diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml
index 4645c83081..d15fe0a490 100644
--- a/com.discord/AndroidManifest.xml
+++ b/com.discord/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="830" platformBuildVersionName="8.3.0">
+<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="831" platformBuildVersionName="8.3.1">
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
     <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
@@ -18,10 +18,10 @@
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
     <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
         <activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
         <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
@@ -101,45 +101,6 @@
         <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false"/>
         <meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="AIzaSyD-4L6bgKMixqBRtrG2UktVXK6IexXlsog"/>
         <activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-        <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
-        <service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
-        <service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
-        <receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
-        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryChargingProxy">
-            <intent-filter>
-                <action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
-                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryNotLowProxy">
-            <intent-filter>
-                <action android:name="android.intent.action.BATTERY_OKAY"/>
-                <action android:name="android.intent.action.BATTERY_LOW"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$StorageNotLowProxy">
-            <intent-filter>
-                <action android:name="android.intent.action.DEVICE_STORAGE_LOW"/>
-                <action android:name="android.intent.action.DEVICE_STORAGE_OK"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$NetworkStateProxy">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.RescheduleReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.intent.action.TIME_SET"/>
-                <action android:name="android.intent.action.TIMEZONE_CHANGED"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxyUpdateReceiver">
-            <intent-filter>
-                <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
-            </intent-filter>
-        </receiver>
         <service android:exported="true" android:name="com.google.firebase.messaging.FirebaseMessagingService">
             <intent-filter android:priority="-500">
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
@@ -181,9 +142,47 @@
         <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
         <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
+        <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
+        <service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
+        <service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
+        <receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
+        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryChargingProxy">
+            <intent-filter>
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryNotLowProxy">
+            <intent-filter>
+                <action android:name="android.intent.action.BATTERY_OKAY"/>
+                <action android:name="android.intent.action.BATTERY_LOW"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$StorageNotLowProxy">
+            <intent-filter>
+                <action android:name="android.intent.action.DEVICE_STORAGE_LOW"/>
+                <action android:name="android.intent.action.DEVICE_STORAGE_OK"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$NetworkStateProxy">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:directBootAware="false" android:enabled="false" android:name="androidx.work.impl.background.systemalarm.RescheduleReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.TIME_SET"/>
+                <action android:name="android.intent.action.TIMEZONE_CHANGED"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.ConstraintProxyUpdateReceiver">
+            <intent-filter>
+                <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
+            </intent-filter>
+        </receiver>
         <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
         <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="100" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
-        <meta-data android:name="io.fabric.ApiKey" android:value="eaccfe98b3572a0a8721a8c3b10f9909018f5ec6"/>
         <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
     </application>
 </manifest>
\ No newline at end of file
diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 3cf2763577..cfd3c9e5cf 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-830.apk
+apkFileName: com.discord-831.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -350,5 +350,5 @@ usesFramework:
   tag: null
 version: 2.4.0-896569-SNAPSHOT
 versionInfo:
-  versionCode: '830'
-  versionName: 8.3.0
+  versionCode: '831'
+  versionName: 8.3.1
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 379c6c4a15..25028af197 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Thu Jan 17 03:55:37 UTC 2019
-version_name=8.3.0
+#Thu Jan 17 23:56:48 UTC 2019
+version_name=8.3.1
 package_name=com.discord
-build_id=070a715d-dd38-4a06-a869-c05445298637
-version_code=830
+build_id=da1245e0-a149-4c0e-88d3-8d88eb54971b
+version_code=831
 app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index bcce14448a..01df581282 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-hdpi/ic_account_microsoft.png b/com.discord/res/drawable-hdpi/ic_account_microsoft.png
index 232e4962eb..79eebd4b7c 100644
Binary files a/com.discord/res/drawable-hdpi/ic_account_microsoft.png and b/com.discord/res/drawable-hdpi/ic_account_microsoft.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_profile_badge_bughunter_32dp.png b/com.discord/res/drawable-hdpi/ic_profile_badge_bughunter_32dp.png
index f0f051a6b6..74dd5596fd 100644
Binary files a/com.discord/res/drawable-hdpi/ic_profile_badge_bughunter_32dp.png and b/com.discord/res/drawable-hdpi/ic_profile_badge_bughunter_32dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_unread_white_9dp.png b/com.discord/res/drawable-hdpi/ic_unread_white_9dp.png
index 339bb36930..30b960fea8 100644
Binary files a/com.discord/res/drawable-hdpi/ic_unread_white_9dp.png and b/com.discord/res/drawable-hdpi/ic_unread_white_9dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_unread_white_9dp_horiz.png b/com.discord/res/drawable-hdpi/ic_unread_white_9dp_horiz.png
index f34a61a377..3320c742ad 100644
Binary files a/com.discord/res/drawable-hdpi/ic_unread_white_9dp_horiz.png and b/com.discord/res/drawable-hdpi/ic_unread_white_9dp_horiz.png differ
diff --git a/com.discord/res/drawable-hdpi/img_addfriends_empty_dark.png b/com.discord/res/drawable-hdpi/img_addfriends_empty_dark.png
index 38e16592f4..47ea387e45 100644
Binary files a/com.discord/res/drawable-hdpi/img_addfriends_empty_dark.png and b/com.discord/res/drawable-hdpi/img_addfriends_empty_dark.png differ
diff --git a/com.discord/res/drawable-hdpi/img_addfriends_empty_light.png b/com.discord/res/drawable-hdpi/img_addfriends_empty_light.png
index bea503bfc2..6d44dcbbe3 100644
Binary files a/com.discord/res/drawable-hdpi/img_addfriends_empty_light.png and b/com.discord/res/drawable-hdpi/img_addfriends_empty_light.png differ
diff --git a/com.discord/res/drawable-hdpi/img_addfriends_notconnected_dark.png b/com.discord/res/drawable-hdpi/img_addfriends_notconnected_dark.png
index e98b176e43..22fd985a10 100644
Binary files a/com.discord/res/drawable-hdpi/img_addfriends_notconnected_dark.png and b/com.discord/res/drawable-hdpi/img_addfriends_notconnected_dark.png differ
diff --git a/com.discord/res/drawable-hdpi/img_addfriends_notconnected_light.png b/com.discord/res/drawable-hdpi/img_addfriends_notconnected_light.png
index 20cbfd5faf..cb10ae36b4 100644
Binary files a/com.discord/res/drawable-hdpi/img_addfriends_notconnected_light.png and b/com.discord/res/drawable-hdpi/img_addfriends_notconnected_light.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_dark.png
index 2e4ef057f6..1911c9adcb 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_dark.png and b/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_dark.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_light.png
index 879b58dcff..230ef7d5c4 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_light.png and b/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_light.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_dark.png b/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_dark.png
index 4f2e38fe87..38b6c61e0f 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_dark.png and b/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_dark.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_light.png b/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_light.png
index 1bc67cbdaf..409e718cf4 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_light.png and b/com.discord/res/drawable-hdpi/img_empty_friends_no_suggestions_light.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_dark.png b/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_dark.png
index 1f073767e8..aa17a941aa 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_dark.png and b/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_dark.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_light.png b/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_light.png
index 26e0e98257..5d218a2991 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_light.png and b/com.discord/res/drawable-hdpi/img_empty_friends_none_blocked_light.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_none_online_dark.png b/com.discord/res/drawable-hdpi/img_empty_friends_none_online_dark.png
index 1302866d2b..aa74b47a5b 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_none_online_dark.png and b/com.discord/res/drawable-hdpi/img_empty_friends_none_online_dark.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_none_online_light.png b/com.discord/res/drawable-hdpi/img_empty_friends_none_online_light.png
index 5536cd0fba..056d0fe148 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_none_online_light.png and b/com.discord/res/drawable-hdpi/img_empty_friends_none_online_light.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_dark.png b/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_dark.png
index a7473a3195..ff37ee4ae3 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_dark.png and b/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_dark.png differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_light.png b/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_light.png
index c5dd193166..89c73c7e4e 100644
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_light.png and b/com.discord/res/drawable-hdpi/img_empty_friends_none_pending_light.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_arrow_drop_down_white_18dp.png b/com.discord/res/drawable-ldpi/ic_arrow_drop_down_white_18dp.png
index a601e6583c..4f53d04ed2 100644
Binary files a/com.discord/res/drawable-ldpi/ic_arrow_drop_down_white_18dp.png and b/com.discord/res/drawable-ldpi/ic_arrow_drop_down_white_18dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_channel_text_grey_18dp.png b/com.discord/res/drawable-ldpi/ic_channel_text_grey_18dp.png
index 329c588f1b..078b52bd06 100644
Binary files a/com.discord/res/drawable-ldpi/ic_channel_text_grey_18dp.png and b/com.discord/res/drawable-ldpi/ic_channel_text_grey_18dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_channel_voice_grey_18dp.png b/com.discord/res/drawable-ldpi/ic_channel_voice_grey_18dp.png
index 4f828540c4..b2bd833762 100644
Binary files a/com.discord/res/drawable-ldpi/ic_channel_voice_grey_18dp.png and b/com.discord/res/drawable-ldpi/ic_channel_voice_grey_18dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_facebook_white_18dp.png b/com.discord/res/drawable-ldpi/ic_facebook_white_18dp.png
index 2aeae8efad..9107249bc6 100644
Binary files a/com.discord/res/drawable-ldpi/ic_facebook_white_18dp.png and b/com.discord/res/drawable-ldpi/ic_facebook_white_18dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_file_large_code.png b/com.discord/res/drawable-ldpi/ic_file_large_code.png
index 51d9d977f5..56d06ea501 100644
Binary files a/com.discord/res/drawable-ldpi/ic_file_large_code.png and b/com.discord/res/drawable-ldpi/ic_file_large_code.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_file_large_document.png b/com.discord/res/drawable-ldpi/ic_file_large_document.png
index 0ac0889785..091d2154da 100644
Binary files a/com.discord/res/drawable-ldpi/ic_file_large_document.png and b/com.discord/res/drawable-ldpi/ic_file_large_document.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_file_large_video.png b/com.discord/res/drawable-ldpi/ic_file_large_video.png
index 43d4e2630b..9c7b70aa21 100644
Binary files a/com.discord/res/drawable-ldpi/ic_file_large_video.png and b/com.discord/res/drawable-ldpi/ic_file_large_video.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_hypesquad_house1_32dp.png b/com.discord/res/drawable-ldpi/ic_hypesquad_house1_32dp.png
index b88f3638b5..5105e1729e 100644
Binary files a/com.discord/res/drawable-ldpi/ic_hypesquad_house1_32dp.png and b/com.discord/res/drawable-ldpi/ic_hypesquad_house1_32dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_instagram_white_18dp.png b/com.discord/res/drawable-ldpi/ic_instagram_white_18dp.png
index 673bdeffe7..487c2b7262 100644
Binary files a/com.discord/res/drawable-ldpi/ic_instagram_white_18dp.png and b/com.discord/res/drawable-ldpi/ic_instagram_white_18dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_message_white_18dp.png b/com.discord/res/drawable-ldpi/ic_message_white_18dp.png
index c6e83e092f..d0ddacce23 100644
Binary files a/com.discord/res/drawable-ldpi/ic_message_white_18dp.png and b/com.discord/res/drawable-ldpi/ic_message_white_18dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_profile_badge_nitro_32dp.png b/com.discord/res/drawable-ldpi/ic_profile_badge_nitro_32dp.png
index 4645427071..8c6d91f7ef 100644
Binary files a/com.discord/res/drawable-ldpi/ic_profile_badge_nitro_32dp.png and b/com.discord/res/drawable-ldpi/ic_profile_badge_nitro_32dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_profile_badge_partner_32dp.png b/com.discord/res/drawable-ldpi/ic_profile_badge_partner_32dp.png
index 5d08b4afca..2e445052fd 100644
Binary files a/com.discord/res/drawable-ldpi/ic_profile_badge_partner_32dp.png and b/com.discord/res/drawable-ldpi/ic_profile_badge_partner_32dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_timer_dark.png b/com.discord/res/drawable-ldpi/ic_timer_dark.png
index 9a9493b77e..b061ff4961 100644
Binary files a/com.discord/res/drawable-ldpi/ic_timer_dark.png and b/com.discord/res/drawable-ldpi/ic_timer_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_timer_light.png b/com.discord/res/drawable-ldpi/ic_timer_light.png
index ae559fac6c..4eeb9ad9e5 100644
Binary files a/com.discord/res/drawable-ldpi/ic_timer_light.png and b/com.discord/res/drawable-ldpi/ic_timer_light.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_twitter_white_18dp.png b/com.discord/res/drawable-ldpi/ic_twitter_white_18dp.png
index e1fad4599a..48b3ed55ba 100644
Binary files a/com.discord/res/drawable-ldpi/ic_twitter_white_18dp.png and b/com.discord/res/drawable-ldpi/ic_twitter_white_18dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_unread_white_9dp.png b/com.discord/res/drawable-ldpi/ic_unread_white_9dp.png
index 8dfde95e3c..ca6b5d7921 100644
Binary files a/com.discord/res/drawable-ldpi/ic_unread_white_9dp.png and b/com.discord/res/drawable-ldpi/ic_unread_white_9dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_unread_white_9dp_horiz.png b/com.discord/res/drawable-ldpi/ic_unread_white_9dp_horiz.png
index e363e45ff5..6a5f015274 100644
Binary files a/com.discord/res/drawable-ldpi/ic_unread_white_9dp_horiz.png and b/com.discord/res/drawable-ldpi/ic_unread_white_9dp_horiz.png differ
diff --git a/com.discord/res/drawable-ldpi/img_addfriends_empty_dark.png b/com.discord/res/drawable-ldpi/img_addfriends_empty_dark.png
index 3df94c9e3b..8d3948aaaa 100644
Binary files a/com.discord/res/drawable-ldpi/img_addfriends_empty_dark.png and b/com.discord/res/drawable-ldpi/img_addfriends_empty_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_addfriends_empty_light.png b/com.discord/res/drawable-ldpi/img_addfriends_empty_light.png
index 7b4318aaf9..07e26cab55 100644
Binary files a/com.discord/res/drawable-ldpi/img_addfriends_empty_light.png and b/com.discord/res/drawable-ldpi/img_addfriends_empty_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_baddies_dark_theme.png b/com.discord/res/drawable-ldpi/img_baddies_dark_theme.png
index f96a13e314..7efa7acf49 100644
Binary files a/com.discord/res/drawable-ldpi/img_baddies_dark_theme.png and b/com.discord/res/drawable-ldpi/img_baddies_dark_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_baddies_light_theme.png b/com.discord/res/drawable-ldpi/img_baddies_light_theme.png
index 0035d67fe7..a22a395e91 100644
Binary files a/com.discord/res/drawable-ldpi/img_baddies_light_theme.png and b/com.discord/res/drawable-ldpi/img_baddies_light_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_dark.png
index d7cdda039c..e173ea0a37 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_dark.png and b/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_light.png
index afacc4fee9..e3a408d9bb 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_light.png and b/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_dark.png b/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_dark.png
index ad31c615f5..878a453be6 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_dark.png and b/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_light.png b/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_light.png
index 25b12dd3ab..82a7da3d9c 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_light.png and b/com.discord/res/drawable-ldpi/img_empty_friends_no_suggestions_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_dark.png b/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_dark.png
index 08fda61754..2d97de3b46 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_dark.png and b/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_light.png b/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_light.png
index d97d3a2bd7..8127cabc4e 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_light.png and b/com.discord/res/drawable-ldpi/img_empty_friends_none_blocked_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_none_online_dark.png b/com.discord/res/drawable-ldpi/img_empty_friends_none_online_dark.png
index 5ee1d33121..154d4e21df 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_none_online_dark.png and b/com.discord/res/drawable-ldpi/img_empty_friends_none_online_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_none_online_light.png b/com.discord/res/drawable-ldpi/img_empty_friends_none_online_light.png
index 189ab59827..91c0fd6c4c 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_none_online_light.png and b/com.discord/res/drawable-ldpi/img_empty_friends_none_online_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_dark.png b/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_dark.png
index 851683b387..4821a4190e 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_dark.png and b/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_light.png b/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_light.png
index d8582b4526..96ba615b2d 100644
Binary files a/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_light.png and b/com.discord/res/drawable-ldpi/img_empty_server_settings_invites_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_forced_update_dark.png b/com.discord/res/drawable-ldpi/img_forced_update_dark.png
index 5cbecab2d6..7509290636 100644
Binary files a/com.discord/res/drawable-ldpi/img_forced_update_dark.png and b/com.discord/res/drawable-ldpi/img_forced_update_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_forced_update_light.png b/com.discord/res/drawable-ldpi/img_forced_update_light.png
index ef1ace33da..e2718e83ab 100644
Binary files a/com.discord/res/drawable-ldpi/img_forced_update_light.png and b/com.discord/res/drawable-ldpi/img_forced_update_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_no_mutual_friends_dark.png b/com.discord/res/drawable-ldpi/img_no_mutual_friends_dark.png
index 6c6f757725..1a6cc02c02 100644
Binary files a/com.discord/res/drawable-ldpi/img_no_mutual_friends_dark.png and b/com.discord/res/drawable-ldpi/img_no_mutual_friends_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_no_mutual_friends_light.png b/com.discord/res/drawable-ldpi/img_no_mutual_friends_light.png
index 1437d27403..026ce05f45 100644
Binary files a/com.discord/res/drawable-ldpi/img_no_mutual_friends_light.png and b/com.discord/res/drawable-ldpi/img_no_mutual_friends_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_no_mutual_servers_dark.png b/com.discord/res/drawable-ldpi/img_no_mutual_servers_dark.png
index 586e02cdb2..b504a6062a 100644
Binary files a/com.discord/res/drawable-ldpi/img_no_mutual_servers_dark.png and b/com.discord/res/drawable-ldpi/img_no_mutual_servers_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_no_mutual_servers_light.png b/com.discord/res/drawable-ldpi/img_no_mutual_servers_light.png
index efae8d9b1d..60271ea25b 100644
Binary files a/com.discord/res/drawable-ldpi/img_no_mutual_servers_light.png and b/com.discord/res/drawable-ldpi/img_no_mutual_servers_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_no_text_channels_dark.png b/com.discord/res/drawable-ldpi/img_no_text_channels_dark.png
index b1e464e73c..5635275bc9 100644
Binary files a/com.discord/res/drawable-ldpi/img_no_text_channels_dark.png and b/com.discord/res/drawable-ldpi/img_no_text_channels_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_no_text_channels_light.png b/com.discord/res/drawable-ldpi/img_no_text_channels_light.png
index 0ccba4bb16..c890afcd53 100644
Binary files a/com.discord/res/drawable-ldpi/img_no_text_channels_light.png and b/com.discord/res/drawable-ldpi/img_no_text_channels_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_nsfw_dark_theme.png b/com.discord/res/drawable-ldpi/img_nsfw_dark_theme.png
index 06bac320ae..198053f22b 100644
Binary files a/com.discord/res/drawable-ldpi/img_nsfw_dark_theme.png and b/com.discord/res/drawable-ldpi/img_nsfw_dark_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_nsfw_light_theme.png b/com.discord/res/drawable-ldpi/img_nsfw_light_theme.png
index 725d16531c..c26e78088c 100644
Binary files a/com.discord/res/drawable-ldpi/img_nsfw_light_theme.png and b/com.discord/res/drawable-ldpi/img_nsfw_light_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_verify_email_dark_theme.png b/com.discord/res/drawable-ldpi/img_verify_email_dark_theme.png
index d60145ee06..2fa79b5efc 100644
Binary files a/com.discord/res/drawable-ldpi/img_verify_email_dark_theme.png and b/com.discord/res/drawable-ldpi/img_verify_email_dark_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_verify_email_light_theme.png b/com.discord/res/drawable-ldpi/img_verify_email_light_theme.png
index c032f9294b..ab9794286e 100644
Binary files a/com.discord/res/drawable-ldpi/img_verify_email_light_theme.png and b/com.discord/res/drawable-ldpi/img_verify_email_light_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_verify_phone_dark_theme.png b/com.discord/res/drawable-ldpi/img_verify_phone_dark_theme.png
index ef828622bc..b566fe35bf 100644
Binary files a/com.discord/res/drawable-ldpi/img_verify_phone_dark_theme.png and b/com.discord/res/drawable-ldpi/img_verify_phone_dark_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_verify_phone_light_theme.png b/com.discord/res/drawable-ldpi/img_verify_phone_light_theme.png
index 8386abedbc..c174d405c6 100644
Binary files a/com.discord/res/drawable-ldpi/img_verify_phone_light_theme.png and b/com.discord/res/drawable-ldpi/img_verify_phone_light_theme.png differ
diff --git a/com.discord/res/drawable-ldpi/img_wumpus_ball_dark.png b/com.discord/res/drawable-ldpi/img_wumpus_ball_dark.png
index 3c3b801c98..0303acb938 100644
Binary files a/com.discord/res/drawable-ldpi/img_wumpus_ball_dark.png and b/com.discord/res/drawable-ldpi/img_wumpus_ball_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_wumpus_ball_light.png b/com.discord/res/drawable-ldpi/img_wumpus_ball_light.png
index 923a958886..ca74150000 100644
Binary files a/com.discord/res/drawable-ldpi/img_wumpus_ball_light.png and b/com.discord/res/drawable-ldpi/img_wumpus_ball_light.png differ
diff --git a/com.discord/res/drawable-ldpi/img_wumpus_tophat_dark.png b/com.discord/res/drawable-ldpi/img_wumpus_tophat_dark.png
index 8ccd7b592d..d1bb55f0dd 100644
Binary files a/com.discord/res/drawable-ldpi/img_wumpus_tophat_dark.png and b/com.discord/res/drawable-ldpi/img_wumpus_tophat_dark.png differ
diff --git a/com.discord/res/drawable-ldpi/img_wumpus_tophat_light.png b/com.discord/res/drawable-ldpi/img_wumpus_tophat_light.png
index 79f18b7061..81d42f0c30 100644
Binary files a/com.discord/res/drawable-ldpi/img_wumpus_tophat_light.png and b/com.discord/res/drawable-ldpi/img_wumpus_tophat_light.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_profile_badge_bughunter_32dp.png b/com.discord/res/drawable-mdpi/ic_profile_badge_bughunter_32dp.png
index b394433e2d..84a5bdfc67 100644
Binary files a/com.discord/res/drawable-mdpi/ic_profile_badge_bughunter_32dp.png and b/com.discord/res/drawable-mdpi/ic_profile_badge_bughunter_32dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_profile_badge_bughunter_32dp.png b/com.discord/res/drawable-xhdpi/ic_profile_badge_bughunter_32dp.png
index 0d5e18b221..262f6c96a7 100644
Binary files a/com.discord/res/drawable-xhdpi/ic_profile_badge_bughunter_32dp.png and b/com.discord/res/drawable-xhdpi/ic_profile_badge_bughunter_32dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_profile_badge_bughunter_32dp.png b/com.discord/res/drawable-xxhdpi/ic_profile_badge_bughunter_32dp.png
index ed2bbfb7b2..18c8677297 100644
Binary files a/com.discord/res/drawable-xxhdpi/ic_profile_badge_bughunter_32dp.png and b/com.discord/res/drawable-xxhdpi/ic_profile_badge_bughunter_32dp.png differ
diff --git a/com.discord/res/values/arrays.xml b/com.discord/res/values/arrays.xml
index 16e8ce1004..96ba669fec 100644
--- a/com.discord/res/values/arrays.xml
+++ b/com.discord/res/values/arrays.xml
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <array name="color_picker_palette">
-        <item>#ff17ac86</item>
-        <item>#ff25c059</item>
-        <item>#ff277ecd</item>
-        <item>#ff843da4</item>
-        <item>#ffda004e</item>
-        <item>#ffe4b400</item>
-        <item>#ffd6680e</item>
-        <item>#ffd7342a</item>
-        <item>#ff7e9091</item>
-        <item>#ff4c6876</item>
-        <item>#ff116d56</item>
-        <item>#ff1a7939</item>
-        <item>#ff195080</item>
-        <item>#ff5b2076</item>
-        <item>#ff970045</item>
-        <item>#ffae6800</item>
-        <item>#ff923200</item>
-        <item>#ff831f18</item>
-        <item>#ff818689</item>
-    </array>
+    <style name="color_picker_palette" />
 </resources>
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 5bd62e6d81..4f93584c2b 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -873,7 +873,7 @@ SIDE TO SIDE {progress}
     <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">070a715d-dd38-4a06-a869-c05445298637</string>
+    <string name="com.crashlytics.android.build_id">da1245e0-a149-4c0e-88d3-8d88eb54971b</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>
@@ -3661,8 +3661,8 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="tip_whos_online_title">"What're You Playing?"</string>
     <string name="tip_whos_online_title3">"What's Everyone Doing?"</string>
     <string name="tip_writing_messages_body">"This is where you'll be typing all your opinions and ideas. To keep things fancy we've included Markdown syntax support so you can **make a point** or __stomp your feet.__ You can also **drag &amp; drop** images or files right here to quickly share those cat GIFs. Not too many though."</string>
-    <string name="tip_writing_messages_body2">"Hooray! You've made it to %1$s. Now that you're here, make your presence known - **say a quick hello**! 👋"</string>
-    <string name="tip_writing_messages_body3">"Now that you've joined %1$s, make your presence known and **say hello**! 👋"</string>
+    <string name="tip_writing_messages_body2" />
+    <string name="tip_writing_messages_body3" />
     <string name="tip_writing_messages_title">Have a Conversation</string>
     <string name="tip_writing_messages_title3">Have a Conversation</string>
     <string name="title">Title</string>
diff --git a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$a.smali b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$a.smali
index 20cb51e463..befe7423a3 100644
--- a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$a.smali
+++ b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$a.smali
@@ -1,5 +1,6 @@
 .class public final LWidgetFriendsAddUserRequestsModel$a$a;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserRequestsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$b.smali b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$b.smali
index c389165c01..4cf954d5f1 100644
--- a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$b.smali
+++ b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$b.smali
@@ -1,5 +1,6 @@
 .class public final LWidgetFriendsAddUserRequestsModel$a$b;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserRequestsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$c.smali b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$c.smali
index 2b82b96658..d1561c280b 100644
--- a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$c.smali
+++ b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a$c.smali
@@ -1,5 +1,6 @@
 .class public final LWidgetFriendsAddUserRequestsModel$a$c;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetFriendsAddUserRequestsModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a.smali b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a.smali
index af00be867d..52f291299a 100644
--- a/com.discord/smali/WidgetFriendsAddUserRequestsModel$a.smali
+++ b/com.discord/smali/WidgetFriendsAddUserRequestsModel$a.smali
@@ -1,5 +1,6 @@
 .class public final LWidgetFriendsAddUserRequestsModel$a;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserRequestsModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali b/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
index 6f80650b72..4175b2c175 100644
--- a/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
+++ b/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
@@ -1,5 +1,6 @@
 .class public final LWidgetFriendsAddUserRequestsModel;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserRequestsModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/a.smali b/com.discord/smali/a.smali
index a760dd30ad..2d294fd519 100644
--- a/com.discord/smali/a.smali
+++ b/com.discord/smali/a.smali
@@ -1,5 +1,6 @@
 .class public final La;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserRequestsModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/a/a$a.smali b/com.discord/smali/a/a$a.smali
index b9ed8f6f4e..40e0f689ae 100644
--- a/com.discord/smali/a/a$a.smali
+++ b/com.discord/smali/a/a$a.smali
@@ -1,5 +1,6 @@
 .class final La/a$a;
 .super Ljava/lang/Object;
+.source "AndroidExecutors.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/a/a.smali b/com.discord/smali/a/a.smali
index f763ee2062..16377dabc6 100644
--- a/com.discord/smali/a/a.smali
+++ b/com.discord/smali/a/a.smali
@@ -1,5 +1,6 @@
 .class final La/a;
 .super Ljava/lang/Object;
+.source "AndroidExecutors.java"
 
 
 # annotations
diff --git a/com.discord/smali/a/b$a.smali b/com.discord/smali/a/b$a.smali
index bbab6b7eb6..02b79a1a7c 100644
--- a/com.discord/smali/a/b$a.smali
+++ b/com.discord/smali/a/b$a.smali
@@ -1,5 +1,6 @@
 .class final La/b$a;
 .super Ljava/lang/Object;
+.source "BoltsExecutors.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
@@ -143,11 +144,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_1
     invoke-static {}, La/b;->q()Ljava/util/concurrent/ExecutorService;
 
@@ -162,7 +158,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     invoke-direct {p0}, La/b$a;->s()I
 
     throw p1
diff --git a/com.discord/smali/a/b.smali b/com.discord/smali/a/b.smali
index 181e2b2ac6..a4c8077135 100644
--- a/com.discord/smali/a/b.smali
+++ b/com.discord/smali/a/b.smali
@@ -1,5 +1,6 @@
 .class final La/b;
 .super Ljava/lang/Object;
+.source "BoltsExecutors.java"
 
 
 # annotations
diff --git a/com.discord/smali/a/c.smali b/com.discord/smali/a/c.smali
index bb131e4149..dedca0cd62 100644
--- a/com.discord/smali/a/c.smali
+++ b/com.discord/smali/a/c.smali
@@ -1,5 +1,6 @@
 .class public final La/c;
 .super Ljava/lang/Object;
+.source "CancellationToken.java"
 
 
 # instance fields
diff --git a/com.discord/smali/a/d.smali b/com.discord/smali/a/d.smali
index 97bd902ba1..4cf46f0a40 100644
--- a/com.discord/smali/a/d.smali
+++ b/com.discord/smali/a/d.smali
@@ -1,5 +1,6 @@
 .class public final La/d;
 .super Ljava/lang/Object;
+.source "CancellationTokenRegistration.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/a/e.smali b/com.discord/smali/a/e.smali
index b37d971e38..a6b28bd6d5 100644
--- a/com.discord/smali/a/e.smali
+++ b/com.discord/smali/a/e.smali
@@ -1,5 +1,6 @@
 .class public final La/e;
 .super Ljava/lang/Object;
+.source "CancellationTokenSource.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -107,6 +108,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method public final t()Z
diff --git a/com.discord/smali/a/f.smali b/com.discord/smali/a/f.smali
index c914e534f3..6f83397bad 100644
--- a/com.discord/smali/a/f.smali
+++ b/com.discord/smali/a/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract La/f;
 .super Ljava/lang/Object;
+.source "Continuation.java"
 
 
 # annotations
diff --git a/com.discord/smali/a/g.smali b/com.discord/smali/a/g.smali
index 2ce13bf2e5..dbc1b0bcd0 100644
--- a/com.discord/smali/a/g.smali
+++ b/com.discord/smali/a/g.smali
@@ -1,5 +1,6 @@
 .class public final La/g;
 .super Ljava/lang/RuntimeException;
+.source "ExecutorException.java"
 
 
 # direct methods
diff --git a/com.discord/smali/a/h$1.smali b/com.discord/smali/a/h$1.smali
index bb325bca75..7c366ed16f 100644
--- a/com.discord/smali/a/h$1.smali
+++ b/com.discord/smali/a/h$1.smali
@@ -1,5 +1,6 @@
 .class final La/h$1;
 .super Ljava/lang/Object;
+.source "Task.java"
 
 # interfaces
 .implements La/f;
diff --git a/com.discord/smali/a/h$2.smali b/com.discord/smali/a/h$2.smali
index 1c4d8f7898..f74f523c02 100644
--- a/com.discord/smali/a/h$2.smali
+++ b/com.discord/smali/a/h$2.smali
@@ -1,5 +1,6 @@
 .class final La/h$2;
 .super Ljava/lang/Object;
+.source "Task.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -52,8 +53,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, La/h$2;->bH:La/c;
-
     iget-object v0, v0, La/c;->bm:La/e;
 
     invoke-virtual {v0}, La/e;->t()Z
diff --git a/com.discord/smali/a/h$3.smali b/com.discord/smali/a/h$3.smali
index 1f1943dcc7..eed2157a8a 100644
--- a/com.discord/smali/a/h$3.smali
+++ b/com.discord/smali/a/h$3.smali
@@ -1,5 +1,6 @@
 .class final La/h$3;
 .super Ljava/lang/Object;
+.source "Task.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -50,8 +51,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, La/h$3;->bH:La/c;
-
     iget-object v0, v0, La/c;->bm:La/e;
 
     invoke-virtual {v0}, La/e;->t()Z
diff --git a/com.discord/smali/a/h$a.smali b/com.discord/smali/a/h$a.smali
index 1cfd83cef8..3207a185df 100644
--- a/com.discord/smali/a/h$a.smali
+++ b/com.discord/smali/a/h$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract La/h$a;
 .super Ljava/lang/Object;
+.source "Task.java"
 
 
 # annotations
diff --git a/com.discord/smali/a/h.smali b/com.discord/smali/a/h.smali
index 25b15c548a..2255e961cd 100644
--- a/com.discord/smali/a/h.smali
+++ b/com.discord/smali/a/h.smali
@@ -1,5 +1,6 @@
 .class public final La/h;
 .super Ljava/lang/Object;
+.source "Task.java"
 
 
 # annotations
@@ -585,6 +586,8 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/a/i.smali b/com.discord/smali/a/i.smali
index 525f645e92..c4315eb7e2 100644
--- a/com.discord/smali/a/i.smali
+++ b/com.discord/smali/a/i.smali
@@ -1,5 +1,6 @@
 .class public final La/i;
 .super Ljava/lang/Object;
+.source "TaskCompletionSource.java"
 
 
 # annotations
diff --git a/com.discord/smali/a/j.smali b/com.discord/smali/a/j.smali
index e9b341f351..a237b26b34 100644
--- a/com.discord/smali/a/j.smali
+++ b/com.discord/smali/a/j.smali
@@ -1,5 +1,6 @@
 .class final La/j;
 .super Ljava/lang/Object;
+.source "UnobservedErrorNotifier.java"
 
 
 # instance fields
diff --git a/com.discord/smali/a/k.smali b/com.discord/smali/a/k.smali
index b588a565d4..241369f785 100644
--- a/com.discord/smali/a/k.smali
+++ b/com.discord/smali/a/k.smali
@@ -1,5 +1,6 @@
 .class public final La/k;
 .super Ljava/lang/RuntimeException;
+.source "UnobservedTaskException.java"
 
 
 # direct methods
diff --git a/com.discord/smali/android/support/a/a$a$a.smali b/com.discord/smali/android/support/a/a$a$a.smali
index 3a9c4566da..403595f18f 100644
--- a/com.discord/smali/android/support/a/a$a$a.smali
+++ b/com.discord/smali/android/support/a/a$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/a/a$a$a;
 .super Ljava/lang/Object;
+.source "ICustomTabsCallback.java"
 
 # interfaces
 .implements Landroid/support/a/a;
@@ -338,20 +339,30 @@
     invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    invoke-virtual {v0, p3}, Landroid/os/Parcel;->writeInt(I)V
+    if-eqz p3, :cond_1
 
-    if-eqz p4, :cond_1
+    const/4 p2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_1
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    if-eqz p4, :cond_2
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
     invoke-virtual {p4, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_1
+    :cond_2
     invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    :goto_1
+    :goto_2
     iget-object p1, p0, Landroid/support/a/a$a$a;->i:Landroid/os/IBinder;
 
     const/4 p2, 0x6
diff --git a/com.discord/smali/android/support/a/a$a.smali b/com.discord/smali/android/support/a/a$a.smali
index 77bd17f11e..02ffe57ff1 100644
--- a/com.discord/smali/android/support/a/a$a.smali
+++ b/com.discord/smali/android/support/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/a/a$a;
 .super Landroid/os/Binder;
+.source "ICustomTabsCallback.java"
 
 # interfaces
 .implements Landroid/support/a/a;
diff --git a/com.discord/smali/android/support/a/a.smali b/com.discord/smali/android/support/a/a.smali
index 3f01b5e62c..f2a8776cc2 100644
--- a/com.discord/smali/android/support/a/a.smali
+++ b/com.discord/smali/android/support/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/a/a;
 .super Ljava/lang/Object;
+.source "ICustomTabsCallback.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
diff --git a/com.discord/smali/android/support/a/b$a$a.smali b/com.discord/smali/android/support/a/b$a$a.smali
index ff64e70f43..c631ff68c1 100644
--- a/com.discord/smali/android/support/a/b$a$a.smali
+++ b/com.discord/smali/android/support/a/b$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/a/b$a$a;
 .super Ljava/lang/Object;
+.source "ICustomTabsService.java"
 
 # interfaces
 .implements Landroid/support/a/b;
diff --git a/com.discord/smali/android/support/a/b$a.smali b/com.discord/smali/android/support/a/b$a.smali
index 785327f9fd..0373a3db58 100644
--- a/com.discord/smali/android/support/a/b$a.smali
+++ b/com.discord/smali/android/support/a/b$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/a/b$a;
 .super Landroid/os/Binder;
+.source "ICustomTabsService.java"
 
 # interfaces
 .implements Landroid/support/a/b;
diff --git a/com.discord/smali/android/support/a/b.smali b/com.discord/smali/android/support/a/b.smali
index 013ab6fe44..e5c42b07c1 100644
--- a/com.discord/smali/android/support/a/b.smali
+++ b/com.discord/smali/android/support/a/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/a/b;
 .super Ljava/lang/Object;
+.source "ICustomTabsService.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
diff --git a/com.discord/smali/android/support/a/c$a$a.smali b/com.discord/smali/android/support/a/c$a$a.smali
index e66cca42dc..71e9304685 100644
--- a/com.discord/smali/android/support/a/c$a$a.smali
+++ b/com.discord/smali/android/support/a/c$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/a/c$a$a;
 .super Ljava/lang/Object;
+.source "IPostMessageService.java"
 
 # interfaces
 .implements Landroid/support/a/c;
diff --git a/com.discord/smali/android/support/a/c$a.smali b/com.discord/smali/android/support/a/c$a.smali
index 86079ce1f2..614a825dc1 100644
--- a/com.discord/smali/android/support/a/c$a.smali
+++ b/com.discord/smali/android/support/a/c$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/a/c$a;
 .super Landroid/os/Binder;
+.source "IPostMessageService.java"
 
 # interfaces
 .implements Landroid/support/a/c;
diff --git a/com.discord/smali/android/support/a/c.smali b/com.discord/smali/android/support/a/c.smali
index 5aabc9599d..201a91882f 100644
--- a/com.discord/smali/android/support/a/c.smali
+++ b/com.discord/smali/android/support/a/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/a/c;
 .super Ljava/lang/Object;
+.source "IPostMessageService.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
diff --git a/com.discord/smali/android/support/v4/a/a$a$a.smali b/com.discord/smali/android/support/v4/a/a$a$a.smali
index b88a1867b0..ab0ee645cc 100644
--- a/com.discord/smali/android/support/v4/a/a$a$a.smali
+++ b/com.discord/smali/android/support/v4/a/a$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/a/a$a$a;
 .super Ljava/lang/Object;
+.source "INotificationSideChannel.java"
 
 # interfaces
 .implements Landroid/support/v4/a/a;
diff --git a/com.discord/smali/android/support/v4/a/a$a.smali b/com.discord/smali/android/support/v4/a/a$a.smali
index 39d4c41ce3..a10ba28912 100644
--- a/com.discord/smali/android/support/v4/a/a$a.smali
+++ b/com.discord/smali/android/support/v4/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/v4/a/a$a;
 .super Landroid/os/Binder;
+.source "INotificationSideChannel.java"
 
 # interfaces
 .implements Landroid/support/v4/a/a;
diff --git a/com.discord/smali/android/support/v4/a/a.smali b/com.discord/smali/android/support/v4/a/a.smali
index 14fc29a458..c08e15faeb 100644
--- a/com.discord/smali/android/support/v4/a/a.smali
+++ b/com.discord/smali/android/support/v4/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/v4/a/a;
 .super Ljava/lang/Object;
+.source "INotificationSideChannel.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
diff --git a/com.discord/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali b/com.discord/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali
index 13ce69a939..c6e275a1bd 100644
--- a/com.discord/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali
+++ b/com.discord/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/graphics/drawable/IconCompatParcelizer;
 .super Landroidx/core/graphics/drawable/IconCompatParcelizer;
+.source "IconCompatParcelizer.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$CustomActionResultReceiver.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$CustomActionResultReceiver.smali
index f01bf94e96..320921e1d9 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$CustomActionResultReceiver.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$CustomActionResultReceiver.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/MediaBrowserCompat$CustomActionResultReceiver;
 .super Landroid/support/v4/os/ResultReceiver;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
@@ -68,13 +69,23 @@
 
     invoke-static {v0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-void
+
     :pswitch_0
     return-void
 
+    :pswitch_1
+    return-void
+
+    :pswitch_2
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch -0x1
-        :pswitch_0
-        :pswitch_0
+        :pswitch_2
+        :pswitch_1
         :pswitch_0
     .end packed-switch
 .end method
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$ItemReceiver.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$ItemReceiver.smali
index 36421c2655..1cc354acaa 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$ItemReceiver.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$ItemReceiver.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/MediaBrowserCompat$ItemReceiver;
 .super Landroid/support/v4/os/ResultReceiver;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
@@ -38,6 +39,8 @@
 
     invoke-virtual {p2, p1}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem$1.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem$1.smali
index ec5e538f7e..12248d11ee 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem$1.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$MediaItem$1;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem.smali
index 7d71172f5b..7a023e74b3 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$MediaItem.smali
@@ -1,5 +1,6 @@
 .class public Landroid/support/v4/media/MediaBrowserCompat$MediaItem;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$SearchResultReceiver.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$SearchResultReceiver.smali
index a31125d1dd..11e127806e 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$SearchResultReceiver.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$SearchResultReceiver.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/MediaBrowserCompat$SearchResultReceiver;
 .super Landroid/support/v4/os/ResultReceiver;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
@@ -19,9 +20,9 @@
 
     invoke-static {p2}, Landroid/support/v4/media/session/MediaSessionCompat;->b(Landroid/os/Bundle;)V
 
-    if-nez p1, :cond_1
+    if-nez p1, :cond_2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_2
 
     const-string p1, "search_results"
 
@@ -64,6 +65,9 @@
     goto :goto_0
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_1
     return-void
 .end method
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$a.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$a.smali
index 3ed4178d76..412ca55eb5 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$a.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$a;
 .super Landroid/os/Handler;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
@@ -69,15 +70,13 @@
 
     iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$a;->l:Ljava/lang/ref/WeakReference;
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$a;->l:Ljava/lang/ref/WeakReference;
+    if-eqz v0, :cond_2
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$a;->k:Ljava/lang/ref/WeakReference;
 
@@ -237,9 +236,14 @@
     invoke-interface {v1, v8}, Landroid/support/v4/media/MediaBrowserCompat$i;->b(Landroid/os/Messenger;)V
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_1
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali
index 9d697430a9..b9cf089a65 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroid/support/v4/media/MediaBrowserCompat$b$a;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$b.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$b.smali
index 2459110e3c..612ae5d9ef 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$b.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$b$b;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/a$a;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b.smali
index 62facec313..f5b1cef858 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b.smali
@@ -1,5 +1,6 @@
 .class public Landroid/support/v4/media/MediaBrowserCompat$b;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$c.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$c.smali
index 1f942a7b70..0bee2e0aaf 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$c.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$c.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/v4/media/MediaBrowserCompat$c;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali
index ff87fd77bb..efe25c35a3 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/v4/media/MediaBrowserCompat$d;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$e.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$e.smali
index 633833c708..9ba5437755 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$e.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$e.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/MediaBrowserCompat$e;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/MediaBrowserCompat$b$a;
@@ -218,19 +219,15 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$e;->B:Landroid/os/Messenger;
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$e;->A:Landroid/support/v4/media/MediaBrowserCompat$j;
-
     iget-object v1, p0, Landroid/support/v4/media/MediaBrowserCompat$e;->B:Landroid/os/Messenger;
 
+    if-eqz v1, :cond_0
+
     const/4 v2, 0x7
 
     const/4 v3, 0x0
 
+    :try_start_0
     invoke-virtual {v0, v2, v3, v1}, Landroid/support/v4/media/MediaBrowserCompat$j;->a(ILandroid/os/Bundle;Landroid/os/Messenger;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$f.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$f.smali
index 880e74a09b..f7fdf28efb 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$f.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$f.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/MediaBrowserCompat$f;
 .super Landroid/support/v4/media/MediaBrowserCompat$e;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$g.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$g.smali
index d49799d273..338a6ddd74 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$g.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$g.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$g;
 .super Landroid/support/v4/media/MediaBrowserCompat$f;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$1.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$1.smali
index e1edcba8c1..8a95b160da 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$1.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$h$1;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -116,9 +117,7 @@
 
     new-instance v2, Landroid/support/v4/media/MediaBrowserCompat$h$a;
 
-    iget-object v3, p0, Landroid/support/v4/media/MediaBrowserCompat$h$1;->H:Landroid/support/v4/media/MediaBrowserCompat$h;
-
-    invoke-direct {v2, v3}, Landroid/support/v4/media/MediaBrowserCompat$h$a;-><init>(Landroid/support/v4/media/MediaBrowserCompat$h;)V
+    invoke-direct {v2, v1}, Landroid/support/v4/media/MediaBrowserCompat$h$a;-><init>(Landroid/support/v4/media/MediaBrowserCompat$h;)V
 
     iput-object v2, v1, Landroid/support/v4/media/MediaBrowserCompat$h;->G:Landroid/support/v4/media/MediaBrowserCompat$h$a;
 
@@ -137,7 +136,7 @@
 
     invoke-virtual {v2, v0, v3, v4}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
 
-    move-result v0
+    move-result v1
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -164,10 +163,8 @@
 
     invoke-static {v0, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    const/4 v0, 0x0
-
     :goto_1
-    if-nez v0, :cond_3
+    if-nez v1, :cond_3
 
     iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$h$1;->H:Landroid/support/v4/media/MediaBrowserCompat$h;
 
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$2.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$2.smali
index fc9d74985c..e0542ce3c8 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$2.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$2.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$h$2;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$1.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$1.smali
index 6c98ef4069..1e36fb01c4 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$1.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$h$a$1;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$2.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$2.smali
index 3bd2d2a282..b3dd92452d 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$2.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a$2.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$h$a$2;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a.smali
index 7fa5a49874..da36807e86 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$h$a;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/content/ServiceConnection;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h.smali
index 3fb36c6215..8aec4e1e24 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$h.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$h;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/MediaBrowserCompat$d;
@@ -197,8 +198,6 @@
 
     if-eqz p1, :cond_1
 
-    iget p1, p0, Landroid/support/v4/media/MediaBrowserCompat$h;->mState:I
-
     if-ne p1, v1, :cond_0
 
     goto :goto_0
@@ -212,8 +211,6 @@
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Landroid/support/v4/media/MediaBrowserCompat$h;->mState:I
-
     if-eq p1, v1, :cond_2
 
     const-string p1, "MediaBrowserCompat"
@@ -267,11 +264,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$h;->mContext:Landroid/content/Context;
+    iget-object v1, p0, Landroid/support/v4/media/MediaBrowserCompat$h;->mContext:Landroid/content/Context;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaBrowserCompat$h;->G:Landroid/support/v4/media/MediaBrowserCompat$h$a;
-
-    invoke-virtual {v0, v1}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
+    invoke-virtual {v1, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
 
     :cond_0
     const/4 v0, 0x1
@@ -664,8 +659,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Landroid/support/v4/media/MediaBrowserCompat$h;->mState:I
-
     const/4 v1, 0x1
 
     if-ne v0, v1, :cond_0
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$i.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$i.smali
index 37d914cc52..5b5749d2f3 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$i.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$i.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroid/support/v4/media/MediaBrowserCompat$i;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$j.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$j.smali
index 45f8360b7d..33786d7a45 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$j.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$j.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$j;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$k.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$k.smali
index d8e6a914db..96b393dd80 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$k.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$k.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$k;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$a.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$a.smali
index c2a11d72fb..cc1c1c5181 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$a.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$a.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/MediaBrowserCompat$l$a;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/a$c;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$b.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$b.smali
index dfe32a24fe..55487d33eb 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$b.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l$b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaBrowserCompat$l$b;
 .super Landroid/support/v4/media/MediaBrowserCompat$l$a;
+.source "MediaBrowserCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/b$a;
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l.smali
index c6982ffe10..3cc3a5e4bd 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$l.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/v4/media/MediaBrowserCompat$l;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat.smali
index c736005d96..18f1c51d29 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/MediaBrowserCompat;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompat.java"
 
 
 # annotations
@@ -67,7 +68,6 @@
 
     invoke-direct {v0, p1, p2, p3, v1}, Landroid/support/v4/media/MediaBrowserCompat$g;-><init>(Landroid/content/Context;Landroid/content/ComponentName;Landroid/support/v4/media/MediaBrowserCompat$b;Landroid/os/Bundle;)V
 
-    :goto_0
     iput-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat;->j:Landroid/support/v4/media/MediaBrowserCompat$d;
 
     return-void
@@ -83,7 +83,9 @@
 
     invoke-direct {v0, p1, p2, p3, v1}, Landroid/support/v4/media/MediaBrowserCompat$f;-><init>(Landroid/content/Context;Landroid/content/ComponentName;Landroid/support/v4/media/MediaBrowserCompat$b;Landroid/os/Bundle;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat;->j:Landroid/support/v4/media/MediaBrowserCompat$d;
+
+    return-void
 
     :cond_1
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -96,12 +98,16 @@
 
     invoke-direct {v0, p1, p2, p3, v1}, Landroid/support/v4/media/MediaBrowserCompat$e;-><init>(Landroid/content/Context;Landroid/content/ComponentName;Landroid/support/v4/media/MediaBrowserCompat$b;Landroid/os/Bundle;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat;->j:Landroid/support/v4/media/MediaBrowserCompat$d;
+
+    return-void
 
     :cond_2
     new-instance v0, Landroid/support/v4/media/MediaBrowserCompat$h;
 
     invoke-direct {v0, p1, p2, p3, v1}, Landroid/support/v4/media/MediaBrowserCompat$h;-><init>(Landroid/content/Context;Landroid/content/ComponentName;Landroid/support/v4/media/MediaBrowserCompat$b;Landroid/os/Bundle;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat;->j:Landroid/support/v4/media/MediaBrowserCompat$d;
+
+    return-void
 .end method
diff --git a/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$1.smali b/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$1.smali
index 9bfb03271f..eccf298fda 100644
--- a/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$1.smali
+++ b/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaDescriptionCompat$1;
 .super Ljava/lang/Object;
+.source "MediaDescriptionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$a.smali b/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$a.smali
index b7ed8d9ed2..ee13f7d47f 100644
--- a/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$a.smali
+++ b/com.discord/smali/android/support/v4/media/MediaDescriptionCompat$a.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/MediaDescriptionCompat$a;
 .super Ljava/lang/Object;
+.source "MediaDescriptionCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/MediaDescriptionCompat.smali b/com.discord/smali/android/support/v4/media/MediaDescriptionCompat.smali
index 52f789c921..9449d7e8a6 100644
--- a/com.discord/smali/android/support/v4/media/MediaDescriptionCompat.smali
+++ b/com.discord/smali/android/support/v4/media/MediaDescriptionCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/MediaDescriptionCompat;
 .super Ljava/lang/Object;
+.source "MediaDescriptionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -323,6 +324,8 @@
 
     iput-object p0, v0, Landroid/support/v4/media/MediaDescriptionCompat;->ab:Ljava/lang/Object;
 
+    return-object v0
+
     :cond_5
     return-object v0
 .end method
@@ -505,10 +508,15 @@
 
     iput-object v0, p0, Landroid/support/v4/media/MediaDescriptionCompat;->ab:Ljava/lang/Object;
 
+    iget-object v0, p0, Landroid/support/v4/media/MediaDescriptionCompat;->ab:Ljava/lang/Object;
+
+    goto :goto_1
+
     :cond_5
     :goto_0
     iget-object v0, p0, Landroid/support/v4/media/MediaDescriptionCompat;->ab:Ljava/lang/Object;
 
+    :goto_1
     check-cast v0, Landroid/media/MediaDescription;
 
     invoke-virtual {v0, p1, p2}, Landroid/media/MediaDescription;->writeToParcel(Landroid/os/Parcel;I)V
diff --git a/com.discord/smali/android/support/v4/media/MediaMetadataCompat$1.smali b/com.discord/smali/android/support/v4/media/MediaMetadataCompat$1.smali
index 350ca8acc4..ad5c95b651 100644
--- a/com.discord/smali/android/support/v4/media/MediaMetadataCompat$1.smali
+++ b/com.discord/smali/android/support/v4/media/MediaMetadataCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/MediaMetadataCompat$1;
 .super Ljava/lang/Object;
+.source "MediaMetadataCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/MediaMetadataCompat.smali b/com.discord/smali/android/support/v4/media/MediaMetadataCompat.smali
index da2105033b..400aa5d236 100644
--- a/com.discord/smali/android/support/v4/media/MediaMetadataCompat.smali
+++ b/com.discord/smali/android/support/v4/media/MediaMetadataCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/MediaMetadataCompat;
 .super Ljava/lang/Object;
+.source "MediaMetadataCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/android/support/v4/media/RatingCompat$1.smali b/com.discord/smali/android/support/v4/media/RatingCompat$1.smali
index c03de46282..c6437af685 100644
--- a/com.discord/smali/android/support/v4/media/RatingCompat$1.smali
+++ b/com.discord/smali/android/support/v4/media/RatingCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/RatingCompat$1;
 .super Ljava/lang/Object;
+.source "RatingCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/RatingCompat.smali b/com.discord/smali/android/support/v4/media/RatingCompat.smali
index 48d00a9106..0ef995b29b 100644
--- a/com.discord/smali/android/support/v4/media/RatingCompat.smali
+++ b/com.discord/smali/android/support/v4/media/RatingCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/RatingCompat;
 .super Ljava/lang/Object;
+.source "RatingCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -79,17 +80,15 @@
 
     const/4 v2, 0x0
 
-    cmpg-float v1, v1, v2
+    cmpg-float v2, v1, v2
 
-    if-gez v1, :cond_0
+    if-gez v2, :cond_0
 
     const-string v1, "unrated"
 
     goto :goto_0
 
     :cond_0
-    iget v1, p0, Landroid/support/v4/media/RatingCompat;->aj:F
-
     invoke-static {v1}, Ljava/lang/String;->valueOf(F)Ljava/lang/String;
 
     move-result-object v1
diff --git a/com.discord/smali/android/support/v4/media/a$a.smali b/com.discord/smali/android/support/v4/media/a$a.smali
index c399e1a00a..99c3f16fad 100644
--- a/com.discord/smali/android/support/v4/media/a$a.smali
+++ b/com.discord/smali/android/support/v4/media/a$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroid/support/v4/media/a$a;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/a$b.smali b/com.discord/smali/android/support/v4/media/a$b.smali
index 0e7acea7e2..4f7d3799af 100644
--- a/com.discord/smali/android/support/v4/media/a$b.smali
+++ b/com.discord/smali/android/support/v4/media/a$b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/a$b;
 .super Landroid/media/browse/MediaBrowser$ConnectionCallback;
+.source "MediaBrowserCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/a$c.smali b/com.discord/smali/android/support/v4/media/a$c.smali
index 256d7fb2cb..2f5eaa9edd 100644
--- a/com.discord/smali/android/support/v4/media/a$c.smali
+++ b/com.discord/smali/android/support/v4/media/a$c.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroid/support/v4/media/a$c;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/a$d.smali b/com.discord/smali/android/support/v4/media/a$d.smali
index 0170b4773e..8a112c2bd3 100644
--- a/com.discord/smali/android/support/v4/media/a$d.smali
+++ b/com.discord/smali/android/support/v4/media/a$d.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/a$d;
 .super Landroid/media/browse/MediaBrowser$SubscriptionCallback;
+.source "MediaBrowserCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/a.smali b/com.discord/smali/android/support/v4/media/a.smali
index fad08281ec..ec4bb99853 100644
--- a/com.discord/smali/android/support/v4/media/a.smali
+++ b/com.discord/smali/android/support/v4/media/a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/a;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/b$a.smali b/com.discord/smali/android/support/v4/media/b$a.smali
index b7ad3cb471..5a7b1d9b1d 100644
--- a/com.discord/smali/android/support/v4/media/b$a.smali
+++ b/com.discord/smali/android/support/v4/media/b$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroid/support/v4/media/b$a;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompatApi26.java"
 
 # interfaces
 .implements Landroid/support/v4/media/a$c;
diff --git a/com.discord/smali/android/support/v4/media/b$b.smali b/com.discord/smali/android/support/v4/media/b$b.smali
index d77557d640..b48beb531b 100644
--- a/com.discord/smali/android/support/v4/media/b$b.smali
+++ b/com.discord/smali/android/support/v4/media/b$b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/b$b;
 .super Landroid/support/v4/media/a$d;
+.source "MediaBrowserCompatApi26.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/b.smali b/com.discord/smali/android/support/v4/media/b.smali
index 40d704da76..9c5412edf7 100644
--- a/com.discord/smali/android/support/v4/media/b.smali
+++ b/com.discord/smali/android/support/v4/media/b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/b;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompatApi26.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali
index c4b700feae..2ea32139c2 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver;
 .super Landroid/os/ResultReceiver;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali
index 2cffad0071..147e533b12 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a;
 .super Landroid/support/v4/media/session/MediaControllerCompat$a$c;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali
index b09612bec4..54c3ed11aa 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;
 .super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/session/MediaControllerCompat$b;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$a.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$a.smali
index 2a53733d76..a2f936a066 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaControllerCompat$a$a;
 .super Landroid/os/Handler;
+.source "MediaControllerCompat.java"
 
 
 # annotations
@@ -105,9 +106,13 @@
 
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_a
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$b.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$b.smali
index 477515f9a0..08a1e245cf 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$b.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaControllerCompat$a$b;
 .super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/session/c$a;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$c.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$c.smali
index 95ebdef880..8e43690dad 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$c.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a$c.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/session/MediaControllerCompat$a$c;
 .super Landroid/support/v4/media/session/a$a;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a.smali
index 23d1068fbb..804503ca05 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/v4/media/session/MediaControllerCompat$a;
 .super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
 
 # interfaces
 .implements Landroid/os/IBinder$DeathRecipient;
@@ -77,8 +78,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroid/support/v4/media/session/MediaControllerCompat$a;->an:Landroid/support/v4/media/session/MediaControllerCompat$a$a;
-
     invoke-virtual {v0, p1, p2}, Landroid/support/v4/media/session/MediaControllerCompat$a$a;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object p1
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$b.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$b.smali
index 58fd2d4ce7..b682aabdc8 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$b.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$b.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroid/support/v4/media/session/MediaControllerCompat$b;
 .super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$c.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$c.smali
index ea637507a5..e89fcb350a 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$c.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$c.smali
@@ -1,5 +1,6 @@
 .class Landroid/support/v4/media/session/MediaControllerCompat$c;
 .super Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$d.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$d.smali
index 0620eb4dc8..ac9523f2a1 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$d.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$d.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaControllerCompat$d;
 .super Landroid/support/v4/media/session/MediaControllerCompat$c;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$e.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$e.smali
index 411ff08b8a..c1071f5f52 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$e.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$e.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaControllerCompat$e;
 .super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
 
 # interfaces
 .implements Landroid/support/v4/media/session/MediaControllerCompat$b;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$f.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$f.smali
index ec9a20e728..fb3e7057ff 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$f.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$f.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/session/MediaControllerCompat$f;
 .super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat.smali
index 0b0fde506d..3fc84081d5 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/session/MediaControllerCompat;
 .super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem$1.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem$1.smali
index d763fbd5b5..d089277887 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem$1.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1;
 .super Ljava/lang/Object;
+.source "MediaSessionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem.smali
index fe198df1f5..22e8154a21 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;
 .super Ljava/lang/Object;
+.source "MediaSessionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1.smali
index 273a28f366..5b5da8995f 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1;
 .super Ljava/lang/Object;
+.source "MediaSessionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper.smali
index 06737c6c1f..730d9c13c2 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper;
 .super Ljava/lang/Object;
+.source "MediaSessionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token$1.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token$1.smali
index 9a27d40b0a..18dceafdc9 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token$1.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/MediaSessionCompat$Token$1;
 .super Ljava/lang/Object;
+.source "MediaSessionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali
index 90b56b89e7..8c357eb72d 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/session/MediaSessionCompat$Token;
 .super Ljava/lang/Object;
+.source "MediaSessionCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -176,18 +177,14 @@
     return v2
 
     :cond_3
-    iget-object v0, p1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->aF:Ljava/lang/Object;
+    iget-object p1, p1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->aF:Ljava/lang/Object;
 
-    if-nez v0, :cond_4
+    if-nez p1, :cond_4
 
     return v2
 
     :cond_4
-    iget-object v0, p0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->aF:Ljava/lang/Object;
-
-    iget-object p1, p1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->aF:Ljava/lang/Object;
-
-    invoke-virtual {v0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -206,8 +203,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->aF:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat.smali
index f917599087..c1527ecb8c 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroid/support/v4/media/session/MediaSessionCompat;
 .super Ljava/lang/Object;
+.source "MediaSessionCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo$1.smali b/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo$1.smali
index 7ca6444cbc..142f71331e 100644
--- a/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo$1.smali
+++ b/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/ParcelableVolumeInfo$1;
 .super Ljava/lang/Object;
+.source "ParcelableVolumeInfo.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo.smali b/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo.smali
index 13befe368a..352c9c958d 100644
--- a/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo.smali
+++ b/com.discord/smali/android/support/v4/media/session/ParcelableVolumeInfo.smali
@@ -1,5 +1,6 @@
 .class public Landroid/support/v4/media/session/ParcelableVolumeInfo;
 .super Ljava/lang/Object;
+.source "ParcelableVolumeInfo.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$1.smali b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$1.smali
index baf36961d6..f01975c4dd 100644
--- a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$1.smali
+++ b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/PlaybackStateCompat$1;
 .super Ljava/lang/Object;
+.source "PlaybackStateCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction$1.smali b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction$1.smali
index 2e9935069f..609cdd4a96 100644
--- a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction$1.smali
+++ b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction$1;
 .super Ljava/lang/Object;
+.source "PlaybackStateCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction.smali b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction.smali
index 728d58b8e4..e88480be5b 100644
--- a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction.smali
+++ b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction;
 .super Ljava/lang/Object;
+.source "PlaybackStateCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat.smali b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat.smali
index 60d99a1d15..ef74a81119 100644
--- a/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat.smali
+++ b/com.discord/smali/android/support/v4/media/session/PlaybackStateCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroid/support/v4/media/session/PlaybackStateCompat;
 .super Ljava/lang/Object;
+.source "PlaybackStateCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -377,9 +378,14 @@
 
     move-result-object v1
 
+    move-object/from16 v21, v1
+
+    goto :goto_2
+
     :cond_2
     move-object/from16 v21, v1
 
+    :goto_2
     new-instance v1, Landroid/support/v4/media/session/PlaybackStateCompat;
 
     invoke-virtual {v2}, Landroid/media/session/PlaybackState;->getState()I
@@ -420,6 +426,8 @@
 
     iput-object v0, v1, Landroid/support/v4/media/session/PlaybackStateCompat;->aW:Ljava/lang/Object;
 
+    return-object v1
+
     :cond_3
     return-object v1
 .end method
diff --git a/com.discord/smali/android/support/v4/media/session/a$a$a.smali b/com.discord/smali/android/support/v4/media/session/a$a$a.smali
index 281c62d27f..9c67483b03 100644
--- a/com.discord/smali/android/support/v4/media/session/a$a$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/a$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/a$a$a;
 .super Ljava/lang/Object;
+.source "IMediaControllerCallback.java"
 
 # interfaces
 .implements Landroid/support/v4/media/session/a;
@@ -50,29 +51,29 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p1, v0, v1}, Landroid/support/v4/media/MediaMetadataCompat;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p1, v0, v2}, Landroid/support/v4/media/MediaMetadataCompat;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
     iget-object p1, p0, Landroid/support/v4/media/session/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
     const/4 v3, 0x0
 
-    invoke-interface {p1, v1, v0, v3, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v2, v0, v3, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -105,29 +106,29 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p1, v0, v1}, Landroid/support/v4/media/session/ParcelableVolumeInfo;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p1, v0, v2}, Landroid/support/v4/media/session/ParcelableVolumeInfo;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
     iget-object p1, p0, Landroid/support/v4/media/session/a$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v1, 0x8
+    const/16 v2, 0x8
 
     const/4 v3, 0x0
 
-    invoke-interface {p1, v1, v0, v3, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v2, v0, v3, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -160,29 +161,29 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p1, v0, v1}, Landroid/support/v4/media/session/PlaybackStateCompat;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p1, v0, v2}, Landroid/support/v4/media/session/PlaybackStateCompat;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
     iget-object p1, p0, Landroid/support/v4/media/session/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
     const/4 v3, 0x0
 
-    invoke-interface {p1, v1, v0, v3, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v2, v0, v3, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -270,17 +271,27 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
+    const/4 v1, 0x1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
     iget-object p1, p0, Landroid/support/v4/media/session/a$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v1, 0xa
+    const/16 v2, 0xa
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    const/4 v3, 0x1
-
-    invoke-interface {p1, v1, v0, v2, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v2, v0, v3, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -405,17 +416,27 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
+    const/4 v1, 0x1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
     iget-object p1, p0, Landroid/support/v4/media/session/a$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v1, 0xb
+    const/16 v2, 0xb
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    const/4 v3, 0x1
-
-    invoke-interface {p1, v1, v0, v2, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v2, v0, v3, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -491,29 +512,29 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
     iget-object p1, p0, Landroid/support/v4/media/session/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v1, 0x7
+    const/4 v2, 0x7
 
     const/4 v3, 0x0
 
-    invoke-interface {p1, v1, v0, v3, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v2, v0, v3, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -598,29 +619,29 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-static {p1, v0, v1}, Landroid/text/TextUtils;->writeToParcel(Ljava/lang/CharSequence;Landroid/os/Parcel;I)V
+    invoke-static {p1, v0, v2}, Landroid/text/TextUtils;->writeToParcel(Ljava/lang/CharSequence;Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
     iget-object p1, p0, Landroid/support/v4/media/session/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v1, 0x6
+    const/4 v2, 0x6
 
     const/4 v3, 0x0
 
-    invoke-interface {p1, v1, v0, v3, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v2, v0, v3, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/android/support/v4/media/session/a$a.smali b/com.discord/smali/android/support/v4/media/session/a$a.smali
index a1c2fa5ccc..590a051e45 100644
--- a/com.discord/smali/android/support/v4/media/session/a$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/a$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/v4/media/session/a$a;
 .super Landroid/os/Binder;
+.source "IMediaControllerCallback.java"
 
 # interfaces
 .implements Landroid/support/v4/media/session/a;
diff --git a/com.discord/smali/android/support/v4/media/session/a.smali b/com.discord/smali/android/support/v4/media/session/a.smali
index 7c8fffd2cc..f9f7254104 100644
--- a/com.discord/smali/android/support/v4/media/session/a.smali
+++ b/com.discord/smali/android/support/v4/media/session/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/v4/media/session/a;
 .super Ljava/lang/Object;
+.source "IMediaControllerCallback.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
diff --git a/com.discord/smali/android/support/v4/media/session/b$a$a.smali b/com.discord/smali/android/support/v4/media/session/b$a$a.smali
index 944faa868c..444783b788 100644
--- a/com.discord/smali/android/support/v4/media/session/b$a$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/b$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/b$a$a;
 .super Ljava/lang/Object;
+.source "IMediaSession.java"
 
 # interfaces
 .implements Landroid/support/v4/media/session/b;
@@ -777,15 +778,25 @@
 
     invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
     iget-object p1, p0, Landroid/support/v4/media/session/b$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v2, 0x2e
+    const/16 v3, 0x2e
 
-    const/4 v3, 0x0
-
-    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
     invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
     :try_end_0
@@ -1006,15 +1017,25 @@
 
     invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
     iget-object p1, p0, Landroid/support/v4/media/session/b$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v2, 0x28
+    const/16 v3, 0x28
 
-    const/4 v3, 0x0
-
-    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
     invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
     :try_end_0
diff --git a/com.discord/smali/android/support/v4/media/session/b$a.smali b/com.discord/smali/android/support/v4/media/session/b$a.smali
index 44fbb05e54..551e39a2d6 100644
--- a/com.discord/smali/android/support/v4/media/session/b$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/b$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/v4/media/session/b$a;
 .super Landroid/os/Binder;
+.source "IMediaSession.java"
 
 # interfaces
 .implements Landroid/support/v4/media/session/b;
diff --git a/com.discord/smali/android/support/v4/media/session/b.smali b/com.discord/smali/android/support/v4/media/session/b.smali
index 012f72c787..b796c7a674 100644
--- a/com.discord/smali/android/support/v4/media/session/b.smali
+++ b/com.discord/smali/android/support/v4/media/session/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/v4/media/session/b;
 .super Ljava/lang/Object;
+.source "IMediaSession.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
diff --git a/com.discord/smali/android/support/v4/media/session/c$a.smali b/com.discord/smali/android/support/v4/media/session/c$a.smali
index d8cb238227..e026b4d915 100644
--- a/com.discord/smali/android/support/v4/media/session/c$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/c$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/v4/media/session/c$a;
 .super Ljava/lang/Object;
+.source "MediaControllerCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/c$b.smali b/com.discord/smali/android/support/v4/media/session/c$b.smali
index 75a76e92e8..723536b545 100644
--- a/com.discord/smali/android/support/v4/media/session/c$b.smali
+++ b/com.discord/smali/android/support/v4/media/session/c$b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/c$b;
 .super Landroid/media/session/MediaController$Callback;
+.source "MediaControllerCompatApi21.java"
 
 
 # annotations
@@ -105,39 +106,43 @@
 
     packed-switch v2, :pswitch_data_0
 
-    :pswitch_0
     const/4 v2, 0x3
 
     goto :goto_0
 
-    :pswitch_1
+    :pswitch_0
     const/4 v2, 0x1
 
     goto :goto_0
 
-    :pswitch_2
+    :pswitch_1
     const/4 v2, 0x2
 
     goto :goto_0
 
-    :pswitch_3
+    :pswitch_2
     const/4 v2, 0x5
 
     goto :goto_0
 
-    :pswitch_4
+    :pswitch_3
     const/4 v2, 0x4
 
     goto :goto_0
 
-    :pswitch_5
+    :pswitch_4
     const/16 v2, 0x8
 
     goto :goto_0
 
-    :pswitch_6
+    :pswitch_5
     const/4 v2, 0x0
 
+    goto :goto_0
+
+    :pswitch_6
+    const/4 v2, 0x3
+
     :goto_0
     invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getVolumeControl()I
 
@@ -159,20 +164,20 @@
 
     :pswitch_data_0
     .packed-switch 0x1
-        :pswitch_0
         :pswitch_6
         :pswitch_5
         :pswitch_4
         :pswitch_3
         :pswitch_2
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-        :pswitch_0
-        :pswitch_0
         :pswitch_1
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_6
+        :pswitch_6
         :pswitch_0
+        :pswitch_6
     .end packed-switch
 .end method
 
diff --git a/com.discord/smali/android/support/v4/media/session/c.smali b/com.discord/smali/android/support/v4/media/session/c.smali
index 1fb6975b82..9d1232d111 100644
--- a/com.discord/smali/android/support/v4/media/session/c.smali
+++ b/com.discord/smali/android/support/v4/media/session/c.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/c;
 .super Ljava/lang/Object;
+.source "MediaControllerCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/media/session/d.smali b/com.discord/smali/android/support/v4/media/session/d.smali
index 356e3c9924..4399255fad 100644
--- a/com.discord/smali/android/support/v4/media/session/d.smali
+++ b/com.discord/smali/android/support/v4/media/session/d.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/media/session/d;
 .super Ljava/lang/Object;
+.source "MediaSessionCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/os/ResultReceiver$1.smali b/com.discord/smali/android/support/v4/os/ResultReceiver$1.smali
index 003aab3c55..fe4b67edc0 100644
--- a/com.discord/smali/android/support/v4/os/ResultReceiver$1.smali
+++ b/com.discord/smali/android/support/v4/os/ResultReceiver$1.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/os/ResultReceiver$1;
 .super Ljava/lang/Object;
+.source "ResultReceiver.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/android/support/v4/os/ResultReceiver$a.smali b/com.discord/smali/android/support/v4/os/ResultReceiver$a.smali
index a76d72c90c..c5d6ae29c1 100644
--- a/com.discord/smali/android/support/v4/os/ResultReceiver$a.smali
+++ b/com.discord/smali/android/support/v4/os/ResultReceiver$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/os/ResultReceiver$a;
 .super Landroid/support/v4/os/a$a;
+.source "ResultReceiver.java"
 
 
 # annotations
diff --git a/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali b/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali
index a342c06737..a315d562a5 100644
--- a/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali
+++ b/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/os/ResultReceiver$b;
 .super Ljava/lang/Object;
+.source "ResultReceiver.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/android/support/v4/os/ResultReceiver.smali b/com.discord/smali/android/support/v4/os/ResultReceiver.smali
index 1566d47ae8..e3b4de0e90 100644
--- a/com.discord/smali/android/support/v4/os/ResultReceiver.smali
+++ b/com.discord/smali/android/support/v4/os/ResultReceiver.smali
@@ -1,5 +1,6 @@
 .class public Landroid/support/v4/os/ResultReceiver;
 .super Ljava/lang/Object;
+.source "ResultReceiver.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -106,8 +107,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver;->mHandler:Landroid/os/Handler;
-
     new-instance v1, Landroid/support/v4/os/ResultReceiver$b;
 
     invoke-direct {v1, p0, p1, p2}, Landroid/support/v4/os/ResultReceiver$b;-><init>(Landroid/support/v4/os/ResultReceiver;ILandroid/os/Bundle;)V
@@ -127,12 +126,12 @@
     if-eqz v0, :cond_2
 
     :try_start_0
-    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver;->ba:Landroid/support/v4/os/a;
-
     invoke-interface {v0, p1, p2}, Landroid/support/v4/os/a;->send(ILandroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_2
     return-void
diff --git a/com.discord/smali/android/support/v4/os/a$a$a.smali b/com.discord/smali/android/support/v4/os/a$a$a.smali
index 644b7bf6f1..7ec84338ec 100644
--- a/com.discord/smali/android/support/v4/os/a$a$a.smali
+++ b/com.discord/smali/android/support/v4/os/a$a$a.smali
@@ -1,5 +1,6 @@
 .class final Landroid/support/v4/os/a$a$a;
 .super Ljava/lang/Object;
+.source "IResultReceiver.java"
 
 # interfaces
 .implements Landroid/support/v4/os/a;
diff --git a/com.discord/smali/android/support/v4/os/a$a.smali b/com.discord/smali/android/support/v4/os/a$a.smali
index ceca5c3de9..6cf9b32e69 100644
--- a/com.discord/smali/android/support/v4/os/a$a.smali
+++ b/com.discord/smali/android/support/v4/os/a$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroid/support/v4/os/a$a;
 .super Landroid/os/Binder;
+.source "IResultReceiver.java"
 
 # interfaces
 .implements Landroid/support/v4/os/a;
diff --git a/com.discord/smali/android/support/v4/os/a.smali b/com.discord/smali/android/support/v4/os/a.smali
index 1717d8602b..49b5fbe533 100644
--- a/com.discord/smali/android/support/v4/os/a.smali
+++ b/com.discord/smali/android/support/v4/os/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroid/support/v4/os/a;
 .super Ljava/lang/Object;
+.source "IResultReceiver.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
diff --git a/com.discord/smali/androidx/annotation/AnimRes.smali b/com.discord/smali/androidx/annotation/AnimRes.smali
index 6b9290dea8..6acede1406 100644
--- a/com.discord/smali/androidx/annotation/AnimRes.smali
+++ b/com.discord/smali/androidx/annotation/AnimRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/AnimRes;
 .super Ljava/lang/Object;
+.source "AnimRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/AnimatorRes.smali b/com.discord/smali/androidx/annotation/AnimatorRes.smali
index 54d4502a10..426ad599b5 100644
--- a/com.discord/smali/androidx/annotation/AnimatorRes.smali
+++ b/com.discord/smali/androidx/annotation/AnimatorRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/AnimatorRes;
 .super Ljava/lang/Object;
+.source "AnimatorRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/AnyRes.smali b/com.discord/smali/androidx/annotation/AnyRes.smali
index b501158172..ffee14719e 100644
--- a/com.discord/smali/androidx/annotation/AnyRes.smali
+++ b/com.discord/smali/androidx/annotation/AnyRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/AnyRes;
 .super Ljava/lang/Object;
+.source "AnyRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/AnyThread.smali b/com.discord/smali/androidx/annotation/AnyThread.smali
index 83c47670b1..bbabb0fbe6 100644
--- a/com.discord/smali/androidx/annotation/AnyThread.smali
+++ b/com.discord/smali/androidx/annotation/AnyThread.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/AnyThread;
 .super Ljava/lang/Object;
+.source "AnyThread.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/ArrayRes.smali b/com.discord/smali/androidx/annotation/ArrayRes.smali
index 940b6c89b3..e6ed43b99e 100644
--- a/com.discord/smali/androidx/annotation/ArrayRes.smali
+++ b/com.discord/smali/androidx/annotation/ArrayRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/ArrayRes;
 .super Ljava/lang/Object;
+.source "ArrayRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/AttrRes.smali b/com.discord/smali/androidx/annotation/AttrRes.smali
index 8002683cb7..9436633080 100644
--- a/com.discord/smali/androidx/annotation/AttrRes.smali
+++ b/com.discord/smali/androidx/annotation/AttrRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/AttrRes;
 .super Ljava/lang/Object;
+.source "AttrRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/BinderThread.smali b/com.discord/smali/androidx/annotation/BinderThread.smali
index cf533e0c65..2be8d40d2a 100644
--- a/com.discord/smali/androidx/annotation/BinderThread.smali
+++ b/com.discord/smali/androidx/annotation/BinderThread.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/BinderThread;
 .super Ljava/lang/Object;
+.source "BinderThread.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/BoolRes.smali b/com.discord/smali/androidx/annotation/BoolRes.smali
index ae4bd53f3e..4ba5a462e8 100644
--- a/com.discord/smali/androidx/annotation/BoolRes.smali
+++ b/com.discord/smali/androidx/annotation/BoolRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/BoolRes;
 .super Ljava/lang/Object;
+.source "BoolRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/CallSuper.smali b/com.discord/smali/androidx/annotation/CallSuper.smali
index d770b2f1f5..e43b9c95ad 100644
--- a/com.discord/smali/androidx/annotation/CallSuper.smali
+++ b/com.discord/smali/androidx/annotation/CallSuper.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/CallSuper;
 .super Ljava/lang/Object;
+.source "CallSuper.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/CheckResult.smali b/com.discord/smali/androidx/annotation/CheckResult.smali
index c06131757e..0b7a697e1f 100644
--- a/com.discord/smali/androidx/annotation/CheckResult.smali
+++ b/com.discord/smali/androidx/annotation/CheckResult.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/CheckResult;
 .super Ljava/lang/Object;
+.source "CheckResult.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/ColorInt.smali b/com.discord/smali/androidx/annotation/ColorInt.smali
index bc3491ee18..2f175b11f4 100644
--- a/com.discord/smali/androidx/annotation/ColorInt.smali
+++ b/com.discord/smali/androidx/annotation/ColorInt.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/ColorInt;
 .super Ljava/lang/Object;
+.source "ColorInt.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/ColorLong.smali b/com.discord/smali/androidx/annotation/ColorLong.smali
index 04f5b6ac95..c063735cdb 100644
--- a/com.discord/smali/androidx/annotation/ColorLong.smali
+++ b/com.discord/smali/androidx/annotation/ColorLong.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/ColorLong;
 .super Ljava/lang/Object;
+.source "ColorLong.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/ColorRes.smali b/com.discord/smali/androidx/annotation/ColorRes.smali
index 2972faf903..c5ffe82cfa 100644
--- a/com.discord/smali/androidx/annotation/ColorRes.smali
+++ b/com.discord/smali/androidx/annotation/ColorRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/ColorRes;
 .super Ljava/lang/Object;
+.source "ColorRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/DimenRes.smali b/com.discord/smali/androidx/annotation/DimenRes.smali
index 846b15dba7..94ab0e77bb 100644
--- a/com.discord/smali/androidx/annotation/DimenRes.smali
+++ b/com.discord/smali/androidx/annotation/DimenRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/DimenRes;
 .super Ljava/lang/Object;
+.source "DimenRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/Dimension.smali b/com.discord/smali/androidx/annotation/Dimension.smali
index 1bfb862021..30262b18f7 100644
--- a/com.discord/smali/androidx/annotation/Dimension.smali
+++ b/com.discord/smali/androidx/annotation/Dimension.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/Dimension;
 .super Ljava/lang/Object;
+.source "Dimension.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/DrawableRes.smali b/com.discord/smali/androidx/annotation/DrawableRes.smali
index b57f54cf35..1490f039dd 100644
--- a/com.discord/smali/androidx/annotation/DrawableRes.smali
+++ b/com.discord/smali/androidx/annotation/DrawableRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/DrawableRes;
 .super Ljava/lang/Object;
+.source "DrawableRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/FloatRange.smali b/com.discord/smali/androidx/annotation/FloatRange.smali
index 7dcc6910fe..a99420bf64 100644
--- a/com.discord/smali/androidx/annotation/FloatRange.smali
+++ b/com.discord/smali/androidx/annotation/FloatRange.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/FloatRange;
 .super Ljava/lang/Object;
+.source "FloatRange.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/FontRes.smali b/com.discord/smali/androidx/annotation/FontRes.smali
index e362d2d5d1..af5a6597c5 100644
--- a/com.discord/smali/androidx/annotation/FontRes.smali
+++ b/com.discord/smali/androidx/annotation/FontRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/FontRes;
 .super Ljava/lang/Object;
+.source "FontRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/FractionRes.smali b/com.discord/smali/androidx/annotation/FractionRes.smali
index 656ab5cfae..31d228f29d 100644
--- a/com.discord/smali/androidx/annotation/FractionRes.smali
+++ b/com.discord/smali/androidx/annotation/FractionRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/FractionRes;
 .super Ljava/lang/Object;
+.source "FractionRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/GuardedBy.smali b/com.discord/smali/androidx/annotation/GuardedBy.smali
index 17e6135345..975c7959c5 100644
--- a/com.discord/smali/androidx/annotation/GuardedBy.smali
+++ b/com.discord/smali/androidx/annotation/GuardedBy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/GuardedBy;
 .super Ljava/lang/Object;
+.source "GuardedBy.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/HalfFloat.smali b/com.discord/smali/androidx/annotation/HalfFloat.smali
index 1401525a0f..c2082a78f9 100644
--- a/com.discord/smali/androidx/annotation/HalfFloat.smali
+++ b/com.discord/smali/androidx/annotation/HalfFloat.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/HalfFloat;
 .super Ljava/lang/Object;
+.source "HalfFloat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/IdRes.smali b/com.discord/smali/androidx/annotation/IdRes.smali
index 156d936c6c..d9f928dbfd 100644
--- a/com.discord/smali/androidx/annotation/IdRes.smali
+++ b/com.discord/smali/androidx/annotation/IdRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/IdRes;
 .super Ljava/lang/Object;
+.source "IdRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/IntDef.smali b/com.discord/smali/androidx/annotation/IntDef.smali
index 09ec6f3594..d743b1bea4 100644
--- a/com.discord/smali/androidx/annotation/IntDef.smali
+++ b/com.discord/smali/androidx/annotation/IntDef.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/IntDef;
 .super Ljava/lang/Object;
+.source "IntDef.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/IntRange.smali b/com.discord/smali/androidx/annotation/IntRange.smali
index 67ced75f55..8882acd9e9 100644
--- a/com.discord/smali/androidx/annotation/IntRange.smali
+++ b/com.discord/smali/androidx/annotation/IntRange.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/IntRange;
 .super Ljava/lang/Object;
+.source "IntRange.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/IntegerRes.smali b/com.discord/smali/androidx/annotation/IntegerRes.smali
index 3daaa11c68..b4c5cb6fc2 100644
--- a/com.discord/smali/androidx/annotation/IntegerRes.smali
+++ b/com.discord/smali/androidx/annotation/IntegerRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/IntegerRes;
 .super Ljava/lang/Object;
+.source "IntegerRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/InterpolatorRes.smali b/com.discord/smali/androidx/annotation/InterpolatorRes.smali
index 98168f1079..6bc84d0874 100644
--- a/com.discord/smali/androidx/annotation/InterpolatorRes.smali
+++ b/com.discord/smali/androidx/annotation/InterpolatorRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/InterpolatorRes;
 .super Ljava/lang/Object;
+.source "InterpolatorRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/Keep.smali b/com.discord/smali/androidx/annotation/Keep.smali
index 73c3e6d84d..2af037d1b4 100644
--- a/com.discord/smali/androidx/annotation/Keep.smali
+++ b/com.discord/smali/androidx/annotation/Keep.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/Keep;
 .super Ljava/lang/Object;
+.source "Keep.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/LayoutRes.smali b/com.discord/smali/androidx/annotation/LayoutRes.smali
index 46a9c08d3f..e27dbf9916 100644
--- a/com.discord/smali/androidx/annotation/LayoutRes.smali
+++ b/com.discord/smali/androidx/annotation/LayoutRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/LayoutRes;
 .super Ljava/lang/Object;
+.source "LayoutRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/LongDef.smali b/com.discord/smali/androidx/annotation/LongDef.smali
index 06a5e1cd48..625ad9041b 100644
--- a/com.discord/smali/androidx/annotation/LongDef.smali
+++ b/com.discord/smali/androidx/annotation/LongDef.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/LongDef;
 .super Ljava/lang/Object;
+.source "LongDef.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/MainThread.smali b/com.discord/smali/androidx/annotation/MainThread.smali
index e775750523..46b1cd22d1 100644
--- a/com.discord/smali/androidx/annotation/MainThread.smali
+++ b/com.discord/smali/androidx/annotation/MainThread.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/MainThread;
 .super Ljava/lang/Object;
+.source "MainThread.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/MenuRes.smali b/com.discord/smali/androidx/annotation/MenuRes.smali
index 32bcbe82bb..cd6f8982be 100644
--- a/com.discord/smali/androidx/annotation/MenuRes.smali
+++ b/com.discord/smali/androidx/annotation/MenuRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/MenuRes;
 .super Ljava/lang/Object;
+.source "MenuRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/NavigationRes.smali b/com.discord/smali/androidx/annotation/NavigationRes.smali
index fa83c0b39c..d6233501cb 100644
--- a/com.discord/smali/androidx/annotation/NavigationRes.smali
+++ b/com.discord/smali/androidx/annotation/NavigationRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/NavigationRes;
 .super Ljava/lang/Object;
+.source "NavigationRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/NonNull.smali b/com.discord/smali/androidx/annotation/NonNull.smali
index f7d4eeac38..a3ef3b6296 100644
--- a/com.discord/smali/androidx/annotation/NonNull.smali
+++ b/com.discord/smali/androidx/annotation/NonNull.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/NonNull;
 .super Ljava/lang/Object;
+.source "NonNull.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/Nullable.smali b/com.discord/smali/androidx/annotation/Nullable.smali
index 4313d67480..01a6e72fd5 100644
--- a/com.discord/smali/androidx/annotation/Nullable.smali
+++ b/com.discord/smali/androidx/annotation/Nullable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/Nullable;
 .super Ljava/lang/Object;
+.source "Nullable.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/PluralsRes.smali b/com.discord/smali/androidx/annotation/PluralsRes.smali
index 3aa96bccd2..cdee48da2a 100644
--- a/com.discord/smali/androidx/annotation/PluralsRes.smali
+++ b/com.discord/smali/androidx/annotation/PluralsRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/PluralsRes;
 .super Ljava/lang/Object;
+.source "PluralsRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/Px.smali b/com.discord/smali/androidx/annotation/Px.smali
index 411a8c0931..b0c1fe76f8 100644
--- a/com.discord/smali/androidx/annotation/Px.smali
+++ b/com.discord/smali/androidx/annotation/Px.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/Px;
 .super Ljava/lang/Object;
+.source "Px.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/RawRes.smali b/com.discord/smali/androidx/annotation/RawRes.smali
index 528ac72a49..41377a4abc 100644
--- a/com.discord/smali/androidx/annotation/RawRes.smali
+++ b/com.discord/smali/androidx/annotation/RawRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/RawRes;
 .super Ljava/lang/Object;
+.source "RawRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/RequiresApi.smali b/com.discord/smali/androidx/annotation/RequiresApi.smali
index a2dc1a5060..c1c7feeb1a 100644
--- a/com.discord/smali/androidx/annotation/RequiresApi.smali
+++ b/com.discord/smali/androidx/annotation/RequiresApi.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/RequiresApi;
 .super Ljava/lang/Object;
+.source "RequiresApi.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/RequiresFeature.smali b/com.discord/smali/androidx/annotation/RequiresFeature.smali
index e1503a60e9..f1eb83e914 100644
--- a/com.discord/smali/androidx/annotation/RequiresFeature.smali
+++ b/com.discord/smali/androidx/annotation/RequiresFeature.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/RequiresFeature;
 .super Ljava/lang/Object;
+.source "RequiresFeature.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/RequiresPermission$Read.smali b/com.discord/smali/androidx/annotation/RequiresPermission$Read.smali
index 315c2b902f..3c7ccb45eb 100644
--- a/com.discord/smali/androidx/annotation/RequiresPermission$Read.smali
+++ b/com.discord/smali/androidx/annotation/RequiresPermission$Read.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/RequiresPermission$Read;
 .super Ljava/lang/Object;
+.source "RequiresPermission.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/RequiresPermission$Write.smali b/com.discord/smali/androidx/annotation/RequiresPermission$Write.smali
index c7caca222a..3f04483e12 100644
--- a/com.discord/smali/androidx/annotation/RequiresPermission$Write.smali
+++ b/com.discord/smali/androidx/annotation/RequiresPermission$Write.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/RequiresPermission$Write;
 .super Ljava/lang/Object;
+.source "RequiresPermission.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/RequiresPermission.smali b/com.discord/smali/androidx/annotation/RequiresPermission.smali
index 3a7d1eb086..367d462659 100644
--- a/com.discord/smali/androidx/annotation/RequiresPermission.smali
+++ b/com.discord/smali/androidx/annotation/RequiresPermission.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/RequiresPermission;
 .super Ljava/lang/Object;
+.source "RequiresPermission.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/RestrictTo$Scope.smali b/com.discord/smali/androidx/annotation/RestrictTo$Scope.smali
index f37374a73c..27254de843 100644
--- a/com.discord/smali/androidx/annotation/RestrictTo$Scope.smali
+++ b/com.discord/smali/androidx/annotation/RestrictTo$Scope.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/annotation/RestrictTo$Scope;
 .super Ljava/lang/Enum;
+.source "RestrictTo.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/annotation/RestrictTo.smali b/com.discord/smali/androidx/annotation/RestrictTo.smali
index 8178410817..c49f94def8 100644
--- a/com.discord/smali/androidx/annotation/RestrictTo.smali
+++ b/com.discord/smali/androidx/annotation/RestrictTo.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/RestrictTo;
 .super Ljava/lang/Object;
+.source "RestrictTo.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/Size.smali b/com.discord/smali/androidx/annotation/Size.smali
index 86bf401835..deb4e3553c 100644
--- a/com.discord/smali/androidx/annotation/Size.smali
+++ b/com.discord/smali/androidx/annotation/Size.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/Size;
 .super Ljava/lang/Object;
+.source "Size.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/StringDef.smali b/com.discord/smali/androidx/annotation/StringDef.smali
index cff731cdb3..45b5ae7a0a 100644
--- a/com.discord/smali/androidx/annotation/StringDef.smali
+++ b/com.discord/smali/androidx/annotation/StringDef.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/StringDef;
 .super Ljava/lang/Object;
+.source "StringDef.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/StringRes.smali b/com.discord/smali/androidx/annotation/StringRes.smali
index 2ecf88d42e..fb5affaf11 100644
--- a/com.discord/smali/androidx/annotation/StringRes.smali
+++ b/com.discord/smali/androidx/annotation/StringRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/StringRes;
 .super Ljava/lang/Object;
+.source "StringRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/StyleRes.smali b/com.discord/smali/androidx/annotation/StyleRes.smali
index aab36c0b32..06da717ed6 100644
--- a/com.discord/smali/androidx/annotation/StyleRes.smali
+++ b/com.discord/smali/androidx/annotation/StyleRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/StyleRes;
 .super Ljava/lang/Object;
+.source "StyleRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/StyleableRes.smali b/com.discord/smali/androidx/annotation/StyleableRes.smali
index 6d93ae091a..6c554b166e 100644
--- a/com.discord/smali/androidx/annotation/StyleableRes.smali
+++ b/com.discord/smali/androidx/annotation/StyleableRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/StyleableRes;
 .super Ljava/lang/Object;
+.source "StyleableRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/TransitionRes.smali b/com.discord/smali/androidx/annotation/TransitionRes.smali
index 08c1769c83..f901506aad 100644
--- a/com.discord/smali/androidx/annotation/TransitionRes.smali
+++ b/com.discord/smali/androidx/annotation/TransitionRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/TransitionRes;
 .super Ljava/lang/Object;
+.source "TransitionRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/UiThread.smali b/com.discord/smali/androidx/annotation/UiThread.smali
index 14767a770d..1d0007fc5d 100644
--- a/com.discord/smali/androidx/annotation/UiThread.smali
+++ b/com.discord/smali/androidx/annotation/UiThread.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/UiThread;
 .super Ljava/lang/Object;
+.source "UiThread.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/VisibleForTesting.smali b/com.discord/smali/androidx/annotation/VisibleForTesting.smali
index 339fdd77ab..b3cf6715df 100644
--- a/com.discord/smali/androidx/annotation/VisibleForTesting.smali
+++ b/com.discord/smali/androidx/annotation/VisibleForTesting.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/VisibleForTesting;
 .super Ljava/lang/Object;
+.source "VisibleForTesting.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/WorkerThread.smali b/com.discord/smali/androidx/annotation/WorkerThread.smali
index e5abd0ff74..049f5efc55 100644
--- a/com.discord/smali/androidx/annotation/WorkerThread.smali
+++ b/com.discord/smali/androidx/annotation/WorkerThread.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/WorkerThread;
 .super Ljava/lang/Object;
+.source "WorkerThread.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/annotation/XmlRes.smali b/com.discord/smali/androidx/annotation/XmlRes.smali
index 06d0f124fc..561efddf2e 100644
--- a/com.discord/smali/androidx/annotation/XmlRes.smali
+++ b/com.discord/smali/androidx/annotation/XmlRes.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/annotation/XmlRes;
 .super Ljava/lang/Object;
+.source "XmlRes.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/R$anim.smali b/com.discord/smali/androidx/appcompat/R$anim.smali
index 158f774223..583c64f61a 100644
--- a/com.discord/smali/androidx/appcompat/R$anim.smali
+++ b/com.discord/smali/androidx/appcompat/R$anim.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$anim;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$attr.smali b/com.discord/smali/androidx/appcompat/R$attr.smali
index 717993ff4b..89bd5c8b93 100644
--- a/com.discord/smali/androidx/appcompat/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$bool.smali b/com.discord/smali/androidx/appcompat/R$bool.smali
index 0c72e65f3c..751f6f596c 100644
--- a/com.discord/smali/androidx/appcompat/R$bool.smali
+++ b/com.discord/smali/androidx/appcompat/R$bool.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$bool;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$color.smali b/com.discord/smali/androidx/appcompat/R$color.smali
index eb0b193034..dcf192dc54 100644
--- a/com.discord/smali/androidx/appcompat/R$color.smali
+++ b/com.discord/smali/androidx/appcompat/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$dimen.smali b/com.discord/smali/androidx/appcompat/R$dimen.smali
index 331182fa2c..156c9c463e 100644
--- a/com.discord/smali/androidx/appcompat/R$dimen.smali
+++ b/com.discord/smali/androidx/appcompat/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index b44861c3bd..e797ab1374 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index c2adef35ef..8eb4e9945d 100644
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$integer.smali b/com.discord/smali/androidx/appcompat/R$integer.smali
index 090a57202c..654b04d697 100644
--- a/com.discord/smali/androidx/appcompat/R$integer.smali
+++ b/com.discord/smali/androidx/appcompat/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$layout.smali b/com.discord/smali/androidx/appcompat/R$layout.smali
index 43997efb00..5d8d551457 100644
--- a/com.discord/smali/androidx/appcompat/R$layout.smali
+++ b/com.discord/smali/androidx/appcompat/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index c4767990c2..82a05ccc9f 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$style.smali b/com.discord/smali/androidx/appcompat/R$style.smali
index 3bdc03cec8..48cb74dc44 100644
--- a/com.discord/smali/androidx/appcompat/R$style.smali
+++ b/com.discord/smali/androidx/appcompat/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R$styleable.smali b/com.discord/smali/androidx/appcompat/R$styleable.smali
index 16f1f9acc1..82de59792e 100644
--- a/com.discord/smali/androidx/appcompat/R$styleable.smali
+++ b/com.discord/smali/androidx/appcompat/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/R.smali b/com.discord/smali/androidx/appcompat/R.smali
index 1b19ef901a..eb1cd52d24 100644
--- a/com.discord/smali/androidx/appcompat/R.smali
+++ b/com.discord/smali/androidx/appcompat/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar$DisplayOptions.smali b/com.discord/smali/androidx/appcompat/app/ActionBar$DisplayOptions.smali
index 2586721960..aaa0a23e68 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar$DisplayOptions.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar$DisplayOptions.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/appcompat/app/ActionBar$DisplayOptions;
 .super Ljava/lang/Object;
+.source "ActionBar.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar$LayoutParams.smali b/com.discord/smali/androidx/appcompat/app/ActionBar$LayoutParams.smali
index 509fb4fda1..0d753383cb 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar$LayoutParams.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/ActionBar$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "ActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar$NavigationMode.smali b/com.discord/smali/androidx/appcompat/app/ActionBar$NavigationMode.smali
index 1fa2453be5..1d6520c35d 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar$NavigationMode.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar$NavigationMode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/appcompat/app/ActionBar$NavigationMode;
 .super Ljava/lang/Object;
+.source "ActionBar.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar$OnMenuVisibilityListener.smali b/com.discord/smali/androidx/appcompat/app/ActionBar$OnMenuVisibilityListener.smali
index d8a2736ae9..22a45e8b35 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar$OnMenuVisibilityListener.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar$OnMenuVisibilityListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/app/ActionBar$OnMenuVisibilityListener;
 .super Ljava/lang/Object;
+.source "ActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar$OnNavigationListener.smali b/com.discord/smali/androidx/appcompat/app/ActionBar$OnNavigationListener.smali
index 44d8a502c3..79ef87cb0b 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar$OnNavigationListener.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar$OnNavigationListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/app/ActionBar$OnNavigationListener;
 .super Ljava/lang/Object;
+.source "ActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar$Tab.smali b/com.discord/smali/androidx/appcompat/app/ActionBar$Tab.smali
index 8533574cfa..7730eb7a5d 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar$Tab.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar$Tab.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/appcompat/app/ActionBar$Tab;
 .super Ljava/lang/Object;
+.source "ActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar$TabListener.smali b/com.discord/smali/androidx/appcompat/app/ActionBar$TabListener.smali
index 470278fd68..f8b6433884 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar$TabListener.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar$TabListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/app/ActionBar$TabListener;
 .super Ljava/lang/Object;
+.source "ActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBar.smali b/com.discord/smali/androidx/appcompat/app/ActionBar.smali
index 854752f4f4..1ef1ea8d93 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBar.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBar.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/appcompat/app/ActionBar;
 .super Ljava/lang/Object;
+.source "ActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$1.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$1.smali
index cb06e0a71c..b95f13c1ee 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ActionBarDrawerToggle$1;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$Delegate.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$Delegate.smali
index 8b5aac8650..91482b78f5 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$Delegate.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$Delegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$DelegateProvider.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$DelegateProvider.smali
index 159b984a1d..461a888305 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$DelegateProvider.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$DelegateProvider.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/app/ActionBarDrawerToggle$DelegateProvider;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$FrameworkActionBarDelegate.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$FrameworkActionBarDelegate.smali
index 445426296a..a3812c0a40 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$FrameworkActionBarDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$FrameworkActionBarDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ActionBarDrawerToggle$FrameworkActionBarDelegate;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 # interfaces
 .implements Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali
index ca9c80c214..2db1362293 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ActionBarDrawerToggle$ToolbarCompatDelegate;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 # interfaces
 .implements Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle.smali
index bf74195c7b..99b999830a 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/ActionBarDrawerToggle;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 # interfaces
 .implements Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
@@ -211,10 +212,9 @@
 
     const/4 v1, 0x1
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setVerticalMirror(Z)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
@@ -227,10 +227,10 @@
 
     const/4 v1, 0x0
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setVerticalMirror(Z)V
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Landroidx/appcompat/app/ActionBarDrawerToggle;->mSlider:Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;
 
     invoke-virtual {v0, p1}, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setProgress(F)V
@@ -492,16 +492,19 @@
     :cond_0
     iget v1, p0, Landroidx/appcompat/app/ActionBarDrawerToggle;->mOpenDrawerContentDescRes:I
 
-    goto :goto_0
+    :goto_0
+    invoke-virtual {p0, v0, v1}, Landroidx/appcompat/app/ActionBarDrawerToggle;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
+
+    goto :goto_1
 
     :cond_1
     iget-object v0, p0, Landroidx/appcompat/app/ActionBarDrawerToggle;->mHomeAsUpIndicator:Landroid/graphics/drawable/Drawable;
 
     const/4 v1, 0x0
 
-    :goto_0
     invoke-virtual {p0, v0, v1}, Landroidx/appcompat/app/ActionBarDrawerToggle;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
 
+    :goto_1
     iput-boolean p1, p0, Landroidx/appcompat/app/ActionBarDrawerToggle;->mDrawerIndicatorEnabled:Z
 
     :cond_2
@@ -609,17 +612,16 @@
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    :goto_0
     invoke-direct {p0, v0}, Landroidx/appcompat/app/ActionBarDrawerToggle;->setPosition(F)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Landroidx/appcompat/app/ActionBarDrawerToggle;->setPosition(F)V
 
-    :goto_1
+    :goto_0
     iget-boolean v0, p0, Landroidx/appcompat/app/ActionBarDrawerToggle;->mDrawerIndicatorEnabled:Z
 
     if-eqz v0, :cond_2
@@ -636,12 +638,12 @@
 
     iget v1, p0, Landroidx/appcompat/app/ActionBarDrawerToggle;->mCloseDrawerContentDescRes:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget v1, p0, Landroidx/appcompat/app/ActionBarDrawerToggle;->mOpenDrawerContentDescRes:I
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, v0, v1}, Landroidx/appcompat/app/ActionBarDrawerToggle;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
 
     :cond_2
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali
index b2c7226a13..0d3286eba2 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggleHoneycomb.java"
 
 
 # annotations
@@ -119,6 +120,8 @@
     move-object p1, v0
 
     :goto_0
+    nop
+
     instance-of v0, p1, Landroid/widget/ImageView;
 
     if-eqz v0, :cond_3
diff --git a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.smali b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.smali
index 2d55e240a5..f3463226f7 100644
--- a/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.smali
+++ b/com.discord/smali/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ActionBarDrawerToggleHoneycomb;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggleHoneycomb.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$1.smali b/com.discord/smali/androidx/appcompat/app/AlertController$1.smali
index 893aed1c37..ba5ee1a70a 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$1;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -52,12 +53,11 @@
 
     iget-object p1, p1, Landroidx/appcompat/app/AlertController;->mButtonPositiveMessage:Landroid/os/Message;
 
-    :goto_0
     invoke-static {p1}, Landroid/os/Message;->obtain(Landroid/os/Message;)Landroid/os/Message;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/app/AlertController$1;->this$0:Landroidx/appcompat/app/AlertController;
@@ -76,6 +76,10 @@
 
     iget-object p1, p1, Landroidx/appcompat/app/AlertController;->mButtonNegativeMessage:Landroid/os/Message;
 
+    invoke-static {p1}, Landroid/os/Message;->obtain(Landroid/os/Message;)Landroid/os/Message;
+
+    move-result-object p1
+
     goto :goto_0
 
     :cond_1
@@ -95,12 +99,16 @@
 
     iget-object p1, p1, Landroidx/appcompat/app/AlertController;->mButtonNeutralMessage:Landroid/os/Message;
 
+    invoke-static {p1}, Landroid/os/Message;->obtain(Landroid/os/Message;)Landroid/os/Message;
+
+    move-result-object p1
+
     goto :goto_0
 
     :cond_2
     const/4 p1, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz p1, :cond_3
 
     invoke-virtual {p1}, Landroid/os/Message;->sendToTarget()V
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$2.smali b/com.discord/smali/androidx/appcompat/app/AlertController$2.smali
index a8867f5a25..4483165023 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$2.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$2;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 # interfaces
 .implements Landroidx/core/widget/NestedScrollView$OnScrollChangeListener;
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$3.smali b/com.discord/smali/androidx/appcompat/app/AlertController$3.smali
index 73d810ddb5..39e37384d9 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$3.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$3;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$4.smali b/com.discord/smali/androidx/appcompat/app/AlertController$4.smali
index e52f1b3079..7b9523e776 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$4.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$4;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 # interfaces
 .implements Landroid/widget/AbsListView$OnScrollListener;
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$5.smali b/com.discord/smali/androidx/appcompat/app/AlertController$5.smali
index d1450d1e9f..fe64b6a01e 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$5.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$5;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$1.smali b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$1.smali
index 16b70337bd..885e9f5c16 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$AlertParams$1;
 .super Landroid/widget/ArrayAdapter;
+.source "AlertController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$2.smali b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$2.smali
index 78356c58d9..79745bcb0b 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$2.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$AlertParams$2;
 .super Landroid/widget/CursorAdapter;
+.source "AlertController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$3.smali b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$3.smali
index 60399d1e0f..90c3dffdfc 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$3.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$AlertParams$3;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$4.smali b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$4.smali
index cf9354c959..4d6560fa2d 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$4.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$AlertParams$4;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener.smali b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener.smali
index 4093d8fc7d..7da5192452 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams.smali b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams.smali
index 4b46464c81..775d1243d6 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$AlertParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AlertController$AlertParams;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 
 # annotations
@@ -147,7 +148,7 @@
 .end method
 
 .method private createListView(Landroidx/appcompat/app/AlertController;)V
-    .locals 10
+    .locals 11
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mInflater:Landroid/view/LayoutInflater;
 
@@ -167,9 +168,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
+    iget-object v4, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
 
-    if-nez v1, :cond_0
+    if-nez v4, :cond_0
 
     new-instance v9, Landroidx/appcompat/app/AlertController$AlertParams$1;
 
@@ -189,15 +190,13 @@
 
     invoke-direct/range {v1 .. v7}, Landroidx/appcompat/app/AlertController$AlertParams$1;-><init>(Landroidx/appcompat/app/AlertController$AlertParams;Landroid/content/Context;II[Ljava/lang/CharSequence;Landroidx/appcompat/app/AlertController$RecycleListView;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     new-instance v9, Landroidx/appcompat/app/AlertController$AlertParams$2;
 
     iget-object v3, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
-    iget-object v4, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
-
     const/4 v5, 0x0
 
     move-object v1, v9
@@ -210,7 +209,7 @@
 
     invoke-direct/range {v1 .. v7}, Landroidx/appcompat/app/AlertController$AlertParams$2;-><init>(Landroidx/appcompat/app/AlertController$AlertParams;Landroid/content/Context;Landroid/database/Cursor;ZLandroidx/appcompat/app/AlertController$RecycleListView;Landroidx/appcompat/app/AlertController;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-boolean v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
@@ -219,74 +218,67 @@
 
     iget v1, p1, Landroidx/appcompat/app/AlertController;->mSingleChoiceItemLayout:I
 
-    :goto_0
     move v4, v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget v1, p1, Landroidx/appcompat/app/AlertController;->mListItemLayout:I
 
-    goto :goto_0
+    move v4, v1
 
-    :goto_1
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
+    :goto_0
+    iget-object v5, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
 
-    const v2, 0x1020014
+    const v1, 0x1020014
 
-    if-eqz v1, :cond_3
+    if-eqz v5, :cond_3
 
-    new-instance v1, Landroid/widget/SimpleCursorAdapter;
+    new-instance v9, Landroid/widget/SimpleCursorAdapter;
 
     iget-object v3, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
-    iget-object v5, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
-
     new-array v6, v8, [Ljava/lang/String;
 
-    iget-object v7, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
+    iget-object v2, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
 
-    const/4 v9, 0x0
+    const/4 v7, 0x0
 
-    aput-object v7, v6, v9
+    aput-object v2, v6, v7
 
-    new-array v7, v8, [I
+    new-array v10, v8, [I
 
-    aput v2, v7, v9
+    aput v1, v10, v7
 
-    move-object v2, v1
+    move-object v2, v9
+
+    move-object v7, v10
 
     invoke-direct/range {v2 .. v7}, Landroid/widget/SimpleCursorAdapter;-><init>(Landroid/content/Context;ILandroid/database/Cursor;[Ljava/lang/String;[I)V
 
-    move-object v9, v1
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mAdapter:Landroid/widget/ListAdapter;
-
-    if-eqz v1, :cond_4
-
     iget-object v9, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mAdapter:Landroid/widget/ListAdapter;
 
-    goto :goto_2
+    if-eqz v9, :cond_4
+
+    goto :goto_1
 
     :cond_4
     new-instance v9, Landroidx/appcompat/app/AlertController$CheckedItemAdapter;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v2, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     iget-object v3, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence;
 
-    invoke-direct {v9, v1, v4, v2, v3}, Landroidx/appcompat/app/AlertController$CheckedItemAdapter;-><init>(Landroid/content/Context;II[Ljava/lang/CharSequence;)V
+    invoke-direct {v9, v2, v4, v1, v3}, Landroidx/appcompat/app/AlertController$CheckedItemAdapter;-><init>(Landroid/content/Context;II[Ljava/lang/CharSequence;)V
 
-    :goto_2
+    :goto_1
     iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnPrepareListViewListener:Landroidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener;
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnPrepareListViewListener:Landroidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener;
-
     invoke-interface {v1, v0}, Landroidx/appcompat/app/AlertController$AlertParams$OnPrepareListViewListener;->onPrepareListView(Landroid/widget/ListView;)V
 
     :cond_5
@@ -304,10 +296,9 @@
 
     invoke-direct {v1, p0, p1}, Landroidx/appcompat/app/AlertController$AlertParams$3;-><init>(Landroidx/appcompat/app/AlertController$AlertParams;Landroidx/appcompat/app/AlertController;)V
 
-    :goto_3
     invoke-virtual {v0, v1}, Landroidx/appcompat/app/AlertController$RecycleListView;->setOnItemClickListener(Landroid/widget/AdapterView$OnItemClickListener;)V
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_6
     iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener;
@@ -318,16 +309,14 @@
 
     invoke-direct {v1, p0, v0, p1}, Landroidx/appcompat/app/AlertController$AlertParams$4;-><init>(Landroidx/appcompat/app/AlertController$AlertParams;Landroidx/appcompat/app/AlertController$RecycleListView;Landroidx/appcompat/app/AlertController;)V
 
-    goto :goto_3
+    invoke-virtual {v0, v1}, Landroidx/appcompat/app/AlertController$RecycleListView;->setOnItemClickListener(Landroid/widget/AdapterView$OnItemClickListener;)V
 
     :cond_7
-    :goto_4
+    :goto_2
     iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnItemSelectedListener:Landroid/widget/AdapterView$OnItemSelectedListener;
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnItemSelectedListener:Landroid/widget/AdapterView$OnItemSelectedListener;
-
     invoke-virtual {v0, v1}, Landroidx/appcompat/app/AlertController$RecycleListView;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
 
     :cond_8
@@ -337,7 +326,7 @@
 
     invoke-virtual {v0, v8}, Landroidx/appcompat/app/AlertController$RecycleListView;->setChoiceMode(I)V
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_9
     iget-boolean v1, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsMultiChoice:Z
@@ -349,7 +338,7 @@
     invoke-virtual {v0, v1}, Landroidx/appcompat/app/AlertController$RecycleListView;->setChoiceMode(I)V
 
     :cond_a
-    :goto_5
+    :goto_3
     iput-object v0, p1, Landroidx/appcompat/app/AlertController;->mListView:Landroid/widget/ListView;
 
     return-void
@@ -364,8 +353,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mCustomTitleView:Landroid/view/View;
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->setCustomTitle(Landroid/view/View;)V
 
     goto :goto_0
@@ -375,8 +362,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mTitle:Ljava/lang/CharSequence;
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->setTitle(Ljava/lang/CharSequence;)V
 
     :cond_1
@@ -384,8 +369,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mIcon:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->setIcon(Landroid/graphics/drawable/Drawable;)V
 
     :cond_2
@@ -393,8 +376,6 @@
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mIconId:I
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->setIcon(I)V
 
     :cond_3
@@ -402,8 +383,6 @@
 
     if-eqz v0, :cond_4
 
-    iget v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mIconAttrId:I
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->getIconAttributeResId(I)I
 
     move-result v0
@@ -416,8 +395,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mMessage:Ljava/lang/CharSequence;
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->setMessage(Ljava/lang/CharSequence;)V
 
     :cond_5
@@ -509,16 +486,14 @@
     invoke-direct {p0, p1}, Landroidx/appcompat/app/AlertController$AlertParams;->createListView(Landroidx/appcompat/app/AlertController;)V
 
     :cond_d
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mView:Landroid/view/View;
+    iget-object v2, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mView:Landroid/view/View;
 
-    if-eqz v0, :cond_f
+    if-eqz v2, :cond_f
 
     iget-boolean v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingSpecified:Z
 
     if-eqz v0, :cond_e
 
-    iget-object v2, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mView:Landroid/view/View;
-
     iget v3, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingLeft:I
 
     iget v4, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingTop:I
@@ -534,9 +509,7 @@
     return-void
 
     :cond_e
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mView:Landroid/view/View;
-
-    invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->setView(Landroid/view/View;)V
+    invoke-virtual {p1, v2}, Landroidx/appcompat/app/AlertController;->setView(Landroid/view/View;)V
 
     return-void
 
@@ -545,8 +518,6 @@
 
     if-eqz v0, :cond_10
 
-    iget v0, p0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewLayoutResId:I
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/app/AlertController;->setView(I)V
 
     :cond_10
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$ButtonHandler.smali b/com.discord/smali/androidx/appcompat/app/AlertController$ButtonHandler.smali
index 5d66896818..ae6b2de2a0 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$ButtonHandler.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$ButtonHandler.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/AlertController$ButtonHandler;
 .super Landroid/os/Handler;
+.source "AlertController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$CheckedItemAdapter.smali b/com.discord/smali/androidx/appcompat/app/AlertController$CheckedItemAdapter.smali
index 66a4105b6d..10bf93b43b 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$CheckedItemAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$CheckedItemAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController$CheckedItemAdapter;
 .super Landroid/widget/ArrayAdapter;
+.source "AlertController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController$RecycleListView.smali b/com.discord/smali/androidx/appcompat/app/AlertController$RecycleListView.smali
index 3004a42e75..d4bad6cb0d 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController$RecycleListView.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController$RecycleListView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AlertController$RecycleListView;
 .super Landroid/widget/ListView;
+.source "AlertController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AlertController.smali b/com.discord/smali/androidx/appcompat/app/AlertController.smali
index d49adaa94e..86de51fb2b 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertController.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertController.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AlertController;
 .super Ljava/lang/Object;
+.source "AlertController.java"
 
 
 # annotations
@@ -299,9 +300,9 @@
 .method static manageScrollIndicators(Landroid/view/View;Landroid/view/View;Landroid/view/View;)V
     .locals 3
 
-    const/4 v0, 0x4
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x4
 
     if-eqz p1, :cond_1
 
@@ -334,9 +335,12 @@
 
     if-eqz p0, :cond_2
 
-    const/4 v0, 0x0
+    goto :goto_1
 
     :cond_2
+    const/4 v0, 0x4
+
+    :goto_1
     invoke-virtual {p2, v0}, Landroid/view/View;->setVisibility(I)V
 
     :cond_3
@@ -406,7 +410,7 @@
 .end method
 
 .method private selectContentView()I
-    .locals 2
+    .locals 3
 
     iget v0, p0, Landroidx/appcompat/app/AlertController;->mButtonPanelSideLayout:I
 
@@ -417,13 +421,11 @@
     return v0
 
     :cond_0
-    iget v0, p0, Landroidx/appcompat/app/AlertController;->mButtonPanelLayoutHint:I
+    iget v1, p0, Landroidx/appcompat/app/AlertController;->mButtonPanelLayoutHint:I
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    if-ne v0, v1, :cond_1
-
-    iget v0, p0, Landroidx/appcompat/app/AlertController;->mButtonPanelSideLayout:I
+    if-ne v1, v2, :cond_1
 
     return v0
 
@@ -531,13 +533,11 @@
 
     if-eqz p3, :cond_6
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mListView:Landroid/widget/ListView;
+    new-instance p1, Landroidx/appcompat/app/AlertController$4;
 
-    new-instance p3, Landroidx/appcompat/app/AlertController$4;
+    invoke-direct {p1, p0, v0, p2}, Landroidx/appcompat/app/AlertController$4;-><init>(Landroidx/appcompat/app/AlertController;Landroid/view/View;Landroid/view/View;)V
 
-    invoke-direct {p3, p0, v0, p2}, Landroidx/appcompat/app/AlertController$4;-><init>(Landroidx/appcompat/app/AlertController;Landroid/view/View;Landroid/view/View;)V
-
-    invoke-virtual {p1, p3}, Landroid/widget/ListView;->setOnScrollListener(Landroid/widget/AbsListView$OnScrollListener;)V
+    invoke-virtual {p3, p1}, Landroid/widget/ListView;->setOnScrollListener(Landroid/widget/AbsListView$OnScrollListener;)V
 
     iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mListView:Landroid/widget/ListView;
 
@@ -564,7 +564,7 @@
 .end method
 
 .method private setupButtons(Landroid/view/ViewGroup;)V
-    .locals 8
+    .locals 7
 
     const v0, 0x1020019
 
@@ -621,13 +621,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mButtonPositiveIcon:Landroid/graphics/drawable/Drawable;
-
     iget v5, p0, Landroidx/appcompat/app/AlertController;->mButtonIconDimen:I
 
-    iget v6, p0, Landroidx/appcompat/app/AlertController;->mButtonIconDimen:I
-
-    invoke-virtual {v0, v4, v4, v5, v6}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v0, v4, v4, v5, v5}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mButtonPositive:Landroid/widget/Button;
 
@@ -688,13 +684,9 @@
 
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Landroidx/appcompat/app/AlertController;->mButtonNegativeIcon:Landroid/graphics/drawable/Drawable;
-
     iget v6, p0, Landroidx/appcompat/app/AlertController;->mButtonIconDimen:I
 
-    iget v7, p0, Landroidx/appcompat/app/AlertController;->mButtonIconDimen:I
-
-    invoke-virtual {v5, v4, v4, v6, v7}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v5, v4, v4, v6, v6}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     iget-object v5, p0, Landroidx/appcompat/app/AlertController;->mButtonNegative:Landroid/widget/Button;
 
@@ -755,13 +747,9 @@
 
     if-eqz v5, :cond_5
 
-    iget-object v5, p0, Landroidx/appcompat/app/AlertController;->mButtonPositiveIcon:Landroid/graphics/drawable/Drawable;
-
     iget v6, p0, Landroidx/appcompat/app/AlertController;->mButtonIconDimen:I
 
-    iget v7, p0, Landroidx/appcompat/app/AlertController;->mButtonIconDimen:I
-
-    invoke-virtual {v5, v4, v4, v6, v7}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v5, v4, v4, v6, v6}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     iget-object v5, p0, Landroidx/appcompat/app/AlertController;->mButtonPositive:Landroid/widget/Button;
 
@@ -789,10 +777,9 @@
 
     iget-object v3, p0, Landroidx/appcompat/app/AlertController;->mButtonPositive:Landroid/widget/Button;
 
-    :goto_3
     invoke-direct {p0, v3}, Landroidx/appcompat/app/AlertController;->centerButton(Landroid/widget/Button;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const/4 v3, 0x2
@@ -801,6 +788,8 @@
 
     iget-object v3, p0, Landroidx/appcompat/app/AlertController;->mButtonNegative:Landroid/widget/Button;
 
+    invoke-direct {p0, v3}, Landroidx/appcompat/app/AlertController;->centerButton(Landroid/widget/Button;)V
+
     goto :goto_3
 
     :cond_7
@@ -810,18 +799,18 @@
 
     iget-object v3, p0, Landroidx/appcompat/app/AlertController;->mButtonNeutral:Landroid/widget/Button;
 
-    goto :goto_3
+    invoke-direct {p0, v3}, Landroidx/appcompat/app/AlertController;->centerButton(Landroid/widget/Button;)V
 
     :cond_8
-    :goto_4
+    :goto_3
     if-eqz v0, :cond_9
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
     const/4 v1, 0x0
 
-    :goto_5
+    :goto_4
     if-nez v1, :cond_a
 
     invoke-virtual {p1, v2}, Landroid/view/ViewGroup;->setVisibility(I)V
@@ -872,21 +861,15 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mMessage:Ljava/lang/CharSequence;
+    iget-object v1, p0, Landroidx/appcompat/app/AlertController;->mMessage:Ljava/lang/CharSequence;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mMessageView:Landroid/widget/TextView;
-
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mMessage:Ljava/lang/CharSequence;
-
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mMessageView:Landroid/widget/TextView;
-
     const/16 v1, 0x8
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setVisibility(I)V
@@ -944,8 +927,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mView:Landroid/view/View;
-
     goto :goto_0
 
     :cond_0
@@ -1136,11 +1117,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
+    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
 
-    iget v0, p0, Landroidx/appcompat/app/AlertController;->mIconId:I
-
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageResource(I)V
 
     return-void
 
@@ -1149,11 +1128,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
+    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mIcon:Landroid/graphics/drawable/Drawable;
-
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     return-void
 
@@ -1362,8 +1339,6 @@
 
     if-eqz v4, :cond_4
 
-    iget-object v4, p0, Landroidx/appcompat/app/AlertController;->mScrollView:Landroidx/core/widget/NestedScrollView;
-
     invoke-virtual {v4, v5}, Landroidx/core/widget/NestedScrollView;->setClipToPadding(Z)V
 
     :cond_4
@@ -1408,11 +1383,9 @@
     :goto_3
     iget-object v1, p0, Landroidx/appcompat/app/AlertController;->mListView:Landroid/widget/ListView;
 
-    instance-of v1, v1, Landroidx/appcompat/app/AlertController$RecycleListView;
+    instance-of v4, v1, Landroidx/appcompat/app/AlertController$RecycleListView;
 
-    if-eqz v1, :cond_9
-
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController;->mListView:Landroid/widget/ListView;
+    if-eqz v4, :cond_9
 
     check-cast v1, Landroidx/appcompat/app/AlertController$RecycleListView;
 
@@ -1425,8 +1398,6 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mListView:Landroid/widget/ListView;
-
     goto :goto_4
 
     :cond_a
@@ -1455,8 +1426,6 @@
 
     if-eqz v1, :cond_d
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController;->mAdapter:Landroid/widget/ListAdapter;
-
     invoke-virtual {v0, v1}, Landroid/widget/ListView;->setAdapter(Landroid/widget/ListAdapter;)V
 
     iget v1, p0, Landroidx/appcompat/app/AlertController;->mCheckedItem:I
@@ -1587,8 +1556,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mScrollView:Landroidx/core/widget/NestedScrollView;
-
     invoke-virtual {p1, p2}, Landroidx/core/widget/NestedScrollView;->executeKeyEvent(Landroid/view/KeyEvent;)Z
 
     move-result p1
@@ -1612,8 +1579,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mScrollView:Landroidx/core/widget/NestedScrollView;
-
     invoke-virtual {p1, p2}, Landroidx/core/widget/NestedScrollView;->executeKeyEvent(Landroid/view/KeyEvent;)Z
 
     move-result p1
@@ -1720,11 +1685,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
+    const/4 p1, 0x0
 
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
 
@@ -1735,11 +1698,9 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
+    const/16 p1, 0x8
 
-    const/16 v0, 0x8
-
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setVisibility(I)V
 
     :cond_1
     return-void
@@ -1760,8 +1721,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
-
     invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
@@ -1771,11 +1730,9 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Landroidx/appcompat/app/AlertController;->mIconView:Landroid/widget/ImageView;
+    const/16 p1, 0x8
 
-    const/16 v0, 0x8
-
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {v1, p1}, Landroid/widget/ImageView;->setVisibility(I)V
 
     :cond_1
     return-void
@@ -1790,8 +1747,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mMessageView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_0
@@ -1807,8 +1762,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertController;->mTitleView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/app/AlertDialog$Builder.smali b/com.discord/smali/androidx/appcompat/app/AlertDialog$Builder.smali
index 5225d4f7a3..c9cb85c2bc 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertDialog$Builder.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertDialog$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AlertDialog$Builder;
 .super Ljava/lang/Object;
+.source "AlertDialog.java"
 
 
 # annotations
@@ -155,9 +156,7 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mAdapter:Landroid/widget/ListAdapter;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
 
     return-object p0
 .end method
@@ -179,13 +178,9 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p3, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
 
-    iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
 
     return-object p0
 .end method
@@ -285,9 +280,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -313,9 +306,7 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
 
     return-object p0
 .end method
@@ -329,9 +320,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1, p1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -365,9 +354,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -383,12 +370,8 @@
 
     iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
     iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItems:[Z
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
     const/4 p2, 0x1
 
     iput-boolean p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsMultiChoice:Z
@@ -403,23 +386,15 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p4, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener;
 
-    iput-object p4, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsCheckedColumn:Ljava/lang/String;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p3, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
 
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsCheckedColumn:Ljava/lang/String;
+    const/4 p1, 0x1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    const/4 p2, 0x1
-
-    iput-boolean p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsMultiChoice:Z
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsMultiChoice:Z
 
     return-object p0
 .end method
@@ -431,19 +406,13 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p3, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener;
 
-    iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItems:[Z
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    const/4 p1, 0x1
 
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItems:[Z
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    const/4 p2, 0x1
-
-    iput-boolean p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsMultiChoice:Z
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsMultiChoice:Z
 
     return-object p0
 .end method
@@ -457,9 +426,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1, p1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -481,9 +448,7 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener;
 
     return-object p0
 .end method
@@ -507,9 +472,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1, p1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -531,9 +494,7 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mNeutralButtonText:Ljava/lang/CharSequence;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mNeutralButtonListener:Landroid/content/DialogInterface$OnClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mNeutralButtonListener:Landroid/content/DialogInterface$OnClickListener;
 
     return-object p0
 .end method
@@ -597,9 +558,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1, p1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -621,9 +580,7 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener;
+    iput-object p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener;
 
     return-object p0
 .end method
@@ -662,9 +619,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -680,12 +635,8 @@
 
     iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
     iput p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItem:I
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
     const/4 p2, 0x1
 
     iput-boolean p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
@@ -700,23 +651,15 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p4, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
 
-    iput-object p4, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
+    iput p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItem:I
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p3, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
 
-    iput p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItem:I
+    const/4 p1, 0x1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String;
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    const/4 p2, 0x1
-
-    iput-boolean p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
 
     return-object p0
 .end method
@@ -728,19 +671,13 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mAdapter:Landroid/widget/ListAdapter;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p3, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
 
-    iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
+    iput p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItem:I
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    const/4 p1, 0x1
 
-    iput p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItem:I
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    const/4 p2, 0x1
-
-    iput-boolean p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
 
     return-object p0
 .end method
@@ -752,19 +689,13 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-object p3, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
 
-    iput-object p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener;
+    iput p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItem:I
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    const/4 p1, 0x1
 
-    iput p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mCheckedItem:I
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    const/4 p2, 0x1
-
-    iput-boolean p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mIsSingleChoice:Z
 
     return-object p0
 .end method
@@ -778,9 +709,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iget-object v1, v1, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
+    iget-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mContext:Landroid/content/Context;
 
     invoke-virtual {v1, p1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -814,15 +743,11 @@
 
     iput-object v1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mView:Landroid/view/View;
 
-    iget-object v0, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
     iput p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewLayoutResId:I
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    const/4 p1, 0x0
 
-    const/4 v0, 0x0
-
-    iput-boolean v0, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingSpecified:Z
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingSpecified:Z
 
     return-object p0
 .end method
@@ -834,15 +759,11 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mView:Landroid/view/View;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    const/4 p1, 0x0
 
-    const/4 v0, 0x0
+    iput p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewLayoutResId:I
 
-    iput v0, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewLayoutResId:I
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput-boolean v0, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingSpecified:Z
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingSpecified:Z
 
     return-object p0
 .end method
@@ -862,33 +783,21 @@
 
     iput-object p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mView:Landroid/view/View;
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    const/4 p1, 0x0
 
-    const/4 v0, 0x0
+    iput p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewLayoutResId:I
 
-    iput v0, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewLayoutResId:I
+    const/4 p1, 0x1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput-boolean p1, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingSpecified:Z
 
-    const/4 v0, 0x1
+    iput p2, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingLeft:I
 
-    iput-boolean v0, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingSpecified:Z
+    iput p3, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingTop:I
 
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
+    iput p4, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingRight:I
 
-    iput p2, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingLeft:I
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput p3, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingTop:I
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput p4, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingRight:I
-
-    iget-object p1, p0, Landroidx/appcompat/app/AlertDialog$Builder;->P:Landroidx/appcompat/app/AlertController$AlertParams;
-
-    iput p5, p1, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingBottom:I
+    iput p5, v0, Landroidx/appcompat/app/AlertController$AlertParams;->mViewSpacingBottom:I
 
     return-object p0
 .end method
diff --git a/com.discord/smali/androidx/appcompat/app/AlertDialog.smali b/com.discord/smali/androidx/appcompat/app/AlertDialog.smali
index 02bc59ee6d..33543961d6 100644
--- a/com.discord/smali/androidx/appcompat/app/AlertDialog.smali
+++ b/com.discord/smali/androidx/appcompat/app/AlertDialog.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AlertDialog;
 .super Landroidx/appcompat/app/AppCompatDialog;
+.source "AlertDialog.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatActivity.smali b/com.discord/smali/androidx/appcompat/app/AppCompatActivity.smali
index b721217256..18b5e1d246 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatActivity.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatActivity.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AppCompatActivity;
 .super Landroidx/fragment/app/FragmentActivity;
+.source "AppCompatActivity.java"
 
 # interfaces
 .implements Landroidx/appcompat/app/ActionBarDrawerToggle$DelegateProvider;
@@ -292,11 +293,7 @@
 
     move-result-object v0
 
-    return-object v0
-
     :cond_1
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatActivity;->mResources:Landroid/content/res/Resources;
-
     return-object v0
 .end method
 
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatCallback.smali b/com.discord/smali/androidx/appcompat/app/AppCompatCallback.smali
index 5537595dd2..8e63dcc366 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatCallback.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/app/AppCompatCallback;
 .super Ljava/lang/Object;
+.source "AppCompatCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegate$NightMode.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegate$NightMode.smali
index 6f0cbe88f8..a4c0d51a42 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegate$NightMode.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegate$NightMode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/appcompat/app/AppCompatDelegate$NightMode;
 .super Ljava/lang/Object;
+.source "AppCompatDelegate.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegate.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegate.smali
index a9e7bd941b..04110b24e7 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegate.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/appcompat/app/AppCompatDelegate;
 .super Ljava/lang/Object;
+.source "AppCompatDelegate.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$1.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$1.smali
index 0ac163982e..aa2b199c2e 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/AppCompatDelegateImpl$1;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Ljava/lang/Thread$UncaughtExceptionHandler;
@@ -38,7 +39,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     invoke-virtual {p1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
 
@@ -69,6 +70,9 @@
 
     :cond_1
     return v1
+
+    :cond_2
+    return v1
 .end method
 
 
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$2.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$2.smali
index d716aa5505..69eca7bd1a 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$2.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$2;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -70,8 +71,6 @@
 
     iput-boolean v1, v0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mInvalidatePanelMenuPosted:Z
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$2;->this$0:Landroidx/appcompat/app/AppCompatDelegateImpl;
-
     iput v1, v0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mInvalidatePanelMenuFeatures:I
 
     return-void
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$3.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$3.smali
index 1f61e293df..ac787b89d4 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$3.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$3;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroidx/core/view/OnApplyWindowInsetsListener;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$4.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$4.smali
index d513603a57..0befef6bb9 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$4.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$4;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$5.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$5.smali
index 3fbde947ec..84f753f2c8 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$5.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$5;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6$1.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6$1.smali
index cf3e2c15f0..9a95e0538a 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$6$1;
 .super Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6.smali
index 579c2f6d53..7c2d1d6bdb 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$6;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -74,9 +75,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$6;->this$0:Landroidx/appcompat/app/AppCompatDelegateImpl;
 
-    iget-object v2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$6;->this$0:Landroidx/appcompat/app/AppCompatDelegateImpl;
-
-    iget-object v2, v2, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionModeView:Landroidx/appcompat/widget/ActionBarContextView;
+    iget-object v2, v0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionModeView:Landroidx/appcompat/widget/ActionBarContextView;
 
     invoke-static {v2}, Landroidx/core/view/ViewCompat;->animate(Landroid/view/View;)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$7.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$7.smali
index df731bd712..17f2b7c736 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$7.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$7;
 .super Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl.smali
index 50d45ed52a..6212280ae5 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionMenuPresenterCallback.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionMenuPresenterCallback.smali
index 2235d44906..f2308a04d9 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionMenuPresenterCallback.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionMenuPresenterCallback.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/AppCompatDelegateImpl$ActionMenuPresenterCallback;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter$Callback;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9$1.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9$1.smali
index 5ec8842b81..0487841233 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9$1;
 .super Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9.smali
index 411caf0e37..ed075361d4 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/ActionMode$Callback;
@@ -101,9 +102,7 @@
 
     iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9;->this$0:Landroidx/appcompat/app/AppCompatDelegateImpl;
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$ActionModeCallbackWrapperV9;->this$0:Landroidx/appcompat/app/AppCompatDelegateImpl;
-
-    iget-object v0, v0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionModeView:Landroidx/appcompat/widget/ActionBarContextView;
+    iget-object v0, p1, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionModeView:Landroidx/appcompat/widget/ActionBarContextView;
 
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->animate(Landroid/view/View;)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali
index cc0766ae3f..2f5f8feff9 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;
 .super Landroidx/appcompat/view/WindowCallbackWrapper;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager$1.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager$1.smali
index e14f44c59d..dba1ca4bf2 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager$1;
 .super Landroid/content/BroadcastReceiver;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager.smali
index 04a6f65bd2..d363b422bc 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ListMenuDecorView.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ListMenuDecorView.smali
index 31c9060648..7197de7533 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ListMenuDecorView.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$ListMenuDecorView.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$ListMenuDecorView;
 .super Landroidx/appcompat/widget/ContentFrameLayout;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState$1.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState$1.smali
index dff66f1390..4336857c9d 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState$1;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali
index 8d9abb0c1d..f28788ca64 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState$SavedState;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState.smali
index b7f50f501a..3e0506ded1 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 
 # annotations
@@ -87,14 +88,10 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->frozenMenuState:Landroid/os/Bundle;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->frozenMenuState:Landroid/os/Bundle;
 
+    if-eqz v1, :cond_0
+
     invoke-virtual {v0, v1}, Landroidx/appcompat/view/menu/MenuBuilder;->restorePresenterStates(Landroid/os/Bundle;)V
 
     const/4 v0, 0x0
@@ -112,8 +109,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->listMenuPresenter:Landroidx/appcompat/view/menu/ListMenuPresenter;
 
     invoke-virtual {v0, v1}, Landroidx/appcompat/view/menu/MenuBuilder;->removeMenuPresenter(Landroidx/appcompat/view/menu/MenuPresenter;)V
@@ -284,12 +279,8 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->listMenuPresenter:Landroidx/appcompat/view/menu/ListMenuPresenter;
 
     invoke-virtual {v0, v1}, Landroidx/appcompat/view/menu/MenuBuilder;->removeMenuPresenter(Landroidx/appcompat/view/menu/MenuPresenter;)V
@@ -303,8 +294,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->listMenuPresenter:Landroidx/appcompat/view/menu/ListMenuPresenter;
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/view/menu/MenuBuilder;->addMenuPresenter(Landroidx/appcompat/view/menu/MenuPresenter;)V
 
     :cond_2
@@ -357,17 +346,16 @@
 
     iget v0, v0, Landroid/util/TypedValue;->resourceId:I
 
-    :goto_0
     invoke-virtual {v1, v0, v3}, Landroid/content/res/Resources$Theme;->applyStyle(IZ)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     sget v0, Landroidx/appcompat/R$style;->Theme_AppCompat_CompactMenu:I
 
-    goto :goto_0
+    invoke-virtual {v1, v0, v3}, Landroid/content/res/Resources$Theme;->applyStyle(IZ)V
 
-    :goto_1
+    :goto_0
     new-instance v0, Landroidx/appcompat/view/ContextThemeWrapper;
 
     const/4 v2, 0x0
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelMenuPresenterCallback.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelMenuPresenterCallback.smali
index 82a0663cc2..fea54d3f5e 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelMenuPresenterCallback.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl$PanelMenuPresenterCallback.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/AppCompatDelegateImpl$PanelMenuPresenterCallback;
 .super Ljava/lang/Object;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter$Callback;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali
index 4d89e51040..83c6261d52 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDelegateImpl;
 .super Landroidx/appcompat/app/AppCompatDelegate;
+.source "AppCompatDelegateImpl.java"
 
 # interfaces
 .implements Landroid/view/LayoutInflater$Factory2;
@@ -218,17 +219,15 @@
 
     iget-object p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
 
-    instance-of p2, p2, Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;
+    instance-of p3, p2, Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;
 
-    if-nez p2, :cond_1
+    if-nez p3, :cond_1
 
-    new-instance p2, Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;
+    new-instance p3, Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;
 
-    iget-object p3, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
+    invoke-direct {p3, p0, p2}, Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;Landroid/view/Window$Callback;)V
 
-    invoke-direct {p2, p0, p3}, Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;Landroid/view/Window$Callback;)V
-
-    iput-object p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatWindowCallback:Landroid/view/Window$Callback;
+    iput-object p3, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatWindowCallback:Landroid/view/Window$Callback;
 
     iget-object p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mWindow:Landroid/view/Window;
 
@@ -523,7 +522,7 @@
 
     iput-boolean v2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mHasActionBar:Z
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_4
     iget-boolean v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mHasActionBar:Z
@@ -622,12 +621,12 @@
 
     invoke-interface {v1, v3}, Landroidx/appcompat/widget/DecorContentParent;->initFeature(I)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     move-object v0, v5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_9
     iget-boolean v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOverlayActionMode:Z
@@ -636,21 +635,24 @@
 
     sget v1, Landroidx/appcompat/R$layout;->abc_screen_simple_overlay_action_mode:I
 
-    :goto_2
     invoke-virtual {v0, v1, v5}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
     move-result-object v0
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_a
     sget v1, Landroidx/appcompat/R$layout;->abc_screen_simple:I
 
-    goto :goto_2
+    invoke-virtual {v0, v1, v5}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    :goto_3
+    move-result-object v0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    :goto_2
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v3, 0x15
@@ -663,7 +665,7 @@
 
     invoke-static {v0, v1}, Landroidx/core/view/ViewCompat;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_b
     move-object v1, v0
@@ -677,7 +679,7 @@
     invoke-interface {v1, v3}, Landroidx/appcompat/widget/FitWindowsViewGroup;->setOnFitSystemWindowsListener(Landroidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener;)V
 
     :cond_c
-    :goto_4
+    :goto_3
     if-eqz v0, :cond_10
 
     iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
@@ -717,7 +719,7 @@
 
     if-eqz v3, :cond_f
 
-    :goto_5
+    :goto_4
     invoke-virtual {v3}, Landroid/view/ViewGroup;->getChildCount()I
 
     move-result v6
@@ -732,7 +734,7 @@
 
     invoke-virtual {v1, v6}, Landroidx/appcompat/widget/ContentFrameLayout;->addView(Landroid/view/View;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_e
     const/4 v2, -0x1
@@ -829,6 +831,8 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private ensureAutoNightModeManager()V
@@ -881,8 +885,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     invoke-interface {v1, v0}, Landroidx/appcompat/widget/DecorContentParent;->setWindowTitle(Ljava/lang/CharSequence;)V
 
     goto :goto_0
@@ -907,8 +909,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mTitleView:Landroid/widget/TextView;
-
     invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_2
@@ -957,8 +957,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mLocalNightMode:I
-
     return v0
 
     :cond_0
@@ -976,67 +974,61 @@
 
     iget-boolean v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mHasActionBar:Z
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
 
     if-eqz v0, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
 
-    instance-of v0, v0, Landroid/app/Activity;
+    instance-of v1, v0, Landroid/app/Activity;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    new-instance v0, Landroidx/appcompat/app/WindowDecorActionBar;
+    new-instance v1, Landroidx/appcompat/app/WindowDecorActionBar;
 
-    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
-
-    check-cast v1, Landroid/app/Activity;
+    check-cast v0, Landroid/app/Activity;
 
     iget-boolean v2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOverlayActionBar:Z
 
-    invoke-direct {v0, v1, v2}, Landroidx/appcompat/app/WindowDecorActionBar;-><init>(Landroid/app/Activity;Z)V
+    invoke-direct {v1, v0, v2}, Landroidx/appcompat/app/WindowDecorActionBar;-><init>(Landroid/app/Activity;Z)V
 
-    :goto_0
-    iput-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
-
-    instance-of v0, v0, Landroid/app/Dialog;
-
-    if-eqz v0, :cond_2
-
-    new-instance v0, Landroidx/appcompat/app/WindowDecorActionBar;
-
-    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
-
-    check-cast v1, Landroid/app/Dialog;
-
-    invoke-direct {v0, v1}, Landroidx/appcompat/app/WindowDecorActionBar;-><init>(Landroid/app/Dialog;)V
+    iput-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
 
     goto :goto_0
 
+    :cond_1
+    instance-of v1, v0, Landroid/app/Dialog;
+
+    if-eqz v1, :cond_2
+
+    new-instance v1, Landroidx/appcompat/app/WindowDecorActionBar;
+
+    check-cast v0, Landroid/app/Dialog;
+
+    invoke-direct {v1, v0}, Landroidx/appcompat/app/WindowDecorActionBar;-><init>(Landroid/app/Dialog;)V
+
+    iput-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
+
     :cond_2
-    :goto_1
+    :goto_0
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
-
     iget-boolean v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mEnableDefaultActionBarUp:Z
 
     invoke-virtual {v0, v1}, Landroidx/appcompat/app/ActionBar;->setDefaultDisplayHomeAsUpEnabled(Z)V
 
     :cond_3
-    :goto_2
+    return-void
+
+    :cond_4
+    :goto_1
     return-void
 .end method
 
@@ -1326,8 +1318,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     invoke-interface {p1}, Landroidx/appcompat/widget/DecorContentParent;->canShowOverflowMenu()Z
 
     move-result p1
@@ -1468,13 +1458,13 @@
 
     iget-boolean v0, p1, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->isOpen:Z
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_10
 
     iget-boolean v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mIsDestroyed:Z
 
     if-eqz v0, :cond_0
 
-    goto/16 :goto_3
+    goto/16 :goto_4
 
     :cond_0
     iget v0, p1, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->featureId:I
@@ -1742,9 +1732,15 @@
 
     iput-boolean v2, p1, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->isOpen:Z
 
+    return-void
+
     :cond_f
     :goto_3
     return-void
+
+    :cond_10
+    :goto_4
+    return-void
 .end method
 
 .method private performPanelShortcut(Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;ILandroid/view/KeyEvent;I)Z
@@ -1826,12 +1822,8 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mPreparedPanel:Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
-
     if-eq v0, p1, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mPreparedPanel:Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
-
     invoke-virtual {p0, v0, v1}, Landroidx/appcompat/app/AppCompatDelegateImpl;->closePanel(Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;Z)V
 
     :cond_2
@@ -1878,8 +1870,6 @@
 
     if-eqz v4, :cond_6
 
-    iget-object v4, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     invoke-interface {v4}, Landroidx/appcompat/widget/DecorContentParent;->setMenuPrepared()V
 
     :cond_6
@@ -1975,8 +1965,6 @@
 
     if-eqz p1, :cond_d
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     iget-object p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMenuPresenterCallback:Landroidx/appcompat/app/AppCompatDelegateImpl$ActionMenuPresenterCallback;
 
     invoke-interface {p1, v5, p2}, Landroidx/appcompat/widget/DecorContentParent;->setMenu(Landroid/view/Menu;Landroidx/appcompat/view/menu/MenuPresenter$Callback;)V
@@ -2021,8 +2009,6 @@
 
     if-eqz p2, :cond_11
 
-    iget-object p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMenuPresenterCallback:Landroidx/appcompat/app/AppCompatDelegateImpl$ActionMenuPresenterCallback;
 
     invoke-interface {p2, v5, v0}, Landroidx/appcompat/widget/DecorContentParent;->setMenu(Landroid/view/Menu;Landroidx/appcompat/view/menu/MenuPresenter$Callback;)V
@@ -2096,15 +2082,13 @@
 
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_5
-
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
+    if-eqz p1, :cond_6
 
     invoke-interface {p1}, Landroidx/appcompat/widget/DecorContentParent;->canShowOverflowMenu()Z
 
     move-result p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
     iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context;
 
@@ -2124,7 +2108,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
     :cond_0
     invoke-virtual {p0}, Landroidx/appcompat/app/AppCompatDelegateImpl;->getWindowCallback()Landroid/view/Window$Callback;
@@ -2152,7 +2136,7 @@
 
     iget-boolean p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mIsDestroyed:Z
 
-    if-nez p2, :cond_4
+    if-nez p2, :cond_5
 
     invoke-virtual {p0, v1, v0}, Landroidx/appcompat/app/AppCompatDelegateImpl;->getPanelState(IZ)Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
 
@@ -2166,11 +2150,11 @@
 
     :cond_2
     :goto_0
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_5
 
     iget-boolean p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mIsDestroyed:Z
 
-    if-nez p2, :cond_4
+    if-nez p2, :cond_5
 
     iget-boolean p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mInvalidatePanelMenuPosted:Z
 
@@ -2228,10 +2212,13 @@
     invoke-interface {p1}, Landroidx/appcompat/widget/DecorContentParent;->showOverflowMenu()Z
 
     :cond_4
-    :goto_1
     return-void
 
     :cond_5
+    :goto_1
+    return-void
+
+    :cond_6
     invoke-virtual {p0, v1, v0}, Landroidx/appcompat/app/AppCompatDelegateImpl;->getPanelState(IZ)Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
 
     move-result-object p1
@@ -2277,6 +2264,8 @@
 
     const/16 p1, 0x6d
 
+    return p1
+
     :cond_1
     return p1
 .end method
@@ -2346,11 +2335,9 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context;
 
-    instance-of v0, v0, Landroid/app/Activity;
+    instance-of v2, v0, Landroid/app/Activity;
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context;
+    if-eqz v2, :cond_1
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -2574,7 +2561,7 @@
 .end method
 
 .method callOnPanelClosed(ILandroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;Landroid/view/Menu;)V
-    .locals 1
+    .locals 2
 
     if-nez p3, :cond_1
 
@@ -2584,13 +2571,11 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mPanels:[Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-ge p1, v0, :cond_0
+    if-ge p1, v1, :cond_0
 
-    iget-object p2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mPanels:[Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
-
-    aget-object p2, p2, p1
+    aget-object p2, v0, p1
 
     :cond_0
     if-eqz p2, :cond_1
@@ -2686,8 +2671,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     invoke-interface {v0}, Landroidx/appcompat/widget/DecorContentParent;->isOverflowMenuShowing()Z
 
     move-result v0
@@ -2829,7 +2812,7 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception v2
@@ -2858,6 +2841,8 @@
 
     invoke-direct {v0}, Landroidx/appcompat/app/AppCompatViewInflater;-><init>()V
 
+    iput-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatViewInflater:Landroidx/appcompat/app/AppCompatViewInflater;
+
     goto :goto_1
 
     :cond_1
@@ -2866,11 +2851,10 @@
 
     invoke-direct {v0}, Landroidx/appcompat/app/AppCompatViewInflater;-><init>()V
 
-    :goto_1
     iput-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatViewInflater:Landroidx/appcompat/app/AppCompatViewInflater;
 
     :cond_2
-    :goto_2
+    :goto_1
     sget-boolean v0, Landroidx/appcompat/app/AppCompatDelegateImpl;->IS_PRE_LOLLIPOP:Z
 
     if-eqz v0, :cond_5
@@ -2893,7 +2877,7 @@
 
     const/4 v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     move-object v0, p1
@@ -2907,15 +2891,15 @@
     move v1, v0
 
     :cond_4
-    :goto_3
+    :goto_2
     move v7, v1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const/4 v7, 0x0
 
-    :goto_4
+    :goto_3
     iget-object v2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatViewInflater:Landroidx/appcompat/app/AppCompatViewInflater;
 
     sget-boolean v8, Landroidx/appcompat/app/AppCompatDelegateImpl;->IS_PRE_LOLLIPOP:Z
@@ -2948,8 +2932,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     invoke-interface {v0}, Landroidx/appcompat/widget/DecorContentParent;->dismissPopups()V
 
     :cond_0
@@ -3016,13 +2998,11 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
 
-    instance-of v0, v0, Landroidx/core/view/KeyEventDispatcher$Component;
+    instance-of v1, v0, Landroidx/core/view/KeyEventDispatcher$Component;
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
+    if-nez v1, :cond_0
 
     instance-of v0, v0, Landroidx/appcompat/app/AppCompatDialog;
 
@@ -3043,16 +3023,16 @@
 
     if-eqz v0, :cond_1
 
-    return v1
+    return v2
 
     :cond_1
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getKeyCode()I
 
     move-result v0
 
-    const/16 v2, 0x52
+    const/16 v1, 0x52
 
-    if-ne v0, v2, :cond_2
+    if-ne v0, v1, :cond_2
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
 
@@ -3062,7 +3042,7 @@
 
     if-eqz v0, :cond_2
 
-    return v1
+    return v2
 
     :cond_2
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getKeyCode()I
@@ -3071,17 +3051,17 @@
 
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getAction()I
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_3
+    if-nez v1, :cond_3
 
     goto :goto_0
 
     :cond_3
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-eqz v1, :cond_4
+    if-eqz v2, :cond_4
 
     invoke-virtual {p0, v0, p1}, Landroidx/appcompat/app/AppCompatDelegateImpl;->onKeyDown(ILandroid/view/KeyEvent;)Z
 
@@ -3176,8 +3156,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mFadeAnim:Landroidx/core/view/ViewPropertyAnimatorCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/ViewPropertyAnimatorCompat;->cancel()V
 
     :cond_0
@@ -3316,8 +3294,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
-
     invoke-virtual {v1}, Landroidx/appcompat/app/ActionBar;->getThemedContext()Landroid/content/Context;
 
     move-result-object v1
@@ -3401,15 +3377,13 @@
 .end method
 
 .method final getTitle()Ljava/lang/CharSequence;
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
 
-    instance-of v0, v0, Landroid/app/Activity;
+    instance-of v1, v0, Landroid/app/Activity;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
+    if-eqz v1, :cond_0
 
     check-cast v0, Landroid/app/Activity;
 
@@ -3648,8 +3622,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMode:Landroidx/appcompat/view/ActionMode;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/ActionMode;->finish()V
 
     return v1
@@ -3713,27 +3685,23 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
 
-    instance-of v0, v0, Landroid/app/Activity;
+    instance-of v1, v0, Landroid/app/Activity;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :try_start_0
-    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback;
+    check-cast v0, Landroid/app/Activity;
 
-    check-cast v1, Landroid/app/Activity;
-
-    invoke-static {v1}, Landroidx/core/app/NavUtils;->getParentActivityName(Landroid/app/Activity;)Ljava/lang/String;
+    invoke-static {v0}, Landroidx/core/app/NavUtils;->getParentActivityName(Landroid/app/Activity;)Ljava/lang/String;
 
     move-result-object v1
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object v0, v1
-
     :catch_0
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
     invoke-virtual {p0}, Landroidx/appcompat/app/AppCompatDelegateImpl;->peekSupportActionBar()Landroidx/appcompat/app/ActionBar;
 
@@ -3820,8 +3788,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/ActionBar;->onDestroy()V
 
     :cond_1
@@ -3829,8 +3795,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAutoNightModeManager:Landroidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager;->cleanup()V
 
     :cond_2
@@ -3904,8 +3868,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mPreparedPanel:Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
-
     invoke-virtual {p2}, Landroid/view/KeyEvent;->getKeyCode()I
 
     move-result v0
@@ -3920,8 +3882,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mPreparedPanel:Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
-
     iput-boolean v1, p1, Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;->isHandled:Z
 
     :cond_1
@@ -4157,11 +4117,9 @@
 
     if-eq v0, v1, :cond_0
 
-    const-string v0, "appcompat:local_night_mode"
+    const-string v1, "appcompat:local_night_mode"
 
-    iget v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mLocalNightMode:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_0
     return-void
@@ -4193,8 +4151,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAutoNightModeManager:Landroidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/AppCompatDelegateImpl$AutoNightModeManager;->cleanup()V
 
     :cond_1
@@ -4429,12 +4385,12 @@
 
     invoke-virtual {p0}, Landroidx/appcompat/app/AppCompatDelegateImpl;->applyDayNight()Z
 
+    return-void
+
     :cond_0
     :goto_0
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch -0x1
         :pswitch_0
@@ -4497,10 +4453,9 @@
 
     move-result-object v0
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/view/Window;->setCallback(Landroid/view/Window$Callback;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iput-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionBar:Landroidx/appcompat/app/ActionBar;
@@ -4509,9 +4464,9 @@
 
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatWindowCallback:Landroid/view/Window$Callback;
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/view/Window;->setCallback(Landroid/view/Window$Callback;)V
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0}, Landroidx/appcompat/app/AppCompatDelegateImpl;->invalidateOptionsMenu()V
 
     return-void
@@ -4535,8 +4490,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mDecorContentParent:Landroidx/appcompat/widget/DecorContentParent;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/widget/DecorContentParent;->setWindowTitle(Ljava/lang/CharSequence;)V
 
     return-void
@@ -4561,8 +4514,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mTitleView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_2
@@ -4580,8 +4531,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mSubDecor:Landroid/view/ViewGroup;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
     move-result v0
@@ -4611,8 +4560,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMode:Landroidx/appcompat/view/ActionMode;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/ActionMode;->finish()V
 
     :cond_0
@@ -4636,15 +4583,11 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroidx/appcompat/app/AppCompatCallback;
+    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroidx/appcompat/app/AppCompatCallback;
 
-    if-eqz p1, :cond_1
+    if-eqz v1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroidx/appcompat/app/AppCompatCallback;
-
-    iget-object v1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMode:Landroidx/appcompat/view/ActionMode;
-
-    invoke-interface {p1, v1}, Landroidx/appcompat/app/AppCompatCallback;->onSupportActionModeStarted(Landroidx/appcompat/view/ActionMode;)V
+    invoke-interface {v1, p1}, Landroidx/appcompat/app/AppCompatCallback;->onSupportActionModeStarted(Landroidx/appcompat/view/ActionMode;)V
 
     :cond_1
     iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMode:Landroidx/appcompat/view/ActionMode;
@@ -4685,8 +4628,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMode:Landroidx/appcompat/view/ActionMode;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/ActionMode;->finish()V
 
     :cond_0
@@ -4707,13 +4648,11 @@
 
     if-eqz v0, :cond_2
 
-    iget-boolean v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mIsDestroyed:Z
+    iget-boolean v2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mIsDestroyed:Z
 
-    if-nez v0, :cond_2
+    if-nez v2, :cond_2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroidx/appcompat/app/AppCompatCallback;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/app/AppCompatCallback;->onWindowStartingSupportActionMode(Landroidx/appcompat/view/ActionMode$Callback;)Landroidx/appcompat/view/ActionMode;
 
     move-result-object v0
@@ -5051,15 +4990,11 @@
 
     if-eqz p1, :cond_c
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroidx/appcompat/app/AppCompatCallback;
+    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroidx/appcompat/app/AppCompatCallback;
 
-    if-eqz p1, :cond_c
+    if-eqz v0, :cond_c
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroidx/appcompat/app/AppCompatCallback;
-
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMode:Landroidx/appcompat/view/ActionMode;
-
-    invoke-interface {p1, v0}, Landroidx/appcompat/app/AppCompatCallback;->onSupportActionModeStarted(Landroidx/appcompat/view/ActionMode;)V
+    invoke-interface {v0, p1}, Landroidx/appcompat/app/AppCompatCallback;->onSupportActionModeStarted(Landroidx/appcompat/view/ActionMode;)V
 
     :cond_c
     iget-object p1, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionMode:Landroidx/appcompat/view/ActionMode;
@@ -5076,8 +5011,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionModeView:Landroidx/appcompat/widget/ActionBarContextView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionBarContextView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v0
@@ -5192,8 +5125,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mStatusGuard:Landroid/view/View;
-
     invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v2
@@ -5236,7 +5167,7 @@
 
     const/4 p1, 0x0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_6
     iget v2, v0, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
@@ -5247,43 +5178,42 @@
 
     const/4 v2, 0x1
 
+    const/4 v3, 0x0
+
     goto :goto_4
 
     :cond_7
     const/4 v2, 0x0
 
-    :goto_4
     const/4 v3, 0x0
 
     :cond_8
-    :goto_5
+    :goto_4
     if-eqz v2, :cond_a
 
     iget-object v2, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mActionModeView:Landroidx/appcompat/widget/ActionBarContextView;
 
     invoke-virtual {v2, v0}, Landroidx/appcompat/widget/ActionBarContextView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_9
     const/4 v3, 0x0
 
     :cond_a
-    :goto_6
+    :goto_5
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mStatusGuard:Landroid/view/View;
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mStatusGuard:Landroid/view/View;
-
     if-eqz v3, :cond_b
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_b
     const/16 v1, 0x8
 
-    :goto_7
+    :goto_6
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     :cond_c
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDialog$1.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDialog$1.smali
index 086d903db7..494bc0e56e 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDialog$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDialog$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatDialog$1;
 .super Ljava/lang/Object;
+.source "AppCompatDialog.java"
 
 # interfaces
 .implements Landroidx/core/view/KeyEventDispatcher$Component;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDialog.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDialog.smali
index 0e69f291c4..62e1bb7df1 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDialog.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDialog.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AppCompatDialog;
 .super Landroid/app/Dialog;
+.source "AppCompatDialog.java"
 
 # interfaces
 .implements Landroidx/appcompat/app/AppCompatCallback;
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDialogFragment.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDialogFragment.smali
index 0ad85bcb92..29fd5d8e70 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDialogFragment.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDialogFragment.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AppCompatDialogFragment;
 .super Landroidx/fragment/app/DialogFragment;
+.source "AppCompatDialogFragment.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater$DeclaredOnClickListener.smali b/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater$DeclaredOnClickListener.smali
index 558d84944c..760d929911 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater$DeclaredOnClickListener.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater$DeclaredOnClickListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/AppCompatViewInflater$DeclaredOnClickListener;
 .super Ljava/lang/Object;
+.source "AppCompatViewInflater.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -199,6 +200,8 @@
     invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p2
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali b/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali
index 5401753ab6..2f88822ed4 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/AppCompatViewInflater;
 .super Ljava/lang/Object;
+.source "AppCompatViewInflater.java"
 
 
 # annotations
@@ -165,6 +166,8 @@
     :cond_1
     invoke-virtual {p2}, Landroid/content/res/TypedArray;->recycle()V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -326,8 +329,6 @@
 
     aput-object v1, p1, v2
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object;
-
     aput-object v1, p1, v0
 
     return-object v3
@@ -342,8 +343,6 @@
 
     aput-object v1, p1, v2
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object;
-
     aput-object v1, p1, v0
 
     return-object v1
@@ -361,8 +360,6 @@
 
     aput-object v1, p2, v2
 
-    iget-object p2, p0, Landroidx/appcompat/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object;
-
     aput-object v1, p2, v0
 
     return-object p1
@@ -374,8 +371,6 @@
 
     aput-object v1, p2, v2
 
-    iget-object p2, p0, Landroidx/appcompat/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object;
-
     aput-object v1, p2, v0
 
     throw p1
@@ -385,8 +380,6 @@
 
     aput-object v1, p1, v2
 
-    iget-object p1, p0, Landroidx/appcompat/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object;
-
     aput-object v1, p1, v0
 
     return-object v1
@@ -903,13 +896,15 @@
 
     move-result-object p5
 
-    goto :goto_3
+    goto/16 :goto_2
 
     :pswitch_0
     invoke-virtual {p0, p1, p4}, Landroidx/appcompat/app/AppCompatViewInflater;->createSeekBar(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatSeekBar;
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_1
@@ -917,6 +912,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_2
@@ -924,6 +921,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_3
@@ -931,6 +930,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_4
@@ -938,6 +939,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_5
@@ -945,6 +948,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_6
@@ -952,6 +957,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_7
@@ -959,6 +966,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_8
@@ -966,6 +975,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_9
@@ -973,6 +984,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_a
@@ -980,6 +993,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_b
@@ -987,6 +1002,8 @@
 
     move-result-object p5
 
+    invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_c
@@ -994,10 +1011,9 @@
 
     move-result-object p5
 
-    :goto_2
     invoke-direct {p0, p5, p2}, Landroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
 
-    :goto_3
+    :goto_2
     if-nez p5, :cond_5
 
     if-eq p3, p1, :cond_5
@@ -1014,6 +1030,8 @@
     :cond_6
     return-object p5
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x7404ceea -> :sswitch_c
diff --git a/com.discord/smali/androidx/appcompat/app/NavItemSelectedListener.smali b/com.discord/smali/androidx/appcompat/app/NavItemSelectedListener.smali
index 8e746f8521..014cece16f 100644
--- a/com.discord/smali/androidx/appcompat/app/NavItemSelectedListener.smali
+++ b/com.discord/smali/androidx/appcompat/app/NavItemSelectedListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/NavItemSelectedListener;
 .super Ljava/lang/Object;
+.source "NavItemSelectedListener.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemSelectedListener;
@@ -38,8 +39,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/app/NavItemSelectedListener;->mListener:Landroidx/appcompat/app/ActionBar$OnNavigationListener;
-
     invoke-interface {p1, p3, p4, p5}, Landroidx/appcompat/app/ActionBar$OnNavigationListener;->onNavigationItemSelected(IJ)Z
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/app/ResourcesFlusher.smali b/com.discord/smali/androidx/appcompat/app/ResourcesFlusher.smali
index d7282e3ec2..1c59ab9fa8 100644
--- a/com.discord/smali/androidx/appcompat/app/ResourcesFlusher.smali
+++ b/com.discord/smali/androidx/appcompat/app/ResourcesFlusher.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ResourcesFlusher;
 .super Ljava/lang/Object;
+.source "ResourcesFlusher.java"
 
 
 # static fields
@@ -131,12 +132,10 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :try_start_1
-    sget-object v1, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field;
-
-    invoke-virtual {v1, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -149,13 +148,13 @@
     :catch_1
     move-exception p0
 
-    const-string v1, "ResourcesFlusher"
+    const-string v0, "ResourcesFlusher"
 
     const-string v2, "Could not retrieve value from Resources#mDrawableCache"
 
-    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v0, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    move-object p0, v0
+    move-object p0, v1
 
     :goto_1
     if-eqz p0, :cond_1
@@ -219,11 +218,9 @@
     if-eqz v1, :cond_1
 
     :try_start_1
-    sget-object v1, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field;
-
     invoke-virtual {v1, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object p0
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
 
@@ -239,15 +236,13 @@
     invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_1
-    move-object p0, v0
-
     :goto_1
-    if-nez p0, :cond_2
+    if-nez v0, :cond_2
 
     return-void
 
     :cond_2
-    invoke-static {p0}, Landroidx/appcompat/app/ResourcesFlusher;->flushThemedResourcesCache(Ljava/lang/Object;)V
+    invoke-static {v0}, Landroidx/appcompat/app/ResourcesFlusher;->flushThemedResourcesCache(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -305,12 +300,10 @@
     return-void
 
     :cond_1
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
     :try_start_1
-    sget-object v2, Landroidx/appcompat/app/ResourcesFlusher;->sResourcesImplField:Ljava/lang/reflect/Field;
-
-    invoke-virtual {v2, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
     :try_end_1
@@ -321,13 +314,13 @@
     :catch_1
     move-exception p0
 
-    const-string v2, "ResourcesFlusher"
+    const-string v0, "ResourcesFlusher"
 
     const-string v3, "Could not retrieve value from Resources#mResourcesImpl"
 
-    invoke-static {v2, v3, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v0, v3, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    move-object p0, v0
+    move-object p0, v2
 
     :goto_1
     if-nez p0, :cond_2
@@ -335,52 +328,50 @@
     return-void
 
     :cond_2
-    sget-boolean v2, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheFieldFetched:Z
+    sget-boolean v0, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheFieldFetched:Z
 
-    if-nez v2, :cond_3
+    if-nez v0, :cond_3
 
     :try_start_2
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v2
+    move-result-object v0
 
     const-string v3, "mDrawableCache"
 
-    invoke-virtual {v2, v3}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+    invoke-virtual {v0, v3}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v2
+    move-result-object v0
 
-    sput-object v2, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field;
+    sput-object v0, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field;
 
-    invoke-virtual {v2, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V
     :try_end_2
     .catch Ljava/lang/NoSuchFieldException; {:try_start_2 .. :try_end_2} :catch_2
 
     goto :goto_2
 
     :catch_2
-    move-exception v2
+    move-exception v0
 
     const-string v3, "ResourcesFlusher"
 
     const-string v4, "Could not retrieve ResourcesImpl#mDrawableCache field"
 
-    invoke-static {v3, v4, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v3, v4, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :goto_2
     sput-boolean v1, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheFieldFetched:Z
 
     :cond_3
-    sget-object v1, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field;
+    sget-object v0, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field;
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
     :try_start_3
-    sget-object v1, Landroidx/appcompat/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field;
+    invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v1, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
+    move-result-object v2
     :try_end_3
     .catch Ljava/lang/IllegalAccessException; {:try_start_3 .. :try_end_3} :catch_3
 
@@ -389,19 +380,17 @@
     :catch_3
     move-exception p0
 
-    const-string v1, "ResourcesFlusher"
+    const-string v0, "ResourcesFlusher"
 
-    const-string v2, "Could not retrieve value from ResourcesImpl#mDrawableCache"
+    const-string v1, "Could not retrieve value from ResourcesImpl#mDrawableCache"
 
-    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v0, v1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_4
-    move-object p0, v0
-
     :goto_3
-    if-eqz p0, :cond_5
+    if-eqz v2, :cond_5
 
-    invoke-static {p0}, Landroidx/appcompat/app/ResourcesFlusher;->flushThemedResourcesCache(Ljava/lang/Object;)V
+    invoke-static {v2}, Landroidx/appcompat/app/ResourcesFlusher;->flushThemedResourcesCache(Ljava/lang/Object;)V
 
     :cond_5
     return-void
@@ -456,13 +445,11 @@
     return-void
 
     :cond_1
-    sget-boolean v0, Landroidx/appcompat/app/ResourcesFlusher;->sThemedResourceCache_mUnthemedEntriesFieldFetched:Z
+    sget-boolean v2, Landroidx/appcompat/app/ResourcesFlusher;->sThemedResourceCache_mUnthemedEntriesFieldFetched:Z
 
-    if-nez v0, :cond_2
+    if-nez v2, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/appcompat/app/ResourcesFlusher;->sThemedResourceCacheClazz:Ljava/lang/Class;
-
     const-string v2, "mUnthemedEntries"
 
     invoke-virtual {v0, v2}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
@@ -497,12 +484,10 @@
     return-void
 
     :cond_3
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :try_start_2
-    sget-object v1, Landroidx/appcompat/app/ResourcesFlusher;->sThemedResourceCache_mUnthemedEntriesField:Ljava/lang/reflect/Field;
-
-    invoke-virtual {v1, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -515,13 +500,13 @@
     :catch_2
     move-exception p0
 
-    const-string v1, "ResourcesFlusher"
+    const-string v0, "ResourcesFlusher"
 
     const-string v2, "Could not retrieve value from ThemedResourceCache#mUnthemedEntries"
 
-    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v0, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    move-object p0, v0
+    move-object p0, v1
 
     :goto_2
     if-eqz p0, :cond_4
diff --git a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$1.smali b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$1.smali
index 19e926ef42..ce876e8c28 100644
--- a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ToolbarActionBar$1;
 .super Ljava/lang/Object;
+.source "ToolbarActionBar.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$2.smali b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$2.smali
index 6c35cd44d8..040f0ce8cb 100644
--- a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$2.smali
+++ b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ToolbarActionBar$2;
 .super Ljava/lang/Object;
+.source "ToolbarActionBar.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ActionMenuPresenterCallback.smali b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ActionMenuPresenterCallback.smali
index e7561e7812..fdf3d7e5b4 100644
--- a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ActionMenuPresenterCallback.smali
+++ b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ActionMenuPresenterCallback.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/ToolbarActionBar$ActionMenuPresenterCallback;
 .super Ljava/lang/Object;
+.source "ToolbarActionBar.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter$Callback;
diff --git a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$MenuBuilderCallback.smali b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$MenuBuilderCallback.smali
index e4c4511b71..7f8b9aa5e9 100644
--- a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$MenuBuilderCallback.smali
+++ b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$MenuBuilderCallback.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/app/ToolbarActionBar$MenuBuilderCallback;
 .super Ljava/lang/Object;
+.source "ToolbarActionBar.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$Callback;
diff --git a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ToolbarCallbackWrapper.smali b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ToolbarCallbackWrapper.smali
index 7adbfcfac6..b593118256 100644
--- a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ToolbarCallbackWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar$ToolbarCallbackWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ToolbarActionBar$ToolbarCallbackWrapper;
 .super Landroidx/appcompat/view/WindowCallbackWrapper;
+.source "ToolbarActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar.smali b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar.smali
index c46b06a0d8..b3944cb029 100644
--- a/com.discord/smali/androidx/appcompat/app/ToolbarActionBar.smali
+++ b/com.discord/smali/androidx/appcompat/app/ToolbarActionBar.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/ToolbarActionBar;
 .super Landroidx/appcompat/app/ActionBar;
+.source "ToolbarActionBar.java"
 
 
 # annotations
@@ -664,6 +665,8 @@
 
     invoke-virtual {v1}, Landroidx/appcompat/view/menu/MenuBuilder;->startDispatchingItemsChanged()V
 
+    return-void
+
     :cond_4
     return-void
 
@@ -1164,9 +1167,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/app/ToolbarActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
-
-    invoke-interface {v1}, Landroidx/appcompat/widget/DecorToolbar;->getContext()Landroid/content/Context;
+    invoke-interface {v0}, Landroidx/appcompat/widget/DecorToolbar;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -1202,9 +1203,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/app/ToolbarActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
-
-    invoke-interface {v1}, Landroidx/appcompat/widget/DecorToolbar;->getContext()Landroid/content/Context;
+    invoke-interface {v0}, Landroidx/appcompat/widget/DecorToolbar;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/androidx/appcompat/app/TwilightCalculator.smali b/com.discord/smali/androidx/appcompat/app/TwilightCalculator.smali
index d0fa53339d..bfc2d9ffdc 100644
--- a/com.discord/smali/androidx/appcompat/app/TwilightCalculator.smali
+++ b/com.discord/smali/androidx/appcompat/app/TwilightCalculator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/TwilightCalculator;
 .super Ljava/lang/Object;
+.source "TwilightCalculator.java"
 
 
 # static fields
@@ -259,7 +260,6 @@
 
     iput v5, v0, Landroidx/appcompat/app/TwilightCalculator;->state:I
 
-    :goto_0
     iput-wide v6, v0, Landroidx/appcompat/app/TwilightCalculator;->sunset:J
 
     iput-wide v6, v0, Landroidx/appcompat/app/TwilightCalculator;->sunrise:J
@@ -277,7 +277,11 @@
 
     iput v8, v0, Landroidx/appcompat/app/TwilightCalculator;->state:I
 
-    goto :goto_0
+    iput-wide v6, v0, Landroidx/appcompat/app/TwilightCalculator;->sunset:J
+
+    iput-wide v6, v0, Landroidx/appcompat/app/TwilightCalculator;->sunrise:J
+
+    return-void
 
     :cond_1
     invoke-static {v9, v10}, Ljava/lang/Math;->acos(D)D
diff --git a/com.discord/smali/androidx/appcompat/app/TwilightManager$TwilightState.smali b/com.discord/smali/androidx/appcompat/app/TwilightManager$TwilightState.smali
index 5a1a1de270..b4c0f9d099 100644
--- a/com.discord/smali/androidx/appcompat/app/TwilightManager$TwilightState.smali
+++ b/com.discord/smali/androidx/appcompat/app/TwilightManager$TwilightState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/TwilightManager$TwilightState;
 .super Ljava/lang/Object;
+.source "TwilightManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/TwilightManager.smali b/com.discord/smali/androidx/appcompat/app/TwilightManager.smali
index 3245dcadbe..52649b3d74 100644
--- a/com.discord/smali/androidx/appcompat/app/TwilightManager.smali
+++ b/com.discord/smali/androidx/appcompat/app/TwilightManager.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/TwilightManager;
 .super Ljava/lang/Object;
+.source "TwilightManager.java"
 
 
 # annotations
@@ -381,8 +382,6 @@
     goto :goto_1
 
     :cond_3
-    const/4 v6, 0x0
-
     add-long/2addr v4, v12
 
     :goto_1
diff --git a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$1.smali b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$1.smali
index f515f37ad7..5e337b4e01 100644
--- a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$1.smali
+++ b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/WindowDecorActionBar$1;
 .super Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
+.source "WindowDecorActionBar.java"
 
 
 # annotations
@@ -82,8 +83,6 @@
 
     iput-object v0, p1, Landroidx/appcompat/app/WindowDecorActionBar;->mCurrentShowAnim:Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar$1;->this$0:Landroidx/appcompat/app/WindowDecorActionBar;
-
     invoke-virtual {p1}, Landroidx/appcompat/app/WindowDecorActionBar;->completeDeferredDestroyActionMode()V
 
     iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar$1;->this$0:Landroidx/appcompat/app/WindowDecorActionBar;
diff --git a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$2.smali b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$2.smali
index e8b0c41025..10640f70f1 100644
--- a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$2.smali
+++ b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/WindowDecorActionBar$2;
 .super Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
+.source "WindowDecorActionBar.java"
 
 
 # annotations
@@ -39,8 +40,6 @@
 
     iput-object v0, p1, Landroidx/appcompat/app/WindowDecorActionBar;->mCurrentShowAnim:Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar$2;->this$0:Landroidx/appcompat/app/WindowDecorActionBar;
-
     iget-object p1, p1, Landroidx/appcompat/app/WindowDecorActionBar;->mContainerView:Landroidx/appcompat/widget/ActionBarContainer;
 
     invoke-virtual {p1}, Landroidx/appcompat/widget/ActionBarContainer;->requestLayout()V
diff --git a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$3.smali b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$3.smali
index 0a81600f8f..cd872d7d27 100644
--- a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$3.smali
+++ b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/app/WindowDecorActionBar$3;
 .super Ljava/lang/Object;
+.source "WindowDecorActionBar.java"
 
 # interfaces
 .implements Landroidx/core/view/ViewPropertyAnimatorUpdateListener;
diff --git a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$ActionModeImpl.smali b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$ActionModeImpl.smali
index be5b30850f..d220d1b3d9 100644
--- a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$ActionModeImpl.smali
+++ b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$ActionModeImpl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;
 .super Landroidx/appcompat/view/ActionMode;
+.source "WindowDecorActionBar.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$Callback;
@@ -141,8 +142,6 @@
 
     iput-object p0, v0, Landroidx/appcompat/app/WindowDecorActionBar;->mDeferredDestroyActionMode:Landroidx/appcompat/view/ActionMode;
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;->this$0:Landroidx/appcompat/app/WindowDecorActionBar;
-
     iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;->mCallback:Landroidx/appcompat/view/ActionMode$Callback;
 
     iput-object v1, v0, Landroidx/appcompat/app/WindowDecorActionBar;->mDeferredModeDestroyCallback:Landroidx/appcompat/view/ActionMode$Callback;
@@ -205,8 +204,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;->mCustomView:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
@@ -343,8 +340,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;->mCallback:Landroidx/appcompat/view/ActionMode$Callback;
-
     invoke-interface {p1, p0, p2}, Landroidx/appcompat/view/ActionMode$Callback;->onActionItemClicked(Landroidx/appcompat/view/ActionMode;Landroid/view/MenuItem;)Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$TabImpl.smali b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$TabImpl.smali
index 3c3149ef6c..f4276e6d7e 100644
--- a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$TabImpl.smali
+++ b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar$TabImpl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;
 .super Landroidx/appcompat/app/ActionBar$Tab;
+.source "WindowDecorActionBar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar.smali b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar.smali
index 5e930b032a..2faaf2861c 100644
--- a/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar.smali
+++ b/com.discord/smali/androidx/appcompat/app/WindowDecorActionBar.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/app/WindowDecorActionBar;
 .super Landroidx/appcompat/app/ActionBar;
+.source "WindowDecorActionBar.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;
@@ -381,8 +382,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mTabScrollView:Landroidx/appcompat/widget/ScrollingTabContainerView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->removeAllTabs()V
 
     :cond_1
@@ -444,6 +443,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private ensureTabsExist()V
@@ -491,8 +492,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     invoke-static {v1}, Landroidx/core/view/ViewCompat;->requestApplyInsets(Landroid/view/View;)V
 
     goto :goto_0
@@ -589,8 +588,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/ActionBarOverlayLayout;->setShowingForActionMode(Z)V
 
     :cond_0
@@ -617,8 +614,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     invoke-virtual {v0, p0}, Landroidx/appcompat/widget/ActionBarOverlayLayout;->setActionBarVisibilityCallback(Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;)V
 
     :cond_0
@@ -658,15 +653,13 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContextView:Landroidx/appcompat/widget/ActionBarContextView;
+    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContextView:Landroidx/appcompat/widget/ActionBarContextView;
 
-    if-eqz p1, :cond_7
+    if-eqz v0, :cond_7
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContainerView:Landroidx/appcompat/widget/ActionBarContainer;
+    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContainerView:Landroidx/appcompat/widget/ActionBarContainer;
 
-    if-eqz p1, :cond_7
-
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
+    if-eqz v0, :cond_7
 
     invoke-interface {p1}, Landroidx/appcompat/widget/DecorToolbar;->getContext()Landroid/content/Context;
 
@@ -866,23 +859,17 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mTabScrollView:Landroidx/appcompat/widget/ScrollingTabContainerView;
-
     invoke-virtual {v0, v2}, Landroidx/appcompat/widget/ScrollingTabContainerView;->setVisibility(I)V
 
     iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->requestApplyInsets(Landroid/view/View;)V
 
     goto :goto_2
 
     :cond_2
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mTabScrollView:Landroidx/appcompat/widget/ScrollingTabContainerView;
-
     const/16 v3, 0x8
 
     invoke-virtual {v0, v3}, Landroidx/appcompat/widget/ScrollingTabContainerView;->setVisibility(I)V
@@ -953,8 +940,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/ActionBarOverlayLayout;->setShowingForActionMode(Z)V
 
     :cond_0
@@ -1109,29 +1094,29 @@
 
     move-result v0
 
-    const/16 v1, 0x8
+    const/4 v1, 0x4
 
-    const/4 v2, 0x4
+    const/16 v2, 0x8
 
     const/4 v3, 0x0
 
     if-eqz v0, :cond_2
 
-    const-wide/16 v4, 0xc8
+    const-wide/16 v4, 0x64
 
-    const-wide/16 v6, 0x64
+    const-wide/16 v6, 0xc8
 
     if-eqz p1, :cond_1
 
     iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
 
-    invoke-interface {p1, v2, v6, v7}, Landroidx/appcompat/widget/DecorToolbar;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
+    invoke-interface {p1, v1, v4, v5}, Landroidx/appcompat/widget/DecorToolbar;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     move-result-object p1
 
     iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContextView:Landroidx/appcompat/widget/ActionBarContextView;
 
-    invoke-virtual {v0, v3, v4, v5}, Landroidx/appcompat/widget/ActionBarContextView;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
+    invoke-virtual {v0, v3, v6, v7}, Landroidx/appcompat/widget/ActionBarContextView;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     move-result-object v0
 
@@ -1140,13 +1125,13 @@
     :cond_1
     iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
 
-    invoke-interface {p1, v3, v4, v5}, Landroidx/appcompat/widget/DecorToolbar;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
+    invoke-interface {p1, v3, v6, v7}, Landroidx/appcompat/widget/DecorToolbar;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     move-result-object v0
 
     iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContextView:Landroidx/appcompat/widget/ActionBarContextView;
 
-    invoke-virtual {p1, v1, v6, v7}, Landroidx/appcompat/widget/ActionBarContextView;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
+    invoke-virtual {p1, v2, v4, v5}, Landroidx/appcompat/widget/ActionBarContextView;->setupAnimatorToVisibility(IJ)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     move-result-object p1
 
@@ -1166,7 +1151,7 @@
 
     iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
 
-    invoke-interface {p1, v2}, Landroidx/appcompat/widget/DecorToolbar;->setVisibility(I)V
+    invoke-interface {p1, v1}, Landroidx/appcompat/widget/DecorToolbar;->setVisibility(I)V
 
     iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContextView:Landroidx/appcompat/widget/ActionBarContextView;
 
@@ -1181,7 +1166,7 @@
 
     iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContextView:Landroidx/appcompat/widget/ActionBarContextView;
 
-    invoke-virtual {p1, v1}, Landroidx/appcompat/widget/ActionBarContextView;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroidx/appcompat/widget/ActionBarContextView;->setVisibility(I)V
 
     return-void
 .end method
@@ -1193,8 +1178,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
-
     invoke-interface {v0}, Landroidx/appcompat/widget/DecorToolbar;->hasExpandedActionView()Z
 
     move-result v0
@@ -1222,8 +1205,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDeferredModeDestroyCallback:Landroidx/appcompat/view/ActionMode$Callback;
-
     iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDeferredDestroyActionMode:Landroidx/appcompat/view/ActionMode;
 
     invoke-interface {v0, v1}, Landroidx/appcompat/view/ActionMode$Callback;->onDestroyActionMode(Landroidx/appcompat/view/ActionMode;)V
@@ -1286,8 +1267,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mCurrentShowAnim:Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;->cancel()V
 
     :cond_0
@@ -1371,8 +1350,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContentView:Landroid/view/View;
-
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->animate(Landroid/view/View;)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     move-result-object p1
@@ -1427,8 +1404,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mCurrentShowAnim:Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;->cancel()V
 
     :cond_0
@@ -1518,8 +1493,6 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v2, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContentView:Landroid/view/View;
-
     invoke-virtual {v2, v0}, Landroid/view/View;->setTranslationY(F)V
 
     iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContentView:Landroid/view/View;
@@ -1572,8 +1545,6 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mContentView:Landroid/view/View;
-
     invoke-virtual {p1, v1}, Landroid/view/View;->setTranslationY(F)V
 
     :cond_5
@@ -1588,8 +1559,6 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->requestApplyInsets(Landroid/view/View;)V
 
     :cond_6
@@ -1746,8 +1715,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSelectedTab:Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;->getPosition()I
 
     move-result v0
@@ -1989,8 +1956,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mDecorToolbar:Landroidx/appcompat/widget/DecorToolbar;
-
     invoke-interface {v0}, Landroidx/appcompat/widget/DecorToolbar;->isTitleTruncated()Z
 
     move-result v0
@@ -2042,8 +2007,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mCurrentShowAnim:Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;->cancel()V
 
     const/4 v0, 0x0
@@ -2072,8 +2035,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mActionMode:Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;->getMenu()Landroid/view/Menu;
 
     move-result-object v0
@@ -2174,8 +2135,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSelectedTab:Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;->getPosition()I
 
     move-result v0
@@ -2367,13 +2326,9 @@
 
     if-ne v2, p1, :cond_3
 
-    iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSelectedTab:Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;
+    if-eqz v2, :cond_6
 
-    if-eqz v1, :cond_6
-
-    iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSelectedTab:Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;
-
-    invoke-virtual {v1}, Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;->getCallback()Landroidx/appcompat/app/ActionBar$TabListener;
+    invoke-virtual {v2}, Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;->getCallback()Landroidx/appcompat/app/ActionBar$TabListener;
 
     move-result-object v1
 
@@ -2407,8 +2362,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSelectedTab:Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;
-
     invoke-virtual {v1}, Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;->getCallback()Landroidx/appcompat/app/ActionBar$TabListener;
 
     move-result-object v1
@@ -2426,8 +2379,6 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSelectedTab:Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;
-
     invoke-virtual {p1}, Landroidx/appcompat/app/WindowDecorActionBar$TabImpl;->getCallback()Landroidx/appcompat/app/ActionBar$TabListener;
 
     move-result-object p1
@@ -2892,8 +2843,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mOverlayLayout:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->requestApplyInsets(Landroid/view/View;)V
 
     :cond_1
@@ -2920,8 +2869,6 @@
 
     if-eq v2, v3, :cond_3
 
-    iget v2, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSavedTabPosition:I
-
     invoke-virtual {p0, v2}, Landroidx/appcompat/app/WindowDecorActionBar;->setSelectedNavigationItem(I)V
 
     iput v3, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mSavedTabPosition:I
@@ -3023,8 +2970,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mCurrentShowAnim:Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;->cancel()V
 
     :cond_0
@@ -3148,8 +3093,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/app/WindowDecorActionBar;->mActionMode:Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/WindowDecorActionBar$ActionModeImpl;->finish()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/content/res/AppCompatResources$ColorStateListCacheEntry.smali b/com.discord/smali/androidx/appcompat/content/res/AppCompatResources$ColorStateListCacheEntry.smali
index afd8662135..50aad2db43 100644
--- a/com.discord/smali/androidx/appcompat/content/res/AppCompatResources$ColorStateListCacheEntry.smali
+++ b/com.discord/smali/androidx/appcompat/content/res/AppCompatResources$ColorStateListCacheEntry.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/content/res/AppCompatResources$ColorStateListCacheEntry;
 .super Ljava/lang/Object;
+.source "AppCompatResources.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/content/res/AppCompatResources.smali b/com.discord/smali/androidx/appcompat/content/res/AppCompatResources.smali
index 265f42375b..0f2f0ed7d4 100644
--- a/com.discord/smali/androidx/appcompat/content/res/AppCompatResources.smali
+++ b/com.discord/smali/androidx/appcompat/content/res/AppCompatResources.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/content/res/AppCompatResources;
 .super Ljava/lang/Object;
+.source "AppCompatResources.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$1.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$1.smali
index 6119996bee..df979c7f0c 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$1.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$1;
 .super Ljava/lang/Object;
+.source "AnimatedStateListDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatableTransition.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatableTransition.smali
index 3f1e4f3b42..db14571870 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatableTransition.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatableTransition.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatableTransition;
 .super Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition;
+.source "AnimatedStateListDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali
index 439fef7b50..26e65c0c38 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState;
 .super Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;
+.source "AnimatedStateListDrawableCompat.java"
 
 
 # annotations
@@ -67,7 +68,6 @@
 
     iget-object p1, p1, Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState;->mStateIds:Landroidx/collection/SparseArrayCompat;
 
-    :goto_0
     iput-object p1, p0, Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState;->mStateIds:Landroidx/collection/SparseArrayCompat;
 
     return-void
@@ -83,7 +83,9 @@
 
     invoke-direct {p1}, Landroidx/collection/SparseArrayCompat;-><init>()V
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState;->mStateIds:Landroidx/collection/SparseArrayCompat;
+
+    return-void
 .end method
 
 .method private static generateTransitionKey(II)J
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedVectorDrawableTransition.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedVectorDrawableTransition.smali
index 21002d3362..81d04d7765 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedVectorDrawableTransition.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedVectorDrawableTransition.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedVectorDrawableTransition;
 .super Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition;
+.source "AnimatedStateListDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali
index 7e4fc0c836..902a6485a1 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition;
 .super Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition;
+.source "AnimatedStateListDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali
index 91b7306c30..856a79d01a 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator;
 .super Ljava/lang/Object;
+.source "AnimatedStateListDrawableCompat.java"
 
 # interfaces
 .implements Landroid/animation/TimeInterpolator;
@@ -122,8 +123,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator;->mFrameTimes:[I
-
     array-length v1, v1
 
     if-ge v1, v0, :cond_1
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition.smali
index 2d8039eb9a..a6d386c6c0 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition;
 .super Ljava/lang/Object;
+.source "AnimatedStateListDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali
index 1ef796947b..836447593b 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat;
 .super Landroidx/appcompat/graphics/drawable/StateListDrawable;
+.source "AnimatedStateListDrawableCompat.java"
 
 
 # annotations
@@ -157,7 +158,7 @@
 
     throw p0
     :try_end_0
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
@@ -169,6 +170,18 @@
 
     invoke-static {p1, p2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_0
+
+    :catch_1
+    move-exception p0
+
+    sget-object p1, Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat;->LOGTAG:Ljava/lang/String;
+
+    const-string p2, "parser error"
+
+    invoke-static {p1, p2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :goto_0
     const/4 p0, 0x0
 
     return-object p0
@@ -557,6 +570,8 @@
     invoke-direct {p1, p2}, Lorg/xmlpull/v1/XmlPullParserException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private parseTransition(Landroid/content/Context;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)I
@@ -779,6 +794,8 @@
     invoke-direct {p1, p2}, Lorg/xmlpull/v1/XmlPullParserException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private selectTransition(I)Z
@@ -852,7 +869,7 @@
 
     const/4 v5, 0x0
 
-    if-eqz v4, :cond_7
+    if-eqz v4, :cond_8
 
     if-nez v3, :cond_3
 
@@ -930,6 +947,9 @@
     return v1
 
     :cond_7
+    return v5
+
+    :cond_8
     :goto_2
     return v5
 .end method
@@ -1394,8 +1414,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat;->mTransition:Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition;
-
     invoke-virtual {v0}, Landroidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat$Transition;->stop()V
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$1.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$1.smali
index 79c6aa1e33..776d23e958 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$1.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/DrawableContainer$1;
 .super Ljava/lang/Object;
+.source "DrawableContainer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali
index ea951599e9..ce919b9fb1 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/DrawableContainer$BlockInvalidateCallback;
 .super Ljava/lang/Object;
+.source "DrawableContainer.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
@@ -56,8 +57,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$BlockInvalidateCallback;->mCallback:Landroid/graphics/drawable/Drawable$Callback;
-
     invoke-interface {v0, p1, p2, p3, p4}, Landroid/graphics/drawable/Drawable$Callback;->scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V
 
     :cond_0
@@ -79,8 +78,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$BlockInvalidateCallback;->mCallback:Landroid/graphics/drawable/Drawable$Callback;
-
     invoke-interface {v0, p1, p2}, Landroid/graphics/drawable/Drawable$Callback;->unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState.smali
index b68d48f36e..1c1fe4bb96 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
 .super Landroid/graphics/drawable/Drawable$ConstantState;
+.source "DrawableContainer.java"
 
 
 # annotations
@@ -310,10 +311,9 @@
 
     move-result-object p1
 
-    :goto_2
     iput-object p1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawableFutures:Landroid/util/SparseArray;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
     new-instance p1, Landroid/util/SparseArray;
@@ -322,12 +322,12 @@
 
     invoke-direct {p1, p3}, Landroid/util/SparseArray;-><init>(I)V
 
-    goto :goto_2
+    iput-object p1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawableFutures:Landroid/util/SparseArray;
 
-    :goto_3
+    :goto_2
     iget p1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mNumChildren:I
 
-    :goto_4
+    :goto_3
     if-ge v0, p1, :cond_a
 
     aget-object p3, p2, v0
@@ -346,7 +346,7 @@
 
     invoke-virtual {v1, v0, p3}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
     iget-object p3, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawables:[Landroid/graphics/drawable/Drawable;
@@ -356,10 +356,10 @@
     aput-object v1, p3, v0
 
     :cond_9
-    :goto_5
+    :goto_4
     add-int/lit8 v0, v0, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_a
     return-void
@@ -383,8 +383,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawableFutures:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -721,6 +719,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method final clearMutated()V
@@ -855,8 +855,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawableFutures:Landroid/util/SparseArray;
-
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->indexOfKey(I)I
 
     move-result v0
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer.smali
index d69cfe15aa..e39542b32c 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableContainer.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/DrawableContainer;
 .super Landroid/graphics/drawable/Drawable;
+.source "DrawableContainer.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
@@ -330,7 +331,7 @@
 
 # virtual methods
 .method animate(Z)V
-    .locals 12
+    .locals 13
 
     const/4 v0, 0x1
 
@@ -352,17 +353,13 @@
 
     iget-wide v9, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mEnterAnimationEnd:J
 
-    cmp-long v3, v9, v7
+    cmp-long v11, v9, v7
 
-    if-eqz v3, :cond_2
+    if-eqz v11, :cond_2
 
-    iget-wide v9, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mEnterAnimationEnd:J
+    cmp-long v11, v9, v1
 
-    cmp-long v3, v9, v1
-
-    if-gtz v3, :cond_0
-
-    iget-object v3, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
+    if-gtz v11, :cond_0
 
     iget v9, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mAlpha:I
 
@@ -371,8 +368,6 @@
     goto :goto_0
 
     :cond_0
-    iget-wide v9, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mEnterAnimationEnd:J
-
     sub-long/2addr v9, v1
 
     mul-long v9, v9, v4
@@ -413,21 +408,17 @@
 
     if-eqz v9, :cond_4
 
-    iget-wide v9, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mExitAnimationEnd:J
+    iget-wide v10, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mExitAnimationEnd:J
 
-    cmp-long v11, v9, v7
+    cmp-long v12, v10, v7
 
-    if-eqz v11, :cond_5
+    if-eqz v12, :cond_5
 
-    iget-wide v9, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mExitAnimationEnd:J
+    cmp-long v12, v10, v1
 
-    cmp-long v11, v9, v1
+    if-gtz v12, :cond_3
 
-    if-gtz v11, :cond_3
-
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
-    invoke-virtual {v0, v6, v6}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
+    invoke-virtual {v9, v6, v6}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     const/4 v0, 0x0
 
@@ -440,13 +431,11 @@
     goto :goto_2
 
     :cond_3
-    iget-wide v6, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mExitAnimationEnd:J
+    sub-long/2addr v10, v1
 
-    sub-long/2addr v6, v1
+    mul-long v10, v10, v4
 
-    mul-long v6, v6, v4
-
-    long-to-int v3, v6
+    long-to-int v3, v10
 
     iget-object v4, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
 
@@ -555,8 +544,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
     :cond_0
@@ -564,8 +551,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
     :cond_1
@@ -656,8 +641,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mHotspotBounds:Landroid/graphics/Rect;
-
     invoke-virtual {p1, v0}, Landroid/graphics/Rect;->set(Landroid/graphics/Rect;)V
 
     return-void
@@ -692,8 +675,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
     move-result v0
@@ -730,8 +711,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
 
     move-result v0
@@ -768,8 +747,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getMinimumHeight()I
 
     move-result v0
@@ -806,8 +783,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getMinimumWidth()I
 
     move-result v0
@@ -827,8 +802,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->isVisible()Z
 
     move-result v0
@@ -867,8 +840,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->getOutline(Landroid/graphics/Outline;)V
 
     :cond_0
@@ -922,8 +893,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     move-result v0
@@ -965,8 +934,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
-
     invoke-virtual {v0}, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->invalidateCache()V
 
     :cond_0
@@ -1021,8 +988,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     const/4 v0, 0x0
@@ -1045,8 +1010,6 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v2}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     iget-boolean v2, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mHasAlpha:Z
@@ -1130,8 +1093,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
     :cond_0
@@ -1139,8 +1100,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
     :cond_1
@@ -1170,9 +1129,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
-    :goto_0
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setLevel(I)Z
 
     move-result p1
@@ -1184,9 +1140,11 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
+    invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setLevel(I)Z
 
-    goto :goto_0
+    move-result p1
+
+    return p1
 
     :cond_1
     const/4 p1, 0x0
@@ -1201,9 +1159,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
-    :goto_0
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
     move-result p1
@@ -1215,9 +1170,11 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
+    invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
-    goto :goto_0
+    move-result p1
+
+    return p1
 
     :cond_1
     const/4 p1, 0x0
@@ -1288,8 +1245,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, v1, v1}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     :cond_1
@@ -1297,8 +1252,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     iput-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
 
     iget v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurIndex:I
@@ -1331,8 +1284,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, v1, v1}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     :cond_4
@@ -1413,8 +1364,6 @@
     goto :goto_2
 
     :cond_9
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mAnimationRunnable:Ljava/lang/Runnable;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/graphics/drawable/DrawableContainer;->unscheduleSelf(Ljava/lang/Runnable;)V
 
     :goto_2
@@ -1427,7 +1376,7 @@
 .end method
 
 .method public setAlpha(I)V
-    .locals 5
+    .locals 6
 
     iget-boolean v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mHasAlpha:Z
 
@@ -1448,15 +1397,13 @@
 
     if-eqz v0, :cond_2
 
-    iget-wide v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mEnterAnimationEnd:J
+    iget-wide v1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mEnterAnimationEnd:J
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v3, 0x0
 
-    cmp-long v4, v0, v2
+    cmp-long v5, v1, v3
 
-    if-nez v4, :cond_1
-
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
+    if-nez v5, :cond_1
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
 
@@ -1488,10 +1435,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
-
     iget-boolean v0, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mAutoMirrored:Z
 
     invoke-static {p1, v0}, Landroidx/core/graphics/drawable/DrawableCompat;->setAutoMirrored(Landroid/graphics/drawable/Drawable;Z)V
@@ -1509,8 +1452,6 @@
 
     iput-boolean v1, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasColorFilter:Z
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
-
     iget-object v0, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mColorFilter:Landroid/graphics/ColorFilter;
 
     if-eq v0, p1, :cond_0
@@ -1523,8 +1464,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
     :cond_0
@@ -1540,8 +1479,6 @@
 
     if-ltz v0, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurIndex:I
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->getChild(I)Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
@@ -1552,8 +1489,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-direct {p0, p1}, Landroidx/appcompat/graphics/drawable/DrawableContainer;->initializeDrawableForDisplay(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -1593,10 +1528,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
-
     iget-boolean v0, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mDither:Z
 
     invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setDither(Z)V
@@ -1632,8 +1563,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0, p1, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setHotspot(Landroid/graphics/drawable/Drawable;FF)V
 
     :cond_0
@@ -1656,8 +1585,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mHotspotBounds:Landroid/graphics/Rect;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Landroid/graphics/Rect;->set(IIII)V
 
     :goto_0
@@ -1665,8 +1592,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0, p1, p2, p3, p4}, Landroidx/core/graphics/drawable/DrawableCompat;->setHotspotBounds(Landroid/graphics/drawable/Drawable;IIII)V
 
     :cond_1
@@ -1682,8 +1607,6 @@
 
     iput-boolean v1, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintList:Z
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
-
     iget-object v0, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintList:Landroid/content/res/ColorStateList;
 
     if-eq v0, p1, :cond_0
@@ -1713,8 +1636,6 @@
 
     iput-boolean v1, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintMode:Z
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
-
     iget-object v0, v0, Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintMode:Landroid/graphics/PorterDuff$Mode;
 
     if-eq v0, p1, :cond_0
@@ -1742,8 +1663,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, p1, p2}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     :cond_0
@@ -1751,8 +1670,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/appcompat/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, p1, p2}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     :cond_1
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableWrapper.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableWrapper.smali
index 0a9d7f8235..a52cae3645 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawableWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/graphics/drawable/DrawableWrapper;
 .super Landroid/graphics/drawable/Drawable;
+.source "DrawableWrapper.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
@@ -400,8 +401,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/graphics/drawable/DrawableWrapper;->mDrawable:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali
index f6d675b511..648a277d2e 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable$ArrowDirection;
 .super Ljava/lang/Object;
+.source "DrawerArrowDrawable.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.smali
index b713ed2d52..e459edd6e2 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "DrawerArrowDrawable.java"
 
 
 # annotations
@@ -234,7 +235,7 @@
 
 # virtual methods
 .method public draw(Landroid/graphics/Canvas;)V
-    .locals 19
+    .locals 18
 
     move-object/from16 v0, p0
 
@@ -262,11 +263,14 @@
 
     if-ne v3, v6, :cond_1
 
-    :goto_0
+    const/4 v5, 0x1
+
+    goto :goto_0
+
     :pswitch_0
     const/4 v5, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-static/range {p0 .. p0}, Landroidx/core/graphics/drawable/DrawableCompat;->getLayoutDirection(Landroid/graphics/drawable/Drawable;)I
@@ -275,16 +279,14 @@
 
     if-nez v3, :cond_1
 
-    goto :goto_0
+    const/4 v5, 0x1
 
     :cond_1
-    :goto_1
+    :goto_0
     :pswitch_1
     iget v3, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mArrowHeadLength:F
 
-    iget v4, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mArrowHeadLength:F
-
-    mul-float v3, v3, v4
+    mul-float v3, v3, v3
 
     const/high16 v4, 0x40000000    # 2.0f
 
@@ -344,24 +346,24 @@
 
     const/4 v11, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/high16 v11, -0x3ccc0000    # -180.0f
 
-    :goto_2
+    :goto_1
     const/high16 v12, 0x43340000    # 180.0f
 
     if-eqz v5, :cond_3
 
     const/high16 v13, 0x43340000    # 180.0f
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const/4 v13, 0x0
 
-    :goto_3
+    :goto_2
     iget v14, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mProgress:F
 
     invoke-static {v11, v13, v14}, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->lerp(FFF)F
@@ -382,93 +384,91 @@
 
     mul-double v16, v16, v13
 
-    move/from16 v18, v5
-
     invoke-static/range {v16 .. v17}, Ljava/lang/Math;->round(D)J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    long-to-float v3, v4
+    long-to-float v3, v3
 
     invoke-static {v10, v11}, Ljava/lang/Math;->sin(D)D
 
-    move-result-wide v4
+    move-result-wide v10
 
     invoke-static {v13, v14}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v13, v13, v4
+    mul-double v13, v13, v10
 
     invoke-static {v13, v14}, Ljava/lang/Math;->round(D)J
 
-    move-result-wide v4
+    move-result-wide v10
 
-    long-to-float v4, v4
+    long-to-float v4, v10
 
-    iget-object v5, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
+    iget-object v10, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
-    invoke-virtual {v5}, Landroid/graphics/Path;->rewind()V
+    invoke-virtual {v10}, Landroid/graphics/Path;->rewind()V
 
-    iget v5, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mBarGap:F
+    iget v10, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mBarGap:F
 
-    iget-object v9, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint;
+    iget-object v11, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint;
 
-    invoke-virtual {v9}, Landroid/graphics/Paint;->getStrokeWidth()F
+    invoke-virtual {v11}, Landroid/graphics/Paint;->getStrokeWidth()F
 
-    move-result v9
+    move-result v11
 
-    add-float/2addr v5, v9
+    add-float/2addr v10, v11
 
-    iget v9, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mMaxCutForBarSize:F
+    iget v11, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mMaxCutForBarSize:F
 
-    neg-float v9, v9
+    neg-float v11, v11
 
-    iget v10, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mProgress:F
+    iget v13, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mProgress:F
 
-    invoke-static {v5, v9, v10}, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->lerp(FFF)F
+    invoke-static {v10, v11, v13}, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->lerp(FFF)F
 
-    move-result v5
+    move-result v10
 
-    neg-float v9, v7
+    neg-float v11, v7
 
-    const/high16 v10, 0x40000000    # 2.0f
+    const/high16 v9, 0x40000000    # 2.0f
 
-    div-float/2addr v9, v10
+    div-float/2addr v11, v9
 
-    iget-object v11, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
+    iget-object v13, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
-    add-float v13, v9, v8
+    add-float v14, v11, v8
 
-    const/4 v14, 0x0
+    const/4 v6, 0x0
 
-    invoke-virtual {v11, v13, v14}, Landroid/graphics/Path;->moveTo(FF)V
+    invoke-virtual {v13, v14, v6}, Landroid/graphics/Path;->moveTo(FF)V
 
-    iget-object v11, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
+    iget-object v13, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
-    mul-float v8, v8, v10
+    mul-float v8, v8, v9
 
     sub-float/2addr v7, v8
 
-    invoke-virtual {v11, v7, v14}, Landroid/graphics/Path;->rLineTo(FF)V
+    invoke-virtual {v13, v7, v6}, Landroid/graphics/Path;->rLineTo(FF)V
 
-    iget-object v7, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
+    iget-object v6, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
-    invoke-virtual {v7, v9, v5}, Landroid/graphics/Path;->moveTo(FF)V
+    invoke-virtual {v6, v11, v10}, Landroid/graphics/Path;->moveTo(FF)V
 
-    iget-object v7, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
+    iget-object v6, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
-    invoke-virtual {v7, v3, v4}, Landroid/graphics/Path;->rLineTo(FF)V
+    invoke-virtual {v6, v3, v4}, Landroid/graphics/Path;->rLineTo(FF)V
 
-    iget-object v7, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
+    iget-object v6, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
-    neg-float v5, v5
+    neg-float v7, v10
 
-    invoke-virtual {v7, v9, v5}, Landroid/graphics/Path;->moveTo(FF)V
+    invoke-virtual {v6, v11, v7}, Landroid/graphics/Path;->moveTo(FF)V
 
-    iget-object v5, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
+    iget-object v6, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
     neg-float v4, v4
 
-    invoke-virtual {v5, v3, v4}, Landroid/graphics/Path;->rLineTo(FF)V
+    invoke-virtual {v6, v3, v4}, Landroid/graphics/Path;->rLineTo(FF)V
 
     iget-object v3, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path;
 
@@ -488,19 +488,19 @@
 
     int-to-float v4, v4
 
-    const/high16 v5, 0x40400000    # 3.0f
+    const/high16 v6, 0x40400000    # 3.0f
 
-    mul-float v5, v5, v3
+    mul-float v6, v6, v3
 
-    sub-float/2addr v4, v5
+    sub-float/2addr v4, v6
 
-    iget v5, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mBarGap:F
+    iget v6, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mBarGap:F
 
     const/high16 v7, 0x40000000    # 2.0f
 
-    mul-float v5, v5, v7
+    mul-float v7, v7, v6
 
-    sub-float/2addr v4, v5
+    sub-float/2addr v4, v7
 
     float-to-int v4, v4
 
@@ -510,13 +510,11 @@
 
     int-to-float v4, v4
 
-    const/high16 v5, 0x3fc00000    # 1.5f
+    const/high16 v7, 0x3fc00000    # 1.5f
 
-    mul-float v3, v3, v5
+    mul-float v3, v3, v7
 
-    iget v5, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mBarGap:F
-
-    add-float/2addr v3, v5
+    add-float/2addr v3, v6
 
     add-float/2addr v4, v3
 
@@ -534,13 +532,18 @@
 
     iget-boolean v2, v0, Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->mVerticalMirror:Z
 
-    xor-int v2, v2, v18
+    xor-int/2addr v2, v5
 
     if-eqz v2, :cond_4
 
     const/4 v6, -0x1
 
+    goto :goto_3
+
     :cond_4
+    const/4 v6, 0x1
+
+    :goto_3
     int-to-float v2, v6
 
     mul-float v11, v15, v2
@@ -550,7 +553,7 @@
     goto :goto_4
 
     :cond_5
-    if-eqz v18, :cond_6
+    if-eqz v5, :cond_6
 
     invoke-virtual {v1, v12}, Landroid/graphics/Canvas;->rotate(F)V
 
@@ -566,6 +569,8 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable$StateListState.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable$StateListState.smali
index b0bd253654..5ff8cdf47e 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable$StateListState.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable$StateListState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;
 .super Landroidx/appcompat/graphics/drawable/DrawableContainer$DrawableContainerState;
+.source "StateListDrawable.java"
 
 
 # annotations
@@ -27,7 +28,6 @@
 
     iget-object p1, p1, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
 
-    :goto_0
     iput-object p1, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
 
     return-void
@@ -39,7 +39,9 @@
 
     new-array p1, p1, [[I
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
+
+    return-void
 .end method
 
 
@@ -112,32 +114,28 @@
 .end method
 
 .method mutate()V
-    .locals 3
+    .locals 4
 
     iget-object v0, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
 
+    array-length v1, v0
+
+    new-array v1, v1, [[I
+
     array-length v0, v0
 
-    new-array v0, v0, [[I
-
-    iget-object v1, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
-
-    array-length v1, v1
-
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v0, v0, -0x1
 
     :goto_0
-    if-ltz v1, :cond_1
+    if-ltz v0, :cond_1
 
     iget-object v2, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v0
 
-    if-eqz v2, :cond_0
+    if-eqz v3, :cond_0
 
-    iget-object v2, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
-
-    aget-object v2, v2, v1
+    aget-object v2, v2, v0
 
     invoke-virtual {v2}, [I->clone()Ljava/lang/Object;
 
@@ -151,14 +149,14 @@
     const/4 v2, 0x0
 
     :goto_1
-    aput-object v2, v0, v1
+    aput-object v2, v1, v0
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v0, v0, -0x1
 
     goto :goto_0
 
     :cond_1
-    iput-object v0, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
+    iput-object v1, p0, Landroidx/appcompat/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable.smali
index 9a0a6228d6..916b4c6272 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/StateListDrawable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/graphics/drawable/StateListDrawable;
 .super Landroidx/appcompat/graphics/drawable/DrawableContainer;
+.source "StateListDrawable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/text/AllCapsTransformationMethod.smali b/com.discord/smali/androidx/appcompat/text/AllCapsTransformationMethod.smali
index 10fc3dba38..d575501e3a 100644
--- a/com.discord/smali/androidx/appcompat/text/AllCapsTransformationMethod.smali
+++ b/com.discord/smali/androidx/appcompat/text/AllCapsTransformationMethod.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/text/AllCapsTransformationMethod;
 .super Ljava/lang/Object;
+.source "AllCapsTransformationMethod.java"
 
 # interfaces
 .implements Landroid/text/method/TransformationMethod;
diff --git a/com.discord/smali/androidx/appcompat/view/ActionBarPolicy.smali b/com.discord/smali/androidx/appcompat/view/ActionBarPolicy.smali
index f70366c731..89a75d2401 100644
--- a/com.discord/smali/androidx/appcompat/view/ActionBarPolicy.smali
+++ b/com.discord/smali/androidx/appcompat/view/ActionBarPolicy.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/ActionBarPolicy;
 .super Ljava/lang/Object;
+.source "ActionBarPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/ActionMode$Callback.smali b/com.discord/smali/androidx/appcompat/view/ActionMode$Callback.smali
index 819c4cb5ea..6bacef6b37 100644
--- a/com.discord/smali/androidx/appcompat/view/ActionMode$Callback.smali
+++ b/com.discord/smali/androidx/appcompat/view/ActionMode$Callback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/ActionMode$Callback;
 .super Ljava/lang/Object;
+.source "ActionMode.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/ActionMode.smali b/com.discord/smali/androidx/appcompat/view/ActionMode.smali
index 2e1881af50..399a5572a5 100644
--- a/com.discord/smali/androidx/appcompat/view/ActionMode.smali
+++ b/com.discord/smali/androidx/appcompat/view/ActionMode.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/appcompat/view/ActionMode;
 .super Ljava/lang/Object;
+.source "ActionMode.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/CollapsibleActionView.smali b/com.discord/smali/androidx/appcompat/view/CollapsibleActionView.smali
index 78777d9740..213816a4cb 100644
--- a/com.discord/smali/androidx/appcompat/view/CollapsibleActionView.smali
+++ b/com.discord/smali/androidx/appcompat/view/CollapsibleActionView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/CollapsibleActionView;
 .super Ljava/lang/Object;
+.source "CollapsibleActionView.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/appcompat/view/ContextThemeWrapper.smali b/com.discord/smali/androidx/appcompat/view/ContextThemeWrapper.smali
index de6706b6b8..1092552bc5 100644
--- a/com.discord/smali/androidx/appcompat/view/ContextThemeWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/ContextThemeWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/ContextThemeWrapper;
 .super Landroid/content/ContextWrapper;
+.source "ContextThemeWrapper.java"
 
 
 # instance fields
@@ -64,10 +65,9 @@
 
     move-result-object v0
 
-    :goto_0
     iput-object v0, p0, Landroidx/appcompat/view/ContextThemeWrapper;->mResources:Landroid/content/res/Resources;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -86,10 +86,10 @@
 
     move-result-object v0
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/appcompat/view/ContextThemeWrapper;->mResources:Landroid/content/res/Resources;
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Landroidx/appcompat/view/ContextThemeWrapper;->mResources:Landroid/content/res/Resources;
 
     return-object v0
@@ -271,8 +271,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/ContextThemeWrapper;->mTheme:Landroid/content/res/Resources$Theme;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/view/StandaloneActionMode.smali b/com.discord/smali/androidx/appcompat/view/StandaloneActionMode.smali
index 5f9d80dd4e..2f46137af3 100644
--- a/com.discord/smali/androidx/appcompat/view/StandaloneActionMode.smali
+++ b/com.discord/smali/androidx/appcompat/view/StandaloneActionMode.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/StandaloneActionMode;
 .super Landroidx/appcompat/view/ActionMode;
+.source "StandaloneActionMode.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$Callback;
@@ -110,8 +111,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/StandaloneActionMode;->mCustomView:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper$CallbackWrapper.smali b/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper$CallbackWrapper.smali
index edc0cce166..90a57e79dd 100644
--- a/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper$CallbackWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper$CallbackWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/SupportActionModeWrapper$CallbackWrapper;
 .super Ljava/lang/Object;
+.source "SupportActionModeWrapper.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/ActionMode$Callback;
diff --git a/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper.smali b/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper.smali
index 0cd9043351..7a03853f04 100644
--- a/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/SupportActionModeWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/SupportActionModeWrapper;
 .super Landroid/view/ActionMode;
+.source "SupportActionModeWrapper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali b/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali
index 5afe5b7b23..7c718c410f 100644
--- a/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali
+++ b/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/SupportMenuInflater$InflatedOnMenuItemClickListener;
 .super Ljava/lang/Object;
+.source "SupportMenuInflater.java"
 
 # interfaces
 .implements Landroid/view/MenuItem$OnMenuItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$MenuState.smali b/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$MenuState.smali
index a1cabeb5a4..e1127923c7 100644
--- a/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$MenuState.smali
+++ b/com.discord/smali/androidx/appcompat/view/SupportMenuInflater$MenuState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/SupportMenuInflater$MenuState;
 .super Ljava/lang/Object;
+.source "SupportMenuInflater.java"
 
 
 # annotations
@@ -174,11 +175,11 @@
 
     invoke-virtual {p2, p3}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object p2
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p2
+    return-object p1
 
     :catch_0
     move-exception p2
@@ -257,8 +258,6 @@
 
     if-ltz v0, :cond_1
 
-    iget v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemShowAsAction:I
-
     invoke-interface {p1, v0}, Landroid/view/MenuItem;->setShowAsAction(I)V
 
     :cond_1
@@ -338,8 +337,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemActionViewClassName:Ljava/lang/String;
-
     sget-object v1, Landroidx/appcompat/view/SupportMenuInflater;->ACTION_VIEW_CONSTRUCTOR_SIGNATURE:[Ljava/lang/Class;
 
     iget-object v2, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->this$0:Landroidx/appcompat/view/SupportMenuInflater;
@@ -363,8 +360,6 @@
 
     if-nez v2, :cond_7
 
-    iget v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemActionViewLayout:I
-
     invoke-interface {p1, v0}, Landroid/view/MenuItem;->setActionView(I)Landroid/view/MenuItem;
 
     goto :goto_3
@@ -382,8 +377,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemActionProvider:Landroidx/core/view/ActionProvider;
-
     invoke-static {p1, v0}, Landroidx/core/view/MenuItemCompat;->setActionProvider(Landroid/view/MenuItem;Landroidx/core/view/ActionProvider;)Landroid/view/MenuItem;
 
     :cond_9
@@ -411,8 +404,6 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemIconTintMode:Landroid/graphics/PorterDuff$Mode;
-
     invoke-static {p1, v0}, Landroidx/core/view/MenuItemCompat;->setIconTintMode(Landroid/view/MenuItem;Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_a
@@ -420,8 +411,6 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemIconTintList:Landroid/content/res/ColorStateList;
-
     invoke-static {p1, v0}, Landroidx/core/view/MenuItemCompat;->setIconTintList(Landroid/view/MenuItem;Landroid/content/res/ColorStateList;)V
 
     :cond_b
@@ -695,14 +684,16 @@
 
     move-result v0
 
+    iput v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemCheckable:I
+
     goto :goto_0
 
     :cond_0
     iget v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->groupCheckable:I
 
-    :goto_0
     iput v0, p0, Landroidx/appcompat/view/SupportMenuInflater$MenuState;->itemCheckable:I
 
+    :goto_0
     sget v0, Landroidx/appcompat/R$styleable;->MenuItem_android_checked:I
 
     invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
diff --git a/com.discord/smali/androidx/appcompat/view/SupportMenuInflater.smali b/com.discord/smali/androidx/appcompat/view/SupportMenuInflater.smali
index bb3df8f3da..aa5ec05402 100644
--- a/com.discord/smali/androidx/appcompat/view/SupportMenuInflater.smali
+++ b/com.discord/smali/androidx/appcompat/view/SupportMenuInflater.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/SupportMenuInflater;
 .super Landroid/view/MenuInflater;
+.source "SupportMenuInflater.java"
 
 
 # annotations
@@ -432,88 +433,62 @@
 
     invoke-virtual {v1, p1}, Landroid/content/res/Resources;->getLayout(I)Landroid/content/res/XmlResourceParser;
 
-    move-result-object p1
-    :try_end_0
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_3
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-static {p1}, Landroid/util/Xml;->asAttributeSet(Lorg/xmlpull/v1/XmlPullParser;)Landroid/util/AttributeSet;
-
     move-result-object v0
 
-    invoke-direct {p0, p1, v0, p2}, Landroidx/appcompat/view/SupportMenuInflater;->parseMenu(Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/view/Menu;)V
-    :try_end_1
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    invoke-static {v0}, Landroid/util/Xml;->asAttributeSet(Lorg/xmlpull/v1/XmlPullParser;)Landroid/util/AttributeSet;
 
-    if-eqz p1, :cond_1
+    move-result-object p1
 
-    invoke-interface {p1}, Landroid/content/res/XmlResourceParser;->close()V
+    invoke-direct {p0, v0, p1, p2}, Landroidx/appcompat/view/SupportMenuInflater;->parseMenu(Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/view/Menu;)V
+    :try_end_0
+    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {v0}, Landroid/content/res/XmlResourceParser;->close()V
+
+    return-void
 
     :cond_1
     return-void
 
     :catchall_0
-    move-exception p2
-
-    move-object v0, p1
-
-    goto :goto_2
-
-    :catch_0
-    move-exception p2
-
-    move-object v0, p1
+    move-exception p1
 
     goto :goto_0
 
+    :catch_0
+    move-exception p1
+
+    :try_start_1
+    new-instance p2, Landroid/view/InflateException;
+
+    const-string v1, "Error inflating menu XML"
+
+    invoke-direct {p2, v1, p1}, Landroid/view/InflateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p2
+
     :catch_1
-    move-exception p2
+    move-exception p1
 
-    move-object v0, p1
+    new-instance p2, Landroid/view/InflateException;
 
-    goto :goto_1
+    const-string v1, "Error inflating menu XML"
 
-    :catchall_1
-    move-exception p2
+    invoke-direct {p2, v1, p1}, Landroid/view/InflateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    goto :goto_2
-
-    :catch_2
-    move-exception p2
+    throw p2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    :try_start_2
-    new-instance p1, Landroid/view/InflateException;
-
-    const-string v1, "Error inflating menu XML"
-
-    invoke-direct {p1, v1, p2}, Landroid/view/InflateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p1
-
-    :catch_3
-    move-exception p2
-
-    :goto_1
-    new-instance p1, Landroid/view/InflateException;
-
-    const-string v1, "Error inflating menu XML"
-
-    invoke-direct {p1, v1, p2}, Landroid/view/InflateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :goto_2
     if-eqz v0, :cond_2
 
     invoke-interface {v0}, Landroid/content/res/XmlResourceParser;->close()V
 
     :cond_2
-    throw p2
+    throw p1
 .end method
diff --git a/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet$1.smali b/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet$1.smali
index 2d31629db8..f6d5e5103d 100644
--- a/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet$1.smali
+++ b/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet$1;
 .super Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
+.source "ViewPropertyAnimatorCompatSet.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet.smali b/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet.smali
index 40d915cf1a..9394f64655 100644
--- a/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet.smali
+++ b/com.discord/smali/androidx/appcompat/view/ViewPropertyAnimatorCompatSet.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;
 .super Ljava/lang/Object;
+.source "ViewPropertyAnimatorCompatSet.java"
 
 
 # annotations
@@ -221,8 +222,6 @@
 
     if-ltz v6, :cond_1
 
-    iget-wide v2, p0, Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;->mDuration:J
-
     invoke-virtual {v1, v2, v3}, Landroidx/core/view/ViewPropertyAnimatorCompat;->setDuration(J)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     :cond_1
@@ -230,8 +229,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/appcompat/view/ViewPropertyAnimatorCompatSet;->mInterpolator:Landroid/view/animation/Interpolator;
-
     invoke-virtual {v1, v2}, Landroidx/core/view/ViewPropertyAnimatorCompat;->setInterpolator(Landroid/view/animation/Interpolator;)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     :cond_2
diff --git a/com.discord/smali/androidx/appcompat/view/WindowCallbackWrapper.smali b/com.discord/smali/androidx/appcompat/view/WindowCallbackWrapper.smali
index 6fc8f2f1d5..2bff4a8bc9 100644
--- a/com.discord/smali/androidx/appcompat/view/WindowCallbackWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/WindowCallbackWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/WindowCallbackWrapper;
 .super Ljava/lang/Object;
+.source "WindowCallbackWrapper.java"
 
 # interfaces
 .implements Landroid/view/Window$Callback;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItem.smali b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItem.smali
index d425269184..0985e8672a 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItem.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItem.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/ActionMenuItem;
 .super Ljava/lang/Object;
+.source "ActionMenuItem.java"
 
 # interfaces
 .implements Landroidx/core/internal/view/SupportMenuItem;
@@ -346,8 +347,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ActionMenuItem;->mTitleCondensed:Ljava/lang/CharSequence;
-
     return-object v0
 
     :cond_0
@@ -381,8 +380,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ActionMenuItem;->mClickListener:Landroid/view/MenuItem$OnMenuItemClickListener;
-
     invoke-interface {v0, p0}, Landroid/view/MenuItem$OnMenuItemClickListener;->onMenuItemClick(Landroid/view/MenuItem;)Z
 
     move-result v0
@@ -396,11 +393,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ActionMenuItem;->mContext:Landroid/content/Context;
+    iget-object v2, p0, Landroidx/appcompat/view/menu/ActionMenuItem;->mContext:Landroid/content/Context;
 
-    iget-object v2, p0, Landroidx/appcompat/view/menu/ActionMenuItem;->mIntent:Landroid/content/Intent;
-
-    invoke-virtual {v0, v2}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
+    invoke-virtual {v2, v0}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
     return v1
 
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$ActionMenuItemForwardingListener.smali b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$ActionMenuItemForwardingListener.smali
index 37d0d9613b..3d7e652a89 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$ActionMenuItemForwardingListener.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$ActionMenuItemForwardingListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/ActionMenuItemView$ActionMenuItemForwardingListener;
 .super Landroidx/appcompat/widget/ForwardingListener;
+.source "ActionMenuItemView.java"
 
 
 # annotations
@@ -64,7 +65,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/ActionMenuItemView$ActionMenuItemForwardingListener;->this$0:Landroidx/appcompat/view/menu/ActionMenuItemView;
 
@@ -78,7 +79,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {p0}, Landroidx/appcompat/view/menu/ActionMenuItemView$ActionMenuItemForwardingListener;->getPopup()Landroidx/appcompat/view/menu/ShowableListMenu;
 
@@ -98,4 +99,7 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$PopupCallback.smali b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$PopupCallback.smali
index a7cfcbe652..806bd9111d 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$PopupCallback.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView$PopupCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/appcompat/view/menu/ActionMenuItemView$PopupCallback;
 .super Ljava/lang/Object;
+.source "ActionMenuItemView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView.smali b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView.smali
index 9cad6705e6..de78939c08 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ActionMenuItemView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/ActionMenuItemView;
 .super Landroidx/appcompat/widget/AppCompatTextView;
+.source "ActionMenuItemView.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -266,10 +267,15 @@
 
     move-result-object v2
 
-    :cond_4
     :goto_2
     invoke-virtual {p0, v2}, Landroidx/appcompat/view/menu/ActionMenuItemView;->setContentDescription(Ljava/lang/CharSequence;)V
 
+    goto :goto_3
+
+    :cond_4
+    invoke-virtual {p0, v2}, Landroidx/appcompat/view/menu/ActionMenuItemView;->setContentDescription(Ljava/lang/CharSequence;)V
+
+    :goto_3
     iget-object v2, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mItemData:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-virtual {v2}, Landroidx/appcompat/view/menu/MenuItemImpl;->getTooltipText()Ljava/lang/CharSequence;
@@ -284,7 +290,7 @@
 
     if-eqz v0, :cond_5
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_5
     iget-object v0, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mItemData:Landroidx/appcompat/view/menu/MenuItemImpl;
@@ -293,7 +299,7 @@
 
     move-result-object v1
 
-    :goto_3
+    :goto_4
     invoke-static {p0, v1}, Landroidx/appcompat/widget/TooltipCompat;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
 
     return-void
@@ -446,8 +452,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mItemInvoker:Landroidx/appcompat/view/menu/MenuBuilder$ItemInvoker;
-
     iget-object v0, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mItemData:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-interface {p1, v0}, Landroidx/appcompat/view/menu/MenuBuilder$ItemInvoker;->invokeItem(Landroidx/appcompat/view/menu/MenuItemImpl;)Z
@@ -485,8 +489,6 @@
 
     if-ltz v1, :cond_0
 
-    iget v1, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mSavedPaddingLeft:I
-
     invoke-virtual {p0}, Landroidx/appcompat/view/menu/ActionMenuItemView;->getPaddingTop()I
 
     move-result v2
@@ -616,8 +618,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mForwardingListener:Landroidx/appcompat/widget/ForwardingListener;
-
     invoke-virtual {v0, p0, p1}, Landroidx/appcompat/widget/ForwardingListener;->onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
 
     move-result v0
@@ -669,8 +669,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mItemData:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuItemImpl;->actionFormatChanged()V
 
     :cond_0
@@ -678,7 +676,7 @@
 .end method
 
 .method public setIcon(Landroid/graphics/drawable/Drawable;)V
-    .locals 3
+    .locals 4
 
     iput-object p1, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mIcon:Landroid/graphics/drawable/Drawable;
 
@@ -696,43 +694,39 @@
 
     if-le v0, v2, :cond_0
 
-    iget v2, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mMaxIconSize:I
-
-    int-to-float v2, v2
+    int-to-float v3, v2
 
     int-to-float v0, v0
 
-    div-float/2addr v2, v0
+    div-float/2addr v3, v0
 
-    iget v0, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mMaxIconSize:I
+    int-to-float v0, v1
 
-    int-to-float v1, v1
+    mul-float v0, v0, v3
 
-    mul-float v1, v1, v2
+    float-to-int v1, v0
 
-    float-to-int v1, v1
+    move v0, v2
 
     :cond_0
     iget v2, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mMaxIconSize:I
 
     if-le v1, v2, :cond_1
 
-    iget v2, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mMaxIconSize:I
-
-    int-to-float v2, v2
+    int-to-float v3, v2
 
     int-to-float v1, v1
 
-    div-float/2addr v2, v1
-
-    iget v1, p0, Landroidx/appcompat/view/menu/ActionMenuItemView;->mMaxIconSize:I
+    div-float/2addr v3, v1
 
     int-to-float v0, v0
 
-    mul-float v0, v0, v2
+    mul-float v0, v0, v3
 
     float-to-int v0, v0
 
+    move v1, v2
+
     :cond_1
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/androidx/appcompat/view/menu/BaseMenuPresenter.smali b/com.discord/smali/androidx/appcompat/view/menu/BaseMenuPresenter.smali
index d2981b2b24..bd68e43fdc 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/BaseMenuPresenter.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/BaseMenuPresenter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/appcompat/view/menu/BaseMenuPresenter;
 .super Ljava/lang/Object;
+.source "BaseMenuPresenter.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter;
@@ -238,8 +239,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuPresenter;->mCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onCloseMenu(Landroidx/appcompat/view/menu/MenuBuilder;Z)V
 
     :cond_0
@@ -253,8 +252,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuPresenter;->mCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onOpenSubMenu(Landroidx/appcompat/view/menu/MenuBuilder;)Z
 
     move-result p1
@@ -309,8 +306,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuPresenter;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/MenuBuilder;->flagActionItems()V
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuPresenter;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/BaseMenuWrapper.smali b/com.discord/smali/androidx/appcompat/view/menu/BaseMenuWrapper.smali
index e293f83d88..f9f914e2f1 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/BaseMenuWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/BaseMenuWrapper.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/appcompat/view/menu/BaseMenuWrapper;
 .super Landroidx/appcompat/view/menu/BaseWrapper;
+.source "BaseMenuWrapper.java"
 
 
 # annotations
@@ -65,7 +66,7 @@
 
     instance-of v0, p1, Landroidx/core/internal/view/SupportMenuItem;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     move-object v0, p1
 
@@ -104,6 +105,9 @@
 
     :cond_1
     return-object p1
+
+    :cond_2
+    return-object p1
 .end method
 
 .method final getSubMenuWrapper(Landroid/view/SubMenu;)Landroid/view/SubMenu;
@@ -160,8 +164,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuWrapper;->mMenuItems:Ljava/util/Map;
-
     invoke-interface {v0}, Ljava/util/Map;->clear()V
 
     :cond_0
@@ -169,8 +171,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuWrapper;->mSubMenus:Ljava/util/Map;
-
     invoke-interface {v0}, Ljava/util/Map;->clear()V
 
     :cond_1
@@ -187,8 +187,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuWrapper;->mMenuItems:Ljava/util/Map;
-
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v0
@@ -235,8 +233,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/view/menu/BaseMenuWrapper;->mMenuItems:Ljava/util/Map;
-
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/appcompat/view/menu/BaseWrapper.smali b/com.discord/smali/androidx/appcompat/view/menu/BaseWrapper.smali
index 8a8fba8845..0eefe5f919 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/BaseWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/BaseWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/BaseWrapper;
 .super Ljava/lang/Object;
+.source "BaseWrapper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$1.smali b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$1.smali
index e33e874a18..1e0aa6e0fb 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$1.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/CascadingMenuPopup$1;
 .super Ljava/lang/Object;
+.source "CascadingMenuPopup.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;
@@ -122,6 +123,8 @@
 
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/CascadingMenuPopup;->dismiss()V
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$2.smali b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$2.smali
index e99ae222f6..3a7be88820 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$2.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/CascadingMenuPopup$2;
 .super Ljava/lang/Object;
+.source "CascadingMenuPopup.java"
 
 # interfaces
 .implements Landroid/view/View$OnAttachStateChangeListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3$1.smali b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3$1.smali
index 25c262c288..097bd1b33d 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3$1.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/CascadingMenuPopup$3$1;
 .super Ljava/lang/Object;
+.source "CascadingMenuPopup.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3.smali b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3.smali
index c01a99ae96..0198fdc1e9 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/CascadingMenuPopup$3;
 .super Ljava/lang/Object;
+.source "CascadingMenuPopup.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/MenuItemHoverListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali
index d3102971ba..5b5dcd0a28 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/CascadingMenuPopup$CascadingMenuInfo;
 .super Ljava/lang/Object;
+.source "CascadingMenuPopup.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$HorizPosition.smali b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$HorizPosition.smali
index b5cd81efa8..640b76dde2 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$HorizPosition.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup$HorizPosition.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/appcompat/view/menu/CascadingMenuPopup$HorizPosition;
 .super Ljava/lang/Object;
+.source "CascadingMenuPopup.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup.smali b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup.smali
index cc4204b0cc..0b9ad4fda2 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/CascadingMenuPopup.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/view/menu/CascadingMenuPopup;
 .super Landroidx/appcompat/view/menu/MenuPopup;
+.source "CascadingMenuPopup.java"
 
 # interfaces
 .implements Landroid/view/View$OnKeyListener;
@@ -496,9 +497,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mShowingMenus:Ljava/util/List;
 
-    iget-object v1, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mShowingMenus:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -652,9 +651,7 @@
 
     iget-object v1, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mShowingMenus:Ljava/util/List;
 
-    iget-object v6, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mShowingMenus:Ljava/util/List;
-
-    invoke-interface {v6}, Ljava/util/List;->size()I
+    invoke-interface {v1}, Ljava/util/List;->size()I
 
     move-result v6
 
@@ -777,42 +774,45 @@
 
     and-int/2addr v10, v11
 
-    if-ne v10, v11, :cond_8
+    if-ne v10, v11, :cond_7
 
     if-eqz v9, :cond_6
 
-    :goto_4
     add-int/2addr v12, v2
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_6
     invoke-virtual {v6}, Landroid/view/View;->getWidth()I
 
     move-result v2
 
-    :cond_7
     sub-int/2addr v12, v2
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_8
-    if-eqz v9, :cond_7
+    :cond_7
+    if-eqz v9, :cond_8
 
     invoke-virtual {v6}, Landroid/view/View;->getWidth()I
 
     move-result v2
 
+    add-int/2addr v12, v2
+
     goto :goto_4
 
-    :goto_5
+    :cond_8
+    sub-int/2addr v12, v2
+
+    :goto_4
     invoke-virtual {v4, v12}, Landroidx/appcompat/widget/MenuPopupWindow;->setHorizontalOffset(I)V
 
     invoke-virtual {v4, v3}, Landroidx/appcompat/widget/MenuPopupWindow;->setOverlapAnchor(Z)V
 
     invoke-virtual {v4, v8}, Landroidx/appcompat/widget/MenuPopupWindow;->setVerticalOffset(I)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_9
     iget-boolean v2, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mHasXOffset:Z
@@ -839,7 +839,7 @@
 
     invoke-virtual {v4, v2}, Landroidx/appcompat/widget/MenuPopupWindow;->setEpicenterBounds(Landroid/graphics/Rect;)V
 
-    :goto_6
+    :goto_5
     new-instance v2, Landroidx/appcompat/view/menu/CascadingMenuPopup$CascadingMenuInfo;
 
     iget v3, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mLastPosition:I
@@ -1012,9 +1012,7 @@
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mShowingMenus:Ljava/util/List;
 
-    iget-object v1, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mShowingMenus:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -1158,19 +1156,18 @@
 
     iget v1, v1, Landroidx/appcompat/view/menu/CascadingMenuPopup$CascadingMenuInfo;->position:I
 
-    :goto_0
     iput v1, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mLastPosition:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-direct {p0}, Landroidx/appcompat/view/menu/CascadingMenuPopup;->getInitialMenuPosition()I
 
     move-result v1
 
-    goto :goto_0
+    iput v1, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mLastPosition:I
 
-    :goto_1
+    :goto_0
     if-nez v0, :cond_7
 
     invoke-virtual {p0}, Landroidx/appcompat/view/menu/CascadingMenuPopup;->dismiss()V
@@ -1179,8 +1176,6 @@
 
     if-eqz p2, :cond_4
 
-    iget-object p2, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mPresenterCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     const/4 v0, 0x1
 
     invoke-interface {p2, p1, v0}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onCloseMenu(Landroidx/appcompat/view/menu/MenuBuilder;Z)V
@@ -1190,8 +1185,6 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver;
-
     invoke-virtual {p1}, Landroid/view/ViewTreeObserver;->isAlive()Z
 
     move-result p1
@@ -1380,8 +1373,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/CascadingMenuPopup;->mPresenterCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onOpenSubMenu(Landroidx/appcompat/view/menu/MenuBuilder;)Z
 
     :cond_2
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ExpandedMenuView.smali b/com.discord/smali/androidx/appcompat/view/menu/ExpandedMenuView.smali
index 5ca9638f9b..5cc285b74b 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ExpandedMenuView.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ExpandedMenuView.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/view/menu/ExpandedMenuView;
 .super Landroid/widget/ListView;
+.source "ExpandedMenuView.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ListMenuItemView.smali b/com.discord/smali/androidx/appcompat/view/menu/ListMenuItemView.smali
index d7230a3f48..f19233f416 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ListMenuItemView.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ListMenuItemView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/ListMenuItemView;
 .super Landroid/widget/LinearLayout;
+.source "ListMenuItemView.java"
 
 # interfaces
 .implements Landroid/widget/AbsListView$SelectionBoundsAdjuster;
@@ -170,8 +171,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mContent:Landroid/widget/LinearLayout;
-
     invoke-virtual {v0, p1, p2}, Landroid/widget/LinearLayout;->addView(Landroid/view/View;I)V
 
     return-void
@@ -290,8 +289,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mSubMenuArrowView:Landroid/widget/ImageView;
-
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
@@ -317,8 +314,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mGroupDivider:Landroid/widget/ImageView;
-
     invoke-virtual {v0}, Landroid/widget/ImageView;->getVisibility()I
 
     move-result v0
@@ -462,13 +457,11 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mTitleView:Landroid/widget/TextView;
+    iget-object v1, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mTitleView:Landroid/widget/TextView;
 
-    iget-object v1, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mTextAppearanceContext:Landroid/content/Context;
+    iget-object v2, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mTextAppearanceContext:Landroid/content/Context;
 
-    iget v2, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mTextAppearance:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
+    invoke-virtual {v1, v2, v0}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
     sget v0, Landroidx/appcompat/R$id;->shortcut:I
@@ -495,8 +488,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mSubMenuArrowView:Landroid/widget/ImageView;
-
     iget-object v1, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mSubMenuArrow:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
@@ -664,8 +655,6 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mCheckBox:Landroid/widget/CheckBox;
-
     invoke-virtual {p1, v2}, Landroid/widget/CheckBox;->setVisibility(I)V
 
     :cond_6
@@ -673,8 +662,6 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mRadioButton:Landroid/widget/RadioButton;
-
     invoke-virtual {p1, v2}, Landroid/widget/RadioButton;->setVisibility(I)V
 
     :cond_7
@@ -736,8 +723,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mGroupDivider:Landroid/widget/ImageView;
-
     iget-boolean v1, p0, Landroidx/appcompat/view/menu/ListMenuItemView;->mHasListDivider:Z
 
     if-nez v1, :cond_0
@@ -859,6 +844,8 @@
 
     invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
+    return-void
+
     :cond_8
     :goto_4
     return-void
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter.smali b/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter.smali
index 2a4b07328a..ecc620b7d2 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter;
 .super Landroid/widget/BaseAdapter;
+.source "ListMenuPresenter.java"
 
 
 # annotations
@@ -147,8 +148,6 @@
 
     if-ltz v1, :cond_0
 
-    iget v1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter;->mExpandedIndex:I
-
     if-lt p1, v1, :cond_0
 
     add-int/lit8 p1, p1, 0x1
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter.smali b/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter.smali
index d554df0752..729c6f1fff 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ListMenuPresenter.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/ListMenuPresenter;
 .super Ljava/lang/Object;
+.source "ListMenuPresenter.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
@@ -197,15 +198,12 @@
 
     if-eqz v0, :cond_0
 
-    new-instance v0, Landroid/view/ContextThemeWrapper;
+    new-instance v1, Landroid/view/ContextThemeWrapper;
 
-    iget v1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mThemeRes:I
+    invoke-direct {v1, p1, v0}, Landroid/view/ContextThemeWrapper;-><init>(Landroid/content/Context;I)V
 
-    invoke-direct {v0, p1, v1}, Landroid/view/ContextThemeWrapper;-><init>(Landroid/content/Context;I)V
+    iput-object v1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context;
 
-    iput-object v0, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context;
-
-    :goto_0
     iget-object p1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context;
 
     invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater;
@@ -214,7 +212,7 @@
 
     iput-object p1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mInflater:Landroid/view/LayoutInflater;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context;
@@ -227,18 +225,22 @@
 
     if-nez p1, :cond_1
 
-    goto :goto_0
+    iget-object p1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context;
+
+    invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater;
+
+    move-result-object p1
+
+    iput-object p1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mInflater:Landroid/view/LayoutInflater;
 
     :cond_1
-    :goto_1
+    :goto_0
     iput-object p2, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
 
     iget-object p1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mAdapter:Landroidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mAdapter:Landroidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter;->notifyDataSetChanged()V
 
     :cond_2
@@ -252,8 +254,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onCloseMenu(Landroidx/appcompat/view/menu/MenuBuilder;Z)V
 
     :cond_0
@@ -344,8 +344,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onOpenSubMenu(Landroidx/appcompat/view/menu/MenuBuilder;)Z
 
     :cond_1
@@ -384,8 +382,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mMenuView:Landroidx/appcompat/view/menu/ExpandedMenuView;
-
     invoke-virtual {v1, v0}, Landroid/view/View;->saveHierarchyState(Landroid/util/SparseArray;)V
 
     :cond_0
@@ -436,8 +432,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/ListMenuPresenter;->mAdapter:Landroidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/ListMenuPresenter$MenuAdapter;->notifyDataSetChanged()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuAdapter.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuAdapter.smali
index 1b063245b8..dec1ae66f2 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuAdapter.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/MenuAdapter;
 .super Landroid/widget/BaseAdapter;
+.source "MenuAdapter.java"
 
 
 # annotations
@@ -186,8 +187,6 @@
 
     if-ltz v1, :cond_1
 
-    iget v1, p0, Landroidx/appcompat/view/menu/MenuAdapter;->mExpandedIndex:I
-
     if-lt p1, v1, :cond_1
 
     add-int/lit8 p1, p1, 0x1
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$Callback.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$Callback.smali
index 6d42e25723..ad1ac21c97 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$Callback.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$Callback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/menu/MenuBuilder$Callback;
 .super Ljava/lang/Object;
+.source "MenuBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$ItemInvoker.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$ItemInvoker.smali
index 3cdace1a6e..c9ddbc05ba 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$ItemInvoker.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder$ItemInvoker.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/menu/MenuBuilder$ItemInvoker;
 .super Ljava/lang/Object;
+.source "MenuBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder.smali
index f260575338..8c70407644 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuBuilder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/MenuBuilder;
 .super Ljava/lang/Object;
+.source "MenuBuilder.java"
 
 # interfaces
 .implements Landroidx/core/internal/view/SupportMenu;
@@ -343,7 +344,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mPresenters:Ljava/util/concurrent/CopyOnWriteArrayList;
 
@@ -410,6 +411,9 @@
     goto :goto_0
 
     :cond_3
+    return-void
+
+    :cond_4
     :goto_1
     return-void
 .end method
@@ -611,7 +615,7 @@
 .end method
 
 .method private static getOrdering(I)I
-    .locals 2
+    .locals 3
 
     const/high16 v0, -0x10000
 
@@ -623,11 +627,9 @@
 
     sget-object v1, Landroidx/appcompat/view/menu/MenuBuilder;->sCategoryToOrder:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
-
-    sget-object v1, Landroidx/appcompat/view/menu/MenuBuilder;->sCategoryToOrder:[I
+    if-ge v0, v2, :cond_0
 
     aget v0, v1, v0
 
@@ -654,7 +656,7 @@
 .method private removeItemAtInt(IZ)V
     .locals 1
 
-    if-ltz p1, :cond_1
+    if-ltz p1, :cond_2
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mItems:Ljava/util/ArrayList;
 
@@ -678,6 +680,9 @@
     invoke-virtual {p0, p1}, Landroidx/appcompat/view/menu/MenuBuilder;->onItemsChanged(Z)V
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_0
     return-void
 .end method
@@ -995,16 +1000,12 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mCurrentMenuInfo:Landroid/view/ContextMenu$ContextMenuInfo;
-
     invoke-virtual {p1, p2}, Landroidx/appcompat/view/menu/MenuItemImpl;->setMenuInfo(Landroid/view/ContextMenu$ContextMenuInfo;)V
 
     :cond_0
     iget-object p2, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mItems:Ljava/util/ArrayList;
 
-    iget-object p3, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mItems:Ljava/util/ArrayList;
-
-    invoke-static {p3, v7}, Landroidx/appcompat/view/menu/MenuBuilder;->findInsertIndex(Ljava/util/ArrayList;I)I
+    invoke-static {p2, v7}, Landroidx/appcompat/view/menu/MenuBuilder;->findInsertIndex(Ljava/util/ArrayList;I)I
 
     move-result p3
 
@@ -1120,8 +1121,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mCallback:Landroidx/appcompat/view/menu/MenuBuilder$Callback;
-
     invoke-interface {v0, p0}, Landroidx/appcompat/view/menu/MenuBuilder$Callback;->onMenuModeChange(Landroidx/appcompat/view/menu/MenuBuilder;)V
 
     :cond_0
@@ -1135,8 +1134,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/view/menu/MenuBuilder;->collapseItemActionView(Landroidx/appcompat/view/menu/MenuItemImpl;)Z
 
     :cond_0
@@ -1278,7 +1275,7 @@
 
     const/4 v1, 0x0
 
-    if-nez v0, :cond_4
+    if-nez v0, :cond_5
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
 
@@ -1340,6 +1337,9 @@
     iput-object p1, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     :cond_4
+    return v1
+
+    :cond_5
     :goto_1
     return v1
 .end method
@@ -1351,8 +1351,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mCallback:Landroidx/appcompat/view/menu/MenuBuilder$Callback;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/view/menu/MenuBuilder$Callback;->onMenuItemSelected(Landroidx/appcompat/view/menu/MenuBuilder;Landroid/view/MenuItem;)Z
 
     move-result p1
@@ -1970,17 +1968,16 @@
 
     iget-object v5, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mActionItems:Ljava/util/ArrayList;
 
-    :goto_2
     invoke-virtual {v5, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     iget-object v5, p0, Landroidx/appcompat/view/menu/MenuBuilder;->mNonActionItems:Ljava/util/ArrayList;
 
-    goto :goto_2
+    invoke-virtual {v5, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :goto_3
+    :goto_2
     add-int/lit8 v3, v3, 0x1
 
     goto :goto_1
@@ -2390,7 +2387,7 @@
 
     if-nez v1, :cond_0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_0
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuItemImpl;->invoke()Z
@@ -2433,10 +2430,9 @@
 
     if-eqz v1, :cond_8
 
-    :goto_1
     invoke-virtual {p0, v3}, Landroidx/appcompat/view/menu/MenuBuilder;->close(Z)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuItemImpl;->hasSubMenu()Z
@@ -2447,17 +2443,19 @@
 
     if-eqz v4, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     and-int/lit8 p1, p3, 0x1
 
     if-nez p1, :cond_8
 
-    goto :goto_1
+    invoke-virtual {p0, v3}, Landroidx/appcompat/view/menu/MenuBuilder;->close(Z)V
+
+    goto :goto_2
 
     :cond_4
-    :goto_2
+    :goto_1
     and-int/lit8 p3, p3, 0x4
 
     if-nez p3, :cond_5
@@ -2501,14 +2499,14 @@
 
     if-nez v1, :cond_8
 
-    goto :goto_1
+    invoke-virtual {p0, v3}, Landroidx/appcompat/view/menu/MenuBuilder;->close(Z)V
 
     :cond_8
-    :goto_3
+    :goto_2
     return v1
 
     :cond_9
-    :goto_4
+    :goto_3
     return v0
 .end method
 
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuDialogHelper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuDialogHelper.smali
index dde0ce9cf6..6cf3d3acf8 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuDialogHelper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuDialogHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuDialogHelper;
 .super Ljava/lang/Object;
+.source "MenuDialogHelper.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface$OnClickListener;
@@ -38,8 +39,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuDialogHelper;->mDialog:Landroidx/appcompat/app/AlertDialog;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
 
     :cond_0
@@ -87,8 +86,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuDialogHelper;->mPresenterCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onCloseMenu(Landroidx/appcompat/view/menu/MenuBuilder;Z)V
 
     :cond_2
@@ -225,8 +222,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuDialogHelper;->mPresenterCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onOpenSubMenu(Landroidx/appcompat/view/menu/MenuBuilder;)Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuHelper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuHelper.smali
index 3a28ecca57..c65c8d4744 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuHelper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuHelper.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/appcompat/view/menu/MenuHelper;
 .super Ljava/lang/Object;
+.source "MenuHelper.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl$1.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl$1.smali
index 9d4034b9a3..ac47e6b9f7 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl$1.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuItemImpl$1;
 .super Ljava/lang/Object;
+.source "MenuItemImpl.java"
 
 # interfaces
 .implements Landroidx/core/view/ActionProvider$VisibilityListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl.smali
index 29ded64cb5..c2f967c7e2 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemImpl.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/view/menu/MenuItemImpl;
 .super Ljava/lang/Object;
+.source "MenuItemImpl.java"
 
 # interfaces
 .implements Landroidx/core/internal/view/SupportMenuItem;
@@ -254,8 +255,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mOnActionExpandListener:Landroid/view/MenuItem$OnActionExpandListener;
-
     invoke-interface {v0, p0}, Landroid/view/MenuItem$OnActionExpandListener;->onMenuItemActionCollapse(Landroid/view/MenuItem;)Z
 
     move-result v0
@@ -296,8 +295,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mOnActionExpandListener:Landroid/view/MenuItem$OnActionExpandListener;
-
     invoke-interface {v0, p0}, Landroid/view/MenuItem$OnActionExpandListener;->onMenuItemActionExpand(Landroid/view/MenuItem;)Z
 
     move-result v0
@@ -339,8 +336,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionView:Landroid/view/View;
-
     return-object v0
 
     :cond_0
@@ -348,8 +343,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionProvider:Landroidx/core/view/ActionProvider;
-
     invoke-virtual {v0, p0}, Landroidx/core/view/ActionProvider;->onCreateActionView(Landroid/view/MenuItem;)Landroid/view/View;
 
     move-result-object v0
@@ -413,9 +406,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mIconDrawable:Landroid/graphics/drawable/Drawable;
-
-    :goto_0
     invoke-direct {p0, v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->applyIconTintIfNecessary(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -445,7 +435,11 @@
 
     iput-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mIconDrawable:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->applyIconTintIfNecessary(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v0
+
+    return-object v0
 
     :cond_1
     const/4 v0, 0x0
@@ -689,29 +683,40 @@
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     sget v0, Landroidx/appcompat/R$string;->abc_menu_space_shortcut_label:I
 
-    goto :goto_1
-
-    :cond_4
-    sget v0, Landroidx/appcompat/R$string;->abc_menu_enter_shortcut_label:I
-
-    goto :goto_1
-
-    :cond_5
-    sget v0, Landroidx/appcompat/R$string;->abc_menu_delete_shortcut_label:I
-
-    :goto_1
     invoke-virtual {v1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_2
+    goto :goto_1
+
+    :cond_4
+    sget v0, Landroidx/appcompat/R$string;->abc_menu_enter_shortcut_label:I
+
+    invoke-virtual {v1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
+
+    :cond_5
+    sget v0, Landroidx/appcompat/R$string;->abc_menu_delete_shortcut_label:I
+
+    invoke-virtual {v1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :goto_1
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
@@ -752,8 +757,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mTitleCondensed:Ljava/lang/CharSequence;
-
     goto :goto_0
 
     :cond_0
@@ -776,6 +779,8 @@
 
     move-result-object v0
 
+    return-object v0
+
     :cond_1
     return-object v0
 .end method
@@ -822,7 +827,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionView:Landroid/view/View;
 
@@ -832,8 +837,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionProvider:Landroidx/core/view/ActionProvider;
-
     invoke-virtual {v0, p0}, Landroidx/core/view/ActionProvider;->onCreateActionView(Landroid/view/MenuItem;)Landroid/view/View;
 
     move-result-object v0
@@ -851,6 +854,9 @@
 
     :cond_1
     return v1
+
+    :cond_2
+    return v1
 .end method
 
 .method public final hasSubMenu()Z
@@ -879,8 +885,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mClickListener:Landroid/view/MenuItem$OnMenuItemClickListener;
-
     invoke-interface {v0, p0}, Landroid/view/MenuItem$OnMenuItemClickListener;->onMenuItemClick(Landroid/view/MenuItem;)Z
 
     move-result v0
@@ -892,9 +896,7 @@
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
 
-    iget-object v2, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
-
-    invoke-virtual {v0, v2, p0}, Landroidx/appcompat/view/menu/MenuBuilder;->dispatchMenuItemSelected(Landroidx/appcompat/view/menu/MenuBuilder;Landroid/view/MenuItem;)Z
+    invoke-virtual {v0, v0, p0}, Landroidx/appcompat/view/menu/MenuBuilder;->dispatchMenuItemSelected(Landroidx/appcompat/view/menu/MenuBuilder;Landroid/view/MenuItem;)Z
 
     move-result v0
 
@@ -907,8 +909,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mItemCallback:Ljava/lang/Runnable;
-
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
     return v1
@@ -947,8 +947,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionProvider:Landroidx/core/view/ActionProvider;
-
     invoke-virtual {v0}, Landroidx/core/view/ActionProvider;->onPerformDefaultAction()Z
 
     move-result v0
@@ -1075,14 +1073,12 @@
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionProvider:Landroidx/core/view/ActionProvider;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionProvider:Landroidx/core/view/ActionProvider;
-
     invoke-virtual {v0}, Landroidx/core/view/ActionProvider;->overridesItemVisibility()Z
 
     move-result v0
@@ -1103,10 +1099,10 @@
 
     if-eqz v0, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     iget v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
@@ -1115,10 +1111,10 @@
 
     if-nez v0, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 .method public final requestsActionButton()Z
@@ -1244,8 +1240,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mId:I
-
     invoke-virtual {p1, v0}, Landroid/view/View;->setId(I)V
 
     :cond_0
@@ -1343,9 +1337,7 @@
 
     iget v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
 
-    iget v1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
-
-    and-int/lit8 v1, v1, -0x2
+    and-int/lit8 v1, v0, -0x2
 
     or-int/2addr p1, v1
 
@@ -1392,9 +1384,7 @@
 
     iget v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
 
-    iget v1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
-
-    and-int/lit8 v1, v1, -0x3
+    and-int/lit8 v1, v0, -0x3
 
     const/4 v2, 0x0
 
@@ -1457,19 +1447,18 @@
 
     or-int/lit8 p1, p1, 0x10
 
-    :goto_0
     iput p1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
 
     and-int/lit8 p1, p1, -0x11
 
-    goto :goto_0
+    iput p1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
 
-    :goto_1
+    :goto_0
     iget-object p1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
 
     const/4 v0, 0x0
@@ -1606,7 +1595,6 @@
 
     or-int/lit8 p1, p1, 0x20
 
-    :goto_0
     iput p1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
 
     return-void
@@ -1616,7 +1604,9 @@
 
     and-int/lit8 p1, p1, -0x21
 
-    goto :goto_0
+    iput p1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
+
+    return-void
 .end method
 
 .method final setMenuInfo(Landroid/view/ContextMenu$ContextMenuInfo;)V
@@ -1820,8 +1810,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionProvider:Landroidx/core/view/ActionProvider;
-
     invoke-virtual {v0}, Landroidx/core/view/ActionProvider;->reset()V
 
     :cond_0
@@ -1841,8 +1829,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mActionProvider:Landroidx/core/view/ActionProvider;
-
     new-instance v0, Landroidx/appcompat/view/menu/MenuItemImpl$1;
 
     invoke-direct {v0, p0}, Landroidx/appcompat/view/menu/MenuItemImpl$1;-><init>(Landroidx/appcompat/view/menu/MenuItemImpl;)V
@@ -1888,8 +1874,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mSubMenu:Landroidx/appcompat/view/menu/SubMenuBuilder;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/view/menu/SubMenuBuilder;->setHeaderTitle(Ljava/lang/CharSequence;)Landroid/view/SubMenu;
 
     :cond_0
@@ -1956,9 +1940,7 @@
 
     iget v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
 
-    iget v1, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mFlags:I
-
-    and-int/lit8 v1, v1, -0x9
+    and-int/lit8 v1, v0, -0x9
 
     const/4 v2, 0x0
 
@@ -2055,8 +2037,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemImpl;->mTitle:Ljava/lang/CharSequence;
-
     invoke-interface {v0}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$ActionProviderWrapper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$ActionProviderWrapper.smali
index 35b471e636..e6e530cffd 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$ActionProviderWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$ActionProviderWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuItemWrapperICS$ActionProviderWrapper;
 .super Landroidx/core/view/ActionProvider;
+.source "MenuItemWrapperICS.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$CollapsibleActionViewWrapper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$CollapsibleActionViewWrapper.smali
index b9236434cd..0cc211dce7 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$CollapsibleActionViewWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$CollapsibleActionViewWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuItemWrapperICS$CollapsibleActionViewWrapper;
 .super Landroid/widget/FrameLayout;
+.source "MenuItemWrapperICS.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/CollapsibleActionView;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnActionExpandListenerWrapper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnActionExpandListenerWrapper.smali
index 0fb95aa99d..75ec557156 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnActionExpandListenerWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnActionExpandListenerWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuItemWrapperICS$OnActionExpandListenerWrapper;
 .super Landroidx/appcompat/view/menu/BaseWrapper;
+.source "MenuItemWrapperICS.java"
 
 # interfaces
 .implements Landroid/view/MenuItem$OnActionExpandListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnMenuItemClickListenerWrapper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnMenuItemClickListenerWrapper.smali
index 46bcb19037..29544fd560 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnMenuItemClickListenerWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS$OnMenuItemClickListenerWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuItemWrapperICS$OnMenuItemClickListenerWrapper;
 .super Landroidx/appcompat/view/menu/BaseWrapper;
+.source "MenuItemWrapperICS.java"
 
 # interfaces
 .implements Landroid/view/MenuItem$OnMenuItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS.smali
index 38187546f2..9ea72462ab 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperICS.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/MenuItemWrapperICS;
 .super Landroidx/appcompat/view/menu/BaseMenuWrapper;
+.source "MenuItemWrapperICS.java"
 
 # interfaces
 .implements Landroid/view/MenuItem;
@@ -138,6 +139,8 @@
 
     move-result-object v0
 
+    return-object v0
+
     :cond_0
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB$ActionProviderWrapperJB.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB$ActionProviderWrapperJB.smali
index 0a3bbb15c3..1fb6d730d9 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB$ActionProviderWrapperJB.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB$ActionProviderWrapperJB.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuItemWrapperJB$ActionProviderWrapperJB;
 .super Landroidx/appcompat/view/menu/MenuItemWrapperICS$ActionProviderWrapper;
+.source "MenuItemWrapperJB.java"
 
 # interfaces
 .implements Landroid/view/ActionProvider$VisibilityListener;
@@ -54,8 +55,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuItemWrapperJB$ActionProviderWrapperJB;->mListener:Landroidx/core/view/ActionProvider$VisibilityListener;
-
     invoke-interface {v0, p1}, Landroidx/core/view/ActionProvider$VisibilityListener;->onActionProviderVisibilityChanged(Z)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB.smali
index 7c36846f64..4ab3a3d5fd 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuItemWrapperJB.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuItemWrapperJB;
 .super Landroidx/appcompat/view/menu/MenuItemWrapperICS;
+.source "MenuItemWrapperJB.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuPopup.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuPopup.smali
index 73391a2a20..c5c00008eb 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuPopup.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuPopup.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/appcompat/view/menu/MenuPopup;
 .super Ljava/lang/Object;
+.source "MenuPopup.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
@@ -54,11 +55,11 @@
 
     move-result v8
 
-    if-eq v8, p1, :cond_0
+    if-eq v8, v5, :cond_0
 
     move-object v7, v4
 
-    move p1, v8
+    move v5, v8
 
     :cond_0
     if-nez v6, :cond_1
@@ -83,9 +84,9 @@
     return p3
 
     :cond_2
-    if-le v8, v5, :cond_3
+    if-le v8, p1, :cond_3
 
-    move v5, v8
+    move p1, v8
 
     :cond_3
     add-int/lit8 v0, v0, 0x1
@@ -93,7 +94,7 @@
     goto :goto_0
 
     :cond_4
-    return v5
+    return p1
 .end method
 
 .method protected static shouldPreserveIconSpacing(Landroidx/appcompat/view/menu/MenuBuilder;)Z
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper$1.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper$1.smali
index 85bae4c8dd..d4788912b4 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper$1.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuPopupHelper$1;
 .super Ljava/lang/Object;
+.source "MenuPopupHelper.java"
 
 # interfaces
 .implements Landroid/widget/PopupWindow$OnDismissListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali
index 5e6f4bf344..61c8868f3a 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/MenuPopupHelper;
 .super Ljava/lang/Object;
+.source "MenuPopupHelper.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuHelper;
@@ -483,8 +484,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuPopupHelper;->mPopup:Landroidx/appcompat/view/menu/MenuPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/MenuPopup;->isShowing()Z
 
     move-result v0
@@ -512,8 +511,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuPopupHelper;->mOnDismissListener:Landroid/widget/PopupWindow$OnDismissListener;
-
     invoke-interface {v0}, Landroid/widget/PopupWindow$OnDismissListener;->onDismiss()V
 
     :cond_0
@@ -541,8 +538,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuPopupHelper;->mPopup:Landroidx/appcompat/view/menu/MenuPopup;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/view/menu/MenuPopup;->setForceShowIcon(Z)V
 
     :cond_0
@@ -582,8 +577,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/MenuPopupHelper;->mPopup:Landroidx/appcompat/view/menu/MenuPopup;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/view/menu/MenuPopup;->setCallback(Landroidx/appcompat/view/menu/MenuPresenter$Callback;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter$Callback.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter$Callback.smali
index f4df68c617..e112cc37f5 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter$Callback.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter$Callback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/menu/MenuPresenter$Callback;
 .super Ljava/lang/Object;
+.source "MenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter.smali
index f5139d468d..2bc207e9c2 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuPresenter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/menu/MenuPresenter;
 .super Ljava/lang/Object;
+.source "MenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuView$ItemView.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuView$ItemView.smali
index e74d1bc106..5bec5673ea 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuView$ItemView.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuView$ItemView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/menu/MenuView$ItemView;
 .super Ljava/lang/Object;
+.source "MenuView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuView.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuView.smali
index 1cc8a404fc..624ae03827 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuView.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/menu/MenuView;
 .super Ljava/lang/Object;
+.source "MenuView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperFactory.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperFactory.smali
index 5d8f80a1c9..8eea0faba2 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperFactory.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperFactory.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/view/menu/MenuWrapperFactory;
 .super Ljava/lang/Object;
+.source "MenuWrapperFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperICS.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperICS.smali
index b92574219d..82dc30f21b 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperICS.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuWrapperICS.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/MenuWrapperICS;
 .super Landroidx/appcompat/view/menu/BaseMenuWrapper;
+.source "MenuWrapperICS.java"
 
 # interfaces
 .implements Landroid/view/Menu;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/ShowableListMenu.smali b/com.discord/smali/androidx/appcompat/view/menu/ShowableListMenu.smali
index d74c13febf..c6b89dccfc 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/ShowableListMenu.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/ShowableListMenu.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/view/menu/ShowableListMenu;
 .super Ljava/lang/Object;
+.source "ShowableListMenu.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$1.smali b/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$1.smali
index 19b8c1ab0f..799397e3f8 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$1.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/StandardMenuPopup$1;
 .super Ljava/lang/Object;
+.source "StandardMenuPopup.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;
@@ -83,6 +84,8 @@
 
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/StandardMenuPopup;->dismiss()V
 
+    return-void
+
     :cond_2
     :goto_1
     return-void
diff --git a/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$2.smali b/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$2.smali
index ddaf623475..849b329636 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$2.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/StandardMenuPopup$2;
 .super Ljava/lang/Object;
+.source "StandardMenuPopup.java"
 
 # interfaces
 .implements Landroid/view/View$OnAttachStateChangeListener;
diff --git a/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup.smali b/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup.smali
index bfc9fb6344..b893852fda 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/StandardMenuPopup.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/view/menu/StandardMenuPopup;
 .super Landroidx/appcompat/view/menu/MenuPopup;
+.source "StandardMenuPopup.java"
 
 # interfaces
 .implements Landroid/view/View$OnKeyListener;
@@ -182,8 +183,6 @@
     goto/16 :goto_1
 
     :cond_1
-    iget-object v0, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mAnchorView:Landroid/view/View;
-
     iput-object v0, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mShownAnchorView:Landroid/view/View;
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mPopup:Landroidx/appcompat/widget/MenuPopupWindow;
@@ -447,8 +446,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mPresenterCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onCloseMenu(Landroidx/appcompat/view/menu/MenuBuilder;Z)V
 
     :cond_1
@@ -470,8 +467,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver;
-
     invoke-virtual {v0}, Landroid/view/ViewTreeObserver;->isAlive()Z
 
     move-result v0
@@ -508,8 +503,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mOnDismissListener:Landroid/widget/PopupWindow$OnDismissListener;
-
     invoke-interface {v0}, Landroid/widget/PopupWindow$OnDismissListener;->onDismiss()V
 
     :cond_2
@@ -655,8 +648,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mPresenterCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onOpenSubMenu(Landroidx/appcompat/view/menu/MenuBuilder;)Z
 
     :cond_1
@@ -770,8 +761,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/view/menu/StandardMenuPopup;->mAdapter:Landroidx/appcompat/view/menu/MenuAdapter;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuAdapter;->notifyDataSetChanged()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/view/menu/SubMenuBuilder.smali b/com.discord/smali/androidx/appcompat/view/menu/SubMenuBuilder.smali
index b3d8ce59ff..85ce5b0d8a 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/SubMenuBuilder.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/SubMenuBuilder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/view/menu/SubMenuBuilder;
 .super Landroidx/appcompat/view/menu/MenuBuilder;
+.source "SubMenuBuilder.java"
 
 # interfaces
 .implements Landroid/view/SubMenu;
@@ -96,8 +97,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/view/menu/SubMenuBuilder;->mItem:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/appcompat/view/menu/SubMenuWrapperICS.smali b/com.discord/smali/androidx/appcompat/view/menu/SubMenuWrapperICS.smali
index e1f20b6d0d..71a215c2c8 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/SubMenuWrapperICS.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/SubMenuWrapperICS.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/view/menu/SubMenuWrapperICS;
 .super Landroidx/appcompat/view/menu/MenuWrapperICS;
+.source "SubMenuWrapperICS.java"
 
 # interfaces
 .implements Landroid/view/SubMenu;
diff --git a/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$1.smali b/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$1.smali
index 98fd6b1c3a..1081e87491 100644
--- a/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AbsActionBarView$1;
 .super Ljava/lang/Object;
+.source "AbsActionBarView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener.smali b/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener.smali
index 0a0e1470ea..21da05a327 100644
--- a/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener;
 .super Ljava/lang/Object;
+.source "AbsActionBarView.java"
 
 # interfaces
 .implements Landroidx/core/view/ViewPropertyAnimatorListener;
@@ -67,8 +68,6 @@
 
     iput-object v0, p1, Landroidx/appcompat/widget/AbsActionBarView;->mVisibilityAnim:Landroidx/core/view/ViewPropertyAnimatorCompat;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener;->this$0:Landroidx/appcompat/widget/AbsActionBarView;
-
     iget v0, p0, Landroidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener;->mFinalVisibility:I
 
     invoke-static {p1, v0}, Landroidx/appcompat/widget/AbsActionBarView;->access$101(Landroidx/appcompat/widget/AbsActionBarView;I)V
diff --git a/com.discord/smali/androidx/appcompat/widget/AbsActionBarView.smali b/com.discord/smali/androidx/appcompat/widget/AbsActionBarView.smali
index b18d46c4e0..7ee9b42ca0 100644
--- a/com.discord/smali/androidx/appcompat/widget/AbsActionBarView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AbsActionBarView.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/appcompat/widget/AbsActionBarView;
 .super Landroid/view/ViewGroup;
+.source "AbsActionBarView.java"
 
 
 # annotations
@@ -181,8 +182,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mActionMenuPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->dismissPopupMenus()Z
 
     :cond_0
@@ -225,8 +224,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mActionMenuPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->hideOverflowMenu()Z
 
     move-result v0
@@ -246,8 +243,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mActionMenuPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->isOverflowMenuShowPending()Z
 
     move-result v0
@@ -267,8 +262,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mActionMenuPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->isOverflowMenuShowing()Z
 
     move-result v0
@@ -288,8 +281,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mActionMenuPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->isOverflowReserved()Z
 
     move-result v0
@@ -369,8 +360,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mActionMenuPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/ActionMenuPresenter;->onConfigurationChanged(Landroid/content/res/Configuration;)V
 
     :cond_0
@@ -549,8 +538,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mVisibilityAnim:Landroidx/core/view/ViewPropertyAnimatorCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/ViewPropertyAnimatorCompat;->cancel()V
 
     :cond_0
@@ -567,8 +554,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mVisibilityAnim:Landroidx/core/view/ViewPropertyAnimatorCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/ViewPropertyAnimatorCompat;->cancel()V
 
     :cond_0
@@ -595,7 +580,6 @@
 
     move-result-object v0
 
-    :goto_0
     invoke-virtual {v0, p2, p3}, Landroidx/core/view/ViewPropertyAnimatorCompat;->setDuration(J)Landroidx/core/view/ViewPropertyAnimatorCompat;
 
     iget-object p2, p0, Landroidx/appcompat/widget/AbsActionBarView;->mVisAnimListener:Landroidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener;
@@ -617,7 +601,17 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-virtual {v0, p2, p3}, Landroidx/core/view/ViewPropertyAnimatorCompat;->setDuration(J)Landroidx/core/view/ViewPropertyAnimatorCompat;
+
+    iget-object p2, p0, Landroidx/appcompat/widget/AbsActionBarView;->mVisAnimListener:Landroidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener;
+
+    invoke-virtual {p2, v0, p1}, Landroidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener;->withFinalVisibility(Landroidx/core/view/ViewPropertyAnimatorCompat;I)Landroidx/appcompat/widget/AbsActionBarView$VisibilityAnimListener;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroidx/core/view/ViewPropertyAnimatorCompat;->setListener(Landroidx/core/view/ViewPropertyAnimatorListener;)Landroidx/core/view/ViewPropertyAnimatorCompat;
+
+    return-object v0
 .end method
 
 .method public showOverflowMenu()Z
@@ -627,8 +621,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AbsActionBarView;->mActionMenuPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->showOverflowMenu()Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarBackgroundDrawable.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarBackgroundDrawable.smali
index 3a0bac45ad..53f3656ce8 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarBackgroundDrawable.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarBackgroundDrawable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionBarBackgroundDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "ActionBarBackgroundDrawable.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarContainer.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarContainer.smali
index a25f39efa5..448f16a246 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarContainer.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarContainer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActionBarContainer;
 .super Landroid/widget/FrameLayout;
+.source "ActionBarContainer.java"
 
 
 # annotations
@@ -210,8 +211,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result v0
@@ -231,8 +230,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mStackedBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result v0
@@ -252,8 +249,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mSplitBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result v0
@@ -289,8 +284,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     :cond_0
@@ -298,8 +291,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mStackedBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     :cond_1
@@ -307,8 +298,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mSplitBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     :cond_2
@@ -448,8 +437,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mSplitBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionBarContainer;->getMeasuredWidth()I
 
     move-result p2
@@ -460,12 +447,12 @@
 
     invoke-virtual {p1, v0, v0, p2, p3}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     const/4 p5, 0x0
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_3
     iget-object p2, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
@@ -502,22 +489,19 @@
 
     iget-object v2, p0, Landroidx/appcompat/widget/ActionBarContainer;->mActionBarView:Landroid/view/View;
 
-    :goto_1
     invoke-virtual {v2}, Landroid/view/View;->getBottom()I
 
     move-result v2
 
     invoke-virtual {p2, p3, p4, v0, v2}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     iget-object p2, p0, Landroidx/appcompat/widget/ActionBarContainer;->mContextView:Landroid/view/View;
 
     if-eqz p2, :cond_5
 
-    iget-object p2, p0, Landroidx/appcompat/widget/ActionBarContainer;->mContextView:Landroid/view/View;
-
     invoke-virtual {p2}, Landroid/view/View;->getVisibility()I
 
     move-result p2
@@ -546,6 +530,12 @@
 
     iget-object v2, p0, Landroidx/appcompat/widget/ActionBarContainer;->mContextView:Landroid/view/View;
 
+    invoke-virtual {v2}, Landroid/view/View;->getBottom()I
+
+    move-result v2
+
+    invoke-virtual {p2, p3, p4, v0, v2}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+
     goto :goto_1
 
     :cond_5
@@ -553,7 +543,7 @@
 
     invoke-virtual {p2, v0, v0, v0, v0}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    :goto_2
+    :goto_1
     const/4 v0, 0x1
 
     :cond_6
@@ -565,8 +555,6 @@
 
     if-eqz p2, :cond_7
 
-    iget-object p2, p0, Landroidx/appcompat/widget/ActionBarContainer;->mStackedBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p1}, Landroid/view/View;->getLeft()I
 
     move-result p3
@@ -585,12 +573,12 @@
 
     invoke-virtual {p2, p3, p4, v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
     move p5, v0
 
-    :goto_3
+    :goto_2
     if-eqz p5, :cond_8
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionBarContainer;->invalidate()V
@@ -618,8 +606,6 @@
 
     if-ltz v0, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mHeight:I
-
     invoke-static {p2}, Landroid/view/View$MeasureSpec;->getSize(I)I
 
     move-result p2
@@ -650,8 +636,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mTabContainer:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
 
     move-result v0
@@ -674,12 +658,11 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mActionBarView:Landroid/view/View;
 
-    :goto_0
     invoke-direct {p0, v0}, Landroidx/appcompat/widget/ActionBarContainer;->getMeasuredHeightWithMargins(Landroid/view/View;)I
 
     move-result v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mContextView:Landroid/view/View;
@@ -692,24 +675,28 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mContextView:Landroid/view/View;
 
+    invoke-direct {p0, v0}, Landroidx/appcompat/widget/ActionBarContainer;->getMeasuredHeightWithMargins(Landroid/view/View;)I
+
+    move-result v0
+
     goto :goto_0
 
     :cond_3
     const/4 v0, 0x0
 
-    :goto_1
+    :goto_0
     if-ne p1, v1, :cond_4
 
     invoke-static {p2}, Landroid/view/View$MeasureSpec;->getSize(I)I
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const p1, 0x7fffffff
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionBarContainer;->getMeasuredWidth()I
 
     move-result p2
@@ -749,8 +736,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
@@ -770,13 +755,11 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mActionBarView:Landroid/view/View;
+    invoke-virtual {p1}, Landroid/view/View;->getLeft()I
 
-    invoke-virtual {v0}, Landroid/view/View;->getLeft()I
-
-    move-result v0
+    move-result p1
 
     iget-object v1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mActionBarView:Landroid/view/View;
 
@@ -796,14 +779,14 @@
 
     move-result v3
 
-    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v0, p1, v1, v2, v3}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     :cond_1
     iget-boolean p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mIsSplit:Z
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_2
 
@@ -811,10 +794,7 @@
 
     if-nez p1, :cond_3
 
-    :goto_0
-    const/4 v0, 0x1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
@@ -828,7 +808,9 @@
     goto :goto_0
 
     :cond_3
-    :goto_1
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ActionBarContainer;->setWillNotDraw(Z)V
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionBarContainer;->invalidate()V
@@ -843,8 +825,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mSplitBackground:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
@@ -870,8 +850,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mSplitBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionBarContainer;->getMeasuredWidth()I
 
     move-result v1
@@ -925,8 +903,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mStackedBackground:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
@@ -950,8 +926,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mStackedBackground:Landroid/graphics/drawable/Drawable;
-
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mTabContainer:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getLeft()I
@@ -981,9 +955,9 @@
     :cond_1
     iget-boolean p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mIsSplit:Z
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_2
 
@@ -991,10 +965,7 @@
 
     if-nez p1, :cond_3
 
-    :goto_0
-    const/4 v0, 0x1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object p1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
@@ -1008,7 +979,9 @@
     goto :goto_0
 
     :cond_3
-    :goto_1
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ActionBarContainer;->setWillNotDraw(Z)V
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionBarContainer;->invalidate()V
@@ -1023,8 +996,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContainer;->mTabContainer:Landroid/view/View;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ActionBarContainer;->removeView(Landroid/view/View;)V
 
     :cond_0
@@ -1095,8 +1066,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, p1, v0}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     :cond_1
@@ -1104,8 +1073,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mStackedBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, p1, v0}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     :cond_2
@@ -1113,8 +1080,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ActionBarContainer;->mSplitBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, p1, v0}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     :cond_3
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarContextView$1.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarContextView$1.smali
index 947dfdf858..88d8c5569a 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarContextView$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarContextView$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionBarContextView$1;
 .super Ljava/lang/Object;
+.source "ActionBarContextView.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarContextView.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarContextView.smali
index 7194413711..d4f29c55d3 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarContextView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarContextView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActionBarContextView;
 .super Landroidx/appcompat/widget/AbsActionBarView;
+.source "ActionBarContextView.java"
 
 
 # annotations
@@ -236,9 +237,9 @@
 
     iget-object v2, p0, Landroidx/appcompat/widget/ActionBarContextView;->mSubtitleView:Landroid/widget/TextView;
 
-    const/16 v3, 0x8
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/16 v4, 0x8
 
     if-eqz v1, :cond_2
 
@@ -254,14 +255,17 @@
 
     iget-object v2, p0, Landroidx/appcompat/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout;
 
-    if-nez v0, :cond_3
+    if-nez v0, :cond_4
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_3
+
+    goto :goto_1
 
     :cond_3
-    const/4 v3, 0x0
+    const/16 v3, 0x8
 
     :cond_4
+    :goto_1
     invoke-virtual {v2, v3}, Landroid/widget/LinearLayout;->setVisibility(I)V
 
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout;
@@ -309,6 +313,8 @@
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionBarContextView;->killMode()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -431,26 +437,25 @@
 
     iput-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mClose:Landroid/view/View;
 
-    :goto_0
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mClose:Landroid/view/View;
 
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ActionBarContextView;->addView(Landroid/view/View;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mClose:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    goto :goto_0
+    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mClose:Landroid/view/View;
+
+    invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ActionBarContextView;->addView(Landroid/view/View;)V
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mClose:Landroid/view/View;
 
     sget v1, Landroidx/appcompat/R$id;->action_mode_close_button:I
@@ -721,8 +726,6 @@
 
     if-eqz p5, :cond_3
 
-    iget-object p5, p0, Landroidx/appcompat/widget/ActionBarContextView;->mClose:Landroid/view/View;
-
     invoke-virtual {p5}, Landroid/view/View;->getVisibility()I
 
     move-result p5
@@ -793,11 +796,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
+    iget-object v1, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
 
-    if-nez v0, :cond_4
-
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout;
+    if-nez v1, :cond_4
 
     invoke-virtual {v0}, Landroid/widget/LinearLayout;->getVisibility()I
 
@@ -823,15 +824,18 @@
 
     add-int/2addr p5, v0
 
+    move v2, p5
+
+    goto :goto_4
+
     :cond_4
     move v2, p5
 
-    iget-object p5, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
-
-    if-eqz p5, :cond_5
-
+    :goto_4
     iget-object v1, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
 
+    if-eqz v1, :cond_5
+
     move-object v0, p0
 
     move v3, v6
@@ -851,7 +855,7 @@
 
     move v3, p2
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_6
     sub-int/2addr p4, p2
@@ -864,7 +868,7 @@
 
     move v3, p4
 
-    :goto_4
+    :goto_5
     iget-object p2, p0, Landroidx/appcompat/widget/ActionBarContextView;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
 
     if-eqz p2, :cond_7
@@ -958,8 +962,6 @@
 
     if-eqz v6, :cond_1
 
-    iget-object v6, p0, Landroidx/appcompat/widget/ActionBarContextView;->mClose:Landroid/view/View;
-
     invoke-virtual {p0, v6, v2, v5, v7}, Landroidx/appcompat/widget/ActionBarContextView;->measureChildView(Landroid/view/View;III)I
 
     move-result v2
@@ -1004,13 +1006,13 @@
 
     if-eqz v6, :cond_7
 
-    iget-object v6, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
+    iget-object v8, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
 
-    if-nez v6, :cond_7
+    if-nez v8, :cond_7
 
-    iget-boolean v6, p0, Landroidx/appcompat/widget/ActionBarContextView;->mTitleOptional:Z
+    iget-boolean v8, p0, Landroidx/appcompat/widget/ActionBarContextView;->mTitleOptional:Z
 
-    if-eqz v6, :cond_6
+    if-eqz v8, :cond_6
 
     invoke-static {v7, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
@@ -1058,8 +1060,6 @@
     goto :goto_3
 
     :cond_6
-    iget-object v6, p0, Landroidx/appcompat/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout;
-
     invoke-virtual {p0, v6, v2, v5, v7}, Landroidx/appcompat/widget/ActionBarContextView;->measureChildView(Landroid/view/View;III)I
 
     move-result v2
@@ -1070,8 +1070,6 @@
 
     if-eqz v5, :cond_c
 
-    iget-object v5, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
-
     invoke-virtual {v5}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v5
@@ -1234,6 +1232,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public bridge synthetic onTouchEvent(Landroid/view/MotionEvent;)Z
@@ -1269,8 +1269,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mCustomView:Landroid/view/View;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ActionBarContextView;->removeView(Landroid/view/View;)V
 
     :cond_0
@@ -1282,8 +1280,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ActionBarContextView;->removeView(Landroid/view/View;)V
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$1.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$1.smali
index 035c52b753..7579fb76d0 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionBarOverlayLayout$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ActionBarOverlayLayout.java"
 
 
 # annotations
@@ -39,8 +40,6 @@
 
     iput-object v0, p1, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mCurrentActionBarTopAnimator:Landroid/view/ViewPropertyAnimator;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout$1;->this$0:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     const/4 v0, 0x0
 
     iput-boolean v0, p1, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mAnimatingForFling:Z
@@ -57,8 +56,6 @@
 
     iput-object v0, p1, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mCurrentActionBarTopAnimator:Landroid/view/ViewPropertyAnimator;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout$1;->this$0:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
     const/4 v0, 0x0
 
     iput-boolean v0, p1, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mAnimatingForFling:Z
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$2.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$2.smali
index 9505cecc76..57b955899d 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionBarOverlayLayout$2;
 .super Ljava/lang/Object;
+.source "ActionBarOverlayLayout.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -42,9 +43,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout$2;->this$0:Landroidx/appcompat/widget/ActionBarOverlayLayout;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout$2;->this$0:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
-    iget-object v1, v1, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarTop:Landroidx/appcompat/widget/ActionBarContainer;
+    iget-object v1, v0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarTop:Landroidx/appcompat/widget/ActionBarContainer;
 
     invoke-virtual {v1}, Landroidx/appcompat/widget/ActionBarContainer;->animate()Landroid/view/ViewPropertyAnimator;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$3.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$3.smali
index 5a05137c57..376bb24a75 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$3.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionBarOverlayLayout$3;
 .super Ljava/lang/Object;
+.source "ActionBarOverlayLayout.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -42,9 +43,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout$3;->this$0:Landroidx/appcompat/widget/ActionBarOverlayLayout;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout$3;->this$0:Landroidx/appcompat/widget/ActionBarOverlayLayout;
-
-    iget-object v1, v1, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarTop:Landroidx/appcompat/widget/ActionBarContainer;
+    iget-object v1, v0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarTop:Landroidx/appcompat/widget/ActionBarContainer;
 
     invoke-virtual {v1}, Landroidx/appcompat/widget/ActionBarContainer;->animate()Landroid/view/ViewPropertyAnimator;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback.smali
index b6aa141447..1c5239bd3a 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;
 .super Ljava/lang/Object;
+.source "ActionBarOverlayLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$LayoutParams.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$LayoutParams.smali
index 2901b74395..ed573dc754 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$LayoutParams.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActionBarOverlayLayout$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "ActionBarOverlayLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout.smali b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout.smali
index 6880ec2202..5a4ffece38 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActionBarOverlayLayout;
 .super Landroid/view/ViewGroup;
+.source "ActionBarOverlayLayout.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/DecorContentParent;
@@ -760,8 +761,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarTop:Landroidx/appcompat/widget/ActionBarContainer;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionBarContainer;->getTranslationY()F
 
     move-result v0
@@ -819,8 +818,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mCurrentActionBarTopAnimator:Landroid/view/ViewPropertyAnimator;
-
     invoke-virtual {v0}, Landroid/view/ViewPropertyAnimator;->cancel()V
 
     :cond_0
@@ -1219,6 +1216,12 @@
 
     iget-object v4, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mContentInsets:Landroid/graphics/Rect;
 
+    iget v5, v4, Landroid/graphics/Rect;->bottom:I
+
+    add-int/2addr v5, v2
+
+    iput v5, v4, Landroid/graphics/Rect;->bottom:I
+
     goto :goto_2
 
     :cond_4
@@ -1232,13 +1235,13 @@
 
     iget-object v4, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mInnerInsets:Landroid/graphics/Rect;
 
-    :goto_2
     iget v5, v4, Landroid/graphics/Rect;->bottom:I
 
     add-int/2addr v5, v2
 
     iput v5, v4, Landroid/graphics/Rect;->bottom:I
 
+    :goto_2
     iget-object v7, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mContent:Landroidx/appcompat/widget/ContentFrameLayout;
 
     iget-object v8, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mContentInsets:Landroid/graphics/Rect;
@@ -1489,8 +1492,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarVisibilityCallback:Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;
-
     invoke-interface {p1}, Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;->onContentScrollStarted()V
 
     :cond_0
@@ -1560,8 +1561,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarVisibilityCallback:Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;
-
     invoke-interface {p1}, Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;->onContentScrollStopped()V
 
     :cond_2
@@ -1615,8 +1614,6 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarVisibilityCallback:Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;
-
     xor-int/lit8 v3, v2, 0x1
 
     invoke-interface {p1, v3}, Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;->enableContentAnimations(Z)V
@@ -1667,8 +1664,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mActionBarVisibilityCallback:Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;->onWindowVisibilityChanged(I)V
 
     :cond_0
@@ -1811,8 +1806,6 @@
 
     if-eqz p1, :cond_0
 
-    iget p1, p0, Landroidx/appcompat/widget/ActionBarOverlayLayout;->mLastSystemUiVisibility:I
-
     invoke-virtual {p0, p1}, Landroidx/appcompat/widget/ActionBarOverlayLayout;->onWindowSystemUiVisibilityChanged(I)V
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->requestApplyInsets(Landroid/view/View;)V
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu.smali
index 55a1175e4c..78144be563 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu;
 .super Landroidx/appcompat/view/menu/MenuPopupHelper;
+.source "ActionMenuPresenter.java"
 
 
 # annotations
@@ -86,8 +87,6 @@
 
     iput-object v1, v0, Landroidx/appcompat/widget/ActionMenuPresenter;->mActionButtonPopup:Landroidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu;->this$0:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     const/4 v1, 0x0
 
     iput v1, v0, Landroidx/appcompat/widget/ActionMenuPresenter;->mOpenSubMenuId:I
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionMenuPopupCallback.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionMenuPopupCallback.smali
index 0144edd31a..04e7a00bbd 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionMenuPopupCallback.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$ActionMenuPopupCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$ActionMenuPopupCallback;
 .super Landroidx/appcompat/view/menu/ActionMenuItemView$PopupCallback;
+.source "ActionMenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OpenOverflowRunnable.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OpenOverflowRunnable.smali
index 0649ebf245..4f78dbb0e0 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OpenOverflowRunnable.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OpenOverflowRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$OpenOverflowRunnable;
 .super Ljava/lang/Object;
+.source "ActionMenuPresenter.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton$1.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton$1.smali
index 56d9118fb3..8fd4080b17 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton$1;
 .super Landroidx/appcompat/widget/ForwardingListener;
+.source "ActionMenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton.smali
index f930e48661..f7d4a38cfc 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;
 .super Landroidx/appcompat/widget/AppCompatImageView;
+.source "ActionMenuPresenter.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/ActionMenuView$ActionMenuChildView;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowPopup.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowPopup.smali
index 3d83eb4f95..be8ab50fc8 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowPopup.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$OverflowPopup.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$OverflowPopup;
 .super Landroidx/appcompat/view/menu/MenuPopupHelper;
+.source "ActionMenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$PopupPresenterCallback.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$PopupPresenterCallback.smali
index 9a70d587d3..560c804db6 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$PopupPresenterCallback.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$PopupPresenterCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$PopupPresenterCallback;
 .super Ljava/lang/Object;
+.source "ActionMenuPresenter.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter$Callback;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState$1.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState$1.smali
index 65756e6acf..00774f0aef 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/widget/ActionMenuPresenter$SavedState$1;
 .super Ljava/lang/Object;
+.source "ActionMenuPresenter.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState.smali
index ee358fc193..352357670c 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter$SavedState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter$SavedState;
 .super Ljava/lang/Object;
+.source "ActionMenuPresenter.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter.smali
index 416b2fc6dd..2de9d0de19 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuPresenter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuPresenter;
 .super Landroidx/appcompat/view/menu/BaseMenuPresenter;
+.source "ActionMenuPresenter.java"
 
 # interfaces
 .implements Landroidx/core/view/ActionProvider$SubUiVisibilityListener;
@@ -332,7 +333,7 @@
 
     if-eqz v14, :cond_1
 
-    add-int/lit8 v8, v8, 0x1
+    add-int/lit8 v9, v9, 0x1
 
     goto :goto_2
 
@@ -348,7 +349,7 @@
     goto :goto_2
 
     :cond_2
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
     :goto_2
     iget-boolean v12, v0, Landroidx/appcompat/widget/ActionMenuPresenter;->mExpandedActionViewsExclusive:Z
@@ -373,9 +374,9 @@
 
     if-eqz v4, :cond_6
 
-    if-nez v9, :cond_5
+    if-nez v8, :cond_5
 
-    add-int/2addr v10, v8
+    add-int/2addr v10, v9
 
     if-le v10, v11, :cond_6
 
@@ -383,7 +384,7 @@
     add-int/lit8 v11, v11, -0x1
 
     :cond_6
-    sub-int/2addr v11, v8
+    sub-int/2addr v11, v9
 
     iget-object v4, v0, Landroidx/appcompat/widget/ActionMenuPresenter;->mActionButtonGroups:Landroid/util/SparseBooleanArray;
 
@@ -395,17 +396,13 @@
 
     iget v8, v0, Landroidx/appcompat/widget/ActionMenuPresenter;->mMinCellSize:I
 
-    div-int v8, v5, v8
+    div-int v9, v5, v8
 
-    iget v9, v0, Landroidx/appcompat/widget/ActionMenuPresenter;->mMinCellSize:I
+    rem-int v10, v5, v8
 
-    rem-int v9, v5, v9
+    div-int/2addr v10, v9
 
-    iget v10, v0, Landroidx/appcompat/widget/ActionMenuPresenter;->mMinCellSize:I
-
-    div-int/2addr v9, v8
-
-    add-int/2addr v9, v10
+    add-int/2addr v8, v10
 
     goto :goto_3
 
@@ -422,7 +419,7 @@
     const/4 v13, 0x0
 
     :goto_4
-    if-ge v5, v3, :cond_1d
+    if-ge v5, v3, :cond_1e
 
     invoke-virtual {v1, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -453,11 +450,11 @@
 
     if-eqz v12, :cond_9
 
-    invoke-static {v15, v9, v8, v6, v2}, Landroidx/appcompat/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I
+    invoke-static {v15, v8, v9, v6, v2}, Landroidx/appcompat/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I
 
     move-result v12
 
-    sub-int/2addr v8, v12
+    sub-int/2addr v9, v12
 
     goto :goto_5
 
@@ -501,17 +498,16 @@
 
     move v13, v12
 
-    :goto_8
     const/4 v0, 0x0
 
-    goto/16 :goto_10
+    goto/16 :goto_f
 
     :cond_c
     invoke-virtual {v14}, Landroidx/appcompat/view/menu/MenuItemImpl;->requestsActionButton()Z
 
     move-result v12
 
-    if-eqz v12, :cond_1c
+    if-eqz v12, :cond_1d
 
     invoke-virtual {v14}, Landroidx/appcompat/view/menu/MenuItemImpl;->getGroupId()I
 
@@ -532,18 +528,18 @@
 
     if-eqz v2, :cond_e
 
-    if-lez v8, :cond_f
+    if-lez v9, :cond_f
 
     :cond_e
     const/4 v2, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_f
     const/4 v2, 0x0
 
-    :goto_9
-    if-eqz v2, :cond_16
+    :goto_8
+    if-eqz v2, :cond_17
 
     move/from16 v16, v2
 
@@ -568,23 +564,23 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v2, v9, v8, v6, v3}, Landroidx/appcompat/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I
+    invoke-static {v2, v8, v9, v6, v3}, Landroidx/appcompat/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I
 
     move-result v18
 
-    sub-int v8, v8, v18
+    sub-int v9, v9, v18
 
     if-nez v18, :cond_12
 
     const/16 v16, 0x0
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_11
     invoke-virtual {v2, v6, v6}, Landroid/view/View;->measure(II)V
 
     :cond_12
-    :goto_a
+    :goto_9
     invoke-virtual {v2}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v2
@@ -602,44 +598,53 @@
 
     if-ltz v10, :cond_14
 
-    :goto_b
     const/4 v2, 0x1
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_14
     const/4 v2, 0x0
 
-    :goto_c
+    :goto_a
     and-int v2, v16, v2
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_15
     add-int v2, v10, v13
 
-    if-lez v2, :cond_14
+    if-lez v2, :cond_16
+
+    const/4 v2, 0x1
 
     goto :goto_b
 
     :cond_16
+    const/4 v2, 0x0
+
+    :goto_b
+    and-int v2, v16, v2
+
+    goto :goto_c
+
+    :cond_17
     move/from16 v16, v2
 
     move/from16 v17, v3
 
-    :goto_d
-    if-eqz v2, :cond_17
+    :goto_c
+    if-eqz v2, :cond_18
 
-    if-eqz v12, :cond_17
+    if-eqz v12, :cond_18
 
     const/4 v3, 0x1
 
     invoke-virtual {v4, v12, v3}, Landroid/util/SparseBooleanArray;->put(IZ)V
 
-    goto :goto_f
+    goto :goto_e
 
-    :cond_17
-    if-eqz v15, :cond_1a
+    :cond_18
+    if-eqz v15, :cond_1b
 
     const/4 v3, 0x0
 
@@ -647,8 +652,8 @@
 
     const/4 v3, 0x0
 
-    :goto_e
-    if-ge v3, v5, :cond_1a
+    :goto_d
+    if-ge v3, v5, :cond_1b
 
     invoke-virtual {v1, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -660,47 +665,49 @@
 
     move-result v0
 
-    if-ne v0, v12, :cond_19
+    if-ne v0, v12, :cond_1a
 
     invoke-virtual {v15}, Landroidx/appcompat/view/menu/MenuItemImpl;->isActionButton()Z
 
     move-result v0
 
-    if-eqz v0, :cond_18
+    if-eqz v0, :cond_19
 
     add-int/lit8 v11, v11, 0x1
 
-    :cond_18
+    :cond_19
     const/4 v0, 0x0
 
     invoke-virtual {v15, v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->setIsActionButton(Z)V
 
-    :cond_19
+    :cond_1a
     add-int/lit8 v3, v3, 0x1
 
     move-object/from16 v0, p0
 
-    goto :goto_e
+    goto :goto_d
 
-    :cond_1a
-    :goto_f
-    if-eqz v2, :cond_1b
+    :cond_1b
+    :goto_e
+    if-eqz v2, :cond_1c
 
     add-int/lit8 v11, v11, -0x1
 
-    :cond_1b
+    :cond_1c
     invoke-virtual {v14, v2}, Landroidx/appcompat/view/menu/MenuItemImpl;->setIsActionButton(Z)V
 
-    goto/16 :goto_8
+    const/4 v0, 0x0
 
-    :cond_1c
+    goto :goto_f
+
+    :cond_1d
     move/from16 v17, v3
 
     const/4 v0, 0x0
 
     invoke-virtual {v14, v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->setIsActionButton(Z)V
 
-    :goto_10
+    :goto_f
     add-int/lit8 v5, v5, 0x1
 
     move/from16 v3, v17
@@ -711,7 +718,7 @@
 
     goto/16 :goto_4
 
-    :cond_1d
+    :cond_1e
     const/4 v2, 0x1
 
     return v2
@@ -804,8 +811,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuPresenter;->mOverflowButton:Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;->getDrawable()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -876,8 +881,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuPresenter;->mActionButtonPopup:Landroidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter$ActionButtonSubmenu;->dismiss()V
 
     const/4 v0, 0x1
@@ -1059,8 +1062,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuPresenter;->mOverflowPopup:Landroidx/appcompat/widget/ActionMenuPresenter$OverflowPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter$OverflowPopup;->isShowing()Z
 
     move-result v0
@@ -1362,8 +1363,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuPresenter;->mOverflowButton:Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     return-void
@@ -1651,8 +1650,6 @@
 
     if-eqz p1, :cond_8
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionMenuPresenter;->mOverflowButton:Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;->getParent()Landroid/view/ViewParent;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuChildView.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuChildView.smali
index 1f4ac12843..6a2b8fe2f6 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuChildView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuChildView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ActionMenuView$ActionMenuChildView;
 .super Ljava/lang/Object;
+.source "ActionMenuView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuPresenterCallback.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuPresenterCallback.smali
index 6ae4a93380..b55a7d6a95 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuPresenterCallback.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$ActionMenuPresenterCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuView$ActionMenuPresenterCallback;
 .super Ljava/lang/Object;
+.source "ActionMenuView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter$Callback;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$LayoutParams.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$LayoutParams.smali
index bc8dc2694c..f5465fbc94 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$LayoutParams.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
 .super Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
+.source "ActionMenuView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$MenuBuilderCallback.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$MenuBuilderCallback.smali
index fbe4e7147c..7dd8d3ceb5 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$MenuBuilderCallback.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$MenuBuilderCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActionMenuView$MenuBuilderCallback;
 .super Ljava/lang/Object;
+.source "ActionMenuView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$Callback;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener.smali
index 996309681d..d698ee827a 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener;
 .super Ljava/lang/Object;
+.source "ActionMenuView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActionMenuView.smali b/com.discord/smali/androidx/appcompat/widget/ActionMenuView.smali
index 5b9ded11f6..fe28afb10a 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActionMenuView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActionMenuView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActionMenuView;
 .super Landroidx/appcompat/widget/LinearLayoutCompat;
+.source "ActionMenuView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$ItemInvoker;
@@ -239,7 +240,7 @@
 .end method
 
 .method private onMeasureExactFormat(II)V
-    .locals 34
+    .locals 29
 
     move-object/from16 v0, p0
 
@@ -287,34 +288,30 @@
 
     iget v4, v0, Landroidx/appcompat/widget/ActionMenuView;->mMinCellSize:I
 
-    div-int v4, v2, v4
+    div-int v7, v2, v4
 
-    iget v7, v0, Landroidx/appcompat/widget/ActionMenuView;->mMinCellSize:I
+    rem-int v8, v2, v4
 
-    rem-int v7, v2, v7
+    const/4 v9, 0x0
 
-    const/4 v8, 0x0
+    if-nez v7, :cond_0
 
-    if-nez v4, :cond_0
-
-    invoke-virtual {v0, v2, v8}, Landroidx/appcompat/widget/ActionMenuView;->setMeasuredDimension(II)V
+    invoke-virtual {v0, v2, v9}, Landroidx/appcompat/widget/ActionMenuView;->setMeasuredDimension(II)V
 
     return-void
 
     :cond_0
-    iget v9, v0, Landroidx/appcompat/widget/ActionMenuView;->mMinCellSize:I
+    div-int/2addr v8, v7
 
-    div-int/2addr v7, v4
-
-    add-int/2addr v9, v7
+    add-int/2addr v4, v8
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/ActionMenuView;->getChildCount()I
 
-    move-result v7
+    move-result v8
 
-    move v14, v4
+    move v14, v7
 
-    const/4 v4, 0x0
+    const/4 v7, 0x0
 
     const/4 v10, 0x0
 
@@ -326,24 +323,24 @@
 
     const/16 v16, 0x0
 
-    const-wide/16 v19, 0x0
+    const-wide/16 v17, 0x0
 
     :goto_0
-    if-ge v4, v7, :cond_8
+    if-ge v7, v8, :cond_8
 
-    invoke-virtual {v0, v4}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {v0, v7}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
 
     move-result-object v11
 
     invoke-virtual {v11}, Landroid/view/View;->getVisibility()I
 
-    move-result v8
+    move-result v9
 
-    move/from16 v21, v3
+    move/from16 v19, v3
 
     const/16 v3, 0x8
 
-    if-eq v8, v3, :cond_7
+    if-eq v9, v3, :cond_7
 
     instance-of v3, v11, Landroidx/appcompat/view/menu/ActionMenuItemView;
 
@@ -351,700 +348,676 @@
 
     if-eqz v3, :cond_1
 
-    iget v8, v0, Landroidx/appcompat/widget/ActionMenuView;->mGeneratedItemPadding:I
+    iget v9, v0, Landroidx/appcompat/widget/ActionMenuView;->mGeneratedItemPadding:I
 
-    move/from16 v22, v13
+    move/from16 v20, v13
 
-    iget v13, v0, Landroidx/appcompat/widget/ActionMenuView;->mGeneratedItemPadding:I
+    const/4 v13, 0x0
 
-    move/from16 v23, v2
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v11, v8, v2, v13, v2}, Landroid/view/View;->setPadding(IIII)V
+    invoke-virtual {v11, v9, v13, v9, v13}, Landroid/view/View;->setPadding(IIII)V
 
     goto :goto_1
 
     :cond_1
-    move/from16 v23, v2
+    move/from16 v20, v13
 
-    move/from16 v22, v13
-
-    const/4 v2, 0x0
+    const/4 v13, 0x0
 
     :goto_1
     invoke-virtual {v11}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v8
+    move-result-object v9
 
-    check-cast v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+    check-cast v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
 
-    iput-boolean v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
+    iput-boolean v13, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
 
-    iput v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
+    iput v13, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
 
-    iput v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+    iput v13, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
 
-    iput-boolean v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expandable:Z
+    iput-boolean v13, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expandable:Z
 
-    iput v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->leftMargin:I
+    iput v13, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->leftMargin:I
 
-    iput v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->rightMargin:I
+    iput v13, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->rightMargin:I
 
     if-eqz v3, :cond_2
 
-    move-object v2, v11
+    move-object v3, v11
 
-    check-cast v2, Landroidx/appcompat/view/menu/ActionMenuItemView;
+    check-cast v3, Landroidx/appcompat/view/menu/ActionMenuItemView;
 
-    invoke-virtual {v2}, Landroidx/appcompat/view/menu/ActionMenuItemView;->hasText()Z
+    invoke-virtual {v3}, Landroidx/appcompat/view/menu/ActionMenuItemView;->hasText()Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_2
+    if-eqz v3, :cond_2
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     :goto_2
-    iput-boolean v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
+    iput-boolean v3, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
 
-    iget-boolean v2, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z
+    iget-boolean v3, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z
 
-    if-eqz v2, :cond_3
+    if-eqz v3, :cond_3
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
     goto :goto_3
 
     :cond_3
-    move v2, v14
+    move v3, v14
 
     :goto_3
-    invoke-static {v11, v9, v2, v6, v5}, Landroidx/appcompat/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I
-
-    move-result v2
-
-    invoke-static {v15, v2}, Ljava/lang/Math;->max(II)I
+    invoke-static {v11, v4, v3, v6, v5}, Landroidx/appcompat/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I
 
     move-result v3
 
-    iget-boolean v13, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expandable:Z
+    invoke-static {v15, v3}, Ljava/lang/Math;->max(II)I
 
-    if-eqz v13, :cond_4
+    move-result v13
+
+    iget-boolean v15, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expandable:Z
+
+    if-eqz v15, :cond_4
 
     add-int/lit8 v16, v16, 0x1
 
     :cond_4
-    iget-boolean v8, v8, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z
+    iget-boolean v9, v9, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z
 
-    if-eqz v8, :cond_5
+    if-eqz v9, :cond_5
 
     const/4 v12, 0x1
 
     :cond_5
-    sub-int/2addr v14, v2
+    sub-int/2addr v14, v3
 
     invoke-virtual {v11}, Landroid/view/View;->getMeasuredHeight()I
 
-    move-result v8
+    move-result v9
 
-    invoke-static {v10, v8}, Ljava/lang/Math;->max(II)I
+    invoke-static {v10, v9}, Ljava/lang/Math;->max(II)I
 
     move-result v10
 
-    const/4 v8, 0x1
+    const/4 v9, 0x1
 
-    if-ne v2, v8, :cond_6
+    if-ne v3, v9, :cond_6
 
-    shl-int v2, v8, v4
+    shl-int v3, v9, v7
 
-    move/from16 v24, v3
+    move v11, v10
 
-    int-to-long v2, v2
+    int-to-long v9, v3
 
-    or-long v2, v19, v2
+    or-long v9, v17, v9
 
-    move-wide/from16 v19, v2
+    move-wide/from16 v17, v9
+
+    move v10, v11
 
     goto :goto_4
 
     :cond_6
-    move/from16 v24, v3
+    move v11, v10
 
     :goto_4
-    move/from16 v13, v22
+    move v15, v13
 
-    move/from16 v15, v24
-
-    goto :goto_5
+    move/from16 v13, v20
 
     :cond_7
-    move/from16 v23, v2
+    add-int/lit8 v7, v7, 0x1
 
-    :goto_5
-    add-int/lit8 v4, v4, 0x1
+    move/from16 v3, v19
 
-    move/from16 v3, v21
+    const/4 v9, 0x0
 
-    move/from16 v2, v23
-
-    const/4 v8, 0x0
-
-    goto/16 :goto_0
+    goto :goto_0
 
     :cond_8
-    move/from16 v23, v2
+    move/from16 v19, v3
 
-    move/from16 v21, v3
-
-    const/4 v2, 0x2
+    const/4 v3, 0x2
 
     if-eqz v12, :cond_9
 
-    if-ne v13, v2, :cond_9
+    if-ne v13, v3, :cond_9
 
-    const/4 v3, 0x1
+    const/4 v5, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_9
-    const/4 v3, 0x0
-
-    :goto_6
-    const/4 v4, 0x0
-
-    :goto_7
-    const-wide/16 v24, 0x1
-
-    if-lez v16, :cond_13
-
-    if-lez v14, :cond_13
-
-    const v5, 0x7fffffff
-
     const/4 v5, 0x0
 
-    const/4 v8, 0x0
+    :goto_5
+    const/4 v7, 0x0
 
-    const v11, 0x7fffffff
+    :goto_6
+    const-wide/16 v20, 0x1
 
-    const-wide/16 v26, 0x0
+    if-lez v16, :cond_12
 
-    :goto_8
-    if-ge v5, v7, :cond_c
+    if-lez v14, :cond_12
 
-    invoke-virtual {v0, v5}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
+    const v9, 0x7fffffff
 
-    move-result-object v22
+    const v3, 0x7fffffff
 
-    invoke-virtual/range {v22 .. v22}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    const/4 v9, 0x0
 
-    move-result-object v22
+    const/4 v11, 0x0
 
-    move-object/from16 v2, v22
+    const-wide/16 v22, 0x0
 
-    check-cast v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+    :goto_7
+    if-ge v9, v8, :cond_c
 
-    move/from16 v28, v4
+    invoke-virtual {v0, v9}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
 
-    iget-boolean v4, v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expandable:Z
+    move-result-object v24
 
-    if-eqz v4, :cond_b
+    invoke-virtual/range {v24 .. v24}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    iget v4, v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+    move-result-object v24
 
-    if-ge v4, v11, :cond_a
+    move/from16 v25, v7
 
-    iget v2, v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+    move-object/from16 v7, v24
 
-    shl-long v26, v24, v5
+    check-cast v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
 
-    move v11, v2
+    move/from16 v24, v10
 
-    const/4 v8, 0x1
+    iget-boolean v10, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expandable:Z
 
-    goto :goto_9
+    if-eqz v10, :cond_b
 
-    :cond_a
-    iget v2, v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+    iget v10, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
 
-    if-ne v2, v11, :cond_b
+    if-ge v10, v3, :cond_a
 
-    shl-long v29, v24, v5
+    iget v3, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
 
-    or-long v26, v26, v29
+    shl-long v10, v20, v9
 
-    add-int/lit8 v8, v8, 0x1
+    move-wide/from16 v22, v10
 
-    :cond_b
-    :goto_9
-    add-int/lit8 v5, v5, 0x1
-
-    move/from16 v4, v28
-
-    const/4 v2, 0x2
+    const/4 v11, 0x1
 
     goto :goto_8
 
-    :cond_c
-    move/from16 v28, v4
+    :cond_a
+    iget v7, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
 
-    or-long v19, v19, v26
+    if-ne v7, v3, :cond_b
 
-    if-gt v8, v14, :cond_12
+    shl-long v26, v20, v9
+
+    or-long v22, v22, v26
 
     add-int/lit8 v11, v11, 0x1
 
-    const/4 v2, 0x0
+    :cond_b
+    :goto_8
+    add-int/lit8 v9, v9, 0x1
+
+    move/from16 v10, v24
+
+    move/from16 v7, v25
+
+    goto :goto_7
+
+    :cond_c
+    move/from16 v25, v7
+
+    move/from16 v24, v10
+
+    or-long v17, v17, v22
+
+    if-gt v11, v14, :cond_11
+
+    add-int/lit8 v3, v3, 0x1
+
+    const/4 v7, 0x0
+
+    :goto_9
+    if-ge v7, v8, :cond_10
+
+    invoke-virtual {v0, v7}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v9
+
+    invoke-virtual {v9}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v10
+
+    check-cast v10, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+
+    move/from16 v26, v2
+
+    const/4 v11, 0x1
+
+    shl-int v2, v11, v7
+
+    move v11, v1
+
+    int-to-long v1, v2
+
+    and-long v20, v22, v1
+
+    const-wide/16 v27, 0x0
+
+    cmp-long v25, v20, v27
+
+    if-nez v25, :cond_e
+
+    iget v9, v10, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+
+    if-ne v9, v3, :cond_d
+
+    or-long v17, v17, v1
+
+    :cond_d
+    move/from16 v20, v3
+
+    goto :goto_b
+
+    :cond_e
+    if-eqz v5, :cond_f
+
+    iget-boolean v1, v10, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
+
+    if-eqz v1, :cond_f
+
+    const/4 v1, 0x1
+
+    if-ne v14, v1, :cond_f
+
+    iget v2, v0, Landroidx/appcompat/widget/ActionMenuView;->mGeneratedItemPadding:I
+
+    add-int v1, v2, v4
+
+    move/from16 v20, v3
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v9, v1, v3, v2, v3}, Landroid/view/View;->setPadding(IIII)V
+
+    goto :goto_a
+
+    :cond_f
+    move/from16 v20, v3
 
     :goto_a
-    if-ge v2, v7, :cond_11
+    iget v1, v10, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+
+    const/4 v2, 0x1
+
+    add-int/2addr v1, v2
+
+    iput v1, v10, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+
+    iput-boolean v2, v10, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
+
+    add-int/lit8 v14, v14, -0x1
+
+    :goto_b
+    add-int/lit8 v7, v7, 0x1
+
+    move v1, v11
+
+    move/from16 v3, v20
+
+    move/from16 v2, v26
+
+    goto :goto_9
+
+    :cond_10
+    move/from16 v10, v24
+
+    const/4 v3, 0x2
+
+    const/4 v7, 0x1
+
+    goto/16 :goto_6
+
+    :cond_11
+    move v11, v1
+
+    move/from16 v26, v2
+
+    goto :goto_c
+
+    :cond_12
+    move v11, v1
+
+    move/from16 v26, v2
+
+    move/from16 v25, v7
+
+    move/from16 v24, v10
+
+    :goto_c
+    if-nez v12, :cond_13
+
+    const/4 v1, 0x1
+
+    if-ne v13, v1, :cond_14
+
+    const/4 v2, 0x1
+
+    goto :goto_d
+
+    :cond_13
+    const/4 v1, 0x1
+
+    :cond_14
+    const/4 v2, 0x0
+
+    :goto_d
+    if-lez v14, :cond_21
+
+    const-wide/16 v9, 0x0
+
+    cmp-long v3, v17, v9
+
+    if-eqz v3, :cond_21
+
+    sub-int/2addr v13, v1
+
+    if-lt v14, v13, :cond_15
+
+    if-nez v2, :cond_15
+
+    if-le v15, v1, :cond_21
+
+    :cond_15
+    invoke-static/range {v17 .. v18}, Ljava/lang/Long;->bitCount(J)I
+
+    move-result v1
+
+    int-to-float v1, v1
+
+    if-nez v2, :cond_18
+
+    and-long v2, v17, v20
+
+    const/high16 v5, 0x3f000000    # 0.5f
+
+    const-wide/16 v9, 0x0
+
+    cmp-long v7, v2, v9
+
+    if-eqz v7, :cond_16
+
+    const/4 v13, 0x0
+
+    invoke-virtual {v0, v13}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v2
+
+    check-cast v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+
+    iget-boolean v2, v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
+
+    if-nez v2, :cond_17
+
+    sub-float/2addr v1, v5
+
+    goto :goto_e
+
+    :cond_16
+    const/4 v13, 0x0
+
+    :cond_17
+    :goto_e
+    add-int/lit8 v2, v8, -0x1
+
+    const/4 v3, 0x1
+
+    shl-int v7, v3, v2
+
+    int-to-long v9, v7
+
+    and-long v9, v17, v9
+
+    const-wide/16 v15, 0x0
+
+    cmp-long v3, v9, v15
+
+    if-eqz v3, :cond_19
 
     invoke-virtual {v0, v2}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
 
-    move-result-object v4
+    move-result-object v2
 
-    invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v2
+
+    check-cast v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+
+    iget-boolean v2, v2, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
+
+    if-nez v2, :cond_19
+
+    sub-float/2addr v1, v5
+
+    goto :goto_f
+
+    :cond_18
+    const/4 v13, 0x0
+
+    :cond_19
+    :goto_f
+    const/4 v2, 0x0
+
+    cmpl-float v2, v1, v2
+
+    if-lez v2, :cond_1a
+
+    mul-int v14, v14, v4
+
+    int-to-float v2, v14
+
+    div-float/2addr v2, v1
+
+    float-to-int v9, v2
+
+    goto :goto_10
+
+    :cond_1a
+    const/4 v9, 0x0
+
+    :goto_10
+    const/4 v1, 0x0
+
+    :goto_11
+    if-ge v1, v8, :cond_22
+
+    const/4 v2, 0x1
+
+    shl-int v3, v2, v1
+
+    int-to-long v14, v3
+
+    and-long v14, v17, v14
+
+    const-wide/16 v20, 0x0
+
+    cmp-long v3, v14, v20
+
+    if-eqz v3, :cond_1f
+
+    invoke-virtual {v0, v1}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v5
 
     check-cast v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
 
-    move/from16 v31, v10
+    instance-of v3, v3, Landroidx/appcompat/view/menu/ActionMenuItemView;
 
-    const/4 v8, 0x1
+    if-eqz v3, :cond_1c
 
-    shl-int v10, v8, v2
+    iput v9, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
 
-    move/from16 v32, v6
+    iput-boolean v2, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
 
-    move/from16 v33, v7
+    if-nez v1, :cond_1b
 
-    int-to-long v6, v10
+    iget-boolean v2, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
 
-    and-long v24, v26, v6
+    if-nez v2, :cond_1b
 
-    const-wide/16 v17, 0x0
+    neg-int v2, v9
 
-    cmp-long v8, v24, v17
+    const/4 v3, 0x2
 
-    if-nez v8, :cond_d
+    div-int/2addr v2, v3
 
-    iget v4, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
-
-    if-ne v4, v11, :cond_10
-
-    or-long v19, v19, v6
-
-    goto :goto_c
-
-    :cond_d
-    if-eqz v3, :cond_e
-
-    iget-boolean v6, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
-
-    if-eqz v6, :cond_e
-
-    const/4 v6, 0x1
-
-    if-ne v14, v6, :cond_f
-
-    iget v7, v0, Landroidx/appcompat/widget/ActionMenuView;->mGeneratedItemPadding:I
-
-    add-int/2addr v7, v9
-
-    iget v8, v0, Landroidx/appcompat/widget/ActionMenuView;->mGeneratedItemPadding:I
-
-    const/4 v10, 0x0
-
-    invoke-virtual {v4, v7, v10, v8, v10}, Landroid/view/View;->setPadding(IIII)V
-
-    goto :goto_b
-
-    :cond_e
-    const/4 v6, 0x1
-
-    :cond_f
-    :goto_b
-    iget v4, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
-
-    add-int/2addr v4, v6
-
-    iput v4, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
-
-    iput-boolean v6, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
-
-    add-int/lit8 v14, v14, -0x1
-
-    :cond_10
-    :goto_c
-    add-int/lit8 v2, v2, 0x1
-
-    move/from16 v10, v31
-
-    move/from16 v6, v32
-
-    move/from16 v7, v33
-
-    goto :goto_a
-
-    :cond_11
-    const/4 v2, 0x2
-
-    const/4 v4, 0x1
-
-    goto/16 :goto_7
-
-    :cond_12
-    :goto_d
-    move/from16 v32, v6
-
-    move/from16 v33, v7
-
-    move/from16 v31, v10
-
-    goto :goto_e
-
-    :cond_13
-    move/from16 v28, v4
-
-    goto :goto_d
-
-    :goto_e
-    if-nez v12, :cond_14
-
-    const/4 v2, 0x1
-
-    if-ne v13, v2, :cond_15
-
-    const/4 v3, 0x1
-
-    goto :goto_f
-
-    :cond_14
-    const/4 v2, 0x1
-
-    :cond_15
-    const/4 v3, 0x0
-
-    :goto_f
-    if-lez v14, :cond_23
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v19, v4
-
-    if-eqz v6, :cond_23
-
-    sub-int/2addr v13, v2
-
-    if-lt v14, v13, :cond_16
-
-    if-nez v3, :cond_16
-
-    if-le v15, v2, :cond_23
-
-    :cond_16
-    invoke-static/range {v19 .. v20}, Ljava/lang/Long;->bitCount(J)I
-
-    move-result v2
-
-    int-to-float v2, v2
-
-    if-nez v3, :cond_19
-
-    and-long v3, v19, v24
-
-    const/high16 v5, 0x3f000000    # 0.5f
-
-    const-wide/16 v6, 0x0
-
-    cmp-long v8, v3, v6
-
-    if-eqz v8, :cond_17
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v0, v3}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v4
-
-    check-cast v4, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
-
-    iget-boolean v4, v4, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
-
-    if-nez v4, :cond_18
-
-    sub-float/2addr v2, v5
-
-    goto :goto_10
-
-    :cond_17
-    const/4 v3, 0x0
-
-    :cond_18
-    :goto_10
-    add-int/lit8 v7, v33, -0x1
-
-    const/4 v4, 0x1
-
-    shl-int v6, v4, v7
-
-    int-to-long v10, v6
-
-    and-long v10, v19, v10
-
-    const-wide/16 v12, 0x0
-
-    cmp-long v4, v10, v12
-
-    if-eqz v4, :cond_1a
-
-    invoke-virtual {v0, v7}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v4
-
-    check-cast v4, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
-
-    iget-boolean v4, v4, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
-
-    if-nez v4, :cond_1a
-
-    sub-float/2addr v2, v5
-
-    goto :goto_11
-
-    :cond_19
-    const/4 v3, 0x0
-
-    :cond_1a
-    :goto_11
-    const/4 v4, 0x0
-
-    cmpl-float v4, v2, v4
-
-    if-lez v4, :cond_1b
-
-    mul-int v14, v14, v9
-
-    int-to-float v4, v14
-
-    div-float/2addr v4, v2
-
-    float-to-int v8, v4
+    iput v2, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->leftMargin:I
 
     goto :goto_12
 
     :cond_1b
-    const/4 v8, 0x0
+    const/4 v3, 0x2
 
     :goto_12
-    move/from16 v11, v28
+    const/4 v2, 0x1
 
-    move/from16 v2, v33
-
-    const/4 v4, 0x0
-
-    :goto_13
-    if-ge v4, v2, :cond_22
-
-    const/4 v5, 0x1
-
-    shl-int v6, v5, v4
-
-    int-to-long v6, v6
-
-    and-long v6, v19, v6
-
-    const-wide/16 v12, 0x0
-
-    cmp-long v10, v6, v12
-
-    if-eqz v10, :cond_20
-
-    invoke-virtual {v0, v4}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v6
-
-    invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v7
-
-    check-cast v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
-
-    instance-of v6, v6, Landroidx/appcompat/view/menu/ActionMenuItemView;
-
-    if-eqz v6, :cond_1d
-
-    iput v8, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
-
-    iput-boolean v5, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
-
-    if-nez v4, :cond_1c
-
-    iget-boolean v5, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z
-
-    if-nez v5, :cond_1c
-
-    neg-int v5, v8
-
-    const/4 v6, 0x2
-
-    div-int/2addr v5, v6
-
-    iput v5, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->leftMargin:I
-
-    goto :goto_14
-
-    :cond_1c
-    const/4 v6, 0x2
-
-    :goto_14
-    const/4 v5, 0x1
-
-    :goto_15
-    const/4 v11, 0x1
-
-    goto :goto_16
-
-    :cond_1d
-    const/4 v6, 0x2
-
-    iget-boolean v5, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z
-
-    if-eqz v5, :cond_1e
-
-    iput v8, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
-
-    const/4 v5, 0x1
-
-    iput-boolean v5, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
-
-    neg-int v10, v8
-
-    div-int/2addr v10, v6
-
-    iput v10, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->rightMargin:I
-
-    goto :goto_15
-
-    :cond_1e
-    const/4 v5, 0x1
-
-    if-eqz v4, :cond_1f
-
-    div-int/lit8 v10, v8, 0x2
-
-    iput v10, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->leftMargin:I
-
-    :cond_1f
-    add-int/lit8 v10, v2, -0x1
-
-    if-eq v4, v10, :cond_21
-
-    div-int/lit8 v10, v8, 0x2
-
-    iput v10, v7, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->rightMargin:I
-
-    goto :goto_16
-
-    :cond_20
-    const/4 v6, 0x2
-
-    :cond_21
-    :goto_16
-    add-int/lit8 v4, v4, 0x1
+    const/16 v25, 0x1
 
     goto :goto_13
 
-    :cond_22
-    move/from16 v28, v11
+    :cond_1c
+    const/4 v3, 0x2
 
-    goto :goto_17
+    iget-boolean v2, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z
+
+    if-eqz v2, :cond_1d
+
+    iput v9, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
+
+    const/4 v2, 0x1
+
+    iput-boolean v2, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
+
+    neg-int v7, v9
+
+    div-int/2addr v7, v3
+
+    iput v7, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->rightMargin:I
+
+    const/16 v25, 0x1
+
+    goto :goto_13
+
+    :cond_1d
+    const/4 v2, 0x1
+
+    if-eqz v1, :cond_1e
+
+    div-int/lit8 v7, v9, 0x2
+
+    iput v7, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->leftMargin:I
+
+    :cond_1e
+    add-int/lit8 v7, v8, -0x1
+
+    if-eq v1, v7, :cond_20
+
+    div-int/lit8 v7, v9, 0x2
+
+    iput v7, v5, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->rightMargin:I
+
+    goto :goto_13
+
+    :cond_1f
+    const/4 v3, 0x2
+
+    :cond_20
+    :goto_13
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_11
+
+    :cond_21
+    const/4 v13, 0x0
+
+    :cond_22
+    const/high16 v1, 0x40000000    # 2.0f
+
+    if-eqz v25, :cond_24
+
+    :goto_14
+    if-ge v13, v8, :cond_24
+
+    invoke-virtual {v0, v13}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v3
+
+    check-cast v3, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+
+    iget-boolean v5, v3, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
+
+    if-eqz v5, :cond_23
+
+    iget v5, v3, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
+
+    mul-int v5, v5, v4
+
+    iget v3, v3, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
+
+    add-int/2addr v5, v3
+
+    invoke-static {v5, v1}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v3
+
+    invoke-virtual {v2, v3, v6}, Landroid/view/View;->measure(II)V
 
     :cond_23
-    move/from16 v2, v33
+    add-int/lit8 v13, v13, 0x1
 
-    const/4 v3, 0x0
-
-    :goto_17
-    const/high16 v4, 0x40000000    # 2.0f
-
-    if-eqz v28, :cond_25
-
-    :goto_18
-    if-ge v3, v2, :cond_25
-
-    invoke-virtual {v0, v3}, Landroidx/appcompat/widget/ActionMenuView;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v6
-
-    check-cast v6, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
-
-    iget-boolean v7, v6, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->expanded:Z
-
-    if-eqz v7, :cond_24
-
-    iget v7, v6, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->cellsUsed:I
-
-    mul-int v7, v7, v9
-
-    iget v6, v6, Landroidx/appcompat/widget/ActionMenuView$LayoutParams;->extraPixels:I
-
-    add-int/2addr v7, v6
-
-    invoke-static {v7, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
-
-    move-result v6
-
-    move/from16 v7, v32
-
-    invoke-virtual {v5, v6, v7}, Landroid/view/View;->measure(II)V
-
-    goto :goto_19
+    goto :goto_14
 
     :cond_24
-    move/from16 v7, v32
+    if-eq v11, v1, :cond_25
 
-    :goto_19
-    add-int/lit8 v3, v3, 0x1
+    move/from16 v1, v24
 
-    move/from16 v32, v7
+    move/from16 v2, v26
 
-    goto :goto_18
+    goto :goto_15
 
     :cond_25
-    if-eq v1, v4, :cond_26
+    move/from16 v1, v19
 
-    move/from16 v2, v23
+    move/from16 v2, v26
 
-    move/from16 v1, v31
-
-    goto :goto_1a
-
-    :cond_26
-    move/from16 v1, v21
-
-    move/from16 v2, v23
-
-    :goto_1a
+    :goto_15
     invoke-virtual {v0, v2, v1}, Landroidx/appcompat/widget/ActionMenuView;->setMeasuredDimension(II)V
 
     return-void
@@ -1078,8 +1051,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuView;->mPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->dismissPopupMenus()Z
 
     :cond_0
@@ -1288,8 +1259,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ActionMenuView;->mActionMenuPresenterCallback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     goto :goto_0
 
     :cond_0
@@ -1424,8 +1393,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuView;->mPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->hideOverflowMenu()Z
 
     move-result v0
@@ -1486,8 +1453,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuView;->mPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->isOverflowMenuShowPending()Z
 
     move-result v0
@@ -1511,8 +1476,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuView;->mPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->isOverflowMenuShowing()Z
 
     move-result v0
@@ -1551,8 +1514,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActionMenuView;->mPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     const/4 v0, 0x0
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->updateMenuView(Z)V
@@ -2000,15 +1961,13 @@
 
     if-eqz v1, :cond_2
 
-    iget v1, p0, Landroidx/appcompat/widget/ActionMenuView;->mFormatItemsWidth:I
+    iget v4, p0, Landroidx/appcompat/widget/ActionMenuView;->mFormatItemsWidth:I
 
-    if-eq v0, v1, :cond_2
+    if-eq v0, v4, :cond_2
 
     iput v0, p0, Landroidx/appcompat/widget/ActionMenuView;->mFormatItemsWidth:I
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuView;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
-
-    invoke-virtual {v0, v2}, Landroidx/appcompat/view/menu/MenuBuilder;->onItemsChanged(Z)V
+    invoke-virtual {v1, v2}, Landroidx/appcompat/view/menu/MenuBuilder;->onItemsChanged(Z)V
 
     :cond_2
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActionMenuView;->getChildCount()I
@@ -2197,8 +2156,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActionMenuView;->mPresenter:Landroidx/appcompat/widget/ActionMenuPresenter;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuPresenter;->showOverflowMenu()Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityChooserModelClient.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityChooserModelClient.smali
index b5ee3b2990..081b3c084e 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityChooserModelClient.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityChooserModelClient.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ActivityChooserModel$ActivityChooserModelClient;
 .super Ljava/lang/Object;
+.source "ActivityChooserModel.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityResolveInfo.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityResolveInfo.smali
index a5d74e9704..eba62fc73d 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityResolveInfo.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityResolveInfo.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/widget/ActivityChooserModel$ActivityResolveInfo;
 .super Ljava/lang/Object;
+.source "ActivityChooserModel.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivitySorter.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivitySorter.smali
index a1c7184923..f5e286ed46 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivitySorter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivitySorter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ActivityChooserModel$ActivitySorter;
 .super Ljava/lang/Object;
+.source "ActivityChooserModel.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$DefaultSorter.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$DefaultSorter.smali
index 8a12616c89..281d9bebea 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$DefaultSorter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$DefaultSorter.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/widget/ActivityChooserModel$DefaultSorter;
 .super Ljava/lang/Object;
+.source "ActivityChooserModel.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/ActivityChooserModel$ActivitySorter;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$HistoricalRecord.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$HistoricalRecord.smali
index 237230eb37..25d9fb6b5e 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$HistoricalRecord.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$HistoricalRecord.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;
 .super Ljava/lang/Object;
+.source "ActivityChooserModel.java"
 
 
 # annotations
@@ -93,8 +94,6 @@
     return v1
 
     :cond_3
-    iget-object v2, p0, Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;->activity:Landroid/content/ComponentName;
-
     iget-object v3, p1, Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;->activity:Landroid/content/ComponentName;
 
     invoke-virtual {v2, v3}, Landroid/content/ComponentName;->equals(Ljava/lang/Object;)Z
@@ -138,7 +137,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 5
 
     iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;->activity:Landroid/content/ComponentName;
 
@@ -149,8 +148,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;->activity:Landroid/content/ComponentName;
-
     invoke-virtual {v0}, Landroid/content/ComponentName;->hashCode()I
 
     move-result v0
@@ -162,11 +159,9 @@
 
     iget-wide v1, p0, Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;->time:J
 
-    iget-wide v3, p0, Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;->time:J
+    const/16 v3, 0x20
 
-    const/16 v5, 0x20
-
-    ushr-long/2addr v3, v5
+    ushr-long v3, v1, v3
 
     xor-long/2addr v1, v3
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$OnChooseActivityListener.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$OnChooseActivityListener.smali
index c732518126..9770e3ef77 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$OnChooseActivityListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$OnChooseActivityListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ActivityChooserModel$OnChooseActivityListener;
 .super Ljava/lang/Object;
+.source "ActivityChooserModel.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali
index 252f7c099e..e5b7cc7ba2 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;
 .super Landroid/os/AsyncTask;
+.source "ActivityChooserModel.java"
 
 
 # annotations
@@ -74,26 +75,26 @@
 
     invoke-virtual {v4, p1, v0}, Landroid/content/Context;->openFileOutput(Ljava/lang/String;I)Ljava/io/FileOutputStream;
 
-    move-result-object v4
+    move-result-object p1
     :try_end_0
     .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_5
 
     invoke-static {}, Landroid/util/Xml;->newSerializer()Lorg/xmlpull/v1/XmlSerializer;
 
-    move-result-object p1
+    move-result-object v4
 
     :try_start_1
-    invoke-interface {p1, v4, v3}, Lorg/xmlpull/v1/XmlSerializer;->setOutput(Ljava/io/OutputStream;Ljava/lang/String;)V
+    invoke-interface {v4, p1, v3}, Lorg/xmlpull/v1/XmlSerializer;->setOutput(Ljava/io/OutputStream;Ljava/lang/String;)V
 
     const-string v5, "UTF-8"
 
     sget-object v6, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    invoke-interface {p1, v5, v6}, Lorg/xmlpull/v1/XmlSerializer;->startDocument(Ljava/lang/String;Ljava/lang/Boolean;)V
+    invoke-interface {v4, v5, v6}, Lorg/xmlpull/v1/XmlSerializer;->startDocument(Ljava/lang/String;Ljava/lang/Boolean;)V
 
     const-string v5, "historical-records"
 
-    invoke-interface {p1, v3, v5}, Lorg/xmlpull/v1/XmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
+    invoke-interface {v4, v3, v5}, Lorg/xmlpull/v1/XmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -112,7 +113,7 @@
 
     const-string v8, "historical-record"
 
-    invoke-interface {p1, v3, v8}, Lorg/xmlpull/v1/XmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
+    invoke-interface {v4, v3, v8}, Lorg/xmlpull/v1/XmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
     const-string v8, "activity"
 
@@ -122,7 +123,7 @@
 
     move-result-object v9
 
-    invoke-interface {p1, v3, v8, v9}, Lorg/xmlpull/v1/XmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
+    invoke-interface {v4, v3, v8, v9}, Lorg/xmlpull/v1/XmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
     const-string v8, "time"
 
@@ -132,7 +133,7 @@
 
     move-result-object v9
 
-    invoke-interface {p1, v3, v8, v9}, Lorg/xmlpull/v1/XmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
+    invoke-interface {v4, v3, v8, v9}, Lorg/xmlpull/v1/XmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
     const-string v8, "weight"
 
@@ -142,11 +143,11 @@
 
     move-result-object v7
 
-    invoke-interface {p1, v3, v8, v7}, Lorg/xmlpull/v1/XmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
+    invoke-interface {v4, v3, v8, v7}, Lorg/xmlpull/v1/XmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
     const-string v7, "historical-record"
 
-    invoke-interface {p1, v3, v7}, Lorg/xmlpull/v1/XmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
+    invoke-interface {v4, v3, v7}, Lorg/xmlpull/v1/XmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
     add-int/lit8 v6, v6, 0x1
 
@@ -155,133 +156,133 @@
     :cond_0
     const-string v0, "historical-records"
 
-    invoke-interface {p1, v3, v0}, Lorg/xmlpull/v1/XmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
+    invoke-interface {v4, v3, v0}, Lorg/xmlpull/v1/XmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
-    invoke-interface {p1}, Lorg/xmlpull/v1/XmlSerializer;->endDocument()V
+    invoke-interface {v4}, Lorg/xmlpull/v1/XmlSerializer;->endDocument()V
     :try_end_1
     .catch Ljava/lang/IllegalArgumentException; {:try_start_1 .. :try_end_1} :catch_2
     .catch Ljava/lang/IllegalStateException; {:try_start_1 .. :try_end_1} :catch_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
+    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
-    iput-boolean v2, p1, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
+    iput-boolean v2, v0, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
 
-    if-eqz v4, :cond_1
+    if-eqz p1, :cond_1
 
     :goto_1
     :try_start_2
-    invoke-virtual {v4}, Ljava/io/FileOutputStream;->close()V
+    invoke-virtual {p1}, Ljava/io/FileOutputStream;->close()V
     :try_end_2
     .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_3
 
     goto :goto_2
 
     :catchall_0
-    move-exception p1
+    move-exception v0
 
     goto :goto_3
 
     :catch_0
-    move-exception p1
+    move-exception v0
 
     :try_start_3
-    sget-object v0, Landroidx/appcompat/widget/ActivityChooserModel;->LOG_TAG:Ljava/lang/String;
+    sget-object v1, Landroidx/appcompat/widget/ActivityChooserModel;->LOG_TAG:Ljava/lang/String;
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v4, Ljava/lang/StringBuilder;
 
     const-string v5, "Error writing historical record file: "
 
-    invoke-direct {v1, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     iget-object v5, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
     iget-object v5, v5, Landroidx/appcompat/widget/ActivityChooserModel;->mHistoryFileName:Ljava/lang/String;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v4
 
-    invoke-static {v0, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v1, v4, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
+    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
-    iput-boolean v2, p1, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
+    iput-boolean v2, v0, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
 
-    if-eqz v4, :cond_1
+    if-eqz p1, :cond_1
 
     goto :goto_1
 
     :catch_1
-    move-exception p1
+    move-exception v0
 
     :try_start_4
-    sget-object v0, Landroidx/appcompat/widget/ActivityChooserModel;->LOG_TAG:Ljava/lang/String;
+    sget-object v1, Landroidx/appcompat/widget/ActivityChooserModel;->LOG_TAG:Ljava/lang/String;
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v4, Ljava/lang/StringBuilder;
 
     const-string v5, "Error writing historical record file: "
 
-    invoke-direct {v1, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     iget-object v5, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
     iget-object v5, v5, Landroidx/appcompat/widget/ActivityChooserModel;->mHistoryFileName:Ljava/lang/String;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v4
 
-    invoke-static {v0, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v1, v4, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
+    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
-    iput-boolean v2, p1, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
+    iput-boolean v2, v0, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
 
-    if-eqz v4, :cond_1
+    if-eqz p1, :cond_1
 
     goto :goto_1
 
     :catch_2
-    move-exception p1
+    move-exception v0
 
     :try_start_5
-    sget-object v0, Landroidx/appcompat/widget/ActivityChooserModel;->LOG_TAG:Ljava/lang/String;
+    sget-object v1, Landroidx/appcompat/widget/ActivityChooserModel;->LOG_TAG:Ljava/lang/String;
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v4, Ljava/lang/StringBuilder;
 
     const-string v5, "Error writing historical record file: "
 
-    invoke-direct {v1, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     iget-object v5, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
     iget-object v5, v5, Landroidx/appcompat/widget/ActivityChooserModel;->mHistoryFileName:Ljava/lang/String;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v4
 
-    invoke-static {v0, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v1, v4, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
+    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
-    iput-boolean v2, p1, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
+    iput-boolean v2, v0, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
 
-    if-eqz v4, :cond_1
+    if-eqz p1, :cond_1
 
     goto :goto_1
 
@@ -291,20 +292,20 @@
     return-object v3
 
     :goto_3
-    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
+    iget-object v1, p0, Landroidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask;->this$0:Landroidx/appcompat/widget/ActivityChooserModel;
 
-    iput-boolean v2, v0, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
+    iput-boolean v2, v1, Landroidx/appcompat/widget/ActivityChooserModel;->mCanReadHistoricalData:Z
 
-    if-eqz v4, :cond_2
+    if-eqz p1, :cond_2
 
     :try_start_6
-    invoke-virtual {v4}, Ljava/io/FileOutputStream;->close()V
+    invoke-virtual {p1}, Ljava/io/FileOutputStream;->close()V
     :try_end_6
     .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_4
 
     :catch_4
     :cond_2
-    throw p1
+    throw v0
 
     :catch_5
     move-exception v0
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali
index b2120134cc..3dac0a72a1 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserModel;
 .super Landroid/database/DataSetObservable;
+.source "ActivityChooserModel.java"
 
 
 # annotations
@@ -738,6 +739,8 @@
     .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_4
 
     :catch_4
+    return-void
+
     :cond_5
     return-void
 
@@ -1029,6 +1032,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public getDefaultActivity()Landroid/content/pm/ResolveInfo;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$1.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$1.smali
index 73946ed6b9..da510cc6ef 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserView$1;
 .super Landroid/database/DataSetObserver;
+.source "ActivityChooserView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$2.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$2.smali
index f6fee9f27b..cd72aa9573 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserView$2;
 .super Ljava/lang/Object;
+.source "ActivityChooserView.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$3.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$3.smali
index 2e5e0ea62b..3c78f9a57d 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$3.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserView$3;
 .super Landroid/view/View$AccessibilityDelegate;
+.source "ActivityChooserView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$4.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$4.smali
index 88cbd1c582..34d8d59682 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$4.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserView$4;
 .super Landroidx/appcompat/widget/ForwardingListener;
+.source "ActivityChooserView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$5.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$5.smali
index 436ec99825..280f2390c9 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$5.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserView$5;
 .super Landroid/database/DataSetObserver;
+.source "ActivityChooserView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter.smali
index cdd99a7778..1d4dc27b15 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
 .super Landroid/widget/BaseAdapter;
+.source "ActivityChooserView.java"
 
 
 # annotations
@@ -437,26 +438,26 @@
 
     const/4 v5, 0x0
 
-    move-object v6, v5
+    move-object v7, v5
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     :goto_0
     if-ge v1, v4, :cond_0
 
-    invoke-virtual {p0, v1, v6, v5}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
+    invoke-virtual {p0, v1, v7, v5}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6, v2, v3}, Landroid/view/View;->measure(II)V
+    invoke-virtual {v7, v2, v3}, Landroid/view/View;->measure(II)V
 
-    invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual {v7}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v8
 
-    invoke-static {v7, v8}, Ljava/lang/Math;->max(II)I
+    invoke-static {v6, v8}, Ljava/lang/Math;->max(II)I
 
-    move-result v7
+    move-result v6
 
     add-int/lit8 v1, v1, 0x1
 
@@ -465,7 +466,7 @@
     :cond_0
     iput v0, p0, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->mMaxActivityCount:I
 
-    return v7
+    return v6
 .end method
 
 .method public setDataModel(Landroidx/appcompat/widget/ActivityChooserModel;)V
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$Callbacks.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$Callbacks.smali
index 44af11abe5..8a8c43bc91 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$Callbacks.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$Callbacks.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ActivityChooserView$Callbacks;
 .super Ljava/lang/Object;
+.source "ActivityChooserView.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -130,11 +131,7 @@
 
     iput-boolean v0, p1, Landroidx/appcompat/widget/ActivityChooserView;->mIsSelectingDefaultActivity:Z
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActivityChooserView$Callbacks;->this$0:Landroidx/appcompat/widget/ActivityChooserView;
-
-    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserView$Callbacks;->this$0:Landroidx/appcompat/widget/ActivityChooserView;
-
-    iget v0, v0, Landroidx/appcompat/widget/ActivityChooserView;->mInitialActivityCount:I
+    iget v0, p1, Landroidx/appcompat/widget/ActivityChooserView;->mInitialActivityCount:I
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/ActivityChooserView;->showPopupUnchecked(I)V
 
@@ -233,6 +230,8 @@
 
     invoke-virtual {p1, p3}, Landroidx/appcompat/widget/ActivityChooserModel;->setDefaultActivity(I)V
 
+    return-void
+
     :cond_0
     return-void
 
@@ -282,8 +281,6 @@
     :cond_3
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
@@ -316,11 +313,7 @@
 
     iput-boolean v0, p1, Landroidx/appcompat/widget/ActivityChooserView;->mIsSelectingDefaultActivity:Z
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ActivityChooserView$Callbacks;->this$0:Landroidx/appcompat/widget/ActivityChooserView;
-
-    iget-object v1, p0, Landroidx/appcompat/widget/ActivityChooserView$Callbacks;->this$0:Landroidx/appcompat/widget/ActivityChooserView;
-
-    iget v1, v1, Landroidx/appcompat/widget/ActivityChooserView;->mInitialActivityCount:I
+    iget v1, p1, Landroidx/appcompat/widget/ActivityChooserView;->mInitialActivityCount:I
 
     invoke-virtual {p1, v1}, Landroidx/appcompat/widget/ActivityChooserView;->showPopupUnchecked(I)V
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$InnerLayout.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$InnerLayout.smali
index 6f94f90848..ab62fdba84 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$InnerLayout.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView$InnerLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActivityChooserView$InnerLayout;
 .super Landroid/widget/LinearLayout;
+.source "ActivityChooserView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView.smali
index 03d3e13410..d9975520c7 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ActivityChooserView;
 .super Landroid/view/ViewGroup;
+.source "ActivityChooserView.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/ActivityChooserModel$ActivityChooserModelClient;
@@ -676,9 +677,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -706,24 +707,26 @@
 
     iget-object v3, p0, Landroidx/appcompat/widget/ActivityChooserView;->mAdapter:Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
 
-    invoke-virtual {v3, v2}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowFooterView(Z)V
+    invoke-virtual {v3, v1}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowFooterView(Z)V
 
     iget-object v3, p0, Landroidx/appcompat/widget/ActivityChooserView;->mAdapter:Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
 
-    sub-int/2addr p1, v2
+    sub-int/2addr p1, v1
+
+    invoke-virtual {v3, p1}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setMaxActivityCount(I)V
 
     goto :goto_1
 
     :cond_1
     iget-object v3, p0, Landroidx/appcompat/widget/ActivityChooserView;->mAdapter:Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
 
-    invoke-virtual {v3, v1}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowFooterView(Z)V
+    invoke-virtual {v3, v2}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowFooterView(Z)V
 
     iget-object v3, p0, Landroidx/appcompat/widget/ActivityChooserView;->mAdapter:Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
 
-    :goto_1
     invoke-virtual {v3, p1}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setMaxActivityCount(I)V
 
+    :goto_1
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActivityChooserView;->getListPopupWindow()Landroidx/appcompat/widget/ListPopupWindow;
 
     move-result-object p1
@@ -745,7 +748,7 @@
     :cond_2
     iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserView;->mAdapter:Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
 
-    invoke-virtual {v0, v1, v1}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowDefaultActivity(ZZ)V
+    invoke-virtual {v0, v2, v2}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowDefaultActivity(ZZ)V
 
     goto :goto_3
 
@@ -753,7 +756,7 @@
     :goto_2
     iget-object v3, p0, Landroidx/appcompat/widget/ActivityChooserView;->mAdapter:Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
 
-    invoke-virtual {v3, v2, v0}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowDefaultActivity(ZZ)V
+    invoke-virtual {v3, v1, v0}, Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;->setShowDefaultActivity(ZZ)V
 
     :goto_3
     iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserView;->mAdapter:Landroidx/appcompat/widget/ActivityChooserView$ActivityChooserViewAdapter;
@@ -776,9 +779,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ActivityChooserView;->mProvider:Landroidx/core/view/ActionProvider;
-
-    invoke-virtual {v0, v2}, Landroidx/core/view/ActionProvider;->subUiVisibilityChanged(Z)V
+    invoke-virtual {v0, v1}, Landroidx/core/view/ActionProvider;->subUiVisibilityChanged(Z)V
 
     :cond_4
     invoke-virtual {p1}, Landroidx/appcompat/widget/ListPopupWindow;->getListView()Landroid/widget/ListView;
@@ -787,15 +788,15 @@
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/ActivityChooserView;->getContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
     sget v3, Landroidx/appcompat/R$string;->abc_activitychooserview_choose_application:I
 
-    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v0, v2}, Landroid/widget/ListView;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/ListView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p1}, Landroidx/appcompat/widget/ListPopupWindow;->getListView()Landroid/widget/ListView;
 
@@ -803,7 +804,7 @@
 
     new-instance v0, Landroid/graphics/drawable/ColorDrawable;
 
-    invoke-direct {v0, v1}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
+    invoke-direct {v0, v2}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
     invoke-virtual {p1, v0}, Landroid/widget/ListView;->setSelector(Landroid/graphics/drawable/Drawable;)V
 
@@ -944,7 +945,6 @@
 
     iget-object v1, p0, Landroidx/appcompat/widget/ActivityChooserView;->mActivityChooserContentBackground:Landroid/graphics/drawable/Drawable;
 
-    :goto_3
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     return-void
@@ -954,5 +954,7 @@
 
     const/4 v1, 0x0
 
-    goto :goto_3
+    invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/appcompat/widget/AlertDialogLayout.smali b/com.discord/smali/androidx/appcompat/widget/AlertDialogLayout.smali
index 173d4bdde3..26fd975fde 100644
--- a/com.discord/smali/androidx/appcompat/widget/AlertDialogLayout.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AlertDialogLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AlertDialogLayout;
 .super Landroidx/appcompat/widget/LinearLayoutCompat;
+.source "AlertDialogLayout.java"
 
 
 # annotations
@@ -521,25 +522,25 @@
 
     move-result v7
 
-    sub-int v2, p4, p2
+    sub-int v0, p4, p2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getPaddingRight()I
 
-    move-result v3
+    move-result v1
 
-    sub-int v8, v2, v3
+    sub-int v8, v0, v1
 
-    sub-int/2addr v2, v7
+    sub-int/2addr v0, v7
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getPaddingRight()I
 
-    move-result v3
+    move-result v1
 
-    sub-int v9, v2, v3
+    sub-int v9, v0, v1
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getMeasuredHeight()I
 
-    move-result v2
+    move-result v0
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getChildCount()I
 
@@ -547,21 +548,21 @@
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getGravity()I
 
-    move-result v3
+    move-result v1
 
-    and-int/lit8 v4, v3, 0x70
+    and-int/lit8 v2, v1, 0x70
 
-    const v5, 0x800007
+    const v3, 0x800007
 
-    and-int v11, v3, v5
+    and-int v11, v1, v3
 
-    const/16 v3, 0x10
+    const/16 v1, 0x10
 
-    if-eq v4, v3, :cond_1
+    if-eq v2, v1, :cond_1
 
-    const/16 v3, 0x50
+    const/16 v1, 0x50
 
-    if-eq v4, v3, :cond_0
+    if-eq v2, v1, :cond_0
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getPaddingTop()I
 
@@ -572,28 +573,28 @@
     :cond_0
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getPaddingTop()I
 
-    move-result v3
+    move-result v1
 
-    add-int v3, v3, p5
+    add-int v1, v1, p5
 
-    sub-int v3, v3, p3
+    sub-int v1, v1, p3
 
-    sub-int v0, v3, v2
+    sub-int v0, v1, v0
 
     goto :goto_0
 
     :cond_1
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getPaddingTop()I
 
-    move-result v3
+    move-result v1
 
-    sub-int v0, p5, p3
+    sub-int v2, p5, p3
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v0
 
-    div-int/lit8 v0, v0, 0x2
+    div-int/lit8 v2, v2, 0x2
 
-    add-int/2addr v0, v3
+    add-int v0, v1, v2
 
     :goto_0
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/AlertDialogLayout;->getDividerDrawable()Landroid/graphics/drawable/Drawable;
@@ -680,11 +681,15 @@
 
     add-int/2addr v2, v7
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     sub-int v2, v8, v4
 
+    iget v3, v15, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
+
+    sub-int/2addr v2, v3
+
     goto :goto_3
 
     :cond_5
@@ -698,12 +703,11 @@
 
     add-int/2addr v2, v3
 
-    :goto_3
     iget v3, v15, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
 
     sub-int/2addr v2, v3
 
-    :goto_4
+    :goto_3
     invoke-virtual {v6, v13}, Landroidx/appcompat/widget/AlertDialogLayout;->hasDividerBeforeChildAt(I)Z
 
     move-result v3
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatAutoCompleteTextView.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatAutoCompleteTextView.smali
index 58c4fe6e12..f2f10113d2 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatAutoCompleteTextView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatAutoCompleteTextView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;
 .super Landroid/widget/AutoCompleteTextView;
+.source "AppCompatAutoCompleteTextView.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -128,8 +129,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -137,8 +136,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
 
     :cond_1
@@ -160,8 +157,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -189,8 +184,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -226,8 +219,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -247,8 +238,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -303,8 +292,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -327,8 +314,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
@@ -344,8 +329,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatBackgroundHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatBackgroundHelper.smali
index 7a61c922fc..513b9587a1 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatBackgroundHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatBackgroundHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatBackgroundHelper;
 .super Ljava/lang/Object;
+.source "AppCompatBackgroundHelper.java"
 
 
 # instance fields
@@ -120,9 +121,9 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/16 v3, 0x15
 
@@ -132,18 +133,18 @@
 
     if-eqz v0, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     if-ne v0, v3, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 
@@ -178,8 +179,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mBackgroundTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v2, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mView:Landroid/view/View;
 
     invoke-virtual {v2}, Landroid/view/View;->getDrawableState()[I
@@ -195,8 +194,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mInternalBackgroundTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v2, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mView:Landroid/view/View;
 
     invoke-virtual {v2}, Landroid/view/View;->getDrawableState()[I
@@ -216,8 +213,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mBackgroundTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v0, v0, Landroidx/appcompat/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList;
 
     return-object v0
@@ -235,8 +230,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mBackgroundTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v0, v0, Landroidx/appcompat/widget/TintInfo;->mTintMode:Landroid/graphics/PorterDuff$Mode;
 
     return-object v0
@@ -385,8 +378,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mDrawableManager:Landroidx/appcompat/widget/AppCompatDrawableManager;
-
     iget-object v1, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mView:Landroid/view/View;
 
     invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
@@ -430,11 +421,9 @@
 
     iput-object p1, v0, Landroidx/appcompat/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mInternalBackgroundTint:Landroidx/appcompat/widget/TintInfo;
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    iput-boolean v0, p1, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
+    iput-boolean p1, v0, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
 
     goto :goto_0
 
@@ -467,11 +456,9 @@
 
     iput-object p1, v0, Landroidx/appcompat/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mBackgroundTint:Landroidx/appcompat/widget/TintInfo;
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    iput-boolean v0, p1, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
+    iput-boolean p1, v0, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
@@ -496,11 +483,9 @@
 
     iput-object p1, v0, Landroidx/appcompat/widget/TintInfo;->mTintMode:Landroid/graphics/PorterDuff$Mode;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->mBackgroundTint:Landroidx/appcompat/widget/TintInfo;
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    iput-boolean v0, p1, Landroidx/appcompat/widget/TintInfo;->mHasTintMode:Z
+    iput-boolean p1, v0, Landroidx/appcompat/widget/TintInfo;->mHasTintMode:Z
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatButton.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatButton.smali
index 0449d71ea2..ea4c37abcb 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatButton.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatButton.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatButton;
 .super Landroid/widget/Button;
+.source "AppCompatButton.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -80,8 +81,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -89,8 +88,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
 
     :cond_1
@@ -120,8 +117,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeMaxTextSize()I
 
     move-result v0
@@ -157,8 +152,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeMinTextSize()I
 
     move-result v0
@@ -194,8 +187,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeStepGranularity()I
 
     move-result v0
@@ -231,8 +222,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeTextAvailableSizes()[I
 
     move-result-object v0
@@ -279,8 +268,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeTextType()I
 
     move-result v0
@@ -306,8 +293,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -335,8 +320,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -382,7 +365,7 @@
 .end method
 
 .method protected onLayout(ZIIII)V
-    .locals 7
+    .locals 6
 
     invoke-super/range {p0 .. p5}, Landroid/widget/Button;->onLayout(ZIIII)V
 
@@ -390,19 +373,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
+    move v1, p1
 
-    move v2, p1
+    move v2, p2
 
-    move v3, p2
+    move v3, p3
 
-    move v4, p3
+    move v4, p4
 
-    move v5, p4
+    move v5, p5
 
-    move v6, p5
-
-    invoke-virtual/range {v1 .. v6}, Landroidx/appcompat/widget/AppCompatTextHelper;->onLayout(ZIIII)V
+    invoke-virtual/range {v0 .. v5}, Landroidx/appcompat/widget/AppCompatTextHelper;->onLayout(ZIIII)V
 
     :cond_0
     return-void
@@ -464,8 +445,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Landroidx/appcompat/widget/AppCompatTextHelper;->setAutoSizeTextTypeUniformWithConfiguration(IIII)V
 
     :cond_1
@@ -503,8 +482,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->setAutoSizeTextTypeUniformWithPresetSizes([II)V
 
     :cond_1
@@ -532,8 +509,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatTextHelper;->setAutoSizeTextTypeWithDefaults(I)V
 
     :cond_1
@@ -549,8 +524,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -570,8 +543,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -597,8 +568,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatTextHelper;->setAllCaps(Z)V
 
     :cond_0
@@ -621,8 +590,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -645,8 +612,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
@@ -662,8 +627,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
@@ -686,8 +649,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatButton;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->setTextSize(IF)V
 
     :cond_1
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatCheckBox.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatCheckBox.smali
index 0196ebf0a1..568ffeb98b 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatCheckBox.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatCheckBox.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatCheckBox;
 .super Landroid/widget/CheckBox;
+.source "AppCompatCheckBox.java"
 
 # interfaces
 .implements Landroidx/core/widget/TintableCompoundButton;
@@ -77,8 +78,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->getCompoundPaddingLeft(I)I
 
     move-result v0
@@ -102,8 +101,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->getSupportButtonTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -131,8 +128,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->getSupportButtonTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -174,8 +169,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->onSetButtonDrawable()V
 
     :cond_0
@@ -198,8 +191,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->setSupportButtonTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -222,8 +213,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->setSupportButtonTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatCheckedTextView.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatCheckedTextView.smali
index c26cb6c6f2..79ed9cf2b7 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatCheckedTextView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatCheckedTextView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatCheckedTextView;
 .super Landroid/widget/CheckedTextView;
+.source "AppCompatCheckedTextView.java"
 
 
 # static fields
@@ -106,8 +107,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatCheckedTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
 
     :cond_0
@@ -169,8 +168,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatCheckedTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper$DirectSetButtonDrawableInterface.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper$DirectSetButtonDrawableInterface.smali
index 6e705deb36..f43edffbc5 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper$DirectSetButtonDrawableInterface.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper$DirectSetButtonDrawableInterface.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/appcompat/widget/AppCompatCompoundButtonHelper$DirectSetButtonDrawableInterface;
 .super Ljava/lang/Object;
+.source "AppCompatCompoundButtonHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper.smali
index ff362a3d64..9cf46088e4 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatCompoundButtonHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
 .super Ljava/lang/Object;
+.source "AppCompatCompoundButtonHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali
index c49631ad1b..1a26e2f40d 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatDrawableManager$AsldcInflateDelegate;
 .super Ljava/lang/Object;
+.source "AppCompatDrawableManager.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate;
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali
index 10b19d2aba..5b4c14f0d0 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatDrawableManager$AvdcInflateDelegate;
 .super Ljava/lang/Object;
+.source "AppCompatDrawableManager.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate;
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$ColorFilterLruCache.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$ColorFilterLruCache.smali
index 4efb6527d0..70c5ac4775 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$ColorFilterLruCache.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$ColorFilterLruCache.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatDrawableManager$ColorFilterLruCache;
 .super Landroidx/collection/LruCache;
+.source "AppCompatDrawableManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate.smali
index 88a4b290e1..9bc03dbd0e 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate;
 .super Ljava/lang/Object;
+.source "AppCompatDrawableManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$VdcInflateDelegate.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$VdcInflateDelegate.smali
index 016a1e3bb4..104faea5ce 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$VdcInflateDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager$VdcInflateDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatDrawableManager$VdcInflateDelegate;
 .super Ljava/lang/Object;
+.source "AppCompatDrawableManager.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/AppCompatDrawableManager$InflateDelegate;
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager.smali
index c0f21afe1c..0c16344b56 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatDrawableManager.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/widget/AppCompatDrawableManager;
 .super Ljava/lang/Object;
+.source "AppCompatDrawableManager.java"
 
 
 # annotations
@@ -365,7 +366,6 @@
 
     const/4 p1, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return p1
@@ -373,7 +373,9 @@
     :cond_1
     const/4 p1, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return p1
 
     :catchall_0
     move-exception p1
@@ -1059,9 +1061,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatDrawableManager;->mTintLists:Ljava/util/WeakHashMap;
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0, p1}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1081,6 +1081,9 @@
 
     :cond_0
     return-object v1
+
+    :cond_1
+    return-object v1
 .end method
 
 .method static getTintMode(I)Landroid/graphics/PorterDuff$Mode;
@@ -1200,8 +1203,6 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatDrawableManager;->mDelegates:Landroidx/collection/ArrayMap;
-
     invoke-virtual {v0}, Landroidx/collection/ArrayMap;->isEmpty()Z
 
     move-result v0
@@ -1212,8 +1213,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatDrawableManager;->mKnownDrawableIdTags:Landroidx/collection/SparseArrayCompat;
-
     invoke-virtual {v0, p2}, Landroidx/collection/SparseArrayCompat;->get(I)Ljava/lang/Object;
 
     move-result-object v0
@@ -1415,8 +1414,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatDrawableManager;->mDelegates:Landroidx/collection/ArrayMap;
-
     invoke-virtual {v0, p1}, Landroidx/collection/ArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
@@ -1505,7 +1502,7 @@
 
     invoke-static {p4, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
-    goto :goto_2
+    goto/16 :goto_1
 
     :cond_1
     sget v0, Landroidx/appcompat/R$drawable;->abc_seekbar_track_material:I
@@ -1542,7 +1539,6 @@
 
     sget v0, Landroidx/appcompat/R$attr;->colorControlNormal:I
 
-    :goto_0
     invoke-static {p1, v0}, Landroidx/appcompat/widget/ThemeUtils;->getThemeAttrColor(Landroid/content/Context;I)I
 
     move-result v0
@@ -1565,7 +1561,7 @@
 
     invoke-static {p2, p1, p3}, Landroidx/appcompat/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     sget v0, Landroidx/appcompat/R$drawable;->abc_ratingbar_material:I
@@ -1580,7 +1576,7 @@
 
     if-ne p2, v0, :cond_3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-static {p1, p2, p4}, Landroidx/appcompat/widget/AppCompatDrawableManager;->tintDrawableUsingColorFilter(Landroid/content/Context;ILandroid/graphics/drawable/Drawable;)Z
@@ -1593,10 +1589,10 @@
 
     const/4 p4, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
-    :goto_1
+    :goto_0
     move-object p2, p4
 
     check-cast p2, Landroid/graphics/drawable/LayerDrawable;
@@ -1621,10 +1617,30 @@
 
     sget v0, Landroidx/appcompat/R$attr;->colorControlActivated:I
 
-    goto :goto_0
+    invoke-static {p1, v0}, Landroidx/appcompat/widget/ThemeUtils;->getThemeAttrColor(Landroid/content/Context;I)I
+
+    move-result v0
+
+    sget-object v2, Landroidx/appcompat/widget/AppCompatDrawableManager;->DEFAULT_MODE:Landroid/graphics/PorterDuff$Mode;
+
+    invoke-static {p3, v0, v2}, Landroidx/appcompat/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V
+
+    invoke-virtual {p2, v1}, Landroid/graphics/drawable/LayerDrawable;->findDrawableByLayerId(I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p2
+
+    sget p3, Landroidx/appcompat/R$attr;->colorControlActivated:I
+
+    invoke-static {p1, p3}, Landroidx/appcompat/widget/ThemeUtils;->getThemeAttrColor(Landroid/content/Context;I)I
+
+    move-result p1
+
+    sget-object p3, Landroidx/appcompat/widget/AppCompatDrawableManager;->DEFAULT_MODE:Landroid/graphics/PorterDuff$Mode;
+
+    invoke-static {p2, p1, p3}, Landroidx/appcompat/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V
 
     :cond_5
-    :goto_2
+    :goto_1
     return-object p4
 .end method
 
@@ -1747,12 +1763,11 @@
 
     sget v2, Landroidx/appcompat/R$attr;->colorControlNormal:I
 
-    :goto_0
     const/4 p1, 0x1
 
     const/4 v1, -0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget-object v1, Landroidx/appcompat/widget/AppCompatDrawableManager;->COLORFILTER_COLOR_CONTROL_ACTIVATED:[I
@@ -1765,6 +1780,10 @@
 
     sget v2, Landroidx/appcompat/R$attr;->colorControlActivated:I
 
+    const/4 p1, 0x1
+
+    const/4 v1, -0x1
+
     goto :goto_0
 
     :cond_1
@@ -1778,6 +1797,10 @@
 
     sget-object v0, Landroid/graphics/PorterDuff$Mode;->MULTIPLY:Landroid/graphics/PorterDuff$Mode;
 
+    const/4 p1, 0x1
+
+    const/4 v1, -0x1
+
     goto :goto_0
 
     :cond_2
@@ -1797,13 +1820,17 @@
 
     const/4 p1, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     sget v1, Landroidx/appcompat/R$drawable;->abc_dialog_material_background:I
 
     if-ne p1, v1, :cond_4
 
+    const/4 p1, 0x1
+
+    const/4 v1, -0x1
+
     goto :goto_0
 
     :cond_4
@@ -1813,7 +1840,7 @@
 
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz p1, :cond_7
 
     invoke-static {p2}, Landroidx/appcompat/widget/DrawableUtils;->canSafelyMutateDrawable(Landroid/graphics/drawable/Drawable;)Z
@@ -1970,12 +1997,11 @@
 
     sget v0, Landroidx/appcompat/R$color;->abc_tint_edittext:I
 
-    :goto_0
     invoke-static {p1, v0}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
 
     move-result-object v0
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     sget v1, Landroidx/appcompat/R$drawable;->abc_switch_track_mtrl_alpha:I
@@ -1984,7 +2010,11 @@
 
     sget v0, Landroidx/appcompat/R$color;->abc_tint_switch_track:I
 
-    goto :goto_0
+    invoke-static {p1, v0}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+
+    move-result-object v0
+
+    goto/16 :goto_1
 
     :cond_1
     sget v1, Landroidx/appcompat/R$drawable;->abc_switch_thumb_material:I
@@ -1995,7 +2025,7 @@
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     sget v1, Landroidx/appcompat/R$drawable;->abc_btn_default_mtrl_shape:I
@@ -2006,7 +2036,7 @@
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     sget v1, Landroidx/appcompat/R$drawable;->abc_btn_borderless_material:I
@@ -2017,7 +2047,7 @@
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     sget v1, Landroidx/appcompat/R$drawable;->abc_btn_colored_material:I
@@ -2028,7 +2058,7 @@
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     sget v1, Landroidx/appcompat/R$drawable;->abc_spinner_mtrl_am_alpha:I
@@ -2039,7 +2069,7 @@
 
     if-ne p2, v1, :cond_6
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_6
     sget-object v1, Landroidx/appcompat/widget/AppCompatDrawableManager;->TINT_COLOR_CONTROL_NORMAL:[I
@@ -2056,7 +2086,7 @@
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_7
     sget-object v1, Landroidx/appcompat/widget/AppCompatDrawableManager;->TINT_COLOR_CONTROL_STATE_LIST:[I
@@ -2069,7 +2099,11 @@
 
     sget v0, Landroidx/appcompat/R$color;->abc_tint_default:I
 
-    goto :goto_0
+    invoke-static {p1, v0}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+
+    move-result-object v0
+
+    goto :goto_1
 
     :cond_8
     sget-object v1, Landroidx/appcompat/widget/AppCompatDrawableManager;->TINT_CHECKABLE_BUTTON_LIST:[I
@@ -2082,7 +2116,11 @@
 
     sget v0, Landroidx/appcompat/R$color;->abc_tint_btn_checkable:I
 
-    goto :goto_0
+    invoke-static {p1, v0}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+
+    move-result-object v0
+
+    goto :goto_1
 
     :cond_9
     sget v1, Landroidx/appcompat/R$drawable;->abc_seekbar_thumb_material:I
@@ -2091,16 +2129,22 @@
 
     sget v0, Landroidx/appcompat/R$color;->abc_tint_seek_thumb:I
 
-    goto :goto_0
+    invoke-static {p1, v0}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+
+    move-result-object v0
+
+    goto :goto_1
 
     :cond_a
-    :goto_1
+    :goto_0
     sget v0, Landroidx/appcompat/R$color;->abc_tint_spinner:I
 
-    goto :goto_0
+    invoke-static {p1, v0}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+
+    move-result-object v0
 
     :cond_b
-    :goto_2
+    :goto_1
     if-eqz v0, :cond_c
 
     invoke-direct {p0, p1, p2, v0}, Landroidx/appcompat/widget/AppCompatDrawableManager;->addTintListToCache(Landroid/content/Context;ILandroid/content/res/ColorStateList;)V
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatEditText.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatEditText.smali
index 5fd3abda32..a19aa1ddd6 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatEditText.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatEditText.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatEditText;
 .super Landroid/widget/EditText;
+.source "AppCompatEditText.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -79,8 +80,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -88,8 +87,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
 
     :cond_1
@@ -111,8 +108,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -140,8 +135,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -214,8 +207,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -235,8 +226,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -271,8 +260,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -295,8 +282,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
@@ -312,8 +297,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatEditText;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatHintHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatHintHelper.smali
index 586e349a06..8f4f47b57b 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatHintHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatHintHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatHintHelper;
 .super Ljava/lang/Object;
+.source "AppCompatHintHelper.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatImageButton.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatImageButton.smali
index b80fbc6ce6..32db149a35 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatImageButton.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatImageButton.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatImageButton;
 .super Landroid/widget/ImageButton;
+.source "AppCompatImageButton.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -76,8 +77,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -85,8 +84,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_1
@@ -108,8 +105,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -137,8 +132,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -166,8 +159,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatImageHelper;->getSupportImageTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -195,8 +186,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatImageHelper;->getSupportImageTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -245,8 +234,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -266,8 +253,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -283,8 +268,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_0
@@ -304,8 +287,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_0
@@ -339,8 +320,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_0
@@ -363,8 +342,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -387,8 +364,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
@@ -411,8 +386,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->setSupportImageTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -435,8 +408,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageButton;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->setSupportImageTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatImageHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatImageHelper.smali
index 444031f8b9..2d2e98d147 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatImageHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatImageHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatImageHelper;
 .super Ljava/lang/Object;
+.source "AppCompatImageHelper.java"
 
 
 # annotations
@@ -114,9 +115,9 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/16 v3, 0x15
 
@@ -126,18 +127,18 @@
 
     if-eqz v0, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     if-ne v0, v3, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 
@@ -177,8 +178,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mImageTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v2, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mView:Landroid/widget/ImageView;
 
     invoke-virtual {v2}, Landroid/widget/ImageView;->getDrawableState()[I
@@ -194,8 +193,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mInternalImageTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v2, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mView:Landroid/widget/ImageView;
 
     invoke-virtual {v2}, Landroid/widget/ImageView;->getDrawableState()[I
@@ -215,8 +212,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mImageTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v0, v0, Landroidx/appcompat/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList;
 
     return-object v0
@@ -234,8 +229,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mImageTint:Landroidx/appcompat/widget/TintInfo;
-
     iget-object v0, v0, Landroidx/appcompat/widget/TintInfo;->mTintMode:Landroid/graphics/PorterDuff$Mode;
 
     return-object v0
@@ -450,11 +443,9 @@
 
     iput-object p1, v0, Landroidx/appcompat/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mInternalImageTint:Landroidx/appcompat/widget/TintInfo;
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    iput-boolean v0, p1, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
+    iput-boolean p1, v0, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
 
     goto :goto_0
 
@@ -487,11 +478,9 @@
 
     iput-object p1, v0, Landroidx/appcompat/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mImageTint:Landroidx/appcompat/widget/TintInfo;
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    iput-boolean v0, p1, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
+    iput-boolean p1, v0, Landroidx/appcompat/widget/TintInfo;->mHasTintList:Z
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
@@ -516,11 +505,9 @@
 
     iput-object p1, v0, Landroidx/appcompat/widget/TintInfo;->mTintMode:Landroid/graphics/PorterDuff$Mode;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageHelper;->mImageTint:Landroidx/appcompat/widget/TintInfo;
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    iput-boolean v0, p1, Landroidx/appcompat/widget/TintInfo;->mHasTintMode:Z
+    iput-boolean p1, v0, Landroidx/appcompat/widget/TintInfo;->mHasTintMode:Z
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatImageView.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatImageView.smali
index 26ff17b522..0778674b2c 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatImageView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatImageView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatImageView;
 .super Landroid/widget/ImageView;
+.source "AppCompatImageView.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -76,8 +77,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -85,8 +84,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_1
@@ -108,8 +105,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -137,8 +132,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -166,8 +159,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatImageHelper;->getSupportImageTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -195,8 +186,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatImageHelper;->getSupportImageTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -245,8 +234,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -266,8 +253,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -283,8 +268,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_0
@@ -304,8 +287,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_0
@@ -323,8 +304,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->setImageResource(I)V
 
     :cond_0
@@ -344,8 +323,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 
     :cond_0
@@ -368,8 +345,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -392,8 +367,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
@@ -416,8 +389,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->setSupportImageTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -440,8 +411,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatImageView;->mImageHelper:Landroidx/appcompat/widget/AppCompatImageHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatImageHelper;->setSupportImageTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatMultiAutoCompleteTextView.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatMultiAutoCompleteTextView.smali
index c097b828b7..3148ead333 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatMultiAutoCompleteTextView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatMultiAutoCompleteTextView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;
 .super Landroid/widget/MultiAutoCompleteTextView;
+.source "AppCompatMultiAutoCompleteTextView.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -128,8 +129,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -137,8 +136,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
 
     :cond_1
@@ -160,8 +157,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -189,8 +184,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -226,8 +219,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -247,8 +238,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -291,8 +280,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -315,8 +302,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
@@ -332,8 +317,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatMultiAutoCompleteTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatPopupWindow.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatPopupWindow.smali
index 23540ac1b0..fb6b94be52 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatPopupWindow.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatPopupWindow.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatPopupWindow;
 .super Landroid/widget/PopupWindow;
+.source "AppCompatPopupWindow.java"
 
 
 # static fields
@@ -206,9 +207,14 @@
 
     sub-int/2addr p3, v0
 
+    move v3, p3
+
+    goto :goto_0
+
     :cond_0
     move v3, p3
 
+    :goto_0
     move-object v0, p0
 
     move-object v1, p1
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatProgressBarHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatProgressBarHelper.smali
index 7ec34012b9..9fb76a2df9 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatProgressBarHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatProgressBarHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatProgressBarHelper;
 .super Ljava/lang/Object;
+.source "AppCompatProgressBarHelper.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatRadioButton.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatRadioButton.smali
index 16e5e3fd85..515204b9c6 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatRadioButton.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatRadioButton.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatRadioButton;
 .super Landroid/widget/RadioButton;
+.source "AppCompatRadioButton.java"
 
 # interfaces
 .implements Landroidx/core/widget/TintableCompoundButton;
@@ -77,8 +78,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->getCompoundPaddingLeft(I)I
 
     move-result v0
@@ -102,8 +101,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->getSupportButtonTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -131,8 +128,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->getSupportButtonTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -174,8 +169,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->onSetButtonDrawable()V
 
     :cond_0
@@ -198,8 +191,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->setSupportButtonTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -222,8 +213,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatCompoundButtonHelper;->setSupportButtonTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatRatingBar.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatRatingBar.smali
index d39226eaad..8f32071e5f 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatRatingBar.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatRatingBar.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatRatingBar;
 .super Landroid/widget/RatingBar;
+.source "AppCompatRatingBar.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBar.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBar.smali
index 0869088274..411a3bc2a5 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBar.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBar.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatSeekBar;
 .super Landroid/widget/SeekBar;
+.source "AppCompatSeekBar.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBarHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBarHelper.smali
index a6427a2358..369c25439e 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBarHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSeekBarHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatSeekBarHelper;
 .super Landroidx/appcompat/widget/AppCompatProgressBarHelper;
+.source "AppCompatSeekBarHelper.java"
 
 
 # instance fields
@@ -311,8 +312,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSeekBarHelper;->mTickMark:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     :cond_0
@@ -425,8 +424,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSeekBarHelper;->mTickMark:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$1.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$1.smali
index 17b9b869a3..51e1199b37 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatSpinner$1;
 .super Landroidx/appcompat/widget/ForwardingListener;
+.source "AppCompatSpinner.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropDownAdapter.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropDownAdapter.smali
index bfd4bc8b66..fce3936993 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropDownAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropDownAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;
 .super Ljava/lang/Object;
+.source "AppCompatSpinner.java"
 
 # interfaces
 .implements Landroid/widget/ListAdapter;
@@ -127,8 +128,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;->mAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-interface {v0}, Landroid/widget/SpinnerAdapter;->getCount()I
 
     move-result v0
@@ -148,8 +147,6 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;->mAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-interface {v0, p1, p2, p3}, Landroid/widget/SpinnerAdapter;->getDropDownView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
 
     move-result-object p1
@@ -169,8 +166,6 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;->mAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-interface {v0, p1}, Landroid/widget/SpinnerAdapter;->getItem(I)Ljava/lang/Object;
 
     move-result-object p1
@@ -190,8 +185,6 @@
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;->mAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-interface {v0, p1}, Landroid/widget/SpinnerAdapter;->getItemId(I)J
 
     move-result-wide v0
@@ -232,8 +225,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;->mAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-interface {v0}, Landroid/widget/SpinnerAdapter;->hasStableIds()Z
 
     move-result v0
@@ -295,8 +286,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;->mAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-interface {v0, p1}, Landroid/widget/SpinnerAdapter;->registerDataSetObserver(Landroid/database/DataSetObserver;)V
 
     :cond_0
@@ -310,8 +299,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;->mAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-interface {v0, p1}, Landroid/widget/SpinnerAdapter;->unregisterDataSetObserver(Landroid/database/DataSetObserver;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$1.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$1.smali
index 813a0a79dc..a024eb5d25 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup$1;
 .super Ljava/lang/Object;
+.source "AppCompatSpinner.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$2.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$2.smali
index 7c8a5aa051..a7fbdcbebe 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup$2;
 .super Ljava/lang/Object;
+.source "AppCompatSpinner.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;
@@ -38,9 +39,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup$2;->this$1:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup$2;->this$1:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
-    iget-object v1, v1, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->this$0:Landroidx/appcompat/widget/AppCompatSpinner;
+    iget-object v1, v0, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->this$0:Landroidx/appcompat/widget/AppCompatSpinner;
 
     invoke-virtual {v0, v1}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->isVisibleToUser(Landroid/view/View;)Z
 
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$3.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$3.smali
index f1f809fd1a..f5ddd47921 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$3.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup$3;
 .super Ljava/lang/Object;
+.source "AppCompatSpinner.java"
 
 # interfaces
 .implements Landroid/widget/PopupWindow$OnDismissListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup.smali
index 8931417e2b..126faf5a74 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner$DropdownPopup.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
 .super Landroidx/appcompat/widget/ListPopupWindow;
+.source "AppCompatSpinner.java"
 
 
 # annotations
@@ -97,10 +98,7 @@
 
     iget v0, v0, Landroid/graphics/Rect;->right:I
 
-    :goto_0
-    move v1, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->this$0:Landroidx/appcompat/widget/AppCompatSpinner;
@@ -111,7 +109,10 @@
 
     neg-int v0, v0
 
-    goto :goto_0
+    :goto_0
+    move v1, v0
+
+    goto :goto_1
 
     :cond_1
     iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->this$0:Landroidx/appcompat/widget/AppCompatSpinner;
@@ -212,10 +213,9 @@
 
     move-result v4
 
-    :goto_2
     invoke-virtual {p0, v4}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setContentWidth(I)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     iget-object v4, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->this$0:Landroidx/appcompat/widget/AppCompatSpinner;
@@ -230,6 +230,8 @@
 
     sub-int/2addr v4, v2
 
+    invoke-virtual {p0, v4}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setContentWidth(I)V
+
     goto :goto_2
 
     :cond_4
@@ -237,9 +239,9 @@
 
     iget v4, v4, Landroidx/appcompat/widget/AppCompatSpinner;->mDropDownWidth:I
 
-    goto :goto_2
+    invoke-virtual {p0, v4}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setContentWidth(I)V
 
-    :goto_3
+    :goto_2
     iget-object v4, p0, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->this$0:Landroidx/appcompat/widget/AppCompatSpinner;
 
     invoke-static {v4}, Landroidx/appcompat/widget/ViewUtils;->isLayoutRtl(Landroid/view/View;)Z
@@ -258,12 +260,12 @@
 
     add-int/2addr v1, v3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     add-int/2addr v1, v0
 
-    :goto_4
+    :goto_3
     invoke-virtual {p0, v1}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setHorizontalOffset(I)V
 
     return-void
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner.smali
index 58868c746d..6871642ccc 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatSpinner.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatSpinner;
 .super Landroid/widget/Spinner;
+.source "AppCompatSpinner.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -223,13 +224,11 @@
 
     invoke-virtual {p5, v1, v1}, Landroid/content/res/TypedArray;->getInt(II)I
 
-    move-result v4
+    move-result p4
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    move p4, v4
-
     :cond_3
     if-eqz p5, :cond_5
 
@@ -364,8 +363,6 @@
 
     if-eqz p1, :cond_8
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mTempAdapter:Landroid/widget/SpinnerAdapter;
-
     invoke-virtual {p0, p1}, Landroidx/appcompat/widget/AppCompatSpinner;->setAdapter(Landroid/widget/SpinnerAdapter;)V
 
     iput-object v2, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mTempAdapter:Landroid/widget/SpinnerAdapter;
@@ -436,9 +433,9 @@
 
     const/4 v5, 0x0
 
-    move-object v6, v5
+    move-object v7, v5
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     :goto_0
     if-ge v3, v4, :cond_3
@@ -449,16 +446,16 @@
 
     if-eq v8, v0, :cond_1
 
-    move-object v6, v5
+    move-object v7, v5
 
     move v0, v8
 
     :cond_1
-    invoke-interface {p1, v3, v6, p0}, Landroid/widget/SpinnerAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
+    invoke-interface {p1, v3, v7, p0}, Landroid/widget/SpinnerAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v7}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v8
 
@@ -470,18 +467,18 @@
 
     invoke-direct {v8, v9, v9}, Landroid/view/ViewGroup$LayoutParams;-><init>(II)V
 
-    invoke-virtual {v6, v8}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+    invoke-virtual {v7, v8}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
     :cond_2
-    invoke-virtual {v6, v1, v2}, Landroid/view/View;->measure(II)V
+    invoke-virtual {v7, v1, v2}, Landroid/view/View;->measure(II)V
 
-    invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual {v7}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v8
 
-    invoke-static {v7, v8}, Ljava/lang/Math;->max(II)I
+    invoke-static {v6, v8}, Ljava/lang/Math;->max(II)I
 
-    move-result v7
+    move-result v6
 
     add-int/lit8 v3, v3, 0x1
 
@@ -504,10 +501,10 @@
 
     add-int/2addr p1, p2
 
-    add-int/2addr v7, p1
+    add-int/2addr v6, p1
 
     :cond_4
-    return v7
+    return v6
 .end method
 
 .method protected drawableStateChanged()V
@@ -519,8 +516,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -534,8 +529,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->getHorizontalOffset()I
 
     move-result v0
@@ -568,8 +561,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->getVerticalOffset()I
 
     move-result v0
@@ -632,8 +623,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->getBackground()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -696,8 +685,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->getHintText()Ljava/lang/CharSequence;
 
     move-result-object v0
@@ -727,8 +714,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -756,8 +741,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -779,8 +762,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->isShowing()Z
 
     move-result v0
@@ -857,8 +838,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mForwardingListener:Landroidx/appcompat/widget/ForwardingListener;
-
     invoke-virtual {v0, p0, p1}, Landroidx/appcompat/widget/ForwardingListener;->onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
 
     move-result v0
@@ -884,8 +863,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->isShowing()Z
 
     move-result v0
@@ -945,12 +922,7 @@
 
     move-result-object v0
 
-    goto :goto_0
-
     :cond_1
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopupContext:Landroid/content/Context;
-
-    :goto_0
     iget-object v1, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
 
     new-instance v2, Landroidx/appcompat/widget/AppCompatSpinner$DropDownAdapter;
@@ -976,8 +948,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -997,8 +967,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -1012,8 +980,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setHorizontalOffset(I)V
 
     return-void
@@ -1038,8 +1004,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setVerticalOffset(I)V
 
     return-void
@@ -1088,8 +1052,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     return-void
@@ -1134,8 +1096,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mPopup:Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setPromptText(Ljava/lang/CharSequence;)V
 
     return-void
@@ -1162,8 +1122,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -1186,8 +1144,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper$1.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper$1.smali
index 90c20a1b04..b96f6919c3 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatTextHelper$1;
 .super Landroidx/core/content/res/ResourcesCompat$FontCallback;
+.source "AppCompatTextHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper.smali
index bf4f01df39..3cace7f240 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatTextHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatTextHelper;
 .super Ljava/lang/Object;
+.source "AppCompatTextHelper.java"
 
 
 # static fields
@@ -149,7 +150,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     sget p1, Landroidx/appcompat/R$styleable;->TextAppearance_android_typeface:I
@@ -170,19 +171,18 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     sget-object p1, Landroid/graphics/Typeface;->MONOSPACE:Landroid/graphics/Typeface;
 
     iput-object p1, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     sget-object p1, Landroid/graphics/Typeface;->SERIF:Landroid/graphics/Typeface;
 
-    :goto_0
     iput-object p1, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface;
 
     return-void
@@ -190,14 +190,16 @@
     :pswitch_2
     sget-object p1, Landroid/graphics/Typeface;->SANS_SERIF:Landroid/graphics/Typeface;
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface;
+
+    return-void
 
     :cond_1
-    :goto_1
+    :goto_0
     return-void
 
     :cond_2
-    :goto_2
+    :goto_1
     const/4 v0, 0x0
 
     iput-object v0, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface;
@@ -212,12 +214,12 @@
 
     sget v0, Landroidx/appcompat/R$styleable;->TextAppearance_fontFamily:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     sget v0, Landroidx/appcompat/R$styleable;->TextAppearance_android_fontFamily:I
 
-    :goto_3
+    :goto_2
     invoke-virtual {p1}, Landroid/content/Context;->isRestricted()Z
 
     move-result p1
@@ -247,24 +249,24 @@
 
     if-nez p1, :cond_4
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     const/4 v1, 0x0
 
-    :goto_4
+    :goto_3
     iput-boolean v1, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mAsyncFontPending:Z
     :try_end_0
     .catch Ljava/lang/UnsupportedOperationException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Landroid/content/res/Resources$NotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_5
+    goto :goto_4
 
     :catch_0
     nop
 
     :cond_5
-    :goto_5
+    :goto_4
     iget-object p1, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface;
 
     if-nez p1, :cond_6
@@ -768,6 +770,14 @@
 
     move-result-object v10
 
+    move-object/from16 v16, v13
+
+    move-object v13, v10
+
+    move-object/from16 v10, v16
+
+    goto :goto_3
+
     :cond_9
     move-object/from16 v16, v13
 
@@ -841,9 +851,7 @@
 
     invoke-virtual {v7, v9}, Landroidx/appcompat/widget/TintTypedArray;->getColorStateList(I)Landroid/content/res/ColorStateList;
 
-    move-result-object v9
-
-    move-object v10, v9
+    move-result-object v10
 
     :cond_d
     sget v9, Landroidx/appcompat/R$styleable;->TextAppearance_android_textColorHint:I
@@ -858,9 +866,7 @@
 
     invoke-virtual {v7, v9}, Landroidx/appcompat/widget/TintTypedArray;->getColorStateList(I)Landroid/content/res/ColorStateList;
 
-    move-result-object v9
-
-    move-object v14, v9
+    move-result-object v14
 
     :cond_e
     sget v9, Landroidx/appcompat/R$styleable;->TextAppearance_android_textColorLink:I
@@ -943,13 +949,11 @@
 
     if-eqz v4, :cond_15
 
-    iget-object v4, v0, Landroidx/appcompat/widget/AppCompatTextHelper;->mView:Landroid/widget/TextView;
-
-    iget-object v5, v0, Landroidx/appcompat/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface;
+    iget-object v5, v0, Landroidx/appcompat/widget/AppCompatTextHelper;->mView:Landroid/widget/TextView;
 
     iget v7, v0, Landroidx/appcompat/widget/AppCompatTextHelper;->mStyle:I
 
-    invoke-virtual {v4, v5, v7}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;I)V
+    invoke-virtual {v5, v4, v7}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;I)V
 
     :cond_15
     iget-object v4, v0, Landroidx/appcompat/widget/AppCompatTextHelper;->mAutoSizeTextHelper:Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;
@@ -1214,13 +1218,11 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mView:Landroid/widget/TextView;
-
-    iget-object p2, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface;
+    iget-object p2, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mView:Landroid/widget/TextView;
 
     iget v0, p0, Landroidx/appcompat/widget/AppCompatTextHelper;->mStyle:I
 
-    invoke-virtual {p1, p2, v0}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;I)V
+    invoke-virtual {p2, p1, v0}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;I)V
 
     :cond_3
     return-void
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatTextView.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatTextView.smali
index 8f71ad5f54..28480641cb 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatTextView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatTextView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/AppCompatTextView;
 .super Landroid/widget/TextView;
+.source "AppCompatTextView.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -89,11 +90,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mPrecomputedTextFuture:Ljava/util/concurrent/Future;
-
     const/4 v1, 0x0
 
+    :try_start_0
     iput-object v1, p0, Landroidx/appcompat/widget/AppCompatTextView;->mPrecomputedTextFuture:Ljava/util/concurrent/Future;
 
     invoke-interface {v0}, Ljava/util/concurrent/Future;->get()Ljava/lang/Object;
@@ -107,6 +106,8 @@
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/util/concurrent/ExecutionException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -123,8 +124,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 
     :cond_0
@@ -132,8 +131,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
 
     :cond_1
@@ -163,8 +160,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeMaxTextSize()I
 
     move-result v0
@@ -200,8 +195,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeMinTextSize()I
 
     move-result v0
@@ -237,8 +230,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeStepGranularity()I
 
     move-result v0
@@ -274,8 +265,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeTextAvailableSizes()[I
 
     move-result-object v0
@@ -322,8 +311,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatTextHelper;->getAutoSizeTextType()I
 
     move-result v0
@@ -369,8 +356,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintList()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -398,8 +383,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode;
 
     move-result-object v0
@@ -451,7 +434,7 @@
 .end method
 
 .method protected onLayout(ZIIII)V
-    .locals 7
+    .locals 6
 
     invoke-super/range {p0 .. p5}, Landroid/widget/TextView;->onLayout(ZIIII)V
 
@@ -459,19 +442,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
+    move v1, p1
 
-    move v2, p1
+    move v2, p2
 
-    move v3, p2
+    move v3, p3
 
-    move v4, p3
+    move v4, p4
 
-    move v5, p4
+    move v5, p5
 
-    move v6, p5
-
-    invoke-virtual/range {v1 .. v6}, Landroidx/appcompat/widget/AppCompatTextHelper;->onLayout(ZIIII)V
+    invoke-virtual/range {v0 .. v5}, Landroidx/appcompat/widget/AppCompatTextHelper;->onLayout(ZIIII)V
 
     :cond_0
     return-void
@@ -543,8 +524,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Landroidx/appcompat/widget/AppCompatTextHelper;->setAutoSizeTextTypeUniformWithConfiguration(IIII)V
 
     :cond_1
@@ -582,8 +561,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->setAutoSizeTextTypeUniformWithPresetSizes([II)V
 
     :cond_1
@@ -611,8 +588,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatTextHelper;->setAutoSizeTextTypeWithDefaults(I)V
 
     :cond_1
@@ -628,8 +603,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -649,8 +622,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 
     :cond_0
@@ -767,8 +738,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -791,8 +760,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mBackgroundTintHelper:Landroidx/appcompat/widget/AppCompatBackgroundHelper;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
@@ -808,8 +775,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
@@ -866,8 +831,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextView;->mTextHelper:Landroidx/appcompat/widget/AppCompatTextHelper;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/AppCompatTextHelper;->setTextSize(IF)V
 
     :cond_1
diff --git a/com.discord/smali/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.smali b/com.discord/smali/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.smali
index 11d6b2d204..744c758c98 100644
--- a/com.discord/smali/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;
 .super Ljava/lang/Object;
+.source "AppCompatTextViewAutoSizeHelper.java"
 
 
 # static fields
@@ -348,14 +349,13 @@
 
     move-result v2
 
-    :goto_0
     move v8, v0
 
     move v9, v1
 
     move v10, v2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView;
@@ -414,9 +414,13 @@
 
     move-result v2
 
-    goto :goto_0
+    move v8, v0
 
-    :goto_1
+    move v9, v1
+
+    move v10, v2
+
+    :goto_0
     new-instance v0, Landroid/text/StaticLayout;
 
     iget-object v5, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mTempTextPaint:Landroid/text/TextPaint;
@@ -502,6 +506,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private getTextViewMethod(Ljava/lang/String;)Ljava/lang/reflect/Method;
@@ -613,7 +619,7 @@
 
     invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object p1
+    move-result-object p3
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -651,10 +657,8 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    move-object p1, p3
-
     :goto_0
-    return-object p1
+    return-object p3
 
     :goto_1
     throw p1
@@ -951,11 +955,9 @@
 
     iput v1, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeMinTextSizeInPx:F
 
-    iget-object v1, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextSizesInPx:[I
-
     sub-int/2addr v0, v2
 
-    aget v0, v1, v0
+    aget v0, v3, v0
 
     int-to-float v0, v0
 
@@ -1032,8 +1034,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v2, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mTempTextPaint:Landroid/text/TextPaint;
-
     invoke-virtual {v2}, Landroid/text/TextPaint;->reset()V
 
     :goto_1
@@ -1299,7 +1299,7 @@
     :cond_0
     iget-boolean v0, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mNeedsAutoSizeText:Z
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_7
 
     iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView;
 
@@ -1307,7 +1307,7 @@
 
     move-result v0
 
-    if-lez v0, :cond_5
+    if-lez v0, :cond_6
 
     iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView;
 
@@ -1317,7 +1317,7 @@
 
     if-gtz v0, :cond_1
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_1
     iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView;
@@ -1441,7 +1441,7 @@
     :cond_4
     monitor-exit v2
 
-    goto :goto_2
+    goto :goto_3
 
     :catchall_0
     move-exception v0
@@ -1458,6 +1458,10 @@
 
     :cond_6
     :goto_2
+    return-void
+
+    :cond_7
+    :goto_3
     const/4 v0, 0x1
 
     iput-boolean v0, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mNeedsAutoSizeText:Z
@@ -2027,10 +2031,10 @@
     :pswitch_1
     invoke-direct {p0}, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->clearAutoSizeConfiguration()V
 
-    :cond_0
     return-void
 
-    nop
+    :cond_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -2058,8 +2062,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->mContext:Landroid/content/Context;
-
     invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/appcompat/widget/ButtonBarLayout.smali b/com.discord/smali/androidx/appcompat/widget/ButtonBarLayout.smali
index 86135e7920..d67d027678 100644
--- a/com.discord/smali/androidx/appcompat/widget/ButtonBarLayout.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ButtonBarLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ButtonBarLayout;
 .super Landroid/widget/LinearLayout;
+.source "ButtonBarLayout.java"
 
 
 # annotations
@@ -371,6 +372,10 @@
 
     add-int/2addr v1, p1
 
+    move v2, v1
+
+    goto :goto_2
+
     :cond_6
     move v2, v1
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout$OnAttachListener.smali b/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout$OnAttachListener.smali
index 76cf1673ff..3e9943c86b 100644
--- a/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout$OnAttachListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout$OnAttachListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;
 .super Ljava/lang/Object;
+.source "ContentFrameLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout.smali b/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout.smali
index 1918079f21..6adb6c99ae 100644
--- a/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ContentFrameLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ContentFrameLayout;
 .super Landroid/widget/FrameLayout;
+.source "ContentFrameLayout.java"
 
 
 # annotations
@@ -207,8 +208,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mAttachListener:Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;
-
     invoke-interface {v0}, Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;->onAttachedFromWindow()V
 
     :cond_0
@@ -224,8 +223,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mAttachListener:Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;
-
     invoke-interface {v0}, Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;->onDetachedFromWindow()V
 
     :cond_0
@@ -307,10 +304,9 @@
 
     move-result v10
 
-    :goto_2
     float-to-int v10, v10
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     iget v11, v10, Landroid/util/TypedValue;->type:I
@@ -329,12 +325,14 @@
 
     move-result v10
 
+    float-to-int v10, v10
+
     goto :goto_2
 
     :cond_3
     const/4 v10, 0x0
 
-    :goto_3
+    :goto_2
     if-lez v10, :cond_4
 
     iget-object v11, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect;
@@ -365,26 +363,26 @@
 
     const/4 p1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     move v10, p1
 
     const/4 p1, 0x0
 
-    :goto_4
+    :goto_3
     if-ne v5, v8, :cond_8
 
     if-eqz v1, :cond_5
 
     iget-object v5, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mFixedHeightMajor:Landroid/util/TypedValue;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     iget-object v5, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mFixedHeightMinor:Landroid/util/TypedValue;
 
-    :goto_5
+    :goto_4
     if-eqz v5, :cond_8
 
     iget v11, v5, Landroid/util/TypedValue;->type:I
@@ -399,10 +397,9 @@
 
     move-result v5
 
-    :goto_6
     float-to-int v5, v5
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_6
     iget v11, v5, Landroid/util/TypedValue;->type:I
@@ -421,12 +418,14 @@
 
     move-result v5
 
-    goto :goto_6
+    float-to-int v5, v5
+
+    goto :goto_5
 
     :cond_7
     const/4 v5, 0x0
 
-    :goto_7
+    :goto_5
     if-lez v5, :cond_8
 
     iget-object v11, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect;
@@ -472,12 +471,12 @@
 
     iget-object p1, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mMinWidthMinor:Landroid/util/TypedValue;
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_9
     iget-object p1, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mMinWidthMajor:Landroid/util/TypedValue;
 
-    :goto_8
+    :goto_6
     if-eqz p1, :cond_d
 
     iget v1, p1, Landroid/util/TypedValue;->type:I
@@ -492,10 +491,9 @@
 
     move-result p1
 
-    :goto_9
     float-to-int p1, p1
 
-    goto :goto_a
+    goto :goto_7
 
     :cond_a
     iget v1, p1, Landroid/util/TypedValue;->type:I
@@ -514,12 +512,14 @@
 
     move-result p1
 
-    goto :goto_9
+    float-to-int p1, p1
+
+    goto :goto_7
 
     :cond_b
     const/4 p1, 0x0
 
-    :goto_a
+    :goto_7
     if-lez p1, :cond_c
 
     iget-object v0, p0, Landroidx/appcompat/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect;
@@ -541,12 +541,12 @@
 
     move-result v10
 
-    goto :goto_b
+    goto :goto_8
 
     :cond_d
     const/4 v3, 0x0
 
-    :goto_b
+    :goto_8
     if-eqz v3, :cond_e
 
     invoke-super {p0, v10, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V
diff --git a/com.discord/smali/androidx/appcompat/widget/DecorContentParent.smali b/com.discord/smali/androidx/appcompat/widget/DecorContentParent.smali
index 76282a4dfe..ee770d6a44 100644
--- a/com.discord/smali/androidx/appcompat/widget/DecorContentParent.smali
+++ b/com.discord/smali/androidx/appcompat/widget/DecorContentParent.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/DecorContentParent;
 .super Ljava/lang/Object;
+.source "DecorContentParent.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/DecorToolbar.smali b/com.discord/smali/androidx/appcompat/widget/DecorToolbar.smali
index fdc910a405..bbae4ebf7c 100644
--- a/com.discord/smali/androidx/appcompat/widget/DecorToolbar.smali
+++ b/com.discord/smali/androidx/appcompat/widget/DecorToolbar.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/DecorToolbar;
 .super Ljava/lang/Object;
+.source "DecorToolbar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/DialogTitle.smali b/com.discord/smali/androidx/appcompat/widget/DialogTitle.smali
index b095cc5431..6e408d3e3d 100644
--- a/com.discord/smali/androidx/appcompat/widget/DialogTitle.smali
+++ b/com.discord/smali/androidx/appcompat/widget/DialogTitle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/DialogTitle;
 .super Landroid/widget/TextView;
+.source "DialogTitle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/DrawableUtils.smali b/com.discord/smali/androidx/appcompat/widget/DrawableUtils.smali
index 2406c21f42..4b47f8f015 100644
--- a/com.discord/smali/androidx/appcompat/widget/DrawableUtils.smali
+++ b/com.discord/smali/androidx/appcompat/widget/DrawableUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/DrawableUtils;
 .super Ljava/lang/Object;
+.source "DrawableUtils.java"
 
 
 # annotations
@@ -54,6 +55,8 @@
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -252,15 +255,17 @@
     :cond_0
     sget-object v1, Landroidx/appcompat/widget/ThemeUtils;->EMPTY_STATE_SET:[I
 
+    invoke-virtual {p0, v1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
+
     goto :goto_1
 
     :cond_1
     :goto_0
     sget-object v1, Landroidx/appcompat/widget/ThemeUtils;->CHECKED_STATE_SET:[I
 
-    :goto_1
     invoke-virtual {p0, v1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
+    :goto_1
     invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
     return-void
diff --git a/com.discord/smali/androidx/appcompat/widget/DropDownListView$GateKeeperDrawable.smali b/com.discord/smali/androidx/appcompat/widget/DropDownListView$GateKeeperDrawable.smali
index a73b73ff63..83839042c1 100644
--- a/com.discord/smali/androidx/appcompat/widget/DropDownListView$GateKeeperDrawable.smali
+++ b/com.discord/smali/androidx/appcompat/widget/DropDownListView$GateKeeperDrawable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/DropDownListView$GateKeeperDrawable;
 .super Landroidx/appcompat/graphics/drawable/DrawableWrapper;
+.source "DropDownListView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/DropDownListView$ResolveHoverRunnable.smali b/com.discord/smali/androidx/appcompat/widget/DropDownListView$ResolveHoverRunnable.smali
index 763907f476..b0e1663eff 100644
--- a/com.discord/smali/androidx/appcompat/widget/DropDownListView$ResolveHoverRunnable.smali
+++ b/com.discord/smali/androidx/appcompat/widget/DropDownListView$ResolveHoverRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/DropDownListView$ResolveHoverRunnable;
 .super Ljava/lang/Object;
+.source "DropDownListView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -42,8 +43,6 @@
 
     iput-object v1, v0, Landroidx/appcompat/widget/DropDownListView;->mResolveHoverRunnable:Landroidx/appcompat/widget/DropDownListView$ResolveHoverRunnable;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/DropDownListView$ResolveHoverRunnable;->this$0:Landroidx/appcompat/widget/DropDownListView;
-
     invoke-virtual {v0, p0}, Landroidx/appcompat/widget/DropDownListView;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     return-void
@@ -68,8 +67,6 @@
 
     iput-object v1, v0, Landroidx/appcompat/widget/DropDownListView;->mResolveHoverRunnable:Landroidx/appcompat/widget/DropDownListView$ResolveHoverRunnable;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/DropDownListView$ResolveHoverRunnable;->this$0:Landroidx/appcompat/widget/DropDownListView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/DropDownListView;->drawableStateChanged()V
 
     return-void
diff --git a/com.discord/smali/androidx/appcompat/widget/DropDownListView.smali b/com.discord/smali/androidx/appcompat/widget/DropDownListView.smali
index 08bcab875f..50a2293c66 100644
--- a/com.discord/smali/androidx/appcompat/widget/DropDownListView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/DropDownListView.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/DropDownListView;
 .super Landroid/widget/ListView;
+.source "DropDownListView.java"
 
 
 # annotations
@@ -138,8 +139,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/DropDownListView;->mClickAnimation:Landroidx/core/view/ViewPropertyAnimatorCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/ViewPropertyAnimatorCompat;->cancel()V
 
     const/4 v0, 0x0
@@ -255,12 +254,20 @@
 
     move-result p2
 
-    if-eq p2, v0, :cond_0
+    if-eq p2, v0, :cond_1
 
     iget-object p2, p0, Landroidx/appcompat/widget/DropDownListView;->mIsChildViewEnabled:Ljava/lang/reflect/Field;
 
-    xor-int/lit8 v0, v0, 0x1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v0
@@ -269,13 +276,13 @@
 
     const/4 p2, -0x1
 
-    if-eq p1, p2, :cond_0
+    if-eq p1, p2, :cond_1
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/DropDownListView;->refreshDrawableState()V
     :try_end_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
-    :cond_0
+    :cond_1
     return-void
 
     :catch_0
@@ -406,8 +413,6 @@
 
     if-eq v1, v3, :cond_2
 
-    iget v1, p0, Landroidx/appcompat/widget/DropDownListView;->mMotionPosition:I
-
     invoke-virtual {p0}, Landroidx/appcompat/widget/DropDownListView;->getFirstVisiblePosition()I
 
     move-result v3
@@ -481,8 +486,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/DropDownListView;->mSelector:Landroidx/appcompat/widget/DropDownListView$GateKeeperDrawable;
-
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/DropDownListView$GateKeeperDrawable;->setEnabled(Z)V
 
     :cond_0
@@ -680,7 +683,7 @@
 
     const/4 v1, -0x1
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/DropDownListView;->isInTouchMode()Z
 
@@ -688,7 +691,7 @@
 
     if-eqz v2, :cond_0
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_0
     invoke-interface {v0}, Landroid/widget/ListAdapter;->getCount()I
@@ -773,6 +776,10 @@
     :cond_7
     :goto_3
     return v1
+
+    :cond_8
+    :goto_4
+    return v1
 .end method
 
 .method public measureHeightOfChildrenCompat(IIIII)I
@@ -829,13 +836,13 @@
 
     const/4 v3, 0x0
 
-    move v5, p2
+    move v4, p2
 
     move-object v6, v3
 
     const/4 p2, 0x0
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     const/4 v7, 0x0
 
@@ -846,11 +853,11 @@
 
     move-result v8
 
-    if-eq v8, v4, :cond_2
+    if-eq v8, v5, :cond_2
 
     move-object v6, v3
 
-    move v4, v8
+    move v5, v8
 
     :cond_2
     invoke-interface {v2, p2, v6, p0}, Landroid/widget/ListAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
@@ -896,16 +903,16 @@
 
     if-lez p2, :cond_5
 
-    add-int/2addr v5, v0
+    add-int/2addr v4, v0
 
     :cond_5
     invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v8
 
-    add-int/2addr v5, v8
+    add-int/2addr v4, v8
 
-    if-lt v5, p4, :cond_7
+    if-lt v4, p4, :cond_7
 
     if-ltz p5, :cond_6
 
@@ -913,7 +920,7 @@
 
     if-lez v7, :cond_6
 
-    if-eq v5, p4, :cond_6
+    if-eq v4, p4, :cond_6
 
     return v7
 
@@ -925,7 +932,7 @@
 
     if-lt p2, p5, :cond_8
 
-    move v7, v5
+    move v7, v4
 
     :cond_8
     add-int/lit8 p2, p2, 0x1
@@ -933,7 +940,7 @@
     goto :goto_1
 
     :cond_9
-    return v5
+    return v4
 .end method
 
 .method protected onDetachedFromWindow()V
@@ -961,40 +968,41 @@
 
     packed-switch v0, :pswitch_data_0
 
-    :cond_0
-    :goto_0
     const/4 p2, 0x0
 
     const/4 v3, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
-    :goto_1
     :pswitch_0
     const/4 p2, 0x0
 
     const/4 v3, 0x0
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_1
     const/4 v3, 0x1
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_2
     const/4 v3, 0x0
 
-    :goto_2
+    :goto_0
     invoke-virtual {p1, p2}, Landroid/view/MotionEvent;->findPointerIndex(I)I
 
     move-result p2
 
-    if-gez p2, :cond_1
+    if-gez p2, :cond_0
+
+    const/4 p2, 0x0
+
+    const/4 v3, 0x0
 
     goto :goto_1
 
-    :cond_1
+    :cond_0
     invoke-virtual {p1, p2}, Landroid/view/MotionEvent;->getX(I)F
 
     move-result v4
@@ -1013,13 +1021,13 @@
 
     const/4 v6, -0x1
 
-    if-ne v5, v6, :cond_2
+    if-ne v5, v6, :cond_1
 
     const/4 p2, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
-    :cond_2
+    :cond_1
     invoke-virtual {p0}, Landroidx/appcompat/widget/DropDownListView;->getFirstVisiblePosition()I
 
     move-result v3
@@ -1036,13 +1044,16 @@
 
     invoke-direct {p0, v3, v5, v4, p2}, Landroidx/appcompat/widget/DropDownListView;->setPressedItem(Landroid/view/View;IFF)V
 
-    if-ne v0, v2, :cond_0
+    if-ne v0, v2, :cond_2
 
     invoke-direct {p0, v3, v5}, Landroidx/appcompat/widget/DropDownListView;->clickPressedItem(Landroid/view/View;I)V
 
-    goto :goto_0
+    :cond_2
+    const/4 p2, 0x0
 
-    :goto_3
+    const/4 v3, 0x1
+
+    :goto_1
     if-eqz v3, :cond_3
 
     if-eqz p2, :cond_4
@@ -1072,21 +1083,21 @@
 
     invoke-virtual {p2, p0, p1}, Landroidx/core/widget/ListViewAutoScrollHelper;->onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_6
     iget-object p1, p0, Landroidx/appcompat/widget/DropDownListView;->mScrollHelper:Landroidx/core/widget/ListViewAutoScrollHelper;
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Landroidx/appcompat/widget/DropDownListView;->mScrollHelper:Landroidx/core/widget/ListViewAutoScrollHelper;
-
     invoke-virtual {p1, v1}, Landroidx/core/widget/ListViewAutoScrollHelper;->setEnabled(Z)Landroidx/core/widget/AutoScrollHelper;
 
     :cond_7
-    :goto_4
+    :goto_2
     return v3
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
@@ -1256,8 +1267,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/DropDownListView;->mResolveHoverRunnable:Landroidx/appcompat/widget/DropDownListView$ResolveHoverRunnable;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/DropDownListView$ResolveHoverRunnable;->cancel()V
 
     :cond_1
diff --git a/com.discord/smali/androidx/appcompat/widget/FitWindowsFrameLayout.smali b/com.discord/smali/androidx/appcompat/widget/FitWindowsFrameLayout.smali
index f5b2e72368..4908c72530 100644
--- a/com.discord/smali/androidx/appcompat/widget/FitWindowsFrameLayout.smali
+++ b/com.discord/smali/androidx/appcompat/widget/FitWindowsFrameLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/FitWindowsFrameLayout;
 .super Landroid/widget/FrameLayout;
+.source "FitWindowsFrameLayout.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/FitWindowsViewGroup;
@@ -43,8 +44,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/FitWindowsFrameLayout;->mListener:Landroidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener;->onFitSystemWindows(Landroid/graphics/Rect;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/FitWindowsLinearLayout.smali b/com.discord/smali/androidx/appcompat/widget/FitWindowsLinearLayout.smali
index 7440bae16e..2aefe2a790 100644
--- a/com.discord/smali/androidx/appcompat/widget/FitWindowsLinearLayout.smali
+++ b/com.discord/smali/androidx/appcompat/widget/FitWindowsLinearLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/FitWindowsLinearLayout;
 .super Landroid/widget/LinearLayout;
+.source "FitWindowsLinearLayout.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/FitWindowsViewGroup;
@@ -43,8 +44,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/FitWindowsLinearLayout;->mListener:Landroidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener;->onFitSystemWindows(Landroid/graphics/Rect;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener.smali b/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener.smali
index 416fe0aefd..9e73176d2b 100644
--- a/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/FitWindowsViewGroup$OnFitSystemWindowsListener;
 .super Ljava/lang/Object;
+.source "FitWindowsViewGroup.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup.smali b/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup.smali
index a980635bde..6a8d1cc798 100644
--- a/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup.smali
+++ b/com.discord/smali/androidx/appcompat/widget/FitWindowsViewGroup.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/FitWindowsViewGroup;
 .super Ljava/lang/Object;
+.source "FitWindowsViewGroup.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ForwardingListener$DisallowIntercept.smali b/com.discord/smali/androidx/appcompat/widget/ForwardingListener$DisallowIntercept.smali
index f23556602d..df216e7708 100644
--- a/com.discord/smali/androidx/appcompat/widget/ForwardingListener$DisallowIntercept.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ForwardingListener$DisallowIntercept.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ForwardingListener$DisallowIntercept;
 .super Ljava/lang/Object;
+.source "ForwardingListener.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ForwardingListener$TriggerLongPress.smali b/com.discord/smali/androidx/appcompat/widget/ForwardingListener$TriggerLongPress.smali
index 0dfabc8800..43b28aa08c 100644
--- a/com.discord/smali/androidx/appcompat/widget/ForwardingListener$TriggerLongPress.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ForwardingListener$TriggerLongPress.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ForwardingListener$TriggerLongPress;
 .super Ljava/lang/Object;
+.source "ForwardingListener.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ForwardingListener.smali b/com.discord/smali/androidx/appcompat/widget/ForwardingListener.smali
index 5fd441d89e..14572e2c51 100644
--- a/com.discord/smali/androidx/appcompat/widget/ForwardingListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ForwardingListener.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/appcompat/widget/ForwardingListener;
 .super Ljava/lang/Object;
+.source "ForwardingListener.java"
 
 # interfaces
 .implements Landroid/view/View$OnAttachStateChangeListener;
@@ -105,22 +106,18 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ForwardingListener;->mSrc:Landroid/view/View;
+    iget-object v1, p0, Landroidx/appcompat/widget/ForwardingListener;->mSrc:Landroid/view/View;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ForwardingListener;->mTriggerLongPress:Ljava/lang/Runnable;
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->removeCallbacks(Ljava/lang/Runnable;)Z
+    invoke-virtual {v1, v0}, Landroid/view/View;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/widget/ForwardingListener;->mDisallowIntercept:Ljava/lang/Runnable;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ForwardingListener;->mSrc:Landroid/view/View;
+    iget-object v1, p0, Landroidx/appcompat/widget/ForwardingListener;->mSrc:Landroid/view/View;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ForwardingListener;->mDisallowIntercept:Ljava/lang/Runnable;
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->removeCallbacks(Ljava/lang/Runnable;)Z
+    invoke-virtual {v1, v0}, Landroid/view/View;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     :cond_1
     return-void
@@ -137,7 +134,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_5
 
     invoke-interface {v1}, Landroidx/appcompat/view/menu/ShowableListMenu;->isShowing()Z
 
@@ -145,7 +142,7 @@
 
     if-nez v3, :cond_0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_0
     invoke-interface {v1}, Landroidx/appcompat/view/menu/ShowableListMenu;->getListView()Landroid/widget/ListView;
@@ -154,7 +151,7 @@
 
     check-cast v1, Landroidx/appcompat/widget/DropDownListView;
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_4
 
     invoke-virtual {v1}, Landroidx/appcompat/widget/DropDownListView;->isShown()Z
 
@@ -208,8 +205,15 @@
     return v1
 
     :cond_3
+    return v2
+
+    :cond_4
     :goto_1
     return v2
+
+    :cond_5
+    :goto_2
+    return v2
 .end method
 
 .method private onTouchObserved(Landroid/view/MotionEvent;)Z
@@ -563,6 +567,8 @@
 
     iput-boolean v2, p0, Landroidx/appcompat/widget/ForwardingListener;->mForwarding:Z
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -573,9 +579,9 @@
 
     iget-boolean p1, p0, Landroidx/appcompat/widget/ForwardingListener;->mForwarding:Z
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_2
 
@@ -662,11 +668,11 @@
     goto :goto_3
 
     :cond_5
-    return v0
+    return v1
 
     :cond_6
     :goto_3
-    return v1
+    return v0
 .end method
 
 .method public onViewAttachedToWindow(Landroid/view/View;)V
@@ -690,11 +696,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ForwardingListener;->mSrc:Landroid/view/View;
+    iget-object v0, p0, Landroidx/appcompat/widget/ForwardingListener;->mSrc:Landroid/view/View;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ForwardingListener;->mDisallowIntercept:Ljava/lang/Runnable;
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->removeCallbacks(Ljava/lang/Runnable;)Z
+    invoke-virtual {v0, p1}, Landroid/view/View;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$DividerMode.smali b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$DividerMode.smali
index ffe1d39f6e..2d35e1c8a2 100644
--- a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$DividerMode.smali
+++ b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$DividerMode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/appcompat/widget/LinearLayoutCompat$DividerMode;
 .super Ljava/lang/Object;
+.source "LinearLayoutCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$LayoutParams.smali b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$LayoutParams.smali
index 103a67bd23..c5cd6da0f6 100644
--- a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$LayoutParams.smali
+++ b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "LinearLayoutCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$OrientationMode.smali b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$OrientationMode.smali
index 11cbab2f48..82c451f73a 100644
--- a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$OrientationMode.smali
+++ b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat$OrientationMode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/appcompat/widget/LinearLayoutCompat$OrientationMode;
 .super Ljava/lang/Object;
+.source "LinearLayoutCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat.smali b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat.smali
index dfd2214e8b..60480ee1ef 100644
--- a/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat.smali
+++ b/com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/LinearLayoutCompat;
 .super Landroid/view/ViewGroup;
+.source "LinearLayoutCompat.java"
 
 
 # annotations
@@ -472,7 +473,7 @@
 
     move-result v0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     invoke-virtual {p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getWidth()I
@@ -483,14 +484,13 @@
 
     move-result v1
 
-    :goto_2
     sub-int/2addr v0, v1
 
     iget v1, p0, Landroidx/appcompat/widget/LinearLayoutCompat;->mDividerWidth:I
 
     sub-int/2addr v0, v1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     invoke-virtual {v0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
@@ -507,6 +507,12 @@
 
     iget v1, v2, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
+    sub-int/2addr v0, v1
+
+    iget v1, p0, Landroidx/appcompat/widget/LinearLayoutCompat;->mDividerWidth:I
+
+    sub-int/2addr v0, v1
+
     goto :goto_2
 
     :cond_5
@@ -518,7 +524,7 @@
 
     add-int/2addr v0, v1
 
-    :goto_3
+    :goto_2
     invoke-virtual {p0, p1, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->drawVerticalDivider(Landroid/graphics/Canvas;I)V
 
     :cond_6
@@ -741,8 +747,6 @@
     return-object v0
 
     :cond_0
-    iget v0, p0, Landroidx/appcompat/widget/LinearLayoutCompat;->mOrientation:I
-
     const/4 v2, 0x1
 
     if-ne v0, v2, :cond_1
@@ -827,9 +831,7 @@
 
     if-le v0, v1, :cond_6
 
-    iget v0, p0, Landroidx/appcompat/widget/LinearLayoutCompat;->mBaselineAlignedChildIndex:I
-
-    invoke-virtual {p0, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {p0, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildAt(I)Landroid/view/View;
 
     move-result-object v0
 
@@ -1124,7 +1126,7 @@
 
     and-int/lit8 v2, v2, 0x2
 
-    if-eqz v2, :cond_5
+    if-eqz v2, :cond_6
 
     sub-int/2addr p1, v1
 
@@ -1155,6 +1157,9 @@
     :cond_5
     :goto_1
     return v0
+
+    :cond_6
+    return v0
 .end method
 
 .method public isBaselineAligned()Z
@@ -1174,47 +1179,45 @@
 .end method
 
 .method layoutHorizontal(IIII)V
-    .locals 27
+    .locals 24
 
     move-object/from16 v6, p0
 
     invoke-static/range {p0 .. p0}, Landroidx/appcompat/widget/ViewUtils;->isLayoutRtl(Landroid/view/View;)Z
 
-    move-result v2
+    move-result v0
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingTop()I
 
     move-result v7
 
-    sub-int v3, p4, p2
+    sub-int v1, p4, p2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingBottom()I
 
-    move-result v4
+    move-result v2
 
-    sub-int v8, v3, v4
+    sub-int v8, v1, v2
 
-    sub-int/2addr v3, v7
+    sub-int/2addr v1, v7
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingBottom()I
 
-    move-result v4
+    move-result v2
 
-    sub-int v9, v3, v4
+    sub-int v9, v1, v2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildCount()I
 
     move-result v10
 
-    iget v3, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
+    iget v1, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
 
-    const v4, 0x800007
+    const v2, 0x800007
 
-    and-int/2addr v3, v4
+    and-int/2addr v2, v1
 
-    iget v4, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
-
-    and-int/lit8 v11, v4, 0x70
+    and-int/lit8 v11, v1, 0x70
 
     iget-boolean v12, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mBaselineAligned:Z
 
@@ -1224,66 +1227,66 @@
 
     invoke-static/range {p0 .. p0}, Landroidx/core/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I
 
-    move-result v4
+    move-result v1
 
-    invoke-static {v3, v4}, Landroidx/core/view/GravityCompat;->getAbsoluteGravity(II)I
+    invoke-static {v2, v1}, Landroidx/core/view/GravityCompat;->getAbsoluteGravity(II)I
 
-    move-result v3
+    move-result v1
 
     const/4 v15, 0x2
 
     const/4 v5, 0x1
 
-    if-eq v3, v5, :cond_1
+    if-eq v1, v5, :cond_1
 
-    const/4 v4, 0x5
+    const/4 v2, 0x5
 
-    if-eq v3, v4, :cond_0
+    if-eq v1, v2, :cond_0
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingLeft()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingLeft()I
 
-    move-result v3
+    move-result v1
 
-    add-int v3, v3, p3
+    add-int v1, v1, p3
 
-    sub-int v3, v3, p1
+    sub-int v1, v1, p1
 
-    iget v0, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    iget v2, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    sub-int v0, v3, v0
+    sub-int/2addr v1, v2
 
     goto :goto_0
 
     :cond_1
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingLeft()I
 
-    move-result v3
+    move-result v1
 
-    sub-int v0, p3, p1
+    sub-int v2, p3, p1
 
-    iget v1, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    iget v3, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    sub-int/2addr v0, v1
+    sub-int/2addr v2, v3
 
-    div-int/2addr v0, v15
+    div-int/2addr v2, v15
 
-    add-int/2addr v0, v3
+    add-int/2addr v1, v2
 
     :goto_0
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    if-eqz v2, :cond_2
+    if-eqz v0, :cond_2
 
-    add-int/lit8 v2, v10, -0x1
+    add-int/lit8 v0, v10, -0x1
 
-    move/from16 v16, v2
+    move/from16 v16, v0
 
     const/16 v17, -0x1
 
@@ -1300,37 +1303,36 @@
     :goto_2
     if-ge v3, v10, :cond_e
 
-    mul-int v1, v17, v3
+    mul-int v0, v17, v3
 
-    add-int v2, v16, v1
+    add-int v2, v16, v0
 
     invoke-virtual {v6, v2}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-nez v1, :cond_3
+    if-nez v0, :cond_3
 
     invoke-virtual {v6, v2}, Landroidx/appcompat/widget/LinearLayoutCompat;->measureNullChild(I)I
 
-    move-result v1
+    move-result v0
 
-    add-int/2addr v0, v1
+    add-int/2addr v1, v0
 
-    :goto_3
-    move/from16 v26, v7
+    move/from16 v22, v7
 
-    move/from16 v23, v10
+    move/from16 v19, v10
 
-    move/from16 v24, v11
+    move/from16 v20, v11
 
-    const/16 v18, 0x1
+    const/16 v21, 0x1
 
-    const/16 v20, -0x1
+    const/16 v23, -0x1
 
-    goto/16 :goto_8
+    goto/16 :goto_5
 
     :cond_3
-    invoke-virtual {v1}, Landroid/view/View;->getVisibility()I
+    invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
 
     move-result v5
 
@@ -1338,49 +1340,49 @@
 
     if-eq v5, v15, :cond_d
 
-    invoke-virtual {v1}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual {v0}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v15
 
-    invoke-virtual {v1}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-virtual {v0}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v5
 
-    invoke-virtual {v1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v20
+    move-result-object v18
 
-    move-object/from16 v4, v20
+    move-object/from16 v4, v18
 
     check-cast v4, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
 
     if-eqz v12, :cond_4
 
-    move/from16 v22, v3
+    move/from16 v18, v3
 
     iget v3, v4, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
 
-    move/from16 v23, v10
+    move/from16 v19, v10
 
     const/4 v10, -0x1
 
     if-eq v3, v10, :cond_5
 
-    invoke-virtual {v1}, Landroid/view/View;->getBaseline()I
+    invoke-virtual {v0}, Landroid/view/View;->getBaseline()I
 
     move-result v3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
-    move/from16 v22, v3
+    move/from16 v18, v3
 
-    move/from16 v23, v10
+    move/from16 v19, v10
 
     :cond_5
     const/4 v3, -0x1
 
-    :goto_4
+    :goto_3
     iget v10, v4, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->gravity:I
 
     if-gez v10, :cond_6
@@ -1390,7 +1392,7 @@
     :cond_6
     and-int/lit8 v10, v10, 0x70
 
-    move/from16 v24, v11
+    move/from16 v20, v11
 
     const/16 v11, 0x10
 
@@ -1408,10 +1410,9 @@
 
     const/4 v11, -0x1
 
-    :goto_5
-    const/16 v18, 0x1
+    const/16 v21, 0x1
 
-    goto :goto_7
+    goto :goto_4
 
     :cond_7
     sub-int v10, v8, v5
@@ -1424,24 +1425,32 @@
 
     if-eq v3, v11, :cond_8
 
-    invoke-virtual {v1}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-virtual {v0}, Landroid/view/View;->getMeasuredHeight()I
 
-    move-result v20
+    move-result v21
 
-    sub-int v20, v20, v3
+    sub-int v21, v21, v3
 
     const/4 v3, 0x2
 
-    aget v21, v14, v3
+    aget v22, v14, v3
 
-    sub-int v21, v21, v20
+    sub-int v22, v22, v21
 
-    sub-int v10, v10, v21
+    sub-int v10, v10, v22
+
+    move v3, v10
+
+    const/16 v21, 0x1
+
+    goto :goto_4
 
     :cond_8
     move v3, v10
 
-    goto :goto_5
+    const/16 v21, 0x1
+
+    goto :goto_4
 
     :cond_9
     const/4 v11, -0x1
@@ -1452,28 +1461,29 @@
 
     if-eq v3, v11, :cond_a
 
-    const/16 v18, 0x1
+    const/16 v21, 0x1
 
-    aget v20, v13, v18
+    aget v22, v13, v21
 
-    sub-int v20, v20, v3
+    sub-int v22, v22, v3
 
-    add-int v10, v10, v20
+    add-int v10, v10, v22
 
-    goto :goto_6
-
-    :cond_a
-    const/16 v18, 0x1
-
-    :goto_6
     move v3, v10
 
-    goto :goto_7
+    goto :goto_4
+
+    :cond_a
+    const/16 v21, 0x1
+
+    move v3, v10
+
+    goto :goto_4
 
     :cond_b
     const/4 v11, -0x1
 
-    const/16 v18, 0x1
+    const/16 v21, 0x1
 
     sub-int v3, v9, v5
 
@@ -1491,7 +1501,7 @@
 
     sub-int/2addr v3, v10
 
-    :goto_7
+    :goto_4
     invoke-virtual {v6, v2}, Landroidx/appcompat/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z
 
     move-result v10
@@ -1500,32 +1510,32 @@
 
     iget v10, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mDividerWidth:I
 
-    add-int/2addr v0, v10
+    add-int/2addr v1, v10
 
     :cond_c
     iget v10, v4, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
-    add-int/2addr v10, v0
+    add-int/2addr v10, v1
 
-    invoke-virtual {v6, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->getLocationOffset(Landroid/view/View;)I
+    invoke-virtual {v6, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getLocationOffset(Landroid/view/View;)I
 
-    move-result v0
+    move-result v1
 
-    add-int v19, v10, v0
+    add-int v22, v10, v1
+
+    move-object v1, v0
 
     move-object/from16 v0, p0
 
-    move-object/from16 v25, v1
+    move-object/from16 p1, v1
 
     move v11, v2
 
-    move/from16 v2, v19
+    move/from16 v2, v22
 
-    move/from16 v19, v22
+    move/from16 v22, v7
 
-    move/from16 v26, v7
-
-    const/16 v20, -0x1
+    const/16 v23, -0x1
 
     move-object v7, v4
 
@@ -1537,7 +1547,7 @@
 
     add-int/2addr v15, v0
 
-    move-object/from16 v0, v25
+    move-object/from16 v0, p1
 
     invoke-virtual {v6, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I
 
@@ -1551,25 +1561,33 @@
 
     move-result v0
 
-    add-int v3, v19, v0
+    add-int v3, v18, v0
 
-    move v0, v10
+    move v1, v10
 
-    goto :goto_8
+    goto :goto_5
 
     :cond_d
-    move/from16 v19, v3
+    move/from16 v18, v3
 
-    goto/16 :goto_3
+    move/from16 v22, v7
 
-    :goto_8
+    move/from16 v19, v10
+
+    move/from16 v20, v11
+
+    const/16 v21, 0x1
+
+    const/16 v23, -0x1
+
+    :goto_5
     add-int/lit8 v3, v3, 0x1
 
-    move/from16 v10, v23
+    move/from16 v10, v19
 
-    move/from16 v11, v24
+    move/from16 v11, v20
 
-    move/from16 v7, v26
+    move/from16 v7, v22
 
     const/4 v5, 0x1
 
@@ -1590,43 +1608,41 @@
 
     move-result v7
 
-    sub-int v2, p3, p1
+    sub-int v0, p3, p1
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingRight()I
 
-    move-result v3
+    move-result v1
 
-    sub-int v8, v2, v3
+    sub-int v8, v0, v1
 
-    sub-int/2addr v2, v7
+    sub-int/2addr v0, v7
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingRight()I
 
-    move-result v3
+    move-result v1
 
-    sub-int v9, v2, v3
+    sub-int v9, v0, v1
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildCount()I
 
     move-result v10
 
-    iget v2, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
+    iget v0, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
 
-    and-int/lit8 v2, v2, 0x70
+    and-int/lit8 v1, v0, 0x70
 
-    iget v3, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
+    const v2, 0x800007
 
-    const v4, 0x800007
+    and-int v11, v0, v2
 
-    and-int v11, v3, v4
+    const/16 v0, 0x10
 
-    const/16 v3, 0x10
+    if-eq v1, v0, :cond_1
 
-    if-eq v2, v3, :cond_1
+    const/16 v0, 0x50
 
-    const/16 v3, 0x50
-
-    if-eq v2, v3, :cond_0
+    if-eq v1, v0, :cond_0
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingTop()I
 
@@ -1637,32 +1653,32 @@
     :cond_0
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingTop()I
 
-    move-result v2
+    move-result v0
 
-    add-int v2, v2, p4
+    add-int v0, v0, p4
 
-    sub-int v2, v2, p2
+    sub-int v0, v0, p2
 
-    iget v0, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    iget v1, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    sub-int v0, v2, v0
+    sub-int/2addr v0, v1
 
     goto :goto_0
 
     :cond_1
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingTop()I
 
-    move-result v2
+    move-result v0
 
-    sub-int v0, p4, p2
+    sub-int v1, p4, p2
 
-    iget v1, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    iget v2, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    sub-int/2addr v0, v1
+    sub-int/2addr v1, v2
 
-    div-int/lit8 v0, v0, 0x2
+    div-int/lit8 v1, v1, 0x2
 
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     :goto_0
     const/4 v1, 0x0
@@ -1678,7 +1694,7 @@
 
     const/4 v14, 0x1
 
-    if-nez v13, :cond_3
+    if-nez v13, :cond_2
 
     invoke-virtual {v6, v12}, Landroidx/appcompat/widget/LinearLayoutCompat;->measureNullChild(I)I
 
@@ -1686,20 +1702,18 @@
 
     add-int/2addr v0, v1
 
-    :cond_2
-    :goto_2
     const/4 v1, 0x1
 
-    goto/16 :goto_6
+    goto/16 :goto_3
 
-    :cond_3
+    :cond_2
     invoke-virtual {v13}, Landroid/view/View;->getVisibility()I
 
     move-result v1
 
     const/16 v2, 0x8
 
-    if-eq v1, v2, :cond_2
+    if-eq v1, v2, :cond_7
 
     invoke-virtual {v13}, Landroid/view/View;->getMeasuredWidth()I
 
@@ -1719,11 +1733,11 @@
 
     iget v1, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->gravity:I
 
-    if-gez v1, :cond_4
+    if-gez v1, :cond_3
 
     move v1, v11
 
-    :cond_4
+    :cond_3
     invoke-static/range {p0 .. p0}, Landroidx/core/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I
 
     move-result v2
@@ -1734,27 +1748,32 @@
 
     and-int/lit8 v1, v1, 0x7
 
-    if-eq v1, v14, :cond_6
+    if-eq v1, v14, :cond_5
 
     const/4 v2, 0x5
 
-    if-eq v1, v2, :cond_5
+    if-eq v1, v2, :cond_4
 
     iget v1, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
     add-int/2addr v1, v7
 
-    :goto_3
     move v2, v1
 
-    goto :goto_5
+    goto :goto_2
 
-    :cond_5
+    :cond_4
     sub-int v1, v8, v4
 
-    goto :goto_4
+    iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
 
-    :cond_6
+    sub-int/2addr v1, v2
+
+    move v2, v1
+
+    goto :goto_2
+
+    :cond_5
     sub-int v1, v9, v4
 
     div-int/lit8 v1, v1, 0x2
@@ -1765,25 +1784,24 @@
 
     add-int/2addr v1, v2
 
-    :goto_4
     iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
 
     sub-int/2addr v1, v2
 
-    goto :goto_3
+    move v2, v1
 
-    :goto_5
+    :goto_2
     invoke-virtual {v6, v12}, Landroidx/appcompat/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z
 
     move-result v1
 
-    if-eqz v1, :cond_7
+    if-eqz v1, :cond_6
 
     iget v1, v6, Landroidx/appcompat/widget/LinearLayoutCompat;->mDividerHeight:I
 
     add-int/2addr v0, v1
 
-    :cond_7
+    :cond_6
     iget v1, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
 
     add-int v16, v0, v1
@@ -1824,12 +1842,17 @@
 
     move/from16 v0, v16
 
-    goto :goto_2
+    const/4 v1, 0x1
 
-    :goto_6
+    goto :goto_3
+
+    :cond_7
+    const/4 v1, 0x1
+
+    :goto_3
     add-int/2addr v12, v1
 
-    goto :goto_1
+    goto/16 :goto_1
 
     :cond_8
     return-void
@@ -1856,7 +1879,7 @@
 .end method
 
 .method measureHorizontal(II)V
-    .locals 43
+    .locals 37
 
     move-object/from16 v7, p0
 
@@ -1971,7 +1994,7 @@
 
     const/16 v5, 0x8
 
-    if-ge v1, v11, :cond_15
+    if-ge v1, v11, :cond_16
 
     invoke-virtual {v7, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
 
@@ -1989,24 +2012,24 @@
 
     iput v5, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    move/from16 v30, v0
+    move/from16 v31, v0
 
     move v0, v1
 
-    move/from16 v31, v3
+    move/from16 v32, v3
 
-    move/from16 v35, v4
+    move/from16 v36, v4
 
     const/high16 v1, 0x40000000    # 2.0f
 
-    goto/16 :goto_10
+    goto/16 :goto_e
 
     :cond_3
     invoke-virtual {v6}, Landroid/view/View;->getVisibility()I
 
     move-result v10
 
-    if-eq v10, v5, :cond_14
+    if-eq v10, v5, :cond_15
 
     invoke-virtual {v7, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z
 
@@ -2033,7 +2056,7 @@
 
     iget v5, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->weight:F
 
-    add-float v30, v0, v5
+    add-float v31, v0, v5
 
     if-ne v12, v2, :cond_7
 
@@ -2059,10 +2082,9 @@
 
     add-int/2addr v0, v5
 
-    :goto_2
     iput v0, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     iget v0, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
@@ -2079,9 +2101,9 @@
 
     move-result v0
 
-    goto :goto_2
+    iput v0, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    :goto_3
+    :goto_2
     if-eqz v4, :cond_6
 
     const/4 v0, 0x0
@@ -2092,34 +2114,34 @@
 
     invoke-virtual {v6, v2, v2}, Landroid/view/View;->measure(II)V
 
-    move/from16 v33, v1
+    move/from16 v34, v1
 
-    move/from16 v31, v3
+    move/from16 v32, v3
 
-    move/from16 v35, v4
+    move/from16 v36, v4
 
     move-object v3, v6
 
-    const/16 v29, -0x2
+    const/16 v30, -0x2
 
-    goto/16 :goto_8
+    goto/16 :goto_6
 
     :cond_6
-    move/from16 v33, v1
+    move/from16 v34, v1
 
-    move/from16 v31, v3
+    move/from16 v32, v3
 
-    move/from16 v35, v4
+    move/from16 v36, v4
 
     move-object v3, v6
 
     const/high16 v1, 0x40000000    # 2.0f
 
-    const/16 v22, 0x1
+    const/16 v24, 0x1
 
-    const/16 v29, -0x2
+    const/16 v30, -0x2
 
-    goto/16 :goto_9
+    goto/16 :goto_7
 
     :cond_7
     iget v0, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
@@ -2138,15 +2160,15 @@
 
     const/4 v2, 0x0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     const/4 v5, -0x2
 
     const/high16 v2, -0x80000000
 
-    :goto_4
-    cmpl-float v0, v30, v20
+    :goto_3
+    cmpl-float v0, v31, v20
 
     if-nez v0, :cond_9
 
@@ -2154,29 +2176,29 @@
 
     move/from16 v29, v0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
     const/16 v29, 0x0
 
-    :goto_5
-    const/16 v32, 0x0
+    :goto_4
+    const/16 v33, 0x0
 
     move-object/from16 v0, p0
 
-    move/from16 v33, v1
+    move/from16 v34, v1
 
     move-object v1, v6
 
-    move/from16 v34, v2
+    move/from16 v35, v2
 
-    move/from16 v2, v33
+    move/from16 v2, v34
 
-    move/from16 v31, v3
+    move/from16 v32, v3
 
     move/from16 v3, p1
 
-    move/from16 v35, v4
+    move/from16 v36, v4
 
     move/from16 v4, v29
 
@@ -2186,22 +2208,24 @@
 
     move/from16 v5, p2
 
-    move-object/from16 v36, v6
+    move-object/from16 v29, v6
 
     const/high16 v9, -0x80000000
 
-    move/from16 v6, v32
+    const/16 v30, -0x2
+
+    move/from16 v6, v33
 
     invoke-virtual/range {v0 .. v6}, Landroidx/appcompat/widget/LinearLayoutCompat;->measureChildBeforeLayout(Landroid/view/View;IIIII)V
 
-    move/from16 v0, v34
+    move/from16 v0, v35
 
     if-eq v0, v9, :cond_a
 
     iput v0, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
 
     :cond_a
-    invoke-virtual/range {v36 .. v36}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual/range {v29 .. v29}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v0
 
@@ -2217,7 +2241,7 @@
 
     add-int/2addr v2, v3
 
-    move-object/from16 v3, v36
+    move-object/from16 v3, v29
 
     invoke-virtual {v7, v3}, Landroidx/appcompat/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I
 
@@ -2227,13 +2251,12 @@
 
     add-int/2addr v1, v2
 
-    :goto_6
     iput v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_b
-    move-object/from16 v3, v36
+    move-object/from16 v3, v29
 
     iget v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
@@ -2257,22 +2280,24 @@
 
     move-result v1
 
-    goto :goto_6
+    iput v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    :goto_7
-    if-eqz v31, :cond_c
+    :goto_5
+    if-eqz v32, :cond_c
 
     invoke-static {v0, v14}, Ljava/lang/Math;->max(II)I
 
-    move-result v0
+    move-result v14
 
-    move v14, v0
-
-    :cond_c
-    :goto_8
     const/high16 v1, 0x40000000    # 2.0f
 
-    :goto_9
+    goto :goto_7
+
+    :cond_c
+    :goto_6
+    const/high16 v1, 0x40000000    # 2.0f
+
+    :goto_7
     if-eq v13, v1, :cond_d
 
     iget v0, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
@@ -2285,12 +2310,12 @@
 
     const/16 v27, 0x1
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_d
     const/4 v0, 0x0
 
-    :goto_a
+    :goto_8
     iget v2, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
 
     iget v4, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I
@@ -2313,7 +2338,7 @@
 
     move-result v25
 
-    if-eqz v35, :cond_f
+    if-eqz v36, :cond_10
 
     invoke-virtual {v3}, Landroid/view/View;->getBaseline()I
 
@@ -2329,12 +2354,12 @@
 
     iget v6, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_e
     iget v6, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->gravity:I
 
-    :goto_b
+    :goto_9
     and-int/lit8 v6, v6, 0x70
 
     const/4 v9, 0x4
@@ -2363,114 +2388,125 @@
 
     aput v5, v28, v6
 
+    move/from16 v5, v21
+
+    goto :goto_a
+
     :cond_f
     move/from16 v5, v21
 
+    goto :goto_a
+
+    :cond_10
+    move/from16 v5, v21
+
+    :goto_a
     invoke-static {v5, v4}, Ljava/lang/Math;->max(II)I
 
     move-result v21
 
-    if-eqz v26, :cond_10
+    if-eqz v26, :cond_11
 
     iget v5, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
 
     const/4 v6, -0x1
 
-    if-ne v5, v6, :cond_10
+    if-ne v5, v6, :cond_11
 
     const/16 v26, 0x1
 
-    goto :goto_c
+    goto :goto_b
 
-    :cond_10
+    :cond_11
     const/16 v26, 0x0
 
-    :goto_c
+    :goto_b
     iget v5, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->weight:F
 
     cmpl-float v5, v5, v20
 
-    if-lez v5, :cond_12
+    if-lez v5, :cond_13
 
-    if-eqz v0, :cond_11
+    if-eqz v0, :cond_12
 
-    :goto_d
-    move/from16 v10, v24
-
-    goto :goto_e
-
-    :cond_11
-    move v2, v4
-
-    goto :goto_d
-
-    :goto_e
-    invoke-static {v10, v2}, Ljava/lang/Math;->max(II)I
-
-    move-result v24
-
-    goto :goto_f
+    goto :goto_c
 
     :cond_12
-    move/from16 v10, v24
+    move v2, v4
 
-    if-eqz v0, :cond_13
+    :goto_c
+    move/from16 v10, v23
 
-    move v4, v2
-
-    :cond_13
-    move/from16 v2, v23
-
-    invoke-static {v2, v4}, Ljava/lang/Math;->max(II)I
+    invoke-static {v10, v2}, Ljava/lang/Math;->max(II)I
 
     move-result v23
 
-    move/from16 v24, v10
+    move/from16 v10, v34
 
-    goto :goto_f
+    goto :goto_d
+
+    :cond_13
+    move/from16 v10, v23
+
+    if-eqz v0, :cond_14
+
+    move v4, v2
 
     :cond_14
-    move/from16 v33, v1
+    move/from16 v2, v22
 
-    move/from16 v31, v3
+    invoke-static {v2, v4}, Ljava/lang/Math;->max(II)I
 
-    move/from16 v35, v4
+    move-result v22
+
+    move/from16 v23, v10
+
+    move/from16 v10, v34
+
+    goto :goto_d
+
+    :cond_15
+    move/from16 v34, v1
+
+    move/from16 v32, v3
+
+    move/from16 v36, v4
 
     move-object v3, v6
 
     move/from16 v5, v21
 
-    move/from16 v2, v23
+    move/from16 v2, v22
 
-    move/from16 v10, v24
+    move/from16 v10, v23
 
     move/from16 v6, v25
 
     const/high16 v1, 0x40000000    # 2.0f
 
-    move/from16 v30, v0
+    move/from16 v31, v0
 
-    :goto_f
-    move/from16 v10, v33
+    move/from16 v10, v34
 
+    :goto_d
     invoke-virtual {v7, v3, v10}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I
 
     move-result v0
 
     add-int/2addr v0, v10
 
-    :goto_10
+    :goto_e
     add-int/lit8 v0, v0, 0x1
 
     move v1, v0
 
     move-object/from16 v6, v28
 
-    move/from16 v0, v30
+    move/from16 v0, v31
 
-    move/from16 v3, v31
+    move/from16 v3, v32
 
-    move/from16 v4, v35
+    move/from16 v4, v36
 
     const/high16 v2, 0x40000000    # 2.0f
 
@@ -2482,16 +2518,16 @@
 
     goto/16 :goto_1
 
-    :cond_15
-    move/from16 v31, v3
+    :cond_16
+    move/from16 v32, v3
 
-    move/from16 v35, v4
+    move/from16 v36, v4
 
     move/from16 v3, v21
 
-    move/from16 v2, v23
+    move/from16 v2, v22
 
-    move/from16 v10, v24
+    move/from16 v10, v23
 
     move/from16 v6, v25
 
@@ -2499,17 +2535,17 @@
 
     const/high16 v9, -0x80000000
 
-    const/16 v29, -0x2
+    const/16 v30, -0x2
 
     iget v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    if-lez v4, :cond_16
+    if-lez v4, :cond_17
 
     invoke-virtual {v7, v11}, Landroidx/appcompat/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_16
+    if-eqz v4, :cond_17
 
     iget v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
@@ -2519,36 +2555,38 @@
 
     iput v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    :cond_16
+    :cond_17
     aget v1, v15, v18
 
     const/4 v4, -0x1
 
-    if-ne v1, v4, :cond_18
+    if-ne v1, v4, :cond_19
 
     const/4 v1, 0x0
 
     aget v5, v15, v1
 
-    if-ne v5, v4, :cond_18
+    if-ne v5, v4, :cond_19
 
     aget v1, v15, v17
 
-    if-ne v1, v4, :cond_18
+    if-ne v1, v4, :cond_19
 
     aget v1, v15, v16
 
-    if-eq v1, v4, :cond_17
+    if-eq v1, v4, :cond_18
 
-    goto :goto_11
-
-    :cond_17
-    move/from16 v37, v6
-
-    goto :goto_12
+    goto :goto_f
 
     :cond_18
-    :goto_11
+    move v1, v3
+
+    move/from16 v23, v6
+
+    goto :goto_10
+
+    :cond_19
+    :goto_f
     aget v1, v15, v16
 
     const/4 v4, 0x0
@@ -2579,7 +2617,7 @@
 
     aget v5, v28, v18
 
-    move/from16 v37, v6
+    move/from16 v23, v6
 
     aget v6, v28, v17
 
@@ -2599,38 +2637,36 @@
 
     invoke-static {v3, v1}, Ljava/lang/Math;->max(II)I
 
-    move-result v21
+    move-result v1
 
-    move/from16 v3, v21
+    :goto_10
+    if-eqz v32, :cond_1f
 
-    :goto_12
-    if-eqz v31, :cond_1d
+    const/high16 v3, -0x80000000
 
-    const/high16 v1, -0x80000000
+    if-eq v12, v3, :cond_1a
 
-    if-eq v12, v1, :cond_19
+    if-nez v12, :cond_1f
 
-    if-nez v12, :cond_1d
+    :cond_1a
+    const/4 v3, 0x0
 
-    :cond_19
-    const/4 v1, 0x0
+    iput v3, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    iput v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    const/4 v3, 0x0
 
-    const/4 v1, 0x0
+    :goto_11
+    if-ge v3, v11, :cond_1e
 
-    :goto_13
-    if-ge v1, v11, :cond_1d
-
-    invoke-virtual {v7, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
+    invoke-virtual {v7, v3}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
 
     move-result-object v4
 
-    if-nez v4, :cond_1a
+    if-nez v4, :cond_1b
 
     iget v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    invoke-virtual {v7, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->measureNullChild(I)I
+    invoke-virtual {v7, v3}, Landroidx/appcompat/widget/LinearLayoutCompat;->measureNullChild(I)I
 
     move-result v5
 
@@ -2638,36 +2674,37 @@
 
     iput v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    goto :goto_14
+    move/from16 v22, v1
 
-    :cond_1a
+    goto :goto_12
+
+    :cond_1b
     invoke-virtual {v4}, Landroid/view/View;->getVisibility()I
 
     move-result v5
 
     const/16 v6, 0x8
 
-    if-ne v5, v6, :cond_1b
+    if-ne v5, v6, :cond_1c
 
-    invoke-virtual {v7, v4, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I
+    invoke-virtual {v7, v4, v3}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I
 
     move-result v4
 
-    add-int/2addr v1, v4
+    add-int/2addr v3, v4
 
-    :goto_14
-    move/from16 v38, v1
+    move/from16 v22, v1
 
-    goto :goto_15
+    goto :goto_12
 
-    :cond_1b
+    :cond_1c
     invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v5
 
     check-cast v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
 
-    if-eqz v19, :cond_1c
+    if-eqz v19, :cond_1d
 
     iget v6, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
@@ -2689,14 +2726,16 @@
 
     iput v6, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    goto :goto_14
+    move/from16 v22, v1
 
-    :cond_1c
+    goto :goto_12
+
+    :cond_1d
     iget v6, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
     add-int v9, v6, v14
 
-    move/from16 v38, v1
+    move/from16 v22, v1
 
     iget v1, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
@@ -2718,25 +2757,35 @@
 
     iput v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    :goto_15
-    add-int/lit8 v1, v38, 0x1
+    :goto_12
+    add-int/lit8 v3, v3, 0x1
+
+    move/from16 v1, v22
+
+    goto :goto_11
+
+    :cond_1e
+    move/from16 v22, v1
 
     goto :goto_13
 
-    :cond_1d
+    :cond_1f
+    move/from16 v22, v1
+
+    :goto_13
     iget v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingLeft()I
 
-    move-result v4
+    move-result v3
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingRight()I
 
-    move-result v5
+    move-result v4
 
-    add-int/2addr v4, v5
+    add-int/2addr v3, v4
 
-    add-int/2addr v1, v4
+    add-int/2addr v1, v3
 
     iput v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
@@ -2744,142 +2793,144 @@
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getSuggestedMinimumWidth()I
 
-    move-result v4
+    move-result v3
 
-    invoke-static {v1, v4}, Ljava/lang/Math;->max(II)I
+    invoke-static {v1, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    invoke-static {v1, v8, v4}, Landroid/view/View;->resolveSizeAndState(III)I
+    invoke-static {v1, v8, v3}, Landroid/view/View;->resolveSizeAndState(III)I
 
     move-result v1
 
-    const v4, 0xffffff
+    const v3, 0xffffff
 
-    and-int/2addr v4, v1
+    and-int/2addr v3, v1
 
-    iget v5, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    iget v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    sub-int/2addr v4, v5
+    sub-int/2addr v3, v4
 
-    if-nez v22, :cond_21
+    if-nez v24, :cond_23
 
-    if-eqz v4, :cond_1e
+    if-eqz v3, :cond_20
 
-    cmpl-float v6, v0, v20
+    cmpl-float v5, v0, v20
 
-    if-lez v6, :cond_1e
+    if-lez v5, :cond_20
 
-    goto :goto_17
+    goto :goto_15
 
-    :cond_1e
+    :cond_20
     invoke-static {v2, v10}, Ljava/lang/Math;->max(II)I
 
     move-result v0
 
-    if-eqz v31, :cond_20
+    if-eqz v32, :cond_22
 
     const/high16 v2, 0x40000000    # 2.0f
 
-    if-eq v12, v2, :cond_20
+    if-eq v12, v2, :cond_22
 
     const/4 v2, 0x0
 
-    :goto_16
-    if-ge v2, v11, :cond_20
+    :goto_14
+    if-ge v2, v11, :cond_22
 
     invoke-virtual {v7, v2}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-eqz v4, :cond_1f
+    if-eqz v3, :cond_21
 
-    invoke-virtual {v4}, Landroid/view/View;->getVisibility()I
+    invoke-virtual {v3}, Landroid/view/View;->getVisibility()I
+
+    move-result v5
+
+    const/16 v6, 0x8
+
+    if-eq v5, v6, :cond_21
+
+    invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v5
+
+    check-cast v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
+
+    iget v5, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->weight:F
+
+    cmpl-float v5, v5, v20
+
+    if-lez v5, :cond_21
+
+    const/high16 v5, 0x40000000    # 2.0f
+
+    invoke-static {v14, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v6
 
-    const/16 v9, 0x8
-
-    if-eq v6, v9, :cond_1f
-
-    invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v6
-
-    check-cast v6, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
-
-    iget v6, v6, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->weight:F
-
-    cmpl-float v6, v6, v20
-
-    if-lez v6, :cond_1f
-
-    const/high16 v6, 0x40000000    # 2.0f
-
-    invoke-static {v14, v6}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    invoke-virtual {v3}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v9
 
-    invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-static {v9, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
-    move-result v10
+    move-result v9
 
-    invoke-static {v10, v6}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
-
-    move-result v10
-
-    invoke-virtual {v4, v9, v10}, Landroid/view/View;->measure(II)V
-
-    :cond_1f
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_16
-
-    :cond_20
-    move/from16 v41, v11
-
-    move/from16 v4, p2
-
-    goto/16 :goto_27
+    invoke-virtual {v3, v6, v9}, Landroid/view/View;->measure(II)V
 
     :cond_21
-    :goto_17
-    iget v3, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mWeightSum:F
+    add-int/lit8 v2, v2, 0x1
 
-    cmpl-float v3, v3, v20
-
-    if-lez v3, :cond_22
-
-    iget v0, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mWeightSum:F
+    goto :goto_14
 
     :cond_22
-    const/4 v3, -0x1
+    move/from16 v25, v11
 
-    aput v3, v15, v16
+    move/from16 v2, v22
 
-    aput v3, v15, v17
+    move/from16 v3, p2
 
-    aput v3, v15, v18
+    goto/16 :goto_24
+
+    :cond_23
+    :goto_15
+    iget v5, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mWeightSum:F
+
+    cmpl-float v6, v5, v20
+
+    if-lez v6, :cond_24
+
+    move v0, v5
+
+    :cond_24
+    const/4 v5, -0x1
+
+    aput v5, v15, v16
+
+    aput v5, v15, v17
+
+    aput v5, v15, v18
 
     const/4 v6, 0x0
 
-    aput v3, v15, v6
+    aput v5, v15, v6
 
-    aput v3, v28, v16
+    aput v5, v28, v16
 
-    aput v3, v28, v17
+    aput v5, v28, v17
 
-    aput v3, v28, v18
+    aput v5, v28, v18
 
-    aput v3, v28, v6
+    aput v5, v28, v6
 
     iput v6, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
     move v10, v2
 
-    move/from16 v9, v37
+    move/from16 v9, v23
 
     const/4 v6, -0x1
 
@@ -2887,188 +2938,189 @@
 
     const/4 v0, 0x0
 
-    :goto_18
-    if-ge v0, v11, :cond_30
+    :goto_16
+    if-ge v0, v11, :cond_33
 
     invoke-virtual {v7, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
 
     move-result-object v14
 
-    if-eqz v14, :cond_2f
+    if-eqz v14, :cond_32
 
     invoke-virtual {v14}, Landroid/view/View;->getVisibility()I
 
-    move-result v3
+    move-result v5
 
-    const/16 v5, 0x8
+    const/16 v4, 0x8
 
-    if-eq v3, v5, :cond_2f
+    if-eq v5, v4, :cond_32
 
     invoke-virtual {v14}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v3
+    move-result-object v5
 
-    check-cast v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
+    check-cast v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
 
-    iget v5, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->weight:F
+    iget v4, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->weight:F
 
-    cmpl-float v21, v5, v20
+    cmpl-float v23, v4, v20
 
-    if-lez v21, :cond_27
+    if-lez v23, :cond_29
 
-    int-to-float v8, v4
+    int-to-float v8, v3
 
-    mul-float v8, v8, v5
+    mul-float v8, v8, v4
 
     div-float/2addr v8, v2
 
     float-to-int v8, v8
 
-    sub-float/2addr v2, v5
+    sub-float/2addr v2, v4
 
-    sub-int/2addr v4, v8
+    sub-int/2addr v3, v8
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingTop()I
 
-    move-result v5
+    move-result v4
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingBottom()I
 
-    move-result v21
+    move-result v23
 
-    add-int v5, v5, v21
+    add-int v4, v4, v23
 
-    move/from16 v39, v2
+    move/from16 v23, v2
 
-    iget v2, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
+    iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
 
-    add-int/2addr v5, v2
+    add-int/2addr v4, v2
 
-    iget v2, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I
+    iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I
 
-    add-int/2addr v5, v2
+    add-int/2addr v4, v2
 
-    iget v2, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
+    iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
 
-    move/from16 v40, v4
+    move/from16 v24, v3
 
-    move/from16 v41, v11
+    move/from16 v25, v11
 
-    move/from16 v4, p2
+    move/from16 v3, p2
 
     const/4 v11, -0x1
 
-    invoke-static {v4, v5, v2}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildMeasureSpec(III)I
+    invoke-static {v3, v4, v2}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildMeasureSpec(III)I
 
     move-result v2
 
-    iget v5, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
+    iget v4, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
 
-    if-nez v5, :cond_25
+    if-nez v4, :cond_27
 
-    const/high16 v5, 0x40000000    # 2.0f
+    const/high16 v4, 0x40000000    # 2.0f
 
-    if-eq v12, v5, :cond_23
+    if-eq v12, v4, :cond_25
 
-    goto :goto_1a
-
-    :cond_23
-    if-lez v8, :cond_24
-
-    move v5, v8
-
-    goto :goto_1b
-
-    :cond_24
-    :goto_19
-    const/4 v5, 0x0
-
-    goto :goto_1b
+    goto :goto_18
 
     :cond_25
-    :goto_1a
-    invoke-virtual {v14}, Landroid/view/View;->getMeasuredWidth()I
+    if-lez v8, :cond_26
 
-    move-result v5
+    move v4, v8
 
-    add-int/2addr v5, v8
+    goto :goto_17
 
-    if-gez v5, :cond_26
+    :cond_26
+    const/4 v4, 0x0
+
+    :goto_17
+    const/high16 v8, 0x40000000    # 2.0f
 
     goto :goto_19
 
-    :cond_26
-    :goto_1b
+    :cond_27
+    :goto_18
+    invoke-virtual {v14}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v4
+
+    add-int/2addr v4, v8
+
+    if-gez v4, :cond_28
+
+    const/4 v4, 0x0
+
+    :cond_28
     const/high16 v8, 0x40000000    # 2.0f
 
-    invoke-static {v5, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    :goto_19
+    invoke-static {v4, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
-    move-result v5
+    move-result v4
 
-    invoke-virtual {v14, v5, v2}, Landroid/view/View;->measure(II)V
+    invoke-virtual {v14, v4, v2}, Landroid/view/View;->measure(II)V
 
     invoke-virtual {v14}, Landroid/view/View;->getMeasuredState()I
 
     move-result v2
 
-    const/high16 v5, -0x1000000
+    const/high16 v4, -0x1000000
 
-    and-int/2addr v2, v5
+    and-int/2addr v2, v4
 
     invoke-static {v9, v2}, Landroid/view/View;->combineMeasuredStates(II)I
 
     move-result v9
 
-    move/from16 v2, v39
+    move/from16 v2, v23
 
-    move/from16 v5, v40
+    move/from16 v4, v24
 
-    goto :goto_1c
+    goto :goto_1a
 
-    :cond_27
-    move v5, v4
+    :cond_29
+    move v4, v3
 
-    move/from16 v41, v11
+    move/from16 v25, v11
 
-    move/from16 v4, p2
+    move/from16 v3, p2
 
     const/4 v11, -0x1
 
-    :goto_1c
-    if-eqz v19, :cond_28
+    :goto_1a
+    if-eqz v19, :cond_2a
 
     iget v8, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
     invoke-virtual {v14}, Landroid/view/View;->getMeasuredWidth()I
 
-    move-result v21
+    move-result v23
 
-    iget v11, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
+    iget v11, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
-    add-int v21, v21, v11
+    add-int v23, v23, v11
 
-    iget v11, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
+    iget v11, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
 
-    add-int v21, v21, v11
+    add-int v23, v23, v11
 
     invoke-virtual {v7, v14}, Landroidx/appcompat/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I
 
     move-result v11
 
-    add-int v21, v21, v11
+    add-int v23, v23, v11
 
-    add-int v8, v8, v21
+    add-int v8, v8, v23
 
     iput v8, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    move/from16 v42, v2
+    move/from16 v23, v2
 
-    :goto_1d
     const/high16 v2, 0x40000000    # 2.0f
 
-    goto :goto_1e
+    goto :goto_1b
 
-    :cond_28
+    :cond_2a
     iget v8, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
     invoke-virtual {v14}, Landroid/view/View;->getMeasuredWidth()I
@@ -3077,13 +3129,13 @@
 
     add-int/2addr v11, v8
 
-    move/from16 v42, v2
+    move/from16 v23, v2
 
-    iget v2, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
+    iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
     add-int/2addr v11, v2
 
-    iget v2, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
+    iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
 
     add-int/2addr v11, v2
 
@@ -3099,28 +3151,28 @@
 
     iput v2, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    goto :goto_1d
+    const/high16 v2, 0x40000000    # 2.0f
 
-    :goto_1e
-    if-eq v13, v2, :cond_29
+    :goto_1b
+    if-eq v13, v2, :cond_2b
 
-    iget v2, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
+    iget v2, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
 
     const/4 v8, -0x1
 
-    if-ne v2, v8, :cond_29
+    if-ne v2, v8, :cond_2b
 
     const/4 v2, 0x1
 
-    goto :goto_1f
+    goto :goto_1c
 
-    :cond_29
+    :cond_2b
     const/4 v2, 0x0
 
-    :goto_1f
-    iget v8, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
+    :goto_1c
+    iget v8, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
 
-    iget v11, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I
+    iget v11, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I
 
     add-int/2addr v8, v11
 
@@ -3134,76 +3186,76 @@
 
     move-result v6
 
-    if-eqz v2, :cond_2a
+    if-eqz v2, :cond_2c
 
-    goto :goto_20
+    goto :goto_1d
 
-    :cond_2a
+    :cond_2c
     move v8, v11
 
-    :goto_20
+    :goto_1d
     invoke-static {v10, v8}, Ljava/lang/Math;->max(II)I
 
     move-result v2
 
-    if-eqz v26, :cond_2b
+    if-eqz v26, :cond_2d
 
-    iget v8, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
+    iget v8, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
 
     const/4 v10, -0x1
 
-    if-ne v8, v10, :cond_2c
+    if-ne v8, v10, :cond_2e
 
     const/4 v8, 0x1
 
-    goto :goto_21
+    goto :goto_1e
 
-    :cond_2b
+    :cond_2d
     const/4 v10, -0x1
 
-    :cond_2c
+    :cond_2e
     const/4 v8, 0x0
 
-    :goto_21
-    if-eqz v35, :cond_2e
+    :goto_1e
+    if-eqz v36, :cond_31
 
     invoke-virtual {v14}, Landroid/view/View;->getBaseline()I
 
     move-result v14
 
-    if-eq v14, v10, :cond_2e
+    if-eq v14, v10, :cond_30
 
-    iget v10, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->gravity:I
+    iget v10, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->gravity:I
 
-    if-gez v10, :cond_2d
+    if-gez v10, :cond_2f
 
-    iget v3, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
+    iget v5, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
 
-    goto :goto_22
+    goto :goto_1f
 
-    :cond_2d
-    iget v3, v3, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->gravity:I
+    :cond_2f
+    iget v5, v5, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->gravity:I
 
-    :goto_22
-    and-int/lit8 v3, v3, 0x70
+    :goto_1f
+    and-int/lit8 v5, v5, 0x70
 
-    const/16 v21, 0x4
+    const/16 v24, 0x4
 
-    shr-int/lit8 v3, v3, 0x4
+    shr-int/lit8 v5, v5, 0x4
 
-    and-int/lit8 v3, v3, -0x2
+    and-int/lit8 v5, v5, -0x2
 
-    shr-int/lit8 v3, v3, 0x1
+    shr-int/lit8 v5, v5, 0x1
 
-    aget v10, v15, v3
+    aget v10, v15, v5
 
     invoke-static {v10, v14}, Ljava/lang/Math;->max(II)I
 
     move-result v10
 
-    aput v10, v15, v3
+    aput v10, v15, v5
 
-    aget v10, v28, v3
+    aget v10, v28, v5
 
     sub-int/2addr v11, v14
 
@@ -3211,48 +3263,53 @@
 
     move-result v10
 
-    aput v10, v28, v3
+    aput v10, v28, v5
 
-    goto :goto_23
+    goto :goto_20
 
-    :cond_2e
-    const/16 v21, 0x4
+    :cond_30
+    const/16 v24, 0x4
 
-    :goto_23
+    goto :goto_20
+
+    :cond_31
+    const/16 v24, 0x4
+
+    :goto_20
     move v10, v2
 
     move/from16 v26, v8
 
-    move/from16 v2, v42
+    move/from16 v2, v23
 
-    goto :goto_24
+    goto :goto_21
 
-    :cond_2f
-    move v5, v4
+    :cond_32
+    move v4, v3
 
-    move/from16 v41, v11
+    move/from16 v25, v11
 
-    move/from16 v4, p2
+    move/from16 v3, p2
 
-    const/16 v21, 0x4
+    const/16 v24, 0x4
 
-    :goto_24
+    :goto_21
     add-int/lit8 v0, v0, 0x1
 
-    move v4, v5
+    move v3, v4
 
-    move/from16 v11, v41
+    move/from16 v11, v25
 
-    const/4 v3, -0x1
+    const/4 v5, -0x1
 
     move/from16 v8, p1
 
-    goto/16 :goto_18
+    goto/16 :goto_16
 
-    :cond_30
-    move/from16 v41, v11
+    :cond_33
+    move/from16 v25, v11
 
-    move/from16 v4, p2
+    move/from16 v3, p2
 
     iget v0, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
@@ -3262,9 +3319,9 @@
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingRight()I
 
-    move-result v3
+    move-result v4
 
-    add-int/2addr v2, v3
+    add-int/2addr v2, v4
 
     add-int/2addr v0, v2
 
@@ -3274,36 +3331,36 @@
 
     const/4 v2, -0x1
 
-    if-ne v0, v2, :cond_32
+    if-ne v0, v2, :cond_35
 
     const/4 v0, 0x0
 
-    aget v3, v15, v0
+    aget v4, v15, v0
 
-    if-ne v3, v2, :cond_32
+    if-ne v4, v2, :cond_35
 
     aget v0, v15, v17
 
-    if-ne v0, v2, :cond_32
+    if-ne v0, v2, :cond_35
 
     aget v0, v15, v16
 
-    if-eq v0, v2, :cond_31
+    if-eq v0, v2, :cond_34
 
-    goto :goto_25
+    goto :goto_22
 
-    :cond_31
-    move v3, v6
+    :cond_34
+    move v0, v6
 
-    goto :goto_26
+    goto :goto_23
 
-    :cond_32
-    :goto_25
+    :cond_35
+    :goto_22
     aget v0, v15, v16
 
     const/4 v2, 0x0
 
-    aget v3, v15, v2
+    aget v4, v15, v2
 
     aget v5, v15, v18
 
@@ -3313,15 +3370,15 @@
 
     move-result v5
 
-    invoke-static {v3, v5}, Ljava/lang/Math;->max(II)I
+    invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I
 
-    move-result v3
+    move-result v4
 
-    invoke-static {v0, v3}, Ljava/lang/Math;->max(II)I
+    invoke-static {v0, v4}, Ljava/lang/Math;->max(II)I
 
     move-result v0
 
-    aget v3, v28, v16
+    aget v4, v28, v16
 
     aget v2, v28, v2
 
@@ -3337,7 +3394,7 @@
 
     move-result v2
 
-    invoke-static {v3, v2}, Ljava/lang/Math;->max(II)I
+    invoke-static {v4, v2}, Ljava/lang/Math;->max(II)I
 
     move-result v2
 
@@ -3347,35 +3404,35 @@
 
     move-result v0
 
-    move v3, v0
+    :goto_23
+    move v2, v0
 
-    :goto_26
-    move/from16 v37, v9
+    move/from16 v23, v9
 
     move v0, v10
 
-    :goto_27
-    if-nez v26, :cond_33
+    :goto_24
+    if-nez v26, :cond_36
 
-    const/high16 v2, 0x40000000    # 2.0f
+    const/high16 v4, 0x40000000    # 2.0f
 
-    if-eq v13, v2, :cond_33
+    if-eq v13, v4, :cond_36
 
-    goto :goto_28
+    goto :goto_25
 
-    :cond_33
-    move v0, v3
+    :cond_36
+    move v0, v2
 
-    :goto_28
+    :goto_25
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingTop()I
 
     move-result v2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingBottom()I
 
-    move-result v3
+    move-result v4
 
-    add-int/2addr v2, v3
+    add-int/2addr v2, v4
 
     add-int/2addr v0, v2
 
@@ -3389,27 +3446,27 @@
 
     const/high16 v2, -0x1000000
 
-    and-int v2, v37, v2
+    and-int v2, v23, v2
 
     or-int/2addr v1, v2
 
-    shl-int/lit8 v2, v37, 0x10
+    shl-int/lit8 v2, v23, 0x10
 
-    invoke-static {v0, v4, v2}, Landroid/view/View;->resolveSizeAndState(III)I
+    invoke-static {v0, v3, v2}, Landroid/view/View;->resolveSizeAndState(III)I
 
     move-result v0
 
     invoke-virtual {v7, v1, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->setMeasuredDimension(II)V
 
-    if-eqz v27, :cond_34
+    if-eqz v27, :cond_37
 
-    move/from16 v1, v41
+    move/from16 v1, v25
 
     move/from16 v0, p1
 
     invoke-direct {v7, v1, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->forceUniformHeight(II)V
 
-    :cond_34
+    :cond_37
     return-void
 .end method
 
@@ -3422,7 +3479,7 @@
 .end method
 
 .method measureVertical(II)V
-    .locals 40
+    .locals 33
 
     move-object/from16 v7, p0
 
@@ -3497,21 +3554,21 @@
 
     iput v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    move/from16 v32, v11
-
-    move/from16 v31, v13
+    move/from16 v23, v11
 
     move/from16 v4, v22
 
-    move/from16 v39, v6
+    move/from16 v22, v13
+
+    move/from16 v32, v6
 
     move v6, v1
 
     move v1, v2
 
-    move/from16 v2, v39
+    move/from16 v2, v32
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :cond_0
     move/from16 v24, v1
@@ -3585,22 +3642,24 @@
 
     move-object v3, v4
 
-    move/from16 v33, v5
+    move/from16 v31, v5
 
-    move/from16 v32, v11
-
-    move/from16 v31, v13
-
-    move/from16 v13, v22
+    move/from16 v23, v11
 
     move/from16 v8, v24
 
-    move/from16 v29, v26
+    move/from16 v30, v26
 
     const/16 v18, 0x1
 
     move v11, v6
 
+    move/from16 v32, v22
+
+    move/from16 v22, v13
+
+    move/from16 v13, v32
+
     goto/16 :goto_3
 
     :cond_2
@@ -3628,7 +3687,7 @@
     const/high16 v2, -0x80000000
 
     :goto_1
-    const/16 v23, 0x0
+    const/16 v27, 0x0
 
     cmpl-float v0, v25, v16
 
@@ -3636,25 +3695,25 @@
 
     iget v0, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    move/from16 v27, v0
+    move/from16 v28, v0
 
     goto :goto_2
 
     :cond_4
-    const/16 v27, 0x0
+    const/16 v28, 0x0
 
     :goto_2
     move-object/from16 v0, p0
 
     move/from16 v8, v24
 
-    const/high16 v24, 0x40000000    # 2.0f
+    const/high16 v23, 0x40000000    # 2.0f
 
     move-object v1, v4
 
-    move/from16 v28, v2
+    move/from16 v29, v2
 
-    move/from16 v29, v26
+    move/from16 v30, v26
 
     move v2, v6
 
@@ -3662,29 +3721,31 @@
 
     move/from16 v3, p1
 
-    move-object/from16 v30, v4
+    move-object/from16 v24, v4
 
-    move/from16 v32, v11
-
-    move/from16 v31, v13
-
-    move/from16 v13, v22
+    move/from16 v23, v11
 
     const/high16 v11, 0x40000000    # 2.0f
 
-    move/from16 v4, v23
+    move/from16 v32, v22
 
-    move/from16 v33, v5
+    move/from16 v22, v13
+
+    move/from16 v13, v32
+
+    move/from16 v4, v27
+
+    move/from16 v31, v5
 
     move/from16 v5, p2
 
     move v11, v6
 
-    move/from16 v6, v27
+    move/from16 v6, v28
 
     invoke-virtual/range {v0 .. v6}, Landroidx/appcompat/widget/LinearLayoutCompat;->measureChildBeforeLayout(Landroid/view/View;IIIII)V
 
-    move/from16 v0, v28
+    move/from16 v0, v29
 
     const/high16 v1, -0x80000000
 
@@ -3693,7 +3754,7 @@
     iput v0, v10, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->height:I
 
     :cond_5
-    invoke-virtual/range {v30 .. v30}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-virtual/range {v24 .. v24}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v0
 
@@ -3709,7 +3770,7 @@
 
     add-int/2addr v2, v3
 
-    move-object/from16 v3, v30
+    move-object/from16 v3, v24
 
     invoke-virtual {v7, v3}, Landroidx/appcompat/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I
 
@@ -3799,7 +3860,7 @@
 
     add-int/2addr v4, v2
 
-    move/from16 v5, v29
+    move/from16 v5, v30
 
     invoke-static {v5, v4}, Ljava/lang/Math;->max(II)I
 
@@ -3849,29 +3910,26 @@
 
     move v13, v4
 
-    move/from16 v1, v33
+    move/from16 v1, v31
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_d
     if-eqz v1, :cond_e
 
-    :goto_8
-    move/from16 v1, v33
-
-    goto :goto_9
+    goto :goto_8
 
     :cond_e
     move v2, v4
 
-    goto :goto_8
+    :goto_8
+    move/from16 v1, v31
 
-    :goto_9
     invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_f
     move v9, v3
@@ -3880,11 +3938,7 @@
 
     move v1, v5
 
-    move/from16 v32, v11
-
-    move/from16 v31, v13
-
-    move/from16 v13, v22
+    move/from16 v23, v11
 
     move/from16 v8, v24
 
@@ -3892,13 +3946,19 @@
 
     move v11, v6
 
+    move/from16 v32, v22
+
+    move/from16 v22, v13
+
+    move/from16 v13, v32
+
     move/from16 v25, v0
 
     move v6, v8
 
     move v0, v9
 
-    :goto_a
+    :goto_9
     invoke-virtual {v7, v3, v11}, Landroidx/appcompat/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I
 
     move-result v2
@@ -3911,30 +3971,30 @@
 
     move/from16 v0, v25
 
-    move/from16 v39, v5
+    move/from16 v32, v5
 
     move v5, v1
 
-    move/from16 v1, v39
+    move/from16 v1, v32
 
-    :goto_b
+    :goto_a
     add-int/lit8 v2, v2, 0x1
 
-    move/from16 v13, v31
+    move/from16 v13, v22
 
-    move/from16 v11, v32
+    move/from16 v11, v23
 
     move/from16 v8, p1
 
     move/from16 v9, p2
 
-    move/from16 v39, v2
+    move/from16 v32, v2
 
     move v2, v1
 
     move v1, v6
 
-    move/from16 v6, v39
+    move/from16 v6, v32
 
     goto/16 :goto_0
 
@@ -3945,19 +4005,21 @@
 
     move v1, v5
 
-    move/from16 v32, v11
-
-    move/from16 v31, v13
-
-    move/from16 v13, v22
+    move/from16 v23, v11
 
     move v5, v2
 
+    move/from16 v32, v22
+
+    move/from16 v22, v13
+
+    move/from16 v13, v32
+
     iget v2, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
     if-lez v2, :cond_11
 
-    move/from16 v2, v32
+    move/from16 v2, v23
 
     invoke-virtual {v7, v2}, Landroidx/appcompat/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z
 
@@ -3973,16 +4035,16 @@
 
     iput v3, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_11
-    move/from16 v2, v32
+    move/from16 v2, v23
 
     :cond_12
-    :goto_c
+    :goto_b
     if-eqz v15, :cond_16
 
-    move/from16 v3, v31
+    move/from16 v3, v22
 
     const/high16 v4, -0x80000000
 
@@ -3997,7 +4059,7 @@
 
     const/4 v4, 0x0
 
-    :goto_d
+    :goto_c
     if-ge v4, v2, :cond_17
 
     invoke-virtual {v7, v4}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
@@ -4014,10 +4076,9 @@
 
     add-int/2addr v6, v11
 
-    :goto_e
     iput v6, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    goto :goto_f
+    goto :goto_d
 
     :cond_14
     invoke-virtual {v6}, Landroid/view/View;->getVisibility()I
@@ -4032,7 +4093,7 @@
 
     add-int/2addr v4, v6
 
-    goto :goto_f
+    goto :goto_d
 
     :cond_15
     invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
@@ -4063,17 +4124,17 @@
 
     move-result v6
 
-    goto :goto_e
+    iput v6, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    :goto_f
+    :goto_d
     add-int/lit8 v4, v4, 0x1
 
     const/16 v10, 0x8
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_16
-    move/from16 v3, v31
+    move/from16 v3, v22
 
     :cond_17
     iget v4, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
@@ -4128,7 +4189,7 @@
 
     if-lez v11, :cond_18
 
-    goto :goto_11
+    goto :goto_f
 
     :cond_18
     invoke-static {v1, v13}, Ljava/lang/Math;->max(II)I
@@ -4143,7 +4204,7 @@
 
     const/4 v1, 0x0
 
-    :goto_10
+    :goto_e
     if-ge v1, v2, :cond_1a
 
     invoke-virtual {v7, v1}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
@@ -4191,24 +4252,24 @@
     :cond_19
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_10
+    goto :goto_e
 
     :cond_1a
     move v1, v8
 
     move/from16 v11, p1
 
-    goto/16 :goto_1b
+    goto/16 :goto_18
 
     :cond_1b
-    :goto_11
+    :goto_f
     iget v10, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mWeightSum:F
 
-    cmpl-float v10, v10, v16
+    cmpl-float v11, v10, v16
 
-    if-lez v10, :cond_1c
+    if-lez v11, :cond_1c
 
-    iget v0, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mWeightSum:F
+    move v0, v10
 
     :cond_1c
     const/4 v10, 0x0
@@ -4219,13 +4280,13 @@
 
     const/4 v0, 0x0
 
-    move/from16 v39, v8
+    move/from16 v32, v8
 
     move v8, v1
 
-    move/from16 v1, v39
+    move/from16 v1, v32
 
-    :goto_12
+    :goto_10
     if-ge v0, v2, :cond_27
 
     invoke-virtual {v7, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
@@ -4274,7 +4335,7 @@
 
     add-int v10, v10, v18
 
-    move/from16 v34, v9
+    move/from16 v18, v9
 
     iget v9, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
@@ -4286,7 +4347,7 @@
 
     iget v9, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
 
-    move/from16 v35, v11
+    move/from16 v21, v11
 
     move/from16 v11, p1
 
@@ -4302,22 +4363,24 @@
 
     if-eq v3, v10, :cond_1d
 
-    goto :goto_13
+    goto :goto_11
 
     :cond_1d
     if-lez v15, :cond_1e
 
-    goto :goto_14
+    const/high16 v10, 0x40000000    # 2.0f
+
+    goto :goto_12
 
     :cond_1e
     const/high16 v10, 0x40000000    # 2.0f
 
     const/4 v15, 0x0
 
-    goto :goto_15
+    goto :goto_12
 
     :cond_1f
-    :goto_13
+    :goto_11
     invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v10
@@ -4331,10 +4394,9 @@
     :cond_20
     move v15, v10
 
-    :goto_14
     const/high16 v10, 0x40000000    # 2.0f
 
-    :goto_15
+    :goto_12
     invoke-static {v15, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v15
@@ -4351,142 +4413,136 @@
 
     move-result v1
 
-    move/from16 v9, v34
-
-    move/from16 v10, v35
-
-    goto :goto_16
+    goto :goto_13
 
     :cond_21
     move v10, v11
 
     move/from16 v11, p1
 
-    :goto_16
-    iget v15, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
+    move/from16 v18, v9
 
-    move/from16 v36, v1
+    move/from16 v21, v10
 
-    iget v1, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
+    :goto_13
+    iget v9, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I
 
-    add-int/2addr v15, v1
+    iget v10, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I
+
+    add-int/2addr v9, v10
 
     invoke-virtual {v13}, Landroid/view/View;->getMeasuredWidth()I
 
-    move-result v1
+    move-result v10
 
-    add-int/2addr v1, v15
+    add-int/2addr v10, v9
 
-    invoke-static {v5, v1}, Ljava/lang/Math;->max(II)I
+    invoke-static {v5, v10}, Ljava/lang/Math;->max(II)I
 
     move-result v5
 
-    move/from16 v37, v1
+    const/high16 v15, 0x40000000    # 2.0f
 
-    const/high16 v1, 0x40000000    # 2.0f
+    if-eq v12, v15, :cond_22
 
-    if-eq v12, v1, :cond_22
+    iget v15, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
 
-    iget v1, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
+    move/from16 v23, v1
 
-    move/from16 v38, v3
+    const/4 v1, -0x1
 
-    const/4 v3, -0x1
+    if-ne v15, v1, :cond_23
 
-    if-ne v1, v3, :cond_23
+    const/4 v15, 0x1
 
-    const/4 v1, 0x1
-
-    goto :goto_17
+    goto :goto_14
 
     :cond_22
-    move/from16 v38, v3
+    move/from16 v23, v1
 
-    const/4 v3, -0x1
+    const/4 v1, -0x1
 
     :cond_23
-    const/4 v1, 0x0
+    const/4 v15, 0x0
 
-    :goto_17
-    if-eqz v1, :cond_24
+    :goto_14
+    if-eqz v15, :cond_24
 
-    goto :goto_18
+    goto :goto_15
 
     :cond_24
-    move/from16 v15, v37
+    move v9, v10
 
-    :goto_18
-    invoke-static {v8, v15}, Ljava/lang/Math;->max(II)I
+    :goto_15
+    invoke-static {v8, v9}, Ljava/lang/Math;->max(II)I
 
-    move-result v1
+    move-result v8
 
     if-eqz v19, :cond_25
 
-    iget v8, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
+    iget v9, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->width:I
 
-    if-ne v8, v3, :cond_25
+    if-ne v9, v1, :cond_25
 
-    const/4 v8, 0x1
+    const/4 v9, 0x1
 
-    goto :goto_19
+    goto :goto_16
 
     :cond_25
-    const/4 v8, 0x0
+    const/4 v9, 0x0
 
-    :goto_19
-    iget v15, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    :goto_16
+    iget v10, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
     invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I
 
-    move-result v18
+    move-result v15
 
-    add-int v18, v15, v18
+    add-int/2addr v15, v10
 
-    iget v3, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
+    iget v1, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->topMargin:I
 
-    add-int v18, v18, v3
+    add-int/2addr v15, v1
 
-    iget v3, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I
+    iget v1, v14, Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I
 
-    add-int v18, v18, v3
+    add-int/2addr v15, v1
 
     invoke-virtual {v7, v13}, Landroidx/appcompat/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I
 
-    move-result v3
+    move-result v1
 
-    add-int v3, v18, v3
+    add-int/2addr v15, v1
 
-    invoke-static {v15, v3}, Ljava/lang/Math;->max(II)I
+    invoke-static {v10, v15}, Ljava/lang/Math;->max(II)I
 
-    move-result v3
+    move-result v1
 
-    iput v3, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
+    iput v1, v7, Landroidx/appcompat/widget/LinearLayoutCompat;->mTotalLength:I
 
-    move/from16 v19, v8
+    move/from16 v19, v9
 
-    move v8, v1
+    move/from16 v9, v18
 
-    move/from16 v1, v36
+    move/from16 v1, v23
 
-    goto :goto_1a
+    goto :goto_17
 
     :cond_26
-    move/from16 v38, v3
-
     move v10, v11
 
     move/from16 v11, p1
 
-    :goto_1a
+    move/from16 v21, v10
+
+    :goto_17
     add-int/lit8 v0, v0, 0x1
 
-    move v11, v10
-
-    move/from16 v3, v38
+    move/from16 v11, v21
 
     const/4 v10, 0x0
 
-    goto/16 :goto_12
+    goto/16 :goto_10
 
     :cond_27
     move/from16 v11, p1
@@ -4509,19 +4565,19 @@
 
     move v0, v8
 
-    :goto_1b
+    :goto_18
     if-nez v19, :cond_28
 
     const/high16 v3, 0x40000000    # 2.0f
 
     if-eq v12, v3, :cond_28
 
-    goto :goto_1c
+    goto :goto_19
 
     :cond_28
     move v0, v5
 
-    :goto_1c
+    :goto_19
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/LinearLayoutCompat;->getPaddingLeft()I
 
     move-result v3
@@ -4805,9 +4861,7 @@
 
     if-eq v0, p1, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
-
-    const v1, -0x800008
+    const v0, -0x800008
 
     and-int/2addr v0, v1
 
@@ -4860,17 +4914,15 @@
 .end method
 
 .method public setVerticalGravity(I)V
-    .locals 1
+    .locals 2
 
     and-int/lit8 p1, p1, 0x70
 
     iget v0, p0, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
 
-    and-int/lit8 v0, v0, 0x70
+    and-int/lit8 v1, v0, 0x70
 
-    if-eq v0, p1, :cond_0
-
-    iget v0, p0, Landroidx/appcompat/widget/LinearLayoutCompat;->mGravity:I
+    if-eq v1, p1, :cond_0
 
     and-int/lit8 v0, v0, -0x71
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$1.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$1.smali
index e5ceabc6bd..93670b50eb 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$1;
 .super Landroidx/appcompat/widget/ForwardingListener;
+.source "ListPopupWindow.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$2.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$2.smali
index b3e77f9cd1..de837fc164 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$2;
 .super Ljava/lang/Object;
+.source "ListPopupWindow.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$3.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$3.smali
index c3763b6662..1ee8ca0a27 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$3.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$3;
 .super Ljava/lang/Object;
+.source "ListPopupWindow.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemSelectedListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ListSelectorHider.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ListSelectorHider.smali
index e823ec724c..34e8382b0e 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ListSelectorHider.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ListSelectorHider.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$ListSelectorHider;
 .super Ljava/lang/Object;
+.source "ListPopupWindow.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupDataSetObserver.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupDataSetObserver.smali
index 5187d308d1..7e6153e480 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupDataSetObserver.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupDataSetObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$PopupDataSetObserver;
 .super Landroid/database/DataSetObserver;
+.source "ListPopupWindow.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupScrollListener.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupScrollListener.smali
index 9c6c7bea46..33d0ab6dbd 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupScrollListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupScrollListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$PopupScrollListener;
 .super Ljava/lang/Object;
+.source "ListPopupWindow.java"
 
 # interfaces
 .implements Landroid/widget/AbsListView$OnScrollListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupTouchInterceptor.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupTouchInterceptor.smali
index c521568025..7d5c9e7472 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupTouchInterceptor.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$PopupTouchInterceptor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$PopupTouchInterceptor;
 .super Ljava/lang/Object;
+.source "ListPopupWindow.java"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ResizePopupRunnable.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ResizePopupRunnable.smali
index 8633c69d0b..ad8a3e502d 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ResizePopupRunnable.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow$ResizePopupRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ListPopupWindow$ResizePopupRunnable;
 .super Ljava/lang/Object;
+.source "ListPopupWindow.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow.smali b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow.smali
index 601e915ab7..3b85fb2af0 100644
--- a/com.discord/smali/androidx/appcompat/widget/ListPopupWindow.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ListPopupWindow.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ListPopupWindow;
 .super Ljava/lang/Object;
+.source "ListPopupWindow.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/ShowableListMenu;
@@ -450,11 +451,9 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v5, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
+    iget-object v6, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
 
-    iget-object v6, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownListHighlight:Landroid/graphics/drawable/Drawable;
-
-    invoke-virtual {v5, v6}, Landroidx/appcompat/widget/DropDownListView;->setSelector(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v6, v5}, Landroidx/appcompat/widget/DropDownListView;->setSelector(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
     iget-object v5, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
@@ -495,11 +494,9 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v5, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
+    iget-object v6, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
 
-    iget-object v6, p0, Landroidx/appcompat/widget/ListPopupWindow;->mItemSelectedListener:Landroid/widget/AdapterView$OnItemSelectedListener;
-
-    invoke-virtual {v5, v6}, Landroidx/appcompat/widget/DropDownListView;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
+    invoke-virtual {v6, v5}, Landroidx/appcompat/widget/DropDownListView;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
 
     :cond_1
     iget-object v5, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
@@ -561,8 +558,6 @@
 
     if-ltz v0, :cond_2
 
-    iget v0, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownWidth:I
-
     const/high16 v5, -0x80000000
 
     goto :goto_1
@@ -725,7 +720,7 @@
 
     if-ne v4, v2, :cond_9
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_9
     iget v2, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownWidth:I
@@ -734,17 +729,13 @@
 
     packed-switch v2, :pswitch_data_1
 
-    iget v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownWidth:I
-
-    :goto_6
-    invoke-static {v1, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    invoke-static {v2, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v1
 
-    :goto_7
     move v7, v1
 
-    goto :goto_8
+    goto :goto_6
 
     :pswitch_2
     iget-object v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mContext:Landroid/content/Context;
@@ -771,6 +762,12 @@
 
     sub-int/2addr v1, v2
 
+    invoke-static {v1, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v1
+
+    move v7, v1
+
     goto :goto_6
 
     :pswitch_3
@@ -802,9 +799,9 @@
 
     move-result v1
 
-    goto :goto_7
+    move v7, v1
 
-    :goto_8
+    :goto_6
     iget-object v6, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
 
     const/4 v8, 0x0
@@ -845,13 +842,11 @@
     return v1
 
     :cond_b
-    :goto_9
+    :goto_7
     add-int/2addr v3, v5
 
     return v3
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
@@ -873,8 +868,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    sget-object v0, Landroidx/appcompat/widget/ListPopupWindow;->sGetMaxAvailableHeightMethod:Ljava/lang/reflect/Method;
-
     iget-object v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow;
 
     const/4 v2, 0x3
@@ -909,11 +902,11 @@
 
     invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I
 
-    move-result p3
+    move-result p1
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return p3
+    return p1
 
     :catch_0
     const-string p3, "ListPopupWindow"
@@ -964,8 +957,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ListPopupWindow;->mPromptView:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
@@ -992,8 +983,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    sget-object v0, Landroidx/appcompat/widget/ListPopupWindow;->sClipToWindowEnabledMethod:Ljava/lang/reflect/Method;
-
     iget-object v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow;
 
     const/4 v2, 0x1
@@ -1781,15 +1770,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/ListPopupWindow;->mAdapter:Landroid/widget/ListAdapter;
+    iget-object v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mAdapter:Landroid/widget/ListAdapter;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ListPopupWindow;->mAdapter:Landroid/widget/ListAdapter;
-
-    iget-object v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mObserver:Landroid/database/DataSetObserver;
-
-    invoke-interface {v0, v1}, Landroid/widget/ListAdapter;->unregisterDataSetObserver(Landroid/database/DataSetObserver;)V
+    invoke-interface {v1, v0}, Landroid/widget/ListAdapter;->unregisterDataSetObserver(Landroid/database/DataSetObserver;)V
 
     :cond_1
     :goto_0
@@ -1806,8 +1791,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownList:Landroidx/appcompat/widget/DropDownListView;
-
     iget-object v0, p0, Landroidx/appcompat/widget/ListPopupWindow;->mAdapter:Landroid/widget/ListAdapter;
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/DropDownListView;->setAdapter(Landroid/widget/ListAdapter;)V
@@ -2232,8 +2215,6 @@
     goto :goto_0
 
     :cond_1
-    iget v2, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownWidth:I
-
     if-ne v2, v4, :cond_2
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/ListPopupWindow;->getAnchorView()Landroid/view/View;
@@ -2244,11 +2225,7 @@
 
     move-result v2
 
-    goto :goto_0
-
     :cond_2
-    iget v2, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownWidth:I
-
     :goto_0
     iget v7, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownHeight:I
 
@@ -2310,14 +2287,12 @@
     goto :goto_4
 
     :cond_7
-    iget v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownHeight:I
-
-    if-ne v1, v4, :cond_8
+    if-ne v7, v4, :cond_8
 
     goto :goto_4
 
     :cond_8
-    iget v0, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownHeight:I
+    move v0, v7
 
     :goto_4
     iget-object v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow;
@@ -2382,8 +2357,6 @@
     goto :goto_8
 
     :cond_d
-    iget v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownWidth:I
-
     if-ne v1, v4, :cond_e
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/ListPopupWindow;->getAnchorView()Landroid/view/View;
@@ -2394,11 +2367,7 @@
 
     move-result v1
 
-    goto :goto_8
-
     :cond_e
-    iget v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownWidth:I
-
     :goto_8
     iget v2, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownHeight:I
 
@@ -2409,14 +2378,12 @@
     goto :goto_9
 
     :cond_f
-    iget v2, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownHeight:I
-
     if-ne v2, v4, :cond_10
 
     goto :goto_9
 
     :cond_10
-    iget v0, p0, Landroidx/appcompat/widget/ListPopupWindow;->mDropDownHeight:I
+    move v0, v2
 
     :goto_9
     iget-object v2, p0, Landroidx/appcompat/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow;
@@ -2471,8 +2438,6 @@
     if-eqz v0, :cond_13
 
     :try_start_0
-    sget-object v0, Landroidx/appcompat/widget/ListPopupWindow;->sSetEpicenterBoundsMethod:Ljava/lang/reflect/Method;
-
     iget-object v1, p0, Landroidx/appcompat/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow;
 
     new-array v2, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/androidx/appcompat/widget/MenuItemHoverListener.smali b/com.discord/smali/androidx/appcompat/widget/MenuItemHoverListener.smali
index 28324f85ae..769e0c9035 100644
--- a/com.discord/smali/androidx/appcompat/widget/MenuItemHoverListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/MenuItemHoverListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/MenuItemHoverListener;
 .super Ljava/lang/Object;
+.source "MenuItemHoverListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow$MenuDropDownListView.smali b/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow$MenuDropDownListView.smali
index 4d0f3d0729..0270f83db6 100644
--- a/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow$MenuDropDownListView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow$MenuDropDownListView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/MenuPopupWindow$MenuDropDownListView;
 .super Landroidx/appcompat/widget/DropDownListView;
+.source "MenuPopupWindow.java"
 
 
 # annotations
@@ -182,17 +183,16 @@
 
     move-result-object v0
 
-    :goto_0
     check-cast v0, Landroidx/appcompat/view/menu/MenuAdapter;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v1, 0x0
 
-    goto :goto_0
+    check-cast v0, Landroidx/appcompat/view/menu/MenuAdapter;
 
-    :goto_1
+    :goto_0
     const/4 v2, 0x0
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
diff --git a/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow.smali b/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow.smali
index ee9fb87a47..aef456f9b9 100644
--- a/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow.smali
+++ b/com.discord/smali/androidx/appcompat/widget/MenuPopupWindow.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/MenuPopupWindow;
 .super Landroidx/appcompat/widget/ListPopupWindow;
+.source "MenuPopupWindow.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/MenuItemHoverListener;
@@ -105,8 +106,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/MenuPopupWindow;->mHoverListener:Landroidx/appcompat/widget/MenuItemHoverListener;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/widget/MenuItemHoverListener;->onItemHoverEnter(Landroidx/appcompat/view/menu/MenuBuilder;Landroid/view/MenuItem;)V
 
     :cond_0
@@ -128,8 +127,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/MenuPopupWindow;->mHoverListener:Landroidx/appcompat/widget/MenuItemHoverListener;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/widget/MenuItemHoverListener;->onItemHoverExit(Landroidx/appcompat/view/menu/MenuBuilder;Landroid/view/MenuItem;)V
 
     :cond_0
@@ -190,8 +187,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    sget-object v0, Landroidx/appcompat/widget/MenuPopupWindow;->sSetTouchModalMethod:Ljava/lang/reflect/Method;
-
     iget-object v1, p0, Landroidx/appcompat/widget/MenuPopupWindow;->mPopup:Landroid/widget/PopupWindow;
 
     const/4 v2, 0x1
diff --git a/com.discord/smali/androidx/appcompat/widget/PopupMenu$1.smali b/com.discord/smali/androidx/appcompat/widget/PopupMenu$1.smali
index 3fb1dfaa48..4a08569612 100644
--- a/com.discord/smali/androidx/appcompat/widget/PopupMenu$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/PopupMenu$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/PopupMenu$1;
 .super Ljava/lang/Object;
+.source "PopupMenu.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$Callback;
diff --git a/com.discord/smali/androidx/appcompat/widget/PopupMenu$2.smali b/com.discord/smali/androidx/appcompat/widget/PopupMenu$2.smali
index 6aef2a2790..55035f791c 100644
--- a/com.discord/smali/androidx/appcompat/widget/PopupMenu$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/PopupMenu$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/PopupMenu$2;
 .super Ljava/lang/Object;
+.source "PopupMenu.java"
 
 # interfaces
 .implements Landroid/widget/PopupWindow$OnDismissListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/PopupMenu$3.smali b/com.discord/smali/androidx/appcompat/widget/PopupMenu$3.smali
index 7c3b3fbb50..9ba8e9f138 100644
--- a/com.discord/smali/androidx/appcompat/widget/PopupMenu$3.smali
+++ b/com.discord/smali/androidx/appcompat/widget/PopupMenu$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/PopupMenu$3;
 .super Landroidx/appcompat/widget/ForwardingListener;
+.source "PopupMenu.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnDismissListener.smali b/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnDismissListener.smali
index b9175cd7bb..f3b089464f 100644
--- a/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnDismissListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnDismissListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/PopupMenu$OnDismissListener;
 .super Ljava/lang/Object;
+.source "PopupMenu.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnMenuItemClickListener.smali b/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnMenuItemClickListener.smali
index 2a76736c4c..2e5ed74d5f 100644
--- a/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnMenuItemClickListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/PopupMenu$OnMenuItemClickListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/PopupMenu$OnMenuItemClickListener;
 .super Ljava/lang/Object;
+.source "PopupMenu.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/PopupMenu.smali b/com.discord/smali/androidx/appcompat/widget/PopupMenu.smali
index 23a3d0cdd0..623be271e2 100644
--- a/com.discord/smali/androidx/appcompat/widget/PopupMenu.smali
+++ b/com.discord/smali/androidx/appcompat/widget/PopupMenu.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/PopupMenu;
 .super Ljava/lang/Object;
+.source "PopupMenu.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ResourcesWrapper.smali b/com.discord/smali/androidx/appcompat/widget/ResourcesWrapper.smali
index 546d064ddd..aa9414f1ed 100644
--- a/com.discord/smali/androidx/appcompat/widget/ResourcesWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ResourcesWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ResourcesWrapper;
 .super Landroid/content/res/Resources;
+.source "ResourcesWrapper.java"
 
 
 # instance fields
@@ -742,8 +743,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ResourcesWrapper;->mResources:Landroid/content/res/Resources;
-
     invoke-virtual {v0, p1, p2}, Landroid/content/res/Resources;->updateConfiguration(Landroid/content/res/Configuration;Landroid/util/DisplayMetrics;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/appcompat/widget/RtlSpacingHelper.smali b/com.discord/smali/androidx/appcompat/widget/RtlSpacingHelper.smali
index 8e14ee8475..9a87934c90 100644
--- a/com.discord/smali/androidx/appcompat/widget/RtlSpacingHelper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/RtlSpacingHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/RtlSpacingHelper;
 .super Ljava/lang/Object;
+.source "RtlSpacingHelper.java"
 
 
 # static fields
@@ -155,8 +156,6 @@
 
     if-eq p1, v0, :cond_1
 
-    iget p1, p0, Landroidx/appcompat/widget/RtlSpacingHelper;->mEnd:I
-
     goto :goto_0
 
     :cond_1
@@ -169,8 +168,6 @@
 
     if-eq p1, v0, :cond_2
 
-    iget p1, p0, Landroidx/appcompat/widget/RtlSpacingHelper;->mStart:I
-
     goto :goto_1
 
     :cond_2
@@ -186,8 +183,6 @@
 
     if-eq p1, v0, :cond_4
 
-    iget p1, p0, Landroidx/appcompat/widget/RtlSpacingHelper;->mStart:I
-
     goto :goto_2
 
     :cond_4
@@ -200,8 +195,6 @@
 
     if-eq p1, v0, :cond_5
 
-    iget p1, p0, Landroidx/appcompat/widget/RtlSpacingHelper;->mEnd:I
-
     goto :goto_3
 
     :cond_5
diff --git a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$1.smali b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$1.smali
index c67b0c3890..d1767fbd6b 100644
--- a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ScrollingTabContainerView$1;
 .super Ljava/lang/Object;
+.source "ScrollingTabContainerView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabAdapter.smali b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabAdapter.smali
index 42fccba353..46ecd7bf83 100644
--- a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ScrollingTabContainerView$TabAdapter;
 .super Landroid/widget/BaseAdapter;
+.source "ScrollingTabContainerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabClickListener.smali b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabClickListener.smali
index 124cdd82a8..dc6d5f1db6 100644
--- a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabClickListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabClickListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ScrollingTabContainerView$TabClickListener;
 .super Ljava/lang/Object;
+.source "ScrollingTabContainerView.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabView.smali b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabView.smali
index 18c471471f..f214dc8ee6 100644
--- a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$TabView.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;
 .super Landroid/widget/LinearLayout;
+.source "ScrollingTabContainerView.java"
 
 
 # annotations
@@ -245,8 +246,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
     :cond_2
@@ -254,8 +253,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mIconView:Landroid/widget/ImageView;
-
     invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mIconView:Landroid/widget/ImageView;
@@ -270,8 +267,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mCustomView:Landroid/view/View;
-
     invoke-virtual {p0, v1}, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->removeView(Landroid/view/View;)V
 
     iput-object v3, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mCustomView:Landroid/view/View;
@@ -333,8 +328,6 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mIconView:Landroid/widget/ImageView;
-
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object v1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mIconView:Landroid/widget/ImageView;
@@ -397,8 +390,6 @@
 
     if-eqz v4, :cond_b
 
-    iget-object v4, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mTextView:Landroid/widget/TextView;
-
     invoke-virtual {v4, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
     iget-object v2, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mTextView:Landroid/widget/TextView;
@@ -411,8 +402,6 @@
 
     if-eqz v2, :cond_c
 
-    iget-object v2, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;->mIconView:Landroid/widget/ImageView;
-
     invoke-virtual {v0}, Landroidx/appcompat/app/ActionBar$Tab;->getContentDescription()Ljava/lang/CharSequence;
 
     move-result-object v4
diff --git a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener.smali b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener.smali
index 5157bb5d74..3dff2a9f2b 100644
--- a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ScrollingTabContainerView.java"
 
 
 # annotations
@@ -64,8 +65,6 @@
 
     iput-object v0, p1, Landroidx/appcompat/widget/ScrollingTabContainerView;->mVisibilityAnim:Landroid/view/ViewPropertyAnimator;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener;->this$0:Landroidx/appcompat/widget/ScrollingTabContainerView;
-
     iget v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener;->mFinalVisibility:I
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->setVisibility(I)V
diff --git a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView.smali b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView.smali
index 309ebbc74b..09fd40fe55 100644
--- a/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ScrollingTabContainerView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ScrollingTabContainerView;
 .super Landroid/widget/HorizontalScrollView;
+.source "ScrollingTabContainerView.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemSelectedListener;
@@ -192,8 +193,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0}, Landroid/widget/Spinner;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
@@ -270,8 +269,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSelector:Ljava/lang/Runnable;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     const/4 v0, 0x0
@@ -356,8 +353,6 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {p2}, Landroid/widget/Spinner;->getAdapter()Landroid/widget/SpinnerAdapter;
 
     move-result-object p2
@@ -409,8 +404,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0}, Landroid/widget/Spinner;->getAdapter()Landroid/widget/SpinnerAdapter;
 
     move-result-object v0
@@ -450,8 +443,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSelector:Ljava/lang/Runnable;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     :cond_0
@@ -475,8 +466,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mVisibilityAnim:Landroid/view/ViewPropertyAnimator;
-
     invoke-virtual {v0}, Landroid/view/ViewPropertyAnimator;->cancel()V
 
     :cond_0
@@ -505,7 +494,6 @@
 
     move-result-object v2
 
-    :goto_0
     invoke-virtual {v2, v0, v1}, Landroid/view/ViewPropertyAnimator;->setDuration(J)Landroid/view/ViewPropertyAnimator;
 
     sget-object v0, Landroidx/appcompat/widget/ScrollingTabContainerView;->sAlphaInterpolator:Landroid/view/animation/Interpolator;
@@ -533,7 +521,23 @@
 
     move-result-object v2
 
-    goto :goto_0
+    invoke-virtual {v2, v0, v1}, Landroid/view/ViewPropertyAnimator;->setDuration(J)Landroid/view/ViewPropertyAnimator;
+
+    sget-object v0, Landroidx/appcompat/widget/ScrollingTabContainerView;->sAlphaInterpolator:Landroid/view/animation/Interpolator;
+
+    invoke-virtual {v2, v0}, Landroid/view/ViewPropertyAnimator;->setInterpolator(Landroid/animation/TimeInterpolator;)Landroid/view/ViewPropertyAnimator;
+
+    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mVisAnimListener:Landroidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener;
+
+    invoke-virtual {v0, v2, p1}, Landroidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener;->withFinalVisibility(Landroid/view/ViewPropertyAnimator;I)Landroidx/appcompat/widget/ScrollingTabContainerView$VisibilityAnimListener;
+
+    move-result-object p1
+
+    invoke-virtual {v2, p1}, Landroid/view/ViewPropertyAnimator;->setListener(Landroid/animation/Animator$AnimatorListener;)Landroid/view/ViewPropertyAnimator;
+
+    invoke-virtual {v2}, Landroid/view/ViewPropertyAnimator;->start()V
+
+    return-void
 .end method
 
 .method createTabView(Landroidx/appcompat/app/ActionBar$Tab;Z)Landroidx/appcompat/widget/ScrollingTabContainerView$TabView;
@@ -598,8 +602,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSelector:Ljava/lang/Runnable;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->post(Ljava/lang/Runnable;)Z
 
     :cond_0
@@ -643,8 +645,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSelector:Ljava/lang/Runnable;
-
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     :cond_0
@@ -681,9 +681,9 @@
 
     move-result p2
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     const/high16 v2, 0x40000000    # 2.0f
 
@@ -705,7 +705,7 @@
 
     move-result v4
 
-    if-le v4, v1, :cond_3
+    if-le v4, v0, :cond_3
 
     if-eq p2, v2, :cond_1
 
@@ -752,14 +752,16 @@
 
     move-result p2
 
+    iput p2, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mMaxTabWidth:I
+
     goto :goto_2
 
     :cond_3
     const/4 p2, -0x1
 
-    :goto_2
     iput p2, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mMaxTabWidth:I
 
+    :goto_2
     iget p2, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mContentHeight:I
 
     invoke-static {p2, v2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
@@ -775,14 +777,14 @@
     goto :goto_3
 
     :cond_4
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_3
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_6
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabLayout:Landroidx/appcompat/widget/LinearLayoutCompat;
+    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabLayout:Landroidx/appcompat/widget/LinearLayoutCompat;
 
-    invoke-virtual {v1, v0, p2}, Landroidx/appcompat/widget/LinearLayoutCompat;->measure(II)V
+    invoke-virtual {v0, v1, p2}, Landroidx/appcompat/widget/LinearLayoutCompat;->measure(II)V
 
     iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabLayout:Landroidx/appcompat/widget/LinearLayoutCompat;
 
@@ -803,6 +805,11 @@
     :cond_5
     invoke-direct {p0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->performExpand()Z
 
+    goto :goto_4
+
+    :cond_6
+    invoke-direct {p0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->performExpand()Z
+
     :goto_4
     invoke-virtual {p0}, Landroidx/appcompat/widget/ScrollingTabContainerView;->getMeasuredWidth()I
 
@@ -814,15 +821,15 @@
 
     move-result p1
 
-    if-eqz v3, :cond_6
+    if-eqz v3, :cond_7
 
-    if-eq v0, p1, :cond_6
+    if-eq v0, p1, :cond_7
 
     iget p1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mSelectedTabIndex:I
 
     invoke-virtual {p0, p1}, Landroidx/appcompat/widget/ScrollingTabContainerView;->setTabSelected(I)V
 
-    :cond_6
+    :cond_7
     return-void
 .end method
 
@@ -850,8 +857,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0}, Landroid/widget/Spinner;->getAdapter()Landroid/widget/SpinnerAdapter;
 
     move-result-object v0
@@ -882,8 +887,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {p1}, Landroid/widget/Spinner;->getAdapter()Landroid/widget/SpinnerAdapter;
 
     move-result-object p1
@@ -973,8 +976,6 @@
 
     if-ltz p1, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0, p1}, Landroid/widget/Spinner;->setSelection(I)V
 
     :cond_3
@@ -998,8 +999,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ScrollingTabContainerView;->mTabSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {p1}, Landroid/widget/Spinner;->getAdapter()Landroid/widget/SpinnerAdapter;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$1.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$1.smali
index 6f9f32ec5c..afbfd3264d 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$1;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$10.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$10.smali
index 27ecfd6d40..d8737085f6 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$10.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$10.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$10;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/text/TextWatcher;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$2.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$2.smali
index 713bfe0d87..c2a7b33ef8 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$2;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$3.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$3.smali
index b36e806214..d395a16ca4 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$3.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$3;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/view/View$OnFocusChangeListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$4.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$4.smali
index 5480988313..bdfd2d450b 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$4.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$4;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/view/View$OnLayoutChangeListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$5.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$5.smali
index c972ea02ba..48c7d452ad 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$5.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$5;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$6.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$6.smali
index d3cffec0df..3f4dba54c3 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$6.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$6;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/view/View$OnKeyListener;
@@ -112,9 +113,7 @@
 
     const/4 p2, 0x0
 
-    iget-object p3, p0, Landroidx/appcompat/widget/SearchView$6;->this$0:Landroidx/appcompat/widget/SearchView;
-
-    iget-object p3, p3, Landroidx/appcompat/widget/SearchView;->mSearchSrcTextView:Landroidx/appcompat/widget/SearchView$SearchAutoComplete;
+    iget-object p3, p1, Landroidx/appcompat/widget/SearchView;->mSearchSrcTextView:Landroidx/appcompat/widget/SearchView$SearchAutoComplete;
 
     invoke-virtual {p3}, Landroidx/appcompat/widget/SearchView$SearchAutoComplete;->getText()Landroid/text/Editable;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$7.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$7.smali
index 3c3956dcd9..aba3ffbe52 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$7.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$7;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/widget/TextView$OnEditorActionListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$8.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$8.smali
index df438892e2..219f31a50c 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$8.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$8.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$8;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$9.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$9.smali
index ddd0ce895c..038bf54847 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$9.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$9.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$9;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemSelectedListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector.smali
index aac08d41e9..1fa69c97bb 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 
 # annotations
@@ -96,6 +97,8 @@
     :try_end_2
     .catch Ljava/lang/NoSuchMethodException; {:try_start_2 .. :try_end_2} :catch_2
 
+    return-void
+
     :catch_2
     return-void
 .end method
@@ -109,17 +112,17 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector;->doAfterTextChanged:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x0
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -132,17 +135,17 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector;->doBeforeTextChanged:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x0
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -155,11 +158,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView$AutoCompleteTextViewReflector;->ensureImeVisible:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -174,6 +175,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$OnCloseListener.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$OnCloseListener.smali
index 493af24018..133961e6ee 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$OnCloseListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$OnCloseListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/SearchView$OnCloseListener;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$OnQueryTextListener.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$OnQueryTextListener.smali
index 8df8e1c9e6..6a8479dcf2 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$OnQueryTextListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$OnQueryTextListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/SearchView$OnQueryTextListener;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$OnSuggestionListener.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$OnSuggestionListener.smali
index ae064bb2f8..24534bcd8d 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$OnSuggestionListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$OnSuggestionListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/SearchView$OnSuggestionListener;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState$1.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState$1.smali
index d5c138d772..879e5d7785 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/widget/SearchView$SavedState$1;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState.smali
index 1683f8a8b3..547ad4f416 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$SavedState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "SearchView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete$1.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete$1.smali
index c0e651b6ee..3beb28518d 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$SearchAutoComplete$1;
 .super Ljava/lang/Object;
+.source "SearchView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete.smali
index a86c06fde5..ee69c030d7 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$SearchAutoComplete.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/SearchView$SearchAutoComplete;
 .super Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;
+.source "SearchView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView$UpdatableTouchDelegate.smali b/com.discord/smali/androidx/appcompat/widget/SearchView$UpdatableTouchDelegate.smali
index 1871daec61..ac382a124a 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView$UpdatableTouchDelegate.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView$UpdatableTouchDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SearchView$UpdatableTouchDelegate;
 .super Landroid/view/TouchDelegate;
+.source "SearchView.java"
 
 
 # annotations
@@ -176,6 +177,10 @@
 
     div-int/lit8 v1, v1, 0x2
 
+    int-to-float v1, v1
+
+    invoke-virtual {p1, v0, v1}, Landroid/view/MotionEvent;->setLocation(FF)V
+
     goto :goto_2
 
     :cond_2
@@ -193,11 +198,11 @@
 
     sub-int/2addr v1, v2
 
-    :goto_2
     int-to-float v1, v1
 
     invoke-virtual {p1, v0, v1}, Landroid/view/MotionEvent;->setLocation(FF)V
 
+    :goto_2
     iget-object v0, p0, Landroidx/appcompat/widget/SearchView$UpdatableTouchDelegate;->mDelegateView:Landroid/view/View;
 
     invoke-virtual {v0, p1}, Landroid/view/View;->dispatchTouchEvent(Landroid/view/MotionEvent;)Z
@@ -231,13 +236,11 @@
 
     iget v0, p0, Landroidx/appcompat/widget/SearchView$UpdatableTouchDelegate;->mSlop:I
 
+    neg-int v1, v0
+
     neg-int v0, v0
 
-    iget v1, p0, Landroidx/appcompat/widget/SearchView$UpdatableTouchDelegate;->mSlop:I
-
-    neg-int v1, v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/graphics/Rect;->inset(II)V
+    invoke-virtual {p1, v1, v0}, Landroid/graphics/Rect;->inset(II)V
 
     iget-object p1, p0, Landroidx/appcompat/widget/SearchView$UpdatableTouchDelegate;->mActualBounds:Landroid/graphics/Rect;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView.smali b/com.discord/smali/androidx/appcompat/widget/SearchView.smali
index 0b424e2179..0924805c43 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/SearchView;
 .super Landroidx/appcompat/widget/LinearLayoutCompat;
+.source "SearchView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/CollapsibleActionView;
@@ -663,8 +664,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/appcompat/widget/SearchView;->mDropDownAnchor:Landroid/view/View;
-
     new-instance p2, Landroidx/appcompat/widget/SearchView$4;
 
     invoke-direct {p2, p0}, Landroidx/appcompat/widget/SearchView$4;-><init>(Landroidx/appcompat/widget/SearchView;)V
@@ -721,11 +720,9 @@
 
     if-eqz p1, :cond_3
 
-    const-string p1, "app_data"
+    const-string p2, "app_data"
 
-    iget-object p2, p0, Landroidx/appcompat/widget/SearchView;->mAppSearchData:Landroid/os/Bundle;
-
-    invoke-virtual {v0, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/Intent;
+    invoke-virtual {v0, p2, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/Intent;
 
     :cond_3
     if-eqz p5, :cond_4
@@ -775,9 +772,14 @@
 
     const-string v1, "android.intent.action.SEARCH"
 
+    move-object v2, v1
+
+    goto :goto_0
+
     :cond_1
     move-object v2, v1
 
+    :goto_0
     const-string v1, "suggest_intent_data"
 
     invoke-static {p1, v1}, Landroidx/appcompat/widget/SuggestionsAdapter;->getColumnString(Landroid/database/Cursor;Ljava/lang/String;)Ljava/lang/String;
@@ -828,7 +830,7 @@
 
     move-object v3, v0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_4
     invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
@@ -837,7 +839,7 @@
 
     move-object v3, v1
 
-    :goto_0
+    :goto_1
     const-string v1, "suggest_intent_query"
 
     invoke-static {p1, v1}, Landroidx/appcompat/widget/SuggestionsAdapter;->getColumnString(Landroid/database/Cursor;Ljava/lang/String;)Ljava/lang/String;
@@ -858,11 +860,11 @@
 
     invoke-direct/range {v1 .. v7}, Landroidx/appcompat/widget/SearchView;->createIntent(Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/Intent;
 
-    move-result-object p2
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p2
+    return-object p1
 
     :catch_0
     move-exception p2
@@ -874,12 +876,12 @@
     :try_end_1
     .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_1
 
-    goto :goto_1
+    goto :goto_2
 
     :catch_1
     const/4 p1, -0x1
 
-    :goto_1
+    :goto_2
     const-string p3, "SearchView"
 
     new-instance v1, Ljava/lang/StringBuilder;
@@ -938,11 +940,9 @@
 
     if-eqz v3, :cond_0
 
-    const-string v3, "app_data"
+    const-string v4, "app_data"
 
-    iget-object v4, p0, Landroidx/appcompat/widget/SearchView;->mAppSearchData:Landroid/os/Bundle;
-
-    invoke-virtual {v2, v3, v4}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     :cond_0
     new-instance v3, Landroid/content/Intent;
@@ -1121,39 +1121,35 @@
 
     const/4 v1, 0x1
 
-    aget v0, v0, v1
-
-    iget-object v2, p0, Landroidx/appcompat/widget/SearchView;->mTemp2:[I
-
-    aget v1, v2, v1
-
-    sub-int/2addr v0, v1
-
-    iget-object v1, p0, Landroidx/appcompat/widget/SearchView;->mTemp:[I
-
-    const/4 v2, 0x0
-
-    aget v1, v1, v2
+    aget v2, v0, v1
 
     iget-object v3, p0, Landroidx/appcompat/widget/SearchView;->mTemp2:[I
 
-    aget v2, v3, v2
+    aget v1, v3, v1
 
-    sub-int/2addr v1, v2
+    sub-int/2addr v2, v1
+
+    const/4 v1, 0x0
+
+    aget v0, v0, v1
+
+    aget v1, v3, v1
+
+    sub-int/2addr v0, v1
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
-    move-result v2
+    move-result v1
 
-    add-int/2addr v2, v1
+    add-int/2addr v1, v0
 
     invoke-virtual {p1}, Landroid/view/View;->getHeight()I
 
     move-result p1
 
-    add-int/2addr p1, v0
+    add-int/2addr p1, v2
 
-    invoke-virtual {p2, v1, v0, v2, p1}, Landroid/graphics/Rect;->set(IIII)V
+    invoke-virtual {p2, v0, v2, v1, p1}, Landroid/graphics/Rect;->set(IIII)V
 
     return-void
 .end method
@@ -1270,15 +1266,13 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mSearchable:Landroid/app/SearchableInfo;
+    if-eqz v0, :cond_3
 
     invoke-virtual {v0}, Landroid/app/SearchableInfo;->getVoiceSearchEnabled()Z
 
     move-result v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     const/4 v0, 0x0
 
@@ -1307,7 +1301,7 @@
 
     :cond_1
     :goto_0
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/SearchView;->getContext()Landroid/content/Context;
 
@@ -1331,6 +1325,9 @@
 
     :cond_2
     return v1
+
+    :cond_3
+    return v1
 .end method
 
 .method static isLandscapeMode(Landroid/content/Context;)Z
@@ -1708,8 +1705,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mSuggestionsAdapter:Landroidx/cursoradapter/widget/CursorAdapter;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroidx/cursoradapter/widget/CursorAdapter;->changeCursor(Landroid/database/Cursor;)V
@@ -2178,8 +2173,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mQueryHint:Ljava/lang/CharSequence;
-
     goto :goto_0
 
     :cond_0
@@ -2187,8 +2180,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mSearchable:Landroid/app/SearchableInfo;
-
     invoke-virtual {v0}, Landroid/app/SearchableInfo;->getHintId()I
 
     move-result v0
@@ -2400,8 +2391,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mOnCloseListener:Landroidx/appcompat/widget/SearchView$OnCloseListener;
-
     invoke-interface {v0}, Landroidx/appcompat/widget/SearchView$OnCloseListener;->onClose()Z
 
     move-result v0
@@ -2459,8 +2448,6 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Landroidx/appcompat/widget/SearchView;->mOnSuggestionListener:Landroidx/appcompat/widget/SearchView$OnSuggestionListener;
-
     invoke-interface {p2, p1}, Landroidx/appcompat/widget/SearchView$OnSuggestionListener;->onSuggestionClick(I)Z
 
     move-result p2
@@ -2496,8 +2483,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mOnSuggestionListener:Landroidx/appcompat/widget/SearchView$OnSuggestionListener;
-
     invoke-interface {v0, p1}, Landroidx/appcompat/widget/SearchView$OnSuggestionListener;->onSuggestionSelect(I)Z
 
     move-result v0
@@ -2572,8 +2557,6 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Landroidx/appcompat/widget/SearchView;->mTouchDelegate:Landroidx/appcompat/widget/SearchView$UpdatableTouchDelegate;
-
     iget-object p2, p0, Landroidx/appcompat/widget/SearchView;->mSearchSrtTextViewBoundsExpanded:Landroid/graphics/Rect;
 
     iget-object p3, p0, Landroidx/appcompat/widget/SearchView;->mSearchSrcTextViewBounds:Landroid/graphics/Rect;
@@ -2616,13 +2599,17 @@
 
     if-eq v0, v2, :cond_1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     iget v0, p0, Landroidx/appcompat/widget/SearchView;->mMaxWidth:I
 
     if-lez v0, :cond_6
 
+    invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
+
+    move-result p1
+
     goto :goto_0
 
     :cond_2
@@ -2630,41 +2617,37 @@
 
     if-lez p1, :cond_3
 
-    iget p1, p0, Landroidx/appcompat/widget/SearchView;->mMaxWidth:I
-
-    goto :goto_2
+    goto :goto_0
 
     :cond_3
     invoke-direct {p0}, Landroidx/appcompat/widget/SearchView;->getPreferredWidth()I
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_4
     iget v0, p0, Landroidx/appcompat/widget/SearchView;->mMaxWidth:I
 
     if-lez v0, :cond_5
 
-    :goto_0
-    iget v0, p0, Landroidx/appcompat/widget/SearchView;->mMaxWidth:I
-
-    :goto_1
     invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_5
     invoke-direct {p0}, Landroidx/appcompat/widget/SearchView;->getPreferredWidth()I
 
     move-result v0
 
-    goto :goto_1
+    invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
+
+    move-result p1
 
     :cond_6
-    :goto_2
+    :goto_0
     invoke-static {p2}, Landroid/view/View$MeasureSpec;->getMode(I)I
 
     move-result v0
@@ -2677,14 +2660,14 @@
 
     if-eqz v0, :cond_7
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_7
     invoke-direct {p0}, Landroidx/appcompat/widget/SearchView;->getPreferredHeight()I
 
     move-result p2
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_8
     invoke-direct {p0}, Landroidx/appcompat/widget/SearchView;->getPreferredHeight()I
@@ -2695,7 +2678,7 @@
 
     move-result p2
 
-    :goto_3
+    :goto_1
     invoke-static {p1, v2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result p1
@@ -2787,8 +2770,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mOnSearchClickListener:Landroid/view/View$OnClickListener;
-
     invoke-interface {v0, p0}, Landroid/view/View$OnClickListener;->onClick(Landroid/view/View;)V
 
     :cond_0
@@ -2816,8 +2797,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SearchView;->mOnQueryChangeListener:Landroidx/appcompat/widget/SearchView$OnQueryTextListener;
-
     invoke-interface {v0}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
     move-result-object v2
@@ -3083,8 +3062,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mSearchable:Landroid/app/SearchableInfo;
-
     :try_start_0
     invoke-virtual {v0}, Landroid/app/SearchableInfo;->getVoiceSearchLaunchWebSearch()Z
 
@@ -3326,9 +3303,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mSearchSrcTextView:Landroidx/appcompat/widget/SearchView$SearchAutoComplete;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SearchView;->mSearchSrcTextView:Landroidx/appcompat/widget/SearchView$SearchAutoComplete;
-
-    invoke-virtual {v1}, Landroidx/appcompat/widget/SearchView$SearchAutoComplete;->length()I
+    invoke-virtual {v0}, Landroidx/appcompat/widget/SearchView$SearchAutoComplete;->length()I
 
     move-result v1
 
@@ -3366,17 +3341,15 @@
 .end method
 
 .method public setQueryRefinementEnabled(Z)V
-    .locals 1
+    .locals 2
 
     iput-boolean p1, p0, Landroidx/appcompat/widget/SearchView;->mQueryRefinement:Z
 
     iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mSuggestionsAdapter:Landroidx/cursoradapter/widget/CursorAdapter;
 
-    instance-of v0, v0, Landroidx/appcompat/widget/SuggestionsAdapter;
+    instance-of v1, v0, Landroidx/appcompat/widget/SuggestionsAdapter;
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Landroidx/appcompat/widget/SearchView;->mSuggestionsAdapter:Landroidx/cursoradapter/widget/CursorAdapter;
+    if-eqz v1, :cond_1
 
     check-cast v0, Landroidx/appcompat/widget/SuggestionsAdapter;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$OnShareTargetSelectedListener.smali b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$OnShareTargetSelectedListener.smali
index 66d0f434a7..6819c453a7 100644
--- a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$OnShareTargetSelectedListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$OnShareTargetSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ShareActionProvider$OnShareTargetSelectedListener;
 .super Ljava/lang/Object;
+.source "ShareActionProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareActivityChooserModelPolicy.smali b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareActivityChooserModelPolicy.smali
index 92b25bc064..5ccc42756e 100644
--- a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareActivityChooserModelPolicy.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareActivityChooserModelPolicy.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ShareActionProvider$ShareActivityChooserModelPolicy;
 .super Ljava/lang/Object;
+.source "ShareActionProvider.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/ActivityChooserModel$OnChooseActivityListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener.smali b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener.smali
index 9d158cbe3c..eb98aae4d8 100644
--- a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener;
 .super Ljava/lang/Object;
+.source "ShareActionProvider.java"
 
 # interfaces
 .implements Landroid/view/MenuItem$OnMenuItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider.smali b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider.smali
index 599c0a8f91..d3a0710f2c 100644
--- a/com.discord/smali/androidx/appcompat/widget/ShareActionProvider.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ShareActionProvider.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ShareActionProvider;
 .super Landroidx/core/view/ActionProvider;
+.source "ShareActionProvider.java"
 
 
 # annotations
@@ -357,7 +358,6 @@
 
     const/high16 v0, 0x8080000
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
 
     return-void
@@ -365,5 +365,7 @@
     :cond_0
     const/high16 v0, 0x80000
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter$ChildViewCache.smali b/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter$ChildViewCache.smali
index 8940e33d3e..27d9d96546 100644
--- a/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter$ChildViewCache.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter$ChildViewCache.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/widget/SuggestionsAdapter$ChildViewCache;
 .super Ljava/lang/Object;
+.source "SuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali b/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali
index 47d10b159b..02da9cf331 100644
--- a/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/SuggestionsAdapter;
 .super Landroidx/cursoradapter/widget/ResourceCursorAdapter;
+.source "SuggestionsAdapter.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -306,7 +307,6 @@
 
     move-result-object p1
 
-    :goto_0
     invoke-static {v0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return-object v2
@@ -323,7 +323,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-static {v0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v2
 .end method
 
 .method private getActivityIconWithCache(Landroid/content/ComponentName;)Landroid/graphics/drawable/Drawable;
@@ -458,12 +460,12 @@
     :try_start_1
     invoke-virtual {p0, p1}, Landroidx/appcompat/widget/SuggestionsAdapter;->getDrawableFromResourceUri(Landroid/net/Uri;)Landroid/graphics/drawable/Drawable;
 
-    move-result-object v1
+    move-result-object p1
     :try_end_1
     .catch Landroid/content/res/Resources$NotFoundException; {:try_start_1 .. :try_end_1} :catch_0
     .catch Ljava/io/FileNotFoundException; {:try_start_1 .. :try_end_1} :catch_3
 
-    return-object v1
+    return-object p1
 
     :catch_0
     :try_start_2
@@ -733,6 +735,8 @@
 
     invoke-direct {p0, p1, v0}, Landroidx/appcompat/widget/SuggestionsAdapter;->storeInIconCache(Ljava/lang/String;Landroid/graphics/drawable/Drawable;)V
 
+    return-object v0
+
     :cond_3
     :goto_0
     return-object v0
@@ -752,8 +756,6 @@
     return-object p1
 
     :cond_0
-    iget v0, p0, Landroidx/appcompat/widget/SuggestionsAdapter;->mIconName1Col:I
-
     invoke-interface {p1, v0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v0
@@ -788,8 +790,6 @@
     return-object p1
 
     :cond_0
-    iget v0, p0, Landroidx/appcompat/widget/SuggestionsAdapter;->mIconName2Col:I
-
     invoke-interface {p1, v0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object p1
@@ -872,7 +872,6 @@
 
     const/16 p2, 0x8
 
-    :goto_0
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setVisibility(I)V
 
     return-void
@@ -880,7 +879,9 @@
     :cond_0
     const/4 p2, 0x0
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Landroid/widget/TextView;->setVisibility(I)V
+
+    return-void
 .end method
 
 .method private storeInIconCache(Ljava/lang/String;Landroid/graphics/drawable/Drawable;)V
@@ -925,6 +926,8 @@
 
     if-eqz p1, :cond_1
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -948,8 +951,6 @@
 
     if-eq p2, v1, :cond_0
 
-    iget p2, p0, Landroidx/appcompat/widget/SuggestionsAdapter;->mFlagsCol:I
-
     invoke-interface {p3, p2}, Landroid/database/Cursor;->getInt(I)I
 
     move-result p2
@@ -1079,8 +1080,6 @@
 
     if-eq p3, v2, :cond_9
 
-    iget p3, p0, Landroidx/appcompat/widget/SuggestionsAdapter;->mQueryRefinement:I
-
     if-ne p3, v3, :cond_8
 
     and-int/2addr p2, v3
@@ -1610,17 +1609,16 @@
 
     aput-object p2, v0, p1
 
-    :goto_0
     move-object v7, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-virtual {v1, p2}, Landroid/net/Uri$Builder;->appendPath(Ljava/lang/String;)Landroid/net/Uri$Builder;
 
-    goto :goto_0
+    move-object v7, v0
 
-    :goto_1
+    :goto_0
     if-lez p3, :cond_4
 
     const-string p1, "limit"
@@ -1810,7 +1808,7 @@
 
     const/4 v1, 0x0
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_3
 
     iget-object v0, p0, Landroidx/appcompat/widget/SuggestionsAdapter;->mSearchView:Landroidx/appcompat/widget/SearchView;
 
@@ -1850,6 +1848,9 @@
     invoke-static {v0, v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_2
+    return-object v1
+
+    :cond_3
     :goto_1
     return-object v1
 .end method
diff --git a/com.discord/smali/androidx/appcompat/widget/SwitchCompat$1.smali b/com.discord/smali/androidx/appcompat/widget/SwitchCompat$1.smali
index aafb0e2e14..8be2dccd59 100644
--- a/com.discord/smali/androidx/appcompat/widget/SwitchCompat$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SwitchCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/widget/SwitchCompat$1;
 .super Landroid/util/Property;
+.source "SwitchCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/SwitchCompat.smali b/com.discord/smali/androidx/appcompat/widget/SwitchCompat.smali
index ad12ef5d43..25df8fa7f0 100644
--- a/com.discord/smali/androidx/appcompat/widget/SwitchCompat.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SwitchCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/SwitchCompat;
 .super Landroid/widget/CompoundButton;
+.source "SwitchCompat.java"
 
 
 # static fields
@@ -237,8 +238,6 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p3, p0}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
     :cond_0
@@ -254,8 +253,6 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p3, p0}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
     :cond_1
@@ -637,8 +634,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mPositionAnimator:Landroid/animation/ObjectAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ObjectAnimator;->cancel()V
 
     :cond_0
@@ -749,26 +744,22 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mTempRect:Landroid/graphics/Rect;
+    iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mTempRect:Landroid/graphics/Rect;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
+    invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
-    invoke-virtual {v1, v0}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
+    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
+    if-eqz v0, :cond_0
 
-    if-eqz v1, :cond_0
+    invoke-static {v0}, Landroidx/appcompat/widget/DrawableUtils;->getOpticalBounds(Landroid/graphics/drawable/Drawable;)Landroid/graphics/Rect;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
-    invoke-static {v1}, Landroidx/appcompat/widget/DrawableUtils;->getOpticalBounds(Landroid/graphics/drawable/Drawable;)Landroid/graphics/Rect;
-
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Landroidx/appcompat/widget/DrawableUtils;->INSETS_NONE:Landroid/graphics/Rect;
+    sget-object v0, Landroidx/appcompat/widget/DrawableUtils;->INSETS_NONE:Landroid/graphics/Rect;
 
     :goto_0
     iget v2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchWidth:I
@@ -777,22 +768,22 @@
 
     sub-int/2addr v2, v3
 
-    iget v3, v0, Landroid/graphics/Rect;->left:I
+    iget v3, v1, Landroid/graphics/Rect;->left:I
 
     sub-int/2addr v2, v3
 
+    iget v1, v1, Landroid/graphics/Rect;->right:I
+
+    sub-int/2addr v2, v1
+
+    iget v1, v0, Landroid/graphics/Rect;->left:I
+
+    sub-int/2addr v2, v1
+
     iget v0, v0, Landroid/graphics/Rect;->right:I
 
     sub-int/2addr v2, v0
 
-    iget v0, v1, Landroid/graphics/Rect;->left:I
-
-    sub-int/2addr v2, v0
-
-    iget v0, v1, Landroid/graphics/Rect;->right:I
-
-    sub-int/2addr v2, v0
-
     return v2
 
     :cond_1
@@ -829,41 +820,37 @@
 
     sub-int/2addr v2, v3
 
-    iget v3, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchLeft:I
+    iget v4, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchLeft:I
 
-    add-int/2addr v3, v0
+    add-int/2addr v4, v0
 
-    iget v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mTouchSlop:I
-
-    sub-int/2addr v3, v0
+    sub-int/2addr v4, v3
 
     iget v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbWidth:I
 
+    add-int/2addr v0, v4
+
+    iget-object v3, p0, Landroidx/appcompat/widget/SwitchCompat;->mTempRect:Landroid/graphics/Rect;
+
+    iget v3, v3, Landroid/graphics/Rect;->left:I
+
     add-int/2addr v0, v3
 
-    iget-object v4, p0, Landroidx/appcompat/widget/SwitchCompat;->mTempRect:Landroid/graphics/Rect;
+    iget-object v3, p0, Landroidx/appcompat/widget/SwitchCompat;->mTempRect:Landroid/graphics/Rect;
 
-    iget v4, v4, Landroid/graphics/Rect;->left:I
+    iget v3, v3, Landroid/graphics/Rect;->right:I
 
-    add-int/2addr v0, v4
+    add-int/2addr v0, v3
 
-    iget-object v4, p0, Landroidx/appcompat/widget/SwitchCompat;->mTempRect:Landroid/graphics/Rect;
+    iget v3, p0, Landroidx/appcompat/widget/SwitchCompat;->mTouchSlop:I
 
-    iget v4, v4, Landroid/graphics/Rect;->right:I
+    add-int/2addr v0, v3
 
-    add-int/2addr v0, v4
+    iget v5, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchBottom:I
 
-    iget v4, p0, Landroidx/appcompat/widget/SwitchCompat;->mTouchSlop:I
+    add-int/2addr v5, v3
 
-    add-int/2addr v0, v4
-
-    iget v4, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchBottom:I
-
-    iget v5, p0, Landroidx/appcompat/widget/SwitchCompat;->mTouchSlop:I
-
-    add-int/2addr v4, v5
-
-    int-to-float v3, v3
+    int-to-float v3, v4
 
     cmpl-float v3, p1, v3
 
@@ -881,7 +868,7 @@
 
     if-lez p1, :cond_1
 
-    int-to-float p1, v4
+    int-to-float p1, v5
 
     cmpg-float p1, p2, p1
 
@@ -902,8 +889,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchTransformationMethod:Landroid/text/method/TransformationMethod;
-
     invoke-interface {v0, p1, p0}, Landroid/text/method/TransformationMethod;->getTransformation(Ljava/lang/CharSequence;Landroid/view/View;)Ljava/lang/CharSequence;
 
     move-result-object p1
@@ -917,9 +902,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mTextPaint:Landroid/text/TextPaint;
-
-    invoke-static {v1, v0}, Landroid/text/Layout;->getDesiredWidth(Ljava/lang/CharSequence;Landroid/text/TextPaint;)F
+    invoke-static {v1, v2}, Landroid/text/Layout;->getDesiredWidth(Ljava/lang/CharSequence;Landroid/text/TextPaint;)F
 
     move-result v0
 
@@ -1058,23 +1041,23 @@
 
     const/4 v5, 0x0
 
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_1
 
     cmpg-float v1, v1, v5
 
-    if-gez v1, :cond_1
+    if-gez v1, :cond_2
 
     goto :goto_1
 
     :cond_1
-    const/4 v2, 0x0
+    cmpl-float v1, v1, v5
+
+    if-lez v1, :cond_2
 
     goto :goto_1
 
     :cond_2
-    cmpl-float v1, v1, v5
-
-    if-lez v1, :cond_1
+    const/4 v2, 0x0
 
     :goto_1
     move v1, v2
@@ -1129,8 +1112,6 @@
 
     if-eqz v6, :cond_0
 
-    iget-object v6, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v6}, Landroidx/appcompat/widget/DrawableUtils;->getOpticalBounds(Landroid/graphics/drawable/Drawable;)Landroid/graphics/Rect;
 
     move-result-object v6
@@ -1145,15 +1126,13 @@
 
     if-eqz v7, :cond_6
 
-    iget-object v7, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v7, v0}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     iget v7, v0, Landroid/graphics/Rect;->left:I
 
     add-int/2addr v5, v7
 
-    if-eqz v6, :cond_4
+    if-eqz v6, :cond_5
 
     iget v7, v6, Landroid/graphics/Rect;->left:I
 
@@ -1209,7 +1188,7 @@
 
     iget v9, v0, Landroid/graphics/Rect;->bottom:I
 
-    if-le v8, v9, :cond_5
+    if-le v8, v9, :cond_4
 
     iget v6, v6, Landroid/graphics/Rect;->bottom:I
 
@@ -1222,9 +1201,13 @@
     goto :goto_2
 
     :cond_4
-    move v7, v2
+    move v6, v4
+
+    goto :goto_2
 
     :cond_5
+    move v7, v2
+
     move v6, v4
 
     :goto_2
@@ -1237,8 +1220,6 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, v0}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     iget v1, v0, Landroid/graphics/Rect;->left:I
@@ -1287,8 +1268,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0, p1, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setHotspot(Landroid/graphics/drawable/Drawable;FF)V
 
     :cond_1
@@ -1296,8 +1275,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0, p1, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setHotspot(Landroid/graphics/drawable/Drawable;FF)V
 
     :cond_2
@@ -1562,8 +1539,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     :cond_0
@@ -1571,8 +1546,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     :cond_1
@@ -1580,8 +1553,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mPositionAnimator:Landroid/animation/ObjectAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ObjectAnimator;->isStarted()Z
 
     move-result v0
@@ -1738,17 +1709,15 @@
 
     if-eqz v6, :cond_5
 
-    iget-object v6, p0, Landroidx/appcompat/widget/SwitchCompat;->mTextPaint:Landroid/text/TextPaint;
-
-    iget-object v7, p0, Landroidx/appcompat/widget/SwitchCompat;->mTextColors:Landroid/content/res/ColorStateList;
+    iget-object v7, p0, Landroidx/appcompat/widget/SwitchCompat;->mTextPaint:Landroid/text/TextPaint;
 
     const/4 v8, 0x0
 
-    invoke-virtual {v7, v5, v8}, Landroid/content/res/ColorStateList;->getColorForState([II)I
+    invoke-virtual {v6, v5, v8}, Landroid/content/res/ColorStateList;->getColorForState([II)I
 
-    move-result v7
+    move-result v6
 
-    invoke-virtual {v6, v7}, Landroid/text/TextPaint;->setColor(I)V
+    invoke-virtual {v7, v6}, Landroid/text/TextPaint;->setColor(I)V
 
     :cond_5
     iget-object v6, p0, Landroidx/appcompat/widget/SwitchCompat;->mTextPaint:Landroid/text/TextPaint;
@@ -1902,8 +1871,6 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p3, p1}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     goto :goto_0
@@ -1938,137 +1905,132 @@
 
     move-result p2
 
-    move p1, p2
-
-    move p2, p4
-
     goto :goto_1
 
     :cond_1
-    const/4 p1, 0x0
+    const/4 p4, 0x0
 
     :goto_1
     invoke-static {p0}, Landroidx/appcompat/widget/ViewUtils;->isLayoutRtl(Landroid/view/View;)Z
 
-    move-result p3
+    move-result p1
 
-    if-eqz p3, :cond_2
+    if-eqz p1, :cond_2
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getPaddingLeft()I
 
-    move-result p3
+    move-result p1
 
-    add-int/2addr p3, p2
+    add-int/2addr p1, p4
 
-    iget p4, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchWidth:I
+    iget p3, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchWidth:I
 
-    add-int/2addr p4, p3
+    add-int/2addr p3, p1
 
-    sub-int/2addr p4, p2
+    sub-int/2addr p3, p4
 
-    sub-int/2addr p4, p1
+    sub-int/2addr p3, p2
 
     goto :goto_2
 
     :cond_2
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getWidth()I
 
-    move-result p3
+    move-result p1
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getPaddingRight()I
 
-    move-result p4
+    move-result p3
 
-    sub-int/2addr p3, p4
+    sub-int/2addr p1, p3
 
-    sub-int p4, p3, p1
+    sub-int p3, p1, p2
 
-    iget p3, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchWidth:I
+    iget p1, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchWidth:I
 
-    sub-int p3, p4, p3
+    sub-int p1, p3, p1
 
-    add-int/2addr p3, p2
+    add-int/2addr p1, p4
 
-    add-int/2addr p3, p1
+    add-int/2addr p1, p2
 
     :goto_2
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getGravity()I
 
-    move-result p1
+    move-result p2
 
-    and-int/lit8 p1, p1, 0x70
+    and-int/lit8 p2, p2, 0x70
 
-    const/16 p2, 0x10
+    const/16 p4, 0x10
 
-    if-eq p1, p2, :cond_4
+    if-eq p2, p4, :cond_4
 
-    const/16 p2, 0x50
+    const/16 p4, 0x50
 
-    if-eq p1, p2, :cond_3
+    if-eq p2, p4, :cond_3
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getPaddingTop()I
 
-    move-result p1
+    move-result p2
 
-    :goto_3
-    iget p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchHeight:I
+    iget p4, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchHeight:I
 
-    add-int/2addr p2, p1
+    add-int/2addr p4, p2
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getHeight()I
 
-    move-result p1
+    move-result p2
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getPaddingBottom()I
 
-    move-result p2
+    move-result p4
 
-    sub-int p2, p1, p2
+    sub-int p4, p2, p4
 
-    iget p1, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchHeight:I
+    iget p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchHeight:I
 
-    sub-int p1, p2, p1
+    sub-int p2, p4, p2
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getPaddingTop()I
 
-    move-result p1
+    move-result p2
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getHeight()I
 
-    move-result p2
+    move-result p4
 
-    add-int/2addr p1, p2
+    add-int/2addr p2, p4
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getPaddingBottom()I
 
-    move-result p2
+    move-result p4
 
-    sub-int/2addr p1, p2
-
-    div-int/lit8 p1, p1, 0x2
-
-    iget p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchHeight:I
+    sub-int/2addr p2, p4
 
     div-int/lit8 p2, p2, 0x2
 
-    sub-int/2addr p1, p2
+    iget p4, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchHeight:I
 
-    goto :goto_3
+    div-int/lit8 p5, p4, 0x2
 
-    :goto_4
-    iput p3, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchLeft:I
+    sub-int/2addr p2, p5
 
-    iput p1, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchTop:I
+    add-int/2addr p4, p2
 
-    iput p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchBottom:I
+    :goto_3
+    iput p1, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchLeft:I
 
-    iput p4, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchRight:I
+    iput p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchTop:I
+
+    iput p4, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchBottom:I
+
+    iput p3, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchRight:I
 
     return-void
 .end method
@@ -2114,8 +2076,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, v0}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
@@ -2188,8 +2148,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1, v0}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     iget-object v1, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
@@ -2212,8 +2170,6 @@
 
     if-eqz v4, :cond_5
 
-    iget-object v4, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v4}, Landroidx/appcompat/widget/DrawableUtils;->getOpticalBounds(Landroid/graphics/drawable/Drawable;)Landroid/graphics/Rect;
 
     move-result-object v4
@@ -2643,19 +2599,18 @@
 
     if-eqz p2, :cond_0
 
-    :goto_0
     iput-object p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mTextColors:Landroid/content/res/ColorStateList;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Landroidx/appcompat/widget/SwitchCompat;->getTextColors()Landroid/content/res/ColorStateList;
 
     move-result-object p2
 
-    goto :goto_0
+    iput-object p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mTextColors:Landroid/content/res/ColorStateList;
 
-    :goto_1
+    :goto_0
     sget p2, Landroidx/appcompat/R$styleable;->TextAppearance_android_textSize:I
 
     const/4 v0, 0x0
@@ -2717,17 +2672,16 @@
 
     invoke-direct {p2, v0}, Landroidx/appcompat/text/AllCapsTransformationMethod;-><init>(Landroid/content/Context;)V
 
-    :goto_2
     iput-object p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchTransformationMethod:Landroid/text/method/TransformationMethod;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_2
     const/4 p2, 0x0
 
-    goto :goto_2
+    iput-object p2, p0, Landroidx/appcompat/widget/SwitchCompat;->mSwitchTransformationMethod:Landroid/text/method/TransformationMethod;
 
-    :goto_3
+    :goto_1
     invoke-virtual {p1}, Landroidx/appcompat/widget/TintTypedArray;->recycle()V
 
     return-void
@@ -2886,8 +2840,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
@@ -2984,8 +2936,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
diff --git a/com.discord/smali/androidx/appcompat/widget/ThemeUtils.smali b/com.discord/smali/androidx/appcompat/widget/ThemeUtils.smali
index 420523d447..b55146ab72 100644
--- a/com.discord/smali/androidx/appcompat/widget/ThemeUtils.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ThemeUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ThemeUtils;
 .super Ljava/lang/Object;
+.source "ThemeUtils.java"
 
 
 # static fields
@@ -221,11 +222,9 @@
 
     aput p1, v0, v1
 
-    sget-object p1, Landroidx/appcompat/widget/ThemeUtils;->TEMP_ARRAY:[I
+    const/4 p1, 0x0
 
-    const/4 v0, 0x0
-
-    invoke-static {p0, v0, p1}, Landroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroidx/appcompat/widget/TintTypedArray;
+    invoke-static {p0, p1, v0}, Landroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroidx/appcompat/widget/TintTypedArray;
 
     move-result-object p0
 
@@ -283,11 +282,9 @@
 
     aput p1, v0, v1
 
-    sget-object p1, Landroidx/appcompat/widget/ThemeUtils;->TEMP_ARRAY:[I
+    const/4 p1, 0x0
 
-    const/4 v0, 0x0
-
-    invoke-static {p0, v0, p1}, Landroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroidx/appcompat/widget/TintTypedArray;
+    invoke-static {p0, p1, v0}, Landroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroidx/appcompat/widget/TintTypedArray;
 
     move-result-object p0
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter$Helper.smali b/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter$Helper.smali
index 7fe27c4096..d553908843 100644
--- a/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter$Helper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter$Helper.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/widget/ThemedSpinnerAdapter$Helper;
 .super Ljava/lang/Object;
+.source "ThemedSpinnerAdapter.java"
 
 
 # annotations
@@ -53,8 +54,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ThemedSpinnerAdapter$Helper;->mDropDownInflater:Landroid/view/LayoutInflater;
-
     return-object v0
 
     :cond_0
@@ -77,8 +76,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/ThemedSpinnerAdapter$Helper;->mDropDownInflater:Landroid/view/LayoutInflater;
-
     invoke-virtual {v0}, Landroid/view/LayoutInflater;->getContext()Landroid/content/Context;
 
     move-result-object v0
@@ -101,7 +98,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     iput-object p1, p0, Landroidx/appcompat/widget/ThemedSpinnerAdapter$Helper;->mDropDownInflater:Landroid/view/LayoutInflater;
 
     return-void
@@ -117,7 +113,9 @@
 
     iget-object p1, p0, Landroidx/appcompat/widget/ThemedSpinnerAdapter$Helper;->mInflater:Landroid/view/LayoutInflater;
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/appcompat/widget/ThemedSpinnerAdapter$Helper;->mDropDownInflater:Landroid/view/LayoutInflater;
+
+    return-void
 
     :cond_1
     new-instance v0, Landroidx/appcompat/view/ContextThemeWrapper;
@@ -130,5 +128,7 @@
 
     move-result-object p1
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/appcompat/widget/ThemedSpinnerAdapter$Helper;->mDropDownInflater:Landroid/view/LayoutInflater;
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter.smali b/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter.smali
index e91714e24a..91d436962f 100644
--- a/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ThemedSpinnerAdapter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ThemedSpinnerAdapter;
 .super Ljava/lang/Object;
+.source "ThemedSpinnerAdapter.java"
 
 # interfaces
 .implements Landroid/widget/SpinnerAdapter;
diff --git a/com.discord/smali/androidx/appcompat/widget/TintContextWrapper.smali b/com.discord/smali/androidx/appcompat/widget/TintContextWrapper.smali
index 0ad055cc6a..2a81f4ea6b 100644
--- a/com.discord/smali/androidx/appcompat/widget/TintContextWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TintContextWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/TintContextWrapper;
 .super Landroid/content/ContextWrapper;
+.source "TintContextWrapper.java"
 
 
 # annotations
@@ -348,11 +349,7 @@
 
     move-result-object v0
 
-    return-object v0
-
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/TintContextWrapper;->mTheme:Landroid/content/res/Resources$Theme;
-
     return-object v0
 .end method
 
@@ -368,8 +365,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/TintContextWrapper;->mTheme:Landroid/content/res/Resources$Theme;
-
     const/4 v1, 0x1
 
     invoke-virtual {v0, p1, v1}, Landroid/content/res/Resources$Theme;->applyStyle(IZ)V
diff --git a/com.discord/smali/androidx/appcompat/widget/TintInfo.smali b/com.discord/smali/androidx/appcompat/widget/TintInfo.smali
index 3560ff1765..9ae4d2e5df 100644
--- a/com.discord/smali/androidx/appcompat/widget/TintInfo.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TintInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/TintInfo;
 .super Ljava/lang/Object;
+.source "TintInfo.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/appcompat/widget/TintResources.smali b/com.discord/smali/androidx/appcompat/widget/TintResources.smali
index fe098d2b5d..514cf4b671 100644
--- a/com.discord/smali/androidx/appcompat/widget/TintResources.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TintResources.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/TintResources;
 .super Landroidx/appcompat/widget/ResourcesWrapper;
+.source "TintResources.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/appcompat/widget/TintTypedArray.smali b/com.discord/smali/androidx/appcompat/widget/TintTypedArray.smali
index 6c29f7dbb5..b1eba7a85e 100644
--- a/com.discord/smali/androidx/appcompat/widget/TintTypedArray.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TintTypedArray.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/TintTypedArray;
 .super Ljava/lang/Object;
+.source "TintTypedArray.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$1.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$1.smali
index 5207045a32..a7091ee0e3 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/Toolbar$1;
 .super Ljava/lang/Object;
+.source "Toolbar.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$2.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$2.smali
index 12e6f7bca1..7a4027b2e7 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/Toolbar$2;
 .super Ljava/lang/Object;
+.source "Toolbar.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$3.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$3.smali
index 8fc4efb140..8b9edc8fb3 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$3.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/Toolbar$3;
 .super Ljava/lang/Object;
+.source "Toolbar.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter.smali
index 6e0ae4faab..abfff7be69 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;
 .super Ljava/lang/Object;
+.source "Toolbar.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter;
@@ -59,17 +60,13 @@
     :cond_0
     iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
-
-    iget-object v0, v0, Landroidx/appcompat/widget/Toolbar;->mExpandedActionView:Landroid/view/View;
+    iget-object v0, p1, Landroidx/appcompat/widget/Toolbar;->mExpandedActionView:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
 
     iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
-
-    iget-object v0, v0, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
+    iget-object v0, p1, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
 
@@ -79,8 +76,6 @@
 
     iput-object v0, p1, Landroidx/appcompat/widget/Toolbar;->mExpandedActionView:Landroid/view/View;
 
-    iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
-
     invoke-virtual {p1}, Landroidx/appcompat/widget/Toolbar;->addChildrenForExpandedActionView()V
 
     iput-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mCurrentExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
@@ -117,14 +112,12 @@
 
     if-eq p1, v0, :cond_1
 
-    instance-of v0, p1, Landroid/view/ViewGroup;
+    instance-of v1, p1, Landroid/view/ViewGroup;
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
-
     iget-object v0, v0, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
@@ -132,9 +125,7 @@
     :cond_0
     iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
-
-    iget-object v0, v0, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
+    iget-object v0, p1, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;)V
 
@@ -161,14 +152,12 @@
 
     if-eq p1, v0, :cond_3
 
-    instance-of v0, p1, Landroid/view/ViewGroup;
+    instance-of v1, p1, Landroid/view/ViewGroup;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
-
     iget-object v0, v0, Landroidx/appcompat/widget/Toolbar;->mExpandedActionView:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
@@ -204,9 +193,7 @@
 
     iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroidx/appcompat/widget/Toolbar;
-
-    iget-object v0, v0, Landroidx/appcompat/widget/Toolbar;->mExpandedActionView:Landroid/view/View;
+    iget-object v0, p1, Landroidx/appcompat/widget/Toolbar;->mExpandedActionView:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;)V
 
@@ -274,14 +261,10 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mCurrentExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     iget-object v0, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mCurrentExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
 
+    if-eqz v0, :cond_0
+
     invoke-virtual {p1, v0}, Landroidx/appcompat/view/menu/MenuBuilder;->collapseItemActionView(Landroidx/appcompat/view/menu/MenuItemImpl;)Z
 
     :cond_0
@@ -337,8 +320,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mMenu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuBuilder;->size()I
 
     move-result p1
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$LayoutParams.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$LayoutParams.smali
index e0f6a5ca0e..f05b2916c4 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$LayoutParams.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/Toolbar$LayoutParams;
 .super Landroidx/appcompat/app/ActionBar$LayoutParams;
+.source "Toolbar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$OnMenuItemClickListener.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$OnMenuItemClickListener.smali
index d7ea252080..36051344ff 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$OnMenuItemClickListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$OnMenuItemClickListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;
 .super Ljava/lang/Object;
+.source "Toolbar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState$1.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState$1.smali
index 28f350bbe5..2b07b3667e 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/appcompat/widget/Toolbar$SavedState$1;
 .super Ljava/lang/Object;
+.source "Toolbar.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState.smali
index 8289bb2fd6..fd2a5e68b6 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/Toolbar$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "Toolbar.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/Toolbar.smali b/com.discord/smali/androidx/appcompat/widget/Toolbar.smali
index 8a45eb6cb1..df0c7502a0 100644
--- a/com.discord/smali/androidx/appcompat/widget/Toolbar.smali
+++ b/com.discord/smali/androidx/appcompat/widget/Toolbar.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/Toolbar;
 .super Landroid/view/ViewGroup;
+.source "Toolbar.java"
 
 
 # annotations
@@ -1092,6 +1093,8 @@
 
     and-int/lit8 p1, p1, 0x70
 
+    return p1
+
     :cond_0
     return p1
 .end method
@@ -1173,11 +1176,13 @@
 
     move-result v2
 
-    move v3, p2
+    move v4, p2
+
+    move v3, v1
 
     const/4 p2, 0x0
 
-    const/4 v4, 0x0
+    const/4 v1, 0x0
 
     :goto_0
     if-ge p2, v2, :cond_0
@@ -1196,17 +1201,17 @@
 
     iget v7, v6, Landroidx/appcompat/widget/Toolbar$LayoutParams;->leftMargin:I
 
-    sub-int/2addr v7, v1
+    sub-int/2addr v7, v3
 
-    iget v1, v6, Landroidx/appcompat/widget/Toolbar$LayoutParams;->rightMargin:I
+    iget v3, v6, Landroidx/appcompat/widget/Toolbar$LayoutParams;->rightMargin:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v3, v4
 
     invoke-static {v0, v7}, Ljava/lang/Math;->max(II)I
 
-    move-result v3
+    move-result v4
 
-    invoke-static {v0, v1}, Ljava/lang/Math;->max(II)I
+    invoke-static {v0, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v6
 
@@ -1216,32 +1221,32 @@
 
     move-result v7
 
-    neg-int v1, v1
+    neg-int v3, v3
 
-    invoke-static {v0, v1}, Ljava/lang/Math;->max(II)I
+    invoke-static {v0, v3}, Ljava/lang/Math;->max(II)I
 
-    move-result v1
+    move-result v3
 
     invoke-virtual {v5}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v5
 
-    add-int/2addr v3, v5
+    add-int/2addr v4, v5
 
-    add-int/2addr v3, v6
+    add-int/2addr v4, v6
 
-    add-int/2addr v4, v3
+    add-int/2addr v1, v4
 
     add-int/lit8 p2, p2, 0x1
 
-    move v3, v1
+    move v4, v3
 
-    move v1, v7
+    move v3, v7
 
     goto :goto_0
 
     :cond_0
-    return v4
+    return v1
 .end method
 
 .method private isChildOrHidden(Landroid/view/View;)Z
@@ -1771,8 +1776,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->isOverflowReserved()Z
 
     move-result v0
@@ -1824,8 +1827,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mExpandedMenuPresenter:Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;
-
     iget-object v0, v0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mCurrentExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     :goto_0
@@ -1844,8 +1845,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->dismissPopupMenus()V
 
     :cond_0
@@ -2031,8 +2030,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mContentInsets:Landroidx/appcompat/widget/RtlSpacingHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/RtlSpacingHelper;->getEnd()I
 
     move-result v0
@@ -2054,8 +2051,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/widget/Toolbar;->mContentInsetEndWithActions:I
-
     return v0
 
     :cond_0
@@ -2073,8 +2068,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mContentInsets:Landroidx/appcompat/widget/RtlSpacingHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/RtlSpacingHelper;->getLeft()I
 
     move-result v0
@@ -2094,8 +2087,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mContentInsets:Landroidx/appcompat/widget/RtlSpacingHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/RtlSpacingHelper;->getRight()I
 
     move-result v0
@@ -2115,8 +2106,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mContentInsets:Landroidx/appcompat/widget/RtlSpacingHelper;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/RtlSpacingHelper;->getStart()I
 
     move-result v0
@@ -2138,8 +2127,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/widget/Toolbar;->mContentInsetStartWithNavigation:I
-
     return v0
 
     :cond_0
@@ -2157,9 +2144,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->peekMenu()Landroidx/appcompat/view/menu/MenuBuilder;
 
@@ -2180,8 +2165,13 @@
     :cond_0
     const/4 v0, 0x0
 
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
     :goto_0
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     invoke-virtual {p0}, Landroidx/appcompat/widget/Toolbar;->getContentInsetEnd()I
 
@@ -2199,7 +2189,7 @@
 
     return v0
 
-    :cond_1
+    :cond_2
     invoke-virtual {p0}, Landroidx/appcompat/widget/Toolbar;->getContentInsetEnd()I
 
     move-result v0
@@ -2299,8 +2289,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mLogoView:Landroid/widget/ImageView;
-
     invoke-virtual {v0}, Landroid/widget/ImageView;->getDrawable()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -2320,8 +2308,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mLogoView:Landroid/widget/ImageView;
-
     invoke-virtual {v0}, Landroid/widget/ImageView;->getContentDescription()Ljava/lang/CharSequence;
 
     move-result-object v0
@@ -2357,8 +2343,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton;
-
     invoke-virtual {v0}, Landroid/widget/ImageButton;->getContentDescription()Ljava/lang/CharSequence;
 
     move-result-object v0
@@ -2380,8 +2364,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton;
-
     invoke-virtual {v0}, Landroid/widget/ImageButton;->getDrawable()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -2515,8 +2497,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mExpandedMenuPresenter:Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;
-
     iget-object v0, v0, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mCurrentExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v0, :cond_0
@@ -2538,8 +2518,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->hideOverflowMenu()Z
 
     move-result v0
@@ -2588,8 +2566,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->isOverflowMenuShowPending()Z
 
     move-result v0
@@ -2613,8 +2589,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->isOverflowMenuShowing()Z
 
     move-result v0
@@ -2648,8 +2622,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0}, Landroid/widget/TextView;->getLayout()Landroid/text/Layout;
 
     move-result-object v0
@@ -2748,7 +2720,7 @@
 .end method
 
 .method protected onLayout(ZIIII)V
-    .locals 24
+    .locals 18
 
     move-object/from16 v0, p0
 
@@ -2836,9 +2808,11 @@
 
     move-result v13
 
-    move v14, v6
+    move v14, v13
 
-    goto :goto_3
+    move v13, v6
+
+    goto :goto_2
 
     :cond_2
     iget-object v13, v0, Landroidx/appcompat/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton;
@@ -2847,17 +2821,16 @@
 
     move-result v13
 
-    move v14, v13
+    move v14, v10
 
     goto :goto_2
 
     :cond_3
-    move v14, v6
+    move v13, v6
+
+    move v14, v10
 
     :goto_2
-    move v13, v10
-
-    :goto_3
     iget-object v15, v0, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
 
     invoke-direct {v0, v15}, Landroidx/appcompat/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z
@@ -2870,21 +2843,21 @@
 
     iget-object v15, v0, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
 
-    invoke-direct {v0, v15, v13, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildRight(Landroid/view/View;I[II)I
+    invoke-direct {v0, v15, v14, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildRight(Landroid/view/View;I[II)I
 
-    move-result v13
+    move-result v14
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     iget-object v15, v0, Landroidx/appcompat/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton;
 
-    invoke-direct {v0, v15, v14, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I
+    invoke-direct {v0, v15, v13, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I
 
-    move-result v14
+    move-result v13
 
     :cond_5
-    :goto_4
+    :goto_3
     iget-object v15, v0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
 
     invoke-direct {v0, v15}, Landroidx/appcompat/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z
@@ -2897,21 +2870,21 @@
 
     iget-object v15, v0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
 
-    invoke-direct {v0, v15, v14, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I
+    invoke-direct {v0, v15, v13, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I
 
-    move-result v14
+    move-result v13
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_6
     iget-object v15, v0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
 
-    invoke-direct {v0, v15, v13, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildRight(Landroid/view/View;I[II)I
+    invoke-direct {v0, v15, v14, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildRight(Landroid/view/View;I[II)I
 
-    move-result v13
+    move-result v14
 
     :cond_7
-    :goto_5
+    :goto_4
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/Toolbar;->getCurrentContentInsetLeft()I
 
     move-result v15
@@ -2920,7 +2893,7 @@
 
     move-result v16
 
-    sub-int v2, v15, v14
+    sub-int v2, v15, v13
 
     invoke-static {v3, v2}, Ljava/lang/Math;->max(II)I
 
@@ -2928,7 +2901,7 @@
 
     aput v2, v11, v3
 
-    sub-int v2, v10, v13
+    sub-int v2, v10, v14
 
     sub-int v2, v16, v2
 
@@ -2940,13 +2913,13 @@
 
     aput v2, v11, v17
 
-    invoke-static {v14, v15}, Ljava/lang/Math;->max(II)I
+    invoke-static {v13, v15}, Ljava/lang/Math;->max(II)I
 
     move-result v2
 
     sub-int v10, v10, v16
 
-    invoke-static {v13, v10}, Ljava/lang/Math;->min(II)I
+    invoke-static {v14, v10}, Ljava/lang/Math;->min(II)I
 
     move-result v10
 
@@ -2966,7 +2939,7 @@
 
     move-result v10
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_8
     iget-object v13, v0, Landroidx/appcompat/widget/Toolbar;->mExpandedActionView:Landroid/view/View;
@@ -2976,7 +2949,7 @@
     move-result v2
 
     :cond_9
-    :goto_6
+    :goto_5
     iget-object v13, v0, Landroidx/appcompat/widget/Toolbar;->mLogoView:Landroid/widget/ImageView;
 
     invoke-direct {v0, v13}, Landroidx/appcompat/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z
@@ -2993,7 +2966,7 @@
 
     move-result v10
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_a
     iget-object v13, v0, Landroidx/appcompat/widget/Toolbar;->mLogoView:Landroid/widget/ImageView;
@@ -3003,7 +2976,7 @@
     move-result v2
 
     :cond_b
-    :goto_7
+    :goto_6
     iget-object v13, v0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
 
     invoke-direct {v0, v13}, Landroidx/appcompat/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z
@@ -3028,7 +3001,7 @@
 
     iget v3, v15, Landroidx/appcompat/widget/Toolbar$LayoutParams;->topMargin:I
 
-    move/from16 v19, v7
+    move/from16 p4, v7
 
     iget-object v7, v0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
 
@@ -3046,14 +3019,14 @@
 
     add-int/2addr v3, v7
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
-    move/from16 v19, v7
+    move/from16 p4, v7
 
     const/4 v3, 0x0
 
-    :goto_8
+    :goto_7
     if-eqz v14, :cond_d
 
     iget-object v7, v0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
@@ -3066,7 +3039,7 @@
 
     iget v15, v7, Landroidx/appcompat/widget/Toolbar$LayoutParams;->topMargin:I
 
-    move/from16 v20, v4
+    move/from16 v16, v4
 
     iget-object v4, v0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
 
@@ -3082,50 +3055,49 @@
 
     add-int/2addr v3, v15
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_d
-    move/from16 v20, v4
+    move/from16 v16, v4
 
-    :goto_9
+    :goto_8
     if-nez v13, :cond_f
 
     if-eqz v14, :cond_e
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_e
-    move/from16 v21, v6
+    move/from16 v17, v6
 
-    move/from16 v22, v12
+    move/from16 p3, v12
 
-    :goto_a
     const/4 v7, 0x0
 
-    goto/16 :goto_17
+    goto/16 :goto_15
 
     :cond_f
-    :goto_b
+    :goto_9
     if-eqz v13, :cond_10
 
     iget-object v4, v0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_10
     iget-object v4, v0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
 
-    :goto_c
+    :goto_a
     if-eqz v14, :cond_11
 
     iget-object v7, v0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_11
     iget-object v7, v0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
 
-    :goto_d
+    :goto_b
     invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v4
@@ -3160,23 +3132,23 @@
     if-lez v15, :cond_14
 
     :cond_13
-    move/from16 v21, v6
+    move/from16 v17, v6
 
     const/4 v15, 0x1
 
-    goto :goto_e
+    goto :goto_c
 
     :cond_14
-    move/from16 v21, v6
+    move/from16 v17, v6
 
     const/4 v15, 0x0
 
-    :goto_e
+    :goto_c
     iget v6, v0, Landroidx/appcompat/widget/Toolbar;->mGravity:I
 
     and-int/lit8 v6, v6, 0x70
 
-    move/from16 v22, v12
+    move/from16 p3, v12
 
     const/16 v12, 0x30
 
@@ -3196,7 +3168,7 @@
 
     iget v12, v4, Landroidx/appcompat/widget/Toolbar$LayoutParams;->topMargin:I
 
-    move/from16 v23, v2
+    move/from16 p5, v2
 
     iget v2, v0, Landroidx/appcompat/widget/Toolbar;->mTitleMarginTop:I
 
@@ -3210,7 +3182,7 @@
 
     add-int v6, v2, v3
 
-    goto :goto_f
+    goto :goto_d
 
     :cond_15
     sub-int/2addr v5, v9
@@ -3246,13 +3218,13 @@
     move-result v6
 
     :cond_16
-    :goto_f
+    :goto_d
     add-int/2addr v8, v6
 
-    goto :goto_10
+    goto :goto_e
 
     :cond_17
-    move/from16 v23, v2
+    move/from16 p5, v2
 
     sub-int/2addr v5, v9
 
@@ -3266,10 +3238,10 @@
 
     sub-int v8, v5, v3
 
-    goto :goto_10
+    goto :goto_e
 
     :cond_18
-    move/from16 v23, v2
+    move/from16 p5, v2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/appcompat/widget/Toolbar;->getPaddingTop()I
 
@@ -3283,7 +3255,7 @@
 
     add-int v8, v2, v3
 
-    :goto_10
+    :goto_e
     if-eqz v1, :cond_1d
 
     if-eqz v15, :cond_19
@@ -3292,14 +3264,14 @@
 
     const/4 v1, 0x1
 
-    goto :goto_11
+    goto :goto_f
 
     :cond_19
     const/4 v1, 0x1
 
     const/4 v3, 0x0
 
-    :goto_11
+    :goto_f
     aget v2, v11, v1
 
     sub-int/2addr v3, v2
@@ -3358,12 +3330,12 @@
 
     add-int v8, v3, v1
 
-    goto :goto_12
+    goto :goto_10
 
     :cond_1a
     move v2, v10
 
-    :goto_12
+    :goto_10
     if-eqz v14, :cond_1b
 
     iget-object v1, v0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
@@ -3404,12 +3376,12 @@
 
     iget v1, v1, Landroidx/appcompat/widget/Toolbar$LayoutParams;->bottomMargin:I
 
-    goto :goto_13
+    goto :goto_11
 
     :cond_1b
     move v3, v10
 
-    :goto_13
+    :goto_11
     if-eqz v15, :cond_1c
 
     invoke-static {v2, v3}, Ljava/lang/Math;->min(II)I
@@ -3419,38 +3391,36 @@
     move v10, v1
 
     :cond_1c
-    move/from16 v2, v23
+    move/from16 v2, p5
 
-    goto/16 :goto_a
+    const/4 v7, 0x0
+
+    goto :goto_15
 
     :cond_1d
     if-eqz v15, :cond_1e
 
     iget v3, v0, Landroidx/appcompat/widget/Toolbar;->mTitleMarginStart:I
 
-    move/from16 v18, v3
-
-    const/4 v7, 0x0
-
-    goto :goto_14
+    goto :goto_12
 
     :cond_1e
+    const/4 v3, 0x0
+
+    :goto_12
     const/4 v7, 0x0
 
-    const/16 v18, 0x0
-
-    :goto_14
     aget v1, v11, v7
 
-    sub-int v1, v18, v1
+    sub-int/2addr v3, v1
 
-    invoke-static {v7, v1}, Ljava/lang/Math;->max(II)I
+    invoke-static {v7, v3}, Ljava/lang/Math;->max(II)I
 
-    move-result v2
+    move-result v1
 
-    add-int v2, v23, v2
+    add-int v2, p5, v1
 
-    neg-int v1, v1
+    neg-int v1, v3
 
     invoke-static {v7, v1}, Ljava/lang/Math;->max(II)I
 
@@ -3496,12 +3466,12 @@
 
     add-int v8, v4, v1
 
-    goto :goto_15
+    goto :goto_13
 
     :cond_1f
     move v3, v2
 
-    :goto_15
+    :goto_13
     if-eqz v14, :cond_20
 
     iget-object v1, v0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
@@ -3542,12 +3512,12 @@
 
     iget v1, v1, Landroidx/appcompat/widget/Toolbar$LayoutParams;->bottomMargin:I
 
-    goto :goto_16
+    goto :goto_14
 
     :cond_20
     move v4, v2
 
-    :goto_16
+    :goto_14
     if-eqz v15, :cond_21
 
     invoke-static {v3, v4}, Ljava/lang/Math;->max(II)I
@@ -3555,7 +3525,7 @@
     move-result v2
 
     :cond_21
-    :goto_17
+    :goto_15
     iget-object v1, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
 
     const/4 v3, 0x3
@@ -3572,7 +3542,7 @@
 
     const/4 v2, 0x0
 
-    :goto_18
+    :goto_16
     if-ge v2, v1, :cond_22
 
     iget-object v4, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
@@ -3583,7 +3553,7 @@
 
     check-cast v4, Landroid/view/View;
 
-    move/from16 v12, v22
+    move/from16 v12, p3
 
     invoke-direct {v0, v4, v3, v11, v12}, Landroidx/appcompat/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I
 
@@ -3591,10 +3561,10 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_18
+    goto :goto_16
 
     :cond_22
-    move/from16 v12, v22
+    move/from16 v12, p3
 
     iget-object v1, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
 
@@ -3610,7 +3580,7 @@
 
     const/4 v2, 0x0
 
-    :goto_19
+    :goto_17
     if-ge v2, v1, :cond_23
 
     iget-object v4, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
@@ -3627,7 +3597,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_19
+    goto :goto_17
 
     :cond_23
     iget-object v1, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
@@ -3642,13 +3612,13 @@
 
     move-result v1
 
-    sub-int v4, v20, v21
+    sub-int v4, v16, v17
 
-    sub-int v4, v4, v19
+    sub-int v4, v4, p4
 
     div-int/lit8 v4, v4, 0x2
 
-    add-int v6, v21, v4
+    add-int v6, v17, v4
 
     div-int/lit8 v2, v1, 0x2
 
@@ -3658,7 +3628,7 @@
 
     if-ge v2, v3, :cond_24
 
-    goto :goto_1a
+    goto :goto_18
 
     :cond_24
     if-le v1, v10, :cond_25
@@ -3667,19 +3637,19 @@
 
     sub-int v3, v2, v1
 
-    goto :goto_1a
+    goto :goto_18
 
     :cond_25
     move v3, v2
 
-    :goto_1a
+    :goto_18
     iget-object v1, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
-    :goto_1b
+    :goto_19
     if-ge v7, v1, :cond_26
 
     iget-object v2, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
@@ -3696,7 +3666,7 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    goto :goto_1b
+    goto :goto_19
 
     :cond_26
     iget-object v1, v0, Landroidx/appcompat/widget/Toolbar;->mTempViews:Ljava/util/ArrayList;
@@ -4445,8 +4415,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->peekMenu()Landroidx/appcompat/view/menu/MenuBuilder;
 
     move-result-object v0
@@ -4534,8 +4502,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/Toolbar;->mExpandedMenuPresenter:Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;
-
     iget-object v1, v1, Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->mCurrentExpandedItem:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v1, :cond_0
@@ -4790,8 +4756,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mLogoView:Landroid/widget/ImageView;
-
     invoke-direct {p0, v0}, Landroidx/appcompat/widget/Toolbar;->isChildOrHidden(Landroid/view/View;)Z
 
     move-result v0
@@ -4814,8 +4778,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mLogoView:Landroid/widget/ImageView;
-
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_2
@@ -4858,8 +4820,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mLogoView:Landroid/widget/ImageView;
-
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     :cond_1
@@ -4987,8 +4947,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0, p1, p2}, Landroidx/appcompat/widget/ActionMenuView;->setMenuCallbacks(Landroidx/appcompat/view/menu/MenuPresenter$Callback;Landroidx/appcompat/view/menu/MenuBuilder$Callback;)V
 
     :cond_0
@@ -5043,8 +5001,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton;
-
     invoke-virtual {v0, p1}, Landroid/widget/ImageButton;->setContentDescription(Ljava/lang/CharSequence;)V
 
     :cond_1
@@ -5103,8 +5059,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton;
-
     invoke-direct {p0, v0}, Landroidx/appcompat/widget/Toolbar;->isChildOrHidden(Landroid/view/View;)Z
 
     move-result v0
@@ -5127,8 +5081,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton;
-
     invoke-virtual {v0, p1}, Landroid/widget/ImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_2
@@ -5266,22 +5218,18 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
+    iget-object v2, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
 
-    iget v2, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextAppearance:I
-
-    invoke-virtual {v1, v0, v2}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
+    invoke-virtual {v2, v0, v1}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
     iget v0, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextColor:I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
+    iget-object v1, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
 
-    iget v1, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextColor:I
-
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setTextColor(I)V
+    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setTextColor(I)V
 
     :cond_1
     iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
@@ -5305,8 +5253,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
-
     invoke-direct {p0, v0}, Landroidx/appcompat/widget/Toolbar;->isChildOrHidden(Landroid/view/View;)Z
 
     move-result v0
@@ -5329,8 +5275,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_4
@@ -5352,8 +5296,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1, p2}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
@@ -5373,8 +5315,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setTextColor(I)V
 
     :cond_0
@@ -5438,22 +5378,18 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
+    iget-object v2, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
 
-    iget v2, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextAppearance:I
-
-    invoke-virtual {v1, v0, v2}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
+    invoke-virtual {v2, v0, v1}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
     iget v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextColor:I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
+    iget-object v1, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
 
-    iget v1, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextColor:I
-
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setTextColor(I)V
+    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setTextColor(I)V
 
     :cond_1
     iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
@@ -5477,8 +5413,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
-
     invoke-direct {p0, v0}, Landroidx/appcompat/widget/Toolbar;->isChildOrHidden(Landroid/view/View;)Z
 
     move-result v0
@@ -5501,8 +5435,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_4
@@ -5580,8 +5512,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1, p2}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V
 
     :cond_0
@@ -5601,8 +5531,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setTextColor(I)V
 
     :cond_0
@@ -5616,8 +5544,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/Toolbar;->mMenuView:Landroidx/appcompat/widget/ActionMenuView;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/ActionMenuView;->showOverflowMenu()Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$1.smali b/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$1.smali
index 7397d45711..cc0470b608 100644
--- a/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ToolbarWidgetWrapper$1;
 .super Ljava/lang/Object;
+.source "ToolbarWidgetWrapper.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$2.smali b/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$2.smali
index 3d6fcbc644..f724bf56e7 100644
--- a/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/ToolbarWidgetWrapper$2;
 .super Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
+.source "ToolbarWidgetWrapper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali b/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali
index 7147369be5..898df97e6d 100644
--- a/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ToolbarWidgetWrapper;
 .super Ljava/lang/Object;
+.source "ToolbarWidgetWrapper.java"
 
 # interfaces
 .implements Landroidx/appcompat/widget/DecorToolbar;
@@ -201,8 +202,6 @@
 
     if-eqz p2, :cond_5
 
-    iget-object p2, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mDefaultNavigationIcon:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p0, p2}, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     :cond_5
@@ -310,9 +309,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
-
-    invoke-virtual {v1}, Landroidx/appcompat/widget/Toolbar;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroidx/appcompat/widget/Toolbar;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -329,9 +326,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
-
-    invoke-virtual {v1}, Landroidx/appcompat/widget/Toolbar;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroidx/appcompat/widget/Toolbar;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -521,8 +516,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mNavIcon:Landroid/graphics/drawable/Drawable;
-
     goto :goto_0
 
     :cond_0
@@ -548,22 +541,18 @@
 
     iget v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mDisplayOpts:I
 
-    and-int/lit8 v0, v0, 0x2
+    and-int/lit8 v1, v0, 0x2
 
-    if-eqz v0, :cond_1
-
-    iget v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mDisplayOpts:I
+    if-eqz v1, :cond_2
 
     and-int/lit8 v0, v0, 0x1
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mLogo:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mLogo:Landroid/graphics/drawable/Drawable;
-
     goto :goto_0
 
     :cond_0
@@ -572,6 +561,11 @@
     goto :goto_0
 
     :cond_1
+    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mIcon:Landroid/graphics/drawable/Drawable;
+
+    goto :goto_0
+
+    :cond_2
     const/4 v0, 0x0
 
     :goto_0
@@ -668,8 +662,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0}, Landroid/widget/Spinner;->getCount()I
 
     move-result v0
@@ -689,8 +681,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0}, Landroid/widget/Spinner;->getSelectedItemPosition()I
 
     move-result v0
@@ -977,17 +967,15 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mDisplayOpts:I
+    iget v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mDisplayOpts:I
 
-    and-int/lit8 v0, v0, 0x10
+    and-int/lit8 v1, v1, 0x10
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
+    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mCustomView:Landroid/view/View;
-
-    invoke-virtual {v0, v1}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
+    invoke-virtual {v1, v0}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
 
     :cond_0
     iput-object p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mCustomView:Landroid/view/View;
@@ -1107,10 +1095,9 @@
 
     iget-object v2, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mSubtitle:Ljava/lang/CharSequence;
 
-    :goto_0
     invoke-virtual {v1, v2}, Landroidx/appcompat/widget/Toolbar;->setSubtitle(Ljava/lang/CharSequence;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
@@ -1121,10 +1108,10 @@
 
     iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    goto :goto_0
+    invoke-virtual {v1, v2}, Landroidx/appcompat/widget/Toolbar;->setSubtitle(Ljava/lang/CharSequence;)V
 
     :cond_4
-    :goto_1
+    :goto_0
     and-int/lit8 v0, v0, 0x10
 
     if-eqz v0, :cond_6
@@ -1139,8 +1126,6 @@
 
     iget-object p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mCustomView:Landroid/view/View;
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;)V
 
     return-void
@@ -1148,8 +1133,6 @@
     :cond_5
     iget-object p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mCustomView:Landroid/view/View;
-
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
 
     :cond_6
@@ -1179,8 +1162,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0, p1}, Landroid/widget/Spinner;->setSelection(I)V
 
     return-void
@@ -1202,8 +1183,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
@@ -1212,11 +1191,9 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
+    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
-
-    invoke-virtual {v0, v1}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
+    invoke-virtual {v1, v0}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
 
     :cond_0
     iput-object p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
@@ -1475,15 +1452,13 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
@@ -1492,9 +1467,9 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
+    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
+    invoke-virtual {v1, v0}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
 
     goto :goto_0
 
@@ -1503,8 +1478,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mSpinner:Landroid/widget/Spinner;
-
     invoke-virtual {v0}, Landroid/widget/Spinner;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
@@ -1513,15 +1486,12 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
+    iget-object v0, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mSpinner:Landroid/widget/Spinner;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mSpinner:Landroid/widget/Spinner;
-
-    :goto_0
-    invoke-virtual {v0, v1}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
+    invoke-virtual {v1, v0}, Landroidx/appcompat/widget/Toolbar;->removeView(Landroid/view/View;)V
 
     :cond_0
-    :goto_1
+    :goto_0
     iput p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mNavigationMode:I
 
     const/4 v0, 0x0
@@ -1549,11 +1519,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
+    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
-
-    invoke-virtual {p1, v1, v0}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;I)V
+    invoke-virtual {v1, p1, v0}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;I)V
 
     iget-object p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View;
 
@@ -1584,11 +1552,13 @@
 
     invoke-virtual {p1, v1, v0}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;I)V
 
-    :cond_1
+    return-void
+
     :pswitch_4
     return-void
 
-    nop
+    :cond_1
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali/androidx/appcompat/widget/TooltipCompat.smali b/com.discord/smali/androidx/appcompat/widget/TooltipCompat.smali
index 91d4f2c0cf..e13c6f5796 100644
--- a/com.discord/smali/androidx/appcompat/widget/TooltipCompat.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TooltipCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/TooltipCompat;
 .super Ljava/lang/Object;
+.source "TooltipCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$1.smali b/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$1.smali
index 012d882ec0..cc2643bfe8 100644
--- a/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$1.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/TooltipCompatHandler$1;
 .super Ljava/lang/Object;
+.source "TooltipCompatHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$2.smali b/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$2.smali
index 26b3532f87..d3bc360ca6 100644
--- a/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$2.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/TooltipCompatHandler$2;
 .super Ljava/lang/Object;
+.source "TooltipCompatHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler.smali b/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler.smali
index 7d67d0607c..227c88e647 100644
--- a/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TooltipCompatHandler.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/TooltipCompatHandler;
 .super Ljava/lang/Object;
+.source "TooltipCompatHandler.java"
 
 # interfaces
 .implements Landroid/view/View$OnAttachStateChangeListener;
@@ -149,8 +150,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/appcompat/widget/TooltipCompatHandler;->sPendingHandler:Landroidx/appcompat/widget/TooltipCompatHandler;
-
     invoke-direct {v0}, Landroidx/appcompat/widget/TooltipCompatHandler;->cancelPendingShow()V
 
     :cond_0
@@ -175,8 +174,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/appcompat/widget/TooltipCompatHandler;->sPendingHandler:Landroidx/appcompat/widget/TooltipCompatHandler;
-
     iget-object v0, v0, Landroidx/appcompat/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View;
 
     if-ne v0, p0, :cond_0
@@ -194,13 +191,9 @@
 
     if-eqz p1, :cond_1
 
-    sget-object p1, Landroidx/appcompat/widget/TooltipCompatHandler;->sActiveHandler:Landroidx/appcompat/widget/TooltipCompatHandler;
+    iget-object v0, p1, Landroidx/appcompat/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View;
 
-    iget-object p1, p1, Landroidx/appcompat/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View;
-
-    if-ne p1, p0, :cond_1
-
-    sget-object p1, Landroidx/appcompat/widget/TooltipCompatHandler;->sActiveHandler:Landroidx/appcompat/widget/TooltipCompatHandler;
+    if-ne v0, p0, :cond_1
 
     invoke-virtual {p1}, Landroidx/appcompat/widget/TooltipCompatHandler;->hide()V
 
@@ -293,8 +286,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/appcompat/widget/TooltipCompatHandler;->mPopup:Landroidx/appcompat/widget/TooltipPopup;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/TooltipPopup;->hide()V
 
     iput-object v1, p0, Landroidx/appcompat/widget/TooltipCompatHandler;->mPopup:Landroidx/appcompat/widget/TooltipPopup;
@@ -486,8 +477,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Landroidx/appcompat/widget/TooltipCompatHandler;->sActiveHandler:Landroidx/appcompat/widget/TooltipCompatHandler;
-
     invoke-virtual {v0}, Landroidx/appcompat/widget/TooltipCompatHandler;->hide()V
 
     :cond_1
@@ -531,7 +520,7 @@
 
     const-wide/16 v0, 0x9c4
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object p1, p0, Landroidx/appcompat/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View;
@@ -548,7 +537,6 @@
 
     const-wide/16 v0, 0xbb8
 
-    :goto_0
     invoke-static {}, Landroid/view/ViewConfiguration;->getLongPressTimeout()I
 
     move-result p1
@@ -557,14 +545,20 @@
 
     sub-long/2addr v0, v2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     const-wide/16 v0, 0x3a98
 
-    goto :goto_0
+    invoke-static {}, Landroid/view/ViewConfiguration;->getLongPressTimeout()I
 
-    :goto_1
+    move-result p1
+
+    int-to-long v2, p1
+
+    sub-long/2addr v0, v2
+
+    :goto_0
     iget-object p1, p0, Landroidx/appcompat/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View;
 
     iget-object v2, p0, Landroidx/appcompat/widget/TooltipCompatHandler;->mHideRunnable:Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali b/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali
index 5194919be8..a368a2dcbc 100644
--- a/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali
@@ -1,5 +1,6 @@
 .class Landroidx/appcompat/widget/TooltipPopup;
 .super Ljava/lang/Object;
+.source "TooltipPopup.java"
 
 
 # annotations
@@ -116,24 +117,16 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->type:I
 
-    iget-object p1, p0, Landroidx/appcompat/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams;
-
     const/4 v0, -0x2
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->width:I
 
-    iget-object p1, p0, Landroidx/appcompat/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams;
-
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->height:I
 
-    iget-object p1, p0, Landroidx/appcompat/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams;
-
     const/4 v0, -0x3
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->format:I
 
-    iget-object p1, p0, Landroidx/appcompat/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams;
-
     sget v0, Landroidx/appcompat/R$style;->Animation_AppCompat_Tooltip:I
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->windowAnimations:I
@@ -328,27 +321,21 @@
 
     iget-object v5, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpAppPos:[I
 
-    aget v5, v5, v2
+    aget v6, v5, v2
 
-    sub-int/2addr v4, v5
+    sub-int/2addr v4, v6
 
     aput v4, p1, v2
 
-    iget-object p1, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpAnchorPos:[I
-
     const/4 v4, 0x1
 
-    aget v5, p1, v4
+    aget v6, p1, v4
 
-    iget-object v6, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpAppPos:[I
+    aget v5, v5, v4
 
-    aget v6, v6, v4
+    sub-int/2addr v6, v5
 
-    sub-int/2addr v5, v6
-
-    aput v5, p1, v4
-
-    iget-object p1, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpAnchorPos:[I
+    aput v6, p1, v4
 
     aget p1, p1, v2
 
@@ -380,47 +367,45 @@
 
     iget-object p2, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpAnchorPos:[I
 
+    aget v2, p2, v4
+
+    add-int/2addr v2, p3
+
+    sub-int/2addr v2, v0
+
+    sub-int/2addr v2, p1
+
     aget p2, p2, v4
 
-    add-int/2addr p2, p3
+    add-int/2addr p2, v1
 
-    sub-int/2addr p2, v0
-
-    sub-int/2addr p2, p1
-
-    iget-object p3, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpAnchorPos:[I
-
-    aget p3, p3, v4
-
-    add-int/2addr p3, v1
-
-    add-int/2addr p3, v0
+    add-int/2addr p2, v0
 
     if-eqz p4, :cond_6
 
-    if-gez p2, :cond_7
+    if-gez v2, :cond_7
 
-    iput p3, p5, Landroid/view/WindowManager$LayoutParams;->y:I
+    iput p2, p5, Landroid/view/WindowManager$LayoutParams;->y:I
 
     return-void
 
     :cond_6
-    add-int/2addr p1, p3
+    add-int/2addr p1, p2
 
-    iget-object p4, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpDisplayFrame:Landroid/graphics/Rect;
+    iget-object p3, p0, Landroidx/appcompat/widget/TooltipPopup;->mTmpDisplayFrame:Landroid/graphics/Rect;
 
-    invoke-virtual {p4}, Landroid/graphics/Rect;->height()I
+    invoke-virtual {p3}, Landroid/graphics/Rect;->height()I
 
-    move-result p4
+    move-result p3
 
-    if-gt p1, p4, :cond_7
+    if-gt p1, p3, :cond_7
 
-    iput p3, p5, Landroid/view/WindowManager$LayoutParams;->y:I
+    iput p2, p5, Landroid/view/WindowManager$LayoutParams;->y:I
 
     return-void
 
     :cond_7
-    iput p2, p5, Landroid/view/WindowManager$LayoutParams;->y:I
+    iput v2, p5, Landroid/view/WindowManager$LayoutParams;->y:I
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/appcompat/widget/VectorEnabledTintResources.smali b/com.discord/smali/androidx/appcompat/widget/VectorEnabledTintResources.smali
index 43e7abe1d0..6185e23e3d 100644
--- a/com.discord/smali/androidx/appcompat/widget/VectorEnabledTintResources.smali
+++ b/com.discord/smali/androidx/appcompat/widget/VectorEnabledTintResources.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/VectorEnabledTintResources;
 .super Landroid/content/res/Resources;
+.source "VectorEnabledTintResources.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ViewStubCompat$OnInflateListener.smali b/com.discord/smali/androidx/appcompat/widget/ViewStubCompat$OnInflateListener.smali
index e5051707a5..6539bb88b8 100644
--- a/com.discord/smali/androidx/appcompat/widget/ViewStubCompat$OnInflateListener.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ViewStubCompat$OnInflateListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/ViewStubCompat$OnInflateListener;
 .super Ljava/lang/Object;
+.source "ViewStubCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/appcompat/widget/ViewStubCompat.smali b/com.discord/smali/androidx/appcompat/widget/ViewStubCompat.smali
index 3451c28933..17148cbdc9 100644
--- a/com.discord/smali/androidx/appcompat/widget/ViewStubCompat.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ViewStubCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/appcompat/widget/ViewStubCompat;
 .super Landroid/view/View;
+.source "ViewStubCompat.java"
 
 
 # annotations
@@ -167,8 +168,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/appcompat/widget/ViewStubCompat;->mInflater:Landroid/view/LayoutInflater;
-
     goto :goto_0
 
     :cond_0
@@ -195,8 +194,6 @@
 
     if-eq v2, v3, :cond_1
 
-    iget v2, p0, Landroidx/appcompat/widget/ViewStubCompat;->mInflatedId:I
-
     invoke-virtual {v1, v2}, Landroid/view/View;->setId(I)V
 
     :cond_1
@@ -230,8 +227,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ViewStubCompat;->mInflateListener:Landroidx/appcompat/widget/ViewStubCompat$OnInflateListener;
-
     invoke-interface {v0, p0, v1}, Landroidx/appcompat/widget/ViewStubCompat$OnInflateListener;->onInflate(Landroidx/appcompat/widget/ViewStubCompat;Landroid/view/View;)V
 
     :cond_3
@@ -305,8 +300,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/appcompat/widget/ViewStubCompat;->mInflatedViewRef:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/appcompat/widget/ViewUtils.smali b/com.discord/smali/androidx/appcompat/widget/ViewUtils.smali
index b0f606c333..4c7ec16e3c 100644
--- a/com.discord/smali/androidx/appcompat/widget/ViewUtils.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ViewUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/appcompat/widget/ViewUtils;
 .super Ljava/lang/Object;
+.source "ViewUtils.java"
 
 
 # annotations
@@ -94,11 +95,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/appcompat/widget/ViewUtils;->sComputeFitSystemWindowsMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x2
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -221,6 +220,8 @@
 
     invoke-static {p0, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/androidx/appcompat/widget/WithHint.smali b/com.discord/smali/androidx/appcompat/widget/WithHint.smali
index 02e1c7d064..1902c2ab7d 100644
--- a/com.discord/smali/androidx/appcompat/widget/WithHint.smali
+++ b/com.discord/smali/androidx/appcompat/widget/WithHint.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/appcompat/widget/WithHint;
 .super Ljava/lang/Object;
+.source "WithHint.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/R.smali b/com.discord/smali/androidx/arch/core/R.smali
index aca295a9fa..9cf0872f99 100644
--- a/com.discord/smali/androidx/arch/core/R.smali
+++ b/com.discord/smali/androidx/arch/core/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/arch/core/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$1.smali b/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$1.smali
index 870a924c13..1f1bf45e7c 100644
--- a/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$1.smali
+++ b/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/arch/core/executor/ArchTaskExecutor$1;
 .super Ljava/lang/Object;
+.source "ArchTaskExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$2.smali b/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$2.smali
index d2bdac88eb..819b5c20ed 100644
--- a/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$2.smali
+++ b/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/arch/core/executor/ArchTaskExecutor$2;
 .super Ljava/lang/Object;
+.source "ArchTaskExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor.smali b/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor.smali
index 5b922716b5..ea1703fb58 100644
--- a/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor.smali
+++ b/com.discord/smali/androidx/arch/core/executor/ArchTaskExecutor.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/arch/core/executor/ArchTaskExecutor;
 .super Landroidx/arch/core/executor/TaskExecutor;
+.source "ArchTaskExecutor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor$1.smali b/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor$1.smali
index 3f459b1d0a..68ae99eddc 100644
--- a/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor$1.smali
+++ b/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/arch/core/executor/DefaultTaskExecutor$1;
 .super Ljava/lang/Object;
+.source "DefaultTaskExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
diff --git a/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor.smali b/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor.smali
index 2f4fe7b2b9..84602e7bde 100644
--- a/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor.smali
+++ b/com.discord/smali/androidx/arch/core/executor/DefaultTaskExecutor.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/arch/core/executor/DefaultTaskExecutor;
 .super Landroidx/arch/core/executor/TaskExecutor;
+.source "DefaultTaskExecutor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/executor/TaskExecutor.smali b/com.discord/smali/androidx/arch/core/executor/TaskExecutor.smali
index ed36732947..08fcc2a206 100644
--- a/com.discord/smali/androidx/arch/core/executor/TaskExecutor.smali
+++ b/com.discord/smali/androidx/arch/core/executor/TaskExecutor.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/arch/core/executor/TaskExecutor;
 .super Ljava/lang/Object;
+.source "TaskExecutor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/internal/FastSafeIterableMap.smali b/com.discord/smali/androidx/arch/core/internal/FastSafeIterableMap.smali
index 9acd3c2064..1bbb7167db 100644
--- a/com.discord/smali/androidx/arch/core/internal/FastSafeIterableMap.smali
+++ b/com.discord/smali/androidx/arch/core/internal/FastSafeIterableMap.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/arch/core/internal/FastSafeIterableMap;
 .super Landroidx/arch/core/internal/SafeIterableMap;
+.source "FastSafeIterableMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$AscendingIterator.smali b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$AscendingIterator.smali
index 5e0893ff50..de5f15eb0a 100644
--- a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$AscendingIterator.smali
+++ b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$AscendingIterator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/arch/core/internal/SafeIterableMap$AscendingIterator;
 .super Landroidx/arch/core/internal/SafeIterableMap$ListIterator;
+.source "SafeIterableMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$DescendingIterator.smali b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$DescendingIterator.smali
index ec654f5fc7..1c40818ba8 100644
--- a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$DescendingIterator.smali
+++ b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$DescendingIterator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/arch/core/internal/SafeIterableMap$DescendingIterator;
 .super Landroidx/arch/core/internal/SafeIterableMap$ListIterator;
+.source "SafeIterableMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$Entry.smali b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$Entry.smali
index 76603aaadf..5a69ce8878 100644
--- a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$Entry.smali
+++ b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$Entry.smali
@@ -1,5 +1,6 @@
 .class Landroidx/arch/core/internal/SafeIterableMap$Entry;
 .super Ljava/lang/Object;
+.source "SafeIterableMap.java"
 
 # interfaces
 .implements Ljava/util/Map$Entry;
diff --git a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali
index 64c095878a..0877930f13 100644
--- a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali
+++ b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;
 .super Ljava/lang/Object;
+.source "SafeIterableMap.java"
 
 # interfaces
 .implements Landroidx/arch/core/internal/SafeIterableMap$SupportRemove;
@@ -65,9 +66,9 @@
 
     iget-boolean v0, p0, Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mBeforeStart:Z
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
@@ -77,26 +78,24 @@
 
     if-eqz v0, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     iget-object v0, p0, Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mCurrent:Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mCurrent:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
     iget-object v0, v0, Landroidx/arch/core/internal/SafeIterableMap$Entry;->mNext:Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
     if-eqz v0, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 .method public bridge synthetic next()Ljava/lang/Object;
@@ -138,8 +137,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mCurrent:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
     iget-object v0, v0, Landroidx/arch/core/internal/SafeIterableMap$Entry;->mNext:Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
     goto :goto_0
@@ -173,9 +170,7 @@
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mCurrent:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
-    iget-object p1, p1, Landroidx/arch/core/internal/SafeIterableMap$Entry;->mPrevious:Landroidx/arch/core/internal/SafeIterableMap$Entry;
+    iget-object p1, v0, Landroidx/arch/core/internal/SafeIterableMap$Entry;->mPrevious:Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
     iput-object p1, p0, Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mCurrent:Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
diff --git a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$ListIterator.smali b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$ListIterator.smali
index 56dedf7d6e..9a3c6a0e2b 100644
--- a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$ListIterator.smali
+++ b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$ListIterator.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/arch/core/internal/SafeIterableMap$ListIterator;
 .super Ljava/lang/Object;
+.source "SafeIterableMap.java"
 
 # interfaces
 .implements Landroidx/arch/core/internal/SafeIterableMap$SupportRemove;
@@ -91,15 +92,11 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Landroidx/arch/core/internal/SafeIterableMap$ListIterator;->mExpectedEnd:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/arch/core/internal/SafeIterableMap$ListIterator;->mNext:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
     invoke-virtual {p0, v0}, Landroidx/arch/core/internal/SafeIterableMap$ListIterator;->forward(Landroidx/arch/core/internal/SafeIterableMap$Entry;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
     move-result-object v0
@@ -220,8 +217,6 @@
 
     if-ne v0, p1, :cond_1
 
-    iget-object v0, p0, Landroidx/arch/core/internal/SafeIterableMap$ListIterator;->mExpectedEnd:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
     invoke-virtual {p0, v0}, Landroidx/arch/core/internal/SafeIterableMap$ListIterator;->backward(Landroidx/arch/core/internal/SafeIterableMap$Entry;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$SupportRemove.smali b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$SupportRemove.smali
index aef7859840..49d855187f 100644
--- a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$SupportRemove.smali
+++ b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap$SupportRemove.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/arch/core/internal/SafeIterableMap$SupportRemove;
 .super Ljava/lang/Object;
+.source "SafeIterableMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap.smali b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap.smali
index 3962e0a384..0969e20e1e 100644
--- a/com.discord/smali/androidx/arch/core/internal/SafeIterableMap.smali
+++ b/com.discord/smali/androidx/arch/core/internal/SafeIterableMap.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/arch/core/internal/SafeIterableMap;
 .super Ljava/lang/Object;
+.source "SafeIterableMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
@@ -411,12 +412,8 @@
     return-object v0
 
     :cond_0
-    iget-object p1, p0, Landroidx/arch/core/internal/SafeIterableMap;->mEnd:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
     iput-object v0, p1, Landroidx/arch/core/internal/SafeIterableMap$Entry;->mNext:Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
-    iget-object p1, p0, Landroidx/arch/core/internal/SafeIterableMap;->mEnd:Landroidx/arch/core/internal/SafeIterableMap$Entry;
-
     iput-object p1, v0, Landroidx/arch/core/internal/SafeIterableMap$Entry;->mPrevious:Landroidx/arch/core/internal/SafeIterableMap$Entry;
 
     iput-object v0, p0, Landroidx/arch/core/internal/SafeIterableMap;->mEnd:Landroidx/arch/core/internal/SafeIterableMap$Entry;
diff --git a/com.discord/smali/androidx/arch/core/util/Function.smali b/com.discord/smali/androidx/arch/core/util/Function.smali
index 10ce1a625b..2bdf19a9a5 100644
--- a/com.discord/smali/androidx/arch/core/util/Function.smali
+++ b/com.discord/smali/androidx/arch/core/util/Function.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/arch/core/util/Function;
 .super Ljava/lang/Object;
+.source "Function.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
index 37e56f4935..da27d3597e 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
index 0e6ea28336..4bbf4a2acb 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
index 337e5757ef..a811510083 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 3c1119b504..0bd68753c2 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index 0bcfb959d3..13d94b5144 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali b/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali
index bb802f8ce8..16e25e55a4 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali b/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
index 2801410050..fb8aef748a 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index 5714d78fba..5bc8463c03 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
index 8ae4ccda72..8585c78273 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
index 580deaf01c..ab2c942871 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R.smali b/com.discord/smali/androidx/asynclayoutinflater/R.smali
index 9b1e21ae40..cdad4c84f9 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$1.smali b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$1.smali
index dbc4eb04eb..f5c06b652c 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$1.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$1;
 .super Ljava/lang/Object;
+.source "AsyncLayoutInflater.java"
 
 # interfaces
 .implements Landroid/os/Handler$Callback;
diff --git a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$BasicInflater.smali b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$BasicInflater.smali
index 49cb941bdc..8325b40ed3 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$BasicInflater.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$BasicInflater.smali
@@ -1,5 +1,6 @@
 .class Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$BasicInflater;
 .super Landroid/view/LayoutInflater;
+.source "AsyncLayoutInflater.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateRequest.smali b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateRequest.smali
index 0250e6e7b4..ead4f1e092 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateRequest.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateRequest.smali
@@ -1,5 +1,6 @@
 .class Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateRequest;
 .super Ljava/lang/Object;
+.source "AsyncLayoutInflater.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateThread.smali b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateThread.smali
index ddaf5cb21f..bd6320e514 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateThread.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateThread.smali
@@ -1,5 +1,6 @@
 .class Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateThread;
 .super Ljava/lang/Thread;
+.source "AsyncLayoutInflater.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener.smali b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener.smali
index 6f3ae8a6da..2eb59dfb18 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener;
 .super Ljava/lang/Object;
+.source "AsyncLayoutInflater.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater.smali b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater.smali
index 5b68143742..280a0552ae 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/view/AsyncLayoutInflater.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/asynclayoutinflater/view/AsyncLayoutInflater;
 .super Ljava/lang/Object;
+.source "AsyncLayoutInflater.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$attr.smali b/com.discord/smali/androidx/browser/R$attr.smali
index 51bf5c61f6..a25df3b444 100644
--- a/com.discord/smali/androidx/browser/R$attr.smali
+++ b/com.discord/smali/androidx/browser/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$color.smali b/com.discord/smali/androidx/browser/R$color.smali
index 2c590d954c..65729c0af6 100644
--- a/com.discord/smali/androidx/browser/R$color.smali
+++ b/com.discord/smali/androidx/browser/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$dimen.smali b/com.discord/smali/androidx/browser/R$dimen.smali
index bf3df6b2ec..7c75e83718 100644
--- a/com.discord/smali/androidx/browser/R$dimen.smali
+++ b/com.discord/smali/androidx/browser/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index 2c1207f47c..6377806f0c 100644
--- a/com.discord/smali/androidx/browser/R$drawable.smali
+++ b/com.discord/smali/androidx/browser/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index c019d6404e..d7249040ee 100644
--- a/com.discord/smali/androidx/browser/R$id.smali
+++ b/com.discord/smali/androidx/browser/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$integer.smali b/com.discord/smali/androidx/browser/R$integer.smali
index 9496f783c6..90badd2ee5 100644
--- a/com.discord/smali/androidx/browser/R$integer.smali
+++ b/com.discord/smali/androidx/browser/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$layout.smali b/com.discord/smali/androidx/browser/R$layout.smali
index 719ddc6d2a..c2cb749b0d 100644
--- a/com.discord/smali/androidx/browser/R$layout.smali
+++ b/com.discord/smali/androidx/browser/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 593519d34f..73b92449fb 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$style.smali b/com.discord/smali/androidx/browser/R$style.smali
index ff710b7a1b..6e5dbc91a2 100644
--- a/com.discord/smali/androidx/browser/R$style.smali
+++ b/com.discord/smali/androidx/browser/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R$styleable.smali b/com.discord/smali/androidx/browser/R$styleable.smali
index 8db0ba3327..61495416c7 100644
--- a/com.discord/smali/androidx/browser/R$styleable.smali
+++ b/com.discord/smali/androidx/browser/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/R.smali b/com.discord/smali/androidx/browser/R.smali
index 85b5b58369..3147e1d855 100644
--- a/com.discord/smali/androidx/browser/R.smali
+++ b/com.discord/smali/androidx/browser/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionItem.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionItem.smali
index d07576c841..d08f84db1a 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionItem.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionItem.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/browseractions/BrowserActionItem;
 .super Ljava/lang/Object;
+.source "BrowserActionItem.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter$ViewHolderItem.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter$ViewHolderItem.smali
index 1097326e1a..c8ed5443c0 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter$ViewHolderItem.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter$ViewHolderItem.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/browseractions/BrowserActionsFallbackMenuAdapter$ViewHolderItem;
 .super Ljava/lang/Object;
+.source "BrowserActionsFallbackMenuAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter.smali
index 9e2a205894..04c0de011b 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/browseractions/BrowserActionsFallbackMenuAdapter;
 .super Landroid/widget/BaseAdapter;
+.source "BrowserActionsFallbackMenuAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog$1.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog$1.smali
index 8fa450e2f6..1834791c8c 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog$1.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/browseractions/BrowserActionsFallbackMenuDialog$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BrowserActionsFallbackMenuDialog.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.smali
index be4dc91e4e..9e68b59862 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/browseractions/BrowserActionsFallbackMenuDialog;
 .super Landroid/app/Dialog;
+.source "BrowserActionsFallbackMenuDialog.java"
 
 
 # static fields
@@ -34,9 +35,9 @@
 .method private startAnimation(Z)V
     .locals 5
 
-    const/high16 v0, 0x3f800000    # 1.0f
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const/high16 v1, 0x3f800000    # 1.0f
 
     if-eqz p1, :cond_0
 
@@ -50,22 +51,19 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    goto :goto_1
+    const/high16 v0, 0x3f800000    # 1.0f
 
     :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
     if-eqz p1, :cond_2
 
     const-wide/16 v3, 0xfa
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const-wide/16 v3, 0x96
 
-    :goto_2
+    :goto_1
     iget-object v1, p0, Landroidx/browser/browseractions/BrowserActionsFallbackMenuDialog;->mContentView:Landroid/view/View;
 
     invoke-virtual {v1, v2}, Landroid/view/View;->setScaleX(F)V
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali
index d645d5ad43..b4e53556bf 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/browseractions/BrowserActionsFallbackMenuUi$1;
 .super Ljava/lang/Object;
+.source "BrowserActionsFallbackMenuUi.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface$OnShowListener;
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$2.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$2.smali
index fb53416251..6944f2fcba 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$2.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/browseractions/BrowserActionsFallbackMenuUi$2;
 .super Ljava/lang/Object;
+.source "BrowserActionsFallbackMenuUi.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -60,7 +61,6 @@
 
     sget-object v0, Landroid/text/TextUtils$TruncateAt;->END:Landroid/text/TextUtils$TruncateAt;
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setEllipsize(Landroid/text/TextUtils$TruncateAt;)V
 
     return-void
@@ -74,5 +74,7 @@
 
     const/4 v0, 0x0
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setEllipsize(Landroid/text/TextUtils$TruncateAt;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$BrowserActionsFallMenuUiListener.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$BrowserActionsFallMenuUiListener.smali
index 604dc87eef..c0c453f8e9 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$BrowserActionsFallMenuUiListener.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$BrowserActionsFallMenuUiListener.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/browser/browseractions/BrowserActionsFallbackMenuUi$BrowserActionsFallMenuUiListener;
 .super Ljava/lang/Object;
+.source "BrowserActionsFallbackMenuUi.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.smali
index e54e1dd339..12b77e0675 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/browseractions/BrowserActionsFallbackMenuUi;
 .super Ljava/lang/Object;
+.source "BrowserActionsFallbackMenuUi.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuView.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuView.smali
index fce715a4ec..f612e1ff8f 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuView.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/browseractions/BrowserActionsFallbackMenuView;
 .super Landroid/widget/LinearLayout;
+.source "BrowserActionsFallbackMenuView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsFallDialogListener.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsFallDialogListener.smali
index fe7799bf75..08f18b3364 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsFallDialogListener.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsFallDialogListener.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/browser/browseractions/BrowserActionsIntent$BrowserActionsFallDialogListener;
 .super Ljava/lang/Object;
+.source "BrowserActionsIntent.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsItemId.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsItemId.smali
index 302d69d7bc..944bd693a5 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsItemId.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsItemId.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/browser/browseractions/BrowserActionsIntent$BrowserActionsItemId;
 .super Ljava/lang/Object;
+.source "BrowserActionsIntent.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsUrlType.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsUrlType.smali
index e1c37c16c9..6008355676 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsUrlType.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$BrowserActionsUrlType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/browser/browseractions/BrowserActionsIntent$BrowserActionsUrlType;
 .super Ljava/lang/Object;
+.source "BrowserActionsIntent.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$Builder.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$Builder.smali
index b189bf8b73..291c1de316 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$Builder.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/browseractions/BrowserActionsIntent$Builder;
 .super Ljava/lang/Object;
+.source "BrowserActionsIntent.java"
 
 
 # annotations
@@ -162,13 +163,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/browser/browseractions/BrowserActionsIntent$Builder;->mIntent:Landroid/content/Intent;
+    iget-object v1, p0, Landroidx/browser/browseractions/BrowserActionsIntent$Builder;->mIntent:Landroid/content/Intent;
 
-    const-string v1, "androidx.browser.browseractions.extra.SELECTED_ACTION_PENDING_INTENT"
+    const-string v2, "androidx.browser.browseractions.extra.SELECTED_ACTION_PENDING_INTENT"
 
-    iget-object v2, p0, Landroidx/browser/browseractions/BrowserActionsIntent$Builder;->mOnItemSelectedPendingIntent:Landroid/app/PendingIntent;
-
-    invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
+    invoke-virtual {v1, v2, v0}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
 
     :cond_0
     new-instance v0, Landroidx/browser/browseractions/BrowserActionsIntent;
@@ -275,6 +274,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final varargs setCustomItems([Landroidx/browser/browseractions/BrowserActionItem;)Landroidx/browser/browseractions/BrowserActionsIntent$Builder;
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent.smali
index 1b8a6b7c22..2ad04c6f40 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsIntent.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/browseractions/BrowserActionsIntent;
 .super Ljava/lang/Object;
+.source "BrowserActionsIntent.java"
 
 
 # annotations
@@ -433,8 +434,6 @@
 
     if-eqz p0, :cond_0
 
-    sget-object p0, Landroidx/browser/browseractions/BrowserActionsIntent;->sDialogListenter:Landroidx/browser/browseractions/BrowserActionsIntent$BrowserActionsFallDialogListener;
-
     invoke-interface {p0}, Landroidx/browser/browseractions/BrowserActionsIntent$BrowserActionsFallDialogListener;->onDialogShown()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsCallback.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsCallback.smali
index 06c963e035..92d8c21fc0 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsCallback.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsCallback.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/customtabs/CustomTabsCallback;
 .super Ljava/lang/Object;
+.source "CustomTabsCallback.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$1.smali
index 0af1222503..77057875f5 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/browser/customtabs/CustomTabsClient$1;
 .super Landroidx/browser/customtabs/CustomTabsServiceConnection;
+.source "CustomTabsClient.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$1.smali
index c6c840442c..b57158f0f2 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsClient$2$1;
 .super Ljava/lang/Object;
+.source "CustomTabsClient.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$2.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$2.smali
index e88c5e5d42..9fb3a6e6e9 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$2.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsClient$2$2;
 .super Ljava/lang/Object;
+.source "CustomTabsClient.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$3.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$3.smali
index 1d7b99a59d..e89b682441 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$3.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsClient$2$3;
 .super Ljava/lang/Object;
+.source "CustomTabsClient.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$4.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$4.smali
index 90bec7b6a0..679f376d78 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$4.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsClient$2$4;
 .super Ljava/lang/Object;
+.source "CustomTabsClient.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$5.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$5.smali
index 6d436ef2b7..addac8f4a0 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$5.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsClient$2$5;
 .super Ljava/lang/Object;
+.source "CustomTabsClient.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali
index c07e1b21b8..ac4dba899c 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsClient$2;
 .super Landroid/support/a/a$a;
+.source "CustomTabsClient.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali
index 46bbf74cee..26c70b3006 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/customtabs/CustomTabsClient;
 .super Ljava/lang/Object;
+.source "CustomTabsClient.java"
 
 
 # instance fields
@@ -281,6 +282,8 @@
 
     invoke-direct {p1, v1, v0, v2}, Landroidx/browser/customtabs/CustomTabsSession;-><init>(Landroid/support/a/b;Landroid/support/a/a;Landroid/content/ComponentName;)V
 
+    return-object p1
+
     :catch_0
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent$Builder.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent$Builder.smali
index f56a33c4fa..e62e4f0afe 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent$Builder.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/customtabs/CustomTabsIntent$Builder;
 .super Ljava/lang/Object;
+.source "CustomTabsIntent.java"
 
 
 # annotations
@@ -261,26 +262,22 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mIntent:Landroid/content/Intent;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mIntent:Landroid/content/Intent;
 
-    const-string v1, "android.support.customtabs.extra.MENU_ITEMS"
+    const-string v2, "android.support.customtabs.extra.MENU_ITEMS"
 
-    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mMenuItems:Ljava/util/ArrayList;
-
-    invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->putParcelableArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;
+    invoke-virtual {v1, v2, v0}, Landroid/content/Intent;->putParcelableArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;
 
     :cond_0
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mActionButtons:Ljava/util/ArrayList;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mIntent:Landroid/content/Intent;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mIntent:Landroid/content/Intent;
 
-    const-string v1, "android.support.customtabs.extra.TOOLBAR_ITEMS"
+    const-string v2, "android.support.customtabs.extra.TOOLBAR_ITEMS"
 
-    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mActionButtons:Ljava/util/ArrayList;
-
-    invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->putParcelableArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;
+    invoke-virtual {v1, v2, v0}, Landroid/content/Intent;->putParcelableArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;
 
     :cond_1
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->mIntent:Landroid/content/Intent;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent.smali
index cf9518cbc3..092a8b1ffd 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsIntent.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/customtabs/CustomTabsIntent;
 .super Ljava/lang/Object;
+.source "CustomTabsIntent.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1$1.smali
index 7f0c67069f..552f4339bb 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsService$1$1;
 .super Ljava/lang/Object;
+.source "CustomTabsService.java"
 
 # interfaces
 .implements Landroid/os/IBinder$DeathRecipient;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali
index 06b93a01e4..9604940077 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsService$1;
 .super Landroid/support/a/b$a;
+.source "CustomTabsService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Relation.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Relation.smali
index 5e2cc714d8..d4a34620ca 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Relation.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Relation.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/browser/customtabs/CustomTabsService$Relation;
 .super Ljava/lang/Object;
+.source "CustomTabsService.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Result.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Result.smali
index 1cae46543d..71a8307b17 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Result.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$Result.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/browser/customtabs/CustomTabsService$Result;
 .super Ljava/lang/Object;
+.source "CustomTabsService.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali
index 9b846e1fba..ef0200c9db 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/browser/customtabs/CustomTabsService;
 .super Landroid/app/Service;
+.source "CustomTabsService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali
index 8e1939ac51..21b4e518c4 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsServiceConnection$1;
 .super Landroidx/browser/customtabs/CustomTabsClient;
+.source "CustomTabsServiceConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali
index c592b64568..8c9d91ad6f 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/browser/customtabs/CustomTabsServiceConnection;
 .super Ljava/lang/Object;
+.source "CustomTabsServiceConnection.java"
 
 # interfaces
 .implements Landroid/content/ServiceConnection;
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali
index 7fa7290fe5..200c270186 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/browser/customtabs/CustomTabsSession;
 .super Ljava/lang/Object;
+.source "CustomTabsSession.java"
 
 
 # static fields
@@ -374,6 +375,8 @@
     return p1
 
     :catch_0
+    return v0
+
     :cond_1
     :goto_0
     return v0
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali
index 872d6ace35..bb5bbc3cc9 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsSessionToken$1;
 .super Landroidx/browser/customtabs/CustomTabsCallback;
+.source "CustomTabsSessionToken.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali
index 52707e475a..29e8e9f981 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/CustomTabsSessionToken$MockCallback;
 .super Landroid/support/a/a$a;
+.source "CustomTabsSessionToken.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali
index 587908ca9d..78eab25614 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/customtabs/CustomTabsSessionToken;
 .super Ljava/lang/Object;
+.source "CustomTabsSessionToken.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali b/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali
index c0164667f5..526f194da2 100644
--- a/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/browser/customtabs/PostMessageService$1;
 .super Landroid/support/a/c$a;
+.source "PostMessageService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali b/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali
index 29abc618c0..63807c4ffc 100644
--- a/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali
+++ b/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/customtabs/PostMessageService;
 .super Landroid/app/Service;
+.source "PostMessageService.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali b/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali
index a85c6d37a1..df62422b3e 100644
--- a/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali
+++ b/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/browser/customtabs/PostMessageServiceConnection;
 .super Ljava/lang/Object;
+.source "PostMessageServiceConnection.java"
 
 # interfaces
 .implements Landroid/content/ServiceConnection;
diff --git a/com.discord/smali/androidx/browser/customtabs/TrustedWebUtils.smali b/com.discord/smali/androidx/browser/customtabs/TrustedWebUtils.smali
index c58d07f587..a6cdbd1605 100644
--- a/com.discord/smali/androidx/browser/customtabs/TrustedWebUtils.smali
+++ b/com.discord/smali/androidx/browser/customtabs/TrustedWebUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/browser/customtabs/TrustedWebUtils;
 .super Ljava/lang/Object;
+.source "TrustedWebUtils.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/cardview/R$attr.smali b/com.discord/smali/androidx/cardview/R$attr.smali
index 450661d60e..b5698fb676 100644
--- a/com.discord/smali/androidx/cardview/R$attr.smali
+++ b/com.discord/smali/androidx/cardview/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/cardview/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/R$color.smali b/com.discord/smali/androidx/cardview/R$color.smali
index 258d904b8c..c43ff54c15 100644
--- a/com.discord/smali/androidx/cardview/R$color.smali
+++ b/com.discord/smali/androidx/cardview/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/cardview/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/R$dimen.smali b/com.discord/smali/androidx/cardview/R$dimen.smali
index 723c314924..b1f7338344 100644
--- a/com.discord/smali/androidx/cardview/R$dimen.smali
+++ b/com.discord/smali/androidx/cardview/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/cardview/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/R$style.smali b/com.discord/smali/androidx/cardview/R$style.smali
index 66b28278d5..a5a942848e 100644
--- a/com.discord/smali/androidx/cardview/R$style.smali
+++ b/com.discord/smali/androidx/cardview/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/cardview/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/R$styleable.smali b/com.discord/smali/androidx/cardview/R$styleable.smali
index b70e3912ba..11f2f1ce79 100644
--- a/com.discord/smali/androidx/cardview/R$styleable.smali
+++ b/com.discord/smali/androidx/cardview/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/cardview/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/R.smali b/com.discord/smali/androidx/cardview/R.smali
index d4ad026541..e093111d0f 100644
--- a/com.discord/smali/androidx/cardview/R.smali
+++ b/com.discord/smali/androidx/cardview/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/cardview/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/widget/CardView$1.smali b/com.discord/smali/androidx/cardview/widget/CardView$1.smali
index 2e50c0da50..6e6b44b7a6 100644
--- a/com.discord/smali/androidx/cardview/widget/CardView$1.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardView$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/CardView$1;
 .super Ljava/lang/Object;
+.source "CardView.java"
 
 # interfaces
 .implements Landroidx/cardview/widget/CardViewDelegate;
diff --git a/com.discord/smali/androidx/cardview/widget/CardView.smali b/com.discord/smali/androidx/cardview/widget/CardView.smali
index ddcf9a57f6..d502125776 100644
--- a/com.discord/smali/androidx/cardview/widget/CardView.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/cardview/widget/CardView;
 .super Landroid/widget/FrameLayout;
+.source "CardView.java"
 
 
 # static fields
@@ -50,10 +51,9 @@
 
     invoke-direct {v0}, Landroidx/cardview/widget/CardViewApi21Impl;-><init>()V
 
-    :goto_0
     sput-object v0, Landroidx/cardview/widget/CardView;->IMPL:Landroidx/cardview/widget/CardViewImpl;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -66,6 +66,8 @@
 
     invoke-direct {v0}, Landroidx/cardview/widget/CardViewApi17Impl;-><init>()V
 
+    sput-object v0, Landroidx/cardview/widget/CardView;->IMPL:Landroidx/cardview/widget/CardViewImpl;
+
     goto :goto_0
 
     :cond_1
@@ -73,9 +75,9 @@
 
     invoke-direct {v0}, Landroidx/cardview/widget/CardViewBaseImpl;-><init>()V
 
-    goto :goto_0
+    sput-object v0, Landroidx/cardview/widget/CardView;->IMPL:Landroidx/cardview/widget/CardViewImpl;
 
-    :goto_1
+    :goto_0
     sget-object v0, Landroidx/cardview/widget/CardView;->IMPL:Landroidx/cardview/widget/CardViewImpl;
 
     invoke-interface {v0}, Landroidx/cardview/widget/CardViewImpl;->initStatic()V
@@ -170,10 +172,9 @@
 
     move-result-object p3
 
-    :goto_0
     move-object v4, p3
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_0
     invoke-virtual {p0}, Landroidx/cardview/widget/CardView;->getContext()Landroid/content/Context;
@@ -214,12 +215,11 @@
 
     sget v1, Landroidx/cardview/R$color;->cardview_light_background:I
 
-    :goto_1
     invoke-virtual {p3, v1}, Landroid/content/res/Resources;->getColor(I)I
 
     move-result p3
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     invoke-virtual {p0}, Landroidx/cardview/widget/CardView;->getResources()Landroid/content/res/Resources;
@@ -228,16 +228,18 @@
 
     sget v1, Landroidx/cardview/R$color;->cardview_dark_background:I
 
-    goto :goto_1
+    invoke-virtual {p3, v1}, Landroid/content/res/Resources;->getColor(I)I
 
-    :goto_2
+    move-result p3
+
+    :goto_0
     invoke-static {p3}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
 
     move-result-object p3
 
-    goto :goto_0
+    move-object v4, p3
 
-    :goto_3
+    :goto_1
     sget p3, Landroidx/cardview/R$styleable;->CardView_cardCornerRadius:I
 
     const/4 v1, 0x0
@@ -328,12 +330,12 @@
 
     move v7, v6
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_2
     move v7, p3
 
-    :goto_4
+    :goto_2
     sget p3, Landroidx/cardview/R$styleable;->CardView_android_minWidth:I
 
     invoke-virtual {p2, p3, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
diff --git a/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl$1.smali b/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl$1.smali
index 540367dd2c..93c35cc14e 100644
--- a/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl$1.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/CardViewApi17Impl$1;
 .super Ljava/lang/Object;
+.source "CardViewApi17Impl.java"
 
 # interfaces
 .implements Landroidx/cardview/widget/RoundRectDrawableWithShadow$RoundRectHelper;
diff --git a/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl.smali b/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl.smali
index 592a5c0903..259f3e8b68 100644
--- a/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardViewApi17Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/CardViewApi17Impl;
 .super Landroidx/cardview/widget/CardViewBaseImpl;
+.source "CardViewApi17Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/widget/CardViewApi21Impl.smali b/com.discord/smali/androidx/cardview/widget/CardViewApi21Impl.smali
index ffe45c5052..d3dbdfb287 100644
--- a/com.discord/smali/androidx/cardview/widget/CardViewApi21Impl.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardViewApi21Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/CardViewApi21Impl;
 .super Ljava/lang/Object;
+.source "CardViewApi21Impl.java"
 
 # interfaces
 .implements Landroidx/cardview/widget/CardViewImpl;
diff --git a/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl$1.smali b/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl$1.smali
index f98a5fd6f3..0a4d5c0d31 100644
--- a/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl$1.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/CardViewBaseImpl$1;
 .super Ljava/lang/Object;
+.source "CardViewBaseImpl.java"
 
 # interfaces
 .implements Landroidx/cardview/widget/RoundRectDrawableWithShadow$RoundRectHelper;
@@ -34,9 +35,9 @@
 
 # virtual methods
 .method public drawRoundRect(Landroid/graphics/Canvas;Landroid/graphics/RectF;FLandroid/graphics/Paint;)V
-    .locals 15
+    .locals 16
 
-    move-object v0, p0
+    move-object/from16 v0, p0
 
     move-object/from16 v7, p1
 
@@ -114,9 +115,9 @@
 
     invoke-virtual {v7, v10, v14}, Landroid/graphics/Canvas;->translate(FF)V
 
-    const/high16 v6, 0x42b40000    # 90.0f
+    const/high16 v15, 0x42b40000    # 90.0f
 
-    invoke-virtual {v7, v6}, Landroid/graphics/Canvas;->rotate(F)V
+    invoke-virtual {v7, v15}, Landroid/graphics/Canvas;->rotate(F)V
 
     iget-object v1, v0, Landroidx/cardview/widget/CardViewBaseImpl$1;->this$0:Landroidx/cardview/widget/CardViewBaseImpl;
 
@@ -124,15 +125,11 @@
 
     move-object/from16 v1, p1
 
-    const/high16 v9, 0x42b40000    # 90.0f
-
-    move-object/from16 v6, p4
-
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawArc(Landroid/graphics/RectF;FFZLandroid/graphics/Paint;)V
 
     invoke-virtual {v7, v11, v14}, Landroid/graphics/Canvas;->translate(FF)V
 
-    invoke-virtual {v7, v9}, Landroid/graphics/Canvas;->rotate(F)V
+    invoke-virtual {v7, v15}, Landroid/graphics/Canvas;->rotate(F)V
 
     iget-object v1, v0, Landroidx/cardview/widget/CardViewBaseImpl$1;->this$0:Landroidx/cardview/widget/CardViewBaseImpl;
 
@@ -144,7 +141,7 @@
 
     invoke-virtual {v7, v10, v14}, Landroid/graphics/Canvas;->translate(FF)V
 
-    invoke-virtual {v7, v9}, Landroid/graphics/Canvas;->rotate(F)V
+    invoke-virtual {v7, v15}, Landroid/graphics/Canvas;->rotate(F)V
 
     iget-object v1, v0, Landroidx/cardview/widget/CardViewBaseImpl$1;->this$0:Landroidx/cardview/widget/CardViewBaseImpl;
 
@@ -160,68 +157,44 @@
 
     add-float/2addr v1, v12
 
-    const/high16 v2, 0x3f800000    # 1.0f
+    sub-float v2, v1, v9
 
-    sub-float v3, v1, v2
-
-    iget v4, v8, Landroid/graphics/RectF;->top:F
+    iget v3, v8, Landroid/graphics/RectF;->top:F
 
     iget v1, v8, Landroid/graphics/RectF;->right:F
 
     sub-float/2addr v1, v12
 
-    add-float v5, v1, v2
+    add-float v4, v1, v9
 
     iget v1, v8, Landroid/graphics/RectF;->top:F
 
-    add-float v6, v1, v12
+    add-float v5, v1, v12
 
     move-object/from16 v1, p1
 
-    move v2, v3
-
-    move v3, v4
-
-    move v4, v5
-
-    move v5, v6
-
-    move-object/from16 v6, p4
-
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
     iget v1, v8, Landroid/graphics/RectF;->left:F
 
     add-float/2addr v1, v12
 
-    const/high16 v2, 0x3f800000    # 1.0f
-
-    sub-float v3, v1, v2
+    sub-float v2, v1, v9
 
     iget v1, v8, Landroid/graphics/RectF;->bottom:F
 
-    sub-float v4, v1, v12
+    sub-float v3, v1, v12
 
     iget v1, v8, Landroid/graphics/RectF;->right:F
 
     sub-float/2addr v1, v12
 
-    add-float v5, v1, v2
+    add-float v4, v1, v9
 
-    iget v6, v8, Landroid/graphics/RectF;->bottom:F
+    iget v5, v8, Landroid/graphics/RectF;->bottom:F
 
     move-object/from16 v1, p1
 
-    move v2, v3
-
-    move v3, v4
-
-    move v4, v5
-
-    move v5, v6
-
-    move-object/from16 v6, p4
-
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl.smali b/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl.smali
index 4052eef62c..df7b2548c6 100644
--- a/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardViewBaseImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/CardViewBaseImpl;
 .super Ljava/lang/Object;
+.source "CardViewBaseImpl.java"
 
 # interfaces
 .implements Landroidx/cardview/widget/CardViewImpl;
diff --git a/com.discord/smali/androidx/cardview/widget/CardViewDelegate.smali b/com.discord/smali/androidx/cardview/widget/CardViewDelegate.smali
index 0f78b0ef08..f6f5f3abea 100644
--- a/com.discord/smali/androidx/cardview/widget/CardViewDelegate.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardViewDelegate.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/cardview/widget/CardViewDelegate;
 .super Ljava/lang/Object;
+.source "CardViewDelegate.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/cardview/widget/CardViewImpl.smali b/com.discord/smali/androidx/cardview/widget/CardViewImpl.smali
index c29fe92c4b..4b0dc94103 100644
--- a/com.discord/smali/androidx/cardview/widget/CardViewImpl.smali
+++ b/com.discord/smali/androidx/cardview/widget/CardViewImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/cardview/widget/CardViewImpl;
 .super Ljava/lang/Object;
+.source "CardViewImpl.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/cardview/widget/RoundRectDrawable.smali b/com.discord/smali/androidx/cardview/widget/RoundRectDrawable.smali
index 159a64d0ce..4059cb0f64 100644
--- a/com.discord/smali/androidx/cardview/widget/RoundRectDrawable.smali
+++ b/com.discord/smali/androidx/cardview/widget/RoundRectDrawable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/RoundRectDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "RoundRectDrawable.java"
 
 
 # annotations
@@ -238,7 +239,7 @@
 
 # virtual methods
 .method public draw(Landroid/graphics/Canvas;)V
-    .locals 5
+    .locals 4
 
     iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawable;->mPaint:Landroid/graphics/Paint;
 
@@ -268,9 +269,7 @@
 
     iget v3, p0, Landroidx/cardview/widget/RoundRectDrawable;->mRadius:F
 
-    iget v4, p0, Landroidx/cardview/widget/RoundRectDrawable;->mRadius:F
-
-    invoke-virtual {p1, v2, v3, v4, v0}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, v2, v3, v3, v0}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
     if-eqz v1, :cond_1
 
@@ -333,8 +332,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawable;->mTint:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->isStateful()Z
 
     move-result v0
@@ -346,8 +343,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawable;->mBackground:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->isStateful()Z
 
     move-result v0
@@ -387,9 +382,7 @@
 
     iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawable;->mBackground:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p0, Landroidx/cardview/widget/RoundRectDrawable;->mBackground:Landroid/content/res/ColorStateList;
-
-    invoke-virtual {v1}, Landroid/content/res/ColorStateList;->getDefaultColor()I
+    invoke-virtual {v0}, Landroid/content/res/ColorStateList;->getDefaultColor()I
 
     move-result v1
 
@@ -426,15 +419,11 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/cardview/widget/RoundRectDrawable;->mTintMode:Landroid/graphics/PorterDuff$Mode;
+    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawable;->mTintMode:Landroid/graphics/PorterDuff$Mode;
 
-    if-eqz p1, :cond_2
+    if-eqz v2, :cond_2
 
-    iget-object p1, p0, Landroidx/cardview/widget/RoundRectDrawable;->mTint:Landroid/content/res/ColorStateList;
-
-    iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawable;->mTintMode:Landroid/graphics/PorterDuff$Mode;
-
-    invoke-direct {p0, p1, v0}, Landroidx/cardview/widget/RoundRectDrawable;->createTintFilter(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
+    invoke-direct {p0, p1, v2}, Landroidx/cardview/widget/RoundRectDrawable;->createTintFilter(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
 
     move-result-object p1
 
diff --git a/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow$RoundRectHelper.smali b/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow$RoundRectHelper.smali
index b3a5b79600..f674919194 100644
--- a/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow$RoundRectHelper.smali
+++ b/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow$RoundRectHelper.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/cardview/widget/RoundRectDrawableWithShadow$RoundRectHelper;
 .super Ljava/lang/Object;
+.source "RoundRectDrawableWithShadow.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali b/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali
index e115ef93fa..3ce295f1bd 100644
--- a/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali
+++ b/com.discord/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cardview/widget/RoundRectDrawableWithShadow;
 .super Landroid/graphics/drawable/Drawable;
+.source "RoundRectDrawableWithShadow.java"
 
 
 # annotations
@@ -220,17 +221,11 @@
 
     iget v2, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
-    neg-float v2, v2
+    neg-float v3, v2
 
-    iget v3, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
+    neg-float v4, v2
 
-    neg-float v3, v3
-
-    iget v4, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
-
-    iget v5, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
-
-    invoke-direct {v1, v2, v3, v4, v5}, Landroid/graphics/RectF;-><init>(FFFF)V
+    invoke-direct {v1, v3, v4, v2, v2}, Landroid/graphics/RectF;-><init>(FFFF)V
 
     new-instance v2, Landroid/graphics/RectF;
 
@@ -238,13 +233,11 @@
 
     iget v3, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
 
+    neg-float v4, v3
+
     neg-float v3, v3
 
-    iget v4, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
-
-    neg-float v4, v4
-
-    invoke-virtual {v2, v3, v4}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v2, v4, v3}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v3, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
 
@@ -259,8 +252,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
-
     invoke-virtual {v3}, Landroid/graphics/Path;->reset()V
 
     :goto_0
@@ -312,119 +303,105 @@
 
     iget v1, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
-    iget v2, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
+    iget v2, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
 
-    iget v3, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
+    add-float v3, v1, v2
 
-    add-float/2addr v2, v3
+    div-float v3, v1, v3
 
-    div-float/2addr v1, v2
+    iget-object v4, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
 
-    iget-object v2, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
-
-    new-instance v3, Landroid/graphics/RadialGradient;
+    new-instance v6, Landroid/graphics/RadialGradient;
 
     const/4 v9, 0x0
 
     const/4 v10, 0x0
 
-    iget v4, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
+    add-float v11, v1, v2
 
-    iget v6, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
+    const/4 v1, 0x3
 
-    add-float v11, v4, v6
+    new-array v12, v1, [I
 
-    const/4 v4, 0x3
+    iget v2, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowStartColor:I
 
-    new-array v12, v4, [I
-
-    iget v6, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowStartColor:I
-
-    aput v6, v12, v7
-
-    iget v6, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowStartColor:I
+    aput v2, v12, v7
 
     const/4 v15, 0x1
 
-    aput v6, v12, v15
+    aput v2, v12, v15
 
-    iget v6, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowEndColor:I
+    iget v2, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowEndColor:I
 
     const/16 v16, 0x2
 
-    aput v6, v12, v16
+    aput v2, v12, v16
 
-    new-array v13, v4, [F
+    new-array v13, v1, [F
 
     aput v5, v13, v7
 
-    aput v1, v13, v15
+    aput v3, v13, v15
 
-    const/high16 v1, 0x3f800000    # 1.0f
+    const/high16 v2, 0x3f800000    # 1.0f
 
-    aput v1, v13, v16
+    aput v2, v13, v16
 
     sget-object v14, Landroid/graphics/Shader$TileMode;->CLAMP:Landroid/graphics/Shader$TileMode;
 
-    move-object v8, v3
+    move-object v8, v6
 
     invoke-direct/range {v8 .. v14}, Landroid/graphics/RadialGradient;-><init>(FFF[I[FLandroid/graphics/Shader$TileMode;)V
 
-    invoke-virtual {v2, v3}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
+    invoke-virtual {v4, v6}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
-    iget-object v1, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
+    iget-object v2, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
 
-    new-instance v2, Landroid/graphics/LinearGradient;
+    new-instance v3, Landroid/graphics/LinearGradient;
 
     const/16 v18, 0x0
 
-    iget v3, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
+    iget v4, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
-    neg-float v3, v3
+    neg-float v5, v4
 
-    iget v5, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
+    iget v6, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
 
-    add-float v19, v3, v5
+    add-float v19, v5, v6
 
     const/16 v20, 0x0
 
-    iget v3, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
+    neg-float v4, v4
 
-    neg-float v3, v3
+    sub-float v21, v4, v6
 
-    iget v5, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
-
-    sub-float v21, v3, v5
-
-    new-array v3, v4, [I
+    new-array v4, v1, [I
 
     iget v5, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowStartColor:I
 
-    aput v5, v3, v7
+    aput v5, v4, v7
 
-    iget v5, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowStartColor:I
-
-    aput v5, v3, v15
+    aput v5, v4, v15
 
     iget v5, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowEndColor:I
 
-    aput v5, v3, v16
+    aput v5, v4, v16
 
-    new-array v4, v4, [F
+    new-array v1, v1, [F
 
-    fill-array-data v4, :array_0
+    fill-array-data v1, :array_0
 
     sget-object v24, Landroid/graphics/Shader$TileMode;->CLAMP:Landroid/graphics/Shader$TileMode;
 
-    move-object/from16 v17, v2
+    move-object/from16 v17, v3
 
-    move-object/from16 v22, v3
+    move-object/from16 v22, v4
 
-    move-object/from16 v23, v4
+    move-object/from16 v23, v1
 
     invoke-direct/range {v17 .. v24}, Landroid/graphics/LinearGradient;-><init>(FFFF[I[FLandroid/graphics/Shader$TileMode;)V
 
-    invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
+    invoke-virtual {v2, v3}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
     iget-object v1, v0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
 
@@ -465,6 +442,8 @@
 
     double-to-float p0, v0
 
+    return p0
+
     :cond_0
     return p0
 .end method
@@ -511,19 +490,17 @@
 
     iget v0, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
-    neg-float v0, v0
+    neg-float v1, v0
 
-    iget v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
+    iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
 
-    sub-float/2addr v0, v1
-
-    iget v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
+    sub-float/2addr v1, v2
 
     iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mInsetShadow:I
 
     int-to-float v2, v2
 
-    add-float/2addr v1, v2
+    add-float/2addr v0, v2
 
     iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mRawShadowSize:F
 
@@ -531,7 +508,7 @@
 
     div-float/2addr v2, v3
 
-    add-float/2addr v1, v2
+    add-float/2addr v0, v2
 
     iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
@@ -539,13 +516,13 @@
 
     move-result v2
 
-    mul-float v8, v1, v3
+    mul-float v9, v0, v3
 
-    sub-float/2addr v2, v8
+    sub-float/2addr v2, v9
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
@@ -553,25 +530,25 @@
 
     if-lez v2, :cond_0
 
-    const/4 v9, 0x1
+    const/4 v2, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v9, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
+    iget-object v6, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
+    invoke-virtual {v6}, Landroid/graphics/RectF;->height()F
 
-    move-result v2
+    move-result v6
 
-    sub-float/2addr v2, v8
+    sub-float/2addr v6, v9
 
-    cmpl-float v2, v2, v5
+    cmpl-float v5, v6, v5
 
-    if-lez v2, :cond_1
+    if-lez v5, :cond_1
 
     const/4 v10, 0x1
 
@@ -585,49 +562,49 @@
 
     move-result v11
 
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
+    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    iget v2, v2, Landroid/graphics/RectF;->left:F
+    iget v3, v3, Landroid/graphics/RectF;->left:F
 
-    add-float/2addr v2, v1
+    add-float/2addr v3, v0
+
+    iget-object v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
+
+    iget v4, v4, Landroid/graphics/RectF;->top:F
+
+    add-float/2addr v4, v0
+
+    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->translate(FF)V
+
+    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
+
+    iget-object v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+
+    if-eqz v2, :cond_2
+
+    const/4 v4, 0x0
 
     iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    iget v3, v3, Landroid/graphics/RectF;->top:F
+    invoke-virtual {v3}, Landroid/graphics/RectF;->width()F
 
-    add-float/2addr v3, v1
+    move-result v3
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->translate(FF)V
+    sub-float v6, v3, v9
 
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
+    iget v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
-    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+    neg-float v7, v3
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+    iget-object v8, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
 
-    if-eqz v9, :cond_2
+    move-object v3, p1
 
-    const/4 v3, 0x0
+    move v5, v1
 
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
-
-    invoke-virtual {v2}, Landroid/graphics/RectF;->width()F
-
-    move-result v2
-
-    sub-float v5, v2, v8
-
-    iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
-
-    neg-float v6, v2
-
-    iget-object v7, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
-
-    move-object v2, p1
-
-    move v4, v0
-
-    invoke-virtual/range {v2 .. v7}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+    invoke-virtual/range {v3 .. v8}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
     :cond_2
     invoke-virtual {p1, v11}, Landroid/graphics/Canvas;->restoreToCount(I)V
@@ -636,33 +613,33 @@
 
     move-result v11
 
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
-
-    iget v2, v2, Landroid/graphics/RectF;->right:F
-
-    sub-float/2addr v2, v1
-
     iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    iget v3, v3, Landroid/graphics/RectF;->bottom:F
+    iget v3, v3, Landroid/graphics/RectF;->right:F
 
-    sub-float/2addr v3, v1
+    sub-float/2addr v3, v0
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->translate(FF)V
+    iget-object v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    const/high16 v2, 0x43340000    # 180.0f
+    iget v4, v4, Landroid/graphics/RectF;->bottom:F
 
-    invoke-virtual {p1, v2}, Landroid/graphics/Canvas;->rotate(F)V
+    sub-float/2addr v4, v0
 
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
+    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+    const/high16 v3, 0x43340000    # 180.0f
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+    invoke-virtual {p1, v3}, Landroid/graphics/Canvas;->rotate(F)V
 
-    if-eqz v9, :cond_3
+    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
 
-    const/4 v3, 0x0
+    iget-object v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+
+    if-eqz v2, :cond_3
+
+    const/4 v4, 0x0
 
     iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
@@ -670,136 +647,136 @@
 
     move-result v2
 
-    sub-float v5, v2, v8
+    sub-float v6, v2, v9
 
     iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
     neg-float v2, v2
 
-    iget v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
+    iget v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mShadowSize:F
 
-    add-float v6, v2, v4
+    add-float v7, v2, v3
 
-    iget-object v7, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
+    iget-object v8, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
 
-    move-object v2, p1
+    move-object v3, p1
 
-    move v4, v0
+    move v5, v1
 
-    invoke-virtual/range {v2 .. v7}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+    invoke-virtual/range {v3 .. v8}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
     :cond_3
     invoke-virtual {p1, v11}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
-    move-result v9
-
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
-
-    iget v2, v2, Landroid/graphics/RectF;->left:F
-
-    add-float/2addr v2, v1
+    move-result v2
 
     iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    iget v3, v3, Landroid/graphics/RectF;->bottom:F
+    iget v3, v3, Landroid/graphics/RectF;->left:F
 
-    sub-float/2addr v3, v1
+    add-float/2addr v3, v0
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->translate(FF)V
+    iget-object v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    const/high16 v2, 0x43870000    # 270.0f
+    iget v4, v4, Landroid/graphics/RectF;->bottom:F
 
-    invoke-virtual {p1, v2}, Landroid/graphics/Canvas;->rotate(F)V
+    sub-float/2addr v4, v0
 
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
+    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+    const/high16 v3, 0x43870000    # 270.0f
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+    invoke-virtual {p1, v3}, Landroid/graphics/Canvas;->rotate(F)V
+
+    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
+
+    iget-object v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
     if-eqz v10, :cond_4
 
-    const/4 v3, 0x0
-
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
-
-    invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
-
-    move-result v2
-
-    sub-float v5, v2, v8
-
-    iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
-
-    neg-float v6, v2
-
-    iget-object v7, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
-
-    move-object v2, p1
-
-    move v4, v0
-
-    invoke-virtual/range {v2 .. v7}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
-
-    :cond_4
-    invoke-virtual {p1, v9}, Landroid/graphics/Canvas;->restoreToCount(I)V
-
-    invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
-
-    move-result v9
-
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
-
-    iget v2, v2, Landroid/graphics/RectF;->right:F
-
-    sub-float/2addr v2, v1
+    const/4 v4, 0x0
 
     iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    iget v3, v3, Landroid/graphics/RectF;->top:F
+    invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
-    add-float/2addr v3, v1
+    move-result v3
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->translate(FF)V
+    sub-float v6, v3, v9
 
-    const/high16 v1, 0x42b40000    # 90.0f
+    iget v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
-    invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->rotate(F)V
+    neg-float v7, v3
 
-    iget-object v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
+    iget-object v8, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
 
-    iget-object v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+    move-object v3, p1
 
-    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+    move v5, v1
+
+    invoke-virtual/range {v3 .. v8}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    :cond_4
+    invoke-virtual {p1, v2}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
+
+    move-result v2
+
+    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
+
+    iget v3, v3, Landroid/graphics/RectF;->right:F
+
+    sub-float/2addr v3, v0
+
+    iget-object v4, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
+
+    iget v4, v4, Landroid/graphics/RectF;->top:F
+
+    add-float/2addr v4, v0
+
+    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->translate(FF)V
+
+    const/high16 v0, 0x42b40000    # 90.0f
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->rotate(F)V
+
+    iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPath:Landroid/graphics/Path;
+
+    iget-object v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerShadowPaint:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v0, v3}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
     if-eqz v10, :cond_5
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    iget-object v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
+    iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCardBounds:Landroid/graphics/RectF;
 
-    invoke-virtual {v1}, Landroid/graphics/RectF;->height()F
+    invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
 
-    move-result v1
+    move-result v0
 
-    sub-float v5, v1, v8
+    sub-float v6, v0, v9
 
-    iget v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
+    iget v0, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mCornerRadius:F
 
-    neg-float v6, v1
+    neg-float v7, v0
 
-    iget-object v7, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
+    iget-object v8, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mEdgeShadowPaint:Landroid/graphics/Paint;
 
-    move-object v2, p1
+    move-object v3, p1
 
-    move v4, v0
+    move v5, v1
 
-    invoke-virtual/range {v2 .. v7}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+    invoke-virtual/range {v3 .. v8}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
     :cond_5
-    invoke-virtual {p1, v9}, Landroid/graphics/Canvas;->restoreToCount(I)V
+    invoke-virtual {p1, v2}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     return-void
 .end method
@@ -991,6 +968,8 @@
 
     sub-int/2addr p1, v1
 
+    return p1
+
     :cond_0
     return p1
 .end method
@@ -1093,17 +1072,15 @@
 
     add-float/2addr v1, v2
 
-    iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mRawMaxShadowSize:F
+    const/high16 v2, 0x3fc00000    # 1.5f
 
-    const/high16 v3, 0x3fc00000    # 1.5f
-
-    mul-float v2, v2, v3
+    mul-float v3, v0, v2
 
     const/high16 v4, 0x40000000    # 2.0f
 
-    div-float/2addr v2, v4
+    div-float/2addr v3, v4
 
-    add-float/2addr v1, v2
+    add-float/2addr v1, v3
 
     invoke-static {v0, v1}, Ljava/lang/Math;->max(FF)F
 
@@ -1113,7 +1090,7 @@
 
     iget v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mRawMaxShadowSize:F
 
-    mul-float v1, v1, v3
+    mul-float v1, v1, v2
 
     iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mInsetShadow:I
 
@@ -1141,29 +1118,27 @@
 
     add-float/2addr v1, v2
 
-    iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mRawMaxShadowSize:F
+    const/high16 v2, 0x40000000    # 2.0f
 
-    const/high16 v3, 0x40000000    # 2.0f
+    div-float v3, v0, v2
 
-    div-float/2addr v2, v3
-
-    add-float/2addr v1, v2
+    add-float/2addr v1, v3
 
     invoke-static {v0, v1}, Ljava/lang/Math;->max(FF)F
 
     move-result v0
 
-    mul-float v0, v0, v3
+    mul-float v0, v0, v2
 
     iget v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mRawMaxShadowSize:F
 
-    iget v2, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mInsetShadow:I
+    iget v3, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mInsetShadow:I
 
-    int-to-float v2, v2
+    int-to-float v3, v3
 
-    add-float/2addr v1, v2
+    add-float/2addr v1, v3
 
-    mul-float v1, v1, v3
+    mul-float v1, v1, v2
 
     add-float/2addr v0, v1
 
@@ -1239,8 +1214,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mBackground:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->isStateful()Z
 
     move-result v0
@@ -1282,9 +1255,7 @@
 
     iget-object v0, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mBackground:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p0, Landroidx/cardview/widget/RoundRectDrawableWithShadow;->mBackground:Landroid/content/res/ColorStateList;
-
-    invoke-virtual {v1}, Landroid/content/res/ColorStateList;->getDefaultColor()I
+    invoke-virtual {v0}, Landroid/content/res/ColorStateList;->getDefaultColor()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/collection/ArrayMap$1.smali b/com.discord/smali/androidx/collection/ArrayMap$1.smali
index b0385feab7..142d7f6cf1 100644
--- a/com.discord/smali/androidx/collection/ArrayMap$1.smali
+++ b/com.discord/smali/androidx/collection/ArrayMap$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/collection/ArrayMap$1;
 .super Landroidx/collection/MapCollections;
+.source "ArrayMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/collection/ArrayMap.smali b/com.discord/smali/androidx/collection/ArrayMap.smali
index ff36ea924e..20c40e1d8a 100644
--- a/com.discord/smali/androidx/collection/ArrayMap.smali
+++ b/com.discord/smali/androidx/collection/ArrayMap.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/collection/ArrayMap;
 .super Landroidx/collection/SimpleArrayMap;
+.source "ArrayMap.java"
 
 # interfaces
 .implements Ljava/util/Map;
diff --git a/com.discord/smali/androidx/collection/ArraySet$1.smali b/com.discord/smali/androidx/collection/ArraySet$1.smali
index 71c8b9cf04..bb744bd1d3 100644
--- a/com.discord/smali/androidx/collection/ArraySet$1.smali
+++ b/com.discord/smali/androidx/collection/ArraySet$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/collection/ArraySet$1;
 .super Landroidx/collection/MapCollections;
+.source "ArraySet.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/collection/ArraySet.smali b/com.discord/smali/androidx/collection/ArraySet.smali
index 7646ee568a..85f7234c7c 100644
--- a/com.discord/smali/androidx/collection/ArraySet.smali
+++ b/com.discord/smali/androidx/collection/ArraySet.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/collection/ArraySet;
 .super Ljava/lang/Object;
+.source "ArraySet.java"
 
 # interfaces
 .implements Ljava/util/Collection;
@@ -659,7 +660,7 @@
 
 # virtual methods
 .method public final add(Ljava/lang/Object;)Z
-    .locals 9
+    .locals 8
     .param p1    # Ljava/lang/Object;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
@@ -691,11 +692,11 @@
 
     move-result v2
 
-    move v8, v2
+    move v7, v2
 
     move v2, v1
 
-    move v1, v8
+    move v1, v7
 
     :goto_0
     if-ltz v1, :cond_1
@@ -711,31 +712,21 @@
 
     array-length v4, v4
 
-    const/4 v5, 0x1
-
     if-lt v3, v4, :cond_5
 
-    iget v3, p0, Landroidx/collection/ArraySet;->mSize:I
-
     const/4 v4, 0x4
 
-    const/16 v6, 0x8
+    const/16 v5, 0x8
 
-    if-lt v3, v6, :cond_2
+    if-lt v3, v5, :cond_2
 
-    iget v3, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    shr-int/2addr v4, v5
+    shr-int/lit8 v4, v3, 0x1
 
     add-int/2addr v4, v3
 
     goto :goto_1
 
     :cond_2
-    iget v3, p0, Landroidx/collection/ArraySet;->mSize:I
-
     if-lt v3, v4, :cond_3
 
     const/16 v4, 0x8
@@ -744,55 +735,51 @@
     :goto_1
     iget-object v3, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    iget-object v6, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
+    iget-object v5, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
     invoke-direct {p0, v4}, Landroidx/collection/ArraySet;->allocArrays(I)V
 
     iget-object v4, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    array-length v4, v4
+    array-length v6, v4
 
-    if-lez v4, :cond_4
+    if-lez v6, :cond_4
 
-    iget-object v4, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    array-length v6, v3
 
-    array-length v7, v3
-
-    invoke-static {v3, v0, v4, v0, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v3, v0, v4, v0, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v4, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    array-length v7, v6
+    array-length v6, v5
 
-    invoke-static {v6, v0, v4, v0, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v5, v0, v4, v0, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_4
     iget v0, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    invoke-static {v3, v6, v0}, Landroidx/collection/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V
+    invoke-static {v3, v5, v0}, Landroidx/collection/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V
 
     :cond_5
     iget v0, p0, Landroidx/collection/ArraySet;->mSize:I
 
     if-ge v1, v0, :cond_6
 
-    iget-object v0, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    iget-object v3, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    add-int/lit8 v3, v1, 0x1
+    add-int/lit8 v4, v1, 0x1
 
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
+    sub-int/2addr v0, v1
 
-    sub-int/2addr v4, v1
-
-    invoke-static {v0, v1, v0, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v3, v1, v3, v4, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v0, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget v3, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    sub-int/2addr v4, v1
+    sub-int/2addr v3, v1
 
-    invoke-static {v0, v1, v0, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v0, v4, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_6
     iget-object v0, p0, Landroidx/collection/ArraySet;->mHashes:[I
@@ -805,11 +792,13 @@
 
     iget p1, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    add-int/2addr p1, v5
+    const/4 v0, 0x1
+
+    add-int/2addr p1, v0
 
     iput p1, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    return v5
+    return v0
 .end method
 
 .method public final addAll(Landroidx/collection/ArraySet;)V
@@ -959,14 +948,12 @@
     :goto_0
     iget-object v2, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_2
+    if-ge v0, v3, :cond_2
 
     if-lez v0, :cond_1
 
-    iget-object v2, p0, Landroidx/collection/ArraySet;->mHashes:[I
-
     add-int/lit8 v3, v0, -0x1
 
     aget v2, v2, v3
@@ -1009,13 +996,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    iget-object v1, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
+    iget-object v2, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    iget v2, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    invoke-static {v0, v1, v2}, Landroidx/collection/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V
+    invoke-static {v1, v2, v0}, Landroidx/collection/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V
 
     sget-object v0, Landroidx/collection/ArraySet;->INT:[I
 
@@ -1106,11 +1091,9 @@
 
     iget-object v0, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-ge v0, p1, :cond_1
-
-    iget-object v0, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    if-ge v1, p1, :cond_1
 
     iget-object v1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
@@ -1120,13 +1103,11 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Landroidx/collection/ArraySet;->mHashes:[I
-
-    iget v2, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget-object v2, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
     const/4 v3, 0x0
 
-    invoke-static {v0, v3, p1, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v2, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object p1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
@@ -1190,7 +1171,7 @@
 
     move-result v3
     :try_end_0
-    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
 
     if-nez v3, :cond_2
@@ -1206,6 +1187,11 @@
     return v0
 
     :catch_0
+    return v2
+
+    :catch_1
+    return v2
+
     :cond_4
     return v2
 .end method
@@ -1422,7 +1408,7 @@
 .end method
 
 .method public final removeAt(I)Ljava/lang/Object;
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I)TE;"
@@ -1431,23 +1417,19 @@
 
     iget-object v0, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    aget-object v0, v0, p1
+    aget-object v1, v0, p1
 
-    iget v1, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget v2, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
-    if-gt v1, v3, :cond_0
+    if-gt v2, v4, :cond_0
 
     iget-object p1, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
-
-    iget v3, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    invoke-static {p1, v1, v3}, Landroidx/collection/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V
+    invoke-static {p1, v0, v2}, Landroidx/collection/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V
 
     sget-object p1, Landroidx/collection/ArraySet;->INT:[I
 
@@ -1457,134 +1439,116 @@
 
     iput-object p1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    iput v2, p0, Landroidx/collection/ArraySet;->mSize:I
+    iput v3, p0, Landroidx/collection/ArraySet;->mSize:I
 
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    iget-object v0, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    array-length v1, v1
+    array-length v5, v0
 
-    const/16 v4, 0x8
+    const/16 v6, 0x8
 
-    if-le v1, v4, :cond_3
+    if-le v5, v6, :cond_3
 
-    iget v1, p0, Landroidx/collection/ArraySet;->mSize:I
+    array-length v0, v0
 
-    iget-object v5, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    div-int/lit8 v0, v0, 0x3
 
-    array-length v5, v5
+    if-ge v2, v0, :cond_3
 
-    div-int/lit8 v5, v5, 0x3
+    if-le v2, v6, :cond_1
 
-    if-ge v1, v5, :cond_3
+    shr-int/lit8 v0, v2, 0x1
 
-    iget v1, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    if-le v1, v4, :cond_1
-
-    iget v1, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    shr-int/2addr v4, v3
-
-    add-int/2addr v4, v1
+    add-int v6, v2, v0
 
     :cond_1
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    iget-object v0, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    iget-object v5, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
+    iget-object v2, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    invoke-direct {p0, v4}, Landroidx/collection/ArraySet;->allocArrays(I)V
+    invoke-direct {p0, v6}, Landroidx/collection/ArraySet;->allocArrays(I)V
 
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget v5, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    sub-int/2addr v4, v3
+    sub-int/2addr v5, v4
 
-    iput v4, p0, Landroidx/collection/ArraySet;->mSize:I
+    iput v5, p0, Landroidx/collection/ArraySet;->mSize:I
 
     if-lez p1, :cond_2
 
-    iget-object v3, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    iget-object v4, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    invoke-static {v1, v2, v3, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v4, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v3, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
+    iget-object v4, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    invoke-static {v5, v2, v3, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v3, v4, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_2
-    iget v2, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget v3, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    if-ge p1, v2, :cond_5
+    if-ge p1, v3, :cond_5
 
-    add-int/lit8 v2, p1, 0x1
+    add-int/lit8 v4, p1, 0x1
 
-    iget-object v3, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    iget-object v5, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
+    sub-int/2addr v3, p1
 
-    sub-int/2addr v4, p1
+    invoke-static {v0, v4, v5, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
+    iget-object v0, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
     iget v3, p0, Landroidx/collection/ArraySet;->mSize:I
 
     sub-int/2addr v3, p1
 
-    invoke-static {v5, v2, v1, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_3
-    iget v1, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget v0, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v0, v4
 
-    iput v1, p0, Landroidx/collection/ArraySet;->mSize:I
+    iput v0, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    iget v1, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget v0, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    if-ge p1, v1, :cond_4
+    if-ge p1, v0, :cond_4
 
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    iget-object v2, p0, Landroidx/collection/ArraySet;->mHashes:[I
 
-    add-int/lit8 v2, p1, 0x1
+    add-int/lit8 v3, p1, 0x1
 
-    iget-object v3, p0, Landroidx/collection/ArraySet;->mHashes:[I
+    sub-int/2addr v0, p1
 
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
+    invoke-static {v2, v3, v2, p1, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    sub-int/2addr v4, p1
+    iget-object v0, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    iget v2, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
-
-    iget v4, p0, Landroidx/collection/ArraySet;->mSize:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_4
     iget-object p1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
-    iget v1, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget v0, p0, Landroidx/collection/ArraySet;->mSize:I
 
     const/4 v2, 0x0
 
-    aput-object v2, p1, v1
+    aput-object v2, p1, v0
 
     :cond_5
     :goto_0
-    return-object v0
+    return-object v1
 .end method
 
 .method public final retainAll(Ljava/util/Collection;)Z
@@ -1650,17 +1614,15 @@
 
     iget v0, p0, Landroidx/collection/ArraySet;->mSize:I
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v1, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
-
-    iget v2, p0, Landroidx/collection/ArraySet;->mSize:I
+    iget-object v2, p0, Landroidx/collection/ArraySet;->mArray:[Ljava/lang/Object;
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v3, v1, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    return-object v0
+    return-object v1
 .end method
 
 .method public final toArray([Ljava/lang/Object;)[Ljava/lang/Object;
@@ -1717,11 +1679,9 @@
 
     if-le v0, v1, :cond_1
 
-    iget v0, p0, Landroidx/collection/ArraySet;->mSize:I
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
-
-    aput-object v1, p1, v0
+    aput-object v0, p1, v1
 
     :cond_1
     return-object p1
diff --git a/com.discord/smali/androidx/collection/CircularArray.smali b/com.discord/smali/androidx/collection/CircularArray.smali
index a7ed923a7a..bc7f232283 100644
--- a/com.discord/smali/androidx/collection/CircularArray.smali
+++ b/com.discord/smali/androidx/collection/CircularArray.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/collection/CircularArray;
 .super Ljava/lang/Object;
+.source "CircularArray.java"
 
 
 # annotations
@@ -104,43 +105,39 @@
 
     iget-object v0, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    iget v1, p0, Landroidx/collection/CircularArray;->mHead:I
+    iget v2, p0, Landroidx/collection/CircularArray;->mHead:I
 
-    sub-int v1, v0, v1
+    sub-int v3, v1, v2
 
-    shl-int/lit8 v2, v0, 0x1
+    shl-int/lit8 v4, v1, 0x1
 
-    if-ltz v2, :cond_0
+    if-ltz v4, :cond_0
 
-    new-array v3, v2, [Ljava/lang/Object;
-
-    iget-object v4, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
-
-    iget v5, p0, Landroidx/collection/CircularArray;->mHead:I
+    new-array v5, v4, [Ljava/lang/Object;
 
     const/4 v6, 0x0
 
-    invoke-static {v4, v5, v3, v6, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v2, v5, v6, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v4, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
+    iget-object v0, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
 
-    iget v5, p0, Landroidx/collection/CircularArray;->mHead:I
+    iget v2, p0, Landroidx/collection/CircularArray;->mHead:I
 
-    invoke-static {v4, v6, v3, v1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v6, v5, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    check-cast v3, [Ljava/lang/Object;
+    check-cast v5, [Ljava/lang/Object;
 
-    iput-object v3, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
+    iput-object v5, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
 
     iput v6, p0, Landroidx/collection/CircularArray;->mHead:I
 
-    iput v0, p0, Landroidx/collection/CircularArray;->mTail:I
+    iput v1, p0, Landroidx/collection/CircularArray;->mTail:I
 
-    add-int/lit8 v2, v2, -0x1
+    add-int/lit8 v4, v4, -0x1
 
-    iput v2, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
+    iput v4, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
 
     return-void
 
@@ -180,11 +177,9 @@
 
     aput-object p1, v0, v1
 
-    iget p1, p0, Landroidx/collection/CircularArray;->mHead:I
+    iget p1, p0, Landroidx/collection/CircularArray;->mTail:I
 
-    iget v0, p0, Landroidx/collection/CircularArray;->mTail:I
-
-    if-ne p1, v0, :cond_0
+    if-ne v1, p1, :cond_0
 
     invoke-direct {p0}, Landroidx/collection/CircularArray;->doubleCapacity()V
 
@@ -206,13 +201,11 @@
 
     aput-object p1, v0, v1
 
-    iget p1, p0, Landroidx/collection/CircularArray;->mTail:I
+    add-int/lit8 v1, v1, 0x1
 
-    add-int/lit8 p1, p1, 0x1
+    iget p1, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
 
-    iget v0, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
-
-    and-int/2addr p1, v0
+    and-int/2addr p1, v1
 
     iput p1, p0, Landroidx/collection/CircularArray;->mTail:I
 
@@ -292,11 +285,9 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
 
-    iget v1, p0, Landroidx/collection/CircularArray;->mHead:I
-
-    aget-object v0, v0, v1
+    aget-object v0, v1, v0
 
     return-object v0
 
@@ -324,8 +315,6 @@
 
     iget-object v0, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
 
-    iget v1, p0, Landroidx/collection/CircularArray;->mTail:I
-
     add-int/lit8 v1, v1, -0x1
 
     iget v2, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
@@ -377,31 +366,23 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
-
-    iget v1, p0, Landroidx/collection/CircularArray;->mHead:I
-
-    aget-object v0, v0, v1
-
     iget-object v1, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
 
-    iget v2, p0, Landroidx/collection/CircularArray;->mHead:I
+    aget-object v2, v1, v0
 
     const/4 v3, 0x0
 
-    aput-object v3, v1, v2
+    aput-object v3, v1, v0
 
-    iget v1, p0, Landroidx/collection/CircularArray;->mHead:I
+    add-int/lit8 v0, v0, 0x1
 
-    add-int/lit8 v1, v1, 0x1
+    iget v1, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
 
-    iget v2, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
+    and-int/2addr v0, v1
 
-    and-int/2addr v1, v2
+    iput v0, p0, Landroidx/collection/CircularArray;->mHead:I
 
-    iput v1, p0, Landroidx/collection/CircularArray;->mHead:I
-
-    return-object v0
+    return-object v2
 
     :cond_0
     new-instance v0, Ljava/lang/ArrayIndexOutOfBoundsException;
@@ -425,27 +406,23 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/collection/CircularArray;->mTail:I
+    add-int/lit8 v1, v1, -0x1
 
-    add-int/lit8 v0, v0, -0x1
-
-    iget v1, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
+    iget v0, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
 
     and-int/2addr v0, v1
 
     iget-object v1, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
-
-    iget-object v2, p0, Landroidx/collection/CircularArray;->mElements:[Ljava/lang/Object;
+    aget-object v2, v1, v0
 
     const/4 v3, 0x0
 
-    aput-object v3, v2, v0
+    aput-object v3, v1, v0
 
     iput v0, p0, Landroidx/collection/CircularArray;->mTail:I
 
-    return-object v1
+    return-object v2
 
     :cond_0
     new-instance v0, Ljava/lang/ArrayIndexOutOfBoundsException;
@@ -475,9 +452,7 @@
 
     if-ge p1, v1, :cond_1
 
-    iget v0, p0, Landroidx/collection/CircularArray;->mTail:I
-
-    sub-int/2addr v0, p1
+    sub-int v0, v1, p1
 
     :cond_1
     move v1, v0
@@ -498,17 +473,13 @@
     goto :goto_0
 
     :cond_2
-    iget v1, p0, Landroidx/collection/CircularArray;->mTail:I
+    sub-int v0, v2, v0
 
-    sub-int/2addr v1, v0
+    sub-int/2addr p1, v0
 
-    sub-int/2addr p1, v1
+    sub-int/2addr v2, v0
 
-    iget v0, p0, Landroidx/collection/CircularArray;->mTail:I
-
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Landroidx/collection/CircularArray;->mTail:I
+    iput v2, p0, Landroidx/collection/CircularArray;->mTail:I
 
     if-lez p1, :cond_4
 
@@ -549,6 +520,8 @@
     invoke-direct {p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final removeFromStart(I)V
@@ -571,13 +544,11 @@
 
     iget v1, p0, Landroidx/collection/CircularArray;->mHead:I
 
-    sub-int v1, v0, v1
+    sub-int v2, v0, v1
 
-    if-ge p1, v1, :cond_1
+    if-ge p1, v2, :cond_1
 
-    iget v0, p0, Landroidx/collection/CircularArray;->mHead:I
-
-    add-int/2addr v0, p1
+    add-int v0, v1, p1
 
     :cond_1
     iget v1, p0, Landroidx/collection/CircularArray;->mHead:I
@@ -602,8 +573,6 @@
 
     sub-int/2addr p1, v0
 
-    iget v1, p0, Landroidx/collection/CircularArray;->mHead:I
-
     add-int/2addr v1, v0
 
     iget v0, p0, Landroidx/collection/CircularArray;->mCapacityBitmask:I
@@ -639,6 +608,8 @@
     invoke-direct {p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final size()I
diff --git a/com.discord/smali/androidx/collection/CircularIntArray.smali b/com.discord/smali/androidx/collection/CircularIntArray.smali
index e2bd596874..de90044c52 100644
--- a/com.discord/smali/androidx/collection/CircularIntArray.smali
+++ b/com.discord/smali/androidx/collection/CircularIntArray.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/collection/CircularIntArray;
 .super Ljava/lang/Object;
+.source "CircularIntArray.java"
 
 
 # instance fields
@@ -85,41 +86,37 @@
 
     iget-object v0, p0, Landroidx/collection/CircularIntArray;->mElements:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    iget v1, p0, Landroidx/collection/CircularIntArray;->mHead:I
+    iget v2, p0, Landroidx/collection/CircularIntArray;->mHead:I
 
-    sub-int v1, v0, v1
+    sub-int v3, v1, v2
 
-    shl-int/lit8 v2, v0, 0x1
+    shl-int/lit8 v4, v1, 0x1
 
-    if-ltz v2, :cond_0
+    if-ltz v4, :cond_0
 
-    new-array v3, v2, [I
-
-    iget-object v4, p0, Landroidx/collection/CircularIntArray;->mElements:[I
-
-    iget v5, p0, Landroidx/collection/CircularIntArray;->mHead:I
+    new-array v5, v4, [I
 
     const/4 v6, 0x0
 
-    invoke-static {v4, v5, v3, v6, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v2, v5, v6, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v4, p0, Landroidx/collection/CircularIntArray;->mElements:[I
+    iget-object v0, p0, Landroidx/collection/CircularIntArray;->mElements:[I
 
-    iget v5, p0, Landroidx/collection/CircularIntArray;->mHead:I
+    iget v2, p0, Landroidx/collection/CircularIntArray;->mHead:I
 
-    invoke-static {v4, v6, v3, v1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v6, v5, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v3, p0, Landroidx/collection/CircularIntArray;->mElements:[I
+    iput-object v5, p0, Landroidx/collection/CircularIntArray;->mElements:[I
 
     iput v6, p0, Landroidx/collection/CircularIntArray;->mHead:I
 
-    iput v0, p0, Landroidx/collection/CircularIntArray;->mTail:I
+    iput v1, p0, Landroidx/collection/CircularIntArray;->mTail:I
 
-    add-int/lit8 v2, v2, -0x1
+    add-int/lit8 v4, v4, -0x1
 
-    iput v2, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
+    iput v4, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
 
     return-void
 
@@ -154,11 +151,9 @@
 
     aput p1, v0, v1
 
-    iget p1, p0, Landroidx/collection/CircularIntArray;->mHead:I
+    iget p1, p0, Landroidx/collection/CircularIntArray;->mTail:I
 
-    iget v0, p0, Landroidx/collection/CircularIntArray;->mTail:I
-
-    if-ne p1, v0, :cond_0
+    if-ne v1, p1, :cond_0
 
     invoke-direct {p0}, Landroidx/collection/CircularIntArray;->doubleCapacity()V
 
@@ -175,13 +170,11 @@
 
     aput p1, v0, v1
 
-    iget p1, p0, Landroidx/collection/CircularIntArray;->mTail:I
+    add-int/lit8 v1, v1, 0x1
 
-    add-int/lit8 p1, p1, 0x1
+    iget p1, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
 
-    iget v0, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
-
-    and-int/2addr p1, v0
+    and-int/2addr p1, v1
 
     iput p1, p0, Landroidx/collection/CircularIntArray;->mTail:I
 
@@ -249,11 +242,9 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/CircularIntArray;->mElements:[I
+    iget-object v1, p0, Landroidx/collection/CircularIntArray;->mElements:[I
 
-    iget v1, p0, Landroidx/collection/CircularIntArray;->mHead:I
-
-    aget v0, v0, v1
+    aget v0, v1, v0
 
     return v0
 
@@ -276,8 +267,6 @@
 
     iget-object v0, p0, Landroidx/collection/CircularIntArray;->mElements:[I
 
-    iget v1, p0, Landroidx/collection/CircularIntArray;->mTail:I
-
     add-int/lit8 v1, v1, -0x1
 
     iget v2, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
@@ -324,23 +313,19 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/CircularIntArray;->mElements:[I
+    iget-object v1, p0, Landroidx/collection/CircularIntArray;->mElements:[I
 
-    iget v1, p0, Landroidx/collection/CircularIntArray;->mHead:I
+    aget v1, v1, v0
 
-    aget v0, v0, v1
-
-    iget v1, p0, Landroidx/collection/CircularIntArray;->mHead:I
-
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v0, v0, 0x1
 
     iget v2, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
 
-    and-int/2addr v1, v2
+    and-int/2addr v0, v2
 
-    iput v1, p0, Landroidx/collection/CircularIntArray;->mHead:I
+    iput v0, p0, Landroidx/collection/CircularIntArray;->mHead:I
 
-    return v0
+    return v1
 
     :cond_0
     new-instance v0, Ljava/lang/ArrayIndexOutOfBoundsException;
@@ -359,11 +344,9 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/collection/CircularIntArray;->mTail:I
+    add-int/lit8 v1, v1, -0x1
 
-    add-int/lit8 v0, v0, -0x1
-
-    iget v1, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
+    iget v0, p0, Landroidx/collection/CircularIntArray;->mCapacityBitmask:I
 
     and-int/2addr v0, v1
 
diff --git a/com.discord/smali/androidx/collection/ContainerHelpers.smali b/com.discord/smali/androidx/collection/ContainerHelpers.smali
index 817957b163..20b1caec23 100644
--- a/com.discord/smali/androidx/collection/ContainerHelpers.smali
+++ b/com.discord/smali/androidx/collection/ContainerHelpers.smali
@@ -1,5 +1,6 @@
 .class Landroidx/collection/ContainerHelpers;
 .super Ljava/lang/Object;
+.source "ContainerHelpers.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/collection/LongSparseArray.smali b/com.discord/smali/androidx/collection/LongSparseArray.smali
index f9f420d65b..9c75254762 100644
--- a/com.discord/smali/androidx/collection/LongSparseArray.smali
+++ b/com.discord/smali/androidx/collection/LongSparseArray.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/collection/LongSparseArray;
 .super Ljava/lang/Object;
+.source "LongSparseArray.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
@@ -71,10 +72,9 @@
 
     sget-object p1, Landroidx/collection/ContainerHelpers;->EMPTY_OBJECTS:[Ljava/lang/Object;
 
-    :goto_0
     iput-object p1, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-static {p1}, Landroidx/collection/ContainerHelpers;->idealLongArraySize(I)I
@@ -87,9 +87,9 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    :goto_1
+    :goto_0
     iput v0, p0, Landroidx/collection/LongSparseArray;->mSize:I
 
     return-void
@@ -161,17 +161,15 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
+    iget-object v1, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
 
-    iget v1, p0, Landroidx/collection/LongSparseArray;->mSize:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
+    aget-wide v0, v1, v0
 
-    aget-wide v1, v0, v1
+    cmp-long v2, p1, v0
 
-    cmp-long v0, p1, v1
-
-    if-gtz v0, :cond_0
+    if-gtz v2, :cond_0
 
     invoke-virtual {p0, p1, p2, p3}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -213,9 +211,7 @@
 
     iget-object v3, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
 
-    iget-object v4, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
-
-    array-length v4, v4
+    array-length v4, v3
 
     const/4 v5, 0x0
 
@@ -223,9 +219,7 @@
 
     iget-object v3, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    iget-object v4, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
-
-    array-length v4, v4
+    array-length v4, v3
 
     invoke-static {v3, v5, v1, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -403,17 +397,13 @@
 
     iget-object p2, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    aget-object p2, p2, p1
+    aget-object v0, p2, p1
 
-    sget-object v0, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
+    sget-object v1, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
 
-    if-eq p2, v0, :cond_0
+    if-eq v0, v1, :cond_0
 
-    iget-object p2, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
-
-    sget-object v0, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
-
-    aput-object v0, p2, p1
+    aput-object v1, p2, p1
 
     const/4 p1, 0x1
 
@@ -463,17 +453,15 @@
 
     iget-object p2, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    aget-object p2, p2, p1
+    aget-object v0, p2, p1
 
-    sget-object v0, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
+    sget-object v1, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
 
-    if-ne p2, v0, :cond_0
+    if-ne v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
-
     aget-object p1, p2, p1
 
     return-object p1
@@ -614,19 +602,17 @@
 
     iget-object v1, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    sget-object v2, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
+    sget-object v3, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
 
-    if-ne v1, v2, :cond_1
+    if-ne v2, v3, :cond_1
 
-    iget-object v1, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
+    iget-object v2, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
 
-    aput-wide p1, v1, v0
+    aput-wide p1, v2, v0
 
-    iget-object p1, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
-
-    aput-object p3, p1, v0
+    aput-object p3, v1, v0
 
     return-void
 
@@ -664,8 +650,6 @@
 
     if-lt v1, v2, :cond_3
 
-    iget v1, p0, Landroidx/collection/LongSparseArray;->mSize:I
-
     add-int/lit8 v1, v1, 0x1
 
     invoke-static {v1}, Landroidx/collection/ContainerHelpers;->idealLongArraySize(I)I
@@ -678,9 +662,7 @@
 
     iget-object v3, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
 
-    iget-object v4, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
-
-    array-length v4, v4
+    array-length v4, v3
 
     const/4 v5, 0x0
 
@@ -688,9 +670,7 @@
 
     iget-object v3, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    iget-object v4, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
-
-    array-length v4, v4
+    array-length v4, v3
 
     invoke-static {v3, v5, v1, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -701,27 +681,25 @@
     :cond_3
     iget v1, p0, Landroidx/collection/LongSparseArray;->mSize:I
 
+    sub-int v2, v1, v0
+
+    if-eqz v2, :cond_4
+
+    iget-object v2, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
+
+    add-int/lit8 v3, v0, 0x1
+
     sub-int/2addr v1, v0
 
-    if-eqz v1, :cond_4
-
-    iget-object v1, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
-
-    add-int/lit8 v2, v0, 0x1
-
-    iget v3, p0, Landroidx/collection/LongSparseArray;->mSize:I
-
-    sub-int/2addr v3, v0
-
-    invoke-static {v1, v0, v1, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v0, v2, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v1, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    iget v3, p0, Landroidx/collection/LongSparseArray;->mSize:I
+    iget v2, p0, Landroidx/collection/LongSparseArray;->mSize:I
 
-    sub-int/2addr v3, v0
+    sub-int/2addr v2, v0
 
-    invoke-static {v1, v0, v1, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v0, v1, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_4
     iget-object v1, p0, Landroidx/collection/LongSparseArray;->mKeys:[J
@@ -791,21 +769,17 @@
 .end method
 
 .method public removeAt(I)V
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
 
-    aget-object v0, v0, p1
+    aget-object v1, v0, p1
 
-    sget-object v1, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
+    sget-object v2, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
 
-    if-eq v0, v1, :cond_0
+    if-eq v1, v2, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/LongSparseArray;->mValues:[Ljava/lang/Object;
-
-    sget-object v1, Landroidx/collection/LongSparseArray;->DELETED:Ljava/lang/Object;
-
-    aput-object v1, v0, p1
+    aput-object v2, v0, p1
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/androidx/collection/LruCache.smali b/com.discord/smali/androidx/collection/LruCache.smali
index 33bba0405e..cef09fff28 100644
--- a/com.discord/smali/androidx/collection/LruCache.smali
+++ b/com.discord/smali/androidx/collection/LruCache.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/collection/LruCache;
 .super Ljava/lang/Object;
+.source "LruCache.java"
 
 
 # annotations
@@ -962,4 +963,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/collection/MapCollections$ArrayIterator.smali b/com.discord/smali/androidx/collection/MapCollections$ArrayIterator.smali
index 6ff6c19ab9..43a4227efd 100644
--- a/com.discord/smali/androidx/collection/MapCollections$ArrayIterator.smali
+++ b/com.discord/smali/androidx/collection/MapCollections$ArrayIterator.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/collection/MapCollections$ArrayIterator;
 .super Ljava/lang/Object;
+.source "MapCollections.java"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali/androidx/collection/MapCollections$EntrySet.smali b/com.discord/smali/androidx/collection/MapCollections$EntrySet.smali
index a7d25b765d..465c99e441 100644
--- a/com.discord/smali/androidx/collection/MapCollections$EntrySet.smali
+++ b/com.discord/smali/androidx/collection/MapCollections$EntrySet.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/collection/MapCollections$EntrySet;
 .super Ljava/lang/Object;
+.source "MapCollections.java"
 
 # interfaces
 .implements Ljava/util/Set;
diff --git a/com.discord/smali/androidx/collection/MapCollections$KeySet.smali b/com.discord/smali/androidx/collection/MapCollections$KeySet.smali
index d669661ea8..62baa9550f 100644
--- a/com.discord/smali/androidx/collection/MapCollections$KeySet.smali
+++ b/com.discord/smali/androidx/collection/MapCollections$KeySet.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/collection/MapCollections$KeySet;
 .super Ljava/lang/Object;
+.source "MapCollections.java"
 
 # interfaces
 .implements Ljava/util/Set;
diff --git a/com.discord/smali/androidx/collection/MapCollections$MapIterator.smali b/com.discord/smali/androidx/collection/MapCollections$MapIterator.smali
index 1c7f62dc9a..73f72d3fb5 100644
--- a/com.discord/smali/androidx/collection/MapCollections$MapIterator.smali
+++ b/com.discord/smali/androidx/collection/MapCollections$MapIterator.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/collection/MapCollections$MapIterator;
 .super Ljava/lang/Object;
+.source "MapCollections.java"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali/androidx/collection/MapCollections$ValuesCollection.smali b/com.discord/smali/androidx/collection/MapCollections$ValuesCollection.smali
index 6d168cae8a..f9cccf7b3b 100644
--- a/com.discord/smali/androidx/collection/MapCollections$ValuesCollection.smali
+++ b/com.discord/smali/androidx/collection/MapCollections$ValuesCollection.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/collection/MapCollections$ValuesCollection;
 .super Ljava/lang/Object;
+.source "MapCollections.java"
 
 # interfaces
 .implements Ljava/util/Collection;
diff --git a/com.discord/smali/androidx/collection/MapCollections.smali b/com.discord/smali/androidx/collection/MapCollections.smali
index c1691e3e69..5ef977b3a5 100644
--- a/com.discord/smali/androidx/collection/MapCollections.smali
+++ b/com.discord/smali/androidx/collection/MapCollections.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/collection/MapCollections;
 .super Ljava/lang/Object;
+.source "MapCollections.java"
 
 
 # annotations
@@ -144,7 +145,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_2
 
     check-cast p1, Ljava/util/Set;
 
@@ -163,16 +164,24 @@
 
     move-result p0
     :try_end_0
-    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
 
     if-eqz p0, :cond_1
 
     return v0
 
-    :catch_0
     :cond_1
     return v2
+
+    :catch_0
+    return v2
+
+    :catch_1
+    return v2
+
+    :cond_2
+    return v2
 .end method
 
 .method public static removeAllHelper(Ljava/util/Map;Ljava/util/Collection;)Z
diff --git a/com.discord/smali/androidx/collection/SimpleArrayMap.smali b/com.discord/smali/androidx/collection/SimpleArrayMap.smali
index 0d1b2c5b59..ef68a651ec 100644
--- a/com.discord/smali/androidx/collection/SimpleArrayMap.smali
+++ b/com.discord/smali/androidx/collection/SimpleArrayMap.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/collection/SimpleArrayMap;
 .super Ljava/lang/Object;
+.source "SimpleArrayMap.java"
 
 
 # annotations
@@ -426,11 +427,9 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    iget-object v1, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    iget-object v1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
-
-    iget v2, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
+    iget-object v2, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
     sget-object v3, Landroidx/collection/ContainerHelpers;->EMPTY_INTS:[I
 
@@ -444,7 +443,7 @@
 
     iput v3, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
 
-    invoke-static {v0, v1, v2}, Landroidx/collection/SimpleArrayMap;->freeArrays([I[Ljava/lang/Object;I)V
+    invoke-static {v1, v2, v0}, Landroidx/collection/SimpleArrayMap;->freeArrays([I[Ljava/lang/Object;I)V
 
     :cond_0
     iget v0, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
@@ -510,11 +509,9 @@
 
     iget-object v1, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v1, p1, :cond_1
-
-    iget-object v1, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    if-ge v2, p1, :cond_1
 
     iget-object v2, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
@@ -623,7 +620,7 @@
 
     move-result v3
     :try_end_0
-    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
 
     if-nez v3, :cond_4
@@ -641,6 +638,9 @@
     :catch_0
     return v2
 
+    :catch_1
+    return v2
+
     :cond_6
     instance-of v1, p1, Ljava/util/Map;
 
@@ -699,8 +699,8 @@
 
     move-result v3
     :try_end_1
-    .catch Ljava/lang/NullPointerException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/lang/ClassCastException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/lang/NullPointerException; {:try_start_1 .. :try_end_1} :catch_3
+    .catch Ljava/lang/ClassCastException; {:try_start_1 .. :try_end_1} :catch_2
 
     if-nez v3, :cond_a
 
@@ -714,7 +714,12 @@
     :cond_b
     return v0
 
-    :catch_1
+    :catch_2
+    return v2
+
+    :catch_3
+    return v2
+
     :cond_c
     return v2
 .end method
@@ -769,14 +774,14 @@
 
     const/4 v3, 0x0
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x1
 
     :goto_0
     if-ge v3, v2, :cond_1
 
-    aget-object v7, v1, v5
+    aget-object v7, v1, v6
 
     aget v8, v0, v3
 
@@ -794,16 +799,16 @@
     :goto_1
     xor-int/2addr v7, v8
 
-    add-int/2addr v6, v7
+    add-int/2addr v5, v7
 
     add-int/lit8 v3, v3, 0x1
 
-    add-int/lit8 v5, v5, 0x2
+    add-int/lit8 v6, v6, 0x2
 
     goto :goto_0
 
     :cond_1
-    return v6
+    return v5
 .end method
 
 .method indexOf(Ljava/lang/Object;I)I
@@ -1176,13 +1181,11 @@
 
     iget-object v0, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    aget-object v0, v0, p1
+    aget-object v1, v0, p1
 
-    iget-object v1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    aput-object p2, v0, p1
 
-    aput-object p2, v1, p1
-
-    return-object v0
+    return-object v1
 
     :cond_1
     xor-int/lit8 v2, v2, -0x1
@@ -1224,11 +1227,9 @@
 
     iget-object v4, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    array-length v4, v4
+    array-length v7, v4
 
-    if-lez v4, :cond_4
-
-    iget-object v4, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    if-lez v7, :cond_4
 
     array-length v7, v5
 
@@ -1268,17 +1269,15 @@
 
     shl-int/lit8 v5, v2, 0x1
 
-    iget-object v6, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
-
     shl-int/lit8 v4, v4, 0x1
 
-    iget v7, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
+    iget v6, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
 
-    sub-int/2addr v7, v2
+    sub-int/2addr v6, v2
 
-    shl-int/lit8 v7, v7, 0x1
+    shl-int/lit8 v6, v6, 0x1
 
-    invoke-static {v1, v5, v6, v4, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v5, v1, v4, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_7
     iget v1, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
@@ -1287,31 +1286,25 @@
 
     iget-object v0, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    array-length v0, v0
+    array-length v4, v0
 
-    if-ge v2, v0, :cond_8
-
-    iget-object v0, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    if-ge v2, v4, :cond_8
 
     aput v3, v0, v2
 
     iget-object v0, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    shl-int/lit8 v1, v2, 0x1
+    shl-int/lit8 v2, v2, 0x1
 
-    aput-object p1, v0, v1
+    aput-object p1, v0, v2
 
-    iget-object p1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    add-int/lit8 v2, v2, 0x1
+
+    aput-object p2, v0, v2
 
     add-int/lit8 v1, v1, 0x1
 
-    aput-object p2, p1, v1
-
-    iget p1, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
+    iput v1, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
 
     const/4 p1, 0x0
 
@@ -1440,21 +1433,19 @@
 
     add-int/lit8 v2, v1, 0x1
 
-    aget-object v0, v0, v2
+    aget-object v2, v0, v2
 
-    iget v2, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
+    iget v3, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    if-gt v2, v4, :cond_0
+    if-gt v3, v5, :cond_0
 
     iget-object p1, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    iget-object v1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
-
-    invoke-static {p1, v1, v2}, Landroidx/collection/SimpleArrayMap;->freeArrays([I[Ljava/lang/Object;I)V
+    invoke-static {p1, v0, v3}, Landroidx/collection/SimpleArrayMap;->freeArrays([I[Ljava/lang/Object;I)V
 
     sget-object p1, Landroidx/collection/ContainerHelpers;->EMPTY_INTS:[I
 
@@ -1464,74 +1455,72 @@
 
     iput-object p1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    goto :goto_1
+    const/4 v0, 0x0
+
+    goto :goto_0
 
     :cond_0
-    add-int/lit8 v5, v2, -0x1
+    add-int/lit8 v0, v3, -0x1
 
     iget-object v6, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
+    array-length v7, v6
+
+    const/16 v8, 0x8
+
+    if-le v7, v8, :cond_4
+
     array-length v6, v6
 
-    const/16 v7, 0x8
+    div-int/lit8 v6, v6, 0x3
 
-    if-le v6, v7, :cond_4
+    if-ge v3, v6, :cond_4
 
-    iget v6, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
+    if-le v3, v8, :cond_1
 
-    iget-object v8, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    shr-int/lit8 v6, v3, 0x1
 
-    array-length v8, v8
-
-    div-int/lit8 v8, v8, 0x3
-
-    if-ge v6, v8, :cond_4
-
-    if-le v2, v7, :cond_1
-
-    shr-int/lit8 v6, v2, 0x1
-
-    add-int v7, v2, v6
+    add-int v8, v3, v6
 
     :cond_1
     iget-object v6, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    iget-object v8, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    iget-object v7, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    invoke-direct {p0, v7}, Landroidx/collection/SimpleArrayMap;->allocArrays(I)V
+    invoke-direct {p0, v8}, Landroidx/collection/SimpleArrayMap;->allocArrays(I)V
 
-    iget v7, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
+    iget v8, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
 
-    if-ne v2, v7, :cond_3
+    if-ne v3, v8, :cond_3
 
     if-lez p1, :cond_2
 
-    iget-object v7, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    iget-object v8, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    invoke-static {v6, v3, v7, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v6, v4, v8, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v7, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    iget-object v8, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    invoke-static {v8, v3, v7, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v7, v4, v8, v4, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_2
-    if-ge p1, v5, :cond_6
+    if-ge p1, v0, :cond_6
 
-    add-int/lit8 v3, p1, 0x1
+    add-int/lit8 v4, p1, 0x1
 
-    iget-object v7, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    iget-object v8, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
-    sub-int v9, v5, p1
+    sub-int v9, v0, p1
 
-    invoke-static {v6, v3, v7, p1, v9}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v6, v4, v8, p1, v9}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    shl-int/lit8 p1, v3, 0x1
+    shl-int/lit8 p1, v4, 0x1
 
-    iget-object v3, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    iget-object v4, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    shl-int/lit8 v4, v9, 0x1
+    shl-int/lit8 v5, v9, 0x1
 
-    invoke-static {v8, p1, v3, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v7, p1, v4, v1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
@@ -1543,55 +1532,46 @@
     throw p1
 
     :cond_4
-    if-ge p1, v5, :cond_5
+    if-ge p1, v0, :cond_5
 
-    iget-object v3, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    iget-object v4, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
 
     add-int/lit8 v6, p1, 0x1
 
-    iget-object v7, p0, Landroidx/collection/SimpleArrayMap;->mHashes:[I
+    sub-int v7, v0, p1
 
-    sub-int v8, v5, p1
-
-    invoke-static {v3, v6, v7, p1, v8}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v4, v6, v4, p1, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object p1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    shl-int/lit8 v3, v6, 0x1
+    shl-int/lit8 v4, v6, 0x1
 
-    iget-object v6, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    shl-int/lit8 v6, v7, 0x1
 
-    shl-int/lit8 v7, v8, 0x1
-
-    invoke-static {p1, v3, v6, v1, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v4, p1, v1, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_5
     iget-object p1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    shl-int/lit8 v1, v5, 0x1
+    shl-int/lit8 v1, v0, 0x1
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    aput-object v3, p1, v1
+    aput-object v4, p1, v1
 
-    iget-object p1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    add-int/2addr v1, v5
 
-    add-int/2addr v1, v4
-
-    aput-object v3, p1, v1
+    aput-object v4, p1, v1
 
     :cond_6
     :goto_0
-    move v3, v5
-
-    :goto_1
     iget p1, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
 
-    if-ne v2, p1, :cond_7
+    if-ne v3, p1, :cond_7
 
-    iput v3, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
+    iput v0, p0, Landroidx/collection/SimpleArrayMap;->mSize:I
 
-    return-object v0
+    return-object v2
 
     :cond_7
     new-instance p1, Ljava/util/ConcurrentModificationException;
@@ -1615,13 +1595,11 @@
 
     iget-object v0, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
 
-    aget-object v0, v0, p1
+    aget-object v1, v0, p1
 
-    iget-object v1, p0, Landroidx/collection/SimpleArrayMap;->mArray:[Ljava/lang/Object;
+    aput-object p2, v0, p1
 
-    aput-object p2, v1, p1
-
-    return-object v0
+    return-object v1
 .end method
 
 .method public size()I
diff --git a/com.discord/smali/androidx/collection/SparseArrayCompat.smali b/com.discord/smali/androidx/collection/SparseArrayCompat.smali
index 28d3e43457..cb7d2770de 100644
--- a/com.discord/smali/androidx/collection/SparseArrayCompat.smali
+++ b/com.discord/smali/androidx/collection/SparseArrayCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/collection/SparseArrayCompat;
 .super Ljava/lang/Object;
+.source "SparseArrayCompat.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
@@ -71,10 +72,9 @@
 
     sget-object p1, Landroidx/collection/ContainerHelpers;->EMPTY_OBJECTS:[Ljava/lang/Object;
 
-    :goto_0
     iput-object p1, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-static {p1}, Landroidx/collection/ContainerHelpers;->idealIntArraySize(I)I
@@ -87,9 +87,9 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    :goto_1
+    :goto_0
     iput v0, p0, Landroidx/collection/SparseArrayCompat;->mSize:I
 
     return-void
@@ -161,13 +161,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
+    iget-object v1, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
 
-    iget v1, p0, Landroidx/collection/SparseArrayCompat;->mSize:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
-
-    aget v0, v0, v1
+    aget v0, v1, v0
 
     if-gt p1, v0, :cond_0
 
@@ -211,9 +209,7 @@
 
     iget-object v3, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
 
-    iget-object v4, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
-
-    array-length v4, v4
+    array-length v4, v3
 
     const/4 v5, 0x0
 
@@ -221,9 +217,7 @@
 
     iget-object v3, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    iget-object v4, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
-
-    array-length v4, v4
+    array-length v4, v3
 
     invoke-static {v3, v5, v1, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -387,7 +381,7 @@
 .end method
 
 .method public delete(I)V
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
 
@@ -401,17 +395,13 @@
 
     iget-object v0, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    aget-object v0, v0, p1
+    aget-object v1, v0, p1
 
-    sget-object v1, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
+    sget-object v2, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
 
-    if-eq v0, v1, :cond_0
+    if-eq v1, v2, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
-
-    sget-object v1, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
-
-    aput-object v1, v0, p1
+    aput-object v2, v0, p1
 
     const/4 p1, 0x1
 
@@ -442,7 +432,7 @@
 .end method
 
 .method public get(ILjava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ITE;)TE;"
@@ -461,18 +451,16 @@
 
     iget-object v0, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    aget-object v0, v0, p1
+    aget-object v1, v0, p1
 
-    sget-object v1, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
+    sget-object v2, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
 
-    if-ne v0, v1, :cond_0
+    if-ne v1, v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
-
-    aget-object p1, p2, p1
+    aget-object p1, v0, p1
 
     return-object p1
 
@@ -612,19 +600,17 @@
 
     iget-object v1, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    sget-object v2, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
+    sget-object v3, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
 
-    if-ne v1, v2, :cond_1
+    if-ne v2, v3, :cond_1
 
-    iget-object v1, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
+    iget-object v2, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
 
-    aput p1, v1, v0
+    aput p1, v2, v0
 
-    iget-object p1, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
-
-    aput-object p2, p1, v0
+    aput-object p2, v1, v0
 
     return-void
 
@@ -662,8 +648,6 @@
 
     if-lt v1, v2, :cond_3
 
-    iget v1, p0, Landroidx/collection/SparseArrayCompat;->mSize:I
-
     add-int/lit8 v1, v1, 0x1
 
     invoke-static {v1}, Landroidx/collection/ContainerHelpers;->idealIntArraySize(I)I
@@ -676,9 +660,7 @@
 
     iget-object v3, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
 
-    iget-object v4, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
-
-    array-length v4, v4
+    array-length v4, v3
 
     const/4 v5, 0x0
 
@@ -686,9 +668,7 @@
 
     iget-object v3, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    iget-object v4, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
-
-    array-length v4, v4
+    array-length v4, v3
 
     invoke-static {v3, v5, v1, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -699,27 +679,25 @@
     :cond_3
     iget v1, p0, Landroidx/collection/SparseArrayCompat;->mSize:I
 
+    sub-int v2, v1, v0
+
+    if-eqz v2, :cond_4
+
+    iget-object v2, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
+
+    add-int/lit8 v3, v0, 0x1
+
     sub-int/2addr v1, v0
 
-    if-eqz v1, :cond_4
-
-    iget-object v1, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
-
-    add-int/lit8 v2, v0, 0x1
-
-    iget v3, p0, Landroidx/collection/SparseArrayCompat;->mSize:I
-
-    sub-int/2addr v3, v0
-
-    invoke-static {v1, v0, v1, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v0, v2, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v1, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    iget v3, p0, Landroidx/collection/SparseArrayCompat;->mSize:I
+    iget v2, p0, Landroidx/collection/SparseArrayCompat;->mSize:I
 
-    sub-int/2addr v3, v0
+    sub-int/2addr v2, v0
 
-    invoke-static {v1, v0, v1, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v0, v1, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_4
     iget-object v1, p0, Landroidx/collection/SparseArrayCompat;->mKeys:[I
@@ -789,21 +767,17 @@
 .end method
 
 .method public removeAt(I)V
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
 
-    aget-object v0, v0, p1
+    aget-object v1, v0, p1
 
-    sget-object v1, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
+    sget-object v2, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
 
-    if-eq v0, v1, :cond_0
+    if-eq v1, v2, :cond_0
 
-    iget-object v0, p0, Landroidx/collection/SparseArrayCompat;->mValues:[Ljava/lang/Object;
-
-    sget-object v1, Landroidx/collection/SparseArrayCompat;->DELETED:Ljava/lang/Object;
-
-    aput-object v1, v0, p1
+    aput-object v2, v0, p1
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/ArrayLinkedVariables.smali b/com.discord/smali/androidx/constraintlayout/solver/ArrayLinkedVariables.smali
index d541ef287b..90f1878e1b 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/ArrayLinkedVariables.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/ArrayLinkedVariables.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/ArrayLinkedVariables;
 .super Ljava/lang/Object;
+.source "ArrayLinkedVariables.java"
 
 
 # static fields
@@ -36,7 +37,7 @@
 
 # direct methods
 .method constructor <init>(Landroidx/constraintlayout/solver/ArrayRow;Landroidx/constraintlayout/solver/Cache;)V
-    .locals 2
+    .locals 3
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,17 +55,13 @@
 
     iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->ROW_SIZE:I
 
-    new-array v1, v1, [I
+    new-array v2, v1, [I
 
-    iput-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
+    iput-object v2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->ROW_SIZE:I
+    new-array v2, v1, [I
 
-    new-array v1, v1, [I
-
-    iput-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayNextIndices:[I
-
-    iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->ROW_SIZE:I
+    iput-object v2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayNextIndices:[I
 
     new-array v1, v1, [F
 
@@ -136,11 +133,9 @@
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    iget p3, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
+    iget p3, p1, Landroidx/constraintlayout/solver/SolverVariable;->id:I
 
-    iget v0, p1, Landroidx/constraintlayout/solver/SolverVariable;->id:I
-
-    aput v0, p2, p3
+    aput p3, p2, v0
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayNextIndices:[I
 
@@ -178,15 +173,13 @@
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length p2, p2
+    array-length p3, p2
 
-    if-lt p1, p2, :cond_1
+    if-lt p1, p3, :cond_1
 
     iput-boolean v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
 
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length p1, p1
+    array-length p1, p2
 
     sub-int/2addr p1, v4
 
@@ -196,8 +189,6 @@
     return-void
 
     :cond_2
-    iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
-
     const/4 v5, 0x0
 
     const/4 v6, -0x1
@@ -225,9 +216,7 @@
 
     aput v3, v2, v1
 
-    iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayValues:[F
-
-    aget p2, p2, v1
+    aget p2, v2, v1
 
     cmpl-float p2, p2, v0
 
@@ -305,55 +294,49 @@
     :cond_9
     iget p3, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mLast:I
 
-    add-int/2addr p3, v4
+    add-int/lit8 v0, p3, 0x1
 
-    iget-boolean v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
+    iget-boolean v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
 
-    if-eqz v0, :cond_b
+    if-eqz v1, :cond_b
 
-    iget-object p3, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
+    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    iget v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mLast:I
+    aget v1, v0, p3
 
-    aget p3, p3, v0
-
-    if-ne p3, v3, :cond_a
-
-    iget p3, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mLast:I
+    if-ne v1, v3, :cond_a
 
     goto :goto_2
 
     :cond_a
-    iget-object p3, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
+    array-length p3, v0
 
-    array-length p3, p3
+    goto :goto_2
 
     :cond_b
+    move p3, v0
+
     :goto_2
     iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
+    array-length v1, v0
+
+    if-lt p3, v1, :cond_d
+
+    iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->currentSize:I
+
     array-length v0, v0
 
-    if-lt p3, v0, :cond_d
-
-    iget v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->currentSize:I
-
-    iget-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length v1, v1
-
-    if-ge v0, v1, :cond_d
+    if-ge v1, v0, :cond_d
 
     const/4 v0, 0x0
 
     :goto_3
     iget-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length v1, v1
+    array-length v5, v1
 
-    if-ge v0, v1, :cond_d
-
-    iget-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
+    if-ge v0, v5, :cond_d
 
     aget v1, v1, v0
 
@@ -372,13 +355,11 @@
     :goto_4
     iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-lt p3, v0, :cond_e
+    if-lt p3, v1, :cond_e
 
-    iget-object p3, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length p3, p3
+    array-length p3, v0
 
     iget v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->ROW_SIZE:I
 
@@ -441,8 +422,6 @@
 
     aput v0, p2, p3
 
-    iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayNextIndices:[I
-
     aput p3, p2, v6
 
     goto :goto_5
@@ -488,15 +467,13 @@
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length p2, p2
+    array-length p3, p2
 
-    if-lt p1, p2, :cond_11
+    if-lt p1, p3, :cond_11
 
     iput-boolean v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
 
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length p1, p1
+    array-length p1, p2
 
     sub-int/2addr p1, v4
 
@@ -564,14 +541,13 @@
 
     aput v3, v9, v0
 
-    :goto_1
     iget-object v9, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mRow:Landroidx/constraintlayout/solver/ArrayRow;
 
     invoke-virtual {v10, v9}, Landroidx/constraintlayout/solver/SolverVariable;->removeFromRow(Landroidx/constraintlayout/solver/ArrayRow;)V
 
     const/4 v9, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const v11, 0x3a83126f    # 0.001f
@@ -584,10 +560,14 @@
 
     aput v3, v9, v0
 
-    goto :goto_1
+    iget-object v9, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mRow:Landroidx/constraintlayout/solver/ArrayRow;
+
+    invoke-virtual {v10, v9}, Landroidx/constraintlayout/solver/SolverVariable;->removeFromRow(Landroidx/constraintlayout/solver/ArrayRow;)V
+
+    const/4 v9, 0x0
 
     :cond_1
-    :goto_2
+    :goto_1
     const/4 v11, 0x1
 
     cmpl-float v12, v9, v3
@@ -600,27 +580,36 @@
 
     if-ne v12, v13, :cond_4
 
-    if-nez v1, :cond_2
+    if-nez v4, :cond_2
 
-    :goto_3
     invoke-direct {p0, v10, p1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->isNew(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/LinearSystem;)Z
 
-    move-result v1
+    move-result v4
 
-    move v6, v1
+    move v6, v4
 
     move v5, v9
 
-    move-object v1, v10
+    move-object v4, v10
 
-    goto :goto_5
+    goto :goto_2
 
     :cond_2
     cmpl-float v12, v5, v9
 
     if-lez v12, :cond_3
 
-    goto :goto_3
+    invoke-direct {p0, v10, p1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->isNew(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/LinearSystem;)Z
+
+    move-result v4
+
+    move v6, v4
+
+    move v5, v9
+
+    move-object v4, v10
+
+    goto :goto_2
 
     :cond_3
     if-nez v6, :cond_7
@@ -633,40 +622,49 @@
 
     move v5, v9
 
-    move-object v1, v10
+    move-object v4, v10
 
     const/4 v6, 0x1
 
-    goto :goto_5
+    goto :goto_2
 
     :cond_4
-    if-nez v1, :cond_7
+    if-nez v4, :cond_7
 
     cmpg-float v12, v9, v3
 
     if-gez v12, :cond_7
 
-    if-nez v4, :cond_5
+    if-nez v1, :cond_5
 
-    :goto_4
     invoke-direct {p0, v10, p1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->isNew(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/LinearSystem;)Z
 
-    move-result v4
+    move-result v1
 
-    move v8, v4
+    move v8, v1
 
     move v7, v9
 
-    move-object v4, v10
+    move-object v1, v10
 
-    goto :goto_5
+    goto :goto_2
 
     :cond_5
     cmpl-float v12, v7, v9
 
     if-lez v12, :cond_6
 
-    goto :goto_4
+    invoke-direct {p0, v10, p1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->isNew(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/LinearSystem;)Z
+
+    move-result v1
+
+    move v8, v1
+
+    move v7, v9
+
+    move-object v1, v10
+
+    goto :goto_2
 
     :cond_6
     if-nez v8, :cond_7
@@ -679,12 +677,12 @@
 
     move v7, v9
 
-    move-object v4, v10
+    move-object v1, v10
 
     const/4 v8, 0x1
 
     :cond_7
-    :goto_5
+    :goto_2
     iget-object v9, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayNextIndices:[I
 
     aget v0, v9, v0
@@ -694,12 +692,12 @@
     goto/16 :goto_0
 
     :cond_8
-    if-eqz v1, :cond_9
+    if-eqz v4, :cond_9
 
-    return-object v1
+    return-object v4
 
     :cond_9
-    return-object v4
+    return-object v1
 .end method
 
 .method public final clear()V
@@ -771,8 +769,6 @@
     return v2
 
     :cond_0
-    iget v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
-
     const/4 v3, 0x0
 
     :goto_0
@@ -1019,8 +1015,6 @@
     return-object v2
 
     :cond_3
-    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->candidate:Landroidx/constraintlayout/solver/SolverVariable;
-
     return-object v0
 .end method
 
@@ -1314,11 +1308,9 @@
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
+    iget v1, p1, Landroidx/constraintlayout/solver/SolverVariable;->id:I
 
-    iget v2, p1, Landroidx/constraintlayout/solver/SolverVariable;->id:I
-
-    aput v2, p2, v1
+    aput v1, p2, v2
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayNextIndices:[I
 
@@ -1356,15 +1348,13 @@
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length p2, p2
+    array-length v1, p2
 
-    if-lt p1, p2, :cond_1
+    if-lt p1, v1, :cond_1
 
     iput-boolean v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
 
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length p1, p1
+    array-length p1, p2
 
     sub-int/2addr p1, v0
 
@@ -1374,8 +1364,6 @@
     return-void
 
     :cond_2
-    iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
-
     const/4 v4, 0x0
 
     const/4 v5, -0x1
@@ -1424,55 +1412,49 @@
     :cond_5
     iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mLast:I
 
-    add-int/2addr v1, v0
+    add-int/lit8 v4, v1, 0x1
 
-    iget-boolean v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
+    iget-boolean v6, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
 
-    if-eqz v4, :cond_7
+    if-eqz v6, :cond_7
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
+    iget-object v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    iget v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mLast:I
+    aget v6, v4, v1
 
-    aget v1, v1, v4
-
-    if-ne v1, v3, :cond_6
-
-    iget v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mLast:I
+    if-ne v6, v3, :cond_6
 
     goto :goto_1
 
     :cond_6
-    iget-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
+    array-length v1, v4
 
-    array-length v1, v1
+    goto :goto_1
 
     :cond_7
+    move v1, v4
+
     :goto_1
     iget-object v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
+    array-length v6, v4
+
+    if-lt v1, v6, :cond_9
+
+    iget v6, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->currentSize:I
+
     array-length v4, v4
 
-    if-lt v1, v4, :cond_9
-
-    iget v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->currentSize:I
-
-    iget-object v6, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length v6, v6
-
-    if-ge v4, v6, :cond_9
+    if-ge v6, v4, :cond_9
 
     const/4 v4, 0x0
 
     :goto_2
     iget-object v6, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length v6, v6
+    array-length v7, v6
 
-    if-ge v4, v6, :cond_9
-
-    iget-object v6, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
+    if-ge v4, v7, :cond_9
 
     aget v6, v6, v4
 
@@ -1491,13 +1473,11 @@
     :goto_3
     iget-object v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length v4, v4
+    array-length v6, v4
 
-    if-lt v1, v4, :cond_a
+    if-lt v1, v6, :cond_a
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length v1, v1
+    array-length v1, v4
 
     iget v4, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->ROW_SIZE:I
 
@@ -1560,8 +1540,6 @@
 
     aput v2, p2, v1
 
-    iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayNextIndices:[I
-
     aput v1, p2, v5
 
     goto :goto_4
@@ -1618,15 +1596,13 @@
 
     iget-object p2, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
 
-    array-length p2, p2
+    array-length v1, p2
 
-    if-lt p1, p2, :cond_e
+    if-lt p1, v1, :cond_e
 
     iput-boolean v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mDidFillOnce:Z
 
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mArrayIndices:[I
-
-    array-length p1, p1
+    array-length p1, p2
 
     sub-int/2addr p1, v0
 
@@ -1659,8 +1635,6 @@
     return v1
 
     :cond_1
-    iget v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
-
     const/4 v3, 0x0
 
     const/4 v4, -0x1
@@ -1866,10 +1840,9 @@
 
     const/4 v1, 0x0
 
-    :goto_0
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     const/4 v3, -0x1
 
     if-eq v0, v3, :cond_3
@@ -1904,7 +1877,7 @@
 
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_1
     if-eq v4, v3, :cond_0
 
     iget v6, v2, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->currentSize:I
@@ -1935,7 +1908,7 @@
 
     add-int/lit8 v5, v5, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget v2, p1, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
@@ -1957,6 +1930,8 @@
     :cond_1
     iget v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
 
+    const/4 v2, 0x0
+
     goto :goto_0
 
     :cond_2
@@ -1966,7 +1941,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     return-void
@@ -1979,10 +1954,9 @@
 
     const/4 v1, 0x0
 
-    :goto_0
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     const/4 v3, -0x1
 
     if-eq v0, v3, :cond_2
@@ -2029,7 +2003,7 @@
 
     const/4 v7, 0x0
 
-    :goto_2
+    :goto_1
     if-eq v6, v3, :cond_0
 
     iget v8, v5, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->currentSize:I
@@ -2060,7 +2034,7 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget v2, p1, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
@@ -2079,6 +2053,8 @@
 
     iget v0, p0, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->mHead:I
 
+    const/4 v2, 0x0
+
     goto :goto_0
 
     :cond_1
@@ -2088,7 +2064,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     return-void
diff --git a/com.discord/smali/androidx/constraintlayout/solver/ArrayRow.smali b/com.discord/smali/androidx/constraintlayout/solver/ArrayRow.smali
index b8f797b405..006735d42f 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/ArrayRow.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/ArrayRow.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/ArrayRow;
 .super Ljava/lang/Object;
+.source "ArrayRow.java"
 
 # interfaces
 .implements Landroidx/constraintlayout/solver/LinearSystem$Row;
@@ -272,10 +273,9 @@
 
     int-to-float p1, p1
 
-    :goto_0
     iput p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/4 v1, 0x0
@@ -294,6 +294,8 @@
 
     int-to-float p1, p3
 
+    iput p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
+
     goto :goto_0
 
     :cond_3
@@ -311,6 +313,8 @@
 
     int-to-float p1, p7
 
+    iput p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
+
     goto :goto_0
 
     :cond_4
@@ -357,10 +361,10 @@
 
     add-float/2addr p1, p2
 
-    goto :goto_0
+    iput p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
 
     :cond_6
-    :goto_1
+    :goto_0
     return-object p0
 .end method
 
@@ -649,10 +653,9 @@
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    :goto_0
     invoke-virtual {p2, p1, v0}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     int-to-float p2, p2
@@ -663,9 +666,9 @@
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    goto :goto_0
+    invoke-virtual {p2, p1, v0}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
-    :goto_1
+    :goto_0
     return-object p0
 .end method
 
@@ -688,31 +691,31 @@
     iput p3, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
 
     :cond_1
-    const/high16 p3, 0x3f800000    # 1.0f
+    const/high16 p3, -0x40800000    # -1.0f
 
-    const/high16 v1, -0x40800000    # -1.0f
+    const/high16 v1, 0x3f800000    # 1.0f
 
     if-nez v0, :cond_2
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
 
-    invoke-virtual {v0, p1, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
-    invoke-virtual {p1, p2, p3}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
     invoke-virtual {v0, p1, p3}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
     iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
 
     invoke-virtual {p1, p2, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
+    goto :goto_0
+
+    :cond_2
+    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {v0, p1, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
+    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {p1, p2, p3}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
     :goto_0
     return-object p0
 .end method
@@ -752,29 +755,14 @@
     iput p4, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
 
     :cond_1
-    const/high16 p4, 0x3f800000    # 1.0f
+    const/high16 p4, -0x40800000    # -1.0f
 
-    const/high16 v1, -0x40800000    # -1.0f
+    const/high16 v1, 0x3f800000    # 1.0f
 
     if-nez v0, :cond_2
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
 
-    invoke-virtual {v0, p1, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
-    invoke-virtual {p1, p2, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
-    invoke-virtual {p1, p3, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
     invoke-virtual {v0, p1, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
     iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
@@ -785,6 +773,21 @@
 
     invoke-virtual {p1, p3, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
+    goto :goto_0
+
+    :cond_2
+    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {v0, p1, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
+    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {p1, p2, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
+    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {p1, p3, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
     :goto_0
     return-object p0
 .end method
@@ -808,29 +811,14 @@
     iput p4, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
 
     :cond_1
-    const/high16 p4, 0x3f800000    # 1.0f
+    const/high16 p4, -0x40800000    # -1.0f
 
-    const/high16 v1, -0x40800000    # -1.0f
+    const/high16 v1, 0x3f800000    # 1.0f
 
     if-nez v0, :cond_2
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
 
-    invoke-virtual {v0, p1, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
-    invoke-virtual {p1, p2, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
-    invoke-virtual {p1, p3, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
-
     invoke-virtual {v0, p1, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
     iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
@@ -841,6 +829,21 @@
 
     invoke-virtual {p1, p3, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
+    goto :goto_0
+
+    :cond_2
+    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {v0, p1, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
+    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {p1, p2, p4}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
+    iget-object p1, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+
+    invoke-virtual {p1, p3, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+
     :goto_0
     return-object p0
 .end method
@@ -882,11 +885,9 @@
 
     const/4 v1, 0x0
 
-    cmpg-float v0, v0, v1
+    cmpg-float v1, v0, v1
 
-    if-gez v0, :cond_0
-
-    iget v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->constantValue:F
+    if-gez v1, :cond_0
 
     const/high16 v1, -0x40800000    # -1.0f
 
@@ -931,8 +932,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variable:Landroidx/constraintlayout/solver/SolverVariable;
-
     iget-object v0, v0, Landroidx/constraintlayout/solver/SolverVariable;->mType:Landroidx/constraintlayout/solver/SolverVariable$Type;
 
     sget-object v1, Landroidx/constraintlayout/solver/SolverVariable$Type;->UNRESTRICTED:Landroidx/constraintlayout/solver/SolverVariable$Type;
@@ -1076,11 +1075,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
+    iget-object v2, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
 
-    iget-object v2, p0, Landroidx/constraintlayout/solver/ArrayRow;->variable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    invoke-virtual {v0, v2, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
+    invoke-virtual {v2, v0, v1}, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->put(Landroidx/constraintlayout/solver/SolverVariable;F)V
 
     const/4 v0, 0x0
 
@@ -1194,12 +1191,11 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_0
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance v1, Ljava/lang/StringBuilder;
@@ -1212,9 +1208,11 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    goto :goto_0
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    :goto_1
+    move-result-object v0
+
+    :goto_0
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
@@ -1255,23 +1253,19 @@
 
     move-result-object v0
 
-    move-object v1, v0
+    const/4 v1, 0x1
 
-    const/4 v0, 0x1
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    move-object v1, v0
+    const/4 v1, 0x0
 
-    const/4 v0, 0x0
-
-    :goto_2
+    :goto_1
     iget-object v5, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
 
     iget v5, v5, Landroidx/constraintlayout/solver/ArrayLinkedVariables;->currentSize:I
 
-    :goto_3
+    :goto_2
     if-ge v2, v5, :cond_7
 
     iget-object v6, p0, Landroidx/constraintlayout/solver/ArrayRow;->variables:Landroidx/constraintlayout/solver/ArrayLinkedVariables;
@@ -1298,128 +1292,136 @@
 
     const/high16 v8, -0x40800000    # -1.0f
 
-    if-nez v0, :cond_2
+    if-nez v1, :cond_2
 
-    cmpg-float v0, v7, v4
+    cmpg-float v1, v7, v4
 
-    if-gez v0, :cond_4
+    if-gez v1, :cond_4
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v1, "- "
+    const-string v0, "- "
 
-    :goto_4
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    mul-float v7, v7, v8
-
-    goto :goto_5
-
-    :cond_2
-    cmpl-float v0, v7, v4
-
-    if-lez v0, :cond_3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    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 v1
-
-    goto :goto_5
-
-    :cond_3
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " - "
-
-    goto :goto_4
-
-    :cond_4
-    :goto_5
-    const/high16 v0, 0x3f800000    # 1.0f
-
-    cmpl-float v0, v7, v0
-
-    if-nez v0, :cond_5
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    :goto_6
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_7
+    mul-float v7, v7, v8
+
+    goto :goto_3
+
+    :cond_2
+    cmpl-float v1, v7, v4
+
+    if-lez v1, :cond_3
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, " + "
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_3
+
+    :cond_3
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, " - "
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    mul-float v7, v7, v8
+
+    :cond_4
+    :goto_3
+    const/high16 v1, 0x3f800000    # 1.0f
+
+    cmpl-float v1, v7, v1
+
+    if-nez v1, :cond_5
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_4
 
     :cond_5
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
 
-    const-string v1, " "
+    const-string v0, " "
 
-    goto :goto_6
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_7
-    move-object v1, v0
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/4 v0, 0x1
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_4
+    const/4 v1, 0x1
 
     :cond_6
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_3
+    goto/16 :goto_2
 
     :cond_7
-    if-nez v0, :cond_8
+    if-nez v1, :cond_8
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v1, "0.0"
+    const-string v0, "0.0"
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     :cond_8
-    return-object v1
+    return-object v0
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/androidx/constraintlayout/solver/Cache.smali b/com.discord/smali/androidx/constraintlayout/solver/Cache.smali
index e2db4ba580..0f0e2d8b52 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/Cache.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/Cache.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/Cache;
 .super Ljava/lang/Object;
+.source "Cache.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/constraintlayout/solver/GoalRow.smali b/com.discord/smali/androidx/constraintlayout/solver/GoalRow.smali
index 8246e3a7c6..5e31dda7fc 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/GoalRow.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/GoalRow.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/GoalRow;
 .super Landroidx/constraintlayout/solver/ArrayRow;
+.source "GoalRow.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/solver/LinearSystem$Row.smali b/com.discord/smali/androidx/constraintlayout/solver/LinearSystem$Row.smali
index f5282f0251..5574400864 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/LinearSystem$Row.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/LinearSystem$Row.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/constraintlayout/solver/LinearSystem$Row;
 .super Ljava/lang/Object;
+.source "LinearSystem.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali b/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali
index 52b50efd01..4e1b0dbf16 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/LinearSystem;
 .super Ljava/lang/Object;
+.source "LinearSystem.java"
 
 
 # annotations
@@ -95,9 +96,7 @@
 
     iput-boolean v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->graphOptimizer:Z
 
-    iget v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
-
-    new-array v1, v1, [Z
+    new-array v1, v2, [Z
 
     iput-object v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mAlreadyTestedCandidates:[Z
 
@@ -107,9 +106,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mNumRows:I
 
-    iget v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
-
-    iput v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mMaxRows:I
+    iput v2, p0, Landroidx/constraintlayout/solver/LinearSystem;->mMaxRows:I
 
     sget v1, Landroidx/constraintlayout/solver/LinearSystem;->POOL_SIZE:I
 
@@ -119,15 +116,11 @@
 
     iput v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mPoolVariablesCount:I
 
-    iget v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
-
-    new-array v0, v0, [Landroidx/constraintlayout/solver/ArrayRow;
+    new-array v0, v2, [Landroidx/constraintlayout/solver/ArrayRow;
 
     iput-object v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->tempClientsCopy:[Landroidx/constraintlayout/solver/ArrayRow;
 
-    iget v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
-
-    new-array v0, v0, [Landroidx/constraintlayout/solver/ArrayRow;
+    new-array v0, v2, [Landroidx/constraintlayout/solver/ArrayRow;
 
     iput-object v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
 
@@ -177,28 +170,25 @@
 
     invoke-direct {v0, p1, p2}, Landroidx/constraintlayout/solver/SolverVariable;-><init>(Landroidx/constraintlayout/solver/SolverVariable$Type;Ljava/lang/String;)V
 
-    :goto_0
     invoke-virtual {v0, p1, p2}, Landroidx/constraintlayout/solver/SolverVariable;->setType(Landroidx/constraintlayout/solver/SolverVariable$Type;Ljava/lang/String;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/SolverVariable;->reset()V
 
-    goto :goto_0
+    invoke-virtual {v0, p1, p2}, Landroidx/constraintlayout/solver/SolverVariable;->setType(Landroidx/constraintlayout/solver/SolverVariable$Type;Ljava/lang/String;)V
 
-    :goto_1
+    :goto_0
     iget p1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mPoolVariablesCount:I
 
     sget p2, Landroidx/constraintlayout/solver/LinearSystem;->POOL_SIZE:I
 
     if-lt p1, p2, :cond_1
 
-    sget p1, Landroidx/constraintlayout/solver/LinearSystem;->POOL_SIZE:I
+    mul-int/lit8 p2, p2, 0x2
 
-    mul-int/lit8 p1, p1, 0x2
-
-    sput p1, Landroidx/constraintlayout/solver/LinearSystem;->POOL_SIZE:I
+    sput p2, Landroidx/constraintlayout/solver/LinearSystem;->POOL_SIZE:I
 
     iget-object p1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mPoolVariables:[Landroidx/constraintlayout/solver/SolverVariable;
 
@@ -272,11 +262,9 @@
 
     iput v1, v0, Landroidx/constraintlayout/solver/SolverVariable;->definitionId:I
 
-    iget v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mNumRows:I
+    add-int/lit8 v1, v1, 0x1
 
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mNumRows:I
+    iput v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mNumRows:I
 
     iget-object v0, p1, Landroidx/constraintlayout/solver/ArrayRow;->variable:Landroidx/constraintlayout/solver/SolverVariable;
 
@@ -471,8 +459,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v1, v0, Landroidx/constraintlayout/solver/Metrics;->variables:J
 
     const-wide/16 v3, 0x1
@@ -654,7 +640,7 @@
 .end method
 
 .method private enforceBFS(Landroidx/constraintlayout/solver/LinearSystem$Row;)I
-    .locals 18
+    .locals 17
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/Exception;
@@ -707,14 +693,14 @@
     const/4 v2, 0x0
 
     :goto_1
-    if-eqz v2, :cond_e
+    if-eqz v2, :cond_d
 
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
     :goto_2
-    if-nez v2, :cond_d
+    if-nez v2, :cond_e
 
     sget-object v6, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
@@ -722,8 +708,6 @@
 
     if-eqz v6, :cond_2
 
-    sget-object v6, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v9, v6, Landroidx/constraintlayout/solver/Metrics;->bfs:J
 
     add-long/2addr v9, v7
@@ -793,9 +777,9 @@
 
     move-result v5
 
-    cmpg-float v17, v5, v4
+    cmpg-float v16, v5, v4
 
-    if-lez v17, :cond_7
+    if-lez v16, :cond_7
 
     move v4, v13
 
@@ -883,8 +867,6 @@
 
     if-eqz v4, :cond_a
 
-    sget-object v4, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v5, v4, Landroidx/constraintlayout/solver/Metrics;->pivots:J
 
     const-wide/16 v7, 0x1
@@ -930,15 +912,10 @@
     goto/16 :goto_2
 
     :cond_d
-    move/from16 v16, v3
-
-    goto :goto_7
+    const/4 v3, 0x0
 
     :cond_e
-    const/16 v16, 0x0
-
-    :goto_7
-    return v16
+    return v3
 .end method
 
 .method private getDisplaySize(I)Ljava/lang/String;
@@ -1098,9 +1075,7 @@
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mCache:Landroidx/constraintlayout/solver/Cache;
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mCache:Landroidx/constraintlayout/solver/Cache;
-
-    iget-object v1, v1, Landroidx/constraintlayout/solver/Cache;->mIndexedVariables:[Landroidx/constraintlayout/solver/SolverVariable;
+    iget-object v1, v0, Landroidx/constraintlayout/solver/Cache;->mIndexedVariables:[Landroidx/constraintlayout/solver/SolverVariable;
 
     iget v2, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
 
@@ -1114,24 +1089,18 @@
 
     iget v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
 
-    new-array v0, v0, [Z
+    new-array v1, v0, [Z
 
-    iput-object v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mAlreadyTestedCandidates:[Z
-
-    iget v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
+    iput-object v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mAlreadyTestedCandidates:[Z
 
     iput v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mMaxColumns:I
 
-    iget v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
-
     iput v0, p0, Landroidx/constraintlayout/solver/LinearSystem;->mMaxRows:I
 
     sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v1, v0, Landroidx/constraintlayout/solver/Metrics;->tableSizeIncrease:J
 
     const-wide/16 v3, 0x1
@@ -1173,8 +1142,6 @@
 
     if-eqz p2, :cond_0
 
-    sget-object p2, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v2, p2, Landroidx/constraintlayout/solver/Metrics;->optimize:J
 
     add-long/2addr v2, v0
@@ -1207,14 +1174,12 @@
     const/4 v4, 0x0
 
     :goto_1
-    if-nez v3, :cond_b
+    if-nez v3, :cond_c
 
     sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
     if-eqz v5, :cond_2
 
-    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v6, v5, Landroidx/constraintlayout/solver/Metrics;->iterations:J
 
     add-long/2addr v6, v0
@@ -1276,7 +1241,7 @@
     aput-boolean v2, v6, v7
 
     :cond_6
-    if-eqz v5, :cond_a
+    if-eqz v5, :cond_b
 
     const v6, 0x7f7fffff    # Float.MAX_VALUE
 
@@ -1361,8 +1326,6 @@
 
     if-eqz v7, :cond_9
 
-    sget-object v7, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v9, v7, Landroidx/constraintlayout/solver/Metrics;->pivots:J
 
     add-long/2addr v9, v0
@@ -1388,6 +1351,11 @@
     goto/16 :goto_1
 
     :cond_b
+    const/4 v3, 0x1
+
+    goto/16 :goto_1
+
+    :cond_c
     return v4
 .end method
 
@@ -1399,11 +1367,9 @@
     :goto_0
     iget-object v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -1460,7 +1426,7 @@
 
 # virtual methods
 .method public addCenterPoint(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;FI)V
-    .locals 19
+    .locals 18
 
     move-object/from16 v0, p0
 
@@ -1568,7 +1534,7 @@
 
     invoke-static {v3, v4}, Ljava/lang/Double;->isNaN(D)Z
 
-    move-object/from16 v18, v12
+    move-object/from16 p1, v12
 
     mul-double v11, v15, v3
 
@@ -1600,7 +1566,7 @@
 
     move-object v7, v1
 
-    move-object/from16 v8, v18
+    move-object/from16 v8, p1
 
     invoke-virtual/range {v4 .. v9}, Landroidx/constraintlayout/solver/ArrayRow;->createRowWithAngle(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;F)Landroidx/constraintlayout/solver/ArrayRow;
 
@@ -1664,8 +1630,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v3, v0, Landroidx/constraintlayout/solver/Metrics;->constraints:J
 
     add-long/2addr v3, v1
@@ -1768,8 +1732,6 @@
 
     if-eqz v4, :cond_5
 
-    sget-object v4, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v5, v4, Landroidx/constraintlayout/solver/Metrics;->pivots:J
 
     add-long/2addr v5, v1
@@ -2194,8 +2156,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v1, v0, Landroidx/constraintlayout/solver/Metrics;->errors:J
 
     const-wide/16 v3, 0x1
@@ -2262,8 +2222,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v1, v0, Landroidx/constraintlayout/solver/Metrics;->extravariables:J
 
     const-wide/16 v3, 0x1
@@ -2464,8 +2422,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v1, v0, Landroidx/constraintlayout/solver/Metrics;->slackvariables:J
 
     const-wide/16 v3, 0x1
@@ -2605,7 +2561,7 @@
 .end method
 
 .method displaySystemInformations()V
-    .locals 7
+    .locals 6
 
     const/4 v0, 0x0
 
@@ -2620,11 +2576,9 @@
 
     iget-object v3, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
 
-    aget-object v3, v3, v1
+    aget-object v4, v3, v1
 
-    if-eqz v3, :cond_0
-
-    iget-object v3, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
+    if-eqz v4, :cond_0
 
     aget-object v3, v3, v1
 
@@ -2651,11 +2605,9 @@
 
     iget-object v4, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
 
-    aget-object v4, v4, v1
+    aget-object v5, v4, v1
 
-    if-eqz v4, :cond_2
-
-    iget-object v4, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
+    if-eqz v5, :cond_2
 
     aget-object v4, v4, v1
 
@@ -2689,9 +2641,7 @@
 
     iget v5, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
 
-    iget v6, p0, Landroidx/constraintlayout/solver/LinearSystem;->TABLE_SIZE:I
-
-    mul-int v5, v5, v6
+    mul-int v5, v5, v5
 
     invoke-direct {p0, v5}, Landroidx/constraintlayout/solver/LinearSystem;->getDisplaySize(I)Ljava/lang/String;
 
@@ -2886,7 +2836,7 @@
 .end method
 
 .method public getMemoryUsed()I
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x0
 
@@ -2899,11 +2849,9 @@
 
     iget-object v2, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
 
-    aget-object v2, v2, v0
+    aget-object v3, v2, v0
 
-    if-eqz v2, :cond_0
-
-    iget-object v2, p0, Landroidx/constraintlayout/solver/LinearSystem;->mRows:[Landroidx/constraintlayout/solver/ArrayRow;
+    if-eqz v3, :cond_0
 
     aget-object v2, v2, v0
 
@@ -3042,8 +2990,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v3, v0, Landroidx/constraintlayout/solver/Metrics;->minimize:J
 
     add-long/2addr v3, v1
@@ -3059,8 +3005,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v3, v0, Landroidx/constraintlayout/solver/Metrics;->graphOptimizer:J
 
     add-long/2addr v3, v1
@@ -3102,8 +3046,6 @@
 
     if-eqz v0, :cond_4
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v3, v0, Landroidx/constraintlayout/solver/Metrics;->fullySolved:J
 
     add-long/2addr v3, v1
@@ -3135,8 +3077,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v1, v0, Landroidx/constraintlayout/solver/Metrics;->minimizeGoal:J
 
     const-wide/16 v3, 0x1
@@ -3247,8 +3187,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/LinearSystem;->mVariables:Ljava/util/HashMap;
-
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
     :cond_2
diff --git a/com.discord/smali/androidx/constraintlayout/solver/Metrics.smali b/com.discord/smali/androidx/constraintlayout/solver/Metrics.smali
index 3aa657db47..3b7c31cea8 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/Metrics.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/Metrics.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/Metrics;
 .super Ljava/lang/Object;
+.source "Metrics.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/constraintlayout/solver/Pools$Pool.smali b/com.discord/smali/androidx/constraintlayout/solver/Pools$Pool.smali
index 17ba599d2b..29b027779f 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/Pools$Pool.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/Pools$Pool.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/constraintlayout/solver/Pools$Pool;
 .super Ljava/lang/Object;
+.source "Pools.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/Pools$SimplePool.smali b/com.discord/smali/androidx/constraintlayout/solver/Pools$SimplePool.smali
index feae555bfa..ac1fc0fb5d 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/Pools$SimplePool.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/Pools$SimplePool.smali
@@ -1,5 +1,6 @@
 .class Landroidx/constraintlayout/solver/Pools$SimplePool;
 .super Ljava/lang/Object;
+.source "Pools.java"
 
 # interfaces
 .implements Landroidx/constraintlayout/solver/Pools$Pool;
@@ -96,7 +97,7 @@
 
 # virtual methods
 .method public acquire()Ljava/lang/Object;
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
@@ -109,32 +110,26 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
-
-    add-int/lit8 v0, v0, -0x1
-
-    iget-object v2, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPool:[Ljava/lang/Object;
-
-    aget-object v2, v2, v0
+    add-int/lit8 v2, v0, -0x1
 
     iget-object v3, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPool:[Ljava/lang/Object;
 
-    aput-object v1, v3, v0
+    aget-object v4, v3, v2
 
-    iget v0, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
+    aput-object v1, v3, v2
 
     add-int/lit8 v0, v0, -0x1
 
     iput v0, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
 
-    return-object v2
+    return-object v4
 
     :cond_0
     return-object v1
 .end method
 
 .method public release(Ljava/lang/Object;)Z
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;)Z"
@@ -145,25 +140,19 @@
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPool:[Ljava/lang/Object;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPool:[Ljava/lang/Object;
+    aput-object p1, v1, v0
 
-    iget v1, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
+    const/4 p1, 0x1
 
-    aput-object p1, v0, v1
+    add-int/2addr v0, p1
 
-    iget p1, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
+    iput v0, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
 
-    const/4 v0, 0x1
-
-    add-int/2addr p1, v0
-
-    iput p1, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
-
-    return v0
+    return p1
 
     :cond_0
     const/4 p1, 0x0
@@ -172,7 +161,7 @@
 .end method
 
 .method public releaseAll([Ljava/lang/Object;I)V
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "([TT;I)V"
@@ -197,21 +186,15 @@
 
     iget-object v3, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPool:[Ljava/lang/Object;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v2, v3, :cond_1
+    if-ge v2, v4, :cond_1
 
-    iget-object v2, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPool:[Ljava/lang/Object;
+    aput-object v1, v3, v2
 
-    iget v3, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
+    add-int/lit8 v2, v2, 0x1
 
-    aput-object v1, v2, v3
-
-    iget v1, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
-
-    add-int/lit8 v1, v1, 0x1
-
-    iput v1, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
+    iput v2, p0, Landroidx/constraintlayout/solver/Pools$SimplePool;->mPoolSize:I
 
     :cond_1
     add-int/lit8 v0, v0, 0x1
diff --git a/com.discord/smali/androidx/constraintlayout/solver/Pools.smali b/com.discord/smali/androidx/constraintlayout/solver/Pools.smali
index e25ba43f49..80bb7cfe84 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/Pools.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/Pools.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/constraintlayout/solver/Pools;
 .super Ljava/lang/Object;
+.source "Pools.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$1.smali b/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$1.smali
index 057720c912..10f18b36d8 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$1.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/constraintlayout/solver/SolverVariable$1;
 .super Ljava/lang/Object;
+.source "SolverVariable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$Type.smali b/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$Type.smali
index c44c6c7f1c..222fb3986d 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$Type.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/SolverVariable$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/constraintlayout/solver/SolverVariable$Type;
 .super Ljava/lang/Enum;
+.source "SolverVariable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/SolverVariable.smali b/com.discord/smali/androidx/constraintlayout/solver/SolverVariable.smali
index 5759375ef0..eef3bf8768 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/SolverVariable.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/SolverVariable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/SolverVariable;
 .super Ljava/lang/Object;
+.source "SolverVariable.java"
 
 
 # annotations
@@ -158,7 +159,6 @@
 
     sget p1, Landroidx/constraintlayout/solver/SolverVariable;->uniqueErrorId:I
 
-    :goto_0
     invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -201,7 +201,13 @@
 
     sput p1, Landroidx/constraintlayout/solver/SolverVariable;->uniqueId:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_1
     new-instance p0, Ljava/lang/StringBuilder;
@@ -216,7 +222,13 @@
 
     sput p1, Landroidx/constraintlayout/solver/SolverVariable;->uniqueErrorId:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_2
     new-instance p0, Ljava/lang/StringBuilder;
@@ -231,7 +243,13 @@
 
     sput p1, Landroidx/constraintlayout/solver/SolverVariable;->uniqueSlackId:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_3
     new-instance p0, Ljava/lang/StringBuilder;
@@ -246,7 +264,13 @@
 
     sput p1, Landroidx/constraintlayout/solver/SolverVariable;->uniqueConstantId:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_4
     new-instance p0, Ljava/lang/StringBuilder;
@@ -261,9 +285,13 @@
 
     sput p1, Landroidx/constraintlayout/solver/SolverVariable;->uniqueUnrestrictedId:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    nop
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -290,7 +318,7 @@
 
 # virtual methods
 .method public final addToRow(Landroidx/constraintlayout/solver/ArrayRow;)V
-    .locals 2
+    .locals 3
 
     const/4 v0, 0x0
 
@@ -313,19 +341,13 @@
     goto :goto_0
 
     :cond_1
-    iget v0, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquationsCount:I
-
-    iget-object v1, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquations:[Landroidx/constraintlayout/solver/ArrayRow;
-
-    array-length v1, v1
-
-    if-lt v0, v1, :cond_2
-
     iget-object v0, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquations:[Landroidx/constraintlayout/solver/ArrayRow;
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquations:[Landroidx/constraintlayout/solver/ArrayRow;
+    array-length v2, v0
 
-    array-length v1, v1
+    if-lt v1, v2, :cond_2
+
+    array-length v1, v0
 
     mul-int/lit8 v1, v1, 0x2
 
@@ -344,11 +366,9 @@
 
     aput-object p1, v0, v1
 
-    iget p1, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquationsCount:I
+    add-int/lit8 v1, v1, 0x1
 
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquationsCount:I
+    iput v1, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquationsCount:I
 
     return-void
 .end method
@@ -386,7 +406,7 @@
 .end method
 
 .method public final removeFromRow(Landroidx/constraintlayout/solver/ArrayRow;)V
-    .locals 6
+    .locals 5
 
     iget v0, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquationsCount:I
 
@@ -414,11 +434,9 @@
 
     add-int v3, v2, v1
 
-    iget-object v4, p0, Landroidx/constraintlayout/solver/SolverVariable;->mClientEquations:[Landroidx/constraintlayout/solver/ArrayRow;
+    add-int/lit8 v4, v3, 0x1
 
-    add-int/lit8 v5, v3, 0x1
-
-    aget-object v4, v4, v5
+    aget-object v4, p1, v4
 
     aput-object v4, p1, v3
 
@@ -493,7 +511,7 @@
 .end method
 
 .method strengthsToString()Ljava/lang/String;
-    .locals 8
+    .locals 9
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -513,11 +531,11 @@
 
     const/4 v2, 0x0
 
-    move-object v3, v0
+    move-object v4, v0
 
     const/4 v0, 0x0
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     const/4 v5, 0x1
 
@@ -532,42 +550,40 @@
 
     invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Landroidx/constraintlayout/solver/SolverVariable;->strengthVector:[F
+    iget-object v4, p0, Landroidx/constraintlayout/solver/SolverVariable;->strengthVector:[F
 
-    aget v3, v3, v0
+    aget v4, v4, v0
 
-    invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
 
     invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
     iget-object v6, p0, Landroidx/constraintlayout/solver/SolverVariable;->strengthVector:[F
 
-    aget v6, v6, v0
+    aget v7, v6, v0
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
-    cmpl-float v6, v6, v7
+    cmpl-float v7, v7, v8
 
-    if-lez v6, :cond_0
+    if-lez v7, :cond_0
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     goto :goto_1
 
     :cond_0
-    iget-object v6, p0, Landroidx/constraintlayout/solver/SolverVariable;->strengthVector:[F
-
     aget v6, v6, v0
 
-    cmpg-float v6, v6, v7
+    cmpg-float v6, v6, v8
 
     if-gez v6, :cond_1
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     :cond_1
     :goto_1
@@ -575,7 +591,7 @@
 
     aget v6, v6, v0
 
-    cmpl-float v6, v6, v7
+    cmpl-float v6, v6, v8
 
     if-eqz v6, :cond_2
 
@@ -594,43 +610,46 @@
 
     invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v3, ", "
+    const-string v4, ", "
 
-    :goto_2
-    invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     new-instance v6, Ljava/lang/StringBuilder;
 
     invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v3, "] "
+    const-string v4, "] "
 
-    goto :goto_2
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_3
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
+    :goto_2
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
 
     :cond_4
-    if-eqz v4, :cond_5
+    if-eqz v3, :cond_5
 
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v1, " (-)"
 
@@ -638,7 +657,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
     :cond_5
     if-eqz v5, :cond_6
@@ -647,7 +666,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v1, " (*)"
 
@@ -655,10 +674,10 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
     :cond_6
-    return-object v3
+    return-object v4
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Analyzer.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Analyzer.smali
index 7891499685..4b8c85c3d9 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Analyzer.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Analyzer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/Analyzer;
 .super Ljava/lang/Object;
+.source "Analyzer.java"
 
 
 # direct methods
@@ -360,7 +361,7 @@
 .end method
 
 .method private static getMaxDimensionTraversal(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;IZI)I
-    .locals 23
+    .locals 20
 
     move-object/from16 v0, p0
 
@@ -455,16 +456,16 @@
 
     move v10, v8
 
-    move v8, v9
-
-    const/4 v9, -0x1
+    const/4 v8, -0x1
 
     goto :goto_2
 
     :cond_3
     move v10, v9
 
-    const/4 v9, 0x1
+    move v9, v8
+
+    const/4 v8, 0x1
 
     :goto_2
     if-eqz v3, :cond_4
@@ -479,13 +480,13 @@
     :goto_3
     iget-object v13, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v13, v13, v8
+    aget-object v13, v13, v9
 
     invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v13
 
-    mul-int v13, v13, v9
+    mul-int v13, v13, v8
 
     invoke-static/range {p0 .. p1}, Landroidx/constraintlayout/solver/widgets/Analyzer;->getParentBiasOffset(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;I)I
 
@@ -509,11 +510,11 @@
     move-result v14
 
     :goto_4
-    mul-int v14, v14, v9
+    mul-int v14, v14, v8
 
     iget-object v15, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v15, v15, v8
+    aget-object v15, v15, v9
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
@@ -594,7 +595,7 @@
 
     iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    move-object/from16 v18, v11
+    move-object/from16 p3, v11
 
     add-int v11, v14, v12
 
@@ -606,7 +607,7 @@
 
     move-result v15
 
-    move-object/from16 v11, v18
+    move-object/from16 v11, p3
 
     const/4 v5, 0x1
 
@@ -619,10 +620,9 @@
 
     add-int/2addr v15, v7
 
-    :goto_7
     const/4 v5, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_8
     if-nez v1, :cond_9
@@ -631,21 +631,21 @@
 
     move-result v5
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_9
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
     move-result v5
 
-    :goto_8
-    mul-int v5, v5, v9
+    :goto_7
+    mul-int v5, v5, v8
 
     add-int/2addr v15, v5
 
-    goto :goto_7
+    const/4 v5, 0x1
 
-    :goto_9
+    :goto_8
     if-ne v1, v5, :cond_e
 
     iget-object v11, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -660,9 +660,9 @@
 
     move-result-object v11
 
-    const/16 v19, 0x0
+    const/16 v18, 0x0
 
-    :goto_a
+    :goto_9
     invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v16
@@ -675,13 +675,13 @@
 
     check-cast v16, Landroidx/constraintlayout/solver/widgets/ResolutionNode;
 
-    move-object/from16 v20, v11
+    move-object/from16 p3, v11
 
     move-object/from16 v11, v16
 
     check-cast v11, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    if-ne v9, v5, :cond_a
+    if-ne v8, v5, :cond_a
 
     iget-object v5, v11, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->myAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -693,29 +693,28 @@
 
     move-result v5
 
-    move/from16 v11, v19
+    move/from16 v11, v18
 
     invoke-static {v11, v5}, Ljava/lang/Math;->max(II)I
 
-    move-result v19
+    move-result v18
 
-    move-object/from16 v11, v20
+    move-object/from16 v11, p3
 
-    :goto_b
     const/4 v5, 0x1
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_a
-    move/from16 v5, v19
+    move/from16 v5, v18
 
     iget-object v11, v11, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->myAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v11, v11, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    mul-int v16, v7, v9
+    mul-int v16, v7, v8
 
-    move/from16 v21, v10
+    move/from16 v17, v10
 
     add-int v10, v16, v12
 
@@ -725,18 +724,20 @@
 
     invoke-static {v5, v10}, Ljava/lang/Math;->max(II)I
 
-    move-result v19
+    move-result v18
 
-    move-object/from16 v11, v20
+    move-object/from16 v11, p3
 
-    move/from16 v10, v21
+    move/from16 v10, v17
 
-    goto :goto_b
+    const/4 v5, 0x1
+
+    goto :goto_9
 
     :cond_b
-    move/from16 v21, v10
+    move/from16 v17, v10
 
-    move/from16 v5, v19
+    move/from16 v5, v18
 
     iget-object v10, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -756,28 +757,28 @@
 
     const/4 v3, 0x1
 
-    if-ne v9, v3, :cond_c
+    if-ne v8, v3, :cond_c
 
     add-int v3, v5, v6
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_c
     sub-int v3, v5, v7
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_d
     move v3, v5
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_e
-    move/from16 v21, v10
+    move/from16 v17, v10
 
     const/4 v3, 0x0
 
-    :goto_c
+    :goto_a
     invoke-static {v15, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v3
@@ -792,13 +793,13 @@
 
     const/4 v4, -0x1
 
-    if-ne v9, v4, :cond_f
+    if-ne v8, v4, :cond_f
 
-    move/from16 v22, v12
+    move/from16 v19, v12
 
     move v12, v3
 
-    move/from16 v3, v22
+    move/from16 v3, v19
 
     :cond_f
     if-eqz v2, :cond_10
@@ -807,7 +808,7 @@
 
     invoke-virtual {v0, v12, v3, v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setFrame(III)V
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_10
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBelongingGroup:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetGroup;
@@ -816,7 +817,7 @@
 
     invoke-virtual {v0, v12, v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setRelativePositioning(II)V
 
-    :goto_d
+    :goto_b
     invoke-virtual/range {p0 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getDimensionBehaviour(I)Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     move-result-object v2
@@ -840,7 +841,7 @@
     :cond_11
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v2, v2, v8
+    aget-object v2, v2, v9
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -848,7 +849,7 @@
 
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v2, v2, v21
+    aget-object v2, v2, v17
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -860,7 +861,7 @@
 
     iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v3, v3, v8
+    aget-object v3, v3, v9
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -870,7 +871,7 @@
 
     iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v3, v3, v21
+    aget-object v3, v3, v17
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -1012,10 +1013,9 @@
 
     mul-float v0, v0, v1
 
-    :goto_0
     float-to-int v0, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
@@ -1028,12 +1028,12 @@
 
     div-float/2addr v0, v1
 
-    goto :goto_0
+    float-to-int v0, v0
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0, v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidth(I)V
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_1
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVerticalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
@@ -1060,10 +1060,9 @@
 
     mul-float v0, v0, v1
 
-    :goto_2
     float-to-int v0, v0
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_2
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
@@ -1076,17 +1075,17 @@
 
     div-float/2addr v0, v1
 
-    goto :goto_2
+    float-to-int v0, v0
 
-    :goto_3
+    :goto_1
     invoke-virtual {p0, v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeight(I)V
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_3
     const/4 v0, -0x1
 
-    :goto_4
+    :goto_2
     return v0
 .end method
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Barrier.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Barrier.smali
index a6e8eed361..16e983b3b4 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Barrier.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Barrier.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/Barrier;
 .super Landroidx/constraintlayout/solver/widgets/Helper;
+.source "Barrier.java"
 
 
 # static fields
@@ -120,13 +121,11 @@
     :cond_0
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
 
-    if-ltz v0, :cond_12
-
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
+    if-ltz v0, :cond_13
 
     const/4 v1, 0x4
 
-    if-ge v0, v1, :cond_12
+    if-ge v0, v1, :cond_13
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -160,8 +159,6 @@
 
     if-eqz v7, :cond_2
 
-    iget v7, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     if-ne v7, v4, :cond_3
 
     :cond_2
@@ -173,18 +170,15 @@
 
     if-ne v7, v8, :cond_3
 
-    :goto_2
     const/4 v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     iget v7, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
 
     if-eq v7, v3, :cond_4
 
-    iget v7, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     if-ne v7, v5, :cond_5
 
     :cond_4
@@ -196,6 +190,8 @@
 
     if-ne v6, v7, :cond_5
 
+    const/4 v1, 0x1
+
     goto :goto_2
 
     :cond_5
@@ -206,16 +202,14 @@
     :cond_6
     const/4 v1, 0x0
 
-    :goto_3
+    :goto_2
     iget v6, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
 
     if-eqz v6, :cond_8
 
-    iget v6, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     if-ne v6, v4, :cond_7
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/Barrier;->getParent()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
@@ -230,10 +224,12 @@
 
     if-ne v6, v7, :cond_9
 
-    goto :goto_5
+    const/4 v1, 0x0
+
+    goto :goto_4
 
     :cond_8
-    :goto_4
+    :goto_3
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/Barrier;->getParent()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     move-result-object v6
@@ -246,13 +242,13 @@
 
     if-ne v6, v7, :cond_9
 
-    :goto_5
     const/4 v1, 0x0
 
     :cond_9
+    :goto_4
     const/4 v6, 0x0
 
-    :goto_6
+    :goto_5
     iget v7, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mWidgetsCount:I
 
     if-ge v6, v7, :cond_e
@@ -290,34 +286,30 @@
 
     iput-object v8, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget v7, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
+    if-eqz v9, :cond_c
 
-    if-eqz v7, :cond_c
+    if-ne v9, v3, :cond_b
 
-    iget v7, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
-    if-ne v7, v3, :cond_b
-
-    goto :goto_7
+    goto :goto_6
 
     :cond_b
     iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
     invoke-virtual {p1, v7, v8, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterBarrier(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Z)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
-    :goto_7
+    :goto_6
     iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
     invoke-virtual {p1, v7, v8, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerBarrier(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Z)V
 
     :cond_d
-    :goto_8
+    :goto_7
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_e
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
@@ -348,7 +340,6 @@
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_9
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
     invoke-virtual {p1, v0, v1, v2, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
@@ -356,8 +347,6 @@
     return-void
 
     :cond_f
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     if-ne v0, v4, :cond_10
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -380,11 +369,13 @@
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_9
+    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    invoke-virtual {p1, v0, v1, v2, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+
+    return-void
 
     :cond_10
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     if-ne v0, v3, :cond_11
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -407,11 +398,13 @@
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_9
+    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    invoke-virtual {p1, v0, v1, v2, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+
+    return-void
 
     :cond_11
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     if-ne v0, v5, :cond_12
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -440,6 +433,9 @@
 
     :cond_12
     return-void
+
+    :cond_13
+    return-void
 .end method
 
 .method public allowedInBarrier()Z
@@ -492,26 +488,38 @@
     :pswitch_0
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object p1
+
     goto :goto_0
 
     :pswitch_1
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object p1
+
     goto :goto_0
 
     :pswitch_2
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object p1
+
     goto :goto_0
 
     :pswitch_3
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_0
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object p1
 
+    :goto_0
     const/4 v0, 0x5
 
     invoke-virtual {p1, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
@@ -524,8 +532,6 @@
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     const/4 v3, 0x1
 
     if-ne v0, v3, :cond_2
@@ -543,6 +549,12 @@
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
     goto :goto_2
 
     :cond_3
@@ -557,13 +569,13 @@
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_2
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v0
 
     invoke-virtual {v0, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
 
+    :goto_2
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mNodes:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
@@ -596,32 +608,43 @@
 
     move-object v1, v2
 
-    goto :goto_5
+    goto :goto_4
 
     :pswitch_4
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v1
+
     goto :goto_4
 
     :pswitch_5
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v1
+
     goto :goto_4
 
     :pswitch_6
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v1
+
     goto :goto_4
 
     :pswitch_7
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_4
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v1
 
-    :goto_5
+    :goto_4
     if-eqz v1, :cond_5
 
     iget-object v3, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mNodes:Ljava/util/ArrayList;
@@ -638,6 +661,8 @@
     :cond_6
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
@@ -683,34 +708,42 @@
     :pswitch_0
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_0
-
-    :pswitch_1
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    goto :goto_1
-
-    :pswitch_2
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    :goto_0
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    goto :goto_2
+    goto :goto_0
 
-    :pswitch_3
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :pswitch_1
+    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_1
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v0
 
-    :goto_2
+    goto :goto_0
+
+    :pswitch_2
+    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    goto :goto_0
+
+    :pswitch_3
+    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v0
+
+    :goto_0
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mNodes:Ljava/util/ArrayList;
 
     invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
@@ -721,7 +754,7 @@
 
     const/4 v4, 0x0
 
-    :goto_3
+    :goto_1
     if-ge v4, v2, :cond_4
 
     iget-object v5, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mNodes:Ljava/util/ArrayList;
@@ -745,13 +778,11 @@
 
     if-eqz v6, :cond_2
 
-    iget v6, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBarrierType:I
-
     const/4 v7, 0x2
 
     if-ne v6, v7, :cond_1
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_1
     iget v6, v5, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
@@ -760,25 +791,29 @@
 
     if-lez v6, :cond_3
 
-    goto :goto_5
+    iget v1, v5, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
+
+    iget-object v3, v5, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    goto :goto_3
 
     :cond_2
-    :goto_4
+    :goto_2
     iget v6, v5, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
     cmpg-float v6, v6, v1
 
     if-gez v6, :cond_3
 
-    :goto_5
     iget v1, v5, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
     iget-object v3, v5, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     :cond_3
+    :goto_3
     add-int/lit8 v4, v4, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_4
     invoke-static {}, Landroidx/constraintlayout/solver/LinearSystem;->getMetrics()Landroidx/constraintlayout/solver/Metrics;
@@ -815,7 +850,6 @@
     :pswitch_4
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_6
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v0
@@ -827,17 +861,35 @@
     :pswitch_5
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_6
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
+    return-void
 
     :pswitch_6
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_6
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
+    return-void
 
     :pswitch_7
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Barrier;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_6
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
+    return-void
 
     nop
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Chain.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Chain.smali
index 4d360da74d..4dea6bfdc5 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Chain.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Chain.smali
@@ -1,5 +1,6 @@
 .class Landroidx/constraintlayout/solver/widgets/Chain;
 .super Ljava/lang/Object;
+.source "Chain.java"
 
 
 # static fields
@@ -79,7 +80,7 @@
 .end method
 
 .method static applyChainConstraints(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;Landroidx/constraintlayout/solver/LinearSystem;IILandroidx/constraintlayout/solver/widgets/ChainHead;)V
-    .locals 45
+    .locals 35
 
     move-object/from16 v0, p0
 
@@ -87,13 +88,13 @@
 
     move-object/from16 v1, p4
 
-    iget-object v11, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirst:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v10, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirst:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    iget-object v12, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLast:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v11, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLast:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    iget-object v13, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirstVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v12, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirstVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    iget-object v14, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v13, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     iget-object v2, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHead:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
@@ -133,232 +134,248 @@
     const/4 v8, 0x0
 
     :goto_1
-    iget v6, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalChainStyle:I
+    iget v14, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalChainStyle:I
 
-    if-ne v6, v7, :cond_2
+    if-ne v14, v7, :cond_2
 
-    const/4 v6, 0x1
+    const/4 v14, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v6, 0x0
+    const/4 v14, 0x0
 
     :goto_2
-    iget v7, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalChainStyle:I
+    iget v15, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalChainStyle:I
 
-    if-ne v7, v5, :cond_3
+    if-ne v15, v5, :cond_3
 
-    :goto_3
     const/4 v5, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/4 v5, 0x0
 
-    :goto_4
-    move v7, v5
+    :goto_3
+    move v15, v8
 
-    move/from16 v18, v6
+    move-object v8, v10
 
-    move/from16 v17, v8
+    move/from16 v16, v14
 
-    move-object v5, v11
+    move v14, v5
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     goto :goto_7
 
     :cond_4
-    iget v6, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
+    iget v8, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
 
-    if-nez v6, :cond_5
+    if-nez v8, :cond_5
 
     const/4 v8, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     const/4 v8, 0x0
 
+    :goto_4
+    iget v14, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
+
+    if-ne v14, v7, :cond_6
+
+    const/4 v14, 0x1
+
+    goto :goto_5
+
+    :cond_6
+    const/4 v14, 0x0
+
     :goto_5
-    iget v6, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
+    iget v15, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
 
-    const/4 v7, 0x1
+    if-ne v15, v5, :cond_7
 
-    if-ne v6, v7, :cond_6
-
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
     goto :goto_6
 
-    :cond_6
-    const/4 v6, 0x0
+    :cond_7
+    const/4 v5, 0x0
 
     :goto_6
-    iget v7, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
+    move v15, v8
 
-    if-ne v7, v5, :cond_3
+    move-object v8, v10
 
-    goto :goto_3
+    move/from16 v16, v14
+
+    move v14, v5
+
+    const/4 v5, 0x0
 
     :goto_7
-    const/16 v22, 0x0
+    const/16 v21, 0x0
 
-    if-nez v6, :cond_13
+    if-nez v5, :cond_14
 
-    iget-object v8, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v7, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v8, v8, p3
+    aget-object v7, v7, p3
 
-    if-nez v4, :cond_8
+    if-nez v4, :cond_9
 
-    if-eqz v7, :cond_7
+    if-eqz v14, :cond_8
 
     goto :goto_8
 
-    :cond_7
+    :cond_8
     const/16 v23, 0x4
 
     goto :goto_9
 
-    :cond_8
+    :cond_9
     :goto_8
     const/16 v23, 0x1
 
     :goto_9
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v24
 
-    move/from16 v25, v3
+    iget-object v6, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v3, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eqz v6, :cond_a
 
-    if-eqz v3, :cond_9
+    if-eq v8, v10, :cond_a
 
-    if-eq v5, v11, :cond_9
+    iget-object v6, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v3, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+    move-result v6
 
-    move-result v3
+    add-int v24, v24, v6
 
-    add-int v24, v24, v3
-
-    :cond_9
-    move/from16 v3, v24
-
-    if-eqz v7, :cond_a
-
-    if-eq v5, v11, :cond_a
-
-    if-eq v5, v13, :cond_a
-
-    move-object/from16 v27, v2
-
-    move/from16 v26, v6
-
-    const/4 v6, 0x6
+    move/from16 v6, v24
 
     goto :goto_a
 
     :cond_a
-    if-eqz v17, :cond_b
-
-    if-eqz v4, :cond_b
-
-    move-object/from16 v27, v2
-
-    move/from16 v26, v6
-
-    const/4 v6, 0x4
-
-    goto :goto_a
-
-    :cond_b
-    move-object/from16 v27, v2
-
-    move/from16 v26, v6
-
-    move/from16 v6, v23
+    move/from16 v6, v24
 
     :goto_a
-    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eqz v14, :cond_b
 
-    if-eqz v2, :cond_d
+    if-eq v8, v10, :cond_b
 
-    if-ne v5, v13, :cond_c
+    if-eq v8, v12, :cond_b
 
-    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    move/from16 v24, v3
 
-    move-object/from16 v28, v11
+    move/from16 v23, v5
 
-    iget-object v11, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    const/4 v3, 0x6
 
-    iget-object v11, v11, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    goto :goto_b
 
-    move/from16 v29, v7
+    :cond_b
+    if-eqz v15, :cond_c
 
-    const/4 v7, 0x5
+    if-eqz v4, :cond_c
 
-    invoke-virtual {v9, v2, v11, v3, v7}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    move/from16 v24, v3
+
+    move/from16 v23, v5
+
+    const/4 v3, 0x4
 
     goto :goto_b
 
     :cond_c
-    move/from16 v29, v7
+    move/from16 v24, v3
 
-    move-object/from16 v28, v11
+    move/from16 v3, v23
 
-    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    iget-object v7, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    const/4 v11, 0x6
-
-    invoke-virtual {v9, v2, v7, v3, v11}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    move/from16 v23, v5
 
     :goto_b
-    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    iget-object v5, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v7, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eqz v5, :cond_e
 
-    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    if-ne v8, v12, :cond_d
 
-    invoke-virtual {v9, v2, v7, v3, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    iget-object v5, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    move/from16 v25, v15
+
+    iget-object v15, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v15, v15, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    move-object/from16 v26, v2
+
+    const/4 v2, 0x5
+
+    invoke-virtual {v9, v5, v15, v6, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
     goto :goto_c
 
     :cond_d
-    move/from16 v29, v7
+    move-object/from16 v26, v2
 
-    move-object/from16 v28, v11
+    move/from16 v25, v15
+
+    iget-object v2, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    iget-object v5, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    const/4 v15, 0x6
+
+    invoke-virtual {v9, v2, v5, v6, v15}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
     :goto_c
-    if-eqz v4, :cond_f
+    iget-object v2, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+    iget-object v5, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    invoke-virtual {v9, v2, v5, v6, v3}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+
+    goto :goto_d
+
+    :cond_e
+    move-object/from16 v26, v2
+
+    move/from16 v25, v15
+
+    :goto_d
+    if-eqz v4, :cond_10
+
+    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v2
 
     const/16 v3, 0x8
 
-    if-eq v2, v3, :cond_e
+    if-eq v2, v3, :cond_f
 
-    iget-object v2, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     aget-object v2, v2, p2
 
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v2, v3, :cond_e
+    if-ne v2, v3, :cond_f
 
-    iget-object v2, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v3, p3, 0x1
 
@@ -366,25 +383,25 @@
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v3, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v3, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v3, v3, p3
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    const/4 v7, 0x5
+    const/4 v6, 0x5
 
-    invoke-virtual {v9, v2, v3, v6, v7}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v9, v2, v3, v5, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    goto :goto_d
+    goto :goto_e
 
-    :cond_e
-    const/4 v6, 0x0
+    :cond_f
+    const/4 v5, 0x0
 
-    :goto_d
-    iget-object v2, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :goto_e
+    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v2, v2, p3
 
@@ -396,12 +413,12 @@
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    const/4 v7, 0x6
+    const/4 v6, 0x6
 
-    invoke-virtual {v9, v2, v3, v6, v7}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v9, v2, v3, v5, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    :cond_f
-    iget-object v2, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_10
+    iget-object v2, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v3, p3, 0x1
 
@@ -409,7 +426,7 @@
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v2, :cond_11
+    if-eqz v2, :cond_12
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
@@ -419,7 +436,7 @@
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v3, :cond_11
+    if-eqz v3, :cond_12
 
     iget-object v3, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -429,56 +446,50 @@
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    if-eq v3, v5, :cond_10
+    if-eq v3, v8, :cond_11
 
-    goto :goto_e
-
-    :cond_10
-    move-object/from16 v22, v2
+    goto :goto_f
 
     :cond_11
-    :goto_e
-    if-eqz v22, :cond_12
-
-    move-object/from16 v5, v22
-
-    move/from16 v3, v25
-
-    move/from16 v6, v26
-
-    move-object/from16 v2, v27
-
-    move-object/from16 v11, v28
-
-    move/from16 v7, v29
-
-    goto/16 :goto_7
+    move-object/from16 v21, v2
 
     :cond_12
-    move/from16 v3, v25
+    :goto_f
+    if-eqz v21, :cond_13
 
-    move-object/from16 v2, v27
+    move-object/from16 v8, v21
 
-    move-object/from16 v11, v28
+    move/from16 v5, v23
 
-    move/from16 v7, v29
+    move/from16 v3, v24
 
-    const/4 v6, 0x1
+    move/from16 v15, v25
+
+    move-object/from16 v2, v26
 
     goto/16 :goto_7
 
     :cond_13
-    move-object/from16 v27, v2
+    move/from16 v3, v24
 
-    move/from16 v25, v3
+    move/from16 v15, v25
 
-    move/from16 v29, v7
+    move-object/from16 v2, v26
 
-    move-object/from16 v28, v11
+    const/4 v5, 0x1
 
-    if-eqz v14, :cond_14
+    goto/16 :goto_7
 
-    iget-object v2, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_14
+    move-object/from16 v26, v2
+
+    move/from16 v24, v3
+
+    move/from16 v25, v15
+
+    if-eqz v13, :cond_15
+
+    iget-object v2, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v3, p3, 0x1
 
@@ -486,15 +497,15 @@
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v2, :cond_14
+    if-eqz v2, :cond_15
 
-    iget-object v2, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v2, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v2, v2, v3
 
     iget-object v5, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v6, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v6, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v3, v6, v3
 
@@ -508,17 +519,17 @@
 
     neg-int v2, v2
 
-    const/4 v8, 0x5
+    const/4 v6, 0x5
 
-    invoke-virtual {v9, v5, v3, v2, v8}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v9, v5, v3, v2, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    goto :goto_f
+    goto :goto_10
 
-    :cond_14
-    const/4 v8, 0x5
+    :cond_15
+    const/4 v6, 0x5
 
-    :goto_f
-    if-eqz v4, :cond_15
+    :goto_10
+    if-eqz v4, :cond_16
 
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -528,13 +539,13 @@
 
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v3, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v3, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v3, v3, v2
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v4, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v4, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v2, v4, v2
 
@@ -546,240 +557,251 @@
 
     invoke-virtual {v9, v0, v3, v2, v4}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    :cond_15
+    :cond_16
     iget-object v0, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWeightedMatchConstraintsWidgets:Ljava/util/ArrayList;
 
-    if-eqz v0, :cond_1b
+    if-eqz v0, :cond_1c
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v2
 
-    const/4 v7, 0x1
+    const/4 v3, 0x1
 
-    if-le v2, v7, :cond_1b
+    if-le v2, v3, :cond_1c
 
-    iget-boolean v3, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasUndefinedWeights:Z
+    iget-boolean v4, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasUndefinedWeights:Z
 
-    if-eqz v3, :cond_16
+    if-eqz v4, :cond_17
 
-    iget-boolean v3, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasComplexMatchWeights:Z
+    iget-boolean v4, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasComplexMatchWeights:Z
 
-    if-nez v3, :cond_16
+    if-nez v4, :cond_17
 
-    iget v3, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
+    iget v4, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
 
-    int-to-float v3, v3
-
-    move/from16 v25, v3
-
-    :cond_16
-    const/4 v3, 0x0
-
-    move-object/from16 v5, v22
-
-    const/4 v4, 0x0
-
-    const/16 v31, 0x0
-
-    :goto_10
-    if-ge v4, v2, :cond_1b
-
-    invoke-virtual {v0, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    iget-object v11, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
-
-    aget v11, v11, p2
-
-    cmpg-float v16, v11, v3
-
-    if-gez v16, :cond_18
-
-    iget-boolean v11, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasComplexMatchWeights:Z
-
-    if-eqz v11, :cond_17
-
-    iget-object v11, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    add-int/lit8 v16, p3, 0x1
-
-    aget-object v11, v11, v16
-
-    iget-object v11, v11, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    iget-object v6, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v6, v6, p3
-
-    iget-object v6, v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x4
-
-    invoke-virtual {v9, v11, v6, v7, v8}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
-
-    const/4 v8, 0x6
-
-    const/4 v11, 0x0
-
-    goto :goto_12
-
-    :cond_17
-    const/4 v8, 0x4
-
-    const/high16 v7, 0x3f800000    # 1.0f
-
-    const/high16 v11, 0x3f800000    # 1.0f
+    int-to-float v4, v4
 
     goto :goto_11
 
-    :cond_18
-    const/4 v8, 0x4
+    :cond_17
+    move/from16 v4, v24
 
     :goto_11
-    cmpl-float v7, v11, v3
+    const/4 v5, 0x0
 
-    if-nez v7, :cond_19
+    move-object/from16 v8, v21
 
-    iget-object v7, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    const/4 v7, 0x0
 
-    add-int/lit8 v11, p3, 0x1
+    const/16 v28, 0x0
 
-    aget-object v7, v7, v11
+    :goto_12
+    if-ge v7, v2, :cond_1c
 
-    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    invoke-virtual {v0, v7}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    iget-object v6, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    move-result-object v15
+
+    check-cast v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    iget-object v3, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
+
+    aget v3, v3, p2
+
+    cmpg-float v23, v3, v5
+
+    if-gez v23, :cond_19
+
+    iget-boolean v3, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasComplexMatchWeights:Z
+
+    if-eqz v3, :cond_18
+
+    iget-object v3, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    add-int/lit8 v23, p3, 0x1
+
+    aget-object v3, v3, v23
+
+    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    iget-object v15, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v15, v15, p3
+
+    iget-object v15, v15, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    const/4 v5, 0x4
+
+    const/4 v6, 0x0
+
+    invoke-virtual {v9, v3, v15, v6, v5}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x6
+
+    goto :goto_14
+
+    :cond_18
+    const/4 v5, 0x4
+
+    const/high16 v3, 0x3f800000    # 1.0f
+
+    const/4 v6, 0x0
+
+    goto :goto_13
+
+    :cond_19
+    const/4 v5, 0x4
+
+    const/4 v6, 0x0
+
+    :goto_13
+    cmpl-float v20, v3, v6
+
+    if-nez v20, :cond_1a
+
+    iget-object v3, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    add-int/lit8 v20, p3, 0x1
+
+    aget-object v3, v3, v20
+
+    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    iget-object v15, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v15, v15, p3
+
+    iget-object v15, v15, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x6
+
+    invoke-virtual {v9, v3, v15, v5, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+
+    :goto_14
+    move-object/from16 v24, v0
+
+    move/from16 v22, v2
+
+    goto :goto_16
+
+    :cond_1a
+    const/4 v5, 0x0
+
+    const/4 v6, 0x6
+
+    if-eqz v8, :cond_1b
+
+    iget-object v5, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v5, v5, p3
+
+    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    iget-object v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    add-int/lit8 v22, p3, 0x1
+
+    aget-object v8, v8, v22
+
+    iget-object v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    iget-object v6, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v6, v6, p3
 
     iget-object v6, v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    const/4 v8, 0x6
+    move-object/from16 v24, v0
 
-    const/4 v11, 0x0
+    iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    invoke-virtual {v9, v7, v6, v11, v8}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    aget-object v0, v0, v22
 
-    :goto_12
-    move-object/from16 v39, v0
+    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_14
-
-    :cond_19
-    const/4 v7, 0x0
-
-    const/4 v8, 0x6
-
-    if-eqz v5, :cond_1a
-
-    iget-object v3, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v3, v3, p3
-
-    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    add-int/lit8 v15, p3, 0x1
-
-    aget-object v5, v5, v15
-
-    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    iget-object v7, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v7, v7, p3
-
-    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    iget-object v8, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v8, v8, v15
-
-    iget-object v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    move-object/from16 v39, v0
+    move/from16 v22, v2
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/LinearSystem;->createRow()Landroidx/constraintlayout/solver/ArrayRow;
 
-    move-result-object v0
+    move-result-object v2
 
-    move-object/from16 v30, v0
+    move-object/from16 v27, v2
 
-    move/from16 v32, v25
+    move/from16 v29, v4
 
-    move/from16 v33, v11
+    move/from16 v30, v3
 
-    move-object/from16 v34, v3
+    move-object/from16 v31, v5
 
-    move-object/from16 v35, v5
+    move-object/from16 v32, v8
 
-    move-object/from16 v36, v7
+    move-object/from16 v33, v6
 
-    move-object/from16 v37, v8
+    move-object/from16 v34, v0
 
-    invoke-virtual/range {v30 .. v37}, Landroidx/constraintlayout/solver/ArrayRow;->createRowEqualMatchDimensions(FFFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual/range {v27 .. v34}, Landroidx/constraintlayout/solver/ArrayRow;->createRowEqualMatchDimensions(FFFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;)Landroidx/constraintlayout/solver/ArrayRow;
 
-    invoke-virtual {v9, v0}, Landroidx/constraintlayout/solver/LinearSystem;->addConstraint(Landroidx/constraintlayout/solver/ArrayRow;)V
+    invoke-virtual {v9, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addConstraint(Landroidx/constraintlayout/solver/ArrayRow;)V
 
-    goto :goto_13
-
-    :cond_1a
-    move-object/from16 v39, v0
-
-    :goto_13
-    move-object v5, v6
-
-    move/from16 v31, v11
-
-    :goto_14
-    add-int/lit8 v4, v4, 0x1
-
-    move-object/from16 v0, v39
-
-    const/4 v3, 0x0
-
-    const/4 v7, 0x1
-
-    const/4 v8, 0x5
-
-    goto/16 :goto_10
+    goto :goto_15
 
     :cond_1b
-    if-eqz v13, :cond_21
+    move-object/from16 v24, v0
 
-    if-eq v13, v14, :cond_1c
+    move/from16 v22, v2
 
-    if-eqz v29, :cond_21
+    :goto_15
+    move/from16 v28, v3
+
+    move-object v8, v15
+
+    :goto_16
+    add-int/lit8 v7, v7, 0x1
+
+    move/from16 v2, v22
+
+    move-object/from16 v0, v24
+
+    const/4 v3, 0x1
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x5
+
+    goto/16 :goto_12
 
     :cond_1c
-    move-object/from16 v11, v28
+    if-eqz v12, :cond_22
 
-    iget-object v0, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eq v12, v13, :cond_1d
+
+    if-eqz v14, :cond_22
+
+    :cond_1d
+    iget-object v0, v10, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
-    iget-object v1, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v1, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v2, p3, 0x1
 
     aget-object v1, v1, v2
 
-    iget-object v3, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v3, v10, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v3, v3, p3
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v3, :cond_1d
+    if-eqz v3, :cond_1e
 
-    iget-object v3, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v3, v10, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v3, v3, p3
 
@@ -787,21 +809,21 @@
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_15
+    goto :goto_17
 
-    :cond_1d
-    move-object/from16 v3, v22
+    :cond_1e
+    move-object/from16 v3, v21
 
-    :goto_15
-    iget-object v4, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :goto_17
+    iget-object v4, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v4, v4, v2
 
     iget-object v4, v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v4, :cond_1e
+    if-eqz v4, :cond_1f
 
-    iget-object v4, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v4, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v4, v4, v2
 
@@ -811,46 +833,45 @@
 
     move-object v5, v4
 
-    goto :goto_16
+    goto :goto_18
 
-    :cond_1e
-    move-object/from16 v5, v22
+    :cond_1f
+    move-object/from16 v5, v21
 
-    :goto_16
-    if-ne v13, v14, :cond_1f
+    :goto_18
+    if-ne v12, v13, :cond_20
 
-    iget-object v0, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v0, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
-    iget-object v1, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v1, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v1, v1, v2
 
-    :cond_1f
+    :cond_20
     if-eqz v3, :cond_46
 
     if-eqz v5, :cond_46
 
-    if-nez p2, :cond_20
+    if-nez p2, :cond_21
 
-    move-object/from16 v2, v27
+    move-object/from16 v2, v26
 
     iget v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F
 
-    :goto_17
     move v4, v2
 
-    goto :goto_18
+    goto :goto_19
 
-    :cond_20
-    move-object/from16 v2, v27
+    :cond_21
+    move-object/from16 v2, v26
 
     iget v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F
 
-    goto :goto_17
+    move v4, v2
 
-    :goto_18
+    :goto_19
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v6
@@ -879,92 +900,83 @@
 
     invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/solver/LinearSystem;->addCentering(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;IFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    goto/16 :goto_33
+    goto/16 :goto_32
 
-    :cond_21
-    move-object/from16 v11, v28
+    :cond_22
+    if-eqz v25, :cond_35
 
-    if-eqz v17, :cond_34
-
-    if-eqz v13, :cond_34
+    if-eqz v12, :cond_35
 
     iget v0, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
 
-    if-lez v0, :cond_22
+    if-lez v0, :cond_23
 
     iget v0, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsCount:I
 
     iget v1, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
 
-    if-ne v0, v1, :cond_22
+    if-ne v0, v1, :cond_23
 
-    const/16 v38, 0x1
+    const/16 v17, 0x1
 
-    goto :goto_19
+    goto :goto_1a
 
-    :cond_22
-    const/16 v38, 0x0
-
-    :goto_19
-    move-object v7, v13
-
-    move-object v8, v7
+    :cond_23
+    const/16 v17, 0x0
 
     :goto_1a
-    if-eqz v8, :cond_45
+    move-object v14, v12
 
-    iget-object v0, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    move-object v15, v14
+
+    :goto_1b
+    if-eqz v14, :cond_46
+
+    iget-object v0, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     aget-object v0, v0, p2
 
-    move-object v6, v0
+    move-object v8, v0
 
-    :goto_1b
-    if-eqz v6, :cond_23
+    :goto_1c
+    if-eqz v8, :cond_24
 
-    invoke-virtual {v6}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v0
 
-    const/16 v5, 0x8
+    const/16 v7, 0x8
 
-    if-ne v0, v5, :cond_24
+    if-ne v0, v7, :cond_25
 
-    iget-object v0, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v0, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    aget-object v6, v0, p2
+    aget-object v8, v0, p2
 
-    goto :goto_1b
-
-    :cond_23
-    const/16 v5, 0x8
+    goto :goto_1c
 
     :cond_24
-    if-nez v6, :cond_26
+    const/16 v7, 0x8
 
-    if-ne v8, v14, :cond_25
+    :cond_25
+    if-nez v8, :cond_27
+
+    if-ne v14, v13, :cond_26
 
     goto :goto_1d
 
-    :cond_25
-    move-object/from16 v20, v6
-
-    move-object/from16 v41, v7
-
-    move-object v15, v8
-
-    :goto_1c
-    const/16 v9, 0x8
+    :cond_26
+    move-object/from16 v18, v8
 
     const/16 v19, 0x6
 
-    const/16 v21, 0x4
+    const/16 v20, 0x4
 
-    goto/16 :goto_25
+    goto/16 :goto_24
 
-    :cond_26
+    :cond_27
     :goto_1d
-    iget-object v0, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v0, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
@@ -972,7 +984,7 @@
 
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v2, :cond_27
+    if-eqz v2, :cond_28
 
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -980,54 +992,55 @@
 
     goto :goto_1e
 
-    :cond_27
-    move-object/from16 v2, v22
+    :cond_28
+    move-object/from16 v2, v21
 
     :goto_1e
-    if-eq v7, v8, :cond_28
+    if-eq v15, v14, :cond_29
 
-    iget-object v2, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v2, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v3, p3, 0x1
 
     aget-object v2, v2, v3
 
-    :goto_1f
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_20
-
-    :cond_28
-    if-ne v8, v13, :cond_2a
-
-    if-ne v7, v8, :cond_2a
-
-    iget-object v2, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v2, v2, p3
-
-    iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-eqz v2, :cond_29
-
-    iget-object v2, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v2, v2, p3
-
-    iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
     goto :goto_1f
 
     :cond_29
-    move-object/from16 v2, v22
+    if-ne v14, v12, :cond_2b
+
+    if-ne v15, v14, :cond_2b
+
+    iget-object v2, v10, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v2, v2, p3
+
+    iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v2, :cond_2a
+
+    iget-object v2, v10, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v2, v2, p3
+
+    iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    goto :goto_1f
 
     :cond_2a
-    :goto_20
+    move-object/from16 v2, v21
+
+    :cond_2b
+    :goto_1f
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v0
 
-    iget-object v3, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v3, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v4, p3, 0x1
 
@@ -1037,54 +1050,51 @@
 
     move-result v3
 
-    if-eqz v6, :cond_2b
+    if-eqz v8, :cond_2c
 
-    iget-object v5, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v5, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v5, v5, p3
 
-    move-object/from16 v40, v6
-
-    :goto_21
     iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_22
+    goto :goto_20
 
-    :cond_2b
-    move-object/from16 v40, v6
-
-    iget-object v5, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_2c
+    iget-object v5, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v5, v5, v4
 
     iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v5, :cond_2c
-
-    goto :goto_21
-
-    :cond_2c
-    move-object/from16 v6, v22
-
-    :goto_22
-    iget-object v9, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v9, v9, v4
-
-    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
     if-eqz v5, :cond_2d
 
+    iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    goto :goto_20
+
+    :cond_2d
+    move-object/from16 v6, v21
+
+    :goto_20
+    iget-object v7, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v7, v7, v4
+
+    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+
+    if-eqz v5, :cond_2e
+
     invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v5
 
     add-int/2addr v3, v5
 
-    :cond_2d
-    if-eqz v7, :cond_2e
+    :cond_2e
+    if-eqz v15, :cond_2f
 
-    iget-object v5, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v5, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v5, v5, v4
 
@@ -1094,18 +1104,18 @@
 
     add-int/2addr v0, v5
 
-    :cond_2e
-    if-eqz v1, :cond_32
+    :cond_2f
+    if-eqz v1, :cond_33
 
-    if-eqz v2, :cond_32
+    if-eqz v2, :cond_33
 
-    if-eqz v6, :cond_32
+    if-eqz v6, :cond_33
 
-    if-eqz v9, :cond_32
+    if-eqz v7, :cond_33
 
-    if-ne v8, v13, :cond_2f
+    if-ne v14, v12, :cond_30
 
-    iget-object v0, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v0, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
@@ -1113,12 +1123,17 @@
 
     move-result v0
 
-    :cond_2f
     move v5, v0
 
-    if-ne v8, v14, :cond_30
+    goto :goto_21
 
-    iget-object v0, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_30
+    move v5, v0
+
+    :goto_21
+    if-ne v14, v13, :cond_31
+
+    iget-object v0, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, v4
 
@@ -1126,167 +1141,152 @@
 
     move-result v0
 
-    move v15, v0
+    move/from16 v18, v0
+
+    goto :goto_22
+
+    :cond_31
+    move/from16 v18, v3
+
+    :goto_22
+    if-eqz v17, :cond_32
+
+    const/16 v22, 0x6
 
     goto :goto_23
 
-    :cond_30
-    move v15, v3
+    :cond_32
+    const/16 v22, 0x4
 
     :goto_23
-    if-eqz v38, :cond_31
-
-    const/16 v16, 0x6
-
-    goto :goto_24
-
-    :cond_31
-    const/16 v16, 0x4
-
-    :goto_24
     const/high16 v4, 0x3f000000    # 0.5f
 
     move-object/from16 v0, p1
 
     move v3, v5
 
-    const/16 v19, 0x8
+    const/16 v20, 0x4
 
     move-object v5, v6
 
-    move-object/from16 v20, v40
+    const/16 v23, 0x6
 
-    move-object v6, v9
-
-    move-object v9, v7
-
-    move v7, v15
-
-    move-object v15, v8
-
-    move-object/from16 v41, v9
-
-    const/16 v9, 0x8
+    move-object v6, v7
 
     const/16 v19, 0x6
 
-    const/16 v21, 0x4
+    move/from16 v7, v18
 
-    move/from16 v8, v16
+    move-object/from16 v18, v8
+
+    move/from16 v8, v22
 
     invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/solver/LinearSystem;->addCentering(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;IFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    goto :goto_25
-
-    :cond_32
-    move-object/from16 v41, v7
-
-    move-object v15, v8
-
-    move-object/from16 v20, v40
-
-    goto/16 :goto_1c
-
-    :goto_25
-    invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
-
-    move-result v0
-
-    if-eq v0, v9, :cond_33
-
-    move-object v7, v15
-
-    goto :goto_26
+    goto :goto_24
 
     :cond_33
-    move-object/from16 v7, v41
-
-    :goto_26
-    move-object/from16 v8, v20
-
-    move-object/from16 v9, p1
-
-    goto/16 :goto_1a
-
-    :cond_34
-    const/16 v9, 0x8
+    move-object/from16 v18, v8
 
     const/16 v19, 0x6
 
-    const/16 v21, 0x4
+    const/16 v20, 0x4
 
-    if-eqz v18, :cond_45
+    :goto_24
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
-    if-eqz v13, :cond_45
+    move-result v0
+
+    const/16 v8, 0x8
+
+    if-eq v0, v8, :cond_34
+
+    move-object v15, v14
+
+    :cond_34
+    move-object/from16 v14, v18
+
+    goto/16 :goto_1b
+
+    :cond_35
+    const/16 v8, 0x8
+
+    const/16 v19, 0x6
+
+    const/16 v20, 0x4
+
+    if-eqz v16, :cond_46
+
+    if-eqz v12, :cond_46
 
     iget v0, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
 
-    if-lez v0, :cond_35
+    if-lez v0, :cond_36
 
     iget v0, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsCount:I
 
     iget v1, v1, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
 
-    if-ne v0, v1, :cond_35
+    if-ne v0, v1, :cond_36
 
-    const/16 v38, 0x1
+    const/16 v17, 0x1
 
-    goto :goto_27
+    goto :goto_25
 
-    :cond_35
-    const/16 v38, 0x0
+    :cond_36
+    const/16 v17, 0x0
 
-    :goto_27
-    move-object v7, v13
+    :goto_25
+    move-object v14, v12
 
-    move-object v8, v7
+    move-object v15, v14
 
-    :goto_28
-    if-eqz v8, :cond_41
+    :goto_26
+    if-eqz v14, :cond_42
 
-    iget-object v0, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v0, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     aget-object v0, v0, p2
 
-    :goto_29
-    if-eqz v0, :cond_36
+    :goto_27
+    if-eqz v0, :cond_37
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v1
 
-    if-ne v1, v9, :cond_36
+    if-ne v1, v8, :cond_37
 
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     aget-object v0, v0, p2
 
-    goto :goto_29
-
-    :cond_36
-    if-eq v8, v13, :cond_3f
-
-    if-eq v8, v14, :cond_3f
-
-    if-eqz v0, :cond_3f
-
-    if-ne v0, v14, :cond_37
-
-    move-object/from16 v6, v22
-
-    goto :goto_2a
+    goto :goto_27
 
     :cond_37
-    move-object v6, v0
+    if-eq v14, v12, :cond_40
 
-    :goto_2a
-    iget-object v0, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eq v14, v13, :cond_40
+
+    if-eqz v0, :cond_40
+
+    if-ne v0, v13, :cond_38
+
+    move-object/from16 v7, v21
+
+    goto :goto_28
+
+    :cond_38
+    move-object v7, v0
+
+    :goto_28
+    iget-object v0, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v2, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v2, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v3, p3, 0x1
 
@@ -1298,7 +1298,7 @@
 
     move-result v0
 
-    iget-object v4, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v4, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v4, v4, v3
 
@@ -1306,65 +1306,54 @@
 
     move-result v4
 
-    if-eqz v6, :cond_39
+    if-eqz v7, :cond_3a
 
-    iget-object v5, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v5, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v5, v5, p3
 
-    iget-object v9, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    move-object/from16 v42, v6
+    iget-object v8, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eqz v8, :cond_39
 
-    if-eqz v6, :cond_38
+    iget-object v8, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v6, v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
-    goto :goto_2b
-
-    :cond_38
-    move-object/from16 v6, v22
-
-    :goto_2b
-    move-object/from16 v44, v9
-
-    move-object v9, v6
-
-    move-object/from16 v6, v44
-
-    goto :goto_2d
+    goto :goto_2a
 
     :cond_39
-    move-object/from16 v42, v6
+    move-object/from16 v8, v21
 
-    iget-object v5, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    goto :goto_2a
+
+    :cond_3a
+    iget-object v5, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v5, v5, v3
 
     iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v5, :cond_3a
+    if-eqz v5, :cond_3b
 
     iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_2c
+    goto :goto_29
 
-    :cond_3a
-    move-object/from16 v6, v22
+    :cond_3b
+    move-object/from16 v6, v21
 
-    :goto_2c
-    iget-object v9, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :goto_29
+    iget-object v8, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v9, v9, v3
+    aget-object v8, v8, v3
 
-    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    iget-object v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    :goto_2d
-    if-eqz v5, :cond_3b
+    :goto_2a
+    if-eqz v5, :cond_3c
 
     invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
@@ -1372,12 +1361,17 @@
 
     add-int/2addr v4, v5
 
-    :cond_3b
-    move v15, v4
+    move/from16 v18, v4
 
-    if-eqz v7, :cond_3c
+    goto :goto_2b
 
-    iget-object v4, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_3c
+    move/from16 v18, v4
+
+    :goto_2b
+    if-eqz v15, :cond_3d
+
+    iget-object v4, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v3, v4, v3
 
@@ -1387,26 +1381,31 @@
 
     add-int/2addr v0, v3
 
-    :cond_3c
     move v3, v0
 
-    if-eqz v38, :cond_3d
-
-    const/16 v16, 0x6
-
-    goto :goto_2e
+    goto :goto_2c
 
     :cond_3d
-    const/16 v16, 0x4
+    move v3, v0
 
-    :goto_2e
-    if-eqz v1, :cond_3e
+    :goto_2c
+    if-eqz v17, :cond_3e
 
-    if-eqz v2, :cond_3e
+    const/16 v22, 0x6
 
-    if-eqz v6, :cond_3e
+    goto :goto_2d
 
-    if-eqz v9, :cond_3e
+    :cond_3e
+    const/16 v22, 0x4
+
+    :goto_2d
+    if-eqz v1, :cond_3f
+
+    if-eqz v2, :cond_3f
+
+    if-eqz v6, :cond_3f
+
+    if-eqz v8, :cond_3f
 
     const/high16 v4, 0x3f000000    # 0.5f
 
@@ -1414,98 +1413,86 @@
 
     move-object v5, v6
 
-    move-object/from16 v20, v42
+    move-object v6, v8
 
-    move-object v6, v9
+    move-object/from16 v23, v7
 
-    move-object v9, v7
+    move/from16 v7, v18
 
-    move v7, v15
+    move-object/from16 v18, v15
 
-    move-object v15, v8
+    const/16 v15, 0x8
 
-    move-object/from16 v43, v9
-
-    const/4 v9, 0x5
-
-    move/from16 v8, v16
+    move/from16 v8, v22
 
     invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/solver/LinearSystem;->addCentering(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;IFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
+    goto :goto_2e
+
+    :cond_3f
+    move-object/from16 v23, v7
+
+    move-object/from16 v18, v15
+
+    const/16 v15, 0x8
+
+    :goto_2e
+    move-object/from16 v0, v23
+
     goto :goto_2f
 
-    :cond_3e
-    move-object/from16 v43, v7
+    :cond_40
+    move-object/from16 v18, v15
 
-    move-object v15, v8
-
-    move-object/from16 v20, v42
-
-    const/4 v9, 0x5
+    const/16 v15, 0x8
 
     :goto_2f
-    move-object/from16 v8, v20
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+
+    move-result v1
+
+    if-eq v1, v15, :cond_41
 
     goto :goto_30
 
-    :cond_3f
-    move-object/from16 v43, v7
-
-    move-object v15, v8
-
-    const/4 v9, 0x5
-
-    move-object v8, v0
+    :cond_41
+    move-object/from16 v14, v18
 
     :goto_30
-    invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+    move-object v15, v14
 
-    move-result v0
+    const/16 v8, 0x8
 
-    const/16 v1, 0x8
+    move-object v14, v0
 
-    if-eq v0, v1, :cond_40
+    goto/16 :goto_26
 
-    move-object v7, v15
-
-    goto :goto_31
-
-    :cond_40
-    move-object/from16 v7, v43
-
-    :goto_31
-    const/16 v9, 0x8
-
-    goto/16 :goto_28
-
-    :cond_41
-    const/4 v9, 0x5
-
-    iget-object v0, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_42
+    iget-object v0, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
-    iget-object v1, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v1, v10, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v1, v1, p3
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v2, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v2, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v3, p3, 0x1
 
     aget-object v10, v2, v3
 
-    iget-object v2, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v2, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v2, v2, v3
 
-    iget-object v11, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v14, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     if-eqz v1, :cond_44
 
-    if-eq v13, v14, :cond_43
+    if-eq v12, v13, :cond_43
 
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
@@ -1515,19 +1502,16 @@
 
     move-result v0
 
-    move-object/from16 v8, p1
+    const/4 v15, 0x5
 
-    invoke-virtual {v8, v2, v1, v0, v9}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v9, v2, v1, v0, v15}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
-    :cond_42
-    move-object v9, v8
-
-    goto :goto_32
+    goto :goto_31
 
     :cond_43
-    move-object/from16 v8, p1
+    const/4 v15, 0x5
 
-    if-eqz v11, :cond_42
+    if-eqz v14, :cond_45
 
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
@@ -1541,13 +1525,13 @@
 
     iget-object v6, v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v7, v11, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    iget-object v7, v14, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
     invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    move-result v15
+    move-result v8
 
-    const/16 v16, 0x5
+    const/16 v17, 0x5
 
     move-object/from16 v0, p1
 
@@ -1563,27 +1547,26 @@
 
     move-object v6, v7
 
-    move v7, v15
+    move v7, v8
 
-    move-object v9, v8
-
-    move/from16 v8, v16
+    move/from16 v8, v17
 
     invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/solver/LinearSystem;->addCentering(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;IFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    goto :goto_32
+    goto :goto_31
 
     :cond_44
-    move-object/from16 v9, p1
+    const/4 v15, 0x5
 
-    :goto_32
-    if-eqz v11, :cond_46
+    :cond_45
+    :goto_31
+    if-eqz v14, :cond_46
 
-    if-eq v13, v14, :cond_46
+    if-eq v12, v13, :cond_46
 
     iget-object v0, v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    iget-object v1, v11, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
+    iget-object v1, v14, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
     invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
@@ -1591,29 +1574,22 @@
 
     neg-int v2, v2
 
-    const/4 v3, 0x5
-
-    invoke-virtual {v9, v0, v1, v2, v3}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
-
-    goto :goto_33
-
-    :cond_45
-    move-object/from16 v9, p1
+    invoke-virtual {v9, v0, v1, v2, v15}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
     :cond_46
-    :goto_33
-    if-nez v17, :cond_47
+    :goto_32
+    if-nez v25, :cond_47
 
-    if-eqz v18, :cond_4e
+    if-eqz v16, :cond_4e
 
     :cond_47
-    if-eqz v13, :cond_4e
+    if-eqz v12, :cond_4e
 
-    iget-object v0, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v0, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
-    iget-object v1, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v1, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v2, p3, 0x1
 
@@ -1627,12 +1603,12 @@
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_34
+    goto :goto_33
 
     :cond_48
-    move-object/from16 v3, v22
+    move-object/from16 v3, v21
 
-    :goto_34
+    :goto_33
     iget-object v4, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     if-eqz v4, :cond_49
@@ -1641,15 +1617,15 @@
 
     iget-object v4, v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_35
+    goto :goto_34
 
     :cond_49
-    move-object/from16 v4, v22
+    move-object/from16 v4, v21
 
-    :goto_35
-    if-eq v12, v14, :cond_4b
+    :goto_34
+    if-eq v11, v13, :cond_4b
 
-    iget-object v4, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v4, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v4, v4, v2
 
@@ -1661,22 +1637,27 @@
 
     iget-object v4, v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
 
-    goto :goto_36
+    goto :goto_35
 
     :cond_4a
-    move-object/from16 v4, v22
+    move-object/from16 v4, v21
 
-    :cond_4b
-    :goto_36
+    :goto_35
     move-object v5, v4
 
-    if-ne v13, v14, :cond_4c
+    goto :goto_36
 
-    iget-object v0, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_4b
+    move-object v5, v4
+
+    :goto_36
+    if-ne v12, v13, :cond_4c
+
+    iget-object v0, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v0, v0, p3
 
-    iget-object v1, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v1, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v1, v1, v2
 
@@ -1689,15 +1670,15 @@
 
     move-result v4
 
-    if-nez v14, :cond_4d
+    if-nez v13, :cond_4d
 
     goto :goto_37
 
     :cond_4d
-    move-object v12, v14
+    move-object v11, v13
 
     :goto_37
-    iget-object v6, v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v6, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v2, v6, v2
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ChainHead.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ChainHead.smali
index 16f9a4d044..bd5af3eed0 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ChainHead.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ChainHead.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ChainHead;
 .super Ljava/lang/Object;
+.source "ChainHead.java"
 
 
 # instance fields
@@ -80,13 +81,13 @@
 
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirst:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    iget-object v3, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirst:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    move-object v5, v2
 
-    move-object v6, v2
+    move-object v6, v5
 
     const/4 v2, 0x0
 
@@ -95,11 +96,11 @@
 
     iget v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsCount:I
 
-    add-int/2addr v7, v5
+    add-int/2addr v7, v4
 
     iput v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsCount:I
 
-    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -107,13 +108,13 @@
 
     aput-object v9, v7, v8
 
-    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
     aput-object v9, v7, v8
 
-    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v7
 
@@ -125,12 +126,12 @@
 
     if-nez v7, :cond_0
 
-    iput-object v3, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirstVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iput-object v5, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirstVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     :cond_0
-    iput-object v3, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iput-object v5, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastVisibleWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -140,7 +141,7 @@
 
     if-ne v7, v8, :cond_8
 
-    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -148,7 +149,7 @@
 
     if-eqz v7, :cond_1
 
-    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -158,7 +159,7 @@
 
     if-eq v7, v8, :cond_1
 
-    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -169,11 +170,11 @@
     :cond_1
     iget v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
 
-    add-int/2addr v7, v5
+    add-int/2addr v7, v4
 
     iput v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWidgetsMatchCount:I
 
-    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -187,7 +188,7 @@
 
     iget v10, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mTotalWeight:F
 
-    iget-object v11, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
+    iget-object v11, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
 
     iget v12, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -200,7 +201,7 @@
     :cond_2
     iget v10, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
-    invoke-static {v3, v10}, Landroidx/constraintlayout/solver/widgets/ChainHead;->isMatchConstraintEqualityCandidate(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;I)Z
+    invoke-static {v5, v10}, Landroidx/constraintlayout/solver/widgets/ChainHead;->isMatchConstraintEqualityCandidate(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;I)Z
 
     move-result v10
 
@@ -210,12 +211,12 @@
 
     if-gez v7, :cond_3
 
-    iput-boolean v5, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasUndefinedWeights:Z
+    iput-boolean v4, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasUndefinedWeights:Z
 
     goto :goto_1
 
     :cond_3
-    iput-boolean v5, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasDefinedWeights:Z
+    iput-boolean v4, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasDefinedWeights:Z
 
     :goto_1
     iget-object v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWeightedMatchConstraintsWidgets:Ljava/util/ArrayList;
@@ -231,42 +232,40 @@
     :cond_4
     iget-object v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mWeightedMatchConstraintsWidgets:Ljava/util/ArrayList;
 
-    invoke-virtual {v7, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_5
     iget-object v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirstMatchConstraintWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     if-nez v7, :cond_6
 
-    iput-object v3, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirstMatchConstraintWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iput-object v5, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirstMatchConstraintWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     :cond_6
     iget-object v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastMatchConstraintWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     if-eqz v7, :cond_7
 
-    iget-object v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastMatchConstraintWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     iget v8, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
-    aput-object v3, v7, v8
+    aput-object v5, v7, v8
 
     :cond_7
-    iput-object v3, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastMatchConstraintWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iput-object v5, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLastMatchConstraintWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     :cond_8
-    if-eq v6, v3, :cond_9
+    if-eq v6, v5, :cond_9
 
     iget-object v6, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     iget v7, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
-    aput-object v3, v6, v7
+    aput-object v5, v6, v7
 
     :cond_9
-    iget-object v6, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     add-int/lit8 v7, v0, 0x1
 
@@ -294,7 +293,7 @@
 
     iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    if-eq v7, v3, :cond_a
+    if-eq v7, v5, :cond_a
 
     goto :goto_2
 
@@ -305,21 +304,21 @@
     :goto_2
     if-eqz v9, :cond_c
 
-    move-object v6, v3
+    move-object v6, v5
 
-    move-object v3, v9
+    move-object v5, v9
 
     goto/16 :goto_0
 
     :cond_c
-    move-object v6, v3
+    move-object v6, v5
 
     const/4 v2, 0x1
 
     goto/16 :goto_0
 
     :cond_d
-    iput-object v3, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLast:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iput-object v5, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLast:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mOrientation:I
 
@@ -331,14 +330,16 @@
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mLast:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
+    iput-object v0, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHead:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
     goto :goto_3
 
     :cond_e
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mFirst:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    :goto_3
     iput-object v0, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHead:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
+    :goto_3
     iget-boolean v0, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasDefinedWeights:Z
 
     if-eqz v0, :cond_f
@@ -347,10 +348,10 @@
 
     if-eqz v0, :cond_f
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     :cond_f
-    iput-boolean v4, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasComplexMatchWeights:Z
+    iput-boolean v3, p0, Landroidx/constraintlayout/solver/widgets/ChainHead;->mHasComplexMatchWeights:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$1.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$1.smali
index 8cab7795b8..3d1c493144 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$1.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$1;
 .super Ljava/lang/Object;
+.source "ConstraintAnchor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$ConnectionType.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$ConnectionType.smali
index c8b4291c66..abecee77b3 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$ConnectionType.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$ConnectionType.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$ConnectionType;
 .super Ljava/lang/Enum;
+.source "ConstraintAnchor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength.smali
index 1f7edd9677..b761954677 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 .super Ljava/lang/Enum;
+.source "ConstraintAnchor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Type.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Type.smali
index 81fee1bb26..c406e41e23 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Type.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 .super Ljava/lang/Enum;
+.source "ConstraintAnchor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor.smali
index a6e1740960..15087311af 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintAnchor.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 .super Ljava/lang/Object;
+.source "ConstraintAnchor.java"
 
 
 # annotations
@@ -353,8 +354,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
@@ -492,26 +491,44 @@
     return v1
 
     :pswitch_1
+    return v1
+
+    :pswitch_2
+    return v1
+
+    :pswitch_3
     const/4 v0, 0x1
 
     return v0
 
-    :pswitch_2
+    :pswitch_4
+    return v2
+
+    :pswitch_5
+    return v2
+
+    :pswitch_6
+    return v2
+
+    :pswitch_7
+    return v2
+
+    :pswitch_8
     return v2
 
     nop
 
     :pswitch_data_0
     .packed-switch 0x1
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
         :pswitch_2
         :pswitch_1
         :pswitch_0
-        :pswitch_0
-        :pswitch_0
     .end packed-switch
 .end method
 
@@ -572,19 +589,25 @@
     return v2
 
     :pswitch_5
-    return v1
+    return v2
 
     :pswitch_6
+    return v1
+
+    :pswitch_7
+    return v1
+
+    :pswitch_8
     const/4 v0, 0x3
 
     return v0
 
     :pswitch_data_0
     .packed-switch 0x1
+        :pswitch_8
+        :pswitch_7
         :pswitch_6
         :pswitch_5
-        :pswitch_5
-        :pswitch_4
         :pswitch_4
         :pswitch_3
         :pswitch_2
@@ -945,6 +968,9 @@
     return v3
 
     :pswitch_2
+    return v3
+
+    :pswitch_3
     sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$1;->$SwitchMap$androidx$constraintlayout$solver$widgets$ConstraintAnchor$Type:[I
 
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getType()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -961,55 +987,10 @@
 
     return v2
 
-    :pswitch_3
-    return v3
-
     :pswitch_4
-    sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$1;->$SwitchMap$androidx$constraintlayout$solver$widgets$ConstraintAnchor$Type:[I
-
-    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getType()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->ordinal()I
-
-    move-result p1
-
-    aget p1, v0, p1
-
-    const/4 v0, 0x4
-
-    if-eq p1, v0, :cond_2
-
-    if-eq p1, v1, :cond_2
-
-    return v2
-
-    :cond_2
     return v3
 
     :pswitch_5
-    sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$1;->$SwitchMap$androidx$constraintlayout$solver$widgets$ConstraintAnchor$Type:[I
-
-    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getType()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->ordinal()I
-
-    move-result p1
-
-    aget p1, v0, p1
-
-    const/4 v0, 0x5
-
-    if-eq p1, v0, :cond_3
-
-    if-eq p1, v1, :cond_3
-
-    return v2
-
-    :cond_3
     return v3
 
     :pswitch_6
@@ -1025,15 +1006,18 @@
 
     aget p1, v0, p1
 
-    const/4 v0, 0x2
+    const/4 v0, 0x4
 
-    if-eq p1, v0, :cond_4
+    if-eq p1, v0, :cond_3
 
-    if-eq p1, v4, :cond_4
+    if-eq p1, v1, :cond_2
 
     return v2
 
-    :cond_4
+    :cond_2
+    return v3
+
+    :cond_3
     return v3
 
     :pswitch_7
@@ -1049,45 +1033,102 @@
 
     aget p1, v0, p1
 
-    const/4 v0, 0x3
+    const/4 v0, 0x5
 
     if-eq p1, v0, :cond_5
 
-    if-eq p1, v4, :cond_5
+    if-eq p1, v1, :cond_4
 
     return v2
 
+    :cond_4
+    return v3
+
     :cond_5
     return v3
 
     :pswitch_8
+    sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$1;->$SwitchMap$androidx$constraintlayout$solver$widgets$ConstraintAnchor$Type:[I
+
+    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getType()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->ordinal()I
+
+    move-result p1
+
+    aget p1, v0, p1
+
+    const/4 v0, 0x2
+
+    if-eq p1, v0, :cond_7
+
+    if-eq p1, v4, :cond_6
+
+    return v2
+
+    :cond_6
+    return v3
+
+    :cond_7
+    return v3
+
+    :pswitch_9
+    sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$1;->$SwitchMap$androidx$constraintlayout$solver$widgets$ConstraintAnchor$Type:[I
+
+    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getType()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->ordinal()I
+
+    move-result p1
+
+    aget p1, v0, p1
+
+    const/4 v0, 0x3
+
+    if-eq p1, v0, :cond_9
+
+    if-eq p1, v4, :cond_8
+
+    return v2
+
+    :cond_8
+    return v3
+
+    :cond_9
+    return v3
+
+    :pswitch_a
     return v2
 
     nop
 
     :pswitch_data_0
     .packed-switch 0x1
+        :pswitch_a
+        :pswitch_9
         :pswitch_8
         :pswitch_7
         :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_8
-        :pswitch_2
+        :pswitch_a
+        :pswitch_3
         :pswitch_0
-        :pswitch_8
+        :pswitch_a
     .end packed-switch
 
     :pswitch_data_1
     .packed-switch 0x4
-        :pswitch_1
+        :pswitch_2
         :pswitch_1
     .end packed-switch
 
     :pswitch_data_2
     .packed-switch 0x2
-        :pswitch_3
-        :pswitch_3
+        :pswitch_5
+        :pswitch_4
     .end packed-switch
 .end method
 
@@ -1111,11 +1152,9 @@
 
     if-ne v1, v2, :cond_3
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mType:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BASELINE:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    sget-object v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BASELINE:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
-
-    if-ne v1, v2, :cond_2
+    if-ne v2, v1, :cond_2
 
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getOwner()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
@@ -1410,8 +1449,6 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroidx/constraintlayout/solver/SolverVariable;
-
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/SolverVariable;->reset()V
 
     return-void
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout$ContentAlignment.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout$ContentAlignment.smali
index ae27c31cb7..159709f1d6 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout$ContentAlignment.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout$ContentAlignment.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout$ContentAlignment;
 .super Ljava/lang/Enum;
+.source "ConstraintHorizontalLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout.smali
index 51242e8a6e..d515d3402d 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ConstraintHorizontalLayout;
 .super Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
+.source "ConstraintHorizontalLayout.java"
 
 
 # annotations
@@ -101,7 +102,7 @@
 
     invoke-virtual {v4, v2, v8, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)V
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_0
     sget-object v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;->STRONG:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
@@ -114,9 +115,14 @@
 
     sget-object v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;->WEAK:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 
+    move-object v7, v2
+
+    goto :goto_1
+
     :cond_1
     move-object v7, v2
 
+    :goto_1
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -127,7 +133,7 @@
 
     invoke-virtual/range {v2 .. v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;ILandroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
 
-    :goto_1
+    :goto_2
     sget-object v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -159,9 +165,14 @@
 
     sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;->WEAK:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 
+    move-object v7, v0
+
+    goto :goto_3
+
     :cond_3
     move-object v7, v0
 
+    :goto_3
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice.smali
index 3292fbafa1..5f580264a0 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice.smali
@@ -1,5 +1,6 @@
 .class Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice;
 .super Ljava/lang/Object;
+.source "ConstraintTableLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice.smali
index 45163b637d..e330001c61 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice.smali
@@ -1,5 +1,6 @@
 .class Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;
 .super Ljava/lang/Object;
+.source "ConstraintTableLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout.smali
index 946d073674..f8ac5a4b2a 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintTableLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;
 .super Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
+.source "ConstraintTableLayout.java"
 
 
 # annotations
@@ -256,35 +257,33 @@
 
     iget v4, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
 
-    rem-int v4, v2, v4
+    rem-int v5, v2, v4
 
-    iget v5, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
-
-    div-int v5, v2, v5
+    div-int v4, v2, v4
 
     iget-object v6, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mHorizontalSlices:Ljava/util/ArrayList;
 
-    invoke-virtual {v6, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice;
-
-    iget-object v6, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mVerticalSlices:Ljava/util/ArrayList;
-
     invoke-virtual {v6, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
     move-result-object v4
 
-    check-cast v4, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;
+    check-cast v4, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice;
 
-    iget-object v6, v4, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->left:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v6, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mVerticalSlices:Ljava/util/ArrayList;
 
-    iget-object v7, v4, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->right:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    invoke-virtual {v6, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    iget-object v8, v5, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice;->top:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    move-result-object v5
 
-    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice;->bottom:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    check-cast v5, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;
+
+    iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->left:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    iget-object v7, v5, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->right:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    iget-object v8, v4, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice;->top:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    iget-object v4, v4, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$HorizontalSlice;->bottom:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     sget-object v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
@@ -314,7 +313,6 @@
 
     sget-object v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    :goto_1
     invoke-virtual {v7, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v7
@@ -323,7 +321,7 @@
 
     invoke-virtual {v6, v7, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;I)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -334,71 +332,78 @@
 
     sget-object v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    goto :goto_1
+    invoke-virtual {v7, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_2
-    iget v4, v4, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->alignment:I
+    move-result-object v7
 
-    packed-switch v4, :pswitch_data_0
+    iget v9, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mPadding:I
 
-    goto :goto_4
+    invoke-virtual {v6, v7, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;I)Z
+
+    :goto_1
+    iget v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->alignment:I
+
+    packed-switch v5, :pswitch_data_0
+
+    goto :goto_2
 
     :pswitch_0
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalDimensionBehaviour(Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;)V
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalDimensionBehaviour(Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;)V
 
-    goto :goto_4
+    goto :goto_2
 
     :pswitch_1
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;->WEAK:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 
-    invoke-virtual {v4, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->setStrength(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
+    invoke-virtual {v5, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->setStrength(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
 
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;->STRONG:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 
-    goto :goto_3
+    invoke-virtual {v5, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->setStrength(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
+
+    goto :goto_2
 
     :pswitch_2
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;->STRONG:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 
-    invoke-virtual {v4, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->setStrength(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
+    invoke-virtual {v5, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->setStrength(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
 
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;->WEAK:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 
-    :goto_3
-    invoke-virtual {v4, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->setStrength(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
+    invoke-virtual {v5, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->setStrength(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;)V
 
-    :goto_4
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    :goto_2
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
@@ -408,22 +413,21 @@
 
     iget v7, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mPadding:I
 
-    invoke-virtual {v4, v6, v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;I)Z
+    invoke-virtual {v5, v6, v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;I)Z
 
-    instance-of v4, v5, Landroidx/constraintlayout/solver/widgets/Guideline;
+    instance-of v5, v4, Landroidx/constraintlayout/solver/widgets/Guideline;
 
-    if-eqz v4, :cond_1
+    if-eqz v5, :cond_1
 
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v3
 
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    :goto_5
-    invoke-virtual {v5, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v4, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v4
 
@@ -431,20 +435,26 @@
 
     invoke-virtual {v3, v4, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;I)Z
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_1
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v3, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v3
 
-    sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    goto :goto_5
+    invoke-virtual {v4, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_6
+    move-result-object v4
+
+    iget v5, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mPadding:I
+
+    invoke-virtual {v3, v4, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;I)Z
+
+    :goto_3
     add-int/lit8 v2, v2, 0x1
 
     add-int/lit8 v1, v1, 0x1
@@ -454,6 +464,8 @@
     :cond_2
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
@@ -943,25 +955,28 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const/4 v0, 0x1
 
+    iput v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->alignment:I
+
     goto :goto_0
 
     :pswitch_1
     const/4 v0, 0x0
 
+    iput v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->alignment:I
+
     goto :goto_0
 
     :pswitch_2
     const/4 v0, 0x2
 
-    :goto_0
     iput v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->alignment:I
 
-    :goto_1
+    :goto_0
     invoke-direct {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->setChildrenConnections()V
 
     return-void
@@ -1072,14 +1087,13 @@
 
     const-string v1, "L"
 
-    :goto_1
     invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget v4, v3, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout$VerticalSlice;->alignment:I
@@ -1094,6 +1108,12 @@
 
     const-string v1, "C"
 
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
     goto :goto_1
 
     :cond_1
@@ -1111,6 +1131,12 @@
 
     const-string v1, "F"
 
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
     goto :goto_1
 
     :cond_2
@@ -1128,10 +1154,14 @@
 
     const-string v1, "R"
 
-    goto :goto_1
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
 
     :cond_3
-    :goto_2
+    :goto_1
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
@@ -1271,10 +1301,9 @@
 
     const/4 v3, 0x1
 
-    :goto_1
     invoke-virtual {p0, v2, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->setColumnAlignment(II)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const/16 v4, 0x43
@@ -1287,6 +1316,8 @@
 
     const/4 v3, 0x3
 
+    invoke-virtual {p0, v2, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->setColumnAlignment(II)V
+
     goto :goto_1
 
     :cond_1
@@ -1296,12 +1327,14 @@
 
     const/4 v3, 0x2
 
+    invoke-virtual {p0, v2, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->setColumnAlignment(II)V
+
     goto :goto_1
 
     :cond_2
     invoke-virtual {p0, v2, v1}, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->setColumnAlignment(II)V
 
-    :goto_2
+    :goto_1
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
@@ -1429,20 +1462,18 @@
     :cond_1
     iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
 
-    div-int v1, v0, v1
+    div-int v3, v0, v1
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
+    mul-int v1, v1, v3
 
-    mul-int v3, v3, v1
+    if-ge v1, v0, :cond_2
 
-    if-ge v3, v0, :cond_2
-
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v3, v3, 0x1
 
     :cond_2
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumRows:I
 
-    if-ne v0, v1, :cond_3
+    if-ne v0, v3, :cond_3
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mVerticalGuidelines:Ljava/util/ArrayList;
 
@@ -1450,16 +1481,16 @@
 
     move-result v0
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
+    iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
 
-    sub-int/2addr v3, v2
+    sub-int/2addr v1, v2
 
-    if-ne v0, v3, :cond_3
+    if-ne v0, v1, :cond_3
 
     return-void
 
     :cond_3
-    iput v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumRows:I
+    iput v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumRows:I
 
     invoke-direct {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->setHorizontalSlices()V
 
@@ -1475,20 +1506,18 @@
     :cond_5
     iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumRows:I
 
-    div-int v1, v0, v1
+    div-int v3, v0, v1
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumRows:I
+    mul-int v1, v1, v3
 
-    mul-int v3, v3, v1
+    if-ge v1, v0, :cond_6
 
-    if-ge v3, v0, :cond_6
-
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v3, v3, 0x1
 
     :cond_6
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
 
-    if-ne v0, v1, :cond_7
+    if-ne v0, v3, :cond_7
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mHorizontalGuidelines:Ljava/util/ArrayList;
 
@@ -1496,16 +1525,16 @@
 
     move-result v0
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumRows:I
+    iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumRows:I
 
-    sub-int/2addr v3, v2
+    sub-int/2addr v1, v2
 
-    if-ne v0, v3, :cond_7
+    if-ne v0, v1, :cond_7
 
     return-void
 
     :cond_7
-    iput v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
+    iput v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->mNumCols:I
 
     invoke-direct {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintTableLayout;->setVerticalSlices()V
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$1.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$1.smali
index 169bebad16..64c8c6c67c 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$1.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/constraintlayout/solver/widgets/ConstraintWidget$1;
 .super Ljava/lang/Object;
+.source "ConstraintWidget.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$ContentAlignment.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$ContentAlignment.smali
index 26bb71a5b7..3351838db2 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$ContentAlignment.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$ContentAlignment.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/constraintlayout/solver/widgets/ConstraintWidget$ContentAlignment;
 .super Ljava/lang/Enum;
+.source "ConstraintWidget.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour.smali
index 29fa43f341..ba701d22f7 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 .super Ljava/lang/Enum;
+.source "ConstraintWidget.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget.smali
index ef642764b3..6aeb0a4f77 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidget.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 .super Ljava/lang/Object;
+.source "ConstraintWidget.java"
 
 
 # annotations
@@ -453,8 +454,6 @@
 
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F
 
-    sget v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->DEFAULT_BIAS:F
-
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F
 
     iput v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mContainerItemSkip:I
@@ -739,8 +738,6 @@
 
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F
 
-    sget v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->DEFAULT_BIAS:F
-
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F
 
     iput v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mContainerItemSkip:I
@@ -871,7 +868,7 @@
 .end method
 
 .method private applyConstraints(Landroidx/constraintlayout/solver/LinearSystem;ZLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;ZLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;IIIIFZZIIIFZ)V
-    .locals 30
+    .locals 28
 
     move-object/from16 v0, p0
 
@@ -891,51 +888,53 @@
 
     invoke-virtual {v10, v13}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
 
-    move-result-object v9
+    move-result-object v15
 
     invoke-virtual {v10, v14}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
 
-    move-result-object v8
+    move-result-object v9
 
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    move-result-object v6
+    move-result-object v3
 
-    invoke-virtual {v10, v6}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
+    invoke-virtual {v10, v3}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
 
-    move-result-object v7
+    move-result-object v8
 
     invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    move-result-object v6
+    move-result-object v3
 
-    invoke-virtual {v10, v6}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
+    invoke-virtual {v10, v3}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
 
-    move-result-object v6
+    move-result-object v7
 
-    iget-boolean v14, v10, Landroidx/constraintlayout/solver/LinearSystem;->graphOptimizer:Z
+    iget-boolean v3, v10, Landroidx/constraintlayout/solver/LinearSystem;->graphOptimizer:Z
 
-    const-wide/16 v15, 0x1
+    const/4 v6, 0x1
 
-    if-eqz v14, :cond_2
+    const/4 v4, 0x6
+
+    const/4 v5, 0x0
+
+    if-eqz v3, :cond_2
 
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    move-result-object v14
+    move-result-object v3
 
-    iget v14, v14, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
+    iget v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
-    const/4 v13, 0x1
-
-    if-ne v14, v13, :cond_2
+    if-ne v3, v6, :cond_2
 
     invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    move-result-object v14
+    move-result-object v3
 
-    iget v14, v14, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
+    iget v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
-    if-ne v14, v13, :cond_2
+    if-ne v3, v6, :cond_2
 
     invoke-static {}, Landroidx/constraintlayout/solver/LinearSystem;->getMetrics()Landroidx/constraintlayout/solver/Metrics;
 
@@ -949,7 +948,9 @@
 
     iget-wide v2, v1, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
 
-    add-long/2addr v2, v15
+    const-wide/16 v6, 0x1
+
+    add-long/2addr v2, v6
 
     iput-wide v2, v1, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
 
@@ -970,11 +971,7 @@
 
     if-eqz p2, :cond_1
 
-    const/4 v1, 0x0
-
-    const/4 v2, 0x6
-
-    invoke-virtual {v10, v12, v8, v1, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v10, v12, v9, v5, v4}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
     :cond_1
     return-void
@@ -982,304 +979,391 @@
     :cond_2
     invoke-static {}, Landroidx/constraintlayout/solver/LinearSystem;->getMetrics()Landroidx/constraintlayout/solver/Metrics;
 
-    move-result-object v13
+    move-result-object v3
 
-    if-eqz v13, :cond_3
+    if-eqz v3, :cond_3
 
     invoke-static {}, Landroidx/constraintlayout/solver/LinearSystem;->getMetrics()Landroidx/constraintlayout/solver/Metrics;
 
-    move-result-object v13
+    move-result-object v3
 
-    iget-wide v11, v13, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+    move-object/from16 v18, v7
 
-    add-long/2addr v11, v15
+    iget-wide v6, v3, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
 
-    iput-wide v11, v13, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+    const-wide/16 v16, 0x1
 
-    :cond_3
-    invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
+    add-long v6, v6, v16
 
-    move-result v11
-
-    invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
-
-    move-result v12
-
-    iget-object v13, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mCenter:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
-
-    move-result v13
-
-    if-eqz v11, :cond_4
-
-    const/4 v14, 0x1
+    iput-wide v6, v3, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
 
     goto :goto_0
 
-    :cond_4
-    const/4 v14, 0x0
+    :cond_3
+    move-object/from16 v18, v7
 
     :goto_0
-    if-eqz v12, :cond_5
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_5
-    if-eqz v13, :cond_6
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_6
-    move-object/from16 v21, v6
-
-    if-eqz p14, :cond_7
-
-    const/4 v6, 0x3
-
-    goto :goto_1
-
-    :cond_7
-    move/from16 v6, p16
-
-    :goto_1
-    sget-object v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$1;->$SwitchMap$androidx$constraintlayout$solver$widgets$ConstraintWidget$DimensionBehaviour:[I
-
-    invoke-virtual/range {p5 .. p5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->ordinal()I
+    invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
     move-result v16
 
-    aget v15, v15, v16
+    invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
-    const/4 v3, 0x4
+    move-result v17
 
-    packed-switch v15, :pswitch_data_0
+    iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mCenter:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
+
+    move-result v20
+
+    if-eqz v16, :cond_4
+
+    const/4 v3, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v3, 0x0
+
+    :goto_1
+    if-eqz v17, :cond_5
+
+    add-int/lit8 v3, v3, 0x1
+
+    :cond_5
+    if-eqz v20, :cond_6
+
+    add-int/lit8 v3, v3, 0x1
+
+    :cond_6
+    move v7, v3
+
+    if-eqz p14, :cond_7
+
+    const/4 v3, 0x3
+
+    goto :goto_2
+
+    :cond_7
+    move/from16 v3, p16
 
     :goto_2
+    sget-object v21, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$1;->$SwitchMap$androidx$constraintlayout$solver$widgets$ConstraintWidget$DimensionBehaviour:[I
+
+    invoke-virtual/range {p5 .. p5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->ordinal()I
+
+    move-result v22
+
+    aget v21, v21, v22
+
+    const/4 v5, 0x4
+
+    packed-switch v21, :pswitch_data_0
+
+    const/16 v21, 0x0
+
+    goto :goto_3
+
     :pswitch_0
-    const/4 v15, 0x0
+    if-ne v3, v5, :cond_8
+
+    const/16 v21, 0x0
+
+    goto :goto_3
+
+    :cond_8
+    const/16 v21, 0x1
 
     goto :goto_3
 
     :pswitch_1
-    if-ne v6, v3, :cond_8
+    const/16 v21, 0x0
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_8
-    const/4 v15, 0x1
+    :pswitch_2
+    const/16 v21, 0x0
+
+    goto :goto_3
+
+    :pswitch_3
+    const/16 v21, 0x0
 
     :goto_3
-    iget v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVisibility:I
+    iget v5, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVisibility:I
 
-    move/from16 v22, v14
+    const/16 v6, 0x8
 
-    const/16 v14, 0x8
+    if-ne v5, v6, :cond_9
 
-    if-ne v3, v14, :cond_9
+    const/4 v5, 0x0
 
-    const/4 v3, 0x0
-
-    const/4 v15, 0x0
+    const/16 v21, 0x0
 
     goto :goto_4
 
     :cond_9
-    move/from16 v3, p10
+    move/from16 v5, p10
 
     :goto_4
     if-eqz p20, :cond_b
 
-    if-nez v11, :cond_a
+    if-nez v16, :cond_a
 
-    if-nez v12, :cond_a
+    if-nez v17, :cond_a
 
-    if-nez v13, :cond_a
+    if-nez v20, :cond_a
 
-    move/from16 v14, p9
+    move/from16 v6, p9
 
-    invoke-virtual {v10, v9, v14}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;I)V
+    invoke-virtual {v10, v15, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;I)V
 
     goto :goto_5
 
     :cond_a
-    if-eqz v11, :cond_b
+    if-eqz v16, :cond_b
 
-    if-nez v12, :cond_b
+    if-nez v17, :cond_b
 
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    move-result v14
+    move-result v6
 
-    move/from16 v23, v13
-
-    const/4 v13, 0x6
-
-    invoke-virtual {v10, v9, v7, v14, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
-
-    goto :goto_6
+    invoke-virtual {v10, v15, v8, v6, v4}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
     :cond_b
     :goto_5
-    move/from16 v23, v13
+    if-nez v21, :cond_f
 
-    const/4 v13, 0x6
+    if-eqz p6, :cond_e
 
-    :goto_6
-    if-nez v15, :cond_f
+    const/4 v4, 0x3
 
-    if-eqz p6, :cond_d
+    const/4 v6, 0x0
 
-    const/4 v13, 0x3
-
-    const/4 v14, 0x0
-
-    invoke-virtual {v10, v8, v9, v14, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v10, v9, v15, v6, v4}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
     if-lez v1, :cond_c
 
-    const/4 v13, 0x6
+    const/4 v5, 0x6
 
-    invoke-virtual {v10, v8, v9, v1, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v10, v9, v15, v1, v5}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+
+    goto :goto_6
+
+    :cond_c
+    const/4 v5, 0x6
+
+    :goto_6
+    const v4, 0x7fffffff
+
+    if-ge v2, v4, :cond_d
+
+    invoke-virtual {v10, v9, v15, v2, v5}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+
+    const/4 v4, 0x6
 
     goto :goto_7
 
-    :cond_c
-    const/4 v13, 0x6
+    :cond_d
+    const/4 v4, 0x6
+
+    goto :goto_7
+
+    :cond_e
+    const/4 v6, 0x0
+
+    invoke-virtual {v10, v9, v15, v5, v4}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
     :goto_7
-    const v3, 0x7fffffff
+    move/from16 v13, p17
 
-    if-ge v2, v3, :cond_e
+    move/from16 p6, v3
 
-    invoke-virtual {v10, v8, v9, v2, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    move v14, v7
+
+    move-object/from16 v19, v8
+
+    move-object/from16 v27, v18
+
+    const/16 v22, 0x4
+
+    move/from16 v8, p18
+
+    goto/16 :goto_10
+
+    :cond_f
+    const/4 v6, 0x0
+
+    const/4 v2, -0x2
+
+    move/from16 v6, p17
+
+    if-ne v6, v2, :cond_10
+
+    move/from16 v6, p18
+
+    move v4, v5
 
     goto :goto_8
 
-    :cond_d
-    invoke-virtual {v10, v8, v9, v3, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
-
-    :cond_e
-    :goto_8
-    move/from16 v27, p17
-
-    move/from16 v14, p18
-
-    move-object/from16 v24, v7
-
-    :goto_9
-    move/from16 v2, v22
-
-    :goto_a
-    const/16 v16, 0x4
-
-    goto/16 :goto_12
-
-    :cond_f
-    const/4 v2, -0x2
-
-    move/from16 v14, p17
-
-    if-ne v14, v2, :cond_10
-
-    move/from16 v14, p18
-
-    move v13, v3
-
-    goto :goto_b
-
     :cond_10
-    move v13, v14
+    move v4, v6
 
-    move/from16 v14, p18
+    move/from16 v6, p18
 
-    :goto_b
-    if-ne v14, v2, :cond_11
+    :goto_8
+    if-ne v6, v2, :cond_11
 
-    move v14, v3
+    move v6, v5
 
     :cond_11
-    if-lez v13, :cond_12
+    if-lez v4, :cond_12
 
     const/4 v2, 0x6
 
-    invoke-virtual {v10, v8, v9, v13, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v10, v9, v15, v4, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    invoke-static {v3, v13}, Ljava/lang/Math;->max(II)I
+    invoke-static {v5, v4}, Ljava/lang/Math;->max(II)I
 
-    move-result v3
+    move-result v5
 
-    goto :goto_c
+    goto :goto_9
 
     :cond_12
     const/4 v2, 0x6
 
-    :goto_c
-    if-lez v14, :cond_13
+    :goto_9
+    if-lez v6, :cond_13
 
-    invoke-virtual {v10, v8, v9, v14, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v10, v9, v15, v6, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    invoke-static {v3, v14}, Ljava/lang/Math;->min(II)I
+    invoke-static {v5, v6}, Ljava/lang/Math;->min(II)I
 
-    move-result v3
+    move-result v5
+
+    const/4 v2, 0x1
+
+    goto :goto_a
 
     :cond_13
     const/4 v2, 0x1
 
-    if-ne v6, v2, :cond_16
+    :goto_a
+    if-ne v3, v2, :cond_16
 
     if-eqz p2, :cond_14
 
     const/4 v2, 0x6
 
-    :goto_d
-    invoke-virtual {v10, v8, v9, v3, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v10, v9, v15, v5, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
-    goto/16 :goto_10
+    move/from16 p6, v3
+
+    move v13, v4
+
+    move v0, v5
+
+    move v14, v7
+
+    move-object/from16 v19, v8
+
+    move-object/from16 v27, v18
+
+    const/16 v22, 0x4
+
+    move v8, v6
+
+    goto/16 :goto_d
 
     :cond_14
+    const/4 v2, 0x6
+
     if-eqz p15, :cond_15
 
-    const/4 v2, 0x4
+    move/from16 p6, v6
 
-    goto :goto_d
+    const/4 v6, 0x4
+
+    invoke-virtual {v10, v9, v15, v5, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+
+    move v13, v4
+
+    move v0, v5
+
+    move v14, v7
+
+    move-object/from16 v19, v8
+
+    move-object/from16 v27, v18
+
+    const/16 v22, 0x4
+
+    move/from16 v8, p6
+
+    move/from16 p6, v3
+
+    goto/16 :goto_d
 
     :cond_15
+    move/from16 p6, v6
+
     const/4 v2, 0x1
 
-    goto :goto_d
+    const/4 v6, 0x4
+
+    invoke-virtual {v10, v9, v15, v5, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+
+    move v13, v4
+
+    move v0, v5
+
+    move v14, v7
+
+    move-object/from16 v19, v8
+
+    move-object/from16 v27, v18
+
+    const/16 v22, 0x4
+
+    move/from16 v8, p6
+
+    move/from16 p6, v3
+
+    goto/16 :goto_d
 
     :cond_16
-    const/4 v2, 0x2
+    move/from16 p6, v6
 
-    if-ne v6, v2, :cond_19
+    const/4 v6, 0x2
+
+    if-ne v3, v6, :cond_19
 
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getType()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     move-result-object v2
 
-    move-object/from16 v24, v7
+    sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    sget-object v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
-
-    if-eq v2, v7, :cond_18
+    if-eq v2, v6, :cond_18
 
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getType()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     move-result-object v2
 
-    sget-object v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    if-ne v2, v7, :cond_17
+    if-ne v2, v6, :cond_17
 
-    goto :goto_e
+    goto :goto_b
 
     :cond_17
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    sget-object v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v2, v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v2, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v2
 
@@ -1287,13 +1371,13 @@
 
     move-result-object v2
 
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v6, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    move-object/from16 v25, v2
+    move-object/from16 p12, v2
 
     sget-object v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v7, v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v6, v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v2
 
@@ -1301,19 +1385,19 @@
 
     move-result-object v2
 
-    move-object/from16 v18, v2
+    move-object/from16 v21, p12
 
-    move-object/from16 v19, v25
+    move-object v6, v2
 
-    goto :goto_f
+    goto :goto_c
 
     :cond_18
-    :goto_e
+    :goto_b
     iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    sget-object v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v2, v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v2, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v2
 
@@ -1321,13 +1405,13 @@
 
     move-result-object v2
 
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    iget-object v6, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    move-object/from16 v26, v2
+    move-object/from16 p12, v2
 
     sget-object v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    invoke-virtual {v7, v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v6, v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v2
 
@@ -1335,156 +1419,192 @@
 
     move-result-object v2
 
-    move-object/from16 v18, v2
+    move-object/from16 v21, p12
 
-    move-object/from16 v19, v26
+    move-object v6, v2
 
-    :goto_f
+    :goto_c
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/LinearSystem;->createRow()Landroidx/constraintlayout/solver/ArrayRow;
 
-    move-result-object v15
+    move-result-object v2
 
-    move-object/from16 v16, v8
+    const/16 v24, 0x6
 
-    move-object/from16 v17, v9
+    const/16 v25, 0x1
 
-    move/from16 v20, p19
+    move v14, v3
 
-    invoke-virtual/range {v15 .. v20}, Landroidx/constraintlayout/solver/ArrayRow;->createRowDimensionRatio(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;F)Landroidx/constraintlayout/solver/ArrayRow;
+    move-object v3, v9
+
+    move v13, v4
+
+    const/4 v0, 0x6
+
+    const/16 v23, 0x3
+
+    move-object v4, v15
+
+    move v0, v5
+
+    move-object/from16 v19, v8
+
+    const/4 v8, 0x0
+
+    const/16 v22, 0x4
+
+    move-object v5, v6
+
+    move/from16 v8, p6
+
+    move/from16 p6, v14
+
+    const/4 v14, 0x2
+
+    move-object/from16 v6, v21
+
+    move v14, v7
+
+    move-object/from16 v27, v18
+
+    move/from16 v7, p19
+
+    invoke-virtual/range {v2 .. v7}, Landroidx/constraintlayout/solver/ArrayRow;->createRowDimensionRatio(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;F)Landroidx/constraintlayout/solver/ArrayRow;
 
     move-result-object v2
 
     invoke-virtual {v10, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addConstraint(Landroidx/constraintlayout/solver/ArrayRow;)V
 
-    const/4 v15, 0x0
+    const/4 v5, 0x0
 
-    goto :goto_11
+    goto :goto_e
 
     :cond_19
-    :goto_10
-    move-object/from16 v24, v7
+    move v13, v4
 
-    :goto_11
-    if-eqz v15, :cond_1d
+    move v0, v5
 
-    move/from16 v2, v22
+    move v14, v7
 
-    const/4 v7, 0x2
+    move-object/from16 v19, v8
 
-    if-eq v2, v7, :cond_1c
+    move-object/from16 v27, v18
 
-    const/16 v16, 0x4
+    const/16 v22, 0x4
+
+    move/from16 v8, p6
+
+    move/from16 p6, v3
+
+    :goto_d
+    move/from16 v5, v21
+
+    :goto_e
+    if-eqz v5, :cond_1b
+
+    const/4 v2, 0x2
+
+    if-eq v14, v2, :cond_1b
 
     if-nez p14, :cond_1b
 
-    invoke-static {v13, v3}, Ljava/lang/Math;->max(II)I
+    invoke-static {v13, v0}, Ljava/lang/Math;->max(II)I
 
-    move-result v3
+    move-result v0
 
-    if-lez v14, :cond_1a
+    if-lez v8, :cond_1a
 
-    invoke-static {v14, v3}, Ljava/lang/Math;->min(II)I
+    invoke-static {v8, v0}, Ljava/lang/Math;->min(II)I
 
-    move-result v3
+    move-result v0
+
+    const/4 v2, 0x6
+
+    goto :goto_f
 
     :cond_1a
-    move/from16 v27, v13
+    const/4 v2, 0x6
 
-    const/4 v13, 0x6
+    :goto_f
+    invoke-virtual {v10, v9, v15, v0, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
-    invoke-virtual {v10, v8, v9, v3, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    const/16 v21, 0x0
 
-    const/4 v15, 0x0
-
-    goto :goto_12
+    goto :goto_10
 
     :cond_1b
-    move/from16 v27, v13
+    move/from16 v21, v5
 
-    goto :goto_12
+    :goto_10
+    if-eqz p20, :cond_3b
+
+    if-eqz p15, :cond_1c
+
+    goto/16 :goto_1a
 
     :cond_1c
-    move/from16 v27, v13
+    const/4 v0, 0x5
 
-    goto/16 :goto_a
+    if-nez v16, :cond_1e
 
-    :cond_1d
-    move/from16 v27, v13
+    if-nez v17, :cond_1e
 
-    goto/16 :goto_9
+    if-nez v20, :cond_1e
 
-    :goto_12
-    if-eqz p20, :cond_3a
+    if-eqz p2, :cond_1d
 
-    if-eqz p15, :cond_1e
+    const/4 v14, 0x0
 
-    move-object v0, v8
+    invoke-virtual {v10, v12, v9, v14, v0}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    move-object v5, v9
+    move-object v0, v9
 
     const/4 v1, 0x0
 
-    const/4 v3, 0x6
+    const/4 v2, 0x6
 
-    move-object/from16 v4, p4
+    goto/16 :goto_19
 
-    const/4 v6, 0x2
+    :cond_1d
+    move-object v0, v9
 
-    move-object/from16 v11, p3
+    const/4 v1, 0x0
 
-    goto/16 :goto_21
+    const/4 v2, 0x6
+
+    goto/16 :goto_19
 
     :cond_1e
-    const/4 v13, 0x5
+    const/4 v14, 0x0
 
-    if-nez v11, :cond_22
+    if-eqz v16, :cond_20
 
-    if-nez v12, :cond_22
-
-    if-nez v23, :cond_22
+    if-nez v17, :cond_20
 
     if-eqz p2, :cond_1f
 
-    const/4 v2, 0x0
+    invoke-virtual {v10, v12, v9, v14, v0}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    move-object/from16 v5, p4
+    move-object v0, v9
 
-    :goto_13
-    invoke-virtual {v10, v5, v8, v2, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
-
-    goto :goto_14
-
-    :cond_1f
-    move-object/from16 v5, p4
-
-    :cond_20
-    :goto_14
-    move-object v0, v8
-
-    :cond_21
     const/4 v1, 0x0
 
-    const/4 v3, 0x6
+    const/4 v2, 0x6
 
-    goto/16 :goto_20
+    goto/16 :goto_19
 
-    :cond_22
-    const/4 v2, 0x0
+    :cond_1f
+    move-object v0, v9
 
-    move-object/from16 v5, p4
+    const/4 v1, 0x0
 
-    if-eqz v11, :cond_23
+    const/4 v2, 0x6
 
-    if-nez v12, :cond_23
+    goto/16 :goto_19
 
-    if-eqz p2, :cond_20
+    :cond_20
+    if-nez v16, :cond_22
 
-    goto :goto_13
-
-    :cond_23
-    if-nez v11, :cond_24
-
-    if-eqz v12, :cond_24
+    if-eqz v17, :cond_22
 
     invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
@@ -1492,146 +1612,180 @@
 
     neg-int v1, v1
 
-    move-object/from16 v4, v21
+    move-object/from16 v7, v27
 
-    const/4 v3, 0x6
+    const/4 v2, 0x6
 
-    invoke-virtual {v10, v8, v4, v1, v3}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v10, v9, v7, v1, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
-    if-eqz p2, :cond_20
+    if-eqz p2, :cond_21
 
-    move-object/from16 v3, p3
+    invoke-virtual {v10, v15, v11, v14, v0}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    invoke-virtual {v10, v9, v3, v2, v13}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    move-object v0, v9
 
-    goto :goto_14
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
+    goto/16 :goto_19
+
+    :cond_21
+    move-object v0, v9
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
+    goto/16 :goto_19
+
+    :cond_22
+    move-object/from16 v7, v27
+
+    if-eqz v16, :cond_39
+
+    if-eqz v17, :cond_39
+
+    if-eqz v21, :cond_2d
+
+    if-eqz p2, :cond_23
+
+    if-nez v1, :cond_23
+
+    const/4 v1, 0x6
+
+    invoke-virtual {v10, v9, v15, v14, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+
+    goto :goto_11
+
+    :cond_23
+    const/4 v1, 0x6
+
+    :goto_11
+    if-nez p6, :cond_28
+
+    if-gtz v8, :cond_25
+
+    if-lez v13, :cond_24
+
+    goto :goto_12
 
     :cond_24
-    move-object/from16 v4, v21
+    const/4 v2, 0x6
 
-    move-object/from16 v3, p3
+    const/4 v6, 0x0
 
-    if-eqz v11, :cond_20
-
-    if-eqz v12, :cond_20
-
-    if-eqz v15, :cond_2e
-
-    if-eqz p2, :cond_25
-
-    if-nez v1, :cond_25
-
-    const/4 v1, 0x6
-
-    invoke-virtual {v10, v8, v9, v2, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    goto :goto_13
 
     :cond_25
-    if-nez v6, :cond_2a
+    :goto_12
+    const/4 v2, 0x4
 
-    if-gtz v14, :cond_27
+    const/4 v6, 0x1
 
-    if-lez v27, :cond_26
-
-    goto :goto_15
-
-    :cond_26
-    const/4 v1, 0x6
-
-    const/4 v2, 0x0
-
-    goto :goto_16
-
-    :cond_27
-    :goto_15
-    const/4 v1, 0x4
-
-    const/4 v2, 0x1
-
-    :goto_16
+    :goto_13
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    move-result v6
+    move-result v3
 
-    move-object/from16 v11, v24
+    move-object/from16 v5, v19
 
-    invoke-virtual {v10, v9, v11, v6, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v10, v15, v5, v3, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
     invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    move-result v6
+    move-result v3
 
-    neg-int v6, v6
+    neg-int v3, v3
 
-    invoke-virtual {v10, v8, v4, v6, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v10, v9, v7, v3, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
-    if-gtz v14, :cond_29
+    if-gtz v8, :cond_27
 
-    if-lez v27, :cond_28
+    if-lez v13, :cond_26
+
+    goto :goto_14
+
+    :cond_26
+    const/4 v2, 0x0
+
+    goto :goto_15
+
+    :cond_27
+    :goto_14
+    const/4 v2, 0x1
+
+    :goto_15
+    move/from16 v17, v6
+
+    const/4 v4, 0x6
+
+    move-object/from16 v6, p0
+
+    const/4 v13, 0x1
+
+    const/16 v16, 0x5
 
     goto :goto_17
 
     :cond_28
-    const/4 v1, 0x0
+    move/from16 v6, p6
 
-    goto :goto_18
+    move-object/from16 v5, v19
+
+    const/4 v13, 0x1
+
+    if-ne v6, v13, :cond_29
+
+    const/4 v2, 0x1
+
+    const/4 v4, 0x6
+
+    move-object/from16 v6, p0
+
+    const/16 v16, 0x6
+
+    const/16 v17, 0x1
+
+    goto :goto_17
 
     :cond_29
-    :goto_17
-    const/4 v1, 0x1
+    const/4 v2, 0x3
 
-    :goto_18
-    move/from16 v16, v2
+    if-ne v6, v2, :cond_2c
 
-    const/4 v12, 0x1
+    if-nez p14, :cond_2a
 
-    const/4 v14, 0x5
+    const/4 v4, 0x6
 
-    goto :goto_1c
+    move-object/from16 v6, p0
 
-    :cond_2a
-    move-object/from16 v11, v24
-
-    const/4 v12, 0x1
-
-    if-ne v6, v12, :cond_2b
-
-    const/4 v1, 0x1
-
-    const/4 v14, 0x6
-
-    :goto_19
-    const/16 v16, 0x1
-
-    goto :goto_1c
-
-    :cond_2b
-    const/4 v1, 0x3
-
-    if-ne v6, v1, :cond_2d
-
-    if-nez p14, :cond_2c
-
-    iget v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
+    iget v1, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
 
     const/4 v2, -0x1
 
-    if-eq v1, v2, :cond_2c
+    if-eq v1, v2, :cond_2b
 
-    if-gtz v14, :cond_2c
+    if-gtz v8, :cond_2b
 
     const/4 v1, 0x6
 
-    goto :goto_1a
+    goto :goto_16
 
-    :cond_2c
+    :cond_2a
+    const/4 v4, 0x6
+
+    move-object/from16 v6, p0
+
+    :cond_2b
     const/4 v1, 0x4
 
-    :goto_1a
+    :goto_16
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v2
 
-    invoke-virtual {v10, v9, v11, v2, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v10, v15, v5, v2, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
     invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
@@ -1639,250 +1793,253 @@
 
     neg-int v2, v2
 
-    invoke-virtual {v10, v8, v4, v2, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
+    invoke-virtual {v10, v9, v7, v2, v1}, Landroidx/constraintlayout/solver/LinearSystem;->addEquality(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)Landroidx/constraintlayout/solver/ArrayRow;
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v14, 0x5
+    const/16 v16, 0x5
 
-    goto :goto_19
+    const/16 v17, 0x1
+
+    goto :goto_17
+
+    :cond_2c
+    const/4 v4, 0x6
+
+    move-object/from16 v6, p0
+
+    const/4 v2, 0x0
+
+    const/16 v16, 0x5
+
+    const/16 v17, 0x0
+
+    goto :goto_17
 
     :cond_2d
-    const/4 v1, 0x0
+    move-object/from16 v5, v19
 
-    goto :goto_1b
+    const/4 v4, 0x6
 
-    :cond_2e
-    move-object/from16 v11, v24
+    move-object/from16 v6, p0
 
-    const/4 v12, 0x1
+    const/4 v13, 0x1
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    :goto_1b
-    const/4 v14, 0x5
+    const/16 v16, 0x5
 
-    const/16 v16, 0x0
+    const/16 v17, 0x0
 
-    :goto_1c
-    if-eqz v1, :cond_30
+    :goto_17
+    if-eqz v2, :cond_2f
 
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    move-result v6
+    move-result v8
 
     invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    move-result v17
+    move-result v18
 
     move-object/from16 v1, p1
 
-    move-object v2, v9
+    move-object v2, v15
 
-    move-object v7, v3
+    move-object v3, v5
 
-    move-object v3, v11
+    const/4 v0, 0x6
 
-    move-object/from16 v18, v4
+    move v4, v8
 
-    move v4, v6
-
-    move-object v6, v5
+    move-object v8, v5
 
     move/from16 v5, p13
 
-    move-object v12, v6
+    move-object v6, v7
 
-    move-object/from16 v28, v18
+    move-object v13, v7
 
-    move-object/from16 v6, v28
+    move-object v7, v9
 
-    move-object v13, v11
+    move-object v14, v8
 
-    move-object v11, v7
+    const/4 v0, 0x0
 
-    move-object v7, v8
+    move/from16 v8, v18
 
-    move-object v0, v8
+    move-object v0, v9
 
-    move/from16 v8, v17
-
-    move-object v12, v9
-
-    move v9, v14
+    move/from16 v9, v16
 
     invoke-virtual/range {v1 .. v9}, Landroidx/constraintlayout/solver/LinearSystem;->addCentering(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;IFLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
     move-object/from16 v1, p7
 
+    iget-object v2, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    instance-of v2, v2, Landroidx/constraintlayout/solver/widgets/Barrier;
+
+    move-object/from16 v3, p8
+
+    iget-object v4, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v4, v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    instance-of v4, v4, Landroidx/constraintlayout/solver/widgets/Barrier;
+
+    if-eqz v2, :cond_2e
+
+    if-nez v4, :cond_2e
+
+    move/from16 v26, p2
+
     const/4 v2, 0x1
 
-    iget-object v3, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    instance-of v3, v3, Landroidx/constraintlayout/solver/widgets/Barrier;
-
-    move-object/from16 v4, p8
-
-    iget-object v5, v4, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    instance-of v5, v5, Landroidx/constraintlayout/solver/widgets/Barrier;
-
-    if-eqz v3, :cond_2f
-
-    if-nez v5, :cond_2f
-
-    move/from16 v2, p2
-
-    const/4 v3, 0x1
+    const/4 v4, 0x5
 
     const/4 v5, 0x6
 
-    goto :goto_1d
+    goto :goto_18
 
-    :cond_2f
-    if-nez v3, :cond_31
+    :cond_2e
+    if-nez v2, :cond_30
 
-    if-eqz v5, :cond_31
+    if-eqz v4, :cond_30
 
-    move/from16 v3, p2
+    move/from16 v2, p2
+
+    const/4 v4, 0x6
 
     const/4 v5, 0x5
 
-    const/16 v29, 0x6
+    const/16 v26, 0x1
 
-    goto :goto_1e
+    goto :goto_18
 
-    :cond_30
-    move-object/from16 v28, v4
+    :cond_2f
+    move-object v14, v5
 
-    move-object v0, v8
+    move-object v13, v7
 
-    move-object v12, v9
-
-    move-object v13, v11
+    move-object v0, v9
 
     move-object/from16 v1, p7
 
-    move-object/from16 v4, p8
+    move-object/from16 v3, p8
 
-    move-object v11, v3
-
-    :cond_31
+    :cond_30
     move/from16 v2, p2
 
-    move v3, v2
+    move/from16 v26, v2
+
+    const/4 v4, 0x5
 
     const/4 v5, 0x5
 
-    :goto_1d
-    const/16 v29, 0x5
+    :goto_18
+    if-eqz v17, :cond_31
 
-    :goto_1e
-    if-eqz v16, :cond_32
+    const/4 v4, 0x6
 
     const/4 v5, 0x6
 
-    const/4 v6, 0x6
+    :cond_31
+    if-nez v21, :cond_32
 
-    goto :goto_1f
+    if-nez v26, :cond_33
 
     :cond_32
-    move v6, v5
-
-    move/from16 v5, v29
-
-    :goto_1f
-    if-nez v15, :cond_33
-
-    if-nez v2, :cond_34
+    if-eqz v17, :cond_34
 
     :cond_33
-    if-eqz v16, :cond_35
-
-    :cond_34
     invoke-virtual/range {p7 .. p7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v1
 
-    invoke-virtual {v10, v12, v13, v1, v5}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    invoke-virtual {v10, v15, v14, v1, v4}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+
+    :cond_34
+    if-nez v21, :cond_35
+
+    if-nez v2, :cond_36
 
     :cond_35
-    if-nez v15, :cond_36
-
-    if-nez v3, :cond_37
+    if-eqz v17, :cond_37
 
     :cond_36
-    if-eqz v16, :cond_38
-
-    :cond_37
     invoke-virtual/range {p8 .. p8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
     move-result v1
 
     neg-int v1, v1
 
-    move-object/from16 v2, v28
+    invoke-virtual {v10, v0, v13, v1, v5}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    invoke-virtual {v10, v0, v2, v1, v6}, Landroidx/constraintlayout/solver/LinearSystem;->addLowerThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    :cond_37
+    if-eqz p2, :cond_38
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
+    invoke-virtual {v10, v15, v11, v1, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+
+    goto :goto_19
 
     :cond_38
-    if-eqz p2, :cond_21
-
     const/4 v1, 0x0
 
-    const/4 v3, 0x6
+    const/4 v2, 0x6
 
-    invoke-virtual {v10, v12, v11, v1, v3}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
-
-    :goto_20
-    if-eqz p2, :cond_39
-
-    move-object/from16 v4, p4
-
-    invoke-virtual {v10, v4, v0, v1, v3}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    goto :goto_19
 
     :cond_39
-    return-void
-
-    :cond_3a
-    move-object v0, v8
-
-    move-object v5, v9
+    move-object v0, v9
 
     const/4 v1, 0x0
 
-    const/4 v3, 0x6
+    const/4 v2, 0x6
 
-    move-object/from16 v4, p4
+    :goto_19
+    if-eqz p2, :cond_3a
 
-    move-object/from16 v11, p3
+    invoke-virtual {v10, v12, v0, v1, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
 
-    const/4 v6, 0x2
-
-    :goto_21
-    if-ge v2, v6, :cond_3b
-
-    if-eqz p2, :cond_3b
-
-    invoke-virtual {v10, v5, v11, v1, v3}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
-
-    invoke-virtual {v10, v4, v0, v1, v3}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+    :cond_3a
+    return-void
 
     :cond_3b
+    :goto_1a
+    move-object v0, v9
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
+    const/4 v3, 0x2
+
+    if-ge v14, v3, :cond_3c
+
+    if-eqz p2, :cond_3c
+
+    invoke-virtual {v10, v15, v11, v1, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+
+    invoke-virtual {v10, v12, v0, v1, v2}, Landroidx/constraintlayout/solver/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;II)V
+
+    :cond_3c
     return-void
 
     nop
 
     :pswitch_data_0
     .packed-switch 0x1
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
+        :pswitch_3
+        :pswitch_2
         :pswitch_1
+        :pswitch_0
     .end packed-switch
 .end method
 
@@ -1909,37 +2066,35 @@
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
+    aget-object v2, v1, p1
+
+    if-eq v0, v2, :cond_0
+
+    const/4 v0, 0x1
+
+    add-int/2addr p1, v0
+
     aget-object v1, v1, p1
 
-    if-eq v0, v1, :cond_0
+    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    add-int/2addr p1, v1
+    aget-object v1, v1, p1
 
-    aget-object v0, v0, p1
+    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v0, v0, p1
-
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object p1, v2, p1
 
-    if-ne v0, p1, :cond_0
+    if-ne v1, p1, :cond_0
 
-    return v1
+    return v0
 
     :cond_0
     const/4 p1, 0x0
@@ -1996,12 +2151,8 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     if-eqz v0, :cond_0
 
-    iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     aget-object v0, v0, v13
@@ -2022,8 +2173,6 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v5, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     aget-object v5, v5, v2
@@ -2170,7 +2319,7 @@
 
     if-ge v5, v7, :cond_7
 
-    iget v5, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinWidth:I
+    move v5, v7
 
     :cond_7
     iget v7, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
@@ -2179,7 +2328,7 @@
 
     if-ge v7, v8, :cond_8
 
-    iget v7, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinHeight:I
+    move v7, v8
 
     :cond_8
     iget-object v8, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
@@ -2222,84 +2371,82 @@
 
     iput v11, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatio:F
 
-    iget v11, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I
+    iget v2, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I
 
-    iget v2, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I
+    iget v13, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I
 
-    iget v13, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatio:F
+    const/16 v18, 0x0
 
-    const/16 v17, 0x0
+    const/16 v19, 0x4
 
-    const/16 v18, 0x4
+    cmpl-float v11, v11, v18
 
-    cmpl-float v13, v13, v17
+    if-lez v11, :cond_13
 
-    if-lez v13, :cond_13
-
-    iget v13, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVisibility:I
+    iget v11, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVisibility:I
 
     const/16 v1, 0x8
 
-    if-eq v13, v1, :cond_13
+    if-eq v11, v1, :cond_13
 
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    const/4 v13, 0x0
+    const/4 v11, 0x0
 
-    aget-object v1, v1, v13
+    aget-object v1, v1, v11
 
-    sget-object v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    sget-object v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    move-object/from16 v27, v3
+    move-object/from16 v23, v3
 
     const/4 v3, 0x3
 
-    if-ne v1, v13, :cond_b
+    if-ne v1, v11, :cond_b
 
-    if-nez v11, :cond_b
+    if-nez v2, :cond_b
 
-    const/4 v11, 0x3
+    const/4 v2, 0x3
 
     :cond_b
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    const/4 v13, 0x1
+    const/4 v11, 0x1
 
-    aget-object v1, v1, v13
+    aget-object v1, v1, v11
 
-    sget-object v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    sget-object v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v1, v13, :cond_c
+    if-ne v1, v11, :cond_c
 
-    if-nez v2, :cond_c
+    if-nez v13, :cond_c
 
-    const/4 v2, 0x3
+    const/4 v13, 0x3
 
     :cond_c
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    const/4 v13, 0x0
+    const/4 v11, 0x0
 
-    aget-object v1, v1, v13
+    aget-object v1, v1, v11
 
-    sget-object v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    sget-object v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v1, v13, :cond_d
+    if-ne v1, v11, :cond_d
 
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    const/4 v13, 0x1
+    const/4 v11, 0x1
 
-    aget-object v1, v1, v13
+    aget-object v1, v1, v11
 
-    sget-object v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    sget-object v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v1, v13, :cond_d
-
-    if-ne v11, v3, :cond_d
+    if-ne v1, v11, :cond_d
 
     if-ne v2, v3, :cond_d
 
+    if-ne v13, v3, :cond_d
+
     invoke-virtual {v15, v0, v12, v8, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setupDimensionRatio(ZZZZ)V
 
     goto/16 :goto_7
@@ -2315,7 +2462,7 @@
 
     if-ne v1, v9, :cond_f
 
-    if-ne v11, v3, :cond_f
+    if-ne v2, v3, :cond_f
 
     iput v8, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
 
@@ -2339,21 +2486,29 @@
 
     if-eq v3, v5, :cond_e
 
-    move/from16 v29, v1
+    move/from16 v28, v1
 
-    move/from16 v25, v2
+    move/from16 v29, v7
 
-    move/from16 v30, v7
+    move/from16 v26, v13
 
-    const/16 v20, 0x4
+    const/16 v25, 0x4
 
-    goto :goto_a
+    const/16 v27, 0x0
+
+    goto/16 :goto_8
 
     :cond_e
-    move/from16 v29, v1
+    move/from16 v28, v1
 
     move/from16 v25, v2
 
+    move/from16 v29, v7
+
+    move/from16 v26, v13
+
+    const/16 v27, 0x1
+
     goto :goto_8
 
     :cond_f
@@ -2367,7 +2522,7 @@
 
     if-ne v1, v9, :cond_12
 
-    if-ne v2, v3, :cond_12
+    if-ne v13, v3, :cond_12
 
     iput v8, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
 
@@ -2406,97 +2561,96 @@
 
     if-eq v3, v7, :cond_11
 
-    move/from16 v30, v1
-
-    move/from16 v29, v5
-
-    move/from16 v20, v11
-
-    const/16 v25, 0x4
-
-    goto :goto_a
-
-    :cond_11
-    move/from16 v30, v1
+    move/from16 v29, v1
 
     move/from16 v25, v2
 
-    move/from16 v29, v5
+    move/from16 v28, v5
 
-    goto :goto_9
+    const/16 v26, 0x4
+
+    const/16 v27, 0x0
+
+    goto :goto_8
+
+    :cond_11
+    move/from16 v29, v1
+
+    move/from16 v25, v2
+
+    move/from16 v28, v5
+
+    move/from16 v26, v13
+
+    const/16 v27, 0x1
+
+    goto :goto_8
 
     :cond_12
     :goto_7
     move/from16 v25, v2
 
-    move/from16 v29, v5
+    move/from16 v28, v5
 
-    :goto_8
-    move/from16 v30, v7
+    move/from16 v29, v7
 
-    :goto_9
-    move/from16 v20, v11
+    move/from16 v26, v13
 
-    const/16 v28, 0x1
+    const/16 v27, 0x1
 
-    goto :goto_b
+    goto :goto_8
 
     :cond_13
-    move-object/from16 v27, v3
+    move-object/from16 v23, v3
 
     move/from16 v25, v2
 
-    move/from16 v29, v5
+    move/from16 v28, v5
 
-    move/from16 v30, v7
+    move/from16 v29, v7
 
-    move/from16 v20, v11
+    move/from16 v26, v13
 
-    :goto_a
-    const/16 v28, 0x0
+    const/16 v27, 0x0
 
-    :goto_b
+    :goto_8
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
 
     const/4 v2, 0x0
 
-    aput v20, v1, v2
-
-    iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I
+    aput v25, v1, v2
 
     const/4 v2, 0x1
 
-    aput v25, v1, v2
+    aput v26, v1, v2
 
-    if-eqz v28, :cond_15
+    if-eqz v27, :cond_15
 
     iget v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
 
     if-eqz v1, :cond_14
 
-    iget v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
-
     const/4 v2, -0x1
 
     if-ne v1, v2, :cond_16
 
-    goto :goto_c
+    goto :goto_9
 
     :cond_14
     const/4 v2, -0x1
 
-    :goto_c
-    const/16 v26, 0x1
+    :goto_9
+    const/16 v24, 0x1
 
-    goto :goto_d
+    goto :goto_a
 
     :cond_15
     const/4 v2, -0x1
 
     :cond_16
-    const/16 v26, 0x0
+    const/16 v24, 0x0
 
-    :goto_d
+    :goto_a
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     const/4 v3, 0x0
@@ -2511,14 +2665,14 @@
 
     if-eqz v1, :cond_17
 
-    const/16 v31, 0x1
+    const/16 v30, 0x1
 
-    goto :goto_e
+    goto :goto_b
 
     :cond_17
-    const/16 v31, 0x0
+    const/16 v30, 0x0
 
-    :goto_e
+    :goto_b
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mCenter:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
@@ -2527,7 +2681,7 @@
 
     const/4 v3, 0x1
 
-    xor-int/lit8 v23, v1, 0x1
+    xor-int/lit8 v31, v1, 0x1
 
     iget v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalResolution:I
 
@@ -2541,42 +2695,38 @@
 
     if-eqz v1, :cond_18
 
-    iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {v14, v1}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
 
     move-result-object v1
 
-    move-object/from16 v33, v1
+    move-object/from16 v20, v1
 
-    goto :goto_f
+    goto :goto_c
 
     :cond_18
-    move-object/from16 v33, v32
+    move-object/from16 v20, v32
 
-    :goto_f
+    :goto_c
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     if-eqz v1, :cond_19
 
-    iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {v14, v1}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
 
     move-result-object v1
 
-    move-object/from16 v34, v1
+    move-object/from16 v33, v1
 
-    goto :goto_10
+    goto :goto_d
 
     :cond_19
-    move-object/from16 v34, v32
+    move-object/from16 v33, v32
 
-    :goto_10
+    :goto_d
     iget-object v1, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     const/16 v17, 0x0
@@ -2595,7 +2745,7 @@
 
     aget v1, v1, v17
 
-    move/from16 v24, v12
+    move/from16 v34, v12
 
     move v12, v1
 
@@ -2623,48 +2773,50 @@
 
     move/from16 v2, v35
 
-    move-object/from16 v36, v27
+    move-object/from16 v36, v23
 
-    move-object/from16 v3, v34
+    move-object/from16 v3, v33
 
-    move-object/from16 v27, v4
+    move-object/from16 v23, v4
 
-    move-object/from16 v4, v33
+    move-object/from16 v4, v20
 
     move-object/from16 v37, v6
 
-    move/from16 v6, v31
+    move/from16 v6, v30
 
-    move-object/from16 v31, v10
+    move-object/from16 v30, v10
 
-    move/from16 v10, v29
+    move/from16 v10, v28
 
-    move/from16 v14, v26
+    move/from16 v14, v24
 
     move/from16 v15, v16
 
-    move/from16 v16, v20
+    move/from16 v16, v25
 
-    move/from16 v20, v23
+    move/from16 v20, v31
 
     invoke-direct/range {v0 .. v20}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->applyConstraints(Landroidx/constraintlayout/solver/LinearSystem;ZLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;ZLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;IIIIFZZIIIFZ)V
 
-    goto :goto_11
+    move-object/from16 v15, p0
+
+    goto :goto_e
 
     :cond_1a
     move-object/from16 v37, v6
 
-    move-object/from16 v31, v10
+    move-object/from16 v30, v10
 
-    move/from16 v24, v12
+    move/from16 v34, v12
 
-    move-object/from16 v36, v27
+    move-object/from16 v36, v23
 
-    move-object/from16 v27, v4
+    move-object/from16 v23, v4
 
-    :goto_11
     move-object/from16 v15, p0
 
+    :goto_e
     iget v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalResolution:I
 
     const/4 v1, 0x2
@@ -2690,20 +2842,18 @@
 
     const/4 v6, 0x1
 
-    goto :goto_12
+    goto :goto_f
 
     :cond_1c
     const/4 v6, 0x0
 
-    :goto_12
-    if-eqz v28, :cond_1e
+    :goto_f
+    if-eqz v27, :cond_1e
 
     iget v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
 
     if-eq v0, v14, :cond_1d
 
-    iget v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I
-
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_1e
@@ -2711,12 +2861,12 @@
     :cond_1d
     const/16 v16, 0x1
 
-    goto :goto_13
+    goto :goto_10
 
     :cond_1e
     const/16 v16, 0x0
 
-    :goto_13
+    :goto_10
     iget v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
 
     if-lez v0, :cond_20
@@ -2743,7 +2893,7 @@
 
     move-object/from16 v4, v37
 
-    goto :goto_14
+    goto :goto_11
 
     :cond_1f
     move-object/from16 v10, p1
@@ -2780,7 +2930,7 @@
 
     const/16 v20, 0x0
 
-    goto :goto_15
+    goto :goto_12
 
     :cond_20
     move-object/from16 v4, v37
@@ -2788,36 +2938,32 @@
     move-object/from16 v10, p1
 
     :cond_21
-    :goto_14
-    move/from16 v20, v23
+    :goto_11
+    move/from16 v20, v31
 
-    :goto_15
+    :goto_12
     iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     if-eqz v0, :cond_22
 
-    iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {v10, v0}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
 
     move-result-object v0
 
-    move-object/from16 v23, v0
+    move-object/from16 v24, v0
 
-    goto :goto_16
+    goto :goto_13
 
     :cond_22
-    move-object/from16 v23, v32
+    move-object/from16 v24, v32
 
-    :goto_16
+    :goto_13
     iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     if-eqz v0, :cond_23
 
-    iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {v10, v0}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
@@ -2826,12 +2972,12 @@
 
     move-object v3, v0
 
-    goto :goto_17
+    goto :goto_14
 
     :cond_23
     move-object/from16 v3, v32
 
-    :goto_17
+    :goto_14
     iget-object v0, v15, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     aget-object v5, v0, v14
@@ -2866,23 +3012,23 @@
 
     move-object/from16 v1, p1
 
-    move/from16 v2, v24
+    move/from16 v2, v34
 
-    move-object/from16 v24, v4
+    move-object/from16 v25, v4
 
-    move-object/from16 v4, v23
+    move-object/from16 v4, v24
 
-    move/from16 v10, v30
+    move/from16 v10, v29
 
     move/from16 v14, v16
 
     move/from16 v15, v22
 
-    move/from16 v16, v25
+    move/from16 v16, v26
 
     invoke-direct/range {v0 .. v20}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->applyConstraints(Landroidx/constraintlayout/solver/LinearSystem;ZLandroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;ZLandroidx/constraintlayout/solver/widgets/ConstraintAnchor;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;IIIIFZZIIIFZ)V
 
-    if-eqz v28, :cond_25
+    if-eqz v27, :cond_25
 
     move-object/from16 v7, p0
 
@@ -2898,18 +3044,17 @@
 
     move-object/from16 v0, p1
 
-    move-object/from16 v1, v27
+    move-object/from16 v1, v23
 
-    move-object/from16 v2, v24
+    move-object/from16 v2, v25
 
-    move-object/from16 v3, v31
+    move-object/from16 v3, v30
 
     move-object/from16 v4, v21
 
-    :goto_18
     invoke-virtual/range {v0 .. v6}, Landroidx/constraintlayout/solver/LinearSystem;->addRatio(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;FI)V
 
-    goto :goto_19
+    goto :goto_15
 
     :cond_24
     iget v5, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolvedDimensionRatio:F
@@ -2918,20 +3063,22 @@
 
     move-object/from16 v0, p1
 
-    move-object/from16 v1, v31
+    move-object/from16 v1, v30
 
     move-object/from16 v2, v21
 
-    move-object/from16 v3, v27
+    move-object/from16 v3, v23
 
-    move-object/from16 v4, v24
+    move-object/from16 v4, v25
 
-    goto :goto_18
+    invoke-virtual/range {v0 .. v6}, Landroidx/constraintlayout/solver/LinearSystem;->addRatio(Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;Landroidx/constraintlayout/solver/SolverVariable;FI)V
+
+    goto :goto_15
 
     :cond_25
     move-object/from16 v7, p0
 
-    :goto_19
+    :goto_15
     iget-object v0, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mCenter:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
@@ -3610,10 +3757,9 @@
     invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
     :cond_15
-    :goto_5
     move-object/from16 v0, p5
 
-    goto/16 :goto_9
+    goto/16 :goto_7
 
     :cond_16
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -3624,7 +3770,7 @@
 
     if-ne v0, v3, :cond_17
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_17
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -3671,15 +3817,14 @@
 
     if-eqz v4, :cond_1d
 
-    :goto_6
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
     invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_1a
-    :goto_7
+    :goto_5
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BASELINE:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     invoke-virtual {p0, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -3726,15 +3871,17 @@
 
     if-eqz v4, :cond_1d
 
-    goto :goto_6
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
+
+    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
     :cond_1d
-    :goto_8
+    :goto_6
     move/from16 v12, p4
 
-    goto :goto_5
+    move-object/from16 v0, p5
 
-    :goto_9
+    :goto_7
     invoke-virtual {v1, v2, v12, v0, v11}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->connect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;ILandroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;I)Z
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getOwner()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
@@ -3999,23 +4146,19 @@
 .end method
 
 .method public forceUpdateDrawPosition()V
-    .locals 5
+    .locals 4
 
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mX:I
 
     iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mY:I
 
-    iget v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mX:I
+    iget v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    add-int/2addr v2, v0
 
-    add-int/2addr v2, v3
+    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mY:I
-
-    iget v4, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
-
-    add-int/2addr v3, v4
+    add-int/2addr v3, v1
 
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDrawX:I
 
@@ -4615,8 +4758,6 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I
-
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
     goto :goto_0
@@ -4629,11 +4770,9 @@
 
     if-lez v1, :cond_2
 
-    iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxHeight:I
-
     if-ge v1, v0, :cond_2
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxHeight:I
+    move v0, v1
 
     :cond_2
     return v0
@@ -4673,8 +4812,6 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I
-
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
     goto :goto_0
@@ -4687,11 +4824,9 @@
 
     if-lez v1, :cond_2
 
-    iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I
-
     if-ge v1, v0, :cond_2
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I
+    move v0, v1
 
     :cond_2
     return v0
@@ -5361,8 +5496,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     instance-of v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
     if-nez v0, :cond_1
@@ -5553,8 +5686,6 @@
 
     iput v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F
 
-    sget v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->DEFAULT_BIAS:F
-
     iput v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F
 
     iget-object v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
@@ -5597,8 +5728,6 @@
 
     aput v4, v3, v2
 
-    iget-object v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
-
     aput v4, v3, v5
 
     iput v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalResolution:I
@@ -5611,8 +5740,6 @@
 
     aput v4, v3, v2
 
-    iget-object v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMaxDimension:[I
-
     aput v4, v3, v5
 
     iput v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I
@@ -5641,8 +5768,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolutionWidth:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->reset()V
 
     :cond_0
@@ -5650,8 +5775,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mResolutionHeight:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->reset()V
 
     :cond_1
@@ -5706,10 +5829,9 @@
 
     sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    :goto_0
     invoke-virtual {p0, v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalDimensionBehaviour(Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
@@ -5724,10 +5846,10 @@
 
     sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    goto :goto_0
+    invoke-virtual {p0, v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHorizontalDimensionBehaviour(Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;)V
 
     :cond_2
-    :goto_1
+    :goto_0
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVerticalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     move-result-object v0
@@ -5847,7 +5969,7 @@
 
     const/high16 v7, 0x3f000000    # 0.5f
 
-    if-ne p1, v4, :cond_4
+    if-ne p1, v4, :cond_3
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
@@ -5905,26 +6027,24 @@
     :cond_2
     iput v7, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F
 
-    :cond_3
-    :goto_0
     iput v7, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
-    :cond_4
-    if-ne p1, v5, :cond_6
+    :cond_3
+    if-ne p1, v5, :cond_5
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
     move-result v2
 
-    if-eqz v2, :cond_5
+    if-eqz v2, :cond_4
 
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
     move-result v2
 
-    if-eqz v2, :cond_5
+    if-eqz v2, :cond_4
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -5942,31 +6062,31 @@
 
     move-result-object v3
 
-    if-ne v2, v3, :cond_5
+    if-ne v2, v3, :cond_4
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
-    :cond_5
+    :cond_4
     iput v7, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F
 
-    goto :goto_3
+    goto :goto_1
 
-    :cond_6
+    :cond_5
     if-ne p1, v6, :cond_7
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_6
 
     invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_6
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -5984,20 +6104,23 @@
 
     move-result-object v1
 
-    if-ne v0, v1, :cond_3
+    if-ne v0, v1, :cond_6
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
     invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
-    goto :goto_0
+    :cond_6
+    iput v7, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F
+
+    goto :goto_1
 
     :cond_7
     if-eq p1, v0, :cond_a
 
     if-ne p1, v1, :cond_8
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_8
     if-eq p1, v2, :cond_9
@@ -6021,10 +6144,12 @@
 
     if-ne v0, v1, :cond_b
 
-    goto :goto_2
+    invoke-virtual {v4}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
+
+    goto :goto_1
 
     :cond_a
-    :goto_1
+    :goto_0
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->isConnected()Z
 
     move-result v2
@@ -6041,11 +6166,10 @@
 
     if-ne v0, v1, :cond_b
 
-    :goto_2
     invoke-virtual {v4}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
     :cond_b
-    :goto_3
+    :goto_1
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->reset()V
 
     return-void
@@ -6437,9 +6561,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinWidth:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
     :cond_0
     iput p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
@@ -6450,9 +6572,7 @@
 
     if-ge p1, p2, :cond_1
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinHeight:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
+    iput p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
     :cond_1
     return-void
@@ -6473,7 +6593,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_9
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
@@ -6544,11 +6664,11 @@
 
     move-result v3
 
-    if-ltz v3, :cond_5
+    if-ltz v3, :cond_6
 
     sub-int/2addr v2, v5
 
-    if-ge v3, v2, :cond_5
+    if-ge v3, v2, :cond_6
 
     invoke-virtual {p1, v4, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -6564,13 +6684,13 @@
 
     move-result v3
 
-    if-lez v3, :cond_6
+    if-lez v3, :cond_7
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
     move-result v3
 
-    if-lez v3, :cond_6
+    if-lez v3, :cond_7
 
     :try_start_0
     invoke-static {v2}, Ljava/lang/Float;->parseFloat(Ljava/lang/String;)F
@@ -6583,11 +6703,11 @@
 
     cmpl-float v3, v2, v0
 
-    if-lez v3, :cond_6
+    if-lez v3, :cond_5
 
     cmpl-float v3, p1, v0
 
-    if-lez v3, :cond_6
+    if-lez v3, :cond_5
 
     if-ne v1, v5, :cond_4
 
@@ -6611,6 +6731,11 @@
     goto :goto_1
 
     :cond_5
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_6
     invoke-virtual {p1, v4}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
     move-result-object p1
@@ -6619,7 +6744,7 @@
 
     move-result v2
 
-    if-lez v2, :cond_6
+    if-lez v2, :cond_7
 
     :try_start_1
     invoke-static {p1}, Ljava/lang/Float;->parseFloat(Ljava/lang/String;)F
@@ -6631,22 +6756,22 @@
     goto :goto_1
 
     :catch_0
-    :cond_6
+    :cond_7
     const/4 p1, 0x0
 
     :goto_1
     cmpl-float v0, p1, v0
 
-    if-lez v0, :cond_7
+    if-lez v0, :cond_8
 
     iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatio:F
 
     iput v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatioSide:I
 
-    :cond_7
+    :cond_8
     return-void
 
-    :cond_8
+    :cond_9
     :goto_2
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatio:F
 
@@ -6788,53 +6913,55 @@
 
     if-ge p3, p1, :cond_1
 
-    iget p3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    move p1, p3
 
-    const/4 p2, 0x1
+    :goto_0
+    iget-object p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    aget-object p1, p1, p2
+    const/4 p3, 0x1
+
+    aget-object p2, p2, p3
 
     sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne p1, v0, :cond_2
+    if-ne p2, v0, :cond_2
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
+    iget p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
-    if-ge p4, p1, :cond_2
+    if-ge p4, p2, :cond_2
 
-    iget p4, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
+    goto :goto_1
 
     :cond_2
-    iput p3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    move p2, p4
 
-    iput p4, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
+    :goto_1
+    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+
+    iput p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
     iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
-    iget p3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinHeight:I
+    iget p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinHeight:I
 
-    if-ge p1, p3, :cond_3
+    if-ge p1, p2, :cond_3
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinHeight:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
+    iput p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
     :cond_3
     iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
-    iget p3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinWidth:I
+    iget p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinWidth:I
 
-    if-ge p1, p3, :cond_4
+    if-ge p1, p2, :cond_4
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinWidth:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    iput p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
     :cond_4
-    iput-boolean p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mOptimizerMeasured:Z
+    iput-boolean p3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mOptimizerMeasured:Z
 
     return-void
 .end method
@@ -6852,19 +6979,18 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iput p2, p1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mGoneMargin:I
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_0
     iput p2, p1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mGoneMargin:I
 
     return-void
@@ -6872,14 +6998,18 @@
     :pswitch_2
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_0
+    iput p2, p1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mGoneMargin:I
+
+    return-void
 
     :pswitch_3
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_0
+    iput p2, p1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mGoneMargin:I
 
-    :goto_1
+    return-void
+
+    :goto_0
     return-void
 
     nop
@@ -6904,9 +7034,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinHeight:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
+    iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
     :cond_0
     return-void
@@ -6951,9 +7079,7 @@
 
     if-ge p1, p2, :cond_0
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinWidth:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    iput p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
     :cond_0
     return-void
@@ -7186,9 +7312,7 @@
 
     if-ge p1, p2, :cond_0
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinHeight:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
+    iput p2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
     :cond_0
     return-void
@@ -7275,9 +7399,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMinWidth:I
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
     :cond_0
     return-void
@@ -7709,23 +7831,19 @@
 .end method
 
 .method public updateDrawPosition()V
-    .locals 5
+    .locals 4
 
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mX:I
 
     iget v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mY:I
 
-    iget v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mX:I
+    iget v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWidth:I
+    add-int/2addr v2, v0
 
-    add-int/2addr v2, v3
+    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mY:I
-
-    iget v4, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHeight:I
-
-    add-int/2addr v3, v4
+    add-int/2addr v3, v1
 
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDrawX:I
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetContainer.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetContainer.smali
index 7821034f3f..8f703755f1 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetContainer.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetContainer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 .super Landroidx/constraintlayout/solver/widgets/WidgetContainer;
+.source "ConstraintWidgetContainer.java"
 
 
 # static fields
@@ -258,19 +259,15 @@
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroidx/constraintlayout/solver/widgets/ChainHead;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-lt v0, v1, :cond_0
+    if-lt v0, v2, :cond_0
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroidx/constraintlayout/solver/widgets/ChainHead;
+    array-length v0, v1
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroidx/constraintlayout/solver/widgets/ChainHead;
+    mul-int/lit8 v0, v0, 0x2
 
-    array-length v1, v1
-
-    mul-int/lit8 v1, v1, 0x2
-
-    invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -315,19 +312,15 @@
 
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mVerticalChainsArray:[Landroidx/constraintlayout/solver/widgets/ChainHead;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-lt v0, v2, :cond_0
+    if-lt v0, v3, :cond_0
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mVerticalChainsArray:[Landroidx/constraintlayout/solver/widgets/ChainHead;
+    array-length v0, v2
 
-    iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mVerticalChainsArray:[Landroidx/constraintlayout/solver/widgets/ChainHead;
+    mul-int/lit8 v0, v0, 0x2
 
-    array-length v2, v2
-
-    mul-int/lit8 v2, v2, 0x2
-
-    invoke-static {v0, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -730,7 +723,7 @@
 .end method
 
 .method public layout()V
-    .locals 23
+    .locals 21
 
     move-object/from16 v1, p0
 
@@ -919,11 +912,11 @@
     const/4 v15, 0x0
 
     :goto_4
-    if-ge v15, v12, :cond_1c
+    if-ge v15, v12, :cond_1f
 
     iget-boolean v8, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mSkipSolver:Z
 
-    if-nez v8, :cond_1c
+    if-nez v8, :cond_1f
 
     iget-object v8, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mWidgetGroups:Ljava/util/List;
 
@@ -935,7 +928,7 @@
 
     iget-boolean v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetGroup;->mSkipSolver:Z
 
-    if-nez v8, :cond_1b
+    if-nez v8, :cond_1e
 
     invoke-virtual {v1, v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->optimizeFor(I)Z
 
@@ -971,6 +964,10 @@
 
     move-result-object v7
 
+    check-cast v7, Ljava/util/ArrayList;
+
+    iput-object v7, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList;
+
     goto :goto_5
 
     :cond_8
@@ -984,12 +981,12 @@
 
     iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetGroup;->mConstrainedGroup:Ljava/util/List;
 
-    :goto_5
     check-cast v7, Ljava/util/ArrayList;
 
     iput-object v7, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList;
 
     :cond_9
+    :goto_5
     invoke-direct/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->resetChains()V
 
     iget-object v7, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList;
@@ -1036,9 +1033,9 @@
     const/4 v4, 0x1
 
     :goto_7
-    if-eqz v4, :cond_1a
+    if-eqz v4, :cond_1d
 
-    move/from16 v18, v4
+    move/from16 v17, v4
 
     const/4 v8, 0x1
 
@@ -1070,7 +1067,7 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
 
-    move/from16 v19, v9
+    move/from16 v18, v9
 
     :try_start_1
     iget-object v9, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroidx/constraintlayout/solver/LinearSystem;
@@ -1079,12 +1076,12 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    move/from16 v9, v19
+    move/from16 v9, v18
 
     goto :goto_8
 
     :cond_c
-    move/from16 v19, v9
+    move/from16 v18, v9
 
     iget-object v0, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroidx/constraintlayout/solver/LinearSystem;
 
@@ -1112,7 +1109,7 @@
 
     :cond_d
     :goto_9
-    move/from16 v20, v8
+    move/from16 v17, v8
 
     goto :goto_c
 
@@ -1124,17 +1121,17 @@
     :catch_2
     move-exception v0
 
-    move/from16 v19, v9
+    move/from16 v18, v9
 
     :goto_a
-    move/from16 v8, v18
+    move/from16 v8, v17
 
     :goto_b
     invoke-virtual {v0}, Ljava/lang/Exception;->printStackTrace()V
 
     sget-object v9, Ljava/lang/System;->out:Ljava/io/PrintStream;
 
-    move/from16 v20, v8
+    move/from16 v17, v8
 
     const-string v8, "EXCEPTION : "
 
@@ -1149,7 +1146,7 @@
     invoke-virtual {v9, v0}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 
     :goto_c
-    if-eqz v20, :cond_f
+    if-eqz v17, :cond_e
 
     iget-object v8, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroidx/constraintlayout/solver/LinearSystem;
 
@@ -1157,23 +1154,21 @@
 
     invoke-virtual {v1, v8, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->updateChildrenFromSolver(Landroidx/constraintlayout/solver/LinearSystem;[Z)V
 
-    :cond_e
-    move/from16 v21, v12
+    move/from16 v19, v12
 
-    :goto_d
     const/4 v9, 0x2
 
-    goto :goto_f
+    goto :goto_10
 
-    :cond_f
+    :cond_e
     iget-object v8, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroidx/constraintlayout/solver/LinearSystem;
 
     invoke-virtual {v1, v8}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->updateFromSolver(Landroidx/constraintlayout/solver/LinearSystem;)V
 
     const/4 v8, 0x0
 
-    :goto_e
-    if-ge v8, v7, :cond_e
+    :goto_d
+    if-ge v8, v7, :cond_13
 
     iget-object v9, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList;
 
@@ -1185,11 +1180,11 @@
 
     iget-object v0, v9, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    const/16 v17, 0x0
+    const/16 v16, 0x0
 
-    aget-object v0, v0, v17
+    aget-object v0, v0, v16
 
-    move/from16 v21, v12
+    move/from16 v19, v12
 
     sget-object v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
@@ -1203,7 +1198,7 @@
 
     move-result v12
 
-    if-ge v0, v12, :cond_10
+    if-ge v0, v12, :cond_f
 
     sget-object v0, Landroidx/constraintlayout/solver/widgets/Optimizer;->flags:[Z
 
@@ -1213,18 +1208,26 @@
 
     aput-boolean v12, v0, v8
 
-    goto :goto_d
+    const/4 v9, 0x2
+
+    goto :goto_10
+
+    :cond_f
+    const/4 v12, 0x1
+
+    goto :goto_e
 
     :cond_10
     const/4 v12, 0x1
 
+    :goto_e
     iget-object v0, v9, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     aget-object v0, v0, v12
 
     sget-object v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v0, v12, :cond_11
+    if-ne v0, v12, :cond_12
 
     invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
@@ -1244,29 +1247,40 @@
 
     aput-boolean v8, v0, v9
 
-    goto :goto_f
+    goto :goto_10
 
     :cond_11
     const/4 v9, 0x2
 
-    add-int/lit8 v8, v8, 0x1
+    goto :goto_f
 
-    move/from16 v12, v21
-
-    goto :goto_e
+    :cond_12
+    const/4 v9, 0x2
 
     :goto_f
-    if-eqz v14, :cond_15
+    add-int/lit8 v8, v8, 0x1
+
+    move/from16 v12, v19
+
+    goto :goto_d
+
+    :cond_13
+    move/from16 v19, v12
+
+    const/4 v9, 0x2
+
+    :goto_10
+    if-eqz v14, :cond_17
 
     const/16 v8, 0x8
 
-    if-ge v4, v8, :cond_15
+    if-ge v4, v8, :cond_17
 
     sget-object v0, Landroidx/constraintlayout/solver/widgets/Optimizer;->flags:[Z
 
     aget-boolean v0, v0, v9
 
-    if-eqz v0, :cond_15
+    if-eqz v0, :cond_17
 
     const/4 v0, 0x0
 
@@ -1274,8 +1288,8 @@
 
     const/4 v12, 0x0
 
-    :goto_10
-    if-ge v0, v7, :cond_12
+    :goto_11
+    if-ge v0, v7, :cond_14
 
     iget-object v8, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList;
 
@@ -1285,15 +1299,15 @@
 
     check-cast v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    move/from16 v22, v4
+    move/from16 v17, v4
 
     iget v4, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mX:I
 
     invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
-    move-result v16
+    move-result v20
 
-    add-int v4, v4, v16
+    add-int v4, v4, v20
 
     invoke-static {v9, v4}, Ljava/lang/Math;->max(II)I
 
@@ -1313,14 +1327,14 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    move/from16 v4, v22
+    move/from16 v4, v17
 
     const/16 v8, 0x8
 
-    goto :goto_10
+    goto :goto_11
 
-    :cond_12
-    move/from16 v22, v4
+    :cond_14
+    move/from16 v17, v4
 
     iget v0, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mMinWidth:I
 
@@ -1336,13 +1350,13 @@
 
     sget-object v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v11, v8, :cond_13
+    if-ne v11, v8, :cond_15
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getWidth()I
 
     move-result v8
 
-    if-ge v8, v0, :cond_13
+    if-ge v8, v0, :cond_15
 
     invoke-virtual {v1, v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V
 
@@ -1356,23 +1370,23 @@
 
     const/4 v0, 0x1
 
-    const/16 v19, 0x1
+    const/16 v18, 0x1
 
-    goto :goto_11
+    goto :goto_12
 
-    :cond_13
+    :cond_15
     const/4 v0, 0x0
 
-    :goto_11
+    :goto_12
     sget-object v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v10, v8, :cond_14
+    if-ne v10, v8, :cond_16
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getHeight()I
 
     move-result v8
 
-    if-ge v8, v4, :cond_14
+    if-ge v8, v4, :cond_16
 
     invoke-virtual {v1, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V
 
@@ -1388,21 +1402,21 @@
 
     const/4 v9, 0x1
 
-    goto :goto_12
+    goto :goto_13
 
-    :cond_14
-    move/from16 v9, v19
+    :cond_16
+    move/from16 v9, v18
 
-    goto :goto_12
+    goto :goto_13
 
-    :cond_15
-    move/from16 v22, v4
+    :cond_17
+    move/from16 v17, v4
 
-    move/from16 v9, v19
+    move/from16 v9, v18
 
     const/4 v0, 0x0
 
-    :goto_12
+    :goto_13
     iget v4, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mMinWidth:I
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getWidth()I
@@ -1417,7 +1431,7 @@
 
     move-result v8
 
-    if-le v4, v8, :cond_16
+    if-le v4, v8, :cond_18
 
     invoke-virtual {v1, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V
 
@@ -1433,7 +1447,7 @@
 
     const/4 v9, 0x1
 
-    :cond_16
+    :cond_18
     iget v4, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mMinHeight:I
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getHeight()I
@@ -1448,7 +1462,7 @@
 
     move-result v8
 
-    if-le v4, v8, :cond_17
+    if-le v4, v8, :cond_19
 
     invoke-virtual {v1, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V
 
@@ -1464,13 +1478,13 @@
 
     const/4 v9, 0x1
 
-    goto :goto_13
+    goto :goto_14
 
-    :cond_17
+    :cond_19
     const/4 v8, 0x1
 
-    :goto_13
-    if-nez v9, :cond_19
+    :goto_14
+    if-nez v9, :cond_1c
 
     iget-object v4, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
@@ -1480,15 +1494,15 @@
 
     sget-object v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v4, v12, :cond_18
+    if-ne v4, v12, :cond_1a
 
-    if-lez v5, :cond_18
+    if-lez v5, :cond_1a
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getWidth()I
 
     move-result v4
 
-    if-le v4, v5, :cond_18
+    if-le v4, v5, :cond_1a
 
     iput-boolean v8, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mWidthMeasuredTooSmall:Z
 
@@ -1506,22 +1520,22 @@
 
     const/4 v9, 0x1
 
-    :cond_18
+    :cond_1a
     iget-object v4, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     aget-object v4, v4, v8
 
     sget-object v12, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v4, v12, :cond_19
+    if-ne v4, v12, :cond_1b
 
-    if-lez v6, :cond_19
+    if-lez v6, :cond_1b
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getHeight()I
 
     move-result v4
 
-    if-le v4, v6, :cond_19
+    if-le v4, v6, :cond_1b
 
     iput-boolean v8, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mHeightMeasuredTooSmall:Z
 
@@ -1537,22 +1551,27 @@
 
     const/4 v9, 0x1
 
-    goto :goto_14
+    goto :goto_15
 
-    :cond_19
+    :cond_1b
     move v4, v0
 
-    :goto_14
-    move/from16 v12, v21
+    goto :goto_15
 
-    move/from16 v0, v22
+    :cond_1c
+    move v4, v0
+
+    :goto_15
+    move/from16 v0, v17
+
+    move/from16 v12, v19
 
     goto/16 :goto_7
 
-    :cond_1a
-    move/from16 v19, v9
+    :cond_1d
+    move/from16 v18, v9
 
-    move/from16 v21, v12
+    move/from16 v19, v12
 
     iget-object v0, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mWidgetGroups:Ljava/util/List;
 
@@ -1564,17 +1583,17 @@
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetGroup;->updateUnresolvedWidgets()V
 
-    move/from16 v0, v19
+    move/from16 v0, v18
 
-    goto :goto_15
+    goto :goto_16
 
-    :cond_1b
-    move/from16 v21, v12
+    :cond_1e
+    move/from16 v19, v12
 
-    :goto_15
+    :goto_16
     add-int/lit8 v15, v15, 0x1
 
-    move/from16 v12, v21
+    move/from16 v12, v19
 
     const/4 v4, 0x0
 
@@ -1586,14 +1605,14 @@
 
     goto/16 :goto_4
 
-    :cond_1c
+    :cond_1f
     check-cast v13, Ljava/util/ArrayList;
 
     iput-object v13, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList;
 
     iget-object v4, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mParent:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    if-eqz v4, :cond_1d
+    if-eqz v4, :cond_20
 
     iget v2, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mMinWidth:I
 
@@ -1639,15 +1658,15 @@
 
     invoke-virtual {v1, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V
 
-    goto :goto_16
+    goto :goto_17
 
-    :cond_1d
+    :cond_20
     iput v2, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mX:I
 
     iput v3, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mY:I
 
-    :goto_16
-    if-eqz v0, :cond_1e
+    :goto_17
+    if-eqz v0, :cond_21
 
     iget-object v0, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
@@ -1661,7 +1680,7 @@
 
     aput-object v10, v0, v2
 
-    :cond_1e
+    :cond_21
     iget-object v0, v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroidx/constraintlayout/solver/LinearSystem;
 
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/LinearSystem;->getCache()Landroidx/constraintlayout/solver/Cache;
@@ -1674,11 +1693,11 @@
 
     move-result-object v0
 
-    if-ne v1, v0, :cond_1f
+    if-ne v1, v0, :cond_22
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->updateDrawPosition()V
 
-    :cond_1f
+    :cond_22
     return-void
 .end method
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetGroup.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetGroup.smali
index d7559d7f16..5121b299ee 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetGroup.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ConstraintWidgetGroup.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ConstraintWidgetGroup;
 .super Ljava/lang/Object;
+.source "ConstraintWidgetGroup.java"
 
 
 # instance fields
@@ -382,17 +383,16 @@
 
     iget-object v3, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_1
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     iget-object v3, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_1
+    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_2
+    :goto_1
     if-eqz v3, :cond_5
 
     iget-object v4, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
@@ -424,7 +424,7 @@
 
     add-int/2addr v3, v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object v4, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mType:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -437,12 +437,12 @@
 
     iget v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mX:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     const/4 v3, 0x0
 
-    :goto_3
+    :goto_2
     if-eqz v0, :cond_6
 
     iget-object v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -453,7 +453,7 @@
 
     sub-int/2addr v3, v0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     iget-object v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -470,7 +470,7 @@
 
     add-int/2addr v3, v0
 
-    :goto_4
+    :goto_3
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
     move-result v0
@@ -538,17 +538,16 @@
 
     iget-object v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_5
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_a
     iget-object v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_5
+    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_6
+    :goto_4
     if-eqz v0, :cond_d
 
     iget-object v4, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
@@ -580,7 +579,7 @@
 
     add-int/2addr v3, v0
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_c
     iget-object v4, v0, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mType:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -594,7 +593,7 @@
     iget v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mY:I
 
     :cond_d
-    :goto_7
+    :goto_5
     if-eqz v1, :cond_e
 
     iget-object v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -605,7 +604,7 @@
 
     sub-int/2addr v3, v0
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_e
     iget-object v0, p1, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -622,7 +621,7 @@
 
     add-int/2addr v3, v0
 
-    :goto_8
+    :goto_6
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline$1.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline$1.smali
index 5c511a5a75..f7db60144c 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline$1.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/constraintlayout/solver/widgets/Guideline$1;
 .super Ljava/lang/Object;
+.source "Guideline.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline.smali
index f1d679dbf0..e3d6bc9130 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Guideline.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/Guideline;
 .super Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+.source "Guideline.java"
 
 
 # static fields
@@ -819,19 +820,15 @@
 
     iget v3, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mHeadSize:I
 
-    mul-int/lit8 v3, v3, 0x2
+    mul-int/lit8 v4, v3, 0x2
 
-    sub-int/2addr v2, v3
+    sub-int/2addr v2, v4
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mHeadSize:I
+    mul-int/lit8 v4, v3, 0x2
 
     mul-int/lit8 v3, v3, 0x2
 
-    iget v4, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mHeadSize:I
-
-    mul-int/lit8 v4, v4, 0x2
-
-    invoke-virtual {v0, v1, v2, v3, v4}, Landroidx/constraintlayout/solver/widgets/Rectangle;->setBounds(IIII)V
+    invoke-virtual {v0, v1, v2, v4, v3}, Landroidx/constraintlayout/solver/widgets/Rectangle;->setBounds(IIII)V
 
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/Guideline;->getOrientation()I
 
@@ -859,15 +856,11 @@
 
     sub-int/2addr v2, v3
 
-    iget v3, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mHeadSize:I
+    mul-int/lit8 v4, v3, 0x2
 
     mul-int/lit8 v3, v3, 0x2
 
-    iget v4, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mHeadSize:I
-
-    mul-int/lit8 v4, v4, 0x2
-
-    invoke-virtual {v0, v1, v2, v3, v4}, Landroidx/constraintlayout/solver/widgets/Rectangle;->setBounds(IIII)V
+    invoke-virtual {v0, v1, v2, v4, v3}, Landroidx/constraintlayout/solver/widgets/Rectangle;->setBounds(IIII)V
 
     :cond_0
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mHead:Landroidx/constraintlayout/solver/widgets/Rectangle;
@@ -1299,17 +1292,16 @@
 
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_0
     iput-object p1, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    :goto_1
+    :goto_0
     iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mAnchors:Ljava/util/ArrayList;
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -1322,7 +1314,7 @@
 
     const/4 v0, 0x0
 
-    :goto_2
+    :goto_1
     if-ge v0, p1, :cond_2
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/Guideline;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -1333,7 +1325,7 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     return-void
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Helper.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Helper.smali
index bda75a3aaa..a2855565ba 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Helper.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Helper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/Helper;
 .super Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+.source "Helper.java"
 
 
 # instance fields
@@ -30,7 +31,7 @@
 
 # virtual methods
 .method public add(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
-    .locals 2
+    .locals 3
 
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/Helper;->mWidgetsCount:I
 
@@ -38,19 +39,15 @@
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/Helper;->mWidgets:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-le v0, v1, :cond_0
+    if-le v0, v2, :cond_0
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/Helper;->mWidgets:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    array-length v0, v1
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/Helper;->mWidgets:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+    mul-int/lit8 v0, v0, 0x2
 
-    array-length v1, v1
-
-    mul-int/lit8 v1, v1, 0x2
-
-    invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -65,11 +62,9 @@
 
     aput-object p1, v0, v1
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/Helper;->mWidgetsCount:I
+    add-int/lit8 v1, v1, 0x1
 
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Landroidx/constraintlayout/solver/widgets/Helper;->mWidgetsCount:I
+    iput v1, p0, Landroidx/constraintlayout/solver/widgets/Helper;->mWidgetsCount:I
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Optimizer.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Optimizer.smali
index 6a526f58a8..2f2a37b0e7 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Optimizer.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Optimizer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/Optimizer;
 .super Ljava/lang/Object;
+.source "Optimizer.java"
 
 
 # static fields
@@ -50,7 +51,7 @@
 .end method
 
 .method static analyze(ILandroidx/constraintlayout/solver/widgets/ConstraintWidget;)V
-    .locals 17
+    .locals 16
 
     move-object/from16 v0, p1
 
@@ -132,11 +133,11 @@
 
     const/4 v15, 0x2
 
-    if-eq v10, v12, :cond_11
+    if-eq v10, v12, :cond_13
 
     iget v10, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
 
-    if-eq v10, v12, :cond_11
+    if-eq v10, v12, :cond_13
 
     iget-object v10, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
@@ -144,7 +145,7 @@
 
     sget-object v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-eq v10, v7, :cond_8
+    if-eq v10, v7, :cond_b
 
     if-eqz v9, :cond_2
 
@@ -157,7 +158,7 @@
     goto/16 :goto_2
 
     :cond_2
-    if-eqz v9, :cond_11
+    if-eqz v9, :cond_13
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
@@ -171,24 +172,7 @@
 
     iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v9, :cond_3
-
-    iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-nez v9, :cond_3
-
-    if-eqz v6, :cond_a
-
-    goto/16 :goto_3
-
-    :cond_3
-    iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-eqz v9, :cond_4
+    if-nez v9, :cond_4
 
     iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -196,41 +180,93 @@
 
     if-nez v9, :cond_4
 
-    if-eqz v6, :cond_a
+    if-eqz v6, :cond_3
 
-    goto :goto_3
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v7
+
+    invoke-virtual {v3, v1, v8, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+
+    goto/16 :goto_3
+
+    :cond_3
+    invoke-virtual {v3, v1, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    goto/16 :goto_3
 
     :cond_4
     iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v9, :cond_5
+    if-eqz v9, :cond_6
 
     iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v9, :cond_5
+    if-nez v9, :cond_6
 
-    if-eqz v6, :cond_e
+    if-eqz v6, :cond_5
 
-    goto/16 :goto_4
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v7
+
+    invoke-virtual {v3, v1, v8, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+
+    goto/16 :goto_3
 
     :cond_5
+    invoke-virtual {v3, v1, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    goto/16 :goto_3
+
+    :cond_6
     iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v9, :cond_11
+    if-nez v9, :cond_8
 
     iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v9, :cond_11
+    if-eqz v9, :cond_8
 
-    if-eqz v6, :cond_6
+    if-eqz v6, :cond_7
+
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v7
+
+    invoke-virtual {v1, v3, v14, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+
+    goto/16 :goto_3
+
+    :cond_7
+    neg-int v7, v7
+
+    invoke-virtual {v1, v3, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    goto/16 :goto_3
+
+    :cond_8
+    iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v9, :cond_13
+
+    iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v9, :cond_13
+
+    if-eqz v6, :cond_9
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -244,12 +280,12 @@
 
     invoke-virtual {v9, v3}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->addDependent(Landroidx/constraintlayout/solver/widgets/ResolutionNode;)V
 
-    :cond_6
+    :cond_9
     iget v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatio:F
 
     cmpl-float v9, v9, v13
 
-    if-nez v9, :cond_7
+    if-nez v9, :cond_a
 
     invoke-virtual {v1, v11}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
@@ -259,9 +295,9 @@
 
     invoke-virtual {v3, v1, v13}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setOpposite(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
-    :cond_7
+    :cond_a
     invoke-virtual {v1, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
     invoke-virtual {v3, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
@@ -278,122 +314,87 @@
 
     invoke-virtual {v0, v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidth(I)V
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
-    :cond_8
+    :cond_b
     :goto_2
     iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v7, :cond_b
+    if-nez v7, :cond_d
 
     iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v7, :cond_b
+    if-nez v7, :cond_d
 
     invoke-virtual {v1, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
     invoke-virtual {v3, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
-    if-eqz v6, :cond_9
+    if-eqz v6, :cond_c
 
-    :goto_3
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
     move-result-object v7
 
     invoke-virtual {v3, v1, v8, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
-    :cond_9
+    :cond_c
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
     move-result v7
 
-    :cond_a
     invoke-virtual {v3, v1, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
-    :cond_b
+    :cond_d
     iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v7, :cond_c
-
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-nez v7, :cond_c
-
-    invoke-virtual {v1, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
-
-    invoke-virtual {v3, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
-
-    if-eqz v6, :cond_9
-
-    goto :goto_3
-
-    :cond_c
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-nez v7, :cond_f
-
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
     if-eqz v7, :cond_f
 
+    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-nez v7, :cond_f
+
     invoke-virtual {v1, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
     invoke-virtual {v3, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
-    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
+    if-eqz v6, :cond_e
 
-    move-result v7
-
-    neg-int v7, v7
-
-    invoke-virtual {v1, v3, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
-
-    if-eqz v6, :cond_d
-
-    :goto_4
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
     move-result-object v7
 
-    invoke-virtual {v1, v3, v14, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+    invoke-virtual {v3, v1, v8, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
 
-    goto :goto_5
+    goto/16 :goto_3
 
-    :cond_d
+    :cond_e
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
     move-result v7
 
-    :cond_e
-    neg-int v7, v7
+    invoke-virtual {v3, v1, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
 
-    invoke-virtual {v1, v3, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
-
-    goto :goto_5
+    goto :goto_3
 
     :cond_f
     iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v7, :cond_11
+    if-nez v7, :cond_11
 
     iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -401,11 +402,57 @@
 
     if-eqz v7, :cond_11
 
+    invoke-virtual {v1, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
+
+    invoke-virtual {v3, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
+
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
+
+    move-result v7
+
+    neg-int v7, v7
+
+    invoke-virtual {v1, v3, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    if-eqz v6, :cond_10
+
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v7
+
+    invoke-virtual {v1, v3, v14, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+
+    goto :goto_3
+
+    :cond_10
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
+
+    move-result v7
+
+    neg-int v7, v7
+
+    invoke-virtual {v1, v3, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    goto :goto_3
+
+    :cond_11
+    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mLeft:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v7, :cond_13
+
+    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mRight:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v7, :cond_13
+
     invoke-virtual {v1, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
     invoke-virtual {v3, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
-    if-eqz v6, :cond_10
+    if-eqz v6, :cond_12
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -431,9 +478,9 @@
 
     invoke-virtual {v3, v1, v8, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setOpposite(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
 
-    goto :goto_5
+    goto :goto_3
 
-    :cond_10
+    :cond_12
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
     move-result v7
@@ -452,58 +499,58 @@
 
     invoke-virtual {v3, v1, v7}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setOpposite(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
 
-    :cond_11
-    :goto_5
+    :cond_13
+    :goto_3
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
     aget-object v1, v1, v8
 
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v1, v3, :cond_12
+    if-ne v1, v3, :cond_14
 
     invoke-static {v0, v8}, Landroidx/constraintlayout/solver/widgets/Optimizer;->optimizableMatchConstraint(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;I)Z
 
     move-result v1
 
-    if-eqz v1, :cond_12
+    if-eqz v1, :cond_14
 
-    const/16 v16, 0x1
+    const/4 v1, 0x1
 
-    goto :goto_6
+    goto :goto_4
 
-    :cond_12
-    const/16 v16, 0x0
+    :cond_14
+    const/4 v1, 0x0
 
-    :goto_6
-    iget v1, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
+    :goto_4
+    iget v3, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
 
-    if-eq v1, v12, :cond_24
+    if-eq v3, v12, :cond_26
 
-    iget v1, v4, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
+    iget v3, v4, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
 
-    if-eq v1, v12, :cond_24
+    if-eq v3, v12, :cond_26
 
-    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    aget-object v1, v1, v8
+    aget-object v3, v3, v8
 
-    sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    sget-object v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-eq v1, v3, :cond_1c
+    if-eq v3, v7, :cond_1e
 
-    if-eqz v16, :cond_13
+    if-eqz v1, :cond_15
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
-    move-result v1
+    move-result v3
 
-    if-ne v1, v5, :cond_13
+    if-ne v3, v5, :cond_15
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
-    :cond_13
-    if-eqz v16, :cond_24
+    :cond_15
+    if-eqz v1, :cond_26
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
@@ -517,35 +564,7 @@
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v3, :cond_15
-
-    iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-nez v3, :cond_15
-
-    if-eqz v6, :cond_14
-
-    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
-    move-result-object v0
-
-    invoke-virtual {v4, v2, v8, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
-
-    return-void
-
-    :cond_14
-    invoke-virtual {v4, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
-
-    return-void
-
-    :cond_15
-    iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-eqz v3, :cond_17
+    if-nez v3, :cond_17
 
     iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -573,13 +592,13 @@
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v3, :cond_19
+    if-eqz v3, :cond_19
 
     iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v3, :cond_19
+    if-nez v3, :cond_19
 
     if-eqz v6, :cond_18
 
@@ -587,31 +606,59 @@
 
     move-result-object v0
 
+    invoke-virtual {v4, v2, v8, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+
+    return-void
+
+    :cond_18
+    invoke-virtual {v4, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    return-void
+
+    :cond_19
+    iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-nez v3, :cond_1b
+
+    iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v3, :cond_1b
+
+    if-eqz v6, :cond_1a
+
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v0
+
     invoke-virtual {v2, v4, v14, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
 
     return-void
 
-    :cond_18
+    :cond_1a
     neg-int v0, v1
 
     invoke-virtual {v2, v4, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
 
     return-void
 
-    :cond_19
+    :cond_1b
     iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v3, :cond_24
+    if-eqz v3, :cond_26
 
     iget-object v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v3, :cond_24
+    if-eqz v3, :cond_26
 
-    if-eqz v6, :cond_1a
+    if-eqz v6, :cond_1c
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -625,12 +672,12 @@
 
     invoke-virtual {v3, v4}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->addDependent(Landroidx/constraintlayout/solver/widgets/ResolutionNode;)V
 
-    :cond_1a
+    :cond_1c
     iget v3, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatio:F
 
     cmpl-float v3, v3, v13
 
-    if-nez v3, :cond_1b
+    if-nez v3, :cond_1d
 
     invoke-virtual {v2, v11}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
@@ -642,7 +689,7 @@
 
     return-void
 
-    :cond_1b
+    :cond_1d
     invoke-virtual {v2, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
     invoke-virtual {v4, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
@@ -661,7 +708,7 @@
 
     iget v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
 
-    if-lez v1, :cond_24
+    if-lez v1, :cond_26
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -673,27 +720,27 @@
 
     invoke-virtual {v1, v8, v2, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(ILandroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
 
-    goto/16 :goto_c
+    goto/16 :goto_a
 
-    :cond_1c
-    :goto_7
+    :cond_1e
+    :goto_5
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v1, :cond_1e
+    if-nez v1, :cond_20
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v1, :cond_1e
+    if-nez v1, :cond_20
 
     invoke-virtual {v2, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
     invoke-virtual {v4, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
-    if-eqz v6, :cond_1d
+    if-eqz v6, :cond_1f
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -701,21 +748,21 @@
 
     invoke-virtual {v4, v2, v8, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
 
-    goto :goto_8
+    goto :goto_6
 
-    :cond_1d
+    :cond_1f
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
     move-result v1
 
     invoke-virtual {v4, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
 
-    :goto_8
+    :goto_6
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v1, :cond_24
+    if-eqz v1, :cond_26
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -739,69 +786,18 @@
 
     return-void
 
-    :cond_1e
-    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-eqz v1, :cond_20
-
-    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-nez v1, :cond_20
-
-    invoke-virtual {v2, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
-
-    invoke-virtual {v4, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
-
-    if-eqz v6, :cond_1f
-
-    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
-    move-result-object v1
-
-    invoke-virtual {v4, v2, v8, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
-
-    goto :goto_9
-
-    :cond_1f
-    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
-
-    move-result v1
-
-    invoke-virtual {v4, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
-
-    :goto_9
-    iget v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
-
-    if-lez v1, :cond_24
-
-    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    move-result-object v1
-
-    iget v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
-
-    invoke-virtual {v1, v8, v2, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(ILandroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
-
-    return-void
-
     :cond_20
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-nez v1, :cond_22
+    if-eqz v1, :cond_22
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v1, :cond_22
+    if-nez v1, :cond_22
 
     invoke-virtual {v2, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
@@ -813,23 +809,21 @@
 
     move-result-object v1
 
-    invoke-virtual {v2, v4, v14, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+    invoke-virtual {v4, v2, v8, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
 
-    goto :goto_a
+    goto :goto_7
 
     :cond_21
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
     move-result v1
 
-    neg-int v1, v1
+    invoke-virtual {v4, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
 
-    invoke-virtual {v2, v4, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
-
-    :goto_a
+    :goto_7
     iget v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
 
-    if-lez v1, :cond_24
+    if-lez v1, :cond_26
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -848,7 +842,7 @@
 
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    if-eqz v1, :cond_24
+    if-nez v1, :cond_24
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -856,11 +850,64 @@
 
     if-eqz v1, :cond_24
 
+    invoke-virtual {v2, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
+
+    invoke-virtual {v4, v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
+
+    if-eqz v6, :cond_23
+
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v1
+
+    invoke-virtual {v2, v4, v14, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;ILandroidx/constraintlayout/solver/widgets/ResolutionDimension;)V
+
+    goto :goto_8
+
+    :cond_23
+    invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
+
+    move-result v1
+
+    neg-int v1, v1
+
+    invoke-virtual {v2, v4, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    :goto_8
+    iget v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
+
+    if-lez v1, :cond_26
+
+    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v1
+
+    iget v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
+
+    invoke-virtual {v1, v8, v2, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(ILandroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
+
+    return-void
+
+    :cond_24
+    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mTop:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v1, :cond_26
+
+    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBottom:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v1, :cond_26
+
     invoke-virtual {v2, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
     invoke-virtual {v4, v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setType(I)V
 
-    if-eqz v6, :cond_23
+    if-eqz v6, :cond_25
 
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -886,9 +933,9 @@
 
     invoke-virtual {v1, v4}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->addDependent(Landroidx/constraintlayout/solver/widgets/ResolutionNode;)V
 
-    goto :goto_b
+    goto :goto_9
 
-    :cond_23
+    :cond_25
     invoke-virtual/range {p1 .. p1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
     move-result v1
@@ -907,10 +954,10 @@
 
     invoke-virtual {v4, v2, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->setOpposite(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
 
-    :goto_b
+    :goto_9
     iget v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaselineDistance:I
 
-    if-lez v1, :cond_24
+    if-lez v1, :cond_26
 
     iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mBaseline:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -922,13 +969,15 @@
 
     invoke-virtual {v1, v8, v2, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dependsOn(ILandroidx/constraintlayout/solver/widgets/ResolutionAnchor;I)V
 
-    :cond_24
-    :goto_c
+    return-void
+
+    :cond_26
+    :goto_a
     return-void
 .end method
 
 .method static applyChainOptimized(Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;Landroidx/constraintlayout/solver/LinearSystem;IILandroidx/constraintlayout/solver/widgets/ChainHead;)Z
-    .locals 22
+    .locals 23
 
     move-object/from16 v0, p1
 
@@ -984,15 +1033,14 @@
 
     if-ne v7, v8, :cond_2
 
-    :goto_2
     const/4 v7, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_2
     const/4 v7, 0x0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_3
     iget v11, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
@@ -1001,530 +1049,86 @@
 
     const/4 v11, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/4 v11, 0x0
 
-    :goto_3
+    :goto_2
     iget v12, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
 
     if-ne v12, v10, :cond_5
 
     const/4 v12, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const/4 v12, 0x0
 
-    :goto_4
+    :goto_3
     iget v7, v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I
 
-    if-ne v7, v8, :cond_2
+    if-ne v7, v8, :cond_6
 
-    goto :goto_2
+    const/4 v7, 0x1
 
-    :goto_5
+    goto :goto_4
+
+    :cond_6
+    const/4 v7, 0x0
+
+    :goto_4
     move-object v14, v3
 
-    const/4 v8, 0x0
-
     const/4 v10, 0x0
 
     const/4 v13, 0x0
 
     const/4 v15, 0x0
 
-    const/16 v17, 0x0
-
-    :goto_6
-    const/16 v9, 0x8
-
-    if-nez v13, :cond_14
-
-    move/from16 v18, v13
-
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
-
-    move-result v13
-
-    if-eq v13, v9, :cond_9
-
-    add-int/lit8 v10, v10, 0x1
-
-    if-nez v1, :cond_6
-
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
-
-    move-result v13
-
-    :goto_7
-    int-to-float v13, v13
-
-    add-float/2addr v15, v13
-
-    goto :goto_8
-
-    :cond_6
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
-
-    move-result v13
-
-    goto :goto_7
-
-    :goto_8
-    if-eq v14, v5, :cond_7
-
-    iget-object v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v13, v13, p3
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
-
-    move-result v13
-
-    int-to-float v13, v13
-
-    add-float/2addr v15, v13
-
-    :cond_7
-    if-eq v14, v6, :cond_8
-
-    iget-object v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    add-int/lit8 v19, p3, 0x1
-
-    aget-object v13, v13, v19
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
-
-    move-result v13
-
-    int-to-float v13, v13
-
-    add-float/2addr v15, v13
-
-    :cond_8
-    iget-object v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v13, v13, p3
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
-
-    move-result v13
-
-    int-to-float v13, v13
-
-    add-float v17, v17, v13
-
-    iget-object v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    add-int/lit8 v19, p3, 0x1
-
-    aget-object v13, v13, v19
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
-
-    move-result v13
-
-    int-to-float v13, v13
-
-    add-float v17, v17, v13
-
-    :cond_9
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
-
-    move-result v13
-
-    if-eq v13, v9, :cond_10
-
-    iget-object v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
-
-    aget-object v9, v9, v1
-
-    sget-object v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
-
-    if-ne v9, v13, :cond_10
-
-    add-int/lit8 v8, v8, 0x1
-
-    if-nez v1, :cond_c
-
-    iget v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I
-
-    if-eqz v9, :cond_a
-
-    const/4 v9, 0x0
-
-    return v9
-
-    :cond_a
-    const/4 v9, 0x0
-
-    iget v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I
-
-    if-nez v13, :cond_b
-
-    iget v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I
-
-    if-eqz v13, :cond_e
-
-    :cond_b
-    return v9
-
-    :cond_c
-    const/4 v9, 0x0
-
-    iget v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I
-
-    if-eqz v13, :cond_d
-
-    return v9
-
-    :cond_d
-    iget v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I
-
-    if-nez v13, :cond_f
-
-    iget v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxHeight:I
-
-    if-eqz v13, :cond_e
-
-    goto :goto_9
-
-    :cond_e
-    iget v13, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatio:F
-
     const/16 v16, 0x0
 
-    cmpl-float v13, v13, v16
+    const/16 v17, 0x0
 
-    if-eqz v13, :cond_10
+    :goto_5
+    const/16 v8, 0x8
 
-    :cond_f
-    :goto_9
-    return v9
+    if-nez v13, :cond_16
 
-    :cond_10
-    iget-object v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    add-int/lit8 v13, p3, 0x1
-
-    aget-object v9, v9, v13
-
-    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-eqz v9, :cond_12
-
-    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    iget-object v13, v9, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v13, v13, p3
-
-    iget-object v13, v13, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    if-eqz v13, :cond_12
-
-    iget-object v13, v9, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v13, v13, p3
-
-    iget-object v13, v13, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    iget-object v13, v13, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    if-eq v13, v14, :cond_11
-
-    goto :goto_a
-
-    :cond_11
-    move-object/from16 v20, v9
-
-    goto :goto_b
-
-    :cond_12
-    :goto_a
-    const/16 v20, 0x0
-
-    :goto_b
-    if-eqz v20, :cond_13
-
-    move/from16 v13, v18
-
-    move-object/from16 v14, v20
-
-    goto/16 :goto_6
-
-    :cond_13
-    const/4 v13, 0x1
-
-    goto/16 :goto_6
-
-    :cond_14
-    iget-object v13, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v13, v13, p3
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    move-result-object v13
-
-    iget-object v9, v4, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    add-int/lit8 v18, p3, 0x1
-
-    aget-object v9, v9, v18
-
-    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    move-result-object v9
-
-    move-object/from16 v21, v3
-
-    iget-object v3, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    if-eqz v3, :cond_3c
-
-    iget-object v3, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    if-nez v3, :cond_15
-
-    goto/16 :goto_24
-
-    :cond_15
-    iget-object v3, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
-
-    const/4 v0, 0x1
-
-    if-ne v3, v0, :cond_3b
-
-    iget-object v3, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
-
-    if-eq v3, v0, :cond_16
-
-    goto/16 :goto_23
-
-    :cond_16
-    if-lez v8, :cond_17
-
-    if-eq v8, v10, :cond_17
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_17
-    if-nez v7, :cond_19
-
-    if-nez v11, :cond_19
-
-    if-eqz v12, :cond_18
-
-    goto :goto_c
-
-    :cond_18
-    const/4 v0, 0x0
-
-    goto :goto_e
-
-    :cond_19
-    :goto_c
-    if-eqz v5, :cond_1a
-
-    iget-object v0, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v0, v0, p3
-
-    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
-
-    move-result v0
-
-    int-to-float v0, v0
-
-    goto :goto_d
-
-    :cond_1a
-    const/4 v0, 0x0
-
-    :goto_d
-    if-eqz v6, :cond_1b
-
-    iget-object v3, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v3, v3, v18
-
-    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
-
-    move-result v3
-
-    int-to-float v3, v3
-
-    add-float/2addr v0, v3
-
-    :cond_1b
-    :goto_e
-    iget-object v3, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
-
-    iget-object v6, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget v6, v6, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
-
-    cmpg-float v9, v3, v6
-
-    if-gez v9, :cond_1c
-
-    sub-float/2addr v6, v3
-
-    :goto_f
-    sub-float/2addr v6, v15
-
-    goto :goto_10
-
-    :cond_1c
-    sub-float v6, v3, v6
-
-    goto :goto_f
-
-    :goto_10
-    const-wide/16 v19, 0x1
-
-    if-lez v8, :cond_25
-
-    if-ne v8, v10, :cond_25
-
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getParent()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1d
-
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getParent()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    move-result-object v0
-
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
-
-    aget-object v0, v0, v1
-
-    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
-
-    if-ne v0, v5, :cond_1d
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_1d
-    add-float/2addr v6, v15
-
-    sub-float v6, v6, v17
-
-    move-object/from16 v0, v21
-
-    :goto_11
-    if-eqz v0, :cond_24
-
-    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
-    if-eqz v5, :cond_1e
-
-    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
-    iget-wide v9, v5, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
-
-    sub-long v9, v9, v19
-
-    iput-wide v9, v5, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
-
-    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
-    iget-wide v9, v5, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
-
-    add-long v9, v9, v19
-
-    iput-wide v9, v5, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
-
-    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
-
-    iget-wide v9, v5, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
-
-    add-long v9, v9, v19
-
-    iput-wide v9, v5, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
-
-    :cond_1e
-    iget-object v5, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    aget-object v5, v5, v1
-
-    if-nez v5, :cond_20
-
-    if-ne v0, v4, :cond_1f
-
-    goto :goto_12
-
-    :cond_1f
-    move-object/from16 v9, p1
-
-    goto :goto_14
-
-    :cond_20
-    :goto_12
-    int-to-float v7, v8
-
-    div-float v7, v6, v7
-
-    const/4 v9, 0x0
-
-    cmpl-float v10, v2, v9
-
-    if-lez v10, :cond_22
-
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
-
-    aget v7, v7, v1
-
-    const/high16 v9, -0x40800000    # -1.0f
-
-    cmpl-float v7, v7, v9
-
-    if-nez v7, :cond_21
-
-    const/4 v7, 0x0
-
-    goto :goto_13
-
-    :cond_21
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
-
-    aget v7, v7, v1
-
-    mul-float v7, v7, v6
-
-    div-float/2addr v7, v2
-
-    :cond_22
-    :goto_13
-    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v9
 
-    const/16 v10, 0x8
+    if-eq v9, v8, :cond_a
 
-    if-ne v9, v10, :cond_23
+    add-int/lit8 v15, v15, 0x1
 
-    const/4 v7, 0x0
+    if-nez v1, :cond_7
 
-    :cond_23
-    iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
+
+    move-result v9
+
+    int-to-float v9, v9
+
+    add-float v16, v16, v9
+
+    goto :goto_6
+
+    :cond_7
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
+
+    move-result v9
+
+    int-to-float v9, v9
+
+    add-float v16, v16, v9
+
+    :goto_6
+    if-eq v14, v5, :cond_8
+
+    iget-object v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v9, v9, p3
 
@@ -1534,9 +1138,189 @@
 
     int-to-float v9, v9
 
-    add-float/2addr v3, v9
+    add-float v16, v16, v9
 
-    iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_8
+    if-eq v14, v6, :cond_9
+
+    iget-object v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    add-int/lit8 v19, p3, 0x1
+
+    aget-object v9, v9, v19
+
+    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v9
+
+    int-to-float v9, v9
+
+    add-float v16, v16, v9
+
+    :cond_9
+    iget-object v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v9, v9, p3
+
+    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v9
+
+    int-to-float v9, v9
+
+    add-float v17, v17, v9
+
+    iget-object v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    add-int/lit8 v19, p3, 0x1
+
+    aget-object v9, v9, v19
+
+    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v9
+
+    int-to-float v9, v9
+
+    add-float v17, v17, v9
+
+    :cond_a
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+
+    move-result v9
+
+    if-eq v9, v8, :cond_11
+
+    iget-object v8, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+
+    aget-object v8, v8, v1
+
+    sget-object v9, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+
+    if-ne v8, v9, :cond_11
+
+    add-int/lit8 v10, v10, 0x1
+
+    if-nez v1, :cond_d
+
+    iget v8, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I
+
+    if-eqz v8, :cond_b
+
+    const/4 v8, 0x0
+
+    return v8
+
+    :cond_b
+    const/4 v8, 0x0
+
+    iget v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I
+
+    if-nez v9, :cond_c
+
+    iget v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I
+
+    if-eqz v9, :cond_f
+
+    :cond_c
+    return v8
+
+    :cond_d
+    const/4 v8, 0x0
+
+    iget v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I
+
+    if-eqz v9, :cond_e
+
+    return v8
+
+    :cond_e
+    iget v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I
+
+    if-nez v9, :cond_10
+
+    iget v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mMatchConstraintMaxHeight:I
+
+    if-eqz v9, :cond_f
+
+    goto :goto_7
+
+    :cond_f
+    iget v9, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mDimensionRatio:F
+
+    const/16 v18, 0x0
+
+    cmpl-float v9, v9, v18
+
+    if-eqz v9, :cond_11
+
+    return v8
+
+    :cond_10
+    :goto_7
+    return v8
+
+    :cond_11
+    iget-object v8, v14, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    add-int/lit8 v9, p3, 0x1
+
+    aget-object v8, v8, v9
+
+    iget-object v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v8, :cond_14
+
+    iget-object v8, v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    iget-object v9, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v9, v9, p3
+
+    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    if-eqz v9, :cond_13
+
+    iget-object v9, v8, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v9, v9, p3
+
+    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mTarget:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    iget-object v9, v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    if-eq v9, v14, :cond_12
+
+    goto :goto_8
+
+    :cond_12
+    move-object/from16 v19, v8
+
+    goto :goto_9
+
+    :cond_13
+    :goto_8
+    const/16 v19, 0x0
+
+    goto :goto_9
+
+    :cond_14
+    const/16 v19, 0x0
+
+    :goto_9
+    if-eqz v19, :cond_15
+
+    move-object/from16 v14, v19
+
+    goto/16 :goto_5
+
+    :cond_15
+    const/4 v13, 0x1
+
+    goto/16 :goto_5
+
+    :cond_16
+    iget-object v9, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v9, v9, p3
 
@@ -1544,76 +1328,338 @@
 
     move-result-object v9
 
-    iget-object v10, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v13, v4, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    invoke-virtual {v9, v10, v3}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+    add-int/lit8 v19, p3, 0x1
 
-    iget-object v9, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    aget-object v13, v13, v19
 
-    aget-object v9, v9, v18
+    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    move-result-object v13
 
-    move-result-object v9
+    iget-object v8, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v10, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    if-eqz v8, :cond_41
 
-    add-float/2addr v3, v7
+    iget-object v8, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    invoke-virtual {v9, v10, v3}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+    if-nez v8, :cond_17
 
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    goto/16 :goto_1c
 
-    aget-object v7, v7, p3
+    :cond_17
+    iget-object v8, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget v8, v8, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
-    move-result-object v7
+    move-object/from16 v20, v3
 
-    move-object/from16 v9, p1
+    const/4 v3, 0x1
 
-    invoke-virtual {v7, v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+    if-ne v8, v3, :cond_40
 
-    iget-object v7, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    iget-object v8, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    aget-object v7, v7, v18
+    iget v8, v8, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
-    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    if-eq v8, v3, :cond_18
 
-    move-result-object v7
+    goto/16 :goto_1b
 
-    invoke-virtual {v7, v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+    :cond_18
+    if-lez v10, :cond_19
 
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-eq v10, v15, :cond_19
 
-    aget-object v0, v0, v18
+    const/4 v3, 0x0
 
-    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+    return v3
 
-    move-result v0
+    :cond_19
+    if-nez v7, :cond_1b
 
-    int-to-float v0, v0
+    if-nez v11, :cond_1b
 
-    add-float/2addr v3, v0
+    if-eqz v12, :cond_1a
 
-    :goto_14
-    move-object v0, v5
+    goto :goto_a
 
-    goto/16 :goto_11
+    :cond_1a
+    const/4 v8, 0x0
+
+    goto :goto_c
+
+    :cond_1b
+    :goto_a
+    if-eqz v5, :cond_1c
+
+    iget-object v3, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v3, v3, p3
+
+    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v3
+
+    int-to-float v8, v3
+
+    goto :goto_b
+
+    :cond_1c
+    const/4 v8, 0x0
+
+    :goto_b
+    if-eqz v6, :cond_1d
+
+    iget-object v3, v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v3, v3, v19
+
+    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v3
+
+    int-to-float v3, v3
+
+    add-float/2addr v8, v3
+
+    :cond_1d
+    :goto_c
+    iget-object v3, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    iget v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
+
+    iget-object v6, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    iget v6, v6, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
+
+    cmpg-float v13, v3, v6
+
+    if-gez v13, :cond_1e
+
+    sub-float/2addr v6, v3
+
+    sub-float v6, v6, v16
+
+    goto :goto_d
+
+    :cond_1e
+    sub-float v6, v3, v6
+
+    sub-float v6, v6, v16
+
+    :goto_d
+    const-wide/16 v21, 0x1
+
+    if-lez v10, :cond_27
+
+    if-ne v10, v15, :cond_27
+
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getParent()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_1f
+
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getParent()Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    move-result-object v5
+
+    iget-object v5, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+
+    aget-object v5, v5, v1
+
+    sget-object v7, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+
+    if-ne v5, v7, :cond_1f
+
+    const/4 v5, 0x0
+
+    return v5
+
+    :cond_1f
+    add-float v6, v6, v16
+
+    sub-float v6, v6, v17
+
+    move v5, v3
+
+    move-object/from16 v3, v20
+
+    :goto_e
+    if-eqz v3, :cond_26
+
+    sget-object v7, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+
+    if-eqz v7, :cond_20
+
+    sget-object v7, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+
+    iget-wide v11, v7, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+
+    sub-long v11, v11, v21
+
+    iput-wide v11, v7, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+
+    sget-object v7, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+
+    iget-wide v11, v7, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
+
+    add-long v11, v11, v21
+
+    iput-wide v11, v7, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
+
+    sget-object v7, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+
+    iget-wide v11, v7, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
+
+    add-long v11, v11, v21
+
+    iput-wide v11, v7, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
+
+    :cond_20
+    iget-object v7, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+
+    aget-object v7, v7, v1
+
+    if-nez v7, :cond_21
+
+    if-ne v3, v4, :cond_25
+
+    :cond_21
+    int-to-float v8, v10
+
+    div-float v8, v6, v8
+
+    const/4 v11, 0x0
+
+    cmpl-float v12, v2, v11
+
+    if-lez v12, :cond_23
+
+    iget-object v8, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
+
+    aget v8, v8, v1
+
+    const/high16 v11, -0x40800000    # -1.0f
+
+    cmpl-float v8, v8, v11
+
+    if-nez v8, :cond_22
+
+    const/4 v8, 0x0
+
+    goto :goto_f
+
+    :cond_22
+    iget-object v8, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mWeight:[F
+
+    aget v8, v8, v1
+
+    mul-float v8, v8, v6
+
+    div-float/2addr v8, v2
+
+    :cond_23
+    :goto_f
+    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
+
+    move-result v11
+
+    const/16 v12, 0x8
+
+    if-ne v11, v12, :cond_24
+
+    const/4 v8, 0x0
 
     :cond_24
-    const/4 v0, 0x1
+    iget-object v11, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    return v0
+    aget-object v11, v11, p3
+
+    invoke-virtual {v11}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v11
+
+    int-to-float v11, v11
+
+    add-float/2addr v5, v11
+
+    iget-object v11, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v11, v11, p3
+
+    invoke-virtual {v11}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v11
+
+    iget-object v12, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    invoke-virtual {v11, v12, v5}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
+    iget-object v11, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v11, v11, v19
+
+    invoke-virtual {v11}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v11
+
+    iget-object v12, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    add-float/2addr v5, v8
+
+    invoke-virtual {v11, v12, v5}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
+    iget-object v8, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v8, v8, p3
+
+    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v8
+
+    invoke-virtual {v8, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+
+    iget-object v8, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v8, v8, v19
+
+    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v8
+
+    invoke-virtual {v8, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+
+    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v3, v3, v19
+
+    invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v3
+
+    int-to-float v3, v3
+
+    add-float/2addr v5, v3
 
     :cond_25
-    move-object/from16 v9, p1
+    move-object v3, v7
 
+    goto/16 :goto_e
+
+    :cond_26
+    const/4 v3, 0x1
+
+    return v3
+
+    :cond_27
     const/4 v2, 0x0
 
     cmpg-float v2, v6, v2
 
-    if-gez v2, :cond_26
+    if-gez v2, :cond_28
 
     const/4 v7, 0x1
 
@@ -1621,93 +1667,118 @@
 
     const/4 v12, 0x0
 
-    :cond_26
-    if-eqz v7, :cond_2c
+    :cond_28
+    if-eqz v7, :cond_2e
 
-    sub-float/2addr v6, v0
+    sub-float/2addr v6, v8
 
-    move-object/from16 v2, v21
+    move-object/from16 v2, v20
 
     invoke-virtual {v2, v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getBiasPercent(I)F
 
-    move-result v0
+    move-result v5
 
-    mul-float v6, v6, v0
+    mul-float v6, v6, v5
 
     add-float/2addr v3, v6
 
-    :goto_15
-    if-eqz v2, :cond_2b
+    :goto_10
+    if-eqz v2, :cond_2d
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    if-eqz v0, :cond_27
+    if-eqz v5, :cond_29
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    iget-wide v5, v0, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+    iget-wide v6, v5, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
 
-    sub-long v5, v5, v19
+    sub-long v6, v6, v21
 
-    iput-wide v5, v0, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+    iput-wide v6, v5, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    iget-wide v5, v0, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
+    iget-wide v6, v5, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
 
-    add-long v5, v5, v19
+    add-long v6, v6, v21
 
-    iput-wide v5, v0, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
+    iput-wide v6, v5, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
 
-    sget-object v0, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
+    sget-object v5, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    iget-wide v5, v0, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
+    iget-wide v6, v5, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
 
-    add-long v5, v5, v19
+    add-long v6, v6, v21
 
-    iput-wide v5, v0, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
-
-    :cond_27
-    iget-object v0, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
-    aget-object v0, v0, v1
-
-    if-nez v0, :cond_28
-
-    if-ne v2, v4, :cond_2a
-
-    :cond_28
-    if-nez v1, :cond_29
-
-    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
-
-    move-result v5
-
-    :goto_16
-    int-to-float v5, v5
-
-    goto :goto_17
+    iput-wide v6, v5, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
 
     :cond_29
-    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
+    iget-object v5, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
-    move-result v5
+    aget-object v5, v5, v1
 
-    goto :goto_16
+    if-nez v5, :cond_2a
 
-    :goto_17
-    iget-object v6, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    if-ne v2, v4, :cond_2c
 
-    aget-object v6, v6, p3
+    :cond_2a
+    if-nez v1, :cond_2b
 
-    invoke-virtual {v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
     move-result v6
 
     int-to-float v6, v6
 
+    goto :goto_11
+
+    :cond_2b
+    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
+
+    move-result v6
+
+    int-to-float v6, v6
+
+    :goto_11
+    iget-object v7, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v7, v7, p3
+
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
+
+    move-result v7
+
+    int-to-float v7, v7
+
+    add-float/2addr v3, v7
+
+    iget-object v7, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v7, v7, p3
+
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v7
+
+    iget-object v8, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    invoke-virtual {v7, v8, v3}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
+    iget-object v7, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v7, v7, v19
+
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v7
+
+    iget-object v8, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
     add-float/2addr v3, v6
 
+    invoke-virtual {v7, v8, v3}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
     iget-object v6, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     aget-object v6, v6, p3
@@ -1716,47 +1787,21 @@
 
     move-result-object v6
 
-    iget-object v7, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    invoke-virtual {v6, v7, v3}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+    invoke-virtual {v6, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
 
     iget-object v6, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v6, v6, v18
+    aget-object v6, v6, v19
 
     invoke-virtual {v6}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v6
 
-    iget-object v7, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    add-float/2addr v3, v5
-
-    invoke-virtual {v6, v7, v3}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
-
-    iget-object v5, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v5, v5, p3
-
-    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    move-result-object v5
-
-    invoke-virtual {v5, v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
-
-    iget-object v5, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v5, v5, v18
-
-    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    move-result-object v5
-
-    invoke-virtual {v5, v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+    invoke-virtual {v6, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v2, v2, v18
+    aget-object v2, v2, v19
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
@@ -1766,87 +1811,93 @@
 
     add-float/2addr v3, v2
 
-    :cond_2a
-    move-object v2, v0
-
-    goto :goto_15
-
-    :cond_2b
-    const/4 v0, 0x1
-
-    goto/16 :goto_22
-
     :cond_2c
-    move-object/from16 v2, v21
+    move-object v2, v5
 
-    if-nez v11, :cond_2d
-
-    if-eqz v12, :cond_2b
+    goto :goto_10
 
     :cond_2d
-    if-eqz v11, :cond_2e
+    const/4 v0, 0x1
 
-    :goto_18
-    sub-float/2addr v6, v0
-
-    goto :goto_19
+    goto/16 :goto_1a
 
     :cond_2e
+    move-object/from16 v2, v20
+
+    if-nez v11, :cond_30
+
     if-eqz v12, :cond_2f
 
-    goto :goto_18
+    goto :goto_12
 
     :cond_2f
-    :goto_19
-    add-int/lit8 v0, v10, 0x1
+    const/4 v0, 0x1
 
-    int-to-float v0, v0
-
-    div-float v0, v6, v0
-
-    if-eqz v12, :cond_31
-
-    const/4 v7, 0x1
-
-    if-le v10, v7, :cond_30
-
-    add-int/lit8 v0, v10, -0x1
-
-    int-to-float v0, v0
-
-    :goto_1a
-    div-float v0, v6, v0
-
-    goto :goto_1b
+    goto/16 :goto_1a
 
     :cond_30
-    const/high16 v0, 0x40000000    # 2.0f
+    :goto_12
+    if-eqz v11, :cond_31
 
-    goto :goto_1a
+    sub-float/2addr v6, v8
+
+    goto :goto_13
 
     :cond_31
-    :goto_1b
+    if-eqz v12, :cond_32
+
+    sub-float/2addr v6, v8
+
+    :cond_32
+    :goto_13
+    add-int/lit8 v7, v15, 0x1
+
+    int-to-float v7, v7
+
+    div-float v7, v6, v7
+
+    if-eqz v12, :cond_34
+
+    const/4 v8, 0x1
+
+    if-le v15, v8, :cond_33
+
+    add-int/lit8 v7, v15, -0x1
+
+    int-to-float v7, v7
+
+    div-float v7, v6, v7
+
+    goto :goto_14
+
+    :cond_33
+    const/high16 v7, 0x40000000    # 2.0f
+
+    div-float v7, v6, v7
+
+    :cond_34
+    :goto_14
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v6
 
-    const/16 v7, 0x8
+    const/16 v8, 0x8
 
-    if-eq v6, v7, :cond_32
+    if-eq v6, v8, :cond_35
 
-    add-float v6, v3, v0
+    add-float v6, v3, v7
 
-    goto :goto_1c
+    goto :goto_15
 
-    :cond_32
+    :cond_35
     move v6, v3
 
-    :goto_1c
-    if-eqz v12, :cond_33
+    :goto_15
+    if-eqz v12, :cond_36
 
-    const/4 v7, 0x1
+    const/4 v8, 0x1
 
-    if-le v10, v7, :cond_33
+    if-le v15, v8, :cond_36
 
     iget-object v6, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -1860,10 +1911,10 @@
 
     add-float/2addr v6, v3
 
-    :cond_33
-    if-eqz v11, :cond_34
+    :cond_36
+    if-eqz v11, :cond_37
 
-    if-eqz v5, :cond_34
+    if-eqz v5, :cond_37
 
     iget-object v3, v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -1877,139 +1928,138 @@
 
     add-float/2addr v6, v3
 
-    :cond_34
-    :goto_1d
-    if-eqz v2, :cond_2b
+    :cond_37
+    :goto_16
+    if-eqz v2, :cond_3f
 
     sget-object v3, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    if-eqz v3, :cond_35
+    if-eqz v3, :cond_38
 
     sget-object v3, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    iget-wide v7, v3, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+    iget-wide v10, v3, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
 
-    sub-long v7, v7, v19
+    sub-long v10, v10, v21
 
-    iput-wide v7, v3, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
+    iput-wide v10, v3, Landroidx/constraintlayout/solver/Metrics;->nonresolvedWidgets:J
 
     sget-object v3, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    iget-wide v7, v3, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
+    iget-wide v10, v3, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
 
-    add-long v7, v7, v19
+    add-long v10, v10, v21
 
-    iput-wide v7, v3, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
+    iput-wide v10, v3, Landroidx/constraintlayout/solver/Metrics;->resolvedWidgets:J
 
     sget-object v3, Landroidx/constraintlayout/solver/LinearSystem;->sMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    iget-wide v7, v3, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
+    iget-wide v10, v3, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
 
-    add-long v7, v7, v19
+    add-long v10, v10, v21
 
-    iput-wide v7, v3, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
+    iput-wide v10, v3, Landroidx/constraintlayout/solver/Metrics;->chainConnectionResolved:J
 
-    :cond_35
+    :cond_38
     iget-object v3, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
 
     aget-object v3, v3, v1
 
-    if-nez v3, :cond_37
+    if-nez v3, :cond_3a
 
-    if-ne v2, v4, :cond_36
+    if-ne v2, v4, :cond_39
 
-    goto :goto_1e
+    goto :goto_17
 
-    :cond_36
-    const/16 v7, 0x8
+    :cond_39
+    const/16 v8, 0x8
 
-    goto :goto_21
+    goto :goto_19
 
-    :cond_37
-    :goto_1e
-    if-nez v1, :cond_38
+    :cond_3a
+    :goto_17
+    if-nez v1, :cond_3b
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
-    move-result v7
-
-    :goto_1f
-    int-to-float v7, v7
-
-    goto :goto_20
-
-    :cond_38
-    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
-
-    move-result v7
-
-    goto :goto_1f
-
-    :goto_20
-    if-eq v2, v5, :cond_39
-
-    iget-object v8, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    aget-object v8, v8, p3
-
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
-
     move-result v8
 
     int-to-float v8, v8
 
-    add-float/2addr v6, v8
+    goto :goto_18
 
-    :cond_39
-    iget-object v8, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_3b
+    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
-    aget-object v8, v8, p3
+    move-result v8
 
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    int-to-float v8, v8
 
-    move-result-object v8
+    :goto_18
+    if-eq v2, v5, :cond_3c
 
-    iget-object v10, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v10, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    invoke-virtual {v8, v10, v6}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+    aget-object v10, v10, p3
 
-    iget-object v8, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
-    aget-object v8, v8, v18
+    move-result v10
 
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    int-to-float v10, v10
 
-    move-result-object v8
+    add-float/2addr v6, v10
 
-    iget-object v10, v13, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    :cond_3c
+    iget-object v10, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    add-float v11, v6, v7
+    aget-object v10, v10, p3
 
-    invoke-virtual {v8, v10, v11}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v8, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    move-result-object v10
 
-    aget-object v8, v8, p3
+    iget-object v11, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    invoke-virtual {v10, v11, v6}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
 
-    move-result-object v8
+    iget-object v10, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    invoke-virtual {v8, v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+    aget-object v10, v10, v19
 
-    iget-object v8, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    aget-object v8, v8, v18
+    move-result-object v10
 
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v11, v9, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    move-result-object v8
+    add-float v12, v6, v8
 
-    invoke-virtual {v8, v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+    invoke-virtual {v10, v11, v12}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolve(Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;F)V
+
+    iget-object v10, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v10, v10, p3
+
+    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v10
+
+    invoke-virtual {v10, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
+
+    iget-object v10, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    aget-object v10, v10, v19
+
+    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+
+    move-result-object v10
+
+    invoke-virtual {v10, v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->addResolvedValue(Landroidx/constraintlayout/solver/LinearSystem;)V
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mListAnchors:[Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    aget-object v2, v2, v18
+    aget-object v2, v2, v19
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
 
@@ -2017,39 +2067,47 @@
 
     int-to-float v2, v2
 
-    add-float/2addr v7, v2
+    add-float/2addr v8, v2
 
-    add-float/2addr v6, v7
+    add-float/2addr v6, v8
 
-    if-eqz v3, :cond_36
+    if-eqz v3, :cond_3d
 
     invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v2
 
-    const/16 v7, 0x8
+    const/16 v8, 0x8
 
-    if-eq v2, v7, :cond_3a
+    if-eq v2, v8, :cond_3e
 
-    add-float/2addr v6, v0
+    add-float/2addr v6, v7
 
-    :cond_3a
-    :goto_21
+    goto :goto_19
+
+    :cond_3d
+    const/16 v8, 0x8
+
+    :cond_3e
+    :goto_19
     move-object v2, v3
 
-    goto/16 :goto_1d
+    goto/16 :goto_16
 
-    :goto_22
+    :cond_3f
+    const/4 v0, 0x1
+
+    :goto_1a
     return v0
 
-    :cond_3b
-    :goto_23
+    :cond_40
+    :goto_1b
     const/4 v0, 0x0
 
     return v0
 
-    :cond_3c
-    :goto_24
+    :cond_41
+    :goto_1c
     const/4 v0, 0x0
 
     return v0
@@ -2277,6 +2335,8 @@
 
     if-ne p0, p1, :cond_2
 
+    return v2
+
     :cond_2
     return v2
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Rectangle.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Rectangle.smali
index 8f46a332a3..b258f0fd9d 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Rectangle.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Rectangle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/Rectangle;
 .super Ljava/lang/Object;
+.source "Rectangle.java"
 
 
 # instance fields
@@ -30,8 +31,6 @@
 
     if-lt p1, v0, :cond_0
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Rectangle;->x:I
-
     iget v1, p0, Landroidx/constraintlayout/solver/widgets/Rectangle;->width:I
 
     add-int/2addr v0, v1
@@ -42,8 +41,6 @@
 
     if-lt p2, p1, :cond_0
 
-    iget p1, p0, Landroidx/constraintlayout/solver/widgets/Rectangle;->y:I
-
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/Rectangle;->height:I
 
     add-int/2addr p1, v0
@@ -131,10 +128,6 @@
 
     if-lt v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Rectangle;->x:I
-
-    iget v1, p1, Landroidx/constraintlayout/solver/widgets/Rectangle;->x:I
-
     iget v2, p1, Landroidx/constraintlayout/solver/widgets/Rectangle;->width:I
 
     add-int/2addr v1, v2
@@ -147,10 +140,6 @@
 
     if-lt v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/constraintlayout/solver/widgets/Rectangle;->y:I
-
-    iget v1, p1, Landroidx/constraintlayout/solver/widgets/Rectangle;->y:I
-
     iget p1, p1, Landroidx/constraintlayout/solver/widgets/Rectangle;->height:I
 
     add-int/2addr v1, p1
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionAnchor.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionAnchor.smali
index af12b29e51..3423aaedfe 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionAnchor.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionAnchor.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 .super Landroidx/constraintlayout/solver/widgets/ResolutionNode;
+.source "ResolutionAnchor.java"
 
 
 # static fields
@@ -99,8 +100,6 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->myAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {p1, v1}, Landroidx/constraintlayout/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/solver/SolverVariable;
@@ -202,11 +201,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dimension:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+    iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->oppositeDimension:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->oppositeDimension:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
-    if-ne p1, v0, :cond_1
+    if-ne v0, p1, :cond_1
 
     iput-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->oppositeDimension:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -288,8 +285,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->dimension:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->state:I
 
     if-eq v0, v1, :cond_2
@@ -314,8 +309,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->oppositeDimension:Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->state:I
 
     if-eq v0, v1, :cond_4
@@ -344,8 +337,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
     if-ne v0, v1, :cond_8
@@ -359,19 +350,14 @@
 
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->offset:F
 
-    :goto_0
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_7
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iput-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iput-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
@@ -379,9 +365,9 @@
 
     add-float/2addr v0, v1
 
-    goto :goto_0
+    iput v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->didResolve()V
 
     return-void
@@ -399,8 +385,6 @@
 
     if-eqz v0, :cond_11
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
     if-ne v0, v1, :cond_11
@@ -409,16 +393,10 @@
 
     if-eqz v0, :cond_11
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     if-eqz v0, :cond_11
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
     if-ne v0, v1, :cond_11
@@ -448,9 +426,7 @@
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v2, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
@@ -474,13 +450,13 @@
 
     if-ne v0, v2, :cond_a
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_a
     const/4 v1, 0x0
 
     :cond_b
-    :goto_2
+    :goto_1
     if-eqz v1, :cond_c
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
@@ -491,12 +467,11 @@
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    :goto_3
     iget v2, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
     sub-float/2addr v0, v2
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_c
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
@@ -507,9 +482,11 @@
 
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    goto :goto_3
+    iget v2, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
-    :goto_4
+    sub-float/2addr v0, v2
+
+    :goto_2
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->myAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mType:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
@@ -526,7 +503,7 @@
 
     if-ne v2, v4, :cond_d
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_d
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->myAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
@@ -547,10 +524,10 @@
 
     iget v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_e
-    :goto_5
+    :goto_3
     iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->myAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     iget-object v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mOwner:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
@@ -569,7 +546,7 @@
 
     iget v2, v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F
 
-    :goto_6
+    :goto_4
     iget-object v4, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->myAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     invoke-virtual {v4}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getMargin()I
@@ -604,12 +581,12 @@
 
     const/4 v5, 0x0
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_f
     move v3, v4
 
-    :goto_7
+    :goto_5
     int-to-float v3, v3
 
     sub-float/2addr v0, v3
@@ -624,9 +601,7 @@
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v6, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v6, v6, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v6, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     iget v6, v6, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
@@ -652,7 +627,7 @@
 
     iput v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_10
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
@@ -669,9 +644,7 @@
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v3, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v3, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     iget v3, v3, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
@@ -685,7 +658,7 @@
 
     iput v3, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
-    :goto_8
+    :goto_6
     invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->didResolve()V
 
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
@@ -705,8 +678,6 @@
 
     if-eqz v0, :cond_13
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
     if-ne v0, v1, :cond_13
@@ -715,16 +686,10 @@
 
     if-eqz v0, :cond_13
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     if-eqz v0, :cond_13
 
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->state:I
 
     if-ne v0, v1, :cond_13
@@ -748,47 +713,41 @@
     :cond_12
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v1, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iput-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iput-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v2, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iget-object v3, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iput-object v1, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    iput-object v3, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedTarget:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     iget v0, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
-    iget v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->offset:F
+    iget v3, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->offset:F
 
-    add-float/2addr v0, v1
+    add-float/2addr v0, v3
 
     iput v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
 
+    iget v0, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
+
+    iget v2, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->offset:F
+
+    add-float/2addr v0, v2
+
+    iput v0, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
+
+    invoke-virtual {p0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->didResolve()V
+
     iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
-    iget-object v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->didResolve()V
 
-    iget-object v1, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->target:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget v1, v1, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
-
-    iget-object v2, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->opposite:Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
-
-    iget v2, v2, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->offset:F
-
-    add-float/2addr v1, v2
-
-    iput v1, v0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->resolvedOffset:F
-
-    goto :goto_8
+    return-void
 
     :cond_13
     iget v0, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
@@ -960,7 +919,6 @@
 
     const-string v1, "]  type: "
 
-    :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     iget v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
@@ -1006,7 +964,21 @@
 
     const-string v1, "] type: "
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
+
+    invoke-virtual {p0, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->sType(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 
     :cond_1
     new-instance v0, Ljava/lang/StringBuilder;
@@ -1021,7 +993,21 @@
 
     const-string v1, " UNRESOLVED} type: "
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->type:I
+
+    invoke-virtual {p0, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->sType(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 .end method
 
 .method public update()V
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionDimension.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionDimension.smali
index 994f590055..04834190f9 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionDimension.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionDimension.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 .super Landroidx/constraintlayout/solver/widgets/ResolutionNode;
+.source "ResolutionDimension.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionNode.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionNode.smali
index b5b9ad0c3d..0fad78c83e 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionNode.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/ResolutionNode.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/ResolutionNode;
 .super Ljava/lang/Object;
+.source "ResolutionNode.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot$Connection.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot$Connection.smali
index 34d47448be..df2b200587 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot$Connection.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot$Connection.smali
@@ -1,5 +1,6 @@
 .class Landroidx/constraintlayout/solver/widgets/Snapshot$Connection;
 .super Ljava/lang/Object;
+.source "Snapshot.java"
 
 
 # annotations
@@ -107,8 +108,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/constraintlayout/solver/widgets/Snapshot$Connection;->mAnchor:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
     invoke-virtual {p1}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object p1
@@ -137,7 +136,6 @@
 
     move-result p1
 
-    :goto_0
     iput p1, p0, Landroidx/constraintlayout/solver/widgets/Snapshot$Connection;->mCreator:I
 
     return-void
@@ -155,5 +153,7 @@
 
     iput-object v0, p0, Landroidx/constraintlayout/solver/widgets/Snapshot$Connection;->mStrengh:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Strength;
 
-    goto :goto_0
+    iput p1, p0, Landroidx/constraintlayout/solver/widgets/Snapshot$Connection;->mCreator:I
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot.smali
index d96f909d96..7c81a78e87 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/Snapshot.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/Snapshot;
 .super Ljava/lang/Object;
+.source "Snapshot.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/solver/widgets/WidgetContainer.smali b/com.discord/smali/androidx/constraintlayout/solver/widgets/WidgetContainer.smali
index 127775cf67..b561e0e470 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/widgets/WidgetContainer.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/widgets/WidgetContainer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/solver/widgets/WidgetContainer;
 .super Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
+.source "WidgetContainer.java"
 
 
 # instance fields
@@ -300,6 +301,8 @@
 
     if-eqz v3, :cond_2
 
+    move-object v0, v3
+
     goto :goto_2
 
     :cond_1
@@ -347,10 +350,10 @@
 
     if-gtz v4, :cond_2
 
-    :goto_2
     move-object v0, v3
 
     :cond_2
+    :goto_2
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_1
@@ -489,6 +492,10 @@
 
     check-cast v1, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
+    move-object v0, v2
+
+    goto :goto_0
+
     :cond_1
     move-object v0, v2
 
@@ -510,8 +517,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/WidgetContainer;->mChildren:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -670,8 +675,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/constraintlayout/solver/widgets/WidgetContainer;->mChildren:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/constraintlayout/widget/Barrier.smali b/com.discord/smali/androidx/constraintlayout/widget/Barrier.smali
index d915fe6e02..a9c9c81414 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/Barrier.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/Barrier.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/Barrier;
 .super Landroidx/constraintlayout/widget/ConstraintHelper;
+.source "Barrier.java"
 
 
 # static fields
@@ -199,20 +200,16 @@
 
     if-ne p1, v1, :cond_0
 
-    :goto_0
     iput v2, p0, Landroidx/constraintlayout/widget/Barrier;->mResolvedType:I
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_0
-    iget p1, p0, Landroidx/constraintlayout/widget/Barrier;->mIndicatedType:I
-
     if-ne p1, v0, :cond_6
 
-    :goto_1
     iput v3, p0, Landroidx/constraintlayout/widget/Barrier;->mResolvedType:I
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     invoke-virtual {p0}, Landroidx/constraintlayout/widget/Barrier;->getResources()Landroid/content/res/Resources;
@@ -231,43 +228,45 @@
 
     const/4 p1, 0x1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_2
     const/4 p1, 0x0
 
-    :goto_2
+    :goto_0
     if-eqz p1, :cond_4
 
     iget p1, p0, Landroidx/constraintlayout/widget/Barrier;->mIndicatedType:I
 
     if-ne p1, v1, :cond_3
 
+    iput v3, p0, Landroidx/constraintlayout/widget/Barrier;->mResolvedType:I
+
     goto :goto_1
 
     :cond_3
-    iget p1, p0, Landroidx/constraintlayout/widget/Barrier;->mIndicatedType:I
-
     if-ne p1, v0, :cond_6
 
-    goto :goto_0
+    iput v2, p0, Landroidx/constraintlayout/widget/Barrier;->mResolvedType:I
+
+    goto :goto_1
 
     :cond_4
     iget p1, p0, Landroidx/constraintlayout/widget/Barrier;->mIndicatedType:I
 
     if-ne p1, v1, :cond_5
 
-    goto :goto_0
-
-    :cond_5
-    iget p1, p0, Landroidx/constraintlayout/widget/Barrier;->mIndicatedType:I
-
-    if-ne p1, v0, :cond_6
+    iput v2, p0, Landroidx/constraintlayout/widget/Barrier;->mResolvedType:I
 
     goto :goto_1
 
+    :cond_5
+    if-ne p1, v0, :cond_6
+
+    iput v3, p0, Landroidx/constraintlayout/widget/Barrier;->mResolvedType:I
+
     :cond_6
-    :goto_3
+    :goto_1
     iget-object p1, p0, Landroidx/constraintlayout/widget/Barrier;->mBarrier:Landroidx/constraintlayout/solver/widgets/Barrier;
 
     iget v0, p0, Landroidx/constraintlayout/widget/Barrier;->mResolvedType:I
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintHelper.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintHelper.smali
index b6baba96c8..cac3577705 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintHelper.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintHelper.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/constraintlayout/widget/ConstraintHelper;
 .super Landroid/view/View;
+.source "ConstraintHelper.java"
 
 
 # instance fields
@@ -377,7 +378,7 @@
 .end method
 
 .method public setTag(ILjava/lang/Object;)V
-    .locals 1
+    .locals 2
 
     iget p2, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mCount:I
 
@@ -385,19 +386,15 @@
 
     iget-object v0, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mIds:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-le p2, v0, :cond_0
+    if-le p2, v1, :cond_0
 
-    iget-object p2, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mIds:[I
+    array-length p2, v0
 
-    iget-object v0, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mIds:[I
+    mul-int/lit8 p2, p2, 0x2
 
-    array-length v0, v0
-
-    mul-int/lit8 v0, v0, 0x2
-
-    invoke-static {p2, v0}, Ljava/util/Arrays;->copyOf([II)[I
+    invoke-static {v0, p2}, Ljava/util/Arrays;->copyOf([II)[I
 
     move-result-object p2
 
@@ -410,11 +407,9 @@
 
     aput p1, p2, v0
 
-    iget p1, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mCount:I
+    add-int/lit8 v0, v0, 0x1
 
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mCount:I
+    iput v0, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mCount:I
 
     return-void
 .end method
@@ -452,8 +447,6 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/constraintlayout/widget/ConstraintHelper;->mHelperWidget:Landroidx/constraintlayout/solver/widgets/Helper;
-
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/Helper;->removeAllIds()V
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table.smali
index 2ab8a628d6..a8cf31ae57 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table.smali
@@ -1,5 +1,6 @@
 .class Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table;
 .super Ljava/lang/Object;
+.source "ConstraintLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams.smali
index 5f51308a48..abd43c80ee 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "ConstraintLayout.java"
 
 
 # annotations
@@ -522,7 +523,7 @@
 
     packed-switch v6, :pswitch_data_1
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_0
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->editorAbsoluteY:I
@@ -533,7 +534,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->editorAbsoluteY:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_1
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->editorAbsoluteX:I
@@ -544,7 +545,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->editorAbsoluteX:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_2
     invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I
@@ -553,7 +554,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalChainStyle:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_3
     invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I
@@ -562,7 +563,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->horizontalChainStyle:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_4
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalWeight:F
@@ -573,7 +574,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalWeight:F
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_5
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->horizontalWeight:F
@@ -584,7 +585,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->horizontalWeight:F
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_6
     invoke-virtual {p1, v4}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
@@ -603,8 +604,6 @@
 
     if-eqz v4, :cond_5
 
-    iget-object v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->dimensionRatio:Ljava/lang/String;
-
     invoke-virtual {v4}, Ljava/lang/String;->length()I
 
     move-result v4
@@ -729,10 +728,9 @@
 
     move-result v4
 
-    :goto_3
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->dimensionRatioValue:F
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :cond_3
     div-float/2addr v4, v6
@@ -740,10 +738,12 @@
     invoke-static {v4}, Ljava/lang/Math;->abs(F)F
 
     move-result v4
+
+    iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->dimensionRatioValue:F
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_4
 
-    goto :goto_3
+    goto/16 :goto_3
 
     :cond_4
     iget-object v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->dimensionRatio:Ljava/lang/String;
@@ -762,10 +762,12 @@
     invoke-static {v4}, Ljava/lang/Float;->parseFloat(Ljava/lang/String;)F
 
     move-result v4
+
+    iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->dimensionRatioValue:F
     :try_end_1
     .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_4
 
-    goto :goto_3
+    goto/16 :goto_3
 
     :pswitch_7
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintPercentHeight:F
@@ -780,7 +782,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintPercentHeight:F
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_8
     :try_start_2
@@ -794,7 +796,7 @@
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :catch_0
     nop
@@ -809,7 +811,7 @@
 
     iput v7, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintMaxHeight:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_9
     :try_start_3
@@ -823,7 +825,7 @@
     :try_end_3
     .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_1
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :catch_1
     nop
@@ -838,7 +840,7 @@
 
     iput v7, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintMinHeight:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_a
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintPercentWidth:F
@@ -853,7 +855,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintPercentWidth:F
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_b
     :try_start_4
@@ -867,7 +869,7 @@
     :try_end_4
     .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_2
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :catch_2
     nop
@@ -882,7 +884,7 @@
 
     iput v7, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintMaxWidth:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_c
     :try_start_5
@@ -896,7 +898,7 @@
     :try_end_5
     .catch Ljava/lang/Exception; {:try_start_5 .. :try_end_5} :catch_3
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :catch_3
     nop
@@ -911,7 +913,7 @@
 
     iput v7, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->matchConstraintMinWidth:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_d
     invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I
@@ -928,7 +930,9 @@
 
     const-string v6, "layout_constraintHeight_default=\"wrap\" is deprecated.\nUse layout_height=\"WRAP_CONTENT\" and layout_constrainedHeight=\"true\" instead."
 
-    goto :goto_4
+    invoke-static {v4, v6}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto/16 :goto_3
 
     :pswitch_e
     invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I
@@ -945,10 +949,9 @@
 
     const-string v6, "layout_constraintWidth_default=\"wrap\" is deprecated.\nUse layout_width=\"WRAP_CONTENT\" and layout_constrainedWidth=\"true\" instead."
 
-    :goto_4
     invoke-static {v4, v6}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_f
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalBias:F
@@ -959,7 +962,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalBias:F
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_10
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->horizontalBias:F
@@ -970,7 +973,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->horizontalBias:F
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_11
     iget-boolean v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->constrainedHeight:Z
@@ -981,7 +984,7 @@
 
     iput-boolean v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->constrainedHeight:Z
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_12
     iget-boolean v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->constrainedWidth:Z
@@ -992,7 +995,7 @@
 
     iput-boolean v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->constrainedWidth:Z
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_13
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneEndMargin:I
@@ -1003,7 +1006,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneEndMargin:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_14
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneStartMargin:I
@@ -1014,7 +1017,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneStartMargin:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_15
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneBottomMargin:I
@@ -1025,7 +1028,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneBottomMargin:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_16
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneRightMargin:I
@@ -1036,7 +1039,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneRightMargin:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_17
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneTopMargin:I
@@ -1047,7 +1050,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneTopMargin:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_18
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneLeftMargin:I
@@ -1058,7 +1061,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneLeftMargin:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_19
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToEnd:I
@@ -1079,7 +1082,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToEnd:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_1a
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToStart:I
@@ -1100,7 +1103,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToStart:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_1b
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToStart:I
@@ -1121,7 +1124,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToStart:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_1c
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToEnd:I
@@ -1142,7 +1145,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToEnd:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_1d
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->baselineToBaseline:I
@@ -1163,7 +1166,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->baselineToBaseline:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_1e
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomToBottom:I
@@ -1184,7 +1187,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomToBottom:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_1f
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomToTop:I
@@ -1205,7 +1208,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomToTop:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_20
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topToBottom:I
@@ -1226,7 +1229,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topToBottom:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_21
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topToTop:I
@@ -1247,7 +1250,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topToTop:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_22
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightToRight:I
@@ -1268,7 +1271,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightToRight:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_23
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightToLeft:I
@@ -1289,7 +1292,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightToLeft:I
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :pswitch_24
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToRight:I
@@ -1310,7 +1313,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToRight:I
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_25
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToLeft:I
@@ -1331,7 +1334,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToLeft:I
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_26
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guidePercent:F
@@ -1342,7 +1345,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guidePercent:F
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_27
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideEnd:I
@@ -1353,7 +1356,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideEnd:I
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_28
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideBegin:I
@@ -1364,7 +1367,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideBegin:I
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_29
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleAngle:F
@@ -1381,11 +1384,9 @@
 
     iget v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleAngle:F
 
-    cmpg-float v4, v4, v3
+    cmpg-float v7, v4, v3
 
-    if-gez v4, :cond_5
-
-    iget v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleAngle:F
+    if-gez v7, :cond_5
 
     sub-float v4, v6, v4
 
@@ -1393,7 +1394,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleAngle:F
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_2a
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleRadius:I
@@ -1404,7 +1405,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleRadius:I
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_2b
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleConstraint:I
@@ -1425,7 +1426,7 @@
 
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleConstraint:I
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_2c
     iget v6, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->orientation:I
@@ -1438,7 +1439,7 @@
 
     :catch_4
     :cond_5
-    :goto_5
+    :goto_3
     :pswitch_2d
     add-int/lit8 v1, v1, 0x1
 
@@ -2057,8 +2058,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->widget:Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
-
     invoke-virtual {v0}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->reset()V
 
     :cond_0
@@ -2066,7 +2065,7 @@
 .end method
 
 .method public resolveLayoutDirection(I)V
-    .locals 5
+    .locals 6
     .annotation build Landroid/annotation/TargetApi;
         value = 0x11
     .end annotation
@@ -2139,34 +2138,27 @@
 
     if-eq v2, p1, :cond_1
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToEnd:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedRightToLeft:I
 
-    :goto_1
     const/4 v3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToStart:I
 
     if-eq v2, p1, :cond_2
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToStart:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedRightToRight:I
 
-    goto :goto_1
+    const/4 v3, 0x1
 
     :cond_2
-    :goto_2
+    :goto_1
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToStart:I
 
     if-eq v2, p1, :cond_3
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToStart:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToRight:I
 
     const/4 v3, 0x1
@@ -2176,8 +2168,6 @@
 
     if-eq v2, p1, :cond_4
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToEnd:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToLeft:I
 
     const/4 v3, 0x1
@@ -2187,8 +2177,6 @@
 
     if-eq v2, p1, :cond_5
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneStartMargin:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolveGoneRightMargin:I
 
     :cond_5
@@ -2196,8 +2184,6 @@
 
     if-eq v2, p1, :cond_6
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneEndMargin:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolveGoneLeftMargin:I
 
     :cond_6
@@ -2224,11 +2210,9 @@
 
     const/high16 v4, -0x40800000    # -1.0f
 
-    cmpl-float v3, v3, v4
+    cmpl-float v5, v3, v4
 
-    if-eqz v3, :cond_8
-
-    iget v3, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guidePercent:F
+    if-eqz v5, :cond_8
 
     sub-float/2addr v2, v3
 
@@ -2238,44 +2222,39 @@
 
     iput p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_8
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideBegin:I
 
     if-eq v2, p1, :cond_9
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideBegin:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I
 
     iput p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedGuideBegin:I
 
-    :goto_3
     iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_9
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideEnd:I
 
     if-eq v2, p1, :cond_10
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->guideEnd:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedGuideBegin:I
 
     iput p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I
 
-    goto :goto_3
+    iput v4, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F
+
+    goto :goto_2
 
     :cond_a
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToEnd:I
 
     if-eq v2, p1, :cond_b
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToEnd:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToRight:I
 
     :cond_b
@@ -2283,8 +2262,6 @@
 
     if-eq v2, p1, :cond_c
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToStart:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToLeft:I
 
     :cond_c
@@ -2292,8 +2269,6 @@
 
     if-eq v2, p1, :cond_d
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToStart:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedRightToLeft:I
 
     :cond_d
@@ -2301,8 +2276,6 @@
 
     if-eq v2, p1, :cond_e
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToEnd:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedRightToRight:I
 
     :cond_e
@@ -2310,8 +2283,6 @@
 
     if-eq v2, p1, :cond_f
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneStartMargin:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolveGoneLeftMargin:I
 
     :cond_f
@@ -2319,12 +2290,10 @@
 
     if-eq v2, p1, :cond_10
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneEndMargin:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolveGoneRightMargin:I
 
     :cond_10
-    :goto_4
+    :goto_2
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToStart:I
 
     if-ne v2, p1, :cond_14
@@ -2345,8 +2314,6 @@
 
     if-eq v2, p1, :cond_11
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightToLeft:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedRightToLeft:I
 
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightMargin:I
@@ -2355,18 +2322,15 @@
 
     if-lez v1, :cond_12
 
-    :goto_5
     iput v1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightMargin:I
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_11
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightToRight:I
 
     if-eq v2, p1, :cond_12
 
-    iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightToRight:I
-
     iput v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedRightToRight:I
 
     iget v2, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightMargin:I
@@ -2375,17 +2339,15 @@
 
     if-lez v1, :cond_12
 
-    goto :goto_5
+    iput v1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightMargin:I
 
     :cond_12
-    :goto_6
+    :goto_3
     iget v1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToLeft:I
 
     if-eq v1, p1, :cond_13
 
-    iget p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToLeft:I
-
-    iput p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToLeft:I
+    iput v1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToLeft:I
 
     iget p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftMargin:I
 
@@ -2402,9 +2364,7 @@
 
     if-eq v1, p1, :cond_14
 
-    iget p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToRight:I
-
-    iput p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToRight:I
+    iput v1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolvedLeftToRight:I
 
     iget p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftMargin:I
 
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout.smali
index 53fb6338ba..170db18e92 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/ConstraintLayout;
 .super Landroid/view/ViewGroup;
+.source "ConstraintLayout.java"
 
 
 # annotations
@@ -810,8 +811,6 @@
 
     if-eqz v6, :cond_9
 
-    iget-object v6, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v14, v6, Landroidx/constraintlayout/solver/Metrics;->measures:J
 
     const-wide/16 v19, 0x1
@@ -899,7 +898,7 @@
 .end method
 
 .method private internalMeasureDimensions(II)V
-    .locals 24
+    .locals 23
 
     move-object/from16 v0, p0
 
@@ -940,7 +939,7 @@
 
     const/4 v12, -0x2
 
-    if-ge v7, v5, :cond_c
+    if-ge v7, v5, :cond_d
 
     invoke-virtual {v0, v7}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildAt(I)Landroid/view/View;
 
@@ -950,7 +949,7 @@
 
     move-result v15
 
-    if-eq v15, v10, :cond_a
+    if-eq v15, v10, :cond_b
 
     invoke-virtual {v14}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -1019,9 +1018,7 @@
 
     if-eqz v11, :cond_3
 
-    iget-object v11, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
-
-    move/from16 v18, v3
+    move v12, v3
 
     iget-wide v2, v11, Landroidx/constraintlayout/solver/Metrics;->measures:J
 
@@ -1029,14 +1026,16 @@
 
     iput-wide v2, v11, Landroidx/constraintlayout/solver/Metrics;->measures:J
 
+    const/4 v2, -0x2
+
     goto :goto_3
 
     :cond_3
-    move/from16 v18, v3
+    move v12, v3
 
-    :goto_3
     const/4 v2, -0x2
 
+    :goto_3
     if-ne v6, v2, :cond_4
 
     const/4 v3, 0x1
@@ -1100,11 +1099,11 @@
     :cond_8
     iget-boolean v6, v10, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->horizontalDimensionFixed:Z
 
-    if-eqz v6, :cond_b
+    if-eqz v6, :cond_c
 
     iget-boolean v6, v10, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalDimensionFixed:Z
 
-    if-eqz v6, :cond_b
+    if-eqz v6, :cond_c
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -1122,7 +1121,7 @@
 
     :cond_9
     :goto_6
-    move/from16 v18, v3
+    move v12, v3
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -1139,20 +1138,25 @@
     goto :goto_7
 
     :cond_a
-    move/from16 v18, v3
+    move v12, v3
+
+    goto :goto_7
 
     :cond_b
+    move v12, v3
+
+    :cond_c
     :goto_7
     add-int/lit8 v7, v7, 0x1
 
-    move/from16 v3, v18
+    move v3, v12
 
     move/from16 v2, p2
 
     goto/16 :goto_0
 
-    :cond_c
-    move/from16 v18, v3
+    :cond_d
+    move v12, v3
 
     iget-object v2, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
@@ -1161,7 +1165,7 @@
     const/4 v2, 0x0
 
     :goto_8
-    if-ge v2, v5, :cond_28
+    if-ge v2, v5, :cond_2b
 
     invoke-virtual {v0, v2}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildAt(I)Landroid/view/View;
 
@@ -1171,7 +1175,7 @@
 
     move-result v6
 
-    if-eq v6, v10, :cond_26
+    if-eq v6, v10, :cond_29
 
     invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -1183,11 +1187,11 @@
 
     iget-boolean v11, v6, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->isGuideline:Z
 
-    if-nez v11, :cond_26
+    if-nez v11, :cond_28
 
     iget-boolean v11, v6, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->isHelper:Z
 
-    if-nez v11, :cond_26
+    if-nez v11, :cond_28
 
     invoke-virtual {v3}, Landroid/view/View;->getVisibility()I
 
@@ -1197,24 +1201,32 @@
 
     iget v11, v6, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->width:I
 
-    iget v12, v6, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->height:I
+    iget v13, v6, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->height:I
 
-    if-eqz v11, :cond_d
+    if-eqz v11, :cond_f
 
-    if-nez v12, :cond_26
+    if-nez v13, :cond_e
 
-    :cond_d
-    sget-object v13, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    goto :goto_9
 
-    invoke-virtual {v7, v13}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    :cond_e
+    move/from16 v20, v2
 
-    move-result-object v13
+    move/from16 v17, v5
 
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    move-wide/from16 v18, v8
 
-    move-result-object v13
+    const/4 v3, -0x1
 
-    sget-object v14, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    move/from16 v5, p2
+
+    const/4 v10, -0x2
+
+    goto/16 :goto_18
+
+    :cond_f
+    :goto_9
+    sget-object v14, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     invoke-virtual {v7, v14}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -1224,49 +1236,49 @@
 
     move-result-object v14
 
-    sget-object v15, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
-
-    invoke-virtual {v7, v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    move-result-object v15
-
-    invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    move-result-object v15
-
-    if-eqz v15, :cond_e
-
     sget-object v15, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     invoke-virtual {v7, v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v15
 
-    invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v15
 
-    if-eqz v15, :cond_e
-
-    const/4 v15, 0x1
-
-    goto :goto_9
-
-    :cond_e
-    const/4 v15, 0x0
-
-    :goto_9
-    sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     invoke-virtual {v7, v10}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v10
 
-    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
+    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v10
 
-    sget-object v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+    if-eqz v10, :cond_10
+
+    sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+
+    invoke-virtual {v7, v10}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    move-result-object v10
+
+    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    move-result-object v10
+
+    if-eqz v10, :cond_10
+
+    const/4 v10, 0x1
+
+    goto :goto_a
+
+    :cond_10
+    const/4 v10, 0x0
+
+    :goto_a
+    sget-object v8, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     invoke-virtual {v7, v8}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
@@ -1276,371 +1288,383 @@
 
     move-result-object v8
 
-    sget-object v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
-
-    invoke-virtual {v7, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    move-result-object v9
-
-    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
-
-    move-result-object v9
-
-    if-eqz v9, :cond_f
-
     sget-object v9, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
     invoke-virtual {v7, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v9
 
-    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getResolutionNode()Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;
 
     move-result-object v9
 
-    if-eqz v9, :cond_f
+    move/from16 v17, v5
 
-    const/4 v9, 0x1
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    goto :goto_a
-
-    :cond_f
-    const/4 v9, 0x0
-
-    :goto_a
-    if-nez v11, :cond_11
-
-    if-nez v12, :cond_11
-
-    if-eqz v15, :cond_11
-
-    if-nez v9, :cond_10
-
-    goto :goto_b
-
-    :cond_10
-    move/from16 v22, v2
-
-    move/from16 v21, v5
-
-    move/from16 v9, v18
-
-    const/4 v3, -0x1
-
-    move/from16 v8, p2
-
-    const/4 v13, -0x2
-
-    const-wide/16 v19, 0x1
-
-    goto/16 :goto_1a
-
-    :cond_11
-    :goto_b
-    move/from16 v21, v5
-
-    iget-object v5, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
-
-    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getHorizontalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    invoke-virtual {v7, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
     move-result-object v5
 
-    move/from16 v22, v2
+    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
 
-    sget-object v2, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    move-result-object v5
 
-    if-eq v5, v2, :cond_12
+    if-eqz v5, :cond_11
 
-    const/4 v2, 0x1
+    sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
+
+    invoke-virtual {v7, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->getTarget()Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_11
+
+    const/4 v5, 0x1
+
+    goto :goto_b
+
+    :cond_11
+    const/4 v5, 0x0
+
+    :goto_b
+    if-nez v11, :cond_13
+
+    if-nez v13, :cond_13
+
+    if-eqz v10, :cond_13
+
+    if-nez v5, :cond_12
 
     goto :goto_c
 
     :cond_12
-    const/4 v2, 0x0
+    move/from16 v20, v2
 
+    const/4 v3, -0x1
+
+    move/from16 v5, p2
+
+    const/4 v10, -0x2
+
+    const-wide/16 v18, 0x1
+
+    goto/16 :goto_18
+
+    :cond_13
     :goto_c
-    iget-object v5, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
+    move/from16 v20, v2
 
-    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getVerticalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
+    iget-object v2, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
-    move-result-object v5
+    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getHorizontalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    move-object/from16 v23, v6
+    move-result-object v2
+
+    move-object/from16 v21, v6
 
     sget-object v6, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-eq v5, v6, :cond_13
+    if-eq v2, v6, :cond_14
 
     const/4 v6, 0x1
 
     goto :goto_d
 
-    :cond_13
+    :cond_14
     const/4 v6, 0x0
 
     :goto_d
-    if-nez v2, :cond_14
+    iget-object v2, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
-    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getVerticalDimensionBehaviour()Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    move-result-object v5
+    move-result-object v2
 
-    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->invalidate()V
+    sget-object v0, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    :cond_14
-    if-nez v6, :cond_15
+    if-eq v2, v0, :cond_15
 
-    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->invalidate()V
-
-    :cond_15
-    if-nez v11, :cond_17
-
-    if-eqz v2, :cond_16
-
-    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->isSpreadWidth()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_16
-
-    if-eqz v15, :cond_16
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_16
-
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_16
-
-    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
-
-    move-result v5
-
-    invoke-virtual {v13}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
-
-    move-result v11
-
-    sub-float/2addr v5, v11
-
-    float-to-int v11, v5
-
-    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
-
-    move-result-object v5
-
-    invoke-virtual {v5, v11}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
+    const/4 v0, 0x1
 
     goto :goto_e
 
-    :cond_16
-    const/4 v5, -0x2
+    :cond_15
+    const/4 v0, 0x0
 
-    invoke-static {v1, v4, v5}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
-
-    move-result v2
-
-    move v13, v2
-
-    const/4 v2, 0x0
-
-    const/4 v5, 0x1
-
-    goto :goto_10
-
-    :cond_17
-    const/4 v5, -0x2
-
-    const/4 v13, -0x1
-
-    if-ne v11, v13, :cond_18
-
-    invoke-static {v1, v4, v13}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
-
-    move-result v14
-
-    move v13, v14
-
-    const/4 v5, 0x0
-
-    goto :goto_10
-
-    :cond_18
-    if-ne v11, v5, :cond_19
-
-    const/4 v5, 0x1
-
-    goto :goto_f
-
-    :cond_19
     :goto_e
-    const/4 v5, 0x0
+    if-nez v6, :cond_16
 
-    :goto_f
-    invoke-static {v1, v4, v11}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
-    move-result v13
+    move-result-object v2
 
-    :goto_10
-    if-nez v12, :cond_1b
+    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->invalidate()V
 
-    if-eqz v6, :cond_1a
-
-    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->isSpreadHeight()Z
-
-    move-result v14
-
-    if-eqz v14, :cond_1a
-
-    if-eqz v9, :cond_1a
-
-    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
-
-    move-result v9
-
-    if-eqz v9, :cond_1a
-
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
-
-    move-result v9
-
-    if-eqz v9, :cond_1a
-
-    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
-
-    move-result v8
-
-    invoke-virtual {v10}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
-
-    move-result v9
-
-    sub-float/2addr v8, v9
-
-    float-to-int v12, v8
+    :cond_16
+    if-nez v0, :cond_17
 
     invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
-    move-result-object v8
+    move-result-object v2
 
-    invoke-virtual {v8, v12}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
+    invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->invalidate()V
 
-    move/from16 v9, v18
+    :cond_17
+    if-nez v11, :cond_19
 
-    move/from16 v8, p2
+    if-eqz v6, :cond_18
 
-    goto :goto_11
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->isSpreadWidth()Z
 
-    :cond_1a
-    move/from16 v9, v18
+    move-result v2
 
-    move/from16 v8, p2
+    if-eqz v2, :cond_18
 
-    const/4 v10, -0x2
+    if-eqz v10, :cond_18
 
-    invoke-static {v8, v9, v10}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_18
+
+    invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_18
+
+    invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
+
+    move-result v2
+
+    invoke-virtual {v14}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
+
+    move-result v10
+
+    sub-float/2addr v2, v10
+
+    float-to-int v11, v2
+
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v11}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
+
+    const/4 v2, 0x0
+
+    goto :goto_f
+
+    :cond_18
+    const/4 v2, -0x2
+
+    invoke-static {v1, v4, v2}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
 
     move-result v6
 
     move v14, v6
 
+    const/4 v2, 0x1
+
     const/4 v6, 0x0
 
-    const/4 v10, 0x1
+    goto :goto_10
 
-    goto :goto_13
+    :cond_19
+    const/4 v2, -0x2
+
+    const/4 v10, -0x1
+
+    if-ne v11, v10, :cond_1a
+
+    invoke-static {v1, v4, v10}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+
+    move-result v14
+
+    const/4 v2, 0x0
+
+    goto :goto_10
+
+    :cond_1a
+    if-ne v11, v2, :cond_1b
+
+    const/4 v2, 0x1
+
+    goto :goto_f
 
     :cond_1b
-    move/from16 v9, v18
+    const/4 v2, 0x0
 
-    move/from16 v8, p2
+    :goto_f
+    invoke-static {v1, v4, v11}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
 
-    const/4 v10, -0x2
+    move-result v10
 
-    const/4 v14, -0x1
+    move v14, v10
 
-    if-ne v12, v14, :cond_1c
+    :goto_10
+    if-nez v13, :cond_1d
 
-    invoke-static {v8, v9, v14}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+    if-eqz v0, :cond_1c
 
-    move-result v15
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->isSpreadHeight()Z
 
-    move v14, v15
+    move-result v10
 
-    const/4 v10, 0x0
+    if-eqz v10, :cond_1c
 
-    goto :goto_13
+    if-eqz v5, :cond_1c
+
+    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1c
+
+    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->isResolved()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1c
+
+    invoke-virtual {v9}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
+
+    move-result v5
+
+    invoke-virtual {v8}, Landroidx/constraintlayout/solver/widgets/ResolutionAnchor;->getResolvedValue()F
+
+    move-result v8
+
+    sub-float/2addr v5, v8
+
+    float-to-int v5, v5
+
+    invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
+
+    move-result-object v8
+
+    invoke-virtual {v8, v5}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
+
+    move v13, v5
+
+    move/from16 v5, p2
+
+    const/4 v8, 0x0
+
+    goto :goto_11
 
     :cond_1c
-    if-ne v12, v10, :cond_1d
+    move/from16 v5, p2
 
-    const/4 v10, 0x1
+    const/4 v8, -0x2
+
+    invoke-static {v5, v12, v8}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+
+    move-result v0
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
 
     goto :goto_12
 
     :cond_1d
+    move/from16 v5, p2
+
+    const/4 v8, -0x2
+
+    const/4 v9, -0x1
+
+    if-ne v13, v9, :cond_1e
+
+    invoke-static {v5, v12, v9}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+
+    move-result v10
+
+    move v9, v0
+
+    move v0, v10
+
+    const/4 v8, 0x0
+
+    goto :goto_12
+
+    :cond_1e
+    if-ne v13, v8, :cond_1f
+
+    const/4 v8, 0x1
+
+    goto :goto_11
+
+    :cond_1f
+    const/4 v8, 0x0
+
     :goto_11
-    const/4 v10, 0x0
+    invoke-static {v5, v12, v13}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+
+    move-result v9
+
+    move/from16 v22, v9
+
+    move v9, v0
+
+    move/from16 v0, v22
 
     :goto_12
-    invoke-static {v8, v9, v12}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildMeasureSpec(III)I
+    invoke-virtual {v3, v14, v0}, Landroid/view/View;->measure(II)V
 
-    move-result v14
+    move-object/from16 v0, p0
+
+    iget-object v10, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
+
+    if-eqz v10, :cond_20
+
+    iget-wide v14, v10, Landroidx/constraintlayout/solver/Metrics;->measures:J
+
+    const-wide/16 v18, 0x1
+
+    add-long v14, v14, v18
+
+    iput-wide v14, v10, Landroidx/constraintlayout/solver/Metrics;->measures:J
+
+    const/4 v10, -0x2
+
+    goto :goto_13
+
+    :cond_20
+    const-wide/16 v18, 0x1
+
+    const/4 v10, -0x2
 
     :goto_13
-    invoke-virtual {v3, v13, v14}, Landroid/view/View;->measure(II)V
+    if-ne v11, v10, :cond_21
 
-    iget-object v13, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
-
-    if-eqz v13, :cond_1e
-
-    iget-object v13, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
-
-    iget-wide v14, v13, Landroidx/constraintlayout/solver/Metrics;->measures:J
-
-    const-wide/16 v19, 0x1
-
-    add-long v14, v14, v19
-
-    iput-wide v14, v13, Landroidx/constraintlayout/solver/Metrics;->measures:J
+    const/4 v11, 0x1
 
     goto :goto_14
 
-    :cond_1e
-    const-wide/16 v19, 0x1
+    :cond_21
+    const/4 v11, 0x0
 
     :goto_14
-    const/4 v13, -0x2
+    invoke-virtual {v7, v11}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidthWrapContent(Z)V
 
-    if-ne v11, v13, :cond_1f
+    if-ne v13, v10, :cond_22
 
     const/4 v11, 0x1
 
     goto :goto_15
 
-    :cond_1f
+    :cond_22
     const/4 v11, 0x0
 
     :goto_15
-    invoke-virtual {v7, v11}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidthWrapContent(Z)V
-
-    if-ne v12, v13, :cond_20
-
-    const/4 v11, 0x1
-
-    goto :goto_16
-
-    :cond_20
-    const/4 v11, 0x0
-
-    :goto_16
     invoke-virtual {v7, v11}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeightWrapContent(Z)V
 
     invoke-virtual {v3}, Landroid/view/View;->getMeasuredWidth()I
@@ -1649,23 +1673,23 @@
 
     invoke-virtual {v3}, Landroid/view/View;->getMeasuredHeight()I
 
-    move-result v12
+    move-result v13
 
     invoke-virtual {v7, v11}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidth(I)V
 
-    invoke-virtual {v7, v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeight(I)V
+    invoke-virtual {v7, v13}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeight(I)V
 
-    if-eqz v5, :cond_21
+    if-eqz v2, :cond_23
 
     invoke-virtual {v7, v11}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWrapWidth(I)V
 
-    :cond_21
-    if-eqz v10, :cond_22
+    :cond_23
+    if-eqz v8, :cond_24
 
-    invoke-virtual {v7, v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWrapHeight(I)V
+    invoke-virtual {v7, v13}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWrapHeight(I)V
 
-    :cond_22
-    if-eqz v2, :cond_23
+    :cond_24
+    if-eqz v6, :cond_25
 
     invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -1673,42 +1697,41 @@
 
     invoke-virtual {v2, v11}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
 
-    goto :goto_17
+    goto :goto_16
 
-    :cond_23
+    :cond_25
     invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
     move-result-object v2
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->remove()V
 
-    :goto_17
-    if-eqz v6, :cond_24
+    :goto_16
+    if-eqz v9, :cond_26
 
     invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
     move-result-object v2
 
-    invoke-virtual {v2, v12}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
+    invoke-virtual {v2, v13}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
 
-    :goto_18
-    move-object/from16 v6, v23
+    move-object/from16 v6, v21
 
-    goto :goto_19
+    goto :goto_17
 
-    :cond_24
+    :cond_26
     invoke-virtual {v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
     move-result-object v2
 
     invoke-virtual {v2}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->remove()V
 
-    goto :goto_18
+    move-object/from16 v6, v21
 
-    :goto_19
+    :goto_17
     iget-boolean v2, v6, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->needsBaseline:Z
 
-    if-eqz v2, :cond_25
+    if-eqz v2, :cond_27
 
     invoke-virtual {v3}, Landroid/view/View;->getBaseline()I
 
@@ -1716,47 +1739,58 @@
 
     const/4 v3, -0x1
 
-    if-eq v2, v3, :cond_27
+    if-eq v2, v3, :cond_2a
 
     invoke-virtual {v7, v2}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setBaselineDistance(I)V
 
-    goto :goto_1a
-
-    :cond_25
-    const/4 v3, -0x1
-
-    goto :goto_1a
-
-    :cond_26
-    move/from16 v22, v2
-
-    move/from16 v21, v5
-
-    move-wide/from16 v19, v8
-
-    move/from16 v9, v18
-
-    const/4 v3, -0x1
-
-    move/from16 v8, p2
-
-    const/4 v13, -0x2
+    goto :goto_18
 
     :cond_27
-    :goto_1a
-    add-int/lit8 v2, v22, 0x1
+    const/4 v3, -0x1
 
-    move/from16 v18, v9
+    goto :goto_18
 
-    move-wide/from16 v8, v19
+    :cond_28
+    move/from16 v20, v2
 
-    move/from16 v5, v21
+    move/from16 v17, v5
+
+    move-wide/from16 v18, v8
+
+    const/4 v3, -0x1
+
+    move/from16 v5, p2
+
+    const/4 v10, -0x2
+
+    goto :goto_18
+
+    :cond_29
+    move/from16 v20, v2
+
+    move/from16 v17, v5
+
+    move-wide/from16 v18, v8
+
+    const/4 v3, -0x1
+
+    move/from16 v5, p2
+
+    const/4 v10, -0x2
+
+    :cond_2a
+    :goto_18
+    add-int/lit8 v2, v20, 0x1
+
+    move/from16 v5, v17
+
+    move-wide/from16 v8, v18
 
     const/16 v10, 0x8
 
     goto/16 :goto_8
 
-    :cond_28
+    :cond_2b
     return-void
 .end method
 
@@ -1910,8 +1944,6 @@
 
     if-eqz v5, :cond_6
 
-    iget-object v5, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mConstraintSet:Landroidx/constraintlayout/widget/ConstraintSet;
-
     invoke-virtual {v5, v0}, Landroidx/constraintlayout/widget/ConstraintSet;->applyToInternal(Landroidx/constraintlayout/widget/ConstraintLayout;)V
 
     :cond_6
@@ -2128,21 +2160,21 @@
 
     invoke-virtual {v13, v9}, Landroidx/constraintlayout/solver/widgets/Guideline;->setGuidePercent(F)V
 
-    goto/16 :goto_13
+    goto/16 :goto_11
 
     :cond_10
     if-eq v6, v4, :cond_11
 
     invoke-virtual {v13, v6}, Landroidx/constraintlayout/solver/widgets/Guideline;->setGuideBegin(I)V
 
-    goto/16 :goto_13
+    goto/16 :goto_11
 
     :cond_11
     if-eq v8, v4, :cond_2d
 
     invoke-virtual {v13, v8}, Landroidx/constraintlayout/solver/widgets/Guideline;->setGuideEnd(I)V
 
-    goto/16 :goto_13
+    goto/16 :goto_11
 
     :cond_12
     iget v6, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->leftToLeft:I
@@ -2260,6 +2292,12 @@
 
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToStart:I
 
+    move/from16 v25, v6
+
+    move v6, v3
+
+    move/from16 v3, v25
+
     goto :goto_7
 
     :cond_14
@@ -2269,14 +2307,22 @@
 
     iget v6, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->startToEnd:I
 
-    :cond_15
-    :goto_7
     move/from16 v25, v6
 
     move v6, v3
 
     move/from16 v3, v25
 
+    goto :goto_7
+
+    :cond_15
+    move/from16 v25, v6
+
+    move v6, v3
+
+    move/from16 v3, v25
+
+    :goto_7
     if-ne v9, v4, :cond_17
 
     if-ne v10, v4, :cond_17
@@ -2287,6 +2333,16 @@
 
     iget v9, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToStart:I
 
+    move v12, v7
+
+    move/from16 v16, v8
+
+    move v11, v10
+
+    move v10, v15
+
+    move v15, v9
+
     goto :goto_8
 
     :cond_16
@@ -2296,13 +2352,30 @@
 
     iget v10, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->endToEnd:I
 
-    :cond_17
-    :goto_8
     move v12, v7
 
     move/from16 v16, v8
 
-    goto :goto_9
+    move v11, v10
+
+    move v10, v15
+
+    move v15, v9
+
+    goto :goto_8
+
+    :cond_17
+    move v12, v7
+
+    move/from16 v16, v8
+
+    move v11, v10
+
+    move v10, v15
+
+    move v15, v9
+
+    goto :goto_8
 
     :cond_18
     move v3, v8
@@ -2311,13 +2384,13 @@
 
     move v12, v11
 
-    :goto_9
     move v11, v10
 
     move v10, v15
 
     move v15, v9
 
+    :goto_8
     iget v7, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->circleConstraint:I
 
     if-eq v7, v4, :cond_19
@@ -2336,7 +2409,7 @@
 
     invoke-virtual {v13, v3, v6, v7}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->connectCircularConstraint(Landroidx/constraintlayout/solver/widgets/ConstraintWidget;FI)V
 
-    goto/16 :goto_f
+    goto/16 :goto_e
 
     :cond_19
     if-eq v6, v4, :cond_1b
@@ -2365,17 +2438,17 @@
 
     invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_1a
     move/from16 v17, v10
 
     move v3, v11
 
-    :goto_a
+    :goto_9
     move v6, v3
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_1b
     move/from16 v17, v10
@@ -2401,7 +2474,7 @@
     invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
 
     :cond_1c
-    :goto_b
+    :goto_a
     if-eq v15, v4, :cond_1d
 
     invoke-direct {v0, v15}, Landroidx/constraintlayout/widget/ConstraintLayout;->getTargetWidget(I)Landroidx/constraintlayout/solver/widgets/ConstraintWidget;
@@ -2414,7 +2487,15 @@
 
     sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    goto :goto_c
+    iget v11, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightMargin:I
+
+    move-object v7, v13
+
+    move/from16 v12, v16
+
+    invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
+
+    goto :goto_b
 
     :cond_1d
     if-eq v6, v4, :cond_1e
@@ -2429,7 +2510,6 @@
 
     sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    :goto_c
     iget v11, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->rightMargin:I
 
     move-object v7, v13
@@ -2439,6 +2519,7 @@
     invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
 
     :cond_1e
+    :goto_b
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topToTop:I
 
     if-eq v3, v4, :cond_1f
@@ -2455,7 +2536,15 @@
 
     sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    goto :goto_d
+    iget v11, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topMargin:I
+
+    iget v12, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneTopMargin:I
+
+    move-object v7, v13
+
+    invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
+
+    goto :goto_c
 
     :cond_1f
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topToBottom:I
@@ -2474,7 +2563,6 @@
 
     sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    :goto_d
     iget v11, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->topMargin:I
 
     iget v12, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneTopMargin:I
@@ -2484,6 +2572,7 @@
     invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
 
     :cond_20
+    :goto_c
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomToTop:I
 
     if-eq v3, v4, :cond_21
@@ -2500,7 +2589,15 @@
 
     sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->TOP:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    goto :goto_e
+    iget v11, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomMargin:I
+
+    iget v12, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneBottomMargin:I
+
+    move-object v7, v13
+
+    invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
+
+    goto :goto_d
 
     :cond_21
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomToBottom:I
@@ -2519,7 +2616,6 @@
 
     sget-object v10, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;
 
-    :goto_e
     iget v11, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->bottomMargin:I
 
     iget v12, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->goneBottomMargin:I
@@ -2529,6 +2625,7 @@
     invoke-virtual/range {v7 .. v12}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->immediateConnect(Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;Landroidx/constraintlayout/solver/widgets/ConstraintWidget;Landroidx/constraintlayout/solver/widgets/ConstraintAnchor$Type;II)V
 
     :cond_22
+    :goto_d
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->baselineToBaseline:I
 
     if-eq v3, v4, :cond_23
@@ -2648,7 +2745,7 @@
     invoke-virtual {v13, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVerticalBiasPercent(F)V
 
     :cond_25
-    :goto_f
+    :goto_e
     if-eqz v1, :cond_27
 
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->editorAbsoluteX:I
@@ -2699,7 +2796,7 @@
 
     iput v6, v3, Landroidx/constraintlayout/solver/widgets/ConstraintAnchor;->mMargin:I
 
-    goto :goto_11
+    goto :goto_f
 
     :cond_28
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
@@ -2708,7 +2805,9 @@
 
     const/4 v3, 0x0
 
-    goto :goto_10
+    invoke-virtual {v13, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidth(I)V
+
+    goto :goto_f
 
     :cond_29
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
@@ -2717,10 +2816,9 @@
 
     iget v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->width:I
 
-    :goto_10
     invoke-virtual {v13, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidth(I)V
 
-    :goto_11
+    :goto_f
     iget-boolean v3, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalDimensionFixed:Z
 
     if-nez v3, :cond_2b
@@ -2755,7 +2853,7 @@
 
     const/4 v3, 0x0
 
-    goto :goto_12
+    goto :goto_10
 
     :cond_2a
     sget-object v3, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
@@ -2766,7 +2864,7 @@
 
     invoke-virtual {v13, v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeight(I)V
 
-    goto :goto_12
+    goto :goto_10
 
     :cond_2b
     const/4 v3, 0x0
@@ -2779,7 +2877,7 @@
 
     invoke-virtual {v13, v6}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeight(I)V
 
-    :goto_12
+    :goto_10
     iget-object v6, v14, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->dimensionRatio:Ljava/lang/String;
 
     if-eqz v6, :cond_2c
@@ -2826,7 +2924,7 @@
     invoke-virtual {v13, v6, v7, v8, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setVerticalMatchStyle(IIIF)V
 
     :cond_2d
-    :goto_13
+    :goto_11
     add-int/lit8 v5, v5, 0x1
 
     goto/16 :goto_5
@@ -2892,10 +2990,9 @@
 
     if-eq v0, v6, :cond_0
 
-    :goto_0
     const/4 p1, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget v0, p0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMaxWidth:I
@@ -2906,27 +3003,28 @@
 
     sub-int/2addr p1, v3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
+    const/4 p1, 0x0
+
     goto :goto_0
 
     :cond_2
     sget-object v4, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    :goto_1
+    :goto_0
     if-eq v1, v7, :cond_5
 
     if-eqz v1, :cond_4
 
     if-eq v1, v6, :cond_3
 
-    :goto_2
     const/4 p2, 0x0
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     iget v0, p0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMaxHeight:I
@@ -2937,17 +3035,19 @@
 
     sub-int/2addr p2, v2
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_4
     sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    goto :goto_2
+    const/4 p2, 0x0
+
+    goto :goto_1
 
     :cond_5
     sget-object v5, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    :goto_3
+    :goto_1
     iget-object v0, p0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
     invoke-virtual {v0, v8}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setMinWidth(I)V
@@ -3155,7 +3255,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildCount()I
 
@@ -3370,6 +3470,12 @@
     :cond_1
     move-object/from16 v5, p0
 
+    goto :goto_1
+
+    :cond_2
+    move-object/from16 v5, p0
+
+    :goto_1
     return-void
 .end method
 
@@ -3456,8 +3562,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout;->mDesignIds:Ljava/util/HashMap;
-
     invoke-virtual {p1, p2}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
     move-result p1
@@ -3691,7 +3795,7 @@
 .end method
 
 .method protected onMeasure(II)V
-    .locals 25
+    .locals 24
 
     move-object/from16 v0, p0
 
@@ -3877,9 +3981,7 @@
 
     iget-object v13, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
-    iget-object v11, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
-
-    iget v11, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mWrapFixedWidth:I
+    iget v11, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mWrapFixedWidth:I
 
     invoke-virtual {v13, v11}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V
 
@@ -3907,9 +4009,7 @@
 
     iget-object v11, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
-    iget-object v13, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
-
-    iget v13, v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mWrapFixedHeight:I
+    iget v13, v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->mWrapFixedHeight:I
 
     invoke-virtual {v11, v13}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V
 
@@ -3929,7 +4029,7 @@
 
     const/high16 v15, 0x40000000    # 2.0f
 
-    if-ne v11, v13, :cond_d
+    if-ne v11, v13, :cond_e
 
     iget-object v11, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
@@ -4024,18 +4124,23 @@
     :cond_d
     const/4 v4, 0x1
 
+    goto :goto_5
+
+    :cond_e
+    const/4 v4, 0x1
+
     :goto_5
     invoke-virtual/range {p0 .. p0}, Landroidx/constraintlayout/widget/ConstraintLayout;->getChildCount()I
 
     move-result v3
 
-    if-lez v3, :cond_e
+    if-lez v3, :cond_f
 
     const-string v3, "First pass"
 
     invoke-virtual {v0, v3}, Landroidx/constraintlayout/widget/ConstraintLayout;->solveLinearSystem(Ljava/lang/String;)V
 
-    :cond_e
+    :cond_f
     iget-object v3, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mVariableDimensionsWidgets:Ljava/util/ArrayList;
 
     invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
@@ -4054,7 +4159,7 @@
 
     add-int/2addr v7, v5
 
-    if-lez v3, :cond_29
+    if-lez v3, :cond_2c
 
     iget-object v6, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
@@ -4064,13 +4169,13 @@
 
     sget-object v11, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v6, v11, :cond_f
+    if-ne v6, v11, :cond_10
 
     const/4 v6, 0x1
 
     goto :goto_6
 
-    :cond_f
+    :cond_10
     const/4 v6, 0x0
 
     :goto_6
@@ -4082,13 +4187,13 @@
 
     sget-object v13, Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroidx/constraintlayout/solver/widgets/ConstraintWidget$DimensionBehaviour;
 
-    if-ne v11, v13, :cond_10
+    if-ne v11, v13, :cond_11
 
     const/4 v11, 0x1
 
     goto :goto_7
 
-    :cond_10
+    :cond_11
     const/4 v11, 0x0
 
     :goto_7
@@ -4124,12 +4229,12 @@
 
     const/4 v10, 0x0
 
-    const/16 v19, 0x0
+    const/16 v17, 0x0
 
     :goto_8
-    const-wide/16 v16, 0x1
+    const-wide/16 v18, 0x1
 
-    if-ge v4, v3, :cond_20
+    if-ge v4, v3, :cond_22
 
     iget-object v15, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mVariableDimensionsWidgets:Ljava/util/ArrayList;
 
@@ -4149,7 +4254,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    if-eqz v3, :cond_1e
+    if-eqz v3, :cond_21
 
     invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -4161,27 +4266,27 @@
 
     check-cast v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;
 
-    move/from16 v23, v9
+    move/from16 v20, v9
 
     iget-boolean v9, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->isHelper:Z
 
-    if-nez v9, :cond_1d
+    if-nez v9, :cond_20
 
     iget-boolean v9, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->isGuideline:Z
 
-    if-nez v9, :cond_1d
+    if-nez v9, :cond_20
 
     invoke-virtual {v3}, Landroid/view/View;->getVisibility()I
 
     move-result v9
 
-    move/from16 v24, v10
+    move/from16 v23, v10
 
     const/16 v10, 0x8
 
     if-eq v9, v10, :cond_1f
 
-    if-eqz v14, :cond_11
+    if-eqz v14, :cond_13
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -4191,7 +4296,7 @@
 
     move-result v9
 
-    if-eqz v9, :cond_11
+    if-eqz v9, :cond_13
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -4201,18 +4306,26 @@
 
     move-result v9
 
-    if-nez v9, :cond_1f
+    if-nez v9, :cond_12
 
-    :cond_11
+    goto :goto_9
+
+    :cond_12
+    move/from16 v3, v17
+
+    goto/16 :goto_c
+
+    :cond_13
+    :goto_9
     iget v9, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->width:I
 
     const/4 v10, -0x2
 
-    if-ne v9, v10, :cond_12
+    if-ne v9, v10, :cond_14
 
     iget-boolean v9, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->horizontalDimensionFixed:Z
 
-    if-eqz v9, :cond_12
+    if-eqz v9, :cond_14
 
     iget v9, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->width:I
 
@@ -4220,9 +4333,9 @@
 
     move-result v9
 
-    goto :goto_9
+    goto :goto_a
 
-    :cond_12
+    :cond_14
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
     move-result v9
@@ -4233,16 +4346,16 @@
 
     move-result v9
 
-    :goto_9
+    :goto_a
     iget v10, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->height:I
 
     const/4 v1, -0x2
 
-    if-ne v10, v1, :cond_13
+    if-ne v10, v1, :cond_15
 
     iget-boolean v1, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->verticalDimensionFixed:Z
 
-    if-eqz v1, :cond_13
+    if-eqz v1, :cond_15
 
     iget v1, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->height:I
 
@@ -4250,9 +4363,9 @@
 
     move-result v1
 
-    goto :goto_a
+    goto :goto_b
 
-    :cond_13
+    :cond_15
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
     move-result v1
@@ -4263,22 +4376,20 @@
 
     move-result v1
 
-    :goto_a
+    :goto_b
     invoke-virtual {v3, v9, v1}, Landroid/view/View;->measure(II)V
 
     iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    if-eqz v1, :cond_14
-
-    iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
+    if-eqz v1, :cond_16
 
     iget-wide v9, v1, Landroidx/constraintlayout/solver/Metrics;->additionalMeasures:J
 
-    add-long v9, v9, v16
+    add-long v9, v9, v18
 
     iput-wide v9, v1, Landroidx/constraintlayout/solver/Metrics;->additionalMeasures:J
 
-    :cond_14
+    :cond_16
     invoke-virtual {v3}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v1
@@ -4291,11 +4402,11 @@
 
     move-result v10
 
-    if-eq v1, v10, :cond_17
+    if-eq v1, v10, :cond_19
 
     invoke-virtual {v15, v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setWidth(I)V
 
-    if-eqz v14, :cond_15
+    if-eqz v14, :cond_17
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionWidth()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -4303,14 +4414,14 @@
 
     invoke-virtual {v10, v1}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
 
-    :cond_15
-    if-eqz v6, :cond_16
+    :cond_17
+    if-eqz v6, :cond_18
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getRight()I
 
     move-result v1
 
-    if-le v1, v13, :cond_16
+    if-le v1, v13, :cond_18
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getRight()I
 
@@ -4330,23 +4441,21 @@
 
     invoke-static {v13, v1}, Ljava/lang/Math;->max(II)I
 
-    move-result v1
+    move-result v13
 
-    move v13, v1
+    :cond_18
+    const/16 v23, 0x1
 
-    :cond_16
-    const/16 v24, 0x1
-
-    :cond_17
+    :cond_19
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getHeight()I
 
     move-result v1
 
-    if-eq v9, v1, :cond_1a
+    if-eq v9, v1, :cond_1c
 
     invoke-virtual {v15, v9}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setHeight(I)V
 
-    if-eqz v14, :cond_18
+    if-eqz v14, :cond_1a
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getResolutionHeight()Landroidx/constraintlayout/solver/widgets/ResolutionDimension;
 
@@ -4354,14 +4463,14 @@
 
     invoke-virtual {v1, v9}, Landroidx/constraintlayout/solver/widgets/ResolutionDimension;->resolve(I)V
 
-    :cond_18
-    if-eqz v11, :cond_19
+    :cond_1a
+    if-eqz v11, :cond_1b
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getBottom()I
 
     move-result v1
 
-    if-le v1, v5, :cond_19
+    if-le v1, v5, :cond_1b
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getBottom()I
 
@@ -4385,13 +4494,13 @@
 
     move v5, v1
 
-    :cond_19
-    const/16 v24, 0x1
+    :cond_1b
+    const/16 v23, 0x1
 
-    :cond_1a
+    :cond_1c
     iget-boolean v1, v12, Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->needsBaseline:Z
 
-    if-eqz v1, :cond_1b
+    if-eqz v1, :cond_1d
 
     invoke-virtual {v3}, Landroid/view/View;->getBaseline()I
 
@@ -4399,93 +4508,103 @@
 
     const/4 v9, -0x1
 
-    if-eq v1, v9, :cond_1b
+    if-eq v1, v9, :cond_1d
 
     invoke-virtual {v15}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getBaselineDistance()I
 
     move-result v9
 
-    if-eq v1, v9, :cond_1b
+    if-eq v1, v9, :cond_1d
 
     invoke-virtual {v15, v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->setBaselineDistance(I)V
 
-    const/16 v24, 0x1
+    const/16 v23, 0x1
 
-    :cond_1b
+    :cond_1d
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v9, 0xb
 
-    if-lt v1, v9, :cond_1c
+    if-lt v1, v9, :cond_1e
 
     invoke-virtual {v3}, Landroid/view/View;->getMeasuredState()I
 
     move-result v1
 
-    move/from16 v3, v19
+    move/from16 v3, v17
 
     invoke-static {v3, v1}, Landroidx/constraintlayout/widget/ConstraintLayout;->combineMeasuredStates(II)I
 
-    move-result v19
+    move-result v17
 
-    goto :goto_c
+    move/from16 v10, v23
 
-    :cond_1c
-    move/from16 v3, v19
-
-    goto :goto_c
-
-    :cond_1d
-    move/from16 v24, v10
-
-    goto :goto_b
+    goto :goto_d
 
     :cond_1e
-    move/from16 v23, v9
+    move/from16 v3, v17
 
-    move/from16 v24, v10
+    move/from16 v10, v23
+
+    goto :goto_d
+
+    :cond_1f
+    move/from16 v3, v17
+
+    goto :goto_c
+
+    :cond_20
+    move/from16 v23, v10
+
+    move/from16 v3, v17
+
+    goto :goto_c
+
+    :cond_21
+    move/from16 v20, v9
+
+    move/from16 v23, v10
 
     move/from16 v22, v12
 
-    :cond_1f
-    :goto_b
-    move/from16 v3, v19
-
-    move/from16 v19, v3
+    move/from16 v3, v17
 
     :goto_c
-    move/from16 v10, v24
+    move/from16 v17, v3
 
+    move/from16 v10, v23
+
+    :goto_d
     add-int/lit8 v4, v4, 0x1
 
+    move/from16 v9, v20
+
     move/from16 v3, v21
 
     move/from16 v12, v22
 
-    move/from16 v9, v23
-
     move/from16 v1, p1
 
     const/high16 v15, 0x40000000    # 2.0f
 
     goto/16 :goto_8
 
-    :cond_20
+    :cond_22
     move/from16 v21, v3
 
-    move/from16 v23, v9
+    move/from16 v20, v9
 
-    move/from16 v24, v10
+    move/from16 v23, v10
 
     move/from16 v22, v12
 
-    move/from16 v3, v19
+    move/from16 v3, v17
 
-    if-eqz v24, :cond_24
+    if-eqz v23, :cond_26
 
     iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
-    move/from16 v4, v23
+    move/from16 v4, v20
 
     invoke-virtual {v1, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V
 
@@ -4495,13 +4614,13 @@
 
     invoke-virtual {v1, v4}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V
 
-    if-eqz v14, :cond_21
+    if-eqz v14, :cond_23
 
     iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->solveGraph()V
 
-    :cond_21
+    :cond_23
     const-string v1, "2nd pass"
 
     invoke-virtual {v0, v1}, Landroidx/constraintlayout/widget/ConstraintLayout;->solveLinearSystem(Ljava/lang/String;)V
@@ -4512,7 +4631,7 @@
 
     move-result v1
 
-    if-ge v1, v13, :cond_22
+    if-ge v1, v13, :cond_24
 
     iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
@@ -4520,45 +4639,45 @@
 
     const/4 v11, 0x1
 
-    goto :goto_d
+    goto :goto_e
 
-    :cond_22
+    :cond_24
     const/4 v11, 0x0
 
-    :goto_d
+    :goto_e
     iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getHeight()I
 
     move-result v1
 
-    if-ge v1, v5, :cond_23
+    if-ge v1, v5, :cond_25
 
     iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
     invoke-virtual {v1, v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V
 
-    const/16 v18, 0x1
+    const/16 v16, 0x1
 
-    goto :goto_e
+    goto :goto_f
 
-    :cond_23
-    move/from16 v18, v11
+    :cond_25
+    move/from16 v16, v11
 
-    :goto_e
-    if-eqz v18, :cond_24
+    :goto_f
+    if-eqz v16, :cond_26
 
     const-string v1, "3rd pass"
 
     invoke-virtual {v0, v1}, Landroidx/constraintlayout/widget/ConstraintLayout;->solveLinearSystem(Ljava/lang/String;)V
 
-    :cond_24
+    :cond_26
     move/from16 v1, v21
 
     const/4 v4, 0x0
 
-    :goto_f
-    if-ge v4, v1, :cond_2a
+    :goto_10
+    if-ge v4, v1, :cond_2d
 
     iget-object v5, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mVariableDimensionsWidgets:Ljava/util/ArrayList;
 
@@ -4574,7 +4693,7 @@
 
     check-cast v6, Landroid/view/View;
 
-    if-eqz v6, :cond_26
+    if-eqz v6, :cond_2a
 
     invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
 
@@ -4584,7 +4703,7 @@
 
     move-result v10
 
-    if-ne v9, v10, :cond_25
+    if-ne v9, v10, :cond_28
 
     invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I
 
@@ -4594,16 +4713,26 @@
 
     move-result v10
 
-    if-eq v9, v10, :cond_26
+    if-eq v9, v10, :cond_27
 
-    :cond_25
+    goto :goto_11
+
+    :cond_27
+    const/16 v10, 0x8
+
+    const/high16 v11, 0x40000000    # 2.0f
+
+    goto :goto_12
+
+    :cond_28
+    :goto_11
     invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getVisibility()I
 
     move-result v9
 
     const/16 v10, 0x8
 
-    if-eq v9, v10, :cond_27
+    if-eq v9, v10, :cond_29
 
     invoke-virtual {v5}, Landroidx/constraintlayout/solver/widgets/ConstraintWidget;->getWidth()I
 
@@ -4627,34 +4756,36 @@
 
     iget-object v5, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
 
-    if-eqz v5, :cond_28
-
-    iget-object v5, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
+    if-eqz v5, :cond_2b
 
     iget-wide v12, v5, Landroidx/constraintlayout/solver/Metrics;->additionalMeasures:J
 
-    add-long v12, v12, v16
+    add-long v12, v12, v18
 
     iput-wide v12, v5, Landroidx/constraintlayout/solver/Metrics;->additionalMeasures:J
 
-    goto :goto_10
-
-    :cond_26
-    const/16 v10, 0x8
-
-    :cond_27
-    const/high16 v11, 0x40000000    # 2.0f
-
-    :cond_28
-    :goto_10
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_f
+    goto :goto_12
 
     :cond_29
-    const/4 v3, 0x0
+    const/high16 v11, 0x40000000    # 2.0f
+
+    goto :goto_12
 
     :cond_2a
+    const/16 v10, 0x8
+
+    const/high16 v11, 0x40000000    # 2.0f
+
+    :cond_2b
+    :goto_12
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_10
+
+    :cond_2c
+    const/4 v3, 0x0
+
+    :cond_2d
     iget-object v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
     invoke-virtual {v1}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->getWidth()I
@@ -4675,7 +4806,7 @@
 
     const/16 v6, 0xb
 
-    if-lt v5, v6, :cond_2d
+    if-lt v5, v6, :cond_30
 
     move/from16 v5, p1
 
@@ -4715,22 +4846,22 @@
 
     const/high16 v4, 0x1000000
 
-    if-eqz v3, :cond_2b
+    if-eqz v3, :cond_2e
 
     or-int/2addr v1, v4
 
-    :cond_2b
+    :cond_2e
     iget-object v3, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLayoutWidget:Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;
 
     invoke-virtual {v3}, Landroidx/constraintlayout/solver/widgets/ConstraintWidgetContainer;->isHeightMeasuredTooSmall()Z
 
     move-result v3
 
-    if-eqz v3, :cond_2c
+    if-eqz v3, :cond_2f
 
     or-int/2addr v2, v4
 
-    :cond_2c
+    :cond_2f
     invoke-virtual {v0, v1, v2}, Landroidx/constraintlayout/widget/ConstraintLayout;->setMeasuredDimension(II)V
 
     iput v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLastMeasureWidth:I
@@ -4739,7 +4870,7 @@
 
     return-void
 
-    :cond_2d
+    :cond_30
     invoke-virtual {v0, v1, v4}, Landroidx/constraintlayout/widget/ConstraintLayout;->setMeasuredDimension(II)V
 
     iput v1, v0, Landroidx/constraintlayout/widget/ConstraintLayout;->mLastMeasureWidth:I
@@ -5120,8 +5251,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/constraintlayout/widget/ConstraintLayout;->mMetrics:Landroidx/constraintlayout/solver/Metrics;
-
     iget-wide v0, p1, Landroidx/constraintlayout/solver/Metrics;->resolutions:J
 
     const-wide/16 v2, 0x1
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$1.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$1.smali
index 9668f19d5b..39fa569f07 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$1.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/constraintlayout/widget/ConstraintSet$1;
 .super Ljava/lang/Object;
+.source "ConstraintSet.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$Constraint.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$Constraint.smali
index 7f7114e47b..cea7bc9e4c 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$Constraint.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet$Constraint.smali
@@ -1,5 +1,6 @@
 .class Landroidx/constraintlayout/widget/ConstraintSet$Constraint;
 .super Ljava/lang/Object;
+.source "ConstraintSet.java"
 
 
 # annotations
@@ -1176,11 +1177,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
-
-    iget-object v2, p0, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
-
-    array-length v2, v2
+    array-length v2, v1
 
     invoke-static {v1, v2}, Ljava/util/Arrays;->copyOf([II)[I
 
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali
index 76c8871c1c..e8592609e5 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/ConstraintSet;
 .super Ljava/lang/Object;
+.source "ConstraintSet.java"
 
 
 # annotations
@@ -1133,6 +1134,8 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/constraintlayout/widget/ConstraintSet$Constraint;
@@ -1259,7 +1262,6 @@
 
     invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    :goto_1
     invoke-static {v2}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
 
     move-result-object v5
@@ -1284,7 +1286,7 @@
 
     invoke-static {v3, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_0
     const-string v3, "ConstraintSet"
@@ -1295,7 +1297,31 @@
 
     invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_1
+    invoke-static {v2}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v5, "   "
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v5, Landroidx/constraintlayout/widget/ConstraintSet;->mapToConstant:Landroid/util/SparseIntArray;
+
+    invoke-virtual {v5, v2}, Landroid/util/SparseIntArray;->get(I)I
+
+    move-result v2
+
+    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v3, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto/16 :goto_1
 
     :pswitch_1
     iget-boolean v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mBarrierAllowsGoneWidgets:Z
@@ -1306,7 +1332,7 @@
 
     iput-boolean v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mBarrierAllowsGoneWidgets:Z
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_2
     invoke-virtual {p2, v2}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
@@ -1315,7 +1341,7 @@
 
     iput-object v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIdString:Ljava/lang/String;
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_3
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mBarrierDirection:I
@@ -1326,7 +1352,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mBarrierDirection:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_4
     const-string v2, "ConstraintSet"
@@ -1335,7 +1361,7 @@
 
     invoke-static {v2, v3}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_5
     invoke-virtual {p2, v2, v4}, Landroid/content/res/TypedArray;->getFloat(IF)F
@@ -1344,7 +1370,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->heightPercent:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_6
     invoke-virtual {p2, v2, v4}, Landroid/content/res/TypedArray;->getFloat(IF)F
@@ -1353,7 +1379,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->widthPercent:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_7
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->circleAngle:F
@@ -1364,7 +1390,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->circleAngle:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_8
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->circleRadius:I
@@ -1375,7 +1401,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->circleRadius:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_9
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->circleConstraint:I
@@ -1386,7 +1412,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->circleConstraint:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_a
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rotation:F
@@ -1397,7 +1423,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rotation:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_b
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->translationZ:F
@@ -1408,7 +1434,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->translationZ:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_c
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->translationY:F
@@ -1419,7 +1445,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->translationY:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_d
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->translationX:F
@@ -1430,7 +1456,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->translationX:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_e
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->transformPivotY:F
@@ -1441,7 +1467,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->transformPivotY:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_f
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->transformPivotX:F
@@ -1452,7 +1478,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->transformPivotX:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_10
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->scaleY:F
@@ -1463,7 +1489,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->scaleY:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_11
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->scaleX:F
@@ -1474,7 +1500,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->scaleX:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_12
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rotationY:F
@@ -1485,7 +1511,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rotationY:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_13
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rotationX:F
@@ -1496,7 +1522,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rotationX:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_14
     const/4 v3, 0x1
@@ -1511,7 +1537,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->elevation:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_15
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->alpha:F
@@ -1522,7 +1548,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->alpha:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_16
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->verticalChainStyle:I
@@ -1533,7 +1559,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->verticalChainStyle:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_17
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->horizontalChainStyle:I
@@ -1544,7 +1570,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->horizontalChainStyle:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_18
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->verticalWeight:F
@@ -1555,7 +1581,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->verticalWeight:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_19
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->horizontalWeight:F
@@ -1566,7 +1592,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->horizontalWeight:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_1a
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mViewId:I
@@ -1577,7 +1603,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mViewId:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_1b
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->verticalBias:F
@@ -1588,7 +1614,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->verticalBias:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_1c
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topToTop:I
@@ -1599,7 +1625,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topToTop:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_1d
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topToBottom:I
@@ -1610,7 +1636,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topToBottom:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_1e
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topMargin:I
@@ -1621,7 +1647,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_1f
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->startToStart:I
@@ -1632,7 +1658,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->startToStart:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_20
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->startToEnd:I
@@ -1643,7 +1669,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->startToEnd:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_21
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->startMargin:I
@@ -1654,7 +1680,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->startMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_22
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightToRight:I
@@ -1665,7 +1691,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightToRight:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_23
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightToLeft:I
@@ -1676,7 +1702,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightToLeft:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_24
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightMargin:I
@@ -1687,7 +1713,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_25
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->orientation:I
@@ -1698,7 +1724,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->orientation:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_26
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftToRight:I
@@ -1709,7 +1735,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftToRight:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_27
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftToLeft:I
@@ -1720,7 +1746,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftToLeft:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_28
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftMargin:I
@@ -1731,7 +1757,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_29
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mWidth:I
@@ -1742,7 +1768,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mWidth:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_2a
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->visibility:I
@@ -1761,7 +1787,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->visibility:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_2b
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mHeight:I
@@ -1772,7 +1798,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mHeight:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_2c
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->horizontalBias:F
@@ -1783,7 +1809,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->horizontalBias:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_2d
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->guidePercent:F
@@ -1794,7 +1820,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->guidePercent:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_2e
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->guideEnd:I
@@ -1805,7 +1831,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->guideEnd:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_2f
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->guideBegin:I
@@ -1816,7 +1842,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->guideBegin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_30
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneTopMargin:I
@@ -1827,7 +1853,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneTopMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_31
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneStartMargin:I
@@ -1838,7 +1864,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneStartMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_32
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneRightMargin:I
@@ -1849,7 +1875,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneRightMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_33
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneLeftMargin:I
@@ -1860,7 +1886,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneLeftMargin:I
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :pswitch_34
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneEndMargin:I
@@ -1871,7 +1897,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneEndMargin:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_35
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneBottomMargin:I
@@ -1882,7 +1908,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneBottomMargin:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_36
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->endToStart:I
@@ -1893,7 +1919,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->endToStart:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_37
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->endToEnd:I
@@ -1904,7 +1930,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->endToEnd:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_38
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->endMargin:I
@@ -1915,7 +1941,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->endMargin:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_39
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->editorAbsoluteY:I
@@ -1926,7 +1952,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->editorAbsoluteY:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_3a
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->editorAbsoluteX:I
@@ -1937,7 +1963,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->editorAbsoluteX:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_3b
     invoke-virtual {p2, v2}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
@@ -1946,7 +1972,7 @@
 
     iput-object v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->dimensionRatio:Ljava/lang/String;
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_3c
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomToTop:I
@@ -1957,7 +1983,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomToTop:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_3d
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomToBottom:I
@@ -1968,7 +1994,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomToBottom:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_3e
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomMargin:I
@@ -1979,7 +2005,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomMargin:I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_3f
     iget v3, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->baselineToBaseline:I
@@ -1990,7 +2016,7 @@
 
     iput v2, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->baselineToBaseline:I
 
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto/16 :goto_0
@@ -1998,8 +2024,6 @@
     :cond_0
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_3f
@@ -2140,9 +2164,9 @@
 .method public addToHorizontalChain(III)V
     .locals 8
 
-    const/4 v6, 0x2
+    const/4 v6, 0x1
 
-    const/4 v7, 0x1
+    const/4 v7, 0x2
 
     if-nez p2, :cond_0
 
@@ -2228,9 +2252,9 @@
 .method public addToHorizontalChainRTL(III)V
     .locals 8
 
-    const/4 v6, 0x7
+    const/4 v6, 0x6
 
-    const/4 v7, 0x6
+    const/4 v7, 0x7
 
     if-nez p2, :cond_0
 
@@ -2316,9 +2340,9 @@
 .method public addToVerticalChain(III)V
     .locals 14
 
-    const/4 v6, 0x4
+    const/4 v6, 0x3
 
-    const/4 v7, 0x3
+    const/4 v7, 0x4
 
     if-nez p2, :cond_0
 
@@ -2494,7 +2518,7 @@
 
     if-eq v3, v4, :cond_1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     move-object v3, v5
@@ -2515,12 +2539,11 @@
 
     if-eqz v4, :cond_2
 
-    :goto_1
     iget-object v4, v7, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
 
     invoke-virtual {v3, v4}, Landroidx/constraintlayout/widget/Barrier;->setReferencedIds([I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     iget-object v4, v7, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIdString:Ljava/lang/String;
@@ -2535,10 +2558,12 @@
 
     iput-object v4, v7, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
 
-    goto :goto_1
+    iget-object v4, v7, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
+
+    invoke-virtual {v3, v4}, Landroidx/constraintlayout/widget/Barrier;->setReferencedIds([I)V
 
     :cond_3
-    :goto_2
+    :goto_1
     invoke-virtual {v5}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v3
@@ -2655,7 +2680,7 @@
     move-result-object v0
 
     :cond_9
-    :goto_3
+    :goto_2
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
@@ -2684,7 +2709,7 @@
 
     if-eq v5, v4, :cond_a
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_a
     new-instance v5, Landroidx/constraintlayout/widget/Barrier;
@@ -2705,12 +2730,11 @@
 
     if-eqz v6, :cond_b
 
-    :goto_4
     iget-object v6, v2, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
 
     invoke-virtual {v5, v6}, Landroidx/constraintlayout/widget/Barrier;->setReferencedIds([I)V
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_b
     iget-object v6, v2, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIdString:Ljava/lang/String;
@@ -2725,10 +2749,12 @@
 
     iput-object v6, v2, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
 
-    goto :goto_4
+    iget-object v6, v2, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mReferenceIds:[I
+
+    invoke-virtual {v5, v6}, Landroidx/constraintlayout/widget/Barrier;->setReferencedIds([I)V
 
     :cond_c
-    :goto_5
+    :goto_3
     iget v6, v2, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mBarrierDirection:I
 
     invoke-virtual {v5, v6}, Landroidx/constraintlayout/widget/Barrier;->setType(I)V
@@ -2744,7 +2770,7 @@
     invoke-virtual {p1, v5, v6}, Landroidx/constraintlayout/widget/ConstraintLayout;->addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
 
     :cond_d
-    :goto_6
+    :goto_4
     iget-boolean v5, v2, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->mIsGuideline:Z
 
     if-eqz v5, :cond_9
@@ -2771,7 +2797,7 @@
 
     invoke-virtual {p1, v5, v1}, Landroidx/constraintlayout/widget/ConstraintLayout;->addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_e
     return-void
@@ -2999,7 +3025,6 @@
 
     move v1, p1
 
-    :goto_0
     invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/widget/ConstraintSet;->center(IIIIIIIF)V
 
     return-void
@@ -3023,7 +3048,9 @@
 
     move v5, p2
 
-    goto :goto_0
+    invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/widget/ConstraintSet;->center(IIIIIIIF)V
+
+    return-void
 .end method
 
 .method public centerHorizontally(IIIIIIIF)V
@@ -3099,7 +3126,6 @@
 
     move v1, p1
 
-    :goto_0
     invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/widget/ConstraintSet;->center(IIIIIIIF)V
 
     return-void
@@ -3123,7 +3149,9 @@
 
     move v5, p2
 
-    goto :goto_0
+    invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/widget/ConstraintSet;->center(IIIIIIIF)V
+
+    return-void
 .end method
 
 .method public centerHorizontallyRtl(IIIIIIIF)V
@@ -3199,7 +3227,6 @@
 
     move v1, p1
 
-    :goto_0
     invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/widget/ConstraintSet;->center(IIIIIIIF)V
 
     return-void
@@ -3223,7 +3250,9 @@
 
     move v5, p2
 
-    goto :goto_0
+    invoke-virtual/range {v0 .. v8}, Landroidx/constraintlayout/widget/ConstraintSet;->center(IIIIIIIF)V
+
+    return-void
 .end method
 
 .method public centerVertically(IIIIIIIF)V
@@ -3398,10 +3427,10 @@
 
     iput v0, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->goneLeftMargin:I
 
-    :cond_0
     return-void
 
-    nop
+    :cond_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -4483,10 +4512,9 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomToTop:I
 
-    :goto_2
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->baselineToBaseline:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     if-ne p4, v4, :cond_7
@@ -4495,9 +4523,9 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomToBottom:I
 
-    goto :goto_2
+    iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->baselineToBaseline:I
 
-    :goto_3
+    :goto_2
     iput p5, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->bottomMargin:I
 
     return-void
@@ -4536,10 +4564,9 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topToBottom:I
 
-    :goto_4
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->baselineToBaseline:I
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_8
     if-ne p4, v3, :cond_9
@@ -4548,9 +4575,9 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topToTop:I
 
-    goto :goto_4
+    iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->baselineToBaseline:I
 
-    :goto_5
+    :goto_3
     iput p5, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->topMargin:I
 
     return-void
@@ -4589,7 +4616,7 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightToRight:I
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_a
     if-ne p4, v0, :cond_b
@@ -4598,7 +4625,7 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightToLeft:I
 
-    :goto_6
+    :goto_4
     iput p5, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->rightMargin:I
 
     return-void
@@ -4637,7 +4664,7 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftToRight:I
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_c
     if-ne p4, v0, :cond_d
@@ -4646,7 +4673,7 @@
 
     iput v6, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftToLeft:I
 
-    :goto_7
+    :goto_5
     iput p5, p1, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftMargin:I
 
     return-void
@@ -5078,6 +5105,8 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public getApplyElevation(I)Z
@@ -5235,7 +5264,7 @@
 
     if-eq v7, v1, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget v2, v0, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->startToEnd:I
@@ -5275,10 +5304,9 @@
 
     move v3, v6
 
-    :goto_0
     invoke-virtual/range {v0 .. v5}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     if-ne v6, v1, :cond_3
@@ -5302,6 +5330,8 @@
 
     move v1, v6
 
+    invoke-virtual/range {v0 .. v5}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
+
     goto :goto_0
 
     :cond_4
@@ -5321,10 +5351,10 @@
 
     move v1, v7
 
-    goto :goto_0
+    invoke-virtual/range {v0 .. v5}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
 
     :cond_5
-    :goto_1
+    :goto_0
     const/4 v0, 0x6
 
     invoke-virtual {p0, p1, v0}, Landroidx/constraintlayout/widget/ConstraintSet;->clear(II)V
@@ -5333,10 +5363,10 @@
 
     invoke-virtual {p0, p1, v0}, Landroidx/constraintlayout/widget/ConstraintSet;->clear(II)V
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_6
-    :goto_2
+    :goto_1
     if-eq v6, v1, :cond_7
 
     if-eq v7, v1, :cond_7
@@ -5363,10 +5393,9 @@
 
     move v3, v6
 
-    :goto_3
     invoke-virtual/range {v0 .. v5}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_7
     if-ne v6, v1, :cond_8
@@ -5390,7 +5419,9 @@
 
     move v1, v6
 
-    goto :goto_3
+    invoke-virtual/range {v0 .. v5}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
+
+    goto :goto_2
 
     :cond_9
     iget v2, v0, Landroidx/constraintlayout/widget/ConstraintSet$Constraint;->leftToLeft:I
@@ -5409,10 +5440,10 @@
 
     move v1, v7
 
-    goto :goto_3
+    invoke-virtual/range {v0 .. v5}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
 
     :cond_a
-    :goto_4
+    :goto_2
     const/4 v0, 0x1
 
     invoke-virtual {p0, p1, v0}, Landroidx/constraintlayout/widget/ConstraintSet;->clear(II)V
@@ -5421,8 +5452,10 @@
 
     invoke-virtual {p0, p1, v0}, Landroidx/constraintlayout/widget/ConstraintSet;->clear(II)V
 
+    return-void
+
     :cond_b
-    :goto_5
+    :goto_3
     return-void
 .end method
 
@@ -5490,10 +5523,9 @@
 
     move v4, v7
 
-    :goto_0
     invoke-virtual/range {v1 .. v6}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     if-ne v7, v1, :cond_2
@@ -5517,6 +5549,8 @@
 
     move v2, v7
 
+    invoke-virtual/range {v1 .. v6}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
+
     goto :goto_0
 
     :cond_3
@@ -5536,10 +5570,10 @@
 
     move v2, v8
 
-    goto :goto_0
+    invoke-virtual/range {v1 .. v6}, Landroidx/constraintlayout/widget/ConstraintSet;->connect(IIIII)V
 
     :cond_4
-    :goto_1
+    :goto_0
     const/4 v0, 0x3
 
     invoke-virtual {p0, p1, v0}, Landroidx/constraintlayout/widget/ConstraintSet;->clear(II)V
diff --git a/com.discord/smali/androidx/constraintlayout/widget/Constraints$LayoutParams.smali b/com.discord/smali/androidx/constraintlayout/widget/Constraints$LayoutParams.smali
index 788e187328..a7d94b92d1 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/Constraints$LayoutParams.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/Constraints$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/Constraints$LayoutParams;
 .super Landroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;
+.source "Constraints.java"
 
 
 # annotations
@@ -148,7 +149,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->alpha:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_elevation:I
@@ -167,7 +168,7 @@
 
     iput-boolean v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->applyElevation:Z
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_1
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_rotationX:I
@@ -182,7 +183,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->rotationX:F
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_2
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_rotationY:I
@@ -197,7 +198,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->rotationY:F
 
-    goto :goto_2
+    goto/16 :goto_1
 
     :cond_3
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_rotation:I
@@ -212,7 +213,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->rotation:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_scaleX:I
@@ -227,7 +228,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->scaleX:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_scaleY:I
@@ -242,7 +243,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->scaleY:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_transformPivotX:I
@@ -257,7 +258,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->transformPivotX:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_7
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_transformPivotY:I
@@ -272,7 +273,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->transformPivotY:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_8
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_translationX:I
@@ -281,14 +282,13 @@
 
     iget v2, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->translationX:F
 
-    :goto_1
     invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getFloat(IF)F
 
     move-result v0
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->translationX:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_9
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_translationY:I
@@ -303,7 +303,7 @@
 
     iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->translationY:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_a
     sget v2, Landroidx/constraintlayout/widget/R$styleable;->ConstraintSet_android_translationZ:I
@@ -312,10 +312,14 @@
 
     iget v2, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->translationZ:F
 
-    goto :goto_1
+    invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result v0
+
+    iput v0, p0, Landroidx/constraintlayout/widget/Constraints$LayoutParams;->translationX:F
 
     :cond_b
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto/16 :goto_0
diff --git a/com.discord/smali/androidx/constraintlayout/widget/Constraints.smali b/com.discord/smali/androidx/constraintlayout/widget/Constraints.smali
index f87e79b560..8f2c57d607 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/Constraints.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/Constraints.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/Constraints;
 .super Landroid/view/ViewGroup;
+.source "Constraints.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/widget/Group.smali b/com.discord/smali/androidx/constraintlayout/widget/Group.smali
index 9f2a0c5b97..ab751b6ee7 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/Group.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/Group.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/Group;
 .super Landroidx/constraintlayout/widget/ConstraintHelper;
+.source "Group.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/Guideline.smali b/com.discord/smali/androidx/constraintlayout/widget/Guideline.smali
index 27c3fa891d..03817d51a2 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/Guideline.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/Guideline.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/Guideline;
 .super Landroid/view/View;
+.source "Guideline.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/Placeholder.smali b/com.discord/smali/androidx/constraintlayout/widget/Placeholder.smali
index fc21303bd2..3a63825268 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/Placeholder.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/Placeholder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/constraintlayout/widget/Placeholder;
 .super Landroid/view/View;
+.source "Placeholder.java"
 
 
 # instance fields
@@ -255,9 +256,7 @@
 
     const-string v5, "?"
 
-    invoke-virtual {v5}, Ljava/lang/String;->length()I
-
-    move-result v6
+    const/4 v6, 0x1
 
     invoke-virtual {v0, v5, v2, v6, v1}, Landroid/graphics/Paint;->getTextBounds(Ljava/lang/String;IILandroid/graphics/Rect;)V
 
@@ -323,8 +322,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/constraintlayout/widget/Placeholder;->mContent:Landroid/view/View;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
@@ -469,8 +466,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/constraintlayout/widget/Placeholder;->mContent:Landroid/view/View;
-
     invoke-virtual {p1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali b/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
index 4df1c80346..b29a868c71 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/constraintlayout/widget/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
index 5a736188e6..c060432a7b 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/constraintlayout/widget/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali b/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
index bef954b259..c9bfcb5e42 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/constraintlayout/widget/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R.smali b/com.discord/smali/androidx/constraintlayout/widget/R.smali
index a9c1a6f949..0789bf317c 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/constraintlayout/widget/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
index 23f7434d88..06e3c1caaf 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$color.smali b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
index 07eb2c6a0b..6c154037df 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$color.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
index 9182d8e125..ae53cce595 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 91ca997a4b..b57b5e6670 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index 276da82801..4654cf875a 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$id.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$integer.smali b/com.discord/smali/androidx/coordinatorlayout/R$integer.smali
index 15ccecdd1a..6041368115 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$integer.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$layout.smali b/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
index f1b8bda8b7..4c89b72e38 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index 1484216f80..a200e214e1 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$style.smali b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
index 5a975867a8..d2b771c856 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$style.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
index dbc20f456f..90995bd74c 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/R.smali b/com.discord/smali/androidx/coordinatorlayout/R.smali
index cfaf7259e9..c05d31a486 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$1.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$1.smali
index b34541d7b4..9b9c3ab9a0 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$1.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/coordinatorlayout/widget/CoordinatorLayout$1;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Landroidx/core/view/OnApplyWindowInsetsListener;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior.smali
index 5cac71569a..c4210258b1 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali
index d32fff042b..0ed15e1d08 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior.smali
index a192eccc92..7b50d7f23a 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali
index af8093fd87..5e00911268 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener.smali
index 6daab1e6d5..16afc0c3d0 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Landroid/view/ViewGroup$OnHierarchyChangeListener;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams.smali
index 21402ac160..4429ea038c 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "CoordinatorLayout.java"
 
 
 # annotations
@@ -206,8 +207,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
-
     invoke-virtual {p1, p0}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onAttachedToLayoutParams(Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;)V
 
     :cond_1
@@ -327,8 +326,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
-
     if-ne v0, p2, :cond_1
 
     invoke-virtual {p2}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->isInEditMode()Z
@@ -337,7 +334,6 @@
 
     if-eqz p1, :cond_0
 
-    :goto_0
     iput-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorDirectChild:Landroid/view/View;
 
     iput-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
@@ -354,15 +350,11 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
-
-    iget-object v2, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
-
-    invoke-virtual {v2}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+    invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v2
 
-    :goto_1
+    :goto_0
     if-eq v2, p2, :cond_5
 
     if-eqz v2, :cond_5
@@ -375,7 +367,11 @@
 
     if-eqz p1, :cond_2
 
-    goto :goto_0
+    iput-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorDirectChild:Landroid/view/View;
+
+    iput-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
+
+    return-void
 
     :cond_2
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -400,7 +396,7 @@
 
     move-result-object v2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_5
     iput-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorDirectChild:Landroid/view/View;
@@ -414,7 +410,11 @@
 
     if-eqz v0, :cond_7
 
-    goto :goto_0
+    iput-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorDirectChild:Landroid/view/View;
+
+    iput-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
+
+    return-void
 
     :cond_7
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -450,6 +450,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private shouldDodge(Landroid/view/View;I)Z
@@ -509,9 +511,7 @@
     :cond_0
     iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
 
-    iget-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View;
-
-    invoke-virtual {v1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+    invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v1
 
@@ -604,8 +604,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
-
     invoke-virtual {v0, p1, p2, p3}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->layoutDependsOn(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)Z
 
     move-result p1
@@ -740,14 +738,10 @@
     return p1
 
     :cond_0
-    iget-boolean v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mDidBlockInteraction:Z
-
     iget-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
-
     invoke-virtual {v1, p1, p2}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->blocksInteractionBelow(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;)Z
 
     move-result p1
@@ -848,12 +842,8 @@
 
     if-eq v0, p1, :cond_1
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
-
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
-
     invoke-virtual {v0}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onDetachedFromLayoutParams()V
 
     :cond_0
@@ -908,9 +898,13 @@
     :pswitch_1
     iput-boolean p2, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mDidAcceptNestedScrollTouch:Z
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$OnPreDrawListener.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$OnPreDrawListener.smali
index 666e67a0a0..f5aaf17032 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$OnPreDrawListener.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$OnPreDrawListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/coordinatorlayout/widget/CoordinatorLayout$OnPreDrawListener;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnPreDrawListener;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState$1.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState$1.smali
index caf0dd7737..33cb0e4231 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState$1.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/coordinatorlayout/widget/CoordinatorLayout$SavedState$1;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState.smali
index 35d85e18bc..7d148c2784 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/coordinatorlayout/widget/CoordinatorLayout$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "CoordinatorLayout.java"
 
 
 # annotations
@@ -115,8 +116,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$SavedState;->behaviorStates:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$ViewElevationComparator.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$ViewElevationComparator.smali
index 5c4d07fd6a..63f03fd5fa 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$ViewElevationComparator.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$ViewElevationComparator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/coordinatorlayout/widget/CoordinatorLayout$ViewElevationComparator;
 .super Ljava/lang/Object;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali
index b5cf6b601b..46d2c00cf4 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 .super Landroid/view/ViewGroup;
+.source "CoordinatorLayout.java"
 
 # interfaces
 .implements Landroidx/core/view/NestedScrollingParent2;
@@ -741,7 +742,6 @@
 
     invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    :goto_0
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
@@ -753,23 +753,19 @@
     :cond_0
     if-ltz p1, :cond_2
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mKeylines:[I
+    array-length v2, v0
 
-    array-length v0, v0
+    if-lt p1, v2, :cond_1
 
-    if-lt p1, v0, :cond_1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mKeylines:[I
-
     aget p1, v0, p1
 
     return p1
 
     :cond_2
-    :goto_1
+    :goto_0
     const-string v0, "CoordinatorLayout"
 
     new-instance v2, Ljava/lang/StringBuilder;
@@ -786,7 +782,13 @@
 
     invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    goto :goto_0
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {v0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return v1
 .end method
 
 .method private getTopSortedChildren(Ljava/util/List;)V
@@ -842,8 +844,6 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->TOP_SORTED_CHILDREN_COMPARATOR:Ljava/util/Comparator;
-
     invoke-static {p1, v0}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
 
     :cond_2
@@ -1521,6 +1521,8 @@
     :cond_a
     invoke-static {v2}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->releaseTempRect(Landroid/graphics/Rect;)V
 
+    return-void
+
     :cond_b
     :goto_3
     return-void
@@ -3060,7 +3062,7 @@
 
     const/4 v2, 0x1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
 
     check-cast p1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior;
 
@@ -3079,21 +3081,19 @@
     :cond_0
     invoke-virtual {v0, p1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->setBehavior(Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;)V
 
-    :cond_1
-    :goto_0
     iput-boolean v2, v0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehaviorResolved:Z
 
     goto :goto_2
 
-    :cond_2
+    :cond_1
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object p1
 
     const/4 v1, 0x0
 
-    :goto_1
-    if-eqz p1, :cond_3
+    :goto_0
+    if-eqz p1, :cond_2
 
     const-class v1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior;
 
@@ -3103,16 +3103,16 @@
 
     check-cast v1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior;
 
-    if-nez v1, :cond_3
+    if-nez v1, :cond_2
 
     invoke-virtual {p1}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_3
-    if-eqz v1, :cond_1
+    :cond_2
+    if-eqz v1, :cond_3
 
     :try_start_0
     invoke-interface {v1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior;->value()Ljava/lang/Class;
@@ -3139,7 +3139,7 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_0
+    goto :goto_1
 
     :catch_0
     move-exception p1
@@ -3172,7 +3172,9 @@
 
     invoke-static {v3, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto :goto_0
+    :cond_3
+    :goto_1
+    iput-boolean v2, v0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->mBehaviorResolved:Z
 
     :cond_4
     :goto_2
@@ -3270,7 +3272,7 @@
 .end method
 
 .method offsetChildToAnchor(Landroid/view/View;I)V
-    .locals 17
+    .locals 16
 
     move-object/from16 v8, p0
 
@@ -3330,7 +3332,7 @@
 
     move v6, v15
 
-    move/from16 v16, v7
+    move/from16 p2, v7
 
     invoke-direct/range {v0 .. v7}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->getDesiredAnchoredChildRectWithoutConstraints(Landroid/view/View;ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;II)V
 
@@ -3350,7 +3352,7 @@
     const/4 v14, 0x1
 
     :cond_1
-    move/from16 v0, v16
+    move/from16 v0, p2
 
     invoke-direct {v8, v10, v13, v15, v0}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->constrainChildRect(Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;Landroid/graphics/Rect;II)V
 
@@ -3786,8 +3788,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mNestedScrollingTarget:Landroid/view/View;
-
     invoke-virtual {p0, v1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->onStopNestedScroll(Landroid/view/View;)V
 
     :cond_1
@@ -3815,8 +3815,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mLastInsets:Landroidx/core/view/WindowInsetsCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
     move-result v0
@@ -4129,9 +4127,9 @@
 
     iget v0, v1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->keyline:I
 
-    if-ltz v0, :cond_7
+    if-ltz v0, :cond_8
 
-    if-eqz v13, :cond_7
+    if-eqz v13, :cond_8
 
     iget v0, v1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->keyline:I
 
@@ -4181,7 +4179,7 @@
 
     const/4 v11, 0x0
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_4
     if-ne v11, v2, :cond_5
@@ -4191,9 +4189,9 @@
     :cond_5
     const/4 v2, 0x3
 
-    if-ne v11, v2, :cond_8
+    if-ne v11, v2, :cond_7
 
-    if-eqz v12, :cond_8
+    if-eqz v12, :cond_7
 
     :cond_6
     sub-int/2addr v0, v8
@@ -4206,17 +4204,22 @@
 
     move/from16 v21, v0
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_7
-    move/from16 v22, v2
-
-    :cond_8
     const/4 v11, 0x0
 
-    const/16 v21, 0x0
+    goto :goto_3
+
+    :cond_8
+    move/from16 v22, v2
+
+    const/4 v11, 0x0
 
     :goto_3
+    const/16 v21, 0x0
+
+    :goto_4
     if-eqz v19, :cond_9
 
     invoke-static/range {v20 .. v20}, Landroidx/core/view/ViewCompat;->getFitsSystemWindows(Landroid/view/View;)Z
@@ -4269,14 +4272,14 @@
 
     move/from16 v23, v2
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_9
     move/from16 v11, p1
 
     move/from16 v23, p2
 
-    :goto_4
+    :goto_5
     invoke-virtual {v1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->getBehavior()Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
 
     move-result-object v0
@@ -4317,7 +4320,7 @@
 
     if-nez v0, :cond_b
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_a
     move-object/from16 v26, v1
@@ -4332,7 +4335,7 @@
 
     move/from16 v22, v5
 
-    :goto_5
+    :goto_6
     const/4 v5, 0x0
 
     move-object/from16 v0, p0
@@ -4404,7 +4407,9 @@
 
     move v3, v2
 
-    goto :goto_6
+    move v2, v1
+
+    goto :goto_7
 
     :cond_c
     move v1, v2
@@ -4417,9 +4422,9 @@
 
     move/from16 v29, v6
 
-    :goto_6
     move v2, v1
 
+    :goto_7
     add-int/lit8 v5, v22, 0x1
 
     move/from16 v6, v29
@@ -4632,11 +4637,11 @@
 .end method
 
 .method public onNestedPreScroll(Landroid/view/View;II[II)V
-    .locals 15
+    .locals 16
 
-    move-object v8, p0
+    move-object/from16 v8, p0
 
-    invoke-virtual {p0}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->getChildCount()I
+    invoke-virtual/range {p0 .. p0}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->getChildCount()I
 
     move-result v9
 
@@ -4653,9 +4658,9 @@
     :goto_0
     const/4 v14, 0x1
 
-    if-ge v11, v9, :cond_3
+    if-ge v11, v9, :cond_4
 
-    invoke-virtual {p0, v11}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {v8, v11}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->getChildAt(I)Landroid/view/View;
 
     move-result-object v2
 
@@ -4673,33 +4678,29 @@
 
     check-cast v1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
 
-    move/from16 v7, p5
+    move/from16 v15, p5
 
-    invoke-virtual {v1, v7}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->isNestedScrollAccepted(I)Z
+    invoke-virtual {v1, v15}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->isNestedScrollAccepted(I)Z
 
     move-result v3
 
-    if-eqz v3, :cond_2
+    if-eqz v3, :cond_3
 
     invoke-virtual {v1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->getBehavior()Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
 
     move-result-object v1
 
-    if-eqz v1, :cond_2
-
-    iget-object v0, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
-
-    iget-object v3, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
-
-    aput v10, v3, v14
-
-    aput v10, v0, v10
+    if-eqz v1, :cond_3
 
     iget-object v6, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
 
+    aput v10, v6, v14
+
+    aput v10, v6, v10
+
     move-object v0, v1
 
-    move-object v1, p0
+    move-object/from16 v1, p0
 
     move-object/from16 v3, p1
 
@@ -4735,47 +4736,53 @@
     :goto_1
     if-lez p3, :cond_1
 
-    iget-object v3, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
+    iget-object v1, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
 
-    aget v3, v3, v14
+    aget v1, v1, v14
 
-    invoke-static {v13, v3}, Ljava/lang/Math;->max(II)I
+    invoke-static {v13, v1}, Ljava/lang/Math;->max(II)I
 
-    move-result v3
+    move-result v1
 
     goto :goto_2
 
     :cond_1
-    iget-object v3, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
+    iget-object v1, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
 
-    aget v3, v3, v14
+    aget v1, v1, v14
 
-    invoke-static {v13, v3}, Ljava/lang/Math;->min(II)I
+    invoke-static {v13, v1}, Ljava/lang/Math;->min(II)I
 
-    move-result v3
+    move-result v1
 
     :goto_2
     move v12, v0
 
-    move v13, v3
+    move v13, v1
 
     const/4 v0, 0x1
 
+    goto :goto_3
+
     :cond_2
+    move/from16 v15, p5
+
+    :cond_3
+    :goto_3
     add-int/lit8 v11, v11, 0x1
 
     goto :goto_0
 
-    :cond_3
+    :cond_4
     aput v12, p4, v10
 
     aput v13, p4, v14
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
-    invoke-virtual {p0, v14}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->onChildViewsChanged(I)V
+    invoke-virtual {v8, v14}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->onChildViewsChanged(I)V
 
-    :cond_4
+    :cond_5
     return-void
 .end method
 
@@ -5312,7 +5319,7 @@
 
     move-result-object v6
 
-    if-eqz v6, :cond_0
+    if-eqz v6, :cond_2
 
     iget-object v7, v0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorTouchView:Landroid/view/View;
 
@@ -5320,12 +5327,17 @@
 
     move-result v6
 
+    goto :goto_1
+
+    :cond_2
+    const/4 v6, 0x0
+
     :goto_1
     iget-object v7, v0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorTouchView:Landroid/view/View;
 
     const/4 v8, 0x0
 
-    if-nez v7, :cond_2
+    if-nez v7, :cond_3
 
     invoke-super/range {p0 .. p1}, Landroid/view/ViewGroup;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -5335,8 +5347,8 @@
 
     goto :goto_2
 
-    :cond_2
-    if-eqz v3, :cond_3
+    :cond_3
+    if-eqz v3, :cond_4
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
@@ -5358,23 +5370,23 @@
 
     invoke-super {v0, v8}, Landroid/view/ViewGroup;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    :cond_3
+    :cond_4
     :goto_2
-    if-eqz v8, :cond_4
+    if-eqz v8, :cond_5
 
     invoke-virtual {v8}, Landroid/view/MotionEvent;->recycle()V
 
-    :cond_4
-    if-eq v2, v4, :cond_5
+    :cond_5
+    if-eq v2, v4, :cond_6
 
     const/4 v1, 0x3
 
-    if-ne v2, v1, :cond_6
-
-    :cond_5
-    invoke-direct {v0, v5}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->resetTouchBehaviors(Z)V
+    if-ne v2, v1, :cond_7
 
     :cond_6
+    invoke-direct {v0, v5}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->resetTouchBehaviors(Z)V
+
+    :cond_7
     return v6
 .end method
 
@@ -5504,14 +5516,10 @@
 
     if-eq v0, p1, :cond_5
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
     :cond_0
@@ -5528,8 +5536,6 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result p1
@@ -5649,8 +5655,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->isVisible()Z
 
     move-result v1
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.smali b/com.discord/smali/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.smali
index 8aeb0800af..9607c300f1 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/coordinatorlayout/widget/DirectedAcyclicGraph;
 .super Ljava/lang/Object;
+.source "DirectedAcyclicGraph.java"
 
 
 # annotations
@@ -168,6 +169,8 @@
     invoke-direct {p1, p2}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private getEmptyList()Ljava/util/ArrayList;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/ViewGroupUtils.smali b/com.discord/smali/androidx/coordinatorlayout/widget/ViewGroupUtils.smali
index 938d0fdd82..afd938ede4 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/ViewGroupUtils.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/ViewGroupUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/coordinatorlayout/widget/ViewGroupUtils;
 .super Ljava/lang/Object;
+.source "ViewGroupUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$attr.smali b/com.discord/smali/androidx/core/R$attr.smali
index f579a3a7a1..6b834dd0e5 100644
--- a/com.discord/smali/androidx/core/R$attr.smali
+++ b/com.discord/smali/androidx/core/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$color.smali b/com.discord/smali/androidx/core/R$color.smali
index adad1c8f74..832aeab713 100644
--- a/com.discord/smali/androidx/core/R$color.smali
+++ b/com.discord/smali/androidx/core/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$dimen.smali b/com.discord/smali/androidx/core/R$dimen.smali
index 108bc93534..3bf8fc69d8 100644
--- a/com.discord/smali/androidx/core/R$dimen.smali
+++ b/com.discord/smali/androidx/core/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index f707282bb2..12a6557dc2 100644
--- a/com.discord/smali/androidx/core/R$drawable.smali
+++ b/com.discord/smali/androidx/core/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index 6e9c1a3191..da7e86c59a 100644
--- a/com.discord/smali/androidx/core/R$id.smali
+++ b/com.discord/smali/androidx/core/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$integer.smali b/com.discord/smali/androidx/core/R$integer.smali
index e4495cc13b..9c24a0f487 100644
--- a/com.discord/smali/androidx/core/R$integer.smali
+++ b/com.discord/smali/androidx/core/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$layout.smali b/com.discord/smali/androidx/core/R$layout.smali
index ae5c18d09a..6e2fbce5fb 100644
--- a/com.discord/smali/androidx/core/R$layout.smali
+++ b/com.discord/smali/androidx/core/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index 2a2eb1df97..90b51bb381 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$style.smali b/com.discord/smali/androidx/core/R$style.smali
index 0341a31121..2cbe8fcbae 100644
--- a/com.discord/smali/androidx/core/R$style.smali
+++ b/com.discord/smali/androidx/core/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R$styleable.smali b/com.discord/smali/androidx/core/R$styleable.smali
index 548553f16e..50cad45055 100644
--- a/com.discord/smali/androidx/core/R$styleable.smali
+++ b/com.discord/smali/androidx/core/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/R.smali b/com.discord/smali/androidx/core/R.smali
index 6d0bc0f112..3fec558e7a 100644
--- a/com.discord/smali/androidx/core/R.smali
+++ b/com.discord/smali/androidx/core/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.smali b/com.discord/smali/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.smali
index 6bd1ef5d43..f4480f139c 100644
--- a/com.discord/smali/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.smali
+++ b/com.discord/smali/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/accessibilityservice/AccessibilityServiceInfoCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityServiceInfoCompat.java"
 
 
 # static fields
@@ -94,10 +95,9 @@
 
     const-string v1, "["
 
-    :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_1
+    :goto_0
     if-lez p0, :cond_4
 
     invoke-static {p0}, Ljava/lang/Integer;->numberOfTrailingZeros(I)I
@@ -137,31 +137,41 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const-string v1, "FEEDBACK_HAPTIC"
 
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :pswitch_1
     const-string v1, "FEEDBACK_SPOKEN"
 
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :cond_1
     const-string v1, "FEEDBACK_GENERIC"
 
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :cond_2
     const-string v1, "FEEDBACK_VISUAL"
 
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :cond_3
     const-string v1, "FEEDBACK_AUDIBLE"
 
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :cond_4
@@ -175,8 +185,6 @@
 
     return-object p0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
diff --git a/com.discord/smali/androidx/core/app/ActivityCompat$1.smali b/com.discord/smali/androidx/core/app/ActivityCompat$1.smali
index 2f48ff50f8..dff8d38b69 100644
--- a/com.discord/smali/androidx/core/app/ActivityCompat$1.smali
+++ b/com.discord/smali/androidx/core/app/ActivityCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/app/ActivityCompat$1;
 .super Ljava/lang/Object;
+.source "ActivityCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback.smali b/com.discord/smali/androidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback.smali
index 8667f59869..fcfa8a4384 100644
--- a/com.discord/smali/androidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback.smali
+++ b/com.discord/smali/androidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback;
 .super Ljava/lang/Object;
+.source "ActivityCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ActivityCompat$PermissionCompatDelegate.smali b/com.discord/smali/androidx/core/app/ActivityCompat$PermissionCompatDelegate.smali
index a65bf0521e..90976e79e2 100644
--- a/com.discord/smali/androidx/core/app/ActivityCompat$PermissionCompatDelegate.smali
+++ b/com.discord/smali/androidx/core/app/ActivityCompat$PermissionCompatDelegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/ActivityCompat$PermissionCompatDelegate;
 .super Ljava/lang/Object;
+.source "ActivityCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali b/com.discord/smali/androidx/core/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali
index 791a42f6d8..f272aebf73 100644
--- a/com.discord/smali/androidx/core/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali
+++ b/com.discord/smali/androidx/core/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/ActivityCompat$RequestPermissionsRequestCodeValidator;
 .super Ljava/lang/Object;
+.source "ActivityCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl$1.smali b/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl$1.smali
index eca462f463..d1a95bbcb9 100644
--- a/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl$1.smali
+++ b/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/ActivityCompat$SharedElementCallback21Impl$1;
 .super Ljava/lang/Object;
+.source "ActivityCompat.java"
 
 # interfaces
 .implements Landroidx/core/app/SharedElementCallback$OnSharedElementsReadyListener;
diff --git a/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl.smali b/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl.smali
index 3f09150e20..27d655877c 100644
--- a/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl.smali
+++ b/com.discord/smali/androidx/core/app/ActivityCompat$SharedElementCallback21Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/ActivityCompat$SharedElementCallback21Impl;
 .super Landroid/app/SharedElementCallback;
+.source "ActivityCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ActivityCompat.smali b/com.discord/smali/androidx/core/app/ActivityCompat.smali
index 42b6684ee7..2ce36fa4e0 100644
--- a/com.discord/smali/androidx/core/app/ActivityCompat.smali
+++ b/com.discord/smali/androidx/core/app/ActivityCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/ActivityCompat;
 .super Landroidx/core/content/ContextCompat;
+.source "ActivityCompat.java"
 
 
 # annotations
@@ -207,8 +208,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/core/app/ActivityCompat;->sDelegate:Landroidx/core/app/ActivityCompat$PermissionCompatDelegate;
-
     invoke-interface {v0, p0, p1, p2}, Landroidx/core/app/ActivityCompat$PermissionCompatDelegate;->requestPermissions(Landroid/app/Activity;[Ljava/lang/String;I)Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/core/app/ActivityManagerCompat.smali b/com.discord/smali/androidx/core/app/ActivityManagerCompat.smali
index 7e666113f2..1d9e15cd89 100644
--- a/com.discord/smali/androidx/core/app/ActivityManagerCompat.smali
+++ b/com.discord/smali/androidx/core/app/ActivityManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/ActivityManagerCompat;
 .super Ljava/lang/Object;
+.source "ActivityManagerCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali b/com.discord/smali/androidx/core/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali
index c880788e13..610f0cbad7 100644
--- a/com.discord/smali/androidx/core/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali
+++ b/com.discord/smali/androidx/core/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/ActivityOptionsCompat$ActivityOptionsCompatImpl;
 .super Landroidx/core/app/ActivityOptionsCompat;
+.source "ActivityOptionsCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ActivityOptionsCompat.smali b/com.discord/smali/androidx/core/app/ActivityOptionsCompat.smali
index b0834293b4..ea2613004a 100644
--- a/com.discord/smali/androidx/core/app/ActivityOptionsCompat.smali
+++ b/com.discord/smali/androidx/core/app/ActivityOptionsCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/ActivityOptionsCompat;
 .super Ljava/lang/Object;
+.source "ActivityOptionsCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/AlarmManagerCompat.smali b/com.discord/smali/androidx/core/app/AlarmManagerCompat.smali
index e3592b78ce..75f90bb9d3 100644
--- a/com.discord/smali/androidx/core/app/AlarmManagerCompat.smali
+++ b/com.discord/smali/androidx/core/app/AlarmManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/AlarmManagerCompat;
 .super Ljava/lang/Object;
+.source "AlarmManagerCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/app/AppComponentFactory.smali b/com.discord/smali/androidx/core/app/AppComponentFactory.smali
index 1d9fafc244..ff51b4ff1b 100644
--- a/com.discord/smali/androidx/core/app/AppComponentFactory.smali
+++ b/com.discord/smali/androidx/core/app/AppComponentFactory.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/AppComponentFactory;
 .super Landroid/app/AppComponentFactory;
+.source "AppComponentFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/AppLaunchChecker.smali b/com.discord/smali/androidx/core/app/AppLaunchChecker.smali
index 5aa970b791..7e8eff7ed5 100644
--- a/com.discord/smali/androidx/core/app/AppLaunchChecker.smali
+++ b/com.discord/smali/androidx/core/app/AppLaunchChecker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/AppLaunchChecker;
 .super Ljava/lang/Object;
+.source "AppLaunchChecker.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/app/AppOpsManagerCompat.smali b/com.discord/smali/androidx/core/app/AppOpsManagerCompat.smali
index c6fd45c018..05f3866eeb 100644
--- a/com.discord/smali/androidx/core/app/AppOpsManagerCompat.smali
+++ b/com.discord/smali/androidx/core/app/AppOpsManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/AppOpsManagerCompat;
 .super Ljava/lang/Object;
+.source "AppOpsManagerCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/app/BundleCompat$BundleCompatBaseImpl.smali b/com.discord/smali/androidx/core/app/BundleCompat$BundleCompatBaseImpl.smali
index 7edb818440..037580c879 100644
--- a/com.discord/smali/androidx/core/app/BundleCompat$BundleCompatBaseImpl.smali
+++ b/com.discord/smali/androidx/core/app/BundleCompat$BundleCompatBaseImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/BundleCompat$BundleCompatBaseImpl;
 .super Ljava/lang/Object;
+.source "BundleCompat.java"
 
 
 # annotations
@@ -88,8 +89,6 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    sget-object v0, Landroidx/core/app/BundleCompat$BundleCompatBaseImpl;->sGetIBinderMethod:Ljava/lang/reflect/Method;
-
     new-array v2, v2, [Ljava/lang/Object;
 
     aput-object p1, v2, v1
@@ -179,8 +178,6 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    sget-object v0, Landroidx/core/app/BundleCompat$BundleCompatBaseImpl;->sPutIBinderMethod:Ljava/lang/reflect/Method;
-
     new-array v2, v2, [Ljava/lang/Object;
 
     aput-object p1, v2, v1
diff --git a/com.discord/smali/androidx/core/app/BundleCompat.smali b/com.discord/smali/androidx/core/app/BundleCompat.smali
index 3316fea596..aa28231e2e 100644
--- a/com.discord/smali/androidx/core/app/BundleCompat.smali
+++ b/com.discord/smali/androidx/core/app/BundleCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/BundleCompat;
 .super Ljava/lang/Object;
+.source "BundleCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali b/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali
index f5a57bf6dc..2ff85e9881 100644
--- a/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali
+++ b/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/ComponentActivity$ExtraData;
 .super Ljava/lang/Object;
+.source "ComponentActivity.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ComponentActivity.smali b/com.discord/smali/androidx/core/app/ComponentActivity.smali
index 81ca50f804..908597bf8e 100644
--- a/com.discord/smali/androidx/core/app/ComponentActivity.smali
+++ b/com.discord/smali/androidx/core/app/ComponentActivity.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/ComponentActivity;
 .super Landroid/app/Activity;
+.source "ComponentActivity.java"
 
 # interfaces
 .implements Landroidx/core/view/KeyEventDispatcher$Component;
diff --git a/com.discord/smali/androidx/core/app/CoreComponentFactory$CompatWrapped.smali b/com.discord/smali/androidx/core/app/CoreComponentFactory$CompatWrapped.smali
index d4fee14929..1f711d1484 100644
--- a/com.discord/smali/androidx/core/app/CoreComponentFactory$CompatWrapped.smali
+++ b/com.discord/smali/androidx/core/app/CoreComponentFactory$CompatWrapped.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/CoreComponentFactory$CompatWrapped;
 .super Ljava/lang/Object;
+.source "CoreComponentFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/CoreComponentFactory.smali b/com.discord/smali/androidx/core/app/CoreComponentFactory.smali
index 3ab06647d8..63af6b1e75 100644
--- a/com.discord/smali/androidx/core/app/CoreComponentFactory.smali
+++ b/com.discord/smali/androidx/core/app/CoreComponentFactory.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/CoreComponentFactory;
 .super Landroid/app/AppComponentFactory;
+.source "CoreComponentFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1.smali b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1.smali
index 37ff4f7f30..fb5b678ce9 100644
--- a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1.smali
+++ b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;
 .super Ljava/lang/Object;
+.source "FrameMetricsAggregator.java"
 
 # interfaces
 .implements Landroid/view/Window$OnFrameMetricsAvailableListener;
@@ -52,9 +53,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v2, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v2, v2, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v2, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object v2, v2, v0
 
@@ -77,9 +76,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v3, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v3, v3, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v3, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object v3, v3, p3
 
@@ -104,9 +101,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v4, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v4, v4, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v4, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object v4, v4, v2
 
@@ -127,9 +122,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v4, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v4, v4, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v4, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object v3, v4, v3
 
@@ -152,9 +145,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v4, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v4, v4, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v4, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object p3, v4, p3
 
@@ -179,9 +170,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v5, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v5, v5, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v5, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object v5, v5, v4
 
@@ -202,9 +191,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v5, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v5, v5, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v5, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object v3, v5, v3
 
@@ -225,9 +212,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object v3, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object v3, v3, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object v3, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object p3, v3, p3
 
@@ -248,9 +233,7 @@
 
     iget-object p1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 
-    iget-object p3, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl$1;->this$0:Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
-
-    iget-object p3, p3, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    iget-object p3, p1, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
     aget-object p3, p3, v1
 
diff --git a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali
index 5ac59dd17d..5e84220dd4 100644
--- a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali
+++ b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;
 .super Landroidx/core/app/FrameMetricsAggregator$FrameMetricsBaseImpl;
+.source "FrameMetricsAggregator.java"
 
 
 # annotations
@@ -84,7 +85,7 @@
 
 # virtual methods
 .method public add(Landroid/app/Activity;)V
-    .locals 3
+    .locals 4
 
     sget-object v0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->sHandlerThread:Landroid/os/HandlerThread;
 
@@ -122,21 +123,19 @@
 
     iget-object v1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    if-nez v1, :cond_1
+    if-nez v2, :cond_1
 
-    iget v1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mTrackingFlags:I
+    iget v2, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mTrackingFlags:I
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    shl-int/2addr v2, v0
+    shl-int/2addr v3, v0
 
-    and-int/2addr v1, v2
+    and-int/2addr v2, v3
 
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Landroidx/core/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray;
+    if-eqz v2, :cond_1
 
     new-instance v2, Landroid/util/SparseIntArray;
 
diff --git a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsBaseImpl.smali b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsBaseImpl.smali
index bee58448a1..dcc500931b 100644
--- a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsBaseImpl.smali
+++ b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$FrameMetricsBaseImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/FrameMetricsAggregator$FrameMetricsBaseImpl;
 .super Ljava/lang/Object;
+.source "FrameMetricsAggregator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$MetricType.smali b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$MetricType.smali
index 5fc59011ba..0dad04ee51 100644
--- a/com.discord/smali/androidx/core/app/FrameMetricsAggregator$MetricType.smali
+++ b/com.discord/smali/androidx/core/app/FrameMetricsAggregator$MetricType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/app/FrameMetricsAggregator$MetricType;
 .super Ljava/lang/Object;
+.source "FrameMetricsAggregator.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/app/FrameMetricsAggregator.smali b/com.discord/smali/androidx/core/app/FrameMetricsAggregator.smali
index 83c5339927..63774eb72c 100644
--- a/com.discord/smali/androidx/core/app/FrameMetricsAggregator.smali
+++ b/com.discord/smali/androidx/core/app/FrameMetricsAggregator.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/FrameMetricsAggregator;
 .super Ljava/lang/Object;
+.source "FrameMetricsAggregator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$CommandProcessor.smali b/com.discord/smali/androidx/core/app/JobIntentService$CommandProcessor.smali
index 5749ae7672..b34eeebf2e 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$CommandProcessor.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$CommandProcessor.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/app/JobIntentService$CommandProcessor;
 .super Landroid/os/AsyncTask;
+.source "JobIntentService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$CompatJobEngine.smali b/com.discord/smali/androidx/core/app/JobIntentService$CompatJobEngine.smali
index 85457b621b..804fa5dab6 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$CompatJobEngine.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$CompatJobEngine.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/app/JobIntentService$CompatJobEngine;
 .super Ljava/lang/Object;
+.source "JobIntentService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkEnqueuer.smali b/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkEnqueuer.smali
index 4a5ac0ec86..82223a10a3 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkEnqueuer.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkEnqueuer.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/app/JobIntentService$CompatWorkEnqueuer;
 .super Landroidx/core/app/JobIntentService$WorkEnqueuer;
+.source "JobIntentService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkItem.smali b/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkItem.smali
index c75e4fb4a2..b4f3a7d176 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkItem.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$CompatWorkItem.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/app/JobIntentService$CompatWorkItem;
 .super Ljava/lang/Object;
+.source "JobIntentService.java"
 
 # interfaces
 .implements Landroidx/core/app/JobIntentService$GenericWorkItem;
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$GenericWorkItem.smali b/com.discord/smali/androidx/core/app/JobIntentService$GenericWorkItem.smali
index 5ca725db80..19d0f54c0e 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$GenericWorkItem.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$GenericWorkItem.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/app/JobIntentService$GenericWorkItem;
 .super Ljava/lang/Object;
+.source "JobIntentService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl$WrapperWorkItem.smali b/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl$WrapperWorkItem.smali
index 7c129605a1..ae20e52575 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl$WrapperWorkItem.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl$WrapperWorkItem.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/app/JobIntentService$JobServiceEngineImpl$WrapperWorkItem;
 .super Ljava/lang/Object;
+.source "JobIntentService.java"
 
 # interfaces
 .implements Landroidx/core/app/JobIntentService$GenericWorkItem;
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl.smali b/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl.smali
index a6101f5642..25f2c1cd5c 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$JobServiceEngineImpl.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/app/JobIntentService$JobServiceEngineImpl;
 .super Landroid/app/job/JobServiceEngine;
+.source "JobIntentService.java"
 
 # interfaces
 .implements Landroidx/core/app/JobIntentService$CompatJobEngine;
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$JobWorkEnqueuer.smali b/com.discord/smali/androidx/core/app/JobIntentService$JobWorkEnqueuer.smali
index 49e67097e5..a17a66b3fa 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$JobWorkEnqueuer.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$JobWorkEnqueuer.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/app/JobIntentService$JobWorkEnqueuer;
 .super Landroidx/core/app/JobIntentService$WorkEnqueuer;
+.source "JobIntentService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/JobIntentService$WorkEnqueuer.smali b/com.discord/smali/androidx/core/app/JobIntentService$WorkEnqueuer.smali
index f947954dd1..5f015efe51 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService$WorkEnqueuer.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService$WorkEnqueuer.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/core/app/JobIntentService$WorkEnqueuer;
 .super Ljava/lang/Object;
+.source "JobIntentService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/JobIntentService.smali b/com.discord/smali/androidx/core/app/JobIntentService.smali
index 8087ef8472..fbbed68df8 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/app/JobIntentService;
 .super Landroid/app/Service;
+.source "JobIntentService.java"
 
 
 # annotations
@@ -100,7 +101,6 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     iput-object v0, p0, Landroidx/core/app/JobIntentService;->mCompatQueue:Ljava/util/ArrayList;
 
     return-void
@@ -110,7 +110,9 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/core/app/JobIntentService;->mCompatQueue:Ljava/util/ArrayList;
+
+    return-void
 .end method
 
 .method public static enqueueWork(Landroid/content/Context;Landroid/content/ComponentName;ILandroid/content/Intent;)V
@@ -217,6 +219,8 @@
 
     invoke-direct {p2, p0, p1, p3}, Landroidx/core/app/JobIntentService$JobWorkEnqueuer;-><init>(Landroid/content/Context;Landroid/content/ComponentName;I)V
 
+    move-object v0, p2
+
     goto :goto_0
 
     :cond_0
@@ -233,9 +237,9 @@
 
     invoke-direct {p2, p0, p1}, Landroidx/core/app/JobIntentService$CompatWorkEnqueuer;-><init>(Landroid/content/Context;Landroid/content/ComponentName;)V
 
-    :goto_0
     move-object v0, p2
 
+    :goto_0
     sget-object p0, Landroidx/core/app/JobIntentService;->sClassWorkEnqueuer:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -253,8 +257,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/app/JobIntentService;->mJobImpl:Landroidx/core/app/JobIntentService$CompatJobEngine;
-
     invoke-interface {v0}, Landroidx/core/app/JobIntentService$CompatJobEngine;->dequeueWork()Landroidx/core/app/JobIntentService$GenericWorkItem;
 
     move-result-object v0
@@ -313,8 +315,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/app/JobIntentService;->mCurProcessor:Landroidx/core/app/JobIntentService$CommandProcessor;
-
     iget-boolean v1, p0, Landroidx/core/app/JobIntentService;->mInterruptIfStopped:Z
 
     invoke-virtual {v0, v1}, Landroidx/core/app/JobIntentService$CommandProcessor;->cancel(Z)Z
@@ -350,9 +350,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/core/app/JobIntentService;->mCompatWorkEnqueuer:Landroidx/core/app/JobIntentService$WorkEnqueuer;
-
-    invoke-virtual {p1}, Landroidx/core/app/JobIntentService$WorkEnqueuer;->serviceProcessingStarted()V
+    invoke-virtual {v0}, Landroidx/core/app/JobIntentService$WorkEnqueuer;->serviceProcessingStarted()V
 
     :cond_0
     iget-object p1, p0, Landroidx/core/app/JobIntentService;->mCurProcessor:Landroidx/core/app/JobIntentService$CommandProcessor;
@@ -388,8 +386,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/core/app/JobIntentService;->mJobImpl:Landroidx/core/app/JobIntentService$CompatJobEngine;
-
     invoke-interface {p1}, Landroidx/core/app/JobIntentService$CompatJobEngine;->compatGetBinder()Landroid/os/IBinder;
 
     move-result-object p1
@@ -456,8 +452,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/app/JobIntentService;->mCompatQueue:Ljava/util/ArrayList;
-
     monitor-enter v0
 
     const/4 v1, 0x1
@@ -571,8 +565,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/core/app/JobIntentService;->mCompatQueue:Ljava/util/ArrayList;
-
     monitor-enter v0
 
     const/4 v1, 0x0
diff --git a/com.discord/smali/androidx/core/app/NavUtils.smali b/com.discord/smali/androidx/core/app/NavUtils.smali
index d4e2b32481..d568729d1c 100644
--- a/com.discord/smali/androidx/core/app/NavUtils.smali
+++ b/com.discord/smali/androidx/core/app/NavUtils.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NavUtils;
 .super Ljava/lang/Object;
+.source "NavUtils.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/app/NotificationBuilderWithBuilderAccessor.smali b/com.discord/smali/androidx/core/app/NotificationBuilderWithBuilderAccessor.smali
index 70ade2d991..67ebdbc6c6 100644
--- a/com.discord/smali/androidx/core/app/NotificationBuilderWithBuilderAccessor.smali
+++ b/com.discord/smali/androidx/core/app/NotificationBuilderWithBuilderAccessor.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/NotificationBuilderWithBuilderAccessor;
 .super Ljava/lang/Object;
+.source "NotificationBuilderWithBuilderAccessor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali
index 11db7b035b..d73659c021 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NotificationCompat$Action$Builder;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -205,8 +206,6 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mRemoteInputs:Ljava/util/ArrayList;
-
     invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
     move-result-object v2
@@ -274,10 +273,9 @@
 
     if-eqz v0, :cond_3
 
-    :goto_2
     move-object v9, v3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     invoke-interface {v1}, Ljava/util/List;->size()I
@@ -294,9 +292,9 @@
 
     check-cast v3, [Landroidx/core/app/RemoteInput;
 
-    goto :goto_2
+    move-object v9, v3
 
-    :goto_3
+    :goto_2
     new-instance v0, Landroidx/core/app/NotificationCompat$Action;
 
     iget v5, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mIcon:I
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Action$Extender.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Action$Extender.smali
index 8a6508e028..6e236e10b7 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Action$Extender.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Action$Extender.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/NotificationCompat$Action$Extender;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Action$SemanticAction.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Action$SemanticAction.smali
index baba036b6e..0f15ea462a 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Action$SemanticAction.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Action$SemanticAction.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/app/NotificationCompat$Action$SemanticAction;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Action$WearableExtender.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Action$WearableExtender.smali
index a78f6db61e..a8390de915 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Action$WearableExtender.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Action$WearableExtender.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NotificationCompat$Action$WearableExtender;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Landroidx/core/app/NotificationCompat$Action$Extender;
@@ -125,7 +126,6 @@
 
     or-int/2addr p1, p2
 
-    :goto_0
     iput p1, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mFlags:I
 
     return-void
@@ -137,7 +137,9 @@
 
     and-int/2addr p1, p2
 
-    goto :goto_0
+    iput p1, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mFlags:I
+
+    return-void
 .end method
 
 
@@ -196,44 +198,36 @@
 
     if-eq v1, v2, :cond_0
 
-    const-string v1, "flags"
+    const-string v2, "flags"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mFlags:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_0
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mInProgressLabel:Ljava/lang/CharSequence;
 
     if-eqz v1, :cond_1
 
-    const-string v1, "inProgressLabel"
+    const-string v2, "inProgressLabel"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mInProgressLabel:Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
     :cond_1
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mConfirmLabel:Ljava/lang/CharSequence;
 
     if-eqz v1, :cond_2
 
-    const-string v1, "confirmLabel"
+    const-string v2, "confirmLabel"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mConfirmLabel:Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
     :cond_2
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mCancelLabel:Ljava/lang/CharSequence;
 
     if-eqz v1, :cond_3
 
-    const-string v1, "cancelLabel"
+    const-string v2, "cancelLabel"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$Action$WearableExtender;->mCancelLabel:Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
     :cond_3
     invoke-virtual {p1}, Landroidx/core/app/NotificationCompat$Action$Builder;->getExtras()Landroid/os/Bundle;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali
index 6a1ba2c67e..8f89638b8b 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$Action;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$BadgeIconType.smali b/com.discord/smali/androidx/core/app/NotificationCompat$BadgeIconType.smali
index 53883cc159..afa5886314 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$BadgeIconType.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$BadgeIconType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/app/NotificationCompat$BadgeIconType;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$BigPictureStyle.smali b/com.discord/smali/androidx/core/app/NotificationCompat$BigPictureStyle.smali
index 8b4deccca1..f967ff7397 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$BigPictureStyle.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$BigPictureStyle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$BigPictureStyle;
 .super Landroidx/core/app/NotificationCompat$Style;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$BigTextStyle.smali b/com.discord/smali/androidx/core/app/NotificationCompat$BigTextStyle.smali
index 7fdc2cc15f..ff73b4a551 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$BigTextStyle.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$BigTextStyle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$BigTextStyle;
 .super Landroidx/core/app/NotificationCompat$Style;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali
index b825eb0642..bc836ef7b4 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$Builder;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -380,6 +381,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_2
     :goto_0
     return-object p1
@@ -396,7 +399,6 @@
 
     or-int/2addr p1, v0
 
-    :goto_0
     iput p1, p2, Landroid/app/Notification;->flags:I
 
     return-void
@@ -410,7 +412,9 @@
 
     and-int/2addr p1, v0
 
-    goto :goto_0
+    iput p1, p2, Landroid/app/Notification;->flags:I
+
+    return-void
 .end method
 
 
@@ -457,8 +461,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mExtras:Landroid/os/Bundle;
-
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->putAll(Landroid/os/Bundle;)V
 
     :cond_1
@@ -799,13 +801,11 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
+    iget p1, v0, Landroid/app/Notification;->flags:I
 
-    iget v0, p1, Landroid/app/Notification;->flags:I
+    or-int/lit8 p1, p1, 0x1
 
-    or-int/lit8 v0, v0, 0x1
-
-    iput v0, p1, Landroid/app/Notification;->flags:I
+    iput p1, v0, Landroid/app/Notification;->flags:I
 
     :cond_0
     return-object p0
@@ -888,17 +888,11 @@
 
     iput p1, v0, Landroid/app/Notification;->ledARGB:I
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
+    iput p2, v0, Landroid/app/Notification;->ledOnMS:I
 
-    iput p2, p1, Landroid/app/Notification;->ledOnMS:I
+    iput p3, v0, Landroid/app/Notification;->ledOffMS:I
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
-
-    iput p3, p1, Landroid/app/Notification;->ledOffMS:I
-
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
-
-    iget p1, p1, Landroid/app/Notification;->ledOnMS:I
+    iget p1, v0, Landroid/app/Notification;->ledOnMS:I
 
     if-eqz p1, :cond_0
 
@@ -918,9 +912,7 @@
     :goto_0
     iget-object p2, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
 
-    iget-object p3, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
-
-    iget p3, p3, Landroid/app/Notification;->flags:I
+    iget p3, p2, Landroid/app/Notification;->flags:I
 
     and-int/lit8 p3, p3, -0x2
 
@@ -1036,9 +1028,7 @@
 
     iput p1, v0, Landroid/app/Notification;->icon:I
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
-
-    iput p2, p1, Landroid/app/Notification;->iconLevel:I
+    iput p2, v0, Landroid/app/Notification;->iconLevel:I
 
     return-object p0
 .end method
@@ -1058,11 +1048,9 @@
 
     iput-object p1, v0, Landroid/app/Notification;->sound:Landroid/net/Uri;
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
+    const/4 p1, -0x1
 
-    const/4 v0, -0x1
-
-    iput v0, p1, Landroid/app/Notification;->audioStreamType:I
+    iput p1, v0, Landroid/app/Notification;->audioStreamType:I
 
     sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -1105,9 +1093,7 @@
 
     iput-object p1, v0, Landroid/app/Notification;->sound:Landroid/net/Uri;
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
-
-    iput p2, p1, Landroid/app/Notification;->audioStreamType:I
+    iput p2, v0, Landroid/app/Notification;->audioStreamType:I
 
     sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -1154,8 +1140,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mStyle:Landroidx/core/app/NotificationCompat$Style;
-
     invoke-virtual {p1, p0}, Landroidx/core/app/NotificationCompat$Style;->setBuilder(Landroidx/core/app/NotificationCompat$Builder;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali
index 6b680e787b..061866a6da 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation$Builder;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -69,9 +70,7 @@
 
     iget-object v0, p0, Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation$Builder;->mMessages:Ljava/util/List;
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation$Builder;->mMessages:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation.smali b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation.smali
index b9623b57cd..e8002b88b5 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender$UnreadConversation.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -77,11 +78,9 @@
 
     iget-object v0, p0, Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;->mParticipants:[Ljava/lang/String;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-lez v0, :cond_0
-
-    iget-object v0, p0, Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;->mParticipants:[Ljava/lang/String;
+    if-lez v1, :cond_0
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali
index 11df92243a..4722437667 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NotificationCompat$CarExtender;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Landroidx/core/app/NotificationCompat$Extender;
@@ -514,6 +515,8 @@
 
     invoke-direct/range {v6 .. v13}, Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;-><init>([Ljava/lang/String;Landroidx/core/app/RemoteInput;Landroid/app/PendingIntent;Landroid/app/PendingIntent;[Ljava/lang/String;J)V
 
+    return-object v1
+
     :cond_8
     :goto_3
     return-object v1
@@ -541,30 +544,24 @@
 
     if-eqz v1, :cond_1
 
-    const-string v1, "large_icon"
+    const-string v2, "large_icon"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$CarExtender;->mLargeIcon:Landroid/graphics/Bitmap;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     :cond_1
     iget v1, p0, Landroidx/core/app/NotificationCompat$CarExtender;->mColor:I
 
     if-eqz v1, :cond_2
 
-    const-string v1, "app_color"
+    const-string v2, "app_color"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$CarExtender;->mColor:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_2
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$CarExtender;->mUnreadConversation:Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompat$CarExtender;->mUnreadConversation:Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;
-
     invoke-static {v1}, Landroidx/core/app/NotificationCompat$CarExtender;->getBundleForUnreadConversation(Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;)Landroid/os/Bundle;
 
     move-result-object v1
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali b/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali
index fec4e8fa0b..1aba084809 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;
 .super Landroidx/core/app/NotificationCompat$Style;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Extender.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Extender.smali
index de3d951c66..c890032e7c 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Extender.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Extender.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/NotificationCompat$Extender;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$GroupAlertBehavior.smali b/com.discord/smali/androidx/core/app/NotificationCompat$GroupAlertBehavior.smali
index d64197c352..41d4932e4f 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$GroupAlertBehavior.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$GroupAlertBehavior.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/app/NotificationCompat$GroupAlertBehavior;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$InboxStyle.smali b/com.discord/smali/androidx/core/app/NotificationCompat$InboxStyle.smali
index 2e7a96e738..e7b4a1cb83 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$InboxStyle.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$InboxStyle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$InboxStyle;
 .super Landroidx/core/app/NotificationCompat$Style;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali b/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali
index 7e94faccfe..4762102e04 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NotificationCompat$MessagingStyle$Message;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -334,10 +335,12 @@
     :cond_5
     return-object v2
 
-    :catch_0
     :cond_6
     :goto_1
     return-object v0
+
+    :catch_0
+    return-object v0
 .end method
 
 .method static getMessagesFromBundleArray([Landroid/os/Parcelable;)Ljava/util/List;
@@ -407,11 +410,9 @@
 
     if-eqz v1, :cond_0
 
-    const-string v1, "text"
+    const-string v2, "text"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mText:Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
     :cond_0
     const-string v1, "time"
@@ -424,15 +425,13 @@
 
     if-eqz v1, :cond_2
 
-    const-string v1, "sender"
+    const-string v2, "sender"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mPerson:Landroidx/core/app/Person;
+    invoke-virtual {v1}, Landroidx/core/app/Person;->getName()Ljava/lang/CharSequence;
 
-    invoke-virtual {v2}, Landroidx/core/app/Person;->getName()Ljava/lang/CharSequence;
+    move-result-object v1
 
-    move-result-object v2
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -469,33 +468,27 @@
 
     if-eqz v1, :cond_3
 
-    const-string v1, "type"
+    const-string v2, "type"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mDataMimeType:Ljava/lang/String;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_3
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mDataUri:Landroid/net/Uri;
 
     if-eqz v1, :cond_4
 
-    const-string v1, "uri"
+    const-string v2, "uri"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mDataUri:Landroid/net/Uri;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     :cond_4
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mExtras:Landroid/os/Bundle;
 
     if-eqz v1, :cond_5
 
-    const-string v1, "extras"
+    const-string v2, "extras"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mExtras:Landroid/os/Bundle;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_5
     return-object v0
@@ -560,8 +553,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->mPerson:Landroidx/core/app/Person;
-
     invoke-virtual {v0}, Landroidx/core/app/Person;->getName()Ljava/lang/CharSequence;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle.smali b/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle.smali
index fff08648fa..a2e642cc56 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat$MessagingStyle;
 .super Landroidx/core/app/NotificationCompat$Style;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -244,9 +245,7 @@
 
     iget-object v0, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mMessages:Ljava/util/List;
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mMessages:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -426,7 +425,9 @@
 
     invoke-virtual {v2}, Landroidx/core/app/NotificationCompat$Builder;->getColor()I
 
-    move-result v3
+    move-result v2
+
+    move v3, v2
 
     :cond_3
     invoke-virtual {v0, v4}, Landroidx/core/text/BidiFormatter;->unicodeWrap(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
@@ -563,15 +564,13 @@
 
     if-eqz v0, :cond_2
 
-    const-string v0, "android.isGroupConversation"
+    const-string v1, "android.isGroupConversation"
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mIsGroupConversation:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
     :cond_2
     return-void
@@ -884,10 +883,9 @@
 
     iget-object v3, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mConversationTitle:Ljava/lang/CharSequence;
 
-    :goto_5
     invoke-virtual {v2, v3}, Landroid/app/Notification$Builder;->setContentTitle(Ljava/lang/CharSequence;)Landroid/app/Notification$Builder;
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_a
     if-eqz v0, :cond_b
@@ -918,10 +916,10 @@
 
     move-result-object v3
 
-    goto :goto_5
+    invoke-virtual {v2, v3}, Landroid/app/Notification$Builder;->setContentTitle(Ljava/lang/CharSequence;)Landroid/app/Notification$Builder;
 
     :cond_b
-    :goto_6
+    :goto_5
     if-eqz v0, :cond_d
 
     invoke-interface {p1}, Landroidx/core/app/NotificationBuilderWithBuilderAccessor;->getBuilder()Landroid/app/Notification$Builder;
@@ -936,14 +934,14 @@
 
     move-result-object v0
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_c
     invoke-virtual {v0}, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->getText()Ljava/lang/CharSequence;
 
     move-result-object v0
 
-    :goto_7
+    :goto_6
     invoke-virtual {v2, v0}, Landroid/app/Notification$Builder;->setContentText(Ljava/lang/CharSequence;)Landroid/app/Notification$Builder;
 
     :cond_d
@@ -971,18 +969,18 @@
 
     if-eqz v2, :cond_e
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_e
     const/4 v2, 0x0
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_f
-    :goto_8
+    :goto_7
     const/4 v2, 0x1
 
-    :goto_9
+    :goto_8
     iget-object v5, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mMessages:Ljava/util/List;
 
     invoke-interface {v5}, Ljava/util/List;->size()I
@@ -991,7 +989,7 @@
 
     sub-int/2addr v5, v4
 
-    :goto_a
+    :goto_9
     if-ltz v5, :cond_12
 
     iget-object v6, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mMessages:Ljava/util/List;
@@ -1008,14 +1006,14 @@
 
     move-result-object v6
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_10
     invoke-virtual {v6}, Landroidx/core/app/NotificationCompat$MessagingStyle$Message;->getText()Ljava/lang/CharSequence;
 
     move-result-object v6
 
-    :goto_b
+    :goto_a
     iget-object v7, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mMessages:Ljava/util/List;
 
     invoke-interface {v7}, Ljava/util/List;->size()I
@@ -1035,7 +1033,7 @@
 
     add-int/lit8 v5, v5, -0x1
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_12
     new-instance v2, Landroid/app/Notification$BigTextStyle;
@@ -1147,8 +1145,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mIsGroupConversation:Ljava/lang/Boolean;
-
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v0
@@ -1189,10 +1185,9 @@
 
     move-result-object v0
 
-    :goto_0
     iput-object v0, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mUser:Landroidx/core/app/Person;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance v0, Landroidx/core/app/Person$Builder;
@@ -1213,9 +1208,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/core/app/NotificationCompat$MessagingStyle;->mUser:Landroidx/core/app/Person;
 
-    :goto_1
+    :goto_0
     const-string v0, "android.conversationTitle"
 
     invoke-virtual {p1, v0}, Landroid/os/Bundle;->getCharSequence(Ljava/lang/String;)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$NotificationVisibility.smali b/com.discord/smali/androidx/core/app/NotificationCompat$NotificationVisibility.smali
index f219ed44bd..76f938d733 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$NotificationVisibility.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$NotificationVisibility.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/app/NotificationCompat$NotificationVisibility;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$StreamType.smali b/com.discord/smali/androidx/core/app/NotificationCompat$StreamType.smali
index e552caf321..89a8d18606 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$StreamType.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$StreamType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/app/NotificationCompat$StreamType;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Style.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Style.smali
index 0aae58e207..00e1c2af26 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Style.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Style.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/app/NotificationCompat$Style;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -375,10 +376,9 @@
 
     sget v4, Landroidx/core/R$drawable;->notification_template_icon_low_bg:I
 
-    :goto_1
     invoke-virtual {v7, p2, v2, v4}, Landroid/widget/RemoteViews;->setInt(ILjava/lang/String;I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     sget p2, Landroidx/core/R$id;->notification_background:I
@@ -395,10 +395,10 @@
 
     sget v4, Landroidx/core/R$drawable;->notification_template_icon_bg:I
 
-    goto :goto_1
+    invoke-virtual {v7, p2, v2, v4}, Landroid/widget/RemoteViews;->setInt(ILjava/lang/String;I)V
 
     :cond_2
-    :goto_2
+    :goto_1
     iget-object p2, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
 
     iget-object p2, p2, Landroidx/core/app/NotificationCompat$Builder;->mLargeIcon:Landroid/graphics/Bitmap;
@@ -423,14 +423,14 @@
 
     invoke-virtual {v7, p2, v2}, Landroid/widget/RemoteViews;->setImageViewBitmap(ILandroid/graphics/Bitmap;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     sget p2, Landroidx/core/R$id;->icon:I
 
     invoke-virtual {v7, p2, v11}, Landroid/widget/RemoteViews;->setViewVisibility(II)V
 
-    :goto_3
+    :goto_2
     if-eqz p1, :cond_7
 
     iget-object p1, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
@@ -481,7 +481,7 @@
 
     invoke-virtual {v7, p2, p1}, Landroid/widget/RemoteViews;->setImageViewBitmap(ILandroid/graphics/Bitmap;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     sget p1, Landroidx/core/R$id;->right_icon:I
@@ -498,12 +498,12 @@
 
     invoke-virtual {v7, p1, p2}, Landroid/widget/RemoteViews;->setImageViewBitmap(ILandroid/graphics/Bitmap;)V
 
-    :goto_4
+    :goto_3
     sget p1, Landroidx/core/R$id;->right_icon:I
 
     invoke-virtual {v7, p1, v9}, Landroid/widget/RemoteViews;->setViewVisibility(II)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     if-eqz p1, :cond_7
@@ -564,7 +564,7 @@
 
     invoke-virtual {v7, p2, p1}, Landroid/widget/RemoteViews;->setImageViewBitmap(ILandroid/graphics/Bitmap;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_6
     sget p1, Landroidx/core/R$id;->icon:I
@@ -582,7 +582,7 @@
     invoke-virtual {v7, p1, p2}, Landroid/widget/RemoteViews;->setImageViewBitmap(ILandroid/graphics/Bitmap;)V
 
     :cond_7
-    :goto_5
+    :goto_4
     iget-object p1, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
 
     iget-object p1, p1, Landroidx/core/app/NotificationCompat$Builder;->mContentTitle:Ljava/lang/CharSequence;
@@ -614,12 +614,12 @@
 
     const/4 p1, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_9
     const/4 p1, 0x0
 
-    :goto_6
+    :goto_5
     sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
 
     if-ge p2, v3, :cond_a
@@ -632,12 +632,12 @@
 
     const/4 p2, 0x1
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_a
     const/4 p2, 0x0
 
-    :goto_7
+    :goto_6
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
 
     iget-object v1, v1, Landroidx/core/app/NotificationCompat$Builder;->mContentInfo:Ljava/lang/CharSequence;
@@ -650,10 +650,8 @@
 
     iget-object p2, p2, Landroidx/core/app/NotificationCompat$Builder;->mContentInfo:Ljava/lang/CharSequence;
 
-    :goto_8
     invoke-virtual {v7, p1, p2}, Landroid/widget/RemoteViews;->setTextViewText(ILjava/lang/CharSequence;)V
 
-    :goto_9
     sget p1, Landroidx/core/R$id;->info:I
 
     invoke-virtual {v7, p1, v9}, Landroid/widget/RemoteViews;->setViewVisibility(II)V
@@ -662,7 +660,7 @@
 
     const/4 p2, 0x1
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_b
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
@@ -691,7 +689,9 @@
 
     move-result-object p2
 
-    goto :goto_8
+    invoke-virtual {v7, p1, p2}, Landroid/widget/RemoteViews;->setTextViewText(ILjava/lang/CharSequence;)V
+
+    goto :goto_7
 
     :cond_c
     invoke-static {}, Ljava/text/NumberFormat;->getIntegerInstance()Ljava/text/NumberFormat;
@@ -712,14 +712,23 @@
 
     invoke-virtual {v7, p2, p1}, Landroid/widget/RemoteViews;->setTextViewText(ILjava/lang/CharSequence;)V
 
-    goto :goto_9
+    :goto_7
+    sget p1, Landroidx/core/R$id;->info:I
+
+    invoke-virtual {v7, p1, v9}, Landroid/widget/RemoteViews;->setViewVisibility(II)V
+
+    const/4 p1, 0x1
+
+    const/4 p2, 0x1
+
+    goto :goto_8
 
     :cond_d
     sget v1, Landroidx/core/R$id;->info:I
 
     invoke-virtual {v7, v1, v11}, Landroid/widget/RemoteViews;->setViewVisibility(II)V
 
-    :goto_a
+    :goto_8
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
 
     iget-object v1, v1, Landroidx/core/app/NotificationCompat$Builder;->mSubText:Ljava/lang/CharSequence;
@@ -758,7 +767,7 @@
 
     const/4 v1, 0x1
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_e
     sget v1, Landroidx/core/R$id;->text2:I
@@ -768,7 +777,7 @@
     :cond_f
     const/4 v1, 0x0
 
-    :goto_b
+    :goto_9
     if-eqz v1, :cond_11
 
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -861,7 +870,7 @@
 
     invoke-virtual {v7, p2, p3, v8}, Landroid/widget/RemoteViews;->setBoolean(ILjava/lang/String;Z)V
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_12
     sget p2, Landroidx/core/R$id;->time:I
@@ -880,7 +889,7 @@
 
     invoke-virtual {v7, p2, p3, v0, v1}, Landroid/widget/RemoteViews;->setLong(ILjava/lang/String;J)V
 
-    :goto_c
+    :goto_a
     const/4 p2, 0x1
 
     :cond_13
@@ -890,24 +899,24 @@
 
     const/4 p2, 0x0
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_14
     const/16 p2, 0x8
 
-    :goto_d
+    :goto_b
     invoke-virtual {v7, p3, p2}, Landroid/widget/RemoteViews;->setViewVisibility(II)V
 
     sget p2, Landroidx/core/R$id;->line3:I
 
     if-eqz p1, :cond_15
 
-    goto :goto_e
+    goto :goto_c
 
     :cond_15
     const/16 v9, 0x8
 
-    :goto_e
+    :goto_c
     invoke-virtual {v7, p2, v9}, Landroid/widget/RemoteViews;->setViewVisibility(II)V
 
     return-object v7
@@ -920,8 +929,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
-
     invoke-virtual {v0}, Landroidx/core/app/NotificationCompat$Builder;->build()Landroid/app/Notification;
 
     move-result-object v0
@@ -1069,8 +1076,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompat$Style;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
-
     invoke-virtual {p1, p0}, Landroidx/core/app/NotificationCompat$Builder;->setStyle(Landroidx/core/app/NotificationCompat$Style;)Landroidx/core/app/NotificationCompat$Builder;
 
     :cond_0
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$WearableExtender.smali b/com.discord/smali/androidx/core/app/NotificationCompat$WearableExtender.smali
index 51807bf633..c3b4e2b339 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$WearableExtender.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$WearableExtender.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NotificationCompat$WearableExtender;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 # interfaces
 .implements Landroidx/core/app/NotificationCompat$Extender;
@@ -534,7 +535,6 @@
 
     or-int/2addr p1, p2
 
-    :goto_0
     iput p1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mFlags:I
 
     return-void
@@ -546,7 +546,9 @@
 
     and-int/2addr p1, p2
 
-    goto :goto_0
+    iput p1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mFlags:I
+
+    return-void
 .end method
 
 
@@ -779,7 +781,6 @@
 
     move-result-object v4
 
-    :goto_1
     invoke-virtual {v1, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
@@ -793,14 +794,16 @@
 
     move-result-object v4
 
-    goto :goto_1
+    invoke-virtual {v1, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
 
     :cond_2
     const-string v2, "actions"
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const-string v1, "actions"
@@ -810,29 +813,25 @@
     invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
 
     :cond_4
-    :goto_2
+    :goto_1
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mFlags:I
 
     const/4 v2, 0x1
 
     if-eq v1, v2, :cond_5
 
-    const-string v1, "flags"
+    const-string v2, "flags"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mFlags:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_5
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mDisplayIntent:Landroid/app/PendingIntent;
 
     if-eqz v1, :cond_6
 
-    const-string v1, "displayIntent"
+    const-string v2, "displayIntent"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mDisplayIntent:Landroid/app/PendingIntent;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     :cond_6
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mPages:Ljava/util/ArrayList;
@@ -847,9 +846,7 @@
 
     iget-object v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mPages:Ljava/util/ArrayList;
 
-    iget-object v3, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mPages:Ljava/util/ArrayList;
-
-    invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
 
     move-result v3
 
@@ -868,22 +865,18 @@
 
     if-eqz v1, :cond_8
 
-    const-string v1, "background"
+    const-string v2, "background"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mBackground:Landroid/graphics/Bitmap;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     :cond_8
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mContentIcon:I
 
     if-eqz v1, :cond_9
 
-    const-string v1, "contentIcon"
+    const-string v2, "contentIcon"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mContentIcon:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_9
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mContentIconGravity:I
@@ -892,11 +885,9 @@
 
     if-eq v1, v2, :cond_a
 
-    const-string v1, "contentIconGravity"
+    const-string v2, "contentIconGravity"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mContentIconGravity:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_a
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mContentActionIndex:I
@@ -905,33 +896,27 @@
 
     if-eq v1, v2, :cond_b
 
-    const-string v1, "contentActionIndex"
+    const-string v2, "contentActionIndex"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mContentActionIndex:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_b
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mCustomSizePreset:I
 
     if-eqz v1, :cond_c
 
-    const-string v1, "customSizePreset"
+    const-string v2, "customSizePreset"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mCustomSizePreset:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_c
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mCustomContentHeight:I
 
     if-eqz v1, :cond_d
 
-    const-string v1, "customContentHeight"
+    const-string v2, "customContentHeight"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mCustomContentHeight:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_d
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mGravity:I
@@ -940,44 +925,36 @@
 
     if-eq v1, v2, :cond_e
 
-    const-string v1, "gravity"
+    const-string v2, "gravity"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mGravity:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_e
     iget v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mHintScreenTimeout:I
 
     if-eqz v1, :cond_f
 
-    const-string v1, "hintScreenTimeout"
+    const-string v2, "hintScreenTimeout"
 
-    iget v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mHintScreenTimeout:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_f
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mDismissalId:Ljava/lang/String;
 
     if-eqz v1, :cond_10
 
-    const-string v1, "dismissalId"
+    const-string v2, "dismissalId"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mDismissalId:Ljava/lang/String;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_10
     iget-object v1, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mBridgeTag:Ljava/lang/String;
 
     if-eqz v1, :cond_11
 
-    const-string v1, "bridgeTag"
+    const-string v2, "bridgeTag"
 
-    iget-object v2, p0, Landroidx/core/app/NotificationCompat$WearableExtender;->mBridgeTag:Ljava/lang/String;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_11
     invoke-virtual {p1}, Landroidx/core/app/NotificationCompat$Builder;->getExtras()Landroid/os/Bundle;
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat.smali b/com.discord/smali/androidx/core/app/NotificationCompat.smali
index 3d4dc5fe39..b4a0871cca 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/NotificationCompat;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -382,7 +383,10 @@
     :goto_2
     const/4 v0, 0x1
 
-    goto :goto_3
+    :goto_3
+    move v11, v0
+
+    goto :goto_4
 
     :cond_4
     invoke-virtual {p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
@@ -395,9 +399,9 @@
 
     move-result v0
 
-    :goto_3
     move v11, v0
 
+    :goto_4
     invoke-virtual {p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
 
     move-result-object v0
@@ -418,7 +422,6 @@
 
     move-result v0
 
-    :goto_4
     move v12, v0
 
     goto :goto_5
@@ -434,7 +437,7 @@
 
     move-result v0
 
-    goto :goto_4
+    move v12, v0
 
     :goto_5
     new-instance v0, Landroidx/core/app/NotificationCompat$Action;
@@ -635,7 +638,6 @@
 
     iget-object p0, p0, Landroid/app/Notification;->extras:Landroid/os/Bundle;
 
-    :goto_0
     const-string v0, "android.support.groupKey"
 
     invoke-virtual {p0, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
@@ -655,7 +657,13 @@
 
     move-result-object p0
 
-    goto :goto_0
+    const-string v0, "android.support.groupKey"
+
+    invoke-virtual {p0, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_2
     const/4 p0, 0x0
@@ -790,7 +798,6 @@
 
     iget-object p0, p0, Landroid/app/Notification;->extras:Landroid/os/Bundle;
 
-    :goto_0
     const-string v0, "android.support.localOnly"
 
     invoke-virtual {p0, v0}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
@@ -810,7 +817,13 @@
 
     move-result-object p0
 
-    goto :goto_0
+    const-string v0, "android.support.localOnly"
+
+    invoke-virtual {p0, v0}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
+
+    move-result p0
+
+    return p0
 
     :cond_3
     return v1
@@ -910,7 +923,6 @@
 
     iget-object p0, p0, Landroid/app/Notification;->extras:Landroid/os/Bundle;
 
-    :goto_0
     const-string v0, "android.support.sortKey"
 
     invoke-virtual {p0, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
@@ -930,7 +942,13 @@
 
     move-result-object p0
 
-    goto :goto_0
+    const-string v0, "android.support.sortKey"
+
+    invoke-virtual {p0, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_2
     const/4 p0, 0x0
@@ -992,7 +1010,6 @@
 
     iget-object p0, p0, Landroid/app/Notification;->extras:Landroid/os/Bundle;
 
-    :goto_0
     const-string v0, "android.support.isGroupSummary"
 
     invoke-virtual {p0, v0}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
@@ -1012,7 +1029,13 @@
 
     move-result-object p0
 
-    goto :goto_0
+    const-string v0, "android.support.isGroupSummary"
+
+    invoke-virtual {p0, v0}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
+
+    move-result p0
+
+    return p0
 
     :cond_3
     return v1
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali b/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali
index 2ce996717a..a5520f33d9 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationCompatBuilder;
 .super Ljava/lang/Object;
+.source "NotificationCompatBuilder.java"
 
 # interfaces
 .implements Landroidx/core/app/NotificationBuilderWithBuilderAccessor;
@@ -73,10 +74,9 @@
 
     invoke-direct {v0, v2, v3}, Landroid/app/Notification$Builder;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    :goto_0
     iput-object v0, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilder:Landroid/app/Notification$Builder;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance v0, Landroid/app/Notification$Builder;
@@ -85,9 +85,9 @@
 
     invoke-direct {v0, v2}, Landroid/app/Notification$Builder;-><init>(Landroid/content/Context;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilder:Landroid/app/Notification$Builder;
 
-    :goto_1
+    :goto_0
     iget-object v0, p1, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
 
     iget-object v2, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilder:Landroid/app/Notification$Builder;
@@ -148,12 +148,12 @@
 
     const/4 v3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 v3, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {v2, v3}, Landroid/app/Notification$Builder;->setOngoing(Z)Landroid/app/Notification$Builder;
 
     move-result-object v2
@@ -166,12 +166,12 @@
 
     const/4 v3, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const/4 v3, 0x0
 
-    :goto_3
+    :goto_2
     invoke-virtual {v2, v3}, Landroid/app/Notification$Builder;->setOnlyAlertOnce(Z)Landroid/app/Notification$Builder;
 
     move-result-object v2
@@ -186,12 +186,12 @@
 
     const/4 v3, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/4 v3, 0x0
 
-    :goto_4
+    :goto_3
     invoke-virtual {v2, v3}, Landroid/app/Notification$Builder;->setAutoCancel(Z)Landroid/app/Notification$Builder;
 
     move-result-object v2
@@ -242,12 +242,12 @@
 
     const/4 v7, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_4
     const/4 v7, 0x0
 
-    :goto_5
+    :goto_4
     invoke-virtual {v2, v3, v7}, Landroid/app/Notification$Builder;->setFullScreenIntent(Landroid/app/PendingIntent;Z)Landroid/app/Notification$Builder;
 
     move-result-object v2
@@ -317,7 +317,7 @@
 
     move-result-object v2
 
-    :goto_6
+    :goto_5
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v6
@@ -332,7 +332,7 @@
 
     invoke-direct {p0, v6}, Landroidx/core/app/NotificationCompatBuilder;->addAction(Landroidx/core/app/NotificationCompat$Action;)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_6
     iget-object v2, p1, Landroidx/core/app/NotificationCompat$Builder;->mExtras:Landroid/os/Bundle;
@@ -381,20 +381,19 @@
 
     const-string v6, "android.support.isGroupSummary"
 
-    :goto_7
     invoke-virtual {v2, v6, v4}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_9
     iget-object v2, p0, Landroidx/core/app/NotificationCompatBuilder;->mExtras:Landroid/os/Bundle;
 
     const-string v6, "android.support.useSideChannel"
 
-    goto :goto_7
+    invoke-virtual {v2, v6, v4}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
     :cond_a
-    :goto_8
+    :goto_6
     iget-object v2, p1, Landroidx/core/app/NotificationCompat$Builder;->mSortKey:Ljava/lang/String;
 
     if-eqz v2, :cond_b
@@ -543,7 +542,7 @@
 
     move-result-object v0
 
-    :goto_9
+    :goto_7
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
@@ -560,7 +559,7 @@
 
     invoke-virtual {v3, v2}, Landroid/app/Notification$Builder;->addPerson(Ljava/lang/String;)Landroid/app/Notification$Builder;
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_f
     iget-object v0, p1, Landroidx/core/app/NotificationCompat$Builder;->mHeadsUpContentView:Landroid/widget/RemoteViews;
@@ -598,7 +597,7 @@
 
     const/4 v3, 0x0
 
-    :goto_a
+    :goto_8
     iget-object v4, p1, Landroidx/core/app/NotificationCompat$Builder;->mInvisibleActions:Ljava/util/ArrayList;
 
     invoke-virtual {v4}, Ljava/util/ArrayList;->size()I
@@ -627,7 +626,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_11
     const-string v3, "invisible_actions"
@@ -985,10 +984,9 @@
 
     if-eqz v1, :cond_2
 
-    :goto_1
     iput-object v1, v2, Landroid/app/Notification;->contentView:Landroid/widget/RemoteViews;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilderCompat:Landroidx/core/app/NotificationCompat$Builder;
@@ -1001,10 +999,10 @@
 
     iget-object v1, v1, Landroidx/core/app/NotificationCompat$Builder;->mContentView:Landroid/widget/RemoteViews;
 
-    goto :goto_1
+    iput-object v1, v2, Landroid/app/Notification;->contentView:Landroid/widget/RemoteViews;
 
     :cond_3
-    :goto_2
+    :goto_1
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v3, 0x10
@@ -1162,8 +1160,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->contentView:Landroid/widget/RemoteViews;
 
     :cond_4
@@ -1171,8 +1167,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mBigContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->bigContentView:Landroid/widget/RemoteViews;
 
     :cond_5
@@ -1180,8 +1174,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mHeadsUpContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->headsUpContentView:Landroid/widget/RemoteViews;
 
     :cond_6
@@ -1252,8 +1244,6 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->contentView:Landroid/widget/RemoteViews;
 
     :cond_a
@@ -1261,8 +1251,6 @@
 
     if-eqz v1, :cond_b
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mBigContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->bigContentView:Landroid/widget/RemoteViews;
 
     :cond_b
@@ -1348,8 +1336,6 @@
 
     if-eqz v1, :cond_10
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->contentView:Landroid/widget/RemoteViews;
 
     :cond_10
@@ -1357,8 +1343,6 @@
 
     if-eqz v1, :cond_11
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mBigContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->bigContentView:Landroid/widget/RemoteViews;
 
     :cond_11
@@ -1445,8 +1429,6 @@
 
     if-eqz v1, :cond_16
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->contentView:Landroid/widget/RemoteViews;
 
     :cond_16
@@ -1454,8 +1436,6 @@
 
     if-eqz v1, :cond_17
 
-    iget-object v1, p0, Landroidx/core/app/NotificationCompatBuilder;->mBigContentView:Landroid/widget/RemoteViews;
-
     iput-object v1, v0, Landroid/app/Notification;->bigContentView:Landroid/widget/RemoteViews;
 
     :cond_17
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatExtras.smali b/com.discord/smali/androidx/core/app/NotificationCompatExtras.smali
index cc69bca4c5..53fc082e52 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatExtras.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatExtras.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NotificationCompatExtras;
 .super Ljava/lang/Object;
+.source "NotificationCompatExtras.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali b/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali
index 0e8b03162f..3f3f368b53 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationCompatJellybean;
 .super Ljava/lang/Object;
+.source "NotificationCompatJellybean.java"
 
 
 # annotations
@@ -214,7 +215,7 @@
 
     invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V
     :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_0
@@ -230,6 +231,19 @@
 
     sput-boolean v0, Landroidx/core/app/NotificationCompatJellybean;->sActionsAccessFailed:Z
 
+    goto :goto_0
+
+    :catch_1
+    move-exception v2
+
+    const-string v3, "NotificationCompat"
+
+    const-string v4, "Unable to access notification actions"
+
+    invoke-static {v3, v4, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    sput-boolean v0, Landroidx/core/app/NotificationCompatJellybean;->sActionsAccessFailed:Z
+
     :cond_1
     :goto_0
     sget-boolean v2, Landroidx/core/app/NotificationCompatJellybean;->sActionsAccessFailed:Z
@@ -907,10 +921,9 @@
 
     const-string v4, "Unable to access notification extras"
 
-    :goto_0
     invoke-static {v3, v4, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_1
     move-exception p0
@@ -919,9 +932,9 @@
 
     const-string v4, "Unable to access notification extras"
 
-    goto :goto_0
+    invoke-static {v3, v4, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    :goto_1
+    :goto_0
     sput-boolean v1, Landroidx/core/app/NotificationCompatJellybean;->sExtrasFieldAccessFailed:Z
 
     monitor-exit v0
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali b/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali
index be38139d53..51caeb8649 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub;
 .super Landroid/support/v4/a/a$a;
+.source "NotificationCompatSideChannelService.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService.smali b/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService.smali
index 1922effd42..4488316757 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/app/NotificationCompatSideChannelService;
 .super Landroid/app/Service;
+.source "NotificationCompatSideChannelService.java"
 
 
 # annotations
@@ -84,6 +85,8 @@
     invoke-direct {v0, p1}, Ljava/lang/SecurityException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public abstract notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali
index f0896c7e4c..6a7fb59c47 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationManagerCompat$CancelTask;
 .super Ljava/lang/Object;
+.source "NotificationManagerCompat.java"
 
 # interfaces
 .implements Landroidx/core/app/NotificationManagerCompat$Task;
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali
index 3d2e34f100..a84117355d 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationManagerCompat$NotifyTask;
 .super Ljava/lang/Object;
+.source "NotificationManagerCompat.java"
 
 # interfaces
 .implements Landroidx/core/app/NotificationManagerCompat$Task;
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$ServiceConnectedEvent.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$ServiceConnectedEvent.smali
index 36c17dab45..fcaa2fc8fd 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$ServiceConnectedEvent.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$ServiceConnectedEvent.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationManagerCompat$ServiceConnectedEvent;
 .super Ljava/lang/Object;
+.source "NotificationManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali
index 032ad2bb8d..94ced3310b 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;
 .super Ljava/lang/Object;
+.source "NotificationManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali
index 410970554d..c18844fed3 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/app/NotificationManagerCompat$SideChannelManager;
 .super Ljava/lang/Object;
+.source "NotificationManagerCompat.java"
 
 # interfaces
 .implements Landroid/content/ServiceConnection;
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali
index 41c503fef6..b7df1e5f50 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/app/NotificationManagerCompat$Task;
 .super Ljava/lang/Object;
+.source "NotificationManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat.smali
index 08775b81eb..5317ef03b7 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/NotificationManagerCompat;
 .super Ljava/lang/Object;
+.source "NotificationManagerCompat.java"
 
 
 # annotations
@@ -237,27 +238,23 @@
 
     sput-object p0, Landroidx/core/app/NotificationManagerCompat;->sEnabledNotificationListeners:Ljava/lang/String;
 
-    goto :goto_1
-
-    :catchall_0
-    move-exception p0
-
-    goto :goto_2
-
     :cond_2
-    :goto_1
     sget-object p0, Landroidx/core/app/NotificationManagerCompat;->sEnabledNotificationListenerPackages:Ljava/util/Set;
 
     monitor-exit v0
 
     return-object p0
 
-    :goto_2
+    :catchall_0
+    move-exception p0
+
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p0
+
+    return-void
 .end method
 
 .method private pushSideChannelQueue(Landroidx/core/app/NotificationManagerCompat$Task;)V
@@ -482,6 +479,8 @@
     return v9
 
     :catch_0
+    return v2
+
     :cond_2
     return v2
 .end method
diff --git a/com.discord/smali/androidx/core/app/Person$Builder.smali b/com.discord/smali/androidx/core/app/Person$Builder.smali
index 14ab0a1f5d..8139334eb0 100644
--- a/com.discord/smali/androidx/core/app/Person$Builder.smali
+++ b/com.discord/smali/androidx/core/app/Person$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/Person$Builder;
 .super Ljava/lang/Object;
+.source "Person.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/Person.smali b/com.discord/smali/androidx/core/app/Person.smali
index e6f9c79dd0..97028b31d1 100644
--- a/com.discord/smali/androidx/core/app/Person.smali
+++ b/com.discord/smali/androidx/core/app/Person.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/Person;
 .super Ljava/lang/Object;
+.source "Person.java"
 
 
 # annotations
@@ -450,8 +451,6 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Landroidx/core/app/Person;->mIcon:Landroidx/core/graphics/drawable/IconCompat;
-
     invoke-virtual {v2}, Landroidx/core/graphics/drawable/IconCompat;->toBundle()Landroid/os/Bundle;
 
     move-result-object v2
diff --git a/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali b/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali
index 4c1d974731..d9f26f24bb 100644
--- a/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali
+++ b/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/RemoteInput$Builder;
 .super Ljava/lang/Object;
+.source "RemoteInput.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/RemoteInput.smali b/com.discord/smali/androidx/core/app/RemoteInput.smali
index 987a0db021..62f68c9ad7 100644
--- a/com.discord/smali/androidx/core/app/RemoteInput.smali
+++ b/com.discord/smali/androidx/core/app/RemoteInput.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/RemoteInput;
 .super Ljava/lang/Object;
+.source "RemoteInput.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ServiceCompat$StopForegroundFlags.smali b/com.discord/smali/androidx/core/app/ServiceCompat$StopForegroundFlags.smali
index f63b6e4d6a..29c84c5068 100644
--- a/com.discord/smali/androidx/core/app/ServiceCompat$StopForegroundFlags.smali
+++ b/com.discord/smali/androidx/core/app/ServiceCompat$StopForegroundFlags.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/app/ServiceCompat$StopForegroundFlags;
 .super Ljava/lang/Object;
+.source "ServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/app/ServiceCompat.smali b/com.discord/smali/androidx/core/app/ServiceCompat.smali
index 7dbc639679..7fd48f6094 100644
--- a/com.discord/smali/androidx/core/app/ServiceCompat.smali
+++ b/com.discord/smali/androidx/core/app/ServiceCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/ServiceCompat;
 .super Ljava/lang/Object;
+.source "ServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali b/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali
index d5468e3fae..946a651a39 100644
--- a/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali
+++ b/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/ShareCompat$IntentBuilder;
 .super Ljava/lang/Object;
+.source "ShareCompat.java"
 
 
 # annotations
@@ -404,11 +405,9 @@
 
     if-eqz v0, :cond_0
 
-    const-string v0, "android.intent.extra.EMAIL"
+    const-string v2, "android.intent.extra.EMAIL"
 
-    iget-object v2, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mToAddresses:Ljava/util/ArrayList;
-
-    invoke-direct {p0, v0, v2}, Landroidx/core/app/ShareCompat$IntentBuilder;->combineArrayExtra(Ljava/lang/String;Ljava/util/ArrayList;)V
+    invoke-direct {p0, v2, v0}, Landroidx/core/app/ShareCompat$IntentBuilder;->combineArrayExtra(Ljava/lang/String;Ljava/util/ArrayList;)V
 
     iput-object v1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mToAddresses:Ljava/util/ArrayList;
 
@@ -417,11 +416,9 @@
 
     if-eqz v0, :cond_1
 
-    const-string v0, "android.intent.extra.CC"
+    const-string v2, "android.intent.extra.CC"
 
-    iget-object v2, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mCcAddresses:Ljava/util/ArrayList;
-
-    invoke-direct {p0, v0, v2}, Landroidx/core/app/ShareCompat$IntentBuilder;->combineArrayExtra(Ljava/lang/String;Ljava/util/ArrayList;)V
+    invoke-direct {p0, v2, v0}, Landroidx/core/app/ShareCompat$IntentBuilder;->combineArrayExtra(Ljava/lang/String;Ljava/util/ArrayList;)V
 
     iput-object v1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mCcAddresses:Ljava/util/ArrayList;
 
@@ -430,35 +427,31 @@
 
     if-eqz v0, :cond_2
 
-    const-string v0, "android.intent.extra.BCC"
+    const-string v2, "android.intent.extra.BCC"
 
-    iget-object v2, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mBccAddresses:Ljava/util/ArrayList;
-
-    invoke-direct {p0, v0, v2}, Landroidx/core/app/ShareCompat$IntentBuilder;->combineArrayExtra(Ljava/lang/String;Ljava/util/ArrayList;)V
+    invoke-direct {p0, v2, v0}, Landroidx/core/app/ShareCompat$IntentBuilder;->combineArrayExtra(Ljava/lang/String;Ljava/util/ArrayList;)V
 
     iput-object v1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mBccAddresses:Ljava/util/ArrayList;
 
     :cond_2
     iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mStreams:Ljava/util/ArrayList;
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mStreams:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
 
-    if-le v0, v3, :cond_3
+    if-le v0, v2, :cond_3
 
     goto :goto_0
 
     :cond_3
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
     iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
@@ -473,7 +466,7 @@
 
     move-result v0
 
-    if-nez v3, :cond_5
+    if-nez v2, :cond_5
 
     if-eqz v0, :cond_5
 
@@ -487,8 +480,6 @@
 
     if-eqz v4, :cond_4
 
-    iget-object v4, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mStreams:Ljava/util/ArrayList;
-
     invoke-virtual {v4}, Ljava/util/ArrayList;->isEmpty()Z
 
     move-result v4
@@ -501,28 +492,28 @@
 
     iget-object v6, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mStreams:Ljava/util/ArrayList;
 
-    invoke-virtual {v6, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    invoke-virtual {v6, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Landroid/os/Parcelable;
+    check-cast v3, Landroid/os/Parcelable;
 
-    invoke-virtual {v4, v5, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
+    invoke-virtual {v4, v5, v3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
 
     goto :goto_1
 
     :cond_4
-    iget-object v2, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
+    iget-object v3, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
 
     const-string v4, "android.intent.extra.STREAM"
 
-    invoke-virtual {v2, v4}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
     :goto_1
     iput-object v1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mStreams:Ljava/util/ArrayList;
 
     :cond_5
-    if-eqz v3, :cond_7
+    if-eqz v2, :cond_7
 
     if-nez v0, :cond_7
 
@@ -536,8 +527,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mStreams:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali b/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali
index f1070656e2..f063473af9 100644
--- a/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali
+++ b/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/app/ShareCompat$IntentReader;
 .super Ljava/lang/Object;
+.source "ShareCompat.java"
 
 
 # annotations
@@ -92,10 +93,9 @@
 
     const-string v0, "&lt;"
 
-    :goto_1
     invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_0
     const/16 v1, 0x3e
@@ -104,7 +104,9 @@
 
     const-string v0, "&gt;"
 
-    goto :goto_1
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_3
 
     :cond_1
     const/16 v1, 0x26
@@ -113,7 +115,9 @@
 
     const-string v0, "&amp;"
 
-    goto :goto_1
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_3
 
     :cond_2
     const/16 v1, 0x7e
@@ -124,12 +128,12 @@
 
     if-ge v0, v1, :cond_3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     if-ne v0, v1, :cond_5
 
-    :goto_2
+    :goto_1
     add-int/lit8 v0, p2, 0x1
 
     if-ge v0, p3, :cond_4
@@ -146,20 +150,20 @@
 
     move p2, v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
-    :goto_3
+    :goto_2
     new-instance v1, Ljava/lang/StringBuilder;
 
     const-string v2, "&#"
@@ -176,9 +180,9 @@
 
     move-result-object v0
 
-    goto :goto_1
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_4
+    :goto_3
     add-int/lit8 p2, p2, 0x1
 
     goto :goto_0
@@ -486,13 +490,10 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mStreams:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
-    :goto_0
     check-cast p1, Landroid/net/Uri;
 
     return-object p1
@@ -508,7 +509,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Landroid/net/Uri;
+
+    return-object p1
 
     :cond_2
     new-instance v0, Ljava/lang/IndexOutOfBoundsException;
@@ -568,8 +571,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mStreams:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/core/app/ShareCompat.smali b/com.discord/smali/androidx/core/app/ShareCompat.smali
index fadc61e065..e6633ddc01 100644
--- a/com.discord/smali/androidx/core/app/ShareCompat.smali
+++ b/com.discord/smali/androidx/core/app/ShareCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/ShareCompat;
 .super Ljava/lang/Object;
+.source "ShareCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/SharedElementCallback$OnSharedElementsReadyListener.smali b/com.discord/smali/androidx/core/app/SharedElementCallback$OnSharedElementsReadyListener.smali
index e762c47c50..0f38e60d9c 100644
--- a/com.discord/smali/androidx/core/app/SharedElementCallback$OnSharedElementsReadyListener.smali
+++ b/com.discord/smali/androidx/core/app/SharedElementCallback$OnSharedElementsReadyListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/SharedElementCallback$OnSharedElementsReadyListener;
 .super Ljava/lang/Object;
+.source "SharedElementCallback.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/SharedElementCallback.smali b/com.discord/smali/androidx/core/app/SharedElementCallback.smali
index 8ad91e330b..58a2b8a1df 100644
--- a/com.discord/smali/androidx/core/app/SharedElementCallback.smali
+++ b/com.discord/smali/androidx/core/app/SharedElementCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/app/SharedElementCallback;
 .super Ljava/lang/Object;
+.source "SharedElementCallback.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/TaskStackBuilder$SupportParentable.smali b/com.discord/smali/androidx/core/app/TaskStackBuilder$SupportParentable.smali
index b0bf49040a..86633106dd 100644
--- a/com.discord/smali/androidx/core/app/TaskStackBuilder$SupportParentable.smali
+++ b/com.discord/smali/androidx/core/app/TaskStackBuilder$SupportParentable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/app/TaskStackBuilder$SupportParentable;
 .super Ljava/lang/Object;
+.source "TaskStackBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/app/TaskStackBuilder.smali b/com.discord/smali/androidx/core/app/TaskStackBuilder.smali
index af6f9e13b7..44b8d737dc 100644
--- a/com.discord/smali/androidx/core/app/TaskStackBuilder.smali
+++ b/com.discord/smali/androidx/core/app/TaskStackBuilder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/app/TaskStackBuilder;
 .super Ljava/lang/Object;
+.source "TaskStackBuilder.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
@@ -212,11 +213,11 @@
     :try_start_0
     iget-object v1, p0, Landroidx/core/app/TaskStackBuilder;->mSourceContext:Landroid/content/Context;
 
-    :goto_0
     invoke-static {v1, p1}, Landroidx/core/app/NavUtils;->getParentActivityIntent(Landroid/content/Context;Landroid/content/ComponentName;)Landroid/content/Intent;
 
     move-result-object p1
 
+    :goto_0
     if-eqz p1, :cond_0
 
     iget-object v1, p0, Landroidx/core/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList;
@@ -227,6 +228,10 @@
 
     invoke-virtual {p1}, Landroid/content/Intent;->getComponent()Landroid/content/ComponentName;
 
+    move-result-object p1
+
+    invoke-static {v1, p1}, Landroidx/core/app/NavUtils;->getParentActivityIntent(Landroid/content/Context;Landroid/content/ComponentName;)Landroid/content/Intent;
+
     move-result-object p1
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
@@ -250,6 +255,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final addParentStack(Ljava/lang/Class;)Landroidx/core/app/TaskStackBuilder;
@@ -427,9 +434,7 @@
 
     iget-object v0, p0, Landroidx/core/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList;
 
-    iget-object v1, p0, Landroidx/core/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList;
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
@@ -540,9 +545,7 @@
 
     iget-object v0, p0, Landroidx/core/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList;
 
-    iget-object v1, p0, Landroidx/core/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList;
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/core/content/ContentResolverCompat.smali b/com.discord/smali/androidx/core/content/ContentResolverCompat.smali
index 879f24df79..36be0082f5 100644
--- a/com.discord/smali/androidx/core/content/ContentResolverCompat.smali
+++ b/com.discord/smali/androidx/core/content/ContentResolverCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/ContentResolverCompat;
 .super Ljava/lang/Object;
+.source "ContentResolverCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali b/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali
index 8e9ff9932a..022c6febb7 100644
--- a/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali
+++ b/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/content/ContextCompat$LegacyServiceMapHolder;
 .super Ljava/lang/Object;
+.source "ContextCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/ContextCompat.smali b/com.discord/smali/androidx/core/content/ContextCompat.smali
index 2a17be3d06..481e957a5f 100644
--- a/com.discord/smali/androidx/core/content/ContextCompat.smali
+++ b/com.discord/smali/androidx/core/content/ContextCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/content/ContextCompat;
 .super Ljava/lang/Object;
+.source "ContextCompat.java"
 
 
 # annotations
@@ -404,7 +405,6 @@
 
     if-lt v0, v1, :cond_1
 
-    :goto_0
     invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object p0
@@ -447,15 +447,26 @@
     iget p1, p1, Landroid/util/TypedValue;->resourceId:I
 
     monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    goto :goto_0
+    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p0
+
+    invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p0
+
+    return-object p0
 
     :catchall_0
     move-exception p0
 
+    :try_start_1
     monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/content/FileProvider$PathStrategy.smali b/com.discord/smali/androidx/core/content/FileProvider$PathStrategy.smali
index 45cef80eeb..eb15c7f24f 100644
--- a/com.discord/smali/androidx/core/content/FileProvider$PathStrategy.smali
+++ b/com.discord/smali/androidx/core/content/FileProvider$PathStrategy.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/content/FileProvider$PathStrategy;
 .super Ljava/lang/Object;
+.source "FileProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/FileProvider$SimplePathStrategy.smali b/com.discord/smali/androidx/core/content/FileProvider$SimplePathStrategy.smali
index 51e0fc747d..d2efa2de2a 100644
--- a/com.discord/smali/androidx/core/content/FileProvider$SimplePathStrategy.smali
+++ b/com.discord/smali/androidx/core/content/FileProvider$SimplePathStrategy.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/content/FileProvider$SimplePathStrategy;
 .super Ljava/lang/Object;
+.source "FileProvider.java"
 
 # interfaces
 .implements Landroidx/core/content/FileProvider$PathStrategy;
@@ -62,13 +63,13 @@
     :try_start_0
     invoke-virtual {p2}, Ljava/io/File;->getCanonicalFile()Ljava/io/File;
 
-    move-result-object v0
+    move-result-object p2
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object p2, p0, Landroidx/core/content/FileProvider$SimplePathStrategy;->mRoots:Ljava/util/HashMap;
+    iget-object v0, p0, Landroidx/core/content/FileProvider$SimplePathStrategy;->mRoots:Ljava/util/HashMap;
 
-    invoke-virtual {p2, p1, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p1, p2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 
@@ -151,25 +152,25 @@
     :try_start_0
     invoke-virtual {p1}, Ljava/io/File;->getCanonicalFile()Ljava/io/File;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v0}, Ljava/io/File;->getPath()Ljava/lang/String;
+    invoke-virtual {p1}, Ljava/io/File;->getPath()Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object v0
 
     invoke-virtual {v1}, Ljava/io/File;->getPath()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {p1, v1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
-    move-result p1
+    move-result v0
 
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
 
-    return-object v0
+    return-object p1
 
     :cond_0
     new-instance p1, Ljava/lang/SecurityException;
@@ -221,11 +222,11 @@
     :try_start_0
     invoke-virtual {p1}, Ljava/io/File;->getCanonicalPath()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    const/4 p1, 0x0
+    const/4 v0, 0x0
 
     iget-object v1, p0, Landroidx/core/content/FileProvider$SimplePathStrategy;->mRoots:Ljava/util/HashMap;
 
@@ -261,19 +262,19 @@
 
     move-result-object v3
 
-    invoke-virtual {v0, v3}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+    invoke-virtual {p1, v3}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
     move-result v4
 
     if-eqz v4, :cond_0
 
-    if-eqz p1, :cond_1
+    if-eqz v0, :cond_1
 
     invoke-virtual {v3}, Ljava/lang/String;->length()I
 
     move-result v3
 
-    invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v4
 
@@ -290,14 +291,14 @@
     if-le v3, v4, :cond_0
 
     :cond_1
-    move-object p1, v2
+    move-object v0, v2
 
     goto :goto_0
 
     :cond_2
-    if-eqz p1, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -319,12 +320,11 @@
 
     move-result v1
 
-    :goto_1
-    invoke-virtual {v0, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+    invoke-virtual {p1, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-virtual {v1}, Ljava/lang/String;->length()I
@@ -333,32 +333,34 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_1
+    invoke-virtual {p1, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
-    :goto_2
+    move-result-object p1
+
+    :goto_1
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
-    move-result-object p1
+    move-result-object v0
 
-    check-cast p1, Ljava/lang/String;
+    check-cast v0, Ljava/lang/String;
 
-    invoke-static {p1}, Landroid/net/Uri;->encode(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Landroid/net/Uri;->encode(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/16 p1, 0x2f
+    const/16 v0, 0x2f
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    const-string p1, "/"
+    const-string v0, "/"
 
-    invoke-static {v0, p1}, Landroid/net/Uri;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1, v0}, Landroid/net/Uri;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -395,21 +397,21 @@
     return-object p1
 
     :cond_4
-    new-instance p1, Ljava/lang/IllegalArgumentException;
+    new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     const-string v1, "Failed to find configured root that contains "
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
-    throw p1
+    throw v0
 
     :catch_0
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -427,4 +429,6 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/core/content/FileProvider.smali b/com.discord/smali/androidx/core/content/FileProvider.smali
index 0f8269b530..a4574bc58e 100644
--- a/com.discord/smali/androidx/core/content/FileProvider.smali
+++ b/com.discord/smali/androidx/core/content/FileProvider.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/content/FileProvider;
 .super Landroid/content/ContentProvider;
+.source "FileProvider.java"
 
 
 # annotations
@@ -574,6 +575,8 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 
@@ -848,10 +851,9 @@
 
     aput-object v3, p4, v1
 
-    :goto_1
     move v1, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const-string v3, "_size"
@@ -878,10 +880,10 @@
 
     aput-object v3, p4, v1
 
-    goto :goto_1
+    move v1, v2
 
     :cond_2
-    :goto_2
+    :goto_1
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali/androidx/core/content/IntentCompat.smali b/com.discord/smali/androidx/core/content/IntentCompat.smali
index 25daf9bf27..e3a35111a8 100644
--- a/com.discord/smali/androidx/core/content/IntentCompat.smali
+++ b/com.discord/smali/androidx/core/content/IntentCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/IntentCompat;
 .super Ljava/lang/Object;
+.source "IntentCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/content/MimeTypeFilter.smali b/com.discord/smali/androidx/core/content/MimeTypeFilter.smali
index 7559c40fb5..d346a32385 100644
--- a/com.discord/smali/androidx/core/content/MimeTypeFilter.smali
+++ b/com.discord/smali/androidx/core/content/MimeTypeFilter.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/MimeTypeFilter;
 .super Ljava/lang/Object;
+.source "MimeTypeFilter.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/content/PermissionChecker$PermissionResult.smali b/com.discord/smali/androidx/core/content/PermissionChecker$PermissionResult.smali
index 19f985b4d1..b235122076 100644
--- a/com.discord/smali/androidx/core/content/PermissionChecker$PermissionResult.smali
+++ b/com.discord/smali/androidx/core/content/PermissionChecker$PermissionResult.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/content/PermissionChecker$PermissionResult;
 .super Ljava/lang/Object;
+.source "PermissionChecker.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/content/PermissionChecker.smali b/com.discord/smali/androidx/core/content/PermissionChecker.smali
index 8846324f21..e4bf2b048a 100644
--- a/com.discord/smali/androidx/core/content/PermissionChecker.smali
+++ b/com.discord/smali/androidx/core/content/PermissionChecker.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/PermissionChecker;
 .super Ljava/lang/Object;
+.source "PermissionChecker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat$Helper.smali b/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat$Helper.smali
index e1fb0a46a0..10327ac10d 100644
--- a/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat$Helper.smali
+++ b/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat$Helper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/content/SharedPreferencesCompat$EditorCompat$Helper;
 .super Ljava/lang/Object;
+.source "SharedPreferencesCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat.smali b/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat.smali
index a9bb683323..bd86bf988d 100644
--- a/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat.smali
+++ b/com.discord/smali/androidx/core/content/SharedPreferencesCompat$EditorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/SharedPreferencesCompat$EditorCompat;
 .super Ljava/lang/Object;
+.source "SharedPreferencesCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/SharedPreferencesCompat.smali b/com.discord/smali/androidx/core/content/SharedPreferencesCompat.smali
index e13084111c..e0331f1215 100644
--- a/com.discord/smali/androidx/core/content/SharedPreferencesCompat.smali
+++ b/com.discord/smali/androidx/core/content/SharedPreferencesCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/SharedPreferencesCompat;
 .super Ljava/lang/Object;
+.source "SharedPreferencesCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/pm/ActivityInfoCompat.smali b/com.discord/smali/androidx/core/content/pm/ActivityInfoCompat.smali
index 5d573f4795..68bfabeda1 100644
--- a/com.discord/smali/androidx/core/content/pm/ActivityInfoCompat.smali
+++ b/com.discord/smali/androidx/core/content/pm/ActivityInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/pm/ActivityInfoCompat;
 .super Ljava/lang/Object;
+.source "ActivityInfoCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/pm/PackageInfoCompat.smali b/com.discord/smali/androidx/core/content/pm/PackageInfoCompat.smali
index fbabb11382..02c9f30d23 100644
--- a/com.discord/smali/androidx/core/content/pm/PackageInfoCompat.smali
+++ b/com.discord/smali/androidx/core/content/pm/PackageInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/pm/PackageInfoCompat;
 .super Ljava/lang/Object;
+.source "PackageInfoCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$Protection.smali b/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$Protection.smali
index c2a9005de3..45d54179c6 100644
--- a/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$Protection.smali
+++ b/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$Protection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/content/pm/PermissionInfoCompat$Protection;
 .super Ljava/lang/Object;
+.source "PermissionInfoCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$ProtectionFlags.smali b/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$ProtectionFlags.smali
index 8c7efd7554..b01c195d29 100644
--- a/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$ProtectionFlags.smali
+++ b/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat$ProtectionFlags.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/content/pm/PermissionInfoCompat$ProtectionFlags;
 .super Ljava/lang/Object;
+.source "PermissionInfoCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat.smali b/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat.smali
index 1d695bdad1..05fdcfa0e9 100644
--- a/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat.smali
+++ b/com.discord/smali/androidx/core/content/pm/PermissionInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/pm/PermissionInfoCompat;
 .super Ljava/lang/Object;
+.source "PermissionInfoCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat$Builder.smali b/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat$Builder.smali
index fa70dd13f8..b4344c67e4 100644
--- a/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat$Builder.smali
+++ b/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
 .super Ljava/lang/Object;
+.source "ShortcutInfoCompat.java"
 
 
 # annotations
@@ -41,9 +42,7 @@
 
     iput-object p1, v0, Landroidx/core/content/pm/ShortcutInfoCompat;->mContext:Landroid/content/Context;
 
-    iget-object p1, p0, Landroidx/core/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroidx/core/content/pm/ShortcutInfoCompat;
-
-    iput-object p2, p1, Landroidx/core/content/pm/ShortcutInfoCompat;->mId:Ljava/lang/String;
+    iput-object p2, v0, Landroidx/core/content/pm/ShortcutInfoCompat;->mId:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali b/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali
index e533cf61a5..804286de5c 100644
--- a/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali
+++ b/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/content/pm/ShortcutInfoCompat;
 .super Ljava/lang/Object;
+.source "ShortcutInfoCompat.java"
 
 
 # annotations
@@ -48,9 +49,7 @@
 
     iget-object v1, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent;
 
-    iget-object v2, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent;
-
-    array-length v2, v2
+    array-length v2, v1
 
     add-int/lit8 v2, v2, -0x1
 
@@ -91,16 +90,12 @@
     if-eqz v2, :cond_0
 
     :try_start_0
-    iget-object v2, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mActivity:Landroid/content/ComponentName;
-
     invoke-virtual {v1, v2}, Landroid/content/pm/PackageManager;->getActivityIcon(Landroid/content/ComponentName;)Landroid/graphics/drawable/Drawable;
 
-    move-result-object v2
+    move-result-object v0
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object v0, v2
-
     :catch_0
     :cond_0
     if-nez v0, :cond_1
@@ -163,9 +158,7 @@
 
     iget-object v0, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent;
 
-    iget-object v1, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent;
-
-    array-length v1, v1
+    array-length v1, v0
 
     add-int/lit8 v1, v1, -0x1
 
@@ -181,9 +174,7 @@
 
     iget-object v0, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent;
 
-    iget-object v1, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent;
-
-    array-length v1, v1
+    array-length v1, v0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
@@ -244,8 +235,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIcon:Landroidx/core/graphics/drawable/IconCompat;
-
     invoke-virtual {v1}, Landroidx/core/graphics/drawable/IconCompat;->toIcon()Landroid/graphics/drawable/Icon;
 
     move-result-object v1
@@ -283,8 +272,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mActivity:Landroid/content/ComponentName;
-
     invoke-virtual {v0, v1}, Landroid/content/pm/ShortcutInfo$Builder;->setActivity(Landroid/content/ComponentName;)Landroid/content/pm/ShortcutInfo$Builder;
 
     :cond_3
diff --git a/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat$1.smali b/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat$1.smali
index 3fdc001967..e4c2f6bce1 100644
--- a/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat$1.smali
+++ b/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/content/pm/ShortcutManagerCompat$1;
 .super Landroid/content/BroadcastReceiver;
+.source "ShortcutManagerCompat.java"
 
 
 # annotations
@@ -50,6 +51,8 @@
     :try_end_0
     .catch Landroid/content/IntentSender$SendIntentException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali b/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali
index cddc1e98ee..1ba54fb587 100644
--- a/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali
+++ b/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/content/pm/ShortcutManagerCompat;
 .super Ljava/lang/Object;
+.source "ShortcutManagerCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/content/res/ColorStateListInflaterCompat.smali b/com.discord/smali/androidx/core/content/res/ColorStateListInflaterCompat.smali
index ef9e636968..4c421a369c 100644
--- a/com.discord/smali/androidx/core/content/res/ColorStateListInflaterCompat.smali
+++ b/com.discord/smali/androidx/core/content/res/ColorStateListInflaterCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/res/ColorStateListInflaterCompat;
 .super Ljava/lang/Object;
+.source "ColorStateListInflaterCompat.java"
 
 
 # annotations
@@ -81,6 +82,8 @@
     invoke-direct {p0, p1}, Lorg/xmlpull/v1/XmlPullParserException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
@@ -207,7 +210,7 @@
 
     move-result v7
 
-    if-eq v7, v2, :cond_7
+    if-eq v7, v2, :cond_8
 
     invoke-interface/range {p1 .. p1}, Lorg/xmlpull/v1/XmlPullParser;->getDepth()I
 
@@ -217,14 +220,14 @@
 
     const/4 v9, 0x3
 
-    if-eq v7, v9, :cond_7
+    if-eq v7, v9, :cond_8
 
     :cond_0
     const/4 v9, 0x2
 
-    if-ne v7, v9, :cond_6
+    if-ne v7, v9, :cond_7
 
-    if-gt v8, v1, :cond_6
+    if-gt v8, v1, :cond_7
 
     invoke-interface/range {p1 .. p1}, Lorg/xmlpull/v1/XmlPullParser;->getName()Ljava/lang/String;
 
@@ -268,12 +271,11 @@
 
     sget v11, Landroidx/core/R$styleable;->ColorStateListItem_android_alpha:I
 
-    :goto_1
     invoke-virtual {v7, v11, v12}, Landroid/content/res/TypedArray;->getFloat(IF)F
 
     move-result v12
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     sget v11, Landroidx/core/R$styleable;->ColorStateListItem_alpha:I
@@ -286,10 +288,12 @@
 
     sget v11, Landroidx/core/R$styleable;->ColorStateListItem_alpha:I
 
-    goto :goto_1
+    invoke-virtual {v7, v11, v12}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result v12
 
     :cond_2
-    :goto_2
+    :goto_1
     invoke-virtual {v7}, Landroid/content/res/TypedArray;->recycle()V
 
     invoke-interface/range {p2 .. p2}, Landroid/util/AttributeSet;->getAttributeCount()I
@@ -302,7 +306,7 @@
 
     const/4 v14, 0x0
 
-    :goto_3
+    :goto_2
     if-ge v13, v7, :cond_5
 
     invoke-interface {v0, v13}, Landroid/util/AttributeSet;->getAttributeNameResource(I)I
@@ -329,12 +333,12 @@
 
     if-eqz v16, :cond_3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     neg-int v15, v15
 
-    :goto_4
+    :goto_3
     aput v15, v11, v14
 
     move v14, v2
@@ -344,7 +348,7 @@
 
     const/4 v2, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     invoke-static {v11, v14}, Landroid/util/StateSet;->trimStateSet([II)[I
@@ -369,19 +373,28 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_5
+    const/4 v2, 0x1
+
+    goto/16 :goto_0
 
     :cond_6
     move-object/from16 v8, p0
 
     move-object/from16 v9, p3
 
-    :goto_5
+    goto :goto_4
+
+    :cond_7
+    move-object/from16 v8, p0
+
+    move-object/from16 v9, p3
+
+    :goto_4
     const/4 v2, 0x1
 
     goto/16 :goto_0
 
-    :cond_7
+    :cond_8
     new-array v0, v6, [I
 
     new-array v1, v6, [[I
diff --git a/com.discord/smali/androidx/core/content/res/ComplexColorCompat.smali b/com.discord/smali/androidx/core/content/res/ComplexColorCompat.smali
index 02313ce4cc..1c5625a86d 100644
--- a/com.discord/smali/androidx/core/content/res/ComplexColorCompat.smali
+++ b/com.discord/smali/androidx/core/content/res/ComplexColorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/res/ComplexColorCompat;
 .super Ljava/lang/Object;
+.source "ComplexColorCompat.java"
 
 
 # annotations
@@ -197,7 +198,7 @@
 
     throw p0
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -350,8 +351,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/content/res/ComplexColorCompat;->mColorStateList:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->isStateful()Z
 
     move-result v0
@@ -379,9 +378,7 @@
 
     iget-object v0, p0, Landroidx/core/content/res/ComplexColorCompat;->mColorStateList:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p0, Landroidx/core/content/res/ComplexColorCompat;->mColorStateList:Landroid/content/res/ColorStateList;
-
-    invoke-virtual {v1}, Landroid/content/res/ColorStateList;->getDefaultColor()I
+    invoke-virtual {v0}, Landroid/content/res/ColorStateList;->getDefaultColor()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/core/content/res/ConfigurationHelper.smali b/com.discord/smali/androidx/core/content/res/ConfigurationHelper.smali
index d0a2c5439b..ddf61eb894 100644
--- a/com.discord/smali/androidx/core/content/res/ConfigurationHelper.smali
+++ b/com.discord/smali/androidx/core/content/res/ConfigurationHelper.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/res/ConfigurationHelper;
 .super Ljava/lang/Object;
+.source "ConfigurationHelper.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry.smali b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry.smali
index ea1f608072..3ae865d00f 100644
--- a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry.smali
+++ b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry;
 .super Ljava/lang/Object;
+.source "FontResourcesParserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FetchStrategy.smali b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FetchStrategy.smali
index 4547c88dd5..20b97f6255 100644
--- a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FetchStrategy.smali
+++ b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FetchStrategy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/content/res/FontResourcesParserCompat$FetchStrategy;
 .super Ljava/lang/Object;
+.source "FontResourcesParserCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali
index b224032770..5bd2c200fc 100644
--- a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali
+++ b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry;
 .super Ljava/lang/Object;
+.source "FontResourcesParserCompat.java"
 
 # interfaces
 .implements Landroidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry;
diff --git a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali
index 498ce3a762..f8dea5a76b 100644
--- a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali
+++ b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry;
 .super Ljava/lang/Object;
+.source "FontResourcesParserCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali
index 058de6afe1..a451a2f979 100644
--- a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali
+++ b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry;
 .super Ljava/lang/Object;
+.source "FontResourcesParserCompat.java"
 
 # interfaces
 .implements Landroidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry;
diff --git a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat.smali b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat.smali
index 20ead8a2cb..aff79fc657 100644
--- a/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat.smali
+++ b/com.discord/smali/androidx/core/content/res/FontResourcesParserCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/content/res/FontResourcesParserCompat;
 .super Ljava/lang/Object;
+.source "FontResourcesParserCompat.java"
 
 
 # annotations
@@ -112,6 +113,8 @@
     invoke-direct {p0, p1}, Lorg/xmlpull/v1/XmlPullParserException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static readCerts(Landroid/content/res/Resources;I)Ljava/util/List;
@@ -231,6 +234,8 @@
     invoke-virtual {v0}, Landroid/content/res/TypedArray;->recycle()V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static readFamilies(Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources;)Landroidx/core/content/res/FontResourcesParserCompat$FamilyResourceEntry;
diff --git a/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat$ColorStops.smali b/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat$ColorStops.smali
index 1ca4daf6c4..f45462a53f 100644
--- a/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat$ColorStops.smali
+++ b/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat$ColorStops.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/content/res/GradientColorInflaterCompat$ColorStops;
 .super Ljava/lang/Object;
+.source "GradientColorInflaterCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat.smali b/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat.smali
index cab2b9dbd5..8fa649ceef 100644
--- a/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat.smali
+++ b/com.discord/smali/androidx/core/content/res/GradientColorInflaterCompat.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/content/res/GradientColorInflaterCompat;
 .super Ljava/lang/Object;
+.source "GradientColorInflaterCompat.java"
 
 
 # annotations
@@ -128,10 +129,12 @@
     invoke-direct {p0, p1}, Lorg/xmlpull/v1/XmlPullParserException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method static createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/Shader;
-    .locals 21
+    .locals 20
     .param p0    # Landroid/content/res/Resources;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -283,7 +286,7 @@
 
     sget v8, Landroidx/core/R$styleable;->GradientColor_android_gradientRadius:I
 
-    move/from16 v20, v12
+    move/from16 v17, v12
 
     const/4 v12, 0x0
 
@@ -315,7 +318,7 @@
 
     move-object v8, v1
 
-    move/from16 v12, v20
+    move/from16 v12, v17
 
     invoke-direct/range {v8 .. v15}, Landroid/graphics/LinearGradient;-><init>(FFFF[I[FLandroid/graphics/Shader$TileMode;)V
 
diff --git a/com.discord/smali/androidx/core/content/res/GrowingArrayUtils.smali b/com.discord/smali/androidx/core/content/res/GrowingArrayUtils.smali
index b345c48d2f..59a904f09f 100644
--- a/com.discord/smali/androidx/core/content/res/GrowingArrayUtils.smali
+++ b/com.discord/smali/androidx/core/content/res/GrowingArrayUtils.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/content/res/GrowingArrayUtils;
 .super Ljava/lang/Object;
+.source "GrowingArrayUtils.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$1.smali b/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$1.smali
index 8662eba56d..908db88a95 100644
--- a/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$1.smali
+++ b/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/content/res/ResourcesCompat$FontCallback$1;
 .super Ljava/lang/Object;
+.source "ResourcesCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$2.smali b/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$2.smali
index 01b7557232..6887595108 100644
--- a/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$2.smali
+++ b/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/content/res/ResourcesCompat$FontCallback$2;
 .super Ljava/lang/Object;
+.source "ResourcesCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback.smali b/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback.smali
index 71630715d2..e317a7abbb 100644
--- a/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback.smali
+++ b/com.discord/smali/androidx/core/content/res/ResourcesCompat$FontCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/content/res/ResourcesCompat$FontCallback;
 .super Ljava/lang/Object;
+.source "ResourcesCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/content/res/ResourcesCompat.smali b/com.discord/smali/androidx/core/content/res/ResourcesCompat.smali
index de6fbc8e47..109c01c303 100644
--- a/com.discord/smali/androidx/core/content/res/ResourcesCompat.smali
+++ b/com.discord/smali/androidx/core/content/res/ResourcesCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/content/res/ResourcesCompat;
 .super Ljava/lang/Object;
+.source "ResourcesCompat.java"
 
 
 # annotations
@@ -618,16 +619,6 @@
 
     const-string v2, "Failed to read xml resource "
 
-    goto :goto_1
-
-    :catch_1
-    move-exception v0
-
-    const-string v1, "ResourcesCompat"
-
-    const-string v2, "Failed to parse xml resource "
-
-    :goto_1
     invoke-static {v11}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
@@ -638,6 +629,26 @@
 
     invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_1
+
+    :catch_1
+    move-exception v0
+
+    const-string v1, "ResourcesCompat"
+
+    const-string v2, "Failed to parse xml resource "
+
+    invoke-static {v11}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :goto_1
     if-eqz v9, :cond_9
 
     invoke-virtual {v9, v13, v10}, Landroidx/core/content/res/ResourcesCompat$FontCallback;->callbackFailAsync(ILandroid/os/Handler;)V
diff --git a/com.discord/smali/androidx/core/content/res/TypedArrayUtils.smali b/com.discord/smali/androidx/core/content/res/TypedArrayUtils.smali
index 3219561aa2..726ea1b58c 100644
--- a/com.discord/smali/androidx/core/content/res/TypedArrayUtils.smali
+++ b/com.discord/smali/androidx/core/content/res/TypedArrayUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/content/res/TypedArrayUtils;
 .super Ljava/lang/Object;
+.source "TypedArrayUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/database/CursorWindowCompat.smali b/com.discord/smali/androidx/core/database/CursorWindowCompat.smali
index 1c5ef2749c..e5e1249a3b 100644
--- a/com.discord/smali/androidx/core/database/CursorWindowCompat.smali
+++ b/com.discord/smali/androidx/core/database/CursorWindowCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/database/CursorWindowCompat;
 .super Ljava/lang/Object;
+.source "CursorWindowCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/database/DatabaseUtilsCompat.smali b/com.discord/smali/androidx/core/database/DatabaseUtilsCompat.smali
index 75c25fce53..e2d7c02e55 100644
--- a/com.discord/smali/androidx/core/database/DatabaseUtilsCompat.smali
+++ b/com.discord/smali/androidx/core/database/DatabaseUtilsCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/database/DatabaseUtilsCompat;
 .super Ljava/lang/Object;
+.source "DatabaseUtilsCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/database/sqlite/SQLiteCursorCompat.smali b/com.discord/smali/androidx/core/database/sqlite/SQLiteCursorCompat.smali
index 6fd2648ef1..db24924a60 100644
--- a/com.discord/smali/androidx/core/database/sqlite/SQLiteCursorCompat.smali
+++ b/com.discord/smali/androidx/core/database/sqlite/SQLiteCursorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/database/sqlite/SQLiteCursorCompat;
 .super Ljava/lang/Object;
+.source "SQLiteCursorCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/graphics/BitmapCompat.smali b/com.discord/smali/androidx/core/graphics/BitmapCompat.smali
index aac7f544b4..0174e02775 100644
--- a/com.discord/smali/androidx/core/graphics/BitmapCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/BitmapCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/graphics/BitmapCompat;
 .super Ljava/lang/Object;
+.source "BitmapCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/graphics/ColorUtils.smali b/com.discord/smali/androidx/core/graphics/ColorUtils.smali
index 310bf716d8..dcb74574b2 100644
--- a/com.discord/smali/androidx/core/graphics/ColorUtils.smali
+++ b/com.discord/smali/androidx/core/graphics/ColorUtils.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/graphics/ColorUtils;
 .super Ljava/lang/Object;
+.source "ColorUtils.java"
 
 
 # static fields
@@ -121,7 +122,7 @@
 
     const/4 v3, 0x0
 
-    goto :goto_3
+    goto/16 :goto_0
 
     :pswitch_0
     add-float/2addr v4, p0
@@ -138,7 +139,15 @@
 
     move-result v3
 
-    goto :goto_1
+    add-float/2addr v5, p0
+
+    mul-float v5, v5, v2
+
+    invoke-static {v5}, Ljava/lang/Math;->round(F)I
+
+    move-result p0
+
+    goto :goto_0
 
     :pswitch_1
     add-float/2addr v5, p0
@@ -155,6 +164,14 @@
 
     move-result v3
 
+    add-float/2addr v4, p0
+
+    mul-float v4, v4, v2
+
+    invoke-static {v4}, Ljava/lang/Math;->round(F)I
+
+    move-result p0
+
     goto :goto_0
 
     :pswitch_2
@@ -172,7 +189,6 @@
 
     move-result v3
 
-    :goto_0
     add-float/2addr v4, p0
 
     mul-float v4, v4, v2
@@ -181,7 +197,7 @@
 
     move-result p0
 
-    goto :goto_3
+    goto :goto_0
 
     :pswitch_3
     mul-float v1, p0, v2
@@ -198,7 +214,6 @@
 
     move-result v3
 
-    :goto_1
     add-float/2addr v5, p0
 
     mul-float v5, v5, v2
@@ -207,7 +222,7 @@
 
     move-result p0
 
-    goto :goto_3
+    goto :goto_0
 
     :pswitch_4
     add-float/2addr v5, p0
@@ -226,7 +241,13 @@
 
     move-result v3
 
-    goto :goto_2
+    mul-float p0, p0, v2
+
+    invoke-static {p0}, Ljava/lang/Math;->round(F)I
+
+    move-result p0
+
+    goto :goto_0
 
     :pswitch_5
     add-float/2addr v4, p0
@@ -245,14 +266,13 @@
 
     move-result v3
 
-    :goto_2
     mul-float p0, p0, v2
 
     invoke-static {p0}, Ljava/lang/Math;->round(F)I
 
     move-result p0
 
-    :goto_3
+    :goto_0
     const/16 v2, 0xff
 
     invoke-static {v1, v0, v2}, Landroidx/core/graphics/ColorUtils;->constrain(III)I
@@ -273,6 +293,8 @@
 
     return p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_5
@@ -342,7 +364,7 @@
 .end method
 
 .method public static LABToXYZ(DDD[D)V
-    .locals 21
+    .locals 19
     .param p0    # D
         .annotation build Landroidx/annotation/FloatRange;
             from = 0.0
@@ -366,111 +388,107 @@
         .end annotation
     .end param
 
-    const-wide/high16 v2, 0x4030000000000000L    # 16.0
+    const-wide/high16 v0, 0x4030000000000000L    # 16.0
 
-    add-double v4, p0, v2
+    add-double v2, p0, v0
 
-    const-wide/high16 v6, 0x405d000000000000L    # 116.0
+    const-wide/high16 v4, 0x405d000000000000L    # 116.0
 
-    div-double/2addr v4, v6
+    div-double/2addr v2, v4
 
-    const-wide v8, 0x407f400000000000L    # 500.0
+    const-wide v6, 0x407f400000000000L    # 500.0
 
-    div-double v8, p2, v8
+    div-double v6, p2, v6
 
-    add-double/2addr v8, v4
+    add-double/2addr v6, v2
 
-    const-wide/high16 v10, 0x4069000000000000L    # 200.0
+    const-wide/high16 v8, 0x4069000000000000L    # 200.0
 
-    div-double v10, p4, v10
+    div-double v8, p4, v8
 
-    sub-double v10, v4, v10
+    sub-double v8, v2, v8
 
-    const-wide/high16 v12, 0x4008000000000000L    # 3.0
+    const-wide/high16 v10, 0x4008000000000000L    # 3.0
 
-    invoke-static {v8, v9, v12, v13}, Ljava/lang/Math;->pow(DD)D
+    invoke-static {v6, v7, v10, v11}, Ljava/lang/Math;->pow(DD)D
 
-    move-result-wide v14
+    move-result-wide v12
 
-    const-wide v16, 0x3f82231832fcac8eL    # 0.008856
+    const-wide v14, 0x3f82231832fcac8eL    # 0.008856
 
-    const-wide v18, 0x408c3a6666666666L    # 903.3
+    const-wide v16, 0x408c3a6666666666L    # 903.3
 
-    cmpl-double v20, v14, v16
+    cmpl-double v18, v12, v14
 
-    if-lez v20, :cond_0
+    if-lez v18, :cond_0
 
     goto :goto_0
 
     :cond_0
-    mul-double v8, v8, v6
+    mul-double v6, v6, v4
 
-    const/4 v14, 0x0
+    sub-double/2addr v6, v0
 
-    sub-double/2addr v8, v2
-
-    div-double v14, v8, v18
+    div-double v12, v6, v16
 
     :goto_0
-    const-wide v8, 0x401fff9da4c11507L    # 7.9996247999999985
+    const-wide v6, 0x401fff9da4c11507L    # 7.9996247999999985
 
-    cmpl-double v20, p0, v8
+    cmpl-double v18, p0, v6
 
-    if-lez v20, :cond_1
+    if-lez v18, :cond_1
 
-    invoke-static {v4, v5, v12, v13}, Ljava/lang/Math;->pow(DD)D
+    invoke-static {v2, v3, v10, v11}, Ljava/lang/Math;->pow(DD)D
 
-    move-result-wide v0
+    move-result-wide v2
 
     goto :goto_1
 
     :cond_1
-    div-double v0, p0, v18
+    div-double v2, p0, v16
 
     :goto_1
-    invoke-static {v10, v11, v12, v13}, Ljava/lang/Math;->pow(DD)D
+    invoke-static {v8, v9, v10, v11}, Ljava/lang/Math;->pow(DD)D
 
-    move-result-wide v4
+    move-result-wide v6
 
-    cmpl-double v8, v4, v16
+    cmpl-double v10, v6, v14
 
-    if-lez v8, :cond_2
+    if-lez v10, :cond_2
 
     goto :goto_2
 
     :cond_2
-    mul-double v10, v10, v6
+    mul-double v8, v8, v4
 
-    const/4 v4, 0x0
+    sub-double/2addr v8, v0
 
-    sub-double/2addr v10, v2
-
-    div-double v4, v10, v18
+    div-double v6, v8, v16
 
     :goto_2
-    const/4 v2, 0x0
+    const/4 v0, 0x0
 
-    const-wide v6, 0x4057c3020c49ba5eL    # 95.047
+    const-wide v4, 0x4057c3020c49ba5eL    # 95.047
 
-    mul-double v14, v14, v6
+    mul-double v12, v12, v4
 
-    aput-wide v14, p6, v2
+    aput-wide v12, p6, v0
 
-    const/4 v2, 0x1
+    const/4 v0, 0x1
 
-    const-wide/high16 v6, 0x4059000000000000L    # 100.0
+    const-wide/high16 v4, 0x4059000000000000L    # 100.0
 
-    mul-double v0, v0, v6
+    mul-double v2, v2, v4
 
-    aput-wide v0, p6, v2
+    aput-wide v2, p6, v0
 
     const/4 v0, 0x2
 
-    const-wide v2, 0x405b3883126e978dL    # 108.883
+    const-wide v1, 0x405b3883126e978dL    # 108.883
 
-    mul-double v4, v4, v2
+    mul-double v6, v6, v1
 
-    aput-wide v4, p6, v0
+    aput-wide v6, p6, v0
 
     return-void
 .end method
@@ -738,13 +756,13 @@
 
     div-double/2addr v1, v3
 
-    const-wide v5, 0x4003333333333333L    # 2.4
+    const-wide v5, 0x4029d70a3d70a3d7L    # 12.92
 
-    const-wide v7, 0x3ff0e147ae147ae1L    # 1.055
+    const-wide v7, 0x4003333333333333L    # 2.4
 
-    const-wide v9, 0x3fac28f5c28f5c29L    # 0.055
+    const-wide v9, 0x3ff0e147ae147ae1L    # 1.055
 
-    const-wide v11, 0x4029d70a3d70a3d7L    # 12.92
+    const-wide v11, 0x3fac28f5c28f5c29L    # 0.055
 
     const-wide v13, 0x3fa4b5dcc63f1412L    # 0.04045
 
@@ -752,29 +770,24 @@
 
     if-gez v15, :cond_0
 
-    div-double/2addr v1, v11
+    div-double/2addr v1, v5
+
+    goto :goto_0
+
+    :cond_0
+    add-double/2addr v1, v11
+
+    div-double/2addr v1, v9
+
+    invoke-static {v1, v2, v7, v8}, Ljava/lang/Math;->pow(DD)D
+
+    move-result-wide v1
 
     :goto_0
     move-wide v15, v1
 
     move/from16 v1, p1
 
-    goto :goto_1
-
-    :cond_0
-    const/4 v15, 0x0
-
-    add-double/2addr v1, v9
-
-    div-double/2addr v1, v7
-
-    invoke-static {v1, v2, v5, v6}, Ljava/lang/Math;->pow(DD)D
-
-    move-result-wide v1
-
-    goto :goto_0
-
-    :goto_1
     int-to-double v1, v1
 
     invoke-static {v1, v2}, Ljava/lang/Double;->isNaN(D)Z
@@ -785,29 +798,24 @@
 
     if-gez v17, :cond_1
 
-    div-double/2addr v1, v11
+    div-double/2addr v1, v5
 
-    :goto_2
+    goto :goto_1
+
+    :cond_1
+    add-double/2addr v1, v11
+
+    div-double/2addr v1, v9
+
+    invoke-static {v1, v2, v7, v8}, Ljava/lang/Math;->pow(DD)D
+
+    move-result-wide v1
+
+    :goto_1
     move-wide/from16 v17, v1
 
     move/from16 v1, p2
 
-    goto :goto_3
-
-    :cond_1
-    const/16 v17, 0x0
-
-    add-double/2addr v1, v9
-
-    div-double/2addr v1, v7
-
-    invoke-static {v1, v2, v5, v6}, Ljava/lang/Math;->pow(DD)D
-
-    move-result-wide v1
-
-    goto :goto_2
-
-    :goto_3
     int-to-double v1, v1
 
     invoke-static {v1, v2}, Ljava/lang/Double;->isNaN(D)Z
@@ -818,22 +826,20 @@
 
     if-gez v3, :cond_2
 
-    div-double/2addr v1, v11
+    div-double/2addr v1, v5
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_2
-    const/4 v3, 0x0
+    add-double/2addr v1, v11
 
-    add-double/2addr v1, v9
+    div-double/2addr v1, v9
 
-    div-double/2addr v1, v7
-
-    invoke-static {v1, v2, v5, v6}, Ljava/lang/Math;->pow(DD)D
+    invoke-static {v1, v2, v7, v8}, Ljava/lang/Math;->pow(DD)D
 
     move-result-wide v1
 
-    :goto_4
+    :goto_2
     const/4 v3, 0x0
 
     const-wide v4, 0x3fda64c2f837b4a2L    # 0.4124
@@ -937,156 +943,128 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    const-wide v6, 0x4009ecbfb15b573fL    # 3.2406
+    const-wide v0, 0x4009ecbfb15b573fL    # 3.2406
 
-    mul-double v6, v6, p0
+    mul-double v0, v0, p0
 
-    const-wide v8, -0x400767a0f9096bbaL    # -1.5372
+    const-wide v2, -0x400767a0f9096bbaL    # -1.5372
 
-    mul-double v8, v8, p2
-
-    add-double/2addr v6, v8
-
-    const-wide v8, -0x402016f0068db8bbL    # -0.4986
-
-    mul-double v8, v8, p4
-
-    add-double/2addr v6, v8
-
-    const-wide/high16 v8, 0x4059000000000000L    # 100.0
-
-    div-double/2addr v6, v8
-
-    const-wide v10, -0x4010fec56d5cfaadL    # -0.9689
-
-    mul-double v10, v10, p0
-
-    const-wide v12, 0x3ffe0346dc5d6388L    # 1.8758
-
-    mul-double v12, v12, p2
-
-    add-double/2addr v10, v12
-
-    const-wide v12, 0x3fa53f7ced916873L    # 0.0415
-
-    mul-double v12, v12, p4
-
-    add-double/2addr v10, v12
-
-    div-double/2addr v10, v8
-
-    const-wide v12, 0x3fac84b5dcc63f14L    # 0.0557
-
-    mul-double v0, p0, v12
-
-    const-wide v12, -0x4035e353f7ced917L    # -0.204
-
-    mul-double v2, p2, v12
+    mul-double v2, v2, p2
 
     add-double/2addr v0, v2
 
-    const-wide v2, 0x3ff0e978d4fdf3b6L    # 1.057
+    const-wide v2, -0x402016f0068db8bbL    # -0.4986
 
     mul-double v2, v2, p4
 
     add-double/2addr v0, v2
 
-    div-double/2addr v0, v8
+    const-wide/high16 v2, 0x4059000000000000L    # 100.0
 
-    const-wide v2, 0x4029d70a3d70a3d7L    # 12.92
+    div-double/2addr v0, v2
 
-    const-wide v4, 0x3fac28f5c28f5c29L    # 0.055
+    const-wide v4, -0x4010fec56d5cfaadL    # -0.9689
+
+    mul-double v4, v4, p0
+
+    const-wide v6, 0x3ffe0346dc5d6388L    # 1.8758
+
+    mul-double v6, v6, p2
+
+    add-double/2addr v4, v6
+
+    const-wide v6, 0x3fa53f7ced916873L    # 0.0415
+
+    mul-double v6, v6, p4
+
+    add-double/2addr v4, v6
+
+    div-double/2addr v4, v2
+
+    const-wide v6, 0x3fac84b5dcc63f14L    # 0.0557
+
+    mul-double v6, v6, p0
+
+    const-wide v8, -0x4035e353f7ced917L    # -0.204
+
+    mul-double v8, v8, p2
+
+    add-double/2addr v6, v8
+
+    const-wide v8, 0x3ff0e978d4fdf3b6L    # 1.057
+
+    mul-double v8, v8, p4
+
+    add-double/2addr v6, v8
+
+    div-double/2addr v6, v2
+
+    const-wide v2, 0x3fac28f5c28f5c29L    # 0.055
 
     const-wide v8, 0x3fdaaaaaaaaaaaabL    # 0.4166666666666667
 
-    const-wide v12, 0x3ff0e147ae147ae1L    # 1.055
+    const-wide v10, 0x3ff0e147ae147ae1L    # 1.055
+
+    const-wide v12, 0x4029d70a3d70a3d7L    # 12.92
 
     const-wide v14, 0x3f69a5c37387b719L    # 0.0031308
 
-    cmpl-double v16, v6, v14
-
-    if-lez v16, :cond_0
-
-    invoke-static {v6, v7, v8, v9}, Ljava/lang/Math;->pow(DD)D
-
-    move-result-wide v6
-
-    mul-double v6, v6, v12
-
-    sub-double/2addr v6, v4
-
-    goto :goto_0
-
-    :cond_0
-    mul-double v6, v6, v2
-
-    :goto_0
-    cmpl-double v16, v10, v14
-
-    if-lez v16, :cond_1
-
-    invoke-static {v10, v11, v8, v9}, Ljava/lang/Math;->pow(DD)D
-
-    move-result-wide v10
-
-    mul-double v10, v10, v12
-
-    sub-double/2addr v10, v4
-
-    goto :goto_1
-
-    :cond_1
-    mul-double v10, v10, v2
-
-    :goto_1
     cmpl-double v16, v0, v14
 
-    if-lez v16, :cond_2
+    if-lez v16, :cond_0
 
     invoke-static {v0, v1, v8, v9}, Ljava/lang/Math;->pow(DD)D
 
     move-result-wide v0
 
+    mul-double v0, v0, v10
+
+    sub-double/2addr v0, v2
+
+    goto :goto_0
+
+    :cond_0
     mul-double v0, v0, v12
 
-    sub-double/2addr v0, v4
+    :goto_0
+    cmpl-double v16, v4, v14
+
+    if-lez v16, :cond_1
+
+    invoke-static {v4, v5, v8, v9}, Ljava/lang/Math;->pow(DD)D
+
+    move-result-wide v4
+
+    mul-double v4, v4, v10
+
+    sub-double/2addr v4, v2
+
+    goto :goto_1
+
+    :cond_1
+    mul-double v4, v4, v12
+
+    :goto_1
+    cmpl-double v16, v6, v14
+
+    if-lez v16, :cond_2
+
+    invoke-static {v6, v7, v8, v9}, Ljava/lang/Math;->pow(DD)D
+
+    move-result-wide v6
+
+    mul-double v6, v6, v10
+
+    sub-double/2addr v6, v2
 
     goto :goto_2
 
     :cond_2
-    mul-double v0, v0, v2
+    mul-double v6, v6, v12
 
     :goto_2
     const-wide v2, 0x406fe00000000000L    # 255.0
 
-    mul-double v6, v6, v2
-
-    invoke-static {v6, v7}, Ljava/lang/Math;->round(D)J
-
-    move-result-wide v4
-
-    long-to-int v4, v4
-
-    const/16 v5, 0xff
-
-    const/4 v6, 0x0
-
-    invoke-static {v4, v6, v5}, Landroidx/core/graphics/ColorUtils;->constrain(III)I
-
-    move-result v4
-
-    mul-double v10, v10, v2
-
-    invoke-static {v10, v11}, Ljava/lang/Math;->round(D)J
-
-    move-result-wide v7
-
-    long-to-int v7, v7
-
-    invoke-static {v7, v6, v5}, Landroidx/core/graphics/ColorUtils;->constrain(III)I
-
-    move-result v7
-
     mul-double v0, v0, v2
 
     invoke-static {v0, v1}, Ljava/lang/Math;->round(D)J
@@ -1095,11 +1073,39 @@
 
     long-to-int v0, v0
 
-    invoke-static {v0, v6, v5}, Landroidx/core/graphics/ColorUtils;->constrain(III)I
+    const/16 v1, 0xff
+
+    const/4 v8, 0x0
+
+    invoke-static {v0, v8, v1}, Landroidx/core/graphics/ColorUtils;->constrain(III)I
 
     move-result v0
 
-    invoke-static {v4, v7, v0}, Landroid/graphics/Color;->rgb(III)I
+    mul-double v4, v4, v2
+
+    invoke-static {v4, v5}, Ljava/lang/Math;->round(D)J
+
+    move-result-wide v4
+
+    long-to-int v4, v4
+
+    invoke-static {v4, v8, v1}, Landroidx/core/graphics/ColorUtils;->constrain(III)I
+
+    move-result v4
+
+    mul-double v6, v6, v2
+
+    invoke-static {v6, v7}, Ljava/lang/Math;->round(D)J
+
+    move-result-wide v2
+
+    long-to-int v2, v2
+
+    invoke-static {v2, v8, v1}, Landroidx/core/graphics/ColorUtils;->constrain(III)I
+
+    move-result v1
+
+    invoke-static {v0, v4, v1}, Landroid/graphics/Color;->rgb(III)I
 
     move-result v0
 
@@ -1703,6 +1709,8 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method static circularInterpolate(FFF)F
@@ -2088,6 +2096,8 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static compositeComponent(IIIII)I
diff --git a/com.discord/smali/androidx/core/graphics/PaintCompat.smali b/com.discord/smali/androidx/core/graphics/PaintCompat.smali
index 47bf44c5a9..ddcde63656 100644
--- a/com.discord/smali/androidx/core/graphics/PaintCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/PaintCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/graphics/PaintCompat;
 .super Ljava/lang/Object;
+.source "PaintCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/graphics/PathParser$ExtractFloatResult.smali b/com.discord/smali/androidx/core/graphics/PathParser$ExtractFloatResult.smali
index eda2864db9..35a6596fd4 100644
--- a/com.discord/smali/androidx/core/graphics/PathParser$ExtractFloatResult.smali
+++ b/com.discord/smali/androidx/core/graphics/PathParser$ExtractFloatResult.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/PathParser$ExtractFloatResult;
 .super Ljava/lang/Object;
+.source "PathParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/PathParser$PathDataNode.smali b/com.discord/smali/androidx/core/graphics/PathParser$PathDataNode.smali
index c6543d965c..cdbc38f5c2 100644
--- a/com.discord/smali/androidx/core/graphics/PathParser$PathDataNode.smali
+++ b/com.discord/smali/androidx/core/graphics/PathParser$PathDataNode.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/PathParser$PathDataNode;
 .super Ljava/lang/Object;
+.source "PathParser.java"
 
 
 # annotations
@@ -53,15 +54,13 @@
 
     iput-char v0, p0, Landroidx/core/graphics/PathParser$PathDataNode;->mType:C
 
-    iget-object v0, p1, Landroidx/core/graphics/PathParser$PathDataNode;->mParams:[F
-
     iget-object p1, p1, Landroidx/core/graphics/PathParser$PathDataNode;->mParams:[F
 
-    array-length p1, p1
+    array-length v0, p1
 
     const/4 v1, 0x0
 
-    invoke-static {v0, v1, p1}, Landroidx/core/graphics/PathParser;->copyOfRange([FII)[F
+    invoke-static {p1, v1, v0}, Landroidx/core/graphics/PathParser;->copyOfRange([FII)[F
 
     move-result-object p1
 
@@ -71,45 +70,43 @@
 .end method
 
 .method private static addCommand(Landroid/graphics/Path;[FCC[F)V
-    .locals 27
+    .locals 23
 
     move-object/from16 v10, p0
 
-    move-object/from16 v13, p4
+    move-object/from16 v11, p4
 
-    const/4 v14, 0x0
+    const/4 v12, 0x0
 
-    aget v0, p1, v14
+    aget v0, p1, v12
 
-    const/4 v15, 0x1
+    const/4 v13, 0x1
 
-    aget v1, p1, v15
+    aget v1, p1, v13
 
-    const/16 v16, 0x2
+    const/4 v14, 0x2
 
-    aget v2, p1, v16
+    aget v2, p1, v14
 
-    const/16 v17, 0x3
+    const/4 v15, 0x3
 
-    aget v3, p1, v17
+    aget v3, p1, v15
 
-    const/16 v18, 0x4
+    const/16 v16, 0x4
 
-    aget v4, p1, v18
+    aget v4, p1, v16
 
-    const/16 v19, 0x5
+    const/16 v17, 0x5
 
-    aget v5, p1, v19
+    aget v5, p1, v17
 
     sparse-switch p3, :sswitch_data_0
 
-    :goto_0
+    const/16 v18, 0x2
+
+    goto :goto_0
+
     :sswitch_0
-    const/16 v20, 0x2
-
-    goto :goto_1
-
-    :sswitch_1
     invoke-virtual/range {p0 .. p0}, Landroid/graphics/Path;->close()V
 
     invoke-virtual {v10, v4, v5}, Landroid/graphics/Path;->moveTo(FF)V
@@ -122,50 +119,59 @@
 
     move v3, v1
 
+    const/16 v18, 0x2
+
+    goto :goto_0
+
+    :sswitch_1
+    const/16 v18, 0x4
+
     goto :goto_0
 
     :sswitch_2
-    const/16 v20, 0x4
+    const/16 v18, 0x2
 
-    goto :goto_1
+    goto :goto_0
 
     :sswitch_3
-    const/16 v20, 0x1
+    const/16 v18, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :sswitch_4
     const/4 v6, 0x6
 
-    const/16 v20, 0x6
+    const/16 v18, 0x6
 
-    goto :goto_1
+    goto :goto_0
 
     :sswitch_5
     const/4 v6, 0x7
 
-    const/16 v20, 0x7
+    const/16 v18, 0x7
 
-    :goto_1
+    :goto_0
     move v8, v0
 
     move v7, v1
 
-    move/from16 v21, v4
+    move/from16 v19, v4
 
-    move/from16 v22, v5
+    move/from16 v20, v5
 
     const/4 v9, 0x0
 
     move/from16 v0, p2
 
-    :goto_2
-    array-length v1, v13
+    :goto_1
+    array-length v1, v11
 
     if-ge v9, v1, :cond_e
 
     const/16 v1, 0x51
 
+    const/16 v4, 0x43
+
     const/16 v5, 0x74
 
     const/16 v6, 0x73
@@ -174,31 +180,36 @@
 
     const/16 v14, 0x63
 
-    const/high16 v23, 0x40000000    # 2.0f
+    const/high16 v21, 0x40000000    # 2.0f
 
-    const/4 v4, 0x0
+    const/4 v13, 0x0
 
     sparse-switch p3, :sswitch_data_1
 
     move v12, v7
 
-    move v11, v8
+    move v7, v8
 
-    :goto_3
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    goto/16 :goto_12
+    move v7, v12
+
+    goto/16 :goto_c
 
     :sswitch_6
     add-int/lit8 v0, v9, 0x0
 
-    aget v1, v13, v0
+    aget v1, v11, v0
 
-    invoke-virtual {v10, v4, v1}, Landroid/graphics/Path;->rLineTo(FF)V
+    invoke-virtual {v10, v13, v1}, Landroid/graphics/Path;->rLineTo(FF)V
 
-    aget v0, v13, v0
+    aget v0, v11, v0
 
-    goto/16 :goto_8
+    add-float/2addr v7, v0
+
+    move/from16 v22, v9
+
+    goto/16 :goto_c
 
     :sswitch_7
     if-eq v0, v15, :cond_1
@@ -211,72 +222,72 @@
 
     if-ne v0, v1, :cond_0
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_1
-    :goto_4
-    sub-float v4, v8, v2
+    :goto_2
+    sub-float v13, v8, v2
 
     sub-float v0, v7, v3
 
-    :goto_5
+    :goto_3
     add-int/lit8 v1, v9, 0x0
 
-    aget v2, v13, v1
+    aget v2, v11, v1
 
     add-int/lit8 v3, v9, 0x1
 
-    aget v5, v13, v3
+    aget v4, v11, v3
 
-    invoke-virtual {v10, v4, v0, v2, v5}, Landroid/graphics/Path;->rQuadTo(FFFF)V
+    invoke-virtual {v10, v13, v0, v2, v4}, Landroid/graphics/Path;->rQuadTo(FFFF)V
 
-    add-float/2addr v4, v8
+    add-float/2addr v13, v8
 
     add-float/2addr v0, v7
 
-    aget v1, v13, v1
+    aget v1, v11, v1
 
     add-float/2addr v8, v1
 
-    aget v1, v13, v3
+    aget v1, v11, v3
 
     add-float/2addr v7, v1
 
     move v3, v0
 
-    move v2, v4
+    move/from16 v22, v9
 
-    goto :goto_3
+    move v2, v13
+
+    goto/16 :goto_c
 
     :sswitch_8
     if-eq v0, v14, :cond_3
 
     if-eq v0, v6, :cond_3
 
-    const/16 v1, 0x43
-
-    if-eq v0, v1, :cond_3
+    if-eq v0, v4, :cond_3
 
     const/16 v1, 0x53
 
     if-ne v0, v1, :cond_2
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_2
     const/4 v1, 0x0
 
     const/4 v2, 0x0
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_3
-    :goto_6
+    :goto_4
     sub-float v0, v8, v2
 
     sub-float v1, v7, v3
@@ -285,315 +296,347 @@
 
     move v1, v0
 
-    :goto_7
-    add-int/lit8 v14, v9, 0x0
+    :goto_5
+    add-int/lit8 v13, v9, 0x0
 
-    aget v3, v13, v14
+    aget v3, v11, v13
 
-    add-int/lit8 v15, v9, 0x1
+    add-int/lit8 v14, v9, 0x1
 
-    aget v4, v13, v15
+    aget v4, v11, v14
 
-    add-int/lit8 v23, v9, 0x2
+    add-int/lit8 v15, v9, 0x2
 
-    aget v5, v13, v23
+    aget v5, v11, v15
 
-    add-int/lit8 v24, v9, 0x3
+    add-int/lit8 v21, v9, 0x3
 
-    aget v6, v13, v24
+    aget v6, v11, v21
 
     move-object/from16 v0, p0
 
     invoke-virtual/range {v0 .. v6}, Landroid/graphics/Path;->rCubicTo(FFFFFF)V
 
-    aget v0, v13, v14
+    aget v0, v11, v13
 
     add-float/2addr v0, v8
 
-    aget v1, v13, v15
+    aget v1, v11, v14
 
     add-float/2addr v1, v7
 
-    aget v2, v13, v23
+    aget v2, v11, v15
 
     add-float/2addr v8, v2
 
-    aget v2, v13, v24
+    aget v2, v11, v21
 
-    goto/16 :goto_9
-
-    :sswitch_9
-    add-int/lit8 v0, v9, 0x0
-
-    aget v1, v13, v0
-
-    add-int/lit8 v2, v9, 0x1
-
-    aget v3, v13, v2
-
-    add-int/lit8 v4, v9, 0x2
-
-    aget v5, v13, v4
-
-    add-int/lit8 v6, v9, 0x3
-
-    aget v14, v13, v6
-
-    invoke-virtual {v10, v1, v3, v5, v14}, Landroid/graphics/Path;->rQuadTo(FFFF)V
-
-    aget v0, v13, v0
-
-    add-float/2addr v0, v8
-
-    aget v1, v13, v2
-
-    add-float/2addr v1, v7
-
-    aget v2, v13, v4
-
-    add-float/2addr v8, v2
-
-    aget v2, v13, v6
-
-    goto :goto_9
-
-    :sswitch_a
-    add-int/lit8 v0, v9, 0x0
-
-    aget v1, v13, v0
-
-    add-float/2addr v8, v1
-
-    add-int/lit8 v1, v9, 0x1
-
-    aget v4, v13, v1
-
-    add-float/2addr v7, v4
-
-    if-lez v9, :cond_4
-
-    aget v0, v13, v0
-
-    aget v1, v13, v1
-
-    invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->rLineTo(FF)V
-
-    goto/16 :goto_3
-
-    :cond_4
-    aget v0, v13, v0
-
-    aget v1, v13, v1
-
-    invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->rMoveTo(FF)V
-
-    move/from16 v22, v7
-
-    move/from16 v21, v8
-
-    goto/16 :goto_3
-
-    :sswitch_b
-    add-int/lit8 v0, v9, 0x0
-
-    aget v1, v13, v0
-
-    add-int/lit8 v4, v9, 0x1
-
-    aget v5, v13, v4
-
-    invoke-virtual {v10, v1, v5}, Landroid/graphics/Path;->rLineTo(FF)V
-
-    aget v0, v13, v0
-
-    add-float/2addr v8, v0
-
-    aget v0, v13, v4
-
-    :goto_8
-    add-float/2addr v7, v0
-
-    goto/16 :goto_3
-
-    :sswitch_c
-    add-int/lit8 v0, v9, 0x0
-
-    aget v1, v13, v0
-
-    invoke-virtual {v10, v1, v4}, Landroid/graphics/Path;->rLineTo(FF)V
-
-    aget v0, v13, v0
-
-    add-float/2addr v8, v0
-
-    goto/16 :goto_3
-
-    :sswitch_d
-    add-int/lit8 v0, v9, 0x0
-
-    aget v1, v13, v0
-
-    add-int/lit8 v0, v9, 0x1
-
-    aget v2, v13, v0
-
-    add-int/lit8 v14, v9, 0x2
-
-    aget v3, v13, v14
-
-    add-int/lit8 v15, v9, 0x3
-
-    aget v4, v13, v15
-
-    add-int/lit8 v23, v9, 0x4
-
-    aget v5, v13, v23
-
-    add-int/lit8 v24, v9, 0x5
-
-    aget v6, v13, v24
-
-    move-object/from16 v0, p0
-
-    invoke-virtual/range {v0 .. v6}, Landroid/graphics/Path;->rCubicTo(FFFFFF)V
-
-    aget v0, v13, v14
-
-    add-float/2addr v0, v8
-
-    aget v1, v13, v15
-
-    add-float/2addr v1, v7
-
-    aget v2, v13, v23
-
-    add-float/2addr v8, v2
-
-    aget v2, v13, v24
-
-    :goto_9
     add-float/2addr v7, v2
 
     move v2, v0
 
     move v3, v1
 
-    goto/16 :goto_3
+    move/from16 v22, v9
+
+    goto/16 :goto_c
+
+    :sswitch_9
+    add-int/lit8 v0, v9, 0x0
+
+    aget v1, v11, v0
+
+    add-int/lit8 v2, v9, 0x1
+
+    aget v3, v11, v2
+
+    add-int/lit8 v4, v9, 0x2
+
+    aget v5, v11, v4
+
+    add-int/lit8 v6, v9, 0x3
+
+    aget v13, v11, v6
+
+    invoke-virtual {v10, v1, v3, v5, v13}, Landroid/graphics/Path;->rQuadTo(FFFF)V
+
+    aget v0, v11, v0
+
+    add-float/2addr v0, v8
+
+    aget v1, v11, v2
+
+    add-float/2addr v1, v7
+
+    aget v2, v11, v4
+
+    add-float/2addr v8, v2
+
+    aget v2, v11, v6
+
+    add-float/2addr v7, v2
+
+    move v2, v0
+
+    move v3, v1
+
+    move/from16 v22, v9
+
+    goto/16 :goto_c
+
+    :sswitch_a
+    add-int/lit8 v0, v9, 0x0
+
+    aget v1, v11, v0
+
+    add-float/2addr v8, v1
+
+    add-int/lit8 v1, v9, 0x1
+
+    aget v4, v11, v1
+
+    add-float/2addr v7, v4
+
+    if-lez v9, :cond_4
+
+    aget v0, v11, v0
+
+    aget v1, v11, v1
+
+    invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->rLineTo(FF)V
+
+    move/from16 v22, v9
+
+    goto/16 :goto_c
+
+    :cond_4
+    aget v0, v11, v0
+
+    aget v1, v11, v1
+
+    invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->rMoveTo(FF)V
+
+    move/from16 v20, v7
+
+    move/from16 v19, v8
+
+    move/from16 v22, v9
+
+    goto/16 :goto_c
+
+    :sswitch_b
+    add-int/lit8 v0, v9, 0x0
+
+    aget v1, v11, v0
+
+    add-int/lit8 v4, v9, 0x1
+
+    aget v5, v11, v4
+
+    invoke-virtual {v10, v1, v5}, Landroid/graphics/Path;->rLineTo(FF)V
+
+    aget v0, v11, v0
+
+    add-float/2addr v8, v0
+
+    aget v0, v11, v4
+
+    add-float/2addr v7, v0
+
+    move/from16 v22, v9
+
+    goto/16 :goto_c
+
+    :sswitch_c
+    add-int/lit8 v0, v9, 0x0
+
+    aget v1, v11, v0
+
+    invoke-virtual {v10, v1, v13}, Landroid/graphics/Path;->rLineTo(FF)V
+
+    aget v0, v11, v0
+
+    add-float/2addr v8, v0
+
+    move/from16 v22, v9
+
+    goto/16 :goto_c
+
+    :sswitch_d
+    add-int/lit8 v0, v9, 0x0
+
+    aget v1, v11, v0
+
+    add-int/lit8 v0, v9, 0x1
+
+    aget v2, v11, v0
+
+    add-int/lit8 v13, v9, 0x2
+
+    aget v3, v11, v13
+
+    add-int/lit8 v14, v9, 0x3
+
+    aget v4, v11, v14
+
+    add-int/lit8 v15, v9, 0x4
+
+    aget v5, v11, v15
+
+    add-int/lit8 v21, v9, 0x5
+
+    aget v6, v11, v21
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {v0 .. v6}, Landroid/graphics/Path;->rCubicTo(FFFFFF)V
+
+    aget v0, v11, v13
+
+    add-float/2addr v0, v8
+
+    aget v1, v11, v14
+
+    add-float/2addr v1, v7
+
+    aget v2, v11, v15
+
+    add-float/2addr v8, v2
+
+    aget v2, v11, v21
+
+    add-float/2addr v7, v2
+
+    move v2, v0
+
+    move v3, v1
+
+    move/from16 v22, v9
+
+    goto/16 :goto_c
 
     :sswitch_e
     add-int/lit8 v14, v9, 0x5
 
-    aget v0, v13, v14
+    aget v0, v11, v14
 
     add-float v3, v0, v8
 
     add-int/lit8 v15, v9, 0x6
 
-    aget v0, v13, v15
+    aget v0, v11, v15
 
-    add-float v5, v0, v7
+    add-float v4, v0, v7
 
     add-int/lit8 v0, v9, 0x0
 
-    aget v6, v13, v0
+    aget v5, v11, v0
 
     add-int/lit8 v0, v9, 0x1
 
-    aget v23, v13, v0
+    aget v6, v11, v0
 
     add-int/lit8 v0, v9, 0x2
 
-    aget v24, v13, v0
+    aget v21, v11, v0
 
     add-int/lit8 v0, v9, 0x3
 
-    aget v0, v13, v0
+    aget v0, v11, v0
 
-    cmpl-float v0, v0, v4
+    cmpl-float v0, v0, v13
 
     if-eqz v0, :cond_5
 
-    const/16 v25, 0x1
+    const/16 v22, 0x1
 
-    goto :goto_a
+    goto :goto_6
 
     :cond_5
-    const/16 v25, 0x0
+    const/16 v22, 0x0
 
-    :goto_a
+    :goto_6
     add-int/lit8 v0, v9, 0x4
 
-    aget v0, v13, v0
+    aget v0, v11, v0
 
-    cmpl-float v0, v0, v4
+    cmpl-float v0, v0, v13
 
     if-eqz v0, :cond_6
 
-    const/16 v26, 0x1
+    const/4 v13, 0x1
 
-    goto :goto_b
+    goto :goto_7
 
     :cond_6
-    const/16 v26, 0x0
+    const/4 v13, 0x0
 
-    :goto_b
+    :goto_7
     move-object/from16 v0, p0
 
     move v1, v8
 
     move v2, v7
 
-    move v4, v5
-
-    move v5, v6
-
-    move/from16 v6, v23
-
     move v12, v7
 
-    move/from16 v7, v24
+    move/from16 v7, v21
 
-    move v11, v8
+    move v10, v8
 
-    move/from16 v8, v25
+    move/from16 v8, v22
 
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    move/from16 v9, v26
+    move v9, v13
 
     invoke-static/range {v0 .. v9}, Landroidx/core/graphics/PathParser$PathDataNode;->drawArc(Landroid/graphics/Path;FFFFFFFZZ)V
 
-    aget v0, v13, v14
+    aget v0, v11, v14
 
-    add-float v8, v11, v0
+    add-float v8, v10, v0
 
-    aget v0, v13, v15
+    aget v0, v11, v15
 
     add-float v7, v12, v0
 
-    goto/16 :goto_11
+    move v3, v7
+
+    move v2, v8
+
+    move-object/from16 v10, p0
+
+    goto/16 :goto_c
 
     :sswitch_f
-    move v11, v8
+    move v10, v8
 
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    add-int/lit8 v9, v25, 0x0
+    add-int/lit8 v9, v22, 0x0
 
-    aget v0, v13, v9
+    aget v0, v11, v9
 
-    invoke-virtual {v10, v11, v0}, Landroid/graphics/Path;->lineTo(FF)V
+    move v7, v10
 
-    aget v7, v13, v9
+    move-object/from16 v10, p0
 
-    goto/16 :goto_12
+    invoke-virtual {v10, v7, v0}, Landroid/graphics/Path;->lineTo(FF)V
+
+    aget v0, v11, v9
+
+    move v8, v7
+
+    move v7, v0
+
+    goto/16 :goto_c
 
     :sswitch_10
     move v12, v7
 
-    move v11, v8
+    move v7, v8
 
-    move/from16 v25, v9
+    move/from16 v22, v9
 
     if-eq v0, v15, :cond_7
 
@@ -606,74 +649,74 @@
     if-ne v0, v1, :cond_8
 
     :cond_7
-    mul-float v8, v11, v23
+    mul-float v8, v7, v21
 
     sub-float/2addr v8, v2
 
-    mul-float v7, v12, v23
+    mul-float v7, v12, v21
 
     sub-float/2addr v7, v3
 
     move v12, v7
 
-    move v11, v8
+    move v7, v8
 
     :cond_8
-    add-int/lit8 v9, v25, 0x0
+    add-int/lit8 v9, v22, 0x0
 
-    aget v0, v13, v9
+    aget v0, v11, v9
 
-    add-int/lit8 v1, v25, 0x1
+    add-int/lit8 v1, v22, 0x1
 
-    aget v2, v13, v1
+    aget v2, v11, v1
 
-    invoke-virtual {v10, v11, v12, v0, v2}, Landroid/graphics/Path;->quadTo(FFFF)V
+    invoke-virtual {v10, v7, v12, v0, v2}, Landroid/graphics/Path;->quadTo(FFFF)V
 
-    aget v8, v13, v9
+    aget v8, v11, v9
 
-    aget v7, v13, v1
+    aget v0, v11, v1
 
-    move v2, v11
+    move v2, v7
 
     move v3, v12
 
-    goto/16 :goto_12
+    move v7, v0
+
+    goto/16 :goto_c
 
     :sswitch_11
     move v12, v7
 
-    move v11, v8
+    move v7, v8
 
-    move/from16 v25, v9
+    move/from16 v22, v9
 
     if-eq v0, v14, :cond_a
 
     if-eq v0, v6, :cond_a
 
-    const/16 v1, 0x43
-
-    if-eq v0, v1, :cond_a
+    if-eq v0, v4, :cond_a
 
     const/16 v1, 0x53
 
     if-ne v0, v1, :cond_9
 
-    goto :goto_c
+    goto :goto_8
 
     :cond_9
-    move v1, v11
+    move v1, v7
 
     move v2, v12
 
-    goto :goto_d
+    goto :goto_9
 
     :cond_a
-    :goto_c
-    mul-float v8, v11, v23
+    :goto_8
+    mul-float v8, v7, v21
 
     sub-float/2addr v8, v2
 
-    mul-float v7, v12, v23
+    mul-float v7, v12, v21
 
     sub-float/2addr v7, v3
 
@@ -681,179 +724,182 @@
 
     move v1, v8
 
-    :goto_d
-    add-int/lit8 v9, v25, 0x0
+    :goto_9
+    add-int/lit8 v9, v22, 0x0
 
-    aget v3, v13, v9
+    aget v3, v11, v9
 
-    add-int/lit8 v7, v25, 0x1
+    add-int/lit8 v7, v22, 0x1
 
-    aget v4, v13, v7
+    aget v4, v11, v7
 
-    add-int/lit8 v8, v25, 0x2
+    add-int/lit8 v8, v22, 0x2
 
-    aget v5, v13, v8
+    aget v5, v11, v8
 
-    add-int/lit8 v11, v25, 0x3
+    add-int/lit8 v12, v22, 0x3
 
-    aget v6, v13, v11
+    aget v6, v11, v12
 
     move-object/from16 v0, p0
 
     invoke-virtual/range {v0 .. v6}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
 
-    aget v0, v13, v9
+    aget v0, v11, v9
 
-    aget v1, v13, v7
+    aget v1, v11, v7
 
-    aget v8, v13, v8
+    aget v8, v11, v8
 
-    aget v7, v13, v11
+    aget v7, v11, v12
 
-    goto :goto_e
-
-    :sswitch_12
-    move/from16 v25, v9
-
-    add-int/lit8 v9, v25, 0x0
-
-    aget v0, v13, v9
-
-    add-int/lit8 v1, v25, 0x1
-
-    aget v2, v13, v1
-
-    add-int/lit8 v3, v25, 0x2
-
-    aget v4, v13, v3
-
-    add-int/lit8 v5, v25, 0x3
-
-    aget v6, v13, v5
-
-    invoke-virtual {v10, v0, v2, v4, v6}, Landroid/graphics/Path;->quadTo(FFFF)V
-
-    aget v0, v13, v9
-
-    aget v1, v13, v1
-
-    aget v8, v13, v3
-
-    aget v7, v13, v5
-
-    :goto_e
     move v2, v0
 
     move v3, v1
 
-    goto/16 :goto_12
+    goto/16 :goto_c
+
+    :sswitch_12
+    move/from16 v22, v9
+
+    add-int/lit8 v9, v22, 0x0
+
+    aget v0, v11, v9
+
+    add-int/lit8 v1, v22, 0x1
+
+    aget v2, v11, v1
+
+    add-int/lit8 v3, v22, 0x2
+
+    aget v4, v11, v3
+
+    add-int/lit8 v5, v22, 0x3
+
+    aget v6, v11, v5
+
+    invoke-virtual {v10, v0, v2, v4, v6}, Landroid/graphics/Path;->quadTo(FFFF)V
+
+    aget v0, v11, v9
+
+    aget v1, v11, v1
+
+    aget v8, v11, v3
+
+    aget v7, v11, v5
+
+    move v2, v0
+
+    move v3, v1
+
+    goto/16 :goto_c
 
     :sswitch_13
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    add-int/lit8 v9, v25, 0x0
+    add-int/lit8 v9, v22, 0x0
 
-    aget v8, v13, v9
+    aget v8, v11, v9
 
-    add-int/lit8 v0, v25, 0x1
+    add-int/lit8 v0, v22, 0x1
 
-    aget v7, v13, v0
+    aget v7, v11, v0
 
-    if-lez v25, :cond_b
+    if-lez v22, :cond_b
 
-    aget v1, v13, v9
+    aget v1, v11, v9
 
-    aget v0, v13, v0
+    aget v0, v11, v0
 
     invoke-virtual {v10, v1, v0}, Landroid/graphics/Path;->lineTo(FF)V
 
-    goto/16 :goto_12
+    goto/16 :goto_c
 
     :cond_b
-    aget v1, v13, v9
+    aget v1, v11, v9
 
-    aget v0, v13, v0
+    aget v0, v11, v0
 
     invoke-virtual {v10, v1, v0}, Landroid/graphics/Path;->moveTo(FF)V
 
-    move/from16 v22, v7
+    move/from16 v20, v7
 
-    move/from16 v21, v8
+    move/from16 v19, v8
 
-    goto/16 :goto_12
+    goto/16 :goto_c
 
     :sswitch_14
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    add-int/lit8 v9, v25, 0x0
+    add-int/lit8 v9, v22, 0x0
 
-    aget v0, v13, v9
+    aget v0, v11, v9
 
-    add-int/lit8 v1, v25, 0x1
+    add-int/lit8 v1, v22, 0x1
 
-    aget v4, v13, v1
+    aget v4, v11, v1
 
     invoke-virtual {v10, v0, v4}, Landroid/graphics/Path;->lineTo(FF)V
 
-    aget v8, v13, v9
+    aget v8, v11, v9
 
-    aget v7, v13, v1
+    aget v7, v11, v1
 
-    goto/16 :goto_12
+    goto/16 :goto_c
 
     :sswitch_15
     move v12, v7
 
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    add-int/lit8 v9, v25, 0x0
+    add-int/lit8 v9, v22, 0x0
 
-    aget v0, v13, v9
+    aget v0, v11, v9
 
     invoke-virtual {v10, v0, v12}, Landroid/graphics/Path;->lineTo(FF)V
 
-    aget v8, v13, v9
+    aget v8, v11, v9
 
-    goto/16 :goto_12
+    goto/16 :goto_c
 
     :sswitch_16
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    add-int/lit8 v9, v25, 0x0
+    add-int/lit8 v9, v22, 0x0
 
-    aget v1, v13, v9
+    aget v1, v11, v9
 
-    add-int/lit8 v9, v25, 0x1
+    add-int/lit8 v9, v22, 0x1
 
-    aget v2, v13, v9
+    aget v2, v11, v9
 
-    add-int/lit8 v9, v25, 0x2
+    add-int/lit8 v9, v22, 0x2
 
-    aget v3, v13, v9
+    aget v3, v11, v9
 
-    add-int/lit8 v7, v25, 0x3
+    add-int/lit8 v7, v22, 0x3
 
-    aget v4, v13, v7
+    aget v4, v11, v7
 
-    add-int/lit8 v8, v25, 0x4
+    add-int/lit8 v8, v22, 0x4
 
-    aget v5, v13, v8
+    aget v5, v11, v8
 
-    add-int/lit8 v11, v25, 0x5
+    add-int/lit8 v12, v22, 0x5
 
-    aget v6, v13, v11
+    aget v6, v11, v12
 
     move-object/from16 v0, p0
 
     invoke-virtual/range {v0 .. v6}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
 
-    aget v8, v13, v8
+    aget v8, v11, v8
 
-    aget v0, v13, v11
+    aget v0, v11, v12
 
-    aget v1, v13, v9
+    aget v1, v11, v9
 
-    aget v2, v13, v7
+    aget v2, v11, v7
 
     move v7, v0
 
@@ -861,125 +907,128 @@
 
     move v2, v1
 
-    goto :goto_12
+    goto :goto_c
 
     :sswitch_17
     move v12, v7
 
-    move v11, v8
+    move v7, v8
 
-    move/from16 v25, v9
+    move/from16 v22, v9
 
-    add-int/lit8 v14, v25, 0x5
+    add-int/lit8 v14, v22, 0x5
 
-    aget v3, v13, v14
+    aget v3, v11, v14
 
-    add-int/lit8 v15, v25, 0x6
+    add-int/lit8 v15, v22, 0x6
 
-    aget v5, v13, v15
+    aget v4, v11, v15
 
-    add-int/lit8 v9, v25, 0x0
+    add-int/lit8 v9, v22, 0x0
 
-    aget v6, v13, v9
+    aget v5, v11, v9
 
-    add-int/lit8 v9, v25, 0x1
+    add-int/lit8 v9, v22, 0x1
 
-    aget v7, v13, v9
+    aget v6, v11, v9
 
-    add-int/lit8 v9, v25, 0x2
+    add-int/lit8 v9, v22, 0x2
 
-    aget v8, v13, v9
+    aget v8, v11, v9
 
-    add-int/lit8 v9, v25, 0x3
+    add-int/lit8 v9, v22, 0x3
 
-    aget v0, v13, v9
+    aget v0, v11, v9
 
-    cmpl-float v0, v0, v4
+    cmpl-float v0, v0, v13
 
     if-eqz v0, :cond_c
 
     const/4 v9, 0x1
 
-    goto :goto_f
+    goto :goto_a
 
     :cond_c
     const/4 v9, 0x0
 
-    :goto_f
-    add-int/lit8 v0, v25, 0x4
+    :goto_a
+    add-int/lit8 v0, v22, 0x4
 
-    aget v0, v13, v0
+    aget v0, v11, v0
 
-    cmpl-float v0, v0, v4
+    cmpl-float v0, v0, v13
 
     if-eqz v0, :cond_d
 
-    const/16 v23, 0x1
+    const/4 v13, 0x1
 
-    goto :goto_10
+    goto :goto_b
 
     :cond_d
-    const/16 v23, 0x0
+    const/4 v13, 0x0
 
-    :goto_10
+    :goto_b
     move-object/from16 v0, p0
 
-    move v1, v11
+    move v1, v7
 
     move v2, v12
 
-    move v4, v5
-
-    move v5, v6
-
-    move v6, v7
-
     move v7, v8
 
     move v8, v9
 
-    move/from16 v9, v23
+    move v9, v13
 
     invoke-static/range {v0 .. v9}, Landroidx/core/graphics/PathParser$PathDataNode;->drawArc(Landroid/graphics/Path;FFFFFFFZZ)V
 
-    aget v8, v13, v14
+    aget v8, v11, v14
 
-    aget v7, v13, v15
+    aget v7, v11, v15
 
-    :goto_11
     move v3, v7
 
     move v2, v8
 
-    :goto_12
-    add-int v9, v25, v20
+    :goto_c
+    add-int v9, v22, v18
 
     move/from16 v0, p3
 
-    const/4 v14, 0x0
+    const/4 v12, 0x0
 
-    const/4 v15, 0x1
+    const/4 v13, 0x1
 
-    goto/16 :goto_2
+    const/4 v14, 0x2
+
+    const/4 v15, 0x3
+
+    goto/16 :goto_1
 
     :cond_e
     move v12, v7
 
-    const/4 v1, 0x0
+    move v7, v8
 
-    aput v8, p1, v1
+    const/4 v0, 0x0
 
-    const/4 v1, 0x1
+    aput v7, p1, v0
 
-    aput v12, p1, v1
+    const/4 v0, 0x1
 
-    aput v2, p1, v16
+    aput v12, p1, v0
 
-    aput v3, p1, v17
+    const/4 v0, 0x2
 
-    aput v21, p1, v18
+    aput v2, p1, v0
 
-    aput v22, p1, v19
+    const/4 v0, 0x3
+
+    aput v3, p1, v0
+
+    aput v19, p1, v16
+
+    aput v20, p1, v17
 
     return-void
 
@@ -988,23 +1037,23 @@
         0x41 -> :sswitch_5
         0x43 -> :sswitch_4
         0x48 -> :sswitch_3
-        0x4c -> :sswitch_0
-        0x4d -> :sswitch_0
-        0x51 -> :sswitch_2
-        0x53 -> :sswitch_2
-        0x54 -> :sswitch_0
+        0x4c -> :sswitch_2
+        0x4d -> :sswitch_2
+        0x51 -> :sswitch_1
+        0x53 -> :sswitch_1
+        0x54 -> :sswitch_2
         0x56 -> :sswitch_3
-        0x5a -> :sswitch_1
+        0x5a -> :sswitch_0
         0x61 -> :sswitch_5
         0x63 -> :sswitch_4
         0x68 -> :sswitch_3
-        0x6c -> :sswitch_0
-        0x6d -> :sswitch_0
-        0x71 -> :sswitch_2
-        0x73 -> :sswitch_2
-        0x74 -> :sswitch_0
+        0x6c -> :sswitch_2
+        0x6d -> :sswitch_2
+        0x71 -> :sswitch_1
+        0x73 -> :sswitch_1
+        0x74 -> :sswitch_2
         0x76 -> :sswitch_3
-        0x7a -> :sswitch_1
+        0x7a -> :sswitch_0
     .end sparse-switch
 
     :sswitch_data_1
@@ -1031,253 +1080,255 @@
 .end method
 
 .method private static arcToBezier(Landroid/graphics/Path;DDDDDDDDD)V
-    .locals 55
+    .locals 48
 
     move-wide/from16 v0, p5
 
-    const-wide/high16 v6, 0x4010000000000000L    # 4.0
+    const-wide/high16 v2, 0x4010000000000000L    # 4.0
 
-    mul-double v8, p17, v6
+    mul-double v4, p17, v2
 
-    const-wide v10, 0x400921fb54442d18L    # Math.PI
+    const-wide v6, 0x400921fb54442d18L    # Math.PI
 
-    div-double/2addr v8, v10
+    div-double/2addr v4, v6
 
-    invoke-static {v8, v9}, Ljava/lang/Math;->abs(D)D
+    invoke-static {v4, v5}, Ljava/lang/Math;->abs(D)D
 
-    move-result-wide v8
+    move-result-wide v4
 
-    invoke-static {v8, v9}, Ljava/lang/Math;->ceil(D)D
+    invoke-static {v4, v5}, Ljava/lang/Math;->ceil(D)D
 
-    move-result-wide v8
+    move-result-wide v4
 
-    double-to-int v8, v8
+    double-to-int v4, v4
 
     invoke-static/range {p13 .. p14}, Ljava/lang/Math;->cos(D)D
 
-    move-result-wide v9
+    move-result-wide v5
 
     invoke-static/range {p13 .. p14}, Ljava/lang/Math;->sin(D)D
 
-    move-result-wide v11
+    move-result-wide v7
 
     invoke-static/range {p15 .. p16}, Ljava/lang/Math;->cos(D)D
 
-    move-result-wide v13
+    move-result-wide v9
 
     invoke-static/range {p15 .. p16}, Ljava/lang/Math;->sin(D)D
 
-    move-result-wide v15
+    move-result-wide v11
 
-    neg-double v6, v0
+    neg-double v13, v0
 
-    mul-double v18, v6, v9
+    mul-double v15, v13, v5
 
-    mul-double v20, v18, v15
+    mul-double v17, v15, v11
 
-    mul-double v22, p7, v11
+    mul-double v19, p7, v7
 
-    mul-double v24, v22, v13
+    mul-double v21, v19, v9
 
-    sub-double v20, v20, v24
+    sub-double v17, v17, v21
 
-    mul-double v6, v6, v11
+    mul-double v13, v13, v7
 
-    mul-double v15, v15, v6
+    mul-double v11, v11, v13
 
-    mul-double v2, p7, v9
+    mul-double v21, p7, v5
 
-    mul-double v13, v13, v2
+    mul-double v9, v9, v21
 
-    add-double/2addr v15, v13
+    add-double/2addr v11, v9
 
-    int-to-double v13, v8
+    int-to-double v9, v4
 
-    invoke-static {v13, v14}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static {v9, v10}, Ljava/lang/Double;->isNaN(D)Z
 
-    div-double v4, p17, v13
+    div-double v9, p17, v9
 
-    const/4 v13, 0x0
+    const/16 v23, 0x0
 
-    move-wide/from16 v26, p11
+    move-wide/from16 v23, p9
 
-    move-wide/from16 v28, v15
+    move-wide/from16 v27, p11
 
-    move-wide/from16 v24, v20
+    move-wide/from16 v29, v11
 
-    move-wide/from16 v20, p9
+    move-wide/from16 v25, v17
 
-    move-wide/from16 v14, p15
+    const/4 v11, 0x0
+
+    move-wide/from16 v17, p15
 
     :goto_0
-    if-ge v13, v8, :cond_0
+    if-ge v11, v4, :cond_0
 
-    add-double v30, v14, v4
+    add-double v31, v17, v9
 
-    invoke-static/range {v30 .. v31}, Ljava/lang/Math;->sin(D)D
+    invoke-static/range {v31 .. v32}, Ljava/lang/Math;->sin(D)D
 
-    move-result-wide v32
+    move-result-wide v33
 
-    invoke-static/range {v30 .. v31}, Ljava/lang/Math;->cos(D)D
+    invoke-static/range {v31 .. v32}, Ljava/lang/Math;->cos(D)D
 
-    move-result-wide v34
+    move-result-wide v35
 
-    mul-double v36, v0, v9
+    mul-double v37, v0, v5
 
-    mul-double v36, v36, v34
+    mul-double v37, v37, v35
 
-    add-double v36, p1, v36
+    add-double v37, p1, v37
 
-    mul-double v38, v22, v32
+    mul-double v39, v19, v33
 
-    move-wide/from16 v40, v4
+    sub-double v2, v37, v39
 
-    sub-double v4, v36, v38
+    mul-double v37, v0, v7
 
-    mul-double v36, v0, v11
+    mul-double v37, v37, v35
 
-    mul-double v36, v36, v34
+    add-double v37, p3, v37
 
-    add-double v36, p3, v36
+    mul-double v39, v21, v33
 
-    mul-double v42, v2, v32
+    add-double v0, v37, v39
 
-    add-double v0, v36, v42
+    mul-double v37, v15, v33
 
-    mul-double v36, v18, v32
+    mul-double v39, v19, v35
 
-    mul-double v42, v22, v34
+    sub-double v37, v37, v39
 
-    sub-double v36, v36, v42
+    mul-double v33, v33, v13
 
-    mul-double v32, v32, v6
+    mul-double v35, v35, v21
 
-    mul-double v34, v34, v2
+    add-double v33, v33, v35
 
-    add-double v32, v32, v34
+    sub-double v17, v31, v17
 
-    sub-double v14, v30, v14
+    const-wide/high16 v35, 0x4000000000000000L    # 2.0
 
-    const-wide/high16 v34, 0x4000000000000000L    # 2.0
+    div-double v35, v17, v35
 
-    div-double v34, v14, v34
+    invoke-static/range {v35 .. v36}, Ljava/lang/Math;->tan(D)D
 
-    invoke-static/range {v34 .. v35}, Ljava/lang/Math;->tan(D)D
+    move-result-wide v35
 
-    move-result-wide v34
+    invoke-static/range {v17 .. v18}, Ljava/lang/Math;->sin(D)D
 
-    invoke-static {v14, v15}, Ljava/lang/Math;->sin(D)D
+    move-result-wide v17
 
-    move-result-wide v14
+    const-wide/high16 v39, 0x4008000000000000L    # 3.0
 
-    const-wide/high16 v42, 0x4008000000000000L    # 3.0
+    mul-double v43, v35, v39
 
-    mul-double v44, v34, v42
+    mul-double v43, v43, v35
 
-    mul-double v44, v44, v34
+    const-wide/high16 v35, 0x4010000000000000L    # 4.0
 
-    const-wide/high16 v16, 0x4010000000000000L    # 4.0
+    add-double v43, v43, v35
 
-    add-double v44, v44, v16
+    invoke-static/range {v43 .. v44}, Ljava/lang/Math;->sqrt(D)D
 
-    invoke-static/range {v44 .. v45}, Ljava/lang/Math;->sqrt(D)D
+    move-result-wide v41
 
-    move-result-wide v34
+    const-wide/high16 v43, 0x3ff0000000000000L    # 1.0
 
-    const-wide/high16 v44, 0x3ff0000000000000L    # 1.0
+    sub-double v41, v41, v43
 
-    sub-double v34, v34, v44
+    mul-double v17, v17, v41
 
-    mul-double v14, v14, v34
+    div-double v17, v17, v39
 
-    div-double v14, v14, v42
+    mul-double v25, v25, v17
 
-    mul-double v24, v24, v14
+    move v12, v4
 
-    move-wide/from16 v46, v2
+    move-wide/from16 v39, v5
 
-    add-double v2, v20, v24
+    add-double v4, v23, v25
 
-    mul-double v28, v28, v14
+    mul-double v29, v29, v17
 
-    move-wide/from16 v48, v6
+    move-wide/from16 p13, v7
 
-    add-double v6, v26, v28
+    add-double v6, v27, v29
 
-    mul-double v20, v14, v36
+    mul-double v23, v17, v37
 
-    move/from16 v50, v8
+    move-wide/from16 p7, v9
 
-    move-wide/from16 v51, v9
+    sub-double v8, v2, v23
 
-    sub-double v8, v4, v20
+    mul-double v17, v17, v33
 
-    mul-double v14, v14, v32
+    move/from16 p9, v12
 
-    sub-double v14, v0, v14
+    move-wide/from16 v23, v13
+
+    sub-double v12, v0, v17
 
     const/4 v10, 0x0
 
-    move-wide/from16 v53, v11
+    move-object/from16 v14, p0
 
-    move-object/from16 v11, p0
+    invoke-virtual {v14, v10, v10}, Landroid/graphics/Path;->rLineTo(FF)V
 
-    invoke-virtual {v11, v10, v10}, Landroid/graphics/Path;->rLineTo(FF)V
+    double-to-float v4, v4
 
-    double-to-float v2, v2
-
-    double-to-float v3, v6
+    double-to-float v5, v6
 
     double-to-float v6, v8
 
-    double-to-float v7, v14
+    double-to-float v7, v12
 
-    double-to-float v8, v4
+    double-to-float v8, v2
 
     double-to-float v9, v0
 
-    move-object/from16 p7, p0
+    move-object/from16 v41, p0
 
-    move/from16 p8, v2
+    move/from16 v42, v4
 
-    move/from16 p9, v3
+    move/from16 v43, v5
 
-    move/from16 p10, v6
+    move/from16 v44, v6
 
-    move/from16 p11, v7
+    move/from16 v45, v7
 
-    move/from16 p12, v8
+    move/from16 v46, v8
 
-    move/from16 p13, v9
+    move/from16 v47, v9
 
-    invoke-virtual/range {p7 .. p13}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
+    invoke-virtual/range {v41 .. v47}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
 
-    add-int/lit8 v13, v13, 0x1
+    add-int/lit8 v11, v11, 0x1
 
-    move-wide/from16 v26, v0
+    move-wide/from16 v9, p7
 
-    move-wide/from16 v20, v4
+    move/from16 v4, p9
 
-    move-wide/from16 v14, v30
+    move-wide/from16 v7, p13
 
-    move-wide/from16 v28, v32
+    move-wide/from16 v27, v0
 
-    move-wide/from16 v24, v36
+    move-wide/from16 v13, v23
 
-    move-wide/from16 v4, v40
+    move-wide/from16 v17, v31
 
-    move-wide/from16 v2, v46
+    move-wide/from16 v29, v33
 
-    move-wide/from16 v6, v48
+    move-wide/from16 v25, v37
 
-    move/from16 v8, v50
-
-    move-wide/from16 v9, v51
-
-    move-wide/from16 v11, v53
+    move-wide/from16 v5, v39
 
     move-wide/from16 v0, p5
 
+    move-wide/from16 v23, v2
+
+    move-wide/from16 v2, v35
+
     goto/16 :goto_0
 
     :cond_0
@@ -1285,7 +1336,7 @@
 .end method
 
 .method private static drawArc(Landroid/graphics/Path;FFFFFFFZZ)V
-    .locals 45
+    .locals 39
 
     move/from16 v0, p1
 
@@ -1322,15 +1373,15 @@
 
     move/from16 v10, p2
 
-    move-wide/from16 v27, v13
+    move-wide v15, v13
 
     float-to-double v13, v10
 
     invoke-static {v13, v14}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v15, v13, v11
+    mul-double v17, v13, v11
 
-    add-double/2addr v8, v15
+    add-double v8, v8, v17
 
     float-to-double v2, v4
 
@@ -1338,11 +1389,11 @@
 
     div-double/2addr v8, v2
 
-    neg-float v15, v0
+    neg-float v10, v0
 
-    move-wide/from16 v29, v8
+    move-wide/from16 p5, v8
 
-    float-to-double v8, v15
+    float-to-double v8, v10
 
     invoke-static {v8, v9}, Ljava/lang/Double;->isNaN(D)Z
 
@@ -1350,11 +1401,11 @@
 
     invoke-static {v13, v14}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v15, v13, v6
+    mul-double v17, v13, v6
 
-    add-double/2addr v8, v15
+    add-double v8, v8, v17
 
-    move-wide/from16 v31, v13
+    move-wide/from16 v17, v13
 
     float-to-double v13, v5
 
@@ -1362,9 +1413,9 @@
 
     div-double/2addr v8, v13
 
-    move/from16 v33, v4
+    move v10, v4
 
-    move/from16 v34, v5
+    move/from16 v19, v5
 
     float-to-double v4, v1
 
@@ -1372,17 +1423,17 @@
 
     mul-double v4, v4, v6
 
-    move/from16 v15, p4
+    move/from16 v0, p4
 
-    move-wide/from16 v35, v8
+    move-wide/from16 v23, v8
 
-    float-to-double v8, v15
+    float-to-double v8, v0
 
     invoke-static {v8, v9}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v16, v8, v11
+    mul-double v25, v8, v11
 
-    add-double v4, v4, v16
+    add-double v4, v4, v25
 
     invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z
 
@@ -1406,29 +1457,29 @@
 
     div-double/2addr v0, v13
 
-    sub-double v8, v29, v4
+    sub-double v8, p5, v4
 
-    sub-double v16, v35, v0
+    sub-double v25, v23, v0
 
-    add-double v18, v29, v4
+    add-double v27, p5, v4
 
-    const-wide/high16 v23, 0x4000000000000000L    # 2.0
+    const-wide/high16 v29, 0x4000000000000000L    # 2.0
 
-    div-double v18, v18, v23
+    div-double v27, v27, v29
 
-    add-double v25, v35, v0
+    add-double v31, v23, v0
 
-    div-double v25, v25, v23
+    div-double v31, v31, v29
 
-    mul-double v23, v8, v8
+    mul-double v29, v8, v8
 
-    mul-double v37, v16, v16
+    mul-double v33, v25, v25
 
-    add-double v23, v23, v37
+    add-double v29, v29, v33
 
-    const-wide/16 v37, 0x0
+    const-wide/16 v33, 0x0
 
-    cmpl-double v20, v23, v37
+    cmpl-double v20, v29, v33
 
     if-nez v20, :cond_0
 
@@ -1441,15 +1492,15 @@
     return-void
 
     :cond_0
-    const-wide/high16 v39, 0x3ff0000000000000L    # 1.0
+    const-wide/high16 v35, 0x3ff0000000000000L    # 1.0
 
-    div-double v39, v39, v23
+    div-double v35, v35, v29
 
-    const-wide/high16 v41, 0x3fd0000000000000L    # 0.25
+    const-wide/high16 v37, 0x3fd0000000000000L    # 0.25
 
-    sub-double v39, v39, v41
+    sub-double v35, v35, v37
 
-    cmpg-double v20, v39, v37
+    cmpg-double v20, v35, v33
 
     if-gez v20, :cond_1
 
@@ -1457,7 +1508,7 @@
 
     const-string v1, "Points are too far apart "
 
-    invoke-static/range {v23 .. v24}, Ljava/lang/String;->valueOf(D)Ljava/lang/String;
+    invoke-static/range {v29 .. v30}, Ljava/lang/String;->valueOf(D)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1467,7 +1518,7 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-static/range {v23 .. v24}, Ljava/lang/Math;->sqrt(D)D
+    invoke-static/range {v29 .. v30}, Ljava/lang/Math;->sqrt(D)D
 
     move-result-wide v0
 
@@ -1477,9 +1528,9 @@
 
     double-to-float v0, v0
 
-    mul-float v4, v33, v0
+    mul-float v4, v10, v0
 
-    mul-float v5, v34, v0
+    mul-float v5, v19, v0
 
     move/from16 v0, p1
 
@@ -1492,15 +1543,15 @@
     goto/16 :goto_0
 
     :cond_1
-    invoke-static/range {v39 .. v40}, Ljava/lang/Math;->sqrt(D)D
+    invoke-static/range {v35 .. v36}, Ljava/lang/Math;->sqrt(D)D
 
-    move-result-wide v23
+    move-result-wide v19
 
-    mul-double v8, v8, v23
+    mul-double v8, v8, v19
 
-    mul-double v23, v23, v16
+    mul-double v19, v19, v25
 
-    move-wide v15, v2
+    move-wide/from16 v25, v2
 
     move/from16 v3, p9
 
@@ -1508,35 +1559,31 @@
 
     if-ne v2, v3, :cond_2
 
-    sub-double v18, v18, v23
+    sub-double v27, v27, v19
 
-    add-double v25, v25, v8
+    add-double v31, v31, v8
 
     goto :goto_1
 
     :cond_2
-    const/4 v2, 0x0
+    add-double v27, v27, v19
 
-    add-double v18, v18, v23
-
-    sub-double v25, v25, v8
+    sub-double v31, v31, v8
 
     :goto_1
-    const/4 v2, 0x0
+    sub-double v8, v23, v31
 
-    sub-double v8, v35, v25
+    move-wide/from16 v19, v11
 
-    move-wide/from16 v43, v11
-
-    sub-double v10, v29, v18
+    sub-double v10, p5, v27
 
     invoke-static {v8, v9, v10, v11}, Ljava/lang/Math;->atan2(DD)D
 
     move-result-wide v23
 
-    sub-double v0, v0, v25
+    sub-double v0, v0, v31
 
-    sub-double v4, v4, v18
+    sub-double v4, v4, v27
 
     invoke-static {v0, v1, v4, v5}, Ljava/lang/Math;->atan2(DD)D
 
@@ -1544,7 +1591,7 @@
 
     sub-double v0, v0, v23
 
-    cmpl-double v2, v0, v37
+    cmpl-double v2, v0, v33
 
     if-ltz v2, :cond_3
 
@@ -1560,7 +1607,7 @@
 
     const-wide v2, 0x401921fb54442d18L    # 6.283185307179586
 
-    cmpl-double v4, v0, v37
+    cmpl-double v4, v0, v33
 
     if-lez v4, :cond_4
 
@@ -1569,41 +1616,39 @@
     goto :goto_3
 
     :cond_4
-    const/4 v4, 0x0
-
     add-double/2addr v0, v2
 
     :cond_5
     :goto_3
-    invoke-static/range {v15 .. v16}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static/range {v25 .. v26}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v18, v18, v15
+    mul-double v27, v27, v25
 
     invoke-static {v13, v14}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v25, v25, v13
+    mul-double v31, v31, v13
 
-    mul-double v2, v18, v6
+    mul-double v2, v27, v6
 
-    mul-double v11, v25, v43
+    mul-double v11, v31, v19
 
     sub-double v9, v2, v11
 
-    mul-double v18, v18, v43
+    mul-double v27, v27, v19
 
-    mul-double v25, v25, v6
+    mul-double v31, v31, v6
 
-    add-double v11, v18, v25
+    add-double v11, v27, v31
 
     move-object/from16 v8, p0
 
     move-wide v6, v13
 
-    move-wide/from16 v2, v27
+    move-wide v2, v15
 
-    move-wide/from16 v4, v31
+    move-wide/from16 v4, v17
 
-    move-wide v13, v15
+    move-wide/from16 v13, v25
 
     move-wide v15, v6
 
@@ -1666,21 +1711,19 @@
     :goto_0
     iget-object v1, p1, Landroidx/core/graphics/PathParser$PathDataNode;->mParams:[F
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v1, p0, Landroidx/core/graphics/PathParser$PathDataNode;->mParams:[F
+    iget-object v2, p0, Landroidx/core/graphics/PathParser$PathDataNode;->mParams:[F
 
-    iget-object v2, p1, Landroidx/core/graphics/PathParser$PathDataNode;->mParams:[F
-
-    aget v2, v2, v0
+    aget v1, v1, v0
 
     const/high16 v3, 0x3f800000    # 1.0f
 
     sub-float/2addr v3, p3
 
-    mul-float v2, v2, v3
+    mul-float v1, v1, v3
 
     iget-object v3, p2, Landroidx/core/graphics/PathParser$PathDataNode;->mParams:[F
 
@@ -1688,9 +1731,9 @@
 
     mul-float v3, v3, p3
 
-    add-float/2addr v2, v3
+    add-float/2addr v1, v3
 
-    aput v2, v1, v0
+    aput v1, v2, v0
 
     add-int/lit8 v0, v0, 0x1
 
diff --git a/com.discord/smali/androidx/core/graphics/PathParser.smali b/com.discord/smali/androidx/core/graphics/PathParser.smali
index 1294ea9584..876c9f1ab2 100644
--- a/com.discord/smali/androidx/core/graphics/PathParser.smali
+++ b/com.discord/smali/androidx/core/graphics/PathParser.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/PathParser;
 .super Ljava/lang/Object;
+.source "PathParser.java"
 
 
 # annotations
@@ -392,7 +393,7 @@
 
     packed-switch v5, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     if-nez v3, :cond_0
@@ -401,40 +402,48 @@
 
     const/4 v3, 0x1
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_0
-    :goto_1
     iput-boolean v7, p2, Landroidx/core/graphics/PathParser$ExtractFloatResult;->mEndWithNegOrDot:Z
 
-    goto :goto_3
+    const/4 v2, 0x0
+
+    const/4 v4, 0x1
+
+    goto :goto_2
 
     :pswitch_1
     if-eq v1, p1, :cond_1
 
     if-nez v2, :cond_1
 
-    goto :goto_1
+    iput-boolean v7, p2, Landroidx/core/graphics/PathParser$ExtractFloatResult;->mEndWithNegOrDot:Z
 
-    :cond_1
-    :goto_2
     const/4 v2, 0x0
 
-    goto :goto_4
+    const/4 v4, 0x1
+
+    goto :goto_2
+
+    :cond_1
+    :goto_1
+    const/4 v2, 0x0
+
+    goto :goto_2
 
     :cond_2
     const/4 v2, 0x1
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_3
-    :goto_3
     :pswitch_2
     const/4 v2, 0x0
 
     const/4 v4, 0x1
 
-    :goto_4
+    :goto_2
     if-nez v4, :cond_4
 
     add-int/lit8 v1, v1, 0x1
@@ -539,11 +548,11 @@
     :cond_3
     invoke-static {v1, v0, v5}, Landroidx/core/graphics/PathParser;->copyOfRange([FII)[F
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
     move-exception v0
diff --git a/com.discord/smali/androidx/core/graphics/PathSegment.smali b/com.discord/smali/androidx/core/graphics/PathSegment.smali
index e189fc9552..0a625ac86d 100644
--- a/com.discord/smali/androidx/core/graphics/PathSegment.smali
+++ b/com.discord/smali/androidx/core/graphics/PathSegment.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/graphics/PathSegment;
 .super Ljava/lang/Object;
+.source "PathSegment.java"
 
 
 # instance fields
@@ -159,7 +160,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 5
 
     iget-object v0, p0, Landroidx/core/graphics/PathSegment;->mStart:Landroid/graphics/PointF;
 
@@ -175,11 +176,9 @@
 
     const/4 v3, 0x0
 
-    cmpl-float v1, v1, v3
+    cmpl-float v4, v1, v3
 
-    if-eqz v1, :cond_0
-
-    iget v1, p0, Landroidx/core/graphics/PathSegment;->mStartFraction:F
+    if-eqz v4, :cond_0
 
     invoke-static {v1}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -207,11 +206,9 @@
 
     iget v1, p0, Landroidx/core/graphics/PathSegment;->mEndFraction:F
 
-    cmpl-float v1, v1, v3
+    cmpl-float v3, v1, v3
 
-    if-eqz v1, :cond_1
-
-    iget v1, p0, Landroidx/core/graphics/PathSegment;->mEndFraction:F
+    if-eqz v3, :cond_1
 
     invoke-static {v1}, Ljava/lang/Float;->floatToIntBits(F)I
 
diff --git a/com.discord/smali/androidx/core/graphics/PathUtils.smali b/com.discord/smali/androidx/core/graphics/PathUtils.smali
index f38efe1dd5..4968513401 100644
--- a/com.discord/smali/androidx/core/graphics/PathUtils.smali
+++ b/com.discord/smali/androidx/core/graphics/PathUtils.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/graphics/PathUtils;
 .super Ljava/lang/Object;
+.source "PathUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali
index c7e9ba8057..b09d86b0c1 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/TypefaceCompat;
 .super Ljava/lang/Object;
+.source "TypefaceCompat.java"
 
 
 # annotations
@@ -41,10 +42,9 @@
 
     invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatApi28Impl;-><init>()V
 
-    :goto_0
     sput-object v0, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroidx/core/graphics/TypefaceCompatBaseImpl;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -57,6 +57,8 @@
 
     invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatApi26Impl;-><init>()V
 
+    sput-object v0, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroidx/core/graphics/TypefaceCompatBaseImpl;
+
     goto :goto_0
 
     :cond_1
@@ -76,6 +78,8 @@
 
     invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatApi24Impl;-><init>()V
 
+    sput-object v0, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroidx/core/graphics/TypefaceCompatBaseImpl;
+
     goto :goto_0
 
     :cond_2
@@ -89,6 +93,8 @@
 
     invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatApi21Impl;-><init>()V
 
+    sput-object v0, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroidx/core/graphics/TypefaceCompatBaseImpl;
+
     goto :goto_0
 
     :cond_3
@@ -96,9 +102,9 @@
 
     invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatBaseImpl;-><init>()V
 
-    goto :goto_0
+    sput-object v0, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroidx/core/graphics/TypefaceCompatBaseImpl;
 
-    :goto_1
+    :goto_0
     new-instance v0, Landroidx/collection/LruCache;
 
     const/16 v1, 0x10
@@ -169,38 +175,35 @@
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    instance-of v4, p1, Landroidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry;
+    instance-of v1, p1, Landroidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry;
 
-    if-eqz v4, :cond_3
+    if-eqz v1, :cond_3
 
     move-object v0, p1
 
     check-cast v0, Landroidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry;
 
-    const/4 v4, 0x0
+    const/4 v1, 0x1
 
-    const/4 v5, 0x1
+    const/4 v4, 0x0
 
     if-eqz p7, :cond_0
 
     invoke-virtual {v0}, Landroidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry;->getFetchStrategy()I
 
-    move-result v6
+    move-result v5
 
-    if-nez v6, :cond_1
+    if-nez v5, :cond_1
 
-    :goto_0
-    const/4 v4, 0x1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     if-nez p5, :cond_1
 
-    goto :goto_0
+    :goto_0
+    const/4 v4, 0x1
 
     :cond_1
-    :goto_1
     if-eqz p7, :cond_2
 
     invoke-virtual {v0}, Landroidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry;->getTimeout()I
@@ -209,14 +212,14 @@
 
     move v5, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v1, -0x1
 
     const/4 v5, -0x1
 
-    :goto_2
+    :goto_1
     invoke-virtual {v0}, Landroidx/core/content/res/FontResourcesParserCompat$ProviderResourceEntry;->getRequest()Landroidx/core/provider/FontRequest;
 
     move-result-object v1
@@ -233,7 +236,7 @@
 
     move-result-object v0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     sget-object v1, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroidx/core/graphics/TypefaceCompatBaseImpl;
@@ -252,7 +255,7 @@
 
     invoke-virtual {p5, v0, p6}, Landroidx/core/content/res/ResourcesCompat$FontCallback;->callbackSuccessAsync(Landroid/graphics/Typeface;Landroid/os/Handler;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/4 v1, -0x3
@@ -260,7 +263,7 @@
     invoke-virtual {p5, v1, p6}, Landroidx/core/content/res/ResourcesCompat$FontCallback;->callbackFailAsync(ILandroid/os/Handler;)V
 
     :cond_5
-    :goto_3
+    :goto_2
     if-eqz v0, :cond_6
 
     sget-object v1, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCache:Landroidx/collection/LruCache;
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali
index 6337538eef..6a5fba8d8a 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/TypefaceCompatApi21Impl;
 .super Landroidx/core/graphics/TypefaceCompatBaseImpl;
+.source "TypefaceCompatApi21Impl.java"
 
 
 # annotations
@@ -73,9 +74,11 @@
 
     return-object v1
 
-    :catch_0
     :cond_0
     return-object v0
+
+    :catch_0
+    return-object v0
 .end method
 
 
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali
index bac8ab0777..34e0ce7989 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/TypefaceCompatApi24Impl;
 .super Landroidx/core/graphics/TypefaceCompatBaseImpl;
+.source "TypefaceCompatApi24Impl.java"
 
 
 # annotations
@@ -109,11 +110,13 @@
 
     invoke-virtual {v6, v8, v7}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    move-result-object v2
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
+    move-object v2, v0
+
     move-object v0, v3
 
     goto :goto_0
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali
index 7f6ebce6e1..1ab8ec2d72 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/TypefaceCompatApi26Impl;
 .super Landroidx/core/graphics/TypefaceCompatApi21Impl;
+.source "TypefaceCompatApi26Impl.java"
 
 
 # annotations
@@ -85,12 +86,16 @@
 
     invoke-virtual {p0, v1}, Landroidx/core/graphics/TypefaceCompatApi26Impl;->obtainCreateFromFamiliesWithDefaultMethod(Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    move-result-object v7
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object v0, v1
+    move-object v7, v1
+
+    move-object v1, v0
+
+    move-object v0, v7
 
     goto :goto_0
 
@@ -121,7 +126,9 @@
 
     invoke-static {v2, v3, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    move-object v2, v0
+    move-object v1, v0
+
+    move-object v2, v1
 
     move-object v3, v2
 
@@ -131,8 +138,6 @@
 
     move-object v6, v5
 
-    move-object v7, v6
-
     :goto_0
     iput-object v0, p0, Landroidx/core/graphics/TypefaceCompatApi26Impl;->mFontFamily:Ljava/lang/Class;
 
@@ -146,7 +151,7 @@
 
     iput-object v6, p0, Landroidx/core/graphics/TypefaceCompatApi26Impl;->mAbortCreation:Ljava/lang/reflect/Method;
 
-    iput-object v7, p0, Landroidx/core/graphics/TypefaceCompatApi26Impl;->mCreateFromFamiliesWithDefault:Ljava/lang/reflect/Method;
+    iput-object v1, p0, Landroidx/core/graphics/TypefaceCompatApi26Impl;->mCreateFromFamiliesWithDefault:Ljava/lang/reflect/Method;
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali
index 41b9f4bbe2..a754325a68 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/TypefaceCompatApi28Impl;
 .super Landroidx/core/graphics/TypefaceCompatApi26Impl;
+.source "TypefaceCompatApi28Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$1.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$1.smali
index ceaaf5f70a..1de0250a0b 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$1.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/TypefaceCompatBaseImpl$1;
 .super Ljava/lang/Object;
+.source "TypefaceCompatBaseImpl.java"
 
 # interfaces
 .implements Landroidx/core/graphics/TypefaceCompatBaseImpl$StyleExtractor;
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$2.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$2.smali
index 1c9ec6eaa2..d844c3fbdd 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$2.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/TypefaceCompatBaseImpl$2;
 .super Ljava/lang/Object;
+.source "TypefaceCompatBaseImpl.java"
 
 # interfaces
 .implements Landroidx/core/graphics/TypefaceCompatBaseImpl$StyleExtractor;
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$StyleExtractor.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$StyleExtractor.smali
index 6583171070..55da76ef08 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$StyleExtractor.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl$StyleExtractor.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/graphics/TypefaceCompatBaseImpl$StyleExtractor;
 .super Ljava/lang/Object;
+.source "TypefaceCompatBaseImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl.smali
index 9e750b23c2..3bc91ee694 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatBaseImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/TypefaceCompatBaseImpl;
 .super Ljava/lang/Object;
+.source "TypefaceCompatBaseImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatUtil.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatUtil.smali
index 3aefed5a4f..1dd473b9d8 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatUtil.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatUtil.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/TypefaceCompatUtil;
 .super Ljava/lang/Object;
+.source "TypefaceCompatUtil.java"
 
 
 # annotations
@@ -35,6 +36,8 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -237,6 +240,8 @@
     invoke-static {v0}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static getTempFile(Landroid/content/Context;)Ljava/io/File;
diff --git a/com.discord/smali/androidx/core/graphics/drawable/DrawableCompat.smali b/com.discord/smali/androidx/core/graphics/drawable/DrawableCompat.smali
index 8dea6c4e18..6b5ea9b34d 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/DrawableCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/DrawableCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/graphics/drawable/DrawableCompat;
 .super Ljava/lang/Object;
+.source "DrawableCompat.java"
 
 
 # static fields
@@ -241,7 +242,7 @@
 
     const/4 v2, 0x0
 
-    if-lt v0, v1, :cond_2
+    if-lt v0, v1, :cond_3
 
     sget-boolean v0, Landroidx/core/graphics/drawable/DrawableCompat;->sGetLayoutDirectionMethodFetched:Z
 
@@ -286,8 +287,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/graphics/drawable/DrawableCompat;->sGetLayoutDirectionMethod:Ljava/lang/reflect/Method;
-
     new-array v1, v2, [Ljava/lang/Object;
 
     invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -319,6 +318,9 @@
 
     :cond_2
     return v2
+
+    :cond_3
+    return v2
 .end method
 
 .method public static inflate(Landroid/graphics/drawable/Drawable;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)V
@@ -488,7 +490,7 @@
 
     const/4 v2, 0x0
 
-    if-lt v0, v1, :cond_2
+    if-lt v0, v1, :cond_3
 
     sget-boolean v0, Landroidx/core/graphics/drawable/DrawableCompat;->sSetLayoutDirectionMethodFetched:Z
 
@@ -537,8 +539,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/graphics/drawable/DrawableCompat;->sSetLayoutDirectionMethod:Ljava/lang/reflect/Method;
-
     new-array v3, v1, [Ljava/lang/Object;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -568,6 +568,9 @@
 
     :cond_2
     return v2
+
+    :cond_3
+    return v2
 .end method
 
 .method public static setTint(Landroid/graphics/drawable/Drawable;I)V
@@ -698,6 +701,8 @@
 
     move-result-object p0
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/drawable/IconCompat$IconType.smali b/com.discord/smali/androidx/core/graphics/drawable/IconCompat$IconType.smali
index 82d78bc780..aef839d64e 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/IconCompat$IconType.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/IconCompat$IconType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/graphics/drawable/IconCompat$IconType;
 .super Ljava/lang/Object;
+.source "IconCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali b/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali
index 5faf260357..ade5f66eea 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/drawable/IconCompat;
 .super Landroidx/versionedparcelable/CustomVersionedParcelable;
+.source "IconCompat.java"
 
 
 # annotations
@@ -262,6 +263,8 @@
 
     move-result-object p0
 
+    iput-object p0, v1, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
+
     goto :goto_0
 
     :pswitch_1
@@ -271,6 +274,8 @@
 
     move-result-object p0
 
+    iput-object p0, v1, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
+
     goto :goto_0
 
     :cond_2
@@ -281,9 +286,9 @@
 
     move-result-object p0
 
-    :goto_0
     iput-object p0, v1, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
 
+    :goto_0
     return-object v1
 
     nop
@@ -878,8 +883,8 @@
 
     move-result p0
     :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
     return p0
@@ -894,6 +899,28 @@
     invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     return v0
+
+    :catch_1
+    move-exception p0
+
+    const-string v1, "IconCompat"
+
+    const-string v2, "Unable to get icon resource"
+
+    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return v0
+
+    :catch_2
+    move-exception p0
+
+    const-string v1, "IconCompat"
+
+    const-string v2, "Unable to get icon resource"
+
+    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return v0
 .end method
 
 .method private static getResPackage(Landroid/graphics/drawable/Icon;)Ljava/lang/String;
@@ -947,8 +974,8 @@
 
     check-cast p0, Ljava/lang/String;
     :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
     return-object p0
@@ -963,6 +990,28 @@
     invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     return-object v0
+
+    :catch_1
+    move-exception p0
+
+    const-string v1, "IconCompat"
+
+    const-string v2, "Unable to get icon package"
+
+    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-object v0
+
+    :catch_2
+    move-exception p0
+
+    const-string v1, "IconCompat"
+
+    const-string v2, "Unable to get icon package"
+
+    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-object v0
 .end method
 
 .method private static getResources(Landroid/content/Context;Ljava/lang/String;)Landroid/content/res/Resources;
@@ -1083,13 +1132,13 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    move-result v1
+    move-result p0
     :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v1
+    return p0
 
     :catch_0
     move-exception v1
@@ -1109,6 +1158,44 @@
     invoke-static {v2, p0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     return v0
+
+    :catch_1
+    move-exception v1
+
+    const-string v2, "IconCompat"
+
+    const-string v3, "Unable to get icon type "
+
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v3, p0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {v2, p0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return v0
+
+    :catch_2
+    move-exception v1
+
+    const-string v2, "IconCompat"
+
+    const-string v3, "Unable to get icon type "
+
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v3, p0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {v2, p0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return v0
 .end method
 
 .method private static getUri(Landroid/graphics/drawable/Icon;)Landroid/net/Uri;
@@ -1162,8 +1249,8 @@
 
     check-cast p0, Landroid/net/Uri;
     :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
     return-object p0
@@ -1178,6 +1265,28 @@
     invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     return-object v0
+
+    :catch_1
+    move-exception p0
+
+    const-string v1, "IconCompat"
+
+    const-string v2, "Unable to get icon uri"
+
+    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-object v0
+
+    :catch_2
+    move-exception p0
+
+    const-string v1, "IconCompat"
+
+    const-string v2, "Unable to get icon uri"
+
+    invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-object v0
 .end method
 
 .method private loadDrawableInner(Landroid/content/Context;)Landroid/graphics/drawable/Drawable;
@@ -1259,6 +1368,8 @@
     :try_end_0
     .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
+    move-object v0, v1
+
     goto :goto_2
 
     :catch_0
@@ -1268,6 +1379,16 @@
 
     const-string v4, "Unable to load image from path: "
 
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v4, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v3, v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
     goto :goto_1
 
     :cond_1
@@ -1279,7 +1400,7 @@
 
     invoke-virtual {v1, v0}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
 
@@ -1292,7 +1413,6 @@
 
     const-string v4, "Unable to load image from URI: "
 
-    :goto_1
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
@@ -1303,24 +1423,25 @@
 
     invoke-static {v3, v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    move-object v1, v2
+    :goto_1
+    move-object v0, v2
 
     :goto_2
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    new-instance v0, Landroid/graphics/drawable/BitmapDrawable;
+    new-instance v1, Landroid/graphics/drawable/BitmapDrawable;
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object p1
 
-    invoke-static {v1}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;)Landroid/graphics/Bitmap;
+    invoke-static {v0}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;)Landroid/graphics/Bitmap;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {v0, p1, v1}, Landroid/graphics/drawable/BitmapDrawable;-><init>(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V
+    invoke-direct {v1, p1, v0}, Landroid/graphics/drawable/BitmapDrawable;-><init>(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V
 
-    return-object v0
+    return-object v1
 
     :pswitch_2
     new-instance v0, Landroid/graphics/drawable/BitmapDrawable;
@@ -2127,8 +2248,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mParcelable:Landroid/os/Parcelable;
-
     iput-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
 
     return-void
@@ -2138,15 +2257,13 @@
 
     iput-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iput v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mType:I
+    iput v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mType:I
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iput v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mInt1:I
-
-    iget-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mData:[B
+    iput v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mInt1:I
 
     array-length v0, v0
 
@@ -2159,8 +2276,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mParcelable:Landroid/os/Parcelable;
-
     iput-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
 
     return-void
@@ -2387,7 +2502,7 @@
 
     invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putByteArray(Ljava/lang/String;[B)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     const-string v1, "obj"
@@ -2398,7 +2513,7 @@
 
     invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_2
     const-string v1, "obj"
@@ -2407,6 +2522,8 @@
 
     check-cast v2, Landroid/graphics/Bitmap;
 
+    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+
     goto :goto_0
 
     :cond_0
@@ -2416,10 +2533,9 @@
 
     check-cast v2, Landroid/os/Parcelable;
 
-    :goto_0
     invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
-    :goto_1
+    :goto_0
     const-string v1, "type"
 
     iget v2, p0, Landroidx/core/graphics/drawable/IconCompat;->mType:I
@@ -2442,11 +2558,9 @@
 
     if-eqz v1, :cond_1
 
-    const-string v1, "tint_list"
+    const-string v2, "tint_list"
 
-    iget-object v2, p0, Landroidx/core/graphics/drawable/IconCompat;->mTintList:Landroid/content/res/ColorStateList;
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     :cond_1
     iget-object v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mTintMode:Landroid/graphics/PorterDuff$Mode;
@@ -2455,21 +2569,17 @@
 
     if-eq v1, v2, :cond_2
 
-    const-string v1, "tint_mode"
+    const-string v2, "tint_mode"
 
-    iget-object v2, p0, Landroidx/core/graphics/drawable/IconCompat;->mTintMode:Landroid/graphics/PorterDuff$Mode;
+    invoke-virtual {v1}, Landroid/graphics/PorterDuff$Mode;->name()Ljava/lang/String;
 
-    invoke-virtual {v2}, Landroid/graphics/PorterDuff$Mode;->name()Ljava/lang/String;
+    move-result-object v1
 
-    move-result-object v2
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_2
     return-object v0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
@@ -2517,7 +2627,7 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
@@ -2530,6 +2640,10 @@
 
     move-result-object v0
 
+    invoke-static {v0}, Landroid/graphics/drawable/Icon;->createWithBitmap(Landroid/graphics/Bitmap;)Landroid/graphics/drawable/Icon;
+
+    move-result-object v0
+
     goto :goto_0
 
     :pswitch_1
@@ -2541,7 +2655,7 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_2
     iget-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
@@ -2556,7 +2670,7 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_3
     invoke-virtual {p0}, Landroidx/core/graphics/drawable/IconCompat;->getResPackage()Ljava/lang/String;
@@ -2569,25 +2683,22 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_4
     iget-object v0, p0, Landroidx/core/graphics/drawable/IconCompat;->mObj1:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/Bitmap;
 
-    :goto_0
     invoke-static {v0}, Landroid/graphics/drawable/Icon;->createWithBitmap(Landroid/graphics/Bitmap;)Landroid/graphics/drawable/Icon;
 
     move-result-object v0
 
-    :goto_1
+    :goto_0
     iget-object v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mTintList:Landroid/content/res/ColorStateList;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mTintList:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Icon;->setTintList(Landroid/content/res/ColorStateList;)Landroid/graphics/drawable/Icon;
 
     :cond_1
@@ -2597,8 +2708,6 @@
 
     if-eq v1, v2, :cond_2
 
-    iget-object v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mTintMode:Landroid/graphics/PorterDuff$Mode;
-
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Icon;->setTintMode(Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/drawable/Icon;
 
     :cond_2
@@ -2657,7 +2766,7 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const-string v1, " uri="
@@ -2668,7 +2777,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     const-string v1, " len="
@@ -2689,6 +2798,8 @@
 
     iget v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mInt2:I
 
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :pswitch_2
@@ -2730,7 +2841,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_3
     const-string v1, " size="
@@ -2759,11 +2870,10 @@
 
     move-result v1
 
-    :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v1, p0, Landroidx/core/graphics/drawable/IconCompat;->mTintList:Landroid/content/res/ColorStateList;
 
     if-eqz v1, :cond_2
@@ -2802,6 +2912,8 @@
 
     return-object v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_3
diff --git a/com.discord/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali b/com.discord/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali
index 56b6c34743..4949c471b8 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/graphics/drawable/IconCompatParcelizer;
 .super Ljava/lang/Object;
+.source "IconCompatParcelizer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable.smali b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable.smali
index 81da4d178e..58a19b27e5 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/graphics/drawable/RoundedBitmapDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "RoundedBitmapDrawable.java"
 
 
 # static fields
@@ -105,7 +106,6 @@
 
     invoke-direct {p1, p2, v0, v0}, Landroid/graphics/BitmapShader;-><init>(Landroid/graphics/Bitmap;Landroid/graphics/Shader$TileMode;Landroid/graphics/Shader$TileMode;)V
 
-    :goto_0
     iput-object p1, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mBitmapShader:Landroid/graphics/BitmapShader;
 
     return-void
@@ -119,7 +119,9 @@
 
     const/4 p1, 0x0
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mBitmapShader:Landroid/graphics/BitmapShader;
+
+    return-void
 .end method
 
 .method private computeBitmapSize()V
@@ -228,11 +230,9 @@
 
     iget v1, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mCornerRadius:F
 
-    iget v2, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mCornerRadius:F
+    iget-object v2, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mPaint:Landroid/graphics/Paint;
 
-    iget-object v3, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mPaint:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, v0, v1, v1, v2}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
     return-void
 .end method
@@ -312,13 +312,13 @@
 
     const/16 v2, 0x77
 
-    if-ne v0, v2, :cond_2
+    if-ne v0, v2, :cond_3
 
     iget-boolean v0, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mIsCircular:Z
 
     if-eqz v0, :cond_0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_0
     iget-object v0, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mBitmap:Landroid/graphics/Bitmap;
@@ -359,6 +359,10 @@
     :cond_2
     :goto_0
     return v1
+
+    :cond_3
+    :goto_1
+    return v1
 .end method
 
 .method public final getPaint()Landroid/graphics/Paint;
@@ -532,19 +536,18 @@
 
     iget-object v1, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mBitmapShader:Landroid/graphics/BitmapShader;
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v0, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mPaint:Landroid/graphics/Paint;
 
     const/4 v1, 0x0
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
-    :goto_1
+    :goto_0
     iput p1, p0, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->mCornerRadius:F
 
     invoke-virtual {p0}, Landroidx/core/graphics/drawable/RoundedBitmapDrawable;->invalidateSelf()V
diff --git a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable21.smali b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable21.smali
index 3e67cda4c1..9317d70b54 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable21.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawable21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/drawable/RoundedBitmapDrawable21;
 .super Landroidx/core/graphics/drawable/RoundedBitmapDrawable;
+.source "RoundedBitmapDrawable21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory$DefaultRoundedBitmapDrawable.smali b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory$DefaultRoundedBitmapDrawable.smali
index 7f02aaeb38..4d4c0afd8a 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory$DefaultRoundedBitmapDrawable.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory$DefaultRoundedBitmapDrawable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/drawable/RoundedBitmapDrawableFactory$DefaultRoundedBitmapDrawable;
 .super Landroidx/core/graphics/drawable/RoundedBitmapDrawable;
+.source "RoundedBitmapDrawableFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali
index 876c5d7037..c3feb82363 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/graphics/drawable/RoundedBitmapDrawableFactory;
 .super Ljava/lang/Object;
+.source "RoundedBitmapDrawableFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/TintAwareDrawable.smali b/com.discord/smali/androidx/core/graphics/drawable/TintAwareDrawable.smali
index 7f3f6185bb..77b3989711 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/TintAwareDrawable.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/TintAwareDrawable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/graphics/drawable/TintAwareDrawable;
 .super Ljava/lang/Object;
+.source "TintAwareDrawable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawable.smali b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawable.smali
index 6459bd057d..57cc9f90a1 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawable.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/graphics/drawable/WrappedDrawable;
 .super Ljava/lang/Object;
+.source "WrappedDrawable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali
index 4312a478b6..ce581381b7 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
 .super Landroid/graphics/drawable/Drawable$ConstantState;
+.source "WrappedDrawableApi14.java"
 
 
 # annotations
@@ -95,8 +96,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;->mDrawableState:Landroid/graphics/drawable/Drawable$ConstantState;
-
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable$ConstantState;->getChangingConfigurations()I
 
     move-result v1
diff --git a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali
index 7104367e69..18a9addc4d 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase;
 .super Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
+.source "WrappedDrawableApi14.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14.smali b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14.smali
index d085054605..43f0f40b25 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/drawable/WrappedDrawableApi14;
 .super Landroid/graphics/drawable/Drawable;
+.source "WrappedDrawableApi14.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
@@ -96,8 +97,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mState:Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
-
     iget-object v0, v0, Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;->mDrawableState:Landroid/graphics/drawable/Drawable$ConstantState;
 
     if-eqz v0, :cond_0
@@ -211,8 +210,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mState:Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
-
     invoke-virtual {v1}, Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;->getChangingConfigurations()I
 
     move-result v1
@@ -245,8 +242,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mState:Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
-
     invoke-virtual {v0}, Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;->canConstantState()Z
 
     move-result v0
@@ -443,8 +438,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mState:Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
-
     iget-object v0, v0, Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;->mTint:Landroid/content/res/ColorStateList;
 
     goto :goto_0
@@ -516,8 +509,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
     :cond_0
@@ -525,14 +516,10 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mState:Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
-
     iget-object v1, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->getConstantState()Landroid/graphics/drawable/Drawable$ConstantState;
 
     move-result-object v1
@@ -577,8 +564,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
     :cond_0
@@ -797,8 +782,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
@@ -840,8 +823,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi14;->mState:Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
-
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getConstantState()Landroid/graphics/drawable/Drawable$ConstantState;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali
index 36d09fd4fa..4b1e0978e9 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop;
 .super Landroidx/core/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;
+.source "WrappedDrawableApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21.smali b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21.smali
index dd22aacbae..581f80302b 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/WrappedDrawableApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/graphics/drawable/WrappedDrawableApi21;
 .super Landroidx/core/graphics/drawable/WrappedDrawableApi14;
+.source "WrappedDrawableApi21.java"
 
 
 # annotations
@@ -168,8 +169,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    sget-object v0, Landroidx/core/graphics/drawable/WrappedDrawableApi21;->sIsProjectedDrawableMethod:Ljava/lang/reflect/Method;
-
     iget-object v2, p0, Landroidx/core/graphics/drawable/WrappedDrawableApi21;->mDrawable:Landroid/graphics/drawable/Drawable;
 
     new-array v3, v1, [Ljava/lang/Object;
diff --git a/com.discord/smali/androidx/core/hardware/display/DisplayManagerCompat.smali b/com.discord/smali/androidx/core/hardware/display/DisplayManagerCompat.smali
index 11140dea2d..08b1450d7f 100644
--- a/com.discord/smali/androidx/core/hardware/display/DisplayManagerCompat.smali
+++ b/com.discord/smali/androidx/core/hardware/display/DisplayManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/hardware/display/DisplayManagerCompat;
 .super Ljava/lang/Object;
+.source "DisplayManagerCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$1.smali b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$1.smali
index 93cf3b2236..6fc6c7be70 100644
--- a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$1.smali
+++ b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/hardware/fingerprint/FingerprintManagerCompat$1;
 .super Landroid/hardware/fingerprint/FingerprintManager$AuthenticationCallback;
+.source "FingerprintManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback.smali b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback.smali
index 722920ca8b..8a8767fd8f 100644
--- a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback.smali
+++ b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback;
 .super Ljava/lang/Object;
+.source "FingerprintManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationResult.smali b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationResult.smali
index 5a14ec86a8..bda3f6efca 100644
--- a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationResult.smali
+++ b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationResult.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/hardware/fingerprint/FingerprintManagerCompat$AuthenticationResult;
 .super Ljava/lang/Object;
+.source "FingerprintManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali
index cb1d756fec..25332f4a7e 100644
--- a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali
+++ b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;
 .super Ljava/lang/Object;
+.source "FingerprintManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali
index 87bbbcd5c5..b8e1923cdf 100644
--- a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali
+++ b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/hardware/fingerprint/FingerprintManagerCompat;
 .super Ljava/lang/Object;
+.source "FingerprintManagerCompat.java"
 
 
 # annotations
@@ -145,6 +146,8 @@
 
     invoke-direct {v0, p0}, Landroidx/core/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;-><init>(Ljavax/crypto/Mac;)V
 
+    return-object v0
+
     :cond_3
     return-object v0
 .end method
@@ -223,6 +226,8 @@
 
     invoke-direct {v0, p0}, Landroid/hardware/fingerprint/FingerprintManager$CryptoObject;-><init>(Ljavax/crypto/Mac;)V
 
+    return-object v0
+
     :cond_3
     return-object v0
 .end method
@@ -273,17 +278,14 @@
 
     check-cast p3, Landroid/os/CancellationSignal;
 
-    :goto_0
-    move-object v3, p3
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p3, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v3, p3
 
-    :goto_1
     invoke-static {p1}, Landroidx/core/hardware/fingerprint/FingerprintManagerCompat;->wrapCryptoObject(Landroidx/core/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;)Landroid/hardware/fingerprint/FingerprintManager$CryptoObject;
 
     move-result-object v2
@@ -314,7 +316,7 @@
 
     const/16 v2, 0x17
 
-    if-lt v0, v2, :cond_0
+    if-lt v0, v2, :cond_1
 
     iget-object v0, p0, Landroidx/core/hardware/fingerprint/FingerprintManagerCompat;->mContext:Landroid/content/Context;
 
@@ -336,6 +338,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method public final isHardwareDetected()Z
@@ -350,7 +355,7 @@
 
     const/16 v2, 0x17
 
-    if-lt v0, v2, :cond_0
+    if-lt v0, v2, :cond_1
 
     iget-object v0, p0, Landroidx/core/hardware/fingerprint/FingerprintManagerCompat;->mContext:Landroid/content/Context;
 
@@ -372,4 +377,7 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
diff --git a/com.discord/smali/androidx/core/internal/package-info.smali b/com.discord/smali/androidx/core/internal/package-info.smali
index 191e3681a3..17447ce0f5 100644
--- a/com.discord/smali/androidx/core/internal/package-info.smali
+++ b/com.discord/smali/androidx/core/internal/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/core/internal/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/internal/view/SupportMenu.smali b/com.discord/smali/androidx/core/internal/view/SupportMenu.smali
index d6bd918fa2..588ec81954 100644
--- a/com.discord/smali/androidx/core/internal/view/SupportMenu.smali
+++ b/com.discord/smali/androidx/core/internal/view/SupportMenu.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/internal/view/SupportMenu;
 .super Ljava/lang/Object;
+.source "SupportMenu.java"
 
 # interfaces
 .implements Landroid/view/Menu;
diff --git a/com.discord/smali/androidx/core/internal/view/SupportMenuItem.smali b/com.discord/smali/androidx/core/internal/view/SupportMenuItem.smali
index f60a96cdb6..b47f715ba7 100644
--- a/com.discord/smali/androidx/core/internal/view/SupportMenuItem.smali
+++ b/com.discord/smali/androidx/core/internal/view/SupportMenuItem.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/internal/view/SupportMenuItem;
 .super Ljava/lang/Object;
+.source "SupportMenuItem.java"
 
 # interfaces
 .implements Landroid/view/MenuItem;
diff --git a/com.discord/smali/androidx/core/internal/view/SupportSubMenu.smali b/com.discord/smali/androidx/core/internal/view/SupportSubMenu.smali
index 37f227c126..a029d60322 100644
--- a/com.discord/smali/androidx/core/internal/view/SupportSubMenu.smali
+++ b/com.discord/smali/androidx/core/internal/view/SupportSubMenu.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/internal/view/SupportSubMenu;
 .super Ljava/lang/Object;
+.source "SupportSubMenu.java"
 
 # interfaces
 .implements Landroid/view/SubMenu;
diff --git a/com.discord/smali/androidx/core/math/MathUtils.smali b/com.discord/smali/androidx/core/math/MathUtils.smali
index 033c5e95c9..4fc17d94b4 100644
--- a/com.discord/smali/androidx/core/math/MathUtils.smali
+++ b/com.discord/smali/androidx/core/math/MathUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/math/MathUtils;
 .super Ljava/lang/Object;
+.source "MathUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali b/com.discord/smali/androidx/core/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali
index fac03b0801..37285bbe6a 100644
--- a/com.discord/smali/androidx/core/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali
+++ b/com.discord/smali/androidx/core/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/net/ConnectivityManagerCompat$RestrictBackgroundStatus;
 .super Ljava/lang/Object;
+.source "ConnectivityManagerCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/net/ConnectivityManagerCompat.smali b/com.discord/smali/androidx/core/net/ConnectivityManagerCompat.smali
index 8264cada58..a86ce321dc 100644
--- a/com.discord/smali/androidx/core/net/ConnectivityManagerCompat.smali
+++ b/com.discord/smali/androidx/core/net/ConnectivityManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/net/ConnectivityManagerCompat;
 .super Ljava/lang/Object;
+.source "ConnectivityManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/net/DatagramSocketWrapper$DatagramSocketImplWrapper.smali b/com.discord/smali/androidx/core/net/DatagramSocketWrapper$DatagramSocketImplWrapper.smali
index 7b23ae0d36..81d8b4dafb 100644
--- a/com.discord/smali/androidx/core/net/DatagramSocketWrapper$DatagramSocketImplWrapper.smali
+++ b/com.discord/smali/androidx/core/net/DatagramSocketWrapper$DatagramSocketImplWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/net/DatagramSocketWrapper$DatagramSocketImplWrapper;
 .super Ljava/net/SocketImpl;
+.source "DatagramSocketWrapper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/net/DatagramSocketWrapper.smali b/com.discord/smali/androidx/core/net/DatagramSocketWrapper.smali
index cd46288087..07a3b44228 100644
--- a/com.discord/smali/androidx/core/net/DatagramSocketWrapper.smali
+++ b/com.discord/smali/androidx/core/net/DatagramSocketWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/net/DatagramSocketWrapper;
 .super Ljava/net/Socket;
+.source "DatagramSocketWrapper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/net/TrafficStatsCompat.smali b/com.discord/smali/androidx/core/net/TrafficStatsCompat.smali
index a62b9c4fea..efae904777 100644
--- a/com.discord/smali/androidx/core/net/TrafficStatsCompat.smali
+++ b/com.discord/smali/androidx/core/net/TrafficStatsCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/net/TrafficStatsCompat;
 .super Ljava/lang/Object;
+.source "TrafficStatsCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/os/BuildCompat.smali b/com.discord/smali/androidx/core/os/BuildCompat.smali
index 17011a4824..c244eac94a 100644
--- a/com.discord/smali/androidx/core/os/BuildCompat.smali
+++ b/com.discord/smali/androidx/core/os/BuildCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/os/BuildCompat;
 .super Ljava/lang/Object;
+.source "BuildCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/os/CancellationSignal$OnCancelListener.smali b/com.discord/smali/androidx/core/os/CancellationSignal$OnCancelListener.smali
index 82f15f8fb7..88008585ee 100644
--- a/com.discord/smali/androidx/core/os/CancellationSignal$OnCancelListener.smali
+++ b/com.discord/smali/androidx/core/os/CancellationSignal$OnCancelListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/os/CancellationSignal$OnCancelListener;
 .super Ljava/lang/Object;
+.source "CancellationSignal.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/os/CancellationSignal.smali b/com.discord/smali/androidx/core/os/CancellationSignal.smali
index 2d3484cc44..6ae49ee5ed 100644
--- a/com.discord/smali/androidx/core/os/CancellationSignal.smali
+++ b/com.discord/smali/androidx/core/os/CancellationSignal.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/CancellationSignal;
 .super Ljava/lang/Object;
+.source "CancellationSignal.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/os/ConfigurationCompat.smali b/com.discord/smali/androidx/core/os/ConfigurationCompat.smali
index 96d6ccf9fd..d864c498b0 100644
--- a/com.discord/smali/androidx/core/os/ConfigurationCompat.smali
+++ b/com.discord/smali/androidx/core/os/ConfigurationCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/ConfigurationCompat;
 .super Ljava/lang/Object;
+.source "ConfigurationCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/os/EnvironmentCompat.smali b/com.discord/smali/androidx/core/os/EnvironmentCompat.smali
index e074a53c20..76a0a7cbae 100644
--- a/com.discord/smali/androidx/core/os/EnvironmentCompat.smali
+++ b/com.discord/smali/androidx/core/os/EnvironmentCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/EnvironmentCompat;
 .super Ljava/lang/Object;
+.source "EnvironmentCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/os/HandlerCompat.smali b/com.discord/smali/androidx/core/os/HandlerCompat.smali
index 94a937426a..ec6b5d0fb5 100644
--- a/com.discord/smali/androidx/core/os/HandlerCompat.smali
+++ b/com.discord/smali/androidx/core/os/HandlerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/HandlerCompat;
 .super Ljava/lang/Object;
+.source "HandlerCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/os/LocaleHelper.smali b/com.discord/smali/androidx/core/os/LocaleHelper.smali
index 5d1ac87750..6bcdbc4419 100644
--- a/com.discord/smali/androidx/core/os/LocaleHelper.smali
+++ b/com.discord/smali/androidx/core/os/LocaleHelper.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/os/LocaleHelper;
 .super Ljava/lang/Object;
+.source "LocaleHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatApi24Impl.smali b/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatApi24Impl.smali
index 116cce8a33..61bc28646d 100644
--- a/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatApi24Impl.smali
+++ b/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatApi24Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/os/LocaleListCompat$LocaleListCompatApi24Impl;
 .super Ljava/lang/Object;
+.source "LocaleListCompat.java"
 
 # interfaces
 .implements Landroidx/core/os/LocaleListInterface;
@@ -84,8 +85,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/os/LocaleListCompat$LocaleListCompatApi24Impl;->mLocaleList:Landroid/os/LocaleList;
-
     invoke-virtual {v0, p1}, Landroid/os/LocaleList;->getFirstMatch([Ljava/lang/String;)Ljava/util/Locale;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatBaseImpl.smali b/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatBaseImpl.smali
index f463bd6a59..c86510848c 100644
--- a/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatBaseImpl.smali
+++ b/com.discord/smali/androidx/core/os/LocaleListCompat$LocaleListCompatBaseImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/os/LocaleListCompat$LocaleListCompatBaseImpl;
 .super Ljava/lang/Object;
+.source "LocaleListCompat.java"
 
 # interfaces
 .implements Landroidx/core/os/LocaleListInterface;
@@ -80,8 +81,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/os/LocaleListCompat$LocaleListCompatBaseImpl;->mLocaleList:Landroidx/core/os/LocaleListHelper;
-
     invoke-virtual {v0, p1}, Landroidx/core/os/LocaleListHelper;->getFirstMatch([Ljava/lang/String;)Ljava/util/Locale;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/core/os/LocaleListCompat.smali b/com.discord/smali/androidx/core/os/LocaleListCompat.smali
index 3726ac663d..c051bad0a7 100644
--- a/com.discord/smali/androidx/core/os/LocaleListCompat.smali
+++ b/com.discord/smali/androidx/core/os/LocaleListCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/LocaleListCompat;
 .super Ljava/lang/Object;
+.source "LocaleListCompat.java"
 
 
 # annotations
@@ -37,7 +38,6 @@
 
     invoke-direct {v0}, Landroidx/core/os/LocaleListCompat$LocaleListCompatApi24Impl;-><init>()V
 
-    :goto_0
     sput-object v0, Landroidx/core/os/LocaleListCompat;->IMPL:Landroidx/core/os/LocaleListInterface;
 
     return-void
@@ -47,7 +47,9 @@
 
     invoke-direct {v0}, Landroidx/core/os/LocaleListCompat$LocaleListCompatBaseImpl;-><init>()V
 
-    goto :goto_0
+    sput-object v0, Landroidx/core/os/LocaleListCompat;->IMPL:Landroidx/core/os/LocaleListInterface;
+
+    return-void
 .end method
 
 .method private constructor <init>()V
diff --git a/com.discord/smali/androidx/core/os/LocaleListHelper.smali b/com.discord/smali/androidx/core/os/LocaleListHelper.smali
index 1904871700..4b8ce3e94d 100644
--- a/com.discord/smali/androidx/core/os/LocaleListHelper.smali
+++ b/com.discord/smali/androidx/core/os/LocaleListHelper.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/os/LocaleListHelper;
 .super Ljava/lang/Object;
+.source "LocaleListHelper.java"
 
 
 # annotations
@@ -329,6 +330,8 @@
     invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method varargs constructor <init>([Ljava/util/Locale;)V
@@ -355,7 +358,6 @@
 
     const-string p1, ""
 
-    :goto_0
     iput-object p1, p0, Landroidx/core/os/LocaleListHelper;->mStringRepresentation:Ljava/lang/String;
 
     return-void
@@ -375,7 +377,7 @@
 
     const/4 v3, 0x0
 
-    :goto_1
+    :goto_0
     array-length v4, p1
 
     if-ge v3, v4, :cond_4
@@ -419,7 +421,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     new-instance p1, Ljava/lang/IllegalArgumentException;
@@ -474,7 +476,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/core/os/LocaleListHelper;->mStringRepresentation:Ljava/lang/String;
+
+    return-void
 .end method
 
 .method private computeFirstMatch(Ljava/util/Collection;Z)Ljava/util/Locale;
@@ -510,7 +514,7 @@
 .end method
 
 .method private computeFirstMatchIndex(Ljava/util/Collection;Z)I
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -522,19 +526,17 @@
 
     iget-object v0, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    if-ne v0, v2, :cond_0
+    if-ne v1, v3, :cond_0
 
-    return v1
+    return v2
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
-
     array-length v0, v0
 
     if-nez v0, :cond_1
@@ -556,7 +558,7 @@
 
     if-nez p2, :cond_2
 
-    return v1
+    return v2
 
     :cond_2
     if-ge p2, v0, :cond_3
@@ -575,57 +577,55 @@
     :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Ljava/lang/String;
+    check-cast v1, Ljava/lang/String;
 
-    invoke-static {v2}, Landroidx/core/os/LocaleHelper;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale;
+    invoke-static {v1}, Landroidx/core/os/LocaleHelper;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, v2}, Landroidx/core/os/LocaleListHelper;->findFirstMatchIndex(Ljava/util/Locale;)I
+    invoke-direct {p0, v1}, Landroidx/core/os/LocaleListHelper;->findFirstMatchIndex(Ljava/util/Locale;)I
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_5
+    if-nez v1, :cond_5
 
-    return v1
+    return v2
 
     :cond_5
-    if-ge v2, p2, :cond_4
+    if-ge v1, p2, :cond_4
 
-    move p2, v2
+    move p2, v1
 
     goto :goto_1
 
     :cond_6
     if-ne p2, v0, :cond_7
 
-    return v1
+    return v2
 
     :cond_7
     return p2
 .end method
 
 .method private findFirstMatchIndex(Ljava/util/Locale;)I
-    .locals 2
+    .locals 3
 
     const/4 v0, 0x0
 
     :goto_0
     iget-object v1, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -1056,7 +1056,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_6
+    if-nez v0, :cond_7
 
     invoke-static {p1}, Landroidx/core/os/LocaleListHelper;->isPseudoLocale(Ljava/util/Locale;)Z
 
@@ -1120,6 +1120,9 @@
     return v1
 
     :cond_6
+    return v2
+
+    :cond_7
     :goto_1
     return v2
 .end method
@@ -1192,10 +1195,9 @@
 
     sget-object p0, Landroidx/core/os/LocaleListHelper;->sDefaultLocaleList:Landroidx/core/os/LocaleListHelper;
 
-    :goto_0
     sput-object p0, Landroidx/core/os/LocaleListHelper;->sDefaultAdjustedLocaleList:Landroidx/core/os/LocaleListHelper;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance p0, Landroidx/core/os/LocaleListHelper;
@@ -1206,9 +1208,9 @@
 
     invoke-direct {p0, p1, v1}, Landroidx/core/os/LocaleListHelper;-><init>(Ljava/util/Locale;Landroidx/core/os/LocaleListHelper;)V
 
-    goto :goto_0
+    sput-object p0, Landroidx/core/os/LocaleListHelper;->sDefaultAdjustedLocaleList:Landroidx/core/os/LocaleListHelper;
 
-    :goto_1
+    :goto_0
     monitor-exit v0
 
     return-void
@@ -1282,11 +1284,9 @@
     :goto_0
     iget-object v3, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v1, v3, :cond_4
-
-    iget-object v3, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
+    if-ge v1, v4, :cond_4
 
     aget-object v3, v3, v1
 
@@ -1310,7 +1310,7 @@
 .end method
 
 .method final get(I)Ljava/util/Locale;
-    .locals 1
+    .locals 2
     .annotation build Landroidx/annotation/RestrictTo;
         value = {
             .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
@@ -1321,11 +1321,9 @@
 
     iget-object v0, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-ge p1, v0, :cond_0
-
-    iget-object v0, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
+    if-ge p1, v1, :cond_0
 
     aget-object p1, v0, p1
 
@@ -1452,7 +1450,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x1
 
@@ -1461,14 +1459,12 @@
     :goto_0
     iget-object v2, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_0
+    if-ge v1, v3, :cond_0
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
-
     aget-object v2, v2, v1
 
     invoke-virtual {v2}, Ljava/util/Locale;->hashCode()I
@@ -1486,7 +1482,7 @@
 .end method
 
 .method final indexOf(Ljava/util/Locale;)I
-    .locals 2
+    .locals 3
     .annotation build Landroidx/annotation/IntRange;
         from = -0x1L
     .end annotation
@@ -1502,11 +1498,9 @@
     :goto_0
     iget-object v1, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -1589,7 +1583,7 @@
 .end method
 
 .method public final toString()Ljava/lang/String;
-    .locals 3
+    .locals 4
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1604,11 +1598,9 @@
     :goto_0
     iget-object v2, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
-
-    iget-object v2, p0, Landroidx/core/os/LocaleListHelper;->mList:[Ljava/util/Locale;
+    if-ge v1, v3, :cond_1
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali/androidx/core/os/LocaleListInterface.smali b/com.discord/smali/androidx/core/os/LocaleListInterface.smali
index 8410497c57..20d8adbd1a 100644
--- a/com.discord/smali/androidx/core/os/LocaleListInterface.smali
+++ b/com.discord/smali/androidx/core/os/LocaleListInterface.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/os/LocaleListInterface;
 .super Ljava/lang/Object;
+.source "LocaleListInterface.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/os/OperationCanceledException.smali b/com.discord/smali/androidx/core/os/OperationCanceledException.smali
index 6d1fc54f4e..0bd946a3d8 100644
--- a/com.discord/smali/androidx/core/os/OperationCanceledException.smali
+++ b/com.discord/smali/androidx/core/os/OperationCanceledException.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/os/OperationCanceledException;
 .super Ljava/lang/RuntimeException;
+.source "OperationCanceledException.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/os/ParcelCompat.smali b/com.discord/smali/androidx/core/os/ParcelCompat.smali
index 8cf8491ff4..c8afa6c957 100644
--- a/com.discord/smali/androidx/core/os/ParcelCompat.smali
+++ b/com.discord/smali/androidx/core/os/ParcelCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/ParcelCompat;
 .super Ljava/lang/Object;
+.source "ParcelCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/os/ParcelableCompat$ParcelableCompatCreatorHoneycombMR2.smali b/com.discord/smali/androidx/core/os/ParcelableCompat$ParcelableCompatCreatorHoneycombMR2.smali
index 8d273848c3..affd22a546 100644
--- a/com.discord/smali/androidx/core/os/ParcelableCompat$ParcelableCompatCreatorHoneycombMR2.smali
+++ b/com.discord/smali/androidx/core/os/ParcelableCompat$ParcelableCompatCreatorHoneycombMR2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/os/ParcelableCompat$ParcelableCompatCreatorHoneycombMR2;
 .super Ljava/lang/Object;
+.source "ParcelableCompat.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/core/os/ParcelableCompat.smali b/com.discord/smali/androidx/core/os/ParcelableCompat.smali
index 1718626ad8..50fce02b1f 100644
--- a/com.discord/smali/androidx/core/os/ParcelableCompat.smali
+++ b/com.discord/smali/androidx/core/os/ParcelableCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/ParcelableCompat;
 .super Ljava/lang/Object;
+.source "ParcelableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/os/ParcelableCompatCreatorCallbacks.smali b/com.discord/smali/androidx/core/os/ParcelableCompatCreatorCallbacks.smali
index 6740acb14d..b1068593b2 100644
--- a/com.discord/smali/androidx/core/os/ParcelableCompatCreatorCallbacks.smali
+++ b/com.discord/smali/androidx/core/os/ParcelableCompatCreatorCallbacks.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/os/ParcelableCompatCreatorCallbacks;
 .super Ljava/lang/Object;
+.source "ParcelableCompatCreatorCallbacks.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/os/TraceCompat.smali b/com.discord/smali/androidx/core/os/TraceCompat.smali
index b529b1934d..f38d70434a 100644
--- a/com.discord/smali/androidx/core/os/TraceCompat.smali
+++ b/com.discord/smali/androidx/core/os/TraceCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/os/TraceCompat;
 .super Ljava/lang/Object;
+.source "TraceCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/os/UserManagerCompat.smali b/com.discord/smali/androidx/core/os/UserManagerCompat.smali
index 1427597d62..1cf30a22f9 100644
--- a/com.discord/smali/androidx/core/os/UserManagerCompat.smali
+++ b/com.discord/smali/androidx/core/os/UserManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/os/UserManagerCompat;
 .super Ljava/lang/Object;
+.source "UserManagerCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/provider/FontRequest.smali b/com.discord/smali/androidx/core/provider/FontRequest.smali
index 1c3e65573e..237844a9c3 100644
--- a/com.discord/smali/androidx/core/provider/FontRequest.smali
+++ b/com.discord/smali/androidx/core/provider/FontRequest.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/provider/FontRequest;
 .super Ljava/lang/Object;
+.source "FontRequest.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$1.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$1.smali
index ed0eb36199..cdfe0b339b 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$1.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/provider/FontsContractCompat$1;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$2.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$2.smali
index 6416bff967..868c12ae61 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$2.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/provider/FontsContractCompat$2;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Landroidx/core/provider/SelfDestructiveThread$ReplyCallback;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$3.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$3.smali
index 7c6e335395..2464bb5ff5 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$3.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$3.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/provider/FontsContractCompat$3;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Landroidx/core/provider/SelfDestructiveThread$ReplyCallback;
@@ -110,6 +111,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final bridge synthetic onReply(Ljava/lang/Object;)V
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$1.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$1.smali
index d84959f8ff..8fc52e97e0 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$1.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$1;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$2.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$2.smali
index fe4a1b9745..51318e00a7 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$2.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$2;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$3.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$3.smali
index 21df486d5d..7e7a9ee0e2 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$3.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$3;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$4.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$4.smali
index baa9737c5e..3269896402 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$4.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$4;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$5.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$5.smali
index 866781b63c..f58fc37753 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$5.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$5;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$6.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$6.smali
index 9a3fc285bb..5b6ab1fa44 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$6.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$6;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$7.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$7.smali
index f33a7565b0..9c1e70d88b 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$7.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$7;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$8.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$8.smali
index 0fb2272b15..0a9b480888 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$8.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$8.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$8;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$9.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$9.smali
index 137bafb3a0..66d3c679ca 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4$9.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4$9.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/FontsContractCompat$4$9;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$4.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$4.smali
index 9194c4cc9c..4e665b8506 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$4.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$4.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/provider/FontsContractCompat$4;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$5.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$5.smali
index 202c5a67b7..a001b5f8ab 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$5.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$5.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/provider/FontsContractCompat$5;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
@@ -62,7 +63,6 @@
 
     array-length p2, p2
 
-    :goto_0
     sub-int/2addr p1, p2
 
     return p1
@@ -72,7 +72,7 @@
 
     const/4 v1, 0x0
 
-    :goto_1
+    :goto_0
     array-length v2, p1
 
     if-ge v1, v2, :cond_2
@@ -87,12 +87,14 @@
 
     aget-byte p2, p2, v1
 
-    goto :goto_0
+    sub-int/2addr p1, p2
+
+    return p1
 
     :cond_1
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     return v0
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$Columns.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$Columns.smali
index 6a1c824061..b886f3f4dc 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$Columns.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$Columns.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/provider/FontsContractCompat$Columns;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Landroid/provider/BaseColumns;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontFamilyResult.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontFamilyResult.smali
index e2e40f44dc..aa00c71c0b 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontFamilyResult.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontFamilyResult.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontInfo.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontInfo.smali
index 59a47193ed..0ec34169c6 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontInfo.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontInfo.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/provider/FontsContractCompat$FontInfo;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali
index 19b69a9708..d8ceab6fa0 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback.smali
index 6f72f363b3..74526da65f 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$FontRequestCallback.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/provider/FontsContractCompat$FontRequestCallback;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat$TypefaceResult.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat$TypefaceResult.smali
index a2562ae7e4..7c59ecc23e 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat$TypefaceResult.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat$TypefaceResult.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/provider/FontsContractCompat$TypefaceResult;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/provider/FontsContractCompat.smali b/com.discord/smali/androidx/core/provider/FontsContractCompat.smali
index ac7c17f003..e377bdbb01 100644
--- a/com.discord/smali/androidx/core/provider/FontsContractCompat.smali
+++ b/com.discord/smali/androidx/core/provider/FontsContractCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/provider/FontsContractCompat;
 .super Ljava/lang/Object;
+.source "FontsContractCompat.java"
 
 
 # annotations
@@ -508,10 +509,9 @@
 
     move-result-object v3
 
-    :goto_0
     move-object v10, v3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual/range {p0 .. p0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
@@ -568,9 +568,9 @@
 
     move-result-object v3
 
-    goto :goto_0
+    move-object v10, v3
 
-    :goto_1
+    :goto_0
     if-eqz v10, :cond_7
 
     invoke-interface {v10}, Landroid/database/Cursor;->getCount()I
@@ -619,7 +619,7 @@
 
     move-result v8
 
-    :goto_2
+    :goto_1
     invoke-interface {v10}, Landroid/database/Cursor;->moveToNext()Z
 
     move-result v9
@@ -636,12 +636,12 @@
 
     move/from16 v19, v11
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     const/16 v19, 0x0
 
-    :goto_3
+    :goto_2
     if-eq v6, v9, :cond_2
 
     invoke-interface {v10, v6}, Landroid/database/Cursor;->getInt(I)I
@@ -650,12 +650,12 @@
 
     move/from16 v16, v11
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_2
     const/16 v16, 0x0
 
-    :goto_4
+    :goto_3
     if-ne v5, v9, :cond_3
 
     invoke-interface {v10, v4}, Landroid/database/Cursor;->getLong(I)J
@@ -666,10 +666,9 @@
 
     move-result-object v11
 
-    :goto_5
     move-object v15, v11
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_3
     invoke-interface {v10, v5}, Landroid/database/Cursor;->getLong(I)J
@@ -680,9 +679,9 @@
 
     move-result-object v11
 
-    goto :goto_5
+    move-object v15, v11
 
-    :goto_6
+    :goto_4
     if-eq v7, v9, :cond_4
 
     invoke-interface {v10, v7}, Landroid/database/Cursor;->getInt(I)I
@@ -691,14 +690,14 @@
 
     move/from16 v17, v11
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_4
     const/16 v11, 0x190
 
     const/16 v17, 0x190
 
-    :goto_7
+    :goto_5
     if-eq v8, v9, :cond_5
 
     invoke-interface {v10, v8}, Landroid/database/Cursor;->getInt(I)I
@@ -709,12 +708,12 @@
 
     const/16 v18, 0x1
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_5
     const/16 v18, 0x0
 
-    :goto_8
+    :goto_6
     new-instance v9, Landroidx/core/provider/FontsContractCompat$FontInfo;
 
     move-object v14, v9
@@ -725,7 +724,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
     move-object v1, v3
@@ -755,6 +754,8 @@
 
     :cond_9
     throw v0
+
+    return-void
 .end method
 
 .method static getFontInternal(Landroid/content/Context;Landroidx/core/provider/FontRequest;I)Landroidx/core/provider/FontsContractCompat$TypefaceResult;
@@ -931,11 +932,11 @@
 
     check-cast p1, Landroidx/core/provider/FontsContractCompat$TypefaceResult;
 
-    iget-object p1, p1, Landroidx/core/provider/FontsContractCompat$TypefaceResult;->mTypeface:Landroid/graphics/Typeface;
+    iget-object p0, p1, Landroidx/core/provider/FontsContractCompat$TypefaceResult;->mTypeface:Landroid/graphics/Typeface;
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p1
+    return-object p0
 
     :catch_0
     return-object p0
@@ -1184,6 +1185,8 @@
     invoke-direct {p0, p1}, Landroid/content/pm/PackageManager$NameNotFoundException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static prepareFontData(Landroid/content/Context;[Landroidx/core/provider/FontsContractCompat$FontInfo;Landroid/os/CancellationSignal;)Ljava/util/Map;
diff --git a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$1.smali b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$1.smali
index 5286efb5d8..8c6cfeb73c 100644
--- a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$1.smali
+++ b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/SelfDestructiveThread$1;
 .super Ljava/lang/Object;
+.source "SelfDestructiveThread.java"
 
 # interfaces
 .implements Landroid/os/Handler$Callback;
diff --git a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2$1.smali b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2$1.smali
index f605fc006b..25ff9873cd 100644
--- a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2$1.smali
+++ b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/SelfDestructiveThread$2$1;
 .super Ljava/lang/Object;
+.source "SelfDestructiveThread.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2.smali b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2.smali
index 6093dc4133..356d280165 100644
--- a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2.smali
+++ b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/SelfDestructiveThread$2;
 .super Ljava/lang/Object;
+.source "SelfDestructiveThread.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$3.smali b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$3.smali
index 280c54af58..35a71201a3 100644
--- a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$3.smali
+++ b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/provider/SelfDestructiveThread$3;
 .super Ljava/lang/Object;
+.source "SelfDestructiveThread.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$ReplyCallback.smali b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$ReplyCallback.smali
index fa5af2a7e5..2815f3edeb 100644
--- a/com.discord/smali/androidx/core/provider/SelfDestructiveThread$ReplyCallback.smali
+++ b/com.discord/smali/androidx/core/provider/SelfDestructiveThread$ReplyCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/provider/SelfDestructiveThread$ReplyCallback;
 .super Ljava/lang/Object;
+.source "SelfDestructiveThread.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/provider/SelfDestructiveThread.smali b/com.discord/smali/androidx/core/provider/SelfDestructiveThread.smali
index b0557dcd77..9bb1ebb8dc 100644
--- a/com.discord/smali/androidx/core/provider/SelfDestructiveThread.smali
+++ b/com.discord/smali/androidx/core/provider/SelfDestructiveThread.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/provider/SelfDestructiveThread;
 .super Ljava/lang/Object;
+.source "SelfDestructiveThread.java"
 
 
 # annotations
@@ -435,13 +436,11 @@
     :try_start_2
     invoke-interface {v8, p1, p2}, Ljava/util/concurrent/locks/Condition;->awaitNanos(J)J
 
-    move-result-wide v0
+    move-result-wide p1
     :try_end_2
     .catch Ljava/lang/InterruptedException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    move-wide p1, v0
-
     :catch_0
     :try_start_3
     invoke-virtual {v10}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
@@ -487,4 +486,6 @@
     invoke-virtual {v7}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/core/text/BidiFormatter$Builder.smali b/com.discord/smali/androidx/core/text/BidiFormatter$Builder.smali
index 4f2c3853d3..87eded61d3 100644
--- a/com.discord/smali/androidx/core/text/BidiFormatter$Builder.smali
+++ b/com.discord/smali/androidx/core/text/BidiFormatter$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/BidiFormatter$Builder;
 .super Ljava/lang/Object;
+.source "BidiFormatter.java"
 
 
 # annotations
@@ -151,18 +152,17 @@
 
     or-int/lit8 p1, p1, 0x2
 
-    :goto_0
     iput p1, p0, Landroidx/core/text/BidiFormatter$Builder;->mFlags:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, p0, Landroidx/core/text/BidiFormatter$Builder;->mFlags:I
 
     and-int/lit8 p1, p1, -0x3
 
-    goto :goto_0
+    iput p1, p0, Landroidx/core/text/BidiFormatter$Builder;->mFlags:I
 
-    :goto_1
+    :goto_0
     return-object p0
 .end method
diff --git a/com.discord/smali/androidx/core/text/BidiFormatter$DirectionalityEstimator.smali b/com.discord/smali/androidx/core/text/BidiFormatter$DirectionalityEstimator.smali
index e17cb2dc66..4c3c6b8eb9 100644
--- a/com.discord/smali/androidx/core/text/BidiFormatter$DirectionalityEstimator.smali
+++ b/com.discord/smali/androidx/core/text/BidiFormatter$DirectionalityEstimator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/BidiFormatter$DirectionalityEstimator;
 .super Ljava/lang/Object;
+.source "BidiFormatter.java"
 
 
 # annotations
@@ -113,15 +114,13 @@
 
     if-lez v1, :cond_2
 
-    iget-object v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
+    iget-object v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
 
-    iget v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
+    add-int/lit8 v1, v1, -0x1
 
-    add-int/lit8 v3, v3, -0x1
+    iput v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    iput v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
-
-    invoke-interface {v1, v3}, Ljava/lang/CharSequence;->charAt(I)C
+    invoke-interface {v3, v1}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result v1
 
@@ -138,8 +137,6 @@
     return v0
 
     :cond_1
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     if-ne v1, v2, :cond_0
 
     :cond_2
@@ -162,15 +159,13 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v0, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
+    iget-object v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
 
-    iget v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
     iput v2, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    invoke-interface {v0, v1}, Ljava/lang/CharSequence;->charAt(I)C
+    invoke-interface {v1, v0}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result v0
 
@@ -199,15 +194,13 @@
 
     if-lez v1, :cond_4
 
-    iget-object v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
+    iget-object v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
 
-    iget v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
+    add-int/lit8 v1, v1, -0x1
 
-    add-int/lit8 v3, v3, -0x1
+    iput v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    iput v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
-
-    invoke-interface {v1, v3}, Ljava/lang/CharSequence;->charAt(I)C
+    invoke-interface {v3, v1}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result v1
 
@@ -224,18 +217,12 @@
     return v0
 
     :cond_1
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     if-eq v1, v2, :cond_4
 
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     const/16 v2, 0x22
 
     if-eq v1, v2, :cond_2
 
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     const/16 v2, 0x27
 
     if-ne v1, v2, :cond_0
@@ -248,15 +235,13 @@
 
     if-lez v2, :cond_0
 
-    iget-object v2, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
+    iget-object v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
 
-    iget v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
+    add-int/lit8 v2, v2, -0x1
 
-    add-int/lit8 v3, v3, -0x1
+    iput v2, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    iput v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
-
-    invoke-interface {v2, v3}, Ljava/lang/CharSequence;->charAt(I)C
+    invoke-interface {v3, v2}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result v2
 
@@ -289,15 +274,13 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
+    iget-object v2, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
 
-    iget v2, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
-
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v3, v1, 0x1
 
     iput v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    invoke-interface {v1, v2}, Ljava/lang/CharSequence;->charAt(I)C
+    invoke-interface {v2, v1}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result v1
 
@@ -314,14 +297,10 @@
     return v0
 
     :cond_1
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     const/16 v2, 0x22
 
     if-eq v1, v2, :cond_2
 
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     const/16 v2, 0x27
 
     if-ne v1, v2, :cond_0
@@ -336,15 +315,13 @@
 
     if-ge v2, v3, :cond_0
 
-    iget-object v2, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
+    iget-object v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->text:Ljava/lang/CharSequence;
 
-    iget v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
-
-    add-int/lit8 v4, v3, 0x1
+    add-int/lit8 v4, v2, 0x1
 
     iput v4, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    invoke-interface {v2, v3}, Ljava/lang/CharSequence;->charAt(I)C
+    invoke-interface {v3, v2}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result v2
 
@@ -445,8 +422,6 @@
     goto :goto_0
 
     :cond_1
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     const/16 v2, 0x3b
 
     if-ne v1, v2, :cond_2
@@ -535,8 +510,6 @@
     goto :goto_0
 
     :cond_1
-    iget-char v1, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->lastChar:C
-
     const/16 v2, 0x26
 
     if-ne v1, v2, :cond_2
@@ -642,7 +615,7 @@
     :goto_2
     iget v4, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    if-lez v4, :cond_6
+    if-lez v4, :cond_7
 
     invoke-virtual {p0}, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->dirTypeBackward()B
 
@@ -662,19 +635,26 @@
 
     return v2
 
-    :pswitch_7
-    if-ne v3, v5, :cond_5
-
-    return v1
-
     :cond_5
     add-int/lit8 v5, v5, -0x1
 
     goto :goto_2
 
+    :pswitch_7
+    if-ne v3, v5, :cond_6
+
+    return v1
+
     :cond_6
+    add-int/lit8 v5, v5, -0x1
+
+    goto :goto_2
+
+    :cond_7
     return v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
@@ -718,7 +698,7 @@
     :goto_0
     iget v3, p0, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->charIndex:I
 
-    if-lez v3, :cond_4
+    if-lez v3, :cond_5
 
     invoke-virtual {p0}, Landroidx/core/text/BidiFormatter$DirectionalityEstimator;->dirTypeBackward()B
 
@@ -750,32 +730,37 @@
 
     return v4
 
-    :pswitch_2
-    if-ne v1, v2, :cond_1
-
-    return v5
-
     :cond_1
     add-int/lit8 v2, v2, -0x1
 
     goto :goto_0
 
+    :pswitch_2
+    if-ne v1, v2, :cond_2
+
+    return v5
+
+    :cond_2
+    add-int/lit8 v2, v2, -0x1
+
+    goto :goto_0
+
     :pswitch_3
-    if-nez v2, :cond_2
+    if-nez v2, :cond_3
 
     return v4
 
-    :cond_2
+    :cond_3
     if-nez v1, :cond_0
 
     goto :goto_1
 
     :pswitch_4
-    if-nez v2, :cond_3
+    if-nez v2, :cond_4
 
     return v5
 
-    :cond_3
+    :cond_4
     if-nez v1, :cond_0
 
     :goto_1
@@ -783,9 +768,11 @@
 
     goto :goto_0
 
-    :cond_4
+    :cond_5
     return v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
diff --git a/com.discord/smali/androidx/core/text/BidiFormatter.smali b/com.discord/smali/androidx/core/text/BidiFormatter.smali
index 76fda0a897..5810c27fee 100644
--- a/com.discord/smali/androidx/core/text/BidiFormatter.smali
+++ b/com.discord/smali/androidx/core/text/BidiFormatter.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/BidiFormatter;
 .super Ljava/lang/Object;
+.source "BidiFormatter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/HtmlCompat.smali b/com.discord/smali/androidx/core/text/HtmlCompat.smali
index 9a0f97f373..e7564c42ec 100644
--- a/com.discord/smali/androidx/core/text/HtmlCompat.smali
+++ b/com.discord/smali/androidx/core/text/HtmlCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/HtmlCompat;
 .super Ljava/lang/Object;
+.source "HtmlCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/ICUCompat.smali b/com.discord/smali/androidx/core/text/ICUCompat.smali
index 1272a5cdcc..3044c48687 100644
--- a/com.discord/smali/androidx/core/text/ICUCompat.smali
+++ b/com.discord/smali/androidx/core/text/ICUCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/ICUCompat;
 .super Ljava/lang/Object;
+.source "ICUCompat.java"
 
 
 # static fields
@@ -155,7 +156,7 @@
 
     check-cast v0, Ljava/lang/String;
     :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_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-object v0
@@ -167,7 +168,17 @@
 
     invoke-static {v1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_0
+
+    :catch_1
+    move-exception v0
+
+    const-string v1, "ICUCompat"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/Throwable;)I
+
     :cond_0
+    :goto_0
     return-object p0
 .end method
 
@@ -197,7 +208,7 @@
 
     check-cast p0, Ljava/lang/String;
     :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_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-object p0
@@ -209,7 +220,17 @@
 
     invoke-static {v1, p0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_0
+
+    :catch_1
+    move-exception p0
+
+    const-string v1, "ICUCompat"
+
+    invoke-static {v1, p0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/Throwable;)I
+
     :cond_0
+    :goto_0
     return-object v0
 .end method
 
@@ -245,12 +266,12 @@
 
     invoke-virtual {v0}, Ljava/util/Locale;->getScript()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
     move-exception v0
@@ -259,6 +280,16 @@
 
     invoke-static {v1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_0
+
+    :catch_1
+    move-exception v0
+
+    const-string v1, "ICUCompat"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :goto_0
     invoke-virtual {p0}, Ljava/util/Locale;->getScript()Ljava/lang/String;
 
     move-result-object p0
diff --git a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params$Builder.smali b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params$Builder.smali
index ca7dd5672d..0dd8427e5f 100644
--- a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params$Builder.smali
+++ b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/text/PrecomputedTextCompat$Params$Builder;
 .super Ljava/lang/Object;
+.source "PrecomputedTextCompat.java"
 
 
 # annotations
@@ -68,7 +69,6 @@
 
     sget-object p1, Landroid/text/TextDirectionHeuristics;->FIRSTSTRONG_LTR:Landroid/text/TextDirectionHeuristic;
 
-    :goto_1
     iput-object p1, p0, Landroidx/core/text/PrecomputedTextCompat$Params$Builder;->mTextDir:Landroid/text/TextDirectionHeuristic;
 
     return-void
@@ -76,7 +76,9 @@
     :cond_1
     const/4 p1, 0x0
 
-    goto :goto_1
+    iput-object p1, p0, Landroidx/core/text/PrecomputedTextCompat$Params$Builder;->mTextDir:Landroid/text/TextDirectionHeuristic;
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali
index fa6033c166..834a3cca24 100644
--- a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali
+++ b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/PrecomputedTextCompat$Params;
 .super Ljava/lang/Object;
+.source "PrecomputedTextCompat.java"
 
 
 # annotations
@@ -181,8 +182,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
-
     iget-object p1, p1, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
 
     invoke-virtual {v0, p1}, Landroid/text/PrecomputedText$Params;->equals(Ljava/lang/Object;)Z
@@ -650,7 +649,6 @@
 
     aput-object v2, v0, v1
 
-    :goto_0
     invoke-static {v0}, Landroidx/core/util/ObjectsCompat;->hash([Ljava/lang/Object;)I
 
     move-result v0
@@ -774,7 +772,11 @@
 
     aput-object v2, v0, v1
 
-    goto :goto_0
+    invoke-static {v0}, Landroidx/core/util/ObjectsCompat;->hash([Ljava/lang/Object;)I
+
+    move-result v0
+
+    return v0
 
     :cond_1
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -869,7 +871,11 @@
 
     aput-object v1, v0, v4
 
-    goto/16 :goto_0
+    invoke-static {v0}, Landroidx/core/util/ObjectsCompat;->hash([Ljava/lang/Object;)I
+
+    move-result v0
+
+    return v0
 
     :cond_2
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -964,7 +970,11 @@
 
     aput-object v1, v0, v4
 
-    goto/16 :goto_0
+    invoke-static {v0}, Landroidx/core/util/ObjectsCompat;->hash([Ljava/lang/Object;)I
+
+    move-result v0
+
+    return v0
 
     :cond_3
     new-array v0, v4, [Ljava/lang/Object;
@@ -1045,7 +1055,11 @@
 
     aput-object v1, v0, v5
 
-    goto/16 :goto_0
+    invoke-static {v0}, Landroidx/core/util/ObjectsCompat;->hash([Ljava/lang/Object;)I
+
+    move-result v0
+
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
@@ -1182,7 +1196,6 @@
 
     move-result-object v2
 
-    :goto_0
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -1191,7 +1204,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -1212,10 +1225,16 @@
 
     move-result-object v2
 
-    goto :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_2
-    :goto_1
+    :goto_0
     new-instance v1, Ljava/lang/StringBuilder;
 
     const-string v2, ", typeface="
diff --git a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali
index b2ee8294ca..669b6c8d02 100644
--- a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali
+++ b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback;
 .super Ljava/lang/Object;
+.source "PrecomputedTextCompat.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali
index 347058f503..4fc86c6b82 100644
--- a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali
+++ b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/PrecomputedTextCompat$PrecomputedTextFutureTask;
 .super Ljava/util/concurrent/FutureTask;
+.source "PrecomputedTextCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali b/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali
index 038d8c10d0..543071d48c 100644
--- a/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali
+++ b/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/text/PrecomputedTextCompat;
 .super Ljava/lang/Object;
+.source "PrecomputedTextCompat.java"
 
 # interfaces
 .implements Landroid/text/Spannable;
@@ -316,6 +317,8 @@
     invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
 
     throw p0
+
+    return-void
 .end method
 
 .method private findParaIndex(I)I
@@ -331,11 +334,9 @@
     :goto_0
     iget-object v1, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
+    if-ge v0, v2, :cond_1
 
     aget v1, v1, v0
 
@@ -359,9 +360,7 @@
 
     iget-object v2, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
 
-    iget-object v3, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
-
-    array-length v3, v3
+    array-length v3, v2
 
     add-int/lit8 v3, v3, -0x1
 
@@ -382,6 +381,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public static getTextFuture(Ljava/lang/CharSequence;Landroidx/core/text/PrecomputedTextCompat$Params;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/Future;
@@ -561,7 +562,7 @@
 .end method
 
 .method public getPrecomputedText()Landroid/text/PrecomputedText;
-    .locals 1
+    .locals 2
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
@@ -577,11 +578,9 @@
 
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mText:Landroid/text/Spannable;
 
-    instance-of v0, v0, Landroid/text/PrecomputedText;
+    instance-of v1, v0, Landroid/text/PrecomputedText;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mText:Landroid/text/Spannable;
+    if-eqz v1, :cond_0
 
     check-cast v0, Landroid/text/PrecomputedText;
 
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicCompat.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicCompat.smali
index c77e7238fb..d95076a9da 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicCompat.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicCompat.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/text/TextDirectionHeuristicCompat;
 .super Ljava/lang/Object;
+.source "TextDirectionHeuristicCompat.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$AnyStrong.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$AnyStrong.smali
index b85e222848..f22f1dfbd1 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$AnyStrong.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$AnyStrong.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/TextDirectionHeuristicsCompat$AnyStrong;
 .super Ljava/lang/Object;
+.source "TextDirectionHeuristicsCompat.java"
 
 # interfaces
 .implements Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionAlgorithm;
@@ -73,7 +74,7 @@
     :goto_0
     const/4 v2, 0x1
 
-    if-ge p2, p3, :cond_1
+    if-ge p2, p3, :cond_2
 
     invoke-interface {p1, p2}, Ljava/lang/CharSequence;->charAt(I)C
 
@@ -98,14 +99,19 @@
 
     return v2
 
+    :cond_0
+    const/4 v1, 0x1
+
+    goto :goto_1
+
     :pswitch_1
     iget-boolean v1, p0, Landroidx/core/text/TextDirectionHeuristicsCompat$AnyStrong;->mLookForRtl:Z
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
 
     return v0
 
-    :cond_0
+    :cond_1
     const/4 v1, 0x1
 
     :goto_1
@@ -113,19 +119,19 @@
 
     goto :goto_0
 
-    :cond_1
-    if-eqz v1, :cond_3
+    :cond_2
+    if-eqz v1, :cond_4
 
     iget-boolean p1, p0, Landroidx/core/text/TextDirectionHeuristicsCompat$AnyStrong;->mLookForRtl:Z
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     return v2
 
-    :cond_2
+    :cond_3
     return v0
 
-    :cond_3
+    :cond_4
     const/4 p1, 0x2
 
     return p1
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$FirstStrong.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$FirstStrong.smali
index 7bb2bfeed8..35ec0f8cc6 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$FirstStrong.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$FirstStrong.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/TextDirectionHeuristicsCompat$FirstStrong;
 .super Ljava/lang/Object;
+.source "TextDirectionHeuristicsCompat.java"
 
 # interfaces
 .implements Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionAlgorithm;
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionAlgorithm.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionAlgorithm.smali
index c488bc2cb1..3960c394ee 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionAlgorithm.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionAlgorithm.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionAlgorithm;
 .super Ljava/lang/Object;
+.source "TextDirectionHeuristicsCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicImpl.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicImpl.smali
index 6199a603c0..9dd9f1e8ef 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicImpl.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicImpl.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicImpl;
 .super Ljava/lang/Object;
+.source "TextDirectionHeuristicsCompat.java"
 
 # interfaces
 .implements Landroidx/core/text/TextDirectionHeuristicCompat;
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicInternal.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicInternal.smali
index 0be0c2acf7..8227ee4f95 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicInternal.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicInternal.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicInternal;
 .super Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicImpl;
+.source "TextDirectionHeuristicsCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicLocale.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicLocale.smali
index b02f1d24a2..2500177765 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicLocale.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicLocale.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicLocale;
 .super Landroidx/core/text/TextDirectionHeuristicsCompat$TextDirectionHeuristicImpl;
+.source "TextDirectionHeuristicsCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat.smali b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat.smali
index 426866d3bd..6d42cca60b 100644
--- a/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat.smali
+++ b/com.discord/smali/androidx/core/text/TextDirectionHeuristicsCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/TextDirectionHeuristicsCompat;
 .super Ljava/lang/Object;
+.source "TextDirectionHeuristicsCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/TextUtilsCompat.smali b/com.discord/smali/androidx/core/text/TextUtilsCompat.smali
index 0bd5af62fc..b554fdff86 100644
--- a/com.discord/smali/androidx/core/text/TextUtilsCompat.smali
+++ b/com.discord/smali/androidx/core/text/TextUtilsCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/TextUtilsCompat;
 .super Ljava/lang/Object;
+.source "TextUtilsCompat.java"
 
 
 # static fields
@@ -199,35 +200,42 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     const-string v2, "&#39;"
 
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :pswitch_1
     const-string v2, "&amp;"
 
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_1
     const-string v2, "&gt;"
 
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_2
     const-string v2, "&lt;"
 
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_3
     const-string v2, "&quot;"
 
-    :goto_1
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali/androidx/core/text/util/FindAddress$ZipRange.smali b/com.discord/smali/androidx/core/text/util/FindAddress$ZipRange.smali
index fde3a09b44..e7daa9dbed 100644
--- a/com.discord/smali/androidx/core/text/util/FindAddress$ZipRange.smali
+++ b/com.discord/smali/androidx/core/text/util/FindAddress$ZipRange.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/util/FindAddress$ZipRange;
 .super Ljava/lang/Object;
+.source "FindAddress.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/util/FindAddress.smali b/com.discord/smali/androidx/core/text/util/FindAddress.smali
index 769a7b1f5d..43f6c45eec 100644
--- a/com.discord/smali/androidx/core/text/util/FindAddress.smali
+++ b/com.discord/smali/androidx/core/text/util/FindAddress.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/util/FindAddress;
 .super Ljava/lang/Object;
+.source "FindAddress.java"
 
 
 # annotations
@@ -796,9 +797,9 @@
 
     const/4 v6, 0x1
 
-    const/4 v7, -0x1
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/4 v8, -0x1
 
     const/4 v10, -0x1
 
@@ -819,7 +820,6 @@
 
     move-result p0
 
-    :goto_1
     neg-int p0, p0
 
     return p0
@@ -843,10 +843,12 @@
 
     move-result p0
 
-    goto :goto_1
+    neg-int p0, p0
+
+    return p0
 
     :cond_1
-    :goto_2
+    :goto_1
     invoke-virtual {v1}, Ljava/util/regex/Matcher;->start()I
 
     move-result v11
@@ -872,7 +874,7 @@
     :cond_2
     move p1, v12
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const/4 v11, 0x5
@@ -900,11 +902,11 @@
     return p0
 
     :cond_4
-    if-ne v7, v2, :cond_b
+    if-ne v8, v2, :cond_b
 
-    move v7, p1
+    move v8, p1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     invoke-virtual {v1, v3}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
@@ -919,23 +921,23 @@
 
     const/4 v6, 0x0
 
-    const/4 v8, 0x1
+    const/4 v7, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     if-ne v5, v11, :cond_7
 
-    if-nez v8, :cond_7
+    if-nez v7, :cond_7
 
     invoke-virtual {v1}, Ljava/util/regex/Matcher;->end()I
 
     move-result p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
-    if-eqz v8, :cond_a
+    if-eqz v7, :cond_a
 
     const/4 v6, 0x4
 
@@ -971,7 +973,7 @@
 
     move-result p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     sget-object v6, Landroidx/core/text/util/FindAddress;->sWordRe:Ljava/util/regex/Pattern;
@@ -1013,11 +1015,15 @@
 
     move v10, p1
 
+    const/4 v6, 0x0
+
+    goto :goto_2
+
     :cond_a
     const/4 v6, 0x0
 
     :cond_b
-    :goto_3
+    :goto_2
     invoke-virtual {v1, v3}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object v9
@@ -1029,15 +1035,15 @@
     goto/16 :goto_0
 
     :cond_c
-    :goto_4
+    :goto_3
     if-lez v10, :cond_d
 
     return v10
 
     :cond_d
-    if-lez v7, :cond_e
+    if-lez v8, :cond_e
 
-    move p1, v7
+    move p1, v8
 
     :cond_e
     neg-int p0, p1
diff --git a/com.discord/smali/androidx/core/text/util/LinkifyCompat$1.smali b/com.discord/smali/androidx/core/text/util/LinkifyCompat$1.smali
index 767d2395cc..d5d6d6b881 100644
--- a/com.discord/smali/androidx/core/text/util/LinkifyCompat$1.smali
+++ b/com.discord/smali/androidx/core/text/util/LinkifyCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/text/util/LinkifyCompat$1;
 .super Ljava/lang/Object;
+.source "LinkifyCompat.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkSpec.smali b/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkSpec.smali
index be903d82b4..77ceff5312 100644
--- a/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkSpec.smali
+++ b/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkSpec.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/text/util/LinkifyCompat$LinkSpec;
 .super Ljava/lang/Object;
+.source "LinkifyCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkifyMask.smali b/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkifyMask.smali
index dcc190d095..785e6c78a6 100644
--- a/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkifyMask.smali
+++ b/com.discord/smali/androidx/core/text/util/LinkifyCompat$LinkifyMask.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/text/util/LinkifyCompat$LinkifyMask;
 .super Ljava/lang/Object;
+.source "LinkifyCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/text/util/LinkifyCompat.smali b/com.discord/smali/androidx/core/text/util/LinkifyCompat.smali
index 04881b66a3..358dc6b5e5 100644
--- a/com.discord/smali/androidx/core/text/util/LinkifyCompat.smali
+++ b/com.discord/smali/androidx/core/text/util/LinkifyCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/text/util/LinkifyCompat;
 .super Ljava/lang/Object;
+.source "LinkifyCompat.java"
 
 
 # annotations
@@ -975,9 +976,11 @@
 
     goto :goto_0
 
-    :catch_1
     :cond_0
     return-void
+
+    :catch_1
+    return-void
 .end method
 
 .method private static makeUrl(Ljava/lang/String;[Ljava/lang/String;Ljava/util/regex/Matcher;Landroid/text/util/Linkify$TransformFilter;)Ljava/lang/String;
@@ -1229,10 +1232,9 @@
 
     if-gt v5, v6, :cond_1
 
-    :goto_2
     move v1, v3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     iget v5, v1, Landroidx/core/text/util/LinkifyCompat$LinkSpec;->end:I
@@ -1249,6 +1251,8 @@
 
     if-le v5, v6, :cond_2
 
+    move v1, v3
+
     goto :goto_2
 
     :cond_2
@@ -1268,12 +1272,12 @@
 
     move v1, v2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const/4 v1, -0x1
 
-    :goto_3
+    :goto_2
     if-eq v1, v7, :cond_5
 
     invoke-virtual {p0, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
diff --git a/com.discord/smali/androidx/core/util/AtomicFile.smali b/com.discord/smali/androidx/core/util/AtomicFile.smali
index 845f0bc0ef..92bca6d735 100644
--- a/com.discord/smali/androidx/core/util/AtomicFile.smali
+++ b/com.discord/smali/androidx/core/util/AtomicFile.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/AtomicFile;
 .super Ljava/lang/Object;
+.source "AtomicFile.java"
 
 
 # instance fields
@@ -290,6 +291,8 @@
     invoke-virtual {v0}, Ljava/io/FileInputStream;->close()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public startWrite()Ljava/io/FileOutputStream;
diff --git a/com.discord/smali/androidx/core/util/Consumer.smali b/com.discord/smali/androidx/core/util/Consumer.smali
index c457c14e07..2b388ede8b 100644
--- a/com.discord/smali/androidx/core/util/Consumer.smali
+++ b/com.discord/smali/androidx/core/util/Consumer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/util/Consumer;
 .super Ljava/lang/Object;
+.source "Consumer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/util/DebugUtils.smali b/com.discord/smali/androidx/core/util/DebugUtils.smali
index cc70f12c80..3ef6d19b0c 100644
--- a/com.discord/smali/androidx/core/util/DebugUtils.smali
+++ b/com.discord/smali/androidx/core/util/DebugUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/DebugUtils;
 .super Ljava/lang/Object;
+.source "DebugUtils.java"
 
 
 # annotations
@@ -26,7 +27,6 @@
 
     const-string p0, "null"
 
-    :goto_0
     invoke-virtual {p1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     return-void
@@ -86,5 +86,7 @@
 
     move-result-object p0
 
-    goto :goto_0
+    invoke-virtual {p1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/LogWriter.smali b/com.discord/smali/androidx/core/util/LogWriter.smali
index ccca2317eb..a889af4e91 100644
--- a/com.discord/smali/androidx/core/util/LogWriter.smali
+++ b/com.discord/smali/androidx/core/util/LogWriter.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/LogWriter;
 .super Ljava/io/Writer;
+.source "LogWriter.java"
 
 
 # annotations
@@ -60,9 +61,7 @@
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Landroidx/core/util/LogWriter;->mBuilder:Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->length()I
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->length()I
 
     move-result v2
 
diff --git a/com.discord/smali/androidx/core/util/ObjectsCompat.smali b/com.discord/smali/androidx/core/util/ObjectsCompat.smali
index 7815c79287..a70694e0f9 100644
--- a/com.discord/smali/androidx/core/util/ObjectsCompat.smali
+++ b/com.discord/smali/androidx/core/util/ObjectsCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/ObjectsCompat;
 .super Ljava/lang/Object;
+.source "ObjectsCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/util/Pair.smali b/com.discord/smali/androidx/core/util/Pair.smali
index ae7af6f3ad..576b41a352 100644
--- a/com.discord/smali/androidx/core/util/Pair.smali
+++ b/com.discord/smali/androidx/core/util/Pair.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/Pair;
 .super Ljava/lang/Object;
+.source "Pair.java"
 
 
 # annotations
@@ -155,8 +156,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/util/Pair;->first:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -169,9 +168,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Landroidx/core/util/Pair;->second:Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/core/util/PatternsCompat.smali b/com.discord/smali/androidx/core/util/PatternsCompat.smali
index aec0ec061e..8920f69da8 100644
--- a/com.discord/smali/androidx/core/util/PatternsCompat.smali
+++ b/com.discord/smali/androidx/core/util/PatternsCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/util/PatternsCompat;
 .super Ljava/lang/Object;
+.source "PatternsCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/util/Pools$Pool.smali b/com.discord/smali/androidx/core/util/Pools$Pool.smali
index abdc7d676d..22ee8b9b35 100644
--- a/com.discord/smali/androidx/core/util/Pools$Pool.smali
+++ b/com.discord/smali/androidx/core/util/Pools$Pool.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/util/Pools$Pool;
 .super Ljava/lang/Object;
+.source "Pools.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/util/Pools$SimplePool.smali b/com.discord/smali/androidx/core/util/Pools$SimplePool.smali
index 9abb421015..6b2e548f57 100644
--- a/com.discord/smali/androidx/core/util/Pools$SimplePool.smali
+++ b/com.discord/smali/androidx/core/util/Pools$SimplePool.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/Pools$SimplePool;
 .super Ljava/lang/Object;
+.source "Pools.java"
 
 # interfaces
 .implements Landroidx/core/util/Pools$Pool;
@@ -100,7 +101,7 @@
 
 # virtual methods
 .method public acquire()Ljava/lang/Object;
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
@@ -113,32 +114,26 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Landroidx/core/util/Pools$SimplePool;->mPoolSize:I
-
-    add-int/lit8 v0, v0, -0x1
-
-    iget-object v2, p0, Landroidx/core/util/Pools$SimplePool;->mPool:[Ljava/lang/Object;
-
-    aget-object v2, v2, v0
+    add-int/lit8 v2, v0, -0x1
 
     iget-object v3, p0, Landroidx/core/util/Pools$SimplePool;->mPool:[Ljava/lang/Object;
 
-    aput-object v1, v3, v0
+    aget-object v4, v3, v2
 
-    iget v0, p0, Landroidx/core/util/Pools$SimplePool;->mPoolSize:I
+    aput-object v1, v3, v2
 
     add-int/lit8 v0, v0, -0x1
 
     iput v0, p0, Landroidx/core/util/Pools$SimplePool;->mPoolSize:I
 
-    return-object v2
+    return-object v4
 
     :cond_0
     return-object v1
 .end method
 
 .method public release(Ljava/lang/Object;)Z
-    .locals 2
+    .locals 3
     .param p1    # Ljava/lang/Object;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -159,25 +154,19 @@
 
     iget-object v1, p0, Landroidx/core/util/Pools$SimplePool;->mPool:[Ljava/lang/Object;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Landroidx/core/util/Pools$SimplePool;->mPool:[Ljava/lang/Object;
+    aput-object p1, v1, v0
 
-    iget v1, p0, Landroidx/core/util/Pools$SimplePool;->mPoolSize:I
+    const/4 p1, 0x1
 
-    aput-object p1, v0, v1
+    add-int/2addr v0, p1
 
-    iget p1, p0, Landroidx/core/util/Pools$SimplePool;->mPoolSize:I
+    iput v0, p0, Landroidx/core/util/Pools$SimplePool;->mPoolSize:I
 
-    const/4 v0, 0x1
-
-    add-int/2addr p1, v0
-
-    iput p1, p0, Landroidx/core/util/Pools$SimplePool;->mPoolSize:I
-
-    return v0
+    return p1
 
     :cond_0
     const/4 p1, 0x0
diff --git a/com.discord/smali/androidx/core/util/Pools$SynchronizedPool.smali b/com.discord/smali/androidx/core/util/Pools$SynchronizedPool.smali
index 6c21917327..d8b7ab9cce 100644
--- a/com.discord/smali/androidx/core/util/Pools$SynchronizedPool.smali
+++ b/com.discord/smali/androidx/core/util/Pools$SynchronizedPool.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/Pools$SynchronizedPool;
 .super Landroidx/core/util/Pools$SimplePool;
+.source "Pools.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/util/Pools.smali b/com.discord/smali/androidx/core/util/Pools.smali
index 90f09c0360..384174eba6 100644
--- a/com.discord/smali/androidx/core/util/Pools.smali
+++ b/com.discord/smali/androidx/core/util/Pools.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/util/Pools;
 .super Ljava/lang/Object;
+.source "Pools.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/util/Preconditions.smali b/com.discord/smali/androidx/core/util/Preconditions.smali
index 1d44f7bb59..8b1e076a6d 100644
--- a/com.discord/smali/androidx/core/util/Preconditions.smali
+++ b/com.discord/smali/androidx/core/util/Preconditions.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/util/Preconditions;
 .super Ljava/lang/Object;
+.source "Preconditions.java"
 
 
 # annotations
@@ -721,6 +722,8 @@
     invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static checkCollectionElementsNotNull(Ljava/util/Collection;Ljava/lang/String;)Ljava/util/Collection;
@@ -821,6 +824,8 @@
     invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static checkCollectionNotEmpty(Ljava/util/Collection;Ljava/lang/String;)Ljava/util/Collection;
diff --git a/com.discord/smali/androidx/core/util/TimeUtils.smali b/com.discord/smali/androidx/core/util/TimeUtils.smali
index f090004583..39a0d09c03 100644
--- a/com.discord/smali/androidx/core/util/TimeUtils.smali
+++ b/com.discord/smali/androidx/core/util/TimeUtils.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/util/TimeUtils;
 .super Ljava/lang/Object;
+.source "TimeUtils.java"
 
 
 # annotations
@@ -137,8 +138,6 @@
     return-void
 
     :cond_0
-    const/4 v0, 0x0
-
     sub-long/2addr p0, p2
 
     const/4 p2, 0x0
diff --git a/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali b/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali
index a43a53d408..dcc3697379 100644
--- a/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali
+++ b/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;
 .super Landroid/view/View$AccessibilityDelegate;
+.source "AccessibilityDelegateCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat.smali b/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat.smali
index 6434a8b5a0..da99929597 100644
--- a/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat.smali
+++ b/com.discord/smali/androidx/core/view/AccessibilityDelegateCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/AccessibilityDelegateCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityDelegateCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/ActionProvider$SubUiVisibilityListener.smali b/com.discord/smali/androidx/core/view/ActionProvider$SubUiVisibilityListener.smali
index bc4e9e524e..4302362467 100644
--- a/com.discord/smali/androidx/core/view/ActionProvider$SubUiVisibilityListener.smali
+++ b/com.discord/smali/androidx/core/view/ActionProvider$SubUiVisibilityListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/ActionProvider$SubUiVisibilityListener;
 .super Ljava/lang/Object;
+.source "ActionProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/ActionProvider$VisibilityListener.smali b/com.discord/smali/androidx/core/view/ActionProvider$VisibilityListener.smali
index 0a4a8429d3..a9d04c2216 100644
--- a/com.discord/smali/androidx/core/view/ActionProvider$VisibilityListener.smali
+++ b/com.discord/smali/androidx/core/view/ActionProvider$VisibilityListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/ActionProvider$VisibilityListener;
 .super Ljava/lang/Object;
+.source "ActionProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/ActionProvider.smali b/com.discord/smali/androidx/core/view/ActionProvider.smali
index d48c8d6b1b..34f76b8b94 100644
--- a/com.discord/smali/androidx/core/view/ActionProvider.smali
+++ b/com.discord/smali/androidx/core/view/ActionProvider.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/view/ActionProvider;
 .super Ljava/lang/Object;
+.source "ActionProvider.java"
 
 
 # annotations
@@ -205,8 +206,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/view/ActionProvider;->mSubUiVisibilityListener:Landroidx/core/view/ActionProvider$SubUiVisibilityListener;
-
     invoke-interface {v0, p1}, Landroidx/core/view/ActionProvider$SubUiVisibilityListener;->onSubUiVisibilityChanged(Z)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/core/view/DisplayCutoutCompat.smali b/com.discord/smali/androidx/core/view/DisplayCutoutCompat.smali
index a9a345c082..1d4a95cab9 100644
--- a/com.discord/smali/androidx/core/view/DisplayCutoutCompat.smali
+++ b/com.discord/smali/androidx/core/view/DisplayCutoutCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/DisplayCutoutCompat;
 .super Ljava/lang/Object;
+.source "DisplayCutoutCompat.java"
 
 
 # instance fields
@@ -112,11 +113,9 @@
     return v1
 
     :cond_3
-    iget-object v0, p0, Landroidx/core/view/DisplayCutoutCompat;->mDisplayCutout:Ljava/lang/Object;
-
     iget-object p1, p1, Landroidx/core/view/DisplayCutoutCompat;->mDisplayCutout:Ljava/lang/Object;
 
-    invoke-virtual {v0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -272,8 +271,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/view/DisplayCutoutCompat;->mDisplayCutout:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/core/view/DragAndDropPermissionsCompat.smali b/com.discord/smali/androidx/core/view/DragAndDropPermissionsCompat.smali
index cb428b1cf6..966a2c1735 100644
--- a/com.discord/smali/androidx/core/view/DragAndDropPermissionsCompat.smali
+++ b/com.discord/smali/androidx/core/view/DragAndDropPermissionsCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/DragAndDropPermissionsCompat;
 .super Ljava/lang/Object;
+.source "DragAndDropPermissionsCompat.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/core/view/DragStartHelper$1.smali b/com.discord/smali/androidx/core/view/DragStartHelper$1.smali
index e34d78c14c..9074556ffe 100644
--- a/com.discord/smali/androidx/core/view/DragStartHelper$1.smali
+++ b/com.discord/smali/androidx/core/view/DragStartHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/DragStartHelper$1;
 .super Ljava/lang/Object;
+.source "DragStartHelper.java"
 
 # interfaces
 .implements Landroid/view/View$OnLongClickListener;
diff --git a/com.discord/smali/androidx/core/view/DragStartHelper$2.smali b/com.discord/smali/androidx/core/view/DragStartHelper$2.smali
index d1d67cb3c3..a71c8d46cb 100644
--- a/com.discord/smali/androidx/core/view/DragStartHelper$2.smali
+++ b/com.discord/smali/androidx/core/view/DragStartHelper$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/DragStartHelper$2;
 .super Ljava/lang/Object;
+.source "DragStartHelper.java"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
diff --git a/com.discord/smali/androidx/core/view/DragStartHelper$OnDragStartListener.smali b/com.discord/smali/androidx/core/view/DragStartHelper$OnDragStartListener.smali
index 8315168ac1..573c8d7818 100644
--- a/com.discord/smali/androidx/core/view/DragStartHelper$OnDragStartListener.smali
+++ b/com.discord/smali/androidx/core/view/DragStartHelper$OnDragStartListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/DragStartHelper$OnDragStartListener;
 .super Ljava/lang/Object;
+.source "DragStartHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/DragStartHelper.smali b/com.discord/smali/androidx/core/view/DragStartHelper.smali
index 96e02c6105..0bb4c15144 100644
--- a/com.discord/smali/androidx/core/view/DragStartHelper.smali
+++ b/com.discord/smali/androidx/core/view/DragStartHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/DragStartHelper;
 .super Ljava/lang/Object;
+.source "DragStartHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl.smali b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl.smali
index cfca3c7017..fed0e1f330 100644
--- a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl.smali
+++ b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl;
 .super Ljava/lang/Object;
+.source "GestureDetectorCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase$GestureHandler.smali b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase$GestureHandler.smali
index 308b036992..7a7cc27e43 100644
--- a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase$GestureHandler.smali
+++ b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase$GestureHandler.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase$GestureHandler;
 .super Landroid/os/Handler;
+.source "GestureDetectorCompat.java"
 
 
 # annotations
@@ -99,6 +100,8 @@
 
     iput-boolean v0, p1, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDeferConfirmSingleTap:Z
 
+    return-void
+
     :cond_1
     return-void
 
@@ -122,8 +125,6 @@
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
diff --git a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase.smali b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase.smali
index f54fb404f6..eaaaa8fcfd 100644
--- a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase.smali
+++ b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;
 .super Ljava/lang/Object;
+.source "GestureDetectorCompat.java"
 
 # interfaces
 .implements Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl;
@@ -529,7 +530,7 @@
     packed-switch v0, :pswitch_data_0
 
     :pswitch_0
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :pswitch_1
     iput v8, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mLastFocusX:F
@@ -605,7 +606,7 @@
 
     invoke-virtual {p1}, Landroid/view/VelocityTracker;->clear()V
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :cond_6
     add-int/lit8 v4, v4, 0x1
@@ -623,12 +624,12 @@
 
     invoke-direct {p0}, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->cancelTaps()V
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :pswitch_3
     invoke-direct {p0}, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->cancel()V
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :pswitch_4
     iget-boolean v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mInLongPress:Z
@@ -655,12 +656,12 @@
 
     or-int/2addr v3, p1
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :cond_7
     iget-boolean v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mAlwaysInTapRegion:Z
 
-    if-eqz v5, :cond_9
+    if-eqz v5, :cond_a
 
     iget v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDownFocusX:F
 
@@ -718,13 +719,16 @@
     :goto_5
     iget v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mTouchSlopSquare:I
 
-    if-le v5, v0, :cond_13
+    if-le v5, v0, :cond_9
 
     iput-boolean v3, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mAlwaysInBiggerTapRegion:Z
 
-    goto/16 :goto_9
-
     :cond_9
+    move v3, p1
+
+    goto/16 :goto_a
+
+    :cond_a
     invoke-static {v0}, Ljava/lang/Math;->abs(F)F
 
     move-result v2
@@ -733,7 +737,7 @@
 
     cmpl-float v2, v2, v4
 
-    if-gez v2, :cond_a
+    if-gez v2, :cond_b
 
     invoke-static {v1}, Ljava/lang/Math;->abs(F)F
 
@@ -743,7 +747,7 @@
 
     if-ltz v2, :cond_19
 
-    :cond_a
+    :cond_b
     iget-object v2, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mListener:Landroid/view/GestureDetector$OnGestureListener;
 
     iget-object v3, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mCurrentDownEvent:Landroid/view/MotionEvent;
@@ -756,7 +760,7 @@
 
     iput v9, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mLastFocusY:F
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :pswitch_5
     iput-boolean v3, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mStillDown:Z
@@ -767,7 +771,7 @@
 
     iget-boolean v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mIsDoubleTapping:Z
 
-    if-eqz v5, :cond_b
+    if-eqz v5, :cond_c
 
     iget-object v1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDoubleTapListener:Landroid/view/GestureDetector$OnDoubleTapListener;
 
@@ -779,10 +783,10 @@
 
     goto :goto_8
 
-    :cond_b
+    :cond_c
     iget-boolean v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mInLongPress:Z
 
-    if-eqz v5, :cond_c
+    if-eqz v5, :cond_d
 
     iget-object p1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mHandler:Landroid/os/Handler;
 
@@ -792,10 +796,10 @@
 
     goto :goto_6
 
-    :cond_c
+    :cond_d
     iget-boolean v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mAlwaysInTapRegion:Z
 
-    if-eqz v5, :cond_e
+    if-eqz v5, :cond_f
 
     iget-object v1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mListener:Landroid/view/GestureDetector$OnGestureListener;
 
@@ -805,22 +809,20 @@
 
     iget-boolean v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDeferConfirmSingleTap:Z
 
-    if-eqz v5, :cond_d
+    if-eqz v5, :cond_e
 
     iget-object v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDoubleTapListener:Landroid/view/GestureDetector$OnDoubleTapListener;
 
-    if-eqz v5, :cond_d
-
-    iget-object v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDoubleTapListener:Landroid/view/GestureDetector$OnDoubleTapListener;
+    if-eqz v5, :cond_e
 
     invoke-interface {v5, p1}, Landroid/view/GestureDetector$OnDoubleTapListener;->onSingleTapConfirmed(Landroid/view/MotionEvent;)Z
 
-    :cond_d
+    :cond_e
     move p1, v1
 
     goto :goto_8
 
-    :cond_e
+    :cond_f
     iget-object v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mVelocityTracker:Landroid/view/VelocityTracker;
 
     invoke-virtual {p1, v3}, Landroid/view/MotionEvent;->getPointerId(I)I
@@ -851,7 +853,7 @@
 
     cmpl-float v6, v6, v7
 
-    if-gtz v6, :cond_10
+    if-gtz v6, :cond_11
 
     invoke-static {v5}, Ljava/lang/Math;->abs(F)F
 
@@ -863,17 +865,17 @@
 
     cmpl-float v6, v6, v7
 
-    if-lez v6, :cond_f
+    if-lez v6, :cond_10
 
     goto :goto_7
 
-    :cond_f
+    :cond_10
     :goto_6
     const/4 p1, 0x0
 
     goto :goto_8
 
-    :cond_10
+    :cond_11
     :goto_7
     iget-object v6, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mListener:Landroid/view/GestureDetector$OnGestureListener;
 
@@ -886,20 +888,16 @@
     :goto_8
     iget-object v1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mPreviousUpEvent:Landroid/view/MotionEvent;
 
-    if-eqz v1, :cond_11
-
-    iget-object v1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mPreviousUpEvent:Landroid/view/MotionEvent;
+    if-eqz v1, :cond_12
 
     invoke-virtual {v1}, Landroid/view/MotionEvent;->recycle()V
 
-    :cond_11
+    :cond_12
     iput-object v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mPreviousUpEvent:Landroid/view/MotionEvent;
 
     iget-object v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mVelocityTracker:Landroid/view/VelocityTracker;
 
-    if-eqz v0, :cond_12
-
-    iget-object v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mVelocityTracker:Landroid/view/VelocityTracker;
+    if-eqz v0, :cond_13
 
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->recycle()V
 
@@ -907,7 +905,7 @@
 
     iput-object v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mVelocityTracker:Landroid/view/VelocityTracker;
 
-    :cond_12
+    :cond_13
     iput-boolean v3, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mIsDoubleTapping:Z
 
     iput-boolean v3, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDeferConfirmSingleTap:Z
@@ -920,11 +918,9 @@
 
     invoke-virtual {v0, v4}, Landroid/os/Handler;->removeMessages(I)V
 
-    :cond_13
-    :goto_9
     move v3, p1
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :pswitch_6
     iget-object v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDoubleTapListener:Landroid/view/GestureDetector$OnDoubleTapListener;
@@ -948,17 +944,13 @@
 
     if-eqz v1, :cond_15
 
-    iget-object v1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mPreviousUpEvent:Landroid/view/MotionEvent;
+    iget-object v5, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mPreviousUpEvent:Landroid/view/MotionEvent;
 
-    if-eqz v1, :cond_15
+    if-eqz v5, :cond_15
 
     if-eqz v0, :cond_15
 
-    iget-object v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mCurrentDownEvent:Landroid/view/MotionEvent;
-
-    iget-object v1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mPreviousUpEvent:Landroid/view/MotionEvent;
-
-    invoke-direct {p0, v0, v1, p1}, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->isConsideredDoubleTap(Landroid/view/MotionEvent;Landroid/view/MotionEvent;Landroid/view/MotionEvent;)Z
+    invoke-direct {p0, v1, v5, p1}, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->isConsideredDoubleTap(Landroid/view/MotionEvent;Landroid/view/MotionEvent;Landroid/view/MotionEvent;)Z
 
     move-result v0
 
@@ -984,7 +976,7 @@
 
     or-int/2addr v0, v1
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_15
     iget-object v0, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mHandler:Landroid/os/Handler;
@@ -998,7 +990,7 @@
     :cond_16
     const/4 v0, 0x0
 
-    :goto_a
+    :goto_9
     iput v8, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mLastFocusX:F
 
     iput v8, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mDownFocusX:F
@@ -1011,8 +1003,6 @@
 
     if-eqz v1, :cond_17
 
-    iget-object v1, p0, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;->mCurrentDownEvent:Landroid/view/MotionEvent;
-
     invoke-virtual {v1}, Landroid/view/MotionEvent;->recycle()V
 
     :cond_17
@@ -1088,11 +1078,9 @@
     or-int v3, v0, p1
 
     :cond_19
-    :goto_b
+    :goto_a
     return v3
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_6
diff --git a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplJellybeanMr2.smali b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplJellybeanMr2.smali
index 46ac7b91a4..239d0dee8f 100644
--- a/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplJellybeanMr2.smali
+++ b/com.discord/smali/androidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplJellybeanMr2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplJellybeanMr2;
 .super Ljava/lang/Object;
+.source "GestureDetectorCompat.java"
 
 # interfaces
 .implements Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl;
diff --git a/com.discord/smali/androidx/core/view/GestureDetectorCompat.smali b/com.discord/smali/androidx/core/view/GestureDetectorCompat.smali
index e5156a2f31..9e458f1201 100644
--- a/com.discord/smali/androidx/core/view/GestureDetectorCompat.smali
+++ b/com.discord/smali/androidx/core/view/GestureDetectorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/GestureDetectorCompat;
 .super Ljava/lang/Object;
+.source "GestureDetectorCompat.java"
 
 
 # annotations
@@ -42,7 +43,6 @@
 
     invoke-direct {v0, p1, p2, p3}, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplJellybeanMr2;-><init>(Landroid/content/Context;Landroid/view/GestureDetector$OnGestureListener;Landroid/os/Handler;)V
 
-    :goto_0
     iput-object v0, p0, Landroidx/core/view/GestureDetectorCompat;->mImpl:Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl;
 
     return-void
@@ -52,7 +52,9 @@
 
     invoke-direct {v0, p1, p2, p3}, Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImplBase;-><init>(Landroid/content/Context;Landroid/view/GestureDetector$OnGestureListener;Landroid/os/Handler;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/core/view/GestureDetectorCompat;->mImpl:Landroidx/core/view/GestureDetectorCompat$GestureDetectorCompatImpl;
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/androidx/core/view/GravityCompat.smali b/com.discord/smali/androidx/core/view/GravityCompat.smali
index 6a8e74902e..8f1a08270c 100644
--- a/com.discord/smali/androidx/core/view/GravityCompat.smali
+++ b/com.discord/smali/androidx/core/view/GravityCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/GravityCompat;
 .super Ljava/lang/Object;
+.source "GravityCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/InputDeviceCompat.smali b/com.discord/smali/androidx/core/view/InputDeviceCompat.smali
index bd6f8ba6da..b88f91ccb3 100644
--- a/com.discord/smali/androidx/core/view/InputDeviceCompat.smali
+++ b/com.discord/smali/androidx/core/view/InputDeviceCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/InputDeviceCompat;
 .super Ljava/lang/Object;
+.source "InputDeviceCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/KeyEventDispatcher$Component.smali b/com.discord/smali/androidx/core/view/KeyEventDispatcher$Component.smali
index ea94b1c47a..309ca831b8 100644
--- a/com.discord/smali/androidx/core/view/KeyEventDispatcher$Component.smali
+++ b/com.discord/smali/androidx/core/view/KeyEventDispatcher$Component.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/KeyEventDispatcher$Component;
 .super Ljava/lang/Object;
+.source "KeyEventDispatcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/KeyEventDispatcher.smali b/com.discord/smali/androidx/core/view/KeyEventDispatcher.smali
index ba5796a2c9..bdab54e78c 100644
--- a/com.discord/smali/androidx/core/view/KeyEventDispatcher.smali
+++ b/com.discord/smali/androidx/core/view/KeyEventDispatcher.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/KeyEventDispatcher;
 .super Ljava/lang/Object;
+.source "KeyEventDispatcher.java"
 
 
 # annotations
@@ -82,8 +83,6 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    sget-object v0, Landroidx/core/view/KeyEventDispatcher;->sActionBarOnMenuKeyMethod:Ljava/lang/reflect/Method;
-
     new-array v1, v1, [Ljava/lang/Object;
 
     aput-object p1, v1, v2
@@ -400,8 +399,6 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    sget-object v0, Landroidx/core/view/KeyEventDispatcher;->sDialogKeyListenerField:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
diff --git a/com.discord/smali/androidx/core/view/LayoutInflaterCompat$Factory2Wrapper.smali b/com.discord/smali/androidx/core/view/LayoutInflaterCompat$Factory2Wrapper.smali
index dc63e07d84..204a834859 100644
--- a/com.discord/smali/androidx/core/view/LayoutInflaterCompat$Factory2Wrapper.smali
+++ b/com.discord/smali/androidx/core/view/LayoutInflaterCompat$Factory2Wrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/LayoutInflaterCompat$Factory2Wrapper;
 .super Ljava/lang/Object;
+.source "LayoutInflaterCompat.java"
 
 # interfaces
 .implements Landroid/view/LayoutInflater$Factory2;
diff --git a/com.discord/smali/androidx/core/view/LayoutInflaterCompat.smali b/com.discord/smali/androidx/core/view/LayoutInflaterCompat.smali
index fd00426e1f..ac7c5513fe 100644
--- a/com.discord/smali/androidx/core/view/LayoutInflaterCompat.smali
+++ b/com.discord/smali/androidx/core/view/LayoutInflaterCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/LayoutInflaterCompat;
 .super Ljava/lang/Object;
+.source "LayoutInflaterCompat.java"
 
 
 # annotations
@@ -91,8 +92,6 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    sget-object v0, Landroidx/core/view/LayoutInflaterCompat;->sLayoutInflaterFactory2Field:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p0, p1}, Ljava/lang/reflect/Field;->set(Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
diff --git a/com.discord/smali/androidx/core/view/LayoutInflaterFactory.smali b/com.discord/smali/androidx/core/view/LayoutInflaterFactory.smali
index a1f2a27569..3db76ffe99 100644
--- a/com.discord/smali/androidx/core/view/LayoutInflaterFactory.smali
+++ b/com.discord/smali/androidx/core/view/LayoutInflaterFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/LayoutInflaterFactory;
 .super Ljava/lang/Object;
+.source "LayoutInflaterFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/MarginLayoutParamsCompat.smali b/com.discord/smali/androidx/core/view/MarginLayoutParamsCompat.smali
index a26db6e452..fd8b035e4c 100644
--- a/com.discord/smali/androidx/core/view/MarginLayoutParamsCompat.smali
+++ b/com.discord/smali/androidx/core/view/MarginLayoutParamsCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/MarginLayoutParamsCompat;
 .super Ljava/lang/Object;
+.source "MarginLayoutParamsCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/view/MenuCompat.smali b/com.discord/smali/androidx/core/view/MenuCompat.smali
index 9e180db49b..5a617169f5 100644
--- a/com.discord/smali/androidx/core/view/MenuCompat.smali
+++ b/com.discord/smali/androidx/core/view/MenuCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/MenuCompat;
 .super Ljava/lang/Object;
+.source "MenuCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/view/MenuItemCompat$1.smali b/com.discord/smali/androidx/core/view/MenuItemCompat$1.smali
index 5bc6904ada..ba38951cc3 100644
--- a/com.discord/smali/androidx/core/view/MenuItemCompat$1.smali
+++ b/com.discord/smali/androidx/core/view/MenuItemCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/view/MenuItemCompat$1;
 .super Ljava/lang/Object;
+.source "MenuItemCompat.java"
 
 # interfaces
 .implements Landroid/view/MenuItem$OnActionExpandListener;
diff --git a/com.discord/smali/androidx/core/view/MenuItemCompat$OnActionExpandListener.smali b/com.discord/smali/androidx/core/view/MenuItemCompat$OnActionExpandListener.smali
index 11b840c470..ee99a79ac9 100644
--- a/com.discord/smali/androidx/core/view/MenuItemCompat$OnActionExpandListener.smali
+++ b/com.discord/smali/androidx/core/view/MenuItemCompat$OnActionExpandListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/MenuItemCompat$OnActionExpandListener;
 .super Ljava/lang/Object;
+.source "MenuItemCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/MenuItemCompat.smali b/com.discord/smali/androidx/core/view/MenuItemCompat.smali
index f72fa0085a..9dda9192e4 100644
--- a/com.discord/smali/androidx/core/view/MenuItemCompat.smali
+++ b/com.discord/smali/androidx/core/view/MenuItemCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/MenuItemCompat;
 .super Ljava/lang/Object;
+.source "MenuItemCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/MotionEventCompat.smali b/com.discord/smali/androidx/core/view/MotionEventCompat.smali
index 894e0e10ad..0bd8d596d6 100644
--- a/com.discord/smali/androidx/core/view/MotionEventCompat.smali
+++ b/com.discord/smali/androidx/core/view/MotionEventCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/MotionEventCompat;
 .super Ljava/lang/Object;
+.source "MotionEventCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/NestedScrollingChild.smali b/com.discord/smali/androidx/core/view/NestedScrollingChild.smali
index 1e1cfaf895..8e3166a2c1 100644
--- a/com.discord/smali/androidx/core/view/NestedScrollingChild.smali
+++ b/com.discord/smali/androidx/core/view/NestedScrollingChild.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/NestedScrollingChild;
 .super Ljava/lang/Object;
+.source "NestedScrollingChild.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/view/NestedScrollingChild2.smali b/com.discord/smali/androidx/core/view/NestedScrollingChild2.smali
index e66655a2b5..8fe5e32c6e 100644
--- a/com.discord/smali/androidx/core/view/NestedScrollingChild2.smali
+++ b/com.discord/smali/androidx/core/view/NestedScrollingChild2.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/NestedScrollingChild2;
 .super Ljava/lang/Object;
+.source "NestedScrollingChild2.java"
 
 # interfaces
 .implements Landroidx/core/view/NestedScrollingChild;
diff --git a/com.discord/smali/androidx/core/view/NestedScrollingChildHelper.smali b/com.discord/smali/androidx/core/view/NestedScrollingChildHelper.smali
index d5b8b8ec28..9407eb6418 100644
--- a/com.discord/smali/androidx/core/view/NestedScrollingChildHelper.smali
+++ b/com.discord/smali/androidx/core/view/NestedScrollingChildHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/NestedScrollingChildHelper;
 .super Ljava/lang/Object;
+.source "NestedScrollingChildHelper.java"
 
 
 # instance fields
@@ -72,9 +73,13 @@
     :pswitch_1
     iput-object p2, p0, Landroidx/core/view/NestedScrollingChildHelper;->mNestedScrollingParentTouch:Landroid/view/ViewParent;
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
@@ -403,11 +408,11 @@
 
     aget v5, v1, v3
 
-    aget v10, v1, v11
+    aget v6, v1, v11
 
     move v12, v5
 
-    move v13, v10
+    move v13, v6
 
     goto :goto_1
 
diff --git a/com.discord/smali/androidx/core/view/NestedScrollingParent.smali b/com.discord/smali/androidx/core/view/NestedScrollingParent.smali
index af1f2981c6..bace17a79a 100644
--- a/com.discord/smali/androidx/core/view/NestedScrollingParent.smali
+++ b/com.discord/smali/androidx/core/view/NestedScrollingParent.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/NestedScrollingParent;
 .super Ljava/lang/Object;
+.source "NestedScrollingParent.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/view/NestedScrollingParent2.smali b/com.discord/smali/androidx/core/view/NestedScrollingParent2.smali
index 1cbdd3373a..87be6b75f3 100644
--- a/com.discord/smali/androidx/core/view/NestedScrollingParent2.smali
+++ b/com.discord/smali/androidx/core/view/NestedScrollingParent2.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/NestedScrollingParent2;
 .super Ljava/lang/Object;
+.source "NestedScrollingParent2.java"
 
 # interfaces
 .implements Landroidx/core/view/NestedScrollingParent;
diff --git a/com.discord/smali/androidx/core/view/NestedScrollingParentHelper.smali b/com.discord/smali/androidx/core/view/NestedScrollingParentHelper.smali
index 134fda9543..5f87d265d3 100644
--- a/com.discord/smali/androidx/core/view/NestedScrollingParentHelper.smali
+++ b/com.discord/smali/androidx/core/view/NestedScrollingParentHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/NestedScrollingParentHelper;
 .super Ljava/lang/Object;
+.source "NestedScrollingParentHelper.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/core/view/OnApplyWindowInsetsListener.smali b/com.discord/smali/androidx/core/view/OnApplyWindowInsetsListener.smali
index e5fcea13c2..d2c209e48a 100644
--- a/com.discord/smali/androidx/core/view/OnApplyWindowInsetsListener.smali
+++ b/com.discord/smali/androidx/core/view/OnApplyWindowInsetsListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/OnApplyWindowInsetsListener;
 .super Ljava/lang/Object;
+.source "OnApplyWindowInsetsListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/view/PointerIconCompat.smali b/com.discord/smali/androidx/core/view/PointerIconCompat.smali
index 75b4941f30..82fb7747ec 100644
--- a/com.discord/smali/androidx/core/view/PointerIconCompat.smali
+++ b/com.discord/smali/androidx/core/view/PointerIconCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/PointerIconCompat;
 .super Ljava/lang/Object;
+.source "PointerIconCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/ScaleGestureDetectorCompat.smali b/com.discord/smali/androidx/core/view/ScaleGestureDetectorCompat.smali
index d549ae1349..bd58790aa9 100644
--- a/com.discord/smali/androidx/core/view/ScaleGestureDetectorCompat.smali
+++ b/com.discord/smali/androidx/core/view/ScaleGestureDetectorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/ScaleGestureDetectorCompat;
 .super Ljava/lang/Object;
+.source "ScaleGestureDetectorCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/view/ScrollingView.smali b/com.discord/smali/androidx/core/view/ScrollingView.smali
index 18b3731139..4305daed52 100644
--- a/com.discord/smali/androidx/core/view/ScrollingView.smali
+++ b/com.discord/smali/androidx/core/view/ScrollingView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/ScrollingView;
 .super Ljava/lang/Object;
+.source "ScrollingView.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/view/TintableBackgroundView.smali b/com.discord/smali/androidx/core/view/TintableBackgroundView.smali
index 997db63668..cbd726430e 100644
--- a/com.discord/smali/androidx/core/view/TintableBackgroundView.smali
+++ b/com.discord/smali/androidx/core/view/TintableBackgroundView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/TintableBackgroundView;
 .super Ljava/lang/Object;
+.source "TintableBackgroundView.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/view/VelocityTrackerCompat.smali b/com.discord/smali/androidx/core/view/VelocityTrackerCompat.smali
index 6232d7b6e4..67c72cf612 100644
--- a/com.discord/smali/androidx/core/view/VelocityTrackerCompat.smali
+++ b/com.discord/smali/androidx/core/view/VelocityTrackerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/VelocityTrackerCompat;
 .super Ljava/lang/Object;
+.source "VelocityTrackerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$1.smali b/com.discord/smali/androidx/core/view/ViewCompat$1.smali
index 5a5578841c..3d1518d3ea 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/view/ViewCompat$1;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Landroid/view/View$OnApplyWindowInsetsListener;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$FocusDirection.smali b/com.discord/smali/androidx/core/view/ViewCompat$FocusDirection.smali
index 55a02fb6df..330bb4503d 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$FocusDirection.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$FocusDirection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/view/ViewCompat$FocusDirection;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$FocusRealDirection.smali b/com.discord/smali/androidx/core/view/ViewCompat$FocusRealDirection.smali
index 714df3caeb..5784b0ba0e 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$FocusRealDirection.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$FocusRealDirection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/view/ViewCompat$FocusRealDirection;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$FocusRelativeDirection.smali b/com.discord/smali/androidx/core/view/ViewCompat$FocusRelativeDirection.smali
index 8491c9c00b..80492f0f91 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$FocusRelativeDirection.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$FocusRelativeDirection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/view/ViewCompat$FocusRelativeDirection;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$NestedScrollType.smali b/com.discord/smali/androidx/core/view/ViewCompat$NestedScrollType.smali
index b5956c30d3..0abea681ff 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$NestedScrollType.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$NestedScrollType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/view/ViewCompat$NestedScrollType;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerCompat.smali b/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerCompat.smali
index 1ebfb8ab1c..9a8c059c49 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerCompat.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerCompat.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/ViewCompat$OnUnhandledKeyEventListenerCompat;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali b/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali
index 60d25d56d4..82fe274f39 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/ViewCompat$OnUnhandledKeyEventListenerWrapper;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Landroid/view/View$OnUnhandledKeyEventListener;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$ScrollAxis.smali b/com.discord/smali/androidx/core/view/ViewCompat$ScrollAxis.smali
index cc4861f52c..4ddd88d06e 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$ScrollAxis.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$ScrollAxis.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/view/ViewCompat$ScrollAxis;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$ScrollIndicators.smali b/com.discord/smali/androidx/core/view/ViewCompat$ScrollIndicators.smali
index 8c87f480e7..7187bfbf32 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$ScrollIndicators.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$ScrollIndicators.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/view/ViewCompat$ScrollIndicators;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$UnhandledKeyEventManager.smali b/com.discord/smali/androidx/core/view/ViewCompat$UnhandledKeyEventManager.smali
index f60ebd1c80..ff8c253c6d 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$UnhandledKeyEventManager.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$UnhandledKeyEventManager.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/ViewCompat$UnhandledKeyEventManager;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 
 # annotations
@@ -126,9 +127,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Landroidx/core/view/ViewCompat$UnhandledKeyEventManager;->mViewsContainingListeners:Ljava/util/WeakHashMap;
+    if-eqz v0, :cond_4
 
     invoke-virtual {v0, p1}, Ljava/util/WeakHashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -183,6 +182,9 @@
     return-object p1
 
     :cond_3
+    return-object v1
+
+    :cond_4
     :goto_1
     return-object v1
 .end method
@@ -279,8 +281,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/view/ViewCompat$UnhandledKeyEventManager;->mViewsContainingListeners:Ljava/util/WeakHashMap;
-
     invoke-virtual {v0}, Ljava/util/WeakHashMap;->clear()V
 
     :cond_0
@@ -395,6 +395,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method static registerListeningView(Landroid/view/View;)V
@@ -455,6 +457,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p0
+
+    return-void
 .end method
 
 .method static unregisterListeningView(Landroid/view/View;)V
@@ -516,6 +520,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p0
+
+    return-void
 .end method
 
 
@@ -586,8 +592,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/view/ViewCompat$UnhandledKeyEventManager;->mLastDispatchedPreViewKeyEvent:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/core/view/ViewCompat.smali b/com.discord/smali/androidx/core/view/ViewCompat.smali
index 184bd266e8..2af418a1a3 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/ViewCompat;
 .super Ljava/lang/Object;
+.source "ViewCompat.java"
 
 
 # annotations
@@ -590,11 +591,9 @@
 
     if-eqz v0, :cond_2
 
-    :try_start_0
-    sget-object v0, Landroidx/core/view/ViewCompat;->sDispatchFinishTemporaryDetach:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x0
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -931,11 +930,9 @@
 
     if-eqz v0, :cond_2
 
-    :try_start_0
-    sget-object v0, Landroidx/core/view/ViewCompat;->sDispatchStartTemporaryDetach:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x0
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -1586,8 +1583,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/view/ViewCompat;->sMinHeightField:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
@@ -1659,8 +1654,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/view/ViewCompat;->sMinWidthField:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
@@ -1944,8 +1937,6 @@
     return-object p0
 
     :cond_1
-    sget-object v0, Landroidx/core/view/ViewCompat;->sTransitionNameMap:Ljava/util/WeakHashMap;
-
     invoke-virtual {v0, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
@@ -3640,8 +3631,8 @@
 
     invoke-virtual {v0, p0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_1
-    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_3
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_1 .. :try_end_1} :catch_2
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_1 .. :try_end_1} :catch_1
 
     return-void
@@ -3656,6 +3647,28 @@
     invoke-static {p1, v0, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     return-void
+
+    :catch_2
+    move-exception p0
+
+    const-string p1, "ViewCompat"
+
+    const-string v0, "Unable to invoke childrenDrawingOrderEnabled"
+
+    invoke-static {p1, v0, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-void
+
+    :catch_3
+    move-exception p0
+
+    const-string p1, "ViewCompat"
+
+    const-string v0, "Unable to invoke childrenDrawingOrderEnabled"
+
+    invoke-static {p1, v0, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-void
 .end method
 
 .method public static setClipBounds(Landroid/view/View;Landroid/graphics/Rect;)V
diff --git a/com.discord/smali/androidx/core/view/ViewConfigurationCompat.smali b/com.discord/smali/androidx/core/view/ViewConfigurationCompat.smali
index 9fa717a9d3..b4e7c72ce4 100644
--- a/com.discord/smali/androidx/core/view/ViewConfigurationCompat.smali
+++ b/com.discord/smali/androidx/core/view/ViewConfigurationCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/ViewConfigurationCompat;
 .super Ljava/lang/Object;
+.source "ViewConfigurationCompat.java"
 
 
 # static fields
@@ -69,11 +70,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/core/view/ViewConfigurationCompat;->sGetScaledScrollFactorMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x0
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/androidx/core/view/ViewGroupCompat.smali b/com.discord/smali/androidx/core/view/ViewGroupCompat.smali
index 2fd0e9162b..fae04305af 100644
--- a/com.discord/smali/androidx/core/view/ViewGroupCompat.smali
+++ b/com.discord/smali/androidx/core/view/ViewGroupCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/ViewGroupCompat;
 .super Ljava/lang/Object;
+.source "ViewGroupCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/ViewParentCompat.smali b/com.discord/smali/androidx/core/view/ViewParentCompat.smali
index a030fd97d9..8b5e32aa67 100644
--- a/com.discord/smali/androidx/core/view/ViewParentCompat.smali
+++ b/com.discord/smali/androidx/core/view/ViewParentCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/ViewParentCompat;
 .super Ljava/lang/Object;
+.source "ViewParentCompat.java"
 
 
 # static fields
@@ -42,11 +43,11 @@
     :try_start_0
     invoke-interface {p0, p1, p2, p3, p4}, Landroid/view/ViewParent;->onNestedFling(Landroid/view/View;FFZ)Z
 
-    move-result p1
+    move-result p0
     :try_end_0
     .catch Ljava/lang/AbstractMethodError; {:try_start_0 .. :try_end_0} :catch_0
 
-    return p1
+    return p0
 
     :catch_0
     move-exception p1
@@ -105,11 +106,11 @@
     :try_start_0
     invoke-interface {p0, p1, p2, p3}, Landroid/view/ViewParent;->onNestedPreFling(Landroid/view/View;FF)Z
 
-    move-result p1
+    move-result p0
     :try_end_0
     .catch Ljava/lang/AbstractMethodError; {:try_start_0 .. :try_end_0} :catch_0
 
-    return p1
+    return p0
 
     :catch_0
     move-exception p1
@@ -486,11 +487,11 @@
     :try_start_0
     invoke-interface {p0, p1, p2, p3}, Landroid/view/ViewParent;->onStartNestedScroll(Landroid/view/View;Landroid/view/View;I)Z
 
-    move-result p1
+    move-result p0
     :try_end_0
     .catch Ljava/lang/AbstractMethodError; {:try_start_0 .. :try_end_0} :catch_0
 
-    return p1
+    return p0
 
     :catch_0
     move-exception p1
diff --git a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$1.smali b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$1.smali
index 6a51f5532c..f34b068ce4 100644
--- a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/ViewPropertyAnimatorCompat$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ViewPropertyAnimatorCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$2.smali b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$2.smali
index ab4a1e4510..e0649de87b 100644
--- a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$2.smali
+++ b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/ViewPropertyAnimatorCompat$2;
 .super Ljava/lang/Object;
+.source "ViewPropertyAnimatorCompat.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$ViewPropertyAnimatorListenerApi14.smali b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$ViewPropertyAnimatorListenerApi14.smali
index ed3f57f22a..29f45ceb51 100644
--- a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$ViewPropertyAnimatorListenerApi14.smali
+++ b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat$ViewPropertyAnimatorListenerApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/ViewPropertyAnimatorCompat$ViewPropertyAnimatorListenerApi14;
 .super Ljava/lang/Object;
+.source "ViewPropertyAnimatorCompat.java"
 
 # interfaces
 .implements Landroidx/core/view/ViewPropertyAnimatorListener;
diff --git a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat.smali b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat.smali
index aa7650cf2c..ec7636f4b3 100644
--- a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat.smali
+++ b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/ViewPropertyAnimatorCompat;
 .super Ljava/lang/Object;
+.source "ViewPropertyAnimatorCompat.java"
 
 
 # annotations
@@ -549,10 +550,9 @@
 
     if-lt v1, v2, :cond_0
 
-    :goto_0
     invoke-direct {p0, v0, p1}, Landroidx/core/view/ViewPropertyAnimatorCompat;->setListenerInternal(Landroid/view/View;Landroidx/core/view/ViewPropertyAnimatorListener;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/high16 v1, 0x7e000000
@@ -563,10 +563,10 @@
 
     invoke-direct {p1, p0}, Landroidx/core/view/ViewPropertyAnimatorCompat$ViewPropertyAnimatorListenerApi14;-><init>(Landroidx/core/view/ViewPropertyAnimatorCompat;)V
 
-    goto :goto_0
+    invoke-direct {p0, v0, p1}, Landroidx/core/view/ViewPropertyAnimatorCompat;->setListenerInternal(Landroid/view/View;Landroidx/core/view/ViewPropertyAnimatorListener;)V
 
     :cond_1
-    :goto_1
+    :goto_0
     return-object p0
 .end method
 
diff --git a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListener.smali b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListener.smali
index 423ca26893..5cd508ed00 100644
--- a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListener.smali
+++ b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/ViewPropertyAnimatorListener;
 .super Ljava/lang/Object;
+.source "ViewPropertyAnimatorListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListenerAdapter.smali b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListenerAdapter.smali
index b48da02d4d..e8d0929e8c 100644
--- a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListenerAdapter.smali
+++ b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorListenerAdapter.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/ViewPropertyAnimatorListenerAdapter;
 .super Ljava/lang/Object;
+.source "ViewPropertyAnimatorListenerAdapter.java"
 
 # interfaces
 .implements Landroidx/core/view/ViewPropertyAnimatorListener;
diff --git a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorUpdateListener.smali b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorUpdateListener.smali
index ce3afd43a7..36839f8f9a 100644
--- a/com.discord/smali/androidx/core/view/ViewPropertyAnimatorUpdateListener.smali
+++ b/com.discord/smali/androidx/core/view/ViewPropertyAnimatorUpdateListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/ViewPropertyAnimatorUpdateListener;
 .super Ljava/lang/Object;
+.source "ViewPropertyAnimatorUpdateListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/view/WindowCompat.smali b/com.discord/smali/androidx/core/view/WindowCompat.smali
index baad611053..0e4f29c662 100644
--- a/com.discord/smali/androidx/core/view/WindowCompat.smali
+++ b/com.discord/smali/androidx/core/view/WindowCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/WindowCompat;
 .super Ljava/lang/Object;
+.source "WindowCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali b/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali
index b52ff82fae..9fa953765a 100644
--- a/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali
+++ b/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/WindowInsetsCompat;
 .super Ljava/lang/Object;
+.source "WindowInsetsCompat.java"
 
 
 # instance fields
@@ -216,11 +217,9 @@
     return v1
 
     :cond_3
-    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
-
     iget-object p1, p1, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
 
-    invoke-virtual {v0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -549,8 +548,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityEventCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityEventCompat.smali
index 1be06febf3..3f62fb15d7 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityEventCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityEventCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/accessibility/AccessibilityEventCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityEventCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener.smali
index d977728502..5f0e79a008 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener;
 .super Ljava/lang/Object;
+.source "AccessibilityManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerCompat.smali
index 8df9406ffa..fbf5e45c10 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerCompat.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityManagerCompat.java"
 
 # interfaces
 .implements Landroidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener;
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali
index be65fa73e2..ced7d303ae 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper;
 .super Ljava/lang/Object;
+.source "AccessibilityManagerCompat.java"
 
 # interfaces
 .implements Landroid/view/accessibility/AccessibilityManager$AccessibilityStateChangeListener;
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener.smali
index 7fbc832d7e..f2e0c866e1 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener;
 .super Ljava/lang/Object;
+.source "AccessibilityManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali
index 03e40efefe..c9a1b80543 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper;
 .super Ljava/lang/Object;
+.source "AccessibilityManagerCompat.java"
 
 # interfaces
 .implements Landroid/view/accessibility/AccessibilityManager$TouchExplorationStateChangeListener;
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat.smali
index dc83b60200..e1958b4e24 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityManagerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/accessibility/AccessibilityManagerCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityManagerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali
index 1018d8e798..ad9794f9d1 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityNodeInfoCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat.smali
index e70c117382..fe31cb9ad1 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityNodeInfoCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali
index f5b67c609f..7f98de292d 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityNodeInfoCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$RangeInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$RangeInfoCompat.smali
index a8d97f5f13..a1753ba762 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$RangeInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$RangeInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$RangeInfoCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityNodeInfoCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali
index a2c2f8f08b..fc86ad7879 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityNodeInfoCompat.java"
 
 
 # annotations
@@ -575,8 +576,6 @@
     return v1
 
     :cond_3
-    iget-object v2, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
-
     iget-object p1, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
     invoke-virtual {v2, p1}, Landroid/view/accessibility/AccessibilityNodeInfo;->equals(Ljava/lang/Object;)Z
@@ -1612,8 +1611,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
-
     invoke-virtual {v0}, Landroid/view/accessibility/AccessibilityNodeInfo;->hashCode()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali
index 7ef0c44674..24419ebb12 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16;
 .super Landroid/view/accessibility/AccessibilityNodeProvider;
+.source "AccessibilityNodeProviderCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali
index c007cdf96e..080f21911d 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19;
 .super Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16;
+.source "AccessibilityNodeProviderCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.smali
index ada6b9d1f1..54454c23a1 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityNodeProviderCompat.java"
 
 
 # annotations
@@ -35,7 +36,6 @@
 
     invoke-direct {v0, p0}, Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19;-><init>(Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;)V
 
-    :goto_0
     iput-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;->mProvider:Ljava/lang/Object;
 
     return-void
@@ -51,12 +51,16 @@
 
     invoke-direct {v0, p0}, Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16;-><init>(Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;->mProvider:Ljava/lang/Object;
+
+    return-void
 
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;->mProvider:Ljava/lang/Object;
+
+    return-void
 .end method
 
 .method public constructor <init>(Ljava/lang/Object;)V
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityRecordCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityRecordCompat.smali
index 019123b7b8..0fc05bfdad 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityRecordCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityRecordCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityRecordCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityRecordCompat.java"
 
 
 # instance fields
@@ -193,8 +194,6 @@
     return v1
 
     :cond_3
-    iget-object v2, p0, Landroidx/core/view/accessibility/AccessibilityRecordCompat;->mRecord:Landroid/view/accessibility/AccessibilityRecord;
-
     iget-object p1, p1, Landroidx/core/view/accessibility/AccessibilityRecordCompat;->mRecord:Landroid/view/accessibility/AccessibilityRecord;
 
     invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
@@ -484,8 +483,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityRecordCompat;->mRecord:Landroid/view/accessibility/AccessibilityRecord;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityWindowInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityWindowInfoCompat.smali
index 3c6ddfc879..fe82cdbc85 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityWindowInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityWindowInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/view/accessibility/AccessibilityWindowInfoCompat;
 .super Ljava/lang/Object;
+.source "AccessibilityWindowInfoCompat.java"
 
 
 # static fields
@@ -190,8 +191,6 @@
     return v1
 
     :cond_3
-    iget-object v2, p0, Landroidx/core/view/accessibility/AccessibilityWindowInfoCompat;->mInfo:Ljava/lang/Object;
-
     iget-object p1, p1, Landroidx/core/view/accessibility/AccessibilityWindowInfoCompat;->mInfo:Ljava/lang/Object;
 
     invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
@@ -478,8 +477,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityWindowInfoCompat;->mInfo:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -666,9 +663,9 @@
 
     move-result-object v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eqz v1, :cond_0
 
@@ -692,9 +689,12 @@
 
     if-lez v1, :cond_1
 
-    const/4 v2, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
     const/16 v1, 0x5d
diff --git a/com.discord/smali/androidx/core/view/animation/PathInterpolatorApi14.smali b/com.discord/smali/androidx/core/view/animation/PathInterpolatorApi14.smali
index a82a70a45b..5c66825ef9 100644
--- a/com.discord/smali/androidx/core/view/animation/PathInterpolatorApi14.smali
+++ b/com.discord/smali/androidx/core/view/animation/PathInterpolatorApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/view/animation/PathInterpolatorApi14;
 .super Ljava/lang/Object;
+.source "PathInterpolatorApi14.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
@@ -226,15 +227,13 @@
     :cond_3
     iget-object v3, p0, Landroidx/core/view/animation/PathInterpolatorApi14;->mX:[F
 
-    aget v3, v3, v2
+    aget v4, v3, v2
 
-    iget-object v4, p0, Landroidx/core/view/animation/PathInterpolatorApi14;->mX:[F
+    aget v5, v3, v1
 
-    aget v4, v4, v1
+    sub-float/2addr v4, v5
 
-    sub-float/2addr v3, v4
-
-    cmpl-float v0, v3, v0
+    cmpl-float v0, v4, v0
 
     if-nez v0, :cond_4
 
@@ -245,27 +244,23 @@
     return p1
 
     :cond_4
-    iget-object v0, p0, Landroidx/core/view/animation/PathInterpolatorApi14;->mX:[F
-
-    aget v0, v0, v1
+    aget v0, v3, v1
 
     sub-float/2addr p1, v0
 
-    div-float/2addr p1, v3
+    div-float/2addr p1, v4
 
     iget-object v0, p0, Landroidx/core/view/animation/PathInterpolatorApi14;->mY:[F
 
-    aget v0, v0, v1
+    aget v1, v0, v1
 
-    iget-object v1, p0, Landroidx/core/view/animation/PathInterpolatorApi14;->mY:[F
+    aget v0, v0, v2
 
-    aget v1, v1, v2
+    sub-float/2addr v0, v1
 
-    sub-float/2addr v1, v0
+    mul-float p1, p1, v0
 
-    mul-float p1, p1, v1
+    add-float/2addr v1, p1
 
-    add-float/2addr v0, p1
-
-    return v0
+    return v1
 .end method
diff --git a/com.discord/smali/androidx/core/view/animation/PathInterpolatorCompat.smali b/com.discord/smali/androidx/core/view/animation/PathInterpolatorCompat.smali
index 0fbc5beb2d..152971f2ce 100644
--- a/com.discord/smali/androidx/core/view/animation/PathInterpolatorCompat.smali
+++ b/com.discord/smali/androidx/core/view/animation/PathInterpolatorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/animation/PathInterpolatorCompat;
 .super Ljava/lang/Object;
+.source "PathInterpolatorCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/view/inputmethod/EditorInfoCompat.smali b/com.discord/smali/androidx/core/view/inputmethod/EditorInfoCompat.smali
index f727546858..dff0c7794f 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/EditorInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/EditorInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/inputmethod/EditorInfoCompat;
 .super Ljava/lang/Object;
+.source "EditorInfoCompat.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$1.smali b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$1.smali
index 1a41492b84..ec6680cfb4 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$1.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/view/inputmethod/InputConnectionCompat$1;
 .super Landroid/view/inputmethod/InputConnectionWrapper;
+.source "InputConnectionCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$2.smali b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$2.smali
index 2ac1aa3db7..ccd93c499c 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$2.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/view/inputmethod/InputConnectionCompat$2;
 .super Landroid/view/inputmethod/InputConnectionWrapper;
+.source "InputConnectionCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener.smali b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener.smali
index a19436e3a6..50beaae306 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;
 .super Ljava/lang/Object;
+.source "InputConnectionCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat.smali b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat.smali
index a3e8e67a26..3aad16082f 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputConnectionCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/inputmethod/InputConnectionCompat;
 .super Ljava/lang/Object;
+.source "InputConnectionCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali
index f81fa1d29a..a201b611c2 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl;
 .super Ljava/lang/Object;
+.source "InputContentInfoCompat.java"
 
 # interfaces
 .implements Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl;
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali
index 30a77d408d..5e046cb674 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl;
 .super Ljava/lang/Object;
+.source "InputContentInfoCompat.java"
 
 # interfaces
 .implements Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl;
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali
index fb233d7145..068152cb7a 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl;
 .super Ljava/lang/Object;
+.source "InputContentInfoCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat.smali b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat.smali
index 09557e0139..edd5af9949 100644
--- a/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/inputmethod/InputContentInfoCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/view/inputmethod/InputContentInfoCompat;
 .super Ljava/lang/Object;
+.source "InputContentInfoCompat.java"
 
 
 # annotations
@@ -44,7 +45,6 @@
 
     invoke-direct {v0, p1, p2, p3}, Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl;-><init>(Landroid/net/Uri;Landroid/content/ClipDescription;Landroid/net/Uri;)V
 
-    :goto_0
     iput-object v0, p0, Landroidx/core/view/inputmethod/InputContentInfoCompat;->mImpl:Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl;
 
     return-void
@@ -54,7 +54,9 @@
 
     invoke-direct {v0, p1, p2, p3}, Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl;-><init>(Landroid/net/Uri;Landroid/content/ClipDescription;Landroid/net/Uri;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/core/view/inputmethod/InputContentInfoCompat;->mImpl:Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl;
+
+    return-void
 .end method
 
 .method private constructor <init>(Landroidx/core/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl;)V
diff --git a/com.discord/smali/androidx/core/widget/AutoScrollHelper$ClampedScroller.smali b/com.discord/smali/androidx/core/widget/AutoScrollHelper$ClampedScroller.smali
index daa68219c6..88cbfda3fe 100644
--- a/com.discord/smali/androidx/core/widget/AutoScrollHelper$ClampedScroller.smali
+++ b/com.discord/smali/androidx/core/widget/AutoScrollHelper$ClampedScroller.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/widget/AutoScrollHelper$ClampedScroller;
 .super Ljava/lang/Object;
+.source "AutoScrollHelper.java"
 
 
 # annotations
@@ -88,8 +89,6 @@
 
     if-ltz v6, :cond_2
 
-    iget-wide v0, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mStopTime:J
-
     cmp-long v3, p1, v0
 
     if-gez v3, :cond_1
@@ -97,15 +96,11 @@
     goto :goto_0
 
     :cond_1
-    iget-wide v0, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mStopTime:J
-
     sub-long/2addr p1, v0
 
     iget v0, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mStopValue:F
 
-    sub-float v0, v5, v0
-
-    iget v1, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mStopValue:F
+    sub-float v1, v5, v0
 
     long-to-float p1, p1
 
@@ -119,11 +114,11 @@
 
     move-result p1
 
-    mul-float v1, v1, p1
+    mul-float v0, v0, p1
 
-    add-float/2addr v0, v1
+    add-float/2addr v1, v0
 
-    return v0
+    return v1
 
     :cond_2
     :goto_0
@@ -252,9 +247,7 @@
 
     iget v0, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mTargetVelocityX:F
 
-    iget v1, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mTargetVelocityX:F
-
-    invoke-static {v1}, Ljava/lang/Math;->abs(F)F
+    invoke-static {v0}, Ljava/lang/Math;->abs(F)F
 
     move-result v1
 
@@ -270,9 +263,7 @@
 
     iget v0, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mTargetVelocityY:F
 
-    iget v1, p0, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->mTargetVelocityY:F
-
-    invoke-static {v1}, Ljava/lang/Math;->abs(F)F
+    invoke-static {v0}, Ljava/lang/Math;->abs(F)F
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/core/widget/AutoScrollHelper$ScrollAnimationRunnable.smali b/com.discord/smali/androidx/core/widget/AutoScrollHelper$ScrollAnimationRunnable.smali
index b65e87bb78..843c1ba4d6 100644
--- a/com.discord/smali/androidx/core/widget/AutoScrollHelper$ScrollAnimationRunnable.smali
+++ b/com.discord/smali/androidx/core/widget/AutoScrollHelper$ScrollAnimationRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/widget/AutoScrollHelper$ScrollAnimationRunnable;
 .super Ljava/lang/Object;
+.source "AutoScrollHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -57,8 +58,6 @@
 
     iput-boolean v1, v0, Landroidx/core/widget/AutoScrollHelper;->mNeedsReset:Z
 
-    iget-object v0, p0, Landroidx/core/widget/AutoScrollHelper$ScrollAnimationRunnable;->this$0:Landroidx/core/widget/AutoScrollHelper;
-
     iget-object v0, v0, Landroidx/core/widget/AutoScrollHelper;->mScroller:Landroidx/core/widget/AutoScrollHelper$ClampedScroller;
 
     invoke-virtual {v0}, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->start()V
@@ -95,9 +94,7 @@
 
     iput-boolean v1, v2, Landroidx/core/widget/AutoScrollHelper;->mNeedsCancel:Z
 
-    iget-object v1, p0, Landroidx/core/widget/AutoScrollHelper$ScrollAnimationRunnable;->this$0:Landroidx/core/widget/AutoScrollHelper;
-
-    invoke-virtual {v1}, Landroidx/core/widget/AutoScrollHelper;->cancelTargetTouch()V
+    invoke-virtual {v2}, Landroidx/core/widget/AutoScrollHelper;->cancelTargetTouch()V
 
     :cond_3
     invoke-virtual {v0}, Landroidx/core/widget/AutoScrollHelper$ClampedScroller;->computeScrollDelta()V
diff --git a/com.discord/smali/androidx/core/widget/AutoScrollHelper.smali b/com.discord/smali/androidx/core/widget/AutoScrollHelper.smali
index c3a0b25564..68dfbdb835 100644
--- a/com.discord/smali/androidx/core/widget/AutoScrollHelper.smali
+++ b/com.discord/smali/androidx/core/widget/AutoScrollHelper.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/core/widget/AutoScrollHelper;
 .super Ljava/lang/Object;
+.source "AutoScrollHelper.java"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
@@ -352,7 +353,7 @@
 .end method
 
 .method private constrainEdgeValue(FF)F
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x0
 
@@ -381,34 +382,32 @@
     return p1
 
     :pswitch_1
-    cmpg-float v1, p1, p2
+    cmpg-float v2, p1, p2
 
-    if-gez v1, :cond_2
+    if-gez v2, :cond_2
 
-    const/high16 v1, 0x3f800000    # 1.0f
+    const/high16 v2, 0x3f800000    # 1.0f
 
-    cmpl-float v2, p1, v0
+    cmpl-float v3, p1, v0
 
-    if-ltz v2, :cond_1
+    if-ltz v3, :cond_1
 
     div-float/2addr p1, p2
 
-    sub-float/2addr v1, p1
+    sub-float/2addr v2, p1
 
-    return v1
+    return v2
 
     :cond_1
     iget-boolean p1, p0, Landroidx/core/widget/AutoScrollHelper;->mAnimating:Z
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Landroidx/core/widget/AutoScrollHelper;->mEdgeType:I
+    const/4 p1, 0x1
 
-    const/4 p2, 0x1
+    if-ne v1, p1, :cond_2
 
-    if-ne p1, p2, :cond_2
-
-    return v1
+    return v2
 
     :cond_2
     :goto_0
@@ -511,7 +510,7 @@
 .end method
 
 .method private startAnimating()V
-    .locals 5
+    .locals 6
 
     iget-object v0, p0, Landroidx/core/widget/AutoScrollHelper;->mRunnable:Ljava/lang/Runnable;
 
@@ -538,15 +537,13 @@
 
     if-lez v1, :cond_1
 
-    iget-object v1, p0, Landroidx/core/widget/AutoScrollHelper;->mTarget:Landroid/view/View;
+    iget-object v2, p0, Landroidx/core/widget/AutoScrollHelper;->mTarget:Landroid/view/View;
 
-    iget-object v2, p0, Landroidx/core/widget/AutoScrollHelper;->mRunnable:Ljava/lang/Runnable;
+    iget-object v3, p0, Landroidx/core/widget/AutoScrollHelper;->mRunnable:Ljava/lang/Runnable;
 
-    iget v3, p0, Landroidx/core/widget/AutoScrollHelper;->mActivationDelay:I
+    int-to-long v4, v1
 
-    int-to-long v3, v3
-
-    invoke-static {v1, v2, v3, v4}, Landroidx/core/view/ViewCompat;->postOnAnimationDelayed(Landroid/view/View;Ljava/lang/Runnable;J)V
+    invoke-static {v2, v3, v4, v5}, Landroidx/core/view/ViewCompat;->postOnAnimationDelayed(Landroid/view/View;Ljava/lang/Runnable;J)V
 
     goto :goto_0
 
@@ -793,11 +790,9 @@
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Landroidx/core/widget/AutoScrollHelper;->mMaximumEdges:[F
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    aput p2, p1, v0
+    aput p2, v0, p1
 
     return-object p0
 .end method
@@ -817,13 +812,11 @@
 
     aput p1, v0, v2
 
-    iget-object p1, p0, Landroidx/core/widget/AutoScrollHelper;->mMaximumVelocity:[F
-
     div-float/2addr p2, v1
 
-    const/4 v0, 0x1
+    const/4 p1, 0x1
 
-    aput p2, p1, v0
+    aput p2, v0, p1
 
     return-object p0
 .end method
@@ -843,13 +836,11 @@
 
     aput p1, v0, v2
 
-    iget-object p1, p0, Landroidx/core/widget/AutoScrollHelper;->mMinimumVelocity:[F
-
     div-float/2addr p2, v1
 
-    const/4 v0, 0x1
+    const/4 p1, 0x1
 
-    aput p2, p1, v0
+    aput p2, v0, p1
 
     return-object p0
 .end method
@@ -889,11 +880,9 @@
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Landroidx/core/widget/AutoScrollHelper;->mRelativeEdges:[F
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
-
-    aput p2, p1, v0
+    aput p2, v0, p1
 
     return-object p0
 .end method
@@ -913,13 +902,11 @@
 
     aput p1, v0, v2
 
-    iget-object p1, p0, Landroidx/core/widget/AutoScrollHelper;->mRelativeVelocity:[F
-
     div-float/2addr p2, v1
 
-    const/4 v0, 0x1
+    const/4 p1, 0x1
 
-    aput p2, p1, v0
+    aput p2, v0, p1
 
     return-object p0
 .end method
diff --git a/com.discord/smali/androidx/core/widget/AutoSizeableTextView.smali b/com.discord/smali/androidx/core/widget/AutoSizeableTextView.smali
index 7e6529e6d3..6929a93cef 100644
--- a/com.discord/smali/androidx/core/widget/AutoSizeableTextView.smali
+++ b/com.discord/smali/androidx/core/widget/AutoSizeableTextView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/widget/AutoSizeableTextView;
 .super Ljava/lang/Object;
+.source "AutoSizeableTextView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/widget/CompoundButtonCompat.smali b/com.discord/smali/androidx/core/widget/CompoundButtonCompat.smali
index 2ca6aaf8b3..0424f3846f 100644
--- a/com.discord/smali/androidx/core/widget/CompoundButtonCompat.smali
+++ b/com.discord/smali/androidx/core/widget/CompoundButtonCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/CompoundButtonCompat;
 .super Ljava/lang/Object;
+.source "CompoundButtonCompat.java"
 
 
 # static fields
@@ -84,8 +85,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/widget/CompoundButtonCompat;->sButtonDrawableField:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
diff --git a/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$1.smali b/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$1.smali
index b43f9531b0..ab6cb2e430 100644
--- a/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$1.smali
+++ b/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/widget/ContentLoadingProgressBar$1;
 .super Ljava/lang/Object;
+.source "ContentLoadingProgressBar.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -42,14 +43,10 @@
 
     iput-boolean v1, v0, Landroidx/core/widget/ContentLoadingProgressBar;->mPostedHide:Z
 
-    iget-object v0, p0, Landroidx/core/widget/ContentLoadingProgressBar$1;->this$0:Landroidx/core/widget/ContentLoadingProgressBar;
-
     const-wide/16 v1, -0x1
 
     iput-wide v1, v0, Landroidx/core/widget/ContentLoadingProgressBar;->mStartTime:J
 
-    iget-object v0, p0, Landroidx/core/widget/ContentLoadingProgressBar$1;->this$0:Landroidx/core/widget/ContentLoadingProgressBar;
-
     const/16 v1, 0x8
 
     invoke-virtual {v0, v1}, Landroidx/core/widget/ContentLoadingProgressBar;->setVisibility(I)V
diff --git a/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$2.smali b/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$2.smali
index b42cd0d39e..75e4c20931 100644
--- a/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$2.smali
+++ b/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/widget/ContentLoadingProgressBar$2;
 .super Ljava/lang/Object;
+.source "ContentLoadingProgressBar.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -42,8 +43,6 @@
 
     iput-boolean v1, v0, Landroidx/core/widget/ContentLoadingProgressBar;->mPostedShow:Z
 
-    iget-object v0, p0, Landroidx/core/widget/ContentLoadingProgressBar$2;->this$0:Landroidx/core/widget/ContentLoadingProgressBar;
-
     iget-boolean v0, v0, Landroidx/core/widget/ContentLoadingProgressBar;->mDismissed:Z
 
     if-nez v0, :cond_0
diff --git a/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar.smali b/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar.smali
index 89af9a154f..6df261ed13 100644
--- a/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar.smali
+++ b/com.discord/smali/androidx/core/widget/ContentLoadingProgressBar.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/widget/ContentLoadingProgressBar;
 .super Landroid/widget/ProgressBar;
+.source "ContentLoadingProgressBar.java"
 
 
 # static fields
@@ -117,8 +118,6 @@
 
     iget-wide v3, p0, Landroidx/core/widget/ContentLoadingProgressBar;->mStartTime:J
 
-    const/4 v5, 0x0
-
     sub-long/2addr v1, v3
 
     const-wide/16 v3, 0x1f4
@@ -144,8 +143,6 @@
 
     iget-object v5, p0, Landroidx/core/widget/ContentLoadingProgressBar;->mDelayedHide:Ljava/lang/Runnable;
 
-    const/4 v6, 0x0
-
     sub-long/2addr v3, v1
 
     invoke-virtual {p0, v5, v3, v4}, Landroidx/core/widget/ContentLoadingProgressBar;->postDelayed(Ljava/lang/Runnable;J)Z
diff --git a/com.discord/smali/androidx/core/widget/EdgeEffectCompat.smali b/com.discord/smali/androidx/core/widget/EdgeEffectCompat.smali
index 2a21cd4c13..cad91ecc23 100644
--- a/com.discord/smali/androidx/core/widget/EdgeEffectCompat.smali
+++ b/com.discord/smali/androidx/core/widget/EdgeEffectCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/EdgeEffectCompat;
 .super Ljava/lang/Object;
+.source "EdgeEffectCompat.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/core/widget/ImageViewCompat.smali b/com.discord/smali/androidx/core/widget/ImageViewCompat.smali
index 277525f855..7533528451 100644
--- a/com.discord/smali/androidx/core/widget/ImageViewCompat.smali
+++ b/com.discord/smali/androidx/core/widget/ImageViewCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/widget/ImageViewCompat;
 .super Ljava/lang/Object;
+.source "ImageViewCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/widget/ListPopupWindowCompat.smali b/com.discord/smali/androidx/core/widget/ListPopupWindowCompat.smali
index e5f9c20a2e..55bf9da910 100644
--- a/com.discord/smali/androidx/core/widget/ListPopupWindowCompat.smali
+++ b/com.discord/smali/androidx/core/widget/ListPopupWindowCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/ListPopupWindowCompat;
 .super Ljava/lang/Object;
+.source "ListPopupWindowCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/widget/ListViewAutoScrollHelper.smali b/com.discord/smali/androidx/core/widget/ListViewAutoScrollHelper.smali
index f78048cd07..6d630e2484 100644
--- a/com.discord/smali/androidx/core/widget/ListViewAutoScrollHelper.smali
+++ b/com.discord/smali/androidx/core/widget/ListViewAutoScrollHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/widget/ListViewAutoScrollHelper;
 .super Landroidx/core/widget/AutoScrollHelper;
+.source "ListViewAutoScrollHelper.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/core/widget/ListViewCompat.smali b/com.discord/smali/androidx/core/widget/ListViewCompat.smali
index b828fb8548..59e4c4661b 100644
--- a/com.discord/smali/androidx/core/widget/ListViewCompat.smali
+++ b/com.discord/smali/androidx/core/widget/ListViewCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/ListViewCompat;
 .super Ljava/lang/Object;
+.source "ListViewCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali b/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali
index e12e0903d3..b8925a56e9 100644
--- a/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/widget/NestedScrollView$AccessibilityDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "NestedScrollView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/widget/NestedScrollView$OnScrollChangeListener.smali b/com.discord/smali/androidx/core/widget/NestedScrollView$OnScrollChangeListener.smali
index b9da6b16fa..cd5a4c5996 100644
--- a/com.discord/smali/androidx/core/widget/NestedScrollView$OnScrollChangeListener.smali
+++ b/com.discord/smali/androidx/core/widget/NestedScrollView$OnScrollChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/widget/NestedScrollView$OnScrollChangeListener;
 .super Ljava/lang/Object;
+.source "NestedScrollView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState$1.smali b/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState$1.smali
index bdc5f1a27c..0ac7c2aeac 100644
--- a/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState$1.smali
+++ b/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/core/widget/NestedScrollView$SavedState$1;
 .super Ljava/lang/Object;
+.source "NestedScrollView.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState.smali b/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState.smali
index 871052b09d..cf80116407 100644
--- a/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState.smali
+++ b/com.discord/smali/androidx/core/widget/NestedScrollView$SavedState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/widget/NestedScrollView$SavedState;
 .super Landroid/view/View$BaseSavedState;
+.source "NestedScrollView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/widget/NestedScrollView.smali b/com.discord/smali/androidx/core/widget/NestedScrollView.smali
index b8f6b1d481..0228d624df 100644
--- a/com.discord/smali/androidx/core/widget/NestedScrollView.smali
+++ b/com.discord/smali/androidx/core/widget/NestedScrollView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/core/widget/NestedScrollView;
 .super Landroid/widget/FrameLayout;
+.source "NestedScrollView.java"
 
 # interfaces
 .implements Landroidx/core/view/NestedScrollingChild2;
@@ -237,7 +238,7 @@
 
     const/4 v1, 0x0
 
-    if-lez v0, :cond_0
+    if-lez v0, :cond_1
 
     invoke-virtual {p0, v1}, Landroidx/core/widget/NestedScrollView;->getChildAt(I)Landroid/view/View;
 
@@ -285,6 +286,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method private static clamp(III)I
@@ -352,8 +356,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mEdgeGlowTop:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->onRelease()V
 
     iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeEffect;
@@ -658,7 +660,7 @@
 
     const/4 v1, 0x0
 
-    if-lez v0, :cond_0
+    if-lez v0, :cond_1
 
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollY()I
 
@@ -702,6 +704,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method private initOrResetVelocityTracker()V
@@ -720,8 +725,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->clear()V
 
     return-void
@@ -945,8 +948,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/core/widget/NestedScrollView;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {p1}, Landroid/view/VelocityTracker;->clear()V
 
     :cond_1
@@ -960,8 +961,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->recycle()V
 
     const/4 v0, 0x0
@@ -1474,9 +1473,14 @@
 
     sub-int/2addr v6, v0
 
+    move v14, v6
+
+    goto :goto_0
+
     :cond_0
     move v14, v6
 
+    :goto_0
     if-eqz v14, :cond_4
 
     invoke-virtual/range {p0 .. p0}, Landroidx/core/widget/NestedScrollView;->getScrollRange()I
@@ -1547,18 +1551,18 @@
 
     if-lez v15, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     const/16 v17, 0x0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
-    :goto_0
+    :goto_1
     const/16 v17, 0x1
 
-    :goto_1
+    :goto_2
     if-eqz v17, :cond_4
 
     invoke-direct/range {p0 .. p0}, Landroidx/core/widget/NestedScrollView;->ensureGlows()V
@@ -1569,7 +1573,6 @@
 
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mEdgeGlowTop:Landroid/widget/EdgeEffect;
 
-    :goto_2
     iget-object v1, v10, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
 
     invoke-virtual {v1}, Landroid/widget/OverScroller;->getCurrVelocity()F
@@ -1589,7 +1592,15 @@
 
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeEffect;
 
-    goto :goto_2
+    iget-object v1, v10, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
+
+    invoke-virtual {v1}, Landroid/widget/OverScroller;->getCurrVelocity()F
+
+    move-result v1
+
+    float-to-int v1, v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/EdgeEffect;->onAbsorb(I)V
 
     :cond_4
     :goto_3
@@ -1608,9 +1619,14 @@
 
     invoke-virtual {v10, v12}, Landroidx/core/widget/NestedScrollView;->stopNestedScroll(I)V
 
+    const/4 v0, 0x0
+
+    goto :goto_4
+
     :cond_6
     const/4 v0, 0x0
 
+    :goto_4
     iput v0, v10, Landroidx/core/widget/NestedScrollView;->mLastScrollerY:I
 
     return-void
@@ -1703,19 +1719,18 @@
 
     sub-int/2addr p1, v2
 
-    :goto_1
     add-int/2addr p1, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget p1, p1, Landroid/graphics/Rect;->bottom:I
 
     sub-int/2addr p1, v4
 
-    goto :goto_1
+    add-int/2addr p1, v1
 
-    :goto_2
+    :goto_1
     invoke-virtual {v5}, Landroid/view/View;->getBottom()I
 
     move-result v0
@@ -1730,7 +1745,7 @@
 
     move-result v1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     iget v3, p1, Landroid/graphics/Rect;->top:I
@@ -1753,7 +1768,7 @@
 
     sub-int/2addr v1, v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     iget p1, p1, Landroid/graphics/Rect;->top:I
@@ -1762,7 +1777,7 @@
 
     sub-int/2addr v1, v2
 
-    :goto_3
+    :goto_2
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollY()I
 
     move-result p1
@@ -1774,7 +1789,7 @@
     move-result v1
 
     :cond_6
-    :goto_4
+    :goto_3
     return v1
 .end method
 
@@ -2317,13 +2332,13 @@
 
     const/16 v2, 0x82
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_3
 
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->isFocused()Z
 
     move-result v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getKeyCode()I
 
@@ -2331,7 +2346,7 @@
 
     const/4 v0, 0x4
 
-    if-eq p1, v0, :cond_1
+    if-eq p1, v0, :cond_2
 
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->findFocus()Landroid/view/View;
 
@@ -2368,11 +2383,14 @@
     return v1
 
     :cond_2
+    return v1
+
+    :cond_3
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getAction()I
 
     move-result v0
 
-    if-nez v0, :cond_7
+    if-nez v0, :cond_8
 
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getKeyCode()I
 
@@ -2382,7 +2400,7 @@
 
     const/16 v4, 0x21
 
-    if-eq v0, v3, :cond_5
+    if-eq v0, v3, :cond_6
 
     packed-switch v0, :pswitch_data_0
 
@@ -2393,7 +2411,7 @@
 
     move-result p1
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_4
 
     invoke-virtual {p0, v2}, Landroidx/core/widget/NestedScrollView;->arrowScroll(I)Z
 
@@ -2401,7 +2419,7 @@
 
     goto :goto_0
 
-    :cond_3
+    :cond_4
     invoke-virtual {p0, v2}, Landroidx/core/widget/NestedScrollView;->fullScroll(I)Z
 
     move-result v1
@@ -2413,7 +2431,7 @@
 
     move-result p1
 
-    if-nez p1, :cond_4
+    if-nez p1, :cond_5
 
     invoke-virtual {p0, v4}, Landroidx/core/widget/NestedScrollView;->arrowScroll(I)Z
 
@@ -2421,31 +2439,29 @@
 
     goto :goto_0
 
-    :cond_4
+    :cond_5
     invoke-virtual {p0, v4}, Landroidx/core/widget/NestedScrollView;->fullScroll(I)Z
 
     move-result v1
 
     goto :goto_0
 
-    :cond_5
+    :cond_6
     invoke-virtual {p1}, Landroid/view/KeyEvent;->isShiftPressed()Z
 
     move-result p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     const/16 v2, 0x21
 
-    :cond_6
+    :cond_7
     invoke-virtual {p0, v2}, Landroidx/core/widget/NestedScrollView;->pageScroll(I)Z
 
-    :cond_7
+    :cond_8
     :goto_0
     return v1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x13
         :pswitch_1
@@ -2511,9 +2527,9 @@
 .method public fullScroll(I)Z
     .locals 5
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     const/16 v2, 0x82
 
@@ -2533,23 +2549,21 @@
 
     iget-object v4, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
 
-    iput v0, v4, Landroid/graphics/Rect;->top:I
+    iput v1, v4, Landroid/graphics/Rect;->top:I
 
-    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
-
-    iput v3, v0, Landroid/graphics/Rect;->bottom:I
+    iput v3, v4, Landroid/graphics/Rect;->bottom:I
 
     if-eqz v2, :cond_1
 
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getChildCount()I
 
-    move-result v0
+    move-result v1
 
-    if-lez v0, :cond_1
+    if-lez v1, :cond_1
 
-    sub-int/2addr v0, v1
+    sub-int/2addr v1, v0
 
-    invoke-virtual {p0, v0}, Landroidx/core/widget/NestedScrollView;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {p0, v1}, Landroidx/core/widget/NestedScrollView;->getChildAt(I)Landroid/view/View;
 
     move-result-object v0
 
@@ -2579,9 +2593,7 @@
 
     iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
 
-    iget-object v1, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
-
-    iget v1, v1, Landroid/graphics/Rect;->bottom:I
+    iget v1, v0, Landroid/graphics/Rect;->bottom:I
 
     sub-int/2addr v1, v3
 
@@ -3285,8 +3297,6 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Landroidx/core/widget/NestedScrollView;->mChildToScrollTo:Landroid/view/View;
-
     invoke-static {p2, p0}, Landroidx/core/widget/NestedScrollView;->isViewDescendantOf(Landroid/view/View;Landroid/view/View;)Z
 
     move-result p2
@@ -3793,7 +3803,7 @@
 .end method
 
 .method protected onScrollChanged(IIII)V
-    .locals 7
+    .locals 6
 
     invoke-super {p0, p1, p2, p3, p4}, Landroid/widget/FrameLayout;->onScrollChanged(IIII)V
 
@@ -3801,19 +3811,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Landroidx/core/widget/NestedScrollView;->mOnScrollChangeListener:Landroidx/core/widget/NestedScrollView$OnScrollChangeListener;
+    move-object v1, p0
 
-    move-object v2, p0
+    move v2, p1
 
-    move v3, p1
+    move v3, p2
 
-    move v4, p2
+    move v4, p3
 
-    move v5, p3
+    move v5, p4
 
-    move v6, p4
-
-    invoke-interface/range {v1 .. v6}, Landroidx/core/widget/NestedScrollView$OnScrollChangeListener;->onScrollChange(Landroidx/core/widget/NestedScrollView;IIII)V
+    invoke-interface/range {v0 .. v5}, Landroidx/core/widget/NestedScrollView$OnScrollChangeListener;->onScrollChange(Landroidx/core/widget/NestedScrollView;IIII)V
 
     :cond_0
     return-void
@@ -3828,7 +3836,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_2
 
     if-ne p0, p1, :cond_0
 
@@ -3860,6 +3868,9 @@
     invoke-direct {p0, p1}, Landroidx/core/widget/NestedScrollView;->doScrollY(I)V
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_0
     return-void
 .end method
@@ -3966,7 +3977,7 @@
     packed-switch v0, :pswitch_data_0
 
     :pswitch_0
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :pswitch_1
     invoke-direct/range {p0 .. p1}, Landroidx/core/widget/NestedScrollView;->onSecondaryPointerUp(Landroid/view/MotionEvent;)V
@@ -3985,7 +3996,7 @@
 
     iput v0, v10, Landroidx/core/widget/NestedScrollView;->mLastMotionY:I
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :pswitch_2
     invoke-virtual/range {p1 .. p1}, Landroid/view/MotionEvent;->getActionIndex()I
@@ -4006,7 +4017,7 @@
 
     iput v0, v10, Landroidx/core/widget/NestedScrollView;->mActivePointerId:I
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :pswitch_3
     iget-boolean v0, v10, Landroidx/core/widget/NestedScrollView;->mIsBeingDragged:Z
@@ -4045,16 +4056,14 @@
 
     if-eqz v0, :cond_1
 
-    :goto_0
     invoke-static/range {p0 .. p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
     :cond_1
-    :goto_1
     iput v1, v10, Landroidx/core/widget/NestedScrollView;->mActivePointerId:I
 
     invoke-direct/range {p0 .. p0}, Landroidx/core/widget/NestedScrollView;->endDrag()V
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :pswitch_4
     iget v0, v10, Landroidx/core/widget/NestedScrollView;->mActivePointerId:I
@@ -4087,7 +4096,7 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :cond_2
     invoke-virtual {v11, v9}, Landroid/view/MotionEvent;->getY(I)F
@@ -4172,20 +4181,26 @@
 
     sub-int/2addr v7, v0
 
-    goto :goto_2
+    move v8, v7
+
+    goto :goto_0
 
     :cond_5
     iget v0, v10, Landroidx/core/widget/NestedScrollView;->mTouchSlop:I
 
     add-int/2addr v7, v0
 
-    :cond_6
-    :goto_2
     move v8, v7
 
+    goto :goto_0
+
+    :cond_6
+    move v8, v7
+
+    :goto_0
     iget-boolean v0, v10, Landroidx/core/widget/NestedScrollView;->mIsBeingDragged:Z
 
-    if-eqz v0, :cond_12
+    if-eqz v0, :cond_13
 
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mScrollOffset:[I
 
@@ -4213,18 +4228,18 @@
 
     if-lez v7, :cond_7
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_7
     const/16 v17, 0x0
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_8
-    :goto_3
+    :goto_1
     const/16 v17, 0x1
 
-    :goto_4
+    :goto_2
     const/4 v1, 0x0
 
     const/4 v3, 0x0
@@ -4304,15 +4319,13 @@
 
     iget-object v1, v10, Landroidx/core/widget/NestedScrollView;->mScrollOffset:[I
 
-    aget v1, v1, v15
+    aget v2, v1, v15
 
-    sub-int/2addr v0, v1
+    sub-int/2addr v0, v2
 
     iput v0, v10, Landroidx/core/widget/NestedScrollView;->mLastMotionY:I
 
-    iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mScrollOffset:[I
-
-    aget v0, v0, v15
+    aget v0, v1, v15
 
     int-to-float v0, v0
 
@@ -4330,10 +4343,10 @@
 
     iput v0, v10, Landroidx/core/widget/NestedScrollView;->mNestedYOffset:I
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :cond_a
-    if-eqz v17, :cond_12
+    if-eqz v17, :cond_13
 
     invoke-direct/range {p0 .. p0}, Landroidx/core/widget/NestedScrollView;->ensureGlows()V
 
@@ -4379,10 +4392,9 @@
 
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeEffect;
 
-    :goto_5
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->onRelease()V
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_b
     move/from16 v1, v21
@@ -4431,15 +4443,13 @@
 
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mEdgeGlowTop:Landroid/widget/EdgeEffect;
 
-    goto :goto_5
+    invoke-virtual {v0}, Landroid/widget/EdgeEffect;->onRelease()V
 
     :cond_c
-    :goto_6
+    :goto_3
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mEdgeGlowTop:Landroid/widget/EdgeEffect;
 
-    if-eqz v0, :cond_12
-
-    iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mEdgeGlowTop:Landroid/widget/EdgeEffect;
+    if-eqz v0, :cond_13
 
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->isFinished()Z
 
@@ -4453,12 +4463,12 @@
 
     move-result v0
 
-    if-nez v0, :cond_12
+    if-nez v0, :cond_13
 
     :cond_d
     invoke-static/range {p0 .. p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
-    goto :goto_7
+    goto/16 :goto_5
 
     :pswitch_5
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mVelocityTracker:Landroid/view/VelocityTracker;
@@ -4491,7 +4501,7 @@
 
     invoke-direct {v10, v0}, Landroidx/core/widget/NestedScrollView;->flingWithNestedDispatch(I)V
 
-    goto/16 :goto_1
+    goto :goto_4
 
     :cond_e
     iget-object v2, v10, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
@@ -4518,20 +4528,28 @@
 
     move-result v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_f
 
-    goto/16 :goto_0
+    invoke-static/range {p0 .. p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
+
+    :cond_f
+    :goto_4
+    iput v1, v10, Landroidx/core/widget/NestedScrollView;->mActivePointerId:I
+
+    invoke-direct/range {p0 .. p0}, Landroidx/core/widget/NestedScrollView;->endDrag()V
+
+    goto :goto_5
 
     :pswitch_6
     invoke-virtual/range {p0 .. p0}, Landroidx/core/widget/NestedScrollView;->getChildCount()I
 
     move-result v0
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_10
 
     return v13
 
-    :cond_f
+    :cond_10
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
 
     invoke-virtual {v0}, Landroid/widget/OverScroller;->isFinished()Z
@@ -4542,30 +4560,30 @@
 
     iput-boolean v0, v10, Landroidx/core/widget/NestedScrollView;->mIsBeingDragged:Z
 
-    if-eqz v0, :cond_10
+    if-eqz v0, :cond_11
 
     invoke-virtual/range {p0 .. p0}, Landroidx/core/widget/NestedScrollView;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
 
-    if-eqz v0, :cond_10
+    if-eqz v0, :cond_11
 
     invoke-interface {v0, v15}, Landroid/view/ViewParent;->requestDisallowInterceptTouchEvent(Z)V
 
-    :cond_10
+    :cond_11
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
 
     invoke-virtual {v0}, Landroid/widget/OverScroller;->isFinished()Z
 
     move-result v0
 
-    if-nez v0, :cond_11
+    if-nez v0, :cond_12
 
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
 
     invoke-virtual {v0}, Landroid/widget/OverScroller;->abortAnimation()V
 
-    :cond_11
+    :cond_12
     invoke-virtual/range {p1 .. p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result v0
@@ -4584,17 +4602,15 @@
 
     invoke-virtual {v10, v0, v13}, Landroidx/core/widget/NestedScrollView;->startNestedScroll(II)Z
 
-    :cond_12
-    :goto_7
+    :cond_13
+    :goto_5
     iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mVelocityTracker:Landroid/view/VelocityTracker;
 
-    if-eqz v0, :cond_13
-
-    iget-object v0, v10, Landroidx/core/widget/NestedScrollView;->mVelocityTracker:Landroid/view/VelocityTracker;
+    if-eqz v0, :cond_14
 
     invoke-virtual {v0, v12}, Landroid/view/VelocityTracker;->addMovement(Landroid/view/MotionEvent;)V
 
-    :cond_13
+    :cond_14
     invoke-virtual {v12}, Landroid/view/MotionEvent;->recycle()V
 
     return v15
@@ -4687,88 +4703,90 @@
     goto :goto_4
 
     :cond_4
-    const/4 v6, 0x0
+    const/4 v1, 0x0
 
     goto :goto_5
 
     :cond_5
     :goto_4
-    const/4 v6, 0x1
+    const/4 v1, 0x1
 
     :goto_5
-    add-int v1, p3, p1
+    add-int v3, p3, p1
 
     if-nez v2, :cond_6
 
-    const/4 v7, 0x0
+    const/4 v2, 0x0
 
     goto :goto_6
 
     :cond_6
-    move/from16 v7, p7
+    move/from16 v2, p7
 
     :goto_6
-    add-int v2, p4, p2
+    add-int v6, p4, p2
 
-    if-nez v6, :cond_7
+    if-nez v1, :cond_7
 
-    const/4 v3, 0x0
+    const/4 v1, 0x0
 
     goto :goto_7
 
     :cond_7
-    move/from16 v3, p8
+    move/from16 v1, p8
 
     :goto_7
-    neg-int v6, v7
+    neg-int v7, v2
 
-    add-int v7, v7, p5
+    add-int v2, v2, p5
 
-    neg-int v8, v3
+    neg-int v8, v1
 
-    add-int v3, v3, p6
+    add-int v1, v1, p6
 
-    if-le v1, v7, :cond_8
+    if-le v3, v2, :cond_8
 
-    move v6, v7
+    move v7, v2
 
-    :goto_8
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_8
-    if-ge v1, v6, :cond_9
+    if-ge v3, v7, :cond_9
+
+    const/4 v2, 0x1
 
     goto :goto_8
 
     :cond_9
-    move v6, v1
-
-    const/4 v1, 0x0
-
-    :goto_9
-    if-le v2, v3, :cond_a
-
-    move v8, v3
-
-    :goto_a
-    const/4 v2, 0x1
-
-    goto :goto_b
-
-    :cond_a
-    if-ge v2, v8, :cond_b
-
-    goto :goto_a
-
-    :cond_b
-    move v8, v2
+    move v7, v3
 
     const/4 v2, 0x0
 
-    :goto_b
-    if-eqz v2, :cond_c
+    :goto_8
+    if-le v6, v1, :cond_a
+
+    move v6, v1
+
+    const/4 v1, 0x1
+
+    goto :goto_9
+
+    :cond_a
+    if-ge v6, v8, :cond_b
+
+    move v6, v8
+
+    const/4 v1, 0x1
+
+    goto :goto_9
+
+    :cond_b
+    const/4 v1, 0x0
+
+    :goto_9
+    if-eqz v1, :cond_c
 
     invoke-virtual {p0, v5}, Landroidx/core/widget/NestedScrollView;->hasNestedScrollingParent(I)Z
 
@@ -4778,7 +4796,7 @@
 
     iget-object v3, v0, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
     const/4 v9, 0x0
 
@@ -4790,11 +4808,11 @@
 
     move-object p1, v3
 
-    move p2, v6
+    move p2, v7
 
-    move p3, v8
+    move p3, v6
 
-    move/from16 p4, v7
+    move/from16 p4, v8
 
     move/from16 p5, v9
 
@@ -4805,28 +4823,28 @@
     invoke-virtual/range {p1 .. p7}, Landroid/widget/OverScroller;->springBack(IIIIII)Z
 
     :cond_c
-    invoke-virtual {p0, v6, v8, v1, v2}, Landroidx/core/widget/NestedScrollView;->onOverScrolled(IIZZ)V
+    invoke-virtual {p0, v7, v6, v2, v1}, Landroidx/core/widget/NestedScrollView;->onOverScrolled(IIZZ)V
 
-    if-nez v1, :cond_e
+    if-nez v2, :cond_e
 
-    if-eqz v2, :cond_d
+    if-eqz v1, :cond_d
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_d
     return v4
 
     :cond_e
-    :goto_c
+    :goto_a
     return v5
 .end method
 
 .method public pageScroll(I)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     const/16 v2, 0x82
 
@@ -4846,7 +4864,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
+    iget-object v1, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
 
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollY()I
 
@@ -4854,17 +4872,17 @@
 
     add-int/2addr v2, v3
 
-    iput v2, v0, Landroid/graphics/Rect;->top:I
+    iput v2, v1, Landroid/graphics/Rect;->top:I
 
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getChildCount()I
 
-    move-result v0
+    move-result v1
 
-    if-lez v0, :cond_2
+    if-lez v1, :cond_2
 
-    sub-int/2addr v0, v1
+    sub-int/2addr v1, v0
 
-    invoke-virtual {p0, v0}, Landroidx/core/widget/NestedScrollView;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {p0, v1}, Landroidx/core/widget/NestedScrollView;->getChildAt(I)Landroid/view/View;
 
     move-result-object v0
 
@@ -4900,10 +4918,12 @@
 
     sub-int/2addr v0, v3
 
+    iput v0, v1, Landroid/graphics/Rect;->top:I
+
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
+    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
 
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollY()I
 
@@ -4911,25 +4931,23 @@
 
     sub-int/2addr v2, v3
 
-    iput v2, v1, Landroid/graphics/Rect;->top:I
+    iput v2, v0, Landroid/graphics/Rect;->top:I
 
-    iget-object v1, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
-
-    iget v1, v1, Landroid/graphics/Rect;->top:I
-
-    if-gez v1, :cond_2
-
-    iget-object v1, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
-
-    :goto_1
-    iput v0, v1, Landroid/graphics/Rect;->top:I
-
-    :cond_2
     iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
 
-    iget-object v1, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
+    iget v0, v0, Landroid/graphics/Rect;->top:I
 
-    iget v1, v1, Landroid/graphics/Rect;->top:I
+    if-gez v0, :cond_2
+
+    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
+
+    iput v1, v0, Landroid/graphics/Rect;->top:I
+
+    :cond_2
+    :goto_1
+    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect;
+
+    iget v1, v0, Landroid/graphics/Rect;->top:I
 
     add-int/2addr v1, v3
 
diff --git a/com.discord/smali/androidx/core/widget/PopupMenuCompat.smali b/com.discord/smali/androidx/core/widget/PopupMenuCompat.smali
index b06f453ba0..810f9989bd 100644
--- a/com.discord/smali/androidx/core/widget/PopupMenuCompat.smali
+++ b/com.discord/smali/androidx/core/widget/PopupMenuCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/PopupMenuCompat;
 .super Ljava/lang/Object;
+.source "PopupMenuCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/widget/PopupWindowCompat.smali b/com.discord/smali/androidx/core/widget/PopupWindowCompat.smali
index 26563e46c2..7ceba8e93e 100644
--- a/com.discord/smali/androidx/core/widget/PopupWindowCompat.smali
+++ b/com.discord/smali/androidx/core/widget/PopupWindowCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/PopupWindowCompat;
 .super Ljava/lang/Object;
+.source "PopupWindowCompat.java"
 
 
 # static fields
@@ -94,8 +95,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/widget/PopupWindowCompat;->sOverlapAnchorField:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
@@ -179,8 +178,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/widget/PopupWindowCompat;->sGetWindowLayoutTypeMethod:Ljava/lang/reflect/Method;
-
     new-array v2, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -267,8 +264,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/widget/PopupWindowCompat;->sOverlapAnchorField:Ljava/lang/reflect/Field;
-
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -348,8 +343,6 @@
     if-eqz v0, :cond_2
 
     :try_start_1
-    sget-object v0, Landroidx/core/widget/PopupWindowCompat;->sSetWindowLayoutTypeMethod:Ljava/lang/reflect/Method;
-
     new-array v2, v2, [Ljava/lang/Object;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -362,6 +355,8 @@
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
 
+    return-void
+
     :catch_1
     :cond_2
     return-void
diff --git a/com.discord/smali/androidx/core/widget/ScrollerCompat.smali b/com.discord/smali/androidx/core/widget/ScrollerCompat.smali
index 60b347a58d..20ef6e8345 100644
--- a/com.discord/smali/androidx/core/widget/ScrollerCompat.smali
+++ b/com.discord/smali/androidx/core/widget/ScrollerCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/ScrollerCompat;
 .super Ljava/lang/Object;
+.source "ScrollerCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/widget/TextViewCompat$AutoSizeTextType.smali b/com.discord/smali/androidx/core/widget/TextViewCompat$AutoSizeTextType.smali
index 9f363dd662..ee0aaeda62 100644
--- a/com.discord/smali/androidx/core/widget/TextViewCompat$AutoSizeTextType.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewCompat$AutoSizeTextType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/core/widget/TextViewCompat$AutoSizeTextType;
 .super Ljava/lang/Object;
+.source "TextViewCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali b/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali
index 0e84039ee9..a171bdfd7d 100644
--- a/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/core/widget/TextViewCompat$OreoCallback;
 .super Ljava/lang/Object;
+.source "TextViewCompat.java"
 
 # interfaces
 .implements Landroid/view/ActionMode$Callback;
@@ -467,9 +468,11 @@
 
     goto :goto_3
 
-    :catch_1
     :cond_4
     return-void
+
+    :catch_1
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/androidx/core/widget/TextViewCompat.smali b/com.discord/smali/androidx/core/widget/TextViewCompat.smali
index ce3683b812..a22e6d87d9 100644
--- a/com.discord/smali/androidx/core/widget/TextViewCompat.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewCompat.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/core/widget/TextViewCompat;
 .super Ljava/lang/Object;
+.source "TextViewCompat.java"
 
 
 # annotations
@@ -404,8 +405,6 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Landroidx/core/widget/TextViewCompat;->sMaxModeField:Ljava/lang/reflect/Field;
-
     invoke-static {v0, p0}, Landroidx/core/widget/TextViewCompat;->retrieveIntFromField(Ljava/lang/reflect/Field;Landroid/widget/TextView;)I
 
     move-result v0
@@ -431,8 +430,6 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Landroidx/core/widget/TextViewCompat;->sMaximumField:Ljava/lang/reflect/Field;
-
     invoke-static {v0, p0}, Landroidx/core/widget/TextViewCompat;->retrieveIntFromField(Ljava/lang/reflect/Field;Landroid/widget/TextView;)I
 
     move-result p0
@@ -486,8 +483,6 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Landroidx/core/widget/TextViewCompat;->sMinModeField:Ljava/lang/reflect/Field;
-
     invoke-static {v0, p0}, Landroidx/core/widget/TextViewCompat;->retrieveIntFromField(Ljava/lang/reflect/Field;Landroid/widget/TextView;)I
 
     move-result v0
@@ -513,8 +508,6 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Landroidx/core/widget/TextViewCompat;->sMinimumField:Ljava/lang/reflect/Field;
-
     invoke-static {v0, p0}, Landroidx/core/widget/TextViewCompat;->retrieveIntFromField(Ljava/lang/reflect/Field;Landroid/widget/TextView;)I
 
     move-result p0
@@ -894,11 +887,11 @@
     :try_start_0
     invoke-virtual {p0, p1}, Ljava/lang/reflect/Field;->getInt(Ljava/lang/Object;)I
 
-    move-result p1
+    move-result p0
     :try_end_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return p1
+    return p0
 
     :catch_0
     const-string p1, "TextViewCompat"
diff --git a/com.discord/smali/androidx/core/widget/TintableCompoundButton.smali b/com.discord/smali/androidx/core/widget/TintableCompoundButton.smali
index 439472daf5..f6208c72d8 100644
--- a/com.discord/smali/androidx/core/widget/TintableCompoundButton.smali
+++ b/com.discord/smali/androidx/core/widget/TintableCompoundButton.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/widget/TintableCompoundButton;
 .super Ljava/lang/Object;
+.source "TintableCompoundButton.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/core/widget/TintableImageSourceView.smali b/com.discord/smali/androidx/core/widget/TintableImageSourceView.smali
index 09aeb5be92..3d9d9c5176 100644
--- a/com.discord/smali/androidx/core/widget/TintableImageSourceView.smali
+++ b/com.discord/smali/androidx/core/widget/TintableImageSourceView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/core/widget/TintableImageSourceView;
 .super Ljava/lang/Object;
+.source "TintableImageSourceView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cursoradapter/R.smali b/com.discord/smali/androidx/cursoradapter/R.smali
index e137f7bc3d..da2018e916 100644
--- a/com.discord/smali/androidx/cursoradapter/R.smali
+++ b/com.discord/smali/androidx/cursoradapter/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/cursoradapter/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$ChangeObserver.smali b/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$ChangeObserver.smali
index b94b40e72e..185fa526e7 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$ChangeObserver.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$ChangeObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cursoradapter/widget/CursorAdapter$ChangeObserver;
 .super Landroid/database/ContentObserver;
+.source "CursorAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver.smali b/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver.smali
index 43b9fb2cce..e9e880a34c 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver;
 .super Landroid/database/DataSetObserver;
+.source "CursorAdapter.java"
 
 
 # annotations
@@ -39,8 +40,6 @@
 
     iput-boolean v1, v0, Landroidx/cursoradapter/widget/CursorAdapter;->mDataValid:Z
 
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver;->this$0:Landroidx/cursoradapter/widget/CursorAdapter;
-
     invoke-virtual {v0}, Landroidx/cursoradapter/widget/CursorAdapter;->notifyDataSetChanged()V
 
     return-void
@@ -55,8 +54,6 @@
 
     iput-boolean v1, v0, Landroidx/cursoradapter/widget/CursorAdapter;->mDataValid:Z
 
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver;->this$0:Landroidx/cursoradapter/widget/CursorAdapter;
-
     invoke-virtual {v0}, Landroidx/cursoradapter/widget/CursorAdapter;->notifyDataSetInvalidated()V
 
     return-void
diff --git a/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter.smali b/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter.smali
index 339d6c0732..e818c2954a 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/CursorAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/cursoradapter/widget/CursorAdapter;
 .super Landroid/widget/BaseAdapter;
+.source "CursorAdapter.java"
 
 # interfaces
 .implements Landroid/widget/Filterable;
@@ -191,8 +192,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mCursor:Landroid/database/Cursor;
-
     invoke-interface {v0}, Landroid/database/Cursor;->getCount()I
 
     move-result v0
@@ -287,8 +286,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mCursor:Landroid/database/Cursor;
-
     invoke-interface {v0, p1}, Landroid/database/Cursor;->moveToPosition(I)Z
 
     iget-object p1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mCursor:Landroid/database/Cursor;
@@ -308,13 +305,11 @@
 
     const-wide/16 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mCursor:Landroid/database/Cursor;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mCursor:Landroid/database/Cursor;
+    if-eqz v0, :cond_1
 
     invoke-interface {v0, p1}, Landroid/database/Cursor;->moveToPosition(I)Z
 
@@ -334,6 +329,9 @@
 
     :cond_0
     return-wide v1
+
+    :cond_1
+    return-wide v1
 .end method
 
 .method public getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
@@ -469,27 +467,24 @@
 
     invoke-direct {p1, p0}, Landroidx/cursoradapter/widget/CursorAdapter$MyDataSetObserver;-><init>(Landroidx/cursoradapter/widget/CursorAdapter;)V
 
-    :goto_2
     iput-object p1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mDataSetObserver:Landroid/database/DataSetObserver;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const/4 p1, 0x0
 
     iput-object p1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mChangeObserver:Landroidx/cursoradapter/widget/CursorAdapter$ChangeObserver;
 
-    goto :goto_2
+    iput-object p1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mDataSetObserver:Landroid/database/DataSetObserver;
 
-    :goto_3
+    :goto_2
     if-eqz v1, :cond_5
 
     iget-object p1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mChangeObserver:Landroidx/cursoradapter/widget/CursorAdapter$ChangeObserver;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mChangeObserver:Landroidx/cursoradapter/widget/CursorAdapter$ChangeObserver;
-
     invoke-interface {p2, p1}, Landroid/database/Cursor;->registerContentObserver(Landroid/database/ContentObserver;)V
 
     :cond_4
@@ -497,8 +492,6 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mDataSetObserver:Landroid/database/DataSetObserver;
-
     invoke-interface {p2, p1}, Landroid/database/Cursor;->registerDataSetObserver(Landroid/database/DataSetObserver;)V
 
     :cond_5
@@ -549,8 +542,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mCursor:Landroid/database/Cursor;
-
     invoke-interface {v0}, Landroid/database/Cursor;->isClosed()Z
 
     move-result v0
@@ -576,8 +567,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mFilterQueryProvider:Landroid/widget/FilterQueryProvider;
-
     invoke-interface {v0, p1}, Landroid/widget/FilterQueryProvider;->runQuery(Ljava/lang/CharSequence;)Landroid/database/Cursor;
 
     move-result-object p1
@@ -610,16 +599,12 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mCursor:Landroid/database/Cursor;
-
     if-eqz v0, :cond_2
 
     iget-object v1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mChangeObserver:Landroidx/cursoradapter/widget/CursorAdapter$ChangeObserver;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mChangeObserver:Landroidx/cursoradapter/widget/CursorAdapter$ChangeObserver;
-
     invoke-interface {v0, v1}, Landroid/database/Cursor;->unregisterContentObserver(Landroid/database/ContentObserver;)V
 
     :cond_1
@@ -627,8 +612,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mDataSetObserver:Landroid/database/DataSetObserver;
-
     invoke-interface {v0, v1}, Landroid/database/Cursor;->unregisterDataSetObserver(Landroid/database/DataSetObserver;)V
 
     :cond_2
@@ -640,8 +623,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mChangeObserver:Landroidx/cursoradapter/widget/CursorAdapter$ChangeObserver;
-
     invoke-interface {p1, v1}, Landroid/database/Cursor;->registerContentObserver(Landroid/database/ContentObserver;)V
 
     :cond_3
@@ -649,8 +630,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Landroidx/cursoradapter/widget/CursorAdapter;->mDataSetObserver:Landroid/database/DataSetObserver;
-
     invoke-interface {p1, v1}, Landroid/database/Cursor;->registerDataSetObserver(Landroid/database/DataSetObserver;)V
 
     :cond_4
diff --git a/com.discord/smali/androidx/cursoradapter/widget/CursorFilter$CursorFilterClient.smali b/com.discord/smali/androidx/cursoradapter/widget/CursorFilter$CursorFilterClient.smali
index b03e104ec1..b2c0bf4dc8 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/CursorFilter$CursorFilterClient.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/CursorFilter$CursorFilterClient.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/cursoradapter/widget/CursorFilter$CursorFilterClient;
 .super Ljava/lang/Object;
+.source "CursorFilter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cursoradapter/widget/CursorFilter.smali b/com.discord/smali/androidx/cursoradapter/widget/CursorFilter.smali
index c1cf849222..92d4fa46a9 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/CursorFilter.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/CursorFilter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/cursoradapter/widget/CursorFilter;
 .super Landroid/widget/Filter;
+.source "CursorFilter.java"
 
 
 # annotations
@@ -62,10 +63,9 @@
 
     iput v1, v0, Landroid/widget/Filter$FilterResults;->count:I
 
-    :goto_0
     iput-object p1, v0, Landroid/widget/Filter$FilterResults;->values:Ljava/lang/Object;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
@@ -74,9 +74,9 @@
 
     const/4 p1, 0x0
 
-    goto :goto_0
+    iput-object p1, v0, Landroid/widget/Filter$FilterResults;->values:Ljava/lang/Object;
 
-    :goto_1
+    :goto_0
     return-object v0
 .end method
 
diff --git a/com.discord/smali/androidx/cursoradapter/widget/ResourceCursorAdapter.smali b/com.discord/smali/androidx/cursoradapter/widget/ResourceCursorAdapter.smali
index c3b0a4e79b..70eaa33402 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/ResourceCursorAdapter.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/ResourceCursorAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/cursoradapter/widget/ResourceCursorAdapter;
 .super Landroidx/cursoradapter/widget/CursorAdapter;
+.source "ResourceCursorAdapter.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$CursorToStringConverter.smali b/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$CursorToStringConverter.smali
index eefff7826d..5aacf8abee 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$CursorToStringConverter.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$CursorToStringConverter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/cursoradapter/widget/SimpleCursorAdapter$CursorToStringConverter;
 .super Ljava/lang/Object;
+.source "SimpleCursorAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$ViewBinder.smali b/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$ViewBinder.smali
index 586aa5981c..c92a684687 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$ViewBinder.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter$ViewBinder.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/cursoradapter/widget/SimpleCursorAdapter$ViewBinder;
 .super Ljava/lang/Object;
+.source "SimpleCursorAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter.smali b/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter.smali
index 50c663c373..84fbf83dfc 100644
--- a/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter.smali
+++ b/com.discord/smali/androidx/cursoradapter/widget/SimpleCursorAdapter.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/cursoradapter/widget/SimpleCursorAdapter;
 .super Landroidx/cursoradapter/widget/ResourceCursorAdapter;
+.source "SimpleCursorAdapter.java"
 
 
 # annotations
@@ -87,8 +88,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/cursoradapter/widget/SimpleCursorAdapter;->mFrom:[I
-
     array-length v1, v1
 
     if-eq v1, v0, :cond_1
@@ -138,20 +137,18 @@
 
     iget-object v0, p0, Landroidx/cursoradapter/widget/SimpleCursorAdapter;->mTo:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    iget-object v1, p0, Landroidx/cursoradapter/widget/SimpleCursorAdapter;->mFrom:[I
-
-    iget-object v2, p0, Landroidx/cursoradapter/widget/SimpleCursorAdapter;->mTo:[I
+    iget-object v2, p0, Landroidx/cursoradapter/widget/SimpleCursorAdapter;->mFrom:[I
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     :goto_0
-    if-ge v4, v0, :cond_5
+    if-ge v4, v1, :cond_5
 
-    aget v5, v2, v4
+    aget v5, v0, v4
 
     invoke-virtual {p1, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -161,7 +158,7 @@
 
     if-eqz p2, :cond_0
 
-    aget v6, v1, v4
+    aget v6, v2, v4
 
     invoke-interface {p2, v5, p3, v6}, Landroidx/cursoradapter/widget/SimpleCursorAdapter$ViewBinder;->setViewValue(Landroid/view/View;Landroid/database/Cursor;I)Z
 
@@ -175,7 +172,7 @@
     :goto_1
     if-nez v6, :cond_4
 
-    aget v6, v1, v4
+    aget v6, v2, v4
 
     invoke-interface {p3, v6}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -269,8 +266,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/cursoradapter/widget/SimpleCursorAdapter;->mCursorToStringConverter:Landroidx/cursoradapter/widget/SimpleCursorAdapter$CursorToStringConverter;
-
     invoke-interface {v0, p1}, Landroidx/cursoradapter/widget/SimpleCursorAdapter$CursorToStringConverter;->convertToString(Landroid/database/Cursor;)Ljava/lang/CharSequence;
 
     move-result-object p1
@@ -282,8 +277,6 @@
 
     if-ltz v0, :cond_1
 
-    iget v0, p0, Landroidx/cursoradapter/widget/SimpleCursorAdapter;->mStringConversionColumn:I
-
     invoke-interface {p1, v0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/customview/R$attr.smali b/com.discord/smali/androidx/customview/R$attr.smali
index 812c26112e..89d3d1a0a2 100644
--- a/com.discord/smali/androidx/customview/R$attr.smali
+++ b/com.discord/smali/androidx/customview/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$color.smali b/com.discord/smali/androidx/customview/R$color.smali
index 78f18867e6..3f21cad810 100644
--- a/com.discord/smali/androidx/customview/R$color.smali
+++ b/com.discord/smali/androidx/customview/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$dimen.smali b/com.discord/smali/androidx/customview/R$dimen.smali
index 622295fc4e..62a30786cf 100644
--- a/com.discord/smali/androidx/customview/R$dimen.smali
+++ b/com.discord/smali/androidx/customview/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index 1e41529eb9..85e7e0a0c6 100644
--- a/com.discord/smali/androidx/customview/R$drawable.smali
+++ b/com.discord/smali/androidx/customview/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index 46a7b9230f..d3eea76db3 100644
--- a/com.discord/smali/androidx/customview/R$id.smali
+++ b/com.discord/smali/androidx/customview/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$integer.smali b/com.discord/smali/androidx/customview/R$integer.smali
index 278e1415e7..7be095bbd8 100644
--- a/com.discord/smali/androidx/customview/R$integer.smali
+++ b/com.discord/smali/androidx/customview/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$layout.smali b/com.discord/smali/androidx/customview/R$layout.smali
index 99b13d3eb6..f42dae8b7e 100644
--- a/com.discord/smali/androidx/customview/R$layout.smali
+++ b/com.discord/smali/androidx/customview/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index a68bca8b68..9f80ddf0a3 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$style.smali b/com.discord/smali/androidx/customview/R$style.smali
index b1dea2f1b2..e2d029ce50 100644
--- a/com.discord/smali/androidx/customview/R$style.smali
+++ b/com.discord/smali/androidx/customview/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R$styleable.smali b/com.discord/smali/androidx/customview/R$styleable.smali
index 9096eb5b26..37f7dfa900 100644
--- a/com.discord/smali/androidx/customview/R$styleable.smali
+++ b/com.discord/smali/androidx/customview/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/R.smali b/com.discord/smali/androidx/customview/R.smali
index 0f0576b6af..38c8a3b241 100644
--- a/com.discord/smali/androidx/customview/R.smali
+++ b/com.discord/smali/androidx/customview/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/customview/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/view/AbsSavedState$1.smali b/com.discord/smali/androidx/customview/view/AbsSavedState$1.smali
index f14cca42f9..3d8877d3ce 100644
--- a/com.discord/smali/androidx/customview/view/AbsSavedState$1.smali
+++ b/com.discord/smali/androidx/customview/view/AbsSavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/customview/view/AbsSavedState$1;
 .super Landroidx/customview/view/AbsSavedState;
+.source "AbsSavedState.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/view/AbsSavedState$2.smali b/com.discord/smali/androidx/customview/view/AbsSavedState$2.smali
index 81875d5239..015eb3274c 100644
--- a/com.discord/smali/androidx/customview/view/AbsSavedState$2.smali
+++ b/com.discord/smali/androidx/customview/view/AbsSavedState$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/customview/view/AbsSavedState$2;
 .super Ljava/lang/Object;
+.source "AbsSavedState.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/customview/view/AbsSavedState.smali b/com.discord/smali/androidx/customview/view/AbsSavedState.smali
index 209d0d115b..ec30f0872c 100644
--- a/com.discord/smali/androidx/customview/view/AbsSavedState.smali
+++ b/com.discord/smali/androidx/customview/view/AbsSavedState.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/customview/view/AbsSavedState;
 .super Ljava/lang/Object;
+.source "AbsSavedState.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$1.smali b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$1.smali
index 82d75365d5..04f5f29082 100644
--- a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$1.smali
+++ b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/customview/widget/ExploreByTouchHelper$1;
 .super Ljava/lang/Object;
+.source "ExploreByTouchHelper.java"
 
 # interfaces
 .implements Landroidx/customview/widget/FocusStrategy$BoundsAdapter;
diff --git a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$2.smali b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$2.smali
index 9894fc407a..7572ee8b29 100644
--- a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$2.smali
+++ b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/customview/widget/ExploreByTouchHelper$2;
 .super Ljava/lang/Object;
+.source "ExploreByTouchHelper.java"
 
 # interfaces
 .implements Landroidx/customview/widget/FocusStrategy$CollectionAdapter;
diff --git a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$MyNodeProvider.smali b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$MyNodeProvider.smali
index c565252f8a..832a76e6fd 100644
--- a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$MyNodeProvider.smali
+++ b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper$MyNodeProvider.smali
@@ -1,5 +1,6 @@
 .class Landroidx/customview/widget/ExploreByTouchHelper$MyNodeProvider;
 .super Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;
+.source "ExploreByTouchHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali
index e203d06880..3a54ff3935 100644
--- a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali
+++ b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/customview/widget/ExploreByTouchHelper;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "ExploreByTouchHelper.java"
 
 
 # annotations
@@ -216,8 +217,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I
-
     const/16 v1, 0x10
 
     const/4 v2, 0x0
@@ -728,6 +727,8 @@
     invoke-direct {p1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private createNodeForHost()Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
@@ -937,7 +938,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
     invoke-virtual {p1}, Landroid/graphics/Rect;->isEmpty()Z
 
@@ -945,7 +946,7 @@
 
     if-eqz p1, :cond_0
 
-    goto :goto_0
+    goto :goto_2
 
     :cond_0
     iget-object p1, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mHost:Landroid/view/View;
@@ -961,11 +962,11 @@
     :cond_1
     iget-object p1, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mHost:Landroid/view/View;
 
-    :cond_2
     invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object p1
 
+    :goto_0
     instance-of v1, p1, Landroid/view/View;
 
     if-eqz v1, :cond_4
@@ -988,7 +989,17 @@
 
     if-eqz v1, :cond_2
 
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+    move-result-object p1
+
+    goto :goto_0
+
     :cond_3
+    :goto_1
     return v0
 
     :cond_4
@@ -999,7 +1010,10 @@
     return p1
 
     :cond_5
-    :goto_0
+    return v0
+
+    :cond_6
+    :goto_2
     return v0
 .end method
 
@@ -1058,10 +1072,9 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     move-object v3, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v7, v0}, Landroidx/collection/SparseArrayCompat;->get(I)Ljava/lang/Object;
@@ -1070,9 +1083,9 @@
 
     check-cast v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
 
-    goto :goto_0
+    move-object v3, v0
 
-    :goto_1
+    :goto_0
     const/16 v0, 0x11
 
     if-eq p1, v0, :cond_2
@@ -1112,14 +1125,14 @@
 
     const/4 v5, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 p2, 0x0
 
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_1
     sget-object v1, Landroidx/customview/widget/ExploreByTouchHelper;->SPARSE_VALUES_ADAPTER:Landroidx/customview/widget/FocusStrategy$CollectionAdapter;
 
     sget-object v2, Landroidx/customview/widget/ExploreByTouchHelper;->NODE_ADAPTER:Landroidx/customview/widget/FocusStrategy$BoundsAdapter;
@@ -1134,10 +1147,9 @@
 
     move-result-object p1
 
-    :goto_3
     check-cast p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_2
     new-instance v4, Landroid/graphics/Rect;
@@ -1148,25 +1160,23 @@
 
     if-eq v0, v8, :cond_3
 
-    iget p2, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I
+    invoke-direct {p0, v0, v4}, Landroidx/customview/widget/ExploreByTouchHelper;->getBoundsInParent(ILandroid/graphics/Rect;)V
 
-    invoke-direct {p0, p2, v4}, Landroidx/customview/widget/ExploreByTouchHelper;->getBoundsInParent(ILandroid/graphics/Rect;)V
-
-    goto :goto_4
+    goto :goto_2
 
     :cond_3
     if-eqz p2, :cond_4
 
     invoke-virtual {v4, p2}, Landroid/graphics/Rect;->set(Landroid/graphics/Rect;)V
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_4
     iget-object p2, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mHost:Landroid/view/View;
 
     invoke-static {p2, p1, v4}, Landroidx/customview/widget/ExploreByTouchHelper;->guessPreviouslyFocusedRect(Landroid/view/View;ILandroid/graphics/Rect;)Landroid/graphics/Rect;
 
-    :goto_4
+    :goto_2
     sget-object v1, Landroidx/customview/widget/ExploreByTouchHelper;->SPARSE_VALUES_ADAPTER:Landroidx/customview/widget/FocusStrategy$CollectionAdapter;
 
     sget-object v2, Landroidx/customview/widget/ExploreByTouchHelper;->NODE_ADAPTER:Landroidx/customview/widget/FocusStrategy$BoundsAdapter;
@@ -1179,12 +1189,12 @@
 
     move-result-object p1
 
-    goto :goto_3
+    check-cast p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
 
-    :goto_5
+    :goto_3
     if-nez p1, :cond_5
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_5
     invoke-virtual {v7, p1}, Landroidx/collection/SparseArrayCompat;->indexOfValue(Ljava/lang/Object;)I
@@ -1195,15 +1205,13 @@
 
     move-result v8
 
-    :goto_6
+    :goto_4
     invoke-virtual {p0, v8}, Landroidx/customview/widget/ExploreByTouchHelper;->requestKeyboardFocusForVirtualView(I)Z
 
     move-result p1
 
     return p1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_0
@@ -1288,7 +1296,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     iget-object v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mManager:Landroid/view/accessibility/AccessibilityManager;
 
@@ -1305,14 +1313,10 @@
 
     if-eq v0, p1, :cond_2
 
-    iget v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mAccessibilityFocusedVirtualViewId:I
-
     const/high16 v1, -0x80000000
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mAccessibilityFocusedVirtualViewId:I
-
     invoke-direct {p0, v0}, Landroidx/customview/widget/ExploreByTouchHelper;->clearAccessibilityFocus(I)Z
 
     :cond_1
@@ -1331,6 +1335,9 @@
     return p1
 
     :cond_2
+    return v1
+
+    :cond_3
     :goto_0
     return v1
 .end method
@@ -1379,7 +1386,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     iget-object v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mManager:Landroid/view/accessibility/AccessibilityManager;
 
@@ -1441,9 +1448,14 @@
     return v3
 
     :cond_3
+    return v1
+
+    :cond_4
     :goto_0
     return v1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x9
         :pswitch_1
@@ -1745,8 +1757,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I
-
     invoke-virtual {p0, v0}, Landroidx/customview/widget/ExploreByTouchHelper;->clearKeyboardFocusForVirtualView(I)Z
 
     :cond_0
@@ -1880,14 +1890,10 @@
     return v1
 
     :cond_1
-    iget v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I
-
     const/high16 v1, -0x80000000
 
     if-eq v0, v1, :cond_2
 
-    iget v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I
-
     invoke-virtual {p0, v0}, Landroidx/customview/widget/ExploreByTouchHelper;->clearKeyboardFocusForVirtualView(I)Z
 
     :cond_2
@@ -1962,8 +1968,6 @@
     return-void
 
     :cond_0
-    iget v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mHoveredVirtualViewId:I
-
     iput p1, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mHoveredVirtualViewId:I
 
     const/16 v1, 0x80
diff --git a/com.discord/smali/androidx/customview/widget/FocusStrategy$BoundsAdapter.smali b/com.discord/smali/androidx/customview/widget/FocusStrategy$BoundsAdapter.smali
index 97681fb91a..304961ace5 100644
--- a/com.discord/smali/androidx/customview/widget/FocusStrategy$BoundsAdapter.smali
+++ b/com.discord/smali/androidx/customview/widget/FocusStrategy$BoundsAdapter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/customview/widget/FocusStrategy$BoundsAdapter;
 .super Ljava/lang/Object;
+.source "FocusStrategy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/widget/FocusStrategy$CollectionAdapter.smali b/com.discord/smali/androidx/customview/widget/FocusStrategy$CollectionAdapter.smali
index d050b363bf..9b7946dc66 100644
--- a/com.discord/smali/androidx/customview/widget/FocusStrategy$CollectionAdapter.smali
+++ b/com.discord/smali/androidx/customview/widget/FocusStrategy$CollectionAdapter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/customview/widget/FocusStrategy$CollectionAdapter;
 .super Ljava/lang/Object;
+.source "FocusStrategy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/widget/FocusStrategy$SequentialComparator.smali b/com.discord/smali/androidx/customview/widget/FocusStrategy$SequentialComparator.smali
index 243f0bb1cc..1c4815555c 100644
--- a/com.discord/smali/androidx/customview/widget/FocusStrategy$SequentialComparator.smali
+++ b/com.discord/smali/androidx/customview/widget/FocusStrategy$SequentialComparator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/customview/widget/FocusStrategy$SequentialComparator;
 .super Ljava/lang/Object;
+.source "FocusStrategy.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/androidx/customview/widget/FocusStrategy.smali b/com.discord/smali/androidx/customview/widget/FocusStrategy.smali
index 697f005fb1..19291bf74d 100644
--- a/com.discord/smali/androidx/customview/widget/FocusStrategy.smali
+++ b/com.discord/smali/androidx/customview/widget/FocusStrategy.smali
@@ -1,5 +1,6 @@
 .class Landroidx/customview/widget/FocusStrategy;
 .super Ljava/lang/Object;
+.source "FocusStrategy.java"
 
 
 # annotations
@@ -250,6 +251,8 @@
 
     neg-int v1, v1
 
+    invoke-virtual {v0, v2, v1}, Landroid/graphics/Rect;->offset(II)V
+
     goto :goto_0
 
     :cond_0
@@ -270,7 +273,9 @@
 
     neg-int v1, v1
 
-    goto :goto_1
+    invoke-virtual {v0, v1, v2}, Landroid/graphics/Rect;->offset(II)V
+
+    goto :goto_0
 
     :cond_2
     invoke-virtual {p4}, Landroid/graphics/Rect;->height()I
@@ -279,10 +284,9 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    :goto_0
     invoke-virtual {v0, v2, v1}, Landroid/graphics/Rect;->offset(II)V
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_3
     invoke-virtual {p4}, Landroid/graphics/Rect;->width()I
@@ -291,10 +295,9 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    :goto_1
     invoke-virtual {v0, v1, v2}, Landroid/graphics/Rect;->offset(II)V
 
-    :goto_2
+    :goto_0
     const/4 v1, 0x0
 
     invoke-interface {p1, p0}, Landroidx/customview/widget/FocusStrategy$CollectionAdapter;->size(Ljava/lang/Object;)I
@@ -305,7 +308,7 @@
 
     invoke-direct {v4}, Landroid/graphics/Rect;-><init>()V
 
-    :goto_3
+    :goto_1
     if-ge v2, v3, :cond_5
 
     invoke-interface {p1, p0, v2}, Landroidx/customview/widget/FocusStrategy$CollectionAdapter;->get(Ljava/lang/Object;I)Ljava/lang/Object;
@@ -329,7 +332,7 @@
     :cond_4
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_5
     return-object v1
@@ -801,9 +804,9 @@
 
     const/16 v0, 0x11
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eq p0, v0, :cond_6
 
@@ -825,10 +828,10 @@
 
     if-gt p0, p1, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     new-instance p0, Ljava/lang/IllegalArgumentException;
@@ -846,10 +849,10 @@
 
     if-gt p0, p1, :cond_3
 
-    return v2
+    return v1
 
     :cond_3
-    return v1
+    return v2
 
     :cond_4
     iget p0, p1, Landroid/graphics/Rect;->top:I
@@ -858,10 +861,10 @@
 
     if-lt p0, p1, :cond_5
 
-    return v2
+    return v1
 
     :cond_5
-    return v1
+    return v2
 
     :cond_6
     iget p0, p1, Landroid/graphics/Rect;->left:I
@@ -870,10 +873,10 @@
 
     if-lt p0, p1, :cond_7
 
-    return v2
+    return v1
 
     :cond_7
-    return v1
+    return v2
 .end method
 
 .method private static majorAxisDistance(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I
@@ -931,7 +934,6 @@
 
     iget p1, p1, Landroid/graphics/Rect;->bottom:I
 
-    :goto_0
     sub-int/2addr p0, p1
 
     return p0
@@ -950,21 +952,27 @@
 
     iget p1, p1, Landroid/graphics/Rect;->right:I
 
-    goto :goto_0
+    sub-int/2addr p0, p1
+
+    return p0
 
     :cond_2
     iget p0, p1, Landroid/graphics/Rect;->top:I
 
     iget p1, p2, Landroid/graphics/Rect;->bottom:I
 
-    goto :goto_0
+    sub-int/2addr p0, p1
+
+    return p0
 
     :cond_3
     iget p0, p1, Landroid/graphics/Rect;->left:I
 
     iget p1, p2, Landroid/graphics/Rect;->right:I
 
-    goto :goto_0
+    sub-int/2addr p0, p1
+
+    return p0
 .end method
 
 .method private static majorAxisDistanceToFarEdge(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I
@@ -1022,7 +1030,6 @@
 
     iget p1, p1, Landroid/graphics/Rect;->bottom:I
 
-    :goto_0
     sub-int/2addr p0, p1
 
     return p0
@@ -1041,21 +1048,27 @@
 
     iget p1, p1, Landroid/graphics/Rect;->right:I
 
-    goto :goto_0
+    sub-int/2addr p0, p1
+
+    return p0
 
     :cond_2
     iget p0, p1, Landroid/graphics/Rect;->top:I
 
     iget p1, p2, Landroid/graphics/Rect;->top:I
 
-    goto :goto_0
+    sub-int/2addr p0, p1
+
+    return p0
 
     :cond_3
     iget p0, p1, Landroid/graphics/Rect;->left:I
 
     iget p1, p2, Landroid/graphics/Rect;->left:I
 
-    goto :goto_0
+    sub-int/2addr p0, p1
+
+    return p0
 .end method
 
 .method private static minorAxisDistance(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I
@@ -1114,7 +1127,6 @@
 
     move-result p2
 
-    :goto_1
     div-int/lit8 p2, p2, 0x2
 
     add-int/2addr p1, p2
@@ -1144,5 +1156,15 @@
 
     move-result p2
 
-    goto :goto_1
+    div-int/lit8 p2, p2, 0x2
+
+    add-int/2addr p1, p2
+
+    sub-int/2addr p0, p1
+
+    invoke-static {p0}, Ljava/lang/Math;->abs(I)I
+
+    move-result p0
+
+    return p0
 .end method
diff --git a/com.discord/smali/androidx/customview/widget/ViewDragHelper$1.smali b/com.discord/smali/androidx/customview/widget/ViewDragHelper$1.smali
index dd32e534d9..363ba89aac 100644
--- a/com.discord/smali/androidx/customview/widget/ViewDragHelper$1.smali
+++ b/com.discord/smali/androidx/customview/widget/ViewDragHelper$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/customview/widget/ViewDragHelper$1;
 .super Ljava/lang/Object;
+.source "ViewDragHelper.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
diff --git a/com.discord/smali/androidx/customview/widget/ViewDragHelper$2.smali b/com.discord/smali/androidx/customview/widget/ViewDragHelper$2.smali
index ad3b5209cf..dae1ebf7ae 100644
--- a/com.discord/smali/androidx/customview/widget/ViewDragHelper$2.smali
+++ b/com.discord/smali/androidx/customview/widget/ViewDragHelper$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/customview/widget/ViewDragHelper$2;
 .super Ljava/lang/Object;
+.source "ViewDragHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/customview/widget/ViewDragHelper$Callback.smali b/com.discord/smali/androidx/customview/widget/ViewDragHelper$Callback.smali
index 5bf243cc01..6ba3ff5932 100644
--- a/com.discord/smali/androidx/customview/widget/ViewDragHelper$Callback.smali
+++ b/com.discord/smali/androidx/customview/widget/ViewDragHelper$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/customview/widget/ViewDragHelper$Callback;
 .super Ljava/lang/Object;
+.source "ViewDragHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali b/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali
index f509ea9335..31f8c3d9fe 100644
--- a/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali
+++ b/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/customview/widget/ViewDragHelper;
 .super Ljava/lang/Object;
+.source "ViewDragHelper.java"
 
 
 # annotations
@@ -218,7 +219,7 @@
 .end method
 
 .method private checkNewEdgeDrag(FFII)Z
-    .locals 2
+    .locals 3
 
     invoke-static {p1}, Ljava/lang/Math;->abs(F)F
 
@@ -236,13 +237,13 @@
 
     const/4 v1, 0x0
 
-    if-ne v0, p4, :cond_2
+    if-ne v0, p4, :cond_3
 
     iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
 
     and-int/2addr v0, p4
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     iget-object v0, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsLocked:[I
 
@@ -250,7 +251,7 @@
 
     and-int/2addr v0, p4
 
-    if-eq v0, p4, :cond_2
+    if-eq v0, p4, :cond_3
 
     iget-object v0, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsInProgress:[I
 
@@ -258,17 +259,15 @@
 
     and-int/2addr v0, p4
 
-    if-eq v0, p4, :cond_2
+    if-eq v0, p4, :cond_3
 
     iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mTouchSlop:I
 
-    int-to-float v0, v0
+    int-to-float v2, v0
 
-    cmpg-float v0, p1, v0
+    cmpg-float v2, p1, v2
 
-    if-gtz v0, :cond_0
-
-    iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mTouchSlop:I
+    if-gtz v2, :cond_0
 
     int-to-float v0, v0
 
@@ -327,6 +326,9 @@
     return p1
 
     :cond_2
+    return v1
+
+    :cond_3
     :goto_0
     return v1
 .end method
@@ -387,9 +389,7 @@
 
     iget p1, p0, Landroidx/customview/widget/ViewDragHelper;->mTouchSlop:I
 
-    iget p3, p0, Landroidx/customview/widget/ViewDragHelper;->mTouchSlop:I
-
-    mul-int p1, p1, p3
+    mul-int p1, p1, p1
 
     int-to-float p1, p1
 
@@ -423,7 +423,7 @@
     return v0
 
     :cond_6
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_8
 
     invoke-static {p3}, Ljava/lang/Math;->abs(F)F
 
@@ -441,6 +441,9 @@
 
     :cond_7
     return v0
+
+    :cond_8
+    return v0
 .end method
 
 .method private clampMag(FFF)F
@@ -472,6 +475,8 @@
     :cond_1
     neg-float p1, p3
 
+    return p1
+
     :cond_2
     return p1
 .end method
@@ -499,6 +504,8 @@
     :cond_1
     neg-int p1, p3
 
+    return p1
+
     :cond_2
     return p1
 .end method
@@ -513,8 +520,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionX:[F
-
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
@@ -610,6 +615,8 @@
 
     iput p1, p0, Landroidx/customview/widget/ViewDragHelper;->mPointersDown:I
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -767,38 +774,32 @@
 
     int-to-float v2, v4
 
-    :goto_0
-    div-float/2addr v0, v2
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     int-to-float v0, v0
 
     int-to-float v2, v5
 
-    goto :goto_0
+    :goto_0
+    div-float/2addr v0, v2
 
-    :goto_1
     if-eqz p5, :cond_1
 
     int-to-float v1, v3
 
     int-to-float v2, v4
 
-    :goto_2
-    div-float/2addr v1, v2
-
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     int-to-float v1, v1
 
     int-to-float v2, v5
 
-    goto :goto_2
+    :goto_1
+    div-float/2addr v1, v2
 
-    :goto_3
     iget-object v2, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
 
     invoke-virtual {v2, p1}, Landroidx/customview/widget/ViewDragHelper$Callback;->getViewHorizontalDragRange(Landroid/view/View;)I
@@ -968,9 +969,14 @@
 
     invoke-static {v2, v3}, Landroidx/core/view/ViewCompat;->offsetLeftAndRight(Landroid/view/View;I)V
 
+    move v6, p1
+
+    goto :goto_0
+
     :cond_0
     move v6, p1
 
+    :goto_0
     if-eqz p4, :cond_1
 
     iget-object p1, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
@@ -987,9 +993,14 @@
 
     invoke-static {p1, v2}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
 
+    move v7, p2
+
+    goto :goto_1
+
     :cond_1
     move v7, p2
 
+    :goto_1
     if-nez p3, :cond_2
 
     if-eqz p4, :cond_3
@@ -1016,8 +1027,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionX:[F
-
     array-length v0, v0
 
     if-gt v0, p1, :cond_2
@@ -1043,11 +1052,7 @@
 
     if-eqz v6, :cond_1
 
-    iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionX:[F
-
-    iget-object v7, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionX:[F
-
-    array-length v7, v7
+    array-length v7, v6
 
     const/4 v8, 0x0
 
@@ -1055,49 +1060,37 @@
 
     iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionY:[F
 
-    iget-object v7, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionY:[F
-
-    array-length v7, v7
+    array-length v7, v6
 
     invoke-static {v6, v8, v1, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mLastMotionX:[F
 
-    iget-object v7, p0, Landroidx/customview/widget/ViewDragHelper;->mLastMotionX:[F
-
-    array-length v7, v7
+    array-length v7, v6
 
     invoke-static {v6, v8, v2, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mLastMotionY:[F
 
-    iget-object v7, p0, Landroidx/customview/widget/ViewDragHelper;->mLastMotionY:[F
-
-    array-length v7, v7
+    array-length v7, v6
 
     invoke-static {v6, v8, v3, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialEdgesTouched:[I
 
-    iget-object v7, p0, Landroidx/customview/widget/ViewDragHelper;->mInitialEdgesTouched:[I
-
-    array-length v7, v7
+    array-length v7, v6
 
     invoke-static {v6, v8, v4, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsInProgress:[I
 
-    iget-object v7, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsInProgress:[I
-
-    array-length v7, v7
+    array-length v7, v6
 
     invoke-static {v6, v8, v5, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsLocked:[I
 
-    iget-object v7, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsLocked:[I
-
-    array-length v7, v7
+    array-length v7, v6
 
     invoke-static {v6, v8, p1, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -1705,8 +1698,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/customview/widget/ViewDragHelper;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->recycle()V
 
     const/4 v0, 0x0
@@ -1879,9 +1870,7 @@
 
     iget p1, p0, Landroidx/customview/widget/ViewDragHelper;->mTouchSlop:I
 
-    iget p2, p0, Landroidx/customview/widget/ViewDragHelper;->mTouchSlop:I
-
-    mul-int p1, p1, p2
+    mul-int p1, p1, p1
 
     int-to-float p1, p1
 
@@ -1915,7 +1904,7 @@
     return v1
 
     :cond_6
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_8
 
     invoke-static {v4}, Ljava/lang/Math;->abs(F)F
 
@@ -1933,6 +1922,9 @@
 
     :cond_7
     return v1
+
+    :cond_8
+    return v1
 .end method
 
 .method public continueSettling(Z)Z
@@ -2483,9 +2475,7 @@
 
     if-ne v5, v6, :cond_2
 
-    iget-object v5, p0, Landroidx/customview/widget/ViewDragHelper;->mCapturedView:Landroid/view/View;
-
-    invoke-virtual {p0, v5, v4}, Landroidx/customview/widget/ViewDragHelper;->tryCaptureViewForDrag(Landroid/view/View;I)Z
+    invoke-virtual {p0, v6, v4}, Landroidx/customview/widget/ViewDragHelper;->tryCaptureViewForDrag(Landroid/view/View;I)Z
 
     move-result v4
 
@@ -2548,17 +2538,15 @@
 
     iget v1, p0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
 
-    and-int/2addr v1, p1
+    and-int v2, p1, v1
 
-    if-eqz v1, :cond_5
+    if-eqz v2, :cond_5
 
-    iget-object v1, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
+    iget-object v2, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
 
-    iget v2, p0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
+    and-int/2addr p1, v1
 
-    and-int/2addr p1, v2
-
-    invoke-virtual {v1, p1, v0}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
+    invoke-virtual {v2, p1, v0}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
 
     :cond_5
     return-void
@@ -2633,8 +2621,6 @@
 
     iget-object v2, p0, Landroidx/customview/widget/ViewDragHelper;->mLastMotionY:[F
 
-    iget v3, p0, Landroidx/customview/widget/ViewDragHelper;->mActivePointerId:I
-
     aget v2, v2, v3
 
     sub-float/2addr v0, v2
@@ -2780,24 +2766,22 @@
 
     iget v1, p0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
 
-    and-int/2addr v1, v0
+    and-int v2, v0, v1
 
-    if-eqz v1, :cond_c
+    if-eqz v2, :cond_c
 
-    iget-object v1, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
+    iget-object v2, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
 
-    iget v2, p0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
+    and-int/2addr v0, v1
 
-    and-int/2addr v0, v2
+    invoke-virtual {v2, v0, p1}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
 
-    invoke-virtual {v1, v0, p1}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
+    return-void
 
     :cond_c
     :goto_3
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_6
@@ -2982,23 +2966,19 @@
 
     iget v3, v0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
 
-    and-int/2addr v3, v1
+    and-int v4, v1, v3
 
-    if-eqz v3, :cond_9
+    if-eqz v4, :cond_9
 
-    iget-object v3, v0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
+    iget-object v4, v0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
 
-    iget v4, v0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
+    and-int/2addr v1, v3
 
-    and-int/2addr v1, v4
-
-    invoke-virtual {v3, v1, v2}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
+    invoke-virtual {v4, v1, v2}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
 
     goto/16 :goto_2
 
     :cond_2
-    iget v3, v0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
-
     if-ne v3, v4, :cond_9
 
     float-to-int v3, v7
@@ -3216,17 +3196,15 @@
 
     iget v3, v0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
 
-    and-int/2addr v3, v2
+    and-int v4, v2, v3
 
-    if-eqz v3, :cond_9
+    if-eqz v4, :cond_9
 
-    iget-object v3, v0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
+    iget-object v4, v0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
 
-    iget v4, v0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
+    and-int/2addr v2, v3
 
-    and-int/2addr v2, v4
-
-    invoke-virtual {v3, v2, v1}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
+    invoke-virtual {v4, v2, v1}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
 
     :cond_9
     :goto_2
diff --git a/com.discord/smali/androidx/documentfile/R.smali b/com.discord/smali/androidx/documentfile/R.smali
index 7600a98482..8010e394bd 100644
--- a/com.discord/smali/androidx/documentfile/R.smali
+++ b/com.discord/smali/androidx/documentfile/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/documentfile/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/documentfile/provider/DocumentFile.smali b/com.discord/smali/androidx/documentfile/provider/DocumentFile.smali
index c52e93388a..c35f17d7d7 100644
--- a/com.discord/smali/androidx/documentfile/provider/DocumentFile.smali
+++ b/com.discord/smali/androidx/documentfile/provider/DocumentFile.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/documentfile/provider/DocumentFile;
 .super Ljava/lang/Object;
+.source "DocumentFile.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali b/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali
index 48416b09ba..4e218e84f3 100644
--- a/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali
+++ b/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali
@@ -1,5 +1,6 @@
 .class Landroidx/documentfile/provider/DocumentsContractApi19;
 .super Ljava/lang/Object;
+.source "DocumentsContractApi19.java"
 
 
 # annotations
@@ -187,20 +188,16 @@
 
     invoke-virtual/range {v0 .. v5}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p1
+    move-result-object v7
+
+    invoke-interface {v7}, Landroid/database/Cursor;->getCount()I
+
+    move-result p1
     :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {p1}, Landroid/database/Cursor;->getCount()I
-
-    move-result v0
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-lez v0, :cond_0
+    if-lez p1, :cond_0
 
     goto :goto_0
 
@@ -208,34 +205,19 @@
     const/4 p0, 0x0
 
     :goto_0
-    invoke-static {p1}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
+    invoke-static {v7}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     return p0
 
     :catchall_0
     move-exception p0
 
-    move-object v7, p1
-
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception p0
 
-    move-object v7, p1
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception p0
-
-    goto :goto_2
-
-    :catch_1
-    move-exception p0
-
-    :goto_1
-    :try_start_2
+    :try_start_1
     const-string p1, "DocumentFile"
 
     const-string v0, "Failed query: "
@@ -249,14 +231,14 @@
     move-result-object p0
 
     invoke-static {p1, p0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     invoke-static {v7}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     return v6
 
-    :goto_2
+    :goto_1
     invoke-static {v7}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     throw p0
@@ -327,6 +309,8 @@
 
     const/4 p0, 0x0
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -488,64 +472,45 @@
 
     invoke-virtual/range {v0 .. v5}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p1
+    move-result-object v6
+
+    invoke-interface {v6}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {v6, p0}, Landroid/database/Cursor;->isNull(I)Z
+
+    move-result p1
+
+    if-nez p1, :cond_0
+
+    invoke-interface {v6, p0}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide p0
     :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {p1}, Landroid/database/Cursor;->moveToFirst()Z
+    invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
-    move-result p2
-
-    if-eqz p2, :cond_0
-
-    invoke-interface {p1, p0}, Landroid/database/Cursor;->isNull(I)Z
-
-    move-result p2
-
-    if-nez p2, :cond_0
-
-    invoke-interface {p1, p0}, Landroid/database/Cursor;->getLong(I)J
-
-    move-result-wide v0
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    invoke-static {p1}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
-
-    return-wide v0
+    return-wide p0
 
     :cond_0
-    invoke-static {p1}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
+    invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     return-wide p3
 
     :catchall_0
     move-exception p0
 
-    move-object v6, p1
-
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception p0
 
-    move-object v6, p1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p0
-
-    goto :goto_1
-
-    :catch_1
-    move-exception p0
-
-    :goto_0
-    :try_start_2
+    :try_start_1
     const-string p1, "DocumentFile"
 
     const-string p2, "Failed query: "
@@ -559,14 +524,14 @@
     move-result-object p0
 
     invoke-static {p1, p0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     return-wide p3
 
-    :goto_1
+    :goto_0
     invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     throw p0
@@ -606,64 +571,45 @@
 
     invoke-virtual/range {v0 .. v5}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p1
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v6
 
-    :try_start_1
-    invoke-interface {p1}, Landroid/database/Cursor;->moveToFirst()Z
+    invoke-interface {v6}, Landroid/database/Cursor;->moveToFirst()Z
 
-    move-result p2
+    move-result p1
 
-    if-eqz p2, :cond_0
+    if-eqz p1, :cond_0
 
-    invoke-interface {p1, p0}, Landroid/database/Cursor;->isNull(I)Z
+    invoke-interface {v6, p0}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result p2
+    move-result p1
 
-    if-nez p2, :cond_0
+    if-nez p1, :cond_0
 
-    invoke-interface {p1, p0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
+    invoke-interface {v6, p0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object p0
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :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 {p1}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
+    invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     return-object p0
 
     :cond_0
-    invoke-static {p1}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
+    invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     return-object p3
 
     :catchall_0
     move-exception p0
 
-    move-object v6, p1
-
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception p0
 
-    move-object v6, p1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p0
-
-    goto :goto_1
-
-    :catch_1
-    move-exception p0
-
-    :goto_0
-    :try_start_2
+    :try_start_1
     const-string p1, "DocumentFile"
 
     const-string p2, "Failed query: "
@@ -677,14 +623,14 @@
     move-result-object p0
 
     invoke-static {p1, p0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     return-object p3
 
-    :goto_1
+    :goto_0
     invoke-static {v6}, Landroidx/documentfile/provider/DocumentsContractApi19;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     throw p0
diff --git a/com.discord/smali/androidx/documentfile/provider/RawDocumentFile.smali b/com.discord/smali/androidx/documentfile/provider/RawDocumentFile.smali
index d6960629b5..733fcdbbfe 100644
--- a/com.discord/smali/androidx/documentfile/provider/RawDocumentFile.smali
+++ b/com.discord/smali/androidx/documentfile/provider/RawDocumentFile.smali
@@ -1,5 +1,6 @@
 .class Landroidx/documentfile/provider/RawDocumentFile;
 .super Landroidx/documentfile/provider/DocumentFile;
+.source "RawDocumentFile.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/documentfile/provider/SingleDocumentFile.smali b/com.discord/smali/androidx/documentfile/provider/SingleDocumentFile.smali
index cf7a7b18c3..fe95a4fce2 100644
--- a/com.discord/smali/androidx/documentfile/provider/SingleDocumentFile.smali
+++ b/com.discord/smali/androidx/documentfile/provider/SingleDocumentFile.smali
@@ -1,5 +1,6 @@
 .class Landroidx/documentfile/provider/SingleDocumentFile;
 .super Landroidx/documentfile/provider/DocumentFile;
+.source "SingleDocumentFile.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali b/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali
index 2cd2a2ec89..586c4ee5d9 100644
--- a/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali
+++ b/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali
@@ -1,5 +1,6 @@
 .class Landroidx/documentfile/provider/TreeDocumentFile;
 .super Landroidx/documentfile/provider/DocumentFile;
+.source "TreeDocumentFile.java"
 
 
 # annotations
@@ -333,9 +334,7 @@
 
     iget-object v0, p0, Landroidx/documentfile/provider/TreeDocumentFile;->mUri:Landroid/net/Uri;
 
-    iget-object v2, p0, Landroidx/documentfile/provider/TreeDocumentFile;->mUri:Landroid/net/Uri;
-
-    invoke-static {v2}, Landroid/provider/DocumentsContract;->getDocumentId(Landroid/net/Uri;)Ljava/lang/String;
+    invoke-static {v0}, Landroid/provider/DocumentsContract;->getDocumentId(Landroid/net/Uri;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -368,84 +367,60 @@
 
     invoke-virtual/range {v1 .. v6}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object v1
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v8
 
     :goto_0
-    :try_start_1
-    invoke-interface {v1}, Landroid/database/Cursor;->moveToNext()Z
+    invoke-interface {v8}, Landroid/database/Cursor;->moveToNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-interface {v1, v7}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
+    invoke-interface {v8, v7}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    iget-object v3, p0, Landroidx/documentfile/provider/TreeDocumentFile;->mUri:Landroid/net/Uri;
+    iget-object v2, p0, Landroidx/documentfile/provider/TreeDocumentFile;->mUri:Landroid/net/Uri;
 
-    invoke-static {v3, v2}, Landroid/provider/DocumentsContract;->buildDocumentUriUsingTree(Landroid/net/Uri;Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v2, v1}, Landroid/provider/DocumentsContract;->buildDocumentUriUsingTree(Landroid/net/Uri;Ljava/lang/String;)Landroid/net/Uri;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)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
 
     goto :goto_0
 
-    :cond_0
-    invoke-static {v1}, Landroidx/documentfile/provider/TreeDocumentFile;->closeQuietly(Ljava/lang/AutoCloseable;)V
-
-    goto :goto_2
-
     :catchall_0
     move-exception v0
 
-    move-object v8, v1
-
-    goto :goto_4
+    goto :goto_2
 
     :catch_0
-    move-exception v2
+    move-exception v1
 
-    move-object v8, v1
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception v0
-
-    goto :goto_4
-
-    :catch_1
-    move-exception v2
-
-    :goto_1
-    :try_start_2
-    const-string v1, "DocumentFile"
+    :try_start_1
+    const-string v2, "DocumentFile"
 
     const-string v3, "Failed query: "
 
-    invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v3, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v1, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    invoke-static {v2, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
+    :cond_0
     invoke-static {v8}, Landroidx/documentfile/provider/TreeDocumentFile;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
-    :goto_2
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
@@ -462,7 +437,7 @@
 
     new-array v1, v1, [Landroidx/documentfile/provider/DocumentFile;
 
-    :goto_3
+    :goto_1
     array-length v2, v0
 
     if-ge v7, v2, :cond_1
@@ -479,15 +454,17 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     return-object v1
 
-    :goto_4
+    :goto_2
     invoke-static {v8}, Landroidx/documentfile/provider/TreeDocumentFile;->closeQuietly(Ljava/lang/AutoCloseable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public renameTo(Ljava/lang/String;)Z
@@ -518,7 +495,9 @@
 
     return p1
 
-    :catch_0
     :cond_0
     return v0
+
+    :catch_0
+    return v0
 .end method
diff --git a/com.discord/smali/androidx/drawerlayout/R$attr.smali b/com.discord/smali/androidx/drawerlayout/R$attr.smali
index 9af7a7a184..f7a5b08d2d 100644
--- a/com.discord/smali/androidx/drawerlayout/R$attr.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$color.smali b/com.discord/smali/androidx/drawerlayout/R$color.smali
index 1972321fa9..44faa2d79f 100644
--- a/com.discord/smali/androidx/drawerlayout/R$color.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$dimen.smali b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
index 5263000640..f87f28ee66 100644
--- a/com.discord/smali/androidx/drawerlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index 7a832c540c..21ddae41cb 100644
--- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index 29536ae2d8..0a2bda939b 100644
--- a/com.discord/smali/androidx/drawerlayout/R$id.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$integer.smali b/com.discord/smali/androidx/drawerlayout/R$integer.smali
index 51dcf5d973..325ebd9d2d 100644
--- a/com.discord/smali/androidx/drawerlayout/R$integer.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$layout.smali b/com.discord/smali/androidx/drawerlayout/R$layout.smali
index 79812df0a7..e0b640e17a 100644
--- a/com.discord/smali/androidx/drawerlayout/R$layout.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index 9cf9f444e7..f291c5b939 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$style.smali b/com.discord/smali/androidx/drawerlayout/R$style.smali
index 93389b0552..bbec715270 100644
--- a/com.discord/smali/androidx/drawerlayout/R$style.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R$styleable.smali b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
index 4b6ec4f942..ac6a871b79 100644
--- a/com.discord/smali/androidx/drawerlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/R.smali b/com.discord/smali/androidx/drawerlayout/R.smali
index a8ca135fb9..fedbd28778 100644
--- a/com.discord/smali/androidx/drawerlayout/R.smali
+++ b/com.discord/smali/androidx/drawerlayout/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/drawerlayout/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$1.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$1.smali
index 514aec0897..11d77f0ecd 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$1.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/drawerlayout/widget/DrawerLayout$1;
 .super Ljava/lang/Object;
+.source "DrawerLayout.java"
 
 # interfaces
 .implements Landroid/view/View$OnApplyWindowInsetsListener;
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali
index 5b5b8cf04e..e74e0a51aa 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "DrawerLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate.smali
index f2b7767cf5..a720320813 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "DrawerLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$DrawerListener.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$DrawerListener.smali
index 4f2ec61aa6..59ad743199 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$DrawerListener.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$DrawerListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
 .super Ljava/lang/Object;
+.source "DrawerLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$LayoutParams.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$LayoutParams.smali
index 196317c5bc..1f6050dac6 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$LayoutParams.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "DrawerLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState$1.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState$1.smali
index 586131dc0a..29dd6200ec 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState$1.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;
 .super Ljava/lang/Object;
+.source "DrawerLayout.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState.smali
index 616b3f27fa..c332f17c60 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/drawerlayout/widget/DrawerLayout$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "DrawerLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SimpleDrawerListener.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SimpleDrawerListener.smali
index ab5a44ff8d..3c86b45d58 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SimpleDrawerListener.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$SimpleDrawerListener.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/drawerlayout/widget/DrawerLayout$SimpleDrawerListener;
 .super Ljava/lang/Object;
+.source "DrawerLayout.java"
 
 # interfaces
 .implements Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback$1.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback$1.smali
index 85f1a16b7f..22416a8f89 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback$1.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback$1;
 .super Ljava/lang/Object;
+.source "DrawerLayout.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali
index 089c85b024..39d6c91836 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
 .super Landroidx/customview/widget/ViewDragHelper$Callback;
+.source "DrawerLayout.java"
 
 
 # annotations
@@ -93,7 +94,6 @@
 
     const/4 p3, 0x0
 
-    :goto_0
     invoke-static {p2, p3}, Ljava/lang/Math;->min(II)I
 
     move-result p2
@@ -117,7 +117,15 @@
 
     sub-int p1, p3, p1
 
-    goto :goto_0
+    invoke-static {p2, p3}, Ljava/lang/Math;->min(II)I
+
+    move-result p2
+
+    invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
+
+    move-result p1
+
+    return p1
 .end method
 
 .method public clampViewPositionVertical(Landroid/view/View;II)I
@@ -166,21 +174,22 @@
 
     const/4 v0, 0x3
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->findDrawerWithGravity(I)Landroid/view/View;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object p1, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
 
     const/4 v0, 0x5
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->findDrawerWithGravity(I)Landroid/view/View;
 
-    :goto_1
+    move-result-object p1
+
+    :goto_0
     if-eqz p1, :cond_1
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
@@ -278,12 +287,11 @@
 
     int-to-float p2, p2
 
-    :goto_0
     int-to-float p3, p3
 
     div-float/2addr p2, p3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object p4, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
@@ -296,9 +304,11 @@
 
     int-to-float p2, p4
 
-    goto :goto_0
+    int-to-float p3, p3
 
-    :goto_1
+    div-float/2addr p2, p3
+
+    :goto_0
     iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
 
     invoke-virtual {p3, p1, p2}, Landroidx/drawerlayout/widget/DrawerLayout;->setDrawerViewOffset(Landroid/view/View;F)V
@@ -311,12 +321,12 @@
 
     const/4 p2, 0x4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 p2, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
 
     iget-object p1, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
@@ -430,9 +440,9 @@
 
     iget v1, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->mAbsGravity:I
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     const/4 v4, 0x3
 
@@ -458,31 +468,31 @@
 
     invoke-virtual {v4}, Landroid/view/View;->getWidth()I
 
-    move-result v2
+    move-result v3
 
-    neg-int v2, v2
+    neg-int v3, v3
 
     :cond_1
-    add-int/2addr v2, v0
+    add-int/2addr v3, v0
 
     goto :goto_1
 
     :cond_2
-    iget-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
+    iget-object v3, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
 
     const/4 v4, 0x5
 
-    invoke-virtual {v2, v4}, Landroidx/drawerlayout/widget/DrawerLayout;->findDrawerWithGravity(I)Landroid/view/View;
+    invoke-virtual {v3, v4}, Landroidx/drawerlayout/widget/DrawerLayout;->findDrawerWithGravity(I)Landroid/view/View;
 
     move-result-object v4
 
-    iget-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
+    iget-object v3, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
 
-    invoke-virtual {v2}, Landroidx/drawerlayout/widget/DrawerLayout;->getWidth()I
+    invoke-virtual {v3}, Landroidx/drawerlayout/widget/DrawerLayout;->getWidth()I
 
-    move-result v2
+    move-result v3
 
-    sub-int/2addr v2, v0
+    sub-int/2addr v3, v0
 
     :goto_1
     if-eqz v4, :cond_5
@@ -493,7 +503,7 @@
 
     move-result v0
 
-    if-lt v0, v2, :cond_4
+    if-lt v0, v3, :cond_4
 
     :cond_3
     if-nez v1, :cond_5
@@ -502,7 +512,7 @@
 
     move-result v0
 
-    if-le v0, v2, :cond_5
+    if-le v0, v3, :cond_5
 
     :cond_4
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
@@ -525,9 +535,9 @@
 
     move-result v5
 
-    invoke-virtual {v1, v4, v2, v5}, Landroidx/customview/widget/ViewDragHelper;->smoothSlideViewTo(Landroid/view/View;II)Z
+    invoke-virtual {v1, v4, v3, v5}, Landroidx/customview/widget/ViewDragHelper;->smoothSlideViewTo(Landroid/view/View;II)Z
 
-    iput-boolean v3, v0, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->isPeeking:Z
+    iput-boolean v2, v0, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->isPeeking:Z
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
 
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali
index 13fa3f846c..48376119b5 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/drawerlayout/widget/DrawerLayout;
 .super Landroid/view/ViewGroup;
+.source "DrawerLayout.java"
 
 
 # annotations
@@ -642,7 +643,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_0
+    if-eqz p0, :cond_1
 
     invoke-virtual {p0}, Landroid/graphics/drawable/Drawable;->getOpacity()I
 
@@ -658,6 +659,9 @@
 
     :cond_0
     return v0
+
+    :cond_1
+    return v0
 .end method
 
 .method private hasPeekingDrawer()Z
@@ -820,8 +824,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
-
     invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
@@ -833,8 +835,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
-
     invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
@@ -860,8 +860,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
-
     invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
@@ -873,8 +871,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
-
     invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
@@ -944,17 +940,16 @@
     :cond_1
     const/4 v3, 0x1
 
-    :goto_1
     invoke-static {v2, v3}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v3, 0x4
 
-    goto :goto_1
+    invoke-static {v2, v3}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
 
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
@@ -1126,15 +1121,17 @@
     :cond_0
     const/4 p2, 0x1
 
+    invoke-static {p1, p2}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
+
     goto :goto_1
 
     :cond_1
     :goto_0
     const/4 p2, 0x4
 
-    :goto_1
     invoke-static {p1, p2}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
 
+    :goto_1
     sget-boolean p2, Landroidx/drawerlayout/widget/DrawerLayout;->CAN_HIDE_DESCENDANTS:Z
 
     if-nez p2, :cond_2
@@ -1338,7 +1335,7 @@
 
     iput v2, v0, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->openState:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v1, 0x4
@@ -1367,14 +1364,13 @@
 
     neg-int v0, v0
 
-    :goto_0
     invoke-virtual {p1}, Landroid/view/View;->getTop()I
 
     move-result v1
 
     invoke-virtual {p2, p1, v0, v1}, Landroidx/customview/widget/ViewDragHelper;->smoothSlideViewTo(Landroid/view/View;II)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
@@ -1383,6 +1379,12 @@
 
     move-result v0
 
+    invoke-virtual {p1}, Landroid/view/View;->getTop()I
+
+    move-result v1
+
+    invoke-virtual {p2, p1, v0, v1}, Landroidx/customview/widget/ViewDragHelper;->smoothSlideViewTo(Landroid/view/View;II)Z
+
     goto :goto_0
 
     :cond_2
@@ -1394,7 +1396,7 @@
 
     invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0}, Landroidx/drawerlayout/widget/DrawerLayout;->invalidate()V
 
     return-void
@@ -1496,10 +1498,9 @@
 
     move-result v4
 
-    :goto_1
     or-int/2addr v3, v4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object v6, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
@@ -1516,9 +1517,9 @@
 
     move-result v4
 
-    goto :goto_1
+    or-int/2addr v3, v4
 
-    :goto_2
+    :goto_1
     iput-boolean v1, v5, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->isPeeking:Z
 
     :cond_2
@@ -1724,8 +1725,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -1795,8 +1794,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -1844,8 +1841,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -2003,35 +1998,31 @@
 
     const/4 v5, 0x0
 
-    cmpl-float v3, v3, v5
+    cmpl-float v6, v3, v5
 
-    if-lez v3, :cond_4
+    if-lez v6, :cond_4
 
     if-eqz v4, :cond_4
 
     iget v2, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mScrimColor:I
 
-    const/high16 v3, -0x1000000
+    const/high16 v4, -0x1000000
 
-    and-int/2addr v2, v3
+    and-int/2addr v4, v2
 
-    ushr-int/lit8 v2, v2, 0x18
+    ushr-int/lit8 v4, v4, 0x18
 
-    int-to-float v2, v2
+    int-to-float v4, v4
 
-    iget v3, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mScrimOpacity:F
+    mul-float v4, v4, v3
 
-    mul-float v2, v2, v3
+    float-to-int v3, v4
 
-    float-to-int v2, v2
-
-    shl-int/lit8 v2, v2, 0x18
-
-    iget v3, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mScrimColor:I
+    shl-int/lit8 v3, v3, 0x18
 
     const v4, 0xffffff
 
-    and-int/2addr v3, v4
+    and-int/2addr v2, v4
 
     or-int/2addr v2, v3
 
@@ -2057,7 +2048,7 @@
 
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_4
     iget-object v3, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowLeftResolved:Landroid/graphics/drawable/Drawable;
@@ -2128,10 +2119,9 @@
 
     iget-object v2, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowLeftResolved:Landroid/graphics/drawable/Drawable;
 
-    :goto_3
     invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     iget-object v3, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowRightResolved:Landroid/graphics/drawable/Drawable;
@@ -2206,10 +2196,10 @@
 
     iget-object v2, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowRightResolved:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_3
+    invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
     :cond_6
-    :goto_4
+    :goto_3
     return v9
 .end method
 
@@ -2453,8 +2443,6 @@
 
     if-eq p1, v1, :cond_1
 
-    iget p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeEnd:I
-
     return p1
 
     :cond_1
@@ -2477,8 +2465,6 @@
 
     if-eq p1, v1, :cond_4
 
-    iget p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeStart:I
-
     return p1
 
     :cond_4
@@ -2501,8 +2487,6 @@
 
     if-eq p1, v1, :cond_7
 
-    iget p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeRight:I
-
     return p1
 
     :cond_7
@@ -2525,8 +2509,6 @@
 
     if-eq p1, v1, :cond_a
 
-    iget p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeLeft:I
-
     return p1
 
     :cond_a
@@ -2982,11 +2964,11 @@
 
     iget-boolean v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawStatusBarBackground:Z
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -2994,14 +2976,12 @@
 
     const/4 v2, 0x0
 
-    if-lt v0, v1, :cond_0
+    if-lt v0, v1, :cond_1
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLastInsets:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLastInsets:Ljava/lang/Object;
-
     check-cast v0, Landroid/view/WindowInsets;
 
     invoke-virtual {v0}, Landroid/view/WindowInsets;->getSystemWindowInsetTop()I
@@ -3013,8 +2993,13 @@
     :cond_0
     const/4 v0, 0x0
 
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
     :goto_0
-    if-lez v0, :cond_1
+    if-lez v0, :cond_2
 
     iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
 
@@ -3028,7 +3013,7 @@
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
-    :cond_1
+    :cond_2
     return-void
 .end method
 
@@ -3250,273 +3235,273 @@
 .end method
 
 .method protected onLayout(ZIIII)V
-    .locals 15
+    .locals 16
 
-    move-object v0, p0
+    move-object/from16 v0, p0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    iput-boolean v2, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mInLayout:Z
+    iput-boolean v1, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mInLayout:Z
 
-    sub-int v3, p4, p2
+    sub-int v2, p4, p2
 
-    invoke-virtual {p0}, Landroidx/drawerlayout/widget/DrawerLayout;->getChildCount()I
+    invoke-virtual/range {p0 .. p0}, Landroidx/drawerlayout/widget/DrawerLayout;->getChildCount()I
 
-    move-result v4
+    move-result v3
 
-    const/4 v6, 0x0
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
 
     :goto_0
-    if-ge v6, v4, :cond_a
+    if-ge v5, v3, :cond_a
 
-    invoke-virtual {p0, v6}, Landroidx/drawerlayout/widget/DrawerLayout;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {v0, v5}, Landroidx/drawerlayout/widget/DrawerLayout;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v6
+
+    invoke-virtual {v6}, Landroid/view/View;->getVisibility()I
+
+    move-result v7
+
+    const/16 v8, 0x8
+
+    if-eq v7, v8, :cond_9
+
+    invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Landroid/view/View;->getVisibility()I
+    check-cast v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;
+
+    invoke-virtual {v0, v6}, Landroidx/drawerlayout/widget/DrawerLayout;->isContentView(Landroid/view/View;)Z
 
     move-result v8
 
-    const/16 v9, 0x8
+    if-eqz v8, :cond_0
 
-    if-eq v8, v9, :cond_9
+    iget v8, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->leftMargin:I
 
-    invoke-virtual {v7}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    iget v9, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
 
-    move-result-object v8
+    iget v10, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->leftMargin:I
 
-    check-cast v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;
+    invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
 
-    invoke-virtual {p0, v7}, Landroidx/drawerlayout/widget/DrawerLayout;->isContentView(Landroid/view/View;)Z
+    move-result v11
 
-    move-result v9
+    add-int/2addr v10, v11
 
-    if-eqz v9, :cond_0
+    iget v7, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
 
-    iget v9, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->leftMargin:I
+    invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I
 
-    iget v10, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
+    move-result v11
 
-    iget v11, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->leftMargin:I
+    add-int/2addr v7, v11
 
-    invoke-virtual {v7}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v12
-
-    add-int/2addr v11, v12
-
-    iget v8, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
-
-    invoke-virtual {v7}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v12
-
-    add-int/2addr v8, v12
-
-    invoke-virtual {v7, v9, v10, v11, v8}, Landroid/view/View;->layout(IIII)V
+    invoke-virtual {v6, v8, v9, v10, v7}, Landroid/view/View;->layout(IIII)V
 
     goto/16 :goto_6
 
     :cond_0
-    invoke-virtual {v7}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v8
+
+    invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v9
 
-    invoke-virtual {v7}, Landroid/view/View;->getMeasuredHeight()I
+    const/4 v10, 0x3
+
+    invoke-virtual {v0, v6, v10}, Landroidx/drawerlayout/widget/DrawerLayout;->checkDrawerViewAbsoluteGravity(Landroid/view/View;I)Z
 
     move-result v10
 
-    const/4 v11, 0x3
+    if-eqz v10, :cond_1
 
-    invoke-virtual {p0, v7, v11}, Landroidx/drawerlayout/widget/DrawerLayout;->checkDrawerViewAbsoluteGravity(Landroid/view/View;I)Z
+    neg-int v10, v8
 
-    move-result v11
+    int-to-float v11, v8
 
-    if-eqz v11, :cond_1
-
-    neg-int v11, v9
-
-    int-to-float v12, v9
-
-    iget v13, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
-
-    mul-float v13, v13, v12
-
-    float-to-int v13, v13
-
-    add-int/2addr v11, v13
-
-    add-int v13, v9, v11
-
-    int-to-float v13, v13
-
-    div-float/2addr v13, v12
-
-    goto :goto_1
-
-    :cond_1
-    int-to-float v11, v9
-
-    iget v12, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
+    iget v12, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
 
     mul-float v12, v12, v11
 
     float-to-int v12, v12
 
-    sub-int v12, v3, v12
+    add-int/2addr v10, v12
 
-    sub-int v13, v3, v12
+    add-int v12, v8, v10
 
-    int-to-float v13, v13
+    int-to-float v12, v12
 
-    div-float/2addr v13, v11
+    div-float/2addr v12, v11
 
-    move v11, v12
+    goto :goto_1
+
+    :cond_1
+    int-to-float v10, v8
+
+    iget v11, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
+
+    mul-float v11, v11, v10
+
+    float-to-int v11, v11
+
+    sub-int v11, v2, v11
+
+    sub-int v12, v2, v11
+
+    int-to-float v12, v12
+
+    div-float/2addr v12, v10
+
+    move v10, v11
 
     :goto_1
-    iget v12, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
+    iget v11, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
 
-    cmpl-float v12, v13, v12
+    cmpl-float v11, v12, v11
 
-    if-eqz v12, :cond_2
+    if-eqz v11, :cond_2
 
-    const/4 v12, 0x1
+    const/4 v11, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
     :goto_2
-    iget v14, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->gravity:I
+    iget v13, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->gravity:I
 
-    and-int/lit8 v14, v14, 0x70
+    and-int/lit8 v13, v13, 0x70
 
-    const/16 v2, 0x10
+    const/16 v14, 0x10
 
-    if-eq v14, v2, :cond_4
+    if-eq v13, v14, :cond_4
 
-    const/16 v2, 0x50
+    const/16 v14, 0x50
 
-    if-eq v14, v2, :cond_3
+    if-eq v13, v14, :cond_3
 
-    iget v2, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
+    iget v13, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
 
-    add-int/2addr v9, v11
+    add-int/2addr v8, v10
 
-    iget v14, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
+    iget v14, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
 
-    add-int/2addr v14, v10
+    add-int/2addr v14, v9
 
-    invoke-virtual {v7, v11, v2, v9, v14}, Landroid/view/View;->layout(IIII)V
+    invoke-virtual {v6, v10, v13, v8, v14}, Landroid/view/View;->layout(IIII)V
 
     goto :goto_4
 
     :cond_3
-    sub-int v2, p5, p3
+    sub-int v9, p5, p3
 
-    iget v10, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
+    iget v13, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
 
-    sub-int v10, v2, v10
+    sub-int v13, v9, v13
 
-    invoke-virtual {v7}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v14
 
-    sub-int/2addr v10, v14
+    sub-int/2addr v13, v14
 
-    add-int/2addr v9, v11
+    add-int/2addr v8, v10
 
-    iget v14, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
+    iget v14, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
 
-    sub-int/2addr v2, v14
+    sub-int/2addr v9, v14
 
-    invoke-virtual {v7, v11, v10, v9, v2}, Landroid/view/View;->layout(IIII)V
+    invoke-virtual {v6, v10, v13, v8, v9}, Landroid/view/View;->layout(IIII)V
 
     goto :goto_4
 
     :cond_4
-    sub-int v2, p5, p3
+    sub-int v13, p5, p3
 
-    sub-int v14, v2, v10
+    sub-int v14, v13, v9
 
     div-int/lit8 v14, v14, 0x2
 
-    iget v5, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
+    iget v15, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
 
-    if-ge v14, v5, :cond_5
+    if-ge v14, v15, :cond_5
 
-    iget v14, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
+    iget v14, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->topMargin:I
 
     goto :goto_3
 
     :cond_5
-    add-int v5, v14, v10
+    add-int v15, v14, v9
 
-    iget v1, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
+    iget v1, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
 
-    sub-int v1, v2, v1
+    sub-int v1, v13, v1
 
-    if-le v5, v1, :cond_6
+    if-le v15, v1, :cond_6
 
-    iget v1, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
+    iget v1, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->bottomMargin:I
 
-    sub-int/2addr v2, v1
+    sub-int/2addr v13, v1
 
-    sub-int v14, v2, v10
+    sub-int v14, v13, v9
 
     :cond_6
     :goto_3
-    add-int/2addr v9, v11
+    add-int/2addr v8, v10
 
-    add-int/2addr v10, v14
+    add-int/2addr v9, v14
 
-    invoke-virtual {v7, v11, v14, v9, v10}, Landroid/view/View;->layout(IIII)V
+    invoke-virtual {v6, v10, v14, v8, v9}, Landroid/view/View;->layout(IIII)V
 
     :goto_4
-    if-eqz v12, :cond_7
+    if-eqz v11, :cond_7
 
-    invoke-virtual {p0, v7, v13}, Landroidx/drawerlayout/widget/DrawerLayout;->setDrawerViewOffset(Landroid/view/View;F)V
+    invoke-virtual {v0, v6, v12}, Landroidx/drawerlayout/widget/DrawerLayout;->setDrawerViewOffset(Landroid/view/View;F)V
 
     :cond_7
-    iget v1, v8, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
+    iget v1, v7, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
 
-    const/4 v2, 0x0
+    const/4 v7, 0x0
 
-    cmpl-float v1, v1, v2
+    cmpl-float v1, v1, v7
 
     if-lez v1, :cond_8
 
-    const/4 v5, 0x0
+    const/4 v1, 0x0
 
     goto :goto_5
 
     :cond_8
-    const/4 v5, 0x4
+    const/4 v1, 0x4
 
     :goto_5
-    invoke-virtual {v7}, Landroid/view/View;->getVisibility()I
+    invoke-virtual {v6}, Landroid/view/View;->getVisibility()I
 
-    move-result v1
+    move-result v7
 
-    if-eq v1, v5, :cond_9
+    if-eq v7, v1, :cond_9
 
-    invoke-virtual {v7, v5}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v6, v1}, Landroid/view/View;->setVisibility(I)V
 
     :cond_9
     :goto_6
-    add-int/lit8 v6, v6, 0x1
+    add-int/lit8 v5, v5, 0x1
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     goto/16 :goto_0
 
     :cond_a
-    const/4 v1, 0x0
+    iput-boolean v4, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mInLayout:Z
 
-    iput-boolean v1, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mInLayout:Z
-
-    iput-boolean v1, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mFirstLayout:Z
+    iput-boolean v4, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mFirstLayout:Z
 
     return-void
 .end method
@@ -3822,6 +3807,10 @@
 
     invoke-virtual {v12, v2, v13}, Landroid/view/View;->measure(II)V
 
+    move/from16 v15, p1
+
+    move/from16 v13, p2
+
     goto/16 :goto_8
 
     :cond_a
@@ -3847,9 +3836,7 @@
 
     if-eqz v2, :cond_b
 
-    iget v2, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawerElevation:F
-
-    invoke-static {v12, v2}, Landroidx/core/view/ViewCompat;->setElevation(Landroid/view/View;F)V
+    invoke-static {v12, v14}, Landroidx/core/view/ViewCompat;->setElevation(Landroid/view/View;F)V
 
     :cond_b
     invoke-virtual {v0, v12}, Landroidx/drawerlayout/widget/DrawerLayout;->getDrawerViewAbsoluteGravity(Landroid/view/View;)I
@@ -3954,7 +3941,7 @@
 
     invoke-virtual {v12, v2, v5}, Landroid/view/View;->measure(II)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_11
     new-instance v1, Ljava/lang/IllegalStateException;
@@ -3986,12 +3973,11 @@
     throw v1
 
     :cond_12
-    :goto_8
     move/from16 v15, p1
 
     move/from16 v13, p2
 
-    :goto_9
+    :goto_8
     add-int/lit8 v9, v9, 0x1
 
     const/4 v5, 0x0
@@ -4009,6 +3995,8 @@
     invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method protected onRestoreInstanceState(Landroid/os/Parcelable;)V
@@ -4223,7 +4211,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_0
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
@@ -4294,23 +4282,24 @@
 
     if-ne p1, v0, :cond_0
 
+    const/4 p1, 0x1
+
     goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    :goto_0
     const/4 p1, 0x1
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0, p1}, Landroidx/drawerlayout/widget/DrawerLayout;->closeDrawers(Z)V
 
     iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_1
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
@@ -4325,19 +4314,20 @@
 
     iput p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mInitialMotionY:F
 
-    :goto_2
     iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
 
     iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_2
     invoke-virtual {p0, v2}, Landroidx/drawerlayout/widget/DrawerLayout;->closeDrawers(Z)V
 
-    goto :goto_2
+    iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
 
-    :goto_3
+    iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
+
+    :goto_1
     return v2
 
     :pswitch_data_0
@@ -4550,8 +4540,6 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mListeners:Ljava/util/List;
-
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     return-void
@@ -4668,8 +4656,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mListener:Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
-
     invoke-virtual {p0, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->removeDrawerListener(Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;)V
 
     :cond_0
@@ -4920,6 +4906,8 @@
 
     invoke-virtual {p0}, Landroidx/drawerlayout/widget/DrawerLayout;->invalidate()V
 
+    return-void
+
     :cond_4
     return-void
 .end method
@@ -5143,8 +5131,6 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mListeners:Ljava/util/List;
-
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
diff --git a/com.discord/smali/androidx/fragment/R$attr.smali b/com.discord/smali/androidx/fragment/R$attr.smali
index a98b419100..3b8bff009d 100644
--- a/com.discord/smali/androidx/fragment/R$attr.smali
+++ b/com.discord/smali/androidx/fragment/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$color.smali b/com.discord/smali/androidx/fragment/R$color.smali
index fc88a0f6ef..85acd338b1 100644
--- a/com.discord/smali/androidx/fragment/R$color.smali
+++ b/com.discord/smali/androidx/fragment/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$dimen.smali b/com.discord/smali/androidx/fragment/R$dimen.smali
index 0ea601530e..bd19ec92ff 100644
--- a/com.discord/smali/androidx/fragment/R$dimen.smali
+++ b/com.discord/smali/androidx/fragment/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 15cd701d34..7dd3cff2c7 100644
--- a/com.discord/smali/androidx/fragment/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index e3d3e039a9..7e42dbbeba 100644
--- a/com.discord/smali/androidx/fragment/R$id.smali
+++ b/com.discord/smali/androidx/fragment/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$integer.smali b/com.discord/smali/androidx/fragment/R$integer.smali
index 3bdbbed8e9..32e1c00713 100644
--- a/com.discord/smali/androidx/fragment/R$integer.smali
+++ b/com.discord/smali/androidx/fragment/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$layout.smali b/com.discord/smali/androidx/fragment/R$layout.smali
index 12a71bdc32..5a2f0b9b4e 100644
--- a/com.discord/smali/androidx/fragment/R$layout.smali
+++ b/com.discord/smali/androidx/fragment/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index e9c3ba9252..bbab9dc5d4 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$style.smali b/com.discord/smali/androidx/fragment/R$style.smali
index ec0b587422..2e18575be3 100644
--- a/com.discord/smali/androidx/fragment/R$style.smali
+++ b/com.discord/smali/androidx/fragment/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R$styleable.smali b/com.discord/smali/androidx/fragment/R$styleable.smali
index 467e5b098a..2f05d81195 100644
--- a/com.discord/smali/androidx/fragment/R$styleable.smali
+++ b/com.discord/smali/androidx/fragment/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/R.smali b/com.discord/smali/androidx/fragment/R.smali
index a8a0a9207a..4c2d5c4670 100644
--- a/com.discord/smali/androidx/fragment/R.smali
+++ b/com.discord/smali/androidx/fragment/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/fragment/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/BackStackRecord$Op.smali b/com.discord/smali/androidx/fragment/app/BackStackRecord$Op.smali
index b5cc8eb932..3889b13501 100644
--- a/com.discord/smali/androidx/fragment/app/BackStackRecord$Op.smali
+++ b/com.discord/smali/androidx/fragment/app/BackStackRecord$Op.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/BackStackRecord$Op;
 .super Ljava/lang/Object;
+.source "BackStackRecord.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/BackStackRecord.smali b/com.discord/smali/androidx/fragment/app/BackStackRecord.smali
index 0e4d26477b..3f3cc6d68d 100644
--- a/com.discord/smali/androidx/fragment/app/BackStackRecord.smali
+++ b/com.discord/smali/androidx/fragment/app/BackStackRecord.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/BackStackRecord;
 .super Landroidx/fragment/app/FragmentTransaction;
+.source "BackStackRecord.java"
 
 # interfaces
 .implements Landroidx/fragment/app/FragmentManager$BackStackEntry;
@@ -832,17 +833,16 @@
 
     move-result v0
 
-    :goto_0
     iput v0, p0, Landroidx/fragment/app/BackStackRecord;->mIndex:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v0, -0x1
 
-    goto :goto_0
+    iput v0, p0, Landroidx/fragment/app/BackStackRecord;->mIndex:I
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Landroidx/fragment/app/BackStackRecord;->mManager:Landroidx/fragment/app/FragmentManagerImpl;
 
     invoke-virtual {v0, p0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->enqueueAction(Landroidx/fragment/app/FragmentManagerImpl$OpGenerator;Z)V
@@ -1536,9 +1536,7 @@
 
     iget-object v0, p0, Landroidx/fragment/app/BackStackRecord;->mManager:Landroidx/fragment/app/FragmentManagerImpl;
 
-    iget-object v1, p0, Landroidx/fragment/app/BackStackRecord;->mManager:Landroidx/fragment/app/FragmentManagerImpl;
-
-    iget v1, v1, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
+    iget v1, v0, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
 
     invoke-virtual {v0, v1, v3}, Landroidx/fragment/app/FragmentManagerImpl;->moveToState(IZ)V
 
@@ -1735,9 +1733,7 @@
 
     iget-object p1, p0, Landroidx/fragment/app/BackStackRecord;->mManager:Landroidx/fragment/app/FragmentManagerImpl;
 
-    iget-object v0, p0, Landroidx/fragment/app/BackStackRecord;->mManager:Landroidx/fragment/app/FragmentManagerImpl;
-
-    iget v0, v0, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
+    iget v0, p1, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
 
     invoke-virtual {p1, v0, v1}, Landroidx/fragment/app/FragmentManagerImpl;->moveToState(IZ)V
 
@@ -1806,7 +1802,7 @@
     packed-switch v3, :pswitch_data_0
 
     :pswitch_0
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :pswitch_1
     iget-object v3, p0, Landroidx/fragment/app/BackStackRecord;->mOps:Ljava/util/ArrayList;
@@ -1821,7 +1817,7 @@
 
     iget-object v1, v2, Landroidx/fragment/app/BackStackRecord$Op;->fragment:Landroidx/fragment/app/Fragment;
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :pswitch_2
     iget-object v3, v2, Landroidx/fragment/app/BackStackRecord$Op;->fragment:Landroidx/fragment/app/Fragment;
@@ -1846,7 +1842,7 @@
 
     move-object v1, v4
 
-    goto :goto_4
+    goto/16 :goto_3
 
     :pswitch_3
     iget-object v3, v2, Landroidx/fragment/app/BackStackRecord$Op;->fragment:Landroidx/fragment/app/Fragment;
@@ -1945,10 +1941,9 @@
 
     add-int/lit8 p2, v1, -0x1
 
-    :goto_3
     move-object v1, v9
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     iput v6, v2, Landroidx/fragment/app/BackStackRecord$Op;->cmd:I
@@ -1957,6 +1952,8 @@
 
     move p2, v1
 
+    move-object v1, v9
+
     goto :goto_3
 
     :pswitch_4
@@ -1965,7 +1962,7 @@
     invoke-virtual {p1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_5
-    :goto_4
+    :goto_3
     add-int/2addr p2, v6
 
     goto/16 :goto_0
@@ -2508,20 +2505,18 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iget-object v1, p0, Landroidx/fragment/app/BackStackRecord;->mCommitRunnables:Ljava/util/ArrayList;
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
-
-    move-result v1
+    move-result v0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
     iget-object v2, p0, Landroidx/fragment/app/BackStackRecord;->mCommitRunnables:Ljava/util/ArrayList;
 
-    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    invoke-virtual {v2, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -2529,7 +2524,7 @@
 
     invoke-interface {v2}, Ljava/lang/Runnable;->run()V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
diff --git a/com.discord/smali/androidx/fragment/app/BackStackState$1.smali b/com.discord/smali/androidx/fragment/app/BackStackState$1.smali
index 4dceabc240..7446dbba9a 100644
--- a/com.discord/smali/androidx/fragment/app/BackStackState$1.smali
+++ b/com.discord/smali/androidx/fragment/app/BackStackState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/BackStackState$1;
 .super Ljava/lang/Object;
+.source "BackStackRecord.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/fragment/app/BackStackState.smali b/com.discord/smali/androidx/fragment/app/BackStackState.smali
index 27df2bde2d..e1b449672b 100644
--- a/com.discord/smali/androidx/fragment/app/BackStackState.smali
+++ b/com.discord/smali/androidx/fragment/app/BackStackState.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/BackStackState;
 .super Ljava/lang/Object;
+.source "BackStackRecord.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -327,6 +328,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -422,42 +425,35 @@
 
     check-cast v1, Landroidx/fragment/app/Fragment;
 
-    :goto_1
     iput-object v1, v3, Landroidx/fragment/app/BackStackRecord$Op;->fragment:Landroidx/fragment/app/Fragment;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 v1, 0x0
 
-    goto :goto_1
+    iput-object v1, v3, Landroidx/fragment/app/BackStackRecord$Op;->fragment:Landroidx/fragment/app/Fragment;
 
-    :goto_2
+    :goto_1
     iget-object v1, p0, Landroidx/fragment/app/BackStackState;->mOps:[I
 
     add-int/lit8 v5, v4, 0x1
 
-    aget v1, v1, v4
+    aget v4, v1, v4
 
-    iput v1, v3, Landroidx/fragment/app/BackStackRecord$Op;->enterAnim:I
-
-    iget-object v1, p0, Landroidx/fragment/app/BackStackState;->mOps:[I
+    iput v4, v3, Landroidx/fragment/app/BackStackRecord$Op;->enterAnim:I
 
     add-int/lit8 v4, v5, 0x1
 
-    aget v1, v1, v5
+    aget v5, v1, v5
 
-    iput v1, v3, Landroidx/fragment/app/BackStackRecord$Op;->exitAnim:I
-
-    iget-object v1, p0, Landroidx/fragment/app/BackStackState;->mOps:[I
+    iput v5, v3, Landroidx/fragment/app/BackStackRecord$Op;->exitAnim:I
 
     add-int/lit8 v5, v4, 0x1
 
-    aget v1, v1, v4
+    aget v4, v1, v4
 
-    iput v1, v3, Landroidx/fragment/app/BackStackRecord$Op;->popEnterAnim:I
-
-    iget-object v1, p0, Landroidx/fragment/app/BackStackState;->mOps:[I
+    iput v4, v3, Landroidx/fragment/app/BackStackRecord$Op;->popEnterAnim:I
 
     add-int/lit8 v4, v5, 0x1
 
diff --git a/com.discord/smali/androidx/fragment/app/DialogFragment.smali b/com.discord/smali/androidx/fragment/app/DialogFragment.smali
index c902d4f8e1..f705b503b2 100644
--- a/com.discord/smali/androidx/fragment/app/DialogFragment.smali
+++ b/com.discord/smali/androidx/fragment/app/DialogFragment.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/DialogFragment;
 .super Landroidx/fragment/app/Fragment;
+.source "DialogFragment.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface$OnCancelListener;
@@ -117,8 +118,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/fragment/app/DialogFragment;->mDialog:Landroid/app/Dialog;
-
     invoke-virtual {v1}, Landroid/app/Dialog;->dismiss()V
 
     :cond_1
@@ -412,7 +411,7 @@
 .end method
 
 .method public onDestroyView()V
-    .locals 1
+    .locals 2
 
     invoke-super {p0}, Landroidx/fragment/app/Fragment;->onDestroyView()V
 
@@ -420,11 +419,9 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iput-boolean v0, p0, Landroidx/fragment/app/DialogFragment;->mViewDestroyed:Z
-
-    iget-object v0, p0, Landroidx/fragment/app/DialogFragment;->mDialog:Landroid/app/Dialog;
+    iput-boolean v1, p0, Landroidx/fragment/app/DialogFragment;->mViewDestroyed:Z
 
     invoke-virtual {v0}, Landroid/app/Dialog;->dismiss()V
 
@@ -502,8 +499,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/fragment/app/DialogFragment;->mDialog:Landroid/app/Dialog;
-
     iget v0, p0, Landroidx/fragment/app/DialogFragment;->mStyle:I
 
     invoke-virtual {p0, p1, v0}, Landroidx/fragment/app/DialogFragment;->setupDialog(Landroid/app/Dialog;I)V
@@ -514,7 +509,6 @@
 
     move-result-object p1
 
-    :goto_0
     const-string v0, "layout_inflater"
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
@@ -532,7 +526,15 @@
 
     move-result-object p1
 
-    goto :goto_0
+    const-string v0, "layout_inflater"
+
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/view/LayoutInflater;
+
+    return-object p1
 .end method
 
 .method public onSaveInstanceState(Landroid/os/Bundle;)V
@@ -548,8 +550,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/DialogFragment;->mDialog:Landroid/app/Dialog;
-
     invoke-virtual {v0}, Landroid/app/Dialog;->onSaveInstanceState()Landroid/os/Bundle;
 
     move-result-object v0
@@ -565,44 +565,36 @@
 
     if-eqz v0, :cond_1
 
-    const-string v0, "android:style"
+    const-string v1, "android:style"
 
-    iget v1, p0, Landroidx/fragment/app/DialogFragment;->mStyle:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_1
     iget v0, p0, Landroidx/fragment/app/DialogFragment;->mTheme:I
 
     if-eqz v0, :cond_2
 
-    const-string v0, "android:theme"
+    const-string v1, "android:theme"
 
-    iget v1, p0, Landroidx/fragment/app/DialogFragment;->mTheme:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_2
     iget-boolean v0, p0, Landroidx/fragment/app/DialogFragment;->mCancelable:Z
 
     if-nez v0, :cond_3
 
-    const-string v0, "android:cancelable"
+    const-string v1, "android:cancelable"
 
-    iget-boolean v1, p0, Landroidx/fragment/app/DialogFragment;->mCancelable:Z
-
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
     :cond_3
     iget-boolean v0, p0, Landroidx/fragment/app/DialogFragment;->mShowsDialog:Z
 
     if-nez v0, :cond_4
 
-    const-string v0, "android:showsDialog"
+    const-string v1, "android:showsDialog"
 
-    iget-boolean v1, p0, Landroidx/fragment/app/DialogFragment;->mShowsDialog:Z
-
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
     :cond_4
     iget v0, p0, Landroidx/fragment/app/DialogFragment;->mBackStackId:I
@@ -611,18 +603,16 @@
 
     if-eq v0, v1, :cond_5
 
-    const-string v0, "android:backStackId"
+    const-string v1, "android:backStackId"
 
-    iget v1, p0, Landroidx/fragment/app/DialogFragment;->mBackStackId:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_5
     return-void
 .end method
 
 .method public onStart()V
-    .locals 1
+    .locals 2
 
     invoke-super {p0}, Landroidx/fragment/app/Fragment;->onStart()V
 
@@ -630,11 +620,9 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iput-boolean v0, p0, Landroidx/fragment/app/DialogFragment;->mViewDestroyed:Z
-
-    iget-object v0, p0, Landroidx/fragment/app/DialogFragment;->mDialog:Landroid/app/Dialog;
+    iput-boolean v1, p0, Landroidx/fragment/app/DialogFragment;->mViewDestroyed:Z
 
     invoke-virtual {v0}, Landroid/app/Dialog;->show()V
 
@@ -651,8 +639,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/DialogFragment;->mDialog:Landroid/app/Dialog;
-
     invoke-virtual {v0}, Landroid/app/Dialog;->hide()V
 
     :cond_0
@@ -668,8 +654,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/DialogFragment;->mDialog:Landroid/app/Dialog;
-
     invoke-virtual {v0, p1}, Landroid/app/Dialog;->setCancelable(Z)V
 
     :cond_0
@@ -699,8 +683,6 @@
 
     if-eq p1, v0, :cond_0
 
-    iget p1, p0, Landroidx/fragment/app/DialogFragment;->mStyle:I
-
     const/4 v0, 0x3
 
     if-ne p1, v0, :cond_1
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$1.smali b/com.discord/smali/androidx/fragment/app/Fragment$1.smali
index 0b2b6dc126..a411f9a171 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$1.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/Fragment$1;
 .super Ljava/lang/Object;
+.source "Fragment.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$2.smali b/com.discord/smali/androidx/fragment/app/Fragment$2.smali
index b8ceb1d06d..e05601fe5e 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$2.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/Fragment$2;
 .super Landroidx/fragment/app/FragmentContainer;
+.source "Fragment.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$3.smali b/com.discord/smali/androidx/fragment/app/Fragment$3.smali
index 8ccf5d9c6e..23cb819471 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$3.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/Fragment$3;
 .super Ljava/lang/Object;
+.source "Fragment.java"
 
 # interfaces
 .implements Landroidx/lifecycle/LifecycleOwner;
@@ -46,9 +47,7 @@
 
     new-instance v1, Landroidx/lifecycle/LifecycleRegistry;
 
-    iget-object v2, p0, Landroidx/fragment/app/Fragment$3;->this$0:Landroidx/fragment/app/Fragment;
-
-    iget-object v2, v2, Landroidx/fragment/app/Fragment;->mViewLifecycleOwner:Landroidx/lifecycle/LifecycleOwner;
+    iget-object v2, v0, Landroidx/fragment/app/Fragment;->mViewLifecycleOwner:Landroidx/lifecycle/LifecycleOwner;
 
     invoke-direct {v1, v2}, Landroidx/lifecycle/LifecycleRegistry;-><init>(Landroidx/lifecycle/LifecycleOwner;)V
 
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$AnimationInfo.smali b/com.discord/smali/androidx/fragment/app/Fragment$AnimationInfo.smali
index ae8f43163e..753ba7e980 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$AnimationInfo.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$AnimationInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/Fragment$AnimationInfo;
 .super Ljava/lang/Object;
+.source "Fragment.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$InstantiationException.smali b/com.discord/smali/androidx/fragment/app/Fragment$InstantiationException.smali
index 5aa30dbd6a..2c136e89f7 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$InstantiationException.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$InstantiationException.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/Fragment$InstantiationException;
 .super Ljava/lang/RuntimeException;
+.source "Fragment.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$OnStartEnterTransitionListener.smali b/com.discord/smali/androidx/fragment/app/Fragment$OnStartEnterTransitionListener.smali
index b73db94553..1304644e1c 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$OnStartEnterTransitionListener.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$OnStartEnterTransitionListener.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/fragment/app/Fragment$OnStartEnterTransitionListener;
 .super Ljava/lang/Object;
+.source "Fragment.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$SavedState$1.smali b/com.discord/smali/androidx/fragment/app/Fragment$SavedState$1.smali
index 97170693f8..551ac49714 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$SavedState$1.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/Fragment$SavedState$1;
 .super Ljava/lang/Object;
+.source "Fragment.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/fragment/app/Fragment$SavedState.smali b/com.discord/smali/androidx/fragment/app/Fragment$SavedState.smali
index 143e64e70b..5bf8d79f97 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment$SavedState.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/Fragment$SavedState;
 .super Ljava/lang/Object;
+.source "Fragment.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -72,8 +73,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/Fragment$SavedState;->mState:Landroid/os/Bundle;
-
     invoke-virtual {p1, p2}, Landroid/os/Bundle;->setClassLoader(Ljava/lang/ClassLoader;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/fragment/app/Fragment.smali b/com.discord/smali/androidx/fragment/app/Fragment.smali
index 94288dfe64..5f334d419e 100644
--- a/com.discord/smali/androidx/fragment/app/Fragment.smali
+++ b/com.discord/smali/androidx/fragment/app/Fragment.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/Fragment;
 .super Ljava/lang/Object;
+.source "Fragment.java"
 
 # interfaces
 .implements Landroid/content/ComponentCallbacks;
@@ -502,14 +503,10 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     const/4 v2, 0x0
 
     iput-boolean v2, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mEnterTransitionPostponed:Z
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mStartEnterTransitionListener:Landroidx/fragment/app/Fragment$OnStartEnterTransitionListener;
 
     iget-object v2, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
@@ -987,8 +984,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->findFragmentByWho(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
 
     move-result-object p1
@@ -1015,8 +1010,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentHostCallback;->getActivity()Landroid/app/Activity;
 
     move-result-object v0
@@ -1033,8 +1026,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mAllowEnterTransitionOverlap:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
@@ -1066,8 +1057,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mAllowReturnTransitionOverlap:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
@@ -1104,8 +1093,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mAnimatingAway:Landroid/view/View;
 
     return-object v0
@@ -1123,8 +1110,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mAnimator:Landroid/animation/Animator;
 
     return-object v0
@@ -1164,8 +1149,6 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Landroidx/fragment/app/Fragment;->mState:I
-
     const/4 v1, 0x3
 
     if-lt v0, v1, :cond_1
@@ -1177,8 +1160,6 @@
     goto :goto_0
 
     :cond_1
-    iget v0, p0, Landroidx/fragment/app/Fragment;->mState:I
-
     const/4 v1, 0x2
 
     if-lt v0, v1, :cond_2
@@ -1190,8 +1171,6 @@
     goto :goto_0
 
     :cond_2
-    iget v0, p0, Landroidx/fragment/app/Fragment;->mState:I
-
     if-lez v0, :cond_3
 
     iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
@@ -1219,8 +1198,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentHostCallback;->getContext()Landroid/content/Context;
 
     move-result-object v0
@@ -1242,8 +1219,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mEnterTransition:Ljava/lang/Object;
 
     return-object v0
@@ -1261,8 +1236,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mEnterTransitionCallback:Landroidx/core/app/SharedElementCallback;
 
     return-object v0
@@ -1282,8 +1255,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mExitTransition:Ljava/lang/Object;
 
     return-object v0
@@ -1301,8 +1272,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mExitTransitionCallback:Landroidx/core/app/SharedElementCallback;
 
     return-object v0
@@ -1332,8 +1301,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentHostCallback;->onGetHost()Ljava/lang/Object;
 
     move-result-object v0
@@ -1365,8 +1332,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mLayoutInflater:Landroid/view/LayoutInflater;
-
     return-object v0
 .end method
 
@@ -1392,8 +1357,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentHostCallback;->onGetLayoutInflater()Landroid/view/LayoutInflater;
 
     move-result-object p1
@@ -1452,8 +1415,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mNextAnim:I
 
     return v0
@@ -1471,8 +1432,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mNextTransition:I
 
     return v0
@@ -1490,8 +1449,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mNextTransitionStyle:I
 
     return v0
@@ -1519,8 +1476,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mReenterTransition:Ljava/lang/Object;
 
     sget-object v1, Landroidx/fragment/app/Fragment;->USE_DEFAULT_TRANSITION:Ljava/lang/Object;
@@ -1579,8 +1534,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mReturnTransition:Ljava/lang/Object;
 
     sget-object v1, Landroidx/fragment/app/Fragment;->USE_DEFAULT_TRANSITION:Ljava/lang/Object;
@@ -1615,8 +1568,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mSharedElementEnterTransition:Ljava/lang/Object;
 
     return-object v0
@@ -1636,8 +1587,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mSharedElementReturnTransition:Ljava/lang/Object;
 
     sget-object v1, Landroidx/fragment/app/Fragment;->USE_DEFAULT_TRANSITION:Ljava/lang/Object;
@@ -1670,8 +1619,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mStateAfterAnimating:I
 
     return v0
@@ -1795,8 +1742,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mViewLifecycleOwner:Landroidx/lifecycle/LifecycleOwner;
-
     return-object v0
 
     :cond_0
@@ -2017,8 +1962,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-boolean v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mIsHideReplaced:Z
 
     return v0
@@ -2074,8 +2017,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
     iget-boolean v0, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mEnterTransitionPostponed:Z
 
     return v0
@@ -2120,8 +2061,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->isStateSaved()Z
 
     move-result v0
@@ -2148,8 +2087,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->getWindowToken()Landroid/os/IBinder;
 
     move-result-object v0
@@ -2181,8 +2118,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->noteStateNotSaved()V
 
     :cond_0
@@ -2244,8 +2179,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentHostCallback;->getActivity()Landroid/app/Activity;
 
     move-result-object p1
@@ -2308,8 +2241,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {p1, v0}, Landroidx/fragment/app/FragmentManagerImpl;->isStateAtLeast(I)Z
 
     move-result p1
@@ -2413,9 +2344,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mViewModelStore:Landroidx/lifecycle/ViewModelStore;
-
-    invoke-virtual {v0}, Landroidx/lifecycle/ViewModelStore;->clear()V
+    invoke-virtual {v1}, Landroidx/lifecycle/ViewModelStore;->clear()V
 
     :cond_1
     return-void
@@ -2506,8 +2435,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentHostCallback;->getActivity()Landroid/app/Activity;
 
     move-result-object p1
@@ -2688,8 +2615,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->noteStateNotSaved()V
 
     :cond_0
@@ -2711,8 +2636,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchActivityCreated()V
 
     :cond_1
@@ -2751,8 +2674,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchConfigurationChanged(Landroid/content/res/Configuration;)V
 
     :cond_0
@@ -2781,8 +2702,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchContextItemSelected(Landroid/view/MenuItem;)Z
 
     move-result p1
@@ -2804,8 +2723,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->noteStateNotSaved()V
 
     :cond_0
@@ -2874,17 +2791,17 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     invoke-virtual {p0, p1, p2}, Landroidx/fragment/app/Fragment;->onCreateOptionsMenu(Landroid/view/Menu;Landroid/view/MenuInflater;)V
 
+    const/4 v1, 0x1
+
     :cond_0
     iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1, p2}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchCreateOptionsMenu(Landroid/view/Menu;Landroid/view/MenuInflater;)Z
 
     move-result p1
@@ -2914,8 +2831,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->noteStateNotSaved()V
 
     :cond_0
@@ -2987,8 +2902,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchDestroy()V
 
     :cond_0
@@ -3054,8 +2967,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchDestroyView()V
 
     :cond_1
@@ -3128,11 +3039,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-boolean v1, p0, Landroidx/fragment/app/Fragment;->mRetaining:Z
+    iget-boolean v2, p0, Landroidx/fragment/app/Fragment;->mRetaining:Z
 
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
+    if-eqz v2, :cond_0
 
     invoke-virtual {v1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchDestroy()V
 
@@ -3220,8 +3129,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchLowMemory()V
 
     :cond_0
@@ -3237,8 +3144,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchMultiWindowModeChanged(Z)V
 
     :cond_0
@@ -3275,8 +3180,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchOptionsItemSelected(Landroid/view/MenuItem;)Z
 
     move-result p1
@@ -3313,8 +3216,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchOptionsMenuClosed(Landroid/view/Menu;)V
 
     :cond_1
@@ -3345,8 +3246,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchPause()V
 
     :cond_1
@@ -3399,8 +3298,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchPictureInPictureModeChanged(Z)V
 
     :cond_0
@@ -3424,17 +3321,17 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->onPrepareOptionsMenu(Landroid/view/Menu;)V
 
+    const/4 v1, 0x1
+
     :cond_0
     iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchPrepareOptionsMenu(Landroid/view/Menu;)Z
 
     move-result p1
@@ -3452,8 +3349,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->noteStateNotSaved()V
 
     iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
@@ -3479,8 +3374,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchResume()V
 
     iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
@@ -3540,8 +3433,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->saveAllState()Landroid/os/Parcelable;
 
     move-result-object v0
@@ -3563,8 +3454,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->noteStateNotSaved()V
 
     iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
@@ -3590,8 +3479,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchStart()V
 
     :cond_1
@@ -3662,8 +3549,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchStop()V
 
     :cond_1
@@ -3740,8 +3625,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v0, p0, p1, p2}, Landroidx/fragment/app/FragmentHostCallback;->onRequestPermissionsFromFragment(Landroidx/fragment/app/Fragment;[Ljava/lang/String;I)V
 
     return-void
@@ -3967,11 +3850,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mInnerView:Landroid/view/View;
+    iget-object v1, p0, Landroidx/fragment/app/Fragment;->mInnerView:Landroid/view/View;
 
-    iget-object v1, p0, Landroidx/fragment/app/Fragment;->mSavedViewState:Landroid/util/SparseArray;
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->restoreHierarchyState(Landroid/util/SparseArray;)V
+    invoke-virtual {v1, v0}, Landroid/view/View;->restoreHierarchyState(Landroid/util/SparseArray;)V
 
     const/4 v0, 0x0
 
@@ -4232,7 +4113,6 @@
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_0
     iget p2, p0, Landroidx/fragment/app/Fragment;->mIndex:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
@@ -4252,7 +4132,17 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_0
+    iget p2, p0, Landroidx/fragment/app/Fragment;->mIndex:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Landroidx/fragment/app/Fragment;->mWho:Ljava/lang/String;
+
+    return-void
 .end method
 
 .method public setInitialSavedState(Landroidx/fragment/app/Fragment$SavedState;)V
@@ -4368,9 +4258,7 @@
 
     iput p1, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mNextTransition:I
 
-    iget-object p1, p0, Landroidx/fragment/app/Fragment;->mAnimationInfo:Landroidx/fragment/app/Fragment$AnimationInfo;
-
-    iput p2, p1, Landroidx/fragment/app/Fragment$AnimationInfo;->mNextTransitionStyle:I
+    iput p2, v0, Landroidx/fragment/app/Fragment$AnimationInfo;->mNextTransitionStyle:I
 
     return-void
 .end method
@@ -4704,8 +4592,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentHostCallback;->onShouldShowRequestPermissionRationale(Ljava/lang/String;)Z
 
     move-result p1
@@ -4739,8 +4625,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     const/4 v1, -0x1
 
     invoke-virtual {v0, p0, p1, v1, p2}, Landroidx/fragment/app/FragmentHostCallback;->onStartActivityFromFragment(Landroidx/fragment/app/Fragment;Landroid/content/Intent;ILandroid/os/Bundle;)V
@@ -4792,8 +4676,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v0, p0, p1, p2, p3}, Landroidx/fragment/app/FragmentHostCallback;->onStartActivityFromFragment(Landroidx/fragment/app/Fragment;Landroid/content/Intent;ILandroid/os/Bundle;)V
 
     return-void
@@ -4840,8 +4722,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v9, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     move-object v1, p0
 
     move-object v2, p1
@@ -4893,8 +4773,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/fragment/app/Fragment;->mFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
-
     iget-object v0, v0, Landroidx/fragment/app/FragmentManagerImpl;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
     if-nez v0, :cond_0
diff --git a/com.discord/smali/androidx/fragment/app/FragmentActivity$1.smali b/com.discord/smali/androidx/fragment/app/FragmentActivity$1.smali
index 63aadd9edf..effe65bd06 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentActivity$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentActivity$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentActivity$1;
 .super Landroid/os/Handler;
+.source "FragmentActivity.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentActivity$HostCallbacks.smali b/com.discord/smali/androidx/fragment/app/FragmentActivity$HostCallbacks.smali
index 707144aac7..999d2fd9c3 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentActivity$HostCallbacks.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentActivity$HostCallbacks.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentActivity$HostCallbacks;
 .super Landroidx/fragment/app/FragmentHostCallback;
+.source "FragmentActivity.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentActivity$NonConfigurationInstances.smali b/com.discord/smali/androidx/fragment/app/FragmentActivity$NonConfigurationInstances.smali
index dbc1c31a73..c448aaa046 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentActivity$NonConfigurationInstances.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentActivity$NonConfigurationInstances.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentActivity$NonConfigurationInstances;
 .super Ljava/lang/Object;
+.source "FragmentActivity.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentActivity.smali b/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
index 94968316df..5f50dbc4f2 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/FragmentActivity;
 .super Landroidx/core/app/ComponentActivity;
+.source "FragmentActivity.java"
 
 # interfaces
 .implements Landroidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback;
@@ -154,6 +155,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method static checkForValidRequestCode(I)V
@@ -1133,7 +1136,6 @@
 
     const-string p2, "Activity result delivered for unknown Fragment."
 
-    :goto_0
     invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
@@ -1159,7 +1161,9 @@
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
 
     :cond_1
     and-int/2addr p1, v1
@@ -1557,11 +1561,6 @@
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     :try_start_1
     invoke-static {p3}, Landroidx/fragment/app/FragmentActivity;->checkForValidRequestCode(I)V
@@ -1588,7 +1587,9 @@
 
     return-void
 
-    :goto_0
+    :catchall_0
+    move-exception p1
+
     iput-boolean v2, p0, Landroidx/fragment/app/FragmentActivity;->mStartedActivityFromFragment:Z
 
     throw p1
@@ -1701,11 +1702,6 @@
 
     return-void
 
-    :catchall_0
-    move-exception v0
-
-    goto :goto_0
-
     :cond_0
     :try_start_1
     invoke-static {p3}, Landroidx/fragment/app/FragmentActivity;->checkForValidRequestCode(I)V
@@ -1746,7 +1742,9 @@
 
     return-void
 
-    :goto_0
+    :catchall_0
+    move-exception v0
+
     iput-boolean v10, v9, Landroidx/fragment/app/FragmentActivity;->mStartedIntentSenderFromFragment:Z
 
     throw v0
diff --git a/com.discord/smali/androidx/fragment/app/FragmentContainer.smali b/com.discord/smali/androidx/fragment/app/FragmentContainer.smali
index dd4df745db..c7f368efa4 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentContainer.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentContainer.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentContainer;
 .super Ljava/lang/Object;
+.source "FragmentContainer.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/app/FragmentController.smali b/com.discord/smali/androidx/fragment/app/FragmentController.smali
index 8ce0a982f3..6d5d46eea3 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentController.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/FragmentController;
 .super Ljava/lang/Object;
+.source "FragmentController.java"
 
 
 # instance fields
@@ -52,7 +53,7 @@
 
 # virtual methods
 .method public attachHost(Landroidx/fragment/app/Fragment;)V
-    .locals 3
+    .locals 2
 
     iget-object v0, p0, Landroidx/fragment/app/FragmentController;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
@@ -60,9 +61,7 @@
 
     iget-object v1, p0, Landroidx/fragment/app/FragmentController;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
-    iget-object v2, p0, Landroidx/fragment/app/FragmentController;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
-    invoke-virtual {v0, v1, v2, p1}, Landroidx/fragment/app/FragmentManagerImpl;->attachController(Landroidx/fragment/app/FragmentHostCallback;Landroidx/fragment/app/FragmentContainer;Landroidx/fragment/app/Fragment;)V
+    invoke-virtual {v0, v1, v1, p1}, Landroidx/fragment/app/FragmentManagerImpl;->attachController(Landroidx/fragment/app/FragmentHostCallback;Landroidx/fragment/app/FragmentContainer;Landroidx/fragment/app/Fragment;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentHostCallback.smali b/com.discord/smali/androidx/fragment/app/FragmentHostCallback.smali
index 57a19bb613..4bc7857e0e 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentHostCallback.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentHostCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentHostCallback;
 .super Landroidx/fragment/app/FragmentContainer;
+.source "FragmentHostCallback.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManager$BackStackEntry.smali b/com.discord/smali/androidx/fragment/app/FragmentManager$BackStackEntry.smali
index e065d65bd9..5f89c6a6fb 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManager$BackStackEntry.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManager$BackStackEntry.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/fragment/app/FragmentManager$BackStackEntry;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks.smali b/com.discord/smali/androidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks.smali
index 80a002c03f..40980a7611 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManager$OnBackStackChangedListener.smali b/com.discord/smali/androidx/fragment/app/FragmentManager$OnBackStackChangedListener.smali
index 48a9f5739e..ed6bd39b89 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManager$OnBackStackChangedListener.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManager$OnBackStackChangedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/fragment/app/FragmentManager$OnBackStackChangedListener;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManager.smali b/com.discord/smali/androidx/fragment/app/FragmentManager.smali
index fd3a107a71..7b48367573 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManager.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManager.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentManager;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$1.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$1.smali
index 542776925f..f913f80174 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$1;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2$1.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2$1.smali
index c90e2fef01..4639bc9e97 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$2$1;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2.smali
index 15bcfc206f..b884f5bfd7 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$2;
 .super Landroidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$3.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$3.smali
index 9210b71ce2..5b54fa8052 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$3.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$3;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FragmentManager.java"
 
 
 # annotations
@@ -79,9 +80,7 @@
 
     iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl$3;->val$fragment:Landroidx/fragment/app/Fragment;
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentManagerImpl$3;->val$fragment:Landroidx/fragment/app/Fragment;
-
-    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getStateAfterAnimating()I
+    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getStateAfterAnimating()I
 
     move-result v2
 
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$4.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$4.smali
index 2f72eef766..c1048cbd72 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$4.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$4;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener$1.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener$1.smali
index 91de650072..708f668d73 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener$1;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali
index f7b915c279..4e5fb978d3 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener;
 .super Landroidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper.smali
index 50b59b8270..406f65dcfd 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Landroid/view/animation/Animation$AnimationListener;
@@ -42,8 +43,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper;->mWrapped:Landroid/view/animation/Animation$AnimationListener;
-
     invoke-interface {v0, p1}, Landroid/view/animation/Animation$AnimationListener;->onAnimationEnd(Landroid/view/animation/Animation;)V
 
     :cond_0
@@ -59,8 +58,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper;->mWrapped:Landroid/view/animation/Animation$AnimationListener;
-
     invoke-interface {v0, p1}, Landroid/view/animation/Animation$AnimationListener;->onAnimationRepeat(Landroid/view/animation/Animation;)V
 
     :cond_0
@@ -76,8 +73,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl$AnimationListenerWrapper;->mWrapped:Landroid/view/animation/Animation$AnimationListener;
-
     invoke-interface {v0, p1}, Landroid/view/animation/Animation$AnimationListener;->onAnimationStart(Landroid/view/animation/Animation;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator.smali
index 7cbd6d52de..e61353c440 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimatorOnHWLayerIfNeededListener.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimatorOnHWLayerIfNeededListener.smali
index ab39e08fd0..cbed9c10e9 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimatorOnHWLayerIfNeededListener.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$AnimatorOnHWLayerIfNeededListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$AnimatorOnHWLayerIfNeededListener;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$EndViewTransitionAnimator.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$EndViewTransitionAnimator.smali
index 8271891464..25d372575e 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$EndViewTransitionAnimator.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$EndViewTransitionAnimator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$EndViewTransitionAnimator;
 .super Landroid/view/animation/AnimationSet;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentLifecycleCallbacksHolder.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentLifecycleCallbacksHolder.smali
index 23cc33f7eb..954fb7ecfa 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentLifecycleCallbacksHolder.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentLifecycleCallbacksHolder.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentManagerImpl$FragmentLifecycleCallbacksHolder;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentTag.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentTag.smali
index 6c51c923ab..2884de6db9 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentTag.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$FragmentTag.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$FragmentTag;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$OpGenerator.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$OpGenerator.smali
index fd20292549..8685f12fa5 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$OpGenerator.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$OpGenerator.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/fragment/app/FragmentManagerImpl$OpGenerator;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$PopBackStackState.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$PopBackStackState.smali
index 20d68fe0a5..c2d5364437 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$PopBackStackState.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$PopBackStackState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$PopBackStackState;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Landroidx/fragment/app/FragmentManagerImpl$OpGenerator;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener.smali
index 0a29b7e6e1..aea407d45f 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Landroidx/fragment/app/Fragment$OnStartEnterTransitionListener;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl.smali
index 23251b3699..6a79a634fd 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerImpl.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerImpl.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentManagerImpl;
 .super Landroidx/fragment/app/FragmentManager;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Landroid/view/LayoutInflater$Factory2;
@@ -328,8 +329,6 @@
     return-void
 
     :cond_0
-    iget v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
-
     const/4 v1, 0x3
 
     invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
@@ -488,8 +487,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -509,9 +506,7 @@
 
     iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
 
-    iget-object v2, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
-    invoke-virtual {v2, v0}, Landroid/util/SparseArray;->keyAt(I)I
+    invoke-virtual {v1, v0}, Landroid/util/SparseArray;->keyAt(I)I
 
     move-result v2
 
@@ -632,8 +627,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -932,8 +925,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mTmpAddedFragments:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
     :goto_0
@@ -1169,8 +1160,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mPostponedTransactions:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -1219,10 +1208,9 @@
 
     if-eqz v5, :cond_1
 
-    :goto_2
     invoke-virtual {v3}, Landroidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener;->cancelTransaction()V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     invoke-virtual {v3}, Landroidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener;->isReady()Z
@@ -1280,13 +1268,15 @@
 
     if-eqz v4, :cond_3
 
+    invoke-virtual {v3}, Landroidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener;->cancelTransaction()V
+
     goto :goto_2
 
     :cond_3
     invoke-virtual {v3}, Landroidx/fragment/app/FragmentManagerImpl$StartEnterTransitionListener;->completeTransaction()V
 
     :cond_4
-    :goto_3
+    :goto_2
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_1
@@ -1304,7 +1294,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     if-nez v1, :cond_0
 
@@ -1346,6 +1336,9 @@
     goto :goto_0
 
     :cond_2
+    return-object v2
+
+    :cond_3
     :goto_1
     return-object v2
 .end method
@@ -1480,6 +1473,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method private static getAnimationListener(Landroid/view/animation/Animation;)Landroid/view/animation/Animation$AnimationListener;
@@ -1525,6 +1520,8 @@
 
     const-string v1, "Cannot access Animation\'s mListener field"
 
+    invoke-static {v0, v1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
     goto :goto_0
 
     :catch_1
@@ -1534,9 +1531,9 @@
 
     const-string v1, "No field with the name mListener is found in Animation class"
 
-    :goto_0
     invoke-static {v0, v1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    :goto_0
     const/4 p0, 0x0
 
     :goto_1
@@ -1855,8 +1852,6 @@
 
     if-nez p1, :cond_0
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mPrimaryNav:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->peekChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v1
@@ -2213,7 +2208,7 @@
 .method private static setHWLayerAnimListenerIfAlpha(Landroid/view/View;Landroidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator;)V
     .locals 3
 
-    if-eqz p0, :cond_2
+    if-eqz p0, :cond_3
 
     if-nez p1, :cond_0
 
@@ -2262,6 +2257,9 @@
     invoke-virtual {p1, v1}, Landroid/view/animation/Animation;->setAnimationListener(Landroid/view/animation/Animation$AnimationListener;)V
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_0
     return-void
 .end method
@@ -2340,7 +2338,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_2
 
     if-nez p1, :cond_0
 
@@ -2376,6 +2374,9 @@
     return p0
 
     :cond_1
+    return v0
+
+    :cond_2
     :goto_0
     return v0
 .end method
@@ -2416,8 +2417,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     const-string v4, "  "
 
     new-array v2, v2, [Ljava/lang/String;
@@ -2447,7 +2446,18 @@
 
     invoke-virtual {p0, v0, v3, v1, v2}, Landroidx/fragment/app/FragmentManagerImpl;->dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
     :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+
+    goto :goto_0
+
+    :catch_1
+    move-exception v0
+
+    const-string v1, "FragmentManager"
+
+    const-string v2, "Failed dumping state"
+
+    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :goto_0
     throw p1
@@ -3019,8 +3029,6 @@
 
     if-eqz p2, :cond_6
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {p2}, Landroid/util/SparseArray;->size()I
 
     move-result p2
@@ -3697,8 +3705,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -3766,8 +3772,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -3835,8 +3839,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -3900,8 +3902,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -3965,8 +3965,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4030,8 +4028,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4099,8 +4095,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4168,8 +4162,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4233,8 +4225,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4302,8 +4292,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4367,8 +4355,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4432,8 +4418,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4505,8 +4489,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4570,8 +4552,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -4899,8 +4879,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v1}, Landroid/util/SparseArray;->size()I
 
     move-result v1
@@ -5018,8 +4996,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mCreatedMenus:Ljava/util/ArrayList;
-
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
     move-result v1
@@ -5072,8 +5048,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
-
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
     move-result v1
@@ -5216,8 +5190,6 @@
 
     if-eqz p2, :cond_7
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentManagerImpl;->mPendingActions:Ljava/util/ArrayList;
-
     invoke-virtual {p2}, Ljava/util/ArrayList;->size()I
 
     move-result p2
@@ -5376,6 +5348,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final enqueueAction(Landroidx/fragment/app/FragmentManagerImpl$OpGenerator;Z)V
@@ -5685,8 +5659,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -5777,8 +5749,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -5828,8 +5798,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -5944,8 +5912,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -5973,8 +5939,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
     move-result v0
@@ -6025,8 +5989,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -6526,9 +6488,13 @@
     :goto_1
     if-nez p4, :cond_9
 
+    return-object p1
+
     :cond_9
     return-object p1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_5
@@ -6653,9 +6619,9 @@
 
     iget-boolean v1, p1, Landroidx/fragment/app/Fragment;->mRemoving:Z
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eqz v1, :cond_2
 
@@ -6665,21 +6631,27 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {v0, v3}, Ljava/lang/Math;->min(II)I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_1
     invoke-static {v0, v2}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
-    :cond_2
-    :goto_0
     move v6, v0
 
+    goto :goto_0
+
+    :cond_1
+    invoke-static {v0, v3}, Ljava/lang/Math;->min(II)I
+
+    move-result v0
+
+    move v6, v0
+
+    goto :goto_0
+
+    :cond_2
+    move v6, v0
+
+    :goto_0
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getNextTransition()I
 
     move-result v7
@@ -6754,7 +6726,7 @@
     :cond_4
     iput v1, p1, Landroidx/fragment/app/Fragment;->mPostponedAlpha:F
 
-    iput-boolean v2, p1, Landroidx/fragment/app/Fragment;->mIsNewlyAdded:Z
+    iput-boolean v3, p1, Landroidx/fragment/app/Fragment;->mIsNewlyAdded:Z
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getNextTransition()I
 
@@ -6764,7 +6736,7 @@
 
     move-result v1
 
-    invoke-virtual {p0, p1, v0, v3, v1}, Landroidx/fragment/app/FragmentManagerImpl;->loadAnimation(Landroidx/fragment/app/Fragment;IZI)Landroidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator;
+    invoke-virtual {p0, p1, v0, v2, v1}, Landroidx/fragment/app/FragmentManagerImpl;->loadAnimation(Landroidx/fragment/app/Fragment;IZI)Landroidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator;
 
     move-result-object v0
 
@@ -6926,13 +6898,11 @@
 
     if-eqz p1, :cond_7
 
-    iget p1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
+    iget v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    if-ne p1, v0, :cond_7
-
-    iget-object p1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mHost:Landroidx/fragment/app/FragmentHostCallback;
+    if-ne v0, v1, :cond_7
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentHostCallback;->onSupportInvalidateOptionsMenu()V
 
@@ -7051,7 +7021,7 @@
 
     const/4 v13, 0x0
 
-    if-gt v0, v11, :cond_22
+    if-gt v0, v11, :cond_23
 
     iget-boolean v0, v7, Landroidx/fragment/app/Fragment;->mFromLayout:Z
 
@@ -7102,7 +7072,9 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto/16 :goto_12
+    move v8, v11
+
+    goto/16 :goto_13
 
     :pswitch_0
     if-lez v11, :cond_13
@@ -7222,23 +7194,17 @@
 
     iput-object v0, v7, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
-    iget-object v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
+    iget-object v1, v6, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
 
-    iput-object v0, v7, Landroidx/fragment/app/Fragment;->mParentFragment:Landroidx/fragment/app/Fragment;
+    iput-object v1, v7, Landroidx/fragment/app/Fragment;->mParentFragment:Landroidx/fragment/app/Fragment;
 
-    iget-object v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
+    if-eqz v1, :cond_d
 
-    if-eqz v0, :cond_d
-
-    iget-object v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
-    iget-object v0, v0, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
+    iget-object v0, v1, Landroidx/fragment/app/Fragment;->mChildFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
 
     goto :goto_5
 
     :cond_d
-    iget-object v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentHostCallback;->getFragmentManagerImpl()Landroidx/fragment/app/FragmentManagerImpl;
 
     move-result-object v0
@@ -7688,7 +7654,7 @@
 
     :cond_20
     :pswitch_3
-    if-le v11, v9, :cond_34
+    if-le v11, v9, :cond_22
 
     sget-boolean v0, Landroidx/fragment/app/FragmentManagerImpl;->DEBUG:Z
 
@@ -7717,12 +7683,15 @@
 
     iput-object v12, v7, Landroidx/fragment/app/Fragment;->mSavedViewState:Landroid/util/SparseArray;
 
-    goto/16 :goto_12
-
     :cond_22
+    move v8, v11
+
+    goto/16 :goto_13
+
+    :cond_23
     iget v0, v7, Landroidx/fragment/app/Fragment;->mState:I
 
-    if-le v0, v11, :cond_34
+    if-le v0, v11, :cond_35
 
     iget v0, v7, Landroidx/fragment/app/Fragment;->mState:I
 
@@ -7733,11 +7702,11 @@
     :pswitch_4
     const/4 v0, 0x4
 
-    if-ge v11, v0, :cond_24
+    if-ge v11, v0, :cond_25
 
     sget-boolean v0, Landroidx/fragment/app/FragmentManagerImpl;->DEBUG:Z
 
-    if-eqz v0, :cond_23
+    if-eqz v0, :cond_24
 
     const-string v0, "FragmentManager"
 
@@ -7753,18 +7722,18 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_23
+    :cond_24
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->performPause()V
 
     invoke-virtual {p0, p1, v13}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchOnFragmentPaused(Landroidx/fragment/app/Fragment;Z)V
 
-    :cond_24
+    :cond_25
     :pswitch_5
-    if-ge v11, v9, :cond_26
+    if-ge v11, v9, :cond_27
 
     sget-boolean v0, Landroidx/fragment/app/FragmentManagerImpl;->DEBUG:Z
 
-    if-eqz v0, :cond_25
+    if-eqz v0, :cond_26
 
     const-string v0, "FragmentManager"
 
@@ -7780,18 +7749,18 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_25
+    :cond_26
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->performStop()V
 
     invoke-virtual {p0, p1, v13}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchOnFragmentStopped(Landroidx/fragment/app/Fragment;Z)V
 
-    :cond_26
+    :cond_27
     :pswitch_6
-    if-ge v11, v10, :cond_2c
+    if-ge v11, v10, :cond_2d
 
     sget-boolean v0, Landroidx/fragment/app/FragmentManagerImpl;->DEBUG:Z
 
-    if-eqz v0, :cond_27
+    if-eqz v0, :cond_28
 
     const-string v0, "FragmentManager"
 
@@ -7807,10 +7776,10 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_27
+    :cond_28
     iget-object v0, v7, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
 
-    if-eqz v0, :cond_28
+    if-eqz v0, :cond_29
 
     iget-object v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
@@ -7818,26 +7787,26 @@
 
     move-result v0
 
-    if-eqz v0, :cond_28
+    if-eqz v0, :cond_29
 
     iget-object v0, v7, Landroidx/fragment/app/Fragment;->mSavedViewState:Landroid/util/SparseArray;
 
-    if-nez v0, :cond_28
+    if-nez v0, :cond_29
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->saveFragmentViewState(Landroidx/fragment/app/Fragment;)V
 
-    :cond_28
+    :cond_29
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->performDestroyView()V
 
     invoke-virtual {p0, p1, v13}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchOnFragmentViewDestroyed(Landroidx/fragment/app/Fragment;Z)V
 
     iget-object v0, v7, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
 
-    if-eqz v0, :cond_2b
+    if-eqz v0, :cond_2c
 
     iget-object v0, v7, Landroidx/fragment/app/Fragment;->mContainer:Landroid/view/ViewGroup;
 
-    if-eqz v0, :cond_2b
+    if-eqz v0, :cond_2c
 
     iget-object v0, v7, Landroidx/fragment/app/Fragment;->mContainer:Landroid/view/ViewGroup;
 
@@ -7853,11 +7822,11 @@
 
     const/4 v1, 0x0
 
-    if-lez v0, :cond_29
+    if-lez v0, :cond_2a
 
     iget-boolean v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mDestroyed:Z
 
-    if-nez v0, :cond_29
+    if-nez v0, :cond_2a
 
     iget-object v0, v7, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
 
@@ -7865,13 +7834,13 @@
 
     move-result v0
 
-    if-nez v0, :cond_29
+    if-nez v0, :cond_2a
 
     iget v0, v7, Landroidx/fragment/app/Fragment;->mPostponedAlpha:F
 
     cmpl-float v0, v0, v1
 
-    if-ltz v0, :cond_29
+    if-ltz v0, :cond_2a
 
     move/from16 v0, p3
 
@@ -7883,24 +7852,24 @@
 
     goto :goto_e
 
-    :cond_29
+    :cond_2a
     move-object v0, v12
 
     :goto_e
     iput v1, v7, Landroidx/fragment/app/Fragment;->mPostponedAlpha:F
 
-    if-eqz v0, :cond_2a
+    if-eqz v0, :cond_2b
 
     invoke-direct {p0, p1, v0, v11}, Landroidx/fragment/app/FragmentManagerImpl;->animateRemoveFragment(Landroidx/fragment/app/Fragment;Landroidx/fragment/app/FragmentManagerImpl$AnimationOrAnimator;I)V
 
-    :cond_2a
+    :cond_2b
     iget-object v0, v7, Landroidx/fragment/app/Fragment;->mContainer:Landroid/view/ViewGroup;
 
     iget-object v1, v7, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
 
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
 
-    :cond_2b
+    :cond_2c
     iput-object v12, v7, Landroidx/fragment/app/Fragment;->mContainer:Landroid/view/ViewGroup;
 
     iput-object v12, v7, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
@@ -7915,19 +7884,19 @@
 
     iput-boolean v13, v7, Landroidx/fragment/app/Fragment;->mInLayout:Z
 
-    :cond_2c
+    :cond_2d
     :pswitch_7
-    if-gtz v11, :cond_34
+    if-gtz v11, :cond_35
 
     iget-boolean v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mDestroyed:Z
 
-    if-eqz v0, :cond_2e
+    if-eqz v0, :cond_2f
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getAnimatingAway()Landroid/view/View;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2d
+    if-eqz v0, :cond_2e
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getAnimatingAway()Landroid/view/View;
 
@@ -7939,12 +7908,12 @@
 
     goto :goto_f
 
-    :cond_2d
+    :cond_2e
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getAnimator()Landroid/animation/Animator;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2e
+    if-eqz v0, :cond_2f
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getAnimator()Landroid/animation/Animator;
 
@@ -7954,26 +7923,26 @@
 
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
-    :cond_2e
+    :cond_2f
     :goto_f
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getAnimatingAway()Landroid/view/View;
 
     move-result-object v0
 
-    if-nez v0, :cond_33
+    if-nez v0, :cond_34
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getAnimator()Landroid/animation/Animator;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2f
+    if-eqz v0, :cond_30
 
     goto :goto_11
 
-    :cond_2f
+    :cond_30
     sget-boolean v0, Landroidx/fragment/app/FragmentManagerImpl;->DEBUG:Z
 
-    if-eqz v0, :cond_30
+    if-eqz v0, :cond_31
 
     const-string v0, "FragmentManager"
 
@@ -7989,10 +7958,10 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_30
+    :cond_31
     iget-boolean v0, v7, Landroidx/fragment/app/Fragment;->mRetaining:Z
 
-    if-nez v0, :cond_31
+    if-nez v0, :cond_32
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->performDestroy()V
 
@@ -8000,7 +7969,7 @@
 
     goto :goto_10
 
-    :cond_31
+    :cond_32
     iput v13, v7, Landroidx/fragment/app/Fragment;->mState:I
 
     :goto_10
@@ -8008,17 +7977,17 @@
 
     invoke-virtual {p0, p1, v13}, Landroidx/fragment/app/FragmentManagerImpl;->dispatchOnFragmentDetached(Landroidx/fragment/app/Fragment;Z)V
 
-    if-nez p5, :cond_34
+    if-nez p5, :cond_35
 
     iget-boolean v0, v7, Landroidx/fragment/app/Fragment;->mRetaining:Z
 
-    if-nez v0, :cond_32
+    if-nez v0, :cond_33
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->makeInactive(Landroidx/fragment/app/Fragment;)V
 
     goto :goto_12
 
-    :cond_32
+    :cond_33
     iput-object v12, v7, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
     iput-object v12, v7, Landroidx/fragment/app/Fragment;->mParentFragment:Landroidx/fragment/app/Fragment;
@@ -8027,20 +7996,20 @@
 
     goto :goto_12
 
-    :cond_33
+    :cond_34
     :goto_11
     invoke-virtual {p1, v11}, Landroidx/fragment/app/Fragment;->setStateAfterAnimating(I)V
 
     goto :goto_13
 
-    :cond_34
+    :cond_35
     :goto_12
     move v8, v11
 
     :goto_13
     iget v0, v7, Landroidx/fragment/app/Fragment;->mState:I
 
-    if-eq v0, v8, :cond_35
+    if-eq v0, v8, :cond_36
 
     const-string v0, "FragmentManager"
 
@@ -8074,7 +8043,7 @@
 
     iput v8, v7, Landroidx/fragment/app/Fragment;->mState:I
 
-    :cond_35
+    :cond_36
     return-void
 
     :pswitch_data_0
@@ -8181,9 +8150,14 @@
 
     move-result-object v2
 
+    move-object v7, v2
+
+    goto :goto_0
+
     :cond_1
     move-object v7, v2
 
+    :goto_0
     const/4 v2, -0x1
 
     const/4 v8, 0x1
@@ -8228,7 +8202,7 @@
 
     if-eqz v10, :cond_4
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_4
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -8258,19 +8232,19 @@
     throw v0
 
     :cond_5
-    :goto_0
+    :goto_1
     if-eq v9, v2, :cond_6
 
     invoke-virtual {p0, v9}, Landroidx/fragment/app/FragmentManagerImpl;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
     move-result-object v4
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_6
     move-object v4, v3
 
-    :goto_1
+    :goto_2
     if-nez v4, :cond_7
 
     if-eqz v10, :cond_7
@@ -8340,12 +8314,12 @@
 
     move v2, v9
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_a
     move v2, v5
 
-    :goto_2
+    :goto_3
     iput v2, v0, Landroidx/fragment/app/Fragment;->mFragmentId:I
 
     iput v5, v0, Landroidx/fragment/app/Fragment;->mContainerId:I
@@ -8360,8 +8334,6 @@
 
     iput-object v2, v0, Landroidx/fragment/app/Fragment;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
-    iget-object v2, v6, Landroidx/fragment/app/FragmentManagerImpl;->mHost:Landroidx/fragment/app/FragmentHostCallback;
-
     invoke-virtual {v2}, Landroidx/fragment/app/FragmentHostCallback;->getContext()Landroid/content/Context;
 
     move-result-object v2
@@ -8374,7 +8346,7 @@
 
     move-object v8, v0
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_b
     iget-boolean v0, v4, Landroidx/fragment/app/Fragment;->mInLayout:Z
@@ -8404,7 +8376,7 @@
     :cond_c
     move-object v8, v4
 
-    :goto_3
+    :goto_4
     iget v0, v6, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
 
     if-gtz v0, :cond_d
@@ -8427,12 +8399,12 @@
 
     invoke-virtual/range {v0 .. v5}, Landroidx/fragment/app/FragmentManagerImpl;->moveToState(Landroidx/fragment/app/Fragment;IIIZ)V
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_d
     invoke-virtual {p0, v8}, Landroidx/fragment/app/FragmentManagerImpl;->moveToState(Landroidx/fragment/app/Fragment;)V
 
-    :goto_4
+    :goto_5
     iget-object v0, v8, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
 
     if-eqz v0, :cond_10
@@ -8759,23 +8731,21 @@
     return v1
 
     :cond_0
-    const/4 v0, 0x1
+    const/4 v2, 0x1
 
     if-nez p3, :cond_2
 
     if-gez p4, :cond_2
 
-    and-int/lit8 v2, p5, 0x1
+    and-int/lit8 v3, p5, 0x1
 
-    if-nez v2, :cond_2
+    if-nez v3, :cond_2
 
-    iget-object p3, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
-
-    invoke-virtual {p3}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result p3
 
-    sub-int/2addr p3, v0
+    sub-int/2addr p3, v2
 
     if-gez p3, :cond_1
 
@@ -8806,26 +8776,26 @@
     :cond_3
     const/4 p3, -0x1
 
-    const/4 v2, -0x1
+    const/4 v0, -0x1
 
     goto :goto_3
 
     :cond_4
     :goto_0
-    iget-object v2, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
+    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
 
-    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
-    move-result v2
+    move-result v0
 
-    sub-int/2addr v2, v0
+    sub-int/2addr v0, v2
 
     :goto_1
-    if-ltz v2, :cond_7
+    if-ltz v0, :cond_7
 
     iget-object v3, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
 
-    invoke-virtual {v3, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    invoke-virtual {v3, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -8851,35 +8821,34 @@
     if-eq p4, v3, :cond_7
 
     :cond_6
-    add-int/lit8 v2, v2, -0x1
+    add-int/lit8 v0, v0, -0x1
 
     goto :goto_1
 
     :cond_7
-    if-gez v2, :cond_8
+    if-gez v0, :cond_8
 
     return v1
 
     :cond_8
-    and-int/2addr p5, v0
+    and-int/2addr p5, v2
 
     if-eqz p5, :cond_b
 
-    :cond_9
-    :goto_2
-    add-int/lit8 v2, v2, -0x1
+    add-int/lit8 v0, v0, -0x1
 
-    if-ltz v2, :cond_b
+    :goto_2
+    if-ltz v0, :cond_b
 
     iget-object p5, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
 
-    invoke-virtual {p5, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    invoke-virtual {p5, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
     move-result-object p5
 
     check-cast p5, Landroidx/fragment/app/BackStackRecord;
 
-    if-eqz p3, :cond_a
+    if-eqz p3, :cond_9
 
     invoke-virtual {p5}, Landroidx/fragment/app/BackStackRecord;->getName()Ljava/lang/String;
 
@@ -8889,15 +8858,18 @@
 
     move-result v3
 
-    if-nez v3, :cond_9
+    if-nez v3, :cond_a
 
-    :cond_a
+    :cond_9
     if-ltz p4, :cond_b
 
     iget p5, p5, Landroidx/fragment/app/BackStackRecord;->mIndex:I
 
     if-ne p4, p5, :cond_b
 
+    :cond_a
+    add-int/lit8 v0, v0, -0x1
+
     goto :goto_2
 
     :cond_b
@@ -8908,9 +8880,9 @@
 
     move-result p3
 
-    sub-int/2addr p3, v0
+    sub-int/2addr p3, v2
 
-    if-ne v2, p3, :cond_c
+    if-ne v0, p3, :cond_c
 
     return v1
 
@@ -8921,10 +8893,10 @@
 
     move-result p3
 
-    sub-int/2addr p3, v0
+    sub-int/2addr p3, v2
 
     :goto_4
-    if-le p3, v2, :cond_d
+    if-le p3, v0, :cond_d
 
     iget-object p4, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
 
@@ -8944,7 +8916,7 @@
 
     :cond_d
     :goto_5
-    return v0
+    return v2
 .end method
 
 .method public final putFragment(Landroid/os/Bundle;Ljava/lang/String;Landroidx/fragment/app/Fragment;)V
@@ -9096,8 +9068,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStackChangeListeners:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
     :cond_0
@@ -9815,8 +9785,6 @@
 
     if-eqz v2, :cond_12
 
-    iget-object v2, p0, Landroidx/fragment/app/FragmentManagerImpl;->mActive:Landroid/util/SparseArray;
-
     invoke-virtual {v2}, Landroid/util/SparseArray;->size()I
 
     move-result v2
@@ -10143,8 +10111,6 @@
 
     if-eqz v0, :cond_10
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -10222,8 +10188,6 @@
 
     if-eqz v1, :cond_11
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mPrimaryNav:Landroidx/fragment/app/Fragment;
-
     iget v1, v1, Landroidx/fragment/app/Fragment;->mIndex:I
 
     iput v1, v0, Landroidx/fragment/app/FragmentManagerState;->mPrimaryNavActiveIndex:I
@@ -10368,7 +10332,7 @@
 
     const/4 v1, 0x0
 
-    if-lez v0, :cond_1
+    if-lez v0, :cond_2
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/FragmentManagerImpl;->saveFragmentBasicState(Landroidx/fragment/app/Fragment;)Landroid/os/Bundle;
 
@@ -10384,6 +10348,9 @@
 
     :cond_1
     return-object v1
+
+    :cond_2
+    return-object v1
 .end method
 
 .method final saveFragmentViewState(Landroidx/fragment/app/Fragment;)V
@@ -10409,8 +10376,6 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Landroidx/fragment/app/FragmentManagerImpl;->mStateArray:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->clear()V
 
     :goto_0
@@ -10882,6 +10847,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final setPrimaryNavigationFragment(Landroidx/fragment/app/Fragment;)V
@@ -11056,19 +11023,16 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mParent:Landroidx/fragment/app/Fragment;
-
-    :goto_0
     invoke-static {v1, v0}, Landroidx/core/util/DebugUtils;->buildShortClassTag(Ljava/lang/Object;Ljava/lang/StringBuilder;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v1, p0, Landroidx/fragment/app/FragmentManagerImpl;->mHost:Landroidx/fragment/app/FragmentHostCallback;
 
-    goto :goto_0
+    invoke-static {v1, v0}, Landroidx/core/util/DebugUtils;->buildShortClassTag(Ljava/lang/Object;Ljava/lang/StringBuilder;)V
 
-    :goto_1
+    :goto_0
     const-string v1, "}}"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -11136,4 +11100,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerNonConfig.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerNonConfig.smali
index 57b0a709d5..07648ad3f9 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerNonConfig.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerNonConfig.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/FragmentManagerNonConfig;
 .super Ljava/lang/Object;
+.source "FragmentManagerNonConfig.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerState$1.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerState$1.smali
index 39bb31be24..6cd16a7f45 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerState$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentManagerState$1;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerState.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerState.smali
index 526c384a2a..c54b8e05dc 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerState.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerState.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentManagerState;
 .super Ljava/lang/Object;
+.source "FragmentManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentPagerAdapter.smali b/com.discord/smali/androidx/fragment/app/FragmentPagerAdapter.smali
index 5fce325e90..06ad6cbb4f 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentPagerAdapter.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentPagerAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentPagerAdapter;
 .super Landroidx/viewpager/widget/PagerAdapter;
+.source "FragmentPagerAdapter.java"
 
 
 # static fields
@@ -103,8 +104,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentPagerAdapter;->mCurTransaction:Landroidx/fragment/app/FragmentTransaction;
-
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentTransaction;->commitNowAllowingStateLoss()V
 
     const/4 p1, 0x0
@@ -270,12 +269,8 @@
 
     if-eq p3, p1, :cond_1
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentPagerAdapter;->mCurrentPrimaryItem:Landroidx/fragment/app/Fragment;
-
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentPagerAdapter;->mCurrentPrimaryItem:Landroidx/fragment/app/Fragment;
-
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Landroidx/fragment/app/Fragment;->setMenuVisibility(Z)V
diff --git a/com.discord/smali/androidx/fragment/app/FragmentState$1.smali b/com.discord/smali/androidx/fragment/app/FragmentState$1.smali
index d2ac825a6c..9c32576336 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentState$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentState$1;
 .super Ljava/lang/Object;
+.source "FragmentState.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentState.smali b/com.discord/smali/androidx/fragment/app/FragmentState.smali
index 217764010e..5c8bbbcd61 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentState.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentState.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentState;
 .super Ljava/lang/Object;
+.source "FragmentState.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -77,9 +78,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
@@ -155,9 +156,12 @@
 
     if-eqz v0, :cond_3
 
-    const/4 v1, 0x1
+    goto :goto_3
 
     :cond_3
+    const/4 v1, 0x0
+
+    :goto_3
     iput-boolean v1, p0, Landroidx/fragment/app/FragmentState;->mHidden:Z
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readBundle()Landroid/os/Bundle;
@@ -248,8 +252,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentState;->mArguments:Landroid/os/Bundle;
-
     invoke-virtual {v0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
 
     move-result-object v2
@@ -267,10 +269,9 @@
 
     move-result-object p2
 
-    :goto_0
     iput-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mClassName:Ljava/lang/String;
@@ -281,15 +282,13 @@
 
     move-result-object p2
 
-    goto :goto_0
+    iput-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
 
-    :goto_1
+    :goto_0
     iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mSavedFragmentState:Landroid/os/Bundle;
 
     if-eqz p2, :cond_2
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mSavedFragmentState:Landroid/os/Bundle;
-
     invoke-virtual {v0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
 
     move-result-object v0
@@ -315,50 +314,34 @@
 
     iput-boolean p3, p2, Landroidx/fragment/app/Fragment;->mFromLayout:Z
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     const/4 p3, 0x1
 
     iput-boolean p3, p2, Landroidx/fragment/app/Fragment;->mRestored:Z
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iget p3, p0, Landroidx/fragment/app/FragmentState;->mFragmentId:I
 
     iput p3, p2, Landroidx/fragment/app/Fragment;->mFragmentId:I
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iget p3, p0, Landroidx/fragment/app/FragmentState;->mContainerId:I
 
     iput p3, p2, Landroidx/fragment/app/Fragment;->mContainerId:I
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iget-object p3, p0, Landroidx/fragment/app/FragmentState;->mTag:Ljava/lang/String;
 
     iput-object p3, p2, Landroidx/fragment/app/Fragment;->mTag:Ljava/lang/String;
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iget-boolean p3, p0, Landroidx/fragment/app/FragmentState;->mRetainInstance:Z
 
     iput-boolean p3, p2, Landroidx/fragment/app/Fragment;->mRetainInstance:Z
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iget-boolean p3, p0, Landroidx/fragment/app/FragmentState;->mDetached:Z
 
     iput-boolean p3, p2, Landroidx/fragment/app/Fragment;->mDetached:Z
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iget-boolean p3, p0, Landroidx/fragment/app/FragmentState;->mHidden:Z
 
     iput-boolean p3, p2, Landroidx/fragment/app/Fragment;->mHidden:Z
 
-    iget-object p2, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iget-object p1, p1, Landroidx/fragment/app/FragmentHostCallback;->mFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
 
     iput-object p1, p2, Landroidx/fragment/app/Fragment;->mFragmentManager:Landroidx/fragment/app/FragmentManagerImpl;
@@ -390,12 +373,8 @@
 
     iput-object p4, p1, Landroidx/fragment/app/Fragment;->mChildNonConfig:Landroidx/fragment/app/FragmentManagerNonConfig;
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     iput-object p5, p1, Landroidx/fragment/app/Fragment;->mViewModelStore:Landroidx/lifecycle/ViewModelStore;
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentState;->mInstance:Landroidx/fragment/app/Fragment;
-
     return-object p1
 .end method
 
diff --git a/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali b/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali
index 13de15ee21..bf850a3d32 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentStatePagerAdapter;
 .super Landroidx/viewpager/widget/PagerAdapter;
+.source "FragmentStatePagerAdapter.java"
 
 
 # static fields
@@ -155,8 +156,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentStatePagerAdapter;->mCurTransaction:Landroidx/fragment/app/FragmentTransaction;
-
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentTransaction;->commitNowAllowingStateLoss()V
 
     const/4 p1, 0x0
@@ -559,12 +558,8 @@
 
     if-eq p3, p1, :cond_1
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentStatePagerAdapter;->mCurrentPrimaryItem:Landroidx/fragment/app/Fragment;
-
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentStatePagerAdapter;->mCurrentPrimaryItem:Landroidx/fragment/app/Fragment;
-
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Landroidx/fragment/app/Fragment;->setMenuVisibility(Z)V
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTabHost$DummyTabFactory.smali b/com.discord/smali/androidx/fragment/app/FragmentTabHost$DummyTabFactory.smali
index 2908eeb86f..2f91c05623 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTabHost$DummyTabFactory.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTabHost$DummyTabFactory.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTabHost$DummyTabFactory;
 .super Ljava/lang/Object;
+.source "FragmentTabHost.java"
 
 # interfaces
 .implements Landroid/widget/TabHost$TabContentFactory;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState$1.smali b/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState$1.smali
index d3eb3a57f0..021ef1f7e0 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentTabHost$SavedState$1;
 .super Ljava/lang/Object;
+.source "FragmentTabHost.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState.smali b/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState.smali
index 639723b446..c4689601ed 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTabHost$SavedState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTabHost$SavedState;
 .super Landroid/view/View$BaseSavedState;
+.source "FragmentTabHost.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTabHost$TabInfo.smali b/com.discord/smali/androidx/fragment/app/FragmentTabHost$TabInfo.smali
index f26b16d15c..b4e51c5e29 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTabHost$TabInfo.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTabHost$TabInfo.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentTabHost$TabInfo;
 .super Ljava/lang/Object;
+.source "FragmentTabHost.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTabHost.smali b/com.discord/smali/androidx/fragment/app/FragmentTabHost.smali
index 05ae2b7d07..7d8cc44224 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTabHost.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTabHost.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/FragmentTabHost;
 .super Landroid/widget/TabHost;
+.source "FragmentTabHost.java"
 
 # interfaces
 .implements Landroid/widget/TabHost$OnTabChangeListener;
@@ -110,8 +111,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentTabHost;->mLastTab:Landroidx/fragment/app/FragmentTabHost$TabInfo;
-
     iget-object v0, v0, Landroidx/fragment/app/FragmentTabHost$TabInfo;->fragment:Landroidx/fragment/app/Fragment;
 
     if-eqz v0, :cond_1
@@ -652,8 +651,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentTabHost;->mOnTabChangeListener:Landroid/widget/TabHost$OnTabChangeListener;
-
     invoke-interface {v0, p1}, Landroid/widget/TabHost$OnTabChangeListener;->onTabChanged(Ljava/lang/String;)V
 
     :cond_1
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransaction.smali b/com.discord/smali/androidx/fragment/app/FragmentTransaction.smali
index 0dc3ed430f..be1dd5f57b 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransaction.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransaction.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentTransaction;
 .super Ljava/lang/Object;
+.source "FragmentTransaction.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransition$1.smali b/com.discord/smali/androidx/fragment/app/FragmentTransition$1.smali
index aadad66c41..2ca9fad21b 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransition$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransition$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentTransition$1;
 .super Ljava/lang/Object;
+.source "FragmentTransition.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransition$2.smali b/com.discord/smali/androidx/fragment/app/FragmentTransition$2.smali
index 9ac6d59bb4..c5001df2e9 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransition$2.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransition$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentTransition$2;
 .super Ljava/lang/Object;
+.source "FragmentTransition.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -68,13 +69,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentTransition$2;->val$impl:Landroidx/fragment/app/FragmentTransitionImpl;
-
-    iget-object v1, p0, Landroidx/fragment/app/FragmentTransition$2;->val$enterTransition:Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/fragment/app/FragmentTransition$2;->val$impl:Landroidx/fragment/app/FragmentTransitionImpl;
 
     iget-object v2, p0, Landroidx/fragment/app/FragmentTransition$2;->val$nonExistentView:Landroid/view/View;
 
-    invoke-virtual {v0, v1, v2}, Landroidx/fragment/app/FragmentTransitionImpl;->removeTarget(Ljava/lang/Object;Landroid/view/View;)V
+    invoke-virtual {v1, v0, v2}, Landroidx/fragment/app/FragmentTransitionImpl;->removeTarget(Ljava/lang/Object;Landroid/view/View;)V
 
     iget-object v0, p0, Landroidx/fragment/app/FragmentTransition$2;->val$impl:Landroidx/fragment/app/FragmentTransitionImpl;
 
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransition$3.smali b/com.discord/smali/androidx/fragment/app/FragmentTransition$3.smali
index 12828309e7..0380e8edf8 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransition$3.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransition$3.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentTransition$3;
 .super Ljava/lang/Object;
+.source "FragmentTransition.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -76,13 +77,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/fragment/app/FragmentTransition$3;->val$impl:Landroidx/fragment/app/FragmentTransitionImpl;
-
-    iget-object v1, p0, Landroidx/fragment/app/FragmentTransition$3;->val$epicenterView:Landroid/view/View;
+    iget-object v1, p0, Landroidx/fragment/app/FragmentTransition$3;->val$impl:Landroidx/fragment/app/FragmentTransitionImpl;
 
     iget-object v2, p0, Landroidx/fragment/app/FragmentTransition$3;->val$epicenter:Landroid/graphics/Rect;
 
-    invoke-virtual {v0, v1, v2}, Landroidx/fragment/app/FragmentTransitionImpl;->getBoundsOnScreen(Landroid/view/View;Landroid/graphics/Rect;)V
+    invoke-virtual {v1, v0, v2}, Landroidx/fragment/app/FragmentTransitionImpl;->getBoundsOnScreen(Landroid/view/View;Landroid/graphics/Rect;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransition$4.smali b/com.discord/smali/androidx/fragment/app/FragmentTransition$4.smali
index 84bb090cbe..df5f3bbc75 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransition$4.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransition$4.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/FragmentTransition$4;
 .super Ljava/lang/Object;
+.source "FragmentTransition.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -123,15 +124,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/fragment/app/FragmentTransition$4;->val$impl:Landroidx/fragment/app/FragmentTransitionImpl;
-
-    iget-object v2, p0, Landroidx/fragment/app/FragmentTransition$4;->val$finalSharedElementTransition:Ljava/lang/Object;
+    iget-object v2, p0, Landroidx/fragment/app/FragmentTransition$4;->val$impl:Landroidx/fragment/app/FragmentTransitionImpl;
 
     iget-object v3, p0, Landroidx/fragment/app/FragmentTransition$4;->val$sharedElementsOut:Ljava/util/ArrayList;
 
     iget-object v4, p0, Landroidx/fragment/app/FragmentTransition$4;->val$sharedElementsIn:Ljava/util/ArrayList;
 
-    invoke-virtual {v1, v2, v3, v4}, Landroidx/fragment/app/FragmentTransitionImpl;->swapSharedElementTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
+    invoke-virtual {v2, v1, v3, v4}, Landroidx/fragment/app/FragmentTransitionImpl;->swapSharedElementTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
 
     iget-object v1, p0, Landroidx/fragment/app/FragmentTransition$4;->val$fragments:Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;
 
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransition$FragmentContainerTransition.smali b/com.discord/smali/androidx/fragment/app/FragmentTransition$FragmentContainerTransition.smali
index f9832f2bb5..05012e2998 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransition$FragmentContainerTransition.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransition$FragmentContainerTransition.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;
 .super Ljava/lang/Object;
+.source "FragmentTransition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransition.smali b/com.discord/smali/androidx/fragment/app/FragmentTransition.smali
index d0b326e7a9..d64775dfc3 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransition.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransition.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransition;
 .super Ljava/lang/Object;
+.source "FragmentTransition.java"
 
 
 # annotations
@@ -180,7 +181,7 @@
 
     const/4 v1, 0x1
 
-    if-eq p1, v1, :cond_7
+    if-eq p1, v1, :cond_b
 
     packed-switch p1, :pswitch_data_0
 
@@ -188,72 +189,105 @@
 
     const/4 v1, 0x0
 
-    :goto_1
     const/4 v8, 0x0
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :pswitch_0
-    if-eqz p4, :cond_3
-
-    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHiddenChanged:Z
-
-    if-eqz p1, :cond_9
-
-    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
-
-    if-nez p1, :cond_9
-
-    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
-
-    if-eqz p1, :cond_9
-
-    goto :goto_5
-
-    :cond_3
-    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
-
-    goto :goto_6
-
-    :pswitch_1
     if-eqz p4, :cond_4
 
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHiddenChanged:Z
 
-    if-eqz p1, :cond_5
-
-    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
-
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_3
 
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
 
-    if-eqz p1, :cond_5
+    if-nez p1, :cond_3
 
-    :goto_2
-    goto :goto_3
+    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
+
+    if-eqz p1, :cond_3
+
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 p1, 0x0
+
+    goto :goto_1
 
     :cond_4
+    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
+
+    :goto_1
+    move v0, p1
+
+    const/4 p1, 0x0
+
+    const/4 v8, 0x0
+
+    goto/16 :goto_5
+
+    :pswitch_1
+    if-eqz p4, :cond_6
+
+    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHiddenChanged:Z
+
+    if-eqz p1, :cond_5
+
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
 
     if-eqz p1, :cond_5
 
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
 
-    if-nez p1, :cond_5
+    if-eqz p1, :cond_5
+
+    const/4 p1, 0x1
 
     goto :goto_2
 
+    :cond_5
+    const/4 p1, 0x0
+
+    goto :goto_2
+
+    :cond_6
+    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
+
+    if-eqz p1, :cond_7
+
+    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
+
+    if-nez p1, :cond_7
+
+    const/4 p1, 0x1
+
+    goto :goto_2
+
+    :cond_7
+    const/4 p1, 0x0
+
+    :goto_2
+    move v8, p1
+
+    const/4 p1, 0x1
+
+    const/4 v1, 0x0
+
+    goto :goto_5
+
     :pswitch_2
-    if-eqz p4, :cond_6
+    if-eqz p4, :cond_9
 
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
 
-    if-nez p1, :cond_5
+    if-nez p1, :cond_8
 
     iget-object p1, v6, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_8
 
     iget-object p1, v6, Landroidx/fragment/app/Fragment;->mView:Landroid/view/View;
 
@@ -261,7 +295,7 @@
 
     move-result p1
 
-    if-nez p1, :cond_5
+    if-nez p1, :cond_8
 
     iget p1, v6, Landroidx/fragment/app/Fragment;->mPostponedAlpha:F
 
@@ -269,78 +303,81 @@
 
     cmpl-float p1, p1, v2
 
-    if-ltz p1, :cond_5
+    if-ltz p1, :cond_8
 
-    :goto_3
     const/4 p1, 0x1
 
-    goto :goto_4
-
-    :cond_5
-    const/4 p1, 0x0
-
-    goto :goto_4
-
-    :cond_6
-    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
-
-    if-eqz p1, :cond_5
-
-    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
-
-    if-nez p1, :cond_5
-
     goto :goto_3
 
-    :goto_4
+    :cond_8
+    const/4 p1, 0x0
+
+    goto :goto_3
+
+    :cond_9
+    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
+
+    if-eqz p1, :cond_a
+
+    iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
+
+    if-nez p1, :cond_a
+
+    const/4 p1, 0x1
+
+    goto :goto_3
+
+    :cond_a
+    const/4 p1, 0x0
+
+    :goto_3
     move v8, p1
 
     const/4 p1, 0x1
 
     const/4 v1, 0x0
 
-    goto :goto_7
+    goto :goto_5
 
-    :cond_7
+    :cond_b
     :pswitch_3
-    if-eqz p4, :cond_8
+    if-eqz p4, :cond_c
 
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mIsNewlyAdded:Z
 
-    goto :goto_6
+    goto :goto_4
 
-    :cond_8
+    :cond_c
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mAdded:Z
 
-    if-nez p1, :cond_9
+    if-nez p1, :cond_d
 
     iget-boolean p1, v6, Landroidx/fragment/app/Fragment;->mHidden:Z
 
-    if-nez p1, :cond_9
+    if-nez p1, :cond_d
 
-    :goto_5
     const/4 p1, 0x1
 
-    goto :goto_6
+    goto :goto_4
 
-    :cond_9
+    :cond_d
     const/4 p1, 0x0
 
-    :goto_6
+    :goto_4
     move v0, p1
 
     const/4 p1, 0x0
 
-    goto :goto_1
+    const/4 v8, 0x0
 
-    :goto_7
+    :goto_5
     invoke-virtual {p2, v7}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_e
 
     invoke-static {v2, p2, v7}, Landroidx/fragment/app/FragmentTransition;->ensureContainer(Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;Landroid/util/SparseArray;I)Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;
 
@@ -352,37 +389,42 @@
 
     iput-object p0, v2, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->lastInTransaction:Landroidx/fragment/app/BackStackRecord;
 
-    :cond_a
     move-object v9, v2
 
+    goto :goto_6
+
+    :cond_e
+    move-object v9, v2
+
+    :goto_6
     const/4 v10, 0x0
 
-    if-nez p4, :cond_c
+    if-nez p4, :cond_10
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_10
 
-    if-eqz v9, :cond_b
+    if-eqz v9, :cond_f
 
     iget-object v0, v9, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOut:Landroidx/fragment/app/Fragment;
 
-    if-ne v0, v6, :cond_b
+    if-ne v0, v6, :cond_f
 
     iput-object v10, v9, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOut:Landroidx/fragment/app/Fragment;
 
-    :cond_b
+    :cond_f
     iget-object v0, p0, Landroidx/fragment/app/BackStackRecord;->mManager:Landroidx/fragment/app/FragmentManagerImpl;
 
     iget v1, v6, Landroidx/fragment/app/Fragment;->mState:I
 
-    if-gtz v1, :cond_c
+    if-gtz v1, :cond_10
 
     iget v1, v0, Landroidx/fragment/app/FragmentManagerImpl;->mCurState:I
 
-    if-lez v1, :cond_c
+    if-lez v1, :cond_10
 
     iget-boolean v1, p0, Landroidx/fragment/app/BackStackRecord;->mReorderingAllowed:Z
 
-    if-nez v1, :cond_c
+    if-nez v1, :cond_10
 
     invoke-virtual {v0, v6}, Landroidx/fragment/app/FragmentManagerImpl;->makeActive(Landroidx/fragment/app/Fragment;)V
 
@@ -398,16 +440,16 @@
 
     invoke-virtual/range {v0 .. v5}, Landroidx/fragment/app/FragmentManagerImpl;->moveToState(Landroidx/fragment/app/Fragment;IIIZ)V
 
-    :cond_c
-    if-eqz v8, :cond_e
+    :cond_10
+    if-eqz v8, :cond_12
 
-    if-eqz v9, :cond_d
+    if-eqz v9, :cond_11
 
     iget-object v0, v9, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOut:Landroidx/fragment/app/Fragment;
 
-    if-nez v0, :cond_e
+    if-nez v0, :cond_12
 
-    :cond_d
+    :cond_11
     invoke-static {v9, p2, v7}, Landroidx/fragment/app/FragmentTransition;->ensureContainer(Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;Landroid/util/SparseArray;I)Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;
 
     move-result-object v9
@@ -418,20 +460,20 @@
 
     iput-object p0, v9, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOutTransaction:Landroidx/fragment/app/BackStackRecord;
 
-    :cond_e
-    if-nez p4, :cond_f
+    :cond_12
+    if-nez p4, :cond_13
 
-    if-eqz p1, :cond_f
+    if-eqz p1, :cond_13
 
-    if-eqz v9, :cond_f
+    if-eqz v9, :cond_13
 
     iget-object p0, v9, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->lastIn:Landroidx/fragment/app/Fragment;
 
-    if-ne p0, v6, :cond_f
+    if-ne p0, v6, :cond_13
 
     iput-object v10, v9, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->lastIn:Landroidx/fragment/app/Fragment;
 
-    :cond_f
+    :cond_13
     return-void
 
     :pswitch_data_0
@@ -1186,8 +1228,6 @@
 
     if-eqz p0, :cond_7
 
-    sget-object p0, Landroidx/fragment/app/FragmentTransition;->PLATFORM_IMPL:Landroidx/fragment/app/FragmentTransitionImpl;
-
     invoke-static {p0, v0}, Landroidx/fragment/app/FragmentTransition;->canHandleAll(Landroidx/fragment/app/FragmentTransitionImpl;Ljava/util/List;)Z
 
     move-result p0
@@ -1203,8 +1243,6 @@
 
     if-eqz p0, :cond_8
 
-    sget-object p0, Landroidx/fragment/app/FragmentTransition;->SUPPORT_IMPL:Landroidx/fragment/app/FragmentTransitionImpl;
-
     invoke-static {p0, v0}, Landroidx/fragment/app/FragmentTransition;->canHandleAll(Landroidx/fragment/app/FragmentTransitionImpl;Ljava/util/List;)Z
 
     move-result p0
@@ -1413,14 +1451,14 @@
 
     iget-boolean v4, v7, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOutIsPop:Z
 
-    iget-object v1, v7, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOutTransaction:Landroidx/fragment/app/BackStackRecord;
+    iget-object v2, v7, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOutTransaction:Landroidx/fragment/app/BackStackRecord;
 
     move-object/from16 v0, p0
 
-    move-object/from16 v16, v1
-
     move-object v1, v14
 
+    move-object/from16 v16, v2
+
     move-object/from16 v2, p8
 
     move-object/from16 v5, v16
@@ -1482,7 +1520,7 @@
 .end method
 
 .method private static configureSharedElementsReordered(Landroidx/fragment/app/FragmentTransitionImpl;Landroid/view/ViewGroup;Landroid/view/View;Landroidx/collection/ArrayMap;Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 16
+    .locals 15
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1507,7 +1545,7 @@
         }
     .end annotation
 
-    move-object/from16 v6, p0
+    move-object v6, p0
 
     move-object/from16 v0, p2
 
@@ -1558,16 +1596,16 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v6, v9, v10, v11}, Landroidx/fragment/app/FragmentTransition;->getSharedElementTransition(Landroidx/fragment/app/FragmentTransitionImpl;Landroidx/fragment/app/Fragment;Landroidx/fragment/app/Fragment;Z)Ljava/lang/Object;
+    invoke-static {p0, v9, v10, v11}, Landroidx/fragment/app/FragmentTransition;->getSharedElementTransition(Landroidx/fragment/app/FragmentTransitionImpl;Landroidx/fragment/app/Fragment;Landroidx/fragment/app/Fragment;Z)Ljava/lang/Object;
 
     move-result-object v5
 
     :goto_0
-    invoke-static {v6, v1, v5, v7}, Landroidx/fragment/app/FragmentTransition;->captureOutSharedElements(Landroidx/fragment/app/FragmentTransitionImpl;Landroidx/collection/ArrayMap;Ljava/lang/Object;Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;)Landroidx/collection/ArrayMap;
+    invoke-static {p0, v1, v5, v7}, Landroidx/fragment/app/FragmentTransition;->captureOutSharedElements(Landroidx/fragment/app/FragmentTransitionImpl;Landroidx/collection/ArrayMap;Ljava/lang/Object;Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;)Landroidx/collection/ArrayMap;
 
     move-result-object v12
 
-    invoke-static {v6, v1, v5, v7}, Landroidx/fragment/app/FragmentTransition;->captureInSharedElements(Landroidx/fragment/app/FragmentTransitionImpl;Landroidx/collection/ArrayMap;Ljava/lang/Object;Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;)Landroidx/collection/ArrayMap;
+    invoke-static {p0, v1, v5, v7}, Landroidx/fragment/app/FragmentTransition;->captureInSharedElements(Landroidx/fragment/app/FragmentTransitionImpl;Landroidx/collection/ArrayMap;Ljava/lang/Object;Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;)Landroidx/collection/ArrayMap;
 
     move-result-object v13
 
@@ -1624,13 +1662,13 @@
 
     invoke-virtual {v3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {v6, v14, v0, v2}, Landroidx/fragment/app/FragmentTransitionImpl;->setSharedElementTargets(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V
+    invoke-virtual {p0, v14, v0, v2}, Landroidx/fragment/app/FragmentTransitionImpl;->setSharedElementTargets(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V
 
     iget-boolean v4, v7, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOutIsPop:Z
 
-    iget-object v15, v7, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOutTransaction:Landroidx/fragment/app/BackStackRecord;
+    iget-object v5, v7, Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;->firstOutTransaction:Landroidx/fragment/app/BackStackRecord;
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
     move-object v1, v14
 
@@ -1638,8 +1676,6 @@
 
     move-object v3, v12
 
-    move-object v5, v15
-
     invoke-static/range {v0 .. v5}, Landroidx/fragment/app/FragmentTransition;->setOutEpicenter(Landroidx/fragment/app/FragmentTransitionImpl;Ljava/lang/Object;Ljava/lang/Object;Landroidx/collection/ArrayMap;ZLandroidx/fragment/app/BackStackRecord;)V
 
     new-instance v0, Landroid/graphics/Rect;
@@ -1652,7 +1688,7 @@
 
     if-eqz v1, :cond_7
 
-    invoke-virtual {v6, v8, v0}, Landroidx/fragment/app/FragmentTransitionImpl;->setEpicenter(Ljava/lang/Object;Landroid/graphics/Rect;)V
+    invoke-virtual {p0, v8, v0}, Landroidx/fragment/app/FragmentTransitionImpl;->setEpicenter(Ljava/lang/Object;Landroid/graphics/Rect;)V
 
     :cond_7
     move-object v7, v0
@@ -1679,7 +1715,7 @@
 
     move-object v4, v13
 
-    move-object/from16 v6, p0
+    move-object v6, p0
 
     invoke-direct/range {v0 .. v7}, Landroidx/fragment/app/FragmentTransition$3;-><init>(Landroidx/fragment/app/Fragment;Landroidx/fragment/app/Fragment;ZLandroidx/collection/ArrayMap;Landroid/view/View;Landroidx/fragment/app/FragmentTransitionImpl;Landroid/graphics/Rect;)V
 
@@ -1695,7 +1731,7 @@
 .end method
 
 .method private static configureTransitionsOrdered(Landroidx/fragment/app/FragmentManagerImpl;ILandroidx/fragment/app/FragmentTransition$FragmentContainerTransition;Landroid/view/View;Landroidx/collection/ArrayMap;)V
-    .locals 21
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1790,43 +1826,43 @@
 
     move-object/from16 v3, p4
 
-    move-object/from16 v16, v4
+    move-object/from16 p0, v4
 
     move-object/from16 v4, p2
 
-    move-object/from16 v17, v5
+    move-object/from16 p1, v5
 
-    move-object/from16 v18, v6
+    move-object/from16 v16, v6
 
-    move-object/from16 v6, v16
+    move-object/from16 v6, p0
 
-    move-object/from16 v19, v7
+    move-object/from16 v17, v7
 
     move-object v12, v8
 
-    move-object/from16 v8, v18
+    move-object/from16 v8, v16
 
     invoke-static/range {v0 .. v8}, Landroidx/fragment/app/FragmentTransition;->configureSharedElementsOrdered(Landroidx/fragment/app/FragmentTransitionImpl;Landroid/view/ViewGroup;Landroid/view/View;Landroidx/collection/ArrayMap;Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v6
 
-    move-object/from16 v8, v19
+    move-object/from16 v8, v17
 
     if-nez v8, :cond_3
 
     if-nez v6, :cond_3
 
-    move-object/from16 v0, v18
+    move-object/from16 v0, v16
 
     if-nez v0, :cond_4
 
     return-void
 
     :cond_3
-    move-object/from16 v0, v18
+    move-object/from16 v0, v16
 
     :cond_4
-    move-object/from16 v1, v17
+    move-object/from16 v1, p1
 
     invoke-static {v12, v0, v15, v1, v10}, Landroidx/fragment/app/FragmentTransition;->configureEnteringExitingViews(Landroidx/fragment/app/FragmentTransitionImpl;Ljava/lang/Object;Landroidx/fragment/app/Fragment;Ljava/util/ArrayList;Landroid/view/View;)Ljava/util/ArrayList;
 
@@ -1843,13 +1879,13 @@
     goto :goto_1
 
     :cond_5
-    move-object/from16 v20, v0
+    move-object/from16 v18, v0
 
     goto :goto_2
 
     :cond_6
     :goto_1
-    const/16 v20, 0x0
+    const/16 v18, 0x0
 
     :goto_2
     invoke-virtual {v12, v8, v10}, Landroidx/fragment/app/FragmentTransitionImpl;->addTarget(Ljava/lang/Object;Landroid/view/View;)V
@@ -1860,7 +1896,7 @@
 
     move-object v1, v8
 
-    move-object/from16 v2, v20
+    move-object/from16 v2, v18
 
     move-object v3, v6
 
@@ -1872,9 +1908,9 @@
 
     if-eqz v9, :cond_7
 
-    new-instance v17, Ljava/util/ArrayList;
+    new-instance v16, Ljava/util/ArrayList;
 
-    invoke-direct/range {v17 .. v17}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct/range {v16 .. v16}, Ljava/util/ArrayList;-><init>()V
 
     move-object v0, v12
 
@@ -1882,13 +1918,13 @@
 
     move-object v2, v8
 
-    move-object/from16 v3, v17
+    move-object/from16 v3, v16
 
-    move-object/from16 v4, v20
+    move-object/from16 v4, v18
 
     move-object v5, v15
 
-    move-object/from16 v7, v16
+    move-object/from16 v7, p0
 
     invoke-virtual/range {v0 .. v7}, Landroidx/fragment/app/FragmentTransitionImpl;->scheduleRemoveTargets(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;)V
 
@@ -1898,19 +1934,19 @@
 
     move-object/from16 v3, p3
 
-    move-object/from16 v4, v16
+    move-object/from16 v4, p0
 
     move-object v5, v8
 
-    move-object/from16 v6, v17
+    move-object/from16 v6, v16
 
-    move-object/from16 v7, v20
+    move-object/from16 v7, v18
 
     move-object v8, v15
 
     invoke-static/range {v0 .. v8}, Landroidx/fragment/app/FragmentTransition;->scheduleTargetChange(Landroidx/fragment/app/FragmentTransitionImpl;Landroid/view/ViewGroup;Landroidx/fragment/app/Fragment;Landroid/view/View;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;)V
 
-    move-object/from16 v0, v16
+    move-object/from16 v0, p0
 
     invoke-virtual {v12, v13, v0, v11}, Landroidx/fragment/app/FragmentTransitionImpl;->setNameOverridesOrdered(Landroid/view/View;Ljava/util/ArrayList;Ljava/util/Map;)V
 
@@ -1923,7 +1959,7 @@
 .end method
 
 .method private static configureTransitionsReordered(Landroidx/fragment/app/FragmentManagerImpl;ILandroidx/fragment/app/FragmentTransition$FragmentContainerTransition;Landroid/view/View;Landroidx/collection/ArrayMap;)V
-    .locals 19
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1962,14 +1998,16 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
+    move-object v10, v0
+
     goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    :goto_0
     move-object v10, v0
 
+    :goto_0
     if-nez v10, :cond_1
 
     return-void
@@ -2020,36 +2058,36 @@
 
     move-object v5, v8
 
-    move-object/from16 v16, v6
+    move-object/from16 p0, v6
 
     move-object v6, v15
 
-    move-object/from16 v17, v7
+    move-object/from16 p1, v7
 
-    move-object/from16 v18, v10
+    move-object/from16 v16, v10
 
     move-object v10, v8
 
-    move-object/from16 v8, v16
+    move-object/from16 v8, p0
 
     invoke-static/range {v0 .. v8}, Landroidx/fragment/app/FragmentTransition;->configureSharedElementsReordered(Landroidx/fragment/app/FragmentTransitionImpl;Landroid/view/ViewGroup;Landroid/view/View;Landroidx/collection/ArrayMap;Landroidx/fragment/app/FragmentTransition$FragmentContainerTransition;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v8
 
-    move-object/from16 v6, v17
+    move-object/from16 v6, p1
 
     if-nez v6, :cond_3
 
     if-nez v8, :cond_3
 
-    move-object/from16 v7, v16
+    move-object/from16 v7, p0
 
     if-nez v7, :cond_4
 
     return-void
 
     :cond_3
-    move-object/from16 v7, v16
+    move-object/from16 v7, p0
 
     :cond_4
     invoke-static {v13, v7, v12, v10, v9}, Landroidx/fragment/app/FragmentTransition;->configureEnteringExitingViews(Landroidx/fragment/app/FragmentTransitionImpl;Ljava/lang/Object;Landroidx/fragment/app/Fragment;Ljava/util/ArrayList;Landroid/view/View;)Ljava/util/ArrayList;
@@ -2108,7 +2146,7 @@
 
     invoke-virtual/range {v0 .. v7}, Landroidx/fragment/app/FragmentTransitionImpl;->scheduleRemoveTargets(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;)V
 
-    move-object/from16 v0, v18
+    move-object/from16 v0, v16
 
     invoke-virtual {v13, v0, v14}, Landroidx/fragment/app/FragmentTransitionImpl;->beginDelayedTransition(Landroid/view/ViewGroup;Ljava/lang/Object;)V
 
@@ -2316,21 +2354,24 @@
 
     iget-object p1, p1, Landroidx/fragment/app/BackStackRecord;->mSharedElementSourceNames:Ljava/util/ArrayList;
 
-    :goto_0
     invoke-virtual {p1, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
     check-cast p1, Ljava/lang/String;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object p1, p1, Landroidx/fragment/app/BackStackRecord;->mSharedElementTargetNames:Ljava/util/ArrayList;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    :goto_1
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    :goto_0
     invoke-virtual {p0, p1}, Landroidx/collection/ArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
@@ -2654,21 +2695,24 @@
 
     iget-object p4, p5, Landroidx/fragment/app/BackStackRecord;->mSharedElementTargetNames:Ljava/util/ArrayList;
 
-    :goto_0
     invoke-virtual {p4, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
     move-result-object p4
 
     check-cast p4, Ljava/lang/String;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object p4, p5, Landroidx/fragment/app/BackStackRecord;->mSharedElementSourceNames:Ljava/util/ArrayList;
 
-    goto :goto_0
+    invoke-virtual {p4, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    :goto_1
+    move-result-object p4
+
+    check-cast p4, Ljava/lang/String;
+
+    :goto_0
     invoke-virtual {p3, p4}, Landroidx/collection/ArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p3
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$1.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$1.smali
index 4f75a3f625..e2d486c040 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionCompat21$1;
 .super Landroid/transition/Transition$EpicenterCallback;
+.source "FragmentTransitionCompat21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$2.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$2.smali
index 5325b4e32d..6d6f4831e4 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$2.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionCompat21$2;
 .super Ljava/lang/Object;
+.source "FragmentTransitionCompat21.java"
 
 # interfaces
 .implements Landroid/transition/Transition$TransitionListener;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$3.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$3.smali
index 68465003a1..5b86e330ad 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$3.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionCompat21$3;
 .super Ljava/lang/Object;
+.source "FragmentTransitionCompat21.java"
 
 # interfaces
 .implements Landroid/transition/Transition$TransitionListener;
@@ -90,39 +91,33 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->this$0:Landroidx/fragment/app/FragmentTransitionCompat21;
-
-    iget-object v1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$enterTransition:Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->this$0:Landroidx/fragment/app/FragmentTransitionCompat21;
 
     iget-object v2, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$enteringViews:Ljava/util/ArrayList;
 
-    invoke-virtual {p1, v1, v2, v0}, Landroidx/fragment/app/FragmentTransitionCompat21;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
+    invoke-virtual {v1, p1, v2, v0}, Landroidx/fragment/app/FragmentTransitionCompat21;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
 
     :cond_0
     iget-object p1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$exitTransition:Ljava/lang/Object;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->this$0:Landroidx/fragment/app/FragmentTransitionCompat21;
-
-    iget-object v1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$exitTransition:Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->this$0:Landroidx/fragment/app/FragmentTransitionCompat21;
 
     iget-object v2, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$exitingViews:Ljava/util/ArrayList;
 
-    invoke-virtual {p1, v1, v2, v0}, Landroidx/fragment/app/FragmentTransitionCompat21;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
+    invoke-virtual {v1, p1, v2, v0}, Landroidx/fragment/app/FragmentTransitionCompat21;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
 
     :cond_1
     iget-object p1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$sharedElementTransition:Ljava/lang/Object;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->this$0:Landroidx/fragment/app/FragmentTransitionCompat21;
-
-    iget-object v1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$sharedElementTransition:Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->this$0:Landroidx/fragment/app/FragmentTransitionCompat21;
 
     iget-object v2, p0, Landroidx/fragment/app/FragmentTransitionCompat21$3;->val$sharedElementsIn:Ljava/util/ArrayList;
 
-    invoke-virtual {p1, v1, v2, v0}, Landroidx/fragment/app/FragmentTransitionCompat21;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
+    invoke-virtual {v1, p1, v2, v0}, Landroidx/fragment/app/FragmentTransitionCompat21;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
 
     :cond_2
     return-void
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$4.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$4.smali
index b7c37fa38e..390cc514e8 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$4.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionCompat21$4;
 .super Landroid/transition/Transition$EpicenterCallback;
+.source "FragmentTransitionCompat21.java"
 
 
 # annotations
@@ -41,8 +42,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/fragment/app/FragmentTransitionCompat21$4;->val$epicenter:Landroid/graphics/Rect;
-
     invoke-virtual {p1}, Landroid/graphics/Rect;->isEmpty()Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21.smali
index 1a7830af52..8b0369d65a 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionCompat21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionCompat21;
 .super Landroidx/fragment/app/FragmentTransitionImpl;
+.source "FragmentTransitionCompat21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$1.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$1.smali
index edec627487..6e63943b5c 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionImpl$1;
 .super Ljava/lang/Object;
+.source "FragmentTransitionImpl.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$2.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$2.smali
index 6d7868c4f8..26b162ef27 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$2.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionImpl$2;
 .super Ljava/lang/Object;
+.source "FragmentTransitionImpl.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$3.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$3.smali
index cd2273ea0a..bbcde341ed 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$3.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/FragmentTransitionImpl$3;
 .super Ljava/lang/Object;
+.source "FragmentTransitionImpl.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl.smali b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl.smali
index d335f77739..873d9b04c8 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransitionImpl.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/fragment/app/FragmentTransitionImpl;
 .super Ljava/lang/Object;
+.source "FragmentTransitionImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/fragment/app/ListFragment$1.smali b/com.discord/smali/androidx/fragment/app/ListFragment$1.smali
index 62eea0c67d..a2b40fb167 100644
--- a/com.discord/smali/androidx/fragment/app/ListFragment$1.smali
+++ b/com.discord/smali/androidx/fragment/app/ListFragment$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/ListFragment$1;
 .super Ljava/lang/Object;
+.source "ListFragment.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/fragment/app/ListFragment$2.smali b/com.discord/smali/androidx/fragment/app/ListFragment$2.smali
index 36a8a2ced9..54d8ba0f07 100644
--- a/com.discord/smali/androidx/fragment/app/ListFragment$2.smali
+++ b/com.discord/smali/androidx/fragment/app/ListFragment$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/ListFragment$2;
 .super Ljava/lang/Object;
+.source "ListFragment.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemClickListener;
diff --git a/com.discord/smali/androidx/fragment/app/ListFragment.smali b/com.discord/smali/androidx/fragment/app/ListFragment.smali
index b9c78c54ee..181bac3c42 100644
--- a/com.discord/smali/androidx/fragment/app/ListFragment.smali
+++ b/com.discord/smali/androidx/fragment/app/ListFragment.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/fragment/app/ListFragment;
 .super Landroidx/fragment/app/Fragment;
+.source "ListFragment.java"
 
 
 # static fields
@@ -85,7 +86,7 @@
 
     iput-object v0, p0, Landroidx/fragment/app/ListFragment;->mList:Landroid/widget/ListView;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const v1, 0xff0001
@@ -113,8 +114,6 @@
     goto :goto_0
 
     :cond_2
-    iget-object v1, p0, Landroidx/fragment/app/ListFragment;->mStandardEmptyView:Landroid/widget/TextView;
-
     const/16 v2, 0x8
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setVisibility(I)V
@@ -174,34 +173,29 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mList:Landroid/widget/ListView;
+    iget-object v1, p0, Landroidx/fragment/app/ListFragment;->mList:Landroid/widget/ListView;
 
-    iget-object v1, p0, Landroidx/fragment/app/ListFragment;->mEmptyView:Landroid/view/View;
+    invoke-virtual {v1, v0}, Landroid/widget/ListView;->setEmptyView(Landroid/view/View;)V
 
-    :goto_1
-    invoke-virtual {v0, v1}, Landroid/widget/ListView;->setEmptyView(Landroid/view/View;)V
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mEmptyText:Ljava/lang/CharSequence;
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mStandardEmptyView:Landroid/widget/TextView;
+    iget-object v1, p0, Landroidx/fragment/app/ListFragment;->mStandardEmptyView:Landroid/widget/TextView;
 
-    iget-object v1, p0, Landroidx/fragment/app/ListFragment;->mEmptyText:Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mList:Landroid/widget/ListView;
 
     iget-object v1, p0, Landroidx/fragment/app/ListFragment;->mStandardEmptyView:Landroid/widget/TextView;
 
-    goto :goto_1
+    invoke-virtual {v0, v1}, Landroid/widget/ListView;->setEmptyView(Landroid/view/View;)V
 
     :cond_6
-    :goto_2
+    :goto_1
     const/4 v0, 0x1
 
     iput-boolean v0, p0, Landroidx/fragment/app/ListFragment;->mListShown:Z
@@ -216,15 +210,13 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mAdapter:Landroid/widget/ListAdapter;
-
     const/4 v1, 0x0
 
     iput-object v1, p0, Landroidx/fragment/app/ListFragment;->mAdapter:Landroid/widget/ListAdapter;
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/ListFragment;->setListAdapter(Landroid/widget/ListAdapter;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
     iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mProgressContainer:Landroid/view/View;
@@ -236,7 +228,7 @@
     invoke-direct {p0, v0, v0}, Landroidx/fragment/app/ListFragment;->setListShown(ZZ)V
 
     :cond_8
-    :goto_3
+    :goto_2
     iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mHandler:Landroid/os/Handler;
 
     iget-object v1, p0, Landroidx/fragment/app/ListFragment;->mRequestFocus:Ljava/lang/Runnable;
@@ -256,7 +248,7 @@
 .end method
 
 .method private setListShown(ZZ)V
-    .locals 4
+    .locals 5
 
     invoke-direct {p0}, Landroidx/fragment/app/ListFragment;->ensureList()V
 
@@ -264,38 +256,36 @@
 
     if-eqz v0, :cond_4
 
-    iget-boolean v0, p0, Landroidx/fragment/app/ListFragment;->mListShown:Z
+    iget-boolean v1, p0, Landroidx/fragment/app/ListFragment;->mListShown:Z
 
-    if-ne v0, p1, :cond_0
+    if-ne v1, p1, :cond_0
 
     return-void
 
     :cond_0
     iput-boolean p1, p0, Landroidx/fragment/app/ListFragment;->mListShown:Z
 
-    const/4 v0, 0x0
-
     const/16 v1, 0x8
 
-    const/high16 v2, 0x10a0000
+    const/4 v2, 0x0
 
     const v3, 0x10a0001
 
+    const/high16 v4, 0x10a0000
+
     if-eqz p1, :cond_2
 
     if-eqz p2, :cond_1
 
-    iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mProgressContainer:Landroid/view/View;
-
     invoke-virtual {p0}, Landroidx/fragment/app/ListFragment;->getContext()Landroid/content/Context;
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-static {p2, v3}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
+    invoke-static {p1, v3}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->startAnimation(Landroid/view/animation/Animation;)V
+    invoke-virtual {v0, p1}, Landroid/view/View;->startAnimation(Landroid/view/animation/Animation;)V
 
     iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mListContainer:Landroid/view/View;
 
@@ -303,7 +293,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v2}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
+    invoke-static {p2, v4}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
 
     move-result-object p2
 
@@ -312,9 +302,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mProgressContainer:Landroid/view/View;
-
-    invoke-virtual {p1}, Landroid/view/View;->clearAnimation()V
+    invoke-virtual {v0}, Landroid/view/View;->clearAnimation()V
 
     iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mListContainer:Landroid/view/View;
 
@@ -327,24 +315,22 @@
 
     iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mListContainer:Landroid/view/View;
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
     :cond_2
     if-eqz p2, :cond_3
 
-    iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mProgressContainer:Landroid/view/View;
-
     invoke-virtual {p0}, Landroidx/fragment/app/ListFragment;->getContext()Landroid/content/Context;
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-static {p2, v2}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
+    invoke-static {p1, v4}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->startAnimation(Landroid/view/animation/Animation;)V
+    invoke-virtual {v0, p1}, Landroid/view/View;->startAnimation(Landroid/view/animation/Animation;)V
 
     iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mListContainer:Landroid/view/View;
 
@@ -361,9 +347,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mProgressContainer:Landroid/view/View;
-
-    invoke-virtual {p1}, Landroid/view/View;->clearAnimation()V
+    invoke-virtual {v0}, Landroid/view/View;->clearAnimation()V
 
     iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mListContainer:Landroid/view/View;
 
@@ -372,7 +356,7 @@
     :goto_1
     iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mProgressContainer:Landroid/view/View;
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     iget-object p1, p0, Landroidx/fragment/app/ListFragment;->mListContainer:Landroid/view/View;
 
@@ -613,8 +597,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mStandardEmptyView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v0, p0, Landroidx/fragment/app/ListFragment;->mEmptyText:Ljava/lang/CharSequence;
@@ -667,8 +649,6 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Landroidx/fragment/app/ListFragment;->mList:Landroid/widget/ListView;
-
     invoke-virtual {v3, p1}, Landroid/widget/ListView;->setAdapter(Landroid/widget/ListAdapter;)V
 
     iget-boolean p1, p0, Landroidx/fragment/app/ListFragment;->mListShown:Z
diff --git a/com.discord/smali/androidx/fragment/app/OneShotPreDrawListener.smali b/com.discord/smali/androidx/fragment/app/OneShotPreDrawListener.smali
index 071bcbcbbf..92ef852a16 100644
--- a/com.discord/smali/androidx/fragment/app/OneShotPreDrawListener.smali
+++ b/com.discord/smali/androidx/fragment/app/OneShotPreDrawListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/fragment/app/OneShotPreDrawListener;
 .super Ljava/lang/Object;
+.source "OneShotPreDrawListener.java"
 
 # interfaces
 .implements Landroid/view/View$OnAttachStateChangeListener;
@@ -100,10 +101,9 @@
 
     iget-object v0, p0, Landroidx/fragment/app/OneShotPreDrawListener;->mViewTreeObserver:Landroid/view/ViewTreeObserver;
 
-    :goto_0
     invoke-virtual {v0, p0}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/fragment/app/OneShotPreDrawListener;->mView:Landroid/view/View;
@@ -112,9 +112,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-virtual {v0, p0}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Landroidx/fragment/app/OneShotPreDrawListener;->mView:Landroid/view/View;
 
     invoke-virtual {v0, p0}, Landroid/view/View;->removeOnAttachStateChangeListener(Landroid/view/View$OnAttachStateChangeListener;)V
diff --git a/com.discord/smali/androidx/fragment/app/SuperNotCalledException.smali b/com.discord/smali/androidx/fragment/app/SuperNotCalledException.smali
index 4127a54fbf..bd5d121158 100644
--- a/com.discord/smali/androidx/fragment/app/SuperNotCalledException.smali
+++ b/com.discord/smali/androidx/fragment/app/SuperNotCalledException.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/fragment/app/SuperNotCalledException;
 .super Landroid/util/AndroidRuntimeException;
+.source "SuperNotCalledException.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/interpolator/R.smali b/com.discord/smali/androidx/interpolator/R.smali
index 9187ff157f..947c5eca28 100644
--- a/com.discord/smali/androidx/interpolator/R.smali
+++ b/com.discord/smali/androidx/interpolator/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/interpolator/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/interpolator/view/animation/FastOutLinearInInterpolator.smali b/com.discord/smali/androidx/interpolator/view/animation/FastOutLinearInInterpolator.smali
index ed573cf719..028167828d 100644
--- a/com.discord/smali/androidx/interpolator/view/animation/FastOutLinearInInterpolator.smali
+++ b/com.discord/smali/androidx/interpolator/view/animation/FastOutLinearInInterpolator.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/interpolator/view/animation/FastOutLinearInInterpolator;
 .super Landroidx/interpolator/view/animation/LookupTableInterpolator;
+.source "FastOutLinearInInterpolator.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/interpolator/view/animation/FastOutSlowInInterpolator.smali b/com.discord/smali/androidx/interpolator/view/animation/FastOutSlowInInterpolator.smali
index a1471f383c..47588381d6 100644
--- a/com.discord/smali/androidx/interpolator/view/animation/FastOutSlowInInterpolator.smali
+++ b/com.discord/smali/androidx/interpolator/view/animation/FastOutSlowInInterpolator.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/interpolator/view/animation/FastOutSlowInInterpolator;
 .super Landroidx/interpolator/view/animation/LookupTableInterpolator;
+.source "FastOutSlowInInterpolator.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/interpolator/view/animation/LinearOutSlowInInterpolator.smali b/com.discord/smali/androidx/interpolator/view/animation/LinearOutSlowInInterpolator.smali
index 69ab0c2ac8..963ba43c3a 100644
--- a/com.discord/smali/androidx/interpolator/view/animation/LinearOutSlowInInterpolator.smali
+++ b/com.discord/smali/androidx/interpolator/view/animation/LinearOutSlowInInterpolator.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/interpolator/view/animation/LinearOutSlowInInterpolator;
 .super Landroidx/interpolator/view/animation/LookupTableInterpolator;
+.source "LinearOutSlowInInterpolator.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/interpolator/view/animation/LookupTableInterpolator.smali b/com.discord/smali/androidx/interpolator/view/animation/LookupTableInterpolator.smali
index f3df4074ad..a580e6ee8f 100644
--- a/com.discord/smali/androidx/interpolator/view/animation/LookupTableInterpolator.smali
+++ b/com.discord/smali/androidx/interpolator/view/animation/LookupTableInterpolator.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/interpolator/view/animation/LookupTableInterpolator;
 .super Ljava/lang/Object;
+.source "LookupTableInterpolator.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
@@ -61,23 +62,21 @@
     :cond_1
     iget-object v0, p0, Landroidx/interpolator/view/animation/LookupTableInterpolator;->mValues:[F
 
+    array-length v1, v0
+
+    add-int/lit8 v1, v1, -0x1
+
+    int-to-float v1, v1
+
+    mul-float v1, v1, p1
+
+    float-to-int v1, v1
+
     array-length v0, v0
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v0, v0, -0x2
 
-    int-to-float v0, v0
-
-    mul-float v0, v0, p1
-
-    float-to-int v0, v0
-
-    iget-object v1, p0, Landroidx/interpolator/view/animation/LookupTableInterpolator;->mValues:[F
-
-    array-length v1, v1
-
-    add-int/lit8 v1, v1, -0x2
-
-    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
+    invoke-static {v1, v0}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
@@ -89,29 +88,23 @@
 
     sub-float/2addr p1, v1
 
-    iget v1, p0, Landroidx/interpolator/view/animation/LookupTableInterpolator;->mStepSize:F
-
-    div-float/2addr p1, v1
+    div-float/2addr p1, v2
 
     iget-object v1, p0, Landroidx/interpolator/view/animation/LookupTableInterpolator;->mValues:[F
 
-    aget v1, v1, v0
-
-    iget-object v2, p0, Landroidx/interpolator/view/animation/LookupTableInterpolator;->mValues:[F
+    aget v2, v1, v0
 
     add-int/lit8 v3, v0, 0x1
 
-    aget v2, v2, v3
+    aget v3, v1, v3
 
-    iget-object v3, p0, Landroidx/interpolator/view/animation/LookupTableInterpolator;->mValues:[F
+    aget v0, v1, v0
 
-    aget v0, v3, v0
+    sub-float/2addr v3, v0
 
-    sub-float/2addr v2, v0
+    mul-float p1, p1, v3
 
-    mul-float p1, p1, v2
+    add-float/2addr v2, p1
 
-    add-float/2addr v1, p1
-
-    return v1
+    return v2
 .end method
diff --git a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$Delegate.smali b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$Delegate.smali
index 9bc7586066..3932e57608 100644
--- a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$Delegate.smali
+++ b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$Delegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$DelegateProvider.smali b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$DelegateProvider.smali
index 95bb329fdc..6038c4f755 100644
--- a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$DelegateProvider.smali
+++ b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$DelegateProvider.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/legacy/app/ActionBarDrawerToggle$DelegateProvider;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SetIndicatorInfo.smali b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SetIndicatorInfo.smali
index 3bb4e46e4d..be330025b6 100644
--- a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SetIndicatorInfo.smali
+++ b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SetIndicatorInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/ActionBarDrawerToggle$SetIndicatorInfo;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 
 # annotations
@@ -119,6 +120,8 @@
     move-object p1, v0
 
     :goto_0
+    nop
+
     instance-of v0, p1, Landroid/widget/ImageView;
 
     if-eqz v0, :cond_3
diff --git a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SlideDrawable.smali b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SlideDrawable.smali
index 7ad562f886..7e60fd20e6 100644
--- a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SlideDrawable.smali
+++ b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle$SlideDrawable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/ActionBarDrawerToggle$SlideDrawable;
 .super Landroid/graphics/drawable/InsetDrawable;
+.source "ActionBarDrawerToggle.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
diff --git a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle.smali b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle.smali
index dfde127a4c..4ecf646db2 100644
--- a/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle.smali
+++ b/com.discord/smali/androidx/legacy/app/ActionBarDrawerToggle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/legacy/app/ActionBarDrawerToggle;
 .super Ljava/lang/Object;
+.source "ActionBarDrawerToggle.java"
 
 # interfaces
 .implements Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
@@ -147,17 +148,16 @@
 
     move-result-object v0
 
-    :goto_0
     iput-object v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mActivityImpl:Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mActivityImpl:Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;
 
-    :goto_1
+    :goto_0
     iput-object p2, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mDrawerLayout:Landroidx/drawerlayout/widget/DrawerLayout;
 
     iput p4, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mDrawerImageResource:I
@@ -192,12 +192,12 @@
 
     const p2, 0x3eaaaaab
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 p2, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {p1, p2}, Landroidx/legacy/app/ActionBarDrawerToggle$SlideDrawable;->setOffset(F)V
 
     return-void
@@ -237,8 +237,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mActivityImpl:Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;
-
     invoke-interface {v0}, Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;->getThemeUpIndicator()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -282,7 +280,6 @@
 
     move-result-object v0
 
-    :goto_1
     invoke-virtual {v0, v2}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
 
     move-result-object v1
@@ -300,7 +297,13 @@
 
     move-result-object v0
 
-    goto :goto_1
+    invoke-virtual {v0, v2}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Landroid/content/res/TypedArray;->recycle()V
+
+    return-object v1
 .end method
 
 .method private setActionBarDescription(I)V
@@ -310,8 +313,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mActivityImpl:Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;
-
     invoke-interface {v0, p1}, Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;->setActionBarDescription(I)V
 
     return-void
@@ -411,8 +412,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mActivityImpl:Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;
-
     invoke-interface {v0, p1, p2}, Landroidx/legacy/app/ActionBarDrawerToggle$Delegate;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
 
     return-void
@@ -746,16 +745,19 @@
     :cond_0
     iget v1, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mOpenDrawerContentDescRes:I
 
-    goto :goto_0
+    :goto_0
+    invoke-direct {p0, v0, v1}, Landroidx/legacy/app/ActionBarDrawerToggle;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
+
+    goto :goto_1
 
     :cond_1
     iget-object v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mHomeAsUpIndicator:Landroid/graphics/drawable/Drawable;
 
     const/4 v1, 0x0
 
-    :goto_0
     invoke-direct {p0, v0, v1}, Landroidx/legacy/app/ActionBarDrawerToggle;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
 
+    :goto_1
     iput-boolean p1, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mDrawerIndicatorEnabled:Z
 
     :cond_2
@@ -838,19 +840,18 @@
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    :goto_0
     invoke-virtual {v0, v2}, Landroidx/legacy/app/ActionBarDrawerToggle$SlideDrawable;->setPosition(F)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mSlider:Landroidx/legacy/app/ActionBarDrawerToggle$SlideDrawable;
 
     const/4 v2, 0x0
 
-    goto :goto_0
+    invoke-virtual {v0, v2}, Landroidx/legacy/app/ActionBarDrawerToggle$SlideDrawable;->setPosition(F)V
 
-    :goto_1
+    :goto_0
     iget-boolean v0, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mDrawerIndicatorEnabled:Z
 
     if-eqz v0, :cond_2
@@ -867,12 +868,12 @@
 
     iget v1, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mCloseDrawerContentDescRes:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget v1, p0, Landroidx/legacy/app/ActionBarDrawerToggle;->mOpenDrawerContentDescRes:I
 
-    :goto_2
+    :goto_1
     invoke-direct {p0, v0, v1}, Landroidx/legacy/app/ActionBarDrawerToggle;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
 
     :cond_2
diff --git a/com.discord/smali/androidx/legacy/app/ActivityCompat.smali b/com.discord/smali/androidx/legacy/app/ActivityCompat.smali
index 277cb38d03..f3aadf2147 100644
--- a/com.discord/smali/androidx/legacy/app/ActivityCompat.smali
+++ b/com.discord/smali/androidx/legacy/app/ActivityCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/legacy/app/ActivityCompat;
 .super Landroidx/core/app/ActivityCompat;
+.source "ActivityCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi15Impl.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi15Impl.smali
index fafd22856a..5ed16aa943 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi15Impl.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi15Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/FragmentCompat$FragmentCompatApi15Impl;
 .super Landroidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl;
+.source "FragmentCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi23Impl.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi23Impl.smali
index e5b48f6cae..058eccd574 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi23Impl.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi23Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/FragmentCompat$FragmentCompatApi23Impl;
 .super Landroidx/legacy/app/FragmentCompat$FragmentCompatApi15Impl;
+.source "FragmentCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi24Impl.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi24Impl.smali
index 7ed8a03004..ef8b3218db 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi24Impl.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatApi24Impl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/FragmentCompat$FragmentCompatApi24Impl;
 .super Landroidx/legacy/app/FragmentCompat$FragmentCompatApi23Impl;
+.source "FragmentCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl$1.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl$1.smali
index 5b3d80ccf2..0ec4c879d9 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl$1.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl$1;
 .super Ljava/lang/Object;
+.source "FragmentCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl.smali
index fdab8da488..71770258aa 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl;
 .super Ljava/lang/Object;
+.source "FragmentCompat.java"
 
 # interfaces
 .implements Landroidx/legacy/app/FragmentCompat$FragmentCompatImpl;
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatImpl.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatImpl.smali
index ecfc075878..d7928e4f8c 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatImpl.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$FragmentCompatImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/legacy/app/FragmentCompat$FragmentCompatImpl;
 .super Ljava/lang/Object;
+.source "FragmentCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$OnRequestPermissionsResultCallback.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$OnRequestPermissionsResultCallback.smali
index 9fd68236b0..30644d501f 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$OnRequestPermissionsResultCallback.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$OnRequestPermissionsResultCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/legacy/app/FragmentCompat$OnRequestPermissionsResultCallback;
 .super Ljava/lang/Object;
+.source "FragmentCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat$PermissionCompatDelegate.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat$PermissionCompatDelegate.smali
index 1f20a88b07..7595be26b4 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat$PermissionCompatDelegate.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat$PermissionCompatDelegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/legacy/app/FragmentCompat$PermissionCompatDelegate;
 .super Ljava/lang/Object;
+.source "FragmentCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentCompat.smali b/com.discord/smali/androidx/legacy/app/FragmentCompat.smali
index 2d0a23e2a8..cafa13cc08 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentCompat.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/legacy/app/FragmentCompat;
 .super Ljava/lang/Object;
+.source "FragmentCompat.java"
 
 
 # annotations
@@ -39,7 +40,6 @@
 
     invoke-direct {v0}, Landroidx/legacy/app/FragmentCompat$FragmentCompatApi24Impl;-><init>()V
 
-    :goto_0
     sput-object v0, Landroidx/legacy/app/FragmentCompat;->IMPL:Landroidx/legacy/app/FragmentCompat$FragmentCompatImpl;
 
     return-void
@@ -55,7 +55,9 @@
 
     invoke-direct {v0}, Landroidx/legacy/app/FragmentCompat$FragmentCompatApi23Impl;-><init>()V
 
-    goto :goto_0
+    sput-object v0, Landroidx/legacy/app/FragmentCompat;->IMPL:Landroidx/legacy/app/FragmentCompat$FragmentCompatImpl;
+
+    return-void
 
     :cond_1
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -68,14 +70,18 @@
 
     invoke-direct {v0}, Landroidx/legacy/app/FragmentCompat$FragmentCompatApi15Impl;-><init>()V
 
-    goto :goto_0
+    sput-object v0, Landroidx/legacy/app/FragmentCompat;->IMPL:Landroidx/legacy/app/FragmentCompat$FragmentCompatImpl;
+
+    return-void
 
     :cond_2
     new-instance v0, Landroidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl;
 
     invoke-direct {v0}, Landroidx/legacy/app/FragmentCompat$FragmentCompatBaseImpl;-><init>()V
 
-    goto :goto_0
+    sput-object v0, Landroidx/legacy/app/FragmentCompat;->IMPL:Landroidx/legacy/app/FragmentCompat$FragmentCompatImpl;
+
+    return-void
 .end method
 
 .method public constructor <init>()V
@@ -121,8 +127,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Landroidx/legacy/app/FragmentCompat;->sDelegate:Landroidx/legacy/app/FragmentCompat$PermissionCompatDelegate;
-
     invoke-interface {v0, p0, p1, p2}, Landroidx/legacy/app/FragmentCompat$PermissionCompatDelegate;->requestPermissions(Landroid/app/Fragment;[Ljava/lang/String;I)Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/legacy/app/FragmentPagerAdapter.smali b/com.discord/smali/androidx/legacy/app/FragmentPagerAdapter.smali
index d3e1b69269..b267125b58 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentPagerAdapter.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentPagerAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/legacy/app/FragmentPagerAdapter;
 .super Landroidx/viewpager/widget/PagerAdapter;
+.source "FragmentPagerAdapter.java"
 
 
 # annotations
@@ -102,8 +103,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/legacy/app/FragmentPagerAdapter;->mCurTransaction:Landroid/app/FragmentTransaction;
-
     invoke-virtual {p1}, Landroid/app/FragmentTransaction;->commitAllowingStateLoss()I
 
     const/4 p1, 0x0
@@ -265,12 +264,8 @@
 
     if-eq p3, p1, :cond_2
 
-    iget-object p1, p0, Landroidx/legacy/app/FragmentPagerAdapter;->mCurrentPrimaryItem:Landroid/app/Fragment;
-
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/legacy/app/FragmentPagerAdapter;->mCurrentPrimaryItem:Landroid/app/Fragment;
-
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Landroid/app/Fragment;->setMenuVisibility(Z)V
diff --git a/com.discord/smali/androidx/legacy/app/FragmentStatePagerAdapter.smali b/com.discord/smali/androidx/legacy/app/FragmentStatePagerAdapter.smali
index a9cd871b9d..94896a930f 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentStatePagerAdapter.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentStatePagerAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/legacy/app/FragmentStatePagerAdapter;
 .super Landroidx/viewpager/widget/PagerAdapter;
+.source "FragmentStatePagerAdapter.java"
 
 
 # annotations
@@ -154,8 +155,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/legacy/app/FragmentStatePagerAdapter;->mCurTransaction:Landroid/app/FragmentTransaction;
-
     invoke-virtual {p1}, Landroid/app/FragmentTransaction;->commitAllowingStateLoss()I
 
     const/4 p1, 0x0
@@ -552,12 +551,8 @@
 
     if-eq p3, p1, :cond_2
 
-    iget-object p1, p0, Landroidx/legacy/app/FragmentStatePagerAdapter;->mCurrentPrimaryItem:Landroid/app/Fragment;
-
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/legacy/app/FragmentStatePagerAdapter;->mCurrentPrimaryItem:Landroid/app/Fragment;
-
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Landroid/app/Fragment;->setMenuVisibility(Z)V
diff --git a/com.discord/smali/androidx/legacy/app/FragmentTabHost$DummyTabFactory.smali b/com.discord/smali/androidx/legacy/app/FragmentTabHost$DummyTabFactory.smali
index 1148bde9b2..ef4c071093 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentTabHost$DummyTabFactory.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentTabHost$DummyTabFactory.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/FragmentTabHost$DummyTabFactory;
 .super Ljava/lang/Object;
+.source "FragmentTabHost.java"
 
 # interfaces
 .implements Landroid/widget/TabHost$TabContentFactory;
diff --git a/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState$1.smali b/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState$1.smali
index b037320be4..cb9bfaaf95 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState$1.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/legacy/app/FragmentTabHost$SavedState$1;
 .super Ljava/lang/Object;
+.source "FragmentTabHost.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState.smali b/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState.smali
index 9ba9bacd15..7a346861a9 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentTabHost$SavedState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/legacy/app/FragmentTabHost$SavedState;
 .super Landroid/view/View$BaseSavedState;
+.source "FragmentTabHost.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentTabHost$TabInfo.smali b/com.discord/smali/androidx/legacy/app/FragmentTabHost$TabInfo.smali
index e2e8bb593c..9cbd9dd447 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentTabHost$TabInfo.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentTabHost$TabInfo.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/legacy/app/FragmentTabHost$TabInfo;
 .super Ljava/lang/Object;
+.source "FragmentTabHost.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/app/FragmentTabHost.smali b/com.discord/smali/androidx/legacy/app/FragmentTabHost.smali
index 934ecf76eb..b35bb3ee5e 100644
--- a/com.discord/smali/androidx/legacy/app/FragmentTabHost.smali
+++ b/com.discord/smali/androidx/legacy/app/FragmentTabHost.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/legacy/app/FragmentTabHost;
 .super Landroid/widget/TabHost;
+.source "FragmentTabHost.java"
 
 # interfaces
 .implements Landroid/widget/TabHost$OnTabChangeListener;
@@ -135,15 +136,15 @@
 
     invoke-virtual {p1}, Landroid/app/FragmentManager;->beginTransaction()Landroid/app/FragmentTransaction;
 
-    move-result-object p2
+    move-result-object p1
+
+    move-object p2, p1
 
     :cond_2
     iget-object p1, p0, Landroidx/legacy/app/FragmentTabHost;->mLastTab:Landroidx/legacy/app/FragmentTabHost$TabInfo;
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/legacy/app/FragmentTabHost;->mLastTab:Landroidx/legacy/app/FragmentTabHost$TabInfo;
-
     iget-object p1, p1, Landroidx/legacy/app/FragmentTabHost$TabInfo;->fragment:Landroid/app/Fragment;
 
     if-eqz p1, :cond_3
@@ -215,6 +216,8 @@
     invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method private ensureContent()V
@@ -657,8 +660,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/legacy/app/FragmentTabHost;->mOnTabChangeListener:Landroid/widget/TabHost$OnTabChangeListener;
-
     invoke-interface {v0, p1}, Landroid/widget/TabHost$OnTabChangeListener;->onTabChanged(Ljava/lang/String;)V
 
     :cond_1
diff --git a/com.discord/smali/androidx/legacy/content/WakefulBroadcastReceiver.smali b/com.discord/smali/androidx/legacy/content/WakefulBroadcastReceiver.smali
index 2d9746d782..440c96366f 100644
--- a/com.discord/smali/androidx/legacy/content/WakefulBroadcastReceiver.smali
+++ b/com.discord/smali/androidx/legacy/content/WakefulBroadcastReceiver.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/legacy/content/WakefulBroadcastReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "WakefulBroadcastReceiver.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$attr.smali b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
index 65b621e727..7b6474fd56 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$color.smali b/com.discord/smali/androidx/legacy/coreui/R$color.smali
index bc615d37f8..fd5ba53999 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$color.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
index 96adbee8da..fa2a8a7aee 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
index bfdafa1a69..a49d87563b 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$id.smali b/com.discord/smali/androidx/legacy/coreui/R$id.smali
index f33ac33a23..13808ff9e8 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$integer.smali b/com.discord/smali/androidx/legacy/coreui/R$integer.smali
index ba6998383c..7842301b12 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$integer.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$layout.smali b/com.discord/smali/androidx/legacy/coreui/R$layout.smali
index 6ad69ed0f8..d04d326a21 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$string.smali b/com.discord/smali/androidx/legacy/coreui/R$string.smali
index 747ddb29a2..100dc503f3 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$style.smali b/com.discord/smali/androidx/legacy/coreui/R$style.smali
index 6c2618a686..ba4a6f8b8f 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
index caa4e1ca47..55a26eb313 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreui/R.smali b/com.discord/smali/androidx/legacy/coreui/R.smali
index 4ac3ee3fa6..7142d2b2f5 100644
--- a/com.discord/smali/androidx/legacy/coreui/R.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreui/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
index 00d1f378a9..ec2094c4f3 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$color.smali b/com.discord/smali/androidx/legacy/coreutils/R$color.smali
index 52ed176184..4b7e32036e 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$color.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
index f301582331..374399d111 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
index a41995c805..35eabc496b 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$id.smali b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
index f024f651ba..768c77d63d 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$integer.smali b/com.discord/smali/androidx/legacy/coreutils/R$integer.smali
index 05a42adda8..23549662ac 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$integer.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$layout.smali b/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
index 9fa5d2e9a8..7f488198e4 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$string.smali b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
index b5a1853a48..e666b78016 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$style.smali b/com.discord/smali/androidx/legacy/coreutils/R$style.smali
index 2a3ffbab20..33af82b5cc 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
index 8e36fa841e..423517556b 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/coreutils/R.smali b/com.discord/smali/androidx/legacy/coreutils/R.smali
index 38c4d15c33..7446694e32 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/coreutils/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$attr.smali b/com.discord/smali/androidx/legacy/v13/R$attr.smali
index b23c0fb803..f8b2307680 100644
--- a/com.discord/smali/androidx/legacy/v13/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$color.smali b/com.discord/smali/androidx/legacy/v13/R$color.smali
index 2bf69dbafd..a7aa4ae7c4 100644
--- a/com.discord/smali/androidx/legacy/v13/R$color.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$dimen.smali b/com.discord/smali/androidx/legacy/v13/R$dimen.smali
index 4370f50f63..aea086b7cd 100644
--- a/com.discord/smali/androidx/legacy/v13/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$drawable.smali b/com.discord/smali/androidx/legacy/v13/R$drawable.smali
index dad5ceebb4..cb2b6d8c83 100644
--- a/com.discord/smali/androidx/legacy/v13/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$id.smali b/com.discord/smali/androidx/legacy/v13/R$id.smali
index 18dbbf9315..e7d814061a 100644
--- a/com.discord/smali/androidx/legacy/v13/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$integer.smali b/com.discord/smali/androidx/legacy/v13/R$integer.smali
index f37c2ae294..bee8a6089a 100644
--- a/com.discord/smali/androidx/legacy/v13/R$integer.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$layout.smali b/com.discord/smali/androidx/legacy/v13/R$layout.smali
index a0e358ca07..bac921a8fa 100644
--- a/com.discord/smali/androidx/legacy/v13/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$string.smali b/com.discord/smali/androidx/legacy/v13/R$string.smali
index 2a712332fe..ec6ea5107b 100644
--- a/com.discord/smali/androidx/legacy/v13/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$style.smali b/com.discord/smali/androidx/legacy/v13/R$style.smali
index a373ee7d00..113450c7a5 100644
--- a/com.discord/smali/androidx/legacy/v13/R$style.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R$styleable.smali b/com.discord/smali/androidx/legacy/v13/R$styleable.smali
index 93c18b627c..36b51429bd 100644
--- a/com.discord/smali/androidx/legacy/v13/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v13/R.smali b/com.discord/smali/androidx/legacy/v13/R.smali
index 7180f01e6d..a8b8cb72fb 100644
--- a/com.discord/smali/androidx/legacy/v13/R.smali
+++ b/com.discord/smali/androidx/legacy/v13/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v13/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$attr.smali b/com.discord/smali/androidx/legacy/v4/R$attr.smali
index 36110aa013..1ad84b36b4 100644
--- a/com.discord/smali/androidx/legacy/v4/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$color.smali b/com.discord/smali/androidx/legacy/v4/R$color.smali
index 78b7e2903e..4a84216a18 100644
--- a/com.discord/smali/androidx/legacy/v4/R$color.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$dimen.smali b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
index 2c7be43860..320e01d5e7 100644
--- a/com.discord/smali/androidx/legacy/v4/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
index fad860345d..7a80db478e 100644
--- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$id.smali b/com.discord/smali/androidx/legacy/v4/R$id.smali
index 96f853f2f0..afc0e90f38 100644
--- a/com.discord/smali/androidx/legacy/v4/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$integer.smali b/com.discord/smali/androidx/legacy/v4/R$integer.smali
index 2f96f7b2c8..26041a961b 100644
--- a/com.discord/smali/androidx/legacy/v4/R$integer.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$layout.smali b/com.discord/smali/androidx/legacy/v4/R$layout.smali
index f41d9b6034..d9dd9cb77d 100644
--- a/com.discord/smali/androidx/legacy/v4/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$string.smali b/com.discord/smali/androidx/legacy/v4/R$string.smali
index 9b27e8059f..fe8f9e8c26 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$style.smali b/com.discord/smali/androidx/legacy/v4/R$style.smali
index ab73b97dd0..087a0dec1b 100644
--- a/com.discord/smali/androidx/legacy/v4/R$style.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R$styleable.smali b/com.discord/smali/androidx/legacy/v4/R$styleable.smali
index e79fa254a0..944a675df3 100644
--- a/com.discord/smali/androidx/legacy/v4/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/v4/R.smali b/com.discord/smali/androidx/legacy/v4/R.smali
index ac8e184f7c..76372284c9 100644
--- a/com.discord/smali/androidx/legacy/v4/R.smali
+++ b/com.discord/smali/androidx/legacy/v4/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/legacy/v4/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/view/ViewCompat.smali b/com.discord/smali/androidx/legacy/view/ViewCompat.smali
index a77203cb57..7769d8c0ee 100644
--- a/com.discord/smali/androidx/legacy/view/ViewCompat.smali
+++ b/com.discord/smali/androidx/legacy/view/ViewCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/legacy/view/ViewCompat;
 .super Landroidx/core/view/ViewCompat;
+.source "ViewCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/legacy/widget/Space.smali b/com.discord/smali/androidx/legacy/widget/Space.smali
index c7c3cc487d..b886ccb907 100644
--- a/com.discord/smali/androidx/legacy/widget/Space.smali
+++ b/com.discord/smali/androidx/legacy/widget/Space.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/legacy/widget/Space;
 .super Landroid/view/View;
+.source "Space.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/AndroidViewModel.smali b/com.discord/smali/androidx/lifecycle/AndroidViewModel.smali
index 355497dca9..3e9e8aaee6 100644
--- a/com.discord/smali/androidx/lifecycle/AndroidViewModel.smali
+++ b/com.discord/smali/androidx/lifecycle/AndroidViewModel.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/AndroidViewModel;
 .super Landroidx/lifecycle/ViewModel;
+.source "AndroidViewModel.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/lifecycle/ClassesInfoCache$CallbackInfo.smali b/com.discord/smali/androidx/lifecycle/ClassesInfoCache$CallbackInfo.smali
index be3a950dd5..d065965834 100644
--- a/com.discord/smali/androidx/lifecycle/ClassesInfoCache$CallbackInfo.smali
+++ b/com.discord/smali/androidx/lifecycle/ClassesInfoCache$CallbackInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ClassesInfoCache$CallbackInfo;
 .super Ljava/lang/Object;
+.source "ClassesInfoCache.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ClassesInfoCache$MethodReference.smali b/com.discord/smali/androidx/lifecycle/ClassesInfoCache$MethodReference.smali
index 170189c0a0..7416096a67 100644
--- a/com.discord/smali/androidx/lifecycle/ClassesInfoCache$MethodReference.smali
+++ b/com.discord/smali/androidx/lifecycle/ClassesInfoCache$MethodReference.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ClassesInfoCache$MethodReference;
 .super Ljava/lang/Object;
+.source "ClassesInfoCache.java"
 
 
 # annotations
@@ -52,7 +53,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -96,6 +97,9 @@
     return v0
 
     :cond_2
+    return v1
+
+    :cond_3
     :goto_0
     return v1
 .end method
@@ -172,6 +176,8 @@
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :goto_0
     return-void
 
@@ -199,8 +205,6 @@
 
     throw p2
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
diff --git a/com.discord/smali/androidx/lifecycle/ClassesInfoCache.smali b/com.discord/smali/androidx/lifecycle/ClassesInfoCache.smali
index b748443a1a..79c4834073 100644
--- a/com.discord/smali/androidx/lifecycle/ClassesInfoCache.smali
+++ b/com.discord/smali/androidx/lifecycle/ClassesInfoCache.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ClassesInfoCache;
 .super Ljava/lang/Object;
+.source "ClassesInfoCache.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/CompositeGeneratedAdaptersObserver.smali b/com.discord/smali/androidx/lifecycle/CompositeGeneratedAdaptersObserver.smali
index 57c3a18662..000c5e9181 100644
--- a/com.discord/smali/androidx/lifecycle/CompositeGeneratedAdaptersObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/CompositeGeneratedAdaptersObserver.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/CompositeGeneratedAdaptersObserver;
 .super Ljava/lang/Object;
+.source "CompositeGeneratedAdaptersObserver.java"
 
 # interfaces
 .implements Landroidx/lifecycle/GenericLifecycleObserver;
diff --git a/com.discord/smali/androidx/lifecycle/ComputableLiveData$1.smali b/com.discord/smali/androidx/lifecycle/ComputableLiveData$1.smali
index 0f87f0310c..f158c4d582 100644
--- a/com.discord/smali/androidx/lifecycle/ComputableLiveData$1.smali
+++ b/com.discord/smali/androidx/lifecycle/ComputableLiveData$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ComputableLiveData$1;
 .super Landroidx/lifecycle/LiveData;
+.source "ComputableLiveData.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ComputableLiveData$2.smali b/com.discord/smali/androidx/lifecycle/ComputableLiveData$2.smali
index b605d132d5..a000a754a5 100644
--- a/com.discord/smali/androidx/lifecycle/ComputableLiveData$2.smali
+++ b/com.discord/smali/androidx/lifecycle/ComputableLiveData$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ComputableLiveData$2;
 .super Ljava/lang/Object;
+.source "ComputableLiveData.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/lifecycle/ComputableLiveData$3.smali b/com.discord/smali/androidx/lifecycle/ComputableLiveData$3.smali
index 24118a3c32..96f1e743a0 100644
--- a/com.discord/smali/androidx/lifecycle/ComputableLiveData$3.smali
+++ b/com.discord/smali/androidx/lifecycle/ComputableLiveData$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ComputableLiveData$3;
 .super Ljava/lang/Object;
+.source "ComputableLiveData.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/lifecycle/ComputableLiveData.smali b/com.discord/smali/androidx/lifecycle/ComputableLiveData.smali
index d82e6ee775..386085f24c 100644
--- a/com.discord/smali/androidx/lifecycle/ComputableLiveData.smali
+++ b/com.discord/smali/androidx/lifecycle/ComputableLiveData.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/lifecycle/ComputableLiveData;
 .super Ljava/lang/Object;
+.source "ComputableLiveData.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/EmptyActivityLifecycleCallbacks.smali b/com.discord/smali/androidx/lifecycle/EmptyActivityLifecycleCallbacks.smali
index 4db7238b75..ba8b11a296 100644
--- a/com.discord/smali/androidx/lifecycle/EmptyActivityLifecycleCallbacks.smali
+++ b/com.discord/smali/androidx/lifecycle/EmptyActivityLifecycleCallbacks.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/EmptyActivityLifecycleCallbacks;
 .super Ljava/lang/Object;
+.source "EmptyActivityLifecycleCallbacks.java"
 
 # interfaces
 .implements Landroid/app/Application$ActivityLifecycleCallbacks;
diff --git a/com.discord/smali/androidx/lifecycle/FullLifecycleObserver.smali b/com.discord/smali/androidx/lifecycle/FullLifecycleObserver.smali
index ba92d2c25e..9d7e0e953b 100644
--- a/com.discord/smali/androidx/lifecycle/FullLifecycleObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/FullLifecycleObserver.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/lifecycle/FullLifecycleObserver;
 .super Ljava/lang/Object;
+.source "FullLifecycleObserver.java"
 
 # interfaces
 .implements Landroidx/lifecycle/LifecycleObserver;
diff --git a/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter$1.smali b/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter$1.smali
index 31bffc9f56..2bb719c870 100644
--- a/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter$1.smali
+++ b/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/lifecycle/FullLifecycleObserverAdapter$1;
 .super Ljava/lang/Object;
+.source "FullLifecycleObserverAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter.smali b/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter.smali
index 5096b9c5a7..eead80e86b 100644
--- a/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter.smali
+++ b/com.discord/smali/androidx/lifecycle/FullLifecycleObserverAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/FullLifecycleObserverAdapter;
 .super Ljava/lang/Object;
+.source "FullLifecycleObserverAdapter.java"
 
 # interfaces
 .implements Landroidx/lifecycle/GenericLifecycleObserver;
diff --git a/com.discord/smali/androidx/lifecycle/GeneratedAdapter.smali b/com.discord/smali/androidx/lifecycle/GeneratedAdapter.smali
index aab56f6852..ddbab79250 100644
--- a/com.discord/smali/androidx/lifecycle/GeneratedAdapter.smali
+++ b/com.discord/smali/androidx/lifecycle/GeneratedAdapter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/lifecycle/GeneratedAdapter;
 .super Ljava/lang/Object;
+.source "GeneratedAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/GenericLifecycleObserver.smali b/com.discord/smali/androidx/lifecycle/GenericLifecycleObserver.smali
index 63bd221195..7cf6c346de 100644
--- a/com.discord/smali/androidx/lifecycle/GenericLifecycleObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/GenericLifecycleObserver.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/lifecycle/GenericLifecycleObserver;
 .super Ljava/lang/Object;
+.source "GenericLifecycleObserver.java"
 
 # interfaces
 .implements Landroidx/lifecycle/LifecycleObserver;
diff --git a/com.discord/smali/androidx/lifecycle/Lifecycle$Event.smali b/com.discord/smali/androidx/lifecycle/Lifecycle$Event.smali
index 76657c346e..f3edd9d503 100644
--- a/com.discord/smali/androidx/lifecycle/Lifecycle$Event.smali
+++ b/com.discord/smali/androidx/lifecycle/Lifecycle$Event.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/lifecycle/Lifecycle$Event;
 .super Ljava/lang/Enum;
+.source "Lifecycle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/Lifecycle$State.smali b/com.discord/smali/androidx/lifecycle/Lifecycle$State.smali
index fda18cfaa8..4bab0f2bcd 100644
--- a/com.discord/smali/androidx/lifecycle/Lifecycle$State.smali
+++ b/com.discord/smali/androidx/lifecycle/Lifecycle$State.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/lifecycle/Lifecycle$State;
 .super Ljava/lang/Enum;
+.source "Lifecycle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/Lifecycle.smali b/com.discord/smali/androidx/lifecycle/Lifecycle.smali
index a03f0118ef..7237ff4cd0 100644
--- a/com.discord/smali/androidx/lifecycle/Lifecycle.smali
+++ b/com.discord/smali/androidx/lifecycle/Lifecycle.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/lifecycle/Lifecycle;
 .super Ljava/lang/Object;
+.source "Lifecycle.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback.smali b/com.discord/smali/androidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback.smali
index 19c7a8dc06..9ed0995f38 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback;
 .super Landroidx/lifecycle/EmptyActivityLifecycleCallbacks;
+.source "LifecycleDispatcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleDispatcher.smali b/com.discord/smali/androidx/lifecycle/LifecycleDispatcher.smali
index 419bbb38f6..3b1c604adb 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleDispatcher.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleDispatcher.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/LifecycleDispatcher;
 .super Ljava/lang/Object;
+.source "LifecycleDispatcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleObserver.smali b/com.discord/smali/androidx/lifecycle/LifecycleObserver.smali
index 2236a01de0..74d1acb197 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleObserver.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Landroidx/lifecycle/LifecycleObserver;
 .super Ljava/lang/Object;
+.source "LifecycleObserver.java"
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleOwner.smali b/com.discord/smali/androidx/lifecycle/LifecycleOwner.smali
index d03bb0ecee..87100c5500 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleOwner.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleOwner.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/lifecycle/LifecycleOwner;
 .super Ljava/lang/Object;
+.source "LifecycleOwner.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleRegistry$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleRegistry$1.smali
index e7f4952221..cf05ce6576 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleRegistry$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleRegistry$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/lifecycle/LifecycleRegistry$1;
 .super Ljava/lang/Object;
+.source "LifecycleRegistry.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleRegistry$ObserverWithState.smali b/com.discord/smali/androidx/lifecycle/LifecycleRegistry$ObserverWithState.smali
index f8ad808947..fa9f05bf34 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleRegistry$ObserverWithState.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleRegistry$ObserverWithState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/LifecycleRegistry$ObserverWithState;
 .super Ljava/lang/Object;
+.source "LifecycleRegistry.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleRegistry.smali b/com.discord/smali/androidx/lifecycle/LifecycleRegistry.smali
index 7059d693e8..25154fa218 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleRegistry.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleRegistry.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/LifecycleRegistry;
 .super Landroidx/lifecycle/Lifecycle;
+.source "LifecycleRegistry.java"
 
 
 # annotations
@@ -216,9 +217,7 @@
 
     iget-object v0, p0, Landroidx/lifecycle/LifecycleRegistry;->mParentStates:Ljava/util/ArrayList;
 
-    iget-object v1, p0, Landroidx/lifecycle/LifecycleRegistry;->mParentStates:Ljava/util/ArrayList;
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
@@ -583,9 +582,7 @@
 
     iget-object v0, p0, Landroidx/lifecycle/LifecycleRegistry;->mParentStates:Ljava/util/ArrayList;
 
-    iget-object v1, p0, Landroidx/lifecycle/LifecycleRegistry;->mParentStates:Ljava/util/ArrayList;
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleRegistryOwner.smali b/com.discord/smali/androidx/lifecycle/LifecycleRegistryOwner.smali
index 90bbbeaaff..49dfe02cf2 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleRegistryOwner.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleRegistryOwner.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/lifecycle/LifecycleRegistryOwner;
 .super Ljava/lang/Object;
+.source "LifecycleRegistryOwner.java"
 
 # interfaces
 .implements Landroidx/lifecycle/LifecycleOwner;
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleService.smali b/com.discord/smali/androidx/lifecycle/LifecycleService.smali
index ce603b9787..84388a5703 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleService.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleService.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/LifecycleService;
 .super Landroid/app/Service;
+.source "LifecycleService.java"
 
 # interfaces
 .implements Landroidx/lifecycle/LifecycleOwner;
diff --git a/com.discord/smali/androidx/lifecycle/Lifecycling.smali b/com.discord/smali/androidx/lifecycle/Lifecycling.smali
index 025da1a5ee..cbadf022df 100644
--- a/com.discord/smali/androidx/lifecycle/Lifecycling.smali
+++ b/com.discord/smali/androidx/lifecycle/Lifecycling.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/Lifecycling;
 .super Ljava/lang/Object;
+.source "Lifecycling.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LiveData$1.smali b/com.discord/smali/androidx/lifecycle/LiveData$1.smali
index 2e14652b90..2e9a03bd38 100644
--- a/com.discord/smali/androidx/lifecycle/LiveData$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LiveData$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/LiveData$1;
 .super Ljava/lang/Object;
+.source "LiveData.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/lifecycle/LiveData$AlwaysActiveObserver.smali b/com.discord/smali/androidx/lifecycle/LiveData$AlwaysActiveObserver.smali
index 4c42c61b33..faa9f81f63 100644
--- a/com.discord/smali/androidx/lifecycle/LiveData$AlwaysActiveObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/LiveData$AlwaysActiveObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/LiveData$AlwaysActiveObserver;
 .super Landroidx/lifecycle/LiveData$ObserverWrapper;
+.source "LiveData.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LiveData$LifecycleBoundObserver.smali b/com.discord/smali/androidx/lifecycle/LiveData$LifecycleBoundObserver.smali
index fc675740a1..14d4568b89 100644
--- a/com.discord/smali/androidx/lifecycle/LiveData$LifecycleBoundObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/LiveData$LifecycleBoundObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/LiveData$LifecycleBoundObserver;
 .super Landroidx/lifecycle/LiveData$ObserverWrapper;
+.source "LiveData.java"
 
 # interfaces
 .implements Landroidx/lifecycle/GenericLifecycleObserver;
diff --git a/com.discord/smali/androidx/lifecycle/LiveData$ObserverWrapper.smali b/com.discord/smali/androidx/lifecycle/LiveData$ObserverWrapper.smali
index b2874065c7..3cd57fe4e6 100644
--- a/com.discord/smali/androidx/lifecycle/LiveData$ObserverWrapper.smali
+++ b/com.discord/smali/androidx/lifecycle/LiveData$ObserverWrapper.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/lifecycle/LiveData$ObserverWrapper;
 .super Ljava/lang/Object;
+.source "LiveData.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/LiveData.smali b/com.discord/smali/androidx/lifecycle/LiveData.smali
index ae1241cdb6..4382a72b69 100644
--- a/com.discord/smali/androidx/lifecycle/LiveData.smali
+++ b/com.discord/smali/androidx/lifecycle/LiveData.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/lifecycle/LiveData;
 .super Ljava/lang/Object;
+.source "LiveData.java"
 
 
 # annotations
@@ -95,8 +96,6 @@
 
     iput-object v0, p0, Landroidx/lifecycle/LiveData;->mData:Ljava/lang/Object;
 
-    sget-object v0, Landroidx/lifecycle/LiveData;->NOT_SET:Ljava/lang/Object;
-
     iput-object v0, p0, Landroidx/lifecycle/LiveData;->mPendingData:Ljava/lang/Object;
 
     const/4 v0, -0x1
@@ -190,9 +189,7 @@
     return-void
 
     :cond_2
-    iget v0, p0, Landroidx/lifecycle/LiveData;->mVersion:I
-
-    iput v0, p1, Landroidx/lifecycle/LiveData$ObserverWrapper;->mLastVersion:I
+    iput v1, p1, Landroidx/lifecycle/LiveData$ObserverWrapper;->mLastVersion:I
 
     iget-object p1, p1, Landroidx/lifecycle/LiveData$ObserverWrapper;->mObserver:Landroidx/lifecycle/Observer;
 
diff --git a/com.discord/smali/androidx/lifecycle/MediatorLiveData$Source.smali b/com.discord/smali/androidx/lifecycle/MediatorLiveData$Source.smali
index bae166bb29..54180d5452 100644
--- a/com.discord/smali/androidx/lifecycle/MediatorLiveData$Source.smali
+++ b/com.discord/smali/androidx/lifecycle/MediatorLiveData$Source.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/MediatorLiveData$Source;
 .super Ljava/lang/Object;
+.source "MediatorLiveData.java"
 
 # interfaces
 .implements Landroidx/lifecycle/Observer;
diff --git a/com.discord/smali/androidx/lifecycle/MediatorLiveData.smali b/com.discord/smali/androidx/lifecycle/MediatorLiveData.smali
index 7e5e620749..f7e84719ea 100644
--- a/com.discord/smali/androidx/lifecycle/MediatorLiveData.smali
+++ b/com.discord/smali/androidx/lifecycle/MediatorLiveData.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/MediatorLiveData;
 .super Landroidx/lifecycle/MutableLiveData;
+.source "MediatorLiveData.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/MethodCallsLogger.smali b/com.discord/smali/androidx/lifecycle/MethodCallsLogger.smali
index ee350d075b..5afb6a74c2 100644
--- a/com.discord/smali/androidx/lifecycle/MethodCallsLogger.smali
+++ b/com.discord/smali/androidx/lifecycle/MethodCallsLogger.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/MethodCallsLogger;
 .super Ljava/lang/Object;
+.source "MethodCallsLogger.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/MutableLiveData.smali b/com.discord/smali/androidx/lifecycle/MutableLiveData.smali
index 3cc7e20c53..80e5697234 100644
--- a/com.discord/smali/androidx/lifecycle/MutableLiveData.smali
+++ b/com.discord/smali/androidx/lifecycle/MutableLiveData.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/MutableLiveData;
 .super Landroidx/lifecycle/LiveData;
+.source "MutableLiveData.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/Observer.smali b/com.discord/smali/androidx/lifecycle/Observer.smali
index ac3a1f4c07..00c27bcc06 100644
--- a/com.discord/smali/androidx/lifecycle/Observer.smali
+++ b/com.discord/smali/androidx/lifecycle/Observer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/lifecycle/Observer;
 .super Ljava/lang/Object;
+.source "Observer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/OnLifecycleEvent.smali b/com.discord/smali/androidx/lifecycle/OnLifecycleEvent.smali
index 2ed5fade96..ab31ed5819 100644
--- a/com.discord/smali/androidx/lifecycle/OnLifecycleEvent.smali
+++ b/com.discord/smali/androidx/lifecycle/OnLifecycleEvent.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/lifecycle/OnLifecycleEvent;
 .super Ljava/lang/Object;
+.source "OnLifecycleEvent.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$1.smali b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$1.smali
index 7fa5d48a63..c417daff94 100644
--- a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$1.smali
+++ b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ProcessLifecycleOwner$1;
 .super Ljava/lang/Object;
+.source "ProcessLifecycleOwner.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$2.smali b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$2.smali
index 2aa555bb59..0a63dc94be 100644
--- a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$2.smali
+++ b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ProcessLifecycleOwner$2;
 .super Ljava/lang/Object;
+.source "ProcessLifecycleOwner.java"
 
 # interfaces
 .implements Landroidx/lifecycle/ReportFragment$ActivityInitializationListener;
diff --git a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$3.smali b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$3.smali
index 49bb5172c2..7a1b41325d 100644
--- a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$3.smali
+++ b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ProcessLifecycleOwner$3;
 .super Landroidx/lifecycle/EmptyActivityLifecycleCallbacks;
+.source "ProcessLifecycleOwner.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner.smali b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner.smali
index 4213c703d3..f6f6309d9a 100644
--- a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner.smali
+++ b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwner.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ProcessLifecycleOwner;
 .super Ljava/lang/Object;
+.source "ProcessLifecycleOwner.java"
 
 # interfaces
 .implements Landroidx/lifecycle/LifecycleOwner;
diff --git a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwnerInitializer.smali b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwnerInitializer.smali
index 37a5cc0c87..3e25aa0191 100644
--- a/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwnerInitializer.smali
+++ b/com.discord/smali/androidx/lifecycle/ProcessLifecycleOwnerInitializer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ProcessLifecycleOwnerInitializer;
 .super Landroid/content/ContentProvider;
+.source "ProcessLifecycleOwnerInitializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/R.smali b/com.discord/smali/androidx/lifecycle/R.smali
index d37015f6b2..9416128a15 100644
--- a/com.discord/smali/androidx/lifecycle/R.smali
+++ b/com.discord/smali/androidx/lifecycle/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/ReflectiveGenericLifecycleObserver.smali b/com.discord/smali/androidx/lifecycle/ReflectiveGenericLifecycleObserver.smali
index be60522f0f..e4af51243a 100644
--- a/com.discord/smali/androidx/lifecycle/ReflectiveGenericLifecycleObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/ReflectiveGenericLifecycleObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ReflectiveGenericLifecycleObserver;
 .super Ljava/lang/Object;
+.source "ReflectiveGenericLifecycleObserver.java"
 
 # interfaces
 .implements Landroidx/lifecycle/GenericLifecycleObserver;
diff --git a/com.discord/smali/androidx/lifecycle/ReportFragment$ActivityInitializationListener.smali b/com.discord/smali/androidx/lifecycle/ReportFragment$ActivityInitializationListener.smali
index 21e249a85d..131651fdcb 100644
--- a/com.discord/smali/androidx/lifecycle/ReportFragment$ActivityInitializationListener.smali
+++ b/com.discord/smali/androidx/lifecycle/ReportFragment$ActivityInitializationListener.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/lifecycle/ReportFragment$ActivityInitializationListener;
 .super Ljava/lang/Object;
+.source "ReportFragment.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ReportFragment.smali b/com.discord/smali/androidx/lifecycle/ReportFragment.smali
index d09b96197e..59ed65aa0e 100644
--- a/com.discord/smali/androidx/lifecycle/ReportFragment.smali
+++ b/com.discord/smali/androidx/lifecycle/ReportFragment.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ReportFragment;
 .super Landroid/app/Fragment;
+.source "ReportFragment.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher$DispatchRunnable.smali b/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher$DispatchRunnable.smali
index 57c9275f59..7095d90741 100644
--- a/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher$DispatchRunnable.smali
+++ b/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher$DispatchRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/ServiceLifecycleDispatcher$DispatchRunnable;
 .super Ljava/lang/Object;
+.source "ServiceLifecycleDispatcher.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher.smali b/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher.smali
index 8972d3f9cc..f4abacd849 100644
--- a/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher.smali
+++ b/com.discord/smali/androidx/lifecycle/ServiceLifecycleDispatcher.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ServiceLifecycleDispatcher;
 .super Ljava/lang/Object;
+.source "ServiceLifecycleDispatcher.java"
 
 
 # annotations
@@ -50,8 +51,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/lifecycle/ServiceLifecycleDispatcher;->mLastDispatchRunnable:Landroidx/lifecycle/ServiceLifecycleDispatcher$DispatchRunnable;
-
     invoke-virtual {v0}, Landroidx/lifecycle/ServiceLifecycleDispatcher$DispatchRunnable;->run()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/lifecycle/SingleGeneratedAdapterObserver.smali b/com.discord/smali/androidx/lifecycle/SingleGeneratedAdapterObserver.smali
index 05a5b3124c..6ae613fc12 100644
--- a/com.discord/smali/androidx/lifecycle/SingleGeneratedAdapterObserver.smali
+++ b/com.discord/smali/androidx/lifecycle/SingleGeneratedAdapterObserver.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/SingleGeneratedAdapterObserver;
 .super Ljava/lang/Object;
+.source "SingleGeneratedAdapterObserver.java"
 
 # interfaces
 .implements Landroidx/lifecycle/GenericLifecycleObserver;
diff --git a/com.discord/smali/androidx/lifecycle/Transformations$1.smali b/com.discord/smali/androidx/lifecycle/Transformations$1.smali
index c157d5a240..9d2b058c3a 100644
--- a/com.discord/smali/androidx/lifecycle/Transformations$1.smali
+++ b/com.discord/smali/androidx/lifecycle/Transformations$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/lifecycle/Transformations$1;
 .super Ljava/lang/Object;
+.source "Transformations.java"
 
 # interfaces
 .implements Landroidx/lifecycle/Observer;
diff --git a/com.discord/smali/androidx/lifecycle/Transformations$2$1.smali b/com.discord/smali/androidx/lifecycle/Transformations$2$1.smali
index c150257874..340c64afbe 100644
--- a/com.discord/smali/androidx/lifecycle/Transformations$2$1.smali
+++ b/com.discord/smali/androidx/lifecycle/Transformations$2$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/lifecycle/Transformations$2$1;
 .super Ljava/lang/Object;
+.source "Transformations.java"
 
 # interfaces
 .implements Landroidx/lifecycle/Observer;
diff --git a/com.discord/smali/androidx/lifecycle/Transformations$2.smali b/com.discord/smali/androidx/lifecycle/Transformations$2.smali
index 812e034a5a..50579974ff 100644
--- a/com.discord/smali/androidx/lifecycle/Transformations$2.smali
+++ b/com.discord/smali/androidx/lifecycle/Transformations$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/lifecycle/Transformations$2;
 .super Ljava/lang/Object;
+.source "Transformations.java"
 
 # interfaces
 .implements Landroidx/lifecycle/Observer;
@@ -81,15 +82,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/lifecycle/Transformations$2;->mSource:Landroidx/lifecycle/LiveData;
-
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/lifecycle/Transformations$2;->val$result:Landroidx/lifecycle/MediatorLiveData;
+    iget-object v1, p0, Landroidx/lifecycle/Transformations$2;->val$result:Landroidx/lifecycle/MediatorLiveData;
 
-    iget-object v1, p0, Landroidx/lifecycle/Transformations$2;->mSource:Landroidx/lifecycle/LiveData;
-
-    invoke-virtual {v0, v1}, Landroidx/lifecycle/MediatorLiveData;->removeSource(Landroidx/lifecycle/LiveData;)V
+    invoke-virtual {v1, v0}, Landroidx/lifecycle/MediatorLiveData;->removeSource(Landroidx/lifecycle/LiveData;)V
 
     :cond_1
     iput-object p1, p0, Landroidx/lifecycle/Transformations$2;->mSource:Landroidx/lifecycle/LiveData;
@@ -98,15 +95,13 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/lifecycle/Transformations$2;->val$result:Landroidx/lifecycle/MediatorLiveData;
-
-    iget-object v0, p0, Landroidx/lifecycle/Transformations$2;->mSource:Landroidx/lifecycle/LiveData;
+    iget-object v0, p0, Landroidx/lifecycle/Transformations$2;->val$result:Landroidx/lifecycle/MediatorLiveData;
 
     new-instance v1, Landroidx/lifecycle/Transformations$2$1;
 
     invoke-direct {v1, p0}, Landroidx/lifecycle/Transformations$2$1;-><init>(Landroidx/lifecycle/Transformations$2;)V
 
-    invoke-virtual {p1, v0, v1}, Landroidx/lifecycle/MediatorLiveData;->addSource(Landroidx/lifecycle/LiveData;Landroidx/lifecycle/Observer;)V
+    invoke-virtual {v0, p1, v1}, Landroidx/lifecycle/MediatorLiveData;->addSource(Landroidx/lifecycle/LiveData;Landroidx/lifecycle/Observer;)V
 
     :cond_2
     return-void
diff --git a/com.discord/smali/androidx/lifecycle/Transformations.smali b/com.discord/smali/androidx/lifecycle/Transformations.smali
index 94fa49dde4..dd0e769fa3 100644
--- a/com.discord/smali/androidx/lifecycle/Transformations.smali
+++ b/com.discord/smali/androidx/lifecycle/Transformations.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/Transformations;
 .super Ljava/lang/Object;
+.source "Transformations.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/ViewModel.smali b/com.discord/smali/androidx/lifecycle/ViewModel.smali
index 1538667d7f..74b334bfdc 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModel.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModel.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/lifecycle/ViewModel;
 .super Ljava/lang/Object;
+.source "ViewModel.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelProvider$AndroidViewModelFactory.smali b/com.discord/smali/androidx/lifecycle/ViewModelProvider$AndroidViewModelFactory.smali
index 577afc5e39..f3ef0c0a4b 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelProvider$AndroidViewModelFactory.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelProvider$AndroidViewModelFactory.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;
 .super Landroidx/lifecycle/ViewModelProvider$NewInstanceFactory;
+.source "ViewModelProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelProvider$Factory.smali b/com.discord/smali/androidx/lifecycle/ViewModelProvider$Factory.smali
index 022e6824ce..63a01b439c 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelProvider$Factory.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelProvider$Factory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/lifecycle/ViewModelProvider$Factory;
 .super Ljava/lang/Object;
+.source "ViewModelProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelProvider$NewInstanceFactory.smali b/com.discord/smali/androidx/lifecycle/ViewModelProvider$NewInstanceFactory.smali
index 5d7e8ad9f0..a3a05a1d37 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelProvider$NewInstanceFactory.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelProvider$NewInstanceFactory.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ViewModelProvider$NewInstanceFactory;
 .super Ljava/lang/Object;
+.source "ViewModelProvider.java"
 
 # interfaces
 .implements Landroidx/lifecycle/ViewModelProvider$Factory;
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelProvider.smali b/com.discord/smali/androidx/lifecycle/ViewModelProvider.smali
index f73208c1ae..ca2749764d 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelProvider.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelProvider.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ViewModelProvider;
 .super Ljava/lang/Object;
+.source "ViewModelProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelProviders$DefaultFactory.smali b/com.discord/smali/androidx/lifecycle/ViewModelProviders$DefaultFactory.smali
index 3ae4b30a22..84df700e7e 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelProviders$DefaultFactory.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelProviders$DefaultFactory.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ViewModelProviders$DefaultFactory;
 .super Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;
+.source "ViewModelProviders.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelProviders.smali b/com.discord/smali/androidx/lifecycle/ViewModelProviders.smali
index 33337dc576..ad5a00b2f7 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelProviders.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelProviders.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ViewModelProviders;
 .super Ljava/lang/Object;
+.source "ViewModelProviders.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelStore.smali b/com.discord/smali/androidx/lifecycle/ViewModelStore.smali
index b437694826..895ed66670 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelStore.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelStore.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ViewModelStore;
 .super Ljava/lang/Object;
+.source "ViewModelStore.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelStoreOwner.smali b/com.discord/smali/androidx/lifecycle/ViewModelStoreOwner.smali
index 6f48d75113..0a4e5f4d05 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelStoreOwner.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelStoreOwner.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/lifecycle/ViewModelStoreOwner;
 .super Ljava/lang/Object;
+.source "ViewModelStoreOwner.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelStores.smali b/com.discord/smali/androidx/lifecycle/ViewModelStores.smali
index e9c1454552..663aca0a13 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelStores.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelStores.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/lifecycle/ViewModelStores;
 .super Ljava/lang/Object;
+.source "ViewModelStores.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
index 1e8b8669f4..d545ad2ac3 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$color.smali b/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
index e8893d8508..a33fdb3d59 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
index 19cbaf9f79..38c2eaf1b5 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
index f7b8404213..2f2b2e48b0 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$id.smali b/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
index 780218d896..c9c041ed34 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali b/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali
index caf97a9bb6..b9075510e6 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali b/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
index cce2562b9a..c39971d705 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
index 5a0fe801fc..4bf020d7e5 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$style.smali b/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
index 83a89a17b4..323b8e7a20 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
index a5a64107bd..559594c6ba 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R.smali b/com.discord/smali/androidx/lifecycle/extensions/R.smali
index 36fc0f0e35..ea666d18ff 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/extensions/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/lifecycle/livedata/R.smali b/com.discord/smali/androidx/lifecycle/livedata/R.smali
index d09d9a4609..bcf65035de 100644
--- a/com.discord/smali/androidx/lifecycle/livedata/R.smali
+++ b/com.discord/smali/androidx/lifecycle/livedata/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/livedata/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/livedata/core/R.smali b/com.discord/smali/androidx/lifecycle/livedata/core/R.smali
index 90b9321d1c..2a72f6bab3 100644
--- a/com.discord/smali/androidx/lifecycle/livedata/core/R.smali
+++ b/com.discord/smali/androidx/lifecycle/livedata/core/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/livedata/core/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/process/R.smali b/com.discord/smali/androidx/lifecycle/process/R.smali
index b70aa65f58..0115b260fa 100644
--- a/com.discord/smali/androidx/lifecycle/process/R.smali
+++ b/com.discord/smali/androidx/lifecycle/process/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/process/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/service/R.smali b/com.discord/smali/androidx/lifecycle/service/R.smali
index fb894ac0a0..582296dddf 100644
--- a/com.discord/smali/androidx/lifecycle/service/R.smali
+++ b/com.discord/smali/androidx/lifecycle/service/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/service/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/viewmodel/R.smali b/com.discord/smali/androidx/lifecycle/viewmodel/R.smali
index 5e4accd9e3..b1ce59df9a 100644
--- a/com.discord/smali/androidx/lifecycle/viewmodel/R.smali
+++ b/com.discord/smali/androidx/lifecycle/viewmodel/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/lifecycle/viewmodel/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$attr.smali b/com.discord/smali/androidx/loader/R$attr.smali
index ff5503fdd9..ee879285b7 100644
--- a/com.discord/smali/androidx/loader/R$attr.smali
+++ b/com.discord/smali/androidx/loader/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$color.smali b/com.discord/smali/androidx/loader/R$color.smali
index 3f19f78ec8..b685651a36 100644
--- a/com.discord/smali/androidx/loader/R$color.smali
+++ b/com.discord/smali/androidx/loader/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$dimen.smali b/com.discord/smali/androidx/loader/R$dimen.smali
index 95a9b93ae7..8cf0c32783 100644
--- a/com.discord/smali/androidx/loader/R$dimen.smali
+++ b/com.discord/smali/androidx/loader/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index ee8095abab..9df274abea 100644
--- a/com.discord/smali/androidx/loader/R$drawable.smali
+++ b/com.discord/smali/androidx/loader/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index c79afb54af..f8dd0f419f 100644
--- a/com.discord/smali/androidx/loader/R$id.smali
+++ b/com.discord/smali/androidx/loader/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$integer.smali b/com.discord/smali/androidx/loader/R$integer.smali
index 81b81f376e..594f36a826 100644
--- a/com.discord/smali/androidx/loader/R$integer.smali
+++ b/com.discord/smali/androidx/loader/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$layout.smali b/com.discord/smali/androidx/loader/R$layout.smali
index 8068bb74d6..f1f10c62e3 100644
--- a/com.discord/smali/androidx/loader/R$layout.smali
+++ b/com.discord/smali/androidx/loader/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index e6b2b4ba7a..7560093680 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$style.smali b/com.discord/smali/androidx/loader/R$style.smali
index 2fd416ff47..9c1b608757 100644
--- a/com.discord/smali/androidx/loader/R$style.smali
+++ b/com.discord/smali/androidx/loader/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R$styleable.smali b/com.discord/smali/androidx/loader/R$styleable.smali
index bfb057cae1..cddb6c6377 100644
--- a/com.discord/smali/androidx/loader/R$styleable.smali
+++ b/com.discord/smali/androidx/loader/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/R.smali b/com.discord/smali/androidx/loader/R.smali
index 918ccf6adf..bbdaf24aaf 100644
--- a/com.discord/smali/androidx/loader/R.smali
+++ b/com.discord/smali/androidx/loader/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/app/LoaderManager$LoaderCallbacks.smali b/com.discord/smali/androidx/loader/app/LoaderManager$LoaderCallbacks.smali
index 560593b916..e23ac59fc1 100644
--- a/com.discord/smali/androidx/loader/app/LoaderManager$LoaderCallbacks.smali
+++ b/com.discord/smali/androidx/loader/app/LoaderManager$LoaderCallbacks.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/loader/app/LoaderManager$LoaderCallbacks;
 .super Ljava/lang/Object;
+.source "LoaderManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/app/LoaderManager.smali b/com.discord/smali/androidx/loader/app/LoaderManager.smali
index 8ed0cb3eaf..f2b69f490a 100644
--- a/com.discord/smali/androidx/loader/app/LoaderManager.smali
+++ b/com.discord/smali/androidx/loader/app/LoaderManager.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/loader/app/LoaderManager;
 .super Ljava/lang/Object;
+.source "LoaderManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderInfo.smali b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderInfo.smali
index cdcd635ed4..57a020d2a8 100644
--- a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderInfo.smali
+++ b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderInfo.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/loader/app/LoaderManagerImpl$LoaderInfo;
 .super Landroidx/lifecycle/MutableLiveData;
+.source "LoaderManagerImpl.java"
 
 # interfaces
 .implements Landroidx/loader/content/Loader$OnLoadCompleteListener;
@@ -348,8 +349,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/loader/app/LoaderManagerImpl$LoaderInfo;->mObserver:Landroidx/loader/app/LoaderManagerImpl$LoaderObserver;
-
     invoke-virtual {v0}, Landroidx/loader/app/LoaderManagerImpl$LoaderObserver;->hasDeliveredData()Z
 
     move-result v0
@@ -573,8 +572,6 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Landroidx/loader/app/LoaderManagerImpl$LoaderInfo;->mObserver:Landroidx/loader/app/LoaderManagerImpl$LoaderObserver;
-
     invoke-virtual {p0, p2}, Landroidx/loader/app/LoaderManagerImpl$LoaderInfo;->removeObserver(Landroidx/lifecycle/Observer;)V
 
     :cond_0
@@ -601,8 +598,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/loader/app/LoaderManagerImpl$LoaderInfo;->mPriorLoader:Landroidx/loader/content/Loader;
-
     invoke-virtual {p1}, Landroidx/loader/content/Loader;->reset()V
 
     const/4 p1, 0x0
diff --git a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderObserver.smali b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderObserver.smali
index b2465f338c..1453d2caaa 100644
--- a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderObserver.smali
+++ b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/loader/app/LoaderManagerImpl$LoaderObserver;
 .super Ljava/lang/Object;
+.source "LoaderManagerImpl.java"
 
 # interfaces
 .implements Landroidx/lifecycle/Observer;
diff --git a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel$1.smali b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel$1.smali
index 81bbae3572..d8901cafc7 100644
--- a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel$1.smali
+++ b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/loader/app/LoaderManagerImpl$LoaderViewModel$1;
 .super Ljava/lang/Object;
+.source "LoaderManagerImpl.java"
 
 # interfaces
 .implements Landroidx/lifecycle/ViewModelProvider$Factory;
diff --git a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel.smali b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel.smali
index 51ef733d96..42f3f34e65 100644
--- a/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel.smali
+++ b/com.discord/smali/androidx/loader/app/LoaderManagerImpl$LoaderViewModel.smali
@@ -1,5 +1,6 @@
 .class Landroidx/loader/app/LoaderManagerImpl$LoaderViewModel;
 .super Landroidx/lifecycle/ViewModel;
+.source "LoaderManagerImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/app/LoaderManagerImpl.smali b/com.discord/smali/androidx/loader/app/LoaderManagerImpl.smali
index abb86bf55d..85656b4c65 100644
--- a/com.discord/smali/androidx/loader/app/LoaderManagerImpl.smali
+++ b/com.discord/smali/androidx/loader/app/LoaderManagerImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/loader/app/LoaderManagerImpl;
 .super Landroidx/loader/app/LoaderManager;
+.source "LoaderManagerImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/AsyncTaskLoader$LoadTask.smali b/com.discord/smali/androidx/loader/content/AsyncTaskLoader$LoadTask.smali
index 2743cfa59b..6478134220 100644
--- a/com.discord/smali/androidx/loader/content/AsyncTaskLoader$LoadTask.smali
+++ b/com.discord/smali/androidx/loader/content/AsyncTaskLoader$LoadTask.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/loader/content/AsyncTaskLoader$LoadTask;
 .super Landroidx/loader/content/ModernAsyncTask;
+.source "AsyncTaskLoader.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -191,6 +192,8 @@
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
diff --git a/com.discord/smali/androidx/loader/content/AsyncTaskLoader.smali b/com.discord/smali/androidx/loader/content/AsyncTaskLoader.smali
index 7b8029a21a..dd74475048 100644
--- a/com.discord/smali/androidx/loader/content/AsyncTaskLoader.smali
+++ b/com.discord/smali/androidx/loader/content/AsyncTaskLoader.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/loader/content/AsyncTaskLoader;
 .super Landroidx/loader/content/Loader;
+.source "AsyncTaskLoader.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/CursorLoader.smali b/com.discord/smali/androidx/loader/content/CursorLoader.smali
index c855657ed9..3bf0a2dd32 100644
--- a/com.discord/smali/androidx/loader/content/CursorLoader.smali
+++ b/com.discord/smali/androidx/loader/content/CursorLoader.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/loader/content/CursorLoader;
 .super Landroidx/loader/content/AsyncTaskLoader;
+.source "CursorLoader.java"
 
 
 # annotations
@@ -518,8 +519,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/loader/content/CursorLoader;->mCursor:Landroid/database/Cursor;
-
     invoke-interface {v0}, Landroid/database/Cursor;->isClosed()Z
 
     move-result v0
@@ -545,8 +544,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/loader/content/CursorLoader;->mCursor:Landroid/database/Cursor;
-
     invoke-virtual {p0, v0}, Landroidx/loader/content/CursorLoader;->deliverResult(Landroid/database/Cursor;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/loader/content/Loader$ForceLoadContentObserver.smali b/com.discord/smali/androidx/loader/content/Loader$ForceLoadContentObserver.smali
index ea933a6b04..077a9c144f 100644
--- a/com.discord/smali/androidx/loader/content/Loader$ForceLoadContentObserver.smali
+++ b/com.discord/smali/androidx/loader/content/Loader$ForceLoadContentObserver.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/loader/content/Loader$ForceLoadContentObserver;
 .super Landroid/database/ContentObserver;
+.source "Loader.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/Loader$OnLoadCanceledListener.smali b/com.discord/smali/androidx/loader/content/Loader$OnLoadCanceledListener.smali
index ec45d8c301..5435ecf66d 100644
--- a/com.discord/smali/androidx/loader/content/Loader$OnLoadCanceledListener.smali
+++ b/com.discord/smali/androidx/loader/content/Loader$OnLoadCanceledListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/loader/content/Loader$OnLoadCanceledListener;
 .super Ljava/lang/Object;
+.source "Loader.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/Loader$OnLoadCompleteListener.smali b/com.discord/smali/androidx/loader/content/Loader$OnLoadCompleteListener.smali
index 417b40cd07..d3779b83de 100644
--- a/com.discord/smali/androidx/loader/content/Loader$OnLoadCompleteListener.smali
+++ b/com.discord/smali/androidx/loader/content/Loader$OnLoadCompleteListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/loader/content/Loader$OnLoadCompleteListener;
 .super Ljava/lang/Object;
+.source "Loader.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/Loader.smali b/com.discord/smali/androidx/loader/content/Loader.smali
index c4a8dda8fa..76bba6ff85 100644
--- a/com.discord/smali/androidx/loader/content/Loader.smali
+++ b/com.discord/smali/androidx/loader/content/Loader.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/loader/content/Loader;
 .super Ljava/lang/Object;
+.source "Loader.java"
 
 
 # annotations
@@ -170,8 +171,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/loader/content/Loader;->mOnLoadCanceledListener:Landroidx/loader/content/Loader$OnLoadCanceledListener;
-
     invoke-interface {v0, p0}, Landroidx/loader/content/Loader$OnLoadCanceledListener;->onLoadCanceled(Landroidx/loader/content/Loader;)V
 
     :cond_0
@@ -197,8 +196,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/loader/content/Loader;->mListener:Landroidx/loader/content/Loader$OnLoadCompleteListener;
-
     invoke-interface {v0, p0, p1}, Landroidx/loader/content/Loader$OnLoadCompleteListener;->onLoadComplete(Landroidx/loader/content/Loader;Ljava/lang/Object;)V
 
     :cond_0
@@ -634,8 +631,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/loader/content/Loader;->mListener:Landroidx/loader/content/Loader$OnLoadCompleteListener;
-
     if-ne v0, p1, :cond_0
 
     const/4 p1, 0x0
@@ -684,8 +679,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/loader/content/Loader;->mOnLoadCanceledListener:Landroidx/loader/content/Loader$OnLoadCanceledListener;
-
     if-ne v0, p1, :cond_0
 
     const/4 p1, 0x0
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$1.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$1.smali
index b3656b6f3e..8e60d06532 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$1.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/loader/content/ModernAsyncTask$1;
 .super Ljava/lang/Object;
+.source "ModernAsyncTask.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$2.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$2.smali
index 0a774bc134..2b161ccfbc 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$2.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/loader/content/ModernAsyncTask$2;
 .super Landroidx/loader/content/ModernAsyncTask$WorkerRunnable;
+.source "ModernAsyncTask.java"
 
 
 # annotations
@@ -38,7 +39,7 @@
 
 # virtual methods
 .method public call()Ljava/lang/Object;
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TResult;"
@@ -72,51 +73,28 @@
 
     invoke-virtual {v0, v3}, Landroidx/loader/content/ModernAsyncTask;->doInBackground([Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v2
 
-    :try_start_1
     invoke-static {}, Landroid/os/Binder;->flushPendingCommands()V
-    :try_end_1
-    .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v1, p0, Landroidx/loader/content/ModernAsyncTask$2;->this$0:Landroidx/loader/content/ModernAsyncTask;
+    iget-object v0, p0, Landroidx/loader/content/ModernAsyncTask$2;->this$0:Landroidx/loader/content/ModernAsyncTask;
 
-    invoke-virtual {v1, v0}, Landroidx/loader/content/ModernAsyncTask;->postResult(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v2}, Landroidx/loader/content/ModernAsyncTask;->postResult(Ljava/lang/Object;)Ljava/lang/Object;
 
-    return-object v0
+    return-object v2
 
     :catchall_0
-    move-exception v1
-
-    move-object v2, v0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v2
-
-    move-object v4, v2
-
-    move-object v2, v0
-
-    move-object v0, v4
+    move-exception v0
 
     goto :goto_0
 
-    :catchall_1
-    move-exception v1
-
-    goto :goto_1
-
-    :catch_1
+    :catch_0
     move-exception v0
 
-    :goto_0
-    :try_start_2
+    :try_start_1
     iget-object v3, p0, Landroidx/loader/content/ModernAsyncTask$2;->this$0:Landroidx/loader/content/ModernAsyncTask;
 
     iget-object v3, v3, Landroidx/loader/content/ModernAsyncTask;->mCancelled:Ljava/util/concurrent/atomic/AtomicBoolean;
@@ -124,13 +102,13 @@
     invoke-virtual {v3, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
     throw v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :goto_1
-    iget-object v0, p0, Landroidx/loader/content/ModernAsyncTask$2;->this$0:Landroidx/loader/content/ModernAsyncTask;
+    :goto_0
+    iget-object v1, p0, Landroidx/loader/content/ModernAsyncTask$2;->this$0:Landroidx/loader/content/ModernAsyncTask;
 
-    invoke-virtual {v0, v2}, Landroidx/loader/content/ModernAsyncTask;->postResult(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v2}, Landroidx/loader/content/ModernAsyncTask;->postResult(Ljava/lang/Object;)Ljava/lang/Object;
 
-    throw v1
+    throw v0
 .end method
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$3.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$3.smali
index ab31ab0d95..da4f49a310 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$3.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/loader/content/ModernAsyncTask$3;
 .super Ljava/util/concurrent/FutureTask;
+.source "ModernAsyncTask.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$4.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$4.smali
index 9c2ba317b0..4d1f07c3b2 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$4.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$4.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/loader/content/ModernAsyncTask$4;
 .super Ljava/lang/Object;
+.source "ModernAsyncTask.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$AsyncTaskResult.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$AsyncTaskResult.smali
index 603bc3670c..0c469a81f9 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$AsyncTaskResult.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$AsyncTaskResult.smali
@@ -1,5 +1,6 @@
 .class Landroidx/loader/content/ModernAsyncTask$AsyncTaskResult;
 .super Ljava/lang/Object;
+.source "ModernAsyncTask.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$InternalHandler.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$InternalHandler.smali
index a19e34d7b5..7a56042b1a 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$InternalHandler.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$InternalHandler.smali
@@ -1,5 +1,6 @@
 .class Landroidx/loader/content/ModernAsyncTask$InternalHandler;
 .super Landroid/os/Handler;
+.source "ModernAsyncTask.java"
 
 
 # annotations
@@ -61,10 +62,10 @@
 
     invoke-virtual {p1, v0}, Landroidx/loader/content/ModernAsyncTask;->finish(Ljava/lang/Object;)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$Status.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$Status.smali
index b242ae8530..f565d83618 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$Status.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$Status.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/loader/content/ModernAsyncTask$Status;
 .super Ljava/lang/Enum;
+.source "ModernAsyncTask.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask$WorkerRunnable.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask$WorkerRunnable.smali
index d6a889e966..47abe5e04e 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask$WorkerRunnable.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask$WorkerRunnable.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/loader/content/ModernAsyncTask$WorkerRunnable;
 .super Ljava/lang/Object;
+.source "ModernAsyncTask.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/androidx/loader/content/ModernAsyncTask.smali b/com.discord/smali/androidx/loader/content/ModernAsyncTask.smali
index 1f44e2aca3..5c7aabadb6 100644
--- a/com.discord/smali/androidx/loader/content/ModernAsyncTask.smali
+++ b/com.discord/smali/androidx/loader/content/ModernAsyncTask.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/loader/content/ModernAsyncTask;
 .super Ljava/lang/Object;
+.source "ModernAsyncTask.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/localbroadcastmanager/R.smali b/com.discord/smali/androidx/localbroadcastmanager/R.smali
index 67d9a7cfb8..613348b35b 100644
--- a/com.discord/smali/androidx/localbroadcastmanager/R.smali
+++ b/com.discord/smali/androidx/localbroadcastmanager/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/localbroadcastmanager/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$1.smali b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$1.smali
index f1f7ee892e..1b9e54a631 100644
--- a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$1.smali
+++ b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/localbroadcastmanager/content/LocalBroadcastManager$1;
 .super Landroid/os/Handler;
+.source "LocalBroadcastManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$BroadcastRecord.smali b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$BroadcastRecord.smali
index 28fe5b7cd9..b250147b3c 100644
--- a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$BroadcastRecord.smali
+++ b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$BroadcastRecord.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/localbroadcastmanager/content/LocalBroadcastManager$BroadcastRecord;
 .super Ljava/lang/Object;
+.source "LocalBroadcastManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$ReceiverRecord.smali b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$ReceiverRecord.smali
index 19057f34a0..38bbfc6d26 100644
--- a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$ReceiverRecord.smali
+++ b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager$ReceiverRecord.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/localbroadcastmanager/content/LocalBroadcastManager$ReceiverRecord;
 .super Ljava/lang/Object;
+.source "LocalBroadcastManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali
index 80c722d1ec..e5f321fe0b 100644
--- a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali
+++ b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/localbroadcastmanager/content/LocalBroadcastManager;
 .super Ljava/lang/Object;
+.source "LocalBroadcastManager.java"
 
 
 # annotations
@@ -258,6 +259,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method public final registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)V
@@ -354,6 +357,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final sendBroadcast(Landroid/content/Intent;)Z
@@ -532,6 +537,20 @@
 
     invoke-static {v3, v4}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
+    move/from16 v18, v7
+
+    move-object/from16 v19, v8
+
+    move-object/from16 v17, v10
+
+    move-object/from16 v20, v11
+
+    const/4 v11, 0x1
+
+    move-object v10, v6
+
+    goto/16 :goto_4
+
     :cond_4
     move/from16 v18, v7
 
@@ -752,6 +771,10 @@
 
     throw v0
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch -0x4
         :pswitch_3
@@ -915,4 +938,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeContentType.smali b/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeContentType.smali
index 0eea4be4b7..81fafa2338 100644
--- a/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeContentType.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeContentType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/media/AudioAttributesCompat$AttributeContentType;
 .super Ljava/lang/Object;
+.source "AudioAttributesCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeUsage.smali b/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeUsage.smali
index b89cf1141a..1dd5e58c9b 100644
--- a/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeUsage.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesCompat$AttributeUsage.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/media/AudioAttributesCompat$AttributeUsage;
 .super Ljava/lang/Object;
+.source "AudioAttributesCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/media/AudioAttributesCompat$AudioManagerHidden.smali b/com.discord/smali/androidx/media/AudioAttributesCompat$AudioManagerHidden.smali
index f60dad9f72..20594e9dbc 100644
--- a/com.discord/smali/androidx/media/AudioAttributesCompat$AudioManagerHidden.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesCompat$AudioManagerHidden.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/media/AudioAttributesCompat$AudioManagerHidden;
 .super Ljava/lang/Object;
+.source "AudioAttributesCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/AudioAttributesCompat$Builder.smali b/com.discord/smali/androidx/media/AudioAttributesCompat$Builder.smali
index 8eb54db018..bce6668169 100644
--- a/com.discord/smali/androidx/media/AudioAttributesCompat$Builder.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesCompat$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/AudioAttributesCompat$Builder;
 .super Ljava/lang/Object;
+.source "AudioAttributesCompat.java"
 
 
 # annotations
@@ -131,8 +132,6 @@
 
     if-eq v1, v2, :cond_0
 
-    iget v1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mLegacyStream:I
-
     invoke-virtual {v0, v1}, Landroid/media/AudioAttributes$Builder;->setLegacyStreamType(I)Landroid/media/AudioAttributes$Builder;
 
     :cond_0
@@ -239,9 +238,24 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
+    iput v0, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
+
+    goto :goto_1
+
+    :pswitch_1
+    iput v1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
+
+    goto :goto_1
+
+    :pswitch_2
+    iput v1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
+
+    goto :goto_1
+
+    :pswitch_3
     iget v2, p0, Landroidx/media/AudioAttributesCompat$Builder;->mFlags:I
 
     or-int/2addr v0, v2
@@ -250,7 +264,7 @@
 
     goto :goto_0
 
-    :pswitch_1
+    :pswitch_4
     iput v0, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
 
     iget v0, p0, Landroidx/media/AudioAttributesCompat$Builder;->mFlags:I
@@ -259,24 +273,40 @@
 
     iput v0, p0, Landroidx/media/AudioAttributesCompat$Builder;->mFlags:I
 
-    goto :goto_2
+    goto :goto_1
 
-    :pswitch_2
+    :pswitch_5
+    iput v1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
+
+    goto :goto_1
+
+    :pswitch_6
+    iput v1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
+
+    goto :goto_1
+
+    :pswitch_7
     const/4 v0, 0x2
 
+    iput v0, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
+
+    goto :goto_1
+
+    :pswitch_8
+    iput v1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
+
     goto :goto_1
 
     :goto_0
-    :pswitch_3
+    :pswitch_9
     iput v1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
 
-    goto :goto_2
+    goto :goto_1
 
-    :goto_1
-    :pswitch_4
+    :pswitch_a
     iput v0, p0, Landroidx/media/AudioAttributesCompat$Builder;->mContentType:I
 
-    :goto_2
+    :goto_1
     invoke-static {p1}, Landroidx/media/AudioAttributesCompat;->usageForStreamType(I)I
 
     move-result p1
@@ -287,17 +317,17 @@
 
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_a
+        :pswitch_9
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
         :pswitch_4
         :pswitch_3
-        :pswitch_3
         :pswitch_2
-        :pswitch_3
-        :pswitch_3
         :pswitch_1
         :pswitch_0
-        :pswitch_3
-        :pswitch_3
-        :pswitch_4
     .end packed-switch
 .end method
 
@@ -342,13 +372,11 @@
 
     const/4 p1, 0x0
 
-    :goto_0
-    :pswitch_0
     iput p1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mUsage:I
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_1
+    :pswitch_0
     sget-boolean v0, Landroidx/media/AudioAttributesCompat;->sForceLegacyBehavior:Z
 
     if-nez v0, :cond_0
@@ -359,34 +387,41 @@
 
     if-le v0, v1, :cond_0
 
+    iput p1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mUsage:I
+
     goto :goto_0
 
     :cond_0
     const/16 p1, 0xc
 
+    iput p1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mUsage:I
+
     goto :goto_0
 
-    :goto_1
+    :pswitch_1
+    iput p1, p0, Landroidx/media/AudioAttributesCompat$Builder;->mUsage:I
+
+    :goto_0
     return-object p0
 
     :pswitch_data_0
     .packed-switch 0x0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
         :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_0
     .end packed-switch
 .end method
diff --git a/com.discord/smali/androidx/media/AudioAttributesCompat.smali b/com.discord/smali/androidx/media/AudioAttributesCompat.smali
index c362a259bf..0be400be20 100644
--- a/com.discord/smali/androidx/media/AudioAttributesCompat.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/AudioAttributesCompat;
 .super Ljava/lang/Object;
+.source "AudioAttributesCompat.java"
 
 # interfaces
 .implements Landroidx/versionedparcelable/VersionedParcelable;
@@ -682,8 +683,6 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl;
-
     iget-object p1, p1, Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl;
 
     invoke-virtual {v0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/androidx/media/AudioAttributesCompatParcelizer.smali b/com.discord/smali/androidx/media/AudioAttributesCompatParcelizer.smali
index 9ec1cd9018..561998ed9a 100644
--- a/com.discord/smali/androidx/media/AudioAttributesCompatParcelizer.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesCompatParcelizer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/AudioAttributesCompatParcelizer;
 .super Ljava/lang/Object;
+.source "AudioAttributesCompatParcelizer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/AudioAttributesImpl.smali b/com.discord/smali/androidx/media/AudioAttributesImpl.smali
index d766cc1a4e..e19147392b 100644
--- a/com.discord/smali/androidx/media/AudioAttributesImpl.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/media/AudioAttributesImpl;
 .super Ljava/lang/Object;
+.source "AudioAttributesImpl.java"
 
 # interfaces
 .implements Landroidx/versionedparcelable/VersionedParcelable;
diff --git a/com.discord/smali/androidx/media/AudioAttributesImplApi21.smali b/com.discord/smali/androidx/media/AudioAttributesImplApi21.smali
index 86ae836e22..262fdb58f0 100644
--- a/com.discord/smali/androidx/media/AudioAttributesImplApi21.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesImplApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/AudioAttributesImplApi21;
 .super Ljava/lang/Object;
+.source "AudioAttributesImplApi21.java"
 
 # interfaces
 .implements Landroidx/media/AudioAttributesImpl;
@@ -209,8 +210,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I
-
     return v0
 
     :cond_0
@@ -381,11 +380,9 @@
 
     if-eq v1, v2, :cond_0
 
-    const-string v1, "androidx.media.audio_attrs.LEGACY_STREAM_TYPE"
+    const-string v2, "androidx.media.audio_attrs.LEGACY_STREAM_TYPE"
 
-    iget v2, p0, Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_0
     return-object v0
diff --git a/com.discord/smali/androidx/media/AudioAttributesImplApi21Parcelizer.smali b/com.discord/smali/androidx/media/AudioAttributesImplApi21Parcelizer.smali
index 1c40654cab..4299e1af7c 100644
--- a/com.discord/smali/androidx/media/AudioAttributesImplApi21Parcelizer.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesImplApi21Parcelizer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/AudioAttributesImplApi21Parcelizer;
 .super Ljava/lang/Object;
+.source "AudioAttributesImplApi21Parcelizer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/AudioAttributesImplBase.smali b/com.discord/smali/androidx/media/AudioAttributesImplBase.smali
index eadccc9f8b..9d1d95a0b8 100644
--- a/com.discord/smali/androidx/media/AudioAttributesImplBase.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesImplBase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/AudioAttributesImplBase;
 .super Ljava/lang/Object;
+.source "AudioAttributesImplBase.java"
 
 # interfaces
 .implements Landroidx/media/AudioAttributesImpl;
@@ -219,8 +220,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I
-
     return v0
 
     :cond_0
@@ -356,11 +355,9 @@
 
     if-eq v1, v2, :cond_0
 
-    const-string v1, "androidx.media.audio_attrs.LEGACY_STREAM_TYPE"
+    const-string v2, "androidx.media.audio_attrs.LEGACY_STREAM_TYPE"
 
-    iget v2, p0, Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_0
     return-object v0
diff --git a/com.discord/smali/androidx/media/AudioAttributesImplBaseParcelizer.smali b/com.discord/smali/androidx/media/AudioAttributesImplBaseParcelizer.smali
index 252b5e72da..e48d68ca07 100644
--- a/com.discord/smali/androidx/media/AudioAttributesImplBaseParcelizer.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesImplBaseParcelizer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/AudioAttributesImplBaseParcelizer;
 .super Ljava/lang/Object;
+.source "AudioAttributesImplBaseParcelizer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserCompatUtils.smali b/com.discord/smali/androidx/media/MediaBrowserCompatUtils.smali
index 2b45c86e8b..54710b4739 100644
--- a/com.discord/smali/androidx/media/MediaBrowserCompatUtils.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserCompatUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/MediaBrowserCompatUtils;
 .super Ljava/lang/Object;
+.source "MediaBrowserCompatUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserProtocol.smali b/com.discord/smali/androidx/media/MediaBrowserProtocol.smali
index 8bff5a7163..e68dd10ccb 100644
--- a/com.discord/smali/androidx/media/MediaBrowserProtocol.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserProtocol.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/MediaBrowserProtocol;
 .super Ljava/lang/Object;
+.source "MediaBrowserProtocol.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$1.smali
index c4df4fb949..e58f9bdb84 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$1;
 .super Landroidx/media/MediaBrowserServiceCompat$Result;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$2.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$2.smali
index 4be13dfed3..99e4b27de4 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$2.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$2;
 .super Landroidx/media/MediaBrowserServiceCompat$Result;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$3.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$3.smali
index 34361d63ca..bf73f04657 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$3.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$3;
 .super Landroidx/media/MediaBrowserServiceCompat$Result;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$4.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$4.smali
index f1bf063c47..0191b086eb 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$4.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$4;
 .super Landroidx/media/MediaBrowserServiceCompat$Result;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$BrowserRoot.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$BrowserRoot.smali
index afc31d3df3..d3b84e5bac 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$BrowserRoot.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$BrowserRoot.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/MediaBrowserServiceCompat$BrowserRoot;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord$1.smali
index 1e34e67dc8..cda33aa9aa 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord$1;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord.smali
index c2c25e1ca3..5aadee454c 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ConnectionRecord.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Landroid/os/IBinder$DeathRecipient;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl.smali
index b89ed8f967..135d37fd22 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali
index 9b70e79204..549d741361 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$2.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$2.smali
index 505f80340a..6c976ad8ec 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$2.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$2;
 .super Landroidx/media/MediaBrowserServiceCompat$Result;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$3.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$3.smali
index 81cca4015a..68d3425063 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$3.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$3;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$4.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$4.smali
index c56c27f48a..55d0aae783 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$4.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$4;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali
index ccbb71e56b..8acf1eea4a 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
@@ -373,27 +374,27 @@
     move-object v1, v0
 
     :goto_1
-    iget-object v2, p0, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21;->this$0:Landroidx/media/MediaBrowserServiceCompat;
+    iget-object v9, p0, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21;->this$0:Landroidx/media/MediaBrowserServiceCompat;
 
     new-instance v10, Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;
 
-    iget-object v4, p0, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21;->this$0:Landroidx/media/MediaBrowserServiceCompat;
+    const/4 v5, -0x1
 
-    const/4 v6, -0x1
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    move-object v2, v10
 
-    move-object v3, v10
+    move-object v3, v9
 
-    move-object v5, p1
+    move-object v4, p1
 
-    move v7, p2
+    move v6, p2
 
-    move-object v8, p3
+    move-object v7, p3
 
-    invoke-direct/range {v3 .. v9}, Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;-><init>(Landroidx/media/MediaBrowserServiceCompat;Ljava/lang/String;IILandroid/os/Bundle;Landroidx/media/MediaBrowserServiceCompat$ServiceCallbacks;)V
+    invoke-direct/range {v2 .. v8}, Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;-><init>(Landroidx/media/MediaBrowserServiceCompat;Ljava/lang/String;IILandroid/os/Bundle;Landroidx/media/MediaBrowserServiceCompat$ServiceCallbacks;)V
 
-    iput-object v10, v2, Landroidx/media/MediaBrowserServiceCompat;->mCurConnection:Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;
+    iput-object v10, v9, Landroidx/media/MediaBrowserServiceCompat;->mCurConnection:Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;
 
     iget-object v2, p0, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21;->this$0:Landroidx/media/MediaBrowserServiceCompat;
 
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23$1.smali
index 47fbbeb28d..51cce17999 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23$1;
 .super Landroidx/media/MediaBrowserServiceCompat$Result;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
@@ -61,7 +62,6 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroidx/media/MediaBrowserServiceCompatApi21$ResultWrapper;->sendResult(Ljava/lang/Object;)V
 
     return-void
@@ -77,7 +77,9 @@
 
     iget-object p1, p0, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23$1;->val$resultWrapper:Landroidx/media/MediaBrowserServiceCompatApi21$ResultWrapper;
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroidx/media/MediaBrowserServiceCompatApi21$ResultWrapper;->sendResult(Ljava/lang/Object;)V
+
+    return-void
 .end method
 
 .method bridge synthetic onResultSent(Ljava/lang/Object;)V
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23.smali
index 8f10d1aae7..751fbea562 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23;
 .super Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Landroidx/media/MediaBrowserServiceCompatApi23$ServiceCompatProxy;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26$1.smali
index 73d4dbf509..c9102775ec 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26$1;
 .super Landroidx/media/MediaBrowserServiceCompat$Result;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26.smali
index 3052358363..0222a89ff3 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26;
 .super Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Landroidx/media/MediaBrowserServiceCompatApi26$ServiceCompatProxy;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi28.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi28.smali
index 4efbaa455a..7bef55c812 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi28.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi28.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi28;
 .super Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$1.smali
index 87e4119970..f1fe13a130 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$1;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$2.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$2.smali
index d9219e6f0b..11a4967d3d 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$2.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$2;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$3.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$3.smali
index 601b430a61..a9b701340f 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$3.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase$3;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase.smali
index e2cc3e8eba..4e60c7bd35 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$Result.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$Result.smali
index 2586847e97..77e375d90f 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$Result.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$Result.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/MediaBrowserServiceCompat$Result;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$1.smali
index 1544b03997..af982c598f 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$1;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$2.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$2.smali
index 5a82b33bb3..d18aaa8ca0 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$2.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$2;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$3.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$3.smali
index 9fc5c52013..1802a8bed1 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$3.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$3;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$4.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$4.smali
index e7f28043ea..5295b40232 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$4.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$4;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$5.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$5.smali
index 6950ee8d78..598cd36245 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$5.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$5;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$6.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$6.smali
index 61339ccd6d..8392ab3f07 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$6.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$6;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$7.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$7.smali
index 140e0a7f5d..6070e8e00c 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$7.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$7;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$8.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$8.smali
index 59e491cebd..e28cdad053 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$8.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$8.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$8;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$9.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$9.smali
index a18d4869ca..3974dde3ab 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$9.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$9.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl$9;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl.smali
index 6b43147911..0d3962bf67 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceBinderImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceBinderImpl;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
@@ -161,6 +162,8 @@
 
     invoke-virtual {v0, v1}, Landroidx/media/MediaBrowserServiceCompat$ServiceHandler;->postOrRun(Ljava/lang/Runnable;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -248,6 +251,8 @@
 
     invoke-virtual {v0, v7}, Landroidx/media/MediaBrowserServiceCompat$ServiceHandler;->postOrRun(Ljava/lang/Runnable;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -289,6 +294,8 @@
 
     invoke-virtual {v0, v7}, Landroidx/media/MediaBrowserServiceCompat$ServiceHandler;->postOrRun(Ljava/lang/Runnable;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacks.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacks.smali
index 418f4ebed5..2b23edff38 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacks.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacks.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/media/MediaBrowserServiceCompat$ServiceCallbacks;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacksCompat.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacksCompat.smali
index 684560ad40..c7e284208a 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacksCompat.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceCallbacksCompat.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompat$ServiceCallbacksCompat;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompat.java"
 
 # interfaces
 .implements Landroidx/media/MediaBrowserServiceCompat$ServiceCallbacks;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceHandler.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceHandler.smali
index f833f23e4e..f6f22a9fd5 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceHandler.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$ServiceHandler.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/media/MediaBrowserServiceCompat$ServiceHandler;
 .super Landroid/os/Handler;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat.smali
index ab2235878f..14b74a8f47 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/media/MediaBrowserServiceCompat;
 .super Landroid/app/Service;
+.source "MediaBrowserServiceCompat.java"
 
 
 # annotations
@@ -555,10 +556,9 @@
 
     invoke-direct {v0, p0}, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi28;-><init>(Landroidx/media/MediaBrowserServiceCompat;)V
 
-    :goto_0
     iput-object v0, p0, Landroidx/media/MediaBrowserServiceCompat;->mImpl:Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -571,6 +571,8 @@
 
     invoke-direct {v0, p0}, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi26;-><init>(Landroidx/media/MediaBrowserServiceCompat;)V
 
+    iput-object v0, p0, Landroidx/media/MediaBrowserServiceCompat;->mImpl:Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
+
     goto :goto_0
 
     :cond_1
@@ -584,6 +586,8 @@
 
     invoke-direct {v0, p0}, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi23;-><init>(Landroidx/media/MediaBrowserServiceCompat;)V
 
+    iput-object v0, p0, Landroidx/media/MediaBrowserServiceCompat;->mImpl:Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
+
     goto :goto_0
 
     :cond_2
@@ -597,6 +601,8 @@
 
     invoke-direct {v0, p0}, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21;-><init>(Landroidx/media/MediaBrowserServiceCompat;)V
 
+    iput-object v0, p0, Landroidx/media/MediaBrowserServiceCompat;->mImpl:Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
+
     goto :goto_0
 
     :cond_3
@@ -604,9 +610,9 @@
 
     invoke-direct {v0, p0}, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplBase;-><init>(Landroidx/media/MediaBrowserServiceCompat;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/media/MediaBrowserServiceCompat;->mImpl:Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Landroidx/media/MediaBrowserServiceCompat;->mImpl:Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;
 
     invoke-interface {v0}, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImpl;->onCreate()V
@@ -1034,11 +1040,6 @@
 
     return v0
 
-    :catchall_0
-    move-exception p3
-
-    goto :goto_2
-
     :cond_1
     :try_start_1
     iget-object v3, p2, Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;->subscriptions:Ljava/util/HashMap;
@@ -1101,7 +1102,9 @@
 
     return v1
 
-    :goto_2
+    :catchall_0
+    move-exception p3
+
     iput-object p2, p0, Landroidx/media/MediaBrowserServiceCompat;->mCurConnection:Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;
 
     invoke-virtual {p0, p1}, Landroidx/media/MediaBrowserServiceCompat;->onUnsubscribe(Ljava/lang/String;)V
@@ -1109,6 +1112,8 @@
     iput-object v2, p0, Landroidx/media/MediaBrowserServiceCompat;->mCurConnection:Landroidx/media/MediaBrowserServiceCompat$ConnectionRecord;
 
     throw p3
+
+    return-void
 .end method
 
 .method public setSessionToken(Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$BrowserRoot.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$BrowserRoot.smali
index 598e4b056a..bf5da705a0 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$BrowserRoot.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$BrowserRoot.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi21$BrowserRoot;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$MediaBrowserServiceAdaptor.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$MediaBrowserServiceAdaptor.smali
index 294f767899..32b35cda1b 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$MediaBrowserServiceAdaptor.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$MediaBrowserServiceAdaptor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi21$MediaBrowserServiceAdaptor;
 .super Landroid/service/media/MediaBrowserService;
+.source "MediaBrowserServiceCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ResultWrapper.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ResultWrapper.smali
index d0b6d9c834..c12b05606d 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ResultWrapper.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ResultWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi21$ResultWrapper;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ServiceCompatProxy.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ServiceCompatProxy.smali
index 84a5f8d391..34a120ec3f 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ServiceCompatProxy.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21$ServiceCompatProxy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/media/MediaBrowserServiceCompatApi21$ServiceCompatProxy;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21.smali
index ca77715a41..b31217bb3d 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi21;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$MediaBrowserServiceAdaptor.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$MediaBrowserServiceAdaptor.smali
index a573bbc0ef..8c84732492 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$MediaBrowserServiceAdaptor.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$MediaBrowserServiceAdaptor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi23$MediaBrowserServiceAdaptor;
 .super Landroidx/media/MediaBrowserServiceCompatApi21$MediaBrowserServiceAdaptor;
+.source "MediaBrowserServiceCompatApi23.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$ServiceCompatProxy.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$ServiceCompatProxy.smali
index f3f0739e2a..cf672a0cad 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$ServiceCompatProxy.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23$ServiceCompatProxy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/media/MediaBrowserServiceCompatApi23$ServiceCompatProxy;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi23.java"
 
 # interfaces
 .implements Landroidx/media/MediaBrowserServiceCompatApi21$ServiceCompatProxy;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23.smali
index bd6c40ad5c..5fe3a463db 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi23.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi23;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi23.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$MediaBrowserServiceAdaptor.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$MediaBrowserServiceAdaptor.smali
index c9e5356174..7cbd4f5abe 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$MediaBrowserServiceAdaptor.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$MediaBrowserServiceAdaptor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi26$MediaBrowserServiceAdaptor;
 .super Landroidx/media/MediaBrowserServiceCompatApi23$MediaBrowserServiceAdaptor;
+.source "MediaBrowserServiceCompatApi26.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ResultWrapper.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ResultWrapper.smali
index 2186eaeef0..b92f15b1a8 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ResultWrapper.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ResultWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi26$ResultWrapper;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi26.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ServiceCompatProxy.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ServiceCompatProxy.smali
index 299137bca1..3fc484cdef 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ServiceCompatProxy.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26$ServiceCompatProxy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/media/MediaBrowserServiceCompatApi26$ServiceCompatProxy;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi26.java"
 
 # interfaces
 .implements Landroidx/media/MediaBrowserServiceCompatApi23$ServiceCompatProxy;
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26.smali
index 00d77f64d8..9dc46db51d 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompatApi26.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaBrowserServiceCompatApi26;
 .super Ljava/lang/Object;
+.source "MediaBrowserServiceCompatApi26.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaSessionManager$MediaSessionManagerImpl.smali b/com.discord/smali/androidx/media/MediaSessionManager$MediaSessionManagerImpl.smali
index 4a58be3bcc..1e0fb38055 100644
--- a/com.discord/smali/androidx/media/MediaSessionManager$MediaSessionManagerImpl.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManager$MediaSessionManagerImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/media/MediaSessionManager$MediaSessionManagerImpl;
 .super Ljava/lang/Object;
+.source "MediaSessionManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfo.smali b/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfo.smali
index 537de2fa5e..bc1379dc67 100644
--- a/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfo.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfo.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/MediaSessionManager$RemoteUserInfo;
 .super Ljava/lang/Object;
+.source "MediaSessionManager.java"
 
 
 # annotations
@@ -64,7 +65,6 @@
 
     invoke-direct {v0, p1, p2, p3}, Landroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28;-><init>(Ljava/lang/String;II)V
 
-    :goto_0
     iput-object v0, p0, Landroidx/media/MediaSessionManager$RemoteUserInfo;->mImpl:Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;
 
     return-void
@@ -74,7 +74,9 @@
 
     invoke-direct {v0, p1, p2, p3}, Landroidx/media/MediaSessionManagerImplBase$RemoteUserInfoImplBase;-><init>(Ljava/lang/String;II)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/media/MediaSessionManager$RemoteUserInfo;->mImpl:Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfoImpl.smali b/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfoImpl.smali
index c4098aa3d8..d120770c27 100644
--- a/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfoImpl.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManager$RemoteUserInfoImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;
 .super Ljava/lang/Object;
+.source "MediaSessionManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaSessionManager.smali b/com.discord/smali/androidx/media/MediaSessionManager.smali
index 65fd4a02cc..ca734c6ae0 100644
--- a/com.discord/smali/androidx/media/MediaSessionManager.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManager.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/MediaSessionManager;
 .super Ljava/lang/Object;
+.source "MediaSessionManager.java"
 
 
 # annotations
@@ -64,7 +65,6 @@
 
     invoke-direct {v0, p1}, Landroidx/media/MediaSessionManagerImplApi28;-><init>(Landroid/content/Context;)V
 
-    :goto_0
     iput-object v0, p0, Landroidx/media/MediaSessionManager;->mImpl:Landroidx/media/MediaSessionManager$MediaSessionManagerImpl;
 
     return-void
@@ -80,14 +80,18 @@
 
     invoke-direct {v0, p1}, Landroidx/media/MediaSessionManagerImplApi21;-><init>(Landroid/content/Context;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/media/MediaSessionManager;->mImpl:Landroidx/media/MediaSessionManager$MediaSessionManagerImpl;
+
+    return-void
 
     :cond_1
     new-instance v0, Landroidx/media/MediaSessionManagerImplBase;
 
     invoke-direct {v0, p1}, Landroidx/media/MediaSessionManagerImplBase;-><init>(Landroid/content/Context;)V
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/media/MediaSessionManager;->mImpl:Landroidx/media/MediaSessionManager$MediaSessionManagerImpl;
+
+    return-void
 .end method
 
 .method public static getSessionManager(Landroid/content/Context;)Landroidx/media/MediaSessionManager;
diff --git a/com.discord/smali/androidx/media/MediaSessionManagerImplApi21.smali b/com.discord/smali/androidx/media/MediaSessionManagerImplApi21.smali
index c568af5329..9e663a2d57 100644
--- a/com.discord/smali/androidx/media/MediaSessionManagerImplApi21.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManagerImplApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaSessionManagerImplApi21;
 .super Landroidx/media/MediaSessionManagerImplBase;
+.source "MediaSessionManagerImplApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28.smali b/com.discord/smali/androidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28.smali
index 9f10c2eb93..422133d422 100644
--- a/com.discord/smali/androidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28;
 .super Ljava/lang/Object;
+.source "MediaSessionManagerImplApi28.java"
 
 # interfaces
 .implements Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;
diff --git a/com.discord/smali/androidx/media/MediaSessionManagerImplApi28.smali b/com.discord/smali/androidx/media/MediaSessionManagerImplApi28.smali
index f2b382c22b..22d20e39f7 100644
--- a/com.discord/smali/androidx/media/MediaSessionManagerImplApi28.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManagerImplApi28.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaSessionManagerImplApi28;
 .super Landroidx/media/MediaSessionManagerImplApi21;
+.source "MediaSessionManagerImplApi28.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/MediaSessionManagerImplBase$RemoteUserInfoImplBase.smali b/com.discord/smali/androidx/media/MediaSessionManagerImplBase$RemoteUserInfoImplBase.smali
index 591ff2c18f..ee1136ebb2 100644
--- a/com.discord/smali/androidx/media/MediaSessionManagerImplBase$RemoteUserInfoImplBase.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManagerImplBase$RemoteUserInfoImplBase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaSessionManagerImplBase$RemoteUserInfoImplBase;
 .super Ljava/lang/Object;
+.source "MediaSessionManagerImplBase.java"
 
 # interfaces
 .implements Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;
diff --git a/com.discord/smali/androidx/media/MediaSessionManagerImplBase.smali b/com.discord/smali/androidx/media/MediaSessionManagerImplBase.smali
index ff743704d8..3598551add 100644
--- a/com.discord/smali/androidx/media/MediaSessionManagerImplBase.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManagerImplBase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/MediaSessionManagerImplBase;
 .super Ljava/lang/Object;
+.source "MediaSessionManagerImplBase.java"
 
 # interfaces
 .implements Landroidx/media/MediaSessionManager$MediaSessionManagerImpl;
@@ -67,9 +68,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-gez v0, :cond_1
 
@@ -89,10 +90,10 @@
 
     if-nez p1, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     iget-object v0, p0, Landroidx/media/MediaSessionManagerImplBase;->mContext:Landroid/content/Context;
@@ -111,10 +112,10 @@
 
     if-nez p1, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 
diff --git a/com.discord/smali/androidx/media/R$attr.smali b/com.discord/smali/androidx/media/R$attr.smali
index 1694f4b73c..37d2ca72bf 100644
--- a/com.discord/smali/androidx/media/R$attr.smali
+++ b/com.discord/smali/androidx/media/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$color.smali b/com.discord/smali/androidx/media/R$color.smali
index d7ed2782ea..127f353f91 100644
--- a/com.discord/smali/androidx/media/R$color.smali
+++ b/com.discord/smali/androidx/media/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$dimen.smali b/com.discord/smali/androidx/media/R$dimen.smali
index 9454688c84..ce3d5e62a6 100644
--- a/com.discord/smali/androidx/media/R$dimen.smali
+++ b/com.discord/smali/androidx/media/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index f60035e3bb..5692b11d49 100644
--- a/com.discord/smali/androidx/media/R$drawable.smali
+++ b/com.discord/smali/androidx/media/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$id.smali b/com.discord/smali/androidx/media/R$id.smali
index d42f3157ae..f0ea9a0b3b 100644
--- a/com.discord/smali/androidx/media/R$id.smali
+++ b/com.discord/smali/androidx/media/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$integer.smali b/com.discord/smali/androidx/media/R$integer.smali
index bd45cada20..596834816e 100644
--- a/com.discord/smali/androidx/media/R$integer.smali
+++ b/com.discord/smali/androidx/media/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$layout.smali b/com.discord/smali/androidx/media/R$layout.smali
index 4600242010..1a8fc318ef 100644
--- a/com.discord/smali/androidx/media/R$layout.smali
+++ b/com.discord/smali/androidx/media/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index b63afce7b1..eb2b72df06 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$style.smali b/com.discord/smali/androidx/media/R$style.smali
index 1226590d4d..6bbde4ea18 100644
--- a/com.discord/smali/androidx/media/R$style.smali
+++ b/com.discord/smali/androidx/media/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R$styleable.smali b/com.discord/smali/androidx/media/R$styleable.smali
index 6dbbb69a3d..74188faf1c 100644
--- a/com.discord/smali/androidx/media/R$styleable.smali
+++ b/com.discord/smali/androidx/media/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/R.smali b/com.discord/smali/androidx/media/R.smali
index 99f452f1c3..b03ca623c1 100644
--- a/com.discord/smali/androidx/media/R.smali
+++ b/com.discord/smali/androidx/media/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/media/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/VolumeProviderCompat$1.smali b/com.discord/smali/androidx/media/VolumeProviderCompat$1.smali
index 0f4b159cde..d9c4185725 100644
--- a/com.discord/smali/androidx/media/VolumeProviderCompat$1.smali
+++ b/com.discord/smali/androidx/media/VolumeProviderCompat$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/VolumeProviderCompat$1;
 .super Ljava/lang/Object;
+.source "VolumeProviderCompat.java"
 
 # interfaces
 .implements Landroidx/media/VolumeProviderCompatApi21$Delegate;
diff --git a/com.discord/smali/androidx/media/VolumeProviderCompat$Callback.smali b/com.discord/smali/androidx/media/VolumeProviderCompat$Callback.smali
index 313721b580..6dbcb9e17e 100644
--- a/com.discord/smali/androidx/media/VolumeProviderCompat$Callback.smali
+++ b/com.discord/smali/androidx/media/VolumeProviderCompat$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/media/VolumeProviderCompat$Callback;
 .super Ljava/lang/Object;
+.source "VolumeProviderCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/VolumeProviderCompat$ControlType.smali b/com.discord/smali/androidx/media/VolumeProviderCompat$ControlType.smali
index 292e18012a..bec4df101d 100644
--- a/com.discord/smali/androidx/media/VolumeProviderCompat$ControlType.smali
+++ b/com.discord/smali/androidx/media/VolumeProviderCompat$ControlType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/media/VolumeProviderCompat$ControlType;
 .super Ljava/lang/Object;
+.source "VolumeProviderCompat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/media/VolumeProviderCompat.smali b/com.discord/smali/androidx/media/VolumeProviderCompat.smali
index 68021a7373..71d84b5376 100644
--- a/com.discord/smali/androidx/media/VolumeProviderCompat.smali
+++ b/com.discord/smali/androidx/media/VolumeProviderCompat.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/media/VolumeProviderCompat;
 .super Ljava/lang/Object;
+.source "VolumeProviderCompat.java"
 
 
 # annotations
@@ -151,8 +152,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/media/VolumeProviderCompat;->mCallback:Landroidx/media/VolumeProviderCompat$Callback;
-
     invoke-virtual {p1, p0}, Landroidx/media/VolumeProviderCompat$Callback;->onVolumeChanged(Landroidx/media/VolumeProviderCompat;)V
 
     :cond_1
diff --git a/com.discord/smali/androidx/media/VolumeProviderCompatApi21$1.smali b/com.discord/smali/androidx/media/VolumeProviderCompatApi21$1.smali
index 8885427c16..f018630abe 100644
--- a/com.discord/smali/androidx/media/VolumeProviderCompatApi21$1.smali
+++ b/com.discord/smali/androidx/media/VolumeProviderCompatApi21$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/media/VolumeProviderCompatApi21$1;
 .super Landroid/media/VolumeProvider;
+.source "VolumeProviderCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/VolumeProviderCompatApi21$Delegate.smali b/com.discord/smali/androidx/media/VolumeProviderCompatApi21$Delegate.smali
index 63dad2b8ba..95a6ff40db 100644
--- a/com.discord/smali/androidx/media/VolumeProviderCompatApi21$Delegate.smali
+++ b/com.discord/smali/androidx/media/VolumeProviderCompatApi21$Delegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/media/VolumeProviderCompatApi21$Delegate;
 .super Ljava/lang/Object;
+.source "VolumeProviderCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/VolumeProviderCompatApi21.smali b/com.discord/smali/androidx/media/VolumeProviderCompatApi21.smali
index 4d0d44f023..86a703d874 100644
--- a/com.discord/smali/androidx/media/VolumeProviderCompatApi21.smali
+++ b/com.discord/smali/androidx/media/VolumeProviderCompatApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/VolumeProviderCompatApi21;
 .super Ljava/lang/Object;
+.source "VolumeProviderCompatApi21.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/app/NotificationCompat$DecoratedMediaCustomViewStyle.smali b/com.discord/smali/androidx/media/app/NotificationCompat$DecoratedMediaCustomViewStyle.smali
index b23656d28d..3eea86435a 100644
--- a/com.discord/smali/androidx/media/app/NotificationCompat$DecoratedMediaCustomViewStyle.smali
+++ b/com.discord/smali/androidx/media/app/NotificationCompat$DecoratedMediaCustomViewStyle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/app/NotificationCompat$DecoratedMediaCustomViewStyle;
 .super Landroidx/media/app/NotificationCompat$MediaStyle;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -235,9 +236,9 @@
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz p1, :cond_1
 
@@ -255,7 +256,7 @@
 
     if-lt v3, v4, :cond_5
 
-    if-nez p1, :cond_2
+    if-nez p1, :cond_3
 
     iget-object v3, p0, Landroidx/media/app/NotificationCompat$DecoratedMediaCustomViewStyle;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
 
@@ -263,12 +264,15 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_2
+
+    goto :goto_1
 
     :cond_2
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     :cond_3
+    :goto_1
     if-eqz v1, :cond_6
 
     invoke-virtual {p0}, Landroidx/media/app/NotificationCompat$DecoratedMediaCustomViewStyle;->generateContentView()Landroid/widget/RemoteViews;
diff --git a/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali b/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali
index 8f425c9379..19f5531cb9 100644
--- a/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali
+++ b/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/app/NotificationCompat$MediaStyle;
 .super Landroidx/core/app/NotificationCompat$Style;
+.source "NotificationCompat.java"
 
 
 # annotations
@@ -249,8 +250,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/media/app/NotificationCompat$MediaStyle;->mActionsToShowInCompact:[I
-
     invoke-virtual {p1, v0}, Landroid/app/Notification$MediaStyle;->setShowActionsInCompactView([I)Landroid/app/Notification$MediaStyle;
 
     :cond_0
@@ -258,8 +257,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/media/app/NotificationCompat$MediaStyle;->mToken:Landroid/support/v4/media/session/MediaSessionCompat$Token;
-
     iget-object v0, v0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->aF:Ljava/lang/Object;
 
     check-cast v0, Landroid/media/session/MediaSession$Token;
@@ -410,8 +407,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v4, p0, Landroidx/media/app/NotificationCompat$MediaStyle;->mActionsToShowInCompact:[I
-
     array-length v4, v4
 
     const/4 v5, 0x3
diff --git a/com.discord/smali/androidx/media/app/NotificationCompat.smali b/com.discord/smali/androidx/media/app/NotificationCompat.smali
index 7848650d89..ec48a42537 100644
--- a/com.discord/smali/androidx/media/app/NotificationCompat.smali
+++ b/com.discord/smali/androidx/media/app/NotificationCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/app/NotificationCompat;
 .super Ljava/lang/Object;
+.source "NotificationCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali b/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali
index 7efde8ffc6..5a8c6ed97f 100644
--- a/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali
+++ b/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback;
 .super Landroid/support/v4/media/MediaBrowserCompat$b;
+.source "MediaButtonReceiver.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/media/session/MediaButtonReceiver.smali b/com.discord/smali/androidx/media/session/MediaButtonReceiver.smali
index dce000a3d6..2627bf1bb0 100644
--- a/com.discord/smali/androidx/media/session/MediaButtonReceiver.smali
+++ b/com.discord/smali/androidx/media/session/MediaButtonReceiver.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/media/session/MediaButtonReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "MediaButtonReceiver.java"
 
 
 # annotations
@@ -61,7 +62,6 @@
 
     const-string p1, "The component name of media button receiver should be provided."
 
-    :goto_0
     invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return-object v0
@@ -85,7 +85,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v0
 
     :cond_1
     new-instance p2, Landroid/content/Intent;
diff --git a/com.discord/smali/androidx/multidex/BuildConfig.smali b/com.discord/smali/androidx/multidex/BuildConfig.smali
index 9f7b96f793..22ab1cc9e4 100644
--- a/com.discord/smali/androidx/multidex/BuildConfig.smali
+++ b/com.discord/smali/androidx/multidex/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/multidex/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/multidex/MultiDex$V14$ElementConstructor.smali b/com.discord/smali/androidx/multidex/MultiDex$V14$ElementConstructor.smali
index 77163a1cd5..41e2c084ff 100644
--- a/com.discord/smali/androidx/multidex/MultiDex$V14$ElementConstructor.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex$V14$ElementConstructor.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/multidex/MultiDex$V14$ElementConstructor;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/multidex/MultiDex$V14$ICSElementConstructor.smali b/com.discord/smali/androidx/multidex/MultiDex$V14$ICSElementConstructor.smali
index 7511d45820..cd68be3930 100644
--- a/com.discord/smali/androidx/multidex/MultiDex$V14$ICSElementConstructor.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex$V14$ICSElementConstructor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/multidex/MultiDex$V14$ICSElementConstructor;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 # interfaces
 .implements Landroidx/multidex/MultiDex$V14$ElementConstructor;
diff --git a/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR11ElementConstructor.smali b/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR11ElementConstructor.smali
index 4107123f54..94c8703fef 100644
--- a/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR11ElementConstructor.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR11ElementConstructor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/multidex/MultiDex$V14$JBMR11ElementConstructor;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 # interfaces
 .implements Landroidx/multidex/MultiDex$V14$ElementConstructor;
diff --git a/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR2ElementConstructor.smali b/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR2ElementConstructor.smali
index 004fe0578c..421846a373 100644
--- a/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR2ElementConstructor.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex$V14$JBMR2ElementConstructor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/multidex/MultiDex$V14$JBMR2ElementConstructor;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 # interfaces
 .implements Landroidx/multidex/MultiDex$V14$ElementConstructor;
diff --git a/com.discord/smali/androidx/multidex/MultiDex$V14.smali b/com.discord/smali/androidx/multidex/MultiDex$V14.smali
index aefb153f60..8d4fa8ea21 100644
--- a/com.discord/smali/androidx/multidex/MultiDex$V14.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex$V14.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/multidex/MultiDex$V14;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/multidex/MultiDex$V19.smali b/com.discord/smali/androidx/multidex/MultiDex$V19.smali
index 14b2b6848a..b052d4fef8 100644
--- a/com.discord/smali/androidx/multidex/MultiDex$V19.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex$V19.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/multidex/MultiDex$V19;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/multidex/MultiDex$V4.smali b/com.discord/smali/androidx/multidex/MultiDex$V4.smali
index 81c0c8d745..6b18bd0d13 100644
--- a/com.discord/smali/androidx/multidex/MultiDex$V4.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex$V4.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/multidex/MultiDex$V4;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/multidex/MultiDex.smali b/com.discord/smali/androidx/multidex/MultiDex.smali
index 0f45e5fbaf..7e59b8ed69 100644
--- a/com.discord/smali/androidx/multidex/MultiDex.smali
+++ b/com.discord/smali/androidx/multidex/MultiDex.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/multidex/MultiDex;
 .super Ljava/lang/Object;
+.source "MultiDex.java"
 
 
 # annotations
@@ -192,7 +193,6 @@
 
     const-string v0, ")."
 
-    :goto_0
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -208,7 +208,7 @@
 
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     if-ge v2, v1, :cond_2
 
     aget-object v3, p0, v2
@@ -269,7 +269,7 @@
 
     invoke-static {v4, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const-string v4, "MultiDex"
@@ -292,10 +292,10 @@
 
     invoke-static {v4, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    :goto_2
+    :goto_1
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
@@ -316,7 +316,15 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {p0, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
 
     :cond_3
     const-string p0, "MultiDex"
@@ -716,6 +724,8 @@
     invoke-direct {v0, p0}, Ljava/lang/NoSuchFieldException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static varargs findMethod(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
@@ -810,6 +820,8 @@
     invoke-direct {v0, p0}, Ljava/lang/NoSuchMethodException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static getApplicationInfo(Landroid/content/Context;)Landroid/content/pm/ApplicationInfo;
@@ -899,7 +911,6 @@
 
     const-string v0, "VM has multidex support, MultiDex support library is disabled."
 
-    :goto_0
     invoke-static {p0, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
@@ -955,7 +966,9 @@
 
     const-string v0, "install done"
 
-    goto :goto_0
+    invoke-static {p0, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
 
     :catch_0
     move-exception p0
@@ -1035,7 +1048,6 @@
 
     const-string p1, "VM has multidex support, MultiDex support library is disabled."
 
-    :goto_0
     invoke-static {p0, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
@@ -1152,7 +1164,9 @@
 
     const-string p1, "Installation done"
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
 
     :catch_0
     move-exception p0
@@ -1407,12 +1421,11 @@
 
     move-result-object v0
 
-    :goto_0
     const-string v1, "MultiDex"
 
     invoke-static {v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance v1, Ljava/lang/StringBuilder;
@@ -1481,9 +1494,11 @@
 
     move-result-object v0
 
-    goto :goto_0
+    const-string v1, "MultiDex"
 
-    :goto_1
+    invoke-static {v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    :goto_0
     new-instance v0, Ljava/io/IOException;
 
     new-instance v1, Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/androidx/multidex/MultiDexApplication.smali b/com.discord/smali/androidx/multidex/MultiDexApplication.smali
index 5078f3a694..0d08dc7915 100644
--- a/com.discord/smali/androidx/multidex/MultiDexApplication.smali
+++ b/com.discord/smali/androidx/multidex/MultiDexApplication.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/multidex/MultiDexApplication;
 .super Landroid/app/Application;
+.source "MultiDexApplication.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/multidex/MultiDexExtractor$1.smali b/com.discord/smali/androidx/multidex/MultiDexExtractor$1.smali
index 7d29648cbc..b019d63aed 100644
--- a/com.discord/smali/androidx/multidex/MultiDexExtractor$1.smali
+++ b/com.discord/smali/androidx/multidex/MultiDexExtractor$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/multidex/MultiDexExtractor$1;
 .super Ljava/lang/Object;
+.source "MultiDexExtractor.java"
 
 # interfaces
 .implements Ljava/io/FileFilter;
diff --git a/com.discord/smali/androidx/multidex/MultiDexExtractor$ExtractedDex.smali b/com.discord/smali/androidx/multidex/MultiDexExtractor$ExtractedDex.smali
index 36e13c99f8..21490e8a08 100644
--- a/com.discord/smali/androidx/multidex/MultiDexExtractor$ExtractedDex.smali
+++ b/com.discord/smali/androidx/multidex/MultiDexExtractor$ExtractedDex.smali
@@ -1,5 +1,6 @@
 .class Landroidx/multidex/MultiDexExtractor$ExtractedDex;
 .super Ljava/io/File;
+.source "MultiDexExtractor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/multidex/MultiDexExtractor.smali b/com.discord/smali/androidx/multidex/MultiDexExtractor.smali
index fb3f35b2d9..09894ac786 100644
--- a/com.discord/smali/androidx/multidex/MultiDexExtractor.smali
+++ b/com.discord/smali/androidx/multidex/MultiDexExtractor.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/multidex/MultiDexExtractor;
 .super Ljava/lang/Object;
+.source "MultiDexExtractor.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -472,11 +473,11 @@
 
     new-array p1, p1, [B
 
-    :goto_0
     invoke-virtual {p0, p1}, Ljava/io/InputStream;->read([B)I
 
     move-result v1
 
+    :goto_0
     const/4 v2, -0x1
 
     if-eq v1, v2, :cond_0
@@ -485,6 +486,10 @@
 
     invoke-virtual {v0, p1, v2, v1}, Ljava/util/zip/ZipOutputStream;->write([BII)V
 
+    invoke-virtual {p0, p1}, Ljava/io/InputStream;->read([B)I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
@@ -627,6 +632,8 @@
     invoke-virtual {p3}, Ljava/io/File;->delete()Z
 
     throw p1
+
+    return-void
 .end method
 
 .method private static getMultiDexPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
@@ -774,7 +781,7 @@
 .end method
 
 .method private loadExistingExtractions(Landroid/content/Context;Ljava/lang/String;)Ljava/util/List;
-    .locals 17
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -942,23 +949,23 @@
 
     if-nez v7, :cond_0
 
-    move-object v15, v2
+    move-object v7, v2
 
-    move-object/from16 v16, v3
+    move-object/from16 p1, v3
 
     iget-wide v2, v8, Landroidx/multidex/MultiDexExtractor$ExtractedDex;->crc:J
 
-    cmp-long v7, v11, v2
+    cmp-long v15, v11, v2
 
-    if-nez v7, :cond_0
+    if-nez v15, :cond_0
 
     invoke-interface {v5, v8}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     add-int/lit8 v6, v6, 0x1
 
-    move-object v2, v15
+    move-object/from16 v3, p1
 
-    move-object/from16 v3, v16
+    move-object v2, v7
 
     goto :goto_0
 
@@ -1110,11 +1117,11 @@
 
     move-result-object v4
 
-    :goto_0
     invoke-virtual {v2, v4}, Ljava/util/zip/ZipFile;->getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;
 
     move-result-object v4
 
+    :goto_0
     if-eqz v4, :cond_4
 
     new-instance v5, Ljava/lang/StringBuilder;
@@ -1327,6 +1334,10 @@
 
     move-result-object v4
 
+    invoke-virtual {v2, v4}, Ljava/util/zip/ZipFile;->getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;
+
+    move-result-object v4
+
     goto/16 :goto_0
 
     :cond_3
@@ -1405,6 +1416,8 @@
 
     :goto_5
     throw v0
+
+    return-void
 .end method
 
 .method private static putStoredApkInfo(Landroid/content/Context;Ljava/lang/String;JJLjava/util/List;)V
@@ -1661,11 +1674,11 @@
     :try_start_0
     invoke-direct {p0, p1, p2}, Landroidx/multidex/MultiDexExtractor;->loadExistingExtractions(Landroid/content/Context;Ljava/lang/String;)Ljava/util/List;
 
-    move-result-object p3
+    move-result-object p1
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception p3
@@ -1676,7 +1689,7 @@
 
     invoke-static {v0, v1, p3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     if-eqz p3, :cond_1
@@ -1685,19 +1698,18 @@
 
     const-string v0, "Forced extraction must be performed."
 
-    :goto_0
     invoke-static {p3, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string p3, "MultiDex"
 
     const-string v0, "Detected that extraction must be performed."
 
-    goto :goto_0
+    invoke-static {p3, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    :goto_1
+    :goto_0
     invoke-direct {p0}, Landroidx/multidex/MultiDexExtractor;->performExtractions()Ljava/util/List;
 
     move-result-object p3
@@ -1718,32 +1730,34 @@
 
     invoke-static/range {v1 .. v7}, Landroidx/multidex/MultiDexExtractor;->putStoredApkInfo(Landroid/content/Context;Ljava/lang/String;JJLjava/util/List;)V
 
-    :goto_2
-    const-string p1, "MultiDex"
+    move-object p1, p3
 
-    new-instance p2, Ljava/lang/StringBuilder;
+    :goto_1
+    const-string p2, "MultiDex"
+
+    new-instance p3, Ljava/lang/StringBuilder;
 
     const-string v0, "load found "
 
-    invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {p3}, Ljava/util/List;->size()I
+    invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result v0
 
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string v0, " secondary dex files"
 
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object p2
+    move-result-object p3
 
-    invoke-static {p1, p2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+    invoke-static {p2, p3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    return-object p3
+    return-object p1
 
     :cond_2
     new-instance p1, Ljava/lang/IllegalStateException;
diff --git a/com.discord/smali/androidx/multidex/R.smali b/com.discord/smali/androidx/multidex/R.smali
index 90b88fcde3..5a36705f40 100644
--- a/com.discord/smali/androidx/multidex/R.smali
+++ b/com.discord/smali/androidx/multidex/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/multidex/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/multidex/ZipUtil$CentralDirectory.smali b/com.discord/smali/androidx/multidex/ZipUtil$CentralDirectory.smali
index 5d5f784fe8..e14b5a64d2 100644
--- a/com.discord/smali/androidx/multidex/ZipUtil$CentralDirectory.smali
+++ b/com.discord/smali/androidx/multidex/ZipUtil$CentralDirectory.smali
@@ -1,5 +1,6 @@
 .class Landroidx/multidex/ZipUtil$CentralDirectory;
 .super Ljava/lang/Object;
+.source "ZipUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/multidex/ZipUtil.smali b/com.discord/smali/androidx/multidex/ZipUtil.smali
index 4298e5a699..cf7d765c73 100644
--- a/com.discord/smali/androidx/multidex/ZipUtil.smali
+++ b/com.discord/smali/androidx/multidex/ZipUtil.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/multidex/ZipUtil;
 .super Ljava/lang/Object;
+.source "ZipUtil.java"
 
 
 # annotations
@@ -59,11 +60,11 @@
 
     const/4 v6, 0x0
 
-    :goto_0
     invoke-virtual {p0, v5, v6, p1}, Ljava/io/RandomAccessFile;->read([BII)I
 
     move-result p1
 
+    :goto_0
     const/4 v7, -0x1
 
     if-eq p1, v7, :cond_0
@@ -86,6 +87,10 @@
 
     long-to-int p1, v7
 
+    invoke-virtual {p0, v5, v6, p1}, Ljava/io/RandomAccessFile;->read([BII)I
+
+    move-result p1
+
     goto :goto_0
 
     :cond_0
@@ -236,6 +241,8 @@
     invoke-direct {v0, p0}, Ljava/util/zip/ZipException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method static getZipCrc(Ljava/io/File;)J
diff --git a/com.discord/smali/androidx/print/PrintHelper$1.smali b/com.discord/smali/androidx/print/PrintHelper$1.smali
index e436121956..27d073baef 100644
--- a/com.discord/smali/androidx/print/PrintHelper$1.smali
+++ b/com.discord/smali/androidx/print/PrintHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/print/PrintHelper$1;
 .super Landroid/os/AsyncTask;
+.source "PrintHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/print/PrintHelper$OnPrintFinishCallback.smali b/com.discord/smali/androidx/print/PrintHelper$OnPrintFinishCallback.smali
index fb074d4412..ecf5c9f73e 100644
--- a/com.discord/smali/androidx/print/PrintHelper$OnPrintFinishCallback.smali
+++ b/com.discord/smali/androidx/print/PrintHelper$OnPrintFinishCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/print/PrintHelper$OnPrintFinishCallback;
 .super Ljava/lang/Object;
+.source "PrintHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/print/PrintHelper$PrintBitmapAdapter.smali b/com.discord/smali/androidx/print/PrintHelper$PrintBitmapAdapter.smali
index 343bafa47f..39dd68f51c 100644
--- a/com.discord/smali/androidx/print/PrintHelper$PrintBitmapAdapter.smali
+++ b/com.discord/smali/androidx/print/PrintHelper$PrintBitmapAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/print/PrintHelper$PrintBitmapAdapter;
 .super Landroid/print/PrintDocumentAdapter;
+.source "PrintHelper.java"
 
 
 # annotations
@@ -59,8 +60,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/print/PrintHelper$PrintBitmapAdapter;->mCallback:Landroidx/print/PrintHelper$OnPrintFinishCallback;
-
     invoke-interface {v0}, Landroidx/print/PrintHelper$OnPrintFinishCallback;->onFinish()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1$1.smali b/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1$1.smali
index 220db5c9a4..11f7816be8 100644
--- a/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1$1.smali
+++ b/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/print/PrintHelper$PrintUriAdapter$1$1;
 .super Ljava/lang/Object;
+.source "PrintHelper.java"
 
 # interfaces
 .implements Landroid/os/CancellationSignal$OnCancelListener;
diff --git a/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1.smali b/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1.smali
index 6cc11f21fe..825bc3190b 100644
--- a/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1.smali
+++ b/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/print/PrintHelper$PrintUriAdapter$1;
 .super Landroid/os/AsyncTask;
+.source "PrintHelper.java"
 
 
 # annotations
@@ -213,25 +214,23 @@
 
     iput-object p1, v0, Landroidx/print/PrintHelper$PrintUriAdapter;->mBitmap:Landroid/graphics/Bitmap;
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_2
 
     new-instance p1, Landroid/print/PrintDocumentInfo$Builder;
 
-    iget-object v1, p0, Landroidx/print/PrintHelper$PrintUriAdapter$1;->this$1:Landroidx/print/PrintHelper$PrintUriAdapter;
+    iget-object v0, v0, Landroidx/print/PrintHelper$PrintUriAdapter;->mJobName:Ljava/lang/String;
 
-    iget-object v1, v1, Landroidx/print/PrintHelper$PrintUriAdapter;->mJobName:Ljava/lang/String;
+    invoke-direct {p1, v0}, Landroid/print/PrintDocumentInfo$Builder;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {p1, v1}, Landroid/print/PrintDocumentInfo$Builder;-><init>(Ljava/lang/String;)V
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
-
-    invoke-virtual {p1, v1}, Landroid/print/PrintDocumentInfo$Builder;->setContentType(I)Landroid/print/PrintDocumentInfo$Builder;
+    invoke-virtual {p1, v0}, Landroid/print/PrintDocumentInfo$Builder;->setContentType(I)Landroid/print/PrintDocumentInfo$Builder;
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Landroid/print/PrintDocumentInfo$Builder;->setPageCount(I)Landroid/print/PrintDocumentInfo$Builder;
+    invoke-virtual {p1, v0}, Landroid/print/PrintDocumentInfo$Builder;->setPageCount(I)Landroid/print/PrintDocumentInfo$Builder;
 
     move-result-object p1
 
@@ -247,23 +246,23 @@
 
     move-result v2
 
-    xor-int/2addr v1, v2
+    xor-int/2addr v0, v2
 
     iget-object v2, p0, Landroidx/print/PrintHelper$PrintUriAdapter$1;->val$layoutResultCallback:Landroid/print/PrintDocumentAdapter$LayoutResultCallback;
 
-    invoke-virtual {v2, p1, v1}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFinished(Landroid/print/PrintDocumentInfo;Z)V
+    invoke-virtual {v2, p1, v0}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFinished(Landroid/print/PrintDocumentInfo;Z)V
 
     goto :goto_1
 
     :cond_2
     iget-object p1, p0, Landroidx/print/PrintHelper$PrintUriAdapter$1;->val$layoutResultCallback:Landroid/print/PrintDocumentAdapter$LayoutResultCallback;
 
-    invoke-virtual {p1, v0}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFailed(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v1}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFailed(Ljava/lang/CharSequence;)V
 
     :goto_1
     iget-object p1, p0, Landroidx/print/PrintHelper$PrintUriAdapter$1;->this$1:Landroidx/print/PrintHelper$PrintUriAdapter;
 
-    iput-object v0, p1, Landroidx/print/PrintHelper$PrintUriAdapter;->mLoadBitmap:Landroid/os/AsyncTask;
+    iput-object v1, p1, Landroidx/print/PrintHelper$PrintUriAdapter;->mLoadBitmap:Landroid/os/AsyncTask;
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter.smali b/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter.smali
index 0ddad1648e..09663235e1 100644
--- a/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter.smali
+++ b/com.discord/smali/androidx/print/PrintHelper$PrintUriAdapter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/print/PrintHelper$PrintUriAdapter;
 .super Landroid/print/PrintDocumentAdapter;
+.source "PrintHelper.java"
 
 
 # annotations
@@ -131,8 +132,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/print/PrintHelper$PrintUriAdapter;->mLoadBitmap:Landroid/os/AsyncTask;
-
     const/4 v1, 0x1
 
     invoke-virtual {v0, v1}, Landroid/os/AsyncTask;->cancel(Z)Z
@@ -142,8 +141,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/print/PrintHelper$PrintUriAdapter;->mCallback:Landroidx/print/PrintHelper$OnPrintFinishCallback;
-
     invoke-interface {v0}, Landroidx/print/PrintHelper$OnPrintFinishCallback;->onFinish()V
 
     :cond_1
@@ -151,8 +148,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/print/PrintHelper$PrintUriAdapter;->mBitmap:Landroid/graphics/Bitmap;
-
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->recycle()V
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/androidx/print/PrintHelper.smali b/com.discord/smali/androidx/print/PrintHelper.smali
index 6a85b8f568..1f0d371f45 100644
--- a/com.discord/smali/androidx/print/PrintHelper.smali
+++ b/com.discord/smali/androidx/print/PrintHelper.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/print/PrintHelper;
 .super Ljava/lang/Object;
+.source "PrintHelper.java"
 
 
 # annotations
@@ -68,9 +69,9 @@
 
     const/4 v1, 0x0
 
-    const/4 v2, 0x1
+    const/16 v2, 0x17
 
-    const/16 v3, 0x17
+    const/4 v3, 0x1
 
     const/16 v4, 0x14
 
@@ -78,7 +79,7 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-le v0, v3, :cond_0
+    if-le v0, v2, :cond_0
 
     goto :goto_0
 
@@ -96,7 +97,7 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-eq v0, v3, :cond_2
+    if-eq v0, v2, :cond_2
 
     const/4 v1, 0x1
 
@@ -379,23 +380,21 @@
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :try_start_0
-    iget-object v1, p0, Landroidx/print/PrintHelper;->mContext:Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
-    invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+    move-result-object v0
 
-    move-result-object v1
-
-    invoke-virtual {v1, p1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
+    invoke-virtual {v0, p1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
 
     move-result-object p1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-static {p1, v0, p2}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
+    invoke-static {p1, v1, p2}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
     move-result-object p2
     :try_end_1
@@ -426,7 +425,7 @@
     :catchall_0
     move-exception p2
 
-    move-object v0, p1
+    move-object v1, p1
 
     goto :goto_1
 
@@ -434,10 +433,10 @@
     move-exception p2
 
     :goto_1
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
     :try_start_3
-    invoke-virtual {v0}, Ljava/io/InputStream;->close()V
+    invoke-virtual {v1}, Ljava/io/InputStream;->close()V
     :try_end_3
     .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_1
 
@@ -534,11 +533,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_5
 
     iget-object v0, p0, Landroidx/print/PrintHelper;->mContext:Landroid/content/Context;
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     new-instance v0, Landroid/graphics/BitmapFactory$Options;
 
@@ -556,11 +555,11 @@
 
     const/4 v3, 0x0
 
-    if-lez v2, :cond_3
+    if-lez v2, :cond_4
 
     if-gtz v0, :cond_0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_0
     invoke-static {v2, v0}, Ljava/lang/Math;->max(II)I
@@ -687,6 +686,10 @@
     return-object v3
 
     :cond_4
+    :goto_2
+    return-object v3
+
+    :cond_5
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const-string v0, "bad argument to getScaledBitmap"
@@ -694,6 +697,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final printBitmap(Ljava/lang/String;Landroid/graphics/Bitmap;)V
@@ -800,6 +805,8 @@
 
     invoke-virtual {v0, p1, v8, v1}, Landroid/print/PrintManager;->print(Ljava/lang/String;Landroid/print/PrintDocumentAdapter;Landroid/print/PrintAttributes;)Landroid/print/PrintJob;
 
+    return-void
+
     :cond_2
     :goto_1
     return-void
@@ -897,31 +904,29 @@
 
     if-eq v1, v2, :cond_2
 
-    iget v1, p0, Landroidx/print/PrintHelper;->mOrientation:I
-
     if-nez v1, :cond_1
 
     goto :goto_0
 
     :cond_1
-    iget v1, p0, Landroidx/print/PrintHelper;->mOrientation:I
-
     const/4 v2, 0x2
 
     if-ne v1, v2, :cond_3
 
     sget-object v1, Landroid/print/PrintAttributes$MediaSize;->UNKNOWN_PORTRAIT:Landroid/print/PrintAttributes$MediaSize;
 
+    invoke-virtual {p3, v1}, Landroid/print/PrintAttributes$Builder;->setMediaSize(Landroid/print/PrintAttributes$MediaSize;)Landroid/print/PrintAttributes$Builder;
+
     goto :goto_1
 
     :cond_2
     :goto_0
     sget-object v1, Landroid/print/PrintAttributes$MediaSize;->UNKNOWN_LANDSCAPE:Landroid/print/PrintAttributes$MediaSize;
 
-    :goto_1
     invoke-virtual {p3, v1}, Landroid/print/PrintAttributes$Builder;->setMediaSize(Landroid/print/PrintAttributes$MediaSize;)Landroid/print/PrintAttributes$Builder;
 
     :cond_3
+    :goto_1
     invoke-virtual {p3}, Landroid/print/PrintAttributes$Builder;->build()Landroid/print/PrintAttributes;
 
     move-result-object p3
diff --git a/com.discord/smali/androidx/print/R.smali b/com.discord/smali/androidx/print/R.smali
index 26dd9e6239..6e6d9f75bf 100644
--- a/com.discord/smali/androidx/print/R.smali
+++ b/com.discord/smali/androidx/print/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/print/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$attr.smali b/com.discord/smali/androidx/recyclerview/R$attr.smali
index 7b36670dfd..7606e2cbb5 100644
--- a/com.discord/smali/androidx/recyclerview/R$attr.smali
+++ b/com.discord/smali/androidx/recyclerview/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$color.smali b/com.discord/smali/androidx/recyclerview/R$color.smali
index a06613fedd..5f4365c5e8 100644
--- a/com.discord/smali/androidx/recyclerview/R$color.smali
+++ b/com.discord/smali/androidx/recyclerview/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$dimen.smali b/com.discord/smali/androidx/recyclerview/R$dimen.smali
index 4930a60c9a..9c32c384df 100644
--- a/com.discord/smali/androidx/recyclerview/R$dimen.smali
+++ b/com.discord/smali/androidx/recyclerview/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 68f1a10adf..7879085494 100644
--- a/com.discord/smali/androidx/recyclerview/R$drawable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index 969c25202e..04ef5e11d9 100644
--- a/com.discord/smali/androidx/recyclerview/R$id.smali
+++ b/com.discord/smali/androidx/recyclerview/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$integer.smali b/com.discord/smali/androidx/recyclerview/R$integer.smali
index 520ebb6b71..697f937986 100644
--- a/com.discord/smali/androidx/recyclerview/R$integer.smali
+++ b/com.discord/smali/androidx/recyclerview/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$layout.smali b/com.discord/smali/androidx/recyclerview/R$layout.smali
index 7d4faf3369..94d299a0b8 100644
--- a/com.discord/smali/androidx/recyclerview/R$layout.smali
+++ b/com.discord/smali/androidx/recyclerview/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 1174339d34..1bffec4f18 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$style.smali b/com.discord/smali/androidx/recyclerview/R$style.smali
index 2d3d01e1fc..a7282e5c4c 100644
--- a/com.discord/smali/androidx/recyclerview/R$style.smali
+++ b/com.discord/smali/androidx/recyclerview/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R$styleable.smali b/com.discord/smali/androidx/recyclerview/R$styleable.smali
index 322b5ef31a..96812c0344 100644
--- a/com.discord/smali/androidx/recyclerview/R$styleable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/R.smali b/com.discord/smali/androidx/recyclerview/R.smali
index 7a5044d8d6..06d3b9647f 100644
--- a/com.discord/smali/androidx/recyclerview/R.smali
+++ b/com.discord/smali/androidx/recyclerview/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$Callback.smali b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$Callback.smali
index 388daba403..32c277e04d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$Callback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$Callback.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/recyclerview/widget/AdapterHelper$Callback;
 .super Ljava/lang/Object;
+.source "AdapterHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali
index c0e8d8b741..c1e0df892a 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
 .super Ljava/lang/Object;
+.source "AdapterHelper.java"
 
 
 # annotations
@@ -140,8 +141,6 @@
     return v1
 
     :cond_2
-    iget v2, p0, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->cmd:I
-
     const/16 v3, 0x8
 
     if-ne v2, v3, :cond_3
@@ -195,8 +194,6 @@
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
-
     iget-object p1, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
 
     invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper.smali b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper.smali
index b65aa8b711..425d48e9bc 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AdapterHelper;
 .super Ljava/lang/Object;
+.source "AdapterHelper.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/OpReorderer$Callback;
@@ -284,10 +285,12 @@
 
     const/4 v4, -0x1
 
-    move v5, v0
+    move v4, v0
 
     const/4 v0, 0x0
 
+    const/4 v5, -0x1
+
     :goto_0
     const/4 v6, 0x4
 
@@ -312,43 +315,43 @@
     goto :goto_1
 
     :cond_0
-    if-ne v4, v8, :cond_1
+    if-ne v5, v8, :cond_1
 
-    iget-object v4, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
+    iget-object v5, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
 
-    invoke-virtual {p0, v6, v5, v0, v4}, Landroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
+    invoke-virtual {p0, v6, v4, v0, v5}, Landroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
 
     move-result-object v0
 
     invoke-direct {p0, v0}, Landroidx/recyclerview/widget/AdapterHelper;->postponeAndUpdateViewHolders(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
-    move v5, v2
+    move v4, v2
 
     const/4 v0, 0x0
 
     :cond_1
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     goto :goto_2
 
     :cond_2
     :goto_1
-    if-nez v4, :cond_3
+    if-nez v5, :cond_3
 
-    iget-object v4, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
+    iget-object v5, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
 
-    invoke-virtual {p0, v6, v5, v0, v4}, Landroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
+    invoke-virtual {p0, v6, v4, v0, v5}, Landroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
 
     move-result-object v0
 
     invoke-direct {p0, v0}, Landroidx/recyclerview/widget/AdapterHelper;->dispatchAndUpdateViewHolders(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
-    move v5, v2
+    move v4, v2
 
     const/4 v0, 0x0
 
     :cond_3
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
     :goto_2
     add-int/2addr v0, v8
@@ -366,12 +369,12 @@
 
     invoke-virtual {p0, p1}, Landroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOp(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
-    invoke-virtual {p0, v6, v5, v0, v1}, Landroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
+    invoke-virtual {p0, v6, v4, v0, v1}, Landroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
 
     move-result-object p1
 
     :cond_5
-    if-nez v4, :cond_6
+    if-nez v5, :cond_6
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/AdapterHelper;->dispatchAndUpdateViewHolders(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
@@ -474,13 +477,13 @@
 
     const/4 v1, 0x1
 
-    if-eq v0, v1, :cond_9
+    if-eq v0, v1, :cond_a
 
     iget v0, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->cmd:I
 
     const/16 v2, 0x8
 
-    if-eq v0, v2, :cond_9
+    if-eq v0, v2, :cond_a
 
     iget v0, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
@@ -540,7 +543,7 @@
     :goto_1
     iget v9, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
-    if-ge v0, v9, :cond_7
+    if-ge v0, v9, :cond_8
 
     iget v9, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
@@ -558,36 +561,44 @@
 
     if-eq v10, v4, :cond_4
 
-    if-eq v10, v5, :cond_3
+    if-eq v10, v5, :cond_2
 
-    :cond_2
     const/4 v10, 0x0
 
-    goto :goto_3
-
-    :cond_3
-    add-int/lit8 v10, v7, 0x1
-
-    if-ne v9, v10, :cond_2
-
-    :goto_2
-    const/4 v10, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    if-ne v9, v7, :cond_2
-
     goto :goto_2
 
-    :goto_3
-    if-eqz v10, :cond_5
+    :cond_2
+    add-int/lit8 v10, v7, 0x1
+
+    if-ne v9, v10, :cond_3
+
+    const/4 v10, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v10, 0x0
+
+    goto :goto_2
+
+    :cond_4
+    if-ne v9, v7, :cond_5
+
+    const/4 v10, 0x1
+
+    goto :goto_2
+
+    :cond_5
+    const/4 v10, 0x0
+
+    :goto_2
+    if-eqz v10, :cond_6
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
-    :cond_5
+    :cond_6
     iget v10, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->cmd:I
 
     iget-object v11, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
@@ -602,26 +613,26 @@
 
     iget v7, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->cmd:I
 
-    if-ne v7, v5, :cond_6
+    if-ne v7, v5, :cond_7
 
     add-int/2addr v8, v2
 
-    :cond_6
+    :cond_7
     move v7, v9
 
     const/4 v2, 0x1
 
-    :goto_4
+    :goto_3
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_1
 
-    :cond_7
+    :cond_8
     iget-object v0, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->payload:Ljava/lang/Object;
 
     invoke-virtual {p0, p1}, Landroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOp(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
-    if-lez v2, :cond_8
+    if-lez v2, :cond_9
 
     iget p1, p1, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->cmd:I
 
@@ -633,10 +644,10 @@
 
     invoke-virtual {p0, p1}, Landroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOp(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
-    :cond_8
+    :cond_9
     return-void
 
-    :cond_9
+    :cond_a
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const-string v0, "should not dispatch add or move for pre layout"
@@ -644,6 +655,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private postponeAndUpdateViewHolders(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
@@ -800,10 +813,9 @@
 
     add-int/2addr v2, v1
 
-    :goto_2
     iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     if-ne p2, v5, :cond_2
@@ -812,13 +824,13 @@
 
     sub-int/2addr v2, v1
 
-    goto :goto_2
+    iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
     :cond_2
-    :goto_3
+    :goto_2
     add-int/lit8 p1, p1, 0x1
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_3
     if-ne p2, v1, :cond_4
@@ -827,10 +839,9 @@
 
     add-int/2addr v2, v1
 
-    :goto_4
     iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_4
     if-ne p2, v5, :cond_5
@@ -839,13 +850,13 @@
 
     sub-int/2addr v2, v1
 
-    goto :goto_4
+    iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
     :cond_5
-    :goto_5
+    :goto_3
     add-int/lit8 p1, p1, -0x1
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_6
     iget v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
@@ -864,7 +875,9 @@
 
     add-int/2addr v2, v1
 
-    goto :goto_6
+    iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
+
+    goto :goto_4
 
     :cond_7
     if-ne p2, v5, :cond_c
@@ -879,10 +892,9 @@
 
     sub-int/2addr v2, v1
 
-    :goto_6
     iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_8
     iget v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
@@ -897,7 +909,7 @@
 
     sub-int/2addr p1, v2
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_9
     iget v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->cmd:I
@@ -908,7 +920,7 @@
 
     add-int/2addr p1, v2
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_a
     if-ne p2, v1, :cond_b
@@ -917,10 +929,9 @@
 
     add-int/2addr v2, v1
 
-    :goto_7
     iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_b
     if-ne p2, v5, :cond_c
@@ -929,10 +940,10 @@
 
     sub-int/2addr v2, v1
 
-    goto :goto_7
+    iput v2, v3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
     :cond_c
-    :goto_8
+    :goto_4
     add-int/lit8 v0, v0, -0x1
 
     goto/16 :goto_0
@@ -946,7 +957,7 @@
 
     sub-int/2addr p2, v1
 
-    :goto_9
+    :goto_5
     if-ltz p2, :cond_11
 
     iget-object v0, p0, Landroidx/recyclerview/widget/AdapterHelper;->mPostponedList:Ljava/util/ArrayList;
@@ -972,27 +983,30 @@
     if-gez v1, :cond_10
 
     :cond_e
-    :goto_a
     iget-object v1, p0, Landroidx/recyclerview/widget/AdapterHelper;->mPostponedList:Ljava/util/ArrayList;
 
     invoke-virtual {v1, p2}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
 
     invoke-virtual {p0, v0}, Landroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOp(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
-    goto :goto_b
+    goto :goto_6
 
     :cond_f
     iget v1, v0, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
     if-gtz v1, :cond_10
 
-    goto :goto_a
+    iget-object v1, p0, Landroidx/recyclerview/widget/AdapterHelper;->mPostponedList:Ljava/util/ArrayList;
+
+    invoke-virtual {v1, p2}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
+
+    invoke-virtual {p0, v0}, Landroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOp(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 
     :cond_10
-    :goto_b
+    :goto_6
     add-int/lit8 p2, p2, -0x1
 
-    goto :goto_9
+    goto :goto_5
 
     :cond_11
     return p1
@@ -1265,8 +1279,6 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/AdapterHelper;->mOnItemProcessedCallback:Ljava/lang/Runnable;
-
     invoke-interface {v3}, Ljava/lang/Runnable;->run()V
 
     :cond_2
@@ -1800,8 +1812,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/AdapterHelper;->mOnItemProcessedCallback:Ljava/lang/Runnable;
-
     invoke-interface {v2}, Ljava/lang/Runnable;->run()V
 
     :cond_2
diff --git a/com.discord/smali/androidx/recyclerview/widget/AdapterListUpdateCallback.smali b/com.discord/smali/androidx/recyclerview/widget/AdapterListUpdateCallback.smali
index de27bda051..cd1f51bdab 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AdapterListUpdateCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AdapterListUpdateCallback.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/widget/AdapterListUpdateCallback;
 .super Ljava/lang/Object;
+.source "AdapterListUpdateCallback.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ListUpdateCallback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig$Builder.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig$Builder.smali
index b9636e1ad0..780850b0de 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig$Builder.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/widget/AsyncDifferConfig$Builder;
 .super Ljava/lang/Object;
+.source "AsyncDifferConfig.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig.smali
index 6f59c82177..e910d1f500 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncDifferConfig.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/widget/AsyncDifferConfig;
 .super Ljava/lang/Object;
+.source "AsyncDifferConfig.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$1.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$1.smali
index 828339a7fb..bc2b3ff124 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AsyncListDiffer$1$1;
 .super Landroidx/recyclerview/widget/DiffUtil$Callback;
+.source "AsyncListDiffer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$2.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$2.smali
index 449c0dc63a..7e7765b2ae 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AsyncListDiffer$1$2;
 .super Ljava/lang/Object;
+.source "AsyncListDiffer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1.smali
index d273569ce4..5c490270d1 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AsyncListDiffer$1;
 .super Ljava/lang/Object;
+.source "AsyncListDiffer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor.smali
index 16d7122c84..679a280b4b 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor;
 .super Ljava/lang/Object;
+.source "AsyncListDiffer.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer.smali
index 3bb0374dc0..1bb5992366 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListDiffer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/AsyncListDiffer;
 .super Ljava/lang/Object;
+.source "AsyncListDiffer.java"
 
 
 # annotations
@@ -118,7 +119,6 @@
 
     move-result-object p1
 
-    :goto_0
     iput-object p1, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mMainThreadExecutor:Ljava/util/concurrent/Executor;
 
     return-void
@@ -126,7 +126,9 @@
     :cond_0
     sget-object p1, Landroidx/recyclerview/widget/AsyncListDiffer;->sMainThreadExecutor:Ljava/util/concurrent/Executor;
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mMainThreadExecutor:Ljava/util/concurrent/Executor;
+
+    return-void
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/DiffUtil$ItemCallback;)V
@@ -247,13 +249,11 @@
     return-void
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mList:Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
+    invoke-interface {v1}, Ljava/util/List;->size()I
 
     move-result p1
 
@@ -269,14 +269,12 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mUpdateCallback:Landroidx/recyclerview/widget/ListUpdateCallback;
 
-    invoke-interface {v0, v1, p1}, Landroidx/recyclerview/widget/ListUpdateCallback;->onRemoved(II)V
+    invoke-interface {v0, v2, p1}, Landroidx/recyclerview/widget/ListUpdateCallback;->onRemoved(II)V
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mList:Ljava/util/List;
-
-    if-nez v2, :cond_2
+    if-nez v1, :cond_2
 
     iput-object p1, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mList:Ljava/util/List;
 
@@ -292,13 +290,11 @@
 
     move-result p1
 
-    invoke-interface {v0, v1, p1}, Landroidx/recyclerview/widget/ListUpdateCallback;->onInserted(II)V
+    invoke-interface {v0, v2, p1}, Landroidx/recyclerview/widget/ListUpdateCallback;->onInserted(II)V
 
     return-void
 
     :cond_2
-    iget-object v1, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mList:Ljava/util/List;
-
     iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListDiffer;->mConfig:Landroidx/recyclerview/widget/AsyncDifferConfig;
 
     invoke-virtual {v2}, Landroidx/recyclerview/widget/AsyncDifferConfig;->getBackgroundThreadExecutor()Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$1.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$1.smali
index 53e608e5a0..e42cc9b97f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AsyncListUtil$1;
 .super Ljava/lang/Object;
+.source "AsyncListUtil.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ThreadUtil$MainThreadCallback;
@@ -284,17 +285,13 @@
 
     iput p2, p1, Landroidx/recyclerview/widget/AsyncListUtil;->mItemCount:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/AsyncListUtil$1;->this$0:Landroidx/recyclerview/widget/AsyncListUtil;
-
     iget-object p1, p1, Landroidx/recyclerview/widget/AsyncListUtil;->mViewCallback:Landroidx/recyclerview/widget/AsyncListUtil$ViewCallback;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/AsyncListUtil$ViewCallback;->onDataRefresh()V
 
     iget-object p1, p0, Landroidx/recyclerview/widget/AsyncListUtil$1;->this$0:Landroidx/recyclerview/widget/AsyncListUtil;
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/AsyncListUtil$1;->this$0:Landroidx/recyclerview/widget/AsyncListUtil;
-
-    iget p2, p2, Landroidx/recyclerview/widget/AsyncListUtil;->mRequestedGeneration:I
+    iget p2, p1, Landroidx/recyclerview/widget/AsyncListUtil;->mRequestedGeneration:I
 
     iput p2, p1, Landroidx/recyclerview/widget/AsyncListUtil;->mDisplayedGeneration:I
 
@@ -306,8 +303,6 @@
 
     iput-boolean p2, p1, Landroidx/recyclerview/widget/AsyncListUtil;->mAllowScrollHints:Z
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/AsyncListUtil$1;->this$0:Landroidx/recyclerview/widget/AsyncListUtil;
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/AsyncListUtil;->updateRange()V
 
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$2.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$2.smali
index 1b8aa630ca..252bb6478d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/AsyncListUtil$2;
 .super Ljava/lang/Object;
+.source "AsyncListUtil.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ThreadUtil$BackgroundCallback;
@@ -78,11 +79,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil$2;->mRecycledRoot:Landroidx/recyclerview/widget/TileList$Tile;
-
-    iget-object v1, p0, Landroidx/recyclerview/widget/AsyncListUtil$2;->mRecycledRoot:Landroidx/recyclerview/widget/TileList$Tile;
-
-    iget-object v1, v1, Landroidx/recyclerview/widget/TileList$Tile;->mNext:Landroidx/recyclerview/widget/TileList$Tile;
+    iget-object v1, v0, Landroidx/recyclerview/widget/TileList$Tile;->mNext:Landroidx/recyclerview/widget/TileList$Tile;
 
     iput-object v1, p0, Landroidx/recyclerview/widget/AsyncListUtil$2;->mRecycledRoot:Landroidx/recyclerview/widget/TileList$Tile;
 
@@ -151,7 +148,7 @@
 
     move-result v1
 
-    if-lt v1, v0, :cond_3
+    if-lt v1, v0, :cond_4
 
     iget-object v1, p0, Landroidx/recyclerview/widget/AsyncListUtil$2;->mLoadedTiles:Landroid/util/SparseBooleanArray;
 
@@ -163,9 +160,7 @@
 
     iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil$2;->mLoadedTiles:Landroid/util/SparseBooleanArray;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/AsyncListUtil$2;->mLoadedTiles:Landroid/util/SparseBooleanArray;
-
-    invoke-virtual {v3}, Landroid/util/SparseBooleanArray;->size()I
+    invoke-virtual {v2}, Landroid/util/SparseBooleanArray;->size()I
 
     move-result v3
 
@@ -212,6 +207,9 @@
 
     :cond_3
     return-void
+
+    :cond_4
+    return-void
 .end method
 
 .method private getTileStart(I)I
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$DataCallback.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$DataCallback.smali
index f6ceca83cc..c947dc5b30 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$DataCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$DataCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/AsyncListUtil$DataCallback;
 .super Ljava/lang/Object;
+.source "AsyncListUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$ViewCallback.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$ViewCallback.smali
index 595ace9c2f..b402473fa1 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$ViewCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil$ViewCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/AsyncListUtil$ViewCallback;
 .super Ljava/lang/Object;
+.source "AsyncListUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil.smali b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil.smali
index 999f8a991f..0f46fe4cf0 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AsyncListUtil.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/AsyncListUtil;
 .super Ljava/lang/Object;
+.source "AsyncListUtil.java"
 
 
 # annotations
@@ -402,92 +403,70 @@
 
     const/4 v1, 0x0
 
-    aget v0, v0, v1
-
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
+    aget v2, v0, v1
 
     const/4 v3, 0x1
 
-    aget v2, v2, v3
+    aget v4, v0, v3
 
-    if-gt v0, v2, :cond_7
+    if-gt v2, v4, :cond_7
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
+    aget v2, v0, v1
 
-    aget v0, v0, v1
-
-    if-gez v0, :cond_0
+    if-gez v2, :cond_0
 
     goto/16 :goto_2
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
+    aget v2, v0, v3
 
-    aget v0, v0, v3
+    iget v4, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mItemCount:I
 
-    iget v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mItemCount:I
-
-    if-lt v0, v2, :cond_1
+    if-lt v2, v4, :cond_1
 
     return-void
 
     :cond_1
-    iget-boolean v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mAllowScrollHints:Z
+    iget-boolean v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mAllowScrollHints:Z
 
-    if-nez v0, :cond_3
+    if-nez v2, :cond_2
 
-    :cond_2
-    :goto_0
     iput v1, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mScrollHint:I
 
     goto :goto_1
 
-    :cond_3
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
+    :cond_2
+    aget v2, v0, v1
 
-    aget v0, v0, v1
+    iget-object v4, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mPrevRange:[I
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mPrevRange:[I
+    aget v5, v4, v3
 
-    aget v2, v2, v3
+    if-gt v2, v5, :cond_5
 
-    if-gt v0, v2, :cond_2
+    aget v2, v4, v1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mPrevRange:[I
+    aget v5, v0, v3
 
-    aget v0, v0, v1
-
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
-
-    aget v2, v2, v3
-
-    if-le v0, v2, :cond_4
+    if-le v2, v5, :cond_3
 
     goto :goto_0
 
-    :cond_4
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
+    :cond_3
+    aget v2, v0, v1
 
-    aget v0, v0, v1
+    aget v5, v4, v1
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mPrevRange:[I
-
-    aget v2, v2, v1
-
-    if-ge v0, v2, :cond_5
+    if-ge v2, v5, :cond_4
 
     iput v3, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mScrollHint:I
 
     goto :goto_1
 
-    :cond_5
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
-
+    :cond_4
     aget v0, v0, v1
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mPrevRange:[I
-
-    aget v2, v2, v1
+    aget v2, v4, v1
 
     if-le v0, v2, :cond_6
 
@@ -495,28 +474,28 @@
 
     iput v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mScrollHint:I
 
+    goto :goto_1
+
+    :cond_5
+    :goto_0
+    iput v1, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mScrollHint:I
+
     :cond_6
     :goto_1
     iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mPrevRange:[I
 
     iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
 
-    aget v2, v2, v1
+    aget v4, v2, v1
 
-    aput v2, v0, v1
+    aput v4, v0, v1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mPrevRange:[I
+    aget v4, v2, v3
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
-
-    aget v2, v2, v3
-
-    aput v2, v0, v3
+    aput v4, v0, v3
 
     iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mViewCallback:Landroidx/recyclerview/widget/AsyncListUtil$ViewCallback;
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
-
     iget-object v4, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRangeExtended:[I
 
     iget v5, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mScrollHint:I
@@ -529,9 +508,7 @@
 
     aget v2, v2, v1
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRangeExtended:[I
-
-    aget v4, v4, v1
+    aget v4, v0, v1
 
     invoke-static {v4, v1}, Ljava/lang/Math;->max(II)I
 
@@ -549,9 +526,7 @@
 
     aget v2, v2, v3
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRangeExtended:[I
-
-    aget v4, v4, v3
+    aget v4, v0, v3
 
     iget v5, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mItemCount:I
 
@@ -573,22 +548,20 @@
 
     aget v5, v0, v1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRange:[I
-
     aget v6, v0, v3
 
     iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRangeExtended:[I
 
     aget v7, v0, v1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mTmpRangeExtended:[I
-
     aget v8, v0, v3
 
     iget v9, p0, Landroidx/recyclerview/widget/AsyncListUtil;->mScrollHint:I
 
     invoke-interface/range {v4 .. v9}, Landroidx/recyclerview/widget/ThreadUtil$BackgroundCallback;->updateRange(IIIII)V
 
+    return-void
+
     :cond_7
     :goto_2
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/BatchingListUpdateCallback.smali b/com.discord/smali/androidx/recyclerview/widget/BatchingListUpdateCallback.smali
index dbb76cfa37..d3f1768849 100644
--- a/com.discord/smali/androidx/recyclerview/widget/BatchingListUpdateCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/BatchingListUpdateCallback.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/BatchingListUpdateCallback;
 .super Ljava/lang/Object;
+.source "BatchingListUpdateCallback.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ListUpdateCallback;
@@ -68,8 +69,6 @@
     return-void
 
     :cond_0
-    iget v0, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventType:I
-
     packed-switch v0, :pswitch_data_0
 
     goto :goto_0
@@ -129,7 +128,7 @@
 .end method
 
 .method public onChanged(IILjava/lang/Object;)V
-    .locals 3
+    .locals 5
 
     iget v0, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventType:I
 
@@ -141,35 +140,27 @@
 
     iget v2, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventCount:I
 
-    add-int/2addr v0, v2
+    add-int v3, v0, v2
 
-    if-gt p1, v0, :cond_0
+    if-gt p1, v3, :cond_0
 
-    add-int v0, p1, p2
+    add-int v3, p1, p2
 
-    iget v2, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPosition:I
+    if-lt v3, v0, :cond_0
 
-    if-lt v0, v2, :cond_0
+    iget-object v4, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPayload:Ljava/lang/Object;
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPayload:Ljava/lang/Object;
+    if-ne v4, p3, :cond_0
 
-    if-ne v2, p3, :cond_0
+    add-int/2addr v2, v0
 
-    iget p2, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPosition:I
-
-    iget p3, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventCount:I
-
-    add-int/2addr p2, p3
-
-    iget p3, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPosition:I
-
-    invoke-static {p1, p3}, Ljava/lang/Math;->min(II)I
+    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
     iput p1, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPosition:I
 
-    invoke-static {p2, v0}, Ljava/lang/Math;->max(II)I
+    invoke-static {v2, v3}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
@@ -196,7 +187,7 @@
 .end method
 
 .method public onInserted(II)V
-    .locals 3
+    .locals 4
 
     iget v0, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventType:I
 
@@ -208,23 +199,17 @@
 
     if-lt p1, v0, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPosition:I
-
     iget v2, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventCount:I
 
-    add-int/2addr v0, v2
+    add-int v3, v0, v2
 
-    if-gt p1, v0, :cond_0
+    if-gt p1, v3, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventCount:I
+    add-int/2addr v2, p2
 
-    add-int/2addr v0, p2
+    iput v2, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventCount:I
 
-    iput v0, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventCount:I
-
-    iget p2, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPosition:I
-
-    invoke-static {p1, p2}, Ljava/lang/Math;->min(II)I
+    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
@@ -269,8 +254,6 @@
 
     if-lt v0, p1, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/BatchingListUpdateCallback;->mLastEventPosition:I
-
     add-int v2, p1, p2
 
     if-gt v0, v2, :cond_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali b/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali
index 284eb61f24..a08b3e7add 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ChildHelper$Bucket;
 .super Ljava/lang/Object;
+.source "ChildHelper.java"
 
 
 # annotations
@@ -68,8 +69,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mNext:Landroidx/recyclerview/widget/ChildHelper$Bucket;
-
     sub-int/2addr p1, v0
 
     invoke-virtual {v1, p1}, Landroidx/recyclerview/widget/ChildHelper$Bucket;->clear(I)V
@@ -149,8 +148,6 @@
     return p1
 
     :cond_2
-    iget-object v0, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mNext:Landroidx/recyclerview/widget/ChildHelper$Bucket;
-
     sub-int/2addr p1, v1
 
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/ChildHelper$Bucket;->countOnesBefore(I)I
@@ -238,9 +235,9 @@
 
     const-wide/16 v2, 0x0
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
     cmp-long v6, v0, v2
 
@@ -262,19 +259,17 @@
 
     iget-wide v1, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mData:J
 
-    and-long/2addr v1, v6
-
-    iget-wide v8, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mData:J
+    and-long v8, v1, v6
 
     const-wide/16 v10, -0x1
 
     xor-long/2addr v6, v10
 
-    and-long/2addr v6, v8
+    and-long/2addr v1, v6
 
-    shl-long v5, v6, v5
+    shl-long/2addr v1, v4
 
-    or-long/2addr v1, v5
+    or-long/2addr v1, v8
 
     iput-wide v1, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mData:J
 
@@ -299,7 +294,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mNext:Landroidx/recyclerview/widget/ChildHelper$Bucket;
 
-    invoke-virtual {p1, v4, v0}, Landroidx/recyclerview/widget/ChildHelper$Bucket;->insert(IZ)V
+    invoke-virtual {p1, v5, v0}, Landroidx/recyclerview/widget/ChildHelper$Bucket;->insert(IZ)V
 
     :cond_4
     return-void
@@ -365,19 +360,17 @@
 
     iget-wide v0, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mData:J
 
-    and-long/2addr v0, v2
-
-    iget-wide v5, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mData:J
+    and-long v5, v0, v2
 
     xor-long/2addr v2, v9
 
-    and-long/2addr v2, v5
+    and-long/2addr v0, v2
 
-    invoke-static {v2, v3, p1}, Ljava/lang/Long;->rotateRight(JI)J
+    invoke-static {v0, v1, p1}, Ljava/lang/Long;->rotateRight(JI)J
 
-    move-result-wide v2
+    move-result-wide v0
 
-    or-long/2addr v0, v2
+    or-long/2addr v0, v5
 
     iput-wide v0, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mData:J
 
@@ -385,8 +378,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mNext:Landroidx/recyclerview/widget/ChildHelper$Bucket;
-
     invoke-virtual {p1, v8}, Landroidx/recyclerview/widget/ChildHelper$Bucket;->get(I)Z
 
     move-result p1
@@ -417,8 +408,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/ChildHelper$Bucket;->mNext:Landroidx/recyclerview/widget/ChildHelper$Bucket;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/ChildHelper$Bucket;->reset()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Callback.smali b/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Callback.smali
index 114e02c3c2..cf057f45d7 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Callback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Callback.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/recyclerview/widget/ChildHelper$Callback;
 .super Ljava/lang/Object;
+.source "ChildHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali b/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali
index e7e6bf440a..ceb31af76a 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ChildHelper;
 .super Ljava/lang/Object;
+.source "ChildHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$1.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$1.smali
index 10a687c2bb..c553a4d3b7 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$1;
 .super Ljava/lang/Object;
+.source "DefaultItemAnimator.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$2.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$2.smali
index c9e18236b9..df014befe4 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$2;
 .super Ljava/lang/Object;
+.source "DefaultItemAnimator.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$3.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$3.smali
index 7950f33f96..add9ee196c 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$3.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$3;
 .super Ljava/lang/Object;
+.source "DefaultItemAnimator.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$4.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$4.smali
index 007032f218..e4c13e767f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$4.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$4;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$5.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$5.smali
index e3ecf743af..8899c1f785 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$5.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$5;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$6.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$6.smali
index a8457e5e03..dfc84f3cd0 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$6.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$6;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$7.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$7.smali
index e3552ec9a9..d976fde3dc 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$7.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$7;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$8.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$8.smali
index c858d91e37..c452706dda 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$8.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$8.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$8;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$ChangeInfo.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$ChangeInfo.smali
index ca0f822ac1..b1045b23eb 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$ChangeInfo.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$ChangeInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$ChangeInfo;
 .super Ljava/lang/Object;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$MoveInfo.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$MoveInfo.smali
index 2e3d268cd0..1995938143 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$MoveInfo.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator$MoveInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DefaultItemAnimator$MoveInfo;
 .super Ljava/lang/Object;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator.smali b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator.smali
index 49518570d6..26b577f1aa 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DefaultItemAnimator.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/DefaultItemAnimator;
 .super Landroidx/recyclerview/widget/SimpleItemAnimator;
+.source "DefaultItemAnimator.java"
 
 
 # annotations
@@ -1965,6 +1966,8 @@
 
     invoke-static {v0, v5, v8, v9}, Landroidx/core/view/ViewCompat;->postOnAnimationDelayed(Landroid/view/View;Ljava/lang/Runnable;J)V
 
+    return-void
+
     :cond_b
     :goto_6
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$1.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$1.smali
index a8675fd266..4206d511d5 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/DiffUtil$1;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Callback.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Callback.smali
index d2268744a3..27ff112efd 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Callback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/DiffUtil$Callback;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali
index 16e9c6ab03..bbe38cdfea 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/DiffUtil$DiffResult;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 
 # annotations
@@ -557,9 +558,9 @@
 
     add-int/2addr v4, v5
 
-    const/4 v5, 0x4
+    const/16 v5, 0x8
 
-    const/16 v6, 0x8
+    const/4 v6, 0x4
 
     const/4 v7, 0x1
 
@@ -586,9 +587,12 @@
 
     if-eqz p1, :cond_1
 
-    const/16 v5, 0x8
+    goto :goto_2
 
     :cond_1
+    const/4 v5, 0x4
+
+    :goto_2
     iget-object p1, p0, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->mNewItemStatuses:[I
 
     shl-int/lit8 p2, v0, 0x5
@@ -615,7 +619,7 @@
     :cond_3
     sub-int/2addr p2, v7
 
-    :goto_2
+    :goto_3
     if-lt p2, v4, :cond_6
 
     iget-object v0, p0, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->mCallback:Landroidx/recyclerview/widget/DiffUtil$Callback;
@@ -634,9 +638,12 @@
 
     if-eqz p3, :cond_4
 
-    const/16 v5, 0x8
+    goto :goto_4
 
     :cond_4
+    const/4 v5, 0x4
+
+    :goto_4
     iget-object p3, p0, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->mOldItemStatuses:[I
 
     sub-int/2addr p1, v7
@@ -660,7 +667,7 @@
     :cond_5
     add-int/lit8 p2, p2, -0x1
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_6
     iget v0, v2, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
@@ -926,11 +933,9 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->mNewItemStatuses:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-ge p1, v0, :cond_1
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->mNewItemStatuses:[I
+    if-ge p1, v1, :cond_1
 
     aget p1, v0, p1
 
@@ -989,11 +994,9 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->mOldItemStatuses:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-ge p1, v0, :cond_1
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->mOldItemStatuses:[I
+    if-ge p1, v1, :cond_1
 
     aget p1, v0, p1
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$ItemCallback.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$ItemCallback.smali
index 3ec03ae4dc..8fee8b9087 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$ItemCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$ItemCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/DiffUtil$ItemCallback;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$PostponedUpdate.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$PostponedUpdate.smali
index 85065ffd5a..cf80753df7 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$PostponedUpdate.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$PostponedUpdate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DiffUtil$PostponedUpdate;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Range.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Range.smali
index f1932d9157..f7ed99ed4d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Range.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Range.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DiffUtil$Range;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Snake.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Snake.smali
index ca23f795ca..b597f0e803 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Snake.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$Snake.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/DiffUtil$Snake;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil.smali
index 2142b31fe2..f04f6ebac5 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/DiffUtil;
 .super Ljava/lang/Object;
+.source "DiffUtil.java"
 
 
 # annotations
@@ -225,15 +226,13 @@
 
     iget v7, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
 
-    :goto_2
     iput v7, v6, Landroidx/recyclerview/widget/DiffUtil$Range;->oldListEnd:I
 
     iget v7, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
 
-    :goto_3
     iput v7, v6, Landroidx/recyclerview/widget/DiffUtil$Range;->newListEnd:I
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_2
     iget-boolean v7, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->removal:Z
@@ -244,6 +243,12 @@
 
     add-int/lit8 v7, v7, -0x1
 
+    iput v7, v6, Landroidx/recyclerview/widget/DiffUtil$Range;->oldListEnd:I
+
+    iget v7, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
+
+    iput v7, v6, Landroidx/recyclerview/widget/DiffUtil$Range;->newListEnd:I
+
     goto :goto_2
 
     :cond_3
@@ -255,9 +260,9 @@
 
     add-int/lit8 v7, v7, -0x1
 
-    goto :goto_3
+    iput v7, v6, Landroidx/recyclerview/widget/DiffUtil$Range;->newListEnd:I
 
-    :goto_4
+    :goto_2
     invoke-interface {v2, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     iget-boolean v6, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->reverse:Z
@@ -276,7 +281,17 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_5
+    iput v6, v14, Landroidx/recyclerview/widget/DiffUtil$Range;->oldListStart:I
+
+    iget v6, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
+
+    iget v5, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->size:I
+
+    add-int/2addr v6, v5
+
+    iput v6, v14, Landroidx/recyclerview/widget/DiffUtil$Range;->newListStart:I
+
+    goto :goto_3
 
     :cond_4
     iget v6, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
@@ -295,7 +310,9 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_6
+    iput v6, v14, Landroidx/recyclerview/widget/DiffUtil$Range;->newListStart:I
+
+    goto :goto_3
 
     :cond_5
     iget v6, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
@@ -304,7 +321,6 @@
 
     add-int/2addr v6, v7
 
-    :goto_5
     iput v6, v14, Landroidx/recyclerview/widget/DiffUtil$Range;->oldListStart:I
 
     iget v6, v5, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
@@ -313,9 +329,9 @@
 
     add-int/2addr v6, v5
 
-    :goto_6
     iput v6, v14, Landroidx/recyclerview/widget/DiffUtil$Range;->newListStart:I
 
+    :goto_3
     invoke-interface {v2, v14}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto/16 :goto_0
@@ -348,411 +364,401 @@
 .end method
 
 .method private static diffPartial(Landroidx/recyclerview/widget/DiffUtil$Callback;IIII[I[II)Landroidx/recyclerview/widget/DiffUtil$Snake;
-    .locals 21
+    .locals 19
 
     move-object/from16 v0, p0
 
-    move-object/from16 v3, p5
+    move-object/from16 v1, p5
 
-    move-object/from16 v4, p6
+    move-object/from16 v2, p6
 
-    sub-int v5, p2, p1
+    sub-int v3, p2, p1
 
-    sub-int v6, p4, p3
+    sub-int v4, p4, p3
 
-    if-lez v5, :cond_f
+    if-lez v3, :cond_11
 
-    if-gtz v6, :cond_0
+    if-gtz v4, :cond_0
 
-    goto/16 :goto_a
+    goto/16 :goto_c
 
     :cond_0
-    sub-int v7, v5, v6
+    sub-int v5, v3, v4
 
-    add-int v8, v5, v6
+    add-int v6, v3, v4
 
-    const/4 v9, 0x1
+    const/4 v7, 0x1
 
-    add-int/2addr v8, v9
+    add-int/2addr v6, v7
 
-    div-int/lit8 v8, v8, 0x2
+    div-int/lit8 v6, v6, 0x2
 
-    sub-int v10, p7, v8
+    sub-int v8, p7, v6
 
-    sub-int/2addr v10, v9
+    sub-int/2addr v8, v7
 
-    add-int v11, p7, v8
+    add-int v9, p7, v6
 
-    add-int/2addr v11, v9
+    add-int/2addr v9, v7
 
-    const/4 v12, 0x0
+    const/4 v10, 0x0
 
-    invoke-static {v3, v10, v11, v12}, Ljava/util/Arrays;->fill([IIII)V
+    invoke-static {v1, v8, v9, v10}, Ljava/util/Arrays;->fill([IIII)V
 
-    add-int/2addr v10, v7
+    add-int/2addr v8, v5
 
-    add-int/2addr v11, v7
+    add-int/2addr v9, v5
 
-    invoke-static {v4, v10, v11, v5}, Ljava/util/Arrays;->fill([IIII)V
+    invoke-static {v2, v8, v9, v3}, Ljava/util/Arrays;->fill([IIII)V
 
-    rem-int/lit8 v10, v7, 0x2
+    rem-int/lit8 v8, v5, 0x2
 
-    if-eqz v10, :cond_1
+    if-eqz v8, :cond_1
 
-    const/4 v10, 0x1
+    const/4 v8, 0x1
 
     goto :goto_0
 
     :cond_1
-    const/4 v10, 0x0
+    const/4 v8, 0x0
 
     :goto_0
-    const/4 v11, 0x0
+    const/4 v9, 0x0
 
     :goto_1
-    if-gt v11, v8, :cond_e
+    if-gt v9, v6, :cond_10
 
-    neg-int v13, v11
+    neg-int v11, v9
 
-    move v14, v13
+    move v12, v11
 
     :goto_2
-    if-gt v14, v11, :cond_7
+    if-gt v12, v9, :cond_7
 
-    if-eq v14, v13, :cond_3
+    if-eq v12, v11, :cond_3
 
-    if-eq v14, v11, :cond_2
+    if-eq v12, v9, :cond_2
 
-    add-int v15, p7, v14
+    add-int v13, p7, v12
 
-    add-int/lit8 v16, v15, -0x1
+    add-int/lit8 v14, v13, -0x1
 
-    aget v12, v3, v16
+    aget v14, v1, v14
 
-    add-int/2addr v15, v9
+    add-int/2addr v13, v7
 
-    aget v9, v3, v15
+    aget v13, v1, v13
 
-    if-ge v12, v9, :cond_2
+    if-ge v14, v13, :cond_2
 
     goto :goto_3
 
     :cond_2
-    add-int v9, p7, v14
+    add-int v13, p7, v12
 
-    const/16 v17, 0x1
+    sub-int/2addr v13, v7
 
-    add-int/lit8 v9, v9, -0x1
+    aget v13, v1, v13
 
-    aget v9, v3, v9
+    add-int/2addr v13, v7
 
-    add-int/lit8 v9, v9, 0x1
-
-    const/4 v12, 0x1
+    const/4 v14, 0x1
 
     goto :goto_4
 
     :cond_3
     :goto_3
-    const/16 v17, 0x1
+    add-int v13, p7, v12
 
-    add-int v9, p7, v14
+    add-int/2addr v13, v7
 
-    add-int/lit8 v9, v9, 0x1
+    aget v13, v1, v13
 
-    aget v9, v3, v9
-
-    const/4 v12, 0x0
+    const/4 v14, 0x0
 
     :goto_4
-    sub-int v15, v9, v14
-
-    move/from16 v18, v8
-
-    move v8, v15
+    sub-int v15, v13, v12
 
     :goto_5
-    if-ge v9, v5, :cond_4
+    if-ge v13, v3, :cond_4
 
-    if-ge v8, v6, :cond_4
+    if-ge v15, v4, :cond_4
 
-    move/from16 v19, v5
+    add-int v10, p1, v13
 
-    add-int v5, p1, v9
+    add-int v7, p3, v15
 
-    move/from16 v20, v6
+    invoke-virtual {v0, v10, v7}, Landroidx/recyclerview/widget/DiffUtil$Callback;->areItemsTheSame(II)Z
 
-    add-int v6, p3, v8
+    move-result v7
 
-    invoke-virtual {v0, v5, v6}, Landroidx/recyclerview/widget/DiffUtil$Callback;->areItemsTheSame(II)Z
+    if-eqz v7, :cond_4
 
-    move-result v5
+    add-int/lit8 v13, v13, 0x1
 
-    if-eqz v5, :cond_5
+    add-int/lit8 v15, v15, 0x1
 
-    add-int/lit8 v9, v9, 0x1
+    const/4 v7, 0x1
 
-    add-int/lit8 v8, v8, 0x1
-
-    move/from16 v5, v19
-
-    move/from16 v6, v20
+    const/4 v10, 0x0
 
     goto :goto_5
 
     :cond_4
-    move/from16 v19, v5
+    add-int v7, p7, v12
 
-    move/from16 v20, v6
+    aput v13, v1, v7
 
-    :cond_5
-    add-int v5, p7, v14
+    if-eqz v8, :cond_6
 
-    aput v9, v3, v5
+    sub-int v10, v5, v9
 
-    if-eqz v10, :cond_6
+    const/4 v13, 0x1
 
-    sub-int v6, v7, v11
+    add-int/2addr v10, v13
 
-    const/4 v8, 0x1
+    if-lt v12, v10, :cond_6
 
-    add-int/2addr v6, v8
+    add-int v10, v5, v9
 
-    if-lt v14, v6, :cond_6
+    sub-int/2addr v10, v13
 
-    add-int v6, v7, v11
+    if-gt v12, v10, :cond_6
 
-    sub-int/2addr v6, v8
+    aget v10, v1, v7
 
-    if-gt v14, v6, :cond_6
+    aget v13, v2, v7
 
-    aget v6, v3, v5
-
-    aget v8, v4, v5
-
-    if-lt v6, v8, :cond_6
+    if-lt v10, v13, :cond_5
 
     new-instance v0, Landroidx/recyclerview/widget/DiffUtil$Snake;
 
     invoke-direct {v0}, Landroidx/recyclerview/widget/DiffUtil$Snake;-><init>()V
 
-    aget v1, v4, v5
+    aget v3, v2, v7
 
-    iput v1, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
+    iput v3, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
 
-    iget v1, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
+    iget v3, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
 
-    sub-int/2addr v1, v14
+    sub-int/2addr v3, v12
 
-    iput v1, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
+    iput v3, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
 
-    aget v1, v3, v5
+    aget v1, v1, v7
 
-    aget v2, v4, v5
+    aget v2, v2, v7
 
     sub-int/2addr v1, v2
 
     iput v1, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->size:I
 
-    iput-boolean v12, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->removal:Z
+    iput-boolean v14, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->removal:Z
 
-    const/4 v5, 0x0
+    const/4 v7, 0x0
 
-    iput-boolean v5, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->reverse:Z
+    iput-boolean v7, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->reverse:Z
 
     return-object v0
 
+    :cond_5
+    const/4 v7, 0x0
+
+    goto :goto_6
+
     :cond_6
-    const/4 v5, 0x0
-
-    add-int/lit8 v14, v14, 0x2
-
-    move/from16 v8, v18
-
-    move/from16 v5, v19
-
-    move/from16 v6, v20
-
-    const/4 v9, 0x1
-
-    const/4 v12, 0x0
-
-    goto/16 :goto_2
-
-    :cond_7
-    move/from16 v19, v5
-
-    move/from16 v20, v6
-
-    move/from16 v18, v8
-
-    const/4 v5, 0x0
-
-    move v6, v13
+    const/4 v7, 0x0
 
     :goto_6
-    if-gt v6, v11, :cond_d
+    add-int/lit8 v12, v12, 0x2
 
-    add-int v8, v6, v7
+    const/4 v7, 0x1
 
-    add-int v9, v11, v7
+    const/4 v10, 0x0
 
-    if-eq v8, v9, :cond_a
+    goto :goto_2
 
-    add-int v9, v13, v7
+    :cond_7
+    const/4 v7, 0x0
 
-    if-eq v8, v9, :cond_8
+    move v10, v11
 
-    add-int v9, p7, v8
+    :goto_7
+    if-gt v10, v9, :cond_f
 
-    add-int/lit8 v12, v9, -0x1
+    add-int v12, v10, v5
 
-    aget v12, v4, v12
+    add-int v13, v9, v5
 
-    const/16 v17, 0x1
+    if-eq v12, v13, :cond_a
 
-    add-int/lit8 v9, v9, 0x1
+    add-int v13, v11, v5
 
-    aget v9, v4, v9
+    if-eq v12, v13, :cond_8
 
-    if-ge v12, v9, :cond_9
+    add-int v13, p7, v12
 
-    goto :goto_7
+    add-int/lit8 v14, v13, -0x1
 
-    :cond_8
-    const/16 v17, 0x1
+    aget v14, v2, v14
 
-    :cond_9
-    add-int v9, p7, v8
+    const/4 v15, 0x1
 
-    add-int/lit8 v9, v9, 0x1
+    add-int/2addr v13, v15
 
-    aget v9, v4, v9
+    aget v13, v2, v13
 
-    add-int/lit8 v9, v9, -0x1
-
-    const/4 v12, 0x1
+    if-ge v14, v13, :cond_9
 
     goto :goto_8
 
-    :cond_a
-    const/16 v17, 0x1
+    :cond_8
+    const/4 v15, 0x1
 
-    :goto_7
-    add-int v9, p7, v8
+    :cond_9
+    add-int v13, p7, v12
 
-    add-int/lit8 v9, v9, -0x1
+    add-int/2addr v13, v15
 
-    aget v9, v4, v9
+    aget v13, v2, v13
 
-    const/4 v12, 0x0
+    sub-int/2addr v13, v15
 
-    :goto_8
-    sub-int v14, v9, v8
-
-    :goto_9
-    if-lez v9, :cond_b
-
-    if-lez v14, :cond_b
-
-    add-int v15, p1, v9
-
-    add-int/lit8 v5, v15, -0x1
-
-    add-int v15, p3, v14
-
-    add-int/lit8 v1, v15, -0x1
-
-    invoke-virtual {v0, v5, v1}, Landroidx/recyclerview/widget/DiffUtil$Callback;->areItemsTheSame(II)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_b
-
-    add-int/lit8 v9, v9, -0x1
-
-    add-int/lit8 v14, v14, -0x1
-
-    const/4 v5, 0x0
-
-    const/16 v17, 0x1
+    const/4 v14, 0x1
 
     goto :goto_9
 
+    :cond_a
+    const/4 v15, 0x1
+
+    :goto_8
+    add-int v13, p7, v12
+
+    sub-int/2addr v13, v15
+
+    aget v13, v2, v13
+
+    const/4 v14, 0x0
+
+    :goto_9
+    sub-int v16, v13, v12
+
+    :goto_a
+    if-lez v13, :cond_b
+
+    if-lez v16, :cond_b
+
+    add-int v17, p1, v13
+
+    add-int/lit8 v7, v17, -0x1
+
+    add-int v17, p3, v16
+
+    move/from16 v18, v3
+
+    add-int/lit8 v3, v17, -0x1
+
+    invoke-virtual {v0, v7, v3}, Landroidx/recyclerview/widget/DiffUtil$Callback;->areItemsTheSame(II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_c
+
+    add-int/lit8 v13, v13, -0x1
+
+    add-int/lit8 v16, v16, -0x1
+
+    move/from16 v3, v18
+
+    const/4 v7, 0x0
+
+    const/4 v15, 0x1
+
+    goto :goto_a
+
     :cond_b
-    add-int v1, p7, v8
+    move/from16 v18, v3
 
-    aput v9, v4, v1
+    :cond_c
+    add-int v3, p7, v12
 
-    if-nez v10, :cond_c
+    aput v13, v2, v3
 
-    if-lt v8, v13, :cond_c
+    if-nez v8, :cond_e
 
-    if-gt v8, v11, :cond_c
+    if-lt v12, v11, :cond_e
 
-    aget v5, v3, v1
+    if-gt v12, v9, :cond_e
 
-    aget v9, v4, v1
+    aget v7, v1, v3
 
-    if-lt v5, v9, :cond_c
+    aget v13, v2, v3
+
+    if-lt v7, v13, :cond_d
 
     new-instance v0, Landroidx/recyclerview/widget/DiffUtil$Snake;
 
     invoke-direct {v0}, Landroidx/recyclerview/widget/DiffUtil$Snake;-><init>()V
 
-    aget v2, v4, v1
+    aget v4, v2, v3
 
-    iput v2, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
+    iput v4, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
 
-    iget v2, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
+    iget v4, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->x:I
 
-    sub-int/2addr v2, v8
+    sub-int/2addr v4, v12
 
-    iput v2, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
+    iput v4, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->y:I
 
-    aget v2, v3, v1
+    aget v1, v1, v3
 
-    aget v1, v4, v1
+    aget v2, v2, v3
 
-    sub-int/2addr v2, v1
+    sub-int/2addr v1, v2
 
-    iput v2, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->size:I
+    iput v1, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->size:I
 
-    iput-boolean v12, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->removal:Z
+    iput-boolean v14, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->removal:Z
 
-    const/4 v1, 0x1
+    const/4 v3, 0x1
 
-    iput-boolean v1, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->reverse:Z
+    iput-boolean v3, v0, Landroidx/recyclerview/widget/DiffUtil$Snake;->reverse:Z
 
     return-object v0
 
-    :cond_c
-    const/4 v1, 0x1
-
-    add-int/lit8 v6, v6, 0x2
-
-    const/4 v5, 0x0
-
-    goto :goto_6
-
     :cond_d
-    const/4 v1, 0x1
+    const/4 v3, 0x1
 
-    add-int/lit8 v11, v11, 0x1
+    goto :goto_b
 
-    move/from16 v8, v18
+    :cond_e
+    const/4 v3, 0x1
 
-    move/from16 v5, v19
+    :goto_b
+    add-int/lit8 v10, v10, 0x2
 
-    move/from16 v6, v20
+    move/from16 v3, v18
 
-    const/4 v9, 0x1
+    const/4 v7, 0x0
 
-    const/4 v12, 0x0
+    goto :goto_7
+
+    :cond_f
+    move/from16 v18, v3
+
+    const/4 v3, 0x1
+
+    add-int/lit8 v9, v9, 0x1
+
+    move/from16 v3, v18
+
+    const/4 v7, 0x1
+
+    const/4 v10, 0x0
 
     goto/16 :goto_1
 
-    :cond_e
+    :cond_10
     new-instance v0, Ljava/lang/IllegalStateException;
 
     const-string v1, "DiffUtil hit an unexpected case while trying to calculate the optimal path. Please make sure your data is not changing during the diff calculation."
@@ -761,8 +767,8 @@
 
     throw v0
 
-    :cond_f
-    :goto_a
+    :cond_11
+    :goto_c
     const/4 v0, 0x0
 
     return-object v0
diff --git a/com.discord/smali/androidx/recyclerview/widget/DividerItemDecoration.smali b/com.discord/smali/androidx/recyclerview/widget/DividerItemDecoration.smali
index a3cb62cc3f..dfde50be50 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DividerItemDecoration.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DividerItemDecoration.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/DividerItemDecoration;
 .super Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;
+.source "DividerItemDecoration.java"
 
 
 # static fields
@@ -305,7 +306,7 @@
 
 # virtual methods
 .method public getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
-    .locals 0
+    .locals 1
 
     iget-object p2, p0, Landroidx/recyclerview/widget/DividerItemDecoration;->mDivider:Landroid/graphics/drawable/Drawable;
 
@@ -318,13 +319,11 @@
     return-void
 
     :cond_0
-    iget p2, p0, Landroidx/recyclerview/widget/DividerItemDecoration;->mOrientation:I
+    iget p4, p0, Landroidx/recyclerview/widget/DividerItemDecoration;->mOrientation:I
 
-    const/4 p4, 0x1
+    const/4 v0, 0x1
 
-    if-ne p2, p4, :cond_1
-
-    iget-object p2, p0, Landroidx/recyclerview/widget/DividerItemDecoration;->mDivider:Landroid/graphics/drawable/Drawable;
+    if-ne p4, v0, :cond_1
 
     invoke-virtual {p2}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
@@ -335,8 +334,6 @@
     return-void
 
     :cond_1
-    iget-object p2, p0, Landroidx/recyclerview/widget/DividerItemDecoration;->mDivider:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p2}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
 
     move-result p2
@@ -375,6 +372,8 @@
     :cond_1
     invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/DividerItemDecoration;->drawHorizontal(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;)V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/FastScroller$1.smali b/com.discord/smali/androidx/recyclerview/widget/FastScroller$1.smali
index 9dc2d49fc0..51d5ea312d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/FastScroller$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/FastScroller$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/FastScroller$1;
 .super Ljava/lang/Object;
+.source "FastScroller.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/FastScroller$2.smali b/com.discord/smali/androidx/recyclerview/widget/FastScroller$2.smali
index c94eff02f1..1d1f0b8af9 100644
--- a/com.discord/smali/androidx/recyclerview/widget/FastScroller$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/FastScroller$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/FastScroller$2;
 .super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "FastScroller.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorListener.smali b/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorListener.smali
index d3d23ac4b6..4826502617 100644
--- a/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/FastScroller$AnimatorListener;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FastScroller.java"
 
 
 # annotations
@@ -84,8 +85,6 @@
 
     iput v0, p1, Landroidx/recyclerview/widget/FastScroller;->mAnimationState:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/FastScroller$AnimatorListener;->this$0:Landroidx/recyclerview/widget/FastScroller;
-
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/FastScroller;->setState(I)V
 
     return-void
@@ -97,8 +96,6 @@
 
     iput v0, p1, Landroidx/recyclerview/widget/FastScroller;->mAnimationState:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/FastScroller$AnimatorListener;->this$0:Landroidx/recyclerview/widget/FastScroller;
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/FastScroller;->requestRedraw()V
 
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorUpdater.smali b/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorUpdater.smali
index 1f9df49113..e63b338d63 100644
--- a/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorUpdater.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/FastScroller$AnimatorUpdater.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/FastScroller$AnimatorUpdater;
 .super Ljava/lang/Object;
+.source "FastScroller.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali/androidx/recyclerview/widget/FastScroller.smali b/com.discord/smali/androidx/recyclerview/widget/FastScroller.smali
index 121ed1bd7f..5056318c50 100644
--- a/com.discord/smali/androidx/recyclerview/widget/FastScroller.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/FastScroller.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/FastScroller;
 .super Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;
+.source "FastScroller.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
@@ -339,51 +340,47 @@
 
     sub-int/2addr v0, v1
 
-    iget v1, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbCenterX:I
-
-    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbWidth:I
-
-    div-int/lit8 v2, v2, 0x2
-
-    sub-int/2addr v1, v2
-
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
+    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbCenterX:I
 
     iget v3, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbWidth:I
 
-    iget v4, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbHeight:I
+    div-int/lit8 v4, v3, 0x2
+
+    sub-int/2addr v2, v4
+
+    iget-object v4, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
 
     const/4 v5, 0x0
 
-    invoke-virtual {v2, v5, v5, v3, v4}, Landroid/graphics/drawable/StateListDrawable;->setBounds(IIII)V
+    invoke-virtual {v4, v5, v5, v3, v1}, Landroid/graphics/drawable/StateListDrawable;->setBounds(IIII)V
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalTrackDrawable:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalTrackDrawable:Landroid/graphics/drawable/Drawable;
 
     iget v3, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewWidth:I
 
     iget v4, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalTrackHeight:I
 
-    invoke-virtual {v2, v5, v5, v3, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v1, v5, v5, v3, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    int-to-float v2, v0
+    int-to-float v1, v0
 
     const/4 v3, 0x0
 
-    invoke-virtual {p1, v3, v2}, Landroid/graphics/Canvas;->translate(FF)V
+    invoke-virtual {p1, v3, v1}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalTrackDrawable:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalTrackDrawable:Landroid/graphics/drawable/Drawable;
 
-    invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
+    invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
-    int-to-float v2, v1
+    int-to-float v1, v2
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->translate(FF)V
+    invoke-virtual {p1, v1, v3}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
+    iget-object v1, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
 
-    invoke-virtual {v2, p1}, Landroid/graphics/drawable/StateListDrawable;->draw(Landroid/graphics/Canvas;)V
+    invoke-virtual {v1, p1}, Landroid/graphics/drawable/StateListDrawable;->draw(Landroid/graphics/Canvas;)V
 
-    neg-int v1, v1
+    neg-int v1, v2
 
     int-to-float v1, v1
 
@@ -405,37 +402,33 @@
 
     sub-int/2addr v0, v1
 
-    iget v1, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbCenterY:I
+    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbCenterY:I
 
-    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbHeight:I
+    iget v3, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbHeight:I
 
-    div-int/lit8 v2, v2, 0x2
+    div-int/lit8 v4, v3, 0x2
 
-    sub-int/2addr v1, v2
+    sub-int/2addr v2, v4
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
-
-    iget v3, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbWidth:I
-
-    iget v4, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbHeight:I
+    iget-object v4, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
 
     const/4 v5, 0x0
 
-    invoke-virtual {v2, v5, v5, v3, v4}, Landroid/graphics/drawable/StateListDrawable;->setBounds(IIII)V
+    invoke-virtual {v4, v5, v5, v1, v3}, Landroid/graphics/drawable/StateListDrawable;->setBounds(IIII)V
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalTrackDrawable:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalTrackDrawable:Landroid/graphics/drawable/Drawable;
 
     iget v3, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalTrackWidth:I
 
     iget v4, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewHeight:I
 
-    invoke-virtual {v2, v5, v5, v3, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v1, v5, v5, v3, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/FastScroller;->isLayoutRTL()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
     iget-object v0, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalTrackDrawable:Landroid/graphics/drawable/Drawable;
 
@@ -445,30 +438,29 @@
 
     int-to-float v0, v0
 
-    int-to-float v2, v1
+    int-to-float v1, v2
 
-    invoke-virtual {p1, v0, v2}, Landroid/graphics/Canvas;->translate(FF)V
+    invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->translate(FF)V
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    const/high16 v2, 0x3f800000    # 1.0f
+    const/high16 v1, 0x3f800000    # 1.0f
 
-    invoke-virtual {p1, v0, v2}, Landroid/graphics/Canvas;->scale(FF)V
+    invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->scale(FF)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/StateListDrawable;->draw(Landroid/graphics/Canvas;)V
 
-    invoke-virtual {p1, v2, v2}, Landroid/graphics/Canvas;->scale(FF)V
+    invoke-virtual {p1, v1, v1}, Landroid/graphics/Canvas;->scale(FF)V
 
     iget v0, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbWidth:I
 
-    :goto_0
     neg-int v0, v0
 
     int-to-float v0, v0
 
-    neg-int v1, v1
+    neg-int v1, v2
 
     int-to-float v1, v1
 
@@ -477,25 +469,35 @@
     return-void
 
     :cond_0
-    int-to-float v2, v0
+    int-to-float v1, v0
 
     const/4 v3, 0x0
 
-    invoke-virtual {p1, v2, v3}, Landroid/graphics/Canvas;->translate(FF)V
+    invoke-virtual {p1, v1, v3}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalTrackDrawable:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalTrackDrawable:Landroid/graphics/drawable/Drawable;
 
-    invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
+    invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
-    int-to-float v2, v1
+    int-to-float v1, v2
 
-    invoke-virtual {p1, v3, v2}, Landroid/graphics/Canvas;->translate(FF)V
+    invoke-virtual {p1, v3, v1}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
+    iget-object v1, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbDrawable:Landroid/graphics/drawable/StateListDrawable;
 
-    invoke-virtual {v2, p1}, Landroid/graphics/drawable/StateListDrawable;->draw(Landroid/graphics/Canvas;)V
+    invoke-virtual {v1, p1}, Landroid/graphics/drawable/StateListDrawable;->draw(Landroid/graphics/Canvas;)V
 
-    goto :goto_0
+    neg-int v0, v0
+
+    int-to-float v0, v0
+
+    neg-int v1, v2
+
+    int-to-float v1, v1
+
+    invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->translate(FF)V
+
+    return-void
 .end method
 
 .method private getHorizontalRange()[I
@@ -509,19 +511,13 @@
 
     aput v1, v0, v2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalRange:[I
+    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewWidth:I
 
-    iget v1, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewWidth:I
+    sub-int/2addr v2, v1
 
-    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mMargin:I
+    const/4 v1, 0x1
 
-    sub-int/2addr v1, v2
-
-    const/4 v2, 0x1
-
-    aput v1, v0, v2
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalRange:[I
+    aput v2, v0, v1
 
     return-object v0
 .end method
@@ -537,19 +533,13 @@
 
     aput v1, v0, v2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalRange:[I
+    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewHeight:I
 
-    iget v1, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewHeight:I
+    sub-int/2addr v2, v1
 
-    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mMargin:I
+    const/4 v1, 0x1
 
-    sub-int/2addr v1, v2
-
-    const/4 v2, 0x1
-
-    aput v1, v0, v2
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalRange:[I
+    aput v2, v0, v1
 
     return-object v0
 .end method
@@ -835,8 +825,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     if-eqz v0, :cond_1
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/FastScroller;->destroyCallbacks()V
@@ -933,9 +921,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/FastScroller;->mShowHideAnimator:Landroid/animation/ValueAnimator;
-
-    invoke-virtual {v3}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
+    invoke-virtual {v0}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1036,19 +1022,15 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbWidth:I
 
-    div-int/lit8 v0, v0, 0x2
+    div-int/lit8 v1, v0, 0x2
 
-    sub-int/2addr p2, v0
+    sub-int v1, p2, v1
 
-    int-to-float p2, p2
+    int-to-float v1, v1
 
-    cmpl-float p2, p1, p2
+    cmpl-float v1, p1, v1
 
-    if-ltz p2, :cond_0
-
-    iget p2, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbCenterX:I
-
-    iget v0, p0, Landroidx/recyclerview/widget/FastScroller;->mHorizontalThumbWidth:I
+    if-ltz v1, :cond_0
 
     div-int/lit8 v0, v0, 0x2
 
@@ -1111,19 +1093,15 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbHeight:I
 
-    div-int/lit8 v0, v0, 0x2
+    div-int/lit8 v1, v0, 0x2
 
-    sub-int/2addr p1, v0
+    sub-int v1, p1, v1
 
-    int-to-float p1, p1
+    int-to-float v1, v1
 
-    cmpl-float p1, p2, p1
+    cmpl-float v1, p2, v1
 
-    if-ltz p1, :cond_1
-
-    iget p1, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbCenterY:I
-
-    iget v0, p0, Landroidx/recyclerview/widget/FastScroller;->mVerticalThumbHeight:I
+    if-ltz v1, :cond_1
 
     div-int/lit8 v0, v0, 0x2
 
@@ -1326,17 +1304,17 @@
     :goto_0
     invoke-virtual {p0, v1}, Landroidx/recyclerview/widget/FastScroller;->setState(I)V
 
+    const/4 v0, 0x1
+
     goto :goto_1
 
     :cond_3
-    iget p1, p0, Landroidx/recyclerview/widget/FastScroller;->mState:I
-
     if-ne p1, v1, :cond_4
 
-    :goto_1
     const/4 v0, 0x1
 
     :cond_4
+    :goto_1
     return v0
 .end method
 
@@ -1558,10 +1536,9 @@
 
     const/16 v0, 0x4b0
 
-    :goto_1
     invoke-direct {p0, v0}, Landroidx/recyclerview/widget/FastScroller;->resetHideDelay(I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v0, 0x1
@@ -1570,10 +1547,10 @@
 
     const/16 v0, 0x5dc
 
-    goto :goto_1
+    invoke-direct {p0, v0}, Landroidx/recyclerview/widget/FastScroller;->resetHideDelay(I)V
 
     :cond_3
-    :goto_2
+    :goto_1
     iput p1, p0, Landroidx/recyclerview/widget/FastScroller;->mState:I
 
     return-void
@@ -1610,9 +1587,7 @@
 
     const/4 v3, 0x0
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/FastScroller;->mShowHideAnimator:Landroid/animation/ValueAnimator;
-
-    invoke-virtual {v4}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
+    invoke-virtual {v1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
     move-result-object v4
 
@@ -1669,11 +1644,9 @@
 
     if-lez v2, :cond_0
 
-    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewHeight:I
+    iget v2, p0, Landroidx/recyclerview/widget/FastScroller;->mScrollbarMinimumRange:I
 
-    iget v5, p0, Landroidx/recyclerview/widget/FastScroller;->mScrollbarMinimumRange:I
-
-    if-lt v2, v5, :cond_0
+    if-lt v1, v2, :cond_0
 
     const/4 v2, 0x1
 
@@ -1697,11 +1670,9 @@
 
     if-lez v6, :cond_1
 
-    iget v6, p0, Landroidx/recyclerview/widget/FastScroller;->mRecyclerViewWidth:I
+    iget v6, p0, Landroidx/recyclerview/widget/FastScroller;->mScrollbarMinimumRange:I
 
-    iget v7, p0, Landroidx/recyclerview/widget/FastScroller;->mScrollbarMinimumRange:I
-
-    if-lt v6, v7, :cond_1
+    if-lt v5, v6, :cond_1
 
     const/4 v6, 0x1
 
@@ -1803,8 +1774,6 @@
 
     if-eqz p1, :cond_6
 
-    iget p1, p0, Landroidx/recyclerview/widget/FastScroller;->mState:I
-
     if-ne p1, v4, :cond_7
 
     :cond_6
diff --git a/com.discord/smali/androidx/recyclerview/widget/GapWorker$1.smali b/com.discord/smali/androidx/recyclerview/widget/GapWorker$1.smali
index 3e58de8892..e8c59e68e9 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GapWorker$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GapWorker$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/GapWorker$1;
 .super Ljava/lang/Object;
+.source "GapWorker.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl.smali b/com.discord/smali/androidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl.smali
index 52ec808d85..0534309eff 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;
 .super Ljava/lang/Object;
+.source "GapWorker.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry;
@@ -67,13 +68,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->mPrefetchArray:[I
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lt v0, v1, :cond_1
-
-    iget-object v1, p0, Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->mPrefetchArray:[I
+    if-lt v0, v2, :cond_1
 
     mul-int/lit8 v2, v0, 0x2
 
@@ -95,11 +92,9 @@
 
     aput p1, v1, v0
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->mPrefetchArray:[I
-
     add-int/lit8 v0, v0, 0x1
 
-    aput p2, p1, v0
+    aput p2, v1, v0
 
     iget p1, p0, Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->mCount:I
 
@@ -135,8 +130,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->mPrefetchArray:[I
-
     const/4 v1, -0x1
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([II)V
@@ -160,8 +153,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->mPrefetchArray:[I
-
     const/4 v1, -0x1
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([II)V
diff --git a/com.discord/smali/androidx/recyclerview/widget/GapWorker$Task.smali b/com.discord/smali/androidx/recyclerview/widget/GapWorker$Task.smali
index f6dbc27f1e..2681fe9aeb 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GapWorker$Task.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GapWorker$Task.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/GapWorker$Task;
 .super Ljava/lang/Object;
+.source "GapWorker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/GapWorker.smali b/com.discord/smali/androidx/recyclerview/widget/GapWorker.smali
index 6e4ca48848..209e4e6f2c 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GapWorker.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GapWorker.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/GapWorker;
 .super Ljava/lang/Object;
+.source "GapWorker.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -659,7 +660,6 @@
 
     if-eqz v2, :cond_0
 
-    :goto_0
     iput-wide v0, p0, Landroidx/recyclerview/widget/GapWorker;->mPostTimeNs:J
 
     invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
@@ -678,7 +678,7 @@
 
     move-wide v4, v0
 
-    :goto_1
+    :goto_0
     if-ge v3, v2, :cond_2
 
     iget-object v6, p0, Landroidx/recyclerview/widget/GapWorker;->mRecyclerViews:Ljava/util/ArrayList;
@@ -702,20 +702,27 @@
     invoke-static {v6, v7, v4, v5}, Ljava/lang/Math;->max(JJ)J
 
     move-result-wide v4
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :cond_1
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     cmp-long v2, v4, v0
 
     if-nez v2, :cond_3
 
-    goto :goto_0
+    iput-wide v0, p0, Landroidx/recyclerview/widget/GapWorker;->mPostTimeNs:J
+
+    invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
+
+    return-void
 
     :cond_3
+    :try_start_2
     sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
     invoke-virtual {v2, v4, v5}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
@@ -724,15 +731,17 @@
 
     iget-wide v4, p0, Landroidx/recyclerview/widget/GapWorker;->mFrameIntervalNs:J
 
-    const/4 v6, 0x0
-
     add-long/2addr v2, v4
 
     invoke-virtual {p0, v2, v3}, Landroidx/recyclerview/widget/GapWorker;->prefetch(J)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto :goto_0
+    iput-wide v0, p0, Landroidx/recyclerview/widget/GapWorker;->mPostTimeNs:J
+
+    invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
+
+    return-void
 
     :catchall_0
     move-exception v2
@@ -742,4 +751,6 @@
     invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
 
     throw v2
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$DefaultSpanSizeLookup.smali b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$DefaultSpanSizeLookup.smali
index 42f35068a6..000e748997 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$DefaultSpanSizeLookup.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$DefaultSpanSizeLookup.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/widget/GridLayoutManager$DefaultSpanSizeLookup;
 .super Landroidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup;
+.source "GridLayoutManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$LayoutParams.smali b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$LayoutParams.smali
index 74051cdecf..7766604e27 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$LayoutParams.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;
 .super Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+.source "GridLayoutManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup.smali b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup.smali
index 58fc2264da..e0389e1719 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup;
 .super Ljava/lang/Object;
+.source "GridLayoutManager.java"
 
 
 # annotations
@@ -242,7 +243,9 @@
 
     add-int/2addr v3, v4
 
-    goto :goto_1
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
 
     :cond_1
     const/4 v2, 0x0
diff --git a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali
index 0643c29dd6..b1b6c43c5e 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/GridLayoutManager;
 .super Landroidx/recyclerview/widget/LinearLayoutManager;
+.source "GridLayoutManager.java"
 
 
 # annotations
@@ -174,15 +175,15 @@
 .method private assignSpans(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;IIZ)V
     .locals 3
 
-    const/4 p4, -0x1
+    const/4 p4, 0x0
 
-    const/4 v0, 0x0
+    const/4 v0, -0x1
 
     if-eqz p5, :cond_0
 
-    const/4 p4, 0x1
+    const/4 v0, 0x1
 
-    move p4, p3
+    move v0, p3
 
     const/4 p3, 0x0
 
@@ -196,7 +197,7 @@
     const/4 p5, -0x1
 
     :goto_0
-    if-eq p3, p4, :cond_1
+    if-eq p3, v0, :cond_1
 
     iget-object v1, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mSet:[Landroid/view/View;
 
@@ -218,11 +219,11 @@
 
     iput v1, v2, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanSize:I
 
-    iput v0, v2, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
+    iput p4, v2, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
 
     iget v1, v2, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanSize:I
 
-    add-int/2addr v0, v1
+    add-int/2addr p4, v1
 
     add-int/2addr p3, p5
 
@@ -466,8 +467,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mSet:[Landroid/view/View;
-
     array-length v0, v0
 
     iget v1, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mSpanCount:I
@@ -869,10 +868,9 @@
 
     move-result v1
 
-    :goto_0
     sub-int/2addr v0, v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Landroidx/recyclerview/widget/GridLayoutManager;->getHeight()I
@@ -889,9 +887,9 @@
 
     move-result v1
 
-    goto :goto_0
+    sub-int/2addr v0, v1
 
-    :goto_1
+    :goto_0
     invoke-direct {p0, v0}, Landroidx/recyclerview/widget/GridLayoutManager;->calculateItemBorders(I)V
 
     return-void
@@ -1083,22 +1081,22 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mOrientation:I
 
-    const/4 v1, -0x1
+    const/4 v1, -0x2
 
-    const/4 v2, -0x2
+    const/4 v2, -0x1
 
     if-nez v0, :cond_0
 
     new-instance v0, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;
 
-    invoke-direct {v0, v2, v1}, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;-><init>(II)V
+    invoke-direct {v0, v1, v2}, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;-><init>(II)V
 
     return-object v0
 
     :cond_0
     new-instance v0, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;
 
-    invoke-direct {v0, v1, v2}, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;-><init>(II)V
+    invoke-direct {v0, v2, v1}, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;-><init>(II)V
 
     return-object v0
 .end method
@@ -1233,23 +1231,19 @@
 
     iget v1, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mSpanCount:I
 
+    sub-int v2, v1, p1
+
+    aget v2, v0, v2
+
     sub-int/2addr v1, p1
 
-    aget v0, v0, v1
+    sub-int/2addr v1, p2
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mCachedBorders:[I
-
-    iget v2, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mSpanCount:I
+    aget p1, v0, v1
 
     sub-int/2addr v2, p1
 
-    sub-int/2addr v2, p2
-
-    aget p1, v1, v2
-
-    sub-int/2addr v0, p1
-
-    return v0
+    return v2
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mCachedBorders:[I
@@ -1258,8 +1252,6 @@
 
     aget p2, v0, p2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mCachedBorders:[I
-
     aget p1, v0, p1
 
     sub-int/2addr p2, p1
@@ -1371,6 +1363,12 @@
 
     add-int/2addr v0, v3
 
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    goto :goto_3
+
     :cond_4
     const/4 v4, 0x0
 
@@ -1753,12 +1751,11 @@
 
     move v2, v1
 
-    :goto_a
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_13
     iget v0, v7, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
@@ -1769,6 +1766,10 @@
 
     move v3, v1
 
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
     goto :goto_a
 
     :cond_14
@@ -1790,7 +1791,7 @@
 
     move/from16 v0, v17
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_15
     iget v0, v7, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
@@ -1801,7 +1802,7 @@
 
     const/4 v3, 0x0
 
-    :goto_b
+    :goto_a
     if-ge v10, v12, :cond_1a
 
     iget-object v4, v6, Landroidx/recyclerview/widget/GridLayoutManager;->mSet:[Landroid/view/View;
@@ -1854,7 +1855,11 @@
 
     move v13, v1
 
-    goto :goto_d
+    move v14, v2
+
+    move/from16 v16, v3
+
+    goto :goto_b
 
     :cond_16
     invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/GridLayoutManager;->getPaddingLeft()I
@@ -1877,7 +1882,15 @@
 
     add-int/2addr v1, v0
 
-    goto :goto_c
+    move v13, v0
+
+    move v15, v1
+
+    move v14, v2
+
+    move/from16 v16, v3
+
+    goto :goto_b
 
     :cond_17
     invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/GridLayoutManager;->getPaddingTop()I
@@ -1900,16 +1913,15 @@
 
     add-int/2addr v3, v2
 
-    :goto_c
     move v13, v0
 
     move v15, v1
 
-    :goto_d
     move v14, v2
 
     move/from16 v16, v3
 
+    :goto_b
     move-object/from16 v0, p0
 
     move-object v1, v7
@@ -1960,7 +1972,7 @@
 
     move/from16 v3, v16
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :cond_1a
     iget-object v0, v6, Landroidx/recyclerview/widget/GridLayoutManager;->mSet:[Landroid/view/View;
@@ -2000,7 +2012,7 @@
 .end method
 
 .method public onFocusSearchFailed(Landroid/view/View;ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)Landroid/view/View;
-    .locals 25
+    .locals 22
 
     move-object/from16 v0, p0
 
@@ -2128,12 +2140,12 @@
 
     const/4 v15, 0x0
 
-    const/16 v17, 0x0
+    const/16 v16, 0x0
 
-    const/16 v18, -0x1
+    const/16 v17, -0x1
 
     :goto_4
-    if-eq v5, v11, :cond_17
+    if-eq v5, v11, :cond_18
 
     invoke-direct {v0, v1, v2, v5}, Landroidx/recyclerview/widget/GridLayoutManager;->getSpanGroupIndex(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;I)I
 
@@ -2143,34 +2155,34 @@
 
     move-result-object v1
 
-    if-eq v1, v3, :cond_17
+    if-eq v1, v3, :cond_18
 
     invoke-virtual {v1}, Landroid/view/View;->hasFocusable()Z
 
-    move-result v20
+    move-result v18
 
-    if-eqz v20, :cond_7
+    if-eqz v18, :cond_7
 
     if-eq v9, v14, :cond_7
 
     if-eqz v4, :cond_6
 
-    goto/16 :goto_d
+    goto/16 :goto_a
 
     :cond_6
-    move-object/from16 v21, v3
+    move-object/from16 v18, v3
 
-    move/from16 v23, v8
+    move/from16 v20, v8
 
-    move/from16 v22, v11
+    move/from16 v19, v11
 
-    move/from16 v24, v14
+    move/from16 p1, v14
 
-    move/from16 v8, v17
+    move/from16 v8, v16
 
-    move/from16 v11, v18
+    move/from16 v11, v17
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
     :cond_7
     invoke-virtual {v1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
@@ -2181,11 +2193,11 @@
 
     iget v2, v9, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
 
-    move-object/from16 v21, v3
+    move-object/from16 v18, v3
 
     iget v3, v9, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
 
-    move/from16 v22, v11
+    move/from16 v19, v11
 
     iget v11, v9, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanSize:I
 
@@ -2222,20 +2234,17 @@
     if-nez v10, :cond_b
 
     :cond_a
-    :goto_5
-    move/from16 v23, v8
+    move/from16 v20, v8
 
-    move/from16 v24, v14
+    move/from16 p1, v14
 
-    move/from16 v8, v17
+    move/from16 v8, v16
 
-    :goto_6
-    move/from16 v11, v18
+    move/from16 v11, v17
 
-    :goto_7
-    const/16 v19, 0x1
+    const/4 v14, 0x1
 
-    goto :goto_9
+    goto/16 :goto_7
 
     :cond_b
     invoke-static {v2, v6}, Ljava/lang/Math;->max(II)I
@@ -2252,35 +2261,66 @@
 
     move-result v20
 
-    if-eqz v20, :cond_e
+    if-eqz v20, :cond_f
 
     if-le v11, v15, :cond_c
 
-    goto :goto_5
+    move/from16 v20, v8
+
+    move/from16 p1, v14
+
+    move/from16 v8, v16
+
+    move/from16 v11, v17
+
+    const/4 v14, 0x1
+
+    goto :goto_7
 
     :cond_c
-    if-ne v11, v15, :cond_11
+    if-ne v11, v15, :cond_e
 
     if-le v2, v8, :cond_d
 
     const/4 v11, 0x1
 
-    goto :goto_8
+    goto :goto_5
 
     :cond_d
     const/4 v11, 0x0
 
-    :goto_8
-    if-ne v13, v11, :cond_11
+    :goto_5
+    if-ne v13, v11, :cond_e
 
-    goto :goto_5
+    move/from16 v20, v8
+
+    move/from16 p1, v14
+
+    move/from16 v8, v16
+
+    move/from16 v11, v17
+
+    const/4 v14, 0x1
+
+    goto :goto_7
 
     :cond_e
-    if-nez v4, :cond_11
+    move/from16 v20, v8
 
-    move/from16 v23, v8
+    move/from16 p1, v14
 
-    move/from16 v24, v14
+    move/from16 v8, v16
+
+    move/from16 v11, v17
+
+    goto :goto_6
+
+    :cond_f
+    if-nez v4, :cond_14
+
+    move/from16 v20, v8
+
+    move/from16 p1, v14
 
     const/4 v8, 0x1
 
@@ -2288,52 +2328,69 @@
 
     invoke-virtual {v0, v1, v14, v8}, Landroidx/recyclerview/widget/GridLayoutManager;->isViewPartiallyVisible(Landroid/view/View;ZZ)Z
 
-    move-result v16
+    move-result v21
 
-    if-eqz v16, :cond_12
+    if-eqz v21, :cond_13
 
-    move/from16 v8, v17
+    move/from16 v8, v16
 
-    if-le v11, v8, :cond_f
+    if-le v11, v8, :cond_10
 
-    goto :goto_6
-
-    :cond_f
-    if-ne v11, v8, :cond_13
-
-    move/from16 v11, v18
-
-    if-le v2, v11, :cond_10
+    move/from16 v11, v17
 
     const/4 v14, 0x1
 
+    goto :goto_7
+
     :cond_10
-    if-ne v13, v14, :cond_14
+    if-ne v11, v8, :cond_12
+
+    move/from16 v11, v17
+
+    if-le v2, v11, :cond_11
+
+    const/4 v14, 0x1
+
+    :cond_11
+    if-ne v13, v14, :cond_15
+
+    const/4 v14, 0x1
 
     goto :goto_7
 
-    :cond_11
-    move/from16 v23, v8
-
-    move/from16 v24, v14
-
     :cond_12
-    move/from16 v8, v17
+    move/from16 v11, v17
+
+    goto :goto_6
 
     :cond_13
-    move/from16 v11, v18
+    move/from16 v8, v16
+
+    move/from16 v11, v17
+
+    goto :goto_6
 
     :cond_14
-    const/16 v19, 0x0
+    move/from16 v20, v8
 
-    :goto_9
-    if-eqz v19, :cond_16
+    move/from16 p1, v14
+
+    move/from16 v8, v16
+
+    move/from16 v11, v17
+
+    :cond_15
+    :goto_6
+    const/4 v14, 0x0
+
+    :goto_7
+    if-eqz v14, :cond_17
 
     invoke-virtual {v1}, Landroid/view/View;->hasFocusable()Z
 
     move-result v14
 
-    if-eqz v14, :cond_15
+    if-eqz v14, :cond_16
 
     iget v4, v9, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
 
@@ -2349,17 +2406,15 @@
 
     move v15, v3
 
-    move/from16 v17, v8
+    move/from16 v20, v4
 
-    move/from16 v18, v11
-
-    move v8, v4
+    move/from16 v17, v11
 
     move-object v4, v1
 
-    goto :goto_c
+    goto :goto_9
 
-    :cond_15
+    :cond_16
     iget v8, v9, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
 
     invoke-static {v3, v7}, Ljava/lang/Math;->min(II)I
@@ -2374,29 +2429,28 @@
 
     move-object v10, v1
 
-    move/from16 v17, v3
-
-    move/from16 v18, v8
-
-    goto :goto_b
-
-    :cond_16
-    :goto_a
     move/from16 v17, v8
 
-    move/from16 v18, v11
+    move v8, v3
 
-    :goto_b
-    move/from16 v8, v23
+    goto :goto_9
 
-    :goto_c
+    :cond_17
+    :goto_8
+    move/from16 v17, v11
+
+    :goto_9
     add-int/2addr v5, v12
 
-    move-object/from16 v3, v21
+    move/from16 v14, p1
 
-    move/from16 v11, v22
+    move/from16 v16, v8
 
-    move/from16 v14, v24
+    move-object/from16 v3, v18
+
+    move/from16 v11, v19
+
+    move/from16 v8, v20
 
     move-object/from16 v1, p3
 
@@ -2406,13 +2460,13 @@
 
     goto/16 :goto_4
 
-    :cond_17
-    :goto_d
-    if-eqz v4, :cond_18
+    :cond_18
+    :goto_a
+    if-eqz v4, :cond_19
 
     return-object v4
 
-    :cond_18
+    :cond_19
     return-object v10
 .end method
 
@@ -2486,7 +2540,6 @@
 
     move v3, p1
 
-    :goto_1
     invoke-static/range {v1 .. v6}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;->obtain(IIIIZZ)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;
 
     move-result-object p1
@@ -2520,17 +2573,23 @@
 
     const/4 v5, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_1
     const/4 v6, 0x0
 
     move v1, p1
 
-    goto :goto_1
+    invoke-static/range {v1 .. v6}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;->obtain(IIIIZZ)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;
+
+    move-result-object p1
+
+    invoke-virtual {p4, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setCollectionItemInfo(Ljava/lang/Object;)V
+
+    return-void
 .end method
 
 .method public onItemsAdded(Landroidx/recyclerview/widget/RecyclerView;II)V
@@ -2694,9 +2753,7 @@
 
     iget-object p3, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mCachedBorders:[I
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mCachedBorders:[I
-
-    array-length v1, v1
+    array-length v1, p3
 
     sub-int/2addr v1, v3
 
@@ -2731,9 +2788,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mCachedBorders:[I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/GridLayoutManager;->mCachedBorders:[I
-
-    array-length v0, v0
+    array-length v0, p1
 
     sub-int/2addr v0, v3
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$1.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$1.smali
index eb47970685..f99175bae9 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$1;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -58,9 +59,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$1;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$1;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
-
-    iget-object v1, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+    iget-object v1, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/ItemTouchHelper;->moveIfNecessary(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$2.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$2.smali
index cad76b6591..1e47770651 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$2;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
@@ -165,9 +166,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$2;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/ItemTouchHelper$2;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
-
-    iget v2, v2, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelectedFlags:I
+    iget v2, p1, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelectedFlags:I
 
     invoke-virtual {p1, p2, v2, v1}, Landroidx/recyclerview/widget/ItemTouchHelper;->updateDxDy(Landroid/view/MotionEvent;II)V
 
@@ -213,8 +212,6 @@
 
     iput v3, p1, Landroidx/recyclerview/widget/ItemTouchHelper;->mActivePointerId:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$2;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
-
     const/4 v2, 0x0
 
     invoke-virtual {p1, v2, v1}, Landroidx/recyclerview/widget/ItemTouchHelper;->select(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
@@ -364,9 +361,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$2;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$2;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
-
-    iget v0, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelectedFlags:I
+    iget v0, p1, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelectedFlags:I
 
     invoke-virtual {p1, p2, v0, v1}, Landroidx/recyclerview/widget/ItemTouchHelper;->updateDxDy(Landroid/view/MotionEvent;II)V
 
@@ -443,9 +438,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$2;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$2;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
-
-    iget v1, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelectedFlags:I
+    iget v1, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelectedFlags:I
 
     invoke-virtual {v0, p2, v1, p1}, Landroidx/recyclerview/widget/ItemTouchHelper;->updateDxDy(Landroid/view/MotionEvent;II)V
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$3.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$3.smali
index fc00f2eab2..7bbddfdd1b 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$3.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$3;
 .super Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;
+.source "ItemTouchHelper.java"
 
 
 # annotations
@@ -111,11 +112,9 @@
 
     if-lez p1, :cond_2
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$3;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
+    iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$3;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
 
-    iget v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$3;->val$swipeDir:I
-
-    invoke-virtual {p1, p0, v0}, Landroidx/recyclerview/widget/ItemTouchHelper;->postDispatchSwipe(Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;I)V
+    invoke-virtual {v0, p0, p1}, Landroidx/recyclerview/widget/ItemTouchHelper;->postDispatchSwipe(Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;I)V
 
     :cond_2
     :goto_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$4.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$4.smali
index fdd9c2645f..65294a4afd 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$4.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$4;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$5.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$5.smali
index 5ec606c953..7806d1dc70 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$5.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$5;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$1.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$1.smali
index 7a02bb53bb..a46831cc95 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/ItemTouchHelper$Callback$1;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$2.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$2.smali
index 2d39955f48..9c15c8c677 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/ItemTouchHelper$Callback$2;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback.smali
index f34d7ed5a2..4b1ee58786 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 
 # annotations
@@ -84,7 +85,6 @@
 
     shl-int/lit8 p1, v1, 0x2
 
-    :goto_0
     or-int/2addr p0, p1
 
     return p0
@@ -102,7 +102,9 @@
 
     shl-int/lit8 p1, p1, 0x2
 
-    goto :goto_0
+    or-int/2addr p0, p1
+
+    return p0
 .end method
 
 .method public static getDefaultUIUtil()Landroidx/recyclerview/widget/ItemTouchUIUtil;
@@ -482,7 +484,6 @@
 
     shr-int/lit8 p2, v1, 0x2
 
-    :goto_0
     or-int/2addr p1, p2
 
     return p1
@@ -500,7 +501,9 @@
 
     shr-int/lit8 p2, p2, 0x2
 
-    goto :goto_0
+    or-int/2addr p1, p2
+
+    return p1
 .end method
 
 .method final getAbsoluteMovementFlags(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
@@ -755,6 +758,8 @@
     :cond_1
     const/4 p1, -0x1
 
+    return p1
+
     :cond_2
     return p1
 .end method
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener.smali
index 2920b80209..e95fd9918e 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;
 .super Landroid/view/GestureDetector$SimpleOnGestureListener;
+.source "ItemTouchHelper.java"
 
 
 # annotations
@@ -131,23 +132,15 @@
 
     iput v2, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mInitialTouchX:F
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
-
     iput p1, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mInitialTouchY:F
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
+    const/4 p1, 0x0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
+    iput p1, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mDy:F
 
-    const/4 v2, 0x0
+    iput p1, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mDx:F
 
-    iput v2, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mDy:F
-
-    iput v2, p1, Landroidx/recyclerview/widget/ItemTouchHelper;->mDx:F
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;->this$0:Landroidx/recyclerview/widget/ItemTouchHelper;
-
-    iget-object p1, p1, Landroidx/recyclerview/widget/ItemTouchHelper;->mCallback:Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
+    iget-object p1, v1, Landroidx/recyclerview/widget/ItemTouchHelper;->mCallback:Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/ItemTouchHelper$Callback;->isLongPressDragEnabled()Z
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation$1.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation$1.smali
index d9afc540cc..aac68d11e5 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation$1;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation.smali
index 7395d68623..74baa38c5b 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Landroid/animation/Animator$AnimatorListener;
@@ -205,15 +206,15 @@
 .end method
 
 .method public update()V
-    .locals 4
+    .locals 3
 
     iget v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mStartDx:F
 
     iget v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mTargetX:F
 
-    cmpl-float v0, v0, v1
+    cmpl-float v2, v0, v1
 
-    if-nez v0, :cond_0
+    if-nez v2, :cond_0
 
     iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mViewHolder:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
@@ -223,36 +224,29 @@
 
     move-result v0
 
-    :goto_0
     iput v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mX:F
 
-    goto :goto_1
-
-    :cond_0
-    iget v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mStartDx:F
-
-    iget v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mFraction:F
-
-    iget v2, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mTargetX:F
-
-    iget v3, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mStartDx:F
-
-    sub-float/2addr v2, v3
-
-    mul-float v1, v1, v2
-
-    add-float/2addr v0, v1
-
     goto :goto_0
 
-    :goto_1
+    :cond_0
+    iget v2, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mFraction:F
+
+    sub-float/2addr v1, v0
+
+    mul-float v2, v2, v1
+
+    add-float/2addr v0, v2
+
+    iput v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mX:F
+
+    :goto_0
     iget v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mStartDy:F
 
     iget v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mTargetY:F
 
-    cmpl-float v0, v0, v1
+    cmpl-float v2, v0, v1
 
-    if-nez v0, :cond_1
+    if-nez v2, :cond_1
 
     iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mViewHolder:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
@@ -262,25 +256,20 @@
 
     move-result v0
 
-    :goto_2
     iput v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mY:F
 
     return-void
 
     :cond_1
-    iget v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mStartDy:F
+    iget v2, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mFraction:F
 
-    iget v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mFraction:F
+    sub-float/2addr v1, v0
 
-    iget v2, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mTargetY:F
+    mul-float v2, v2, v1
 
-    iget v3, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mStartDy:F
+    add-float/2addr v0, v2
 
-    sub-float/2addr v2, v3
+    iput v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->mY:F
 
-    mul-float v1, v1, v2
-
-    add-float/2addr v0, v1
-
-    goto :goto_2
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$SimpleCallback.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$SimpleCallback.smali
index 3579b5724d..81a6b035f0 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$SimpleCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$SimpleCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/ItemTouchHelper$SimpleCallback;
 .super Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
+.source "ItemTouchHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ViewDropHandler.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ViewDropHandler.smali
index abac141e75..bf6ef79b0d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ViewDropHandler.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper$ViewDropHandler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/ItemTouchHelper$ViewDropHandler;
 .super Ljava/lang/Object;
+.source "ItemTouchHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper.smali
index 4f8a147d2b..c9d5784869 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/ItemTouchHelper;
 .super Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;
+.source "ItemTouchHelper.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener;
@@ -260,9 +261,9 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mDx:F
 
-    const/4 v1, 0x4
+    const/16 v1, 0x8
 
-    const/16 v2, 0x8
+    const/4 v2, 0x4
 
     const/4 v3, 0x0
 
@@ -282,11 +283,9 @@
 
     if-eqz v4, :cond_2
 
-    iget v4, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mActivePointerId:I
+    iget v5, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mActivePointerId:I
 
-    if-ltz v4, :cond_2
-
-    iget-object v4, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mVelocityTracker:Landroid/view/VelocityTracker;
+    if-ltz v5, :cond_2
 
     const/16 v5, 0x3e8
 
@@ -320,9 +319,12 @@
 
     if-lez v3, :cond_1
 
-    const/16 v1, 0x8
+    goto :goto_1
 
     :cond_1
+    const/4 v1, 0x4
+
+    :goto_1
     invoke-static {v4}, Ljava/lang/Math;->abs(F)F
 
     move-result v2
@@ -403,9 +405,9 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mDy:F
 
-    const/4 v1, 0x1
+    const/4 v1, 0x2
 
-    const/4 v2, 0x2
+    const/4 v2, 0x1
 
     const/4 v3, 0x0
 
@@ -425,11 +427,9 @@
 
     if-eqz v4, :cond_2
 
-    iget v4, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mActivePointerId:I
+    iget v5, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mActivePointerId:I
 
-    if-ltz v4, :cond_2
-
-    iget-object v4, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mVelocityTracker:Landroid/view/VelocityTracker;
+    if-ltz v5, :cond_2
 
     const/16 v5, 0x3e8
 
@@ -463,9 +463,12 @@
 
     if-lez v3, :cond_1
 
-    const/4 v1, 0x2
+    goto :goto_1
 
     :cond_1
+    const/4 v1, 0x1
+
+    :goto_1
     invoke-static {v5}, Ljava/lang/Math;->abs(F)F
 
     move-result v2
@@ -643,8 +646,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSwapTargets:Ljava/util/List;
-
     invoke-interface {v2}, Ljava/util/List;->clear()V
 
     iget-object v2, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mDistances:Ljava/util/List;
@@ -881,7 +882,7 @@
 .end method
 
 .method private findSwipedView(Landroid/view/MotionEvent;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-    .locals 5
+    .locals 6
 
     iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -900,8 +901,6 @@
     return-object v2
 
     :cond_0
-    iget v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mActivePointerId:I
-
     invoke-virtual {p1, v1}, Landroid/view/MotionEvent;->findPointerIndex(I)I
 
     move-result v1
@@ -932,13 +931,11 @@
 
     iget v4, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSlop:I
 
-    int-to-float v4, v4
+    int-to-float v5, v4
 
-    cmpg-float v4, v3, v4
+    cmpg-float v5, v3, v5
 
-    if-gez v4, :cond_1
-
-    iget v4, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSlop:I
+    if-gez v5, :cond_1
 
     int-to-float v4, v4
 
@@ -1134,8 +1131,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->recycle()V
 
     const/4 v0, 0x0
@@ -1219,8 +1214,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mItemTouchHelperGestureListener:Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;->doNotReactToLongPress()V
 
     iput-object v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mItemTouchHelperGestureListener:Landroidx/recyclerview/widget/ItemTouchHelper$ItemTouchHelperGestureListener;
@@ -1365,6 +1358,8 @@
 
     move-result p1
 
+    return p1
+
     :cond_6
     return p1
 
@@ -1388,8 +1383,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     if-eqz v0, :cond_1
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/ItemTouchHelper;->destroyCallbacks()V
@@ -1426,7 +1419,7 @@
 .end method
 
 .method checkSelectForSwipe(ILandroid/view/MotionEvent;I)V
-    .locals 7
+    .locals 8
 
     iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
@@ -1518,13 +1511,11 @@
 
     iget v6, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSlop:I
 
-    int-to-float v6, v6
+    int-to-float v7, v6
 
-    cmpg-float v6, v4, v6
+    cmpg-float v7, v4, v7
 
-    if-gez v6, :cond_4
-
-    iget v6, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSlop:I
+    if-gez v7, :cond_4
 
     int-to-float v6, v6
 
@@ -1599,6 +1590,8 @@
 
     invoke-virtual {p0, p1, v1}, Landroidx/recyclerview/widget/ItemTouchHelper;->select(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
 
+    return-void
+
     :cond_9
     :goto_0
     return-void
@@ -1729,8 +1722,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-
     iget-object v1, v1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     iget v2, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelectedStartX:F
@@ -2026,8 +2017,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->recycle()V
 
     :cond_0
@@ -2076,8 +2065,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-
     if-ne p1, v0, :cond_1
 
     const/4 p1, 0x0
@@ -2132,8 +2119,6 @@
 
     aget v0, p3, v0
 
-    iget-object p3, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mTmpPosition:[F
-
     const/4 v1, 0x1
 
     aget p3, p3, v1
@@ -2186,8 +2171,6 @@
 
     aget v0, p3, v0
 
-    iget-object p3, p0, Landroidx/recyclerview/widget/ItemTouchHelper;->mTmpPosition:[F
-
     const/4 v1, 0x1
 
     aget p3, p3, v1
@@ -2291,8 +2274,6 @@
     goto :goto_0
 
     :cond_1
-    iget-wide v7, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mDragScrollStartTimeInMs:J
-
     sub-long v7, v5, v7
 
     :goto_0
@@ -2525,9 +2506,14 @@
 
     move-result v12
 
+    move v14, v12
+
+    goto :goto_3
+
     :cond_7
     move v14, v12
 
+    :goto_3
     if-eqz v1, :cond_8
 
     iget-object v9, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mCallback:Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
@@ -2562,17 +2548,17 @@
 
     move v1, v7
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_8
     move v12, v14
 
-    :goto_3
+    :goto_4
     if-nez v12, :cond_a
 
     if-eqz v1, :cond_9
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_9
     iput-wide v3, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mDragScrollStartTimeInMs:J
@@ -2580,7 +2566,7 @@
     return v2
 
     :cond_a
-    :goto_4
+    :goto_5
     iget-wide v7, v0, Landroidx/recyclerview/widget/ItemTouchHelper;->mDragScrollStartTimeInMs:J
 
     cmp-long v2, v7, v3
@@ -2670,15 +2656,13 @@
 
     add-int/lit8 v16, v0, -0x1
 
-    iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+    iget-object v9, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    if-eqz v0, :cond_8
+    if-eqz v9, :cond_8
 
-    iget-object v8, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-
-    iget-object v0, v8, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v0, v9, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
@@ -2693,7 +2677,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-direct {v11, v8}, Landroidx/recyclerview/widget/ItemTouchHelper;->swipeIfNecessary(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
+    invoke-direct {v11, v9}, Landroidx/recyclerview/widget/ItemTouchHelper;->swipeIfNecessary(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
 
     move-result v0
 
@@ -2722,10 +2706,9 @@
 
     const/16 v17, 0x0
 
-    :goto_2
     const/16 v18, 0x0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     iget v2, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mDy:F
@@ -2744,7 +2727,9 @@
 
     mul-float v2, v2, v3
 
-    move/from16 v17, v2
+    move/from16 v18, v2
+
+    const/16 v17, 0x0
 
     goto :goto_2
 
@@ -2765,37 +2750,35 @@
 
     mul-float v2, v2, v3
 
-    move/from16 v18, v2
+    move/from16 v17, v2
 
-    const/16 v17, 0x0
+    const/16 v18, 0x0
 
-    :goto_3
+    :goto_2
     if-ne v4, v15, :cond_5
 
     const/16 v6, 0x8
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     if-lez v7, :cond_6
 
     const/4 v6, 0x2
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const/4 v6, 0x4
 
-    :goto_4
+    :goto_3
     iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mTmpPosition:[F
 
     invoke-direct {v11, v0}, Landroidx/recyclerview/widget/ItemTouchHelper;->getSelectedDxDy([F)V
 
     iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mTmpPosition:[F
 
-    aget v19, v0, v9
-
-    iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mTmpPosition:[F
+    aget v19, v0, v8
 
     aget v20, v0, v14
 
@@ -2805,7 +2788,7 @@
 
     move-object/from16 v1, p0
 
-    move-object v2, v8
+    move-object v2, v9
 
     move v3, v6
 
@@ -2819,11 +2802,11 @@
 
     move/from16 v21, v7
 
-    move/from16 v7, v18
+    move/from16 v7, v17
 
-    move-object/from16 v22, v8
+    move/from16 v8, v18
 
-    move/from16 v8, v17
+    move-object/from16 v22, v9
 
     move/from16 v9, v21
 
@@ -2837,9 +2820,9 @@
 
     iget-object v1, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    sub-float v2, v18, v19
+    sub-float v2, v17, v19
 
-    sub-float v3, v17, v20
+    sub-float v3, v18, v20
 
     invoke-virtual {v0, v1, v15, v2, v3}, Landroidx/recyclerview/widget/ItemTouchHelper$Callback;->getAnimationDuration(Landroidx/recyclerview/widget/RecyclerView;IFF)J
 
@@ -2853,12 +2836,12 @@
 
     invoke-virtual {v14}, Landroidx/recyclerview/widget/ItemTouchHelper$RecoverAnimation;->start()V
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_7
-    move-object v0, v8
+    move-object v0, v9
 
     const/16 v21, 0x8
 
@@ -2872,22 +2855,22 @@
 
     invoke-virtual {v1, v2, v0}, Landroidx/recyclerview/widget/ItemTouchHelper$Callback;->clearView(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    :goto_5
+    :goto_4
     const/4 v0, 0x0
 
     iput-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_8
     const/16 v21, 0x8
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    :goto_6
-    if-eqz v12, :cond_9
+    :goto_5
+    if-eqz v12, :cond_a
 
     iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mCallback:Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
 
@@ -2941,31 +2924,36 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->performHapticFeedback(I)Z
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_9
     const/4 v1, 0x0
 
-    :goto_7
+    goto :goto_6
+
+    :cond_a
+    const/4 v1, 0x0
+
+    :goto_6
     iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_c
 
     iget-object v2, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
-    if-eqz v2, :cond_a
+    if-eqz v2, :cond_b
 
     const/4 v1, 0x1
 
-    :cond_a
+    :cond_b
     invoke-interface {v0, v1}, Landroid/view/ViewParent;->requestDisallowInterceptTouchEvent(Z)V
 
-    :cond_b
-    if-nez v9, :cond_c
+    :cond_c
+    if-nez v8, :cond_d
 
     iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2975,7 +2963,7 @@
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->requestSimpleAnimationsInNextLayout()V
 
-    :cond_c
+    :cond_d
     iget-object v0, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mCallback:Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
 
     iget-object v1, v11, Landroidx/recyclerview/widget/ItemTouchHelper;->mSelected:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtil.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtil.smali
index 7972cb2c09..23a836af17 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtil.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtil.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/ItemTouchUIUtil;
 .super Ljava/lang/Object;
+.source "ItemTouchUIUtil.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtilImpl.smali b/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtilImpl.smali
index 29e39bec37..8224cd324f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtilImpl.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ItemTouchUIUtilImpl.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ItemTouchUIUtilImpl;
 .super Ljava/lang/Object;
+.source "ItemTouchUIUtilImpl.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ItemTouchUIUtil;
diff --git a/com.discord/smali/androidx/recyclerview/widget/LayoutState.smali b/com.discord/smali/androidx/recyclerview/widget/LayoutState.smali
index 3329ee6a85..51fb8dfe18 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LayoutState.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LayoutState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/LayoutState;
 .super Ljava/lang/Object;
+.source "LayoutState.java"
 
 
 # static fields
@@ -64,8 +65,6 @@
 
     if-ltz v0, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/LayoutState;->mCurrentPosition:I
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
     move-result p1
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$AnchorInfo.smali b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$AnchorInfo.smali
index 3323bd4646..5dbb0cd081 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$AnchorInfo.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$AnchorInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
 .super Ljava/lang/Object;
+.source "LinearLayoutManager.java"
 
 
 # annotations
@@ -87,10 +88,9 @@
 
     add-int/2addr p1, v0
 
-    :goto_0
     iput p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mCoordinate:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -99,9 +99,9 @@
 
     move-result p1
 
-    goto :goto_0
+    iput p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mCoordinate:I
 
-    :goto_1
+    :goto_0
     iput p2, p0, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mPosition:I
 
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult.smali b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult.smali
index 76370f5636..14d7bbb0ec 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;
 .super Ljava/lang/Object;
+.source "LinearLayoutManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutState.smali b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutState.smali
index d5d59139eb..c7d098d455 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutState.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$LayoutState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 .super Ljava/lang/Object;
+.source "LinearLayoutManager.java"
 
 
 # annotations
@@ -168,7 +169,6 @@
 
     const/4 p1, -0x1
 
-    :goto_0
     iput p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
 
     return-void
@@ -184,7 +184,9 @@
 
     move-result p1
 
-    goto :goto_0
+    iput p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
+
+    return-void
 .end method
 
 .method hasMore(Landroidx/recyclerview/widget/RecyclerView$State;)Z
@@ -194,8 +196,6 @@
 
     if-ltz v0, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
     move-result p1
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState$1.smali b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState$1.smali
index d24954b602..0ee9cecef2 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/LinearLayoutManager$SavedState$1;
 .super Ljava/lang/Object;
+.source "LinearLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState.smali b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState.smali
index 1b8ded5dd3..ca9423c314 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
 .super Ljava/lang/Object;
+.source "LinearLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali
index a45421388d..d6664e4a1f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/LinearLayoutManager;
 .super Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+.source "LinearLayoutManager.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ItemTouchHelper$ViewDropHandler;
@@ -412,7 +413,6 @@
 
     move-result v1
 
-    :goto_0
     invoke-virtual {p0, v0, v1, p1, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->findOneVisibleChild(IIZZ)Landroid/view/View;
 
     move-result-object p1
@@ -428,7 +428,11 @@
 
     const/4 v1, -0x1
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v1, p1, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->findOneVisibleChild(IIZZ)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method private findFirstVisibleChildClosestToStart(ZZ)Landroid/view/View;
@@ -446,7 +450,6 @@
 
     const/4 v1, -0x1
 
-    :goto_0
     invoke-virtual {p0, v0, v1, p1, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->findOneVisibleChild(IIZZ)Landroid/view/View;
 
     move-result-object p1
@@ -460,7 +463,11 @@
 
     move-result v1
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v1, p1, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->findOneVisibleChild(IIZZ)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method private findLastPartiallyOrCompletelyInvisibleChild(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)Landroid/view/View;
@@ -686,6 +693,8 @@
 
     sub-int/2addr p2, p1
 
+    return p2
+
     :cond_0
     return p2
 
@@ -901,12 +910,8 @@
 
     iput v8, v3, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v3, v0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     iput v5, v3, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mAvailable:I
 
-    iget-object v3, v0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     invoke-virtual {v3}, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->assignPositionFromScrapList()V
 
     iget-object v3, v0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
@@ -932,12 +937,8 @@
 
     iput v9, v3, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v3, v0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     iput v5, v3, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mAvailable:I
 
-    iget-object v3, v0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     invoke-virtual {v3}, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->assignPositionFromScrapList()V
 
     iget-object v3, v0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
@@ -951,6 +952,8 @@
 
     iput-object v2, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mScrapList:Ljava/util/List;
 
+    return-void
+
     :cond_8
     :goto_3
     return-void
@@ -1055,6 +1058,8 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->recycleViewsFromStart(Landroidx/recyclerview/widget/RecyclerView$Recycler;I)V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -1160,6 +1165,8 @@
     :goto_1
     invoke-direct {p0, p1, p2, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->recycleChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
 
+    return-void
+
     :cond_3
     return-void
 
@@ -1202,6 +1209,8 @@
     :goto_3
     invoke-direct {p0, p1, v0, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->recycleChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
 
+    return-void
+
     :cond_7
     return-void
 .end method
@@ -1260,6 +1269,8 @@
     :goto_1
     invoke-direct {p0, p1, v0, v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->recycleChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
 
+    return-void
+
     :cond_3
     return-void
 
@@ -1302,6 +1313,8 @@
     :goto_3
     invoke-direct {p0, p1, v1, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->recycleChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
 
+    return-void
+
     :cond_7
     return-void
 .end method
@@ -1507,24 +1520,20 @@
 
     if-ne v0, v2, :cond_0
 
-    goto/16 :goto_8
+    goto/16 :goto_6
 
     :cond_0
-    iget v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPosition:I
-
     const/high16 v3, -0x80000000
 
     if-ltz v0, :cond_e
 
-    iget v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPosition:I
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
     move-result p1
 
     if-lt v0, p1, :cond_1
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :cond_1
     iget p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPosition:I
@@ -1537,8 +1546,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;->hasValidAnchor()Z
 
     move-result p1
@@ -1567,10 +1574,9 @@
 
     sub-int/2addr p1, v1
 
-    :goto_0
     iput p1, p2, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mCoordinate:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -1585,9 +1591,9 @@
 
     add-int/2addr p1, v1
 
-    goto :goto_0
+    iput p1, p2, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mCoordinate:I
 
-    :goto_1
+    :goto_0
     return v0
 
     :cond_3
@@ -1698,7 +1704,7 @@
 
     add-int/2addr p1, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_7
     iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -1707,10 +1713,10 @@
 
     move-result p1
 
-    :goto_2
+    :goto_1
     iput p1, p2, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mCoordinate:I
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     invoke-virtual {p0}, Landroidx/recyclerview/widget/LinearLayoutManager;->getChildCount()I
@@ -1733,12 +1739,12 @@
 
     const/4 p1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_9
     const/4 p1, 0x0
 
-    :goto_3
+    :goto_2
     iget-boolean v2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
 
     if-ne p1, v2, :cond_a
@@ -1751,7 +1757,7 @@
     :cond_b
     invoke-virtual {p2}, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->assignCoordinateFromPadding()V
 
-    :goto_4
+    :goto_3
     return v0
 
     :cond_c
@@ -1759,8 +1765,6 @@
 
     iput-boolean p1, p2, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mLayoutFromEnd:Z
 
-    iget-boolean p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
-
     if-eqz p1, :cond_d
 
     iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -1773,10 +1777,9 @@
 
     sub-int/2addr p1, v1
 
-    :goto_5
     iput p1, p2, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mCoordinate:I
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_d
     iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -1789,19 +1792,21 @@
 
     add-int/2addr p1, v1
 
-    goto :goto_5
+    iput p1, p2, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mCoordinate:I
 
-    :goto_6
+    :goto_4
     return v0
 
     :cond_e
-    :goto_7
+    :goto_5
     iput v2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPosition:I
 
     iput v3, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPositionOffset:I
 
+    return v1
+
     :cond_f
-    :goto_8
+    :goto_6
     return v1
 .end method
 
@@ -1872,15 +1877,13 @@
 
     iput p1, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mLayoutDirection:I
 
-    const/4 p4, -0x1
+    const/4 v0, -0x1
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    if-ne p1, v0, :cond_1
+    if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
-    iget v1, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
+    iget p1, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
     iget-object v2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -1888,15 +1891,15 @@
 
     move-result v2
 
-    add-int/2addr v1, v2
+    add-int/2addr p1, v2
 
-    iput v1, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
+    iput p1, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToEnd()Landroid/view/View;
 
     move-result-object p1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+    iget-object p4, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
     iget-boolean v2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
 
@@ -1905,10 +1908,10 @@
     goto :goto_0
 
     :cond_0
-    const/4 p4, 0x1
+    const/4 v0, 0x1
 
     :goto_0
-    iput p4, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
+    iput v0, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
 
     iget-object p4, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
@@ -1955,9 +1958,9 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+    iget-object p4, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
-    iget v2, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
+    iget v2, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
     iget-object v3, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -1967,18 +1970,18 @@
 
     add-int/2addr v2, v3
 
-    iput v2, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
+    iput v2, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+    iget-object p4, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
     iget-boolean v2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
 
     if-eqz v2, :cond_2
 
-    const/4 p4, 0x1
+    const/4 v0, 0x1
 
     :cond_2
-    iput p4, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
+    iput v0, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
 
     iget-object p4, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
@@ -2027,13 +2030,11 @@
 
     if-eqz p3, :cond_3
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+    iget p2, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mAvailable:I
 
-    iget p3, p2, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mAvailable:I
+    sub-int/2addr p2, p1
 
-    sub-int/2addr p3, p1
-
-    iput p3, p2, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mAvailable:I
+    iput p2, p4, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mAvailable:I
 
     :cond_3
     iget-object p2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
@@ -2080,19 +2081,13 @@
 
     iput p1, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+    iput v2, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mLayoutDirection:I
 
-    iput v2, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mLayoutDirection:I
+    iput p2, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+    const/high16 p1, -0x80000000
 
-    iput p2, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
-    const/high16 p2, -0x80000000
-
-    iput p2, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mScrollingOffset:I
+    iput p1, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mScrollingOffset:I
 
     return-void
 .end method
@@ -2128,34 +2123,28 @@
 
     iput p1, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
-    iget-boolean v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
+    iget-boolean p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
 
     const/4 v1, -0x1
 
-    if-eqz v0, :cond_0
+    if-eqz p1, :cond_0
 
-    const/4 v0, 0x1
+    const/4 p1, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, -0x1
+    const/4 p1, -0x1
 
     :goto_0
-    iput v0, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
+    iput p1, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
 
     iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
     iput v1, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mLayoutDirection:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     iput p2, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     const/high16 p2, -0x80000000
 
     iput p2, p1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mScrollingOffset:I
@@ -2272,6 +2261,8 @@
 
     invoke-virtual {p0, p3, p1, p4}, Landroidx/recyclerview/widget/LinearLayoutManager;->collectPrefetchPositionsForLayoutState(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry;)V
 
+    return-void
+
     :cond_3
     :goto_2
     return-void
@@ -2288,8 +2279,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;->hasValidAnchor()Z
 
     move-result v0
@@ -2324,11 +2313,7 @@
     :cond_1
     const/4 v3, 0x0
 
-    goto :goto_0
-
     :cond_2
-    iget v3, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPosition:I
-
     :goto_0
     if-eqz v0, :cond_3
 
@@ -2979,7 +2964,6 @@
 
     iget-object v2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mHorizontalBoundCheck:Landroidx/recyclerview/widget/ViewBoundsCheck;
 
-    :goto_2
     invoke-virtual {v2, p1, p2, v0, v1}, Landroidx/recyclerview/widget/ViewBoundsCheck;->findOneViewWithinBoundFlags(IIII)Landroid/view/View;
 
     move-result-object p1
@@ -2989,7 +2973,11 @@
     :cond_4
     iget-object v2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mVerticalBoundCheck:Landroidx/recyclerview/widget/ViewBoundsCheck;
 
-    goto :goto_2
+    invoke-virtual {v2, p1, p2, v0, v1}, Landroidx/recyclerview/widget/ViewBoundsCheck;->findOneViewWithinBoundFlags(IIII)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method findOneVisibleChild(IIZZ)Landroid/view/View;
@@ -3023,7 +3011,6 @@
 
     iget-object p4, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mHorizontalBoundCheck:Landroidx/recyclerview/widget/ViewBoundsCheck;
 
-    :goto_2
     invoke-virtual {p4, p1, p2, p3, v0}, Landroidx/recyclerview/widget/ViewBoundsCheck;->findOneViewWithinBoundFlags(IIII)Landroid/view/View;
 
     move-result-object p1
@@ -3033,7 +3020,11 @@
     :cond_2
     iget-object p4, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mVerticalBoundCheck:Landroidx/recyclerview/widget/ViewBoundsCheck;
 
-    goto :goto_2
+    invoke-virtual {p4, p1, p2, p3, v0}, Landroidx/recyclerview/widget/ViewBoundsCheck;->findOneViewWithinBoundFlags(IIII)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method findReferenceChild(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;III)Landroid/view/View;
@@ -3636,15 +3627,11 @@
 
     iput p2, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mScrollingOffset:I
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+    iput-boolean v2, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mRecycle:Z
 
-    iput-boolean v2, p2, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mRecycle:Z
+    const/4 p2, 0x1
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p0, p3, p2, p4, v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
+    invoke-virtual {p0, p3, v1, p4, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
     const/4 p2, -0x1
 
@@ -3749,8 +3736,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;->hasValidAnchor()Z
 
     move-result v0
@@ -3854,8 +3839,6 @@
 
     iput-boolean v3, v0, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mLayoutFromEnd:Z
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mAnchorInfo:Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
-
     invoke-direct {p0, p1, p2, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->updateAnchorInfoForLayout(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mAnchorInfo:Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
@@ -3910,13 +3893,11 @@
 
     if-eq v5, v1, :cond_a
 
-    iget v5, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPositionOffset:I
+    iget v6, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPositionOffset:I
 
-    const/high16 v6, -0x80000000
+    const/high16 v7, -0x80000000
 
-    if-eq v5, v6, :cond_a
-
-    iget v5, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPosition:I
+    if-eq v6, v7, :cond_a
 
     invoke-virtual {p0, v5}, Landroidx/recyclerview/widget/LinearLayoutManager;->findViewByPosition(I)Landroid/view/View;
 
@@ -3944,10 +3925,9 @@
 
     iget v5, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPositionOffset:I
 
-    :goto_3
     sub-int/2addr v6, v5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     iget-object v6, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -3966,42 +3946,46 @@
 
     iget v6, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingScrollPositionOffset:I
 
-    goto :goto_3
+    sub-int/2addr v6, v5
 
-    :goto_4
+    :goto_3
     if-lez v6, :cond_9
 
     add-int/2addr v0, v6
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
     sub-int/2addr v3, v6
 
     :cond_a
-    :goto_5
+    :goto_4
     iget-object v5, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mAnchorInfo:Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
 
     iget-boolean v5, v5, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->mLayoutFromEnd:Z
 
-    if-eqz v5, :cond_c
+    if-eqz v5, :cond_b
 
     iget-boolean v5, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
 
     if-eqz v5, :cond_d
 
-    :cond_b
     const/4 v1, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_c
+    :cond_b
     iget-boolean v5, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mShouldReverseLayout:Z
 
-    if-eqz v5, :cond_b
+    if-eqz v5, :cond_c
+
+    goto :goto_5
+
+    :cond_c
+    const/4 v1, 0x1
 
     :cond_d
-    :goto_6
+    :goto_5
     iget-object v5, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mAnchorInfo:Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
 
     invoke-virtual {p0, p1, p2, v5, v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->onAnchorReady(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;I)V
@@ -4038,9 +4022,7 @@
 
     iput v0, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
-    invoke-virtual {p0, p1, v0, p2, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
+    invoke-virtual {p0, p1, v1, p2, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
     iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
@@ -4071,17 +4053,15 @@
 
     iput v3, v5, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
-    iget v5, v3, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
+    iget v3, v5, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
 
     iget-object v6, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
     iget v6, v6, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
 
-    add-int/2addr v5, v6
+    add-int/2addr v3, v6
 
-    iput v5, v3, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
+    iput v3, v5, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
 
     iget-object v3, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
@@ -4107,15 +4087,13 @@
 
     iput v5, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     invoke-virtual {p0, p1, v0, p2, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
     iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
     iget v0, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_f
     iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mAnchorInfo:Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
@@ -4126,8 +4104,6 @@
 
     iput v3, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     invoke-virtual {p0, p1, v1, p2, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
     iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
@@ -4159,17 +4135,15 @@
 
     iput v0, v5, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
-    iget v5, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
+    iget v0, v5, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
 
     iget-object v6, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
     iget v6, v6, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mItemDirection:I
 
-    add-int/2addr v5, v6
+    add-int/2addr v0, v6
 
-    iput v5, v0, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
+    iput v0, v5, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mCurrentPosition:I
 
     iget-object v0, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 
@@ -4195,8 +4169,6 @@
 
     iput v5, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mExtra:I
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
-
     invoke-virtual {p0, p1, v1, p2, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
     iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
@@ -4204,7 +4176,7 @@
     iget v3, v1, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
 
     :cond_11
-    :goto_7
+    :goto_6
     invoke-virtual {p0}, Landroidx/recyclerview/widget/LinearLayoutManager;->getChildCount()I
 
     move-result v1
@@ -4231,12 +4203,11 @@
 
     move-result v1
 
-    :goto_8
     add-int/2addr v0, v1
 
     add-int/2addr v3, v1
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_12
     invoke-direct {p0, v0, p1, p2, v4}, Landroidx/recyclerview/widget/LinearLayoutManager;->fixLayoutStartGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
@@ -4251,10 +4222,12 @@
 
     move-result v1
 
-    goto :goto_8
+    add-int/2addr v0, v1
+
+    add-int/2addr v3, v1
 
     :cond_13
-    :goto_9
+    :goto_7
     invoke-direct {p0, p1, p2, v0, v3}, Landroidx/recyclerview/widget/LinearLayoutManager;->layoutForPredictiveAnimations(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;II)V
 
     invoke-virtual {p2}, Landroidx/recyclerview/widget/RecyclerView$State;->isPreLayout()Z
@@ -4267,14 +4240,14 @@
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/OrientationHelper;->onLayoutComplete()V
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_14
     iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mAnchorInfo:Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->reset()V
 
-    :goto_a
+    :goto_8
     iget-boolean p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mStackFromEnd:Z
 
     iput-boolean p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mLastStackFromEnd:Z
@@ -4330,13 +4303,11 @@
 
     if-eqz v0, :cond_0
 
-    new-instance v0, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
+    new-instance v1, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
+    invoke-direct {v1, v0}, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;-><init>(Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;)V
 
-    invoke-direct {v0, v1}, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;-><init>(Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;)V
-
-    return-object v0
+    return-object v1
 
     :cond_0
     new-instance v0, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
@@ -4457,9 +4428,9 @@
 
     move-result p4
 
-    const/4 v0, -0x1
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, -0x1
 
     if-ge p3, p4, :cond_0
 
@@ -4475,7 +4446,7 @@
 
     if-eqz v2, :cond_2
 
-    if-ne p3, v1, :cond_1
+    if-ne p3, v0, :cond_1
 
     iget-object p3, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4523,7 +4494,7 @@
     return-void
 
     :cond_2
-    if-ne p3, v0, :cond_3
+    if-ne p3, v1, :cond_3
 
     iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4697,8 +4668,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;->invalidateAnchor()V
 
     :cond_0
@@ -4718,8 +4687,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/LinearLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;->invalidateAnchor()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearSmoothScroller.smali b/com.discord/smali/androidx/recyclerview/widget/LinearSmoothScroller.smali
index 24fc0c3c54..3d2bef14d4 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearSmoothScroller.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearSmoothScroller.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/LinearSmoothScroller;
 .super Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;
+.source "LinearSmoothScroller.java"
 
 
 # static fields
@@ -357,8 +358,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearSmoothScroller;->mTargetVector:Landroid/graphics/PointF;
-
     iget v0, v0, Landroid/graphics/PointF;->x:F
 
     const/4 v1, 0x0
@@ -401,8 +400,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearSmoothScroller;->mTargetVector:Landroid/graphics/PointF;
-
     iget v0, v0, Landroid/graphics/PointF;->y:F
 
     const/4 v1, 0x0
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearSnapHelper.smali b/com.discord/smali/androidx/recyclerview/widget/LinearSnapHelper.smali
index 154e50e79d..ec5afa5bd8 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearSnapHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearSnapHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/LinearSnapHelper;
 .super Landroidx/recyclerview/widget/SnapHelper;
+.source "LinearSnapHelper.java"
 
 
 # static fields
@@ -49,7 +50,9 @@
 
     const/high16 v5, -0x80000000
 
-    move-object v5, v3
+    move-object v4, v3
+
+    const v5, 0x7fffffff
 
     const/high16 v6, -0x80000000
 
@@ -68,16 +71,16 @@
 
     if-eq v8, v9, :cond_2
 
-    if-ge v8, v4, :cond_1
+    if-ge v8, v5, :cond_1
 
     move-object v3, v7
 
-    move v4, v8
+    move v5, v8
 
     :cond_1
     if-le v8, v6, :cond_2
 
-    move-object v5, v7
+    move-object v4, v7
 
     move v6, v8
 
@@ -89,7 +92,7 @@
     :cond_3
     if-eqz v3, :cond_6
 
-    if-nez v5, :cond_4
+    if-nez v4, :cond_4
 
     goto :goto_1
 
@@ -98,7 +101,7 @@
 
     move-result p1
 
-    invoke-virtual {p2, v5}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedStart(Landroid/view/View;)I
+    invoke-virtual {p2, v4}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedStart(Landroid/view/View;)I
 
     move-result v0
 
@@ -110,7 +113,7 @@
 
     move-result v0
 
-    invoke-virtual {p2, v5}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedEnd(Landroid/view/View;)I
+    invoke-virtual {p2, v4}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedEnd(Landroid/view/View;)I
 
     move-result p2
 
@@ -129,7 +132,7 @@
 
     mul-float p1, p1, v1
 
-    sub-int/2addr v6, v4
+    sub-int/2addr v6, v5
 
     add-int/lit8 v6, v6, 0x1
 
@@ -358,8 +361,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearSnapHelper;->mHorizontalHelper:Landroidx/recyclerview/widget/OrientationHelper;
-
     iget-object v0, v0, Landroidx/recyclerview/widget/OrientationHelper;->mLayoutManager:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     if-eq v0, p1, :cond_1
@@ -390,8 +391,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/LinearSnapHelper;->mVerticalHelper:Landroidx/recyclerview/widget/OrientationHelper;
-
     iget-object v0, v0, Landroidx/recyclerview/widget/OrientationHelper;->mLayoutManager:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     if-eq v0, p1, :cond_1
@@ -490,7 +489,6 @@
 
     move-result-object v0
 
-    :goto_0
     invoke-direct {p0, p1, v0}, Landroidx/recyclerview/widget/LinearSnapHelper;->findCenterView(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Landroidx/recyclerview/widget/OrientationHelper;)Landroid/view/View;
 
     move-result-object p1
@@ -508,7 +506,11 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0}, Landroidx/recyclerview/widget/LinearSnapHelper;->findCenterView(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Landroidx/recyclerview/widget/OrientationHelper;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_1
     const/4 p1, 0x0
diff --git a/com.discord/smali/androidx/recyclerview/widget/ListAdapter.smali b/com.discord/smali/androidx/recyclerview/widget/ListAdapter.smali
index 3bfafc7c3b..3a59c01e87 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ListAdapter.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ListAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/ListAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "ListAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ListUpdateCallback.smali b/com.discord/smali/androidx/recyclerview/widget/ListUpdateCallback.smali
index f0bfd0a466..672fc1dc9f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ListUpdateCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ListUpdateCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/ListUpdateCallback;
 .super Ljava/lang/Object;
+.source "ListUpdateCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1$1.smali b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1$1.smali
index c4e6623ca5..f26082a700 100644
--- a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/MessageThreadUtil$1$1;
 .super Ljava/lang/Object;
+.source "MessageThreadUtil.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -36,7 +37,6 @@
 .method public run()V
     .locals 4
 
-    :goto_0
     iget-object v0, p0, Landroidx/recyclerview/widget/MessageThreadUtil$1$1;->this$1:Landroidx/recyclerview/widget/MessageThreadUtil$1;
 
     iget-object v0, v0, Landroidx/recyclerview/widget/MessageThreadUtil$1;->mQueue:Landroidx/recyclerview/widget/MessageThreadUtil$MessageQueue;
@@ -45,6 +45,7 @@
 
     move-result-object v0
 
+    :goto_0
     if-eqz v0, :cond_0
 
     iget v1, v0, Landroidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem;->what:I
@@ -69,7 +70,7 @@
 
     invoke-static {v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_0
+    goto :goto_1
 
     :pswitch_0
     iget-object v1, p0, Landroidx/recyclerview/widget/MessageThreadUtil$1$1;->this$1:Landroidx/recyclerview/widget/MessageThreadUtil$1;
@@ -82,7 +83,7 @@
 
     invoke-interface {v1, v2, v0}, Landroidx/recyclerview/widget/ThreadUtil$MainThreadCallback;->removeTile(II)V
 
-    goto :goto_0
+    goto :goto_1
 
     :pswitch_1
     iget-object v1, p0, Landroidx/recyclerview/widget/MessageThreadUtil$1$1;->this$1:Landroidx/recyclerview/widget/MessageThreadUtil$1;
@@ -97,7 +98,7 @@
 
     invoke-interface {v1, v2, v0}, Landroidx/recyclerview/widget/ThreadUtil$MainThreadCallback;->addTile(ILandroidx/recyclerview/widget/TileList$Tile;)V
 
-    goto :goto_0
+    goto :goto_1
 
     :pswitch_2
     iget-object v1, p0, Landroidx/recyclerview/widget/MessageThreadUtil$1$1;->this$1:Landroidx/recyclerview/widget/MessageThreadUtil$1;
@@ -110,6 +111,15 @@
 
     invoke-interface {v1, v2, v0}, Landroidx/recyclerview/widget/ThreadUtil$MainThreadCallback;->updateItemCount(II)V
 
+    :goto_1
+    iget-object v0, p0, Landroidx/recyclerview/widget/MessageThreadUtil$1$1;->this$1:Landroidx/recyclerview/widget/MessageThreadUtil$1;
+
+    iget-object v0, v0, Landroidx/recyclerview/widget/MessageThreadUtil$1;->mQueue:Landroidx/recyclerview/widget/MessageThreadUtil$MessageQueue;
+
+    invoke-virtual {v0}, Landroidx/recyclerview/widget/MessageThreadUtil$MessageQueue;->next()Landroidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1.smali b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1.smali
index 1e50f6eae2..18f796cd75 100644
--- a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/MessageThreadUtil$1;
 .super Ljava/lang/Object;
+.source "MessageThreadUtil.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ThreadUtil$MainThreadCallback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2$1.smali b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2$1.smali
index 99f7b9f74d..8f17ec5acc 100644
--- a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/MessageThreadUtil$2$1;
 .super Ljava/lang/Object;
+.source "MessageThreadUtil.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2.smali b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2.smali
index e791220a1d..bc136abe0e 100644
--- a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/MessageThreadUtil$2;
 .super Ljava/lang/Object;
+.source "MessageThreadUtil.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ThreadUtil$BackgroundCallback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$MessageQueue.smali b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$MessageQueue.smali
index 1260e39586..12467cb0a7 100644
--- a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$MessageQueue.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$MessageQueue.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/MessageThreadUtil$MessageQueue;
 .super Ljava/lang/Object;
+.source "MessageThreadUtil.java"
 
 
 # annotations
@@ -144,6 +145,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method declared-synchronized sendMessage(Landroidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem;)V
@@ -192,6 +195,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method declared-synchronized sendMessageAtFrontOfQueue(Landroidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem;)V
diff --git a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem.smali b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem.smali
index f64f02cd78..7ed1dfdf70 100644
--- a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/MessageThreadUtil$SyncQueueItem;
 .super Ljava/lang/Object;
+.source "MessageThreadUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil.smali b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil.smali
index 485ec811dd..14021cb050 100644
--- a/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/MessageThreadUtil.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/MessageThreadUtil;
 .super Ljava/lang/Object;
+.source "MessageThreadUtil.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ThreadUtil;
diff --git a/com.discord/smali/androidx/recyclerview/widget/OpReorderer$Callback.smali b/com.discord/smali/androidx/recyclerview/widget/OpReorderer$Callback.smali
index 35d5040781..a739e3d4f1 100644
--- a/com.discord/smali/androidx/recyclerview/widget/OpReorderer$Callback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/OpReorderer$Callback.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/recyclerview/widget/OpReorderer$Callback;
 .super Ljava/lang/Object;
+.source "OpReorderer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/OpReorderer.smali b/com.discord/smali/androidx/recyclerview/widget/OpReorderer.smali
index f30102fda9..e30d8c4ec6 100644
--- a/com.discord/smali/androidx/recyclerview/widget/OpReorderer.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/OpReorderer.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/OpReorderer;
 .super Ljava/lang/Object;
+.source "OpReorderer.java"
 
 
 # annotations
@@ -321,15 +322,14 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     const/4 v2, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget v0, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
@@ -352,12 +352,14 @@
 
     const/4 v0, 0x1
 
+    const/4 v2, 0x1
+
     goto :goto_0
 
     :cond_2
     const/4 v0, 0x1
 
-    :goto_1
+    :goto_0
     iget v1, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
     iget v4, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
@@ -372,7 +374,7 @@
 
     iput v1, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget v1, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
@@ -409,7 +411,7 @@
     return-void
 
     :cond_5
-    :goto_2
+    :goto_1
     iget v1, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
     iget v4, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
@@ -424,7 +426,7 @@
 
     iput v1, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     iget v1, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
@@ -466,7 +468,7 @@
     iput v1, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
     :cond_7
-    :goto_3
+    :goto_2
     if-eqz v2, :cond_8
 
     invoke-interface {p1, p2, p5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
@@ -535,7 +537,6 @@
 
     if-le v0, v1, :cond_10
 
-    :goto_4
     iget v0, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
     iget v1, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
@@ -544,7 +545,7 @@
 
     iput v0, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_c
     if-eqz v6, :cond_e
@@ -600,10 +601,16 @@
 
     if-lt v0, v1, :cond_10
 
-    goto :goto_4
+    iget v0, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
+
+    iget v1, p5, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
+
+    sub-int/2addr v0, v1
+
+    iput v0, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->itemCount:I
 
     :cond_10
-    :goto_5
+    :goto_3
     invoke-interface {p1, p2, p5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
     iget p5, p3, Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;->positionStart:I
@@ -614,12 +621,12 @@
 
     invoke-interface {p1, p4, p3}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_11
     invoke-interface {p1, p4}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
-    :goto_6
+    :goto_4
     if-eqz v6, :cond_12
 
     invoke-interface {p1, p2, v6}, Ljava/util/List;->add(ILjava/lang/Object;)V
diff --git a/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$1.smali b/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$1.smali
index be3d27ccb0..a3d8b6141c 100644
--- a/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/OrientationHelper$1;
 .super Landroidx/recyclerview/widget/OrientationHelper;
+.source "OrientationHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$2.smali b/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$2.smali
index 87e9b2db8f..d24832c572 100644
--- a/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/OrientationHelper$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/OrientationHelper$2;
 .super Landroidx/recyclerview/widget/OrientationHelper;
+.source "OrientationHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/OrientationHelper.smali b/com.discord/smali/androidx/recyclerview/widget/OrientationHelper.smali
index 5c8cc4e49e..7cb4e41ce0 100644
--- a/com.discord/smali/androidx/recyclerview/widget/OrientationHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/OrientationHelper.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/OrientationHelper;
 .super Ljava/lang/Object;
+.source "OrientationHelper.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper$1.smali b/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper$1.smali
index f6fc137abe..45861ef271 100644
--- a/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/PagerSnapHelper$1;
 .super Landroidx/recyclerview/widget/LinearSmoothScroller;
+.source "PagerSnapHelper.java"
 
 
 # annotations
@@ -65,9 +66,7 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/PagerSnapHelper$1;->this$0:Landroidx/recyclerview/widget/PagerSnapHelper;
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/PagerSnapHelper$1;->this$0:Landroidx/recyclerview/widget/PagerSnapHelper;
-
-    iget-object v0, v0, Landroidx/recyclerview/widget/PagerSnapHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object v0, p2, Landroidx/recyclerview/widget/PagerSnapHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper.smali b/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper.smali
index d16c7553e7..90b10f0b15 100644
--- a/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/PagerSnapHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/PagerSnapHelper;
 .super Landroidx/recyclerview/widget/SnapHelper;
+.source "PagerSnapHelper.java"
 
 
 # static fields
@@ -230,8 +231,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/PagerSnapHelper;->mHorizontalHelper:Landroidx/recyclerview/widget/OrientationHelper;
-
     iget-object v0, v0, Landroidx/recyclerview/widget/OrientationHelper;->mLayoutManager:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     if-eq v0, p1, :cond_1
@@ -262,8 +261,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/PagerSnapHelper;->mVerticalHelper:Landroidx/recyclerview/widget/OrientationHelper;
-
     iget-object v0, v0, Landroidx/recyclerview/widget/OrientationHelper;->mLayoutManager:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     if-eq v0, p1, :cond_1
@@ -391,7 +388,6 @@
 
     move-result-object v0
 
-    :goto_0
     invoke-direct {p0, p1, v0}, Landroidx/recyclerview/widget/PagerSnapHelper;->findCenterView(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Landroidx/recyclerview/widget/OrientationHelper;)Landroid/view/View;
 
     move-result-object p1
@@ -409,7 +405,11 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0}, Landroidx/recyclerview/widget/PagerSnapHelper;->findCenterView(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Landroidx/recyclerview/widget/OrientationHelper;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_1
     const/4 p1, 0x0
@@ -443,12 +443,11 @@
 
     move-result-object v2
 
-    :goto_0
     invoke-direct {p0, p1, v2}, Landroidx/recyclerview/widget/PagerSnapHelper;->findStartView(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Landroidx/recyclerview/widget/OrientationHelper;)Landroid/view/View;
 
     move-result-object v2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
@@ -461,10 +460,12 @@
 
     move-result-object v2
 
-    goto :goto_0
+    invoke-direct {p0, p1, v2}, Landroidx/recyclerview/widget/PagerSnapHelper;->findStartView(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Landroidx/recyclerview/widget/OrientationHelper;)Landroid/view/View;
+
+    move-result-object v2
 
     :cond_2
-    :goto_1
+    :goto_0
     if-nez v2, :cond_3
 
     return v1
@@ -491,25 +492,29 @@
 
     if-lez p2, :cond_5
 
-    :goto_2
     const/4 p2, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_5
     const/4 p2, 0x0
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_6
-    if-lez p3, :cond_5
+    if-lez p3, :cond_7
 
-    goto :goto_2
+    const/4 p2, 0x1
 
-    :goto_3
+    goto :goto_1
+
+    :cond_7
+    const/4 p2, 0x0
+
+    :goto_1
     instance-of p3, p1, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider;
 
-    if-eqz p3, :cond_8
+    if-eqz p3, :cond_9
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider;
 
@@ -519,7 +524,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_9
 
     iget p3, p1, Landroid/graphics/PointF;->x:F
 
@@ -527,32 +532,32 @@
 
     cmpg-float p3, p3, v0
 
-    if-ltz p3, :cond_7
+    if-ltz p3, :cond_8
 
     iget p1, p1, Landroid/graphics/PointF;->y:F
 
     cmpg-float p1, p1, v0
 
-    if-gez p1, :cond_8
-
-    :cond_7
-    const/4 v3, 0x1
+    if-gez p1, :cond_9
 
     :cond_8
-    if-eqz v3, :cond_a
+    const/4 v3, 0x1
 
-    if-eqz p2, :cond_9
+    :cond_9
+    if-eqz v3, :cond_b
+
+    if-eqz p2, :cond_a
 
     sub-int/2addr v2, v4
 
-    :cond_9
+    :cond_a
     return v2
 
-    :cond_a
-    if-eqz p2, :cond_b
+    :cond_b
+    if-eqz p2, :cond_c
 
     add-int/2addr v2, v4
 
-    :cond_b
+    :cond_c
     return v2
 .end method
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$1.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$1.smali
index b81bc0ad8c..37fb7680f8 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$1;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -85,6 +86,8 @@
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->consumePendingUpdateOperations()V
 
+    return-void
+
     :cond_3
     :goto_0
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$2.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$2.smali
index 6e4611bcbb..e622bc1711 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$2;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$3.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$3.smali
index e2b46b5c8a..9d1cc7f842 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$3.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$3.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/RecyclerView$3;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$4.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$4.smali
index e57bfd4ce3..ddaaf56535 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$4.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$4;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$5.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$5.smali
index 8a2060cb29..dd8e66b19e 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$5.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$5;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ChildHelper$Callback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$6.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$6.smali
index 900a74715d..b7f11f7f6f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$6.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$6;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/AdapterHelper$Callback;
@@ -219,8 +220,6 @@
 
     iput-boolean v1, p1, Landroidx/recyclerview/widget/RecyclerView;->mItemsAddedOrRemoved:Z
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$6;->this$0:Landroidx/recyclerview/widget/RecyclerView;
-
     iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
     iget v0, p1, Landroidx/recyclerview/widget/RecyclerView$State;->mDeletedInvisibleItemCountSincePreviousLayout:I
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Adapter.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Adapter.smali
index 64f1e1db3a..dc484de8dc 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Adapter.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Adapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$Adapter;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObservable.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObservable.smali
index 9d7a9eb166..5a399c27e4 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObservable.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObservable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;
 .super Landroid/database/Observable;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObserver.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObserver.smali
index 901c1b2865..7a902ab5c3 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObserver.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$AdapterDataObserver.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback.smali
index cebf6e7c08..2bc8cd6e7f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory$EdgeDirection.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory$EdgeDirection.smali
index 5c0db93c21..4f7276d3ce 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory$EdgeDirection.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory$EdgeDirection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/recyclerview/widget/RecyclerView$EdgeEffectFactory$EdgeDirection;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory.smali
index 0b13f31dbd..e4f45fd2ee 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$EdgeEffectFactory.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$EdgeEffectFactory;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$AdapterChanges.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$AdapterChanges.smali
index 3e5e4772dd..24218d60da 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$AdapterChanges.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$AdapterChanges.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$AdapterChanges;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorFinishedListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorFinishedListener.smali
index ac4948ada8..1f175c0532 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorFinishedListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorFinishedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorFinishedListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener.smali
index 8ab764a2ae..35ab9d0eb3 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo.smali
index 3165ec925e..eec66092ef 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator.smali
index 4ab7f96303..226d73ba8e 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimator.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -249,8 +250,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->mListener:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;
-
     invoke-interface {v0, p1}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;->onAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener.smali
index 73e61d61eb..5e982a8233 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemDecoration.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemDecoration.smali
index 82116cb3bf..6f80b22b00 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemDecoration.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ItemDecoration.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$1.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$1.smali
index ae7dc96a1c..321f87628d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$LayoutManager$1;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ViewBoundsCheck$Callback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$2.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$2.smali
index 375a4c1289..0a4792d8c8 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$LayoutManager$2;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ViewBoundsCheck$Callback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry.smali
index 1ab878f519..3850c761e5 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$Properties.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$Properties.smali
index 56c3dedf2b..b4bf0bd9a3 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$Properties.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager$Properties.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$LayoutManager$Properties;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager.smali
index b2126795fa..ef040fffdf 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutManager.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -253,8 +254,6 @@
 
     if-eqz p2, :cond_8
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mSmoothScroller:Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;
-
     invoke-virtual {p2}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->isRunning()Z
 
     move-result p2
@@ -330,6 +329,8 @@
 
     move-result p0
 
+    return p0
+
     :cond_0
     return p0
 
@@ -378,61 +379,78 @@
 
     const/high16 v3, 0x40000000    # 2.0f
 
-    if-eqz p4, :cond_1
+    if-eqz p4, :cond_3
 
     if-ltz p3, :cond_0
 
-    :goto_0
     const/high16 p2, 0x40000000    # 2.0f
 
-    goto :goto_2
-
-    :cond_0
-    if-ne p3, v1, :cond_7
-
-    if-eq p1, v2, :cond_3
-
-    if-eqz p1, :cond_7
-
-    if-eq p1, v3, :cond_3
-
     goto :goto_1
 
-    :cond_1
-    if-ltz p3, :cond_2
+    :cond_0
+    if-ne p3, v1, :cond_2
 
-    goto :goto_0
+    if-eq p1, v2, :cond_5
+
+    if-eqz p1, :cond_1
+
+    if-eq p1, v3, :cond_5
+
+    :cond_1
+    const/4 p3, 0x0
+
+    goto :goto_1
 
     :cond_2
-    if-ne p3, v1, :cond_4
+    if-ne p3, v0, :cond_9
+
+    const/4 p3, 0x0
+
+    goto :goto_1
 
     :cond_3
+    if-ltz p3, :cond_4
+
+    const/high16 p2, 0x40000000    # 2.0f
+
+    goto :goto_1
+
+    :cond_4
+    if-ne p3, v1, :cond_6
+
+    :cond_5
     move p3, p0
 
     move p2, p1
 
-    goto :goto_2
-
-    :cond_4
-    if-ne p3, v0, :cond_7
-
-    if-eq p1, v2, :cond_5
-
-    if-ne p1, v3, :cond_6
-
-    :cond_5
-    const/high16 p2, -0x80000000
+    goto :goto_1
 
     :cond_6
-    move p3, p0
+    if-ne p3, v0, :cond_9
 
-    goto :goto_2
+    if-eq p1, v2, :cond_8
+
+    if-ne p1, v3, :cond_7
+
+    goto :goto_0
 
     :cond_7
-    :goto_1
+    move p3, p0
+
+    goto :goto_1
+
+    :cond_8
+    :goto_0
+    const/high16 p2, -0x80000000
+
+    move p3, p0
+
+    goto :goto_1
+
+    :cond_9
     const/4 p3, 0x0
 
-    :goto_2
+    :goto_1
     invoke-static {p3, p2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result p0
@@ -459,22 +477,24 @@
 
     if-ltz p2, :cond_0
 
-    :goto_0
     move p0, p2
 
-    :goto_1
     const/high16 p1, 0x40000000    # 2.0f
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_0
     const/4 p0, 0x0
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     if-ltz p2, :cond_2
 
+    move p0, p2
+
+    const/high16 p1, 0x40000000    # 2.0f
+
     goto :goto_0
 
     :cond_2
@@ -482,16 +502,23 @@
 
     if-ne p2, p3, :cond_3
 
-    goto :goto_1
+    const/high16 p1, 0x40000000    # 2.0f
+
+    goto :goto_0
 
     :cond_3
     const/4 p3, -0x2
 
-    if-ne p2, p3, :cond_0
+    if-ne p2, p3, :cond_4
 
     const/high16 p1, -0x80000000
 
-    :goto_2
+    goto :goto_0
+
+    :cond_4
+    const/4 p0, 0x0
+
+    :goto_0
     invoke-static {p0, p1}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result p0
@@ -610,41 +637,40 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-static {v5, p2}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     if-eqz v5, :cond_2
 
-    :goto_0
     move v1, v5
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     invoke-static {v3, v1}, Ljava/lang/Math;->min(II)I
 
     move-result v5
 
-    goto :goto_0
+    move v1, v5
 
-    :goto_1
+    :goto_0
     if-eqz v0, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-static {v4, p3}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
-    :goto_2
+    :goto_1
     aput v1, p1, p4
 
     aput v0, p1, v6
@@ -959,8 +985,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->assertInLayoutOrScroll(Ljava/lang/String;)V
 
     :cond_0
@@ -974,8 +998,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
 
     :cond_0
@@ -1080,8 +1102,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->getItemDecorInsetsForChild(Landroid/view/View;)Landroid/graphics/Rect;
 
     move-result-object p1
@@ -1372,8 +1392,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->findContainingItemView(Landroid/view/View;)Landroid/view/View;
 
     move-result-object p1
@@ -1549,8 +1567,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mChildHelper:Landroidx/recyclerview/widget/ChildHelper;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/ChildHelper;->getChildAt(I)Landroid/view/View;
 
     move-result-object p1
@@ -1570,8 +1586,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mChildHelper:Landroidx/recyclerview/widget/ChildHelper;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/ChildHelper;->getChildCount()I
 
     move-result v0
@@ -1591,8 +1605,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     iget-boolean v0, v0, Landroidx/recyclerview/widget/RecyclerView;->mClipToPadding:Z
 
     if-eqz v0, :cond_0
@@ -1622,9 +1634,7 @@
 
     const/4 p2, 0x1
 
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    if-eqz p1, :cond_2
 
     iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
@@ -1650,6 +1660,9 @@
     return p1
 
     :cond_1
+    return p2
+
+    :cond_2
     :goto_0
     return p2
 .end method
@@ -1824,8 +1837,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getFocusedChild()Landroid/view/View;
 
     move-result-object v0
@@ -1875,8 +1886,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     move-result-object v0
@@ -1988,8 +1997,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getPaddingBottom()I
 
     move-result v0
@@ -2011,8 +2018,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->getPaddingEnd(Landroid/view/View;)I
 
     move-result v0
@@ -2034,8 +2039,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getPaddingLeft()I
 
     move-result v0
@@ -2057,8 +2060,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getPaddingRight()I
 
     move-result v0
@@ -2080,8 +2081,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->getPaddingStart(Landroid/view/View;)I
 
     move-result v0
@@ -2103,8 +2102,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getPaddingTop()I
 
     move-result v0
@@ -2172,9 +2169,7 @@
 
     const/4 p2, 0x1
 
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    if-eqz p1, :cond_2
 
     iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
@@ -2200,6 +2195,9 @@
     return p1
 
     :cond_1
+    return p2
+
+    :cond_2
     :goto_0
     return p2
 .end method
@@ -2451,8 +2449,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->hasFocus()Z
 
     move-result v0
@@ -2484,9 +2480,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
-    invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->indexOfChild(Landroid/view/View;)I
+    invoke-virtual {v1, p1}, Landroidx/recyclerview/widget/RecyclerView;->indexOfChild(Landroid/view/View;)I
 
     move-result v0
 
@@ -2559,8 +2553,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->isFocused()Z
 
     move-result v0
@@ -2616,8 +2608,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mSmoothScroller:Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->isRunning()Z
 
     move-result v0
@@ -3056,8 +3046,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->offsetChildrenHorizontal(I)V
 
     :cond_0
@@ -3075,8 +3063,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->offsetChildrenVertical(I)V
 
     :cond_0
@@ -3207,15 +3193,13 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
     if-nez p3, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     const/4 p2, 0x1
 
     invoke-virtual {p1, p2}, Landroidx/recyclerview/widget/RecyclerView;->canScrollVertically(I)Z
@@ -3276,6 +3260,9 @@
     invoke-virtual {p3, p1}, Landroid/view/accessibility/AccessibilityEvent;->setItemCount(I)V
 
     :cond_3
+    return-void
+
+    :cond_4
     :goto_1
     return-void
 .end method
@@ -3769,33 +3756,30 @@
     return p2
 
     :cond_0
-    const/16 p1, 0x1000
+    const/16 p4, 0x1000
 
-    const/4 p4, 0x1
+    const/4 v0, 0x1
 
-    if-eq p3, p1, :cond_4
+    if-eq p3, p4, :cond_4
 
-    const/16 p1, 0x2000
+    const/16 p4, 0x2000
 
-    if-eq p3, p1, :cond_2
+    if-eq p3, p4, :cond_1
 
     const/4 p1, 0x0
 
-    :cond_1
     const/4 p3, 0x0
 
     goto :goto_2
 
-    :cond_2
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
+    :cond_1
     const/4 p3, -0x1
 
     invoke-virtual {p1, p3}, Landroidx/recyclerview/widget/RecyclerView;->canScrollVertically(I)Z
 
     move-result p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getHeight()I
 
@@ -3803,31 +3787,31 @@
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingTop()I
 
-    move-result v0
+    move-result p4
 
-    sub-int/2addr p1, v0
+    sub-int/2addr p1, p4
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingBottom()I
 
-    move-result v0
+    move-result p4
 
-    sub-int/2addr p1, v0
+    sub-int/2addr p1, p4
 
     neg-int p1, p1
 
     goto :goto_0
 
-    :cond_3
+    :cond_2
     const/4 p1, 0x0
 
     :goto_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p4, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    invoke-virtual {v0, p3}, Landroidx/recyclerview/widget/RecyclerView;->canScrollHorizontally(I)Z
+    invoke-virtual {p4, p3}, Landroidx/recyclerview/widget/RecyclerView;->canScrollHorizontally(I)Z
 
     move-result p3
 
-    if-eqz p3, :cond_1
+    if-eqz p3, :cond_3
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidth()I
 
@@ -3835,24 +3819,27 @@
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingLeft()I
 
-    move-result v0
+    move-result p4
 
-    sub-int/2addr p3, v0
+    sub-int/2addr p3, p4
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingRight()I
 
-    move-result v0
+    move-result p4
 
-    sub-int/2addr p3, v0
+    sub-int/2addr p3, p4
 
     neg-int p3, p3
 
     goto :goto_2
 
-    :cond_4
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    :cond_3
+    const/4 p3, 0x0
 
-    invoke-virtual {p1, p4}, Landroidx/recyclerview/widget/RecyclerView;->canScrollVertically(I)Z
+    goto :goto_2
+
+    :cond_4
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->canScrollVertically(I)Z
 
     move-result p1
 
@@ -3882,11 +3869,11 @@
     :goto_1
     iget-object p3, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    invoke-virtual {p3, p4}, Landroidx/recyclerview/widget/RecyclerView;->canScrollHorizontally(I)Z
+    invoke-virtual {p3, v0}, Landroidx/recyclerview/widget/RecyclerView;->canScrollHorizontally(I)Z
 
     move-result p3
 
-    if-eqz p3, :cond_1
+    if-eqz p3, :cond_6
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidth()I
 
@@ -3894,29 +3881,34 @@
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingLeft()I
 
-    move-result v0
+    move-result p4
 
-    sub-int/2addr p3, v0
+    sub-int/2addr p3, p4
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingRight()I
 
-    move-result v0
+    move-result p4
 
-    sub-int/2addr p3, v0
+    sub-int/2addr p3, p4
+
+    goto :goto_2
+
+    :cond_6
+    const/4 p3, 0x0
 
     :goto_2
-    if-nez p1, :cond_6
+    if-nez p1, :cond_7
 
-    if-nez p3, :cond_6
+    if-nez p3, :cond_7
 
     return p2
 
-    :cond_6
+    :cond_7
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {p2, p3, p1}, Landroidx/recyclerview/widget/RecyclerView;->smoothScrollBy(II)V
 
-    return p4
+    return v0
 .end method
 
 .method performAccessibilityActionForItem(Landroid/view/View;ILandroid/os/Bundle;)Z
@@ -3984,8 +3976,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-static {v0, p1}, Landroidx/core/view/ViewCompat;->postOnAnimation(Landroid/view/View;Ljava/lang/Runnable;)V
 
     :cond_0
@@ -4178,8 +4168,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     move-result p1
@@ -4336,8 +4324,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->requestLayout()V
 
     :cond_0
@@ -4429,8 +4415,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$Recycler;->updateViewCacheSize()V
@@ -4671,10 +4655,9 @@
 
     iput p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mWidth:I
 
-    :goto_0
     iput p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mHeight:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iput-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
@@ -4693,9 +4676,9 @@
 
     move-result p1
 
-    goto :goto_0
+    iput p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mHeight:I
 
-    :goto_1
+    :goto_0
     const/high16 p1, 0x40000000    # 2.0f
 
     iput p1, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mWidthMode:I
@@ -4828,12 +4811,8 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mSmoothScroller:Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;
-
     if-eq p1, v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mSmoothScroller:Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->isRunning()Z
 
     move-result v0
@@ -4885,8 +4864,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mSmoothScroller:Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->stop()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutParams.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutParams.smali
index f51a056e59..ef36ac2ced 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutParams.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener.smali
index d3504ba3f4..241f129068 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnFlingListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnFlingListener.smali
index 37715d9c75..8af7014ebf 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnFlingListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnFlingListener.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$OnFlingListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnItemTouchListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnItemTouchListener.smali
index 6817f59d46..5c137f6a1b 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnItemTouchListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnItemTouchListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnScrollListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnScrollListener.smali
index cd4d376c13..b6e01d7819 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnScrollListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$OnScrollListener.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Orientation.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Orientation.smali
index 4767339d53..674ac84523 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Orientation.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Orientation.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/recyclerview/widget/RecyclerView$Orientation;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData.smali
index 83bbd95d32..9dada0eefe 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool.smali
index e63fb92e76..dfa0d6f19c 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecycledViewPool.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Recycler.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Recycler.smali
index fff0087f8c..2ff4b9c6e8 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Recycler.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$Recycler.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/recyclerview/widget/RecyclerView$Recycler;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -433,14 +434,13 @@
 
     move-result-object p2
 
-    :goto_0
     check-cast p2, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
     iget-object v0, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     invoke-virtual {v0, p2}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
@@ -457,12 +457,18 @@
 
     move-result-object p2
 
+    check-cast p2, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+
+    iget-object v0, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-virtual {v0, p2}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
     goto :goto_0
 
     :cond_1
     check-cast p2, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
-    :goto_1
+    :goto_0
     const/4 v0, 0x1
 
     iput-boolean v0, p2, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;->mInsetsDirty:Z
@@ -477,12 +483,12 @@
 
     if-nez p1, :cond_2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v0, 0x0
 
-    :goto_2
+    :goto_1
     iput-boolean v0, p2, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;->mPendingInvalidate:Z
 
     return-void
@@ -633,8 +639,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mChangedScrap:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -671,8 +675,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mChangedScrap:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
     :cond_0
@@ -815,9 +817,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mChangedScrap:Ljava/util/ArrayList;
+    if-eqz v0, :cond_5
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -940,6 +940,9 @@
     goto :goto_1
 
     :cond_4
+    return-object v1
+
+    :cond_5
     :goto_2
     return-object v1
 .end method
@@ -2120,6 +2123,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method final recycleViewInternal(Landroid/view/View;)V
@@ -2163,7 +2168,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mChangedScrap:Ljava/util/ArrayList;
@@ -2183,13 +2188,12 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mChangedScrap:Ljava/util/ArrayList;
 
-    :goto_0
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     return-void
 
     :cond_2
-    :goto_1
+    :goto_0
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->isInvalid()Z
 
     move-result v0
@@ -2212,7 +2216,7 @@
 
     if-eqz v0, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance p1, Ljava/lang/IllegalArgumentException;
@@ -2240,14 +2244,16 @@
     throw p1
 
     :cond_4
-    :goto_2
+    :goto_1
     const/4 v0, 0x0
 
     invoke-virtual {p1, p0, v0}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->setScrapContainer(Landroidx/recyclerview/widget/RecyclerView$Recycler;Z)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mAttachedScrap:Ljava/util/ArrayList;
 
-    goto :goto_0
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    return-void
 .end method
 
 .method final setRecycledViewPool(Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;)V
@@ -2257,8 +2263,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mRecyclerPool:Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->detach()V
 
     :cond_0
@@ -2313,7 +2317,7 @@
 
     move/from16 v0, p2
 
-    if-ltz v3, :cond_17
+    if-ltz v3, :cond_18
 
     iget-object v1, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2323,7 +2327,7 @@
 
     move-result v1
 
-    if-ge v3, v1, :cond_17
+    if-ge v3, v1, :cond_18
 
     iget-object v1, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2339,22 +2343,26 @@
 
     const/4 v8, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
 
     invoke-virtual/range {p0 .. p1}, Landroidx/recyclerview/widget/RecyclerView$Recycler;->getChangedScrapViewForPosition(I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
     move-result-object v1
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_0
 
     const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v2
+    const/4 v4, 0x0
+
+    goto :goto_0
 
     :cond_1
+    move-object v1, v2
+
     const/4 v4, 0x0
 
     :goto_0
@@ -2417,7 +2425,7 @@
 
     :cond_6
     :goto_2
-    if-nez v1, :cond_f
+    if-nez v1, :cond_10
 
     iget-object v5, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2427,7 +2435,7 @@
 
     move-result v5
 
-    if-ltz v5, :cond_e
+    if-ltz v5, :cond_f
 
     iget-object v9, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2437,7 +2445,7 @@
 
     move-result v9
 
-    if-ge v5, v9, :cond_e
+    if-ge v5, v9, :cond_f
 
     iget-object v9, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2482,8 +2490,6 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mViewCacheExtension:Landroidx/recyclerview/widget/RecyclerView$ViewCacheExtension;
-
     invoke-virtual {v0, v6, v3, v9}, Landroidx/recyclerview/widget/RecyclerView$ViewCacheExtension;->getViewForPositionAndType(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)Landroid/view/View;
 
     move-result-object v0
@@ -2579,7 +2585,7 @@
     invoke-direct {v6, v1}, Landroidx/recyclerview/widget/RecyclerView$Recycler;->invalidateDisplayListInt(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
     :cond_b
-    if-nez v1, :cond_f
+    if-nez v1, :cond_e
 
     iget-object v0, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2653,9 +2659,18 @@
 
     move-object v10, v2
 
+    move v9, v4
+
     goto :goto_4
 
     :cond_e
+    move-object v10, v1
+
+    move v9, v4
+
+    goto :goto_4
+
+    :cond_f
     new-instance v0, Ljava/lang/IndexOutOfBoundsException;
 
     new-instance v1, Ljava/lang/StringBuilder;
@@ -2702,13 +2717,13 @@
 
     throw v0
 
-    :cond_f
+    :cond_10
     move-object v10, v1
 
-    :goto_4
     move v9, v4
 
-    if-eqz v9, :cond_10
+    :goto_4
+    if-eqz v9, :cond_11
 
     iget-object v0, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2718,7 +2733,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_10
+    if-nez v0, :cond_11
 
     const/16 v0, 0x2000
 
@@ -2726,7 +2741,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_10
+    if-eqz v1, :cond_11
 
     invoke-virtual {v10, v8, v0}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->setFlags(II)V
 
@@ -2736,7 +2751,7 @@
 
     iget-boolean v0, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
 
-    if-eqz v0, :cond_10
+    if-eqz v0, :cond_11
 
     invoke-static {v10}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->buildAdapterChangeFlagsForAnimations(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
 
@@ -2764,7 +2779,7 @@
 
     invoke-virtual {v1, v10, v0}, Landroidx/recyclerview/widget/RecyclerView;->recordAnimationInfoIfBouncedHiddenView(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 
-    :cond_10
+    :cond_11
     iget-object v0, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     iget-object v0, v0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
@@ -2773,46 +2788,46 @@
 
     move-result v0
 
-    if-eqz v0, :cond_11
+    if-eqz v0, :cond_12
 
     invoke-virtual {v10}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->isBound()Z
 
     move-result v0
 
-    if-eqz v0, :cond_11
-
-    iput v3, v10, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPreLayoutPosition:I
-
-    goto :goto_5
-
-    :cond_11
-    invoke-virtual {v10}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->isBound()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_13
-
-    invoke-virtual {v10}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->needsUpdate()Z
-
-    move-result v0
-
-    if-nez v0, :cond_13
-
-    invoke-virtual {v10}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->isInvalid()Z
-
-    move-result v0
-
     if-eqz v0, :cond_12
 
-    goto :goto_6
+    iput v3, v10, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPreLayoutPosition:I
+
+    goto :goto_5
 
     :cond_12
+    invoke-virtual {v10}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->isBound()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_14
+
+    invoke-virtual {v10}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->needsUpdate()Z
+
+    move-result v0
+
+    if-nez v0, :cond_14
+
+    invoke-virtual {v10}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->isInvalid()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_13
+
+    goto :goto_6
+
+    :cond_13
     :goto_5
     const/4 v0, 0x0
 
     goto :goto_7
 
-    :cond_13
+    :cond_14
     :goto_6
     iget-object v0, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2841,7 +2856,7 @@
 
     move-result-object v1
 
-    if-nez v1, :cond_14
+    if-nez v1, :cond_15
 
     iget-object v1, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2849,23 +2864,22 @@
 
     move-result-object v1
 
-    :goto_8
     check-cast v1, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
     iget-object v2, v10, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     invoke-virtual {v2, v1}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    goto :goto_9
+    goto :goto_8
 
-    :cond_14
+    :cond_15
     iget-object v2, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v2, v1}, Landroidx/recyclerview/widget/RecyclerView;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
 
     move-result v2
 
-    if-nez v2, :cond_15
+    if-nez v2, :cond_16
 
     iget-object v2, v6, Landroidx/recyclerview/widget/RecyclerView$Recycler;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2873,29 +2887,35 @@
 
     move-result-object v1
 
-    goto :goto_8
-
-    :cond_15
     check-cast v1, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
-    :goto_9
-    iput-object v10, v1, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;->mViewHolder:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+    iget-object v2, v10, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    if-eqz v9, :cond_16
+    invoke-virtual {v2, v1}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    if-eqz v0, :cond_16
-
-    goto :goto_a
+    goto :goto_8
 
     :cond_16
+    check-cast v1, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+
+    :goto_8
+    iput-object v10, v1, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;->mViewHolder:Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+
+    if-eqz v9, :cond_17
+
+    if-eqz v0, :cond_17
+
+    goto :goto_9
+
+    :cond_17
     const/4 v7, 0x0
 
-    :goto_a
+    :goto_9
     iput-boolean v7, v1, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;->mPendingInvalidate:Z
 
     return-object v10
 
-    :cond_17
+    :cond_18
     new-instance v0, Ljava/lang/IndexOutOfBoundsException;
 
     new-instance v1, Ljava/lang/StringBuilder;
@@ -2952,17 +2972,16 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mChangedScrap:Ljava/util/ArrayList;
 
-    :goto_0
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$Recycler;->mAttachedScrap:Ljava/util/ArrayList;
 
-    goto :goto_0
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
-    :goto_1
+    :goto_0
     const/4 v0, 0x0
 
     iput-object v0, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mScrapContainer:Landroidx/recyclerview/widget/RecyclerView$Recycler;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerListener.smali
index f0993034aa..87a1c964a3 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/RecyclerView$RecyclerListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver.smali
index 4fa685dfc3..17820f7944 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;
 .super Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -190,9 +191,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->this$0:Landroidx/recyclerview/widget/RecyclerView;
-
-    iget-object v1, v1, Landroidx/recyclerview/widget/RecyclerView;->mUpdateChildViewsRunnable:Ljava/lang/Runnable;
+    iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView;->mUpdateChildViewsRunnable:Ljava/lang/Runnable;
 
     invoke-static {v0, v1}, Landroidx/core/view/ViewCompat;->postOnAnimation(Landroid/view/View;Ljava/lang/Runnable;)V
 
@@ -205,8 +204,6 @@
 
     iput-boolean v1, v0, Landroidx/recyclerview/widget/RecyclerView;->mAdapterUpdateDuringMeasure:Z
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->this$0:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->requestLayout()V
 
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState$1.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState$1.smali
index f44e181968..54b272c082 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/RecyclerView$SavedState$1;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState.smali
index 712de3cdbf..454c272f57 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SimpleOnItemTouchListener.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SimpleOnItemTouchListener.smali
index 8ac8df96c7..6be859458f 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SimpleOnItemTouchListener.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SimpleOnItemTouchListener.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$SimpleOnItemTouchListener;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$Action.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$Action.smali
index 5201ce4e53..3703a3d79d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$Action.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$Action.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$Action;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -224,8 +225,6 @@
 
     if-ltz v0, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$Action;->mJumpToPosition:I
-
     const/4 v2, -0x1
 
     iput v2, p0, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$Action;->mJumpToPosition:I
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider.smali
index 31af5369d0..a1019d4f29 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller.smali
index 5bed113c8e..c0a8866ddb 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$SmoothScroller.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -325,8 +326,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->mTargetView:Landroid/view/View;
-
     invoke-virtual {p0, v1}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->getChildPosition(Landroid/view/View;)I
 
     move-result v1
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$State.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$State.smali
index 005e258f90..08aa14f6b7 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$State.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$State.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView$State;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -178,8 +179,6 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$State;->mData:Landroid/util/SparseArray;
-
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
     move-result-object p1
@@ -322,8 +321,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$State;->mData:Landroid/util/SparseArray;
-
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->remove(I)V
 
     return-void
@@ -340,8 +337,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$State;->mData:Landroid/util/SparseArray;
-
     invoke-virtual {v0}, Landroid/util/SparseArray;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewCacheExtension.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewCacheExtension.smali
index 85c0cac418..0cd5ecac17 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewCacheExtension.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewCacheExtension.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$ViewCacheExtension;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewFlinger.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewFlinger.smali
index 1d8789aa44..a0f399fc7e 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewFlinger.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewFlinger.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -367,7 +368,7 @@
 
     const/4 v4, 0x0
 
-    if-eqz v3, :cond_1c
+    if-eqz v3, :cond_1e
 
     iget-object v3, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -430,9 +431,7 @@
 
     iget-object v3, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
-    iget-object v5, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
-
-    iget-object v5, v5, Landroidx/recyclerview/widget/RecyclerView;->mScrollStepConsumed:[I
+    iget-object v5, v3, Landroidx/recyclerview/widget/RecyclerView;->mScrollStepConsumed:[I
 
     invoke-virtual {v3, v13, v14, v5}, Landroidx/recyclerview/widget/RecyclerView;->scrollStep(II[I)V
 
@@ -559,11 +558,11 @@
 
     move-result v9
 
-    if-nez v9, :cond_10
+    if-nez v9, :cond_12
 
     if-nez v7, :cond_8
 
-    if-eqz v8, :cond_10
+    if-eqz v8, :cond_12
 
     :cond_8
     invoke-virtual {v1}, Landroid/widget/OverScroller;->getCurrVelocity()F
@@ -572,7 +571,7 @@
 
     float-to-int v9, v9
 
-    if-eq v7, v11, :cond_a
+    if-eq v7, v11, :cond_b
 
     if-gez v7, :cond_9
 
@@ -590,21 +589,31 @@
     :cond_a
     const/4 v15, 0x0
 
-    :goto_1
-    if-eq v8, v12, :cond_c
+    goto :goto_1
 
-    if-gez v8, :cond_b
+    :cond_b
+    const/4 v15, 0x0
+
+    :goto_1
+    if-eq v8, v12, :cond_e
+
+    if-gez v8, :cond_c
 
     neg-int v9, v9
 
     goto :goto_2
 
-    :cond_b
-    if-lez v8, :cond_c
+    :cond_c
+    if-lez v8, :cond_d
 
     goto :goto_2
 
-    :cond_c
+    :cond_d
+    const/4 v9, 0x0
+
+    goto :goto_2
+
+    :cond_e
     const/4 v9, 0x0
 
     :goto_2
@@ -614,62 +623,62 @@
 
     move-result v4
 
-    if-eq v4, v10, :cond_d
+    if-eq v4, v10, :cond_f
 
     iget-object v4, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v4, v15, v9}, Landroidx/recyclerview/widget/RecyclerView;->absorbGlows(II)V
 
-    :cond_d
-    if-nez v15, :cond_e
+    :cond_f
+    if-nez v15, :cond_10
 
-    if-eq v7, v11, :cond_e
+    if-eq v7, v11, :cond_10
 
     invoke-virtual {v1}, Landroid/widget/OverScroller;->getFinalX()I
 
     move-result v4
 
-    if-nez v4, :cond_10
+    if-nez v4, :cond_12
 
-    :cond_e
-    if-nez v9, :cond_f
+    :cond_10
+    if-nez v9, :cond_11
 
-    if-eq v8, v12, :cond_f
+    if-eq v8, v12, :cond_11
 
     invoke-virtual {v1}, Landroid/widget/OverScroller;->getFinalY()I
 
     move-result v4
 
-    if-nez v4, :cond_10
-
-    :cond_f
-    invoke-virtual {v1}, Landroid/widget/OverScroller;->abortAnimation()V
-
-    :cond_10
-    if-nez v3, :cond_11
-
-    if-eqz v5, :cond_12
+    if-nez v4, :cond_12
 
     :cond_11
+    invoke-virtual {v1}, Landroid/widget/OverScroller;->abortAnimation()V
+
+    :cond_12
+    if-nez v3, :cond_13
+
+    if-eqz v5, :cond_14
+
+    :cond_13
     iget-object v4, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v4, v3, v5}, Landroidx/recyclerview/widget/RecyclerView;->dispatchOnScrolled(II)V
 
-    :cond_12
+    :cond_14
     iget-object v4, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-static {v4}, Landroidx/recyclerview/widget/RecyclerView;->access$200(Landroidx/recyclerview/widget/RecyclerView;)Z
 
     move-result v4
 
-    if-nez v4, :cond_13
+    if-nez v4, :cond_15
 
     iget-object v4, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v4}, Landroidx/recyclerview/widget/RecyclerView;->invalidate()V
 
-    :cond_13
-    if-eqz v14, :cond_14
+    :cond_15
+    if-eqz v14, :cond_16
 
     iget-object v4, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -679,19 +688,19 @@
 
     move-result v4
 
-    if-eqz v4, :cond_14
+    if-eqz v4, :cond_16
 
-    if-ne v5, v14, :cond_14
+    if-ne v5, v14, :cond_16
 
     const/4 v4, 0x1
 
     goto :goto_3
 
-    :cond_14
+    :cond_16
     const/4 v4, 0x0
 
     :goto_3
-    if-eqz v13, :cond_15
+    if-eqz v13, :cond_17
 
     iget-object v5, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -701,35 +710,35 @@
 
     move-result v5
 
-    if-eqz v5, :cond_15
+    if-eqz v5, :cond_17
 
-    if-ne v3, v13, :cond_15
+    if-ne v3, v13, :cond_17
 
     const/4 v3, 0x1
 
     goto :goto_4
 
-    :cond_15
+    :cond_17
     const/4 v3, 0x0
 
     :goto_4
-    if-nez v13, :cond_16
+    if-nez v13, :cond_18
 
-    if-eqz v14, :cond_18
+    if-eqz v14, :cond_1a
 
-    :cond_16
-    if-nez v3, :cond_18
+    :cond_18
+    if-nez v3, :cond_1a
 
-    if-eqz v4, :cond_17
+    if-eqz v4, :cond_19
 
     goto :goto_5
 
-    :cond_17
+    :cond_19
     const/4 v3, 0x0
 
     goto :goto_6
 
-    :cond_18
+    :cond_1a
     :goto_5
     const/4 v3, 0x1
 
@@ -738,9 +747,9 @@
 
     move-result v1
 
-    if-nez v1, :cond_1a
+    if-nez v1, :cond_1c
 
-    if-nez v3, :cond_19
+    if-nez v3, :cond_1b
 
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -748,18 +757,18 @@
 
     move-result v1
 
-    if-nez v1, :cond_19
+    if-nez v1, :cond_1b
 
     goto :goto_7
 
-    :cond_19
+    :cond_1b
     invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->postOnAnimation()V
 
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     iget-object v1, v1, Landroidx/recyclerview/widget/RecyclerView;->mGapWorker:Landroidx/recyclerview/widget/GapWorker;
 
-    if-eqz v1, :cond_1c
+    if-eqz v1, :cond_1e
 
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -771,7 +780,7 @@
 
     goto :goto_8
 
-    :cond_1a
+    :cond_1c
     :goto_7
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -781,7 +790,7 @@
 
     sget-boolean v1, Landroidx/recyclerview/widget/RecyclerView;->ALLOW_THREAD_GAP_WORK:Z
 
-    if-eqz v1, :cond_1b
+    if-eqz v1, :cond_1d
 
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -789,33 +798,33 @@
 
     invoke-virtual {v1}, Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->clearPrefetchPositions()V
 
-    :cond_1b
+    :cond_1d
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->this$0:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v1, v6}, Landroidx/recyclerview/widget/RecyclerView;->stopNestedScroll(I)V
 
-    :cond_1c
+    :cond_1e
     :goto_8
-    if-eqz v2, :cond_1e
+    if-eqz v2, :cond_20
 
     invoke-virtual {v2}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->isPendingInitialRun()Z
 
     move-result v1
 
-    if-eqz v1, :cond_1d
+    if-eqz v1, :cond_1f
 
     const/4 v1, 0x0
 
     invoke-virtual {v2, v1, v1}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->onAnimation(II)V
 
-    :cond_1d
+    :cond_1f
     iget-boolean v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->mReSchedulePostAnimationCallback:Z
 
-    if-nez v1, :cond_1e
+    if-nez v1, :cond_20
 
     invoke-virtual {v2}, Landroidx/recyclerview/widget/RecyclerView$SmoothScroller;->stop()V
 
-    :cond_1e
+    :cond_20
     invoke-direct/range {p0 .. p0}, Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;->enableRunOnAnimationRequests()V
 
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewHolder.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewHolder.smali
index d78a80e327..576fcef707 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewHolder.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView$ViewHolder.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 .super Ljava/lang/Object;
+.source "RecyclerView.java"
 
 
 # annotations
@@ -283,8 +284,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPayloads:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
     :cond_0
@@ -374,8 +373,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mOwnerRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0, p0}, Landroidx/recyclerview/widget/RecyclerView;->getAdapterPositionFor(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
 
     move-result v0
@@ -410,11 +407,7 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPosition:I
 
-    return v0
-
     :cond_0
-    iget v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPreLayoutPosition:I
-
     return v0
 .end method
 
@@ -439,11 +432,7 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPosition:I
 
-    return v0
-
     :cond_0
-    iget v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPreLayoutPosition:I
-
     return v0
 .end method
 
@@ -468,8 +457,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPayloads:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -772,12 +759,9 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPendingAccessibilityState:I
-
-    :goto_0
     iput v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mWasImportantForAccessibilityBeforeHidden:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
@@ -786,9 +770,9 @@
 
     move-result v0
 
-    goto :goto_0
+    iput v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mWasImportantForAccessibilityBeforeHidden:I
 
-    :goto_1
+    :goto_0
     const/4 v0, 0x4
 
     invoke-virtual {p1, p0, v0}, Landroidx/recyclerview/widget/RecyclerView;->setChildImportantForAccessibilityInternal(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Z
@@ -931,8 +915,6 @@
     :cond_1
     if-nez p1, :cond_2
 
-    iget v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mIsRecyclableCount:I
-
     if-ne v1, v0, :cond_2
 
     iget p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mFlags:I
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerView.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerView.smali
index 99d6390c37..6a70aa8ce9 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerView.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerView.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerView;
 .super Landroid/view/ViewGroup;
+.source "RecyclerView.java"
 
 # interfaces
 .implements Landroidx/core/view/NestedScrollingChild2;
@@ -1495,7 +1496,7 @@
 .end method
 
 .method private didChildRangeChange(II)Z
-    .locals 3
+    .locals 4
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mMinMaxLayoutPositions:[I
 
@@ -1505,15 +1506,13 @@
 
     const/4 v1, 0x0
 
-    aget v0, v0, v1
+    aget v2, v0, v1
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    if-ne v0, p1, :cond_1
+    if-ne v2, p1, :cond_1
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mMinMaxLayoutPositions:[I
-
-    aget p1, p1, v2
+    aget p1, v0, v3
 
     if-eq p1, p2, :cond_0
 
@@ -1524,7 +1523,7 @@
 
     :cond_1
     :goto_0
-    return v2
+    return v3
 .end method
 
 .method private dispatchContentChangedIfNecessary()V
@@ -1593,9 +1592,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    iget-boolean v3, v3, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
+    iget-boolean v3, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
 
     if-eqz v3, :cond_0
 
@@ -1617,9 +1614,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    iget-boolean v1, v1, Landroidx/recyclerview/widget/RecyclerView$State;->mRunPredictiveAnimations:Z
+    iget-boolean v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunPredictiveAnimations:Z
 
     iput-boolean v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mInPreLayout:Z
 
@@ -1753,7 +1748,7 @@
 
     iget-boolean v0, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunPredictiveAnimations:Z
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->saveOldPositions()V
 
@@ -1765,13 +1760,11 @@
 
     iput-boolean v2, v1, Landroidx/recyclerview/widget/RecyclerView$State;->mStructureChanged:Z
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
+    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    invoke-virtual {v1, v3, v4}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
+    invoke-virtual {v3, v4, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
@@ -1859,6 +1852,12 @@
     :cond_7
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->clearOldPositions()V
 
+    goto :goto_4
+
+    :cond_8
+    invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->clearOldPositions()V
+
+    :goto_4
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->onExitLayoutOrScroll()V
 
     invoke-virtual {p0, v2}, Landroidx/recyclerview/widget/RecyclerView;->stopInterceptRequestLayout(Z)V
@@ -1905,31 +1904,23 @@
 
     iput v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mDeletedInvisibleItemCountSincePreviousLayout:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
     iput-boolean v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mInPreLayout:Z
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
+    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    invoke-virtual {v0, v2, v3}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
+    invoke-virtual {v2, v3, v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
     iput-boolean v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mStructureChanged:Z
 
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
-    iput-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mPendingSavedState:Landroidx/recyclerview/widget/RecyclerView$SavedState;
+    iput-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mPendingSavedState:Landroidx/recyclerview/widget/RecyclerView$SavedState;
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    iget-boolean v2, v2, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
+    iget-boolean v2, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
 
     if-eqz v2, :cond_0
 
@@ -1979,8 +1970,6 @@
 
     iput v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mLayoutStep:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
     iget-boolean v0, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
 
     if-eqz v0, :cond_5
@@ -2117,9 +2106,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    iget v2, v2, Landroidx/recyclerview/widget/RecyclerView$State;->mItemCount:I
+    iget v2, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mItemCount:I
 
     iput v2, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mPreviousLayoutItemCount:I
 
@@ -2133,8 +2120,6 @@
 
     iput-boolean v0, v2, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
     iput-boolean v0, v2, Landroidx/recyclerview/widget/RecyclerView$State;->mRunPredictiveAnimations:Z
 
     iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
@@ -2164,8 +2149,6 @@
 
     iput v0, v2, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mPrefetchMaxCountObserved:I
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     iput-boolean v0, v2, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->mPrefetchMaxObservedInInitialPrefetch:Z
 
     iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
@@ -2189,13 +2172,11 @@
 
     iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mMinMaxLayoutPositions:[I
 
-    aget v2, v2, v0
+    aget v3, v2, v0
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mMinMaxLayoutPositions:[I
+    aget v1, v2, v1
 
-    aget v1, v3, v1
-
-    invoke-direct {p0, v2, v1}, Landroidx/recyclerview/widget/RecyclerView;->didChildRangeChange(II)Z
+    invoke-direct {p0, v3, v1}, Landroidx/recyclerview/widget/RecyclerView;->didChildRangeChange(II)Z
 
     move-result v1
 
@@ -2224,18 +2205,16 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
     if-nez v0, :cond_0
 
-    iput-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mActiveOnItemTouchListener:Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
+    iput-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mActiveOnItemTouchListener:Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
 
     goto :goto_0
 
     :cond_0
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mActiveOnItemTouchListener:Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
-
-    invoke-interface {v3, p0, p1}, Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;->onTouchEvent(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/MotionEvent;)V
+    invoke-interface {v1, p0, p1}, Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;->onTouchEvent(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/MotionEvent;)V
 
     const/4 p1, 0x3
 
@@ -2244,7 +2223,7 @@
     if-ne v0, v2, :cond_2
 
     :cond_1
-    iput-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mActiveOnItemTouchListener:Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
+    iput-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mActiveOnItemTouchListener:Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
 
     :cond_2
     return v2
@@ -2681,12 +2660,12 @@
 .method private getDeepestFocusedViewWithId(Landroid/view/View;)I
     .locals 3
 
-    :goto_0
     invoke-virtual {p1}, Landroid/view/View;->getId()I
 
     move-result v0
 
     :cond_0
+    :goto_0
     invoke-virtual {p1}, Landroid/view/View;->isFocused()Z
 
     move-result v1
@@ -2717,6 +2696,10 @@
 
     if-eq v1, v2, :cond_0
 
+    invoke-virtual {p1}, Landroid/view/View;->getId()I
+
+    move-result v0
+
     goto :goto_0
 
     :cond_1
@@ -2850,8 +2833,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->hasStableIds()Z
 
     move-result p1
@@ -3052,7 +3033,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p2, :cond_18
+    if-eqz p2, :cond_19
 
     if-ne p2, p0, :cond_0
 
@@ -3390,9 +3371,14 @@
     return v1
 
     :cond_18
+    return v0
+
+    :cond_19
     :goto_5
     return v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -3596,9 +3582,7 @@
 
     iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
-    iget-boolean v4, v4, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
+    iget-boolean v4, v3, Landroidx/recyclerview/widget/RecyclerView$State;->mRunSimpleAnimations:Z
 
     if-eqz v4, :cond_7
 
@@ -3659,12 +3643,11 @@
 
     sub-float p3, v0, p3
 
-    :goto_0
     invoke-static {v3, v4, p3}, Landroidx/core/widget/EdgeEffectCompat;->onPull(Landroid/widget/EdgeEffect;FF)V
 
     const/4 p3, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     cmpl-float v3, p2, v2
@@ -3691,12 +3674,16 @@
 
     div-float/2addr p3, v5
 
+    invoke-static {v3, v4, p3}, Landroidx/core/widget/EdgeEffectCompat;->onPull(Landroid/widget/EdgeEffect;FF)V
+
+    const/4 p3, 0x1
+
     goto :goto_0
 
     :cond_1
     const/4 p3, 0x0
 
-    :goto_1
+    :goto_0
     cmpg-float v3, p4, v2
 
     if-gez v3, :cond_2
@@ -3725,7 +3712,7 @@
 
     invoke-static {p3, v0, p1}, Landroidx/core/widget/EdgeEffectCompat;->onPull(Landroid/widget/EdgeEffect;FF)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     cmpl-float v3, p4, v2
@@ -3756,12 +3743,12 @@
 
     invoke-static {p3, v3, v0}, Landroidx/core/widget/EdgeEffectCompat;->onPull(Landroid/widget/EdgeEffect;FF)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     move v1, p3
 
-    :goto_2
+    :goto_1
     if-nez v1, :cond_4
 
     cmpl-float p1, p2, v2
@@ -3784,17 +3771,17 @@
 
     iget-boolean v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mPreserveFocusAfterLayout:Z
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_a
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_a
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->hasFocus()Z
 
     move-result v0
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_a
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->getDescendantFocusability()I
 
@@ -3802,7 +3789,7 @@
 
     const/high16 v1, 0x60000
 
-    if-eq v0, v1, :cond_9
+    if-eq v0, v1, :cond_a
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->getDescendantFocusability()I
 
@@ -3986,6 +3973,9 @@
     invoke-virtual {v0}, Landroid/view/View;->requestFocus()Z
 
     :cond_9
+    return-void
+
+    :cond_a
     :goto_4
     return-void
 .end method
@@ -3997,8 +3987,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLeftGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->onRelease()V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLeftGlow:Landroid/widget/EdgeEffect;
@@ -4017,8 +4005,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mTopGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v1}, Landroid/widget/EdgeEffect;->onRelease()V
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mTopGlow:Landroid/widget/EdgeEffect;
@@ -4034,8 +4020,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mRightGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v1}, Landroid/widget/EdgeEffect;->onRelease()V
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mRightGlow:Landroid/widget/EdgeEffect;
@@ -4051,8 +4035,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mBottomGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v1}, Landroid/widget/EdgeEffect;->onRelease()V
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mBottomGlow:Landroid/widget/EdgeEffect;
@@ -4213,14 +4195,10 @@
 
     iput-wide v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mFocusedItemId:J
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
     const/4 v1, -0x1
 
     iput v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mFocusedItemPosition:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
     iput v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mFocusedSubChildId:I
 
     return-void
@@ -4233,8 +4211,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->clear()V
 
     :cond_0
@@ -4368,8 +4344,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
-
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mObserver:Landroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->unregisterAdapterDataObserver(Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;)V
@@ -4408,8 +4382,6 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     invoke-virtual {p1, p3, v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
@@ -4441,8 +4413,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->stopSmoothScroller()V
 
     :cond_0
@@ -4526,8 +4496,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0, p0, p1, p2, p3}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAddFocusables(Landroidx/recyclerview/widget/RecyclerView;Ljava/util/ArrayList;II)Z
 
     move-result v0
@@ -4566,8 +4534,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     const-string v1, "Cannot add item decoration during a scroll  or layout"
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
@@ -4879,8 +4845,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getUnmodifiedPayloads()Ljava/util/List;
 
     move-result-object v1
@@ -4984,8 +4948,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mOnChildAttachStateListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
     :cond_0
@@ -4999,8 +4961,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
     :cond_0
@@ -5019,8 +4979,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -5053,8 +5011,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -5087,8 +5043,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -5121,8 +5075,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollVertically()Z
 
     move-result v0
@@ -5155,8 +5107,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollVertically()Z
 
     move-result v0
@@ -5189,8 +5139,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollVertically()Z
 
     move-result v0
@@ -5218,8 +5166,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLeftGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result v0
@@ -5248,8 +5194,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mRightGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v1}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result v1
@@ -5275,8 +5219,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mTopGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {p1}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result p1
@@ -5302,8 +5244,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mBottomGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {p1}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result p1
@@ -5344,7 +5284,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapterHelper:Landroidx/recyclerview/widget/AdapterHelper;
@@ -5417,7 +5357,6 @@
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->onExitLayoutOrScroll()V
 
-    :goto_1
     invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
 
     return-void
@@ -5443,14 +5382,16 @@
     return-void
 
     :cond_6
-    :goto_2
+    :goto_1
     const-string v0, "RV FullInvalidate"
 
     invoke-static {v0}, Landroidx/core/os/TraceCompat;->beginSection(Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->dispatchLayout()V
 
-    goto :goto_1
+    invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
+
+    return-void
 .end method
 
 .method defaultOnMeasure(II)V
@@ -5512,8 +5453,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
-
     invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
     :cond_0
@@ -5521,8 +5460,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mOnChildAttachStateListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -5565,8 +5502,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
-
     invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onViewDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
     :cond_0
@@ -5574,8 +5509,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mOnChildAttachStateListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -5614,7 +5547,6 @@
 
     const-string v1, "No adapter attached; skipping layout"
 
-    :goto_0
     invoke-static {v0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
@@ -5628,7 +5560,9 @@
 
     const-string v1, "No layout manager attached; skipping layout"
 
-    goto :goto_0
+    invoke-static {v0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
 
     :cond_1
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
@@ -5637,34 +5571,30 @@
 
     iput-boolean v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mIsMeasuring:Z
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
-
     iget v0, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mLayoutStep:I
 
     const/4 v1, 0x1
 
-    if-ne v0, v1, :cond_3
+    if-ne v0, v1, :cond_2
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep1()V
 
-    :cond_2
-    :goto_1
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     invoke-virtual {v0, p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->setExactMeasureSpecsFrom(Landroidx/recyclerview/widget/RecyclerView;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep2()V
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_3
+    :cond_2
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapterHelper:Landroidx/recyclerview/widget/AdapterHelper;
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/AdapterHelper;->hasUpdates()Z
 
     move-result v0
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_4
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
@@ -5676,7 +5606,7 @@
 
     move-result v1
 
-    if-ne v0, v1, :cond_2
+    if-ne v0, v1, :cond_4
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
@@ -5688,16 +5618,26 @@
 
     move-result v1
 
-    if-eq v0, v1, :cond_4
+    if-eq v0, v1, :cond_3
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_4
+    :cond_3
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     invoke-virtual {v0, p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->setExactMeasureSpecsFrom(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    :goto_2
+    goto :goto_1
+
+    :cond_4
+    :goto_0
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+
+    invoke-virtual {v0, p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->setExactMeasureSpecsFrom(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep2()V
+
+    :goto_1
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep3()V
 
     return-void
@@ -5826,8 +5766,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onScrollStateChanged(I)V
 
     :cond_0
@@ -5837,8 +5775,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollListener:Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
-
     invoke-virtual {v0, p0, p1}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
 
     :cond_1
@@ -5846,8 +5782,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -5900,8 +5834,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollListener:Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
-
     invoke-virtual {v0, p0, p1, p2}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 
     :cond_0
@@ -5909,8 +5841,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -6078,8 +6008,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLeftGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result v0
@@ -6126,8 +6054,6 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mLeftGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v3, p1}, Landroid/widget/EdgeEffect;->draw(Landroid/graphics/Canvas;)Z
 
     move-result v3
@@ -6154,8 +6080,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mTopGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result v0
@@ -6189,8 +6113,6 @@
 
     if-eqz v4, :cond_5
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mTopGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v4, p1}, Landroid/widget/EdgeEffect;->draw(Landroid/graphics/Canvas;)Z
 
     move-result v4
@@ -6214,8 +6136,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mRightGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result v0
@@ -6262,8 +6182,6 @@
 
     if-eqz v4, :cond_8
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mRightGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v4, p1}, Landroid/widget/EdgeEffect;->draw(Landroid/graphics/Canvas;)Z
 
     move-result v4
@@ -6287,8 +6205,6 @@
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mBottomGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v0}, Landroid/widget/EdgeEffect;->isFinished()Z
 
     move-result v0
@@ -6333,12 +6249,11 @@
 
     add-int/2addr v5, v6
 
-    :goto_7
     int-to-float v5, v5
 
     invoke-virtual {p1, v4, v5}, Landroid/graphics/Canvas;->translate(FF)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_a
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->getWidth()I
@@ -6355,15 +6270,15 @@
 
     neg-int v5, v5
 
-    goto :goto_7
+    int-to-float v5, v5
 
-    :goto_8
+    invoke-virtual {p1, v4, v5}, Landroid/graphics/Canvas;->translate(FF)V
+
+    :goto_7
     iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mBottomGlow:Landroid/widget/EdgeEffect;
 
     if-eqz v4, :cond_b
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mBottomGlow:Landroid/widget/EdgeEffect;
-
     invoke-virtual {v4, p1}, Landroid/widget/EdgeEffect;->draw(Landroid/graphics/Canvas;)Z
 
     move-result v4
@@ -6377,12 +6292,12 @@
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_c
     move v1, v3
 
-    :goto_9
+    :goto_8
     if-nez v1, :cond_d
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
@@ -6484,7 +6399,6 @@
 
     sub-int/2addr v2, v3
 
-    :goto_0
     invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
 
     return-void
@@ -6500,7 +6414,9 @@
 
     move-result v2
 
-    goto :goto_0
+    invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
+
+    return-void
 .end method
 
 .method ensureLeftGlow()V
@@ -6561,7 +6477,6 @@
 
     sub-int/2addr v2, v3
 
-    :goto_0
     invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
 
     return-void
@@ -6577,7 +6492,9 @@
 
     move-result v2
 
-    goto :goto_0
+    invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
+
+    return-void
 .end method
 
 .method ensureRightGlow()V
@@ -6638,7 +6555,6 @@
 
     sub-int/2addr v2, v3
 
-    :goto_0
     invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
 
     return-void
@@ -6654,7 +6570,9 @@
 
     move-result v2
 
-    goto :goto_0
+    invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
+
+    return-void
 .end method
 
 .method ensureTopGlow()V
@@ -6715,7 +6633,6 @@
 
     sub-int/2addr v2, v3
 
-    :goto_0
     invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
 
     return-void
@@ -6731,7 +6648,9 @@
 
     move-result v2
 
-    goto :goto_0
+    invoke-virtual {v0, v1, v2}, Landroid/widget/EdgeEffect;->setSize(II)V
+
+    return-void
 .end method
 
 .method exceptionLabel()Ljava/lang/String;
@@ -6933,11 +6852,11 @@
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    :goto_0
     invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
 
+    :goto_0
     if-eqz v0, :cond_0
 
     if-eq v0, p0, :cond_0
@@ -6950,6 +6869,10 @@
 
     check-cast p1, Landroid/view/View;
 
+    invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_0
@@ -7073,9 +6996,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    if-eqz v0, :cond_4
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->hasStableIds()Z
 
@@ -7147,6 +7068,9 @@
     goto :goto_0
 
     :cond_3
+    return-object v1
+
+    :cond_4
     :goto_2
     return-object v1
 .end method
@@ -7279,15 +7203,13 @@
     return v1
 
     :cond_0
-    iget-boolean v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayoutFrozen:Z
+    iget-boolean v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayoutFrozen:Z
 
-    if-eqz v0, :cond_1
+    if-eqz v2, :cond_1
 
     return v1
 
     :cond_1
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -7367,8 +7289,6 @@
 
     if-eqz v3, :cond_9
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mOnFlingListener:Landroidx/recyclerview/widget/RecyclerView$OnFlingListener;
-
     invoke-virtual {v3, p1, p2}, Landroidx/recyclerview/widget/RecyclerView$OnFlingListener;->onFling(II)Z
 
     move-result v3
@@ -7389,29 +7309,25 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mMaxFlingVelocity:I
 
-    neg-int v0, v0
+    neg-int v1, v0
 
-    iget v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mMaxFlingVelocity:I
-
-    invoke-static {p1, v1}, Ljava/lang/Math;->min(II)I
+    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    invoke-static {v0, p1}, Ljava/lang/Math;->max(II)I
+    invoke-static {v1, p1}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
     iget v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mMaxFlingVelocity:I
 
-    neg-int v0, v0
+    neg-int v1, v0
 
-    iget v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mMaxFlingVelocity:I
-
-    invoke-static {p2, v1}, Ljava/lang/Math;->min(II)I
+    invoke-static {p2, v0}, Ljava/lang/Math;->min(II)I
 
     move-result p2
 
-    invoke-static {v0, p2}, Ljava/lang/Math;->max(II)I
+    invoke-static {v1, p2}, Ljava/lang/Math;->max(II)I
 
     move-result p2
 
@@ -7719,8 +7635,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->generateDefaultLayoutParams()Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
     move-result-object v0
@@ -7758,8 +7672,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->getContext()Landroid/content/Context;
 
     move-result-object v1
@@ -7801,8 +7713,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
     move-result-object p1
@@ -7887,8 +7797,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getBaseline()I
 
     move-result v0
@@ -7967,8 +7875,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mChildDrawingOrderCallback:Landroidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback;
-
     invoke-interface {v0, p1, p2}, Landroidx/recyclerview/widget/RecyclerView$ChildDrawingOrderCallback;->onGetChildDrawingOrder(II)I
 
     move-result p1
@@ -7987,9 +7893,7 @@
 
     const-wide/16 v1, -0x1
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    if-eqz v0, :cond_2
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->hasStableIds()Z
 
@@ -8013,6 +7917,9 @@
     return-wide v0
 
     :cond_1
+    return-wide v1
+
+    :cond_2
     :goto_0
     return-wide v1
 .end method
@@ -8634,8 +8541,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     const-string v1, "Cannot invalidate item decorations during a scroll or layout"
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
@@ -8655,8 +8560,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAccessibilityManager:Landroid/view/accessibility/AccessibilityManager;
-
     invoke-virtual {v0}, Landroid/view/accessibility/AccessibilityManager;->isEnabled()Z
 
     move-result v0
@@ -8680,8 +8583,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->isRunning()Z
 
     move-result v0
@@ -8755,8 +8656,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->scrollToPosition(I)V
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->awakenScrollBars()Z
@@ -9121,12 +9020,11 @@
 
     invoke-virtual {v3, v4, p3}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->offsetPosition(IZ)V
 
-    :goto_1
     iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
     iput-boolean v5, v3, Landroidx/recyclerview/widget/RecyclerView$State;->mStructureChanged:Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget v4, v3, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->mPosition:I
@@ -9139,10 +9037,12 @@
 
     invoke-virtual {v3, v4, v6, p3}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->flagRemovedAndOffsetPosition(IIZ)V
 
-    goto :goto_1
+    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
+
+    iput-boolean v5, v3, Landroidx/recyclerview/widget/RecyclerView$State;->mStructureChanged:Z
 
     :cond_1
-    :goto_2
+    :goto_1
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
@@ -9192,8 +9092,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v1, p0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->dispatchAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView;)V
 
     :cond_1
@@ -9307,8 +9205,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->endAnimations()V
 
     :cond_0
@@ -9322,8 +9218,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
 
     invoke-virtual {v0, p0, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->dispatchDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
@@ -9349,8 +9243,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mGapWorker:Landroidx/recyclerview/widget/GapWorker;
-
     invoke-virtual {v0, p0}, Landroidx/recyclerview/widget/GapWorker;->remove(Landroidx/recyclerview/widget/RecyclerView;)V
 
     const/4 v0, 0x0
@@ -9471,7 +9363,7 @@
 
     const/16 v2, 0x8
 
-    if-ne v0, v2, :cond_8
+    if-ne v0, v2, :cond_9
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getSource()I
 
@@ -9481,7 +9373,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
@@ -9511,7 +9403,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_6
+    if-eqz v3, :cond_3
 
     const/16 v3, 0xa
 
@@ -9519,9 +9411,14 @@
 
     move-result v3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :cond_4
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getSource()I
 
     move-result v0
@@ -9530,7 +9427,7 @@
 
     and-int/2addr v0, v3
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_7
 
     const/16 v0, 0x1a
 
@@ -9544,44 +9441,51 @@
 
     move-result v3
 
-    if-eqz v3, :cond_4
+    if-eqz v3, :cond_5
 
     neg-float v0, v0
 
+    const/4 v3, 0x0
+
     goto :goto_1
 
-    :cond_4
+    :cond_5
     iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     invoke-virtual {v3}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v3
 
-    if-eqz v3, :cond_5
+    if-eqz v3, :cond_6
 
     move v3, v0
 
     const/4 v0, 0x0
 
-    goto :goto_2
-
-    :cond_5
-    const/4 v0, 0x0
+    goto :goto_1
 
     :cond_6
-    :goto_1
+    const/4 v0, 0x0
+
     const/4 v3, 0x0
 
-    :goto_2
+    goto :goto_1
+
+    :cond_7
+    const/4 v0, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_1
     cmpl-float v4, v0, v2
 
-    if-nez v4, :cond_7
+    if-nez v4, :cond_8
 
     cmpl-float v2, v3, v2
 
-    if-eqz v2, :cond_8
+    if-eqz v2, :cond_9
 
-    :cond_7
+    :cond_8
     iget v2, p0, Landroidx/recyclerview/widget/RecyclerView;->mScaledHorizontalScrollFactor:F
 
     mul-float v3, v3, v2
@@ -9596,7 +9500,7 @@
 
     invoke-virtual {p0, v2, v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->scrollByInternal(IILandroid/view/MotionEvent;)Z
 
-    :cond_8
+    :cond_9
     return v1
 .end method
 
@@ -9632,8 +9536,6 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -9884,9 +9786,7 @@
     :cond_8
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
-
-    aput v1, v4, v2
+    aput v1, p1, v2
 
     aput v1, p1, v1
 
@@ -9950,8 +9850,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->isAutoMeasureEnabled()Z
 
     move-result v0
@@ -9960,7 +9858,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     invoke-static {p1}, Landroid/view/View$MeasureSpec;->getMode(I)I
 
@@ -9987,7 +9885,7 @@
     const/4 v2, 0x1
 
     :cond_1
-    if-nez v2, :cond_4
+    if-nez v2, :cond_5
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
@@ -10058,13 +9956,16 @@
     invoke-virtual {v0, p1, p2}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->setMeasuredDimensionFromChildren(II)V
 
     :cond_4
-    :goto_0
     return-void
 
     :cond_5
+    :goto_0
+    return-void
+
+    :cond_6
     iget-boolean v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mHasFixedSize:Z
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_7
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
@@ -10076,10 +9977,10 @@
 
     return-void
 
-    :cond_6
+    :cond_7
     iget-boolean v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapterUpdateDuringMeasure:Z
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_9
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->startInterceptRequestLayout()V
 
@@ -10093,7 +9994,7 @@
 
     iget-boolean v0, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunPredictiveAnimations:Z
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
@@ -10101,7 +10002,7 @@
 
     goto :goto_1
 
-    :cond_7
+    :cond_8
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapterHelper:Landroidx/recyclerview/widget/AdapterHelper;
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/AdapterHelper;->consumeUpdatesInOnePass()V
@@ -10117,12 +10018,12 @@
 
     goto :goto_2
 
-    :cond_8
+    :cond_9
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
     iget-boolean v0, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mRunPredictiveAnimations:Z
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_a
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->getMeasuredWidth()I
 
@@ -10136,25 +10037,23 @@
 
     return-void
 
-    :cond_9
+    :cond_a
     :goto_2
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_b
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
+    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mAdapter:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->getItemCount()I
 
-    invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->getItemCount()I
+    move-result v0
 
-    move-result v1
-
-    iput v1, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mItemCount:I
+    iput v0, v1, Landroidx/recyclerview/widget/RecyclerView$State;->mItemCount:I
 
     goto :goto_3
 
-    :cond_a
+    :cond_b
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
     iput v2, v0, Landroidx/recyclerview/widget/RecyclerView$State;->mItemCount:I
@@ -10261,34 +10160,29 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mPendingSavedState:Landroidx/recyclerview/widget/RecyclerView$SavedState;
-
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView$SavedState;->copyFrom(Landroidx/recyclerview/widget/RecyclerView$SavedState;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->onSaveInstanceState()Landroid/os/Parcelable;
 
     move-result-object v1
 
-    :goto_0
     iput-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$SavedState;->mLayoutState:Landroid/os/Parcelable;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v1, 0x0
 
-    goto :goto_0
+    iput-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$SavedState;->mLayoutState:Landroid/os/Parcelable;
 
-    :goto_1
+    :goto_0
     return-object v0
 .end method
 
@@ -10364,8 +10258,6 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -10403,26 +10295,22 @@
 
     iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
 
-    iget-object v8, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
-
-    aput v1, v8, v2
+    aput v1, v7, v2
 
     aput v1, v7, v1
 
     :cond_4
     iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
 
-    aget v7, v7, v1
-
-    int-to-float v7, v7
-
-    iget-object v8, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
-
-    aget v8, v8, v2
+    aget v8, v7, v1
 
     int-to-float v8, v8
 
-    invoke-virtual {v4, v7, v8}, Landroid/view/MotionEvent;->offsetLocation(FF)V
+    aget v7, v7, v2
+
+    int-to-float v7, v7
+
+    invoke-virtual {v4, v8, v7}, Landroid/view/MotionEvent;->offsetLocation(FF)V
 
     const/high16 v7, 0x3f000000    # 0.5f
 
@@ -10552,11 +10440,9 @@
 
     iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollConsumed:[I
 
-    aget v7, v7, v1
+    aget v8, v7, v1
 
-    sub-int/2addr v5, v7
-
-    iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollConsumed:[I
+    sub-int/2addr v5, v8
 
     aget v7, v7, v2
 
@@ -10564,17 +10450,15 @@
 
     iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
 
-    aget v7, v7, v1
-
-    int-to-float v7, v7
-
-    iget-object v8, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
-
-    aget v8, v8, v2
+    aget v8, v7, v1
 
     int-to-float v8, v8
 
-    invoke-virtual {v4, v7, v8}, Landroid/view/MotionEvent;->offsetLocation(FF)V
+    aget v7, v7, v2
+
+    int-to-float v7, v7
+
+    invoke-virtual {v4, v8, v7}, Landroid/view/MotionEvent;->offsetLocation(FF)V
 
     iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
 
@@ -10582,18 +10466,14 @@
 
     iget-object v9, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
 
-    aget v9, v9, v1
+    aget v10, v9, v1
 
-    add-int/2addr v8, v9
+    add-int/2addr v8, v10
 
     aput v8, v7, v1
 
-    iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
-
     aget v8, v7, v2
 
-    iget-object v9, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
-
     aget v9, v9, v2
 
     add-int/2addr v8, v9
@@ -10617,16 +10497,12 @@
 
     if-lez v5, :cond_7
 
-    iget v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mTouchSlop:I
-
-    sub-int/2addr v5, v7
+    sub-int/2addr v5, v8
 
     goto :goto_0
 
     :cond_7
-    iget v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mTouchSlop:I
-
-    add-int/2addr v5, v7
+    add-int/2addr v5, v8
 
     :goto_0
     const/4 v7, 0x1
@@ -10649,16 +10525,12 @@
 
     if-lez v13, :cond_9
 
-    iget v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mTouchSlop:I
-
-    sub-int/2addr v13, v7
+    sub-int/2addr v13, v9
 
     goto :goto_2
 
     :cond_9
-    iget v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mTouchSlop:I
-
-    add-int/2addr v13, v7
+    add-int/2addr v13, v9
 
     :goto_2
     const/4 v7, 0x1
@@ -10675,15 +10547,13 @@
 
     iget-object v7, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
 
-    aget v7, v7, v1
+    aget v8, v7, v1
 
-    sub-int/2addr v6, v7
+    sub-int/2addr v6, v8
 
     iput v6, p0, Landroidx/recyclerview/widget/RecyclerView;->mLastTouchX:I
 
-    iget-object v6, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
-
-    aget v6, v6, v2
+    aget v6, v7, v2
 
     sub-int/2addr p1, v6
 
@@ -10985,8 +10855,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->endAnimations()V
 
     :cond_0
@@ -10994,8 +10862,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mRecycler:Landroidx/recyclerview/widget/RecyclerView$Recycler;
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->removeAndRecycleAllViews(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
@@ -11122,8 +10988,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     const-string v1, "Cannot remove item decoration during a scroll  or layout"
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
@@ -11224,8 +11088,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mOnChildAttachStateListeners:Ljava/util/List;
-
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     return-void
@@ -11265,8 +11127,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mScrollListeners:Ljava/util/List;
-
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     :cond_0
@@ -11500,15 +11360,13 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayoutFrozen:Z
+    iget-boolean v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayoutFrozen:Z
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -11577,23 +11435,21 @@
 
     iget-object v0, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollStepConsumed:[I
 
-    aget v0, v0, v12
+    aget v1, v0, v12
 
-    iget-object v1, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollStepConsumed:[I
+    aget v0, v0, v11
 
-    aget v1, v1, v11
+    sub-int v2, v8, v1
 
-    sub-int v2, v8, v0
+    sub-int v3, v9, v0
 
-    sub-int v3, v9, v1
+    move v6, v0
 
-    move v13, v0
+    move v15, v1
 
-    move v14, v1
+    move v13, v2
 
-    move v15, v2
-
-    move v6, v3
+    move v14, v3
 
     goto :goto_0
 
@@ -11624,13 +11480,13 @@
 
     move-object/from16 v0, p0
 
-    move v1, v13
+    move v1, v15
 
-    move v2, v14
+    move v2, v6
 
-    move v3, v15
+    move v3, v13
 
-    move v4, v6
+    move v4, v14
 
     move/from16 v17, v6
 
@@ -11646,32 +11502,26 @@
 
     iget-object v1, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
 
-    aget v1, v1, v12
+    aget v2, v1, v12
 
-    sub-int/2addr v0, v1
+    sub-int/2addr v0, v2
 
     iput v0, v7, Landroidx/recyclerview/widget/RecyclerView;->mLastTouchX:I
 
     iget v0, v7, Landroidx/recyclerview/widget/RecyclerView;->mLastTouchY:I
 
-    iget-object v1, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
+    aget v2, v1, v11
 
-    aget v1, v1, v11
-
-    sub-int/2addr v0, v1
+    sub-int/2addr v0, v2
 
     iput v0, v7, Landroidx/recyclerview/widget/RecyclerView;->mLastTouchY:I
 
     if-eqz v10, :cond_2
 
-    iget-object v0, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
-
-    aget v0, v0, v12
+    aget v0, v1, v12
 
     int-to-float v0, v0
 
-    iget-object v1, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
-
     aget v1, v1, v11
 
     int-to-float v1, v1
@@ -11685,18 +11535,14 @@
 
     iget-object v2, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
 
-    aget v2, v2, v12
+    aget v3, v2, v12
 
-    add-int/2addr v1, v2
+    add-int/2addr v1, v3
 
     aput v1, v0, v12
 
-    iget-object v0, v7, Landroidx/recyclerview/widget/RecyclerView;->mNestedOffsets:[I
-
     aget v1, v0, v11
 
-    iget-object v2, v7, Landroidx/recyclerview/widget/RecyclerView;->mScrollOffset:[I
-
     aget v2, v2, v11
 
     add-int/2addr v1, v2
@@ -11728,15 +11574,13 @@
 
     move-result v0
 
-    int-to-float v1, v15
+    int-to-float v1, v13
 
     invoke-virtual/range {p3 .. p3}, Landroid/view/MotionEvent;->getY()F
 
     move-result v2
 
-    move/from16 v3, v17
-
-    int-to-float v3, v3
+    int-to-float v3, v14
 
     invoke-direct {v7, v0, v1, v2, v3}, Landroidx/recyclerview/widget/RecyclerView;->pullGlows(FFFF)V
 
@@ -11745,34 +11589,41 @@
 
     :cond_5
     :goto_1
-    if-nez v13, :cond_6
+    if-nez v15, :cond_6
 
-    if-eqz v14, :cond_7
+    move/from16 v0, v17
+
+    if-eqz v0, :cond_7
+
+    goto :goto_2
 
     :cond_6
-    invoke-virtual {v7, v13, v14}, Landroidx/recyclerview/widget/RecyclerView;->dispatchOnScrolled(II)V
+    move/from16 v0, v17
+
+    :goto_2
+    invoke-virtual {v7, v15, v0}, Landroidx/recyclerview/widget/RecyclerView;->dispatchOnScrolled(II)V
 
     :cond_7
     invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/RecyclerView;->awakenScrollBars()Z
 
-    move-result v0
+    move-result v1
 
-    if-nez v0, :cond_8
+    if-nez v1, :cond_8
 
     invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/RecyclerView;->invalidate()V
 
     :cond_8
-    if-nez v13, :cond_a
+    if-nez v15, :cond_a
 
-    if-eqz v14, :cond_9
+    if-eqz v0, :cond_9
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_9
     return v12
 
     :cond_a
-    :goto_2
+    :goto_3
     return v11
 .end method
 
@@ -11890,8 +11741,6 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->scrollToPosition(I)V
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView;->awakenScrollBars()Z
@@ -12077,8 +11926,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->endAnimations()V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
@@ -12094,8 +11941,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
-
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimatorListener:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;
 
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->setListener(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;)V
@@ -12207,8 +12052,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mItemAnimator:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;->endAnimations()V
 
     :cond_1
@@ -12452,25 +12295,26 @@
 
     invoke-static {v1, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     invoke-virtual {v0}, Landroid/view/ViewConfiguration;->getScaledPagingTouchSlop()I
 
     move-result p1
 
-    :goto_0
     iput p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mTouchSlop:I
 
     return-void
 
-    :goto_1
+    :goto_0
     :pswitch_1
     invoke-virtual {v0}, Landroid/view/ViewConfiguration;->getScaledTouchSlop()I
 
     move-result p1
 
-    goto :goto_0
+    iput p1, p0, Landroidx/recyclerview/widget/RecyclerView;->mTouchSlop:I
+
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -12581,15 +12425,13 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayoutFrozen:Z
+    iget-boolean v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayoutFrozen:Z
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->canScrollHorizontally()Z
 
     move-result v0
@@ -12648,8 +12490,6 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView;->mLayout:Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
-
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView;->mState:Landroidx/recyclerview/widget/RecyclerView$State;
 
     invoke-virtual {v0, p0, v1, p1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->smoothScrollToPosition(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;I)V
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate.smali
index a7edec019a..88d9bdea04 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "RecyclerViewAccessibilityDelegate.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.smali b/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.smali
index 0d5926d3f1..2407cd8a95 100644
--- a/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "RecyclerViewAccessibilityDelegate.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ScrollbarHelper.smali b/com.discord/smali/androidx/recyclerview/widget/ScrollbarHelper.smali
index 47a72a633e..87d6cd06f4 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ScrollbarHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ScrollbarHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ScrollbarHelper;
 .super Ljava/lang/Object;
+.source "ScrollbarHelper.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/widget/SimpleItemAnimator.smali b/com.discord/smali/androidx/recyclerview/widget/SimpleItemAnimator.smali
index 79fa8378fd..e09b49e324 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SimpleItemAnimator.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SimpleItemAnimator.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/SimpleItemAnimator;
 .super Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
+.source "SimpleItemAnimator.java"
 
 
 # static fields
@@ -178,34 +179,28 @@
 
     move-result v0
 
-    :goto_0
-    move v4, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget v0, p3, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;->left:I
 
-    goto :goto_0
+    :goto_0
+    move v4, v0
 
-    :goto_1
     if-nez p3, :cond_1
 
     invoke-virtual {p2}, Landroid/view/View;->getTop()I
 
     move-result p3
 
-    :goto_2
-    move v5, p3
-
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     iget p3, p3, Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;->top:I
 
-    goto :goto_2
+    :goto_1
+    move v5, p3
 
-    :goto_3
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->isRemoved()Z
 
     move-result p3
diff --git a/com.discord/smali/androidx/recyclerview/widget/SnapHelper$1.smali b/com.discord/smali/androidx/recyclerview/widget/SnapHelper$1.smali
index d1bc9897fc..1043bb97fb 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SnapHelper$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SnapHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/SnapHelper$1;
 .super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "SnapHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/SnapHelper$2.smali b/com.discord/smali/androidx/recyclerview/widget/SnapHelper$2.smali
index 5c8c6ce10c..403a23ea14 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SnapHelper$2.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SnapHelper$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/SnapHelper$2;
 .super Landroidx/recyclerview/widget/LinearSmoothScroller;
+.source "SnapHelper.java"
 
 
 # annotations
@@ -58,9 +59,7 @@
     :cond_0
     iget-object p2, p0, Landroidx/recyclerview/widget/SnapHelper$2;->this$0:Landroidx/recyclerview/widget/SnapHelper;
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/SnapHelper$2;->this$0:Landroidx/recyclerview/widget/SnapHelper;
-
-    iget-object v0, v0, Landroidx/recyclerview/widget/SnapHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object v0, p2, Landroidx/recyclerview/widget/SnapHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/SnapHelper.smali b/com.discord/smali/androidx/recyclerview/widget/SnapHelper.smali
index 779428481f..06a324dded 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SnapHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SnapHelper.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/SnapHelper;
 .super Landroidx/recyclerview/widget/RecyclerView$OnFlingListener;
+.source "SnapHelper.java"
 
 
 # static fields
@@ -151,8 +152,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/SnapHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     if-eqz v0, :cond_1
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/SnapHelper;->destroyCallbacks()V
@@ -371,8 +370,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/SnapHelper;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/recyclerview/widget/SortedList$BatchedCallback.smali b/com.discord/smali/androidx/recyclerview/widget/SortedList$BatchedCallback.smali
index 211bf65e82..ebb1b442f1 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SortedList$BatchedCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SortedList$BatchedCallback.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/SortedList$BatchedCallback;
 .super Landroidx/recyclerview/widget/SortedList$Callback;
+.source "SortedList.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/SortedList$Callback.smali b/com.discord/smali/androidx/recyclerview/widget/SortedList$Callback.smali
index f55eaf07cc..4bb4462703 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SortedList$Callback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SortedList$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/SortedList$Callback;
 .super Ljava/lang/Object;
+.source "SortedList.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/ListUpdateCallback;
diff --git a/com.discord/smali/androidx/recyclerview/widget/SortedList.smali b/com.discord/smali/androidx/recyclerview/widget/SortedList.smali
index 839fc81feb..f74bb3cfbc 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SortedList.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SortedList.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/SortedList;
 .super Ljava/lang/Object;
+.source "SortedList.java"
 
 
 # annotations
@@ -214,9 +215,7 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
-
-    invoke-virtual {v3, v2, p1}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {p2, v2, p1}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -291,18 +290,14 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
-
     iget-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ne v0, v1, :cond_0
+    if-ne v0, v2, :cond_0
 
     iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mTClass:Ljava/lang/Class;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
-
     array-length v1, v1
 
     add-int/lit8 v1, v1, 0xa
@@ -336,15 +331,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
 
@@ -427,7 +418,7 @@
 
     const/4 v1, 0x1
 
-    if-ge p3, p4, :cond_4
+    if-ge p3, p4, :cond_5
 
     add-int v2, p3, p4
 
@@ -448,7 +439,7 @@
     goto :goto_0
 
     :cond_0
-    if-nez v4, :cond_3
+    if-nez v4, :cond_4
 
     iget-object p2, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
@@ -465,7 +456,7 @@
 
     move-result p1
 
-    if-ne p5, v1, :cond_2
+    if-ne p5, v1, :cond_3
 
     if-ne p1, v0, :cond_2
 
@@ -475,16 +466,19 @@
     return p1
 
     :cond_3
+    return p1
+
+    :cond_4
     move p4, v2
 
     goto :goto_0
 
-    :cond_4
-    if-ne p5, v1, :cond_5
+    :cond_5
+    if-ne p5, v1, :cond_6
 
     return p3
 
-    :cond_5
+    :cond_6
     return v0
 .end method
 
@@ -636,8 +630,6 @@
 
     iput v3, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataSize:I
 
-    iget v3, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
-
     add-int/2addr v3, p2
 
     add-int/lit8 v3, v3, 0xa
@@ -704,27 +696,21 @@
     :cond_4
     if-ne v1, p2, :cond_7
 
-    iget p1, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataSize:I
+    sub-int/2addr v4, v3
 
-    iget p2, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataStart:I
+    iget-object p1, p0, Landroidx/recyclerview/widget/SortedList;->mOldData:[Ljava/lang/Object;
 
-    sub-int/2addr p1, p2
+    iget-object p2, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/SortedList;->mOldData:[Ljava/lang/Object;
+    iget v1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
-    iget v1, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataStart:I
+    invoke-static {p1, v3, p2, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
+    iget p1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
-    iget v3, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
+    add-int/2addr p1, v4
 
-    invoke-static {p2, v1, v2, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget p2, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
-
-    add-int/2addr p2, p1
-
-    iput p2, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
+    iput p1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
     :cond_5
     :goto_2
@@ -740,11 +726,9 @@
     return-void
 
     :cond_7
-    iget-object v3, p0, Landroidx/recyclerview/widget/SortedList;->mOldData:[Ljava/lang/Object;
+    iget-object v4, p0, Landroidx/recyclerview/widget/SortedList;->mOldData:[Ljava/lang/Object;
 
-    iget v4, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataStart:I
-
-    aget-object v3, v3, v4
+    aget-object v3, v4, v3
 
     aget-object v4, p1, v1
 
@@ -827,9 +811,7 @@
 
     sub-int/2addr v6, v2
 
-    iget-object v7, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
-
-    invoke-virtual {v7, v3, v4}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v5, v3, v4}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -898,27 +880,25 @@
 .end method
 
 .method private removeItemAtIndex(IZ)V
-    .locals 5
+    .locals 4
 
     iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
 
     add-int/lit8 v1, p1, 0x1
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
+    iget v2, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
 
-    iget v3, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
+    sub-int/2addr v2, p1
 
-    sub-int/2addr v3, p1
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    sub-int/2addr v2, v3
 
-    sub-int/2addr v3, v4
-
-    invoke-static {v0, v1, v2, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget v0, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
 
-    sub-int/2addr v0, v4
+    sub-int/2addr v0, v3
 
     iput v0, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
 
@@ -934,7 +914,7 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    invoke-virtual {p2, p1, v4}, Landroidx/recyclerview/widget/SortedList$Callback;->onRemoved(II)V
+    invoke-virtual {p2, p1, v3}, Landroidx/recyclerview/widget/SortedList$Callback;->onRemoved(II)V
 
     :cond_0
     return-void
@@ -954,33 +934,31 @@
 
     aput-object p1, v0, v1
 
-    iget p1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
+    add-int/2addr v1, p1
 
-    add-int/2addr p1, v0
+    iput v1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
-    iput p1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
+    iget v0, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
 
-    iget p1, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
+    add-int/2addr v0, p1
 
-    add-int/2addr p1, v0
+    iput v0, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
 
-    iput p1, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
+    iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
     iget v1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
-    sub-int/2addr v1, v0
+    sub-int/2addr v1, p1
 
-    invoke-virtual {p1, v1, v0}, Landroidx/recyclerview/widget/SortedList$Callback;->onInserted(II)V
+    invoke-virtual {v0, v1, p1}, Landroidx/recyclerview/widget/SortedList$Callback;->onInserted(II)V
 
     return-void
 .end method
 
 .method private replaceAllInternal([Ljava/lang/Object;)V
-    .locals 8
+    .locals 7
     .param p1    # [Ljava/lang/Object;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -1061,9 +1039,7 @@
 
     iget v2, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
-    iget v3, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
-
-    sub-int/2addr v1, v3
+    sub-int/2addr v1, v2
 
     iget-object v3, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
 
@@ -1088,27 +1064,21 @@
     goto :goto_2
 
     :cond_4
-    iget v3, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
+    iget v5, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
-    if-lt v3, v1, :cond_7
+    if-lt v5, v1, :cond_7
 
-    iget p1, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataSize:I
+    sub-int/2addr v4, v3
 
-    iget v1, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataStart:I
+    iget p1, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
 
-    sub-int/2addr p1, v1
+    sub-int/2addr p1, v4
 
-    iget v1, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
+    iput p1, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
 
-    sub-int/2addr v1, p1
+    iget-object p1, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    iput v1, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
-
-    iget-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
-
-    iget v2, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
-
-    invoke-virtual {v1, v2, p1}, Landroidx/recyclerview/widget/SortedList$Callback;->onRemoved(II)V
+    invoke-virtual {p1, v5, v4}, Landroidx/recyclerview/widget/SortedList$Callback;->onRemoved(II)V
 
     :cond_5
     :goto_2
@@ -1124,15 +1094,11 @@
     return-void
 
     :cond_7
-    iget-object v3, p0, Landroidx/recyclerview/widget/SortedList;->mOldData:[Ljava/lang/Object;
+    iget-object v4, p0, Landroidx/recyclerview/widget/SortedList;->mOldData:[Ljava/lang/Object;
 
-    iget v4, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataStart:I
+    aget-object v3, v4, v3
 
-    aget-object v3, v3, v4
-
-    iget v4, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
-
-    aget-object v4, p1, v4
+    aget-object v4, p1, v5
 
     iget-object v5, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
@@ -1149,7 +1115,6 @@
     :cond_8
     if-lez v5, :cond_9
 
-    :goto_3
     invoke-direct {p0, v4}, Landroidx/recyclerview/widget/SortedList;->replaceAllInsert(Ljava/lang/Object;)V
 
     goto :goto_1
@@ -1165,7 +1130,9 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/SortedList;->replaceAllRemove()V
 
-    goto :goto_3
+    invoke-direct {p0, v4}, Landroidx/recyclerview/widget/SortedList;->replaceAllInsert(Ljava/lang/Object;)V
+
+    goto :goto_1
 
     :cond_a
     iget-object v5, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
@@ -1180,11 +1147,9 @@
 
     iput v5, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataStart:I
 
-    iget v5, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
+    add-int/2addr v6, v2
 
-    add-int/2addr v5, v2
-
-    iput v5, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
+    iput v6, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
     iget-object v5, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
@@ -1200,9 +1165,7 @@
 
     sub-int/2addr v6, v2
 
-    iget-object v7, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
-
-    invoke-virtual {v7, v3, v4}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v5, v3, v4}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1264,7 +1227,9 @@
 
     const/4 v0, 0x1
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
 
     :goto_0
     array-length v3, p1
@@ -1275,7 +1240,7 @@
 
     iget-object v4, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    aget-object v5, p1, v1
+    aget-object v5, p1, v2
 
     invoke-virtual {v4, v5, v3}, Landroidx/recyclerview/widget/SortedList$Callback;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 
@@ -1283,7 +1248,7 @@
 
     if-nez v4, :cond_3
 
-    invoke-direct {p0, v3, p1, v1, v2}, Landroidx/recyclerview/widget/SortedList;->findSameItem(Ljava/lang/Object;[Ljava/lang/Object;II)I
+    invoke-direct {p0, v3, p1, v2, v1}, Landroidx/recyclerview/widget/SortedList;->findSameItem(Ljava/lang/Object;[Ljava/lang/Object;II)I
 
     move-result v4
 
@@ -1296,22 +1261,22 @@
     goto :goto_1
 
     :cond_1
-    if-eq v2, v0, :cond_2
+    if-eq v1, v0, :cond_2
 
-    aput-object v3, p1, v2
+    aput-object v3, p1, v1
 
     :cond_2
-    add-int/lit8 v2, v2, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_1
 
     :cond_3
-    if-eq v2, v0, :cond_4
+    if-eq v1, v0, :cond_4
 
-    aput-object v3, p1, v2
+    aput-object v3, p1, v1
 
     :cond_4
-    add-int/lit8 v1, v2, 0x1
+    add-int/lit8 v2, v1, 0x1
 
     move v6, v2
 
@@ -1325,7 +1290,7 @@
     goto :goto_0
 
     :cond_5
-    return v2
+    return v1
 .end method
 
 .method private throwIfInMutationOperation()V
@@ -1468,24 +1433,22 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    instance-of v0, v0, Landroidx/recyclerview/widget/SortedList$BatchedCallback;
+    instance-of v1, v0, Landroidx/recyclerview/widget/SortedList$BatchedCallback;
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mBatchedCallback:Landroidx/recyclerview/widget/SortedList$BatchedCallback;
+    iget-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mBatchedCallback:Landroidx/recyclerview/widget/SortedList$BatchedCallback;
 
-    if-nez v0, :cond_1
+    if-nez v1, :cond_1
 
-    new-instance v0, Landroidx/recyclerview/widget/SortedList$BatchedCallback;
+    new-instance v1, Landroidx/recyclerview/widget/SortedList$BatchedCallback;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
+    invoke-direct {v1, v0}, Landroidx/recyclerview/widget/SortedList$BatchedCallback;-><init>(Landroidx/recyclerview/widget/SortedList$Callback;)V
 
-    invoke-direct {v0, v1}, Landroidx/recyclerview/widget/SortedList$BatchedCallback;-><init>(Landroidx/recyclerview/widget/SortedList$Callback;)V
-
-    iput-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mBatchedCallback:Landroidx/recyclerview/widget/SortedList$BatchedCallback;
+    iput-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mBatchedCallback:Landroidx/recyclerview/widget/SortedList$BatchedCallback;
 
     :cond_1
     iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mBatchedCallback:Landroidx/recyclerview/widget/SortedList$BatchedCallback;
@@ -1507,8 +1470,6 @@
     return-void
 
     :cond_0
-    iget v0, p0, Landroidx/recyclerview/widget/SortedList;->mSize:I
-
     iget-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mData:[Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -1533,11 +1494,9 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    instance-of v0, v0, Landroidx/recyclerview/widget/SortedList$BatchedCallback;
+    instance-of v1, v0, Landroidx/recyclerview/widget/SortedList$BatchedCallback;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
+    if-eqz v1, :cond_0
 
     check-cast v0, Landroidx/recyclerview/widget/SortedList$BatchedCallback;
 
@@ -1550,9 +1509,7 @@
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mBatchedCallback:Landroidx/recyclerview/widget/SortedList$BatchedCallback;
-
-    iget-object v0, v0, Landroidx/recyclerview/widget/SortedList$BatchedCallback;->mWrappedCallback:Landroidx/recyclerview/widget/SortedList$Callback;
+    iget-object v0, v1, Landroidx/recyclerview/widget/SortedList$BatchedCallback;->mWrappedCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
     iput-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
@@ -1584,14 +1541,10 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
-
-    if-lt p1, v0, :cond_0
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/SortedList;->mOldData:[Ljava/lang/Object;
-
     iget v1, p0, Landroidx/recyclerview/widget/SortedList;->mNewDataStart:I
 
+    if-lt p1, v1, :cond_0
+
     sub-int/2addr p1, v1
 
     iget v1, p0, Landroidx/recyclerview/widget/SortedList;->mOldDataStart:I
@@ -1942,9 +1895,7 @@
 
     iget-object v1, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
-
-    invoke-virtual {v3, v0, p2}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v0, p2}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -1958,9 +1909,7 @@
 
     iget-object v3, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/SortedList;->mCallback:Landroidx/recyclerview/widget/SortedList$Callback;
-
-    invoke-virtual {v4, v0, p2}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v3, v0, p2}, Landroidx/recyclerview/widget/SortedList$Callback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/SortedListAdapterCallback.smali b/com.discord/smali/androidx/recyclerview/widget/SortedListAdapterCallback.smali
index f38f75c811..33fff744de 100644
--- a/com.discord/smali/androidx/recyclerview/widget/SortedListAdapterCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/SortedListAdapterCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/recyclerview/widget/SortedListAdapterCallback;
 .super Landroidx/recyclerview/widget/SortedList$Callback;
+.source "SortedListAdapterCallback.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$1.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$1.smali
index d05af63c60..2e7f8307a7 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/StaggeredGridLayoutManager$1;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo.smali
index a268a9aa4f..2d54fec328 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 
 # annotations
@@ -93,7 +94,6 @@
 
     sub-int/2addr v0, p1
 
-    :goto_0
     iput v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mOffset:I
 
     return-void
@@ -109,7 +109,9 @@
 
     add-int/2addr v0, p1
 
-    goto :goto_0
+    iput v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mOffset:I
+
+    return-void
 .end method
 
 .method reset()V
@@ -135,8 +137,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mSpanReferenceLines:[I
-
     invoke-static {v1, v0}, Ljava/util/Arrays;->fill([II)V
 
     :cond_0
@@ -152,8 +152,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mSpanReferenceLines:[I
-
     array-length v1, v1
 
     if-ge v1, v0, :cond_1
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams.smali
index 6d42de44de..a9b0ce4da7 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;
 .super Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+.source "StaggeredGridLayoutManager.java"
 
 
 # annotations
@@ -78,8 +79,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mSpan:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
-
     iget v0, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mIndex:I
 
     return v0
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem$1.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem$1.smali
index 6f4c671f44..ff75596446 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem$1;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem.smali
index 4c431d5cbe..2c0fc9a67a 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -132,8 +133,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem;->mGapPerSpan:[I
-
     aget p1, v0, p1
 
     return p1
@@ -192,7 +191,7 @@
 .end method
 
 .method public writeToParcel(Landroid/os/Parcel;I)V
-    .locals 0
+    .locals 1
 
     iget p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem;->mPosition:I
 
@@ -210,13 +209,9 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem;->mGapPerSpan:[I
+    array-length v0, p2
 
-    array-length p2, p2
-
-    if-lez p2, :cond_0
-
-    iget-object p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem;->mGapPerSpan:[I
+    if-lez v0, :cond_0
 
     array-length p2, p2
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup.smali
index 2bf861a2a6..37e7d52052 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 
 # annotations
@@ -135,8 +136,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mFullSpanItems:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -183,22 +182,20 @@
     return-void
 
     :cond_0
-    add-int v0, p1, p2
+    add-int v1, p1, p2
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mFullSpanItems:Ljava/util/List;
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    move-result v0
 
-    move-result v1
-
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v0, v0, -0x1
 
     :goto_0
-    if-ltz v1, :cond_3
+    if-ltz v0, :cond_3
 
     iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mFullSpanItems:Ljava/util/List;
 
-    invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -210,11 +207,11 @@
 
     iget v3, v2, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup$FullSpanItem;->mPosition:I
 
-    if-ge v3, v0, :cond_1
+    if-ge v3, v1, :cond_1
 
     iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mFullSpanItems:Ljava/util/List;
 
-    invoke-interface {v2, v1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+    invoke-interface {v2, v0}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
     goto :goto_1
 
@@ -227,7 +224,7 @@
 
     :cond_2
     :goto_1
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v0, v0, -0x1
 
     goto :goto_0
 
@@ -313,8 +310,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
     const/4 v1, -0x1
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([II)V
@@ -355,13 +350,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
+    array-length v2, v0
 
-    array-length v0, v0
-
-    if-lt p1, v0, :cond_1
-
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
+    if-lt p1, v2, :cond_1
 
     invoke-virtual {p0, p1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->sizeForPosition(I)I
 
@@ -383,9 +374,7 @@
 
     array-length v0, v0
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
-    array-length v2, v2
+    array-length v2, p1
 
     invoke-static {p1, v0, v2, v1}, Ljava/util/Arrays;->fill([IIII)V
 
@@ -400,8 +389,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mFullSpanItems:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -452,8 +439,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mFullSpanItems:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -518,8 +503,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mFullSpanItems:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -553,23 +536,19 @@
 .end method
 
 .method getSpan(I)I
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
+    array-length v1, v0
 
-    array-length v0, v0
-
-    if-lt p1, v0, :cond_0
+    if-lt p1, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
     aget p1, v0, p1
 
     return p1
@@ -593,8 +572,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
     array-length v0, v0
 
     if-lt p1, v0, :cond_1
@@ -637,8 +614,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
     array-length v0, v0
 
     if-lt p1, v0, :cond_0
@@ -652,9 +627,7 @@
 
     iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
-    array-length v2, v2
+    array-length v2, v1
 
     sub-int/2addr v2, p1
 
@@ -670,6 +643,8 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->offsetFullSpansForAddition(II)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -682,8 +657,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
     array-length v0, v0
 
     if-lt p1, v0, :cond_0
@@ -697,27 +670,21 @@
 
     iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
+    array-length v2, v1
 
-    array-length v3, v2
+    sub-int/2addr v2, p1
 
-    sub-int/2addr v3, p1
+    sub-int/2addr v2, p2
 
-    sub-int/2addr v3, p2
-
-    invoke-static {v1, v0, v2, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v0, v1, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
-    array-length v1, v1
+    array-length v1, v0
 
     sub-int/2addr v1, p2
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
-
-    array-length v2, v2
+    array-length v2, v0
 
     const/4 v3, -0x1
 
@@ -725,6 +692,8 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->offsetFullSpansForRemoval(II)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState$1.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState$1.smali
index efc5f4b581..6d14f1862c 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState$1.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState$1;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState.smali
index 77cb95da25..d99daa0c90 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -112,8 +113,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanOffsetsSize:I
-
     new-array v0, v0, [I
 
     iput-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanOffsets:[I
@@ -133,8 +132,6 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanLookupSize:I
-
     new-array v0, v0, [I
 
     iput-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanLookup:[I
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$Span.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$Span.smali
index abc1bccf53..250e72e2d6 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$Span.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager$Span.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
 .super Ljava/lang/Object;
+.source "StaggeredGridLayoutManager.java"
 
 
 # annotations
@@ -203,9 +204,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mViews:Ljava/util/ArrayList;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mViews:Ljava/util/ArrayList;
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
@@ -375,7 +374,6 @@
 
     const/4 v2, -0x1
 
-    :goto_0
     invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOneVisibleChild(IIZ)I
 
     move-result v0
@@ -391,7 +389,11 @@
 
     move-result v2
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOneVisibleChild(IIZ)I
+
+    move-result v0
+
+    return v0
 .end method
 
 .method public findFirstPartiallyVisibleItemPosition()I
@@ -415,7 +417,6 @@
 
     const/4 v2, -0x1
 
-    :goto_0
     invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOnePartiallyVisibleChild(IIZ)I
 
     move-result v0
@@ -431,7 +432,11 @@
 
     move-result v2
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOnePartiallyVisibleChild(IIZ)I
+
+    move-result v0
+
+    return v0
 .end method
 
 .method public findFirstVisibleItemPosition()I
@@ -494,7 +499,6 @@
 
     move-result v2
 
-    :goto_0
     invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOneVisibleChild(IIZ)I
 
     move-result v0
@@ -512,7 +516,11 @@
 
     const/4 v2, -0x1
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOneVisibleChild(IIZ)I
+
+    move-result v0
+
+    return v0
 .end method
 
 .method public findLastPartiallyVisibleItemPosition()I
@@ -534,7 +542,6 @@
 
     move-result v2
 
-    :goto_0
     invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOnePartiallyVisibleChild(IIZ)I
 
     move-result v0
@@ -552,7 +559,11 @@
 
     const/4 v2, -0x1
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->findOnePartiallyVisibleChild(IIZ)I
+
+    move-result v0
+
+    return v0
 .end method
 
 .method public findLastVisibleItemPosition()I
@@ -657,56 +668,60 @@
 
     const/4 v8, 0x0
 
-    if-eqz p5, :cond_2
+    if-eqz p5, :cond_1
 
-    if-gt v6, v1, :cond_1
+    if-gt v6, v1, :cond_2
+
+    goto :goto_1
+
+    :cond_1
+    if-ge v6, v1, :cond_2
 
     :goto_1
     const/4 v9, 0x1
 
     goto :goto_2
 
-    :cond_1
-    const/4 v9, 0x0
-
-    goto :goto_2
-
     :cond_2
-    if-ge v6, v1, :cond_1
-
-    goto :goto_1
+    const/4 v9, 0x0
 
     :goto_2
     if-eqz p5, :cond_3
 
     if-lt v7, v0, :cond_4
 
-    :goto_3
-    const/4 v8, 0x1
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     if-le v7, v0, :cond_4
 
-    goto :goto_3
+    :goto_3
+    const/4 v8, 0x1
 
     :cond_4
-    :goto_4
     if-eqz v9, :cond_8
 
     if-eqz v8, :cond_8
 
-    if-eqz p3, :cond_6
+    if-eqz p3, :cond_5
 
-    if-eqz p4, :cond_6
+    if-eqz p4, :cond_5
 
     if-lt v6, v0, :cond_8
 
     if-gt v7, v1, :cond_8
 
+    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->this$0:Landroidx/recyclerview/widget/StaggeredGridLayoutManager;
+
+    invoke-virtual {p1, v5}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getPosition(Landroid/view/View;)I
+
+    move-result p1
+
+    return p1
+
     :cond_5
-    :goto_5
+    if-eqz p4, :cond_6
+
     iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->this$0:Landroidx/recyclerview/widget/StaggeredGridLayoutManager;
 
     invoke-virtual {p1, v5}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getPosition(Landroid/view/View;)I
@@ -716,16 +731,18 @@
     return p1
 
     :cond_6
-    if-eqz p4, :cond_7
-
-    goto :goto_5
-
-    :cond_7
-    if-lt v6, v0, :cond_5
+    if-lt v6, v0, :cond_7
 
     if-le v7, v1, :cond_8
 
-    goto :goto_5
+    :cond_7
+    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->this$0:Landroidx/recyclerview/widget/StaggeredGridLayoutManager;
+
+    invoke-virtual {p1, v5}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getPosition(Landroid/view/View;)I
+
+    move-result p1
+
+    return p1
 
     :cond_8
     add-int/2addr p1, v4
@@ -797,8 +814,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedEnd:I
-
     return v0
 
     :cond_0
@@ -818,9 +833,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedEnd:I
-
-    return p1
+    return v0
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mViews:Ljava/util/ArrayList;
@@ -998,8 +1011,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedStart:I
-
     return v0
 
     :cond_0
@@ -1019,9 +1030,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedStart:I
-
-    return p1
+    return v0
 
     :cond_0
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mViews:Ljava/util/ArrayList;
@@ -1063,8 +1072,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedStart:I
-
     add-int/2addr v0, p1
 
     iput v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedStart:I
@@ -1074,8 +1081,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedEnd:I
-
     add-int/2addr v0, p1
 
     iput v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mCachedEnd:I
diff --git a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager.smali b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager.smali
index d7ce184ffd..4b7baea191 100644
--- a/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/StaggeredGridLayoutManager.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/StaggeredGridLayoutManager;
 .super Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+.source "StaggeredGridLayoutManager.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider;
@@ -328,10 +329,9 @@
 
     move-result v2
 
-    :goto_1
     add-int/2addr v1, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
@@ -340,10 +340,10 @@
 
     move-result v2
 
-    goto :goto_1
+    add-int/2addr v1, v2
 
     :cond_1
-    :goto_2
+    :goto_1
     iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSpans:[Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
 
     aget-object v2, v2, v0
@@ -361,9 +361,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
-
-    iget v1, v1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mVisibleAnchorPosition:I
+    iget v1, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mVisibleAnchorPosition:I
 
     iput v1, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mAnchorPosition:I
 
@@ -400,17 +398,16 @@
 
     iget-boolean v0, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mAnchorLayoutFromEnd:Z
 
-    :goto_3
     iput-boolean v0, p1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mLayoutFromEnd:Z
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_4
     iget-boolean v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mShouldReverseLayout:Z
 
-    goto :goto_3
+    iput-boolean v0, p1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mLayoutFromEnd:Z
 
-    :goto_4
+    :goto_2
     iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
 
     iget p1, p1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanLookupSize:I
@@ -548,7 +545,7 @@
 
     move-result v3
 
-    if-ge v0, v3, :cond_2
+    if-ge v0, v3, :cond_3
 
     iget-object v0, p1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mViews:Ljava/util/ArrayList;
 
@@ -590,7 +587,7 @@
 
     move-result v3
 
-    if-le v0, v3, :cond_2
+    if-le v0, v3, :cond_3
 
     iget-object v0, p1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mViews:Ljava/util/ArrayList;
 
@@ -612,6 +609,9 @@
 
     :cond_2
     return v2
+
+    :cond_3
+    return v2
 .end method
 
 .method private computeScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;)I
@@ -1006,14 +1006,14 @@
 
     const v11, 0x7fffffff
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/high16 v0, -0x80000000
 
     const/high16 v11, -0x80000000
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget v0, v8, Landroidx/recyclerview/widget/LayoutState;->mLayoutDirection:I
@@ -1026,10 +1026,9 @@
 
     add-int/2addr v0, v1
 
-    :goto_0
     move v11, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget v0, v8, Landroidx/recyclerview/widget/LayoutState;->mStartLine:I
@@ -1038,9 +1037,9 @@
 
     sub-int/2addr v0, v1
 
-    goto :goto_0
+    move v11, v0
 
-    :goto_1
+    :goto_0
     iget v0, v8, Landroidx/recyclerview/widget/LayoutState;->mLayoutDirection:I
 
     invoke-direct {v6, v0, v11}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->updateAllRemainingSpans(II)V
@@ -1055,10 +1054,9 @@
 
     move-result v0
 
-    :goto_2
     move v12, v0
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     iget-object v0, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
@@ -1067,12 +1065,12 @@
 
     move-result v0
 
-    goto :goto_2
+    move v12, v0
 
-    :goto_3
+    :goto_1
     const/4 v0, 0x0
 
-    :goto_4
+    :goto_2
     invoke-virtual/range {p2 .. p3}, Landroidx/recyclerview/widget/LayoutState;->hasMore(Landroidx/recyclerview/widget/RecyclerView$State;)Z
 
     move-result v1
@@ -1122,12 +1120,12 @@
 
     const/4 v3, 0x1
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_5
     const/4 v3, 0x0
 
-    :goto_5
+    :goto_3
     if-eqz v3, :cond_7
 
     iget-boolean v1, v14, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mFullSpan:Z
@@ -1138,28 +1136,30 @@
 
     aget-object v1, v1, v9
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_6
     invoke-direct {v6, v8}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getNextSpan(Landroidx/recyclerview/widget/LayoutState;)Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
 
     move-result-object v1
 
-    :goto_6
+    :goto_4
     iget-object v4, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
 
     invoke-virtual {v4, v0, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->setSpan(ILandroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;)V
 
-    goto :goto_7
+    move-object v15, v1
+
+    goto :goto_5
 
     :cond_7
     iget-object v4, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSpans:[Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
 
     aget-object v1, v4, v1
 
-    :goto_7
     move-object v15, v1
 
+    :goto_5
     iput-object v15, v14, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mSpan:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
 
     iget v1, v8, Landroidx/recyclerview/widget/LayoutState;->mLayoutDirection:I
@@ -1168,12 +1168,12 @@
 
     invoke-virtual {v6, v13}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->addView(Landroid/view/View;)V
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_8
     invoke-virtual {v6, v13, v9}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->addView(Landroid/view/View;I)V
 
-    :goto_8
+    :goto_6
     invoke-direct {v6, v13, v14, v9}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->measureChildWithDecorationsAndMargin(Landroid/view/View;Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;Z)V
 
     iget v1, v8, Landroidx/recyclerview/widget/LayoutState;->mLayoutDirection:I
@@ -1188,14 +1188,14 @@
 
     move-result v1
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_9
     invoke-virtual {v15, v12}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->getEndLine(I)I
 
     move-result v1
 
-    :goto_9
+    :goto_7
     iget-object v4, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v4, v13}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedMeasurement(Landroid/view/View;)I
@@ -1227,7 +1227,7 @@
 
     move v4, v1
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_b
     iget-boolean v1, v14, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mFullSpan:Z
@@ -1238,14 +1238,14 @@
 
     move-result v1
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_c
     invoke-virtual {v15, v12}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->getStartLine(I)I
 
     move-result v1
 
-    :goto_a
+    :goto_8
     iget-object v4, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v4, v13}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedMeasurement(Landroid/view/View;)I
@@ -1275,7 +1275,7 @@
     :cond_d
     move v5, v1
 
-    :goto_b
+    :goto_9
     iget-boolean v1, v14, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mFullSpan:Z
 
     if-eqz v1, :cond_10
@@ -1294,19 +1294,18 @@
 
     move-result v1
 
-    :goto_c
     xor-int/2addr v1, v10
 
-    goto :goto_d
+    goto :goto_a
 
     :cond_e
     invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->areAllStartsEqual()Z
 
     move-result v1
 
-    goto :goto_c
+    xor-int/2addr v1, v10
 
-    :goto_d
+    :goto_a
     if-eqz v1, :cond_10
 
     iget-object v1, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
@@ -1345,7 +1344,7 @@
 
     move-result v0
 
-    goto :goto_e
+    goto :goto_b
 
     :cond_11
     iget-object v0, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSecondaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
@@ -1368,7 +1367,7 @@
 
     sub-int/2addr v0, v1
 
-    :goto_e
+    :goto_b
     iget-object v1, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSecondaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v1, v13}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedMeasurement(Landroid/view/View;)I
@@ -1381,7 +1380,7 @@
 
     move v3, v1
 
-    goto :goto_10
+    goto :goto_d
 
     :cond_12
     iget-boolean v0, v14, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mFullSpan:Z
@@ -1394,7 +1393,7 @@
 
     move-result v0
 
-    goto :goto_f
+    goto :goto_c
 
     :cond_13
     iget v0, v15, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;->mIndex:I
@@ -1411,7 +1410,7 @@
 
     add-int/2addr v0, v1
 
-    :goto_f
+    :goto_c
     iget-object v1, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSecondaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v1, v13}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedMeasurement(Landroid/view/View;)I
@@ -1424,7 +1423,7 @@
 
     move v9, v1
 
-    :goto_10
+    :goto_d
     iget v0, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mOrientation:I
 
     if-ne v0, v10, :cond_14
@@ -1439,10 +1438,9 @@
 
     move v4, v9
 
-    :goto_11
     invoke-virtual/range {v0 .. v5}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->layoutDecoratedWithMargins(Landroid/view/View;IIII)V
 
-    goto :goto_12
+    goto :goto_e
 
     :cond_14
     move-object/from16 v0, p0
@@ -1455,9 +1453,9 @@
 
     move v5, v9
 
-    goto :goto_11
+    invoke-virtual/range {v0 .. v5}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->layoutDecoratedWithMargins(Landroid/view/View;IIII)V
 
-    :goto_12
+    :goto_e
     iget-boolean v0, v14, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mFullSpan:Z
 
     if-eqz v0, :cond_15
@@ -1468,7 +1466,7 @@
 
     invoke-direct {v6, v0, v11}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->updateAllRemainingSpans(II)V
 
-    goto :goto_13
+    goto :goto_f
 
     :cond_15
     iget-object v0, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
@@ -1477,7 +1475,7 @@
 
     invoke-direct {v6, v15, v0, v11}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->updateRemainingSpans(Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;II)V
 
-    :goto_13
+    :goto_f
     iget-object v0, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
 
     invoke-direct {v6, v7, v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->recycle(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LayoutState;)V
@@ -1502,7 +1500,7 @@
 
     invoke-virtual {v0}, Ljava/util/BitSet;->clear()V
 
-    goto :goto_14
+    goto :goto_10
 
     :cond_16
     iget-object v0, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mRemainingSpans:Ljava/util/BitSet;
@@ -1514,12 +1512,12 @@
     invoke-virtual {v0, v1, v2}, Ljava/util/BitSet;->set(IZ)V
 
     :cond_17
-    :goto_14
+    :goto_10
     const/4 v0, 0x1
 
     const/4 v9, 0x0
 
-    goto/16 :goto_4
+    goto/16 :goto_2
 
     :cond_18
     if-nez v0, :cond_19
@@ -1553,7 +1551,7 @@
 
     sub-int/2addr v1, v0
 
-    goto :goto_15
+    goto :goto_11
 
     :cond_1a
     iget-object v0, v6, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
@@ -1574,7 +1572,7 @@
 
     sub-int v1, v0, v1
 
-    :goto_15
+    :goto_11
     if-lez v1, :cond_1b
 
     iget v0, v8, Landroidx/recyclerview/widget/LayoutState;->mAvailable:I
@@ -1687,7 +1685,7 @@
 
     sub-int/2addr v0, v1
 
-    if-lez v0, :cond_1
+    if-lez v0, :cond_2
 
     neg-int v1, v0
 
@@ -1709,6 +1707,9 @@
 
     :cond_1
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 .method private fixStartGap(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)V
@@ -1733,7 +1734,7 @@
 
     sub-int/2addr v1, v0
 
-    if-lez v1, :cond_1
+    if-lez v1, :cond_2
 
     invoke-virtual {p0, v1, p1, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->scrollBy(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
 
@@ -1753,6 +1754,9 @@
 
     :cond_1
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 .method private getMaxEnd(I)I
@@ -2051,6 +2055,10 @@
 
     add-int/lit8 v2, p2, 0x1
 
+    move v3, v2
+
+    move v2, p1
+
     goto :goto_1
 
     :cond_1
@@ -2060,17 +2068,16 @@
 
     move v2, p2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     add-int v2, p1, p2
 
-    :goto_1
     move v3, v2
 
     move v2, p1
 
-    :goto_2
+    :goto_1
     iget-object v4, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
 
     invoke-virtual {v4, v2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->invalidateAfter(I)I
@@ -2079,21 +2086,21 @@
 
     packed-switch p3, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     iget-object p3, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
 
     invoke-virtual {p3, p1, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->offsetForRemoval(II)V
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_1
     iget-object p3, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
 
     invoke-virtual {p3, p1, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->offsetForAddition(II)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     iget-object p3, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
@@ -2106,7 +2113,7 @@
 
     invoke-virtual {p1, p2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->offsetForAddition(II)V
 
-    :goto_3
+    :goto_2
     if-gt v3, v0, :cond_4
 
     return-void
@@ -2120,14 +2127,14 @@
 
     move-result p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getLastChildPosition()I
 
     move-result p1
 
-    :goto_4
+    :goto_3
     if-gt v2, p1, :cond_6
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->requestLayout()V
@@ -2505,8 +2512,6 @@
 
     if-eqz v5, :cond_8
 
-    iget-object v5, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
-
     iget v5, v5, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanOffsetsSize:I
 
     if-gtz v5, :cond_e
@@ -2648,7 +2653,6 @@
 
     invoke-direct {p0, v4}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->setLayoutStateDirection(I)V
 
-    :goto_8
     iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
 
     iget v3, v1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mPosition:I
@@ -2665,7 +2669,7 @@
 
     invoke-direct {p0, p1, v2, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;)I
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_f
     invoke-direct {p0, v4}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->setLayoutStateDirection(I)V
@@ -2676,9 +2680,23 @@
 
     invoke-direct {p0, v3}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->setLayoutStateDirection(I)V
 
-    goto :goto_8
+    iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
 
-    :goto_9
+    iget v3, v1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mPosition:I
+
+    iget-object v5, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
+
+    iget v5, v5, Landroidx/recyclerview/widget/LayoutState;->mItemDirection:I
+
+    add-int/2addr v3, v5
+
+    iput v3, v2, Landroidx/recyclerview/widget/LayoutState;->mCurrentPosition:I
+
+    iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
+
+    invoke-direct {p0, p1, v2, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;)I
+
+    :goto_8
     invoke-direct {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->repositionToWrapContentIfNecessary()V
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getChildCount()I
@@ -2695,7 +2713,7 @@
 
     invoke-direct {p0, p1, p2, v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->fixStartGap(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)V
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_10
     invoke-direct {p0, p1, p2, v4}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->fixStartGap(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)V
@@ -2703,7 +2721,7 @@
     invoke-direct {p0, p1, p2, v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->fixEndGap(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)V
 
     :cond_11
-    :goto_a
+    :goto_9
     if-eqz p3, :cond_14
 
     invoke-virtual {p2}, Landroidx/recyclerview/widget/RecyclerView$State;->isPreLayout()Z
@@ -2735,12 +2753,12 @@
     :cond_12
     const/4 p3, 0x1
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_13
     const/4 p3, 0x0
 
-    :goto_b
+    :goto_a
     if-eqz p3, :cond_14
 
     iget-object p3, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mCheckForGapsRunnable:Ljava/lang/Runnable;
@@ -2753,12 +2771,12 @@
 
     if-eqz p3, :cond_14
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_14
     const/4 v4, 0x0
 
-    :goto_c
+    :goto_b
     invoke-virtual {p2}, Landroidx/recyclerview/widget/RecyclerView$State;->isPreLayout()Z
 
     move-result p3
@@ -2801,9 +2819,9 @@
 
     const/4 v1, -0x1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-nez v0, :cond_2
 
@@ -2821,10 +2839,10 @@
 
     if-eq p1, v0, :cond_1
 
-    return v3
+    return v2
 
     :cond_1
-    return v2
+    return v3
 
     :cond_2
     if-ne p1, v1, :cond_3
@@ -2855,10 +2873,10 @@
 
     if-ne p1, v0, :cond_5
 
-    return v3
+    return v2
 
     :cond_5
-    return v2
+    return v3
 .end method
 
 .method private prependViewToAllSpans(Landroid/view/View;)V
@@ -2990,6 +3008,8 @@
     :goto_1
     invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->recycleFromStart(Landroidx/recyclerview/widget/RecyclerView$Recycler;I)V
 
+    return-void
+
     :cond_6
     :goto_2
     return-void
@@ -3007,7 +3027,7 @@
     sub-int/2addr v0, v1
 
     :goto_0
-    if-ltz v0, :cond_5
+    if-ltz v0, :cond_6
 
     invoke-virtual {p0, v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getChildAt(I)Landroid/view/View;
 
@@ -3110,6 +3130,9 @@
 
     :cond_5
     return-void
+
+    :cond_6
+    return-void
 .end method
 
 .method private recycleFromStart(Landroidx/recyclerview/widget/RecyclerView$Recycler;I)V
@@ -3120,7 +3143,7 @@
 
     move-result v0
 
-    if-lez v0, :cond_5
+    if-lez v0, :cond_6
 
     const/4 v0, 0x0
 
@@ -3223,6 +3246,9 @@
 
     :cond_5
     return-void
+
+    :cond_6
+    return-void
 .end method
 
 .method private repositionToWrapContentIfNecessary()V
@@ -3406,12 +3432,11 @@
 
     mul-int v4, v4, v0
 
-    :goto_2
     sub-int/2addr v5, v4
 
     invoke-virtual {v3, v5}, Landroid/view/View;->offsetLeftAndRight(I)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     iget-object v5, v4, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mSpan:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
@@ -3432,6 +3457,10 @@
 
     if-ne v7, v6, :cond_7
 
+    sub-int/2addr v5, v4
+
+    invoke-virtual {v3, v5}, Landroid/view/View;->offsetLeftAndRight(I)V
+
     goto :goto_2
 
     :cond_7
@@ -3440,7 +3469,7 @@
     invoke-virtual {v3, v5}, Landroid/view/View;->offsetTopAndBottom(I)V
 
     :cond_8
-    :goto_3
+    :goto_2
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
@@ -3495,8 +3524,6 @@
 
     iput p1, v0, Landroidx/recyclerview/widget/LayoutState;->mLayoutDirection:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
-
     iget-boolean v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mShouldReverseLayout:Z
 
     const/4 v2, 0x1
@@ -3610,8 +3637,6 @@
 
     iput v1, v0, Landroidx/recyclerview/widget/LayoutState;->mAvailable:I
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
-
     iput p1, v0, Landroidx/recyclerview/widget/LayoutState;->mCurrentPosition:I
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->isSmoothScrolling()Z
@@ -3650,11 +3675,9 @@
 
     move-result p1
 
-    move p2, p1
+    const/4 p2, 0x0
 
-    const/4 p1, 0x0
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
@@ -3663,15 +3686,18 @@
 
     move-result p1
 
+    move p2, p1
+
+    const/4 p1, 0x0
+
     goto :goto_1
 
     :cond_2
     const/4 p1, 0x0
 
-    :goto_1
     const/4 p2, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getClipToPadding()Z
 
     move-result v0
@@ -3686,11 +3712,11 @@
 
     move-result v3
 
-    sub-int/2addr v3, p1
+    sub-int/2addr v3, p2
 
     iput v3, v0, Landroidx/recyclerview/widget/LayoutState;->mStartLine:I
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
+    iget-object p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
 
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -3698,11 +3724,11 @@
 
     move-result v0
 
-    add-int/2addr v0, p2
+    add-int/2addr v0, p1
 
-    iput v0, p1, Landroidx/recyclerview/widget/LayoutState;->mEndLine:I
+    iput v0, p2, Landroidx/recyclerview/widget/LayoutState;->mEndLine:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
@@ -3713,27 +3739,23 @@
 
     move-result v3
 
-    add-int/2addr v3, p2
+    add-int/2addr v3, p1
 
     iput v3, v0, Landroidx/recyclerview/widget/LayoutState;->mEndLine:I
 
-    iget-object p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
+    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
 
-    neg-int p1, p1
+    neg-int p2, p2
 
-    iput p1, p2, Landroidx/recyclerview/widget/LayoutState;->mStartLine:I
+    iput p2, p1, Landroidx/recyclerview/widget/LayoutState;->mStartLine:I
 
-    :goto_3
+    :goto_2
     iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
 
     iput-boolean v1, p1, Landroidx/recyclerview/widget/LayoutState;->mStopInFocusable:Z
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
-
     iput-boolean v2, p1, Landroidx/recyclerview/widget/LayoutState;->mRecycle:Z
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
-
     iget-object p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {p2}, Landroidx/recyclerview/widget/OrientationHelper;->getMode()I
@@ -4058,7 +4080,6 @@
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->clear()V
 
-    :goto_1
     invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->requestSimpleAnimationsInNextLayout()V
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->requestLayout()V
@@ -4081,12 +4102,12 @@
 
     const/4 v4, -0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const/4 v4, 0x1
 
-    :goto_2
+    :goto_1
     iget-object v6, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
 
     add-int/2addr v2, v3
@@ -4124,7 +4145,7 @@
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->forceInvalidateAfter(I)I
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_6
     iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
@@ -4135,7 +4156,12 @@
 
     invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->forceInvalidateAfter(I)I
 
-    goto :goto_1
+    :goto_2
+    invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->requestSimpleAnimationsInNextLayout()V
+
+    invoke-virtual {p0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->requestLayout()V
+
+    return v3
 
     :cond_7
     :goto_3
@@ -4172,11 +4198,11 @@
 
     move-result p2
 
-    if-eqz p2, :cond_7
+    if-eqz p2, :cond_8
 
     if-nez p1, :cond_1
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_1
     invoke-virtual {p0, p1, p3}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->prepareLayoutStateForDelta(ILandroidx/recyclerview/widget/RecyclerView$State;)V
@@ -4185,8 +4211,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrefetchDistances:[I
-
     array-length p1, p1
 
     iget p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSpanCount:I
@@ -4236,10 +4260,9 @@
 
     move-result v2
 
-    :goto_2
     sub-int/2addr v1, v2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSpans:[Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
@@ -4258,9 +4281,9 @@
 
     iget v2, v2, Landroidx/recyclerview/widget/LayoutState;->mEndLine:I
 
-    goto :goto_2
+    sub-int/2addr v1, v2
 
-    :goto_3
+    :goto_2
     if-ltz v1, :cond_5
 
     iget-object v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrefetchDistances:[I
@@ -4279,7 +4302,7 @@
 
     invoke-static {p2, p1, v0}, Ljava/util/Arrays;->sort([III)V
 
-    :goto_4
+    :goto_3
     if-ge p1, v0, :cond_7
 
     iget-object p2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
@@ -4314,10 +4337,13 @@
 
     add-int/lit8 p1, p1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
-    :goto_5
+    return-void
+
+    :cond_8
+    :goto_4
     return-void
 .end method
 
@@ -4495,6 +4521,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method findFirstVisibleItemClosestToEnd(Z)Landroid/view/View;
@@ -4749,6 +4777,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public findLastCompletelyVisibleItemPositions([I)[I
@@ -4822,6 +4852,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public findLastVisibleItemPositions([I)[I
@@ -4895,6 +4927,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public generateDefaultLayoutParams()Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
@@ -4902,22 +4936,22 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mOrientation:I
 
-    const/4 v1, -0x1
+    const/4 v1, -0x2
 
-    const/4 v2, -0x2
+    const/4 v2, -0x1
 
     if-nez v0, :cond_0
 
     new-instance v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;
 
-    invoke-direct {v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;-><init>(II)V
+    invoke-direct {v0, v1, v2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;-><init>(II)V
 
     return-object v0
 
     :cond_0
     new-instance v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;
 
-    invoke-direct {v0, v1, v2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;-><init>(II)V
+    invoke-direct {v0, v2, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;-><init>(II)V
 
     return-object v0
 .end method
@@ -5144,7 +5178,7 @@
 
     :cond_2
     :goto_2
-    if-eq v0, v6, :cond_c
+    if-eq v0, v6, :cond_d
 
     invoke-virtual {p0, v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getChildAt(I)Landroid/view/View;
 
@@ -5186,11 +5220,11 @@
     :cond_4
     iget-boolean v9, v8, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LayoutParams;->mFullSpan:Z
 
-    if-nez v9, :cond_b
+    if-nez v9, :cond_c
 
     add-int v9, v0, v5
 
-    if-eq v9, v6, :cond_b
+    if-eq v9, v6, :cond_c
 
     invoke-virtual {p0, v9}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->getChildAt(I)Landroid/view/View;
 
@@ -5198,7 +5232,7 @@
 
     iget-boolean v10, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mShouldReverseLayout:Z
 
-    if-eqz v10, :cond_6
+    if-eqz v10, :cond_7
 
     iget-object v10, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -5217,11 +5251,18 @@
     return-object v7
 
     :cond_5
-    if-ne v10, v11, :cond_8
+    if-ne v10, v11, :cond_6
+
+    const/4 v10, 0x1
 
     goto :goto_3
 
     :cond_6
+    const/4 v10, 0x0
+
+    goto :goto_3
+
+    :cond_7
     iget-object v10, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v10, v7}, Landroidx/recyclerview/widget/OrientationHelper;->getDecoratedStart(Landroid/view/View;)I
@@ -5234,23 +5275,22 @@
 
     move-result v11
 
-    if-le v10, v11, :cond_7
+    if-le v10, v11, :cond_8
 
     return-object v7
 
-    :cond_7
-    if-ne v10, v11, :cond_8
+    :cond_8
+    if-ne v10, v11, :cond_9
 
-    :goto_3
     const/4 v10, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
-    :cond_8
+    :cond_9
     const/4 v10, 0x0
 
-    :goto_4
-    if-eqz v10, :cond_b
+    :goto_3
+    if-eqz v10, :cond_c
 
     invoke-virtual {v9}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -5268,36 +5308,36 @@
 
     sub-int/2addr v8, v9
 
-    if-gez v8, :cond_9
+    if-gez v8, :cond_a
 
     const/4 v8, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_9
+    :cond_a
     const/4 v8, 0x0
 
-    :goto_5
-    if-gez v3, :cond_a
+    :goto_4
+    if-gez v3, :cond_b
 
     const/4 v9, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_a
+    :cond_b
     const/4 v9, 0x0
 
-    :goto_6
-    if-eq v8, v9, :cond_b
+    :goto_5
+    if-eq v8, v9, :cond_c
 
     return-object v7
 
-    :cond_b
+    :cond_c
     add-int/2addr v0, v5
 
     goto :goto_2
 
-    :cond_c
+    :cond_d
     const/4 v0, 0x0
 
     return-object v0
@@ -5533,14 +5573,10 @@
 
     iput-boolean v3, v5, Landroidx/recyclerview/widget/LayoutState;->mStopInFocusable:Z
 
-    iget-object v5, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
-
     const/4 v6, 0x0
 
     iput-boolean v6, v5, Landroidx/recyclerview/widget/LayoutState;->mRecycle:Z
 
-    iget-object v5, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
-
     invoke-direct {p0, p3, v5, p4}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;)I
 
     iget-boolean p3, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mShouldReverseLayout:Z
@@ -5783,7 +5819,7 @@
 
     move-result v0
 
-    if-lez v0, :cond_2
+    if-lez v0, :cond_3
 
     const/4 v0, 0x0
 
@@ -5823,11 +5859,15 @@
 
     invoke-virtual {p1, v1}, Landroid/view/accessibility/AccessibilityEvent;->setToIndex(I)V
 
-    nop
+    goto :goto_1
 
     :cond_2
     :goto_0
     return-void
+
+    :cond_3
+    :goto_1
+    return-void
 .end method
 
 .method public onInitializeAccessibilityNodeInfoForItem(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
@@ -6031,13 +6071,11 @@
 
     if-eqz v0, :cond_0
 
-    new-instance v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
+    new-instance v1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
+    invoke-direct {v1, v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;-><init>(Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;)V
 
-    invoke-direct {v0, v1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;-><init>(Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;)V
-
-    return-object v0
+    return-object v1
 
     :cond_0
     new-instance v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
@@ -6062,8 +6100,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLazySpanLookup:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;
-
     iget-object v1, v1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$LazySpanLookup;->mData:[I
 
     if-eqz v1, :cond_1
@@ -6126,8 +6162,6 @@
 
     iput v1, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanOffsetsSize:I
 
-    iget v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSpanCount:I
-
     new-array v1, v1, [I
 
     iput-object v1, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanOffsets:[I
@@ -6159,10 +6193,9 @@
 
     move-result v3
 
-    :goto_3
     sub-int/2addr v1, v3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mSpans:[Landroidx/recyclerview/widget/StaggeredGridLayoutManager$Span;
@@ -6181,10 +6214,10 @@
 
     move-result v3
 
-    goto :goto_3
+    sub-int/2addr v1, v3
 
     :cond_4
-    :goto_4
+    :goto_3
     iget-object v3, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mSpanOffsets:[I
 
     aput v1, v3, v2
@@ -6328,8 +6361,6 @@
 
     iput v1, p3, Landroidx/recyclerview/widget/LayoutState;->mAvailable:I
 
-    iget-object p3, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mLayoutState:Landroidx/recyclerview/widget/LayoutState;
-
     invoke-direct {p0, p2, p3}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->recycle(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LayoutState;)V
 
     return p1
@@ -6356,8 +6387,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
-
     iget v0, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mAnchorPosition:I
 
     if-eq v0, p1, :cond_0
@@ -6385,8 +6414,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
-
     invoke-virtual {v0}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->invalidateAnchorPositionInfo()V
 
     :cond_0
@@ -6606,8 +6633,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
-
     iget-boolean v0, v0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mReverseLayout:Z
 
     if-eq v0, p1, :cond_0
@@ -6731,24 +6756,20 @@
 
     if-ne v0, v2, :cond_0
 
-    goto/16 :goto_8
+    goto/16 :goto_7
 
     :cond_0
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingScrollPosition:I
-
     const/high16 v3, -0x80000000
 
     if-ltz v0, :cond_e
 
-    iget v0, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingScrollPosition:I
-
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
     move-result p1
 
     if-lt v0, p1, :cond_1
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_1
     iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
@@ -6757,8 +6778,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingSavedState:Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;
-
     iget p1, p1, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$SavedState;->mAnchorPosition:I
 
     if-eq p1, v2, :cond_3
@@ -6778,7 +6797,7 @@
 
     iput p1, p2, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mPosition:I
 
-    goto/16 :goto_6
+    goto/16 :goto_5
 
     :cond_3
     :goto_0
@@ -6832,12 +6851,11 @@
 
     move-result p1
 
-    :goto_2
     sub-int/2addr v1, p1
 
     iput v1, p2, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mOffset:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     iget-object v1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
@@ -6856,9 +6874,11 @@
 
     move-result p1
 
-    goto :goto_2
+    sub-int/2addr v1, p1
 
-    :goto_3
+    iput v1, p2, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mOffset:I
+
+    :goto_2
     return v0
 
     :cond_6
@@ -6886,7 +6906,7 @@
 
     move-result p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     iget-object p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPrimaryOrientation:Landroidx/recyclerview/widget/OrientationHelper;
@@ -6895,7 +6915,7 @@
 
     move-result p1
 
-    :goto_4
+    :goto_3
     iput p1, p2, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mOffset:I
 
     return v0
@@ -6947,7 +6967,7 @@
     :cond_a
     iput v3, p2, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mOffset:I
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_b
     iget p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingScrollPosition:I
@@ -6973,27 +6993,27 @@
 
     invoke-virtual {p2}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->assignCoordinateFromPadding()V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_d
-    iget p1, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingScrollPositionOffset:I
-
     invoke-virtual {p2, p1}, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->assignCoordinateFromPadding(I)V
 
-    :goto_5
+    :goto_4
     iput-boolean v0, p2, Landroidx/recyclerview/widget/StaggeredGridLayoutManager$AnchorInfo;->mInvalidateOffsets:Z
 
-    :goto_6
+    :goto_5
     return v0
 
     :cond_e
-    :goto_7
+    :goto_6
     iput v2, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingScrollPosition:I
 
     iput v3, p0, Landroidx/recyclerview/widget/StaggeredGridLayoutManager;->mPendingScrollPositionOffset:I
 
+    return v1
+
     :cond_f
-    :goto_8
+    :goto_7
     return v1
 .end method
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$BackgroundCallback.smali b/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$BackgroundCallback.smali
index 73064e7291..c6fc4c48d8 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$BackgroundCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$BackgroundCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/ThreadUtil$BackgroundCallback;
 .super Ljava/lang/Object;
+.source "ThreadUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$MainThreadCallback.smali b/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$MainThreadCallback.smali
index 7c04df1bd6..6d0cdf42ce 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$MainThreadCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ThreadUtil$MainThreadCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/recyclerview/widget/ThreadUtil$MainThreadCallback;
 .super Ljava/lang/Object;
+.source "ThreadUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ThreadUtil.smali b/com.discord/smali/androidx/recyclerview/widget/ThreadUtil.smali
index 6b0654dfaa..52ae88cd68 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ThreadUtil.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ThreadUtil.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/recyclerview/widget/ThreadUtil;
 .super Ljava/lang/Object;
+.source "ThreadUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/TileList$Tile.smali b/com.discord/smali/androidx/recyclerview/widget/TileList$Tile.smali
index c47f42c082..2fe2ec0535 100644
--- a/com.discord/smali/androidx/recyclerview/widget/TileList$Tile.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/TileList$Tile.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/recyclerview/widget/TileList$Tile;
 .super Ljava/lang/Object;
+.source "TileList.java"
 
 
 # annotations
@@ -78,8 +79,6 @@
 
     if-gt v0, p1, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/TileList$Tile;->mStartPosition:I
-
     iget v1, p0, Landroidx/recyclerview/widget/TileList$Tile;->mItemCount:I
 
     add-int/2addr v0, v1
diff --git a/com.discord/smali/androidx/recyclerview/widget/TileList.smali b/com.discord/smali/androidx/recyclerview/widget/TileList.smali
index 3a1aca22e2..2c31b5a09b 100644
--- a/com.discord/smali/androidx/recyclerview/widget/TileList.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/TileList.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/TileList;
 .super Ljava/lang/Object;
+.source "TileList.java"
 
 
 # annotations
@@ -161,8 +162,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/TileList;->mLastAccessedTile:Landroidx/recyclerview/widget/TileList$Tile;
-
     invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/TileList$Tile;->containsPosition(I)Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$BoundFlags.smali b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$BoundFlags.smali
index 7683dcf87e..6f7c1131b1 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$BoundFlags.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$BoundFlags.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;
 .super Ljava/lang/Object;
+.source "ViewBoundsCheck.java"
 
 
 # annotations
@@ -57,104 +58,96 @@
 
     iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
 
-    and-int/lit8 v0, v0, 0x7
+    and-int/lit8 v1, v0, 0x7
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
-
-    iget v2, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildStart:I
+    iget v1, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildStart:I
 
     iget v3, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mRvStart:I
 
-    invoke-virtual {p0, v2, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
+    invoke-virtual {p0, v1, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
 
-    move-result v2
+    move-result v1
 
-    shl-int/2addr v2, v1
+    shl-int/2addr v1, v2
 
-    and-int/2addr v0, v2
+    and-int/2addr v0, v1
 
     if-nez v0, :cond_0
 
-    return v1
+    return v2
 
     :cond_0
     iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
 
-    and-int/lit8 v0, v0, 0x70
+    and-int/lit8 v1, v0, 0x70
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
-
-    iget v2, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildStart:I
+    iget v1, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildStart:I
 
     iget v3, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mRvEnd:I
 
-    invoke-virtual {p0, v2, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
+    invoke-virtual {p0, v1, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
 
-    move-result v2
+    move-result v1
 
-    shl-int/lit8 v2, v2, 0x4
+    shl-int/lit8 v1, v1, 0x4
 
-    and-int/2addr v0, v2
+    and-int/2addr v0, v1
 
     if-nez v0, :cond_1
 
-    return v1
+    return v2
 
     :cond_1
     iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
 
-    and-int/lit16 v0, v0, 0x700
+    and-int/lit16 v1, v0, 0x700
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
-
-    iget v2, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildEnd:I
+    iget v1, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildEnd:I
 
     iget v3, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mRvStart:I
 
-    invoke-virtual {p0, v2, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
+    invoke-virtual {p0, v1, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
 
-    move-result v2
+    move-result v1
 
-    shl-int/lit8 v2, v2, 0x8
+    shl-int/lit8 v1, v1, 0x8
 
-    and-int/2addr v0, v2
+    and-int/2addr v0, v1
 
     if-nez v0, :cond_2
 
-    return v1
+    return v2
 
     :cond_2
     iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
 
-    and-int/lit16 v0, v0, 0x7000
+    and-int/lit16 v1, v0, 0x7000
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    iget v0, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mBoundFlags:I
-
-    iget v2, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildEnd:I
+    iget v1, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mChildEnd:I
 
     iget v3, p0, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->mRvEnd:I
 
-    invoke-virtual {p0, v2, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
+    invoke-virtual {p0, v1, v3}, Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
 
-    move-result v2
+    move-result v1
 
-    shl-int/lit8 v2, v2, 0xc
+    shl-int/lit8 v1, v1, 0xc
 
-    and-int/2addr v0, v2
+    and-int/2addr v0, v1
 
     if-nez v0, :cond_3
 
-    return v1
+    return v2
 
     :cond_3
     const/4 v0, 0x1
diff --git a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$Callback.smali b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$Callback.smali
index 8cef486dc4..a706294bea 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$Callback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$Callback.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/recyclerview/widget/ViewBoundsCheck$Callback;
 .super Ljava/lang/Object;
+.source "ViewBoundsCheck.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$ViewBounds.smali b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$ViewBounds.smali
index 5b4503db0f..77909f7beb 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$ViewBounds.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck$ViewBounds.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/recyclerview/widget/ViewBoundsCheck$ViewBounds;
 .super Ljava/lang/Object;
+.source "ViewBoundsCheck.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck.smali b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck.smali
index 2b5561b7a9..ca04b94ed4 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ViewBoundsCheck.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ViewBoundsCheck;
 .super Ljava/lang/Object;
+.source "ViewBoundsCheck.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$InfoRecord.smali b/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$InfoRecord.smali
index 998dbe76e4..27cd94fd8c 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$InfoRecord.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$InfoRecord.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;
 .super Ljava/lang/Object;
+.source "ViewInfoStore.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$ProcessCallback.smali b/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$ProcessCallback.smali
index 63e46ec551..5cbc1a83b3 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$ProcessCallback.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore$ProcessCallback.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;
 .super Ljava/lang/Object;
+.source "ViewInfoStore.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore.smali b/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore.smali
index b6852a1825..12f867ff30 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ViewInfoStore.smali
@@ -1,5 +1,6 @@
 .class Landroidx/recyclerview/widget/ViewInfoStore;
 .super Ljava/lang/Object;
+.source "ViewInfoStore.java"
 
 
 # annotations
@@ -459,10 +460,9 @@
 
     if-ne v3, v4, :cond_0
 
-    :goto_1
     invoke-interface {p1, v1}, Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;->unused(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_0
     iget v3, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->flags:I
@@ -475,6 +475,8 @@
 
     if-nez v3, :cond_1
 
+    invoke-interface {p1, v1}, Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;->unused(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+
     goto :goto_1
 
     :cond_1
@@ -482,10 +484,9 @@
 
     iget-object v4, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->postInfo:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 
-    :goto_2
     invoke-interface {p1, v1, v3, v4}, Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;->processDisappeared(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_2
     iget v3, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->flags:I
@@ -496,14 +497,13 @@
 
     if-ne v3, v4, :cond_3
 
-    :goto_3
     iget-object v3, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->preInfo:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 
     iget-object v4, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->postInfo:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 
     invoke-interface {p1, v1, v3, v4}, Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;->processAppeared(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_3
     iget v3, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->flags:I
@@ -520,7 +520,7 @@
 
     invoke-interface {p1, v1, v3, v4}, Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;->processPersistent(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_4
     iget v3, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->flags:I
@@ -533,7 +533,9 @@
 
     const/4 v4, 0x0
 
-    goto :goto_2
+    invoke-interface {p1, v1, v3, v4}, Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;->processDisappeared(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
+
+    goto :goto_1
 
     :cond_5
     iget v3, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->flags:I
@@ -542,10 +544,14 @@
 
     if-eqz v3, :cond_6
 
-    goto :goto_3
+    iget-object v3, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->preInfo:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+
+    iget-object v4, v2, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->postInfo:Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+
+    invoke-interface {p1, v1, v3, v4}, Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;->processAppeared(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 
     :cond_6
-    :goto_4
+    :goto_1
     invoke-static {v2}, Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->recycle(Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;)V
 
     add-int/lit8 v0, v0, -0x1
diff --git a/com.discord/smali/androidx/room/ColumnInfo$Collate.smali b/com.discord/smali/androidx/room/ColumnInfo$Collate.smali
index e809b42377..4489f5fd77 100644
--- a/com.discord/smali/androidx/room/ColumnInfo$Collate.smali
+++ b/com.discord/smali/androidx/room/ColumnInfo$Collate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/ColumnInfo$Collate;
 .super Ljava/lang/Object;
+.source "ColumnInfo.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/ColumnInfo$SQLiteTypeAffinity.smali b/com.discord/smali/androidx/room/ColumnInfo$SQLiteTypeAffinity.smali
index 4de4ef28d4..fba69a83c3 100644
--- a/com.discord/smali/androidx/room/ColumnInfo$SQLiteTypeAffinity.smali
+++ b/com.discord/smali/androidx/room/ColumnInfo$SQLiteTypeAffinity.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/ColumnInfo$SQLiteTypeAffinity;
 .super Ljava/lang/Object;
+.source "ColumnInfo.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/ColumnInfo.smali b/com.discord/smali/androidx/room/ColumnInfo.smali
index 042fcba958..687b81d28e 100644
--- a/com.discord/smali/androidx/room/ColumnInfo.smali
+++ b/com.discord/smali/androidx/room/ColumnInfo.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/ColumnInfo;
 .super Ljava/lang/Object;
+.source "ColumnInfo.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Dao.smali b/com.discord/smali/androidx/room/Dao.smali
index d44061a580..f0ef266b1f 100644
--- a/com.discord/smali/androidx/room/Dao.smali
+++ b/com.discord/smali/androidx/room/Dao.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Dao;
 .super Ljava/lang/Object;
+.source "Dao.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Database.smali b/com.discord/smali/androidx/room/Database.smali
index db9978928c..093b87a7a4 100644
--- a/com.discord/smali/androidx/room/Database.smali
+++ b/com.discord/smali/androidx/room/Database.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Database;
 .super Ljava/lang/Object;
+.source "Database.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/DatabaseConfiguration.smali b/com.discord/smali/androidx/room/DatabaseConfiguration.smali
index faeeb42637..46aeaafe4d 100644
--- a/com.discord/smali/androidx/room/DatabaseConfiguration.smali
+++ b/com.discord/smali/androidx/room/DatabaseConfiguration.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/DatabaseConfiguration;
 .super Ljava/lang/Object;
+.source "DatabaseConfiguration.java"
 
 
 # instance fields
@@ -152,8 +153,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/room/DatabaseConfiguration;->mMigrationNotRequiredFrom:Ljava/util/Set;
-
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
diff --git a/com.discord/smali/androidx/room/Delete.smali b/com.discord/smali/androidx/room/Delete.smali
index ab9f2bb0e6..0cd7812d69 100644
--- a/com.discord/smali/androidx/room/Delete.smali
+++ b/com.discord/smali/androidx/room/Delete.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Delete;
 .super Ljava/lang/Object;
+.source "Delete.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Embedded.smali b/com.discord/smali/androidx/room/Embedded.smali
index 333c742597..10cbd09af3 100644
--- a/com.discord/smali/androidx/room/Embedded.smali
+++ b/com.discord/smali/androidx/room/Embedded.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Embedded;
 .super Ljava/lang/Object;
+.source "Embedded.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Entity.smali b/com.discord/smali/androidx/room/Entity.smali
index 685292188e..d7ba5852a2 100644
--- a/com.discord/smali/androidx/room/Entity.smali
+++ b/com.discord/smali/androidx/room/Entity.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Entity;
 .super Ljava/lang/Object;
+.source "Entity.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/EntityDeletionOrUpdateAdapter.smali b/com.discord/smali/androidx/room/EntityDeletionOrUpdateAdapter.smali
index fbe9262997..1c2eb82a64 100644
--- a/com.discord/smali/androidx/room/EntityDeletionOrUpdateAdapter.smali
+++ b/com.discord/smali/androidx/room/EntityDeletionOrUpdateAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/EntityDeletionOrUpdateAdapter;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "EntityDeletionOrUpdateAdapter.java"
 
 
 # annotations
@@ -131,6 +132,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityDeletionOrUpdateAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final handleMultiple([Ljava/lang/Object;)I
@@ -182,4 +185,6 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityDeletionOrUpdateAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/room/EntityInsertionAdapter.smali b/com.discord/smali/androidx/room/EntityInsertionAdapter.smali
index 095fae9b1c..1856b35980 100644
--- a/com.discord/smali/androidx/room/EntityInsertionAdapter.smali
+++ b/com.discord/smali/androidx/room/EntityInsertionAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/EntityInsertionAdapter;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "EntityInsertionAdapter.java"
 
 
 # annotations
@@ -89,6 +90,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final insert(Ljava/lang/Object;)V
@@ -165,6 +168,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final insertAndReturnId(Ljava/lang/Object;)J
@@ -263,6 +268,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final insertAndReturnIdsArray([Ljava/lang/Object;)[J
@@ -320,6 +327,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final insertAndReturnIdsArrayBox(Ljava/util/Collection;)[Ljava/lang/Long;
@@ -390,6 +399,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final insertAndReturnIdsArrayBox([Ljava/lang/Object;)[Ljava/lang/Long;
@@ -452,6 +463,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final insertAndReturnIdsList(Ljava/util/Collection;)Ljava/util/List;
@@ -526,6 +539,8 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final insertAndReturnIdsList([Ljava/lang/Object;)Ljava/util/List;
@@ -592,4 +607,6 @@
     invoke-virtual {p0, v0}, Landroidx/room/EntityInsertionAdapter;->release(Landroidx/sqlite/db/SupportSQLiteStatement;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/room/ForeignKey$Action.smali b/com.discord/smali/androidx/room/ForeignKey$Action.smali
index 4675e552ba..70db4d8b0e 100644
--- a/com.discord/smali/androidx/room/ForeignKey$Action.smali
+++ b/com.discord/smali/androidx/room/ForeignKey$Action.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/ForeignKey$Action;
 .super Ljava/lang/Object;
+.source "ForeignKey.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/ForeignKey.smali b/com.discord/smali/androidx/room/ForeignKey.smali
index 48bb0b0eeb..7b5a33e54c 100644
--- a/com.discord/smali/androidx/room/ForeignKey.smali
+++ b/com.discord/smali/androidx/room/ForeignKey.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/ForeignKey;
 .super Ljava/lang/Object;
+.source "ForeignKey.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Ignore.smali b/com.discord/smali/androidx/room/Ignore.smali
index 8d095e71b2..b49aa46d47 100644
--- a/com.discord/smali/androidx/room/Ignore.smali
+++ b/com.discord/smali/androidx/room/Ignore.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Ignore;
 .super Ljava/lang/Object;
+.source "Ignore.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Index.smali b/com.discord/smali/androidx/room/Index.smali
index 32b9e5eb94..227e5a0212 100644
--- a/com.discord/smali/androidx/room/Index.smali
+++ b/com.discord/smali/androidx/room/Index.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Index;
 .super Ljava/lang/Object;
+.source "Index.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Insert.smali b/com.discord/smali/androidx/room/Insert.smali
index f1dcbaebb9..1234c1c9f8 100644
--- a/com.discord/smali/androidx/room/Insert.smali
+++ b/com.discord/smali/androidx/room/Insert.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Insert;
 .super Ljava/lang/Object;
+.source "Insert.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/InvalidationTracker$1.smali b/com.discord/smali/androidx/room/InvalidationTracker$1.smali
index 3bb9eac82d..ad03f45cc7 100644
--- a/com.discord/smali/androidx/room/InvalidationTracker$1.smali
+++ b/com.discord/smali/androidx/room/InvalidationTracker$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/room/InvalidationTracker$1;
 .super Ljava/lang/Object;
+.source "InvalidationTracker.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -97,12 +98,14 @@
     invoke-interface {v0}, Landroid/database/Cursor;->close()V
 
     throw v1
+
+    return-void
 .end method
 
 
 # virtual methods
 .method public run()V
-    .locals 6
+    .locals 5
 
     iget-object v0, p0, Landroidx/room/InvalidationTracker$1;->this$0:Landroidx/room/InvalidationTracker;
 
@@ -123,9 +126,9 @@
 
     move-result v2
     :try_end_0
-    .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+    .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     if-nez v2, :cond_0
 
@@ -145,9 +148,9 @@
 
     move-result v2
     :try_end_1
-    .catch Ljava/lang/IllegalStateException; {:try_start_1 .. :try_end_1} :catch_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_2
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+    .catch Ljava/lang/IllegalStateException; {:try_start_1 .. :try_end_1} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     if-nez v2, :cond_1
 
@@ -165,9 +168,9 @@
 
     move-result v2
     :try_end_2
-    .catch Ljava/lang/IllegalStateException; {:try_start_2 .. :try_end_2} :catch_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+    .catch Ljava/lang/IllegalStateException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     if-eqz v2, :cond_2
 
@@ -217,107 +220,65 @@
 
     move-result-object v2
     :try_end_3
-    .catch Ljava/lang/IllegalStateException; {:try_start_3 .. :try_end_3} :catch_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_2
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+    .catch Ljava/lang/IllegalStateException; {:try_start_3 .. :try_end_3} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     :try_start_4
     invoke-interface {v2}, Landroidx/sqlite/db/SupportSQLiteDatabase;->beginTransaction()V
 
     invoke-direct {p0}, Landroidx/room/InvalidationTracker$1;->checkUpdatedTable()Z
 
-    move-result v3
+    move-result v1
+
+    invoke-interface {v2}, Landroidx/sqlite/db/SupportSQLiteDatabase;->setTransactionSuccessful()V
     :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    invoke-interface {v2}, Landroidx/sqlite/db/SupportSQLiteDatabase;->setTransactionSuccessful()V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_0
-
-    :try_start_6
     invoke-interface {v2}, Landroidx/sqlite/db/SupportSQLiteDatabase;->endTransaction()V
-    :try_end_6
-    .catch Ljava/lang/IllegalStateException; {:try_start_6 .. :try_end_6} :catch_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_6 .. :try_end_6} :catch_0
-    .catchall {:try_start_6 .. :try_end_6} :catchall_2
 
-    goto :goto_2
-
-    :catch_0
-    move-exception v1
-
-    move-object v2, v1
-
-    goto :goto_1
+    goto :goto_0
 
     :catchall_0
-    move-exception v1
+    move-exception v3
 
-    move v5, v3
+    invoke-interface {v2}, Landroidx/sqlite/db/SupportSQLiteDatabase;->endTransaction()V
 
-    move-object v3, v1
+    throw v3
 
-    move v1, v5
+    :cond_3
+    invoke-direct {p0}, Landroidx/room/InvalidationTracker$1;->checkUpdatedTable()Z
+
+    move-result v1
+    :try_end_5
+    .catch Ljava/lang/IllegalStateException; {:try_start_5 .. :try_end_5} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_0
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
     goto :goto_0
 
     :catchall_1
-    move-exception v3
-
-    :goto_0
-    :try_start_7
-    invoke-interface {v2}, Landroidx/sqlite/db/SupportSQLiteDatabase;->endTransaction()V
-
-    throw v3
-    :try_end_7
-    .catch Ljava/lang/IllegalStateException; {:try_start_7 .. :try_end_7} :catch_1
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_7 .. :try_end_7} :catch_1
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
-
-    :catch_1
-    move-exception v2
-
-    move v3, v1
-
-    goto :goto_1
-
-    :cond_3
-    :try_start_8
-    invoke-direct {p0}, Landroidx/room/InvalidationTracker$1;->checkUpdatedTable()Z
-
-    move-result v3
-    :try_end_8
-    .catch Ljava/lang/IllegalStateException; {:try_start_8 .. :try_end_8} :catch_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_8 .. :try_end_8} :catch_2
-    .catchall {:try_start_8 .. :try_end_8} :catchall_2
+    move-exception v1
 
     goto :goto_2
 
-    :catchall_2
-    move-exception v1
-
-    goto :goto_4
-
-    :catch_2
+    :catch_0
     move-exception v2
 
-    const/4 v3, 0x0
-
-    :goto_1
-    :try_start_9
-    const-string v1, "ROOM"
+    :try_start_6
+    const-string v3, "ROOM"
 
     const-string v4, "Cannot run invalidation tracker. Is the db closed?"
 
-    invoke-static {v1, v4, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_2
+    invoke-static {v3, v4, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
-    :goto_2
+    :goto_0
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
-    if-eqz v3, :cond_5
+    if-eqz v1, :cond_5
 
     iget-object v0, p0, Landroidx/room/InvalidationTracker$1;->this$0:Landroidx/room/InvalidationTracker;
 
@@ -325,7 +286,7 @@
 
     monitor-enter v0
 
-    :try_start_a
+    :try_start_7
     iget-object v1, p0, Landroidx/room/InvalidationTracker$1;->this$0:Landroidx/room/InvalidationTracker;
 
     iget-object v1, v1, Landroidx/room/InvalidationTracker;->mObserverMap:Landroidx/arch/core/internal/SafeIterableMap;
@@ -334,7 +295,7 @@
 
     move-result-object v1
 
-    :goto_3
+    :goto_1
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
@@ -359,27 +320,29 @@
 
     invoke-virtual {v2, v3}, Landroidx/room/InvalidationTracker$ObserverWrapper;->checkForInvalidation([J)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_4
     monitor-exit v0
 
     return-void
 
-    :catchall_3
+    :catchall_2
     move-exception v1
 
     monitor-exit v0
-    :try_end_a
-    .catchall {:try_start_a .. :try_end_a} :catchall_3
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
 
     throw v1
 
     :cond_5
     return-void
 
-    :goto_4
+    :goto_2
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/room/InvalidationTracker$ObservedTableTracker.smali b/com.discord/smali/androidx/room/InvalidationTracker$ObservedTableTracker.smali
index be5afaa724..7d1b4868c1 100644
--- a/com.discord/smali/androidx/room/InvalidationTracker$ObservedTableTracker.smali
+++ b/com.discord/smali/androidx/room/InvalidationTracker$ObservedTableTracker.smali
@@ -1,5 +1,6 @@
 .class Landroidx/room/InvalidationTracker$ObservedTableTracker;
 .super Ljava/lang/Object;
+.source "InvalidationTracker.java"
 
 
 # annotations
@@ -179,6 +180,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 .method varargs onAdded([I)Z
@@ -240,6 +243,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method varargs onRemoved([I)Z
@@ -299,6 +304,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method onSyncCompleted()V
diff --git a/com.discord/smali/androidx/room/InvalidationTracker$Observer.smali b/com.discord/smali/androidx/room/InvalidationTracker$Observer.smali
index 6ebac1fd98..52bc4a174c 100644
--- a/com.discord/smali/androidx/room/InvalidationTracker$Observer.smali
+++ b/com.discord/smali/androidx/room/InvalidationTracker$Observer.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/InvalidationTracker$Observer;
 .super Ljava/lang/Object;
+.source "InvalidationTracker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/InvalidationTracker$ObserverWrapper.smali b/com.discord/smali/androidx/room/InvalidationTracker$ObserverWrapper.smali
index 98168c6016..f1e53ece38 100644
--- a/com.discord/smali/androidx/room/InvalidationTracker$ObserverWrapper.smali
+++ b/com.discord/smali/androidx/room/InvalidationTracker$ObserverWrapper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/room/InvalidationTracker$ObserverWrapper;
 .super Ljava/lang/Object;
+.source "InvalidationTracker.java"
 
 
 # annotations
@@ -69,7 +70,6 @@
 
     move-result-object p1
 
-    :goto_0
     iput-object p1, p0, Landroidx/room/InvalidationTracker$ObserverWrapper;->mSingleTableSet:Ljava/util/Set;
 
     return-void
@@ -77,13 +77,15 @@
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    iput-object p1, p0, Landroidx/room/InvalidationTracker$ObserverWrapper;->mSingleTableSet:Ljava/util/Set;
+
+    return-void
 .end method
 
 
 # virtual methods
 .method checkForInvalidation([J)V
-    .locals 8
+    .locals 9
 
     iget-object v0, p0, Landroidx/room/InvalidationTracker$ObserverWrapper;->mTableIds:[I
 
@@ -106,11 +108,9 @@
 
     aget-wide v6, v5, v2
 
-    cmp-long v5, v6, v3
+    cmp-long v8, v6, v3
 
-    if-gez v5, :cond_2
-
-    iget-object v5, p0, Landroidx/room/InvalidationTracker$ObserverWrapper;->mVersions:[J
+    if-gez v8, :cond_2
 
     aput-wide v3, v5, v2
 
diff --git a/com.discord/smali/androidx/room/InvalidationTracker$WeakObserver.smali b/com.discord/smali/androidx/room/InvalidationTracker$WeakObserver.smali
index d0f6998dd3..c9a8c91136 100644
--- a/com.discord/smali/androidx/room/InvalidationTracker$WeakObserver.smali
+++ b/com.discord/smali/androidx/room/InvalidationTracker$WeakObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/room/InvalidationTracker$WeakObserver;
 .super Landroidx/room/InvalidationTracker$Observer;
+.source "InvalidationTracker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/InvalidationTracker.smali b/com.discord/smali/androidx/room/InvalidationTracker.smali
index e95f45138b..303f34bef5 100644
--- a/com.discord/smali/androidx/room/InvalidationTracker.smali
+++ b/com.discord/smali/androidx/room/InvalidationTracker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/InvalidationTracker;
 .super Ljava/lang/Object;
+.source "InvalidationTracker.java"
 
 
 # annotations
@@ -496,6 +497,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public addWeakObserver(Landroidx/room/InvalidationTracker$Observer;)V
diff --git a/com.discord/smali/androidx/room/OnConflictStrategy.smali b/com.discord/smali/androidx/room/OnConflictStrategy.smali
index 22614b858a..5b6ebc63e5 100644
--- a/com.discord/smali/androidx/room/OnConflictStrategy.smali
+++ b/com.discord/smali/androidx/room/OnConflictStrategy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/OnConflictStrategy;
 .super Ljava/lang/Object;
+.source "OnConflictStrategy.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/PrimaryKey.smali b/com.discord/smali/androidx/room/PrimaryKey.smali
index cc8e769d56..a54dbb8416 100644
--- a/com.discord/smali/androidx/room/PrimaryKey.smali
+++ b/com.discord/smali/androidx/room/PrimaryKey.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/PrimaryKey;
 .super Ljava/lang/Object;
+.source "PrimaryKey.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Query.smali b/com.discord/smali/androidx/room/Query.smali
index 4e1d4ae6a4..725e3e904f 100644
--- a/com.discord/smali/androidx/room/Query.smali
+++ b/com.discord/smali/androidx/room/Query.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Query;
 .super Ljava/lang/Object;
+.source "Query.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/R$attr.smali b/com.discord/smali/androidx/room/R$attr.smali
index d76bbf5061..8eb2dc707a 100644
--- a/com.discord/smali/androidx/room/R$attr.smali
+++ b/com.discord/smali/androidx/room/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$color.smali b/com.discord/smali/androidx/room/R$color.smali
index 60fbe991c6..2ebc36c5f6 100644
--- a/com.discord/smali/androidx/room/R$color.smali
+++ b/com.discord/smali/androidx/room/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$dimen.smali b/com.discord/smali/androidx/room/R$dimen.smali
index 13bbc0c1f5..7cc3f7842a 100644
--- a/com.discord/smali/androidx/room/R$dimen.smali
+++ b/com.discord/smali/androidx/room/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index 4735643a1a..6ac9ac00bb 100644
--- a/com.discord/smali/androidx/room/R$drawable.smali
+++ b/com.discord/smali/androidx/room/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$id.smali b/com.discord/smali/androidx/room/R$id.smali
index 03f68d848d..7c548abc6a 100644
--- a/com.discord/smali/androidx/room/R$id.smali
+++ b/com.discord/smali/androidx/room/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$integer.smali b/com.discord/smali/androidx/room/R$integer.smali
index 06788d6eb9..e1badca10c 100644
--- a/com.discord/smali/androidx/room/R$integer.smali
+++ b/com.discord/smali/androidx/room/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$layout.smali b/com.discord/smali/androidx/room/R$layout.smali
index 6e4a92d51a..1cdba61a19 100644
--- a/com.discord/smali/androidx/room/R$layout.smali
+++ b/com.discord/smali/androidx/room/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index 8a12961d37..746e89220e 100644
--- a/com.discord/smali/androidx/room/R$string.smali
+++ b/com.discord/smali/androidx/room/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$style.smali b/com.discord/smali/androidx/room/R$style.smali
index 893a7e39a2..428821e98b 100644
--- a/com.discord/smali/androidx/room/R$style.smali
+++ b/com.discord/smali/androidx/room/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R$styleable.smali b/com.discord/smali/androidx/room/R$styleable.smali
index 200e34d5a8..8d27720bd5 100644
--- a/com.discord/smali/androidx/room/R$styleable.smali
+++ b/com.discord/smali/androidx/room/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/R.smali b/com.discord/smali/androidx/room/R.smali
index 584b203fee..7bf4cc2518 100644
--- a/com.discord/smali/androidx/room/R.smali
+++ b/com.discord/smali/androidx/room/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/room/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/RawQuery.smali b/com.discord/smali/androidx/room/RawQuery.smali
index 14d66c28c1..aa6e93209e 100644
--- a/com.discord/smali/androidx/room/RawQuery.smali
+++ b/com.discord/smali/androidx/room/RawQuery.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/RawQuery;
 .super Ljava/lang/Object;
+.source "RawQuery.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Relation.smali b/com.discord/smali/androidx/room/Relation.smali
index f42b5d96fe..4ed8c805f5 100644
--- a/com.discord/smali/androidx/room/Relation.smali
+++ b/com.discord/smali/androidx/room/Relation.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Relation;
 .super Ljava/lang/Object;
+.source "Relation.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Room.smali b/com.discord/smali/androidx/room/Room.smali
index e06dbab0a9..39e47a8790 100644
--- a/com.discord/smali/androidx/room/Room.smali
+++ b/com.discord/smali/androidx/room/Room.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/Room;
 .super Ljava/lang/Object;
+.source "Room.java"
 
 
 # static fields
@@ -187,13 +188,13 @@
 
     invoke-virtual {v0}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
     new-instance p1, Ljava/lang/RuntimeException;
diff --git a/com.discord/smali/androidx/room/RoomDatabase$Builder.smali b/com.discord/smali/androidx/room/RoomDatabase$Builder.smali
index f4dedd8970..f4af0893a2 100644
--- a/com.discord/smali/androidx/room/RoomDatabase$Builder.smali
+++ b/com.discord/smali/androidx/room/RoomDatabase$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/RoomDatabase$Builder;
 .super Ljava/lang/Object;
+.source "RoomDatabase.java"
 
 
 # annotations
@@ -294,11 +295,9 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/room/RoomDatabase$Builder;->mMigrationsNotRequiredFrom:Ljava/util/Set;
+    iget-object v1, p0, Landroidx/room/RoomDatabase$Builder;->mMigrationsNotRequiredFrom:Ljava/util/Set;
 
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Landroidx/room/RoomDatabase$Builder;->mMigrationStartAndEndVersions:Ljava/util/Set;
+    if-eqz v1, :cond_2
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -372,9 +371,7 @@
 
     iget-object v1, p0, Landroidx/room/RoomDatabase$Builder;->mJournalMode:Landroidx/room/RoomDatabase$JournalMode;
 
-    iget-object v8, p0, Landroidx/room/RoomDatabase$Builder;->mContext:Landroid/content/Context;
-
-    invoke-virtual {v1, v8}, Landroidx/room/RoomDatabase$JournalMode;->resolve(Landroid/content/Context;)Landroidx/room/RoomDatabase$JournalMode;
+    invoke-virtual {v1, v2}, Landroidx/room/RoomDatabase$JournalMode;->resolve(Landroid/content/Context;)Landroidx/room/RoomDatabase$JournalMode;
 
     move-result-object v8
 
@@ -419,6 +416,8 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public fallbackToDestructiveMigration()Landroidx/room/RoomDatabase$Builder;
diff --git a/com.discord/smali/androidx/room/RoomDatabase$Callback.smali b/com.discord/smali/androidx/room/RoomDatabase$Callback.smali
index 37515f157f..01f37c5762 100644
--- a/com.discord/smali/androidx/room/RoomDatabase$Callback.smali
+++ b/com.discord/smali/androidx/room/RoomDatabase$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/RoomDatabase$Callback;
 .super Ljava/lang/Object;
+.source "RoomDatabase.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/RoomDatabase$JournalMode.smali b/com.discord/smali/androidx/room/RoomDatabase$JournalMode.smali
index 0bebe41c66..bdc850ea34 100644
--- a/com.discord/smali/androidx/room/RoomDatabase$JournalMode.smali
+++ b/com.discord/smali/androidx/room/RoomDatabase$JournalMode.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/room/RoomDatabase$JournalMode;
 .super Ljava/lang/Enum;
+.source "RoomDatabase.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/RoomDatabase$MigrationContainer.smali b/com.discord/smali/androidx/room/RoomDatabase$MigrationContainer.smali
index 4339c8afcf..5a8cad6f92 100644
--- a/com.discord/smali/androidx/room/RoomDatabase$MigrationContainer.smali
+++ b/com.discord/smali/androidx/room/RoomDatabase$MigrationContainer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/RoomDatabase$MigrationContainer;
 .super Ljava/lang/Object;
+.source "RoomDatabase.java"
 
 
 # annotations
@@ -134,12 +135,12 @@
     :goto_0
     if-eqz p2, :cond_2
 
-    if-ge p3, p4, :cond_9
+    if-ge p3, p4, :cond_a
 
     goto :goto_1
 
     :cond_2
-    if-le p3, p4, :cond_9
+    if-le p3, p4, :cond_a
 
     :goto_1
     iget-object v3, p0, Landroidx/room/RoomDatabase$MigrationContainer;->mMigrations:Landroidx/collection/SparseArrayCompat;
@@ -177,7 +178,7 @@
     const/4 v5, 0x0
 
     :goto_2
-    if-eq v5, v7, :cond_8
+    if-eq v5, v7, :cond_9
 
     invoke-virtual {v3, v5}, Landroidx/collection/SparseArrayCompat;->keyAt(I)I
 
@@ -189,25 +190,29 @@
 
     if-le v8, p3, :cond_5
 
-    :goto_3
     const/4 v9, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const/4 v9, 0x0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
-    if-lt v8, p4, :cond_5
+    if-lt v8, p4, :cond_7
 
-    if-ge v8, p3, :cond_5
+    if-ge v8, p3, :cond_7
+
+    const/4 v9, 0x1
 
     goto :goto_3
 
-    :goto_4
-    if-eqz v9, :cond_7
+    :cond_7
+    const/4 v9, 0x0
+
+    :goto_3
+    if-eqz v9, :cond_8
 
     invoke-virtual {v3, v5}, Landroidx/collection/SparseArrayCompat;->valueAt(I)Ljava/lang/Object;
 
@@ -219,20 +224,20 @@
 
     const/4 v6, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_7
+    :cond_8
     add-int/2addr v5, v2
 
     goto :goto_2
 
-    :cond_8
-    :goto_5
+    :cond_9
+    :goto_4
     if-nez v6, :cond_1
 
     return-object v4
 
-    :cond_9
+    :cond_a
     return-object p1
 .end method
 
diff --git a/com.discord/smali/androidx/room/RoomDatabase.smali b/com.discord/smali/androidx/room/RoomDatabase.smali
index 19030e80da..d03136b3e3 100644
--- a/com.discord/smali/androidx/room/RoomDatabase.smali
+++ b/com.discord/smali/androidx/room/RoomDatabase.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/RoomDatabase;
 .super Ljava/lang/Object;
+.source "RoomDatabase.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/RoomMasterTable.smali b/com.discord/smali/androidx/room/RoomMasterTable.smali
index 49c040a6fd..0983b95931 100644
--- a/com.discord/smali/androidx/room/RoomMasterTable.smali
+++ b/com.discord/smali/androidx/room/RoomMasterTable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/RoomMasterTable;
 .super Ljava/lang/Object;
+.source "RoomMasterTable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali b/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali
index f18ccc2e76..76c4908a12 100644
--- a/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali
+++ b/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/RoomOpenHelper$Delegate;
 .super Ljava/lang/Object;
+.source "RoomOpenHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/RoomOpenHelper.smali b/com.discord/smali/androidx/room/RoomOpenHelper.smali
index 827d3d5ac4..7e3e966576 100644
--- a/com.discord/smali/androidx/room/RoomOpenHelper.smali
+++ b/com.discord/smali/androidx/room/RoomOpenHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/RoomOpenHelper;
 .super Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;
+.source "RoomOpenHelper.java"
 
 
 # annotations
@@ -305,8 +306,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/room/RoomOpenHelper;->mConfiguration:Landroidx/room/DatabaseConfiguration;
-
     iget-object v0, v0, Landroidx/room/DatabaseConfiguration;->migrationContainer:Landroidx/room/RoomDatabase$MigrationContainer;
 
     invoke-virtual {v0, p2, p3}, Landroidx/room/RoomDatabase$MigrationContainer;->findMigrationPath(II)Ljava/util/List;
@@ -357,8 +356,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/room/RoomOpenHelper;->mConfiguration:Landroidx/room/DatabaseConfiguration;
-
     invoke-virtual {v0, p2}, Landroidx/room/DatabaseConfiguration;->isMigrationRequiredFrom(I)Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/room/RoomSQLiteQuery$1.smali b/com.discord/smali/androidx/room/RoomSQLiteQuery$1.smali
index faf8c6a7d3..e2892e918d 100644
--- a/com.discord/smali/androidx/room/RoomSQLiteQuery$1.smali
+++ b/com.discord/smali/androidx/room/RoomSQLiteQuery$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/room/RoomSQLiteQuery$1;
 .super Ljava/lang/Object;
+.source "RoomSQLiteQuery.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteProgram;
diff --git a/com.discord/smali/androidx/room/RoomSQLiteQuery.smali b/com.discord/smali/androidx/room/RoomSQLiteQuery.smali
index 9f08209fdc..75ae8e9987 100644
--- a/com.discord/smali/androidx/room/RoomSQLiteQuery.smali
+++ b/com.discord/smali/androidx/room/RoomSQLiteQuery.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/RoomSQLiteQuery;
 .super Ljava/lang/Object;
+.source "RoomSQLiteQuery.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteProgram;
diff --git a/com.discord/smali/androidx/room/RoomWarnings.smali b/com.discord/smali/androidx/room/RoomWarnings.smali
index d97dbac1e0..e835ff8cfa 100644
--- a/com.discord/smali/androidx/room/RoomWarnings.smali
+++ b/com.discord/smali/androidx/room/RoomWarnings.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/RoomWarnings;
 .super Ljava/lang/Object;
+.source "RoomWarnings.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/room/SharedSQLiteStatement.smali b/com.discord/smali/androidx/room/SharedSQLiteStatement.smali
index bfbfad4b92..f9ea7c63ce 100644
--- a/com.discord/smali/androidx/room/SharedSQLiteStatement.smali
+++ b/com.discord/smali/androidx/room/SharedSQLiteStatement.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/SharedSQLiteStatement;
 .super Ljava/lang/Object;
+.source "SharedSQLiteStatement.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/SkipQueryVerification.smali b/com.discord/smali/androidx/room/SkipQueryVerification.smali
index d9ebe4c624..282aadcba1 100644
--- a/com.discord/smali/androidx/room/SkipQueryVerification.smali
+++ b/com.discord/smali/androidx/room/SkipQueryVerification.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/SkipQueryVerification;
 .super Ljava/lang/Object;
+.source "SkipQueryVerification.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Transaction.smali b/com.discord/smali/androidx/room/Transaction.smali
index 6d8be36197..fdbe6f36d3 100644
--- a/com.discord/smali/androidx/room/Transaction.smali
+++ b/com.discord/smali/androidx/room/Transaction.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Transaction;
 .super Ljava/lang/Object;
+.source "Transaction.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/TypeConverter.smali b/com.discord/smali/androidx/room/TypeConverter.smali
index 5a1ecff1ef..1bd0077244 100644
--- a/com.discord/smali/androidx/room/TypeConverter.smali
+++ b/com.discord/smali/androidx/room/TypeConverter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/TypeConverter;
 .super Ljava/lang/Object;
+.source "TypeConverter.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/TypeConverters.smali b/com.discord/smali/androidx/room/TypeConverters.smali
index 504a43a114..3865e3b707 100644
--- a/com.discord/smali/androidx/room/TypeConverters.smali
+++ b/com.discord/smali/androidx/room/TypeConverters.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/TypeConverters;
 .super Ljava/lang/Object;
+.source "TypeConverters.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/Update.smali b/com.discord/smali/androidx/room/Update.smali
index 58790ddf50..585b709434 100644
--- a/com.discord/smali/androidx/room/Update.smali
+++ b/com.discord/smali/androidx/room/Update.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/room/Update;
 .super Ljava/lang/Object;
+.source "Update.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/room/migration/Migration.smali b/com.discord/smali/androidx/room/migration/Migration.smali
index e53413b4c5..91409a67c3 100644
--- a/com.discord/smali/androidx/room/migration/Migration.smali
+++ b/com.discord/smali/androidx/room/migration/Migration.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/migration/Migration;
 .super Ljava/lang/Object;
+.source "Migration.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/room/paging/LimitOffsetDataSource$1.smali b/com.discord/smali/androidx/room/paging/LimitOffsetDataSource$1.smali
index 51a848364f..bd0dc9bbc2 100644
--- a/com.discord/smali/androidx/room/paging/LimitOffsetDataSource$1.smali
+++ b/com.discord/smali/androidx/room/paging/LimitOffsetDataSource$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/room/paging/LimitOffsetDataSource$1;
 .super Landroidx/room/InvalidationTracker$Observer;
+.source "LimitOffsetDataSource.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/paging/LimitOffsetDataSource.smali b/com.discord/smali/androidx/room/paging/LimitOffsetDataSource.smali
index c7fa28875f..6de75e17be 100644
--- a/com.discord/smali/androidx/room/paging/LimitOffsetDataSource.smali
+++ b/com.discord/smali/androidx/room/paging/LimitOffsetDataSource.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/room/paging/LimitOffsetDataSource;
 .super Landroidx/paging/PositionalDataSource;
+.source "LimitOffsetDataSource.java"
 
 
 # annotations
@@ -285,7 +286,7 @@
 .end method
 
 .method public loadRange(II)Ljava/util/List;
-    .locals 5
+    .locals 4
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
@@ -348,61 +349,46 @@
 
     invoke-virtual {p2, v0}, Landroidx/room/RoomDatabase;->query(Landroidx/sqlite/db/SupportSQLiteQuery;)Landroid/database/Cursor;
 
-    move-result-object p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-virtual {p0, p2}, Landroidx/room/paging/LimitOffsetDataSource;->convertRows(Landroid/database/Cursor;)Ljava/util/List;
-
     move-result-object p1
 
+    invoke-virtual {p0, p1}, Landroidx/room/paging/LimitOffsetDataSource;->convertRows(Landroid/database/Cursor;)Ljava/util/List;
+
+    move-result-object p2
+
     iget-object v1, p0, Landroidx/room/paging/LimitOffsetDataSource;->mDb:Landroidx/room/RoomDatabase;
 
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->setTransactionSuccessful()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz p2, :cond_0
+    if-eqz p1, :cond_0
 
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
+    invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    iget-object p2, p0, Landroidx/room/paging/LimitOffsetDataSource;->mDb:Landroidx/room/RoomDatabase;
+    iget-object p1, p0, Landroidx/room/paging/LimitOffsetDataSource;->mDb:Landroidx/room/RoomDatabase;
 
-    invoke-virtual {p2}, Landroidx/room/RoomDatabase;->endTransaction()V
+    invoke-virtual {p1}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
-    return-object p1
+    return-object p2
 
     :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
-    :catchall_1
     move-exception p2
 
-    move-object v4, p2
+    if-eqz p1, :cond_1
 
-    move-object p2, p1
-
-    move-object p1, v4
-
-    :goto_0
-    if-eqz p2, :cond_1
-
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
+    invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_1
-    iget-object p2, p0, Landroidx/room/paging/LimitOffsetDataSource;->mDb:Landroidx/room/RoomDatabase;
+    iget-object p1, p0, Landroidx/room/paging/LimitOffsetDataSource;->mDb:Landroidx/room/RoomDatabase;
 
-    invoke-virtual {p2}, Landroidx/room/RoomDatabase;->endTransaction()V
+    invoke-virtual {p1}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
-    throw p1
+    throw p2
 
     :cond_2
     iget-object p1, p0, Landroidx/room/paging/LimitOffsetDataSource;->mDb:Landroidx/room/RoomDatabase;
@@ -411,12 +397,12 @@
 
     move-result-object p1
 
-    :try_start_2
+    :try_start_1
     invoke-virtual {p0, p1}, Landroidx/room/paging/LimitOffsetDataSource;->convertRows(Landroid/database/Cursor;)Ljava/util/List;
 
     move-result-object p2
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
@@ -424,7 +410,7 @@
 
     return-object p2
 
-    :catchall_2
+    :catchall_1
     move-exception p2
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
diff --git a/com.discord/smali/androidx/room/util/StringUtil.smali b/com.discord/smali/androidx/room/util/StringUtil.smali
index f45792e4ba..05dfdc42a0 100644
--- a/com.discord/smali/androidx/room/util/StringUtil.smali
+++ b/com.discord/smali/androidx/room/util/StringUtil.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/util/StringUtil;
 .super Ljava/lang/Object;
+.source "StringUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/util/TableInfo$Column.smali b/com.discord/smali/androidx/room/util/TableInfo$Column.smali
index 2a903ef398..226f7d5d17 100644
--- a/com.discord/smali/androidx/room/util/TableInfo$Column.smali
+++ b/com.discord/smali/androidx/room/util/TableInfo$Column.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/util/TableInfo$Column;
 .super Ljava/lang/Object;
+.source "TableInfo.java"
 
 
 # annotations
@@ -182,7 +183,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -258,6 +259,9 @@
     return v0
 
     :cond_6
+    return v1
+
+    :cond_7
     :goto_0
     return v1
 .end method
diff --git a/com.discord/smali/androidx/room/util/TableInfo$ForeignKey.smali b/com.discord/smali/androidx/room/util/TableInfo$ForeignKey.smali
index 2f53ac98d3..50809ef898 100644
--- a/com.discord/smali/androidx/room/util/TableInfo$ForeignKey.smali
+++ b/com.discord/smali/androidx/room/util/TableInfo$ForeignKey.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/util/TableInfo$ForeignKey;
 .super Ljava/lang/Object;
+.source "TableInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/room/util/TableInfo$ForeignKeyWithSequence.smali b/com.discord/smali/androidx/room/util/TableInfo$ForeignKeyWithSequence.smali
index b4c9da8bb7..a20b6d9c94 100644
--- a/com.discord/smali/androidx/room/util/TableInfo$ForeignKeyWithSequence.smali
+++ b/com.discord/smali/androidx/room/util/TableInfo$ForeignKeyWithSequence.smali
@@ -1,5 +1,6 @@
 .class Landroidx/room/util/TableInfo$ForeignKeyWithSequence;
 .super Ljava/lang/Object;
+.source "TableInfo.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
@@ -81,6 +82,8 @@
 
     sub-int/2addr v0, p1
 
+    return v0
+
     :cond_0
     return v0
 .end method
diff --git a/com.discord/smali/androidx/room/util/TableInfo$Index.smali b/com.discord/smali/androidx/room/util/TableInfo$Index.smali
index ecdc303529..0b5de014fd 100644
--- a/com.discord/smali/androidx/room/util/TableInfo$Index.smali
+++ b/com.discord/smali/androidx/room/util/TableInfo$Index.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/util/TableInfo$Index;
 .super Ljava/lang/Object;
+.source "TableInfo.java"
 
 
 # annotations
@@ -168,19 +169,20 @@
 
     const-string v0, "index_"
 
-    :goto_0
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
     move-result v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Landroidx/room/util/TableInfo$Index;->name:Ljava/lang/String;
 
-    goto :goto_0
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
-    :goto_1
+    move-result v0
+
+    :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
     iget-boolean v1, p0, Landroidx/room/util/TableInfo$Index;->unique:Z
diff --git a/com.discord/smali/androidx/room/util/TableInfo.smali b/com.discord/smali/androidx/room/util/TableInfo.smali
index cd4acc8c09..a4053ff198 100644
--- a/com.discord/smali/androidx/room/util/TableInfo.smali
+++ b/com.discord/smali/androidx/room/util/TableInfo.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/room/util/TableInfo;
 .super Ljava/lang/Object;
+.source "TableInfo.java"
 
 
 # annotations
@@ -281,6 +282,8 @@
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static readForeignKeyFieldMappings(Landroid/database/Cursor;)Ljava/util/List;
@@ -550,6 +553,8 @@
     invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static readIndex(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;Z)Landroidx/room/util/TableInfo$Index;
@@ -680,6 +685,8 @@
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static readIndices(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)Ljava/util/Set;
@@ -830,6 +837,8 @@
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     throw p0
+
+    return-void
 .end method
 
 
@@ -867,8 +876,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/room/util/TableInfo;->name:Ljava/lang/String;
-
     iget-object v3, p1, Landroidx/room/util/TableInfo;->name:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -892,8 +899,6 @@
 
     if-eqz v2, :cond_4
 
-    iget-object v2, p0, Landroidx/room/util/TableInfo;->columns:Ljava/util/Map;
-
     iget-object v3, p1, Landroidx/room/util/TableInfo;->columns:Ljava/util/Map;
 
     invoke-interface {v2, v3}, Ljava/util/Map;->equals(Ljava/lang/Object;)Z
@@ -917,8 +922,6 @@
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Landroidx/room/util/TableInfo;->foreignKeys:Ljava/util/Set;
-
     iget-object v3, p1, Landroidx/room/util/TableInfo;->foreignKeys:Ljava/util/Set;
 
     invoke-interface {v2, v3}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
@@ -942,18 +945,14 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p1, Landroidx/room/util/TableInfo;->indices:Ljava/util/Set;
+    iget-object p1, p1, Landroidx/room/util/TableInfo;->indices:Ljava/util/Set;
 
-    if-nez v1, :cond_8
+    if-nez p1, :cond_8
 
     goto :goto_3
 
     :cond_8
-    iget-object v0, p0, Landroidx/room/util/TableInfo;->indices:Ljava/util/Set;
-
-    iget-object p1, p1, Landroidx/room/util/TableInfo;->indices:Ljava/util/Set;
-
-    invoke-interface {v0, p1}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
+    invoke-interface {v1, p1}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -977,8 +976,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/room/util/TableInfo;->name:Ljava/lang/String;
-
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
     move-result v0
@@ -995,8 +992,6 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Landroidx/room/util/TableInfo;->columns:Ljava/util/Map;
-
     invoke-interface {v2}, Ljava/util/Map;->hashCode()I
 
     move-result v2
@@ -1015,9 +1010,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v1, p0, Landroidx/room/util/TableInfo;->foreignKeys:Ljava/util/Set;
-
-    invoke-interface {v1}, Ljava/util/Set;->hashCode()I
+    invoke-interface {v2}, Ljava/util/Set;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
index a705f068c0..93c558732a 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$color.smali b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
index ffa163285d..624a1adde0 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$color.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
index c189c0f7f6..8cdb85e348 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index d81e7b45dc..025686fedd 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index c26a11dcaf..c0714ef6a0 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$id.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$integer.smali b/com.discord/smali/androidx/slidingpanelayout/R$integer.smali
index 442db1104c..fcf8e42a59 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$integer.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$layout.smali b/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
index ee9aba6dd2..eb984349b4 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index 3c039726af..8074a5f068 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$style.smali b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
index 137d96fdda..0aaefa9d58 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$style.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
index 5f899ac8f9..9b1478d13e 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/R.smali b/com.discord/smali/androidx/slidingpanelayout/R.smali
index 3f17353932..e886525e79 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/slidingpanelayout/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$AccessibilityDelegate.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$AccessibilityDelegate.smali
index 9c9b6836fd..0933ce24a4 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$AccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$AccessibilityDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/slidingpanelayout/widget/SlidingPaneLayout$AccessibilityDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "SlidingPaneLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DisableLayerRunnable.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DisableLayerRunnable.smali
index 2bf4496ce3..fee14201e1 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DisableLayerRunnable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DisableLayerRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DisableLayerRunnable;
 .super Ljava/lang/Object;
+.source "SlidingPaneLayout.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback.smali
index 38ddea05b1..5058f24a4f 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback;
 .super Landroidx/customview/widget/ViewDragHelper$Callback;
+.source "SlidingPaneLayout.java"
 
 
 # annotations
@@ -195,17 +196,13 @@
 
     iget-object p1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback;->this$0:Landroidx/slidingpanelayout/widget/SlidingPaneLayout;
 
-    iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback;->this$0:Landroidx/slidingpanelayout/widget/SlidingPaneLayout;
-
-    iget-object v0, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
+    iget-object v0, p1, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->updateObscuredViewsVisibility(Landroid/view/View;)V
 
     iget-object p1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback;->this$0:Landroidx/slidingpanelayout/widget/SlidingPaneLayout;
 
-    iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback;->this$0:Landroidx/slidingpanelayout/widget/SlidingPaneLayout;
-
-    iget-object v0, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
+    iget-object v0, p1, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->dispatchOnPanelClosed(Landroid/view/View;)V
 
@@ -220,9 +217,7 @@
     :cond_0
     iget-object p1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback;->this$0:Landroidx/slidingpanelayout/widget/SlidingPaneLayout;
 
-    iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$DragHelperCallback;->this$0:Landroidx/slidingpanelayout/widget/SlidingPaneLayout;
-
-    iget-object v0, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
+    iget-object v0, p1, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->dispatchOnPanelOpened(Landroid/view/View;)V
 
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams.smali
index 394c872785..94ee24e178 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "SlidingPaneLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener.smali
index 71933db71e..76c04ef6ec 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;
 .super Ljava/lang/Object;
+.source "SlidingPaneLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState$1.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState$1.smali
index 26772dbe6f..b07b72c376 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState$1.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState$1;
 .super Ljava/lang/Object;
+.source "SlidingPaneLayout.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState.smali
index 964d48777d..219b12dc7f 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "SlidingPaneLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SimplePanelSlideListener.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SimplePanelSlideListener.smali
index 1c98779568..3c08d1d1c5 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SimplePanelSlideListener.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout$SimplePanelSlideListener.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/slidingpanelayout/widget/SlidingPaneLayout$SimplePanelSlideListener;
 .super Ljava/lang/Object;
+.source "SlidingPaneLayout.java"
 
 # interfaces
 .implements Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;
diff --git a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout.smali b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout.smali
index 8ea977d3df..eb91747e84 100644
--- a/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/widget/SlidingPaneLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/slidingpanelayout/widget/SlidingPaneLayout;
 .super Landroid/view/ViewGroup;
+.source "SlidingPaneLayout.java"
 
 
 # annotations
@@ -436,23 +437,21 @@
 
     iget v7, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mParallaxBy:I
 
-    int-to-float v7, v7
+    int-to-float v8, v7
 
-    mul-float v5, v5, v7
+    mul-float v5, v5, v8
 
     float-to-int v5, v5
 
     iput p1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mParallaxOffset:F
 
-    sub-float v7, v6, p1
+    sub-float v8, v6, p1
 
-    iget v8, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mParallaxBy:I
+    int-to-float v7, v7
 
-    int-to-float v8, v8
+    mul-float v8, v8, v7
 
-    mul-float v7, v7, v8
-
-    float-to-int v7, v7
+    float-to-int v7, v8
 
     sub-int/2addr v5, v7
 
@@ -521,7 +520,7 @@
 
     move-result-object p0
 
-    if-eqz p0, :cond_2
+    if-eqz p0, :cond_3
 
     invoke-virtual {p0}, Landroid/graphics/drawable/Drawable;->getOpacity()I
 
@@ -535,6 +534,9 @@
 
     :cond_2
     return v3
+
+    :cond_3
+    return v3
 .end method
 
 
@@ -753,8 +755,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mPanelSlideListener:Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;
-
     invoke-interface {v0, p1}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;->onPanelClosed(Landroid/view/View;)V
 
     :cond_0
@@ -772,8 +772,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mPanelSlideListener:Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;
-
     invoke-interface {v0, p1}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;->onPanelOpened(Landroid/view/View;)V
 
     :cond_0
@@ -791,8 +789,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mPanelSlideListener:Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;
-
     iget v1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideOffset:F
 
     invoke-interface {v0, p1, v1}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$PanelSlideListener;->onPanelSlide(Landroid/view/View;F)V
@@ -889,6 +885,8 @@
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
+    return-void
+
     :cond_4
     :goto_3
     return-void
@@ -931,9 +929,7 @@
 
     iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mTmpRect:Landroid/graphics/Rect;
 
-    iget-object v2, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mTmpRect:Landroid/graphics/Rect;
-
-    iget v2, v2, Landroid/graphics/Rect;->left:I
+    iget v2, v0, Landroid/graphics/Rect;->left:I
 
     iget-object v3, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
 
@@ -952,9 +948,7 @@
     :cond_0
     iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mTmpRect:Landroid/graphics/Rect;
 
-    iget-object v2, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mTmpRect:Landroid/graphics/Rect;
-
-    iget v2, v2, Landroid/graphics/Rect;->right:I
+    iget v2, v0, Landroid/graphics/Rect;->right:I
 
     iget-object v3, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
 
@@ -1165,8 +1159,6 @@
 
     :cond_2
     :try_start_2
-    iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mRecreateDisplayList:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p1, v2}, Ljava/lang/reflect/Field;->setBoolean(Ljava/lang/Object;Z)V
 
     iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mGetDisplayList:Ljava/lang/reflect/Method;
@@ -1781,9 +1773,9 @@
 
     iput v8, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideOffset:F
 
-    const/high16 v8, 0x3f800000    # 1.0f
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/high16 v9, 0x3f800000    # 1.0f
 
     goto :goto_8
 
@@ -1796,30 +1788,26 @@
 
     if-eqz v2, :cond_8
 
-    iget v2, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideOffset:F
+    iget v8, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideOffset:F
 
-    const/high16 v8, 0x3f800000    # 1.0f
+    const/high16 v9, 0x3f800000    # 1.0f
 
-    sub-float v9, v8, v2
-
-    iget v2, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mParallaxBy:I
+    sub-float v8, v9, v8
 
     int-to-float v2, v2
 
-    mul-float v9, v9, v2
+    mul-float v8, v8, v2
 
-    float-to-int v2, v9
+    float-to-int v8, v8
 
     goto :goto_7
 
     :cond_8
-    const/high16 v8, 0x3f800000    # 1.0f
+    const/high16 v9, 0x3f800000    # 1.0f
 
-    const/4 v2, 0x0
+    const/4 v8, 0x0
 
     :goto_7
-    move v9, v2
-
     move v2, v11
 
     :goto_8
@@ -1827,16 +1815,16 @@
 
     sub-int v10, v3, v2
 
-    add-int/2addr v10, v9
+    add-int/2addr v10, v8
 
-    sub-int v9, v10, v15
+    sub-int v8, v10, v15
 
     goto :goto_9
 
     :cond_9
-    sub-int v9, v2, v9
+    sub-int v8, v2, v8
 
-    add-int v10, v9, v15
+    add-int v10, v8, v15
 
     :goto_9
     invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I
@@ -1845,20 +1833,20 @@
 
     add-int/2addr v12, v6
 
-    invoke-virtual {v13, v9, v6, v10, v12}, Landroid/view/View;->layout(IIII)V
+    invoke-virtual {v13, v8, v6, v10, v12}, Landroid/view/View;->layout(IIII)V
 
     invoke-virtual {v13}, Landroid/view/View;->getWidth()I
 
-    move-result v9
+    move-result v8
 
-    add-int/2addr v11, v9
+    add-int/2addr v11, v8
 
     move v12, v2
 
     goto :goto_a
 
     :cond_a
-    const/high16 v8, 0x3f800000    # 1.0f
+    const/high16 v9, 0x3f800000    # 1.0f
 
     :goto_a
     add-int/lit8 v4, v4, 0x1
@@ -1933,9 +1921,14 @@
 
     invoke-virtual {v0, v1}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->updateObscuredViewsVisibility(Landroid/view/View;)V
 
+    const/4 v1, 0x0
+
+    goto :goto_d
+
     :cond_f
     const/4 v1, 0x0
 
+    :goto_d
     iput-boolean v1, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mFirstLayout:Z
 
     return-void
@@ -2136,7 +2129,7 @@
 
     iput-boolean v1, v7, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->dimWhenOffset:Z
 
-    goto/16 :goto_8
+    goto/16 :goto_6
 
     :cond_7
     iget v10, v7, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->weight:F
@@ -2178,7 +2171,7 @@
 
     const/high16 v10, 0x40000000    # 2.0f
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_9
     iget v1, v7, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
@@ -2191,21 +2184,22 @@
 
     const/high16 v10, 0x40000000    # 2.0f
 
-    :goto_3
     invoke-static {v1, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_a
     const/high16 v10, 0x40000000    # 2.0f
 
     iget v1, v7, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
 
-    goto :goto_3
+    invoke-static {v1, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
-    :goto_4
+    move-result v1
+
+    :goto_3
     iget v15, v7, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
 
     const/4 v10, -0x2
@@ -2214,12 +2208,11 @@
 
     const/high16 v10, -0x80000000
 
-    :goto_5
     invoke-static {v5, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v15
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_b
     iget v10, v7, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
@@ -2230,7 +2223,11 @@
 
     const/high16 v10, 0x40000000    # 2.0f
 
-    goto :goto_5
+    invoke-static {v5, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v15
+
+    goto :goto_4
 
     :cond_c
     const/high16 v10, 0x40000000    # 2.0f
@@ -2241,7 +2238,7 @@
 
     move-result v15
 
-    :goto_6
+    :goto_4
     invoke-virtual {v6, v1, v15}, Landroid/view/View;->measure(II)V
 
     invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
@@ -2269,12 +2266,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_e
     const/4 v1, 0x0
 
-    :goto_7
+    :goto_5
     iput-boolean v1, v7, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->slideable:Z
 
     or-int/2addr v1, v11
@@ -2289,7 +2286,7 @@
     move v11, v1
 
     :cond_10
-    :goto_8
+    :goto_6
     add-int/lit8 v4, v4, 0x1
 
     const/4 v1, 0x0
@@ -2307,7 +2304,7 @@
 
     cmpl-float v3, v12, v1
 
-    if-lez v3, :cond_20
+    if-lez v3, :cond_23
 
     :cond_12
     iget v1, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mOverhangSize:I
@@ -2316,8 +2313,8 @@
 
     const/4 v3, 0x0
 
-    :goto_9
-    if-ge v3, v9, :cond_20
+    :goto_7
+    if-ge v3, v9, :cond_23
 
     invoke-virtual {v0, v3}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View;
 
@@ -2327,7 +2324,7 @@
 
     move-result v6
 
-    if-eq v6, v15, :cond_1e
+    if-eq v6, v15, :cond_22
 
     invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -2339,7 +2336,7 @@
 
     move-result v7
 
-    if-eq v7, v15, :cond_1e
+    if-eq v7, v15, :cond_21
 
     iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
 
@@ -2355,33 +2352,33 @@
 
     const/4 v7, 0x1
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_13
     const/4 v7, 0x0
 
-    :goto_a
+    :goto_8
     if-eqz v7, :cond_14
 
     const/4 v10, 0x0
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_14
     invoke-virtual {v4}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v10
 
-    :goto_b
-    if-eqz v11, :cond_19
+    :goto_9
+    if-eqz v11, :cond_1a
 
     iget-object v15, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
 
-    if-eq v4, v15, :cond_19
+    if-eq v4, v15, :cond_1a
 
     iget v15, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
 
-    if-gez v15, :cond_1e
+    if-gez v15, :cond_19
 
     if-gt v10, v1, :cond_15
 
@@ -2391,7 +2388,7 @@
 
     cmpl-float v10, v10, v15
 
-    if-lez v10, :cond_1e
+    if-lez v10, :cond_19
 
     :cond_15
     if-eqz v7, :cond_18
@@ -2410,7 +2407,7 @@
 
     const/high16 v7, 0x40000000    # 2.0f
 
-    goto :goto_d
+    goto :goto_a
 
     :cond_16
     iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
@@ -2425,14 +2422,18 @@
 
     move-result v6
 
-    goto :goto_d
+    goto :goto_a
 
     :cond_17
     const/high16 v7, 0x40000000    # 2.0f
 
     iget v6, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
 
-    goto :goto_c
+    invoke-static {v6, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v6
+
+    goto :goto_a
 
     :cond_18
     const/high16 v7, 0x40000000    # 2.0f
@@ -2441,38 +2442,52 @@
 
     move-result v6
 
-    :goto_c
     invoke-static {v6, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v6
 
-    :goto_d
+    :goto_a
     invoke-static {v1, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v10
 
     invoke-virtual {v4, v10, v6}, Landroid/view/View;->measure(II)V
 
-    goto :goto_11
+    move/from16 v19, v1
+
+    const/4 v1, 0x0
+
+    const/high16 v6, 0x40000000    # 2.0f
+
+    goto/16 :goto_c
 
     :cond_19
+    move/from16 v19, v1
+
+    const/4 v1, 0x0
+
+    const/high16 v6, 0x40000000    # 2.0f
+
+    goto/16 :goto_c
+
+    :cond_1a
     iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->weight:F
 
     const/4 v15, 0x0
 
     cmpl-float v7, v7, v15
 
-    if-lez v7, :cond_1e
+    if-lez v7, :cond_20
 
     iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
 
-    if-nez v7, :cond_1c
+    if-nez v7, :cond_1d
 
     iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
 
     const/4 v15, -0x2
 
-    if-ne v7, v15, :cond_1a
+    if-ne v7, v15, :cond_1b
 
     const/high16 v7, -0x80000000
 
@@ -2484,47 +2499,49 @@
 
     const/high16 v7, 0x40000000    # 2.0f
 
-    goto :goto_10
+    goto :goto_b
 
-    :cond_1a
+    :cond_1b
     iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
 
     const/4 v15, -0x1
 
-    if-ne v7, v15, :cond_1b
+    if-ne v7, v15, :cond_1c
 
     const/high16 v7, 0x40000000    # 2.0f
 
     invoke-static {v5, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
-    move-result v17
+    move-result v19
 
-    goto :goto_f
+    move/from16 v15, v19
 
-    :cond_1b
+    goto :goto_b
+
+    :cond_1c
     const/high16 v7, 0x40000000    # 2.0f
 
     iget v15, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
 
-    goto :goto_e
+    invoke-static {v15, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
-    :cond_1c
+    move-result v15
+
+    goto :goto_b
+
+    :cond_1d
     const/high16 v7, 0x40000000    # 2.0f
 
     invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v15
 
-    :goto_e
     invoke-static {v15, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
-    move-result v17
+    move-result v15
 
-    :goto_f
-    move/from16 v15, v17
-
-    :goto_10
-    if-eqz v11, :cond_1d
+    :goto_b
+    if-eqz v11, :cond_1f
 
     iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->leftMargin:I
 
@@ -2542,13 +2559,18 @@
 
     move-result v1
 
-    if-eq v10, v6, :cond_1f
+    if-eq v10, v6, :cond_1e
 
     invoke-virtual {v4, v1, v15}, Landroid/view/View;->measure(II)V
 
-    goto :goto_12
+    :cond_1e
+    const/4 v1, 0x0
 
-    :cond_1d
+    const/high16 v6, 0x40000000    # 2.0f
+
+    goto :goto_c
+
+    :cond_1f
     move/from16 v19, v1
 
     const/4 v1, 0x0
@@ -2577,28 +2599,43 @@
 
     invoke-virtual {v4, v7, v15}, Landroid/view/View;->measure(II)V
 
-    goto :goto_13
+    goto :goto_c
 
-    :cond_1e
-    :goto_11
+    :cond_20
     move/from16 v19, v1
 
-    :cond_1f
-    :goto_12
     const/4 v1, 0x0
 
     const/high16 v6, 0x40000000    # 2.0f
 
-    :goto_13
+    goto :goto_c
+
+    :cond_21
+    move/from16 v19, v1
+
+    const/4 v1, 0x0
+
+    const/high16 v6, 0x40000000    # 2.0f
+
+    goto :goto_c
+
+    :cond_22
+    move/from16 v19, v1
+
+    const/4 v1, 0x0
+
+    const/high16 v6, 0x40000000    # 2.0f
+
+    :goto_c
     add-int/lit8 v3, v3, 0x1
 
     move/from16 v1, v19
 
     const/16 v15, 0x8
 
-    goto/16 :goto_9
+    goto/16 :goto_7
 
-    :cond_20
+    :cond_23
     invoke-virtual/range {p0 .. p0}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->getPaddingTop()I
 
     move-result v1
@@ -2621,15 +2658,15 @@
 
     move-result v1
 
-    if-eqz v1, :cond_21
+    if-eqz v1, :cond_24
 
-    if-nez v11, :cond_21
+    if-nez v11, :cond_24
 
     iget-object v1, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
     invoke-virtual {v1}, Landroidx/customview/widget/ViewDragHelper;->abort()V
 
-    :cond_21
+    :cond_24
     return-void
 .end method
 
@@ -3284,9 +3321,7 @@
 
     iget-object v1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
 
-    iget-object v2, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
-
-    invoke-virtual {v2}, Landroid/view/View;->getTop()I
+    invoke-virtual {v1}, Landroid/view/View;->getTop()I
 
     move-result v2
 
diff --git a/com.discord/smali/androidx/sqlite/db/R.smali b/com.discord/smali/androidx/sqlite/db/R.smali
index 126b1a473b..471a89e76f 100644
--- a/com.discord/smali/androidx/sqlite/db/R.smali
+++ b/com.discord/smali/androidx/sqlite/db/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/sqlite/db/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/sqlite/db/SimpleSQLiteQuery.smali b/com.discord/smali/androidx/sqlite/db/SimpleSQLiteQuery.smali
index ff5671e557..7575e666eb 100644
--- a/com.discord/smali/androidx/sqlite/db/SimpleSQLiteQuery.smali
+++ b/com.discord/smali/androidx/sqlite/db/SimpleSQLiteQuery.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/sqlite/db/SimpleSQLiteQuery;
 .super Ljava/lang/Object;
+.source "SimpleSQLiteQuery.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteQuery;
@@ -276,8 +277,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/sqlite/db/SimpleSQLiteQuery;->mBindArgs:[Ljava/lang/Object;
-
     array-length v0, v0
 
     return v0
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteDatabase.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteDatabase.smali
index 926c284e32..86745ad563 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteDatabase.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteDatabase.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/sqlite/db/SupportSQLiteDatabase;
 .super Ljava/lang/Object;
+.source "SupportSQLiteDatabase.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali
index f88a5a93ce..db2d7dc517 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;
 .super Ljava/lang/Object;
+.source "SupportSQLiteOpenHelper.java"
 
 
 # annotations
@@ -141,6 +142,8 @@
 
     invoke-static {v0, v1, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    return-void
+
     :cond_3
     :goto_0
     return-void
@@ -181,9 +184,8 @@
 
     move-result v0
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_0
 
-    :cond_0
     invoke-interface {p1}, Landroidx/sqlite/db/SupportSQLiteDatabase;->getPath()Ljava/lang/String;
 
     move-result-object p1
@@ -192,19 +194,17 @@
 
     return-void
 
-    :cond_1
+    :cond_0
     const/4 v0, 0x0
 
     :try_start_0
     invoke-interface {p1}, Landroidx/sqlite/db/SupportSQLiteDatabase;->getAttachedDbs()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
     :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
 
-    move-object v0, v1
-
     goto :goto_0
 
     :catchall_0
@@ -223,7 +223,7 @@
     goto :goto_3
 
     :goto_1
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -234,6 +234,45 @@
 
     move-result v0
 
+    if-eqz v0, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/util/Pair;
+
+    iget-object v0, v0, Landroid/util/Pair;->second:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    invoke-direct {p0, v0}, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;->deleteDatabaseFile(Ljava/lang/String;)V
+
+    goto :goto_2
+
+    :cond_1
+    invoke-interface {p1}, Landroidx/sqlite/db/SupportSQLiteDatabase;->getPath()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;->deleteDatabaseFile(Ljava/lang/String;)V
+
+    :cond_2
+    throw v1
+
+    :catch_1
+    :goto_3
+    if-eqz v0, :cond_4
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_4
+    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;
@@ -248,48 +287,18 @@
 
     invoke-direct {p0, v0}, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;->deleteDatabaseFile(Ljava/lang/String;)V
 
-    goto :goto_2
+    goto :goto_4
 
-    :cond_2
+    :cond_3
+    return-void
+
+    :cond_4
     invoke-interface {p1}, Landroidx/sqlite/db/SupportSQLiteDatabase;->getPath()Ljava/lang/String;
 
     move-result-object p1
 
     invoke-direct {p0, p1}, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;->deleteDatabaseFile(Ljava/lang/String;)V
 
-    :cond_3
-    throw v1
-
-    :catch_1
-    :goto_3
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :goto_4
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/util/Pair;
-
-    iget-object v0, v0, Landroid/util/Pair;->second:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/String;
-
-    invoke-direct {p0, v0}, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;->deleteDatabaseFile(Ljava/lang/String;)V
-
-    goto :goto_4
-
-    :cond_4
     return-void
 .end method
 
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder.smali
index 892b4e6754..4d12dcd309 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;
 .super Ljava/lang/Object;
+.source "SupportSQLiteOpenHelper.java"
 
 
 # annotations
@@ -45,21 +46,17 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->mContext:Landroid/content/Context;
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;
-
     iget-object v1, p0, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->mContext:Landroid/content/Context;
 
-    iget-object v2, p0, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->mName:Ljava/lang/String;
+    if-eqz v1, :cond_0
 
-    iget-object v3, p0, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->mCallback:Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;
+    new-instance v2, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;
 
-    invoke-direct {v0, v1, v2, v3}, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;)V
+    iget-object v3, p0, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->mName:Ljava/lang/String;
 
-    return-object v0
+    invoke-direct {v2, v1, v3, v0}, Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;)V
+
+    return-object v2
 
     :cond_0
     new-instance v0, Ljava/lang/IllegalArgumentException;
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration.smali
index a0cccc63af..aab2226676 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Configuration.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;
 .super Ljava/lang/Object;
+.source "SupportSQLiteOpenHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Factory.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Factory.smali
index 900b9dc0a1..1600c69144 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Factory.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Factory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;
 .super Ljava/lang/Object;
+.source "SupportSQLiteOpenHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper.smali
index 780b056bfc..a84a045db2 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/sqlite/db/SupportSQLiteOpenHelper;
 .super Ljava/lang/Object;
+.source "SupportSQLiteOpenHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteProgram.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteProgram.smali
index 91e29a5a39..87bd8834db 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteProgram.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteProgram.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/sqlite/db/SupportSQLiteProgram;
 .super Ljava/lang/Object;
+.source "SupportSQLiteProgram.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteQuery.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteQuery.smali
index a14688c8e9..5f8e1cf8d9 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteQuery.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteQuery.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/sqlite/db/SupportSQLiteQuery;
 .super Ljava/lang/Object;
+.source "SupportSQLiteQuery.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteQueryBuilder.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteQueryBuilder.smali
index 0571194dec..8bf1039969 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteQueryBuilder.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteQueryBuilder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/sqlite/db/SupportSQLiteQueryBuilder;
 .super Ljava/lang/Object;
+.source "SupportSQLiteQueryBuilder.java"
 
 
 # static fields
@@ -217,13 +218,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/sqlite/db/SupportSQLiteQueryBuilder;->mColumns:[Ljava/lang/String;
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-eqz v1, :cond_3
-
-    iget-object v1, p0, Landroidx/sqlite/db/SupportSQLiteQueryBuilder;->mColumns:[Ljava/lang/String;
+    if-eqz v2, :cond_3
 
     invoke-static {v0, v1}, Landroidx/sqlite/db/SupportSQLiteQueryBuilder;->appendColumns(Ljava/lang/StringBuilder;[Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteStatement.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteStatement.smali
index f333892179..699423f821 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteStatement.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteStatement.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/sqlite/db/SupportSQLiteStatement;
 .super Ljava/lang/Object;
+.source "SupportSQLiteStatement.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteProgram;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$1.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$1.smali
index b0dc2993a3..42bc1b5fab 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$1.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$1;
 .super Ljava/lang/Object;
+.source "FrameworkSQLiteDatabase.java"
 
 # interfaces
 .implements Landroid/database/sqlite/SQLiteDatabase$CursorFactory;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$2.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$2.smali
index 15a533ce1a..f66228a4e4 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$2.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$2;
 .super Ljava/lang/Object;
+.source "FrameworkSQLiteDatabase.java"
 
 # interfaces
 .implements Landroid/database/sqlite/SQLiteDatabase$CursorFactory;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.smali
index 0df5134e8e..1b83d2ed25 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;
 .super Ljava/lang/Object;
+.source "FrameworkSQLiteDatabase.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteDatabase;
@@ -760,6 +761,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public yieldIfContendedSafely()Z
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$1.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$1.smali
index 67549cd056..b75f150d45 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$1.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$1;
 .super Ljava/lang/Object;
+.source "FrameworkSQLiteOpenHelper.java"
 
 # interfaces
 .implements Landroid/database/DatabaseErrorHandler;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper.smali
index b401a2bbdf..4339e77963 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;
 .super Landroid/database/sqlite/SQLiteOpenHelper;
+.source "FrameworkSQLiteOpenHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.smali
index e25b343266..ef986d00e4 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;
 .super Ljava/lang/Object;
+.source "FrameworkSQLiteOpenHelper.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteOpenHelper;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory.smali
index 3839cb3c96..c77eb0dfb9 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory;
 .super Ljava/lang/Object;
+.source "FrameworkSQLiteOpenHelperFactory.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteProgram.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteProgram.smali
index 03c87a0783..e2738e9dec 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteProgram.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteProgram.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteProgram;
 .super Ljava/lang/Object;
+.source "FrameworkSQLiteProgram.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteProgram;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteStatement.smali b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteStatement.smali
index 9c22e6203c..49b4fcb784 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteStatement.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/FrameworkSQLiteStatement.smali
@@ -1,5 +1,6 @@
 .class Landroidx/sqlite/db/framework/FrameworkSQLiteStatement;
 .super Landroidx/sqlite/db/framework/FrameworkSQLiteProgram;
+.source "FrameworkSQLiteStatement.java"
 
 # interfaces
 .implements Landroidx/sqlite/db/SupportSQLiteStatement;
diff --git a/com.discord/smali/androidx/sqlite/db/framework/R.smali b/com.discord/smali/androidx/sqlite/db/framework/R.smali
index d378b77f62..7ac89752c4 100644
--- a/com.discord/smali/androidx/sqlite/db/framework/R.smali
+++ b/com.discord/smali/androidx/sqlite/db/framework/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/sqlite/db/framework/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
index f19a0af155..379250bb31 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
index 6bd7cb45f6..4b85c95bcd 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
index 4ea39e0aa2..03172b1694 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index e658db8fb1..03e784ce97 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index 3e581440a3..79c4b9b87a 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali b/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali
index 6010e833ca..6a5528a4d7 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali b/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
index 139c4fd4e0..677fe1ace5 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 76d00449ed..ac4b69dae7 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
index da23799050..3f481358f2 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
index ad540ee706..087995d13a 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R.smali b/com.discord/smali/androidx/swiperefreshlayout/R.smali
index 9625833838..1c2414b79c 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/swiperefreshlayout/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView$OvalShadow.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView$OvalShadow.smali
index 26b52ff5b7..721c6e360f 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView$OvalShadow.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView$OvalShadow.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/CircleImageView$OvalShadow;
 .super Landroid/graphics/drawable/shapes/OvalShape;
+.source "CircleImageView.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView.smali
index 312de15187..77b355f6de 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/CircleImageView.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/CircleImageView;
 .super Landroid/widget/ImageView;
+.source "CircleImageView.java"
 
 
 # annotations
@@ -175,8 +176,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/CircleImageView;->mListener:Landroid/view/animation/Animation$AnimationListener;
-
     invoke-virtual {p0}, Landroidx/swiperefreshlayout/widget/CircleImageView;->getAnimation()Landroid/view/animation/Animation;
 
     move-result-object v1
@@ -196,8 +195,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/CircleImageView;->mListener:Landroid/view/animation/Animation$AnimationListener;
-
     invoke-virtual {p0}, Landroidx/swiperefreshlayout/widget/CircleImageView;->getAnimation()Landroid/view/animation/Animation;
 
     move-result-object v1
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$1.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$1.smali
index 6e667facd1..d9399f3dab 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$1.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$1;
 .super Ljava/lang/Object;
+.source "CircularProgressDrawable.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$2.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$2.smali
index a7aeac5c14..de0b480e0d 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$2.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$2;
 .super Ljava/lang/Object;
+.source "CircularProgressDrawable.java"
 
 # interfaces
 .implements Landroid/animation/Animator$AnimatorListener;
@@ -99,9 +100,7 @@
     :cond_0
     iget-object p1, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$2;->this$0:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;
 
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$2;->this$0:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;
-
-    iget v0, v0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->mRotationCount:F
+    iget v0, p1, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->mRotationCount:F
 
     add-float/2addr v0, v2
 
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$ProgressDrawableSize.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$ProgressDrawableSize.smali
index f0357a2550..dbb9519b08 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$ProgressDrawableSize.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$ProgressDrawableSize.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$ProgressDrawableSize;
 .super Ljava/lang/Object;
+.source "CircularProgressDrawable.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring.smali
index 62c39e2372..902b117e74 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;
 .super Ljava/lang/Object;
+.source "CircularProgressDrawable.java"
 
 
 # annotations
@@ -159,15 +160,13 @@
 
     div-float/2addr v1, v2
 
-    add-float/2addr v0, v1
-
-    iget v1, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mRingCenterRadius:F
+    add-float/2addr v1, v0
 
     const/4 v3, 0x0
 
-    cmpg-float v1, v1, v3
+    cmpg-float v0, v0, v3
 
-    if-gtz v1, :cond_0
+    if-gtz v0, :cond_0
 
     invoke-virtual {p2}, Landroid/graphics/Rect;->width()I
 
@@ -203,16 +202,16 @@
 
     move-result v1
 
-    sub-float/2addr v0, v1
+    sub-float v1, v0, v1
 
     :cond_0
     invoke-virtual {p2}, Landroid/graphics/Rect;->centerX()I
 
-    move-result v1
+    move-result v0
 
-    int-to-float v1, v1
+    int-to-float v0, v0
 
-    sub-float/2addr v1, v0
+    sub-float/2addr v0, v1
 
     invoke-virtual {p2}, Landroid/graphics/Rect;->centerY()I
 
@@ -220,7 +219,7 @@
 
     int-to-float v3, v3
 
-    sub-float/2addr v3, v0
+    sub-float/2addr v3, v1
 
     invoke-virtual {p2}, Landroid/graphics/Rect;->centerX()I
 
@@ -228,7 +227,7 @@
 
     int-to-float v4, v4
 
-    add-float/2addr v4, v0
+    add-float/2addr v4, v1
 
     invoke-virtual {p2}, Landroid/graphics/Rect;->centerY()I
 
@@ -236,9 +235,9 @@
 
     int-to-float p2, p2
 
-    add-float/2addr p2, v0
+    add-float/2addr p2, v1
 
-    invoke-virtual {v6, v1, v3, v4, p2}, Landroid/graphics/RectF;->set(FFFF)V
+    invoke-virtual {v6, v0, v3, v4, p2}, Landroid/graphics/RectF;->set(FFFF)V
 
     iget p2, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mStartTrim:F
 
@@ -246,19 +245,17 @@
 
     add-float/2addr p2, v0
 
-    const/high16 v0, 0x43b40000    # 360.0f
+    const/high16 v1, 0x43b40000    # 360.0f
 
-    mul-float p2, p2, v0
+    mul-float p2, p2, v1
 
-    iget v1, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mEndTrim:F
+    iget v3, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mEndTrim:F
 
-    iget v3, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mRotation:F
+    add-float/2addr v3, v0
 
-    add-float/2addr v1, v3
+    mul-float v3, v3, v1
 
-    mul-float v1, v1, v0
-
-    sub-float v7, v1, p2
+    sub-float v7, v3, p2
 
     iget-object v0, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mPaint:Landroid/graphics/Paint;
 
@@ -345,8 +342,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mArrow:Landroid/graphics/Path;
-
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
     :goto_0
@@ -406,15 +401,13 @@
 
     div-float/2addr v4, v1
 
-    iget v5, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mArrowHeight:I
+    iget v6, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mArrowHeight:I
 
-    int-to-float v5, v5
+    int-to-float v6, v6
 
-    iget v6, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mArrowScale:F
+    mul-float v6, v6, v5
 
-    mul-float v5, v5, v6
-
-    invoke-virtual {v3, v4, v5}, Landroid/graphics/Path;->lineTo(FF)V
+    invoke-virtual {v3, v4, v6}, Landroid/graphics/Path;->lineTo(FF)V
 
     iget-object v3, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->mArrow:Landroid/graphics/Path;
 
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable.smali
index 9ccf6f6697..7617332484 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/CircularProgressDrawable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "CircularProgressDrawable.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Animatable;
@@ -903,10 +904,9 @@
 
     const/high16 v2, 0x40c00000    # 6.0f
 
-    :goto_0
     invoke-direct {p0, p1, v0, v1, v2}, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setSizeParameters(FFFF)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/high16 p1, 0x40f00000    # 7.5f
@@ -917,9 +917,9 @@
 
     const/high16 v2, 0x40a00000    # 5.0f
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0, v1, v2}, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setSizeParameters(FFFF)V
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0}, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->invalidateSelf()V
 
     return-void
@@ -960,7 +960,6 @@
 
     const-wide/16 v1, 0x29a
 
-    :goto_0
     invoke-virtual {v0, v1, v2}, Landroid/animation/Animator;->setDuration(J)Landroid/animation/Animator;
 
     iget-object v0, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->mAnimator:Landroid/animation/Animator;
@@ -984,7 +983,13 @@
 
     const-wide/16 v1, 0x534
 
-    goto :goto_0
+    invoke-virtual {v0, v1, v2}, Landroid/animation/Animator;->setDuration(J)Landroid/animation/Animator;
+
+    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->mAnimator:Landroid/animation/Animator;
+
+    invoke-virtual {v0}, Landroid/animation/Animator;->start()V
+
+    return-void
 .end method
 
 .method public stop()V
@@ -1044,7 +1049,6 @@
 
     move-result p1
 
-    :goto_0
     invoke-virtual {p2, p1}, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setColor(I)V
 
     return-void
@@ -1054,5 +1058,7 @@
 
     move-result p1
 
-    goto :goto_0
+    invoke-virtual {p2, p1}, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setColor(I)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$1.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$1.smali
index 0fe553cc37..8c0937aea1 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$1.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;
 .super Ljava/lang/Object;
+.source "SwipeRefreshLayout.java"
 
 # interfaces
 .implements Landroid/view/animation/Animation$AnimationListener;
@@ -77,9 +78,7 @@
     :cond_0
     iget-object p1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
-
-    iget-object v0, v0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleView:Landroidx/swiperefreshlayout/widget/CircleImageView;
+    iget-object v0, p1, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleView:Landroidx/swiperefreshlayout/widget/CircleImageView;
 
     invoke-virtual {v0}, Landroidx/swiperefreshlayout/widget/CircleImageView;->getTop()I
 
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$2.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$2.smali
index 9fc35d8a7d..57aa1999f3 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$2.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$2;
 .super Landroid/view/animation/Animation;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$3.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$3.smali
index 2ee5a3ee06..1b92f8b744 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$3.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$3;
 .super Landroid/view/animation/Animation;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$4.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$4.smali
index 437b53d48a..ebee2c970e 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$4.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;
 .super Landroid/view/animation/Animation;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
@@ -47,21 +48,19 @@
 
     iget v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$startingAlpha:I
 
-    int-to-float v0, v0
+    int-to-float v1, v0
 
-    iget v1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$endingAlpha:I
+    iget v2, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$endingAlpha:I
 
-    iget v2, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$startingAlpha:I
+    sub-int/2addr v2, v0
 
-    sub-int/2addr v1, v2
+    int-to-float v0, v2
 
-    int-to-float v1, v1
+    mul-float v0, v0, p1
 
-    mul-float v1, v1, p1
+    add-float/2addr v1, v0
 
-    add-float/2addr v0, v1
-
-    float-to-int p1, v0
+    float-to-int p1, v1
 
     invoke-virtual {p2, p1}, Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setAlpha(I)V
 
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$5.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$5.smali
index 28158a1519..c9236d9778 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$5.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$5;
 .super Ljava/lang/Object;
+.source "SwipeRefreshLayout.java"
 
 # interfaces
 .implements Landroid/view/animation/Animation$AnimationListener;
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$6.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$6.smali
index 4b59b900cd..bd7f269fa6 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$6.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;
 .super Landroid/view/animation/Animation;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$7.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$7.smali
index c230fd2b1e..da12e52d8f 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$7.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;
 .super Landroid/view/animation/Animation;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$8.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$8.smali
index 34ef188360..aab0f34d82 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$8.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$8.smali
@@ -1,5 +1,6 @@
 .class Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$8;
 .super Landroid/view/animation/Animation;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali
index e5d81e5dc0..d5f93757f7 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback;
 .super Ljava/lang/Object;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener.smali
index 0541dedc5e..82f3e40643 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;
 .super Ljava/lang/Object;
+.source "SwipeRefreshLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.smali b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.smali
index 7ed638ca7b..fbe9b7e7af 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 .super Landroid/view/ViewGroup;
+.source "SwipeRefreshLayout.java"
 
 # interfaces
 .implements Landroidx/core/view/NestedScrollingChild;
@@ -662,8 +663,6 @@
 
     if-lez v5, :cond_0
 
-    iget v5, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCustomSlingshotDistance:I
-
     goto :goto_0
 
     :cond_0
@@ -992,17 +991,17 @@
 .end method
 
 .method private startDragging(F)V
-    .locals 1
+    .locals 3
 
     iget v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mInitialDownY:F
 
     sub-float/2addr p1, v0
 
-    iget v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTouchSlop:I
+    iget v1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTouchSlop:I
 
-    int-to-float v0, v0
+    int-to-float v2, v1
 
-    cmpl-float p1, p1, v0
+    cmpl-float p1, p1, v2
 
     if-lez p1, :cond_0
 
@@ -1010,15 +1009,11 @@
 
     if-nez p1, :cond_0
 
-    iget p1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mInitialDownY:F
+    int-to-float p1, v1
 
-    iget v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTouchSlop:I
+    add-float/2addr v0, p1
 
-    int-to-float v0, v0
-
-    add-float/2addr p1, v0
-
-    iput p1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mInitialMotionY:F
+    iput v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mInitialMotionY:F
 
     const/4 p1, 0x1
 
@@ -1171,14 +1166,12 @@
 
 # virtual methods
 .method public canChildScrollUp()Z
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mChildScrollUpCallback:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mChildScrollUpCallback:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback;
-
     iget-object v1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTarget:Landroid/view/View;
 
     invoke-interface {v0, p0, v1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnChildScrollUpCallback;->canChildScrollUp(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;Landroid/view/View;)Z
@@ -1190,26 +1183,22 @@
     :cond_0
     iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTarget:Landroid/view/View;
 
-    instance-of v0, v0, Landroid/widget/ListView;
+    instance-of v1, v0, Landroid/widget/ListView;
 
-    const/4 v1, -0x1
+    const/4 v2, -0x1
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTarget:Landroid/view/View;
+    if-eqz v1, :cond_1
 
     check-cast v0, Landroid/widget/ListView;
 
-    invoke-static {v0, v1}, Landroidx/core/widget/ListViewCompat;->canScrollList(Landroid/widget/ListView;I)Z
+    invoke-static {v0, v2}, Landroidx/core/widget/ListViewCompat;->canScrollList(Landroid/widget/ListView;I)Z
 
     move-result v0
 
     return v0
 
     :cond_1
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTarget:Landroid/view/View;
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->canScrollVertically(I)Z
+    invoke-virtual {v0, v2}, Landroid/view/View;->canScrollVertically(I)Z
 
     move-result v0
 
@@ -1288,17 +1277,15 @@
 
     if-ne p2, p1, :cond_1
 
-    iget p1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleViewIndex:I
-
-    return p1
+    return v0
 
     :cond_1
-    iget p1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleViewIndex:I
-
-    if-lt p2, p1, :cond_2
+    if-lt p2, v0, :cond_2
 
     add-int/lit8 p2, p2, 0x1
 
+    return p2
+
     :cond_2
     return p2
 .end method
@@ -1372,15 +1359,13 @@
 .end method
 
 .method moveToStart(F)V
-    .locals 3
+    .locals 2
 
     iget v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mFrom:I
 
     iget v1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mOriginalOffsetTop:I
 
-    iget v2, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mFrom:I
-
-    sub-int/2addr v1, v2
+    sub-int/2addr v1, v0
 
     int-to-float v1, v1
 
@@ -1484,8 +1469,6 @@
     return v2
 
     :cond_2
-    iget v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mActivePointerId:I
-
     invoke-virtual {p1, v0}, Landroid/view/MotionEvent;->findPointerIndex(I)I
 
     move-result v0
@@ -1605,8 +1588,6 @@
     return-void
 
     :cond_2
-    iget-object p3, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTarget:Landroid/view/View;
-
     invoke-virtual {p0}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->getPaddingLeft()I
 
     move-result p4
@@ -1669,11 +1650,9 @@
 
     add-int/2addr p1, p2
 
-    iget p2, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCurrentTargetOffsetTop:I
+    add-int/2addr p3, v0
 
-    add-int/2addr p2, p3
-
-    invoke-virtual {p4, p5, v0, p1, p2}, Landroidx/swiperefreshlayout/widget/CircleImageView;->layout(IIII)V
+    invoke-virtual {p4, p5, v0, p1, p3}, Landroidx/swiperefreshlayout/widget/CircleImageView;->layout(IIII)V
 
     return-void
 .end method
@@ -1697,8 +1676,6 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTarget:Landroid/view/View;
-
     invoke-virtual {p0}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->getMeasuredWidth()I
 
     move-result p2
@@ -1814,7 +1791,7 @@
 .end method
 
 .method public onNestedPreScroll(Landroid/view/View;II[I)V
-    .locals 3
+    .locals 4
 
     const/4 p1, 0x0
 
@@ -1824,19 +1801,15 @@
 
     iget v1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalUnconsumed:F
 
-    cmpl-float v1, v1, p1
+    cmpl-float v2, v1, p1
 
-    if-lez v1, :cond_1
+    if-lez v2, :cond_1
 
-    int-to-float v1, p3
+    int-to-float v2, p3
 
-    iget v2, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalUnconsumed:F
+    cmpl-float v3, v2, v1
 
-    cmpl-float v2, v1, v2
-
-    if-lez v2, :cond_0
-
-    iget v1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalUnconsumed:F
+    if-lez v3, :cond_0
 
     float-to-int v1, v1
 
@@ -1849,11 +1822,9 @@
     goto :goto_0
 
     :cond_0
-    iget v2, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalUnconsumed:F
+    sub-float/2addr v1, v2
 
-    sub-float/2addr v2, v1
-
-    iput v2, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalUnconsumed:F
+    iput v1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalUnconsumed:F
 
     aput p3, p4, v0
 
@@ -2039,7 +2010,7 @@
 .end method
 
 .method public onStopNestedScroll(Landroid/view/View;)V
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mNestedScrollingParentHelper:Landroidx/core/view/NestedScrollingParentHelper;
 
@@ -2053,11 +2024,9 @@
 
     const/4 v0, 0x0
 
-    cmpl-float p1, p1, v0
+    cmpl-float v1, p1, v0
 
-    if-lez p1, :cond_0
-
-    iget p1, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalUnconsumed:F
+    if-lez v1, :cond_0
 
     invoke-direct {p0, p1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->finishSpinner(F)V
 
@@ -2296,8 +2265,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTarget:Landroid/view/View;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->isNestedScrollingEnabled(Landroid/view/View;)Z
 
     move-result v0
@@ -2657,7 +2624,6 @@
 
     const/high16 v1, 0x42600000    # 56.0f
 
-    :goto_0
     iget v0, v0, Landroid/util/DisplayMetrics;->density:F
 
     mul-float v0, v0, v1
@@ -2666,14 +2632,20 @@
 
     iput v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleDiameter:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/high16 v1, 0x42200000    # 40.0f
 
-    goto :goto_0
+    iget v0, v0, Landroid/util/DisplayMetrics;->density:F
 
-    :goto_1
+    mul-float v0, v0, v1
+
+    float-to-int v0, v0
+
+    iput v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleDiameter:I
+
+    :goto_0
     iget-object v0, p0, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleView:Landroidx/swiperefreshlayout/widget/CircleImageView;
 
     const/4 v1, 0x0
diff --git a/com.discord/smali/androidx/transition/AnimatorUtils$AnimatorPauseListenerCompat.smali b/com.discord/smali/androidx/transition/AnimatorUtils$AnimatorPauseListenerCompat.smali
index eef1a2747c..d3b2a7c7be 100644
--- a/com.discord/smali/androidx/transition/AnimatorUtils$AnimatorPauseListenerCompat.smali
+++ b/com.discord/smali/androidx/transition/AnimatorUtils$AnimatorPauseListenerCompat.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/AnimatorUtils$AnimatorPauseListenerCompat;
 .super Ljava/lang/Object;
+.source "AnimatorUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/AnimatorUtils.smali b/com.discord/smali/androidx/transition/AnimatorUtils.smali
index ed747dc7fc..e6c90a5b1d 100644
--- a/com.discord/smali/androidx/transition/AnimatorUtils.smali
+++ b/com.discord/smali/androidx/transition/AnimatorUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/AnimatorUtils;
 .super Ljava/lang/Object;
+.source "AnimatorUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ArcMotion.smali b/com.discord/smali/androidx/transition/ArcMotion.smali
index cda48e050d..5297dca0ba 100644
--- a/com.discord/smali/androidx/transition/ArcMotion.smali
+++ b/com.discord/smali/androidx/transition/ArcMotion.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/ArcMotion;
 .super Landroidx/transition/PathMotion;
+.source "ArcMotion.java"
 
 
 # static fields
@@ -291,14 +292,11 @@
     :goto_1
     iget v2, p0, Landroidx/transition/ArcMotion;->mMinimumVerticalTangent:F
 
-    mul-float v2, v2, v6
+    mul-float v8, v6, v2
 
-    iget v8, p0, Landroidx/transition/ArcMotion;->mMinimumVerticalTangent:F
+    mul-float v8, v8, v2
 
-    :goto_2
-    mul-float v2, v2, v8
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_2
     mul-float v0, v0, v4
@@ -313,69 +311,65 @@
 
     move v0, v2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     sub-float v0, p3, v2
 
     move v1, p4
 
-    :goto_3
+    :goto_2
     iget v2, p0, Landroidx/transition/ArcMotion;->mMinimumHorizontalTangent:F
 
-    mul-float v2, v2, v6
+    mul-float v8, v6, v2
 
-    iget v8, p0, Landroidx/transition/ArcMotion;->mMinimumHorizontalTangent:F
+    mul-float v8, v8, v2
 
-    goto :goto_2
-
-    :goto_4
-    sub-float v8, v3, v0
+    :goto_3
+    sub-float v2, v3, v0
 
     sub-float v9, v5, v1
 
-    mul-float v8, v8, v8
+    mul-float v2, v2, v2
 
     mul-float v9, v9, v9
 
-    add-float/2addr v8, v9
+    add-float/2addr v2, v9
 
     iget v9, p0, Landroidx/transition/ArcMotion;->mMaximumTangent:F
 
     mul-float v6, v6, v9
 
-    iget v9, p0, Landroidx/transition/ArcMotion;->mMaximumTangent:F
-
     mul-float v6, v6, v9
 
     const/4 v9, 0x0
 
-    cmpg-float v10, v8, v2
+    cmpg-float v10, v2, v8
 
     if-gez v10, :cond_4
 
-    goto :goto_5
+    move v6, v8
+
+    goto :goto_4
 
     :cond_4
-    cmpl-float v2, v8, v6
+    cmpl-float v8, v2, v6
 
-    if-lez v2, :cond_5
+    if-lez v8, :cond_5
 
-    move v2, v6
-
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
-    const/4 v2, 0x0
+    const/4 v6, 0x0
 
-    :goto_5
-    cmpl-float v6, v2, v9
+    :goto_4
+    cmpl-float v8, v6, v9
 
-    if-eqz v6, :cond_6
+    if-eqz v8, :cond_6
 
-    div-float/2addr v2, v8
+    div-float/2addr v6, v2
 
-    float-to-double v8, v2
+    float-to-double v8, v6
 
     invoke-static {v8, v9}, Ljava/lang/Math;->sqrt(D)D
 
diff --git a/com.discord/smali/androidx/transition/AutoTransition.smali b/com.discord/smali/androidx/transition/AutoTransition.smali
index 8ab4c34e20..bef44f2e81 100644
--- a/com.discord/smali/androidx/transition/AutoTransition.smali
+++ b/com.discord/smali/androidx/transition/AutoTransition.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/AutoTransition;
 .super Landroidx/transition/TransitionSet;
+.source "AutoTransition.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$1.smali b/com.discord/smali/androidx/transition/ChangeBounds$1.smali
index e03dab9337..212d664165 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$1.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeBounds$1;
 .super Landroid/util/Property;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$10.smali b/com.discord/smali/androidx/transition/ChangeBounds$10.smali
index df212b8c7a..694513e6b0 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$10.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$10.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeBounds$10;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$2.smali b/com.discord/smali/androidx/transition/ChangeBounds$2.smali
index 9ca94271f9..916cd5bbf4 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$2.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeBounds$2;
 .super Landroid/util/Property;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$3.smali b/com.discord/smali/androidx/transition/ChangeBounds$3.smali
index c432a53568..bb5e7b3fd2 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$3.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$3.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeBounds$3;
 .super Landroid/util/Property;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$4.smali b/com.discord/smali/androidx/transition/ChangeBounds$4.smali
index fdc0cd26fd..5dc9d167f6 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$4.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$4.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeBounds$4;
 .super Landroid/util/Property;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$5.smali b/com.discord/smali/androidx/transition/ChangeBounds$5.smali
index 57299f4533..82e6011c0c 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$5.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$5.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeBounds$5;
 .super Landroid/util/Property;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$6.smali b/com.discord/smali/androidx/transition/ChangeBounds$6.smali
index 934714ef55..e9d0854939 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$6.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$6.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeBounds$6;
 .super Landroid/util/Property;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$7.smali b/com.discord/smali/androidx/transition/ChangeBounds$7.smali
index 7ab2b81780..343a0f43d3 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$7.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeBounds$7;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$8.smali b/com.discord/smali/androidx/transition/ChangeBounds$8.smali
index 102a83f6c5..ade715c3dd 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$8.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$8.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeBounds$8;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$9.smali b/com.discord/smali/androidx/transition/ChangeBounds$9.smali
index ba8059be10..e91c992818 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$9.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$9.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeBounds$9;
 .super Landroidx/transition/TransitionListenerAdapter;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds$ViewBounds.smali b/com.discord/smali/androidx/transition/ChangeBounds$ViewBounds.smali
index 8bc9359c30..b4259e7061 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds$ViewBounds.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds$ViewBounds.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeBounds$ViewBounds;
 .super Ljava/lang/Object;
+.source "ChangeBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeBounds.smali b/com.discord/smali/androidx/transition/ChangeBounds.smali
index 4f92fa386e..80189c56ea 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/ChangeBounds;
 .super Landroidx/transition/Transition;
+.source "ChangeBounds.java"
 
 
 # annotations
@@ -397,7 +398,7 @@
 
     const/4 v1, 0x1
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     invoke-virtual {p0, p1, v1}, Landroidx/transition/ChangeBounds;->getMatchedTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
 
@@ -419,9 +420,14 @@
     :cond_1
     iget-object p1, v0, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
 
-    if-ne p2, p1, :cond_0
+    if-ne p2, p1, :cond_2
+
+    goto :goto_0
 
     :cond_2
+    const/4 v1, 0x0
+
+    :cond_3
     :goto_0
     return v1
 .end method
@@ -453,7 +459,7 @@
 .end method
 
 .method public createAnimator(Landroid/view/ViewGroup;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
-    .locals 20
+    .locals 18
     .param p1    # Landroid/view/ViewGroup;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -475,7 +481,7 @@
 
     move-object/from16 v1, p3
 
-    if-eqz v0, :cond_1b
+    if-eqz v0, :cond_1c
 
     if-nez v1, :cond_0
 
@@ -502,7 +508,7 @@
 
     check-cast v4, Landroid/view/ViewGroup;
 
-    if-eqz v3, :cond_1a
+    if-eqz v3, :cond_1b
 
     if-nez v4, :cond_1
 
@@ -515,7 +521,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_17
+    if-eqz v3, :cond_18
 
     iget-object v3, v0, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
 
@@ -642,13 +648,13 @@
     add-int/lit8 v1, v1, 0x1
 
     :cond_b
-    if-lez v1, :cond_18
+    if-lez v1, :cond_17
 
-    move-object/from16 v18, v9
+    move-object/from16 p1, v9
 
     iget-boolean v9, v8, Landroidx/transition/ChangeBounds;->mResizeClip:Z
 
-    move-object/from16 v19, v0
+    move-object/from16 p2, v0
 
     const/4 v0, 0x2
 
@@ -682,7 +688,11 @@
 
     sget-object v1, Landroidx/transition/ChangeBounds;->POSITION_PROPERTY:Landroid/util/Property;
 
-    goto :goto_4
+    invoke-static {v9, v1, v0}, Landroidx/transition/ObjectAnimatorUtils;->ofPointF(Ljava/lang/Object;Landroid/util/Property;Landroid/graphics/Path;)Landroid/animation/ObjectAnimator;
+
+    move-result-object v0
+
+    goto/16 :goto_9
 
     :cond_c
     new-instance v1, Landroidx/transition/ChangeBounds$ViewBounds;
@@ -757,7 +767,7 @@
 
     move-object v0, v4
 
-    goto/16 :goto_a
+    goto/16 :goto_9
 
     :cond_d
     if-ne v6, v7, :cond_f
@@ -785,7 +795,11 @@
 
     sget-object v1, Landroidx/transition/ChangeBounds;->BOTTOM_RIGHT_ONLY_PROPERTY:Landroid/util/Property;
 
-    goto :goto_4
+    invoke-static {v9, v1, v0}, Landroidx/transition/ObjectAnimatorUtils;->ofPointF(Ljava/lang/Object;Landroid/util/Property;Landroid/graphics/Path;)Landroid/animation/ObjectAnimator;
+
+    move-result-object v0
+
+    goto/16 :goto_9
 
     :cond_f
     :goto_3
@@ -807,12 +821,11 @@
 
     sget-object v1, Landroidx/transition/ChangeBounds;->TOP_LEFT_ONLY_PROPERTY:Landroid/util/Property;
 
-    :goto_4
     invoke-static {v9, v1, v0}, Landroidx/transition/ObjectAnimatorUtils;->ofPointF(Ljava/lang/Object;Landroid/util/Property;Landroid/graphics/Path;)Landroid/animation/ObjectAnimator;
 
     move-result-object v0
 
-    goto/16 :goto_a
+    goto/16 :goto_9
 
     :cond_10
     move-object/from16 v9, v16
@@ -835,15 +848,15 @@
 
     if-eq v11, v12, :cond_11
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_11
     const/4 v11, 0x0
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_12
-    :goto_5
+    :goto_4
     invoke-virtual/range {p0 .. p0}, Landroidx/transition/ChangeBounds;->getPathMotion()Landroidx/transition/PathMotion;
 
     move-result-object v1
@@ -868,8 +881,8 @@
 
     move-object v11, v1
 
-    :goto_6
-    if-nez v19, :cond_13
+    :goto_5
+    if-nez p2, :cond_13
 
     new-instance v1, Landroid/graphics/Rect;
 
@@ -877,26 +890,26 @@
 
     invoke-direct {v1, v3, v3, v5, v2}, Landroid/graphics/Rect;-><init>(IIII)V
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_13
     const/4 v3, 0x0
 
-    move-object/from16 v1, v19
+    move-object/from16 v1, p2
 
-    :goto_7
-    if-nez v18, :cond_14
+    :goto_6
+    if-nez p1, :cond_14
 
     new-instance v2, Landroid/graphics/Rect;
 
     invoke-direct {v2, v3, v3, v10, v4}, Landroid/graphics/Rect;-><init>(IIII)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_14
-    move-object/from16 v2, v18
+    move-object/from16 v2, p1
 
-    :goto_8
+    :goto_7
     invoke-virtual {v1, v2}, Landroid/graphics/Rect;->equals(Ljava/lang/Object;)Z
 
     move-result v4
@@ -929,7 +942,7 @@
 
     move-object v2, v9
 
-    move-object/from16 v3, v18
+    move-object/from16 v3, p1
 
     move v4, v7
 
@@ -943,17 +956,17 @@
 
     invoke-virtual {v10, v13}, Landroid/animation/ObjectAnimator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_15
     const/4 v10, 0x0
 
-    :goto_9
+    :goto_8
     invoke-static {v11, v10}, Landroidx/transition/TransitionUtils;->mergeAnimators(Landroid/animation/Animator;Landroid/animation/Animator;)Landroid/animation/Animator;
 
     move-result-object v0
 
-    :goto_a
+    :goto_9
     invoke-virtual {v9}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v1
@@ -982,6 +995,11 @@
     return-object v0
 
     :cond_17
+    const/4 v0, 0x0
+
+    goto :goto_a
+
+    :cond_18
     iget-object v2, v0, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
 
     const-string v3, "android:changeBounds:windowX"
@@ -1038,18 +1056,19 @@
 
     move-result v1
 
-    if-ne v2, v3, :cond_19
+    if-ne v2, v3, :cond_1a
 
-    if-eq v0, v1, :cond_18
+    if-eq v0, v1, :cond_19
 
     goto :goto_b
 
-    :cond_18
+    :cond_19
     const/4 v0, 0x0
 
+    :goto_a
     return-object v0
 
-    :cond_19
+    :cond_1a
     :goto_b
     iget-object v4, v8, Landroidx/transition/ChangeBounds;->mTempLocation:[I
 
@@ -1103,32 +1122,26 @@
 
     const/4 v11, 0x0
 
-    aget v10, v10, v11
+    aget v12, v10, v11
 
-    sub-int/2addr v2, v10
+    sub-int/2addr v2, v12
 
     int-to-float v2, v2
 
-    iget-object v10, v8, Landroidx/transition/ChangeBounds;->mTempLocation:[I
-
     const/4 v12, 0x1
 
-    aget v10, v10, v12
+    aget v13, v10, v12
 
-    sub-int/2addr v0, v10
+    sub-int/2addr v0, v13
 
     int-to-float v0, v0
 
-    iget-object v10, v8, Landroidx/transition/ChangeBounds;->mTempLocation:[I
+    aget v13, v10, v11
 
-    aget v10, v10, v11
-
-    sub-int/2addr v3, v10
+    sub-int/2addr v3, v13
 
     int-to-float v3, v3
 
-    iget-object v10, v8, Landroidx/transition/ChangeBounds;->mTempLocation:[I
-
     aget v10, v10, v12
 
     sub-int/2addr v1, v10
@@ -1173,13 +1186,13 @@
 
     return-object v10
 
-    :cond_1a
+    :cond_1b
     :goto_c
     const/4 v0, 0x0
 
     return-object v0
 
-    :cond_1b
+    :cond_1c
     :goto_d
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/androidx/transition/ChangeClipBounds$1.smali b/com.discord/smali/androidx/transition/ChangeClipBounds$1.smali
index 44dd511e15..65178349c6 100644
--- a/com.discord/smali/androidx/transition/ChangeClipBounds$1.smali
+++ b/com.discord/smali/androidx/transition/ChangeClipBounds$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeClipBounds$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ChangeClipBounds.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeClipBounds.smali b/com.discord/smali/androidx/transition/ChangeClipBounds.smali
index f0183e2394..6559307258 100644
--- a/com.discord/smali/androidx/transition/ChangeClipBounds.smali
+++ b/com.discord/smali/androidx/transition/ChangeClipBounds.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/ChangeClipBounds;
 .super Landroidx/transition/Transition;
+.source "ChangeClipBounds.java"
 
 
 # static fields
@@ -132,9 +133,9 @@
 
     const/4 p1, 0x0
 
-    if-eqz p2, :cond_6
+    if-eqz p2, :cond_7
 
-    if-eqz p3, :cond_6
+    if-eqz p3, :cond_7
 
     iget-object v0, p2, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
 
@@ -144,7 +145,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_7
 
     iget-object v0, p3, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
 
@@ -179,9 +180,9 @@
 
     check-cast v1, Landroid/graphics/Rect;
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-nez v1, :cond_1
 
@@ -262,9 +263,9 @@
 
     new-array v6, v6, [Landroid/graphics/Rect;
 
-    aput-object v0, v6, v2
+    aput-object v0, v6, v3
 
-    aput-object v1, v6, v3
+    aput-object v1, v6, v2
 
     invoke-static {p2, v5, p1, v6}, Landroid/animation/ObjectAnimator;->ofObject(Ljava/lang/Object;Landroid/util/Property;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/ObjectAnimator;
 
@@ -281,6 +282,9 @@
     invoke-virtual {p1, p3}, Landroid/animation/ObjectAnimator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
     :cond_6
+    return-object p1
+
+    :cond_7
     :goto_2
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/transition/ChangeImageTransform$1.smali b/com.discord/smali/androidx/transition/ChangeImageTransform$1.smali
index d5a0f295bb..b0876e709c 100644
--- a/com.discord/smali/androidx/transition/ChangeImageTransform$1.smali
+++ b/com.discord/smali/androidx/transition/ChangeImageTransform$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeImageTransform$1;
 .super Ljava/lang/Object;
+.source "ChangeImageTransform.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
diff --git a/com.discord/smali/androidx/transition/ChangeImageTransform$2.smali b/com.discord/smali/androidx/transition/ChangeImageTransform$2.smali
index 5bac8237e6..7c5017a867 100644
--- a/com.discord/smali/androidx/transition/ChangeImageTransform$2.smali
+++ b/com.discord/smali/androidx/transition/ChangeImageTransform$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeImageTransform$2;
 .super Landroid/util/Property;
+.source "ChangeImageTransform.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeImageTransform$3.smali b/com.discord/smali/androidx/transition/ChangeImageTransform$3.smali
index f77947d974..c1de42550c 100644
--- a/com.discord/smali/androidx/transition/ChangeImageTransform$3.smali
+++ b/com.discord/smali/androidx/transition/ChangeImageTransform$3.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/transition/ChangeImageTransform$3;
 .super Ljava/lang/Object;
+.source "ChangeImageTransform.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeImageTransform.smali b/com.discord/smali/androidx/transition/ChangeImageTransform.smali
index 44d1cb0ddb..84c3609961 100644
--- a/com.discord/smali/androidx/transition/ChangeImageTransform.smali
+++ b/com.discord/smali/androidx/transition/ChangeImageTransform.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/ChangeImageTransform;
 .super Landroidx/transition/Transition;
+.source "ChangeImageTransform.java"
 
 
 # static fields
@@ -153,6 +154,8 @@
 
     invoke-interface {p1, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -419,11 +422,11 @@
 
     const/4 p1, 0x0
 
-    if-eqz p2, :cond_a
+    if-eqz p2, :cond_b
 
     if-nez p3, :cond_0
 
-    goto/16 :goto_3
+    goto/16 :goto_4
 
     :cond_0
     iget-object v0, p2, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
@@ -565,6 +568,10 @@
     :cond_a
     :goto_3
     return-object p1
+
+    :cond_b
+    :goto_4
+    return-object p1
 .end method
 
 .method public getTransitionProperties()[Ljava/lang/String;
diff --git a/com.discord/smali/androidx/transition/ChangeScroll.smali b/com.discord/smali/androidx/transition/ChangeScroll.smali
index 9053a552af..7b527af4cf 100644
--- a/com.discord/smali/androidx/transition/ChangeScroll.smali
+++ b/com.discord/smali/androidx/transition/ChangeScroll.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/ChangeScroll;
 .super Landroidx/transition/Transition;
+.source "ChangeScroll.java"
 
 
 # static fields
@@ -248,6 +249,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_3
     :goto_1
     return-object p1
diff --git a/com.discord/smali/androidx/transition/ChangeTransform$1.smali b/com.discord/smali/androidx/transition/ChangeTransform$1.smali
index 183a2f0b55..67e3d0a184 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform$1.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeTransform$1;
 .super Landroid/util/Property;
+.source "ChangeTransform.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeTransform$2.smali b/com.discord/smali/androidx/transition/ChangeTransform$2.smali
index d6c90fbdab..270412d901 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform$2.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ChangeTransform$2;
 .super Landroid/util/Property;
+.source "ChangeTransform.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeTransform$3.smali b/com.discord/smali/androidx/transition/ChangeTransform$3.smali
index b199759f37..c462cb76a6 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform$3.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeTransform$3;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ChangeTransform.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali b/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali
index c8d2084c44..799080a34c 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeTransform$GhostListener;
 .super Landroidx/transition/TransitionListenerAdapter;
+.source "ChangeTransform.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ChangeTransform$PathAnimatorMatrix.smali b/com.discord/smali/androidx/transition/ChangeTransform$PathAnimatorMatrix.smali
index 5172350a9a..a40c4d0cfe 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform$PathAnimatorMatrix.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform$PathAnimatorMatrix.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeTransform$PathAnimatorMatrix;
 .super Ljava/lang/Object;
+.source "ChangeTransform.java"
 
 
 # annotations
@@ -51,11 +52,9 @@
 
     const/4 p2, 0x2
 
-    aget p1, p1, p2
+    aget p2, p1, p2
 
-    iput p1, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mTranslationX:F
-
-    iget-object p1, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mValues:[F
+    iput p2, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mTranslationX:F
 
     const/4 p2, 0x5
 
@@ -79,19 +78,15 @@
 
     aput v1, v0, v2
 
-    iget-object v0, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mValues:[F
-
     iget v1, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mTranslationY:F
 
     const/4 v2, 0x5
 
     aput v1, v0, v2
 
-    iget-object v0, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mMatrix:Landroid/graphics/Matrix;
+    iget-object v1, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mMatrix:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mValues:[F
-
-    invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->setValues([F)V
+    invoke-virtual {v1, v0}, Landroid/graphics/Matrix;->setValues([F)V
 
     iget-object v0, p0, Landroidx/transition/ChangeTransform$PathAnimatorMatrix;->mView:Landroid/view/View;
 
diff --git a/com.discord/smali/androidx/transition/ChangeTransform$Transforms.smali b/com.discord/smali/androidx/transition/ChangeTransform$Transforms.smali
index aa9a406366..2f3b1f0af7 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform$Transforms.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform$Transforms.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ChangeTransform$Transforms;
 .super Ljava/lang/Object;
+.source "ChangeTransform.java"
 
 
 # annotations
@@ -177,7 +178,7 @@
 .end method
 
 .method public hashCode()I
-    .locals 4
+    .locals 5
 
     iget v0, p0, Landroidx/transition/ChangeTransform$Transforms;->mTranslationX:F
 
@@ -185,11 +186,9 @@
 
     const/4 v2, 0x0
 
-    cmpl-float v0, v0, v2
+    cmpl-float v3, v0, v2
 
-    if-eqz v0, :cond_0
-
-    iget v0, p0, Landroidx/transition/ChangeTransform$Transforms;->mTranslationX:F
+    if-eqz v3, :cond_0
 
     invoke-static {v0}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -205,11 +204,9 @@
 
     iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mTranslationY:F
 
-    cmpl-float v3, v3, v2
+    cmpl-float v4, v3, v2
 
-    if-eqz v3, :cond_1
-
-    iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mTranslationY:F
+    if-eqz v4, :cond_1
 
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -227,11 +224,9 @@
 
     iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mTranslationZ:F
 
-    cmpl-float v3, v3, v2
+    cmpl-float v4, v3, v2
 
-    if-eqz v3, :cond_2
-
-    iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mTranslationZ:F
+    if-eqz v4, :cond_2
 
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -249,11 +244,9 @@
 
     iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mScaleX:F
 
-    cmpl-float v3, v3, v2
+    cmpl-float v4, v3, v2
 
-    if-eqz v3, :cond_3
-
-    iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mScaleX:F
+    if-eqz v4, :cond_3
 
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -271,11 +264,9 @@
 
     iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mScaleY:F
 
-    cmpl-float v3, v3, v2
+    cmpl-float v4, v3, v2
 
-    if-eqz v3, :cond_4
-
-    iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mScaleY:F
+    if-eqz v4, :cond_4
 
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -293,11 +284,9 @@
 
     iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mRotationX:F
 
-    cmpl-float v3, v3, v2
+    cmpl-float v4, v3, v2
 
-    if-eqz v3, :cond_5
-
-    iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mRotationX:F
+    if-eqz v4, :cond_5
 
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -315,11 +304,9 @@
 
     iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mRotationY:F
 
-    cmpl-float v3, v3, v2
+    cmpl-float v4, v3, v2
 
-    if-eqz v3, :cond_6
-
-    iget v3, p0, Landroidx/transition/ChangeTransform$Transforms;->mRotationY:F
+    if-eqz v4, :cond_6
 
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -341,9 +328,7 @@
 
     if-eqz v2, :cond_7
 
-    iget v1, p0, Landroidx/transition/ChangeTransform$Transforms;->mRotationZ:F
-
-    invoke-static {v1}, Ljava/lang/Float;->floatToIntBits(F)I
+    invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/transition/ChangeTransform.smali b/com.discord/smali/androidx/transition/ChangeTransform.smali
index c9bd733f54..c3449211e2 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/ChangeTransform;
 .super Landroidx/transition/Transition;
+.source "ChangeTransform.java"
 
 
 # annotations
@@ -444,9 +445,14 @@
 
     sget-object v0, Landroidx/transition/MatrixUtils;->IDENTITY_MATRIX:Landroid/graphics/Matrix;
 
+    move-object v4, v0
+
+    goto :goto_0
+
     :cond_1
     move-object v4, v0
 
+    :goto_0
     invoke-virtual {p1, v4}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
     move-result v0
@@ -582,7 +588,7 @@
 
     if-nez v0, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0, p1, v1}, Landroidx/transition/ChangeTransform;->getMatchedTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
@@ -595,19 +601,18 @@
 
     if-ne p2, p1, :cond_2
 
-    :goto_0
     const/4 v2, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    :goto_1
+    :goto_0
     if-ne p1, p2, :cond_2
 
-    goto :goto_0
+    const/4 v2, 0x1
 
     :cond_2
-    :goto_2
+    :goto_1
     return v2
 .end method
 
diff --git a/com.discord/smali/androidx/transition/CircularPropagation.smali b/com.discord/smali/androidx/transition/CircularPropagation.smali
index 941e6053cc..f86ed542d8 100644
--- a/com.discord/smali/androidx/transition/CircularPropagation.smali
+++ b/com.discord/smali/androidx/transition/CircularPropagation.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/CircularPropagation;
 .super Landroidx/transition/VisibilityPropagation;
+.source "CircularPropagation.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/transition/Explode.smali b/com.discord/smali/androidx/transition/Explode.smali
index 0dd1a66d1d..f1e8ea883c 100644
--- a/com.discord/smali/androidx/transition/Explode.smali
+++ b/com.discord/smali/androidx/transition/Explode.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/Explode;
 .super Landroidx/transition/Visibility;
+.source "Explode.java"
 
 
 # static fields
@@ -142,13 +143,11 @@
 
     const/4 v3, 0x0
 
-    aget v2, v2, v3
-
-    iget-object v4, v0, Landroidx/transition/Explode;->mTempLoc:[I
+    aget v4, v2, v3
 
     const/4 v5, 0x1
 
-    aget v4, v4, v5
+    aget v2, v2, v5
 
     invoke-virtual {p0}, Landroidx/transition/Explode;->getEpicenter()Landroid/graphics/Rect;
 
@@ -162,7 +161,7 @@
 
     div-int/lit8 v6, v6, 0x2
 
-    add-int/2addr v6, v2
+    add-int/2addr v6, v4
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getTranslationX()F
 
@@ -180,7 +179,7 @@
 
     div-int/lit8 v7, v7, 0x2
 
-    add-int/2addr v7, v4
+    add-int/2addr v7, v2
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getTranslationY()F
 
@@ -269,9 +268,9 @@
 
     div-float/2addr v9, v10
 
-    sub-int/2addr v6, v2
+    sub-int/2addr v6, v4
 
-    sub-int/2addr v7, v4
+    sub-int/2addr v7, v2
 
     invoke-static {v1, v6, v7}, Landroidx/transition/Explode;->calculateMaxDistance(Landroid/view/View;II)F
 
@@ -309,25 +308,23 @@
 
     const/4 v2, 0x0
 
-    aget v1, v1, v2
-
-    iget-object v2, p0, Landroidx/transition/Explode;->mTempLoc:[I
+    aget v2, v1, v2
 
     const/4 v3, 0x1
 
-    aget v2, v2, v3
+    aget v1, v1, v3
 
     invoke-virtual {v0}, Landroid/view/View;->getWidth()I
 
     move-result v3
 
-    add-int/2addr v3, v1
+    add-int/2addr v3, v2
 
     invoke-virtual {v0}, Landroid/view/View;->getHeight()I
 
     move-result v0
 
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     iget-object p1, p1, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
 
@@ -335,7 +332,7 @@
 
     new-instance v5, Landroid/graphics/Rect;
 
-    invoke-direct {v5, v1, v2, v3, v0}, Landroid/graphics/Rect;-><init>(IIII)V
+    invoke-direct {v5, v2, v1, v3, v0}, Landroid/graphics/Rect;-><init>(IIII)V
 
     invoke-interface {p1, v4, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -408,13 +405,11 @@
 
     const/4 v0, 0x0
 
-    aget p1, p1, v0
+    aget v0, p1, v0
 
-    int-to-float p1, p1
+    int-to-float v0, v0
 
-    add-float v4, v6, p1
-
-    iget-object p1, p0, Landroidx/transition/Explode;->mTempLoc:[I
+    add-float v4, v6, v0
 
     const/4 v0, 0x1
 
@@ -529,13 +524,11 @@
 
     iget-object p1, p0, Landroidx/transition/Explode;->mTempLoc:[I
 
-    aget p1, p1, v6
+    aget p4, p1, v6
 
-    int-to-float p1, p1
+    int-to-float p4, p4
 
-    add-float v6, v7, p1
-
-    iget-object p1, p0, Landroidx/transition/Explode;->mTempLoc:[I
+    add-float v6, v7, p4
 
     aget p1, p1, v1
 
diff --git a/com.discord/smali/androidx/transition/Fade$1.smali b/com.discord/smali/androidx/transition/Fade$1.smali
index 7d9e28f398..736e62e4eb 100644
--- a/com.discord/smali/androidx/transition/Fade$1.smali
+++ b/com.discord/smali/androidx/transition/Fade$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Fade$1;
 .super Landroidx/transition/TransitionListenerAdapter;
+.source "Fade.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Fade$FadeAnimatorListener.smali b/com.discord/smali/androidx/transition/Fade$FadeAnimatorListener.smali
index 860932f3ad..72bbe2eaff 100644
--- a/com.discord/smali/androidx/transition/Fade$FadeAnimatorListener.smali
+++ b/com.discord/smali/androidx/transition/Fade$FadeAnimatorListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Fade$FadeAnimatorListener;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "Fade.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Fade.smali b/com.discord/smali/androidx/transition/Fade.smali
index 07bb07dc9a..4b1e4398f8 100644
--- a/com.discord/smali/androidx/transition/Fade.smali
+++ b/com.discord/smali/androidx/transition/Fade.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/Fade;
 .super Landroidx/transition/Visibility;
+.source "Fade.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/FloatArrayEvaluator.smali b/com.discord/smali/androidx/transition/FloatArrayEvaluator.smali
index fb5b205ef5..d3b0b50435 100644
--- a/com.discord/smali/androidx/transition/FloatArrayEvaluator.smali
+++ b/com.discord/smali/androidx/transition/FloatArrayEvaluator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/FloatArrayEvaluator;
 .super Ljava/lang/Object;
+.source "FloatArrayEvaluator.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
diff --git a/com.discord/smali/androidx/transition/FragmentTransitionSupport$1.smali b/com.discord/smali/androidx/transition/FragmentTransitionSupport$1.smali
index a5a526dfc4..7a281d27e9 100644
--- a/com.discord/smali/androidx/transition/FragmentTransitionSupport$1.smali
+++ b/com.discord/smali/androidx/transition/FragmentTransitionSupport$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/FragmentTransitionSupport$1;
 .super Landroidx/transition/Transition$EpicenterCallback;
+.source "FragmentTransitionSupport.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/FragmentTransitionSupport$2.smali b/com.discord/smali/androidx/transition/FragmentTransitionSupport$2.smali
index 6b17ba33a3..b6a6c308c5 100644
--- a/com.discord/smali/androidx/transition/FragmentTransitionSupport$2.smali
+++ b/com.discord/smali/androidx/transition/FragmentTransitionSupport$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/FragmentTransitionSupport$2;
 .super Ljava/lang/Object;
+.source "FragmentTransitionSupport.java"
 
 # interfaces
 .implements Landroidx/transition/Transition$TransitionListener;
diff --git a/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali b/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali
index 5ea6a60e1d..f346c7dab8 100644
--- a/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali
+++ b/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/FragmentTransitionSupport$3;
 .super Ljava/lang/Object;
+.source "FragmentTransitionSupport.java"
 
 # interfaces
 .implements Landroidx/transition/Transition$TransitionListener;
@@ -110,39 +111,33 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Landroidx/transition/FragmentTransitionSupport$3;->this$0:Landroidx/transition/FragmentTransitionSupport;
-
-    iget-object v1, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$enterTransition:Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/transition/FragmentTransitionSupport$3;->this$0:Landroidx/transition/FragmentTransitionSupport;
 
     iget-object v2, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$enteringViews:Ljava/util/ArrayList;
 
-    invoke-virtual {p1, v1, v2, v0}, Landroidx/transition/FragmentTransitionSupport;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
+    invoke-virtual {v1, p1, v2, v0}, Landroidx/transition/FragmentTransitionSupport;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
 
     :cond_0
     iget-object p1, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$exitTransition:Ljava/lang/Object;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/transition/FragmentTransitionSupport$3;->this$0:Landroidx/transition/FragmentTransitionSupport;
-
-    iget-object v1, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$exitTransition:Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/transition/FragmentTransitionSupport$3;->this$0:Landroidx/transition/FragmentTransitionSupport;
 
     iget-object v2, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$exitingViews:Ljava/util/ArrayList;
 
-    invoke-virtual {p1, v1, v2, v0}, Landroidx/transition/FragmentTransitionSupport;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
+    invoke-virtual {v1, p1, v2, v0}, Landroidx/transition/FragmentTransitionSupport;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
 
     :cond_1
     iget-object p1, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$sharedElementTransition:Ljava/lang/Object;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/transition/FragmentTransitionSupport$3;->this$0:Landroidx/transition/FragmentTransitionSupport;
-
-    iget-object v1, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$sharedElementTransition:Ljava/lang/Object;
+    iget-object v1, p0, Landroidx/transition/FragmentTransitionSupport$3;->this$0:Landroidx/transition/FragmentTransitionSupport;
 
     iget-object v2, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$sharedElementsIn:Ljava/util/ArrayList;
 
-    invoke-virtual {p1, v1, v2, v0}, Landroidx/transition/FragmentTransitionSupport;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
+    invoke-virtual {v1, p1, v2, v0}, Landroidx/transition/FragmentTransitionSupport;->replaceTargets(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V
 
     :cond_2
     return-void
diff --git a/com.discord/smali/androidx/transition/FragmentTransitionSupport$4.smali b/com.discord/smali/androidx/transition/FragmentTransitionSupport$4.smali
index 6fa72c8d0b..c376ed3cc6 100644
--- a/com.discord/smali/androidx/transition/FragmentTransitionSupport$4.smali
+++ b/com.discord/smali/androidx/transition/FragmentTransitionSupport$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/FragmentTransitionSupport$4;
 .super Landroidx/transition/Transition$EpicenterCallback;
+.source "FragmentTransitionSupport.java"
 
 
 # annotations
@@ -45,8 +46,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/transition/FragmentTransitionSupport$4;->val$epicenter:Landroid/graphics/Rect;
-
     invoke-virtual {p1}, Landroid/graphics/Rect;->isEmpty()Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali b/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali
index 01cbaca44c..9f16c1fbde 100644
--- a/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali
+++ b/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/FragmentTransitionSupport;
 .super Landroidx/fragment/app/FragmentTransitionImpl;
+.source "FragmentTransitionSupport.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/GhostViewApi14$1.smali b/com.discord/smali/androidx/transition/GhostViewApi14$1.smali
index 1ebbc956cc..afdb8166aa 100644
--- a/com.discord/smali/androidx/transition/GhostViewApi14$1.smali
+++ b/com.discord/smali/androidx/transition/GhostViewApi14$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/GhostViewApi14$1;
 .super Ljava/lang/Object;
+.source "GhostViewApi14.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnPreDrawListener;
@@ -38,9 +39,7 @@
 
     iget-object v0, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
 
-    iget-object v1, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
-    iget-object v1, v1, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
+    iget-object v1, v0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
 
     invoke-virtual {v1}, Landroid/view/View;->getMatrix()Landroid/graphics/Matrix;
 
@@ -86,8 +85,6 @@
 
     iput-object v1, v0, Landroidx/transition/GhostViewApi14;->mStartParent:Landroid/view/ViewGroup;
 
-    iget-object v0, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
     iput-object v1, v0, Landroidx/transition/GhostViewApi14;->mStartView:Landroid/view/View;
 
     :cond_0
diff --git a/com.discord/smali/androidx/transition/GhostViewApi14.smali b/com.discord/smali/androidx/transition/GhostViewApi14.smali
index 88d0750a72..6d43412d05 100644
--- a/com.discord/smali/androidx/transition/GhostViewApi14.smali
+++ b/com.discord/smali/androidx/transition/GhostViewApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/GhostViewApi14;
 .super Landroid/view/View;
+.source "GhostViewApi14.java"
 
 # interfaces
 .implements Landroidx/transition/GhostViewImpl;
diff --git a/com.discord/smali/androidx/transition/GhostViewApi21.smali b/com.discord/smali/androidx/transition/GhostViewApi21.smali
index d6b422b217..3ddc2f04f1 100644
--- a/com.discord/smali/androidx/transition/GhostViewApi21.smali
+++ b/com.discord/smali/androidx/transition/GhostViewApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/GhostViewApi21;
 .super Ljava/lang/Object;
+.source "GhostViewApi21.java"
 
 # interfaces
 .implements Landroidx/transition/GhostViewImpl;
@@ -65,9 +66,7 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    new-instance v0, Landroidx/transition/GhostViewApi21;
-
-    sget-object v2, Landroidx/transition/GhostViewApi21;->sAddGhostMethod:Ljava/lang/reflect/Method;
+    new-instance v2, Landroidx/transition/GhostViewApi21;
 
     const/4 v3, 0x3
 
@@ -85,18 +84,18 @@
 
     aput-object p2, v3, p0
 
-    invoke-virtual {v2, v1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
     check-cast p0, Landroid/view/View;
 
-    invoke-direct {v0, p0}, Landroidx/transition/GhostViewApi21;-><init>(Landroid/view/View;)V
+    invoke-direct {v2, p0}, Landroidx/transition/GhostViewApi21;-><init>(Landroid/view/View;)V
     :try_end_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object v2
 
     :catch_0
     move-exception p0
@@ -279,13 +278,11 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/GhostViewApi21;->sRemoveGhostMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x0
 
     const/4 v2, 0x1
 
+    :try_start_0
     new-array v2, v2, [Ljava/lang/Object;
 
     const/4 v3, 0x0
@@ -313,6 +310,8 @@
     throw v0
 
     :catch_1
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/androidx/transition/GhostViewImpl.smali b/com.discord/smali/androidx/transition/GhostViewImpl.smali
index c41a2c3f23..a9063956d1 100644
--- a/com.discord/smali/androidx/transition/GhostViewImpl.smali
+++ b/com.discord/smali/androidx/transition/GhostViewImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/GhostViewImpl;
 .super Ljava/lang/Object;
+.source "GhostViewImpl.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/transition/GhostViewUtils.smali b/com.discord/smali/androidx/transition/GhostViewUtils.smali
index 691ec89245..875ad533c1 100644
--- a/com.discord/smali/androidx/transition/GhostViewUtils.smali
+++ b/com.discord/smali/androidx/transition/GhostViewUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/GhostViewUtils;
 .super Ljava/lang/Object;
+.source "GhostViewUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/ImageViewUtils$1.smali b/com.discord/smali/androidx/transition/ImageViewUtils$1.smali
index 41be996db7..85540dd77e 100644
--- a/com.discord/smali/androidx/transition/ImageViewUtils$1.smali
+++ b/com.discord/smali/androidx/transition/ImageViewUtils$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ImageViewUtils$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ImageViewUtils.java"
 
 
 # annotations
@@ -61,11 +62,9 @@
 
     iget-object v0, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
 
-    iget-object v1, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
+    sget v1, Landroidx/transition/R$id;->save_image_matrix:I
 
-    sget v2, Landroidx/transition/R$id;->save_image_matrix:I
-
-    invoke-virtual {v1, v2}, Landroid/widget/ImageView;->getTag(I)Ljava/lang/Object;
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->getTag(I)Ljava/lang/Object;
 
     move-result-object v1
 
diff --git a/com.discord/smali/androidx/transition/ImageViewUtils.smali b/com.discord/smali/androidx/transition/ImageViewUtils.smali
index 6581a4f1f1..2206c37e86 100644
--- a/com.discord/smali/androidx/transition/ImageViewUtils.smali
+++ b/com.discord/smali/androidx/transition/ImageViewUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ImageViewUtils;
 .super Ljava/lang/Object;
+.source "ImageViewUtils.java"
 
 
 # static fields
@@ -39,11 +40,9 @@
 
     if-eqz v0, :cond_1
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ImageViewUtils;->sAnimateTransformMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -71,6 +70,8 @@
     throw p1
 
     :catch_1
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/androidx/transition/MatrixUtils$1.smali b/com.discord/smali/androidx/transition/MatrixUtils$1.smali
index 4d4123b29b..69c668bf84 100644
--- a/com.discord/smali/androidx/transition/MatrixUtils$1.smali
+++ b/com.discord/smali/androidx/transition/MatrixUtils$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/MatrixUtils$1;
 .super Landroid/graphics/Matrix;
+.source "MatrixUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/MatrixUtils.smali b/com.discord/smali/androidx/transition/MatrixUtils.smali
index 5a651ff1f5..88d1bb5b4c 100644
--- a/com.discord/smali/androidx/transition/MatrixUtils.smali
+++ b/com.discord/smali/androidx/transition/MatrixUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/MatrixUtils;
 .super Ljava/lang/Object;
+.source "MatrixUtils.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/transition/ObjectAnimatorUtils.smali b/com.discord/smali/androidx/transition/ObjectAnimatorUtils.smali
index bbe958cfb6..64922072f9 100644
--- a/com.discord/smali/androidx/transition/ObjectAnimatorUtils.smali
+++ b/com.discord/smali/androidx/transition/ObjectAnimatorUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ObjectAnimatorUtils;
 .super Ljava/lang/Object;
+.source "ObjectAnimatorUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/PathMotion.smali b/com.discord/smali/androidx/transition/PathMotion.smali
index fbd075af1a..794b87d93c 100644
--- a/com.discord/smali/androidx/transition/PathMotion.smali
+++ b/com.discord/smali/androidx/transition/PathMotion.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/transition/PathMotion;
 .super Ljava/lang/Object;
+.source "PathMotion.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/PathProperty.smali b/com.discord/smali/androidx/transition/PathProperty.smali
index 309d7dbe6d..544170a54f 100644
--- a/com.discord/smali/androidx/transition/PathProperty.smali
+++ b/com.discord/smali/androidx/transition/PathProperty.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/PathProperty;
 .super Landroid/util/Property;
+.source "PathProperty.java"
 
 
 # annotations
@@ -163,13 +164,9 @@
 
     const/4 v1, 0x0
 
-    aget v0, v0, v1
+    aget v1, v0, v1
 
-    iput v0, p2, Landroid/graphics/PointF;->x:F
-
-    iget-object p2, p0, Landroidx/transition/PathProperty;->mPointF:Landroid/graphics/PointF;
-
-    iget-object v0, p0, Landroidx/transition/PathProperty;->mPosition:[F
+    iput v1, p2, Landroid/graphics/PointF;->x:F
 
     const/4 v1, 0x1
 
@@ -177,11 +174,9 @@
 
     iput v0, p2, Landroid/graphics/PointF;->y:F
 
-    iget-object p2, p0, Landroidx/transition/PathProperty;->mProperty:Landroid/util/Property;
+    iget-object v0, p0, Landroidx/transition/PathProperty;->mProperty:Landroid/util/Property;
 
-    iget-object v0, p0, Landroidx/transition/PathProperty;->mPointF:Landroid/graphics/PointF;
-
-    invoke-virtual {p2, p1, v0}, Landroid/util/Property;->set(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-virtual {v0, p1, p2}, Landroid/util/Property;->set(Ljava/lang/Object;Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/transition/PatternPathMotion.smali b/com.discord/smali/androidx/transition/PatternPathMotion.smali
index 61b4cec12c..5ee784fc4e 100644
--- a/com.discord/smali/androidx/transition/PatternPathMotion.smali
+++ b/com.discord/smali/androidx/transition/PatternPathMotion.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/PatternPathMotion;
 .super Landroidx/transition/PathMotion;
+.source "PatternPathMotion.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/transition/PropertyValuesHolderUtils.smali b/com.discord/smali/androidx/transition/PropertyValuesHolderUtils.smali
index e34ac42f51..5a5c30605e 100644
--- a/com.discord/smali/androidx/transition/PropertyValuesHolderUtils.smali
+++ b/com.discord/smali/androidx/transition/PropertyValuesHolderUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/PropertyValuesHolderUtils;
 .super Ljava/lang/Object;
+.source "PropertyValuesHolderUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$attr.smali b/com.discord/smali/androidx/transition/R$attr.smali
index ef35eb0caf..edabf2cf99 100644
--- a/com.discord/smali/androidx/transition/R$attr.smali
+++ b/com.discord/smali/androidx/transition/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$color.smali b/com.discord/smali/androidx/transition/R$color.smali
index 372fc23e2c..8a7aeeb9b2 100644
--- a/com.discord/smali/androidx/transition/R$color.smali
+++ b/com.discord/smali/androidx/transition/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$dimen.smali b/com.discord/smali/androidx/transition/R$dimen.smali
index 25d8024685..5e113affa3 100644
--- a/com.discord/smali/androidx/transition/R$dimen.smali
+++ b/com.discord/smali/androidx/transition/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index 92eeed2283..55ac29f8f9 100644
--- a/com.discord/smali/androidx/transition/R$drawable.smali
+++ b/com.discord/smali/androidx/transition/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index 00208af0f2..9e9ccb1ce9 100644
--- a/com.discord/smali/androidx/transition/R$id.smali
+++ b/com.discord/smali/androidx/transition/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$integer.smali b/com.discord/smali/androidx/transition/R$integer.smali
index f2dfabb0d2..bfc17037a9 100644
--- a/com.discord/smali/androidx/transition/R$integer.smali
+++ b/com.discord/smali/androidx/transition/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$layout.smali b/com.discord/smali/androidx/transition/R$layout.smali
index 89fa8c6396..eb3f71da29 100644
--- a/com.discord/smali/androidx/transition/R$layout.smali
+++ b/com.discord/smali/androidx/transition/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index c259e03500..225be8cabc 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$style.smali b/com.discord/smali/androidx/transition/R$style.smali
index 568f51849f..ac9fda41b8 100644
--- a/com.discord/smali/androidx/transition/R$style.smali
+++ b/com.discord/smali/androidx/transition/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R$styleable.smali b/com.discord/smali/androidx/transition/R$styleable.smali
index adbd8e2962..ed600486ce 100644
--- a/com.discord/smali/androidx/transition/R$styleable.smali
+++ b/com.discord/smali/androidx/transition/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/R.smali b/com.discord/smali/androidx/transition/R.smali
index 2a7a6ed304..cb6c47e914 100644
--- a/com.discord/smali/androidx/transition/R.smali
+++ b/com.discord/smali/androidx/transition/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/transition/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/RectEvaluator.smali b/com.discord/smali/androidx/transition/RectEvaluator.smali
index f6e2e1f35f..a8ba673035 100644
--- a/com.discord/smali/androidx/transition/RectEvaluator.smali
+++ b/com.discord/smali/androidx/transition/RectEvaluator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/RectEvaluator;
 .super Ljava/lang/Object;
+.source "RectEvaluator.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
@@ -119,8 +120,6 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Landroidx/transition/RectEvaluator;->mRect:Landroid/graphics/Rect;
-
     invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Rect;->set(IIII)V
 
     iget-object p1, p0, Landroidx/transition/RectEvaluator;->mRect:Landroid/graphics/Rect;
diff --git a/com.discord/smali/androidx/transition/Scene.smali b/com.discord/smali/androidx/transition/Scene.smali
index c38fd600da..cdb300d878 100644
--- a/com.discord/smali/androidx/transition/Scene.smali
+++ b/com.discord/smali/androidx/transition/Scene.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/Scene;
 .super Ljava/lang/Object;
+.source "Scene.java"
 
 
 # instance fields
@@ -208,8 +209,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/transition/Scene;->mEnterAction:Ljava/lang/Runnable;
-
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
     :cond_3
@@ -235,8 +234,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Scene;->mExitAction:Ljava/lang/Runnable;
-
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/transition/SidePropagation.smali b/com.discord/smali/androidx/transition/SidePropagation.smali
index d269e3d2ef..e346b2a16c 100644
--- a/com.discord/smali/androidx/transition/SidePropagation.smali
+++ b/com.discord/smali/androidx/transition/SidePropagation.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/SidePropagation;
 .super Landroidx/transition/VisibilityPropagation;
+.source "SidePropagation.java"
 
 
 # instance fields
@@ -40,7 +41,7 @@
 
     const v5, 0x800003
 
-    if-ne v0, v5, :cond_3
+    if-ne v0, v5, :cond_2
 
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I
 
@@ -54,22 +55,18 @@
     const/4 v4, 0x0
 
     :goto_0
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_1
+
+    const/4 v0, 0x5
+
+    goto :goto_2
 
     :cond_1
-    const/4 p1, 0x5
+    const/4 v0, 0x3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
-    :goto_1
-    const/4 p1, 0x3
-
-    goto :goto_3
-
-    :cond_3
-    iget v0, p0, Landroidx/transition/SidePropagation;->mSide:I
-
     const v5, 0x800005
 
     if-ne v0, v5, :cond_5
@@ -78,35 +75,38 @@
 
     move-result p1
 
-    if-ne p1, v4, :cond_4
+    if-ne p1, v4, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v4, 0x0
+
+    :goto_1
+    if-eqz v4, :cond_4
+
+    const/4 v0, 0x3
 
     goto :goto_2
 
     :cond_4
-    const/4 v4, 0x0
-
-    :goto_2
-    if-eqz v4, :cond_1
-
-    goto :goto_1
+    const/4 v0, 0x5
 
     :cond_5
-    iget p1, p0, Landroidx/transition/SidePropagation;->mSide:I
+    :goto_2
+    if-eq v0, v2, :cond_9
 
-    :goto_3
-    if-eq p1, v2, :cond_9
+    if-eq v0, v1, :cond_8
 
-    if-eq p1, v1, :cond_8
+    const/16 p1, 0x30
 
-    const/16 p5, 0x30
+    if-eq v0, p1, :cond_7
 
-    if-eq p1, p5, :cond_7
+    const/16 p1, 0x50
 
-    const/16 p5, 0x50
+    if-eq v0, p1, :cond_6
 
-    if-eq p1, p5, :cond_6
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     sub-int/2addr p3, p7
@@ -119,7 +119,7 @@
 
     add-int v3, p3, p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     sub-int/2addr p9, p3
@@ -132,7 +132,7 @@
 
     add-int v3, p9, p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     sub-int/2addr p2, p6
@@ -145,7 +145,7 @@
 
     add-int v3, p2, p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_9
     sub-int/2addr p8, p2
@@ -158,7 +158,7 @@
 
     add-int v3, p8, p1
 
-    :goto_4
+    :goto_3
     return v3
 .end method
 
@@ -200,7 +200,7 @@
 
 # virtual methods
 .method public getStartDelay(Landroid/view/ViewGroup;Landroidx/transition/Transition;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)J
-    .locals 17
+    .locals 16
 
     move-object/from16 v10, p0
 
@@ -217,17 +217,17 @@
     :cond_0
     invoke-virtual/range {p2 .. p2}, Landroidx/transition/Transition;->getEpicenter()Landroid/graphics/Rect;
 
-    move-result-object v2
+    move-result-object v1
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
     if-eqz p4, :cond_2
 
     invoke-virtual {v10, v0}, Landroidx/transition/SidePropagation;->getViewVisibility(Landroidx/transition/TransitionValues;)I
 
-    move-result v4
+    move-result v3
 
-    if-nez v4, :cond_1
+    if-nez v3, :cond_1
 
     goto :goto_0
 
@@ -240,30 +240,30 @@
 
     :cond_2
     :goto_0
-    const/4 v1, -0x1
+    const/4 v3, -0x1
 
     const/4 v13, -0x1
 
     :goto_1
     invoke-virtual {v10, v0}, Landroidx/transition/SidePropagation;->getViewX(Landroidx/transition/TransitionValues;)I
 
-    move-result v4
+    move-result v3
 
     invoke-virtual {v10, v0}, Landroidx/transition/SidePropagation;->getViewY(Landroidx/transition/TransitionValues;)I
 
-    move-result v5
+    move-result v4
 
     const/4 v0, 0x2
 
-    new-array v1, v0, [I
+    new-array v5, v0, [I
 
     move-object/from16 v14, p1
 
-    invoke-virtual {v14, v1}, Landroid/view/ViewGroup;->getLocationOnScreen([I)V
+    invoke-virtual {v14, v5}, Landroid/view/ViewGroup;->getLocationOnScreen([I)V
 
     const/4 v6, 0x0
 
-    aget v6, v1, v6
+    aget v6, v5, v6
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/ViewGroup;->getTranslationX()F
 
@@ -275,43 +275,43 @@
 
     add-int/2addr v6, v7
 
-    aget v1, v1, v3
+    aget v2, v5, v2
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/ViewGroup;->getTranslationY()F
 
-    move-result v3
+    move-result v5
 
-    invoke-static {v3}, Ljava/lang/Math;->round(F)I
+    invoke-static {v5}, Ljava/lang/Math;->round(F)I
 
-    move-result v3
+    move-result v5
 
-    add-int v7, v1, v3
+    add-int v7, v2, v5
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/ViewGroup;->getWidth()I
 
-    move-result v1
+    move-result v2
 
-    add-int v8, v6, v1
+    add-int v8, v6, v2
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/ViewGroup;->getHeight()I
 
-    move-result v1
+    move-result v2
 
-    add-int v9, v7, v1
+    add-int v9, v7, v2
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
-    invoke-virtual {v2}, Landroid/graphics/Rect;->centerX()I
+    invoke-virtual {v1}, Landroid/graphics/Rect;->centerX()I
 
     move-result v0
 
-    invoke-virtual {v2}, Landroid/graphics/Rect;->centerY()I
+    invoke-virtual {v1}, Landroid/graphics/Rect;->centerY()I
 
     move-result v1
 
-    move v15, v0
+    move v5, v0
 
-    move/from16 v16, v1
+    move v15, v1
 
     goto :goto_2
 
@@ -324,22 +324,22 @@
 
     div-int/2addr v2, v0
 
-    move v15, v1
+    move v5, v1
 
-    move/from16 v16, v2
+    move v15, v2
 
     :goto_2
     move-object/from16 v0, p0
 
     move-object/from16 v1, p1
 
-    move v2, v4
+    move v2, v3
 
-    move v3, v5
+    move v3, v4
 
-    move v4, v15
+    move v4, v5
 
-    move/from16 v5, v16
+    move v5, v15
 
     invoke-direct/range {v0 .. v9}, Landroidx/transition/SidePropagation;->distance(Landroid/view/View;IIIIIIII)I
 
diff --git a/com.discord/smali/androidx/transition/Slide$1.smali b/com.discord/smali/androidx/transition/Slide$1.smali
index 161fea3363..803bca2e1e 100644
--- a/com.discord/smali/androidx/transition/Slide$1.smali
+++ b/com.discord/smali/androidx/transition/Slide$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/Slide$1;
 .super Landroidx/transition/Slide$CalculateSlideHorizontal;
+.source "Slide.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Slide$2.smali b/com.discord/smali/androidx/transition/Slide$2.smali
index badb966e16..1aed93d6ca 100644
--- a/com.discord/smali/androidx/transition/Slide$2.smali
+++ b/com.discord/smali/androidx/transition/Slide$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/Slide$2;
 .super Landroidx/transition/Slide$CalculateSlideHorizontal;
+.source "Slide.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Slide$3.smali b/com.discord/smali/androidx/transition/Slide$3.smali
index d33d3cf6b5..46700e9cb5 100644
--- a/com.discord/smali/androidx/transition/Slide$3.smali
+++ b/com.discord/smali/androidx/transition/Slide$3.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/Slide$3;
 .super Landroidx/transition/Slide$CalculateSlideVertical;
+.source "Slide.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Slide$4.smali b/com.discord/smali/androidx/transition/Slide$4.smali
index ef48c5fcd6..2fe7e1ce82 100644
--- a/com.discord/smali/androidx/transition/Slide$4.smali
+++ b/com.discord/smali/androidx/transition/Slide$4.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/Slide$4;
 .super Landroidx/transition/Slide$CalculateSlideHorizontal;
+.source "Slide.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Slide$5.smali b/com.discord/smali/androidx/transition/Slide$5.smali
index 25629ec67a..654ef9730c 100644
--- a/com.discord/smali/androidx/transition/Slide$5.smali
+++ b/com.discord/smali/androidx/transition/Slide$5.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/Slide$5;
 .super Landroidx/transition/Slide$CalculateSlideHorizontal;
+.source "Slide.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Slide$6.smali b/com.discord/smali/androidx/transition/Slide$6.smali
index c73aa37b33..b76fe45564 100644
--- a/com.discord/smali/androidx/transition/Slide$6.smali
+++ b/com.discord/smali/androidx/transition/Slide$6.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/Slide$6;
 .super Landroidx/transition/Slide$CalculateSlideVertical;
+.source "Slide.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Slide$CalculateSlide.smali b/com.discord/smali/androidx/transition/Slide$CalculateSlide.smali
index 3a1dd9a730..e6e606f42d 100644
--- a/com.discord/smali/androidx/transition/Slide$CalculateSlide.smali
+++ b/com.discord/smali/androidx/transition/Slide$CalculateSlide.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Slide$CalculateSlide;
 .super Ljava/lang/Object;
+.source "Slide.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Slide$CalculateSlideHorizontal.smali b/com.discord/smali/androidx/transition/Slide$CalculateSlideHorizontal.smali
index 918c4cad6c..f17a5e4d1c 100644
--- a/com.discord/smali/androidx/transition/Slide$CalculateSlideHorizontal.smali
+++ b/com.discord/smali/androidx/transition/Slide$CalculateSlideHorizontal.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/transition/Slide$CalculateSlideHorizontal;
 .super Ljava/lang/Object;
+.source "Slide.java"
 
 # interfaces
 .implements Landroidx/transition/Slide$CalculateSlide;
diff --git a/com.discord/smali/androidx/transition/Slide$CalculateSlideVertical.smali b/com.discord/smali/androidx/transition/Slide$CalculateSlideVertical.smali
index 4e56798929..d34af271da 100644
--- a/com.discord/smali/androidx/transition/Slide$CalculateSlideVertical.smali
+++ b/com.discord/smali/androidx/transition/Slide$CalculateSlideVertical.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/transition/Slide$CalculateSlideVertical;
 .super Ljava/lang/Object;
+.source "Slide.java"
 
 # interfaces
 .implements Landroidx/transition/Slide$CalculateSlide;
diff --git a/com.discord/smali/androidx/transition/Slide$GravityFlag.smali b/com.discord/smali/androidx/transition/Slide$GravityFlag.smali
index ab74ec4d6a..8b61c85c60 100644
--- a/com.discord/smali/androidx/transition/Slide$GravityFlag.smali
+++ b/com.discord/smali/androidx/transition/Slide$GravityFlag.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/transition/Slide$GravityFlag;
 .super Ljava/lang/Object;
+.source "Slide.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/transition/Slide.smali b/com.discord/smali/androidx/transition/Slide.smali
index b4f89689e5..77afcf7ca8 100644
--- a/com.discord/smali/androidx/transition/Slide.smali
+++ b/com.discord/smali/androidx/transition/Slide.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/Slide;
 .super Landroidx/transition/Visibility;
+.source "Slide.java"
 
 
 # annotations
@@ -375,6 +376,8 @@
 
     sget-object v0, Landroidx/transition/Slide;->sCalculateEnd:Landroidx/transition/Slide$CalculateSlide;
 
+    iput-object v0, p0, Landroidx/transition/Slide;->mSlideCalculator:Landroidx/transition/Slide$CalculateSlide;
+
     goto :goto_0
 
     :cond_0
@@ -389,29 +392,37 @@
     :cond_1
     sget-object v0, Landroidx/transition/Slide;->sCalculateStart:Landroidx/transition/Slide$CalculateSlide;
 
+    iput-object v0, p0, Landroidx/transition/Slide;->mSlideCalculator:Landroidx/transition/Slide$CalculateSlide;
+
     goto :goto_0
 
     :cond_2
     sget-object v0, Landroidx/transition/Slide;->sCalculateBottom:Landroidx/transition/Slide$CalculateSlide;
 
+    iput-object v0, p0, Landroidx/transition/Slide;->mSlideCalculator:Landroidx/transition/Slide$CalculateSlide;
+
     goto :goto_0
 
     :cond_3
     sget-object v0, Landroidx/transition/Slide;->sCalculateTop:Landroidx/transition/Slide$CalculateSlide;
 
+    iput-object v0, p0, Landroidx/transition/Slide;->mSlideCalculator:Landroidx/transition/Slide$CalculateSlide;
+
     goto :goto_0
 
     :cond_4
     sget-object v0, Landroidx/transition/Slide;->sCalculateRight:Landroidx/transition/Slide$CalculateSlide;
 
+    iput-object v0, p0, Landroidx/transition/Slide;->mSlideCalculator:Landroidx/transition/Slide$CalculateSlide;
+
     goto :goto_0
 
     :cond_5
     sget-object v0, Landroidx/transition/Slide;->sCalculateLeft:Landroidx/transition/Slide$CalculateSlide;
 
-    :goto_0
     iput-object v0, p0, Landroidx/transition/Slide;->mSlideCalculator:Landroidx/transition/Slide$CalculateSlide;
 
+    :goto_0
     iput p1, p0, Landroidx/transition/Slide;->mSlideEdge:I
 
     new-instance v0, Landroidx/transition/SidePropagation;
diff --git a/com.discord/smali/androidx/transition/Styleable$ArcMotion.smali b/com.discord/smali/androidx/transition/Styleable$ArcMotion.smali
index f8c425b0e1..81142c50a3 100644
--- a/com.discord/smali/androidx/transition/Styleable$ArcMotion.smali
+++ b/com.discord/smali/androidx/transition/Styleable$ArcMotion.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$ArcMotion;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$ChangeBounds.smali b/com.discord/smali/androidx/transition/Styleable$ChangeBounds.smali
index d3e1468d72..4c65e37609 100644
--- a/com.discord/smali/androidx/transition/Styleable$ChangeBounds.smali
+++ b/com.discord/smali/androidx/transition/Styleable$ChangeBounds.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$ChangeBounds;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$ChangeTransform.smali b/com.discord/smali/androidx/transition/Styleable$ChangeTransform.smali
index 9a7321a115..1c972f34df 100644
--- a/com.discord/smali/androidx/transition/Styleable$ChangeTransform.smali
+++ b/com.discord/smali/androidx/transition/Styleable$ChangeTransform.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$ChangeTransform;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$Fade.smali b/com.discord/smali/androidx/transition/Styleable$Fade.smali
index 9c4eab9073..55d811971a 100644
--- a/com.discord/smali/androidx/transition/Styleable$Fade.smali
+++ b/com.discord/smali/androidx/transition/Styleable$Fade.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$Fade;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$PatternPathMotion.smali b/com.discord/smali/androidx/transition/Styleable$PatternPathMotion.smali
index 8d71cad530..1282a1dd74 100644
--- a/com.discord/smali/androidx/transition/Styleable$PatternPathMotion.smali
+++ b/com.discord/smali/androidx/transition/Styleable$PatternPathMotion.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$PatternPathMotion;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$Slide.smali b/com.discord/smali/androidx/transition/Styleable$Slide.smali
index 93be8e1319..0281eb54cd 100644
--- a/com.discord/smali/androidx/transition/Styleable$Slide.smali
+++ b/com.discord/smali/androidx/transition/Styleable$Slide.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$Slide;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$Transition.smali b/com.discord/smali/androidx/transition/Styleable$Transition.smali
index 02fc36aaa3..15542a0b18 100644
--- a/com.discord/smali/androidx/transition/Styleable$Transition.smali
+++ b/com.discord/smali/androidx/transition/Styleable$Transition.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$Transition;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$TransitionManager.smali b/com.discord/smali/androidx/transition/Styleable$TransitionManager.smali
index a7ae4056fc..9d705ab3d1 100644
--- a/com.discord/smali/androidx/transition/Styleable$TransitionManager.smali
+++ b/com.discord/smali/androidx/transition/Styleable$TransitionManager.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$TransitionManager;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$TransitionSet.smali b/com.discord/smali/androidx/transition/Styleable$TransitionSet.smali
index 8306128d2f..83119386d6 100644
--- a/com.discord/smali/androidx/transition/Styleable$TransitionSet.smali
+++ b/com.discord/smali/androidx/transition/Styleable$TransitionSet.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$TransitionSet;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$TransitionTarget.smali b/com.discord/smali/androidx/transition/Styleable$TransitionTarget.smali
index ca1eaf3d26..5dcb1434a0 100644
--- a/com.discord/smali/androidx/transition/Styleable$TransitionTarget.smali
+++ b/com.discord/smali/androidx/transition/Styleable$TransitionTarget.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$TransitionTarget;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable$VisibilityTransition.smali b/com.discord/smali/androidx/transition/Styleable$VisibilityTransition.smali
index 88bd9cb176..e07c6e3bdb 100644
--- a/com.discord/smali/androidx/transition/Styleable$VisibilityTransition.smali
+++ b/com.discord/smali/androidx/transition/Styleable$VisibilityTransition.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/Styleable$VisibilityTransition;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Styleable.smali b/com.discord/smali/androidx/transition/Styleable.smali
index b341a60df2..892e972951 100644
--- a/com.discord/smali/androidx/transition/Styleable.smali
+++ b/com.discord/smali/androidx/transition/Styleable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Styleable;
 .super Ljava/lang/Object;
+.source "Styleable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition$1.smali b/com.discord/smali/androidx/transition/Transition$1.smali
index e9d76893ec..7ec69dd986 100644
--- a/com.discord/smali/androidx/transition/Transition$1.smali
+++ b/com.discord/smali/androidx/transition/Transition$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/Transition$1;
 .super Landroidx/transition/PathMotion;
+.source "Transition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition$2.smali b/com.discord/smali/androidx/transition/Transition$2.smali
index 2473e2c89e..dc6a4d4e0f 100644
--- a/com.discord/smali/androidx/transition/Transition$2.smali
+++ b/com.discord/smali/androidx/transition/Transition$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Transition$2;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "Transition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition$3.smali b/com.discord/smali/androidx/transition/Transition$3.smali
index 6d56fc3936..6c09c8481b 100644
--- a/com.discord/smali/androidx/transition/Transition$3.smali
+++ b/com.discord/smali/androidx/transition/Transition$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Transition$3;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "Transition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition$AnimationInfo.smali b/com.discord/smali/androidx/transition/Transition$AnimationInfo.smali
index 840fd89d96..a7e8cc682c 100644
--- a/com.discord/smali/androidx/transition/Transition$AnimationInfo.smali
+++ b/com.discord/smali/androidx/transition/Transition$AnimationInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Transition$AnimationInfo;
 .super Ljava/lang/Object;
+.source "Transition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition$ArrayListManager.smali b/com.discord/smali/androidx/transition/Transition$ArrayListManager.smali
index 39d0df6ea4..25160cbc35 100644
--- a/com.discord/smali/androidx/transition/Transition$ArrayListManager.smali
+++ b/com.discord/smali/androidx/transition/Transition$ArrayListManager.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Transition$ArrayListManager;
 .super Ljava/lang/Object;
+.source "Transition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition$EpicenterCallback.smali b/com.discord/smali/androidx/transition/Transition$EpicenterCallback.smali
index 851fae76de..88a11c5bfe 100644
--- a/com.discord/smali/androidx/transition/Transition$EpicenterCallback.smali
+++ b/com.discord/smali/androidx/transition/Transition$EpicenterCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/transition/Transition$EpicenterCallback;
 .super Ljava/lang/Object;
+.source "Transition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition$MatchOrder.smali b/com.discord/smali/androidx/transition/Transition$MatchOrder.smali
index 578a6a8976..ba4d5bbb53 100644
--- a/com.discord/smali/androidx/transition/Transition$MatchOrder.smali
+++ b/com.discord/smali/androidx/transition/Transition$MatchOrder.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/transition/Transition$MatchOrder;
 .super Ljava/lang/Object;
+.source "Transition.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/transition/Transition$TransitionListener.smali b/com.discord/smali/androidx/transition/Transition$TransitionListener.smali
index 34d5d066ba..6e23aaf2bb 100644
--- a/com.discord/smali/androidx/transition/Transition$TransitionListener.smali
+++ b/com.discord/smali/androidx/transition/Transition$TransitionListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/transition/Transition$TransitionListener;
 .super Ljava/lang/Object;
+.source "Transition.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Transition.smali b/com.discord/smali/androidx/transition/Transition.smali
index 0cfa7b51c0..21f4b30822 100644
--- a/com.discord/smali/androidx/transition/Transition.smali
+++ b/com.discord/smali/androidx/transition/Transition.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/transition/Transition;
 .super Ljava/lang/Object;
+.source "Transition.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
@@ -870,8 +871,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetIdExcludes:Ljava/util/ArrayList;
-
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
@@ -889,8 +888,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetExcludes:Ljava/util/ArrayList;
-
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
 
     move-result v1
@@ -906,8 +903,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetTypeExcludes:Ljava/util/ArrayList;
-
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
     move-result v1
@@ -973,18 +968,17 @@
 
     iget-object v3, p0, Landroidx/transition/Transition;->mStartValues:Landroidx/transition/TransitionValuesMaps;
 
-    :goto_2
     invoke-static {v3, p1, v1}, Landroidx/transition/Transition;->addViewValues(Landroidx/transition/TransitionValuesMaps;Landroid/view/View;Landroidx/transition/TransitionValues;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     iget-object v3, p0, Landroidx/transition/Transition;->mEndValues:Landroidx/transition/TransitionValuesMaps;
 
-    goto :goto_2
+    invoke-static {v3, p1, v1}, Landroidx/transition/Transition;->addViewValues(Landroidx/transition/TransitionValuesMaps;Landroid/view/View;Landroidx/transition/TransitionValues;)V
 
     :cond_7
-    :goto_3
+    :goto_2
     instance-of v1, p1, Landroid/view/ViewGroup;
 
     if-eqz v1, :cond_c
@@ -993,8 +987,6 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetIdChildExcludes:Ljava/util/ArrayList;
-
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
@@ -1012,8 +1004,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mTargetChildExcludes:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
 
     move-result v0
@@ -1027,15 +1017,13 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mTargetTypeChildExcludes:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
 
     const/4 v1, 0x0
 
-    :goto_4
+    :goto_3
     if-ge v1, v0, :cond_b
 
     iget-object v3, p0, Landroidx/transition/Transition;->mTargetTypeChildExcludes:Ljava/util/ArrayList;
@@ -1057,12 +1045,12 @@
     :cond_a
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_b
     check-cast p1, Landroid/view/ViewGroup;
 
-    :goto_5
+    :goto_4
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getChildCount()I
 
     move-result v0
@@ -1077,7 +1065,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_c
     return-void
@@ -1735,11 +1723,9 @@
     :goto_0
     iget-object v3, p0, Landroidx/transition/Transition;->mMatchOrder:[I
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v2, v3, :cond_0
-
-    iget-object v3, p0, Landroidx/transition/Transition;->mMatchOrder:[I
+    if-ge v2, v4, :cond_0
 
     aget v3, v3, v2
 
@@ -2198,8 +2184,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mListeners:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -2347,8 +2331,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mTargetNames:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
 
     move-result v0
@@ -2360,8 +2342,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mTargetTypes:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
 
     move-result v0
@@ -2373,7 +2353,7 @@
     :cond_2
     invoke-direct {p0, p1, p2}, Landroidx/transition/Transition;->captureHierarchy(Landroid/view/View;Z)V
 
-    goto/16 :goto_9
+    goto/16 :goto_7
 
     :cond_3
     :goto_0
@@ -2432,18 +2412,17 @@
 
     iget-object v4, p0, Landroidx/transition/Transition;->mStartValues:Landroidx/transition/TransitionValuesMaps;
 
-    :goto_3
     invoke-static {v4, v2, v3}, Landroidx/transition/Transition;->addViewValues(Landroidx/transition/TransitionValuesMaps;Landroid/view/View;Landroidx/transition/TransitionValues;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     iget-object v4, p0, Landroidx/transition/Transition;->mEndValues:Landroidx/transition/TransitionValuesMaps;
 
-    goto :goto_3
+    invoke-static {v4, v2, v3}, Landroidx/transition/Transition;->addViewValues(Landroidx/transition/TransitionValuesMaps;Landroid/view/View;Landroidx/transition/TransitionValues;)V
 
     :cond_6
-    :goto_4
+    :goto_3
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_1
@@ -2451,7 +2430,7 @@
     :cond_7
     const/4 p1, 0x0
 
-    :goto_5
+    :goto_4
     iget-object v0, p0, Landroidx/transition/Transition;->mTargets:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
@@ -2478,12 +2457,12 @@
 
     invoke-virtual {p0, v2}, Landroidx/transition/Transition;->captureStartValues(Landroidx/transition/TransitionValues;)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_8
     invoke-virtual {p0, v2}, Landroidx/transition/Transition;->captureEndValues(Landroidx/transition/TransitionValues;)V
 
-    :goto_6
+    :goto_5
     iget-object v3, v2, Landroidx/transition/TransitionValues;->mTargetedTransitions:Ljava/util/ArrayList;
 
     invoke-virtual {v3, p0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
@@ -2494,31 +2473,28 @@
 
     iget-object v3, p0, Landroidx/transition/Transition;->mStartValues:Landroidx/transition/TransitionValuesMaps;
 
-    :goto_7
     invoke-static {v3, v0, v2}, Landroidx/transition/Transition;->addViewValues(Landroidx/transition/TransitionValuesMaps;Landroid/view/View;Landroidx/transition/TransitionValues;)V
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_9
     iget-object v3, p0, Landroidx/transition/Transition;->mEndValues:Landroidx/transition/TransitionValuesMaps;
 
-    goto :goto_7
+    invoke-static {v3, v0, v2}, Landroidx/transition/Transition;->addViewValues(Landroidx/transition/TransitionValuesMaps;Landroid/view/View;Landroidx/transition/TransitionValues;)V
 
-    :goto_8
+    :goto_6
     add-int/lit8 p1, p1, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_a
-    :goto_9
+    :goto_7
     if-nez p2, :cond_d
 
     iget-object p1, p0, Landroidx/transition/Transition;->mNameOverrides:Landroidx/collection/ArrayMap;
 
     if-eqz p1, :cond_d
 
-    iget-object p1, p0, Landroidx/transition/Transition;->mNameOverrides:Landroidx/collection/ArrayMap;
-
     invoke-virtual {p1}, Landroidx/collection/ArrayMap;->size()I
 
     move-result p1
@@ -2529,7 +2505,7 @@
 
     const/4 v0, 0x0
 
-    :goto_a
+    :goto_8
     if-ge v0, p1, :cond_b
 
     iget-object v2, p0, Landroidx/transition/Transition;->mNameOverrides:Landroidx/collection/ArrayMap;
@@ -2552,10 +2528,10 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_b
-    :goto_b
+    :goto_9
     if-ge v1, p1, :cond_d
 
     invoke-virtual {p2, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -2583,7 +2559,7 @@
     :cond_c
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_d
     return-void
@@ -2608,7 +2584,6 @@
 
     iget-object p1, p0, Landroidx/transition/Transition;->mStartValues:Landroidx/transition/TransitionValuesMaps;
 
-    :goto_0
     iget-object p1, p1, Landroidx/transition/TransitionValuesMaps;->mItemIdValues:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {p1}, Landroidx/collection/LongSparseArray;->clear()V
@@ -2630,7 +2605,11 @@
 
     iget-object p1, p0, Landroidx/transition/Transition;->mEndValues:Landroidx/transition/TransitionValuesMaps;
 
-    goto :goto_0
+    iget-object p1, p1, Landroidx/transition/TransitionValuesMaps;->mItemIdValues:Landroidx/collection/LongSparseArray;
+
+    invoke-virtual {p1}, Landroidx/collection/LongSparseArray;->clear()V
+
+    return-void
 .end method
 
 .method public clone()Landroidx/transition/Transition;
@@ -2756,7 +2735,7 @@
     const/4 v12, 0x0
 
     :goto_0
-    if-ge v12, v10, :cond_d
+    if-ge v12, v10, :cond_10
 
     move-object/from16 v13, p4
 
@@ -2811,7 +2790,7 @@
 
     move/from16 v18, v12
 
-    goto/16 :goto_7
+    goto/16 :goto_9
 
     :cond_3
     :goto_1
@@ -2837,15 +2816,15 @@
     const/4 v5, 0x1
 
     :goto_3
-    if-eqz v5, :cond_2
+    if-eqz v5, :cond_e
 
     invoke-virtual {v6, v7, v2, v3}, Landroidx/transition/Transition;->createAnimator(Landroid/view/ViewGroup;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
 
     move-result-object v5
 
-    if-eqz v5, :cond_2
+    if-eqz v5, :cond_d
 
-    if-eqz v3, :cond_a
+    if-eqz v3, :cond_b
 
     iget-object v15, v3, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
 
@@ -2853,13 +2832,13 @@
 
     move-result-object v4
 
-    if-eqz v15, :cond_8
+    if-eqz v15, :cond_9
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_9
 
     array-length v11, v4
 
-    if-lez v11, :cond_8
+    if-lez v11, :cond_9
 
     new-instance v11, Landroidx/transition/TransitionValues;
 
@@ -2881,7 +2860,7 @@
 
     check-cast v5, Landroidx/transition/TransitionValues;
 
-    if-eqz v5, :cond_6
+    if-eqz v5, :cond_7
 
     const/4 v10, 0x0
 
@@ -2921,14 +2900,20 @@
     :cond_6
     move/from16 v18, v12
 
+    goto :goto_5
+
+    :cond_7
+    move/from16 v18, v12
+
+    :goto_5
     invoke-virtual {v8}, Landroidx/collection/ArrayMap;->size()I
 
     move-result v4
 
     const/4 v5, 0x0
 
-    :goto_5
-    if-ge v5, v4, :cond_9
+    :goto_6
+    if-ge v5, v4, :cond_a
 
     invoke-virtual {v8, v5}, Landroidx/collection/ArrayMap;->keyAt(I)Ljava/lang/Object;
 
@@ -2944,11 +2929,11 @@
 
     iget-object v12, v10, Landroidx/transition/Transition$AnimationInfo;->mValues:Landroidx/transition/TransitionValues;
 
-    if-eqz v12, :cond_7
+    if-eqz v12, :cond_8
 
     iget-object v12, v10, Landroidx/transition/Transition$AnimationInfo;->mView:Landroid/view/View;
 
-    if-ne v12, v15, :cond_7
+    if-ne v12, v15, :cond_8
 
     iget-object v12, v10, Landroidx/transition/Transition$AnimationInfo;->mName:Ljava/lang/String;
 
@@ -2960,7 +2945,7 @@
 
     move-result v12
 
-    if-eqz v12, :cond_7
+    if-eqz v12, :cond_8
 
     iget-object v10, v10, Landroidx/transition/Transition$AnimationInfo;->mValues:Landroidx/transition/TransitionValues;
 
@@ -2968,20 +2953,20 @@
 
     move-result v10
 
-    if-eqz v10, :cond_7
+    if-eqz v10, :cond_8
 
     move-object v5, v11
 
     const/4 v10, 0x0
 
-    goto :goto_6
-
-    :cond_7
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_5
+    goto :goto_7
 
     :cond_8
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_6
+
+    :cond_9
     move-object/from16 v17, v5
 
     move/from16 v16, v10
@@ -2990,14 +2975,14 @@
 
     const/4 v11, 0x0
 
-    :cond_9
+    :cond_a
     move-object v5, v11
 
     move-object/from16 v10, v17
 
-    goto :goto_6
+    goto :goto_7
 
-    :cond_a
+    :cond_b
     move-object/from16 v17, v5
 
     move/from16 v16, v10
@@ -3012,14 +2997,12 @@
 
     const/4 v5, 0x0
 
-    :goto_6
-    if-eqz v10, :cond_c
+    :goto_7
+    if-eqz v10, :cond_f
 
     iget-object v4, v6, Landroidx/transition/Transition;->mPropagation:Landroidx/transition/TransitionPropagation;
 
-    if-eqz v4, :cond_b
-
-    iget-object v4, v6, Landroidx/transition/Transition;->mPropagation:Landroidx/transition/TransitionPropagation;
+    if-eqz v4, :cond_c
 
     invoke-virtual {v4, v7, v6, v2, v3}, Landroidx/transition/TransitionPropagation;->getStartDelay(Landroid/view/ViewGroup;Landroidx/transition/Transition;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)J
 
@@ -3039,9 +3022,14 @@
 
     move-result-wide v0
 
-    :cond_b
     move-wide v11, v0
 
+    goto :goto_8
+
+    :cond_c
+    move-wide v11, v0
+
+    :goto_8
     new-instance v13, Landroidx/transition/Transition$AnimationInfo;
 
     invoke-virtual/range {p0 .. p0}, Landroidx/transition/Transition;->getName()Ljava/lang/String;
@@ -3068,29 +3056,43 @@
 
     move-wide v0, v11
 
-    :cond_c
-    :goto_7
+    goto :goto_9
+
+    :cond_d
+    move/from16 v16, v10
+
+    move/from16 v18, v12
+
+    goto :goto_9
+
+    :cond_e
+    move/from16 v16, v10
+
+    move/from16 v18, v12
+
+    :cond_f
+    :goto_9
     add-int/lit8 v12, v18, 0x1
 
     move/from16 v10, v16
 
     goto/16 :goto_0
 
-    :cond_d
+    :cond_10
     const-wide/16 v2, 0x0
 
     cmp-long v4, v0, v2
 
-    if-eqz v4, :cond_e
+    if-eqz v4, :cond_11
 
     const/4 v2, 0x0
 
-    :goto_8
+    :goto_a
     invoke-virtual {v9}, Landroid/util/SparseIntArray;->size()I
 
     move-result v3
 
-    if-ge v2, v3, :cond_e
+    if-ge v2, v3, :cond_11
 
     invoke-virtual {v9, v2}, Landroid/util/SparseIntArray;->keyAt(I)I
 
@@ -3122,9 +3124,9 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_8
+    goto :goto_a
 
-    :cond_e
+    :cond_11
     return-void
 .end method
 
@@ -3154,8 +3156,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mListeners:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -3490,8 +3490,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Landroidx/transition/Transition;->mEpicenterCallback:Landroidx/transition/Transition$EpicenterCallback;
-
     invoke-virtual {v0, p0}, Landroidx/transition/Transition$EpicenterCallback;->onGetEpicenter(Landroidx/transition/Transition;)Landroid/graphics/Rect;
 
     move-result-object v0
@@ -3526,8 +3524,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mParent:Landroidx/transition/TransitionSet;
-
     invoke-virtual {v0, p1, p2}, Landroidx/transition/TransitionSet;->getMatchedTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
 
     move-result-object p1
@@ -3750,8 +3746,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mParent:Landroidx/transition/TransitionSet;
-
     invoke-virtual {v0, p1, p2}, Landroidx/transition/TransitionSet;->getTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
 
     move-result-object p1
@@ -3879,8 +3873,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetIdExcludes:Ljava/util/ArrayList;
-
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
@@ -3898,8 +3890,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetExcludes:Ljava/util/ArrayList;
-
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
 
     move-result v1
@@ -3913,8 +3903,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetTypeExcludes:Ljava/util/ArrayList;
-
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
     move-result v1
@@ -3993,8 +3981,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetTypes:Ljava/util/ArrayList;
-
     invoke-virtual {v1}, Ljava/util/ArrayList;->isEmpty()Z
 
     move-result v1
@@ -4006,8 +3992,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Landroidx/transition/Transition;->mTargetNames:Ljava/util/ArrayList;
-
     invoke-virtual {v1}, Ljava/util/ArrayList;->isEmpty()Z
 
     move-result v1
@@ -4045,8 +4029,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mTargetNames:Ljava/util/ArrayList;
-
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->getTransitionName(Landroid/view/View;)Ljava/lang/String;
 
     move-result-object v1
@@ -4171,8 +4153,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/transition/Transition;->mListeners:Ljava/util/ArrayList;
-
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
     move-result p1
@@ -4383,8 +4363,6 @@
     return-object p0
 
     :cond_0
-    iget-object v0, p0, Landroidx/transition/Transition;->mListeners:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
     iget-object p1, p0, Landroidx/transition/Transition;->mListeners:Ljava/util/ArrayList;
@@ -4455,8 +4433,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mTargetTypes:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
     :cond_0
@@ -4476,8 +4452,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mTargetNames:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
     :cond_0
@@ -4555,8 +4529,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Landroidx/transition/Transition;->mListeners:Ljava/util/ArrayList;
-
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
     move-result p1
@@ -4708,7 +4680,7 @@
 
     if-nez v0, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const/4 v0, 0x0
@@ -4761,16 +4733,17 @@
 
     check-cast p1, [I
 
-    :goto_1
     iput-object p1, p0, Landroidx/transition/Transition;->mMatchOrder:[I
 
     return-void
 
     :cond_4
-    :goto_2
+    :goto_1
     sget-object p1, Landroidx/transition/Transition;->DEFAULT_MATCH_ORDER:[I
 
-    goto :goto_1
+    iput-object p1, p0, Landroidx/transition/Transition;->mMatchOrder:[I
+
+    return-void
 .end method
 
 .method public setPathMotion(Landroidx/transition/PathMotion;)V
@@ -4842,8 +4815,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Transition;->mListeners:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
diff --git a/com.discord/smali/androidx/transition/TransitionInflater.smali b/com.discord/smali/androidx/transition/TransitionInflater.smali
index 857a4b91fd..610d6a3310 100644
--- a/com.discord/smali/androidx/transition/TransitionInflater.smali
+++ b/com.discord/smali/androidx/transition/TransitionInflater.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/TransitionInflater;
 .super Ljava/lang/Object;
+.source "TransitionInflater.java"
 
 
 # static fields
@@ -291,7 +292,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/Fade;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_3
     const-string v5, "changeBounds"
@@ -308,7 +309,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/ChangeBounds;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_4
     const-string v5, "slide"
@@ -325,7 +326,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/Slide;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_5
     const-string v5, "explode"
@@ -342,7 +343,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/Explode;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_6
     const-string v5, "changeImageTransform"
@@ -359,7 +360,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/ChangeImageTransform;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_7
     const-string v5, "changeTransform"
@@ -376,7 +377,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/ChangeTransform;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_8
     const-string v5, "changeClipBounds"
@@ -393,7 +394,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/ChangeClipBounds;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_9
     const-string v5, "autoTransition"
@@ -410,7 +411,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/AutoTransition;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_a
     const-string v5, "changeScroll"
@@ -427,7 +428,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/ChangeScroll;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_b
     const-string v5, "transitionSet"
@@ -444,7 +445,7 @@
 
     invoke-direct {v3, v4, p2}, Landroidx/transition/TransitionSet;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_c
     const-string v5, "transition"
@@ -465,7 +466,7 @@
 
     check-cast v3, Landroidx/transition/Transition;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_d
     const-string v5, "targets"
@@ -478,7 +479,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/transition/TransitionInflater;->getTargetIds(Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroidx/transition/Transition;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_e
     const-string v5, "arcMotion"
@@ -497,10 +498,9 @@
 
     invoke-direct {v4, v5, p2}, Landroidx/transition/ArcMotion;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    :goto_2
     invoke-virtual {p3, v4}, Landroidx/transition/Transition;->setPathMotion(Landroidx/transition/PathMotion;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_f
     new-instance p1, Ljava/lang/RuntimeException;
@@ -532,6 +532,8 @@
 
     check-cast v4, Landroidx/transition/PathMotion;
 
+    invoke-virtual {p3, v4}, Landroidx/transition/Transition;->setPathMotion(Landroidx/transition/PathMotion;)V
+
     goto :goto_2
 
     :cond_11
@@ -560,9 +562,9 @@
 
     invoke-direct {v4, v5, p2}, Landroidx/transition/PatternPathMotion;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto :goto_2
+    invoke-virtual {p3, v4}, Landroidx/transition/Transition;->setPathMotion(Landroidx/transition/PathMotion;)V
 
-    :goto_3
+    :goto_2
     if-eqz v3, :cond_1
 
     invoke-interface {p1}, Lorg/xmlpull/v1/XmlPullParser;->isEmptyElementTag()Z
@@ -578,7 +580,9 @@
 
     invoke-virtual {v1, v3}, Landroidx/transition/TransitionSet;->addTransition(Landroidx/transition/Transition;)Landroidx/transition/TransitionSet;
 
-    goto/16 :goto_0
+    move-object v3, v2
+
+    goto/16 :goto_1
 
     :cond_14
     if-nez p3, :cond_15
@@ -873,47 +877,32 @@
 
     goto :goto_1
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_6
     const-string v3, "targetClass"
 
     invoke-static {v1, p1, v3, v6}, Landroidx/core/content/res/TypedArrayUtils;->getNamedString(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;I)Ljava/lang/String;
 
-    move-result-object v3
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eqz v3, :cond_7
-
-    :try_start_1
-    invoke-static {v3}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
     move-result-object v2
 
-    invoke-virtual {p3, v2}, Landroidx/transition/Transition;->addTarget(Ljava/lang/Class;)Landroidx/transition/Transition;
-    :try_end_1
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
+    if-eqz v2, :cond_7
 
-    goto :goto_1
+    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
 
-    :catch_1
-    move-exception p1
+    move-result-object v3
 
-    move-object v2, v3
-
-    goto :goto_2
+    invoke-virtual {p3, v3}, Landroidx/transition/Transition;->addTarget(Ljava/lang/Class;)Landroidx/transition/Transition;
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
     :cond_7
     :goto_1
     invoke-virtual {v1}, Landroid/content/res/TypedArray;->recycle()V
 
-    goto/16 :goto_0
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
 
-    :goto_2
     invoke-virtual {v1}, Landroid/content/res/TypedArray;->recycle()V
 
     new-instance p2, Ljava/lang/RuntimeException;
diff --git a/com.discord/smali/androidx/transition/TransitionListenerAdapter.smali b/com.discord/smali/androidx/transition/TransitionListenerAdapter.smali
index f7b5731c43..00bd25f96f 100644
--- a/com.discord/smali/androidx/transition/TransitionListenerAdapter.smali
+++ b/com.discord/smali/androidx/transition/TransitionListenerAdapter.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/TransitionListenerAdapter;
 .super Ljava/lang/Object;
+.source "TransitionListenerAdapter.java"
 
 # interfaces
 .implements Landroidx/transition/Transition$TransitionListener;
diff --git a/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali b/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali
index 514dc3a840..52e5c97cdb 100644
--- a/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali
+++ b/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TransitionManager$MultiListener$1;
 .super Landroidx/transition/TransitionListenerAdapter;
+.source "TransitionManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/TransitionManager$MultiListener.smali b/com.discord/smali/androidx/transition/TransitionManager$MultiListener.smali
index 772de2ec3d..d36c309df3 100644
--- a/com.discord/smali/androidx/transition/TransitionManager$MultiListener.smali
+++ b/com.discord/smali/androidx/transition/TransitionManager$MultiListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TransitionManager$MultiListener;
 .super Ljava/lang/Object;
+.source "TransitionManager.java"
 
 # interfaces
 .implements Landroid/view/View$OnAttachStateChangeListener;
diff --git a/com.discord/smali/androidx/transition/TransitionManager.smali b/com.discord/smali/androidx/transition/TransitionManager.smali
index 86c6ea2805..93508c6604 100644
--- a/com.discord/smali/androidx/transition/TransitionManager.smali
+++ b/com.discord/smali/androidx/transition/TransitionManager.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/TransitionManager;
 .super Ljava/lang/Object;
+.source "TransitionManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/TransitionPropagation.smali b/com.discord/smali/androidx/transition/TransitionPropagation.smali
index 1e96570069..2f036ac367 100644
--- a/com.discord/smali/androidx/transition/TransitionPropagation.smali
+++ b/com.discord/smali/androidx/transition/TransitionPropagation.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/transition/TransitionPropagation;
 .super Ljava/lang/Object;
+.source "TransitionPropagation.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/TransitionSet$1.smali b/com.discord/smali/androidx/transition/TransitionSet$1.smali
index 96dcb57316..0aff0645a2 100644
--- a/com.discord/smali/androidx/transition/TransitionSet$1.smali
+++ b/com.discord/smali/androidx/transition/TransitionSet$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TransitionSet$1;
 .super Landroidx/transition/TransitionListenerAdapter;
+.source "TransitionSet.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/TransitionSet$TransitionSetListener.smali b/com.discord/smali/androidx/transition/TransitionSet$TransitionSetListener.smali
index 9d99f9edba..4e14bfd424 100644
--- a/com.discord/smali/androidx/transition/TransitionSet$TransitionSetListener.smali
+++ b/com.discord/smali/androidx/transition/TransitionSet$TransitionSetListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TransitionSet$TransitionSetListener;
 .super Landroidx/transition/TransitionListenerAdapter;
+.source "TransitionSet.java"
 
 
 # annotations
@@ -57,8 +58,6 @@
 
     iput-boolean v1, v0, Landroidx/transition/TransitionSet;->mStarted:Z
 
-    iget-object v0, p0, Landroidx/transition/TransitionSet$TransitionSetListener;->mTransitionSet:Landroidx/transition/TransitionSet;
-
     invoke-virtual {v0}, Landroidx/transition/TransitionSet;->end()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/transition/TransitionSet.smali b/com.discord/smali/androidx/transition/TransitionSet.smali
index b4ed4beb48..e6b26d325b 100644
--- a/com.discord/smali/androidx/transition/TransitionSet.smali
+++ b/com.discord/smali/androidx/transition/TransitionSet.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/TransitionSet;
 .super Landroidx/transition/Transition;
+.source "TransitionSet.java"
 
 
 # annotations
@@ -1776,8 +1777,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/TransitionSet;->mTransitions:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -1837,14 +1836,16 @@
     :pswitch_0
     const/4 p1, 0x0
 
+    iput-boolean p1, p0, Landroidx/transition/TransitionSet;->mPlayTogether:Z
+
     goto :goto_0
 
     :pswitch_1
     const/4 p1, 0x1
 
-    :goto_0
     iput-boolean p1, p0, Landroidx/transition/TransitionSet;->mPlayTogether:Z
 
+    :goto_0
     return-object p0
 
     nop
diff --git a/com.discord/smali/androidx/transition/TransitionUtils$MatrixEvaluator.smali b/com.discord/smali/androidx/transition/TransitionUtils$MatrixEvaluator.smali
index 3185026f4c..2c6607aec8 100644
--- a/com.discord/smali/androidx/transition/TransitionUtils$MatrixEvaluator.smali
+++ b/com.discord/smali/androidx/transition/TransitionUtils$MatrixEvaluator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TransitionUtils$MatrixEvaluator;
 .super Ljava/lang/Object;
+.source "TransitionUtils.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
@@ -61,7 +62,7 @@
 
 # virtual methods
 .method public evaluate(FLandroid/graphics/Matrix;Landroid/graphics/Matrix;)Landroid/graphics/Matrix;
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Landroidx/transition/TransitionUtils$MatrixEvaluator;->mTempStartValues:[F
 
@@ -80,25 +81,21 @@
 
     iget-object p3, p0, Landroidx/transition/TransitionUtils$MatrixEvaluator;->mTempEndValues:[F
 
-    aget p3, p3, p2
-
-    iget-object v0, p0, Landroidx/transition/TransitionUtils$MatrixEvaluator;->mTempStartValues:[F
-
-    aget v0, v0, p2
-
-    sub-float/2addr p3, v0
-
-    iget-object v0, p0, Landroidx/transition/TransitionUtils$MatrixEvaluator;->mTempEndValues:[F
+    aget v0, p3, p2
 
     iget-object v1, p0, Landroidx/transition/TransitionUtils$MatrixEvaluator;->mTempStartValues:[F
 
+    aget v2, v1, p2
+
+    sub-float/2addr v0, v2
+
     aget v1, v1, p2
 
-    mul-float p3, p3, p1
+    mul-float v0, v0, p1
 
-    add-float/2addr v1, p3
+    add-float/2addr v1, v0
 
-    aput v1, v0, p2
+    aput v1, p3, p2
 
     add-int/lit8 p2, p2, 0x1
 
diff --git a/com.discord/smali/androidx/transition/TransitionUtils.smali b/com.discord/smali/androidx/transition/TransitionUtils.smali
index afc7eeda2b..42c2bc65d5 100644
--- a/com.discord/smali/androidx/transition/TransitionUtils.smali
+++ b/com.discord/smali/androidx/transition/TransitionUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TransitionUtils;
 .super Ljava/lang/Object;
+.source "TransitionUtils.java"
 
 
 # annotations
@@ -26,9 +27,9 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/16 v3, 0x13
 
@@ -66,9 +67,12 @@
 
     if-lt v0, v3, :cond_2
 
-    const/4 v1, 0x1
+    goto :goto_2
 
     :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
     sput-boolean v1, Landroidx/transition/TransitionUtils;->HAS_PICTURE_BITMAP:Z
 
     return-void
@@ -198,7 +202,7 @@
 .end method
 
 .method private static createViewBitmap(Landroid/view/View;Landroid/graphics/Matrix;Landroid/graphics/RectF;Landroid/view/ViewGroup;)Landroid/graphics/Bitmap;
-    .locals 8
+    .locals 9
 
     sget-boolean v0, Landroidx/transition/TransitionUtils;->HAS_IS_ATTACHED_TO_WINDOW:Z
 
@@ -214,6 +218,8 @@
 
     if-nez p3, :cond_0
 
+    const/4 v2, 0x0
+
     goto :goto_0
 
     :cond_0
@@ -221,15 +227,14 @@
 
     move-result v2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v0, 0x0
 
-    :goto_0
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     sget-boolean v3, Landroidx/transition/TransitionUtils;->HAS_OVERLAY:Z
 
     const/4 v4, 0x0
@@ -259,14 +264,18 @@
 
     invoke-virtual {v3, p0}, Landroid/view/ViewGroupOverlay;->add(Landroid/view/View;)V
 
-    goto :goto_2
+    move v8, v2
+
+    move-object v2, v1
+
+    move v1, v8
+
+    goto :goto_1
 
     :cond_3
-    move-object v1, v4
+    move-object v2, v4
 
-    const/4 v2, 0x0
-
-    :goto_2
+    :goto_1
     invoke-virtual {p2}, Landroid/graphics/RectF;->width()F
 
     move-result v3
@@ -351,7 +360,7 @@
 
     move-result-object v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     sget-object p2, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
@@ -369,7 +378,7 @@
     invoke-virtual {p0, p2}, Landroid/view/View;->draw(Landroid/graphics/Canvas;)V
 
     :cond_5
-    :goto_3
+    :goto_2
     sget-boolean p1, Landroidx/transition/TransitionUtils;->HAS_OVERLAY:Z
 
     if-eqz p1, :cond_6
@@ -382,7 +391,7 @@
 
     invoke-virtual {p1, p0}, Landroid/view/ViewGroupOverlay;->remove(Landroid/view/View;)V
 
-    invoke-virtual {v1, p0, v2}, Landroid/view/ViewGroup;->addView(Landroid/view/View;I)V
+    invoke-virtual {v2, p0, v1}, Landroid/view/ViewGroup;->addView(Landroid/view/View;I)V
 
     :cond_6
     return-object v4
diff --git a/com.discord/smali/androidx/transition/TransitionValues.smali b/com.discord/smali/androidx/transition/TransitionValues.smali
index 8604cc7d82..f866403057 100644
--- a/com.discord/smali/androidx/transition/TransitionValues.smali
+++ b/com.discord/smali/androidx/transition/TransitionValues.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/transition/TransitionValues;
 .super Ljava/lang/Object;
+.source "TransitionValues.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/transition/TransitionValuesMaps.smali b/com.discord/smali/androidx/transition/TransitionValuesMaps.smali
index b29ba51526..fe0adbaa67 100644
--- a/com.discord/smali/androidx/transition/TransitionValuesMaps.smali
+++ b/com.discord/smali/androidx/transition/TransitionValuesMaps.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TransitionValuesMaps;
 .super Ljava/lang/Object;
+.source "TransitionValuesMaps.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali b/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali
index 8465dd37a9..57d1c57271 100644
--- a/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali
+++ b/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "TranslationAnimationCreator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali b/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali
index 8ea471b87b..9a693fecbe 100644
--- a/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali
+++ b/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/TranslationAnimationCreator;
 .super Ljava/lang/Object;
+.source "TranslationAnimationCreator.java"
 
 
 # annotations
@@ -20,126 +21,126 @@
 .end method
 
 .method static createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;)Landroid/animation/Animator;
-    .locals 16
+    .locals 14
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
-    move-object/from16 v1, p1
+    move-object v1, p1
 
-    invoke-virtual/range {p0 .. p0}, Landroid/view/View;->getTranslationX()F
+    invoke-virtual {p0}, Landroid/view/View;->getTranslationX()F
 
-    move-result v6
+    move-result v2
 
-    invoke-virtual/range {p0 .. p0}, Landroid/view/View;->getTranslationY()F
+    invoke-virtual {p0}, Landroid/view/View;->getTranslationY()F
 
-    move-result v7
+    move-result v3
 
-    iget-object v8, v1, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
+    iget-object v4, v1, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
 
-    sget v9, Landroidx/transition/R$id;->transition_position:I
+    sget v5, Landroidx/transition/R$id;->transition_position:I
 
-    invoke-virtual {v8, v9}, Landroid/view/View;->getTag(I)Ljava/lang/Object;
+    invoke-virtual {v4, v5}, Landroid/view/View;->getTag(I)Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v4
 
-    check-cast v8, [I
+    check-cast v4, [I
 
-    const/4 v9, 0x1
+    const/4 v5, 0x1
 
-    const/4 v10, 0x0
+    const/4 v6, 0x0
 
-    if-eqz v8, :cond_0
+    if-eqz v4, :cond_0
 
-    aget v11, v8, v10
+    aget v7, v4, v6
 
-    sub-int v11, v11, p2
+    sub-int v7, v7, p2
 
-    int-to-float v11, v11
+    int-to-float v7, v7
 
-    add-float/2addr v11, v6
+    add-float/2addr v7, v2
 
-    aget v8, v8, v9
+    aget v4, v4, v5
 
-    sub-int v8, v8, p3
+    sub-int v4, v4, p3
 
-    int-to-float v8, v8
+    int-to-float v4, v4
 
-    add-float/2addr v8, v7
+    add-float/2addr v4, v3
 
     goto :goto_0
 
     :cond_0
-    move/from16 v11, p4
+    move/from16 v7, p4
 
-    move/from16 v8, p5
+    move/from16 v4, p5
 
     :goto_0
-    sub-float v12, v11, v6
+    sub-float v8, v7, v2
 
-    invoke-static {v12}, Ljava/lang/Math;->round(F)I
+    invoke-static {v8}, Ljava/lang/Math;->round(F)I
 
-    move-result v12
+    move-result v8
 
-    add-int v2, p2, v12
+    add-int v8, p2, v8
 
-    sub-float v12, v8, v7
+    sub-float v9, v4, v3
 
-    invoke-static {v12}, Ljava/lang/Math;->round(F)I
+    invoke-static {v9}, Ljava/lang/Math;->round(F)I
 
-    move-result v12
+    move-result v9
 
-    add-int v3, p3, v12
+    add-int v9, p3, v9
 
-    invoke-virtual {v0, v11}, Landroid/view/View;->setTranslationX(F)V
+    invoke-virtual {p0, v7}, Landroid/view/View;->setTranslationX(F)V
 
-    invoke-virtual {v0, v8}, Landroid/view/View;->setTranslationY(F)V
+    invoke-virtual {p0, v4}, Landroid/view/View;->setTranslationY(F)V
 
-    cmpl-float v12, v11, p6
+    cmpl-float v10, v7, p6
 
-    if-nez v12, :cond_1
+    if-nez v10, :cond_1
 
-    cmpl-float v12, v8, p7
+    cmpl-float v10, v4, p7
 
-    if-nez v12, :cond_1
+    if-nez v10, :cond_1
 
     const/4 v0, 0x0
 
     return-object v0
 
     :cond_1
-    const/4 v12, 0x2
+    const/4 v10, 0x2
 
-    new-array v13, v12, [Landroid/animation/PropertyValuesHolder;
+    new-array v11, v10, [Landroid/animation/PropertyValuesHolder;
 
-    sget-object v14, Landroid/view/View;->TRANSLATION_X:Landroid/util/Property;
+    sget-object v12, Landroid/view/View;->TRANSLATION_X:Landroid/util/Property;
 
-    new-array v15, v12, [F
+    new-array v13, v10, [F
 
-    aput v11, v15, v10
+    aput v7, v13, v6
 
-    aput p6, v15, v9
+    aput p6, v13, v5
 
-    invoke-static {v14, v15}, Landroid/animation/PropertyValuesHolder;->ofFloat(Landroid/util/Property;[F)Landroid/animation/PropertyValuesHolder;
+    invoke-static {v12, v13}, Landroid/animation/PropertyValuesHolder;->ofFloat(Landroid/util/Property;[F)Landroid/animation/PropertyValuesHolder;
+
+    move-result-object v7
+
+    aput-object v7, v11, v6
+
+    sget-object v7, Landroid/view/View;->TRANSLATION_Y:Landroid/util/Property;
+
+    new-array v10, v10, [F
+
+    aput v4, v10, v6
+
+    aput p7, v10, v5
+
+    invoke-static {v7, v10}, Landroid/animation/PropertyValuesHolder;->ofFloat(Landroid/util/Property;[F)Landroid/animation/PropertyValuesHolder;
 
     move-result-object v4
 
-    aput-object v4, v13, v10
+    aput-object v4, v11, v5
 
-    sget-object v4, Landroid/view/View;->TRANSLATION_Y:Landroid/util/Property;
-
-    new-array v11, v12, [F
-
-    aput v8, v11, v10
-
-    aput p7, v11, v9
-
-    invoke-static {v4, v11}, Landroid/animation/PropertyValuesHolder;->ofFloat(Landroid/util/Property;[F)Landroid/animation/PropertyValuesHolder;
-
-    move-result-object v4
-
-    aput-object v4, v13, v9
-
-    invoke-static {v0, v13}, Landroid/animation/ObjectAnimator;->ofPropertyValuesHolder(Ljava/lang/Object;[Landroid/animation/PropertyValuesHolder;)Landroid/animation/ObjectAnimator;
+    invoke-static {p0, v11}, Landroid/animation/ObjectAnimator;->ofPropertyValuesHolder(Ljava/lang/Object;[Landroid/animation/PropertyValuesHolder;)Landroid/animation/ObjectAnimator;
 
     move-result-object v4
 
@@ -147,19 +148,19 @@
 
     iget-object v1, v1, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
 
-    move-object/from16 p1, v5
+    move-object p1, v5
 
     move-object/from16 p2, p0
 
     move-object/from16 p3, v1
 
-    move/from16 p4, v2
+    move/from16 p4, v8
 
-    move/from16 p5, v3
+    move/from16 p5, v9
 
-    move/from16 p6, v6
+    move/from16 p6, v2
 
-    move/from16 p7, v7
+    move/from16 p7, v3
 
     invoke-direct/range {p1 .. p7}, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;-><init>(Landroid/view/View;Landroid/view/View;IIFF)V
 
diff --git a/com.discord/smali/androidx/transition/ViewGroupOverlayApi14.smali b/com.discord/smali/androidx/transition/ViewGroupOverlayApi14.smali
index 03bc6dc096..d56dbe9d00 100644
--- a/com.discord/smali/androidx/transition/ViewGroupOverlayApi14.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupOverlayApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewGroupOverlayApi14;
 .super Landroidx/transition/ViewOverlayApi14;
+.source "ViewGroupOverlayApi14.java"
 
 # interfaces
 .implements Landroidx/transition/ViewGroupOverlayImpl;
diff --git a/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali b/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali
index 9f9ac1500b..4c78e33c0b 100644
--- a/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewGroupOverlayApi18;
 .super Ljava/lang/Object;
+.source "ViewGroupOverlayApi18.java"
 
 # interfaces
 .implements Landroidx/transition/ViewGroupOverlayImpl;
diff --git a/com.discord/smali/androidx/transition/ViewGroupOverlayImpl.smali b/com.discord/smali/androidx/transition/ViewGroupOverlayImpl.smali
index 925b0a0872..b786e93bda 100644
--- a/com.discord/smali/androidx/transition/ViewGroupOverlayImpl.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupOverlayImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/ViewGroupOverlayImpl;
 .super Ljava/lang/Object;
+.source "ViewGroupOverlayImpl.java"
 
 # interfaces
 .implements Landroidx/transition/ViewOverlayImpl;
diff --git a/com.discord/smali/androidx/transition/ViewGroupUtils.smali b/com.discord/smali/androidx/transition/ViewGroupUtils.smali
index 7260fdc567..b0035cbe61 100644
--- a/com.discord/smali/androidx/transition/ViewGroupUtils.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewGroupUtils;
 .super Ljava/lang/Object;
+.source "ViewGroupUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/ViewGroupUtilsApi14$1.smali b/com.discord/smali/androidx/transition/ViewGroupUtilsApi14$1.smali
index 85b1f21463..71eaf8cbbd 100644
--- a/com.discord/smali/androidx/transition/ViewGroupUtilsApi14$1.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupUtilsApi14$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ViewGroupUtilsApi14$1;
 .super Landroid/animation/LayoutTransition;
+.source "ViewGroupUtilsApi14.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ViewGroupUtilsApi14.smali b/com.discord/smali/androidx/transition/ViewGroupUtilsApi14.smali
index 11de41f292..5c37b1d146 100644
--- a/com.discord/smali/androidx/transition/ViewGroupUtilsApi14.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupUtilsApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewGroupUtilsApi14;
 .super Ljava/lang/Object;
+.source "ViewGroupUtilsApi14.java"
 
 
 # static fields
@@ -73,8 +74,6 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    sget-object v0, Landroidx/transition/ViewGroupUtilsApi14;->sCancelMethod:Ljava/lang/reflect/Method;
-
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -100,6 +99,8 @@
 
     invoke-static {p0, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-void
+
     :cond_1
     :goto_1
     return-void
@@ -225,8 +226,6 @@
     if-eqz p1, :cond_6
 
     :try_start_1
-    sget-object p1, Landroidx/transition/ViewGroupUtilsApi14;->sLayoutSuppressedField:Ljava/lang/reflect/Field;
-
     invoke-virtual {p1, p0}, Ljava/lang/reflect/Field;->getBoolean(Ljava/lang/Object;)Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/transition/ViewGroupUtilsApi18.smali b/com.discord/smali/androidx/transition/ViewGroupUtilsApi18.smali
index 3c41a010f2..01987ba663 100644
--- a/com.discord/smali/androidx/transition/ViewGroupUtilsApi18.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupUtilsApi18.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewGroupUtilsApi18;
 .super Ljava/lang/Object;
+.source "ViewGroupUtilsApi18.java"
 
 
 # annotations
@@ -88,11 +89,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ViewGroupUtilsApi18;->sSuppressLayoutMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -130,6 +129,8 @@
 
     invoke-static {p1, v0, p0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    return-void
+
     :cond_0
     :goto_0
     return-void
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor.smali b/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor.smali
index 5bbb27d202..5263bc0745 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor;
 .super Landroid/view/View;
+.source "ViewOverlayApi14.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali b/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali
index 0ef0793c91..0563c5cc1e 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;
 .super Landroid/view/ViewGroup;
+.source "ViewOverlayApi14.java"
 
 
 # annotations
@@ -80,6 +81,8 @@
     :try_end_0
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -293,8 +296,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
     :cond_0
@@ -369,8 +370,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -607,8 +606,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v0
@@ -639,8 +636,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
@@ -693,8 +688,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi14.smali b/com.discord/smali/androidx/transition/ViewOverlayApi14.smali
index 6eec672795..c485cf6cdb 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayApi14.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewOverlayApi14;
 .super Ljava/lang/Object;
+.source "ViewOverlayApi14.java"
 
 # interfaces
 .implements Landroidx/transition/ViewOverlayImpl;
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi18.smali b/com.discord/smali/androidx/transition/ViewOverlayApi18.smali
index c137af8807..425e36df9a 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayApi18.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayApi18.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewOverlayApi18;
 .super Ljava/lang/Object;
+.source "ViewOverlayApi18.java"
 
 # interfaces
 .implements Landroidx/transition/ViewOverlayImpl;
diff --git a/com.discord/smali/androidx/transition/ViewOverlayImpl.smali b/com.discord/smali/androidx/transition/ViewOverlayImpl.smali
index a2c8e87d5c..f586139c28 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayImpl.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayImpl.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/transition/ViewOverlayImpl;
 .super Ljava/lang/Object;
+.source "ViewOverlayImpl.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/transition/ViewUtils$1.smali b/com.discord/smali/androidx/transition/ViewUtils$1.smali
index 012d66e9d4..bf9cff2eb2 100644
--- a/com.discord/smali/androidx/transition/ViewUtils$1.smali
+++ b/com.discord/smali/androidx/transition/ViewUtils$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ViewUtils$1;
 .super Landroid/util/Property;
+.source "ViewUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ViewUtils$2.smali b/com.discord/smali/androidx/transition/ViewUtils$2.smali
index 0e7dda60f6..d2ba63f8e1 100644
--- a/com.discord/smali/androidx/transition/ViewUtils$2.smali
+++ b/com.discord/smali/androidx/transition/ViewUtils$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/transition/ViewUtils$2;
 .super Landroid/util/Property;
+.source "ViewUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/ViewUtils.smali b/com.discord/smali/androidx/transition/ViewUtils.smali
index cd001f5e02..ef13f4f49c 100644
--- a/com.discord/smali/androidx/transition/ViewUtils.smali
+++ b/com.discord/smali/androidx/transition/ViewUtils.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewUtils;
 .super Ljava/lang/Object;
+.source "ViewUtils.java"
 
 
 # static fields
@@ -50,10 +51,9 @@
 
     invoke-direct {v0}, Landroidx/transition/ViewUtilsApi22;-><init>()V
 
-    :goto_0
     sput-object v0, Landroidx/transition/ViewUtils;->IMPL:Landroidx/transition/ViewUtilsBase;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -66,6 +66,8 @@
 
     invoke-direct {v0}, Landroidx/transition/ViewUtilsApi21;-><init>()V
 
+    sput-object v0, Landroidx/transition/ViewUtils;->IMPL:Landroidx/transition/ViewUtilsBase;
+
     goto :goto_0
 
     :cond_1
@@ -79,6 +81,8 @@
 
     invoke-direct {v0}, Landroidx/transition/ViewUtilsApi19;-><init>()V
 
+    sput-object v0, Landroidx/transition/ViewUtils;->IMPL:Landroidx/transition/ViewUtilsBase;
+
     goto :goto_0
 
     :cond_2
@@ -86,9 +90,9 @@
 
     invoke-direct {v0}, Landroidx/transition/ViewUtilsBase;-><init>()V
 
-    goto :goto_0
+    sput-object v0, Landroidx/transition/ViewUtils;->IMPL:Landroidx/transition/ViewUtilsBase;
 
-    :goto_1
+    :goto_0
     new-instance v0, Landroidx/transition/ViewUtils$1;
 
     const-class v1, Ljava/lang/Float;
@@ -332,8 +336,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    sget-object v0, Landroidx/transition/ViewUtils;->sViewFlagsField:Ljava/lang/reflect/Field;
-
     invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->getInt(Ljava/lang/Object;)I
 
     move-result v0
@@ -348,6 +350,8 @@
     :try_end_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi19.smali b/com.discord/smali/androidx/transition/ViewUtilsApi19.smali
index 98478a3281..790abd0db9 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsApi19.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi19.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewUtilsApi19;
 .super Landroidx/transition/ViewUtilsBase;
+.source "ViewUtilsApi19.java"
 
 
 # annotations
@@ -150,11 +151,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ViewUtilsApi19;->sGetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x0
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -165,12 +164,12 @@
 
     invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
-    move-result v0
+    move-result p1
     :try_end_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v0
+    return p1
 
     :catch_0
     move-exception p1
@@ -217,11 +216,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ViewUtilsApi19;->sSetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi21.smali b/com.discord/smali/androidx/transition/ViewUtilsApi21.smali
index 112a3a9a9f..20112fef8d 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsApi21.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi21.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewUtilsApi21;
 .super Landroidx/transition/ViewUtilsApi19;
+.source "ViewUtilsApi21.java"
 
 
 # annotations
@@ -198,11 +199,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ViewUtilsApi21;->sSetAnimationMatrixMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -230,6 +229,8 @@
     throw p2
 
     :catch_1
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -251,11 +252,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToGlobalMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -283,6 +282,8 @@
     throw p2
 
     :catch_1
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -304,11 +305,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToLocalMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -336,6 +335,8 @@
     throw p2
 
     :catch_1
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi22.smali b/com.discord/smali/androidx/transition/ViewUtilsApi22.smali
index 968537c293..5c9221a38b 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsApi22.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi22.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewUtilsApi22;
 .super Landroidx/transition/ViewUtilsApi21;
+.source "ViewUtilsApi22.java"
 
 
 # annotations
@@ -109,11 +110,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Landroidx/transition/ViewUtilsApi22;->sSetLeftTopRightBottomMethod:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x4
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -169,6 +168,8 @@
     throw p2
 
     :catch_1
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/androidx/transition/ViewUtilsBase.smali b/com.discord/smali/androidx/transition/ViewUtilsBase.smali
index 593a651149..77cf6fa211 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsBase.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsBase.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/ViewUtilsBase;
 .super Ljava/lang/Object;
+.source "ViewUtilsBase.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/transition/Visibility$1.smali b/com.discord/smali/androidx/transition/Visibility$1.smali
index a3ac1c309e..d04c8c63ca 100644
--- a/com.discord/smali/androidx/transition/Visibility$1.smali
+++ b/com.discord/smali/androidx/transition/Visibility$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Visibility$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "Visibility.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Visibility$DisappearListener.smali b/com.discord/smali/androidx/transition/Visibility$DisappearListener.smali
index 8c6da79f75..44ef72005e 100644
--- a/com.discord/smali/androidx/transition/Visibility$DisappearListener.smali
+++ b/com.discord/smali/androidx/transition/Visibility$DisappearListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Visibility$DisappearListener;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "Visibility.java"
 
 # interfaces
 .implements Landroidx/transition/AnimatorUtils$AnimatorPauseListenerCompat;
@@ -79,8 +80,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/transition/Visibility$DisappearListener;->mParent:Landroid/view/ViewGroup;
-
     invoke-virtual {v0}, Landroid/view/ViewGroup;->invalidate()V
 
     :cond_0
@@ -108,8 +107,6 @@
 
     iput-boolean p1, p0, Landroidx/transition/Visibility$DisappearListener;->mLayoutSuppressed:Z
 
-    iget-object v0, p0, Landroidx/transition/Visibility$DisappearListener;->mParent:Landroid/view/ViewGroup;
-
     invoke-static {v0, p1}, Landroidx/transition/ViewGroupUtils;->suppressLayout(Landroid/view/ViewGroup;Z)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/transition/Visibility$Mode.smali b/com.discord/smali/androidx/transition/Visibility$Mode.smali
index adea66cd53..21fa368762 100644
--- a/com.discord/smali/androidx/transition/Visibility$Mode.smali
+++ b/com.discord/smali/androidx/transition/Visibility$Mode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/transition/Visibility$Mode;
 .super Ljava/lang/Object;
+.source "Visibility.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/transition/Visibility$VisibilityInfo.smali b/com.discord/smali/androidx/transition/Visibility$VisibilityInfo.smali
index 61456e5170..0902bdc0d6 100644
--- a/com.discord/smali/androidx/transition/Visibility$VisibilityInfo.smali
+++ b/com.discord/smali/androidx/transition/Visibility$VisibilityInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/Visibility$VisibilityInfo;
 .super Ljava/lang/Object;
+.source "Visibility.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/transition/Visibility.smali b/com.discord/smali/androidx/transition/Visibility.smali
index 125d141e9d..77784ed641 100644
--- a/com.discord/smali/androidx/transition/Visibility.smali
+++ b/com.discord/smali/androidx/transition/Visibility.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/transition/Visibility;
 .super Landroidx/transition/Transition;
+.source "Visibility.java"
 
 
 # annotations
@@ -253,14 +254,16 @@
 
     check-cast v2, Landroid/view/ViewGroup;
 
+    iput-object v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mEndParent:Landroid/view/ViewGroup;
+
     goto :goto_1
 
     :cond_1
     iput v3, v0, Landroidx/transition/Visibility$VisibilityInfo;->mEndVisibility:I
 
-    :goto_1
     iput-object v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mEndParent:Landroid/view/ViewGroup;
 
+    :goto_1
     const/4 v2, 0x1
 
     if-eqz p1, :cond_6
@@ -292,13 +295,21 @@
 
     if-nez p1, :cond_3
 
-    goto :goto_4
+    iput-boolean v1, v0, Landroidx/transition/Visibility$VisibilityInfo;->mFadeIn:Z
+
+    iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
+
+    goto :goto_2
 
     :cond_3
     iget p1, v0, Landroidx/transition/Visibility$VisibilityInfo;->mEndVisibility:I
 
     if-nez p1, :cond_8
 
+    iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mFadeIn:Z
+
+    iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
+
     goto :goto_2
 
     :cond_4
@@ -306,13 +317,21 @@
 
     if-nez p1, :cond_5
 
-    goto :goto_4
+    iput-boolean v1, v0, Landroidx/transition/Visibility$VisibilityInfo;->mFadeIn:Z
+
+    iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
+
+    goto :goto_2
 
     :cond_5
     iget-object p1, v0, Landroidx/transition/Visibility$VisibilityInfo;->mStartParent:Landroid/view/ViewGroup;
 
     if-nez p1, :cond_8
 
+    iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mFadeIn:Z
+
+    iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
+
     goto :goto_2
 
     :cond_6
@@ -322,13 +341,11 @@
 
     if-nez p1, :cond_7
 
-    :goto_2
     iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mFadeIn:Z
 
-    :goto_3
     iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
 
-    goto :goto_5
+    goto :goto_2
 
     :cond_7
     if-nez p2, :cond_8
@@ -337,13 +354,12 @@
 
     if-nez p1, :cond_8
 
-    :goto_4
     iput-boolean v1, v0, Landroidx/transition/Visibility$VisibilityInfo;->mFadeIn:Z
 
-    goto :goto_3
+    iput-boolean v2, v0, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
 
     :cond_8
-    :goto_5
+    :goto_2
     return-object v0
 .end method
 
@@ -704,7 +720,7 @@
 
     if-nez v4, :cond_3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/4 v4, 0x4
@@ -719,14 +735,14 @@
     :goto_2
     move-object p3, v1
 
-    goto :goto_7
+    goto/16 :goto_6
 
     :cond_5
     iget-boolean v2, p0, Landroidx/transition/Visibility;->mCanRemoveViews:Z
 
     if-eqz v2, :cond_6
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_6
     invoke-virtual {p3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
@@ -735,23 +751,23 @@
 
     check-cast v2, Landroid/view/View;
 
-    :goto_3
     invoke-static {p1, p3, v2}, Landroidx/transition/TransitionUtils;->copyViewImage(Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/View;)Landroid/view/View;
 
     move-result-object p3
 
-    goto :goto_5
+    move-object v2, v1
+
+    goto :goto_6
 
     :cond_7
-    :goto_4
+    :goto_3
     if-eqz v2, :cond_8
 
     move-object p3, v2
 
-    :goto_5
     move-object v2, v1
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_8
     if-eqz p3, :cond_c
@@ -762,8 +778,10 @@
 
     if-nez v2, :cond_9
 
-    :goto_6
-    goto :goto_5
+    :goto_4
+    move-object v2, v1
+
+    goto :goto_6
 
     :cond_9
     invoke-virtual {p3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
@@ -796,7 +814,13 @@
 
     if-nez v4, :cond_a
 
-    goto :goto_3
+    invoke-static {p1, p3, v2}, Landroidx/transition/TransitionUtils;->copyViewImage(Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/View;)Landroid/view/View;
+
+    move-result-object p3
+
+    move-object v2, v1
+
+    goto :goto_6
 
     :cond_a
     invoke-virtual {v2}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
@@ -828,14 +852,17 @@
     :cond_b
     move-object p3, v1
 
-    goto :goto_5
+    :goto_5
+    move-object v2, v1
+
+    goto :goto_6
 
     :cond_c
     move-object p3, v1
 
     move-object v2, p3
 
-    :goto_7
+    :goto_6
     const/4 v4, 0x0
 
     if-eqz p3, :cond_e
@@ -898,7 +925,7 @@
 
     invoke-interface {p5, p3}, Landroidx/transition/ViewGroupOverlayImpl;->remove(Landroid/view/View;)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_d
     new-instance p2, Landroidx/transition/Visibility$1;
@@ -907,7 +934,7 @@
 
     invoke-virtual {p1, p2}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
-    :goto_8
+    :goto_7
     return-object p1
 
     :cond_e
@@ -935,12 +962,12 @@
 
     invoke-virtual {p0, p2}, Landroidx/transition/Visibility;->addListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_f
     invoke-static {v2, p3}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
 
-    :goto_9
+    :goto_8
     return-object p1
 
     :cond_10
diff --git a/com.discord/smali/androidx/transition/VisibilityPropagation.smali b/com.discord/smali/androidx/transition/VisibilityPropagation.smali
index 4bcfe867d4..693e907e9d 100644
--- a/com.discord/smali/androidx/transition/VisibilityPropagation.smali
+++ b/com.discord/smali/androidx/transition/VisibilityPropagation.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/transition/VisibilityPropagation;
 .super Landroidx/transition/TransitionPropagation;
+.source "VisibilityPropagation.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/transition/WindowIdApi14.smali b/com.discord/smali/androidx/transition/WindowIdApi14.smali
index bf488cbaa5..9e08213d8d 100644
--- a/com.discord/smali/androidx/transition/WindowIdApi14.smali
+++ b/com.discord/smali/androidx/transition/WindowIdApi14.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/WindowIdApi14;
 .super Ljava/lang/Object;
+.source "WindowIdApi14.java"
 
 # interfaces
 .implements Landroidx/transition/WindowIdImpl;
diff --git a/com.discord/smali/androidx/transition/WindowIdApi18.smali b/com.discord/smali/androidx/transition/WindowIdApi18.smali
index c97525154e..5ae1bf69cf 100644
--- a/com.discord/smali/androidx/transition/WindowIdApi18.smali
+++ b/com.discord/smali/androidx/transition/WindowIdApi18.smali
@@ -1,5 +1,6 @@
 .class Landroidx/transition/WindowIdApi18;
 .super Ljava/lang/Object;
+.source "WindowIdApi18.java"
 
 # interfaces
 .implements Landroidx/transition/WindowIdImpl;
diff --git a/com.discord/smali/androidx/transition/WindowIdImpl.smali b/com.discord/smali/androidx/transition/WindowIdImpl.smali
index 9a65298cd7..be1aa86491 100644
--- a/com.discord/smali/androidx/transition/WindowIdImpl.smali
+++ b/com.discord/smali/androidx/transition/WindowIdImpl.smali
@@ -1,2 +1,3 @@
 .class interface abstract Landroidx/transition/WindowIdImpl;
 .super Ljava/lang/Object;
+.source "WindowIdImpl.java"
diff --git a/com.discord/smali/androidx/vectordrawable/R$attr.smali b/com.discord/smali/androidx/vectordrawable/R$attr.smali
index b1b28fc055..eb500b4b94 100644
--- a/com.discord/smali/androidx/vectordrawable/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$color.smali b/com.discord/smali/androidx/vectordrawable/R$color.smali
index 726f8f1c40..f7ae280c88 100644
--- a/com.discord/smali/androidx/vectordrawable/R$color.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$dimen.smali b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
index e1c4e1de37..b5d6be8e9e 100644
--- a/com.discord/smali/androidx/vectordrawable/R$dimen.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 631274274b..cd0fd76c22 100644
--- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index d22c343899..031d876b86 100644
--- a/com.discord/smali/androidx/vectordrawable/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$integer.smali b/com.discord/smali/androidx/vectordrawable/R$integer.smali
index e14bcfbd1e..b5094b07e0 100644
--- a/com.discord/smali/androidx/vectordrawable/R$integer.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$layout.smali b/com.discord/smali/androidx/vectordrawable/R$layout.smali
index e3d1238784..9f6ab9f788 100644
--- a/com.discord/smali/androidx/vectordrawable/R$layout.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index a7a3dbf4fd..e0a9a56fe6 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$style.smali b/com.discord/smali/androidx/vectordrawable/R$style.smali
index dbb02540cc..919a331c79 100644
--- a/com.discord/smali/androidx/vectordrawable/R$style.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
index dba86820ec..0074721ed3 100644
--- a/com.discord/smali/androidx/vectordrawable/R$styleable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/R.smali b/com.discord/smali/androidx/vectordrawable/R.smali
index 095429be1a..06c0ad0e1f 100644
--- a/com.discord/smali/androidx/vectordrawable/R.smali
+++ b/com.discord/smali/androidx/vectordrawable/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/vectordrawable/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AndroidResources.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AndroidResources.smali
index 4f8c817591..15f46781d3 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AndroidResources.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AndroidResources.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/AndroidResources;
 .super Ljava/lang/Object;
+.source "AndroidResources.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback$1.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback$1.smali
index 042d56a646..91b29decab 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback$1.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback$1;
 .super Landroid/graphics/drawable/Animatable2$AnimationCallback;
+.source "Animatable2Compat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback.smali
index e2746ff6d2..030f129781 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;
 .super Ljava/lang/Object;
+.source "Animatable2Compat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat.smali
index 85270f3b83..7c582e99a0 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/Animatable2Compat.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/vectordrawable/graphics/drawable/Animatable2Compat;
 .super Ljava/lang/Object;
+.source "Animatable2Compat.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Animatable;
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$1.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$1.smali
index b05f889272..c23f9e572f 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$1.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$1;
 .super Ljava/lang/Object;
+.source "AnimatedVectorDrawableCompat.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$2.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$2.smali
index c33e9a040a..f398c23ae8 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$2.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$2;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "AnimatedVectorDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali
index 8e723679cf..9221f095fb 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;
 .super Landroid/graphics/drawable/Drawable$ConstantState;
+.source "AnimatedVectorDrawableCompat.java"
 
 
 # annotations
@@ -60,8 +61,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p2, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mVectorDrawable:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
-
     invoke-virtual {p1}, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->getConstantState()Landroid/graphics/drawable/Drawable$ConstantState;
 
     move-result-object p1
@@ -72,21 +71,22 @@
 
     move-result-object p1
 
-    :goto_0
     check-cast p1, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
 
     iput-object p1, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mVectorDrawable:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable$ConstantState;->newDrawable()Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
 
-    :goto_1
+    iput-object p1, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mVectorDrawable:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
+
+    :goto_0
     iget-object p1, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mVectorDrawable:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
 
     invoke-virtual {p1}, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mutate()Landroid/graphics/drawable/Drawable;
@@ -120,8 +120,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p2, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mAnimators:Ljava/util/ArrayList;
-
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
     move-result p1
@@ -138,7 +136,7 @@
 
     iput-object p3, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mTargetNameMap:Landroidx/collection/ArrayMap;
 
-    :goto_2
+    :goto_1
     if-ge v0, p1, :cond_2
 
     iget-object p3, p2, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mAnimators:Ljava/util/ArrayList;
@@ -179,7 +177,7 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-virtual {p0}, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->setupAnimatorSet()V
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali
index 01e613b0bc..d7be589f5e 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState;
 .super Landroid/graphics/drawable/Drawable$ConstantState;
+.source "AnimatedVectorDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.smali
index 749c5b5b85..e0ffd06383 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;
 .super Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;
+.source "AnimatedVectorDrawableCompat.java"
 
 # interfaces
 .implements Landroidx/vectordrawable/graphics/drawable/Animatable2Compat;
@@ -153,6 +154,8 @@
 
     invoke-virtual {p0}, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->clearAnimationCallbacks()V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -268,7 +271,7 @@
 
     throw p0
     :try_end_0
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
@@ -280,6 +283,18 @@
 
     invoke-static {p1, v0, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_0
+
+    :catch_1
+    move-exception p0
+
+    const-string p1, "AnimatedVDCompat"
+
+    const-string v0, "parser error"
+
+    invoke-static {p1, v0, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :goto_0
     const/4 p0, 0x0
 
     return-object p0
@@ -337,6 +352,8 @@
 
     invoke-virtual {p0, p1}, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->registerAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)V
 
+    return-void
+
     :cond_3
     :goto_0
     return-void
@@ -610,6 +627,8 @@
 
     invoke-static {v0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->applyTheme(Landroid/graphics/drawable/Drawable;Landroid/content/res/Resources$Theme;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -660,8 +679,6 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->mAnimationCallbacks:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
     return-void
@@ -998,7 +1015,7 @@
     add-int/2addr v1, v2
 
     :goto_0
-    if-eq v0, v2, :cond_7
+    if-eq v0, v2, :cond_8
 
     invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->getDepth()I
 
@@ -1008,12 +1025,12 @@
 
     const/4 v3, 0x3
 
-    if-eq v0, v3, :cond_7
+    if-eq v0, v3, :cond_8
 
     :cond_1
     const/4 v3, 0x2
 
-    if-ne v0, v3, :cond_6
+    if-ne v0, v3, :cond_7
 
     invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->getName()Ljava/lang/String;
 
@@ -1071,7 +1088,6 @@
     iput-object v3, v4, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mVectorDrawable:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
 
     :cond_3
-    :goto_1
     invoke-virtual {v0}, Landroid/content/res/TypedArray;->recycle()V
 
     goto :goto_2
@@ -1083,7 +1099,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_7
 
     sget-object v0, Landroidx/vectordrawable/graphics/drawable/AndroidResources;->STYLEABLE_ANIMATED_VECTOR_DRAWABLE_TARGET:[I
 
@@ -1099,14 +1115,12 @@
 
     move-result v4
 
-    if-eqz v4, :cond_3
+    if-eqz v4, :cond_6
 
     iget-object v5, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->mContext:Landroid/content/Context;
 
     if-eqz v5, :cond_5
 
-    iget-object v5, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->mContext:Landroid/content/Context;
-
     invoke-static {v5, v4}, Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat;->loadAnimator(Landroid/content/Context;I)Landroid/animation/Animator;
 
     move-result-object v4
@@ -1127,6 +1141,10 @@
     throw p1
 
     :cond_6
+    :goto_1
+    invoke-virtual {v0}, Landroid/content/res/TypedArray;->recycle()V
+
+    :cond_7
     :goto_2
     invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->next()I
 
@@ -1134,7 +1152,7 @@
 
     goto :goto_0
 
-    :cond_7
+    :cond_8
     iget-object p1, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->mAnimatedVectorState:Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;
 
     invoke-virtual {p1}, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->setupAnimatorSet()V
@@ -1707,8 +1725,6 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->mAnimationCallbacks:Ljava/util/ArrayList;
-
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.smali
index a2de5bf71a..cb79538b11 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/vectordrawable/graphics/drawable/AnimationUtilsCompat;
 .super Ljava/lang/Object;
+.source "AnimationUtilsCompat.java"
 
 
 # annotations
@@ -94,7 +95,6 @@
 
     invoke-direct {v0, p0, p2}, Landroid/view/animation/AccelerateInterpolator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    :goto_1
     move-object p2, v0
 
     goto :goto_0
@@ -112,7 +112,9 @@
 
     invoke-direct {v0, p0, p2}, Landroid/view/animation/DecelerateInterpolator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto :goto_1
+    move-object p2, v0
+
+    goto :goto_0
 
     :cond_4
     const-string v1, "accelerateDecelerateInterpolator"
@@ -142,7 +144,9 @@
 
     invoke-direct {v0, p0, p2}, Landroid/view/animation/CycleInterpolator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto :goto_1
+    move-object p2, v0
+
+    goto :goto_0
 
     :cond_6
     const-string v1, "anticipateInterpolator"
@@ -157,7 +161,9 @@
 
     invoke-direct {v0, p0, p2}, Landroid/view/animation/AnticipateInterpolator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto :goto_1
+    move-object p2, v0
+
+    goto :goto_0
 
     :cond_7
     const-string v1, "overshootInterpolator"
@@ -172,7 +178,9 @@
 
     invoke-direct {v0, p0, p2}, Landroid/view/animation/OvershootInterpolator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto :goto_1
+    move-object p2, v0
+
+    goto/16 :goto_0
 
     :cond_8
     const-string v1, "anticipateOvershootInterpolator"
@@ -187,7 +195,9 @@
 
     invoke-direct {v0, p0, p2}, Landroid/view/animation/AnticipateOvershootInterpolator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    goto :goto_1
+    move-object p2, v0
+
+    goto/16 :goto_0
 
     :cond_9
     const-string v1, "bounceInterpolator"
@@ -217,7 +227,9 @@
 
     invoke-direct {v0, p0, p2, p3}, Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;Lorg/xmlpull/v1/XmlPullParser;)V
 
-    goto :goto_1
+    move-object p2, v0
+
+    goto/16 :goto_0
 
     :cond_b
     new-instance p0, Ljava/lang/RuntimeException;
@@ -283,7 +295,7 @@
     :catchall_0
     move-exception p0
 
-    goto/16 :goto_2
+    goto :goto_2
 
     :catch_0
     move-exception p0
@@ -324,59 +336,33 @@
 
     invoke-virtual {v1, p1}, Landroid/content/res/Resources;->getAnimation(I)Landroid/content/res/XmlResourceParser;
 
-    move-result-object v1
-    :try_end_0
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    move-result-object v0
 
-    :try_start_1
     invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p0}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
 
     move-result-object v2
 
-    invoke-static {p0, v0, v2, v1}, Landroidx/vectordrawable/graphics/drawable/AnimationUtilsCompat;->createInterpolatorFromXml(Landroid/content/Context;Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Lorg/xmlpull/v1/XmlPullParser;)Landroid/view/animation/Interpolator;
+    invoke-static {p0, v1, v2, v0}, Landroidx/vectordrawable/graphics/drawable/AnimationUtilsCompat;->createInterpolatorFromXml(Landroid/content/Context;Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Lorg/xmlpull/v1/XmlPullParser;)Landroid/view/animation/Interpolator;
 
     move-result-object p0
-    :try_end_1
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_1 .. :try_end_1} :catch_3
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_2
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    :try_end_0
+    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-interface {v1}, Landroid/content/res/XmlResourceParser;->close()V
+    invoke-interface {v0}, Landroid/content/res/XmlResourceParser;->close()V
 
     :cond_4
     return-object p0
 
-    :catchall_1
-    move-exception p0
-
-    move-object v0, v1
-
-    goto :goto_2
-
-    :catch_2
-    move-exception p0
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :catch_3
-    move-exception p0
-
-    move-object v0, v1
-
-    goto :goto_1
-
     :goto_0
-    :try_start_2
+    :try_start_1
     new-instance v1, Landroid/content/res/Resources$NotFoundException;
 
     new-instance v2, Ljava/lang/StringBuilder;
@@ -425,8 +411,8 @@
     invoke-virtual {v1, p0}, Landroid/content/res/Resources$NotFoundException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     throw v1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_2
     if-eqz v0, :cond_5
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali
index c0db48135d..4e7117be8c 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator;
 .super Ljava/lang/Object;
+.source "AnimatorInflaterCompat.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
@@ -78,8 +79,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator;->mNodeArray:[Landroidx/core/graphics/PathParser$PathDataNode;
-
     invoke-static {v0, p2}, Landroidx/core/graphics/PathParser;->canMorph([Landroidx/core/graphics/PathParser$PathDataNode;[Landroidx/core/graphics/PathParser$PathDataNode;)Z
 
     move-result v0
@@ -128,4 +127,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali
index 013ab14566..0e67c97d8e 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat;
 .super Ljava/lang/Object;
+.source "AnimatorInflaterCompat.java"
 
 
 # annotations
@@ -159,10 +160,9 @@
 
     move-result-object v0
 
-    :goto_1
     move-object/from16 v3, p0
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_2
     const-string v3, "animator"
@@ -191,6 +191,8 @@
 
     move-result-object v0
 
+    move-object/from16 v3, p0
+
     goto :goto_1
 
     :cond_3
@@ -248,7 +250,7 @@
 
     move-object v0, v15
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const-string v3, "propertyValuesHolder"
@@ -286,7 +288,7 @@
     :cond_5
     const/4 v14, 0x1
 
-    :goto_2
+    :goto_1
     if-eqz v11, :cond_0
 
     if-nez v14, :cond_0
@@ -345,7 +347,7 @@
 
     move-result-object v2
 
-    :goto_3
+    :goto_2
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
@@ -364,20 +366,20 @@
 
     move v14, v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_a
     if-nez p6, :cond_b
 
     invoke-virtual {v11, v1}, Landroid/animation/AnimatorSet;->playTogether([Landroid/animation/Animator;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_b
     invoke-virtual {v11, v1}, Landroid/animation/AnimatorSet;->playSequentially([Landroid/animation/Animator;)V
 
     :cond_c
-    :goto_4
+    :goto_3
     return-object v0
 .end method
 
@@ -460,7 +462,7 @@
 .method private static dumpKeyframes([Ljava/lang/Object;Ljava/lang/String;)V
     .locals 6
 
-    if-eqz p0, :cond_3
+    if-eqz p0, :cond_4
 
     array-length v0, p0
 
@@ -557,6 +559,9 @@
     goto :goto_0
 
     :cond_3
+    return-void
+
+    :cond_4
     :goto_3
     return-void
 .end method
@@ -706,7 +711,11 @@
 
     aput-object p3, p0, v1
 
-    goto :goto_6
+    invoke-static {p4, v0, p0}, Landroid/animation/PropertyValuesHolder;->ofObject(Ljava/lang/String;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/PropertyValuesHolder;
+
+    move-result-object p0
+
+    goto/16 :goto_e
 
     :cond_a
     new-instance p2, Landroid/view/InflateException;
@@ -738,12 +747,11 @@
 
     aput-object p2, p0, v2
 
-    :goto_6
     invoke-static {p4, v0, p0}, Landroid/animation/PropertyValuesHolder;->ofObject(Ljava/lang/String;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/PropertyValuesHolder;
 
     move-result-object p0
 
-    goto/16 :goto_f
+    goto/16 :goto_e
 
     :cond_c
     if-eqz p3, :cond_d
@@ -760,10 +768,14 @@
 
     move-result-object v8
 
+    move-object p0, v8
+
+    goto/16 :goto_e
+
     :cond_d
     move-object p0, v8
 
-    goto/16 :goto_f
+    goto/16 :goto_e
 
     :cond_e
     if-ne p1, v7, :cond_f
@@ -772,12 +784,12 @@
 
     move-result-object p1
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_f
     move-object p1, v8
 
-    :goto_7
+    :goto_6
     const/4 v7, 0x5
 
     const/4 v10, 0x0
@@ -792,14 +804,14 @@
 
     move-result p2
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_10
     invoke-virtual {p0, p2, v10}, Landroid/content/res/TypedArray;->getFloat(IF)F
 
     move-result p2
 
-    :goto_8
+    :goto_7
     if-eqz v5, :cond_12
 
     if-ne v4, v7, :cond_11
@@ -808,14 +820,14 @@
 
     move-result p0
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_11
     invoke-virtual {p0, p3, v10}, Landroid/content/res/TypedArray;->getFloat(IF)F
 
     move-result p0
 
-    :goto_9
+    :goto_8
     new-array p3, v9, [F
 
     aput p2, p3, v2
@@ -826,7 +838,9 @@
 
     move-result-object v8
 
-    goto/16 :goto_e
+    move-object p0, v8
+
+    goto/16 :goto_d
 
     :cond_12
     new-array p0, v1, [F
@@ -837,7 +851,9 @@
 
     move-result-object v8
 
-    goto/16 :goto_e
+    move-object p0, v8
+
+    goto/16 :goto_d
 
     :cond_13
     if-ne v4, v7, :cond_14
@@ -846,14 +862,14 @@
 
     move-result p0
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_14
     invoke-virtual {p0, p3, v10}, Landroid/content/res/TypedArray;->getFloat(IF)F
 
     move-result p0
 
-    :goto_a
+    :goto_9
     new-array p2, v1, [F
 
     aput p0, p2, v2
@@ -862,7 +878,9 @@
 
     move-result-object v8
 
-    goto/16 :goto_e
+    move-object p0, v8
+
+    goto/16 :goto_d
 
     :cond_15
     if-eqz v3, :cond_1b
@@ -875,7 +893,7 @@
 
     float-to-int p2, p2
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_16
     invoke-static {v0}, Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat;->isColorType(I)Z
@@ -888,14 +906,14 @@
 
     move-result p2
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_17
     invoke-virtual {p0, p2, v2}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
-    :goto_b
+    :goto_a
     if-eqz v5, :cond_1a
 
     if-ne v4, v7, :cond_18
@@ -906,7 +924,7 @@
 
     float-to-int p0, p0
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_18
     invoke-static {v4}, Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat;->isColorType(I)Z
@@ -919,14 +937,14 @@
 
     move-result p0
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_19
     invoke-virtual {p0, p3, v2}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p0
 
-    :goto_c
+    :goto_b
     new-array p3, v9, [I
 
     aput p2, p3, v2
@@ -937,7 +955,9 @@
 
     move-result-object v8
 
-    goto :goto_e
+    move-object p0, v8
+
+    goto :goto_d
 
     :cond_1a
     new-array p0, v1, [I
@@ -948,7 +968,9 @@
 
     move-result-object v8
 
-    goto :goto_e
+    move-object p0, v8
+
+    goto :goto_d
 
     :cond_1b
     if-eqz v5, :cond_1e
@@ -961,7 +983,7 @@
 
     float-to-int p0, p0
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_1c
     invoke-static {v4}, Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat;->isColorType(I)Z
@@ -974,14 +996,14 @@
 
     move-result p0
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_1d
     invoke-virtual {p0, p3, v2}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p0
 
-    :goto_d
+    :goto_c
     new-array p2, v1, [I
 
     aput p0, p2, v2
@@ -990,10 +1012,14 @@
 
     move-result-object v8
 
-    :cond_1e
-    :goto_e
     move-object p0, v8
 
+    goto :goto_d
+
+    :cond_1e
+    move-object p0, v8
+
+    :goto_d
     if-eqz p0, :cond_1f
 
     if-eqz p1, :cond_1f
@@ -1001,7 +1027,7 @@
     invoke-virtual {p0, p1}, Landroid/animation/PropertyValuesHolder;->setEvaluator(Landroid/animation/TypeEvaluator;)V
 
     :cond_1f
-    :goto_f
+    :goto_e
     return-object p0
 .end method
 
@@ -1211,7 +1237,7 @@
 .end method
 
 .method public static loadAnimator(Landroid/content/Context;Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;IF)Landroid/animation/Animator;
-    .locals 2
+    .locals 1
     .param p3    # I
         .annotation build Landroidx/annotation/AnimatorRes;
         .end annotation
@@ -1227,24 +1253,19 @@
     :try_start_0
     invoke-virtual {p1, p3}, Landroid/content/res/Resources;->getAnimation(I)Landroid/content/res/XmlResourceParser;
 
-    move-result-object v1
-    :try_end_0
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_3
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v0
 
-    :try_start_1
-    invoke-static {p0, p1, p2, v1, p4}, Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat;->createAnimatorFromXml(Landroid/content/Context;Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Lorg/xmlpull/v1/XmlPullParser;F)Landroid/animation/Animator;
+    invoke-static {p0, p1, p2, v0, p4}, Landroidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat;->createAnimatorFromXml(Landroid/content/Context;Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Lorg/xmlpull/v1/XmlPullParser;F)Landroid/animation/Animator;
 
     move-result-object p0
-    :try_end_1
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_0
+    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-interface {v1}, Landroid/content/res/XmlResourceParser;->close()V
+    invoke-interface {v0}, Landroid/content/res/XmlResourceParser;->close()V
 
     :cond_0
     return-object p0
@@ -1252,89 +1273,66 @@
     :catchall_0
     move-exception p0
 
-    move-object v0, v1
-
-    goto :goto_2
+    goto :goto_0
 
     :catch_0
     move-exception p0
 
-    move-object v0, v1
+    :try_start_1
+    new-instance p1, Landroid/content/res/Resources$NotFoundException;
 
-    goto :goto_0
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    const-string p4, "Can\'t load animation resource ID #0x"
+
+    invoke-direct {p2, p4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-static {p3}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Landroid/content/res/Resources$NotFoundException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p1, p0}, Landroid/content/res/Resources$NotFoundException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p1
 
     :catch_1
     move-exception p0
 
-    move-object v0, v1
+    new-instance p1, Landroid/content/res/Resources$NotFoundException;
 
-    goto :goto_1
+    new-instance p2, Ljava/lang/StringBuilder;
 
-    :catchall_1
-    move-exception p0
+    const-string p4, "Can\'t load animation resource ID #0x"
 
-    goto :goto_2
+    invoke-direct {p2, p4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    :catch_2
-    move-exception p0
+    invoke-static {p3}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Landroid/content/res/Resources$NotFoundException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p1, p0}, Landroid/content/res/Resources$NotFoundException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    :try_start_2
-    new-instance p1, Landroid/content/res/Resources$NotFoundException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    const-string p4, "Can\'t load animation resource ID #0x"
-
-    invoke-direct {p2, p4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-static {p3}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Landroid/content/res/Resources$NotFoundException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p1, p0}, Landroid/content/res/Resources$NotFoundException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw p1
-
-    :catch_3
-    move-exception p0
-
-    :goto_1
-    new-instance p1, Landroid/content/res/Resources$NotFoundException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    const-string p4, "Can\'t load animation resource ID #0x"
-
-    invoke-direct {p2, p4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-static {p3}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Landroid/content/res/Resources$NotFoundException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p1, p0}, Landroid/content/res/Resources$NotFoundException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :goto_2
     if-eqz v0, :cond_1
 
     invoke-interface {v0}, Landroid/content/res/XmlResourceParser;->close()V
@@ -1891,7 +1889,6 @@
 
     if-eq v0, v2, :cond_0
 
-    :goto_1
     invoke-interface/range {p3 .. p3}, Lorg/xmlpull/v1/XmlPullParser;->next()I
 
     goto :goto_0
@@ -1964,9 +1961,11 @@
 
     if-nez v8, :cond_2
 
-    new-instance v8, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    invoke-direct {v8}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    move-object v8, v1
 
     :cond_2
     invoke-virtual {v8, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
@@ -1983,7 +1982,10 @@
 
     move-object/from16 v13, p4
 
-    goto :goto_1
+    :goto_1
+    invoke-interface/range {p3 .. p3}, Lorg/xmlpull/v1/XmlPullParser;->next()I
+
+    goto :goto_0
 
     :cond_5
     if-eqz v8, :cond_6
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.smali
index d7a68c2cf7..b924b955a1 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/vectordrawable/graphics/drawable/ArgbEvaluator;
 .super Ljava/lang/Object;
+.source "ArgbEvaluator.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.smali
index 04282eda01..04575ce03e 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;
 .super Ljava/lang/Object;
+.source "PathInterpolatorCompat.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
@@ -258,9 +259,7 @@
 
     if-ltz v3, :cond_1
 
-    iget-object v3, p0, Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;->mX:[F
-
-    aput p1, v3, v1
+    aput p1, v4, v1
 
     add-int/lit8 v1, v1, 0x1
 
@@ -376,6 +375,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private initQuad(FF)V
@@ -610,15 +611,13 @@
     :cond_3
     iget-object v3, p0, Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;->mX:[F
 
-    aget v3, v3, v2
+    aget v4, v3, v2
 
-    iget-object v4, p0, Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;->mX:[F
+    aget v5, v3, v1
 
-    aget v4, v4, v1
+    sub-float/2addr v4, v5
 
-    sub-float/2addr v3, v4
-
-    cmpl-float v0, v3, v0
+    cmpl-float v0, v4, v0
 
     if-nez v0, :cond_4
 
@@ -629,27 +628,23 @@
     return p1
 
     :cond_4
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;->mX:[F
-
-    aget v0, v0, v1
+    aget v0, v3, v1
 
     sub-float/2addr p1, v0
 
-    div-float/2addr p1, v3
+    div-float/2addr p1, v4
 
     iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;->mY:[F
 
-    aget v0, v0, v1
+    aget v1, v0, v1
 
-    iget-object v1, p0, Landroidx/vectordrawable/graphics/drawable/PathInterpolatorCompat;->mY:[F
+    aget v0, v0, v2
 
-    aget v1, v1, v2
+    sub-float/2addr v0, v1
 
-    sub-float/2addr v1, v0
+    mul-float p1, p1, v0
 
-    mul-float p1, p1, v1
+    add-float/2addr v1, p1
 
-    add-float/2addr v0, p1
-
-    return v0
+    return v1
 .end method
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCommon.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCommon.smali
index db0be82dbb..bfadc3d978 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCommon.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCommon.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;
 .super Landroid/graphics/drawable/Drawable;
+.source "VectorDrawableCommon.java"
 
 # interfaces
 .implements Landroidx/core/graphics/drawable/TintAwareDrawable;
@@ -27,10 +28,10 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->applyTheme(Landroid/graphics/drawable/Drawable;Landroid/content/res/Resources$Theme;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -42,8 +43,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->clearColorFilter()V
 
     return-void
@@ -61,8 +60,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0}, Landroidx/core/graphics/drawable/DrawableCompat;->getColorFilter(Landroid/graphics/drawable/Drawable;)Landroid/graphics/ColorFilter;
 
     move-result-object v0
@@ -82,8 +79,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getCurrent()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -105,8 +100,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getMinimumHeight()I
 
     move-result v0
@@ -128,8 +121,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getMinimumWidth()I
 
     move-result v0
@@ -151,8 +142,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     move-result p1
@@ -174,8 +163,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getState()[I
 
     move-result-object v0
@@ -197,8 +184,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getTransparentRegion()Landroid/graphics/Region;
 
     move-result-object v0
@@ -220,10 +205,10 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0}, Landroidx/core/graphics/drawable/DrawableCompat;->jumpToCurrentState(Landroid/graphics/drawable/Drawable;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -235,8 +220,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
     return-void
@@ -254,8 +237,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setLevel(I)Z
 
     move-result p1
@@ -277,8 +258,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setChangingConfigurations(I)V
 
     return-void
@@ -296,8 +275,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1, p2}, Landroid/graphics/drawable/Drawable;->setColorFilter(ILandroid/graphics/PorterDuff$Mode;)V
 
     return-void
@@ -315,10 +292,10 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setFilterBitmap(Z)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -330,8 +307,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0, p1, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setHotspot(Landroid/graphics/drawable/Drawable;FF)V
 
     :cond_0
@@ -345,10 +320,10 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0, p1, p2, p3, p4}, Landroidx/core/graphics/drawable/DrawableCompat;->setHotspotBounds(Landroid/graphics/drawable/Drawable;IIII)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -360,8 +335,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;->mDelegateDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
     move-result p1
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$1.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$1.smali
index c5412dd46f..158c9789d1 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$1.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$1;
 .super Ljava/lang/Object;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VClipPath.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VClipPath.smali
index a35b4ac907..bfca799c0c 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VClipPath.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VClipPath.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VClipPath;
 .super Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath.smali
index 2414b8756c..e438062357 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath;
 .super Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
@@ -460,6 +461,8 @@
 
     if-nez p1, :cond_0
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VGroup.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VGroup.smali
index e6f6db3bc3..fb29b5a110 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VGroup.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VGroup.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VGroup;
 .super Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VObject;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
@@ -197,8 +198,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VGroup;->mGroupName:Ljava/lang/String;
-
     invoke-virtual {p2, v0, p0}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VObject.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VObject.smali
index a129024993..29d61fa654 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VObject.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VObject.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VObject;
 .super Ljava/lang/Object;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath.smali
index 3206209c27..1030e23a34 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath;
 .super Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VObject;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
@@ -286,8 +287,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPath;->mNodes:[Landroidx/core/graphics/PathParser$PathDataNode;
-
     invoke-static {v0, p1}, Landroidx/core/graphics/PathParser$PathDataNode;->nodesToPath([Landroidx/core/graphics/PathParser$PathDataNode;Landroid/graphics/Path;)V
 
     :cond_0
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali
index 0651f1ffb9..c1ddb99c1c 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;
 .super Ljava/lang/Object;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
@@ -226,11 +227,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mVGTargetsMap:Landroidx/collection/ArrayMap;
+    iget-object v1, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mVGTargetsMap:Landroidx/collection/ArrayMap;
 
-    iget-object v1, p1, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootName:Ljava/lang/String;
-
-    invoke-virtual {v0, v1, p0}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v0, p0}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
     iget-object p1, p1, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mIsStateful:Ljava/lang/Boolean;
@@ -517,11 +516,11 @@
 
     move-result p4
 
-    const/16 p5, 0xff
+    const/high16 p5, 0x437f0000    # 255.0f
 
-    const/4 v1, 0x0
+    const/16 v1, 0xff
 
-    const/high16 v2, 0x437f0000    # 255.0f
+    const/4 v2, 0x0
 
     if-eqz p4, :cond_9
 
@@ -564,7 +563,7 @@
 
     iget p4, p2, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath;->mFillAlpha:F
 
-    mul-float p4, p4, v2
+    mul-float p4, p4, p5
 
     invoke-static {p4}, Ljava/lang/Math;->round(F)I
 
@@ -575,9 +574,9 @@
     goto :goto_1
 
     :cond_7
-    invoke-virtual {v4, v1}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
+    invoke-virtual {v4, v2}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
-    invoke-virtual {v4, p5}, Landroid/graphics/Paint;->setAlpha(I)V
+    invoke-virtual {v4, v1}, Landroid/graphics/Paint;->setAlpha(I)V
 
     invoke-virtual {p4}, Landroidx/core/content/res/ComplexColorCompat;->getColor()I
 
@@ -676,15 +675,15 @@
 
     move-result-object p4
 
-    iget-object p5, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mFinalPathMatrix:Landroid/graphics/Matrix;
+    iget-object v1, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mFinalPathMatrix:Landroid/graphics/Matrix;
 
-    invoke-virtual {p4, p5}, Landroid/graphics/Shader;->setLocalMatrix(Landroid/graphics/Matrix;)V
+    invoke-virtual {p4, v1}, Landroid/graphics/Shader;->setLocalMatrix(Landroid/graphics/Matrix;)V
 
     invoke-virtual {v3, p4}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
     iget p4, p2, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath;->mStrokeAlpha:F
 
-    mul-float p4, p4, v2
+    mul-float p4, p4, p5
 
     invoke-static {p4}, Ljava/lang/Math;->round(F)I
 
@@ -695,9 +694,9 @@
     goto :goto_3
 
     :cond_d
-    invoke-virtual {v3, v1}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
+    invoke-virtual {v3, v2}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
-    invoke-virtual {v3, p5}, Landroid/graphics/Paint;->setAlpha(I)V
+    invoke-virtual {v3, v1}, Landroid/graphics/Paint;->setAlpha(I)V
 
     invoke-virtual {p4}, Landroidx/core/content/res/ComplexColorCompat;->getColor()I
 
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali
index 05d94ca69d..114bd77199 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;
 .super Landroid/graphics/drawable/Drawable$ConstantState;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali
index c8348d2ecf..536150689c 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali
@@ -1,5 +1,6 @@
 .class Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState;
 .super Landroid/graphics/drawable/Drawable$ConstantState;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali
index 384968c145..36ecefbe8a 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
 .super Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;
+.source "VectorDrawableCompat.java"
 
 
 # annotations
@@ -274,7 +275,7 @@
 
     throw p0
     :try_end_0
-    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
@@ -286,6 +287,18 @@
 
     invoke-static {p1, p2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_0
+
+    :catch_1
+    move-exception p0
+
+    const-string p1, "VectorDrawableCompat"
+
+    const-string p2, "parser error"
+
+    invoke-static {p1, p2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :goto_0
     const/4 p0, 0x0
 
     return-object p0
@@ -411,12 +424,11 @@
 
     iget v3, v3, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VFullPath;->mChangingConfigurations:I
 
-    :goto_1
     or-int/2addr v3, v7
 
     iput v3, v0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->mChangingConfigurations:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const-string v8, "clip-path"
@@ -456,6 +468,10 @@
 
     iget v3, v3, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VClipPath;->mChangingConfigurations:I
 
+    or-int/2addr v3, v7
+
+    iput v3, v0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->mChangingConfigurations:I
+
     goto :goto_1
 
     :cond_4
@@ -498,6 +514,10 @@
 
     iget v3, v3, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VGroup;->mChangingConfigurations:I
 
+    or-int/2addr v3, v7
+
+    iput v3, v0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->mChangingConfigurations:I
+
     goto :goto_1
 
     :cond_6
@@ -518,7 +538,7 @@
     invoke-virtual {v2}, Ljava/util/ArrayDeque;->pop()Ljava/lang/Object;
 
     :cond_7
-    :goto_2
+    :goto_1
     invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->next()I
 
     move-result v3
@@ -538,6 +558,8 @@
     invoke-direct {p1, p2}, Lorg/xmlpull/v1/XmlPullParserException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private needMirroring()Z
@@ -549,7 +571,7 @@
 
     const/16 v2, 0x11
 
-    if-lt v0, v2, :cond_0
+    if-lt v0, v2, :cond_1
 
     invoke-virtual {p0}, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->isAutoMirrored()Z
 
@@ -569,6 +591,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method private static parseTintModeCompat(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuff$Mode;
@@ -1080,7 +1105,7 @@
 
     move-result v0
 
-    if-lez v0, :cond_9
+    if-lez v0, :cond_a
 
     iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mTmpBounds:Landroid/graphics/Rect;
 
@@ -1099,12 +1124,7 @@
 
     iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mTintFilter:Landroid/graphics/PorterDuffColorFilter;
 
-    goto :goto_0
-
     :cond_2
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mColorFilter:Landroid/graphics/ColorFilter;
-
-    :goto_0
     iget-object v1, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mTmpMatrix:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->getMatrix(Landroid/graphics/Matrix;)V
@@ -1211,7 +1231,7 @@
 
     if-gtz v3, :cond_5
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
@@ -1269,7 +1289,7 @@
 
     invoke-virtual {v2, v1, v3}, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->updateCachedBitmap(II)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_7
     iget-object v2, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mVectorState:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;
@@ -1289,7 +1309,7 @@
     invoke-virtual {v1}, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->updateCacheStates()V
 
     :cond_8
-    :goto_1
+    :goto_0
     iget-object v1, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mVectorState:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;
 
     iget-object v2, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mTmpBounds:Landroid/graphics/Rect;
@@ -1298,7 +1318,13 @@
 
     invoke-virtual {p1, v4}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
+    return-void
+
     :cond_9
+    :goto_1
+    return-void
+
+    :cond_a
     :goto_2
     return-void
 .end method
@@ -1537,8 +1563,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mVectorState:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;
-
     iget-object v0, v0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->mVPathRenderer:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;
 
     if-eqz v0, :cond_1
@@ -1825,8 +1849,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;->mVectorState:Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;
-
     invoke-virtual {v0}, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->isStateful()Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali b/com.discord/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali
index 607bf84ccf..20696a28a6 100644
--- a/com.discord/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali
+++ b/com.discord/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/versionedparcelable/CustomVersionedParcelable;
 .super Ljava/lang/Object;
+.source "CustomVersionedParcelable.java"
 
 # interfaces
 .implements Landroidx/versionedparcelable/VersionedParcelable;
diff --git a/com.discord/smali/androidx/versionedparcelable/NonParcelField.smali b/com.discord/smali/androidx/versionedparcelable/NonParcelField.smali
index 1056be989e..96c54340ba 100644
--- a/com.discord/smali/androidx/versionedparcelable/NonParcelField.smali
+++ b/com.discord/smali/androidx/versionedparcelable/NonParcelField.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/versionedparcelable/NonParcelField;
 .super Ljava/lang/Object;
+.source "NonParcelField.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/versionedparcelable/ParcelField.smali b/com.discord/smali/androidx/versionedparcelable/ParcelField.smali
index b958771e43..3cdfcf55cd 100644
--- a/com.discord/smali/androidx/versionedparcelable/ParcelField.smali
+++ b/com.discord/smali/androidx/versionedparcelable/ParcelField.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/versionedparcelable/ParcelField;
 .super Ljava/lang/Object;
+.source "ParcelField.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/versionedparcelable/ParcelImpl$1.smali b/com.discord/smali/androidx/versionedparcelable/ParcelImpl$1.smali
index ebae2dc439..30dc8b8420 100644
--- a/com.discord/smali/androidx/versionedparcelable/ParcelImpl$1.smali
+++ b/com.discord/smali/androidx/versionedparcelable/ParcelImpl$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/versionedparcelable/ParcelImpl$1;
 .super Ljava/lang/Object;
+.source "ParcelImpl.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/androidx/versionedparcelable/ParcelImpl.smali b/com.discord/smali/androidx/versionedparcelable/ParcelImpl.smali
index b077f935fe..03f2a1aee5 100644
--- a/com.discord/smali/androidx/versionedparcelable/ParcelImpl.smali
+++ b/com.discord/smali/androidx/versionedparcelable/ParcelImpl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/versionedparcelable/ParcelImpl;
 .super Ljava/lang/Object;
+.source "ParcelImpl.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/androidx/versionedparcelable/ParcelUtils.smali b/com.discord/smali/androidx/versionedparcelable/ParcelUtils.smali
index 7ffed56212..72fccadff2 100644
--- a/com.discord/smali/androidx/versionedparcelable/ParcelUtils.smali
+++ b/com.discord/smali/androidx/versionedparcelable/ParcelUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/versionedparcelable/ParcelUtils;
 .super Ljava/lang/Object;
+.source "ParcelUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/versionedparcelable/R.smali b/com.discord/smali/androidx/versionedparcelable/R.smali
index 22d8174ca6..3abe6e04ea 100644
--- a/com.discord/smali/androidx/versionedparcelable/R.smali
+++ b/com.discord/smali/androidx/versionedparcelable/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/versionedparcelable/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcel$1.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcel$1.smali
index ef65ac5810..613bf71a6c 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcel$1.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcel$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/versionedparcelable/VersionedParcel$1;
 .super Ljava/io/ObjectInputStream;
+.source "VersionedParcel.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcel$ParcelException.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcel$ParcelException.smali
index 8a68d8593f..ae15743e04 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcel$ParcelException.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcel$ParcelException.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/versionedparcelable/VersionedParcel$ParcelException;
 .super Ljava/lang/RuntimeException;
+.source "VersionedParcel.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali
index 5b1d52778a..6109632fa6 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/versionedparcelable/VersionedParcel;
 .super Ljava/lang/Object;
+.source "VersionedParcel.java"
 
 
 # annotations
@@ -647,7 +648,7 @@
 
     invoke-virtual {p0, p2}, Landroidx/versionedparcelable/VersionedParcel;->writeInt(I)V
 
-    if-lez p2, :cond_4
+    if-lez p2, :cond_5
 
     invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
@@ -677,7 +678,7 @@
 
     move-result p2
 
-    if-eqz p2, :cond_4
+    if-eqz p2, :cond_5
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -787,9 +788,14 @@
     goto :goto_4
 
     :cond_4
+    return-void
+
+    :cond_5
     :goto_5
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_4
@@ -1001,11 +1007,11 @@
 
     invoke-static {v0}, Landroidx/versionedparcelable/VersionedParcel;->findParcelClass(Ljava/lang/Class;)Ljava/lang/Class;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1520,6 +1526,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_1
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcelParcel.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcelParcel.smali
index 38f76e2b7b..b60083f67c 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcelParcel.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcelParcel.smali
@@ -1,5 +1,6 @@
 .class Landroidx/versionedparcelable/VersionedParcelParcel;
 .super Landroidx/versionedparcelable/VersionedParcel;
+.source "VersionedParcelParcel.java"
 
 
 # annotations
@@ -95,11 +96,9 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v0, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mParcel:Landroid/os/Parcel;
+    iget-object v1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mParcel:Landroid/os/Parcel;
 
-    iget v1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mNextRead:I
-
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->setDataPosition(I)V
+    invoke-virtual {v1, v0}, Landroid/os/Parcel;->setDataPosition(I)V
 
     iget-object v0, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mParcel:Landroid/os/Parcel;
 
@@ -144,11 +143,9 @@
 
     if-ltz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mPositionLookup:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mPositionLookup:Landroid/util/SparseIntArray;
 
-    iget v1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mCurrentField:I
-
-    invoke-virtual {v0, v1}, Landroid/util/SparseIntArray;->get(I)I
+    invoke-virtual {v1, v0}, Landroid/util/SparseIntArray;->get(I)I
 
     move-result v0
 
@@ -183,9 +180,7 @@
 
     iget-object v1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mParcel:Landroid/os/Parcel;
 
-    iget-object v2, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mParcel:Landroid/os/Parcel;
-
-    invoke-virtual {v2}, Landroid/os/Parcel;->dataPosition()I
+    invoke-virtual {v1}, Landroid/os/Parcel;->dataPosition()I
 
     move-result v2
 
@@ -197,12 +192,7 @@
 
     iget v3, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mEnd:I
 
-    goto :goto_0
-
     :cond_0
-    iget v3, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mNextRead:I
-
-    :goto_0
     new-instance v4, Ljava/lang/StringBuilder;
 
     invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali
index c273be48ed..2882432ee9 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali
@@ -1,5 +1,6 @@
 .class Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;
 .super Ljava/lang/Object;
+.source "VersionedParcelStream.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali
index 11920777e4..17a1dda454 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali
@@ -1,5 +1,6 @@
 .class Landroidx/versionedparcelable/VersionedParcelStream$InputBuffer;
 .super Ljava/lang/Object;
+.source "VersionedParcelStream.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream.smali
index d3a1d99ea0..63aa0b5993 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcelStream.smali
@@ -1,5 +1,6 @@
 .class Landroidx/versionedparcelable/VersionedParcelStream;
 .super Landroidx/versionedparcelable/VersionedParcel;
+.source "VersionedParcelStream.java"
 
 
 # annotations
@@ -579,8 +580,6 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mFieldBuffer:Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;
-
     iget-object v0, v0, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mOutput:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->size()I
@@ -1097,11 +1096,6 @@
     :cond_0
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_1
     iget-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentOutput:Ljava/io/DataOutputStream;
 
@@ -1113,12 +1107,16 @@
 
     return-void
 
-    :goto_1
+    :catch_0
+    move-exception p1
+
     new-instance v0, Landroidx/versionedparcelable/VersionedParcel$ParcelException;
 
     invoke-direct {v0, p1}, Landroidx/versionedparcelable/VersionedParcel$ParcelException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public writeByteArray([B)V
@@ -1139,11 +1137,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     iget-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentOutput:Ljava/io/DataOutputStream;
 
@@ -1155,7 +1148,9 @@
 
     return-void
 
-    :goto_0
+    :catch_0
+    move-exception p1
+
     new-instance v0, Landroidx/versionedparcelable/VersionedParcel$ParcelException;
 
     invoke-direct {v0, p1}, Landroidx/versionedparcelable/VersionedParcel$ParcelException;-><init>(Ljava/lang/Throwable;)V
@@ -1179,11 +1174,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     iget-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentOutput:Ljava/io/DataOutputStream;
 
@@ -1195,7 +1185,9 @@
 
     return-void
 
-    :goto_0
+    :catch_0
+    move-exception p1
+
     new-instance p2, Landroidx/versionedparcelable/VersionedParcel$ParcelException;
 
     invoke-direct {p2, p1}, Landroidx/versionedparcelable/VersionedParcel$ParcelException;-><init>(Ljava/lang/Throwable;)V
@@ -1334,11 +1326,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     iget-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentOutput:Ljava/io/DataOutputStream;
 
@@ -1350,7 +1337,9 @@
 
     return-void
 
-    :goto_0
+    :catch_0
+    move-exception p1
+
     new-instance v0, Landroidx/versionedparcelable/VersionedParcel$ParcelException;
 
     invoke-direct {v0, p1}, Landroidx/versionedparcelable/VersionedParcel$ParcelException;-><init>(Ljava/lang/Throwable;)V
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcelable.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcelable.smali
index 142e48280f..805b686ef5 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcelable.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcelable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/versionedparcelable/VersionedParcelable;
 .super Ljava/lang/Object;
+.source "VersionedParcelable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcelize.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcelize.smali
index cb076039d3..e9e5dcd762 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcelize.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcelize.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/versionedparcelable/VersionedParcelize;
 .super Ljava/lang/Object;
+.source "VersionedParcelize.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/viewpager/R$attr.smali b/com.discord/smali/androidx/viewpager/R$attr.smali
index 2e52b64a65..522d6187e7 100644
--- a/com.discord/smali/androidx/viewpager/R$attr.smali
+++ b/com.discord/smali/androidx/viewpager/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$color.smali b/com.discord/smali/androidx/viewpager/R$color.smali
index f3c920b71e..aa900aa0ee 100644
--- a/com.discord/smali/androidx/viewpager/R$color.smali
+++ b/com.discord/smali/androidx/viewpager/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$dimen.smali b/com.discord/smali/androidx/viewpager/R$dimen.smali
index e56267cd22..ae2747bf7a 100644
--- a/com.discord/smali/androidx/viewpager/R$dimen.smali
+++ b/com.discord/smali/androidx/viewpager/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 951faeb93f..b5df829b29 100644
--- a/com.discord/smali/androidx/viewpager/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index 43724bc8ee..c3893ad9f3 100644
--- a/com.discord/smali/androidx/viewpager/R$id.smali
+++ b/com.discord/smali/androidx/viewpager/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$integer.smali b/com.discord/smali/androidx/viewpager/R$integer.smali
index 9098a81c87..388430ed8d 100644
--- a/com.discord/smali/androidx/viewpager/R$integer.smali
+++ b/com.discord/smali/androidx/viewpager/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$layout.smali b/com.discord/smali/androidx/viewpager/R$layout.smali
index 9dbb0dd803..23c274a539 100644
--- a/com.discord/smali/androidx/viewpager/R$layout.smali
+++ b/com.discord/smali/androidx/viewpager/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 0c75ac7ab3..440d1e1f2c 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$style.smali b/com.discord/smali/androidx/viewpager/R$style.smali
index 4be274b576..555cef1302 100644
--- a/com.discord/smali/androidx/viewpager/R$style.smali
+++ b/com.discord/smali/androidx/viewpager/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R$styleable.smali b/com.discord/smali/androidx/viewpager/R$styleable.smali
index f60d00c596..07e3e5d9f6 100644
--- a/com.discord/smali/androidx/viewpager/R$styleable.smali
+++ b/com.discord/smali/androidx/viewpager/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/R.smali b/com.discord/smali/androidx/viewpager/R.smali
index c8e3ff34a4..29d805ca35 100644
--- a/com.discord/smali/androidx/viewpager/R.smali
+++ b/com.discord/smali/androidx/viewpager/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/viewpager/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/PagerAdapter.smali b/com.discord/smali/androidx/viewpager/widget/PagerAdapter.smali
index e3b7829db9..bf5cd5bcc1 100644
--- a/com.discord/smali/androidx/viewpager/widget/PagerAdapter.smali
+++ b/com.discord/smali/androidx/viewpager/widget/PagerAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/viewpager/widget/PagerAdapter;
 .super Ljava/lang/Object;
+.source "PagerAdapter.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$1.smali b/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$1.smali
index 7c3a641939..018e713a19 100644
--- a/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$1.smali
+++ b/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/PagerTabStrip$1;
 .super Ljava/lang/Object;
+.source "PagerTabStrip.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$2.smali b/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$2.smali
index d7e8f48ec4..0f9fc87fa0 100644
--- a/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$2.smali
+++ b/com.discord/smali/androidx/viewpager/widget/PagerTabStrip$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/PagerTabStrip$2;
 .super Ljava/lang/Object;
+.source "PagerTabStrip.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/androidx/viewpager/widget/PagerTabStrip.smali b/com.discord/smali/androidx/viewpager/widget/PagerTabStrip.smali
index 55e204cc34..68a6ff4518 100644
--- a/com.discord/smali/androidx/viewpager/widget/PagerTabStrip.smali
+++ b/com.discord/smali/androidx/viewpager/widget/PagerTabStrip.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/viewpager/widget/PagerTabStrip;
 .super Landroidx/viewpager/widget/PagerTitleStrip;
+.source "PagerTabStrip.java"
 
 
 # static fields
@@ -439,7 +440,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     iget v0, p0, Landroidx/viewpager/widget/PagerTabStrip;->mInitialMotionX:F
@@ -477,7 +478,7 @@
     :cond_1
     iput-boolean v3, p0, Landroidx/viewpager/widget/PagerTabStrip;->mIgnoreTap:Z
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     iget-object p1, p0, Landroidx/viewpager/widget/PagerTabStrip;->mCurrText:Landroid/widget/TextView;
@@ -506,10 +507,9 @@
 
     sub-int/2addr v0, v3
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroidx/viewpager/widget/ViewPager;->setCurrentItem(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object p1, p0, Landroidx/viewpager/widget/PagerTabStrip;->mCurrText:Landroid/widget/TextView;
@@ -538,6 +538,8 @@
 
     add-int/2addr v0, v3
 
+    invoke-virtual {p1, v0}, Landroidx/viewpager/widget/ViewPager;->setCurrentItem(I)V
+
     goto :goto_0
 
     :pswitch_2
@@ -548,9 +550,11 @@
     iput-boolean v1, p0, Landroidx/viewpager/widget/PagerTabStrip;->mIgnoreTap:Z
 
     :cond_3
-    :goto_1
+    :goto_0
     return v3
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
@@ -667,7 +671,7 @@
 
     if-ge p4, v0, :cond_0
 
-    iget p4, p0, Landroidx/viewpager/widget/PagerTabStrip;->mMinPaddingBottom:I
+    move p4, v0
 
     :cond_0
     invoke-super {p0, p1, p2, p3, p4}, Landroidx/viewpager/widget/PagerTitleStrip;->setPadding(IIII)V
@@ -722,7 +726,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget p1, p0, Landroidx/viewpager/widget/PagerTabStrip;->mMinTextSpacing:I
+    move p1, v0
 
     :cond_0
     invoke-super {p0, p1}, Landroidx/viewpager/widget/PagerTitleStrip;->setTextSpacing(I)V
diff --git a/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$PageListener.smali b/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$PageListener.smali
index 598aef56fe..76b361b95c 100644
--- a/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$PageListener.smali
+++ b/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$PageListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/PagerTitleStrip$PageListener;
 .super Landroid/database/DataSetObserver;
+.source "PagerTitleStrip.java"
 
 # interfaces
 .implements Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;
@@ -51,9 +52,7 @@
 
     iget-object v0, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
 
-    iget-object v1, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
-
-    iget-object v1, v1, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
+    iget-object v1, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
 
     invoke-virtual {v1}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
 
@@ -86,9 +85,7 @@
     :cond_0
     iget-object v0, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
 
-    iget-object v2, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
-
-    iget-object v2, v2, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
+    iget-object v2, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
 
     invoke-virtual {v2}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
 
@@ -139,9 +136,7 @@
 
     iget-object p1, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
 
-    iget-object v0, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
-
-    iget-object v0, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p1, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
 
     invoke-virtual {v0}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
 
@@ -174,9 +169,7 @@
     :cond_0
     iget-object p1, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
 
-    iget-object v1, p0, Landroidx/viewpager/widget/PagerTitleStrip$PageListener;->this$0:Landroidx/viewpager/widget/PagerTitleStrip;
-
-    iget-object v1, v1, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
+    iget-object v1, p1, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
 
     invoke-virtual {v1}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
 
diff --git a/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$SingleLineAllCapsTransform.smali b/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$SingleLineAllCapsTransform.smali
index 0703f56561..e8eeeb49cb 100644
--- a/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$SingleLineAllCapsTransform.smali
+++ b/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip$SingleLineAllCapsTransform.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/PagerTitleStrip$SingleLineAllCapsTransform;
 .super Landroid/text/method/SingleLineTransformationMethod;
+.source "PagerTitleStrip.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip.smali b/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip.smali
index 8a30da0b3e..ba95dad310 100644
--- a/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip.smali
+++ b/com.discord/smali/androidx/viewpager/widget/PagerTitleStrip.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/viewpager/widget/PagerTitleStrip;
 .super Landroid/view/ViewGroup;
+.source "PagerTitleStrip.java"
 
 
 # annotations
@@ -420,8 +421,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mWatchingAdapter:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
@@ -457,8 +456,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
-
     invoke-virtual {v0}, Landroidx/viewpager/widget/ViewPager;->getAdapter()Landroidx/viewpager/widget/PagerAdapter;
 
     move-result-object v0
@@ -494,18 +491,21 @@
 
     const/4 p2, 0x0
 
-    cmpl-float p1, p1, p2
+    cmpl-float p3, p1, p2
 
-    if-ltz p1, :cond_0
+    if-ltz p3, :cond_0
 
-    iget p2, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mLastKnownPositionOffset:F
+    goto :goto_0
 
     :cond_0
-    iget p1, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mLastKnownCurrentPage:I
+    const/4 p1, 0x0
+
+    :goto_0
+    iget p2, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mLastKnownCurrentPage:I
 
     const/4 p3, 0x1
 
-    invoke-virtual {p0, p1, p2, p3}, Landroidx/viewpager/widget/PagerTitleStrip;->updateTextPositions(IFZ)V
+    invoke-virtual {p0, p2, p1, p3}, Landroidx/viewpager/widget/PagerTitleStrip;->updateTextPositions(IFZ)V
 
     :cond_1
     return-void
@@ -782,15 +782,13 @@
 
     if-eqz p1, :cond_2
 
-    const/4 p1, -0x1
+    const/4 v0, -0x1
 
-    iput p1, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mLastKnownCurrentPage:I
+    iput v0, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mLastKnownCurrentPage:I
 
-    const/high16 p1, -0x40800000    # -1.0f
+    const/high16 v0, -0x40800000    # -1.0f
 
-    iput p1, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mLastKnownPositionOffset:F
-
-    iget-object p1, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mPager:Landroidx/viewpager/widget/ViewPager;
+    iput v0, p0, Landroidx/viewpager/widget/PagerTitleStrip;->mLastKnownPositionOffset:F
 
     invoke-virtual {p1}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
 
@@ -967,7 +965,7 @@
 .end method
 
 .method updateTextPositions(IFZ)V
-    .locals 18
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -1133,7 +1131,7 @@
 
     add-int/2addr v2, v12
 
-    move/from16 v17, v4
+    move/from16 p1, v4
 
     iget-object v4, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mNextText:Landroid/widget/TextView;
 
@@ -1169,13 +1167,19 @@
 
     add-int/2addr v10, v15
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     sub-int/2addr v7, v11
 
     sub-int/2addr v7, v2
 
+    add-int/2addr v5, v7
+
+    add-int/2addr v12, v7
+
+    add-int v10, v7, v15
+
     goto :goto_1
 
     :cond_4
@@ -1187,19 +1191,16 @@
 
     div-int/lit8 v7, v7, 0x2
 
-    :goto_1
     add-int/2addr v5, v7
 
     add-int/2addr v12, v7
 
     add-int v10, v7, v15
 
-    :goto_2
+    :goto_1
     iget-object v2, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mCurrText:Landroid/widget/TextView;
 
-    iget-object v4, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mCurrText:Landroid/widget/TextView;
-
-    invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredHeight()I
+    invoke-virtual {v2}, Landroid/widget/TextView;->getMeasuredHeight()I
 
     move-result v4
 
@@ -1221,9 +1222,7 @@
 
     add-int/2addr v1, v2
 
-    iget-object v7, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mPrevText:Landroid/widget/TextView;
-
-    invoke-virtual {v7}, Landroid/widget/TextView;->getMeasuredHeight()I
+    invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredHeight()I
 
     move-result v7
 
@@ -1233,7 +1232,7 @@
 
     sub-int/2addr v6, v9
 
-    sub-int v6, v6, v17
+    sub-int v6, v6, p1
 
     iget v1, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mScaledTextSpacing:I
 
@@ -1245,11 +1244,9 @@
 
     iget-object v2, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mNextText:Landroid/widget/TextView;
 
-    add-int v4, v1, v17
+    add-int v4, v1, p1
 
-    iget-object v3, v0, Landroidx/viewpager/widget/PagerTitleStrip;->mNextText:Landroid/widget/TextView;
-
-    invoke-virtual {v3}, Landroid/widget/TextView;->getMeasuredHeight()I
+    invoke-virtual {v2}, Landroid/widget/TextView;->getMeasuredHeight()I
 
     move-result v3
 
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$1.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$1.smali
index e889e13d48..0a33a62dc6 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$1.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/viewpager/widget/ViewPager$1;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$2.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$2.smali
index a5731e57a3..46e789841d 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$2.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/viewpager/widget/ViewPager$2;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Landroid/view/animation/Interpolator;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$3.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$3.smali
index 55e9df9f4e..2faeb88839 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$3.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/ViewPager$3;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$4.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$4.smali
index 7871895fa0..3989c978dd 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$4.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/ViewPager$4;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Landroidx/core/view/OnApplyWindowInsetsListener;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$DecorView.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$DecorView.smali
index 95a83ab9f9..a5aa4b31fa 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$DecorView.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$DecorView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Landroidx/viewpager/widget/ViewPager$DecorView;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$ItemInfo.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$ItemInfo.smali
index 43a16c25d5..2080e7209f 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$ItemInfo.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$ItemInfo.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/ViewPager$ItemInfo;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$LayoutParams.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$LayoutParams.smali
index 938ae6cc2c..dab2702b0e 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$LayoutParams.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/viewpager/widget/ViewPager$LayoutParams;
 .super Landroid/view/ViewGroup$LayoutParams;
+.source "ViewPager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$MyAccessibilityDelegate.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$MyAccessibilityDelegate.smali
index 2e5664cb17..91c5b25105 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$MyAccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$MyAccessibilityDelegate.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/ViewPager$MyAccessibilityDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "ViewPager.java"
 
 
 # annotations
@@ -209,13 +210,10 @@
 
     iget-object p1, p0, Landroidx/viewpager/widget/ViewPager$MyAccessibilityDelegate;->this$0:Landroidx/viewpager/widget/ViewPager;
 
-    iget-object p2, p0, Landroidx/viewpager/widget/ViewPager$MyAccessibilityDelegate;->this$0:Landroidx/viewpager/widget/ViewPager;
-
-    iget p2, p2, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
+    iget p2, p1, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
     sub-int/2addr p2, p3
 
-    :goto_0
     invoke-virtual {p1, p2}, Landroidx/viewpager/widget/ViewPager;->setCurrentItem(I)V
 
     return p3
@@ -234,13 +232,13 @@
 
     iget-object p1, p0, Landroidx/viewpager/widget/ViewPager$MyAccessibilityDelegate;->this$0:Landroidx/viewpager/widget/ViewPager;
 
-    iget-object p2, p0, Landroidx/viewpager/widget/ViewPager$MyAccessibilityDelegate;->this$0:Landroidx/viewpager/widget/ViewPager;
-
-    iget p2, p2, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
+    iget p2, p1, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
     add-int/2addr p2, p3
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Landroidx/viewpager/widget/ViewPager;->setCurrentItem(I)V
+
+    return p3
 
     :cond_4
     return v0
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$OnAdapterChangeListener.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$OnAdapterChangeListener.smali
index 22eddf3a4a..f9b713b72b 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$OnAdapterChangeListener.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$OnAdapterChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$OnPageChangeListener.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$OnPageChangeListener.smali
index dbc86c4d56..c8c615247d 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$OnPageChangeListener.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$OnPageChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$PageTransformer.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$PageTransformer.smali
index d17fb6744a..798ce0351a 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$PageTransformer.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$PageTransformer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/viewpager/widget/ViewPager$PageTransformer;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$PagerObserver.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$PagerObserver.smali
index 3f8a326441..575077aeba 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$PagerObserver.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$PagerObserver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/ViewPager$PagerObserver;
 .super Landroid/database/DataSetObserver;
+.source "ViewPager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState$1.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState$1.smali
index fbe2a01faa..431372686a 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState$1.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/viewpager/widget/ViewPager$SavedState$1;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState.smali
index ec6df3e78e..251295bd3d 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/viewpager/widget/ViewPager$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "ViewPager.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$SimpleOnPageChangeListener.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$SimpleOnPageChangeListener.smali
index 0776f4fc08..8c2d5a07e8 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$SimpleOnPageChangeListener.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$SimpleOnPageChangeListener.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/viewpager/widget/ViewPager$SimpleOnPageChangeListener;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager$ViewPositionComparator.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager$ViewPositionComparator.smali
index 6ec323064b..27103c9d1d 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager$ViewPositionComparator.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager$ViewPositionComparator.smali
@@ -1,5 +1,6 @@
 .class Landroidx/viewpager/widget/ViewPager$ViewPositionComparator;
 .super Ljava/lang/Object;
+.source "ViewPager.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/androidx/viewpager/widget/ViewPager.smali b/com.discord/smali/androidx/viewpager/widget/ViewPager.smali
index c46e432f29..bde8b5933b 100644
--- a/com.discord/smali/androidx/viewpager/widget/ViewPager.smali
+++ b/com.discord/smali/androidx/viewpager/widget/ViewPager.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/viewpager/widget/ViewPager;
 .super Landroid/view/ViewGroup;
+.source "ViewPager.java"
 
 
 # annotations
@@ -463,7 +464,6 @@
 
     if-ge p3, v5, :cond_6
 
-    :goto_2
     iget-object v5, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
     invoke-virtual {v5, p3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -472,6 +472,7 @@
 
     check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
+    :goto_2
     iget v6, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
     if-le v3, v6, :cond_1
@@ -488,6 +489,14 @@
 
     add-int/lit8 p3, p3, 0x1
 
+    iget-object v5, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
+
+    invoke-virtual {v5, p3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
+
     goto :goto_2
 
     :cond_1
@@ -547,7 +556,6 @@
 
     if-ltz v4, :cond_6
 
-    :goto_5
     iget-object v5, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
     invoke-virtual {v5, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -556,6 +564,7 @@
 
     check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
+    :goto_5
     iget v6, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
     if-ge v3, v6, :cond_4
@@ -564,6 +573,14 @@
 
     add-int/lit8 v4, v4, -0x1
 
+    iget-object v5, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
+
+    invoke-virtual {v5, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
+
     goto :goto_5
 
     :cond_4
@@ -982,9 +999,7 @@
 
     iget-object p3, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
-    iget-object p4, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
-
-    invoke-virtual {p4}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {p3}, Ljava/util/ArrayList;->size()I
 
     move-result p4
 
@@ -1019,8 +1034,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListener:Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
     invoke-interface {v0, p1, p2, p3}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageScrolled(IFI)V
 
     :cond_0
@@ -1028,20 +1041,18 @@
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iget-object v1, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
+    move-result v0
 
     :goto_0
-    if-ge v0, v1, :cond_2
+    if-ge v1, v0, :cond_2
 
     iget-object v2, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
 
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1052,7 +1063,7 @@
     invoke-interface {v2, p1, p2, p3}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageScrolled(IFI)V
 
     :cond_1
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
@@ -1061,8 +1072,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mInternalPageChangeListener:Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
     invoke-interface {v0, p1, p2, p3}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageScrolled(IFI)V
 
     :cond_3
@@ -1076,8 +1085,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListener:Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
     invoke-interface {v0, p1}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageSelected(I)V
 
     :cond_0
@@ -1085,20 +1092,18 @@
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iget-object v1, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
+    move-result v0
 
     :goto_0
-    if-ge v0, v1, :cond_2
+    if-ge v1, v0, :cond_2
 
     iget-object v2, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
 
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1109,7 +1114,7 @@
     invoke-interface {v2, p1}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageSelected(I)V
 
     :cond_1
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
@@ -1118,8 +1123,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mInternalPageChangeListener:Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
     invoke-interface {v0, p1}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageSelected(I)V
 
     :cond_3
@@ -1133,8 +1136,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListener:Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
     invoke-interface {v0, p1}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageScrollStateChanged(I)V
 
     :cond_0
@@ -1142,20 +1143,18 @@
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iget-object v1, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
+    move-result v0
 
     :goto_0
-    if-ge v0, v1, :cond_2
+    if-ge v1, v0, :cond_2
 
     iget-object v2, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
 
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1166,7 +1165,7 @@
     invoke-interface {v2, p1}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageScrollStateChanged(I)V
 
     :cond_1
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
@@ -1175,8 +1174,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mInternalPageChangeListener:Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
     invoke-interface {v0, p1}, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;->onPageScrollStateChanged(I)V
 
     :cond_3
@@ -1236,8 +1233,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->recycle()V
 
     const/4 v0, 0x0
@@ -1427,11 +1422,9 @@
 
     const/4 v6, 0x1
 
-    move-object v5, v3
-
     const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v5, 0x1
 
     const/4 v7, -0x1
 
@@ -1456,7 +1449,7 @@
 
     check-cast v10, Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
-    if-nez v3, :cond_2
+    if-nez v5, :cond_2
 
     iget v11, v10, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
@@ -1495,16 +1488,16 @@
 
     add-float/2addr v7, v0
 
-    if-nez v3, :cond_4
+    if-nez v5, :cond_4
 
-    cmpl-float v3, v2, v8
+    cmpl-float v5, v2, v8
 
-    if-ltz v3, :cond_3
+    if-ltz v5, :cond_3
 
     goto :goto_3
 
     :cond_3
-    return-object v5
+    return-object v3
 
     :cond_4
     :goto_3
@@ -1531,9 +1524,9 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    move-object v5, v10
+    move-object v3, v10
 
-    const/4 v3, 0x0
+    const/4 v5, 0x0
 
     goto :goto_2
 
@@ -1542,7 +1535,7 @@
     return-object v10
 
     :cond_7
-    return-object v5
+    return-object v3
 .end method
 
 .method private static isDecorView(Landroid/view/View;)Z
@@ -1662,8 +1655,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/viewpager/widget/ViewPager;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {p1}, Landroid/view/VelocityTracker;->clear()V
 
     :cond_1
@@ -1722,15 +1713,13 @@
 
     iget v3, p0, Landroidx/viewpager/widget/ViewPager;->mPageMargin:I
 
-    add-int/2addr v3, v2
+    add-int v4, v2, v3
 
-    iget v4, p0, Landroidx/viewpager/widget/ViewPager;->mPageMargin:I
-
-    int-to-float v4, v4
+    int-to-float v3, v3
 
     int-to-float v2, v2
 
-    div-float/2addr v4, v2
+    div-float/2addr v3, v2
 
     iget v5, v0, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
@@ -1744,11 +1733,11 @@
 
     iget v0, v0, Landroidx/viewpager/widget/ViewPager$ItemInfo;->widthFactor:F
 
-    add-float/2addr v0, v4
+    add-float/2addr v0, v3
 
     div-float/2addr p1, v0
 
-    int-to-float v0, v3
+    int-to-float v0, v4
 
     mul-float v0, v0, p1
 
@@ -1819,9 +1808,7 @@
 
     iget-object v5, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
-    iget-object v6, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
-
-    invoke-virtual {v6}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
 
     move-result v6
 
@@ -2301,8 +2288,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mDrawingOrderedChildren:Ljava/util/ArrayList;
-
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
     :goto_0
@@ -2803,9 +2788,9 @@
 
     const/16 v5, 0x11
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
-    if-eq v0, v3, :cond_7
+    if-eq v0, v3, :cond_8
 
     if-ne p1, v5, :cond_6
 
@@ -2829,18 +2814,21 @@
 
     if-lt v1, v2, :cond_5
 
+    invoke-virtual {p0}, Landroidx/viewpager/widget/ViewPager;->pageLeft()Z
+
+    move-result v2
+
     goto :goto_5
 
     :cond_5
-    :goto_4
     invoke-virtual {v0}, Landroid/view/View;->requestFocus()Z
 
     move-result v2
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_6
-    if-ne p1, v4, :cond_b
+    if-ne p1, v4, :cond_c
 
     iget-object v1, p0, Landroidx/viewpager/widget/ViewPager;->mTempRect:Landroid/graphics/Rect;
 
@@ -2858,42 +2846,47 @@
 
     iget v2, v2, Landroid/graphics/Rect;->left:I
 
-    if-eqz v3, :cond_5
+    if-eqz v3, :cond_7
 
-    if-le v1, v2, :cond_9
-
-    goto :goto_4
+    if-le v1, v2, :cond_a
 
     :cond_7
-    if-eq p1, v5, :cond_a
+    invoke-virtual {v0}, Landroid/view/View;->requestFocus()Z
 
-    if-ne p1, v1, :cond_8
+    move-result v2
 
     goto :goto_5
 
     :cond_8
-    if-eq p1, v4, :cond_9
+    if-eq p1, v5, :cond_b
+
+    if-ne p1, v1, :cond_9
+
+    goto :goto_4
+
+    :cond_9
+    if-eq p1, v4, :cond_a
 
     const/4 v0, 0x2
 
-    if-ne p1, v0, :cond_b
+    if-ne p1, v0, :cond_c
 
-    :cond_9
+    :cond_a
     invoke-virtual {p0}, Landroidx/viewpager/widget/ViewPager;->pageRight()Z
 
     move-result v2
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_a
-    :goto_5
+    :cond_b
+    :goto_4
     invoke-virtual {p0}, Landroidx/viewpager/widget/ViewPager;->pageLeft()Z
 
     move-result v2
 
-    :cond_b
-    :goto_6
-    if-eqz v2, :cond_c
+    :cond_c
+    :goto_5
+    if-eqz v2, :cond_d
 
     invoke-static {p1}, Landroid/view/SoundEffectConstants;->getContantForFocusDirection(I)I
 
@@ -2901,7 +2894,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/viewpager/widget/ViewPager;->playSoundEffect(I)V
 
-    :cond_c
+    :cond_d
     return v2
 .end method
 
@@ -2942,8 +2935,6 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Landroidx/viewpager/widget/ViewPager;->mVelocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v1}, Landroid/view/VelocityTracker;->clear()V
 
     :goto_0
@@ -3136,7 +3127,7 @@
     return v1
 
     :cond_2
-    if-lez p1, :cond_3
+    if-lez p1, :cond_4
 
     int-to-float p1, v0
 
@@ -3152,6 +3143,9 @@
 
     :cond_3
     return v1
+
+    :cond_4
+    return v1
 .end method
 
 .method protected checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
@@ -3184,8 +3178,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
     :cond_0
@@ -3398,11 +3390,14 @@
 
     move v6, v5
 
-    :cond_2
-    :goto_2
     const/4 v5, 0x1
 
-    goto :goto_3
+    goto :goto_2
+
+    :cond_2
+    const/4 v5, 0x1
+
+    goto :goto_2
 
     :cond_3
     iget v9, v7, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
@@ -3420,10 +3415,10 @@
     :cond_4
     iput v8, v7, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
-    goto :goto_2
+    const/4 v5, 0x1
 
     :cond_5
-    :goto_3
+    :goto_2
     add-int/2addr v1, v3
 
     goto :goto_1
@@ -3450,7 +3445,7 @@
 
     const/4 v1, 0x0
 
-    :goto_4
+    :goto_3
     if-ge v1, v0, :cond_9
 
     invoke-virtual {p0, v1}, Landroidx/viewpager/widget/ViewPager;->getChildAt(I)Landroid/view/View;
@@ -3474,7 +3469,7 @@
     :cond_8
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_9
     invoke-virtual {p0, v6, v4, v3}, Landroidx/viewpager/widget/ViewPager;->setCurrentItemInternal(IZZ)V
@@ -3627,8 +3622,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     invoke-virtual {v0}, Landroidx/viewpager/widget/PagerAdapter;->getCount()I
 
     move-result v0
@@ -3945,7 +3938,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     invoke-virtual {p1, v2}, Landroid/view/KeyEvent;->hasModifiers(I)Z
@@ -3958,12 +3951,16 @@
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const/16 p1, 0x42
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroidx/viewpager/widget/ViewPager;->arrowScroll(I)Z
+
+    move-result p1
+
+    goto :goto_1
 
     :pswitch_1
     invoke-virtual {p1, v2}, Landroid/view/KeyEvent;->hasModifiers(I)Z
@@ -3976,17 +3973,16 @@
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/16 p1, 0x11
 
-    :goto_0
     invoke-virtual {p0, p1}, Landroidx/viewpager/widget/ViewPager;->arrowScroll(I)Z
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-virtual {p1}, Landroid/view/KeyEvent;->hasNoModifiers()Z
@@ -3999,7 +3995,7 @@
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const/4 v0, 0x1
@@ -4014,13 +4010,13 @@
 
     move-result p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
-    :goto_1
+    :goto_0
     const/4 p1, 0x0
 
-    :goto_2
+    :goto_1
     return p1
 
     :pswitch_data_0
@@ -4084,9 +4080,7 @@
 
     iget-object v4, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
-    iget-object v5, p0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
-
-    invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v4}, Ljava/util/ArrayList;->size()I
 
     move-result v5
 
@@ -4573,8 +4567,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mScroller:Landroid/widget/Scroller;
-
     invoke-virtual {v0}, Landroid/widget/Scroller;->isFinished()Z
 
     move-result v0
@@ -5621,20 +5613,24 @@
     :goto_3
     const/high16 v10, -0x80000000
 
-    if-eqz v11, :cond_5
+    if-eqz v11, :cond_4
 
     const/high16 v10, 0x40000000    # 2.0f
 
-    :cond_4
     const/high16 v12, -0x80000000
 
     goto :goto_4
 
-    :cond_5
-    if-eqz v7, :cond_4
+    :cond_4
+    if-eqz v7, :cond_5
 
     const/high16 v12, 0x40000000    # 2.0f
 
+    goto :goto_4
+
+    :cond_5
+    const/high16 v12, -0x80000000
+
     :goto_4
     iget v13, v6, Landroidx/viewpager/widget/ViewPager$LayoutParams;->width:I
 
@@ -5652,20 +5648,21 @@
 
     move v13, v10
 
+    const/high16 v10, 0x40000000    # 2.0f
+
     goto :goto_5
 
     :cond_6
     move v13, v3
 
-    :goto_5
     const/high16 v10, 0x40000000    # 2.0f
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     move v13, v3
 
-    :goto_6
+    :goto_5
     iget v1, v6, Landroidx/viewpager/widget/ViewPager$LayoutParams;->height:I
 
     if-eq v1, v15, :cond_9
@@ -5676,19 +5673,19 @@
 
     iget v1, v6, Landroidx/viewpager/widget/ViewPager$LayoutParams;->height:I
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_8
     move v1, v5
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_9
     move v1, v5
 
     move v8, v12
 
-    :goto_7
+    :goto_6
     invoke-static {v13, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result v6
@@ -5707,7 +5704,7 @@
 
     sub-int/2addr v5, v1
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_a
     if-eqz v7, :cond_b
@@ -5719,7 +5716,7 @@
     sub-int/2addr v3, v1
 
     :cond_b
-    :goto_8
+    :goto_7
     add-int/lit8 v2, v2, 0x1
 
     const/4 v1, 0x0
@@ -5751,7 +5748,7 @@
 
     move-result v2
 
-    :goto_9
+    :goto_8
     if-ge v1, v2, :cond_f
 
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->getChildAt(I)Landroid/view/View;
@@ -5796,7 +5793,7 @@
     :cond_e
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_f
     return-void
@@ -5874,7 +5871,7 @@
 
     move v9, v4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     sub-int v9, v5, v7
@@ -5891,6 +5888,12 @@
 
     add-int/2addr v7, v10
 
+    move v11, v9
+
+    move v9, v4
+
+    move v4, v11
+
     goto :goto_1
 
     :cond_1
@@ -5900,7 +5903,7 @@
 
     add-int/2addr v9, v4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-virtual {v8}, Landroid/view/View;->getMeasuredWidth()I
@@ -5915,14 +5918,13 @@
 
     move-result v9
 
-    :goto_1
     move v11, v9
 
     move v9, v4
 
     move v4, v11
 
-    :goto_2
+    :goto_1
     add-int/2addr v4, v0
 
     invoke-virtual {v8}, Landroid/view/View;->getLeft()I
@@ -5958,7 +5960,7 @@
 
     move-result p2
 
-    :goto_3
+    :goto_2
     if-ge v1, p2, :cond_7
 
     invoke-virtual {p0, v1}, Landroidx/viewpager/widget/ViewPager;->getChildAt(I)Landroid/view/View;
@@ -5998,7 +6000,7 @@
     :cond_6
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
     iput-boolean v2, p0, Landroidx/viewpager/widget/ViewPager;->mCalledSuper:Z
@@ -6015,15 +6017,15 @@
 
     and-int/lit8 v1, p1, 0x2
 
-    const/4 v2, -0x1
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    const/4 v3, -0x1
 
     const/4 v4, 0x1
 
     if-eqz v1, :cond_0
 
-    move v2, v0
+    move v3, v0
 
     const/4 v0, 0x0
 
@@ -6037,7 +6039,7 @@
     const/4 v1, -0x1
 
     :goto_0
-    if-eq v0, v2, :cond_2
+    if-eq v0, v3, :cond_2
 
     invoke-virtual {p0, v0}, Landroidx/viewpager/widget/ViewPager;->getChildAt(I)Landroid/view/View;
 
@@ -6075,7 +6077,7 @@
     goto :goto_0
 
     :cond_2
-    return v3
+    return v2
 .end method
 
 .method public onRestoreInstanceState(Landroid/os/Parcelable;)V
@@ -6102,8 +6104,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     iget-object v1, p1, Landroidx/viewpager/widget/ViewPager$SavedState;->adapterState:Landroid/os/Parcelable;
 
     iget-object v2, p1, Landroidx/viewpager/widget/ViewPager$SavedState;->loader:Ljava/lang/ClassLoader;
@@ -6155,8 +6155,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     invoke-virtual {v0}, Landroidx/viewpager/widget/PagerAdapter;->saveState()Landroid/os/Parcelable;
 
     move-result-object v0
@@ -6176,9 +6174,7 @@
 
     iget p2, p0, Landroidx/viewpager/widget/ViewPager;->mPageMargin:I
 
-    iget p4, p0, Landroidx/viewpager/widget/ViewPager;->mPageMargin:I
-
-    invoke-direct {p0, p1, p3, p2, p4}, Landroidx/viewpager/widget/ViewPager;->recomputeScrollPosition(IIII)V
+    invoke-direct {p0, p1, p3, p2, p2}, Landroidx/viewpager/widget/ViewPager;->recomputeScrollPosition(IIII)V
 
     :cond_0
     return-void
@@ -6217,15 +6213,13 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     invoke-virtual {v0}, Landroidx/viewpager/widget/PagerAdapter;->getCount()I
 
     move-result v0
 
     if-nez v0, :cond_2
 
-    goto/16 :goto_4
+    goto/16 :goto_2
 
     :cond_2
     iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mVelocityTracker:Landroid/view/VelocityTracker;
@@ -6252,7 +6246,7 @@
     packed-switch v0, :pswitch_data_0
 
     :pswitch_0
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_1
     invoke-direct {p0, p1}, Landroidx/viewpager/widget/ViewPager;->onSecondaryPointerUp(Landroid/view/MotionEvent;)V
@@ -6269,7 +6263,7 @@
 
     iput p1, p0, Landroidx/viewpager/widget/ViewPager;->mLastMotionX:F
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_2
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionIndex()I
@@ -6286,7 +6280,9 @@
 
     move-result p1
 
-    goto/16 :goto_2
+    iput p1, p0, Landroidx/viewpager/widget/ViewPager;->mActivePointerId:I
+
+    goto/16 :goto_1
 
     :pswitch_3
     iget-boolean p1, p0, Landroidx/viewpager/widget/ViewPager;->mIsBeingDragged:Z
@@ -6297,6 +6293,10 @@
 
     invoke-direct {p0, p1, v1, v2, v2}, Landroidx/viewpager/widget/ViewPager;->scrollToItem(IZIZ)V
 
+    invoke-direct {p0}, Landroidx/viewpager/widget/ViewPager;->resetTouch()Z
+
+    move-result v2
+
     goto/16 :goto_1
 
     :pswitch_4
@@ -6314,6 +6314,10 @@
 
     if-ne v0, v3, :cond_4
 
+    invoke-direct {p0}, Landroidx/viewpager/widget/ViewPager;->resetTouch()Z
+
+    move-result v2
+
     goto/16 :goto_1
 
     :cond_4
@@ -6361,33 +6365,29 @@
 
     sub-float/2addr v3, v4
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
-    cmpl-float v3, v3, v4
+    cmpl-float v3, v3, v5
 
     if-lez v3, :cond_5
 
-    iget v3, p0, Landroidx/viewpager/widget/ViewPager;->mInitialMotionX:F
+    iget v3, p0, Landroidx/viewpager/widget/ViewPager;->mTouchSlop:I
 
-    iget v4, p0, Landroidx/viewpager/widget/ViewPager;->mTouchSlop:I
+    int-to-float v3, v3
 
-    int-to-float v4, v4
-
-    add-float/2addr v3, v4
+    add-float/2addr v4, v3
 
     goto :goto_0
 
     :cond_5
-    iget v3, p0, Landroidx/viewpager/widget/ViewPager;->mInitialMotionX:F
+    iget v3, p0, Landroidx/viewpager/widget/ViewPager;->mTouchSlop:I
 
-    iget v4, p0, Landroidx/viewpager/widget/ViewPager;->mTouchSlop:I
+    int-to-float v3, v3
 
-    int-to-float v4, v4
-
-    sub-float/2addr v3, v4
+    sub-float/2addr v4, v3
 
     :goto_0
-    iput v3, p0, Landroidx/viewpager/widget/ViewPager;->mLastMotionX:F
+    iput v4, p0, Landroidx/viewpager/widget/ViewPager;->mLastMotionX:F
 
     iput v0, p0, Landroidx/viewpager/widget/ViewPager;->mLastMotionY:F
 
@@ -6424,7 +6424,7 @@
 
     or-int/2addr v2, p1
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_5
     iget-boolean v0, p0, Landroidx/viewpager/widget/ViewPager;->mIsBeingDragged:Z
@@ -6509,12 +6509,11 @@
 
     invoke-virtual {p0, p1, v1, v1, v0}, Landroidx/viewpager/widget/ViewPager;->setCurrentItemInternal(IZZI)V
 
-    :goto_1
     invoke-direct {p0}, Landroidx/viewpager/widget/ViewPager;->resetTouch()Z
 
     move-result v2
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_6
     iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mScroller:Landroid/widget/Scroller;
@@ -6545,11 +6544,10 @@
 
     move-result p1
 
-    :goto_2
     iput p1, p0, Landroidx/viewpager/widget/ViewPager;->mActivePointerId:I
 
     :cond_7
-    :goto_3
+    :goto_1
     if-eqz v2, :cond_8
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
@@ -6558,7 +6556,7 @@
     return v1
 
     :cond_9
-    :goto_4
+    :goto_2
     return v2
 
     nop
@@ -6582,8 +6580,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
-
     const/4 v1, 0x1
 
     sub-int/2addr v0, v1
@@ -6605,19 +6601,17 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
+    iget v1, p0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
-    iget-object v1, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
+    invoke-virtual {v0}, Landroidx/viewpager/widget/PagerAdapter;->getCount()I
 
-    invoke-virtual {v1}, Landroidx/viewpager/widget/PagerAdapter;->getCount()I
-
-    move-result v1
+    move-result v0
 
     const/4 v2, 0x1
 
-    sub-int/2addr v1, v2
+    sub-int/2addr v0, v2
 
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
     iget v0, p0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
@@ -6654,8 +6648,6 @@
 
     if-eq v2, v1, :cond_0
 
-    iget v2, v0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
-
     invoke-virtual {v0, v2}, Landroidx/viewpager/widget/ViewPager;->infoForPosition(I)Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
     move-result-object v2
@@ -6729,7 +6721,7 @@
 
     iget v7, v0, Landroidx/viewpager/widget/ViewPager;->mExpectedAdapterCount:I
 
-    if-ne v6, v7, :cond_1c
+    if-ne v6, v7, :cond_20
 
     const/4 v7, 0x0
 
@@ -6786,7 +6778,7 @@
     :cond_6
     const/4 v9, 0x0
 
-    if-eqz v8, :cond_15
+    if-eqz v8, :cond_19
 
     add-int/lit8 v10, v7, -0x1
 
@@ -6847,23 +6839,23 @@
     const/4 v7, 0x0
 
     :goto_5
-    if-ltz v14, :cond_d
+    if-ltz v14, :cond_f
 
     cmpl-float v16, v7, v3
 
-    if-ltz v16, :cond_9
+    if-ltz v16, :cond_a
 
-    if-ge v14, v4, :cond_9
+    if-ge v14, v4, :cond_a
 
-    if-eqz v11, :cond_d
+    if-eqz v11, :cond_f
 
     iget v5, v11, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
-    if-ne v14, v5, :cond_c
+    if-ne v14, v5, :cond_e
 
     iget-boolean v5, v11, Landroidx/viewpager/widget/ViewPager$ItemInfo;->scrolling:Z
 
-    if-nez v5, :cond_c
+    if-nez v5, :cond_e
 
     iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
@@ -6879,16 +6871,32 @@
 
     add-int/lit8 v10, v10, -0x1
 
-    if-ltz v15, :cond_b
+    if-ltz v15, :cond_9
+
+    iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
+
+    invoke-virtual {v5, v15}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
     goto :goto_6
 
     :cond_9
-    if-eqz v11, :cond_a
+    const/4 v5, 0x0
+
+    :goto_6
+    move-object v11, v5
+
+    goto :goto_9
+
+    :cond_a
+    if-eqz v11, :cond_c
 
     iget v5, v11, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
-    if-ne v14, v5, :cond_a
+    if-ne v14, v5, :cond_c
 
     iget v5, v11, Landroidx/viewpager/widget/ViewPager$ItemInfo;->widthFactor:F
 
@@ -6898,24 +6906,6 @@
 
     if-ltz v15, :cond_b
 
-    goto :goto_6
-
-    :cond_a
-    add-int/lit8 v5, v15, 0x1
-
-    invoke-virtual {v0, v14, v5}, Landroidx/viewpager/widget/ViewPager;->addNewItem(II)Landroidx/viewpager/widget/ViewPager$ItemInfo;
-
-    move-result-object v5
-
-    iget v5, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->widthFactor:F
-
-    add-float/2addr v7, v5
-
-    add-int/lit8 v10, v10, 0x1
-
-    if-ltz v15, :cond_b
-
-    :goto_6
     iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
     invoke-virtual {v5, v15}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -6932,21 +6922,55 @@
     :goto_7
     move-object v11, v5
 
+    goto :goto_9
+
     :cond_c
+    add-int/lit8 v5, v15, 0x1
+
+    invoke-virtual {v0, v14, v5}, Landroidx/viewpager/widget/ViewPager;->addNewItem(II)Landroidx/viewpager/widget/ViewPager$ItemInfo;
+
+    move-result-object v5
+
+    iget v5, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->widthFactor:F
+
+    add-float/2addr v7, v5
+
+    add-int/lit8 v10, v10, 0x1
+
+    if-ltz v15, :cond_d
+
+    iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
+
+    invoke-virtual {v5, v15}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
+
+    goto :goto_8
+
+    :cond_d
+    const/4 v5, 0x0
+
+    :goto_8
+    move-object v11, v5
+
+    :cond_e
+    :goto_9
     add-int/lit8 v14, v14, -0x1
 
     const/4 v5, 0x0
 
     goto :goto_5
 
-    :cond_d
+    :cond_f
     iget v3, v8, Landroidx/viewpager/widget/ViewPager$ItemInfo;->widthFactor:F
 
     add-int/lit8 v4, v10, 0x1
 
     cmpg-float v5, v3, v13
 
-    if-gez v5, :cond_14
+    if-gez v5, :cond_18
 
     iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
@@ -6954,7 +6978,7 @@
 
     move-result v5
 
-    if-ge v4, v5, :cond_e
+    if-ge v4, v5, :cond_10
 
     iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
@@ -6964,19 +6988,19 @@
 
     check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
-    goto :goto_8
+    goto :goto_a
 
-    :cond_e
+    :cond_10
     const/4 v5, 0x0
 
-    :goto_8
-    if-gtz v12, :cond_f
+    :goto_a
+    if-gtz v12, :cond_11
 
     const/4 v7, 0x0
 
-    goto :goto_9
+    goto :goto_b
 
-    :cond_f
+    :cond_11
     invoke-virtual/range {p0 .. p0}, Landroidx/viewpager/widget/ViewPager;->getPaddingRight()I
 
     move-result v7
@@ -6989,29 +7013,29 @@
 
     add-float/2addr v7, v13
 
-    :goto_9
+    :goto_b
     iget v11, v0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
-    :goto_a
+    :goto_c
     add-int/lit8 v11, v11, 0x1
 
-    if-ge v11, v6, :cond_14
+    if-ge v11, v6, :cond_18
 
     cmpl-float v12, v3, v7
 
-    if-ltz v12, :cond_11
+    if-ltz v12, :cond_13
 
-    if-le v11, v1, :cond_11
+    if-le v11, v1, :cond_13
 
-    if-eqz v5, :cond_14
+    if-eqz v5, :cond_18
 
     iget v12, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
-    if-ne v11, v12, :cond_13
+    if-ne v11, v12, :cond_17
 
     iget-boolean v12, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->scrolling:Z
 
-    if-nez v12, :cond_13
+    if-nez v12, :cond_17
 
     iget-object v12, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
@@ -7029,9 +7053,8 @@
 
     move-result v5
 
-    if-ge v4, v5, :cond_10
+    if-ge v4, v5, :cond_12
 
-    :goto_b
     iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
     invoke-virtual {v5, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -7040,19 +7063,19 @@
 
     check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
-    goto :goto_c
+    goto :goto_d
 
-    :cond_10
+    :cond_12
     const/4 v5, 0x0
 
-    goto :goto_c
+    goto :goto_d
 
-    :cond_11
-    if-eqz v5, :cond_12
+    :cond_13
+    if-eqz v5, :cond_15
 
     iget v12, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
-    if-ne v11, v12, :cond_12
+    if-ne v11, v12, :cond_15
 
     iget v5, v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;->widthFactor:F
 
@@ -7066,11 +7089,24 @@
 
     move-result v5
 
-    if-ge v4, v5, :cond_10
+    if-ge v4, v5, :cond_14
 
-    goto :goto_b
+    iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
-    :cond_12
+    invoke-virtual {v5, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
+
+    goto :goto_d
+
+    :cond_14
+    const/4 v5, 0x0
+
+    goto :goto_d
+
+    :cond_15
     invoke-virtual {v0, v11, v4}, Landroidx/viewpager/widget/ViewPager;->addNewItem(II)Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
     move-result-object v5
@@ -7087,15 +7123,26 @@
 
     move-result v5
 
-    if-ge v4, v5, :cond_10
+    if-ge v4, v5, :cond_16
 
-    goto :goto_b
+    iget-object v5, v0, Landroidx/viewpager/widget/ViewPager;->mItems:Ljava/util/ArrayList;
 
-    :cond_13
-    :goto_c
-    goto :goto_a
+    invoke-virtual {v5, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    :cond_14
+    move-result-object v5
+
+    check-cast v5, Landroidx/viewpager/widget/ViewPager$ItemInfo;
+
+    goto :goto_d
+
+    :cond_16
+    const/4 v5, 0x0
+
+    :cond_17
+    :goto_d
+    goto :goto_c
+
+    :cond_18
     invoke-direct {v0, v8, v10, v2}, Landroidx/viewpager/widget/ViewPager;->calculatePageOffsets(Landroidx/viewpager/widget/ViewPager$ItemInfo;ILandroidx/viewpager/widget/ViewPager$ItemInfo;)V
 
     iget-object v1, v0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
@@ -7106,7 +7153,7 @@
 
     invoke-virtual {v1, v0, v2, v3}, Landroidx/viewpager/widget/PagerAdapter;->setPrimaryItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V
 
-    :cond_15
+    :cond_19
     iget-object v1, v0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
 
     invoke-virtual {v1, v0}, Landroidx/viewpager/widget/PagerAdapter;->finishUpdate(Landroid/view/ViewGroup;)V
@@ -7117,8 +7164,8 @@
 
     const/4 v2, 0x0
 
-    :goto_d
-    if-ge v2, v1, :cond_17
+    :goto_e
+    if-ge v2, v1, :cond_1b
 
     invoke-virtual {v0, v2}, Landroidx/viewpager/widget/ViewPager;->getChildAt(I)Landroid/view/View;
 
@@ -7134,19 +7181,19 @@
 
     iget-boolean v5, v4, Landroidx/viewpager/widget/ViewPager$LayoutParams;->isDecor:Z
 
-    if-nez v5, :cond_16
+    if-nez v5, :cond_1a
 
     iget v5, v4, Landroidx/viewpager/widget/ViewPager$LayoutParams;->widthFactor:F
 
     cmpl-float v5, v5, v9
 
-    if-nez v5, :cond_16
+    if-nez v5, :cond_1a
 
     invoke-virtual {v0, v3}, Landroidx/viewpager/widget/ViewPager;->infoForChild(Landroid/view/View;)Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
     move-result-object v3
 
-    if-eqz v3, :cond_16
+    if-eqz v3, :cond_1a
 
     iget v5, v3, Landroidx/viewpager/widget/ViewPager$ItemInfo;->widthFactor:F
 
@@ -7156,53 +7203,53 @@
 
     iput v3, v4, Landroidx/viewpager/widget/ViewPager$LayoutParams;->position:I
 
-    :cond_16
+    :cond_1a
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_d
+    goto :goto_e
 
-    :cond_17
+    :cond_1b
     invoke-direct/range {p0 .. p0}, Landroidx/viewpager/widget/ViewPager;->sortChildDrawingOrder()V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/viewpager/widget/ViewPager;->hasFocus()Z
 
     move-result v1
 
-    if-eqz v1, :cond_1b
+    if-eqz v1, :cond_1f
 
     invoke-virtual/range {p0 .. p0}, Landroidx/viewpager/widget/ViewPager;->findFocus()Landroid/view/View;
 
     move-result-object v1
 
-    if-eqz v1, :cond_18
+    if-eqz v1, :cond_1c
 
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->infoForAnyChild(Landroid/view/View;)Landroidx/viewpager/widget/ViewPager$ItemInfo;
 
     move-result-object v3
 
-    goto :goto_e
+    goto :goto_f
 
-    :cond_18
+    :cond_1c
     const/4 v3, 0x0
 
-    :goto_e
-    if-eqz v3, :cond_19
+    :goto_f
+    if-eqz v3, :cond_1d
 
     iget v1, v3, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
     iget v2, v0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
-    if-eq v1, v2, :cond_1b
+    if-eq v1, v2, :cond_1f
 
-    :cond_19
+    :cond_1d
     const/4 v1, 0x0
 
-    :goto_f
+    :goto_10
     invoke-virtual/range {p0 .. p0}, Landroidx/viewpager/widget/ViewPager;->getChildCount()I
 
     move-result v2
 
-    if-ge v1, v2, :cond_1b
+    if-ge v1, v2, :cond_1f
 
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->getChildAt(I)Landroid/view/View;
 
@@ -7212,13 +7259,13 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_1a
+    if-eqz v3, :cond_1e
 
     iget v3, v3, Landroidx/viewpager/widget/ViewPager$ItemInfo;->position:I
 
     iget v4, v0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
-    if-ne v3, v4, :cond_1a
+    if-ne v3, v4, :cond_1e
 
     const/4 v3, 0x2
 
@@ -7226,17 +7273,17 @@
 
     move-result v2
 
-    if-nez v2, :cond_1b
+    if-nez v2, :cond_1f
 
-    :cond_1a
+    :cond_1e
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_f
+    goto :goto_10
 
-    :cond_1b
+    :cond_1f
     return-void
 
-    :cond_1c
+    :cond_20
     :try_start_0
     invoke-virtual/range {p0 .. p0}, Landroidx/viewpager/widget/ViewPager;->getResources()Landroid/content/res/Resources;
 
@@ -7252,7 +7299,7 @@
     :try_end_0
     .catch Landroid/content/res/Resources$NotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_10
+    goto :goto_11
 
     :catch_0
     invoke-virtual/range {p0 .. p0}, Landroidx/viewpager/widget/ViewPager;->getId()I
@@ -7263,7 +7310,7 @@
 
     move-result-object v1
 
-    :goto_10
+    :goto_11
     new-instance v2, Ljava/lang/IllegalStateException;
 
     new-instance v3, Ljava/lang/StringBuilder;
@@ -7317,6 +7364,8 @@
     invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v2
+
+    return-void
 .end method
 
 .method public removeOnAdapterChangeListener(Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;)V
@@ -7330,8 +7379,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapterChangeListeners:Ljava/util/List;
-
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     :cond_0
@@ -7349,8 +7396,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mOnPageChangeListeners:Ljava/util/List;
-
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     :cond_0
@@ -7389,8 +7434,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/PagerAdapter;->setViewPagerObserver(Landroid/database/DataSetObserver;)V
 
     iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
@@ -7529,8 +7572,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Landroidx/viewpager/widget/ViewPager;->mAdapterChangeListeners:Ljava/util/List;
-
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
     move-result v1
@@ -7603,7 +7644,7 @@
 .end method
 
 .method setCurrentItemInternal(IZZI)V
-    .locals 3
+    .locals 4
 
     iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
 
@@ -7611,8 +7652,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     invoke-virtual {v0}, Landroidx/viewpager/widget/PagerAdapter;->getCount()I
 
     move-result v0
@@ -7672,11 +7711,9 @@
 
     iget v2, p0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
 
-    add-int/2addr v2, v0
+    add-int v3, v2, v0
 
-    if-gt p1, v2, :cond_4
-
-    iget v2, p0, Landroidx/viewpager/widget/ViewPager;->mCurItem:I
+    if-gt p1, v3, :cond_4
 
     sub-int/2addr v2, v0
 
@@ -7898,9 +7935,9 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-eqz p2, :cond_0
 
@@ -7942,17 +7979,17 @@
 
     if-eqz p1, :cond_3
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
     :cond_3
-    iput v1, p0, Landroidx/viewpager/widget/ViewPager;->mDrawingOrder:I
+    iput v0, p0, Landroidx/viewpager/widget/ViewPager;->mDrawingOrder:I
 
     iput p3, p0, Landroidx/viewpager/widget/ViewPager;->mPageTransformerLayerType:I
 
     goto :goto_3
 
     :cond_4
-    iput v0, p0, Landroidx/viewpager/widget/ViewPager;->mDrawingOrder:I
+    iput v1, p0, Landroidx/viewpager/widget/ViewPager;->mDrawingOrder:I
 
     :goto_3
     if-eqz v3, :cond_5
@@ -8029,8 +8066,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/viewpager/widget/ViewPager;->mScroller:Landroid/widget/Scroller;
-
     invoke-virtual {v0}, Landroid/widget/Scroller;->isFinished()Z
 
     move-result v0
@@ -8073,6 +8108,8 @@
 
     invoke-direct {p0, v1}, Landroidx/viewpager/widget/ViewPager;->setScrollingCacheEnabled(Z)V
 
+    move v4, v0
+
     goto :goto_2
 
     :cond_3
@@ -8080,9 +8117,9 @@
 
     move-result v0
 
-    :goto_2
     move v4, v0
 
+    :goto_2
     invoke-virtual {p0}, Landroidx/viewpager/widget/ViewPager;->getScrollY()I
 
     move-result v5
diff --git a/com.discord/smali/androidx/work/ArrayCreatingInputMerger.smali b/com.discord/smali/androidx/work/ArrayCreatingInputMerger.smali
index da81955b67..f718c820ab 100644
--- a/com.discord/smali/androidx/work/ArrayCreatingInputMerger.smali
+++ b/com.discord/smali/androidx/work/ArrayCreatingInputMerger.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ArrayCreatingInputMerger;
 .super Landroidx/work/InputMerger;
+.source "ArrayCreatingInputMerger.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/BackoffPolicy.smali b/com.discord/smali/androidx/work/BackoffPolicy.smali
index 7b65572312..8c3953c55f 100644
--- a/com.discord/smali/androidx/work/BackoffPolicy.smali
+++ b/com.discord/smali/androidx/work/BackoffPolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/work/BackoffPolicy;
 .super Ljava/lang/Enum;
+.source "BackoffPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Configuration$Builder.smali b/com.discord/smali/androidx/work/Configuration$Builder.smali
index 505029c8bd..a327b2485f 100644
--- a/com.discord/smali/androidx/work/Configuration$Builder.smali
+++ b/com.discord/smali/androidx/work/Configuration$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Configuration$Builder;
 .super Ljava/lang/Object;
+.source "Configuration.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Configuration.smali b/com.discord/smali/androidx/work/Configuration.smali
index 34aa81befa..ff2d6c1b15 100644
--- a/com.discord/smali/androidx/work/Configuration.smali
+++ b/com.discord/smali/androidx/work/Configuration.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Configuration;
 .super Ljava/lang/Object;
+.source "Configuration.java"
 
 
 # annotations
@@ -52,17 +53,16 @@
 
     move-result-object v0
 
-    :goto_0
     iput-object v0, p0, Landroidx/work/Configuration;->mExecutor:Ljava/util/concurrent/Executor;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p1, Landroidx/work/Configuration$Builder;->mExecutor:Ljava/util/concurrent/Executor;
 
-    goto :goto_0
+    iput-object v0, p0, Landroidx/work/Configuration;->mExecutor:Ljava/util/concurrent/Executor;
 
-    :goto_1
+    :goto_0
     iget-object v0, p1, Landroidx/work/Configuration$Builder;->mWorkerFactory:Landroidx/work/WorkerFactory;
 
     if-nez v0, :cond_1
@@ -71,17 +71,16 @@
 
     move-result-object v0
 
-    :goto_2
     iput-object v0, p0, Landroidx/work/Configuration;->mWorkerFactory:Landroidx/work/WorkerFactory;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     iget-object v0, p1, Landroidx/work/Configuration$Builder;->mWorkerFactory:Landroidx/work/WorkerFactory;
 
-    goto :goto_2
+    iput-object v0, p0, Landroidx/work/Configuration;->mWorkerFactory:Landroidx/work/WorkerFactory;
 
-    :goto_3
+    :goto_1
     iget v0, p1, Landroidx/work/Configuration$Builder;->mLoggingLevel:I
 
     iput v0, p0, Landroidx/work/Configuration;->mLoggingLevel:I
diff --git a/com.discord/smali/androidx/work/Constraints$Builder.smali b/com.discord/smali/androidx/work/Constraints$Builder.smali
index 9a56477047..62f75978db 100644
--- a/com.discord/smali/androidx/work/Constraints$Builder.smali
+++ b/com.discord/smali/androidx/work/Constraints$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Constraints$Builder;
 .super Ljava/lang/Object;
+.source "Constraints.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Constraints.smali b/com.discord/smali/androidx/work/Constraints.smali
index 0d1068b331..ab4141f678 100644
--- a/com.discord/smali/androidx/work/Constraints.smali
+++ b/com.discord/smali/androidx/work/Constraints.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Constraints;
 .super Ljava/lang/Object;
+.source "Constraints.java"
 
 
 # annotations
@@ -197,7 +198,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -248,8 +249,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/work/Constraints;->mContentUriTriggers:Landroidx/work/ContentUriTriggers;
-
     iget-object p1, p1, Landroidx/work/Constraints;->mContentUriTriggers:Landroidx/work/ContentUriTriggers;
 
     invoke-virtual {v2, p1}, Landroidx/work/ContentUriTriggers;->equals(Ljava/lang/Object;)Z
@@ -269,6 +268,9 @@
     return v0
 
     :cond_3
+    return v1
+
+    :cond_4
     :goto_1
     return v1
 .end method
@@ -307,8 +309,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/work/Constraints;->mContentUriTriggers:Landroidx/work/ContentUriTriggers;
-
     invoke-virtual {v0}, Landroidx/work/ContentUriTriggers;->size()I
 
     move-result v0
@@ -364,8 +364,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/work/Constraints;->mContentUriTriggers:Landroidx/work/ContentUriTriggers;
-
     invoke-virtual {v1}, Landroidx/work/ContentUriTriggers;->hashCode()I
 
     move-result v1
diff --git a/com.discord/smali/androidx/work/ContentUriTriggers$Trigger.smali b/com.discord/smali/androidx/work/ContentUriTriggers$Trigger.smali
index 9e1e297d2d..5076211237 100644
--- a/com.discord/smali/androidx/work/ContentUriTriggers$Trigger.smali
+++ b/com.discord/smali/androidx/work/ContentUriTriggers$Trigger.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ContentUriTriggers$Trigger;
 .super Ljava/lang/Object;
+.source "ContentUriTriggers.java"
 
 
 # annotations
@@ -53,7 +54,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -89,6 +90,9 @@
     return v0
 
     :cond_2
+    return v1
+
+    :cond_3
     :goto_0
     return v1
 .end method
diff --git a/com.discord/smali/androidx/work/ContentUriTriggers.smali b/com.discord/smali/androidx/work/ContentUriTriggers.smali
index 331ee1348e..d98d8eafc2 100644
--- a/com.discord/smali/androidx/work/ContentUriTriggers.smali
+++ b/com.discord/smali/androidx/work/ContentUriTriggers.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ContentUriTriggers;
 .super Ljava/lang/Object;
+.source "ContentUriTriggers.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$1.smali
index cf5de208a8..18225fb9d6 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/CoroutineWorker$1;
 .super Ljava/lang/Object;
+.source "CoroutineWorker.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -50,11 +51,11 @@
 
     iget-object v0, p0, Landroidx/work/CoroutineWorker$1;->this$0:Landroidx/work/CoroutineWorker;
 
-    invoke-virtual {v0}, Landroidx/work/CoroutineWorker;->getJob$work_runtime_ktx_minDepVersionsRelease()Lkotlinx/coroutines/al;
+    invoke-virtual {v0}, Landroidx/work/CoroutineWorker;->getJob$work_runtime_ktx_minDepVersionsRelease()Lkotlinx/coroutines/ak;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lkotlinx/coroutines/al;->cancel()V
+    invoke-interface {v0}, Lkotlinx/coroutines/ak;->cancel()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
index 675bbf4b94..12b4928775 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/CoroutineWorker$startWork$1;
 .super Lkotlin/c/b/a/h;
+.source "CoroutineWorker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -19,7 +20,7 @@
     value = {
         "Lkotlin/c/b/a/h;",
         "Lkotlin/jvm/functions/Function2<",
-        "Lkotlinx/coroutines/q;",
+        "Lkotlinx/coroutines/p;",
         "Lkotlin/c/c<",
         "-",
         "Lkotlin/Unit;",
@@ -30,20 +31,20 @@
 .end annotation
 
 .annotation runtime Lkotlin/c/b/a/e;
-    Fd = "CoroutineWorker.kt"
-    Fe = {
+    Fc = "CoroutineWorker.kt"
+    Fd = {
         0x3c,
         0x3f
     }
-    Ff = "invokeSuspend"
-    Fg = "androidx/work/CoroutineWorker$startWork$1"
+    Fe = "invokeSuspend"
+    Ff = "androidx/work/CoroutineWorker$startWork$1"
 .end annotation
 
 
 # instance fields
 .field label:I
 
-.field private p$:Lkotlinx/coroutines/q;
+.field private p$:Lkotlinx/coroutines/p;
 
 .field final synthetic this$0:Landroidx/work/CoroutineWorker;
 
@@ -87,9 +88,9 @@
 
     invoke-direct {v0, v1, p2}, Landroidx/work/CoroutineWorker$startWork$1;-><init>(Landroidx/work/CoroutineWorker;Lkotlin/c/c;)V
 
-    check-cast p1, Lkotlinx/coroutines/q;
+    check-cast p1, Lkotlinx/coroutines/p;
 
-    iput-object p1, v0, Landroidx/work/CoroutineWorker$startWork$1;->p$:Lkotlinx/coroutines/q;
+    iput-object p1, v0, Landroidx/work/CoroutineWorker$startWork$1;->p$:Lkotlinx/coroutines/p;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/work/CoroutineWorker.smali b/com.discord/smali/androidx/work/CoroutineWorker.smali
index 5033b941f1..149e7c1633 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/CoroutineWorker;
 .super Landroidx/work/ListenableWorker;
+.source "CoroutineWorker.kt"
 
 
 # instance fields
@@ -15,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final job:Lkotlinx/coroutines/al;
+.field private final job:Lkotlinx/coroutines/ak;
 
 
 # direct methods
@@ -34,11 +35,11 @@
 
     const/4 p1, 0x0
 
-    invoke-static {p1}, Lkotlinx/coroutines/ap;->a(Lkotlinx/coroutines/al;)Lkotlinx/coroutines/al;
+    invoke-static {p1}, Lkotlinx/coroutines/ao;->a(Lkotlinx/coroutines/ak;)Lkotlinx/coroutines/ak;
 
     move-result-object p1
 
-    iput-object p1, p0, Landroidx/work/CoroutineWorker;->job:Lkotlinx/coroutines/al;
+    iput-object p1, p0, Landroidx/work/CoroutineWorker;->job:Lkotlinx/coroutines/ak;
 
     invoke-static {}, Landroidx/work/impl/utils/futures/SettableFuture;->create()Landroidx/work/impl/utils/futures/SettableFuture;
 
@@ -72,7 +73,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/aa;->FP()Lkotlinx/coroutines/k;
+    invoke-static {}, Lkotlinx/coroutines/z;->FO()Lkotlinx/coroutines/k;
 
     move-result-object p1
 
@@ -120,10 +121,10 @@
     return-object v0
 .end method
 
-.method public final getJob$work_runtime_ktx_minDepVersionsRelease()Lkotlinx/coroutines/al;
+.method public final getJob$work_runtime_ktx_minDepVersionsRelease()Lkotlinx/coroutines/ak;
     .locals 1
 
-    iget-object v0, p0, Landroidx/work/CoroutineWorker;->job:Lkotlinx/coroutines/al;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker;->job:Lkotlinx/coroutines/ak;
 
     return-object v0
 .end method
@@ -157,7 +158,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Landroidx/work/CoroutineWorker;->job:Lkotlinx/coroutines/al;
+    iget-object v1, p0, Landroidx/work/CoroutineWorker;->job:Lkotlinx/coroutines/ak;
 
     check-cast v1, Lkotlin/c/e;
 
@@ -171,7 +172,7 @@
 
     new-instance v1, Lkotlinx/coroutines/a/f;
 
-    sget-object v2, Lkotlinx/coroutines/al;->bSs:Lkotlinx/coroutines/al$b;
+    sget-object v2, Lkotlinx/coroutines/ak;->bSl:Lkotlinx/coroutines/ak$b;
 
     check-cast v2, Lkotlin/c/e$c;
 
@@ -186,7 +187,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v3}, Lkotlinx/coroutines/ap;->a(Lkotlinx/coroutines/al;)Lkotlinx/coroutines/al;
+    invoke-static {v3}, Lkotlinx/coroutines/ao;->a(Lkotlinx/coroutines/ak;)Lkotlinx/coroutines/ak;
 
     move-result-object v2
 
@@ -199,7 +200,7 @@
     :goto_0
     invoke-direct {v1, v0}, Lkotlinx/coroutines/a/f;-><init>(Lkotlin/c/e;)V
 
-    check-cast v1, Lkotlinx/coroutines/q;
+    check-cast v1, Lkotlinx/coroutines/p;
 
     new-instance v0, Landroidx/work/CoroutineWorker$startWork$1;
 
@@ -211,7 +212,7 @@
 
     check-cast v2, Lkotlin/c/e;
 
-    sget-object v4, Lkotlinx/coroutines/r;->bRN:Lkotlinx/coroutines/r;
+    sget-object v4, Lkotlinx/coroutines/q;->bRM:Lkotlinx/coroutines/q;
 
     const-string v5, "receiver$0"
 
@@ -229,15 +230,15 @@
 
     invoke-static {v0, v5}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v2}, Lkotlinx/coroutines/j;->a(Lkotlinx/coroutines/q;Lkotlin/c/e;)Lkotlin/c/e;
+    invoke-static {v1, v2}, Lkotlinx/coroutines/j;->a(Lkotlinx/coroutines/p;Lkotlin/c/e;)Lkotlin/c/e;
 
     move-result-object v1
 
     move-object v2, v4
 
-    check-cast v2, Lkotlinx/coroutines/r;
+    check-cast v2, Lkotlinx/coroutines/q;
 
-    sget-object v5, Lkotlinx/coroutines/r;->bRO:Lkotlinx/coroutines/r;
+    sget-object v5, Lkotlinx/coroutines/q;->bRN:Lkotlinx/coroutines/q;
 
     const/4 v6, 0x1
 
@@ -253,18 +254,18 @@
     :goto_1
     if-eqz v2, :cond_2
 
-    new-instance v2, Lkotlinx/coroutines/at;
+    new-instance v2, Lkotlinx/coroutines/as;
 
-    invoke-direct {v2, v1, v0}, Lkotlinx/coroutines/at;-><init>(Lkotlin/c/e;Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {v2, v1, v0}, Lkotlinx/coroutines/as;-><init>(Lkotlin/c/e;Lkotlin/jvm/functions/Function2;)V
 
-    check-cast v2, Lkotlinx/coroutines/ay;
+    check-cast v2, Lkotlinx/coroutines/ax;
 
     goto :goto_2
 
     :cond_2
-    new-instance v2, Lkotlinx/coroutines/ay;
+    new-instance v2, Lkotlinx/coroutines/ax;
 
-    invoke-direct {v2, v1, v6}, Lkotlinx/coroutines/ay;-><init>(Lkotlin/c/e;Z)V
+    invoke-direct {v2, v1, v6}, Lkotlinx/coroutines/ax;-><init>(Lkotlin/c/e;Z)V
 
     :goto_2
     const-string v1, "start"
@@ -275,7 +276,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lkotlinx/coroutines/a;->Fy()V
+    invoke-virtual {v2}, Lkotlinx/coroutines/a;->Fx()V
 
     move-object v1, v2
 
@@ -289,9 +290,9 @@
 
     invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v5, Lkotlinx/coroutines/s;->$EnumSwitchMapping$1:[I
+    sget-object v5, Lkotlinx/coroutines/r;->$EnumSwitchMapping$1:[I
 
-    invoke-virtual {v4}, Lkotlinx/coroutines/r;->ordinal()I
+    invoke-virtual {v4}, Lkotlinx/coroutines/q;->ordinal()I
 
     move-result v4
 
@@ -349,6 +350,12 @@
 
     sget-object v2, Lkotlin/m;->bPj:Lkotlin/m$a;
 
+    invoke-static {v0}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-interface {v1, v0}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
+
     goto :goto_3
 
     :catchall_0
@@ -370,14 +377,13 @@
 
     move-result-object v0
 
-    :goto_3
     invoke-static {v0}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     invoke-interface {v1, v0}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :pswitch_1
     const-string v3, "receiver$0"
@@ -406,13 +412,13 @@
 
     invoke-interface {v0, v1}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :pswitch_2
     invoke-static {v0, v2, v1}, Lkotlinx/coroutines/b/a;->b(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/c/c;)V
 
     :cond_3
-    :goto_4
+    :goto_3
     :pswitch_3
     iget-object v0, p0, Landroidx/work/CoroutineWorker;->future:Landroidx/work/impl/utils/futures/SettableFuture;
 
@@ -420,6 +426,8 @@
 
     return-object v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
diff --git a/com.discord/smali/androidx/work/Data$Builder.smali b/com.discord/smali/androidx/work/Data$Builder.smali
index 4faccb0174..94c9a4d38d 100644
--- a/com.discord/smali/androidx/work/Data$Builder.smali
+++ b/com.discord/smali/androidx/work/Data$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Data$Builder;
 .super Ljava/lang/Object;
+.source "Data.java"
 
 
 # annotations
@@ -84,7 +85,7 @@
 
     invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
@@ -154,6 +155,8 @@
 
     move-result-object p2
 
+    invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     goto :goto_1
 
     :cond_2
@@ -169,6 +172,8 @@
 
     move-result-object p2
 
+    invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     goto :goto_1
 
     :cond_3
@@ -184,6 +189,8 @@
 
     move-result-object p2
 
+    invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     goto :goto_1
 
     :cond_4
@@ -199,6 +206,8 @@
 
     move-result-object p2
 
+    invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     goto :goto_1
 
     :cond_5
@@ -214,6 +223,8 @@
 
     move-result-object p2
 
+    invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     goto :goto_1
 
     :cond_6
@@ -245,10 +256,9 @@
     :goto_0
     iget-object v0, p0, Landroidx/work/Data$Builder;->mValues:Ljava/util/Map;
 
-    :goto_1
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :goto_2
+    :goto_1
     return-object p0
 .end method
 
diff --git a/com.discord/smali/androidx/work/Data.smali b/com.discord/smali/androidx/work/Data.smali
index f85522837b..a3f88007f4 100644
--- a/com.discord/smali/androidx/work/Data.smali
+++ b/com.discord/smali/androidx/work/Data.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Data;
 .super Ljava/lang/Object;
+.source "Data.java"
 
 
 # annotations
@@ -483,6 +484,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static toByteArray(Landroidx/work/Data;)[B
@@ -704,6 +707,8 @@
 
     :goto_7
     throw p0
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/androidx/work/DataKt.smali b/com.discord/smali/androidx/work/DataKt.smali
index 53cee08989..066ce7e69b 100644
--- a/com.discord/smali/androidx/work/DataKt.smali
+++ b/com.discord/smali/androidx/work/DataKt.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/DataKt;
 .super Ljava/lang/Object;
+.source "Data.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ExistingPeriodicWorkPolicy.smali b/com.discord/smali/androidx/work/ExistingPeriodicWorkPolicy.smali
index 9ec1de8987..5b68f3b890 100644
--- a/com.discord/smali/androidx/work/ExistingPeriodicWorkPolicy.smali
+++ b/com.discord/smali/androidx/work/ExistingPeriodicWorkPolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/work/ExistingPeriodicWorkPolicy;
 .super Ljava/lang/Enum;
+.source "ExistingPeriodicWorkPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ExistingWorkPolicy.smali b/com.discord/smali/androidx/work/ExistingWorkPolicy.smali
index 732e93ff2d..5ecfb77d17 100644
--- a/com.discord/smali/androidx/work/ExistingWorkPolicy.smali
+++ b/com.discord/smali/androidx/work/ExistingWorkPolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/work/ExistingWorkPolicy;
 .super Ljava/lang/Enum;
+.source "ExistingWorkPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/InputMerger.smali b/com.discord/smali/androidx/work/InputMerger.smali
index 044f5b3c8a..8dcf0b0199 100644
--- a/com.discord/smali/androidx/work/InputMerger.smali
+++ b/com.discord/smali/androidx/work/InputMerger.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/InputMerger;
 .super Ljava/lang/Object;
+.source "InputMerger.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/work/ListenableWorker$Payload.smali b/com.discord/smali/androidx/work/ListenableWorker$Payload.smali
index d2ac956cf4..13d0929a30 100644
--- a/com.discord/smali/androidx/work/ListenableWorker$Payload.smali
+++ b/com.discord/smali/androidx/work/ListenableWorker$Payload.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ListenableWorker$Payload;
 .super Ljava/lang/Object;
+.source "ListenableWorker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ListenableWorker$Result.smali b/com.discord/smali/androidx/work/ListenableWorker$Result.smali
index ff46de68ac..298ac03d1f 100644
--- a/com.discord/smali/androidx/work/ListenableWorker$Result.smali
+++ b/com.discord/smali/androidx/work/ListenableWorker$Result.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/work/ListenableWorker$Result;
 .super Ljava/lang/Enum;
+.source "ListenableWorker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ListenableWorker.smali b/com.discord/smali/androidx/work/ListenableWorker.smali
index e05ef1ea40..a3ebe50663 100644
--- a/com.discord/smali/androidx/work/ListenableWorker.smali
+++ b/com.discord/smali/androidx/work/ListenableWorker.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/ListenableWorker;
 .super Ljava/lang/Object;
+.source "ListenableWorker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Logger.smali b/com.discord/smali/androidx/work/Logger.smali
index 142824e5f7..3b443057af 100644
--- a/com.discord/smali/androidx/work/Logger.smali
+++ b/com.discord/smali/androidx/work/Logger.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/Logger;
 .super Ljava/lang/Object;
+.source "Logger.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/NetworkType.smali b/com.discord/smali/androidx/work/NetworkType.smali
index 34a1e69dde..139891fca3 100644
--- a/com.discord/smali/androidx/work/NetworkType.smali
+++ b/com.discord/smali/androidx/work/NetworkType.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/work/NetworkType;
 .super Ljava/lang/Enum;
+.source "NetworkType.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/OneTimeWorkRequest$Builder.smali b/com.discord/smali/androidx/work/OneTimeWorkRequest$Builder.smali
index f93b7dd95a..f182f3289d 100644
--- a/com.discord/smali/androidx/work/OneTimeWorkRequest$Builder.smali
+++ b/com.discord/smali/androidx/work/OneTimeWorkRequest$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/OneTimeWorkRequest$Builder;
 .super Landroidx/work/WorkRequest$Builder;
+.source "OneTimeWorkRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/OneTimeWorkRequest.smali b/com.discord/smali/androidx/work/OneTimeWorkRequest.smali
index 5dbd150eef..fee67f1548 100644
--- a/com.discord/smali/androidx/work/OneTimeWorkRequest.smali
+++ b/com.discord/smali/androidx/work/OneTimeWorkRequest.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/OneTimeWorkRequest;
 .super Landroidx/work/WorkRequest;
+.source "OneTimeWorkRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali b/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
index b9644f199e..e5c266f382 100644
--- a/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
+++ b/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/OneTimeWorkRequestKt;
 .super Ljava/lang/Object;
+.source "OneTimeWorkRequest.kt"
 
 
 # direct methods
@@ -16,7 +17,7 @@
 
     new-instance v0, Landroidx/work/OneTimeWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
diff --git a/com.discord/smali/androidx/work/Operation$1.smali b/com.discord/smali/androidx/work/Operation$1.smali
index 0de5a59704..22f6a22774 100644
--- a/com.discord/smali/androidx/work/Operation$1.smali
+++ b/com.discord/smali/androidx/work/Operation$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/work/Operation$1;
 .super Ljava/lang/Object;
+.source "Operation.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Operation$State$FAILURE.smali b/com.discord/smali/androidx/work/Operation$State$FAILURE.smali
index 1c870ad2b8..aba1b65d0e 100644
--- a/com.discord/smali/androidx/work/Operation$State$FAILURE.smali
+++ b/com.discord/smali/androidx/work/Operation$State$FAILURE.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Operation$State$FAILURE;
 .super Landroidx/work/Operation$State;
+.source "Operation.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Operation$State$IN_PROGRESS.smali b/com.discord/smali/androidx/work/Operation$State$IN_PROGRESS.smali
index 65e11f29fd..a6d8f2e00c 100644
--- a/com.discord/smali/androidx/work/Operation$State$IN_PROGRESS.smali
+++ b/com.discord/smali/androidx/work/Operation$State$IN_PROGRESS.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Operation$State$IN_PROGRESS;
 .super Landroidx/work/Operation$State;
+.source "Operation.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Operation$State$SUCCESS.smali b/com.discord/smali/androidx/work/Operation$State$SUCCESS.smali
index 37b5765e4b..4d99d49393 100644
--- a/com.discord/smali/androidx/work/Operation$State$SUCCESS.smali
+++ b/com.discord/smali/androidx/work/Operation$State$SUCCESS.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/Operation$State$SUCCESS;
 .super Landroidx/work/Operation$State;
+.source "Operation.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Operation$State.smali b/com.discord/smali/androidx/work/Operation$State.smali
index fdd84eb1da..05f8dc7434 100644
--- a/com.discord/smali/androidx/work/Operation$State.smali
+++ b/com.discord/smali/androidx/work/Operation$State.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/Operation$State;
 .super Ljava/lang/Object;
+.source "Operation.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Operation.smali b/com.discord/smali/androidx/work/Operation.smali
index da6b318c01..8a8820dce4 100644
--- a/com.discord/smali/androidx/work/Operation.smali
+++ b/com.discord/smali/androidx/work/Operation.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/Operation;
 .super Ljava/lang/Object;
+.source "Operation.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/OverwritingInputMerger.smali b/com.discord/smali/androidx/work/OverwritingInputMerger.smali
index 120091002b..21375f0f7f 100644
--- a/com.discord/smali/androidx/work/OverwritingInputMerger.smali
+++ b/com.discord/smali/androidx/work/OverwritingInputMerger.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/OverwritingInputMerger;
 .super Landroidx/work/InputMerger;
+.source "OverwritingInputMerger.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/PeriodicWorkRequest$Builder.smali b/com.discord/smali/androidx/work/PeriodicWorkRequest$Builder.smali
index 9e11b5d46f..395742d877 100644
--- a/com.discord/smali/androidx/work/PeriodicWorkRequest$Builder.smali
+++ b/com.discord/smali/androidx/work/PeriodicWorkRequest$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/PeriodicWorkRequest$Builder;
 .super Landroidx/work/WorkRequest$Builder;
+.source "PeriodicWorkRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/PeriodicWorkRequest.smali b/com.discord/smali/androidx/work/PeriodicWorkRequest.smali
index 8e05cff1cc..6cdc5c3ea3 100644
--- a/com.discord/smali/androidx/work/PeriodicWorkRequest.smali
+++ b/com.discord/smali/androidx/work/PeriodicWorkRequest.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/PeriodicWorkRequest;
 .super Landroidx/work/WorkRequest;
+.source "PeriodicWorkRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali b/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
index 6554eeb1c7..8a796cb8fc 100644
--- a/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
+++ b/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/PeriodicWorkRequestKt;
 .super Ljava/lang/Object;
+.source "PeriodicWorkRequest.kt"
 
 
 # direct methods
@@ -18,7 +19,7 @@
 
     new-instance v0, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
@@ -44,7 +45,7 @@
 
     new-instance v8, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
@@ -82,7 +83,7 @@
 
     new-instance v0, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
@@ -111,7 +112,7 @@
 
     new-instance v0, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
diff --git a/com.discord/smali/androidx/work/R$attr.smali b/com.discord/smali/androidx/work/R$attr.smali
index b094c38af9..223c0dad87 100644
--- a/com.discord/smali/androidx/work/R$attr.smali
+++ b/com.discord/smali/androidx/work/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$bool.smali b/com.discord/smali/androidx/work/R$bool.smali
index 115f897c36..27e39c698d 100644
--- a/com.discord/smali/androidx/work/R$bool.smali
+++ b/com.discord/smali/androidx/work/R$bool.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$bool;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$color.smali b/com.discord/smali/androidx/work/R$color.smali
index 1052020bc1..5590303a8c 100644
--- a/com.discord/smali/androidx/work/R$color.smali
+++ b/com.discord/smali/androidx/work/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$dimen.smali b/com.discord/smali/androidx/work/R$dimen.smali
index 6103aeaf6d..3355e328b4 100644
--- a/com.discord/smali/androidx/work/R$dimen.smali
+++ b/com.discord/smali/androidx/work/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index cfc933e732..7d4e35102b 100644
--- a/com.discord/smali/androidx/work/R$drawable.smali
+++ b/com.discord/smali/androidx/work/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$id.smali b/com.discord/smali/androidx/work/R$id.smali
index d4501034cc..206008329d 100644
--- a/com.discord/smali/androidx/work/R$id.smali
+++ b/com.discord/smali/androidx/work/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$integer.smali b/com.discord/smali/androidx/work/R$integer.smali
index c63e38ae4c..f59a3eecfa 100644
--- a/com.discord/smali/androidx/work/R$integer.smali
+++ b/com.discord/smali/androidx/work/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$layout.smali b/com.discord/smali/androidx/work/R$layout.smali
index b9424b04c8..c5bc0655f6 100644
--- a/com.discord/smali/androidx/work/R$layout.smali
+++ b/com.discord/smali/androidx/work/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index 1c7ff99c2e..3013e5bef8 100644
--- a/com.discord/smali/androidx/work/R$string.smali
+++ b/com.discord/smali/androidx/work/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$style.smali b/com.discord/smali/androidx/work/R$style.smali
index 36d291b118..7d5453087f 100644
--- a/com.discord/smali/androidx/work/R$style.smali
+++ b/com.discord/smali/androidx/work/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R$styleable.smali b/com.discord/smali/androidx/work/R$styleable.smali
index d0d90c996b..93a801f20a 100644
--- a/com.discord/smali/androidx/work/R$styleable.smali
+++ b/com.discord/smali/androidx/work/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/R.smali b/com.discord/smali/androidx/work/R.smali
index e68cca8ebc..d04dcbbdc2 100644
--- a/com.discord/smali/androidx/work/R.smali
+++ b/com.discord/smali/androidx/work/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/WorkContinuation.smali b/com.discord/smali/androidx/work/WorkContinuation.smali
index 62d9164fef..c64527654b 100644
--- a/com.discord/smali/androidx/work/WorkContinuation.smali
+++ b/com.discord/smali/androidx/work/WorkContinuation.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/WorkContinuation;
 .super Ljava/lang/Object;
+.source "WorkContinuation.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/WorkInfo$State.smali b/com.discord/smali/androidx/work/WorkInfo$State.smali
index 490ab3330b..e9c0078d1f 100644
--- a/com.discord/smali/androidx/work/WorkInfo$State.smali
+++ b/com.discord/smali/androidx/work/WorkInfo$State.smali
@@ -1,5 +1,6 @@
 .class public final enum Landroidx/work/WorkInfo$State;
 .super Ljava/lang/Enum;
+.source "WorkInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/WorkInfo.smali b/com.discord/smali/androidx/work/WorkInfo.smali
index 92e7ce75ee..f3b23c2a9d 100644
--- a/com.discord/smali/androidx/work/WorkInfo.smali
+++ b/com.discord/smali/androidx/work/WorkInfo.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/WorkInfo;
 .super Ljava/lang/Object;
+.source "WorkInfo.java"
 
 
 # annotations
@@ -108,7 +109,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_9
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -129,8 +130,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/work/WorkInfo;->mId:Ljava/util/UUID;
-
     iget-object v3, p1, Landroidx/work/WorkInfo;->mId:Ljava/util/UUID;
 
     invoke-virtual {v2, v3}, Ljava/util/UUID;->equals(Ljava/lang/Object;)Z
@@ -163,8 +162,6 @@
 
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Landroidx/work/WorkInfo;->mOutputData:Landroidx/work/Data;
-
     iget-object v3, p1, Landroidx/work/WorkInfo;->mOutputData:Landroidx/work/Data;
 
     invoke-virtual {v2, v3}, Landroidx/work/Data;->equals(Ljava/lang/Object;)Z
@@ -188,11 +185,9 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v0, p0, Landroidx/work/WorkInfo;->mTags:Ljava/util/Set;
-
     iget-object p1, p1, Landroidx/work/WorkInfo;->mTags:Ljava/util/Set;
 
-    invoke-interface {v0, p1}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
+    invoke-interface {v2, p1}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -206,6 +201,9 @@
     return v0
 
     :cond_8
+    return v1
+
+    :cond_9
     :goto_2
     return v1
 .end method
@@ -268,8 +266,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/work/WorkInfo;->mId:Ljava/util/UUID;
-
     invoke-virtual {v0}, Ljava/util/UUID;->hashCode()I
 
     move-result v0
@@ -286,8 +282,6 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Landroidx/work/WorkInfo;->mState:Landroidx/work/WorkInfo$State;
-
     invoke-virtual {v2}, Landroidx/work/WorkInfo$State;->hashCode()I
 
     move-result v2
@@ -306,8 +300,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/work/WorkInfo;->mOutputData:Landroidx/work/Data;
-
     invoke-virtual {v2}, Landroidx/work/Data;->hashCode()I
 
     move-result v2
@@ -326,9 +318,7 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v1, p0, Landroidx/work/WorkInfo;->mTags:Ljava/util/Set;
-
-    invoke-interface {v1}, Ljava/util/Set;->hashCode()I
+    invoke-interface {v2}, Ljava/util/Set;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/work/WorkManager.smali b/com.discord/smali/androidx/work/WorkManager.smali
index e392325d35..709ebefb1c 100644
--- a/com.discord/smali/androidx/work/WorkManager.smali
+++ b/com.discord/smali/androidx/work/WorkManager.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/WorkManager;
 .super Ljava/lang/Object;
+.source "WorkManager.java"
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/WorkRequest$Builder.smali b/com.discord/smali/androidx/work/WorkRequest$Builder.smali
index dc498e86a0..ac6e8b87cf 100644
--- a/com.discord/smali/androidx/work/WorkRequest$Builder.smali
+++ b/com.discord/smali/androidx/work/WorkRequest$Builder.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/WorkRequest$Builder;
 .super Ljava/lang/Object;
+.source "WorkRequest.java"
 
 
 # annotations
@@ -295,13 +296,11 @@
 
     iput-object p1, v0, Landroidx/work/impl/model/WorkSpec;->backoffPolicy:Landroidx/work/BackoffPolicy;
 
-    iget-object p1, p0, Landroidx/work/WorkRequest$Builder;->mWorkSpec:Landroidx/work/impl/model/WorkSpec;
-
     invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
 
-    move-result-wide p2
+    move-result-wide p1
 
-    invoke-virtual {p1, p2, p3}, Landroidx/work/impl/model/WorkSpec;->setBackoffDelayDuration(J)V
+    invoke-virtual {v0, p1, p2}, Landroidx/work/impl/model/WorkSpec;->setBackoffDelayDuration(J)V
 
     invoke-virtual {p0}, Landroidx/work/WorkRequest$Builder;->getThis()Landroidx/work/WorkRequest$Builder;
 
diff --git a/com.discord/smali/androidx/work/WorkRequest.smali b/com.discord/smali/androidx/work/WorkRequest.smali
index a6fb908825..1107ed6e3e 100644
--- a/com.discord/smali/androidx/work/WorkRequest.smali
+++ b/com.discord/smali/androidx/work/WorkRequest.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/WorkRequest;
 .super Ljava/lang/Object;
+.source "WorkRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/Worker$1.smali b/com.discord/smali/androidx/work/Worker$1.smali
index e10d1a534c..5460fa38cc 100644
--- a/com.discord/smali/androidx/work/Worker$1.smali
+++ b/com.discord/smali/androidx/work/Worker$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/Worker$1;
 .super Ljava/lang/Object;
+.source "Worker.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/Worker.smali b/com.discord/smali/androidx/work/Worker.smali
index 69fcf74d7a..ad0c2f8cb2 100644
--- a/com.discord/smali/androidx/work/Worker.smali
+++ b/com.discord/smali/androidx/work/Worker.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/Worker;
 .super Landroidx/work/ListenableWorker;
+.source "Worker.java"
 
 
 # instance fields
diff --git a/com.discord/smali/androidx/work/WorkerFactory$1.smali b/com.discord/smali/androidx/work/WorkerFactory$1.smali
index 287f660d5e..d641b79510 100644
--- a/com.discord/smali/androidx/work/WorkerFactory$1.smali
+++ b/com.discord/smali/androidx/work/WorkerFactory$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/WorkerFactory$1;
 .super Landroidx/work/WorkerFactory;
+.source "WorkerFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/WorkerFactory.smali b/com.discord/smali/androidx/work/WorkerFactory.smali
index faf84b86dc..4c55a9e6d5 100644
--- a/com.discord/smali/androidx/work/WorkerFactory.smali
+++ b/com.discord/smali/androidx/work/WorkerFactory.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/WorkerFactory;
 .super Ljava/lang/Object;
+.source "WorkerFactory.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/work/WorkerParameters$RuntimeExtras.smali b/com.discord/smali/androidx/work/WorkerParameters$RuntimeExtras.smali
index 4a3a227f46..643c844884 100644
--- a/com.discord/smali/androidx/work/WorkerParameters$RuntimeExtras.smali
+++ b/com.discord/smali/androidx/work/WorkerParameters$RuntimeExtras.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/WorkerParameters$RuntimeExtras;
 .super Ljava/lang/Object;
+.source "WorkerParameters.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/WorkerParameters.smali b/com.discord/smali/androidx/work/WorkerParameters.smali
index 6633335b97..1aa51b4c4c 100644
--- a/com.discord/smali/androidx/work/WorkerParameters.smali
+++ b/com.discord/smali/androidx/work/WorkerParameters.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/WorkerParameters;
 .super Ljava/lang/Object;
+.source "WorkerParameters.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/ExecutionListener.smali b/com.discord/smali/androidx/work/impl/ExecutionListener.smali
index c472cc0747..9635bbeac9 100644
--- a/com.discord/smali/androidx/work/impl/ExecutionListener.smali
+++ b/com.discord/smali/androidx/work/impl/ExecutionListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/ExecutionListener;
 .super Ljava/lang/Object;
+.source "ExecutionListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/OperationImpl.smali b/com.discord/smali/androidx/work/impl/OperationImpl.smali
index e1d7339114..e1fd9b7683 100644
--- a/com.discord/smali/androidx/work/impl/OperationImpl.smali
+++ b/com.discord/smali/androidx/work/impl/OperationImpl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/OperationImpl;
 .super Ljava/lang/Object;
+.source "OperationImpl.java"
 
 # interfaces
 .implements Landroidx/work/Operation;
diff --git a/com.discord/smali/androidx/work/impl/Processor$FutureListener.smali b/com.discord/smali/androidx/work/impl/Processor$FutureListener.smali
index 85160ad28c..4a00c94edc 100644
--- a/com.discord/smali/androidx/work/impl/Processor$FutureListener.smali
+++ b/com.discord/smali/androidx/work/impl/Processor$FutureListener.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/Processor$FutureListener;
 .super Ljava/lang/Object;
+.source "Processor.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/Processor.smali b/com.discord/smali/androidx/work/impl/Processor.smali
index d93b7459ed..914152b2fd 100644
--- a/com.discord/smali/androidx/work/impl/Processor.smali
+++ b/com.discord/smali/androidx/work/impl/Processor.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/Processor;
 .super Ljava/lang/Object;
+.source "Processor.java"
 
 # interfaces
 .implements Landroidx/work/impl/ExecutionListener;
@@ -173,8 +174,16 @@
 
     move-result v1
 
-    xor-int/lit8 v1, v1, 0x1
+    if-nez v1, :cond_0
 
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
     monitor-exit v0
 
     return v1
@@ -341,6 +350,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public removeExecutionListener(Landroidx/work/impl/ExecutionListener;)V
diff --git a/com.discord/smali/androidx/work/impl/Scheduler.smali b/com.discord/smali/androidx/work/impl/Scheduler.smali
index a9ff60db20..88bbc41778 100644
--- a/com.discord/smali/androidx/work/impl/Scheduler.smali
+++ b/com.discord/smali/androidx/work/impl/Scheduler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/Scheduler;
 .super Ljava/lang/Object;
+.source "Scheduler.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/Schedulers.smali b/com.discord/smali/androidx/work/impl/Schedulers.smali
index cdc4ca7250..b94ed332f3 100644
--- a/com.discord/smali/androidx/work/impl/Schedulers.smali
+++ b/com.discord/smali/androidx/work/impl/Schedulers.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/Schedulers;
 .super Ljava/lang/Object;
+.source "Schedulers.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkContinuationImpl.smali b/com.discord/smali/androidx/work/impl/WorkContinuationImpl.smali
index 09f6e7c0d0..48326b20ae 100644
--- a/com.discord/smali/androidx/work/impl/WorkContinuationImpl.smali
+++ b/com.discord/smali/androidx/work/impl/WorkContinuationImpl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkContinuationImpl;
 .super Landroidx/work/WorkContinuation;
+.source "WorkContinuationImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabase$1.smali b/com.discord/smali/androidx/work/impl/WorkDatabase$1.smali
index 2004b415b3..1575763ed3 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabase$1.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabase$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/WorkDatabase$1;
 .super Landroidx/room/RoomDatabase$Callback;
+.source "WorkDatabase.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabase.smali b/com.discord/smali/androidx/work/impl/WorkDatabase.smali
index a9f0230b7a..10df4c097d 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabase.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabase.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/impl/WorkDatabase;
 .super Landroidx/room/RoomDatabase;
+.source "WorkDatabase.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$1.smali b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$1.smali
index 1653fcfdde..f8ce585720 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$1.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/WorkDatabaseMigrations$1;
 .super Landroidx/room/migration/Migration;
+.source "WorkDatabaseMigrations.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$2.smali b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$2.smali
index cff24ee7e4..478809d7ee 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$2.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/WorkDatabaseMigrations$2;
 .super Landroidx/room/migration/Migration;
+.source "WorkDatabaseMigrations.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$WorkMigration.smali b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$WorkMigration.smali
index fb3998f8d1..176e235e6b 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$WorkMigration.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations$WorkMigration.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkDatabaseMigrations$WorkMigration;
 .super Landroidx/room/migration/Migration;
+.source "WorkDatabaseMigrations.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations.smali b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations.smali
index 3074839a6b..d06043faf4 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabaseMigrations.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkDatabaseMigrations;
 .super Ljava/lang/Object;
+.source "WorkDatabaseMigrations.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali b/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali
index cafb3f18f1..7afb84b6dd 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/WorkDatabase_Impl$1;
 .super Landroidx/room/RoomOpenHelper$Delegate;
+.source "WorkDatabase_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabase_Impl.smali b/com.discord/smali/androidx/work/impl/WorkDatabase_Impl.smali
index c1ebb800c0..300807120f 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabase_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabase_Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkDatabase_Impl;
 .super Landroidx/work/impl/WorkDatabase;
+.source "WorkDatabase_Impl.java"
 
 
 # instance fields
@@ -123,15 +124,7 @@
 
     invoke-interface {v0, v2}, Landroidx/sqlite/db/SupportSQLiteDatabase;->execSQL(Ljava/lang/String;)V
 
-    goto :goto_1
-
-    :catchall_0
-    move-exception v2
-
-    goto :goto_2
-
     :cond_1
-    :goto_1
     invoke-super {p0}, Landroidx/work/impl/WorkDatabase;->beginTransaction()V
 
     if-eqz v1, :cond_2
@@ -192,10 +185,14 @@
 
     invoke-interface {v0, v1}, Landroidx/sqlite/db/SupportSQLiteDatabase;->execSQL(Ljava/lang/String;)V
 
+    return-void
+
     :cond_4
     return-void
 
-    :goto_2
+    :catchall_0
+    move-exception v2
+
     invoke-super {p0}, Landroidx/work/impl/WorkDatabase;->endTransaction()V
 
     if-nez v1, :cond_5
diff --git a/com.discord/smali/androidx/work/impl/WorkManagerImpl$1.smali b/com.discord/smali/androidx/work/impl/WorkManagerImpl$1.smali
index fd194e7eff..e35707e132 100644
--- a/com.discord/smali/androidx/work/impl/WorkManagerImpl$1.smali
+++ b/com.discord/smali/androidx/work/impl/WorkManagerImpl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/WorkManagerImpl$1;
 .super Ljava/lang/Object;
+.source "WorkManagerImpl.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/WorkManagerImpl$2.smali b/com.discord/smali/androidx/work/impl/WorkManagerImpl$2.smali
index 526cd6980c..7ce10edbec 100644
--- a/com.discord/smali/androidx/work/impl/WorkManagerImpl$2.smali
+++ b/com.discord/smali/androidx/work/impl/WorkManagerImpl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/WorkManagerImpl$2;
 .super Ljava/lang/Object;
+.source "WorkManagerImpl.java"
 
 # interfaces
 .implements Landroidx/arch/core/util/Function;
diff --git a/com.discord/smali/androidx/work/impl/WorkManagerImpl.smali b/com.discord/smali/androidx/work/impl/WorkManagerImpl.smali
index 2359f3df1d..15b28896c0 100644
--- a/com.discord/smali/androidx/work/impl/WorkManagerImpl.smali
+++ b/com.discord/smali/androidx/work/impl/WorkManagerImpl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkManagerImpl;
 .super Landroidx/work/WorkManager;
+.source "WorkManagerImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkManagerInitializer.smali b/com.discord/smali/androidx/work/impl/WorkManagerInitializer.smali
index cf14f7b834..f954089f54 100644
--- a/com.discord/smali/androidx/work/impl/WorkManagerInitializer.smali
+++ b/com.discord/smali/androidx/work/impl/WorkManagerInitializer.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkManagerInitializer;
 .super Landroid/content/ContentProvider;
+.source "WorkManagerInitializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkerWrapper$1.smali b/com.discord/smali/androidx/work/impl/WorkerWrapper$1.smali
index 732b46dfa2..90505960e9 100644
--- a/com.discord/smali/androidx/work/impl/WorkerWrapper$1.smali
+++ b/com.discord/smali/androidx/work/impl/WorkerWrapper$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/WorkerWrapper$1;
 .super Ljava/lang/Object;
+.source "WorkerWrapper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/WorkerWrapper$2.smali b/com.discord/smali/androidx/work/impl/WorkerWrapper$2.smali
index 738d568484..f158c9c2de 100644
--- a/com.discord/smali/androidx/work/impl/WorkerWrapper$2.smali
+++ b/com.discord/smali/androidx/work/impl/WorkerWrapper$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/WorkerWrapper$2;
 .super Ljava/lang/Object;
+.source "WorkerWrapper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -137,4 +138,6 @@
     invoke-virtual {v1}, Landroidx/work/impl/WorkerWrapper;->onWorkFinished()V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/WorkerWrapper$3.smali b/com.discord/smali/androidx/work/impl/WorkerWrapper$3.smali
index 203c75a675..a5fd398fc9 100644
--- a/com.discord/smali/androidx/work/impl/WorkerWrapper$3.smali
+++ b/com.discord/smali/androidx/work/impl/WorkerWrapper$3.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/work/impl/WorkerWrapper$3;
 .super Ljava/lang/Object;
+.source "WorkerWrapper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkerWrapper$Builder.smali b/com.discord/smali/androidx/work/impl/WorkerWrapper$Builder.smali
index b9d90a2e27..1d84802ff5 100644
--- a/com.discord/smali/androidx/work/impl/WorkerWrapper$Builder.smali
+++ b/com.discord/smali/androidx/work/impl/WorkerWrapper$Builder.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkerWrapper$Builder;
 .super Ljava/lang/Object;
+.source "WorkerWrapper.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/WorkerWrapper.smali b/com.discord/smali/androidx/work/impl/WorkerWrapper.smali
index 00ca6387db..f3ab7afab8 100644
--- a/com.discord/smali/androidx/work/impl/WorkerWrapper.smali
+++ b/com.discord/smali/androidx/work/impl/WorkerWrapper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/WorkerWrapper;
 .super Ljava/lang/Object;
+.source "WorkerWrapper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -538,7 +539,7 @@
 .end method
 
 .method private resetPeriodicAndResolve()V
-    .locals 8
+    .locals 7
 
     iget-object v0, p0, Landroidx/work/impl/WorkerWrapper;->mWorkDatabase:Landroidx/work/impl/WorkDatabase;
 
@@ -559,8 +560,6 @@
 
     iget-wide v5, v5, Landroidx/work/impl/model/WorkSpec;->intervalDuration:J
 
-    const/4 v7, 0x0
-
     add-long/2addr v1, v5
 
     invoke-static {v3, v4, v1, v2}, Ljava/lang/Math;->max(JJ)J
@@ -893,10 +892,9 @@
 
     iget-object v0, v0, Landroidx/work/impl/model/WorkSpec;->input:Landroidx/work/Data;
 
-    :goto_0
     move-object v5, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     iget-object v0, p0, Landroidx/work/impl/WorkerWrapper;->mWorkSpec:Landroidx/work/impl/model/WorkSpec;
@@ -958,9 +956,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    move-object v5, v0
 
-    :goto_1
+    :goto_0
     new-instance v0, Landroidx/work/WorkerParameters;
 
     iget-object v3, p0, Landroidx/work/impl/WorkerWrapper;->mWorkSpecId:Ljava/lang/String;
@@ -1047,8 +1045,6 @@
     return-void
 
     :cond_6
-    iget-object v0, p0, Landroidx/work/impl/WorkerWrapper;->mWorker:Landroidx/work/ListenableWorker;
-
     invoke-virtual {v0}, Landroidx/work/ListenableWorker;->isUsed()Z
 
     move-result v0
@@ -1334,6 +1330,8 @@
     invoke-direct {p0, v0}, Landroidx/work/impl/WorkerWrapper;->resolve(Z)V
 
     throw v1
+
+    return-void
 .end method
 
 .method private tryCheckForInterruptionAndResolve()Z
@@ -1505,8 +1503,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/work/impl/WorkerWrapper;->mInnerFuture:Lcom/google/a/a/a/a;
-
     invoke-interface {v0, p1}, Lcom/google/a/a/a/a;->cancel(Z)Z
 
     :cond_0
@@ -1514,8 +1510,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Landroidx/work/impl/WorkerWrapper;->mWorker:Landroidx/work/ListenableWorker;
-
     invoke-virtual {p1}, Landroidx/work/ListenableWorker;->stop()V
 
     :cond_1
@@ -1627,8 +1621,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v0, p0, Landroidx/work/impl/WorkerWrapper;->mSchedulers:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/work/impl/background/greedy/GreedyScheduler.smali b/com.discord/smali/androidx/work/impl/background/greedy/GreedyScheduler.smali
index 33417b8f49..76d38e9f06 100644
--- a/com.discord/smali/androidx/work/impl/background/greedy/GreedyScheduler.smali
+++ b/com.discord/smali/androidx/work/impl/background/greedy/GreedyScheduler.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/greedy/GreedyScheduler;
 .super Ljava/lang/Object;
+.source "GreedyScheduler.java"
 
 # interfaces
 .implements Landroidx/work/impl/ExecutionListener;
@@ -207,6 +208,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -534,4 +537,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/background/package-info.smali b/com.discord/smali/androidx/work/impl/background/package-info.smali
index c723a27bfe..8e3ee1b094 100644
--- a/com.discord/smali/androidx/work/impl/background/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/background/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/background/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/Alarms.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/Alarms.smali
index 16169f3d9c..0395fb7263 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/Alarms.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/Alarms.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemalarm/Alarms;
 .super Ljava/lang/Object;
+.source "Alarms.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/CommandHandler.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/CommandHandler.smali
index 29c71e46a2..62eebe9d15 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/CommandHandler.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/CommandHandler.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/CommandHandler;
 .super Ljava/lang/Object;
+.source "CommandHandler.java"
 
 # interfaces
 .implements Landroidx/work/impl/ExecutionListener;
@@ -807,8 +808,16 @@
 
     move-result v1
 
-    xor-int/lit8 v1, v1, 0x1
+    if-nez v1, :cond_0
 
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
     monitor-exit v0
 
     return v1
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryChargingProxy.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryChargingProxy.smali
index 33fc008d92..9062919da1 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryChargingProxy.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryChargingProxy.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/ConstraintProxy$BatteryChargingProxy;
 .super Landroidx/work/impl/background/systemalarm/ConstraintProxy;
+.source "ConstraintProxy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryNotLowProxy.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryNotLowProxy.smali
index 64c30b52c8..43501d2743 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryNotLowProxy.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$BatteryNotLowProxy.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/ConstraintProxy$BatteryNotLowProxy;
 .super Landroidx/work/impl/background/systemalarm/ConstraintProxy;
+.source "ConstraintProxy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$NetworkStateProxy.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$NetworkStateProxy.smali
index 5ebd5b8e44..6381903577 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$NetworkStateProxy.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$NetworkStateProxy.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/ConstraintProxy$NetworkStateProxy;
 .super Landroidx/work/impl/background/systemalarm/ConstraintProxy;
+.source "ConstraintProxy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$StorageNotLowProxy.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$StorageNotLowProxy.smali
index 47407b4f0e..777c45fe7c 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$StorageNotLowProxy.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy$StorageNotLowProxy.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/ConstraintProxy$StorageNotLowProxy;
 .super Landroidx/work/impl/background/systemalarm/ConstraintProxy;
+.source "ConstraintProxy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy.smali
index 00a17a2ac5..e782579068 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxy.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/work/impl/background/systemalarm/ConstraintProxy;
 .super Landroid/content/BroadcastReceiver;
+.source "ConstraintProxy.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.smali
index 1cd158eaf1..bbaa66e3a7 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "ConstraintProxyUpdateReceiver.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintsCommandHandler.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintsCommandHandler.smali
index 8914460540..af05c694ec 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintsCommandHandler.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/ConstraintsCommandHandler.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemalarm/ConstraintsCommandHandler;
 .super Ljava/lang/Object;
+.source "ConstraintsCommandHandler.java"
 
 
 # annotations
@@ -213,11 +214,9 @@
 
     new-instance v3, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable;
 
-    iget-object v4, p0, Landroidx/work/impl/background/systemalarm/ConstraintsCommandHandler;->mDispatcher:Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;
+    iget v4, p0, Landroidx/work/impl/background/systemalarm/ConstraintsCommandHandler;->mStartId:I
 
-    iget v5, p0, Landroidx/work/impl/background/systemalarm/ConstraintsCommandHandler;->mStartId:I
-
-    invoke-direct {v3, v4, v2, v5}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;Landroid/content/Intent;I)V
+    invoke-direct {v3, v1, v2, v4}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;Landroid/content/Intent;I)V
 
     invoke-virtual {v1, v3}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;->postOnMainThread(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.smali
index f283063296..8385a11bd3 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/DelayMetCommandHandler;
 .super Ljava/lang/Object;
+.source "DelayMetCommandHandler.java"
 
 # interfaces
 .implements Landroidx/work/impl/ExecutionListener;
@@ -620,11 +621,9 @@
 
     new-instance v0, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable;
 
-    iget-object v1, p0, Landroidx/work/impl/background/systemalarm/DelayMetCommandHandler;->mDispatcher:Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;
+    iget v1, p0, Landroidx/work/impl/background/systemalarm/DelayMetCommandHandler;->mStartId:I
 
-    iget v2, p0, Landroidx/work/impl/background/systemalarm/DelayMetCommandHandler;->mStartId:I
-
-    invoke-direct {v0, v1, p1, v2}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;Landroid/content/Intent;I)V
+    invoke-direct {v0, p2, p1, v1}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;Landroid/content/Intent;I)V
 
     invoke-virtual {p2, v0}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;->postOnMainThread(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/RescheduleReceiver.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/RescheduleReceiver.smali
index c68ba44348..a75129e718 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/RescheduleReceiver.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/RescheduleReceiver.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/RescheduleReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "RescheduleReceiver.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1.smali
index c1eefcb5d4..486447ac2a 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1;
 .super Ljava/lang/Object;
+.source "SystemAlarmDispatcher.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -201,9 +202,7 @@
 
     new-instance v1, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;
 
-    iget-object v2, p0, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1;->this$0:Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;
-
-    invoke-direct {v1, v2}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;)V
+    invoke-direct {v1, v0}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;)V
 
     :goto_0
     invoke-virtual {v0, v1}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;->postOnMainThread(Ljava/lang/Runnable;)V
@@ -255,9 +254,7 @@
 
     new-instance v1, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;
 
-    iget-object v2, p0, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1;->this$0:Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;
-
-    invoke-direct {v1, v2}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;)V
+    invoke-direct {v1, v0}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;)V
 
     goto :goto_0
 
@@ -286,9 +283,7 @@
 
     new-instance v2, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;
 
-    iget-object v3, p0, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$1;->this$0:Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;
-
-    invoke-direct {v2, v3}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;)V
+    invoke-direct {v2, v0}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;-><init>(Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;)V
 
     invoke-virtual {v0, v2}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;->postOnMainThread(Ljava/lang/Runnable;)V
 
@@ -306,4 +301,6 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable.smali
index 92a8bb97d4..f968c27077 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$AddRunnable;
 .super Ljava/lang/Object;
+.source "SystemAlarmDispatcher.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$CommandsCompletedListener.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$CommandsCompletedListener.smali
index b9e68486f4..4b67cad19b 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$CommandsCompletedListener.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$CommandsCompletedListener.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$CommandsCompletedListener;
 .super Ljava/lang/Object;
+.source "SystemAlarmDispatcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion.smali
index 5360cde687..d33473b07d 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$DequeueAndCheckForCompletion;
 .super Ljava/lang/Object;
+.source "SystemAlarmDispatcher.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.smali
index cedbf69c26..45684e0e06 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;
 .super Ljava/lang/Object;
+.source "SystemAlarmDispatcher.java"
 
 # interfaces
 .implements Landroidx/work/impl/ExecutionListener;
@@ -266,6 +267,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method private processCommand()V
@@ -408,17 +411,20 @@
 
     move-result v0
 
-    xor-int/2addr v0, v5
-
-    iget-object v1, p0, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;->mIntents:Ljava/util/List;
-
-    invoke-interface {v1, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
     if-nez v0, :cond_2
 
+    const/4 v3, 0x1
+
+    :cond_2
+    iget-object v0, p0, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;->mIntents:Ljava/util/List;
+
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    if-nez v3, :cond_3
+
     invoke-direct {p0}, Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher;->processCommand()V
 
-    :cond_2
+    :cond_3
     monitor-exit p2
 
     return v5
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmScheduler.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmScheduler.smali
index f4734a7749..5659a366ae 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmScheduler.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmScheduler.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/SystemAlarmScheduler;
 .super Ljava/lang/Object;
+.source "SystemAlarmScheduler.java"
 
 # interfaces
 .implements Landroidx/work/impl/Scheduler;
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmService.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmService.smali
index 0d1d21751e..7d5a88e510 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmService.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/SystemAlarmService.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemalarm/SystemAlarmService;
 .super Landroidx/lifecycle/LifecycleService;
+.source "SystemAlarmService.java"
 
 # interfaces
 .implements Landroidx/work/impl/background/systemalarm/SystemAlarmDispatcher$CommandsCompletedListener;
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$TimeLimitExceededListener.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$TimeLimitExceededListener.smali
index 044833fad1..8577bb0e37 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$TimeLimitExceededListener.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$TimeLimitExceededListener.smali
@@ -1,5 +1,6 @@
 .class interface abstract Landroidx/work/impl/background/systemalarm/WorkTimer$TimeLimitExceededListener;
 .super Ljava/lang/Object;
+.source "WorkTimer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$WorkTimerRunnable.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$WorkTimerRunnable.smali
index f24b55ec30..85e22ba747 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$WorkTimerRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer$WorkTimerRunnable.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemalarm/WorkTimer$WorkTimerRunnable;
 .super Ljava/lang/Object;
+.source "WorkTimer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer.smali
index 9f3d265339..843a4d1245 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/WorkTimer.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemalarm/WorkTimer;
 .super Ljava/lang/Object;
+.source "WorkTimer.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemalarm/package-info.smali b/com.discord/smali/androidx/work/impl/background/systemalarm/package-info.smali
index ce9e9b9270..beea940a7a 100644
--- a/com.discord/smali/androidx/work/impl/background/systemalarm/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemalarm/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/background/systemalarm/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter$1.smali b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter$1.smali
index 4c981c3a85..bb7a54bb68 100644
--- a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter$1.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/work/impl/background/systemjob/SystemJobInfoConverter$1;
 .super Ljava/lang/Object;
+.source "SystemJobInfoConverter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter.smali b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter.smali
index 07029c70ff..fda841cf32 100644
--- a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobInfoConverter.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/background/systemjob/SystemJobInfoConverter;
 .super Ljava/lang/Object;
+.source "SystemJobInfoConverter.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobScheduler.smali b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobScheduler.smali
index b86feb4ccc..c730070bda 100644
--- a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobScheduler.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobScheduler.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemjob/SystemJobScheduler;
 .super Ljava/lang/Object;
+.source "SystemJobScheduler.java"
 
 # interfaces
 .implements Landroidx/work/impl/Scheduler;
@@ -223,6 +224,8 @@
 
     if-eq v1, v2, :cond_0
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -284,15 +287,14 @@
 
     new-array v6, v2, [Ljava/lang/Throwable;
 
-    :goto_1
     invoke-static {v5, v4, v6}, Landroidx/work/Logger;->warning(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Throwable;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :goto_2
+    :goto_1
     invoke-virtual {v0}, Landroidx/work/impl/WorkDatabase;->endTransaction()V
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_0
     :try_start_1
@@ -324,6 +326,8 @@
 
     new-array v6, v2, [Ljava/lang/Throwable;
 
+    invoke-static {v5, v4, v6}, Landroidx/work/Logger;->warning(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Throwable;)V
+
     goto :goto_1
 
     :cond_1
@@ -341,7 +345,7 @@
 
     iget v6, v5, Landroidx/work/impl/model/SystemIdInfo;->systemId:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     iget-object v6, p0, Landroidx/work/impl/background/systemjob/SystemJobScheduler;->mIdGenerator:Landroidx/work/impl/utils/IdGenerator;
@@ -370,7 +374,7 @@
 
     move-result v6
 
-    :goto_3
+    :goto_2
     if-nez v5, :cond_3
 
     new-instance v5, Landroidx/work/impl/model/SystemIdInfo;
@@ -433,9 +437,9 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto/16 :goto_2
+    invoke-virtual {v0}, Landroidx/work/impl/WorkDatabase;->endTransaction()V
 
-    :goto_4
+    :goto_3
     add-int/lit8 v3, v3, 0x1
 
     goto/16 :goto_0
diff --git a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobService.smali b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobService.smali
index f5783490d5..81fc33fe93 100644
--- a/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobService.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemjob/SystemJobService.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/background/systemjob/SystemJobService;
 .super Landroid/app/job/JobService;
+.source "SystemJobService.java"
 
 # interfaces
 .implements Landroidx/work/impl/ExecutionListener;
@@ -106,8 +107,6 @@
     throw v0
 
     :cond_1
-    iget-object v0, p0, Landroidx/work/impl/background/systemjob/SystemJobService;->mWorkManagerImpl:Landroidx/work/impl/WorkManagerImpl;
-
     invoke-virtual {v0}, Landroidx/work/impl/WorkManagerImpl;->getProcessor()Landroidx/work/impl/Processor;
 
     move-result-object v0
@@ -126,8 +125,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/work/impl/background/systemjob/SystemJobService;->mWorkManagerImpl:Landroidx/work/impl/WorkManagerImpl;
-
     invoke-virtual {v0}, Landroidx/work/impl/WorkManagerImpl;->getProcessor()Landroidx/work/impl/Processor;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/work/impl/background/systemjob/package-info.smali b/com.discord/smali/androidx/work/impl/background/systemjob/package-info.smali
index 13ab3157ed..5a05ca045b 100644
--- a/com.discord/smali/androidx/work/impl/background/systemjob/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/background/systemjob/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/background/systemjob/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/ConstraintListener.smali b/com.discord/smali/androidx/work/impl/constraints/ConstraintListener.smali
index 4c0c6840c5..dae2c74c7e 100644
--- a/com.discord/smali/androidx/work/impl/constraints/ConstraintListener.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/ConstraintListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/constraints/ConstraintListener;
 .super Ljava/lang/Object;
+.source "ConstraintListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/NetworkState.smali b/com.discord/smali/androidx/work/impl/constraints/NetworkState.smali
index b1e64ec152..4d40a3c9b7 100644
--- a/com.discord/smali/androidx/work/impl/constraints/NetworkState.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/NetworkState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/NetworkState;
 .super Ljava/lang/Object;
+.source "NetworkState.java"
 
 
 # instance fields
@@ -43,7 +44,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -87,6 +88,9 @@
     return v0
 
     :cond_2
+    return v1
+
+    :cond_3
     :goto_0
     return v1
 .end method
diff --git a/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsCallback.smali b/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsCallback.smali
index e3d99b02ae..6409303add 100644
--- a/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsCallback.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/constraints/WorkConstraintsCallback;
 .super Ljava/lang/Object;
+.source "WorkConstraintsCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsTracker.smali b/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsTracker.smali
index 85dec08895..87ba3dbcfd 100644
--- a/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsTracker.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/WorkConstraintsTracker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/WorkConstraintsTracker;
 .super Ljava/lang/Object;
+.source "WorkConstraintsTracker.java"
 
 # interfaces
 .implements Landroidx/work/impl/constraints/controllers/ConstraintController$OnConstraintUpdatedCallback;
@@ -216,6 +217,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public onConstraintMet(Ljava/util/List;)V
@@ -312,6 +315,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public onConstraintNotMet(Ljava/util/List;)V
@@ -445,6 +450,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public reset()V
@@ -485,4 +492,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryChargingController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryChargingController.smali
index 6d7e912195..c0240b17b7 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryChargingController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryChargingController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/controllers/BatteryChargingController;
 .super Landroidx/work/impl/constraints/controllers/ConstraintController;
+.source "BatteryChargingController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryNotLowController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryNotLowController.smali
index fbeb9c26bc..64776b7119 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryNotLowController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/BatteryNotLowController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/controllers/BatteryNotLowController;
 .super Landroidx/work/impl/constraints/controllers/ConstraintController;
+.source "BatteryNotLowController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController$OnConstraintUpdatedCallback.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController$OnConstraintUpdatedCallback.smali
index 625f103000..d2e20497bb 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController$OnConstraintUpdatedCallback.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController$OnConstraintUpdatedCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/constraints/controllers/ConstraintController$OnConstraintUpdatedCallback;
 .super Ljava/lang/Object;
+.source "ConstraintController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController.smali
index 652b4dde18..084ce7a602 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/ConstraintController.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/impl/constraints/controllers/ConstraintController;
 .super Ljava/lang/Object;
+.source "ConstraintController.java"
 
 # interfaces
 .implements Landroidx/work/impl/constraints/ConstraintListener;
@@ -101,8 +102,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Landroidx/work/impl/constraints/controllers/ConstraintController;->mCurrentValue:Ljava/lang/Object;
-
     invoke-virtual {p0, v0}, Landroidx/work/impl/constraints/controllers/ConstraintController;->isConstrained(Ljava/lang/Object;)Z
 
     move-result v0
@@ -128,6 +127,8 @@
 
     invoke-interface {v0, v1}, Landroidx/work/impl/constraints/controllers/ConstraintController$OnConstraintUpdatedCallback;->onConstraintNotMet(Ljava/util/List;)V
 
+    return-void
+
     :cond_3
     :goto_1
     return-void
@@ -165,8 +166,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/work/impl/constraints/controllers/ConstraintController;->mCurrentValue:Ljava/lang/Object;
-
     invoke-virtual {p0, v0}, Landroidx/work/impl/constraints/controllers/ConstraintController;->isConstrained(Ljava/lang/Object;)Z
 
     move-result v0
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkConnectedController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkConnectedController.smali
index 17f20203d5..522d5cbbce 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkConnectedController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkConnectedController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/controllers/NetworkConnectedController;
 .super Landroidx/work/impl/constraints/controllers/ConstraintController;
+.source "NetworkConnectedController.java"
 
 
 # annotations
@@ -67,9 +68,9 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/16 v3, 0x1a
 
@@ -90,11 +91,11 @@
     goto :goto_0
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     :goto_0
-    return v2
+    return v1
 
     :cond_2
     invoke-virtual {p1}, Landroidx/work/impl/constraints/NetworkState;->isConnected()Z
@@ -103,10 +104,10 @@
 
     if-nez p1, :cond_3
 
-    return v2
+    return v1
 
     :cond_3
-    return v1
+    return v2
 .end method
 
 .method bridge synthetic isConstrained(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkMeteredController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkMeteredController.smali
index 0e1c2d24d7..c041c4511f 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkMeteredController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkMeteredController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/controllers/NetworkMeteredController;
 .super Landroidx/work/impl/constraints/controllers/ConstraintController;
+.source "NetworkMeteredController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkNotRoamingController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkNotRoamingController.smali
index 72015f9bdb..243874e705 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkNotRoamingController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkNotRoamingController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/controllers/NetworkNotRoamingController;
 .super Landroidx/work/impl/constraints/controllers/ConstraintController;
+.source "NetworkNotRoamingController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.smali
index e595ccee8d..165d8d68b3 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/controllers/NetworkUnmeteredController;
 .super Landroidx/work/impl/constraints/controllers/ConstraintController;
+.source "NetworkUnmeteredController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/StorageNotLowController.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/StorageNotLowController.smali
index 5d3f2e8a7b..a6abcd0f41 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/StorageNotLowController.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/StorageNotLowController.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/controllers/StorageNotLowController;
 .super Landroidx/work/impl/constraints/controllers/ConstraintController;
+.source "StorageNotLowController.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/controllers/package-info.smali b/com.discord/smali/androidx/work/impl/constraints/controllers/package-info.smali
index ceaec07d13..7a403be514 100644
--- a/com.discord/smali/androidx/work/impl/constraints/controllers/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/controllers/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/constraints/controllers/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/package-info.smali b/com.discord/smali/androidx/work/impl/constraints/package-info.smali
index a1689b4fb2..3e0f0659ef 100644
--- a/com.discord/smali/androidx/work/impl/constraints/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/constraints/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryChargingTracker.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryChargingTracker.smali
index c82fff8e60..b0bed00266 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryChargingTracker.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryChargingTracker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/trackers/BatteryChargingTracker;
 .super Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;
+.source "BatteryChargingTracker.java"
 
 
 # annotations
@@ -54,7 +55,7 @@
 
     const/4 v0, 0x2
 
-    if-eq p1, v0, :cond_2
+    if-eq p1, v0, :cond_3
 
     const/4 v0, 0x5
 
@@ -74,9 +75,14 @@
 
     move-result p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_2
+
+    goto :goto_0
 
     :cond_2
+    const/4 v1, 0x0
+
+    :cond_3
     :goto_0
     return v1
 .end method
@@ -155,10 +161,9 @@
 
     const-string v1, "android.os.action.DISCHARGING"
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroid/content/IntentFilter;->addAction(Ljava/lang/String;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v1, "android.intent.action.ACTION_POWER_CONNECTED"
@@ -167,9 +172,9 @@
 
     const-string v1, "android.intent.action.ACTION_POWER_DISCONNECTED"
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Landroid/content/IntentFilter;->addAction(Ljava/lang/String;)V
 
-    :goto_1
+    :goto_0
     return-object v0
 .end method
 
@@ -290,19 +295,18 @@
     :goto_1
     packed-switch v1, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     sget-object p1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
     invoke-virtual {p0, p1}, Landroidx/work/impl/constraints/trackers/BatteryChargingTracker;->setState(Ljava/lang/Object;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_1
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    :goto_2
     invoke-virtual {p0, p1}, Landroidx/work/impl/constraints/trackers/BatteryChargingTracker;->setState(Ljava/lang/Object;)V
 
     return-void
@@ -310,14 +314,25 @@
     :pswitch_2
     sget-object p1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    goto :goto_2
+    invoke-virtual {p0, p1}, Landroidx/work/impl/constraints/trackers/BatteryChargingTracker;->setState(Ljava/lang/Object;)V
 
-    :goto_3
     return-void
 
+    :pswitch_3
+    sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1}, Landroidx/work/impl/constraints/trackers/BatteryChargingTracker;->setState(Ljava/lang/Object;)V
+
+    return-void
+
+    :goto_2
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
-        :pswitch_1
+        :pswitch_3
         :pswitch_2
         :pswitch_1
         :pswitch_0
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryNotLowTracker.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryNotLowTracker.smali
index 699b078eaa..7c08a21054 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryNotLowTracker.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/BatteryNotLowTracker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;
 .super Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;
+.source "BatteryNotLowTracker.java"
 
 
 # annotations
@@ -257,10 +258,10 @@
 
     invoke-virtual {p0, p1}, Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;->setState(Ljava/lang/Object;)V
 
-    :goto_1
     return-void
 
-    nop
+    :goto_1
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$1.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$1.smali
index 2882cf9478..650e6b5665 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$1.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$1;
 .super Landroid/content/BroadcastReceiver;
+.source "BroadcastReceiverConstraintTracker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker.smali
index 00703869b9..f1ecb58f33 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;
 .super Landroidx/work/impl/constraints/trackers/ConstraintTracker;
+.source "BroadcastReceiverConstraintTracker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/ConstraintTracker.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/ConstraintTracker.smali
index e86c6a5863..a10504868c 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/ConstraintTracker.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/ConstraintTracker.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/impl/constraints/trackers/ConstraintTracker;
 .super Ljava/lang/Object;
+.source "ConstraintTracker.java"
 
 
 # annotations
@@ -307,6 +308,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public abstract startTracking()V
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateBroadcastReceiver.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateBroadcastReceiver.smali
index 954b6a93ee..599aee961b 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateBroadcastReceiver.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateBroadcastReceiver.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateBroadcastReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "NetworkStateTracker.java"
 
 
 # annotations
@@ -33,7 +34,7 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_2
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
@@ -68,15 +69,16 @@
 
     iget-object p1, p0, Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateBroadcastReceiver;->this$0:Landroidx/work/impl/constraints/trackers/NetworkStateTracker;
 
-    iget-object p2, p0, Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateBroadcastReceiver;->this$0:Landroidx/work/impl/constraints/trackers/NetworkStateTracker;
-
-    invoke-virtual {p2}, Landroidx/work/impl/constraints/trackers/NetworkStateTracker;->getActiveNetworkState()Landroidx/work/impl/constraints/NetworkState;
+    invoke-virtual {p1}, Landroidx/work/impl/constraints/trackers/NetworkStateTracker;->getActiveNetworkState()Landroidx/work/impl/constraints/NetworkState;
 
     move-result-object p2
 
     invoke-virtual {p1, p2}, Landroidx/work/impl/constraints/trackers/NetworkStateTracker;->setState(Ljava/lang/Object;)V
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback.smali
index 983b5515fd..be877e01c2 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback;
 .super Landroid/net/ConnectivityManager$NetworkCallback;
+.source "NetworkStateTracker.java"
 
 
 # annotations
@@ -59,9 +60,7 @@
 
     iget-object p1, p0, Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback;->this$0:Landroidx/work/impl/constraints/trackers/NetworkStateTracker;
 
-    iget-object p2, p0, Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback;->this$0:Landroidx/work/impl/constraints/trackers/NetworkStateTracker;
-
-    invoke-virtual {p2}, Landroidx/work/impl/constraints/trackers/NetworkStateTracker;->getActiveNetworkState()Landroidx/work/impl/constraints/NetworkState;
+    invoke-virtual {p1}, Landroidx/work/impl/constraints/trackers/NetworkStateTracker;->getActiveNetworkState()Landroidx/work/impl/constraints/NetworkState;
 
     move-result-object p2
 
@@ -85,9 +84,7 @@
 
     iget-object p1, p0, Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback;->this$0:Landroidx/work/impl/constraints/trackers/NetworkStateTracker;
 
-    iget-object v0, p0, Landroidx/work/impl/constraints/trackers/NetworkStateTracker$NetworkStateCallback;->this$0:Landroidx/work/impl/constraints/trackers/NetworkStateTracker;
-
-    invoke-virtual {v0}, Landroidx/work/impl/constraints/trackers/NetworkStateTracker;->getActiveNetworkState()Landroidx/work/impl/constraints/NetworkState;
+    invoke-virtual {p1}, Landroidx/work/impl/constraints/trackers/NetworkStateTracker;->getActiveNetworkState()Landroidx/work/impl/constraints/NetworkState;
 
     move-result-object v0
 
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker.smali
index 6b1c14aa34..7430a59781 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/NetworkStateTracker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/trackers/NetworkStateTracker;
 .super Landroidx/work/impl/constraints/trackers/ConstraintTracker;
+.source "NetworkStateTracker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/StorageNotLowTracker.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/StorageNotLowTracker.smali
index 9a31ec6045..6b45a697a5 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/StorageNotLowTracker.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/StorageNotLowTracker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/trackers/StorageNotLowTracker;
 .super Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;
+.source "StorageNotLowTracker.java"
 
 
 # annotations
@@ -262,10 +263,10 @@
 
     invoke-virtual {p0, p1}, Landroidx/work/impl/constraints/trackers/StorageNotLowTracker;->setState(Ljava/lang/Object;)V
 
-    :goto_1
     return-void
 
-    nop
+    :goto_1
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/Trackers.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/Trackers.smali
index 15c84d0993..6221929ffa 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/Trackers.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/Trackers.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/constraints/trackers/Trackers;
 .super Ljava/lang/Object;
+.source "Trackers.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/constraints/trackers/package-info.smali b/com.discord/smali/androidx/work/impl/constraints/trackers/package-info.smali
index 7c18acce11..8bc9ca47a2 100644
--- a/com.discord/smali/androidx/work/impl/constraints/trackers/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/constraints/trackers/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/constraints/trackers/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/Dependency.smali b/com.discord/smali/androidx/work/impl/model/Dependency.smali
index f668d78bf6..04cbb9200f 100644
--- a/com.discord/smali/androidx/work/impl/model/Dependency.smali
+++ b/com.discord/smali/androidx/work/impl/model/Dependency.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/Dependency;
 .super Ljava/lang/Object;
+.source "Dependency.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/DependencyDao.smali b/com.discord/smali/androidx/work/impl/model/DependencyDao.smali
index 07a1aef8fa..032142be19 100644
--- a/com.discord/smali/androidx/work/impl/model/DependencyDao.smali
+++ b/com.discord/smali/androidx/work/impl/model/DependencyDao.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/DependencyDao;
 .super Ljava/lang/Object;
+.source "DependencyDao.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl$1.smali b/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl$1.smali
index c834b1ab6a..adffff522e 100644
--- a/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/DependencyDao_Impl$1;
 .super Landroidx/room/EntityInsertionAdapter;
+.source "DependencyDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl.smali b/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl.smali
index c59766abba..18f30f506f 100644
--- a/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/model/DependencyDao_Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/DependencyDao_Impl;
 .super Ljava/lang/Object;
+.source "DependencyDao_Impl.java"
 
 # interfaces
 .implements Landroidx/work/impl/model/DependencyDao;
@@ -110,6 +111,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getPrerequisites(Ljava/lang/String;)Ljava/util/List;
@@ -192,6 +195,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public hasCompletedAllPrerequisites(Ljava/lang/String;)Z
diff --git a/com.discord/smali/androidx/work/impl/model/SystemIdInfo.smali b/com.discord/smali/androidx/work/impl/model/SystemIdInfo.smali
index 73b32f2a82..9e25a69b40 100644
--- a/com.discord/smali/androidx/work/impl/model/SystemIdInfo.smali
+++ b/com.discord/smali/androidx/work/impl/model/SystemIdInfo.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/SystemIdInfo;
 .super Ljava/lang/Object;
+.source "SystemIdInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao.smali b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao.smali
index 29b6575bc5..6e5ce0a88d 100644
--- a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao.smali
+++ b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/SystemIdInfoDao;
 .super Ljava/lang/Object;
+.source "SystemIdInfoDao.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$1.smali b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$1.smali
index 4e863a6dde..44a7e02b39 100644
--- a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/SystemIdInfoDao_Impl$1;
 .super Landroidx/room/EntityInsertionAdapter;
+.source "SystemIdInfoDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$2.smali b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$2.smali
index d9564d3723..f266caaf1b 100644
--- a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$2.smali
+++ b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/SystemIdInfoDao_Impl$2;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "SystemIdInfoDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali
index 942c62c5e6..de7feba343 100644
--- a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/SystemIdInfoDao_Impl;
 .super Ljava/lang/Object;
+.source "SystemIdInfoDao_Impl.java"
 
 # interfaces
 .implements Landroidx/work/impl/model/SystemIdInfoDao;
@@ -176,11 +177,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     invoke-interface {v0, v1, p1}, Landroidx/sqlite/db/SupportSQLiteStatement;->bindString(ILjava/lang/String;)V
 
@@ -203,7 +199,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     iget-object v1, p0, Landroidx/work/impl/model/SystemIdInfoDao_Impl;->__db:Landroidx/room/RoomDatabase;
 
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->endTransaction()V
diff --git a/com.discord/smali/androidx/work/impl/model/WorkName.smali b/com.discord/smali/androidx/work/impl/model/WorkName.smali
index 760c4ccc9b..6bea59e196 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkName.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkName.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkName;
 .super Ljava/lang/Object;
+.source "WorkName.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkNameDao.smali b/com.discord/smali/androidx/work/impl/model/WorkNameDao.smali
index 6c774208d4..e085366248 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkNameDao.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkNameDao.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/WorkNameDao;
 .super Ljava/lang/Object;
+.source "WorkNameDao.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl$1.smali b/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl$1.smali
index 623ceee5a0..d51793c4d8 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkNameDao_Impl$1;
 .super Landroidx/room/EntityInsertionAdapter;
+.source "WorkNameDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl.smali b/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl.smali
index afec444150..a59471dbe1 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkNameDao_Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkNameDao_Impl;
 .super Ljava/lang/Object;
+.source "WorkNameDao_Impl.java"
 
 # interfaces
 .implements Landroidx/work/impl/model/WorkNameDao;
@@ -110,6 +111,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public insert(Landroidx/work/impl/model/WorkName;)V
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpec$1.smali b/com.discord/smali/androidx/work/impl/model/WorkSpec$1.smali
index 3fee57fe23..8ad5bde67e 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpec$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpec$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/model/WorkSpec$1;
 .super Ljava/lang/Object;
+.source "WorkSpec.java"
 
 # interfaces
 .implements Landroidx/arch/core/util/Function;
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpec$IdAndState.smali b/com.discord/smali/androidx/work/impl/model/WorkSpec$IdAndState.smali
index d23e9a2835..e4d853a88b 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpec$IdAndState.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpec$IdAndState.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkSpec$IdAndState;
 .super Ljava/lang/Object;
+.source "WorkSpec.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpec$WorkInfoPojo.smali b/com.discord/smali/androidx/work/impl/model/WorkSpec$WorkInfoPojo.smali
index b5c99625d3..121d755228 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpec$WorkInfoPojo.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpec$WorkInfoPojo.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;
 .super Ljava/lang/Object;
+.source "WorkSpec.java"
 
 
 # annotations
@@ -75,7 +76,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_9
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -96,8 +97,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->id:Ljava/lang/String;
-
     iget-object v3, p1, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->id:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -130,8 +129,6 @@
 
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->output:Landroidx/work/Data;
-
     iget-object v3, p1, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->output:Landroidx/work/Data;
 
     invoke-virtual {v2, v3}, Landroidx/work/Data;->equals(Ljava/lang/Object;)Z
@@ -155,11 +152,9 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v0, p0, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->tags:Ljava/util/List;
-
     iget-object p1, p1, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->tags:Ljava/util/List;
 
-    invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
+    invoke-interface {v2, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -173,6 +168,9 @@
     return v0
 
     :cond_8
+    return v1
+
+    :cond_9
     :goto_2
     return v1
 .end method
@@ -186,8 +184,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->id:Ljava/lang/String;
-
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
     move-result v0
@@ -204,8 +200,6 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->state:Landroidx/work/WorkInfo$State;
-
     invoke-virtual {v2}, Landroidx/work/WorkInfo$State;->hashCode()I
 
     move-result v2
@@ -224,8 +218,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->output:Landroidx/work/Data;
-
     invoke-virtual {v2}, Landroidx/work/Data;->hashCode()I
 
     move-result v2
@@ -244,9 +236,7 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v1, p0, Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;->tags:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->hashCode()I
+    invoke-interface {v2}, Ljava/util/List;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpec.smali b/com.discord/smali/androidx/work/impl/model/WorkSpec.smali
index b77544a6d5..40511e1d06 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpec.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpec.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkSpec;
 .super Ljava/lang/Object;
+.source "WorkSpec.java"
 
 
 # annotations
@@ -453,7 +454,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_12
+    if-eqz p1, :cond_13
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -595,8 +596,6 @@
 
     if-eqz v2, :cond_d
 
-    iget-object v2, p0, Landroidx/work/impl/model/WorkSpec;->inputMergerClassName:Ljava/lang/String;
-
     iget-object v3, p1, Landroidx/work/impl/model/WorkSpec;->inputMergerClassName:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -664,6 +663,9 @@
     return v0
 
     :cond_12
+    return v1
+
+    :cond_13
     :goto_1
     return v1
 .end method
@@ -726,8 +728,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Landroidx/work/impl/model/WorkSpec;->inputMergerClassName:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -764,13 +764,11 @@
 
     iget-wide v1, p0, Landroidx/work/impl/model/WorkSpec;->initialDelay:J
 
-    iget-wide v3, p0, Landroidx/work/impl/model/WorkSpec;->initialDelay:J
+    const/16 v3, 0x20
 
-    const/16 v5, 0x20
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -780,11 +778,9 @@
 
     iget-wide v1, p0, Landroidx/work/impl/model/WorkSpec;->intervalDuration:J
 
-    iget-wide v3, p0, Landroidx/work/impl/model/WorkSpec;->intervalDuration:J
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -794,11 +790,9 @@
 
     iget-wide v1, p0, Landroidx/work/impl/model/WorkSpec;->flexDuration:J
 
-    iget-wide v3, p0, Landroidx/work/impl/model/WorkSpec;->flexDuration:J
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -834,11 +828,9 @@
 
     iget-wide v1, p0, Landroidx/work/impl/model/WorkSpec;->backoffDelayDuration:J
 
-    iget-wide v3, p0, Landroidx/work/impl/model/WorkSpec;->backoffDelayDuration:J
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -848,11 +840,9 @@
 
     iget-wide v1, p0, Landroidx/work/impl/model/WorkSpec;->periodStartTime:J
 
-    iget-wide v3, p0, Landroidx/work/impl/model/WorkSpec;->periodStartTime:J
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -862,11 +852,9 @@
 
     iget-wide v1, p0, Landroidx/work/impl/model/WorkSpec;->minimumRetentionDuration:J
 
-    iget-wide v3, p0, Landroidx/work/impl/model/WorkSpec;->minimumRetentionDuration:J
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -876,9 +864,7 @@
 
     iget-wide v1, p0, Landroidx/work/impl/model/WorkSpec;->scheduleRequestedAt:J
 
-    iget-wide v3, p0, Landroidx/work/impl/model/WorkSpec;->scheduleRequestedAt:J
-
-    ushr-long/2addr v3, v5
+    ushr-long v3, v1, v3
 
     xor-long/2addr v1, v3
 
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao.smali
index 5ed53144d2..02ad708665 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/WorkSpecDao;
 .super Ljava/lang/Object;
+.source "WorkSpecDao.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$1.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$1.smali
index 1a177db594..5265f2fcb9 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$1;
 .super Landroidx/room/EntityInsertionAdapter;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10$1.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10$1.smali
index 7147a535ee..cd3977854a 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$10$1;
 .super Landroidx/room/InvalidationTracker$Observer;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10.smali
index c351c1e892..092663f453 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$10.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$10;
 .super Landroidx/lifecycle/ComputableLiveData;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
@@ -278,6 +279,8 @@
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     throw v0
+
+    return-void
 .end method
 
 .method protected finalize()V
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11$1.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11$1.smali
index 7f05b936a6..2d742e7d11 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$11$1;
 .super Landroidx/room/InvalidationTracker$Observer;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11.smali
index b48c3f531c..6781320721 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$11.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$11;
 .super Landroidx/lifecycle/ComputableLiveData;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
@@ -284,6 +285,8 @@
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     throw v0
+
+    return-void
 .end method
 
 .method protected finalize()V
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12$1.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12$1.smali
index d2df106797..52f6bc8399 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$12$1;
 .super Landroidx/room/InvalidationTracker$Observer;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12.smali
index 89608ab567..5c0c92db23 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$12.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$12;
 .super Landroidx/lifecycle/ComputableLiveData;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
@@ -284,6 +285,8 @@
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     throw v0
+
+    return-void
 .end method
 
 .method protected finalize()V
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$2.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$2.smali
index 7d49cf81c2..a247d9ac84 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$2.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$2;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$3.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$3.smali
index c20f6f0e94..fb55817761 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$3.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$3.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$3;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$4.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$4.smali
index f9644e33aa..4580c92b09 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$4.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$4.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$4;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$5.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$5.smali
index 6ac2aa8c90..f2ca0fd11e 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$5.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$5.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$5;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$6.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$6.smali
index cde7900671..2ca5abb027 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$6.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$6.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$6;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$7.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$7.smali
index 260da05e7e..61b12e6a6e 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$7.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$7.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$7;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$8.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$8.smali
index 7d2f1644dd..f5b8a67bfb 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$8.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$8.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$8;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$9.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$9.smali
index 53708a0684..5c32fdbfb6 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$9.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl$9.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkSpecDao_Impl$9;
 .super Landroidx/room/SharedSQLiteStatement;
+.source "WorkSpecDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali
index de718e2fe8..945782a7a2 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkSpecDao_Impl;
 .super Ljava/lang/Object;
+.source "WorkSpecDao_Impl.java"
 
 # interfaces
 .implements Landroidx/work/impl/model/WorkSpecDao;
@@ -137,14 +138,14 @@
 
     move-result v1
 
-    move-object v4, v0
+    move-object v5, v0
 
     const/4 v0, 0x0
 
-    :goto_1
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :cond_1
+    :goto_1
     if-ge v0, v1, :cond_2
 
     invoke-virtual {p1, v0}, Landroidx/collection/ArrayMap;->keyAt(I)Ljava/lang/Object;
@@ -155,26 +156,28 @@
 
     move-result-object v7
 
-    invoke-virtual {v4, v6, v7}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v5, v6, v7}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     add-int/lit8 v0, v0, 0x1
 
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v4, v4, 0x1
 
-    if-ne v5, v2, :cond_1
+    if-ne v4, v2, :cond_1
 
-    invoke-direct {p0, v4}, Landroidx/work/impl/model/WorkSpecDao_Impl;->__fetchRelationshipWorkTagAsjavaLangString(Landroidx/collection/ArrayMap;)V
+    invoke-direct {p0, v5}, Landroidx/work/impl/model/WorkSpecDao_Impl;->__fetchRelationshipWorkTagAsjavaLangString(Landroidx/collection/ArrayMap;)V
 
-    new-instance v4, Landroidx/collection/ArrayMap;
+    new-instance v5, Landroidx/collection/ArrayMap;
 
-    invoke-direct {v4, v2}, Landroidx/collection/ArrayMap;-><init>(I)V
+    invoke-direct {v5, v2}, Landroidx/collection/ArrayMap;-><init>(I)V
+
+    const/4 v4, 0x0
 
     goto :goto_1
 
     :cond_2
-    if-lez v5, :cond_3
+    if-lez v4, :cond_3
 
-    move-object p1, v4
+    move-object p1, v5
 
     goto :goto_0
 
@@ -315,6 +318,8 @@
     invoke-interface {v0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method static synthetic access$000(Landroidx/work/impl/model/WorkSpecDao_Impl;)Landroidx/room/RoomDatabase;
@@ -357,11 +362,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     invoke-interface {v0, v1, p1}, Landroidx/sqlite/db/SupportSQLiteStatement;->bindString(ILjava/lang/String;)V
 
@@ -384,7 +384,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     iget-object v1, p0, Landroidx/work/impl/model/WorkSpecDao_Impl;->__db:Landroidx/room/RoomDatabase;
 
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->endTransaction()V
@@ -462,6 +464,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getAllWorkSpecIds()Ljava/util/List;
@@ -530,10 +534,12 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getEligibleWorkForScheduling(I)Ljava/util/List;
-    .locals 38
+    .locals 30
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I)",
@@ -661,7 +667,7 @@
 
     move-result v2
 
-    move/from16 v17, v2
+    move/from16 p1, v2
 
     const-string v2, "required_network_type"
 
@@ -669,7 +675,7 @@
 
     move-result v2
 
-    move/from16 v18, v3
+    move/from16 v17, v3
 
     const-string v3, "requires_charging"
 
@@ -677,7 +683,7 @@
 
     move-result v3
 
-    move/from16 v19, v1
+    move/from16 v18, v1
 
     const-string v1, "requires_device_idle"
 
@@ -685,7 +691,7 @@
 
     move-result v1
 
-    move/from16 v20, v15
+    move/from16 v19, v15
 
     const-string v15, "requires_battery_not_low"
 
@@ -693,7 +699,7 @@
 
     move-result v15
 
-    move/from16 v21, v14
+    move/from16 v20, v14
 
     const-string v14, "requires_storage_not_low"
 
@@ -701,7 +707,7 @@
 
     move-result v14
 
-    move/from16 v22, v13
+    move/from16 v21, v13
 
     const-string v13, "content_uri_triggers"
 
@@ -709,11 +715,11 @@
 
     move-result v13
 
-    move/from16 v23, v12
+    move/from16 v22, v12
 
     new-instance v12, Ljava/util/ArrayList;
 
-    move/from16 v24, v11
+    move/from16 v23, v11
 
     invoke-interface {v4}, Landroid/database/Cursor;->getCount()I
 
@@ -732,13 +738,13 @@
 
     move-result-object v11
 
-    move/from16 v25, v0
+    move/from16 v24, v0
 
     invoke-interface {v4, v6}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
-    move/from16 v26, v6
+    move/from16 v25, v6
 
     new-instance v6, Landroidx/work/Constraints;
 
@@ -746,11 +752,11 @@
 
     invoke-interface {v4, v2}, Landroid/database/Cursor;->getInt(I)I
 
-    move-result v27
+    move-result v26
 
-    move/from16 v28, v2
+    move/from16 v27, v2
 
-    invoke-static/range {v27 .. v27}, Landroidx/work/impl/model/WorkTypeConverters;->intToNetworkType(I)Landroidx/work/NetworkType;
+    invoke-static/range {v26 .. v26}, Landroidx/work/impl/model/WorkTypeConverters;->intToNetworkType(I)Landroidx/work/NetworkType;
 
     move-result-object v2
 
@@ -760,7 +766,7 @@
 
     move-result v2
 
-    const/16 v27, 0x0
+    const/16 v26, 0x0
 
     if-eqz v2, :cond_0
 
@@ -872,7 +878,7 @@
 
     iput-object v0, v2, Landroidx/work/impl/model/WorkSpec;->output:Landroidx/work/Data;
 
-    move/from16 v29, v1
+    move v11, v1
 
     invoke-interface {v4, v10}, Landroid/database/Cursor;->getLong(I)J
 
@@ -880,11 +886,11 @@
 
     iput-wide v0, v2, Landroidx/work/impl/model/WorkSpec;->initialDelay:J
 
-    move/from16 v30, v7
+    move v1, v7
 
-    move/from16 v31, v8
+    move/from16 v0, v23
 
-    move/from16 v0, v24
+    move/from16 v23, v8
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
@@ -892,71 +898,81 @@
 
     iput-wide v7, v2, Landroidx/work/impl/model/WorkSpec;->intervalDuration:J
 
-    move/from16 v1, v23
-
-    invoke-interface {v4, v1}, Landroid/database/Cursor;->getLong(I)J
-
-    move-result-wide v7
-
-    iput-wide v7, v2, Landroidx/work/impl/model/WorkSpec;->flexDuration:J
+    move v8, v0
 
     move/from16 v7, v22
 
-    invoke-interface {v4, v7}, Landroid/database/Cursor;->getInt(I)I
+    move/from16 v22, v1
 
-    move-result v8
-
-    iput v8, v2, Landroidx/work/impl/model/WorkSpec;->runAttemptCount:I
-
-    move/from16 v8, v21
-
-    invoke-interface {v4, v8}, Landroid/database/Cursor;->getInt(I)I
-
-    move-result v11
-
-    invoke-static {v11}, Landroidx/work/impl/model/WorkTypeConverters;->intToBackoffPolicy(I)Landroidx/work/BackoffPolicy;
-
-    move-result-object v11
-
-    iput-object v11, v2, Landroidx/work/impl/model/WorkSpec;->backoffPolicy:Landroidx/work/BackoffPolicy;
-
-    move/from16 v32, v0
-
-    move/from16 v33, v1
-
-    move/from16 v11, v20
-
-    invoke-interface {v4, v11}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v4, v7}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v0
 
-    iput-wide v0, v2, Landroidx/work/impl/model/WorkSpec;->backoffDelayDuration:J
+    iput-wide v0, v2, Landroidx/work/impl/model/WorkSpec;->flexDuration:J
 
-    move/from16 v34, v7
+    move/from16 v0, v21
 
-    move/from16 v35, v8
+    invoke-interface {v4, v0}, Landroid/database/Cursor;->getInt(I)I
+
+    move-result v1
+
+    iput v1, v2, Landroidx/work/impl/model/WorkSpec;->runAttemptCount:I
+
+    move/from16 v1, v20
+
+    invoke-interface {v4, v1}, Landroid/database/Cursor;->getInt(I)I
+
+    move-result v20
+
+    move/from16 v21, v0
+
+    invoke-static/range {v20 .. v20}, Landroidx/work/impl/model/WorkTypeConverters;->intToBackoffPolicy(I)Landroidx/work/BackoffPolicy;
+
+    move-result-object v0
+
+    iput-object v0, v2, Landroidx/work/impl/model/WorkSpec;->backoffPolicy:Landroidx/work/BackoffPolicy;
+
+    move/from16 v20, v8
 
     move/from16 v0, v19
 
+    move/from16 v19, v7
+
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v7
 
-    iput-wide v7, v2, Landroidx/work/impl/model/WorkSpec;->periodStartTime:J
+    iput-wide v7, v2, Landroidx/work/impl/model/WorkSpec;->backoffDelayDuration:J
 
-    move/from16 v1, v18
+    move v8, v1
 
-    invoke-interface {v4, v1}, Landroid/database/Cursor;->getLong(I)J
+    move/from16 v7, v18
+
+    move/from16 v18, v0
+
+    invoke-interface {v4, v7}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide v0
+
+    iput-wide v0, v2, Landroidx/work/impl/model/WorkSpec;->periodStartTime:J
+
+    move v1, v7
+
+    move/from16 v0, v17
+
+    move/from16 v17, v8
+
+    invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v7
 
     iput-wide v7, v2, Landroidx/work/impl/model/WorkSpec;->minimumRetentionDuration:J
 
-    move/from16 v36, v0
+    move/from16 v7, p1
 
-    move/from16 v37, v1
+    move v8, v0
 
-    move/from16 v7, v17
+    move/from16 p1, v1
 
     invoke-interface {v4, v7}, Landroid/database/Cursor;->getLong(I)J
 
@@ -970,33 +986,35 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    move/from16 v17, v7
+    move v1, v11
 
-    move/from16 v20, v11
+    move/from16 v0, v24
 
-    move/from16 v0, v25
+    move/from16 v6, v25
 
-    move/from16 v6, v26
+    move/from16 v2, v27
 
-    move/from16 v2, v28
+    move/from16 v28, v18
 
-    move/from16 v1, v29
+    move/from16 v18, p1
 
-    move/from16 v7, v30
+    move/from16 p1, v7
 
-    move/from16 v8, v31
+    move/from16 v7, v22
 
-    move/from16 v24, v32
+    move/from16 v22, v19
 
-    move/from16 v23, v33
+    move/from16 v19, v28
 
-    move/from16 v22, v34
+    move/from16 v29, v17
 
-    move/from16 v21, v35
+    move/from16 v17, v8
 
-    move/from16 v19, v36
+    move/from16 v8, v23
 
-    move/from16 v18, v37
+    move/from16 v23, v20
+
+    move/from16 v20, v29
 
     goto/16 :goto_0
 
@@ -1023,6 +1041,8 @@
     invoke-virtual/range {v16 .. v16}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public getInputsFromPrerequisites(Ljava/lang/String;)Ljava/util/List;
@@ -1109,6 +1129,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getState(Ljava/lang/String;)Landroidx/work/WorkInfo$State;
@@ -1259,6 +1281,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getUnfinishedWorkWithTag(Ljava/lang/String;)Ljava/util/List;
@@ -1341,10 +1365,12 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getWorkSpec(Ljava/lang/String;)Landroidx/work/impl/model/WorkSpec;
-    .locals 25
+    .locals 23
 
     move-object/from16 v0, p1
 
@@ -1360,17 +1386,16 @@
 
     invoke-virtual {v1, v2}, Landroidx/room/RoomSQLiteQuery;->bindNull(I)V
 
-    :goto_0
     move-object/from16 v3, p0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v1, v2, v0}, Landroidx/room/RoomSQLiteQuery;->bindString(ILjava/lang/String;)V
 
-    goto :goto_0
+    move-object/from16 v3, p0
 
-    :goto_1
+    :goto_0
     iget-object v0, v3, Landroidx/work/impl/model/WorkSpecDao_Impl;->__db:Landroidx/room/RoomDatabase;
 
     invoke-virtual {v0, v1}, Landroidx/room/RoomDatabase;->query(Landroidx/sqlite/db/SupportSQLiteQuery;)Landroid/database/Cursor;
@@ -1473,7 +1498,7 @@
 
     move-result v1
 
-    move/from16 v17, v1
+    move/from16 p1, v1
 
     const-string v1, "required_network_type"
 
@@ -1481,7 +1506,7 @@
 
     move-result v1
 
-    move/from16 v18, v3
+    move/from16 v17, v3
 
     const-string v3, "requires_charging"
 
@@ -1489,7 +1514,7 @@
 
     move-result v3
 
-    move/from16 v19, v2
+    move/from16 v18, v2
 
     const-string v2, "requires_device_idle"
 
@@ -1497,7 +1522,7 @@
 
     move-result v2
 
-    move/from16 v20, v15
+    move/from16 v19, v15
 
     const-string v15, "requires_battery_not_low"
 
@@ -1505,7 +1530,7 @@
 
     move-result v15
 
-    move/from16 v21, v14
+    move/from16 v20, v14
 
     const-string v14, "requires_storage_not_low"
 
@@ -1513,7 +1538,7 @@
 
     move-result v14
 
-    move/from16 v22, v13
+    move/from16 v21, v13
 
     const-string v13, "content_uri_triggers"
 
@@ -1523,9 +1548,9 @@
 
     invoke-interface {v4}, Landroid/database/Cursor;->moveToFirst()Z
 
-    move-result v23
+    move-result v22
 
-    if-eqz v23, :cond_5
+    if-eqz v22, :cond_5
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -1535,7 +1560,7 @@
 
     move-result-object v6
 
-    move/from16 v24, v12
+    move/from16 v22, v12
 
     new-instance v12, Landroidx/work/Constraints;
 
@@ -1561,12 +1586,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 v1, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {v12, v1}, Landroidx/work/Constraints;->setRequiresCharging(Z)V
 
     invoke-interface {v4, v2}, Landroid/database/Cursor;->getInt(I)I
@@ -1577,12 +1602,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const/4 v1, 0x0
 
-    :goto_3
+    :goto_2
     invoke-virtual {v12, v1}, Landroidx/work/Constraints;->setRequiresDeviceIdle(Z)V
 
     invoke-interface {v4, v15}, Landroid/database/Cursor;->getInt(I)I
@@ -1593,12 +1618,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/4 v1, 0x0
 
-    :goto_4
+    :goto_3
     invoke-virtual {v12, v1}, Landroidx/work/Constraints;->setRequiresBatteryNotLow(Z)V
 
     invoke-interface {v4, v14}, Landroid/database/Cursor;->getInt(I)I
@@ -1674,7 +1699,7 @@
 
     iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->intervalDuration:J
 
-    move/from16 v0, v24
+    move/from16 v0, v22
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
@@ -1682,7 +1707,7 @@
 
     iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->flexDuration:J
 
-    move/from16 v0, v22
+    move/from16 v0, v21
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getInt(I)I
 
@@ -1690,7 +1715,7 @@
 
     iput v0, v1, Landroidx/work/impl/model/WorkSpec;->runAttemptCount:I
 
-    move/from16 v0, v21
+    move/from16 v0, v20
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getInt(I)I
 
@@ -1702,7 +1727,7 @@
 
     iput-object v0, v1, Landroidx/work/impl/model/WorkSpec;->backoffPolicy:Landroidx/work/BackoffPolicy;
 
-    move/from16 v0, v20
+    move/from16 v0, v19
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
@@ -1710,7 +1735,7 @@
 
     iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->backoffDelayDuration:J
 
-    move/from16 v0, v19
+    move/from16 v0, v18
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
@@ -1718,7 +1743,7 @@
 
     iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->periodStartTime:J
 
-    move/from16 v0, v18
+    move/from16 v0, v17
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
@@ -1726,7 +1751,7 @@
 
     iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->minimumRetentionDuration:J
 
-    move/from16 v0, v17
+    move/from16 v0, p1
 
     invoke-interface {v4, v0}, Landroid/database/Cursor;->getLong(I)J
 
@@ -1738,12 +1763,12 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     const/4 v1, 0x0
 
-    :goto_5
+    :goto_4
     invoke-interface {v4}, Landroid/database/Cursor;->close()V
 
     invoke-virtual/range {v16 .. v16}, Landroidx/room/RoomSQLiteQuery;->release()V
@@ -1753,14 +1778,14 @@
     :catchall_0
     move-exception v0
 
-    goto :goto_6
+    goto :goto_5
 
     :catchall_1
     move-exception v0
 
     move-object/from16 v16, v1
 
-    :goto_6
+    :goto_5
     invoke-interface {v4}, Landroid/database/Cursor;->close()V
 
     invoke-virtual/range {v16 .. v16}, Landroidx/room/RoomSQLiteQuery;->release()V
@@ -1874,10 +1899,12 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getWorkSpecs(Ljava/util/List;)[Landroidx/work/impl/model/WorkSpec;
-    .locals 37
+    .locals 30
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -2121,19 +2148,19 @@
 
     if-eqz v25, :cond_6
 
-    move-object/from16 v26, v13
+    move-object/from16 v25, v13
 
     invoke-interface {v5, v0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v13
 
-    move/from16 v27, v0
+    move/from16 v26, v0
 
     invoke-interface {v5, v7}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
-    move/from16 v28, v7
+    move/from16 v27, v7
 
     new-instance v7, Landroidx/work/Constraints;
 
@@ -2141,11 +2168,11 @@
 
     invoke-interface {v5, v1}, Landroid/database/Cursor;->getInt(I)I
 
-    move-result v25
+    move-result v28
 
     move/from16 v29, v1
 
-    invoke-static/range {v25 .. v25}, Landroidx/work/impl/model/WorkTypeConverters;->intToNetworkType(I)Landroidx/work/NetworkType;
+    invoke-static/range {v28 .. v28}, Landroidx/work/impl/model/WorkTypeConverters;->intToNetworkType(I)Landroidx/work/NetworkType;
 
     move-result-object v1
 
@@ -2265,9 +2292,9 @@
 
     iput-object v0, v1, Landroidx/work/impl/model/WorkSpec;->output:Landroidx/work/Data;
 
-    move/from16 v31, v2
+    move v13, v2
 
-    move/from16 v30, v3
+    move v0, v3
 
     invoke-interface {v5, v11}, Landroid/database/Cursor;->getLong(I)J
 
@@ -2281,126 +2308,134 @@
 
     iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->intervalDuration:J
 
-    move/from16 v0, v23
+    move/from16 v2, v23
+
+    move/from16 v23, v4
+
+    invoke-interface {v5, v2}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide v3
+
+    iput-wide v3, v1, Landroidx/work/impl/model/WorkSpec;->flexDuration:J
+
+    move/from16 v3, v22
+
+    invoke-interface {v5, v3}, Landroid/database/Cursor;->getInt(I)I
+
+    move-result v4
+
+    iput v4, v1, Landroidx/work/impl/model/WorkSpec;->runAttemptCount:I
+
+    move/from16 v4, v21
+
+    invoke-interface {v5, v4}, Landroid/database/Cursor;->getInt(I)I
+
+    move-result v21
+
+    move/from16 v22, v0
+
+    invoke-static/range {v21 .. v21}, Landroidx/work/impl/model/WorkTypeConverters;->intToBackoffPolicy(I)Landroidx/work/BackoffPolicy;
+
+    move-result-object v0
+
+    iput-object v0, v1, Landroidx/work/impl/model/WorkSpec;->backoffPolicy:Landroidx/work/BackoffPolicy;
+
+    move/from16 v21, v3
+
+    move/from16 v0, v20
+
+    move/from16 v20, v2
 
     invoke-interface {v5, v0}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->flexDuration:J
-
-    move/from16 v2, v22
-
-    invoke-interface {v5, v2}, Landroid/database/Cursor;->getInt(I)I
-
-    move-result v3
-
-    iput v3, v1, Landroidx/work/impl/model/WorkSpec;->runAttemptCount:I
-
-    move/from16 v3, v21
-
-    invoke-interface {v5, v3}, Landroid/database/Cursor;->getInt(I)I
-
-    move-result v13
-
-    invoke-static {v13}, Landroidx/work/impl/model/WorkTypeConverters;->intToBackoffPolicy(I)Landroidx/work/BackoffPolicy;
-
-    move-result-object v13
-
-    iput-object v13, v1, Landroidx/work/impl/model/WorkSpec;->backoffPolicy:Landroidx/work/BackoffPolicy;
-
-    move/from16 v32, v2
-
-    move/from16 v33, v3
-
-    move/from16 v13, v20
-
-    invoke-interface {v5, v13}, Landroid/database/Cursor;->getLong(I)J
-
-    move-result-wide v2
-
     iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->backoffDelayDuration:J
 
-    move/from16 v34, v4
-
     move/from16 v2, v19
 
+    move/from16 v19, v4
+
     invoke-interface {v5, v2}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v3
 
     iput-wide v3, v1, Landroidx/work/impl/model/WorkSpec;->periodStartTime:J
 
-    move/from16 v35, v8
-
-    move/from16 v36, v9
+    move v4, v8
 
     move/from16 v3, v18
 
+    move/from16 v18, v9
+
     invoke-interface {v5, v3}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v8
 
     iput-wide v8, v1, Landroidx/work/impl/model/WorkSpec;->minimumRetentionDuration:J
 
-    move/from16 v4, v17
+    move v9, v2
 
-    invoke-interface {v5, v4}, Landroid/database/Cursor;->getLong(I)J
+    move/from16 v8, v17
 
-    move-result-wide v8
+    move/from16 v17, v3
 
-    iput-wide v8, v1, Landroidx/work/impl/model/WorkSpec;->scheduleRequestedAt:J
+    invoke-interface {v5, v8}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide v2
+
+    iput-wide v2, v1, Landroidx/work/impl/model/WorkSpec;->scheduleRequestedAt:J
 
     iput-object v7, v1, Landroidx/work/impl/model/WorkSpec;->constraints:Landroidx/work/Constraints;
 
-    aput-object v1, v26, v24
+    aput-object v1, v25, v24
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     add-int/lit8 v24, v24, 0x1
 
-    move/from16 v23, v0
+    move v2, v13
 
-    move/from16 v19, v2
+    move/from16 v3, v22
 
-    move/from16 v18, v3
+    move-object/from16 v13, v25
 
-    move/from16 v17, v4
-
-    move/from16 v20, v13
-
-    move-object/from16 v13, v26
-
-    move/from16 v0, v27
-
-    move/from16 v7, v28
+    move/from16 v7, v27
 
     move/from16 v1, v29
 
-    move/from16 v3, v30
+    move/from16 v22, v21
 
-    move/from16 v2, v31
+    move/from16 v21, v19
 
-    move/from16 v22, v32
+    move/from16 v19, v9
 
-    move/from16 v21, v33
+    move/from16 v9, v18
 
-    move/from16 v4, v34
+    move/from16 v18, v17
 
-    move/from16 v8, v35
+    move/from16 v17, v8
 
-    move/from16 v9, v36
+    move v8, v4
+
+    move/from16 v4, v23
+
+    move/from16 v23, v20
+
+    move/from16 v20, v0
+
+    move/from16 v0, v26
 
     goto/16 :goto_2
 
     :cond_6
-    move-object/from16 v26, v13
+    move-object/from16 v25, v13
 
     invoke-interface {v5}, Landroid/database/Cursor;->close()V
 
     invoke-virtual/range {v16 .. v16}, Landroidx/room/RoomSQLiteQuery;->release()V
 
-    return-object v26
+    return-object v25
 
     :catchall_0
     move-exception v0
@@ -2418,6 +2453,8 @@
     invoke-virtual/range {v16 .. v16}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public getWorkStatusPojoForId(Ljava/lang/String;)Landroidx/work/impl/model/WorkSpec$WorkInfoPojo;
@@ -2821,6 +2858,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public getWorkStatusPojoForName(Ljava/lang/String;)Ljava/util/List;
@@ -3009,6 +3048,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public getWorkStatusPojoForTag(Ljava/lang/String;)Ljava/util/List;
@@ -3197,6 +3238,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public getWorkStatusPojoLiveDataForIds(Ljava/util/List;)Landroidx/lifecycle/LiveData;
@@ -3395,11 +3438,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     invoke-interface {v0, v1, p1}, Landroidx/sqlite/db/SupportSQLiteStatement;->bindString(ILjava/lang/String;)V
 
@@ -3424,7 +3462,9 @@
 
     return p1
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     iget-object v1, p0, Landroidx/work/impl/model/WorkSpecDao_Impl;->__db:Landroidx/room/RoomDatabase;
 
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->endTransaction()V
@@ -3650,11 +3690,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     invoke-interface {v0, v1, p1}, Landroidx/sqlite/db/SupportSQLiteStatement;->bindString(ILjava/lang/String;)V
 
@@ -3679,7 +3714,9 @@
 
     return p1
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     iget-object v1, p0, Landroidx/work/impl/model/WorkSpecDao_Impl;->__db:Landroidx/room/RoomDatabase;
 
     invoke-virtual {v1}, Landroidx/room/RoomDatabase;->endTransaction()V
@@ -3931,4 +3968,6 @@
     invoke-virtual {p2}, Landroidx/room/RoomDatabase;->endTransaction()V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTag.smali b/com.discord/smali/androidx/work/impl/model/WorkTag.smali
index 554262d874..6145c0c36e 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTag.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTag.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkTag;
 .super Ljava/lang/Object;
+.source "WorkTag.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTagDao.smali b/com.discord/smali/androidx/work/impl/model/WorkTagDao.smali
index 0602f9575c..7cc5b8e24a 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTagDao.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTagDao.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/WorkTagDao;
 .super Ljava/lang/Object;
+.source "WorkTagDao.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl$1.smali b/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl$1.smali
index e8fac023da..5e8c97ae39 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/model/WorkTagDao_Impl$1;
 .super Landroidx/room/EntityInsertionAdapter;
+.source "WorkTagDao_Impl.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl.smali b/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl.smali
index c44cae0ad2..0367156b9e 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTagDao_Impl.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkTagDao_Impl;
 .super Ljava/lang/Object;
+.source "WorkTagDao_Impl.java"
 
 # interfaces
 .implements Landroidx/work/impl/model/WorkTagDao;
@@ -110,6 +111,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public getWorkSpecIdsWithTag(Ljava/lang/String;)Ljava/util/List;
@@ -192,6 +195,8 @@
     invoke-virtual {v0}, Landroidx/room/RoomSQLiteQuery;->release()V
 
     throw v1
+
+    return-void
 .end method
 
 .method public insert(Landroidx/work/impl/model/WorkTag;)V
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$1.smali b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$1.smali
index 1661b4d147..51a18b45bc 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$1.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/work/impl/model/WorkTypeConverters$1;
 .super Ljava/lang/Object;
+.source "WorkTypeConverters.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$BackoffPolicyIds.smali b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$BackoffPolicyIds.smali
index 6de7475c73..6aea234d03 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$BackoffPolicyIds.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$BackoffPolicyIds.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/WorkTypeConverters$BackoffPolicyIds;
 .super Ljava/lang/Object;
+.source "WorkTypeConverters.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$NetworkTypeIds.smali b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$NetworkTypeIds.smali
index 1adba4075e..63da7e849a 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$NetworkTypeIds.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$NetworkTypeIds.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/WorkTypeConverters$NetworkTypeIds;
 .super Ljava/lang/Object;
+.source "WorkTypeConverters.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$StateIds.smali b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$StateIds.smali
index e1ca5414c0..6e1ee829ba 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$StateIds.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters$StateIds.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/model/WorkTypeConverters$StateIds;
 .super Ljava/lang/Object;
+.source "WorkTypeConverters.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters.smali b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters.smali
index dd39d4d5ca..b307cfd7b7 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkTypeConverters.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkTypeConverters.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/model/WorkTypeConverters;
 .super Ljava/lang/Object;
+.source "WorkTypeConverters.java"
 
 
 # annotations
@@ -247,6 +248,8 @@
 
     :goto_7
     throw p0
+
+    return-void
 .end method
 
 .method public static contentUriTriggersToByteArray(Landroidx/work/ContentUriTriggers;)[B
@@ -441,6 +444,8 @@
 
     :goto_7
     throw p0
+
+    return-void
 .end method
 
 .method public static intToBackoffPolicy(I)Landroidx/work/BackoffPolicy;
diff --git a/com.discord/smali/androidx/work/impl/model/package-info.smali b/com.discord/smali/androidx/work/impl/model/package-info.smali
index c653054587..730346fa20 100644
--- a/com.discord/smali/androidx/work/impl/model/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/model/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/model/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/package-info.smali b/com.discord/smali/androidx/work/impl/package-info.smali
index d7d9505ed9..dafb9b78e7 100644
--- a/com.discord/smali/androidx/work/impl/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$1.smali b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$1.smali
index c3bf3756a1..06ec87cb25 100644
--- a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/CancelWorkRunnable$1;
 .super Landroidx/work/impl/utils/CancelWorkRunnable;
+.source "CancelWorkRunnable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$2.smali b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$2.smali
index 7adbea1cf7..4aae0598f0 100644
--- a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$2.smali
+++ b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/CancelWorkRunnable$2;
 .super Landroidx/work/impl/utils/CancelWorkRunnable;
+.source "CancelWorkRunnable.java"
 
 
 # annotations
@@ -100,4 +101,6 @@
     invoke-virtual {v0}, Landroidx/work/impl/WorkDatabase;->endTransaction()V
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$3.smali b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$3.smali
index 917396ec25..bfac44281b 100644
--- a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$3.smali
+++ b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$3.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/CancelWorkRunnable$3;
 .super Landroidx/work/impl/utils/CancelWorkRunnable;
+.source "CancelWorkRunnable.java"
 
 
 # annotations
@@ -109,4 +110,6 @@
     invoke-virtual {v0}, Landroidx/work/impl/WorkDatabase;->endTransaction()V
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$4.smali b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$4.smali
index 6efb6df1cd..dfaf912fa2 100644
--- a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$4.smali
+++ b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable$4.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/CancelWorkRunnable$4;
 .super Landroidx/work/impl/utils/CancelWorkRunnable;
+.source "CancelWorkRunnable.java"
 
 
 # annotations
@@ -106,4 +107,6 @@
     invoke-virtual {v0}, Landroidx/work/impl/WorkDatabase;->endTransaction()V
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable.smali b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable.smali
index 28cbf2d5d8..908d16f43c 100644
--- a/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/utils/CancelWorkRunnable.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/impl/utils/CancelWorkRunnable;
 .super Ljava/lang/Object;
+.source "CancelWorkRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/EnqueueRunnable.smali b/com.discord/smali/androidx/work/impl/utils/EnqueueRunnable.smali
index bed2aa0e12..dea4c194d5 100644
--- a/com.discord/smali/androidx/work/impl/utils/EnqueueRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/utils/EnqueueRunnable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/EnqueueRunnable;
 .super Ljava/lang/Object;
+.source "EnqueueRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -91,7 +92,7 @@
 .end method
 
 .method private static enqueueWorkWithPrerequisites(Landroidx/work/impl/WorkManagerImpl;Ljava/util/List;[Ljava/lang/String;Ljava/lang/String;Landroidx/work/ExistingWorkPolicy;)Z
-    .locals 18
+    .locals 16
     .param p1    # Ljava/util/List;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -252,7 +253,7 @@
     const/4 v10, 0x0
 
     :goto_4
-    if-eqz v10, :cond_13
+    if-eqz v10, :cond_14
 
     invoke-virtual {v5}, Landroidx/work/impl/WorkDatabase;->workSpecDao()Landroidx/work/impl/model/WorkSpecDao;
 
@@ -266,7 +267,7 @@
 
     move-result v14
 
-    if-nez v14, :cond_13
+    if-nez v14, :cond_14
 
     sget-object v14, Landroidx/work/ExistingWorkPolicy;->APPEND:Landroidx/work/ExistingWorkPolicy;
 
@@ -366,17 +367,20 @@
 
     const/4 v8, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_d
     const/4 v8, 0x0
 
-    goto :goto_9
+    :goto_8
+    const/4 v2, 0x0
+
+    goto :goto_b
 
     :cond_e
     sget-object v7, Landroidx/work/ExistingWorkPolicy;->KEEP:Landroidx/work/ExistingWorkPolicy;
 
-    if-ne v2, v7, :cond_11
+    if-ne v2, v7, :cond_12
 
     invoke-interface {v10}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -413,6 +417,12 @@
     :cond_11
     move-object/from16 v2, p0
 
+    goto :goto_9
+
+    :cond_12
+    move-object/from16 v2, p0
+
+    :goto_9
     invoke-static {v1, v2, v6}, Landroidx/work/impl/utils/CancelWorkRunnable;->forName(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;Z)Landroidx/work/impl/utils/CancelWorkRunnable;
 
     move-result-object v2
@@ -427,12 +437,12 @@
 
     move-result-object v7
 
-    :goto_8
+    :goto_a
     invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v10
 
-    if-eqz v10, :cond_12
+    if-eqz v10, :cond_13
 
     invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -444,28 +454,27 @@
 
     invoke-interface {v2, v10}, Landroidx/work/impl/model/WorkSpecDao;->delete(Ljava/lang/String;)V
 
-    goto :goto_8
-
-    :cond_12
-    const/4 v2, 0x1
-
     goto :goto_a
 
     :cond_13
-    :goto_9
+    const/4 v2, 0x1
+
+    goto :goto_b
+
+    :cond_14
     const/4 v2, 0x0
 
-    :goto_a
+    :goto_b
     invoke-interface/range {p1 .. p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v7
 
-    :goto_b
+    :goto_c
     invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v10
 
-    if-eqz v10, :cond_1c
+    if-eqz v10, :cond_1e
 
     invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -477,32 +486,35 @@
 
     move-result-object v14
 
-    if-eqz v8, :cond_16
+    if-eqz v8, :cond_17
 
-    if-nez v11, :cond_16
+    if-nez v11, :cond_17
 
-    if-eqz v12, :cond_14
+    if-eqz v12, :cond_15
 
     sget-object v15, Landroidx/work/WorkInfo$State;->FAILED:Landroidx/work/WorkInfo$State;
 
-    :goto_c
     iput-object v15, v14, Landroidx/work/impl/model/WorkSpec;->state:Landroidx/work/WorkInfo$State;
 
     goto :goto_d
 
-    :cond_14
-    if-eqz v13, :cond_15
+    :cond_15
+    if-eqz v13, :cond_16
 
     sget-object v15, Landroidx/work/WorkInfo$State;->CANCELLED:Landroidx/work/WorkInfo$State;
 
-    goto :goto_c
+    iput-object v15, v14, Landroidx/work/impl/model/WorkSpec;->state:Landroidx/work/WorkInfo$State;
 
-    :cond_15
-    sget-object v15, Landroidx/work/WorkInfo$State;->BLOCKED:Landroidx/work/WorkInfo$State;
-
-    goto :goto_c
+    goto :goto_d
 
     :cond_16
+    sget-object v15, Landroidx/work/WorkInfo$State;->BLOCKED:Landroidx/work/WorkInfo$State;
+
+    iput-object v15, v14, Landroidx/work/impl/model/WorkSpec;->state:Landroidx/work/WorkInfo$State;
+
+    goto :goto_d
+
+    :cond_17
     iput-wide v3, v14, Landroidx/work/impl/model/WorkSpec;->periodStartTime:J
 
     :goto_d
@@ -510,48 +522,48 @@
 
     const/16 v6, 0x17
 
-    if-lt v15, v6, :cond_17
+    if-lt v15, v6, :cond_18
 
     sget v6, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v15, 0x19
 
-    if-gt v6, v15, :cond_17
+    if-gt v6, v15, :cond_18
 
     invoke-static {v14}, Landroidx/work/impl/utils/EnqueueRunnable;->tryDelegateConstrainedWorkSpec(Landroidx/work/impl/model/WorkSpec;)V
 
-    :cond_17
+    :cond_18
     iget-object v6, v14, Landroidx/work/impl/model/WorkSpec;->state:Landroidx/work/WorkInfo$State;
 
     sget-object v15, Landroidx/work/WorkInfo$State;->ENQUEUED:Landroidx/work/WorkInfo$State;
 
-    if-ne v6, v15, :cond_18
+    if-ne v6, v15, :cond_19
 
     const/4 v2, 0x1
 
-    :cond_18
+    :cond_19
     invoke-virtual {v5}, Landroidx/work/impl/WorkDatabase;->workSpecDao()Landroidx/work/impl/model/WorkSpecDao;
 
     move-result-object v6
 
     invoke-interface {v6, v14}, Landroidx/work/impl/model/WorkSpecDao;->insertWorkSpec(Landroidx/work/impl/model/WorkSpec;)V
 
-    if-eqz v8, :cond_19
+    if-eqz v8, :cond_1b
 
     array-length v6, v0
 
     const/4 v14, 0x0
 
     :goto_e
-    if-ge v14, v6, :cond_19
+    if-ge v14, v6, :cond_1a
 
     aget-object v15, v0, v14
 
-    move-object/from16 v16, v0
+    move-object/from16 p0, v0
 
     new-instance v0, Landroidx/work/impl/model/Dependency;
 
-    move/from16 v17, v2
+    move/from16 p1, v2
 
     invoke-virtual {v10}, Landroidx/work/WorkRequest;->getStringId()Ljava/lang/String;
 
@@ -567,17 +579,25 @@
 
     add-int/lit8 v14, v14, 0x1
 
-    move-object/from16 v0, v16
+    move-object/from16 v0, p0
 
-    move/from16 v2, v17
+    move/from16 v2, p1
 
     goto :goto_e
 
-    :cond_19
-    move-object/from16 v16, v0
+    :cond_1a
+    move-object/from16 p0, v0
 
-    move/from16 v17, v2
+    move/from16 p1, v2
 
+    goto :goto_f
+
+    :cond_1b
+    move-object/from16 p0, v0
+
+    move/from16 p1, v2
+
+    :goto_f
     invoke-virtual {v10}, Landroidx/work/WorkRequest;->getTags()Ljava/util/Set;
 
     move-result-object v0
@@ -586,12 +606,12 @@
 
     move-result-object v0
 
-    :goto_f
+    :goto_10
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
-    if-eqz v2, :cond_1a
+    if-eqz v2, :cond_1c
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -613,10 +633,10 @@
 
     invoke-interface {v6, v14}, Landroidx/work/impl/model/WorkTagDao;->insert(Landroidx/work/impl/model/WorkTag;)V
 
-    goto :goto_f
+    goto :goto_10
 
-    :cond_1a
-    if-eqz v9, :cond_1b
+    :cond_1c
+    if-eqz v9, :cond_1d
 
     invoke-virtual {v5}, Landroidx/work/impl/WorkDatabase;->workNameDao()Landroidx/work/impl/model/WorkNameDao;
 
@@ -632,16 +652,16 @@
 
     invoke-interface {v0, v2}, Landroidx/work/impl/model/WorkNameDao;->insert(Landroidx/work/impl/model/WorkName;)V
 
-    :cond_1b
-    move-object/from16 v0, v16
-
-    move/from16 v2, v17
-
+    :cond_1d
     const/4 v6, 0x0
 
-    goto/16 :goto_b
+    move-object/from16 v0, p0
 
-    :cond_1c
+    move/from16 v2, p1
+
+    goto/16 :goto_c
+
+    :cond_1e
     return v2
 .end method
 
diff --git a/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable$BroadcastReceiver.smali b/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable$BroadcastReceiver.smali
index da9eabdb04..71c62945a8 100644
--- a/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable$BroadcastReceiver.smali
+++ b/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable$BroadcastReceiver.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/ForceStopRunnable$BroadcastReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "ForceStopRunnable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable.smali b/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable.smali
index 6ed54c1f61..ea13a877c5 100644
--- a/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/utils/ForceStopRunnable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/ForceStopRunnable;
 .super Ljava/lang/Object;
+.source "ForceStopRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/IdGenerator.smali b/com.discord/smali/androidx/work/impl/utils/IdGenerator.smali
index 14626662c0..11c0100b4b 100644
--- a/com.discord/smali/androidx/work/impl/utils/IdGenerator.smali
+++ b/com.discord/smali/androidx/work/impl/utils/IdGenerator.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/IdGenerator;
 .super Ljava/lang/Object;
+.source "IdGenerator.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1$1.smali b/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1$1.smali
index b9e873c305..2c7ada3f22 100644
--- a/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/utils/LiveDataUtils$1$1;
 .super Ljava/lang/Object;
+.source "LiveDataUtils.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -71,10 +72,9 @@
 
     iget-object v2, v2, Landroidx/work/impl/utils/LiveDataUtils$1;->val$outputLiveData:Landroidx/lifecycle/MediatorLiveData;
 
-    :goto_0
     invoke-virtual {v2, v1}, Landroidx/lifecycle/MediatorLiveData;->postValue(Ljava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v2, p0, Landroidx/work/impl/utils/LiveDataUtils$1$1;->val$previousOutput:Ljava/lang/Object;
@@ -93,10 +93,10 @@
 
     iget-object v2, v2, Landroidx/work/impl/utils/LiveDataUtils$1;->val$outputLiveData:Landroidx/lifecycle/MediatorLiveData;
 
-    goto :goto_0
+    invoke-virtual {v2, v1}, Landroidx/lifecycle/MediatorLiveData;->postValue(Ljava/lang/Object;)V
 
     :cond_1
-    :goto_1
+    :goto_0
     monitor-exit v0
 
     return-void
diff --git a/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1.smali b/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1.smali
index b373242aef..a6860045a0 100644
--- a/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/LiveDataUtils$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/LiveDataUtils$1;
 .super Ljava/lang/Object;
+.source "LiveDataUtils.java"
 
 # interfaces
 .implements Landroidx/lifecycle/Observer;
diff --git a/com.discord/smali/androidx/work/impl/utils/LiveDataUtils.smali b/com.discord/smali/androidx/work/impl/utils/LiveDataUtils.smali
index 62d32583c4..73c300cfa1 100644
--- a/com.discord/smali/androidx/work/impl/utils/LiveDataUtils.smali
+++ b/com.discord/smali/androidx/work/impl/utils/LiveDataUtils.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/LiveDataUtils;
 .super Ljava/lang/Object;
+.source "LiveDataUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/PackageManagerHelper.smali b/com.discord/smali/androidx/work/impl/utils/PackageManagerHelper.smali
index 5bb4df4409..baee6c6004 100644
--- a/com.discord/smali/androidx/work/impl/utils/PackageManagerHelper.smali
+++ b/com.discord/smali/androidx/work/impl/utils/PackageManagerHelper.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/PackageManagerHelper;
 .super Ljava/lang/Object;
+.source "PackageManagerHelper.java"
 
 
 # static fields
diff --git a/com.discord/smali/androidx/work/impl/utils/Preferences$LastCancelAllLiveData.smali b/com.discord/smali/androidx/work/impl/utils/Preferences$LastCancelAllLiveData.smali
index a4c15bfbc1..2896e0564f 100644
--- a/com.discord/smali/androidx/work/impl/utils/Preferences$LastCancelAllLiveData.smali
+++ b/com.discord/smali/androidx/work/impl/utils/Preferences$LastCancelAllLiveData.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/utils/Preferences$LastCancelAllLiveData;
 .super Landroidx/lifecycle/MutableLiveData;
+.source "Preferences.java"
 
 # interfaces
 .implements Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
diff --git a/com.discord/smali/androidx/work/impl/utils/Preferences.smali b/com.discord/smali/androidx/work/impl/utils/Preferences.smali
index 8f23440aa9..5384b12428 100644
--- a/com.discord/smali/androidx/work/impl/utils/Preferences.smali
+++ b/com.discord/smali/androidx/work/impl/utils/Preferences.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/Preferences;
 .super Ljava/lang/Object;
+.source "Preferences.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/PruneWorkRunnable.smali b/com.discord/smali/androidx/work/impl/utils/PruneWorkRunnable.smali
index 8999510ada..d32533e3cd 100644
--- a/com.discord/smali/androidx/work/impl/utils/PruneWorkRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/utils/PruneWorkRunnable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/PruneWorkRunnable;
 .super Ljava/lang/Object;
+.source "PruneWorkRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/StartWorkRunnable.smali b/com.discord/smali/androidx/work/impl/utils/StartWorkRunnable.smali
index 549b0016af..7ca4b9c9a2 100644
--- a/com.discord/smali/androidx/work/impl/utils/StartWorkRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/utils/StartWorkRunnable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/StartWorkRunnable;
 .super Ljava/lang/Object;
+.source "StartWorkRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$1.smali b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$1.smali
index fc0ef344a8..2dbb1a1513 100644
--- a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/StatusRunnable$1;
 .super Landroidx/work/impl/utils/StatusRunnable;
+.source "StatusRunnable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$2.smali b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$2.smali
index b645dc9fc6..ab1bcf30d4 100644
--- a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$2.smali
+++ b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/StatusRunnable$2;
 .super Landroidx/work/impl/utils/StatusRunnable;
+.source "StatusRunnable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$3.smali b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$3.smali
index 697d64e95f..0e40fa4302 100644
--- a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$3.smali
+++ b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$3.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/StatusRunnable$3;
 .super Landroidx/work/impl/utils/StatusRunnable;
+.source "StatusRunnable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$4.smali b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$4.smali
index d888725ac1..a3918f4bf1 100644
--- a/com.discord/smali/androidx/work/impl/utils/StatusRunnable$4.smali
+++ b/com.discord/smali/androidx/work/impl/utils/StatusRunnable$4.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/StatusRunnable$4;
 .super Landroidx/work/impl/utils/StatusRunnable;
+.source "StatusRunnable.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/StatusRunnable.smali b/com.discord/smali/androidx/work/impl/utils/StatusRunnable.smali
index 8c5abd7794..29d513dfa5 100644
--- a/com.discord/smali/androidx/work/impl/utils/StatusRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/utils/StatusRunnable.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/impl/utils/StatusRunnable;
 .super Ljava/lang/Object;
+.source "StatusRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/StopWorkRunnable.smali b/com.discord/smali/androidx/work/impl/utils/StopWorkRunnable.smali
index cbf4514382..65e5d57ac5 100644
--- a/com.discord/smali/androidx/work/impl/utils/StopWorkRunnable.smali
+++ b/com.discord/smali/androidx/work/impl/utils/StopWorkRunnable.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/StopWorkRunnable;
 .super Ljava/lang/Object;
+.source "StopWorkRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/SynchronousExecutor.smali b/com.discord/smali/androidx/work/impl/utils/SynchronousExecutor.smali
index 89ce36bf77..e39657695d 100644
--- a/com.discord/smali/androidx/work/impl/utils/SynchronousExecutor.smali
+++ b/com.discord/smali/androidx/work/impl/utils/SynchronousExecutor.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/SynchronousExecutor;
 .super Ljava/lang/Object;
+.source "SynchronousExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/androidx/work/impl/utils/WakeLocks.smali b/com.discord/smali/androidx/work/impl/utils/WakeLocks.smali
index d96f6d6713..df73832d10 100644
--- a/com.discord/smali/androidx/work/impl/utils/WakeLocks.smali
+++ b/com.discord/smali/androidx/work/impl/utils/WakeLocks.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/WakeLocks;
 .super Ljava/lang/Object;
+.source "WakeLocks.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$1.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$1.smali
index 1e8ccc6dae..8029adf983 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Landroidx/work/impl/utils/futures/AbstractFuture$1;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$AtomicHelper.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$AtomicHelper.smali
index 0277cabf44..edcddb18fd 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$AtomicHelper.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$AtomicHelper.smali
@@ -1,5 +1,6 @@
 .class abstract Landroidx/work/impl/utils/futures/AbstractFuture$AtomicHelper;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Cancellation.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Cancellation.smali
index d4a639258f..8a1c37e31b 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Cancellation.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Cancellation.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$Cancellation;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure$1.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure$1.smali
index f19c02482f..e3809a3a82 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$Failure$1;
 .super Ljava/lang/Throwable;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure.smali
index 374e5586bf..79776f45e6 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Failure.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$Failure;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Listener.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Listener.smali
index 0f77330fbf..ce9d2e7bb9 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Listener.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Listener.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$Listener;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SafeAtomicHelper.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SafeAtomicHelper.smali
index d16f8833d5..eaec5384d7 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SafeAtomicHelper.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SafeAtomicHelper.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$SafeAtomicHelper;
 .super Landroidx/work/impl/utils/futures/AbstractFuture$AtomicHelper;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SetFuture.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SetFuture.smali
index 62f301841e..b38176c6d7 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SetFuture.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SetFuture.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$SetFuture;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SynchronizedHelper.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SynchronizedHelper.smali
index 6e64e3854e..fdd4503a63 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SynchronizedHelper.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$SynchronizedHelper.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$SynchronizedHelper;
 .super Landroidx/work/impl/utils/futures/AbstractFuture$AtomicHelper;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Waiter.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Waiter.smali
index 14400d3435..f5fae0f6f0 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Waiter.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture$Waiter.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/AbstractFuture$Waiter;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali
index 621a35f133..1009a2e510 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali
@@ -1,5 +1,6 @@
 .class public abstract Landroidx/work/impl/utils/futures/AbstractFuture;
 .super Ljava/lang/Object;
+.source "AbstractFuture.java"
 
 # interfaces
 .implements Lcom/google/a/a/a/a;
@@ -244,7 +245,6 @@
 
     const-string v0, " thrown from get()]"
 
-    :goto_0
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     return-void
@@ -252,7 +252,9 @@
     :catch_1
     const-string v0, "CANCELLED"
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    return-void
 
     :catch_2
     move-exception v0
@@ -269,7 +271,9 @@
 
     const-string v0, "]"
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    return-void
 .end method
 
 .method private static cancellationExceptionWithCause(Ljava/lang/String;Ljava/lang/Throwable;)Ljava/util/concurrent/CancellationException;
@@ -501,6 +505,8 @@
 
     const/4 p1, 0x0
 
+    return-object p1
+
     :cond_0
     return-object p1
 
@@ -606,12 +612,14 @@
 
     if-nez v2, :cond_4
 
-    sget-object v2, Landroidx/work/impl/utils/futures/AbstractFuture;->NULL:Ljava/lang/Object;
+    sget-object p0, Landroidx/work/impl/utils/futures/AbstractFuture;->NULL:Ljava/lang/Object;
     :try_end_0
     .catch Ljava/util/concurrent/ExecutionException; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/util/concurrent/CancellationException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-object p0
+
     :cond_4
     return-object v2
 
@@ -671,7 +679,7 @@
 .end method
 
 .method private static getUninterruptibly(Ljava/util/concurrent/Future;)Ljava/lang/Object;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<V:",
@@ -694,7 +702,7 @@
     :try_start_0
     invoke-interface {p0}, Ljava/util/concurrent/Future;->get()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -703,12 +711,12 @@
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
-    move-result-object p0
+    move-result-object v0
 
-    invoke-virtual {p0}, Ljava/lang/Thread;->interrupt()V
+    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
 
     :cond_0
-    return-object v1
+    return-object p0
 
     :catchall_0
     move-exception p0
@@ -1048,9 +1056,9 @@
 
     iget-object v0, p0, Landroidx/work/impl/utils/futures/AbstractFuture;->value:Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
@@ -1180,6 +1188,8 @@
     invoke-direct {v0}, Ljava/lang/InterruptedException;-><init>()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final get(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;
@@ -1218,7 +1228,7 @@
 
     iget-object v6, v0, Landroidx/work/impl/utils/futures/AbstractFuture;->value:Ljava/lang/Object;
 
-    const/4 v8, 0x1
+    const/4 v8, 0x0
 
     if-eqz v6, :cond_0
 
@@ -1683,6 +1693,8 @@
     invoke-direct {v1}, Ljava/lang/InterruptedException;-><init>()V
 
     throw v1
+
+    return-void
 .end method
 
 .method protected interruptTask()V
@@ -1706,9 +1718,9 @@
 
     iget-object v0, p0, Landroidx/work/impl/utils/futures/AbstractFuture;->value:Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
@@ -1724,9 +1736,12 @@
 
     if-nez v0, :cond_1
 
-    const/4 v1, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
     and-int v0, v3, v1
 
     return v0
@@ -2059,10 +2074,9 @@
 
     const-string v1, "CANCELLED"
 
-    :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_0
     invoke-virtual {p0}, Landroidx/work/impl/utils/futures/AbstractFuture;->isDone()Z
@@ -2071,10 +2085,9 @@
 
     if-eqz v1, :cond_1
 
-    :goto_1
     invoke-direct {p0, v0}, Landroidx/work/impl/utils/futures/AbstractFuture;->addDoneString(Ljava/lang/StringBuilder;)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     :try_start_0
@@ -2084,7 +2097,7 @@
     :try_end_0
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_2
+    goto :goto_0
 
     :catch_0
     move-exception v1
@@ -2105,7 +2118,7 @@
 
     move-result-object v1
 
-    :goto_2
+    :goto_0
     if-eqz v1, :cond_2
 
     invoke-virtual {v1}, Ljava/lang/String;->isEmpty()Z
@@ -2122,7 +2135,9 @@
 
     const-string v1, "]"
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :cond_2
     invoke-virtual {p0}, Landroidx/work/impl/utils/futures/AbstractFuture;->isDone()Z
@@ -2131,14 +2146,16 @@
 
     if-eqz v1, :cond_3
 
+    invoke-direct {p0, v0}, Landroidx/work/impl/utils/futures/AbstractFuture;->addDoneString(Ljava/lang/StringBuilder;)V
+
     goto :goto_1
 
     :cond_3
     const-string v1, "PENDING"
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_3
+    :goto_1
     const-string v1, "]"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/DirectExecutor.smali b/com.discord/smali/androidx/work/impl/utils/futures/DirectExecutor.smali
index b11d3c7ee1..2c86f716d3 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/DirectExecutor.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/DirectExecutor.smali
@@ -1,5 +1,6 @@
 .class final enum Landroidx/work/impl/utils/futures/DirectExecutor;
 .super Ljava/lang/Enum;
+.source "DirectExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$1.smali b/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$1.smali
index c725469f1a..9b4d5c8754 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$1.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/FutureExtras$1;
 .super Ljava/lang/Object;
+.source "FutureExtras.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$2.smali b/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$2.smali
index a2c9c2e870..71efcbdec8 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$2.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras$2.smali
@@ -1,5 +1,6 @@
 .class final Landroidx/work/impl/utils/futures/FutureExtras$2;
 .super Ljava/lang/Object;
+.source "FutureExtras.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras.smali b/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras.smali
index 40a82bbebf..7780adbb63 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/FutureExtras.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/futures/FutureExtras;
 .super Ljava/lang/Object;
+.source "FutureExtras.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/SettableFuture.smali b/com.discord/smali/androidx/work/impl/utils/futures/SettableFuture.smali
index 9fcc88b6d3..e958b6302f 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/SettableFuture.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/SettableFuture.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/impl/utils/futures/SettableFuture;
 .super Landroidx/work/impl/utils/futures/AbstractFuture;
+.source "SettableFuture.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/package-info.smali b/com.discord/smali/androidx/work/impl/utils/futures/package-info.smali
index 32cd7dcee7..12412c77d9 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/utils/futures/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/package-info.smali b/com.discord/smali/androidx/work/impl/utils/package-info.smali
index 3a7004b4d4..cacf8d4c53 100644
--- a/com.discord/smali/androidx/work/impl/utils/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/utils/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/utils/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/taskexecutor/TaskExecutor.smali b/com.discord/smali/androidx/work/impl/utils/taskexecutor/TaskExecutor.smali
index c6cbab072c..34880958ea 100644
--- a/com.discord/smali/androidx/work/impl/utils/taskexecutor/TaskExecutor.smali
+++ b/com.discord/smali/androidx/work/impl/utils/taskexecutor/TaskExecutor.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Landroidx/work/impl/utils/taskexecutor/TaskExecutor;
 .super Ljava/lang/Object;
+.source "TaskExecutor.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$1.smali b/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$1.smali
index 90e00e9d3b..4df1f56dd0 100644
--- a/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$1.smali
+++ b/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$1;
 .super Ljava/lang/Object;
+.source "WorkManagerTaskExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$2.smali b/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$2.smali
index 73acbc7d18..4ad8453d7a 100644
--- a/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$2.smali
+++ b/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$2;
 .super Ljava/lang/Object;
+.source "WorkManagerTaskExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
diff --git a/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor.smali b/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor.smali
index f9b1b5ce63..be6089a9ad 100644
--- a/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor.smali
+++ b/com.discord/smali/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;
 .super Ljava/lang/Object;
+.source "WorkManagerTaskExecutor.java"
 
 # interfaces
 .implements Landroidx/work/impl/utils/taskexecutor/TaskExecutor;
diff --git a/com.discord/smali/androidx/work/impl/utils/taskexecutor/package-info.smali b/com.discord/smali/androidx/work/impl/utils/taskexecutor/package-info.smali
index 4a8e241542..f7a3d9ff57 100644
--- a/com.discord/smali/androidx/work/impl/utils/taskexecutor/package-info.smali
+++ b/com.discord/smali/androidx/work/impl/utils/taskexecutor/package-info.smali
@@ -1,5 +1,6 @@
 .class interface abstract synthetic Landroidx/work/impl/utils/taskexecutor/package-info;
 .super Ljava/lang/Object;
+.source "package-info.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/workers/CombineContinuationsWorker.smali b/com.discord/smali/androidx/work/impl/workers/CombineContinuationsWorker.smali
index 21132baf33..5939f4af67 100644
--- a/com.discord/smali/androidx/work/impl/workers/CombineContinuationsWorker.smali
+++ b/com.discord/smali/androidx/work/impl/workers/CombineContinuationsWorker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/workers/CombineContinuationsWorker;
 .super Landroidx/work/Worker;
+.source "CombineContinuationsWorker.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$1.smali b/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$1.smali
index bd2398113e..4479382b5b 100644
--- a/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$1.smali
+++ b/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$1.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/workers/ConstraintTrackingWorker$1;
 .super Ljava/lang/Object;
+.source "ConstraintTrackingWorker.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$2.smali b/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$2.smali
index 0a4016f5fd..ca0b43b537 100644
--- a/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$2.smali
+++ b/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker$2.smali
@@ -1,5 +1,6 @@
 .class Landroidx/work/impl/workers/ConstraintTrackingWorker$2;
 .super Ljava/lang/Object;
+.source "ConstraintTrackingWorker.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker.smali b/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker.smali
index 7ebbff5812..2be91250ce 100644
--- a/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker.smali
+++ b/com.discord/smali/androidx/work/impl/workers/ConstraintTrackingWorker.smali
@@ -1,5 +1,6 @@
 .class public Landroidx/work/impl/workers/ConstraintTrackingWorker;
 .super Landroidx/work/ListenableWorker;
+.source "ConstraintTrackingWorker.java"
 
 # interfaces
 .implements Landroidx/work/impl/constraints/WorkConstraintsCallback;
@@ -200,8 +201,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/work/impl/workers/ConstraintTrackingWorker;->mDelegate:Landroidx/work/ListenableWorker;
-
     invoke-virtual {v0}, Landroidx/work/ListenableWorker;->stop()V
 
     :cond_0
diff --git a/com.discord/smali/androidx/work/ktx/R$attr.smali b/com.discord/smali/androidx/work/ktx/R$attr.smali
index 27b9a210a9..1d1a5e5df8 100644
--- a/com.discord/smali/androidx/work/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/work/ktx/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$bool.smali b/com.discord/smali/androidx/work/ktx/R$bool.smali
index ccec53b439..a7b3793b34 100644
--- a/com.discord/smali/androidx/work/ktx/R$bool.smali
+++ b/com.discord/smali/androidx/work/ktx/R$bool.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$bool;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$color.smali b/com.discord/smali/androidx/work/ktx/R$color.smali
index fac1dc90da..1763ee4555 100644
--- a/com.discord/smali/androidx/work/ktx/R$color.smali
+++ b/com.discord/smali/androidx/work/ktx/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$dimen.smali b/com.discord/smali/androidx/work/ktx/R$dimen.smali
index 34b5c69692..1b67ce1050 100644
--- a/com.discord/smali/androidx/work/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/work/ktx/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$drawable.smali b/com.discord/smali/androidx/work/ktx/R$drawable.smali
index 1df6ce1323..6270207c79 100644
--- a/com.discord/smali/androidx/work/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$id.smali b/com.discord/smali/androidx/work/ktx/R$id.smali
index 71db366e4b..52aeab2d63 100644
--- a/com.discord/smali/androidx/work/ktx/R$id.smali
+++ b/com.discord/smali/androidx/work/ktx/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$integer.smali b/com.discord/smali/androidx/work/ktx/R$integer.smali
index cd472e2cee..80b655b341 100644
--- a/com.discord/smali/androidx/work/ktx/R$integer.smali
+++ b/com.discord/smali/androidx/work/ktx/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$layout.smali b/com.discord/smali/androidx/work/ktx/R$layout.smali
index d36d34d24a..72cdac2876 100644
--- a/com.discord/smali/androidx/work/ktx/R$layout.smali
+++ b/com.discord/smali/androidx/work/ktx/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali
index 67483f4724..319e6e798d 100644
--- a/com.discord/smali/androidx/work/ktx/R$string.smali
+++ b/com.discord/smali/androidx/work/ktx/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$style.smali b/com.discord/smali/androidx/work/ktx/R$style.smali
index dc18acc84d..ac8d33eeea 100644
--- a/com.discord/smali/androidx/work/ktx/R$style.smali
+++ b/com.discord/smali/androidx/work/ktx/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R$styleable.smali b/com.discord/smali/androidx/work/ktx/R$styleable.smali
index 90724fc954..aab3abcd2e 100644
--- a/com.discord/smali/androidx/work/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/androidx/work/ktx/R.smali b/com.discord/smali/androidx/work/ktx/R.smali
index f53e76f41c..43007403c9 100644
--- a/com.discord/smali/androidx/work/ktx/R.smali
+++ b/com.discord/smali/androidx/work/ktx/R.smali
@@ -1,5 +1,6 @@
 .class public final Landroidx/work/ktx/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/a$a.smali b/com.discord/smali/b/a$a.smali
index 0f7ad9bdae..68cbed7be4 100644
--- a/com.discord/smali/b/a$a.smali
+++ b/com.discord/smali/b/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/a$a;
 .super Ljava/lang/Object;
+.source "BuiltInConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final ckH:Lb/a$a;
+.field static final ckb:Lb/a$a;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$a;-><init>()V
 
-    sput-object v0, Lb/a$a;->ckH:Lb/a$a;
+    sput-object v0, Lb/a$a;->ckb: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 508d2b2d8e..09efbc99a8 100644
--- a/com.discord/smali/b/a$b.smali
+++ b/com.discord/smali/b/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lb/a$b;
 .super Ljava/lang/Object;
+.source "BuiltInConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final ckI:Lb/a$b;
+.field static final ckc:Lb/a$b;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$b;-><init>()V
 
-    sput-object v0, Lb/a$b;->ckI:Lb/a$b;
+    sput-object v0, Lb/a$b;->ckc: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 4075f5138b..77e5a03858 100644
--- a/com.discord/smali/b/a$c.smali
+++ b/com.discord/smali/b/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lb/a$c;
 .super Ljava/lang/Object;
+.source "BuiltInConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final ckJ:Lb/a$c;
+.field static final ckd:Lb/a$c;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$c;-><init>()V
 
-    sput-object v0, Lb/a$c;->ckJ:Lb/a$c;
+    sput-object v0, Lb/a$c;->ckd: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 e621b06afe..f46b99cb28 100644
--- a/com.discord/smali/b/a$d.smali
+++ b/com.discord/smali/b/a$d.smali
@@ -1,5 +1,6 @@
 .class final Lb/a$d;
 .super Ljava/lang/Object;
+.source "BuiltInConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final ckK:Lb/a$d;
+.field static final cke:Lb/a$d;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$d;-><init>()V
 
-    sput-object v0, Lb/a$d;->ckK:Lb/a$d;
+    sput-object v0, Lb/a$d;->cke: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 43b0feeadd..79e3e84c90 100644
--- a/com.discord/smali/b/a$e.smali
+++ b/com.discord/smali/b/a$e.smali
@@ -1,5 +1,6 @@
 .class final Lb/a$e;
 .super Ljava/lang/Object;
+.source "BuiltInConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final ckL:Lb/a$e;
+.field static final ckf:Lb/a$e;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$e;-><init>()V
 
-    sput-object v0, Lb/a$e;->ckL:Lb/a$e;
+    sput-object v0, Lb/a$e;->ckf:Lb/a$e;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a.smali b/com.discord/smali/b/a.smali
index f6d6a5ff60..51b514bc4c 100644
--- a/com.discord/smali/b/a.smali
+++ b/com.discord/smali/b/a.smali
@@ -1,5 +1,6 @@
 .class final Lb/a;
 .super Lb/e$a;
+.source "BuiltInConverters.java"
 
 
 # annotations
@@ -52,12 +53,12 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lb/a$c;->ckJ:Lb/a$c;
+    sget-object p1, Lb/a$c;->ckd:Lb/a$c;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lb/a$a;->ckH:Lb/a$a;
+    sget-object p1, Lb/a$a;->ckb:Lb/a$a;
 
     return-object p1
 
@@ -66,7 +67,7 @@
 
     if-ne p1, p2, :cond_2
 
-    sget-object p1, Lb/a$e;->ckL:Lb/a$e;
+    sget-object p1, Lb/a$e;->ckf:Lb/a$e;
 
     return-object p1
 
@@ -102,7 +103,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lb/a$b;->ckI:Lb/a$b;
+    sget-object p1, Lb/a$b;->ckc: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 9cdc382c95..a9794542e9 100644
--- a/com.discord/smali/b/a/a/a$a.smali
+++ b/com.discord/smali/b/a/a/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/a$a;
 .super Lrx/Subscriber;
+.source "BodyOnSubscribe.java"
 
 
 # annotations
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field private cmb:Z
+.field private clv:Z
 
 .field private final subscriber:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -60,7 +61,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-boolean v0, p0, Lb/a/a/a$a;->cmb:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->clv:Z
 
     if-nez v0, :cond_0
 
@@ -75,7 +76,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 2
 
-    iget-boolean v0, p0, Lb/a/a/a$a;->cmb:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->clv:Z
 
     if-nez v0, :cond_0
 
@@ -94,11 +95,11 @@
 
     invoke-virtual {v0, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
 
     return-void
 .end method
@@ -108,9 +109,9 @@
 
     check-cast p1, Lb/m;
 
-    iget-object v0, p1, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->ckO:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response;->AQ()Z
+    invoke-virtual {v0}, Lokhttp3/Response;->AP()Z
 
     move-result v0
 
@@ -118,7 +119,7 @@
 
     iget-object v0, p0, Lb/a/a/a$a;->subscriber:Lrx/Subscriber;
 
-    iget-object p1, p1, Lb/m;->clv:Ljava/lang/Object;
+    iget-object p1, p1, Lb/m;->ckP:Ljava/lang/Object;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -127,7 +128,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/a/a/a$a;->cmb:Z
+    iput-boolean v0, p0, Lb/a/a/a$a;->clv:Z
 
     new-instance v1, Lb/a/a/e;
 
@@ -164,20 +165,20 @@
 
     invoke-direct {v2, v3}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
 
     return-void
 
     :catch_1
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()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 5be3672e76..ecf914a58c 100644
--- a/com.discord/smali/b/a/a/a.smali
+++ b/com.discord/smali/b/a/a/a.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/a;
 .super Ljava/lang/Object;
+.source "BodyOnSubscribe.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field private final cma:Lrx/Observable$a;
+.field private final clu:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -50,7 +51,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/a;->cma:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/a;->clu:Lrx/Observable$a;
 
     return-void
 .end method
@@ -62,7 +63,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/a;->cma:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/a;->clu: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 d861a8cf0d..a95007ac4e 100644
--- a/com.discord/smali/b/a/a/b.smali
+++ b/com.discord/smali/b/a/a/b.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/b;
 .super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "CallArbiter.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -97,9 +98,9 @@
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
     :try_end_0
-    .catch Lrx/a/d; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Lrx/a/e; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Lrx/a/f; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Lrx/a/d; {:try_start_0 .. :try_end_0} :catch_5
+    .catch Lrx/a/e; {:try_start_0 .. :try_end_0} :catch_5
+    .catch Lrx/a/f; {:try_start_0 .. :try_end_0} :catch_5
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_2
 
     :cond_0
@@ -127,13 +128,20 @@
 
     invoke-static {p1}, Lrx/a/b;->C(Ljava/lang/Throwable;)V
 
-    :catch_1
-    :goto_0
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
+
+    return-void
+
+    :catch_1
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
 
     return-void
 
@@ -147,9 +155,9 @@
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
     :try_end_2
-    .catch Lrx/a/d; {:try_start_2 .. :try_end_2} :catch_1
-    .catch Lrx/a/e; {:try_start_2 .. :try_end_2} :catch_1
-    .catch Lrx/a/f; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Lrx/a/d; {:try_start_2 .. :try_end_2} :catch_4
+    .catch Lrx/a/e; {:try_start_2 .. :try_end_2} :catch_4
+    .catch Lrx/a/f; {:try_start_2 .. :try_end_2} :catch_4
     .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_3
 
     return-void
@@ -175,7 +183,31 @@
 
     invoke-direct {v1, v2}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    goto :goto_0
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
+
+    return-void
+
+    :catch_4
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
+
+    return-void
+
+    :catch_5
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
+
+    return-void
 .end method
 
 
@@ -320,6 +352,8 @@
 
     invoke-direct {p0, p1}, Lb/a/a/b;->c(Lb/m;)V
 
+    return-void
+
     :pswitch_1
     return-void
 
@@ -336,8 +370,6 @@
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
@@ -403,20 +435,22 @@
 
     invoke-direct {v1, v2}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
 
     goto :goto_0
 
     :catch_1
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
+
+    return-void
 
     :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 e66cfe3d49..aefbe205aa 100644
--- a/com.discord/smali/b/a/a/c$1.smali
+++ b/com.discord/smali/b/a/a/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/c$1;
 .super Ljava/lang/Object;
+.source "CallEnqueueOnSubscribe.java"
 
 # interfaces
 .implements Lb/d;
@@ -25,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic cme:Lb/a/a/b;
+.field final synthetic clx:Lb/a/a/b;
 
-.field final synthetic cmf:Lb/a/a/c;
+.field final synthetic cly: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;->cmf:Lb/a/a/c;
+    iput-object p1, p0, Lb/a/a/c$1;->cly:Lb/a/a/c;
 
-    iput-object p2, p0, Lb/a/a/c$1;->cme:Lb/a/a/b;
+    iput-object p2, p0, Lb/a/a/c$1;->clx:Lb/a/a/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,7 +56,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/a/a/c$1;->cme:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->clx:Lb/a/a/b;
 
     invoke-virtual {v0, p1}, Lb/a/a/b;->b(Lb/m;)V
 
@@ -74,7 +75,7 @@
 
     invoke-static {p1}, Lrx/a/b;->C(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lb/a/a/c$1;->cme:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->clx:Lb/a/a/b;
 
     invoke-virtual {v0, p1}, Lb/a/a/b;->x(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali/b/a/a/c.smali b/com.discord/smali/b/a/a/c.smali
index eb6d7866e0..d7c3e40bc5 100644
--- a/com.discord/smali/b/a/a/c.smali
+++ b/com.discord/smali/b/a/a/c.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/c;
 .super Ljava/lang/Object;
+.source "CallEnqueueOnSubscribe.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -20,7 +21,7 @@
 
 
 # instance fields
-.field private final cmc:Lb/b;
+.field private final clw:Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b<",
@@ -43,7 +44,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/c;->cmc:Lb/b;
+    iput-object p1, p0, Lb/a/a/c;->clw:Lb/b;
 
     return-void
 .end method
@@ -55,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/c;->cmc:Lb/b;
+    iget-object v0, p0, Lb/a/a/c;->clw:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Ka()Lb/b;
+    invoke-interface {v0}, Lb/b;->JZ()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 26aa34bd0f..9b49da9281 100644
--- a/com.discord/smali/b/a/a/d.smali
+++ b/com.discord/smali/b/a/a/d.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/d;
 .super Ljava/lang/Object;
+.source "CallExecuteOnSubscribe.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -20,7 +21,7 @@
 
 
 # instance fields
-.field private final cmc:Lb/b;
+.field private final clw:Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b<",
@@ -43,7 +44,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/d;->cmc:Lb/b;
+    iput-object p1, p0, Lb/a/a/d;->clw:Lb/b;
 
     return-void
 .end method
@@ -55,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/d;->cmc:Lb/b;
+    iget-object v0, p0, Lb/a/a/d;->clw:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Ka()Lb/b;
+    invoke-interface {v0}, Lb/b;->JZ()Lb/b;
 
     move-result-object v0
 
@@ -70,7 +71,7 @@
     invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
     :try_start_0
-    invoke-interface {v0}, Lb/b;->JZ()Lb/m;
+    invoke-interface {v0}, Lb/b;->JY()Lb/m;
 
     move-result-object p1
     :try_end_0
diff --git a/com.discord/smali/b/a/a/e.smali b/com.discord/smali/b/a/a/e.smali
index c8c0503a14..54a875d784 100644
--- a/com.discord/smali/b/a/a/e.smali
+++ b/com.discord/smali/b/a/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lb/a/a/e;
 .super Lb/h;
+.source "HttpException.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/a/a/f.smali b/com.discord/smali/b/a/a/f.smali
index 304c336e41..4c14baf4e5 100644
--- a/com.discord/smali/b/a/a/f.smali
+++ b/com.discord/smali/b/a/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lb/a/a/f;
 .super Ljava/lang/Object;
+.source "Result.java"
 
 
 # annotations
@@ -153,7 +154,6 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_0
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
@@ -175,5 +175,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_0
+    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/b/a/a/g$a.smali b/com.discord/smali/b/a/a/g$a.smali
index f03fa5682f..78462cea60 100644
--- a/com.discord/smali/b/a/a/g$a.smali
+++ b/com.discord/smali/b/a/a/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/g$a;
 .super Lrx/Subscriber;
+.source "ResultOnSubscribe.java"
 
 
 # annotations
@@ -125,20 +126,20 @@
 
     invoke-direct {v1, v2}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()Lrx/c/b;
 
     return-void
 
     :catch_2
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()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 479394655f..5a8b913eba 100644
--- a/com.discord/smali/b/a/a/g.smali
+++ b/com.discord/smali/b/a/a/g.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/g;
 .super Ljava/lang/Object;
+.source "ResultOnSubscribe.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field private final cma:Lrx/Observable$a;
+.field private final clu:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -51,7 +52,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/g;->cma:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/g;->clu:Lrx/Observable$a;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/g;->cma:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/g;->clu: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 54bc5eabe2..66061c7162 100644
--- a/com.discord/smali/b/a/a/h.smali
+++ b/com.discord/smali/b/a/a/h.smali
@@ -1,5 +1,6 @@
 .class final Lb/a/a/h;
 .super Ljava/lang/Object;
+.source "RxJavaCallAdapter.java"
 
 # interfaces
 .implements Lb/c;
@@ -21,17 +22,17 @@
 
 
 # instance fields
-.field private final clS:Ljava/lang/reflect/Type;
+.field private final clA:Z
 
-.field private final cmg:Z
+.field private final clB:Z
 
-.field private final cmh:Z
+.field private final clC:Z
 
-.field private final cmi:Z
+.field private final clD:Z
 
-.field private final cmj:Z
+.field private final clm:Ljava/lang/reflect/Type;
 
-.field private final cmk:Z
+.field private final clz:Z
 
 .field private final scheduler:Lrx/Scheduler;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -49,29 +50,29 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/h;->clS:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/a/a/h;->clm:Ljava/lang/reflect/Type;
 
     iput-object p2, p0, Lb/a/a/h;->scheduler:Lrx/Scheduler;
 
-    iput-boolean p3, p0, Lb/a/a/h;->cmg:Z
+    iput-boolean p3, p0, Lb/a/a/h;->clz:Z
 
-    iput-boolean p4, p0, Lb/a/a/h;->cmh:Z
+    iput-boolean p4, p0, Lb/a/a/h;->clA:Z
 
-    iput-boolean p5, p0, Lb/a/a/h;->cmi:Z
+    iput-boolean p5, p0, Lb/a/a/h;->clB:Z
 
-    iput-boolean p6, p0, Lb/a/a/h;->cmj:Z
+    iput-boolean p6, p0, Lb/a/a/h;->clC:Z
 
-    iput-boolean p7, p0, Lb/a/a/h;->cmk:Z
+    iput-boolean p7, p0, Lb/a/a/h;->clD:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Kb()Ljava/lang/reflect/Type;
+.method public final Ka()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/a/a/h;->clS:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/a/a/h;->clm:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -87,7 +88,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lb/a/a/h;->cmg:Z
+    iget-boolean v0, p0, Lb/a/a/h;->clz:Z
 
     if-eqz v0, :cond_0
 
@@ -103,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;->cmh:Z
+    iget-boolean p1, p0, Lb/a/a/h;->clA:Z
 
     if-eqz p1, :cond_1
 
@@ -114,7 +115,7 @@
     goto :goto_1
 
     :cond_1
-    iget-boolean p1, p0, Lb/a/a/h;->cmi:Z
+    iget-boolean p1, p0, Lb/a/a/h;->clB:Z
 
     if-eqz p1, :cond_2
 
@@ -136,25 +137,23 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lb/a/a/h;->scheduler:Lrx/Scheduler;
-
     invoke-virtual {p1, v0}, Lrx/Observable;->b(Lrx/Scheduler;)Lrx/Observable;
 
     move-result-object p1
 
     :cond_3
-    iget-boolean v0, p0, Lb/a/a/h;->cmj:Z
+    iget-boolean v0, p0, Lb/a/a/h;->clC:Z
 
     if-eqz v0, :cond_4
 
-    invoke-virtual {p1}, Lrx/Observable;->KA()Lrx/f;
+    invoke-virtual {p1}, Lrx/Observable;->Kz()Lrx/f;
 
     move-result-object p1
 
     return-object p1
 
     :cond_4
-    iget-boolean v0, p0, Lb/a/a/h;->cmk:Z
+    iget-boolean v0, p0, Lb/a/a/h;->clD:Z
 
     if-eqz v0, :cond_5
 
@@ -162,6 +161,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_5
     return-object p1
 .end method
diff --git a/com.discord/smali/b/a/a/i.smali b/com.discord/smali/b/a/a/i.smali
index 2395b91ca1..a52d366ab4 100644
--- a/com.discord/smali/b/a/a/i.smali
+++ b/com.discord/smali/b/a/a/i.smali
@@ -1,9 +1,10 @@
 .class public final Lb/a/a/i;
 .super Lb/c$a;
+.source "RxJavaCallAdapterFactory.java"
 
 
 # instance fields
-.field private final cmg:Z
+.field private final clz:Z
 
 .field private final scheduler:Lrx/Scheduler;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -23,12 +24,12 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lb/a/a/i;->cmg:Z
+    iput-boolean v0, p0, Lb/a/a/i;->clz:Z
 
     return-void
 .end method
 
-.method public static Ko()Lb/a/a/i;
+.method public static Kn()Lb/a/a/i;
     .locals 1
 
     new-instance v0, Lb/a/a/i;
@@ -105,7 +106,7 @@
 
     iget-object v2, p0, Lb/a/a/i;->scheduler:Lrx/Scheduler;
 
-    iget-boolean v3, p0, Lb/a/a/i;->cmg:Z
+    iget-boolean v3, p0, Lb/a/a/i;->clz:Z
 
     const/4 v4, 0x0
 
@@ -197,10 +198,9 @@
 
     const/4 v8, 0x0
 
-    :goto_3
     const/4 v9, 0x0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -230,6 +230,8 @@
 
     const/4 v8, 0x1
 
+    const/4 v9, 0x0
+
     goto :goto_3
 
     :cond_8
@@ -248,12 +250,12 @@
 
     const/4 v9, 0x1
 
-    :goto_4
+    :goto_3
     new-instance p1, Lb/a/a/h;
 
     iget-object v6, p0, Lb/a/a/i;->scheduler:Lrx/Scheduler;
 
-    iget-boolean v7, p0, Lb/a/a/i;->cmg:Z
+    iget-boolean v7, p0, Lb/a/a/i;->clz:Z
 
     const/4 v11, 0x0
 
diff --git a/com.discord/smali/b/b.smali b/com.discord/smali/b/b.smali
index 1f46d9dafa..b382243799 100644
--- a/com.discord/smali/b/b.smali
+++ b/com.discord/smali/b/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lb/b;
 .super Ljava/lang/Object;
+.source "Call.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
@@ -18,7 +19,7 @@
 
 
 # virtual methods
-.method public abstract JZ()Lb/m;
+.method public abstract JY()Lb/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -34,7 +35,7 @@
     .end annotation
 .end method
 
-.method public abstract Ka()Lb/b;
+.method public abstract JZ()Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/b/b/a/a.smali b/com.discord/smali/b/b/a/a.smali
index cc9ec9b080..9a90202866 100644
--- a/com.discord/smali/b/b/a/a.smali
+++ b/com.discord/smali/b/b/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lb/b/a/a;
 .super Lb/e$a;
+.source "GsonConverterFactory.java"
 
 
 # instance fields
diff --git a/com.discord/smali/b/b/a/b.smali b/com.discord/smali/b/b/a/b.smali
index 058d7d569d..9830ec436b 100644
--- a/com.discord/smali/b/b/a/b.smali
+++ b/com.discord/smali/b/b/a/b.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/a/b;
 .super Ljava/lang/Object;
+.source "GsonRequestBodyConverter.java"
 
 # interfaces
 .implements Lb/e;
@@ -23,11 +24,11 @@
 # static fields
 .field private static final UTF_8:Ljava/nio/charset/Charset;
 
-.field private static final cml:Lokhttp3/MediaType;
+.field private static final clE:Lokhttp3/MediaType;
 
 
 # instance fields
-.field private final cmm:Lcom/google/gson/TypeAdapter;
+.field private final clF:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -49,7 +50,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/b/a/b;->cml:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/a/b;->clE:Lokhttp3/MediaType;
 
     const-string v0, "UTF-8"
 
@@ -77,7 +78,7 @@
 
     iput-object p1, p0, Lb/b/a/b;->gson:Lcom/google/gson/Gson;
 
-    iput-object p2, p0, Lb/b/a/b;->cmm:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/b;->clF:Lcom/google/gson/TypeAdapter;
 
     return-void
 .end method
@@ -112,15 +113,15 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lb/b/a/b;->cmm:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lb/b/a/b;->clF: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;->cml:Lokhttp3/MediaType;
+    sget-object p1, Lb/b/a/b;->clE:Lokhttp3/MediaType;
 
-    invoke-virtual {v0}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Ij()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 8133befc79..46f1de0c97 100644
--- a/com.discord/smali/b/b/a/c.smali
+++ b/com.discord/smali/b/b/a/c.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/a/c;
 .super Ljava/lang/Object;
+.source "GsonResponseBodyConverter.java"
 
 # interfaces
 .implements Lb/e;
@@ -20,7 +21,7 @@
 
 
 # instance fields
-.field private final cmm:Lcom/google/gson/TypeAdapter;
+.field private final clF:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -48,7 +49,7 @@
 
     iput-object p1, p0, Lb/b/a/c;->gson:Lcom/google/gson/Gson;
 
-    iput-object p2, p0, Lb/b/a/c;->cmm:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/c;->clF:Lcom/google/gson/TypeAdapter;
 
     return-void
 .end method
@@ -71,7 +72,7 @@
 
     iget-object v0, p0, Lb/b/a/c;->gson:Lcom/google/gson/Gson;
 
-    iget-object v1, p1, Lokhttp3/x;->caB:Ljava/io/Reader;
+    iget-object v1, p1, Lokhttp3/x;->bZV:Ljava/io/Reader;
 
     if-eqz v1, :cond_0
 
@@ -80,7 +81,7 @@
     :cond_0
     new-instance v1, Lokhttp3/x$a;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {p1}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v2
 
@@ -90,7 +91,7 @@
 
     invoke-direct {v1, v2, v3}, Lokhttp3/x$a;-><init>(Lokio/d;Ljava/nio/charset/Charset;)V
 
-    iput-object v1, p1, Lokhttp3/x;->caB:Ljava/io/Reader;
+    iput-object v1, p1, Lokhttp3/x;->bZV:Ljava/io/Reader;
 
     :goto_0
     invoke-virtual {v0, v1}, Lcom/google/gson/Gson;->a(Ljava/io/Reader;)Lcom/google/gson/stream/JsonReader;
@@ -98,7 +99,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lb/b/a/c;->cmm:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lb/b/a/c;->clF: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 c0a18f2961..73866d3a0e 100644
--- a/com.discord/smali/b/b/b/a.smali
+++ b/com.discord/smali/b/b/b/a.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/a;
 .super Ljava/lang/Object;
+.source "ScalarRequestBodyConverter.java"
 
 # interfaces
 .implements Lb/e;
@@ -21,9 +22,9 @@
 
 
 # static fields
-.field private static final cml:Lokhttp3/MediaType;
+.field private static final clE:Lokhttp3/MediaType;
 
-.field static final cmn:Lb/b/b/a;
+.field static final clG:Lb/b/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b/b/a<",
@@ -42,7 +43,7 @@
 
     invoke-direct {v0}, Lb/b/b/a;-><init>()V
 
-    sput-object v0, Lb/b/b/a;->cmn:Lb/b/b/a;
+    sput-object v0, Lb/b/b/a;->clG:Lb/b/b/a;
 
     const-string v0, "text/plain; charset=UTF-8"
 
@@ -50,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/b/b/a;->cml:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/b/a;->clE:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -73,7 +74,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/b/b/a;->cml:Lokhttp3/MediaType;
+    sget-object v0, Lb/b/b/a;->clE: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 00380894fa..f9dceb3637 100644
--- a/com.discord/smali/b/b/b/b$a.smali
+++ b/com.discord/smali/b/b/b/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$a;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmo:Lb/b/b/b$a;
+.field static final clH:Lb/b/b/b$a;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$a;-><init>()V
 
-    sput-object v0, Lb/b/b/b$a;->cmo:Lb/b/b/b$a;
+    sput-object v0, Lb/b/b/b$a;->clH:Lb/b/b/b$a;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 3b27e17f7b..b29fa6652d 100644
--- a/com.discord/smali/b/b/b/b$b.smali
+++ b/com.discord/smali/b/b/b/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$b;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmp:Lb/b/b/b$b;
+.field static final clI:Lb/b/b/b$b;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$b;-><init>()V
 
-    sput-object v0, Lb/b/b/b$b;->cmp:Lb/b/b/b$b;
+    sput-object v0, Lb/b/b/b$b;->clI:Lb/b/b/b$b;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 8e34a72c84..26199f184b 100644
--- a/com.discord/smali/b/b/b/b$c.smali
+++ b/com.discord/smali/b/b/b/b$c.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$c;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmq:Lb/b/b/b$c;
+.field static final clJ:Lb/b/b/b$c;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$c;-><init>()V
 
-    sput-object v0, Lb/b/b/b$c;->cmq:Lb/b/b/b$c;
+    sput-object v0, Lb/b/b/b$c;->clJ:Lb/b/b/b$c;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 556d2534f1..860904344b 100644
--- a/com.discord/smali/b/b/b/b$d.smali
+++ b/com.discord/smali/b/b/b/b$d.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$d;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmr:Lb/b/b/b$d;
+.field static final clK:Lb/b/b/b$d;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$d;-><init>()V
 
-    sput-object v0, Lb/b/b/b$d;->cmr:Lb/b/b/b$d;
+    sput-object v0, Lb/b/b/b$d;->clK:Lb/b/b/b$d;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 6d23747075..51a658e95e 100644
--- a/com.discord/smali/b/b/b/b$e.smali
+++ b/com.discord/smali/b/b/b/b$e.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$e;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cms:Lb/b/b/b$e;
+.field static final clL:Lb/b/b/b$e;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$e;-><init>()V
 
-    sput-object v0, Lb/b/b/b$e;->cms:Lb/b/b/b$e;
+    sput-object v0, Lb/b/b/b$e;->clL:Lb/b/b/b$e;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 b57019c15a..8d931c81fb 100644
--- a/com.discord/smali/b/b/b/b$f.smali
+++ b/com.discord/smali/b/b/b/b$f.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$f;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmt:Lb/b/b/b$f;
+.field static final clM:Lb/b/b/b$f;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$f;-><init>()V
 
-    sput-object v0, Lb/b/b/b$f;->cmt:Lb/b/b/b$f;
+    sput-object v0, Lb/b/b/b$f;->clM:Lb/b/b/b$f;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 2256857bfa..57dfad11d6 100644
--- a/com.discord/smali/b/b/b/b$g.smali
+++ b/com.discord/smali/b/b/b/b$g.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$g;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmu:Lb/b/b/b$g;
+.field static final clN:Lb/b/b/b$g;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$g;-><init>()V
 
-    sput-object v0, Lb/b/b/b$g;->cmu:Lb/b/b/b$g;
+    sput-object v0, Lb/b/b/b$g;->clN:Lb/b/b/b$g;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 16efa529c2..bf4e84156b 100644
--- a/com.discord/smali/b/b/b/b$h.smali
+++ b/com.discord/smali/b/b/b/b$h.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$h;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmv:Lb/b/b/b$h;
+.field static final clO:Lb/b/b/b$h;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$h;-><init>()V
 
-    sput-object v0, Lb/b/b/b$h;->cmv:Lb/b/b/b$h;
+    sput-object v0, Lb/b/b/b$h;->clO:Lb/b/b/b$h;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()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 e67f35c7f2..e19956f42b 100644
--- a/com.discord/smali/b/b/b/b$i.smali
+++ b/com.discord/smali/b/b/b/b$i.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b$i;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 # interfaces
 .implements Lb/e;
@@ -27,7 +28,7 @@
 
 
 # static fields
-.field static final cmw:Lb/b/b/b$i;
+.field static final clP:Lb/b/b/b$i;
 
 
 # direct methods
@@ -38,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$i;-><init>()V
 
-    sput-object v0, Lb/b/b/b$i;->cmw:Lb/b/b/b$i;
+    sput-object v0, Lb/b/b/b$i;->clP:Lb/b/b/b$i;
 
     return-void
 .end method
@@ -63,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->HK()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b.smali b/com.discord/smali/b/b/b/b.smali
index 45d7bd5bf5..9062fa6380 100644
--- a/com.discord/smali/b/b/b/b.smali
+++ b/com.discord/smali/b/b/b/b.smali
@@ -1,5 +1,6 @@
 .class final Lb/b/b/b;
 .super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/b/b/c.smali b/com.discord/smali/b/b/b/c.smali
index 01ac44bd81..66bd1031c1 100644
--- a/com.discord/smali/b/b/b/c.smali
+++ b/com.discord/smali/b/b/b/c.smali
@@ -1,5 +1,6 @@
 .class public final Lb/b/b/c;
 .super Lb/e$a;
+.source "ScalarsConverterFactory.java"
 
 
 # direct methods
@@ -11,7 +12,7 @@
     return-void
 .end method
 
-.method public static Kp()Lb/b/b/c;
+.method public static Ko()Lb/b/b/c;
     .locals 1
 
     new-instance v0, Lb/b/b/c;
@@ -42,7 +43,7 @@
 
     if-ne p1, p2, :cond_0
 
-    sget-object p1, Lb/b/b/b$i;->cmw:Lb/b/b/b$i;
+    sget-object p1, Lb/b/b/b$i;->clP:Lb/b/b/b$i;
 
     return-object p1
 
@@ -141,49 +142,49 @@
 
     :cond_9
     :goto_0
-    sget-object p1, Lb/b/b/b$h;->cmv:Lb/b/b/b$h;
+    sget-object p1, Lb/b/b/b$h;->clO:Lb/b/b/b$h;
 
     return-object p1
 
     :cond_a
     :goto_1
-    sget-object p1, Lb/b/b/b$g;->cmu:Lb/b/b/b$g;
+    sget-object p1, Lb/b/b/b$g;->clN:Lb/b/b/b$g;
 
     return-object p1
 
     :cond_b
     :goto_2
-    sget-object p1, Lb/b/b/b$f;->cmt:Lb/b/b/b$f;
+    sget-object p1, Lb/b/b/b$f;->clM:Lb/b/b/b$f;
 
     return-object p1
 
     :cond_c
     :goto_3
-    sget-object p1, Lb/b/b/b$e;->cms:Lb/b/b/b$e;
+    sget-object p1, Lb/b/b/b$e;->clL:Lb/b/b/b$e;
 
     return-object p1
 
     :cond_d
     :goto_4
-    sget-object p1, Lb/b/b/b$d;->cmr:Lb/b/b/b$d;
+    sget-object p1, Lb/b/b/b$d;->clK:Lb/b/b/b$d;
 
     return-object p1
 
     :cond_e
     :goto_5
-    sget-object p1, Lb/b/b/b$c;->cmq:Lb/b/b/b$c;
+    sget-object p1, Lb/b/b/b$c;->clJ:Lb/b/b/b$c;
 
     return-object p1
 
     :cond_f
     :goto_6
-    sget-object p1, Lb/b/b/b$b;->cmp:Lb/b/b/b$b;
+    sget-object p1, Lb/b/b/b$b;->clI:Lb/b/b/b$b;
 
     return-object p1
 
     :cond_10
     :goto_7
-    sget-object p1, Lb/b/b/b$a;->cmo:Lb/b/b/b$a;
+    sget-object p1, Lb/b/b/b$a;->clH:Lb/b/b/b$a;
 
     return-object p1
 .end method
@@ -279,7 +280,7 @@
 
     :cond_1
     :goto_0
-    sget-object p1, Lb/b/b/a;->cmn:Lb/b/b/a;
+    sget-object p1, Lb/b/b/a;->clG:Lb/b/b/a;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/b/c$a.smali b/com.discord/smali/b/c$a.smali
index 7b5b1206f1..c6d7fa181c 100644
--- a/com.discord/smali/b/c$a.smali
+++ b/com.discord/smali/b/c$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lb/c$a;
 .super Ljava/lang/Object;
+.source "CallAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/c.smali b/com.discord/smali/b/c.smali
index 727ca1fbbf..d87bf2a8db 100644
--- a/com.discord/smali/b/c.smali
+++ b/com.discord/smali/b/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lb/c;
 .super Ljava/lang/Object;
+.source "CallAdapter.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
 
 
 # virtual methods
-.method public abstract Kb()Ljava/lang/reflect/Type;
+.method public abstract Ka()Ljava/lang/reflect/Type;
 .end method
 
 .method public abstract a(Lb/b;)Ljava/lang/Object;
diff --git a/com.discord/smali/b/c/a.smali b/com.discord/smali/b/c/a.smali
index 21dfdc4f3d..56217cc8af 100644
--- a/com.discord/smali/b/c/a.smali
+++ b/com.discord/smali/b/c/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/a;
 .super Ljava/lang/Object;
+.source "Body.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/b.smali b/com.discord/smali/b/c/b.smali
index 569ef833b7..38d4dcdcc3 100644
--- a/com.discord/smali/b/c/b.smali
+++ b/com.discord/smali/b/c/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/b;
 .super Ljava/lang/Object;
+.source "DELETE.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/c.smali b/com.discord/smali/b/c/c.smali
index 3412a6d8c1..ad0d98e6b7 100644
--- a/com.discord/smali/b/c/c.smali
+++ b/com.discord/smali/b/c/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/c;
 .super Ljava/lang/Object;
+.source "Field.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/c;
-        Kq = false
+        Kp = false
     .end subannotation
 .end annotation
 
@@ -27,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract Kq()Z
+.method public abstract Kp()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 6c1c506e9f..e9f594bb8a 100644
--- a/com.discord/smali/b/c/d.smali
+++ b/com.discord/smali/b/c/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/d;
 .super Ljava/lang/Object;
+.source "FieldMap.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/d;
-        Kq = false
+        Kp = false
     .end subannotation
 .end annotation
 
@@ -27,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract Kq()Z
+.method public abstract Kp()Z
 .end method
diff --git a/com.discord/smali/b/c/e.smali b/com.discord/smali/b/c/e.smali
index 2dd80dfb07..db61bf8d16 100644
--- a/com.discord/smali/b/c/e.smali
+++ b/com.discord/smali/b/c/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/e;
 .super Ljava/lang/Object;
+.source "FormUrlEncoded.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/f.smali b/com.discord/smali/b/c/f.smali
index 7621cbb95f..39dd9c356c 100644
--- a/com.discord/smali/b/c/f.smali
+++ b/com.discord/smali/b/c/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/f;
 .super Ljava/lang/Object;
+.source "GET.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/g.smali b/com.discord/smali/b/c/g.smali
index 9858119f3b..dcc9aa1f68 100644
--- a/com.discord/smali/b/c/g.smali
+++ b/com.discord/smali/b/c/g.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/g;
 .super Ljava/lang/Object;
+.source "HEAD.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/h.smali b/com.discord/smali/b/c/h.smali
index ddaa4bdcb8..ff18200ee1 100644
--- a/com.discord/smali/b/c/h.smali
+++ b/com.discord/smali/b/c/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/h;
 .super Ljava/lang/Object;
+.source "HTTP.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,8 +9,8 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/h;
-        Kr = ""
-        Ks = false
+        Kq = ""
+        Kr = false
     .end subannotation
 .end annotation
 
@@ -28,10 +29,10 @@
 
 
 # virtual methods
-.method public abstract Kr()Ljava/lang/String;
+.method public abstract Kq()Ljava/lang/String;
 .end method
 
-.method public abstract Ks()Z
+.method public abstract Kr()Z
 .end method
 
 .method public abstract method()Ljava/lang/String;
diff --git a/com.discord/smali/b/c/i.smali b/com.discord/smali/b/c/i.smali
index 5258c5bf55..6ab8884712 100644
--- a/com.discord/smali/b/c/i.smali
+++ b/com.discord/smali/b/c/i.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/i;
 .super Ljava/lang/Object;
+.source "Header.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/j.smali b/com.discord/smali/b/c/j.smali
index 32a0609972..3605da3073 100644
--- a/com.discord/smali/b/c/j.smali
+++ b/com.discord/smali/b/c/j.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/j;
 .super Ljava/lang/Object;
+.source "HeaderMap.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/k.smali b/com.discord/smali/b/c/k.smali
index 6756ba72e2..14916463a5 100644
--- a/com.discord/smali/b/c/k.smali
+++ b/com.discord/smali/b/c/k.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/k;
 .super Ljava/lang/Object;
+.source "Headers.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/l.smali b/com.discord/smali/b/c/l.smali
index d2cbe916ad..4a9277d923 100644
--- a/com.discord/smali/b/c/l.smali
+++ b/com.discord/smali/b/c/l.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/l;
 .super Ljava/lang/Object;
+.source "Multipart.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/m.smali b/com.discord/smali/b/c/m.smali
index 6cc71d5ad9..848c66b106 100644
--- a/com.discord/smali/b/c/m.smali
+++ b/com.discord/smali/b/c/m.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/m;
 .super Ljava/lang/Object;
+.source "OPTIONS.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/n.smali b/com.discord/smali/b/c/n.smali
index c6377a8661..a2e1c2fa06 100644
--- a/com.discord/smali/b/c/n.smali
+++ b/com.discord/smali/b/c/n.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/n;
 .super Ljava/lang/Object;
+.source "PATCH.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/o.smali b/com.discord/smali/b/c/o.smali
index 43490a92a7..1bb3ae820b 100644
--- a/com.discord/smali/b/c/o.smali
+++ b/com.discord/smali/b/c/o.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/o;
 .super Ljava/lang/Object;
+.source "POST.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/p.smali b/com.discord/smali/b/c/p.smali
index 45f9124cc7..d74845f25d 100644
--- a/com.discord/smali/b/c/p.smali
+++ b/com.discord/smali/b/c/p.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/p;
 .super Ljava/lang/Object;
+.source "PUT.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/q.smali b/com.discord/smali/b/c/q.smali
index 8a333f517d..dcaaac9abf 100644
--- a/com.discord/smali/b/c/q.smali
+++ b/com.discord/smali/b/c/q.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/q;
 .super Ljava/lang/Object;
+.source "Part.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/q;
-        Kt = "binary"
+        Ks = "binary"
         value = ""
     .end subannotation
 .end annotation
@@ -28,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract Kt()Ljava/lang/String;
+.method public abstract Ks()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 3936a48cac..f4b681362f 100644
--- a/com.discord/smali/b/c/r.smali
+++ b/com.discord/smali/b/c/r.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/r;
 .super Ljava/lang/Object;
+.source "PartMap.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/r;
-        Kt = "binary"
+        Ks = "binary"
     .end subannotation
 .end annotation
 
@@ -27,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract Kt()Ljava/lang/String;
+.method public abstract Ks()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/b/c/s.smali b/com.discord/smali/b/c/s.smali
index 4e4663c6dd..c7d51b404e 100644
--- a/com.discord/smali/b/c/s.smali
+++ b/com.discord/smali/b/c/s.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/s;
 .super Ljava/lang/Object;
+.source "Path.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/s;
-        Kq = false
+        Kp = false
     .end subannotation
 .end annotation
 
@@ -27,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract Kq()Z
+.method public abstract Kp()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 9676ea4b54..b15a816e3d 100644
--- a/com.discord/smali/b/c/t.smali
+++ b/com.discord/smali/b/c/t.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/t;
 .super Ljava/lang/Object;
+.source "Query.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/t;
-        Kq = false
+        Kp = false
     .end subannotation
 .end annotation
 
@@ -27,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract Kq()Z
+.method public abstract Kp()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 69b35ca85b..0456f503ec 100644
--- a/com.discord/smali/b/c/u.smali
+++ b/com.discord/smali/b/c/u.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/u;
 .super Ljava/lang/Object;
+.source "QueryMap.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/u;
-        Kq = false
+        Kp = false
     .end subannotation
 .end annotation
 
@@ -27,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract Kq()Z
+.method public abstract Kp()Z
 .end method
diff --git a/com.discord/smali/b/c/v.smali b/com.discord/smali/b/c/v.smali
index bbcb532d1e..02f50f9be9 100644
--- a/com.discord/smali/b/c/v.smali
+++ b/com.discord/smali/b/c/v.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/v;
 .super Ljava/lang/Object;
+.source "QueryName.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/v;
-        Kq = false
+        Kp = false
     .end subannotation
 .end annotation
 
@@ -27,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract Kq()Z
+.method public abstract Kp()Z
 .end method
diff --git a/com.discord/smali/b/c/w.smali b/com.discord/smali/b/c/w.smali
index cd8575a22b..403bb436e4 100644
--- a/com.discord/smali/b/c/w.smali
+++ b/com.discord/smali/b/c/w.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/w;
 .super Ljava/lang/Object;
+.source "Streaming.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/c/x.smali b/com.discord/smali/b/c/x.smali
index ed3c5fc4be..9b78882798 100644
--- a/com.discord/smali/b/c/x.smali
+++ b/com.discord/smali/b/c/x.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lb/c/x;
 .super Ljava/lang/Object;
+.source "Url.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/b/d.smali b/com.discord/smali/b/d.smali
index 892bb5b448..692d2cd2f3 100644
--- a/com.discord/smali/b/d.smali
+++ b/com.discord/smali/b/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lb/d;
 .super Ljava/lang/Object;
+.source "Callback.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/e$a.smali b/com.discord/smali/b/e$a.smali
index 6c7bae04ce..cf88a4f23a 100644
--- a/com.discord/smali/b/e$a.smali
+++ b/com.discord/smali/b/e$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lb/e$a;
 .super Ljava/lang/Object;
+.source "Converter.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/e.smali b/com.discord/smali/b/e.smali
index 60cee894da..6d568421ad 100644
--- a/com.discord/smali/b/e.smali
+++ b/com.discord/smali/b/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lb/e;
 .super Ljava/lang/Object;
+.source "Converter.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/f$1.smali b/com.discord/smali/b/f$1.smali
index b0a28119dc..b09f22ff9c 100644
--- a/com.discord/smali/b/f$1.smali
+++ b/com.discord/smali/b/f$1.smali
@@ -1,5 +1,6 @@
 .class final Lb/f$1;
 .super Ljava/lang/Object;
+.source "DefaultCallAdapterFactory.java"
 
 # interfaces
 .implements Lb/c;
@@ -27,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic ckN:Ljava/lang/reflect/Type;
+.field final synthetic ckh:Ljava/lang/reflect/Type;
 
-.field final synthetic ckO:Lb/f;
+.field final synthetic cki:Lb/f;
 
 
 # direct methods
 .method constructor <init>(Lb/f;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/f$1;->ckO:Lb/f;
+    iput-object p1, p0, Lb/f$1;->cki:Lb/f;
 
-    iput-object p2, p0, Lb/f$1;->ckN:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/f$1;->ckh:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,10 +48,10 @@
 
 
 # virtual methods
-.method public final Kb()Ljava/lang/reflect/Type;
+.method public final Ka()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/f$1;->ckN:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/f$1;->ckh: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 f435f5d0b5..912b248c39 100644
--- a/com.discord/smali/b/f.smali
+++ b/com.discord/smali/b/f.smali
@@ -1,9 +1,10 @@
 .class final Lb/f;
 .super Lb/c$a;
+.source "DefaultCallAdapterFactory.java"
 
 
 # static fields
-.field static final ckM:Lb/c$a;
+.field static final ckg:Lb/c$a;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lb/f;-><init>()V
 
-    sput-object v0, Lb/f;->ckM:Lb/c$a;
+    sput-object v0, Lb/f;->ckg: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 c14b11fcba..0ea9705e2c 100644
--- a/com.discord/smali/b/g$1.smali
+++ b/com.discord/smali/b/g$1.smali
@@ -1,5 +1,6 @@
 .class final Lb/g$1;
 .super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
 
 # interfaces
 .implements Lb/c;
@@ -27,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic ckN:Ljava/lang/reflect/Type;
+.field final synthetic ckh:Ljava/lang/reflect/Type;
 
-.field final synthetic ckQ:Lb/g;
+.field final synthetic ckk:Lb/g;
 
 
 # direct methods
 .method constructor <init>(Lb/g;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$1;->ckQ:Lb/g;
+    iput-object p1, p0, Lb/g$1;->ckk:Lb/g;
 
-    iput-object p2, p0, Lb/g$1;->ckN:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/g$1;->ckh:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,10 +48,10 @@
 
 
 # virtual methods
-.method public final Kb()Ljava/lang/reflect/Type;
+.method public final Ka()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/g$1;->ckN:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/g$1;->ckh:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -60,9 +61,9 @@
 
     new-instance v0, Lb/g$a;
 
-    iget-object v1, p0, Lb/g$1;->ckQ:Lb/g;
+    iget-object v1, p0, Lb/g$1;->ckk:Lb/g;
 
-    iget-object v1, v1, Lb/g;->ckP:Ljava/util/concurrent/Executor;
+    iget-object v1, v1, Lb/g;->ckj: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 9befe8040b..4c519e7d5a 100644
--- a/com.discord/smali/b/g$a$1$1.smali
+++ b/com.discord/smali/b/g$a$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lb/g$a$1$1;
 .super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic ckU:Lb/m;
+.field final synthetic cko:Lb/m;
 
-.field final synthetic ckV:Lb/g$a$1;
+.field final synthetic ckp: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;->ckV:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$1;->ckp:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$1;->ckU:Lb/m;
+    iput-object p2, p0, Lb/g$a$1$1;->cko:Lb/m;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,11 +41,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lb/g$a$1$1;->ckV:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->ckp:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->ckT:Lb/g$a;
+    iget-object v0, v0, Lb/g$a$1;->ckn:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->ckR:Lb/b;
+    iget-object v0, v0, Lb/g$a;->ckl:Lb/b;
 
     invoke-interface {v0}, Lb/b;->isCanceled()Z
 
@@ -52,9 +53,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lb/g$a$1$1;->ckV:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->ckp:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->ckS:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->ckm:Lb/d;
 
     new-instance v1, Ljava/io/IOException;
 
@@ -67,11 +68,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/g$a$1$1;->ckV:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->ckp:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->ckS:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->ckm:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$1;->ckU:Lb/m;
+    iget-object v1, p0, Lb/g$a$1$1;->cko: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 0778a59576..dbe364001d 100644
--- a/com.discord/smali/b/g$a$1$2.smali
+++ b/com.discord/smali/b/g$a$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lb/g$a$1$2;
 .super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic ckV:Lb/g$a$1;
+.field final synthetic ckp:Lb/g$a$1;
 
-.field final synthetic ckW:Ljava/lang/Throwable;
+.field final synthetic ckq: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;->ckV:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$2;->ckp:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$2;->ckW:Ljava/lang/Throwable;
+    iput-object p2, p0, Lb/g$a$1$2;->ckq:Ljava/lang/Throwable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,11 +41,11 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lb/g$a$1$2;->ckV:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$2;->ckp:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->ckS:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->ckm:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$2;->ckW:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/g$a$1$2;->ckq:Ljava/lang/Throwable;
 
     invoke-interface {v0, v1}, Lb/d;->w(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 321dcb975f..2052cd45e0 100644
--- a/com.discord/smali/b/g$a$1.smali
+++ b/com.discord/smali/b/g$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lb/g$a$1;
 .super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
 
 # interfaces
 .implements Lb/d;
@@ -25,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic ckS:Lb/d;
+.field final synthetic ckm:Lb/d;
 
-.field final synthetic ckT:Lb/g$a;
+.field final synthetic ckn:Lb/g$a;
 
 
 # direct methods
 .method constructor <init>(Lb/g$a;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$a$1;->ckT:Lb/g$a;
+    iput-object p1, p0, Lb/g$a$1;->ckn:Lb/g$a;
 
-    iput-object p2, p0, Lb/g$a$1;->ckS:Lb/d;
+    iput-object p2, p0, Lb/g$a$1;->ckm:Lb/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,9 +56,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a$1;->ckT:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->ckn:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->ckP:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->ckj:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lb/g$a$1$1;
 
@@ -78,9 +79,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a$1;->ckT:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->ckn:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->ckP:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->ckj:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lb/g$a$1$2;
 
diff --git a/com.discord/smali/b/g$a.smali b/com.discord/smali/b/g$a.smali
index ff390f8e95..e71112f48c 100644
--- a/com.discord/smali/b/g$a.smali
+++ b/com.discord/smali/b/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/g$a;
 .super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
 
 # interfaces
 .implements Lb/b;
@@ -28,9 +29,9 @@
 
 
 # instance fields
-.field final ckP:Ljava/util/concurrent/Executor;
+.field final ckj:Ljava/util/concurrent/Executor;
 
-.field final ckR:Lb/b;
+.field final ckl:Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b<",
@@ -54,16 +55,16 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/g$a;->ckP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g$a;->ckj:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lb/g$a;->ckR:Lb/b;
+    iput-object p2, p0, Lb/g$a;->ckl:Lb/b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final JZ()Lb/m;
+.method public final JY()Lb/m;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -79,16 +80,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a;->ckR:Lb/b;
+    iget-object v0, p0, Lb/g$a;->ckl:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->JZ()Lb/m;
+    invoke-interface {v0}, Lb/b;->JY()Lb/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Ka()Lb/b;
+.method public final JZ()Lb/b;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -100,11 +101,11 @@
 
     new-instance v0, Lb/g$a;
 
-    iget-object v1, p0, Lb/g$a;->ckP:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lb/g$a;->ckj:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lb/g$a;->ckR:Lb/b;
+    iget-object v2, p0, Lb/g$a;->ckl:Lb/b;
 
-    invoke-interface {v2}, Lb/b;->Ka()Lb/b;
+    invoke-interface {v2}, Lb/b;->JZ()Lb/b;
 
     move-result-object v2
 
@@ -127,7 +128,7 @@
 
     invoke-static {p1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lb/g$a;->ckR:Lb/b;
+    iget-object v0, p0, Lb/g$a;->ckl:Lb/b;
 
     new-instance v1, Lb/g$a$1;
 
@@ -141,7 +142,7 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lb/g$a;->ckR:Lb/b;
+    iget-object v0, p0, Lb/g$a;->ckl:Lb/b;
 
     invoke-interface {v0}, Lb/b;->cancel()V
 
@@ -156,7 +157,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lb/g$a;->Ka()Lb/b;
+    invoke-virtual {p0}, Lb/g$a;->JZ()Lb/b;
 
     move-result-object v0
 
@@ -166,7 +167,7 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-object v0, p0, Lb/g$a;->ckR:Lb/b;
+    iget-object v0, p0, Lb/g$a;->ckl: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 90ee2975c4..2c77315b41 100644
--- a/com.discord/smali/b/g.smali
+++ b/com.discord/smali/b/g.smali
@@ -1,5 +1,6 @@
 .class final Lb/g;
 .super Lb/c$a;
+.source "ExecutorCallAdapterFactory.java"
 
 
 # annotations
@@ -11,7 +12,7 @@
 
 
 # instance fields
-.field final ckP:Ljava/util/concurrent/Executor;
+.field final ckj:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -20,7 +21,7 @@
 
     invoke-direct {p0}, Lb/c$a;-><init>()V
 
-    iput-object p1, p0, Lb/g;->ckP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g;->ckj: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 0dcf1a5638..abd4b009db 100644
--- a/com.discord/smali/b/h.smali
+++ b/com.discord/smali/b/h.smali
@@ -1,5 +1,6 @@
 .class public Lb/h;
 .super Ljava/lang/RuntimeException;
+.source "HttpException.java"
 
 
 # instance fields
@@ -38,7 +39,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p1, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->ckO:Lokhttp3/Response;
 
     iget v1, v1, Lokhttp3/Response;->code:I
 
@@ -48,7 +49,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p1, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->ckO:Lokhttp3/Response;
 
     iget-object v1, v1, Lokhttp3/Response;->message:Ljava/lang/String;
 
@@ -60,13 +61,13 @@
 
     invoke-direct {p0, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p1, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->ckO:Lokhttp3/Response;
 
     iget v0, v0, Lokhttp3/Response;->code:I
 
     iput v0, p0, Lb/h;->code:I
 
-    iget-object v0, p1, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->ckO:Lokhttp3/Response;
 
     iget-object v0, v0, Lokhttp3/Response;->message:Ljava/lang/String;
 
@@ -79,7 +80,7 @@
 
 
 # virtual methods
-.method public final EF()I
+.method public final EE()I
     .locals 1
 
     iget v0, p0, Lb/h;->code:I
@@ -87,7 +88,7 @@
     return v0
 .end method
 
-.method public final Kc()Lb/m;
+.method public final Kb()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 604fea20e3..a821c64406 100644
--- a/com.discord/smali/b/i$1.smali
+++ b/com.discord/smali/b/i$1.smali
@@ -1,5 +1,6 @@
 .class final Lb/i$1;
 .super Ljava/lang/Object;
+.source "OkHttpCall.java"
 
 # interfaces
 .implements Lokhttp3/f;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic ckS:Lb/d;
+.field final synthetic ckm:Lb/d;
 
-.field final synthetic clb:Lb/i;
+.field final synthetic ckv:Lb/i;
 
 
 # direct methods
 .method constructor <init>(Lb/i;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$1;->clb:Lb/i;
+    iput-object p1, p0, Lb/i$1;->ckv:Lb/i;
 
-    iput-object p2, p0, Lb/i$1;->ckS:Lb/d;
+    iput-object p2, p0, Lb/i$1;->ckm:Lb/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +42,7 @@
     .locals 0
 
     :try_start_0
-    iget-object p1, p0, Lb/i$1;->ckS:Lb/d;
+    iget-object p1, p0, Lb/i$1;->ckm:Lb/d;
 
     invoke-interface {p1, p2}, Lb/d;->w(Ljava/lang/Throwable;)V
     :try_end_0
@@ -66,7 +67,7 @@
     .end annotation
 
     :try_start_0
-    iget-object p1, p0, Lb/i$1;->clb:Lb/i;
+    iget-object p1, p0, Lb/i$1;->ckv:Lb/i;
 
     invoke-virtual {p1, p2}, Lb/i;->g(Lokhttp3/Response;)Lb/m;
 
@@ -75,7 +76,7 @@
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_1
 
     :try_start_1
-    iget-object p2, p0, Lb/i$1;->ckS:Lb/d;
+    iget-object p2, p0, Lb/i$1;->ckm:Lb/d;
 
     invoke-interface {p2, p1}, Lb/d;->a(Lb/m;)V
     :try_end_1
@@ -94,7 +95,7 @@
     move-exception p1
 
     :try_start_2
-    iget-object p2, p0, Lb/i$1;->ckS:Lb/d;
+    iget-object p2, p0, Lb/i$1;->ckm:Lb/d;
 
     invoke-interface {p2, p1}, Lb/d;->w(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 439558c6d6..e0ed7795e6 100644
--- a/com.discord/smali/b/i$a$1.smali
+++ b/com.discord/smali/b/i$a$1.smali
@@ -1,10 +1,11 @@
 .class final Lb/i$a$1;
 .super Lokio/f;
+.source "OkHttpCall.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lb/i$a;->HK()Lokio/d;
+    value = Lb/i$a;->HJ()Lokio/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic cle:Lb/i$a;
+.field final synthetic cky:Lb/i$a;
 
 
 # direct methods
 .method constructor <init>(Lb/i$a;Lokio/q;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$a$1;->cle:Lb/i$a;
+    iput-object p1, p0, Lb/i$a$1;->cky:Lb/i$a;
 
     invoke-direct {p0, p2}, Lokio/f;-><init>(Lokio/q;)V
 
@@ -50,9 +51,9 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lb/i$a$1;->cle:Lb/i$a;
+    iget-object p2, p0, Lb/i$a$1;->cky:Lb/i$a;
 
-    iput-object p1, p2, Lb/i$a;->cld:Ljava/io/IOException;
+    iput-object p1, p2, Lb/i$a;->ckx: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 ddf02f643b..a7bea84960 100644
--- a/com.discord/smali/b/i$a.smali
+++ b/com.discord/smali/b/i$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/i$a;
 .super Lokhttp3/x;
+.source "OkHttpCall.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field private final clc:Lokhttp3/x;
+.field private final ckw:Lokhttp3/x;
 
-.field cld:Ljava/io/IOException;
+.field ckx:Ljava/io/IOException;
 
 
 # direct methods
@@ -25,21 +26,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lb/i$a;->clc:Lokhttp3/x;
+    iput-object p1, p0, Lb/i$a;->ckw:Lokhttp3/x;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HK()Lokio/d;
+.method public final HJ()Lokio/d;
     .locals 2
 
     new-instance v0, Lb/i$a$1;
 
-    iget-object v1, p0, Lb/i$a;->clc:Lokhttp3/x;
+    iget-object v1, p0, Lb/i$a;->ckw:Lokhttp3/x;
 
-    invoke-virtual {v1}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {v1}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v1
 
@@ -55,7 +56,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lb/i$a;->clc:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->ckw:Lokhttp3/x;
 
     invoke-virtual {v0}, Lokhttp3/x;->close()V
 
@@ -65,7 +66,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget-object v0, p0, Lb/i$a;->clc:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->ckw:Lokhttp3/x;
 
     invoke-virtual {v0}, Lokhttp3/x;->contentLength()J
 
@@ -77,7 +78,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lb/i$a;->clc:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->ckw: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 95cd0e8211..049d690954 100644
--- a/com.discord/smali/b/i$b.smali
+++ b/com.discord/smali/b/i$b.smali
@@ -1,5 +1,6 @@
 .class final Lb/i$b;
 .super Lokhttp3/x;
+.source "OkHttpCall.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field private final bZz:Lokhttp3/MediaType;
+.field private final bYT:Lokhttp3/MediaType;
 
 .field private final contentLength:J
 
@@ -25,7 +26,7 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lb/i$b;->bZz:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/i$b;->bYT:Lokhttp3/MediaType;
 
     iput-wide p2, p0, Lb/i$b;->contentLength:J
 
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final HK()Lokio/d;
+.method public final HJ()Lokio/d;
     .locals 2
 
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -57,7 +58,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lb/i$b;->bZz:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/i$b;->bYT:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/i.smali b/com.discord/smali/b/i.smali
index 24b3f841eb..5a171d471b 100644
--- a/com.discord/smali/b/i.smali
+++ b/com.discord/smali/b/i.smali
@@ -1,5 +1,6 @@
 .class final Lb/i;
 .super Ljava/lang/Object;
+.source "OkHttpCall.java"
 
 # interfaces
 .implements Lb/b;
@@ -26,15 +27,15 @@
 
 
 # instance fields
-.field private cag:Z
+.field private bZA:Z
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "this"
     .end annotation
 .end field
 
-.field private volatile ccn:Z
+.field private volatile cbH:Z
 
-.field private final ckX:Lb/o;
+.field private final ckr:Lb/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/o<",
@@ -43,12 +44,12 @@
     .end annotation
 .end field
 
-.field private final ckY:[Ljava/lang/Object;
+.field private final cks:[Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private ckZ:Lokhttp3/e;
+.field private ckt:Lokhttp3/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
@@ -57,7 +58,7 @@
     .end annotation
 .end field
 
-.field private cla:Ljava/lang/Throwable;
+.field private cku:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
@@ -86,14 +87,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/i;->ckX:Lb/o;
+    iput-object p1, p0, Lb/i;->ckr:Lb/o;
 
-    iput-object p2, p0, Lb/i;->ckY:[Ljava/lang/Object;
+    iput-object p2, p0, Lb/i;->cks:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private Kd()Lb/i;
+.method private Kc()Lb/i;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -105,16 +106,16 @@
 
     new-instance v0, Lb/i;
 
-    iget-object v1, p0, Lb/i;->ckX:Lb/o;
+    iget-object v1, p0, Lb/i;->ckr:Lb/o;
 
-    iget-object v2, p0, Lb/i;->ckY:[Ljava/lang/Object;
+    iget-object v2, p0, Lb/i;->cks:[Ljava/lang/Object;
 
     invoke-direct {v0, v1, v2}, Lb/i;-><init>(Lb/o;[Ljava/lang/Object;)V
 
     return-object v0
 .end method
 
-.method private Ke()Lokhttp3/e;
+.method private Kd()Lokhttp3/e;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -122,17 +123,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/i;->ckX:Lb/o;
+    iget-object v0, p0, Lb/i;->ckr:Lb/o;
 
-    iget-object v1, p0, Lb/i;->ckY:[Ljava/lang/Object;
+    iget-object v1, p0, Lb/i;->cks:[Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Lb/o;->o([Ljava/lang/Object;)Lokhttp3/w;
 
     move-result-object v0
 
-    iget-object v1, p0, Lb/i;->ckX:Lb/o;
+    iget-object v1, p0, Lb/i;->ckr:Lb/o;
 
-    iget-object v1, v1, Lb/o;->cly:Lokhttp3/e$a;
+    iget-object v1, v1, Lb/o;->ckS:Lokhttp3/e$a;
 
     invoke-interface {v1, v0}, Lokhttp3/e$a;->a(Lokhttp3/w;)Lokhttp3/e;
 
@@ -154,7 +155,7 @@
 
 
 # virtual methods
-.method public final JZ()Lb/m;
+.method public final JY()Lb/m;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -173,50 +174,50 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lb/i;->cag:Z
+    iget-boolean v0, p0, Lb/i;->bZA:Z
 
     if-nez v0, :cond_4
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->cag:Z
+    iput-boolean v0, p0, Lb/i;->bZA:Z
 
-    iget-object v0, p0, Lb/i;->cla:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->cku:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->cla:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->cku:Ljava/lang/Throwable;
 
     instance-of v0, v0, Ljava/io/IOException;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lb/i;->cla:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->cku:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/io/IOException;
 
     throw v0
 
     :cond_0
-    iget-object v0, p0, Lb/i;->cla:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->cku:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/lang/RuntimeException;
 
     throw v0
 
     :cond_1
-    iget-object v0, p0, Lb/i;->ckZ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->ckt: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;->Ke()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->Kd()Lokhttp3/e;
 
     move-result-object v0
 
-    iput-object v0, p0, Lb/i;->ckZ:Lokhttp3/e;
+    iput-object v0, p0, Lb/i;->ckt:Lokhttp3/e;
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
     .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_0
@@ -228,7 +229,7 @@
     move-exception v0
 
     :try_start_2
-    iput-object v0, p0, Lb/i;->cla:Ljava/lang/Throwable;
+    iput-object v0, p0, Lb/i;->cku:Ljava/lang/Throwable;
 
     throw v0
 
@@ -238,7 +239,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-boolean v1, p0, Lb/i;->ccn:Z
+    iget-boolean v1, p0, Lb/i;->cbH:Z
 
     if-eqz v1, :cond_3
 
@@ -275,10 +276,10 @@
     throw v0
 .end method
 
-.method public final synthetic Ka()Lb/b;
+.method public final synthetic JZ()Lb/b;
     .locals 1
 
-    invoke-direct {p0}, Lb/i;->Kd()Lb/i;
+    invoke-direct {p0}, Lb/i;->Kc()Lb/i;
 
     move-result-object v0
 
@@ -302,17 +303,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lb/i;->cag:Z
+    iget-boolean v0, p0, Lb/i;->bZA:Z
 
     if-nez v0, :cond_3
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->cag:Z
+    iput-boolean v0, p0, Lb/i;->bZA:Z
 
-    iget-object v0, p0, Lb/i;->ckZ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->ckt:Lokhttp3/e;
 
-    iget-object v1, p0, Lb/i;->cla:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/i;->cku:Ljava/lang/Throwable;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -321,11 +322,11 @@
     if-nez v1, :cond_0
 
     :try_start_1
-    invoke-direct {p0}, Lb/i;->Ke()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->Kd()Lokhttp3/e;
 
     move-result-object v2
 
-    iput-object v2, p0, Lb/i;->ckZ:Lokhttp3/e;
+    iput-object v2, p0, Lb/i;->ckt:Lokhttp3/e;
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -338,7 +339,7 @@
     move-exception v1
 
     :try_start_2
-    iput-object v1, p0, Lb/i;->cla:Ljava/lang/Throwable;
+    iput-object v1, p0, Lb/i;->cku:Ljava/lang/Throwable;
 
     :cond_0
     :goto_0
@@ -353,7 +354,7 @@
     return-void
 
     :cond_1
-    iget-boolean v1, p0, Lb/i;->ccn:Z
+    iget-boolean v1, p0, Lb/i;->cbH:Z
 
     if-eqz v1, :cond_2
 
@@ -393,12 +394,12 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->ccn:Z
+    iput-boolean v0, p0, Lb/i;->cbH:Z
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->ckZ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->ckt:Lokhttp3/e;
 
     monitor-exit p0
     :try_end_0
@@ -430,7 +431,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lb/i;->Kd()Lb/i;
+    invoke-direct {p0}, Lb/i;->Kc()Lb/i;
 
     move-result-object v0
 
@@ -455,9 +456,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object p1
 
@@ -473,9 +474,9 @@
 
     invoke-direct {v1, v2, v3, v4}, Lb/i$b;-><init>(Lokhttp3/MediaType;J)V
 
-    iput-object v1, p1, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iput-object v1, p1, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object p1
 
@@ -508,9 +509,9 @@
     invoke-direct {v1, v0}, Lb/i$a;-><init>(Lokhttp3/x;)V
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->ckX:Lb/o;
+    iget-object v0, p0, Lb/i;->ckr:Lb/o;
 
-    iget-object v0, v0, Lb/o;->clI:Lb/e;
+    iget-object v0, v0, Lb/o;->clc:Lb/e;
 
     invoke-interface {v0, v1}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -569,7 +570,7 @@
 .method public final isCanceled()Z
     .locals 2
 
-    iget-boolean v0, p0, Lb/i;->ccn:Z
+    iget-boolean v0, p0, Lb/i;->cbH:Z
 
     const/4 v1, 0x1
 
@@ -581,11 +582,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->ckZ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->ckt:Lokhttp3/e;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->ckZ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->ckt: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 a10ee43c30..a4da626258 100644
--- a/com.discord/smali/b/j$1.smali
+++ b/com.discord/smali/b/j$1.smali
@@ -1,10 +1,11 @@
 .class final Lb/j$1;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lb/j;->Kf()Lb/j;
+    value = Lb/j;->Ke()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic clf:Lb/j;
+.field final synthetic ckz:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$1;->clf:Lb/j;
+    iput-object p1, p0, Lb/j$1;->ckz:Lb/j;
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
@@ -69,7 +70,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lb/j$1;->clf:Lb/j;
+    iget-object v1, p0, Lb/j$1;->ckz: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 d314f27038..57c7d67a80 100644
--- a/com.discord/smali/b/j$2.smali
+++ b/com.discord/smali/b/j$2.smali
@@ -1,10 +1,11 @@
 .class final Lb/j$2;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lb/j;->Kg()Lb/j;
+    value = Lb/j;->Kf()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic clf:Lb/j;
+.field final synthetic ckz:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$2;->clf:Lb/j;
+    iput-object p1, p0, Lb/j$2;->ckz:Lb/j;
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
@@ -64,7 +65,7 @@
     :goto_0
     if-ge v0, v1, :cond_1
 
-    iget-object v2, p0, Lb/j$2;->clf:Lb/j;
+    iget-object v2, p0, Lb/j$2;->ckz: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 b4bf6b9ee4..79453402c6 100644
--- a/com.discord/smali/b/j$a.smali
+++ b/com.discord/smali/b/j$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$a;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final clg:Lb/e;
+.field private final ckA:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -51,7 +52,7 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$a;->clg:Lb/e;
+    iput-object p1, p0, Lb/j$a;->ckA:Lb/e;
 
     return-void
 .end method
@@ -75,7 +76,7 @@
     if-eqz p2, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lb/j$a;->clg:Lb/e;
+    iget-object v0, p0, Lb/j$a;->ckA:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -85,7 +86,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iput-object v0, p1, Lb/l;->bZD:Lokhttp3/RequestBody;
+    iput-object v0, p1, Lb/l;->bYX:Lokhttp3/RequestBody;
 
     return-void
 
diff --git a/com.discord/smali/b/j$b.smali b/com.discord/smali/b/j$b.smali
index 47d0e7a36f..3c17b5087e 100644
--- a/com.discord/smali/b/j$b.smali
+++ b/com.discord/smali/b/j$b.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$b;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -35,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final cli:Z
+.field private final ckC:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -66,9 +67,9 @@
 
     iput-object p1, p0, Lb/j$b;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$b;->clh:Lb/e;
+    iput-object p2, p0, Lb/j$b;->ckB:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$b;->cli:Z
+    iput-boolean p3, p0, Lb/j$b;->ckC:Z
 
     return-void
 .end method
@@ -100,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$b;->clh:Lb/e;
+    iget-object v0, p0, Lb/j$b;->ckB:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -115,7 +116,7 @@
     :cond_1
     iget-object v0, p0, Lb/j$b;->name:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lb/j$b;->cli:Z
+    iget-boolean v1, p0, Lb/j$b;->ckC:Z
 
     invoke-virtual {p1, v0, p2, v1}, Lb/l;->e(Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali/b/j$c.smali b/com.discord/smali/b/j$c.smali
index 8b96b1f726..d218cddfb3 100644
--- a/com.discord/smali/b/j$c.smali
+++ b/com.discord/smali/b/j$c.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$c;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -37,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final cli:Z
+.field private final ckC:Z
 
 
 # direct methods
@@ -55,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$c;->clh:Lb/e;
+    iput-object p1, p0, Lb/j$c;->ckB:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$c;->cli:Z
+    iput-boolean p2, p0, Lb/j$c;->ckC:Z
 
     return-void
 .end method
@@ -115,7 +116,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, p0, Lb/j$c;->clh:Lb/e;
+    iget-object v2, p0, Lb/j$c;->ckB:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -125,7 +126,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-boolean v0, p0, Lb/j$c;->cli:Z
+    iget-boolean v0, p0, Lb/j$c;->ckC:Z
 
     invoke-virtual {p1, v1, v2, v0}, Lb/l;->e(Ljava/lang/String;Ljava/lang/String;Z)V
 
@@ -146,7 +147,7 @@
 
     invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lb/j$c;->clh:Lb/e;
+    iget-object v0, p0, Lb/j$c;->ckB:Lb/e;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -219,4 +220,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/b/j$d.smali b/com.discord/smali/b/j$d.smali
index 7c505b9359..9d470ea978 100644
--- a/com.discord/smali/b/j$d.smali
+++ b/com.discord/smali/b/j$d.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$d;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -64,7 +65,7 @@
 
     iput-object p1, p0, Lb/j$d;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$d;->clh:Lb/e;
+    iput-object p2, p0, Lb/j$d;->ckB:Lb/e;
 
     return-void
 .end method
@@ -96,7 +97,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$d;->clh:Lb/e;
+    iget-object v0, p0, Lb/j$d;->ckB:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/b/j$e.smali b/com.discord/smali/b/j$e.smali
index fd36485da6..dade6e2ecd 100644
--- a/com.discord/smali/b/j$e.smali
+++ b/com.discord/smali/b/j$e.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$e;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -53,7 +54,7 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$e;->clh:Lb/e;
+    iput-object p1, p0, Lb/j$e;->ckB:Lb/e;
 
     return-void
 .end method
@@ -111,7 +112,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v2, p0, Lb/j$e;->clh:Lb/e;
+    iget-object v2, p0, Lb/j$e;->ckB:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -166,4 +167,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/b/j$f.smali b/com.discord/smali/b/j$f.smali
index d06fba226d..09543436d2 100644
--- a/com.discord/smali/b/j$f.smali
+++ b/com.discord/smali/b/j$f.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$f;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -24,9 +25,9 @@
 
 
 # instance fields
-.field private final bZC:Lokhttp3/Headers;
+.field private final bYW:Lokhttp3/Headers;
 
-.field private final clg:Lb/e;
+.field private final ckA:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -54,9 +55,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$f;->bZC:Lokhttp3/Headers;
+    iput-object p1, p0, Lb/j$f;->bYW:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lb/j$f;->clg:Lb/e;
+    iput-object p2, p0, Lb/j$f;->ckA:Lb/e;
 
     return-void
 .end method
@@ -83,7 +84,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lb/j$f;->clg:Lb/e;
+    iget-object v0, p0, Lb/j$f;->ckA:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -93,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;->bZC:Lokhttp3/Headers;
+    iget-object p2, p0, Lb/j$f;->bYW: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 4f1e946212..708df61b7a 100644
--- a/com.discord/smali/b/j$g.smali
+++ b/com.discord/smali/b/j$g.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$g;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -37,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final clj:Ljava/lang/String;
+.field private final ckD:Ljava/lang/String;
 
 
 # direct methods
@@ -57,9 +58,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$g;->clh:Lb/e;
+    iput-object p1, p0, Lb/j$g;->ckB:Lb/e;
 
-    iput-object p2, p0, Lb/j$g;->clj:Ljava/lang/String;
+    iput-object p2, p0, Lb/j$g;->ckD:Ljava/lang/String;
 
     return-void
 .end method
@@ -155,7 +156,7 @@
 
     const/4 v1, 0x3
 
-    iget-object v3, p0, Lb/j$g;->clj:Ljava/lang/String;
+    iget-object v3, p0, Lb/j$g;->ckD:Ljava/lang/String;
 
     aput-object v3, v2, v1
 
@@ -163,7 +164,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lb/j$g;->clh:Lb/e;
+    iget-object v2, p0, Lb/j$g;->ckB:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -218,4 +219,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/b/j$h.smali b/com.discord/smali/b/j$h.smali
index dd10761349..e0b2e4dbfa 100644
--- a/com.discord/smali/b/j$h.smali
+++ b/com.discord/smali/b/j$h.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$h;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -35,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final cli:Z
+.field private final ckC:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -66,9 +67,9 @@
 
     iput-object p1, p0, Lb/j$h;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$h;->clh:Lb/e;
+    iput-object p2, p0, Lb/j$h;->ckB:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$h;->cli:Z
+    iput-boolean p3, p0, Lb/j$h;->ckC:Z
 
     return-void
 .end method
@@ -99,7 +100,7 @@
 
     iget-object v0, p0, Lb/j$h;->name:Ljava/lang/String;
 
-    iget-object v1, p0, Lb/j$h;->clh:Lb/e;
+    iget-object v1, p0, Lb/j$h;->ckB:Lb/e;
 
     invoke-interface {v1, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -107,13 +108,13 @@
 
     check-cast p2, Ljava/lang/String;
 
-    iget-boolean v1, p0, Lb/j$h;->cli:Z
+    iget-boolean v1, p0, Lb/j$h;->ckC:Z
 
-    iget-object v2, p1, Lb/l;->clo:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->ckI:Ljava/lang/String;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p1, Lb/l;->clo:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->ckI:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -139,7 +140,7 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lb/l;->clo:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->ckI:Ljava/lang/String;
 
     return-void
 
diff --git a/com.discord/smali/b/j$i.smali b/com.discord/smali/b/j$i.smali
index 83443e064a..0161804f4d 100644
--- a/com.discord/smali/b/j$i.smali
+++ b/com.discord/smali/b/j$i.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$i;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -35,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final cli:Z
+.field private final ckC:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -66,9 +67,9 @@
 
     iput-object p1, p0, Lb/j$i;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$i;->clh:Lb/e;
+    iput-object p2, p0, Lb/j$i;->ckB:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$i;->cli:Z
+    iput-boolean p3, p0, Lb/j$i;->ckC:Z
 
     return-void
 .end method
@@ -100,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$i;->clh:Lb/e;
+    iget-object v0, p0, Lb/j$i;->ckB:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -115,7 +116,7 @@
     :cond_1
     iget-object v0, p0, Lb/j$i;->name:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lb/j$i;->cli:Z
+    iget-boolean v1, p0, Lb/j$i;->ckC: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$j.smali b/com.discord/smali/b/j$j.smali
index 580d8ed47f..123f294a9f 100644
--- a/com.discord/smali/b/j$j.smali
+++ b/com.discord/smali/b/j$j.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$j;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field private final clh:Lb/e;
+.field private final ckB:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -37,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final cli:Z
+.field private final ckC:Z
 
 
 # direct methods
@@ -55,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$j;->clh:Lb/e;
+    iput-object p1, p0, Lb/j$j;->ckB:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$j;->cli:Z
+    iput-boolean p2, p0, Lb/j$j;->ckC:Z
 
     return-void
 .end method
@@ -115,7 +116,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, p0, Lb/j$j;->clh:Lb/e;
+    iget-object v2, p0, Lb/j$j;->ckB:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -125,7 +126,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-boolean v0, p0, Lb/j$j;->cli:Z
+    iget-boolean v0, p0, Lb/j$j;->ckC:Z
 
     invoke-virtual {p1, v1, v2, v0}, Lb/l;->d(Ljava/lang/String;Ljava/lang/String;Z)V
 
@@ -146,7 +147,7 @@
 
     invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lb/j$j;->clh:Lb/e;
+    iget-object v0, p0, Lb/j$j;->ckB:Lb/e;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -219,4 +220,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/b/j$k.smali b/com.discord/smali/b/j$k.smali
index f3ebb39668..075f0cd811 100644
--- a/com.discord/smali/b/j$k.smali
+++ b/com.discord/smali/b/j$k.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$k;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -24,9 +25,9 @@
 
 
 # instance fields
-.field private final cli:Z
+.field private final ckC:Z
 
-.field private final clk:Lb/e;
+.field private final ckE:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -53,9 +54,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$k;->clk:Lb/e;
+    iput-object p1, p0, Lb/j$k;->ckE:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$k;->cli:Z
+    iput-boolean p2, p0, Lb/j$k;->ckC:Z
 
     return-void
 .end method
@@ -87,7 +88,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$k;->clk:Lb/e;
+    iget-object v0, p0, Lb/j$k;->ckE:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -97,7 +98,7 @@
 
     const/4 v0, 0x0
 
-    iget-boolean v1, p0, Lb/j$k;->cli:Z
+    iget-boolean v1, p0, Lb/j$k;->ckC:Z
 
     invoke-virtual {p1, p2, v0, v1}, Lb/l;->d(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 41da946135..88005dbcc4 100644
--- a/com.discord/smali/b/j$l.smali
+++ b/com.discord/smali/b/j$l.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$l;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
 
 
 # static fields
-.field static final cll:Lb/j$l;
+.field static final ckF:Lb/j$l;
 
 
 # direct methods
@@ -33,7 +34,7 @@
 
     invoke-direct {v0}, Lb/j$l;-><init>()V
 
-    sput-object v0, Lb/j$l;->cll:Lb/j$l;
+    sput-object v0, Lb/j$l;->ckF:Lb/j$l;
 
     return-void
 .end method
@@ -64,7 +65,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p1, Lb/l;->cls:Lokhttp3/MultipartBody$a;
+    iget-object p1, p1, Lb/l;->ckM: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 167cce6d18..6f2666187b 100644
--- a/com.discord/smali/b/j$m.smali
+++ b/com.discord/smali/b/j$m.smali
@@ -1,5 +1,6 @@
 .class final Lb/j$m;
 .super Lb/j;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -47,7 +48,7 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lb/l;->clo:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->ckI:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/j.smali b/com.discord/smali/b/j.smali
index 7e6c816c17..82672e0f91 100644
--- a/com.discord/smali/b/j.smali
+++ b/com.discord/smali/b/j.smali
@@ -1,5 +1,6 @@
 .class abstract Lb/j;
 .super Ljava/lang/Object;
+.source "ParameterHandler.java"
 
 
 # annotations
@@ -42,7 +43,7 @@
 
 
 # virtual methods
-.method final Kf()Lb/j;
+.method final Ke()Lb/j;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,7 +61,7 @@
     return-object v0
 .end method
 
-.method final Kg()Lb/j;
+.method final Kf()Lb/j;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/b/k$a$a.smali b/com.discord/smali/b/k$a$a.smali
index d4a4a20238..69060b3eb2 100644
--- a/com.discord/smali/b/k$a$a.smali
+++ b/com.discord/smali/b/k$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/k$a$a;
 .super Ljava/lang/Object;
+.source "Platform.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/b/k$a.smali b/com.discord/smali/b/k$a.smali
index d2bd261247..100f222c43 100644
--- a/com.discord/smali/b/k$a.smali
+++ b/com.discord/smali/b/k$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/k$a;
 .super Lb/k;
+.source "Platform.java"
 
 
 # annotations
@@ -30,7 +31,7 @@
 
 
 # virtual methods
-.method public final Kj()Ljava/util/concurrent/Executor;
+.method public final Ki()Ljava/util/concurrent/Executor;
     .locals 1
 
     new-instance v0, Lb/k$a$a;
diff --git a/com.discord/smali/b/k$b.smali b/com.discord/smali/b/k$b.smali
index 9e9b8e753c..1c89655f20 100644
--- a/com.discord/smali/b/k$b.smali
+++ b/com.discord/smali/b/k$b.smali
@@ -1,5 +1,6 @@
 .class final Lb/k$b;
 .super Lb/k;
+.source "Platform.java"
 
 
 # annotations
diff --git a/com.discord/smali/b/k.smali b/com.discord/smali/b/k.smali
index 2b127b5a9b..7f5d35e42c 100644
--- a/com.discord/smali/b/k.smali
+++ b/com.discord/smali/b/k.smali
@@ -1,5 +1,6 @@
 .class Lb/k;
 .super Ljava/lang/Object;
+.source "Platform.java"
 
 
 # annotations
@@ -12,18 +13,18 @@
 
 
 # static fields
-.field private static final clm:Lb/k;
+.field private static final ckG:Lb/k;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lb/k;->Ki()Lb/k;
+    invoke-static {}, Lb/k;->Kh()Lb/k;
 
     move-result-object v0
 
-    sput-object v0, Lb/k;->clm:Lb/k;
+    sput-object v0, Lb/k;->ckG:Lb/k;
 
     return-void
 .end method
@@ -36,15 +37,15 @@
     return-void
 .end method
 
-.method static Kh()Lb/k;
+.method static Kg()Lb/k;
     .locals 1
 
-    sget-object v0, Lb/k;->clm:Lb/k;
+    sget-object v0, Lb/k;->ckG:Lb/k;
 
     return-object v0
 .end method
 
-.method private static Ki()Lb/k;
+.method private static Kh()Lb/k;
     .locals 1
 
     :try_start_0
@@ -89,7 +90,7 @@
 
 
 # virtual methods
-.method Kj()Ljava/util/concurrent/Executor;
+.method Ki()Ljava/util/concurrent/Executor;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -115,7 +116,7 @@
     return-object v0
 
     :cond_0
-    sget-object p1, Lb/f;->ckM:Lb/c$a;
+    sget-object p1, Lb/f;->ckg: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 31ca17491f..a7c5f90d45 100644
--- a/com.discord/smali/b/l$a.smali
+++ b/com.discord/smali/b/l$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/l$a;
 .super Lokhttp3/RequestBody;
+.source "RequestBuilder.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field private final bZz:Lokhttp3/MediaType;
+.field private final bYT:Lokhttp3/MediaType;
 
 .field private final delegate:Lokhttp3/RequestBody;
 
@@ -27,7 +28,7 @@
 
     iput-object p1, p0, Lb/l$a;->delegate:Lokhttp3/RequestBody;
 
-    iput-object p2, p0, Lb/l$a;->bZz:Lokhttp3/MediaType;
+    iput-object p2, p0, Lb/l$a;->bYT:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -54,7 +55,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lb/l$a;->bZz:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/l$a;->bYT:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/l.smali b/com.discord/smali/b/l.smali
index 57310c00ed..a26e805862 100644
--- a/com.discord/smali/b/l.smali
+++ b/com.discord/smali/b/l.smali
@@ -1,5 +1,6 @@
 .class final Lb/l;
 .super Ljava/lang/Object;
+.source "RequestBuilder.java"
 
 
 # annotations
@@ -11,42 +12,42 @@
 
 
 # static fields
-.field private static final bZb:[C
+.field private static final bYv:[C
 
 
 # instance fields
-.field bZD:Lokhttp3/RequestBody;
+.field private bYT:Lokhttp3/MediaType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bZz:Lokhttp3/MediaType;
+.field bYX:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final cln:Lokhttp3/s;
+.field private final ckH:Lokhttp3/s;
 
-.field clo:Ljava/lang/String;
+.field ckI:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private clp:Lokhttp3/s$a;
+.field private ckJ:Lokhttp3/s$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final clq:Lokhttp3/w$a;
+.field private final ckK:Lokhttp3/w$a;
 
-.field private final clr:Z
+.field private final ckL:Z
 
-.field cls:Lokhttp3/MultipartBody$a;
+.field ckM:Lokhttp3/MultipartBody$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private clt:Lokhttp3/q$a;
+.field private ckN:Lokhttp3/q$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -64,7 +65,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lb/l;->bZb:[C
+    sput-object v0, Lb/l;->bYv:[C
 
     return-void
 
@@ -108,23 +109,23 @@
 
     iput-object p1, p0, Lb/l;->method:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/l;->cln:Lokhttp3/s;
+    iput-object p2, p0, Lb/l;->ckH:Lokhttp3/s;
 
-    iput-object p3, p0, Lb/l;->clo:Ljava/lang/String;
+    iput-object p3, p0, Lb/l;->ckI:Ljava/lang/String;
 
     new-instance p1, Lokhttp3/w$a;
 
     invoke-direct {p1}, Lokhttp3/w$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->clq:Lokhttp3/w$a;
+    iput-object p1, p0, Lb/l;->ckK:Lokhttp3/w$a;
 
-    iput-object p5, p0, Lb/l;->bZz:Lokhttp3/MediaType;
+    iput-object p5, p0, Lb/l;->bYT:Lokhttp3/MediaType;
 
-    iput-boolean p6, p0, Lb/l;->clr:Z
+    iput-boolean p6, p0, Lb/l;->ckL:Z
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lb/l;->clq:Lokhttp3/w$a;
+    iget-object p1, p0, Lb/l;->ckK:Lokhttp3/w$a;
 
     invoke-virtual {p1, p4}, Lokhttp3/w$a;->b(Lokhttp3/Headers;)Lokhttp3/w$a;
 
@@ -135,7 +136,7 @@
 
     invoke-direct {p1}, Lokhttp3/q$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->clt:Lokhttp3/q$a;
+    iput-object p1, p0, Lb/l;->ckN:Lokhttp3/q$a;
 
     return-void
 
@@ -146,11 +147,11 @@
 
     invoke-direct {p1}, Lokhttp3/MultipartBody$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->cls:Lokhttp3/MultipartBody$a;
+    iput-object p1, p0, Lb/l;->ckM:Lokhttp3/MultipartBody$a;
 
-    iget-object p1, p0, Lb/l;->cls:Lokhttp3/MultipartBody$a;
+    iget-object p1, p0, Lb/l;->ckM:Lokhttp3/MultipartBody$a;
 
-    sget-object p2, Lokhttp3/MultipartBody;->bZt:Lokhttp3/MediaType;
+    sget-object p2, Lokhttp3/MultipartBody;->bYN:Lokhttp3/MediaType;
 
     if-eqz p2, :cond_3
 
@@ -164,7 +165,7 @@
 
     if-eqz p3, :cond_2
 
-    iput-object p2, p1, Lokhttp3/MultipartBody$a;->bZB:Lokhttp3/MediaType;
+    iput-object p2, p1, Lokhttp3/MultipartBody$a;->bYV:Lokhttp3/MediaType;
 
     goto :goto_0
 
@@ -329,7 +330,7 @@
     invoke-virtual {v1, v9}, Lokio/c;->fr(I)Lokio/c;
 
     :goto_4
-    invoke-virtual {v1}, Lokio/c;->IZ()Z
+    invoke-virtual {v1}, Lokio/c;->IY()Z
 
     move-result v10
 
@@ -343,7 +344,7 @@
 
     invoke-virtual {v3, v8}, Lokio/c;->fs(I)Lokio/c;
 
-    sget-object v11, Lb/l;->bZb:[C
+    sget-object v11, Lb/l;->bYv:[C
 
     shr-int/lit8 v12, v10, 0x4
 
@@ -353,7 +354,7 @@
 
     invoke-virtual {v3, v11}, Lokio/c;->fs(I)Lokio/c;
 
-    sget-object v11, Lb/l;->bZb:[C
+    sget-object v11, Lb/l;->bYv:[C
 
     and-int/lit8 v10, v10, 0xf
 
@@ -374,33 +375,35 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v3}, Lokio/c;->Jf()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/c;->Je()Ljava/lang/String;
 
     move-result-object p0
 
+    return-object p0
+
     :cond_8
     return-object p0
 .end method
 
 
 # virtual methods
-.method final HH()Lokhttp3/w;
+.method final HG()Lokhttp3/w;
     .locals 5
 
-    iget-object v0, p0, Lb/l;->clp:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->ckJ:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->Ht()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Hs()Lokhttp3/s;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lb/l;->cln:Lokhttp3/s;
+    iget-object v0, p0, Lb/l;->ckH:Lokhttp3/s;
 
-    iget-object v1, p0, Lb/l;->clo:Ljava/lang/String;
+    iget-object v1, p0, Lb/l;->ckI:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lokhttp3/s;->el(Ljava/lang/String;)Lokhttp3/s;
 
@@ -409,53 +412,46 @@
     if-eqz v0, :cond_7
 
     :goto_0
-    iget-object v1, p0, Lb/l;->bZD:Lokhttp3/RequestBody;
+    iget-object v1, p0, Lb/l;->bYX:Lokhttp3/RequestBody;
 
     if-nez v1, :cond_4
 
-    iget-object v2, p0, Lb/l;->clt:Lokhttp3/q$a;
+    iget-object v2, p0, Lb/l;->ckN:Lokhttp3/q$a;
 
     if-eqz v2, :cond_1
 
-    iget-object v1, p0, Lb/l;->clt:Lokhttp3/q$a;
+    new-instance v1, Lokhttp3/q;
 
-    new-instance v2, Lokhttp3/q;
+    iget-object v3, v2, Lokhttp3/q$a;->names:Ljava/util/List;
 
-    iget-object v3, v1, Lokhttp3/q$a;->names:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/q$a;->bYn:Ljava/util/List;
 
-    iget-object v1, v1, Lokhttp3/q$a;->bYT:Ljava/util/List;
+    invoke-direct {v1, v3, v2}, Lokhttp3/q;-><init>(Ljava/util/List;Ljava/util/List;)V
 
-    invoke-direct {v2, v3, v1}, Lokhttp3/q;-><init>(Ljava/util/List;Ljava/util/List;)V
-
-    :goto_1
-    move-object v1, v2
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lb/l;->cls:Lokhttp3/MultipartBody$a;
+    iget-object v2, p0, Lb/l;->ckM:Lokhttp3/MultipartBody$a;
 
     if-eqz v2, :cond_3
 
-    iget-object v1, p0, Lb/l;->cls:Lokhttp3/MultipartBody$a;
+    iget-object v1, v2, Lokhttp3/MultipartBody$a;->bYU:Ljava/util/List;
 
-    iget-object v2, v1, Lokhttp3/MultipartBody$a;->bZA:Ljava/util/List;
+    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
-    invoke-interface {v2}, Ljava/util/List;->isEmpty()Z
+    move-result v1
 
-    move-result v2
+    if-nez v1, :cond_2
 
-    if-nez v2, :cond_2
+    new-instance v1, Lokhttp3/MultipartBody;
 
-    new-instance v2, Lokhttp3/MultipartBody;
+    iget-object v3, v2, Lokhttp3/MultipartBody$a;->bYR:Lokio/ByteString;
 
-    iget-object v3, v1, Lokhttp3/MultipartBody$a;->bZx:Lokio/ByteString;
+    iget-object v4, v2, Lokhttp3/MultipartBody$a;->bYV:Lokhttp3/MediaType;
 
-    iget-object v4, v1, Lokhttp3/MultipartBody$a;->bZB:Lokhttp3/MediaType;
+    iget-object v2, v2, Lokhttp3/MultipartBody$a;->bYU:Ljava/util/List;
 
-    iget-object v1, v1, Lokhttp3/MultipartBody$a;->bZA:Ljava/util/List;
-
-    invoke-direct {v2, v3, v4, v1}, Lokhttp3/MultipartBody;-><init>(Lokio/ByteString;Lokhttp3/MediaType;Ljava/util/List;)V
+    invoke-direct {v1, v3, v4, v2}, Lokhttp3/MultipartBody;-><init>(Lokio/ByteString;Lokhttp3/MediaType;Ljava/util/List;)V
 
     goto :goto_1
 
@@ -469,7 +465,7 @@
     throw v0
 
     :cond_3
-    iget-boolean v2, p0, Lb/l;->clr:Z
+    iget-boolean v2, p0, Lb/l;->ckL:Z
 
     if-eqz v2, :cond_4
 
@@ -484,8 +480,8 @@
     move-result-object v1
 
     :cond_4
-    :goto_2
-    iget-object v2, p0, Lb/l;->bZz:Lokhttp3/MediaType;
+    :goto_1
+    iget-object v2, p0, Lb/l;->bYT:Lokhttp3/MediaType;
 
     if-eqz v2, :cond_6
 
@@ -497,10 +493,10 @@
 
     move-object v1, v3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
-    iget-object v3, p0, Lb/l;->clq:Lokhttp3/w$a;
+    iget-object v3, p0, Lb/l;->ckK:Lokhttp3/w$a;
 
     const-string v4, "Content-Type"
 
@@ -511,8 +507,8 @@
     invoke-virtual {v3, v4, v2}, Lokhttp3/w$a;->ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_6
-    :goto_3
-    iget-object v2, p0, Lb/l;->clq:Lokhttp3/w$a;
+    :goto_2
+    iget-object v2, p0, Lb/l;->ckK:Lokhttp3/w$a;
 
     invoke-virtual {v2, v0}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
@@ -524,7 +520,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v0
 
@@ -539,7 +535,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lb/l;->cln:Lokhttp3/s;
+    iget-object v2, p0, Lb/l;->ckH:Lokhttp3/s;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -547,7 +543,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lb/l;->clo:Ljava/lang/String;
+    iget-object v2, p0, Lb/l;->ckI:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -577,7 +573,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lb/l;->bZz:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/l;->bYT:Lokhttp3/MediaType;
 
     return-void
 
@@ -599,7 +595,7 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Lb/l;->clq:Lokhttp3/w$a;
+    iget-object v0, p0, Lb/l;->ckK:Lokhttp3/w$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/w$a;->ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
@@ -609,7 +605,7 @@
 .method final c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
     .locals 1
 
-    iget-object v0, p0, Lb/l;->cls:Lokhttp3/MultipartBody$a;
+    iget-object v0, p0, Lb/l;->ckM:Lokhttp3/MultipartBody$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/Headers;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$a;
 
@@ -623,27 +619,25 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lb/l;->clo:Ljava/lang/String;
+    iget-object v0, p0, Lb/l;->ckI:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/l;->cln:Lokhttp3/s;
+    iget-object v1, p0, Lb/l;->ckH:Lokhttp3/s;
 
-    iget-object v1, p0, Lb/l;->clo:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lokhttp3/s;->em(Ljava/lang/String;)Lokhttp3/s$a;
+    invoke-virtual {v1, v0}, Lokhttp3/s;->em(Ljava/lang/String;)Lokhttp3/s$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lb/l;->clp:Lokhttp3/s$a;
+    iput-object v0, p0, Lb/l;->ckJ:Lokhttp3/s$a;
 
-    iget-object v0, p0, Lb/l;->clp:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->ckJ:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lb/l;->clo:Ljava/lang/String;
+    iput-object v0, p0, Lb/l;->ckI:Ljava/lang/String;
 
     goto :goto_0
 
@@ -656,7 +650,7 @@
 
     invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object p3, p0, Lb/l;->cln:Lokhttp3/s;
+    iget-object p3, p0, Lb/l;->ckH:Lokhttp3/s;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -664,7 +658,7 @@
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p3, p0, Lb/l;->clo:Ljava/lang/String;
+    iget-object p3, p0, Lb/l;->ckI:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -680,14 +674,14 @@
     :goto_0
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lb/l;->clp:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->ckJ:Lokhttp3/s$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/s$a;->am(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/s$a;
 
     return-void
 
     :cond_2
-    iget-object p3, p0, Lb/l;->clp:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->ckJ:Lokhttp3/s$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/s$a;->al(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/s$a;
 
@@ -699,14 +693,14 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Lb/l;->clt:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->ckN:Lokhttp3/q$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/q$a;->ag(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/q$a;
 
     return-void
 
     :cond_0
-    iget-object p3, p0, Lb/l;->clt:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->ckN:Lokhttp3/q$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/q$a;->af(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 12f8cebfb4..b51f145ccc 100644
--- a/com.discord/smali/b/m.smali
+++ b/com.discord/smali/b/m.smali
@@ -1,5 +1,6 @@
 .class public final Lb/m;
 .super Ljava/lang/Object;
+.source "Response.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field public final clu:Lokhttp3/Response;
+.field public final ckO:Lokhttp3/Response;
 
-.field public final clv:Ljava/lang/Object;
+.field public final ckP:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -27,7 +28,7 @@
     .end annotation
 .end field
 
-.field public final clw:Lokhttp3/x;
+.field public final ckQ:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -56,11 +57,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/m;->clu:Lokhttp3/Response;
+    iput-object p1, p0, Lb/m;->ckO:Lokhttp3/Response;
 
-    iput-object p2, p0, Lb/m;->clv:Ljava/lang/Object;
+    iput-object p2, p0, Lb/m;->ckP:Ljava/lang/Object;
 
-    iput-object p3, p0, Lb/m;->clw:Lokhttp3/x;
+    iput-object p3, p0, Lb/m;->ckQ:Lokhttp3/x;
 
     return-void
 .end method
@@ -87,7 +88,7 @@
 
     invoke-static {p1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->AQ()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->AP()Z
 
     move-result v0
 
@@ -134,7 +135,7 @@
 
     invoke-static {p1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->AQ()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->AP()Z
 
     move-result v0
 
@@ -160,10 +161,10 @@
 
 
 # virtual methods
-.method public final Kk()Lokhttp3/Response;
+.method public final Kj()Lokhttp3/Response;
     .locals 1
 
-    iget-object v0, p0, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->ckO:Lokhttp3/Response;
 
     return-object v0
 .end method
@@ -171,7 +172,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->ckO: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 060993b7b9..22050aa179 100644
--- a/com.discord/smali/b/n$1.smali
+++ b/com.discord/smali/b/n$1.smali
@@ -1,5 +1,6 @@
 .class final Lb/n$1;
 .super Ljava/lang/Object;
+.source "Retrofit.java"
 
 # interfaces
 .implements Ljava/lang/reflect/InvocationHandler;
@@ -17,28 +18,28 @@
 
 
 # instance fields
-.field private final clC:Lb/k;
+.field private final ckW:Lb/k;
 
-.field final synthetic clD:Ljava/lang/Class;
+.field final synthetic ckX:Ljava/lang/Class;
 
-.field final synthetic clE:Lb/n;
+.field final synthetic ckY:Lb/n;
 
 
 # direct methods
 .method constructor <init>(Lb/n;Ljava/lang/Class;)V
     .locals 0
 
-    iput-object p1, p0, Lb/n$1;->clE:Lb/n;
+    iput-object p1, p0, Lb/n$1;->ckY:Lb/n;
 
-    iput-object p2, p0, Lb/n$1;->clD:Ljava/lang/Class;
+    iput-object p2, p0, Lb/n$1;->ckX:Ljava/lang/Class;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lb/k;->Kh()Lb/k;
+    invoke-static {}, Lb/k;->Kg()Lb/k;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/n$1;->clC:Lb/k;
+    iput-object p1, p0, Lb/n$1;->ckW:Lb/k;
 
     return-void
 .end method
@@ -72,7 +73,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lb/n$1;->clC:Lb/k;
+    iget-object v0, p0, Lb/n$1;->ckW:Lb/k;
 
     invoke-virtual {v0, p2}, Lb/k;->a(Ljava/lang/reflect/Method;)Z
 
@@ -80,9 +81,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/n$1;->clC:Lb/k;
+    iget-object v0, p0, Lb/n$1;->ckW:Lb/k;
 
-    iget-object v1, p0, Lb/n$1;->clD:Ljava/lang/Class;
+    iget-object v1, p0, Lb/n$1;->ckX: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;
 
@@ -91,7 +92,7 @@
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lb/n$1;->clE:Lb/n;
+    iget-object p1, p0, Lb/n$1;->ckY:Lb/n;
 
     invoke-virtual {p1, p2}, Lb/n;->b(Ljava/lang/reflect/Method;)Lb/o;
 
@@ -101,7 +102,7 @@
 
     invoke-direct {p2, p1, p3}, Lb/i;-><init>(Lb/o;[Ljava/lang/Object;)V
 
-    iget-object p1, p1, Lb/o;->clH:Lb/c;
+    iget-object p1, p1, Lb/o;->clb: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 17e34ecad6..3e7e1246c5 100644
--- a/com.discord/smali/b/n$a.smali
+++ b/com.discord/smali/b/n$a.smali
@@ -1,5 +1,6 @@
 .class public final Lb/n$a;
 .super Ljava/lang/Object;
+.source "Retrofit.java"
 
 
 # annotations
@@ -14,33 +15,14 @@
 
 
 # instance fields
-.field private ckP:Ljava/util/concurrent/Executor;
+.field private ckH:Lokhttp3/s;
+
+.field private ckS:Lokhttp3/e$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final clA:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lb/c$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private clB:Z
-
-.field private final clC:Lb/k;
-
-.field private cln:Lokhttp3/s;
-
-.field private cly:Lokhttp3/e$a;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final clz:Ljava/util/List;
+.field private final ckT:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -50,12 +32,31 @@
     .end annotation
 .end field
 
+.field private final ckU:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lb/c$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private ckV:Z
+
+.field private final ckW:Lb/k;
+
+.field private ckj:Ljava/util/concurrent/Executor;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lb/k;->Kh()Lb/k;
+    invoke-static {}, Lb/k;->Kg()Lb/k;
 
     move-result-object v0
 
@@ -73,17 +74,17 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lb/n$a;->clz:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->ckT:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lb/n$a;->clA:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->ckU:Ljava/util/List;
 
-    iput-object p1, p0, Lb/n$a;->clC:Lb/k;
+    iput-object p1, p0, Lb/n$a;->ckW:Lb/k;
 
-    iget-object p1, p0, Lb/n$a;->clz:Ljava/util/List;
+    iget-object p1, p0, Lb/n$a;->ckT:Ljava/util/List;
 
     new-instance v0, Lb/a;
 
@@ -96,14 +97,14 @@
 
 
 # virtual methods
-.method public final Kl()Lb/n;
+.method public final Kk()Lb/n;
     .locals 8
 
-    iget-object v0, p0, Lb/n$a;->cln:Lokhttp3/s;
+    iget-object v0, p0, Lb/n$a;->ckH:Lokhttp3/s;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lb/n$a;->cly:Lokhttp3/e$a;
+    iget-object v0, p0, Lb/n$a;->ckS:Lokhttp3/e$a;
 
     if-nez v0, :cond_0
 
@@ -111,29 +112,39 @@
 
     invoke-direct {v0}, Lokhttp3/t;-><init>()V
 
+    move-object v2, v0
+
+    goto :goto_0
+
     :cond_0
     move-object v2, v0
 
-    iget-object v0, p0, Lb/n$a;->ckP:Ljava/util/concurrent/Executor;
+    :goto_0
+    iget-object v0, p0, Lb/n$a;->ckj:Ljava/util/concurrent/Executor;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lb/n$a;->clC:Lb/k;
+    iget-object v0, p0, Lb/n$a;->ckW:Lb/k;
 
-    invoke-virtual {v0}, Lb/k;->Kj()Ljava/util/concurrent/Executor;
+    invoke-virtual {v0}, Lb/k;->Ki()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
+    move-object v6, v0
+
+    goto :goto_1
+
     :cond_1
     move-object v6, v0
 
+    :goto_1
     new-instance v5, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lb/n$a;->clA:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->ckU:Ljava/util/List;
 
     invoke-direct {v5, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v0, p0, Lb/n$a;->clC:Lb/k;
+    iget-object v0, p0, Lb/n$a;->ckW:Lb/k;
 
     invoke-virtual {v0, v6}, Lb/k;->a(Ljava/util/concurrent/Executor;)Lb/c$a;
 
@@ -143,15 +154,15 @@
 
     new-instance v4, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lb/n$a;->clz:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->ckT: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;->cln:Lokhttp3/s;
+    iget-object v3, p0, Lb/n$a;->ckH:Lokhttp3/s;
 
-    iget-boolean v7, p0, Lb/n$a;->clB:Z
+    iget-boolean v7, p0, Lb/n$a;->ckV:Z
 
     move-object v1, v0
 
@@ -172,7 +183,7 @@
 .method public final a(Lb/c$a;)Lb/n$a;
     .locals 2
 
-    iget-object v0, p0, Lb/n$a;->clA:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->ckU:Ljava/util/List;
 
     const-string v1, "factory == null"
 
@@ -188,7 +199,7 @@
 .method public final a(Lb/e$a;)Lb/n$a;
     .locals 2
 
-    iget-object v0, p0, Lb/n$a;->clz:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->ckT:Ljava/util/List;
 
     const-string v1, "factory == null"
 
@@ -220,7 +231,7 @@
 
     check-cast p1, Lokhttp3/e$a;
 
-    iput-object p1, p0, Lb/n$a;->cly:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n$a;->ckS:Lokhttp3/e$a;
 
     return-object p0
 .end method
@@ -242,7 +253,7 @@
 
     invoke-static {v0, p1}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p1, v0, Lokhttp3/s;->bZe:Ljava/util/List;
+    iget-object p1, v0, Lokhttp3/s;->bYy:Ljava/util/List;
 
     const-string v1, ""
 
@@ -262,7 +273,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object v0, p0, Lb/n$a;->cln:Lokhttp3/s;
+    iput-object v0, p0, Lb/n$a;->ckH:Lokhttp3/s;
 
     return-object p0
 
diff --git a/com.discord/smali/b/n.smali b/com.discord/smali/b/n.smali
index 37aeebb527..8aa781f28a 100644
--- a/com.discord/smali/b/n.smali
+++ b/com.discord/smali/b/n.smali
@@ -1,5 +1,6 @@
 .class public final Lb/n;
 .super Ljava/lang/Object;
+.source "Retrofit.java"
 
 
 # annotations
@@ -11,26 +12,9 @@
 
 
 # instance fields
-.field final ckP:Ljava/util/concurrent/Executor;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field final ckH:Lokhttp3/s;
 
-.field final clA:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lb/c$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final clB:Z
-
-.field final cln:Lokhttp3/s;
-
-.field private final clx:Ljava/util/Map;
+.field private final ckR:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,9 +25,9 @@
     .end annotation
 .end field
 
-.field final cly:Lokhttp3/e$a;
+.field final ckS:Lokhttp3/e$a;
 
-.field final clz:Ljava/util/List;
+.field final ckT:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,6 +37,23 @@
     .end annotation
 .end field
 
+.field final ckU:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lb/c$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final ckV:Z
+
+.field final ckj:Ljava/util/concurrent/Executor;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
 
 # direct methods
 .method constructor <init>(Lokhttp3/e$a;Lokhttp3/s;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;Z)V
@@ -83,27 +84,27 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lb/n;->clx:Ljava/util/Map;
+    iput-object v0, p0, Lb/n;->ckR:Ljava/util/Map;
 
-    iput-object p1, p0, Lb/n;->cly:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n;->ckS:Lokhttp3/e$a;
 
-    iput-object p2, p0, Lb/n;->cln:Lokhttp3/s;
+    iput-object p2, p0, Lb/n;->ckH: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;->clz:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->ckT: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;->clA:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->ckU:Ljava/util/List;
 
-    iput-object p5, p0, Lb/n;->ckP:Ljava/util/concurrent/Executor;
+    iput-object p5, p0, Lb/n;->ckj:Ljava/util/concurrent/Executor;
 
-    iput-boolean p6, p0, Lb/n;->clB:Z
+    iput-boolean p6, p0, Lb/n;->ckV:Z
 
     return-void
 .end method
@@ -142,7 +143,7 @@
 
     invoke-static {p3, p2}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p2, p0, Lb/n;->clz:Ljava/util/List;
+    iget-object p2, p0, Lb/n;->ckT:Ljava/util/List;
 
     const/4 p3, 0x0
 
@@ -152,7 +153,7 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    iget-object p3, p0, Lb/n;->clz:Ljava/util/List;
+    iget-object p3, p0, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {p3}, Ljava/util/List;->size()I
 
@@ -163,7 +164,7 @@
     :goto_0
     if-ge v0, p3, :cond_1
 
-    iget-object v1, p0, Lb/n;->clz:Ljava/util/List;
+    iget-object v1, p0, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -201,7 +202,7 @@
 
     invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p0, Lb/n;->clz:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -214,7 +215,7 @@
 
     invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lb/n;->clz:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -246,6 +247,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final an(Ljava/lang/Class;)Ljava/lang/Object;
@@ -262,13 +265,13 @@
 
     invoke-static {p1}, Lb/p;->ap(Ljava/lang/Class;)V
 
-    iget-boolean v0, p0, Lb/n;->clB:Z
+    iget-boolean v0, p0, Lb/n;->ckV:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lb/k;->Kh()Lb/k;
+    invoke-static {}, Lb/k;->Kg()Lb/k;
 
     move-result-object v0
 
@@ -346,7 +349,7 @@
 
     invoke-static {p2, p1}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p1, p0, Lb/n;->clz:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -357,7 +360,7 @@
     :goto_0
     if-ge p2, p1, :cond_0
 
-    iget-object v0, p0, Lb/n;->clz:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -366,7 +369,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lb/a$d;->ckK:Lb/a$d;
+    sget-object p1, Lb/a$d;->cke:Lb/a$d;
 
     return-object p1
 .end method
@@ -383,7 +386,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/n;->clx:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->ckR:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -396,12 +399,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lb/n;->clx:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->ckR:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lb/n;->clx:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->ckR:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -415,21 +418,21 @@
 
     invoke-direct {v1, p0, p1}, Lb/o$a;-><init>(Lb/n;Ljava/lang/reflect/Method;)V
 
-    invoke-virtual {v1}, Lb/o$a;->Km()Lb/c;
+    invoke-virtual {v1}, Lb/o$a;->Kl()Lb/c;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->clH:Lb/c;
+    iput-object v2, v1, Lb/o$a;->clb:Lb/c;
 
-    iget-object v2, v1, Lb/o$a;->clH:Lb/c;
+    iget-object v2, v1, Lb/o$a;->clb:Lb/c;
 
-    invoke-interface {v2}, Lb/c;->Kb()Ljava/lang/reflect/Type;
+    invoke-interface {v2}, Lb/c;->Ka()Ljava/lang/reflect/Type;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->clS:Ljava/lang/reflect/Type;
+    iput-object v2, v1, Lb/o$a;->clm:Ljava/lang/reflect/Type;
 
-    iget-object v2, v1, Lb/o$a;->clS:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->clm:Ljava/lang/reflect/Type;
 
     const-class v3, Lb/m;
 
@@ -439,19 +442,19 @@
 
     if-eq v2, v3, :cond_20
 
-    iget-object v2, v1, Lb/o$a;->clS:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->clm:Ljava/lang/reflect/Type;
 
     const-class v3, Lokhttp3/Response;
 
     if-eq v2, v3, :cond_20
 
-    invoke-virtual {v1}, Lb/o$a;->Kn()Lb/e;
+    invoke-virtual {v1}, Lb/o$a;->Km()Lb/e;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->clI:Lb/e;
+    iput-object v2, v1, Lb/o$a;->clc:Lb/e;
 
-    iget-object v2, v1, Lb/o$a;->clP:[Ljava/lang/annotation/Annotation;
+    iget-object v2, v1, Lb/o$a;->clj:[Ljava/lang/annotation/Annotation;
 
     array-length v3, v2
 
@@ -476,10 +479,9 @@
 
     move-result-object v8
 
-    :goto_1
     invoke-virtual {v1, v7, v8, v5}, Lb/o$a;->f(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :cond_1
     instance-of v9, v8, Lb/c/f;
@@ -494,7 +496,9 @@
 
     move-result-object v8
 
-    goto :goto_1
+    invoke-virtual {v1, v7, v8, v5}, Lb/o$a;->f(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_1
 
     :cond_2
     instance-of v9, v8, Lb/c/g;
@@ -513,7 +517,7 @@
 
     const-class v7, Ljava/lang/Void;
 
-    iget-object v8, v1, Lb/o$a;->clS:Ljava/lang/reflect/Type;
+    iget-object v8, v1, Lb/o$a;->clm:Ljava/lang/reflect/Type;
 
     invoke-virtual {v7, v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -521,7 +525,7 @@
 
     if-eqz v7, :cond_3
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :cond_3
     const-string p1, "HEAD method must use Void as response type."
@@ -547,10 +551,9 @@
 
     move-result-object v8
 
-    :goto_2
     invoke-virtual {v1, v9, v8, v7}, Lb/o$a;->f(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :cond_5
     instance-of v9, v8, Lb/c/o;
@@ -565,7 +568,9 @@
 
     move-result-object v8
 
-    goto :goto_2
+    invoke-virtual {v1, v9, v8, v7}, Lb/o$a;->f(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_1
 
     :cond_6
     instance-of v9, v8, Lb/c/p;
@@ -580,7 +585,9 @@
 
     move-result-object v8
 
-    goto :goto_2
+    invoke-virtual {v1, v9, v8, v7}, Lb/o$a;->f(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_1
 
     :cond_7
     instance-of v9, v8, Lb/c/m;
@@ -595,6 +602,8 @@
 
     move-result-object v8
 
+    invoke-virtual {v1, v7, v8, v5}, Lb/o$a;->f(Ljava/lang/String;Ljava/lang/String;Z)V
+
     goto :goto_1
 
     :cond_8
@@ -608,17 +617,17 @@
 
     move-result-object v7
 
-    invoke-interface {v8}, Lb/c/h;->Kr()Ljava/lang/String;
+    invoke-interface {v8}, Lb/c/h;->Kq()Ljava/lang/String;
 
     move-result-object v9
 
-    invoke-interface {v8}, Lb/c/h;->Ks()Z
+    invoke-interface {v8}, Lb/c/h;->Kr()Z
 
     move-result v8
 
     invoke-virtual {v1, v7, v9, v8}, Lb/o$a;->f(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_9
     instance-of v9, v8, Lb/c/k;
@@ -639,9 +648,9 @@
 
     move-result-object v7
 
-    iput-object v7, v1, Lb/o$a;->bZC:Lokhttp3/Headers;
+    iput-object v7, v1, Lb/o$a;->bYW:Lokhttp3/Headers;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_a
     const-string p1, "@Headers annotation is empty."
@@ -659,13 +668,13 @@
 
     if-eqz v9, :cond_d
 
-    iget-boolean v8, v1, Lb/o$a;->clK:Z
+    iget-boolean v8, v1, Lb/o$a;->cle:Z
 
     if-nez v8, :cond_c
 
-    iput-boolean v7, v1, Lb/o$a;->clL:Z
+    iput-boolean v7, v1, Lb/o$a;->clf:Z
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_c
     const-string p1, "Only one encoding annotation is allowed."
@@ -683,13 +692,13 @@
 
     if-eqz v8, :cond_f
 
-    iget-boolean v8, v1, Lb/o$a;->clL:Z
+    iget-boolean v8, v1, Lb/o$a;->clf:Z
 
     if-nez v8, :cond_e
 
-    iput-boolean v7, v1, Lb/o$a;->clK:Z
+    iput-boolean v7, v1, Lb/o$a;->cle:Z
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_e
     const-string p1, "Only one encoding annotation is allowed."
@@ -703,29 +712,29 @@
     throw p1
 
     :cond_f
-    :goto_3
+    :goto_1
     add-int/lit8 v6, v6, 0x1
 
     goto/16 :goto_0
 
     :cond_10
-    iget-object v2, v1, Lb/o$a;->clJ:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->cld:Ljava/lang/String;
 
     if-eqz v2, :cond_1f
 
-    iget-boolean v2, v1, Lb/o$a;->clr:Z
+    iget-boolean v2, v1, Lb/o$a;->ckL:Z
 
     if-nez v2, :cond_13
 
-    iget-boolean v2, v1, Lb/o$a;->clL:Z
+    iget-boolean v2, v1, Lb/o$a;->clf:Z
 
     if-nez v2, :cond_12
 
-    iget-boolean v2, v1, Lb/o$a;->clK:Z
+    iget-boolean v2, v1, Lb/o$a;->cle:Z
 
     if-nez v2, :cond_11
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_11
     const-string p1, "FormUrlEncoded can only be specified on HTTP methods with request body (e.g., @POST)."
@@ -750,21 +759,21 @@
     throw p1
 
     :cond_13
-    :goto_4
-    iget-object v2, v1, Lb/o$a;->clQ:[[Ljava/lang/annotation/Annotation;
+    :goto_2
+    iget-object v2, v1, Lb/o$a;->clk:[[Ljava/lang/annotation/Annotation;
 
     array-length v2, v2
 
     new-array v3, v2, [Lb/j;
 
-    iput-object v3, v1, Lb/o$a;->clM:[Lb/j;
+    iput-object v3, v1, Lb/o$a;->clg:[Lb/j;
 
     const/4 v3, 0x0
 
-    :goto_5
+    :goto_3
     if-ge v3, v2, :cond_16
 
-    iget-object v6, v1, Lb/o$a;->clR:[Ljava/lang/reflect/Type;
+    iget-object v6, v1, Lb/o$a;->cll:[Ljava/lang/reflect/Type;
 
     aget-object v6, v6, v3
 
@@ -774,13 +783,13 @@
 
     if-nez v8, :cond_15
 
-    iget-object v8, v1, Lb/o$a;->clQ:[[Ljava/lang/annotation/Annotation;
+    iget-object v8, v1, Lb/o$a;->clk:[[Ljava/lang/annotation/Annotation;
 
     aget-object v8, v8, v3
 
     if-eqz v8, :cond_14
 
-    iget-object v9, v1, Lb/o$a;->clM:[Lb/j;
+    iget-object v9, v1, Lb/o$a;->clg:[Lb/j;
 
     invoke-virtual {v1, v3, v6, v8}, Lb/o$a;->a(ILjava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/j;
 
@@ -790,7 +799,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_14
     const-string p1, "No Retrofit annotation found."
@@ -817,22 +826,22 @@
     throw p1
 
     :cond_16
-    iget-object v2, v1, Lb/o$a;->clo:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->ckI:Ljava/lang/String;
 
     if-nez v2, :cond_18
 
-    iget-boolean v2, v1, Lb/o$a;->clY:Z
+    iget-boolean v2, v1, Lb/o$a;->cls:Z
 
     if-eqz v2, :cond_17
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_17
     const-string p1, "Missing either @%s URL or @Url parameter."
 
     new-array v2, v7, [Ljava/lang/Object;
 
-    iget-object v3, v1, Lb/o$a;->clJ:Ljava/lang/String;
+    iget-object v3, v1, Lb/o$a;->cld:Ljava/lang/String;
 
     aput-object v3, v2, v5
 
@@ -843,24 +852,24 @@
     throw p1
 
     :cond_18
-    :goto_6
-    iget-boolean v2, v1, Lb/o$a;->clK:Z
+    :goto_4
+    iget-boolean v2, v1, Lb/o$a;->cle:Z
 
     if-nez v2, :cond_1a
 
-    iget-boolean v2, v1, Lb/o$a;->clL:Z
+    iget-boolean v2, v1, Lb/o$a;->clf:Z
 
     if-nez v2, :cond_1a
 
-    iget-boolean v2, v1, Lb/o$a;->clr:Z
+    iget-boolean v2, v1, Lb/o$a;->ckL:Z
 
     if-nez v2, :cond_1a
 
-    iget-boolean v2, v1, Lb/o$a;->clV:Z
+    iget-boolean v2, v1, Lb/o$a;->clp:Z
 
     if-nez v2, :cond_19
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_19
     const-string p1, "Non-body HTTP method cannot contain @Body."
@@ -874,16 +883,16 @@
     throw p1
 
     :cond_1a
-    :goto_7
-    iget-boolean v2, v1, Lb/o$a;->clK:Z
+    :goto_5
+    iget-boolean v2, v1, Lb/o$a;->cle:Z
 
     if-eqz v2, :cond_1c
 
-    iget-boolean v2, v1, Lb/o$a;->clT:Z
+    iget-boolean v2, v1, Lb/o$a;->cln:Z
 
     if-eqz v2, :cond_1b
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_1b
     const-string p1, "Form-encoded method must contain at least one @Field."
@@ -897,16 +906,16 @@
     throw p1
 
     :cond_1c
-    :goto_8
-    iget-boolean v2, v1, Lb/o$a;->clL:Z
+    :goto_6
+    iget-boolean v2, v1, Lb/o$a;->clf:Z
 
     if-eqz v2, :cond_1e
 
-    iget-boolean v2, v1, Lb/o$a;->clU:Z
+    iget-boolean v2, v1, Lb/o$a;->clo:Z
 
     if-eqz v2, :cond_1d
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_1d
     const-string p1, "Multipart method must contain at least one @Part."
@@ -920,18 +929,18 @@
     throw p1
 
     :cond_1e
-    :goto_9
+    :goto_7
     new-instance v2, Lb/o;
 
     invoke-direct {v2, v1}, Lb/o;-><init>(Lb/o$a;)V
 
-    iget-object v1, p0, Lb/n;->clx:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->ckR:Ljava/util/Map;
 
     invoke-interface {v1, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-object v1, v2
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_1f
     const-string p1, "HTTP method annotation is required (e.g., @GET, @POST, etc.)."
@@ -951,7 +960,7 @@
 
     invoke-direct {p1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, v1, Lb/o$a;->clS:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->clm:Ljava/lang/reflect/Type;
 
     invoke-static {v2}, Lb/p;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
@@ -980,7 +989,7 @@
     throw p1
 
     :cond_21
-    :goto_a
+    :goto_8
     monitor-exit v0
 
     return-object v1
@@ -993,4 +1002,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/b/o$a.smali b/com.discord/smali/b/o$a.smali
index 47605d3197..616eb6e6be 100644
--- a/com.discord/smali/b/o$a.smali
+++ b/com.discord/smali/b/o$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/o$a;
 .super Ljava/lang/Object;
+.source "ServiceMethod.java"
 
 
 # annotations
@@ -25,11 +26,15 @@
 
 
 # instance fields
-.field bZC:Lokhttp3/Headers;
+.field bYT:Lokhttp3/MediaType;
 
-.field bZz:Lokhttp3/MediaType;
+.field bYW:Lokhttp3/Headers;
 
-.field clH:Lb/c;
+.field ckI:Ljava/lang/String;
+
+.field ckL:Z
+
+.field clb:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -38,7 +43,7 @@
     .end annotation
 .end field
 
-.field clI:Lb/e;
+.field clc:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -48,13 +53,13 @@
     .end annotation
 .end field
 
-.field clJ:Ljava/lang/String;
+.field cld:Ljava/lang/String;
 
-.field clK:Z
+.field cle:Z
 
-.field clL:Z
+.field clf:Z
 
-.field clM:[Lb/j;
+.field clg:[Lb/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -64,31 +69,31 @@
     .end annotation
 .end field
 
-.field final clN:Lb/n;
+.field final clh:Lb/n;
 
-.field final clO:Ljava/lang/reflect/Method;
+.field final cli:Ljava/lang/reflect/Method;
 
-.field final clP:[Ljava/lang/annotation/Annotation;
+.field final clj:[Ljava/lang/annotation/Annotation;
 
-.field final clQ:[[Ljava/lang/annotation/Annotation;
+.field final clk:[[Ljava/lang/annotation/Annotation;
 
-.field final clR:[Ljava/lang/reflect/Type;
+.field final cll:[Ljava/lang/reflect/Type;
 
-.field clS:Ljava/lang/reflect/Type;
+.field clm:Ljava/lang/reflect/Type;
 
-.field clT:Z
+.field cln:Z
 
-.field clU:Z
+.field clo:Z
 
-.field clV:Z
+.field clp:Z
 
-.field clW:Z
+.field clq:Z
 
-.field clX:Z
+.field clr:Z
 
-.field clY:Z
+.field cls:Z
 
-.field clZ:Ljava/util/Set;
+.field clt:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -98,10 +103,6 @@
     .end annotation
 .end field
 
-.field clo:Ljava/lang/String;
-
-.field clr:Z
-
 
 # direct methods
 .method constructor <init>(Lb/n;Ljava/lang/reflect/Method;)V
@@ -109,27 +110,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iput-object p1, p0, Lb/o$a;->clh:Lb/n;
 
-    iput-object p2, p0, Lb/o$a;->clO:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lb/o$a;->cli: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;->clP:[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->clj:[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;->clR:[Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/o$a;->cll:[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;->clQ:[[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->clk:[[Ljava/lang/annotation/Annotation;
 
     return-void
 .end method
@@ -157,23 +158,23 @@
 
     if-eqz v0, :cond_6
 
-    iget-boolean p3, p0, Lb/o$a;->clY:Z
+    iget-boolean p3, p0, Lb/o$a;->cls:Z
 
     if-nez p3, :cond_5
 
-    iget-boolean p3, p0, Lb/o$a;->clW:Z
+    iget-boolean p3, p0, Lb/o$a;->clq:Z
 
     if-nez p3, :cond_4
 
-    iget-boolean p3, p0, Lb/o$a;->clX:Z
+    iget-boolean p3, p0, Lb/o$a;->clr:Z
 
     if-nez p3, :cond_3
 
-    iget-object p3, p0, Lb/o$a;->clo:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->ckI:Ljava/lang/String;
 
     if-nez p3, :cond_2
 
-    iput-boolean v1, p0, Lb/o$a;->clY:Z
+    iput-boolean v1, p0, Lb/o$a;->cls:Z
 
     const-class p3, Lokhttp3/s;
 
@@ -229,7 +230,7 @@
     :cond_2
     new-array p2, v1, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->clJ:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->cld:Ljava/lang/String;
 
     aput-object p3, p2, v2
 
@@ -281,19 +282,19 @@
 
     if-eqz v0, :cond_c
 
-    iget-boolean v0, p0, Lb/o$a;->clX:Z
+    iget-boolean v0, p0, Lb/o$a;->clr:Z
 
     if-nez v0, :cond_b
 
-    iget-boolean v0, p0, Lb/o$a;->clY:Z
+    iget-boolean v0, p0, Lb/o$a;->cls:Z
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lb/o$a;->clo:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->ckI:Ljava/lang/String;
 
     if-eqz v0, :cond_9
 
-    iput-boolean v1, p0, Lb/o$a;->clW:Z
+    iput-boolean v1, p0, Lb/o$a;->clq:Z
 
     check-cast p4, Lb/c/s;
 
@@ -301,7 +302,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lb/o;->clG:Ljava/util/regex/Pattern;
+    sget-object v4, Lb/o;->cla:Ljava/util/regex/Pattern;
 
     invoke-virtual {v4, v0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -313,7 +314,7 @@
 
     if-eqz v4, :cond_8
 
-    iget-object v4, p0, Lb/o$a;->clZ:Ljava/util/Set;
+    iget-object v4, p0, Lb/o$a;->clt:Ljava/util/Set;
 
     invoke-interface {v4, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -321,7 +322,7 @@
 
     if-eqz v4, :cond_7
 
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -329,7 +330,7 @@
 
     new-instance p2, Lb/j$h;
 
-    invoke-interface {p4}, Lb/c/s;->Kq()Z
+    invoke-interface {p4}, Lb/c/s;->Kp()Z
 
     move-result p3
 
@@ -340,7 +341,7 @@
     :cond_7
     new-array p2, v3, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->clo:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->ckI:Ljava/lang/String;
 
     aput-object p3, p2, v2
 
@@ -357,7 +358,7 @@
     :cond_8
     new-array p2, v3, [Ljava/lang/Object;
 
-    sget-object p3, Lb/o;->clF:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->ckZ:Ljava/util/regex/Pattern;
 
     invoke-virtual {p3}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
 
@@ -378,7 +379,7 @@
     :cond_9
     new-array p2, v1, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->clJ:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->cld:Ljava/lang/String;
 
     aput-object p3, p2, v2
 
@@ -423,7 +424,7 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/t;->Kq()Z
+    invoke-interface {p4}, Lb/c/t;->Kp()Z
 
     move-result p4
 
@@ -431,7 +432,7 @@
 
     move-result-object v3
 
-    iput-boolean v1, p0, Lb/o$a;->clX:Z
+    iput-boolean v1, p0, Lb/o$a;->clr:Z
 
     const-class v1, Ljava/lang/Iterable;
 
@@ -451,7 +452,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -461,7 +462,7 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$i;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$i;->Kf()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Ke()Lb/j;
 
     move-result-object p1
 
@@ -519,7 +520,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -529,14 +530,14 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$i;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$i;->Kg()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Kf()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_f
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -555,7 +556,7 @@
 
     check-cast p4, Lb/c/v;
 
-    invoke-interface {p4}, Lb/c/v;->Kq()Z
+    invoke-interface {p4}, Lb/c/v;->Kp()Z
 
     move-result p4
 
@@ -563,7 +564,7 @@
 
     move-result-object v0
 
-    iput-boolean v1, p0, Lb/o$a;->clX:Z
+    iput-boolean v1, p0, Lb/o$a;->clr:Z
 
     const-class v1, Ljava/lang/Iterable;
 
@@ -583,7 +584,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -593,7 +594,7 @@
 
     invoke-direct {p2, p1, p4}, Lb/j$k;-><init>(Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$k;->Kf()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Ke()Lb/j;
 
     move-result-object p1
 
@@ -651,7 +652,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -661,14 +662,14 @@
 
     invoke-direct {p2, p1, p4}, Lb/j$k;-><init>(Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$k;->Kg()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Kf()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_13
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -721,7 +722,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -731,7 +732,7 @@
 
     check-cast p4, Lb/c/u;
 
-    invoke-interface {p4}, Lb/c/u;->Kq()Z
+    invoke-interface {p4}, Lb/c/u;->Kp()Z
 
     move-result p3
 
@@ -813,7 +814,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -823,7 +824,7 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$d;-><init>(Ljava/lang/String;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$d;->Kf()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Ke()Lb/j;
 
     move-result-object p1
 
@@ -881,7 +882,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -891,14 +892,14 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$d;-><init>(Ljava/lang/String;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$d;->Kg()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Kf()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_1b
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -951,7 +952,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1009,7 +1010,7 @@
 
     if-eqz v0, :cond_25
 
-    iget-boolean v0, p0, Lb/o$a;->clK:Z
+    iget-boolean v0, p0, Lb/o$a;->cle:Z
 
     if-eqz v0, :cond_24
 
@@ -1019,11 +1020,11 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/c;->Kq()Z
+    invoke-interface {p4}, Lb/c/c;->Kp()Z
 
     move-result p4
 
-    iput-boolean v1, p0, Lb/o$a;->clT:Z
+    iput-boolean v1, p0, Lb/o$a;->cln:Z
 
     invoke-static {p2}, Lb/p;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
@@ -1047,7 +1048,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1057,7 +1058,7 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$b;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$b;->Kf()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Ke()Lb/j;
 
     move-result-object p1
 
@@ -1115,7 +1116,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1125,14 +1126,14 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$b;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$b;->Kg()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Kf()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_23
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1160,7 +1161,7 @@
 
     if-eqz v0, :cond_2a
 
-    iget-boolean v0, p0, Lb/o$a;->clK:Z
+    iget-boolean v0, p0, Lb/o$a;->cle:Z
 
     if-eqz v0, :cond_29
 
@@ -1200,19 +1201,19 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p2, p0, Lb/o$a;->clh: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 v1, p0, Lb/o$a;->clT:Z
+    iput-boolean v1, p0, Lb/o$a;->cln:Z
 
     new-instance p2, Lb/j$c;
 
     check-cast p4, Lb/c/d;
 
-    invoke-interface {p4}, Lb/c/d;->Kq()Z
+    invoke-interface {p4}, Lb/c/d;->Kp()Z
 
     move-result p3
 
@@ -1277,13 +1278,13 @@
 
     if-eqz v0, :cond_39
 
-    iget-boolean v0, p0, Lb/o$a;->clL:Z
+    iget-boolean v0, p0, Lb/o$a;->clf:Z
 
     if-eqz v0, :cond_38
 
     check-cast p4, Lb/c/q;
 
-    iput-boolean v1, p0, Lb/o$a;->clU:Z
+    iput-boolean v1, p0, Lb/o$a;->clo:Z
 
     invoke-interface {p4}, Lb/c/q;->value()Ljava/lang/String;
 
@@ -1329,9 +1330,9 @@
 
     if-eqz p2, :cond_2b
 
-    sget-object p1, Lb/j$l;->cll:Lb/j$l;
+    sget-object p1, Lb/j$l;->ckF:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->Kf()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Ke()Lb/j;
 
     move-result-object p1
 
@@ -1404,9 +1405,9 @@
 
     if-eqz p2, :cond_2e
 
-    sget-object p1, Lb/j$l;->cll:Lb/j$l;
+    sget-object p1, Lb/j$l;->ckF:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->Kg()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Kf()Lb/j;
 
     move-result-object p1
 
@@ -1432,7 +1433,7 @@
 
     if-eqz p2, :cond_30
 
-    sget-object p1, Lb/j$l;->cll:Lb/j$l;
+    sget-object p1, Lb/j$l;->ckF:Lb/j$l;
 
     return-object p1
 
@@ -1480,7 +1481,7 @@
 
     const/4 v0, 0x3
 
-    invoke-interface {p4}, Lb/c/q;->Kt()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/q;->Ks()Ljava/lang/String;
 
     move-result-object p4
 
@@ -1520,9 +1521,9 @@
 
     if-nez v0, :cond_32
 
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->clP:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->clj:[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;
 
@@ -1532,7 +1533,7 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$f;-><init>(Lokhttp3/Headers;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$f;->Kf()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Ke()Lb/j;
 
     move-result-object p1
 
@@ -1609,9 +1610,9 @@
 
     if-nez v0, :cond_35
 
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->clP:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->clj:[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;
 
@@ -1621,7 +1622,7 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$f;-><init>(Lokhttp3/Headers;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$f;->Kg()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Kf()Lb/j;
 
     move-result-object p1
 
@@ -1647,9 +1648,9 @@
 
     if-nez v0, :cond_37
 
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->clP:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->clj:[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;
 
@@ -1688,11 +1689,11 @@
 
     if-eqz v0, :cond_3f
 
-    iget-boolean v0, p0, Lb/o$a;->clL:Z
+    iget-boolean v0, p0, Lb/o$a;->clf:Z
 
     if-eqz v0, :cond_3e
 
-    iput-boolean v1, p0, Lb/o$a;->clU:Z
+    iput-boolean v1, p0, Lb/o$a;->clo:Z
 
     invoke-static {p2}, Lb/p;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
@@ -1742,9 +1743,9 @@
 
     if-nez v0, :cond_3a
 
-    iget-object p1, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p1, p0, Lb/o$a;->clh:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->clP:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->clj:[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;
 
@@ -1754,7 +1755,7 @@
 
     new-instance p2, Lb/j$g;
 
-    invoke-interface {p4}, Lb/c/r;->Kt()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/r;->Ks()Ljava/lang/String;
 
     move-result-object p3
 
@@ -1830,36 +1831,36 @@
 
     if-eqz p4, :cond_42
 
-    iget-boolean p4, p0, Lb/o$a;->clK:Z
+    iget-boolean p4, p0, Lb/o$a;->cle:Z
 
     if-nez p4, :cond_41
 
-    iget-boolean p4, p0, Lb/o$a;->clL:Z
+    iget-boolean p4, p0, Lb/o$a;->clf:Z
 
     if-nez p4, :cond_41
 
-    iget-boolean p4, p0, Lb/o$a;->clV:Z
+    iget-boolean p4, p0, Lb/o$a;->clp:Z
 
     if-nez p4, :cond_40
 
     :try_start_0
-    iget-object p4, p0, Lb/o$a;->clN:Lb/n;
+    iget-object p4, p0, Lb/o$a;->clh:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->clP:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->clj:[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;
 
-    move-result-object p3
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iput-boolean v1, p0, Lb/o$a;->clV:Z
+    iput-boolean v1, p0, Lb/o$a;->clp:Z
 
-    new-instance p1, Lb/j$a;
+    new-instance p2, Lb/j$a;
 
-    invoke-direct {p1, p3}, Lb/j$a;-><init>(Lb/e;)V
+    invoke-direct {p2, p1}, Lb/j$a;-><init>(Lb/e;)V
 
-    return-object p1
+    return-object p2
 
     :catch_0
     move-exception p3
@@ -1928,7 +1929,7 @@
 
 
 # virtual methods
-.method final Km()Lb/c;
+.method final Kl()Lb/c;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1938,7 +1939,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->clO:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->cli:Ljava/lang/reflect/Method;
 
     invoke-virtual {v0}, Ljava/lang/reflect/Method;->getGenericReturnType()Ljava/lang/reflect/Type;
 
@@ -1960,14 +1961,14 @@
 
     if-eq v0, v1, :cond_3
 
-    iget-object v1, p0, Lb/o$a;->clO:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lb/o$a;->cli: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;->clN:Lb/n;
+    iget-object v5, p0, Lb/o$a;->clh:Lb/n;
 
     const-string v6, "returnType == null"
 
@@ -1977,7 +1978,7 @@
 
     invoke-static {v1, v6}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v1, v5, Lb/n;->clA:Ljava/util/List;
+    iget-object v1, v5, Lb/n;->ckU:Ljava/util/List;
 
     invoke-interface {v1, v2}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
 
@@ -1985,7 +1986,7 @@
 
     add-int/2addr v1, v4
 
-    iget-object v2, v5, Lb/n;->clA:Ljava/util/List;
+    iget-object v2, v5, Lb/n;->ckU:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -1996,7 +1997,7 @@
     :goto_0
     if-ge v6, v2, :cond_1
 
-    iget-object v7, v5, Lb/n;->clA:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->ckU:Ljava/util/List;
 
     invoke-interface {v7, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2034,7 +2035,7 @@
 
     invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v6, v5, Lb/n;->clA:Ljava/util/List;
+    iget-object v6, v5, Lb/n;->ckU:Ljava/util/List;
 
     invoke-interface {v6}, Ljava/util/List;->size()I
 
@@ -2047,7 +2048,7 @@
 
     invoke-virtual {v2, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v7, v5, Lb/n;->clA:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->ckU:Ljava/util/List;
 
     invoke-interface {v7, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2120,9 +2121,11 @@
     move-result-object v0
 
     throw v0
+
+    return-void
 .end method
 
-.method final Kn()Lb/e;
+.method final Km()Lb/e;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2133,7 +2136,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->clO:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->cli:Ljava/lang/reflect/Method;
 
     invoke-virtual {v0}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
 
@@ -2142,9 +2145,9 @@
     const/4 v1, 0x1
 
     :try_start_0
-    iget-object v2, p0, Lb/o$a;->clN:Lb/n;
+    iget-object v2, p0, Lb/o$a;->clh:Lb/n;
 
-    iget-object v3, p0, Lb/o$a;->clS:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->clm:Ljava/lang/reflect/Type;
 
     const-string v4, "type == null"
 
@@ -2154,7 +2157,7 @@
 
     invoke-static {v0, v4}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v4, v2, Lb/n;->clz:Ljava/util/List;
+    iget-object v4, v2, Lb/n;->ckT:Ljava/util/List;
 
     const/4 v5, 0x0
 
@@ -2164,7 +2167,7 @@
 
     add-int/2addr v4, v1
 
-    iget-object v5, v2, Lb/n;->clz:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {v5}, Ljava/util/List;->size()I
 
@@ -2175,7 +2178,7 @@
     :goto_0
     if-ge v6, v5, :cond_1
 
-    iget-object v7, v2, Lb/n;->clz:Ljava/util/List;
+    iget-object v7, v2, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {v7, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2213,7 +2216,7 @@
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, v2, Lb/n;->clz:Ljava/util/List;
+    iget-object v3, v2, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -2226,7 +2229,7 @@
 
     invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v5, v2, Lb/n;->clz:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->ckT:Ljava/util/List;
 
     invoke-interface {v5, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2268,7 +2271,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lb/o$a;->clS:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->clm:Ljava/lang/reflect/Type;
 
     aput-object v3, v1, v2
 
@@ -2279,6 +2282,8 @@
     move-result-object v0
 
     throw v0
+
+    return-void
 .end method
 
 .method final a(ILjava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/j;
@@ -2354,6 +2359,8 @@
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method final varargs a(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
@@ -2409,7 +2416,7 @@
 
     invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p2, p0, Lb/o$a;->clO:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->cli:Ljava/lang/reflect/Method;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getDeclaringClass()Ljava/lang/Class;
 
@@ -2425,7 +2432,7 @@
 
     invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p2, p0, Lb/o$a;->clO:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->cli:Ljava/lang/reflect/Method;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
 
@@ -2445,7 +2452,7 @@
 .method final f(Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 4
 
-    iget-object v0, p0, Lb/o$a;->clJ:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->cld:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -2455,9 +2462,9 @@
 
     if-nez v0, :cond_3
 
-    iput-object p1, p0, Lb/o$a;->clJ:Ljava/lang/String;
+    iput-object p1, p0, Lb/o$a;->cld:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lb/o$a;->clr:Z
+    iput-boolean p3, p0, Lb/o$a;->ckL:Z
 
     invoke-virtual {p2}, Ljava/lang/String;->isEmpty()Z
 
@@ -2492,7 +2499,7 @@
 
     move-result-object p1
 
-    sget-object p3, Lb/o;->clF:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->ckZ:Ljava/util/regex/Pattern;
 
     invoke-virtual {p3, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -2521,13 +2528,13 @@
 
     :cond_2
     :goto_0
-    iput-object p2, p0, Lb/o$a;->clo:Ljava/lang/String;
+    iput-object p2, p0, Lb/o$a;->ckI:Ljava/lang/String;
 
     invoke-static {p2}, Lb/o;->ff(Ljava/lang/String;)Ljava/util/Set;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/o$a;->clZ:Ljava/util/Set;
+    iput-object p1, p0, Lb/o$a;->clt:Ljava/util/Set;
 
     return-void
 
@@ -2536,9 +2543,7 @@
 
     new-array p2, p2, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->clJ:Ljava/lang/String;
-
-    aput-object p3, p2, v2
+    aput-object v0, p2, v2
 
     aput-object p1, p2, v3
 
@@ -2621,7 +2626,7 @@
 
     if-eqz v5, :cond_0
 
-    iput-object v5, p0, Lb/o$a;->bZz:Lokhttp3/MediaType;
+    iput-object v5, p0, Lb/o$a;->bYT:Lokhttp3/MediaType;
 
     goto :goto_1
 
@@ -2660,7 +2665,7 @@
     throw p1
 
     :cond_3
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/o.smali b/com.discord/smali/b/o.smali
index 804743b2e9..cd716b0906 100644
--- a/com.discord/smali/b/o.smali
+++ b/com.discord/smali/b/o.smali
@@ -1,5 +1,6 @@
 .class final Lb/o;
 .super Ljava/lang/Object;
+.source "ServiceMethod.java"
 
 
 # annotations
@@ -22,17 +23,25 @@
 
 
 # static fields
-.field static final clF:Ljava/util/regex/Pattern;
+.field static final ckZ:Ljava/util/regex/Pattern;
 
-.field static final clG:Ljava/util/regex/Pattern;
+.field static final cla:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bZC:Lokhttp3/Headers;
+.field private final bYT:Lokhttp3/MediaType;
 
-.field private final bZz:Lokhttp3/MediaType;
+.field private final bYW:Lokhttp3/Headers;
 
-.field final clH:Lb/c;
+.field private final ckH:Lokhttp3/s;
+
+.field private final ckI:Ljava/lang/String;
+
+.field private final ckL:Z
+
+.field final ckS:Lokhttp3/e$a;
+
+.field final clb:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -41,7 +50,7 @@
     .end annotation
 .end field
 
-.field final clI:Lb/e;
+.field final clc:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -51,13 +60,13 @@
     .end annotation
 .end field
 
-.field private final clJ:Ljava/lang/String;
+.field private final cld:Ljava/lang/String;
 
-.field private final clK:Z
+.field private final cle:Z
 
-.field private final clL:Z
+.field private final clf:Z
 
-.field private final clM:[Lb/j;
+.field private final clg:[Lb/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -67,14 +76,6 @@
     .end annotation
 .end field
 
-.field private final cln:Lokhttp3/s;
-
-.field private final clo:Ljava/lang/String;
-
-.field private final clr:Z
-
-.field final cly:Lokhttp3/e$a;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -86,7 +87,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/o;->clF:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->ckZ:Ljava/util/regex/Pattern;
 
     const-string v0, "[a-zA-Z][a-zA-Z0-9_-]*"
 
@@ -94,7 +95,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/o;->clG:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->cla:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -111,57 +112,57 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lb/o$a;->clN:Lb/n;
+    iget-object v0, p1, Lb/o$a;->clh:Lb/n;
 
-    iget-object v0, v0, Lb/n;->cly:Lokhttp3/e$a;
+    iget-object v0, v0, Lb/n;->ckS:Lokhttp3/e$a;
 
-    iput-object v0, p0, Lb/o;->cly:Lokhttp3/e$a;
+    iput-object v0, p0, Lb/o;->ckS:Lokhttp3/e$a;
 
-    iget-object v0, p1, Lb/o$a;->clH:Lb/c;
+    iget-object v0, p1, Lb/o$a;->clb:Lb/c;
 
-    iput-object v0, p0, Lb/o;->clH:Lb/c;
+    iput-object v0, p0, Lb/o;->clb:Lb/c;
 
-    iget-object v0, p1, Lb/o$a;->clN:Lb/n;
+    iget-object v0, p1, Lb/o$a;->clh:Lb/n;
 
-    iget-object v0, v0, Lb/n;->cln:Lokhttp3/s;
+    iget-object v0, v0, Lb/n;->ckH:Lokhttp3/s;
 
-    iput-object v0, p0, Lb/o;->cln:Lokhttp3/s;
+    iput-object v0, p0, Lb/o;->ckH:Lokhttp3/s;
 
-    iget-object v0, p1, Lb/o$a;->clI:Lb/e;
+    iget-object v0, p1, Lb/o$a;->clc:Lb/e;
 
-    iput-object v0, p0, Lb/o;->clI:Lb/e;
+    iput-object v0, p0, Lb/o;->clc:Lb/e;
 
-    iget-object v0, p1, Lb/o$a;->clJ:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->cld:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->clJ:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->cld:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->clo:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->ckI:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->clo:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->ckI:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->bZC:Lokhttp3/Headers;
+    iget-object v0, p1, Lb/o$a;->bYW:Lokhttp3/Headers;
 
-    iput-object v0, p0, Lb/o;->bZC:Lokhttp3/Headers;
+    iput-object v0, p0, Lb/o;->bYW:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lb/o$a;->bZz:Lokhttp3/MediaType;
+    iget-object v0, p1, Lb/o$a;->bYT:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lb/o;->bZz:Lokhttp3/MediaType;
+    iput-object v0, p0, Lb/o;->bYT:Lokhttp3/MediaType;
 
-    iget-boolean v0, p1, Lb/o$a;->clr:Z
+    iget-boolean v0, p1, Lb/o$a;->ckL:Z
 
-    iput-boolean v0, p0, Lb/o;->clr:Z
+    iput-boolean v0, p0, Lb/o;->ckL:Z
 
-    iget-boolean v0, p1, Lb/o$a;->clK:Z
+    iget-boolean v0, p1, Lb/o$a;->cle:Z
 
-    iput-boolean v0, p0, Lb/o;->clK:Z
+    iput-boolean v0, p0, Lb/o;->cle:Z
 
-    iget-boolean v0, p1, Lb/o$a;->clL:Z
+    iget-boolean v0, p1, Lb/o$a;->clf:Z
 
-    iput-boolean v0, p0, Lb/o;->clL:Z
+    iput-boolean v0, p0, Lb/o;->clf:Z
 
-    iget-object p1, p1, Lb/o$a;->clM:[Lb/j;
+    iget-object p1, p1, Lb/o$a;->clg:[Lb/j;
 
-    iput-object p1, p0, Lb/o;->clM:[Lb/j;
+    iput-object p1, p0, Lb/o;->clg:[Lb/j;
 
     return-void
 .end method
@@ -247,6 +248,8 @@
 
     const-class p0, Ljava/lang/Short;
 
+    return-object p0
+
     :cond_7
     return-object p0
 .end method
@@ -264,7 +267,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/o;->clF:Ljava/util/regex/Pattern;
+    sget-object v0, Lb/o;->ckZ:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -311,27 +314,27 @@
 
     new-instance v9, Lb/l;
 
-    iget-object v1, p0, Lb/o;->clJ:Ljava/lang/String;
+    iget-object v1, p0, Lb/o;->cld:Ljava/lang/String;
 
-    iget-object v2, p0, Lb/o;->cln:Lokhttp3/s;
+    iget-object v2, p0, Lb/o;->ckH:Lokhttp3/s;
 
-    iget-object v3, p0, Lb/o;->clo:Ljava/lang/String;
+    iget-object v3, p0, Lb/o;->ckI:Ljava/lang/String;
 
-    iget-object v4, p0, Lb/o;->bZC:Lokhttp3/Headers;
+    iget-object v4, p0, Lb/o;->bYW:Lokhttp3/Headers;
 
-    iget-object v5, p0, Lb/o;->bZz:Lokhttp3/MediaType;
+    iget-object v5, p0, Lb/o;->bYT:Lokhttp3/MediaType;
 
-    iget-boolean v6, p0, Lb/o;->clr:Z
+    iget-boolean v6, p0, Lb/o;->ckL:Z
 
-    iget-boolean v7, p0, Lb/o;->clK:Z
+    iget-boolean v7, p0, Lb/o;->cle:Z
 
-    iget-boolean v8, p0, Lb/o;->clL:Z
+    iget-boolean v8, p0, Lb/o;->clf: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;->clM:[Lb/j;
+    iget-object v0, p0, Lb/o;->clg:[Lb/j;
 
     const/4 v1, 0x0
 
@@ -363,7 +366,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v9}, Lb/l;->HH()Lokhttp3/w;
+    invoke-virtual {v9}, Lb/l;->HG()Lokhttp3/w;
 
     move-result-object p1
 
@@ -399,4 +402,6 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/b/p$a.smali b/com.discord/smali/b/p$a.smali
index d647dfc40b..ab9598d8ba 100644
--- a/com.discord/smali/b/p$a.smali
+++ b/com.discord/smali/b/p$a.smali
@@ -1,5 +1,6 @@
 .class final Lb/p$a;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 # interfaces
 .implements Ljava/lang/reflect/GenericArrayType;
diff --git a/com.discord/smali/b/p$b.smali b/com.discord/smali/b/p$b.smali
index fec6ba843f..37a6c56c70 100644
--- a/com.discord/smali/b/p$b.smali
+++ b/com.discord/smali/b/p$b.smali
@@ -1,5 +1,6 @@
 .class final Lb/p$b;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 # interfaces
 .implements Ljava/lang/reflect/ParameterizedType;
@@ -200,9 +201,9 @@
 
     iget-object v0, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
     iget-object v0, p0, Lb/p$b;->rawType:Ljava/lang/reflect/Type;
 
@@ -213,75 +214,73 @@
     return-object v0
 
     :cond_0
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
-
-    array-length v1, v1
+    array-length v0, v0
 
     const/4 v2, 0x1
 
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    mul-int/lit8 v1, v1, 0x1e
+    mul-int/lit8 v0, v0, 0x1e
 
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
+    invoke-direct {v1, v0}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    iget-object v1, p0, Lb/p$b;->rawType:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/p$b;->rawType:Ljava/lang/reflect/Type;
 
-    invoke-static {v1}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v0}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v1, "<"
+    const-string v0, "<"
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
 
     const/4 v3, 0x0
 
-    aget-object v1, v1, v3
+    aget-object v0, v0, v3
 
-    invoke-static {v1}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v0}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :goto_0
-    iget-object v1, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
 
-    array-length v1, v1
+    array-length v0, v0
 
-    if-ge v2, v1, :cond_1
+    if-ge v2, v0, :cond_1
 
-    const-string v1, ", "
+    const-string v0, ", "
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/p$b;->typeArguments:[Ljava/lang/reflect/Type;
 
-    aget-object v1, v1, v2
+    aget-object v0, v0, v2
 
-    invoke-static {v1}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v0}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
 
     :cond_1
-    const-string v1, ">"
+    const-string v0, ">"
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/b/p$c.smali b/com.discord/smali/b/p$c.smali
index f6090bce0f..3f9cd66864 100644
--- a/com.discord/smali/b/p$c.smali
+++ b/com.discord/smali/b/p$c.smali
@@ -1,5 +1,6 @@
 .class final Lb/p$c;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 # interfaces
 .implements Ljava/lang/reflect/WildcardType;
@@ -60,7 +61,6 @@
 
     const-class p1, Ljava/lang/Object;
 
-    :goto_0
     iput-object p1, p0, Lb/p$c;->upperBound:Ljava/lang/reflect/Type;
 
     return-void
@@ -94,7 +94,9 @@
 
     aget-object p1, p1, v2
 
-    goto :goto_0
+    iput-object p1, p0, Lb/p$c;->upperBound:Ljava/lang/reflect/Type;
+
+    return-void
 
     :cond_3
     new-instance p1, Ljava/lang/NullPointerException;
@@ -145,17 +147,15 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    new-array v0, v0, [Ljava/lang/reflect/Type;
+    new-array v1, v1, [Ljava/lang/reflect/Type;
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    iget-object v2, p0, Lb/p$c;->lowerBound:Ljava/lang/reflect/Type;
+    aput-object v0, v1, v2
 
-    aput-object v2, v0, v1
-
-    return-object v0
+    return-object v1
 
     :cond_0
     sget-object v0, Lb/p;->bCX:[Ljava/lang/reflect/Type;
@@ -186,8 +186,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lb/p$c;->lowerBound:Ljava/lang/reflect/Type;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -228,7 +226,6 @@
 
     iget-object v1, p0, Lb/p$c;->lowerBound:Ljava/lang/reflect/Type;
 
-    :goto_0
     invoke-static {v1}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v1
@@ -261,5 +258,15 @@
 
     iget-object v1, p0, Lb/p$c;->upperBound:Ljava/lang/reflect/Type;
 
-    goto :goto_0
+    invoke-static {v1}, Lb/p;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    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/b/p.smali b/com.discord/smali/b/p.smali
index ef27ded2d2..54dbc96b5d 100644
--- a/com.discord/smali/b/p.smali
+++ b/com.discord/smali/b/p.smali
@@ -1,5 +1,6 @@
 .class public final Lb/p;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 
 # annotations
@@ -58,6 +59,8 @@
 
     aget-object p0, p0, p1
 
+    return-object p0
+
     :cond_0
     return-object p0
 
@@ -161,7 +164,6 @@
 
     aget-object p0, p0, v0
 
-    :goto_2
     move-object v3, p1
 
     move-object p1, p0
@@ -182,7 +184,7 @@
 
     if-nez p0, :cond_6
 
-    :goto_3
+    :goto_2
     const-class p0, Ljava/lang/Object;
 
     if-eq p1, p0, :cond_6
@@ -210,12 +212,18 @@
 
     move-result-object p1
 
-    goto :goto_2
+    move-object v3, p1
+
+    move-object p1, p0
+
+    move-object p0, v3
+
+    goto :goto_0
 
     :cond_5
     move-object p1, p0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     return-object p2
@@ -467,7 +475,7 @@
     :cond_f
     instance-of v0, p2, Ljava/lang/reflect/WildcardType;
 
-    if-eqz v0, :cond_11
+    if-eqz v0, :cond_12
 
     check-cast p2, Ljava/lang/reflect/WildcardType;
 
@@ -542,10 +550,15 @@
     :cond_11
     return-object p2
 
+    :cond_12
+    return-object p2
+
     :catch_0
     move-exception p0
 
     throw p0
+
+    return-void
 .end method
 
 .method static a(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
@@ -730,7 +743,7 @@
     :cond_b
     instance-of v1, p0, Ljava/lang/reflect/TypeVariable;
 
-    if-eqz v1, :cond_d
+    if-eqz v1, :cond_e
 
     instance-of v1, p1, Ljava/lang/reflect/TypeVariable;
 
@@ -771,6 +784,9 @@
 
     :cond_d
     return v2
+
+    :cond_e
+    return v2
 .end method
 
 .method static a([Ljava/lang/annotation/Annotation;Ljava/lang/Class;)Z
@@ -913,7 +929,7 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    invoke-virtual {p0}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v1
 
@@ -1085,6 +1101,8 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method static checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
@@ -1284,6 +1302,8 @@
     invoke-direct {v1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method static l(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
diff --git a/com.discord/smali/butterknife/Action.smali b/com.discord/smali/butterknife/Action.smali
index e81266e033..874bb8fbff 100644
--- a/com.discord/smali/butterknife/Action.smali
+++ b/com.discord/smali/butterknife/Action.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lbutterknife/Action;
 .super Ljava/lang/Object;
+.source "Action.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/BindAnim.smali b/com.discord/smali/butterknife/BindAnim.smali
index b7c9099181..6060a32c08 100644
--- a/com.discord/smali/butterknife/BindAnim.smali
+++ b/com.discord/smali/butterknife/BindAnim.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindAnim;
 .super Ljava/lang/Object;
+.source "BindAnim.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindArray.smali b/com.discord/smali/butterknife/BindArray.smali
index 11f6263c22..94b137edc2 100644
--- a/com.discord/smali/butterknife/BindArray.smali
+++ b/com.discord/smali/butterknife/BindArray.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindArray;
 .super Ljava/lang/Object;
+.source "BindArray.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindBitmap.smali b/com.discord/smali/butterknife/BindBitmap.smali
index 6d11c7c67d..6f97b21c0f 100644
--- a/com.discord/smali/butterknife/BindBitmap.smali
+++ b/com.discord/smali/butterknife/BindBitmap.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindBitmap;
 .super Ljava/lang/Object;
+.source "BindBitmap.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindBool.smali b/com.discord/smali/butterknife/BindBool.smali
index f64b429b49..c46b03196d 100644
--- a/com.discord/smali/butterknife/BindBool.smali
+++ b/com.discord/smali/butterknife/BindBool.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindBool;
 .super Ljava/lang/Object;
+.source "BindBool.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindColor.smali b/com.discord/smali/butterknife/BindColor.smali
index c14f830050..dad3543295 100644
--- a/com.discord/smali/butterknife/BindColor.smali
+++ b/com.discord/smali/butterknife/BindColor.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindColor;
 .super Ljava/lang/Object;
+.source "BindColor.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindDimen.smali b/com.discord/smali/butterknife/BindDimen.smali
index 1cf65e6d68..673ac93d22 100644
--- a/com.discord/smali/butterknife/BindDimen.smali
+++ b/com.discord/smali/butterknife/BindDimen.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindDimen;
 .super Ljava/lang/Object;
+.source "BindDimen.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindDrawable.smali b/com.discord/smali/butterknife/BindDrawable.smali
index 7aa182dbf2..b0df68c888 100644
--- a/com.discord/smali/butterknife/BindDrawable.smali
+++ b/com.discord/smali/butterknife/BindDrawable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindDrawable;
 .super Ljava/lang/Object;
+.source "BindDrawable.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindFloat.smali b/com.discord/smali/butterknife/BindFloat.smali
index 1daf58caa7..8781064b50 100644
--- a/com.discord/smali/butterknife/BindFloat.smali
+++ b/com.discord/smali/butterknife/BindFloat.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindFloat;
 .super Ljava/lang/Object;
+.source "BindFloat.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindFont$TypefaceStyle.smali b/com.discord/smali/butterknife/BindFont$TypefaceStyle.smali
index 483d46f909..524d06c996 100644
--- a/com.discord/smali/butterknife/BindFont$TypefaceStyle.smali
+++ b/com.discord/smali/butterknife/BindFont$TypefaceStyle.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindFont$TypefaceStyle;
 .super Ljava/lang/Object;
+.source "BindFont.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindFont.smali b/com.discord/smali/butterknife/BindFont.smali
index f89c7f678b..6e48b86609 100644
--- a/com.discord/smali/butterknife/BindFont.smali
+++ b/com.discord/smali/butterknife/BindFont.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindFont;
 .super Ljava/lang/Object;
+.source "BindFont.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindInt.smali b/com.discord/smali/butterknife/BindInt.smali
index 37a3630f75..932facfc4e 100644
--- a/com.discord/smali/butterknife/BindInt.smali
+++ b/com.discord/smali/butterknife/BindInt.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindInt;
 .super Ljava/lang/Object;
+.source "BindInt.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindString.smali b/com.discord/smali/butterknife/BindString.smali
index 793cc1d66d..edce982660 100644
--- a/com.discord/smali/butterknife/BindString.smali
+++ b/com.discord/smali/butterknife/BindString.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindString;
 .super Ljava/lang/Object;
+.source "BindString.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindView.smali b/com.discord/smali/butterknife/BindView.smali
index 76759f70cd..0f2d2557a8 100644
--- a/com.discord/smali/butterknife/BindView.smali
+++ b/com.discord/smali/butterknife/BindView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindView;
 .super Ljava/lang/Object;
+.source "BindView.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/BindViews.smali b/com.discord/smali/butterknife/BindViews.smali
index d63684282b..d5a39c3911 100644
--- a/com.discord/smali/butterknife/BindViews.smali
+++ b/com.discord/smali/butterknife/BindViews.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/BindViews;
 .super Ljava/lang/Object;
+.source "BindViews.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/ButterKnife$Action.smali b/com.discord/smali/butterknife/ButterKnife$Action.smali
deleted file mode 100644
index 5bed693d77..0000000000
--- a/com.discord/smali/butterknife/ButterKnife$Action.smali
+++ /dev/null
@@ -1,30 +0,0 @@
-.class public interface abstract Lbutterknife/ButterKnife$Action;
-.super Ljava/lang/Object;
-
-# interfaces
-.implements Lbutterknife/Action;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lbutterknife/ButterKnife;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "Action"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Landroid/view/View;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lbutterknife/Action<",
-        "TT;>;"
-    }
-.end annotation
-
-.annotation runtime Ljava/lang/Deprecated;
-.end annotation
diff --git a/com.discord/smali/butterknife/ButterKnife$Setter.smali b/com.discord/smali/butterknife/ButterKnife$Setter.smali
deleted file mode 100644
index b8f3c54949..0000000000
--- a/com.discord/smali/butterknife/ButterKnife$Setter.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract Lbutterknife/ButterKnife$Setter;
-.super Ljava/lang/Object;
-
-# interfaces
-.implements Lbutterknife/Setter;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lbutterknife/ButterKnife;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "Setter"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Landroid/view/View;",
-        "V:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lbutterknife/Setter<",
-        "TT;TV;>;"
-    }
-.end annotation
-
-.annotation runtime Ljava/lang/Deprecated;
-.end annotation
diff --git a/com.discord/smali/butterknife/ButterKnife.smali b/com.discord/smali/butterknife/ButterKnife.smali
index 76fde153e6..22df006678 100644
--- a/com.discord/smali/butterknife/ButterKnife.smali
+++ b/com.discord/smali/butterknife/ButterKnife.smali
@@ -1,14 +1,6 @@
 .class public final Lbutterknife/ButterKnife;
 .super Ljava/lang/Object;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lbutterknife/ButterKnife$Setter;,
-        Lbutterknife/ButterKnife$Action;
-    }
-.end annotation
+.source "ButterKnife.java"
 
 
 # static fields
@@ -270,22 +262,19 @@
 
     check-cast v0, Ljava/lang/reflect/Constructor;
 
-    if-eqz v0, :cond_1
+    if-nez v0, :cond_6
 
-    sget-boolean p0, Lbutterknife/ButterKnife;->bL:Z
+    sget-object v1, Lbutterknife/ButterKnife;->bM:Ljava/util/Map;
 
-    if-eqz p0, :cond_0
+    invoke-interface {v1, p0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    const-string p0, "ButterKnife"
+    move-result v1
 
-    const-string v1, "HIT: Cached in binding map."
+    if-eqz v1, :cond_0
 
-    invoke-static {p0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+    goto/16 :goto_2
 
     :cond_0
-    return-object v0
-
-    :cond_1
     invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
     move-result-object v0
@@ -296,7 +285,7 @@
 
     move-result v1
 
-    if-nez v1, :cond_5
+    if-nez v1, :cond_4
 
     const-string v1, "java."
 
@@ -304,7 +293,7 @@
 
     move-result v1
 
-    if-nez v1, :cond_5
+    if-nez v1, :cond_4
 
     const-string v1, "androidx."
 
@@ -312,11 +301,11 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
 
     goto :goto_1
 
-    :cond_2
+    :cond_1
     :try_start_0
     invoke-virtual {p0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
 
@@ -360,7 +349,7 @@
 
     sget-boolean v2, Lbutterknife/ButterKnife;->bL:Z
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_3
 
     const-string v2, "ButterKnife"
 
@@ -397,7 +386,7 @@
 
     sget-boolean v0, Lbutterknife/ButterKnife;->bL:Z
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_2
 
     const-string v0, "ButterKnife"
 
@@ -423,7 +412,7 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_3
+    :cond_2
     invoke-virtual {p0}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
 
     move-result-object v0
@@ -432,7 +421,7 @@
 
     move-result-object v1
 
-    :cond_4
+    :cond_3
     :goto_0
     sget-object v0, Lbutterknife/ButterKnife;->bM:Ljava/util/Map;
 
@@ -440,11 +429,11 @@
 
     return-object v1
 
-    :cond_5
+    :cond_4
     :goto_1
     sget-boolean p0, Lbutterknife/ButterKnife;->bL:Z
 
-    if-eqz p0, :cond_6
+    if-eqz p0, :cond_5
 
     const-string p0, "ButterKnife"
 
@@ -452,8 +441,23 @@
 
     invoke-static {p0, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_6
+    :cond_5
     const/4 p0, 0x0
 
     return-object p0
+
+    :cond_6
+    :goto_2
+    sget-boolean p0, Lbutterknife/ButterKnife;->bL:Z
+
+    if-eqz p0, :cond_7
+
+    const-string p0, "ButterKnife"
+
+    const-string v1, "HIT: Cached in binding map."
+
+    invoke-static {p0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_7
+    return-object v0
 .end method
diff --git a/com.discord/smali/butterknife/OnCheckedChanged.smali b/com.discord/smali/butterknife/OnCheckedChanged.smali
index 88d893c659..5425931bc1 100644
--- a/com.discord/smali/butterknife/OnCheckedChanged.smali
+++ b/com.discord/smali/butterknife/OnCheckedChanged.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnCheckedChanged;
 .super Ljava/lang/Object;
+.source "OnCheckedChanged.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnClick.smali b/com.discord/smali/butterknife/OnClick.smali
index 214a3bb2fb..1325486fe1 100644
--- a/com.discord/smali/butterknife/OnClick.smali
+++ b/com.discord/smali/butterknife/OnClick.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnClick;
 .super Ljava/lang/Object;
+.source "OnClick.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnEditorAction.smali b/com.discord/smali/butterknife/OnEditorAction.smali
index 3e5f98504f..7cf3c941b4 100644
--- a/com.discord/smali/butterknife/OnEditorAction.smali
+++ b/com.discord/smali/butterknife/OnEditorAction.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnEditorAction;
 .super Ljava/lang/Object;
+.source "OnEditorAction.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnFocusChange.smali b/com.discord/smali/butterknife/OnFocusChange.smali
index 4cbd476376..1baabedbab 100644
--- a/com.discord/smali/butterknife/OnFocusChange.smali
+++ b/com.discord/smali/butterknife/OnFocusChange.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnFocusChange;
 .super Ljava/lang/Object;
+.source "OnFocusChange.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnItemClick.smali b/com.discord/smali/butterknife/OnItemClick.smali
index aa83a77e3a..eeed127dc6 100644
--- a/com.discord/smali/butterknife/OnItemClick.smali
+++ b/com.discord/smali/butterknife/OnItemClick.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnItemClick;
 .super Ljava/lang/Object;
+.source "OnItemClick.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnItemLongClick.smali b/com.discord/smali/butterknife/OnItemLongClick.smali
index 653c4ec875..fd99682baa 100644
--- a/com.discord/smali/butterknife/OnItemLongClick.smali
+++ b/com.discord/smali/butterknife/OnItemLongClick.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnItemLongClick;
 .super Ljava/lang/Object;
+.source "OnItemLongClick.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnItemSelected$Callback.smali b/com.discord/smali/butterknife/OnItemSelected$Callback.smali
index f1fb5b70e9..62c2d09074 100644
--- a/com.discord/smali/butterknife/OnItemSelected$Callback.smali
+++ b/com.discord/smali/butterknife/OnItemSelected$Callback.smali
@@ -1,5 +1,6 @@
 .class public final enum Lbutterknife/OnItemSelected$Callback;
 .super Ljava/lang/Enum;
+.source "OnItemSelected.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/OnItemSelected.smali b/com.discord/smali/butterknife/OnItemSelected.smali
index 93ed406200..bdba877e6d 100644
--- a/com.discord/smali/butterknife/OnItemSelected.smali
+++ b/com.discord/smali/butterknife/OnItemSelected.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnItemSelected;
 .super Ljava/lang/Object;
+.source "OnItemSelected.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnLongClick.smali b/com.discord/smali/butterknife/OnLongClick.smali
index 35a20c2f8b..13e203a9d8 100644
--- a/com.discord/smali/butterknife/OnLongClick.smali
+++ b/com.discord/smali/butterknife/OnLongClick.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnLongClick;
 .super Ljava/lang/Object;
+.source "OnLongClick.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnPageChange$Callback.smali b/com.discord/smali/butterknife/OnPageChange$Callback.smali
index b8b9750c04..d9cbd9b3ea 100644
--- a/com.discord/smali/butterknife/OnPageChange$Callback.smali
+++ b/com.discord/smali/butterknife/OnPageChange$Callback.smali
@@ -1,5 +1,6 @@
 .class public final enum Lbutterknife/OnPageChange$Callback;
 .super Ljava/lang/Enum;
+.source "OnPageChange.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/OnPageChange.smali b/com.discord/smali/butterknife/OnPageChange.smali
index aa6c888783..0b1ecaab2d 100644
--- a/com.discord/smali/butterknife/OnPageChange.smali
+++ b/com.discord/smali/butterknife/OnPageChange.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnPageChange;
 .super Ljava/lang/Object;
+.source "OnPageChange.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnTextChanged$Callback.smali b/com.discord/smali/butterknife/OnTextChanged$Callback.smali
index 2e46962ca1..810b4c15e7 100644
--- a/com.discord/smali/butterknife/OnTextChanged$Callback.smali
+++ b/com.discord/smali/butterknife/OnTextChanged$Callback.smali
@@ -1,5 +1,6 @@
 .class public final enum Lbutterknife/OnTextChanged$Callback;
 .super Ljava/lang/Enum;
+.source "OnTextChanged.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/OnTextChanged.smali b/com.discord/smali/butterknife/OnTextChanged.smali
index 75daec63bf..2d6b7a7b8c 100644
--- a/com.discord/smali/butterknife/OnTextChanged.smali
+++ b/com.discord/smali/butterknife/OnTextChanged.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnTextChanged;
 .super Ljava/lang/Object;
+.source "OnTextChanged.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/OnTouch.smali b/com.discord/smali/butterknife/OnTouch.smali
index 79c517fd1f..f0e5f9e1cd 100644
--- a/com.discord/smali/butterknife/OnTouch.smali
+++ b/com.discord/smali/butterknife/OnTouch.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/OnTouch;
 .super Ljava/lang/Object;
+.source "OnTouch.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/Optional.smali b/com.discord/smali/butterknife/Optional.smali
index 248a7e4535..e2abc946cf 100644
--- a/com.discord/smali/butterknife/Optional.smali
+++ b/com.discord/smali/butterknife/Optional.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lbutterknife/Optional;
 .super Ljava/lang/Object;
+.source "Optional.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/butterknife/R$attr.smali b/com.discord/smali/butterknife/R$attr.smali
index 0caa22fdd6..2ac60abc00 100644
--- a/com.discord/smali/butterknife/R$attr.smali
+++ b/com.discord/smali/butterknife/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$color.smali b/com.discord/smali/butterknife/R$color.smali
index 7e4772886a..13662142be 100644
--- a/com.discord/smali/butterknife/R$color.smali
+++ b/com.discord/smali/butterknife/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$dimen.smali b/com.discord/smali/butterknife/R$dimen.smali
index d7ffc6af8a..8889a3c5b7 100644
--- a/com.discord/smali/butterknife/R$dimen.smali
+++ b/com.discord/smali/butterknife/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$drawable.smali b/com.discord/smali/butterknife/R$drawable.smali
index 0b485fa857..c106d55293 100644
--- a/com.discord/smali/butterknife/R$drawable.smali
+++ b/com.discord/smali/butterknife/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$id.smali b/com.discord/smali/butterknife/R$id.smali
index f108eb7523..d801687343 100644
--- a/com.discord/smali/butterknife/R$id.smali
+++ b/com.discord/smali/butterknife/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$integer.smali b/com.discord/smali/butterknife/R$integer.smali
index c25af6e7d8..c9847f160c 100644
--- a/com.discord/smali/butterknife/R$integer.smali
+++ b/com.discord/smali/butterknife/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$layout.smali b/com.discord/smali/butterknife/R$layout.smali
index 1af55da22a..36a2108a9d 100644
--- a/com.discord/smali/butterknife/R$layout.smali
+++ b/com.discord/smali/butterknife/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$string.smali b/com.discord/smali/butterknife/R$string.smali
index dd1786b9eb..c12af85825 100644
--- a/com.discord/smali/butterknife/R$string.smali
+++ b/com.discord/smali/butterknife/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$style.smali b/com.discord/smali/butterknife/R$style.smali
index 9895be580b..d5d3e93d71 100644
--- a/com.discord/smali/butterknife/R$style.smali
+++ b/com.discord/smali/butterknife/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R$styleable.smali b/com.discord/smali/butterknife/R$styleable.smali
index 3a7554205c..8fac3e99f8 100644
--- a/com.discord/smali/butterknife/R$styleable.smali
+++ b/com.discord/smali/butterknife/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/R.smali b/com.discord/smali/butterknife/R.smali
index 56973b3da3..cf582fcb86 100644
--- a/com.discord/smali/butterknife/R.smali
+++ b/com.discord/smali/butterknife/R.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/Setter.smali b/com.discord/smali/butterknife/Setter.smali
index d1b6fe0779..b6cd536158 100644
--- a/com.discord/smali/butterknife/Setter.smali
+++ b/com.discord/smali/butterknife/Setter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lbutterknife/Setter;
 .super Ljava/lang/Object;
+.source "Setter.java"
 
 
 # annotations
diff --git a/com.discord/smali/butterknife/Unbinder$-CC.smali b/com.discord/smali/butterknife/Unbinder$-CC.smali
index 1f63c20d5e..5fb7d288a4 100644
--- a/com.discord/smali/butterknife/Unbinder$-CC.smali
+++ b/com.discord/smali/butterknife/Unbinder$-CC.smali
@@ -1,5 +1,6 @@
 .class public final synthetic Lbutterknife/Unbinder$-CC;
 .super Ljava/lang/Object;
+.source "Unbinder.java"
 
 
 # direct methods
diff --git a/com.discord/smali/butterknife/Unbinder.smali b/com.discord/smali/butterknife/Unbinder.smali
index 46eb1acf8a..a08ab48408 100644
--- a/com.discord/smali/butterknife/Unbinder.smali
+++ b/com.discord/smali/butterknife/Unbinder.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lbutterknife/Unbinder;
 .super Ljava/lang/Object;
+.source "Unbinder.java"
 
 
 # static fields
diff --git a/com.discord/smali/butterknife/ViewCollections.smali b/com.discord/smali/butterknife/ViewCollections.smali
index 49d1876888..130ed9f979 100644
--- a/com.discord/smali/butterknife/ViewCollections.smali
+++ b/com.discord/smali/butterknife/ViewCollections.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/ViewCollections;
 .super Ljava/lang/Object;
+.source "ViewCollections.java"
 
 
 # direct methods
diff --git a/com.discord/smali/butterknife/a/a.smali b/com.discord/smali/butterknife/a/a.smali
index aab3db17e9..76c3f21e52 100644
--- a/com.discord/smali/butterknife/a/a.smali
+++ b/com.discord/smali/butterknife/a/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lbutterknife/a/a;
 .super Ljava/lang/Object;
+.source "DebouncingOnClickListener.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/butterknife/a/b.smali b/com.discord/smali/butterknife/a/b.smali
index 9b5656bfe1..a003f3649e 100644
--- a/com.discord/smali/butterknife/a/b.smali
+++ b/com.discord/smali/butterknife/a/b.smali
@@ -1,5 +1,6 @@
 .class final Lbutterknife/a/b;
 .super Ljava/util/AbstractList;
+.source "ImmutableList.java"
 
 # interfaces
 .implements Ljava/util/RandomAccess;
diff --git a/com.discord/smali/butterknife/a/c.smali b/com.discord/smali/butterknife/a/c.smali
index 20bf39598b..bb63eef5b8 100644
--- a/com.discord/smali/butterknife/a/c.smali
+++ b/com.discord/smali/butterknife/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/a/c;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 
 # static fields
@@ -279,11 +280,11 @@
     :try_start_0
     invoke-virtual {p3, p0}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object p3
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p3
+    return-object p0
 
     :catch_0
     move-exception p3
diff --git a/com.discord/smali/butterknife/runtime/R.smali b/com.discord/smali/butterknife/runtime/R.smali
index a999348b18..faafe101cf 100644
--- a/com.discord/smali/butterknife/runtime/R.smali
+++ b/com.discord/smali/butterknife/runtime/R.smali
@@ -1,5 +1,6 @@
 .class public final Lbutterknife/runtime/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/c/a/a/a.smali b/com.discord/smali/c/a/a/a.smali
index 7125879803..5ff7730981 100644
--- a/com.discord/smali/c/a/a/a.smali
+++ b/com.discord/smali/c/a/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lc/a/a/a;
 .super Ljava/lang/Object;
+.source "MurmurHash3.java"
 
 
 # direct methods
diff --git a/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali b/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali
index ebcae5b24a..2e832a1f88 100644
--- a/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali
+++ b/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/AudioInputDeviceDescription;
 .super Ljava/lang/Object;
+.source "DeviceDescription.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali b/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali
index 802723cf5f..ec6e45efd4 100644
--- a/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali
+++ b/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/AudioOutputDeviceDescription;
 .super Ljava/lang/Object;
+.source "DeviceDescription.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/CameraVideoSource.smali b/com.discord/smali/co/discord/media_engine/CameraVideoSource.smali
index bd761f9d14..7bea0c20b9 100644
--- a/com.discord/smali/co/discord/media_engine/CameraVideoSource.smali
+++ b/com.discord/smali/co/discord/media_engine/CameraVideoSource.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/CameraVideoSource;
 .super Ljava/lang/Object;
+.source "CameraVideoSource.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoCapturer$CapturerObserver;
@@ -96,8 +97,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lco/discord/media_engine/CameraVideoSource;->videoCapturer_:Lorg/webrtc/VideoCapturer;
-
     invoke-interface {v0}, Lorg/webrtc/VideoCapturer;->stopCapture()V
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
@@ -185,8 +184,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lco/discord/media_engine/CameraVideoSource;->videoCapturer_:Lorg/webrtc/VideoCapturer;
-
     invoke-interface {v0, p1, p2, p3}, Lorg/webrtc/VideoCapturer;->changeCaptureFormat(III)V
 
     return-void
diff --git a/com.discord/smali/co/discord/media_engine/DeviceType.smali b/com.discord/smali/co/discord/media_engine/DeviceType.smali
index d887b6b50f..21a8b536e9 100644
--- a/com.discord/smali/co/discord/media_engine/DeviceType.smali
+++ b/com.discord/smali/co/discord/media_engine/DeviceType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lco/discord/media_engine/DeviceType;
 .super Ljava/lang/Enum;
+.source "DeviceDescription.kt"
 
 
 # annotations
diff --git a/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali b/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali
index 17ffeb2b8f..0aa935bdcd 100644
--- a/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/InboundRtpAudio;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
@@ -132,7 +133,7 @@
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/InboundRtpAudio;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;IIIFFZIIIIIIIIIILjava/lang/Object;)Lco/discord/media_engine/InboundRtpAudio;
-    .locals 20
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -306,7 +307,7 @@
     move/from16 v15, p14
 
     :goto_d
-    move/from16 v16, v15
+    move/from16 p14, v15
 
     and-int/lit16 v15, v1, 0x4000
 
@@ -320,45 +321,45 @@
     move/from16 v15, p15
 
     :goto_e
-    const v17, 0x8000
+    const v16, 0x8000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_f
+    if-eqz v16, :cond_f
 
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     iget v15, v0, Lco/discord/media_engine/InboundRtpAudio;->decodingNormal:I
 
     goto :goto_f
 
     :cond_f
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     move/from16 v15, p16
 
     :goto_f
-    const/high16 v17, 0x10000
+    const/high16 v16, 0x10000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_10
+    if-eqz v16, :cond_10
 
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     iget v15, v0, Lco/discord/media_engine/InboundRtpAudio;->decodingPLC:I
 
     goto :goto_10
 
     :cond_10
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     move/from16 v15, p17
 
     :goto_10
-    const/high16 v17, 0x20000
+    const/high16 v16, 0x20000
 
-    and-int v1, v1, v17
+    and-int v1, v1, v16
 
     if-eqz v1, :cond_11
 
@@ -396,12 +397,6 @@
 
     move/from16 p13, v14
 
-    move/from16 p14, v16
-
-    move/from16 p15, v18
-
-    move/from16 p16, v19
-
     move/from16 p17, v15
 
     move/from16 p18, v1
diff --git a/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali b/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali
index d9a9959e24..79acc3e7f0 100644
--- a/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/InboundRtpVideo;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
@@ -148,7 +149,7 @@
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/InboundRtpVideo;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;IIIFIILco/discord/media_engine/Resolution;IIIIIIIIIIILjava/lang/Object;)Lco/discord/media_engine/InboundRtpVideo;
-    .locals 22
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -322,7 +323,7 @@
     move/from16 v15, p14
 
     :goto_d
-    move/from16 v16, v15
+    move/from16 p14, v15
 
     and-int/lit16 v15, v1, 0x4000
 
@@ -336,81 +337,81 @@
     move/from16 v15, p15
 
     :goto_e
-    const v17, 0x8000
+    const v16, 0x8000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_f
+    if-eqz v16, :cond_f
 
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     iget v15, v0, Lco/discord/media_engine/InboundRtpVideo;->frameRateRender:I
 
     goto :goto_f
 
     :cond_f
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     move/from16 v15, p16
 
     :goto_f
-    const/high16 v17, 0x10000
+    const/high16 v16, 0x10000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_10
+    if-eqz v16, :cond_10
 
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     iget v15, v0, Lco/discord/media_engine/InboundRtpVideo;->firCount:I
 
     goto :goto_10
 
     :cond_10
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     move/from16 v15, p17
 
     :goto_10
-    const/high16 v17, 0x20000
+    const/high16 v16, 0x20000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_11
+    if-eqz v16, :cond_11
 
-    move/from16 v20, v15
+    move/from16 p17, v15
 
     iget v15, v0, Lco/discord/media_engine/InboundRtpVideo;->nackCount:I
 
     goto :goto_11
 
     :cond_11
-    move/from16 v20, v15
+    move/from16 p17, v15
 
     move/from16 v15, p18
 
     :goto_11
-    const/high16 v17, 0x40000
+    const/high16 v16, 0x40000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_12
+    if-eqz v16, :cond_12
 
-    move/from16 v21, v15
+    move/from16 p18, v15
 
     iget v15, v0, Lco/discord/media_engine/InboundRtpVideo;->pliCount:I
 
     goto :goto_12
 
     :cond_12
-    move/from16 v21, v15
+    move/from16 p18, v15
 
     move/from16 v15, p19
 
     :goto_12
-    const/high16 v17, 0x80000
+    const/high16 v16, 0x80000
 
-    and-int v1, v1, v17
+    and-int v1, v1, v16
 
     if-eqz v1, :cond_13
 
@@ -448,16 +449,6 @@
 
     move/from16 p13, v14
 
-    move/from16 p14, v16
-
-    move/from16 p15, v18
-
-    move/from16 p16, v19
-
-    move/from16 p17, v20
-
-    move/from16 p18, v21
-
     move/from16 p19, v15
 
     move/from16 p20, v1
diff --git a/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali b/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
index 8d783a9578..b94f3315aa 100644
--- a/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/OutboundRtpAudio;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali b/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali
index 3a28e9ae73..83793e44b5 100644
--- a/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/OutboundRtpVideo;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
@@ -166,7 +167,7 @@
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/OutboundRtpVideo;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;IIIFIIIIILco/discord/media_engine/Resolution;IIIIIIIIZZILjava/lang/Object;)Lco/discord/media_engine/OutboundRtpVideo;
-    .locals 25
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -340,7 +341,7 @@
     move/from16 v15, p14
 
     :goto_d
-    move/from16 v16, v15
+    move/from16 p14, v15
 
     and-int/lit16 v15, v1, 0x4000
 
@@ -354,135 +355,135 @@
     move/from16 v15, p15
 
     :goto_e
-    const v17, 0x8000
+    const v16, 0x8000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_f
+    if-eqz v16, :cond_f
 
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     iget v15, v0, Lco/discord/media_engine/OutboundRtpVideo;->frameRateInput:I
 
     goto :goto_f
 
     :cond_f
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     move/from16 v15, p16
 
     :goto_f
-    const/high16 v17, 0x10000
+    const/high16 v16, 0x10000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_10
+    if-eqz v16, :cond_10
 
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     iget v15, v0, Lco/discord/media_engine/OutboundRtpVideo;->frameRateEncode:I
 
     goto :goto_10
 
     :cond_10
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     move/from16 v15, p17
 
     :goto_10
-    const/high16 v17, 0x20000
+    const/high16 v16, 0x20000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_11
+    if-eqz v16, :cond_11
 
-    move/from16 v20, v15
+    move/from16 p17, v15
 
     iget v15, v0, Lco/discord/media_engine/OutboundRtpVideo;->firCount:I
 
     goto :goto_11
 
     :cond_11
-    move/from16 v20, v15
+    move/from16 p17, v15
 
     move/from16 v15, p18
 
     :goto_11
-    const/high16 v17, 0x40000
+    const/high16 v16, 0x40000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_12
+    if-eqz v16, :cond_12
 
-    move/from16 v21, v15
+    move/from16 p18, v15
 
     iget v15, v0, Lco/discord/media_engine/OutboundRtpVideo;->nackCount:I
 
     goto :goto_12
 
     :cond_12
-    move/from16 v21, v15
+    move/from16 p18, v15
 
     move/from16 v15, p19
 
     :goto_12
-    const/high16 v17, 0x80000
+    const/high16 v16, 0x80000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_13
+    if-eqz v16, :cond_13
 
-    move/from16 v22, v15
+    move/from16 p19, v15
 
     iget v15, v0, Lco/discord/media_engine/OutboundRtpVideo;->pliCount:I
 
     goto :goto_13
 
     :cond_13
-    move/from16 v22, v15
+    move/from16 p19, v15
 
     move/from16 v15, p20
 
     :goto_13
-    const/high16 v17, 0x100000
+    const/high16 v16, 0x100000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_14
+    if-eqz v16, :cond_14
 
-    move/from16 v23, v15
+    move/from16 p20, v15
 
     iget v15, v0, Lco/discord/media_engine/OutboundRtpVideo;->qpSum:I
 
     goto :goto_14
 
     :cond_14
-    move/from16 v23, v15
+    move/from16 p20, v15
 
     move/from16 v15, p21
 
     :goto_14
-    const/high16 v17, 0x200000
+    const/high16 v16, 0x200000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_15
+    if-eqz v16, :cond_15
 
-    move/from16 v24, v15
+    move/from16 p21, v15
 
     iget-boolean v15, v0, Lco/discord/media_engine/OutboundRtpVideo;->bandwidthLimitedResolution:Z
 
     goto :goto_15
 
     :cond_15
-    move/from16 v24, v15
+    move/from16 p21, v15
 
     move/from16 v15, p22
 
     :goto_15
-    const/high16 v17, 0x400000
+    const/high16 v16, 0x400000
 
-    and-int v1, v1, v17
+    and-int v1, v1, v16
 
     if-eqz v1, :cond_16
 
@@ -520,22 +521,6 @@
 
     move-object/from16 p13, v14
 
-    move/from16 p14, v16
-
-    move/from16 p15, v18
-
-    move/from16 p16, v19
-
-    move/from16 p17, v20
-
-    move/from16 p18, v21
-
-    move/from16 p19, v22
-
-    move/from16 p20, v23
-
-    move/from16 p21, v24
-
     move/from16 p22, v15
 
     move/from16 p23, v1
diff --git a/com.discord/smali/co/discord/media_engine/Resolution.smali b/com.discord/smali/co/discord/media_engine/Resolution.smali
index cf13e604c9..aa2a629c53 100644
--- a/com.discord/smali/co/discord/media_engine/Resolution.smali
+++ b/com.discord/smali/co/discord/media_engine/Resolution.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/Resolution;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/Stats.smali b/com.discord/smali/co/discord/media_engine/Stats.smali
index b927952324..209de3d251 100644
--- a/com.discord/smali/co/discord/media_engine/Stats.smali
+++ b/com.discord/smali/co/discord/media_engine/Stats.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/Stats;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/StatsCodec.smali b/com.discord/smali/co/discord/media_engine/StatsCodec.smali
index bf884e9c8f..da40ca99a2 100644
--- a/com.discord/smali/co/discord/media_engine/StatsCodec.smali
+++ b/com.discord/smali/co/discord/media_engine/StatsCodec.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/StatsCodec;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/Transport.smali b/com.discord/smali/co/discord/media_engine/Transport.smali
index cf944ab87e..bedb1711e9 100644
--- a/com.discord/smali/co/discord/media_engine/Transport.smali
+++ b/com.discord/smali/co/discord/media_engine/Transport.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/Transport;
 .super Ljava/lang/Object;
+.source "Statistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali b/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali
index aded0047a7..15a13ca70b 100644
--- a/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/VideoInputDeviceDescription;
 .super Ljava/lang/Object;
+.source "DeviceDescription.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/VideoInputDeviceFacing.smali b/com.discord/smali/co/discord/media_engine/VideoInputDeviceFacing.smali
index 3ec2c776fd..e4f75968fe 100644
--- a/com.discord/smali/co/discord/media_engine/VideoInputDeviceFacing.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoInputDeviceFacing.smali
@@ -1,5 +1,6 @@
 .class public final enum Lco/discord/media_engine/VideoInputDeviceFacing;
 .super Ljava/lang/Enum;
+.source "DeviceDescription.kt"
 
 
 # annotations
diff --git a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali
index 2b16b8c2d1..9da3ef1e7f 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lco/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2;
 .super Ljava/lang/Object;
+.source "VideoStreamRenderer.kt"
 
 # interfaces
 .implements Lcom/hammerandchisel/libdiscord/Discord$VideoFrameCallback;
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 962febedff..fce777bb5a 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
@@ -1,5 +1,6 @@
 .class final Lco/discord/media_engine/VideoStreamRenderer$Muxer;
 .super Ljava/lang/Object;
+.source "VideoStreamRenderer.kt"
 
 
 # annotations
diff --git a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali
index db3c0a7102..099d7655fc 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali
@@ -1,5 +1,6 @@
 .class public Lco/discord/media_engine/VideoStreamRenderer;
 .super Lorg/webrtc/SurfaceViewRenderer;
+.source "VideoStreamRenderer.kt"
 
 
 # annotations
@@ -149,9 +150,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_1
 
@@ -193,9 +194,12 @@
 
     if-nez p2, :cond_4
 
-    const/4 v1, 0x1
+    goto :goto_1
 
     :cond_4
+    const/4 v1, 0x0
+
+    :goto_1
     if-nez v1, :cond_5
 
     invoke-static {}, Lco/discord/media_engine/CameraVideoSource;->getEglContext()Lorg/webrtc/EglBase$Context;
diff --git a/com.discord/smali/co/discord/media_engine/internal/DeviceInfo.smali b/com.discord/smali/co/discord/media_engine/internal/DeviceInfo.smali
index 5d92942232..d2179b09f6 100644
--- a/com.discord/smali/co/discord/media_engine/internal/DeviceInfo.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/DeviceInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/DeviceInfo;
 .super Ljava/lang/Object;
+.source "DeviceInfo.java"
 
 
 # static fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/FrameCounts.smali b/com.discord/smali/co/discord/media_engine/internal/FrameCounts.smali
index 82c26be445..08e1d8a230 100644
--- a/com.discord/smali/co/discord/media_engine/internal/FrameCounts.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/FrameCounts.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/FrameCounts;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/Inbound.smali b/com.discord/smali/co/discord/media_engine/internal/Inbound.smali
index 929146d6e5..1737ca200a 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Inbound.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Inbound.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/Inbound;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali b/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali
index a462d8d8b7..5be7658250 100644
--- a/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/InboundAudio;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
@@ -128,7 +129,7 @@
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/InboundAudio;IILjava/lang/String;IIIIIIIFIIIIIIIILjava/lang/Object;)Lco/discord/media_engine/internal/InboundAudio;
-    .locals 20
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -302,7 +303,7 @@
     move/from16 v15, p14
 
     :goto_d
-    move/from16 v16, v15
+    move/from16 p14, v15
 
     and-int/lit16 v15, v1, 0x4000
 
@@ -316,45 +317,45 @@
     move/from16 v15, p15
 
     :goto_e
-    const v17, 0x8000
+    const v16, 0x8000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_f
+    if-eqz v16, :cond_f
 
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     iget v15, v0, Lco/discord/media_engine/internal/InboundAudio;->packetsReceived:I
 
     goto :goto_f
 
     :cond_f
-    move/from16 v18, v15
+    move/from16 p15, v15
 
     move/from16 v15, p16
 
     :goto_f
-    const/high16 v17, 0x10000
+    const/high16 v16, 0x10000
 
-    and-int v17, v1, v17
+    and-int v16, v1, v16
 
-    if-eqz v17, :cond_10
+    if-eqz v16, :cond_10
 
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     iget v15, v0, Lco/discord/media_engine/internal/InboundAudio;->speaking:I
 
     goto :goto_10
 
     :cond_10
-    move/from16 v19, v15
+    move/from16 p16, v15
 
     move/from16 v15, p17
 
     :goto_10
-    const/high16 v17, 0x20000
+    const/high16 v16, 0x20000
 
-    and-int v1, v1, v17
+    and-int v1, v1, v16
 
     if-eqz v1, :cond_11
 
@@ -392,12 +393,6 @@
 
     move/from16 p13, v14
 
-    move/from16 p14, v16
-
-    move/from16 p15, v18
-
-    move/from16 p16, v19
-
     move/from16 p17, v15
 
     move/from16 p18, v1
@@ -556,7 +551,7 @@
 .end method
 
 .method public final copy(IILjava/lang/String;IIIIIIIFIIIIIII)Lco/discord/media_engine/internal/InboundAudio;
-    .locals 21
+    .locals 20
 
     move/from16 v1, p1
 
@@ -596,21 +591,19 @@
 
     const-string v0, "codecName"
 
-    move/from16 v19, v1
-
     move-object/from16 v1, p3
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v20, Lco/discord/media_engine/internal/InboundAudio;
+    new-instance v19, Lco/discord/media_engine/internal/InboundAudio;
 
-    move-object/from16 v0, v20
+    move-object/from16 v0, v19
 
-    move/from16 v1, v19
+    move/from16 v1, p1
 
     invoke-direct/range {v0 .. v18}, Lco/discord/media_engine/internal/InboundAudio;-><init>(IILjava/lang/String;IIIIIIIFIIIIIII)V
 
-    return-object v20
+    return-object v19
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali b/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali
index d41b7c4a5e..6480c9eed8 100644
--- a/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/InboundVideo;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
@@ -128,7 +129,7 @@
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/InboundVideo;Ljava/lang/String;IIIILco/discord/media_engine/internal/FrameCounts;IIIIILco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;IIIILjava/lang/Object;)Lco/discord/media_engine/internal/InboundVideo;
-    .locals 18
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -302,7 +303,7 @@
     move/from16 v15, p14
 
     :goto_d
-    move/from16 v16, v15
+    move/from16 p14, v15
 
     and-int/lit16 v15, v1, 0x4000
 
@@ -316,9 +317,9 @@
     move/from16 v15, p15
 
     :goto_e
-    const v17, 0x8000
+    const v16, 0x8000
 
-    and-int v1, v1, v17
+    and-int v1, v1, v16
 
     if-eqz v1, :cond_f
 
@@ -356,8 +357,6 @@
 
     move-object/from16 p13, v14
 
-    move/from16 p14, v16
-
     move/from16 p15, v15
 
     move/from16 p16, v1
diff --git a/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali b/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali
index 66f0af5063..dde4ac0855 100644
--- a/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/NativeStats;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/Outbound.smali b/com.discord/smali/co/discord/media_engine/internal/Outbound.smali
index 7abc4307c7..02162721f6 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Outbound.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Outbound.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/Outbound;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali b/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
index 8430223b21..489fafd2f0 100644
--- a/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/OutboundAudio;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali b/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali
index e7a2e89afe..ee0a165d2f 100644
--- a/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/OutboundVideo;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/PacketStats.smali b/com.discord/smali/co/discord/media_engine/internal/PacketStats.smali
index bdde101c18..99578b7c0b 100644
--- a/com.discord/smali/co/discord/media_engine/internal/PacketStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/PacketStats.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/PacketStats;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/RtcpStats.smali b/com.discord/smali/co/discord/media_engine/internal/RtcpStats.smali
index f4bd5fc617..f7c5b103e4 100644
--- a/com.discord/smali/co/discord/media_engine/internal/RtcpStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/RtcpStats.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/RtcpStats;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali b/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali
index 53523f61a1..06ebbe9a58 100644
--- a/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/RtpStats;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/co/discord/media_engine/internal/Substream.smali b/com.discord/smali/co/discord/media_engine/internal/Substream.smali
index a0d1a38ed2..69f7d09cc6 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Substream.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Substream.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/Substream;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
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 3ab936f076..f518e0b329 100644
--- a/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/TransformStats;
 .super Ljava/lang/Object;
+.source "TransformStats.kt"
 
 
 # static fields
@@ -600,14 +601,16 @@
 
     invoke-direct/range {v21 .. v44}, Lco/discord/media_engine/OutboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;IIIFIIIIILco/discord/media_engine/Resolution;IIIIIIIIZZ)V
 
+    move v13, v6
+
     goto :goto_8
 
     :cond_8
     move-object/from16 v21, v3
 
-    :goto_8
     move v13, v6
 
+    :goto_8
     new-instance v1, Ljava/util/LinkedHashMap;
 
     invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
diff --git a/com.discord/smali/co/discord/media_engine/internal/Transport.smali b/com.discord/smali/co/discord/media_engine/internal/Transport.smali
index 0af62ab628..b5193509d3 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Transport.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Transport.smali
@@ -1,5 +1,6 @@
 .class public final Lco/discord/media_engine/internal/Transport;
 .super Ljava/lang/Object;
+.source "NativeStatistics.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/AdjustConfig.smali b/com.discord/smali/com/adjust/sdk/AdjustConfig.smali
index 7b445320ec..10c3e3ad82 100644
--- a/com.discord/smali/com/adjust/sdk/AdjustConfig.smali
+++ b/com.discord/smali/com/adjust/sdk/AdjustConfig.smali
@@ -1,5 +1,6 @@
 .class public Lcom/adjust/sdk/AdjustConfig;
 .super Ljava/lang/Object;
+.source "AdjustConfig.java"
 
 
 # instance fields
@@ -112,10 +113,9 @@
     :goto_0
     if-nez v0, :cond_1
 
-    :goto_1
     const/4 v1, 0x0
 
-    goto :goto_7
+    goto :goto_3
 
     :cond_1
     if-nez p3, :cond_2
@@ -126,12 +126,11 @@
 
     new-array v4, v2, [Ljava/lang/Object;
 
-    :goto_2
     invoke-interface {v0, v3, v4}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
     const/4 v0, 0x0
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_2
     const-string v0, "sandbox"
@@ -146,14 +145,13 @@
 
     const-string v3, "SANDBOX: Adjust is running in Sandbox mode. Use this setting for testing. Don\'t forget to set the environment to `production` before publishing!"
 
-    :goto_3
     new-array v4, v2, [Ljava/lang/Object;
 
     invoke-interface {v0, v3, v4}, Lcom/adjust/sdk/x;->e(Ljava/lang/String;[Ljava/lang/Object;)V
 
     const/4 v0, 0x1
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_3
     const-string v0, "production"
@@ -168,7 +166,13 @@
 
     const-string v3, "PRODUCTION: Adjust is running in Production mode. Use this setting only for the build that you want to publish. Set the environment to `sandbox` if you want to test your app!"
 
-    goto :goto_3
+    new-array v4, v2, [Ljava/lang/Object;
+
+    invoke-interface {v0, v3, v4}, Lcom/adjust/sdk/x;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    const/4 v0, 0x1
+
+    goto :goto_1
 
     :cond_4
     iget-object v0, p0, Lcom/adjust/sdk/AdjustConfig;->cj:Lcom/adjust/sdk/x;
@@ -179,12 +183,16 @@
 
     aput-object p3, v4, v2
 
-    goto :goto_2
+    invoke-interface {v0, v3, v4}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_4
+    const/4 v0, 0x0
+
+    :goto_1
     if-nez v0, :cond_5
 
-    goto :goto_1
+    const/4 v1, 0x0
+
+    goto :goto_3
 
     :cond_5
     if-nez p1, :cond_6
@@ -193,14 +201,13 @@
 
     const-string v3, "Missing context"
 
-    :goto_5
     new-array v4, v2, [Ljava/lang/Object;
 
     invoke-interface {v0, v3, v4}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
     const/4 v0, 0x0
 
-    goto :goto_6
+    goto :goto_2
 
     :cond_6
     const-string v0, "android.permission.INTERNET"
@@ -215,18 +222,24 @@
 
     const-string v3, "Missing permission: INTERNET"
 
-    goto :goto_5
+    new-array v4, v2, [Ljava/lang/Object;
+
+    invoke-interface {v0, v3, v4}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    const/4 v0, 0x0
+
+    goto :goto_2
 
     :cond_7
     const/4 v0, 0x1
 
-    :goto_6
+    :goto_2
     if-nez v0, :cond_8
 
-    goto :goto_1
+    const/4 v1, 0x0
 
     :cond_8
-    :goto_7
+    :goto_3
     if-eqz v1, :cond_9
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
diff --git a/com.discord/smali/com/adjust/sdk/a$1.smali b/com.discord/smali/com/adjust/sdk/a$1.smali
index 2320a1f7f7..360e93a768 100644
--- a/com.discord/smali/com/adjust/sdk/a$1.smali
+++ b/com.discord/smali/com/adjust/sdk/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$1;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$10.smali b/com.discord/smali/com/adjust/sdk/a$10.smali
index b7e314719f..57d5b3dbb6 100644
--- a/com.discord/smali/com/adjust/sdk/a$10.smali
+++ b/com.discord/smali/com/adjust/sdk/a$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$10;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$11.smali b/com.discord/smali/com/adjust/sdk/a$11.smali
index 9ae5fd361b..011c948b69 100644
--- a/com.discord/smali/com/adjust/sdk/a$11.smali
+++ b/com.discord/smali/com/adjust/sdk/a$11.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$11;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$12.smali b/com.discord/smali/com/adjust/sdk/a$12.smali
index 4a2952dcf3..ce12304754 100644
--- a/com.discord/smali/com/adjust/sdk/a$12.smali
+++ b/com.discord/smali/com/adjust/sdk/a$12.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$12;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Lcom/adjust/sdk/aa;
diff --git a/com.discord/smali/com/adjust/sdk/a$13.smali b/com.discord/smali/com/adjust/sdk/a$13.smali
index 0afb35be7c..c0cf552adb 100644
--- a/com.discord/smali/com/adjust/sdk/a$13.smali
+++ b/com.discord/smali/com/adjust/sdk/a$13.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$13;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$14.smali b/com.discord/smali/com/adjust/sdk/a$14.smali
index cc28ac49ff..d06d5fe79a 100644
--- a/com.discord/smali/com/adjust/sdk/a$14.smali
+++ b/com.discord/smali/com/adjust/sdk/a$14.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$14;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$15.smali b/com.discord/smali/com/adjust/sdk/a$15.smali
index 566d3e08b1..ad6fe28953 100644
--- a/com.discord/smali/com/adjust/sdk/a$15.smali
+++ b/com.discord/smali/com/adjust/sdk/a$15.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$15;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$16.smali b/com.discord/smali/com/adjust/sdk/a$16.smali
index ee288be8ca..7d47c5fab4 100644
--- a/com.discord/smali/com/adjust/sdk/a$16.smali
+++ b/com.discord/smali/com/adjust/sdk/a$16.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$16;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$17.smali b/com.discord/smali/com/adjust/sdk/a$17.smali
index 3e8c742291..b5aa93b8d4 100644
--- a/com.discord/smali/com/adjust/sdk/a$17.smali
+++ b/com.discord/smali/com/adjust/sdk/a$17.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$17;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$18.smali b/com.discord/smali/com/adjust/sdk/a$18.smali
index 76a641cc21..f981ae934a 100644
--- a/com.discord/smali/com/adjust/sdk/a$18.smali
+++ b/com.discord/smali/com/adjust/sdk/a$18.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$18;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$19.smali b/com.discord/smali/com/adjust/sdk/a$19.smali
index 71dfa37287..362f24da6e 100644
--- a/com.discord/smali/com/adjust/sdk/a$19.smali
+++ b/com.discord/smali/com/adjust/sdk/a$19.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$19;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$2.smali b/com.discord/smali/com/adjust/sdk/a$2.smali
index 484247264b..c7e859e8b9 100644
--- a/com.discord/smali/com/adjust/sdk/a$2.smali
+++ b/com.discord/smali/com/adjust/sdk/a$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$2;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$20.smali b/com.discord/smali/com/adjust/sdk/a$20.smali
index 0f8f78ef98..79a7f434fd 100644
--- a/com.discord/smali/com/adjust/sdk/a$20.smali
+++ b/com.discord/smali/com/adjust/sdk/a$20.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$20;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$21.smali b/com.discord/smali/com/adjust/sdk/a$21.smali
index dff1249e73..b8fbef4fe5 100644
--- a/com.discord/smali/com/adjust/sdk/a$21.smali
+++ b/com.discord/smali/com/adjust/sdk/a$21.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$21;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -53,6 +54,8 @@
 
     if-nez v0, :cond_1
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/a$22.smali b/com.discord/smali/com/adjust/sdk/a$22.smali
index 413e1fa274..7e23f4d576 100644
--- a/com.discord/smali/com/adjust/sdk/a$22.smali
+++ b/com.discord/smali/com/adjust/sdk/a$22.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$22;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$23.smali b/com.discord/smali/com/adjust/sdk/a$23.smali
index 643e0bea32..e5e8ffd6a0 100644
--- a/com.discord/smali/com/adjust/sdk/a$23.smali
+++ b/com.discord/smali/com/adjust/sdk/a$23.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$23;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$24.smali b/com.discord/smali/com/adjust/sdk/a$24.smali
index a4dc1476b3..be721876f1 100644
--- a/com.discord/smali/com/adjust/sdk/a$24.smali
+++ b/com.discord/smali/com/adjust/sdk/a$24.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$24;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$25.smali b/com.discord/smali/com/adjust/sdk/a$25.smali
index f6681c4d3b..d2fe55f0bf 100644
--- a/com.discord/smali/com/adjust/sdk/a$25.smali
+++ b/com.discord/smali/com/adjust/sdk/a$25.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$25;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$3.smali b/com.discord/smali/com/adjust/sdk/a$3.smali
index 6401c30a03..473bf42599 100644
--- a/com.discord/smali/com/adjust/sdk/a$3.smali
+++ b/com.discord/smali/com/adjust/sdk/a$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$3;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$4.smali b/com.discord/smali/com/adjust/sdk/a$4.smali
index 2921798fd8..008e23853b 100644
--- a/com.discord/smali/com/adjust/sdk/a$4.smali
+++ b/com.discord/smali/com/adjust/sdk/a$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$4;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$5.smali b/com.discord/smali/com/adjust/sdk/a$5.smali
index 5db176332a..e76c95324d 100644
--- a/com.discord/smali/com/adjust/sdk/a$5.smali
+++ b/com.discord/smali/com/adjust/sdk/a$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$5;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$6.smali b/com.discord/smali/com/adjust/sdk/a$6.smali
index a0a35c985b..9267f136b7 100644
--- a/com.discord/smali/com/adjust/sdk/a$6.smali
+++ b/com.discord/smali/com/adjust/sdk/a$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$6;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$7.smali b/com.discord/smali/com/adjust/sdk/a$7.smali
index 13b70483f7..5b4822cec4 100644
--- a/com.discord/smali/com/adjust/sdk/a$7.smali
+++ b/com.discord/smali/com/adjust/sdk/a$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$7;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$8.smali b/com.discord/smali/com/adjust/sdk/a$8.smali
index 07da017b5e..9df6883f37 100644
--- a/com.discord/smali/com/adjust/sdk/a$8.smali
+++ b/com.discord/smali/com/adjust/sdk/a$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$8;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$9.smali b/com.discord/smali/com/adjust/sdk/a$9.smali
index 7eacc05439..960cff8d52 100644
--- a/com.discord/smali/com/adjust/sdk/a$9.smali
+++ b/com.discord/smali/com/adjust/sdk/a$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/a$9;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/a$a.smali b/com.discord/smali/com/adjust/sdk/a$a.smali
index ef412fa9cd..42d749f9ca 100644
--- a/com.discord/smali/com/adjust/sdk/a$a.smali
+++ b/com.discord/smali/com/adjust/sdk/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/a$a;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/a.smali b/com.discord/smali/com/adjust/sdk/a.smali
index cd46431fcb..b9ab745265 100644
--- a/com.discord/smali/com/adjust/sdk/a.smali
+++ b/com.discord/smali/com/adjust/sdk/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/a;
 .super Ljava/lang/Object;
+.source "ActivityHandler.java"
 
 # interfaces
 .implements Lcom/adjust/sdk/v;
@@ -123,16 +124,10 @@
 
     iput-boolean v3, p1, Lcom/adjust/sdk/a$a;->cJ:Z
 
-    iget-object p1, p0, Lcom/adjust/sdk/a;->cn:Lcom/adjust/sdk/a$a;
-
     iput-boolean v2, p1, Lcom/adjust/sdk/a$a;->cK:Z
 
-    iget-object p1, p0, Lcom/adjust/sdk/a;->cn:Lcom/adjust/sdk/a$a;
-
     iput-boolean v2, p1, Lcom/adjust/sdk/a$a;->updatePackages:Z
 
-    iget-object p1, p0, Lcom/adjust/sdk/a;->cn:Lcom/adjust/sdk/a$a;
-
     iput-boolean v2, p1, Lcom/adjust/sdk/a$a;->cM:Z
 
     iget-object p1, p0, Lcom/adjust/sdk/a;->cg:Lcom/adjust/sdk/s;
@@ -153,8 +148,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
-
     iget-boolean v0, v0, Lcom/adjust/sdk/d;->enabled:Z
 
     return v0
@@ -307,8 +300,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
-
     iput-boolean v1, v0, Lcom/adjust/sdk/d;->updatePackages:Z
 
     invoke-direct {p0}, Lcom/adjust/sdk/a;->P()V
@@ -324,8 +315,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
-
     iget-boolean v0, v0, Lcom/adjust/sdk/d;->updatePackages:Z
 
     return v0
@@ -681,13 +670,11 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->cn:Lcom/adjust/sdk/a$a;
+    iget-object v1, p0, Lcom/adjust/sdk/a;->cn:Lcom/adjust/sdk/a$a;
 
-    iget-object v1, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
+    iget-boolean v0, v0, Lcom/adjust/sdk/d;->enabled:Z
 
-    iget-boolean v1, v1, Lcom/adjust/sdk/d;->enabled:Z
-
-    iput-boolean v1, v0, Lcom/adjust/sdk/a$a;->enabled:Z
+    iput-boolean v0, v1, Lcom/adjust/sdk/a$a;->enabled:Z
 
     iget-object v0, p0, Lcom/adjust/sdk/a;->cn:Lcom/adjust/sdk/a$a;
 
@@ -1344,10 +1331,9 @@
 
     invoke-direct {v1, p0, p1}, Lcom/adjust/sdk/a$19;-><init>(Lcom/adjust/sdk/a;Lcom/adjust/sdk/au;)V
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-boolean v1, p1, Lcom/adjust/sdk/au;->fp:Z
@@ -1372,10 +1358,10 @@
 
     invoke-direct {v1, p0, p1}, Lcom/adjust/sdk/a$20;-><init>(Lcom/adjust/sdk/a;Lcom/adjust/sdk/au;)V
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
     :cond_3
-    :goto_1
+    :goto_0
     iget-object p0, p0, Lcom/adjust/sdk/a;->cn:Lcom/adjust/sdk/a$a;
 
     const/4 p1, 0x1
@@ -1412,14 +1398,13 @@
 
     const-string v3, "Event missing"
 
-    :goto_0
     new-array v4, v1, [Ljava/lang/Object;
 
     invoke-interface {v2, v3, v4}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
     const/4 v2, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object v2, p1, Lcom/adjust/sdk/g;->dv:Ljava/lang/String;
@@ -1428,24 +1413,30 @@
 
     const/4 v2, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     if-nez v2, :cond_2
 
     iget-object v2, p0, Lcom/adjust/sdk/a;->cj:Lcom/adjust/sdk/x;
 
     const-string v3, "Event not initialized correctly"
 
-    goto :goto_0
+    new-array v4, v1, [Ljava/lang/Object;
+
+    invoke-interface {v2, v3, v4}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    const/4 v2, 0x0
+
+    goto :goto_1
 
     :cond_2
     const/4 v2, 0x1
 
-    :goto_2
+    :goto_1
     if-eqz v2, :cond_a
 
     iget-object v2, p1, Lcom/adjust/sdk/g;->dy:Ljava/lang/String;
@@ -1458,7 +1449,7 @@
 
     if-eqz v3, :cond_3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     iget-object v3, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
@@ -1481,7 +1472,7 @@
 
     const/4 v2, 0x0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     iget-object v3, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
@@ -1498,11 +1489,15 @@
 
     invoke-interface {v3, v4, v5}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :cond_5
-    :goto_3
     const/4 v2, 0x1
 
-    :goto_4
+    goto :goto_3
+
+    :cond_5
+    :goto_2
+    const/4 v2, 0x1
+
+    :goto_3
     if-eqz v2, :cond_a
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
@@ -1655,14 +1650,14 @@
 
     invoke-interface {p1, v3, v0}, Lcom/adjust/sdk/x;->c(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
     iget-object p1, p0, Lcom/adjust/sdk/a;->ch:Lcom/adjust/sdk/y;
 
     invoke-interface {p1}, Lcom/adjust/sdk/y;->aj()V
 
-    :goto_5
+    :goto_4
     iget-object p1, p0, Lcom/adjust/sdk/a;->cp:Lcom/adjust/sdk/AdjustConfig;
 
     iget-boolean p1, p1, Lcom/adjust/sdk/AdjustConfig;->dm:Z
@@ -2141,12 +2136,11 @@
 
     iget-object p1, p0, Lcom/adjust/sdk/a;->cj:Lcom/adjust/sdk/x;
 
-    :goto_0
     new-array p3, v0, [Ljava/lang/Object;
 
     invoke-interface {p1, p2, p3}, Lcom/adjust/sdk/x;->c(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-direct {p0, v0}, Lcom/adjust/sdk/a;->f(Z)Z
@@ -2169,7 +2163,7 @@
 
     invoke-interface {p1, p3, p2}, Lcom/adjust/sdk/x;->c(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p1, p0, Lcom/adjust/sdk/a;->cj:Lcom/adjust/sdk/x;
@@ -2188,6 +2182,10 @@
 
     move-result-object p2
 
+    new-array p3, v0, [Ljava/lang/Object;
+
+    invoke-interface {p1, p2, p3}, Lcom/adjust/sdk/x;->c(Ljava/lang/String;[Ljava/lang/Object;)V
+
     goto :goto_0
 
     :cond_2
@@ -2197,7 +2195,7 @@
 
     invoke-interface {p1, p4, p2}, Lcom/adjust/sdk/x;->c(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     invoke-direct {p0}, Lcom/adjust/sdk/a;->I()V
 
     return-void
@@ -2258,10 +2256,9 @@
 
     if-nez v0, :cond_2
 
-    :goto_0
     monitor-exit p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object v0, p0, Lcom/adjust/sdk/a;->cq:Lcom/adjust/sdk/f;
@@ -2276,9 +2273,9 @@
 
     invoke-static {v0, v1, v2, v3}, Lcom/adjust/sdk/ay;->a(Ljava/lang/Object;Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_0
+    monitor-exit p1
 
-    :goto_1
+    :goto_0
     const/4 p1, 0x1
 
     return p1
@@ -2448,8 +2445,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
-
     iput-boolean v7, v0, Lcom/adjust/sdk/d;->updatePackages:Z
 
     invoke-direct {p0}, Lcom/adjust/sdk/a;->P()V
@@ -2609,9 +2604,9 @@
 
     const-wide/16 p1, 0x0
 
-    cmp-long v0, v2, p1
+    cmp-long v4, v2, p1
 
-    if-gez v0, :cond_2
+    if-gez v4, :cond_2
 
     iget-object p1, p0, Lcom/adjust/sdk/a;->cj:Lcom/adjust/sdk/x;
 
@@ -2624,13 +2619,11 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
+    iget-wide p1, v0, Lcom/adjust/sdk/d;->sessionLength:J
 
-    iget-wide v0, p1, Lcom/adjust/sdk/d;->sessionLength:J
+    add-long/2addr p1, v2
 
-    add-long/2addr v0, v2
-
-    iput-wide v0, p1, Lcom/adjust/sdk/d;->sessionLength:J
+    iput-wide p1, v0, Lcom/adjust/sdk/d;->sessionLength:J
 
     iget-object p1, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
 
@@ -2691,8 +2684,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
-
     iget-boolean v0, v0, Lcom/adjust/sdk/d;->enabled:Z
 
     if-eqz v0, :cond_8
@@ -2769,11 +2760,9 @@
 
     invoke-virtual {v2}, Lcom/adjust/sdk/av;->aC()V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
-    iget-object v2, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
-
     iget-wide v4, v2, Lcom/adjust/sdk/d;->lastActivity:J
 
     sub-long v4, v0, v4
@@ -2798,10 +2787,9 @@
 
     iput-wide v0, v2, Lcom/adjust/sdk/d;->lastActivity:J
 
-    :goto_0
     invoke-direct {p0}, Lcom/adjust/sdk/a;->P()V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     sget-wide v6, Lcom/adjust/sdk/a;->ce:J
@@ -2812,7 +2800,7 @@
 
     invoke-direct {p0, v0, v1}, Lcom/adjust/sdk/a;->b(J)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
     sget-wide v6, Lcom/adjust/sdk/a;->cf:J
@@ -2845,19 +2833,17 @@
 
     const-string v1, "Started subsession %d of session %d"
 
-    const/4 v4, 0x2
+    const/4 v5, 0x2
 
-    new-array v4, v4, [Ljava/lang/Object;
+    new-array v5, v5, [Ljava/lang/Object;
 
-    iget-object v5, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
+    iget v4, v4, Lcom/adjust/sdk/d;->subsessionCount:I
 
-    iget v5, v5, Lcom/adjust/sdk/d;->subsessionCount:I
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v4
 
-    move-result-object v5
-
-    aput-object v5, v4, v2
+    aput-object v4, v5, v2
 
     iget-object v2, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
 
@@ -2867,9 +2853,11 @@
 
     move-result-object v2
 
-    aput-object v2, v4, v3
+    aput-object v2, v5, v3
 
-    invoke-interface {v0, v1, v4}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-interface {v0, v1, v5}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/adjust/sdk/a;->P()V
 
     goto :goto_0
 
@@ -2882,7 +2870,7 @@
 
     invoke-interface {v0, v1, v2}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/adjust/sdk/a;->ci:Lcom/adjust/sdk/d;
 
     invoke-direct {p0, v0}, Lcom/adjust/sdk/a;->a(Lcom/adjust/sdk/d;)Z
@@ -3204,9 +3192,9 @@
 
     iget-boolean v1, v0, Lcom/adjust/sdk/aw;->fy:Z
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eqz v1, :cond_0
 
@@ -3214,13 +3202,13 @@
 
     const-string v4, "%s is already suspended"
 
-    new-array v3, v3, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
     iget-object v0, v0, Lcom/adjust/sdk/aw;->name:Ljava/lang/String;
 
-    aput-object v0, v3, v2
+    aput-object v0, v2, v3
 
-    invoke-interface {v1, v4, v3}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-interface {v1, v4, v2}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
     return-void
 
@@ -3237,7 +3225,7 @@
 
     iget-object v1, v0, Lcom/adjust/sdk/aw;->fv:Ljava/util/concurrent/ScheduledFuture;
 
-    invoke-interface {v1, v2}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
+    invoke-interface {v1, v3}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
     sget-object v1, Lcom/adjust/sdk/ay;->fB:Ljava/text/DecimalFormat;
 
@@ -3265,13 +3253,13 @@
 
     iget-object v7, v0, Lcom/adjust/sdk/aw;->name:Ljava/lang/String;
 
-    aput-object v7, v6, v2
+    aput-object v7, v6, v3
 
-    aput-object v1, v6, v3
+    aput-object v1, v6, v2
 
     invoke-interface {v4, v5, v6}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-boolean v3, v0, Lcom/adjust/sdk/aw;->fy:Z
+    iput-boolean v2, v0, Lcom/adjust/sdk/aw;->fy:Z
 
     return-void
 .end method
@@ -3421,6 +3409,8 @@
 
     invoke-virtual {v0, v1}, Lcom/adjust/sdk/s;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
+    return-void
+
     :cond_3
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/a/a.smali b/com.discord/smali/com/adjust/sdk/a/a.smali
index b449aa2d9c..5aa1816b0f 100644
--- a/com.discord/smali/com/adjust/sdk/a/a.smali
+++ b/com.discord/smali/com/adjust/sdk/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/a/a;
 .super Ljava/lang/Object;
+.source "Plugin.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/aa.smali b/com.discord/smali/com/adjust/sdk/aa.smali
index 6766441f8c..8fcefc3c27 100644
--- a/com.discord/smali/com/adjust/sdk/aa.smali
+++ b/com.discord/smali/com/adjust/sdk/aa.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/aa;
 .super Ljava/lang/Object;
+.source "IRunActivityHandler.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/ab.smali b/com.discord/smali/com/adjust/sdk/ab.smali
index 7ce787295b..ff1119cc4f 100644
--- a/com.discord/smali/com/adjust/sdk/ab.smali
+++ b/com.discord/smali/com/adjust/sdk/ab.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/ab;
 .super Ljava/lang/Object;
+.source "ISdkClickHandler.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/ac$1.smali b/com.discord/smali/com/adjust/sdk/ac$1.smali
index bb7e698538..8bb5dca28c 100644
--- a/com.discord/smali/com/adjust/sdk/ac$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ac$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ac$1;
 .super Ljava/lang/Object;
+.source "InstallReferrer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/ac.smali b/com.discord/smali/com/adjust/sdk/ac.smali
index c3fd27b633..2f466e0a21 100644
--- a/com.discord/smali/com/adjust/sdk/ac.smali
+++ b/com.discord/smali/com/adjust/sdk/ac.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/ac;
 .super Ljava/lang/Object;
+.source "InstallReferrer.java"
 
 # interfaces
 .implements Ljava/lang/reflect/InvocationHandler;
@@ -103,24 +104,22 @@
     goto :goto_0
 
     :cond_1
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
     :try_start_0
-    iget-object v2, p0, Lcom/adjust/sdk/ac;->eH:Ljava/lang/Object;
-
     const-string v3, "startConnection"
 
-    new-array v4, v1, [Ljava/lang/Class;
+    new-array v4, v2, [Ljava/lang/Class;
 
-    aput-object p1, v4, v0
+    aput-object p1, v4, v1
 
-    new-array p1, v1, [Ljava/lang/Object;
+    new-array p1, v2, [Ljava/lang/Object;
 
-    aput-object p2, p1, v0
+    aput-object p2, p1, v1
 
-    invoke-static {v2, v3, v4, p1}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v3, v4, p1}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -131,17 +130,19 @@
 
     iget-object p2, p0, Lcom/adjust/sdk/ac;->cj:Lcom/adjust/sdk/x;
 
-    const-string v2, "startConnection error (%s)"
+    const-string v0, "startConnection error (%s)"
 
-    new-array v1, v1, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
     move-result-object p1
 
-    aput-object p1, v1, v0
+    aput-object p1, v2, v1
 
-    invoke-interface {p2, v2, v1}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-interface {p2, v0, v2}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    return-void
 
     :cond_2
     :goto_0
@@ -200,25 +201,23 @@
     return-object v1
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/adjust/sdk/ac;->eH:Ljava/lang/Object;
-
     const-string v3, "getInstallReferrer"
 
-    new-array v4, v0, [Ljava/lang/Object;
+    new-array v4, v2, [Ljava/lang/Object;
 
-    invoke-static {v2, v3, v1, v4}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v3, v1, v4}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v2
+    return-object v0
 
     :catch_0
-    move-exception v2
+    move-exception v0
 
     iget-object v3, p0, Lcom/adjust/sdk/ac;->cj:Lcom/adjust/sdk/x;
 
@@ -228,11 +227,11 @@
 
     new-array v5, v5, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v0
 
-    aput-object v2, v5, v0
+    aput-object v0, v5, v2
 
     invoke-interface {v3, v4, v5}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -355,25 +354,23 @@
     return-void
 
     :cond_0
-    const/4 v0, 0x0
-
     const/4 v1, 0x0
 
-    :try_start_0
-    iget-object v2, p0, Lcom/adjust/sdk/ac;->eH:Ljava/lang/Object;
+    const/4 v2, 0x0
 
+    :try_start_0
     const-string v3, "endConnection"
 
-    new-array v4, v1, [Ljava/lang/Object;
+    new-array v4, v2, [Ljava/lang/Object;
 
-    invoke-static {v2, v3, v0, v4}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v3, v1, v4}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_0
 
     :catch_0
-    move-exception v2
+    move-exception v0
 
     iget-object v3, p0, Lcom/adjust/sdk/ac;->cj:Lcom/adjust/sdk/x;
 
@@ -383,16 +380,16 @@
 
     new-array v5, v5, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v0
 
-    aput-object v2, v5, v1
+    aput-object v0, v5, v2
 
     invoke-interface {v3, v4, v5}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
     :goto_0
-    iput-object v0, p0, Lcom/adjust/sdk/ac;->eH:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/adjust/sdk/ac;->eH:Ljava/lang/Object;
 
     return-void
 .end method
@@ -514,14 +511,20 @@
 
     invoke-interface {v2, v3, v0}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    goto/16 :goto_2
+    goto/16 :goto_0
 
     :pswitch_0
     iget-object p1, p0, Lcom/adjust/sdk/ac;->cj:Lcom/adjust/sdk/x;
 
     const-string v0, "Install referrer general errors caused by incorrect usage. Retrying ..."
 
-    goto :goto_0
+    new-array v1, v1, [Ljava/lang/Object;
+
+    invoke-interface {p1, v0, v1}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/adjust/sdk/ac;->ao()V
+
+    goto/16 :goto_0
 
     :pswitch_1
     iget-object p1, p0, Lcom/adjust/sdk/ac;->cj:Lcom/adjust/sdk/x;
@@ -532,13 +535,19 @@
 
     invoke-interface {p1, v0, v1}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_2
     iget-object p1, p0, Lcom/adjust/sdk/ac;->cj:Lcom/adjust/sdk/x;
 
     const-string v0, "Could not initiate connection to the Install Referrer service. Retrying ..."
 
+    new-array v1, v1, [Ljava/lang/Object;
+
+    invoke-interface {p1, v0, v1}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/adjust/sdk/ac;->ao()V
+
     goto :goto_0
 
     :pswitch_3
@@ -611,7 +620,7 @@
 
     monitor-exit p1
 
-    goto :goto_2
+    goto :goto_0
 
     :catchall_0
     move-exception v2
@@ -642,22 +651,22 @@
 
     invoke-interface {v2, v3, v0}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    goto :goto_1
+    invoke-direct {p0}, Lcom/adjust/sdk/ac;->ao()V
+
+    goto :goto_0
 
     :pswitch_4
     iget-object p1, p0, Lcom/adjust/sdk/ac;->cj:Lcom/adjust/sdk/x;
 
     const-string v0, "Play Store service is not connected now. Retrying ..."
 
-    :goto_0
     new-array v1, v1, [Ljava/lang/Object;
 
     invoke-interface {p1, v0, v1}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_1
     invoke-direct {p0}, Lcom/adjust/sdk/ac;->ao()V
 
-    :goto_2
+    :goto_0
     invoke-direct {p0}, Lcom/adjust/sdk/ac;->ap()V
 
     return-void
@@ -748,11 +757,11 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v3
+    return-wide v0
 
     :catch_0
     move-exception p1
@@ -803,11 +812,11 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v3
+    return-wide v0
 
     :catch_0
     move-exception p1
diff --git a/com.discord/smali/com/adjust/sdk/ad.smali b/com.discord/smali/com/adjust/sdk/ad.smali
index b5f19280f7..a45d380f12 100644
--- a/com.discord/smali/com/adjust/sdk/ad.smali
+++ b/com.discord/smali/com/adjust/sdk/ad.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/adjust/sdk/ad;
 .super Ljava/lang/Enum;
+.source "LogLevel.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/ae.smali b/com.discord/smali/com/adjust/sdk/ae.smali
index c40e4d9f76..c5bcaf480b 100644
--- a/com.discord/smali/com/adjust/sdk/ae.smali
+++ b/com.discord/smali/com/adjust/sdk/ae.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/ae;
 .super Ljava/lang/Object;
+.source "Logger.java"
 
 # interfaces
 .implements Lcom/adjust/sdk/x;
diff --git a/com.discord/smali/com/adjust/sdk/af.smali b/com.discord/smali/com/adjust/sdk/af.smali
index 2d8a4b4507..3feb101ccb 100644
--- a/com.discord/smali/com/adjust/sdk/af.smali
+++ b/com.discord/smali/com/adjust/sdk/af.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/adjust/sdk/af;
 .super Ljava/lang/Object;
+.source "OnAttributionChangedListener.java"
diff --git a/com.discord/smali/com/adjust/sdk/ag.smali b/com.discord/smali/com/adjust/sdk/ag.smali
index 48bf771ca0..d493aa8288 100644
--- a/com.discord/smali/com/adjust/sdk/ag.smali
+++ b/com.discord/smali/com/adjust/sdk/ag.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/ag;
 .super Ljava/lang/Object;
+.source "OnDeeplinkResponseListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/ah.smali b/com.discord/smali/com/adjust/sdk/ah.smali
index d690e52b04..ec0207a728 100644
--- a/com.discord/smali/com/adjust/sdk/ah.smali
+++ b/com.discord/smali/com/adjust/sdk/ah.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/adjust/sdk/ah;
 .super Ljava/lang/Object;
+.source "OnEventTrackingFailedListener.java"
diff --git a/com.discord/smali/com/adjust/sdk/ai.smali b/com.discord/smali/com/adjust/sdk/ai.smali
index ae474b97ac..aaf9597760 100644
--- a/com.discord/smali/com/adjust/sdk/ai.smali
+++ b/com.discord/smali/com/adjust/sdk/ai.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/adjust/sdk/ai;
 .super Ljava/lang/Object;
+.source "OnEventTrackingSucceededListener.java"
diff --git a/com.discord/smali/com/adjust/sdk/aj.smali b/com.discord/smali/com/adjust/sdk/aj.smali
index 8388b4bfbb..6316828d86 100644
--- a/com.discord/smali/com/adjust/sdk/aj.smali
+++ b/com.discord/smali/com/adjust/sdk/aj.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/adjust/sdk/aj;
 .super Ljava/lang/Object;
+.source "OnSessionTrackingFailedListener.java"
diff --git a/com.discord/smali/com/adjust/sdk/ak.smali b/com.discord/smali/com/adjust/sdk/ak.smali
index 8d1ab6f6c0..6b192c8a26 100644
--- a/com.discord/smali/com/adjust/sdk/ak.smali
+++ b/com.discord/smali/com/adjust/sdk/ak.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/adjust/sdk/ak;
 .super Ljava/lang/Object;
+.source "OnSessionTrackingSucceededListener.java"
diff --git a/com.discord/smali/com/adjust/sdk/al$a.smali b/com.discord/smali/com/adjust/sdk/al$a.smali
index f7f1d87337..3a371e371f 100644
--- a/com.discord/smali/com/adjust/sdk/al$a.smali
+++ b/com.discord/smali/com/adjust/sdk/al$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/al$a;
 .super Ljava/lang/Object;
+.source "PackageBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/al.smali b/com.discord/smali/com/adjust/sdk/al.smali
index 79a1ad983d..f25f6feb3a 100644
--- a/com.discord/smali/com/adjust/sdk/al.smali
+++ b/com.discord/smali/com/adjust/sdk/al.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/al;
 .super Ljava/lang/Object;
+.source "PackageBuilder.java"
 
 
 # annotations
@@ -535,9 +536,9 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/g;->dw:Ljava/lang/Double;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -545,13 +546,13 @@
 
     const-string v3, "\'%s\'"
 
-    new-array v2, v2, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
     iget-object p0, p0, Lcom/adjust/sdk/g;->dv:Ljava/lang/String;
 
-    aput-object p0, v2, v1
+    aput-object p0, v1, v2
 
-    invoke-static {v0, v3, v2}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v3, v1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -568,11 +569,11 @@
 
     iget-object v5, p0, Lcom/adjust/sdk/g;->dw:Ljava/lang/Double;
 
-    aput-object v5, v4, v1
+    aput-object v5, v4, v2
 
-    iget-object v1, p0, Lcom/adjust/sdk/g;->dx:Ljava/lang/String;
+    iget-object v2, p0, Lcom/adjust/sdk/g;->dx:Ljava/lang/String;
 
-    aput-object v1, v4, v2
+    aput-object v2, v4, v1
 
     const/4 v1, 0x2
 
@@ -1014,13 +1015,11 @@
     return-void
 
     :cond_0
-    const-string v0, "tracker"
+    const-string v1, "tracker"
 
-    iget-object v1, p0, Lcom/adjust/sdk/al;->cq:Lcom/adjust/sdk/f;
+    iget-object v0, v0, Lcom/adjust/sdk/f;->trackerName:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/adjust/sdk/f;->trackerName:Ljava/lang/String;
-
-    invoke-static {p1, v0, v1}, Lcom/adjust/sdk/al;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, v1, v0}, Lcom/adjust/sdk/al;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v0, "campaign"
 
diff --git a/com.discord/smali/com/adjust/sdk/am.smali b/com.discord/smali/com/adjust/sdk/am.smali
index 1a1ec361aa..5907accb5c 100644
--- a/com.discord/smali/com/adjust/sdk/am.smali
+++ b/com.discord/smali/com/adjust/sdk/am.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/am;
 .super Ljava/lang/Object;
+.source "PackageFactory.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/adjust/sdk/an$1.smali b/com.discord/smali/com/adjust/sdk/an$1.smali
index 07c8288c6f..00ba41ad3c 100644
--- a/com.discord/smali/com/adjust/sdk/an$1.smali
+++ b/com.discord/smali/com/adjust/sdk/an$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/an$1;
 .super Ljava/lang/Object;
+.source "PackageHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/an$2.smali b/com.discord/smali/com/adjust/sdk/an$2.smali
index 97d2ec5bbf..72777669a7 100644
--- a/com.discord/smali/com/adjust/sdk/an$2.smali
+++ b/com.discord/smali/com/adjust/sdk/an$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/an$2;
 .super Ljava/lang/Object;
+.source "PackageHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/an$3.smali b/com.discord/smali/com/adjust/sdk/an$3.smali
index 22abe12c01..3420f59f6c 100644
--- a/com.discord/smali/com/adjust/sdk/an$3.smali
+++ b/com.discord/smali/com/adjust/sdk/an$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/an$3;
 .super Ljava/lang/Object;
+.source "PackageHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/an$4.smali b/com.discord/smali/com/adjust/sdk/an$4.smali
index 0abd7b61d7..e5bee861e3 100644
--- a/com.discord/smali/com/adjust/sdk/an$4.smali
+++ b/com.discord/smali/com/adjust/sdk/an$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/an$4;
 .super Ljava/lang/Object;
+.source "PackageHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/an$5.smali b/com.discord/smali/com/adjust/sdk/an$5.smali
index b2f83d8c96..13b29971dd 100644
--- a/com.discord/smali/com/adjust/sdk/an$5.smali
+++ b/com.discord/smali/com/adjust/sdk/an$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/an$5;
 .super Ljava/lang/Object;
+.source "PackageHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/an$6.smali b/com.discord/smali/com/adjust/sdk/an$6.smali
index b622eb4d94..8e15be70ac 100644
--- a/com.discord/smali/com/adjust/sdk/an$6.smali
+++ b/com.discord/smali/com/adjust/sdk/an$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/an$6;
 .super Ljava/lang/Object;
+.source "PackageHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/an.smali b/com.discord/smali/com/adjust/sdk/an.smali
index 9d29b424a5..b1d9dd407e 100644
--- a/com.discord/smali/com/adjust/sdk/an.smali
+++ b/com.discord/smali/com/adjust/sdk/an.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/an;
 .super Ljava/lang/Object;
+.source "PackageHandler.java"
 
 # interfaces
 .implements Lcom/adjust/sdk/y;
diff --git a/com.discord/smali/com/adjust/sdk/ao.smali b/com.discord/smali/com/adjust/sdk/ao.smali
index d211a6f5be..a74f2d7ce3 100644
--- a/com.discord/smali/com/adjust/sdk/ao.smali
+++ b/com.discord/smali/com/adjust/sdk/ao.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/ao;
 .super Ljava/lang/Object;
+.source "Reflection.java"
 
 
 # direct methods
@@ -216,11 +217,11 @@
 
     invoke-static {v1, v2, v0, v3}, Lcom/adjust/sdk/ao;->a(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v1
+    return-object v0
 
     :catch_0
     return-object v0
@@ -543,7 +544,7 @@
 .end method
 
 .method public static h(Landroid/content/Context;)Ljava/lang/Boolean;
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x0
 
@@ -556,9 +557,9 @@
 
     const/4 v2, 0x0
 
-    new-array v2, v2, [Ljava/lang/Object;
+    new-array v3, v2, [Ljava/lang/Object;
 
-    invoke-static {p0, v1, v0, v2}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p0, v1, v0, v3}, Lcom/adjust/sdk/ao;->a(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -573,9 +574,12 @@
 
     move-result p0
 
-    xor-int/lit8 p0, p0, 0x1
+    if-nez p0, :cond_1
 
-    invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    const/4 v2, 0x1
+
+    :cond_1
+    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p0
     :try_end_0
diff --git a/com.discord/smali/com/adjust/sdk/ap$1.smali b/com.discord/smali/com/adjust/sdk/ap$1.smali
index 58b0bdaa6f..cac5a892b9 100644
--- a/com.discord/smali/com/adjust/sdk/ap$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ap$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ap$1;
 .super Ljava/lang/Object;
+.source "RequestHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/ap.smali b/com.discord/smali/com/adjust/sdk/ap.smali
index 52cfd69f83..9f655cb292 100644
--- a/com.discord/smali/com/adjust/sdk/ap.smali
+++ b/com.discord/smali/com/adjust/sdk/ap.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/ap;
 .super Ljava/lang/Object;
+.source "RequestHandler.java"
 
 # interfaces
 .implements Lcom/adjust/sdk/z;
diff --git a/com.discord/smali/com/adjust/sdk/aq$1.smali b/com.discord/smali/com/adjust/sdk/aq$1.smali
index 8f73c1d8fb..c6d62071cf 100644
--- a/com.discord/smali/com/adjust/sdk/aq$1.smali
+++ b/com.discord/smali/com/adjust/sdk/aq$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/adjust/sdk/aq$1;
 .super Ljava/lang/Object;
+.source "ResponseData.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/aq.smali b/com.discord/smali/com/adjust/sdk/aq.smali
index 5ecfaf18ca..98d17784dc 100644
--- a/com.discord/smali/com/adjust/sdk/aq.smali
+++ b/com.discord/smali/com/adjust/sdk/aq.smali
@@ -1,5 +1,6 @@
 .class public Lcom/adjust/sdk/aq;
 .super Ljava/lang/Object;
+.source "ResponseData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/ar$1.smali b/com.discord/smali/com/adjust/sdk/ar$1.smali
index aaf62ac27f..a36d8a94d0 100644
--- a/com.discord/smali/com/adjust/sdk/ar$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ar$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ar$1;
 .super Ljava/lang/Object;
+.source "SdkClickHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/ar$2.smali b/com.discord/smali/com/adjust/sdk/ar$2.smali
index 29efde7381..38d9d3c4bf 100644
--- a/com.discord/smali/com/adjust/sdk/ar$2.smali
+++ b/com.discord/smali/com/adjust/sdk/ar$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ar$2;
 .super Ljava/lang/Object;
+.source "SdkClickHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/ar$3.smali b/com.discord/smali/com/adjust/sdk/ar$3.smali
index 2089a34559..eabb707fcb 100644
--- a/com.discord/smali/com/adjust/sdk/ar$3.smali
+++ b/com.discord/smali/com/adjust/sdk/ar$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ar$3;
 .super Ljava/lang/Object;
+.source "SdkClickHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/ar$4.smali b/com.discord/smali/com/adjust/sdk/ar$4.smali
index f58b1a6ac9..2f614a7de8 100644
--- a/com.discord/smali/com/adjust/sdk/ar$4.smali
+++ b/com.discord/smali/com/adjust/sdk/ar$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ar$4;
 .super Ljava/lang/Object;
+.source "SdkClickHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/ar.smali b/com.discord/smali/com/adjust/sdk/ar.smali
index ce74ee142d..29427e306d 100644
--- a/com.discord/smali/com/adjust/sdk/ar.smali
+++ b/com.discord/smali/com/adjust/sdk/ar.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/ar;
 .super Ljava/lang/Object;
+.source "SdkClickHandler.java"
 
 # interfaces
 .implements Lcom/adjust/sdk/ab;
diff --git a/com.discord/smali/com/adjust/sdk/as.smali b/com.discord/smali/com/adjust/sdk/as.smali
index 0283959c2b..995b087f92 100644
--- a/com.discord/smali/com/adjust/sdk/as.smali
+++ b/com.discord/smali/com/adjust/sdk/as.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/as;
 .super Lcom/adjust/sdk/aq;
+.source "SdkClickResponseData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/at.smali b/com.discord/smali/com/adjust/sdk/at.smali
index f6a3475424..79e6d1d550 100644
--- a/com.discord/smali/com/adjust/sdk/at.smali
+++ b/com.discord/smali/com/adjust/sdk/at.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/at;
 .super Ljava/lang/Object;
+.source "SessionParameters.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/au.smali b/com.discord/smali/com/adjust/sdk/au.smali
index d93c88bbe6..faf29a134b 100644
--- a/com.discord/smali/com/adjust/sdk/au.smali
+++ b/com.discord/smali/com/adjust/sdk/au.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/au;
 .super Lcom/adjust/sdk/aq;
+.source "SessionResponseData.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/adjust/sdk/av.smali b/com.discord/smali/com/adjust/sdk/av.smali
index 853ef93907..39a27756b9 100644
--- a/com.discord/smali/com/adjust/sdk/av.smali
+++ b/com.discord/smali/com/adjust/sdk/av.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/av;
 .super Ljava/lang/Object;
+.source "SharedPreferencesManager.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/aw$1.smali b/com.discord/smali/com/adjust/sdk/aw$1.smali
index b591286871..586aa39c4c 100644
--- a/com.discord/smali/com/adjust/sdk/aw$1.smali
+++ b/com.discord/smali/com/adjust/sdk/aw$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/aw$1;
 .super Ljava/lang/Object;
+.source "TimerCycle.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/aw.smali b/com.discord/smali/com/adjust/sdk/aw.smali
index ce638529c7..5b89c1a204 100644
--- a/com.discord/smali/com/adjust/sdk/aw.smali
+++ b/com.discord/smali/com/adjust/sdk/aw.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/aw;
 .super Ljava/lang/Object;
+.source "TimerCycle.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/ax$1.smali b/com.discord/smali/com/adjust/sdk/ax$1.smali
index cf2fdc4d53..26537fd9df 100644
--- a/com.discord/smali/com/adjust/sdk/ax$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ax$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ax$1;
 .super Ljava/lang/Object;
+.source "TimerOnce.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/ax.smali b/com.discord/smali/com/adjust/sdk/ax.smali
index 0738e72f81..71bfc4c032 100644
--- a/com.discord/smali/com/adjust/sdk/ax.smali
+++ b/com.discord/smali/com/adjust/sdk/ax.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/ax;
 .super Ljava/lang/Object;
+.source "TimerOnce.java"
 
 
 # instance fields
@@ -55,8 +56,6 @@
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Lcom/adjust/sdk/ax;->fv:Ljava/util/concurrent/ScheduledFuture;
-
     sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledFuture;->getDelay(Ljava/util/concurrent/TimeUnit;)J
@@ -75,8 +74,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/adjust/sdk/ax;->fv:Ljava/util/concurrent/ScheduledFuture;
-
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
     :cond_0
diff --git a/com.discord/smali/com/adjust/sdk/ay$1.smali b/com.discord/smali/com/adjust/sdk/ay$1.smali
index 01265c142b..cf8a1420cb 100644
--- a/com.discord/smali/com/adjust/sdk/ay$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ay$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/ay$1;
 .super Landroid/os/AsyncTask;
+.source "Util.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/ay.smali b/com.discord/smali/com/adjust/sdk/ay.smali
index cdc64e0c74..4150158e3b 100644
--- a/com.discord/smali/com/adjust/sdk/ay.smali
+++ b/com.discord/smali/com/adjust/sdk/ay.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/ay;
 .super Ljava/lang/Object;
+.source "Util.java"
 
 
 # static fields
@@ -219,24 +220,24 @@
 
     move-result-object p0
     :try_end_0
-    .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_b
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_a
+    .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_7
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_6
 
     :try_start_1
     new-instance p1, Ljava/io/BufferedInputStream;
 
     invoke-direct {p1, p0}, Ljava/io/BufferedInputStream;-><init>(Ljava/io/InputStream;)V
     :try_end_1
-    .catch Ljava/io/FileNotFoundException; {:try_start_1 .. :try_end_1} :catch_9
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_8
+    .catch Ljava/io/FileNotFoundException; {:try_start_1 .. :try_end_1} :catch_8
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_5
 
     :try_start_2
     new-instance p0, Ljava/io/ObjectInputStream;
 
     invoke-direct {p0, p1}, Ljava/io/ObjectInputStream;-><init>(Ljava/io/InputStream;)V
     :try_end_2
-    .catch Ljava/io/FileNotFoundException; {:try_start_2 .. :try_end_2} :catch_7
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_6
+    .catch Ljava/io/FileNotFoundException; {:try_start_2 .. :try_end_2} :catch_4
+    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_3
 
     :try_start_3
     invoke-virtual {p0}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
@@ -245,64 +246,36 @@
 
     invoke-virtual {p3, p1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object p1
-    :try_end_3
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_3 .. :try_end_3} :catch_5
-    .catch Ljava/lang/ClassCastException; {:try_start_3 .. :try_end_3} :catch_4
-    .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_3
-    .catch Ljava/io/FileNotFoundException; {:try_start_3 .. :try_end_3} :catch_9
+    move-result-object v0
 
-    :try_start_4
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
-    move-result-object p3
+    move-result-object p1
 
-    const-string v0, "Read %s: %s"
+    const-string p3, "Read %s: %s"
 
     new-array v4, v1, [Ljava/lang/Object;
 
     aput-object p2, v4, v2
 
-    aput-object p1, v4, v3
+    aput-object v0, v4, v3
 
-    invoke-interface {p3, v0, v4}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
-    :try_end_4
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_4 .. :try_end_4} :catch_2
-    .catch Ljava/lang/ClassCastException; {:try_start_4 .. :try_end_4} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_0
-    .catch Ljava/io/FileNotFoundException; {:try_start_4 .. :try_end_4} :catch_c
+    invoke-interface {p1, p3, v4}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
+    :try_end_3
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_3 .. :try_end_3} :catch_2
+    .catch Ljava/lang/ClassCastException; {:try_start_3 .. :try_end_3} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_0
+    .catch Ljava/io/FileNotFoundException; {:try_start_3 .. :try_end_3} :catch_8
 
-    goto/16 :goto_7
+    goto/16 :goto_2
 
     :catch_0
-    move-exception p3
+    move-exception p1
 
-    move-object v0, p1
-
-    goto :goto_0
-
-    :catch_1
-    move-exception p3
-
-    move-object v0, p1
-
-    goto :goto_2
-
-    :catch_2
-    move-exception p3
-
-    move-object v0, p1
-
-    goto :goto_3
-
-    :catch_3
-    move-exception p3
-
-    :goto_0
-    :try_start_5
+    :try_start_4
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
-    move-result-object p1
+    move-result-object p3
 
     const-string v4, "Failed to read %s object (%s)"
 
@@ -310,65 +283,66 @@
 
     aput-object p2, v5, v2
 
-    invoke-virtual {p3}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
-
-    move-result-object p3
-
-    aput-object p3, v5, v3
-
-    :goto_1
-    invoke-interface {p1, v4, v5}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    goto :goto_8
-
-    :catch_4
-    move-exception p3
-
-    :goto_2
-    invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
+    invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
     move-result-object p1
 
+    aput-object p1, v5, v3
+
+    invoke-interface {p3, v4, v5}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :catch_1
+    move-exception p1
+
+    invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
+
+    move-result-object p3
+
     const-string v4, "Failed to cast %s object (%s)"
 
     new-array v5, v1, [Ljava/lang/Object;
 
     aput-object p2, v5, v2
 
-    invoke-virtual {p3}, Ljava/lang/ClassCastException;->getMessage()Ljava/lang/String;
-
-    move-result-object p3
-
-    aput-object p3, v5, v3
-
-    goto :goto_1
-
-    :catch_5
-    move-exception p3
-
-    :goto_3
-    invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
+    invoke-virtual {p1}, Ljava/lang/ClassCastException;->getMessage()Ljava/lang/String;
 
     move-result-object p1
 
+    aput-object p1, v5, v3
+
+    invoke-interface {p3, v4, v5}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :catch_2
+    move-exception p1
+
+    invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
+
+    move-result-object p3
+
     const-string v4, "Failed to find %s class (%s)"
 
     new-array v5, v1, [Ljava/lang/Object;
 
     aput-object p2, v5, v2
 
-    invoke-virtual {p3}, Ljava/lang/ClassNotFoundException;->getMessage()Ljava/lang/String;
+    invoke-virtual {p1}, Ljava/lang/ClassNotFoundException;->getMessage()Ljava/lang/String;
 
-    move-result-object p3
+    move-result-object p1
 
-    aput-object p3, v5, v3
-    :try_end_5
-    .catch Ljava/io/FileNotFoundException; {:try_start_5 .. :try_end_5} :catch_9
-    .catch Ljava/lang/Exception; {:try_start_5 .. :try_end_5} :catch_8
+    aput-object p1, v5, v3
 
-    goto :goto_1
+    invoke-interface {p3, v4, v5}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+    :try_end_4
+    .catch Ljava/io/FileNotFoundException; {:try_start_4 .. :try_end_4} :catch_8
+    .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_5
 
-    :catch_6
+    goto :goto_2
+
+    :catch_3
     move-exception p0
 
     move-object v6, p1
@@ -377,30 +351,24 @@
 
     move-object p0, v6
 
-    goto :goto_5
+    goto :goto_0
 
-    :catch_7
+    :catch_4
     move-object p0, p1
 
-    goto :goto_4
+    goto :goto_1
 
-    :catch_8
+    :catch_5
     move-exception p1
 
-    goto :goto_5
+    goto :goto_0
 
-    :catch_9
-    :goto_4
-    move-object p1, v0
-
-    goto :goto_6
-
-    :catch_a
+    :catch_6
     move-exception p1
 
     move-object p0, v0
 
-    :goto_5
+    :goto_0
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
     move-result-object p3
@@ -415,41 +383,36 @@
 
     invoke-interface {p3, v4, v5}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    goto :goto_8
+    goto :goto_2
 
-    :catch_b
+    :catch_7
     move-object p0, v0
 
-    move-object p1, p0
-
-    :catch_c
-    :goto_6
+    :catch_8
+    :goto_1
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
-    move-result-object p3
+    move-result-object p1
 
-    const-string v0, "%s file not found"
+    const-string p3, "%s file not found"
 
     new-array v4, v3, [Ljava/lang/Object;
 
     aput-object p2, v4, v2
 
-    invoke-interface {p3, v0, v4}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-interface {p1, p3, v4}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_7
-    move-object v0, p1
-
-    :goto_8
+    :goto_2
     if-eqz p0, :cond_0
 
-    :try_start_6
+    :try_start_5
     invoke-interface {p0}, Ljava/io/Closeable;->close()V
-    :try_end_6
-    .catch Ljava/lang/Exception; {:try_start_6 .. :try_end_6} :catch_d
+    :try_end_5
+    .catch Ljava/lang/Exception; {:try_start_5 .. :try_end_5} :catch_9
 
-    goto :goto_9
+    goto :goto_3
 
-    :catch_d
+    :catch_9
     move-exception p0
 
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
@@ -467,7 +430,7 @@
     invoke-interface {p1, p3, v1}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_0
-    :goto_9
+    :goto_3
     return-object v0
 .end method
 
@@ -619,9 +582,9 @@
 .method public static a(Ljava/lang/String;Ljava/lang/Throwable;)Ljava/lang/String;
     .locals 5
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
     if-eqz p1, :cond_0
 
@@ -633,9 +596,9 @@
 
     new-array v4, v4, [Ljava/lang/Object;
 
-    aput-object p0, v4, v1
+    aput-object p0, v4, v0
 
-    aput-object p1, v4, v0
+    aput-object p1, v4, v1
 
     invoke-static {v2, v3, v4}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -648,11 +611,11 @@
 
     const-string v2, "%s"
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
-    aput-object p0, v0, v1
+    aput-object p0, v1, v0
 
-    invoke-static {p1, v2, v0}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, v2, v1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -915,6 +878,8 @@
 
     invoke-interface {p1, p2, v0}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
+    return-void
+
     :cond_0
     :goto_2
     return-void
@@ -1166,11 +1131,11 @@
     :try_start_0
     invoke-virtual {p0, p1, v0, v1}, Ljava/io/ObjectInputStream$GetField;->get(Ljava/lang/String;J)J
 
-    move-result-wide v2
+    move-result-wide p0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v2
+    return-wide p0
 
     :catch_0
     move-exception p0
@@ -1561,6 +1526,8 @@
 
     const/4 p0, 0x0
 
+    return-object p0
+
     :cond_2
     return-object p0
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/az.smali b/com.discord/smali/com/adjust/sdk/az.smali
index 4f58380c10..31503c523c 100644
--- a/com.discord/smali/com/adjust/sdk/az.smali
+++ b/com.discord/smali/com/adjust/sdk/az.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/az;
 .super Ljava/lang/Object;
+.source "UtilNetworking.java"
 
 
 # static fields
@@ -347,7 +348,7 @@
 
     if-nez v0, :cond_3
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_3
     const/4 v0, 0x0
@@ -454,14 +455,17 @@
 
     invoke-interface {v1, v0, v3}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :cond_7
     :goto_3
     return-object p1
 
+    :cond_7
+    :goto_4
+    return-object p1
+
     :catchall_0
     move-exception p1
 
-    goto :goto_4
+    goto :goto_5
 
     :catch_1
     move-exception p1
@@ -483,13 +487,15 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    :goto_4
+    :goto_5
     if-eqz p0, :cond_8
 
     invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->disconnect()V
 
     :cond_8
     throw p1
+
+    return-void
 .end method
 
 .method private static a(Ljava/util/Map;I)Ljava/lang/String;
@@ -828,11 +834,9 @@
 
     if-eqz p1, :cond_0
 
-    const-string p1, "User-Agent"
+    const-string v0, "User-Agent"
 
-    sget-object v0, Lcom/adjust/sdk/az;->dp:Ljava/lang/String;
-
-    invoke-virtual {p0, p1, v0}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v0, p1}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/adjust/sdk/b$1.smali b/com.discord/smali/com/adjust/sdk/b$1.smali
index 2e08245cf9..414ea449b2 100644
--- a/com.discord/smali/com/adjust/sdk/b$1.smali
+++ b/com.discord/smali/com/adjust/sdk/b$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/adjust/sdk/b$1;
 .super Ljava/lang/Object;
+.source "ActivityKind.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/b.smali b/com.discord/smali/com/adjust/sdk/b.smali
index 95602d560d..602eaafbb2 100644
--- a/com.discord/smali/com/adjust/sdk/b.smali
+++ b/com.discord/smali/com/adjust/sdk/b.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/adjust/sdk/b;
 .super Ljava/lang/Enum;
+.source "ActivityKind.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/c.smali b/com.discord/smali/com/adjust/sdk/c.smali
index c4e99f9f61..899ce15961 100644
--- a/com.discord/smali/com/adjust/sdk/c.smali
+++ b/com.discord/smali/com/adjust/sdk/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/c;
 .super Ljava/lang/Object;
+.source "ActivityPackage.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali/com/adjust/sdk/d.smali b/com.discord/smali/com/adjust/sdk/d.smali
index a5313bfc45..c9215b9066 100644
--- a/com.discord/smali/com/adjust/sdk/d.smali
+++ b/com.discord/smali/com/adjust/sdk/d.smali
@@ -1,5 +1,6 @@
 .class public Lcom/adjust/sdk/d;
 .super Ljava/lang/Object;
+.source "ActivityState.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -575,8 +576,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/adjust/sdk/d;->orderIds:Ljava/util/LinkedList;
-
     invoke-virtual {v0, p1}, Ljava/util/LinkedList;->contains(Ljava/lang/Object;)Z
 
     move-result p1
diff --git a/com.discord/smali/com/adjust/sdk/e.smali b/com.discord/smali/com/adjust/sdk/e.smali
index 0f51550a62..0131bf4188 100644
--- a/com.discord/smali/com/adjust/sdk/e.smali
+++ b/com.discord/smali/com/adjust/sdk/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/e;
 .super Ljava/lang/Object;
+.source "Adjust.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/adjust/sdk/f.smali b/com.discord/smali/com/adjust/sdk/f.smali
index 7e866fa8d0..0c8d50c192 100644
--- a/com.discord/smali/com/adjust/sdk/f.smali
+++ b/com.discord/smali/com/adjust/sdk/f.smali
@@ -1,5 +1,6 @@
 .class public Lcom/adjust/sdk/f;
 .super Ljava/lang/Object;
+.source "AdjustAttribution.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali/com/adjust/sdk/g.smali b/com.discord/smali/com/adjust/sdk/g.smali
index 4ba49bee3e..16b2628b85 100644
--- a/com.discord/smali/com/adjust/sdk/g.smali
+++ b/com.discord/smali/com/adjust/sdk/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/g;
 .super Ljava/lang/Object;
+.source "AdjustEvent.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/adjust/sdk/h.smali b/com.discord/smali/com/adjust/sdk/h.smali
index d1965fef91..ec7220ba3a 100644
--- a/com.discord/smali/com/adjust/sdk/h.smali
+++ b/com.discord/smali/com/adjust/sdk/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/h;
 .super Ljava/lang/Object;
+.source "AdjustEventFailure.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/i.smali b/com.discord/smali/com/adjust/sdk/i.smali
index c7b95faf73..e379bd2850 100644
--- a/com.discord/smali/com/adjust/sdk/i.smali
+++ b/com.discord/smali/com/adjust/sdk/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/i;
 .super Ljava/lang/Object;
+.source "AdjustEventSuccess.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/j.smali b/com.discord/smali/com/adjust/sdk/j.smali
index 5bf39121a7..9b8b86d9ab 100644
--- a/com.discord/smali/com/adjust/sdk/j.smali
+++ b/com.discord/smali/com/adjust/sdk/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/j;
 .super Ljava/lang/Object;
+.source "AdjustFactory.java"
 
 
 # static fields
@@ -74,8 +75,6 @@
     return-wide v0
 
     :cond_0
-    sget-wide v0, Lcom/adjust/sdk/j;->dE:J
-
     return-wide v0
 .end method
 
@@ -95,8 +94,6 @@
     return-wide v0
 
     :cond_0
-    sget-wide v0, Lcom/adjust/sdk/j;->dF:J
-
     return-wide v0
 .end method
 
@@ -114,8 +111,6 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/adjust/sdk/j;->cs:Lcom/adjust/sdk/ab;
-
     invoke-interface {v0, p0, p1}, Lcom/adjust/sdk/ab;->b(Lcom/adjust/sdk/v;Z)V
 
     sget-object p0, Lcom/adjust/sdk/j;->cs:Lcom/adjust/sdk/ab;
@@ -137,8 +132,6 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/adjust/sdk/j;->cr:Lcom/adjust/sdk/w;
-
     invoke-interface {v0, p0, p1, p2}, Lcom/adjust/sdk/w;->b(Lcom/adjust/sdk/v;Lcom/adjust/sdk/c;Z)V
 
     sget-object p0, Lcom/adjust/sdk/j;->cr:Lcom/adjust/sdk/w;
@@ -160,8 +153,6 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/adjust/sdk/j;->ch:Lcom/adjust/sdk/y;
-
     invoke-interface {v0, p0, p1, p2}, Lcom/adjust/sdk/y;->b(Lcom/adjust/sdk/v;Landroid/content/Context;Z)V
 
     sget-object p0, Lcom/adjust/sdk/j;->ch:Lcom/adjust/sdk/y;
@@ -183,8 +174,6 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/adjust/sdk/j;->dB:Lcom/adjust/sdk/z;
-
     invoke-interface {v0, p0}, Lcom/adjust/sdk/z;->b(Lcom/adjust/sdk/y;)V
 
     sget-object p0, Lcom/adjust/sdk/j;->dB:Lcom/adjust/sdk/z;
@@ -219,9 +208,7 @@
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/adjust/sdk/j;->dD:Ljavax/net/ssl/HttpsURLConnection;
-
-    return-object p0
+    return-object v0
 .end method
 
 .method public static aa()J
@@ -240,8 +227,6 @@
     return-wide v0
 
     :cond_0
-    sget-wide v0, Lcom/adjust/sdk/j;->dG:J
-
     return-wide v0
 .end method
 
@@ -261,8 +246,6 @@
     return-wide v0
 
     :cond_0
-    sget-wide v0, Lcom/adjust/sdk/j;->dH:J
-
     return-wide v0
 .end method
 
@@ -278,8 +261,6 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/adjust/sdk/j;->dI:Lcom/adjust/sdk/q;
-
     return-object v0
 .end method
 
@@ -295,8 +276,6 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/adjust/sdk/j;->dJ:Lcom/adjust/sdk/q;
-
     return-object v0
 .end method
 
@@ -316,8 +295,6 @@
     return-wide v0
 
     :cond_0
-    sget-wide v0, Lcom/adjust/sdk/j;->dK:J
-
     return-wide v0
 .end method
 
@@ -458,8 +435,6 @@
     return-object v0
 
     :cond_6
-    sget-object v0, Lcom/adjust/sdk/j;->dC:Lcom/adjust/sdk/v;
-
     invoke-interface {v0, p0}, Lcom/adjust/sdk/v;->a(Lcom/adjust/sdk/AdjustConfig;)V
 
     sget-object p0, Lcom/adjust/sdk/j;->dC:Lcom/adjust/sdk/v;
diff --git a/com.discord/smali/com/adjust/sdk/k$1.smali b/com.discord/smali/com/adjust/sdk/k$1.smali
index 6d50125485..909800381c 100644
--- a/com.discord/smali/com/adjust/sdk/k$1.smali
+++ b/com.discord/smali/com/adjust/sdk/k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/k$1;
 .super Ljava/lang/Object;
+.source "AdjustInstance.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/k$2.smali b/com.discord/smali/com/adjust/sdk/k$2.smali
index 369850d658..5a9b518aeb 100644
--- a/com.discord/smali/com/adjust/sdk/k$2.smali
+++ b/com.discord/smali/com/adjust/sdk/k$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/k$2;
 .super Ljava/lang/Object;
+.source "AdjustInstance.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/k.smali b/com.discord/smali/com/adjust/sdk/k.smali
index e2238b400a..f0e52f8b85 100644
--- a/com.discord/smali/com/adjust/sdk/k.smali
+++ b/com.discord/smali/com/adjust/sdk/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/k;
 .super Ljava/lang/Object;
+.source "AdjustInstance.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/l.smali b/com.discord/smali/com/adjust/sdk/l.smali
index 5b6b6b442d..1845adaf85 100644
--- a/com.discord/smali/com/adjust/sdk/l.smali
+++ b/com.discord/smali/com/adjust/sdk/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/l;
 .super Landroid/content/BroadcastReceiver;
+.source "AdjustReferrerReceiver.java"
 
 
 # direct methods
@@ -35,7 +36,7 @@
 
     move-result-wide v5
 
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_3
 
     invoke-virtual {v4}, Ljava/lang/String;->length()I
 
@@ -79,6 +80,9 @@
     invoke-interface {p1}, Lcom/adjust/sdk/v;->G()V
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/m.smali b/com.discord/smali/com/adjust/sdk/m.smali
index c5531248b7..9f8df70a39 100644
--- a/com.discord/smali/com/adjust/sdk/m.smali
+++ b/com.discord/smali/com/adjust/sdk/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/m;
 .super Ljava/lang/Object;
+.source "AdjustSessionFailure.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/n.smali b/com.discord/smali/com/adjust/sdk/n.smali
index 576d095b4e..f263dd0427 100644
--- a/com.discord/smali/com/adjust/sdk/n.smali
+++ b/com.discord/smali/com/adjust/sdk/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/n;
 .super Ljava/lang/Object;
+.source "AdjustSessionSuccess.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/o$1.smali b/com.discord/smali/com/adjust/sdk/o$1.smali
index 92b745da2f..bd46cdff51 100644
--- a/com.discord/smali/com/adjust/sdk/o$1.smali
+++ b/com.discord/smali/com/adjust/sdk/o$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/o$1;
 .super Ljava/lang/Object;
+.source "AttributionHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/o$2.smali b/com.discord/smali/com/adjust/sdk/o$2.smali
index ae0e2b694d..677f03c3e8 100644
--- a/com.discord/smali/com/adjust/sdk/o$2.smali
+++ b/com.discord/smali/com/adjust/sdk/o$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/o$2;
 .super Ljava/lang/Object;
+.source "AttributionHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/o$3.smali b/com.discord/smali/com/adjust/sdk/o$3.smali
index a24eb4ee08..cfa67240b4 100644
--- a/com.discord/smali/com/adjust/sdk/o$3.smali
+++ b/com.discord/smali/com/adjust/sdk/o$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/o$3;
 .super Ljava/lang/Object;
+.source "AttributionHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/o$4.smali b/com.discord/smali/com/adjust/sdk/o$4.smali
index 8866aec448..b03e1a8d0e 100644
--- a/com.discord/smali/com/adjust/sdk/o$4.smali
+++ b/com.discord/smali/com/adjust/sdk/o$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/o$4;
 .super Ljava/lang/Object;
+.source "AttributionHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/o$5.smali b/com.discord/smali/com/adjust/sdk/o$5.smali
index 0bb23e674c..bb3f57034a 100644
--- a/com.discord/smali/com/adjust/sdk/o$5.smali
+++ b/com.discord/smali/com/adjust/sdk/o$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/o$5;
 .super Ljava/lang/Object;
+.source "AttributionHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/o$6.smali b/com.discord/smali/com/adjust/sdk/o$6.smali
index c74c5122fb..af889e4f09 100644
--- a/com.discord/smali/com/adjust/sdk/o$6.smali
+++ b/com.discord/smali/com/adjust/sdk/o$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/o$6;
 .super Ljava/lang/Object;
+.source "AttributionHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/o.smali b/com.discord/smali/com/adjust/sdk/o.smali
index 736eff8a70..e037064bae 100644
--- a/com.discord/smali/com/adjust/sdk/o.smali
+++ b/com.discord/smali/com/adjust/sdk/o.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/o;
 .super Ljava/lang/Object;
+.source "AttributionHandler.java"
 
 # interfaces
 .implements Lcom/adjust/sdk/w;
diff --git a/com.discord/smali/com/adjust/sdk/p.smali b/com.discord/smali/com/adjust/sdk/p.smali
index 4e8206acee..5d59cda9f3 100644
--- a/com.discord/smali/com/adjust/sdk/p.smali
+++ b/com.discord/smali/com/adjust/sdk/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/p;
 .super Lcom/adjust/sdk/aq;
+.source "AttributionResponseData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/q.smali b/com.discord/smali/com/adjust/sdk/q.smali
index 7112bb7a40..0df0194068 100644
--- a/com.discord/smali/com/adjust/sdk/q.smali
+++ b/com.discord/smali/com/adjust/sdk/q.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/adjust/sdk/q;
 .super Ljava/lang/Enum;
+.source "BackoffStrategy.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/r.smali b/com.discord/smali/com/adjust/sdk/r.smali
index 5a8dcaa67d..3bb0c1daca 100644
--- a/com.discord/smali/com/adjust/sdk/r.smali
+++ b/com.discord/smali/com/adjust/sdk/r.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/r;
 .super Ljava/lang/Object;
+.source "Constants.java"
 
 
 # static fields
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 19bfbaa25d..fe7b9f7b7f 100644
--- a/com.discord/smali/com/adjust/sdk/s$1$1.smali
+++ b/com.discord/smali/com/adjust/sdk/s$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/s$1$1;
 .super Ljava/lang/Object;
+.source "CustomScheduledExecutor.java"
 
 # interfaces
 .implements Ljava/lang/Thread$UncaughtExceptionHandler;
diff --git a/com.discord/smali/com/adjust/sdk/s$1.smali b/com.discord/smali/com/adjust/sdk/s$1.smali
index 377c896ea9..63413aa9ad 100644
--- a/com.discord/smali/com/adjust/sdk/s$1.smali
+++ b/com.discord/smali/com/adjust/sdk/s$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/s$1;
 .super Ljava/lang/Object;
+.source "CustomScheduledExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
diff --git a/com.discord/smali/com/adjust/sdk/s$2.smali b/com.discord/smali/com/adjust/sdk/s$2.smali
index f974990ac8..f30efabeb9 100644
--- a/com.discord/smali/com/adjust/sdk/s$2.smali
+++ b/com.discord/smali/com/adjust/sdk/s$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/s$2;
 .super Ljava/lang/Object;
+.source "CustomScheduledExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/RejectedExecutionHandler;
diff --git a/com.discord/smali/com/adjust/sdk/s$a.smali b/com.discord/smali/com/adjust/sdk/s$a.smali
index 83e30668d8..bd36f1f58a 100644
--- a/com.discord/smali/com/adjust/sdk/s$a.smali
+++ b/com.discord/smali/com/adjust/sdk/s$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/s$a;
 .super Ljava/lang/Object;
+.source "CustomScheduledExecutor.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/adjust/sdk/s.smali b/com.discord/smali/com/adjust/sdk/s.smali
index 8c42a2571c..f04b43a58a 100644
--- a/com.discord/smali/com/adjust/sdk/s.smali
+++ b/com.discord/smali/com/adjust/sdk/s.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/s;
 .super Ljava/lang/Object;
+.source "CustomScheduledExecutor.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/adjust/sdk/t.smali b/com.discord/smali/com/adjust/sdk/t.smali
index 10da715093..10b6d43002 100644
--- a/com.discord/smali/com/adjust/sdk/t.smali
+++ b/com.discord/smali/com/adjust/sdk/t.smali
@@ -1,5 +1,6 @@
 .class final Lcom/adjust/sdk/t;
 .super Ljava/lang/Object;
+.source "DeviceInfo.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/u.smali b/com.discord/smali/com/adjust/sdk/u.smali
index f3941a2636..04df6b68af 100644
--- a/com.discord/smali/com/adjust/sdk/u.smali
+++ b/com.discord/smali/com/adjust/sdk/u.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/adjust/sdk/u;
 .super Lcom/adjust/sdk/aq;
+.source "EventResponseData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/adjust/sdk/v.smali b/com.discord/smali/com/adjust/sdk/v.smali
index 84cc5b9956..37563b364b 100644
--- a/com.discord/smali/com/adjust/sdk/v.smali
+++ b/com.discord/smali/com/adjust/sdk/v.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/v;
 .super Ljava/lang/Object;
+.source "IActivityHandler.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/w.smali b/com.discord/smali/com/adjust/sdk/w.smali
index f4fb34588c..f771e15f8c 100644
--- a/com.discord/smali/com/adjust/sdk/w.smali
+++ b/com.discord/smali/com/adjust/sdk/w.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/w;
 .super Ljava/lang/Object;
+.source "IAttributionHandler.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/x.smali b/com.discord/smali/com/adjust/sdk/x.smali
index 0e12491421..14a94de197 100644
--- a/com.discord/smali/com/adjust/sdk/x.smali
+++ b/com.discord/smali/com/adjust/sdk/x.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/x;
 .super Ljava/lang/Object;
+.source "ILogger.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/y.smali b/com.discord/smali/com/adjust/sdk/y.smali
index 447006de37..25c59c1540 100644
--- a/com.discord/smali/com/adjust/sdk/y.smali
+++ b/com.discord/smali/com/adjust/sdk/y.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/y;
 .super Ljava/lang/Object;
+.source "IPackageHandler.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/adjust/sdk/z.smali b/com.discord/smali/com/adjust/sdk/z.smali
index 30c817678a..de61b5f2e2 100644
--- a/com.discord/smali/com/adjust/sdk/z.smali
+++ b/com.discord/smali/com/adjust/sdk/z.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/adjust/sdk/z;
 .super Ljava/lang/Object;
+.source "IRequestHandler.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/agarron/simpleastcore/R.smali b/com.discord/smali/com/agarron/simpleastcore/R.smali
index 44b5b8c131..65492ba53a 100644
--- a/com.discord/smali/com/agarron/simpleastcore/R.smali
+++ b/com.discord/smali/com/agarron/simpleastcore/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/agarron/simpleastcore/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali
index aef44c55bf..a9c17e5020 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/LottieAnimationView$1;
 .super Ljava/lang/Object;
+.source "LottieAnimationView.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/h;
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali
index 182de9eb58..2f812bd448 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/LottieAnimationView$2;
 .super Ljava/lang/Object;
+.source "LottieAnimationView.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/h;
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState$1.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState$1.smali
index eff38b71bb..eeb5327435 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/LottieAnimationView$SavedState$1;
 .super Ljava/lang/Object;
+.source "LottieAnimationView.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali
index b55b082842..50bb5ce1ad 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali
@@ -1,5 +1,6 @@
 .class Lcom/airbnb/lottie/LottieAnimationView$SavedState;
 .super Landroid/view/View$BaseSavedState;
+.source "LottieAnimationView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
index 42ec52fda8..8554cbef9f 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/airbnb/lottie/LottieAnimationView;
 .super Landroidx/appcompat/widget/AppCompatImageView;
+.source "LottieAnimationView.java"
 
 
 # annotations
@@ -86,52 +87,8 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Landroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;)V
-
-    new-instance p1, Lcom/airbnb/lottie/LottieAnimationView$1;
-
-    invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$1;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fJ: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;->fK: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;->fL:Lcom/airbnb/lottie/f;
-
-    const/4 p1, 0x0
-
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fO:Z
-
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fP:Z
-
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fQ:Z
-
-    new-instance p1, Ljava/util/HashSet;
-
-    invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fR:Ljava/util/Set;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lcom/airbnb/lottie/LottieAnimationView;->init(Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 5
 
     invoke-direct {p0, p1, p2}, Landroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -161,55 +118,289 @@
 
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fQ:Z
 
-    new-instance p1, Ljava/util/HashSet;
+    new-instance v0, Ljava/util/HashSet;
 
-    invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
+    invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fR:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fR:Ljava/util/Set;
 
-    invoke-direct {p0, p2}, Lcom/airbnb/lottie/LottieAnimationView;->init(Landroid/util/AttributeSet;)V
+    invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->getContext()Landroid/content/Context;
 
-    return-void
-.end method
+    move-result-object v0
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    sget-object v1, Lcom/airbnb/lottie/R$a;->LottieAnimationView:[I
 
-    invoke-direct {p0, p1, p2, p3}, Landroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-virtual {v0, p2, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
 
-    new-instance p1, Lcom/airbnb/lottie/LottieAnimationView$1;
+    move-result-object p2
 
-    invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$1;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
+    invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->isInEditMode()Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fJ:Lcom/airbnb/lottie/h;
+    move-result v0
 
-    new-instance p1, Lcom/airbnb/lottie/LottieAnimationView$2;
+    if-nez v0, :cond_4
 
-    invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$2;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_rawRes:I
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fK:Lcom/airbnb/lottie/h;
+    invoke-virtual {p2, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
 
-    new-instance p1, Lcom/airbnb/lottie/f;
+    move-result v0
 
-    invoke-direct {p1}, Lcom/airbnb/lottie/f;-><init>()V
+    sget v1, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_fileName:I
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
+    invoke-virtual {p2, v1}, Landroid/content/res/TypedArray;->hasValue(I)Z
 
-    const/4 p1, 0x0
+    move-result v1
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fO:Z
+    sget v2, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_url:I
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fP:Z
+    invoke-virtual {p2, v2}, Landroid/content/res/TypedArray;->hasValue(I)Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fQ:Z
+    move-result v2
 
-    new-instance p1, Ljava/util/HashSet;
+    if-eqz v0, :cond_1
 
-    invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
+    if-nez v1, :cond_0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fR:Ljava/util/Set;
+    goto :goto_0
 
-    invoke-direct {p0, p2}, Lcom/airbnb/lottie/LottieAnimationView;->init(Landroid/util/AttributeSet;)V
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "lottie_rawRes and lottie_fileName cannot be used at the same time. Please use only one at once."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    if-eqz v0, :cond_2
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_rawRes:I
+
+    invoke-virtual {p2, v0, p1}, Landroid/content/res/TypedArray;->getResourceId(II)I
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimation(I)V
+
+    goto :goto_1
+
+    :cond_2
+    if-eqz v1, :cond_3
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_fileName:I
+
+    invoke-virtual {p2, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimation(Ljava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_3
+    if-eqz v2, :cond_4
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_url:I
+
+    invoke-virtual {p2, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimationFromUrl(Ljava/lang/String;)V
+
+    :cond_4
+    :goto_1
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_autoPlay:I
+
+    invoke-virtual {p2, v0, p1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_5
+
+    iput-boolean v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fO:Z
+
+    iput-boolean v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fP:Z
+
+    :cond_5
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_loop:I
+
+    invoke-virtual {p2, v0, p1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v0
+
+    const/4 v2, -0x1
+
+    if-eqz v0, :cond_6
+
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
+
+    invoke-virtual {v0, v2}, Lcom/airbnb/lottie/f;->setRepeatCount(I)V
+
+    :cond_6
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatMode:I
+
+    invoke-virtual {p2, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_7
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatMode:I
+
+    invoke-virtual {p2, v0, v1}, Landroid/content/res/TypedArray;->getInt(II)I
+
+    move-result v0
+
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setRepeatMode(I)V
+
+    :cond_7
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatCount:I
+
+    invoke-virtual {p2, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_8
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatCount:I
+
+    invoke-virtual {p2, v0, v2}, Landroid/content/res/TypedArray;->getInt(II)I
+
+    move-result v0
+
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setRepeatCount(I)V
+
+    :cond_8
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_imageAssetsFolder:I
+
+    invoke-virtual {p2, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setImageAssetsFolder(Ljava/lang/String;)V
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_progress:I
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p2, v0, v2}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result v0
+
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setProgress(F)V
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_enableMergePathsForKitKatAndAbove:I
+
+    invoke-virtual {p2, v0, p1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v0
+
+    iget-object v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
+
+    iget-boolean v3, v2, Lcom/airbnb/lottie/f;->gy:Z
+
+    if-eq v3, v0, :cond_a
+
+    sget v3, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v4, 0x13
+
+    if-ge v3, v4, :cond_9
+
+    sget-object v0, Lcom/airbnb/lottie/f;->TAG:Ljava/lang/String;
+
+    const-string v2, "Merge paths are not supported pre-Kit Kat."
+
+    invoke-static {v0, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto :goto_2
+
+    :cond_9
+    iput-boolean v0, v2, Lcom/airbnb/lottie/f;->gy:Z
+
+    iget-object v0, v2, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
+
+    if-eqz v0, :cond_a
+
+    invoke-virtual {v2}, Lcom/airbnb/lottie/f;->aS()V
+
+    :cond_a
+    :goto_2
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_colorFilter:I
+
+    invoke-virtual {p2, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_b
+
+    new-instance v0, Lcom/airbnb/lottie/m;
+
+    sget v2, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_colorFilter:I
+
+    invoke-virtual {p2, v2, p1}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result v2
+
+    invoke-direct {v0, v2}, Lcom/airbnb/lottie/m;-><init>(I)V
+
+    new-instance v2, Lcom/airbnb/lottie/c/e;
+
+    new-array v1, v1, [Ljava/lang/String;
+
+    const-string v3, "**"
+
+    aput-object v3, v1, p1
+
+    invoke-direct {v2, v1}, Lcom/airbnb/lottie/c/e;-><init>([Ljava/lang/String;)V
+
+    new-instance p1, Lcom/airbnb/lottie/g/c;
+
+    invoke-direct {p1, v0}, Lcom/airbnb/lottie/g/c;-><init>(Ljava/lang/Object;)V
+
+    sget-object v0, Lcom/airbnb/lottie/i;->hl:Landroid/graphics/ColorFilter;
+
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
+
+    invoke-virtual {v1, v2, v0, p1}, Lcom/airbnb/lottie/f;->a(Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
+
+    :cond_b
+    sget p1, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_scale:I
+
+    invoke-virtual {p2, p1}, Landroid/content/res/TypedArray;->hasValue(I)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_c
+
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
+
+    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_scale:I
+
+    const/high16 v1, 0x3f800000    # 1.0f
+
+    invoke-virtual {p2, v0, v1}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lcom/airbnb/lottie/f;->setScale(F)V
+
+    :cond_c
+    invoke-virtual {p2}, Landroid/content/res/TypedArray;->recycle()V
+
+    invoke-direct {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aN()V
 
     return-void
 .end method
@@ -223,8 +414,6 @@
 
     if-eq p1, p2, :cond_0
 
-    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
-
     invoke-virtual {p2}, Lcom/airbnb/lottie/f;->aR()V
 
     :cond_0
@@ -235,27 +424,6 @@
     return-void
 .end method
 
-.method private a(Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lcom/airbnb/lottie/c/e;",
-            "TT;",
-            "Lcom/airbnb/lottie/g/c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL: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
-
-    return-void
-.end method
-
 .method private aK()V
     .locals 2
 
@@ -263,8 +431,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fS:Lcom/airbnb/lottie/k;
-
     iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fJ:Lcom/airbnb/lottie/h;
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/k;->b(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/k;
@@ -318,275 +484,6 @@
     return-void
 .end method
 
-.method private init(Landroid/util/AttributeSet;)V
-    .locals 5
-    .param p1    # Landroid/util/AttributeSet;
-        .annotation build Landroidx/annotation/Nullable;
-        .end annotation
-    .end param
-
-    invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/airbnb/lottie/R$a;->LottieAnimationView:[I
-
-    invoke-virtual {v0, p1, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->isInEditMode()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_4
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_rawRes:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
-
-    move-result v0
-
-    sget v2, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_fileName:I
-
-    invoke-virtual {p1, v2}, Landroid/content/res/TypedArray;->hasValue(I)Z
-
-    move-result v2
-
-    sget v3, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_url:I
-
-    invoke-virtual {p1, v3}, Landroid/content/res/TypedArray;->hasValue(I)Z
-
-    move-result v3
-
-    if-eqz v0, :cond_1
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "lottie_rawRes and lottie_fileName cannot be used at the same time. Please use only one at once."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    if-eqz v0, :cond_2
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_rawRes:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getResourceId(II)I
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimation(I)V
-
-    goto :goto_1
-
-    :cond_2
-    if-eqz v2, :cond_3
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_fileName:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimation(Ljava/lang/String;)V
-
-    goto :goto_1
-
-    :cond_3
-    if-eqz v3, :cond_4
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_url:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimationFromUrl(Ljava/lang/String;)V
-
-    :cond_4
-    :goto_1
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_autoPlay:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v0
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_5
-
-    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fO:Z
-
-    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fP:Z
-
-    :cond_5
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_loop:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v0
-
-    const/4 v3, -0x1
-
-    if-eqz v0, :cond_6
-
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
-
-    invoke-virtual {v0, v3}, Lcom/airbnb/lottie/f;->setRepeatCount(I)V
-
-    :cond_6
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatMode:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_7
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatMode:I
-
-    invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getInt(II)I
-
-    move-result v0
-
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setRepeatMode(I)V
-
-    :cond_7
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatCount:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_8
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_repeatCount:I
-
-    invoke-virtual {p1, v0, v3}, Landroid/content/res/TypedArray;->getInt(II)I
-
-    move-result v0
-
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setRepeatCount(I)V
-
-    :cond_8
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_imageAssetsFolder:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setImageAssetsFolder(Ljava/lang/String;)V
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_progress:I
-
-    const/4 v3, 0x0
-
-    invoke-virtual {p1, v0, v3}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v0
-
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setProgress(F)V
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_enableMergePathsForKitKatAndAbove:I
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v0
-
-    invoke-direct {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->j(Z)V
-
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_colorFilter:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_9
-
-    new-instance v0, Lcom/airbnb/lottie/m;
-
-    sget v3, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_colorFilter:I
-
-    invoke-virtual {p1, v3, v1}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v3
-
-    invoke-direct {v0, v3}, Lcom/airbnb/lottie/m;-><init>(I)V
-
-    new-instance v3, Lcom/airbnb/lottie/c/e;
-
-    new-array v2, v2, [Ljava/lang/String;
-
-    const-string v4, "**"
-
-    aput-object v4, v2, v1
-
-    invoke-direct {v3, v2}, Lcom/airbnb/lottie/c/e;-><init>([Ljava/lang/String;)V
-
-    new-instance v1, Lcom/airbnb/lottie/g/c;
-
-    invoke-direct {v1, v0}, Lcom/airbnb/lottie/g/c;-><init>(Ljava/lang/Object;)V
-
-    sget-object v0, Lcom/airbnb/lottie/i;->hl:Landroid/graphics/ColorFilter;
-
-    invoke-direct {p0, v3, v0, v1}, Lcom/airbnb/lottie/LottieAnimationView;->a(Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
-
-    :cond_9
-    sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_scale:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->hasValue(I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_a
-
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
-
-    sget v1, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_scale:I
-
-    const/high16 v2, 0x3f800000    # 1.0f
-
-    invoke-virtual {p1, v1, v2}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setScale(F)V
-
-    :cond_a
-    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
-
-    invoke-direct {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aN()V
-
-    return-void
-.end method
-
-.method private j(Z)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
-
-    invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->j(Z)V
-
-    return-void
-.end method
-
 .method private setCompositionTask(Lcom/airbnb/lottie/k;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -656,7 +553,7 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f/c;->l(Z)V
+    invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f/c;->k(Z)V
 
     invoke-direct {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aN()V
 
@@ -680,8 +577,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fT:Lcom/airbnb/lottie/d;
-
     invoke-virtual {v0}, Lcom/airbnb/lottie/d;->aO()F
 
     move-result v0
@@ -864,9 +759,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fL:Lcom/airbnb/lottie/f;
-
-    invoke-super {p0, p1}, Landroidx/appcompat/widget/AppCompatImageView;->invalidateDrawable(Landroid/graphics/drawable/Drawable;)V
+    invoke-super {p0, v1}, Landroidx/appcompat/widget/AppCompatImageView;->invalidateDrawable(Landroid/graphics/drawable/Drawable;)V
 
     return-void
 
@@ -979,8 +872,6 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fN:I
-
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimation(I)V
 
     :cond_2
diff --git a/com.discord/smali/com/airbnb/lottie/R$a.smali b/com.discord/smali/com/airbnb/lottie/R$a.smali
index a6d2e6ef02..140f88c259 100644
--- a/com.discord/smali/com/airbnb/lottie/R$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/R.smali b/com.discord/smali/com/airbnb/lottie/R.smali
index 081169e783..fc8546803f 100644
--- a/com.discord/smali/com/airbnb/lottie/R.smali
+++ b/com.discord/smali/com/airbnb/lottie/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/a.smali b/com.discord/smali/com/airbnb/lottie/a.smali
index 4770e1c96b..af70d7b6b7 100644
--- a/com.discord/smali/com/airbnb/lottie/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/airbnb/lottie/a;
 .super Ljava/lang/Object;
+.source "FontAssetDelegate.java"
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 7e0e01dece..ef5fd690d4 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
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/a/a/a$a;
 .super Ljava/lang/Object;
+.source "BaseStrokeContent.java"
 
 
 # annotations
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 ae87457e0a..03fd788ab9 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/airbnb/lottie/a/a/a;
 .super Ljava/lang/Object;
+.source "BaseStrokeContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/d;
@@ -204,19 +205,18 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p9}, Lcom/airbnb/lottie/c/a/b;->bl()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
 
-    :goto_1
+    :goto_0
     new-instance p1, Ljava/util/ArrayList;
 
     invoke-interface {p8}, Ljava/util/List;->size()I
@@ -239,7 +239,7 @@
 
     const/4 p3, 0x0
 
-    :goto_2
+    :goto_1
     invoke-interface {p8}, Ljava/util/List;->size()I
 
     move-result p4
@@ -262,7 +262,7 @@
 
     add-int/lit8 p3, p3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hG:Lcom/airbnb/lottie/a/b/a;
@@ -275,7 +275,7 @@
 
     const/4 p3, 0x0
 
-    :goto_3
+    :goto_2
     iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->hH:Ljava/util/List;
 
     invoke-interface {p4}, Ljava/util/List;->size()I
@@ -296,15 +296,13 @@
 
     add-int/lit8 p3, p3, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p3, :cond_3
 
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {p2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     :cond_3
@@ -316,7 +314,7 @@
 
     invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    :goto_4
+    :goto_3
     invoke-interface {p8}, Ljava/util/List;->size()I
 
     move-result p2
@@ -335,15 +333,13 @@
 
     add-int/lit8 p1, p1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hI: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_5
@@ -359,16 +355,15 @@
 
     iget-object v0, p2, Lcom/airbnb/lottie/a/a/a$a;->hL:Lcom/airbnb/lottie/a/a/r;
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_0
 
-    :cond_0
     const-string p1, "StrokeContent#applyTrimPath"
 
     invoke-static {p1}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
 
     return-void
 
-    :cond_1
+    :cond_0
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
@@ -382,7 +377,7 @@
     add-int/lit8 v0, v0, -0x1
 
     :goto_0
-    if-ltz v0, :cond_2
+    if-ltz v0, :cond_1
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
 
@@ -404,7 +399,7 @@
 
     goto :goto_0
 
-    :cond_2
+    :cond_1
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hA:Landroid/graphics/PathMeasure;
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
@@ -426,7 +421,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->hA:Landroid/graphics/PathMeasure;
 
@@ -438,7 +433,7 @@
 
     goto :goto_1
 
-    :cond_3
+    :cond_2
     iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->hL:Lcom/airbnb/lottie/a/a/r;
 
     iget-object v1, v1, Lcom/airbnb/lottie/a/a/r;->iA:Lcom/airbnb/lottie/a/b/a;
@@ -514,7 +509,7 @@
     const/4 v6, 0x0
 
     :goto_2
-    if-ltz v1, :cond_0
+    if-ltz v1, :cond_9
 
     iget-object v7, p0, Lcom/airbnb/lottie/a/a/a;->hB:Landroid/graphics/Path;
 
@@ -552,7 +547,7 @@
 
     cmpl-float v9, v5, v0
 
-    if-lez v9, :cond_5
+    if-lez v9, :cond_4
 
     sub-float v9, v5, v0
 
@@ -560,15 +555,15 @@
 
     cmpg-float v10, v9, v10
 
-    if-gez v10, :cond_5
+    if-gez v10, :cond_4
 
     cmpg-float v10, v6, v9
 
-    if-gez v10, :cond_5
+    if-gez v10, :cond_4
 
     cmpl-float v10, v3, v0
 
-    if-lez v10, :cond_4
+    if-lez v10, :cond_3
 
     sub-float v10, v3, v0
 
@@ -576,7 +571,7 @@
 
     goto :goto_3
 
-    :cond_4
+    :cond_3
     const/4 v10, 0x0
 
     :goto_3
@@ -586,82 +581,92 @@
 
     move-result v8
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_5
+    :cond_4
     add-float v9, v6, v7
 
     cmpg-float v10, v9, v3
 
-    if-ltz v10, :cond_9
+    if-ltz v10, :cond_8
 
     cmpl-float v10, v6, v5
 
-    if-gtz v10, :cond_9
+    if-gtz v10, :cond_8
 
     cmpg-float v10, v9, v5
 
-    if-gtz v10, :cond_6
+    if-gtz v10, :cond_5
 
     cmpg-float v10, v3, v6
 
-    if-gez v10, :cond_6
+    if-gez v10, :cond_5
 
-    :goto_4
     iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hB:Landroid/graphics/Path;
 
     iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
-    goto :goto_7
+    goto :goto_6
 
-    :cond_6
+    :cond_5
     cmpg-float v10, v3, v6
 
-    if-gez v10, :cond_7
+    if-gez v10, :cond_6
 
     const/4 v10, 0x0
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_7
+    :cond_6
     sub-float v10, v3, v6
 
     div-float/2addr v10, v7
 
-    :goto_5
+    :goto_4
     cmpl-float v9, v5, v9
 
-    if-lez v9, :cond_8
+    if-lez v9, :cond_7
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_8
+    :cond_7
     sub-float v8, v5, v6
 
     div-float/2addr v8, v7
 
-    :goto_6
+    :goto_5
     iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->hB:Landroid/graphics/Path;
 
     invoke-static {v9, v10, v8, v4}, Lcom/airbnb/lottie/f/f;->a(Landroid/graphics/Path;FFF)V
 
-    goto :goto_4
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hB:Landroid/graphics/Path;
 
-    :cond_9
-    :goto_7
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+
+    :cond_8
+    :goto_6
     add-float/2addr v6, v7
 
     add-int/lit8 v1, v1, -0x1
 
-    goto :goto_2
+    goto/16 :goto_2
+
+    :cond_9
+    const-string p1, "StrokeContent#applyTrimPath"
+
+    invoke-static {p1}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
+
+    return-void
 .end method
 
 
 # virtual methods
 .method public a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
-    .locals 5
+    .locals 6
 
     const-string v0, "StrokeContent#draw"
 
@@ -737,16 +742,15 @@
 
     cmpg-float p3, p3, v0
 
-    if-gtz p3, :cond_1
+    if-gtz p3, :cond_0
 
-    :cond_0
     const-string p1, "StrokeContent#draw"
 
     invoke-static {p1}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
 
     return-void
 
-    :cond_1
+    :cond_0
     const-string p3, "StrokeContent#applyDashPattern"
 
     invoke-static {p3}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
@@ -759,30 +763,29 @@
 
     const/4 v1, 0x0
 
-    if-eqz p3, :cond_2
+    if-eqz p3, :cond_1
 
-    :goto_0
     const-string p3, "StrokeContent#applyDashPattern"
 
     invoke-static {p3}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
 
-    goto :goto_4
+    goto :goto_3
 
-    :cond_2
+    :cond_1
     invoke-static {p2}, Lcom/airbnb/lottie/f/f;->a(Landroid/graphics/Matrix;)F
 
     move-result p3
 
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     iget-object v3, p0, Lcom/airbnb/lottie/a/a/a;->hH:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
     move-result v3
 
-    if-ge v2, v3, :cond_5
+    if-ge v2, v3, :cond_4
 
     iget-object v3, p0, Lcom/airbnb/lottie/a/a/a;->hE:[F
 
@@ -808,41 +811,37 @@
 
     rem-int/lit8 v3, v2, 0x2
 
-    if-nez v3, :cond_3
+    if-nez v3, :cond_2
 
     iget-object v3, p0, Lcom/airbnb/lottie/a/a/a;->hE:[F
 
-    aget v3, v3, v2
+    aget v4, v3, v2
 
-    const/high16 v4, 0x3f800000    # 1.0f
+    const/high16 v5, 0x3f800000    # 1.0f
 
-    cmpg-float v3, v3, v4
+    cmpg-float v4, v4, v5
 
-    if-gez v3, :cond_4
+    if-gez v4, :cond_3
 
+    aput v5, v3, v2
+
+    goto :goto_1
+
+    :cond_2
     iget-object v3, p0, Lcom/airbnb/lottie/a/a/a;->hE:[F
 
-    aput v4, v3, v2
+    aget v4, v3, v2
 
-    goto :goto_2
+    const v5, 0x3dcccccd    # 0.1f
+
+    cmpg-float v4, v4, v5
+
+    if-gez v4, :cond_3
+
+    aput v5, v3, v2
 
     :cond_3
-    iget-object v3, p0, Lcom/airbnb/lottie/a/a/a;->hE:[F
-
-    aget v3, v3, v2
-
-    const v4, 0x3dcccccd    # 0.1f
-
-    cmpg-float v3, v3, v4
-
-    if-gez v3, :cond_4
-
-    iget-object v3, p0, Lcom/airbnb/lottie/a/a/a;->hE:[F
-
-    aput v4, v3, v2
-
-    :cond_4
-    :goto_2
+    :goto_1
     iget-object v3, p0, Lcom/airbnb/lottie/a/a/a;->hE:[F
 
     aget v4, v3, v2
@@ -853,18 +852,16 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_1
+    goto :goto_0
+
+    :cond_4
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
+
+    if-nez p3, :cond_5
+
+    goto :goto_2
 
     :cond_5
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
-
-    if-nez p3, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hI:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {p3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object p3
@@ -875,7 +872,7 @@
 
     move-result v0
 
-    :goto_3
+    :goto_2
     iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
     new-instance v2, Landroid/graphics/DashPathEffect;
@@ -886,34 +883,34 @@
 
     invoke-virtual {p3, v2}, Landroid/graphics/Paint;->setPathEffect(Landroid/graphics/PathEffect;)Landroid/graphics/PathEffect;
 
-    goto :goto_0
+    const-string p3, "StrokeContent#applyDashPattern"
 
-    :goto_4
+    invoke-static {p3}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
+
+    :goto_3
     iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hJ:Lcom/airbnb/lottie/a/b/a;
 
-    if-eqz p3, :cond_7
+    if-eqz p3, :cond_6
 
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hJ:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {p3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object p3
 
-    move-result-object v0
+    check-cast p3, Landroid/graphics/ColorFilter;
 
-    check-cast v0, Landroid/graphics/ColorFilter;
+    invoke-virtual {v0, p3}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
 
-    invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
-
-    :cond_7
-    :goto_5
+    :cond_6
+    :goto_4
     iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hD:Ljava/util/List;
 
     invoke-interface {p3}, Ljava/util/List;->size()I
 
     move-result p3
 
-    if-ge v1, p3, :cond_0
+    if-ge v1, p3, :cond_9
 
     iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hD:Ljava/util/List;
 
@@ -925,13 +922,13 @@
 
     iget-object v0, p3, Lcom/airbnb/lottie/a/a/a$a;->hL:Lcom/airbnb/lottie/a/a/r;
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_7
 
     invoke-direct {p0, p1, p3, p2}, Lcom/airbnb/lottie/a/a/a;->a(Landroid/graphics/Canvas;Lcom/airbnb/lottie/a/a/a$a;Landroid/graphics/Matrix;)V
 
-    goto :goto_7
+    goto :goto_6
 
-    :cond_8
+    :cond_7
     const-string v0, "StrokeContent#buildPath"
 
     invoke-static {v0}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
@@ -948,8 +945,8 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    :goto_6
-    if-ltz v0, :cond_9
+    :goto_5
+    if-ltz v0, :cond_8
 
     iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
 
@@ -969,9 +966,9 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_9
+    :cond_8
     const-string p3, "StrokeContent#buildPath"
 
     invoke-static {p3}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
@@ -990,10 +987,17 @@
 
     invoke-static {p3}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
 
-    :goto_7
+    :goto_6
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_5
+    goto :goto_4
+
+    :cond_9
+    const-string p1, "StrokeContent#draw"
+
+    invoke-static {p1}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
+
+    return-void
 .end method
 
 .method public final a(Landroid/graphics/RectF;Landroid/graphics/Matrix;)V
@@ -1085,9 +1089,7 @@
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->rect:Landroid/graphics/RectF;
-
-    iget v1, v1, Landroid/graphics/RectF;->left:F
+    iget v1, v0, Landroid/graphics/RectF;->left:F
 
     const/high16 v2, 0x40000000    # 2.0f
 
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 c15fb78f0e..349256c65a 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/a/a/b;
 .super Ljava/lang/Object;
+.source "Content.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/c.smali b/com.discord/smali/com/airbnb/lottie/a/a/c.smali
index 215162f9d0..fbd4b5519c 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/c;
 .super Ljava/lang/Object;
+.source "ContentGroup.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/d;
@@ -324,15 +325,13 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/c;->matrix:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->hO:Lcom/airbnb/lottie/a/b/o;
+    invoke-virtual {p2}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
-    invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
+    move-result-object p2
 
-    move-result-object v0
-
-    invoke-virtual {p2, v0}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
+    invoke-virtual {v0, p2}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
     iget-object p2, p0, Lcom/airbnb/lottie/a/a/c;->hO:Lcom/airbnb/lottie/a/b/o;
 
@@ -414,15 +413,13 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/c;->matrix:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->hO:Lcom/airbnb/lottie/a/b/o;
+    invoke-virtual {p2}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
-    invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
+    move-result-object p2
 
-    move-result-object v0
-
-    invoke-virtual {p2, v0}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
+    invoke-virtual {v0, p2}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
     :cond_0
     iget-object p2, p0, Lcom/airbnb/lottie/a/a/c;->rect:Landroid/graphics/RectF;
@@ -656,8 +653,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->hO: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
 
     :cond_0
@@ -813,8 +808,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->hO:Lcom/airbnb/lottie/a/b/o;
-
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
     move-result-object v0
@@ -850,15 +843,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->matrix:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/c;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/c;->hO:Lcom/airbnb/lottie/a/b/o;
+    invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
-    invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
+    move-result-object v0
 
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
+    invoke-virtual {v1, v0}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
     :cond_0
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/c;->path:Landroid/graphics/Path;
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 cf213ce301..c719815d99 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/a/a/d;
 .super Ljava/lang/Object;
+.source "DrawingContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/b;
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/e.smali b/com.discord/smali/com/airbnb/lottie/a/a/e.smali
index a29248056c..540d15e055 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/e;
 .super Ljava/lang/Object;
+.source "EllipseContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/j;
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 9c6ec673fb..cc9c3e4838 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/f;
 .super Ljava/lang/Object;
+.source "FillContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/d;
@@ -228,17 +229,15 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/f;->paint:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->paint:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->hJ:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {p3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object p3
 
-    move-result-object v0
+    check-cast p3, Landroid/graphics/ColorFilter;
 
-    check-cast v0, Landroid/graphics/ColorFilter;
-
-    invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
+    invoke-virtual {v0, p3}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
 
     :cond_0
     iget-object p3, p0, 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 91889759be..9fcf4c3e37 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/g;
 .super Ljava/lang/Object;
+.source "GradientFillContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/d;
@@ -572,21 +573,24 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/g;->paint:Landroid/graphics/Paint;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/g;->paint:Landroid/graphics/Paint;
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/g;->hJ:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object v1
 
-    move-result-object v2
+    check-cast v1, Landroid/graphics/ColorFilter;
 
-    check-cast v2, Landroid/graphics/ColorFilter;
+    invoke-virtual {v2, v1}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
 
-    invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
+    move/from16 v1, p3
+
+    goto :goto_2
 
     :cond_4
     move/from16 v1, p3
 
+    :goto_2
     int-to-float v1, v1
 
     const/high16 v2, 0x437f0000    # 255.0f
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 b62c377538..9bdade9b13 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/h;
 .super Lcom/airbnb/lottie/a/a/a;
+.source "GradientStrokeContent.java"
 
 
 # instance fields
@@ -437,7 +438,7 @@
     :goto_0
     invoke-virtual {v1, v3}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
-    goto/16 :goto_1
+    goto/16 :goto_2
 
     :cond_1
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->paint:Landroid/graphics/Paint;
@@ -458,7 +459,7 @@
 
     if-eqz v3, :cond_2
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_2
     iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->hZ:Lcom/airbnb/lottie/a/b/a;
@@ -601,9 +602,10 @@
 
     move-object v3, v4
 
-    goto/16 :goto_0
-
     :goto_1
+    invoke-virtual {v1, v3}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
+
+    :goto_2
     invoke-super/range {p0 .. p3}, Lcom/airbnb/lottie/a/a/a;->a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
 
     return-void
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 3f85ce4974..cf5c624bbe 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/i.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/airbnb/lottie/a/a/i;
 .super Ljava/lang/Object;
+.source "GreedyContent.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/j.smali b/com.discord/smali/com/airbnb/lottie/a/a/j.smali
index 047313c207..59bd9570c8 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/j.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/a/a/j;
 .super Ljava/lang/Object;
+.source "KeyPathElementContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/b;
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/k$1.smali b/com.discord/smali/com/airbnb/lottie/a/a/k$1.smali
index 5b6f9ccc38..9b9c8deb73 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/k$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/k$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/airbnb/lottie/a/a/k$1;
 .super Ljava/lang/Object;
+.source "MergePathsContent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/k.smali b/com.discord/smali/com/airbnb/lottie/a/a/k.smali
index bbc28f51b0..7e46755668 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/k;
 .super Ljava/lang/Object;
+.source "MergePathsContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/i;
@@ -381,35 +382,40 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     sget-object v0, Landroid/graphics/Path$Op;->XOR:Landroid/graphics/Path$Op;
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Lcom/airbnb/lottie/a/a/k;->a(Landroid/graphics/Path$Op;)V
+
+    goto :goto_1
 
     :pswitch_1
     sget-object v0, Landroid/graphics/Path$Op;->INTERSECT:Landroid/graphics/Path$Op;
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Lcom/airbnb/lottie/a/a/k;->a(Landroid/graphics/Path$Op;)V
+
+    goto :goto_1
 
     :pswitch_2
     sget-object v0, Landroid/graphics/Path$Op;->REVERSE_DIFFERENCE:Landroid/graphics/Path$Op;
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Lcom/airbnb/lottie/a/a/k;->a(Landroid/graphics/Path$Op;)V
+
+    goto :goto_1
 
     :pswitch_3
     sget-object v0, Landroid/graphics/Path$Op;->UNION:Landroid/graphics/Path$Op;
 
-    :goto_0
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/a/a/k;->a(Landroid/graphics/Path$Op;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_4
     const/4 v0, 0x0
 
-    :goto_1
+    :goto_0
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/k;->hN:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
@@ -436,14 +442,16 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    :goto_2
+    :goto_1
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/k;->path:Landroid/graphics/Path;
 
     return-object v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_4
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 c678f40f82..85c18a81f7 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/l.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/airbnb/lottie/a/a/l;
 .super Ljava/lang/Object;
+.source "PathContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/b;
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/m$1.smali b/com.discord/smali/com/airbnb/lottie/a/a/m$1.smali
index 341b36d97d..759929045c 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/m$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/m$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/airbnb/lottie/a/a/m$1;
 .super Ljava/lang/Object;
+.source "PolystarContent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/m.smali b/com.discord/smali/com/airbnb/lottie/a/a/m.smali
index e6e512cc04..308f5d40a1 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/m;
 .super Ljava/lang/Object;
+.source "PolystarContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/j;
@@ -189,19 +190,18 @@
 
     move-result-object p1
 
-    :goto_0
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/m;->im:Lcom/airbnb/lottie/a/b/a;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/m;->ik:Lcom/airbnb/lottie/a/b/a;
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/m;->im:Lcom/airbnb/lottie/a/b/a;
 
-    :goto_1
+    :goto_0
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/m;->ii:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
@@ -319,7 +319,6 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/m;->ii:Lcom/airbnb/lottie/a/b/a;
 
-    :goto_0
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
@@ -331,7 +330,9 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/m;->ij:Lcom/airbnb/lottie/a/b/a;
 
-    goto :goto_0
+    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/i;->gV:Landroid/graphics/PointF;
@@ -340,7 +341,9 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/m;->hQ:Lcom/airbnb/lottie/a/b/a;
 
-    goto :goto_0
+    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/i;->he:Ljava/lang/Float;
@@ -351,9 +354,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/m;->ik:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v0, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
-    goto :goto_0
+    return-void
 
     :cond_3
     sget-object v0, Lcom/airbnb/lottie/i;->hf:Ljava/lang/Float;
@@ -362,7 +365,9 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/m;->il:Lcom/airbnb/lottie/a/b/a;
 
-    goto :goto_0
+    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/i;->hg:Ljava/lang/Float;
@@ -373,9 +378,9 @@
 
     if-eqz v0, :cond_5
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/m;->im:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v0, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
-    goto :goto_0
+    return-void
 
     :cond_5
     sget-object v0, Lcom/airbnb/lottie/i;->hh:Ljava/lang/Float;
@@ -469,7 +474,7 @@
 .end method
 
 .method public final getPath()Landroid/graphics/Path;
-    .locals 45
+    .locals 40
 
     move-object/from16 v0, p0
 
@@ -506,7 +511,7 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto/16 :goto_12
+    goto/16 :goto_11
 
     :pswitch_0
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/m;->ii:Lcom/airbnb/lottie/a/b/a;
@@ -536,9 +541,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v6, v0, Lcom/airbnb/lottie/a/a/m;->ij:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    invoke-virtual {v13}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -551,8 +554,6 @@
     float-to-double v6, v6
 
     :goto_0
-    const/4 v13, 0x0
-
     sub-double/2addr v6, v4
 
     invoke-static {v6, v7}, Ljava/lang/Math;->toRadians(D)D
@@ -662,17 +663,17 @@
 
     const/4 v14, 0x0
 
-    cmpl-float v15, v2, v14
+    cmpl-float v16, v2, v14
 
-    if-eqz v15, :cond_2
-
-    float-to-double v14, v9
+    if-eqz v16, :cond_2
 
     move-wide/from16 v27, v6
 
-    float-to-double v6, v8
+    float-to-double v6, v9
 
-    invoke-static {v14, v15, v6, v7}, Ljava/lang/Math;->atan2(DD)D
+    float-to-double v14, v8
+
+    invoke-static {v6, v7, v14, v15}, Ljava/lang/Math;->atan2(DD)D
 
     move-result-wide v6
 
@@ -696,11 +697,11 @@
 
     double-to-float v6, v6
 
-    move-wide/from16 v31, v4
+    move-wide/from16 v29, v4
 
     float-to-double v4, v13
 
-    move-wide/from16 v33, v10
+    move-wide/from16 v31, v10
 
     float-to-double v10, v12
 
@@ -763,20 +764,20 @@
     goto :goto_2
 
     :cond_2
-    move-wide/from16 v31, v4
+    move-wide/from16 v29, v4
 
     move-wide/from16 v27, v6
 
-    move-wide/from16 v33, v10
+    move-wide/from16 v31, v10
 
     iget-object v4, v0, Lcom/airbnb/lottie/a/a/m;->path:Landroid/graphics/Path;
 
     invoke-virtual {v4, v12, v13}, Landroid/graphics/Path;->lineTo(FF)V
 
     :goto_2
-    invoke-static/range {v33 .. v34}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static/range {v31 .. v32}, Ljava/lang/Double;->isNaN(D)Z
 
-    add-double v4, v31, v33
+    add-double v4, v29, v31
 
     add-int/lit8 v1, v1, 0x1
 
@@ -786,7 +787,7 @@
 
     move-wide/from16 v6, v27
 
-    move-wide/from16 v10, v33
+    move-wide/from16 v10, v31
 
     goto/16 :goto_1
 
@@ -811,7 +812,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->close()V
 
-    goto/16 :goto_12
+    goto/16 :goto_11
 
     :pswitch_1
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/m;->ii:Lcom/airbnb/lottie/a/b/a;
@@ -833,9 +834,7 @@
     goto :goto_3
 
     :cond_4
-    iget-object v6, v0, Lcom/airbnb/lottie/a/a/m;->ij:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    invoke-virtual {v8}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -848,8 +847,6 @@
     float-to-double v6, v6
 
     :goto_3
-    const/4 v8, 0x0
-
     sub-double/2addr v6, v4
 
     invoke-static {v6, v7}, Ljava/lang/Math;->toRadians(D)D
@@ -921,8 +918,6 @@
 
     if-eqz v12, :cond_6
 
-    iget-object v12, v0, Lcom/airbnb/lottie/a/a/m;->im:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {v12}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object v12
@@ -945,8 +940,6 @@
 
     if-eqz v13, :cond_7
 
-    iget-object v13, v0, Lcom/airbnb/lottie/a/a/m;->io:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {v13}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object v13
@@ -959,14 +952,16 @@
 
     div-float v9, v13, v9
 
+    const/4 v13, 0x0
+
     goto :goto_5
 
     :cond_7
     const/4 v9, 0x0
 
-    :goto_5
     const/4 v13, 0x0
 
+    :goto_5
     cmpl-float v14, v1, v13
 
     if-eqz v14, :cond_8
@@ -985,9 +980,9 @@
 
     invoke-static {v14, v15}, Ljava/lang/Double;->isNaN(D)Z
 
-    move/from16 v35, v11
+    move/from16 v20, v11
 
-    move/from16 v36, v12
+    move/from16 v21, v12
 
     mul-double v11, v14, v18
 
@@ -1020,9 +1015,9 @@
     goto :goto_6
 
     :cond_8
-    move/from16 v35, v11
+    move/from16 v20, v11
 
-    move/from16 v36, v12
+    move/from16 v21, v12
 
     float-to-double v11, v10
 
@@ -1065,11 +1060,11 @@
 
     move-result-wide v6
 
-    const-wide/high16 v14, 0x4000000000000000L    # 2.0
+    const-wide/high16 v18, 0x4000000000000000L    # 2.0
 
-    mul-double v6, v6, v14
+    mul-double v6, v6, v18
 
-    move-wide/from16 v18, v4
+    move-wide/from16 v22, v4
 
     const/4 v4, 0x0
 
@@ -1080,176 +1075,170 @@
 
     cmpg-double v5, v14, v6
 
-    if-gez v5, :cond_3
+    if-gez v5, :cond_13
 
     if-eqz v17, :cond_9
 
     move v5, v10
 
-    :goto_8
-    const/16 v16, 0x0
-
-    goto :goto_9
-
-    :cond_9
-    move/from16 v5, v35
-
     goto :goto_8
 
-    :goto_9
-    cmpl-float v20, v13, v16
-
-    if-eqz v20, :cond_a
-
-    const-wide/high16 v20, 0x4000000000000000L    # 2.0
-
-    sub-double v22, v6, v20
-
-    cmpl-double v16, v14, v22
-
-    if-nez v16, :cond_b
-
-    mul-float v16, v2, v1
-
-    div-float v16, v16, v3
-
-    move/from16 v3, v16
-
-    goto :goto_a
-
-    :cond_a
-    const-wide/high16 v20, 0x4000000000000000L    # 2.0
-
-    :cond_b
-    move v3, v8
-
-    :goto_a
-    const-wide/high16 v22, 0x3ff0000000000000L    # 1.0
+    :cond_9
+    move/from16 v5, v20
 
+    :goto_8
     const/16 v16, 0x0
 
     cmpl-float v24, v13, v16
 
-    if-eqz v24, :cond_c
+    move-wide/from16 v25, v14
 
-    sub-double v24, v6, v22
+    if-eqz v24, :cond_a
 
-    cmpl-double v16, v14, v24
+    sub-double v27, v6, v18
 
-    if-nez v16, :cond_c
+    cmpl-double v14, v25, v27
 
-    move/from16 v37, v2
+    if-nez v14, :cond_a
 
-    move/from16 v38, v3
+    mul-float v14, v2, v1
+
+    div-float/2addr v14, v3
+
+    goto :goto_9
+
+    :cond_a
+    move v14, v8
+
+    :goto_9
+    const-wide/high16 v27, 0x3ff0000000000000L    # 1.0
+
+    const/4 v15, 0x0
+
+    cmpl-float v16, v13, v15
+
+    if-eqz v16, :cond_b
+
+    sub-double v29, v6, v27
+
+    cmpl-double v16, v25, v29
+
+    if-nez v16, :cond_b
+
+    move/from16 v24, v4
 
     move v5, v13
 
-    goto :goto_b
+    goto :goto_a
+
+    :cond_b
+    move/from16 v24, v4
+
+    :goto_a
+    float-to-double v3, v5
+
+    invoke-static/range {v22 .. v23}, Ljava/lang/Math;->cos(D)D
+
+    move-result-wide v29
+
+    invoke-static {v3, v4}, Ljava/lang/Double;->isNaN(D)Z
+
+    move v5, v13
+
+    move/from16 v31, v14
+
+    mul-double v13, v3, v29
+
+    double-to-float v13, v13
+
+    invoke-static/range {v22 .. v23}, Ljava/lang/Math;->sin(D)D
+
+    move-result-wide v29
+
+    invoke-static {v3, v4}, Ljava/lang/Double;->isNaN(D)Z
+
+    mul-double v3, v3, v29
+
+    double-to-float v3, v3
+
+    const/4 v4, 0x0
+
+    cmpl-float v14, v21, v4
+
+    if-nez v14, :cond_c
+
+    cmpl-float v14, v9, v4
+
+    if-nez v14, :cond_c
+
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/m;->path:Landroid/graphics/Path;
+
+    invoke-virtual {v4, v13, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    move/from16 v39, v5
+
+    move/from16 v29, v8
+
+    move/from16 v30, v9
+
+    move v5, v10
+
+    move/from16 v8, v31
+
+    const/4 v4, 0x0
+
+    goto/16 :goto_10
 
     :cond_c
-    move/from16 v37, v2
+    move v14, v5
 
-    move/from16 v38, v3
+    float-to-double v4, v12
 
-    :goto_b
-    float-to-double v2, v5
+    move/from16 v29, v8
 
-    invoke-static/range {v18 .. v19}, Ljava/lang/Math;->cos(D)D
-
-    move-result-wide v24
-
-    invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z
-
-    move/from16 v39, v13
-
-    move-wide/from16 v40, v14
-
-    mul-double v13, v2, v24
-
-    double-to-float v5, v13
-
-    invoke-static/range {v18 .. v19}, Ljava/lang/Math;->sin(D)D
-
-    move-result-wide v13
-
-    invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z
-
-    mul-double v2, v2, v13
-
-    double-to-float v2, v2
-
-    const/4 v3, 0x0
-
-    cmpl-float v13, v36, v3
-
-    if-nez v13, :cond_d
-
-    cmpl-float v13, v9, v3
-
-    if-nez v13, :cond_d
-
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/m;->path:Landroid/graphics/Path;
-
-    invoke-virtual {v3, v5, v2}, Landroid/graphics/Path;->lineTo(FF)V
-
-    move/from16 v42, v8
-
-    move/from16 v43, v9
-
-    move/from16 v44, v10
-
-    move/from16 v3, v38
-
-    const/4 v8, 0x0
-
-    goto/16 :goto_11
-
-    :cond_d
-    float-to-double v13, v12
-
-    move/from16 v42, v8
-
-    move/from16 v43, v9
+    move/from16 v30, v9
 
     float-to-double v8, v11
 
-    invoke-static {v13, v14, v8, v9}, Ljava/lang/Math;->atan2(DD)D
+    invoke-static {v4, v5, v8, v9}, Ljava/lang/Math;->atan2(DD)D
 
-    move-result-wide v8
+    move-result-wide v4
 
-    const-wide v13, 0x3ff921fb54442d18L    # 1.5707963267948966
+    const-wide v8, 0x3ff921fb54442d18L    # 1.5707963267948966
 
-    sub-double/2addr v8, v13
+    sub-double/2addr v4, v8
 
-    double-to-float v3, v8
+    double-to-float v4, v4
 
-    float-to-double v8, v3
+    float-to-double v4, v4
 
-    invoke-static {v8, v9}, Ljava/lang/Math;->cos(D)D
-
-    move-result-wide v13
-
-    double-to-float v3, v13
-
-    invoke-static {v8, v9}, Ljava/lang/Math;->sin(D)D
+    invoke-static {v4, v5}, Ljava/lang/Math;->cos(D)D
 
     move-result-wide v8
 
     double-to-float v8, v8
 
-    float-to-double v13, v2
+    invoke-static {v4, v5}, Ljava/lang/Math;->sin(D)D
 
-    move/from16 v44, v10
+    move-result-wide v4
 
-    float-to-double v9, v5
+    double-to-float v4, v4
 
-    invoke-static {v13, v14, v9, v10}, Ljava/lang/Math;->atan2(DD)D
+    move v5, v10
+
+    float-to-double v9, v3
+
+    move/from16 v39, v14
+
+    float-to-double v14, v13
+
+    invoke-static {v9, v10, v14, v15}, Ljava/lang/Math;->atan2(DD)D
 
     move-result-wide v9
 
-    const-wide v13, 0x3ff921fb54442d18L    # 1.5707963267948966
+    const-wide v14, 0x3ff921fb54442d18L    # 1.5707963267948966
 
-    sub-double/2addr v9, v13
+    sub-double/2addr v9, v14
 
     double-to-float v9, v9
 
@@ -1257,9 +1246,9 @@
 
     invoke-static {v9, v10}, Ljava/lang/Math;->cos(D)D
 
-    move-result-wide v13
+    move-result-wide v14
 
-    double-to-float v13, v13
+    double-to-float v14, v14
 
     invoke-static {v9, v10}, Ljava/lang/Math;->sin(D)D
 
@@ -1267,143 +1256,166 @@
 
     double-to-float v9, v9
 
+    if-eqz v17, :cond_d
+
+    move/from16 v10, v21
+
+    goto :goto_b
+
+    :cond_d
+    move/from16 v10, v30
+
+    :goto_b
     if-eqz v17, :cond_e
 
-    move/from16 v10, v36
+    move/from16 v15, v30
 
     goto :goto_c
 
     :cond_e
-    move/from16 v10, v43
+    move/from16 v15, v21
 
     :goto_c
     if-eqz v17, :cond_f
 
-    move/from16 v14, v43
+    move/from16 v33, v20
 
     goto :goto_d
 
     :cond_f
-    move/from16 v14, v36
+    move/from16 v33, v5
 
     :goto_d
     if-eqz v17, :cond_10
 
-    move/from16 v15, v35
+    move/from16 v34, v5
 
     goto :goto_e
 
     :cond_10
-    move/from16 v15, v44
+    move/from16 v34, v20
 
     :goto_e
-    if-eqz v17, :cond_11
+    mul-float v33, v33, v10
 
-    move/from16 v16, v44
+    const v10, 0x3ef4e26d    # 0.47829f
+
+    mul-float v33, v33, v10
+
+    mul-float v8, v8, v33
+
+    mul-float v33, v33, v4
+
+    mul-float v34, v34, v15
+
+    mul-float v34, v34, v10
+
+    mul-float v14, v14, v34
+
+    mul-float v34, v34, v9
+
+    const/4 v4, 0x0
+
+    cmpl-float v9, v1, v4
+
+    if-eqz v9, :cond_12
+
+    if-nez v24, :cond_11
+
+    mul-float v8, v8, v1
+
+    mul-float v33, v33, v1
 
     goto :goto_f
 
     :cond_11
-    move/from16 v16, v35
+    sub-double v9, v6, v27
 
-    :goto_f
-    mul-float v15, v15, v10
+    cmpl-double v15, v25, v9
 
-    const v10, 0x3ef4e26d    # 0.47829f
+    if-nez v15, :cond_12
 
-    mul-float v15, v15, v10
+    mul-float v14, v14, v1
 
-    mul-float v3, v3, v15
-
-    mul-float v15, v15, v8
-
-    mul-float v16, v16, v14
-
-    mul-float v16, v16, v10
-
-    mul-float v13, v13, v16
-
-    mul-float v16, v16, v9
-
-    const/4 v8, 0x0
-
-    cmpl-float v9, v1, v8
-
-    if-eqz v9, :cond_13
-
-    if-nez v4, :cond_12
-
-    mul-float v3, v3, v1
-
-    mul-float v15, v15, v1
-
-    goto :goto_10
+    mul-float v34, v34, v1
 
     :cond_12
-    const/4 v9, 0x0
-
-    sub-double v9, v6, v22
-
-    cmpl-double v14, v40, v9
-
-    if-nez v14, :cond_13
-
-    mul-float v13, v13, v1
-
-    mul-float v16, v16, v1
-
-    :cond_13
-    :goto_10
+    :goto_f
     iget-object v9, v0, Lcom/airbnb/lottie/a/a/m;->path:Landroid/graphics/Path;
 
-    sub-float v25, v11, v3
+    sub-float v8, v11, v8
 
-    sub-float v26, v12, v15
+    sub-float v10, v12, v33
 
-    add-float v27, v5, v13
+    add-float v35, v13, v14
 
-    add-float v28, v2, v16
+    add-float v36, v3, v34
 
-    move-object/from16 v24, v9
+    move-object/from16 v32, v9
 
-    move/from16 v29, v5
+    move/from16 v33, v8
 
-    move/from16 v30, v2
+    move/from16 v34, v10
 
-    invoke-virtual/range {v24 .. v30}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
+    move/from16 v37, v13
 
-    move/from16 v3, v38
+    move/from16 v38, v3
 
-    :goto_11
-    float-to-double v9, v3
+    invoke-virtual/range {v32 .. v38}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
 
-    invoke-static {v9, v10}, Ljava/lang/Double;->isNaN(D)Z
+    move/from16 v8, v31
 
-    add-double v18, v18, v9
+    :goto_10
+    float-to-double v8, v8
+
+    invoke-static {v8, v9}, Ljava/lang/Double;->isNaN(D)Z
+
+    add-double v22, v22, v8
 
     xor-int/lit8 v17, v17, 0x1
 
-    add-int/lit8 v4, v4, 0x1
+    add-int/lit8 v8, v24, 0x1
 
-    move v12, v2
+    move v12, v3
 
-    move v11, v5
+    move v10, v5
 
-    move/from16 v2, v37
+    move v4, v8
+
+    move v11, v13
+
+    move/from16 v8, v29
+
+    move/from16 v9, v30
 
     move/from16 v13, v39
 
-    move/from16 v8, v42
-
-    move/from16 v9, v43
-
-    move/from16 v10, v44
-
     const/high16 v3, 0x40000000    # 2.0f
 
     goto/16 :goto_7
 
-    :goto_12
+    :cond_13
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/m;->hQ:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/graphics/PointF;
+
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/m;->path:Landroid/graphics/Path;
+
+    iget v3, v1, Landroid/graphics/PointF;->x:F
+
+    iget v1, v1, Landroid/graphics/PointF;->y:F
+
+    invoke-virtual {v2, v3, v1}, Landroid/graphics/Path;->offset(FF)V
+
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/m;->path:Landroid/graphics/Path;
+
+    invoke-virtual {v1}, Landroid/graphics/Path;->close()V
+
+    :goto_11
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/m;->path:Landroid/graphics/Path;
 
     invoke-virtual {v1}, Landroid/graphics/Path;->close()V
@@ -1422,8 +1434,6 @@
 
     return-object v1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
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 69c1740806..05fd29ed2e 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/n;
 .super Ljava/lang/Object;
+.source "RectangleContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/j;
@@ -296,8 +297,6 @@
     goto :goto_0
 
     :cond_1
-    iget-object v3, p0, Lcom/airbnb/lottie/a/a/n;->iq:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {v3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object v3
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 144812179d..7e9308ee8b 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/o.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/o;
 .super Ljava/lang/Object;
+.source "RepeaterContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/d;
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 3d6fc3d3d5..1861268b4d 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/p;
 .super Ljava/lang/Object;
+.source "ShapeContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/l;
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 a841ef7f92..426a34f0e4 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/q.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/q;
 .super Lcom/airbnb/lottie/a/a/a;
+.source "StrokeContent.java"
 
 
 # instance fields
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 17aaf65ca2..a3753dc1e4 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/r.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/r.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/a/r;
 .super Ljava/lang/Object;
+.source "TrimPathContent.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/b;
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/a$a.smali b/com.discord/smali/com/airbnb/lottie/a/b/a$a.smali
index 4cd146f77d..b124ff3fe7 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/a$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/a$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/a/b/a$a;
 .super Ljava/lang/Object;
+.source "BaseKeyframeAnimation.java"
 
 
 # annotations
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 243b3b8699..0da44d9a01 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/airbnb/lottie/a/b/a;
 .super Ljava/lang/Object;
+.source "BaseKeyframeAnimation.java"
 
 
 # annotations
@@ -120,8 +121,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iE:Lcom/airbnb/lottie/g/a;
-
     iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fV:F
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/g/a;->e(F)Z
@@ -137,9 +136,7 @@
     :cond_0
     iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iC:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/a;->iC:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -265,8 +262,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iD:Lcom/airbnb/lottie/g/c;
-
     const/4 v1, 0x0
 
     iput-object v1, v0, Lcom/airbnb/lottie/g/c;->ne:Lcom/airbnb/lottie/a/b/a;
@@ -394,9 +389,7 @@
     :cond_0
     iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iC:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/a;->iC:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
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 9666d11c17..58cdd7476f 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/b;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "ColorKeyframeAnimation.java"
 
 
 # annotations
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 70a864bc32..00b24a1601 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/c;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "FloatKeyframeAnimation.java"
 
 
 # annotations
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 999e08b5b9..99032342a8 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/d;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "GradientColorKeyframeAnimation.java"
 
 
 # annotations
@@ -179,4 +180,6 @@
     invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p2
+
+    return-void
 .end method
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 1438be26b1..2258d63410 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/e;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "IntegerKeyframeAnimation.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/f.smali b/com.discord/smali/com/airbnb/lottie/a/b/f.smali
index eb50771f05..af1aafc92c 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/f.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/airbnb/lottie/a/b/f;
 .super Lcom/airbnb/lottie/a/b/a;
+.source "KeyframeAnimation.java"
 
 
 # annotations
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 e529cdf51e..e53b5dd645 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/g;
 .super Ljava/lang/Object;
+.source "MaskKeyframeAnimation.java"
 
 
 # instance fields
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 a6537ebd57..f28505690e 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/h;
 .super Lcom/airbnb/lottie/g/a;
+.source "PathKeyframe.java"
 
 
 # annotations
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 835b68cf60..f50de6ecd0 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/i;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "PathKeyframeAnimation.java"
 
 
 # annotations
@@ -127,9 +128,7 @@
     :cond_2
     iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iM:Landroid/graphics/PathMeasure;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/i;->iM:Landroid/graphics/PathMeasure;
-
-    invoke-virtual {v0}, Landroid/graphics/PathMeasure;->getLength()F
+    invoke-virtual {p1}, Landroid/graphics/PathMeasure;->getLength()F
 
     move-result v0
 
@@ -145,15 +144,13 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/a/b/i;->iK:[F
 
-    aget p2, p2, v2
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/i;->iK:[F
+    aget v0, p2, v2
 
     const/4 v1, 0x1
 
-    aget v0, v0, v1
+    aget p2, p2, v1
 
-    invoke-virtual {p1, p2, v0}, Landroid/graphics/PointF;->set(FF)V
+    invoke-virtual {p1, v0, p2}, Landroid/graphics/PointF;->set(FF)V
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iJ:Landroid/graphics/PointF;
 
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 40732ab2e9..9443d75fea 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/j;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "PointKeyframeAnimation.java"
 
 
 # annotations
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 b24429c615..989489c724 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/k;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "ScaleKeyframeAnimation.java"
 
 
 # annotations
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 294a06fab5..f8288aed46 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/l;
 .super Lcom/airbnb/lottie/a/b/a;
+.source "ShapeKeyframeAnimation.java"
 
 
 # annotations
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 63d315de7b..f1471bec80 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/m;
 .super Lcom/airbnb/lottie/a/b/a;
+.source "SplitDimensionPathKeyframeAnimation.java"
 
 
 # annotations
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 8f6dfd1e8a..c5f2acd505 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/n;
 .super Lcom/airbnb/lottie/a/b/f;
+.source "TextKeyframeAnimation.java"
 
 
 # annotations
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 0e7620336e..754c8baccd 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/o.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/o;
 .super Ljava/lang/Object;
+.source "TransformKeyframeAnimation.java"
 
 
 # instance fields
@@ -306,8 +307,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iW:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_0
@@ -315,8 +314,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iX:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_1
@@ -350,8 +347,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iW:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     :cond_0
@@ -359,8 +354,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iX:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     :cond_1
@@ -389,10 +382,9 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iR:Lcom/airbnb/lottie/a/b/a;
 
-    :goto_0
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget-object v0, Lcom/airbnb/lottie/i;->gT:Landroid/graphics/PointF;
@@ -401,6 +393,8 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iS:Lcom/airbnb/lottie/a/b/a;
 
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
     goto :goto_0
 
     :cond_1
@@ -410,6 +404,8 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iT:Lcom/airbnb/lottie/a/b/a;
 
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
     goto :goto_0
 
     :cond_2
@@ -419,6 +415,8 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iU:Lcom/airbnb/lottie/a/b/a;
 
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
     goto :goto_0
 
     :cond_3
@@ -428,6 +426,8 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iV:Lcom/airbnb/lottie/a/b/a;
 
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
     goto :goto_0
 
     :cond_4
@@ -439,7 +439,7 @@
 
     if-eqz v0, :cond_5
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iW:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v0, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     goto :goto_0
 
@@ -452,11 +452,9 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iX:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
-    goto :goto_0
-
-    :goto_1
+    :goto_0
     const/4 p1, 0x1
 
     return p1
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 048e5e336d..bf8ed7e8d3 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/a/b/p;
 .super Lcom/airbnb/lottie/a/b/a;
+.source "ValueCallbackKeyframeAnimation.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/b.smali b/com.discord/smali/com/airbnb/lottie/b.smali
index 44d5c2dd5a..d62fa4b431 100644
--- a/com.discord/smali/com/airbnb/lottie/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/b;
 .super Ljava/lang/Object;
+.source "ImageAssetDelegate.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/airbnb/lottie/b/a.smali b/com.discord/smali/com/airbnb/lottie/b/a.smali
index a792b08abe..6df120c46d 100644
--- a/com.discord/smali/com/airbnb/lottie/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/b/a;
 .super Ljava/lang/Object;
+.source "FontAssetManager.java"
 
 
 # instance fields
@@ -93,7 +94,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     iput-object p1, p0, Lcom/airbnb/lottie/b/a;->jc:Landroid/content/res/AssetManager;
 
     return-void
@@ -109,5 +109,7 @@
 
     move-result-object p1
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->jc: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 57e6013302..fbb0bd211a 100644
--- a/com.discord/smali/com/airbnb/lottie/b/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/b/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/b/b;
 .super Ljava/lang/Object;
+.source "ImageAssetManager.java"
 
 
 # static fields
@@ -68,9 +69,7 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/b/b;->jg:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/b/b;->jg:Ljava/lang/String;
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
 
     move-result v0
 
@@ -240,6 +239,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method public final v(Ljava/lang/String;)Landroid/graphics/Bitmap;
@@ -273,9 +274,7 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/b/b;->jh:Lcom/airbnb/lottie/b;
-
-    invoke-interface {v0}, Lcom/airbnb/lottie/b;->aJ()Landroid/graphics/Bitmap;
+    invoke-interface {v2}, Lcom/airbnb/lottie/b;->aJ()Landroid/graphics/Bitmap;
 
     move-result-object v0
 
@@ -344,7 +343,6 @@
 
     move-result-object v0
 
-    :goto_0
     invoke-direct {p0, p1, v0}, Lcom/airbnb/lottie/b/b;->a(Ljava/lang/String;Landroid/graphics/Bitmap;)Landroid/graphics/Bitmap;
 
     move-result-object p1
@@ -358,7 +356,6 @@
 
     const-string v2, "data URL did not have correct base64 format."
 
-    :goto_1
     invoke-static {v0, v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     return-object v1
@@ -403,7 +400,11 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0}, Lcom/airbnb/lottie/b/b;->a(Ljava/lang/String;Landroid/graphics/Bitmap;)Landroid/graphics/Bitmap;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_5
     :try_start_2
@@ -424,5 +425,7 @@
 
     const-string v2, "Unable to open asset."
 
-    goto :goto_1
+    invoke-static {v0, v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-object v1
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c.smali b/com.discord/smali/com/airbnb/lottie/c.smali
index 8d1d36f824..c2f027e5f9 100644
--- a/com.discord/smali/com/airbnb/lottie/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c;
 .super Ljava/lang/Object;
+.source "L.java"
 
 
 # annotations
@@ -80,21 +81,17 @@
     return-void
 
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/c;->fF:[Ljava/lang/String;
+    sget-object v1, Lcom/airbnb/lottie/c;->fF:[Ljava/lang/String;
 
-    sget v1, Lcom/airbnb/lottie/c;->fH:I
+    aput-object p0, v1, v0
 
-    aput-object p0, v0, v1
-
-    sget-object v0, Lcom/airbnb/lottie/c;->fG:[J
-
-    sget v1, Lcom/airbnb/lottie/c;->fH:I
+    sget-object v1, Lcom/airbnb/lottie/c;->fG:[J
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide v2
 
-    aput-wide v2, v0, v1
+    aput-wide v2, v1, v0
 
     invoke-static {p0}, Landroidx/core/os/TraceCompat;->beginSection(Ljava/lang/String;)V
 
@@ -156,11 +153,9 @@
 
     if-lez v0, :cond_0
 
-    sget p0, Lcom/airbnb/lottie/c;->fI:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 p0, p0, -0x1
-
-    sput p0, Lcom/airbnb/lottie/c;->fI:I
+    sput v0, Lcom/airbnb/lottie/c;->fI:I
 
     return v1
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a.smali b/com.discord/smali/com/airbnb/lottie/c/a.smali
index 65266ba92f..88433c5c4f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a;
 .super Ljava/lang/Object;
+.source "CubicCurveData.java"
 
 
 # annotations
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 4444642c75..cd99583eb9 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/a;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatableColorValue.java"
 
 
 # annotations
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 b52ddc2674..17886880eb 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/b;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatableFloatValue.java"
 
 
 # annotations
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 ab9a04bb6f..a5281a81ba 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/c;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatableGradientColorValue.java"
 
 
 # annotations
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 e8b62e3ef3..ba449720af 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/d;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatableIntegerValue.java"
 
 
 # annotations
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 4bfadcb76e..f2a22124c7 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/e;
 .super Ljava/lang/Object;
+.source "AnimatablePathValue.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/a/m;
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 570a464dfd..b992594bc8 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/f;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatablePointValue.java"
 
 
 # annotations
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 aa5b4e2de1..486492108b 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/g;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatableScaleValue.java"
 
 
 # annotations
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 01dae6b398..d4f79f8e4b 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/h;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatableShapeValue.java"
 
 
 # annotations
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 6347abc07d..e29c9419e6 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/i;
 .super Ljava/lang/Object;
+.source "AnimatableSplitDimensionPathValue.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/a/m;
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 bcb922c2ae..9fd3a108f7 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/j;
 .super Lcom/airbnb/lottie/c/a/n;
+.source "AnimatableTextFrame.java"
 
 
 # annotations
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 a506085b04..746e2a2010 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/k;
 .super Ljava/lang/Object;
+.source "AnimatableTextProperties.java"
 
 
 # instance fields
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 1c40956d25..c5f6055c49 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/a/l;
 .super Ljava/lang/Object;
+.source "AnimatableTransform.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/m.smali b/com.discord/smali/com/airbnb/lottie/c/a/m.smali
index f270500a08..24d85c7439 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/m.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/c/a/m;
 .super Ljava/lang/Object;
+.source "AnimatableValue.java"
 
 
 # annotations
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 5346ef885b..2494d9ab9a 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/n.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/airbnb/lottie/c/a/n;
 .super Ljava/lang/Object;
+.source "BaseAnimatableValue.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/a/m;
diff --git a/com.discord/smali/com/airbnb/lottie/c/b.smali b/com.discord/smali/com/airbnb/lottie/c/b.smali
index a3424c4389..d19888687c 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b;
 .super Ljava/lang/Object;
+.source "DocumentData.java"
 
 
 # annotations
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 a0ea7ed178..c855788974 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/a;
 .super Ljava/lang/Object;
+.source "CircleShape.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/b.smali b/com.discord/smali/com/airbnb/lottie/c/b/b.smali
index 10e9f85144..3d1a35a349 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/c/b/b;
 .super Ljava/lang/Object;
+.source "ContentModel.java"
 
 
 # virtual methods
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 cc559e3d5c..4fabda9c0a 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/c;
 .super Ljava/lang/Object;
+.source "GradientColor.java"
 
 
 # instance fields
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 d7145a71ba..0b77a36765 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/d;
 .super Ljava/lang/Object;
+.source "GradientFill.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 27da5ebf42..69dbd3f9a5 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/e;
 .super Ljava/lang/Object;
+.source "GradientStroke.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 da5d0602aa..5568daa2f8 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/f;
 .super Ljava/lang/Enum;
+.source "GradientType.java"
 
 
 # annotations
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 8140af60fc..ca3903571d 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
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/g$a;
 .super Ljava/lang/Enum;
+.source "Mask.java"
 
 
 # annotations
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 ab3705a9de..1cf846cb41 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/g;
 .super Ljava/lang/Object;
+.source "Mask.java"
 
 
 # annotations
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 22b729c71b..5aa85a095e 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
@@ -1,5 +1,6 @@
 .class public final enum Lcom/airbnb/lottie/c/b/h$a;
 .super Ljava/lang/Enum;
+.source "MergePaths.java"
 
 
 # annotations
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 85e8a9ef1b..1b2445d9e7 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/h;
 .super Ljava/lang/Object;
+.source "MergePaths.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 c29187f21b..092ba201aa 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
@@ -1,5 +1,6 @@
 .class public final enum Lcom/airbnb/lottie/c/b/i$a;
 .super Ljava/lang/Enum;
+.source "PolystarShape.java"
 
 
 # annotations
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 ac6559faeb..49fb751399 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/i;
 .super Ljava/lang/Object;
+.source "PolystarShape.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 c4160e3652..4e9c523d2c 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/j;
 .super Ljava/lang/Object;
+.source "RectangleShape.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 cb081e8556..582d9b4f11 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/k;
 .super Ljava/lang/Object;
+.source "Repeater.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 aa91e1d42d..0ee3df4810 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/l;
 .super Ljava/lang/Object;
+.source "ShapeData.java"
 
 
 # instance fields
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 8a99d4fb52..97f5c0e5b3 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/m;
 .super Ljava/lang/Object;
+.source "ShapeFill.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 1bbbfc09bc..186fb114cb 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/n;
 .super Ljava/lang/Object;
+.source "ShapeGroup.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 a2b1c696d0..39a206598f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/o.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/o;
 .super Ljava/lang/Object;
+.source "ShapePath.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 b434a5cdfb..ebb2e24883 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
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/airbnb/lottie/c/b/p$1;
 .super Ljava/lang/Object;
+.source "ShapeStroke.java"
 
 
 # annotations
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 20e085b68e..7cc56dfad5 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
@@ -1,5 +1,6 @@
 .class public final enum Lcom/airbnb/lottie/c/b/p$a;
 .super Ljava/lang/Enum;
+.source "ShapeStroke.java"
 
 
 # annotations
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 bbfb82fe07..4ef6557a1a 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
@@ -1,5 +1,6 @@
 .class public final enum Lcom/airbnb/lottie/c/b/p$b;
 .super Ljava/lang/Enum;
+.source "ShapeStroke.java"
 
 
 # annotations
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 6bbd5611d5..3da4e67679 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/p;
 .super Ljava/lang/Object;
+.source "ShapeStroke.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
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 d4d2137488..2cb23d97cf 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
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/q$a;
 .super Ljava/lang/Enum;
+.source "ShapeTrimPath.java"
 
 
 # annotations
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 5ec2b76ccf..df756d5e78 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/q.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/b/q;
 .super Ljava/lang/Object;
+.source "ShapeTrimPath.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/c/b/b;
diff --git a/com.discord/smali/com/airbnb/lottie/c/c.smali b/com.discord/smali/com/airbnb/lottie/c/c.smali
index 6584839eb0..e2cef95c1c 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c;
 .super Ljava/lang/Object;
+.source "Font.java"
 
 
 # annotations
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 6864177098..dff685f718 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
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/c/c/a$1;
 .super Ljava/lang/Object;
+.source "BaseLayer.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/b/a$a;
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 ce3b12b66f..400a492cc4 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
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/airbnb/lottie/c/c/a$2;
 .super Ljava/lang/Object;
+.source "BaseLayer.java"
 
 
 # annotations
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 977507fa33..7f6814f9f3 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/airbnb/lottie/c/c/a;
 .super Ljava/lang/Object;
+.source "BaseLayer.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/a/a/d;
@@ -232,10 +233,9 @@
 
     invoke-direct {v0, v2}, Landroid/graphics/PorterDuffXfermode;-><init>(Landroid/graphics/PorterDuff$Mode;)V
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setXfermode(Landroid/graphics/Xfermode;)Landroid/graphics/Xfermode;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lf:Landroid/graphics/Paint;
@@ -246,9 +246,9 @@
 
     invoke-direct {v0, v2}, Landroid/graphics/PorterDuffXfermode;-><init>(Landroid/graphics/PorterDuff$Mode;)V
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setXfermode(Landroid/graphics/Xfermode;)Landroid/graphics/Xfermode;
 
-    :goto_1
+    :goto_0
     iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->kI:Lcom/airbnb/lottie/c/a/l;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/l;->bn()Lcom/airbnb/lottie/a/b/o;
@@ -289,7 +289,7 @@
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
@@ -304,7 +304,7 @@
 
     invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ln:Lcom/airbnb/lottie/a/b/g;
@@ -315,7 +315,7 @@
 
     move-result-object p1
 
-    :goto_3
+    :goto_2
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
@@ -332,7 +332,7 @@
 
     invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lm:Lcom/airbnb/lottie/c/c/d;
@@ -377,12 +377,12 @@
 
     if-nez p2, :cond_3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/4 v1, 0x0
 
-    :goto_4
+    :goto_3
     invoke-virtual {p0, v1}, Lcom/airbnb/lottie/c/c/a;->setVisible(Z)V
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
@@ -589,12 +589,13 @@
     :pswitch_0
     return-void
 
+    :pswitch_1
+    return-void
+
     :cond_1
     iget-object v3, p0, Lcom/airbnb/lottie/c/c/a;->lh:Landroid/graphics/RectF;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/c/c/a;->lh:Landroid/graphics/RectF;
-
-    iget v4, v4, Landroid/graphics/RectF;->left:F
+    iget v4, v3, Landroid/graphics/RectF;->left:F
 
     iget-object v5, p0, Lcom/airbnb/lottie/c/c/a;->lj:Landroid/graphics/RectF;
 
@@ -692,9 +693,11 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
-        :pswitch_0
+        :pswitch_1
         :pswitch_0
     .end packed-switch
 .end method
@@ -723,8 +726,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ln:Lcom/airbnb/lottie/a/b/g;
-
     iget-object v0, v0, Lcom/airbnb/lottie/a/b/g;->iG:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
@@ -1682,8 +1683,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lo:Lcom/airbnb/lottie/c/c/a;
-
     iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->lm:Lcom/airbnb/lottie/c/c/d;
 
     iget v0, v0, Lcom/airbnb/lottie/c/c/d;->lJ:F
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 754a0ad551..829c012474 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
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/airbnb/lottie/c/c/b$1;
 .super Ljava/lang/Object;
+.source "CompositionLayer.java"
 
 
 # annotations
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 bb96dbfdd1..856b8b1927 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/b;
 .super Lcom/airbnb/lottie/c/c/a;
+.source "CompositionLayer.java"
 
 
 # instance fields
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 a1c11c9ba9..16c4b9355b 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/c;
 .super Lcom/airbnb/lottie/c/c/a;
+.source "ImageLayer.java"
 
 
 # instance fields
@@ -197,17 +198,15 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->paint:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/c;->paint:Landroid/graphics/Paint;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/c;->hJ:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {p3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object p3
 
-    move-result-object v2
+    check-cast p3, Landroid/graphics/ColorFilter;
 
-    check-cast v2, Landroid/graphics/ColorFilter;
-
-    invoke-virtual {p3, v2}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
+    invoke-virtual {v2, p3}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
 
     :cond_1
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
@@ -262,6 +261,8 @@
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->restore()V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
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 2f3b38fe7f..0dc53d58cd 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
@@ -1,5 +1,6 @@
 .class public final enum Lcom/airbnb/lottie/c/c/d$a;
 .super Ljava/lang/Enum;
+.source "Layer.java"
 
 
 # annotations
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 7d75c7611b..b7e2ce1097 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
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/d$b;
 .super Ljava/lang/Enum;
+.source "Layer.java"
 
 
 # annotations
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 704fc34179..65a11103d2 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/d;
 .super Ljava/lang/Object;
+.source "Layer.java"
 
 
 # annotations
@@ -273,7 +274,6 @@
 
     const-string v2, "\t\tParents: "
 
-    :goto_0
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     iget-object v2, v1, Lcom/airbnb/lottie/c/c/d;->lC:Ljava/lang/String;
@@ -288,10 +288,25 @@
 
     move-result-object v1
 
+    :goto_0
     if-eqz v1, :cond_0
 
     const-string v2, "->"
 
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v2, v1, Lcom/airbnb/lottie/c/c/d;->lC:Ljava/lang/String;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->fT:Lcom/airbnb/lottie/d;
+
+    iget-wide v3, v1, Lcom/airbnb/lottie/c/c/d;->parentId:J
+
+    invoke-virtual {v2, v3, v4}, Lcom/airbnb/lottie/d;->h(J)Lcom/airbnb/lottie/c/c/d;
+
+    move-result-object v1
+
     goto :goto_0
 
     :cond_0
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/e.smali b/com.discord/smali/com/airbnb/lottie/c/c/e.smali
index a277e8c6c3..2a83cd183f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/e;
 .super Lcom/airbnb/lottie/c/c/a;
+.source "NullLayer.java"
 
 
 # direct methods
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 38580e961b..6db0f9c509 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/f;
 .super Lcom/airbnb/lottie/c/c/a;
+.source "ShapeLayer.java"
 
 
 # instance fields
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 7d25e71afb..19a345c2c3 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/g;
 .super Lcom/airbnb/lottie/c/c/a;
+.source "SolidLayer.java"
 
 
 # instance fields
@@ -222,17 +223,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->paint:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->paint:Landroid/graphics/Paint;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->hJ:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object v0
 
-    move-result-object v1
+    check-cast v0, Landroid/graphics/ColorFilter;
 
-    check-cast v1, Landroid/graphics/ColorFilter;
-
-    invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
+    invoke-virtual {v1, v0}, Landroid/graphics/Paint;->setColorFilter(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;
 
     :cond_1
     if-lez p3, :cond_2
@@ -245,14 +244,10 @@
 
     aput v1, p3, v0
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
-
     const/4 v2, 0x1
 
     aput v1, p3, v2
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
-
     iget-object v3, p0, Lcom/airbnb/lottie/c/c/g;->lm:Lcom/airbnb/lottie/c/c/d;
 
     iget v3, v3, Lcom/airbnb/lottie/c/c/d;->lG:I
@@ -269,8 +264,6 @@
 
     aput v1, p3, v3
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
-
     iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->lm:Lcom/airbnb/lottie/c/c/d;
 
     iget v5, v5, Lcom/airbnb/lottie/c/c/d;->lG:I
@@ -299,8 +292,6 @@
 
     aput v1, p3, v5
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
-
     iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->lm:Lcom/airbnb/lottie/c/c/d;
 
     iget v1, v1, Lcom/airbnb/lottie/c/c/d;->lH:I
@@ -323,61 +314,51 @@
 
     iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
 
-    aget p3, p3, v0
+    aget v1, p3, v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
+    aget p3, p3, v2
 
-    aget v1, v1, v2
-
-    invoke-virtual {p2, p3, v1}, Landroid/graphics/Path;->moveTo(FF)V
+    invoke-virtual {p2, v1, p3}, Landroid/graphics/Path;->moveTo(FF)V
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
     iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
 
-    aget p3, p3, v4
+    aget v1, p3, v4
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
+    aget p3, p3, v3
 
-    aget v1, v1, v3
-
-    invoke-virtual {p2, p3, v1}, Landroid/graphics/Path;->lineTo(FF)V
+    invoke-virtual {p2, v1, p3}, Landroid/graphics/Path;->lineTo(FF)V
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
     iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
 
-    aget p3, p3, v6
+    aget v1, p3, v6
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
+    aget p3, p3, v7
 
-    aget v1, v1, v7
-
-    invoke-virtual {p2, p3, v1}, Landroid/graphics/Path;->lineTo(FF)V
+    invoke-virtual {p2, v1, p3}, Landroid/graphics/Path;->lineTo(FF)V
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
     iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
 
-    aget p3, p3, v5
+    aget v1, p3, v5
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
+    aget p3, p3, v8
 
-    aget v1, v1, v8
-
-    invoke-virtual {p2, p3, v1}, Landroid/graphics/Path;->lineTo(FF)V
+    invoke-virtual {p2, v1, p3}, Landroid/graphics/Path;->lineTo(FF)V
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
     iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
 
-    aget p3, p3, v0
+    aget v0, p3, v0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
+    aget p3, p3, v2
 
-    aget v0, v0, v2
-
-    invoke-virtual {p2, p3, v0}, Landroid/graphics/Path;->lineTo(FF)V
+    invoke-virtual {p2, v0, p3}, Landroid/graphics/Path;->lineTo(FF)V
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
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 f24b187273..40dea56ad5 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
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/c/c/h$1;
 .super Landroid/graphics/Paint;
+.source "TextLayer.java"
 
 
 # annotations
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 ae20c7d906..407f34610f 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
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/c/c/h$2;
 .super Landroid/graphics/Paint;
+.source "TextLayer.java"
 
 
 # annotations
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 3039ac09f9..c4fe238b65 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/c/h;
 .super Lcom/airbnb/lottie/c/c/a;
+.source "TextLayer.java"
 
 
 # instance fields
@@ -581,10 +582,9 @@
 
     iget-object v5, p0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
 
-    :goto_7
     invoke-static {v3, v5, p4}, Lcom/airbnb/lottie/c/c/h;->a([CLandroid/graphics/Paint;Landroid/graphics/Canvas;)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
     iget-object v3, p0, Lcom/airbnb/lottie/c/c/h;->mf:[C
@@ -597,17 +597,15 @@
 
     iget-object v5, p0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
 
-    goto :goto_7
+    invoke-static {v3, v5, p4}, Lcom/airbnb/lottie/c/c/h;->a([CLandroid/graphics/Paint;Landroid/graphics/Canvas;)V
 
-    :goto_8
+    :goto_7
     iget-object v3, p0, Lcom/airbnb/lottie/c/c/h;->mf:[C
 
     aput-char v1, v3, v4
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/h;->mf:[C
-
     invoke-virtual {v1, v3, v4, v2}, Landroid/graphics/Paint;->measureText([CII)F
 
     move-result v1
@@ -624,8 +622,6 @@
 
     if-eqz v5, :cond_d
 
-    iget-object v5, p0, Lcom/airbnb/lottie/c/c/h;->mk:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {v5}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object v5
@@ -735,10 +731,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->hT:Lcom/airbnb/lottie/a/b/a;
-
-    :goto_0
-    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+    invoke-virtual {v0, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
@@ -751,9 +744,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mi:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v0, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
-    goto :goto_0
+    return-void
 
     :cond_1
     sget-object v0, Lcom/airbnb/lottie/i;->gY:Ljava/lang/Float;
@@ -764,9 +757,9 @@
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mj:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v0, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
-    goto :goto_0
+    return-void
 
     :cond_2
     sget-object v0, Lcom/airbnb/lottie/i;->gZ:Ljava/lang/Float;
@@ -777,8 +770,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mk:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     :cond_3
@@ -838,64 +829,58 @@
 
     if-eqz v5, :cond_2
 
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
+    iget-object v6, v0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
 
-    iget-object v6, v0, Lcom/airbnb/lottie/c/c/h;->hT:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v5}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object v5
 
-    move-result-object v6
+    check-cast v5, Ljava/lang/Integer;
 
-    check-cast v6, Ljava/lang/Integer;
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
+    move-result v5
 
-    move-result v6
+    invoke-virtual {v6, v5}, Landroid/graphics/Paint;->setColor(I)V
 
-    :goto_0
-    invoke-virtual {v5, v6}, Landroid/graphics/Paint;->setColor(I)V
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
 
     iget v6, v3, Lcom/airbnb/lottie/c/b;->color:I
 
-    goto :goto_0
+    invoke-virtual {v5, v6}, Landroid/graphics/Paint;->setColor(I)V
 
-    :goto_1
+    :goto_0
     iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->mi:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
+    iget-object v6, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
 
-    iget-object v6, v0, Lcom/airbnb/lottie/c/c/h;->mi:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v5}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object v5
 
-    move-result-object v6
+    check-cast v5, Ljava/lang/Integer;
 
-    check-cast v6, Ljava/lang/Integer;
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
+    move-result v5
 
-    move-result v6
+    invoke-virtual {v6, v5}, Landroid/graphics/Paint;->setColor(I)V
 
-    :goto_2
-    invoke-virtual {v5, v6}, Landroid/graphics/Paint;->setColor(I)V
-
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
 
     iget v6, v3, Lcom/airbnb/lottie/c/b;->strokeColor:I
 
-    goto :goto_2
+    invoke-virtual {v5, v6}, Landroid/graphics/Paint;->setColor(I)V
 
-    :goto_3
+    :goto_1
     iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->iu:Lcom/airbnb/lottie/a/b/o;
 
     iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->iV:Lcom/airbnb/lottie/a/b/a;
@@ -926,23 +911,21 @@
 
     if-eqz v5, :cond_4
 
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
+    iget-object v6, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
 
-    iget-object v6, v0, Lcom/airbnb/lottie/c/c/h;->mj:Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {v5}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
-    invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
+    move-result-object v5
 
-    move-result-object v6
+    check-cast v5, Ljava/lang/Float;
 
-    check-cast v6, Ljava/lang/Float;
+    invoke-virtual {v5}, Ljava/lang/Float;->floatValue()F
 
-    invoke-virtual {v6}, Ljava/lang/Float;->floatValue()F
+    move-result v5
 
-    move-result v6
+    invoke-virtual {v6, v5}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    invoke-virtual {v5, v6}, Landroid/graphics/Paint;->setStrokeWidth(F)V
-
-    goto :goto_4
+    goto :goto_2
 
     :cond_4
     invoke-static/range {p2 .. p2}, Lcom/airbnb/lottie/f/f;->a(Landroid/graphics/Matrix;)F
@@ -973,7 +956,7 @@
 
     invoke-virtual {v6, v5}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    :goto_4
+    :goto_2
     iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->fL:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v5}, Lcom/airbnb/lottie/f;->aU()Z
@@ -998,7 +981,7 @@
 
     const/4 v9, 0x0
 
-    :goto_5
+    :goto_3
     invoke-virtual {v7}, Ljava/lang/String;->length()I
 
     move-result v10
@@ -1049,7 +1032,7 @@
 
     move-object v13, v11
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_5
     iget-object v11, v10, Lcom/airbnb/lottie/c/d;->jw:Ljava/util/List;
@@ -1064,7 +1047,7 @@
 
     const/4 v14, 0x0
 
-    :goto_6
+    :goto_4
     if-ge v14, v12, :cond_6
 
     invoke-interface {v11, v14}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -1087,7 +1070,7 @@
 
     move-object/from16 v7, v16
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_6
     move-object/from16 v16, v7
@@ -1096,10 +1079,10 @@
 
     invoke-interface {v7, v10, v13}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :goto_7
+    :goto_5
     const/4 v7, 0x0
 
-    :goto_8
+    :goto_6
     invoke-interface {v13}, Ljava/util/List;->size()I
 
     move-result v8
@@ -1162,10 +1145,9 @@
 
     iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
 
-    :goto_9
     invoke-static {v8, v11, v1}, Lcom/airbnb/lottie/c/c/h;->a(Landroid/graphics/Path;Landroid/graphics/Paint;Landroid/graphics/Canvas;)V
 
-    goto :goto_a
+    goto :goto_7
 
     :cond_7
     iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
@@ -1174,12 +1156,12 @@
 
     iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
 
-    goto :goto_9
+    invoke-static {v8, v11, v1}, Lcom/airbnb/lottie/c/c/h;->a(Landroid/graphics/Path;Landroid/graphics/Paint;Landroid/graphics/Canvas;)V
 
-    :goto_a
+    :goto_7
     add-int/lit8 v7, v7, 0x1
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_8
     iget-wide v7, v10, Lcom/airbnb/lottie/c/d;->jy:D
@@ -1208,8 +1190,6 @@
 
     if-eqz v10, :cond_9
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/h;->mk:Lcom/airbnb/lottie/a/b/a;
-
     invoke-virtual {v10}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
     move-result-object v10
@@ -1229,17 +1209,17 @@
 
     invoke-virtual {v1, v7, v11}, Landroid/graphics/Canvas;->translate(FF)V
 
-    goto :goto_b
+    goto :goto_8
 
     :cond_a
     move-object/from16 v16, v7
 
-    :goto_b
+    :goto_8
     add-int/lit8 v9, v9, 0x1
 
     move-object/from16 v7, v16
 
-    goto/16 :goto_5
+    goto/16 :goto_3
 
     :cond_b
     invoke-direct {v0, v3, v4, v2, v1}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/c/b;Lcom/airbnb/lottie/c/c;Landroid/graphics/Matrix;Landroid/graphics/Canvas;)V
diff --git a/com.discord/smali/com/airbnb/lottie/c/d.smali b/com.discord/smali/com/airbnb/lottie/c/d.smali
index d3f724885e..2741f98960 100644
--- a/com.discord/smali/com/airbnb/lottie/c/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/d;
 .super Ljava/lang/Object;
+.source "FontCharacter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/c/e.smali b/com.discord/smali/com/airbnb/lottie/c/e.smali
index 91900834c9..ecb1a6a96b 100644
--- a/com.discord/smali/com/airbnb/lottie/c/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/e;
 .super Ljava/lang/Object;
+.source "KeyPath.java"
 
 
 # instance fields
@@ -59,9 +60,7 @@
 
     iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jz:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->jz:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/f.smali b/com.discord/smali/com/airbnb/lottie/c/f.smali
index 0edd8169bc..c897d3c67f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/c/f;
 .super Ljava/lang/Object;
+.source "KeyPathElement.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/c/g.smali b/com.discord/smali/com/airbnb/lottie/c/g.smali
index 453193a073..487f8f4307 100644
--- a/com.discord/smali/com/airbnb/lottie/c/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/g;
 .super Ljava/lang/Object;
+.source "LottieCompositionCache.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/c/h.smali b/com.discord/smali/com/airbnb/lottie/c/h.smali
index ef1ea59ab2..89448d80e2 100644
--- a/com.discord/smali/com/airbnb/lottie/c/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/c/h;
 .super Ljava/lang/Object;
+.source "MutablePair.java"
 
 
 # annotations
@@ -137,8 +138,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/h;->first:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -151,9 +150,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/airbnb/lottie/c/h;->second:Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/airbnb/lottie/d.smali b/com.discord/smali/com/airbnb/lottie/d.smali
index c1024caa99..8e55fa2e6e 100644
--- a/com.discord/smali/com/airbnb/lottie/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/d;
 .super Ljava/lang/Object;
+.source "LottieComposition.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/airbnb/lottie/d/a.smali b/com.discord/smali/com/airbnb/lottie/d/a.smali
index f2b14675e2..c10e26ba0b 100644
--- a/com.discord/smali/com/airbnb/lottie/d/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/d/a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/airbnb/lottie/d/a;
 .super Ljava/lang/Enum;
+.source "FileExtension.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/d/b.smali b/com.discord/smali/com/airbnb/lottie/d/b.smali
index d68b4eeeb7..74688252e5 100644
--- a/com.discord/smali/com/airbnb/lottie/d/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/d/b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/d/b;
 .super Ljava/lang/Object;
+.source "NetworkCache.java"
 
 
 # instance fields
@@ -150,6 +151,8 @@
     invoke-virtual {p1}, Ljava/io/InputStream;->close()V
 
     throw p2
+
+    return-void
 .end method
 
 .method final bv()Landroidx/core/util/Pair;
@@ -222,7 +225,7 @@
 
     move-result v1
     :try_end_0
-    .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
 
     if-eqz v1, :cond_1
 
@@ -298,4 +301,7 @@
 
     :catch_0
     return-object v0
+
+    :catch_1
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/d/c$1.smali b/com.discord/smali/com/airbnb/lottie/d/c$1.smali
index 16346d5b80..076c50c36b 100644
--- a/com.discord/smali/com/airbnb/lottie/d/c$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/d/c$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/d/c$1;
 .super Ljava/lang/Object;
+.source "NetworkFetcher.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/com/airbnb/lottie/d/c.smali b/com.discord/smali/com/airbnb/lottie/d/c.smali
index 5f32e75185..602229fa4f 100644
--- a/com.discord/smali/com/airbnb/lottie/d/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/d/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/d/c;
 .super Ljava/lang/Object;
+.source "NetworkFetcher.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/airbnb/lottie/e$1.smali b/com.discord/smali/com/airbnb/lottie/e$1.smali
index f60f2fa7f3..6b064184df 100644
--- a/com.discord/smali/com/airbnb/lottie/e$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e$1;
 .super Ljava/lang/Object;
+.source "LottieCompositionFactory.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/com/airbnb/lottie/e$2.smali b/com.discord/smali/com/airbnb/lottie/e$2.smali
index be3683981e..2266ce9751 100644
--- a/com.discord/smali/com/airbnb/lottie/e$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e$2;
 .super Ljava/lang/Object;
+.source "LottieCompositionFactory.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/h;
diff --git a/com.discord/smali/com/airbnb/lottie/e$3.smali b/com.discord/smali/com/airbnb/lottie/e$3.smali
index 88da73de2d..e5b9353bde 100644
--- a/com.discord/smali/com/airbnb/lottie/e$3.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e$3;
 .super Ljava/lang/Object;
+.source "LottieCompositionFactory.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/com/airbnb/lottie/e$4.smali b/com.discord/smali/com/airbnb/lottie/e$4.smali
index a89e931f55..cb2e363d41 100644
--- a/com.discord/smali/com/airbnb/lottie/e$4.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e$4;
 .super Ljava/lang/Object;
+.source "LottieCompositionFactory.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/com/airbnb/lottie/e$5.smali b/com.discord/smali/com/airbnb/lottie/e$5.smali
index 287909267f..a7eba986be 100644
--- a/com.discord/smali/com/airbnb/lottie/e$5.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e$5;
 .super Ljava/lang/Object;
+.source "LottieCompositionFactory.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/com/airbnb/lottie/e$6.smali b/com.discord/smali/com/airbnb/lottie/e$6.smali
index 9af168987c..e742c017bd 100644
--- a/com.discord/smali/com/airbnb/lottie/e$6.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e$6;
 .super Ljava/lang/Object;
+.source "LottieCompositionFactory.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/h;
diff --git a/com.discord/smali/com/airbnb/lottie/e.smali b/com.discord/smali/com/airbnb/lottie/e.smali
index c3272259ea..8b219ba337 100644
--- a/com.discord/smali/com/airbnb/lottie/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e;
 .super Ljava/lang/Object;
+.source "LottieCompositionFactory.java"
 
 
 # static fields
@@ -409,7 +410,7 @@
 .end method
 
 .method public static b(Landroid/util/JsonReader;Ljava/lang/String;)Lcom/airbnb/lottie/j;
-    .locals 22
+    .locals 20
     .param p1    # Ljava/lang/String;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
@@ -640,39 +641,49 @@
     :goto_2
     packed-switch v10, :pswitch_data_0
 
-    move-object/from16 v20, v6
+    move-object v0, v6
 
-    move-object/from16 v21, v7
+    move-object v10, v7
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :pswitch_0
     invoke-static {v0, v8, v7}, Lcom/airbnb/lottie/e/r;->a(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;Landroidx/collection/SparseArrayCompat;)V
 
-    goto :goto_3
+    move-object v0, v6
+
+    move-object v10, v7
+
+    goto/16 :goto_3
 
     :pswitch_1
     invoke-static {v0, v6}, Lcom/airbnb/lottie/e/r;->a(Landroid/util/JsonReader;Ljava/util/Map;)V
 
-    goto :goto_3
+    move-object v0, v6
+
+    move-object v10, v7
+
+    goto/16 :goto_3
 
     :pswitch_2
     invoke-static {v0, v8, v4, v5}, Lcom/airbnb/lottie/e/r;->a(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;Ljava/util/Map;Ljava/util/Map;)V
 
-    goto :goto_3
+    move-object v0, v6
+
+    move-object v10, v7
+
+    goto/16 :goto_3
 
     :pswitch_3
     invoke-static {v0, v8, v3, v2}, Lcom/airbnb/lottie/e/r;->a(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;Ljava/util/List;Landroidx/collection/LongSparseArray;)V
 
-    :cond_1
-    :goto_3
-    move-object/from16 v20, v6
+    move-object v0, v6
 
-    move-object/from16 v21, v7
+    move-object v10, v7
 
-    goto :goto_4
+    goto/16 :goto_3
 
     :pswitch_4
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
@@ -715,6 +726,17 @@
 
     invoke-virtual {v8, v0}, Lcom/airbnb/lottie/d;->t(Ljava/lang/String;)V
 
+    move-object v0, v6
+
+    move-object v10, v7
+
+    goto :goto_3
+
+    :cond_1
+    move-object v0, v6
+
+    move-object v10, v7
+
     goto :goto_3
 
     :pswitch_5
@@ -724,29 +746,37 @@
 
     double-to-float v14, v14
 
-    goto :goto_5
+    move-object/from16 v0, p0
+
+    goto/16 :goto_0
 
     :pswitch_6
-    move-object/from16 v20, v6
+    move-object v0, v6
 
-    move-object/from16 v21, v7
+    move-object v10, v7
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextDouble()D
 
     move-result-wide v6
 
-    double-to-float v0, v6
+    double-to-float v6, v6
 
-    const v6, 0x3c23d70a    # 0.01f
+    const v7, 0x3c23d70a    # 0.01f
 
-    sub-float v13, v0, v6
+    sub-float v13, v6, v7
 
-    goto :goto_4
+    move-object v6, v0
+
+    move-object v7, v10
+
+    move-object/from16 v0, p0
+
+    goto/16 :goto_0
 
     :pswitch_7
-    move-object/from16 v20, v6
+    move-object v0, v6
 
-    move-object/from16 v21, v7
+    move-object v10, v7
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextDouble()D
 
@@ -754,64 +784,83 @@
 
     double-to-float v12, v6
 
-    goto :goto_4
+    move-object v6, v0
+
+    move-object v7, v10
+
+    move-object/from16 v0, p0
+
+    goto/16 :goto_0
 
     :pswitch_8
-    move-object/from16 v20, v6
+    move-object v0, v6
 
-    move-object/from16 v21, v7
+    move-object v10, v7
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
 
     move-result v11
 
-    goto :goto_4
+    move-object v6, v0
+
+    move-object v7, v10
+
+    move-object/from16 v0, p0
+
+    goto/16 :goto_0
 
     :pswitch_9
-    move-object/from16 v20, v6
+    move-object v0, v6
 
-    move-object/from16 v21, v7
+    move-object v10, v7
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
 
     move-result v9
 
-    :goto_4
-    move-object/from16 v6, v20
+    move-object v6, v0
 
-    move-object/from16 v7, v21
+    move-object v7, v10
+
+    move-object/from16 v0, p0
+
+    goto/16 :goto_0
+
+    :goto_3
+    move-object v6, v0
+
+    move-object v7, v10
 
-    :goto_5
     move-object/from16 v0, p0
 
     goto/16 :goto_0
 
     :cond_2
-    move-object/from16 v20, v6
+    move-object v0, v6
 
-    move-object/from16 v21, v7
+    move-object v10, v7
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endObject()V
 
-    int-to-float v0, v9
-
-    mul-float v0, v0, v1
-
-    float-to-int v0, v0
-
-    int-to-float v6, v11
+    int-to-float v6, v9
 
     mul-float v6, v6, v1
 
-    float-to-int v1, v6
+    float-to-int v6, v6
 
-    new-instance v6, Landroid/graphics/Rect;
+    int-to-float v7, v11
 
-    const/4 v7, 0x0
+    mul-float v7, v7, v1
 
-    invoke-direct {v6, v7, v7, v0, v1}, Landroid/graphics/Rect;-><init>(IIII)V
+    float-to-int v1, v7
 
-    iput-object v6, v8, Lcom/airbnb/lottie/d;->gf:Landroid/graphics/Rect;
+    new-instance v7, Landroid/graphics/Rect;
+
+    const/4 v9, 0x0
+
+    invoke-direct {v7, v9, v9, v6, v1}, Landroid/graphics/Rect;-><init>(IIII)V
+
+    iput-object v7, v8, Lcom/airbnb/lottie/d;->gf:Landroid/graphics/Rect;
 
     iput v12, v8, Lcom/airbnb/lottie/d;->gg:F
 
@@ -827,11 +876,7 @@
 
     iput-object v5, v8, Lcom/airbnb/lottie/d;->ga:Ljava/util/Map;
 
-    move-object/from16 v0, v21
-
-    iput-object v0, v8, Lcom/airbnb/lottie/d;->gc:Landroidx/collection/SparseArrayCompat;
-
-    move-object/from16 v0, v20
+    iput-object v10, v8, Lcom/airbnb/lottie/d;->gc:Landroidx/collection/SparseArrayCompat;
 
     iput-object v0, v8, Lcom/airbnb/lottie/d;->gb:Ljava/util/Map;
 
@@ -860,6 +905,8 @@
 
     return-object v1
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x53ef8c7d -> :sswitch_9
diff --git a/com.discord/smali/com/airbnb/lottie/e/a.smali b/com.discord/smali/com/airbnb/lottie/e/a.smali
index ba27acdcdf..f40b8fdc09 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/a;
 .super Ljava/lang/Object;
+.source "AnimatablePathValueParser.java"
 
 
 # direct methods
@@ -206,7 +207,7 @@
     :goto_2
     packed-switch v5, :pswitch_data_1
 
-    goto :goto_4
+    goto :goto_3
 
     :pswitch_2
     invoke-virtual {p0}, Landroid/util/JsonReader;->peek()Landroid/util/JsonToken;
@@ -217,6 +218,8 @@
 
     if-ne v5, v6, :cond_2
 
+    const/4 v1, 0x1
+
     goto :goto_3
 
     :cond_2
@@ -235,10 +238,9 @@
 
     if-ne v5, v6, :cond_3
 
-    :goto_3
     const/4 v1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     invoke-static {p0, p1, v9}, Lcom/airbnb/lottie/e/d;->a(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;Z)Lcom/airbnb/lottie/c/a/b;
@@ -254,7 +256,7 @@
 
     goto :goto_0
 
-    :goto_4
+    :goto_3
     invoke-virtual {p0}, Landroid/util/JsonReader;->skipValue()V
 
     goto :goto_0
@@ -280,8 +282,6 @@
 
     return-object p0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x78
         :pswitch_1
diff --git a/com.discord/smali/com/airbnb/lottie/e/aa.smali b/com.discord/smali/com/airbnb/lottie/e/aa.smali
index 7d108ea4f9..4b505af087 100644
--- a/com.discord/smali/com/airbnb/lottie/e/aa.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/aa.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/aa;
 .super Ljava/lang/Object;
+.source "ShapeDataParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
@@ -363,6 +364,10 @@
 
     throw p1
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
diff --git a/com.discord/smali/com/airbnb/lottie/e/ab.smali b/com.discord/smali/com/airbnb/lottie/e/ab.smali
index 8a8a374ea7..be1ec589f3 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ab.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ab.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/ab;
 .super Ljava/lang/Object;
+.source "ShapeFillParser.java"
 
 
 # direct methods
@@ -182,17 +183,14 @@
 
     sget-object p0, Landroid/graphics/Path$FillType;->WINDING:Landroid/graphics/Path$FillType;
 
-    :goto_3
-    move-object v6, p0
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     sget-object p0, Landroid/graphics/Path$FillType;->EVEN_ODD:Landroid/graphics/Path$FillType;
 
-    goto :goto_3
+    :goto_3
+    move-object v6, p0
 
-    :goto_4
     new-instance p0, Lcom/airbnb/lottie/c/b/m;
 
     move-object v3, p0
@@ -201,6 +199,8 @@
 
     return-object p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
diff --git a/com.discord/smali/com/airbnb/lottie/e/ac.smali b/com.discord/smali/com/airbnb/lottie/e/ac.smali
index 18198dbdb0..07fea93bca 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ac.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ac.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/ac;
 .super Ljava/lang/Object;
+.source "ShapePathParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/ad.smali b/com.discord/smali/com/airbnb/lottie/e/ad.smali
index 10e63ea129..e45ae66c6f 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ad.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ad.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/ad;
 .super Ljava/lang/Object;
+.source "ShapeStrokeParser.java"
 
 
 # direct methods
@@ -274,7 +275,6 @@
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    :goto_7
     const/16 v15, 0x6f
 
     goto :goto_4
@@ -286,14 +286,18 @@
 
     move-result-object v12
 
-    goto :goto_7
+    const/16 v15, 0x6f
+
+    goto :goto_4
 
     :pswitch_4
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
 
     move-result-object v2
 
-    goto :goto_7
+    const/16 v15, 0x6f
+
+    goto :goto_4
 
     :cond_b
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endObject()V
@@ -314,7 +318,7 @@
 
     if-eq v13, v14, :cond_c
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
     const-string v13, "o"
@@ -327,7 +331,7 @@
 
     const/4 v2, 0x0
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_d
     const/16 v14, 0x6f
@@ -342,7 +346,7 @@
 
     const/4 v2, 0x2
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_e
     const/16 v14, 0x6f
@@ -357,26 +361,30 @@
 
     const/4 v2, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_f
-    :goto_8
+    :goto_7
     const/4 v2, -0x1
 
-    :goto_9
+    :goto_8
     packed-switch v2, :pswitch_data_3
 
-    goto :goto_a
+    goto :goto_9
 
     :pswitch_5
     invoke-interface {v3, v12}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_a
+    goto :goto_9
 
     :pswitch_6
     move-object v5, v12
 
-    :goto_a
+    const/16 v15, 0x6f
+
+    goto/16 :goto_3
+
+    :goto_9
     const/16 v15, 0x6f
 
     goto/16 :goto_3
diff --git a/com.discord/smali/com/airbnb/lottie/e/ae.smali b/com.discord/smali/com/airbnb/lottie/e/ae.smali
index 027d172595..4c75482820 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ae.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ae.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/ae;
 .super Ljava/lang/Object;
+.source "ShapeTrimPathParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/af.smali b/com.discord/smali/com/airbnb/lottie/e/af.smali
index dada039fc3..78c111d3b6 100644
--- a/com.discord/smali/com/airbnb/lottie/e/af.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/af.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/airbnb/lottie/e/af;
 .super Ljava/lang/Object;
+.source "ValueParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/e/b.smali b/com.discord/smali/com/airbnb/lottie/e/b.smali
index 5ca27bea34..46619b0e1f 100644
--- a/com.discord/smali/com/airbnb/lottie/e/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/b;
 .super Ljava/lang/Object;
+.source "AnimatableTextPropertiesParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/c.smali b/com.discord/smali/com/airbnb/lottie/e/c.smali
index cc1313316a..ab18b8e17d 100644
--- a/com.discord/smali/com/airbnb/lottie/e/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/c;
 .super Ljava/lang/Object;
+.source "AnimatableTransformParser.java"
 
 
 # direct methods
@@ -295,9 +296,14 @@
 
     invoke-direct {v1}, Lcom/airbnb/lottie/c/a/e;-><init>()V
 
+    move-object v7, v1
+
+    goto :goto_5
+
     :cond_7
     move-object v7, v1
 
+    :goto_5
     if-nez v4, :cond_8
 
     new-instance v4, Lcom/airbnb/lottie/c/a/g;
@@ -310,18 +316,28 @@
 
     invoke-direct {v4, p0}, Lcom/airbnb/lottie/c/a/g;-><init>(Lcom/airbnb/lottie/g/d;)V
 
+    move-object v9, v4
+
+    goto :goto_6
+
     :cond_8
     move-object v9, v4
 
+    :goto_6
     if-nez v5, :cond_9
 
     new-instance v5, Lcom/airbnb/lottie/c/a/d;
 
     invoke-direct {v5}, Lcom/airbnb/lottie/c/a/d;-><init>()V
 
+    move-object v11, v5
+
+    goto :goto_7
+
     :cond_9
     move-object v11, v5
 
+    :goto_7
     new-instance p0, Lcom/airbnb/lottie/c/a/l;
 
     move-object v6, p0
diff --git a/com.discord/smali/com/airbnb/lottie/e/d.smali b/com.discord/smali/com/airbnb/lottie/e/d.smali
index 112d0c70b2..7a4a3180da 100644
--- a/com.discord/smali/com/airbnb/lottie/e/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/d;
 .super Ljava/lang/Object;
+.source "AnimatableValueParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/e.smali b/com.discord/smali/com/airbnb/lottie/e/e.smali
index d9091ac02f..fe6c84a6ef 100644
--- a/com.discord/smali/com/airbnb/lottie/e/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/e;
 .super Ljava/lang/Object;
+.source "CircleShapeParser.java"
 
 
 # direct methods
@@ -11,9 +12,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     const/4 v2, 0x3
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/f.smali b/com.discord/smali/com/airbnb/lottie/e/f.smali
index 02ba755f55..fd7f1786ab 100644
--- a/com.discord/smali/com/airbnb/lottie/e/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/f;
 .super Ljava/lang/Object;
+.source "ColorParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
diff --git a/com.discord/smali/com/airbnb/lottie/e/g.smali b/com.discord/smali/com/airbnb/lottie/e/g.smali
index 7a2366f46f..1b77c732b5 100644
--- a/com.discord/smali/com/airbnb/lottie/e/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/g;
 .super Ljava/lang/Object;
+.source "ContentModelParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/h.smali b/com.discord/smali/com/airbnb/lottie/e/h.smali
index b14bb8793e..05b245d560 100644
--- a/com.discord/smali/com/airbnb/lottie/e/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/h;
 .super Ljava/lang/Object;
+.source "DocumentDataParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
diff --git a/com.discord/smali/com/airbnb/lottie/e/i.smali b/com.discord/smali/com/airbnb/lottie/e/i.smali
index c2d19c1398..93a5945989 100644
--- a/com.discord/smali/com/airbnb/lottie/e/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/i;
 .super Ljava/lang/Object;
+.source "FloatParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
diff --git a/com.discord/smali/com/airbnb/lottie/e/j.smali b/com.discord/smali/com/airbnb/lottie/e/j.smali
index cde68ee54f..c62caa48fa 100644
--- a/com.discord/smali/com/airbnb/lottie/e/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/j;
 .super Ljava/lang/Object;
+.source "GradientColorParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
@@ -312,11 +313,9 @@
     :cond_4
     iget p1, p0, Lcom/airbnb/lottie/e/j;->mv:I
 
-    new-array p1, p1, [F
+    new-array v0, p1, [F
 
-    iget v0, p0, Lcom/airbnb/lottie/e/j;->mv:I
-
-    new-array v0, v0, [I
+    new-array p1, p1, [I
 
     const/4 v1, 0x0
 
@@ -364,7 +363,7 @@
 
     move-result v5
 
-    aput v5, v0, v4
+    aput v5, p1, v4
 
     goto :goto_3
 
@@ -389,7 +388,7 @@
     :pswitch_3
     double-to-float v5, v5
 
-    aput v5, p1, v4
+    aput v5, v0, v4
 
     :goto_3
     add-int/lit8 v2, v2, 0x1
@@ -399,7 +398,7 @@
     :cond_5
     new-instance v1, Lcom/airbnb/lottie/c/b/c;
 
-    invoke-direct {v1, p1, v0}, Lcom/airbnb/lottie/c/b/c;-><init>([F[I)V
+    invoke-direct {v1, v0, p1}, Lcom/airbnb/lottie/c/b/c;-><init>([F[I)V
 
     invoke-direct {p0, v1, p2}, Lcom/airbnb/lottie/e/j;->a(Lcom/airbnb/lottie/c/b/c;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/k.smali b/com.discord/smali/com/airbnb/lottie/e/k.smali
index 22c765a17c..f76f692d47 100644
--- a/com.discord/smali/com/airbnb/lottie/e/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/k.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/k;
 .super Ljava/lang/Object;
+.source "GradientFillParser.java"
 
 
 # direct methods
@@ -179,15 +180,15 @@
 
     sget-object v1, Landroid/graphics/Path$FillType;->WINDING:Landroid/graphics/Path$FillType;
 
-    :goto_3
-    move-object v5, v1
-
-    goto :goto_0
+    goto :goto_3
 
     :cond_5
     sget-object v1, Landroid/graphics/Path$FillType;->EVEN_ODD:Landroid/graphics/Path$FillType;
 
-    goto :goto_3
+    :goto_3
+    move-object v5, v1
+
+    goto :goto_0
 
     :pswitch_4
     invoke-static {p0, p1}, Lcom/airbnb/lottie/e/d;->f(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/a/f;
@@ -212,15 +213,15 @@
 
     sget v1, Lcom/airbnb/lottie/c/b/f;->kh:I
 
-    :goto_4
-    move v4, v1
-
-    goto/16 :goto_0
+    goto :goto_4
 
     :cond_6
     sget v1, Lcom/airbnb/lottie/c/b/f;->ki:I
 
-    goto :goto_4
+    :goto_4
+    move v4, v1
+
+    goto/16 :goto_0
 
     :pswitch_7
     invoke-static {p0, p1}, Lcom/airbnb/lottie/e/d;->e(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/a/d;
diff --git a/com.discord/smali/com/airbnb/lottie/e/l.smali b/com.discord/smali/com/airbnb/lottie/e/l.smali
index 8614c19d4d..99adb38403 100644
--- a/com.discord/smali/com/airbnb/lottie/e/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/l.smali
@@ -1,10 +1,11 @@
 .class final Lcom/airbnb/lottie/e/l;
 .super Ljava/lang/Object;
+.source "GradientStrokeParser.java"
 
 
 # direct methods
 .method static k(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/b/e;
-    .locals 21
+    .locals 22
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -56,11 +57,11 @@
 
     invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
 
-    move-result v16
+    move-result v17
 
-    const/16 v17, -0x1
+    const/16 v18, -0x1
 
-    sparse-switch v16, :sswitch_data_0
+    sparse-switch v17, :sswitch_data_0
 
     goto/16 :goto_1
 
@@ -214,13 +215,13 @@
     :goto_2
     packed-switch v2, :pswitch_data_0
 
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    goto/16 :goto_f
+    goto/16 :goto_b
 
     :pswitch_0
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->beginArray()V
@@ -241,23 +242,23 @@
     :goto_4
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->hasNext()Z
 
-    move-result v16
+    move-result v19
 
-    if-eqz v16, :cond_4
+    if-eqz v19, :cond_4
 
-    move-object/from16 v18, v15
+    move-object/from16 v19, v15
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextName()Ljava/lang/String;
 
     move-result-object v15
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     invoke-virtual {v15}, Ljava/lang/String;->hashCode()I
 
     move-result v14
 
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
     const/16 v13, 0x6e
 
@@ -304,12 +305,11 @@
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    :goto_7
-    move-object/from16 v15, v18
+    move-object/from16 v15, v19
 
-    move/from16 v14, v19
+    move/from16 v14, v20
 
-    move-object/from16 v13, v20
+    move-object/from16 v13, v21
 
     goto :goto_4
 
@@ -320,21 +320,33 @@
 
     move-result-object v2
 
-    goto :goto_7
+    move-object/from16 v15, v19
+
+    move/from16 v14, v20
+
+    move-object/from16 v13, v21
+
+    goto :goto_4
 
     :pswitch_2
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
 
     move-result-object v3
 
-    goto :goto_7
+    move-object/from16 v15, v19
+
+    move/from16 v14, v20
+
+    move-object/from16 v13, v21
+
+    goto :goto_4
 
     :cond_4
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
-    move-object/from16 v18, v15
+    move-object/from16 v19, v15
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endObject()V
 
@@ -348,10 +360,9 @@
 
     move-object v15, v2
 
-    :goto_8
-    move/from16 v14, v19
+    move/from16 v14, v20
 
-    move-object/from16 v13, v20
+    move-object/from16 v13, v21
 
     goto :goto_3
 
@@ -376,16 +387,20 @@
     invoke-interface {v11, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_7
-    move-object/from16 v15, v18
+    move-object/from16 v15, v19
 
-    goto :goto_8
+    move/from16 v14, v20
+
+    move-object/from16 v13, v21
+
+    goto/16 :goto_3
 
     :cond_8
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
-    move-object/from16 v18, v15
+    move-object/from16 v19, v15
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endArray()V
 
@@ -405,13 +420,21 @@
 
     invoke-interface {v11, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :cond_9
-    move-object/from16 v15, v18
+    move-object/from16 v15, v19
 
-    goto/16 :goto_f
+    move/from16 v14, v20
+
+    move-object/from16 v13, v21
+
+    goto/16 :goto_0
+
+    :cond_9
+    move-object/from16 v15, v19
+
+    goto/16 :goto_b
 
     :pswitch_3
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
     const/4 v2, 0x0
 
@@ -421,10 +444,12 @@
 
     double-to-float v14, v13
 
-    goto :goto_9
+    move-object/from16 v13, v21
+
+    goto/16 :goto_0
 
     :pswitch_4
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -442,14 +467,14 @@
 
     aget-object v13, v3, v14
 
-    move/from16 v14, v19
+    move/from16 v14, v20
 
     goto/16 :goto_0
 
     :pswitch_5
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -467,12 +492,14 @@
 
     aget-object v12, v3, v12
 
-    goto :goto_9
+    move-object/from16 v13, v21
+
+    goto/16 :goto_0
 
     :pswitch_6
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -482,15 +509,14 @@
 
     move-result-object v10
 
-    :goto_9
-    move-object/from16 v13, v20
+    move-object/from16 v13, v21
 
     goto/16 :goto_0
 
     :pswitch_7
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -501,9 +527,9 @@
     goto/16 :goto_0
 
     :pswitch_8
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -514,9 +540,9 @@
     goto/16 :goto_0
 
     :pswitch_9
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -530,20 +556,24 @@
 
     sget v3, Lcom/airbnb/lottie/c/b/f;->kh:I
 
-    :goto_a
-    move v5, v3
-
-    goto/16 :goto_f
+    goto :goto_7
 
     :cond_a
     sget v3, Lcom/airbnb/lottie/c/b/f;->ki:I
 
-    goto :goto_a
+    :goto_7
+    move v5, v3
+
+    move/from16 v14, v20
+
+    move-object/from16 v13, v21
+
+    goto/16 :goto_0
 
     :pswitch_a
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -554,9 +584,9 @@
     goto/16 :goto_0
 
     :pswitch_b
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     const/4 v2, 0x0
 
@@ -566,7 +596,7 @@
 
     const/4 v3, -0x1
 
-    :goto_b
+    :goto_8
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->hasNext()Z
 
     move-result v14
@@ -589,7 +619,7 @@
 
     if-eq v2, v13, :cond_b
 
-    goto :goto_c
+    goto :goto_9
 
     :cond_b
     const-string v2, "p"
@@ -602,7 +632,7 @@
 
     const/4 v2, 0x0
 
-    goto :goto_d
+    goto :goto_a
 
     :cond_c
     const-string v2, "k"
@@ -615,47 +645,58 @@
 
     const/4 v2, 0x1
 
-    goto :goto_d
+    goto :goto_a
 
     :cond_d
-    :goto_c
+    :goto_9
     const/4 v2, -0x1
 
-    :goto_d
+    :goto_a
     packed-switch v2, :pswitch_data_2
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    :goto_e
     const/4 v2, 0x0
 
     const/4 v13, 0x1
 
-    goto :goto_b
+    goto :goto_8
 
     :pswitch_c
     invoke-static {v0, v1, v3}, Lcom/airbnb/lottie/e/d;->a(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;I)Lcom/airbnb/lottie/c/a/c;
 
     move-result-object v6
 
-    goto :goto_e
+    const/4 v2, 0x0
+
+    const/4 v13, 0x1
+
+    goto :goto_8
 
     :pswitch_d
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
 
     move-result v3
 
-    goto :goto_e
+    const/4 v2, 0x0
+
+    const/4 v13, 0x1
+
+    goto :goto_8
 
     :cond_e
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endObject()V
 
-    goto :goto_f
+    move/from16 v14, v20
+
+    move-object/from16 v13, v21
+
+    goto/16 :goto_0
 
     :pswitch_e
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
 
@@ -663,15 +704,17 @@
 
     goto/16 :goto_0
 
-    :goto_f
-    move/from16 v14, v19
+    :goto_b
+    move/from16 v14, v20
 
-    goto/16 :goto_9
+    move-object/from16 v13, v21
+
+    goto/16 :goto_0
 
     :cond_f
-    move-object/from16 v20, v13
+    move-object/from16 v21, v13
 
-    move/from16 v19, v14
+    move/from16 v20, v14
 
     new-instance v13, Lcom/airbnb/lottie/c/b/e;
 
@@ -693,9 +736,9 @@
 
     move-object v8, v12
 
-    move-object/from16 v9, v20
+    move-object/from16 v9, v21
 
-    move/from16 v10, v19
+    move/from16 v10, v20
 
     move-object v12, v15
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/m.smali b/com.discord/smali/com/airbnb/lottie/e/m.smali
index ed3abc61ab..407d1b2732 100644
--- a/com.discord/smali/com/airbnb/lottie/e/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/m;
 .super Ljava/lang/Object;
+.source "IntegerParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
diff --git a/com.discord/smali/com/airbnb/lottie/e/n$1.smali b/com.discord/smali/com/airbnb/lottie/e/n$1.smali
index 6c6acb2a66..eb49e00775 100644
--- a/com.discord/smali/com/airbnb/lottie/e/n$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/n$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/airbnb/lottie/e/n$1;
 .super Ljava/lang/Object;
+.source "JsonUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/e/n.smali b/com.discord/smali/com/airbnb/lottie/e/n.smali
index 796d6f3036..2108380d1d 100644
--- a/com.discord/smali/com/airbnb/lottie/e/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/n.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/n;
 .super Ljava/lang/Object;
+.source "JsonUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/o.smali b/com.discord/smali/com/airbnb/lottie/e/o.smali
index a095b64864..bb7cfc6ab2 100644
--- a/com.discord/smali/com/airbnb/lottie/e/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/o.smali
@@ -1,5 +1,6 @@
 .class Lcom/airbnb/lottie/e/o;
 .super Ljava/lang/Object;
+.source "KeyframeParser.java"
 
 
 # static fields
@@ -124,13 +125,13 @@
 
     move-object v9, v8
 
-    move-object v13, v9
+    move-object v14, v9
 
-    move-object v14, v13
+    move-object v15, v14
 
     const/4 v5, 0x0
 
-    const/4 v11, 0x0
+    const/4 v12, 0x0
 
     :goto_0
     invoke-virtual/range {p1 .. p1}, Landroid/util/JsonReader;->hasNext()Z
@@ -143,22 +144,22 @@
 
     move-result-object v10
 
-    const/4 v12, -0x1
+    const/4 v11, -0x1
 
     invoke-virtual {v10}, Ljava/lang/String;->hashCode()I
 
-    move-result v15
+    move-result v13
 
     const/4 v3, 0x1
 
-    sparse-switch v15, :sswitch_data_0
+    sparse-switch v13, :sswitch_data_0
 
     goto :goto_1
 
     :sswitch_0
-    const-string v15, "to"
+    const-string v13, "to"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -169,9 +170,9 @@
     goto :goto_2
 
     :sswitch_1
-    const-string v15, "ti"
+    const-string v13, "ti"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -182,9 +183,9 @@
     goto :goto_2
 
     :sswitch_2
-    const-string v15, "t"
+    const-string v13, "t"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -195,9 +196,9 @@
     goto :goto_2
 
     :sswitch_3
-    const-string v15, "s"
+    const-string v13, "s"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -208,9 +209,9 @@
     goto :goto_2
 
     :sswitch_4
-    const-string v15, "o"
+    const-string v13, "o"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -221,9 +222,9 @@
     goto :goto_2
 
     :sswitch_5
-    const-string v15, "i"
+    const-string v13, "i"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -234,9 +235,9 @@
     goto :goto_2
 
     :sswitch_6
-    const-string v15, "h"
+    const-string v13, "h"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -247,9 +248,9 @@
     goto :goto_2
 
     :sswitch_7
-    const-string v15, "e"
+    const-string v13, "e"
 
-    invoke-virtual {v10, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -273,14 +274,14 @@
     :pswitch_0
     invoke-static/range {p1 .. p2}, Lcom/airbnb/lottie/e/n;->c(Landroid/util/JsonReader;F)Landroid/graphics/PointF;
 
-    move-result-object v14
+    move-result-object v15
 
     goto :goto_0
 
     :pswitch_1
     invoke-static/range {p1 .. p2}, Lcom/airbnb/lottie/e/n;->c(Landroid/util/JsonReader;F)Landroid/graphics/PointF;
 
-    move-result-object v13
+    move-result-object v14
 
     goto :goto_0
 
@@ -317,14 +318,14 @@
     :pswitch_5
     invoke-interface {v2, v0, v1}, Lcom/airbnb/lottie/e/af;->a(Landroid/util/JsonReader;F)Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object v8
 
     goto/16 :goto_0
 
     :pswitch_6
     invoke-interface {v2, v0, v1}, Lcom/airbnb/lottie/e/af;->a(Landroid/util/JsonReader;F)Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v9
 
     goto/16 :goto_0
 
@@ -333,7 +334,7 @@
 
     move-result-wide v10
 
-    double-to-float v11, v10
+    double-to-float v12, v10
 
     goto/16 :goto_0
 
@@ -344,11 +345,11 @@
 
     sget-object v0, Lcom/airbnb/lottie/e/o;->LINEAR_INTERPOLATOR:Landroid/view/animation/Interpolator;
 
-    move-object v10, v0
+    move-object v11, v0
 
-    move-object v9, v8
+    move-object v10, v9
 
-    goto :goto_3
+    goto/16 :goto_3
 
     :cond_3
     if-eqz v6, :cond_7
@@ -454,31 +455,41 @@
     :try_end_0
     .catch Ljava/lang/ArrayIndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
 
+    move-object v11, v4
+
+    move-object v10, v8
+
+    goto :goto_3
+
     :catch_0
     :cond_6
-    move-object v10, v4
+    move-object v11, v4
+
+    move-object v10, v8
 
     goto :goto_3
 
     :cond_7
     sget-object v0, Lcom/airbnb/lottie/e/o;->LINEAR_INTERPOLATOR:Landroid/view/animation/Interpolator;
 
-    move-object v10, v0
+    move-object v11, v0
+
+    move-object v10, v8
 
     :goto_3
     new-instance v0, Lcom/airbnb/lottie/g/a;
 
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
-    move-object v6, v0
+    move-object v7, v0
 
-    move-object/from16 v7, p0
+    move-object/from16 v8, p0
 
-    invoke-direct/range {v6 .. v12}, Lcom/airbnb/lottie/g/a;-><init>(Lcom/airbnb/lottie/d;Ljava/lang/Object;Ljava/lang/Object;Landroid/view/animation/Interpolator;FLjava/lang/Float;)V
+    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 v13, v0, Lcom/airbnb/lottie/g/a;->mZ:Landroid/graphics/PointF;
+    iput-object v14, v0, Lcom/airbnb/lottie/g/a;->mZ:Landroid/graphics/PointF;
 
-    iput-object v14, v0, Lcom/airbnb/lottie/g/a;->na:Landroid/graphics/PointF;
+    iput-object v15, v0, Lcom/airbnb/lottie/g/a;->na:Landroid/graphics/PointF;
 
     return-object v0
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/p.smali b/com.discord/smali/com/airbnb/lottie/e/p.smali
index 1800548447..69756ea985 100644
--- a/com.discord/smali/com/airbnb/lottie/e/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/p.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/p;
 .super Ljava/lang/Object;
+.source "KeyframesParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/q.smali b/com.discord/smali/com/airbnb/lottie/e/q.smali
index 931c2235b9..92ba10287b 100644
--- a/com.discord/smali/com/airbnb/lottie/e/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/q.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/q;
 .super Ljava/lang/Object;
+.source "LayerParser.java"
 
 
 # direct methods
@@ -111,40 +112,40 @@
 
     const-wide/16 v12, -0x1
 
-    move/from16 v30, v2
+    move/from16 v29, v2
 
     move-object v14, v3
 
-    move-object/from16 v20, v14
+    move-object/from16 v16, v14
 
-    move-object/from16 v21, v20
+    move-object/from16 v27, v16
 
-    move-object/from16 v28, v21
+    move-object/from16 v28, v27
 
-    move-object/from16 v29, v28
+    move-object/from16 v30, v28
 
-    move-object/from16 v31, v29
+    move-object/from16 v31, v30
 
-    move-wide/from16 v16, v5
+    move-wide/from16 v17, v5
 
-    move-wide/from16 v18, v12
+    move-wide/from16 v24, v12
 
     const/4 v2, 0x0
 
     const/high16 v15, 0x3f800000    # 1.0f
 
+    const/16 v19, 0x0
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
     const/16 v22, 0x0
 
     const/16 v23, 0x0
 
-    const/16 v24, 0x0
-
-    const/16 v25, 0x0
-
     const/16 v26, 0x0
 
-    const/16 v27, 0x0
-
     move-object v12, v1
 
     move-object/from16 v13, v31
@@ -156,7 +157,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_f
+    if-eqz v3, :cond_10
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextName()Ljava/lang/String;
 
@@ -469,7 +470,7 @@
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    goto/16 :goto_e
+    goto/16 :goto_d
 
     :pswitch_0
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
@@ -518,7 +519,7 @@
 
     float-to-int v3, v3
 
-    move/from16 v27, v3
+    move/from16 v23, v3
 
     goto/16 :goto_0
 
@@ -537,7 +538,7 @@
 
     float-to-int v3, v3
 
-    move/from16 v26, v3
+    move/from16 v22, v3
 
     goto/16 :goto_0
 
@@ -548,7 +549,7 @@
 
     double-to-float v3, v5
 
-    move/from16 v25, v3
+    move/from16 v26, v3
 
     goto/16 :goto_0
 
@@ -620,7 +621,6 @@
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    :goto_7
     const/4 v4, 0x0
 
     goto :goto_4
@@ -632,7 +632,9 @@
 
     invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_7
+    const/4 v4, 0x0
+
+    goto :goto_4
 
     :cond_4
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endObject()V
@@ -656,12 +658,12 @@
 
     invoke-virtual {v7, v3}, Lcom/airbnb/lottie/d;->t(Ljava/lang/String;)V
 
-    goto/16 :goto_e
+    goto/16 :goto_d
 
     :pswitch_9
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->beginObject()V
 
-    :goto_8
+    :goto_7
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->hasNext()Z
 
     move-result v3
@@ -684,7 +686,7 @@
 
     if-eq v4, v5, :cond_6
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_6
     const-string v4, "d"
@@ -697,7 +699,7 @@
 
     const/4 v3, 0x0
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_7
     const-string v4, "a"
@@ -710,18 +712,18 @@
 
     const/4 v3, 0x1
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_8
-    :goto_9
+    :goto_8
     const/4 v3, -0x1
 
-    :goto_a
+    :goto_9
     packed-switch v3, :pswitch_data_1
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    goto :goto_8
+    goto :goto_7
 
     :pswitch_a
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->beginArray()V
@@ -736,10 +738,10 @@
 
     move-result-object v3
 
-    move-object/from16 v29, v3
+    move-object/from16 v30, v3
 
     :cond_9
-    :goto_b
+    :goto_a
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->hasNext()Z
 
     move-result v3
@@ -748,12 +750,12 @@
 
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->skipValue()V
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_a
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endArray()V
 
-    goto :goto_8
+    goto :goto_7
 
     :pswitch_b
     new-instance v3, Lcom/airbnb/lottie/c/a/j;
@@ -768,18 +770,20 @@
 
     move-object/from16 v28, v3
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_b
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endObject()V
 
-    goto/16 :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_c
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->beginArray()V
 
     :cond_c
-    :goto_c
+    :goto_b
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->hasNext()Z
 
     move-result v3
@@ -794,17 +798,22 @@
 
     invoke-interface {v8, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_c
+    goto :goto_b
+
+    :cond_d
+    invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endArray()V
+
+    goto/16 :goto_d
 
     :pswitch_d
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->beginArray()V
 
-    :goto_d
+    :goto_c
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->hasNext()Z
 
     move-result v3
 
-    if-eqz v3, :cond_d
+    if-eqz v3, :cond_e
 
     invoke-static/range {p0 .. p1}, Lcom/airbnb/lottie/e/s;->m(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/b/g;
 
@@ -812,12 +821,12 @@
 
     invoke-interface {v10, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_d
+    goto :goto_c
 
-    :cond_d
+    :cond_e
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endArray()V
 
-    goto/16 :goto_e
+    goto/16 :goto_d
 
     :pswitch_e
     invoke-static {}, Lcom/airbnb/lottie/c/c/d$b;->bt()[I
@@ -828,16 +837,20 @@
 
     move-result v4
 
-    aget v30, v3, v4
+    aget v29, v3, v4
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_f
     invoke-static/range {p0 .. p1}, Lcom/airbnb/lottie/e/c;->d(Landroid/util/JsonReader;Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/a/l;
 
-    move-result-object v21
+    move-result-object v27
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_10
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
@@ -846,9 +859,11 @@
 
     invoke-static {v3}, Landroid/graphics/Color;->parseColor(Ljava/lang/String;)I
 
-    move-result v24
+    move-result v21
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_11
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
@@ -865,9 +880,11 @@
 
     float-to-int v3, v3
 
-    move/from16 v23, v3
+    move/from16 v20, v3
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_12
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
@@ -884,9 +901,11 @@
 
     float-to-int v3, v3
 
-    move/from16 v22, v3
+    move/from16 v19, v3
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_13
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
@@ -895,9 +914,11 @@
 
     int-to-long v3, v3
 
-    move-wide/from16 v18, v3
+    move-wide/from16 v24, v3
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_14
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
@@ -910,7 +931,7 @@
 
     move-result v4
 
-    if-ge v3, v4, :cond_e
+    if-ge v3, v4, :cond_f
 
     invoke-static {}, Lcom/airbnb/lottie/c/c/d$a;->values()[Lcom/airbnb/lottie/c/c/d$a;
 
@@ -918,19 +939,25 @@
 
     aget-object v14, v4, v3
 
-    goto :goto_e
+    const/4 v4, 0x0
 
-    :cond_e
+    goto/16 :goto_0
+
+    :cond_f
     sget-object v14, Lcom/airbnb/lottie/c/c/d$a;->lX:Lcom/airbnb/lottie/c/c/d$a;
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_15
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
 
-    move-result-object v20
+    move-result-object v16
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_16
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextInt()I
@@ -939,21 +966,27 @@
 
     int-to-long v3, v3
 
-    move-wide/from16 v16, v3
+    move-wide/from16 v17, v3
 
-    goto :goto_e
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
 
     :pswitch_17
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->nextString()Ljava/lang/String;
 
     move-result-object v12
 
-    :goto_e
     const/4 v4, 0x0
 
     goto/16 :goto_0
 
-    :cond_f
+    :goto_d
+    const/4 v4, 0x0
+
+    goto/16 :goto_0
+
+    :cond_10
     invoke-virtual/range {p0 .. p0}, Landroid/util/JsonReader;->endObject()V
 
     div-float v32, v1, v15
@@ -966,7 +999,7 @@
 
     cmpl-float v0, v32, v11
 
-    if-lez v0, :cond_10
+    if-lez v0, :cond_11
 
     new-instance v5, Lcom/airbnb/lottie/g/a;
 
@@ -1002,26 +1035,28 @@
 
     invoke-interface {v11, v9}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_f
-
-    :cond_10
-    move-object v11, v6
-
-    :goto_f
     const/4 v0, 0x0
 
-    cmpl-float v1, v33, v0
-
-    if-lez v1, :cond_11
-
-    goto :goto_10
+    goto :goto_e
 
     :cond_11
+    move-object v11, v6
+
+    const/4 v0, 0x0
+
+    :goto_e
+    cmpl-float v1, v33, v0
+
+    if-lez v1, :cond_12
+
+    goto :goto_f
+
+    :cond_12
     iget v0, v7, Lcom/airbnb/lottie/d;->gh:F
 
     move/from16 v33, v0
 
-    :goto_10
+    :goto_f
     new-instance v9, Lcom/airbnb/lottie/g/a;
 
     const/high16 v0, 0x3f800000    # 1.0f
@@ -1082,7 +1117,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_12
+    if-nez v0, :cond_13
 
     const-string v0, "ai"
 
@@ -1090,14 +1125,14 @@
 
     move-result v0
 
-    if-eqz v0, :cond_13
+    if-eqz v0, :cond_14
 
-    :cond_12
+    :cond_13
     const-string v0, "Convert your Illustrator layers to shape layers."
 
     invoke-virtual {v7, v0}, Lcom/airbnb/lottie/d;->t(Ljava/lang/String;)V
 
-    :cond_13
+    :cond_14
     new-instance v32, Lcom/airbnb/lottie/c/c/d;
 
     move-object/from16 v0, v32
@@ -1108,37 +1143,37 @@
 
     move-object v3, v12
 
-    move-wide/from16 v4, v16
+    move-wide/from16 v4, v17
 
     move-object v6, v14
 
-    move-wide/from16 v7, v18
+    move-wide/from16 v7, v24
 
-    move-object/from16 v9, v20
+    move-object/from16 v9, v16
 
-    move-object/from16 v33, v11
+    move-object/from16 v24, v11
 
-    move-object/from16 v11, v21
+    move-object/from16 v11, v27
 
-    move/from16 v12, v22
+    move/from16 v12, v19
 
-    move/from16 v13, v23
+    move/from16 v13, v20
 
-    move/from16 v14, v24
+    move/from16 v14, v21
 
-    move/from16 v16, v25
+    move/from16 v16, v26
 
-    move/from16 v17, v26
+    move/from16 v17, v22
 
-    move/from16 v18, v27
+    move/from16 v18, v23
 
     move-object/from16 v19, v28
 
-    move-object/from16 v20, v29
+    move-object/from16 v20, v30
 
-    move-object/from16 v21, v33
+    move-object/from16 v21, v24
 
-    move/from16 v22, v30
+    move/from16 v22, v29
 
     move-object/from16 v23, v31
 
@@ -1146,6 +1181,8 @@
 
     return-object v32
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x3b54f756 -> :sswitch_15
diff --git a/com.discord/smali/com/airbnb/lottie/e/r.smali b/com.discord/smali/com/airbnb/lottie/e/r.smali
index 512b93536c..1db9e99f0f 100644
--- a/com.discord/smali/com/airbnb/lottie/e/r.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/r.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/r;
 .super Ljava/lang/Object;
+.source "LottieCompositionParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/s.smali b/com.discord/smali/com/airbnb/lottie/e/s.smali
index 2914840008..74fc1ea02c 100644
--- a/com.discord/smali/com/airbnb/lottie/e/s.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/s.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/s;
 .super Ljava/lang/Object;
+.source "MaskParser.java"
 
 
 # direct methods
@@ -209,12 +210,11 @@
 
     invoke-static {v0, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    :pswitch_3
     sget v0, Lcom/airbnb/lottie/c/b/g$a;->km:I
 
     goto/16 :goto_0
 
-    :pswitch_4
+    :pswitch_3
     const-string v0, "Animation contains intersect masks. They are not supported but will be treated like add masks."
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/d;->t(Ljava/lang/String;)V
@@ -223,11 +223,16 @@
 
     goto/16 :goto_0
 
-    :pswitch_5
+    :pswitch_4
     sget v0, Lcom/airbnb/lottie/c/b/g$a;->kn:I
 
     goto/16 :goto_0
 
+    :pswitch_5
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->km:I
+
+    goto/16 :goto_0
+
     :cond_8
     invoke-virtual {p0}, Landroid/util/JsonReader;->endObject()V
 
@@ -248,8 +253,8 @@
 
     :pswitch_data_1
     .packed-switch 0x0
-        :pswitch_3
         :pswitch_5
         :pswitch_4
+        :pswitch_3
     .end packed-switch
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/e/t.smali b/com.discord/smali/com/airbnb/lottie/e/t.smali
index d5973cdfc4..76263764ae 100644
--- a/com.discord/smali/com/airbnb/lottie/e/t.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/t.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/t;
 .super Ljava/lang/Object;
+.source "MergePathsParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/u.smali b/com.discord/smali/com/airbnb/lottie/e/u.smali
index cca008d1c5..7b754bfbba 100644
--- a/com.discord/smali/com/airbnb/lottie/e/u.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/u.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/u;
 .super Ljava/lang/Object;
+.source "PathParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
diff --git a/com.discord/smali/com/airbnb/lottie/e/v.smali b/com.discord/smali/com/airbnb/lottie/e/v.smali
index 65e4563b4f..ed9d537dc8 100644
--- a/com.discord/smali/com/airbnb/lottie/e/v.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/v.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/v;
 .super Ljava/lang/Object;
+.source "PointFParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
@@ -131,4 +132,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/e/w.smali b/com.discord/smali/com/airbnb/lottie/e/w.smali
index ec29e281f8..446e6ce11a 100644
--- a/com.discord/smali/com/airbnb/lottie/e/w.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/w.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/w;
 .super Ljava/lang/Object;
+.source "PolystarShapeParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/x.smali b/com.discord/smali/com/airbnb/lottie/e/x.smali
index 6c0652469a..0ab9e7bff7 100644
--- a/com.discord/smali/com/airbnb/lottie/e/x.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/x.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/x;
 .super Ljava/lang/Object;
+.source "RectangleShapeParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/y.smali b/com.discord/smali/com/airbnb/lottie/e/y.smali
index 0cdc2432f5..3916ccbcb5 100644
--- a/com.discord/smali/com/airbnb/lottie/e/y.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/y.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/e/y;
 .super Ljava/lang/Object;
+.source "RepeaterParser.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/e/z.smali b/com.discord/smali/com/airbnb/lottie/e/z.smali
index 7ba55b1c71..aeae16ecb4 100644
--- a/com.discord/smali/com/airbnb/lottie/e/z.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/z.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/e/z;
 .super Ljava/lang/Object;
+.source "ScaleXYParser.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/e/af;
diff --git a/com.discord/smali/com/airbnb/lottie/f$1.smali b/com.discord/smali/com/airbnb/lottie/f$1.smali
index cc36d5685b..da53fc4fdb 100644
--- a/com.discord/smali/com/airbnb/lottie/f$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$1;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali/com/airbnb/lottie/f$2.smali b/com.discord/smali/com/airbnb/lottie/f$2.smali
index 03204d844c..400a931df5 100644
--- a/com.discord/smali/com/airbnb/lottie/f$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$2;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$3.smali b/com.discord/smali/com/airbnb/lottie/f$3.smali
index 7ef140e72e..f9ea6a4d34 100644
--- a/com.discord/smali/com/airbnb/lottie/f$3.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$3;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$4.smali b/com.discord/smali/com/airbnb/lottie/f$4.smali
index c0f09f59ad..e7783538d9 100644
--- a/com.discord/smali/com/airbnb/lottie/f$4.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$4;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$5.smali b/com.discord/smali/com/airbnb/lottie/f$5.smali
index 0eaaf99436..72496ba66b 100644
--- a/com.discord/smali/com/airbnb/lottie/f$5.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$5;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$6.smali b/com.discord/smali/com/airbnb/lottie/f$6.smali
index 556333a170..a98b93b8ae 100644
--- a/com.discord/smali/com/airbnb/lottie/f$6.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$6;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$7.smali b/com.discord/smali/com/airbnb/lottie/f$7.smali
index 99950dd53d..33d07e1330 100644
--- a/com.discord/smali/com/airbnb/lottie/f$7.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$7;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$8.smali b/com.discord/smali/com/airbnb/lottie/f$8.smali
index bf4285443c..193af2496b 100644
--- a/com.discord/smali/com/airbnb/lottie/f$8.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$8;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$9.smali b/com.discord/smali/com/airbnb/lottie/f$9.smali
index 17c818fda1..9c342f69fa 100644
--- a/com.discord/smali/com/airbnb/lottie/f$9.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/f$9;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Lcom/airbnb/lottie/f$a;
diff --git a/com.discord/smali/com/airbnb/lottie/f$a.smali b/com.discord/smali/com/airbnb/lottie/f$a.smali
index 0c0698746c..bf932410eb 100644
--- a/com.discord/smali/com/airbnb/lottie/f$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/airbnb/lottie/f$a;
 .super Ljava/lang/Object;
+.source "LottieDrawable.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/f.smali b/com.discord/smali/com/airbnb/lottie/f.smali
index b59949a6c5..36a1ea536c 100644
--- a/com.discord/smali/com/airbnb/lottie/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/f.smali
@@ -1,5 +1,6 @@
 .class public Lcom/airbnb/lottie/f;
 .super Landroid/graphics/drawable/Drawable;
+.source "LottieDrawable.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Animatable;
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field private static final TAG:Ljava/lang/String; = "f"
+.field static final TAG:Ljava/lang/String; = "f"
 
 
 # instance fields
@@ -152,79 +153,6 @@
     return-object p0
 .end method
 
-.method private a(Lcom/airbnb/lottie/c/e;)Ljava/util/List;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/airbnb/lottie/c/e;",
-            ")",
-            "Ljava/util/List<",
-            "Lcom/airbnb/lottie/c/e;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gz:Lcom/airbnb/lottie/c/c/b;
-
-    if-nez v0, :cond_0
-
-    const-string p1, "LOTTIE"
-
-    const-string v0, "Cannot resolve KeyPath. Composition is not set yet."
-
-    invoke-static {p1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-
-    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->gz:Lcom/airbnb/lottie/c/c/b;
-
-    new-instance v2, Lcom/airbnb/lottie/c/e;
-
-    const/4 v3, 0x0
-
-    new-array v4, v3, [Ljava/lang/String;
-
-    invoke-direct {v2, v4}, Lcom/airbnb/lottie/c/e;-><init>([Ljava/lang/String;)V
-
-    invoke-virtual {v1, p1, v3, v0, v2}, Lcom/airbnb/lottie/c/c/b;->a(Lcom/airbnb/lottie/c/e;ILjava/util/List;Lcom/airbnb/lottie/c/e;)V
-
-    return-object v0
-.end method
-
-.method private aS()V
-    .locals 4
-
-    new-instance v0, Lcom/airbnb/lottie/c/c/b;
-
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
-    invoke-static {v1}, Lcom/airbnb/lottie/e/q;->b(Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/c/d;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
-    iget-object v2, v2, Lcom/airbnb/lottie/d;->ge:Ljava/util/List;
-
-    iget-object v3, p0, Lcom/airbnb/lottie/f;->fT: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;->gz:Lcom/airbnb/lottie/c/c/b;
-
-    return-void
-.end method
-
 .method private aV()V
     .locals 3
 
@@ -235,21 +163,19 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/airbnb/lottie/f;->scale:F
+    iget v1, p0, Lcom/airbnb/lottie/f;->scale:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->gf:Landroid/graphics/Rect;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/d;->gf:Landroid/graphics/Rect;
+    invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
-    invoke-virtual {v1}, Landroid/graphics/Rect;->width()I
+    move-result v0
 
-    move-result v1
+    int-to-float v0, v0
 
-    int-to-float v1, v1
+    mul-float v0, v0, v1
 
-    mul-float v1, v1, v0
-
-    float-to-int v1, v1
+    float-to-int v0, v0
 
     iget-object v2, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
 
@@ -261,13 +187,13 @@
 
     int-to-float v2, v2
 
-    mul-float v2, v2, v0
+    mul-float v2, v2, v1
 
-    float-to-int v0, v2
+    float-to-int v1, v2
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0, v2, v2, v1, v0}, Lcom/airbnb/lottie/f;->setBounds(IIII)V
+    invoke-virtual {p0, v2, v2, v0, v1}, Lcom/airbnb/lottie/f;->setBounds(IIII)V
 
     return-void
 .end method
@@ -283,7 +209,7 @@
 
 # virtual methods
 .method public final a(Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
-    .locals 4
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -313,9 +239,9 @@
     :cond_0
     iget-object v0, p1, Lcom/airbnb/lottie/c/e;->jA:Lcom/airbnb/lottie/c/f;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
@@ -323,21 +249,51 @@
 
     invoke-interface {p1, p2, p3}, Lcom/airbnb/lottie/c/f;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_1
-    invoke-direct {p0, p1}, Lcom/airbnb/lottie/f;->a(Lcom/airbnb/lottie/c/e;)Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gz:Lcom/airbnb/lottie/c/c/b;
+
+    if-nez v0, :cond_2
+
+    const-string p1, "LOTTIE"
+
+    const-string v0, "Cannot resolve KeyPath. Composition is not set yet."
+
+    invoke-static {p1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object p1
 
-    const/4 v0, 0x0
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->gz:Lcom/airbnb/lottie/c/c/b;
+
+    new-instance v4, Lcom/airbnb/lottie/c/e;
+
+    new-array v5, v2, [Ljava/lang/String;
+
+    invoke-direct {v4, v5}, Lcom/airbnb/lottie/c/e;-><init>([Ljava/lang/String;)V
+
+    invoke-virtual {v3, p1, v2, v0, v4}, Lcom/airbnb/lottie/c/c/b;->a(Lcom/airbnb/lottie/c/e;ILjava/util/List;Lcom/airbnb/lottie/c/e;)V
+
+    move-object p1, v0
 
     :goto_0
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result v3
 
-    if-ge v0, v3, :cond_2
+    if-ge v0, v3, :cond_3
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -351,28 +307,28 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    goto :goto_0
+    goto :goto_1
 
-    :cond_2
+    :cond_3
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
     move-result p1
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_4
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_3
-    const/4 v2, 0x0
+    :cond_4
+    const/4 v1, 0x0
 
-    :goto_1
-    if-eqz v2, :cond_4
+    :goto_2
+    if-eqz v1, :cond_5
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
     sget-object p1, Lcom/airbnb/lottie/i;->hk:Ljava/lang/Float;
 
-    if-ne p2, p1, :cond_4
+    if-ne p2, p1, :cond_5
 
     iget-object p1, p0, Lcom/airbnb/lottie/f;->gq:Lcom/airbnb/lottie/f/c;
 
@@ -382,7 +338,7 @@
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/f;->setProgress(F)V
 
-    :cond_4
+    :cond_5
     return-void
 .end method
 
@@ -402,7 +358,7 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
 
-    invoke-direct {p0}, Lcom/airbnb/lottie/f;->aS()V
+    invoke-virtual {p0}, Lcom/airbnb/lottie/f;->aS()V
 
     iget-object v0, p0, Lcom/airbnb/lottie/f;->gq:Lcom/airbnb/lottie/f/c;
 
@@ -437,12 +393,11 @@
 
     move-result v2
 
-    :goto_0
     float-to-int v2, v2
 
     invoke-virtual {v0, v1, v2}, Lcom/airbnb/lottie/f/c;->a(II)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget v1, p1, Lcom/airbnb/lottie/d;->gg:F
@@ -451,9 +406,11 @@
 
     iget v2, p1, Lcom/airbnb/lottie/d;->gh:F
 
-    goto :goto_0
+    float-to-int v2, v2
 
-    :goto_1
+    invoke-virtual {v0, v1, v2}, Lcom/airbnb/lottie/f/c;->a(II)V
+
+    :goto_0
     iget v1, v0, Lcom/airbnb/lottie/f/c;->mJ:F
 
     float-to-int v1, v1
@@ -490,7 +447,7 @@
 
     move-result-object v0
 
-    :goto_2
+    :goto_1
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
@@ -507,7 +464,7 @@
 
     invoke-interface {v0}, Ljava/util/Iterator;->remove()V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object v0, p0, Lcom/airbnb/lottie/f;->gs:Ljava/util/ArrayList;
@@ -555,14 +512,36 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gt:Lcom/airbnb/lottie/b/b;
-
     invoke-virtual {v0}, Lcom/airbnb/lottie/b/b;->aR()V
 
     :cond_0
     return-void
 .end method
 
+.method final aS()V
+    .locals 4
+
+    new-instance v0, Lcom/airbnb/lottie/c/c/b;
+
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
+
+    invoke-static {v1}, Lcom/airbnb/lottie/e/q;->b(Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/c/d;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
+
+    iget-object v2, v2, Lcom/airbnb/lottie/d;->ge:Ljava/util/List;
+
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->fT: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;->gz:Lcom/airbnb/lottie/c/c/b;
+
+    return-void
+.end method
+
 .method public final aT()V
     .locals 1
 
@@ -741,17 +720,15 @@
 
     iget v7, p0, Lcom/airbnb/lottie/f;->scale:F
 
-    mul-float v7, v7, v3
+    mul-float v3, v3, v7
 
-    sub-float/2addr v7, v4
+    sub-float/2addr v3, v4
 
-    iget v3, p0, Lcom/airbnb/lottie/f;->scale:F
+    mul-float v7, v7, v5
 
-    mul-float v3, v3, v5
+    sub-float/2addr v7, v6
 
-    sub-float/2addr v3, v6
-
-    invoke-virtual {p1, v7, v3}, Landroid/graphics/Canvas;->translate(FF)V
+    invoke-virtual {p1, v3, v7}, Landroid/graphics/Canvas;->translate(FF)V
 
     invoke-virtual {p1, v0, v0, v4, v6}, Landroid/graphics/Canvas;->scale(FFFF)V
 
@@ -806,8 +783,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
     iget-object v0, v0, Lcom/airbnb/lottie/d;->gf:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
@@ -837,8 +812,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
     iget-object v0, v0, Lcom/airbnb/lottie/d;->gf:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
@@ -912,43 +885,6 @@
     return v0
 .end method
 
-.method public final j(Z)V
-    .locals 2
-
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gy:Z
-
-    if-ne v0, p1, :cond_0
-
-    return-void
-
-    :cond_0
-    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 v1, 0x13
-
-    if-ge v0, v1, :cond_1
-
-    sget-object p1, Lcom/airbnb/lottie/f;->TAG:Ljava/lang/String;
-
-    const-string v0, "Merge paths are not supported pre-Kit Kat."
-
-    invoke-static {p1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-
-    return-void
-
-    :cond_1
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->gy:Z
-
-    iget-object p1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
-    if-eqz p1, :cond_2
-
-    invoke-direct {p0}, Lcom/airbnb/lottie/f;->aS()V
-
-    :cond_2
-    return-void
-.end method
-
 .method public scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V
     .locals 0
     .param p1    # Landroid/graphics/drawable/Drawable;
@@ -1078,8 +1014,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
     iget v0, v0, Lcom/airbnb/lottie/d;->gg:F
 
     iget-object v1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
@@ -1142,8 +1076,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
     iget v0, v0, Lcom/airbnb/lottie/d;->gg:F
 
     iget-object v1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
@@ -1187,8 +1119,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
-
     iget v0, v0, Lcom/airbnb/lottie/d;->gg:F
 
     iget-object v1, p0, Lcom/airbnb/lottie/f;->fT:Lcom/airbnb/lottie/d;
@@ -1251,13 +1181,13 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f/c;->l(Z)V
+    invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f/c;->k(Z)V
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/c;->bA()Z
 
     move-result v1
 
-    invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f/c;->k(Z)V
+    invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f/c;->j(Z)V
 
     return-void
 .end method
@@ -1284,8 +1214,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gt:Lcom/airbnb/lottie/b/b;
-
     invoke-virtual {p0}, Lcom/airbnb/lottie/f;->getCallback()Landroid/graphics/drawable/Drawable$Callback;
 
     move-result-object v2
diff --git a/com.discord/smali/com/airbnb/lottie/f/a.smali b/com.discord/smali/com/airbnb/lottie/f/a.smali
index 32cb19ec9c..e77aac4aaa 100644
--- a/com.discord/smali/com/airbnb/lottie/f/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/airbnb/lottie/f/a;
 .super Landroid/animation/ValueAnimator;
+.source "BaseLottieAnimator.java"
 
 
 # instance fields
@@ -109,7 +110,7 @@
     throw v0
 .end method
 
-.method public final k(Z)V
+.method public final j(Z)V
     .locals 4
 
     iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mF:Ljava/util/Set;
diff --git a/com.discord/smali/com/airbnb/lottie/f/b.smali b/com.discord/smali/com/airbnb/lottie/f/b.smali
index 05ecff621c..0d5167eb6d 100644
--- a/com.discord/smali/com/airbnb/lottie/f/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/f/b;
 .super Ljava/lang/Object;
+.source "GammaEvaluator.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/f/c.smali b/com.discord/smali/com/airbnb/lottie/f/c.smali
index 145fd9350d..793a570799 100644
--- a/com.discord/smali/com/airbnb/lottie/f/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/f/c;
 .super Lcom/airbnb/lottie/f/a;
+.source "LottieValueAnimator.java"
 
 # interfaces
 .implements Landroid/view/Choreographer$FrameCallback;
@@ -79,7 +80,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/f/c;->l(Z)V
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/f/c;->k(Z)V
 
     invoke-static {}, Landroid/view/Choreographer;->getInstance()Landroid/view/Choreographer;
 
@@ -117,8 +118,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
-
     iget v0, v0, Lcom/airbnb/lottie/d;->gg:F
 
     :goto_0
@@ -131,8 +130,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
-
     iget v1, v1, Lcom/airbnb/lottie/d;->gh:F
 
     :goto_1
@@ -305,27 +302,25 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lcom/airbnb/lottie/f/c;->mJ:F
+    iget v1, p0, Lcom/airbnb/lottie/f/c;->mJ:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
+    iget v0, v0, Lcom/airbnb/lottie/d;->gg:F
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->gg:F
+    sub-float/2addr v1, v0
 
-    sub-float/2addr v0, v1
+    iget-object v0, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
-
-    iget v1, v1, Lcom/airbnb/lottie/d;->gh:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->gh:F
 
     iget-object v2, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
 
     iget v2, v2, Lcom/airbnb/lottie/d;->gg:F
 
-    sub-float/2addr v1, v2
+    sub-float/2addr v0, v2
 
-    div-float/2addr v0, v1
+    div-float/2addr v1, v0
 
-    return v0
+    return v1
 .end method
 
 .method public final cancel()V
@@ -359,7 +354,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/f/c;->l(Z)V
+    invoke-virtual {p0, v0}, Lcom/airbnb/lottie/f/c;->k(Z)V
 
     return-void
 .end method
@@ -371,7 +366,7 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
 
-    if-eqz p1, :cond_a
+    if-eqz p1, :cond_b
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/c;->isRunning()Z
 
@@ -379,7 +374,7 @@
 
     if-nez p1, :cond_0
 
-    goto/16 :goto_6
+    goto/16 :goto_7
 
     :cond_0
     invoke-static {}, Ljava/lang/System;->nanoTime()J
@@ -399,21 +394,19 @@
     goto :goto_0
 
     :cond_1
-    const v2, 0x4e6e6b28    # 1.0E9f
+    const v3, 0x4e6e6b28    # 1.0E9f
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
+    iget v2, v2, Lcom/airbnb/lottie/d;->gi:F
 
-    iget v3, v3, Lcom/airbnb/lottie/d;->gi:F
+    div-float/2addr v3, v2
 
-    div-float/2addr v2, v3
+    iget v2, p0, Lcom/airbnb/lottie/f/c;->mG:F
 
-    iget v3, p0, Lcom/airbnb/lottie/f/c;->mG:F
+    invoke-static {v2}, Ljava/lang/Math;->abs(F)F
 
-    invoke-static {v3}, Ljava/lang/Math;->abs(F)F
+    move-result v2
 
-    move-result v3
-
-    div-float/2addr v2, v3
+    div-float v2, v3, v2
 
     :goto_0
     long-to-float v0, v0
@@ -513,13 +506,13 @@
 
     iput p1, p0, Lcom/airbnb/lottie/f/c;->mJ:F
 
-    invoke-virtual {p0, v4}, Lcom/airbnb/lottie/f/c;->l(Z)V
+    invoke-virtual {p0, v4}, Lcom/airbnb/lottie/f/c;->k(Z)V
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/c;->bA()Z
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/airbnb/lottie/f/c;->k(Z)V
+    invoke-virtual {p0, p1}, Lcom/airbnb/lottie/f/c;->j(Z)V
 
     goto :goto_5
 
@@ -604,11 +597,9 @@
 
     iget p2, p0, Lcom/airbnb/lottie/f/c;->mK:F
 
-    cmpg-float p1, p1, p2
+    cmpg-float p2, p1, p2
 
-    if-ltz p1, :cond_9
-
-    iget p1, p0, Lcom/airbnb/lottie/f/c;->mJ:F
+    if-ltz p2, :cond_9
 
     iget p2, p0, Lcom/airbnb/lottie/f/c;->mL:F
 
@@ -662,6 +653,10 @@
     :cond_a
     :goto_6
     return-void
+
+    :cond_b
+    :goto_7
+    return-void
 .end method
 
 .method public final getAnimatedFraction()F
@@ -692,7 +687,6 @@
 
     iget v1, p0, Lcom/airbnb/lottie/f/c;->mJ:F
 
-    :goto_0
     sub-float/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/c;->getMaxFrame()F
@@ -716,7 +710,21 @@
 
     move-result v1
 
-    goto :goto_0
+    sub-float/2addr v0, v1
+
+    invoke-virtual {p0}, Lcom/airbnb/lottie/f/c;->getMaxFrame()F
+
+    move-result v1
+
+    invoke-virtual {p0}, Lcom/airbnb/lottie/f/c;->getMinFrame()F
+
+    move-result v2
+
+    sub-float/2addr v1, v2
+
+    div-float/2addr v0, v1
+
+    return v0
 .end method
 
 .method public final getAnimatedValue()Ljava/lang/Object;
@@ -745,8 +753,6 @@
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
-
     invoke-virtual {v0}, Lcom/airbnb/lottie/d;->aO()F
 
     move-result v0
@@ -757,7 +763,7 @@
 .end method
 
 .method public final getMaxFrame()F
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
 
@@ -768,28 +774,24 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lcom/airbnb/lottie/f/c;->mL:F
+    iget v1, p0, Lcom/airbnb/lottie/f/c;->mL:F
 
-    const/high16 v1, 0x4f000000
+    const/high16 v2, 0x4f000000
 
-    cmpl-float v0, v0, v1
+    cmpl-float v2, v1, v2
 
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
+    if-nez v2, :cond_1
 
     iget v0, v0, Lcom/airbnb/lottie/d;->gh:F
 
     return v0
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/f/c;->mL:F
-
-    return v0
+    return v1
 .end method
 
 .method public final getMinFrame()F
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
 
@@ -800,24 +802,20 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lcom/airbnb/lottie/f/c;->mK:F
+    iget v1, p0, Lcom/airbnb/lottie/f/c;->mK:F
 
-    const/high16 v1, -0x31000000
+    const/high16 v2, -0x31000000
 
-    cmpl-float v0, v0, v1
+    cmpl-float v2, v1, v2
 
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lcom/airbnb/lottie/f/c;->fT:Lcom/airbnb/lottie/d;
+    if-nez v2, :cond_1
 
     iget v0, v0, Lcom/airbnb/lottie/d;->gg:F
 
     return v0
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/f/c;->mK:F
-
-    return v0
+    return v1
 .end method
 
 .method public final isRunning()Z
@@ -828,7 +826,7 @@
     return v0
 .end method
 
-.method public l(Z)V
+.method public k(Z)V
     .locals 1
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
diff --git a/com.discord/smali/com/airbnb/lottie/f/d.smali b/com.discord/smali/com/airbnb/lottie/f/d.smali
index 73d0ef3896..22d2d82ad4 100644
--- a/com.discord/smali/com/airbnb/lottie/f/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/f/d;
 .super Ljava/lang/Object;
+.source "MeanCalculator.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/airbnb/lottie/f/e.smali b/com.discord/smali/com/airbnb/lottie/f/e.smali
index b72a8aa579..2a1f3bd998 100644
--- a/com.discord/smali/com/airbnb/lottie/f/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/f/e;
 .super Ljava/lang/Object;
+.source "MiscUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/f/f.smali b/com.discord/smali/com/airbnb/lottie/f/f.smali
index dc5c6b8df5..93a99a4e74 100644
--- a/com.discord/smali/com/airbnb/lottie/f/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/f/f;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 
 # static fields
@@ -72,57 +73,41 @@
 
     aput v1, v0, v2
 
-    sget-object v0, Lcom/airbnb/lottie/f/f;->points:[F
-
     const/4 v3, 0x1
 
     aput v1, v0, v3
 
-    sget-object v0, Lcom/airbnb/lottie/f/f;->points:[F
-
     sget v1, Lcom/airbnb/lottie/f/f;->mP:F
 
     const/4 v4, 0x2
 
     aput v1, v0, v4
 
-    sget-object v0, Lcom/airbnb/lottie/f/f;->points:[F
-
-    sget v1, Lcom/airbnb/lottie/f/f;->mP:F
-
     const/4 v5, 0x3
 
     aput v1, v0, v5
 
-    sget-object v0, Lcom/airbnb/lottie/f/f;->points:[F
-
     invoke-virtual {p0, v0}, Landroid/graphics/Matrix;->mapPoints([F)V
 
     sget-object p0, Lcom/airbnb/lottie/f/f;->points:[F
 
-    aget p0, p0, v4
+    aget v0, p0, v4
 
-    sget-object v0, Lcom/airbnb/lottie/f/f;->points:[F
-
-    aget v0, v0, v2
-
-    sub-float/2addr p0, v0
-
-    sget-object v0, Lcom/airbnb/lottie/f/f;->points:[F
-
-    aget v0, v0, v5
-
-    sget-object v1, Lcom/airbnb/lottie/f/f;->points:[F
-
-    aget v1, v1, v3
+    aget v1, p0, v2
 
     sub-float/2addr v0, v1
 
-    float-to-double v1, p0
+    aget v1, p0, v5
 
-    float-to-double v3, v0
+    aget p0, p0, v3
 
-    invoke-static {v1, v2, v3, v4}, Ljava/lang/Math;->hypot(DD)D
+    sub-float/2addr v1, p0
+
+    float-to-double v2, v0
+
+    float-to-double v0, v1
+
+    invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->hypot(DD)D
 
     move-result-wide v0
 
@@ -304,24 +289,22 @@
 
     cmpl-float v3, p1, v1
 
-    if-nez v3, :cond_1
+    if-nez v3, :cond_0
 
     cmpl-float v3, p2, v2
 
-    if-nez v3, :cond_1
+    if-nez v3, :cond_0
 
-    :cond_0
-    :goto_0
     const-string p0, "applyTrimPathIfNeeded"
 
     invoke-static {p0}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
 
     return-void
 
-    :cond_1
+    :cond_0
     cmpg-float v3, v0, v1
 
-    if-ltz v3, :cond_0
+    if-ltz v3, :cond_9
 
     sub-float v3, p2, p1
 
@@ -337,11 +320,11 @@
 
     cmpg-double v1, v3, v5
 
-    if-gez v1, :cond_2
+    if-gez v1, :cond_1
 
-    goto :goto_0
+    goto/16 :goto_1
 
-    :cond_2
+    :cond_1
     mul-float p1, p1, v0
 
     mul-float p2, p2, v0
@@ -362,11 +345,11 @@
 
     cmpl-float p2, v1, v0
 
-    if-ltz p2, :cond_3
+    if-ltz p2, :cond_2
 
     cmpl-float p2, p1, v0
 
-    if-ltz p2, :cond_3
+    if-ltz p2, :cond_2
 
     invoke-static {v1, v0}, Lcom/airbnb/lottie/f/e;->a(FF)I
 
@@ -380,45 +363,49 @@
 
     int-to-float p1, p1
 
-    :cond_3
+    :cond_2
     cmpg-float p2, v1, v2
 
+    if-gez p2, :cond_3
+
+    invoke-static {v1, v0}, Lcom/airbnb/lottie/f/e;->a(FF)I
+
+    move-result p2
+
+    int-to-float v1, p2
+
+    :cond_3
+    cmpg-float p2, p1, v2
+
     if-gez p2, :cond_4
 
-    invoke-static {v1, v0}, Lcom/airbnb/lottie/f/e;->a(FF)I
-
-    move-result p2
-
-    int-to-float v1, p2
-
-    :cond_4
-    cmpg-float p2, p1, v2
-
-    if-gez p2, :cond_5
-
     invoke-static {p1, v0}, Lcom/airbnb/lottie/f/e;->a(FF)I
 
     move-result p1
 
     int-to-float p1, p1
 
+    :cond_4
+    cmpl-float p2, v1, p1
+
+    if-nez p2, :cond_5
+
+    invoke-virtual {p0}, Landroid/graphics/Path;->reset()V
+
+    const-string p0, "applyTrimPathIfNeeded"
+
+    invoke-static {p0}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
+
+    return-void
+
     :cond_5
     cmpl-float p2, v1, p1
 
-    if-nez p2, :cond_6
-
-    invoke-virtual {p0}, Landroid/graphics/Path;->reset()V
-
-    goto :goto_0
-
-    :cond_6
-    cmpl-float p2, v1, p1
-
-    if-ltz p2, :cond_7
+    if-ltz p2, :cond_6
 
     sub-float/2addr v1, v0
 
-    :cond_7
+    :cond_6
     sget-object p2, Lcom/airbnb/lottie/f/f;->iO:Landroid/graphics/Path;
 
     invoke-virtual {p2}, Landroid/graphics/Path;->reset()V
@@ -433,7 +420,7 @@
 
     cmpl-float p2, p1, v0
 
-    if-lez p2, :cond_8
+    if-lez p2, :cond_7
 
     sget-object p2, Lcom/airbnb/lottie/f/f;->mO:Landroid/graphics/Path;
 
@@ -447,19 +434,18 @@
 
     invoke-virtual {p2, v2, p1, p3, v3}, Landroid/graphics/PathMeasure;->getSegment(FFLandroid/graphics/Path;Z)Z
 
-    :goto_1
     sget-object p1, Lcom/airbnb/lottie/f/f;->iO:Landroid/graphics/Path;
 
     sget-object p2, Lcom/airbnb/lottie/f/f;->mO:Landroid/graphics/Path;
 
     invoke-virtual {p1, p2}, Landroid/graphics/Path;->addPath(Landroid/graphics/Path;)V
 
-    goto :goto_2
+    goto :goto_0
 
-    :cond_8
+    :cond_7
     cmpg-float p1, v1, v2
 
-    if-gez p1, :cond_9
+    if-gez p1, :cond_8
 
     sget-object p1, Lcom/airbnb/lottie/f/f;->mO:Landroid/graphics/Path;
 
@@ -473,15 +459,31 @@
 
     invoke-virtual {p1, v1, v0, p2, v3}, Landroid/graphics/PathMeasure;->getSegment(FFLandroid/graphics/Path;Z)Z
 
-    goto :goto_1
+    sget-object p1, Lcom/airbnb/lottie/f/f;->iO:Landroid/graphics/Path;
 
-    :cond_9
-    :goto_2
+    sget-object p2, Lcom/airbnb/lottie/f/f;->mO:Landroid/graphics/Path;
+
+    invoke-virtual {p1, p2}, Landroid/graphics/Path;->addPath(Landroid/graphics/Path;)V
+
+    :cond_8
+    :goto_0
     sget-object p1, Lcom/airbnb/lottie/f/f;->iO:Landroid/graphics/Path;
 
     invoke-virtual {p0, p1}, Landroid/graphics/Path;->set(Landroid/graphics/Path;)V
 
-    goto/16 :goto_0
+    const-string p0, "applyTrimPathIfNeeded"
+
+    invoke-static {p0}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
+
+    return-void
+
+    :cond_9
+    :goto_1
+    const-string p0, "applyTrimPathIfNeeded"
+
+    invoke-static {p0}, Lcom/airbnb/lottie/c;->s(Ljava/lang/String;)F
+
+    return-void
 .end method
 
 .method public static a(Landroid/graphics/Path;Lcom/airbnb/lottie/a/a/r;)V
diff --git a/com.discord/smali/com/airbnb/lottie/g.smali b/com.discord/smali/com/airbnb/lottie/g.smali
index 41218a1135..aca947a010 100644
--- a/com.discord/smali/com/airbnb/lottie/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/g;
 .super Ljava/lang/Object;
+.source "LottieImageAsset.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/airbnb/lottie/g/a.smali b/com.discord/smali/com/airbnb/lottie/g/a.smali
index 86b1764fc3..aeaa645381 100644
--- a/com.discord/smali/com/airbnb/lottie/g/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/airbnb/lottie/g/a;
 .super Ljava/lang/Object;
+.source "Keyframe.java"
 
 
 # annotations
@@ -168,7 +169,7 @@
 
 # virtual methods
 .method public final bD()F
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fT:Lcom/airbnb/lottie/d;
 
@@ -179,31 +180,29 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->mV:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->mV:F
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    cmpl-float v0, v0, v1
+    cmpl-float v1, v1, v2
 
-    if-nez v0, :cond_1
+    if-nez v1, :cond_1
 
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->gg:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->gg:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->fT:Lcom/airbnb/lottie/d;
+    iget v0, v0, Lcom/airbnb/lottie/d;->gg:F
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->gg:F
+    sub-float/2addr v1, v0
 
-    sub-float/2addr v0, v1
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fT:Lcom/airbnb/lottie/d;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->fT:Lcom/airbnb/lottie/d;
+    invoke-virtual {v0}, Lcom/airbnb/lottie/d;->aP()F
 
-    invoke-virtual {v1}, Lcom/airbnb/lottie/d;->aP()F
+    move-result v0
 
-    move-result v1
+    div-float/2addr v1, v0
 
-    div-float/2addr v0, v1
-
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mV:F
+    iput v1, p0, Lcom/airbnb/lottie/g/a;->mV:F
 
     :cond_1
     iget v0, p0, Lcom/airbnb/lottie/g/a;->mV:F
diff --git a/com.discord/smali/com/airbnb/lottie/g/b.smali b/com.discord/smali/com/airbnb/lottie/g/b.smali
index 92fdb0e0f7..291c3e7de1 100644
--- a/com.discord/smali/com/airbnb/lottie/g/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/g/b;
 .super Ljava/lang/Object;
+.source "LottieFrameInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/g/c.smali b/com.discord/smali/com/airbnb/lottie/g/c.smali
index 4a6fa2fd92..ddf4cf27d7 100644
--- a/com.discord/smali/com/airbnb/lottie/g/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/g/c;
 .super Ljava/lang/Object;
+.source "LottieValueCallback.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/g/d.smali b/com.discord/smali/com/airbnb/lottie/g/d.smali
index b9eb490557..d72e3ff66d 100644
--- a/com.discord/smali/com/airbnb/lottie/g/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/g/d;
 .super Ljava/lang/Object;
+.source "ScaleXY.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/airbnb/lottie/h.smali b/com.discord/smali/com/airbnb/lottie/h.smali
index c51f74068a..aedf5fb667 100644
--- a/com.discord/smali/com/airbnb/lottie/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/h;
 .super Ljava/lang/Object;
+.source "LottieListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/i.smali b/com.discord/smali/com/airbnb/lottie/i.smali
index 7f0ad715bc..ed338eeaf0 100644
--- a/com.discord/smali/com/airbnb/lottie/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/i.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/airbnb/lottie/i;
 .super Ljava/lang/Object;
+.source "LottieProperty.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/airbnb/lottie/j.smali b/com.discord/smali/com/airbnb/lottie/j.smali
index 02ff20abb5..f86864f875 100644
--- a/com.discord/smali/com/airbnb/lottie/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/j;
 .super Ljava/lang/Object;
+.source "LottieResult.java"
 
 
 # annotations
@@ -92,8 +93,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/airbnb/lottie/j;->value:Ljava/lang/Object;
-
     iget-object v3, p1, Lcom/airbnb/lottie/j;->value:Ljava/lang/Object;
 
     invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
@@ -113,9 +112,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/j;->exception:Ljava/lang/Throwable;
-
-    invoke-virtual {p1}, Ljava/lang/Throwable;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/Throwable;->toString()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/airbnb/lottie/k$1.smali b/com.discord/smali/com/airbnb/lottie/k$1.smali
index 4799066967..0670b35d1e 100644
--- a/com.discord/smali/com/airbnb/lottie/k$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/k$1;
 .super Ljava/lang/Object;
+.source "LottieTask.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -84,6 +85,8 @@
 
     invoke-static {v1, v0}, Lcom/airbnb/lottie/k;->a(Lcom/airbnb/lottie/k;Ljava/lang/Throwable;)V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
diff --git a/com.discord/smali/com/airbnb/lottie/k$2.smali b/com.discord/smali/com/airbnb/lottie/k$2.smali
index 64453cae82..e7814a0f6f 100644
--- a/com.discord/smali/com/airbnb/lottie/k$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/k$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/k$2;
 .super Ljava/lang/Thread;
+.source "LottieTask.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/airbnb/lottie/k.smali b/com.discord/smali/com/airbnb/lottie/k.smali
index 9eb2a99400..1514ec0e11 100644
--- a/com.discord/smali/com/airbnb/lottie/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/k;
 .super Ljava/lang/Object;
+.source "LottieTask.java"
 
 
 # annotations
@@ -412,8 +413,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/k;->hn:Ljava/lang/Thread;
-
     invoke-virtual {v0}, Ljava/lang/Thread;->isAlive()Z
 
     move-result v0
diff --git a/com.discord/smali/com/airbnb/lottie/l$1.smali b/com.discord/smali/com/airbnb/lottie/l$1.smali
index e73050817c..3b26f5af67 100644
--- a/com.discord/smali/com/airbnb/lottie/l$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/l$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/airbnb/lottie/l$1;
 .super Ljava/lang/Object;
+.source "PerformanceTracker.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/airbnb/lottie/l.smali b/com.discord/smali/com/airbnb/lottie/l.smali
index 287d8085f6..a670f6b4ae 100644
--- a/com.discord/smali/com/airbnb/lottie/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/l;
 .super Ljava/lang/Object;
+.source "PerformanceTracker.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/airbnb/lottie/m.smali b/com.discord/smali/com/airbnb/lottie/m.smali
index 19465591d0..839de05ee7 100644
--- a/com.discord/smali/com/airbnb/lottie/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/m;
 .super Landroid/graphics/PorterDuffColorFilter;
+.source "SimpleColorFilter.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/n.smali b/com.discord/smali/com/airbnb/lottie/n.smali
index 17bfc31db0..ee97371ffd 100644
--- a/com.discord/smali/com/airbnb/lottie/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/airbnb/lottie/n;
 .super Ljava/lang/Object;
+.source "TextDelegate.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/android/installreferrer/R.smali b/com.discord/smali/com/android/installreferrer/R.smali
index 0e066f3f1d..43f0a7b1bf 100644
--- a/com.discord/smali/com/android/installreferrer/R.smali
+++ b/com.discord/smali/com/android/installreferrer/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/android/installreferrer/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/android/installreferrer/a/a.smali b/com.discord/smali/com/android/installreferrer/a/a.smali
index 763e81bd64..4fd4261cec 100644
--- a/com.discord/smali/com/android/installreferrer/a/a.smali
+++ b/com.discord/smali/com/android/installreferrer/a/a.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/android/installreferrer/a/a;
 .super Ljava/lang/Object;
+.source "InstallReferrerStateListener.java"
diff --git a/com.discord/smali/com/angarron/colorpicker/OnColorSelectedListener.smali b/com.discord/smali/com/angarron/colorpicker/OnColorSelectedListener.smali
index 994d7acbf7..24d5ef43ed 100644
--- a/com.discord/smali/com/angarron/colorpicker/OnColorSelectedListener.smali
+++ b/com.discord/smali/com/angarron/colorpicker/OnColorSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/angarron/colorpicker/OnColorSelectedListener;
 .super Ljava/lang/Object;
+.source "OnColorSelectedListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/angarron/colorpicker/R$a.smali b/com.discord/smali/com/angarron/colorpicker/R$a.smali
index cd9ff7a755..725f4b1c79 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/angarron/colorpicker/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/angarron/colorpicker/R$b.smali b/com.discord/smali/com/angarron/colorpicker/R$b.smali
index 1650cd1cef..39c0773127 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$b.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/angarron/colorpicker/R$b;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/angarron/colorpicker/R.smali b/com.discord/smali/com/angarron/colorpicker/R.smali
index f386b14d6c..4406a9d1bd 100644
--- a/com.discord/smali/com/angarron/colorpicker/R.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/angarron/colorpicker/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/angarron/colorpicker/a$1.smali b/com.discord/smali/com/angarron/colorpicker/a$1.smali
index e1d6712a09..41c228fd3e 100644
--- a/com.discord/smali/com/angarron/colorpicker/a$1.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/angarron/colorpicker/a$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ColorItem.java"
 
 
 # annotations
@@ -59,9 +60,7 @@
 
     iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->nj:Lcom/angarron/colorpicker/a;
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a$1;->nj:Lcom/angarron/colorpicker/a;
-
-    invoke-static {v0}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
+    invoke-static {p1}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/angarron/colorpicker/a$2.smali b/com.discord/smali/com/angarron/colorpicker/a$2.smali
index 1b7ed5d1cd..85e871229d 100644
--- a/com.discord/smali/com/angarron/colorpicker/a$2.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/angarron/colorpicker/a$2;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ColorItem.java"
 
 
 # annotations
@@ -59,9 +60,7 @@
 
     iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->nj:Lcom/angarron/colorpicker/a;
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a$2;->nj:Lcom/angarron/colorpicker/a;
-
-    invoke-static {v0}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
+    invoke-static {p1}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/angarron/colorpicker/a$a.smali b/com.discord/smali/com/angarron/colorpicker/a$a.smali
index 95cd2f0dd8..fda5f22760 100644
--- a/com.discord/smali/com/angarron/colorpicker/a$a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/angarron/colorpicker/a$a;
 .super Ljava/lang/Object;
+.source "ColorItem.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/angarron/colorpicker/a.smali b/com.discord/smali/com/angarron/colorpicker/a.smali
index d30a458ca8..a46d19bfb5 100644
--- a/com.discord/smali/com/angarron/colorpicker/a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/angarron/colorpicker/a;
 .super Landroid/widget/FrameLayout;
+.source "ColorItem.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -175,8 +176,6 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/angarron/colorpicker/a;->ng:I
-
     iget v2, p0, Lcom/angarron/colorpicker/a;->mColor:I
 
     invoke-static {v2}, Lcom/angarron/colorpicker/a;->isColorDark(I)Z
@@ -426,8 +425,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ni:Lcom/angarron/colorpicker/a$a;
-
     invoke-interface {p1, p0}, Lcom/angarron/colorpicker/a$a;->c(Lcom/angarron/colorpicker/a;)V
 
     :cond_0
diff --git a/com.discord/smali/com/angarron/colorpicker/b$a.smali b/com.discord/smali/com/angarron/colorpicker/b$a.smali
index a4cf7dad81..1524d1d7db 100644
--- a/com.discord/smali/com/angarron/colorpicker/b$a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/angarron/colorpicker/b$a;
 .super Ljava/lang/Object;
+.source "PaletteAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/angarron/colorpicker/b.smali b/com.discord/smali/com/angarron/colorpicker/b.smali
index e1442f262f..a71cbd71b2 100644
--- a/com.discord/smali/com/angarron/colorpicker/b.smali
+++ b/com.discord/smali/com/angarron/colorpicker/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/angarron/colorpicker/b;
 .super Landroid/widget/BaseAdapter;
+.source "PaletteAdapter.java"
 
 # interfaces
 .implements Lcom/angarron/colorpicker/a$a;
@@ -157,8 +158,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/b;->np:Lcom/angarron/colorpicker/a;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Lcom/angarron/colorpicker/a;->setChecked(Z)V
@@ -176,8 +175,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/b;->listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
-
     iget v0, p0, Lcom/angarron/colorpicker/b;->no:I
 
     invoke-interface {p1, v0}, Lcom/angarron/colorpicker/OnColorSelectedListener;->onColorSelected(I)V
diff --git a/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider$a.smali b/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider$a.smali
index 37372365f2..d1600bd6c5 100644
--- a/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider$a.smali
+++ b/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/CrashlyticsInitProvider$a;
 .super Ljava/lang/Object;
+.source "CrashlyticsInitProvider.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali b/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali
index 937fb8941e..23b3553aa4 100644
--- a/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali
+++ b/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali
@@ -1,5 +1,6 @@
 .class public Lcom/crashlytics/android/CrashlyticsInitProvider;
 .super Landroid/content/ContentProvider;
+.source "CrashlyticsInitProvider.java"
 
 
 # annotations
@@ -97,7 +98,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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -112,7 +113,7 @@
     goto :goto_1
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/R.smali b/com.discord/smali/com/crashlytics/android/R.smali
index 62725a8885..9d60edf0c2 100644
--- a/com.discord/smali/com/crashlytics/android/R.smali
+++ b/com.discord/smali/com/crashlytics/android/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/a.smali b/com.discord/smali/com/crashlytics/android/a.smali
index cf0a1133e3..423c4847f2 100644
--- a/com.discord/smali/com/crashlytics/android/a.smali
+++ b/com.discord/smali/com/crashlytics/android/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/crashlytics/android/a;
 .super Lio/fabric/sdk/android/i;
+.source "Crashlytics.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/j;
@@ -164,7 +165,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -299,7 +300,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/Answers.smali b/com.discord/smali/com/crashlytics/android/answers/Answers.smali
index cf74b1fbe7..0ec0b479fe 100644
--- a/com.discord/smali/com/crashlytics/android/answers/Answers.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/Answers.smali
@@ -1,5 +1,6 @@
 .class public Lcom/crashlytics/android/answers/Answers;
 .super Lio/fabric/sdk/android/i;
+.source "Answers.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 .method private static B(Ljava/lang/String;)V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -79,17 +80,17 @@
     .locals 5
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ET()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ES()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -110,7 +111,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -151,7 +152,7 @@
     return-object v0
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -214,7 +215,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -249,8 +250,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->ny:Lcom/crashlytics/android/answers/ac;
-
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
     :cond_1
@@ -275,8 +274,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->ny:Lcom/crashlytics/android/answers/ac;
-
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
     :cond_1
@@ -303,9 +300,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->ny:Lcom/crashlytics/android/answers/ac;
-
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -376,8 +371,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->ny:Lcom/crashlytics/android/answers/ac;
-
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
     :cond_1
@@ -447,10 +440,9 @@
 
     iget-wide v1, v3, Landroid/content/pm/PackageInfo;->firstInstallTime:J
 
-    :goto_1
     move-wide/from16 v16, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     invoke-virtual {v1, v2, v10}, Landroid/content/pm/PackageManager;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
@@ -467,9 +459,9 @@
 
     move-result-wide v1
 
-    goto :goto_1
+    move-wide/from16 v16, v1
 
-    :goto_2
+    :goto_1
     iget-object v1, v9, Lio/fabric/sdk/android/i;->pk:Lio/fabric/sdk/android/a/b/p;
 
     new-instance v6, Lcom/crashlytics/android/answers/ah;
@@ -486,7 +478,7 @@
 
     new-instance v7, Lio/fabric/sdk/android/a/e/b;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -582,7 +574,7 @@
 
     iget-object v2, v2, Lcom/crashlytics/android/answers/h;->nT:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -600,7 +592,7 @@
 
     iget-wide v4, v1, Lcom/crashlytics/android/answers/ac;->oG:J
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -668,7 +660,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/R.smali b/com.discord/smali/com/crashlytics/android/answers/R.smali
index a80e5c2aac..c43f29595a 100644
--- a/com.discord/smali/com/crashlytics/android/answers/R.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/answers/a.smali b/com.discord/smali/com/crashlytics/android/answers/a.smali
index 2d7d783b7e..73dc377917 100644
--- a/com.discord/smali/com/crashlytics/android/answers/a.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/a;
 .super Lcom/crashlytics/android/answers/w;
+.source "AddToCartEvent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/aa.smali b/com.discord/smali/com/crashlytics/android/answers/aa.smali
index 05f5d8da75..01f6606d29 100644
--- a/com.discord/smali/com/crashlytics/android/answers/aa.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/aa.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/aa;
 .super Lio/fabric/sdk/android/a/d/b;
+.source "SessionAnalyticsFilesManager.java"
 
 
 # annotations
@@ -57,7 +58,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->pr:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Eb()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Ea()J
 
     move-result-wide v2
 
@@ -88,8 +89,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->oE:Lio/fabric/sdk/android/a/g/b;
-
     iget v0, v0, Lio/fabric/sdk/android/a/g/b;->bNU:I
 
     return v0
@@ -109,8 +108,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->oE:Lio/fabric/sdk/android/a/g/b;
-
     iget v0, v0, Lio/fabric/sdk/android/a/g/b;->bNS:I
 
     return v0
diff --git a/com.discord/smali/com/crashlytics/android/answers/ab.smali b/com.discord/smali/com/crashlytics/android/answers/ab.smali
index 196734a060..d0b8957561 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ab.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ab.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/ab;
 .super Lio/fabric/sdk/android/a/b/a;
+.source "SessionAnalyticsFilesSender.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/d/f;
@@ -45,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->DS()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->DR()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
@@ -123,7 +124,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -155,11 +156,11 @@
 
     invoke-interface {v1, v3, p1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->EF()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 c0221976cf..d843ac3091 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ac.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ac.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/ac;
 .super Ljava/lang/Object;
+.source "SessionAnalyticsManager.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/answers/k$a;
@@ -41,7 +42,7 @@
 .method public final a(Landroid/app/Activity;Lcom/crashlytics/android/answers/ae$b;)V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -81,7 +82,7 @@
 .method public final a(Lcom/crashlytics/android/answers/w;)V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -115,7 +116,7 @@
 .method public final bR()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/ad.smali b/com.discord/smali/com/crashlytics/android/answers/ad.smali
index 084356c382..c3ec86660c 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ad.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ad.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/answers/ad;
 .super Ljava/lang/Object;
+.source "SessionAnalyticsManagerStrategy.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/d/e;
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 3cb888c148..09381d1e1b 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ae$a.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ae$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/ae$a;
 .super Ljava/lang/Object;
+.source "SessionEvent.java"
 
 
 # annotations
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 5d8a9b3fdd..2029c52c69 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ae$b.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ae$b.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/crashlytics/android/answers/ae$b;
 .super Ljava/lang/Enum;
+.source "SessionEvent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/ae.smali b/com.discord/smali/com/crashlytics/android/answers/ae.smali
index 8cadce580c..31996b6a83 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ae.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ae.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/ae;
 .super Ljava/lang/Object;
+.source "SessionEvent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/af.smali b/com.discord/smali/com/crashlytics/android/answers/af.smali
index 3252fc3765..d984987f92 100644
--- a/com.discord/smali/com/crashlytics/android/answers/af.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/af.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/af;
 .super Ljava/lang/Object;
+.source "SessionEventMetadata.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/answers/ag.smali b/com.discord/smali/com/crashlytics/android/answers/ag.smali
index bdf0a5488f..a8143555b0 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ag.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ag.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/ag;
 .super Ljava/lang/Object;
+.source "SessionEventTransform.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/d/a;
diff --git a/com.discord/smali/com/crashlytics/android/answers/ah.smali b/com.discord/smali/com/crashlytics/android/answers/ah.smali
index ff9fb669d8..54bc154419 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ah.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ah.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/ah;
 .super Ljava/lang/Object;
+.source "SessionMetadataCollector.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/answers/ai.smali b/com.discord/smali/com/crashlytics/android/answers/ai.smali
index 1ec2210445..24a2f893a0 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ai.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ai.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/ai;
 .super Lcom/crashlytics/android/answers/w;
+.source "ShareEvent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/aj.smali b/com.discord/smali/com/crashlytics/android/answers/aj.smali
index 13dc51a675..74d710e719 100644
--- a/com.discord/smali/com/crashlytics/android/answers/aj.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/aj.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/aj;
 .super Lcom/crashlytics/android/answers/w;
+.source "SignUpEvent.java"
 
 
 # annotations
@@ -43,7 +44,7 @@
     return-object v0
 .end method
 
-.method public final n(Z)Lcom/crashlytics/android/answers/aj;
+.method public final m(Z)Lcom/crashlytics/android/answers/aj;
     .locals 2
 
     iget-object v0, p0, Lcom/crashlytics/android/answers/aj;->ox:Lcom/crashlytics/android/answers/b;
diff --git a/com.discord/smali/com/crashlytics/android/answers/b.smali b/com.discord/smali/com/crashlytics/android/answers/b.smali
index 185751aeab..7f56f15ac6 100644
--- a/com.discord/smali/com/crashlytics/android/answers/b.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/b;
 .super Ljava/lang/Object;
+.source "AnswersAttributes.java"
 
 
 # instance fields
@@ -97,6 +98,8 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/crashlytics/android/answers/b;->a(Ljava/lang/String;Ljava/lang/Object;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/com/crashlytics/android/answers/c.smali b/com.discord/smali/com/crashlytics/android/answers/c.smali
index 0c1dbf70d3..bcd7281fd6 100644
--- a/com.discord/smali/com/crashlytics/android/answers/c.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/crashlytics/android/answers/c;
 .super Ljava/lang/Object;
+.source "AnswersEvent.java"
 
 
 # annotations
@@ -27,7 +28,7 @@
 
     new-instance v0, Lcom/crashlytics/android/answers/d;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DH()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Z
 
     move-result v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/d.smali b/com.discord/smali/com/crashlytics/android/answers/d.smali
index c24868881d..4395bad7bc 100644
--- a/com.discord/smali/com/crashlytics/android/answers/d.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/d;
 .super Ljava/lang/Object;
+.source "AnswersEventValidator.java"
 
 
 # instance fields
@@ -36,7 +37,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -99,6 +100,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_0
     return-object p1
 .end method
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 cc405302e7..b3065ee6af 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$1.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/e$1;
 .super Ljava/lang/Object;
+.source "AnswersEventsHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -62,7 +63,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 be8dedcca3..d273fd9212 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$2.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/e$2;
 .super Ljava/lang/Object;
+.source "AnswersEventsHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -58,7 +59,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 c53ef1963d..72ecc31620 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$3.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/e$3;
 .super Ljava/lang/Object;
+.source "AnswersEventsHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -50,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 92037aeaff..b43b51360a 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$4.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/e$4;
 .super Ljava/lang/Object;
+.source "AnswersEventsHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -55,7 +56,7 @@
 
     iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->pk:Lio/fabric/sdk/android/a/b/p;
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/p;->Ec()Ljava/lang/String;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/p;->Eb()Ljava/lang/String;
 
     move-result-object v7
 
@@ -83,9 +84,9 @@
     :goto_0
     const/4 v6, 0x0
 
-    if-eqz v4, :cond_1
+    if-eqz v4, :cond_2
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/p;->DW()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/p;->DV()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v3
 
@@ -100,6 +101,12 @@
     :cond_1
     move-object v8, v6
 
+    goto :goto_1
+
+    :cond_2
+    move-object v8, v6
+
+    :goto_1
     sget-object v3, Lio/fabric/sdk/android/a/b/p$a;->bLP:Lio/fabric/sdk/android/a/b/p$a;
 
     invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
@@ -144,7 +151,7 @@
 
     move-result-object v11
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/p;->Ed()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/p;->Ec()Ljava/lang/String;
 
     move-result-object v12
 
@@ -178,7 +185,7 @@
 
     move-result-object v3
 
-    if-eq v2, v3, :cond_2
+    if-eq v2, v3, :cond_3
 
     new-instance v2, Lcom/crashlytics/android/answers/ag;
 
@@ -254,7 +261,7 @@
 
     return-void
 
-    :cond_2
+    :cond_3
     new-instance v0, Ljava/lang/IllegalStateException;
 
     const-string v2, "AnswersFilesManagerProvider cannot be called on the main thread"
@@ -268,7 +275,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 040a5336ec..b6365e5584 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$5.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/e$5;
 .super Ljava/lang/Object;
+.source "AnswersEventsHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -50,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 acb885618f..cf52c8be49 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$6.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/e$6;
 .super Ljava/lang/Object;
+.source "AnswersEventsHandler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -71,7 +72,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 f1184fc7b4..65c9838811 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/e;
 .super Ljava/lang/Object;
+.source "AnswersEventsHandler.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/d/d;
@@ -71,7 +72,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -132,7 +133,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 98560df5c5..b3fe643a08 100644
--- a/com.discord/smali/com/crashlytics/android/answers/f.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/f;
 .super Ljava/lang/Object;
+.source "AnswersFilesManagerProvider.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/answers/g.smali b/com.discord/smali/com/crashlytics/android/answers/g.smali
index 1ff06c2e69..095166d6cf 100644
--- a/com.discord/smali/com/crashlytics/android/answers/g.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/g;
 .super Lio/fabric/sdk/android/a$b;
+.source "AnswersLifecycleCallbacks.java"
 
 
 # instance fields
@@ -80,7 +81,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/h.smali b/com.discord/smali/com/crashlytics/android/answers/h.smali
index ed44b35cdd..16e1f2373f 100644
--- a/com.discord/smali/com/crashlytics/android/answers/h.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/h;
 .super Ljava/lang/Object;
+.source "AnswersPreferenceManager.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/answers/i.smali b/com.discord/smali/com/crashlytics/android/answers/i.smali
index 2ff5f21e37..6443b929db 100644
--- a/com.discord/smali/com/crashlytics/android/answers/i.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/i;
 .super Ljava/lang/Object;
+.source "AnswersRetryFilesSender.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/d/f;
@@ -61,9 +62,9 @@
 
     sub-long v5, v0, v5
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v7, 0x1
+    const/4 v7, 0x0
 
     cmp-long v8, v5, v3
 
@@ -97,15 +98,15 @@
 
     new-instance v1, Lio/fabric/sdk/android/a/c/a/e;
 
-    iget-object v2, v0, Lio/fabric/sdk/android/a/c/a/e;->oy:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v3, v0, Lio/fabric/sdk/android/a/c/a/e;->oy:Lio/fabric/sdk/android/a/c/a/a;
 
     iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bMV:Lio/fabric/sdk/android/a/c/a/d;
 
-    invoke-direct {v1, v2, 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
+    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;->oB:Lio/fabric/sdk/android/a/c/a/e;
 
-    return v7
+    return v2
 
     :cond_1
     iget-object p1, p0, Lcom/crashlytics/android/answers/i;->nV:Lcom/crashlytics/android/answers/y;
@@ -118,16 +119,18 @@
 
     iget v3, v0, Lio/fabric/sdk/android/a/c/a/e;->retryCount:I
 
-    add-int/2addr v3, v7
+    add-int/2addr v3, v2
 
-    iget-object v4, v0, Lio/fabric/sdk/android/a/c/a/e;->oy:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/c/a/e;->oy:Lio/fabric/sdk/android/a/c/a/a;
 
     iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bMV:Lio/fabric/sdk/android/a/c/a/d;
 
-    invoke-direct {v1, v3, v4, 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
+    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;->oB:Lio/fabric/sdk/android/a/c/a/e;
 
+    return v7
+
     :cond_2
-    return v2
+    return v7
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/j.smali b/com.discord/smali/com/crashlytics/android/answers/j.smali
index 739727f53d..86a7bcbccb 100644
--- a/com.discord/smali/com/crashlytics/android/answers/j.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/j;
 .super Ljava/lang/Object;
+.source "AppMeasurementEventLogger.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/answers/p;
@@ -197,6 +198,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
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 458f6c15af..8e594519eb 100644
--- a/com.discord/smali/com/crashlytics/android/answers/k$1.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/k$1;
 .super Ljava/lang/Object;
+.source "BackgroundManager.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/crashlytics/android/answers/k$a.smali b/com.discord/smali/com/crashlytics/android/answers/k$a.smali
index 01d819c1ee..7355d5e6e6 100644
--- a/com.discord/smali/com/crashlytics/android/answers/k$a.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/k$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/crashlytics/android/answers/k$a;
 .super Ljava/lang/Object;
+.source "BackgroundManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/k.smali b/com.discord/smali/com/crashlytics/android/answers/k.smali
index ae529ff4c3..1aeea58e53 100644
--- a/com.discord/smali/com/crashlytics/android/answers/k.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/k.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/k;
 .super Ljava/lang/Object;
+.source "BackgroundManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/l.smali b/com.discord/smali/com/crashlytics/android/answers/l.smali
index 274e441d4a..1cb7f47fd7 100644
--- a/com.discord/smali/com/crashlytics/android/answers/l.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/l;
 .super Lcom/crashlytics/android/answers/c;
+.source "CustomEvent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/m.smali b/com.discord/smali/com/crashlytics/android/answers/m.smali
index a6a99f9ec3..b2b424bfef 100644
--- a/com.discord/smali/com/crashlytics/android/answers/m.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/m.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/m;
 .super Ljava/lang/Object;
+.source "DisabledSessionAnalyticsManagerStrategy.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/answers/ad;
diff --git a/com.discord/smali/com/crashlytics/android/answers/n.smali b/com.discord/smali/com/crashlytics/android/answers/n.smali
index 2bf4d6ba77..5daecc822d 100644
--- a/com.discord/smali/com/crashlytics/android/answers/n.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/n.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/n;
 .super Ljava/lang/Object;
+.source "EnabledSessionAnalyticsManagerStrategy.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/answers/ad;
@@ -226,7 +227,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -261,7 +262,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -290,7 +291,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -323,7 +324,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -346,9 +347,9 @@
 
     const/4 v0, -0x1
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eq p1, v0, :cond_3
 
@@ -419,7 +420,7 @@
 
     if-nez p1, :cond_7
 
-    goto/16 :goto_11
+    goto/16 :goto_f
 
     :cond_7
     if-eqz v3, :cond_8
@@ -451,7 +452,7 @@
 
     if-nez p1, :cond_a
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -514,7 +515,7 @@
 
     const/4 v0, 0x0
 
-    goto/16 :goto_10
+    goto/16 :goto_e
 
     :cond_d
     if-eqz v4, :cond_1a
@@ -603,10 +604,9 @@
 
     check-cast v6, Ljava/lang/String;
 
-    :goto_6
     invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_e
     const-string v5, "addToCart"
@@ -713,7 +713,7 @@
 
     invoke-virtual {v3, v5, v6, v7}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_f
     const-string v5, "startCheckout"
@@ -778,6 +778,8 @@
 
     check-cast v6, Ljava/lang/String;
 
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
     goto/16 :goto_6
 
     :cond_10
@@ -831,6 +833,8 @@
 
     check-cast v6, Ljava/lang/String;
 
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
     goto/16 :goto_6
 
     :cond_11
@@ -856,6 +860,8 @@
 
     check-cast v6, Ljava/lang/String;
 
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
     goto/16 :goto_6
 
     :cond_12
@@ -923,6 +929,8 @@
 
     check-cast v6, Ljava/lang/String;
 
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
     goto/16 :goto_6
 
     :cond_13
@@ -992,6 +1000,8 @@
 
     check-cast v6, Ljava/lang/String;
 
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
     goto/16 :goto_6
 
     :cond_14
@@ -1017,6 +1027,8 @@
 
     check-cast v6, Ljava/lang/String;
 
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
     goto/16 :goto_6
 
     :cond_15
@@ -1042,7 +1054,9 @@
 
     check-cast v6, Ljava/lang/String;
 
-    goto/16 :goto_6
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_6
 
     :cond_16
     const-string v5, "invite"
@@ -1067,7 +1081,9 @@
 
     check-cast v6, Ljava/lang/String;
 
-    goto/16 :goto_6
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_6
 
     :cond_17
     const-string v5, "levelStart"
@@ -1092,7 +1108,9 @@
 
     check-cast v6, Ljava/lang/String;
 
-    goto/16 :goto_6
+    invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_6
 
     :cond_18
     const-string v5, "levelEnd"
@@ -1154,13 +1172,12 @@
     invoke-static {v3, v5, v6}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Integer;)V
 
     :cond_19
-    :goto_7
+    :goto_6
     iget-object v5, v11, Lcom/crashlytics/android/answers/ae;->oO:Ljava/util/Map;
 
-    :goto_8
     invoke-static {v3, v5}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/util/Map;)V
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_1a
     new-instance v3, Landroid/os/Bundle;
@@ -1173,10 +1190,10 @@
 
     iget-object v5, v11, Lcom/crashlytics/android/answers/ae;->oO:Ljava/util/Map;
 
-    goto :goto_8
+    invoke-static {v3, v5}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/util/Map;)V
 
     :cond_1b
-    :goto_9
+    :goto_7
     if-eqz v4, :cond_23
 
     iget-object v4, v11, Lcom/crashlytics/android/answers/ae;->oQ:Ljava/util/Map;
@@ -1199,12 +1216,12 @@
 
     const/4 v4, 0x1
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_1c
     const/4 v4, 0x0
 
-    :goto_a
+    :goto_8
     iget-object v5, v11, Lcom/crashlytics/android/answers/ae;->oP:Ljava/lang/String;
 
     const/4 v6, 0x2
@@ -1227,7 +1244,7 @@
 
     if-eq v4, v7, :cond_1d
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_1d
     const-string v4, "purchase"
@@ -1240,7 +1257,7 @@
 
     const/4 v4, 0x0
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_1e
     const-string v4, "login"
@@ -1253,7 +1270,7 @@
 
     const/4 v4, 0x2
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_1f
     const-string v4, "signUp"
@@ -1266,54 +1283,54 @@
 
     const/4 v4, 0x1
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_20
-    :goto_b
+    :goto_9
     const/4 v4, -0x1
 
-    :goto_c
+    :goto_a
     packed-switch v4, :pswitch_data_0
 
-    goto :goto_d
+    goto :goto_b
 
     :pswitch_0
     const-string v0, "failed_login"
 
-    goto/16 :goto_f
+    goto/16 :goto_d
 
     :pswitch_1
     const-string v0, "failed_sign_up"
 
-    goto/16 :goto_f
+    goto/16 :goto_d
 
     :pswitch_2
     const-string v0, "failed_ecommerce_purchase"
 
-    goto/16 :goto_f
+    goto/16 :goto_d
 
     :cond_21
-    :goto_d
+    :goto_b
     invoke-virtual {v5}, Ljava/lang/String;->hashCode()I
 
     move-result v4
 
     sparse-switch v4, :sswitch_data_0
 
-    goto/16 :goto_e
+    goto/16 :goto_c
 
     :sswitch_0
-    const-string v2, "purchase"
+    const-string v1, "purchase"
 
-    invoke-virtual {v5, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v5, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_22
+    if-eqz v1, :cond_22
 
     const/4 v0, 0x0
 
-    goto/16 :goto_e
+    goto/16 :goto_c
 
     :sswitch_1
     const-string v1, "startCheckout"
@@ -1326,7 +1343,7 @@
 
     const/4 v0, 0x2
 
-    goto/16 :goto_e
+    goto/16 :goto_c
 
     :sswitch_2
     const-string v1, "levelStart"
@@ -1339,7 +1356,7 @@
 
     const/16 v0, 0xa
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_3
     const-string v1, "share"
@@ -1352,7 +1369,7 @@
 
     const/4 v0, 0x5
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_4
     const-string v1, "login"
@@ -1365,20 +1382,20 @@
 
     const/16 v0, 0x8
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_5
-    const-string v1, "addToCart"
+    const-string v2, "addToCart"
 
-    invoke-virtual {v5, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_22
+    if-eqz v2, :cond_22
 
     const/4 v0, 0x1
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_6
     const-string v1, "contentView"
@@ -1391,7 +1408,7 @@
 
     const/4 v0, 0x3
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_7
     const-string v1, "signUp"
@@ -1404,7 +1421,7 @@
 
     const/4 v0, 0x7
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_8
     const-string v1, "search"
@@ -1417,7 +1434,7 @@
 
     const/4 v0, 0x4
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_9
     const-string v1, "rating"
@@ -1430,7 +1447,7 @@
 
     const/4 v0, 0x6
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_a
     const-string v1, "invite"
@@ -1443,7 +1460,7 @@
 
     const/16 v0, 0x9
 
-    goto :goto_e
+    goto :goto_c
 
     :sswitch_b
     const-string v1, "levelEnd"
@@ -1457,74 +1474,74 @@
     const/16 v0, 0xb
 
     :cond_22
-    :goto_e
+    :goto_c
     packed-switch v0, :pswitch_data_1
 
     invoke-static {v5}, Lcom/crashlytics/android/answers/t;->D(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_3
     const-string v0, "level_end"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_4
     const-string v0, "level_start"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_5
     const-string v0, "invite"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_6
     const-string v0, "login"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_7
     const-string v0, "sign_up"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_8
     const-string v0, "rate_content"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_9
     const-string v0, "share"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_a
     const-string v0, "search"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_b
     const-string v0, "select_content"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_c
     const-string v0, "begin_checkout"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_d
     const-string v0, "add_to_cart"
 
-    goto :goto_f
+    goto :goto_d
 
     :pswitch_e
     const-string v0, "ecommerce_purchase"
 
-    goto :goto_f
+    goto :goto_d
 
     :cond_23
     iget-object v0, v11, Lcom/crashlytics/android/answers/ae;->oN:Ljava/lang/String;
@@ -1533,8 +1550,8 @@
 
     move-result-object v0
 
-    :goto_f
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    :goto_d
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -1550,10 +1567,10 @@
 
     move-object v0, v1
 
-    :goto_10
+    :goto_e
     if-nez v0, :cond_24
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -1604,7 +1621,7 @@
     :catch_1
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1622,11 +1639,11 @@
 
     invoke-interface {v0, v1, v2, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    :cond_26
-    :goto_11
     return-void
 
-    nop
+    :cond_26
+    :goto_f
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -1733,7 +1750,7 @@
 
     iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->or:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1765,7 +1782,7 @@
 
     invoke-interface {p2, v0, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1801,7 +1818,7 @@
 
     iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->ol:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1837,7 +1854,7 @@
 
     iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->om:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1875,7 +1892,7 @@
 
     if-le p2, v0, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1933,7 +1950,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/answers/n;->of:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Es()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Er()Ljava/util/List;
 
     move-result-object v0
 
@@ -1998,7 +2015,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/answers/n;->of:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Es()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Er()Ljava/util/List;
 
     move-result-object v0
     :try_end_0
@@ -2034,7 +2051,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/answers/n;->of:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Eu()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Et()V
 
     :cond_3
     return-void
@@ -2045,7 +2062,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/answers/n;->of:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Et()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Es()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/o.smali b/com.discord/smali/com/crashlytics/android/answers/o.smali
index 2fbe2e9123..1f6b2bbb5a 100644
--- a/com.discord/smali/com/crashlytics/android/answers/o.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/o.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/answers/o;
 .super Ljava/lang/Object;
+.source "EventFilter.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/answers/p.smali b/com.discord/smali/com/crashlytics/android/answers/p.smali
index 160d2a3eaa..b6dff69a02 100644
--- a/com.discord/smali/com/crashlytics/android/answers/p.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/p.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/crashlytics/android/answers/p;
 .super Ljava/lang/Object;
+.source "EventLogger.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/answers/q.smali b/com.discord/smali/com/crashlytics/android/answers/q.smali
index b03ef3b371..2a0449f77c 100644
--- a/com.discord/smali/com/crashlytics/android/answers/q.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/q.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/q;
 .super Ljava/lang/Object;
+.source "FirebaseAnalyticsApiAdapter.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/answers/s.smali b/com.discord/smali/com/crashlytics/android/answers/s.smali
index 35c66630c8..b9bf852afe 100644
--- a/com.discord/smali/com/crashlytics/android/answers/s.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/s.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/s;
 .super Ljava/lang/Object;
+.source "FirebaseAnalyticsEvent.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/answers/t.smali b/com.discord/smali/com/crashlytics/android/answers/t.smali
index 509fb03b47..ccca6d5285 100644
--- a/com.discord/smali/com/crashlytics/android/answers/t.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/t.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/t;
 .super Ljava/lang/Object;
+.source "FirebaseAnalyticsEventMapper.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/crashlytics/android/answers/u.smali b/com.discord/smali/com/crashlytics/android/answers/u.smali
index 4fb8e08ac6..6e31e598db 100644
--- a/com.discord/smali/com/crashlytics/android/answers/u.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/u.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/u;
 .super Ljava/lang/Object;
+.source "KeepAllEventFilter.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/answers/o;
diff --git a/com.discord/smali/com/crashlytics/android/answers/v.smali b/com.discord/smali/com/crashlytics/android/answers/v.smali
index a298c14d17..82d8bd99ea 100644
--- a/com.discord/smali/com/crashlytics/android/answers/v.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/v.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/answers/v;
 .super Lcom/crashlytics/android/answers/w;
+.source "LoginEvent.java"
 
 
 # annotations
@@ -43,7 +44,7 @@
     return-object v0
 .end method
 
-.method public final m(Z)Lcom/crashlytics/android/answers/v;
+.method public final l(Z)Lcom/crashlytics/android/answers/v;
     .locals 2
 
     iget-object v0, p0, Lcom/crashlytics/android/answers/v;->ox:Lcom/crashlytics/android/answers/b;
diff --git a/com.discord/smali/com/crashlytics/android/answers/w.smali b/com.discord/smali/com/crashlytics/android/answers/w.smali
index deb1fdb67a..150a3669c0 100644
--- a/com.discord/smali/com/crashlytics/android/answers/w.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/w.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/crashlytics/android/answers/w;
 .super Lcom/crashlytics/android/answers/c;
+.source "PredefinedEvent.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/x.smali b/com.discord/smali/com/crashlytics/android/answers/x.smali
index 5c8865bf5c..749d414045 100644
--- a/com.discord/smali/com/crashlytics/android/answers/x.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/x.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/x;
 .super Ljava/lang/Object;
+.source "RandomBackoff.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/c/a/a;
@@ -64,11 +65,9 @@
 
     const-wide/high16 v2, 0x3ff0000000000000L    # 1.0
 
-    sub-double v0, v2, v0
+    sub-double v4, v2, v0
 
-    iget-wide v4, p0, Lcom/crashlytics/android/answers/x;->oz:D
-
-    add-double/2addr v4, v2
+    add-double/2addr v0, v2
 
     iget-object v2, p0, Lcom/crashlytics/android/answers/x;->random:Ljava/util/Random;
 
@@ -76,25 +75,25 @@
 
     move-result-wide v2
 
-    sub-double/2addr v4, v0
-
-    mul-double v4, v4, v2
-
-    add-double/2addr v0, v4
-
-    iget-object v2, p0, Lcom/crashlytics/android/answers/x;->oy:Lio/fabric/sdk/android/a/c/a/a;
-
-    invoke-interface {v2, p1}, Lio/fabric/sdk/android/a/c/a/a;->n(I)J
-
-    move-result-wide v2
-
-    long-to-double v2, v2
-
-    invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z
+    sub-double/2addr v0, v4
 
     mul-double v0, v0, v2
 
-    double-to-long v0, v0
+    add-double/2addr v4, v0
+
+    iget-object v0, p0, Lcom/crashlytics/android/answers/x;->oy:Lio/fabric/sdk/android/a/c/a/a;
+
+    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/a/a;->n(I)J
+
+    move-result-wide v0
+
+    long-to-double v0, v0
+
+    invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
+
+    mul-double v4, v4, v0
+
+    double-to-long v0, v4
 
     return-wide v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/y.smali b/com.discord/smali/com/crashlytics/android/answers/y.smali
index 19e55c2090..504cfc6ca3 100644
--- a/com.discord/smali/com/crashlytics/android/answers/y.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/y.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/y;
 .super Ljava/lang/Object;
+.source "RetryManager.java"
 
 
 # instance fields
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 6897a63dfd..ea4cc5260d 100644
--- a/com.discord/smali/com/crashlytics/android/answers/z$1.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/z$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/z$1;
 .super Ljava/util/HashSet;
+.source "SamplingEventFilter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/answers/z.smali b/com.discord/smali/com/crashlytics/android/answers/z.smali
index 9399756af2..6434c4dcf7 100644
--- a/com.discord/smali/com/crashlytics/android/answers/z.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/z.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/answers/z;
 .super Ljava/lang/Object;
+.source "SamplingEventFilter.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/answers/o;
diff --git a/com.discord/smali/com/crashlytics/android/b.smali b/com.discord/smali/com/crashlytics/android/b.smali
index 5748bbba84..e61f66751f 100644
--- a/com.discord/smali/com/crashlytics/android/b.smali
+++ b/com.discord/smali/com/crashlytics/android/b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/b;
 .super Ljava/lang/Object;
+.source "ManifestEnabledCheckStrategy.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/CrashlyticsInitProvider$a;
@@ -57,8 +58,10 @@
 
     return p1
 
-    :catch_0
     :cond_1
     :goto_0
     return v0
+
+    :catch_0
+    return v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/beta/R.smali b/com.discord/smali/com/crashlytics/android/beta/R.smali
index ad089b3616..1e72fbcba7 100644
--- a/com.discord/smali/com/crashlytics/android/beta/R.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/beta/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/beta/a.smali b/com.discord/smali/com/crashlytics/android/beta/a.smali
index c73c0f9a8f..992552536b 100644
--- a/com.discord/smali/com/crashlytics/android/beta/a.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/a.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/crashlytics/android/beta/a;
 .super Ljava/lang/Object;
+.source "AbstractCheckForUpdatesController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/beta/j;
@@ -67,7 +68,7 @@
 .method private ca()V
     .locals 9
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -105,9 +106,7 @@
 
     iget-object v3, p0, Lcom/crashlytics/android/beta/a;->nt:Lcom/crashlytics/android/beta/c;
 
-    iget-object v2, p0, Lcom/crashlytics/android/beta/a;->nt:Lcom/crashlytics/android/beta/c;
-
-    invoke-virtual {v2}, Lcom/crashlytics/android/beta/c;->cc()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/crashlytics/android/beta/c;->cc()Ljava/lang/String;
 
     move-result-object v4
 
@@ -188,7 +187,7 @@
     :try_start_0
     iget-object v1, p0, Lcom/crashlytics/android/beta/a;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -223,7 +222,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/beta/a;->pr:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Eb()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Ea()J
 
     move-result-wide v0
 
@@ -237,7 +236,7 @@
 
     mul-long v2, v2, v4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -255,7 +254,7 @@
 
     invoke-interface {v4, v5, v6}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -281,7 +280,7 @@
 
     add-long/2addr v4, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -328,7 +327,7 @@
     throw v2
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/beta/b$1$1.smali b/com.discord/smali/com/crashlytics/android/beta/b$1$1.smali
index b890ded1ce..7215f567bb 100644
--- a/com.discord/smali/com/crashlytics/android/beta/b$1$1.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/b$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/b$1$1;
 .super Ljava/lang/Object;
+.source "ActivityLifecycleCheckForUpdatesController.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/crashlytics/android/beta/b$1.smali b/com.discord/smali/com/crashlytics/android/beta/b$1.smali
index 00a04c640d..a7737d9c01 100644
--- a/com.discord/smali/com/crashlytics/android/beta/b$1.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/b$1;
 .super Lio/fabric/sdk/android/a$b;
+.source "ActivityLifecycleCheckForUpdatesController.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/beta/b.smali b/com.discord/smali/com/crashlytics/android/beta/b.smali
index f220aa7980..50ef4d7481 100644
--- a/com.discord/smali/com/crashlytics/android/beta/b.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/b;
 .super Lcom/crashlytics/android/beta/a;
+.source "ActivityLifecycleCheckForUpdatesController.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/beta/c.smali b/com.discord/smali/com/crashlytics/android/beta/c.smali
index 79038e0588..9d4c655dcc 100644
--- a/com.discord/smali/com/crashlytics/android/beta/c.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/beta/c;
 .super Lio/fabric/sdk/android/i;
+.source "Beta.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/b/m;
@@ -89,7 +90,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -100,7 +101,7 @@
     invoke-interface {v1, v2, v3, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -189,7 +190,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -268,7 +269,7 @@
     :catch_2
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -302,7 +303,7 @@
 
     :goto_1
     :try_start_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -326,7 +327,7 @@
     :catch_4
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -360,7 +361,7 @@
     :catch_5
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -380,7 +381,7 @@
 .method public final synthetic bL()Ljava/lang/Object;
     .locals 12
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -406,7 +407,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -421,7 +422,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -431,11 +432,11 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ET()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ES()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
 
@@ -443,17 +444,16 @@
 
     iget-object v0, v0, Lio/fabric/sdk/android/a/g/t;->bOS:Lio/fabric/sdk/android/a/g/f;
 
-    :goto_0
     move-object v7, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    move-object v7, v0
 
-    :goto_1
+    :goto_0
     invoke-static {v4}, Lcom/crashlytics/android/beta/c;->u(Landroid/content/Context;)Lcom/crashlytics/android/beta/d;
 
     move-result-object v8
@@ -472,12 +472,12 @@
 
     const/4 v0, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v0, 0x0
 
-    :goto_2
+    :goto_1
     if-eqz v0, :cond_3
 
     iget-object v3, p0, Lcom/crashlytics/android/beta/c;->py:Lcom/crashlytics/android/beta/j;
@@ -492,7 +492,7 @@
 
     new-instance v11, Lio/fabric/sdk/android/a/e/b;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/beta/d.smali b/com.discord/smali/com/crashlytics/android/beta/d.smali
index e8f17c1f6a..9306c75360 100644
--- a/com.discord/smali/com/crashlytics/android/beta/d.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/d;
 .super Ljava/lang/Object;
+.source "BuildProperties.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/beta/e.smali b/com.discord/smali/com/crashlytics/android/beta/e.smali
index 0b5d92b492..b3700c8cea 100644
--- a/com.discord/smali/com/crashlytics/android/beta/e.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/e;
 .super Lio/fabric/sdk/android/a/b/a;
+.source "CheckForUpdatesRequest.java"
 
 
 # instance fields
@@ -159,7 +160,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -181,7 +182,7 @@
 
     invoke-interface {p2, p3, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -201,7 +202,7 @@
 
     const/16 p2, 0xc8
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EF()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result p3
 
@@ -217,7 +218,7 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -229,7 +230,7 @@
 
     new-instance p2, Lorg/json/JSONObject;
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EG()Ljava/lang/String;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EF()Ljava/lang/String;
 
     move-result-object p3
 
@@ -286,7 +287,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p3
 
@@ -308,7 +309,7 @@
 
     :cond_1
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -320,7 +321,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EF()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result v2
 
@@ -370,7 +371,7 @@
 
     :goto_1
     :try_start_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p3
 
@@ -403,7 +404,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -436,7 +437,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p3
 
diff --git a/com.discord/smali/com/crashlytics/android/beta/f.smali b/com.discord/smali/com/crashlytics/android/beta/f.smali
index 98b3ef1726..76e951905b 100644
--- a/com.discord/smali/com/crashlytics/android/beta/f.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/f;
 .super Ljava/lang/Object;
+.source "CheckForUpdatesResponse.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/beta/g.smali b/com.discord/smali/com/crashlytics/android/beta/g.smali
index 396b826f25..9974e8d084 100644
--- a/com.discord/smali/com/crashlytics/android/beta/g.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/g;
 .super Ljava/lang/Object;
+.source "CheckForUpdatesResponseTransform.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/beta/h.smali b/com.discord/smali/com/crashlytics/android/beta/h.smali
index 976fb7cf17..a7207b4e55 100644
--- a/com.discord/smali/com/crashlytics/android/beta/h.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/beta/h;
 .super Ljava/lang/Object;
+.source "DeviceTokenLoader.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/a/d;
@@ -100,6 +101,8 @@
 
     move-result-object p0
 
+    move-object v2, p0
+
     goto :goto_0
 
     :cond_0
@@ -110,9 +113,9 @@
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :goto_0
     move-object v2, p0
 
+    :goto_0
     :try_start_2
     invoke-virtual {v4}, Ljava/util/zip/ZipInputStream;->close()V
     :try_end_2
@@ -123,7 +126,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -171,7 +174,7 @@
 
     :goto_1
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -197,7 +200,7 @@
 
     :goto_2
     :try_start_5
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -221,7 +224,7 @@
     :catch_6
     :goto_3
     :try_start_7
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -256,7 +259,7 @@
 
     div-double/2addr v0, v3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -295,7 +298,7 @@
     :catch_7
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/beta/i.smali b/com.discord/smali/com/crashlytics/android/beta/i.smali
index 595eedc0c8..dac59ef77f 100644
--- a/com.discord/smali/com/crashlytics/android/beta/i.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/beta/i;
 .super Lcom/crashlytics/android/beta/a;
+.source "ImmediateCheckForUpdatesController.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/beta/j.smali b/com.discord/smali/com/crashlytics/android/beta/j.smali
index a42db04da5..3426a0a95a 100644
--- a/com.discord/smali/com/crashlytics/android/beta/j.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/j.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/beta/j;
 .super Ljava/lang/Object;
+.source "UpdatesController.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/core/R.smali b/com.discord/smali/com/crashlytics/android/core/R.smali
index 92155ba49f..d5b53a4be2 100644
--- a/com.discord/smali/com/crashlytics/android/core/R.smali
+++ b/com.discord/smali/com/crashlytics/android/core/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/core/a.smali b/com.discord/smali/com/crashlytics/android/core/a.smali
index 76d19d8c03..22bd707f25 100644
--- a/com.discord/smali/com/crashlytics/android/core/a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/a;
 .super Ljava/lang/Object;
+.source "AppData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/core/aa.smali b/com.discord/smali/com/crashlytics/android/core/aa.smali
index 25b38be6c2..ac30570849 100644
--- a/com.discord/smali/com/crashlytics/android/core/aa.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aa.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/aa;
 .super Ljava/lang/Object;
+.source "FileLogStore.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/core/ab.smali b/com.discord/smali/com/crashlytics/android/core/ab.smali
index 9ec4193d96..19bca370c2 100644
--- a/com.discord/smali/com/crashlytics/android/core/ab.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ab.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ab;
 .super Ljava/lang/Object;
+.source "InvalidSessionReport.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/aq;
@@ -132,7 +133,7 @@
 
     aget-object v3, v0, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ac$a.smali b/com.discord/smali/com/crashlytics/android/core/ac$a.smali
index 54ed26d278..32fdf1fc49 100644
--- a/com.discord/smali/com/crashlytics/android/core/ac$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ac$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/crashlytics/android/core/ac$a;
 .super Ljava/lang/Object;
+.source "LogFileManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/ac$b.smali b/com.discord/smali/com/crashlytics/android/core/ac$b.smali
index d6443ea7a0..42928db897 100644
--- a/com.discord/smali/com/crashlytics/android/core/ac$b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ac$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ac$b;
 .super Ljava/lang/Object;
+.source "LogFileManager.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/aa;
diff --git a/com.discord/smali/com/crashlytics/android/core/ac.smali b/com.discord/smali/com/crashlytics/android/core/ac.smali
index 363d314491..6e4ad1737f 100644
--- a/com.discord/smali/com/crashlytics/android/core/ac.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ac.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ac;
 .super Ljava/lang/Object;
+.source "LogFileManager.java"
 
 
 # annotations
@@ -142,7 +143,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ad.smali b/com.discord/smali/com/crashlytics/android/core/ad.smali
index ea43c43e13..ccf12e6464 100644
--- a/com.discord/smali/com/crashlytics/android/core/ad.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ad.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ad;
 .super Ljava/lang/Object;
+.source "ManifestUnityVersionProvider.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/ax;
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 056cbf7128..a38e0e03a7 100644
--- a/com.discord/smali/com/crashlytics/android/core/ae$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ae$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ae$1;
 .super Lorg/json/JSONObject;
+.source "MetaDataStore.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/ae.smali b/com.discord/smali/com/crashlytics/android/core/ae.smali
index 45a0e9caf0..831461473b 100644
--- a/com.discord/smali/com/crashlytics/android/core/ae.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ae.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ae;
 .super Ljava/lang/Object;
+.source "MetaDataStore.java"
 
 
 # static fields
@@ -199,7 +200,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/af.smali b/com.discord/smali/com/crashlytics/android/core/af.smali
index 2201c5dd41..96f14ec537 100644
--- a/com.discord/smali/com/crashlytics/android/core/af.smali
+++ b/com.discord/smali/com/crashlytics/android/core/af.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/af;
 .super Ljava/lang/Object;
+.source "MiddleOutFallbackStrategy.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/av;
diff --git a/com.discord/smali/com/crashlytics/android/core/ag.smali b/com.discord/smali/com/crashlytics/android/core/ag.smali
index 63e84b768e..4a228eb4b7 100644
--- a/com.discord/smali/com/crashlytics/android/core/ag.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ag.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ag;
 .super Ljava/lang/Object;
+.source "MiddleOutStrategy.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/av;
@@ -36,27 +37,21 @@
     return-object p1
 
     :cond_0
-    iget v0, p0, Lcom/crashlytics/android/core/ag;->rX:I
+    div-int/lit8 v0, v1, 0x2
 
-    div-int/lit8 v0, v0, 0x2
+    sub-int v2, v1, v0
 
-    iget v1, p0, Lcom/crashlytics/android/core/ag;->rX:I
-
-    sub-int/2addr v1, v0
-
-    iget v2, p0, Lcom/crashlytics/android/core/ag;->rX:I
-
-    new-array v2, v2, [Ljava/lang/StackTraceElement;
+    new-array v1, v1, [Ljava/lang/StackTraceElement;
 
     const/4 v3, 0x0
 
-    invoke-static {p1, v3, v2, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v3, v1, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     array-length v3, p1
 
     sub-int/2addr v3, v0
 
-    invoke-static {p1, v3, v2, v1, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v3, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    return-object v2
+    return-object v1
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/ah.smali b/com.discord/smali/com/crashlytics/android/core/ah.smali
index 8a3e535d2f..d42b680037 100644
--- a/com.discord/smali/com/crashlytics/android/core/ah.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ah.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ah;
 .super Lio/fabric/sdk/android/a/b/a;
+.source "NativeCreateReportSpiCall.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/v;
@@ -66,7 +67,6 @@
 
     const-string v3, "minidump_file"
 
-    :goto_1
     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
 
     move-result-object v4
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
@@ -92,7 +92,15 @@
 
     const-string v3, "crash_meta_file"
 
-    goto :goto_1
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
+    goto/16 :goto_1
 
     :cond_1
     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
@@ -109,7 +117,15 @@
 
     const-string v3, "binary_images_file"
 
-    goto :goto_1
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
+    goto/16 :goto_1
 
     :cond_2
     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
@@ -126,7 +142,15 @@
 
     const-string v3, "session_meta_file"
 
-    goto :goto_1
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
+    goto/16 :goto_1
 
     :cond_3
     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
@@ -143,7 +167,15 @@
 
     const-string v3, "app_meta_file"
 
-    goto :goto_1
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
+    goto/16 :goto_1
 
     :cond_4
     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
@@ -160,6 +192,14 @@
 
     const-string v3, "device_meta_file"
 
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
     goto :goto_1
 
     :cond_5
@@ -177,6 +217,14 @@
 
     const-string v3, "os_meta_file"
 
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
     goto :goto_1
 
     :cond_6
@@ -194,6 +242,14 @@
 
     const-string v3, "user_meta_file"
 
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
     goto :goto_1
 
     :cond_7
@@ -211,7 +267,15 @@
 
     const-string v3, "logs_file"
 
-    goto/16 :goto_1
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+
+    goto :goto_1
 
     :cond_8
     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
@@ -228,10 +292,16 @@
 
     const-string v3, "keys_file"
 
-    goto/16 :goto_1
+    invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "application/octet-stream"
+
+    invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
 
     :cond_9
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto/16 :goto_0
@@ -245,7 +315,7 @@
 .method public final a(Lcom/crashlytics/android/core/u;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->DS()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->DR()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
@@ -305,7 +375,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -327,11 +397,11 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EF()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ai.smali b/com.discord/smali/com/crashlytics/android/core/ai.smali
index 5dfdc2e6c7..1a4db7062e 100644
--- a/com.discord/smali/com/crashlytics/android/core/ai.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ai.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ai;
 .super Ljava/lang/Object;
+.source "NativeFileUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/core/aj.smali b/com.discord/smali/com/crashlytics/android/core/aj.smali
index 6b0a64b6c2..4b015f8fe4 100644
--- a/com.discord/smali/com/crashlytics/android/core/aj.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aj.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/aj;
 .super Ljava/lang/Object;
+.source "NativeSessionReport.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/aq;
@@ -105,7 +106,7 @@
 
     aget-object v3, v0, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -136,7 +137,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ak.smali b/com.discord/smali/com/crashlytics/android/core/ak.smali
index 5ee122eac7..0e00ba734e 100644
--- a/com.discord/smali/com/crashlytics/android/core/ak.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ak.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/crashlytics/android/core/ak;
 .super Ljava/lang/Object;
+.source "PinningInfoProvider.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/core/al.smali b/com.discord/smali/com/crashlytics/android/core/al.smali
index 030292f90a..b0d5b10acd 100644
--- a/com.discord/smali/com/crashlytics/android/core/al.smali
+++ b/com.discord/smali/com/crashlytics/android/core/al.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/al;
 .super Ljava/lang/Object;
+.source "PreferenceManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/am.smali b/com.discord/smali/com/crashlytics/android/core/am.smali
index c7ce511fe2..e70cae80a9 100644
--- a/com.discord/smali/com/crashlytics/android/core/am.smali
+++ b/com.discord/smali/com/crashlytics/android/core/am.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/am;
 .super Ljava/lang/Object;
+.source "ProcMapEntry.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/core/an.smali b/com.discord/smali/com/crashlytics/android/core/an.smali
index bf870bf5a0..195ee38fca 100644
--- a/com.discord/smali/com/crashlytics/android/core/an.smali
+++ b/com.discord/smali/com/crashlytics/android/core/an.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/an;
 .super Ljava/lang/Object;
+.source "ProcMapEntryParser.java"
 
 
 # static fields
@@ -72,8 +73,6 @@
 
     move-result-wide v3
 
-    const/4 v1, 0x0
-
     sub-long v7, v3, v5
 
     const/4 v1, 0x3
@@ -99,7 +98,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 5f5250ffa4..f41ff12453 100644
--- a/com.discord/smali/com/crashlytics/android/core/ao$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ao$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ao$1;
 .super Ljava/lang/Object;
+.source "QueueFileLogStore.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/b/r$c;
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 25e8e2279a..9db036ca95 100644
--- a/com.discord/smali/com/crashlytics/android/core/ao$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ao$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/ao$a;
 .super Ljava/lang/Object;
+.source "QueueFileLogStore.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/ao.smali b/com.discord/smali/com/crashlytics/android/core/ao.smali
index f32a0d7c16..2cce73258a 100644
--- a/com.discord/smali/com/crashlytics/android/core/ao.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ao.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ao;
 .super Ljava/lang/Object;
+.source "QueueFileLogStore.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/aa;
@@ -61,28 +62,26 @@
     return-object v1
 
     :cond_1
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    new-array v0, v0, [I
+    new-array v1, v1, [I
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    aput v1, v0, v1
+    aput v2, v1, v2
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/ao;->sg:Lio/fabric/sdk/android/a/b/r;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/r;->Ed()I
 
-    invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/r;->Ee()I
+    move-result v0
 
-    move-result v2
-
-    new-array v2, v2, [B
+    new-array v0, v0, [B
 
     :try_start_0
     iget-object v3, p0, Lcom/crashlytics/android/core/ao;->sg:Lio/fabric/sdk/android/a/b/r;
 
     new-instance v4, Lcom/crashlytics/android/core/ao$1;
 
-    invoke-direct {v4, p0, v2, v0}, Lcom/crashlytics/android/core/ao$1;-><init>(Lcom/crashlytics/android/core/ao;[B[I)V
+    invoke-direct {v4, p0, v0, v1}, Lcom/crashlytics/android/core/ao$1;-><init>(Lcom/crashlytics/android/core/ao;[B[I)V
 
     invoke-virtual {v3, v4}, Lio/fabric/sdk/android/a/b/r;->a(Lio/fabric/sdk/android/a/b/r$c;)V
     :try_end_0
@@ -93,7 +92,7 @@
     :catch_0
     move-exception v3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -106,9 +105,9 @@
     :goto_0
     new-instance v3, Lcom/crashlytics/android/core/ao$a;
 
-    aget v0, v0, v1
+    aget v1, v1, v2
 
-    invoke-direct {v3, p0, v2, v0}, Lcom/crashlytics/android/core/ao$a;-><init>(Lcom/crashlytics/android/core/ao;[BI)V
+    invoke-direct {v3, p0, v0, v1}, Lcom/crashlytics/android/core/ao$a;-><init>(Lcom/crashlytics/android/core/ao;[BI)V
 
     return-object v3
 .end method
@@ -136,7 +135,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -275,7 +274,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/ao;->sg:Lio/fabric/sdk/android/a/b/r;
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/r;->Ee()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/r;->Ed()I
 
     move-result p1
 
@@ -297,7 +296,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ap.smali b/com.discord/smali/com/crashlytics/android/core/ap.smali
index 1e1b33dd51..60789a3cb3 100644
--- a/com.discord/smali/com/crashlytics/android/core/ap.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ap.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ap;
 .super Ljava/lang/Object;
+.source "RemoveRepeatsStrategy.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/av;
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 ea2580e269..e639ab9d4f 100644
--- a/com.discord/smali/com/crashlytics/android/core/aq$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aq$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/aq$a;
 .super Ljava/lang/Enum;
+.source "Report.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/aq.smali b/com.discord/smali/com/crashlytics/android/core/aq.smali
index 3749c8c843..519c38c672 100644
--- a/com.discord/smali/com/crashlytics/android/core/aq.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aq.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/aq;
 .super Ljava/lang/Object;
+.source "Report.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/ar$a.smali b/com.discord/smali/com/crashlytics/android/core/ar$a.smali
index 768eb0b927..dd2842555b 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ar$a;
 .super Ljava/lang/Object;
+.source "ReportUploader.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/ar$d;
diff --git a/com.discord/smali/com/crashlytics/android/core/ar$b.smali b/com.discord/smali/com/crashlytics/android/core/ar$b.smali
index 891483fe70..ded27a2bc8 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar$b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar$b.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/ar$b;
 .super Ljava/lang/Object;
+.source "ReportUploader.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/ar$c.smali b/com.discord/smali/com/crashlytics/android/core/ar$c.smali
index 2b016d2721..5afd6401b2 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar$c.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar$c.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/ar$c;
 .super Ljava/lang/Object;
+.source "ReportUploader.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/ar$d.smali b/com.discord/smali/com/crashlytics/android/core/ar$d.smali
index cff54a1e72..5291b36551 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar$d.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar$d.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/ar$d;
 .super Ljava/lang/Object;
+.source "ReportUploader.java"
 
 
 # annotations
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 28e880e7de..e08e24606c 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar$e.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ar$e;
 .super Lio/fabric/sdk/android/a/b/h;
+.source "ReportUploader.java"
 
 
 # annotations
@@ -42,7 +43,7 @@
     .locals 8
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -92,7 +93,7 @@
     .catch Ljava/lang/InterruptedException; {:try_start_1 .. :try_end_1} :catch_0
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_2
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     :try_start_2
@@ -100,13 +101,12 @@
 
     move-result-object v0
 
-    :goto_0
     invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_0
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/crashlytics/android/core/ar$e;->su:Lcom/crashlytics/android/core/ar;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/ar;->cZ()Ljava/util/List;
@@ -139,7 +139,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -171,7 +171,7 @@
 
     move-result-object v0
 
-    :goto_2
+    :goto_1
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
@@ -186,13 +186,13 @@
 
     invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->remove()V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 v1, 0x0
 
     :cond_2
-    :goto_3
+    :goto_2
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
     move-result v2
@@ -211,7 +211,7 @@
 
     if-nez v2, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -243,7 +243,7 @@
 
     move-result-object v0
 
-    :goto_4
+    :goto_3
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
@@ -260,7 +260,7 @@
 
     invoke-virtual {v3, v2}, Lcom/crashlytics/android/core/ar;->a(Lcom/crashlytics/android/core/aq;)Z
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     iget-object v0, p0, Lcom/crashlytics/android/core/ar$e;->su:Lcom/crashlytics/android/core/ar;
@@ -297,7 +297,7 @@
 
     int-to-long v1, v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -335,22 +335,24 @@
 
     move v1, v3
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :catch_1
     :try_start_4
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
     :try_end_4
     .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_2
 
-    goto/16 :goto_0
+    goto :goto_4
 
     :catch_2
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -361,7 +363,7 @@
     invoke-interface {v1, v2, v3, v0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_4
-    :goto_5
+    :goto_4
     iget-object v0, p0, Lcom/crashlytics/android/core/ar$e;->su: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 b93d0235a4..092e6f09b7 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ar;
 .super Ljava/lang/Object;
+.source "ReportUploader.java"
 
 
 # annotations
@@ -151,7 +152,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -221,7 +222,7 @@
 
     move-result v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -279,7 +280,7 @@
     move-exception v2
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -322,7 +323,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -376,7 +377,7 @@
 
     aget-object v7, v1, v6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v8
 
@@ -477,7 +478,7 @@
 
     check-cast v5, Ljava/lang/String;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -548,7 +549,7 @@
 
     if-eqz v1, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -570,4 +571,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/as.smali b/com.discord/smali/com/crashlytics/android/core/as.smali
index af5d4a89d5..49c545db68 100644
--- a/com.discord/smali/com/crashlytics/android/core/as.smali
+++ b/com.discord/smali/com/crashlytics/android/core/as.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/as;
 .super Ljava/lang/Object;
+.source "SessionProtobufHelper.java"
 
 
 # static fields
@@ -619,21 +620,24 @@
 
     int-to-long v3, v0
 
-    :goto_0
     invoke-static {v1, v3, v4}, Lcom/crashlytics/android/core/g;->b(IJ)I
 
     move-result v0
 
     add-int/2addr v0, v2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 v3, 0x0
 
-    goto :goto_0
+    invoke-static {v1, v3, v4}, Lcom/crashlytics/android/core/g;->b(IJ)I
 
-    :goto_1
+    move-result v0
+
+    add-int/2addr v0, v2
+
+    :goto_0
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
@@ -836,17 +840,16 @@
 
     int-to-long v3, p1
 
-    :goto_0
     invoke-virtual {p0, v2, v3, v4}, Lcom/crashlytics/android/core/g;->a(IJ)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 v3, 0x0
 
-    goto :goto_0
+    invoke-virtual {p0, v2, v3, v4}, Lcom/crashlytics/android/core/g;->a(IJ)V
 
-    :goto_1
+    :goto_0
     new-instance p1, Ljava/lang/StringBuilder;
 
     invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
@@ -923,12 +926,12 @@
 
     if-eqz p3, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const/4 v0, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, p1, v0}, Lcom/crashlytics/android/core/g;->b(II)V
 
     return-void
@@ -1043,9 +1046,9 @@
 
     invoke-static {v11}, Lcom/crashlytics/android/core/g;->o(I)I
 
-    move-result v16
+    move-result v17
 
-    add-int v13, v13, v16
+    add-int v13, v13, v17
 
     const/16 v11, 0xb
 
@@ -1141,17 +1144,17 @@
 
     if-nez v9, :cond_3
 
-    const/16 v17, 0x0
+    const/16 v19, 0x0
 
     goto :goto_3
 
     :cond_3
     invoke-static {v15, v9}, Lcom/crashlytics/android/core/g;->b(ILcom/crashlytics/android/core/d;)I
 
-    move-result v17
+    move-result v19
 
     :goto_3
-    add-int v13, v13, v17
+    add-int v13, v13, v19
 
     invoke-virtual {v0, v13}, Lcom/crashlytics/android/core/g;->r(I)V
 
@@ -1269,7 +1272,7 @@
 .end method
 
 .method public static a(Lcom/crashlytics/android/core/g;JLjava/lang/String;Lcom/crashlytics/android/core/aw;Ljava/lang/Thread;[Ljava/lang/StackTraceElement;[Ljava/lang/Thread;Ljava/util/List;Ljava/util/Map;Lcom/crashlytics/android/core/ac;Landroid/app/ActivityManager$RunningAppProcessInfo;ILjava/lang/String;Ljava/lang/String;Ljava/lang/Float;IZJJ)V
-    .locals 20
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1326,12 +1329,11 @@
 
     const/4 v3, 0x0
 
-    :goto_0
     move-object v11, v3
 
     move-object/from16 v3, p10
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v4, "-"
@@ -1346,9 +1348,11 @@
 
     move-result-object v3
 
-    goto :goto_0
+    move-object v11, v3
 
-    :goto_1
+    move-object/from16 v3, p10
+
+    :goto_0
     iget-object v4, v3, Lcom/crashlytics/android/core/ac;->rR:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v4}, Lcom/crashlytics/android/core/aa;->cM()Lcom/crashlytics/android/core/d;
@@ -1357,7 +1361,7 @@
 
     if-nez v10, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -1420,11 +1424,11 @@
 
     move-object v10, v11
 
-    move-object/from16 v18, v11
+    move-object/from16 p13, v11
 
     move-object/from16 v11, p9
 
-    move-object/from16 v19, v12
+    move-object/from16 p14, v12
 
     move-object/from16 v12, p11
 
@@ -1506,14 +1510,16 @@
 
     add-int v16, v16, v5
 
-    goto :goto_2
+    move/from16 v4, v16
+
+    goto :goto_1
 
     :cond_2
     const/4 v3, 0x1
 
-    :goto_2
     move/from16 v4, v16
 
+    :goto_1
     invoke-virtual {v0, v4}, Lcom/crashlytics/android/core/g;->r(I)V
 
     invoke-virtual {v0, v3, v1, v2}, Lcom/crashlytics/android/core/g;->a(IJ)V
@@ -1540,9 +1546,9 @@
 
     move-object/from16 v5, p8
 
-    move-object/from16 v7, v19
+    move-object/from16 v7, p14
 
-    move-object/from16 v8, v18
+    move-object/from16 v8, p13
 
     move-object/from16 v9, p9
 
@@ -1580,7 +1586,7 @@
 
     const/4 v3, 0x0
 
-    :goto_3
+    :goto_2
     if-ge v3, v2, :cond_3
 
     aget-object v4, v14, v3
@@ -1599,7 +1605,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const/4 v7, 0x0
@@ -1634,9 +1640,9 @@
 
     invoke-virtual {v0, v1, v13}, Lcom/crashlytics/android/core/g;->f(II)V
 
-    move-object/from16 v6, v18
+    move-object/from16 v6, p13
 
-    move-object/from16 v5, v19
+    move-object/from16 v5, p14
 
     invoke-static {v5, v6}, Lcom/crashlytics/android/core/as;->a(Lcom/crashlytics/android/core/d;Lcom/crashlytics/android/core/d;)I
 
@@ -1655,13 +1661,13 @@
     invoke-virtual {v0, v1, v6}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
     :cond_4
-    if-eqz p9, :cond_6
+    if-eqz p9, :cond_7
 
     invoke-interface/range {p9 .. p9}, Ljava/util/Map;->isEmpty()Z
 
-    move-result v3
+    move-result v2
 
-    if-nez v3, :cond_6
+    if-nez v2, :cond_7
 
     invoke-interface/range {p9 .. p9}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1671,7 +1677,7 @@
 
     move-result-object v2
 
-    :goto_4
+    :goto_3
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
@@ -1735,34 +1741,47 @@
 
     invoke-virtual {v0, v13, v3}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     move-object/from16 v2, p11
 
     const/4 v3, 0x0
 
-    if-eqz v2, :cond_8
+    goto :goto_4
+
+    :cond_7
+    move-object/from16 v2, p11
+
+    const/4 v3, 0x0
+
+    :goto_4
+    if-eqz v2, :cond_9
 
     iget v2, v2, Landroid/app/ActivityManager$RunningAppProcessInfo;->importance:I
 
     const/16 v4, 0x64
 
-    if-eq v2, v4, :cond_7
+    if-eq v2, v4, :cond_8
 
     const/4 v2, 0x1
 
     goto :goto_5
 
-    :cond_7
+    :cond_8
     const/4 v2, 0x0
 
     :goto_5
     invoke-virtual {v0, v12, v2}, Lcom/crashlytics/android/core/g;->a(IZ)V
 
-    :cond_8
     move/from16 v2, p12
 
+    goto :goto_6
+
+    :cond_9
+    move/from16 v2, p12
+
+    :goto_6
     invoke-virtual {v0, v1, v2}, Lcom/crashlytics/android/core/g;->b(II)V
 
     const/4 v4, 0x5
@@ -1787,7 +1806,7 @@
 
     invoke-virtual {v0, v5}, Lcom/crashlytics/android/core/g;->r(I)V
 
-    if-eqz p15, :cond_9
+    if-eqz p15, :cond_a
 
     invoke-virtual/range {p15 .. p15}, Ljava/lang/Float;->floatValue()F
 
@@ -1831,7 +1850,7 @@
 
     invoke-virtual {v0, v4}, Lcom/crashlytics/android/core/g;->a(B)V
 
-    :cond_9
+    :cond_a
     invoke-virtual {v0, v13, v3}, Lcom/crashlytics/android/core/g;->f(II)V
 
     invoke-static/range {p16 .. p16}, Lcom/crashlytics/android/core/g;->t(I)I
@@ -1858,7 +1877,7 @@
 
     invoke-virtual {v0, v3, v1, v2}, Lcom/crashlytics/android/core/g;->a(IJ)V
 
-    if-eqz v15, :cond_a
+    if-eqz v15, :cond_b
 
     invoke-virtual {v0, v3, v13}, Lcom/crashlytics/android/core/g;->f(II)V
 
@@ -1872,7 +1891,7 @@
 
     invoke-virtual {v0, v1, v15}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
-    :cond_a
+    :cond_b
     return-void
 .end method
 
diff --git a/com.discord/smali/com/crashlytics/android/core/at.smali b/com.discord/smali/com/crashlytics/android/core/at.smali
index ce9be942ce..416f4bff39 100644
--- a/com.discord/smali/com/crashlytics/android/core/at.smali
+++ b/com.discord/smali/com/crashlytics/android/core/at.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/at;
 .super Ljava/lang/Object;
+.source "SessionReport.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/aq;
@@ -176,7 +177,7 @@
 .method public final remove()V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/au.smali b/com.discord/smali/com/crashlytics/android/core/au.smali
index bd77a466f3..ecc97175cf 100644
--- a/com.discord/smali/com/crashlytics/android/core/au.smali
+++ b/com.discord/smali/com/crashlytics/android/core/au.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/au;
 .super Ljava/lang/Object;
+.source "Sha1FileIdStrategy.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/c$a;
diff --git a/com.discord/smali/com/crashlytics/android/core/av.smali b/com.discord/smali/com/crashlytics/android/core/av.smali
index 023e323200..dae040ab45 100644
--- a/com.discord/smali/com/crashlytics/android/core/av.smali
+++ b/com.discord/smali/com/crashlytics/android/core/av.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/av;
 .super Ljava/lang/Object;
+.source "StackTraceTrimmingStrategy.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/core/aw.smali b/com.discord/smali/com/crashlytics/android/core/aw.smali
index 395e688454..671a873c12 100644
--- a/com.discord/smali/com/crashlytics/android/core/aw.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aw.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/aw;
 .super Ljava/lang/Object;
+.source "TrimmedThrowableData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/core/ax.smali b/com.discord/smali/com/crashlytics/android/core/ax.smali
index 3da2de9c3b..55e7847b94 100644
--- a/com.discord/smali/com/crashlytics/android/core/ax.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ax.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/ax;
 .super Ljava/lang/Object;
+.source "UnityVersionProvider.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/core/ay.smali b/com.discord/smali/com/crashlytics/android/core/ay.smali
index ea365d5938..7c81625afe 100644
--- a/com.discord/smali/com/crashlytics/android/core/ay.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ay.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/ay;
 .super Ljava/lang/Object;
+.source "UserMetaData.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/crashlytics/android/core/az$1.smali b/com.discord/smali/com/crashlytics/android/core/az$1.smali
index c976a3fe70..106dd41d8e 100644
--- a/com.discord/smali/com/crashlytics/android/core/az$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/az$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/az$1;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
diff --git a/com.discord/smali/com/crashlytics/android/core/az.smali b/com.discord/smali/com/crashlytics/android/core/az.smali
index 5e0f19c216..5cc7475a41 100644
--- a/com.discord/smali/com/crashlytics/android/core/az.smali
+++ b/com.discord/smali/com/crashlytics/android/core/az.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/az;
 .super Ljava/lang/Object;
+.source "Utils.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/crashlytics/android/core/b.smali b/com.discord/smali/com/crashlytics/android/core/b.smali
index c11cd93adf..624d03dd65 100644
--- a/com.discord/smali/com/crashlytics/android/core/b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/b.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/b;
 .super Ljava/lang/Object;
+.source "AppMeasurementEventListenerRegistrar.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/core/ba.smali b/com.discord/smali/com/crashlytics/android/core/ba.smali
index 34a005f40c..f9854b13c0 100644
--- a/com.discord/smali/com/crashlytics/android/core/ba.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ba.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/ba;
 .super Ljava/lang/Object;
+.source "WireFormat.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/crashlytics/android/core/c$a.smali b/com.discord/smali/com/crashlytics/android/core/c$a.smali
index 8fccf300e7..c6d030562d 100644
--- a/com.discord/smali/com/crashlytics/android/core/c$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/c$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/c$a;
 .super Ljava/lang/Object;
+.source "BinaryImagesConverter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/c.smali b/com.discord/smali/com/crashlytics/android/core/c.smali
index a0a329599b..ce9284940e 100644
--- a/com.discord/smali/com/crashlytics/android/core/c.smali
+++ b/com.discord/smali/com/crashlytics/android/core/c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/c;
 .super Ljava/lang/Object;
+.source "BinaryImagesConverter.java"
 
 
 # annotations
@@ -135,7 +136,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -150,7 +151,7 @@
     :catch_1
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -172,6 +173,8 @@
 
     invoke-interface {v2, v3, p1, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
+    return-object v0
+
     :cond_3
     :goto_1
     return-object v0
@@ -239,7 +242,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -281,7 +284,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -397,7 +400,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 c827aa7dd6..39c0f50971 100644
--- a/com.discord/smali/com/crashlytics/android/core/d.smali
+++ b/com.discord/smali/com/crashlytics/android/core/d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/d;
 .super Ljava/lang/Object;
+.source "ByteString.java"
 
 
 # static fields
@@ -124,27 +125,23 @@
 
     iget-object v1, p0, Lcom/crashlytics/android/core/d;->pF:[B
 
-    array-length v1, v1
+    array-length v3, v1
 
-    iget-object v3, p1, Lcom/crashlytics/android/core/d;->pF:[B
+    iget-object p1, p1, Lcom/crashlytics/android/core/d;->pF:[B
 
-    array-length v3, v3
+    array-length v4, p1
 
-    if-eq v1, v3, :cond_2
+    if-eq v3, v4, :cond_2
 
     return v2
 
     :cond_2
-    iget-object v3, p0, Lcom/crashlytics/android/core/d;->pF:[B
-
-    iget-object p1, p1, Lcom/crashlytics/android/core/d;->pF:[B
-
     const/4 v4, 0x0
 
     :goto_0
-    if-ge v4, v1, :cond_4
+    if-ge v4, v3, :cond_4
 
-    aget-byte v5, v3, v4
+    aget-byte v5, v1, v4
 
     aget-byte v6, p1, v4
 
@@ -170,9 +167,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/core/d;->pF:[B
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/d;->pF:[B
-
-    array-length v1, v1
+    array-length v1, v0
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/e.smali b/com.discord/smali/com/crashlytics/android/core/e.smali
index 2b07534aea..65264a02fd 100644
--- a/com.discord/smali/com/crashlytics/android/core/e.smali
+++ b/com.discord/smali/com/crashlytics/android/core/e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/e;
 .super Ljava/lang/Object;
+.source "CLSUUID.java"
 
 
 # static fields
@@ -156,7 +157,7 @@
 
     aput-byte v1, v0, v2
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/p;->Ec()Ljava/lang/String;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/p;->Eb()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/f$1.smali b/com.discord/smali/com/crashlytics/android/core/f$1.smali
index 572ce74757..680e10af0f 100644
--- a/com.discord/smali/com/crashlytics/android/core/f$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/f$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/f$1;
 .super Ljava/lang/Object;
+.source "ClsFileOutputStream.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
diff --git a/com.discord/smali/com/crashlytics/android/core/f.smali b/com.discord/smali/com/crashlytics/android/core/f.smali
index a5221078e5..0cb352caf9 100644
--- a/com.discord/smali/com/crashlytics/android/core/f.smali
+++ b/com.discord/smali/com/crashlytics/android/core/f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/f;
 .super Ljava/io/FileOutputStream;
+.source "ClsFileOutputStream.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/crashlytics/android/core/g$a.smali b/com.discord/smali/com/crashlytics/android/core/g$a.smali
index 2ab0528278..7657508253 100644
--- a/com.discord/smali/com/crashlytics/android/core/g$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/g$a;
 .super Ljava/io/IOException;
+.source "CodedOutputStream.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/g.smali b/com.discord/smali/com/crashlytics/android/core/g.smali
index bbbf0a1395..12363da940 100644
--- a/com.discord/smali/com/crashlytics/android/core/g.smali
+++ b/com.discord/smali/com/crashlytics/android/core/g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/g;
 .super Ljava/lang/Object;
+.source "CodedOutputStream.java"
 
 # interfaces
 .implements Ljava/io/Flushable;
@@ -502,17 +503,15 @@
 
     iget v1, p0, Lcom/crashlytics/android/core/g;->position:I
 
-    sub-int/2addr v0, v1
+    sub-int v2, v0, v1
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    if-lt v0, p1, :cond_0
+    if-lt v2, p1, :cond_0
 
     iget-object v0, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
-    iget v2, p0, Lcom/crashlytics/android/core/g;->position:I
-
-    invoke-virtual {p2, v0, v1, v2, p1}, Lcom/crashlytics/android/core/d;->a([BIII)V
+    invoke-virtual {p2, v0, v3, v1, p1}, Lcom/crashlytics/android/core/d;->a([BIII)V
 
     iget p2, p0, Lcom/crashlytics/android/core/g;->position:I
 
@@ -523,19 +522,13 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/crashlytics/android/core/g;->limit:I
-
-    iget v2, p0, Lcom/crashlytics/android/core/g;->position:I
-
-    sub-int/2addr v0, v2
+    sub-int/2addr v0, v1
 
     iget-object v2, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
-    iget v3, p0, Lcom/crashlytics/android/core/g;->position:I
+    invoke-virtual {p2, v2, v3, v1, v0}, Lcom/crashlytics/android/core/d;->a([BIII)V
 
-    invoke-virtual {p2, v2, v1, v3, v0}, Lcom/crashlytics/android/core/d;->a([BIII)V
-
-    add-int/lit8 v2, v0, 0x0
+    add-int/lit8 v1, v0, 0x0
 
     sub-int/2addr p1, v0
 
@@ -551,7 +544,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
-    invoke-virtual {p2, v0, v2, v1, p1}, Lcom/crashlytics/android/core/d;->a([BIII)V
+    invoke-virtual {p2, v0, v1, v3, p1}, Lcom/crashlytics/android/core/d;->a([BIII)V
 
     iput p1, p0, Lcom/crashlytics/android/core/g;->position:I
 
@@ -564,13 +557,13 @@
 
     invoke-direct {v0, p2}, Ljava/io/ByteArrayInputStream;-><init>([B)V
 
-    int-to-long v2, v2
+    int-to-long v1, v1
 
-    invoke-virtual {v0, v2, v3}, Ljava/io/InputStream;->skip(J)J
+    invoke-virtual {v0, v1, v2}, Ljava/io/InputStream;->skip(J)J
 
     move-result-wide v4
 
-    cmp-long p2, v2, v4
+    cmp-long p2, v1, v4
 
     if-nez p2, :cond_4
 
@@ -583,21 +576,21 @@
 
     move-result p2
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/g;->buffer:[B
+    iget-object v1, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
-    invoke-virtual {v0, v2, v1, p2}, Ljava/io/InputStream;->read([BII)I
+    invoke-virtual {v0, v1, v3, p2}, Ljava/io/InputStream;->read([BII)I
 
-    move-result v2
+    move-result v1
 
-    if-ne v2, p2, :cond_2
+    if-ne v1, p2, :cond_2
 
     iget-object p2, p0, Lcom/crashlytics/android/core/g;->pO:Ljava/io/OutputStream;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/g;->buffer:[B
+    iget-object v2, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
-    invoke-virtual {p2, v3, v1, v2}, Ljava/io/OutputStream;->write([BII)V
+    invoke-virtual {p2, v2, v3, v1}, Ljava/io/OutputStream;->write([BII)V
 
-    sub-int/2addr p1, v2
+    sub-int/2addr p1, v1
 
     goto :goto_0
 
@@ -621,6 +614,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(IZ)V
@@ -697,8 +692,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/g;->pO:Ljava/io/OutputStream;
-
     iget-object v1, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
     iget v2, p0, Lcom/crashlytics/android/core/g;->position:I
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 01614adeee..2101995a30 100644
--- a/com.discord/smali/com/crashlytics/android/core/h$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/h$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/crashlytics/android/core/h$1;
 .super Ljava/lang/Object;
+.source "CompositeCreateReportSpiCall.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/h.smali b/com.discord/smali/com/crashlytics/android/core/h.smali
index 5f781960a5..750047bcea 100644
--- a/com.discord/smali/com/crashlytics/android/core/h.smali
+++ b/com.discord/smali/com/crashlytics/android/core/h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/h;
 .super Ljava/lang/Object;
+.source "CompositeCreateReportSpiCall.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/v;
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 a85c6fc7a3..62f58cf5cc 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/i$1;
 .super Ljava/lang/Object;
+.source "CrashPromptDialog.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface$OnClickListener;
@@ -40,7 +41,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->o(Z)V
+    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->n(Z)V
 
     invoke-interface {p1}, Landroid/content/DialogInterface;->dismiss()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i$2.smali b/com.discord/smali/com/crashlytics/android/core/i$2.smali
index f1328a26d9..b10a77293d 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/i$2;
 .super Ljava/lang/Object;
+.source "CrashPromptDialog.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface$OnClickListener;
@@ -40,7 +41,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->o(Z)V
+    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->n(Z)V
 
     invoke-interface {p1}, Landroid/content/DialogInterface;->dismiss()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i$3.smali b/com.discord/smali/com/crashlytics/android/core/i$3.smali
index 05199496b4..250e7250a7 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$3.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/i$3;
 .super Ljava/lang/Object;
+.source "CrashPromptDialog.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface$OnClickListener;
@@ -48,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->o(Z)V
+    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->n(Z)V
 
     invoke-interface {p1}, Landroid/content/DialogInterface;->dismiss()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i$a.smali b/com.discord/smali/com/crashlytics/android/core/i$a.smali
index d716d35dd8..26d39ef649 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/i$a;
 .super Ljava/lang/Object;
+.source "CrashPromptDialog.java"
 
 
 # annotations
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 78d579df57..9bd6ec6e3b 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/i$b;
 .super Ljava/lang/Object;
+.source "CrashPromptDialog.java"
 
 
 # annotations
@@ -50,7 +51,7 @@
 
 
 # virtual methods
-.method final o(Z)V
+.method final n(Z)V
     .locals 0
 
     iput-boolean p1, p0, Lcom/crashlytics/android/core/i$b;->pW:Z
diff --git a/com.discord/smali/com/crashlytics/android/core/i.smali b/com.discord/smali/com/crashlytics/android/core/i.smali
index e9ebf2a87f..8b3b2d9bb3 100644
--- a/com.discord/smali/com/crashlytics/android/core/i.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/i;
 .super Ljava/lang/Object;
+.source "CrashPromptDialog.java"
 
 
 # annotations
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 b7ffcf1bf3..cc3e658c16 100644
--- a/com.discord/smali/com/crashlytics/android/core/j$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/j$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/j$1;
 .super Ljava/lang/Object;
+.source "CrashlyticsBackgroundWorker.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -52,7 +53,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 568217c7b9..4fe380e70e 100644
--- a/com.discord/smali/com/crashlytics/android/core/j$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/j$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/j$2;
 .super Ljava/lang/Object;
+.source "CrashlyticsBackgroundWorker.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -73,7 +74,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 e5de91e6f8..6dede02574 100644
--- a/com.discord/smali/com/crashlytics/android/core/j.smali
+++ b/com.discord/smali/com/crashlytics/android/core/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/j;
 .super Ljava/lang/Object;
+.source "CrashlyticsBackgroundWorker.java"
 
 
 # instance fields
@@ -79,7 +80,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -92,7 +93,7 @@
     return-object v0
 
     :catch_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -133,7 +134,7 @@
     return-object p1
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -178,7 +179,7 @@
     return-object p1
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$1.smali b/com.discord/smali/com/crashlytics/android/core/k$1.smali
index f963cdc315..375b3b5b4c 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$1;
 .super Lcom/crashlytics/android/core/k$d;
+.source "CrashlyticsController.java"
 
 
 # annotations
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 69fe28a532..8b9e73ecce 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
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$10$1;
 .super Ljava/util/HashMap;
+.source "CrashlyticsController.java"
 
 
 # annotations
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 796cbd5239..688491478b 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$10.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$10;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$e;
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 c0efc4b9c0..e9ae582af0 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$11.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$11.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$11;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$b;
diff --git a/com.discord/smali/com/crashlytics/android/core/k$12.smali b/com.discord/smali/com/crashlytics/android/core/k$12.smali
index 6f9e5fa596..cff89f713c 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$12.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$12.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$12;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
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 3e31897bf7..2330dcc300 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
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$13$1;
 .super Ljava/util/HashMap;
+.source "CrashlyticsController.java"
 
 
 # annotations
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 eb1293083e..68409b2209 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$13.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$13.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$13;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$e;
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 86f6b83279..7b6ec46449 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$14.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$14.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$14;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$b;
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 11b888ce99..6c5563606e 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
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$15$1;
 .super Ljava/util/HashMap;
+.source "CrashlyticsController.java"
 
 
 # annotations
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 5186eb906d..701091cd24 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$15.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$15.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$15;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$e;
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 611e186796..9796ad083e 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$16.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$16.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$16;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$b;
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 228d8f11e0..155c305cd4 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
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$17$1;
 .super Ljava/util/HashMap;
+.source "CrashlyticsController.java"
 
 
 # annotations
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 35e1621dbb..ec55dd94da 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$17.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$17.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$17;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$e;
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 c335b077db..a5f3329737 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$18.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$18.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$18;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$b;
diff --git a/com.discord/smali/com/crashlytics/android/core/k$19.smali b/com.discord/smali/com/crashlytics/android/core/k$19.smali
index 11bb6c3f52..e085f259bc 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$19.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$19.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$19;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/io/FileFilter;
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 1d04f3a3d0..9a9f11084f 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$2;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -141,7 +142,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$20.smali b/com.discord/smali/com/crashlytics/android/core/k$20.smali
index 66208f7de8..692ba1cae1 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$20.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$20.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$20;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/crashlytics/android/core/k$21.smali b/com.discord/smali/com/crashlytics/android/core/k$21.smali
index 85676a11c5..b902fc81a3 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$21.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$21.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$21;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
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 d92e276686..fe3dd4a6f3 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$22.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$22.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$22;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/t$a;
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 6284a8dc70..97d2bbff4b 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$23.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$23.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$23;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
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 c905d4b152..405fd93a4e 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$24.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$24.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$24;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
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 2cdc7088cc..904ae7f9d3 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$25.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$25.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/k$25;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 28079cfc85..76a7c84503 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$3.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$3.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/k$3;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -125,7 +126,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
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 6d3d36fd2c..f7715a277b 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$4.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$4;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
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 bc89dad621..de07957838 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$5.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$5;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -62,7 +63,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -77,7 +78,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -93,7 +94,7 @@
 
     invoke-static {v0, v1}, 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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 2b0d0c9a14..e9a68980c3 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$6.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$6;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -38,13 +39,11 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/core/k$6;->qB:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$6;->qB:Lcom/crashlytics/android/core/k;
+    new-instance v1, Lcom/crashlytics/android/core/k$f;
 
-    new-instance v2, Lcom/crashlytics/android/core/k$f;
+    invoke-direct {v1}, Lcom/crashlytics/android/core/k$f;-><init>()V
 
-    invoke-direct {v2}, Lcom/crashlytics/android/core/k$f;-><init>()V
-
-    invoke-static {v1, v2}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;Ljava/io/FilenameFilter;)[Ljava/io/File;
+    invoke-static {v0, v1}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;Ljava/io/FilenameFilter;)[Ljava/io/File;
 
     move-result-object v1
 
@@ -63,7 +62,7 @@
 
     aget-object v6, v1, v5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v7
 
@@ -126,7 +125,7 @@
 
     aget-object v5, v2, v4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -158,7 +157,7 @@
 
     if-nez v6, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
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 5202094317..328e4e0f04 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$7.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$7;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
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 2942db59f0..25055beef7 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$8.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$8;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -82,9 +83,7 @@
 
     iget-object v3, p0, Lcom/crashlytics/android/core/k$8;->qB:Lcom/crashlytics/android/core/k;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k$8;->qB:Lcom/crashlytics/android/core/k;
-
-    invoke-static {v4}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/l;
+    invoke-static {v3}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/l;
 
     move-result-object v4
 
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 ba04a70b81..e045547667 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$9.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$9;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/k$b;
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 f3277bc547..d706bf4d29 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$a;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
diff --git a/com.discord/smali/com/crashlytics/android/core/k$b.smali b/com.discord/smali/com/crashlytics/android/core/k$b.smali
index 7951faf21b..079ae8f4bc 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$b.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/k$b;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 
 # annotations
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 c4a51e9a7d..6cab48c4fd 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$c.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$c;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/t$b;
@@ -38,11 +39,11 @@
 .method public final cs()Lio/fabric/sdk/android/a/g/t;
     .locals 1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ET()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ES()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 8522c39510..fecdfd3649 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$d.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$d.smali
@@ -1,5 +1,6 @@
 .class Lcom/crashlytics/android/core/k$d;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
diff --git a/com.discord/smali/com/crashlytics/android/core/k$e.smali b/com.discord/smali/com/crashlytics/android/core/k$e.smali
index 0d73b8f645..38ee2eec46 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$e.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$e.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/k$e;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 
 # annotations
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 730731cad9..5da1b50d37 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$f.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$f;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
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 12636d6a59..2fdda53680 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$g.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$g;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/ac$a;
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 57a68ad478..45d5880bc8 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
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$h$1;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/i$a;
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 6df630684a..f1a8fd1e2b 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
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$h$2;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 f94f6ba1eb..4e4406fe37 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$h.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$h;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/ar$d;
@@ -263,7 +264,7 @@
 
     invoke-virtual {v0, v2}, Landroid/app/Activity;->runOnUiThread(Ljava/lang/Runnable;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object 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 ae1db00d39..f2e3634ede 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$i.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$i;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/ar$c;
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 1ff2f17809..c11b842f36 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$j.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$j.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$j;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/ar$b;
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 5133a33ea5..ff2d1b5432 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$k.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$k.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$k;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -55,7 +56,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$l.smali b/com.discord/smali/com/crashlytics/android/core/k$l.smali
index 6cb8bed211..cebde30419 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$l.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$l.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/k$l;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 # interfaces
 .implements Ljava/io/FilenameFilter;
diff --git a/com.discord/smali/com/crashlytics/android/core/k.smali b/com.discord/smali/com/crashlytics/android/core/k.smali
index 8d2c80f665..5d96f58bb0 100644
--- a/com.discord/smali/com/crashlytics/android/core/k.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/k;
 .super Ljava/lang/Object;
+.source "CrashlyticsController.java"
 
 
 # annotations
@@ -337,7 +338,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -366,7 +367,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -484,7 +485,7 @@
 
     if-nez v6, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -515,7 +516,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -610,7 +611,7 @@
 
     iget v13, v4, Landroid/content/res/Configuration;->orientation:I
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->DZ()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->DY()J
 
     move-result-wide v6
 
@@ -738,18 +739,17 @@
 
     move-result v1
 
-    if-nez v1, :cond_3
+    if-nez v1, :cond_2
 
     new-instance v1, Ljava/util/TreeMap;
 
     invoke-direct {v1}, Ljava/util/TreeMap;-><init>()V
 
-    :cond_2
     move-object v10, v1
 
     goto :goto_2
 
-    :cond_3
+    :cond_2
     iget-object v1, v0, Lcom/crashlytics/android/core/k;->qj:Lcom/crashlytics/android/core/l;
 
     iget-object v1, v1, Lcom/crashlytics/android/core/l;->rk:Ljava/util/concurrent/ConcurrentHashMap;
@@ -758,13 +758,13 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
     move-result v4
 
-    if-le v4, v6, :cond_2
+    if-le v4, v6, :cond_3
 
     new-instance v4, Ljava/util/TreeMap;
 
@@ -772,6 +772,11 @@
 
     move-object v10, v4
 
+    goto :goto_2
+
+    :cond_3
+    move-object v10, v1
+
     :goto_2
     iget-object v11, v0, Lcom/crashlytics/android/core/k;->qo:Lcom/crashlytics/android/core/ac;
 
@@ -805,7 +810,7 @@
     aget-object v3, p1, v2
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -844,7 +849,7 @@
     :catch_0
     move-exception v3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -872,7 +877,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -889,7 +894,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -928,7 +933,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1150,7 +1155,7 @@
 
     if-nez p0, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1247,7 +1252,7 @@
 
     :cond_7
     :goto_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1295,7 +1300,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1305,8 +1310,8 @@
 
     invoke-interface {p0, p1, p2, v0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     const-string p0, "Failed to flush to session begin file."
 
@@ -1352,25 +1357,21 @@
 
     invoke-direct {v2, v3, v1}, Lcom/crashlytics/android/core/f;-><init>(Ljava/io/File;Ljava/lang/String;)V
     :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_2
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
     invoke-static {v2}, Lcom/crashlytics/android/core/g;->a(Ljava/io/OutputStream;)Lcom/crashlytics/android/core/g;
 
-    move-result-object v1
-    :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+    move-result-object v0
 
-    :try_start_3
     const-string v9, "crash"
 
     const/4 v10, 0x1
 
     move-object v4, p0
 
-    move-object v5, v1
+    move-object v5, v0
 
     move-object v6, p1
 
@@ -1379,65 +1380,11 @@
     move-object v8, p3
 
     invoke-direct/range {v4 .. v10}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/util/Date;Ljava/lang/Thread;Ljava/lang/Throwable;Ljava/lang/String;Z)V
-    :try_end_3
-    .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_0
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    const-string p0, "Failed to flush to session begin file."
-
-    invoke-static {v1, p0}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
-
-    const-string p0, "Failed to close fatal exception file output stream."
-
-    invoke-static {v2, p0}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_0
-    move-exception p0
-
-    move-object v0, v1
-
-    goto :goto_1
-
-    :catch_0
-    move-exception p0
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :catch_1
-    move-exception p0
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p0
-
-    move-object v2, v0
-
-    goto :goto_1
-
-    :catch_2
-    move-exception p0
-
-    move-object v2, v0
+    :try_end_2
+    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :goto_0
-    :try_start_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
-
-    move-result-object p1
-
-    const-string p2, "CrashlyticsCore"
-
-    const-string p3, "An error occurred in the fatal exception logger"
-
-    invoke-interface {p1, p2, p3, p0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
     const-string p0, "Failed to flush to session begin file."
 
     invoke-static {v0, p0}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
@@ -1448,10 +1395,43 @@
 
     return-void
 
-    :catchall_2
+    :catch_0
     move-exception p0
 
+    goto :goto_1
+
+    :catchall_0
+    move-exception p0
+
+    move-object v2, v0
+
+    goto :goto_2
+
+    :catch_1
+    move-exception p0
+
+    move-object v2, v0
+
     :goto_1
+    :try_start_3
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
+
+    move-result-object p1
+
+    const-string p2, "CrashlyticsCore"
+
+    const-string p3, "An error occurred in the fatal exception logger"
+
+    invoke-interface {p1, p2, p3, p0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    goto :goto_0
+
+    :catchall_1
+    move-exception p0
+
+    :goto_2
     const-string p1, "Failed to flush to session begin file."
 
     invoke-static {v0, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
@@ -1461,6 +1441,8 @@
     invoke-static {v2, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method static synthetic a(Lcom/crashlytics/android/core/k;Ljava/util/Set;)V
@@ -1536,22 +1518,18 @@
 
     invoke-direct {v4, v2, p2}, Lcom/crashlytics/android/core/f;-><init>(Ljava/io/File;Ljava/lang/String;)V
     :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
     invoke-static {v4}, Lcom/crashlytics/android/core/g;->a(Ljava/io/OutputStream;)Lcom/crashlytics/android/core/g;
 
-    move-result-object v2
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
-
-    :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
-
     move-result-object v3
 
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
+
+    move-result-object v2
+
     const-string v5, "CrashlyticsCore"
 
     const-string v6, "Collecting SessionStart data for session ID "
@@ -1564,17 +1542,17 @@
 
     move-result-object v6
 
-    invoke-interface {v3, v5, v6}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-interface {v2, v5, v6}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {v2, p1}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/io/File;)V
+    invoke-static {v3, p1}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/io/File;)V
 
     const/4 p1, 0x4
 
-    new-instance v3, Ljava/util/Date;
+    new-instance v2, Ljava/util/Date;
 
-    invoke-direct {v3}, Ljava/util/Date;-><init>()V
+    invoke-direct {v2}, Ljava/util/Date;-><init>()V
 
-    invoke-virtual {v3}, Ljava/util/Date;->getTime()J
+    invoke-virtual {v2}, Ljava/util/Date;->getTime()J
 
     move-result-wide v5
 
@@ -1582,37 +1560,37 @@
 
     div-long/2addr v5, v7
 
-    invoke-virtual {v2, p1, v5, v6}, Lcom/crashlytics/android/core/g;->a(IJ)V
+    invoke-virtual {v3, p1, v5, v6}, Lcom/crashlytics/android/core/g;->a(IJ)V
 
     const/4 p1, 0x5
 
-    invoke-virtual {v2, p1, v1}, Lcom/crashlytics/android/core/g;->a(IZ)V
+    invoke-virtual {v3, p1, v1}, Lcom/crashlytics/android/core/g;->a(IZ)V
 
     const/16 p1, 0xb
 
-    invoke-virtual {v2, p1, v0}, Lcom/crashlytics/android/core/g;->b(II)V
+    invoke-virtual {v3, p1, v0}, Lcom/crashlytics/android/core/g;->b(II)V
 
     const/16 p1, 0xc
 
     const/4 v0, 0x3
 
-    invoke-virtual {v2, p1, v0}, Lcom/crashlytics/android/core/g;->c(II)V
+    invoke-virtual {v3, p1, v0}, Lcom/crashlytics/android/core/g;->c(II)V
 
-    invoke-direct {p0, v2, p2}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/lang/String;)V
+    invoke-direct {p0, v3, p2}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/lang/String;)V
 
-    invoke-static {v2, p3, p2}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;[Ljava/io/File;Ljava/lang/String;)V
+    invoke-static {v3, p3, p2}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;[Ljava/io/File;Ljava/lang/String;)V
 
     if-eqz v1, :cond_3
 
-    invoke-static {v2, p4}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/io/File;)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
+    invoke-static {v3, p4}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/io/File;)V
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :cond_3
     const-string p1, "Error flushing session file stream"
 
-    invoke-static {v2, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
 
     const-string p1, "Failed to close CLS file"
 
@@ -1620,40 +1598,26 @@
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_3
-
     :catch_0
     move-exception p1
 
-    move-object v3, v2
-
     goto :goto_2
 
-    :catch_1
+    :catchall_0
     move-exception p1
 
-    goto :goto_2
-
-    :catchall_1
-    move-exception p1
-
-    move-object v2, v3
-
-    move-object v4, v2
+    move-object v4, v3
 
     goto :goto_3
 
-    :catch_2
+    :catch_1
     move-exception p1
 
     move-object v4, v3
 
     :goto_2
-    :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    :try_start_2
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p3
 
@@ -1670,8 +1634,8 @@
     move-result-object p2
 
     invoke-interface {p3, p4, p2, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     const-string p1, "Error flushing session file stream"
 
@@ -1681,15 +1645,13 @@
 
     return-void
 
-    :catchall_2
+    :catchall_1
     move-exception p1
 
-    move-object v2, v3
-
     :goto_3
     const-string p2, "Error flushing session file stream"
 
-    invoke-static {v2, p2}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
+    invoke-static {v3, p2}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
 
     const-string p2, "Failed to close CLS file"
 
@@ -1830,37 +1792,34 @@
 
     invoke-direct {v1, v2, p1}, Lcom/crashlytics/android/core/f;-><init>(Ljava/io/File;Ljava/lang/String;)V
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
     invoke-static {v1}, Lcom/crashlytics/android/core/g;->a(Ljava/io/OutputStream;)Lcom/crashlytics/android/core/g;
 
-    move-result-object p1
+    move-result-object v0
+
+    invoke-interface {p3, v0}, Lcom/crashlytics/android/core/k$b;->a(Lcom/crashlytics/android/core/g;)V
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :try_start_2
-    invoke-interface {p3, p1}, Lcom/crashlytics/android/core/k$b;->a(Lcom/crashlytics/android/core/g;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    new-instance p1, Ljava/lang/StringBuilder;
 
-    new-instance p3, Ljava/lang/StringBuilder;
+    const-string p3, "Failed to flush to session "
 
-    const-string v0, "Failed to flush to session "
+    invoke-direct {p1, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string p3, " file."
 
-    const-string v0, " file."
+    invoke-virtual {p1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    move-result-object p1
 
-    move-result-object p3
-
-    invoke-static {p1, p3}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -1883,60 +1842,53 @@
     return-void
 
     :catchall_0
-    move-exception p3
-
-    move-object v0, p1
+    move-exception p1
 
     goto :goto_0
 
     :catchall_1
-    move-exception p3
-
-    goto :goto_0
-
-    :catchall_2
-    move-exception p3
+    move-exception p1
 
     move-object v1, v0
 
     :goto_0
-    new-instance p1, Ljava/lang/StringBuilder;
+    new-instance p3, Ljava/lang/StringBuilder;
 
     const-string v2, "Failed to flush to session "
 
-    invoke-direct {p1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {p3, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v2, " file."
 
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {p3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object p3
 
-    invoke-static {v0, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
+    invoke-static {v0, p3}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
 
-    new-instance p1, Ljava/lang/StringBuilder;
+    new-instance p3, Ljava/lang/StringBuilder;
 
     const-string v0, "Failed to close session "
 
-    invoke-direct {p1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string p2, " file."
 
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object p2
 
-    invoke-static {v1, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
 
-    throw p3
+    throw p1
 .end method
 
 .method private a(Ljava/lang/String;Ljava/lang/String;Lcom/crashlytics/android/core/k$e;)V
@@ -2099,7 +2051,7 @@
 
     move/from16 v2, p3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -2122,7 +2074,7 @@
 
     move-result-object v5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -2140,7 +2092,7 @@
 
     invoke-interface {v6, v7, v8}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -2198,7 +2150,7 @@
     const/4 v9, 0x0
 
     :goto_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v10
 
@@ -2262,7 +2214,7 @@
     const/4 v11, 0x0
 
     :goto_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v12
 
@@ -2297,7 +2249,7 @@
     goto :goto_3
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -2323,7 +2275,7 @@
 
     if-le v7, v2, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v7
 
@@ -2387,7 +2339,7 @@
     invoke-direct {v0, v4, v5, v10, v6}, 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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -2452,7 +2404,7 @@
 
     if-nez v5, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -2460,7 +2412,6 @@
 
     const-string v6, "Deleting unknown file: "
 
-    :goto_1
     invoke-static {v3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
@@ -2473,7 +2424,7 @@
 
     invoke-virtual {v2}, Ljava/io/File;->delete()Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const/4 v5, 0x1
@@ -2488,7 +2439,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -2496,10 +2447,20 @@
 
     const-string v6, "Trimming session file: "
 
-    goto :goto_1
+    invoke-static {v3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v6, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-interface {v4, v5, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/io/File;->delete()Z
 
     :cond_1
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
@@ -2556,7 +2517,7 @@
 .end method
 
 .method static synthetic b(Lcom/crashlytics/android/core/k;)V
-    .locals 25
+    .locals 24
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/Exception;
@@ -2579,7 +2540,7 @@
 
     move-result-object v12
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -2665,7 +2626,7 @@
 
     iget-object v0, v11, Lcom/crashlytics/android/core/k;->pk:Lio/fabric/sdk/android/a/b/p;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/p;->Ec()Ljava/lang/String;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/p;->Eb()Ljava/lang/String;
 
     move-result-object v10
 
@@ -2749,7 +2710,7 @@
 
     invoke-direct {v1, v2}, Landroid/os/StatFs;-><init>(Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->DY()I
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->DX()I
 
     move-result v13
 
@@ -2761,7 +2722,7 @@
 
     move-result v14
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->DZ()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->DY()J
 
     move-result-wide v15
 
@@ -2817,7 +2778,7 @@
 
     move-object/from16 v9, v20
 
-    move/from16 v24, v14
+    move/from16 v16, v14
 
     move-object v14, v10
 
@@ -2833,7 +2794,7 @@
 
     move-object v0, v15
 
-    move/from16 v3, v24
+    move/from16 v3, v16
 
     move-wide/from16 v4, v22
 
@@ -2853,7 +2814,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -2940,7 +2901,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -2971,7 +2932,7 @@
 
     if-nez v3, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -2990,7 +2951,7 @@
 
     :goto_0
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -3054,25 +3015,21 @@
 
     invoke-direct {v3, v4, v2}, Lcom/crashlytics/android/core/f;-><init>(Ljava/io/File;Ljava/lang/String;)V
     :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
     invoke-static {v3}, Lcom/crashlytics/android/core/g;->a(Ljava/io/OutputStream;)Lcom/crashlytics/android/core/g;
 
-    move-result-object v2
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+    move-result-object v1
 
-    :try_start_2
     const-string v10, "error"
 
     const/4 v11, 0x0
 
     move-object v5, p0
 
-    move-object v6, v2
+    move-object v6, v1
 
     move-object v7, p1
 
@@ -3081,50 +3038,32 @@
     move-object v9, p3
 
     invoke-direct/range {v5 .. v11}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/g;Ljava/util/Date;Ljava/lang/Thread;Ljava/lang/Throwable;Ljava/lang/String;Z)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
-
-    const-string p1, "Failed to flush to non-fatal file."
-
-    invoke-static {v2, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     goto :goto_2
 
-    :catchall_0
-    move-exception p0
-
-    move-object v1, v2
-
-    goto :goto_3
-
     :catch_0
     move-exception p1
 
-    move-object v1, v2
-
     goto :goto_1
 
-    :catch_1
-    move-exception p1
-
-    goto :goto_1
-
-    :catchall_1
+    :catchall_0
     move-exception p0
 
     move-object v3, v1
 
     goto :goto_3
 
-    :catch_2
+    :catch_1
     move-exception p1
 
     move-object v3, v1
 
     :goto_1
-    :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    :try_start_2
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -3133,31 +3072,31 @@
     const-string v2, "An error occurred in the non-fatal exception logger"
 
     invoke-interface {p2, p3, v2, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
+    :goto_2
     const-string p1, "Failed to flush to non-fatal file."
 
     invoke-static {v1, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Flushable;Ljava/lang/String;)V
 
-    :goto_2
     const-string p1, "Failed to close non-fatal file output stream."
 
     invoke-static {v3, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
 
     const/16 p1, 0x40
 
-    :try_start_4
+    :try_start_3
     invoke-direct {p0, v0, p1}, Lcom/crashlytics/android/core/k;->e(Ljava/lang/String;I)V
-    :try_end_4
-    .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_3
+    :try_end_3
+    .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_2
 
     return-void
 
-    :catch_3
+    :catch_2
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -3169,7 +3108,7 @@
 
     return-void
 
-    :catchall_2
+    :catchall_1
     move-exception p0
 
     :goto_3
@@ -3443,7 +3382,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -3480,7 +3419,7 @@
 
     if-eq v1, v2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -3558,7 +3497,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -3717,7 +3656,7 @@
 
     if-gt v1, p2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -3790,7 +3729,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -3844,7 +3783,7 @@
 
     iget-object v1, p1, Lcom/crashlytics/android/core/al;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -3866,7 +3805,7 @@
 
     iget-object v3, p1, Lcom/crashlytics/android/core/al;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v3}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v3}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v3
 
@@ -3878,7 +3817,7 @@
 
     if-nez v3, :cond_1
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v3
 
@@ -3900,7 +3839,7 @@
     :goto_0
     if-eqz v3, :cond_2
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -3946,7 +3885,7 @@
     :cond_3
     iget-object p1, p1, Lcom/crashlytics/android/core/al;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object p1
 
@@ -4118,8 +4057,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->qx:Lcom/crashlytics/android/core/t;
-
     iget-object v0, v0, Lcom/crashlytics/android/core/t;->rC:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
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 5bfba6f90e..f767c2c7cb 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/l$1;
 .super Lio/fabric/sdk/android/a/c/g;
+.source "CrashlyticsCore.java"
 
 
 # annotations
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 cc191f4e87..0684ffb3c9 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/l$2;
 .super Ljava/lang/Object;
+.source "CrashlyticsCore.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -58,7 +59,7 @@
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cG()Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 5ea189337d..969c92f2c8 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$3.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/l$3;
 .super Ljava/lang/Object;
+.source "CrashlyticsCore.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -63,7 +64,7 @@
 
     move-result v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -92,7 +93,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
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 2e2c41d747..7e0e3e80f4 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/l$a;
 .super Ljava/lang/Object;
+.source "CrashlyticsCore.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -67,7 +68,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/l$b.smali b/com.discord/smali/com/crashlytics/android/core/l$b.smali
index 26b89245b7..2025162dbc 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/l$b;
 .super Ljava/lang/Object;
+.source "CrashlyticsCore.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/o;
diff --git a/com.discord/smali/com/crashlytics/android/core/l.smali b/com.discord/smali/com/crashlytics/android/core/l.smali
index f4f54f492a..7567598aca 100644
--- a/com.discord/smali/com/crashlytics/android/core/l.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l.smali
@@ -1,5 +1,6 @@
 .class public Lcom/crashlytics/android/core/l;
 .super Lio/fabric/sdk/android/i;
+.source "CrashlyticsCore.java"
 
 
 # annotations
@@ -179,7 +180,7 @@
 
     :cond_1
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -282,7 +283,7 @@
 
     iget-object v1, p0, Lio/fabric/sdk/android/i;->bKG:Lio/fabric/sdk/android/h;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Ek()Ljava/util/Collection;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Ej()Ljava/util/Collection;
 
     move-result-object v1
 
@@ -316,7 +317,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -342,7 +343,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -350,7 +351,6 @@
 
     const-string v3, "Crashlytics timed out during initialization."
 
-    :goto_1
     invoke-interface {v1, v2, v3, v0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
@@ -358,7 +358,7 @@
     :catch_1
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -366,12 +366,14 @@
 
     const-string v3, "Problem encountered during Crashlytics initialization."
 
-    goto :goto_1
+    invoke-interface {v1, v2, v3, v0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return-void
 
     :catch_2
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -379,7 +381,9 @@
 
     const-string v3, "Crashlytics was interrupted during initialization."
 
-    goto :goto_1
+    invoke-interface {v1, v2, v3, v0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return-void
 .end method
 
 .method private cD()V
@@ -453,7 +457,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -463,10 +467,9 @@
 
     invoke-interface {v1, v2, v5}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    :goto_0
     const/4 v1, 0x1
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :cond_2
     invoke-static {v4}, Lio/fabric/sdk/android/a/b/i;->Q(Ljava/lang/String;)Z
@@ -475,7 +478,9 @@
 
     if-nez v1, :cond_3
 
-    goto :goto_0
+    const/4 v1, 0x1
+
+    goto/16 :goto_0
 
     :cond_3
     const-string v1, "CrashlyticsCore"
@@ -594,11 +599,11 @@
 
     const/4 v1, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz v1, :cond_7
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -658,15 +663,15 @@
 
     invoke-direct {v1, v2}, Lcom/crashlytics/android/core/s;-><init>(Lcom/crashlytics/android/core/ak;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const/4 v1, 0x0
 
-    :goto_2
+    :goto_1
     new-instance v2, Lio/fabric/sdk/android/a/e/b;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -708,12 +713,12 @@
 
     const-string v1, "0.0"
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     iget-object v1, v1, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
-    :goto_3
+    :goto_2
     move-object v8, v1
 
     new-instance v1, Lcom/crashlytics/android/core/a;
@@ -736,7 +741,7 @@
 
     move-result-object v16
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -868,7 +873,7 @@
 
     if-eqz v0, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -885,7 +890,7 @@
     return v13
 
     :cond_6
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -900,7 +905,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -1084,17 +1089,17 @@
     invoke-virtual {v2, v1, v4}, 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;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->ET()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->ES()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v1
 
     if-nez v1, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -1129,7 +1134,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1146,7 +1151,7 @@
 
     if-nez v2, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -1209,7 +1214,7 @@
     :goto_3
     if-nez v3, :cond_9
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1242,7 +1247,7 @@
 
     if-nez v2, :cond_a
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1259,7 +1264,7 @@
 
     if-nez v1, :cond_b
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -1336,7 +1341,7 @@
     move-exception v1
 
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/m.smali b/com.discord/smali/com/crashlytics/android/core/m.smali
index fbdfb24046..4f36cc1f50 100644
--- a/com.discord/smali/com/crashlytics/android/core/m.smali
+++ b/com.discord/smali/com/crashlytics/android/core/m.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/m;
 .super Ljava/lang/Object;
+.source "CrashlyticsFileMarker.java"
 
 
 # instance fields
@@ -42,7 +43,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/n.smali b/com.discord/smali/com/crashlytics/android/core/n.smali
index a3d114e2e4..94363c566b 100644
--- a/com.discord/smali/com/crashlytics/android/core/n.smali
+++ b/com.discord/smali/com/crashlytics/android/core/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/n;
 .super Ljava/lang/Object;
+.source "CrashlyticsKitBinder.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/core/o.smali b/com.discord/smali/com/crashlytics/android/core/o.smali
index 6615727deb..683f085c42 100644
--- a/com.discord/smali/com/crashlytics/android/core/o.smali
+++ b/com.discord/smali/com/crashlytics/android/core/o.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/crashlytics/android/core/o;
 .super Ljava/lang/Object;
+.source "CrashlyticsListener.java"
diff --git a/com.discord/smali/com/crashlytics/android/core/p.smali b/com.discord/smali/com/crashlytics/android/core/p.smali
index c3ae4255b4..0864c448ea 100644
--- a/com.discord/smali/com/crashlytics/android/core/p.smali
+++ b/com.discord/smali/com/crashlytics/android/core/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/core/p;
 .super Ljava/lang/Object;
+.source "CrashlyticsNdkData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/core/q.smali b/com.discord/smali/com/crashlytics/android/core/q.smali
index 071959d79d..ee9d6689d6 100644
--- a/com.discord/smali/com/crashlytics/android/core/q.smali
+++ b/com.discord/smali/com/crashlytics/android/core/q.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/crashlytics/android/core/q;
 .super Ljava/lang/Object;
+.source "CrashlyticsNdkDataProvider.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/core/s.smali b/com.discord/smali/com/crashlytics/android/core/s.smali
index c90de68b46..e9372b40d4 100644
--- a/com.discord/smali/com/crashlytics/android/core/s.smali
+++ b/com.discord/smali/com/crashlytics/android/core/s.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/s;
 .super Ljava/lang/Object;
+.source "CrashlyticsPinningInfoProvider.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/e/f;
diff --git a/com.discord/smali/com/crashlytics/android/core/t$a.smali b/com.discord/smali/com/crashlytics/android/core/t$a.smali
index 733dff2b9f..ee14be4a11 100644
--- a/com.discord/smali/com/crashlytics/android/core/t$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/t$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/t$a;
 .super Ljava/lang/Object;
+.source "CrashlyticsUncaughtExceptionHandler.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/t$b.smali b/com.discord/smali/com/crashlytics/android/core/t$b.smali
index 034c63d293..53deb5f7ab 100644
--- a/com.discord/smali/com/crashlytics/android/core/t$b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/t$b.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/t$b;
 .super Ljava/lang/Object;
+.source "CrashlyticsUncaughtExceptionHandler.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/t.smali b/com.discord/smali/com/crashlytics/android/core/t.smali
index f6cd63b610..e440e2a858 100644
--- a/com.discord/smali/com/crashlytics/android/core/t.smali
+++ b/com.discord/smali/com/crashlytics/android/core/t.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/t;
 .super Ljava/lang/Object;
+.source "CrashlyticsUncaughtExceptionHandler.java"
 
 # interfaces
 .implements Ljava/lang/Thread$UncaughtExceptionHandler;
@@ -77,7 +78,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -106,7 +107,7 @@
     move-exception v1
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -121,7 +122,7 @@
     goto :goto_0
 
     :goto_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -140,4 +141,6 @@
     invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/u.smali b/com.discord/smali/com/crashlytics/android/core/u.smali
index 320d90672f..850f3f0213 100644
--- a/com.discord/smali/com/crashlytics/android/core/u.smali
+++ b/com.discord/smali/com/crashlytics/android/core/u.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/u;
 .super Ljava/lang/Object;
+.source "CreateReportRequest.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/core/v.smali b/com.discord/smali/com/crashlytics/android/core/v.smali
index 7ca874aaf1..bbe31fca3c 100644
--- a/com.discord/smali/com/crashlytics/android/core/v.smali
+++ b/com.discord/smali/com/crashlytics/android/core/v.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/core/v;
 .super Ljava/lang/Object;
+.source "CreateReportSpiCall.java"
 
 
 # virtual methods
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 6fd180e086..773dca9fb4 100644
--- a/com.discord/smali/com/crashlytics/android/core/w$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/w$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/w$1;
 .super Ljava/lang/Object;
+.source "DefaultAppMeasurementEventListenerRegistrar.java"
 
 # interfaces
 .implements Ljava/lang/reflect/InvocationHandler;
@@ -105,7 +106,7 @@
     goto :goto_0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/w.smali b/com.discord/smali/com/crashlytics/android/core/w.smali
index dcf4345cc5..075b0ab81b 100644
--- a/com.discord/smali/com/crashlytics/android/core/w.smali
+++ b/com.discord/smali/com/crashlytics/android/core/w.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/w;
 .super Ljava/lang/Object;
+.source "DefaultAppMeasurementEventListenerRegistrar.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/b;
@@ -122,7 +123,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -130,7 +131,6 @@
 
     const-string v1, "Cannot access method: "
 
-    :goto_0
     invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p3
@@ -146,7 +146,7 @@
     :catch_1
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -154,12 +154,22 @@
 
     const-string v1, "Cannot invoke method: "
 
-    goto :goto_0
+    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {v1, p3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-interface {p2, v0, p3, p1}, Lio/fabric/sdk/android/l;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return v2
 
     :catch_2
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -167,7 +177,17 @@
 
     const-string v1, "Expected method missing: "
 
-    goto :goto_0
+    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {v1, p3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-interface {p2, v0, p3, p1}, Lio/fabric/sdk/android/l;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return v2
 .end method
 
 .method static c(Ljava/lang/String;Landroid/os/Bundle;)Ljava/lang/String;
@@ -296,7 +316,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -304,7 +324,6 @@
 
     const-string v3, "Firebase Analytics is not present; you will not see automatic logging of events before a crash occurs."
 
-    :goto_0
     invoke-interface {v0, v2, v3}, Lio/fabric/sdk/android/l;->w(Ljava/lang/String;Ljava/lang/String;)V
 
     return v1
@@ -316,7 +335,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -324,7 +343,9 @@
 
     const-string v3, "Could not create an instance of Firebase Analytics."
 
-    goto :goto_0
+    invoke-interface {v0, v2, v3}, Lio/fabric/sdk/android/l;->w(Ljava/lang/String;Ljava/lang/String;)V
+
+    return v1
 
     :cond_1
     const-string v1, "registerOnMeasurementEventListener"
diff --git a/com.discord/smali/com/crashlytics/android/core/x.smali b/com.discord/smali/com/crashlytics/android/core/x.smali
index 01816bfa6f..7d4bf9a93a 100644
--- a/com.discord/smali/com/crashlytics/android/core/x.smali
+++ b/com.discord/smali/com/crashlytics/android/core/x.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/x;
 .super Lio/fabric/sdk/android/a/b/a;
+.source "DefaultCreateReportSpiCall.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/v;
@@ -31,7 +32,7 @@
 .method public final a(Lcom/crashlytics/android/core/u;)Z
     .locals 12
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->DS()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->DR()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
@@ -133,7 +134,7 @@
 
     if-ne v1, v3, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -201,7 +202,7 @@
 
     aget-object v7, v1, v5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v8
 
@@ -267,7 +268,7 @@
 
     :cond_2
     :goto_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -289,11 +290,11 @@
 
     invoke-interface {p1, v1, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->EF()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -319,7 +320,7 @@
 
     invoke-interface {v1, v4, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 bcb5db3ff7..b146f93fd1 100644
--- a/com.discord/smali/com/crashlytics/android/core/y$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/y$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/y$1;
 .super Landroid/content/BroadcastReceiver;
+.source "DevicePowerStateListener.java"
 
 
 # annotations
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 e087aa7e46..21bf0b6729 100644
--- a/com.discord/smali/com/crashlytics/android/core/y$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/y$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/y$2;
 .super Landroid/content/BroadcastReceiver;
+.source "DevicePowerStateListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/crashlytics/android/core/y.smali b/com.discord/smali/com/crashlytics/android/core/y.smali
index 1916ed49b4..bd5ba09d2d 100644
--- a/com.discord/smali/com/crashlytics/android/core/y.smali
+++ b/com.discord/smali/com/crashlytics/android/core/y.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/y;
 .super Ljava/lang/Object;
+.source "DevicePowerStateListener.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/crashlytics/android/core/z.smali b/com.discord/smali/com/crashlytics/android/core/z.smali
index aa68952eb2..dbdacac524 100644
--- a/com.discord/smali/com/crashlytics/android/core/z.smali
+++ b/com.discord/smali/com/crashlytics/android/core/z.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/core/z;
 .super Ljava/lang/Object;
+.source "DialogStringResolver.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/crashlytics/android/ndk/JniNativeApi.smali b/com.discord/smali/com/crashlytics/android/ndk/JniNativeApi.smali
index 037f2e5438..aa71123366 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/JniNativeApi.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/JniNativeApi.smali
@@ -1,5 +1,6 @@
 .class Lcom/crashlytics/android/ndk/JniNativeApi;
 .super Ljava/lang/Object;
+.source "JniNativeApi.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/ndk/d;
diff --git a/com.discord/smali/com/crashlytics/android/ndk/R.smali b/com.discord/smali/com/crashlytics/android/ndk/R.smali
index 7bac16cfcf..650b625f00 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/R.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/ndk/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/ndk/a.smali b/com.discord/smali/com/crashlytics/android/ndk/a.smali
index 7974968a24..ce58c6a603 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/a.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/ndk/a;
 .super Ljava/lang/Object;
+.source "BreakpadController.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/ndk/f;
@@ -69,7 +70,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/crashlytics/android/ndk/b.smali b/com.discord/smali/com/crashlytics/android/ndk/b.smali
index cf2e45a003..0f522252cf 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/b.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/crashlytics/android/ndk/b;
 .super Ljava/lang/Object;
+.source "CrashFilesManager.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/ndk/c.smali b/com.discord/smali/com/crashlytics/android/ndk/c.smali
index 8f7ad49273..dfbe42d108 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/c.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/crashlytics/android/ndk/c;
 .super Lio/fabric/sdk/android/i;
+.source "CrashlyticsNdk.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/core/q;
@@ -50,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -123,7 +124,7 @@
 
     iput-object p0, v0, Lcom/crashlytics/android/core/l;->ru:Lcom/crashlytics/android/core/q;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/ndk/d.smali b/com.discord/smali/com/crashlytics/android/ndk/d.smali
index 048ed730a7..274fd739ff 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/d.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/d.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/ndk/d;
 .super Ljava/lang/Object;
+.source "NativeApi.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/crashlytics/android/ndk/e$1.smali b/com.discord/smali/com/crashlytics/android/ndk/e$1.smali
index 36d1c75d6e..248a599f72 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/e$1.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/e$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/ndk/e$1;
 .super Ljava/lang/Object;
+.source "NdkCrashFilesManager.java"
 
 # interfaces
 .implements Ljava/io/FileFilter;
diff --git a/com.discord/smali/com/crashlytics/android/ndk/e$2.smali b/com.discord/smali/com/crashlytics/android/ndk/e$2.smali
index 5f913b2127..6b04d6645d 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/e$2.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/e$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/ndk/e$2;
 .super Ljava/lang/Object;
+.source "NdkCrashFilesManager.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/crashlytics/android/ndk/e.smali b/com.discord/smali/com/crashlytics/android/ndk/e.smali
index 865f1edc3b..f3963c473e 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/e.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/crashlytics/android/ndk/e;
 .super Ljava/lang/Object;
+.source "NdkCrashFilesManager.java"
 
 # interfaces
 .implements Lcom/crashlytics/android/ndk/b;
diff --git a/com.discord/smali/com/crashlytics/android/ndk/f.smali b/com.discord/smali/com/crashlytics/android/ndk/f.smali
index 2ef6bda28e..389ff418e5 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/f.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/f.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/crashlytics/android/ndk/f;
 .super Ljava/lang/Object;
+.source "NdkKitController.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 915c693b8f..b23f2a91bb 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
@@ -29,11 +30,11 @@
 
 .field public static final LOCAL_VOICE:Ljava/lang/String; = ""
 
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/830"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/831"
 
-.field public static final VERSION_CODE:I = 0x33e
+.field public static final VERSION_CODE:I = 0x33f
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "8.3.0"
+.field public static final VERSION_NAME:Ljava/lang/String; = "8.3.1"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/R$a.smali b/com.discord/smali/com/discord/R$a.smali
index 799f7e6308..51e00c26ef 100644
--- a/com.discord/smali/com/discord/R$a.smali
+++ b/com.discord/smali/com/discord/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/R.smali b/com.discord/smali/com/discord/R.smali
index 9c4249f6e2..fb10b9348f 100644
--- a/com.discord/smali/com/discord/R.smali
+++ b/com.discord/smali/com/discord/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/a/a$a.smali b/com.discord/smali/com/discord/a/a$a.smali
index f982e68cd0..1627a7dde8 100644
--- a/com.discord/smali/com/discord/a/a$a.smali
+++ b/com.discord/smali/com/discord/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/a/a$a;
 .super Ljava/lang/Object;
+.source "SelectorDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/a/a$b.smali b/com.discord/smali/com/discord/a/a$b.smali
index c3378cbb87..ff5568500c 100644
--- a/com.discord/smali/com/discord/a/a$b.smali
+++ b/com.discord/smali/com/discord/a/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/a$b;
 .super Ljava/lang/Object;
+.source "SelectorDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/a/a$c.smali b/com.discord/smali/com/discord/a/a$c.smali
index 92cb3f6443..e9bf6f3d15 100644
--- a/com.discord/smali/com/discord/a/a$c.smali
+++ b/com.discord/smali/com/discord/a/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/a$c;
 .super Lkotlin/jvm/internal/k;
+.source "SelectorDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/a/a.smali b/com.discord/smali/com/discord/a/a.smali
index 64addf2cef..a00a732387 100644
--- a/com.discord/smali/com/discord/a/a.smali
+++ b/com.discord/smali/com/discord/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/a/a;
 .super Lcom/discord/app/AppDialog;
+.source "SelectorDialog.kt"
 
 
 # annotations
@@ -161,7 +162,7 @@
     return-void
 .end method
 
-.method private final dL()Landroidx/recyclerview/widget/RecyclerView;
+.method private final dK()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/a/a;->wa:Lkotlin/properties/ReadOnlyProperty;
@@ -190,8 +191,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/a/a;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -354,7 +353,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/a/a;->dL()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/a/a;->dK()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v0
 
@@ -372,7 +371,7 @@
 
     invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
-    invoke-direct {p0}, Lcom/discord/a/a;->dL()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/a/a;->dK()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
@@ -391,7 +390,7 @@
 
     sget-object p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->Companion:Lcom/discord/utilities/views/SimpleRecyclerAdapter$Companion;
 
-    invoke-direct {p0}, Lcom/discord/a/a;->dL()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/a/a;->dK()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/a/b$a$a.smali b/com.discord/smali/com/discord/a/b$a$a.smali
index 079a99ccd8..e1d54ab61b 100644
--- a/com.discord/smali/com/discord/a/b$a$a.smali
+++ b/com.discord/smali/com/discord/a/b$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$a$a;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/a/b$a.smali b/com.discord/smali/com/discord/a/b$a.smali
index ce1cac6ae2..f4714c4bfa 100644
--- a/com.discord/smali/com/discord/a/b$a.smali
+++ b/com.discord/smali/com/discord/a/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/a/b$a;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/a/b$b.smali b/com.discord/smali/com/discord/a/b$b.smali
index 7d61fe0315..266363e246 100644
--- a/com.discord/smali/com/discord/a/b$b.smali
+++ b/com.discord/smali/com/discord/a/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$b;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/a/b$c.smali b/com.discord/smali/com/discord/a/b$c.smali
index 745ceda9e5..c04f83e727 100644
--- a/com.discord/smali/com/discord/a/b$c.smali
+++ b/com.discord/smali/com/discord/a/b$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$c;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/a/b$d.smali b/com.discord/smali/com/discord/a/b$d.smali
index cf6f4b96da..046d496271 100644
--- a/com.discord/smali/com/discord/a/b$d.smali
+++ b/com.discord/smali/com/discord/a/b$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$d;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/a/b$e.smali b/com.discord/smali/com/discord/a/b$e.smali
index 4f72033cfe..6bb4c72e76 100644
--- a/com.discord/smali/com/discord/a/b$e.smali
+++ b/com.discord/smali/com/discord/a/b$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$e;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/a/b$f.smali b/com.discord/smali/com/discord/a/b$f.smali
index 28a87c6100..188d9c3906 100644
--- a/com.discord/smali/com/discord/a/b$f.smali
+++ b/com.discord/smali/com/discord/a/b$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$f;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/a/b$g.smali b/com.discord/smali/com/discord/a/b$g.smali
index 67019593f7..5e4c184c24 100644
--- a/com.discord/smali/com/discord/a/b$g.smali
+++ b/com.discord/smali/com/discord/a/b$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$g;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/a/b$h.smali b/com.discord/smali/com/discord/a/b$h.smali
index c8f3f3c375..104eac35f9 100644
--- a/com.discord/smali/com/discord/a/b$h.smali
+++ b/com.discord/smali/com/discord/a/b$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$h;
 .super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/a/b$i.smali b/com.discord/smali/com/discord/a/b$i.smali
index 85af2e5ac1..d10b6c1475 100644
--- a/com.discord/smali/com/discord/a/b$i.smali
+++ b/com.discord/smali/com/discord/a/b$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$i;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/a/b$j.smali b/com.discord/smali/com/discord/a/b$j.smali
index 2fdba88e5f..c2989079e6 100644
--- a/com.discord/smali/com/discord/a/b$j.smali
+++ b/com.discord/smali/com/discord/a/b$j.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/a/b$j;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/a/b.smali b/com.discord/smali/com/discord/a/b.smali
index 519ea05c82..1c93dc3982 100644
--- a/com.discord/smali/com/discord/a/b.smali
+++ b/com.discord/smali/com/discord/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/a/b;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetGiftAcceptDialog.kt"
 
 
 # annotations
@@ -222,7 +223,7 @@
 
     invoke-direct {p0, p1}, Lcom/discord/a/b;->a(Lcom/discord/models/domain/ModelGift;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dL()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
@@ -236,7 +237,7 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
@@ -250,7 +251,7 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -274,7 +275,7 @@
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -298,7 +299,7 @@
 
     invoke-direct {p0, v0}, Lcom/discord/a/b;->a(Lcom/discord/models/domain/ModelGift;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dL()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -312,7 +313,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -336,7 +337,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -348,7 +349,7 @@
 
     invoke-virtual {v0, v1, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object v0
 
@@ -367,7 +368,7 @@
     :cond_0
     invoke-virtual {v0, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p0
 
@@ -382,7 +383,7 @@
     return-void
 
     :cond_1
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
@@ -396,7 +397,7 @@
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -415,7 +416,7 @@
     :cond_2
     invoke-virtual {p1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -441,7 +442,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dO()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v0
 
@@ -505,14 +506,14 @@
     move-result-object v1
 
     :cond_1
-    invoke-direct {p0}, Lcom/discord/a/b;->dO()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p1
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
 
     :goto_0
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -520,7 +521,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dQ()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/view/View;
 
     move-result-object p1
 
@@ -629,7 +630,6 @@
 
     aput-object v0, v3, v4
 
-    :goto_1
     invoke-virtual {p0, v2, v3}, Lcom/discord/a/b;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
@@ -657,7 +657,17 @@
 
     aput-object v0, v3, v4
 
-    goto :goto_1
+    invoke-virtual {p0, v2, v3}, Lcom/discord/a/b;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "getString(R.string.gift_\u2026String(), timeUnitString)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    nop
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -739,12 +749,11 @@
 
     aput-object v1, v0, v4
 
-    :goto_1
     invoke-virtual {p0, p1, v0}, Lcom/discord/a/b;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isNitroGift()Z
@@ -759,6 +768,10 @@
 
     aput-object v1, v0, v4
 
+    invoke-virtual {p0, p1, v0}, Lcom/discord/a/b;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
     goto :goto_1
 
     :cond_2
@@ -772,12 +785,12 @@
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     const-string v0, "when {\n      gift.isNitr\u2026ccess_mobile, name)\n    }"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dL()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -785,7 +798,7 @@
 
     invoke-virtual {v0, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -793,7 +806,7 @@
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -809,15 +822,15 @@
 
     move-result-object v0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const/4 v0, 0x0
 
-    :goto_3
+    :goto_2
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -837,7 +850,7 @@
 
     invoke-direct {p0, p1}, Lcom/discord/a/b;->a(Lcom/discord/models/domain/ModelGift;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dL()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
@@ -851,7 +864,7 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
@@ -867,7 +880,7 @@
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -891,7 +904,7 @@
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -999,7 +1012,7 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dL()Lcom/discord/app/AppTextView;
 
     move-result-object v2
 
@@ -1007,7 +1020,7 @@
 
     invoke-virtual {v2, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object v1
 
@@ -1015,7 +1028,7 @@
 
     invoke-virtual {v1, v0, v2}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object v0
 
@@ -1039,7 +1052,7 @@
     :goto_2
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object p0
 
@@ -1054,7 +1067,7 @@
     return-void
 .end method
 
-.method private final dM()Lcom/discord/app/AppTextView;
+.method private final dL()Lcom/discord/app/AppTextView;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/a/b;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -1074,7 +1087,7 @@
     return-object v0
 .end method
 
-.method private final dN()Lcom/discord/app/AppTextView;
+.method private final dM()Lcom/discord/app/AppTextView;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/a/b;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -1094,7 +1107,7 @@
     return-object v0
 .end method
 
-.method private final dO()Lcom/facebook/drawee/view/SimpleDraweeView;
+.method private final dN()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/a/b;->wc:Lkotlin/properties/ReadOnlyProperty;
@@ -1114,7 +1127,7 @@
     return-object v0
 .end method
 
-.method private final dP()Landroid/widget/Button;
+.method private final dO()Landroid/widget/Button;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/a/b;->wd:Lkotlin/properties/ReadOnlyProperty;
@@ -1134,7 +1147,7 @@
     return-object v0
 .end method
 
-.method private final dQ()Landroid/view/View;
+.method private final dP()Landroid/view/View;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/a/b;->we:Lkotlin/properties/ReadOnlyProperty;
@@ -1171,7 +1184,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/a/b;->dO()Landroid/widget/Button;
 
     move-result-object v1
 
@@ -1179,7 +1192,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dQ()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/a/b;->dP()Landroid/view/View;
 
     move-result-object v1
 
@@ -1261,7 +1274,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dL()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -1269,7 +1282,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dN()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/a/b;->dM()Lcom/discord/app/AppTextView;
 
     move-result-object p0
 
@@ -1289,8 +1302,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/a/b;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/app/App$a.smali b/com.discord/smali/com/discord/app/App$a.smali
index a07215a0c7..c773fb8d6c 100644
--- a/com.discord/smali/com/discord/app/App$a.smali
+++ b/com.discord/smali/com/discord/app/App$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/App$a;
 .super Ljava/lang/Object;
+.source "App.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/App$b.smali b/com.discord/smali/com/discord/app/App$b.smali
index 2e35d26457..dbae20cb90 100644
--- a/com.discord/smali/com/discord/app/App$b.smali
+++ b/com.discord/smali/com/discord/app/App$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/App$b;
 .super Ljava/lang/Object;
+.source "App.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/app/App$c.smali b/com.discord/smali/com/discord/app/App$c.smali
index c4e9516ab6..16f970f408 100644
--- a/com.discord/smali/com/discord/app/App$c.smali
+++ b/com.discord/smali/com/discord/app/App$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/App$c;
 .super Lkotlin/jvm/internal/i;
+.source "App.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
diff --git a/com.discord/smali/com/discord/app/App$d.smali b/com.discord/smali/com/discord/app/App$d.smali
index 598daea11f..2f49f08d04 100644
--- a/com.discord/smali/com/discord/app/App$d.smali
+++ b/com.discord/smali/com/discord/app/App$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/App$d;
 .super Lkotlin/jvm/internal/k;
+.source "App.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index 6b4b6754bc..736d8ee7c3 100644
--- a/com.discord/smali/com/discord/app/App.smali
+++ b/com.discord/smali/com/discord/app/App.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/app/App;
 .super Landroid/app/Application;
+.source "App.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/AppActivity$IncomingShare$a.smali b/com.discord/smali/com/discord/app/AppActivity$IncomingShare$a.smali
index a77e45e9ff..ec1e348dde 100644
--- a/com.discord/smali/com/discord/app/AppActivity$IncomingShare$a.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$IncomingShare$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$IncomingShare$a;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/AppActivity$IncomingShare$b.smali b/com.discord/smali/com/discord/app/AppActivity$IncomingShare$b.smali
index 5e05451efb..c516a612bd 100644
--- a/com.discord/smali/com/discord/app/AppActivity$IncomingShare$b.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$IncomingShare$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$IncomingShare$b;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppActivity$IncomingShare.smali b/com.discord/smali/com/discord/app/AppActivity$IncomingShare.smali
index e176f084eb..4d7c05ded0 100644
--- a/com.discord/smali/com/discord/app/AppActivity$IncomingShare.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$IncomingShare.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppActivity$IncomingShare;
 .super Lcom/discord/app/AppActivity;
+.source "AppActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/AppActivity$Main.smali b/com.discord/smali/com/discord/app/AppActivity$Main.smali
index 0abfb749af..0d0b342f2f 100644
--- a/com.discord/smali/com/discord/app/AppActivity$Main.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$Main.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppActivity$Main;
 .super Lcom/discord/app/AppActivity;
+.source "AppActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/AppActivity$a.smali b/com.discord/smali/com/discord/app/AppActivity$a.smali
index 4a967df39f..cdf1a07fee 100644
--- a/com.discord/smali/com/discord/app/AppActivity$a.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppActivity$a;
 .super Ljava/lang/Object;
+.source "AppActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/AppActivity$b.smali b/com.discord/smali/com/discord/app/AppActivity$b.smali
index ac53ededd9..c070551538 100644
--- a/com.discord/smali/com/discord/app/AppActivity$b.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$b;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/AppActivity$c.smali b/com.discord/smali/com/discord/app/AppActivity$c.smali
index 18764562cc..ecf4458be0 100644
--- a/com.discord/smali/com/discord/app/AppActivity$c.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$c;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/AppActivity$d.smali b/com.discord/smali/com/discord/app/AppActivity$d.smali
index b94d521029..78ab31c25e 100644
--- a/com.discord/smali/com/discord/app/AppActivity$d.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$d;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppActivity$e.smali b/com.discord/smali/com/discord/app/AppActivity$e.smali
index 60115b16df..3ec5af307f 100644
--- a/com.discord/smali/com/discord/app/AppActivity$e.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$e;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -59,9 +60,7 @@
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$e;->this$0:Lcom/discord/app/AppActivity;
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$e;->this$0:Lcom/discord/app/AppActivity;
-
-    invoke-static {v1}, Lcom/discord/app/AppActivity;->a(Lcom/discord/app/AppActivity;)Lcom/discord/stores/StoreUserSettings;
+    invoke-static {v0}, Lcom/discord/app/AppActivity;->a(Lcom/discord/app/AppActivity;)Lcom/discord/stores/StoreUserSettings;
 
     move-result-object v1
 
@@ -81,9 +80,7 @@
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$e;->this$0:Lcom/discord/app/AppActivity;
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$e;->this$0:Lcom/discord/app/AppActivity;
-
-    invoke-static {v1}, Lcom/discord/app/AppActivity;->a(Lcom/discord/app/AppActivity;)Lcom/discord/stores/StoreUserSettings;
+    invoke-static {v0}, Lcom/discord/app/AppActivity;->a(Lcom/discord/app/AppActivity;)Lcom/discord/stores/StoreUserSettings;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$f.smali b/com.discord/smali/com/discord/app/AppActivity$f.smali
index 0781264a17..0206542c1b 100644
--- a/com.discord/smali/com/discord/app/AppActivity$f.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$f;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -59,9 +60,7 @@
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$f;->this$0:Lcom/discord/app/AppActivity;
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$f;->this$0:Lcom/discord/app/AppActivity;
-
-    invoke-virtual {v1}, Lcom/discord/app/AppActivity;->getMostRecentIntent()Landroid/content/Intent;
+    invoke-virtual {v0}, Lcom/discord/app/AppActivity;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object v1
 
@@ -75,9 +74,7 @@
 
     iget-object v1, p0, Lcom/discord/app/AppActivity$f;->this$0:Lcom/discord/app/AppActivity;
 
-    iget-object v2, p0, Lcom/discord/app/AppActivity$f;->this$0:Lcom/discord/app/AppActivity;
-
-    invoke-static {v2, v0}, Lcom/discord/app/AppActivity;->b(Lcom/discord/app/AppActivity;Landroid/content/Intent;)Lcom/discord/app/h$a;
+    invoke-static {v1, v0}, Lcom/discord/app/AppActivity;->b(Lcom/discord/app/AppActivity;Landroid/content/Intent;)Lcom/discord/app/h$a;
 
     move-result-object v0
 
@@ -128,15 +125,15 @@
 
     iget-object v1, p0, Lcom/discord/app/AppActivity$f;->this$0:Lcom/discord/app/AppActivity;
 
-    check-cast v1, Landroid/content/Context;
+    move-object v2, v1
 
-    iget-object v2, p0, Lcom/discord/app/AppActivity$f;->this$0:Lcom/discord/app/AppActivity;
+    check-cast v2, Landroid/content/Context;
 
-    invoke-virtual {v2}, Lcom/discord/app/AppActivity;->getScreen()Ljava/lang/Class;
+    invoke-virtual {v1}, Lcom/discord/app/AppActivity;->getScreen()Ljava/lang/Class;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v0, v1, v2}, Lcom/discord/app/e;->a(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Ljava/lang/Class;)V
+    invoke-static {v0, v2, v1}, Lcom/discord/app/e;->a(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Ljava/lang/Class;)V
 
     return-void
 .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 660d7a9a73..8a00203436 100644
--- a/com.discord/smali/com/discord/app/AppActivity$g.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$g;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -55,7 +56,7 @@
 .end method
 
 .method public final invoke()V
-    .locals 3
+    .locals 2
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$g;->this$0:Lcom/discord/app/AppActivity;
 
@@ -65,11 +66,9 @@
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$g;->this$0:Lcom/discord/app/AppActivity;
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$g;->this$0:Lcom/discord/app/AppActivity;
+    const v1, 0x7f0a0015
 
-    const v2, 0x7f0a0015
-
-    invoke-virtual {v1, v2}, Lcom/discord/app/AppActivity;->findViewById(I)Landroid/view/View;
+    invoke-virtual {v0, v1}, Lcom/discord/app/AppActivity;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$h.smali b/com.discord/smali/com/discord/app/AppActivity$h.smali
index ac0acb6486..7bb07ea583 100644
--- a/com.discord/smali/com/discord/app/AppActivity$h.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$h;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/AppActivity$i.smali b/com.discord/smali/com/discord/app/AppActivity$i.smali
index e646572a13..ac9a807d23 100644
--- a/com.discord/smali/com/discord/app/AppActivity$i.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$i;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/AppActivity$j.smali b/com.discord/smali/com/discord/app/AppActivity$j.smali
index d1094027a6..e74b4d2f42 100644
--- a/com.discord/smali/com/discord/app/AppActivity$j.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$j.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$j;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/app/AppActivity$k.smali b/com.discord/smali/com/discord/app/AppActivity$k.smali
index 2602533a4f..a8b27af083 100644
--- a/com.discord/smali/com/discord/app/AppActivity$k.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$k.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$k;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppActivity$l.smali b/com.discord/smali/com/discord/app/AppActivity$l.smali
index 7572d2fa8c..cdf8e41ff5 100644
--- a/com.discord/smali/com/discord/app/AppActivity$l.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$l.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$l;
 .super Ljava/lang/Object;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;
diff --git a/com.discord/smali/com/discord/app/AppActivity$m.smali b/com.discord/smali/com/discord/app/AppActivity$m.smali
index 2d8c5394c4..2a9c96e1f7 100644
--- a/com.discord/smali/com/discord/app/AppActivity$m.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$m.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$m;
 .super Ljava/lang/Object;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/app/AppActivity$n.smali b/com.discord/smali/com/discord/app/AppActivity$n.smali
index 0fd03b4849..4c8601067f 100644
--- a/com.discord/smali/com/discord/app/AppActivity$n.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$n.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppActivity$n;
 .super Lkotlin/jvm/internal/k;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppActivity.smali b/com.discord/smali/com/discord/app/AppActivity.smali
index 3f87b0be2b..f6fd7615d0 100644
--- a/com.discord/smali/com/discord/app/AppActivity.smali
+++ b/com.discord/smali/com/discord/app/AppActivity.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/app/AppActivity;
 .super Lcom/discord/app/b;
+.source "AppActivity.kt"
 
 # interfaces
 .implements Lcom/discord/app/AppComponent;
@@ -145,7 +146,7 @@
 
     iput-object v0, p0, Lcom/discord/app/AppActivity;->sQ:Ljava/util/LinkedHashMap;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -192,6 +193,8 @@
 
     invoke-direct {v0, v1}, Lkotlin/u;-><init>(Lkotlin/jvm/functions/Function0;)V
 
+    check-cast v0, Lkotlin/Lazy;
+
     goto :goto_0
 
     :pswitch_1
@@ -199,6 +202,8 @@
 
     invoke-direct {v0, v1}, Lkotlin/o;-><init>(Lkotlin/jvm/functions/Function0;)V
 
+    check-cast v0, Lkotlin/Lazy;
+
     goto :goto_0
 
     :pswitch_2
@@ -206,9 +211,9 @@
 
     invoke-direct {v0, v1}, Lkotlin/p;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    :goto_0
     check-cast v0, Lkotlin/Lazy;
 
+    :goto_0
     iput-object v0, p0, Lcom/discord/app/AppActivity;->sR:Lkotlin/Lazy;
 
     new-instance v0, Lcom/discord/app/AppActivity$k;
@@ -591,6 +596,8 @@
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->setNavigationOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -729,7 +736,7 @@
 
     move-result-object v0
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_0
 
     new-instance v0, Landroid/content/Intent;
 
@@ -737,12 +744,7 @@
 
     invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 
-    return-object v0
-
     :cond_0
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->sT:Landroid/content/Intent;
-
-    :cond_1
     return-object v0
 .end method
 
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$a.smali b/com.discord/smali/com/discord/app/AppBottomSheet$a.smali
index 8961553946..8ffc1c817a 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$a.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppBottomSheet$a;
 .super Lkotlin/jvm/internal/k;
+.source "AppBottomSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$b.smali b/com.discord/smali/com/discord/app/AppBottomSheet$b.smali
index 74c4093b86..acb4cc1090 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$b.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppBottomSheet$b;
 .super Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
+.source "AppBottomSheet.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$c.smali b/com.discord/smali/com/discord/app/AppBottomSheet$c.smali
index 501384f477..3170a19245 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$c.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppBottomSheet$c;
 .super Ljava/lang/Object;
+.source "AppBottomSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnLayoutChangeListener;
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$d.smali b/com.discord/smali/com/discord/app/AppBottomSheet$d.smali
index 678c5bc1ce..2e1e3b8ae0 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$d.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppBottomSheet$d;
 .super Ljava/lang/Object;
+.source "AppBottomSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet.smali b/com.discord/smali/com/discord/app/AppBottomSheet.smali
index 74273bd0b8..0dba7baa44 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/app/AppBottomSheet;
 .super Lcom/google/android/material/bottomsheet/BottomSheetDialogFragment;
+.source "AppBottomSheet.kt"
 
 # interfaces
 .implements Lcom/discord/app/AppComponent;
@@ -75,7 +76,7 @@
 
     invoke-direct {p0}, Lcom/google/android/material/bottomsheet/BottomSheetDialogFragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -278,6 +279,8 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setPeekHeight(I)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -291,8 +294,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/app/AppBottomSheet;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -372,6 +373,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -442,6 +445,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppActivity;->hideKeyboard(Landroid/view/View;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -594,6 +599,8 @@
 
     invoke-virtual {p1, p2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setBottomSheetCallback(Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -657,6 +664,8 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -794,6 +803,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -809,6 +820,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppActivity;->showKeyboard(Landroid/view/View;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppComponent.smali b/com.discord/smali/com/discord/app/AppComponent.smali
index 71b83bbbb6..1d95e35c72 100644
--- a/com.discord/smali/com/discord/app/AppComponent.smali
+++ b/com.discord/smali/com/discord/app/AppComponent.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/app/AppComponent;
 .super Ljava/lang/Object;
+.source "AppComponent.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/app/AppDialog$a.smali b/com.discord/smali/com/discord/app/AppDialog$a.smali
index 850671fd4f..bc9b34549f 100644
--- a/com.discord/smali/com/discord/app/AppDialog$a.smali
+++ b/com.discord/smali/com/discord/app/AppDialog$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppDialog$a;
 .super Ljava/lang/Object;
+.source "AppDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/app/AppDialog.smali b/com.discord/smali/com/discord/app/AppDialog.smali
index 211cda26ff..ad60f2d9b6 100644
--- a/com.discord/smali/com/discord/app/AppDialog.smali
+++ b/com.discord/smali/com/discord/app/AppDialog.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/app/AppDialog;
 .super Landroidx/fragment/app/DialogFragment;
+.source "AppDialog.kt"
 
 # interfaces
 .implements Lcom/discord/app/AppComponent;
@@ -32,7 +33,7 @@
 
     invoke-direct {p0}, Landroidx/fragment/app/DialogFragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -116,8 +117,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/app/AppDialog;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -187,6 +186,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -269,6 +270,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppActivity;->hideKeyboard(Landroid/view/View;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -511,6 +514,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 
@@ -547,6 +552,8 @@
 
     invoke-static {p2, p1, v1, v0, v1}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -574,6 +581,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppActivity;->showKeyboard(Landroid/view/View;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppEditText.smali b/com.discord/smali/com/discord/app/AppEditText.smali
index 6119318fd8..bbcf247b9c 100644
--- a/com.discord/smali/com/discord/app/AppEditText.smali
+++ b/com.discord/smali/com/discord/app/AppEditText.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppEditText;
 .super Landroidx/appcompat/widget/AppCompatEditText;
+.source "AppEditText.kt"
 
 
 # instance fields
@@ -7,14 +8,6 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Landroidx/appcompat/widget/AppCompatEditText;-><init>(Landroid/content/Context;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 0
 
@@ -23,14 +16,6 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2, p3}, Landroidx/appcompat/widget/AppCompatEditText;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
 
 # virtual methods
 .method public final getTrimmedText()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/app/AppFragment$a.smali b/com.discord/smali/com/discord/app/AppFragment$a.smali
index 0a10c1cbb9..6ddc9b2279 100644
--- a/com.discord/smali/com/discord/app/AppFragment$a.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppFragment$a;
 .super Lkotlin/jvm/internal/k;
+.source "AppFragment.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali
index 3c919ee89e..eeeae8a620 100644
--- a/com.discord/smali/com/discord/app/AppFragment$b.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppFragment$b;
 .super Lkotlin/jvm/internal/k;
+.source "AppFragment.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali
index a7b5985995..d20ee5c248 100644
--- a/com.discord/smali/com/discord/app/AppFragment$c.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppFragment$c;
 .super Ljava/lang/Object;
+.source "AppFragment.kt"
 
 # interfaces
 .implements Lcom/miguelgaeta/media_picker/MediaPicker$OnResult;
diff --git a/com.discord/smali/com/discord/app/AppFragment$d.smali b/com.discord/smali/com/discord/app/AppFragment$d.smali
index 23b0a61ed9..b815d4c58e 100644
--- a/com.discord/smali/com/discord/app/AppFragment$d.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppFragment$d;
 .super Lkotlin/jvm/internal/k;
+.source "AppFragment.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppFragment.smali b/com.discord/smali/com/discord/app/AppFragment.smali
index 5db01980a5..53fba1d36c 100644
--- a/com.discord/smali/com/discord/app/AppFragment.smali
+++ b/com.discord/smali/com/discord/app/AppFragment.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/app/AppFragment;
 .super Landroidx/fragment/app/Fragment;
+.source "AppFragment.kt"
 
 # interfaces
 .implements Lcom/discord/app/AppComponent;
@@ -102,7 +103,7 @@
 
     invoke-direct {p0}, Landroidx/fragment/app/Fragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -407,8 +408,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/app/AppFragment;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -556,7 +555,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Dr()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Dq()Ljava/io/File;
 
     move-result-object v0
 
@@ -627,6 +626,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppActivity;->hideKeyboard(Landroid/view/View;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -745,7 +746,7 @@
     invoke-interface {v0}, Lbutterknife/Unbinder;->unbind()V
 
     :cond_1
-    sget-object v0, Lkotterknife/a;->bVg:Lkotterknife/a;
+    sget-object v0, Lkotterknife/a;->bUA:Lkotterknife/a;
 
     invoke-static {p0}, Lkotterknife/a;->reset(Ljava/lang/Object;)V
 
@@ -1461,6 +1462,8 @@
 
     invoke-interface {p1, p2, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -1506,6 +1509,8 @@
 
     invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1533,6 +1538,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppActivity;->showKeyboard(Landroid/view/View;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog$Elapsed$a.smali b/com.discord/smali/com/discord/app/AppLog$Elapsed$a.smali
index fd946cfec0..151668d209 100644
--- a/com.discord/smali/com/discord/app/AppLog$Elapsed$a.smali
+++ b/com.discord/smali/com/discord/app/AppLog$Elapsed$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppLog$Elapsed$a;
 .super Lkotlin/jvm/internal/k;
+.source "AppLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali b/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali
index 069a7dbe80..e6699a8c2e 100644
--- a/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali
+++ b/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppLog$Elapsed$b;
 .super Lkotlin/jvm/internal/k;
+.source "AppLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppLog$Elapsed.smali b/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
index eb15118f81..cce3e84611 100644
--- a/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
+++ b/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppLog$Elapsed;
 .super Ljava/lang/Object;
+.source "AppLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali b/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
index 197a79436b..3caeb15f93 100644
--- a/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
+++ b/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppLog$LoggedItem;
 .super Ljava/lang/Object;
+.source "AppLog.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/app/AppLog$a.smali b/com.discord/smali/com/discord/app/AppLog$a.smali
index 84c6ea1a21..36de6bf489 100644
--- a/com.discord/smali/com/discord/app/AppLog$a.smali
+++ b/com.discord/smali/com/discord/app/AppLog$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppLog$a;
 .super Lkotlin/jvm/internal/k;
+.source "AppLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/app/AppLog$b.smali b/com.discord/smali/com/discord/app/AppLog$b.smali
index 57265b0dbb..258354cf75 100644
--- a/com.discord/smali/com/discord/app/AppLog$b.smali
+++ b/com.discord/smali/com/discord/app/AppLog$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppLog$b;
 .super Lkotlin/jvm/internal/k;
+.source "AppLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -85,22 +86,18 @@
 
     if-eqz v0, :cond_1
 
-    const-string v0, "LOG_CACHE_KEY_USER_EMAIL"
+    const-string v1, "LOG_CACHE_KEY_USER_EMAIL"
 
-    iget-object v1, p0, Lcom/discord/app/AppLog$b;->$userEmail:Ljava/lang/String;
-
-    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     :cond_1
     iget-object v0, p0, Lcom/discord/app/AppLog$b;->$username:Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    const-string v0, "LOG_CACHE_KEY_USER_NAME"
+    const-string v1, "LOG_CACHE_KEY_USER_NAME"
 
-    iget-object v1, p0, Lcom/discord/app/AppLog$b;->$username:Ljava/lang/String;
-
-    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
+    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;->bPm:Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/app/AppLog.smali b/com.discord/smali/com/discord/app/AppLog.smali
index 279799eadd..c860df5b4c 100644
--- a/com.discord/smali/com/discord/app/AppLog.smali
+++ b/com.discord/smali/com/discord/app/AppLog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppLog;
 .super Lcom/discord/utilities/logging/Logger;
+.source "AppLog.kt"
 
 
 # annotations
@@ -40,7 +41,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/a;->Mm()Lrx/subjects/a;
+    invoke-static {}, Lrx/subjects/a;->Ml()Lrx/subjects/a;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/app/AppPermissions$Requests.smali b/com.discord/smali/com/discord/app/AppPermissions$Requests.smali
index 6c84bd77e4..d9220d51e9 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$Requests.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$Requests.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/app/AppPermissions$Requests;
 .super Ljava/lang/Object;
+.source "AppPermissions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/AppPermissions$a.smali b/com.discord/smali/com/discord/app/AppPermissions$a.smali
index 3b70610176..363de2d327 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$a.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppPermissions$a;
 .super Ljava/lang/Object;
+.source "AppPermissions.kt"
 
 
 # annotations
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 aade5f9fa9..fb51bc8e92 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$b$1.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppPermissions$b$1;
 .super Lkotlin/jvm/internal/k;
+.source "AppPermissions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppPermissions$b.smali b/com.discord/smali/com/discord/app/AppPermissions$b.smali
index 5ebf81a676..182f13361f 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$b.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppPermissions$b;
 .super Lkotlin/jvm/internal/k;
+.source "AppPermissions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/AppPermissions$c.smali b/com.discord/smali/com/discord/app/AppPermissions$c.smali
index d273b98e66..459aa898a1 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$c.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppPermissions$c;
 .super Lkotlin/jvm/internal/k;
+.source "AppPermissions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali
index 516a7f3e84..8fb5221e49 100644
--- a/com.discord/smali/com/discord/app/AppPermissions.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppPermissions;
 .super Ljava/lang/Object;
+.source "AppPermissions.kt"
 
 
 # annotations
@@ -343,6 +344,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method private static a([I)Z
diff --git a/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali b/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
index ffd534bf5a..34ee10588a 100644
--- a/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
+++ b/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/AppScrollingViewBehavior$a;
 .super Ljava/lang/Object;
+.source "AppScrollingViewBehavior.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali b/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
index 77a91747e9..82ec9d6ba7 100644
--- a/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
+++ b/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppScrollingViewBehavior;
 .super Lcom/google/android/material/appbar/AppBarLayout$ScrollingViewBehavior;
+.source "AppScrollingViewBehavior.kt"
 
 
 # instance fields
@@ -122,7 +123,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     check-cast p0, Landroidx/recyclerview/widget/RecyclerView;
 
@@ -138,6 +139,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method private final v(I)V
@@ -163,6 +167,8 @@
 
     invoke-static {v0, p1}, Landroidx/core/view/ViewCompat;->setElevation(Landroid/view/View;F)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppTextView.smali b/com.discord/smali/com/discord/app/AppTextView.smali
index 10ef16783a..a480cf4a83 100644
--- a/com.discord/smali/com/discord/app/AppTextView.smali
+++ b/com.discord/smali/com/discord/app/AppTextView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/AppTextView;
 .super Landroidx/appcompat/widget/AppCompatTextView;
+.source "AppTextView.kt"
 
 
 # instance fields
@@ -11,52 +12,34 @@
 
 
 # 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/app/AppTextView;-><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
+    .locals 1
 
-    const/4 v3, 0x0
+    const/4 v0, 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/app/AppTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/discord/app/AppTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.method private synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+    .locals 0
+
+    const/4 p3, 0x0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/app/AppTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
     .locals 5
 
-    const-string v0, "context"
+    const-string p3, "context"
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p3, 0x0
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -68,13 +51,11 @@
 
     sget-object v1, Lcom/discord/R$a;->AppTextView:[I
 
-    const/4 v2, 0x0
-
-    invoke-virtual {p1, p2, v1, p3, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p2, v1, p3, p3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, 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
 
@@ -98,9 +79,9 @@
 
     const/4 p2, 0x1
 
-    invoke-virtual {p1, p2, v2}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
-    move-result p3
+    move-result v0
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
@@ -112,17 +93,15 @@
 
     if-lez p1, :cond_0
 
-    iget p1, p0, Lcom/discord/app/AppTextView;->tQ:I
+    new-array v1, p3, [Ljava/lang/Object;
 
-    new-array v0, v2, [Ljava/lang/Object;
+    invoke-static {v1, p3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
-    invoke-static {v0, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p0}, Lcom/discord/app/AppTextView;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v1
+    move-result-object v2
 
     iget v3, p0, Lcom/discord/app/AppTextView;->tP:I
 
@@ -132,9 +111,9 @@
 
     move-result-object v4
 
-    aput-object v4, p2, v2
+    aput-object v4, p2, p3
 
-    invoke-virtual {v1, v3, p1, p2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v2, v3, p1, p2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -144,15 +123,15 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    array-length p2, v0
+    array-length p2, v1
 
-    invoke-static {v0, p2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v1, p2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object p2
 
-    array-length v0, p2
+    array-length v1, p2
 
-    invoke-static {p2, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {p2, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object p2
 
@@ -169,11 +148,11 @@
     invoke-virtual {p0, p1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_0
-    if-eqz p3, :cond_1
+    if-eqz v0, :cond_1
 
     iget-object p1, p0, Lcom/discord/app/AppTextView;->tR:Ljava/lang/String;
 
-    new-array p2, v2, [Ljava/lang/Object;
+    new-array p2, p3, [Ljava/lang/Object;
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -181,28 +160,6 @@
     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/app/AppTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
 
 # virtual methods
 .method public final varargs a(I[Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/app/AppViewFlipper.smali b/com.discord/smali/com/discord/app/AppViewFlipper.smali
index b6b567b6f5..e57429dd49 100644
--- a/com.discord/smali/com/discord/app/AppViewFlipper.smali
+++ b/com.discord/smali/com/discord/app/AppViewFlipper.smali
@@ -1,16 +1,9 @@
 .class public Lcom/discord/app/AppViewFlipper;
 .super Landroid/widget/ViewFlipper;
+.source "AppViewFlipper.java"
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Landroid/widget/ViewFlipper;-><init>(Landroid/content/Context;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 0
 
diff --git a/com.discord/smali/com/discord/app/a.smali b/com.discord/smali/com/discord/app/a.smali
index f24d3df4bb..05eba20e8c 100644
--- a/com.discord/smali/com/discord/app/a.smali
+++ b/com.discord/smali/com/discord/app/a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/a;
 .super Ljava/lang/Object;
+.source "App.kt"
 
 # interfaces
 .implements Lrx/functions/Action4;
diff --git a/com.discord/smali/com/discord/app/a/a.smali b/com.discord/smali/com/discord/app/a/a.smali
index cc48f0918e..17e5d8ba90 100644
--- a/com.discord/smali/com/discord/app/a/a.smali
+++ b/com.discord/smali/com/discord/app/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/a/a;
 .super Ljava/lang/Object;
+.source "RoutingPatterns.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/app/b$a.smali b/com.discord/smali/com/discord/app/b$a.smali
index 379a274a70..4f7849d7f5 100644
--- a/com.discord/smali/com/discord/app/b$a.smali
+++ b/com.discord/smali/com/discord/app/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/b$a;
 .super Ljava/lang/Object;
+.source "AppEventHandlerActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/b.smali b/com.discord/smali/com/discord/app/b.smali
index 1aeef33168..e32ef8ee21 100644
--- a/com.discord/smali/com/discord/app/b.smali
+++ b/com.discord/smali/com/discord/app/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/app/b;
 .super Lcom/discord/app/h;
+.source "AppEventHandlerActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/d.smali b/com.discord/smali/com/discord/app/d.smali
index 7b888a688f..24ca0c788d 100644
--- a/com.discord/smali/com/discord/app/d.smali
+++ b/com.discord/smali/com/discord/app/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/d;
 .super Ljava/lang/Object;
+.source "AppHelpDesk.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/app/e$a.smali b/com.discord/smali/com/discord/app/e$a.smali
index 4af82ba852..0aeaa59666 100644
--- a/com.discord/smali/com/discord/app/e$a.smali
+++ b/com.discord/smali/com/discord/app/e$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/e$a;
 .super Ljava/lang/Object;
+.source "AppScreen.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/app/e.smali b/com.discord/smali/com/discord/app/e.smali
index eee80bdcaf..f1a46298c6 100644
--- a/com.discord/smali/com/discord/app/e.smali
+++ b/com.discord/smali/com/discord/app/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/e;
 .super Ljava/lang/Object;
+.source "AppScreen.kt"
 
 
 # static fields
@@ -567,6 +568,8 @@
 
     invoke-virtual {p0, p1, p3}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/f.smali b/com.discord/smali/com/discord/app/f.smali
index 3f9b3f9313..0f96c3c022 100644
--- a/com.discord/smali/com/discord/app/f.smali
+++ b/com.discord/smali/com/discord/app/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/f;
 .super Ljava/lang/Object;
+.source "AppToast.kt"
 
 
 # static fields
@@ -94,6 +95,8 @@
 
     invoke-virtual {v0}, Landroid/widget/Toast;->show()V
 
+    return-void
+
     :cond_0
     return-void
 .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 f949f7146e..8286aa10ab 100644
--- a/com.discord/smali/com/discord/app/g$a.smali
+++ b/com.discord/smali/com/discord/app/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$a;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$aa$1.smali b/com.discord/smali/com/discord/app/g$aa$1.smali
index 2ad46b2766..6f8e354861 100644
--- a/com.discord/smali/com/discord/app/g$aa$1.smali
+++ b/com.discord/smali/com/discord/app/g$aa$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$aa$1;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$aa.smali b/com.discord/smali/com/discord/app/g$aa.smali
index 6ce6305ccd..e5436aa6a8 100644
--- a/com.discord/smali/com/discord/app/g$aa.smali
+++ b/com.discord/smali/com/discord/app/g$aa.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$aa;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$ab.smali b/com.discord/smali/com/discord/app/g$ab.smali
index fd6d979c4f..f3f337c5e2 100644
--- a/com.discord/smali/com/discord/app/g$ab.smali
+++ b/com.discord/smali/com/discord/app/g$ab.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/g$ab;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$b.smali b/com.discord/smali/com/discord/app/g$b.smali
index 0d01e1b9e2..390399a380 100644
--- a/com.discord/smali/com/discord/app/g$b.smali
+++ b/com.discord/smali/com/discord/app/g$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$b;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
@@ -69,7 +70,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/app/g$c.smali b/com.discord/smali/com/discord/app/g$c.smali
index 63083b1dd0..d6c9897409 100644
--- a/com.discord/smali/com/discord/app/g$c.smali
+++ b/com.discord/smali/com/discord/app/g$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$c;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -63,7 +64,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     return-object p1
diff --git a/com.discord/smali/com/discord/app/g$d.smali b/com.discord/smali/com/discord/app/g$d.smali
index dc35ec39a5..50423c385c 100644
--- a/com.discord/smali/com/discord/app/g$d.smali
+++ b/com.discord/smali/com/discord/app/g$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$d;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$e$1$1.smali b/com.discord/smali/com/discord/app/g$e$1$1.smali
index 36262660c2..189da8dccf 100644
--- a/com.discord/smali/com/discord/app/g$e$1$1.smali
+++ b/com.discord/smali/com/discord/app/g$e$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$e$1$1;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/app/g$e$1$2.smali b/com.discord/smali/com/discord/app/g$e$1$2.smali
index 66b434a3cc..10a3276cc1 100644
--- a/com.discord/smali/com/discord/app/g$e$1$2.smali
+++ b/com.discord/smali/com/discord/app/g$e$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$e$1$2;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/app/g$e$1$3.smali b/com.discord/smali/com/discord/app/g$e$1$3.smali
index 7d39b20086..babd849648 100644
--- a/com.discord/smali/com/discord/app/g$e$1$3.smali
+++ b/com.discord/smali/com/discord/app/g$e$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$e$1$3;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/app/g$e$1.smali b/com.discord/smali/com/discord/app/g$e$1.smali
index 0cb984052a..7fb9cfa70f 100644
--- a/com.discord/smali/com/discord/app/g$e$1.smali
+++ b/com.discord/smali/com/discord/app/g$e$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$e$1;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/app/g$e.smali b/com.discord/smali/com/discord/app/g$e.smali
index 4615de67a2..7c1d45b2e7 100644
--- a/com.discord/smali/com/discord/app/g$e.smali
+++ b/com.discord/smali/com/discord/app/g$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$e;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
@@ -68,7 +69,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/app/g$f$1.smali b/com.discord/smali/com/discord/app/g$f$1.smali
index d2231a3306..5bce40aaa0 100644
--- a/com.discord/smali/com/discord/app/g$f$1.smali
+++ b/com.discord/smali/com/discord/app/g$f$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$f$1;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/app/g$f.smali b/com.discord/smali/com/discord/app/g$f.smali
index 0a105fb67a..ca752055a6 100644
--- a/com.discord/smali/com/discord/app/g$f.smali
+++ b/com.discord/smali/com/discord/app/g$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$f;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$g.smali b/com.discord/smali/com/discord/app/g$g.smali
index b8f225195e..f95efdca18 100644
--- a/com.discord/smali/com/discord/app/g$g.smali
+++ b/com.discord/smali/com/discord/app/g$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$g;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/g;->p(Z)Lrx/Observable$Transformer;
+    value = Lcom/discord/app/g;->o(Z)Lrx/Observable$Transformer;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/app/g$h.smali b/com.discord/smali/com/discord/app/g$h.smali
index 80468534cf..01ae38f07f 100644
--- a/com.discord/smali/com/discord/app/g$h.smali
+++ b/com.discord/smali/com/discord/app/g$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$h;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$i.smali b/com.discord/smali/com/discord/app/g$i.smali
index 6a705eace4..e9c6915be1 100644
--- a/com.discord/smali/com/discord/app/g$i.smali
+++ b/com.discord/smali/com/discord/app/g$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$i;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$j$1.smali b/com.discord/smali/com/discord/app/g$j$1.smali
index 186f525a4d..71d69d5707 100644
--- a/com.discord/smali/com/discord/app/g$j$1.smali
+++ b/com.discord/smali/com/discord/app/g$j$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$j$1;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/g$j.smali b/com.discord/smali/com/discord/app/g$j.smali
index d4bc625014..8b55055cf7 100644
--- a/com.discord/smali/com/discord/app/g$j.smali
+++ b/com.discord/smali/com/discord/app/g$j.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$j;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$k$1.smali b/com.discord/smali/com/discord/app/g$k$1.smali
index 92cd7c2252..269405cf35 100644
--- a/com.discord/smali/com/discord/app/g$k$1.smali
+++ b/com.discord/smali/com/discord/app/g$k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$k$1;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/g$k.smali b/com.discord/smali/com/discord/app/g$k.smali
index 911c14a735..d98178a91b 100644
--- a/com.discord/smali/com/discord/app/g$k.smali
+++ b/com.discord/smali/com/discord/app/g$k.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$k;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$l.smali b/com.discord/smali/com/discord/app/g$l.smali
index 20817970e0..8448d4d20e 100644
--- a/com.discord/smali/com/discord/app/g$l.smali
+++ b/com.discord/smali/com/discord/app/g$l.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$l;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$m.smali b/com.discord/smali/com/discord/app/g$m.smali
index ef96701c8b..89500e77e6 100644
--- a/com.discord/smali/com/discord/app/g$m.smali
+++ b/com.discord/smali/com/discord/app/g$m.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$m;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$n.smali b/com.discord/smali/com/discord/app/g$n.smali
index 804097ba5f..662faaca31 100644
--- a/com.discord/smali/com/discord/app/g$n.smali
+++ b/com.discord/smali/com/discord/app/g$n.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$n;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$o.smali b/com.discord/smali/com/discord/app/g$o.smali
index de98257e74..8b0c153726 100644
--- a/com.discord/smali/com/discord/app/g$o.smali
+++ b/com.discord/smali/com/discord/app/g$o.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$o;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$p.smali b/com.discord/smali/com/discord/app/g$p.smali
index 1a893aa2a3..08675921c9 100644
--- a/com.discord/smali/com/discord/app/g$p.smali
+++ b/com.discord/smali/com/discord/app/g$p.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$p;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$q.smali b/com.discord/smali/com/discord/app/g$q.smali
index 5d894a9729..7c4cb42639 100644
--- a/com.discord/smali/com/discord/app/g$q.smali
+++ b/com.discord/smali/com/discord/app/g$q.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$q;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$r.smali b/com.discord/smali/com/discord/app/g$r.smali
index 1d60c5b96b..f762661543 100644
--- a/com.discord/smali/com/discord/app/g$r.smali
+++ b/com.discord/smali/com/discord/app/g$r.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$r;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$s.smali b/com.discord/smali/com/discord/app/g$s.smali
index 463cd34eb4..4a75afd9e4 100644
--- a/com.discord/smali/com/discord/app/g$s.smali
+++ b/com.discord/smali/com/discord/app/g$s.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$s;
 .super Lkotlin/jvm/internal/i;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$t$1.smali b/com.discord/smali/com/discord/app/g$t$1.smali
index a82a74ca36..837526fc87 100644
--- a/com.discord/smali/com/discord/app/g$t$1.smali
+++ b/com.discord/smali/com/discord/app/g$t$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$t$1;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -71,7 +72,6 @@
 
     iget-object v0, v0, Lcom/discord/app/g$t;->uu:Lkotlin/jvm/functions/Function1;
 
-    :goto_0
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
@@ -85,5 +85,11 @@
 
     iget-object v0, v0, Lcom/discord/app/g$t;->uv:Lkotlin/jvm/functions/Function1;
 
-    goto :goto_0
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lrx/Observable;
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/g$t.smali b/com.discord/smali/com/discord/app/g$t.smali
index 49bcfe22e3..8d20f81308 100644
--- a/com.discord/smali/com/discord/app/g$t.smali
+++ b/com.discord/smali/com/discord/app/g$t.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$t;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$u.smali b/com.discord/smali/com/discord/app/g$u.smali
index 627b203236..01a332be36 100644
--- a/com.discord/smali/com/discord/app/g$u.smali
+++ b/com.discord/smali/com/discord/app/g$u.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$u;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$v.smali b/com.discord/smali/com/discord/app/g$v.smali
index 9ce082b292..454cbdaf84 100644
--- a/com.discord/smali/com/discord/app/g$v.smali
+++ b/com.discord/smali/com/discord/app/g$v.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$v;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$w.smali b/com.discord/smali/com/discord/app/g$w.smali
index 2ad65f8cb9..c884a2ed7d 100644
--- a/com.discord/smali/com/discord/app/g$w.smali
+++ b/com.discord/smali/com/discord/app/g$w.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$w;
 .super Lkotlin/jvm/internal/k;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/app/g$x.smali b/com.discord/smali/com/discord/app/g$x.smali
index bcd8ccb937..69655e19fd 100644
--- a/com.discord/smali/com/discord/app/g$x.smali
+++ b/com.discord/smali/com/discord/app/g$x.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$x;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
diff --git a/com.discord/smali/com/discord/app/g$y.smali b/com.discord/smali/com/discord/app/g$y.smali
index dd8a62d7e9..d44d340a15 100644
--- a/com.discord/smali/com/discord/app/g$y.smali
+++ b/com.discord/smali/com/discord/app/g$y.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$y;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
@@ -61,7 +62,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/app/g$z$1.smali b/com.discord/smali/com/discord/app/g$z$1.smali
index f2ebbe3667..5dcf8c6f16 100644
--- a/com.discord/smali/com/discord/app/g$z$1.smali
+++ b/com.discord/smali/com/discord/app/g$z$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$z$1;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/app/g$z$2.smali b/com.discord/smali/com/discord/app/g$z$2.smali
index 8094a84381..f58095cc9e 100644
--- a/com.discord/smali/com/discord/app/g$z$2.smali
+++ b/com.discord/smali/com/discord/app/g$z$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$z$2;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -44,6 +45,8 @@
 
     invoke-virtual {v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->unsubscribeFromUpdates()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/g$z.smali b/com.discord/smali/com/discord/app/g$z.smali
index 4216f06d7c..32ba8d1010 100644
--- a/com.discord/smali/com/discord/app/g$z.smali
+++ b/com.discord/smali/com/discord/app/g$z.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/app/g$z;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
 .implements Lrx/Observable$Transformer;
@@ -59,7 +60,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/app/g.smali b/com.discord/smali/com/discord/app/g.smali
index 3d4e2fb2d9..9cc0da1435 100644
--- a/com.discord/smali/com/discord/app/g.smali
+++ b/com.discord/smali/com/discord/app/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/g;
 .super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 
 # static fields
@@ -715,17 +716,14 @@
 
     check-cast p0, Lkotlin/jvm/functions/Function1;
 
-    :goto_0
-    move-object v3, p0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v3, p0
 
-    :goto_1
     const/4 v4, 0x0
 
     const/16 v6, 0x28
@@ -1288,7 +1286,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/discord/app/g;->p(Z)Lrx/Observable$Transformer;
+    invoke-static {v0}, Lcom/discord/app/g;->o(Z)Lrx/Observable$Transformer;
 
     move-result-object v0
 
@@ -1309,7 +1307,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/discord/app/g;->p(Z)Lrx/Observable$Transformer;
+    invoke-static {v0}, Lcom/discord/app/g;->o(Z)Lrx/Observable$Transformer;
 
     move-result-object v0
 
@@ -1405,7 +1403,7 @@
     return-object v0
 .end method
 
-.method public static final p(Z)Lrx/Observable$Transformer;
+.method public static final o(Z)Lrx/Observable$Transformer;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/discord/app/h$a.smali b/com.discord/smali/com/discord/app/h$a.smali
index 5d48e2fb73..04c3d8c3ff 100644
--- a/com.discord/smali/com/discord/app/h$a.smali
+++ b/com.discord/smali/com/discord/app/h$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/h$a;
 .super Ljava/lang/Object;
+.source "AppTransitionActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/h$b.smali b/com.discord/smali/com/discord/app/h$b.smali
index 79cc57c6de..5901b5acdd 100644
--- a/com.discord/smali/com/discord/app/h$b.smali
+++ b/com.discord/smali/com/discord/app/h$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app/h$b;
 .super Ljava/lang/Object;
+.source "AppTransitionActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/h$c.smali b/com.discord/smali/com/discord/app/h$c.smali
index a549240578..60dbbe0eb8 100644
--- a/com.discord/smali/com/discord/app/h$c.smali
+++ b/com.discord/smali/com/discord/app/h$c.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/app/h$c;
 .super Ljava/lang/Enum;
+.source "AppTransitionActivity.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/app/h.smali b/com.discord/smali/com/discord/app/h.smali
index 1a10e7ae52..5e01bc63bf 100644
--- a/com.discord/smali/com/discord/app/h.smali
+++ b/com.discord/smali/com/discord/app/h.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/app/h;
 .super Landroidx/appcompat/app/AppCompatActivity;
+.source "AppTransitionActivity.kt"
 
 
 # annotations
@@ -93,6 +94,8 @@
     :goto_1
     invoke-virtual {p0, v0, p1}, Lcom/discord/app/h;->overridePendingTransition(II)V
 
+    return-void
+
     :cond_5
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app_models/R.smali b/com.discord/smali/com/discord/app_models/R.smali
index b6cdceaa18..47700728de 100644
--- a/com.discord/smali/com/discord/app_models/R.smali
+++ b/com.discord/smali/com/discord/app_models/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app_models/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/app_resources/R.smali b/com.discord/smali/com/discord/app_resources/R.smali
index 663397b71e..67ad2554a8 100644
--- a/com.discord/smali/com/discord/app_resources/R.smali
+++ b/com.discord/smali/com/discord/app_resources/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/app_resources/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$1.smali b/com.discord/smali/com/discord/chipsview/ChipsView$1.smali
index 53a3fdb046..f74553d380 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$1.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$1.smali
@@ -1,13 +1,14 @@
 .class final Lcom/discord/chipsview/ChipsView$1;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/chipsview/ChipsView;->dK()V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/chipsview/ChipsView;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$2.smali b/com.discord/smali/com/discord/chipsview/ChipsView$2.smali
index b4c721c863..ff635848c0 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$2.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$2.smali
@@ -1,13 +1,14 @@
 .class final Lcom/discord/chipsview/ChipsView$2;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 # interfaces
 .implements Landroid/view/View$OnFocusChangeListener;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/chipsview/ChipsView;->dK()V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/chipsview/ChipsView;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$3.smali b/com.discord/smali/com/discord/chipsview/ChipsView$3.smali
index fc0abde58c..80c6e6251d 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$3.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/chipsview/ChipsView$3;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$4.smali b/com.discord/smali/com/discord/chipsview/ChipsView$4.smali
index 708505e4b8..d3da9314e2 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$4.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/chipsview/ChipsView$4;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/chipsview/ChipsView;->q(Z)V
+    value = Lcom/discord/chipsview/ChipsView;->p(Z)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$a.smali b/com.discord/smali/com/discord/chipsview/ChipsView$a.smali
index 5acf142db8..142bddfb87 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$a.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/chipsview/ChipsView$a;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$b.smali b/com.discord/smali/com/discord/chipsview/ChipsView$b.smali
index 842aa99dae..f2795b8679 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$b.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/chipsview/ChipsView$b;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$c.smali b/com.discord/smali/com/discord/chipsview/ChipsView$c.smali
index 77d0aea364..3b18f72e76 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$c.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/chipsview/ChipsView$c;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$d.smali b/com.discord/smali/com/discord/chipsview/ChipsView$d.smali
index aabf7f29ee..bc8b9b663b 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$d.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/chipsview/ChipsView$d;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 # interfaces
 .implements Landroid/text/TextWatcher;
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$e.smali b/com.discord/smali/com/discord/chipsview/ChipsView$e.smali
index 7e243a46e5..8165351c8f 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$e.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/chipsview/ChipsView$e;
 .super Landroid/view/inputmethod/InputConnectionWrapper;
+.source "ChipsView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView$f.smali b/com.discord/smali/com/discord/chipsview/ChipsView$f.smali
index be809b6b61..b2c3ac5aa7 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView$f.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView$f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/chipsview/ChipsView$f;
 .super Ljava/lang/Object;
+.source "ChipsView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/ChipsView.smali b/com.discord/smali/com/discord/chipsview/ChipsView.smali
index ed6229070a..2bf9de6fcb 100644
--- a/com.discord/smali/com/discord/chipsview/ChipsView.smali
+++ b/com.discord/smali/com/discord/chipsview/ChipsView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/chipsview/ChipsView;
 .super Landroid/widget/ScrollView;
+.source "ChipsView.java"
 
 # interfaces
 .implements Lcom/discord/chipsview/b$a;
@@ -109,28 +110,8 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Landroid/widget/ScrollView;-><init>(Landroid/content/Context;)V
-
-    sget p1, Lcom/discord/chipsview/R$b;->drawable_chip_background:I
-
-    iput p1, p0, Lcom/discord/chipsview/ChipsView;->vC:I
-
-    new-instance p1, Ljava/util/LinkedHashMap;
-
-    invoke-direct {p1}, Ljava/util/LinkedHashMap;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/chipsview/ChipsView;->vT:Ljava/util/LinkedHashMap;
-
-    invoke-direct {p0}, Lcom/discord/chipsview/ChipsView;->init()V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
+    .locals 5
 
     invoke-direct {p0, p1, p2}, Landroid/widget/ScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -144,71 +125,6 @@
 
     iput-object v0, p0, Lcom/discord/chipsview/ChipsView;->vT:Ljava/util/LinkedHashMap;
 
-    invoke-direct {p0, p1, p2}, Lcom/discord/chipsview/ChipsView;->a(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    invoke-direct {p0}, Lcom/discord/chipsview/ChipsView;->init()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2, p3}, Landroid/widget/ScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    sget p3, Lcom/discord/chipsview/R$b;->drawable_chip_background:I
-
-    iput p3, p0, Lcom/discord/chipsview/ChipsView;->vC:I
-
-    new-instance p3, Ljava/util/LinkedHashMap;
-
-    invoke-direct {p3}, Ljava/util/LinkedHashMap;-><init>()V
-
-    iput-object p3, p0, Lcom/discord/chipsview/ChipsView;->vT:Ljava/util/LinkedHashMap;
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/chipsview/ChipsView;->a(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    invoke-direct {p0}, Lcom/discord/chipsview/ChipsView;->init()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 0
-    .annotation build Landroid/annotation/TargetApi;
-        value = 0x15
-    .end annotation
-
-    invoke-direct {p0, p1, p2, p3, p4}, Landroid/widget/ScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-
-    sget p3, Lcom/discord/chipsview/R$b;->drawable_chip_background:I
-
-    iput p3, p0, Lcom/discord/chipsview/ChipsView;->vC:I
-
-    new-instance p3, Ljava/util/LinkedHashMap;
-
-    invoke-direct {p3}, Ljava/util/LinkedHashMap;-><init>()V
-
-    iput-object p3, p0, Lcom/discord/chipsview/ChipsView;->vT:Ljava/util/LinkedHashMap;
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/chipsview/ChipsView;->a(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    invoke-direct {p0}, Lcom/discord/chipsview/ChipsView;->init()V
-
-    return-void
-.end method
-
-.method static synthetic a(Lcom/discord/chipsview/ChipsView;)Lcom/discord/chipsview/b;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    return-object p0
-.end method
-
-.method private a(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 5
-
     invoke-virtual {p1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
 
     move-result-object v0
@@ -330,9 +246,9 @@
 
     sget p1, Lcom/discord/chipsview/R$e;->ChipsView_cv_icon_delete:I
 
-    sget v1, Lcom/discord/chipsview/R$b;->drawable_chip_delete:I
+    sget v3, Lcom/discord/chipsview/R$b;->drawable_chip_delete:I
 
-    invoke-virtual {p2, p1, v1}, Landroid/content/res/TypedArray;->getResourceId(II)I
+    invoke-virtual {p2, p1, v3}, Landroid/content/res/TypedArray;->getResourceId(II)I
 
     move-result p1
 
@@ -372,6 +288,212 @@
 
     invoke-virtual {p2}, Landroid/content/res/TypedArray;->recycle()V
 
+    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
+
+    move-result-object p1
+
+    iget p1, p1, Landroid/util/DisplayMetrics;->density:F
+
+    iput p1, p0, Lcom/discord/chipsview/ChipsView;->vP:F
+
+    new-instance p1, Landroid/widget/RelativeLayout;
+
+    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
+
+    iput-object p1, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
+
+    invoke-virtual {p0, p1}, Lcom/discord/chipsview/ChipsView;->addView(Landroid/view/View;)V
+
+    new-instance p1, Landroid/widget/LinearLayout;
+
+    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
+
+    new-instance p2, Landroid/view/ViewGroup$LayoutParams;
+
+    invoke-direct {p2, v2, v2}, Landroid/view/ViewGroup$LayoutParams;-><init>(II)V
+
+    invoke-virtual {p1, p2}, Landroid/widget/LinearLayout;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    const/4 p2, 0x1
+
+    invoke-virtual {p1, p2}, Landroid/widget/LinearLayout;->setFocusable(Z)V
+
+    invoke-virtual {p1, p2}, Landroid/widget/LinearLayout;->setFocusableInTouchMode(Z)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
+
+    invoke-virtual {v0, p1}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
+
+    new-instance p1, Lcom/discord/chipsview/b;
+
+    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0, p0}, Lcom/discord/chipsview/b;-><init>(Landroid/content/Context;Lcom/discord/chipsview/b$a;)V
+
+    iput-object p1, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    const/high16 p1, 0x41c00000    # 24.0f
+
+    iget v0, p0, Lcom/discord/chipsview/ChipsView;->vP:F
+
+    mul-float v0, v0, p1
+
+    iget p1, p0, Lcom/discord/chipsview/ChipsView;->vD:I
+
+    int-to-float p1, p1
+
+    add-float/2addr v0, p1
+
+    float-to-int p1, v0
+
+    new-instance v0, Landroid/widget/RelativeLayout$LayoutParams;
+
+    invoke-direct {v0, v1, p1}, Landroid/widget/RelativeLayout$LayoutParams;-><init>(II)V
+
+    const/high16 v3, 0x40a00000    # 5.0f
+
+    iget v4, p0, Lcom/discord/chipsview/ChipsView;->vP:F
+
+    mul-float v4, v4, v3
+
+    float-to-int v3, v4
+
+    iput v3, v0, Landroid/widget/RelativeLayout$LayoutParams;->leftMargin:I
+
+    const/16 v3, 0xc
+
+    invoke-virtual {v0, v3, v1}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
+
+    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    invoke-virtual {v3, v0}, Lcom/discord/chipsview/b;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    iget v3, p0, Lcom/discord/chipsview/ChipsView;->vD:I
+
+    invoke-virtual {v0, v2, v2, v2, v3}, Lcom/discord/chipsview/b;->setPadding(IIII)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    invoke-static {v2, v2, v2, v2}, Landroid/graphics/Color;->argb(IIII)I
+
+    move-result v3
+
+    invoke-virtual {v0, v3}, Lcom/discord/chipsview/b;->setBackgroundColor(I)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    const/high16 v3, 0x10000000
+
+    invoke-virtual {v0, v3}, Lcom/discord/chipsview/b;->setImeOptions(I)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    invoke-virtual {v0, p2}, Lcom/discord/chipsview/b;->setInputType(I)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    iget v3, p0, Lcom/discord/chipsview/ChipsView;->vM:I
+
+    invoke-virtual {v0, v3}, Lcom/discord/chipsview/b;->setTextColor(I)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    iget v3, p0, Lcom/discord/chipsview/ChipsView;->vN:F
+
+    invoke-virtual {v0, v2, v3}, Lcom/discord/chipsview/b;->setTextSize(IF)V
+
+    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
+
+    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    invoke-virtual {v0, v3}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
+
+    new-instance v0, Lcom/discord/chipsview/c;
+
+    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    invoke-direct {v0, v3, p1}, Lcom/discord/chipsview/c;-><init>(Landroid/content/Context;I)V
+
+    iput-object v0, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
+
+    invoke-virtual {p1, p2}, Lcom/discord/chipsview/c;->setOrientation(I)V
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
+
+    new-instance p2, Landroid/view/ViewGroup$LayoutParams;
+
+    const/4 v0, -0x2
+
+    invoke-direct {p2, v1, v0}, Landroid/view/ViewGroup$LayoutParams;-><init>(II)V
+
+    invoke-virtual {p1, p2}, Lcom/discord/chipsview/c;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
+
+    const/high16 p2, 0x40800000    # 4.0f
+
+    iget v0, p0, Lcom/discord/chipsview/ChipsView;->vP:F
+
+    mul-float v0, v0, p2
+
+    float-to-int p2, v0
+
+    invoke-virtual {p1, v2, p2, v2, v2}, Lcom/discord/chipsview/c;->setPadding(IIII)V
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
+
+    iget-object p2, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
+
+    invoke-virtual {p1, p2}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
+
+    new-instance p2, Lcom/discord/chipsview/ChipsView$1;
+
+    invoke-direct {p2, p0}, Lcom/discord/chipsview/ChipsView$1;-><init>(Lcom/discord/chipsview/ChipsView;)V
+
+    invoke-virtual {p1, p2}, Landroid/widget/RelativeLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    new-instance p2, Lcom/discord/chipsview/ChipsView$d;
+
+    invoke-direct {p2, p0, v2}, Lcom/discord/chipsview/ChipsView$d;-><init>(Lcom/discord/chipsview/ChipsView;B)V
+
+    invoke-virtual {p1, p2}, Lcom/discord/chipsview/b;->addTextChangedListener(Landroid/text/TextWatcher;)V
+
+    iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    new-instance p2, Lcom/discord/chipsview/ChipsView$2;
+
+    invoke-direct {p2, p0}, Lcom/discord/chipsview/ChipsView$2;-><init>(Lcom/discord/chipsview/ChipsView;)V
+
+    invoke-virtual {p1, p2}, Lcom/discord/chipsview/b;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
+
+    invoke-direct {p0, v2}, Lcom/discord/chipsview/ChipsView;->p(Z)V
+
     return-void
 
     :catchall_0
@@ -382,10 +504,18 @@
     throw p1
 .end method
 
+.method static synthetic a(Lcom/discord/chipsview/ChipsView;)Lcom/discord/chipsview/b;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
+
+    return-object p0
+.end method
+
 .method static synthetic a(Lcom/discord/chipsview/ChipsView;Z)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/chipsview/ChipsView;->q(Z)V
+    invoke-direct {p0, p1}, Lcom/discord/chipsview/ChipsView;->p(Z)V
 
     return-void
 .end method
@@ -512,238 +642,12 @@
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0, v2}, Lcom/discord/chipsview/ChipsView;->q(Z)V
+    invoke-direct {p0, v2}, Lcom/discord/chipsview/ChipsView;->p(Z)V
 
     return-void
 .end method
 
-.method private dK()V
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
-
-    new-instance v1, Lcom/discord/chipsview/ChipsView$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/chipsview/ChipsView$1;-><init>(Lcom/discord/chipsview/ChipsView;)V
-
-    invoke-virtual {v0, v1}, Landroid/widget/RelativeLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    new-instance v1, Lcom/discord/chipsview/ChipsView$d;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v1, p0, v2}, Lcom/discord/chipsview/ChipsView$d;-><init>(Lcom/discord/chipsview/ChipsView;B)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/chipsview/b;->addTextChangedListener(Landroid/text/TextWatcher;)V
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    new-instance v1, Lcom/discord/chipsview/ChipsView$2;
-
-    invoke-direct {v1, p0}, Lcom/discord/chipsview/ChipsView$2;-><init>(Lcom/discord/chipsview/ChipsView;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/chipsview/b;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
-
-    return-void
-.end method
-
-.method private init()V
-    .locals 7
-
-    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
-
-    move-result-object v0
-
-    iget v0, v0, Landroid/util/DisplayMetrics;->density:F
-
-    iput v0, p0, Lcom/discord/chipsview/ChipsView;->vP:F
-
-    new-instance v0, Landroid/widget/RelativeLayout;
-
-    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
-
-    iput-object v0, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
-
-    invoke-virtual {p0, v0}, Lcom/discord/chipsview/ChipsView;->addView(Landroid/view/View;)V
-
-    new-instance v0, Landroid/widget/LinearLayout;
-
-    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
-
-    new-instance v1, Landroid/view/ViewGroup$LayoutParams;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v1, v2, v2}, Landroid/view/ViewGroup$LayoutParams;-><init>(II)V
-
-    invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setFocusable(Z)V
-
-    invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setFocusableInTouchMode(Z)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
-
-    invoke-virtual {v3, v0}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
-
-    new-instance v0, Lcom/discord/chipsview/b;
-
-    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
-
-    move-result-object v3
-
-    invoke-direct {v0, v3, p0}, Lcom/discord/chipsview/b;-><init>(Landroid/content/Context;Lcom/discord/chipsview/b$a;)V
-
-    iput-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    iget v0, p0, Lcom/discord/chipsview/ChipsView;->vP:F
-
-    const/high16 v3, 0x41c00000    # 24.0f
-
-    mul-float v0, v0, v3
-
-    iget v3, p0, Lcom/discord/chipsview/ChipsView;->vD:I
-
-    int-to-float v3, v3
-
-    add-float/2addr v0, v3
-
-    float-to-int v0, v0
-
-    new-instance v3, Landroid/widget/RelativeLayout$LayoutParams;
-
-    const/4 v4, -0x1
-
-    invoke-direct {v3, v4, v0}, Landroid/widget/RelativeLayout$LayoutParams;-><init>(II)V
-
-    iget v5, p0, Lcom/discord/chipsview/ChipsView;->vP:F
-
-    const/high16 v6, 0x40a00000    # 5.0f
-
-    mul-float v5, v5, v6
-
-    float-to-int v5, v5
-
-    iput v5, v3, Landroid/widget/RelativeLayout$LayoutParams;->leftMargin:I
-
-    const/16 v5, 0xc
-
-    invoke-virtual {v3, v5, v4}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
-
-    iget-object v5, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    invoke-virtual {v5, v3}, Lcom/discord/chipsview/b;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    iget v5, p0, Lcom/discord/chipsview/ChipsView;->vD:I
-
-    invoke-virtual {v3, v2, v2, v2, v5}, Lcom/discord/chipsview/b;->setPadding(IIII)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    invoke-static {v2, v2, v2, v2}, Landroid/graphics/Color;->argb(IIII)I
-
-    move-result v5
-
-    invoke-virtual {v3, v5}, Lcom/discord/chipsview/b;->setBackgroundColor(I)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    const/high16 v5, 0x10000000
-
-    invoke-virtual {v3, v5}, Lcom/discord/chipsview/b;->setImeOptions(I)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    invoke-virtual {v3, v1}, Lcom/discord/chipsview/b;->setInputType(I)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    iget v5, p0, Lcom/discord/chipsview/ChipsView;->vM:I
-
-    invoke-virtual {v3, v5}, Lcom/discord/chipsview/b;->setTextColor(I)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    iget v5, p0, Lcom/discord/chipsview/ChipsView;->vN:F
-
-    invoke-virtual {v3, v2, v5}, Lcom/discord/chipsview/b;->setTextSize(IF)V
-
-    iget-object v3, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
-
-    iget-object v5, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    invoke-virtual {v3, v5}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
-
-    new-instance v3, Lcom/discord/chipsview/c;
-
-    invoke-virtual {p0}, Lcom/discord/chipsview/ChipsView;->getContext()Landroid/content/Context;
-
-    move-result-object v5
-
-    invoke-direct {v3, v5, v0}, Lcom/discord/chipsview/c;-><init>(Landroid/content/Context;I)V
-
-    iput-object v3, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
-
-    invoke-virtual {v0, v1}, Lcom/discord/chipsview/c;->setOrientation(I)V
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
-
-    new-instance v1, Landroid/view/ViewGroup$LayoutParams;
-
-    const/4 v3, -0x2
-
-    invoke-direct {v1, v4, v3}, Landroid/view/ViewGroup$LayoutParams;-><init>(II)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/chipsview/c;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
-
-    iget v1, p0, Lcom/discord/chipsview/ChipsView;->vP:F
-
-    const/high16 v3, 0x40800000    # 4.0f
-
-    mul-float v1, v1, v3
-
-    float-to-int v1, v1
-
-    invoke-virtual {v0, v2, v1, v2, v2}, Lcom/discord/chipsview/c;->setPadding(IIII)V
-
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vQ:Landroid/widget/RelativeLayout;
-
-    iget-object v1, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
-
-    invoke-virtual {v0, v1}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
-
-    invoke-direct {p0}, Lcom/discord/chipsview/ChipsView;->dK()V
-
-    invoke-direct {p0, v2}, Lcom/discord/chipsview/ChipsView;->q(Z)V
-
-    return-void
-.end method
-
-.method private q(Z)V
+.method private p(Z)V
     .locals 2
 
     iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vS:Lcom/discord/chipsview/c;
@@ -777,9 +681,7 @@
 
     iget-object p1, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
 
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vR:Lcom/discord/chipsview/b;
-
-    invoke-virtual {v0}, Lcom/discord/chipsview/b;->length()I
+    invoke-virtual {p1}, Lcom/discord/chipsview/b;->length()I
 
     move-result v0
 
@@ -802,8 +704,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/chipsview/ChipsView;->vU:Ljava/lang/Object;
-
     invoke-interface {v0, v1}, Landroid/text/Spannable;->removeSpan(Ljava/lang/Object;)V
 
     :cond_0
@@ -932,7 +832,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {v8, v0}, Lcom/discord/chipsview/ChipsView;->q(Z)V
+    invoke-direct {v8, v0}, Lcom/discord/chipsview/ChipsView;->p(Z)V
 
     new-instance v0, Lcom/discord/chipsview/ChipsView$3;
 
@@ -956,8 +856,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v8, Lcom/discord/chipsview/ChipsView;->vU:Ljava/lang/Object;
-
     invoke-interface {v0, v1}, Landroid/text/Spannable;->removeSpan(Ljava/lang/Object;)V
 
     :cond_1
@@ -1004,14 +902,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/chipsview/ChipsView;->vW:Lcom/discord/chipsview/ChipsView$b;
-
     iget-object p1, p1, Lcom/discord/chipsview/a;->vh:Lcom/discord/chipsview/ChipsView$c;
 
     invoke-interface {v0, p1}, Lcom/discord/chipsview/ChipsView$b;->onChipDeleted(Lcom/discord/chipsview/ChipsView$c;)V
 
     :cond_0
-    invoke-direct {p0, v1}, Lcom/discord/chipsview/ChipsView;->q(Z)V
+    invoke-direct {p0, v1}, Lcom/discord/chipsview/ChipsView;->p(Z)V
 
     return-void
 
@@ -1020,7 +916,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lcom/discord/chipsview/ChipsView;->q(Z)V
+    invoke-direct {p0, p1}, Lcom/discord/chipsview/ChipsView;->p(Z)V
 
     return-void
 .end method
@@ -1082,7 +978,7 @@
     :cond_1
     if-eqz v1, :cond_2
 
-    invoke-direct {p0, v3}, Lcom/discord/chipsview/ChipsView;->q(Z)V
+    invoke-direct {p0, v3}, Lcom/discord/chipsview/ChipsView;->p(Z)V
 
     :cond_2
     return-void
diff --git a/com.discord/smali/com/discord/chipsview/R$a.smali b/com.discord/smali/com/discord/chipsview/R$a.smali
index dbc4885df5..9763fed9e0 100644
--- a/com.discord/smali/com/discord/chipsview/R$a.smali
+++ b/com.discord/smali/com/discord/chipsview/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/R$b.smali b/com.discord/smali/com/discord/chipsview/R$b.smali
index 1f42c475e2..0dbaece8df 100644
--- a/com.discord/smali/com/discord/chipsview/R$b.smali
+++ b/com.discord/smali/com/discord/chipsview/R$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/R$b;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/R$c.smali b/com.discord/smali/com/discord/chipsview/R$c.smali
index 7d69c4f2e7..47bf66e6ae 100644
--- a/com.discord/smali/com/discord/chipsview/R$c.smali
+++ b/com.discord/smali/com/discord/chipsview/R$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/R$c;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/R$d.smali b/com.discord/smali/com/discord/chipsview/R$d.smali
index fc05499ef5..4d7433b672 100644
--- a/com.discord/smali/com/discord/chipsview/R$d.smali
+++ b/com.discord/smali/com/discord/chipsview/R$d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/R$d;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/R$e.smali b/com.discord/smali/com/discord/chipsview/R$e.smali
index ba92660a58..2ada9d0992 100644
--- a/com.discord/smali/com/discord/chipsview/R$e.smali
+++ b/com.discord/smali/com/discord/chipsview/R$e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/R$e;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/R.smali b/com.discord/smali/com/discord/chipsview/R.smali
index ae7429abe1..75597eacdf 100644
--- a/com.discord/smali/com/discord/chipsview/R.smali
+++ b/com.discord/smali/com/discord/chipsview/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/a$1.smali b/com.discord/smali/com/discord/chipsview/a$1.smali
index 64b7188c6a..a143e4c38e 100644
--- a/com.discord/smali/com/discord/chipsview/a$1.smali
+++ b/com.discord/smali/com/discord/chipsview/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/chipsview/a$1;
 .super Ljava/lang/Object;
+.source "Chip.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/chipsview/a$a.smali b/com.discord/smali/com/discord/chipsview/a$a.smali
index 2ebc87f4b4..530eff8828 100644
--- a/com.discord/smali/com/discord/chipsview/a$a.smali
+++ b/com.discord/smali/com/discord/chipsview/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/a$a;
 .super Ljava/lang/Object;
+.source "Chip.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/a.smali b/com.discord/smali/com/discord/chipsview/a.smali
index d7f8153f72..ffabca7452 100644
--- a/com.discord/smali/com/discord/chipsview/a.smali
+++ b/com.discord/smali/com/discord/chipsview/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/a;
 .super Ljava/lang/Object;
+.source "Chip.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/chipsview/b$a.smali b/com.discord/smali/com/discord/chipsview/b$a.smali
index 4d3c5060d6..aac5d4c5ce 100644
--- a/com.discord/smali/com/discord/chipsview/b$a.smali
+++ b/com.discord/smali/com/discord/chipsview/b$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/chipsview/b$a;
 .super Ljava/lang/Object;
+.source "ChipsEditText.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/b.smali b/com.discord/smali/com/discord/chipsview/b.smali
index a8fde920c1..b7a131b557 100644
--- a/com.discord/smali/com/discord/chipsview/b.smali
+++ b/com.discord/smali/com/discord/chipsview/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/b;
 .super Landroidx/appcompat/widget/AppCompatEditText;
+.source "ChipsEditText.java"
 
 
 # annotations
@@ -34,8 +35,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/chipsview/b;->vy:Lcom/discord/chipsview/b$a;
-
     invoke-super {p0, p1}, Landroidx/appcompat/widget/AppCompatEditText;->onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 
     move-result-object p1
diff --git a/com.discord/smali/com/discord/chipsview/c$a.smali b/com.discord/smali/com/discord/chipsview/c$a.smali
index 3a959e26ba..a6bed126fc 100644
--- a/com.discord/smali/com/discord/chipsview/c$a.smali
+++ b/com.discord/smali/com/discord/chipsview/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/c$a;
 .super Ljava/lang/Object;
+.source "ChipsVerticalLinearLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/chipsview/c.smali b/com.discord/smali/com/discord/chipsview/c.smali
index 590aec6727..c43d021f85 100644
--- a/com.discord/smali/com/discord/chipsview/c.smali
+++ b/com.discord/smali/com/discord/chipsview/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/chipsview/c;
 .super Landroid/widget/LinearLayout;
+.source "ChipsVerticalLinearLayout.java"
 
 
 # annotations
@@ -348,7 +349,7 @@
 
     move-result-object v10
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fN()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v11
 
@@ -427,7 +428,7 @@
     iput-object v8, v12, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ML:Lcom/facebook/imagepipeline/a/e;
 
     :cond_7
-    invoke-virtual {v12}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v12}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v8
 
@@ -437,7 +438,7 @@
 
     check-cast v8, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v8}, Lcom/facebook/drawee/backends/pipeline/e;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v8}, Lcom/facebook/drawee/backends/pipeline/e;->gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v8
 
diff --git a/com.discord/smali/com/discord/gateway/BuildConfig.smali b/com.discord/smali/com/discord/gateway/BuildConfig.smali
index aee76dc21f..a815dac96d 100644
--- a/com.discord/smali/com/discord/gateway/BuildConfig.smali
+++ b/com.discord/smali/com/discord/gateway/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
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 9504f74839..531459afb6 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewayDiscovery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
index 4dfa76fb9a..c54d17abbc 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewayDiscovery$Cache;
 .super Ljava/lang/Object;
+.source "GatewayDiscovery.kt"
 
 
 # annotations
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 f9d3dae9a0..7c25122dcc 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewayDiscovery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 af12ba726c..1a6580a261 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2;
 .super Lkotlin/jvm/internal/k;
+.source "GatewayDiscovery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 acb5e17d70..0fd2a1c52c 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3;
 .super Lkotlin/jvm/internal/i;
+.source "GatewayDiscovery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 042c564b7f..8c0a1b9ac7 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4;
 .super Lkotlin/jvm/internal/i;
+.source "GatewayDiscovery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali
index 511c07822e..0a58f86461 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0;
 .super Ljava/lang/Object;
+.source "GatewayDiscovery.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali
index 289ef40a63..e5f409bc4e 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/GatewayDiscovery;
 .super Ljava/lang/Object;
+.source "GatewayDiscovery.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/GatewayEventHandler.smali b/com.discord/smali/com/discord/gateway/GatewayEventHandler.smali
index b6608dded1..cf0b342d5f 100644
--- a/com.discord/smali/com/discord/gateway/GatewayEventHandler.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayEventHandler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/gateway/GatewayEventHandler;
 .super Ljava/lang/Object;
+.source "GatewayEventHandler.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
index e92f84dacd..058fdbe5b8 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali
index 06786a6844..ea21edf3f0 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$2;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
index f12ab12588..8948a4c431 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$3;
 .super Lkotlin/jvm/internal/i;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$Companion.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$Companion.smali
index 97b7e5faf2..0903c9a6c9 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$Companion.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/GatewaySocket$Companion;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 
 # annotations
@@ -55,8 +56,6 @@
     move-result-wide v0
 
     :goto_0
-    const/4 p3, 0x0
-
     sub-long/2addr v0, p1
 
     return-wide v0
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali
index 0989a2bd6c..1972f74b6c 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/GatewaySocket$IdentifyData;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$1.smali
index ab6cea6f67..b9f02656c2 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$Timer$postInterval$1;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$2.smali
index 097158f452..23ccf7b6c7 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$postInterval$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$Timer$postInterval$2;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$1.smali
index 2a3f5fbf2d..2a99805279 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$Timer$schedule$1;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$2.smali
index d9227b7142..62ed8284e6 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer$schedule$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$Timer$schedule$2;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali
index 0ab49dce4e..5e4184acaa 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$Timer;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/networking/Backoff$Scheduler;
@@ -95,8 +96,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$Timer;->subscription:Lrx/Subscription;
-
     if-eqz v0, :cond_0
 
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
@@ -110,6 +109,8 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
+    return-void
+
     :cond_1
     return-void
 .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 345f228f68..f65bb52470 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$callConnect$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 d8c4f6a871..ff371230a0 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$close$1$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$close$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$close$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 bd1e081f8b..7cb152b243 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$close$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 0653f16474..895b803139 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0e52fc2714..2812e3a0f8 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 17fd8a96ac..22536ceecd 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 316862d711..1199395851 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a10053a9bf..bab983ba12 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 32d09fbd5b..e118dbbd50 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$2;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 23b0fc6f14..b3f5f9ad8a 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$3;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 4d87e64d62..b135489e05 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$connect$4;
 .super Lkotlin/jvm/internal/i;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
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 c9df79f8e0..fd24482d5d 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$discover$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -66,9 +67,7 @@
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$discover$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
-    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$discover$1;->this$0:Lcom/discord/gateway/GatewaySocket;
-
-    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getGatewayUrlTransform$p(Lcom/discord/gateway/GatewaySocket;)Lkotlin/jvm/functions/Function1;
+    invoke-static {v0}, Lcom/discord/gateway/GatewaySocket;->access$getGatewayUrlTransform$p(Lcom/discord/gateway/GatewaySocket;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v1
 
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 55e3e3d690..0e9107695f 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$discover$2;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e94d0bd4cf..e1f6abd658 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discoveryFailed$delay$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discoveryFailed$delay$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$discoveryFailed$delay$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 80623b112e..f651ddb969 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 bc9ed477eb..e59e32b5b4 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 1cdd2a6e95..86d9d0b02a 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -143,9 +144,7 @@
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
-    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;->this$0:Lcom/discord/gateway/GatewaySocket;
-
-    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getSeq$p(Lcom/discord/gateway/GatewaySocket;)I
+    invoke-static {v0}, Lcom/discord/gateway/GatewaySocket;->access$getSeq$p(Lcom/discord/gateway/GatewaySocket;)I
 
     move-result v1
 
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 9be583c56e..306565d8c7 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$handleClose$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 957621a271..e3183232fc 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$delay$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$delay$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$handleClose$delay$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 43b8c22e02..dea93c3385 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$handleHeartbeatAck$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 bfbc7faedf..348aad2fd4 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 663ff376ef..bc0e7d24cb 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 fde00899c9..bef084795c 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$handleReconnect$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7089bdd9e8..5e13cc8ac7 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$incomingParser$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$incomingParser$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$incomingParser$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$pingVoiceServer$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$pingVoiceServer$1.smali
index ecc4799373..a9b5b82931 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$pingVoiceServer$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$pingVoiceServer$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$pingVoiceServer$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1$1.smali
new file mode 100644
index 0000000000..24fa5515e4
--- /dev/null
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1$1.smali
@@ -0,0 +1,87 @@
+.class final Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;
+.super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->invoke()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/k;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/models/domain/ModelPresence$Activity;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;
+
+    invoke-direct {v0}, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;-><init>()V
+
+    sput-object v0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;->INSTANCE:Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/k;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;->invoke(Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "it.name"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    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 ea2da5610f..1874b9d5a3 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/gateway/GatewaySocket;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)V
+    value = Lcom/discord/gateway/GatewaySocket;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field final synthetic $activity:Lcom/discord/models/domain/ModelPresence$Activity;
+.field final synthetic $activities:Ljava/util/List;
 
 .field final synthetic $afk:Ljava/lang/Boolean;
 
@@ -38,14 +39,14 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Long;Ljava/lang/Boolean;)V
+.method constructor <init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/Long;Ljava/lang/Boolean;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
     iput-object p2, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$status:Ljava/lang/Integer;
 
-    iput-object p3, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p3, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activities:Ljava/util/List;
 
     iput-object p4, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$since:Ljava/lang/Long;
 
@@ -71,7 +72,7 @@
 .end method
 
 .method public final invoke()V
-    .locals 8
+    .locals 12
 
     sget-object v0, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
 
@@ -95,11 +96,33 @@
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iget-object v3, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activities:Ljava/util/List;
 
     if-eqz v3, :cond_0
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+    move-object v4, v3
+
+    check-cast v4, Ljava/lang/Iterable;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    sget-object v3, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;->INSTANCE:Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;
+
+    move-object v10, v3
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    const/16 v11, 0x1f
+
+    invoke-static/range {v4 .. v11}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -111,10 +134,6 @@
     :goto_0
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/16 v3, 0x2e
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v2
@@ -127,53 +146,46 @@
 
     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 v0, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iget-object v6, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
-    if-eqz v0, :cond_1
+    new-instance v7, Lcom/discord/gateway/io/Outgoing;
 
-    invoke-static {v0}, Lkotlin/a/l;->by(Ljava/lang/Object;)Ljava/util/List;
+    const/4 v0, 0x3
 
-    move-result-object v0
+    new-instance v1, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;
 
-    if-nez v0, :cond_2
+    iget-object v2, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$status:Ljava/lang/Integer;
+
+    invoke-static {v2}, Lcom/discord/models/domain/ModelPresence;->getStatusString(Ljava/lang/Integer;)Ljava/lang/String;
+
+    move-result-object v2
+
+    iget-object v3, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$since:Ljava/lang/Long;
+
+    iget-object v4, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activities:Ljava/util/List;
+
+    if-nez v4, :cond_1
+
+    sget-object v4, Lkotlin/a/x;->bPB:Lkotlin/a/x;
+
+    check-cast v4, Ljava/util/List;
 
     :cond_1
-    sget-object v0, Lkotlin/a/x;->bPB:Lkotlin/a/x;
+    iget-object v5, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$afk:Ljava/lang/Boolean;
 
-    check-cast v0, Ljava/util/List;
+    invoke-direct {v1, v2, v3, v4, v5}, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
 
-    :cond_2
-    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+    invoke-direct {v7, v0, v1}, Lcom/discord/gateway/io/Outgoing;-><init>(ILjava/lang/Object;)V
 
-    new-instance v2, Lcom/discord/gateway/io/Outgoing;
+    const/4 v8, 0x0
 
-    const/4 v3, 0x3
+    const/4 v9, 0x0
 
-    new-instance v4, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;
+    const/4 v10, 0x6
 
-    iget-object v5, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$status:Ljava/lang/Integer;
+    const/4 v11, 0x0
 
-    invoke-static {v5}, Lcom/discord/models/domain/ModelPresence;->getStatusString(Ljava/lang/Integer;)Ljava/lang/String;
-
-    move-result-object v5
-
-    iget-object v6, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$since:Ljava/lang/Long;
-
-    iget-object v7, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$afk:Ljava/lang/Boolean;
-
-    invoke-direct {v4, v5, v6, v0, v7}, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
-
-    invoke-direct {v2, v3, v4}, Lcom/discord/gateway/io/Outgoing;-><init>(ILjava/lang/Object;)V
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x6
-
-    const/4 v6, 0x0
-
-    invoke-static/range {v1 .. v6}, Lcom/discord/gateway/GatewaySocket;->send$default(Lcom/discord/gateway/GatewaySocket;Lcom/discord/gateway/io/Outgoing;ZLcom/google/gson/Gson;ILjava/lang/Object;)V
+    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$requestGuildMembers$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
index 321732d8e6..e65936eefa 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$requestGuildMembers$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$2.smali
index d6b80c85fa..0185706aaa 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$requestGuildMembers$2;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali
index 49c5be0505..304a68bddf 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$1.smali
index 1ece04b2ab..2518856a0d 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$schedule$1;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$2.smali
index 2eaec20c0b..9376e75448 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$schedule$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$schedule$2;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 5d61c4ab3e..6630d3b093 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$startHeartbeater$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -73,9 +74,7 @@
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$startHeartbeater$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
-    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$startHeartbeater$1;->this$0:Lcom/discord/gateway/GatewaySocket;
-
-    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getSeq$p(Lcom/discord/gateway/GatewaySocket;)I
+    invoke-static {v0}, Lcom/discord/gateway/GatewaySocket;->access$getSeq$p(Lcom/discord/gateway/GatewaySocket;)I
 
     move-result v1
 
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 d7b82bb840..cbec63ff6f 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/GatewaySocket$voiceStateUpdate$1;
 .super Lkotlin/jvm/internal/k;
+.source "GatewaySocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket.smali b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
index 634c8b46a1..f852a65e0b 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/GatewaySocket;
 .super Ljava/lang/Object;
+.source "GatewaySocket.kt"
 
 
 # annotations
@@ -154,7 +155,7 @@
 
     iput-boolean v1, v0, Lcom/google/gson/f;->serializeNulls:Z
 
-    invoke-virtual {v0}, Lcom/google/gson/f;->CL()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->CK()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -164,7 +165,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/f;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/gson/f;->CL()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->CK()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -374,7 +375,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
@@ -1600,6 +1601,8 @@
 
     invoke-interface {p2, p1}, Lcom/discord/gateway/GatewayEventHandler;->handleConnectionReady(Z)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -2598,7 +2601,7 @@
     return-void
 .end method
 
-.method public static synthetic presenceUpdate$default(Lcom/discord/gateway/GatewaySocket;Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;ILjava/lang/Object;)V
+.method public static synthetic presenceUpdate$default(Lcom/discord/gateway/GatewaySocket;Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)V
     .locals 2
 
     and-int/lit8 p6, p5, 0x2
@@ -2628,7 +2631,7 @@
     sget-object p4, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
     :cond_2
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/gateway/GatewaySocket;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)V
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/gateway/GatewaySocket;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
 
     return-void
 .end method
@@ -2851,8 +2854,6 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lcom/discord/gateway/GatewaySocket;->webSocket:Lcom/discord/utilities/websocket/WebSocket;
-
     if-eqz p2, :cond_2
 
     invoke-virtual {p3, p1}, Lcom/google/gson/Gson;->toJson(Ljava/lang/Object;)Ljava/lang/String;
@@ -3071,8 +3072,21 @@
     return-void
 .end method
 
-.method public final presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)V
+.method public final presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
     .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;",
+            "Ljava/lang/Boolean;",
+            ")V"
+        }
+    .end annotation
 
     new-instance v6, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;
 
@@ -3088,7 +3102,7 @@
 
     move-object v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;-><init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Long;Ljava/lang/Boolean;)V
+    invoke-direct/range {v0 .. v5}, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;-><init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/Long;Ljava/lang/Boolean;)V
 
     check-cast v6, Lkotlin/jvm/functions/Function0;
 
@@ -3229,17 +3243,14 @@
 
     move-result-object v5
 
-    :goto_0
-    move-object v11, v5
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v5, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v11, v5
 
-    :goto_1
     invoke-virtual/range {p3 .. p3}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;->getChannels()Ljava/util/Map;
 
     move-result-object v12
diff --git a/com.discord/smali/com/discord/gateway/R$anim.smali b/com.discord/smali/com/discord/gateway/R$anim.smali
index 1a272a3d67..77b1a3362d 100644
--- a/com.discord/smali/com/discord/gateway/R$anim.smali
+++ b/com.discord/smali/com/discord/gateway/R$anim.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$anim;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$animator.smali b/com.discord/smali/com/discord/gateway/R$animator.smali
index f7d49b0592..59de489509 100644
--- a/com.discord/smali/com/discord/gateway/R$animator.smali
+++ b/com.discord/smali/com/discord/gateway/R$animator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$animator;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$attr.smali b/com.discord/smali/com/discord/gateway/R$attr.smali
index 6620220c80..42b8ff36e9 100644
--- a/com.discord/smali/com/discord/gateway/R$attr.smali
+++ b/com.discord/smali/com/discord/gateway/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$bool.smali b/com.discord/smali/com/discord/gateway/R$bool.smali
index 7a55d269eb..400f98e6fb 100644
--- a/com.discord/smali/com/discord/gateway/R$bool.smali
+++ b/com.discord/smali/com/discord/gateway/R$bool.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$bool;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$color.smali b/com.discord/smali/com/discord/gateway/R$color.smali
index 420e4680f9..b301e772e3 100644
--- a/com.discord/smali/com/discord/gateway/R$color.smali
+++ b/com.discord/smali/com/discord/gateway/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$dimen.smali b/com.discord/smali/com/discord/gateway/R$dimen.smali
index 29599f1d0d..cde3206bb4 100644
--- a/com.discord/smali/com/discord/gateway/R$dimen.smali
+++ b/com.discord/smali/com/discord/gateway/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali
index 34003c39fd..86c8192e73 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$id.smali b/com.discord/smali/com/discord/gateway/R$id.smali
index e60e4c4740..a96b89586f 100644
--- a/com.discord/smali/com/discord/gateway/R$id.smali
+++ b/com.discord/smali/com/discord/gateway/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$integer.smali b/com.discord/smali/com/discord/gateway/R$integer.smali
index 7f06d58fb7..57492fc5f6 100644
--- a/com.discord/smali/com/discord/gateway/R$integer.smali
+++ b/com.discord/smali/com/discord/gateway/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$interpolator.smali b/com.discord/smali/com/discord/gateway/R$interpolator.smali
index 3ce6694d35..511c965fb2 100644
--- a/com.discord/smali/com/discord/gateway/R$interpolator.smali
+++ b/com.discord/smali/com/discord/gateway/R$interpolator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$interpolator;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$layout.smali b/com.discord/smali/com/discord/gateway/R$layout.smali
index 3288e089ae..b32dbfcd13 100644
--- a/com.discord/smali/com/discord/gateway/R$layout.smali
+++ b/com.discord/smali/com/discord/gateway/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali
index bc2fae2d8a..ad670e05b5 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$style.smali b/com.discord/smali/com/discord/gateway/R$style.smali
index 70ba0df193..b33a1b2e48 100644
--- a/com.discord/smali/com/discord/gateway/R$style.smali
+++ b/com.discord/smali/com/discord/gateway/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R$styleable.smali b/com.discord/smali/com/discord/gateway/R$styleable.smali
index 81de9bd82b..6bc8a14f39 100644
--- a/com.discord/smali/com/discord/gateway/R$styleable.smali
+++ b/com.discord/smali/com/discord/gateway/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/R.smali b/com.discord/smali/com/discord/gateway/R.smali
index cf0cf09990..6dc193fb7d 100644
--- a/com.discord/smali/com/discord/gateway/R.smali
+++ b/com.discord/smali/com/discord/gateway/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/Incoming.smali b/com.discord/smali/com/discord/gateway/io/Incoming.smali
index e725dea135..fb67b5c89f 100644
--- a/com.discord/smali/com/discord/gateway/io/Incoming.smali
+++ b/com.discord/smali/com/discord/gateway/io/Incoming.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/Incoming;
 .super Ljava/lang/Object;
+.source "Incoming.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$1.smali b/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$1.smali
index e342f047ae..2f5cb0a417 100644
--- a/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$1.smali
+++ b/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/io/IncomingParser$assignField$1;
 .super Ljava/lang/Object;
+.source "Incoming.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
diff --git a/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$2.smali b/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$2.smali
index 7fd92693a2..4eb4333a35 100644
--- a/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$2.smali
+++ b/com.discord/smali/com/discord/gateway/io/IncomingParser$assignField$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/io/IncomingParser$assignField$2;
 .super Ljava/lang/Object;
+.source "Incoming.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
diff --git a/com.discord/smali/com/discord/gateway/io/IncomingParser.smali b/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
index d71fb17089..56e26590c8 100644
--- a/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
+++ b/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/IncomingParser;
 .super Ljava/lang/Object;
+.source "Incoming.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/gateway/io/Outgoing.smali b/com.discord/smali/com/discord/gateway/io/Outgoing.smali
index a9451b8db0..6434ed8324 100644
--- a/com.discord/smali/com/discord/gateway/io/Outgoing.smali
+++ b/com.discord/smali/com/discord/gateway/io/Outgoing.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/Outgoing;
 .super Ljava/lang/Object;
+.source "Outgoing.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$CallConnect.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$CallConnect.smali
index 042c0bb558..a21709956e 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$CallConnect.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$CallConnect.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$CallConnect;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali
index 4cb29bcab1..37afc12e1d 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptions.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptions.smali
index 6fee7eda73..e5fbcce371 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptions.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate.smali
index f16bc195d7..79f3848f98 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
index 520baab855..d0e1db8f95 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$Identify;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali
index dbead3f86a..dddc12fc9b 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Resume.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Resume.smali
index c17dca4f6c..88d191c891 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Resume.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Resume.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$Resume;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali
index da1f85e9c8..f0ad0587f3 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;
 .super Lcom/discord/gateway/io/OutgoingPayload;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
index cbd1b65d8a..2170e1d4c7 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/gateway/io/OutgoingPayload;
 .super Ljava/lang/Object;
+.source "Outgoing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali b/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
index 40e33e4ce7..ae51d0375c 100644
--- a/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
+++ b/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/opcodes/Opcodes;
 .super Ljava/lang/Object;
+.source "Opcodes.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/gateway/rest/RestApi.smali b/com.discord/smali/com/discord/gateway/rest/RestApi.smali
index b59e48976d..d56a566bed 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestApi.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestApi.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/gateway/rest/RestApi;
 .super Ljava/lang/Object;
+.source "RestApi.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali b/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali
index 85442e95bf..0c5064220a 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/gateway/rest/RestClient$getGateway$1;
 .super Ljava/lang/Object;
+.source "RestClient.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/gateway/rest/RestClient.smali b/com.discord/smali/com/discord/gateway/rest/RestClient.smali
index f4115c3dd9..8e4c932e6d 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestClient.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestClient.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/rest/RestClient;
 .super Ljava/lang/Object;
+.source "RestClient.kt"
 
 
 # static fields
@@ -57,7 +58,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/d/a;->Mi()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/gateway/rest/RestConfig.smali b/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
index 84769b07ff..ef4048e860 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/gateway/rest/RestConfig;
 .super Ljava/lang/Object;
+.source "RestConfig.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread$Marker.smali b/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread$Marker.smali
index 9273ec6a41..5e97e5d169 100644
--- a/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread$Marker.smali
+++ b/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread$Marker.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/application/ModelAppMessage$Unread$Marker;
 .super Ljava/lang/Object;
+.source "ModelAppMessage.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread.smali b/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread.smali
index dbf623a9a6..c2b2f5a958 100644
--- a/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread.smali
+++ b/com.discord/smali/com/discord/models/application/ModelAppMessage$Unread.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/application/ModelAppMessage$Unread;
 .super Ljava/lang/Object;
+.source "ModelAppMessage.java"
 
 
 # annotations
@@ -94,7 +95,7 @@
 
     const/4 v1, 0x0
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_3
 
     iget-object v0, p0, Lcom/discord/models/application/ModelAppMessage$Unread;->marker:Lcom/discord/models/application/ModelAppMessage$Unread$Marker;
 
@@ -150,6 +151,9 @@
     goto :goto_0
 
     :cond_2
+    return v1
+
+    :cond_3
     :goto_1
     return v1
 .end method
diff --git a/com.discord/smali/com/discord/models/application/ModelAppMessage.smali b/com.discord/smali/com/discord/models/application/ModelAppMessage.smali
index b94ebc6a5f..ba31fc77f5 100644
--- a/com.discord/smali/com/discord/models/application/ModelAppMessage.smali
+++ b/com.discord/smali/com/discord/models/application/ModelAppMessage.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/application/ModelAppMessage;
 .super Ljava/lang/Object;
+.source "ModelAppMessage.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk.smali b/com.discord/smali/com/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk.smali
new file mode 100644
index 0000000000..11bf580136
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lcom/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk;->f$0:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk;->f$0:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPresence;->lambda$assignField$0(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI.smali b/com.discord/smali/com/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI.smali
new file mode 100644
index 0000000000..61f021c514
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lcom/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI;->f$0:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI;->f$0:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/ModelSession;->lambda$assignField$0(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/Consent.smali b/com.discord/smali/com/discord/models/domain/Consent.smali
index c69312f184..8c01b8b208 100644
--- a/com.discord/smali/com/discord/models/domain/Consent.smali
+++ b/com.discord/smali/com/discord/models/domain/Consent.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/Consent;
 .super Ljava/lang/Object;
+.source "ModelUserConsents.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/ConsentRequired.smali b/com.discord/smali/com/discord/models/domain/ConsentRequired.smali
index 199cb6c37e..5a991764a8 100644
--- a/com.discord/smali/com/discord/models/domain/ConsentRequired.smali
+++ b/com.discord/smali/com/discord/models/domain/ConsentRequired.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ConsentRequired;
 .super Ljava/lang/Object;
+.source "ModelUserConsents.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/Consents.smali b/com.discord/smali/com/discord/models/domain/Consents.smali
index 92cc7afef2..cf68e7928e 100644
--- a/com.discord/smali/com/discord/models/domain/Consents.smali
+++ b/com.discord/smali/com/discord/models/domain/Consents.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/Consents;
 .super Ljava/lang/Object;
+.source "ModelUserConsents.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/Harvest.smali b/com.discord/smali/com/discord/models/domain/Harvest.smali
index fa6860b301..517e5608ad 100644
--- a/com.discord/smali/com/discord/models/domain/Harvest.smali
+++ b/com.discord/smali/com/discord/models/domain/Harvest.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/Harvest;
 .super Ljava/lang/Object;
+.source "ModelUserConsents.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/Model$1.smali b/com.discord/smali/com/discord/models/domain/Model$1.smali
index 0e5420be32..5803cb5951 100644
--- a/com.discord/smali/com/discord/models/domain/Model$1.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/models/domain/Model$1;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemFactory.smali b/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemFactory.smali
index a3d9f22d7a..d22f91d2d8 100644
--- a/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemFactory.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemRunnable.smali b/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemRunnable.smali
index 317764be30..866b55c1bd 100644
--- a/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemRunnable.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$JsonReader$ItemRunnable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/models/domain/Model$JsonReader$ItemRunnable;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/Model$JsonReader$KeySelector.smali b/com.discord/smali/com/discord/models/domain/Model$JsonReader$KeySelector.smali
index 0be4d2ea36..09f96f2faf 100644
--- a/com.discord/smali/com/discord/models/domain/Model$JsonReader$KeySelector.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$JsonReader$KeySelector.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/models/domain/Model$JsonReader$KeySelector;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/Model$JsonReader.smali b/com.discord/smali/com/discord/models/domain/Model$JsonReader.smali
index 059f30cb60..a22ab85567 100644
--- a/com.discord/smali/com/discord/models/domain/Model$JsonReader.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$JsonReader.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/Model$JsonReader;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/com/discord/models/domain/Model$Parser.smali b/com.discord/smali/com/discord/models/domain/Model$Parser.smali
index 4fdc87e2ce..cd4269f75a 100644
--- a/com.discord/smali/com/discord/models/domain/Model$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$Parser.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/models/domain/Model$Parser;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 
 # annotations
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 b50824e1c7..c03d87f2b9 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/models/domain/Model$TypeAdapterFactory$1;
 .super Lcom/google/gson/TypeAdapter;
+.source "Model.java"
 
 
 # annotations
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 ce39592ad7..d78a8af2b6 100644
--- a/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/Model$TypeAdapterFactory;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali/com/discord/models/domain/Model.smali b/com.discord/smali/com/discord/models/domain/Model.smali
index 72eee2a5e8..c9eacc66b7 100644
--- a/com.discord/smali/com/discord/models/domain/Model.smali
+++ b/com.discord/smali/com/discord/models/domain/Model.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/models/domain/Model;
 .super Ljava/lang/Object;
+.source "Model.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelActivityMetaData.smali b/com.discord/smali/com/discord/models/domain/ModelActivityMetaData.smali
index 065cd03a40..70c415c8ef 100644
--- a/com.discord/smali/com/discord/models/domain/ModelActivityMetaData.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelActivityMetaData.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelActivityMetaData;
 .super Ljava/lang/Object;
+.source "ModelActivityMetaData.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali
index 3be4cb6132..63ab6f66ed 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelApplication$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelApplication.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 243e7fdf82..69c16c1e6d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelApplication$Parser;
 .super Ljava/lang/Object;
+.source "ModelApplication.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -113,7 +114,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -128,7 +129,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication.smali b/com.discord/smali/com/discord/models/domain/ModelApplication.smali
index 8e2c9edfba..a049fc2428 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelApplication;
 .super Ljava/lang/Object;
+.source "ModelApplication.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali
index 9a36982d9b..1cf3705080 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelAuditLog;
 .super Ljava/lang/Object;
+.source "ModelAuditLog.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ActionType.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ActionType.smali
index 1cb75e84f5..47f6cfb763 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ActionType.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ActionType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
 .super Ljava/lang/Enum;
+.source "ModelAuditLogEntry.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Change.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Change.smali
index 43a1dc759f..04a915d038 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Change.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Change.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 .super Ljava/lang/Object;
+.source "ModelAuditLogEntry.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -365,8 +366,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->newValue:Ljava/lang/Object;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ChangeNameId.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ChangeNameId.smali
index 3942cf2e0d..b25cbba858 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ChangeNameId.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$ChangeNameId.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelAuditLogEntry$ChangeNameId;
 .super Ljava/lang/Object;
+.source "ModelAuditLogEntry.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
index 4c6f380575..ba32398ecd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
 .super Ljava/lang/Enum;
+.source "ModelAuditLogEntry.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
index e44de6a284..d9613b669b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 .super Ljava/lang/Object;
+.source "ModelAuditLogEntry.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$TargetType.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$TargetType.smali
index 781732b32f..50c2f647c6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$TargetType.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$TargetType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 .super Ljava/lang/Enum;
+.source "ModelAuditLogEntry.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
index b89c92ee5a..95a360af75 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelAuditLogEntry;
 .super Ljava/lang/Object;
+.source "ModelAuditLogEntry.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelBan.smali b/com.discord/smali/com/discord/models/domain/ModelBan.smali
index 0f0748b902..005a1bd536 100644
--- a/com.discord/smali/com/discord/models/domain/ModelBan.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelBan.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelBan;
 .super Ljava/lang/Object;
+.source "ModelBan.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelCall$Ringable.smali b/com.discord/smali/com/discord/models/domain/ModelCall$Ringable.smali
index 1ab44260c6..9c1e10ed55 100644
--- a/com.discord/smali/com/discord/models/domain/ModelCall$Ringable.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelCall$Ringable.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelCall$Ringable;
 .super Ljava/lang/Object;
+.source "ModelCall.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelCall.smali b/com.discord/smali/com/discord/models/domain/ModelCall.smali
index 28476bd80d..0c02a5e889 100644
--- a/com.discord/smali/com/discord/models/domain/ModelCall.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelCall.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelCall;
 .super Ljava/lang/Object;
+.source "ModelCall.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -521,8 +522,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelCall;->ringing:Ljava/util/List;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali b/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali
index 7ffa4b61fe..78580c1b38 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelChannel$Recipient;
 .super Ljava/lang/Object;
+.source "ModelChannel.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannel$RecipientNick.smali b/com.discord/smali/com/discord/models/domain/ModelChannel$RecipientNick.smali
index efce6e1bc8..2660764a0e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannel$RecipientNick.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannel$RecipientNick.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelChannel$RecipientNick;
 .super Ljava/lang/Object;
+.source "ModelChannel.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannel.smali b/com.discord/smali/com/discord/models/domain/ModelChannel.smali
index 20abad7f71..8d9338ef74 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannel.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannel.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelChannel;
 .super Ljava/lang/Object;
+.source "ModelChannel.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -225,7 +226,7 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide p2, p1, Lcom/discord/models/domain/ModelChannel;->guildId:J
+    move-wide p2, v0
 
     :cond_0
     iput-wide p2, p0, Lcom/discord/models/domain/ModelChannel;->guildId:J
@@ -629,7 +630,7 @@
 .end method
 
 .method static synthetic lambda$static$0(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)I
-    .locals 8
+    .locals 6
 
     const/4 v0, 0x0
 
@@ -668,30 +669,22 @@
 
     if-eq v3, v4, :cond_3
 
-    iget p0, p0, Lcom/discord/models/domain/ModelChannel;->position:I
+    sub-int/2addr v3, v4
 
-    iget p1, p1, Lcom/discord/models/domain/ModelChannel;->position:I
-
-    sub-int/2addr p0, p1
-
-    return p0
+    return v3
 
     :cond_3
     iget-wide v3, p0, Lcom/discord/models/domain/ModelChannel;->id:J
 
-    iget-wide v5, p1, Lcom/discord/models/domain/ModelChannel;->id:J
+    iget-wide p0, p1, Lcom/discord/models/domain/ModelChannel;->id:J
 
-    cmp-long v7, v3, v5
+    cmp-long v5, v3, p0
 
-    if-gez v7, :cond_4
+    if-gez v5, :cond_4
 
     return v1
 
     :cond_4
-    iget-wide v3, p0, Lcom/discord/models/domain/ModelChannel;->id:J
-
-    iget-wide p0, p1, Lcom/discord/models/domain/ModelChannel;->id:J
-
     cmp-long v1, v3, p0
 
     if-nez v1, :cond_5
@@ -709,29 +702,25 @@
     return v1
 
     :cond_7
-    iget v0, p1, Lcom/discord/models/domain/ModelChannel;->type:I
+    iget v3, p1, Lcom/discord/models/domain/ModelChannel;->type:I
 
-    if-ne v0, v4, :cond_8
+    if-ne v3, v4, :cond_8
 
     return v2
 
     :cond_8
-    iget v0, p0, Lcom/discord/models/domain/ModelChannel;->type:I
-
-    const/4 v3, 0x2
+    const/4 v4, 0x2
 
     if-nez v0, :cond_9
 
-    iget v0, p1, Lcom/discord/models/domain/ModelChannel;->type:I
-
-    if-ne v0, v3, :cond_9
+    if-ne v3, v4, :cond_9
 
     return v1
 
     :cond_9
     iget v0, p0, Lcom/discord/models/domain/ModelChannel;->type:I
 
-    if-ne v0, v3, :cond_a
+    if-ne v0, v4, :cond_a
 
     iget v0, p1, Lcom/discord/models/domain/ModelChannel;->type:I
 
@@ -746,13 +735,9 @@
 
     if-eq v0, v1, :cond_b
 
-    iget p0, p0, Lcom/discord/models/domain/ModelChannel;->position:I
+    sub-int/2addr v0, v1
 
-    iget p1, p1, Lcom/discord/models/domain/ModelChannel;->position:I
-
-    sub-int/2addr p0, p1
-
-    return p0
+    return v0
 
     :cond_b
     invoke-direct {p0}, Lcom/discord/models/domain/ModelChannel;->getComputedName()Ljava/lang/String;
@@ -1942,8 +1927,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->nicks:Ljava/util/Map;
-
     return-object v0
 
     :cond_0
@@ -1992,8 +1975,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->permissionOverwrites:Ljava/util/Map;
-
     return-object v0
 
     :cond_0
@@ -2033,8 +2014,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->recipients:Ljava/util/List;
-
     return-object v0
 
     :cond_0
@@ -2548,8 +2527,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/discord/models/domain/ModelChannel;->type:I
-
     const/4 v2, 0x3
 
     if-ne v0, v2, :cond_0
@@ -2575,14 +2552,10 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/discord/models/domain/ModelChannel;->type:I
-
     const/4 v2, 0x3
 
     if-eq v0, v2, :cond_1
 
-    iget v0, p0, Lcom/discord/models/domain/ModelChannel;->type:I
-
     if-ne v0, v1, :cond_0
 
     goto :goto_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali b/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali
index bb859333af..b63a8dcd4d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelConnectedAccount;
 .super Ljava/lang/Object;
+.source "ModelConnectedAccount.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -546,9 +547,9 @@
 
     move-result v2
 
-    const/16 v3, 0x61
+    const/16 v3, 0x4f
 
-    const/16 v4, 0x4f
+    const/16 v4, 0x61
 
     if-eqz v2, :cond_2
 
@@ -606,9 +607,12 @@
 
     if-eqz v2, :cond_5
 
-    const/16 v3, 0x4f
+    goto :goto_5
 
     :cond_5
+    const/16 v3, 0x61
+
+    :goto_5
     add-int/2addr v0, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelConnectedAccount;->getType()Ljava/lang/String;
@@ -619,14 +623,14 @@
 
     if-nez v2, :cond_6
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_6
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_5
+    :goto_6
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelConnectionState.smali b/com.discord/smali/com/discord/models/domain/ModelConnectionState.smali
index fbe56ebd60..5c411f5f52 100644
--- a/com.discord/smali/com/discord/models/domain/ModelConnectionState.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelConnectionState.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelConnectionState;
 .super Ljava/lang/Object;
+.source "ModelConnectionState.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali
index dcd1065ddc..c0c91c93a2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelExperiment$Assignments;
 .super Ljava/lang/Object;
+.source "ModelExperiment.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment$Context.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment$Context.smali
index 2fef638a70..f61153a530 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment$Context.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment$Context.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelExperiment$Context;
 .super Ljava/lang/Object;
+.source "ModelExperiment.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali
index 5158cd63d5..99ce5bd6c2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelExperiment$Experiments;
 .super Ljava/lang/Object;
+.source "ModelExperiment.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
index b927e69bab..7ac8e3c361 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelExperiment;
 .super Ljava/lang/Object;
+.source "ModelExperiment.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Delete.smali b/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Delete.smali
index 4bba1886b2..448c31a88b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Delete.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Delete.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelFriendSuggestion$Delete;
 .super Ljava/lang/Object;
+.source "ModelFriendSuggestion.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Reason.smali b/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Reason.smali
index fd7c6b9d9a..5dac739760 100644
--- a/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Reason.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion$Reason.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelFriendSuggestion$Reason;
 .super Ljava/lang/Object;
+.source "ModelFriendSuggestion.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion.smali b/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion.smali
index 3932ef6846..5e321bf30e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelFriendSuggestion.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelFriendSuggestion;
 .super Ljava/lang/Object;
+.source "ModelFriendSuggestion.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGateway.smali b/com.discord/smali/com/discord/models/domain/ModelGateway.smali
index ceed471dad..4751dd3904 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGateway.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGateway.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGateway;
 .super Ljava/lang/Object;
+.source "ModelGateway.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali
index c4d881a055..fc5bf249f9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGift$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelGift.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
index 8f63a1f5a5..68ca448658 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGift$Parser;
 .super Ljava/lang/Object;
+.source "ModelGift.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -169,17 +170,14 @@
 
     move-result-wide v1
 
-    :goto_0
-    move-wide v2, v1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 v1, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v2, v1
 
-    :goto_1
     iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Boolean;
@@ -194,12 +192,12 @@
 
     move v5, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_1
     iget-object v1, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/String;
@@ -238,14 +236,14 @@
 
     move-object/from16 v1, v20
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     move-object/from16 v1, v20
 
     const/4 v8, 0x0
 
-    :goto_3
+    :goto_2
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object v9, v1
@@ -254,7 +252,7 @@
 
     if-nez v9, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_5
     move-object/from16 v1, v19
@@ -273,14 +271,14 @@
 
     move-object/from16 v1, v18
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     move-object/from16 v1, v18
 
     const/4 v10, 0x0
 
-    :goto_4
+    :goto_3
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object v11, v1
diff --git a/com.discord/smali/com/discord/models/domain/ModelGift.smali b/com.discord/smali/com/discord/models/domain/ModelGift.smali
index e697811e2b..81d8a01357 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGift.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGift.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGift;
 .super Ljava/lang/Object;
+.source "ModelGift.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuild$PruneCountResponse.smali b/com.discord/smali/com/discord/models/domain/ModelGuild$PruneCountResponse.smali
index 790cd17cdd..6c1e52cebc 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild$PruneCountResponse.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild$PruneCountResponse.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuild$PruneCountResponse;
 .super Ljava/lang/Object;
+.source "ModelGuild.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuild$VanityUrlResponse.smali b/com.discord/smali/com/discord/models/domain/ModelGuild$VanityUrlResponse.smali
index 611f98376a..d996de93cd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild$VanityUrlResponse.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild$VanityUrlResponse.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuild$VanityUrlResponse;
 .super Ljava/lang/Object;
+.source "ModelGuild.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuild.smali b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
index cbe40f4cf4..32358d90a6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuild;
 .super Ljava/lang/Object;
+.source "ModelGuild.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -272,18 +273,18 @@
         .end annotation
     .end param
 
-    const/4 v0, -0x1
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const/4 v1, -0x1
 
     if-nez p0, :cond_1
 
     if-nez p1, :cond_0
 
-    return v1
+    return v0
 
     :cond_0
-    return v0
+    return v1
 
     :cond_1
     const/4 v2, 0x1
@@ -301,7 +302,7 @@
 
     if-nez p1, :cond_3
 
-    return v1
+    return v0
 
     :cond_3
     return v2
@@ -309,7 +310,7 @@
     :cond_4
     if-nez p1, :cond_5
 
-    return v0
+    return v1
 
     :cond_5
     invoke-virtual {p0, p1}, Ljava/lang/String;->compareToIgnoreCase(Ljava/lang/String;)I
@@ -485,10 +486,9 @@
 
     if-eqz v7, :cond_1
 
-    :goto_1
     const/4 v5, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     invoke-virtual {v6}, Ljava/lang/Character;->charValue()C
@@ -503,6 +503,8 @@
 
     invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const/4 v5, 0x1
+
     goto :goto_1
 
     :cond_2
@@ -513,7 +515,7 @@
     const/4 v5, 0x0
 
     :cond_3
-    :goto_2
+    :goto_1
     add-int/lit8 v4, v4, 0x1
 
     goto :goto_0
@@ -551,8 +553,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->name:Ljava/lang/String;
-
     goto :goto_0
 
     :cond_2
@@ -565,8 +565,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->defaultMessageNotifications:Ljava/lang/Integer;
-
     goto :goto_1
 
     :cond_3
@@ -583,8 +581,6 @@
 
     if-eqz v5, :cond_4
 
-    iget-wide v1, p1, Lcom/discord/models/domain/ModelGuild;->id:J
-
     goto :goto_2
 
     :cond_4
@@ -597,8 +593,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->region:Ljava/lang/String;
-
     goto :goto_3
 
     :cond_5
@@ -613,8 +607,6 @@
 
     if-eqz v5, :cond_6
 
-    iget-wide v1, p1, Lcom/discord/models/domain/ModelGuild;->ownerId:J
-
     goto :goto_4
 
     :cond_6
@@ -632,11 +624,9 @@
     goto :goto_5
 
     :cond_7
-    const-string v1, "ICON_UNSET"
+    const-string v2, "ICON_UNSET"
 
-    iget-object v2, p1, Lcom/discord/models/domain/ModelGuild;->icon:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v2, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -656,8 +646,6 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->verificationLevel:Ljava/lang/Integer;
-
     goto :goto_6
 
     :cond_9
@@ -670,8 +658,6 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->explicitContentFilter:Ljava/lang/Integer;
-
     goto :goto_7
 
     :cond_a
@@ -688,8 +674,6 @@
 
     if-eqz v1, :cond_b
 
-    iget v1, p1, Lcom/discord/models/domain/ModelGuild;->afkTimeout:I
-
     goto :goto_8
 
     :cond_b
@@ -702,8 +686,6 @@
 
     if-eqz v1, :cond_c
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->afkChannelId:Ljava/lang/Long;
-
     goto :goto_9
 
     :cond_c
@@ -716,8 +698,6 @@
 
     if-eqz v1, :cond_d
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->systemChannelId:Ljava/lang/Long;
-
     goto :goto_a
 
     :cond_d
@@ -730,8 +710,6 @@
 
     if-eqz v1, :cond_e
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->features:Ljava/util/List;
-
     goto :goto_b
 
     :cond_e
@@ -740,19 +718,17 @@
     :goto_b
     iput-object v1, v0, Lcom/discord/models/domain/ModelGuild;->features:Ljava/util/List;
 
-    iget-object v1, p1, Lcom/discord/models/domain/ModelGuild;->lazy:Ljava/lang/Boolean;
+    iget-object p1, p1, Lcom/discord/models/domain/ModelGuild;->lazy:Ljava/lang/Boolean;
 
-    if-eqz v1, :cond_f
-
-    iget-object p0, p1, Lcom/discord/models/domain/ModelGuild;->lazy:Ljava/lang/Boolean;
+    if-eqz p1, :cond_f
 
     goto :goto_c
 
     :cond_f
-    iget-object p0, p0, Lcom/discord/models/domain/ModelGuild;->lazy:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/discord/models/domain/ModelGuild;->lazy:Ljava/lang/Boolean;
 
     :goto_c
-    iput-object p0, v0, Lcom/discord/models/domain/ModelGuild;->lazy:Ljava/lang/Boolean;
+    iput-object p1, v0, Lcom/discord/models/domain/ModelGuild;->lazy:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -2261,8 +2237,6 @@
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->afkChannelId:Ljava/lang/Long;
-
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
@@ -2293,8 +2267,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->channels:Ljava/util/List;
-
     return-object v0
 
     :cond_0
@@ -2310,8 +2282,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->defaultMessageNotifications:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -2347,8 +2317,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->explicitContentFilter:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -2425,8 +2393,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->members:Ljava/util/Map;
-
     return-object v0
 
     :cond_0
@@ -2578,8 +2544,6 @@
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->systemChannelId:Ljava/lang/Long;
-
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
@@ -2594,8 +2558,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->verificationLevel:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -2631,8 +2593,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->icon:Ljava/lang/String;
-
     const-string v1, "ICON_UNSET"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3072,8 +3032,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->features:Ljava/util/List;
-
     sget-object v1, Lcom/discord/models/domain/ModelGuild;->FEATURE_VANITY_URL:Ljava/lang/Integer;
 
     invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
@@ -3099,8 +3057,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->features:Ljava/util/List;
-
     sget-object v1, Lcom/discord/models/domain/ModelGuild;->FEATURE_VERIFIED_SERVER:Ljava/lang/Integer;
 
     invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
@@ -3126,8 +3082,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->features:Ljava/util/List;
-
     sget-object v1, Lcom/discord/models/domain/ModelGuild;->FEATURE_VIP_REGIONS:Ljava/lang/Integer;
 
     invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$IntegrationAccount.smali b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$IntegrationAccount.smali
index fae8454180..7908ffe21f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$IntegrationAccount.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$IntegrationAccount.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildIntegration$IntegrationAccount;
 .super Ljava/lang/Object;
+.source "ModelGuildIntegration.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$Update.smali b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$Update.smali
index 1ca82248df..dc0442ff07 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration$Update.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildIntegration$Update;
 .super Ljava/lang/Object;
+.source "ModelGuildIntegration.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali
index 33868ec281..0aa89d540d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildIntegration;
 .super Ljava/lang/Object;
+.source "ModelGuildIntegration.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -843,9 +844,9 @@
 
     move-result v0
 
-    const/16 v1, 0x61
+    const/16 v1, 0x4f
 
-    const/16 v2, 0x4f
+    const/16 v2, 0x61
 
     if-eqz v0, :cond_0
 
@@ -981,9 +982,12 @@
 
     if-eqz v3, :cond_4
 
-    const/16 v1, 0x4f
+    goto :goto_4
 
     :cond_4
+    const/16 v1, 0x61
+
+    :goto_4
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildIntegration;->getType()Ljava/lang/String;
@@ -996,14 +1000,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_5
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_4
+    :goto_5
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildIntegration;->getUser()Lcom/discord/models/domain/ModelUser;
@@ -1016,14 +1020,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_6
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_5
+    :goto_6
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildIntegration;->getAccount()Lcom/discord/models/domain/ModelGuildIntegration$IntegrationAccount;
@@ -1034,14 +1038,14 @@
 
     if-nez v1, :cond_7
 
-    goto :goto_6
+    goto :goto_7
 
     :cond_7
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v4
 
-    :goto_6
+    :goto_7
     add-int/2addr v0, v4
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali
index 0c7ca1ca77..e87c5dc479 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildMember$Chunk;
 .super Ljava/lang/Object;
+.source "ModelGuildMember.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMember$Computed.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMember$Computed.smali
index 0584a0d8ad..8f4ecfb17b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMember$Computed.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMember$Computed.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildMember$Computed;
 .super Ljava/lang/Object;
+.source "ModelGuildMember.java"
 
 
 # annotations
@@ -412,8 +413,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuildMember$Computed;->roles:Ljava/util/List;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali
index c7513e2c17..54cba48547 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildMember;
 .super Ljava/lang/Object;
+.source "ModelGuildMember.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -785,8 +786,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->roles:Ljava/util/List;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Companion.smali
index f40cfa050a..4a65d0a614 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Companion;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali
index 03ce7ec20e..355fba444e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali
index fecbbf8349..b39b1cf219 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Type.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Type.smali
index 90e3176974..da8699fb83 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Type.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group$Type;
 .super Ljava/lang/Enum;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali
index 84de9c9e38..eed572f273 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete.smali
index f05366d5d2..943462a441 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete;
 .super Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali
index c7c19c6756..02f922f11f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;
 .super Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali
index b6970d4b97..0d212daf91 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;
 .super Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali
index 5d784625b0..961c633393 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
 .super Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali
index 1407c6c650..44101a42f5 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
 .super Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1.smali
index 1017b0c57e..62bab21944 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali
index f9932979d8..0c75c489d5 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -95,12 +96,11 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;-><init>(Lcom/discord/models/domain/ModelGuildMember;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
 
     return-object p1
@@ -120,12 +120,14 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;-><init>(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
+
+    return-object p1
 
     :cond_3
     new-instance p1, Ljava/lang/IllegalArgumentException;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item.smali
index c1e1e2758b..b21136f35e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$1.smali
index 17efa459ee..2b3ee98ef4 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$1;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$3.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$3.smali
index b25f6a6914..141509079e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$3.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1$3;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali
index e0ef4c4cee..d692735453 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali
index 06cbe036dd..421e4b7202 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -125,7 +126,7 @@
 
     sparse-switch v1, :sswitch_data_0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :sswitch_0
     const-string v1, "DELETE"
@@ -144,7 +145,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -153,7 +154,6 @@
 
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete;-><init>(I)V
 
-    :goto_0
     check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
 
     return-object p1
@@ -175,7 +175,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
@@ -184,12 +184,14 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;-><init>(Lkotlin/ranges/IntRange;Ljava/util/List;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+
+    return-object p1
 
     :sswitch_2
     const-string v1, "INVALIDATE"
@@ -208,12 +210,14 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_3
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;-><init>(Lkotlin/ranges/IntRange;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+
+    return-object p1
 
     :sswitch_3
     const-string v1, "UPDATE"
@@ -232,7 +236,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_4
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -245,12 +249,14 @@
 
     if-nez v1, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_5
     invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+
+    return-object p1
 
     :sswitch_4
     const-string v1, "INSERT"
@@ -269,7 +275,7 @@
 
     if-nez v0, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_6
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -282,15 +288,17 @@
 
     if-nez v1, :cond_7
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_7
     invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
 
-    goto/16 :goto_0
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+
+    return-object p1
 
     :cond_8
-    :goto_1
+    :goto_0
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     new-instance v1, Ljava/lang/StringBuilder;
@@ -315,6 +323,8 @@
 
     throw p1
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x7efc4947 -> :sswitch_4
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali
index 1719c7ec1e..eb3f3775f8 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;
 .super Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali
index c546f7c73f..bf77738706 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;
 .super Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation.smali
index 28fd89986e..37a0016df9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$1.smali
index a464959471..89b86456c8 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$1;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$2.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$2.smali
index 93d6b80d96..1d1c0543c3 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1$2;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.smali
index db5f54ca09..f4d372767e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
index 255b4dea30..78532593f8 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate$Parser;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -113,7 +114,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -139,7 +140,7 @@
 
     if-nez v5, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
@@ -150,7 +151,7 @@
 
     if-nez v6, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_3
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali
index bed36d13f5..6ac3ae49d0 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelGuildMemberListUpdate;
 .super Ljava/lang/Object;
+.source "ModelGuildMemberListUpdate.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildRole$Payload.smali b/com.discord/smali/com/discord/models/domain/ModelGuildRole$Payload.smali
index 0a8791ef3f..3a9a58bae7 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildRole$Payload.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildRole$Payload.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildRole$Payload;
 .super Ljava/lang/Object;
+.source "ModelGuildRole.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -267,8 +268,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelGuildRole$Payload;->role:Lcom/discord/models/domain/ModelGuildRole;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali b/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
index 89f98a38d9..28af58b1bd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelGuildRole;
 .super Ljava/lang/Object;
+.source "ModelGuildRole.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -971,9 +972,9 @@
 
     move-result v1
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_1
 
@@ -1021,9 +1022,12 @@
 
     if-eqz v1, :cond_3
 
-    const/16 v2, 0x4f
+    goto :goto_3
 
     :cond_3
+    const/16 v2, 0x61
+
+    :goto_3
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelInvite$Settings.smali b/com.discord/smali/com/discord/models/domain/ModelInvite$Settings.smali
index 1b6131f79e..ad64caaa33 100644
--- a/com.discord/smali/com/discord/models/domain/ModelInvite$Settings.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelInvite$Settings.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelInvite$Settings;
 .super Ljava/lang/Object;
+.source "ModelInvite.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelInvite.smali b/com.discord/smali/com/discord/models/domain/ModelInvite.smali
index 9edcd32150..df561dd7dc 100644
--- a/com.discord/smali/com/discord/models/domain/ModelInvite.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelInvite.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelInvite;
 .super Ljava/lang/Object;
+.source "ModelInvite.java"
 
 
 # annotations
@@ -541,9 +542,9 @@
 
     move-result v1
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_4
 
@@ -565,9 +566,12 @@
 
     if-eqz v1, :cond_5
 
-    const/16 v2, 0x4f
+    goto :goto_5
 
     :cond_5
+    const/16 v2, 0x61
+
+    :goto_5
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x3b
diff --git a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser$parse$1.smali
index e6cae19e06..5e36b621ea 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelLibraryApplication$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelLibraryApplication.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
index 198c01ba51..94b88ec809 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelLibraryApplication$Parser;
 .super Ljava/lang/Object;
+.source "ModelLibraryApplication.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -123,7 +124,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali
index 0b249fbe4d..b01bc41067 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelLibraryApplication;
 .super Ljava/lang/Object;
+.source "ModelLibraryApplication.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali b/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali
index e77f08c0bc..75af442cf8 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessage$Activity;
 .super Ljava/lang/Object;
+.source "ModelMessage.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage$Application.smali b/com.discord/smali/com/discord/models/domain/ModelMessage$Application.smali
index 58102e5bd3..72c5beb7f4 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage$Application.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage$Application.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessage$Application;
 .super Ljava/lang/Object;
+.source "ModelMessage.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali b/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali
index 19cb667457..e9f29791f0 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessage$Call;
 .super Ljava/lang/Object;
+.source "ModelMessage.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali b/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali
index e57b9baa0e..436df469c0 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessage$Content;
 .super Ljava/lang/Object;
+.source "ModelMessage.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -158,10 +159,10 @@
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelMessage$Content;->content:Ljava/lang/String;
 
-    :goto_2
     return-void
 
-    nop
+    :goto_2
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage.smali b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
index 3da907233d..dfdd8b82f6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessage;
 .super Ljava/lang/Object;
+.source "ModelMessage.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -585,89 +586,64 @@
 
     if-eqz v6, :cond_0
 
-    iget-wide v2, v1, Lcom/discord/models/domain/ModelMessage;->id:J
-
-    :goto_0
-    move-wide v7, v2
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-wide v2, v0, Lcom/discord/models/domain/ModelMessage;->id:J
 
-    goto :goto_0
+    :goto_0
+    move-wide v7, v2
 
-    :goto_1
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->nonce:Ljava/lang/String;
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->nonce:Ljava/lang/String;
-
-    :goto_2
-    move-object v9, v2
-
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->nonce:Ljava/lang/String;
 
-    goto :goto_2
+    :goto_1
+    move-object v9, v2
 
-    :goto_3
     iget-wide v2, v1, Lcom/discord/models/domain/ModelMessage;->channelId:J
 
     cmp-long v6, v2, v4
 
     if-eqz v6, :cond_2
 
-    iget-wide v2, v1, Lcom/discord/models/domain/ModelMessage;->channelId:J
-
-    :goto_4
-    move-wide v10, v2
-
-    goto :goto_5
+    goto :goto_2
 
     :cond_2
     iget-wide v2, v0, Lcom/discord/models/domain/ModelMessage;->channelId:J
 
-    goto :goto_4
+    :goto_2
+    move-wide v10, v2
 
-    :goto_5
     iget v2, v1, Lcom/discord/models/domain/ModelMessage;->type:I
 
     if-eqz v2, :cond_3
 
-    iget v2, v1, Lcom/discord/models/domain/ModelMessage;->type:I
-
-    :goto_6
-    move v12, v2
-
-    goto :goto_7
+    goto :goto_3
 
     :cond_3
     iget v2, v0, Lcom/discord/models/domain/ModelMessage;->type:I
 
-    goto :goto_6
+    :goto_3
+    move v12, v2
 
-    :goto_7
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->content:Ljava/lang/String;
 
     if-eqz v2, :cond_4
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->content:Ljava/lang/String;
-
-    :goto_8
-    move-object v13, v2
-
-    goto :goto_9
+    goto :goto_4
 
     :cond_4
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->content:Ljava/lang/String;
 
-    goto :goto_8
+    :goto_4
+    move-object v13, v2
 
-    :goto_9
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->author:Lcom/discord/models/domain/ModelUser;
 
     sget-object v3, Lcom/discord/models/domain/ModelUser;->EMPTY:Lcom/discord/models/domain/ModelUser;
@@ -676,102 +652,74 @@
 
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->author:Lcom/discord/models/domain/ModelUser;
 
-    :goto_a
-    move-object v14, v2
-
-    goto :goto_b
+    goto :goto_5
 
     :cond_5
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->author:Lcom/discord/models/domain/ModelUser;
 
-    goto :goto_a
+    :goto_5
+    move-object v14, v2
 
-    :goto_b
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->mentions:Ljava/util/List;
 
     if-eqz v2, :cond_6
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->mentions:Ljava/util/List;
-
-    :goto_c
-    move-object v15, v2
-
-    goto :goto_d
+    goto :goto_6
 
     :cond_6
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->mentions:Ljava/util/List;
 
-    goto :goto_c
+    :goto_6
+    move-object v15, v2
 
-    :goto_d
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->timestamp:Ljava/lang/String;
 
     if-eqz v2, :cond_7
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->timestamp:Ljava/lang/String;
-
-    :goto_e
-    move-object/from16 v16, v2
-
-    goto :goto_f
+    goto :goto_7
 
     :cond_7
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->timestamp:Ljava/lang/String;
 
-    goto :goto_e
+    :goto_7
+    move-object/from16 v16, v2
 
-    :goto_f
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->editedTimestamp:Ljava/lang/String;
 
     if-eqz v2, :cond_8
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->editedTimestamp:Ljava/lang/String;
-
-    :goto_10
-    move-object/from16 v17, v2
-
-    goto :goto_11
+    goto :goto_8
 
     :cond_8
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->editedTimestamp:Ljava/lang/String;
 
-    goto :goto_10
+    :goto_8
+    move-object/from16 v17, v2
 
-    :goto_11
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->attachments:Ljava/util/List;
 
     if-eqz v2, :cond_9
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->attachments:Ljava/util/List;
-
-    :goto_12
-    move-object/from16 v18, v2
-
-    goto :goto_13
+    goto :goto_9
 
     :cond_9
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->attachments:Ljava/util/List;
 
-    goto :goto_12
+    :goto_9
+    move-object/from16 v18, v2
 
-    :goto_13
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->embeds:Ljava/util/List;
 
     if-eqz v2, :cond_a
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->embeds:Ljava/util/List;
-
-    :goto_14
-    move-object/from16 v19, v2
-
-    goto :goto_15
+    goto :goto_a
 
     :cond_a
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->embeds:Ljava/util/List;
 
-    goto :goto_14
+    :goto_a
+    move-object/from16 v19, v2
 
-    :goto_15
     iget-boolean v2, v1, Lcom/discord/models/domain/ModelMessage;->tts:Z
 
     const/4 v3, 0x0
@@ -784,35 +732,30 @@
 
     if-eqz v2, :cond_b
 
-    goto :goto_16
+    goto :goto_b
 
     :cond_b
     const/16 v20, 0x0
 
-    goto :goto_17
+    goto :goto_c
 
     :cond_c
-    :goto_16
+    :goto_b
     const/16 v20, 0x1
 
-    :goto_17
+    :goto_c
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->call:Lcom/discord/models/domain/ModelMessage$Call;
 
     if-eqz v2, :cond_d
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->call:Lcom/discord/models/domain/ModelMessage$Call;
-
-    :goto_18
-    move-object/from16 v21, v2
-
-    goto :goto_19
+    goto :goto_d
 
     :cond_d
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->call:Lcom/discord/models/domain/ModelMessage$Call;
 
-    goto :goto_18
+    :goto_d
+    move-object/from16 v21, v2
 
-    :goto_19
     iget-boolean v2, v1, Lcom/discord/models/domain/ModelMessage;->mentionEveryone:Z
 
     if-nez v2, :cond_f
@@ -821,103 +764,78 @@
 
     if-eqz v2, :cond_e
 
-    goto :goto_1a
+    goto :goto_e
 
     :cond_e
     const/16 v22, 0x0
 
-    goto :goto_1b
+    goto :goto_f
 
     :cond_f
-    :goto_1a
+    :goto_e
     const/16 v22, 0x1
 
-    :goto_1b
+    :goto_f
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->reactions:Ljava/util/LinkedHashMap;
 
     if-eqz v2, :cond_10
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->reactions:Ljava/util/LinkedHashMap;
-
-    :goto_1c
-    move-object/from16 v23, v2
-
-    goto :goto_1d
+    goto :goto_10
 
     :cond_10
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->reactions:Ljava/util/LinkedHashMap;
 
-    goto :goto_1c
+    :goto_10
+    move-object/from16 v23, v2
 
-    :goto_1d
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->pinned:Ljava/lang/Boolean;
 
     if-eqz v2, :cond_11
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->pinned:Ljava/lang/Boolean;
-
-    :goto_1e
-    move-object/from16 v24, v2
-
-    goto :goto_1f
+    goto :goto_11
 
     :cond_11
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->pinned:Ljava/lang/Boolean;
 
-    goto :goto_1e
+    :goto_11
+    move-object/from16 v24, v2
 
-    :goto_1f
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->webhookId:Ljava/lang/Long;
 
     if-eqz v2, :cond_12
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->webhookId:Ljava/lang/Long;
-
-    :goto_20
-    move-object/from16 v25, v2
-
-    goto :goto_21
+    goto :goto_12
 
     :cond_12
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->webhookId:Ljava/lang/Long;
 
-    goto :goto_20
+    :goto_12
+    move-object/from16 v25, v2
 
-    :goto_21
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->application:Lcom/discord/models/domain/ModelMessage$Application;
 
     if-eqz v2, :cond_13
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->application:Lcom/discord/models/domain/ModelMessage$Application;
-
-    :goto_22
-    move-object/from16 v26, v2
-
-    goto :goto_23
+    goto :goto_13
 
     :cond_13
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->application:Lcom/discord/models/domain/ModelMessage$Application;
 
-    goto :goto_22
+    :goto_13
+    move-object/from16 v26, v2
 
-    :goto_23
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
 
     if-eqz v2, :cond_14
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
-
-    :goto_24
-    move-object/from16 v27, v2
-
-    goto :goto_25
+    goto :goto_14
 
     :cond_14
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
 
-    goto :goto_24
+    :goto_14
+    move-object/from16 v27, v2
 
-    :goto_25
     iget-boolean v2, v1, Lcom/discord/models/domain/ModelMessage;->hit:Z
 
     if-nez v2, :cond_16
@@ -926,35 +844,30 @@
 
     if-eqz v2, :cond_15
 
-    goto :goto_26
+    goto :goto_15
 
     :cond_15
     const/16 v28, 0x0
 
-    goto :goto_27
+    goto :goto_16
 
     :cond_16
-    :goto_26
+    :goto_15
     const/16 v28, 0x1
 
-    :goto_27
+    :goto_16
     iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->mentionRoles:Ljava/util/List;
 
     if-eqz v2, :cond_17
 
-    iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->mentionRoles:Ljava/util/List;
-
-    :goto_28
-    move-object/from16 v29, v2
-
-    goto :goto_29
+    goto :goto_17
 
     :cond_17
     iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->mentionRoles:Ljava/util/List;
 
-    goto :goto_28
+    :goto_17
+    move-object/from16 v29, v2
 
-    :goto_29
     iget-boolean v2, v1, Lcom/discord/models/domain/ModelMessage;->hasLocalUploads:Z
 
     if-nez v2, :cond_19
@@ -963,18 +876,18 @@
 
     if-eqz v2, :cond_18
 
-    goto :goto_2a
+    goto :goto_18
 
     :cond_18
     const/16 v30, 0x0
 
-    goto :goto_2b
+    goto :goto_19
 
     :cond_19
-    :goto_2a
+    :goto_18
     const/16 v30, 0x1
 
-    :goto_2b
+    :goto_19
     move-object/from16 v6, p0
 
     invoke-direct/range {v6 .. v30}, Lcom/discord/models/domain/ModelMessage;-><init>(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelMessage$Application;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;Z)V
@@ -2551,8 +2464,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->attachments:Ljava/util/List;
-
     return-object v0
 
     :cond_0
@@ -2685,8 +2596,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->embeds:Ljava/util/List;
-
     return-object v0
 
     :cond_0
@@ -2754,8 +2663,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->mentions:Ljava/util/List;
-
     return-object v0
 
     :cond_0
@@ -2798,8 +2705,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->reactions:Ljava/util/LinkedHashMap;
-
     return-object v0
 
     :cond_0
@@ -2910,8 +2815,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->attachments:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -2935,8 +2838,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->embeds:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -2981,8 +2882,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->mentions:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -3214,9 +3113,9 @@
 
     move-result v1
 
-    const/16 v4, 0x61
+    const/16 v4, 0x4f
 
-    const/16 v5, 0x4f
+    const/16 v5, 0x61
 
     if-eqz v1, :cond_7
 
@@ -3258,9 +3157,12 @@
 
     if-eqz v1, :cond_9
 
-    const/16 v4, 0x4f
+    goto :goto_9
 
     :cond_9
+    const/16 v4, 0x61
+
+    :goto_9
     add-int/2addr v0, v4
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getReactions()Ljava/util/Map;
@@ -3273,14 +3175,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_9
+    goto :goto_a
 
     :cond_a
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_9
+    :goto_a
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getPinned()Ljava/lang/Boolean;
@@ -3293,14 +3195,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_a
+    goto :goto_b
 
     :cond_b
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_a
+    :goto_b
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getWebhookId()Ljava/lang/Long;
@@ -3313,14 +3215,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_b
+    goto :goto_c
 
     :cond_c
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_b
+    :goto_c
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getApplication()Lcom/discord/models/domain/ModelMessage$Application;
@@ -3333,14 +3235,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_c
+    goto :goto_d
 
     :cond_d
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_c
+    :goto_d
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
@@ -3351,14 +3253,14 @@
 
     if-nez v1, :cond_e
 
-    goto :goto_d
+    goto :goto_e
 
     :cond_e
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v3
 
-    :goto_d
+    :goto_e
     add-int/2addr v0, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
@@ -3417,8 +3319,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/discord/models/domain/ModelMessage;->type:I
-
     const/4 v1, -0x2
 
     if-ne v0, v1, :cond_0
@@ -3452,8 +3352,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->pinned:Ljava/lang/Boolean;
-
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageAttachment$Type.smali b/com.discord/smali/com/discord/models/domain/ModelMessageAttachment$Type.smali
index c501d51fa6..e0b6025909 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageAttachment$Type.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageAttachment$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelMessageAttachment$Type;
 .super Ljava/lang/Enum;
+.source "ModelMessageAttachment.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali b/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali
index 813879e238..1d313b4831 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageAttachment;
 .super Ljava/lang/Object;
+.source "ModelMessageAttachment.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -51,8 +52,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelMessageAttachment;->url:Ljava/lang/String;
-
     invoke-virtual {v0}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
     move-result-object v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali b/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali
index f806bf6037..f6de1bc40d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageDelete;
 .super Ljava/lang/Object;
+.source "ModelMessageDelete.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$1.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$1.smali
index 49db20c134..208b9864c1 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/models/domain/ModelMessageEmbed$1;
 .super Ljava/lang/Object;
+.source "ModelMessageEmbed.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali
index 65fda5a24f..8967beed63 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageEmbed$Field;
 .super Ljava/lang/Object;
+.source "ModelMessageEmbed.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -144,9 +145,13 @@
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelMessageEmbed$Field;->name:Ljava/lang/String;
 
+    return-void
+
     :goto_2
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype$1.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype$1.smali
index 69ae827e47..e14357d840 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/models/domain/ModelMessageEmbed$Filetype$1;
 .super Ljava/lang/ThreadLocal;
+.source "ModelMessageEmbed.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype.smali
index 8e1f938779..bd25f07582 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Filetype.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelMessageEmbed$Filetype;
 .super Ljava/lang/Enum;
+.source "ModelMessageEmbed.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$FiletypePatterns.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$FiletypePatterns.smali
index d1041a2bcf..9b4f1be399 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$FiletypePatterns.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$FiletypePatterns.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/models/domain/ModelMessageEmbed$FiletypePatterns;
 .super Ljava/lang/Object;
+.source "ModelMessageEmbed.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali
index 228b420bf4..8b055b2ecc 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageEmbed$Item;
 .super Ljava/lang/Object;
+.source "ModelMessageEmbed.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali
index 902a95f228..db4793525c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageEmbed;
 .super Ljava/lang/Object;
+.source "ModelMessageEmbed.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -144,7 +145,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     iput-object p3, p0, Lcom/discord/models/domain/ModelMessageEmbed;->image:Lcom/discord/models/domain/ModelMessageEmbed$Item;
@@ -153,7 +154,7 @@
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelMessageEmbed;->type:Ljava/lang/String;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     iput-object p3, p0, Lcom/discord/models/domain/ModelMessageEmbed;->image:Lcom/discord/models/domain/ModelMessageEmbed$Item;
@@ -162,7 +163,6 @@
 
     const-string p1, "image"
 
-    :goto_0
     iput-object p1, p0, Lcom/discord/models/domain/ModelMessageEmbed;->type:Ljava/lang/String;
 
     return-void
@@ -174,9 +174,11 @@
 
     const-string p1, "video"
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/discord/models/domain/ModelMessageEmbed;->type:Ljava/lang/String;
 
-    :goto_1
+    return-void
+
+    :goto_0
     return-void
 
     nop
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Emoji.smali b/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Emoji.smali
index 3f61beb66c..7142d2d0ca 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Emoji.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Emoji.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 .super Ljava/lang/Object;
+.source "ModelMessageReaction.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali b/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali
index c6624392f1..deabf81dbd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageReaction$Update;
 .super Ljava/lang/Object;
+.source "ModelMessageReaction.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageReaction.smali b/com.discord/smali/com/discord/models/domain/ModelMessageReaction.smali
index 9d05330d53..040803bf61 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageReaction.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageReaction.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelMessageReaction;
 .super Ljava/lang/Object;
+.source "ModelMessageReaction.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali b/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali
index c9850924f1..8965af7244 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPayload$Hello;
 .super Ljava/lang/Object;
+.source "ModelPayload.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPayload.smali b/com.discord/smali/com/discord/models/domain/ModelPayload.smali
index e8736d7018..179835d132 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPayload.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPayload.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPayload;
 .super Ljava/lang/Object;
+.source "ModelPayload.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPermission$Permission.smali b/com.discord/smali/com/discord/models/domain/ModelPermission$Permission.smali
index 2a3afd556d..ce9f4394f5 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPermission$Permission.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPermission$Permission.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/discord/models/domain/ModelPermission$Permission;
 .super Ljava/lang/Object;
+.source "ModelPermission.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPermission.smali b/com.discord/smali/com/discord/models/domain/ModelPermission.smali
index b68a16f1a1..8193dd2efd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPermission.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPermission.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPermission;
 .super Ljava/lang/Object;
+.source "ModelPermission.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali b/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
index 3340a1d75b..05cde078f1 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPermissionOverwrite;
 .super Ljava/lang/Object;
+.source "ModelPermissionOverwrite.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Activity.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Activity.smali
index ab5ea8969d..725210084f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Activity.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Activity.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPresence$Activity;
 .super Ljava/lang/Object;
+.source "ModelPresence.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -1042,8 +1043,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Activity;->gamePlatform:Ljava/lang/String;
-
     return-object v0
 
     :cond_1
@@ -1390,8 +1389,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/discord/models/domain/ModelPresence$Activity;->type:I
-
     if-ne v0, v1, :cond_0
 
     goto :goto_0
@@ -1477,8 +1474,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Activity;->applicationId:Ljava/lang/Long;
-
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Assets.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Assets.smali
index 5d43bb904a..895cd75ba9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Assets.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Assets.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPresence$Assets;
 .super Ljava/lang/Object;
+.source "ModelPresence.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Metadata.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Metadata.smali
index 1f5201fe33..0af75b461d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Metadata.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Metadata.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPresence$Metadata;
 .super Ljava/lang/Object;
+.source "ModelPresence.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Party.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Party.smali
index ebaa7eaf54..e9722e6769 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Party.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Party.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPresence$Party;
 .super Ljava/lang/Object;
+.source "ModelPresence.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -271,8 +272,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -314,8 +313,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -324,9 +321,7 @@
 
     iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -359,8 +354,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Timestamps.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Timestamps.smali
index d3ce5a5496..c21fbb116c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Timestamps.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Timestamps.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPresence$Timestamps;
 .super Ljava/lang/Object;
+.source "ModelPresence.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence.smali b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
index 10a02efe66..f3bdb63092 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelPresence;
 .super Ljava/lang/Object;
+.source "ModelPresence.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -50,9 +51,17 @@
 
 
 # instance fields
-.field private transient activity:Lcom/discord/models/domain/ModelPresence$Activity;
+.field private transient activities:Ljava/util/List;
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;"
+        }
+    .end annotation
 .end field
 
 .field private transient guildId:J
@@ -92,25 +101,33 @@
     return-void
 .end method
 
-.method public constructor <init>(ILcom/discord/models/domain/ModelPresence$Activity;)V
+.method public constructor <init>(ILjava/util/List;)V
     .locals 0
-    .param p2    # Lcom/discord/models/domain/ModelPresence$Activity;
+    .param p2    # Ljava/util/List;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
     .end param
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;)V"
+        }
+    .end annotation
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput p1, p0, Lcom/discord/models/domain/ModelPresence;->status:I
 
-    iput-object p2, p0, Lcom/discord/models/domain/ModelPresence;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p2, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
 
     return-void
 .end method
 
-.method public constructor <init>(ILcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;)V
+.method public constructor <init>(ILjava/util/List;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
-    .param p2    # Lcom/discord/models/domain/ModelPresence$Activity;
+    .param p2    # Ljava/util/List;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
     .end param
@@ -118,14 +135,62 @@
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
     .end param
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ")V"
+        }
+    .end annotation
 
-    invoke-direct {p0, p1, p2}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {p0, p1, p2}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;)V
 
     iput-object p3, p0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
 
     return-void
 .end method
 
+.method private getActivityByType(I)Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 3
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    iget v2, v1, Lcom/discord/models/domain/ModelPresence$Activity;->type:I
+
+    if-ne v2, p1, :cond_0
+
+    return-object v1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
 .method public static getStatus(Ljava/lang/String;)I
     .locals 7
 
@@ -296,6 +361,27 @@
     .end packed-switch
 .end method
 
+.method static synthetic lambda$assignField$0(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelPresence$Activity;-><init>()V
+
+    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    return-object p0
+.end method
+
 
 # virtual methods
 .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -319,6 +405,19 @@
     goto :goto_0
 
     :sswitch_0
+    const-string v1, "activities"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :sswitch_1
     const-string v1, "roles"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -331,7 +430,7 @@
 
     goto :goto_1
 
-    :sswitch_1
+    :sswitch_2
     const-string v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -344,7 +443,7 @@
 
     goto :goto_1
 
-    :sswitch_2
+    :sswitch_3
     const-string v1, "nick"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -357,19 +456,6 @@
 
     goto :goto_1
 
-    :sswitch_3
-    const-string v1, "game"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
     :sswitch_4
     const-string v1, "status"
 
@@ -460,17 +546,15 @@
     return-void
 
     :pswitch_4
-    new-instance v0, Lcom/discord/models/domain/ModelPresence$Activity;
+    new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk;
 
-    invoke-direct {v0}, Lcom/discord/models/domain/ModelPresence$Activity;-><init>()V
+    invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelPresence$IwuKRkzMdxC3OUIhZUlFfbmppKk;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
     move-result-object p1
 
-    check-cast p1, Lcom/discord/models/domain/ModelPresence$Activity;
-
-    iput-object p1, p0, Lcom/discord/models/domain/ModelPresence;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
 
     return-void
 
@@ -495,10 +579,10 @@
     .sparse-switch
         -0x4de03319 -> :sswitch_5
         -0x3532300e -> :sswitch_4
-        0x304bf2 -> :sswitch_3
-        0x339763 -> :sswitch_2
-        0x36ebcb -> :sswitch_1
-        0x67a8ebd -> :sswitch_0
+        0x339763 -> :sswitch_3
+        0x36ebcb -> :sswitch_2
+        0x67a8ebd -> :sswitch_1
+        0x7a1b3bed -> :sswitch_0
     .end sparse-switch
 
     :pswitch_data_0
@@ -521,7 +605,7 @@
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
     const/4 v0, 0x1
 
@@ -556,47 +640,31 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
 
-    move-result v3
+    move-result p1
 
-    if-eq v1, v3, :cond_3
+    if-eq v1, p1, :cond_3
 
     return v2
 
     :cond_3
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object p1
-
-    if-nez v1, :cond_4
-
-    if-eqz p1, :cond_5
-
-    goto :goto_0
-
-    :cond_4
-    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_5
-
-    :goto_0
-    return v2
-
-    :cond_5
     return v0
 .end method
 
-.method public getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+.method public getActivities()Ljava/util/List;
     .locals 1
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
 
     return-object v0
 .end method
@@ -609,6 +677,20 @@
     return-wide v0
 .end method
 
+.method public getListeningActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lcom/discord/models/domain/ModelPresence;->getActivityByType(I)Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public getNick()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/Nullable;
@@ -619,6 +701,53 @@
     return-object v0
 .end method
 
+.method public getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/models/domain/ModelPresence;->getActivityByType(I)Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 2
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    if-lez v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->activities: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/discord/models/domain/ModelPresence$Activity;
+
+    return-object v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
 .method public getRoles()Ljava/util/List;
     .locals 1
     .annotation build Landroidx/annotation/Nullable;
@@ -646,6 +775,20 @@
     return v0
 .end method
 
+.method public getStreamingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lcom/discord/models/domain/ModelPresence;->getActivityByType(I)Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public getUser()Lcom/discord/models/domain/ModelUser;
     .locals 1
     .annotation build Landroidx/annotation/Nullable;
@@ -656,8 +799,22 @@
     return-object v0
 .end method
 
+.method public getWatchingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    const/4 v0, 0x3
+
+    invoke-direct {p0, v0}, Lcom/discord/models/domain/ModelPresence;->getActivityByType(I)Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public hashCode()I
-    .locals 2
+    .locals 1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
 
@@ -665,26 +822,6 @@
 
     add-int/lit8 v0, v0, 0x3b
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v1
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    if-nez v1, :cond_0
-
-    const/16 v1, 0x2b
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :goto_0
-    add-int/2addr v0, v1
-
     return v0
 .end method
 
@@ -703,11 +840,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    const-string v1, ", activity="
+    const-string v1, ", activities="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelReadState.smali b/com.discord/smali/com/discord/models/domain/ModelReadState.smali
index 7a79b5257f..7e81e3fc89 100644
--- a/com.discord/smali/com/discord/models/domain/ModelReadState.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelReadState.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelReadState;
 .super Ljava/lang/Object;
+.source "ModelReadState.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -324,8 +325,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lcom/discord/models/domain/ModelReadState;->channelId:J
-
     return-wide v0
 
     :cond_0
@@ -345,8 +344,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lcom/discord/models/domain/ModelReadState;->lastMessageId:J
-
     return-wide v0
 
     :cond_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali b/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali
index 923c7d512a..98c5b51efa 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelSearchResponse$hits$2;
 .super Lkotlin/jvm/internal/k;
+.source "ModelSearchResponse.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali b/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali
index 4659b39116..602e38751f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelSearchResponse;
 .super Ljava/lang/Object;
+.source "ModelSearchResponse.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/models/domain/ModelSession$ClientInfo.smali b/com.discord/smali/com/discord/models/domain/ModelSession$ClientInfo.smali
index 691af05a59..6520492fb0 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSession$ClientInfo.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSession$ClientInfo.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelSession$ClientInfo;
 .super Ljava/lang/Object;
+.source "ModelSession.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelSession.smali b/com.discord/smali/com/discord/models/domain/ModelSession.smali
index 905a973af1..c118e35fff 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSession.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSession.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelSession;
 .super Ljava/lang/Object;
+.source "ModelSession.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -16,9 +17,20 @@
 # instance fields
 .field private active:Z
 
-.field private clientInfo:Lcom/discord/models/domain/ModelSession$ClientInfo;
+.field private activities:Ljava/util/List;
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
 
-.field private game:Lcom/discord/models/domain/ModelPresence$Activity;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private clientInfo:Lcom/discord/models/domain/ModelSession$ClientInfo;
 
 .field private lastModified:J
 
@@ -36,6 +48,27 @@
     return-void
 .end method
 
+.method static synthetic lambda$assignField$0(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelPresence$Activity;-><init>()V
+
+    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    return-object p0
+.end method
+
 
 # virtual methods
 .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -59,6 +92,19 @@
     goto :goto_0
 
     :sswitch_0
+    const-string v1, "activities"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x3
+
+    goto :goto_1
+
+    :sswitch_1
     const-string v1, "session_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -71,19 +117,6 @@
 
     goto :goto_1
 
-    :sswitch_1
-    const-string v1, "game"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x3
-
-    goto :goto_1
-
     :sswitch_2
     const-string v1, "last_modified"
 
@@ -174,17 +207,15 @@
     return-void
 
     :pswitch_2
-    new-instance v0, Lcom/discord/models/domain/ModelPresence$Activity;
+    new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI;
 
-    invoke-direct {v0}, Lcom/discord/models/domain/ModelPresence$Activity;-><init>()V
+    invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelSession$aZvlML2Xk_8vdZ8uFgbAPNvJZtI;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
     move-result-object p1
 
-    check-cast p1, Lcom/discord/models/domain/ModelPresence$Activity;
-
-    iput-object p1, p0, Lcom/discord/models/domain/ModelSession;->game:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p1, p0, Lcom/discord/models/domain/ModelSession;->activities:Ljava/util/List;
 
     return-void
 
@@ -227,8 +258,8 @@
         -0x3532300e -> :sswitch_4
         -0xa5f2f5e -> :sswitch_3
         -0x1b0d5ae -> :sswitch_2
-        0x304bf2 -> :sswitch_1
-        0x630ddf64 -> :sswitch_0
+        0x630ddf64 -> :sswitch_1
+        0x7a1b3bed -> :sswitch_0
     .end sparse-switch
 
     :pswitch_data_0
@@ -345,11 +376,11 @@
     return v2
 
     :cond_7
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSession;->getGame()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSession;->getGame()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
 
     move-result-object v3
 
@@ -411,18 +442,29 @@
     return v0
 .end method
 
-.method public getClientInfo()Lcom/discord/models/domain/ModelSession$ClientInfo;
+.method public getActivities()Ljava/util/List;
     .locals 1
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelSession;->clientInfo:Lcom/discord/models/domain/ModelSession$ClientInfo;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelSession;->activities:Ljava/util/List;
 
     return-object v0
 .end method
 
-.method public getGame()Lcom/discord/models/domain/ModelPresence$Activity;
+.method public getClientInfo()Lcom/discord/models/domain/ModelSession$ClientInfo;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelSession;->game:Lcom/discord/models/domain/ModelPresence$Activity;
+    iget-object v0, p0, Lcom/discord/models/domain/ModelSession;->clientInfo:Lcom/discord/models/domain/ModelSession$ClientInfo;
 
     return-object v0
 .end method
@@ -510,7 +552,7 @@
     :goto_1
     add-int/2addr v0, v2
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSession;->getGame()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
 
     move-result-object v2
 
@@ -612,11 +654,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v1, ", game="
+    const-string v1, ", activities="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSession;->getGame()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSku$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelSku$Parser$parse$1.smali
index 09549c85ac..afdc220391 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSku$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSku$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelSku$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelSku.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
index 2df14e8d0e..b2a9ae8c0a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelSku$Parser;
 .super Ljava/lang/Object;
+.source "ModelSku.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -184,7 +185,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_3
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
@@ -197,7 +198,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_4
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
diff --git a/com.discord/smali/com/discord/models/domain/ModelSku$SkuCategory.smali b/com.discord/smali/com/discord/models/domain/ModelSku$SkuCategory.smali
index a987987046..7a0181a39e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSku$SkuCategory.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSku$SkuCategory.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelSku$SkuCategory;
 .super Ljava/lang/Enum;
+.source "ModelSku.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelSku.smali b/com.discord/smali/com/discord/models/domain/ModelSku.smali
index 7b2ed68b05..e5552b426e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSku.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSku.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelSku;
 .super Ljava/lang/Object;
+.source "ModelSku.kt"
 
 
 # annotations
@@ -55,89 +56,89 @@
 
     move-object v0, p0
 
-    and-int/lit8 v2, p9, 0x1
+    and-int/lit8 v1, p9, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-wide v2, v0, Lcom/discord/models/domain/ModelSku;->applicationId:J
+    iget-wide v1, v0, Lcom/discord/models/domain/ModelSku;->applicationId:J
 
     goto :goto_0
 
     :cond_0
-    move-wide v2, p1
+    move-wide v1, p1
 
     :goto_0
-    and-int/lit8 v4, p9, 0x2
+    and-int/lit8 v3, p9, 0x2
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    iget-object v4, v0, Lcom/discord/models/domain/ModelSku;->name:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/models/domain/ModelSku;->name:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    move-object v4, p3
+    move-object v3, p3
 
     :goto_1
-    and-int/lit8 v5, p9, 0x4
+    and-int/lit8 v4, p9, 0x4
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
-    iget-wide v5, v0, Lcom/discord/models/domain/ModelSku;->id:J
+    iget-wide v4, v0, Lcom/discord/models/domain/ModelSku;->id:J
 
     goto :goto_2
 
     :cond_2
-    move-wide v5, p4
+    move-wide v4, p4
 
     :goto_2
-    and-int/lit8 v7, p9, 0x8
+    and-int/lit8 v6, p9, 0x8
 
-    if-eqz v7, :cond_3
+    if-eqz v6, :cond_3
 
-    iget-object v7, v0, Lcom/discord/models/domain/ModelSku;->application:Lcom/discord/models/domain/ModelApplication;
+    iget-object v6, v0, Lcom/discord/models/domain/ModelSku;->application:Lcom/discord/models/domain/ModelApplication;
 
     goto :goto_3
 
     :cond_3
-    move-object v7, p6
+    move-object v6, p6
 
     :goto_3
-    and-int/lit8 v8, p9, 0x10
+    and-int/lit8 v7, p9, 0x10
 
-    if-eqz v8, :cond_4
+    if-eqz v7, :cond_4
 
-    iget-boolean v8, v0, Lcom/discord/models/domain/ModelSku;->premium:Z
+    iget-boolean v7, v0, Lcom/discord/models/domain/ModelSku;->premium:Z
 
     goto :goto_4
 
     :cond_4
-    move/from16 v8, p7
+    move/from16 v7, p7
 
     :goto_4
-    and-int/lit8 v1, p9, 0x20
+    and-int/lit8 v8, p9, 0x20
 
-    if-eqz v1, :cond_5
+    if-eqz v8, :cond_5
 
-    iget v1, v0, Lcom/discord/models/domain/ModelSku;->type:I
+    iget v8, v0, Lcom/discord/models/domain/ModelSku;->type:I
 
     goto :goto_5
 
     :cond_5
-    move/from16 v1, p8
+    move/from16 v8, p8
 
     :goto_5
-    move-wide p1, v2
+    move-wide p1, v1
 
-    move-object p3, v4
+    move-object p3, v3
 
-    move-wide p4, v5
+    move-wide p4, v4
 
-    move-object p6, v7
+    move-object p6, v6
 
-    move/from16 p7, v8
+    move/from16 p7, v7
 
-    move/from16 p8, v1
+    move/from16 p8, v8
 
     invoke-virtual/range {p0 .. p8}, Lcom/discord/models/domain/ModelSku;->copy(JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZI)Lcom/discord/models/domain/ModelSku;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser$parse$1.smali
index e9e2299bb7..bec08efed6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelStoreListing$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelStoreListing.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
index 2059d15dee..24a47c130b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelStoreListing$Parser;
 .super Ljava/lang/Object;
+.source "ModelStoreListing.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -89,7 +90,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     iget-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali b/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali
index 94a0d875f5..fead197c9b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelStoreListing;
 .super Ljava/lang/Object;
+.source "ModelStoreListing.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Companion.smali
index c28ab4b34f..c1b5635ef5 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelSubscriptionPlan$Companion;
 .super Ljava/lang/Object;
+.source "ModelSubscriptionPlan.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1.smali
index bf2f5f430c..25f9e085c8 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1;
 .super Ljava/lang/Object;
+.source "ModelSubscriptionPlan.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali
index bc935c81fd..0bd796a26d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelSubscriptionPlan$Parser;
 .super Ljava/lang/Object;
+.source "ModelSubscriptionPlan.kt"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model$Parser;
@@ -117,17 +118,14 @@
 
     move-result-wide v0
 
-    :goto_0
-    move-wide v2, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 v0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v2, v0
 
-    :goto_1
     iget-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
@@ -153,12 +151,12 @@
 
     move v5, v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v5, -0x1
 
-    :goto_2
+    :goto_1
     iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
@@ -171,12 +169,12 @@
 
     move v6, v0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const/4 v6, -0x1
 
-    :goto_3
+    :goto_2
     move-object v1, p1
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelSubscriptionPlan;-><init>(JLjava/lang/String;II)V
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali
index d1ca83671d..2ebf59f77a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelSubscriptionPlan;
 .super Ljava/lang/Object;
+.source "ModelSubscriptionPlan.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali b/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali
index cda6fe2231..68a94469d5 100644
--- a/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelTypingResponse;
 .super Ljava/lang/Object;
+.source "ModelTypingResponse.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/ModelUrl.smali b/com.discord/smali/com/discord/models/domain/ModelUrl.smali
index c4b9ad28cf..a454d57375 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUrl.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUrl.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUrl;
 .super Ljava/lang/Object;
+.source "ModelUrl.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Fingerprint.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Fingerprint.smali
index 1a86a55072..94d56439d2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Fingerprint.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Fingerprint.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$Fingerprint;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali
index f40cfe555c..ce5a08c455 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$Me;
 .super Lcom/discord/models/domain/ModelUser;
+.source "ModelUser.java"
 
 
 # annotations
@@ -304,9 +305,9 @@
 
     move-result v1
 
-    const/16 v3, 0x61
+    const/16 v3, 0x4f
 
-    const/16 v4, 0x4f
+    const/16 v4, 0x61
 
     if-eqz v1, :cond_1
 
@@ -346,9 +347,12 @@
 
     if-eqz v1, :cond_3
 
-    const/16 v3, 0x4f
+    goto :goto_3
 
     :cond_3
+    const/16 v3, 0x61
+
+    :goto_3
     add-int/2addr v0, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getToken()Ljava/lang/String;
@@ -361,14 +365,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_4
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_3
+    :goto_4
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x3b
@@ -387,14 +391,14 @@
 
     if-nez v1, :cond_5
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_5
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
-    :goto_4
+    :goto_5
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Notes$Update.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Notes$Update.smali
index 1a8664261c..8a4244b835 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Notes$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Notes$Update.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$Notes$Update;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Notes.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Notes.smali
index 57ad86dbbd..43c0d4622d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Notes.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Notes.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$Notes;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$RequiredAction.smali b/com.discord/smali/com/discord/models/domain/ModelUser$RequiredAction.smali
index 4fdd44b91a..b0ad00faee 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$RequiredAction.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$RequiredAction.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelUser$RequiredAction;
 .super Ljava/lang/Enum;
+.source "ModelUser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$RequiredActionUpdate.smali b/com.discord/smali/com/discord/models/domain/ModelUser$RequiredActionUpdate.smali
index ab8ec220fa..f87329e11d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$RequiredActionUpdate.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$RequiredActionUpdate.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Speaking.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Speaking.smali
index 7c796e304d..b11090078b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Speaking.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Speaking.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$Speaking;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Token.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Token.smali
index 8c9718fc58..f237efbac7 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Token.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Token.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$Token;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali
index 660567c979..a1bdedbe11 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser$Typing;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser.smali b/com.discord/smali/com/discord/models/domain/ModelUser.smali
index 4c4957ae98..865b93a37a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUser;
 .super Ljava/lang/Object;
+.source "ModelUser.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -200,18 +201,18 @@
         .end annotation
     .end param
 
-    const/4 v0, -0x1
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const/4 v1, -0x1
 
     if-nez p0, :cond_1
 
     if-nez p1, :cond_0
 
-    return v1
+    return v0
 
     :cond_0
-    return v0
+    return v1
 
     :cond_1
     const/4 v2, 0x1
@@ -233,10 +234,10 @@
 
     if-nez p3, :cond_3
 
-    return v1
+    return v0
 
     :cond_3
-    return v0
+    return v1
 
     :cond_4
     if-nez p3, :cond_5
@@ -1447,8 +1448,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelUser;->username:Ljava/lang/String;
-
     invoke-virtual {v0}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
     move-result-object v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserConsents.smali b/com.discord/smali/com/discord/models/domain/ModelUserConsents.smali
index 15c46fbf1c..a51535f5a3 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserConsents.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserConsents.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelUserConsents;
 .super Ljava/lang/Object;
+.source "ModelUserConsents.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali
index a395a2b0e0..3225ce458e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;
 .super Ljava/lang/Object;
+.source "ModelUserGuildSettings.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali
index de503946dd..30d83aae48 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUserGuildSettings;
 .super Ljava/lang/Object;
+.source "ModelUserGuildSettings.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -454,8 +455,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->channelOverrides:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
@@ -526,9 +525,9 @@
 
     move-result v0
 
-    const/16 v1, 0x61
+    const/16 v1, 0x4f
 
-    const/16 v2, 0x4f
+    const/16 v2, 0x61
 
     if-eqz v0, :cond_0
 
@@ -568,9 +567,12 @@
 
     if-eqz v3, :cond_2
 
-    const/16 v1, 0x4f
+    goto :goto_2
 
     :cond_2
+    const/16 v1, 0x61
+
+    :goto_2
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x3b
@@ -607,14 +609,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_2
+    :goto_3
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserProfile$GuildReference.smali b/com.discord/smali/com/discord/models/domain/ModelUserProfile$GuildReference.smali
index 206d2154f8..8b1b480bb9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserProfile$GuildReference.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserProfile$GuildReference.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/ModelUserProfile$GuildReference;
 .super Ljava/lang/Object;
+.source "ModelUserProfile.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali b/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
index 02698b0259..54357f0964 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUserProfile;
 .super Ljava/lang/Object;
+.source "ModelUserProfile.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali b/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali
index e64b715b97..2ab4ed60fc 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUserRelationship;
 .super Ljava/lang/Object;
+.source "ModelUserRelationship.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserSettings$FriendSourceFlags.smali b/com.discord/smali/com/discord/models/domain/ModelUserSettings$FriendSourceFlags.smali
index 134592011d..267ba72b24 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserSettings$FriendSourceFlags.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserSettings$FriendSourceFlags.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;
 .super Ljava/lang/Object;
+.source "ModelUserSettings.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -144,9 +145,13 @@
 
     iput-boolean p1, p0, Lcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;->all:Z
 
+    return-void
+
     :goto_2
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
@@ -242,9 +247,9 @@
 
     move-result v0
 
-    const/16 v1, 0x61
+    const/16 v1, 0x4f
 
-    const/16 v2, 0x4f
+    const/16 v2, 0x61
 
     if-eqz v0, :cond_0
 
@@ -284,9 +289,12 @@
 
     if-eqz v3, :cond_2
 
-    const/16 v1, 0x4f
+    goto :goto_2
 
     :cond_2
+    const/16 v1, 0x61
+
+    :goto_2
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserSettings.smali b/com.discord/smali/com/discord/models/domain/ModelUserSettings.smali
index 2be353e8a2..aefd393531 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserSettings.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserSettings.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelUserSettings;
 .super Ljava/lang/Object;
+.source "ModelUserSettings.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -1079,8 +1080,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelUserSettings;->status:Ljava/lang/String;
-
     invoke-static {v0}, Lcom/discord/models/domain/ModelPresence;->getStatus(Ljava/lang/String;)I
 
     move-result v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$OutputMode.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$OutputMode.smali
index a1d686507b..9e98185b97 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$OutputMode.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$OutputMode.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/ModelVoice$OutputMode;
 .super Ljava/lang/Enum;
+.source "ModelVoice.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$Server.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$Server.smali
index 94aea5e71c..bc10ba0808 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$Server.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$Server.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelVoice$Server;
 .super Ljava/lang/Object;
+.source "ModelVoice.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -355,8 +356,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelVoice$Server;->endpoint:Ljava/lang/String;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
index df41eda6ff..72dc3a3832 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelVoice$State;
 .super Ljava/lang/Object;
+.source "ModelVoice.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -689,9 +690,9 @@
 
     move-result v1
 
-    const/16 v3, 0x61
+    const/16 v3, 0x4f
 
-    const/16 v4, 0x4f
+    const/16 v4, 0x61
 
     if-eqz v1, :cond_0
 
@@ -821,9 +822,12 @@
 
     if-eqz v1, :cond_6
 
-    const/16 v3, 0x4f
+    goto :goto_6
 
     :cond_6
+    const/16 v3, 0x61
+
+    :goto_6
     add-int/2addr v0, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
@@ -836,14 +840,14 @@
 
     const/16 v1, 0x2b
 
-    goto :goto_6
+    goto :goto_7
 
     :cond_7
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_6
+    :goto_7
     add-int/2addr v0, v1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$State;->getMember()Lcom/discord/models/domain/ModelGuildMember;
@@ -854,14 +858,14 @@
 
     if-nez v1, :cond_8
 
-    goto :goto_7
+    goto :goto_8
 
     :cond_8
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v5
 
-    :goto_7
+    :goto_8
     add-int/2addr v0, v5
 
     return v0
@@ -890,8 +894,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelVoice$State;->channelId:Ljava/lang/Long;
-
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
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 50cf4f1912..fac313926a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelVoice$User;
 .super Ljava/lang/Object;
+.source "ModelVoice.java"
 
 
 # annotations
@@ -282,8 +283,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelVoice$User;->nickname:Ljava/lang/String;
-
     return-object v0
 
     :cond_0
@@ -383,9 +382,9 @@
 
     move-result v2
 
-    const/16 v3, 0x61
+    const/16 v3, 0x4f
 
-    const/16 v4, 0x4f
+    const/16 v4, 0x61
 
     if-eqz v2, :cond_2
 
@@ -445,9 +444,12 @@
 
     if-eqz v2, :cond_5
 
-    const/16 v3, 0x4f
+    goto :goto_5
 
     :cond_5
+    const/16 v3, 0x61
+
+    :goto_5
     add-int/2addr v0, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
@@ -458,14 +460,14 @@
 
     if-nez v2, :cond_6
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_6
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_5
+    :goto_6
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice.smali b/com.discord/smali/com/discord/models/domain/ModelVoice.smali
index 493a3105fb..cb609ed0b4 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelVoice;
 .super Ljava/lang/Object;
+.source "ModelVoice.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoiceRegion.smali b/com.discord/smali/com/discord/models/domain/ModelVoiceRegion.smali
index 957c728abb..5a18144335 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoiceRegion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoiceRegion.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelVoiceRegion;
 .super Ljava/lang/Object;
+.source "ModelVoiceRegion.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -462,9 +463,9 @@
 
     move-result v2
 
-    const/16 v3, 0x61
+    const/16 v3, 0x4f
 
-    const/16 v4, 0x4f
+    const/16 v4, 0x61
 
     if-eqz v2, :cond_2
 
@@ -512,9 +513,12 @@
 
     if-eqz v1, :cond_4
 
-    const/16 v3, 0x4f
+    goto :goto_4
 
     :cond_4
+    const/16 v3, 0x61
+
+    :goto_4
     add-int/2addr v0, v3
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelWebhook.smali b/com.discord/smali/com/discord/models/domain/ModelWebhook.smali
index faf905108b..813c9aef51 100644
--- a/com.discord/smali/com/discord/models/domain/ModelWebhook.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelWebhook.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/ModelWebhook;
 .super Ljava/lang/Object;
+.source "ModelWebhook.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/TypeAliasesKt.smali b/com.discord/smali/com/discord/models/domain/TypeAliasesKt.smali
index 92db4cc6dc..a582d2295e 100644
--- a/com.discord/smali/com/discord/models/domain/TypeAliasesKt.smali
+++ b/com.discord/smali/com/discord/models/domain/TypeAliasesKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/models/domain/TypeAliasesKt;
 .super Ljava/lang/Object;
+.source "TypeAliases.kt"
diff --git a/com.discord/smali/com/discord/models/domain/emoji/Emoji.smali b/com.discord/smali/com/discord/models/domain/emoji/Emoji.smali
index 1c15bc97e3..949af13862 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/Emoji.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/Emoji.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/models/domain/emoji/Emoji;
 .super Ljava/lang/Object;
+.source "Emoji.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali b/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali
index 165461b0e7..5acab83aa6 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/models/domain/emoji/EmojiCategory;
 .super Ljava/lang/Enum;
+.source "EmojiCategory.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/emoji/EmojiSet.smali b/com.discord/smali/com/discord/models/domain/emoji/EmojiSet.smali
index 8707ec4182..7aaf25c55a 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/EmojiSet.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/EmojiSet.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/emoji/EmojiSet;
 .super Ljava/lang/Object;
+.source "EmojiSet.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$1.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$1.smali
index 6e3c8dad3b..5bcdbb1df4 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$1.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/emoji/ModelEmojiCustom$1;
 .super Ljava/lang/Object;
+.source "ModelEmojiCustom.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
@@ -59,9 +60,9 @@
 
     move-result v0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x1
 
-    const/4 v6, 0x1
+    const/4 v6, 0x0
 
     if-lez v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali
index 86978ebf64..ee67b4c5c3 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;
 .super Ljava/lang/Object;
+.source "ModelEmojiCustom.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali
index 2b445d7744..70bcea40ef 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/emoji/ModelEmojiCustom;
 .super Ljava/lang/Object;
+.source "ModelEmojiCustom.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -290,8 +291,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->nameDisambiguated:Ljava/lang/String;
-
     return-object v0
 
     :cond_0
@@ -1017,8 +1016,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->roles:Ljava/util/List;
-
     return-object v0
 
     :cond_0
@@ -1118,9 +1115,9 @@
 
     move-result v1
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_3
 
@@ -1160,9 +1157,12 @@
 
     if-eqz v1, :cond_5
 
-    const/16 v2, 0x4f
+    goto :goto_5
 
     :cond_5
+    const/16 v2, 0x61
+
+    :goto_5
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$1.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$1.smali
index 7b8698c1e2..3e81cc0efc 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$1.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/models/domain/emoji/ModelEmojiUnicode$1;
 .super Ljava/lang/Object;
+.source "ModelEmojiUnicode.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali
index 89fed9738f..151f15db3d 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/emoji/ModelEmojiUnicode$Bundle;
 .super Ljava/lang/Object;
+.source "ModelEmojiUnicode.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali
index 5d01f8c8b7..3d57420810 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
 .super Ljava/lang/Object;
+.source "ModelEmojiUnicode.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -234,10 +235,9 @@
 
     const/4 v2, 0x0
 
-    :goto_0
     const/4 v3, 0x0
 
-    :goto_1
+    :goto_0
     iget-object v4, p0, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->surrogates:Ljava/lang/String;
 
     invoke-virtual {v4}, Ljava/lang/String;->length()I
@@ -280,6 +280,8 @@
 
     move v2, v5
 
+    const/4 v3, 0x0
+
     goto :goto_0
 
     :cond_0
@@ -291,7 +293,9 @@
 
     move v3, v2
 
-    goto :goto_2
+    move v2, v5
+
+    goto :goto_0
 
     :cond_1
     invoke-static {v2}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
@@ -300,10 +304,9 @@
 
     invoke-interface {v0, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :goto_2
     move v2, v5
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const-string v1, "_"
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali
index b264a8fdda..7d3c711152 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage;
 .super Ljava/lang/Object;
+.source "ModelSpotifyAlbum.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali
index ab08dfd002..e0a7fc7f58 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
 .super Ljava/lang/Object;
+.source "ModelSpotifyAlbum.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali
index c30da96ade..ff2b2d9f51 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
 .super Ljava/lang/Object;
+.source "ModelSpotifyArtist.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyToken.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyToken.smali
index 79b6425339..99db093752 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyToken.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyToken.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/spotify/ModelSpotifyToken;
 .super Ljava/lang/Object;
+.source "ModelSpotifyToken.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali
index 47e70ced0d..8bef72208d 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
 .super Ljava/lang/Object;
+.source "ModelSpotifyTrack.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali b/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
index b1d467b158..7717047ad1 100644
--- a/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/BreadcrumbInterceptor;
 .super Ljava/lang/Object;
+.source "RestInterceptors.kt"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -33,7 +34,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v0
 
@@ -41,7 +42,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lokhttp3/w;->HE()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/w;->HD()Lokhttp3/s;
 
     move-result-object v0
 
@@ -101,7 +102,7 @@
 
     invoke-virtual {v2, v3, v4, v0}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/restapi/BuildConfig.smali b/com.discord/smali/com/discord/restapi/BuildConfig.smali
index b81780afb2..2332fa55a1 100644
--- a/com.discord/smali/com/discord/restapi/BuildConfig.smali
+++ b/com.discord/smali/com/discord/restapi/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/restapi/R$anim.smali b/com.discord/smali/com/discord/restapi/R$anim.smali
index 7e549af037..5179a73d8e 100644
--- a/com.discord/smali/com/discord/restapi/R$anim.smali
+++ b/com.discord/smali/com/discord/restapi/R$anim.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$anim;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$animator.smali b/com.discord/smali/com/discord/restapi/R$animator.smali
index 8ba95c6b37..f7e31d9c0e 100644
--- a/com.discord/smali/com/discord/restapi/R$animator.smali
+++ b/com.discord/smali/com/discord/restapi/R$animator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$animator;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$attr.smali b/com.discord/smali/com/discord/restapi/R$attr.smali
index 4b90fd647c..77ecd061ae 100644
--- a/com.discord/smali/com/discord/restapi/R$attr.smali
+++ b/com.discord/smali/com/discord/restapi/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$bool.smali b/com.discord/smali/com/discord/restapi/R$bool.smali
index 019bf7f8d5..492740741b 100644
--- a/com.discord/smali/com/discord/restapi/R$bool.smali
+++ b/com.discord/smali/com/discord/restapi/R$bool.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$bool;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$color.smali b/com.discord/smali/com/discord/restapi/R$color.smali
index 381f41dd78..f0c2f9f7c3 100644
--- a/com.discord/smali/com/discord/restapi/R$color.smali
+++ b/com.discord/smali/com/discord/restapi/R$color.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$dimen.smali b/com.discord/smali/com/discord/restapi/R$dimen.smali
index 025ab0afa2..0fc7dcdd82 100644
--- a/com.discord/smali/com/discord/restapi/R$dimen.smali
+++ b/com.discord/smali/com/discord/restapi/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index 89864483be..e61f32cbe0 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$id.smali b/com.discord/smali/com/discord/restapi/R$id.smali
index 7eee2c3a8b..447986da10 100644
--- a/com.discord/smali/com/discord/restapi/R$id.smali
+++ b/com.discord/smali/com/discord/restapi/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$integer.smali b/com.discord/smali/com/discord/restapi/R$integer.smali
index dd0143e49b..ee5d62a445 100644
--- a/com.discord/smali/com/discord/restapi/R$integer.smali
+++ b/com.discord/smali/com/discord/restapi/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$interpolator.smali b/com.discord/smali/com/discord/restapi/R$interpolator.smali
index 1d105a71fe..b1c8277832 100644
--- a/com.discord/smali/com/discord/restapi/R$interpolator.smali
+++ b/com.discord/smali/com/discord/restapi/R$interpolator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$interpolator;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$layout.smali b/com.discord/smali/com/discord/restapi/R$layout.smali
index da47263c60..178fd198ac 100644
--- a/com.discord/smali/com/discord/restapi/R$layout.smali
+++ b/com.discord/smali/com/discord/restapi/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali
index 2e0b8ff3cb..72280234d9 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$style.smali b/com.discord/smali/com/discord/restapi/R$style.smali
index c169c263d7..b69773645f 100644
--- a/com.discord/smali/com/discord/restapi/R$style.smali
+++ b/com.discord/smali/com/discord/restapi/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R$styleable.smali b/com.discord/smali/com/discord/restapi/R$styleable.smali
index 9e92a20c69..436f0bd1c3 100644
--- a/com.discord/smali/com/discord/restapi/R$styleable.smali
+++ b/com.discord/smali/com/discord/restapi/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/R.smali b/com.discord/smali/com/discord/restapi/R.smali
index bd766a5eaa..864cc14a16 100644
--- a/com.discord/smali/com/discord/restapi/R.smali
+++ b/com.discord/smali/com/discord/restapi/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor$HeadersProvider.smali b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor$HeadersProvider.smali
index 7614a1857e..d722f8de83 100644
--- a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor$HeadersProvider.smali
+++ b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor$HeadersProvider.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 .super Ljava/lang/Object;
+.source "RestInterceptors.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
index b4e0af4123..a07fbe622b 100644
--- a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RequiredHeadersInterceptor;
 .super Ljava/lang/Object;
+.source "RestInterceptors.kt"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -65,11 +66,11 @@
 
     move-result-object v3
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {v4}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object v4
 
@@ -100,7 +101,7 @@
     invoke-virtual {v3, v0, v2}, Lokhttp3/w$a;->ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_2
-    invoke-virtual {v3}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v3}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIAbortCodes.smali b/com.discord/smali/com/discord/restapi/RestAPIAbortCodes.smali
index cd96993fb4..d78af679b8 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIAbortCodes.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIAbortCodes.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIAbortCodes;
 .super Ljava/lang/Object;
+.source "RestAPIAbortCodes.kt"
 
 
 # static fields
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 1c71386865..40e23d0a7d 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion$clientCallback$1.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion$clientCallback$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/RestAPIBuilder$Companion$clientCallback$1;
 .super Lkotlin/jvm/internal/k;
+.source "RestAPIBuilder.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali
index f32e53587b..228ccd60b1 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIBuilder$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIBuilder.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
index f2ada67872..a8ce689997 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIBuilder;
 .super Ljava/lang/Object;
+.source "RestAPIBuilder.kt"
 
 
 # annotations
@@ -96,81 +97,81 @@
 .end method
 
 .method public static synthetic build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
-    .locals 7
+    .locals 6
 
-    and-int/lit8 v1, p8, 0x2
+    and-int/lit8 v0, p8, 0x2
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     goto :goto_0
 
     :cond_0
-    move v1, p2
+    move v0, p2
 
     :goto_0
-    and-int/lit8 v2, p8, 0x4
+    and-int/lit8 v1, p8, 0x4
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const-wide/16 v2, 0x2710
+    const-wide/16 v1, 0x2710
 
     goto :goto_1
 
     :cond_1
-    move-wide v2, p3
+    move-wide v1, p3
 
     :goto_1
-    and-int/lit8 v4, p8, 0x8
+    and-int/lit8 v3, p8, 0x8
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
-    move-object v4, v5
+    move-object v3, v4
 
     goto :goto_2
 
     :cond_2
-    move-object v4, p5
+    move-object v3, p5
 
     :goto_2
-    and-int/lit8 v6, p8, 0x10
+    and-int/lit8 v5, p8, 0x10
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
     goto :goto_3
 
     :cond_3
-    move-object v5, p6
+    move-object v4, p6
 
     :goto_3
-    and-int/lit8 v0, p8, 0x20
+    and-int/lit8 v5, p8, 0x20
 
-    if-eqz v0, :cond_4
+    if-eqz v5, :cond_4
 
-    const/4 v0, 0x1
+    const/4 v5, 0x1
 
     goto :goto_4
 
     :cond_4
-    move v0, p7
+    move v5, p7
 
     :goto_4
     move-object p2, p0
 
     move-object p3, p1
 
-    move p4, v1
+    move p4, v0
 
-    move-wide p5, v2
+    move-wide p5, v1
 
-    move-object p7, v4
+    move-object p7, v3
 
-    move-object p8, v5
+    move-object p8, v4
 
-    move/from16 p9, v0
+    move p9, v5
 
     invoke-virtual/range {p2 .. p9}, Lcom/discord/restapi/RestAPIBuilder;->build(Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;Z)Ljava/lang/Object;
 
@@ -241,7 +242,7 @@
     iput-boolean v3, v0, Lcom/google/gson/f;->serializeNulls:Z
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/gson/f;->CL()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->CK()Lcom/google/gson/Gson;
 
     move-result-object p4
 
@@ -275,7 +276,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/a/a/i;->Ko()Lb/a/a/i;
+    invoke-static {}, Lb/a/a/i;->Kn()Lb/a/a/i;
 
     move-result-object p5
 
@@ -285,7 +286,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/b/b/c;->Kp()Lb/b/b/c;
+    invoke-static {}, Lb/b/b/c;->Ko()Lb/b/b/c;
 
     move-result-object p5
 
@@ -309,7 +310,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lb/n$a;->Kl()Lb/n;
+    invoke-virtual {p1}, Lb/n$a;->Kk()Lb/n;
 
     move-result-object p1
 
@@ -431,7 +432,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->Hz()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->Hy()Lokhttp3/t;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface$Companion.smali
index 125950b72d..b1e05ce477 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIInterface$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIInterface.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali
index a903d5e072..29704176c4 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/restapi/RestAPIInterface$Dynamic;
 .super Ljava/lang/Object;
+.source "RestAPIInterface.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
index 42d9d33b37..53235786b8 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/restapi/RestAPIInterface;
 .super Ljava/lang/Object;
+.source "RestAPIInterface.kt"
 
 
 # annotations
@@ -133,7 +134,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            Kq = true
+            Kp = true
             value = "reaction"
         .end annotation
     .end param
@@ -1277,7 +1278,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            Kq = true
+            Kp = true
             value = "emoji"
         .end annotation
     .end param
@@ -1781,7 +1782,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            Kq = true
+            Kp = true
             value = "reaction"
         .end annotation
     .end param
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$AuthLogin.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$AuthLogin.smali
index 48094db7b1..91c3471add 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$AuthLogin.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$AuthLogin.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$AuthLogin;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$AuthRegister.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$AuthRegister.smali
index 402bc91f4a..94e803bae8 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$AuthRegister.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$AuthRegister.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$AuthRegister;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CaptchaCode.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CaptchaCode.smali
index 7b99384cb8..7a55e061ba 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CaptchaCode.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CaptchaCode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$CaptchaCode;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Channel.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Channel.smali
index f9841d5f8c..4b2cd4fc22 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Channel.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Channel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Channel;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
index d67ceb9941..92523d16ec 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
index f260fffa8c..66b8e1b8df 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Companion.smali
index 083b769eac..253c1fc153 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ChannelPosition$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali
index fda43f4585..2ff934fdd8 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ChannelPosition$Serializer;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 # interfaces
 .implements Lcom/google/gson/o;
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition.smali
index 59c46c17af..73686d1c7a 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ChannelPosition;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali
index 63ab0e0c64..d3b067ab96 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ConnectedAccount$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali
index ea0baef3c6..d5a789cb62 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectionState.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectionState.smali
index 9fe833d075..b7f5a91e77 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectionState.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectionState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ConnectionState;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents$Type.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents$Type.smali
index d92e1f60d9..ad34017e6c 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents$Type.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents$Type.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Consents$Type;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
index 6d2e67625e..959ba6aa83 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Consents;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
index d8eea71863..b82895069d 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$CreateChannel;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali
index 2bc1f78968..ac7c5d7bd4 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$CreateGuild;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildChannel.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildChannel.smali
index cd0e1639fa..7a51463ec8 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildChannel.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildChannel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$CreateGuildChannel;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$DeleteGuild.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$DeleteGuild.smali
index 32dd82a05f..e1a7bfa686 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$DeleteGuild.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$DeleteGuild.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$DeleteGuild;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$EmptyBody.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$EmptyBody.smali
index 269c9b9e45..c3b4cfd999 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$EmptyBody.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$EmptyBody.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$EmptyBody;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$EnableIntegration.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$EnableIntegration.smali
index 15c535cc1c..09b139b43e 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$EnableIntegration.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$EnableIntegration.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$EnableIntegration;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ForgotPassword.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ForgotPassword.smali
index 21a6cc26e3..a0f1878c28 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ForgotPassword.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ForgotPassword.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$ForgotPassword;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$GroupDM.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$GroupDM.smali
index ab0d56bc82..f4074b07a7 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$GroupDM.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$GroupDM.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$GroupDM;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildIntegration.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildIntegration.smali
index 789813e06d..7d5d2ff8ad 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildIntegration.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildIntegration.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$GuildIntegration;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMFA.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMFA.smali
index 70d1a5893c..bbb61b864d 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMFA.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMFA.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$GuildMFA;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember$Companion.smali
index 6eacc4892a..6be9a179ea 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$GuildMember$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember.smali
index 4df5d2f18b..084405f8cf 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$GuildMember.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$GuildMember;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Invite.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Invite.smali
index 2d20825d2f..490e954452 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Invite.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Invite.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Invite;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$MFALogin.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$MFALogin.smali
index 460016a5b8..011931c8c4 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$MFALogin.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$MFALogin.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$MFALogin;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali
index 7b7cf42ad0..50b6149f4b 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Message;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Nick.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Nick.smali
index 5a22e92cf5..8b8a342ab4 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Nick.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Nick.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Nick;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Phone.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Phone.smali
index a1be61eb1c..7d613901e7 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Phone.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Phone.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Phone;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Ring.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Ring.smali
index 0b057a2b68..cfefcb4d19 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Ring.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Ring.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Ring;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali
index 1f3780f3c0..258cf8517a 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Role$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Role.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Role.smali
index c745604d0b..79b940926c 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Role.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Role.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Role;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
@@ -185,9 +186,14 @@
 
     const-wide/16 p7, 0x0
 
+    move-wide p8, p7
+
+    goto :goto_6
+
     :cond_6
     move-wide p8, p7
 
+    :goto_6
     move-object p1, p0
 
     move-object p2, p10
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Track$Event.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Track$Event.smali
index fe2ce2c431..8593eded44 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Track$Event.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Track$Event.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Track$Event;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Track.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Track.smali
index 758912c71e..426d9362c7 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Track.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Track.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$Track;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$TransferGuildOwnership.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$TransferGuildOwnership.smali
index 6cccc083cc..82fe6325ac 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$TransferGuildOwnership.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$TransferGuildOwnership.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$TransferGuildOwnership;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild$Companion.smali
index 59897dcc1f..848fea47e2 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UpdateGuild$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild.smali
index b2724ecf96..995accccb5 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UpdateGuild.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UpdateGuild;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserAgreements.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserAgreements.smali
index 7c55cb7c76..a8014f94f1 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserAgreements.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserAgreements.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserAgreements;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserDevices.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserDevices.smali
index 71166963ee..ba0449261b 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserDevices.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserDevices.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserDevices;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride.smali
index 4ed5f438ce..6870c5f746 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali
index 7356b3694c..ebd9d886ef 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali
index 15bd768401..90fabae92b 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserInfo$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo.smali
index 345ee32dbe..022c511591 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserInfo;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
index ee1b3705f2..96e0546533 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali
index 4b4cd75ffd..c2d71dbb85 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship.smali
index da9e85ad34..9b40f5a1e7 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserRelationship;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali
index ccf00ca32c..0857c53b5e 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserSettings$Companion;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags.smali
index 10e876188e..8da1af46c9 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings.smali
index 2f2630a941..23c00db49a 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$UserSettings;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$VanityUrl.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$VanityUrl.smali
index fda9522ffb..bbf0d1e7bd 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$VanityUrl.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$VanityUrl.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$VanityUrl;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$VerificationCode.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$VerificationCode.smali
index 0b060becf1..a8907e5ee1 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$VerificationCode.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$VerificationCode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams$VerificationCode;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams.smali b/com.discord/smali/com/discord/restapi/RestAPIParams.smali
index dd87d9046b..62b92b9518 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/RestAPIParams;
 .super Ljava/lang/Object;
+.source "RestAPIParams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/restapi/SpotifyAuthInterceptor.smali b/com.discord/smali/com/discord/restapi/SpotifyAuthInterceptor.smali
index bd08a32cf5..ff4f9a906e 100644
--- a/com.discord/smali/com/discord/restapi/SpotifyAuthInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/SpotifyAuthInterceptor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/SpotifyAuthInterceptor;
 .super Ljava/lang/Object;
+.source "RestInterceptors.kt"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -41,11 +42,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -103,7 +104,7 @@
 
     invoke-virtual {v0, v2, v1}, Lokhttp3/w$a;->ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
index b82eb72df5..d89dc6177f 100644
--- a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/SpotifyTokenInterceptor;
 .super Ljava/lang/Object;
+.source "RestInterceptors.kt"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -33,11 +34,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -63,7 +64,7 @@
 
     invoke-virtual {v0, v1, v2}, Lokhttp3/w$a;->ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali
index 2347d19143..58e9e7793f 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/utils/CountingRequestBody$CountingSink;
 .super Lokio/e;
+.source "CountingRequestBody.kt"
 
 
 # annotations
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 ad13281d63..613dbcc99f 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1;
 .super Lkotlin/jvm/internal/i;
+.source "CountingRequestBody.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
index d3074e8649..b0d6f6db31 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/utils/CountingRequestBody;
 .super Lokhttp3/RequestBody;
+.source "CountingRequestBody.kt"
 
 
 # annotations
@@ -151,11 +152,11 @@
 
     iget-object v0, p0, Lcom/discord/restapi/utils/CountingRequestBody;->bytesWrittenSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KF()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KE()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali
index 094e928405..4ca254b1ba 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/utils/RetryWithDelay$restRetry$1;
 .super Lkotlin/jvm/internal/k;
+.source "RetryWithDelay.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -88,23 +89,23 @@
 
     check-cast v0, Lb/h;
 
-    invoke-virtual {v0}, Lb/h;->EF()I
+    invoke-virtual {v0}, Lb/h;->EE()I
 
     move-result v2
 
-    invoke-virtual {v0}, Lb/h;->Kc()Lb/m;
+    invoke-virtual {v0}, Lb/h;->Kb()Lb/m;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lb/m;->Kk()Lokhttp3/Response;
+    invoke-virtual {v0}, Lb/m;->Kj()Lokhttp3/Response;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/Response;->GY()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/Response;->GX()Lokhttp3/w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali
index 419b8fd3e1..bfed8d8a19 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/utils/RetryWithDelay$restRetry$2$1;
 .super Lkotlin/jvm/internal/i;
+.source "RetryWithDelay.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali
index 8ee737273c..576e1dafda 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/utils/RetryWithDelay$restRetry$2;
 .super Ljava/lang/Object;
+.source "RetryWithDelay.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali
index afb8060c52..d87d75a9f3 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/restapi/utils/RetryWithDelay$retryWithDelay$1;
 .super Ljava/lang/Object;
+.source "RetryWithDelay.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali
index 6b9d5e7697..f0b8a56aa6 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/restapi/utils/RetryWithDelay;
 .super Ljava/lang/Object;
+.source "RetryWithDelay.kt"
 
 
 # static fields
@@ -46,9 +47,14 @@
 
     const-wide/16 p2, 0x3e8
 
+    move-wide v2, p2
+
+    goto :goto_0
+
     :cond_0
     move-wide v2, p2
 
+    :goto_0
     and-int/lit8 p2, p6, 0x2
 
     const/4 p3, 0x3
@@ -59,9 +65,14 @@
 
     move-result-object p4
 
+    move-object v4, p4
+
+    goto :goto_1
+
     :cond_1
     move-object v4, p4
 
+    :goto_1
     and-int/lit8 p2, p6, 0x4
 
     if-eqz p2, :cond_2
@@ -70,9 +81,14 @@
 
     move-result-object p5
 
+    move-object v5, p5
+
+    goto :goto_2
+
     :cond_2
     move-object v5, p5
 
+    :goto_2
     move-object v0, p0
 
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/rtcconnection/R.smali b/com.discord/smali/com/discord/rtcconnection/R.smali
index d854c16a8a..f3ddf0c55c 100644
--- a/com.discord/smali/com/discord/rtcconnection/R.smali
+++ b/com.discord/smali/com/discord/rtcconnection/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 b8ed84ac1c..bdcafccf6c 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$1$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali
index 2149fd3a4e..154a483cc4 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$1;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali
index 4e0bcd62be..9aa46024ae 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 .super Ljava/lang/Enum;
+.source "RtcConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality$a.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality$a.smali
index 13c58b681e..583d1d2450 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$Quality$a;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali
index 655f0f46db..6855ebd9b3 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/RtcConnection$Quality;
 .super Ljava/lang/Enum;
+.source "RtcConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State.smali
index 55015bf55f..9c5e5973bb 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/RtcConnection$State;
 .super Ljava/lang/Enum;
+.source "RtcConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$a.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$a.smali
index 8b3b07638f..fbad979acf 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$a;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$b.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$b.smali
index 857d122ac9..2d0620e17e 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/rtcconnection/RtcConnection$b;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali
index 6035c93e87..0e1ec5d10a 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$c;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
index f1ef33e7c4..4bbd14f2c4 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$d;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -83,7 +84,6 @@
 
     const-string v3, "Connect called on destroyed instance."
 
-    :goto_0
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -98,7 +98,7 @@
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_0
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
@@ -121,7 +121,21 @@
 
     const-string v3, "Connect called with no token."
 
-    goto :goto_0
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v6, 0xc
+
+    const/4 v7, 0x0
+
+    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
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)V
+
+    goto/16 :goto_3
 
     :cond_1
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
@@ -182,12 +196,12 @@
 
     const/4 v0, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/4 v0, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz v0, :cond_3
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
@@ -196,7 +210,7 @@
 
     invoke-static {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/RtcConnection$State;)V
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_3
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
@@ -205,12 +219,12 @@
 
     const-string v0, "wss"
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const-string v0, "ws"
 
-    :goto_2
+    :goto_1
     new-instance v2, Ljava/lang/StringBuilder;
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
@@ -256,7 +270,7 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_3
+    goto :goto_2
 
     :catch_0
     move-exception v2
@@ -285,7 +299,7 @@
 
     invoke-virtual {v3, v4, v2, v5}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    :goto_3
+    :goto_2
     iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
     new-instance v9, Lcom/discord/rtcconnection/socket/a;
@@ -314,7 +328,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->dX()Ljava/util/concurrent/ExecutorService;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->dW()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v8
 
@@ -342,7 +356,7 @@
 
     invoke-static {v2, v9}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/socket/a;)V
 
-    :goto_4
+    :goto_3
     sget-object v0, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
     return-object v0
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
index 17394a44dc..eaa9b82528 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$e;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;->dR()Ljava/util/concurrent/Future;
+    value = Lcom/discord/rtcconnection/RtcConnection;->dQ()Ljava/util/concurrent/Future;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -57,7 +58,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->dV()Lkotlin/Unit;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->dU()Lkotlin/Unit;
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$e;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
index 86db76bdec..ae01b37d12 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$f;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;->dS()V
+    value = Lcom/discord/rtcconnection/RtcConnection;->dR()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali
index 7417436c4b..dfc602e367 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$g;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali
index 0a6e5ee977..b7750dee4f 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$h;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali
index b007c8afe9..4001bf7d47 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$i;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali
index 5fe44dde92..aae6362bbc 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$j;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali
index 1ef94fc777..172dfc0c97 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$k;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali
index 5b12113842..639bbed65a 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/RtcConnection$l;
 .super Lkotlin/jvm/internal/k;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali
index 0c419e9437..9ab464ad8e 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$m;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/socket/a$c;
@@ -85,7 +86,7 @@
     return-void
 .end method
 
-.method public final dT()V
+.method public final dS()V
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$m;->this$0:Lcom/discord/rtcconnection/RtcConnection;
@@ -95,7 +96,7 @@
     return-void
 .end method
 
-.method public final dU()V
+.method public final dT()V
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$m;->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 c39126d08d..132f9707f4 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 
 # annotations
@@ -392,26 +393,22 @@
 
     invoke-static {v3, v2, v5, v5, v4}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
 
-    move-result v3
+    move-result v2
 
-    const/4 v4, -0x1
+    const/4 v3, -0x1
 
-    if-ne v3, v4, :cond_0
+    if-ne v2, v3, :cond_0
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v2}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    add-int/2addr v3, v2
+    add-int/lit8 v2, v2, 0x3
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
-    move-result v2
+    move-result v3
 
-    invoke-virtual {v0, v3, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v0, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v0
 
@@ -491,7 +488,7 @@
 
     invoke-static/range {v2 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->dS()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->dR()V
 
     return-void
 
@@ -548,7 +545,7 @@
 
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    invoke-virtual {p2}, Lcom/discord/rtcconnection/d;->dV()Lkotlin/Unit;
+    invoke-virtual {p2}, Lcom/discord/rtcconnection/d;->dU()Lkotlin/Unit;
 
     :cond_6
     iget-wide v0, p2, Lcom/discord/rtcconnection/d;->wP:J
@@ -634,7 +631,7 @@
 
     sget-object v0, Lkotlin/jvm/internal/g;->bQb:Lkotlin/jvm/internal/g;
 
-    invoke-static {}, Lkotlin/jvm/internal/g;->Fk()D
+    invoke-static {}, Lkotlin/jvm/internal/g;->Fj()D
 
     move-result-wide v0
 
@@ -700,6 +697,8 @@
 
     invoke-interface {p0, p1, p2, p3, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->a(JILjava/lang/Integer;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -723,6 +722,8 @@
 
     invoke-interface {p0, p1, p2, p3, p4}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->a(JILjava/lang/Integer;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1127,7 +1128,7 @@
     invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
 
     :goto_1
-    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/RtcConnection;->dS()V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/RtcConnection;->dR()V
 
     return-void
 
@@ -1194,7 +1195,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
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/RtcConnection;->dS()V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/RtcConnection;->dR()V
 
     return-void
 
@@ -1294,6 +1295,8 @@
 
     invoke-interface {p0, p1, p2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->a(Ljava/lang/String;[I)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1313,7 +1316,6 @@
 
     const/4 v2, 0x1
 
-    :goto_0
     invoke-virtual {p0, v0, v1, p1, v2}, Lcom/discord/rtcconnection/socket/a;->a(JLjava/lang/String;Z)V
 
     return-void
@@ -1325,7 +1327,9 @@
 
     const/4 v2, 0x0
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v1, p1, v2}, Lcom/discord/rtcconnection/socket/a;->a(JLjava/lang/String;Z)V
+
+    return-void
 
     :cond_1
     return-void
@@ -1560,28 +1564,28 @@
 
     move-result v5
 
-    add-int/2addr v2, v5
+    add-int/2addr v3, v5
 
     invoke-virtual {v4}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsReceived()I
 
     move-result v4
 
-    add-int/2addr v3, v4
+    add-int/2addr v2, v4
 
     goto :goto_2
 
     :cond_7
     const-string v0, "packets_received"
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-interface {p2, v0, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p2, v0, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const-string v0, "packets_received_lost"
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
@@ -1634,7 +1638,7 @@
 
     if-nez p1, :cond_b
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->dS()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->dR()V
 
     :cond_b
     return-void
@@ -1717,12 +1721,12 @@
 .method public static final synthetic d(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->dS()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->dR()V
 
     return-void
 .end method
 
-.method private final dS()V
+.method private final dR()V
     .locals 1
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$f;->wN:Lcom/discord/rtcconnection/RtcConnection$f;
@@ -1733,7 +1737,7 @@
 
     invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->removeAllListeners()V
 
-    invoke-virtual {p0}, Lcom/discord/rtcconnection/RtcConnection;->dR()Ljava/util/concurrent/Future;
+    invoke-virtual {p0}, Lcom/discord/rtcconnection/RtcConnection;->dQ()Ljava/util/concurrent/Future;
 
     return-void
 .end method
@@ -1971,7 +1975,7 @@
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->dX()Ljava/util/concurrent/ExecutorService;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->dW()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -1993,7 +1997,7 @@
     return-object p1
 .end method
 
-.method public final dR()Ljava/util/concurrent/Future;
+.method public final dQ()Ljava/util/concurrent/Future;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/discord/rtcconnection/c.smali b/com.discord/smali/com/discord/rtcconnection/c.smali
index 63ce916763..81e5c63fdd 100644
--- a/com.discord/smali/com/discord/rtcconnection/c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/c;
 .super Ljava/lang/Object;
+.source "RtcConnection.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 23155adf14..6dba84b302 100644
--- a/com.discord/smali/com/discord/rtcconnection/d$a$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/d$a$1;
 .super Lkotlin/jvm/internal/i;
+.source "RtcStatsCollector.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/d$a.smali b/com.discord/smali/com/discord/rtcconnection/d$a.smali
index 1f492855e5..f1e537c59d 100644
--- a/com.discord/smali/com/discord/rtcconnection/d$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/d$a;
 .super Ljava/lang/Object;
+.source "RtcStatsCollector.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/rtcconnection/d$b.smali b/com.discord/smali/com/discord/rtcconnection/d$b.smali
index b861eec247..18c6a64712 100644
--- a/com.discord/smali/com/discord/rtcconnection/d$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/d$b;
 .super Ljava/lang/Object;
+.source "RtcStatsCollector.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/rtcconnection/d.smali b/com.discord/smali/com/discord/rtcconnection/d.smali
index 11f3864df7..44b96ec7a8 100644
--- a/com.discord/smali/com/discord/rtcconnection/d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/d;
 .super Ljava/lang/Object;
+.source "RtcStatsCollector.kt"
 
 
 # instance fields
@@ -49,7 +50,7 @@
 
 
 # virtual methods
-.method public final dV()Lkotlin/Unit;
+.method public final dU()Lkotlin/Unit;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/d;->subscription:Lrx/Subscription;
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 5384ee2d31..8b773fda52 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
 .super Ljava/lang/Object;
+.source "MediaEngine.kt"
 
 
 # annotations
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 37d4825b2e..6b70013ba8 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 .super Ljava/lang/Enum;
+.source "MediaEngine.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali
index 57b8beddda..e652b162cb 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
 .super Ljava/lang/Object;
+.source "MediaEngine.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$b.smali
index cba8c35eb2..b85fd850b5 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;
 .super Ljava/lang/Object;
+.source "MediaEngine.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$c.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$c.smali
index 68b6d5307b..6c6ba28137 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;
 .super Ljava/lang/Exception;
+.source "MediaEngine.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
index 1d5cb46ca5..aafa105c72 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 .super Ljava/lang/Object;
+.source "MediaEngine.kt"
 
 
 # annotations
@@ -59,10 +60,10 @@
     .end annotation
 .end method
 
-.method public abstract dW()Lcom/hammerandchisel/libdiscord/Discord;
+.method public abstract dV()Lcom/hammerandchisel/libdiscord/Discord;
 .end method
 
-.method public abstract dX()Ljava/util/concurrent/ExecutorService;
+.method public abstract dW()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 1ebf53ec3f..b0f8933c16 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 .super Ljava/lang/Enum;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a.smali
index 0eef82fe24..af30197223 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
 .super Ljava/lang/Object;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
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 1e646bf354..f8ffd9ea91 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
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 .super Ljava/lang/Enum;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
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 248b39ff54..a84b9749b1 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 .super Ljava/lang/Exception;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
@@ -29,9 +30,9 @@
 
     sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->xi:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_0
 
@@ -43,7 +44,7 @@
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    invoke-static {v2, v3, v1}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v2, v3, v0}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v2
 
@@ -70,7 +71,7 @@
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    invoke-static {v2, v3, v1}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v2, v3, v0}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v2
 
@@ -89,20 +90,20 @@
     :cond_3
     if-eqz p1, :cond_4
 
-    move-object v0, p1
+    move-object v1, p1
 
-    check-cast v0, Ljava/lang/CharSequence;
+    check-cast v1, Ljava/lang/CharSequence;
 
     const-string v2, "OnAddressIPResolved"
 
     check-cast v2, Ljava/lang/CharSequence;
 
-    invoke-static {v0, v2, v1}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v1, v2, v0}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
-    move-result v0
+    move-result v1
 
     :cond_4
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
     sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->xe:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
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 ae09c8a89f..560c881319 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 .super Ljava/lang/Enum;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
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 60dc085f35..2875b2cf63 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
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 .super Ljava/lang/Enum;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
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 dd1e45153a..3398a00d6a 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 .super Ljava/lang/Object;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
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 4bf9b499b7..092573eabd 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;
 .super Ljava/lang/Object;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
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 a54e6623b9..bb0c850d6c 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 .super Ljava/lang/Object;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
index 0c18be238d..d2733c7b8f 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 .super Ljava/lang/Object;
+.source "MediaEngineConnection.kt"
 
 
 # annotations
@@ -53,6 +54,9 @@
 .method public abstract destroy()V
 .end method
 
+.method public abstract q(Z)V
+.end method
+
 .method public abstract r(Z)V
 .end method
 
@@ -67,6 +71,3 @@
 
 .method public abstract t(Z)V
 .end method
-
-.method public abstract u(Z)V
-.end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a.smali
index e2dfbdef37..42b9b3c3ee 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/a;
 .super Ljava/lang/Object;
+.source "MediaEngineFactory.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$a.smali
index 9599c02a01..5d65ce8e28 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/a/a$a;
 .super Ljava/lang/Object;
+.source "MediaEngineConnectionLegacy.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b$1.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b$1.smali
index 179f619c21..99c2d0ddc0 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$b$1;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 5d5a1298ee..ab773d21f4 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$b;
 .super Ljava/lang/Object;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c.smali
index f36137f3ad..fc76e941d1 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$c;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3f39a81016..db66b9dfb4 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$d;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e.smali
index 131d0c2037..4d72fd9d8c 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/a/a$e;
 .super Ljava/lang/Object;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lcom/hammerandchisel/libdiscord/Discord$GetStatsCallback;
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$f.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$f.smali
index 9870d845a3..592c9bad38 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$f;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8d49c6209c..8df2d7fb44 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$g;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 c3651a0701..08114ccbf8 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$h;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a78fe9c605..e69b10f454 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$i;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 467ae6db59..d5ada53c6e 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$j;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -78,17 +79,14 @@
 
     move-result-object p1
 
-    :goto_0
-    move-object v3, p1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v3, p1
 
-    :goto_1
     iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
     invoke-static {p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->b(Lcom/discord/rtcconnection/mediaengine/a/a;)Ljava/util/HashMap;
@@ -122,9 +120,7 @@
 
     iget v5, p0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->$videoSsrc:I
 
-    iget p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->$videoSsrc:I
-
-    invoke-static {p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->z(I)I
+    invoke-static {v5}, Lcom/discord/rtcconnection/mediaengine/a/a;->z(I)I
 
     move-result v6
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k$1.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k$1.smali
index 7664edf7dc..12b6b41c31 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$k$1;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 7e85b3423b..41373d96bd 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$k;
 .super Ljava/lang/Object;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lcom/hammerandchisel/libdiscord/Discord$UserSpeakingStatusChangedCallback;
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l$1.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l$1.smali
index e79ad330ca..9be345a542 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$l$1;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 b3b37a4288..45a543ed10 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/a$l;
 .super Ljava/lang/Object;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lcom/hammerandchisel/libdiscord/Discord$OnVideoCallback;
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 087c663582..2e1a987be7 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/a/a;
 .super Ljava/lang/Object;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
@@ -352,7 +353,6 @@
 
     invoke-direct {p1, v1}, Lcom/discord/rtcconnection/mediaengine/a/a$f;-><init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;)V
 
-    :goto_2
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->e(Lkotlin/jvm/functions/Function1;)V
@@ -373,14 +373,22 @@
 
     sget-object p1, Lcom/discord/rtcconnection/mediaengine/a/a$g;->xE:Lcom/discord/rtcconnection/mediaengine/a/a$g;
 
-    goto :goto_2
+    check-cast p1, Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->e(Lkotlin/jvm/functions/Function1;)V
+
+    return-void
 
     :cond_4
     new-instance p1, Lcom/discord/rtcconnection/mediaengine/a/a$h;
 
     invoke-direct {p1, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$h;-><init>(Ljava/lang/String;)V
 
-    goto :goto_2
+    check-cast p1, Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->e(Lkotlin/jvm/functions/Function1;)V
+
+    return-void
 .end method
 
 .method public static final synthetic access$getTAG$cp()Ljava/lang/String;
@@ -922,7 +930,7 @@
     return-void
 .end method
 
-.method public final r(Z)V
+.method public final q(Z)V
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->xA:Lcom/hammerandchisel/libdiscord/Discord;
@@ -932,6 +940,26 @@
     return-void
 .end method
 
+.method public final r(Z)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->xA:Lcom/hammerandchisel/libdiscord/Discord;
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x2
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, -0x1
+
+    :goto_0
+    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setEchoCancellation(I)V
+
+    return-void
+.end method
+
 .method public final s(Z)V
     .locals 1
 
@@ -947,7 +975,7 @@
     const/4 p1, -0x1
 
     :goto_0
-    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setEchoCancellation(I)V
+    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setNoiseSuppression(I)V
 
     return-void
 .end method
@@ -986,26 +1014,6 @@
     :cond_0
     const/4 p1, -0x1
 
-    :goto_0
-    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setNoiseSuppression(I)V
-
-    return-void
-.end method
-
-.method public final u(Z)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->xA:Lcom/hammerandchisel/libdiscord/Discord;
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x2
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, -0x1
-
     :goto_0
     invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setAutomaticGainControl(I)V
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/b.smali
index 5f13df6d0c..c0e94c6701 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/b;
 .super Ljava/lang/Object;
+.source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$a.smali
index dc87f64fdd..8a6e90c913 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/a/c$a;
 .super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 
 # annotations
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 6323bf2596..cf8019c255 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/c$b$1;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 ef3591eba3..fa02775de1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/c$b$2;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 9b3d3af22a..a62458b936 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/c$b$3;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 852c540667..d22cf31b8b 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/a/c$b;
 .super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
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 8e97e828a6..037ec5e215 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/c$c;
 .super Lkotlin/jvm/internal/k;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e60f27ecc1..2e2676cf43 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/c$d;
 .super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lcom/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback;
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 9ca114c1ae..1a8fedb4d1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/c$e;
 .super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lorg/webrtc/Logging$ExternalReporter;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c;->dY()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->dX()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 a8f3f65c49..08e64df765 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/c$f;
 .super Lkotlin/jvm/internal/i;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c;->dY()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->dX()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 2df720ec1d..37f58373b2 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/mediaengine/a/c;
 .super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/mediaengine/MediaEngine;
@@ -147,7 +148,7 @@
     return-object p0
 .end method
 
-.method private final dY()V
+.method private final dX()V
     .locals 8
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->xA:Lcom/hammerandchisel/libdiscord/Discord;
@@ -199,20 +200,21 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const/4 v0, 0x1
 
+    invoke-static {v0}, Lorg/webrtc/voiceengine/WebRtcAudioManager;->setBlacklistDeviceForOpenSLESUsage(Z)V
+
     goto :goto_0
 
     :pswitch_1
     const/4 v0, 0x0
 
-    :goto_0
     invoke-static {v0}, Lorg/webrtc/voiceengine/WebRtcAudioManager;->setBlacklistDeviceForOpenSLESUsage(Z)V
 
-    :goto_1
+    :goto_0
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/c$e;
 
     invoke-direct {v0, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$e;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c;)V
@@ -230,11 +232,11 @@
 
     iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->xA:Lcom/hammerandchisel/libdiscord/Discord;
     :try_end_0
-    .catch Ljava/lang/ExceptionInInitializerError; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/ExceptionInInitializerError; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/lang/UnsatisfiedLinkError; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_3
+    goto :goto_1
 
     :catch_0
     move-exception v0
@@ -251,7 +253,15 @@
 
     const-string v3, "Unable to initialize voice engine, new error discovered"
 
-    goto :goto_2
+    const/4 v5, 0x0
+
+    const/16 v6, 0x8
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+
+    goto :goto_1
 
     :catch_1
     move-exception v0
@@ -270,7 +280,6 @@
 
     check-cast v4, Ljava/lang/Throwable;
 
-    :goto_2
     const/4 v5, 0x0
 
     const/16 v6, 0x8
@@ -279,7 +288,34 @@
 
     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_3
+    goto :goto_1
+
+    :catch_2
+    move-exception v0
+
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
+
+    const-string v3, "TAG"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "Unable to initialize voice engine."
+
+    move-object v4, v0
+
+    check-cast v4, Ljava/lang/Throwable;
+
+    const/4 v5, 0x0
+
+    const/16 v6, 0x8
+
+    const/4 v7, 0x0
+
+    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;->xA:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_1
@@ -293,8 +329,6 @@
     :cond_1
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -399,7 +433,7 @@
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->dY()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->dX()V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->xA:Lcom/hammerandchisel/libdiscord/Discord;
 
@@ -515,7 +549,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->dY()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->dX()V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->xA:Lcom/hammerandchisel/libdiscord/Discord;
 
@@ -529,6 +563,8 @@
 
     invoke-virtual {v0, v1}, Lcom/hammerandchisel/libdiscord/Discord;->getVideoInputDevices(Lcom/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -548,7 +584,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->dY()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->dX()V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->xA:Lcom/hammerandchisel/libdiscord/Discord;
 
@@ -574,11 +610,13 @@
 
     invoke-virtual {p1, v0}, Lcom/hammerandchisel/libdiscord/Discord;->setLocalVoiceLevelChangedCallback(Lcom/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback;)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
 
-.method public final dW()Lcom/hammerandchisel/libdiscord/Discord;
+.method public final dV()Lcom/hammerandchisel/libdiscord/Discord;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->xA:Lcom/hammerandchisel/libdiscord/Discord;
@@ -586,7 +624,7 @@
     return-object v0
 .end method
 
-.method public final dX()Ljava/util/concurrent/ExecutorService;
+.method public final dW()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->executorService:Ljava/util/concurrent/ExecutorService;
@@ -639,6 +677,8 @@
 
     invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setSpeakerVolume(F)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -652,6 +692,8 @@
 
     invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setVideoBroadcast(Z)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -665,6 +707,8 @@
 
     invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setVideoInputDevice(I)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/e.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/e.smali
index f557b840a7..f665a1a88f 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/e;
 .super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Lcom/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback;
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/f.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/f.smali
index e0aac98717..201fccf08d 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/mediaengine/a/f;
 .super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$a.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$a.smali
index 46c537c339..eeae9d2b7a 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/a$a;
 .super Ljava/lang/Object;
+.source "RtcControlSocket.kt"
 
 
 # annotations
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 027d85f098..23b86e7a3e 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/a$b;
 .super Ljava/lang/Enum;
+.source "RtcControlSocket.kt"
 
 
 # annotations
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 a59c697e5a..3e7ea1f599 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/rtcconnection/socket/a$c;
 .super Ljava/lang/Object;
+.source "RtcControlSocket.kt"
 
 
 # annotations
@@ -32,10 +33,10 @@
 .method public abstract a(ZLjava/lang/Integer;Ljava/lang/String;)V
 .end method
 
-.method public abstract dT()V
+.method public abstract dS()V
 .end method
 
-.method public abstract dU()V
+.method public abstract dT()V
 .end method
 
 .method public abstract h(II)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 fa98403d90..4e127cadfb 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$d;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8d43ebdea4..104074a53b 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$e;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3689fc70d4..88b53fd0f3 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$f;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -64,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->dT()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->dS()V
 
     sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
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 188863782c..ffe93db7d9 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$g.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$g;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/socket/a;->dZ()V
+    value = Lcom/discord/rtcconnection/socket/a;->dY()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 b0188331d2..eb901cc83b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$h$a;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 e09ea5bd72..96ae988f93 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$h.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$h.smali
@@ -1,10 +1,11 @@
 .class public final Lcom/discord/rtcconnection/socket/a$h;
 .super Ljava/util/TimerTask;
+.source "RtcControlSocket.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/socket/a;->dZ()V
+    value = Lcom/discord/rtcconnection/socket/a;->dY()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$i$a.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$i$a.smali
index bda7a8be18..644a722acc 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$i$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$i$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$i$a;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 41f8363c03..ea0800a0b1 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$i.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$i.smali
@@ -1,10 +1,11 @@
 .class public final Lcom/discord/rtcconnection/socket/a$i;
 .super Ljava/util/TimerTask;
+.source "RtcControlSocket.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/socket/a;->ed()Ljava/util/TimerTask;
+    value = Lcom/discord/rtcconnection/socket/a;->ec()Ljava/util/TimerTask;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 3a9afd2f55..e970024305 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$j.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$j.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$j;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 bd7c5b8493..22e4ad0c87 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$k.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$k.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$k;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 010e160a4b..0c269af681 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$l.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$l.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$l;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0ed0dd085d..e0fadfe5c8 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$m.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$m.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$m;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 5b6077f8e6..3e0ed20bb5 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$n.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$n.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$n;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 06622e34df..ede8acd2a1 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$o.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$o.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$o;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 51ca41b791..66475dd18c 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$p.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$p.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$p;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 bc747b2e7d..12b122c157 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$q;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 5c34ab0e73..d073866067 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$r;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 9afc809fdb..030f10cc3c 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$s;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 af26461b7b..d85ab6f646 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$t.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$t.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$t;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 6b0a3c8c84..ffd9cb740b 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$u.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$u.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$u;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 61c3ad75f9..26fbef8424 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$v.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$v.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$v;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -137,9 +138,7 @@
     :pswitch_1
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v2}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
 
     move-result-object v2
 
@@ -173,9 +172,7 @@
     :pswitch_3
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v2}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
 
     move-result-object v2
 
@@ -202,9 +199,7 @@
     :pswitch_4
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v2}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
 
     move-result-object v2
 
@@ -235,9 +230,7 @@
     :pswitch_5
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v2}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
 
     move-result-object v2
 
@@ -264,9 +257,7 @@
     :pswitch_6
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v2}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
 
     move-result-object v2
 
@@ -300,9 +291,7 @@
     :pswitch_8
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v2}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$w$1.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$w$1.smali
index c7c36815e2..35c5739bb2 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$w$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$w$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$w$1;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -64,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->dU()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->dT()V
 
     sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$w$2.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$w$2.smali
index 104b7d5b00..6fd7a8284b 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$w$2.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$w$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$w$2;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f7fd349e3c..e2318c8805 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$w.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$w.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$w;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -132,8 +133,6 @@
     const-wide/16 v2, 0x0
 
     :goto_1
-    const/4 v4, 0x0
-
     sub-long/2addr v0, v2
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
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 69295c96a3..913e43384c 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$x.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$x.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$x;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 5797dc906c..3cdf048cc2 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$y.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$y.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/a$y;
 .super Lkotlin/jvm/internal/k;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a.smali b/com.discord/smali/com/discord/rtcconnection/socket/a.smali
index 2e98f6052b..a84e9dd1df 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/a;
 .super Lokhttp3/WebSocketListener;
+.source "RtcControlSocket.kt"
 
 
 # annotations
@@ -126,7 +127,7 @@
 
     invoke-direct {p1}, Lcom/google/gson/f;-><init>()V
 
-    invoke-virtual {p1}, Lcom/google/gson/f;->CL()Lcom/google/gson/Gson;
+    invoke-virtual {p1}, Lcom/google/gson/f;->CK()Lcom/google/gson/Gson;
 
     move-result-object p1
 
@@ -164,7 +165,7 @@
 
     iput p1, p0, Lcom/discord/rtcconnection/socket/a;->xO:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ed()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ec()Ljava/util/TimerTask;
 
     move-result-object p1
 
@@ -398,7 +399,7 @@
 
     iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eb()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ea()V
 
     return-void
 .end method
@@ -428,8 +429,6 @@
     const-wide/16 v2, 0x0
 
     :goto_0
-    const/4 v4, 0x0
-
     sub-long/2addr v0, v2
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
@@ -917,7 +916,7 @@
 
     iput p1, p0, Lcom/discord/rtcconnection/socket/a;->xO:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->dZ()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->dY()V
 
     return-void
 .end method
@@ -1081,7 +1080,7 @@
 
     invoke-direct {p0, v0}, Lcom/discord/rtcconnection/socket/a;->f(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ea()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->dZ()V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/a$j;
 
@@ -1102,7 +1101,7 @@
     return-object p0
 .end method
 
-.method private final dZ()V
+.method private final dY()V
     .locals 8
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
@@ -1255,7 +1254,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;->Hz()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->Hy()Lokhttp3/t;
 
     move-result-object v0
 
@@ -1267,7 +1266,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v1
 
@@ -1284,15 +1283,7 @@
     return-void
 .end method
 
-.method public static final synthetic e(Lcom/discord/rtcconnection/socket/a;)Lcom/discord/utilities/logging/Logger;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
-
-    return-object p0
-.end method
-
-.method private final ea()V
+.method private final dZ()V
     .locals 1
 
     const/4 v0, 0x0
@@ -1312,7 +1303,15 @@
     return-void
 .end method
 
-.method private final eb()V
+.method public static final synthetic e(Lcom/discord/rtcconnection/socket/a;)Lcom/discord/utilities/logging/Logger;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+
+    return-object p0
+.end method
+
+.method private final ea()V
     .locals 8
 
     iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
@@ -1323,7 +1322,7 @@
 
     iput-boolean v1, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ec()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eb()V
 
     goto :goto_0
 
@@ -1421,7 +1420,7 @@
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ed()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ec()Ljava/util/TimerTask;
 
     move-result-object v2
 
@@ -1433,11 +1432,13 @@
 
     invoke-virtual {v2, v3, v0, v1}, Ljava/util/Timer;->schedule(Ljava/util/TimerTask;J)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
 
-.method private final ec()V
+.method private final eb()V
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
@@ -1455,7 +1456,7 @@
     return-void
 .end method
 
-.method private final ed()Ljava/util/TimerTask;
+.method private final ec()Ljava/util/TimerTask;
     .locals 1
 
     new-instance v0, Lcom/discord/rtcconnection/socket/a$i;
@@ -1522,7 +1523,7 @@
 .method public static final synthetic g(Lcom/discord/rtcconnection/socket/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ec()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eb()V
 
     return-void
 .end method
@@ -1540,7 +1541,7 @@
 .method public static final synthetic i(Lcom/discord/rtcconnection/socket/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eb()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ea()V
 
     return-void
 .end method
@@ -1685,7 +1686,7 @@
 
     invoke-virtual {p3}, Ljava/util/TimerTask;->cancel()Z
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ed()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ec()Ljava/util/TimerTask;
 
     move-result-object p3
 
@@ -1747,7 +1748,7 @@
 
     invoke-direct {p0, v0}, Lcom/discord/rtcconnection/socket/a;->f(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ea()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->dZ()V
 
     sget-object v0, Lcom/discord/rtcconnection/socket/a$e;->yd:Lcom/discord/rtcconnection/socket/a$e;
 
@@ -1796,7 +1797,7 @@
 
     iput v0, p0, Lcom/discord/rtcconnection/socket/a;->xO:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->dZ()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->dY()V
 
     sget-object v0, Lcom/discord/rtcconnection/socket/a$f;->ye:Lcom/discord/rtcconnection/socket/a$f;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/b.smali b/com.discord/smali/com/discord/rtcconnection/socket/b.smali
index e9677a3303..4aa442c109 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/rtcconnection/socket/b;
 .super Ljava/lang/Object;
+.source "RtcControlSocket.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Opcodes.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Opcodes.smali
index b7d093f970..03f0a1e811 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Opcodes.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Opcodes.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Opcodes;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali
index 8a29d0a492..7a7ad88f72 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Hello.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Hello.smali
index 76092f558f..5354ceaad6 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Hello.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Hello.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali
index 146dc24f45..67bf4db760 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Identify;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali
index 7dc03ed24a..d64f553353 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali
index 7666fdf21d..ee314df2ef 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali
index ffa3b4a7bd..92ed528e0d 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali
index d30c7ad74d..e4b73b5e5d 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali
index 007ee49e62..247c8504fc 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali
index 87b5d90a17..d2d93b38bf 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Resume;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
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 079599146f..12fb39507a 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali
index 6a697584d8..02f4eeaada 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads$Video;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads.smali
index 2979c8fa28..1bc58873e0 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/rtcconnection/socket/io/Payloads;
 .super Ljava/lang/Object;
+.source "Payloads.kt"
 
 
 # annotations
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 2689eb538e..74f46f83d4 100644
--- a/com.discord/smali/com/discord/simpleast/a/a$a.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/simpleast/a/a$a;
 .super Lcom/discord/simpleast/a/a$b;
+.source "MarkdownRules.kt"
 
 
 # annotations
@@ -78,7 +79,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->v(Z)Ljava/util/List;
+    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->u(Z)Ljava/util/List;
 
     move-result-object v0
 
@@ -86,7 +87,7 @@
 
     sget-object v1, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
@@ -137,7 +138,7 @@
 
     sget-object v0, Lcom/discord/simpleast/a/a;->yK:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->em()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->el()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
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 71e28eb877..2b6660cee2 100644
--- a/com.discord/smali/com/discord/simpleast/a/a$b.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a$b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/simpleast/a/a$b;
 .super Lcom/discord/simpleast/a/a$c;
+.source "MarkdownRules.kt"
 
 
 # annotations
@@ -61,7 +62,7 @@
 
     sget-object p1, Lcom/discord/simpleast/a/a;->yK:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->el()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->ek()Ljava/util/regex/Pattern;
 
     move-result-object p1
 
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 4f11f41a9e..6bb4e09fd3 100644
--- a/com.discord/smali/com/discord/simpleast/a/a$c.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a$c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/simpleast/a/a$c;
 .super Lcom/discord/simpleast/core/parser/Rule$a;
+.source "MarkdownRules.kt"
 
 
 # annotations
@@ -89,7 +90,7 @@
 
     sget-object v0, Lcom/discord/simpleast/a/a;->yK:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->ek()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->ej()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/simpleast/a/a.smali b/com.discord/smali/com/discord/simpleast/a/a.smali
index 6a102235fb..77860fdeb8 100644
--- a/com.discord/smali/com/discord/simpleast/a/a.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/a/a;
 .super Ljava/lang/Object;
+.source "MarkdownRules.kt"
 
 
 # annotations
@@ -93,7 +94,7 @@
     return-void
 .end method
 
-.method public static ej()Ljava/util/regex/Pattern;
+.method public static ei()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/a/a;->yG:Ljava/util/regex/Pattern;
@@ -101,7 +102,7 @@
     return-object v0
 .end method
 
-.method public static ek()Ljava/util/regex/Pattern;
+.method public static ej()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/a/a;->yH:Ljava/util/regex/Pattern;
@@ -109,7 +110,7 @@
     return-object v0
 .end method
 
-.method public static el()Ljava/util/regex/Pattern;
+.method public static ek()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/a/a;->yI:Ljava/util/regex/Pattern;
@@ -117,7 +118,7 @@
     return-object v0
 .end method
 
-.method public static em()Ljava/util/regex/Pattern;
+.method public static el()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/a/a;->yJ:Ljava/util/regex/Pattern;
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 e4f395d0e8..2f5ad654ad 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/simpleast/core/a/a$a;
 .super Lkotlin/jvm/internal/k;
+.source "SimpleMarkdownRules.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->ef()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 afd79f1127..145809fcd1 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/a/a$b;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "SimpleMarkdownRules.kt"
 
 
 # annotations
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 9ad06431e4..b6edbe7477 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/a/a$c;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "SimpleMarkdownRules.kt"
 
 
 # annotations
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 f8b9bae83b..dd9895d79f 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/a/a$d;
 .super Lcom/discord/simpleast/core/parser/Rule$a;
+.source "SimpleMarkdownRules.kt"
 
 
 # annotations
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 53a4863804..24c7e68ae5 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/a/a$e;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "SimpleMarkdownRules.kt"
 
 
 # annotations
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 d8ac74469d..3a1229283b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/simpleast/core/a/a$f;
 .super Lkotlin/jvm/internal/k;
+.source "SimpleMarkdownRules.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 4b492e75db..74bf1849f2 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
@@ -1,10 +1,11 @@
 .class public final Lcom/discord/simpleast/core/a/a$g;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "SimpleMarkdownRules.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 e9718a6305..5097030172 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/simpleast/core/a/a$h;
 .super Lkotlin/jvm/internal/k;
+.source "SimpleMarkdownRules.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 6b633204db..bfcef60354 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/a/a;
 .super Ljava/lang/Object;
+.source "SimpleMarkdownRules.kt"
 
 
 # static fields
@@ -135,7 +136,7 @@
     return-object v0
 .end method
 
-.method public static ee()Ljava/util/regex/Pattern;
+.method public static ed()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/core/a/a;->yr:Ljava/util/regex/Pattern;
@@ -143,7 +144,7 @@
     return-object v0
 .end method
 
-.method public static ef()Ljava/util/regex/Pattern;
+.method public static ee()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/core/a/a;->yv:Ljava/util/regex/Pattern;
@@ -151,7 +152,7 @@
     return-object v0
 .end method
 
-.method public static eg()Lcom/discord/simpleast/core/parser/Rule;
+.method public static ef()Lcom/discord/simpleast/core/parser/Rule;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -182,19 +183,19 @@
     return-object v0
 .end method
 
-.method public static synthetic ei()Ljava/util/List;
+.method public static synthetic eh()Ljava/util/List;
     .locals 1
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->v(Z)Ljava/util/List;
+    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->u(Z)Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static final v(Z)Ljava/util/List;
+.method public static final u(Z)Ljava/util/List;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -245,7 +246,7 @@
 
     invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ef()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
@@ -303,7 +304,7 @@
 
     sget-object p0, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p0
 
@@ -317,7 +318,7 @@
 
 
 # virtual methods
-.method public final eh()Lcom/discord/simpleast/core/parser/Rule;
+.method public final eg()Lcom/discord/simpleast/core/parser/Rule;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 6df46ea48d..31f5a2d3b3 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/b.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/a/b;
 .super Ljava/lang/Object;
+.source "SimpleRenderer.kt"
 
 
 # static fields
@@ -83,7 +84,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ei()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eh()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/simpleast/core/b/a.smali b/com.discord/smali/com/discord/simpleast/core/b/a.smali
index 90323a7439..58ea72dc2c 100644
--- a/com.discord/smali/com/discord/simpleast/core/b/a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/b/a;
 .super Ljava/lang/Object;
+.source "ASTUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/simpleast/core/b/b.smali b/com.discord/smali/com/discord/simpleast/core/b/b.smali
index 64a2b2ad8f..3826ee31b6 100644
--- a/com.discord/smali/com/discord/simpleast/core/b/b.smali
+++ b/com.discord/smali/com/discord/simpleast/core/b/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/simpleast/core/b/b;
 .super Ljava/lang/Object;
+.source "NodeProcessor.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/simpleast/core/node/Node.smali b/com.discord/smali/com/discord/simpleast/core/node/Node.smali
index e6071d4f1f..3085014608 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/Node.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/Node.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/simpleast/core/node/Node;
 .super Ljava/lang/Object;
+.source "Node.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali b/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali
index 27979998a3..a37c6256a6 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/node/StyleNode$a;
 .super Ljava/lang/Object;
+.source "StyleNode.kt"
 
 
 # annotations
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 3e0557e486..7e0e1ff03d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/simpleast/core/node/StyleNode$b;
 .super Lkotlin/jvm/internal/k;
+.source "StyleNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 42179f4394..45af323045 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/simpleast/core/node/StyleNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "StyleNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/simpleast/core/node/a.smali b/com.discord/smali/com/discord/simpleast/core/node/a.smali
index cb042d7a1a..d7db7b7fbc 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/simpleast/core/node/a;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "TextNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec$a.smali b/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec$a.smali
index df2810de1d..a1986d73a4 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec$a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/parser/ParseSpec$a;
 .super Ljava/lang/Object;
+.source "ParseSpec.kt"
 
 
 # annotations
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 1ee77da7b1..5a08cc07e8 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/parser/ParseSpec;
 .super Ljava/lang/Object;
+.source "ParseSpec.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/Parser$Companion.smali b/com.discord/smali/com/discord/simpleast/core/parser/Parser$Companion.smali
index 93645c6000..db4686a3a3 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Parser$Companion.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Parser$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/simpleast/core/parser/Parser$Companion;
 .super Ljava/lang/Object;
+.source "Parser.kt"
 
 
 # annotations
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 ee086f0d9b..fe94bed8b1 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/simpleast/core/parser/Parser;
 .super Ljava/lang/Object;
+.source "Parser.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/Rule$a.smali b/com.discord/smali/com/discord/simpleast/core/parser/Rule$a.smali
index 09aca66647..07b2cb4581 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Rule$a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Rule$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/simpleast/core/parser/Rule$a;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rule.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali b/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali
index ca61ee372c..de65d47864 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/simpleast/core/parser/Rule;
 .super Ljava/lang/Object;
+.source "Rule.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/DispatchHandler.smali b/com.discord/smali/com/discord/stores/DispatchHandler.smali
index 1b12727032..8bb4b41bcb 100644
--- a/com.discord/smali/com/discord/stores/DispatchHandler.smali
+++ b/com.discord/smali/com/discord/stores/DispatchHandler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/stores/DispatchHandler;
 .super Ljava/lang/Object;
+.source "Store.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/stores/NotificationTextUtils.smali b/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
index 20186f79f9..eb13189ce4 100644
--- a/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
+++ b/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/NotificationTextUtils;
 .super Ljava/lang/Object;
+.source "NotificationTextUtils.kt"
 
 
 # static fields
@@ -256,7 +257,7 @@
 
     move-result v2
 
-    if-eq v2, v0, :cond_d
+    if-eq v2, v0, :cond_e
 
     :goto_0
     sget v0, Lcom/discord/models/domain/ModelUserGuildSettings;->FREQUENCY_NOTHING:I
@@ -282,14 +283,14 @@
 
     if-nez p1, :cond_3
 
-    goto/16 :goto_5
+    goto/16 :goto_6
 
     :cond_3
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
     move-result p1
 
-    if-ne p1, v0, :cond_d
+    if-ne p1, v0, :cond_e
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelMessage;->isMentionEveryone()Z
 
@@ -444,6 +445,10 @@
     :cond_d
     :goto_5
     return v1
+
+    :cond_e
+    :goto_6
+    return v1
 .end method
 
 .method static synthetic shouldNotifyForLevel$default(Lcom/discord/stores/NotificationTextUtils;Ljava/lang/Integer;Lcom/discord/models/domain/ModelUser$Me;Ljava/util/Collection;Lcom/discord/models/domain/ModelMessage;ZILjava/lang/Object;)Z
@@ -559,53 +564,53 @@
     :cond_1
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v6
+    move-result-object v3
 
-    sget-object v7, Lcom/discord/models/domain/ModelUser;->EMPTY:Lcom/discord/models/domain/ModelUser;
+    sget-object v6, Lcom/discord/models/domain/ModelUser;->EMPTY:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v6}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v7
+    move-result v6
 
-    const/4 v9, 0x0
+    const/4 v7, 0x0
 
-    if-nez v7, :cond_2
+    if-nez v6, :cond_2
 
     goto :goto_0
 
     :cond_2
-    move-object v6, v9
+    move-object v3, v7
 
     :goto_0
-    if-nez v6, :cond_3
+    if-nez v3, :cond_3
 
     return v5
 
     :cond_3
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v10
+    move-result-wide v9
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
 
-    move-result-wide v12
+    move-result-wide v11
 
-    cmp-long v7, v10, v12
+    cmp-long v6, v9, v11
 
-    if-nez v7, :cond_4
+    if-nez v6, :cond_4
 
     return v5
 
     :cond_4
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v6
+    move-result-wide v9
 
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v6
+    move-result-object v3
 
-    invoke-interface {v0, v6}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v0, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -647,7 +652,7 @@
     goto :goto_1
 
     :cond_6
-    move-object v0, v9
+    move-object v0, v7
 
     :goto_1
     if-eqz v0, :cond_7
@@ -728,7 +733,7 @@
     goto :goto_2
 
     :cond_a
-    move-object v5, v9
+    move-object v5, v7
 
     :goto_2
     move-object v7, v0
diff --git a/com.discord/smali/com/discord/stores/Store.smali b/com.discord/smali/com/discord/stores/Store.smali
index 968a52bf21..83549030fc 100644
--- a/com.discord/smali/com/discord/stores/Store.smali
+++ b/com.discord/smali/com/discord/stores/Store.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/Store;
 .super Ljava/lang/Object;
+.source "Store.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
index 4132388194..b9a5fdd6e8 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$ScreenViewed;
 .super Ljava/lang/Object;
+.source "StoreAnalytics.kt"
 
 
 # annotations
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 c6a5408179..d46f461a39 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3350e4bca3..dfaeb1703f 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali
index 02800eac5f..569dcba8bb 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$init$3$1;
 .super Ljava/lang/Object;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali
index a6058113e6..fb6d119808 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$init$3;
 .super Ljava/lang/Object;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 863dfe4e67..d760481ce4 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$init$4;
 .super Lkotlin/jvm/internal/i;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a054417b0f..a38480817c 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1;
 .super Ljava/lang/Object;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 7841015ba5..0fcb383d88 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$onScreenViewed$1;
 .super Ljava/lang/Object;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 be9e1f94e0..0f6aaffcae 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1;
 .super Ljava/lang/Object;
+.source "StoreAnalytics.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics.smali b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
index 62c36a5597..32700aa559 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAnalytics;
 .super Lcom/discord/stores/Store;
+.source "StoreAnalytics.kt"
 
 
 # annotations
@@ -56,7 +57,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreAnalytics;->hasTrackedAppUiShown:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -338,7 +339,7 @@
     const/4 v5, 0x0
 
     :goto_2
-    if-eqz v5, :cond_8
+    if-eqz v5, :cond_9
 
     iget-object v6, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
 
@@ -398,7 +399,7 @@
 
     check-cast v6, Ljava/lang/Integer;
 
-    if-eqz v6, :cond_9
+    if-eqz v6, :cond_8
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
@@ -407,9 +408,13 @@
     goto :goto_4
 
     :cond_8
-    const/4 v5, 0x0
+    const/4 v6, 0x0
+
+    goto :goto_4
 
     :cond_9
+    const/4 v5, 0x0
+
     const/4 v6, 0x0
 
     :goto_4
@@ -910,17 +915,14 @@
 
     move-result-wide v1
 
-    :goto_0
-    move-wide v8, v1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const-wide/16 v1, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v8, v1
 
-    :goto_1
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
     move-wide v2, v8
@@ -995,17 +997,14 @@
 
     move-result-wide v0
 
-    :goto_0
-    move-wide v1, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const-wide/16 v0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v1, v0
 
-    :goto_1
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
     move-object v5, p1
@@ -1098,11 +1097,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KG()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KF()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali
index d0a3ae4f6e..13f25ebeab 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 .super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
 
 
 # annotations
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 23e7336576..489e8e4d5f 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
 .super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
index d6f67076ee..7196c19dd6 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
 .super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
 
 
 # annotations
@@ -86,6 +87,8 @@
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     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 0b8ac422ca..90f5519b2d 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAudioManager$init$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreAudioManager.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
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 fe3b959b76..4a01f7ae9e 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAudioManager$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAudioManager.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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
index 2829c79e6f..79b8f403b2 100644
--- 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;
 .super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
index 218ef72ccc..0783c7261d 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAudioManager;
 .super Lcom/discord/stores/Store;
+.source "StoreAudioManager.kt"
 
 
 # annotations
@@ -103,7 +104,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter$Companion.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter$Companion.smali
index 22b203092d..58574b23f7 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAuditLog$AuditLogFilter$Companion;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali
index 115969f257..dc5bd51cd0 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali
index 4b859c4713..a36f20534f 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAuditLog$AuditLogState;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali
index cf8bcb63a7..04a4049c3a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$Companion.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$Companion.smali
index e33ee34dfb..b2e625dd23 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAuditLog$Companion;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 
 # annotations
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 da95c8fc3f..91ddd356f1 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$fetchAuditLogs$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 38bf07d842..5d0ca7e704 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$fetchAuditLogs$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1299698bfa..21b3870021 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$getAuditLogState$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -52,9 +53,7 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreAuditLog$getAuditLogState$1;->$guildId:J
 
-    iget-object v3, p0, Lcom/discord/stores/StoreAuditLog$getAuditLogState$1;->this$0:Lcom/discord/stores/StoreAuditLog;
-
-    invoke-static {v3}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
+    invoke-static {v0}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali
index b21dae0396..4962c7ba19 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$getPermissionUserIds$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali
index f48662c192..c92bdc3ae7 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$getPermissionUserIds$1$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali
index 102280d7e3..5533e47de6 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$getPermissionUserIds$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
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 89ada88a79..57cf345732 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$handleAuditLogResponse$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 49781c2643..c45ae3a91a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$handleFetchFailure$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 0720eb6e06..d8eec0b68b 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$scrollToBottom$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -44,9 +45,7 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreAuditLog$scrollToBottom$1;->$guildId:J
 
-    iget-object v3, p0, Lcom/discord/stores/StoreAuditLog$scrollToBottom$1;->this$0:Lcom/discord/stores/StoreAuditLog;
-
-    invoke-static {v3}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
+    invoke-static {v0}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
     move-result-object v3
 
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 0f667fb8e6..2e1497128a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -65,9 +66,7 @@
 
     new-instance v1, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1;->this$0:Lcom/discord/stores/StoreAuditLog;
-
-    invoke-static {v2}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
+    invoke-static {v0}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
     move-result-object v2
 
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 328a6c10f5..e06d1a8bab 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -69,9 +70,7 @@
 
     iget-wide v2, p0, Lcom/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1;->$userId:J
 
-    iget-object v4, p0, Lcom/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1;->this$0:Lcom/discord/stores/StoreAuditLog;
-
-    invoke-static {v4}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
+    invoke-static {v0}, Lcom/discord/stores/StoreAuditLog;->access$getAuditLogFilter$p(Lcom/discord/stores/StoreAuditLog;)Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
     move-result-object v4
 
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 85945cc5a8..1f37faf631 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreAuditLog$toggleSelectedState$1;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -65,6 +66,8 @@
 
     const/4 v1, 0x0
 
+    invoke-static {v0, v1}, Lcom/discord/stores/StoreAuditLog;->access$setSelectedItemId$p(Lcom/discord/stores/StoreAuditLog;Ljava/lang/Long;)V
+
     goto :goto_1
 
     :cond_1
@@ -77,9 +80,9 @@
 
     move-result-object v1
 
-    :goto_1
     invoke-static {v0, v1}, Lcom/discord/stores/StoreAuditLog;->access$setSelectedItemId$p(Lcom/discord/stores/StoreAuditLog;Ljava/lang/Long;)V
 
+    :goto_1
     iget-object v0, p0, Lcom/discord/stores/StoreAuditLog$toggleSelectedState$1;->this$0:Lcom/discord/stores/StoreAuditLog;
 
     const/4 v1, 0x1
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog.smali b/com.discord/smali/com/discord/stores/StoreAuditLog.smali
index 417cfa31c9..1cbac999ac 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreAuditLog;
 .super Lcom/discord/stores/Store;
+.source "StoreAuditLog.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -151,7 +152,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreAuditLog;->deletedTargets:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -620,7 +621,7 @@
 .end method
 
 .method private final transformEntries(JLjava/util/List;)Ljava/util/List;
-    .locals 43
+    .locals 31
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -652,10 +653,9 @@
 
     const/4 v11, 0x0
 
-    :goto_0
     const/4 v12, 0x0
 
-    :goto_1
+    :goto_0
     invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
@@ -710,7 +710,7 @@
     move-object v4, v3
 
     :cond_1
-    :goto_2
+    :goto_1
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
@@ -759,7 +759,7 @@
 
     move-object v3, v6
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
@@ -776,21 +776,21 @@
 
     move-object v4, v6
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     move-object v14, v3
 
     move-object v15, v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     move-object v14, v13
 
     move-object v15, v14
 
-    :goto_3
+    :goto_2
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
     move-result v2
@@ -811,12 +811,12 @@
 
     move-result v2
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const/4 v2, 0x1
 
-    :goto_4
+    :goto_3
     new-instance v3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
     const-string v4, "prune_delete_days"
@@ -892,7 +892,7 @@
 
     move v3, v12
 
-    move-object/from16 v29, v6
+    move-object/from16 p3, v6
 
     move/from16 v6, v17
 
@@ -912,76 +912,64 @@
 
     move-result-wide v0
 
-    :goto_5
-    move-wide/from16 v31, v0
-
-    goto :goto_6
+    goto :goto_4
 
     :cond_7
-    invoke-virtual/range {v29 .. v29}, Lcom/discord/models/domain/ModelAuditLogEntry;->getId()J
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getId()J
 
     move-result-wide v0
 
-    goto :goto_5
+    :goto_4
+    move-wide/from16 v19, v0
 
-    :goto_6
     if-eqz v16, :cond_8
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
     move-result v0
 
-    :goto_7
-    move/from16 v33, v0
-
-    goto :goto_8
+    goto :goto_5
 
     :cond_8
-    invoke-virtual/range {v29 .. v29}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
     move-result v0
 
-    goto :goto_7
+    :goto_5
+    move/from16 v21, v0
 
-    :goto_8
     if-eqz v16, :cond_9
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
     move-result-wide v0
 
-    :goto_9
-    move-wide/from16 v34, v0
-
-    goto :goto_a
+    goto :goto_6
 
     :cond_9
-    invoke-virtual/range {v29 .. v29}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
     move-result-wide v0
 
-    goto :goto_9
+    :goto_6
+    move-wide/from16 v22, v0
 
-    :goto_a
     if-eqz v16, :cond_a
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelAuditLogEntry;->getUserId()J
 
     move-result-wide v0
 
-    :goto_b
-    move-wide/from16 v36, v0
-
-    goto :goto_c
+    goto :goto_7
 
     :cond_a
-    invoke-virtual/range {v29 .. v29}, Lcom/discord/models/domain/ModelAuditLogEntry;->getUserId()J
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getUserId()J
 
     move-result-wide v0
 
-    goto :goto_b
+    :goto_7
+    move-wide/from16 v24, v0
 
-    :goto_c
     if-eqz v16, :cond_b
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
@@ -996,69 +984,57 @@
 
     move-result-object v13
 
-    goto :goto_d
+    goto :goto_8
 
     :cond_b
     const/4 v13, 0x0
 
-    :goto_d
+    :goto_8
     if-eqz v13, :cond_d
 
-    invoke-virtual/range {v29 .. v29}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
     move-result-object v0
 
     if-eqz v0, :cond_c
 
-    :goto_e
-    check-cast v0, Ljava/util/Collection;
-
-    goto :goto_f
+    goto :goto_9
 
     :cond_c
     sget-object v0, Lkotlin/a/x;->bPB:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/List;
 
-    goto :goto_e
+    :goto_9
+    check-cast v0, Ljava/util/Collection;
 
-    :goto_f
     invoke-interface {v13, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    goto :goto_10
+    goto :goto_a
 
     :cond_d
-    invoke-virtual/range {v29 .. v29}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
-    :goto_10
-    if-eqz v16, :cond_f
+    :goto_a
+    if-eqz v16, :cond_e
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
     move-result-object v0
 
-    if-nez v0, :cond_e
-
-    goto :goto_12
+    if-nez v0, :cond_f
 
     :cond_e
-    :goto_11
-    move-object/from16 v39, v0
-
-    goto :goto_13
-
-    :cond_f
-    :goto_12
-    invoke-virtual/range {v29 .. v29}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
     move-result-object v0
 
-    goto :goto_11
+    :cond_f
+    move-object/from16 v27, v0
 
-    :goto_13
     sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    move-object/from16 v1, v29
+    move-object/from16 v1, p3
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTimestampStart(Lcom/discord/models/domain/ModelAuditLogEntry;)J
 
@@ -1066,26 +1042,26 @@
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v42
+    move-result-object v30
 
     new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry;
 
-    move-object/from16 v30, v0
+    move-object/from16 v18, v0
 
-    move-object/from16 v38, v13
+    move-object/from16 v26, v13
 
-    move-wide/from16 v40, p1
+    move-wide/from16 v28, p1
 
-    invoke-direct/range {v30 .. v42}, Lcom/discord/models/domain/ModelAuditLogEntry;-><init>(JIJJLjava/util/List;Lcom/discord/models/domain/ModelAuditLogEntry$Options;JLjava/lang/Long;)V
+    invoke-direct/range {v18 .. v30}, Lcom/discord/models/domain/ModelAuditLogEntry;-><init>(JIJJLjava/util/List;Lcom/discord/models/domain/ModelAuditLogEntry$Options;JLjava/lang/Long;)V
 
     invoke-virtual {v9, v11, v0}, Ljava/util/ArrayList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
     add-int/lit8 v12, v12, 0x1
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :cond_10
-    move-object/from16 v1, v29
+    move-object/from16 v1, p3
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionType()Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
 
@@ -1103,12 +1079,12 @@
 
     move-result-object v0
 
-    goto :goto_14
+    goto :goto_b
 
     :cond_11
     const/4 v0, 0x0
 
-    :goto_14
+    :goto_b
     check-cast v0, Ljava/lang/String;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
@@ -1125,12 +1101,12 @@
 
     move-result-object v2
 
-    goto :goto_15
+    goto :goto_c
 
     :cond_12
     const/4 v2, 0x0
 
-    :goto_15
+    :goto_c
     invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
@@ -1196,10 +1172,9 @@
 
     move-result-object v0
 
-    :goto_16
     invoke-interface {v2, v3, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_17
+    goto :goto_d
 
     :cond_14
     iget-object v2, v8, Lcom/discord/stores/StoreAuditLog;->deletedTargets:Ljava/util/HashMap;
@@ -1224,12 +1199,14 @@
 
     move-result-object v3
 
-    goto :goto_16
+    invoke-interface {v2, v3, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_15
-    :goto_17
+    :goto_d
     invoke-virtual {v9, v11, v1}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V
 
+    const/4 v12, 0x0
+
     goto/16 :goto_0
 
     :cond_16
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLogKt.smali b/com.discord/smali/com/discord/stores/StoreAuditLogKt.smali
index 54e16da259..ac0e86fe4c 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLogKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLogKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/stores/StoreAuditLogKt;
 .super Ljava/lang/Object;
+.source "StoreAuditLog.kt"
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication.smali b/com.discord/smali/com/discord/stores/StoreAuthentication.smali
index e3b17eed6f..fa02a31bda 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreAuthentication;
 .super Lcom/discord/stores/Store;
+.source "StoreAuthentication.java"
 
 
 # static fields
@@ -75,7 +76,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreAuthentication;->$lock:Ljava/lang/Object;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -83,7 +84,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -93,7 +94,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -187,7 +188,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->fingerprintSubject:Lrx/subjects/Subject;
 
-    invoke-virtual {v0}, Lrx/subjects/Subject;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/Subject;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -403,17 +404,14 @@
 
     move-result-object p6
 
-    :goto_0
-    move-object v6, p6
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p6, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v6, p6
 
-    :goto_1
     invoke-static {v6}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
     move-result p6
@@ -782,7 +780,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->tokenSubject:Lrx/subjects/Subject;
 
-    invoke-virtual {v0}, Lrx/subjects/Subject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/Subject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -818,7 +816,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->fingerprintSubject:Lrx/subjects/Subject;
 
-    invoke-virtual {v0}, Lrx/subjects/Subject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/Subject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -911,8 +909,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/stores/StoreAuthentication;->isConsentRequiredSubscription:Lrx/Subscription;
-
     invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
 
     iput-object v0, p0, Lcom/discord/stores/StoreAuthentication;->isConsentRequiredSubscription:Lrx/Subscription;
@@ -1379,15 +1375,7 @@
 
     if-nez p2, :cond_1
 
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
-    :goto_0
     iget-object p2, p0, Lcom/discord/stores/StoreAuthentication;->prefsSessionDurable:Landroid/content/SharedPreferences;
 
     invoke-interface {p2}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
@@ -1436,7 +1424,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
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 aff884e751..1164464bf0 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreBans$get$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreBans.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreBans$get$2.smali b/com.discord/smali/com/discord/stores/StoreBans$get$2.smali
index e214cdde23..97eb14bb08 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreBans$get$2;
 .super Ljava/lang/Object;
+.source "StoreBans.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 2a208208b6..753d35cdfd 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreBans$onLoadedBans$1;
 .super Ljava/lang/Object;
+.source "StoreBans.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreBans.smali b/com.discord/smali/com/discord/stores/StoreBans.smali
index e1785abe55..a77bad2ab5 100644
--- a/com.discord/smali/com/discord/stores/StoreBans.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreBans;
 .super Lcom/discord/stores/Store;
+.source "StoreBans.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -202,7 +203,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
index c9deefd1a7..d306ae3cd9 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali
index daddf56722..fa2496b3fb 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$2$1$1;
 .super Ljava/lang/Object;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali
index 58a7594d8c..5bd0d94426 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$2$1;
 .super Ljava/lang/Object;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 3198583ea6..24942fe84c 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$2$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 08150539ed..2c3645cf69 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$2$3;
 .super Ljava/lang/Object;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 470b2377c4..5d0269d545 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
index 4be65b8578..e967e53988 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
index a5aa53c520..de0015819d 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$4;
 .super Ljava/lang/Object;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 7f773af254..fc423ab990 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$call$5;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali
index ff275caf7a..b15ea48dff 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$findCall$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 31a699dac8..33cb938731 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$findCall$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -66,6 +67,8 @@
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali
index 34cf2f5501..0235947d34 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$get$1;
 .super Ljava/lang/Object;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 845a82c387..e40e8349b1 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$ring$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8c8bc5fbdc..40298b0f94 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreCalls$stopRinging$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreCalls.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreCalls.smali b/com.discord/smali/com/discord/stores/StoreCalls.smali
index f9c6f4fbf1..a6038aa281 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreCalls;
 .super Ljava/lang/Object;
+.source "StoreCalls.kt"
 
 
 # instance fields
@@ -59,7 +60,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -116,15 +117,13 @@
 
     if-lez v4, :cond_1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
+    iget-object v2, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
 
-    iget-wide v1, p0, Lcom/discord/stores/StoreCalls;->selectedChannelId:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
+    invoke-virtual {v2, v0}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -155,6 +154,8 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreGatewayConnection;->callConnect(J)Z
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -391,7 +392,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v11
 
diff --git a/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali b/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
index aebeaf9fb2..4a8f365f89 100644
--- a/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
+++ b/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreCallsIncoming;
 .super Ljava/lang/Object;
+.source "StoreCallsIncoming.java"
 
 
 # instance fields
@@ -44,7 +45,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -218,7 +219,6 @@
 
     invoke-virtual {v1, v2}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
-    :goto_1
     const/4 v1, 0x1
 
     goto :goto_0
@@ -246,7 +246,9 @@
 
     invoke-virtual {v1, v2}, Ljava/util/HashSet;->remove(Ljava/lang/Object;)Z
 
-    goto :goto_1
+    const/4 v1, 0x1
+
+    goto :goto_0
 
     :cond_2
     if-eqz v1, :cond_3
@@ -301,6 +303,8 @@
 
     iput-wide v0, p0, Lcom/discord/stores/StoreCallsIncoming;->myId:J
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -335,7 +339,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali b/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali
index 6382d8353f..42336e5fcf 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChangeLog$createChangeLogNotice$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChangeLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog$init$1.smali b/com.discord/smali/com/discord/stores/StoreChangeLog$init$1.smali
index 4b12858bab..6f3a2b75c3 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChangeLog$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChangeLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -72,7 +73,7 @@
 
     check-cast v0, Landroid/content/Context;
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     iget-object v1, p0, Lcom/discord/stores/StoreChangeLog$init$1;->this$0:Lcom/discord/stores/StoreChangeLog;
 
@@ -110,4 +111,7 @@
 
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .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 f21644bd52..0939438c10 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChangeLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
index cd3e075108..155cb03e4e 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChangeLog;
 .super Lcom/discord/stores/Store;
+.source "StoreChangeLog.kt"
 
 
 # instance fields
@@ -278,7 +279,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLogKt.smali b/com.discord/smali/com/discord/stores/StoreChangeLogKt.smali
index 2c2908a87e..1d8f0c2eef 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLogKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLogKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChangeLogKt;
 .super Ljava/lang/Object;
+.source "StoreChangeLog.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali
index 6dde3353ae..1dbf689414 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelCategories$getChannelCategories$1;
 .super Ljava/lang/Object;
+.source "StoreChannelCategories.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelsForCategory$1.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelsForCategory$1.smali
index e7336d04ee..7446cfd922 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelsForCategory$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelsForCategory$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelCategories$getChannelsForCategory$1;
 .super Ljava/lang/Object;
+.source "StoreChannelCategories.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
index 4e275d99c5..dadb8d2873 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelCategories$getCollapsedCategories$1;
 .super Ljava/lang/Object;
+.source "StoreChannelCategories.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
index 88f5cedf33..14282b545a 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChannelCategories;
 .super Ljava/lang/Object;
+.source "StoreChannelCategories.kt"
 
 
 # instance fields
@@ -512,6 +513,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final init()V
diff --git a/com.discord/smali/com/discord/stores/StoreChannelConversions.smali b/com.discord/smali/com/discord/stores/StoreChannelConversions.smali
index f0a1d4e699..e74740ea2c 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelConversions.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelConversions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreChannelConversions;
 .super Ljava/lang/Object;
+.source "StoreChannelConversions.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali
index a140771960..59367a6874 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1$1.smali
index 43b27b3183..f30f1c2048 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1$1;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -97,7 +98,6 @@
 
     const-string p1, "everyone"
 
-    :goto_0
     invoke-static {p1}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
@@ -121,5 +121,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-static {p1}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1.smali
index 19b6348d19..acfae59fa9 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator$computeMemberListId$1;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator.smali
index de8db0d185..04ad29aedb 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$MemberListIdCalculator;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 
 # annotations
@@ -118,7 +119,6 @@
 
     const-string v1, "allow:"
 
-    :goto_1
     invoke-static {v2, v3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
     move-result-object v2
@@ -140,7 +140,17 @@
 
     const-string v1, "deny:"
 
-    goto :goto_1
+    invoke-static {v2, v3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
 
     :cond_2
     check-cast v0, Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateException.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateException.smali
index 77495e2c7b..964a18ff3e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateException.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateException.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$MemberListUpdateException;
 .super Ljava/lang/RuntimeException;
+.source "StoreChannelMembersLazy.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger$logUpdate$groupLog$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger$logUpdate$groupLog$1.smali
index 25424c921a..d67c12a726 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger$logUpdate$groupLog$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger$logUpdate$groupLog$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger$logUpdate$groupLog$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
index 69d442b78e..2fa168ae17 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 
 # annotations
@@ -250,15 +251,13 @@
 
     move-result-object v2
 
-    :goto_1
     invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    :goto_2
     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v2
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_0
     instance-of v3, v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;
@@ -277,10 +276,13 @@
 
     move-result v2
 
-    :goto_3
     invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_1
 
     :cond_1
     instance-of v3, v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;
@@ -299,7 +301,13 @@
 
     move-result v2
 
-    goto :goto_3
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_1
 
     :cond_2
     instance-of v3, v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete;
@@ -318,7 +326,13 @@
 
     move-result v2
 
-    goto :goto_3
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_1
 
     :cond_3
     instance-of v3, v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;
@@ -337,12 +351,16 @@
 
     move-result-object v2
 
-    goto :goto_1
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    :goto_4
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    :goto_1
     invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :cond_4
     new-instance p1, Lkotlin/k;
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 7a44d0b3d9..7839d9862c 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$doFlush$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$doFlush$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$doFlush$1;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$get$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$get$1.smali
index 1c1350a9b5..55e88f7d40 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$get$1;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$1.smali
index e35d90115e..f78b84d737 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$getMemberListObservable$1;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2$1.smali
index 6da932a211..67a5244e80 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2$1;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2.smali
index c6fe1ef39f..1fedbedd4a 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$getMemberListObservable$2;
 .super Ljava/lang/Object;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildMemberListUpdate$2.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildMemberListUpdate$2.smali
index baf17da384..64443871cf 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildMemberListUpdate$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildMemberListUpdate$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$handleGuildMemberListUpdate$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali
index ed2118bd39..695eeeb326 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$handleGuildRoleUpdate$$inlined$forEach$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 dcd84c4a5e..79d8d59f80 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -97,23 +98,26 @@
 
     const-string p1, ""
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     const v0, 0x7f120d88
 
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
     goto :goto_0
 
     :pswitch_2
     const v0, 0x7f120d89
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
     :cond_0
-    :goto_1
+    :goto_0
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali
index f1357cde64..901a44e64e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChannelMembersLazy;
 .super Lcom/discord/stores/Store;
+.source "StoreChannelMembersLazy.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -140,7 +141,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannelMembersLazy;->memberListPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -547,7 +548,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     const-string v3, "item.member.user!!"
@@ -934,7 +935,7 @@
 
     if-nez p3, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     const-string v0, "item.member.user!!"
@@ -999,7 +1000,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p3
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels.smali b/com.discord/smali/com/discord/stores/StoreChannels.smali
index 6f88dbbc1b..71d3da458e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreChannels;
 .super Ljava/lang/Object;
+.source "StoreChannels.java"
 
 
 # static fields
@@ -287,7 +288,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
@@ -742,7 +743,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p1
 
@@ -1076,7 +1077,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p2
 
@@ -1198,7 +1199,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -1327,7 +1328,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -1526,7 +1527,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -1678,7 +1679,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -2534,7 +2535,7 @@
 
     move-result-wide v9
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_2
 
     new-instance p2, Ljava/util/ArrayList;
 
@@ -2550,12 +2551,11 @@
 
     invoke-interface {p2, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :cond_2
     move-object v7, p2
 
     goto :goto_1
 
-    :cond_3
+    :cond_2
     new-instance p2, Ljava/util/ArrayList;
 
     invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
@@ -2568,13 +2568,13 @@
 
     move-result-object v0
 
-    :cond_4
+    :cond_3
     :goto_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
 
-    if-eqz v3, :cond_2
+    if-eqz v3, :cond_4
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -2596,12 +2596,15 @@
 
     cmp-long v11, v5, v7
 
-    if-eqz v11, :cond_4
+    if-eqz v11, :cond_3
 
     invoke-interface {p2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
+    :cond_4
+    move-object v7, p2
+
     :goto_1
     new-instance p2, Lcom/discord/models/domain/ModelChannel;
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali
index e5f5e0808d..309e912e22 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;
 .super Lkotlin/properties/b;
+.source "Delegates.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Companion.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Companion.smali
index ccdc9ee5b4..033caa9d00 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$Companion;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali
index 809d50aa60..19cc409e29 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali
index 7d9c232d7e..9b61c03492 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali
index b3a9e137b0..85214b6c75 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$Selected$Companion;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
index 929cc6ec90..365bd56685 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$Selected;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali
index 940dcbb4a8..2e975d051c 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali
index a373cbd165..b53f362852 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali
index bb64c0b147..ee003ed138 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 8a76ace794..bbaa7f859e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -93,7 +94,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
index 0bfe924674..c7f99bd8dd 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -90,6 +91,8 @@
 
     invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreChannelsSelected;->access$handleSelectChannelId(Lcom/discord/stores/StoreChannelsSelected;JJ)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali
index 4ba6ebe20a..f36e5823fd 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSet$1;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali
index 2dacad468b..8cfbadc684 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSet$2;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 896ca7c3a1..06963520fe 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSet$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali
index d461bcfad4..c696734ac5 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$1;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 1c8d57375e..72b8c4eacd 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 733b273872..4eff2d75d3 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e009c83e15..7cb0060542 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSet$4;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7e6626c70d..56620cd31a 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$getId$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$getId$1.smali
index 106113758e..ae4243d3ca 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$getId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$getId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$getId$1;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali
index b75ef4e5c3..7f0c73740e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$handleConnectionOpen$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0edd4530f8..c0c0dde81f 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChannelsSelected$set$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreChannelsSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -70,17 +71,16 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreChannelsSelected$set$1;->$guildId:J
 
-    :goto_0
     move-wide v4, v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-wide v1, p0, Lcom/discord/stores/StoreChannelsSelected$set$1;->$channelId:J
 
-    goto :goto_0
+    move-wide v4, v1
 
-    :goto_1
+    :goto_0
     iget-object p1, p0, Lcom/discord/stores/StoreChannelsSelected$set$1;->this$0:Lcom/discord/stores/StoreChannelsSelected;
 
     iget-wide v1, p0, Lcom/discord/stores/StoreChannelsSelected$set$1;->$guildId:J
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
index adcb4be22c..7fcb0832c9 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected;
 .super Ljava/lang/Object;
+.source "StoreChannelsSelected.kt"
 
 
 # annotations
@@ -153,7 +154,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -289,7 +290,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
@@ -1084,6 +1085,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized init(Lrx/Observable;)V
@@ -1225,6 +1228,8 @@
 
     invoke-virtual/range {v0 .. v5}, Lcom/discord/stores/StoreChannelsSelected;->set(JJI)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali b/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali
index a71b5aa9ab..40b6d9e30d 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChat$EditingMessage;
 .super Ljava/lang/Object;
+.source "StoreChat.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreChat$InteractionState$Companion.smali b/com.discord/smali/com/discord/stores/StoreChat$InteractionState$Companion.smali
index 40bd671cb7..2a25c4d256 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$InteractionState$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$InteractionState$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChat$InteractionState$Companion;
 .super Ljava/lang/Object;
+.source "StoreChat.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali b/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali
index cd21299156..7335a922c2 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChat$InteractionState;
 .super Ljava/lang/Object;
+.source "StoreChat.kt"
 
 
 # annotations
@@ -330,8 +331,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/discord/stores/StoreChat$InteractionState;->scrollState$1:I
-
     const/4 v2, 0x3
 
     if-ne v0, v2, :cond_0
@@ -365,8 +364,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/discord/stores/StoreChat$InteractionState;->scrollState$1:I
-
     const/4 v1, 0x3
 
     if-ne v0, v1, :cond_0
diff --git a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali
index 9417b4f35d..872b6f81f5 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChat$toggleBlockedMessageGroup$1;
 .super Ljava/lang/Object;
+.source "StoreChat.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 768019b207..79405aecb8 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreChat$toggleBlockedMessageGroup$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreChat.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreChat.smali b/com.discord/smali/com/discord/stores/StoreChat.smali
index 47b6a58423..6756bea249 100644
--- a/com.discord/smali/com/discord/stores/StoreChat.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreChat;
 .super Ljava/lang/Object;
+.source "StoreChat.kt"
 
 
 # annotations
@@ -78,7 +79,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -197,6 +198,8 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChat;->setExternalMessageText(Ljava/lang/String;)V
 
+    return-void
+
     :cond_3
     :goto_2
     return-void
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali b/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali
index 3ecd158137..a5d21aef39 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreClientVersion$init$1;
 .super Ljava/lang/Object;
+.source "StoreClientVersion.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 9488aaac11..8459f9640d 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreClientVersion$init$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreClientVersion.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a34ad55423..ab6ee80f1e 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreClientVersion$setClientMinVersion$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreClientVersion.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index e49625de1c..5f38838340 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreClientVersion;
 .super Lcom/discord/stores/Store;
+.source "StoreClientVersion.kt"
 
 
 # instance fields
@@ -27,7 +28,7 @@
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
-    const/16 v0, 0x33e
+    const/16 v0, 0x33f
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity.smali b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
index 2429c13c2c..658cb939bf 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreConnectivity;
 .super Landroid/content/BroadcastReceiver;
+.source "StoreConnectivity.java"
 
 
 # static fields
@@ -106,8 +107,16 @@
 
     monitor-enter v0
 
-    xor-int/lit8 p1, p1, 0x1
+    if-nez p1, :cond_0
 
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     :try_start_0
     iput-boolean p1, p0, Lcom/discord/stores/StoreConnectivity;->deviceNetworkOffline:Z
 
@@ -349,8 +358,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegroundedClearSubscription:Lrx/Subscription;
-
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     iput-object v1, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegroundedClearSubscription:Lrx/Subscription;
@@ -407,8 +414,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->connectingTransitionTimerSubscription:Lrx/Subscription;
-
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     iput-object v1, p0, Lcom/discord/stores/StoreConnectivity;->connectingTransitionTimerSubscription:Lrx/Subscription;
@@ -562,8 +567,16 @@
     :try_start_0
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->transitioningFromRecentlyForegroundedTimer(Z)V
 
-    xor-int/lit8 p1, p1, 0x1
+    if-nez p1, :cond_0
 
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     iput-boolean p1, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegrounded:Z
 
     invoke-direct {p0}, Lcom/discord/stores/StoreConnectivity;->updateConnectivityState()V
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$Companion.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$Companion.smali
index 4214d124c9..53e278b2c0 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$Companion;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali
index 9baab6f3c6..e16b2b7a9f 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali
index 9a33ffa1ae..28a6423d9c 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 ac5283280c..57d5a340a7 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0d903a09ba..e57613db29 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/e;
@@ -52,7 +53,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->BI()Landroid/net/Uri;
+    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->BH()Landroid/net/Uri;
 
     move-result-object p1
 
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 c5dc7708b2..9adb53ccfa 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -66,7 +67,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/dynamiclinks/a;->BH()Lcom/google/firebase/dynamiclinks/a;
+    invoke-static {}, Lcom/google/firebase/dynamiclinks/a;->BG()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 e9aeba42fd..c6fa6ef089 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$handleDataReceived$1;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali
index 348e77960f..8295f8afcd 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/d;
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 e2e6d28341..7ea6b2d034 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$1;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -88,24 +89,21 @@
 
     if-eqz v2, :cond_1
 
-    :goto_0
-    check-cast v2, Ljava/lang/CharSequence;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string v2, ""
 
-    goto :goto_0
+    :goto_0
+    check-cast v2, Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-virtual {v0, v2}, Lkotlin/text/Regex;->i(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
 
     move-result-object v0
 
     if-eqz v0, :cond_4
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object v0
 
@@ -144,22 +142,22 @@
 
     if-eqz v3, :cond_2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     move-object v2, v1
 
-    :goto_2
+    :goto_1
     move-object v0, v2
 
     check-cast v0, Ljava/lang/String;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     move-object v0, v1
 
-    :goto_3
+    :goto_2
     :try_start_0
     const-string v2, "fingerprint"
 
@@ -169,32 +167,27 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_0
     move-object v2, v1
 
-    :goto_4
+    :goto_3
     :try_start_1
     const-string v3, "auth_token"
 
     invoke-virtual {p1, v3}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object v1
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
 
-    goto :goto_5
-
     :catch_1
-    move-object p1, v1
+    new-instance p1, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;
 
-    :goto_5
-    new-instance v1, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;
+    invoke-direct {p1, v2, v0, v1}, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-direct {v1, v2, v0, p1}, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object v1
+    return-object p1
 .end method
 
 .method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$2.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$2.smali
index 98ab876dee..deb357cca7 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$2;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 afcb37fa94..b8fc879562 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreDynamicLink.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
index 16328cf353..90956455b1 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreDynamicLink;
 .super Ljava/lang/Object;
+.source "StoreDynamicLink.kt"
 
 
 # annotations
@@ -88,7 +89,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->cmM:I
+    sget p1, Lrx/Emitter$a;->cmg:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -144,13 +145,13 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lrx/functions/Action0;)V
 
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;->getInviteCode()Ljava/lang/String;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     check-cast v0, Ljava/lang/CharSequence;
 
@@ -214,6 +215,9 @@
     :cond_1
     :goto_0
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$Companion.smali b/com.discord/smali/com/discord/stores/StoreEmoji$Companion.smali
index d5b8893e12..8ed90312c8 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreEmoji$Companion;
 .super Ljava/lang/Object;
+.source "StoreEmoji.kt"
 
 
 # annotations
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 02a0a8e666..555ee45a0d 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3$processGuildEmojis$$inlined$sortedByDescending$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3$processGuildEmojis$$inlined$sortedByDescending$1.smali
index bb5a381988..829ff65759 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3$processGuildEmojis$$inlined$sortedByDescending$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3$processGuildEmojis$$inlined$sortedByDescending$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$3$processGuildEmojis$$inlined$sortedByDescending$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
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 e447d9da23..9d41f63ebe 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -107,7 +108,7 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_8
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -288,6 +289,9 @@
     invoke-interface {p1, p2, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_7
+    return-void
+
+    :cond_8
     :goto_3
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$$inlined$sortedBy$1.smali
index 4cb1e70b94..5e49a0aeca 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$$inlined$sortedBy$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$$inlined$sortedBy$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreEmoji$compileSurrogatesPattern$$inlined$sortedBy$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali b/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali
index 442e675aa7..d19c58e0d6 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$1.smali
index 408b0e5468..db0de0d10d 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$getUsableEmojiSet$1;
 .super Ljava/lang/Object;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$2.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$2.smali
index 89c6369173..6932c89de4 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$getUsableEmojiSet$2;
 .super Ljava/lang/Object;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$3.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$3.smali
index f61baf7ab8..ad956cbb07 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$getUsableEmojiSet$3;
 .super Ljava/lang/Object;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4$1.smali
index 9678650be5..6c90295c3e 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$getUsableEmojiSet$4$1;
 .super Ljava/lang/Object;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4.smali
index 543adc8893..251fb0c9b5 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getUsableEmojiSet$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$getUsableEmojiSet$4;
 .super Ljava/lang/Object;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 a846a15492..d2c7d0226a 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji.smali b/com.discord/smali/com/discord/stores/StoreEmoji.smali
index a19150ea87..0112dfa536 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreEmoji;
 .super Ljava/lang/Object;
+.source "StoreEmoji.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;
@@ -235,7 +236,7 @@
 
     move-wide/from16 v10, p2
 
-    const/4 v13, 0x1
+    const/4 v13, 0x0
 
     const-wide/16 v2, 0x0
 
@@ -333,19 +334,19 @@
 
     check-cast v4, Lcom/discord/models/domain/emoji/Emoji;
 
-    move-object/from16 v7, v16
+    move-object/from16 v6, v16
 
-    check-cast v7, Ljava/util/Map;
+    check-cast v6, Ljava/util/Map;
 
     invoke-interface {v4}, Lcom/discord/models/domain/emoji/Emoji;->getUniqueId()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    const-string v9, "emoji.uniqueId"
+    const-string v8, "emoji.uniqueId"
 
-    invoke-static {v8, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v7, v8, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v6, v7, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_2
 
@@ -1078,7 +1079,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p3
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustom$Companion.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustom$Companion.smali
index 1c227fe333..fc731cc588 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreEmojiCustom$Companion;
 .super Ljava/lang/Object;
+.source "StoreEmojiCustom.kt"
 
 
 # annotations
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 6eed71882e..b7be2a9818 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreEmojiCustom.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
index 903543775d..857518851b 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreEmojiCustom;
 .super Lcom/discord/stores/Store;
+.source "StoreEmojiCustom.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -210,7 +211,6 @@
 
     const-wide/16 v0, 0x0
 
-    :goto_1
     invoke-virtual {p1, v0, v1, p4}, Lcom/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1;->invoke(JLcom/discord/models/domain/emoji/ModelEmojiCustom;)V
 
     goto :goto_0
@@ -251,12 +251,12 @@
 
     if-eqz v3, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const/4 v2, 0x0
 
-    :goto_2
+    :goto_1
     check-cast v2, Ljava/lang/Long;
 
     if-eqz v2, :cond_1
@@ -267,7 +267,9 @@
 
     move-result-wide v0
 
-    goto :goto_1
+    invoke-virtual {p1, v0, v1, p4}, Lcom/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1;->invoke(JLcom/discord/models/domain/emoji/ModelEmojiCustom;)V
+
+    goto :goto_0
 
     :cond_5
     return-void
@@ -644,7 +646,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -682,8 +684,13 @@
 
     invoke-direct {p0, v0, v1, p1, v2}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLcom/discord/models/domain/ModelGuildMember;Ljava/util/Collection;)V
 
+    return-void
+
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustomKt.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustomKt.smali
index 0fa27fabe4..c5c134e904 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustomKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustomKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/stores/StoreEmojiCustomKt;
 .super Ljava/lang/Object;
+.source "StoreEmojiCustom.kt"
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali
index 5fe54277d3..5955fe7788 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$Companion.smali b/com.discord/smali/com/discord/stores/StoreExperiments$Companion.smali
index 1f7b330290..51b636cd54 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreExperiments$Companion;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali b/com.discord/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
index 2d3821f6d3..dd11926462 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali b/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali
index 3b4f86d838..02a56a0733 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$Triggered;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1$1.smali
index 892e62cc2c..2c0af28c76 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$getExperiment$1$1;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali
index cbfc115abf..a79fb42e84 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$getExperiment$1;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
index 93fc73fded..3543083882 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$getExperimentAndStaff$1;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$2.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$2.smali
index 9e553c174a..6a7b25b427 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$getExperimentAndStaff$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
index ffa5ac20a0..309224e2cd 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$getExperimentalAlpha$1;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$sam$rx_functions_Func2$0.smali b/com.discord/smali/com/discord/stores/StoreExperiments$sam$rx_functions_Func2$0.smali
index b6dfb51eb2..787b6602ea 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$sam$rx_functions_Func2$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$sam$rx_functions_Func2$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$sam$rx_functions_Func2$0;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali
index eec93aaef8..83e424f0e6 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$1;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali
index 1a5c3081cc..250cb2c43f 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2;
 .super Ljava/lang/Object;
+.source "StoreExperiments.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments.smali b/com.discord/smali/com/discord/stores/StoreExperiments.smali
index 8d76839b18..c09a36b205 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreExperiments;
 .super Lcom/discord/stores/Store;
+.source "StoreExperiments.kt"
 
 
 # annotations
@@ -695,6 +696,8 @@
 
     invoke-virtual {v0, v1, v2}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -889,7 +892,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreFriendSuggestions.smali b/com.discord/smali/com/discord/stores/StoreFriendSuggestions.smali
index 9ad3197d8f..034881f9d4 100644
--- a/com.discord/smali/com/discord/stores/StoreFriendSuggestions.smali
+++ b/com.discord/smali/com/discord/stores/StoreFriendSuggestions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreFriendSuggestions;
 .super Lcom/discord/stores/Store;
+.source "StoreFriendSuggestions.java"
 
 
 # static fields
@@ -82,7 +83,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali
index d02be3b442..a51de77cbe 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGameParty$getUsersForPartyId$1;
 .super Ljava/lang/Object;
+.source "StoreGameParty.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali
index 74efa3fa01..8dc2dfbafc 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2$1;
 .super Ljava/lang/Object;
+.source "StoreGameParty.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
index 78b16e57b0..474cbb203b 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2;
 .super Ljava/lang/Object;
+.source "StoreGameParty.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -92,19 +93,16 @@
 
     if-eqz p1, :cond_0
 
-    :goto_0
-    check-cast p1, Ljava/util/Collection;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget-object p1, Lkotlin/a/x;->bPB:Lkotlin/a/x;
 
     check-cast p1, Ljava/util/List;
 
-    goto :goto_0
+    :goto_0
+    check-cast p1, Ljava/util/Collection;
 
-    :goto_1
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->get(Ljava/util/Collection;)Lrx/Observable;
 
     move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty.smali b/com.discord/smali/com/discord/stores/StoreGameParty.smali
index 41fac7f593..65af36e583 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGameParty;
 .super Lcom/discord/stores/Store;
+.source "StoreGameParty.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -319,6 +320,8 @@
     :goto_0
     iput-boolean v0, p0, Lcom/discord/stores/StoreGameParty;->isDirty:Z
 
+    return-void
+
     :cond_3
     :goto_1
     return-void
@@ -348,17 +351,14 @@
 
     if-eqz v3, :cond_1
 
-    :goto_0
-    move-wide v4, p2
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-wide p2, p0, Lcom/discord/stores/StoreGameParty;->meId:J
 
-    goto :goto_0
+    :goto_0
+    move-wide v4, p2
 
-    :goto_1
     iget-object p2, p0, Lcom/discord/stores/StoreGameParty;->userParties:Ljava/util/HashMap;
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -389,13 +389,13 @@
 
     check-cast p2, Ljava/lang/String;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     move-object p2, p3
 
-    :goto_2
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    :goto_1
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v1
 
@@ -426,12 +426,12 @@
 
     const/4 p1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/4 p1, 0x0
 
-    :goto_3
+    :goto_2
     if-eqz p1, :cond_6
 
     invoke-static {p2, v6}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -617,6 +617,8 @@
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreGameParty;->handlePresences(Ljava/util/List;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali
index 5b5c5d9d61..ced0e16f71 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
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 2fa39901a8..991ff63d1a 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$ClientState$Companion;
 .super Ljava/lang/Object;
+.source "StoreGatewayConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali
index 00612a93f9..95b23bda98 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$ClientState;
 .super Ljava/lang/Object;
+.source "StoreGatewayConnection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali
index 5359ae5460..efddfbaca7 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$buildGatewaySocket$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali
index 389e340e38..5662fad63c 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 43dcbcc216..ec0b6d0e93 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$callConnect$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7d7cfba56c..f102acb71c 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6448834e46..cc174958e8 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)Z
+    value = Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)Z
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,9 +28,9 @@
 
 
 # instance fields
-.field final synthetic $afk:Ljava/lang/Boolean;
+.field final synthetic $activities:Ljava/util/List;
 
-.field final synthetic $game:Lcom/discord/models/domain/ModelPresence$Activity;
+.field final synthetic $afk:Ljava/lang/Boolean;
 
 .field final synthetic $since:Ljava/lang/Long;
 
@@ -37,14 +38,14 @@
 
 
 # direct methods
-.method constructor <init>(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)V
+.method constructor <init>(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$status:Ljava/lang/Integer;
 
     iput-object p2, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$since:Ljava/lang/Long;
 
-    iput-object p3, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$game:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p3, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$activities:Ljava/util/List;
 
     iput-object p4, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$afk:Ljava/lang/Boolean;
 
@@ -80,11 +81,11 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$since:Ljava/lang/Long;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$game:Lcom/discord/models/domain/ModelPresence$Activity;
+    iget-object v2, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$activities:Ljava/util/List;
 
     iget-object v3, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$afk:Ljava/lang/Boolean;
 
-    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/gateway/GatewaySocket;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)V
+    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/gateway/GatewaySocket;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
 
     return-void
 .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 8a1ae7249d..e334bb6dd3 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$requestGuildMembers$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$2.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$2.smali
index 40f2a1568d..a63019f209 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$requestGuildMembers$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
index f30f81d69e..e17f0d265c 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0;
 .super Ljava/lang/Object;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 804441bdcd..78cff7fff9 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0da345fa39..f64848cc6e 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
index 51f9a47d4b..5e98a69da5 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection;
 .super Ljava/lang/Object;
+.source "StoreGatewayConnection.kt"
 
 # interfaces
 .implements Lcom/discord/gateway/GatewayEventHandler;
@@ -573,7 +574,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -585,7 +586,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -597,7 +598,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -609,7 +610,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -621,7 +622,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -633,7 +634,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -645,7 +646,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -657,7 +658,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -669,7 +670,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -681,7 +682,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -693,7 +694,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -705,7 +706,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -717,7 +718,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -729,7 +730,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -741,7 +742,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -753,7 +754,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -765,7 +766,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -777,7 +778,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -789,7 +790,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -801,7 +802,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -813,7 +814,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -825,7 +826,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -837,7 +838,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -849,7 +850,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -861,7 +862,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -873,7 +874,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -885,7 +886,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -897,7 +898,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -909,7 +910,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -921,7 +922,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -933,7 +934,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -945,7 +946,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -957,7 +958,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -969,7 +970,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -981,7 +982,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -993,7 +994,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1005,7 +1006,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1017,7 +1018,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1029,7 +1030,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1041,7 +1042,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1053,7 +1054,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1065,7 +1066,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1192,9 +1193,14 @@
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
+    move-object v11, v3
+
+    goto :goto_1
+
     :cond_1
     move-object v11, v3
 
+    :goto_1
     new-instance v1, Lcom/discord/gateway/GatewaySocket;
 
     new-instance v2, Lcom/discord/stores/StoreGatewayConnection$buildGatewaySocket$1;
@@ -1298,6 +1304,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/gateway/GatewaySocket;->close(Z)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -1321,7 +1329,7 @@
     return-void
 .end method
 
-.method public static synthetic presenceUpdate$default(Lcom/discord/stores/StoreGatewayConnection;Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;ILjava/lang/Object;)Z
+.method public static synthetic presenceUpdate$default(Lcom/discord/stores/StoreGatewayConnection;Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)Z
     .locals 2
 
     and-int/lit8 p6, p5, 0x2
@@ -1353,7 +1361,7 @@
     move-object p4, v0
 
     :cond_2
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)Z
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)Z
 
     move-result p0
 
@@ -1527,7 +1535,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connected:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -1551,7 +1559,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connectionReady:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -2241,7 +2249,7 @@
 
     sparse-switch v0, :sswitch_data_0
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :sswitch_0
     const-string v0, "GUILD_ROLE_UPDATE"
@@ -2252,7 +2260,7 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :sswitch_1
     const-string v0, "VOICE_SERVER_UPDATE"
@@ -2265,7 +2273,6 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->voiceServerUpdate:Lrx/subjects/SerializedSubject;
 
-    :goto_0
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
@@ -2281,7 +2288,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->voiceStateUpdate:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_3
     const-string v0, "PRESENCES_REPLACE"
@@ -2294,7 +2303,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->presenceReplace:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_4
     const-string v0, "GUILD_BAN_REMOVE"
@@ -2307,7 +2318,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildBanRemove:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_5
     const-string v0, "MESSAGE_UPDATE"
@@ -2320,7 +2333,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageUpdate:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_6
     const-string v0, "GUILD_ROLE_DELETE"
@@ -2333,7 +2348,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildRoleDelete:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_7
     const-string p2, "USER_CONNECTIONS_UPDATE"
@@ -2348,7 +2365,9 @@
 
     sget-object p2, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_8
     const-string v0, "GUILD_ROLE_CREATE"
@@ -2359,10 +2378,12 @@
 
     if-eqz p1, :cond_1
 
-    :goto_1
+    :goto_0
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildRoleCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_9
     const-string v0, "USER_GUILD_SETTINGS_UPDATE"
@@ -2375,7 +2396,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userGuildSettingsUpdate:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_a
     const-string v0, "MESSAGE_ACK"
@@ -2388,7 +2411,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageAck:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_b
     const-string v0, "GUILD_EMOJIS_UPDATE"
@@ -2401,7 +2426,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildEmojisUpdate:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_c
     const-string v0, "MESSAGE_REACTION_REMOVE"
@@ -2414,7 +2441,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageReactionRemove:Lrx/subjects/SerializedSubject;
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_d
     const-string v0, "CHANNEL_RECIPIENT_ADD"
@@ -2427,7 +2456,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelRecipientAdd:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_e
     const-string v0, "MESSAGE_DELETE"
@@ -2438,7 +2469,7 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_2
+    goto :goto_1
 
     :sswitch_f
     const-string v0, "MESSAGE_CREATE"
@@ -2451,7 +2482,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageCreate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_10
     const-string v0, "USER_UPDATE"
@@ -2464,7 +2497,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_11
     const-string v0, "CALL_UPDATE"
@@ -2475,7 +2510,7 @@
 
     if-eqz p1, :cond_1
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :sswitch_12
     const-string v0, "GUILD_UPDATE"
@@ -2486,7 +2521,7 @@
 
     if-eqz p1, :cond_1
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :sswitch_13
     const-string v0, "READY"
@@ -2499,7 +2534,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->ready:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_14
     const-string v0, "FRIEND_SUGGESTION_DELETE"
@@ -2512,7 +2549,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->friendSuggestionDelete:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_15
     const-string v0, "GUILD_MEMBER_UPDATE"
@@ -2523,7 +2562,7 @@
 
     if-eqz p1, :cond_1
 
-    goto/16 :goto_6
+    goto/16 :goto_5
 
     :sswitch_16
     const-string v0, "FRIEND_SUGGESTION_CREATE"
@@ -2536,7 +2575,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->friendSuggestionCreate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_17
     const-string v0, "MESSAGE_DELETE_BULK"
@@ -2547,10 +2588,12 @@
 
     if-eqz p1, :cond_1
 
-    :goto_2
+    :goto_1
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageDelete:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_18
     const-string v0, "GUILD_MEMBER_REMOVE"
@@ -2563,7 +2606,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildMemberRemove:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_19
     const-string v0, "CHANNEL_UPDATE"
@@ -2574,7 +2619,7 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_5
+    goto :goto_4
 
     :sswitch_1a
     const-string v0, "CALL_DELETE"
@@ -2587,7 +2632,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->callDelete:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_1b
     const-string v0, "CALL_CREATE"
@@ -2598,10 +2645,12 @@
 
     if-eqz p1, :cond_1
 
-    :goto_3
+    :goto_2
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->callCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_1c
     const-string v0, "GUILD_DELETE"
@@ -2614,7 +2663,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildDeleted:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_1d
     const-string v0, "GUILD_CREATE"
@@ -2625,10 +2676,12 @@
 
     if-eqz p1, :cond_1
 
-    :goto_4
+    :goto_3
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_1e
     const-string v0, "TYPING_START"
@@ -2641,7 +2694,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->typingStart:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_1f
     const-string v0, "CHANNEL_RECIPIENT_REMOVE"
@@ -2654,7 +2709,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelRecipientRemove:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_20
     const-string v0, "CHANNEL_DELETE"
@@ -2667,7 +2724,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelDeleted:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_21
     const-string v0, "CHANNEL_CREATE"
@@ -2678,10 +2737,12 @@
 
     if-eqz p1, :cond_1
 
-    :goto_5
+    :goto_4
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_22
     const-string v0, "RELATIONSHIP_REMOVE"
@@ -2694,7 +2755,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->relationshipRemove:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_23
     const-string v0, "USER_SETTINGS_UPDATE"
@@ -2707,7 +2770,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userSettingsUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_24
     const-string v0, "GUILD_INTEGRATIONS_UPDATE"
@@ -2720,7 +2785,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildIntegrationsUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_25
     const-string v0, "PRESENCE_UPDATE"
@@ -2733,7 +2800,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_26
     const-string v0, "USER_NOTE_UPDATE"
@@ -2746,7 +2815,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userNoteUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_27
     const-string v0, "GUILD_MEMBER_LIST_UPDATE"
@@ -2761,7 +2832,7 @@
 
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    goto :goto_7
+    goto :goto_6
 
     :sswitch_28
     const-string v0, "MESSAGE_REACTION_ADD"
@@ -2774,7 +2845,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageReactionAdd:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_29
     const-string v0, "GUILD_MEMBER_ADD"
@@ -2785,10 +2858,12 @@
 
     if-eqz p1, :cond_1
 
-    :goto_6
+    :goto_5
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildMembersAdd:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_2a
     const-string v0, "GUILD_BAN_ADD"
@@ -2801,7 +2876,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildBanAdd:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_2b
     const-string v0, "RELATIONSHIP_ADD"
@@ -2814,7 +2891,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->relationshipAdd:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_2c
     const-string v0, "USER_REQUIRED_ACTION_UPDATE"
@@ -2827,7 +2906,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userRequiredActionUpdate:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_2d
     const-string v0, "MESSAGE_REACTION_REMOVE_ALL"
@@ -2840,7 +2921,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageReactionRemoveAll:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_2e
     const-string v0, "GUILD_MEMBERS_CHUNK"
@@ -2853,7 +2936,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildMembersChunk:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :sswitch_2f
     const-string v0, "SESSIONS_REPLACE"
@@ -2866,12 +2951,16 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->sessionsReplace:Lrx/subjects/SerializedSubject;
 
-    goto/16 :goto_0
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 
     :cond_1
-    :goto_7
+    :goto_6
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x78ca470e -> :sswitch_2f
@@ -2975,12 +3064,25 @@
     return-void
 .end method
 
-.method public final presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)Z
+.method public final presenceUpdate(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)Z
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;",
+            "Ljava/lang/Boolean;",
+            ")Z"
+        }
+    .end annotation
 
     new-instance v0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;
 
-    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;-><init>(Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;)V
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;-><init>(Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Invalid.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Invalid.smali
index 18e45709ec..9d57e70176 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Invalid.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Invalid.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGifting$GiftState$Invalid;
 .super Lcom/discord/stores/StoreGifting$GiftState;
+.source "StoreGifting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$LoadFailed.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$LoadFailed.smali
index a2b932b020..d88d496d5f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$LoadFailed.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$LoadFailed.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGifting$GiftState$LoadFailed;
 .super Lcom/discord/stores/StoreGifting$GiftState;
+.source "StoreGifting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Loading.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Loading.smali
index 11b097c4e2..6616fcc6ff 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Loading.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Loading.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGifting$GiftState$Loading;
 .super Lcom/discord/stores/StoreGifting$GiftState;
+.source "StoreGifting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali
index a57e692b6a..abbbe739f7 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 .super Lcom/discord/stores/StoreGifting$GiftState;
+.source "StoreGifting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali
index e2a0b823ef..4d8c40937a 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
 .super Lcom/discord/stores/StoreGifting$GiftState;
+.source "StoreGifting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali
index 92d996d0b2..99a51b2d8c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGifting$GiftState$Resolved;
 .super Lcom/discord/stores/StoreGifting$GiftState;
+.source "StoreGifting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState.smali
index 0faacb606e..e24117256c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/stores/StoreGifting$GiftState;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 
 # annotations
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 b679645e9b..60b20794e8 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$acceptGift$1$1$1;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -78,7 +79,7 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_0
     iget-object v1, v0, Lcom/discord/stores/StoreGifting$acceptGift$1$1$1;->this$0:Lcom/discord/stores/StoreGifting$acceptGift$1$1;
@@ -133,7 +134,6 @@
 
     invoke-direct {v3, v4}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;-><init>(Lcom/discord/models/domain/ModelGift;)V
 
-    :goto_0
     check-cast v3, Lcom/discord/stores/StoreGifting$GiftState;
 
     invoke-static {v1, v2, v3}, Lcom/discord/stores/StoreGifting;->access$setGifts(Lcom/discord/stores/StoreGifting;Ljava/lang/String;Lcom/discord/stores/StoreGifting$GiftState;)V
@@ -201,7 +201,11 @@
 
     invoke-direct {v3, v4}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;-><init>(Lcom/discord/models/domain/ModelGift;)V
 
-    goto :goto_0
+    check-cast v3, Lcom/discord/stores/StoreGifting$GiftState;
+
+    invoke-static {v1, v2, v3}, Lcom/discord/stores/StoreGifting;->access$setGifts(Lcom/discord/stores/StoreGifting;Ljava/lang/String;Lcom/discord/stores/StoreGifting$GiftState;)V
+
+    return-void
 
     :cond_0
     iget-object v1, v0, Lcom/discord/stores/StoreGifting$acceptGift$1$1$1;->this$0:Lcom/discord/stores/StoreGifting$acceptGift$1$1;
@@ -234,7 +238,7 @@
 
     invoke-static {v1, v3, v4}, Lcom/discord/stores/StoreGifting;->access$setGifts(Lcom/discord/stores/StoreGifting;Ljava/lang/String;Lcom/discord/stores/StoreGifting$GiftState;)V
 
-    :goto_1
+    :goto_0
     return-void
 
     :cond_1
@@ -266,7 +270,11 @@
 
     invoke-direct {v3, v4, v5}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;-><init>(Lcom/discord/models/domain/ModelGift;Z)V
 
-    goto :goto_0
+    check-cast v3, Lcom/discord/stores/StoreGifting$GiftState;
+
+    invoke-static {v1, v2, v3}, Lcom/discord/stores/StoreGifting;->access$setGifts(Lcom/discord/stores/StoreGifting;Ljava/lang/String;Lcom/discord/stores/StoreGifting$GiftState;)V
+
+    return-void
 
     nop
 
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 47bbebca38..6007b2e150 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$acceptGift$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4b44480ef8..75fe007cb8 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$acceptGift$1$2$1;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 c1af6ce74c..217e5d9df0 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$acceptGift$1$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6ffe5137ac..bfe340bc0c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$acceptGift$1;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -74,7 +75,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Mi()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mh()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 be8648344c..528e2a1182 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$fetchGift$1$1;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -104,10 +105,10 @@
 
     invoke-static {v0, v1, v2}, Lcom/discord/stores/StoreGifting;->access$setGifts(Lcom/discord/stores/StoreGifting;Ljava/lang/String;Lcom/discord/stores/StoreGifting$GiftState;)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
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 4cc4c11392..e5c5ea6231 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$fetchGift$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a7214739df..22e82ef195 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$fetchGift$2$1;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 f6c867207e..b3bbc74ed0 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$fetchGift$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 fb70271adf..5a1bfbe22d 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$requestGift$1;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali
index 5592607151..5c0ad27314 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGifting$requestGift$2;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreGifting.smali b/com.discord/smali/com/discord/stores/StoreGifting.smali
index 19b3bc7daa..59f5b6c141 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGifting;
 .super Ljava/lang/Object;
+.source "StoreGifting.kt"
 
 
 # annotations
@@ -55,7 +56,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifting;->knownGifts:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -292,7 +293,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali
index ca5b6fb0e8..00d0cf5a52 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$get$1;
 .super Ljava/lang/Object;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali
index 14907c2330..d96baea0ee 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$get$2;
 .super Ljava/lang/Object;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 225afd5cc3..acc8899b5c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 134ae26123..2496e2b9a5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7280cc4d60..c8f4b58dfc 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 9b6684ae27..45178af3d0 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1;
 .super Ljava/lang/Object;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 651b0d7939..10ff2363ba 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1;
 .super Ljava/lang/Object;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 4cca5c2f6e..84edf117fb 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
index 3be6dbf80b..e983315948 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildIntegrations;
 .super Ljava/lang/Object;
+.source "StoreGuildIntegrations.kt"
 
 
 # instance fields
@@ -322,7 +323,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -358,7 +359,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt$sam$rx_functions_Action0$0.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt$sam$rx_functions_Action0$0.smali
index 4a83cb4513..3a6fc15513 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt$sam$rx_functions_Action0$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt$sam$rx_functions_Action0$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildIntegrationsKt$sam$rx_functions_Action0$0;
 .super Ljava/lang/Object;
+.source "StoreGuildIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt.smali
index c16dbc4626..8faa9f8fa0 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrationsKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildIntegrationsKt;
 .super Ljava/lang/Object;
+.source "StoreGuildIntegrations.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali
index 251c957506..c775de5ad1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1;
 .super Ljava/lang/Object;
+.source "StoreGuildMemberCounts.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
index a3956615a2..503d7d910c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildMemberCounts;
 .super Lcom/discord/stores/Store;
+.source "StoreGuildMemberCounts.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -82,7 +83,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -311,6 +312,8 @@
 
     iput-boolean v2, p0, Lcom/discord/stores/StoreGuildMemberCounts;->isDirty:Z
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -358,6 +361,8 @@
 
     iput-boolean v0, p0, Lcom/discord/stores/StoreGuildMemberCounts;->isDirty:Z
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali
index 731d113a6c..a11ad33e0b 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildMemberRequester$requestManager$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreGuildMemberRequester.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 e4d85fbe68..676dafd84c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildMemberRequester$requestManager$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreGuildMemberRequester.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
index e497de5986..d308d49459 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildMemberRequester;
 .super Lcom/discord/stores/Store;
+.source "StoreGuildMemberRequester.kt"
 
 
 # instance fields
@@ -439,7 +440,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -476,6 +477,9 @@
 
     :cond_3
     return-void
+
+    :cond_4
+    return-void
 .end method
 
 .method public final handleLoadMessages(JLjava/util/Collection;)V
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$Companion.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$Companion.smali
index fe2e166fc5..2ee4db816f 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildSelected$Companion;
 .super Ljava/lang/Object;
+.source "StoreGuildSelected.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali
index 3675372c1f..eea0792097 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSelected$get$1$1;
 .super Ljava/lang/Object;
+.source "StoreGuildSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali
index ec2e3633c8..03993974ae 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSelected$get$1;
 .super Ljava/lang/Object;
+.source "StoreGuildSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali
index 7ffb438ce1..03ecb621a2 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSelected$handleConnectionOpen$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali
index 1b38fdff5e..c910a5afdd 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSelected$id$1;
 .super Ljava/lang/Object;
+.source "StoreGuildSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 f6bf6faaa1..b5a13fa93e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSelected$set$1;
 .super Ljava/lang/Object;
+.source "StoreGuildSelected.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -70,6 +71,8 @@
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
index c742e20b8f..37fd7884a5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildSelected;
 .super Lcom/discord/stores/Store;
+.source "StoreGuildSelected.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -130,7 +131,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIdsCache:Lcom/discord/utilities/persister/Persister;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -251,7 +252,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali
index 2efa2ad96b..e28222766e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildSubscriptions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
index c8366dff79..4e97dd9efa 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildSubscriptions$RangeComputer;
 .super Ljava/lang/Object;
+.source "StoreGuildSubscriptions.kt"
 
 
 # annotations
@@ -204,4 +205,6 @@
     check-cast p1, Ljava/lang/Throwable;
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
index c6f36dc0dd..7a9ef2cfe2 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1;
 .super Ljava/lang/Object;
+.source "StoreGuildSubscriptions.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 a25e2be757..fd6eadd215 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSubscriptions$subscribeUser$1;
 .super Ljava/lang/Object;
+.source "StoreGuildSubscriptions.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 87e7e44ffb..72a2e5dad1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildSubscriptions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 e8cdbb2f1e..c962f0278f 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1;
 .super Ljava/lang/Object;
+.source "StoreGuildSubscriptions.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
index e5da9b05cd..a1c526f1f2 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildSubscriptions;
 .super Lcom/discord/stores/Store;
+.source "StoreGuildSubscriptions.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
index e699442925..a4b9f90499 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreGuilds$Actions;
 .super Ljava/lang/Object;
+.source "StoreGuilds.java"
 
 
 # annotations
@@ -176,7 +177,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds.smali b/com.discord/smali/com/discord/stores/StoreGuilds.smali
index 6d3fe5ccc4..c55deb12d5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreGuilds;
 .super Lcom/discord/stores/Store;
+.source "StoreGuilds.java"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -809,7 +810,6 @@
 
     invoke-interface {p1, p2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    :goto_0
     iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
 
     return-void
@@ -858,7 +858,9 @@
 
     invoke-interface {p3, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_0
+    iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
+
+    return-void
 
     :cond_3
     if-eqz p5, :cond_4
@@ -867,7 +869,7 @@
 
     move-result-object p3
 
-    :goto_1
+    :goto_0
     invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p4
@@ -882,7 +884,7 @@
 
     invoke-direct {p0, p4, p1, p2}, Lcom/discord/stores/StoreGuilds;->handleGuildMember(Lcom/discord/models/domain/ModelGuildMember;J)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
     return-void
@@ -909,17 +911,14 @@
 
     move-result-object p3
 
-    :goto_0
-    move-object v5, p3
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p3, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v5, p3
 
-    :goto_1
     const/4 v6, 0x0
 
     const-wide/16 v3, 0x0
@@ -1031,7 +1030,6 @@
 
     invoke-interface {p1, p2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    :goto_0
     iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
 
     return-void
@@ -1057,7 +1055,9 @@
 
     invoke-interface {p3, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_0
+    iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+
+    return-void
 
     :cond_1
     iget-object p3, p0, Lcom/discord/stores/StoreGuilds;->guildRoles:Ljava/util/Map;
@@ -1095,7 +1095,7 @@
     move-result-object p3
 
     :cond_4
-    :goto_1
+    :goto_0
     invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p4
@@ -1189,7 +1189,7 @@
 
     iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_6
     return-void
@@ -1280,7 +1280,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     if-nez p3, :cond_0
 
@@ -1363,6 +1363,9 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_0
     return-void
 .end method
@@ -1505,11 +1508,11 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KL()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KK()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
@@ -1742,7 +1745,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -1805,7 +1808,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -1929,7 +1932,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -2027,7 +2030,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -2090,7 +2093,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -2143,7 +2146,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$Companion.smali b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$Companion.smali
index 40f778d794..bacbb341a7 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildsNsfw$Companion;
 .super Ljava/lang/Object;
+.source "StoreGuildsNsfw.kt"
 
 
 # annotations
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 d38f6a275f..c93dc5ce96 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildsNsfw$allow$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildsNsfw.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -70,9 +71,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreGuildsNsfw$allow$1;->this$0:Lcom/discord/stores/StoreGuildsNsfw;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreGuildsNsfw$allow$1;->this$0:Lcom/discord/stores/StoreGuildsNsfw;
-
-    invoke-static {v2}, Lcom/discord/stores/StoreGuildsNsfw;->access$getGuildsIdsAllowed$p(Lcom/discord/stores/StoreGuildsNsfw;)Ljava/util/Set;
+    invoke-static {v1}, Lcom/discord/stores/StoreGuildsNsfw;->access$getGuildsIdsAllowed$p(Lcom/discord/stores/StoreGuildsNsfw;)Ljava/util/Set;
 
     move-result-object v2
 
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 e59352242d..88be171e2e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildsNsfw$deny$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreGuildsNsfw.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali b/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
index cafb624497..0da554e559 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildsNsfw;
 .super Lcom/discord/stores/Store;
+.source "StoreGuildsNsfw.kt"
 
 
 # annotations
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 8d35b37cec..72a055f4ba 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildsSorted$init$1;
 .super Ljava/lang/Object;
+.source "StoreGuildsSorted.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$2.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$2.smali
index 0f5e337e96..c221d8e3ff 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildsSorted$init$2;
 .super Ljava/lang/Object;
+.source "StoreGuildsSorted.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$3.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$3.smali
index f01dda264e..d05cd480c3 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreGuildsSorted$init$3;
 .super Lkotlin/jvm/internal/i;
+.source "StoreGuildsSorted.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
index 681153197d..9fc7887290 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreGuildsSorted;
 .super Lcom/discord/stores/Store;
+.source "StoreGuildsSorted.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Invalid.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Invalid.smali
index 152b56ab53..da6bc4e940 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Invalid.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Invalid.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInstantInvites$InviteState$Invalid;
 .super Lcom/discord/stores/StoreInstantInvites$InviteState;
+.source "StoreInstantInvites.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$LoadFailed.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$LoadFailed.smali
index a27c48fad7..a2fe31c18f 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$LoadFailed.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$LoadFailed.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInstantInvites$InviteState$LoadFailed;
 .super Lcom/discord/stores/StoreInstantInvites$InviteState;
+.source "StoreInstantInvites.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Loading.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Loading.smali
index c05f784e77..93ca2fb4cf 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Loading.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Loading.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInstantInvites$InviteState$Loading;
 .super Lcom/discord/stores/StoreInstantInvites$InviteState;
+.source "StoreInstantInvites.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali
index 9e6cea6c23..d475276060 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;
 .super Lcom/discord/stores/StoreInstantInvites$InviteState;
+.source "StoreInstantInvites.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState.smali
index 1ba17b54a0..f278dac054 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/stores/StoreInstantInvites$InviteState;
 .super Ljava/lang/Object;
+.source "StoreInstantInvites.kt"
 
 
 # annotations
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 22977ff275..89b24b12e5 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInstantInvites$get$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreInstantInvites.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d2f48dcf47..e6782927a2 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInstantInvites$requestInvite$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreInstantInvites.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e3316c3291..22c1be8b92 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInstantInvites$requestInvite$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreInstantInvites.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -120,16 +121,18 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreInstantInvites$requestInvite$2;->$inviteCode:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/stores/StoreInstantInvites$requestInvite$2;->$inviteCode:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreInstantInvites$requestInvite$2;->$source:Ljava/lang/String;
+    invoke-static {v0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteResolveFailed(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {p1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteResolveFailed(Ljava/lang/String;Ljava/lang/String;)V
+    return-void
 
     :cond_0
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali
index 6effe6eafa..298a2cf637 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInstantInvites$requestInvite$3;
 .super Ljava/lang/Object;
+.source "StoreInstantInvites.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
index 7998bd9eae..64de999928 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInstantInvites;
 .super Ljava/lang/Object;
+.source "StoreInstantInvites.kt"
 
 
 # annotations
@@ -76,7 +77,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -92,7 +93,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreInstantInvites;->knownInvites:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -314,7 +315,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreInstantInvites;->invitesPublisher:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {p1}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -464,7 +465,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$Companion.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$Companion.smali
index 8ec773a17a..30bb706e3a 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInviteSettings$Companion;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali
index 2fc6db359b..2fda21fe04 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInviteSettings$InviteCode;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali
index 61a53188a4..8b609b898d 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali
index 28d7265153..881b1310f5 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali
index 07eccdb2fd..22a8af1cb6 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 395a259708..74bc1312ba 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -94,7 +95,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KA()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali
index fefecaa458..42d0f268cf 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$getInvitableChannels$1;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali
index 6bcad21675..02fdd0202f 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$getInvite$1;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali
index 802ad7c3dc..3fc3906765 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$getInvite$2;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali
index 8fe9662f7f..bfda40405e 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$trackWithInvite$1;
 .super Ljava/lang/Object;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 2facba055d..0f9accfad9 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreInviteSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
index 84806e7070..09aebb974b 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreInviteSettings;
 .super Lcom/discord/stores/Store;
+.source "StoreInviteSettings.kt"
 
 
 # annotations
@@ -262,7 +263,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -398,7 +399,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreInviteSettings;->pendingInviteCodeSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali
index 1152ffab87..b7a61abf6a 100644
--- a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreLibrary$fetchApplications$1$1;
 .super Ljava/lang/Object;
+.source "StoreLibrary.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 d119e2822a..36253f518a 100644
--- a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreLibrary$fetchApplications$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreLibrary.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreLibrary.smali b/com.discord/smali/com/discord/stores/StoreLibrary.smali
index 74f276a920..220ac1e54f 100644
--- a/com.discord/smali/com/discord/stores/StoreLibrary.smali
+++ b/com.discord/smali/com/discord/stores/StoreLibrary.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreLibrary;
 .super Lcom/discord/stores/Store;
+.source "StoreLibrary.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
index 36ea76b901..8786d792bf 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaEngine$Companion;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali
index c3b9cee365..fb48fed09e 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$EngineListener;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;
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 473cc5c9b7..4682b7e251 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 120315a5a4..2efd3c8803 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1ab2a20a84..b16cbcce0d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 28bd0881fe..aec2daa7e8 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
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 96a230150e..199d84fc9d 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$handleNewConnection$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -67,9 +68,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$2;->this$0:Lcom/discord/stores/StoreMediaEngine;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$2;->this$0:Lcom/discord/stores/StoreMediaEngine;
-
-    invoke-static {v0}, Lcom/discord/stores/StoreMediaEngine;->access$getSelectedVideoInputDevice$p(Lcom/discord/stores/StoreMediaEngine;)Lco/discord/media_engine/VideoInputDeviceDescription;
+    invoke-static {v1}, Lcom/discord/stores/StoreMediaEngine;->access$getSelectedVideoInputDevice$p(Lcom/discord/stores/StoreMediaEngine;)Lco/discord/media_engine/VideoInputDeviceDescription;
 
     move-result-object v0
 
@@ -79,17 +78,14 @@
 
     move-result-object v0
 
-    :goto_0
-    move-object v3, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v3, v0
 
-    :goto_1
     const/4 v4, 0x0
 
     const/4 v5, 0x4
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 2cb05e5f45..555f5c65af 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$localVoiceStatus$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 137131206a..c7ac1fd304 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$localVoiceStatus$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali
index 9b4ba8f37e..9cebfb5dbf 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action1$0.smali
index 3c5b1e3ee6..d65c3b8c4a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$sam$rx_functions_Action1$0;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 7d316b0aad..674d7e9f58 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 89fe43f704..d50d18d8da 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$selectVideoInputDevice$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4bcf5e3e53..bbb128b943 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ef464891bf..9394b6379f 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$2;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 be462ece28..f50a0af62b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$3;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 dedf655430..be76f8b809 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$4;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 eed3cc435f..c8473f2d87 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$5;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 5afb7668bf..600b89d65e 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$6;
 .super Ljava/lang/Object;
+.source "StoreMediaEngine.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
index 414a6b9156..ade44a6d54 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaEngine;
 .super Lcom/discord/stores/Store;
+.source "StoreMediaEngine.kt"
 
 
 # annotations
@@ -232,7 +233,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -314,7 +315,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/b/b;->LQ()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/b/b;->LP()Lrx/Observable;
 
     move-result-object p1
 
@@ -1013,6 +1014,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method static synthetic handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
@@ -1121,19 +1124,19 @@
 
     move-result v2
 
-    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->s(Z)V
+    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->r(Z)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseSuppression()Z
 
     move-result v2
 
-    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->t(Z)V
+    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->s(Z)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
 
     move-result v2
 
-    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->u(Z)V
+    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->t(Z)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isDeafened()Z
 
@@ -1145,7 +1148,7 @@
 
     move-result v2
 
-    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->r(Z)V
+    invoke-interface {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->q(Z)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1483,7 +1486,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->selectedVideoInputDeviceSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -1516,7 +1519,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->videoInputDevicesSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -1542,7 +1545,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
     :cond_0
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->dW()Lcom/hammerandchisel/libdiscord/Discord;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->dV()Lcom/hammerandchisel/libdiscord/Discord;
 
     move-result-object v0
     :try_end_0
@@ -1833,4 +1836,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$Companion.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$Companion.smali
index dafcf22f74..b9cb1dd30e 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaNotification$Companion;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index a800839636..57b5fb1df3 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$NotificationData;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$1.smali
index c7c07b0450..b62028a9e2 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$init$1;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$2.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$2.smali
index 20efc2f7af..e2436aaa0f 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$init$2;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 b3e99afef6..e9b2114411 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$init$3;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 c849233f01..cb89ab09df 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$init$4;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMediaNotification.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$1.smali
index c7013805a6..ca5655c689 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1$1;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$2.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$2.smali
index 1ea5362c54..f4014f0564 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1$2;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 635b21e110..cc2047c45e 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;
 .super Ljava/lang/Object;
+.source "StoreMediaNotification.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
index e22e7edaba..f18da992ab 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaNotification;
 .super Lcom/discord/stores/Store;
+.source "StoreMediaNotification.kt"
 
 
 # annotations
@@ -77,7 +78,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$Companion.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$Companion.smali
index 1c21454b29..1a7890c37e 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaSettings$Companion;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
index 539d773a4b..f76304d2e1 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali
index 111a4e3a0c..868af8b0b6 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getAutomaticGainControl$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali
index 7177378f22..6083f3d2ca 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getAutomaticVAD$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali
index db64d51e2e..3c6a6f5d8c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getEchoCancellation$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali
index e89921bb31..2a340b6346 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getInputMode$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseSuppression$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseSuppression$1.smali
index 24688947c7..c7b37de1e3 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseSuppression$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseSuppression$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getNoiseSuppression$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputMode$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputMode$1.smali
index 749540264d..92e11bb5cd 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputMode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputMode$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali
index 21402d7315..6e92b90530 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getOutputVolume$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali
index d986ee1428..14c277ccf4 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getSensitivity$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali
index b9d91c3d67..e5b33e854b 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getUserMuted$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali
index faade7cfcc..257315ac50 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$getUserOutputVolume$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 858308927a..cc115ce831 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$init$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1$1.smali
index fd238b3a13..be429750e7 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$init$2$1$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1.smali
index 18b20eb04d..877467a4de 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$init$2$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
index 866537f0d1..7bbefc60b8 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$init$2;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 437bb5491f..f506e3ce57 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$init$3;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali
index c6277c0936..d41bc8ef37 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$isSelfDeafened$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali
index f59a371909..19dbefdbce 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMediaSettings$isSelfMuted$1;
 .super Ljava/lang/Object;
+.source "StoreMediaSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
index a1e1c2cd64..4e61b803b6 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMediaSettings;
 .super Lcom/discord/stores/Store;
+.source "StoreMediaSettings.kt"
 
 
 # annotations
@@ -479,7 +480,6 @@
 
     const-string v2, "inputMode was null"
 
-    :goto_0
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -505,7 +505,19 @@
 
     const-string v2, "outputMode was null"
 
-    goto :goto_0
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x6
+
+    const/4 v6, 0x0
+
+    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
+
+    sget-object p1, Lcom/discord/stores/StoreMediaSettings;->DEFAULT_VOICE_CONFIG:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    return-object p1
 
     :cond_1
     return-object p1
@@ -1776,8 +1788,16 @@
 
     move-result v4
 
-    xor-int/lit8 v4, v4, 0x1
+    if-nez v4, :cond_0
 
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :goto_0
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -1832,8 +1852,16 @@
 
     move-result v3
 
-    xor-int/lit8 v3, v3, 0x1
+    if-nez v3, :cond_0
 
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -1894,8 +1922,16 @@
 
     move-result v5
 
-    xor-int/lit8 v5, v5, 0x1
+    if-nez v5, :cond_0
 
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v5, 0x0
+
+    :goto_0
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -1938,8 +1974,16 @@
     :try_start_0
     iget-boolean v0, p0, Lcom/discord/stores/StoreMediaSettings;->enableVideoHardwareScaling:Z
 
-    xor-int/lit8 v0, v0, 0x1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setEnableVideoHardwareScaling(Z)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -1980,8 +2024,16 @@
 
     move-result v6
 
-    xor-int/lit8 v6, v6, 0x1
+    if-nez v6, :cond_0
 
+    const/4 v6, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v6, 0x0
+
+    :goto_0
     const/4 v7, 0x0
 
     const/4 v8, 0x0
@@ -2123,8 +2175,16 @@
 
     move-result v2
 
-    xor-int/lit8 v2, v2, 0x1
+    if-nez v2, :cond_0
 
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -2166,41 +2226,47 @@
 .end method
 
 .method public final declared-synchronized toggleSelfMuted()Z
-    .locals 15
+    .locals 17
+
+    move-object/from16 v1, p0
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaSettings;->forceSelfMute:Z
+    iget-boolean v0, v1, Lcom/discord/stores/StoreMediaSettings;->forceSelfMute:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v0, :cond_0
+    const/4 v2, 0x0
 
-    const/4 v0, 0x0
+    if-eqz v0, :cond_0
 
     monitor-exit p0
 
-    return v0
+    return v2
 
     :cond_0
     :try_start_1
-    iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v3, v1, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, v1, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
 
     move-result v0
 
-    const/4 v14, 0x1
+    const/16 v16, 0x1
 
-    xor-int/lit8 v2, v0, 0x1
+    if-nez v0, :cond_1
 
-    const/4 v3, 0x0
+    const/4 v4, 0x1
 
+    goto :goto_0
+
+    :cond_1
     const/4 v4, 0x0
 
+    :goto_0
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -2215,21 +2281,25 @@
 
     const/4 v11, 0x0
 
-    const/16 v12, 0x3fe
+    const/4 v12, 0x0
 
     const/4 v13, 0x0
 
-    invoke-static/range {v1 .. v13}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;IILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    const/16 v14, 0x3fe
+
+    const/4 v15, 0x0
+
+    invoke-static/range {v3 .. v15}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;IILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceConfiguration(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
+    invoke-direct {v1, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceConfiguration(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     monitor-exit p0
 
-    return v14
+    return v16
 
     :catchall_0
     move-exception v0
@@ -2278,8 +2348,16 @@
 
     move-result-object p1
 
-    xor-int/lit8 p2, v1, 0x1
+    if-nez v1, :cond_1
 
+    const/4 p2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_0
     invoke-static {p2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p2
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali b/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali
index f59aafce7b..69a5ffb9d9 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMentions$getTotal$1;
 .super Ljava/lang/Object;
+.source "StoreMentions.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$init$1.smali b/com.discord/smali/com/discord/stores/StoreMentions$init$1.smali
index a82d94e66d..4122f0a29a 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMentions$init$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 495e1da57d..6fb7776eee 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMentions$init$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$init$3.smali b/com.discord/smali/com/discord/stores/StoreMentions$init$3.smali
index 556fe79585..53e3eb1cfd 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMentions$init$3;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMentions.smali b/com.discord/smali/com/discord/stores/StoreMentions.smali
index f6208e2056..caa88f17d7 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMentions;
 .super Lcom/discord/stores/Store;
+.source "StoreMentions.kt"
 
 
 # instance fields
@@ -166,15 +167,13 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreMentions;->counts:Ljava/util/Map;
 
-    new-instance p1, Lcom/discord/utilities/persister/Persister;
+    new-instance v0, Lcom/discord/utilities/persister/Persister;
 
-    const-string v0, "CHANNEL_MENTION_COUNTS_V5"
+    const-string v1, "CHANNEL_MENTION_COUNTS_V5"
 
-    iget-object v1, p0, Lcom/discord/stores/StoreMentions;->countsEmpty:Ljava/util/Map;
+    invoke-direct {v0, v1, p1}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p1, v0, v1}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMentions;->countsSubject:Lcom/discord/utilities/persister/Persister;
+    iput-object v0, p0, Lcom/discord/stores/StoreMentions;->countsSubject:Lcom/discord/utilities/persister/Persister;
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -777,7 +776,7 @@
 
     cmp-long v9, v5, v7
 
-    if-eqz v9, :cond_10
+    if-eqz v9, :cond_11
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestamp()J
 
@@ -1040,6 +1039,9 @@
     return v6
 
     :cond_10
+    return v0
+
+    :cond_11
     :goto_5
     return v0
 .end method
@@ -1425,6 +1427,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
@@ -1540,6 +1544,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -1671,6 +1677,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized handleMessageCreateOrUpdate(Ljava/util/List;)V
@@ -1756,6 +1764,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final init(Landroid/content/Context;)V
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali
index 0b17b3dba8..b9b91ad91d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageAck$Ack;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck$Companion.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck$Companion.smali
index 7ff6b483fb..0461ee2d30 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageAck$PendingAck$Companion;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
index cdc2ba276e..42c4242882 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$PendingAck;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1$1.smali
index fd1a5c0280..dd5556c626 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$ack$1$1;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 1aeef76b80..2b2db424b7 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$ack$1;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 10bc5841dd..80d838ac03 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$ackGuild$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali
index d3ea83e5ff..f65cc5f82e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$get$1;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1$1.smali
index 9333c50aea..7f22921a25 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAck$1$1;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali
index 68e0b62754..ec927055a2 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAck$1;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$1.smali
index 4e21ba339f..e68b18d7e9 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAckSubscription$1$1;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$2.smali
index 9b8042aea1..3e98ed89ca 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAckSubscription$1$2;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$3.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$3.smali
index 251281566c..81791a315b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAckSubscription$1$3;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1.smali
index 25c5093ef5..8ae180e7c6 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAckSubscription$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$2.smali
index 7fca374f6b..770526240d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAckSubscription$2;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$3.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$3.smali
index f2bd60a918..e0b218f8d3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAckSubscription$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$getPendingAckSubscription$3;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8dbee96d1f..f770dcf568 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageAck$init$1;
 .super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
index 45467e94c3..41eb903d84 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageAck;
 .super Lcom/discord/stores/Store;
+.source "StoreMessageAck.kt"
 
 
 # annotations
@@ -384,7 +385,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p1
 
@@ -492,7 +493,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -815,6 +816,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V
@@ -972,6 +975,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method protected final init(Landroid/content/Context;)V
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$State.smali b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
index 35967cd93d..550756a504 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageState$State;
 .super Ljava/lang/Object;
+.source "StoreMessageState.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali
index 0a6977341a..f86174874a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessageState.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d607918a81..8b62e5e9c9 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageState$revealSpoiler$1;
 .super Ljava/lang/Object;
+.source "StoreMessageState.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali
index 007fb1b098..f44ce7b457 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessageState.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 03c8357f51..a4ae361977 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1;
 .super Ljava/lang/Object;
+.source "StoreMessageState.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState.smali b/com.discord/smali/com/discord/stores/StoreMessageState.smali
index 5eb6d0574d..9b8217241b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageState;
 .super Ljava/lang/Object;
+.source "StoreMessageState.kt"
 
 
 # annotations
@@ -362,7 +363,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageStateKt.smali b/com.discord/smali/com/discord/stores/StoreMessageStateKt.smali
index 29a397a98b..47931cfff0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageStateKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageStateKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/stores/StoreMessageStateKt;
 .super Ljava/lang/Object;
+.source "StoreMessageState.kt"
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$None.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$None.smali
index 32129f0fa8..3372cc8f1a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$None.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$None.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageUploads$MessageUploadState$None;
 .super Lcom/discord/stores/StoreMessageUploads$MessageUploadState;
+.source "StoreMessageUploads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
index 6365442d2e..baf7ad7e85 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing;
 .super Lcom/discord/stores/StoreMessageUploads$MessageUploadState;
+.source "StoreMessageUploads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali
index 8a68e39331..c159fbc69e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;
 .super Lcom/discord/stores/StoreMessageUploads$MessageUploadState;
+.source "StoreMessageUploads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState.smali
index 999e923873..88ac9c1380 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/stores/StoreMessageUploads$MessageUploadState;
 .super Ljava/lang/Object;
+.source "StoreMessageUploads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali
index 21995f0677..c048dca798 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessageUploads$getUploadProgress$1;
 .super Ljava/lang/Object;
+.source "StoreMessageUploads.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads.smali
index 9e440e4e71..c92ff62d9f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessageUploads;
 .super Ljava/lang/Object;
+.source "StoreMessageUploads.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -99,6 +100,8 @@
 
     invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploadsKt.smali b/com.discord/smali/com/discord/stores/StoreMessageUploadsKt.smali
index bb7a382ead..c4771e1463 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploadsKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploadsKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/stores/StoreMessageUploadsKt;
 .super Ljava/lang/Object;
+.source "StoreMessageUploads.kt"
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
index 8217be5be3..70cf29602a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$get$1;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali
index 14821c3079..6da3350cee 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$get$2;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$get$3.smali b/com.discord/smali/com/discord/stores/StoreMessages$get$3.smali
index e4f5b9f3f1..592673296a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$get$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$get$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$get$3;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali
index d2150f3767..f03fe2b4bf 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$isDetached$1;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
index c6ec69479b..f74d09abe1 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$1;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 673af47164..40970825e3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -207,11 +208,9 @@
     goto :goto_0
 
     :cond_2
-    instance-of v0, v0, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
+    instance-of v1, v0, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
 
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;->$result:Lcom/discord/utilities/messagesend/MessageResult;
+    if-eqz v1, :cond_3
 
     check-cast v0, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
 
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 f23b2994ef..7f08db6145 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b7f0d11dd7..dbb139cc65 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$request$1$2$1;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -76,7 +77,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     const-string v2, "localMessage.nonce!!"
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 23b8bf030c..c52973c559 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$request$1$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3697162bf9..07dce3a8a0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$request$1$3$1;
 .super Ljava/lang/Object;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -68,7 +69,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     const-string v2, "localMessage.nonce!!"
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 147bfa2c17..d928e5f88f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
index 7c8960d99e..ef0bb4dca3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessages$sendMessage$request$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessages.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages.smali b/com.discord/smali/com/discord/stores/StoreMessages.smali
index b66ca74f66..42adcaafe8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessages;
 .super Lcom/discord/stores/Store;
+.source "StoreMessages.kt"
 
 
 # instance fields
@@ -495,7 +496,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -780,7 +781,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -975,7 +976,7 @@
 
     check-cast p4, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->cmL:I
+    sget p1, Lrx/Emitter$a;->cmf:I
 
     invoke-static {p4, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
index 92f21dd570..701125b54c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/stores/StoreMessagesHolder;
 .super Ljava/lang/Object;
+.source "StoreMessagesHolder.java"
 
 
 # static fields
@@ -171,7 +172,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -617,8 +618,6 @@
     goto :goto_0
 
     :cond_1
-    const/4 v5, 0x0
-
     sub-long/2addr v3, v1
 
     const-wide/16 v1, 0x3e8
@@ -934,6 +933,8 @@
 
     move-result-object p0
 
+    return-object p0
+
     :cond_4
     :goto_3
     return-object p0
@@ -955,9 +956,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/16 v3, 0xc8
 
@@ -1030,9 +1031,12 @@
 
     if-nez p5, :cond_6
 
-    const/4 v1, 0x1
+    goto :goto_3
 
     :cond_6
+    const/4 v1, 0x0
+
+    :goto_3
     if-nez p3, :cond_8
 
     if-nez v1, :cond_7
@@ -1056,7 +1060,6 @@
 
     invoke-direct {p2, p3}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    :goto_3
     invoke-virtual {p1, p2}, Lrx/subjects/Subject;->onNext(Ljava/lang/Object;)V
 
     goto :goto_4
@@ -1082,7 +1085,7 @@
 
     invoke-direct {p2, p3}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    goto :goto_3
+    invoke-virtual {p1, p2}, Lrx/subjects/Subject;->onNext(Ljava/lang/Object;)V
 
     :cond_9
     :goto_4
@@ -1273,6 +1276,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public deleteMessages(JLjava/util/List;)V
@@ -1393,6 +1398,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public getDetachedChannelSubject()Lrx/Observable;
@@ -1559,11 +1566,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
     iput-boolean p1, p0, Lcom/discord/stores/StoreMessagesHolder;->cacheEnabled:Z
 
@@ -1575,12 +1577,16 @@
 
     return-void
 
-    :goto_2
+    :catchall_0
+    move-exception p1
+
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public invalidate()V
@@ -1678,6 +1684,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method public loadMessageChunks(Ljava/util/List;)V
@@ -1882,6 +1890,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public removeAllReactions(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
@@ -2200,6 +2210,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public updateReactions(Ljava/util/List;Z)V
@@ -2345,4 +2357,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
index 8b6887c9f0..b1e391c0fc 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 
 # annotations
@@ -74,89 +75,89 @@
 
     move-object v0, p0
 
-    and-int/lit8 v2, p8, 0x1
+    and-int/lit8 v1, p8, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-wide v2, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->channelId:J
+    iget-wide v1, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->channelId:J
 
     goto :goto_0
 
     :cond_0
-    move-wide v2, p1
+    move-wide v1, p1
 
     :goto_0
-    and-int/lit8 v4, p8, 0x2
+    and-int/lit8 v3, p8, 0x2
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    iget-object v4, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->messages:Ljava/util/List;
+    iget-object v3, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->messages:Ljava/util/List;
 
     goto :goto_1
 
     :cond_1
-    move-object v4, p3
+    move-object v3, p3
 
     :goto_1
-    and-int/lit8 v5, p8, 0x4
+    and-int/lit8 v4, p8, 0x4
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
-    iget-boolean v5, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isInitial:Z
+    iget-boolean v4, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isInitial:Z
 
     goto :goto_2
 
     :cond_2
-    move v5, p4
+    move v4, p4
 
     :goto_2
-    and-int/lit8 v6, p8, 0x8
+    and-int/lit8 v5, p8, 0x8
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    iget-boolean v6, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isPresent:Z
+    iget-boolean v5, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isPresent:Z
 
     goto :goto_3
 
     :cond_3
-    move v6, p5
+    move v5, p5
 
     :goto_3
-    and-int/lit8 v7, p8, 0x10
+    and-int/lit8 v6, p8, 0x10
 
-    if-eqz v7, :cond_4
+    if-eqz v6, :cond_4
 
-    iget-boolean v7, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isAppendingTop:Z
+    iget-boolean v6, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isAppendingTop:Z
 
     goto :goto_4
 
     :cond_4
-    move v7, p6
+    move v6, p6
 
     :goto_4
-    and-int/lit8 v1, p8, 0x20
+    and-int/lit8 v7, p8, 0x20
 
-    if-eqz v1, :cond_5
+    if-eqz v7, :cond_5
 
-    iget-boolean v1, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isJump:Z
+    iget-boolean v7, v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isJump:Z
 
     goto :goto_5
 
     :cond_5
-    move v1, p7
+    move v7, p7
 
     :goto_5
-    move-wide p1, v2
+    move-wide p1, v1
 
-    move-object p3, v4
+    move-object p3, v3
 
-    move p4, v5
+    move p4, v4
 
-    move p5, v6
+    move p5, v5
 
-    move p6, v7
+    move p6, v6
 
-    move p7, v1
+    move p7, v7
 
     invoke-virtual/range {p0 .. p7}, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->copy(JLjava/util/List;ZZZZ)Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelLoadedState.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelLoadedState.smali
index cbeecb2c5d..b6af14e08f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelLoadedState.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelLoadedState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali
index 627129bbd0..297fcc3ab3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali
index 87b94eca1f..3d99bf955c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$getScrollTo$1;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali
index 88d900d5c4..b206c85fb8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$handleChannelSelected$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali
index 08d9e6314e..e2cc2e088f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali
index 069264fb70..81cf27d7c5 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali
index 70f31bada4..937a8d0139 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$handleLoadedMessages$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 67419aee18..fdcb8e04e9 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$init$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d03611b530..ad5c362c0a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$init$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali
index 0722912993..20d6bbde0a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 05afb5722b..8b1f4d248a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -95,11 +96,6 @@
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     :try_start_1
     iget-object p1, p0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1;->this$0:Lcom/discord/stores/StoreMessagesLoader;
@@ -146,7 +142,9 @@
 
     return-void
 
-    :goto_0
+    :catchall_0
+    move-exception p1
+
     monitor-exit p0
 
     throw p1
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali
index 52d70fd48e..a2c7f0c5f2 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f82b20aa87..15d1052087 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali
index 2008808ede..88f1cfbe90 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali
index b4ec6774c0..b48f43c45e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$4;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 f4519571c8..8efbcb8ed8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$5;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali
index 6c36f6e8f4..cc8ac35a74 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
index c29577b598..af0000cfad 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 bfe634ed3b..224942a02d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$7;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e734bf57ed..b0f4e3de4d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;
 .super Lkotlin/jvm/internal/i;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali
index b667f4c73c..175ef29928 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$requestNewestMessages$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali
index 50f8eea81f..be6f5c1246 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$2.smali
index ad1683a023..cb8dbbecb3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 e18ba007b4..f0fe8c6a07 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a6174b8b73..8d3c8e8313 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali
index 01cd9f1c6b..9d1457fe3b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 815c1ac439..b46e1e5ac1 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$3.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$3.smali
index 3218f11c0b..73ee6aac46 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$3;
 .super Ljava/lang/Object;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 b38961a107..16c938753a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a14c44aa2e..24a87c4ea3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
@@ -198,7 +199,7 @@
     :goto_0
     const/4 v1, 0x0
 
-    invoke-static {v1}, Lcom/discord/app/g;->p(Z)Lrx/Observable$Transformer;
+    invoke-static {v1}, Lcom/discord/app/g;->o(Z)Lrx/Observable$Transformer;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali
index 59294490b4..b4defe0769 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f7702717a1..6c22efa47c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali
index ac2c2e99ae..425424ead9 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesLoader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
index cb6ca50c97..090e332f69 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader;
 .super Lcom/discord/stores/Store;
+.source "StoreMessagesLoader.kt"
 
 
 # annotations
@@ -118,7 +119,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -160,7 +161,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -661,7 +662,7 @@
 .end method
 
 .method private final declared-synchronized handleLoadedMessages(Ljava/util/List;JLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V
-    .locals 17
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -685,28 +686,28 @@
     :try_start_0
     invoke-interface/range {p1 .. p1}, Ljava/util/List;->size()I
 
-    move-result v1
+    move-result v0
 
-    iget v2, v11, Lcom/discord/stores/StoreMessagesLoader;->messageRequestSize:I
+    iget v1, v11, Lcom/discord/stores/StoreMessagesLoader;->messageRequestSize:I
 
-    if-ge v1, v2, :cond_0
+    if-ge v0, v1, :cond_0
 
-    const/4 v14, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v14, 0x0
+    const/4 v0, 0x0
 
     :goto_0
     if-eqz p6, :cond_1
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     goto :goto_1
 
     :cond_1
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_1
     if-eqz p5, :cond_2
@@ -721,33 +722,33 @@
     :goto_2
     if-eqz p4, :cond_3
 
-    const/4 v15, 0x1
+    const/4 v14, 0x1
 
     goto :goto_3
 
     :cond_3
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
     :goto_3
-    if-nez v15, :cond_4
+    if-nez v14, :cond_4
 
-    if-nez v2, :cond_4
+    if-nez v1, :cond_4
 
     if-nez v7, :cond_4
 
-    const/4 v8, 0x1
+    const/4 v15, 0x1
 
     goto :goto_4
 
     :cond_4
-    const/4 v8, 0x0
+    const/4 v15, 0x0
 
     :goto_4
-    if-nez v8, :cond_6
+    if-nez v15, :cond_6
 
-    if-eqz v2, :cond_5
+    if-eqz v1, :cond_5
 
-    if-eqz v14, :cond_5
+    if-eqz v0, :cond_5
 
     goto :goto_5
 
@@ -763,37 +764,35 @@
     :goto_6
     new-instance v1, Lcom/discord/stores/StoreMessagesLoader$handleLoadedMessages$1;
 
-    invoke-direct {v1, v8, v7, v14}, Lcom/discord/stores/StoreMessagesLoader$handleLoadedMessages$1;-><init>(ZZZ)V
+    invoke-direct {v1, v15, v7, v0}, Lcom/discord/stores/StoreMessagesLoader$handleLoadedMessages$1;-><init>(ZZZ)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {v11, v9, v10, v1}, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStateUpdate(JLkotlin/jvm/functions/Function1;)V
 
-    iget-object v5, v11, Lcom/discord/stores/StoreMessagesLoader;->channelMessageChunksSubject:Lrx/subjects/SerializedSubject;
+    iget-object v8, v11, Lcom/discord/stores/StoreMessagesLoader;->channelMessageChunksSubject:Lrx/subjects/SerializedSubject;
 
-    new-instance v4, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;
+    new-instance v5, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;
 
-    move-object v1, v4
+    move-object v1, v5
 
     move-wide/from16 v2, p2
 
-    move-object v12, v4
-
     move-object/from16 v4, p1
 
-    move-object v13, v5
+    move-object v12, v5
 
-    move v5, v8
+    move v5, v15
 
-    move/from16 v16, v8
+    move-object v13, v8
 
-    move v8, v15
+    move v8, v14
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;-><init>(JLjava/util/List;ZZZZ)V
 
     invoke-virtual {v13, v12}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    if-eqz v16, :cond_7
+    if-eqz v15, :cond_7
 
     move-object/from16 v1, p1
 
@@ -850,13 +849,12 @@
 
     move-result-object v3
 
-    :goto_8
     invoke-virtual {v1, v3}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_9
-    if-eqz v16, :cond_a
+    if-eqz v15, :cond_a
 
     iget-object v1, v11, Lcom/discord/stores/StoreMessagesLoader;->scrollToSubject:Lrx/subjects/SerializedSubject;
 
@@ -866,11 +864,11 @@
 
     move-result-object v3
 
-    goto :goto_8
+    invoke-virtual {v1, v3}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
     :cond_a
-    :goto_9
-    if-eqz v15, :cond_10
+    :goto_8
+    if-eqz v14, :cond_10
 
     move-object/from16 v1, p1
 
@@ -901,7 +899,7 @@
 
     if-nez p4, :cond_c
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_c
     invoke-virtual/range {p4 .. p4}, Ljava/lang/Long;->longValue()J
@@ -914,21 +912,21 @@
 
     const/4 v4, 0x1
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_d
-    :goto_a
+    :goto_9
     const/4 v4, 0x0
 
-    :goto_b
+    :goto_a
     if-eqz v4, :cond_b
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_e
     const/4 v3, 0x0
 
-    :goto_c
+    :goto_b
     check-cast v3, Lcom/discord/models/domain/ModelMessage;
 
     if-nez v3, :cond_f
@@ -943,7 +941,7 @@
 
     invoke-virtual {v1, v2}, Lcom/discord/stores/StoreReadStates;->markAsRead(Ljava/lang/Long;)V
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_f
     iget-object v1, v11, Lcom/discord/stores/StoreMessagesLoader;->scrollToSubject:Lrx/subjects/SerializedSubject;
@@ -959,7 +957,7 @@
     invoke-virtual {v1, v2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
     :cond_10
-    :goto_d
+    :goto_c
     new-instance v1, Ljava/lang/StringBuilder;
 
     const-string v2, "Loaded "
@@ -968,21 +966,21 @@
 
     invoke-interface/range {p1 .. p1}, Ljava/util/List;->size()I
 
-    move-result v0
+    move-result v2
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    const-string v0, " messages for channel ["
+    const-string v2, " messages for channel ["
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1, v9, v10}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    const-string v0, "], all loaded: "
+    const-string v2, "], all loaded: "
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v14}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
     const/16 v0, 0x2e
 
@@ -1026,56 +1024,58 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method static synthetic handleLoadedMessages$default(Lcom/discord/stores/StoreMessagesLoader;Ljava/util/List;JLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;ILjava/lang/Object;)V
-    .locals 10
+    .locals 9
 
-    and-int/lit8 v1, p7, 0x4
+    and-int/lit8 v0, p7, 0x4
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v7, v2
+    move-object v6, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v7, p4
+    move-object v6, p4
 
     :goto_0
-    and-int/lit8 v1, p7, 0x8
+    and-int/lit8 v0, p7, 0x8
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_1
 
     :cond_1
-    move-object v8, p5
+    move-object v7, p5
 
     :goto_1
     and-int/lit8 v0, p7, 0x10
 
     if-eqz v0, :cond_2
 
-    move-object v9, v2
+    move-object v8, v1
 
     goto :goto_2
 
     :cond_2
-    move-object/from16 v9, p6
+    move-object v8, p6
 
     :goto_2
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object v4, p1
+    move-object v3, p1
 
-    move-wide v5, p2
+    move-wide v4, p2
 
-    invoke-direct/range {v3 .. v9}, Lcom/discord/stores/StoreMessagesLoader;->handleLoadedMessages(Ljava/util/List;JLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V
+    invoke-direct/range {v2 .. v8}, Lcom/discord/stores/StoreMessagesLoader;->handleLoadedMessages(Ljava/util/List;JLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V
 
     return-void
 .end method
@@ -1112,40 +1112,35 @@
     :try_start_0
     invoke-virtual/range {p6 .. p6}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v2
 
     goto :goto_0
 
-    :catchall_0
-    move-exception v0
-
-    goto/16 :goto_4
-
     :cond_0
-    iget-wide v3, v9, Lcom/discord/stores/StoreMessagesLoader;->selectedChannelId:J
+    iget-wide v2, v9, Lcom/discord/stores/StoreMessagesLoader;->selectedChannelId:J
 
     :goto_0
-    move-wide v10, v3
+    move-wide v10, v2
 
     if-eqz p5, :cond_2
 
-    iget-object v3, v9, Lcom/discord/stores/StoreMessagesLoader;->delayLoadingMessagesSubscription:Lrx/Subscription;
+    iget-object v2, v9, Lcom/discord/stores/StoreMessagesLoader;->delayLoadingMessagesSubscription:Lrx/Subscription;
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    invoke-interface {v3}, Lrx/Subscription;->unsubscribe()V
+    invoke-interface {v2}, Lrx/Subscription;->unsubscribe()V
 
     :cond_1
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    iput-object v3, v9, Lcom/discord/stores/StoreMessagesLoader;->delayLoadingMessagesSubscription:Lrx/Subscription;
+    iput-object v2, v9, Lcom/discord/stores/StoreMessagesLoader;->delayLoadingMessagesSubscription:Lrx/Subscription;
 
     :cond_2
-    iget-object v3, v9, Lcom/discord/stores/StoreMessagesLoader;->delayLoadingMessagesSubscription:Lrx/Subscription;
+    iget-object v2, v9, Lcom/discord/stores/StoreMessagesLoader;->delayLoadingMessagesSubscription:Lrx/Subscription;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v3, :cond_3
+    if-eqz v2, :cond_3
 
     if-nez p3, :cond_3
 
@@ -1154,11 +1149,11 @@
     return-void
 
     :cond_3
-    const-wide/16 v3, 0x0
+    const-wide/16 v2, 0x0
 
-    cmp-long v5, v0, v3
+    cmp-long v4, v0, v2
 
-    if-lez v5, :cond_4
+    if-lez v4, :cond_4
 
     :try_start_1
     sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
@@ -1250,11 +1245,11 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->isLoadingMessages()Z
 
-    move-result v5
+    move-result v4
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    if-ne v5, v1, :cond_6
+    if-ne v4, v1, :cond_6
 
     if-nez p3, :cond_6
 
@@ -1264,16 +1259,16 @@
 
     :cond_6
     :try_start_3
-    iget-object v2, v9, Lcom/discord/stores/StoreMessagesLoader;->loadingMessagesSubscription:Lrx/Subscription;
+    iget-object v4, v9, Lcom/discord/stores/StoreMessagesLoader;->loadingMessagesSubscription:Lrx/Subscription;
 
-    if-eqz v2, :cond_7
+    if-eqz v4, :cond_7
 
-    invoke-interface {v2}, Lrx/Subscription;->unsubscribe()V
+    invoke-interface {v4}, Lrx/Subscription;->unsubscribe()V
 
     :cond_7
-    cmp-long v2, v10, v3
+    cmp-long v4, v10, v2
 
-    if-lez v2, :cond_11
+    if-lez v4, :cond_11
 
     iget-boolean v2, v9, Lcom/discord/stores/StoreMessagesLoader;->backgrounded:Z
 
@@ -1512,7 +1507,9 @@
 
     return-void
 
-    :goto_4
+    :catchall_0
+    move-exception v0
+
     monitor-exit p0
 
     throw v0
@@ -1521,89 +1518,89 @@
 .method static synthetic tryLoadMessages$default(Lcom/discord/stores/StoreMessagesLoader;JZZZLjava/lang/Long;Ljava/lang/Long;ILjava/lang/Object;)V
     .locals 8
 
-    and-int/lit8 v1, p8, 0x1
+    and-int/lit8 v0, p8, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const-wide/16 v1, 0x0
+    const-wide/16 v0, 0x0
 
     goto :goto_0
 
     :cond_0
-    move-wide v1, p1
+    move-wide v0, p1
 
     :goto_0
-    and-int/lit8 v3, p8, 0x2
-
-    const/4 v4, 0x0
-
-    if-eqz v3, :cond_1
+    and-int/lit8 v2, p8, 0x2
 
     const/4 v3, 0x0
 
+    if-eqz v2, :cond_1
+
+    const/4 v2, 0x0
+
     goto :goto_1
 
     :cond_1
-    move v3, p3
+    move v2, p3
 
     :goto_1
-    and-int/lit8 v5, p8, 0x4
+    and-int/lit8 v4, p8, 0x4
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     goto :goto_2
 
     :cond_2
-    move v5, p4
+    move v4, p4
 
     :goto_2
-    and-int/lit8 v6, p8, 0x8
+    and-int/lit8 v5, p8, 0x8
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
     goto :goto_3
 
     :cond_3
-    move v4, p5
+    move v3, p5
 
     :goto_3
-    and-int/lit8 v6, p8, 0x10
+    and-int/lit8 v5, p8, 0x10
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    if-eqz v6, :cond_4
+    if-eqz v5, :cond_4
 
-    move-object v6, v7
+    move-object v5, v6
 
     goto :goto_4
 
     :cond_4
-    move-object v6, p6
+    move-object v5, p6
 
     :goto_4
-    and-int/lit8 v0, p8, 0x20
+    and-int/lit8 v7, p8, 0x20
 
-    if-eqz v0, :cond_5
+    if-eqz v7, :cond_5
 
     goto :goto_5
 
     :cond_5
-    move-object v7, p7
+    move-object v6, p7
 
     :goto_5
-    move-wide p1, v1
+    move-wide p1, v0
 
-    move p3, v3
+    move p3, v2
 
-    move p4, v5
+    move p4, v4
 
-    move p5, v4
+    move p5, v3
 
-    move-object p6, v6
+    move-object p6, v5
 
-    move-object p7, v7
+    move-object p7, v6
 
     invoke-direct/range {p0 .. p7}, Lcom/discord/stores/StoreMessagesLoader;->tryLoadMessages(JZZZLjava/lang/Long;Ljava/lang/Long;)V
 
@@ -1888,11 +1885,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     const/4 p1, 0x1
 
@@ -1926,7 +1918,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     monitor-exit p0
 
     throw p1
@@ -2145,7 +2139,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p3
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali
index f435ee17dc..192d9721a0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesMostRecent$get$1;
 .super Ljava/lang/Object;
+.source "StoreMessagesMostRecent.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$init$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$init$1.smali
index d3ddb488bc..6289ee4776 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreMessagesMostRecent$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreMessagesMostRecent.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
index 8dcf45c9e1..61591aee92 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreMessagesMostRecent;
 .super Lcom/discord/stores/Store;
+.source "StoreMessagesMostRecent.kt"
 
 
 # instance fields
@@ -70,7 +71,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -112,6 +113,8 @@
 
     invoke-virtual {v0, v1}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -571,6 +574,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali
index 4e3eae49ea..fee2005884 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 
 # annotations
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 9feae29564..6ea2e025db 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali
index bdb0634035..05900cb0d7 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali
index 5344bc2a53..cdbd55c092 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali
index c0df57f42b..e083bd5ebd 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali
index ae616ad15c..3662c3defb 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function9;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali
index 7cd935caee..e8afd0397c 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali
index db54537b6d..5b7e613435 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 8af030a375..296db66457 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali
index 2107ff493c..c9ddcebfd6 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali
index a9de848820..d0db462e08 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 b116e6e16b..204043655e 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali
index 08561940f5..c143f69bfc 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -101,9 +102,9 @@
 
     sget-object v1, Lcom/discord/models/domain/ModelUser$RequiredAction;->AGREEMENTS:Lcom/discord/models/domain/ModelUser$RequiredAction;
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-ne p2, v1, :cond_0
 
@@ -125,7 +126,7 @@
 
     invoke-virtual {p2, p1}, Lcom/discord/widgets/tos/WidgetTosAccept$Companion;->show(Landroid/content/Context;)V
 
-    return v3
+    return v2
 
     :cond_1
     if-nez p2, :cond_2
@@ -136,9 +137,9 @@
 
     const/4 p2, 0x6
 
-    invoke-static {p1, v2, v2, p2}, Lcom/discord/app/e;->a(Landroid/content/Context;ZZI)V
+    invoke-static {p1, v3, v3, p2}, Lcom/discord/app/e;->a(Landroid/content/Context;ZZI)V
 
-    return v3
+    return v2
 
     :cond_2
     return p2
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 db5427f950..df8fbe42d5 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
index 7b45f7d8e3..538fa1da7c 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;
 .super Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;
+.source "StoreNavigation.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$DrawerAction.smali b/com.discord/smali/com/discord/stores/StoreNavigation$DrawerAction.smali
index a7aff590be..f685980bf9 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$DrawerAction.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$DrawerAction.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/stores/StoreNavigation$DrawerAction;
 .super Ljava/lang/Enum;
+.source "StoreNavigation.kt"
 
 
 # annotations
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 3fdab1d116..2912a52d57 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$1.smali
index 259b61416e..d622ae2c3d 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$init$1;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 b763e1a8a7..292c6d6699 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$init$2;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -104,7 +105,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KA()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 18437c2eb8..6d368796f8 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$init$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$4.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$4.smali
index f9776d98b5..27c39ecd7d 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$init$4;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$5.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$5.smali
index e843af26c6..c8f409dac2 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$init$5;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$6$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$6$1.smali
index 0179b49de3..f147c86e96 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$6$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$6$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$init$6$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -86,6 +87,8 @@
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$Companion;->launchForClaim(Landroid/content/Context;Ljava/lang/String;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali
index 7a8db5bcae..96da2e24bb 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$init$6;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$isAnyNavigationDrawerOpen$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$isAnyNavigationDrawerOpen$1.smali
index 5e49665d15..924417218a 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$isAnyNavigationDrawerOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$isAnyNavigationDrawerOpen$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigation$isAnyNavigationDrawerOpen$1;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali
index 3235150c65..ce77749741 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNavigation;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 
 # annotations
@@ -128,7 +129,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -343,7 +344,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigationKt$sam$rx_functions_Func9$0.smali b/com.discord/smali/com/discord/stores/StoreNavigationKt$sam$rx_functions_Func9$0.smali
index b6ef5b433d..070ee53fff 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigationKt$sam$rx_functions_Func9$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigationKt$sam$rx_functions_Func9$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNavigationKt$sam$rx_functions_Func9$0;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 # interfaces
 .implements Lrx/functions/Func9;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigationKt.smali b/com.discord/smali/com/discord/stores/StoreNavigationKt.smali
index 4fd8dfd2a8..05ca1512cd 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigationKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigationKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNavigationKt;
 .super Ljava/lang/Object;
+.source "StoreNavigation.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Companion.smali b/com.discord/smali/com/discord/stores/StoreNotices$Companion.smali
index 386b5523cf..81896281fd 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNotices$Companion;
 .super Ljava/lang/Object;
+.source "StoreNotices.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$bulidPassiveNotice$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$bulidPassiveNotice$1.smali
index 3b9f9a4049..45e77fbff6 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$bulidPassiveNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$bulidPassiveNotice$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$Dialog$Type$bulidPassiveNotice$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type.smali b/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type.smali
index 146493d703..e235d26001 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/stores/StoreNotices$Dialog$Type;
 .super Ljava/lang/Enum;
+.source "StoreNotices.kt"
 
 
 # annotations
@@ -95,18 +96,28 @@
 
     const-wide p2, 0x757b12c00L
 
+    move-wide v0, p2
+
+    goto :goto_0
+
     :cond_1
     move-wide v0, p2
 
+    :goto_0
     and-int/lit8 p2, p7, 0x4
 
     if-eqz p2, :cond_2
 
     const-wide/32 p4, 0x1499700
 
+    move-wide v2, p4
+
+    goto :goto_1
+
     :cond_2
     move-wide v2, p4
 
+    :goto_1
     and-int/lit8 p2, p7, 0x8
 
     if-eqz p2, :cond_3
@@ -115,12 +126,12 @@
 
     const/4 p8, 0x0
 
-    goto :goto_0
+    goto :goto_2
 
     :cond_3
     move p8, p6
 
-    :goto_0
+    :goto_2
     move-object p2, p0
 
     move p3, p1
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali b/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali
index 3654eb7ee4..22be48673e 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNotices$Dialog;
 .super Ljava/lang/Object;
+.source "StoreNotices.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali b/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
index a30e734e32..750d27f9e6 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreNotices$Notice;
 .super Ljava/lang/Object;
+.source "StoreNotices.kt"
 
 
 # annotations
@@ -88,78 +89,78 @@
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;JIZZJJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 15
+    .locals 14
 
-    and-int/lit8 v1, p12, 0x2
+    and-int/lit8 v0, p12, 0x2
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    move-wide v5, v1
+    move-wide v4, v0
 
     goto :goto_0
 
     :cond_0
-    move-wide/from16 v5, p2
+    move-wide/from16 v4, p2
 
     :goto_0
-    and-int/lit8 v1, p12, 0x4
+    and-int/lit8 v0, p12, 0x4
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const/16 v1, 0xa
+    const/16 v0, 0xa
 
-    const/16 v7, 0xa
+    const/16 v6, 0xa
 
     goto :goto_1
 
     :cond_1
-    move/from16 v7, p4
+    move/from16 v6, p4
 
     :goto_1
-    and-int/lit8 v1, p12, 0x8
+    and-int/lit8 v0, p12, 0x8
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
     goto :goto_2
 
     :cond_2
-    move/from16 v8, p5
+    move/from16 v7, p5
 
     :goto_2
-    and-int/lit8 v1, p12, 0x10
+    and-int/lit8 v0, p12, 0x10
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
     goto :goto_3
 
     :cond_3
-    move/from16 v9, p6
+    move/from16 v8, p6
 
     :goto_3
-    and-int/lit8 v1, p12, 0x20
+    and-int/lit8 v0, p12, 0x20
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    const-wide/16 v1, 0x3a98
+    const-wide/16 v0, 0x3a98
 
-    move-wide v10, v1
+    move-wide v9, v0
 
     goto :goto_4
 
     :cond_4
-    move-wide/from16 v10, p7
+    move-wide/from16 v9, p7
 
     :goto_4
     and-int/lit8 v0, p12, 0x40
@@ -168,21 +169,21 @@
 
     const-wide v0, 0x757b12c00L
 
-    move-wide v12, v0
+    move-wide v11, v0
 
     goto :goto_5
 
     :cond_5
-    move-wide/from16 v12, p9
+    move-wide/from16 v11, p9
 
     :goto_5
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object/from16 v4, p1
+    move-object v3, p1
 
-    move-object/from16 v14, p11
+    move-object/from16 v13, p11
 
-    invoke-direct/range {v3 .. v14}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;JIZZJJLkotlin/jvm/functions/Function1;)V
+    invoke-direct/range {v2 .. v13}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;JIZZJJLkotlin/jvm/functions/Function1;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali b/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali
index 2eb8561916..8b95315bd2 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreNotices$PassiveNotice;
 .super Lcom/discord/stores/StoreNotices$Notice;
+.source "StoreNotices.kt"
 
 
 # annotations
@@ -65,34 +66,34 @@
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;IZJJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 11
+    .locals 10
 
-    and-int/lit8 v1, p9, 0x4
+    and-int/lit8 v0, p9, 0x4
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     goto :goto_0
 
     :cond_0
-    move v5, p3
+    move v4, p3
 
     :goto_0
-    and-int/lit8 v1, p9, 0x8
+    and-int/lit8 v0, p9, 0x8
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const-wide v1, 0x757b12c00L
+    const-wide v0, 0x757b12c00L
 
-    move-wide v6, v1
+    move-wide v5, v0
 
     goto :goto_1
 
     :cond_1
-    move-wide v6, p4
+    move-wide v5, p4
 
     :goto_1
     and-int/lit8 v0, p9, 0x10
@@ -101,23 +102,23 @@
 
     const-wide/32 v0, 0x1499700
 
-    move-wide v8, v0
+    move-wide v7, v0
 
     goto :goto_2
 
     :cond_2
-    move-wide/from16 v8, p6
+    move-wide/from16 v7, p6
 
     :goto_2
-    move-object v2, p0
+    move-object v1, p0
 
-    move-object v3, p1
+    move-object v2, p1
 
-    move v4, p2
+    move v3, p2
 
-    move-object/from16 v10, p8
+    move-object/from16 v9, p8
 
-    invoke-direct/range {v2 .. v10}, Lcom/discord/stores/StoreNotices$PassiveNotice;-><init>(Ljava/lang/String;IZJJLkotlin/jvm/functions/Function1;)V
+    invoke-direct/range {v1 .. v9}, Lcom/discord/stores/StoreNotices$PassiveNotice;-><init>(Ljava/lang/String;IZJJLkotlin/jvm/functions/Function1;)V
 
     return-void
 .end method
@@ -158,9 +159,9 @@
 
     move-result v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eqz v1, :cond_2
 
@@ -186,9 +187,12 @@
 
     if-gt v4, v5, :cond_1
 
-    const/4 v2, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
     if-eqz v2, :cond_0
 
     invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
@@ -224,12 +228,12 @@
 
     move-result-wide v0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_3
     const-wide/16 v0, 0x0
 
-    :goto_1
+    :goto_2
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v4
@@ -244,8 +248,8 @@
 
     if-gez p1, :cond_4
 
-    return v3
+    return v2
 
     :cond_4
-    return v2
+    return v3
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali
index 4cfb3ad43a..a96535c5de 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$firstUseTimestamp$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali
index f0060f68b6..ff8b6e3b10 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$firstUseTimestamp$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali
index 67efc13bef..7d8f4112c3 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$init$1;
 .super Ljava/lang/Object;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$init$2.smali b/com.discord/smali/com/discord/stores/StoreNotices$init$2.smali
index cb66f620e1..b8794c111f 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$init$2;
 .super Ljava/lang/Object;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 8aa09fd25e..04b6250a87 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$init$3;
 .super Ljava/lang/Object;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali
index 8dc4459f88..7debafa15a 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$noticeQueue$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali
index d6d497f3b7..d7c64c729a 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$noticeQueue$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali
index 6254be80fd..c354b5c5c9 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotices$noticeQueue$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotices.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices.smali b/com.discord/smali/com/discord/stores/StoreNotices.smali
index 732e553a8b..c533f9e3d9 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNotices;
 .super Lcom/discord/stores/Store;
+.source "StoreNotices.kt"
 
 
 # annotations
@@ -214,7 +215,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->lastShownTimes:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -398,7 +399,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticePublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -836,6 +837,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
@@ -1008,4 +1011,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$Companion.smali b/com.discord/smali/com/discord/stores/StoreNotifications$Companion.smali
index 0aed508aad..b3d63f889d 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNotifications$Companion;
 .super Ljava/lang/Object;
+.source "StoreNotifications.kt"
 
 
 # annotations
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 8013c2263f..008d397198 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$configureNotificationClient$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali
index f623ba1cde..d34b7ca7e8 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$configureNotificationClient$2;
 .super Ljava/lang/Object;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 e7d8bd0ed0..bf08ede095 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$configureNotificationClient$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali
index 417b983c85..7c190a4362 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1;
 .super Ljava/lang/Object;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali
index 5a030441fa..4f3ce85c32 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2;
 .super Ljava/lang/Object;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 8ff1b32c10..5ca99fd8e5 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$displayPopup$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali
index 61632bd0c7..b352d92fa1 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$setEnabled$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali
index e1d369f758..a843342750 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali
index dbf55ab45f..fbe04c23b7 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$setNotificationLightDisabled$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali
index bd65fbc003..785175d0e9 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$setNotificationSoundDisabled$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali
index 0c4d5ed5dc..b334fbc650 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali
index 9c2bffaf2c..4a7e0ed252 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$setWakeUpDevice$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 fca3a9a6d8..9003d269f1 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -62,9 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;->this$0:Lcom/discord/stores/StoreNotifications;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;->this$0:Lcom/discord/stores/StoreNotifications;
-
-    invoke-static {v0}, Lcom/discord/stores/StoreNotifications;->access$getPushToken$p(Lcom/discord/stores/StoreNotifications;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/discord/stores/StoreNotifications;->access$getPushToken$p(Lcom/discord/stores/StoreNotifications;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications.smali b/com.discord/smali/com/discord/stores/StoreNotifications.smali
index fc1733422e..fb2748b712 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNotifications;
 .super Lcom/discord/stores/Store;
+.source "StoreNotifications.kt"
 
 
 # annotations
@@ -194,7 +195,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -218,7 +219,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
@@ -494,6 +495,8 @@
 
     invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable;
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -544,7 +547,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -750,15 +753,13 @@
 
     cmp-long v5, v9, v1
 
-    if-nez v5, :cond_7
+    if-nez v5, :cond_6
 
-    :cond_6
-    :goto_2
     const/4 v5, 0x0
 
     goto :goto_3
 
-    :cond_7
+    :cond_6
     iget-object v5, p0, Lcom/discord/stores/StoreNotifications;->stream:Lcom/discord/stores/StoreStream;
 
     iget-object v5, v5, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
@@ -769,20 +770,20 @@
 
     move-result-object v9
 
-    if-nez v9, :cond_8
+    if-nez v9, :cond_7
 
     invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v9
 
-    :cond_8
+    :cond_7
     invoke-interface {v5, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v5
 
     check-cast v5, Ljava/util/Map;
 
-    if-eqz v5, :cond_6
+    if-eqz v5, :cond_9
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
@@ -800,11 +801,11 @@
 
     check-cast v9, Lcom/discord/models/domain/ModelChannel;
 
-    if-nez v9, :cond_9
+    if-nez v9, :cond_8
 
     goto :goto_2
 
-    :cond_9
+    :cond_8
     sget-object v5, Lcom/discord/stores/NotificationTextUtils;->INSTANCE:Lcom/discord/stores/NotificationTextUtils;
 
     iget-object v6, p0, Lcom/discord/stores/StoreNotifications;->stream:Lcom/discord/stores/StoreStream;
@@ -865,6 +866,12 @@
 
     move-result v5
 
+    goto :goto_3
+
+    :cond_9
+    :goto_2
+    const/4 v5, 0x0
+
     :goto_3
     if-eqz v5, :cond_5
 
diff --git a/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali b/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali
index f37631fb69..80fffd328b 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNux$NuxState;
 .super Ljava/lang/Object;
+.source "StoreNux.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali b/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali
index a297c78d2f..b51c3446fc 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNux$setFirstOpen$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNux.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreNux$setPostRegisterJoin$1.smali b/com.discord/smali/com/discord/stores/StoreNux$setPostRegisterJoin$1.smali
index bf939f63f0..0ca795d8ef 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$setPostRegisterJoin$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$setPostRegisterJoin$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNux$setPostRegisterJoin$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreNux.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4763a17a7c..c24755e76e 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreNux$updateNux$1;
 .super Ljava/lang/Object;
+.source "StoreNux.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreNux.smali b/com.discord/smali/com/discord/stores/StoreNux.smali
index 11da8c4654..3901ebe545 100644
--- a/com.discord/smali/com/discord/stores/StoreNux.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreNux;
 .super Lcom/discord/stores/Store;
+.source "StoreNux.kt"
 
 
 # annotations
@@ -84,7 +85,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreNux;->nuxStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StorePermissions.smali b/com.discord/smali/com/discord/stores/StorePermissions.smali
index a2214eddf6..72ec59561e 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StorePermissions;
 .super Lcom/discord/stores/Store;
+.source "StorePermissions.java"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -506,7 +507,7 @@
 
     check-cast v10, Ljava/util/Map;
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_7
 
     if-nez v1, :cond_2
 
@@ -629,6 +630,9 @@
     iput-boolean v3, p0, Lcom/discord/stores/StorePermissions;->isDirty:Z
 
     :cond_6
+    return-void
+
+    :cond_7
     :goto_0
     return-void
 .end method
@@ -658,7 +662,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -720,7 +724,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -782,7 +786,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
index fd461a2417..7d3a3287ec 100644
--- a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
+++ b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StorePinnedMessages;
 .super Ljava/lang/Object;
+.source "StorePinnedMessages.java"
 
 
 # instance fields
@@ -461,7 +462,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -502,7 +503,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -603,6 +604,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public handleMessagesUpdate(Ljava/util/List;)V
@@ -657,6 +660,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public handlePinnedMessagesLoaded(JLjava/util/List;)V
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates.smali b/com.discord/smali/com/discord/stores/StoreReadStates.smali
index 1fb497c8d2..d185c2a56e 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreReadStates;
 .super Lcom/discord/stores/Store;
+.source "StoreReadStates.java"
 
 
 # instance fields
@@ -129,7 +130,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -645,7 +646,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -661,7 +662,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v1
 
@@ -715,11 +716,11 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/-$$Lambda$StoreReadStates$BEpBYAlVtMYsmcI--VrnnzTNNnc;-><init>(Lcom/discord/stores/StoreReadStates;)V
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v1
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v2
 
@@ -811,17 +812,14 @@
 
     move-result-wide p0
 
-    :goto_0
-    move-wide v3, p0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 p0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v3, p0
 
-    :goto_1
     move-object v0, v6
 
     move-object v5, p2
@@ -909,7 +907,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreReviewRequest$Companion.smali b/com.discord/smali/com/discord/stores/StoreReviewRequest$Companion.smali
index fb932cb96c..73d3a12198 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreReviewRequest$Companion;
 .super Ljava/lang/Object;
+.source "StoreReviewRequest.kt"
 
 
 # annotations
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 ba4ffad82e..2fa73b1c4b 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreReviewRequest$onReviewRequestShown$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreReviewRequest.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 709a9d73d8..0c54247efa 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreReviewRequest.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreReviewRequest.smali b/com.discord/smali/com/discord/stores/StoreReviewRequest.smali
index 2cc2622a5e..f0b052525d 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreReviewRequest;
 .super Lcom/discord/stores/Store;
+.source "StoreReviewRequest.kt"
 
 
 # annotations
@@ -266,6 +267,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
 
+    return-void
+
     :cond_b
     :goto_3
     return-void
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 7481165bf4..e78b93157e 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRtcConnection$init$1$1;
 .super Ljava/lang/Object;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 51c0e8f4cc..7ccb1ed01a 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRtcConnection$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4b1e41d24e..8ba33de634 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRtcConnection$init$2$1;
 .super Ljava/lang/Object;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 bdd6d7688e..94ba0b828d 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRtcConnection$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali
index edcae71a46..99d90b5123 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRtcConnection$init$3;
 .super Ljava/lang/Object;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 ba3f7f68f3..7df689e18e 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRtcConnection$init$4$1;
 .super Ljava/lang/Object;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 d9e05d8fd9..34054de202 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRtcConnection$init$4;
 .super Lkotlin/jvm/internal/k;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
index 9fb55fcc20..41508007b6 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreRtcConnection;
 .super Lcom/discord/stores/Store;
+.source "StoreRtcConnection.kt"
 
 # interfaces
 .implements Lcom/discord/rtcconnection/RtcConnection$b;
@@ -126,13 +127,13 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->speakingUsersSubject:Lrx/subjects/PublishSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -390,6 +391,8 @@
 
     invoke-virtual {v0, v3}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
+    return-void
+
     :cond_5
     :goto_1
     return-void
@@ -547,6 +550,8 @@
 
     iput-object v12, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
 
+    return-void
+
     :cond_6
     :goto_3
     return-void
@@ -569,7 +574,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/RtcConnection;->dR()Ljava/util/concurrent/Future;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/RtcConnection;->dQ()Ljava/util/concurrent/Future;
 
     :cond_0
     const/4 v0, 0x0
@@ -685,7 +690,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
 
@@ -747,9 +752,14 @@
 
     invoke-virtual/range {v1 .. v7}, Lcom/discord/utilities/analytics/AnalyticsTracker;->voiceChannelJoin(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
+
+    :cond_3
+    return-void
 .end method
 
 .method private final logChannelLeave(Lcom/discord/models/domain/ModelChannel;)V
@@ -761,7 +771,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
 
@@ -775,7 +785,7 @@
 
     if-nez v4, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
@@ -831,23 +841,25 @@
 
     move-result-object v0
 
-    :goto_0
-    move-object v7, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/4 v0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v7, v0
 
-    :goto_1
     move-object v5, p1
 
     invoke-virtual/range {v1 .. v7}, Lcom/discord/utilities/analytics/AnalyticsTracker;->voiceChannelLeave(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;)V
 
+    return-void
+
     :cond_3
-    :goto_2
+    :goto_1
+    return-void
+
+    :cond_4
     return-void
 .end method
 
@@ -1071,19 +1083,16 @@
 
     move-result-wide v0
 
+    goto :goto_0
+
+    :cond_1
+    const-wide/16 v0, 0x0
+
     :goto_0
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
-    goto :goto_1
-
-    :cond_1
-    const-wide/16 v0, 0x0
-
-    goto :goto_0
-
-    :goto_1
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcConnection;->handleVoiceChannelSelected(Ljava/lang/Long;)V
 
     return-void
@@ -1473,9 +1482,13 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->voiceConnectionSuccess(Ljava/util/Map;)V
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
diff --git a/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali b/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
index b52a154e6e..9734fa05e7 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreRunningGame$RunningGame;
 .super Ljava/lang/Object;
+.source "StoreRunningGame.kt"
 
 
 # annotations
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 96163274d7..2f0ea1d7a5 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreRunningGame$setRunningGame$1;
 .super Ljava/lang/Object;
+.source "StoreRunningGame.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -38,7 +39,7 @@
 
 # virtual methods
 .method public final call()V
-    .locals 5
+    .locals 7
 
     iget-object v0, p0, Lcom/discord/stores/StoreRunningGame$setRunningGame$1;->this$0:Lcom/discord/stores/StoreRunningGame;
 
@@ -68,37 +69,39 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
+    iget-object v1, v0, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreRunningGame$setRunningGame$1;->this$0:Lcom/discord/stores/StoreRunningGame;
+    iget-object v0, p0, Lcom/discord/stores/StoreRunningGame$setRunningGame$1;->this$0:Lcom/discord/stores/StoreRunningGame;
 
-    invoke-static {v1}, Lcom/discord/stores/StoreRunningGame;->access$getRunningGame$p(Lcom/discord/stores/StoreRunningGame;)Lcom/discord/stores/StoreRunningGame$RunningGame;
+    invoke-static {v0}, Lcom/discord/stores/StoreRunningGame;->access$getRunningGame$p(Lcom/discord/stores/StoreRunningGame;)Lcom/discord/stores/StoreRunningGame$RunningGame;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    if-eqz v0, :cond_0
 
-    if-eqz v1, :cond_0
+    invoke-virtual {v0}, Lcom/discord/stores/StoreRunningGame$RunningGame;->getAppName()Ljava/lang/String;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreRunningGame$RunningGame;->getAppName()Ljava/lang/String;
-
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v2
+    const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v1}, Lcom/discord/models/domain/ModelPresence$Activity;->createForPlaying(Ljava/lang/String;)Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->createForPlaying(Ljava/lang/String;)Lcom/discord/models/domain/ModelPresence$Activity;
 
-    move-result-object v1
+    move-result-object v3
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    const/4 v4, 0x2
+    const/4 v5, 0x4
 
-    invoke-static {v0, v1, v3, v4, v2}, Lcom/discord/stores/StoreUserPresence;->updateActivity$default(Lcom/discord/stores/StoreUserPresence;Lcom/discord/models/domain/ModelPresence$Activity;ZILjava/lang/Object;)V
+    const/4 v6, 0x0
+
+    const/4 v2, 0x0
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreUserPresence;->updateActivity$default(Lcom/discord/stores/StoreUserPresence;ILcom/discord/models/domain/ModelPresence$Activity;ZILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRunningGame.smali b/com.discord/smali/com/discord/stores/StoreRunningGame.smali
index 459a07dc6c..95b2c6b06d 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreRunningGame;
 .super Lcom/discord/stores/Store;
+.source "StoreRunningGame.kt"
 
 
 # annotations
@@ -143,7 +144,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_3
 
     if-nez p1, :cond_0
 
@@ -208,6 +209,9 @@
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_0
     return-void
 .end method
@@ -261,7 +265,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRunningGame;->gameDetectionRunningSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -285,7 +289,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRunningGame;->runningGameSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$DisplayState.smali b/com.discord/smali/com/discord/stores/StoreSearch$DisplayState.smali
index 58c169c1cc..d00f0e78de 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$DisplayState.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$DisplayState.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/stores/StoreSearch$DisplayState;
 .super Ljava/lang/Enum;
+.source "StoreSearch.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget$Type.smali b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget$Type.smali
index b5594ec861..0ca2444fe5 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget$Type.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/stores/StoreSearch$SearchTarget$Type;
 .super Ljava/lang/Enum;
+.source "StoreSearch.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
index e68f34a64f..107571df4b 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSearch$SearchTarget;
 .super Ljava/lang/Object;
+.source "StoreSearch.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali b/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
index bed38ac37b..4b9d08e328 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearch$getHistory$1;
 .super Ljava/lang/Object;
+.source "StoreSearch.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali
index 0a4d139e9a..508a66fa20 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearch$init$1;
 .super Ljava/lang/Object;
+.source "StoreSearch.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali
index 89104e6930..399174fdfa 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearch$init$2;
 .super Ljava/lang/Object;
+.source "StoreSearch.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali
index 5e8324d26e..e574cba9cd 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearch$init$3;
 .super Ljava/lang/Object;
+.source "StoreSearch.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 fc832f93b9..4b96f38d0f 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearch$init$4;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3207e5b7e3..c401d7d5cb 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearch$init$5;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSearch.smali b/com.discord/smali/com/discord/stores/StoreSearch.smali
index 6108ea13af..43c6782350 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSearch;
 .super Ljava/lang/Object;
+.source "StoreSearch.kt"
 
 
 # annotations
@@ -141,7 +142,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali b/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali
index f9c9e188b3..0d13bf8892 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchData$getChannelSearchData$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSearchData.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali b/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali
index fabb16d390..fb4fca389a 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchData$getGuildSearchData$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSearchData.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
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 9eebe93a65..b89cb57bb2 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchData$init$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSearchData.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ddf2cce46a..6cec82b8a7 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchData$init$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSearchData.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func2$0.smali b/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func2$0.smali
index 1871b23d34..6752a7906c 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func2$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func2$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchData$sam$rx_functions_Func2$0;
 .super Ljava/lang/Object;
+.source "StoreSearchData.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func4$0.smali
index 515fecfb1f..8c21bc329c 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func4$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$sam$rx_functions_Func4$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchData$sam$rx_functions_Func4$0;
 .super Ljava/lang/Object;
+.source "StoreSearchData.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData.smali b/com.discord/smali/com/discord/stores/StoreSearchData.smali
index df71cb1dd9..de03f754e1 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSearchData;
 .super Ljava/lang/Object;
+.source "StoreSearchData.kt"
 
 
 # instance fields
@@ -357,7 +358,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali
index 8cdfae513a..3fe75179df 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchInput$1;
 .super Ljava/lang/Object;
+.source "StoreSearchInput.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
index cf3e240df7..eff31d59ef 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchInput$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSearchInput.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali
index 7f7908eccc..cf38c9285a 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchInput$init$1;
 .super Ljava/lang/Object;
+.source "StoreSearchInput.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 1b0e1761b5..afebee9d9f 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchInput$init$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSearchInput.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 2950f4be9c..f549911470 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchInput$init$3;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSearchInput.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput.smali b/com.discord/smali/com/discord/stores/StoreSearchInput.smali
index 0279129eab..3979d35a5a 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSearchInput;
 .super Ljava/lang/Object;
+.source "StoreSearchInput.kt"
 
 
 # instance fields
@@ -93,7 +94,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -131,7 +132,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreSearchInput;->isInputValidSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -179,7 +180,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -371,6 +372,8 @@
 
     invoke-virtual {p1, p3}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -451,7 +454,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -465,7 +468,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$Companion.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$Companion.smali
index da53118c88..6e9c0a17f9 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSearchQuery$Companion;
 .super Ljava/lang/Object;
+.source "StoreSearchQuery.kt"
 
 
 # annotations
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 3cd9dfad53..9e8b69d5b7 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchQuery$makeQuery$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSearchQuery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 62b0dfda9a..bb293db77b 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchQuery$makeQuery$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSearchQuery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 45f6285f8f..f159cbc80f 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchQuery$makeQuery$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSearchQuery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali
index 2228d1e48d..f053c59f16 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchQuery$parseAndQuery$1;
 .super Ljava/lang/Object;
+.source "StoreSearchQuery.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali
index 0db53ee08a..636b4be1df 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchQuery$parseAndQuery$2;
 .super Ljava/lang/Object;
+.source "StoreSearchQuery.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali
index 990aee1c1b..0dcbcecb5c 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchQuery$parseAndQuery$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSearchQuery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 10774c2656..c99323314d 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSearchQuery$parseAndQuery$4;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSearchQuery.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
index 3f9e6be499..5cbe0bb6ec 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSearchQuery;
 .super Ljava/lang/Object;
+.source "StoreSearchQuery.kt"
 
 
 # annotations
@@ -194,15 +195,13 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    :goto_0
     check-cast v0, Ljava/util/List;
 
-    :goto_1
     move v6, p3
 
     move-object v4, v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object p3, p0, Lcom/discord/stores/StoreSearchQuery;->currentSearchState:Lcom/discord/utilities/search/network/state/SearchState;
@@ -225,16 +224,21 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    goto :goto_0
+    check-cast v0, Ljava/util/List;
 
-    :goto_2
+    :goto_0
+    move v6, p3
+
+    move-object v4, v0
+
+    :goto_1
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelSearchResponse;->getHits()Ljava/util/List;
 
     move-result-object p2
@@ -253,14 +257,14 @@
 
     const/4 v5, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const/4 p2, 0x0
 
     const/4 v5, 0x0
 
-    :goto_3
+    :goto_2
     new-instance p2, Lcom/discord/utilities/search/network/state/SearchState;
 
     sget-object v2, Lcom/discord/utilities/search/network/state/QueryFetchState;->COMPLETED:Lcom/discord/utilities/search/network/state/QueryFetchState;
@@ -271,7 +275,7 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/search/network/state/SearchState;-><init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZI)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -302,7 +306,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/utilities/search/network/state/SearchState;-><init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     new-instance p2, Lcom/discord/utilities/search/network/state/SearchState;
@@ -325,7 +329,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/utilities/search/network/state/SearchState;-><init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    :goto_4
+    :goto_3
     invoke-direct {p0, p2}, Lcom/discord/stores/StoreSearchQuery;->updateAndPublish(Lcom/discord/utilities/search/network/state/SearchState;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -522,7 +526,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchQuery;->searchStateSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -760,7 +764,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$Companion.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$Companion.smali
index 76bdad6509..96645b80f0 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$Companion;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali
index 2702b1a3da..898c5b7c94 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali
index 28e993ac73..e582a524c0 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali
index ecd45c9a33..1ff73b2b26 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali
index d95c8079d4..37a2bae463 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali
index 5fd8cff105..3cf0aa8daa 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali
index 46ba192a43..3385ea9132 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali
index 994401de88..d5952aded5 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$4.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$4.smali
index 1fd3db81fd..36732c7a5c 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$4;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali
index 038ecba6cc..6ca5d4dd9c 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0;
 .super Ljava/lang/Object;
+.source "StoreSlowMode.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode.smali b/com.discord/smali/com/discord/stores/StoreSlowMode.smali
index 1ae2ab326a..9d95bbb27b 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSlowMode;
 .super Lcom/discord/stores/Store;
+.source "StoreSlowMode.kt"
 
 
 # annotations
@@ -194,7 +195,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -232,7 +233,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/b/b;->LQ()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/b/b;->LP()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali b/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
index 2b89d07834..64ab2500dc 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSpotify$SpotifyState;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 
 # annotations
@@ -102,9 +103,14 @@
 
     const-wide/16 p4, 0x0
 
+    move-wide v1, p4
+
+    goto :goto_2
+
     :cond_3
     move-wide v1, p4
 
+    :goto_2
     move-object p2, p0
 
     move-object p3, p1
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali
index e307988eb8..324bab052f 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$init$1$1;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali
index 5d842529d5..7ddce8c8f5 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$init$1;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali
index e618dca498..9bea785c52 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$init$2;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 ef44b23e76..4fe87f54df 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$init$3$1;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 5a104d44a6..a7801865bd 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$init$3;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali
index e2958cd34f..c4681f830f 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$publishState$activity$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali
index c9e57fa707..38fd04cbd2 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$publishState$activity$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 831e5a0121..d8e94d99e9 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -77,35 +78,33 @@
     :cond_0
     iget-object v0, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->this$0:Lcom/discord/stores/StoreSpotify;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->this$0:Lcom/discord/stores/StoreSpotify;
+    invoke-static {v0}, Lcom/discord/stores/StoreSpotify;->access$getSpotifyState$p(Lcom/discord/stores/StoreSpotify;)Lcom/discord/stores/StoreSpotify$SpotifyState;
 
-    invoke-static {v1}, Lcom/discord/stores/StoreSpotify;->access$getSpotifyState$p(Lcom/discord/stores/StoreSpotify;)Lcom/discord/stores/StoreSpotify$SpotifyState;
+    move-result-object v1
 
-    move-result-object v2
+    if-eqz v1, :cond_1
 
-    if-eqz v2, :cond_1
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    iget-boolean v3, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->$playing:Z
 
-    iget-boolean v4, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->$playing:Z
-
-    iget v5, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->$position:I
+    iget v4, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->$position:I
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    iget v1, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->$position:I
+    iget v7, p0, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->$position:I
 
-    int-to-long v8, v1
+    int-to-long v7, v7
 
-    sub-long/2addr v6, v8
+    sub-long/2addr v5, v7
 
-    const/4 v8, 0x1
+    const/4 v7, 0x1
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    invoke-static/range {v2 .. v9}, Lcom/discord/stores/StoreSpotify$SpotifyState;->copy$default(Lcom/discord/stores/StoreSpotify$SpotifyState;Lcom/discord/models/domain/spotify/ModelSpotifyTrack;ZIJILjava/lang/Object;)Lcom/discord/stores/StoreSpotify$SpotifyState;
+    invoke-static/range {v1 .. v8}, Lcom/discord/stores/StoreSpotify$SpotifyState;->copy$default(Lcom/discord/stores/StoreSpotify$SpotifyState;Lcom/discord/models/domain/spotify/ModelSpotifyTrack;ZIJILjava/lang/Object;)Lcom/discord/stores/StoreSpotify$SpotifyState;
 
     move-result-object v1
 
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 623c1629be..382cb68ed1 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$startStateExpiration$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0b4b8acae9..adaad6b1c7 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$startStateExpiration$2$1;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 f391ade533..5f20c46920 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSpotify$startStateExpiration$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSpotify.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify.smali b/com.discord/smali/com/discord/stores/StoreSpotify.smali
index 7aa2c55eb3..41f73f470b 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSpotify;
 .super Ljava/lang/Object;
+.source "StoreSpotify.kt"
 
 
 # annotations
@@ -42,7 +43,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -122,7 +123,7 @@
 .end method
 
 .method private final publishState()V
-    .locals 23
+    .locals 24
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -130,22 +131,23 @@
 
     iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->spotifyState:Lcom/discord/stores/StoreSpotify$SpotifyState;
 
-    const/4 v2, 0x1
+    const/4 v2, 0x2
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    if-nez v1, :cond_1
+    const/4 v4, 0x0
+
+    if-nez v1, :cond_0
 
-    :cond_0
     iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
 
     iget-object v1, v1, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
 
-    invoke-virtual {v1, v3, v2}, Lcom/discord/stores/StoreUserPresence;->updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V
+    invoke-virtual {v1, v2, v4, v3}, Lcom/discord/stores/StoreUserPresence;->updateActivity(ILcom/discord/models/domain/ModelPresence$Activity;Z)V
 
     return-void
 
-    :cond_1
+    :cond_0
     iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
 
     iget-object v1, v1, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
@@ -166,119 +168,119 @@
 
     check-cast v1, Ljava/lang/Iterable;
 
-    instance-of v4, v1, Ljava/util/Collection;
+    instance-of v5, v1, Ljava/util/Collection;
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    if-eqz v4, :cond_2
+    if-eqz v5, :cond_1
 
-    move-object v4, v1
+    move-object v5, v1
 
-    check-cast v4, Ljava/util/Collection;
+    check-cast v5, Ljava/util/Collection;
 
-    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v4
+    move-result v5
 
-    if-nez v4, :cond_5
+    if-nez v5, :cond_4
 
-    :cond_2
+    :cond_1
     invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v1
 
-    :cond_3
+    :cond_2
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v5
 
-    if-eqz v4, :cond_5
+    if-eqz v5, :cond_4
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v5
 
-    check-cast v4, Lcom/discord/models/domain/ModelConnectedAccount;
+    check-cast v5, Lcom/discord/models/domain/ModelConnectedAccount;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelConnectedAccount;->getType()Ljava/lang/String;
-
-    move-result-object v6
-
-    sget-object v7, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform;
-
-    invoke-virtual {v7}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelConnectedAccount;->getType()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+    sget-object v8, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform;
 
-    move-result v6
+    invoke-virtual {v8}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
 
-    if-eqz v6, :cond_4
+    move-result-object v8
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelConnectedAccount;->isShowActivity()Z
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v4
+    move-result v7
 
-    if-eqz v4, :cond_4
+    if-eqz v7, :cond_3
 
-    const/4 v4, 0x1
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelConnectedAccount;->isShowActivity()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_3
+
+    const/4 v5, 0x1
 
     goto :goto_0
 
-    :cond_4
-    const/4 v4, 0x0
+    :cond_3
+    const/4 v5, 0x0
 
     :goto_0
-    if-eqz v4, :cond_3
+    if-eqz v5, :cond_2
 
     const/4 v1, 0x1
 
     goto :goto_1
 
-    :cond_5
+    :cond_4
     const/4 v1, 0x0
 
     :goto_1
-    if-nez v1, :cond_6
+    if-nez v1, :cond_5
 
     goto/16 :goto_6
 
-    :cond_6
+    :cond_5
     iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->spotifyState:Lcom/discord/stores/StoreSpotify$SpotifyState;
 
-    if-nez v1, :cond_7
+    if-nez v1, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
-    :cond_7
+    :cond_6
     invoke-virtual {v1}, Lcom/discord/stores/StoreSpotify$SpotifyState;->component1()Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
 
-    move-result-object v4
+    move-result-object v5
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreSpotify$SpotifyState;->component2()Z
 
-    move-result v6
+    move-result v7
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreSpotify$SpotifyState;->component4()J
 
-    move-result-wide v7
+    move-result-wide v8
 
-    if-eqz v6, :cond_0
+    if-eqz v7, :cond_d
 
-    if-eqz v4, :cond_0
+    if-eqz v5, :cond_d
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
 
     move-result-object v1
 
-    if-eqz v1, :cond_8
+    if-eqz v1, :cond_7
 
     invoke-virtual {v1}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getImages()Ljava/util/List;
 
     move-result-object v1
 
-    if-eqz v1, :cond_8
+    if-eqz v1, :cond_7
 
     invoke-static {v1}, Lkotlin/a/l;->at(Ljava/util/List;)Ljava/lang/Object;
 
@@ -286,27 +288,27 @@
 
     check-cast v1, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage;
 
-    if-eqz v1, :cond_8
+    if-eqz v1, :cond_7
 
     invoke-virtual {v1}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage;->getUrl()Ljava/lang/String;
 
     move-result-object v1
 
-    if-eqz v1, :cond_8
+    if-eqz v1, :cond_7
 
     check-cast v1, Ljava/lang/CharSequence;
 
-    new-array v6, v2, [Ljava/lang/String;
+    new-array v7, v3, [Ljava/lang/String;
 
-    const-string v9, "/"
+    const-string v10, "/"
 
-    aput-object v9, v6, v5
+    aput-object v10, v7, v6
 
-    invoke-static {v1, v6, v5, v5}, Lkotlin/text/l;->b(Ljava/lang/CharSequence;[Ljava/lang/String;ZI)Ljava/util/List;
+    invoke-static {v1, v7, v6, v6}, Lkotlin/text/l;->b(Ljava/lang/CharSequence;[Ljava/lang/String;ZI)Ljava/util/List;
 
     move-result-object v1
 
-    if-eqz v1, :cond_8
+    if-eqz v1, :cond_7
 
     invoke-static {v1}, Lkotlin/a/l;->au(Ljava/util/List;)Ljava/lang/Object;
 
@@ -316,83 +318,81 @@
 
     goto :goto_2
 
-    :cond_8
-    move-object v1, v3
+    :cond_7
+    move-object v1, v4
 
     :goto_2
-    const/16 v6, 0x3a
+    const/16 v7, 0x3a
 
-    if-eqz v1, :cond_9
+    if-eqz v1, :cond_8
 
-    new-instance v9, Ljava/lang/StringBuilder;
+    new-instance v10, Ljava/lang/StringBuilder;
 
-    invoke-direct {v9}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v10, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform;
+    sget-object v11, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform;
 
-    invoke-virtual {v10}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
 
-    move-result-object v10
+    move-result-object v11
 
-    invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v10, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v10, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v1
 
-    move-object v13, v1
+    move-object v14, v1
 
     goto :goto_3
 
-    :cond_9
-    move-object v13, v3
+    :cond_8
+    move-object v14, v4
 
     :goto_3
     sget-object v1, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform;
 
     invoke-virtual {v1}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
 
-    move-result-object v9
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getName()Ljava/lang/String;
-
     move-result-object v10
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getId()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getName()Ljava/lang/String;
 
     move-result-object v11
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getId()Ljava/lang/String;
+
+    move-result-object v12
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
 
     move-result-object v1
 
-    if-eqz v1, :cond_a
+    if-eqz v1, :cond_9
 
     invoke-virtual {v1}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getName()Ljava/lang/String;
 
     move-result-object v1
 
-    move-object v12, v1
+    move-object v13, v1
 
     goto :goto_4
 
-    :cond_a
-    move-object v12, v3
+    :cond_9
+    move-object v13, v4
 
     :goto_4
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getArtists()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getArtists()Ljava/util/List;
 
     move-result-object v1
 
-    move-object v14, v1
+    move-object v15, v1
 
-    check-cast v14, Ljava/lang/Iterable;
-
-    const/4 v15, 0x0
+    check-cast v15, Ljava/lang/Iterable;
 
     const/16 v16, 0x0
 
@@ -402,33 +402,9 @@
 
     const/16 v19, 0x0
 
-    sget-object v1, Lcom/discord/stores/StoreSpotify$publishState$activity$1;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$1;
-
-    move-object/from16 v20, v1
-
-    check-cast v20, Lkotlin/jvm/functions/Function1;
-
-    const/16 v21, 0x1f
-
-    invoke-static/range {v14 .. v21}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-
-    move-result-object v14
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getArtists()Ljava/util/List;
-
-    move-result-object v1
-
-    move-object v15, v1
-
-    check-cast v15, Ljava/lang/Iterable;
-
-    const/16 v18, 0x0
-
-    const/16 v19, 0x0
-
     const/16 v20, 0x0
 
-    sget-object v1, Lcom/discord/stores/StoreSpotify$publishState$activity$2;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$2;
+    sget-object v1, Lcom/discord/stores/StoreSpotify$publishState$activity$1;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$1;
 
     move-object/from16 v21, v1
 
@@ -440,102 +416,128 @@
 
     move-result-object v15
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getArtists()Ljava/util/List;
+
+    move-result-object v1
+
+    move-object/from16 v16, v1
+
+    check-cast v16, Ljava/lang/Iterable;
+
+    const/16 v19, 0x0
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    sget-object v1, Lcom/discord/stores/StoreSpotify$publishState$activity$2;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$2;
+
+    move-object/from16 v22, v1
+
+    check-cast v22, Lkotlin/jvm/functions/Function1;
+
+    const/16 v23, 0x1f
+
+    invoke-static/range {v16 .. v23}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v16
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getDurationMs()J
-
-    move-result-wide v17
-
-    add-long v7, v7, v17
-
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v17
 
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getDurationMs()J
+
+    move-result-wide v18
+
+    add-long v8, v8, v18
+
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v18
+
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v7, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform;
+    sget-object v8, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform;
 
-    invoke-virtual {v7}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v7, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
+
+    iget-object v7, v7, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+
+    iget-object v7, v7, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
+
+    if-eqz v7, :cond_a
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
+
+    move-result-wide v7
+
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v7
 
-    invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v6, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
-
-    iget-object v6, v6, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
-    iget-object v6, v6, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
-
-    if-eqz v6, :cond_b
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
-
-    move-result-wide v6
-
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v6
-
     goto :goto_5
 
-    :cond_b
-    move-object v6, v3
+    :cond_a
+    move-object v7, v4
 
     :goto_5
-    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v18
+    move-result-object v19
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
 
     move-result-object v1
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_b
 
     invoke-virtual {v1}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getId()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    :cond_c
-    move-object/from16 v19, v3
+    :cond_b
+    move-object/from16 v20, v4
 
-    invoke-static/range {v9 .. v19}, Lcom/discord/models/domain/ModelPresence$Activity;->createForListening(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-static/range {v10 .. v20}, Lcom/discord/models/domain/ModelPresence$Activity;->createForListening(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v1
 
-    iget-object v3, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
+    iget-object v4, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
 
-    iget-object v3, v3, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
+    iget-object v4, v4, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
 
-    invoke-virtual {v3, v1, v2}, Lcom/discord/stores/StoreUserPresence;->updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V
+    invoke-virtual {v4, v2, v1, v3}, Lcom/discord/stores/StoreUserPresence;->updateActivity(ILcom/discord/models/domain/ModelPresence$Activity;Z)V
 
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getId()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getId()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
+    invoke-virtual {v5}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
 
     move-result-object v4
 
-    if-eqz v4, :cond_d
+    if-eqz v4, :cond_c
 
     invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getImages()Ljava/util/List;
 
     move-result-object v4
 
-    if-eqz v4, :cond_d
+    if-eqz v4, :cond_c
 
     check-cast v4, Ljava/util/Collection;
 
@@ -543,10 +545,21 @@
 
     move-result v4
 
-    xor-int/lit8 v5, v4, 0x1
+    xor-int/lit8 v6, v4, 0x1
+
+    :cond_c
+    invoke-virtual {v1, v2, v6}, Lcom/discord/utilities/analytics/AnalyticsTracker;->activityUpdatedSpotify(Ljava/lang/String;Z)V
+
+    return-void
 
     :cond_d
-    invoke-virtual {v1, v3, v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->activityUpdatedSpotify(Ljava/lang/String;Z)V
+    iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
+
+    iget-object v1, v1, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
+
+    invoke-virtual {v1, v2, v4, v3}, Lcom/discord/stores/StoreUserPresence;->updateActivity(ILcom/discord/models/domain/ModelPresence$Activity;Z)V
+
+    return-void
 
     :cond_e
     :goto_6
@@ -665,7 +678,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali
index a05e25350e..284e26b9e5 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreStream;
 .super Ljava/lang/Object;
+.source "StoreStream.java"
 
 
 # static fields
@@ -2259,6 +2260,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUserPresence;->handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -2317,7 +2320,7 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -2396,6 +2399,9 @@
     goto :goto_0
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_2
     return-void
 .end method
@@ -2501,6 +2507,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreChannelMembersLazy;->handleGuildRoleUpdate(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -2534,6 +2542,8 @@
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->handleGuildRoleRemove()V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -3918,7 +3928,7 @@
 .method public static synthetic lambda$subscribe$5(Lcom/discord/stores/StoreStream;JILrx/functions/Action1;Ljava/lang/String;Lrx/Observable;)Lrx/Observable;
     .locals 7
 
-    invoke-virtual {p6}, Lrx/Observable;->KE()Lrx/Observable;
+    invoke-virtual {p6}, Lrx/Observable;->KD()Lrx/Observable;
 
     move-result-object p6
 
@@ -3960,7 +3970,7 @@
 .method public static synthetic lambda$subscribe$7(Lcom/discord/stores/StoreStream;Lrx/functions/Action1;Ljava/lang/String;Lrx/Observable;)Lrx/Observable;
     .locals 1
 
-    invoke-virtual {p3}, Lrx/Observable;->KE()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->KD()Lrx/Observable;
 
     move-result-object p3
 
@@ -4979,7 +4989,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object v1
 
@@ -5579,7 +5589,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSurveys$Companion.smali b/com.discord/smali/com/discord/stores/StoreSurveys$Companion.smali
index 0abf757075..f51b727567 100644
--- a/com.discord/smali/com/discord/stores/StoreSurveys$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreSurveys$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSurveys$Companion;
 .super Ljava/lang/Object;
+.source "StoreSurveys.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreSurveys$ack$1.smali b/com.discord/smali/com/discord/stores/StoreSurveys$ack$1.smali
index ef9fab4309..66b21d4d47 100644
--- a/com.discord/smali/com/discord/stores/StoreSurveys$ack$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSurveys$ack$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSurveys$ack$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreSurveys.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreSurveys$get$1.smali b/com.discord/smali/com/discord/stores/StoreSurveys$get$1.smali
index 6d51514590..3b38bef3f5 100644
--- a/com.discord/smali/com/discord/stores/StoreSurveys$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSurveys$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSurveys$get$1;
 .super Ljava/lang/Object;
+.source "StoreSurveys.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/stores/StoreSurveys$getEnabled$1.smali b/com.discord/smali/com/discord/stores/StoreSurveys$getEnabled$1.smali
index 729dbbee8b..8b9439cf29 100644
--- a/com.discord/smali/com/discord/stores/StoreSurveys$getEnabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSurveys$getEnabled$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreSurveys$getEnabled$1;
 .super Ljava/lang/Object;
+.source "StoreSurveys.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreSurveys.smali b/com.discord/smali/com/discord/stores/StoreSurveys.smali
index 5ef811a904..dafcd18656 100644
--- a/com.discord/smali/com/discord/stores/StoreSurveys.smali
+++ b/com.discord/smali/com/discord/stores/StoreSurveys.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreSurveys;
 .super Lcom/discord/stores/Store;
+.source "StoreSurveys.kt"
 
 
 # annotations
@@ -70,13 +71,13 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreSurveys;->stream:Lcom/discord/stores/StoreStream;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
     iput-object p1, p0, Lcom/discord/stores/StoreSurveys;->isIntentConsumedSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -255,8 +256,6 @@
     const-wide/16 v2, 0x0
 
     :goto_1
-    const/4 p1, 0x0
-
     sub-long/2addr v0, v2
 
     const-wide/16 v2, 0x7
@@ -265,7 +264,7 @@
 
     if-gez p1, :cond_2
 
-    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KA()Lrx/Observable;
 
     move-result-object p1
 
@@ -282,7 +281,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p1
 
@@ -313,7 +312,7 @@
     return-object p1
 
     :catch_0
-    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KA()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreThread.smali b/com.discord/smali/com/discord/stores/StoreThread.smali
index 0438de7860..50f5b7da91 100644
--- a/com.discord/smali/com/discord/stores/StoreThread.smali
+++ b/com.discord/smali/com/discord/stores/StoreThread.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/discord/stores/StoreThread;
 .super Ljava/lang/Object;
+.source "Store.kt"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/discord/stores/StoreUser.smali b/com.discord/smali/com/discord/stores/StoreUser.smali
index e6a5a8fcb2..1165f19f71 100644
--- a/com.discord/smali/com/discord/stores/StoreUser.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreUser;
 .super Lcom/discord/stores/Store;
+.source "StoreUser.java"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -582,7 +583,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -1387,8 +1388,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
-
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
 
     move-result-wide v1
@@ -1476,8 +1475,6 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
-
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
 
     move-result-wide v0
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 7496903cc1..754aee81c5 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$authorizeConnection$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -78,6 +79,8 @@
 
     invoke-static {v0, p1}, Lcom/discord/utilities/uri/UriHandler;->openUrlWithCustomTabs(Landroid/content/Context;Landroid/net/Uri;)V
 
+    return-void
+
     :cond_0
     return-void
 .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 49b5e473c4..28b1ff97f8 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$deleteUserConnection$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 56b144734b..280573bcb2 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1;
 .super Ljava/lang/Object;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 8b4883d2df..f897d3cbd5 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$fetchConnectedAccounts$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a5d1b077b2..bd16691117 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali
index a26a4c6909..d3d39422cf 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$submitPinCode$1;
 .super Ljava/lang/Object;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 8f86e5f466..55bcf566c6 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$submitPinCode$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 2e6d16d3ca..4ba456f31f 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserConnections.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections.smali b/com.discord/smali/com/discord/stores/StoreUserConnections.smali
index 3428a86db2..d150ce312f 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUserConnections;
 .super Lcom/discord/stores/Store;
+.source "StoreUserConnections.kt"
 
 
 # instance fields
@@ -44,7 +45,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
index 33a8425d8f..3bcb3a940f 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreUserGuildSettings;
 .super Lcom/discord/stores/Store;
+.source "StoreUserGuildSettings.java"
 
 
 # instance fields
@@ -262,7 +263,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
@@ -434,7 +435,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -466,7 +467,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -495,7 +496,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -865,11 +866,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     iget-object p3, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/Set;
 
@@ -896,7 +892,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes.smali b/com.discord/smali/com/discord/stores/StoreUserNotes.smali
index d0686a2b79..7d29abbd50 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreUserNotes;
 .super Ljava/lang/Object;
+.source "StoreUserNotes.java"
 
 
 # instance fields
@@ -174,7 +175,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
index 4ac151fc65..a5ccf97a69 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
 .super Ljava/lang/Object;
+.source "StoreUserPresence.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$$inlined$sortedByDescending$1.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$$inlined$sortedByDescending$1.smali
index bede11efd0..685f76402b 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$$inlined$sortedByDescending$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$$inlined$sortedByDescending$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUserPresence$flattenPresence$$inlined$sortedByDescending$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$sortedUserPresences$2.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$sortedUserPresences$2.smali
index 08b64a2f67..a7b127a9dc 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$sortedUserPresences$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$flattenPresence$sortedUserPresences$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserPresence$flattenPresence$sortedUserPresences$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserPresence.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali
index 4f9b319824..71ac9d6f09 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserPresence$getForUserId$1;
 .super Ljava/lang/Object;
+.source "StoreUserPresence.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali
index 4eead0e778..cc63054532 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserPresence$getForUserIds$1;
 .super Ljava/lang/Object;
+.source "StoreUserPresence.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
index a9615b90c4..18d0b06829 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUserPresence;
 .super Lcom/discord/stores/Store;
+.source "StoreUserPresence.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -125,7 +126,7 @@
 
     const/4 v1, 0x4
 
-    invoke-direct {p1, v1, v0, v0}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {p1, v1, v0, v0}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;Lcom/discord/models/domain/ModelUser;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
@@ -262,7 +263,7 @@
 .end method
 
 .method private final flattenPresence(J)V
-    .locals 7
+    .locals 5
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -318,148 +319,109 @@
     move-object v0, v1
 
     :goto_0
-    const/4 v2, 0x0
-
     if-eqz v0, :cond_1
 
     invoke-static {v0}, Lkotlin/sequences/i;->c(Lkotlin/sequences/Sequence;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Lcom/discord/models/domain/ModelPresence;
+    check-cast v2, Lcom/discord/models/domain/ModelPresence;
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
 
-    move-result v3
+    move-result v2
 
     goto :goto_1
 
     :cond_1
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_1
-    const/4 v4, 0x1
+    if-eqz v0, :cond_2
 
-    if-eqz v0, :cond_5
-
-    invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_2
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_4
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    move-object v6, v5
-
-    check-cast v6, Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_3
-
-    const/4 v6, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v6, 0x0
-
-    :goto_2
-    if-eqz v6, :cond_2
-
-    goto :goto_3
-
-    :cond_4
-    move-object v5, v1
-
-    :goto_3
-    check-cast v5, Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz v5, :cond_5
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v1
-
-    :cond_5
-    if-nez v3, :cond_7
-
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
-
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz p1, :cond_6
-
-    iput-boolean v4, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
-
-    :cond_6
-    return-void
-
-    :cond_7
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Lkotlin/sequences/i;->c(Lkotlin/sequences/Sequence;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/discord/models/domain/ModelPresence;
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
-    move-result v2
+    move-result-object v1
 
-    if-ne v2, v3, :cond_8
+    :cond_2
+    const/4 v0, 0x1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    if-nez v2, :cond_4
 
-    move-result-object v0
+    iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result v0
+    move-result-object v2
 
-    xor-int/2addr v0, v4
+    invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v0, :cond_9
+    iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
 
-    :cond_8
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    check-cast v0, Ljava/util/Map;
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/models/domain/ModelPresence;
+
+    if-eqz p1, :cond_3
+
+    iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+
+    :cond_3
+    return-void
+
+    :cond_4
+    iget-object v3, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelPresence;
+
+    if-eqz v3, :cond_5
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
+
+    move-result v4
+
+    if-ne v4, v2, :cond_5
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+    move-result-object v3
+
+    invoke-static {v3, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    xor-int/2addr v3, v0
+
+    if-eqz v3, :cond_6
+
+    :cond_5
+    iget-object v3, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+    check-cast v3, Ljava/util/Map;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -467,16 +429,145 @@
 
     new-instance p2, Lcom/discord/models/domain/ModelPresence;
 
-    invoke-direct {p2, v3, v1}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {p2, v2, v1}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;)V
 
-    invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-boolean v4, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+    iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
 
-    :cond_9
+    :cond_6
     return-void
 .end method
 
+.method private final removeActivityInList(ILjava/util/List;)Ljava/util/List;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;)",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;"
+        }
+    .end annotation
+
+    if-eqz p2, :cond_0
+
+    move-object v0, p2
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-static {v0}, Lkotlin/a/l;->k(Ljava/util/Collection;)Ljava/util/List;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v0, Ljava/util/List;
+
+    :goto_0
+    const/4 v1, -0x1
+
+    if-eqz p2, :cond_4
+
+    invoke-interface {p2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_1
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_3
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Activity;->getType()I
+
+    move-result v4
+
+    if-ne v4, p1, :cond_1
+
+    const/4 v4, 0x1
+
+    goto :goto_2
+
+    :cond_1
+    const/4 v4, 0x0
+
+    :goto_2
+    if-eqz v4, :cond_2
+
+    goto :goto_3
+
+    :cond_2
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v3, -0x1
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v3, -0x1
+
+    :goto_3
+    if-eq v3, v1, :cond_5
+
+    invoke-interface {v0, v3}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+
+    :cond_5
+    return-object v0
+.end method
+
+.method private final replaceActivityInList(Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;)",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getType()I
+
+    move-result v0
+
+    invoke-direct {p0, v0, p2}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
+
+    move-result-object p2
+
+    invoke-interface {p2, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    return-object p2
+.end method
+
 .method private final setLocalPresence(Lcom/discord/models/domain/ModelPresence;)V
     .locals 0
 
@@ -485,19 +576,19 @@
     return-void
 .end method
 
-.method public static synthetic updateActivity$default(Lcom/discord/stores/StoreUserPresence;Lcom/discord/models/domain/ModelPresence$Activity;ZILjava/lang/Object;)V
+.method public static synthetic updateActivity$default(Lcom/discord/stores/StoreUserPresence;ILcom/discord/models/domain/ModelPresence$Activity;ZILjava/lang/Object;)V
     .locals 0
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    and-int/lit8 p3, p3, 0x2
+    and-int/lit8 p4, p4, 0x4
 
-    if-eqz p3, :cond_0
+    if-eqz p4, :cond_0
 
-    const/4 p2, 0x0
+    const/4 p3, 0x0
 
     :cond_0
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreUserPresence;->updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreUserPresence;->updateActivity(ILcom/discord/models/domain/ModelPresence$Activity;Z)V
 
     return-void
 .end method
@@ -520,7 +611,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_9
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -595,7 +686,7 @@
 
     if-eqz v3, :cond_5
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSession;->getGame()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
 
     move-result-object p2
 
@@ -624,7 +715,7 @@
 
     if-eqz p2, :cond_6
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
     move-result-object v2
 
@@ -642,11 +733,11 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
     move-result-object v0
 
-    invoke-direct {p2, p1, v0}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {p2, p1, v0}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;)V
 
     iput-object p2, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
@@ -667,7 +758,7 @@
 
     iget-object v3, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-direct {p2, p1, v2, v3}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {p2, p1, v2, v3}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;Lcom/discord/models/domain/ModelUser;)V
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
@@ -679,6 +770,9 @@
 
     :cond_8
     return-void
+
+    :cond_9
+    return-void
 .end method
 
 
@@ -732,7 +826,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -777,7 +871,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -977,7 +1071,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1012,6 +1106,9 @@
 
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
 
 .method public final handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -1037,7 +1134,7 @@
 
     const/4 v4, 0x0
 
-    invoke-direct {v2, v3, v4, p1}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {v2, v3, v4, p1}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;Lcom/discord/models/domain/ModelUser;)V
 
     invoke-virtual {p0, v0, v1, v2}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
@@ -1203,6 +1300,8 @@
 
     invoke-direct {p0, v0, v1}, Lcom/discord/stores/StoreUserPresence;->flattenPresence(J)V
 
+    return-void
+
     :cond_3
     return-void
 .end method
@@ -1301,7 +1400,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
     move-result-object v5
 
@@ -1311,45 +1410,140 @@
 
     const/4 v8, 0x0
 
-    invoke-static/range {v2 .. v8}, Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate$default(Lcom/discord/stores/StoreGatewayConnection;Ljava/lang/Integer;Ljava/lang/Long;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/lang/Boolean;ILjava/lang/Object;)Z
+    invoke-static/range {v2 .. v8}, Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate$default(Lcom/discord/stores/StoreGatewayConnection;Ljava/lang/Integer;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)Z
 
     :cond_1
     return-void
 .end method
 
-.method public final updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V
-    .locals 2
+.method public final updateActivity(ILcom/discord/models/domain/ModelPresence$Activity;Z)V
+    .locals 5
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+    const/4 v0, 0x1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    if-nez p3, :cond_4
 
-    move-result-object v0
+    iget-object p3, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
-    move-result v0
+    move-result-object p3
 
-    const/4 v1, 0x1
+    if-eqz p3, :cond_3
 
-    xor-int/2addr v0, v1
+    check-cast p3, Ljava/lang/Iterable;
 
-    if-nez v0, :cond_0
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p3
+
+    :cond_0
+    :goto_0
+    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    move-object v3, v2
+
+    check-cast v3, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    const-string v4, "it"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Activity;->getType()I
+
+    move-result v3
 
     if-eqz p2, :cond_1
 
-    :cond_0
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence$Activity;->getType()I
+
+    move-result v4
+
+    if-ne v3, v4, :cond_1
+
+    const/4 v3, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :goto_1
+    if-eqz 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;
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v1, 0x0
+
+    :goto_2
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p3
+
+    xor-int/2addr p3, v0
+
+    if-eqz p3, :cond_6
+
+    :cond_4
+    if-eqz p2, :cond_5
+
+    iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-direct {p0, p2, p1}, Lcom/discord/stores/StoreUserPresence;->replaceActivityInList(Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    goto :goto_3
+
+    :cond_5
+    iget-object p2, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+    move-result-object p2
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    :goto_3
     new-instance p2, Lcom/discord/models/domain/ModelPresence;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+    iget-object p3, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
+    invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
 
-    move-result v0
+    move-result p3
 
-    invoke-direct {p2, v0, p1}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {p2, p3, p1}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;)V
 
     iput-object p2, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
@@ -1359,8 +1553,8 @@
 
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    iput-boolean v1, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+    iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
 
-    :cond_1
+    :cond_6
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresenceKt.smali b/com.discord/smali/com/discord/stores/StoreUserPresenceKt.smali
index ce71fabe4b..98e100a783 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresenceKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresenceKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUserPresenceKt;
 .super Ljava/lang/Object;
+.source "StoreUserPresence.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali b/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali
index e13a6565b9..5088167672 100644
--- a/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserProfile$get$1;
 .super Ljava/lang/Object;
+.source "StoreUserProfile.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile$request$1.smali b/com.discord/smali/com/discord/stores/StoreUserProfile$request$1.smali
index 255066a65b..b2a1505913 100644
--- a/com.discord/smali/com/discord/stores/StoreUserProfile$request$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserProfile$request$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserProfile$request$1;
 .super Ljava/lang/Object;
+.source "StoreUserProfile.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile$request$2.smali b/com.discord/smali/com/discord/stores/StoreUserProfile$request$2.smali
index c77da7fbe0..32562840b4 100644
--- a/com.discord/smali/com/discord/stores/StoreUserProfile$request$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserProfile$request$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserProfile$request$2;
 .super Ljava/lang/Object;
+.source "StoreUserProfile.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile.smali b/com.discord/smali/com/discord/stores/StoreUserProfile.smali
index 06b4a29b21..7b7a506503 100644
--- a/com.discord/smali/com/discord/stores/StoreUserProfile.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserProfile.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUserProfile;
 .super Ljava/lang/Object;
+.source "StoreUserProfile.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$get$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$get$1.smali
index d4f335b296..cab4a04fc0 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserRelationships$get$1;
 .super Ljava/lang/Object;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$get$2.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$get$2.smali
index 6377871828..66a85e231c 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserRelationships$get$2;
 .super Ljava/lang/Object;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$getForType$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$getForType$1.smali
index 84c6a47573..6cd8920ece 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$getForType$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$getForType$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserRelationships$getForType$1;
 .super Ljava/lang/Object;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$getPendingCount$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$getPendingCount$1.smali
index e242bc8107..a2f1a390cb 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$getPendingCount$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$getPendingCount$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserRelationships$getPendingCount$1;
 .super Ljava/lang/Object;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
index 8cdc96de82..96ad01e141 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$1;
 .super Ljava/lang/Object;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 b06634c043..8397a14af4 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2$1;
 .super Ljava/lang/Object;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 f6db706af3..beabaa5e04 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
index fe12fc3115..50d4cbad71 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUserRelationships;
 .super Ljava/lang/Object;
+.source "StoreUserRelationships.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -169,7 +170,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -207,7 +208,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -241,7 +242,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali b/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
index 85698e5fef..7c377c5672 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUserRequiredActions;
 .super Ljava/lang/Object;
+.source "StoreUserRequiredActions.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index d71701ac9b..894f2167fe 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreUserSettings;
 .super Lcom/discord/stores/Store;
+.source "StoreUserSettings.java"
 
 
 # instance fields
@@ -111,7 +112,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -121,7 +122,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -131,7 +132,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -185,7 +186,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -195,7 +196,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -258,6 +259,8 @@
 
     const-string p1, "pureEvil"
 
+    return-object p1
+
     :cond_0
     return-object p1
 .end method
@@ -623,7 +626,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -878,7 +881,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->localePublisher:Lrx/subjects/Subject;
 
-    invoke-virtual {v0}, Lrx/subjects/Subject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/Subject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -1026,7 +1029,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -1717,7 +1720,6 @@
 
     const v0, 0x7f120e02
 
-    :goto_1
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
@@ -1751,7 +1753,13 @@
 
     const v0, 0x7f120e01
 
-    goto :goto_1
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-static {p1, p2, v0}, Lcom/discord/stores/StoreUserSettings;->updateUserSettings(Lcom/discord/app/AppActivity;Lcom/discord/restapi/RestAPIParams$UserSettings;Ljava/lang/Integer;)V
+
+    return-void
 
     :cond_3
     invoke-direct {p0, p2}, Lcom/discord/stores/StoreUserSettings;->setTheme(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping.smali b/com.discord/smali/com/discord/stores/StoreUserTyping.smali
index 931077aa0e..55970941e6 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreUserTyping;
 .super Ljava/lang/Object;
+.source "StoreUserTyping.java"
 
 
 # static fields
@@ -101,7 +102,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -382,7 +383,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -486,10 +487,12 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method handleTypingStart(Ljava/util/List;)V
-    .locals 20
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -696,11 +699,11 @@
 
     move-wide v3, v12
 
-    move/from16 v19, v0
+    move/from16 v18, v0
 
     move-object v0, v6
 
-    move-object/from16 v18, v11
+    move-object/from16 p1, v11
 
     move-object v11, v5
 
@@ -759,17 +762,17 @@
     goto :goto_2
 
     :cond_4
-    move/from16 v0, v19
+    move/from16 v0, v18
 
     :goto_2
-    move-wide/from16 v9, v16
+    move-object/from16 v11, p1
 
-    move-object/from16 v11, v18
+    move-wide/from16 v9, v16
 
     goto/16 :goto_1
 
     :cond_5
-    move/from16 v19, v0
+    move/from16 v18, v0
 
     goto/16 :goto_1
 
@@ -788,6 +791,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 .method public setUserTyping(J)V
diff --git a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
index ace2832240..2c28544443 100644
--- a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreUsersMutualGuilds$get$1;
 .super Ljava/lang/Object;
+.source "StoreUsersMutualGuilds.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
index 84b2a36db8..6071a3addd 100644
--- a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
+++ b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreUsersMutualGuilds;
 .super Lcom/discord/stores/Store;
+.source "StoreUsersMutualGuilds.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreVideoStreams$Companion.smali b/com.discord/smali/com/discord/stores/StoreVideoStreams$Companion.smali
index dceaaa9f4e..d5b895e9ca 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoStreams$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoStreams$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreVideoStreams$Companion;
 .super Ljava/lang/Object;
+.source "StoreVideoStreams.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/stores/StoreVideoStreams$init$1.smali b/com.discord/smali/com/discord/stores/StoreVideoStreams$init$1.smali
index d668969121..dfe4e7f746 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoStreams$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoStreams$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVideoStreams$init$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreVideoStreams.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreVideoStreams.smali b/com.discord/smali/com/discord/stores/StoreVideoStreams.smali
index 0f413c2f04..4ffb64aeb9 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoStreams.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoStreams.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreVideoStreams;
 .super Lcom/discord/stores/Store;
+.source "StoreVideoStreams.kt"
 
 
 # annotations
@@ -197,6 +198,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method private final publishIfUpdated()V
@@ -349,6 +352,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method protected final init(Landroid/content/Context;)V
diff --git a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali
index 36d97904bd..072ec9abf5 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVideoSupport$init$1;
 .super Ljava/lang/Object;
+.source "StoreVideoSupport.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 4109e0c66a..8a2dfc0870 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVideoSupport$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "StoreVideoSupport.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/stores/StoreVideoSupport.smali b/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
index 2ee2f2f83a..8ed077f34d 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreVideoSupport;
 .super Lcom/discord/stores/Store;
+.source "StoreVideoSupport.kt"
 
 
 # instance fields
@@ -108,7 +109,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
index c75212bb56..a12b4c8981 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceChannelSelected$clear$1;
 .super Lkotlin/jvm/internal/i;
+.source "StoreVoiceChannelSelected.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali
index 5614d3d3b3..7b6394a3ef 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceChannelSelected$get$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceChannelSelected.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$sam$rx_functions_Action0$0.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$sam$rx_functions_Action0$0.smali
index cd8df326ee..7f216ec50b 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$sam$rx_functions_Action0$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$sam$rx_functions_Action0$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceChannelSelected$sam$rx_functions_Action0$0;
 .super Ljava/lang/Object;
+.source "StoreVoiceChannelSelected.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 75ab8b40d7..60eb0542c9 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceChannelSelected$set$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceChannelSelected.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
index b1659c42fd..3ee8405e62 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreVoiceChannelSelected;
 .super Lcom/discord/stores/Store;
+.source "StoreVoiceChannelSelected.kt"
 
 # interfaces
 .implements Lcom/discord/stores/DispatchHandler;
@@ -174,8 +175,6 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelId:J
-
     iput-wide p1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelId:J
 
     invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected;->validateSelectedVoiceChannel()V
@@ -215,8 +214,6 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelId:J
-
     iget-object v2, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->stream:Lcom/discord/stores/StoreStream;
 
     iget-object v2, v2, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
@@ -229,10 +226,9 @@
 
     if-nez v2, :cond_1
 
-    :goto_0
     invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clearInternal()V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
@@ -277,12 +273,12 @@
 
     check-cast v2, Ljava/lang/Integer;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     const/high16 v3, 0x100000
 
     invoke-static {v3, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
@@ -291,10 +287,10 @@
 
     if-nez v2, :cond_3
 
-    goto :goto_0
+    invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clearInternal()V
 
     :cond_3
-    :goto_2
+    :goto_1
     iget-wide v2, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelId:J
 
     cmp-long v4, v2, v0
@@ -303,12 +299,12 @@
 
     const/4 v0, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/4 v0, 0x0
 
-    :goto_3
+    :goto_2
     iput-boolean v0, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->isDirty:Z
 
     return-void
@@ -365,7 +361,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali
index 1f9713c204..eceb6da504 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$get$1$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 a271b23a5b..5a3213683b 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,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$get$1$2;
 .super Lkotlin/jvm/internal/i;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function7;
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 16b2adbfe4..fb2ade12ce 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$get$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali
index 26ae366461..82b12868c0 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali
index b99d8a3e77..8f8b75fc92 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali
index 4ce0b81fbb..a33aad6460 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali
index 0ecdddfc8c..2b58c27472 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali
index 358c828cde..c5a238fb27 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 a73d2decd1..911ed38bee 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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
index 7a838b6aee..62de350811 100644
--- 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;
 .super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
 
 # interfaces
 .implements Lrx/functions/Func7;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
index 1bc63ab0d6..bb5c64f8c1 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreVoiceParticipants;
 .super Lcom/discord/stores/Store;
+.source "StoreVoiceParticipants.kt"
 
 
 # instance fields
@@ -437,7 +438,6 @@
 
     const-string v0, "Observable.just(emptyList())"
 
-    :goto_0
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -467,7 +467,9 @@
 
     const-string v0, "StoreStream\n            \u2026          }\n            }"
 
-    goto :goto_0
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :pswitch_1
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
@@ -480,7 +482,9 @@
 
     const-string v0, "Observable.just(channel.recipients)"
 
-    goto :goto_0
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
index edf759df03..2a2bf98868 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/stores/StoreVoiceSpeaking;
 .super Lcom/discord/stores/Store;
+.source "StoreVoiceSpeaking.java"
 
 
 # static fields
@@ -46,7 +47,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -74,7 +75,6 @@
 
     const/4 v0, 0x0
 
-    :cond_0
     const/4 v1, 0x0
 
     :goto_0
@@ -100,7 +100,7 @@
 
     const/4 v5, 0x1
 
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_0
 
     iget-object v1, p0, Lcom/discord/stores/StoreVoiceSpeaking;->speakingUsers:Ljava/util/Set;
 
@@ -110,13 +110,11 @@
 
     invoke-interface {v1, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    :cond_1
-    :goto_1
     const/4 v1, 0x1
 
     goto :goto_0
 
-    :cond_2
+    :cond_0
     iget-object v2, p0, Lcom/discord/stores/StoreVoiceSpeaking;->speakingUsers:Ljava/util/Set;
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -127,12 +125,23 @@
 
     move-result v2
 
-    if-nez v2, :cond_1
+    if-nez v2, :cond_2
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
 
     goto :goto_1
 
+    :cond_1
+    const/4 v1, 0x0
+
+    goto :goto_0
+
+    :cond_2
+    :goto_1
+    const/4 v1, 0x1
+
+    goto :goto_0
+
     :cond_3
     if-eqz v1, :cond_4
 
@@ -208,7 +217,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->KC()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
 
     move-result-object p0
 
@@ -291,7 +300,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali
index 92bc1c9380..082aeff66f 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceStates$get$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceStates.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali
index 0e51299b9c..c2f148f40f 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceStates$get$2$1;
 .super Ljava/lang/Object;
+.source "StoreVoiceStates.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali
index d8aa07b481..002a9c8fe8 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceStates$get$2$2;
 .super Ljava/lang/Object;
+.source "StoreVoiceStates.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali
index 8439da8c73..4f6b58fc0f 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/stores/StoreVoiceStates$get$2;
 .super Ljava/lang/Object;
+.source "StoreVoiceStates.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
index 51c0834193..47e0b2e31a 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/stores/StoreVoiceStates;
 .super Ljava/lang/Object;
+.source "StoreVoiceStates.kt"
 
 
 # instance fields
@@ -318,7 +319,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -364,7 +365,7 @@
 
     if-nez v5, :cond_2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
@@ -401,7 +402,6 @@
 
     if-eqz v0, :cond_0
 
-    :goto_2
     iget-object v0, p0, Lcom/discord/stores/StoreVoiceStates;->updatedGuildIds:Ljava/util/HashSet;
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -413,7 +413,7 @@
     goto :goto_0
 
     :cond_3
-    :goto_3
+    :goto_2
     const/4 v5, 0x0
 
     iget-object v7, p0, Lcom/discord/stores/StoreVoiceStates;->voiceStates:Ljava/util/HashMap;
@@ -447,7 +447,7 @@
 
     move-result v10
 
-    if-eqz v10, :cond_5
+    if-eqz v10, :cond_6
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -459,11 +459,16 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelVoice$State;
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
+    const/4 v6, 0x0
+
+    goto :goto_3
+
+    :cond_6
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v10
@@ -480,7 +485,7 @@
 
     xor-int/2addr v10, v6
 
-    if-eqz v10, :cond_6
+    if-eqz v10, :cond_7
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -488,12 +493,12 @@
 
     invoke-virtual {v9, v3, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_4
+    goto :goto_3
 
-    :cond_6
+    :cond_7
     const/4 v6, 0x0
 
-    :goto_4
+    :goto_3
     const-string v0, "(voiceStates[voiceStateG\u2026          }\n            }"
 
     invoke-static {v9, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
@@ -502,9 +507,17 @@
 
     if-eqz v6, :cond_0
 
-    goto :goto_2
+    iget-object v0, p0, Lcom/discord/stores/StoreVoiceStates;->updatedGuildIds:Ljava/util/HashSet;
 
-    :cond_7
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+    goto/16 :goto_0
+
+    :cond_8
     return-void
 .end method
 
@@ -592,7 +605,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali b/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
index 4bfb710395..652034a4f5 100644
--- a/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/SnowflakeUtils;
 .super Ljava/lang/Object;
+.source "SnowflakeUtils.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
index 800070e0b4..6f80f511cd 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener;
 .super Ljava/lang/Object;
+.source "AdjustConfig.kt"
 
 # interfaces
 .implements Landroid/app/Application$ActivityLifecycleCallbacks;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali
index cc2b847ba2..9fd14cc2b4 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/analytics/AdjustConfig;
 .super Ljava/lang/Object;
+.source "AdjustConfig.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
index 07c8145b2a..61ed24cfe2 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1$1.smali
index b7191ffc30..ee4c295e89 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$ackMessage$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali
index 1fbed2d570..4faf1e4ca7 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$ackMessage$1;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali
index 459e9b033c..898ba59f5d 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$1;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 fb9330b898..28cdf9942a 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -138,7 +139,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-static {v1, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->access$getProperties$p(Lcom/discord/utilities/analytics/AnalyticsTracker;Lcom/discord/models/domain/ModelChannel;)[Lkotlin/Pair;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$3.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$3.smali
index 013fc04f56..903577263e 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$3.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$3;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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
index f73edb7762..c67c3430d0 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/Func9;
@@ -269,7 +270,7 @@
 
     if-gez v1, :cond_2
 
-    invoke-static {}, Lkotlin/a/l;->Fa()V
+    invoke-static {}, Lkotlin/a/l;->EZ()V
 
     goto :goto_1
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali
index 1dc2d3a6d6..5a92037bd6 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali
index fca3c127b8..51704aae51 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -79,7 +80,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object p1
 
@@ -87,7 +88,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$3.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$3.smali
index da8947c322..bc2c80e91e 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$3.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$getGameProperties$3;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$1.smali
index e7a76a661f..b613ae9112 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSent$1;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$2.smali
index 072da7f283..00b2795a94 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSent$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSent$2;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali
index e0eabfcc14..bac44d072a 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 55d93110a3..f52e86560d 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 599c4c456f..9656f0cf92 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 54f544a7ab..e343738d68 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 431f98aab7..78e1fca2e0 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$1;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a0f38ec513..bda445f12b 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsTracker.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
index 0c5f8fcd87..2a872d669f 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker;
 .super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
 
 
 # annotations
@@ -213,7 +214,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -321,6 +322,8 @@
 
     invoke-virtual {v0, p0}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/l;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -406,6 +409,8 @@
 
     invoke-virtual {v0, p0}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/l;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -777,6 +782,8 @@
 
     invoke-virtual {p1, v0, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
+    return-void
+
     :cond_2
     :goto_1
     return-void
@@ -1256,7 +1263,7 @@
 .end method
 
 .method private final getVoiceChannelProperties(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;)Ljava/util/Map;
-    .locals 12
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -1277,279 +1284,279 @@
         }
     .end annotation
 
-    move-object/from16 v1, p7
+    move-object/from16 v0, p7
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     if-eqz p5, :cond_2
 
     invoke-interface/range {p5 .. p5}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
-    check-cast v3, Ljava/lang/Iterable;
+    check-cast v2, Ljava/lang/Iterable;
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v3
+    move-result-object v2
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x0
-
     :cond_0
     :goto_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v5
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/models/domain/ModelVoice$State;
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
     move-result-object v6
 
-    check-cast v6, Lcom/discord/models/domain/ModelVoice$State;
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
-
-    move-result-object v7
-
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v8
+    move-result-wide v7
 
-    if-nez v7, :cond_1
+    if-nez v6, :cond_1
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v7}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v10
+    move-result-wide v9
 
-    cmp-long v7, v10, v8
+    cmp-long v6, v9, v7
 
-    if-nez v7, :cond_0
+    if-nez v6, :cond_0
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    cmp-long v11, v7, p1
+    cmp-long v8, v6, p1
 
-    if-eqz v11, :cond_0
+    if-eqz v8, :cond_0
+
+    add-int/lit8 v3, v3, 0x1
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
 
     add-int/lit8 v4, v4, 0x1
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_0
-
-    add-int/lit8 v5, v5, 0x1
-
     goto :goto_0
 
     :cond_2
+    const/4 v3, 0x0
+
     const/4 v4, 0x0
 
-    const/4 v5, 0x0
-
     :cond_3
-    const/4 v3, 0x5
+    const/4 v2, 0x5
 
-    new-array v3, v3, [Lkotlin/Pair;
+    new-array v2, v2, [Lkotlin/Pair;
 
-    const-string v6, "channel_id"
+    const-string v5, "channel_id"
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v7
-
-    invoke-static {v6, v7}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v6
 
-    aput-object v6, v3, v2
+    invoke-static {v5, v6}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    const-string v6, "channel_type"
+    move-result-object v5
+
+    aput-object v5, v2, v1
+
+    const-string v5, "channel_type"
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
-    move-result v7
+    move-result v6
 
-    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v7
-
-    invoke-static {v6, v7}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v6
 
-    const/4 v7, 0x1
+    invoke-static {v5, v6}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    aput-object v6, v3, v7
+    move-result-object v5
 
-    const/4 v6, 0x2
+    const/4 v6, 0x1
 
-    const-string v8, "guild_id"
+    aput-object v5, v2, v6
+
+    const/4 v5, 0x2
+
+    const-string v7, "guild_id"
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
 
-    move-result-wide v9
+    move-result-wide v8
 
-    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v9
-
-    invoke-static {v8, v9}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v8
 
-    aput-object v8, v3, v6
+    invoke-static {v7, v8}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    const/4 v6, 0x3
+    move-result-object v7
 
-    const-string v8, "voice_state_count"
+    aput-object v7, v2, v5
+
+    const/4 v5, 0x3
+
+    const-string v7, "voice_state_count"
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-static {v7, v3}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v3
+
+    aput-object v3, v2, v5
+
+    const/4 v3, 0x4
+
+    const-string v5, "video_stream_count"
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    invoke-static {v8, v4}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v5, v4}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
     move-result-object v4
 
-    aput-object v4, v3, v6
+    aput-object v4, v2, v3
 
-    const/4 v4, 0x4
+    invoke-static {v2}, Lkotlin/a/ab;->b([Lkotlin/Pair;)Ljava/util/Map;
 
-    const-string v6, "video_stream_count"
+    move-result-object v2
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
-
-    invoke-static {v6, v5}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object v5
-
-    aput-object v5, v3, v4
-
-    invoke-static {v3}, Lkotlin/a/ab;->b([Lkotlin/Pair;)Ljava/util/Map;
-
-    move-result-object v3
-
-    const-string v4, "video_enabled"
+    const-string v3, "video_enabled"
 
     if-eqz p6, :cond_4
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :cond_4
-    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-interface {v3, v4, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     if-eqz p4, :cond_5
 
-    move-object/from16 v0, p4
+    move-object v1, p4
 
-    check-cast v0, Ljava/lang/Number;
+    check-cast v1, Ljava/lang/Number;
 
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v1}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    const-string v0, "duration"
+    const-string v1, "duration"
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-interface {v3, v0, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v1, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_5
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
-    const-string v0, "rtc_connection_id"
+    const-string v1, "rtc_connection_id"
 
-    invoke-interface {v3, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_6
-    return-object v3
+    return-object v2
 .end method
 
 .method static synthetic getVoiceChannelProperties$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/Map;
-    .locals 11
+    .locals 10
 
-    and-int/lit8 v1, p8, 0x4
+    and-int/lit8 v0, p8, 0x4
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v7, v2
+    move-object v6, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v7, p4
+    move-object v6, p4
 
     :goto_0
-    and-int/lit8 v1, p8, 0x8
+    and-int/lit8 v0, p8, 0x8
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_1
 
     :cond_1
-    move-object/from16 v8, p5
+    move-object v7, p5
 
     :goto_1
-    and-int/lit8 v1, p8, 0x10
+    and-int/lit8 v0, p8, 0x10
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    move-object v9, v2
+    move-object v8, v1
 
     goto :goto_2
 
     :cond_2
-    move-object/from16 v9, p6
+    move-object/from16 v8, p6
 
     :goto_2
     and-int/lit8 v0, p8, 0x20
 
     if-eqz v0, :cond_3
 
-    move-object v10, v2
+    move-object v9, v1
 
     goto :goto_3
 
     :cond_3
-    move-object/from16 v10, p7
+    move-object/from16 v9, p7
 
     :goto_3
-    move-object v3, p0
+    move-object v2, p0
 
-    move-wide v4, p1
+    move-wide v3, p1
 
-    move-object v6, p3
+    move-object v5, p3
 
-    invoke-direct/range {v3 .. v10}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getVoiceChannelProperties(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;)Ljava/util/Map;
+    invoke-direct/range {v2 .. v9}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getVoiceChannelProperties(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v0
 
@@ -2086,6 +2093,8 @@
     :cond_4
     invoke-virtual {v0, v1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/ai;)V
 
+    return-void
+
     :cond_5
     return-void
 .end method
@@ -2148,9 +2157,14 @@
 
     const/4 p4, 0x0
 
+    move-object v4, p4
+
+    goto :goto_0
+
     :cond_0
     move-object v4, p4
 
+    :goto_0
     and-int/lit8 p4, p6, 0x10
 
     if-eqz p4, :cond_1
@@ -2159,12 +2173,12 @@
 
     const/4 v5, 0x0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     move v5, p5
 
-    :goto_0
+    :goto_1
     move-object v0, p0
 
     move-object v1, p1
@@ -2719,9 +2733,14 @@
 
     const/4 p6, 0x0
 
+    move-object v6, p6
+
+    goto :goto_0
+
     :cond_0
     move-object v6, p6
 
+    :goto_0
     move-object v0, p0
 
     move-wide v1, p1
@@ -3086,6 +3105,8 @@
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/l;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -3301,6 +3322,8 @@
 
     invoke-virtual {v0, v1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/l;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -4018,6 +4041,8 @@
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/l;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -4039,7 +4064,7 @@
 
     invoke-virtual {v1, v2}, Lcom/crashlytics/android/answers/v;->F(Ljava/lang/String;)Lcom/crashlytics/android/answers/v;
 
-    invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/v;->m(Z)Lcom/crashlytics/android/answers/v;
+    invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/v;->l(Z)Lcom/crashlytics/android/answers/v;
 
     if-eqz p2, :cond_0
 
@@ -4218,6 +4243,8 @@
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/l;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -4507,7 +4534,7 @@
     :goto_1
     invoke-interface {p1, v0, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     instance-of p3, p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
@@ -4536,10 +4563,9 @@
 
     const-string p3, "USER"
 
-    :goto_2
     invoke-interface {p1, p2, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     instance-of p3, p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
@@ -4568,9 +4594,9 @@
 
     const-string p3, "GUILD"
 
-    goto :goto_2
+    invoke-interface {p1, p2, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :goto_3
+    :goto_2
     invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getFabricTracker()Lcom/crashlytics/android/answers/Answers;
 
     move-result-object p2
@@ -4602,7 +4628,7 @@
     move-result-object v3
 
     :cond_3
-    :goto_4
+    :goto_3
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
@@ -4641,7 +4667,7 @@
 
     invoke-virtual {v0, v5, v4}, Ljava/util/LinkedHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     check-cast v0, Ljava/util/Map;
@@ -4654,7 +4680,7 @@
 
     move-result-object v0
 
-    :goto_5
+    :goto_4
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
@@ -4685,7 +4711,7 @@
 
     invoke-virtual {p3, v2, v1}, Lcom/crashlytics/android/answers/l;->a(Ljava/lang/String;Ljava/lang/Number;)Lcom/crashlytics/android/answers/c;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
@@ -4694,7 +4720,7 @@
 
     invoke-virtual {p3, v2, v1}, Lcom/crashlytics/android/answers/l;->f(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/answers/c;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_6
     invoke-virtual {p2, p3}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/l;)V
@@ -4810,10 +4836,12 @@
 
     invoke-virtual {v1, v2}, Lcom/crashlytics/android/answers/aj;->I(Ljava/lang/String;)Lcom/crashlytics/android/answers/aj;
 
-    invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/aj;->n(Z)Lcom/crashlytics/android/answers/aj;
+    invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/aj;->m(Z)Lcom/crashlytics/android/answers/aj;
 
     invoke-virtual {v0, v1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/aj;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$$special$$inlined$observable$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$$special$$inlined$observable$1.smali
index f83a605553..dad5f3dd35 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$$special$$inlined$observable$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$$special$$inlined$observable$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsUtils$$special$$inlined$observable$1;
 .super Lkotlin/properties/b;
+.source "Delegates.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1.smali
index 28b92b5225..4c69a47de0 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1;
 .super Ljava/lang/Object;
+.source "AnalyticsUtils.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2.smali
index 57f948d8d7..97024545cb 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2;
 .super Ljava/lang/Object;
+.source "AnalyticsUtils.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1.smali
index 6ba0bbe28d..95291a8f2f 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1;
 .super Ljava/lang/Object;
+.source "AnalyticsUtils.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 a21bdd82ac..bf2cd83f31 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 .super Ljava/lang/Object;
+.source "AnalyticsUtils.kt"
 
 
 # annotations
@@ -743,6 +744,8 @@
 
     invoke-virtual {v0, p1, p2}, Lcom/google/firebase/analytics/FirebaseAnalytics;->b(Ljava/lang/String;Landroid/os/Bundle;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
index 33b9a7a2ed..d6ede59de4 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1;
 .super Lkotlin/jvm/internal/k;
+.source "AnalyticsUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali
index 623467feb5..3a750ee58d 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsUtils;
 .super Ljava/lang/Object;
+.source "AnalyticsUtils.kt"
 
 
 # annotations
@@ -193,7 +194,7 @@
 
     const-string v1, "browser_user_agent"
 
-    const-string v2, "Discord-Android/830"
+    const-string v2, "Discord-Android/831"
 
     invoke-static {v1, v2}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
@@ -205,7 +206,7 @@
 
     const-string v1, "client_build_number"
 
-    const/16 v2, 0x33e
+    const/16 v2, 0x33f
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -221,7 +222,7 @@
 
     const-string v1, "client_version"
 
-    const-string v2, "8.3.0"
+    const-string v2, "8.3.1"
 
     invoke-static {v1, v2}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtilsKt.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtilsKt.smali
index a85edfe6d2..396e49b929 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtilsKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsUtilsKt;
 .super Ljava/lang/Object;
+.source "AnalyticsUtils.kt"
diff --git a/com.discord/smali/com/discord/utilities/anim/RingAnimator$$special$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/utilities/anim/RingAnimator$$special$$inlined$apply$lambda$1.smali
index d39d002a73..52618cfcd5 100644
--- a/com.discord/smali/com/discord/utilities/anim/RingAnimator$$special$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/anim/RingAnimator$$special$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/anim/RingAnimator$$special$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "RingAnimator.kt"
 
 # interfaces
 .implements Landroid/view/animation/Animation$AnimationListener;
diff --git a/com.discord/smali/com/discord/utilities/anim/RingAnimator$Companion.smali b/com.discord/smali/com/discord/utilities/anim/RingAnimator$Companion.smali
index 8a4c7caa83..1bfab21f57 100644
--- a/com.discord/smali/com/discord/utilities/anim/RingAnimator$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/anim/RingAnimator$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/anim/RingAnimator$Companion;
 .super Ljava/lang/Object;
+.source "RingAnimator.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/anim/RingAnimator$onUpdate$1.smali b/com.discord/smali/com/discord/utilities/anim/RingAnimator$onUpdate$1.smali
index a9ef9a60db..bbc4d196fd 100644
--- a/com.discord/smali/com/discord/utilities/anim/RingAnimator$onUpdate$1.smali
+++ b/com.discord/smali/com/discord/utilities/anim/RingAnimator$onUpdate$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/anim/RingAnimator$onUpdate$1;
 .super Ljava/lang/Object;
+.source "RingAnimator.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali b/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali
index ddf7da7fbb..9269c5e79b 100644
--- a/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali
+++ b/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/anim/RingAnimator;
 .super Ljava/lang/Object;
+.source "RingAnimator.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali
index e12259e558..3133b3ca4f 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2;
 .super Lkotlin/jvm/internal/k;
+.source "AttachmentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali
index 6a73beae7f..4cac173659 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1;
 .super Lkotlin/jvm/internal/k;
+.source "AttachmentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
index 8f0deeb782..3503136784 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/attachments/AttachmentUtilsKt;
 .super Ljava/lang/Object;
+.source "AttachmentUtils.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali
index ebaa749e63..4ee574fc90 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1;
 .super Lkotlin/jvm/internal/k;
+.source "AuditLogChangeUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali
index 5a3ff9248b..aa20fb964d 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2;
 .super Lkotlin/jvm/internal/k;
+.source "AuditLogChangeUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali
index 5e6ff4a9ae..d83b693f90 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3;
 .super Lkotlin/jvm/internal/k;
+.source "AuditLogChangeUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali
index a3b1e5c559..eb88b542bd 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4;
 .super Lkotlin/jvm/internal/k;
+.source "AuditLogChangeUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index 6b94cc7406..f74b032498 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 .super Ljava/lang/Object;
+.source "AuditLogChangeUtils.kt"
 
 
 # static fields
@@ -1307,7 +1308,7 @@
 
     if-nez v0, :cond_0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
@@ -1316,7 +1317,7 @@
 
     sparse-switch v1, :sswitch_data_0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :sswitch_0
     const-string v1, "rate_limit_per_user"
@@ -1331,7 +1332,6 @@
 
     const v1, 0x7f12071a
 
-    :goto_0
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
     move-result p1
@@ -1351,7 +1351,11 @@
 
     const v1, 0x7f120718
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :sswitch_2
     const-string v1, "topic"
@@ -1366,7 +1370,11 @@
 
     const v1, 0x7f12071d
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :sswitch_3
     const-string p1, "allow"
@@ -1446,7 +1454,11 @@
 
     const v1, 0x7f12070e
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :sswitch_6
     const-string p1, "deny"
@@ -1474,7 +1486,11 @@
 
     const v1, 0x7f12070a
 
-    goto/16 :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :sswitch_8
     const-string p1, "reason"
@@ -1490,11 +1506,13 @@
     return p1
 
     :cond_4
-    :goto_1
+    :goto_0
     const/4 p1, 0x0
 
     return p1
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x37ba6dbc -> :sswitch_8
@@ -1739,7 +1757,7 @@
 
     if-nez v0, :cond_0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
@@ -1748,7 +1766,7 @@
 
     sparse-switch v2, :sswitch_data_0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :sswitch_0
     const-string v2, "widget_enabled"
@@ -1828,7 +1846,6 @@
 
     const v1, 0x7f120740
 
-    :goto_0
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
     move-result p1
@@ -1848,7 +1865,11 @@
 
     const v1, 0x7f120739
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :sswitch_4
     const-string v2, "default_message_notifications"
@@ -2081,7 +2102,11 @@
 
     const v1, 0x7f120736
 
-    goto/16 :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :sswitch_d
     const-string p1, "icon_hash"
@@ -2109,7 +2134,11 @@
 
     const v1, 0x7f120727
 
-    goto/16 :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :sswitch_f
     const-string v2, "explicit_content_filter"
@@ -2163,7 +2192,7 @@
     throw p1
 
     :cond_8
-    :goto_1
+    :goto_0
     return v1
 
     :sswitch_data_0
@@ -2736,7 +2765,7 @@
 
     if-nez p2, :cond_4
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_4
     invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
@@ -2757,7 +2786,7 @@
 
     if-eq p3, p4, :cond_5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const-string p3, "allow"
@@ -2802,7 +2831,6 @@
 
     aput-object v2, p3, v3
 
-    :goto_3
     invoke-virtual {p1, p2, p3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
@@ -2856,10 +2884,18 @@
 
     aput-object v2, p3, v3
 
-    goto :goto_3
+    invoke-virtual {p1, p2, p3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "context.getString(R.stri\u2026            optionTarget)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_7
-    :goto_4
+    :goto_3
     const-string p1, ""
 
     return-object p1
@@ -2873,8 +2909,6 @@
 
     throw p1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -2944,7 +2978,7 @@
 
     if-nez p2, :cond_0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :cond_0
     invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
@@ -2971,7 +3005,7 @@
 
     if-eq v1, v2, :cond_1
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :cond_1
     const-string v1, "$remove"
@@ -3004,7 +3038,6 @@
 
     aput-object v0, v2, v3
 
-    :goto_0
     invoke-virtual {p1, p2, v1, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
@@ -3046,7 +3079,15 @@
 
     aput-object v0, v2, v3
 
-    goto :goto_0
+    invoke-virtual {p1, p2, v1, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "context.resources.getQua\u2026s.size, changeNames.size)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_3
     const-string v1, "deny"
@@ -3079,7 +3120,15 @@
 
     aput-object v0, v2, v3
 
-    goto :goto_0
+    invoke-virtual {p1, p2, v1, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "context.resources.getQua\u2026s.size, changeNames.size)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_4
     const-string v1, "$add"
@@ -3112,10 +3161,18 @@
 
     aput-object v0, v2, v3
 
-    goto :goto_0
+    invoke-virtual {p1, p2, v1, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "context.resources.getQua\u2026s.size, changeNames.size)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_5
-    :goto_1
+    :goto_0
     const-string p1, ""
 
     return-object p1
@@ -3591,7 +3648,7 @@
 
     if-nez p2, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
@@ -3604,12 +3661,11 @@
 
     packed-switch p2, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const p2, 0x7f06011a
 
-    :goto_0
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result p1
@@ -3619,17 +3675,29 @@
     :pswitch_1
     const p2, 0x7f060125
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_2
     const p2, 0x7f060103
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
-    :goto_1
+    move-result p1
+
+    return p1
+
+    :goto_0
     const p2, 0x7f0600c7
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result p1
+
+    return p1
 
     nop
 
@@ -3889,7 +3957,7 @@
 
     if-nez v0, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
@@ -3912,7 +3980,7 @@
 
     if-eq v1, p1, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string p1, "avatar_hash"
@@ -3940,7 +4008,6 @@
 
     const v1, 0x7f120774
 
-    :goto_0
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
     move-result p1
@@ -3973,10 +4040,14 @@
 
     const v1, 0x7f120770
 
-    goto :goto_0
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    return p1
 
     :cond_5
-    :goto_1
+    :goto_0
     const/4 p1, 0x0
 
     return p1
@@ -4252,6 +4323,8 @@
     invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private final shouldNotRenderChange(Lcom/discord/models/domain/ModelAuditLogEntry;Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Z
@@ -4267,7 +4340,7 @@
 
     const/4 v3, 0x0
 
-    if-ne v0, v1, :cond_10
+    if-ne v0, v1, :cond_11
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
@@ -4373,7 +4446,6 @@
 
     if-eqz p1, :cond_5
 
-    :goto_1
     check-cast p1, Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->isEmpty()Z
@@ -4444,7 +4516,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_f
+    if-eqz p1, :cond_10
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
 
@@ -4460,7 +4532,13 @@
 
     if-eqz p1, :cond_b
 
-    goto :goto_1
+    check-cast p1, Ljava/util/Set;
+
+    invoke-interface {p1}, Ljava/util/Set;->isEmpty()Z
+
+    move-result p1
+
+    return p1
 
     :cond_b
     new-instance p1, Lkotlin/r;
@@ -4514,121 +4592,127 @@
     return v3
 
     :cond_10
+    return v3
+
+    :cond_11
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    if-ne v0, v1, :cond_15
+    if-ne v0, v1, :cond_16
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object p1
 
-    if-nez p1, :cond_11
+    if-nez p1, :cond_12
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_11
+    :cond_12
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
     move-result p2
 
     const v0, 0x36ebcc
 
-    if-eq p2, v0, :cond_13
+    if-eq p2, v0, :cond_14
 
     const v0, 0x4776c691
 
-    if-eq p2, v0, :cond_12
+    if-eq p2, v0, :cond_13
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_12
+    :cond_13
     const-string p2, "inviter_id"
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_14
+    if-eqz p1, :cond_15
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_13
+    :cond_14
     const-string p2, "uses"
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_14
+    if-eqz p1, :cond_15
 
-    :goto_2
+    :goto_1
     return v2
 
-    :cond_14
-    :goto_3
+    :cond_15
+    :goto_2
     return v3
 
-    :cond_15
+    :cond_16
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    if-ne p1, v0, :cond_19
+    if-ne p1, v0, :cond_1b
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object p1
 
-    if-nez p1, :cond_16
+    if-nez p1, :cond_17
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_16
+    :cond_17
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
     move-result p2
 
     const v0, -0x4cb85596
 
-    if-eq p2, v0, :cond_18
+    if-eq p2, v0, :cond_19
 
     const v0, 0x368f3a
 
-    if-eq p2, v0, :cond_17
+    if-eq p2, v0, :cond_18
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_17
+    :cond_18
     const-string p2, "type"
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_19
+    if-eqz p1, :cond_1a
 
-    goto :goto_4
+    goto :goto_3
 
-    :cond_18
+    :cond_19
     const-string p2, "application_id"
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_19
+    if-eqz p1, :cond_1a
 
-    :goto_4
+    :goto_3
     return v2
 
-    :cond_19
-    :goto_5
+    :cond_1a
+    :goto_4
+    return v3
+
+    :cond_1b
     return v3
 .end method
 
@@ -5134,7 +5218,7 @@
 
     if-nez v1, :cond_7
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     sget-object v2, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
@@ -5147,7 +5231,7 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto :goto_6
+    goto :goto_5
 
     :pswitch_0
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -5156,7 +5240,9 @@
 
     move-result v1
 
-    goto :goto_5
+    move v4, v1
+
+    goto :goto_6
 
     :pswitch_1
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -5165,7 +5251,9 @@
 
     move-result v1
 
-    goto :goto_5
+    move v4, v1
+
+    goto :goto_6
 
     :pswitch_2
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -5174,7 +5262,9 @@
 
     move-result v1
 
-    goto :goto_5
+    move v4, v1
+
+    goto :goto_6
 
     :pswitch_3
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -5183,7 +5273,9 @@
 
     move-result v1
 
-    goto :goto_5
+    move v4, v1
+
+    goto :goto_6
 
     :pswitch_4
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -5192,7 +5284,9 @@
 
     move-result v1
 
-    goto :goto_5
+    move v4, v1
+
+    goto :goto_6
 
     :pswitch_5
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -5201,7 +5295,9 @@
 
     move-result v1
 
-    goto :goto_5
+    move v4, v1
+
+    goto :goto_6
 
     :pswitch_6
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -5210,16 +5306,19 @@
 
     move-result v1
 
-    :goto_5
     move v4, v1
 
-    goto :goto_7
+    goto :goto_6
 
-    :goto_6
     :pswitch_7
     const/4 v4, 0x0
 
-    :goto_7
+    goto :goto_6
+
+    :goto_5
+    const/4 v4, 0x0
+
+    :goto_6
     if-eqz v4, :cond_d
 
     add-int/lit8 v14, v0, 0x1
@@ -5329,13 +5428,13 @@
 
     move-result v0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_c
 
     invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
     move-result-object v0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_c
 
     invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
@@ -5352,7 +5451,7 @@
 
     if-nez v0, :cond_a
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_a
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -5363,9 +5462,9 @@
 
     cmp-long v4, v0, v2
 
-    if-eqz v4, :cond_b
+    if-eqz v4, :cond_c
 
-    :goto_8
+    :goto_7
     const-string v0, "\u25cf"
 
     check-cast v0, Ljava/lang/CharSequence;
@@ -5384,7 +5483,7 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_c
+    if-eqz v3, :cond_b
 
     check-cast v3, Ljava/lang/Long;
 
@@ -5440,12 +5539,11 @@
 
     invoke-virtual {v9, v1, v2, v0, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
-    :cond_b
     move v0, v14
 
     goto/16 :goto_4
 
-    :cond_c
+    :cond_b
     new-instance v0, Lkotlin/r;
 
     const-string v1, "null cannot be cast to non-null type kotlin.Long"
@@ -5454,6 +5552,11 @@
 
     throw v0
 
+    :cond_c
+    move v0, v14
+
+    goto/16 :goto_4
+
     :cond_d
     sget-object v1, Lcom/discord/app/AppLog;->tv:Lcom/discord/app/AppLog;
 
@@ -5502,8 +5605,6 @@
 
     return-object v9
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_7
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali
index 156ca977ac..e09fc917ff 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2;
 .super Lkotlin/jvm/internal/k;
+.source "AuditLogUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
index ecec1c266b..52ad469afc 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/auditlogs/AuditLogUtils;
 .super Ljava/lang/Object;
+.source "AuditLogUtils.kt"
 
 
 # static fields
@@ -390,9 +391,14 @@
 
     const-string p5, ""
 
+    move-object v5, p5
+
+    goto :goto_0
+
     :cond_0
     move-object v5, p5
 
+    :goto_0
     move-object v0, p0
 
     move-object v1, p1
@@ -492,7 +498,6 @@
     move-result-object v1
 
     :cond_3
-    :goto_1
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
@@ -512,7 +517,7 @@
 
     const/16 v0, 0xa
 
-    if-ne p2, v0, :cond_7
+    if-ne p2, v0, :cond_8
 
     new-instance p2, Ljava/lang/StringBuilder;
 
@@ -524,7 +529,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_7
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -563,30 +568,41 @@
 
     if-eqz v0, :cond_5
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
     move-object p3, v1
 
-    :goto_2
+    :goto_1
     check-cast p3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    if-eqz p3, :cond_3
+    if-eqz p3, :cond_7
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
 
     move-result-object v1
 
-    goto :goto_1
-
     :cond_7
+    invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_8
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
     move-result p2
 
     const/16 v0, 0xb
 
-    if-ne p2, v0, :cond_a
+    if-ne p2, v0, :cond_c
 
     new-instance p2, Ljava/lang/StringBuilder;
 
@@ -598,7 +614,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_b
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -606,12 +622,12 @@
 
     move-result-object p1
 
-    :cond_8
+    :cond_9
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p3
 
-    if-eqz p3, :cond_9
+    if-eqz p3, :cond_a
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -635,51 +651,62 @@
 
     move-result v0
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_9
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_9
+    :cond_a
     move-object p3, v1
 
-    :goto_3
+    :goto_2
     check-cast p3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    if-eqz p3, :cond_3
+    if-eqz p3, :cond_b
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
     move-result-object v1
 
-    goto/16 :goto_1
+    :cond_b
+    invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    :cond_a
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_c
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
     move-result-object p2
 
     sget-object p3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    if-ne p2, p3, :cond_f
+    if-ne p2, p3, :cond_11
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
     move-result-object p2
 
-    if-eqz p2, :cond_b
+    if-eqz p2, :cond_d
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getRoleName()Ljava/lang/String;
 
     move-result-object p2
 
-    if-nez p2, :cond_18
+    if-nez p2, :cond_1a
 
-    :cond_b
+    :cond_d
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
     move-result-object p1
 
-    if-eqz p1, :cond_e
+    if-eqz p1, :cond_10
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -687,12 +714,12 @@
 
     move-result-object p1
 
-    :cond_c
+    :cond_e
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
 
-    if-eqz p2, :cond_d
+    if-eqz p2, :cond_f
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -716,43 +743,43 @@
 
     move-result p3
 
-    if-eqz p3, :cond_c
+    if-eqz p3, :cond_e
 
-    goto :goto_4
+    goto :goto_3
 
-    :cond_d
+    :cond_f
     move-object p2, v1
 
-    :goto_4
+    :goto_3
     check-cast p2, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    if-eqz p2, :cond_e
+    if-eqz p2, :cond_10
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
     move-result-object v1
 
-    :cond_e
+    :cond_10
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
-    :cond_f
+    :cond_11
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
     move-result-object p2
 
     sget-object p3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    if-ne p2, p3, :cond_13
+    if-ne p2, p3, :cond_15
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
     move-result-object p1
 
-    if-eqz p1, :cond_12
+    if-eqz p1, :cond_14
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -760,12 +787,12 @@
 
     move-result-object p1
 
-    :cond_10
+    :cond_12
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
 
-    if-eqz p2, :cond_11
+    if-eqz p2, :cond_13
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -789,43 +816,43 @@
 
     move-result p3
 
-    if-eqz p3, :cond_10
+    if-eqz p3, :cond_12
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_11
+    :cond_13
     move-object p2, v1
 
-    :goto_5
+    :goto_4
     check-cast p2, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    if-eqz p2, :cond_12
+    if-eqz p2, :cond_14
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
 
     move-result-object v1
 
-    :cond_12
+    :cond_14
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
-    :cond_13
+    :cond_15
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
     move-result p2
 
     const/16 p3, 0x32
 
-    if-ne p2, p3, :cond_17
+    if-ne p2, p3, :cond_19
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
     move-result-object p1
 
-    if-eqz p1, :cond_16
+    if-eqz p1, :cond_18
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -833,12 +860,12 @@
 
     move-result-object p1
 
-    :cond_14
+    :cond_16
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
 
-    if-eqz p2, :cond_15
+    if-eqz p2, :cond_17
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -862,33 +889,33 @@
 
     move-result p3
 
-    if-eqz p3, :cond_14
+    if-eqz p3, :cond_16
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_15
+    :cond_17
     move-object p2, v1
 
-    :goto_6
+    :goto_5
     check-cast p2, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    if-eqz p2, :cond_16
+    if-eqz p2, :cond_18
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
     move-result-object v1
 
-    :cond_16
+    :cond_18
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
-    :cond_17
+    :cond_19
     const-string p2, ""
 
-    :cond_18
+    :cond_1a
     return-object p2
 .end method
 
@@ -1824,7 +1851,6 @@
 
     const p2, 0x7f040158
 
-    :goto_0
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
     move-result p1
@@ -1847,42 +1873,74 @@
     :pswitch_0
     const p2, 0x7f040154
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_1
     const p2, 0x7f04015b
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_2
     const p2, 0x7f040155
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_3
     const p2, 0x7f040159
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_4
     const p2, 0x7f040157
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_5
     const p2, 0x7f040153
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_6
     const p2, 0x7f04015a
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     :pswitch_7
     const p2, 0x7f040152
 
-    goto :goto_0
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali b/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali
index 545c908172..d114b9a063 100644
--- a/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/cache/SharedPreferenceExtensionsKt;
 .super Ljava/lang/Object;
+.source "SharedPreferenceExtensions.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
index 775cb287a9..48fcfd6578 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 .super Ljava/lang/Throwable;
+.source "CaptchaHelper.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1.smali
index ff01e78446..e0beca4d15 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1;
 .super Ljava/lang/Object;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/e;
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 dc599c5eb9..49682efe9d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2;
 .super Ljava/lang/Object;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/d;
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 13ec6beebf..d4d0d6fca2 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$showCaptcha$1;
 .super Ljava/lang/Object;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/e;
@@ -52,7 +53,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;->yw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;->yv()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 fe3c45c884..72fa6ed227 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$showCaptcha$2;
 .super Ljava/lang/Object;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/d;
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 e8755abc73..36a04d3a6f 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -88,6 +89,8 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .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 187883ffb9..d7aa3624bb 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b5796b1746..7f95c2ed07 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 6c2680830e..98b9dafdce 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8c2d106a33..14de51258a 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1;
 .super Ljava/lang/Object;
+.source "CaptchaHelper.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -74,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;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()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 4044216567..c28ac60404 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/captcha/CaptchaHelper;
 .super Ljava/lang/Object;
+.source "CaptchaHelper.kt"
 
 
 # annotations
@@ -273,6 +274,8 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -300,7 +303,6 @@
 
     const-string v0, "Observable.just(null)"
 
-    :goto_0
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -312,7 +314,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->cmM:I
+    sget p1, Lrx/Emitter$a;->cmg:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -320,5 +322,7 @@
 
     const-string v0, "Observable.create({ emit\u2026.BackpressureMode.BUFFER)"
 
-    goto :goto_0
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali
index 621f56e85b..b6cdd6735b 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1;
 .super Ljava/lang/Object;
+.source "ChannelUtils.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali
index d5615df326..a29d40222c 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "ChannelUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali
index f51266a249..128209ad4d 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1;
 .super Ljava/lang/Object;
+.source "ChannelUtils.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali
index c71a517b00..27796869bb 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1;
 .super Ljava/lang/Object;
+.source "ChannelUtils.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali
index 48e93b67c0..c485822093 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1;
 .super Ljava/lang/Object;
+.source "ChannelUtils.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
index 6317e43aa9..c253bfac50 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/channel/ChannelUtils;
 .super Ljava/lang/Object;
+.source "ChannelUtils.kt"
 
 
 # static fields
@@ -281,6 +282,8 @@
 
     packed-switch p3, :pswitch_data_0
 
+    return-object p2
+
     :pswitch_0
     return-object p2
 
@@ -360,6 +363,8 @@
 
     return-object p1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
index 6d87ccc0d4..2b26d71993 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/channel/GuildChannelsInfo$Companion$get$1;
 .super Ljava/lang/Object;
+.source "GuildChannelsInfo.kt"
 
 # interfaces
 .implements Lrx/functions/Func7;
@@ -92,152 +93,142 @@
 
     const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
-    move-result v3
+    move-result v2
 
-    if-ne v3, v2, :cond_0
+    if-ne v2, v1, :cond_0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
     if-eqz p2, :cond_1
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
 
-    move-result v4
+    move-result v3
 
     goto :goto_1
 
     :cond_1
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :goto_1
-    const/16 v5, 0x10
+    const/16 v4, 0x10
 
-    invoke-static {v5, v3, v4}, Lcom/discord/utilities/permissions/PermissionUtils;->isElevated(IZI)Z
+    invoke-static {v4, v2, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->isElevated(IZI)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    move-object/from16 v3, p6
+
+    invoke-static {v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v3
 
     if-eqz v3, :cond_2
 
-    move-object/from16 v4, p6
-
-    invoke-static {v5, v4}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_2
-
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :goto_2
     invoke-interface/range {p7 .. p7}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-interface {v6}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+    invoke-interface {v5}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
-    move-result-object v6
+    move-result-object v5
 
-    move v7, v4
+    move v6, v3
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :cond_3
     :goto_3
-    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_6
-
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v8
-
-    check-cast v8, Ljava/lang/Integer;
-
-    if-nez v4, :cond_4
-
-    invoke-static {v2, v8}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
-
-    move-result v4
-
-    :cond_4
-    if-nez v7, :cond_5
-
-    invoke-static {v5, v8}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v7
 
-    :cond_5
-    if-eqz v4, :cond_3
+    if-eqz v7, :cond_7
 
-    if-nez v7, :cond_6
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Ljava/lang/Integer;
+
+    if-nez v3, :cond_4
+
+    invoke-static {v1, v7}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+
+    move-result v3
+
+    :cond_4
+    if-nez v6, :cond_5
+
+    invoke-static {v4, v7}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+
+    move-result v6
+
+    :cond_5
+    if-eqz v3, :cond_3
+
+    if-nez v6, :cond_6
 
     goto :goto_3
 
     :cond_6
-    move v6, v4
-
-    if-eqz p2, :cond_7
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getId()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, p5
-
-    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/ModelGuildRole;
+    move v7, v3
 
     goto :goto_4
 
     :cond_7
-    const/4 v4, 0x0
+    move v7, v3
 
     :goto_4
-    if-nez v3, :cond_8
+    if-eqz p2, :cond_8
 
-    if-eqz v7, :cond_8
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    const/4 v7, 0x1
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    move-object/from16 v4, p5
+
+    invoke-interface {v4, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelGuildRole;
 
     goto :goto_5
 
     :cond_8
-    const/4 v7, 0x0
+    const/4 v3, 0x0
 
     :goto_5
-    if-eqz p2, :cond_9
+    if-nez v2, :cond_9
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->isVerifiedServer()Z
-
-    move-result v3
-
-    if-ne v3, v2, :cond_9
+    if-eqz v6, :cond_9
 
     const/4 v8, 0x1
 
@@ -247,17 +238,33 @@
     const/4 v8, 0x0
 
     :goto_6
-    new-instance v9, Lcom/discord/utilities/channel/GuildChannelsInfo;
+    if-eqz p2, :cond_a
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->isVerifiedServer()Z
+
+    move-result v2
+
+    if-ne v2, v1, :cond_a
+
+    const/4 v9, 0x1
+
+    goto :goto_7
+
+    :cond_a
+    const/4 v9, 0x0
+
+    :goto_7
+    new-instance v10, Lcom/discord/utilities/channel/GuildChannelsInfo;
 
     const-string v0, "guildSettings"
 
-    move-object v3, p3
+    move-object v4, p3
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "hideMuted"
 
-    move-object v2, p4
+    move-object v1, p4
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -267,23 +274,31 @@
 
     const-string v0, "channelPermissions"
 
-    move-object/from16 v10, p7
+    move-object/from16 v6, p7
 
-    invoke-static {v10, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v9
+    move-object v0, v10
 
     move-object v1, p2
 
-    move-object v2, v4
+    move-object v2, v3
+
+    move-object v3, p3
 
     move v4, v5
 
     move-object/from16 v5, p7
 
+    move v6, v7
+
+    move v7, v8
+
+    move v8, v9
+
     invoke-direct/range {v0 .. v8}, Lcom/discord/utilities/channel/GuildChannelsInfo;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuildRole;Lcom/discord/models/domain/ModelUserGuildSettings;ZLjava/util/Map;ZZZ)V
 
-    return-object v9
+    return-object v10
 .end method
 
 .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
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 ed0112605a..312dcec3bc 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/channel/GuildChannelsInfo$Companion;
 .super Ljava/lang/Object;
+.source "GuildChannelsInfo.kt"
 
 
 # annotations
@@ -115,7 +116,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali
index f940fda415..ddd75baf70 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/channel/GuildChannelsInfo;
 .super Ljava/lang/Object;
+.source "GuildChannelsInfo.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali b/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali
index b1aca69a23..2b13a98694 100644
--- a/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali
+++ b/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
 .super Ljava/lang/Object;
+.source "LeastRecentlyAddedSet.kt"
 
 # interfaces
 .implements Ljava/util/Set;
@@ -168,6 +169,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final addAll(Ljava/util/Collection;)Z
diff --git a/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali b/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali
index feff3bf34a..ae0bbf20e4 100644
--- a/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali
+++ b/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/MutablePartitionedIterator;
 .super Ljava/lang/Object;
+.source "MutablePartitionedIterator.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
index 50e326000e..2f86f37c0c 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/ShallowPartitionCollection$Companion;
 .super Ljava/lang/Object;
+.source "ShallowPartitionCollection.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
index 482c36170f..355feae177 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/collections/ShallowPartitionCollection;
 .super Ljava/lang/Object;
+.source "ShallowPartitionCollection.kt"
 
 # interfaces
 .implements Ljava/util/Collection;
@@ -248,7 +249,6 @@
 
     const/4 v0, 0x0
 
-    :cond_0
     const/4 v1, 0x0
 
     :goto_0
@@ -270,7 +270,15 @@
 
     if-eqz v1, :cond_0
 
+    goto :goto_1
+
+    :cond_0
+    const/4 v1, 0x0
+
+    goto :goto_0
+
     :cond_1
+    :goto_1
     const/4 v1, 0x1
 
     goto :goto_0
@@ -533,7 +541,6 @@
 
     const/4 v0, 0x0
 
-    :cond_0
     const/4 v1, 0x0
 
     :goto_0
@@ -555,7 +562,15 @@
 
     if-eqz v1, :cond_0
 
+    goto :goto_1
+
+    :cond_0
+    const/4 v1, 0x0
+
+    goto :goto_0
+
     :cond_1
+    :goto_1
     const/4 v1, 0x1
 
     goto :goto_0
@@ -590,7 +605,6 @@
 
     const/4 v1, 0x0
 
-    :cond_0
     const/4 v2, 0x0
 
     :goto_0
@@ -614,7 +628,15 @@
 
     if-eqz v2, :cond_0
 
+    goto :goto_1
+
+    :cond_0
+    const/4 v2, 0x0
+
+    goto :goto_0
+
     :cond_1
+    :goto_1
     const/4 v2, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali
index 7d4fddfd59..88838ea9c8 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection$1;
 .super Lkotlin/jvm/internal/k;
+.source "ShallowPartitionImmutableCollection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali
index ff23f8b8e9..4423904e32 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection$Set;
 .super Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection;
+.source "ShallowPartitionImmutableCollection.kt"
 
 # interfaces
 .implements Ljava/util/Set;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali
index 9e6ff6239b..1e16ae47be 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection;
 .super Lcom/discord/utilities/collections/ShallowPartitionCollection;
+.source "ShallowPartitionImmutableCollection.kt"
 
 # interfaces
 .implements Ljava/util/Collection;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
index de0b49b9f7..2c882e63a9 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap;
 .super Lcom/discord/utilities/collections/ShallowPartitionMap;
+.source "ShallowPartitionMap.kt"
 
 
 # annotations
@@ -180,7 +181,7 @@
 
     if-gez v1, :cond_0
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_0
     check-cast v2, Ljava/util/Map;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali
index 449a1eb9a6..4c990bc8de 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/collections/ShallowPartitionMap$entries$2;
 .super Lkotlin/jvm/internal/k;
+.source "ShallowPartitionMap.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
index 45885b77d8..f50e216375 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/collections/ShallowPartitionMap;
 .super Ljava/lang/Object;
+.source "ShallowPartitionMap.kt"
 
 # interfaces
 .implements Ljava/util/Map;
diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali
index bcda5a26e7..32f8c29616 100644
--- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1;
 .super Lkotlin/jvm/internal/k;
+.source "SnowflakePartitionMap.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion.smali
index 8d3f0a7f53..3213f87a4f 100644
--- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/SnowflakePartitionMap$Companion;
 .super Ljava/lang/Object;
+.source "SnowflakePartitionMap.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap.smali
index c8a3c0347b..49a5965cbd 100644
--- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
 .super Lcom/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap;
+.source "SnowflakePartitionMap.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
index 32abe5c2e2..53d8013ea1 100644
--- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/SnowflakePartitionMap;
 .super Lcom/discord/utilities/collections/ShallowPartitionMap;
+.source "SnowflakePartitionMap.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali
index 7020354aeb..c31eee0c2e 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/SparseMutableList$Chunk$Companion;
 .super Ljava/lang/Object;
+.source "SparseMutableList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali
index 76c37a9d8d..43c1a13780 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/SparseMutableList$Chunk;
 .super Ljava/lang/Object;
+.source "SparseMutableList.kt"
 
 # interfaces
 .implements Ljava/lang/Comparable;
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali
index 6643d0b65c..59a1e1fc3c 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;
 .super Ljava/lang/Object;
+.source "SparseMutableList.kt"
 
 # interfaces
 .implements Ljava/util/ListIterator;
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
index 7b590fda73..47d69b4b88 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/collections/SparseMutableList;
 .super Ljava/lang/Object;
+.source "SparseMutableList.kt"
 
 # interfaces
 .implements Ljava/util/List;
@@ -151,7 +152,7 @@
 
     move-result v0
 
-    if-ltz p1, :cond_1
+    if-ltz p1, :cond_2
 
     if-ge v0, p1, :cond_0
 
@@ -185,6 +186,9 @@
 
     :cond_1
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 .method private final getChunkIndex(I)I
@@ -282,7 +286,7 @@
 
     move-result v0
 
-    if-ltz p1, :cond_1
+    if-ltz p1, :cond_2
 
     if-ge v0, p1, :cond_0
 
@@ -316,6 +320,9 @@
 
     :cond_1
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 .method private final resolveChunks()V
@@ -443,12 +450,11 @@
 
     invoke-virtual {v1, p1, p2}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->addAtListIndex(ILjava/lang/Object;)V
 
-    :goto_0
     add-int/lit8 v0, v0, 0x1
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/collections/SparseMutableList;->incrementChunksFromIndex(I)V
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     sget-object v0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->Companion:Lcom/discord/utilities/collections/SparseMutableList$Chunk$Companion;
@@ -467,17 +473,16 @@
 
     invoke-direct {p0, p2}, Lcom/discord/utilities/collections/SparseMutableList;->addChunk(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)V
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_2
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/collections/SparseMutableList;->addChunk(ILcom/discord/utilities/collections/SparseMutableList$Chunk;)V
 
     add-int/lit8 p1, p1, 0x1
 
-    :goto_1
     invoke-direct {p0, p1}, Lcom/discord/utilities/collections/SparseMutableList;->incrementChunksFromIndex(I)V
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_3
     if-ltz v0, :cond_4
@@ -494,6 +499,10 @@
 
     invoke-virtual {p2, p1, v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->addAtListIndex(ILjava/lang/Object;)V
 
+    add-int/lit8 v0, v0, 0x1
+
+    invoke-direct {p0, v0}, Lcom/discord/utilities/collections/SparseMutableList;->incrementChunksFromIndex(I)V
+
     goto :goto_0
 
     :cond_4
@@ -503,10 +512,10 @@
 
     if-eq p1, v1, :cond_5
 
-    goto :goto_1
+    invoke-direct {p0, p1}, Lcom/discord/utilities/collections/SparseMutableList;->incrementChunksFromIndex(I)V
 
     :cond_5
-    :goto_2
+    :goto_0
     invoke-virtual {p0}, Lcom/discord/utilities/collections/SparseMutableList;->size()I
 
     move-result p1
@@ -933,7 +942,7 @@
 
     if-gez v1, :cond_3
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_3
     invoke-static {v3, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -1434,8 +1443,6 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/discord/utilities/collections/SparseMutableList;->size:I
-
     if-ge p1, v0, :cond_2
 
     iget-object v0, p0, Lcom/discord/utilities/collections/SparseMutableList;->chunks:Ljava/util/List;
diff --git a/com.discord/smali/com/discord/utilities/color/ColorCompat.smali b/com.discord/smali/com/discord/utilities/color/ColorCompat.smali
index 5640d0abfb..8921c9ff0d 100644
--- a/com.discord/smali/com/discord/utilities/color/ColorCompat.smali
+++ b/com.discord/smali/com/discord/utilities/color/ColorCompat.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/color/ColorCompat;
 .super Ljava/lang/Object;
+.source "ColorCompat.kt"
 
 
 # static fields
@@ -395,6 +396,8 @@
 
     invoke-virtual {p0, p1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    return-void
+
     :cond_3
     return-void
 .end method
@@ -599,6 +602,8 @@
 
     invoke-virtual {p0, v0, v0}, Landroid/view/Window;->setFlags(II)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali b/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
index 31358be60a..0fa1a23e17 100644
--- a/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
+++ b/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/dimen/DimenUtils;
 .super Ljava/lang/Object;
+.source "DimenUtils.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali b/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali
index 00cd77fb6a..78371a1a4a 100644
--- a/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali
+++ b/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/dimmer/DimmerView;
 .super Landroid/widget/RelativeLayout;
+.source "DimmerView.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali b/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali
index f0ca5d6f32..94e3b620f5 100644
--- a/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali
+++ b/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/display/DisplayUtils;
 .super Ljava/lang/Object;
+.source "DisplayUtils.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali b/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali
index d9acaa0d66..cc3c7eba78 100644
--- a/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali
+++ b/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/drawable/DrawableCompat;
 .super Ljava/lang/Object;
+.source "DrawableCompat.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
index af5e57a921..836fc49a03 100644
--- a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/embed/EmbedResourceUtils;
 .super Ljava/lang/Object;
+.source "EmbedResourceUtils.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali b/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali
index 66dfb6e3eb..a1e28ed308 100644
--- a/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali
+++ b/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/emoji/EmojiFrecencyTracker;
 .super Lcom/discord/utilities/frecency/FrecencyTracker;
+.source "EmojiFrecencyTracker.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTrackerKt.smali b/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTrackerKt.smali
index 0f228ba974..9363fd69fb 100644
--- a/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTrackerKt.smali
+++ b/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTrackerKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/emoji/EmojiFrecencyTrackerKt;
 .super Ljava/lang/Object;
+.source "EmojiFrecencyTracker.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/error/Error$1.smali b/com.discord/smali/com/discord/utilities/error/Error$1.smali
index f4ca6cb362..259c77aaa5 100644
--- a/com.discord/smali/com/discord/utilities/error/Error$1.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/utilities/error/Error$1;
 .super Ljava/lang/Object;
+.source "Error.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/error/Error$Response.smali b/com.discord/smali/com/discord/utilities/error/Error$Response.smali
index 14eeab479e..9937fe713f 100644
--- a/com.discord/smali/com/discord/utilities/error/Error$Response.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error$Response.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/error/Error$Response;
 .super Ljava/lang/Object;
+.source "Error.java"
 
 # interfaces
 .implements Lcom/discord/models/domain/Model;
@@ -75,10 +76,13 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    nop
+    goto :goto_0
 
     :catch_0
+    return-void
+
     :cond_0
+    :goto_0
     return-void
 .end method
 
@@ -125,9 +129,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
-
-    return-object p1
+    return-object v0
 
     :cond_1
     iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
@@ -584,8 +586,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Lcom/discord/utilities/error/Error$Response;->retryAfter:I
-
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
diff --git a/com.discord/smali/com/discord/utilities/error/Error$Type.smali b/com.discord/smali/com/discord/utilities/error/Error$Type.smali
index ea91c5d6f6..ac0aa7c720 100644
--- a/com.discord/smali/com/discord/utilities/error/Error$Type.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/error/Error$Type;
 .super Ljava/lang/Enum;
+.source "Error.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index 8a1afa00fc..ce0316153f 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/error/Error;
 .super Ljava/lang/Object;
+.source "Error.java"
 
 
 # annotations
@@ -210,11 +211,11 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v4, v0, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v4, v0, Lb/m;->ckO:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v4, v4, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
-    iget-object v5, v0, Lb/m;->clw:Lokhttp3/x;
+    iget-object v5, v0, Lb/m;->ckQ:Lokhttp3/x;
 
     if-eqz v5, :cond_2
 
@@ -236,7 +237,7 @@
     :goto_0
     if-eqz v2, :cond_1
 
-    iget-object v2, v2, Lokhttp3/MediaType;->bZo:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/MediaType;->bYI:Ljava/lang/String;
 
     goto :goto_1
 
@@ -245,7 +246,7 @@
 
     :goto_1
     :try_start_0
-    invoke-virtual {v5}, Lokhttp3/x;->HL()Ljava/lang/String;
+    invoke-virtual {v5}, Lokhttp3/x;->HK()Ljava/lang/String;
 
     move-result-object v7
     :try_end_0
@@ -276,7 +277,7 @@
     move-object v7, v6
 
     :goto_2
-    iget-object v0, v0, Lb/m;->clu:Lokhttp3/Response;
+    iget-object v0, v0, Lb/m;->ckO:Lokhttp3/Response;
 
     invoke-static {v0}, Lcom/discord/utilities/error/Error;->getRequestUrl(Lokhttp3/Response;)Ljava/lang/String;
 
@@ -300,7 +301,6 @@
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->INTERNAL_SERVER_ERROR:Lcom/discord/utilities/error/Error$Type;
 
-    :goto_4
     move-object v5, v0
 
     move-object v2, v1
@@ -309,7 +309,7 @@
 
     move-object v7, v2
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
     :cond_4
     const/16 v5, 0x1f6
@@ -336,7 +336,7 @@
 
     if-ne v3, v5, :cond_5
 
-    goto :goto_6
+    goto/16 :goto_4
 
     :cond_5
     const/16 v5, 0x191
@@ -345,7 +345,15 @@
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->UNAUTHORIZED:Lcom/discord/utilities/error/Error$Type;
 
-    goto :goto_4
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v8, v7
+
+    move-object v7, v2
+
+    goto/16 :goto_8
 
     :cond_6
     const/16 v5, 0x193
@@ -362,7 +370,15 @@
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->FORBIDDEN_CLOUD_FLARE:Lcom/discord/utilities/error/Error$Type;
 
-    goto :goto_4
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v8, v7
+
+    move-object v7, v2
+
+    goto/16 :goto_8
 
     :cond_7
     const/16 v2, 0x19d
@@ -371,7 +387,15 @@
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->REQUEST_TOO_LARGE:Lcom/discord/utilities/error/Error$Type;
 
-    goto :goto_4
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v8, v7
+
+    move-object v7, v2
+
+    goto/16 :goto_8
 
     :cond_8
     new-instance v2, Lcom/discord/utilities/error/Error$Response;
@@ -384,21 +408,26 @@
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->DISCORD_BAD_REQUEST:Lcom/discord/utilities/error/Error$Type;
 
-    :goto_5
     move-object v5, v0
 
     move-object v8, v7
 
     move-object v7, v1
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
     :cond_9
     if-ne v3, v5, :cond_a
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->FORBIDDEN_DISCORD:Lcom/discord/utilities/error/Error$Type;
 
-    goto :goto_5
+    move-object v5, v0
+
+    move-object v8, v7
+
+    move-object v7, v1
+
+    goto/16 :goto_8
 
     :cond_a
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error$Response;->isKnownResponse()Z
@@ -409,7 +438,13 @@
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->DISCORD_REQUEST_ERROR:Lcom/discord/utilities/error/Error$Type;
 
-    goto :goto_5
+    move-object v5, v0
+
+    move-object v8, v7
+
+    move-object v7, v1
+
+    goto/16 :goto_8
 
     :cond_b
     const/16 v5, 0x1ad
@@ -418,7 +453,13 @@
 
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->RATE_LIMITED:Lcom/discord/utilities/error/Error$Type;
 
-    goto :goto_5
+    move-object v5, v0
+
+    move-object v8, v7
+
+    move-object v7, v1
+
+    goto/16 :goto_8
 
     :cond_c
     sget-object v5, Lcom/discord/utilities/error/Error$Type;->DISCORD_REQUEST_ERROR_UNKNOWN:Lcom/discord/utilities/error/Error$Type;
@@ -431,24 +472,29 @@
 
     move-object v7, v0
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
     :cond_d
-    :goto_6
+    :goto_4
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->INTERMITTENT_CLOUD_FLARE:Lcom/discord/utilities/error/Error$Type;
 
-    goto :goto_4
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v8, v7
+
+    move-object v7, v2
+
+    goto/16 :goto_8
 
     :cond_e
     instance-of v0, p0, Ljava/net/UnknownHostException;
 
-    if-eqz v0, :cond_10
+    if-eqz v0, :cond_f
 
-    :cond_f
-    :goto_7
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->NETWORK:Lcom/discord/utilities/error/Error$Type;
 
-    :goto_8
     move-object v5, v0
 
     move-object v2, v1
@@ -457,36 +503,36 @@
 
     move-object v8, v7
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
-    :cond_10
+    :cond_f
     instance-of v0, p0, Ljava/io/IOException;
 
-    if-eqz v0, :cond_15
+    if-eqz v0, :cond_16
 
     invoke-virtual {p0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
 
     move-result-object v0
 
-    if-eqz v0, :cond_11
+    if-eqz v0, :cond_10
 
     invoke-virtual {p0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_9
+    goto :goto_5
 
-    :cond_11
+    :cond_10
     const-string v0, ""
 
-    :goto_9
+    :goto_5
     const-string v2, "Canceled"
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
-    if-nez v2, :cond_f
+    if-nez v2, :cond_15
 
     const-string v2, "Connection reset by peer"
 
@@ -494,7 +540,7 @@
 
     move-result v2
 
-    if-nez v2, :cond_f
+    if-nez v2, :cond_15
 
     const-string v2, "stream was reset:"
 
@@ -502,25 +548,25 @@
 
     move-result v0
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_15
 
     instance-of v0, p0, Ljava/net/NoRouteToHostException;
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_15
 
     instance-of v0, p0, Ljava/net/SocketException;
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_15
 
     instance-of v0, p0, Ljava/io/InterruptedIOException;
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_15
 
     invoke-virtual {p0}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
 
     move-result-object v0
 
-    if-eqz v0, :cond_12
+    if-eqz v0, :cond_11
 
     invoke-virtual {p0}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
 
@@ -528,66 +574,131 @@
 
     instance-of v0, v0, Ljava/lang/InterruptedException;
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_15
 
-    :cond_12
+    :cond_11
     invoke-virtual {p0}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
 
     move-result-object v0
 
     instance-of v0, v0, Ljava/net/SocketTimeoutException;
 
-    if-eqz v0, :cond_13
+    if-eqz v0, :cond_12
 
     goto :goto_7
 
-    :cond_13
+    :cond_12
     instance-of v0, p0, Ljavax/net/ssl/SSLHandshakeException;
 
     if-nez v0, :cond_14
 
     instance-of v0, p0, Ljavax/net/ssl/SSLException;
 
-    if-eqz v0, :cond_17
+    if-eqz v0, :cond_13
+
+    goto :goto_6
+
+    :cond_13
+    sget-object v0, Lcom/discord/utilities/error/Error$Type;->OTHER:Lcom/discord/utilities/error/Error$Type;
+
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v7, v2
+
+    move-object v8, v7
+
+    goto :goto_8
 
     :cond_14
+    :goto_6
     sget-object v0, Lcom/discord/utilities/error/Error$Type;->SSL:Lcom/discord/utilities/error/Error$Type;
 
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v7, v2
+
+    move-object v8, v7
+
     goto :goto_8
 
     :cond_15
-    instance-of v0, p0, Ljava/util/concurrent/TimeoutException;
+    :goto_7
+    sget-object v0, Lcom/discord/utilities/error/Error$Type;->NETWORK:Lcom/discord/utilities/error/Error$Type;
 
-    if-eqz v0, :cond_16
+    move-object v5, v0
 
-    sget-object v0, Lcom/discord/utilities/error/Error$Type;->TIMEOUT:Lcom/discord/utilities/error/Error$Type;
+    move-object v2, v1
+
+    move-object v7, v2
+
+    move-object v8, v7
 
     goto :goto_8
 
     :cond_16
-    instance-of v0, p0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
+    instance-of v0, p0, Ljava/util/concurrent/TimeoutException;
 
     if-eqz v0, :cond_17
 
-    sget-object v0, Lcom/discord/utilities/error/Error$Type;->CAPTCHA_KNOWN_FAILURE:Lcom/discord/utilities/error/Error$Type;
+    sget-object v0, Lcom/discord/utilities/error/Error$Type;->TIMEOUT:Lcom/discord/utilities/error/Error$Type;
+
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v7, v2
+
+    move-object v8, v7
 
     goto :goto_8
 
     :cond_17
-    sget-object v0, Lcom/discord/utilities/error/Error$Type;->OTHER:Lcom/discord/utilities/error/Error$Type;
+    instance-of v0, p0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
+
+    if-eqz v0, :cond_18
+
+    sget-object v0, Lcom/discord/utilities/error/Error$Type;->CAPTCHA_KNOWN_FAILURE:Lcom/discord/utilities/error/Error$Type;
+
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v7, v2
+
+    move-object v8, v7
 
     goto :goto_8
 
-    :goto_a
-    if-nez v2, :cond_18
+    :cond_18
+    sget-object v0, Lcom/discord/utilities/error/Error$Type;->OTHER:Lcom/discord/utilities/error/Error$Type;
+
+    move-object v5, v0
+
+    move-object v2, v1
+
+    move-object v7, v2
+
+    move-object v8, v7
+
+    :goto_8
+    if-nez v2, :cond_19
 
     new-instance v2, Lcom/discord/utilities/error/Error$Response;
 
     invoke-direct {v2, v1, v1}, Lcom/discord/utilities/error/Error$Response;-><init>(Ljava/lang/String;Lcom/discord/utilities/error/Error$1;)V
 
-    :cond_18
     move-object v6, v2
 
+    goto :goto_9
+
+    :cond_19
+    move-object v6, v2
+
+    :goto_9
     new-instance v0, Lcom/discord/utilities/error/Error;
 
     move-object v3, v0
@@ -668,22 +779,22 @@
 
     if-eqz p0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-virtual {p0}, Lokhttp3/s;->toString()Ljava/lang/String;
 
@@ -736,12 +847,10 @@
 
     const v0, 0x7f1209d0
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    :goto_1
     invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
@@ -751,66 +860,149 @@
     :pswitch_0
     const v0, 0x7f120868
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_1
     const v0, 0x7f1209cf
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_2
     const v0, 0x7f1209cc
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_3
     const v0, 0x7f120e07
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_4
     const v0, 0x7f1209ce
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_5
     const v0, 0x7f1209ca
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_6
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
     const v1, 0x7f1209c7
 
-    :goto_2
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_1
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_7
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
     const v1, 0x7f1209cb
 
-    goto :goto_2
+    invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_8
     const v0, 0x7f120be3
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_9
     const v0, 0x7f1209c9
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_a
     const v0, 0x7f1209c8
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_0
     :pswitch_b
@@ -818,7 +1010,15 @@
 
     const v1, 0x7f1209cd
 
-    goto :goto_2
+    invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x3
@@ -882,15 +1082,7 @@
     :try_start_1
     invoke-interface {p2, p0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    goto :goto_0
-
-    :catch_0
-    move-exception p2
-
-    goto :goto_1
-
     :cond_0
-    :goto_0
     invoke-direct {p0, p1}, Lcom/discord/utilities/error/Error;->logError(Ljava/lang/String;)V
 
     invoke-virtual {p0, p3}, Lcom/discord/utilities/error/Error;->showToasts(Landroid/content/Context;)V
@@ -899,24 +1091,29 @@
 
     return-void
 
+    :catch_0
+    move-exception p2
+
+    goto :goto_0
+
     :catch_1
     move-exception p2
 
     move-object p0, v0
 
-    :goto_1
+    :goto_0
     if-eqz p0, :cond_1
 
     invoke-virtual {p0}, Lcom/discord/utilities/error/Error;->toString()Ljava/lang/String;
 
     move-result-object p0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     move-object p0, v0
 
-    :goto_2
+    :goto_1
     sget-object p3, Lcom/discord/utilities/error/Error;->onUnhandledError:Lrx/functions/Action4;
 
     new-instance v1, Ljava/lang/Exception;
@@ -988,8 +1185,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/discord/utilities/error/Error;->onUnhandledError:Lrx/functions/Action4;
-
     iget-object v1, p0, Lcom/discord/utilities/error/Error;->throwable:Ljava/lang/Throwable;
 
     iget-object v2, p0, Lcom/discord/utilities/error/Error;->metadata:Ljava/util/Map;
@@ -1003,8 +1198,6 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lcom/discord/utilities/error/Error;->onUnhandledError:Lrx/functions/Action4;
-
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->type:Lcom/discord/utilities/error/Error$Type;
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Type;->name()Ljava/lang/String;
@@ -1017,10 +1210,14 @@
 
     invoke-interface {p1, v0, v1, v2}, Lrx/functions/Action4;->a(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
+    return-void
+
     :cond_0
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -1398,7 +1595,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     if-nez p1, :cond_0
 
@@ -1437,6 +1634,9 @@
     goto :goto_0
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/error/ErrorExtensionsKt.smali b/com.discord/smali/com/discord/utilities/error/ErrorExtensionsKt.smali
index c64a3ae2f4..63f5e9dce0 100644
--- a/com.discord/smali/com/discord/utilities/error/ErrorExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/error/ErrorExtensionsKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/error/ErrorExtensionsKt;
 .super Ljava/lang/Object;
+.source "ErrorExtensions.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali
index 590705db48..4327c4c861 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationActions$Companion;
 .super Ljava/lang/Object;
+.source "NotificationActions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
index d65d7a02b3..0b0e59fec4 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationActions;
 .super Landroid/content/BroadcastReceiver;
+.source "NotificationActions.kt"
 
 
 # annotations
@@ -48,7 +49,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     const-string v0, "channelId"
 
@@ -56,13 +57,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-static {v0}, Lkotlin/text/l;->ec(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -218,8 +219,13 @@
 
     invoke-virtual {v0, p1}, Landroidx/work/WorkManager;->enqueue(Landroidx/work/WorkRequest;)Landroidx/work/Operation;
 
+    return-void
+
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
 
 .method private final enqueueDirectReply(Landroid/content/Context;Landroid/content/Intent;)V
@@ -441,6 +447,8 @@
 
     invoke-virtual {p2, v0, v1, p1}, Lcom/discord/utilities/fcm/NotificationClient;->clear(JLandroid/content/Context;)V
 
+    return-void
+
     :cond_4
     return-void
 .end method
@@ -628,7 +636,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/fcm/NotificationActions;->enqueue(Landroid/content/Context;Landroid/content/Intent;)V
 
@@ -641,7 +649,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     const-string v0, "Got notification deleted: "
 
@@ -671,6 +679,8 @@
 
     invoke-virtual {p2, v0, v1, p1}, Lcom/discord/utilities/fcm/NotificationClient;->clear(JLandroid/content/Context;)V
 
+    return-void
+
     :cond_3
     return-void
 
@@ -681,7 +691,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     const-string v0, "Got notification cancel: "
 
@@ -713,9 +723,12 @@
 
     invoke-virtual {p1, p2}, Landroidx/core/app/NotificationManagerCompat;->cancel(I)V
 
-    nop
+    goto :goto_0
 
     :cond_5
+    return-void
+
+    :cond_6
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali
index 8868ebf032..560c81ad75 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationCache;
 .super Ljava/lang/Object;
+.source "NotificationCache.kt"
 
 
 # static fields
@@ -243,4 +244,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
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 146e762a3e..9e4992a78c 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationClient$FCMMessagingService;
 .super Lcom/google/firebase/messaging/FirebaseMessagingService;
+.source "NotificationClient.kt"
 
 
 # annotations
@@ -46,7 +47,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Cl()Ljava/util/Map;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Ck()Ljava/util/Map;
 
     move-result-object v0
 
@@ -74,7 +75,7 @@
 
     const-string v9, "fcm_from"
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Ck()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Cj()Ljava/lang/String;
 
     move-result-object v10
 
@@ -108,7 +109,7 @@
 
     const-string v4, "fcm_messageId"
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Cn()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Cm()Ljava/lang/String;
 
     move-result-object v5
 
@@ -125,7 +126,7 @@
 
     const-string v3, "fcm_collapseKey"
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Cm()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Cl()Ljava/lang/String;
 
     move-result-object v4
 
@@ -142,7 +143,7 @@
 
     const-string v2, "fcm_messageType"
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Co()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Cn()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali
index d686d0c7f4..e9bbb5e946 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationClient$Settings;
 .super Ljava/lang/Object;
+.source "NotificationClient.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali
index 8b9ef0e8da..3958852511 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
 .super Ljava/lang/Object;
+.source "NotificationClient.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali
index df4a1a8c12..86bb235f8e 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationClient$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali
index 49a561291e..c0aed76b25 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationClient$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali
index fcff86506b..f42aa3367e 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationClient$init$3;
 .super Ljava/lang/Object;
+.source "NotificationClient.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/e;
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 9b4299c519..721d8b1d1b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationClient$init$4;
 .super Ljava/lang/Object;
+.source "NotificationClient.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/b;
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 e09ab0093b..1d1bceb163 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationClient$init$5;
 .super Ljava/lang/Object;
+.source "NotificationClient.kt"
 
 # interfaces
 .implements Lcom/google/android/gms/tasks/d;
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 3474cae9e9..496ac5a4ca 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$tokenCallback$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$tokenCallback$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationClient$tokenCallback$1;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
index 7fdaa1a9cc..e0a3a5f0e7 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationClient;
 .super Ljava/lang/Object;
+.source "NotificationClient.kt"
 
 
 # annotations
@@ -274,7 +275,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;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
@@ -282,7 +283,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->BM()Lcom/google/android/gms/tasks/g;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->BL()Lcom/google/android/gms/tasks/g;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
index 71af3c8cf7..2edcb7fbd1 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationData$Companion;
 .super Ljava/lang/Object;
+.source "NotificationData.kt"
 
 
 # annotations
@@ -171,6 +172,8 @@
     :cond_2
     invoke-interface {p2, p3, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_3
     :goto_1
     return-void
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
index 6b5b8dadab..1325d7d1f5 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;
 .super Ljava/lang/Object;
+.source "NotificationData.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 74cf3788f1..e1b31a53cf 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationData;
 .super Ljava/lang/Object;
+.source "NotificationData.kt"
 
 
 # annotations
@@ -360,8 +361,6 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
-
     const/4 v4, 0x3
 
     if-ne v1, v4, :cond_2
@@ -376,7 +375,7 @@
 .end method
 
 .method public constructor <init>(Ljava/util/Map;)V
-    .locals 35
+    .locals 36
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -586,9 +585,9 @@
 
     move-result-object v2
 
-    move-object/from16 v16, v2
+    move-object/from16 v17, v2
 
-    check-cast v16, Ljava/lang/String;
+    check-cast v17, Ljava/lang/String;
 
     const-string v2, "user_id"
 
@@ -608,12 +607,12 @@
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v17
+    move-result-wide v18
 
     goto :goto_5
 
     :cond_6
-    move-wide/from16 v17, v4
+    move-wide/from16 v18, v4
 
     :goto_5
     const-string v2, "user_username"
@@ -622,9 +621,9 @@
 
     move-result-object v2
 
-    move-object/from16 v19, v2
+    move-object/from16 v20, v2
 
-    check-cast v19, Ljava/lang/String;
+    check-cast v20, Ljava/lang/String;
 
     const-string v2, "user_avatar"
 
@@ -632,9 +631,9 @@
 
     move-result-object v2
 
-    move-object/from16 v20, v2
+    move-object/from16 v21, v2
 
-    check-cast v20, Ljava/lang/String;
+    check-cast v21, Ljava/lang/String;
 
     const-string v2, "rel_type"
 
@@ -656,12 +655,12 @@
 
     move-result v2
 
-    move/from16 v21, v2
+    move/from16 v22, v2
 
     goto :goto_6
 
     :cond_7
-    const/16 v21, -0x1
+    const/16 v22, -0x1
 
     :goto_6
     const-string v2, "guild_id"
@@ -682,12 +681,12 @@
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v22
+    move-result-wide v23
 
     goto :goto_7
 
     :cond_8
-    move-wide/from16 v22, v4
+    move-wide/from16 v23, v4
 
     :goto_7
     const-string v2, "guild_name"
@@ -696,9 +695,9 @@
 
     move-result-object v2
 
-    move-object/from16 v24, v2
+    move-object/from16 v25, v2
 
-    check-cast v24, Ljava/lang/String;
+    check-cast v25, Ljava/lang/String;
 
     const-string v2, "guild_icon"
 
@@ -706,9 +705,9 @@
 
     move-result-object v2
 
-    move-object/from16 v25, v2
+    move-object/from16 v26, v2
 
-    check-cast v25, Ljava/lang/String;
+    check-cast v26, Ljava/lang/String;
 
     const-string v2, "activity_type"
 
@@ -730,12 +729,12 @@
 
     move-result v2
 
-    move/from16 v26, v2
+    move/from16 v27, v2
 
     goto :goto_8
 
     :cond_9
-    const/16 v26, -0x1
+    const/16 v27, -0x1
 
     :goto_8
     const-string v2, "activity_name"
@@ -744,9 +743,9 @@
 
     move-result-object v2
 
-    move-object/from16 v27, v2
+    move-object/from16 v28, v2
 
-    check-cast v27, Ljava/lang/String;
+    check-cast v28, Ljava/lang/String;
 
     const-string v2, "platform_name"
 
@@ -754,9 +753,9 @@
 
     move-result-object v2
 
-    move-object/from16 v28, v2
+    move-object/from16 v29, v2
 
-    check-cast v28, Ljava/lang/String;
+    check-cast v29, Ljava/lang/String;
 
     const-string v2, "platform_type"
 
@@ -778,12 +777,12 @@
 
     move-result v2
 
-    move/from16 v34, v2
+    move/from16 v30, v2
 
     goto :goto_9
 
     :cond_a
-    const/16 v34, -0x1
+    const/16 v30, -0x1
 
     :goto_9
     const-string v2, "platform_user_username"
@@ -792,9 +791,9 @@
 
     move-result-object v2
 
-    move-object/from16 v29, v2
+    move-object/from16 v31, v2
 
-    check-cast v29, Ljava/lang/String;
+    check-cast v31, Ljava/lang/String;
 
     const-string v2, "application_id"
 
@@ -817,7 +816,7 @@
     move-result-wide v4
 
     :cond_b
-    move-wide/from16 v30, v4
+    move-wide/from16 v34, v4
 
     const-string v2, "application_name"
 
@@ -859,29 +858,33 @@
 
     move-object v14, v15
 
-    move-object/from16 v15, v16
+    move-object/from16 v15, v17
 
-    move-wide/from16 v16, v17
+    move-wide/from16 v16, v18
 
-    move-object/from16 v18, v19
+    move-object/from16 v18, v20
 
-    move-object/from16 v19, v20
+    move-object/from16 v19, v21
 
-    move/from16 v20, v21
+    move/from16 v20, v22
 
-    move-wide/from16 v21, v22
+    move-wide/from16 v21, v23
 
-    move-object/from16 v23, v24
+    move-object/from16 v23, v25
 
-    move-object/from16 v24, v25
+    move-object/from16 v24, v26
 
-    move/from16 v25, v26
+    move/from16 v25, v27
 
-    move-object/from16 v26, v27
+    move-object/from16 v26, v28
 
-    move-object/from16 v27, v28
+    move-object/from16 v27, v29
 
-    move/from16 v28, v34
+    move/from16 v28, v30
+
+    move-object/from16 v29, v31
+
+    move-wide/from16 v30, v34
 
     invoke-direct/range {v2 .. v33}, Lcom/discord/utilities/fcm/NotificationData;-><init>(Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;)V
 
@@ -1265,7 +1268,7 @@
 
     sparse-switch v1, :sswitch_data_0
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :sswitch_0
     const-string v1, "CALL_RING"
@@ -1390,8 +1393,6 @@
     return-object p1
 
     :cond_1
-    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
-
     if-ne v0, v5, :cond_2
 
     const v0, 0x7f120a5a
@@ -1599,28 +1600,31 @@
 
     const-string p1, ""
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_7
     const v0, 0x7f120a5e
 
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
     goto :goto_1
 
     :cond_8
     const v0, 0x7f120a51
 
-    :goto_1
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     check-cast p1, Ljava/lang/CharSequence;
 
     return-object p1
 
     :cond_9
-    :goto_3
+    :goto_2
     const-string p1, ""
 
     check-cast p1, Ljava/lang/CharSequence;
@@ -2187,7 +2191,7 @@
 
     sparse-switch v1, :sswitch_data_0
 
-    goto/16 :goto_4
+    goto/16 :goto_2
 
     :sswitch_0
     const-string v1, "CALL_RING"
@@ -2220,10 +2224,8 @@
 
     iget-wide v1, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
 
-    :goto_1
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    :goto_2
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
@@ -2255,7 +2257,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 
     :sswitch_3
     const-string v1, "FRIEND_SUGGESTION_CREATE"
@@ -2266,7 +2272,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_3
+    goto :goto_1
 
     :sswitch_4
     const-string v1, "APPLICATION_LIBRARY_INSTALL_COMPLETE"
@@ -2287,7 +2293,13 @@
 
     iget-wide v1, p0, Lcom/discord/utilities/fcm/NotificationData;->applicationId:J
 
-    goto :goto_1
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 
     :sswitch_5
     const-string v1, "RELATIONSHIP_ADD"
@@ -2298,7 +2310,7 @@
 
     if-eqz v0, :cond_0
 
-    :goto_3
+    :goto_1
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
@@ -2309,10 +2321,16 @@
 
     iget-wide v1, p0, Lcom/discord/utilities/fcm/NotificationData;->userId:J
 
-    goto :goto_1
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 
     :cond_0
-    :goto_4
+    :goto_2
     const-string v0, ""
 
     return-object v0
@@ -2766,8 +2784,6 @@
 
     if-eq v0, v2, :cond_0
 
-    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
-
     if-eq v0, v1, :cond_0
 
     iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationData;->userUsername: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 37d4ebc360..cab1c2440f 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$clear$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$clear$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationRenderer$clear$1;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationRenderer.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b170ebdc74..dd67e543e1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationRenderer$display$1;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationRenderer.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 47ea7e3d37..09df091f04 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationRenderer$display$2;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationRenderer.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ebd4b95f42..44e20aebd3 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationRenderer$display$3;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationRenderer.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e244af4d24..3b823fc8db 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayInApp$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayInApp$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/fcm/NotificationRenderer$displayInApp$1;
 .super Lkotlin/jvm/internal/k;
+.source "NotificationRenderer.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
index 1fb1bd69bb..5eae597464 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fcm/NotificationRenderer;
 .super Ljava/lang/Object;
+.source "NotificationRenderer.kt"
 
 
 # static fields
@@ -1187,7 +1188,7 @@
 
     throw p1
 
-    nop
+    return-void
 
     :array_0
     .array-data 8
diff --git a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali
index 36cfbb0142..ba00614b4e 100644
--- a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali
+++ b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/frecency/FrecencyTracker$computeScores$1;
 .super Ljava/lang/Object;
+.source "FrecencyTracker.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali
index 776bd621f9..4b10dcf872 100644
--- a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali
+++ b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/frecency/FrecencyTracker;
 .super Ljava/lang/Object;
+.source "FrecencyTracker.kt"
 
 
 # annotations
@@ -481,4 +482,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali b/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali
index f3252721ba..d96f3b7503 100644
--- a/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/fresco/GrayscalePostprocessor;
 .super Lcom/facebook/imagepipeline/request/a;
+.source "GrayscalePostprocessor.kt"
 
 
 # direct methods
@@ -85,6 +86,8 @@
 
     invoke-virtual {v0, p2, v1, v1, v2}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;FFLandroid/graphics/Paint;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
index b66b4c404d..c75b8e1243 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/games/GameDetectionHelper;
 .super Ljava/lang/Object;
+.source "GameDetectionHelper.kt"
 
 
 # static fields
@@ -218,7 +219,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-virtual {v1}, Landroid/app/usage/UsageStats;->getLastTimeStamp()J
@@ -304,9 +305,9 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/high16 v3, 0x2000000
 
@@ -327,11 +328,11 @@
     goto :goto_0
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     :goto_0
-    return v2
+    return v1
 
     :cond_2
     iget p1, p1, Landroid/content/pm/ApplicationInfo;->flags:I
@@ -340,10 +341,10 @@
 
     if-eqz p1, :cond_3
 
-    return v2
+    return v1
 
     :cond_3
-    return v1
+    return v2
 .end method
 
 .method public static final isGameDetectionSupported()Z
@@ -401,7 +402,7 @@
     move-result-object v2
 
     :cond_0
-    if-eqz v2, :cond_1
+    if-eqz v2, :cond_2
 
     check-cast v2, Ljava/lang/Iterable;
 
@@ -448,6 +449,9 @@
 
     :cond_1
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 
@@ -488,7 +492,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-virtual {v0, v4, v5, v2, v3}, Landroid/app/usage/UsageStatsManager;->queryAndAggregateUsageStats(JJ)Ljava/util/Map;
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 8736128079..1077e2bd55 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/games/GameDetectionService$Companion;
 .super Ljava/lang/Object;
+.source "GameDetectionService.kt"
 
 
 # annotations
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 cf8769472e..916f3c3d68 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/games/GameDetectionService$onCreate$1;
 .super Ljava/lang/Object;
+.source "GameDetectionService.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
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 e86e573507..c200ff6470 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$2.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/games/GameDetectionService$onCreate$2;
 .super Lkotlin/jvm/internal/k;
+.source "GameDetectionService.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f5d5338bd5..77e1a77461 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/games/GameDetectionService$onCreate$3;
 .super Ljava/lang/Object;
+.source "GameDetectionService.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 617ede528b..9b1180aff7 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$4.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/games/GameDetectionService$onCreate$4;
 .super Lkotlin/jvm/internal/k;
+.source "GameDetectionService.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 eac87c1f5d..0fd40dd712 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$5.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/games/GameDetectionService$onCreate$5;
 .super Lkotlin/jvm/internal/i;
+.source "GameDetectionService.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3396516cb3..f629992aa5 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$6.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/games/GameDetectionService$onCreate$6;
 .super Lkotlin/jvm/internal/k;
+.source "GameDetectionService.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
index 616c431c53..2ef43470a9 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/games/GameDetectionService;
 .super Landroid/app/Service;
+.source "GameDetectionService.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
index 584606a56c..33a53b3d7d 100644
--- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
+++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/icon/IconUtils;
 .super Ljava/lang/Object;
+.source "IconUtils.kt"
 
 
 # static fields
@@ -312,9 +313,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -341,9 +342,12 @@
 
     if-nez p3, :cond_2
 
-    const/4 v1, 0x1
+    goto :goto_1
 
     :cond_2
+    const/4 v1, 0x0
+
+    :goto_1
     if-eqz v1, :cond_3
 
     new-instance p3, Ljava/lang/StringBuilder;
@@ -362,7 +366,6 @@
 
     const-string p0, ".jpg"
 
-    :goto_1
     invoke-virtual {p3, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -388,7 +391,13 @@
 
     const-string p0, ".webp"
 
-    goto :goto_1
+    invoke-virtual {p3, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_4
     :goto_2
@@ -599,7 +608,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const-string p2, "https://cdn.discordapp.com"
@@ -638,7 +647,6 @@
 
     const-string p0, ".jpg"
 
-    :goto_1
     invoke-virtual {p2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -664,10 +672,16 @@
 
     const-string p0, ".webp"
 
-    goto :goto_1
+    invoke-virtual {p2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_3
-    :goto_2
+    :goto_1
     return-object p2
 .end method
 
@@ -1006,9 +1020,14 @@
 
     const/4 p5, 0x0
 
+    move-object v5, p5
+
+    goto :goto_0
+
     :cond_0
     move-object v5, p5
 
+    :goto_0
     move-object v0, p0
 
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali b/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali
index 0774cdb0f7..b7d415df15 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;
 .super Ljava/lang/Object;
+.source "MGImages.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/images/MGImages$ChangeDetector;
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$ChangeDetector.smali b/com.discord/smali/com/discord/utilities/images/MGImages$ChangeDetector.smali
index 6c1bda0573..59e99bbfa3 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$ChangeDetector.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$ChangeDetector.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/images/MGImages$ChangeDetector;
 .super Ljava/lang/Object;
+.source "MGImages.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali b/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali
index bc0f6891d3..39b5953bf3 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
 .super Ljava/lang/Object;
+.source "MGImages.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/images/MGImages$ChangeDetector;
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 9e6d88f2a1..15e7c4eb28 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/images/MGImages$requestAvatarCrop$1;
 .super Ljava/lang/Object;
+.source "MGImages.kt"
 
 # interfaces
 .implements Lcom/miguelgaeta/media_picker/MediaPicker$OnError;
@@ -34,29 +35,27 @@
 
 # virtual methods
 .method public final onError(Ljava/io/IOException;)V
-    .locals 5
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/utilities/images/MGImages$requestAvatarCrop$1;->$context:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/discord/utilities/images/MGImages$requestAvatarCrop$1;->$context:Landroid/content/Context;
+    if-eqz v0, :cond_0
 
-    if-eqz v1, :cond_0
+    const v1, 0x7f120e7d
 
-    const v2, 0x7f120e7d
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    new-array v2, v2, [Ljava/lang/Object;
 
-    new-array v3, v3, [Ljava/lang/Object;
-
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     invoke-virtual {p1}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
 
     move-result-object p1
 
-    aput-object p1, v3, v4
+    aput-object p1, v2, v3
 
-    invoke-virtual {v1, v2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v1, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages.smali b/com.discord/smali/com/discord/utilities/images/MGImages.smali
index 6db0c9f49c..a1513fbeff 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/images/MGImages;
 .super Ljava/lang/Object;
+.source "MGImages.kt"
 
 
 # annotations
@@ -72,7 +73,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/DraweeView;->gL()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/DraweeView;->gK()Z
 
     move-result v1
 
@@ -86,7 +87,7 @@
 
     invoke-direct {v1, p1}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
 
-    invoke-virtual {v1}, Lcom/facebook/drawee/generic/a;->gE()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/a;->gD()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
@@ -277,7 +278,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p0, :cond_2
+    if-eqz p0, :cond_3
 
     const/4 v0, 0x0
 
@@ -292,13 +293,13 @@
 
     move-result-object v4
 
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_3
 
     invoke-virtual {v4, p1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
 
     move-result-object p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     check-cast p1, Ljava/io/Closeable;
     :try_end_0
@@ -378,7 +379,6 @@
 
     aput-object p1, p2, v0
 
-    :goto_1
     invoke-virtual {p0, v2, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
@@ -393,7 +393,7 @@
     :catch_2
     move-exception p1
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_2
 
     new-array p2, v1, [Ljava/lang/Object;
 
@@ -403,9 +403,18 @@
 
     aput-object p1, p2, v0
 
-    goto :goto_1
+    invoke-virtual {p0, v2, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
 
     :cond_2
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-static {p0, v3}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/CharSequence;)V
+
+    return-void
+
+    :cond_3
     return-void
 .end method
 
@@ -424,7 +433,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/drawee/generic/d;->gG()Lcom/facebook/drawee/generic/d;
+    invoke-static {}, Lcom/facebook/drawee/generic/d;->gF()Lcom/facebook/drawee/generic/d;
 
     move-result-object p1
 
@@ -900,9 +909,9 @@
     :cond_0
     array-length p6, p1
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-nez p6, :cond_1
 
@@ -924,7 +933,6 @@
 
     const/4 p1, 0x0
 
-    :goto_1
     invoke-virtual {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/d/a;)V
 
     return-void
@@ -942,7 +950,7 @@
 
     const/4 v3, 0x0
 
-    :goto_2
+    :goto_1
     if-ge v3, v2, :cond_4
 
     aget-object v4, p1, v3
@@ -956,7 +964,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;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
@@ -964,14 +972,14 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     check-cast p6, Ljava/util/List;
 
     check-cast p6, Ljava/util/Collection;
 
-    new-array p1, v0, [Lcom/facebook/imagepipeline/request/b;
+    new-array p1, v1, [Lcom/facebook/imagepipeline/request/b;
 
     invoke-interface {p6, p1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
@@ -981,7 +989,7 @@
 
     check-cast p1, [Lcom/facebook/imagepipeline/request/b;
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fN()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p2
 
@@ -1001,7 +1009,7 @@
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p2, v1}, Lcom/facebook/drawee/backends/pipeline/e;->x(Z)Lcom/facebook/drawee/controller/a;
+    invoke-virtual {p2, v0}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
 
     move-result-object p2
 
@@ -1019,13 +1027,15 @@
 
     move-result-object p0
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
     check-cast p1, Lcom/facebook/drawee/d/a;
 
-    goto :goto_1
+    invoke-virtual {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/d/a;)V
+
+    return-void
 
     :cond_5
     new-instance p0, Lkotlin/r;
@@ -1035,6 +1045,8 @@
     invoke-direct {p0, p1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static synthetic setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
@@ -1057,81 +1069,81 @@
 .method public static synthetic setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
     .locals 5
 
-    and-int/lit8 v1, p7, 0x4
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_0
+    and-int/lit8 v0, p7, 0x4
 
     const/4 v1, 0x0
 
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x0
+
     goto :goto_0
 
     :cond_0
-    move v1, p2
+    move v0, p2
 
     :goto_0
-    and-int/lit8 v3, p7, 0x8
+    and-int/lit8 v2, p7, 0x8
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     goto :goto_1
 
     :cond_1
-    move v3, p3
+    move v2, p3
 
     :goto_1
-    and-int/lit8 v4, p7, 0x10
+    and-int/lit8 v3, p7, 0x10
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
     goto :goto_2
 
     :cond_2
-    move v2, p4
+    move v1, p4
 
     :goto_2
-    and-int/lit8 v4, p7, 0x20
+    and-int/lit8 v3, p7, 0x20
 
-    if-eqz v4, :cond_3
+    if-eqz v3, :cond_3
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     goto :goto_3
 
     :cond_3
-    move-object v4, p5
+    move-object v3, p5
 
     :goto_3
-    and-int/lit8 v0, p7, 0x40
+    and-int/lit8 v4, p7, 0x40
 
-    if-eqz v0, :cond_4
+    if-eqz v4, :cond_4
 
-    sget-object v0, Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;->INSTANCE:Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;
+    sget-object v4, Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;->INSTANCE:Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;
 
-    check-cast v0, Lcom/discord/utilities/images/MGImages$ChangeDetector;
+    check-cast v4, Lcom/discord/utilities/images/MGImages$ChangeDetector;
 
     goto :goto_4
 
     :cond_4
-    move-object v0, p6
+    move-object v4, p6
 
     :goto_4
     move-object p2, p0
 
     move-object p3, p1
 
-    move p4, v1
+    move p4, v0
 
-    move p5, v3
+    move p5, v2
 
-    move p6, v2
+    move p6, v1
 
-    move-object p7, v4
+    move-object p7, v3
 
-    move-object p8, v0
+    move-object p8, v4
 
     invoke-static/range {p2 .. p8}, Lcom/discord/utilities/images/MGImages;->setImage(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;)V
 
@@ -1141,81 +1153,81 @@
 .method public static synthetic setImage$default(Landroid/widget/ImageView;[Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
     .locals 5
 
-    and-int/lit8 v1, p7, 0x4
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_0
+    and-int/lit8 v0, p7, 0x4
 
     const/4 v1, 0x0
 
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x0
+
     goto :goto_0
 
     :cond_0
-    move v1, p2
+    move v0, p2
 
     :goto_0
-    and-int/lit8 v3, p7, 0x8
+    and-int/lit8 v2, p7, 0x8
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     goto :goto_1
 
     :cond_1
-    move v3, p3
+    move v2, p3
 
     :goto_1
-    and-int/lit8 v4, p7, 0x10
+    and-int/lit8 v3, p7, 0x10
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
     goto :goto_2
 
     :cond_2
-    move v2, p4
+    move v1, p4
 
     :goto_2
-    and-int/lit8 v4, p7, 0x20
+    and-int/lit8 v3, p7, 0x20
 
-    if-eqz v4, :cond_3
+    if-eqz v3, :cond_3
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     goto :goto_3
 
     :cond_3
-    move-object v4, p5
+    move-object v3, p5
 
     :goto_3
-    and-int/lit8 v0, p7, 0x40
+    and-int/lit8 v4, p7, 0x40
 
-    if-eqz v0, :cond_4
+    if-eqz v4, :cond_4
 
-    sget-object v0, Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;->INSTANCE:Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;
+    sget-object v4, Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;->INSTANCE:Lcom/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector;
 
-    check-cast v0, Lcom/discord/utilities/images/MGImages$ChangeDetector;
+    check-cast v4, Lcom/discord/utilities/images/MGImages$ChangeDetector;
 
     goto :goto_4
 
     :cond_4
-    move-object v0, p6
+    move-object v4, p6
 
     :goto_4
     move-object p2, p0
 
     move-object p3, p1
 
-    move p4, v1
+    move p4, v0
 
-    move p5, v3
+    move p5, v2
 
-    move p6, v2
+    move p6, v1
 
-    move-object p7, v4
+    move-object p7, v3
 
-    move-object p8, v0
+    move-object p8, v4
 
     invoke-static/range {p2 .. p8}, Lcom/discord/utilities/images/MGImages;->setImage(Landroid/widget/ImageView;[Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;)V
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali
index aed43611b2..068280f8c0 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/images/MGImagesBitmap$CirclePostProcessor;
 .super Lcom/facebook/imagepipeline/request/a;
+.source "MGImagesBitmap.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$2.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$2.smali
index 1d9ff65fe3..a1273cb9bc 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$2.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$2;
 .super Lcom/facebook/imagepipeline/c/b;
+.source "MGImagesBitmap.kt"
 
 
 # annotations
@@ -50,7 +51,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fD()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fC()Ljava/lang/Throwable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$3.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$3.smali
index ef95674224..795c3fece5 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$3.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$3;
 .super Ljava/lang/Object;
+.source "MGImagesBitmap.kt"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
index 7b903ffbd1..4be3708b96 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/images/MGImagesBitmap;
 .super Ljava/lang/Object;
+.source "MGImagesBitmap.kt"
 
 
 # annotations
@@ -71,7 +72,7 @@
 
     invoke-static {p6, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fP()Lcom/facebook/imagepipeline/b/g;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object v0
 
@@ -92,7 +93,7 @@
     invoke-virtual {p1, p4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a(Lcom/facebook/imagepipeline/request/c;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
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 9084d8e1bb..85a3743257 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1;
 .super Lcom/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier;
+.source "MGImagesConfig.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali b/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
index 5064318402..1bfd1dc8d1 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/images/MGImagesConfig;
 .super Ljava/lang/Object;
+.source "MGImagesConfig.kt"
 
 
 # static fields
@@ -85,11 +86,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->eW()Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    invoke-virtual {p1}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->eV()Lcom/facebook/cache/disk/DiskCacheConfig$a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->eX()Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-virtual {p1}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->eW()Lcom/facebook/cache/disk/DiskCacheConfig;
 
     move-result-object p1
 
@@ -115,7 +116,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/h$a;->hD()Lcom/facebook/imagepipeline/b/h$a;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/h$a;->hC()Lcom/facebook/imagepipeline/b/h$a;
 
     move-result-object v0
 
@@ -149,7 +150,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/h$a;->hE()Lcom/facebook/imagepipeline/b/h;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/h$a;->hD()Lcom/facebook/imagepipeline/b/h;
 
     move-result-object v0
 
@@ -188,11 +189,11 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fP()Lcom/facebook/imagepipeline/b/g;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/b/g;->hB()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/b/g;->hA()V
 
     :goto_0
     return-void
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1.smali
index 8d283a1a53..5017a5803b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyHelper.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -102,6 +103,8 @@
 
     invoke-static {p1, v1, v0}, Lcom/discord/utilities/integrations/SpotifyHelper;->access$launchSpotifyIntent(Lcom/discord/utilities/integrations/SpotifyHelper;Landroid/content/Context;Landroid/content/Intent;)V
 
+    return-void
+
     :cond_0
     return-void
 .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 2685ecf7c1..32062e7c66 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyHelper.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 51b9709a8b..be4f392163 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyHelper.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 c3f5595316..a21c6b6b3c 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1;
 .super Ljava/lang/Object;
+.source "SpotifyHelper.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali
index e57952626a..5a1b283796 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/integrations/SpotifyHelper;
 .super Ljava/lang/Object;
+.source "SpotifyHelper.kt"
 
 
 # static fields
@@ -232,6 +233,8 @@
 
     invoke-direct {p5, v0, p1}, Lcom/discord/utilities/integrations/SpotifyHelper;->runIfSpotifyInstalled(Lkotlin/jvm/functions/Function0;Landroid/content/Context;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -261,6 +264,8 @@
 
     invoke-direct {v0, v1, p1}, Lcom/discord/utilities/integrations/SpotifyHelper;->runIfSpotifyInstalled(Lkotlin/jvm/functions/Function0;Landroid/content/Context;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -316,6 +321,8 @@
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
index 4d53b6d45b..7a0e3c2374 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/intent/IntentUtils$RouteBuilders;
 .super Ljava/lang/Object;
+.source "IntentUtils.kt"
 
 
 # annotations
@@ -202,7 +203,7 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     if-eqz p1, :cond_1
@@ -233,6 +234,10 @@
 
     move-result-object p1
 
+    invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_1
@@ -254,12 +259,11 @@
 
     move-result-object p1
 
-    :goto_0
     invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v0
 
-    :goto_1
+    :goto_0
     new-instance p1, Landroid/content/Intent;
 
     invoke-direct {p1}, Landroid/content/Intent;-><init>()V
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$1.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$1.smali
index 16eec4ecf3..5c66809d7b 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$1;
 .super Lkotlin/jvm/internal/i;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$2.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$2.smali
index 13ca73abc8..0173cca468 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$2.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$RouteHandlers$wildCardMatcher$actualHandler$2;
 .super Lkotlin/jvm/internal/i;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers.smali
index de10fc07de..90e83379da 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteHandlers.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$RouteHandlers;
 .super Ljava/lang/Object;
+.source "IntentUtils.kt"
 
 
 # annotations
@@ -55,7 +56,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object p2
 
@@ -107,7 +108,7 @@
     const-string p1, "Deeplink"
 
     :cond_3
-    if-eqz p2, :cond_4
+    if-eqz p2, :cond_5
 
     move-object p3, p2
 
@@ -129,6 +130,9 @@
 
     :cond_4
     return-void
+
+    :cond_5
+    return-void
 .end method
 
 .method public final selectChannel(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)V
@@ -146,7 +150,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object p1
 
@@ -176,7 +180,7 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object p1
 
@@ -251,7 +255,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object p1
 
@@ -291,6 +295,8 @@
 
     invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage$default(Lcom/discord/stores/StoreChannelsSelected;Landroid/content/Context;JLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -326,7 +332,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object p1
 
@@ -376,7 +382,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object p2
 
@@ -451,7 +457,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object v0
 
@@ -579,6 +585,8 @@
 
     invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_8
     :goto_4
     return-void
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 c24120ed63..1e34aedf14 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1;
 .super Lkotlin/jvm/internal/k;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 1834af4bd6..b50c2347fd 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1;
 .super Lkotlin/jvm/internal/k;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali
index 46c2138fe5..9fb84c8add 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$1;
 .super Lkotlin/jvm/internal/i;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali
index aae55561f6..8ae5bf4f30 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$2;
 .super Lkotlin/jvm/internal/i;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali
index 049357649b..f8599f2472 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$3;
 .super Lkotlin/jvm/internal/i;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali
index 025891ea53..17e8bc1116 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$4;
 .super Lkotlin/jvm/internal/i;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali
index 1ebf78be7c..36b57dbc2b 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$5;
 .super Lkotlin/jvm/internal/i;
+.source "IntentUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
index 6c4a8d7908..7a70274505 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/intent/IntentUtils;
 .super Ljava/lang/Object;
+.source "IntentUtils.kt"
 
 
 # annotations
@@ -256,17 +257,14 @@
 
     if-eqz v0, :cond_0
 
-    :goto_0
-    check-cast v0, Ljava/lang/CharSequence;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v0, ""
 
-    goto :goto_0
+    :goto_0
+    check-cast v0, Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-virtual {v2, v0}, Lkotlin/text/Regex;->g(Ljava/lang/CharSequence;)Z
 
     move-result v0
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerEnqueueFailure.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerEnqueueFailure.smali
index 7571b7c66e..a7e2086554 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerEnqueueFailure.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerEnqueueFailure.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/io/NetworkUtils$DownloadManagerEnqueueFailure;
 .super Ljava/lang/Throwable;
+.source "NetworkUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerFileNoFound.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerFileNoFound.smali
index 8a6d90f5b3..534b4e0526 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerFileNoFound.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerFileNoFound.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/io/NetworkUtils$DownloadManagerFileNoFound;
 .super Ljava/lang/Throwable;
+.source "NetworkUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerNotFound.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerNotFound.smali
index 5c4ff1f048..9796d0ceec 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerNotFound.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils$DownloadManagerNotFound.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/io/NetworkUtils$DownloadManagerNotFound;
 .super Ljava/lang/Throwable;
+.source "NetworkUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali
index 831b98dc13..74ef35a4dc 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "NetworkUtils.kt"
 
 
 # annotations
@@ -95,6 +96,8 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
+    return-void
+
     :cond_3
     :goto_1
     return-void
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 49c9eb2138..aeee7b0e79 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/io/NetworkUtils$downloadFile$1;
 .super Lkotlin/jvm/internal/k;
+.source "NetworkUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
index e9ec053f73..64c44779b9 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/io/NetworkUtils;
 .super Ljava/lang/Object;
+.source "NetworkUtils.kt"
 
 
 # annotations
@@ -45,7 +46,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/f;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/gson/f;->CL()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->CK()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -164,15 +165,7 @@
 
     move-result-object p3
 
-    goto :goto_1
-
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
-    :goto_1
     new-instance p1, Landroid/app/DownloadManager$Request;
 
     invoke-direct {p1, p2}, Landroid/app/DownloadManager$Request;-><init>(Landroid/net/Uri;)V
@@ -211,9 +204,11 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_3
+    goto :goto_1
+
+    :catch_0
+    move-exception p1
 
-    :goto_2
     invoke-interface {p6, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
@@ -221,7 +216,7 @@
     :cond_3
     move-wide p1, v0
 
-    :goto_3
+    :goto_1
     cmp-long p3, p1, v0
 
     if-nez p3, :cond_4
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$ActivityLifecycleCallbacks.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$ActivityLifecycleCallbacks.smali
index a76b51df6c..4e981e530e 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$ActivityLifecycleCallbacks.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$ActivityLifecycleCallbacks.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/discord/utilities/keyboard/Keyboard$ActivityLifecycleCallbacks;
 .super Ljava/lang/Object;
+.source "Keyboard.kt"
 
 # interfaces
 .implements Landroid/app/Application$ActivityLifecycleCallbacks;
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardAnimation.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardAnimation.smali
index 4bc8ddd675..cfe23e9bed 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardAnimation.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardAnimation.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/keyboard/Keyboard$KeyboardAnimation;
 .super Landroid/view/animation/Animation;
+.source "Keyboard.kt"
 
 
 # annotations
@@ -49,7 +50,7 @@
 
 # virtual methods
 .method protected final applyTransformation(FLandroid/view/animation/Transformation;)V
-    .locals 3
+    .locals 2
 
     const-string v0, "t"
 
@@ -65,9 +66,7 @@
 
     iget v1, p0, Lcom/discord/utilities/keyboard/Keyboard$KeyboardAnimation;->heightTarget:I
 
-    iget v2, p0, Lcom/discord/utilities/keyboard/Keyboard$KeyboardAnimation;->heightInitial:I
-
-    sub-int/2addr v1, v2
+    sub-int/2addr v1, v0
 
     int-to-float v1, v1
 
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$Companion.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$Companion.smali
index 1693e348cd..4f38999867 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/keyboard/Keyboard$KeyboardMetrics$Companion;
 .super Ljava/lang/Object;
+.source "Keyboard.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali
index 8a3918093a..e64617711f 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1;
 .super Lkotlin/jvm/internal/k;
+.source "Keyboard.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7b550e5f6c..e173e9fac1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$2;
 .super Lkotlin/jvm/internal/k;
+.source "Keyboard.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$serialized$1.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$serialized$1.smali
index ec22afd15f..f435cdfa7a 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$serialized$1.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$serialized$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$serialized$1;
 .super Lkotlin/jvm/internal/k;
+.source "Keyboard.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali
index 8d79093ff2..063d068adf 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/keyboard/Keyboard$KeyboardMetrics;
 .super Ljava/lang/Object;
+.source "Keyboard.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$resizeRootViewWithDelay$1.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$resizeRootViewWithDelay$1.smali
index 0a1113549a..17f4b07d1e 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$resizeRootViewWithDelay$1.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$resizeRootViewWithDelay$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$resizeRootViewWithDelay$1;
 .super Ljava/lang/Object;
+.source "Keyboard.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -86,9 +87,7 @@
 
     iget-object p1, p0, Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$resizeRootViewWithDelay$1;->this$0:Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;
 
-    iget-object v0, p0, Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$resizeRootViewWithDelay$1;->this$0:Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;
-
-    invoke-virtual {v0}, Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;->getKeyboardOpenDelay()I
+    invoke-virtual {p1}, Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;->getKeyboardOpenDelay()I
 
     move-result v0
 
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 3f94a6209c..0dd8770b62 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;
 .super Ljava/lang/Object;
+.source "Keyboard.kt"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;
@@ -132,7 +133,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -254,7 +255,6 @@
 
     const/4 v1, 0x0
 
-    :goto_0
     invoke-direct {p0, v0, v1}, Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;->resizeRootView(IZ)V
 
     return-void
@@ -294,7 +294,9 @@
 
     const/4 v1, 0x1
 
-    goto :goto_0
+    invoke-direct {p0, v0, v1}, Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;->resizeRootView(IZ)V
+
+    return-void
 
     :cond_3
     iget v0, p0, Lcom/discord/utilities/keyboard/Keyboard$init$1$LayoutListener;->keyboardHeightCurrent:I
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1.smali
index ea72b752c1..e553ea0b06 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/keyboard/Keyboard$init$1;
 .super Lcom/discord/utilities/keyboard/Keyboard$ActivityLifecycleCallbacks;
+.source "Keyboard.kt"
 
 
 # annotations
@@ -110,6 +111,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/ViewTreeObserver;->removeOnGlobalLayoutListener(Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali
index 9128b4ca31..be30c49356 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/keyboard/Keyboard;
 .super Ljava/lang/Object;
+.source "Keyboard.kt"
 
 
 # annotations
@@ -232,7 +233,7 @@
 
     sget-object v0, Lcom/discord/utilities/keyboard/Keyboard;->isOpenedSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -323,6 +324,8 @@
 
     invoke-virtual {p1, p0, v0}, Landroid/view/inputmethod/InputMethodManager;->hideSoftInputFromWindow(Landroid/os/IBinder;I)Z
 
+    return-void
+
     :cond_3
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
index cd47bec77c..f05bf4e8f4 100644
--- a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
+++ b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/kryo/LeastRecentlyAddedSetSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "LeastRecentlyAddedSetSerializer.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
index 9a2ee8658d..e374707986 100644
--- a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
+++ b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/kryo/SnowflakePartitionMapSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "SnowflakePartitionMapSerializer.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
index d1db78edc6..802fab24bc 100644
--- a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;
 .super Ljava/lang/Object;
+.source "ChannelMemberList.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList;
@@ -182,7 +183,6 @@
 
     move-result-object v0
 
-    :goto_0
     check-cast v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
 
     goto :goto_1
@@ -217,7 +217,8 @@
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    :goto_0
+    check-cast v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
 
     :cond_2
     :goto_1
@@ -435,7 +436,7 @@
 
     if-gez v1, :cond_0
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_0
     check-cast v2, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
@@ -627,7 +628,7 @@
 
     if-gez v0, :cond_0
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_0
     check-cast v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
diff --git a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali
index c6369a15ab..f276b1355c 100644
--- a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState;
 .super Ljava/lang/Object;
+.source "GuildMemberRequestManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali
index 6bf84447c2..a844283419 100644
--- a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1;
 .super Lkotlin/jvm/internal/k;
+.source "GuildMemberRequestManager.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
index 536c2de2f4..f42cfd0f8f 100644
--- a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager;
 .super Ljava/lang/Object;
+.source "GuildMemberRequestManager.kt"
 
 
 # annotations
@@ -276,7 +277,7 @@
 
     if-gez v2, :cond_1
 
-    invoke-static {}, Lkotlin/a/l;->Fa()V
+    invoke-static {}, Lkotlin/a/l;->EZ()V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali
index dd1bfddedb..52daf06368 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager;
 .super Ljava/lang/Object;
+.source "GuildChannelSubscriptionsManager.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManagerKt.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManagerKt.smali
index d083ef4fff..4dadc10f75 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManagerKt.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManagerKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManagerKt;
 .super Ljava/lang/Object;
+.source "GuildChannelSubscriptionsManager.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali
index 06b626a03d..ef77818153 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1;
 .super Ljava/lang/Object;
+.source "GuildMemberSubscriptionsManager.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 8d896ef309..8a87ba7f37 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;
 .super Ljava/lang/Object;
+.source "GuildMemberSubscriptionsManager.kt"
 
 
 # instance fields
@@ -106,7 +107,7 @@
 
     if-eqz p3, :cond_0
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManagerKt.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManagerKt.smali
index 1c97d0f1de..59a7f802a5 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManagerKt.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManagerKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManagerKt;
 .super Ljava/lang/Object;
+.source "GuildMemberSubscriptionsManager.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali
index 22bd9747b5..ff5b61ccee 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2;
 .super Lkotlin/jvm/internal/k;
+.source "GuildSubscriptions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali
index 7fd8b1108b..15e6a73b43 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;
 .super Ljava/lang/Object;
+.source "GuildSubscriptions.kt"
 
 
 # static fields
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 322cf6fffe..9ef445753a 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1;
 .super Lkotlin/jvm/internal/i;
+.source "GuildSubscriptionsManager.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 2761680d67..245c0eb09a 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1;
 .super Lkotlin/jvm/internal/i;
+.source "GuildSubscriptionsManager.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali
index 374c5840f8..dac897cae1 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 .super Ljava/lang/Object;
+.source "GuildSubscriptionsManager.kt"
 
 
 # instance fields
@@ -438,6 +439,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized get(J)Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;
@@ -564,6 +567,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized remove(J)V
@@ -791,6 +796,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized subscribeActivities(J)V
diff --git a/com.discord/smali/com/discord/utilities/logging/Logger.smali b/com.discord/smali/com/discord/utilities/logging/Logger.smali
index 2059d81f0e..2c6e1a2e19 100644
--- a/com.discord/smali/com/discord/utilities/logging/Logger.smali
+++ b/com.discord/smali/com/discord/utilities/logging/Logger.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/logging/Logger;
 .super Ljava/lang/Object;
+.source "Logger.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$handleInitialState$1.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$handleInitialState$1.smali
index b6362114c4..11b0ee7f8f 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$handleInitialState$1.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$handleInitialState$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/media/AudioOutputMonitor$handleInitialState$1;
 .super Ljava/lang/Object;
+.source "AudioOutputMonitor.kt"
 
 # interfaces
 .implements Landroid/bluetooth/BluetoothProfile$ServiceListener;
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 b269f355b1..b056181402 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$1.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$1;
 .super Lkotlin/jvm/internal/i;
+.source "AudioOutputMonitor.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 2ba60f4ad4..cf5b4f8ddc 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$2.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$2;
 .super Lkotlin/jvm/internal/i;
+.source "AudioOutputMonitor.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4deaeddb86..de9d0e9832 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$3.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$3;
 .super Lkotlin/jvm/internal/i;
+.source "AudioOutputMonitor.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 12adbf19c6..75e74d4b9d 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$4.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$4;
 .super Lkotlin/jvm/internal/i;
+.source "AudioOutputMonitor.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
index 60e4ab5a37..23f67517e7 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/media/AudioOutputMonitor;
 .super Landroid/content/BroadcastReceiver;
+.source "AudioOutputMonitor.kt"
 
 
 # instance fields
@@ -628,7 +629,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/media/AudioOutputMonitor;->outputStateSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -642,7 +643,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_2
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
@@ -667,7 +668,12 @@
 
     invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_1
+    return-void
+
+    :cond_2
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
index 17e72a095f..ad5cefff99 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/media/AudioOutputState;
 .super Ljava/lang/Object;
+.source "AudioOutputMonitor.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$Companion.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$Companion.smali
index 16bd3a5726..99424572a4 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$Companion;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali
index f3f82ceb3b..73e677bc13 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali
index 01a8d66cfe..685d7a3401 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$InflightRequest;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali
index 7e3c164f46..00ff1641a8 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$cancel$1;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 5290aa34f9..2c287a72af 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doEdit$1;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6c92c4c941..bc2732efd2 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$2.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doEdit$2;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3824139417..c823b5c264 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$3.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doEdit$3;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali
index 2224ff4e1d..9b945321eb 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali
index a34052d979..ecbaa28c26 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$1.smali
index 11a24fa396..f75e81f792 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doSend$1;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali
index 3e3b074545..359a267945 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doSend$2;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -171,4 +172,6 @@
     invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .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 896d4c80ce..bc090bcb60 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$3.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doSend$3;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 2411686ed4..2e78ebbc38 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$4.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doSend$4;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4e8a3bf514..f18b61bb55 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$5.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doSend$5;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$isNonceEnabled$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$isNonceEnabled$1.smali
index 8a96cd817e..ad6550601d 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$isNonceEnabled$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$isNonceEnabled$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$doSend$isNonceEnabled$1;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$enqueue$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$enqueue$1.smali
index c9d94d4394..64ab6f6a58 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$enqueue$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$enqueue$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$enqueue$1;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1$1.smali
index 37edce0e17..ea9739b756 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1$1;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1.smali
index cb2df2ce6f..23bf777185 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$1;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2.smali
index 47251f71e3..061e95702b 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 71388b95cf..96031e36b0 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
index a3744ca3a1..5f0154a846 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 
 # annotations
@@ -347,7 +348,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v2
 
@@ -456,6 +457,8 @@
     :cond_0
     invoke-direct {v0, v1, v2}, Lcom/discord/utilities/messagesend/MessageResult$Slowmode;-><init>(J)V
 
+    check-cast v0, Lcom/discord/utilities/messagesend/MessageResult;
+
     goto :goto_0
 
     :cond_1
@@ -492,6 +495,8 @@
     :cond_2
     invoke-direct {v0, v1, v2}, Lcom/discord/utilities/messagesend/MessageResult$RateLimited;-><init>(J)V
 
+    check-cast v0, Lcom/discord/utilities/messagesend/MessageResult;
+
     goto :goto_0
 
     :cond_3
@@ -499,9 +504,9 @@
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;-><init>(Lcom/discord/utilities/error/Error;)V
 
-    :goto_0
     check-cast v0, Lcom/discord/utilities/messagesend/MessageResult;
 
+    :goto_0
     invoke-virtual {p2, v0}, Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;->complete(Lcom/discord/utilities/messagesend/MessageResult;)V
 
     return-void
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 61213c1674..0eb1790edd 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/messagesend/MessageRequest$Edit$1;
 .super Lkotlin/jvm/internal/k;
+.source "MessageQueue.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali
index 77a94119a2..b05bb0ae51 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageRequest$Edit;
 .super Lcom/discord/utilities/messagesend/MessageRequest;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
index d6ed9425f1..95e1da30f6 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageRequest$Send;
 .super Lcom/discord/utilities/messagesend/MessageRequest;
+.source "MessageQueue.kt"
 
 
 # annotations
@@ -104,7 +105,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     const-string v1, "message.nonce!!"
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest.smali
index e69cda9b90..a29f6320ff 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/messagesend/MessageRequest;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$RateLimited.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$RateLimited.smali
index 9152a981bb..28da68c000 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$RateLimited.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$RateLimited.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageResult$RateLimited;
 .super Lcom/discord/utilities/messagesend/MessageResult;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Slowmode.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Slowmode.smali
index 24511e1b38..6ac957baee 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Slowmode.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Slowmode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageResult$Slowmode;
 .super Lcom/discord/utilities/messagesend/MessageResult;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali
index 18a3597ebd..826477a0d9 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageResult$Success;
 .super Lcom/discord/utilities/messagesend/MessageResult;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali
index 5d961bf0bf..68ccc69252 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
 .super Lcom/discord/utilities/messagesend/MessageResult;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UserCancelled.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UserCancelled.smali
index 51021160d3..f37e326112 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UserCancelled.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UserCancelled.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/messagesend/MessageResult$UserCancelled;
 .super Lcom/discord/utilities/messagesend/MessageResult;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
index 544d01c25d..946a253c83 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/messagesend/MessageResult;
 .super Ljava/lang/Object;
+.source "MessageQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload.smali b/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload.smali
index 4f48a94f16..dc4f7baa23 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;
 .super Ljava/lang/Object;
+.source "CategoricalDragAndDropAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropAdapter$Payload;
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali
index 86d33377da..768e84e6a1 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter;
 .super Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;
+.source "CategoricalDragAndDropAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter$Payload.smali b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter$Payload.smali
index f134cffb92..74f10a00ca 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter$Payload.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter$Payload.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_recycler/DragAndDropAdapter$Payload;
 .super Ljava/lang/Object;
+.source "DragAndDropAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
index d50c209fbb..18608cc348 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "DragAndDropAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropHelper$Adapter;
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$Adapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$Adapter.smali
index b226ce978a..72d1044e9e 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$Adapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$Adapter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_recycler/DragAndDropHelper$Adapter;
 .super Ljava/lang/Object;
+.source "DragAndDropHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder.smali b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder.smali
index 76463e05c2..ce72cdcc68 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder;
 .super Ljava/lang/Object;
+.source "DragAndDropHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper.smali b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper.smali
index 466af5c7d0..2d4ea93532 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropHelper.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/mg_recycler/DragAndDropHelper;
 .super Landroidx/recyclerview/widget/ItemTouchHelper$Callback;
+.source "DragAndDropHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali
index fc47960b9a..e4fc14e95d 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 .super Ljava/lang/Object;
+.source "MGRecyclerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager$resetAdapter$1.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager$resetAdapter$1.smali
index 09fbef20f5..f7f2278231 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager$resetAdapter$1.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager$resetAdapter$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager$resetAdapter$1;
 .super Ljava/lang/Object;
+.source "MGRecyclerAdapter.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -53,6 +54,8 @@
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->invalidate()V
 
+    return-void
+
     :cond_1
     return-void
 .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 31a35fb7b4..c7fa855233 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager;
 .super Landroidx/recyclerview/widget/LinearLayoutManager;
+.source "MGRecyclerAdapter.kt"
 
 
 # annotations
@@ -172,7 +173,7 @@
     :try_start_0
     invoke-super {p0, p1, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
     :try_end_0
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
     return-void
@@ -185,4 +186,13 @@
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager;->resetAdapter(Ljava/lang/Throwable;)V
 
     return-void
+
+    :catch_1
+    move-exception p1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager;->resetAdapter(Ljava/lang/Throwable;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
index b8cbafea50..a7cde8a1a8 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "MGRecyclerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$Diff.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$Diff.smali
index 4032db9d6e..c2323c397e 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$Diff.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$Diff.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$Diff;
 .super Landroidx/recyclerview/widget/DiffUtil$Callback;
+.source "MGRecyclerAdapterSimple.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated.smali
index d192928e29..4eaf93d85c 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
 .super Ljava/lang/Object;
+.source "MGRecyclerAdapterSimple.java"
 
 
 # annotations
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 1121beb3b6..b1c4e32e58 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+.source "MGRecyclerAdapterSimple.java"
 
 
 # annotations
@@ -152,8 +153,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->onUpdated:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
-
     invoke-interface {p1, p2, p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;->onUpdated(Ljava/util/List;Ljava/util/List;)V
 
     :cond_1
@@ -265,11 +264,9 @@
 
     iget-object v0, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->data:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->data:Ljava/util/List;
+    sget-object v1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->EMPTY_DATA:Ljava/util/List;
 
-    sget-object v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->EMPTY_DATA:Ljava/util/List;
-
-    if-ne v1, v2, :cond_0
+    if-ne v0, v1, :cond_0
 
     const/4 v1, 0x0
 
@@ -290,7 +287,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -304,7 +301,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -374,8 +371,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->diffingSubscription:Lrx/Subscription;
-
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerDataPayload.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerDataPayload.smali
index aabd3360c4..5b105ce187 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerDataPayload.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerDataPayload.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
 .super Ljava/lang/Object;
+.source "MGRecyclerDataPayload.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnClickListener$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnClickListener$$inlined$forEach$lambda$1.smali
index 1c13b85c47..fb787abe84 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnClickListener$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnClickListener$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnClickListener$$inlined$forEach$lambda$1;
 .super Ljava/lang/Object;
+.source "MGRecyclerViewHolder.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnLongClickListener$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnLongClickListener$$inlined$forEach$lambda$1.smali
index b5ad755509..77bc664a27 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnLongClickListener$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnLongClickListener$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnLongClickListener$$inlined$forEach$lambda$1;
 .super Ljava/lang/Object;
+.source "MGRecyclerViewHolder.kt"
 
 # interfaces
 .implements Landroid/view/View$OnLongClickListener;
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali
index de1df1df57..28d53339e5 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "MGRecyclerViewHolder.kt"
 
 
 # annotations
@@ -188,9 +189,9 @@
 
     array-length v0, p2
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -204,21 +205,21 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    new-array p2, v2, [Landroid/view/View;
+    new-array p2, v1, [Landroid/view/View;
 
     iget-object v0, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->itemView:Landroid/view/View;
 
-    aput-object v0, p2, v1
+    aput-object v0, p2, v2
 
     :cond_1
     array-length v0, p2
 
     :goto_1
-    if-ge v1, v0, :cond_3
+    if-ge v2, v0, :cond_3
 
-    aget-object v2, p2, v1
+    aget-object v1, p2, v2
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     new-instance v3, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnClickListener$$inlined$forEach$lambda$1;
 
@@ -226,10 +227,10 @@
 
     check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_2
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
 
@@ -261,9 +262,9 @@
 
     array-length v0, p2
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -277,21 +278,21 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    new-array p2, v2, [Landroid/view/View;
+    new-array p2, v1, [Landroid/view/View;
 
     iget-object v0, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->itemView:Landroid/view/View;
 
-    aput-object v0, p2, v1
+    aput-object v0, p2, v2
 
     :cond_1
     array-length v0, p2
 
     :goto_1
-    if-ge v1, v0, :cond_3
+    if-ge v2, v0, :cond_3
 
-    aget-object v2, p2, v1
+    aget-object v1, p2, v2
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     new-instance v3, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder$setOnLongClickListener$$inlined$forEach$lambda$1;
 
@@ -299,10 +300,10 @@
 
     check-cast v3, Landroid/view/View$OnLongClickListener;
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
+    invoke-virtual {v1, v3}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
     :cond_2
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
 
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/SingleTypePayload.smali b/com.discord/smali/com/discord/utilities/mg_recycler/SingleTypePayload.smali
index 2910474054..2990da2430 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/SingleTypePayload.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/SingleTypePayload.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/mg_recycler/SingleTypePayload;
 .super Ljava/lang/Object;
+.source "SingleTypePayload.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged.smali b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged.smali
index 11392a7d29..fe890db61f 100644
--- a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged.smali
+++ b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
 .super Ljava/lang/Object;
+.source "LambdaTextWatcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnBeforeChanged.smali b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnBeforeChanged.smali
index a80538ac19..f1a062fa95 100644
--- a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnBeforeChanged.smali
+++ b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnBeforeChanged.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnBeforeChanged;
 .super Ljava/lang/Object;
+.source "LambdaTextWatcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnChanged.smali b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnChanged.smali
index ee62c6310a..58cc5ff945 100644
--- a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnChanged.smali
+++ b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher$OnChanged.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnChanged;
 .super Ljava/lang/Object;
+.source "LambdaTextWatcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher.smali b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher.smali
index 81536ba6b5..d9a662d3a2 100644
--- a/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher.smali
+++ b/com.discord/smali/com/discord/utilities/mg_views/LambdaTextWatcher.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/mg_views/LambdaTextWatcher;
 .super Ljava/lang/Object;
+.source "LambdaTextWatcher.java"
 
 # interfaces
 .implements Landroid/text/TextWatcher;
@@ -87,8 +88,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/mg_views/LambdaTextWatcher;->onAfterChanged:Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
-
     invoke-interface {v0, p1}, Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;->afterTextChanged(Landroid/text/Editable;)V
 
     :cond_0
@@ -102,8 +101,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/mg_views/LambdaTextWatcher;->onBeforeChanged:Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnBeforeChanged;
-
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnBeforeChanged;->beforeTextChanged(Ljava/lang/CharSequence;III)V
 
     :cond_0
@@ -117,8 +114,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/mg_views/LambdaTextWatcher;->onChanged:Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnChanged;
-
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnChanged;->onTextChanged(Ljava/lang/CharSequence;III)V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/utilities/networking/Backoff$Scheduler.smali b/com.discord/smali/com/discord/utilities/networking/Backoff$Scheduler.smali
index bc3c73f402..a49b8c26fb 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff$Scheduler.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff$Scheduler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/networking/Backoff$Scheduler;
 .super Ljava/lang/Object;
+.source "Backoff.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.smali b/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.smali
index e7c253ebd4..f582a5fa38 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/networking/Backoff$TimerScheduler$schedule$1;
 .super Ljava/util/TimerTask;
+.source "Backoff.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali b/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali
index a5a8434b96..97134b1524 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/networking/Backoff$TimerScheduler;
 .super Ljava/util/Timer;
+.source "Backoff.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/networking/Backoff$Scheduler;
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 89000eaf09..d0988373ff 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff$fail$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff$fail$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/networking/Backoff$fail$1;
 .super Lkotlin/jvm/internal/k;
+.source "Backoff.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/networking/Backoff.smali b/com.discord/smali/com/discord/utilities/networking/Backoff.smali
index e5d732ebac..f55a9cba89 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/networking/Backoff;
 .super Ljava/lang/Object;
+.source "Backoff.kt"
 
 
 # annotations
@@ -85,83 +86,83 @@
 .method public synthetic constructor <init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 7
 
-    and-int/lit8 v1, p8, 0x1
+    and-int/lit8 v0, p8, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const-wide/16 v1, 0x1f4
+    const-wide/16 v0, 0x1f4
 
     goto :goto_0
 
     :cond_0
-    move-wide v1, p1
+    move-wide v0, p1
 
     :goto_0
-    and-int/lit8 v3, p8, 0x2
+    and-int/lit8 v2, p8, 0x2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    const-wide/16 v3, 0xa
+    const-wide/16 v2, 0xa
 
-    mul-long v3, v3, v1
+    mul-long v2, v2, v0
 
     goto :goto_1
 
     :cond_1
-    move-wide v3, p3
+    move-wide v2, p3
 
     :goto_1
-    and-int/lit8 v5, p8, 0x4
+    and-int/lit8 v4, p8, 0x4
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
-    const v5, 0x7fffffff
+    const v4, 0x7fffffff
 
     goto :goto_2
 
     :cond_2
-    move v5, p5
+    move v4, p5
 
     :goto_2
-    and-int/lit8 v6, p8, 0x8
+    and-int/lit8 v5, p8, 0x8
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
     goto :goto_3
 
     :cond_3
-    move v6, p6
+    move v5, p6
 
     :goto_3
-    and-int/lit8 v0, p8, 0x10
+    and-int/lit8 v6, p8, 0x10
 
-    if-eqz v0, :cond_4
+    if-eqz v6, :cond_4
 
-    new-instance v0, Lcom/discord/utilities/networking/Backoff$TimerScheduler;
+    new-instance v6, Lcom/discord/utilities/networking/Backoff$TimerScheduler;
 
-    invoke-direct {v0}, Lcom/discord/utilities/networking/Backoff$TimerScheduler;-><init>()V
+    invoke-direct {v6}, Lcom/discord/utilities/networking/Backoff$TimerScheduler;-><init>()V
 
-    check-cast v0, Lcom/discord/utilities/networking/Backoff$Scheduler;
+    check-cast v6, Lcom/discord/utilities/networking/Backoff$Scheduler;
 
     goto :goto_4
 
     :cond_4
-    move-object v0, p7
+    move-object v6, p7
 
     :goto_4
     move-object p1, p0
 
-    move-wide p2, v1
+    move-wide p2, v0
 
-    move-wide p4, v3
+    move-wide p4, v2
 
-    move p6, v5
+    move p6, v4
 
-    move p7, v6
+    move p7, v5
 
-    move-object p8, v0
+    move-object p8, v6
 
     invoke-direct/range {p1 .. p8}, Lcom/discord/utilities/networking/Backoff;-><init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;)V
 
@@ -327,8 +328,6 @@
     :try_start_1
     iget-wide v4, p0, Lcom/discord/utilities/networking/Backoff;->current:J
 
-    const/4 v0, 0x0
-
     add-long/2addr v4, v2
 
     iget-wide v2, p0, Lcom/discord/utilities/networking/Backoff;->maxBackoffMs:J
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1.smali
index 25da8349a0..b590828104 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1.smali
index b9c6b0f6a0..cac8e3348d 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI20AndDown$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI20AndDown$1.smali
index b813fe67cf..816fe654ef 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI20AndDown$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI20AndDown$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI20AndDown$1;
 .super Landroid/content/BroadcastReceiver;
+.source "NetworkMonitor.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI21AndUp$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI21AndUp$1.smali
index 6d29a16ae1..16fcdb31e4 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI21AndUp$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI21AndUp$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitorForAPI21AndUp$1;
 .super Landroid/net/ConnectivityManager$NetworkCallback;
+.source "NetworkMonitor.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
index 4b69a38b05..f5e0a65e57 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/networking/NetworkMonitor;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.kt"
 
 
 # instance fields
@@ -159,7 +160,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->isConnectedSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -185,7 +186,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -205,7 +206,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitorKt.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitorKt.smali
index 0efb671188..5a0da060a2 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitorKt.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitorKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/networking/NetworkMonitorKt;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/nitro/NitroUtils.smali b/com.discord/smali/com/discord/utilities/nitro/NitroUtils.smali
index 051fdd786a..557abca82f 100644
--- a/com.discord/smali/com/discord/utilities/nitro/NitroUtils.smali
+++ b/com.discord/smali/com/discord/utilities/nitro/NitroUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/nitro/NitroUtils;
 .super Ljava/lang/Object;
+.source "NitroUtils.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali
index beb3a05b75..4493fdc0f5 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
 .super Ljava/lang/Object;
+.source "NoticeBuilders.kt"
 
 
 # annotations
@@ -87,65 +88,65 @@
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 10
+    .locals 9
 
-    and-int/lit8 v1, p7, 0x4
+    and-int/lit8 v0, p7, 0x4
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v6, v2
+    move-object v5, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v6, p3
+    move-object v5, p3
 
     :goto_0
-    and-int/lit8 v1, p7, 0x8
+    and-int/lit8 v0, p7, 0x8
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v7, v2
+    move-object v6, v1
 
     goto :goto_1
 
     :cond_1
-    move-object v7, p4
+    move-object v6, p4
 
     :goto_1
-    and-int/lit8 v1, p7, 0x10
+    and-int/lit8 v0, p7, 0x10
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_2
 
     :cond_2
-    move-object v8, p5
+    move-object v7, p5
 
     :goto_2
     and-int/lit8 v0, p7, 0x20
 
     if-eqz v0, :cond_3
 
-    move-object v9, v2
+    move-object v8, v1
 
     goto :goto_3
 
     :cond_3
-    move-object/from16 v9, p6
+    move-object v8, p6
 
     :goto_3
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object v4, p1
+    move-object v3, p1
 
-    move-object v5, p2
+    move-object v4, p2
 
-    invoke-direct/range {v3 .. v9}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;)V
+    invoke-direct/range {v2 .. v8}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;)V
 
     return-void
 .end method
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 8a2b3055d4..282ddb4bb4 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;
 .super Lkotlin/jvm/internal/k;
+.source "NoticeBuilders.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali
index 38528de4d4..dfec29c4e6 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1;
 .super Lkotlin/jvm/internal/i;
+.source "NoticeBuilders.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali
index bc3d2b55e4..8d2ac87547 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2;
 .super Lkotlin/jvm/internal/i;
+.source "NoticeBuilders.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 89c8f537b1..b9bbd9ba40 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1;
 .super Lkotlin/jvm/internal/k;
+.source "NoticeBuilders.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 dbd0ddc5da..06d70d99bf 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2;
 .super Lkotlin/jvm/internal/k;
+.source "NoticeBuilders.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
index 2a185d4316..67a4b808d0 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/notices/NoticeBuilders;
 .super Ljava/lang/Object;
+.source "NoticeBuilders.kt"
 
 
 # annotations
@@ -397,6 +398,8 @@
 
     invoke-static/range {v3 .. v15}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali b/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali
index 10d5f33c92..5dbd211af0 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/permissions/ManageMessageContext$Companion;
 .super Ljava/lang/Object;
+.source "PermissionsContexts.kt"
 
 
 # annotations
@@ -43,9 +44,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -156,9 +157,12 @@
 
     if-eqz v0, :cond_9
 
-    const/4 v1, 0x1
+    goto :goto_8
 
     :cond_9
+    const/4 v1, 0x0
+
+    :goto_8
     new-instance p3, Lcom/discord/utilities/permissions/ManageMessageContext;
 
     invoke-direct {p3, v3, p1, p2, v1}, Lcom/discord/utilities/permissions/ManageMessageContext;-><init>(ZZZZ)V
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext.smali b/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext.smali
index 80379d59d7..94ad3e11f3 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/permissions/ManageMessageContext;
 .super Ljava/lang/Object;
+.source "PermissionsContexts.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali b/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali
index 62813641a7..5e17cc76cf 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/permissions/ManageUserContext$Companion;
 .super Ljava/lang/Object;
+.source "PermissionsContexts.kt"
 
 
 # annotations
@@ -102,9 +103,9 @@
 
     move-result-wide v9
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/4 v11, 0x1
+    const/4 v11, 0x0
 
     cmp-long v12, v9, v7
 
@@ -345,9 +346,9 @@
     const/16 v19, 0x1
 
     :goto_10
-    if-eqz v12, :cond_15
+    if-eqz v12, :cond_16
 
-    if-nez v5, :cond_14
+    if-nez v5, :cond_15
 
     const/high16 v0, 0x4000000
 
@@ -355,18 +356,25 @@
 
     move-result v0
 
-    if-eqz v0, :cond_16
+    if-eqz v0, :cond_14
+
+    goto :goto_11
 
     :cond_14
+    const/16 v20, 0x0
+
+    goto :goto_12
+
+    :cond_15
     :goto_11
     const/16 v20, 0x1
 
     goto :goto_12
 
-    :cond_15
-    if-eqz v0, :cond_16
+    :cond_16
+    if-eqz v0, :cond_18
 
-    if-nez v5, :cond_14
+    if-nez v5, :cond_17
 
     const/high16 v0, 0x8000000
 
@@ -374,23 +382,26 @@
 
     move-result v0
 
-    if-eqz v0, :cond_16
+    if-eqz v0, :cond_18
 
-    goto :goto_11
+    :cond_17
+    const/16 v20, 0x1
 
-    :cond_16
+    goto :goto_12
+
+    :cond_18
     const/16 v20, 0x0
 
     :goto_12
-    if-nez v12, :cond_17
+    if-nez v12, :cond_19
 
-    if-eqz v9, :cond_17
+    if-eqz v9, :cond_19
 
     const/16 v21, 0x1
 
     goto :goto_13
 
-    :cond_17
+    :cond_19
     const/16 v21, 0x0
 
     :goto_13
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageUserContext.smali b/com.discord/smali/com/discord/utilities/permissions/ManageUserContext.smali
index c1187bf229..09787f0ddb 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageUserContext.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageUserContext.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/permissions/ManageUserContext;
 .super Ljava/lang/Object;
+.source "PermissionsContexts.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/permissions/PermissionUtils.smali b/com.discord/smali/com/discord/utilities/permissions/PermissionUtils.smali
index 68fc48a846..7222003a6a 100644
--- a/com.discord/smali/com/discord/utilities/permissions/PermissionUtils.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/PermissionUtils.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/permissions/PermissionUtils;
 .super Ljava/lang/Object;
+.source "PermissionUtils.java"
 
 
 # direct methods
@@ -772,17 +773,14 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    :goto_0
-    move-object v7, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v7, v0
 
-    :goto_1
     move-wide v1, p0
 
     move-wide v3, p2
@@ -983,6 +981,8 @@
 
     const/4 p0, 0x1
 
+    return p0
+
     :cond_0
     return p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali
index 5bf5a65bbb..5434ee10b6 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Companion$init$1;
 .super Ljava/lang/Object;
+.source "Persister.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 ae2358e782..612f9aee14 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$2.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Companion$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "Persister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 df27b3e065..23952e2316 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryoConfig$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryoConfig$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Companion$kryoConfig$1;
 .super Lkotlin/jvm/internal/k;
+.source "Persister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryos$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryos$1.smali
index ec6cdbd37a..725a2d81bd 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryos$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryos$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/persister/Persister$Companion$kryos$1;
 .super Ljava/lang/ThreadLocal;
+.source "Persister.kt"
 
 
 # annotations
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 44acb6ffb7..34cadecfb1 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$logger$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$logger$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Companion$logger$1;
 .super Lkotlin/jvm/internal/k;
+.source "Persister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
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 49fe1516c1..5ecb68b0f0 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$persistAll$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$persistAll$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Companion$persistAll$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "Persister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -78,7 +79,7 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     new-instance v0, Lcom/discord/app/AppLog$Elapsed;
 
@@ -144,4 +145,7 @@
 
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .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 a7e64d0a39..c9a8da0232 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/persister/Persister$Companion;
 .super Ljava/lang/Object;
+.source "Persister.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali
index 2cab9510e3..478c26c5cc 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Preloader$1;
 .super Ljava/lang/Object;
+.source "Persister.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 9c632cd928..dc0f01ee12 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$2.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Preloader$2;
 .super Lkotlin/jvm/internal/k;
+.source "Persister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali
index 0a5d51ba0a..13ba981419 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Preloader$isPreloaded$1;
 .super Ljava/lang/Object;
+.source "Persister.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 4677575696..3290169447 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$Preloader;
 .super Ljava/lang/Object;
+.source "Persister.kt"
 
 
 # annotations
@@ -53,7 +54,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -274,7 +275,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali
index fcad1fbd31..9f736de496 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$getObservable$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "Persister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8289ae1b2c..33161d0625 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/Persister$getObservable$1;
 .super Lkotlin/jvm/internal/k;
+.source "Persister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -66,7 +67,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()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 ddf7401489..b0dbe185f4 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/persister/Persister;
 .super Ljava/lang/Object;
+.source "Persister.kt"
 
 
 # annotations
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 2d889f7738..58e8c280e9 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/PersisterConfig$init$1;
 .super Lkotlin/jvm/internal/k;
+.source "PersisterConfig.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$2.smali b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$2.smali
index 9f069a74a9..348208dde4 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$2.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/PersisterConfig$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "PersisterConfig.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
@@ -151,10 +152,10 @@
 
     invoke-virtual {p1, p2, p3}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x4
diff --git a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali
index 15a3070882..e11fe4fbec 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/persister/PersisterConfig$persistenceStrategy$1;
 .super Ljava/lang/Object;
+.source "PersisterConfig.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali b/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
index e82e279bdd..441e13b861 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/persister/PersisterConfig;
 .super Ljava/lang/Object;
+.source "PersisterConfig.kt"
 
 
 # static fields
@@ -42,7 +43,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KG()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali b/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali
index 3472bcdbce..bb6fd05ae7 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/platform/Platform$Companion;
 .super Ljava/lang/Object;
+.source "Platform.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index e2147eab5d..89468b2f39 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/platform/Platform;
 .super Ljava/lang/Enum;
+.source "Platform.kt"
 
 
 # annotations
@@ -622,103 +623,103 @@
 .end method
 
 .method synthetic constructor <init>(Ljava/lang/String;ILjava/lang/String;IIIZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 12
+    .locals 11
 
-    and-int/lit8 v1, p10, 0x1
+    and-int/lit8 v0, p10, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const-string v1, ""
+    const-string v0, ""
 
-    move-object v5, v1
+    move-object v4, v0
 
     goto :goto_0
 
     :cond_0
-    move-object v5, p3
+    move-object v4, p3
 
     :goto_0
-    and-int/lit8 v1, p10, 0x2
+    and-int/lit8 v0, p10, 0x2
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     goto :goto_1
 
     :cond_1
-    move/from16 v6, p4
+    move v5, p4
 
     :goto_1
-    and-int/lit8 v1, p10, 0x4
+    and-int/lit8 v0, p10, 0x4
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     goto :goto_2
 
     :cond_2
-    move/from16 v7, p5
+    move/from16 v6, p5
 
     :goto_2
-    and-int/lit8 v1, p10, 0x8
+    and-int/lit8 v0, p10, 0x8
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
     goto :goto_3
 
     :cond_3
-    move/from16 v8, p6
+    move/from16 v7, p6
 
     :goto_3
-    and-int/lit8 v1, p10, 0x10
+    and-int/lit8 v0, p10, 0x10
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     goto :goto_4
 
     :cond_4
-    move/from16 v9, p7
+    move/from16 v8, p7
 
     :goto_4
-    and-int/lit8 v1, p10, 0x20
+    and-int/lit8 v0, p10, 0x20
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
     goto :goto_5
 
     :cond_5
-    move/from16 v10, p8
+    move/from16 v9, p8
 
     :goto_5
     and-int/lit8 v0, p10, 0x40
 
     if-eqz v0, :cond_6
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
     goto :goto_6
 
     :cond_6
-    move/from16 v11, p9
+    move/from16 v10, p9
 
     :goto_6
-    move-object v2, p0
+    move-object v1, p0
 
-    move-object v3, p1
+    move-object v2, p1
 
-    move v4, p2
+    move v3, p2
 
-    invoke-direct/range {v2 .. v11}, Lcom/discord/utilities/platform/Platform;-><init>(Ljava/lang/String;ILjava/lang/String;IIIZZZ)V
+    invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/platform/Platform;-><init>(Ljava/lang/String;ILjava/lang/String;IIIZZZ)V
 
     return-void
 .end method
@@ -853,12 +854,10 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    :goto_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
 
     move-result-object p1
 
-    :goto_1
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -874,7 +873,17 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_2
     new-instance v0, Ljava/lang/StringBuilder;
@@ -883,7 +892,17 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_3
     new-instance v0, Ljava/lang/StringBuilder;
@@ -892,12 +911,17 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    :goto_2
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_1
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_4
     new-instance v0, Ljava/lang/StringBuilder;
@@ -906,7 +930,17 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_2
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_5
     new-instance v0, Ljava/lang/StringBuilder;
@@ -915,7 +949,17 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_2
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_6
     new-instance v0, Ljava/lang/StringBuilder;
@@ -924,7 +968,17 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_2
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali
index d8f5fcc47f..c1f33fabd0 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/presence/PresenceUtils$getActivity$1;
 .super Lkotlin/jvm/internal/k;
+.source "PresenceUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -90,7 +91,6 @@
     :pswitch_0
     const p2, 0x7f120f9f
 
-    :goto_0
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
@@ -100,17 +100,29 @@
     :pswitch_1
     const p2, 0x7f120941
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_2
     const p2, 0x7f120d96
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_3
     const p2, 0x7f120b47
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index 945d640e88..62dad2540a 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/presence/PresenceUtils;
 .super Ljava/lang/Object;
+.source "PresenceUtils.kt"
 
 
 # static fields
@@ -50,14 +51,13 @@
 
     packed-switch v0, :pswitch_data_0
 
-    :pswitch_0
     invoke-virtual {p0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p0
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_1
+    :pswitch_0
     const v0, 0x7f120edd
 
     new-array v1, v3, [Ljava/lang/Object;
@@ -68,9 +68,13 @@
 
     aput-object p1, v1, v2
 
+    invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
     goto :goto_0
 
-    :pswitch_2
+    :pswitch_1
     const v0, 0x7f120ed9
 
     new-array v1, v3, [Ljava/lang/Object;
@@ -81,9 +85,13 @@
 
     aput-object p1, v1, v2
 
+    invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
     goto :goto_0
 
-    :pswitch_3
+    :pswitch_2
     const v0, 0x7f120eda
 
     new-array v1, v3, [Ljava/lang/Object;
@@ -94,12 +102,18 @@
 
     aput-object p1, v1, v2
 
-    :goto_0
     invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
 
-    :goto_1
+    goto :goto_0
+
+    :pswitch_3
+    invoke-virtual {p0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    :goto_0
     const-string p1, "activityHeader"
 
     invoke-static {p0, p1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
@@ -112,12 +126,14 @@
 
     return-object p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
-        :pswitch_0
         :pswitch_3
         :pswitch_2
         :pswitch_1
+        :pswitch_0
     .end packed-switch
 .end method
 
@@ -131,7 +147,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v1
 
@@ -267,7 +283,7 @@
 .method private final setActivity(Lcom/discord/models/domain/ModelPresence;Landroid/widget/TextView;)V
     .locals 3
 
-    if-eqz p2, :cond_0
+    if-eqz p2, :cond_1
 
     sget-object v0, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
 
@@ -293,8 +309,13 @@
 
     invoke-static {p2, p1, v0, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
 
+    return-void
+
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
 
 .method public static final setPresence(Lcom/discord/models/domain/ModelPresence;Landroid/widget/ImageView;)V
@@ -316,28 +337,34 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v0, 0x0
-
     if-eqz p0, :cond_0
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
     move-object v0, p2
 
-    :goto_1
+    :goto_0
     sget-object v1, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
 
     invoke-direct {v1, p0, p1, v0}, Lcom/discord/utilities/presence/PresenceUtils;->setStatus(Lcom/discord/models/domain/ModelPresence;Landroid/widget/ImageView;Landroid/widget/TextView;)V
@@ -390,6 +417,8 @@
 
     invoke-virtual {p3, p1}, Landroid/widget/TextView;->setText(I)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -424,7 +453,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object p2
 
@@ -433,7 +462,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v2, "presence?.activity ?: return null"
+    const-string v2, "presence?.primaryActivity ?: return null"
 
     invoke-static {p2, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1$1.smali b/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1$1.smali
index 6969055d62..74cd3cf86e 100644
--- a/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/press/InteractionTimer$get$1$1;
 .super Ljava/lang/Object;
+.source "InteractionTimer.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1.smali b/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1.smali
index 2d16ae126e..f4caf298ae 100644
--- a/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1.smali
+++ b/com.discord/smali/com/discord/utilities/press/InteractionTimer$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/press/InteractionTimer$get$1;
 .super Ljava/lang/Object;
+.source "InteractionTimer.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/press/InteractionTimer.smali b/com.discord/smali/com/discord/utilities/press/InteractionTimer.smali
index c592781939..bfef8b1c1c 100644
--- a/com.discord/smali/com/discord/utilities/press/InteractionTimer.smali
+++ b/com.discord/smali/com/discord/utilities/press/InteractionTimer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/press/InteractionTimer;
 .super Ljava/lang/Object;
+.source "InteractionTimer.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/press/OnPressListener$1.smali b/com.discord/smali/com/discord/utilities/press/OnPressListener$1.smali
index 3254b42871..2a406d8899 100644
--- a/com.discord/smali/com/discord/utilities/press/OnPressListener$1.smali
+++ b/com.discord/smali/com/discord/utilities/press/OnPressListener$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/press/OnPressListener$1;
 .super Ljava/lang/Object;
+.source "OnPressListener.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/press/OnPressListener$OnPress;
diff --git a/com.discord/smali/com/discord/utilities/press/OnPressListener$OnPress.smali b/com.discord/smali/com/discord/utilities/press/OnPressListener$OnPress.smali
index 2eb6cd5662..c7c6781771 100644
--- a/com.discord/smali/com/discord/utilities/press/OnPressListener$OnPress.smali
+++ b/com.discord/smali/com/discord/utilities/press/OnPressListener$OnPress.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/press/OnPressListener$OnPress;
 .super Ljava/lang/Object;
+.source "OnPressListener.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/press/OnPressListener.smali b/com.discord/smali/com/discord/utilities/press/OnPressListener.smali
index ea087ac486..966f749441 100644
--- a/com.discord/smali/com/discord/utilities/press/OnPressListener.smali
+++ b/com.discord/smali/com/discord/utilities/press/OnPressListener.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/press/OnPressListener;
 .super Ljava/lang/Object;
+.source "OnPressListener.kt"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
diff --git a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali
index abf4eefdf4..ff7ea4dcc3 100644
--- a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali
+++ b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/press/RepeatingOnTouchListener$subscribe$1;
 .super Ljava/lang/Object;
+.source "RepeatingOnTouchListener.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$2.smali b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$2.smali
index ffbbeb9ea8..565f4054ac 100644
--- a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$2.smali
+++ b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/press/RepeatingOnTouchListener$subscribe$2;
 .super Ljava/lang/Object;
+.source "RepeatingOnTouchListener.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$3.smali b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$3.smali
index 5ab9ca77a3..b4fb1348a9 100644
--- a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$3.smali
+++ b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/press/RepeatingOnTouchListener$subscribe$3;
 .super Ljava/lang/Object;
+.source "RepeatingOnTouchListener.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
index 2f6d4a98bb..e7f1ad393f 100644
--- a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
+++ b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/press/RepeatingOnTouchListener;
 .super Ljava/lang/Object;
+.source "RepeatingOnTouchListener.kt"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
@@ -125,7 +126,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()Lrx/Scheduler;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver$Companion.smali b/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver$Companion.smali
index 210fc4aafe..e629889e88 100644
--- a/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/receiver/CampaignReceiver$Companion;
 .super Ljava/lang/Object;
+.source "CampaignReceiver.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver.smali b/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver.smali
index 6ce9bb1f87..d7cc0ab47f 100644
--- a/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/receiver/CampaignReceiver.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/receiver/CampaignReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "CampaignReceiver.kt"
 
 
 # annotations
@@ -372,6 +373,8 @@
 
     invoke-virtual {p2, p1, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils;->updateSuperProperties(Landroid/content/Context;Ljava/util/Map;)V
 
+    return-void
+
     :cond_7
     return-void
 .end method
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 f5f4abfd24..d27182ef7b 100644
--- a/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/receiver/spotify/SpotifyMetadataReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "SpotifyMetadataReceiver.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyPlayingStateReceiver.smali b/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyPlayingStateReceiver.smali
index 66369382aa..b97883d553 100644
--- a/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyPlayingStateReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyPlayingStateReceiver.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/receiver/spotify/SpotifyPlayingStateReceiver;
 .super Landroid/content/BroadcastReceiver;
+.source "SpotifyPlayingStateReceiver.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
index 21d767eeca..376577c90a 100644
--- a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
+++ b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/AttachmentRequestBody;
 .super Lokhttp3/RequestBody;
+.source "AttachmentRequestBody.kt"
 
 
 # instance fields
@@ -153,14 +154,12 @@
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v3
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    move-wide v3, v5
-
     :catch_0
     :cond_1
     invoke-static {v0, v1}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali
index 775fbdfaf9..262c5ed9c3 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1;
 .super Lkotlin/jvm/internal/k;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali
index d29047e353..584ef931f7 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1;
 .super Lkotlin/jvm/internal/k;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali
index 47ee87ab6b..346e7dadf0 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1;
 .super Lkotlin/jvm/internal/k;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali
index 92bafd04ba..cc26c7bffe 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1;
 .super Lkotlin/jvm/internal/k;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 2de1be2280..3c021835f9 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
@@ -166,7 +167,7 @@
 .method public final getUserAgent()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "Discord-Android/830"
+    const-string v0, "Discord-Android/831"
 
     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 63a2d4a0e8..3f53a93b9e 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$1;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -46,11 +47,11 @@
 .method public final intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
     .locals 3
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -64,7 +65,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->HG()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 b8444ec3aa..1fc304bf20 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$Companion$buildLoggingInterceptor$1;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lokhttp3/a/a$b;
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 26f8794cae..5ce488766e 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$Companion;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 
 # annotations
@@ -83,7 +84,7 @@
 
     invoke-direct {v0, v1}, Lokhttp3/a/a;-><init>(Lokhttp3/a/a$b;)V
 
-    sget v1, Lokhttp3/a/a$a;->cgv:I
+    sget v1, Lokhttp3/a/a$a;->cfP:I
 
     invoke-virtual {v0, v1}, Lokhttp3/a/a;->fq(I)Lokhttp3/a/a;
 
@@ -183,93 +184,93 @@
 
     invoke-direct {v2, v3}, Lcom/discord/restapi/BreadcrumbInterceptor;-><init>(Lcom/discord/utilities/logging/Logger;)V
 
-    move-object/from16 v4, p0
+    move-object/from16 v3, p0
 
-    check-cast v4, Lcom/discord/utilities/rest/RestAPI$Companion;
+    check-cast v3, Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v4}, Lcom/discord/utilities/rest/RestAPI$Companion;->buildAnalyticsInterceptor()Lokhttp3/Interceptor;
+    invoke-virtual {v3}, Lcom/discord/utilities/rest/RestAPI$Companion;->buildAnalyticsInterceptor()Lokhttp3/Interceptor;
+
+    move-result-object v4
+
+    invoke-virtual {v3}, Lcom/discord/utilities/rest/RestAPI$Companion;->buildLoggingInterceptor()Lokhttp3/Interceptor;
 
     move-result-object v5
 
-    invoke-virtual {v4}, Lcom/discord/utilities/rest/RestAPI$Companion;->buildLoggingInterceptor()Lokhttp3/Interceptor;
+    const/4 v6, 0x4
 
-    move-result-object v6
-
-    const/4 v7, 0x4
-
-    new-array v7, v7, [Lokhttp3/Interceptor;
+    new-array v6, v6, [Lokhttp3/Interceptor;
 
     check-cast v1, Lokhttp3/Interceptor;
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    aput-object v1, v7, v8
+    aput-object v1, v6, v7
 
     const/4 v1, 0x1
 
-    aput-object v5, v7, v1
+    aput-object v4, v6, v1
 
-    invoke-virtual {v4}, Lcom/discord/utilities/rest/RestAPI$Companion;->buildLoggingInterceptor()Lokhttp3/Interceptor;
+    invoke-virtual {v3}, Lcom/discord/utilities/rest/RestAPI$Companion;->buildLoggingInterceptor()Lokhttp3/Interceptor;
 
-    move-result-object v5
+    move-result-object v4
 
-    const/4 v9, 0x2
+    const/4 v8, 0x2
 
-    aput-object v5, v7, v9
+    aput-object v4, v6, v8
 
     check-cast v2, Lokhttp3/Interceptor;
 
-    const/4 v5, 0x3
+    const/4 v4, 0x3
 
-    aput-object v2, v7, v5
+    aput-object v2, v6, v4
 
-    invoke-static {v7}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v6}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v4
 
-    new-array v7, v9, [Lokhttp3/Interceptor;
+    new-array v6, v8, [Lokhttp3/Interceptor;
 
-    aput-object v6, v7, v8
+    aput-object v5, v6, v7
 
-    aput-object v2, v7, v1
+    aput-object v2, v6, v1
 
-    invoke-static {v7}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v6}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v2
 
-    new-instance v7, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;
+    new-instance v6, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;
 
-    new-instance v10, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
+    new-instance v9, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
 
-    invoke-direct {v10}, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;-><init>()V
+    invoke-direct {v9}, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;-><init>()V
 
-    check-cast v10, Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    check-cast v9, Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    new-instance v11, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;
+    new-instance v10, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;
 
-    invoke-direct {v11, v0}, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;-><init>(Landroid/content/Context;)V
+    invoke-direct {v10, v0}, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;-><init>(Landroid/content/Context;)V
 
-    check-cast v11, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    check-cast v10, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
-    invoke-direct {v7, v10, v11}, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;-><init>(Lcom/franmontiel/persistentcookiejar/cache/CookieCache;Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;)V
+    invoke-direct {v6, v9, v10}, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;-><init>(Lcom/franmontiel/persistentcookiejar/cache/CookieCache;Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;)V
 
     new-instance v0, Lcom/discord/restapi/RestAPIBuilder;
 
-    const-string v10, "https://discordapp.com/api/"
+    const-string v9, "https://discordapp.com/api/"
 
-    check-cast v7, Lokhttp3/m;
+    check-cast v6, Lokhttp3/m;
 
-    invoke-direct {v0, v10, v7}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
+    invoke-direct {v0, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
 
     new-instance v15, Lcom/discord/utilities/rest/RestAPI;
 
-    const-class v11, Lcom/discord/restapi/RestAPIInterface;
+    const-class v10, Lcom/discord/restapi/RestAPIInterface;
 
     const-string v16, "client_base"
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
-    const-wide/16 v13, 0x0
+    const-wide/16 v12, 0x0
 
     const/16 v17, 0x0
 
@@ -277,125 +278,137 @@
 
     const/16 v19, 0x0
 
-    move-object v10, v0
+    move-object v9, v0
+
+    move-object v14, v4
 
     move-object v1, v15
 
-    move-object v15, v5
+    move-object/from16 v15, v16
 
-    invoke-static/range {v10 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
+    move/from16 v16, v17
 
-    move-result-object v10
+    move/from16 v17, v18
 
-    check-cast v10, Lcom/discord/restapi/RestAPIInterface;
+    move-object/from16 v18, v19
 
-    invoke-direct {v1, v10}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
+    invoke-static/range {v9 .. v18}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v4, v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApi(Lcom/discord/utilities/rest/RestAPI;)V
+    move-result-object v9
+
+    check-cast v9, Lcom/discord/restapi/RestAPIInterface;
+
+    invoke-direct {v1, v9}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
+
+    invoke-virtual {v3, v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApi(Lcom/discord/utilities/rest/RestAPI;)V
 
     new-instance v1, Lcom/discord/utilities/rest/RestAPI;
 
-    const-class v11, Lcom/discord/restapi/RestAPIInterface;
+    const-class v10, Lcom/discord/restapi/RestAPIInterface;
 
-    const-string v16, "client_serialize_nulls"
+    const-string v15, "client_serialize_nulls"
 
-    const/4 v12, 0x1
+    const/4 v11, 0x1
 
-    const/16 v18, 0x24
+    const/16 v16, 0x0
 
-    move-object v10, v0
+    const/16 v17, 0x24
 
-    invoke-static/range {v10 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
+    const/16 v18, 0x0
 
-    move-result-object v10
+    move-object v9, v0
 
-    check-cast v10, Lcom/discord/restapi/RestAPIInterface;
+    invoke-static/range {v9 .. v18}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
 
-    invoke-direct {v1, v10}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
+    move-result-object v9
 
-    invoke-virtual {v4, v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSerializeNulls(Lcom/discord/utilities/rest/RestAPI;)V
+    check-cast v9, Lcom/discord/restapi/RestAPIInterface;
+
+    invoke-direct {v1, v9}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
+
+    invoke-virtual {v3, v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSerializeNulls(Lcom/discord/utilities/rest/RestAPI;)V
 
     new-instance v1, Lcom/discord/utilities/rest/RestAPI;
 
-    const-class v11, Lcom/discord/restapi/RestAPIInterface;
+    const-class v10, Lcom/discord/restapi/RestAPIInterface;
 
-    const-string v16, "client_relaxed"
+    const-string v15, "client_relaxed"
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
-    const-wide/32 v13, 0x1d4c0
+    const-wide/32 v12, 0x1d4c0
 
-    const/16 v18, 0x22
+    const/16 v17, 0x22
 
-    move-object v10, v0
+    move-object v9, v0
 
-    invoke-static/range {v10 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
+    invoke-static/range {v9 .. v18}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v4
 
-    check-cast v5, Lcom/discord/restapi/RestAPIInterface;
+    check-cast v4, Lcom/discord/restapi/RestAPIInterface;
 
-    invoke-direct {v1, v5}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
+    invoke-direct {v1, v4}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
 
-    invoke-virtual {v4, v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiRelaxedTimeout(Lcom/discord/utilities/rest/RestAPI;)V
+    invoke-virtual {v3, v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiRelaxedTimeout(Lcom/discord/utilities/rest/RestAPI;)V
 
-    const-class v11, Lcom/discord/restapi/RestAPIInterface$Dynamic;
+    const-class v10, Lcom/discord/restapi/RestAPIInterface$Dynamic;
 
-    const-string v16, "client_dynamic"
+    const-string v15, "client_dynamic"
 
-    const-wide/16 v13, 0x0
+    const-wide/16 v12, 0x0
 
-    const/16 v18, 0x26
+    const/16 v17, 0x26
 
-    move-object v15, v2
+    move-object v14, v2
 
-    invoke-static/range {v10 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
+    invoke-static/range {v9 .. v18}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/discord/restapi/RestAPIInterface$Dynamic;
 
-    invoke-virtual {v4, v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiClientVersions(Lcom/discord/restapi/RestAPIInterface$Dynamic;)V
+    invoke-virtual {v3, v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiClientVersions(Lcom/discord/restapi/RestAPIInterface$Dynamic;)V
 
     new-instance v0, Lcom/discord/utilities/rest/RestAPI;
 
-    new-instance v10, Lcom/discord/restapi/RestAPIBuilder;
+    new-instance v9, Lcom/discord/restapi/RestAPIBuilder;
 
     const-string v1, "https://accounts.spotify.com/api/"
 
-    invoke-direct {v10, v1, v7}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
+    invoke-direct {v9, v1, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
 
-    const-class v11, Lcom/discord/restapi/RestAPIInterface;
+    const-class v10, Lcom/discord/restapi/RestAPIInterface;
 
-    new-array v1, v9, [Lokhttp3/Interceptor;
+    new-array v1, v8, [Lokhttp3/Interceptor;
 
-    aput-object v6, v1, v8
+    aput-object v5, v1, v7
 
     new-instance v2, Lcom/discord/restapi/SpotifyAuthInterceptor;
 
-    const-string v5, "17cca4a24f32402482e8d9cd39f7f666"
+    const-string v4, "17cca4a24f32402482e8d9cd39f7f666"
 
-    const-string v12, "836a44ab33cb40f893cdd180f7f0ccc6"
+    const-string v11, "836a44ab33cb40f893cdd180f7f0ccc6"
 
-    invoke-direct {v2, v5, v12}, Lcom/discord/restapi/SpotifyAuthInterceptor;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v2, v4, v11}, Lcom/discord/restapi/SpotifyAuthInterceptor;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     check-cast v2, Lokhttp3/Interceptor;
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
-    aput-object v2, v1, v5
+    aput-object v2, v1, v4
 
     invoke-static {v1}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v15
+    move-result-object v14
 
-    const-string v16, "client_spotify_auth"
+    const-string v15, "client_spotify_auth"
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
-    const/16 v18, 0x6
+    const/16 v17, 0x6
 
-    invoke-static/range {v10 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
+    invoke-static/range {v9 .. v18}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -403,43 +416,43 @@
 
     invoke-direct {v0, v1}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
 
-    invoke-virtual {v4, v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSpotifyAuth(Lcom/discord/utilities/rest/RestAPI;)V
+    invoke-virtual {v3, v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSpotifyAuth(Lcom/discord/utilities/rest/RestAPI;)V
 
     new-instance v0, Lcom/discord/utilities/rest/RestAPI;
 
-    new-instance v10, Lcom/discord/restapi/RestAPIBuilder;
+    new-instance v9, Lcom/discord/restapi/RestAPIBuilder;
 
     const-string v1, "https://api.spotify.com/v1/"
 
-    invoke-direct {v10, v1, v7}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
+    invoke-direct {v9, v1, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
 
-    const-class v11, Lcom/discord/restapi/RestAPIInterface;
+    const-class v10, Lcom/discord/restapi/RestAPIInterface;
 
-    new-array v1, v9, [Lokhttp3/Interceptor;
+    new-array v1, v8, [Lokhttp3/Interceptor;
 
-    aput-object v6, v1, v8
+    aput-object v5, v1, v7
 
     new-instance v2, Lcom/discord/restapi/SpotifyTokenInterceptor;
 
-    sget-object v5, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
+    sget-object v4, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
 
-    check-cast v5, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
+    check-cast v4, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
-    invoke-direct {v2, v5}, Lcom/discord/restapi/SpotifyTokenInterceptor;-><init>(Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;)V
+    invoke-direct {v2, v4}, Lcom/discord/restapi/SpotifyTokenInterceptor;-><init>(Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;)V
 
     check-cast v2, Lokhttp3/Interceptor;
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
-    aput-object v2, v1, v5
+    aput-object v2, v1, v4
 
     invoke-static {v1}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v15
+    move-result-object v14
 
-    const-string v16, "client_spotify"
+    const-string v15, "client_spotify"
 
-    invoke-static/range {v10 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
+    invoke-static/range {v9 .. v18}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -447,7 +460,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
 
-    invoke-virtual {v4, v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSpotify(Lcom/discord/utilities/rest/RestAPI;)V
+    invoke-virtual {v3, v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSpotify(Lcom/discord/utilities/rest/RestAPI;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali
index c15d59d1c2..280747dc64 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$HarvestState$LastRequested;
 .super Lcom/discord/utilities/rest/RestAPI$HarvestState;
+.source "RestAPI.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$NeverRequested.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$NeverRequested.smali
index 9bc53d41ac..1f95cf8c4c 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$NeverRequested.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$NeverRequested.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$HarvestState$NeverRequested;
 .super Lcom/discord/utilities/rest/RestAPI$HarvestState;
+.source "RestAPI.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState.smali
index f2b914a4cb..ecfdefbd61 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/rest/RestAPI$HarvestState;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 
 # annotations
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 bf6a2a6037..51503d2d40 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$getClientVersion$1;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali
index 06df1c62fe..14f3df8f34 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
index a880cf3d32..3a5805280d 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/RestAPI;
 .super Ljava/lang/Object;
+.source "RestAPI.kt"
 
 # interfaces
 .implements Lcom/discord/restapi/RestAPIInterface;
@@ -244,87 +245,87 @@
 .end method
 
 .method public static synthetic editChannel$default(Lcom/discord/utilities/rest/RestAPI;JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;ILjava/lang/Object;)Lrx/Observable;
-    .locals 12
+    .locals 11
 
-    and-int/lit8 v1, p9, 0x2
+    and-int/lit8 v0, p9, 0x2
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v6, v2
+    move-object v5, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v6, p3
+    move-object v5, p3
 
     :goto_0
-    and-int/lit8 v1, p9, 0x4
+    and-int/lit8 v0, p9, 0x4
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v7, v2
+    move-object v6, v1
 
     goto :goto_1
 
     :cond_1
-    move-object/from16 v7, p4
+    move-object v6, p4
 
     :goto_1
-    and-int/lit8 v1, p9, 0x8
+    and-int/lit8 v0, p9, 0x8
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_2
 
     :cond_2
-    move-object/from16 v8, p5
+    move-object/from16 v7, p5
 
     :goto_2
-    and-int/lit8 v1, p9, 0x10
+    and-int/lit8 v0, p9, 0x10
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    move-object v9, v2
+    move-object v8, v1
 
     goto :goto_3
 
     :cond_3
-    move-object/from16 v9, p6
+    move-object/from16 v8, p6
 
     :goto_3
-    and-int/lit8 v1, p9, 0x20
+    and-int/lit8 v0, p9, 0x20
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    move-object v10, v2
+    move-object v9, v1
 
     goto :goto_4
 
     :cond_4
-    move-object/from16 v10, p7
+    move-object/from16 v9, p7
 
     :goto_4
     and-int/lit8 v0, p9, 0x40
 
     if-eqz v0, :cond_5
 
-    move-object v11, v2
+    move-object v10, v1
 
     goto :goto_5
 
     :cond_5
-    move-object/from16 v11, p8
+    move-object/from16 v10, p8
 
     :goto_5
-    move-object v3, p0
+    move-object v2, p0
 
-    move-wide v4, p1
+    move-wide v3, p1
 
-    invoke-virtual/range {v3 .. v11}, Lcom/discord/utilities/rest/RestAPI;->editChannel(JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;)Lrx/Observable;
+    invoke-virtual/range {v2 .. v10}, Lcom/discord/utilities/rest/RestAPI;->editChannel(JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;)Lrx/Observable;
 
     move-result-object v0
 
@@ -569,6 +570,8 @@
     invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public static synthetic postInviteCode$default(Lcom/discord/utilities/rest/RestAPI;Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;ILjava/lang/Object;)Lrx/Observable;
@@ -867,7 +870,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            Kq = true
+            Kp = true
             value = "reaction"
         .end annotation
     .end param
@@ -2063,13 +2066,13 @@
     :cond_0
     invoke-virtual {p4}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
-    cmp-long v6, v2, v4
+    cmp-long v5, v1, v3
 
-    if-nez v6, :cond_1
+    if-nez v5, :cond_1
 
     move-object v6, v0
 
@@ -2087,9 +2090,9 @@
     :cond_2
     invoke-virtual {p5}, Ljava/lang/Integer;->intValue()I
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_3
+    if-nez v1, :cond_3
 
     move-object v7, v0
 
@@ -2856,7 +2859,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            Kq = true
+            Kp = true
             value = "emoji"
         .end annotation
     .end param
@@ -3780,7 +3783,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            Kq = true
+            Kp = true
             value = "reaction"
         .end annotation
     .end param
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
index 726c3303c4..611f971e4d 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/RestAPIAbortMessages;
 .super Ljava/lang/Object;
+.source "RestAPIAbortMessages.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload$Companion.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload$Companion.smali
index fd0ee0fd0f..5baa9ecc04 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/SendUtils$FileUpload$Companion;
 .super Ljava/lang/Object;
+.source "SendUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
index c3b0d32b2b..56f132933e 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/SendUtils$FileUpload;
 .super Ljava/lang/Object;
+.source "SendUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$ImageCompressionException.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$ImageCompressionException.smali
index 4ccaf9a961..b59b80c51b 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$ImageCompressionException.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$ImageCompressionException.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/SendUtils$ImageCompressionException;
 .super Ljava/lang/IllegalStateException;
+.source "SendUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali
index 2ef38340f0..9df0eb18a6 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;
 .super Lcom/discord/utilities/rest/SendUtils$SendPayload;
+.source "SendUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali
index da4ca20915..34522ebd37 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
 .super Lcom/discord/utilities/rest/SendUtils$SendPayload;
+.source "SendUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload.smali
index ce280945e3..51a0d5e08c 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/rest/SendUtils$SendPayload;
 .super Ljava/lang/Object;
+.source "SendUtils.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
index 8ac947c789..bba7603841 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/SendUtils$getPart$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "SendUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$2.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$2.smali
index 1901978b8c..7ff3ecfb5d 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$2.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/SendUtils$getPart$1$2;
 .super Lkotlin/jvm/internal/k;
+.source "SendUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$3.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$3.smali
index 698bff1c6a..33e52a4fb4 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$3.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/SendUtils$getPart$1$3;
 .super Lkotlin/jvm/internal/i;
+.source "SendUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali
index 62ff0f2dac..9a3a6d81de 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/SendUtils$getPart$1;
 .super Ljava/lang/Object;
+.source "SendUtils.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali
index 554dc8e967..ad426f1709 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rest/SendUtils$getSendPayload$2;
 .super Ljava/lang/Object;
+.source "SendUtils.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index 0dc10cabd9..694926e8b0 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rest/SendUtils;
 .super Ljava/lang/Object;
+.source "SendUtils.kt"
 
 
 # annotations
@@ -346,7 +347,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->cmM:I
+    sget p1, Lrx/Emitter$a;->cmg:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -567,19 +568,20 @@
 
     const p2, 0x7f1204de
 
-    :goto_0
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const p2, 0x7f1204df
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    :goto_1
+    move-result-object p1
+
+    :goto_0
     const-string p2, "if (isPremium)\n      get\u2026le_upload_limit_standard)"
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
@@ -766,7 +768,7 @@
 
     if-gez v2, :cond_1
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_1
     check-cast v3, Lcom/lytefast/flexinput/model/Attachment;
@@ -802,7 +804,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p1
 
@@ -822,7 +824,6 @@
 
     const-string p2, "Observable.concat(\n     \u2026ttachmentParts) }\n      )"
 
-    :goto_2
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -842,7 +843,9 @@
 
     const-string p2, "Observable.just(SendPayl\u2026zedComment, emptyList()))"
 
-    goto :goto_2
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
 
 .method public final handlSendError(Lcom/discord/utilities/error/Error;Landroid/content/Context;Z)V
@@ -872,7 +875,7 @@
 
     invoke-direct {p0, p2, p3}, Lcom/discord/utilities/rest/SendUtils;->showFilesTooLargeDialog(Landroid/content/Context;Z)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getThrowable()Ljava/lang/Throwable;
@@ -885,10 +888,9 @@
 
     const p3, 0x7f120eb7
 
-    :goto_0
     invoke-static {p2, p3}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
@@ -913,20 +915,22 @@
 
     if-ne p3, v0, :cond_2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const p3, 0x7f1209c7
 
-    goto :goto_0
+    invoke-static {p2, p3}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V
+
+    goto :goto_1
 
     :cond_3
-    :goto_1
+    :goto_0
     const/4 p3, 0x1
 
     invoke-virtual {p1, p3}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V
 
-    :goto_2
+    :goto_1
     invoke-virtual {p1, p2}, Lcom/discord/utilities/error/Error;->showToasts(Landroid/content/Context;)V
 
     return-void
diff --git a/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali b/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali
index 4059547f85..e40f70d62a 100644
--- a/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;
 .super Ljava/lang/Object;
+.source "ActivityLifecycleCallbacks.kt"
 
 # interfaces
 .implements Landroid/app/Application$ActivityLifecycleCallbacks;
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1$1.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1$1.smali
index afb0e18db0..3b15962a91 100644
--- a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/rx/LeadingEdgeThrottle$1$1;
 .super Ljava/lang/Object;
+.source "LeadingEdgeThrottle.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali
index e9e4444d09..b6f6aa21e8 100644
--- a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/rx/LeadingEdgeThrottle$1;
 .super Lrx/Subscriber;
+.source "LeadingEdgeThrottle.java"
 
 
 # annotations
@@ -135,8 +136,6 @@
 
     if-eqz v6, :cond_1
 
-    iget-wide v2, p0, Lcom/discord/utilities/rx/LeadingEdgeThrottle$1;->lastOnNext:J
-
     sub-long v2, v0, v2
 
     iget-object v4, p0, Lcom/discord/utilities/rx/LeadingEdgeThrottle$1;->this$0:Lcom/discord/utilities/rx/LeadingEdgeThrottle;
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali
index 117b246ad2..d79314ad18 100644
--- a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali
+++ b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/LeadingEdgeThrottle$DebounceState;
 .super Ljava/lang/Object;
+.source "LeadingEdgeThrottle.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali
index d0f90b15c6..f98c93a0d1 100644
--- a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali
+++ b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/rx/LeadingEdgeThrottle;
 .super Ljava/lang/Object;
+.source "LeadingEdgeThrottle.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -34,7 +35,7 @@
 .method public constructor <init>(JLjava/util/concurrent/TimeUnit;)V
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -87,7 +88,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/LeadingEdgeThrottle;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()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 c310e6078a..031a375d70 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1;
 .super Lkotlin/jvm/internal/k;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 c591eb4ac1..37cae560e5 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2;
 .super Lkotlin/jvm/internal/k;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$subscription$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$subscription$1.smali
index 1cf5157107..ae6e4cc613 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$subscription$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$subscription$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$subscription$1;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali
index 111a08ca20..ab5fd703ab 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$1;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -75,7 +76,7 @@
 .method public final call(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
 
     instance-of p1, p1, Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali
index ce73f9ab28..1f625d894a 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$2;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -66,7 +67,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
 
     check-cast p1, Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali
index 5dedd6ff88..6b105b9fd7 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali
index 025d6465ae..5198879e47 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
index 032ea63846..34d6831b62 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rx/ObservableExtensionsKt;
 .super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
 
 
 # direct methods
@@ -88,6 +89,8 @@
 
     invoke-interface {p3, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -166,44 +169,44 @@
 .end method
 
 .method public static synthetic appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
-    .locals 10
+    .locals 9
 
-    and-int/lit8 v1, p7, 0x1
+    and-int/lit8 v0, p7, 0x1
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v4, v2
+    move-object v3, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v4, p1
+    move-object v3, p1
 
     :goto_0
-    and-int/lit8 v1, p7, 0x4
+    and-int/lit8 v0, p7, 0x4
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v6, v2
+    move-object v5, v1
 
     goto :goto_1
 
     :cond_1
-    move-object v6, p3
+    move-object v5, p3
 
     :goto_1
-    and-int/lit8 v1, p7, 0x10
+    and-int/lit8 v0, p7, 0x10
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_2
 
     :cond_2
-    move-object v8, p5
+    move-object v7, p5
 
     :goto_2
     and-int/lit8 v0, p7, 0x20
@@ -214,64 +217,64 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    move-object v9, v0
+    move-object v8, v0
 
     goto :goto_3
 
     :cond_3
-    move-object/from16 v9, p6
+    move-object v8, p6
 
     :goto_3
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object v5, p2
+    move-object v4, p2
 
-    move-object v7, p4
+    move-object v6, p4
 
-    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
     return-void
 .end method
 
 .method public static synthetic 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
-    .locals 10
+    .locals 9
 
-    and-int/lit8 v1, p7, 0x2
+    and-int/lit8 v0, p7, 0x2
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v5, v2
+    move-object v4, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v5, p2
+    move-object v4, p2
 
     :goto_0
-    and-int/lit8 v1, p7, 0x4
+    and-int/lit8 v0, p7, 0x4
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v6, v2
+    move-object v5, v1
 
     goto :goto_1
 
     :cond_1
-    move-object v6, p3
+    move-object v5, p3
 
     :goto_1
-    and-int/lit8 v1, p7, 0x8
+    and-int/lit8 v0, p7, 0x8
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    move-object v7, v2
+    move-object v6, v1
 
     goto :goto_2
 
     :cond_2
-    move-object v7, p4
+    move-object v6, p4
 
     :goto_2
     and-int/lit8 v0, p7, 0x10
@@ -282,21 +285,21 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    move-object v8, v0
+    move-object v7, v0
 
     goto :goto_3
 
     :cond_3
-    move-object v8, p5
+    move-object v7, p5
 
     :goto_3
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object v4, p1
+    move-object v3, p1
 
-    move-object/from16 v9, p6
+    move-object v8, p6
 
-    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
+    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
 
     return-void
 .end method
@@ -319,11 +322,11 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lrx/Observable;->KE()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -331,7 +334,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -360,7 +363,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fo()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$1;
 
@@ -370,7 +373,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fo()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fn()V
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$2;
 
@@ -446,7 +449,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/d/a;->Mi()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -523,7 +526,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$1.smali
index d96fe118a2..bac4c2eace 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$1;
 .super Ljava/lang/Object;
+.source "ObservableWithLeadingEdgeThrottle.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali
index 8707a6b4ce..828c01a4e6 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2;
 .super Ljava/lang/Object;
+.source "ObservableWithLeadingEdgeThrottle.java"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali
index 88fec32d80..605d81146e 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;
 .super Ljava/lang/Object;
+.source "ObservableWithLeadingEdgeThrottle.java"
 
 
 # static fields
@@ -49,7 +50,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$1.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$1.smali
index ff882f88b2..3402e0b6ec 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$1;
 .super Ljava/lang/Object;
+.source "OnDelayedEmissionHandler.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 5f11a139fb..9cc2f4b1b3 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$2;
 .super Lkotlin/jvm/internal/i;
+.source "OnDelayedEmissionHandler.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1.smali
index 22de3a8cb7..c2418cd331 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1;
 .super Ljava/lang/Object;
+.source "OnDelayedEmissionHandler.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 b001653000..f7b4c8e47c 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2;
 .super Lkotlin/jvm/internal/i;
+.source "OnDelayedEmissionHandler.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali
index 94ea32e834..6118123e47 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
 .super Lrx/Subscriber;
+.source "OnDelayedEmissionHandler.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali
index 4d0f892457..bb18158ae3 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0;
 .super Ljava/lang/Object;
+.source "OnDelayedEmissionHandler.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
index a7cb9076a4..914a9e09f3 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rx/OnDelayedEmissionHandler;
 .super Ljava/lang/Object;
+.source "OnDelayedEmissionHandler.kt"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -100,23 +101,33 @@
 
     const-wide/16 p2, 0x0
 
+    move-wide v2, p2
+
+    goto :goto_0
+
     :cond_0
     move-wide v2, p2
 
+    :goto_0
     and-int/lit8 p2, p6, 0x4
 
     if-eqz p2, :cond_1
 
     sget-object p4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
+    move-object v4, p4
+
+    goto :goto_1
+
     :cond_1
     move-object v4, p4
 
+    :goto_1
     and-int/lit8 p2, p6, 0x8
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()Lrx/Scheduler;
 
     move-result-object p5
 
@@ -124,9 +135,14 @@
 
     invoke-static {p5, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
+    move-object v5, p5
+
+    goto :goto_2
+
     :cond_2
     move-object v5, p5
 
+    :goto_2
     move-object v0, p0
 
     move-object v1, p1
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 60cf03b4f0..870bcc9a38 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rx/OperatorBufferedDelay$Companion;
 .super Ljava/lang/Object;
+.source "OperatorBufferedDelay.kt"
 
 
 # annotations
@@ -39,14 +40,19 @@
 
     sget-object p4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
+    move-object v4, p4
+
+    goto :goto_0
+
     :cond_0
     move-object v4, p4
 
+    :goto_0
     and-int/lit8 p4, p7, 0x8
 
     if-eqz p4, :cond_1
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object p6
 
@@ -54,9 +60,14 @@
 
     invoke-static {p6, p4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
+    move-object v6, p6
+
+    goto :goto_1
+
     :cond_1
     move-object v6, p6
 
+    :goto_1
     move-object v0, p0
 
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber$onNext$$inlined$synchronized$lambda$1.smali b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber$onNext$$inlined$synchronized$lambda$1.smali
index 8bf6071bd4..6c596dad20 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber$onNext$$inlined$synchronized$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber$onNext$$inlined$synchronized$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber$onNext$$inlined$synchronized$lambda$1;
 .super Ljava/lang/Object;
+.source "OperatorBufferedDelay.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali
index 92050c5aac..acadb5e2ca 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;
 .super Lrx/Subscriber;
+.source "OperatorBufferedDelay.kt"
 
 
 # annotations
@@ -210,6 +211,8 @@
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;->publish(Ljava/util/List;)V
 
+    return-void
+
     :cond_1
     return-void
 
@@ -359,6 +362,8 @@
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;->publish(Ljava/util/List;)V
 
+    return-void
+
     :cond_1
     return-void
 
diff --git a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
index d05464dd56..e18fdbb714 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/rx/OperatorBufferedDelay;
 .super Ljava/lang/Object;
+.source "OperatorBufferedDelay.kt"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -88,9 +89,14 @@
 
     sget-object p3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
+    move-object v3, p3
+
+    goto :goto_0
+
     :cond_0
     move-object v3, p3
 
+    :goto_0
     move-object v0, p0
 
     move-wide v1, p1
@@ -138,7 +144,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/search/SearchUtils.smali b/com.discord/smali/com/discord/utilities/search/SearchUtils.smali
index d19a522d5a..6ba44e90fd 100644
--- a/com.discord/smali/com/discord/utilities/search/SearchUtils.smali
+++ b/com.discord/smali/com/discord/utilities/search/SearchUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/SearchUtils;
 .super Ljava/lang/Object;
+.source "SearchUtils.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali
index 61c1d54fd2..6850481e26 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;
 .super Ljava/lang/Object;
+.source "MGPreferenceSearchHistoryCache.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali
index 41b48f7d1b..5e6a698573 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1;
 .super Ljava/lang/Object;
+.source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 ab37a219cf..74d8573d69 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2;
 .super Lkotlin/jvm/internal/k;
+.source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali
index eb101af02f..27c7ec98fe 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1;
 .super Ljava/lang/Object;
+.source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali
index e0b28ea0a1..c4b9666326 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1;
 .super Ljava/lang/Object;
+.source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 1af3a8c5ac..7f13bd6c6a 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2;
 .super Lkotlin/jvm/internal/k;
+.source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 cb587e79b1..733d372cc4 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;
 .super Ljava/lang/Object;
+.source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/search/history/SearchHistoryCache;
@@ -402,7 +403,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -514,7 +515,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/search/history/SearchHistoryCache.smali b/com.discord/smali/com/discord/utilities/search/history/SearchHistoryCache.smali
index f03747f36b..37914ec27f 100644
--- a/com.discord/smali/com/discord/utilities/search/history/SearchHistoryCache.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/SearchHistoryCache.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/search/history/SearchHistoryCache;
 .super Ljava/lang/Object;
+.source "SearchHistoryCache.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali
index 633c62d5e8..9108c08028 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/network/SearchFetcher$getRestObservable$1;
 .super Lkotlin/jvm/internal/k;
+.source "SearchFetcher.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali
index 1a79a3208f..48d77e6a9d 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/network/SearchFetcher$getRestObservable$2;
 .super Ljava/lang/Object;
+.source "SearchFetcher.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali
index d246a9d27a..28506900c5 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/network/SearchFetcher$getRestObservable$3;
 .super Ljava/lang/Object;
+.source "SearchFetcher.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali
index 3d099bac3e..a797d0ac39 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$1;
 .super Ljava/lang/Object;
+.source "SearchFetcher.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali
index 108c1e3365..e36f852172 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$2$1;
 .super Ljava/lang/Object;
+.source "SearchFetcher.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali
index c28e1f1d95..ea6fdc085b 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$2;
 .super Ljava/lang/Object;
+.source "SearchFetcher.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali
index 4e4682af37..e79d958aa1 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$3;
 .super Ljava/lang/Object;
+.source "SearchFetcher.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
index ae81c6fee5..475c6fd2ff 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/search/network/SearchFetcher;
 .super Ljava/lang/Object;
+.source "SearchFetcher.kt"
 
 
 # instance fields
@@ -126,9 +127,14 @@
 
     const-wide/16 p4, 0x0
 
+    move-wide v4, p4
+
+    goto :goto_0
+
     :cond_0
     move-wide v4, p4
 
+    :goto_0
     move-object v0, p0
 
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali b/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali
index 98e40ed431..870af00e41 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/network/SearchQuery$Builder;
 .super Ljava/lang/Object;
+.source "SearchQuery.kt"
 
 
 # annotations
@@ -142,11 +143,10 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     move-object v1, v0
 
     :cond_0
-    :goto_1
+    :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
@@ -169,12 +169,12 @@
 
     move-result-object v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     instance-of v3, v2, Lcom/discord/utilities/search/query/node/answer/AnswerNode;
 
-    if-eqz v3, :cond_2
+    if-eqz v3, :cond_3
 
     move-object v3, v2
 
@@ -190,24 +190,37 @@
 
     move-result v4
 
-    if-eqz v4, :cond_3
+    if-eqz v4, :cond_2
 
     invoke-virtual {v3, p0, p2, v1}, Lcom/discord/utilities/search/query/node/answer/AnswerNode;->updateQuery(Lcom/discord/utilities/search/network/SearchQuery$Builder;Lcom/discord/utilities/search/validation/SearchData;Lcom/discord/utilities/search/query/FilterType;)V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_2
-    instance-of v3, v2, Lcom/discord/utilities/search/query/node/content/ContentNode;
-
-    if-eqz v3, :cond_0
-
-    :cond_3
     invoke-virtual {v2}, Lcom/discord/utilities/search/query/node/QueryNode;->getText()Ljava/lang/String;
 
     move-result-object v1
 
     invoke-direct {p0, v1}, Lcom/discord/utilities/search/network/SearchQuery$Builder;->appendContent(Ljava/lang/String;)V
 
+    :goto_1
+    move-object v1, v0
+
+    goto :goto_0
+
+    :cond_3
+    instance-of v3, v2, Lcom/discord/utilities/search/query/node/content/ContentNode;
+
+    if-eqz v3, :cond_0
+
+    invoke-virtual {v2}, Lcom/discord/utilities/search/query/node/QueryNode;->getText()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {p0, v1}, Lcom/discord/utilities/search/network/SearchQuery$Builder;->appendContent(Ljava/lang/String;)V
+
+    move-object v1, v0
+
     goto :goto_0
 
     :cond_4
@@ -241,9 +254,9 @@
 
     move-result p2
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-nez p2, :cond_5
 
@@ -263,11 +276,11 @@
 
     const-string v2, "content"
 
-    new-array v1, v1, [Ljava/lang/String;
+    new-array v0, v0, [Ljava/lang/String;
 
-    aput-object p1, v1, v0
+    aput-object p1, v0, v1
 
-    invoke-static {v1}, Lkotlin/a/l;->j([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/l;->j([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
@@ -294,6 +307,8 @@
     invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final setIncludeNsfw(Z)Lcom/discord/utilities/search/network/SearchQuery$Builder;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali b/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali
index 565a18c864..1f97d59cee 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/network/SearchQuery;
 .super Ljava/lang/Object;
+.source "SearchQuery.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/network/state/QueryFetchState.smali b/com.discord/smali/com/discord/utilities/search/network/state/QueryFetchState.smali
index f8f393cc1a..fafb634f45 100644
--- a/com.discord/smali/com/discord/utilities/search/network/state/QueryFetchState.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/state/QueryFetchState.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/search/network/state/QueryFetchState;
 .super Ljava/lang/Enum;
+.source "QueryFetchState.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali b/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali
index 01be8a113c..d5cc16dc20 100644
--- a/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/network/state/SearchState;
 .super Ljava/lang/Object;
+.source "SearchState.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/search/query/FilterType.smali b/com.discord/smali/com/discord/utilities/search/query/FilterType.smali
index 26cfcb3848..d80bfbd8b2 100644
--- a/com.discord/smali/com/discord/utilities/search/query/FilterType.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/FilterType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/search/query/FilterType;
 .super Ljava/lang/Enum;
+.source "FilterType.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali b/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali
index eed5c44551..f5e112edb7 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/query/node/QueryNode$Preprocessor;
 .super Ljava/lang/Object;
+.source "QueryNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/QueryNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/QueryNode.smali
index d7265a4a2b..35cd237f1b 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/QueryNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/QueryNode.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/search/query/node/QueryNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "QueryNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali
index 4ea5953841..41398bafd4 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/search/query/node/answer/AnswerNode;
 .super Lcom/discord/utilities/search/query/node/QueryNode;
+.source "AnswerNode.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali
index 0b9d9e5300..fa542b9027 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/query/node/answer/ChannelNode;
 .super Lcom/discord/utilities/search/query/node/answer/AnswerNode;
+.source "ChannelNode.kt"
 
 
 # instance fields
@@ -260,6 +261,8 @@
 
     invoke-virtual {p1, v0, p2}, Lcom/discord/utilities/search/network/SearchQuery$Builder;->appendParam(Ljava/lang/String;Ljava/lang/String;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali
index 5831fc6a43..88edfef485 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/query/node/answer/HasAnswerOption$Companion;
 .super Ljava/lang/Object;
+.source "HasNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali
index b54c56ae9d..1aa95c256d 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;
 .super Ljava/lang/Enum;
+.source "HasNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali
index 2d53fc4e0c..7b0a9f72d8 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/query/node/answer/HasNode;
 .super Lcom/discord/utilities/search/query/node/answer/AnswerNode;
+.source "HasNode.kt"
 
 
 # instance fields
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 08212c5381..b9c136af89 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/query/node/answer/UserNode;
 .super Lcom/discord/utilities/search/query/node/answer/AnswerNode;
+.source "UserNode.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali
index eccbbd25cc..ff1943b1c8 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/query/node/content/ContentNode;
 .super Lcom/discord/utilities/search/query/node/QueryNode;
+.source "ContentNode.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali
index 7b2984446e..f3ac5e37b7 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/query/node/filter/FilterNode;
 .super Lcom/discord/utilities/search/query/node/QueryNode;
+.source "FilterNode.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$1.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$1.smali
index 49fe29ea8e..a3f88af9dd 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$2.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$2.smali
index a29e306412..945dcbf716 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$2;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$3.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$3.smali
index 13b16b0bfb..87c58117c1 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$3.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$3;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$4.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$4.smali
index c7bbdb1d4e..3e377bd283 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$4.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$4;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$5.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$5.smali
index a518a4ea5a..403f09dac9 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$5.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$5;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$6.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$6.smali
index 9b01a93619..4c0bf35f6d 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$6.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$6;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$7.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$7.smali
index 2357339aca..216ee80cf3 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$7.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$7;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$8.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$8.smali
index 27de9cc020..0a6548ce69 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$8.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/query/parsing/QueryParser$8;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "QueryParser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser.smali b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser.smali
index dbd6304555..852dc60662 100644
--- a/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/parsing/QueryParser.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/search/query/parsing/QueryParser;
 .super Lcom/discord/simpleast/core/parser/Parser;
+.source "QueryParser.java"
 
 
 # annotations
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 016733f8bb..9dc947eb8a 100644
--- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
+++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/strings/ContextSearchStringProvider;
 .super Ljava/lang/Object;
+.source "ContextSearchStringProvider.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/search/strings/SearchStringProvider;
diff --git a/com.discord/smali/com/discord/utilities/search/strings/SearchStringProvider.smali b/com.discord/smali/com/discord/utilities/search/strings/SearchStringProvider.smali
index 70ff0ab742..19be7e3c4a 100644
--- a/com.discord/smali/com/discord/utilities/search/strings/SearchStringProvider.smali
+++ b/com.discord/smali/com/discord/utilities/search/strings/SearchStringProvider.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/search/strings/SearchStringProvider;
 .super Ljava/lang/Object;
+.source "SearchStringProvider.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali
index 8eb0b35b03..7a3395d25a 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0;
 .super Ljava/lang/Object;
+.source "SearchSuggestionEngine.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali
index 79e07f5c0d..8185e8780d 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1;
 .super Ljava/lang/Object;
+.source "SearchSuggestionEngine.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali
index b7da85ab42..a1f612da5c 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2;
 .super Lkotlin/jvm/internal/i;
+.source "SearchSuggestionEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 690e6b5616..f87c60bc53 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3;
 .super Lkotlin/jvm/internal/k;
+.source "SearchSuggestionEngine.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -92,6 +93,8 @@
 
     invoke-virtual {v0, v1, v2, p1}, Lcom/discord/stores/StoreGatewayConnection;->requestGuildMembers(JLjava/lang/String;)Z
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
index 305e42d636..007700b122 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;
 .super Ljava/lang/Object;
+.source "SearchSuggestionEngine.kt"
 
 
 # static fields
@@ -45,7 +46,7 @@
 
     new-instance v1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v2
 
@@ -714,17 +715,15 @@
 
     move-result v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
-    :cond_0
     const-string p1, ""
 
-    :goto_0
     check-cast p1, Ljava/lang/CharSequence;
 
     return-object p1
 
-    :cond_1
+    :cond_0
     invoke-static {p1}, Lkotlin/a/l;->au(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
@@ -733,7 +732,7 @@
 
     instance-of v0, p1, Lcom/discord/utilities/search/query/node/content/ContentNode;
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_2
 
     check-cast p1, Lcom/discord/utilities/search/query/node/content/ContentNode;
 
@@ -745,7 +744,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     check-cast p1, Ljava/lang/CharSequence;
 
@@ -757,9 +756,11 @@
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Ljava/lang/CharSequence;
 
-    :cond_2
+    return-object p1
+
+    :cond_1
     new-instance p1, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.CharSequence"
@@ -767,6 +768,13 @@
     invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    :cond_2
+    const-string p1, ""
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    return-object p1
 .end method
 
 .method public static final getSuggestions(Ljava/util/List;Lcom/discord/utilities/search/validation/SearchData;Lcom/discord/utilities/search/strings/SearchStringProvider;Ljava/util/Collection;)Ljava/util/List;
@@ -862,12 +870,11 @@
 
     move-result-object p1
 
-    :goto_0
     check-cast p1, Ljava/util/Collection;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget-object v1, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->INSTANCE:Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;
@@ -886,9 +893,11 @@
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Ljava/util/Collection;
 
-    :goto_1
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+
+    :goto_0
     invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
 
     move-result p0
@@ -940,7 +949,6 @@
 
     check-cast p1, Ljava/util/List;
 
-    :goto_0
     check-cast p1, Ljava/util/Collection;
 
     return-object p1
@@ -948,12 +956,12 @@
     :pswitch_0
     sget-object p2, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;->MENTIONS:Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_1
     sget-object p2, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;->FROM:Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;
 
-    :goto_1
+    :goto_0
     sget-object v0, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->membersRequestSubject:Lrx/subjects/SerializedSubject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
@@ -980,12 +988,12 @@
 
     const/4 v10, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const/4 v10, 0x0
 
-    :goto_2
+    :goto_1
     invoke-interface {p3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
     move-result-object p3
@@ -1106,9 +1114,9 @@
 
     move-result-object p1
 
-    goto/16 :goto_0
+    check-cast p1, Ljava/util/Collection;
 
-    nop
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -1157,7 +1165,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali
index 9e2c6b223c..b17350c0ba 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion;
 .super Ljava/lang/Object;
+.source "ChannelSuggestion.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali
index 887dcb8663..7718a92f79 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
 .super Ljava/lang/Object;
+.source "ChannelSuggestion.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali
index 8ca39f22bc..d19f38c3ab 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion;
 .super Ljava/lang/Object;
+.source "FilterSuggestion.kt"
 
 
 # annotations
@@ -64,6 +65,13 @@
     goto :goto_0
 
     :pswitch_2
+    invoke-interface {p2}, Lcom/discord/utilities/search/strings/SearchStringProvider;->getMentionsFilterString()Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :pswitch_3
     invoke-interface {p2}, Lcom/discord/utilities/search/strings/SearchStringProvider;->getFromFilterString()Ljava/lang/String;
 
     move-result-object p1
@@ -85,13 +93,11 @@
 
     return-object p1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
+        :pswitch_3
         :pswitch_2
         :pswitch_1
-        :pswitch_1
         :pswitch_0
     .end packed-switch
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali
index f78c6ddd9d..27108093e6 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
 .super Ljava/lang/Object;
+.source "FilterSuggestion.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali
index 701b219ccd..cfca24ae95 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/HasSuggestion$Companion;
 .super Ljava/lang/Object;
+.source "HasSuggestion.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali
index 0c8a66e119..79ad810827 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
 .super Ljava/lang/Object;
+.source "HasSuggestion.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali
index 532c261033..d1837c23f8 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
 .super Ljava/lang/Object;
+.source "RecentQuerySuggestion.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion$Category.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion$Category.smali
index 5118f0fd52..43d1e48248 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion$Category.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion$Category.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 .super Ljava/lang/Enum;
+.source "SearchSuggestion.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion.smali
index 7ad4405903..7477c0f526 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/SearchSuggestion.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
 .super Ljava/lang/Object;
+.source "SearchSuggestion.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali
index 900576f6b6..cc37644811 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$Companion;
 .super Ljava/lang/Object;
+.source "UserSuggestion.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType.smali
index ff3b39a99b..492b761d01 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;
 .super Ljava/lang/Enum;
+.source "UserSuggestion.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali
index fd9bf6e90c..597bb556a0 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
 .super Ljava/lang/Object;
+.source "UserSuggestion.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
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 4f9db5d7f9..4a71e58eef 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;
 .super Lkotlin/jvm/internal/k;
+.source "SearchData.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali
index a03766e338..889684ca42 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/validation/SearchData$Builder;
 .super Ljava/lang/Object;
+.source "SearchData.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali
index 55e3a057af..2636c029f9 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;
 .super Ljava/lang/Object;
+.source "SearchData.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali
index 47e7d04a4c..59738d5f49 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/search/validation/SearchData;
 .super Ljava/lang/Object;
+.source "SearchData.kt"
 
 
 # annotations
@@ -177,9 +178,14 @@
 
     move-result-object p2
 
+    move-object p7, p2
+
+    goto :goto_0
+
     :cond_1
     move-object p7, p2
 
+    :goto_0
     and-int/lit8 p2, p6, 0x4
 
     if-eqz p2, :cond_2
@@ -188,9 +194,14 @@
 
     move-result-object p3
 
+    move-object v0, p3
+
+    goto :goto_1
+
     :cond_2
     move-object v0, p3
 
+    :goto_1
     and-int/lit8 p2, p6, 0x8
 
     if-eqz p2, :cond_3
@@ -199,9 +210,14 @@
 
     move-result-object p4
 
+    move-object v1, p4
+
+    goto :goto_2
+
     :cond_3
     move-object v1, p4
 
+    :goto_2
     and-int/lit8 p2, p6, 0x10
 
     if-eqz p2, :cond_4
@@ -210,9 +226,14 @@
 
     move-result-object p5
 
+    move-object v2, p5
+
+    goto :goto_3
+
     :cond_4
     move-object v2, p5
 
+    :goto_3
     move-object p2, p0
 
     move-object p3, p1
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchDataKt.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchDataKt.smali
index 2dcb1287f9..065e59303b 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchDataKt.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchDataKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/utilities/search/validation/SearchDataKt;
 .super Ljava/lang/Object;
+.source "SearchData.kt"
diff --git a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali
index 615290e26d..4f464c9e68 100644
--- a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali
+++ b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 .super Ljava/lang/Object;
+.source "SimplePager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali
index 5fd79cd463..6a5368f12b 100644
--- a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali
+++ b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/simple_pager/SimplePager$Adapter;
 .super Landroidx/fragment/app/FragmentPagerAdapter;
+.source "SimplePager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali
index 2771d7b9f1..ed175831bf 100644
--- a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali
+++ b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/simple_pager/SimplePager;
 .super Landroidx/viewpager/widget/ViewPager;
+.source "SimplePager.kt"
 
 
 # annotations
@@ -156,6 +157,8 @@
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/tabs/TabLayout;->setupWithViewPager(Landroidx/viewpager/widget/ViewPager;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali b/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali
index f65753ee7d..4cdfa3cd24 100644
--- a/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spans/BlockBackgroundSpan;
 .super Ljava/lang/Object;
+.source "BlockBackgroundSpan.kt"
 
 # interfaces
 .implements Landroid/text/style/LineBackgroundSpan;
@@ -77,7 +78,7 @@
 
 # virtual methods
 .method public final draw(Landroid/graphics/Canvas;)V
-    .locals 4
+    .locals 3
 
     const-string v0, "canvas"
 
@@ -87,21 +88,17 @@
 
     iget v1, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->radius:F
 
-    iget v2, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->radius:F
+    iget-object v2, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->fillPaint:Landroid/graphics/Paint;
 
-    iget-object v3, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->fillPaint:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, v0, v1, v1, v2}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
     iget-object v0, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->rect:Landroid/graphics/RectF;
 
     iget v1, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->radius:F
 
-    iget v2, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->radius:F
+    iget-object v2, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->strokePaint:Landroid/graphics/Paint;
 
-    iget-object v3, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->strokePaint:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, v0, v1, v1, v2}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
     return-void
 .end method
@@ -154,8 +151,6 @@
 
     iput p3, p2, Landroid/graphics/RectF;->left:F
 
-    iget-object p2, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->rect:Landroid/graphics/RectF;
-
     int-to-float p3, p5
 
     iput p3, p2, Landroid/graphics/RectF;->top:F
@@ -173,8 +168,6 @@
 
     iput p3, p2, Landroid/graphics/RectF;->right:F
 
-    iget-object p2, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->rect:Landroid/graphics/RectF;
-
     int-to-float p3, p7
 
     iput p3, p2, Landroid/graphics/RectF;->bottom:F
diff --git a/com.discord/smali/com/discord/utilities/spans/BulletSpan$Companion.smali b/com.discord/smali/com/discord/utilities/spans/BulletSpan$Companion.smali
index 9bf19b7e7f..77509ca629 100644
--- a/com.discord/smali/com/discord/utilities/spans/BulletSpan$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/spans/BulletSpan$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spans/BulletSpan$Companion;
 .super Ljava/lang/Object;
+.source "BulletSpan.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali b/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
index 798db2958e..1bbd4e5cbb 100644
--- a/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spans/BulletSpan;
 .super Ljava/lang/Object;
+.source "BulletSpan.kt"
 
 # interfaces
 .implements Landroid/text/style/LeadingMarginSpan;
@@ -265,7 +266,7 @@
 
     if-nez p3, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-virtual {p1, p3, p2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
@@ -289,9 +290,7 @@
 
     div-float/2addr p4, p10
 
-    iget p5, p0, Lcom/discord/utilities/spans/BulletSpan;->mBulletRadius:I
-
-    int-to-float p5, p5
+    int-to-float p5, p9
 
     invoke-virtual {p1, p3, p4, p5, p2}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
 
diff --git a/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali b/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali
index 9f9cab0eba..61bc95497d 100644
--- a/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spans/ClickableSpan;
 .super Landroid/text/style/ClickableSpan;
+.source "ClickableSpan.kt"
 
 
 # instance fields
@@ -81,8 +82,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/spans/ClickableSpan;->color:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
diff --git a/com.discord/smali/com/discord/utilities/spans/TypefaceSpan$Monospace.smali b/com.discord/smali/com/discord/utilities/spans/TypefaceSpan$Monospace.smali
index bb7da1ba3d..2fa9ac88ab 100644
--- a/com.discord/smali/com/discord/utilities/spans/TypefaceSpan$Monospace.smali
+++ b/com.discord/smali/com/discord/utilities/spans/TypefaceSpan$Monospace.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spans/TypefaceSpan$Monospace;
 .super Landroid/text/style/TypefaceSpan;
+.source "TypefaceSpan.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/spans/TypefaceSpan.smali b/com.discord/smali/com/discord/utilities/spans/TypefaceSpan.smali
index b992043a02..d17ec0660c 100644
--- a/com.discord/smali/com/discord/utilities/spans/TypefaceSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/TypefaceSpan.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spans/TypefaceSpan;
 .super Landroid/text/style/MetricAffectingSpan;
+.source "TypefaceSpan.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali b/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali
index c9541b8ab2..089f4b14ee 100644
--- a/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spans/VerticalPaddingSpan;
 .super Ljava/lang/Object;
+.source "VerticalPaddingSpan.kt"
 
 # interfaces
 .implements Landroid/text/style/LineHeightSpan;
@@ -123,10 +124,9 @@
 
     sub-int/2addr p2, p4
 
-    :goto_1
     iput p2, p6, Landroid/graphics/Paint$FontMetricsInt;->ascent:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget p2, p0, Lcom/discord/utilities/spans/VerticalPaddingSpan;->origTop:I
@@ -135,9 +135,9 @@
 
     iget p2, p0, Lcom/discord/utilities/spans/VerticalPaddingSpan;->origAscent:I
 
-    goto :goto_1
+    iput p2, p6, Landroid/graphics/Paint$FontMetricsInt;->ascent:I
 
-    :goto_2
+    :goto_1
     invoke-interface {p1, p0}, Landroid/text/Spanned;->getSpanEnd(Ljava/lang/Object;)I
 
     move-result p1
@@ -158,7 +158,6 @@
 
     add-int/2addr p1, p2
 
-    :goto_3
     iput p1, p6, Landroid/graphics/Paint$FontMetricsInt;->descent:I
 
     return-void
@@ -170,7 +169,9 @@
 
     iget p1, p0, Lcom/discord/utilities/spans/VerticalPaddingSpan;->origDescent:I
 
-    goto :goto_3
+    iput p1, p6, Landroid/graphics/Paint$FontMetricsInt;->descent:I
+
+    return-void
 .end method
 
 .method public final getPaddingBottom()I
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali
index 2ae27a5fb2..66a5d00358 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyApiClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 9ac70b79ff..c6e7ef22f2 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyApiClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali
index 04e711f640..e30a18428e 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyApiClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 105e3ca6b4..8f5d7edd7c 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyApiClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -104,6 +105,8 @@
 
     invoke-static {p1, v0}, Lcom/discord/utilities/spotify/SpotifyApiClient;->access$setTrackIdToFetch(Lcom/discord/utilities/spotify/SpotifyApiClient;Ljava/lang/String;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali
index 824c6ef143..33c564295f 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2;
 .super Lkotlin/jvm/internal/k;
+.source "SpotifyApiClient.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
index bab1d0a0aa..425cb7c246 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/spotify/SpotifyApiClient;
 .super Ljava/lang/Object;
+.source "SpotifyApiClient.kt"
 
 
 # instance fields
@@ -43,7 +44,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/spotify/SpotifyApiClient;->spotifyTracks:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -238,8 +239,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/utilities/spotify/SpotifyApiClient;->tokenSubscription:Lrx/Subscription;
-
     if-eqz v0, :cond_0
 
     invoke-interface {v0}, Lrx/Subscription;->isUnsubscribed()Z
diff --git a/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali b/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali
index c82061a72a..2718bbf42b 100644
--- a/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali
+++ b/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/ssl/SecureSocketsLayerUtils;
 .super Ljava/lang/Object;
+.source "SecureSocketsLayerUtils.kt"
 
 
 # static fields
@@ -273,6 +274,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1.smali
index 89373a4754..ae9fb3cf89 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1;
 .super Ljava/lang/Object;
+.source "StatefulViews.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2.smali
index 14773848f9..dda4570a57 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2;
 .super Ljava/lang/Object;
+.source "StatefulViews.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 84d7e1aee0..9374abf7f0 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;
 .super Ljava/lang/Object;
+.source "StatefulViews.kt"
 
 
 # annotations
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 2313da43c1..6462ce9dbf 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$configureSaveActionView$1;
 .super Lkotlin/jvm/internal/k;
+.source "StatefulViews.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0e9654d795..faad2b65a8 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$2.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$configureSaveActionView$2;
 .super Lkotlin/jvm/internal/k;
+.source "StatefulViews.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 9ef4148c99..5809fbe41a 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1;
 .super Ljava/lang/Object;
+.source "StatefulViews.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali
index c8d9dd563e..241529f45a 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "StatefulViews.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali
index 31fc869c2a..1d1e166407 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;
 .super Ljava/lang/Object;
+.source "StatefulViews.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
index c45e34b302..5ebeba559e 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/stateful/StatefulViews;
 .super Ljava/lang/Object;
+.source "StatefulViews.kt"
 
 
 # annotations
@@ -593,6 +594,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/stateful/StatefulViews$configureSaveActionView$1;->invoke(Landroid/view/View;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali b/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali
index 74cafddb55..d73373ddfa 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/textprocessing/AstRenderer;
 .super Ljava/lang/Object;
+.source "AstRenderer.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$Companion.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$Companion.smali
index 9014cda96d..b7973f00f2 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessagePreprocessor$Companion;
 .super Ljava/lang/Object;
+.source "MessagePreprocessor.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$process$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$process$1.smali
index bf1f59bf56..20dc9779b7 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$process$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$process$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/MessagePreprocessor$process$1;
 .super Ljava/lang/Object;
+.source "MessagePreprocessor.kt"
 
 # interfaces
 .implements Lcom/discord/simpleast/core/b/b;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali
index 445763bb07..c39a521703 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1;
 .super Ljava/lang/Object;
+.source "MessagePreprocessor.kt"
 
 # interfaces
 .implements Lcom/discord/simpleast/core/b/b;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
index ef692b53a1..acb6a77f82 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessagePreprocessor;
 .super Ljava/lang/Object;
+.source "MessagePreprocessor.kt"
 
 # interfaces
 .implements Lcom/discord/simpleast/core/b/b;
@@ -168,7 +169,7 @@
     const/4 v0, 0x0
 
     :goto_2
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -246,6 +247,9 @@
 
     :cond_5
     return-void
+
+    :cond_6
+    return-void
 .end method
 
 .method private final setFoundSelfMention(Z)V
@@ -411,7 +415,7 @@
 
     const/4 v2, 0x1
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
@@ -429,27 +433,28 @@
 
     if-gt v0, v3, :cond_0
 
-    :goto_0
     const/4 v0, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     instance-of v0, p1, Lcom/discord/simpleast/core/node/StyleNode;
 
     if-eqz v0, :cond_2
 
+    const/4 v0, 0x1
+
     goto :goto_0
 
     :cond_2
     instance-of v0, p1, Lcom/discord/simpleast/core/node/a;
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_3
 
     move-object v0, p1
 
@@ -465,31 +470,36 @@
 
     move-result v0
 
-    :goto_1
-    if-eqz v0, :cond_3
-
-    const/4 v0, 0x1
-
-    goto :goto_2
+    goto :goto_0
 
     :cond_3
     const/4 v0, 0x0
 
-    :goto_2
+    :goto_0
+    if-eqz v0, :cond_4
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v0, 0x0
+
+    :goto_1
     iput-boolean v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->shouldJumboify:Z
 
     instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/CodeNode;
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     iput-boolean v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->hasCodeNode:Z
 
     return-void
 
-    :cond_4
+    :cond_5
     instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/UserMentionNode;
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     check-cast p1, Lcom/discord/utilities/textprocessing/node/UserMentionNode;
 
@@ -501,20 +511,20 @@
 
     cmp-long p1, v0, v3
 
-    if-nez p1, :cond_8
+    if-nez p1, :cond_9
 
     iput-boolean v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundSelfMention:Z
 
     return-void
 
-    :cond_5
+    :cond_6
     instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/SpoilerNode;
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_9
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->spoilers:Ljava/util/List;
 
-    if-nez v0, :cond_6
+    if-nez v0, :cond_7
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -524,7 +534,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->spoilers:Ljava/util/List;
 
-    :cond_6
+    :cond_7
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v2
@@ -533,7 +543,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->visibleSpoilerNodeIndices:Ljava/util/Collection;
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -543,11 +553,11 @@
 
     move-result v1
 
-    :cond_7
+    :cond_8
     check-cast p1, Lcom/discord/utilities/textprocessing/node/SpoilerNode;
 
     invoke-virtual {p1, v2, v1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->updateState(IZ)V
 
-    :cond_8
+    :cond_9
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali
index 48a11fe14e..f7eef33988 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageRenderContext;
 .super Ljava/lang/Object;
+.source "MessageRenderContext.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext;
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 5e0e1f4ff8..392705d439 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "MessageUnparser.kt"
 
 
 # annotations
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 1992c44724..f49d3a4224 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "MessageUnparser.kt"
 
 
 # annotations
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 30109ce749..c061a4c173 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "MessageUnparser.kt"
 
 
 # annotations
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 5e7ad9418f..e5fc8f4dec 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "MessageUnparser.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
index 18f159402f..b6afcf1765 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUnparser;
 .super Ljava/lang/Object;
+.source "MessageUnparser.kt"
 
 
 # static fields
@@ -32,7 +33,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_USER_MENTION:Ljava/util/regex/Pattern;
@@ -45,7 +46,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_ROLE_MENTION:Ljava/util/regex/Pattern;
@@ -58,7 +59,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_CHANNEL_MENTION:Ljava/util/regex/Pattern;
@@ -71,7 +72,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_3
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_CUSTOM_EMOJI:Ljava/util/regex/Pattern;
@@ -308,7 +309,7 @@
 
     sget-object p2, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eg()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 8034945244..822c0b9b36 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUtils;
 .super Ljava/lang/Object;
+.source "MessageUtils.kt"
 
 
 # static fields
@@ -215,16 +216,21 @@
 
     move-result-object p0
 
-    if-eqz p0, :cond_0
+    if-eqz p0, :cond_2
 
     invoke-virtual {p0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
     move-result-object p0
 
-    if-eqz p0, :cond_0
+    if-eqz p0, :cond_2
 
     iget-object p0, p0, Landroid/content/res/Configuration;->locale:Ljava/util/Locale;
 
+    goto :goto_0
+
+    :cond_2
+    move-object p0, v1
+
     :goto_0
     new-instance v0, Ljava/util/Locale;
 
@@ -232,13 +238,13 @@
 
     invoke-direct {v0, v2}, Ljava/util/Locale;-><init>(Ljava/lang/String;)V
 
-    if-eqz p0, :cond_2
+    if-eqz p0, :cond_3
 
     invoke-virtual {p0}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
 
     move-result-object v1
 
-    :cond_2
+    :cond_3
     invoke-virtual {v0}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
 
     move-result-object p0
@@ -249,13 +255,13 @@
 
     xor-int/lit8 p0, p0, 0x1
 
-    if-eqz p0, :cond_3
+    if-eqz p0, :cond_4
 
     const-wide/16 p0, 0x0
 
     goto :goto_1
 
-    :cond_3
+    :cond_4
     invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
 
     move-result-object p0
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali
index 9b85429fe1..734303a55e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1;
 .super Lkotlin/jvm/internal/k;
+.source "Parsers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 642f234e35..08dd14daa9 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1;
 .super Ljava/lang/Object;
+.source "Parsers.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/UrlNode$RenderContext;
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 2762189274..88b0be1938 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1;
 .super Ljava/lang/Object;
+.source "Parsers.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/UrlNode$RenderContext;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
index 34be5e4ac2..9411005c85 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers;
 .super Ljava/lang/Object;
+.source "Parsers.kt"
 
 
 # static fields
@@ -293,7 +294,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->v(Z)Ljava/util/List;
+    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->u(Z)Ljava/util/List;
 
     move-result-object v0
 
@@ -327,7 +328,7 @@
 
     sget-object v2, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ef()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -337,7 +338,7 @@
 
     sget-object v2, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -415,7 +416,7 @@
 
     sget-object v2, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ef()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -425,7 +426,7 @@
 
     sget-object v2, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -515,7 +516,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ei()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eh()Ljava/util/List;
 
     move-result-object v2
 
@@ -603,7 +604,7 @@
     :cond_1
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-interface {v1}, Lkotlin/text/MatchResult;->getRange()Lkotlin/ranges/IntRange;
@@ -630,7 +631,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-interface {v1}, Lkotlin/text/MatchResult;->Fw()Lkotlin/text/MatchResult;
+    invoke-interface {v1}, Lkotlin/text/MatchResult;->Fv()Lkotlin/text/MatchResult;
 
     move-result-object v1
 
@@ -731,7 +732,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ei()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eh()Ljava/util/List;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$EmojiDataProvider.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$EmojiDataProvider.smali
index a73d5551f8..704a7bb795 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$EmojiDataProvider.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$EmojiDataProvider.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;
 .super Ljava/lang/Object;
+.source "Rules.kt"
 
 
 # annotations
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 ffdbd7c7d0..8cae79df5c 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$HeaderLineClassedRule;
 .super Lcom/discord/simpleast/a/a$a;
+.source "Rules.kt"
 
 
 # annotations
@@ -141,6 +142,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_0
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
index 88e571766e..b519231d3e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$MarkdownListItemRule;
 .super Lcom/discord/simpleast/core/parser/Rule$a;
+.source "Rules.kt"
 
 
 # annotations
@@ -59,7 +60,7 @@
 
     sget-object v0, Lcom/discord/simpleast/a/a;->yK:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->ej()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->ei()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali
index 95d9faf928..375fb7e84e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2;
 .super Lkotlin/jvm/internal/k;
+.source "Rules.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 f1adcbc993..a0df421f4a 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createChannelMentionRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 32a1369e1e..29188768d9 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createCodeBlockRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
index c4f846df0b..741a3a15e1 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1;
 .super Lkotlin/jvm/internal/k;
+.source "Rules.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 92ff18c7f5..addb9fd333 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 22000fc671..0e4a3d760c 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createHookedLinkRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 ad514bef71..ec673e4327 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createInlineCodeRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInviteRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInviteRule$1.smali
index 0deaa723fc..baa6d0fb78 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInviteRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInviteRule$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createInviteRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 53c8091e2a..82e29fdc74 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createMaskedLinkRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 e9a8ed298d..2d7ddce33a 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createNamedEmojiRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 8f6a13636e..88894bf76e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createNonMarkdownRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 9e2483d8d1..5e30f91b2f 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createRoleMentionRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 ecfdc52749..1830468100 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createSoftHyphenRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 642f4d2406..5a439b2d11 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createSpoilerRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 ef1a922d8a..67c521465c 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createTextReplacementRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
@@ -69,7 +70,7 @@
 
     sget-object p2, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eg()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p2
 
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 f2c0b316aa..759f6f3b84 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createUnescapeEmoticonRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 4f1b4f02ca..3945ab68db 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createUnicodeEmojiRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 a6e75a721c..5caee70c8d 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createUrlNoEmbedRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 f3e2cc2c4a..19e90e9559 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createUrlRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
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 084b0ff51d..0d622bf736 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createUserMentionRule$1;
 .super Lcom/discord/simpleast/core/parser/Rule;
+.source "Rules.kt"
 
 
 # annotations
@@ -138,17 +139,16 @@
 
     sget-object p1, Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;->HERE:Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;
 
-    :goto_0
     move-object v1, p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     sget-object p1, Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;->EVERYONE:Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;
 
-    goto :goto_0
+    move-object v1, p1
 
-    :goto_1
+    :goto_0
     const-wide/16 v2, 0x0
 
     const/4 v4, 0x2
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
index cc64724b99..50fbfd43de 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules;
 .super Ljava/lang/Object;
+.source "Rules.kt"
 
 
 # annotations
@@ -810,7 +811,7 @@
 
     sget-object v1, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ef()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ee()Ljava/util/regex/Pattern;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali
index a4900b14bf..54857c965d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;
 .super Lkotlin/jvm/internal/k;
+.source "Spans.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali
index 2798f93115..355c811759 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1;
 .super Lkotlin/jvm/internal/k;
+.source "Spans.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali
index 5f362c71df..934c1250eb 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1;
 .super Lkotlin/jvm/internal/k;
+.source "Spans.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -58,7 +59,6 @@
 
     invoke-direct {p1, v0}, Landroid/text/style/StyleSpan;-><init>(I)V
 
-    :goto_0
     check-cast p1, Landroid/text/style/CharacterStyle;
 
     return-object p1
@@ -72,7 +72,9 @@
 
     invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
-    goto :goto_0
+    check-cast p1, Landroid/text/style/CharacterStyle;
+
+    return-object p1
 .end method
 
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali
index 344aa3268a..a0ea00a6b2 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "Spans.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -83,9 +84,7 @@
 
     iget v2, p0, Lcom/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1;->$bulletVerticalPadding:I
 
-    iget v3, p0, Lcom/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1;->$bulletVerticalPadding:I
-
-    invoke-direct {v1, v2, v3}, Lcom/discord/utilities/spans/VerticalPaddingSpan;-><init>(II)V
+    invoke-direct {v1, v2, v2}, Lcom/discord/utilities/spans/VerticalPaddingSpan;-><init>(II)V
 
     check-cast v1, Landroid/text/style/ParagraphStyle;
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
index b97302f986..93d0b179ba 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Spans;
 .super Ljava/lang/Object;
+.source "Spans.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali b/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali
index 47bd0ce61f..59f70bbedd 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/Tags;
 .super Ljava/lang/Object;
+.source "TagsBuilder.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali
index 59f2e124d5..309696c553 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/TagsBuilder$Companion;
 .super Ljava/lang/Object;
+.source "TagsBuilder.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
index 0e3bcbbd49..6d83b005d2 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/TagsBuilder;
 .super Ljava/lang/Object;
+.source "TagsBuilder.kt"
 
 # interfaces
 .implements Lcom/discord/simpleast/core/b/b;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/BasicRenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/BasicRenderContext.smali
index f8c6c67431..6cb5984156 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/BasicRenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/BasicRenderContext.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/BasicRenderContext;
 .super Ljava/lang/Object;
+.source "BasicRenderContext.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali
index debf4516d0..123ace4129 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext;
 .super Ljava/lang/Object;
+.source "ChannelMentionNode.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext;
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 1b1bdcd29e..dfb6baf521 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$render$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$render$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;
 .super Lkotlin/jvm/internal/k;
+.source "ChannelMentionNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 34159ee13e..f76225d16c 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/ChannelMentionNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "ChannelMentionNode.kt"
 
 
 # annotations
@@ -160,10 +161,9 @@
 
     invoke-direct {v5, v4, v3, v6}, Lcom/discord/utilities/spans/ClickableSpan;-><init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;)V
 
-    :goto_1
     invoke-virtual {v2, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     new-instance v5, Landroid/text/style/ForegroundColorSpan;
@@ -174,9 +174,9 @@
 
     invoke-direct {v5, v4}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
 
-    goto :goto_1
+    invoke-virtual {v2, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :goto_2
+    :goto_1
     new-instance v4, Landroid/text/style/BackgroundColorSpan;
 
     const v5, 0x7f0600f0
@@ -205,7 +205,7 @@
 
     move-result-object p2
 
-    :goto_3
+    :goto_2
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
@@ -226,7 +226,7 @@
 
     invoke-virtual {p1, v0, v1, v2, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     return-void
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 c109bc0f2a..481c9125e1 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/CodeNode;
 .super Lcom/discord/simpleast/core/node/a;
+.source "CodeNode.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/Spoilerable;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali
index 7585e4c5c4..bacfebf4e1 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1;
 .super Lkotlin/jvm/internal/k;
+.source "EmojiNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali
index 3e58926e58..9e421c942f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5;
 .super Lkotlin/jvm/internal/k;
+.source "EmojiNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$renderEmoji$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$renderEmoji$1.smali
index 27f2dbeea3..57acaa1671 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$renderEmoji$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$renderEmoji$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$renderEmoji$1;
 .super Ljava/lang/Object;
+.source "EmojiNode.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali
index 2efa9dc1da..559dbbf035 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;
 .super Ljava/lang/Object;
+.source "EmojiNode.kt"
 
 
 # annotations
@@ -79,7 +80,7 @@
 
     if-nez v4, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     const-string v5, "it.id!!"
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$RenderContext.smali
index db496f27dd..1c1da7d7a4 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$RenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$RenderContext.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;
 .super Ljava/lang/Object;
+.source "EmojiNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$placeholderSpan$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$placeholderSpan$1.smali
index 1c3664965c..a002ed0ee1 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$placeholderSpan$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$placeholderSpan$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode$render$placeholderSpan$1;
 .super Landroid/text/style/ReplacementSpan;
+.source "EmojiNode.kt"
 
 
 # annotations
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 452425b772..18f865bf4b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode;
 .super Lcom/discord/simpleast/core/node/a;
+.source "EmojiNode.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/Spoilerable;
@@ -433,11 +434,11 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p2
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fN()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
@@ -447,13 +448,13 @@
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p2, v1}, Lcom/facebook/drawee/backends/pipeline/e;->x(Z)Lcom/facebook/drawee/controller/a;
+    invoke-virtual {p2, v1}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
 
     move-result-object p2
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p2}, Lcom/facebook/drawee/backends/pipeline/e;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p2}, Lcom/facebook/drawee/backends/pipeline/e;->gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p2
 
@@ -483,7 +484,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->gE()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->gD()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$clickableSpan$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$clickableSpan$1.smali
index 1d306732c9..577c4d08f1 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$clickableSpan$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$clickableSpan$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/node/InviteNode$render$clickableSpan$1;
 .super Lkotlin/jvm/internal/k;
+.source "InviteNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali
index 34e7c8304e..a4499242e7 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/InviteNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "InviteNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext.smali
index 61c6812f14..db77ae802a 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext;
 .super Ljava/lang/Object;
+.source "RoleMentionNode.kt"
 
 
 # annotations
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 46fd0de825..c9e2d1f64f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/RoleMentionNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "RoleMentionNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$RenderContext.smali
index 12d48a6325..1d41386f1a 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$RenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$RenderContext.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
 .super Ljava/lang/Object;
+.source "SpoilerNode.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext;
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 d0fc8a9fe4..ceb5c43a2b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "SpoilerNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 318f01f340..c593cfc37e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/SpoilerNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "SpoilerNode.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/Spoilerable;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali
index 4d1ca224ae..ab67d66f64 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/Spoilerable;
 .super Ljava/lang/Object;
+.source "Spoilerable.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali
index 1d422264ae..1e4d33aebc 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/UrlNode$Companion;
 .super Ljava/lang/Object;
+.source "UrlNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali
index a76c0e8f46..5813705a12 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/UrlNode$RenderContext;
 .super Ljava/lang/Object;
+.source "UrlNode.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext;
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 27680ea578..18a99a3fae 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$1;
 .super Lkotlin/jvm/internal/k;
+.source "UrlNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali
index ced88f4d02..6fa3fa027e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/UrlNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "UrlNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$RenderContext.smali
index 68e9e04678..8eca700b1b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$RenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$RenderContext.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/textprocessing/node/UserMentionNode$RenderContext;
 .super Ljava/lang/Object;
+.source "UserMentionNode.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$Type.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$Type.smali
index 6729430b05..bda5b60b36 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$Type.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;
 .super Ljava/lang/Enum;
+.source "UserMentionNode.kt"
 
 
 # annotations
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 0664cc045d..06796f7caf 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1;
 .super Lkotlin/jvm/internal/k;
+.source "UserMentionNode.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 41f4c43697..0cd116ae92 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/textprocessing/node/UserMentionNode;
 .super Lcom/discord/simpleast/core/node/Node;
+.source "UserMentionNode.kt"
 
 
 # annotations
@@ -199,6 +200,8 @@
 
     invoke-direct {v0, p2, v5, v3}, Lcom/discord/utilities/spans/ClickableSpan;-><init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;)V
 
+    invoke-virtual {v6, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
     goto :goto_2
 
     :cond_4
@@ -210,9 +213,9 @@
 
     invoke-direct {v0, p2}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
 
-    :goto_2
     invoke-virtual {v6, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
+    :goto_2
     check-cast v1, Ljava/lang/CharSequence;
 
     invoke-virtual {p1, v1}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
diff --git a/com.discord/smali/com/discord/utilities/time/TimeUtils.smali b/com.discord/smali/com/discord/utilities/time/TimeUtils.smali
index c88699b7e8..cf74c26119 100644
--- a/com.discord/smali/com/discord/utilities/time/TimeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/time/TimeUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/time/TimeUtils;
 .super Ljava/lang/Object;
+.source "TimeUtils.kt"
 
 
 # static fields
@@ -38,18 +39,28 @@
 
     move-result-wide p3
 
+    move-wide v3, p3
+
+    goto :goto_0
+
     :cond_0
     move-wide v3, p3
 
+    :goto_0
     and-int/lit8 p3, p6, 0x4
 
     if-eqz p3, :cond_1
 
     const/4 p5, 0x0
 
+    move-object v5, p5
+
+    goto :goto_1
+
     :cond_1
     move-object v5, p5
 
+    :goto_1
     move-object v0, p0
 
     move-wide v1, p1
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali
index aa2bf2bebc..bffa1d3feb 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/uri/UriHandler$directToPlayStore$1;
 .super Lkotlin/jvm/internal/k;
+.source "UriHandler.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali
index 375da2b569..26b972d41b 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "UriHandler.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$1$2.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$1$2.smali
index b5e2f81875..008406267b 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$1$2.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$1$2;
 .super Ljava/lang/Object;
+.source "UriHandler.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
index 00ba28a38c..164ee9947f 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/uri/UriHandler;
 .super Ljava/lang/Object;
+.source "UriHandler.kt"
 
 
 # static fields
@@ -396,6 +397,8 @@
 
     invoke-direct {v1, p0, v0, p1, p2}, Lcom/discord/utilities/uri/UriHandler;->openUrlExternally(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 
+    return-void
+
     :cond_2
     :goto_1
     return-void
@@ -589,15 +592,17 @@
 
     invoke-direct {p2, p1, p3}, Lcom/discord/utilities/uri/UriHandler;->showUnhandledUrlDialog(Landroid/content/Context;Ljava/lang/String;)V
 
+    sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+
     goto :goto_0
 
     :cond_1
     invoke-virtual {p1, v0}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
-    :goto_0
     sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
     :cond_2
+    :goto_0
     return-void
 .end method
 
@@ -684,6 +689,24 @@
     return-void
 
     :catch_0
+    sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v5, 0xc
+
+    const/4 v6, 0x0
+
+    move-object v1, p0
+
+    move-object v2, p1
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/uri/UriHandler;->openUrlExternally$default(Lcom/discord/utilities/uri/UriHandler;Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+
+    return-void
+
     :cond_0
     sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
diff --git a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$1.smali b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$1.smali
index 24412d0ce5..cb44c8abea 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$1.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/users/UserRequestManager$requestUser$1;
 .super Ljava/lang/Object;
+.source "UserRequestManager.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$2.smali b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$2.smali
index 75d778ea76..dd2c5b0c0c 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$2.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/users/UserRequestManager$requestUser$2;
 .super Ljava/lang/Object;
+.source "UserRequestManager.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -58,6 +59,8 @@
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali
index 26cac6db6f..cc9eb97627 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/users/UserRequestManager$requestUser$3;
 .super Ljava/lang/Object;
+.source "UserRequestManager.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali b/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
index d2f402e3ac..58d828c3b0 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/users/UserRequestManager;
 .super Ljava/lang/Object;
+.source "UserRequestManager.kt"
 
 
 # instance fields
@@ -206,7 +207,7 @@
 
     check-cast v1, Lrx/functions/Action0;
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v2
 
@@ -326,4 +327,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali
index d3919cd125..9bbc427269 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/extensions/ViewExtensions$fadeIn$1;
 .super Lkotlin/jvm/internal/k;
+.source "ViewExtensions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 13fe6f9dbe..64b6f908a6 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$2.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/extensions/ViewExtensions$fadeIn$2;
 .super Lkotlin/jvm/internal/k;
+.source "ViewExtensions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 efb4d12a8b..43d2720410 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/extensions/ViewExtensions$fadeOut$1;
 .super Lkotlin/jvm/internal/k;
+.source "ViewExtensions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$2.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$2.smali
index f6932718d0..d78b239a46 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$2.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/extensions/ViewExtensions$fadeOut$2;
 .super Ljava/lang/Object;
+.source "ViewExtensions.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$hintWithRipple$1.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$hintWithRipple$1.smali
index c91f406493..076af0d924 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$hintWithRipple$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$hintWithRipple$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/extensions/ViewExtensions$hintWithRipple$1;
 .super Ljava/lang/Object;
+.source "ViewExtensions.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali
index 63702a2dea..d392d8cea0 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1;
 .super Ljava/lang/Object;
+.source "ViewExtensions.kt"
 
 # interfaces
 .implements Landroid/widget/TextView$OnEditorActionListener;
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 d942c69adc..758c03ba99 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/extensions/ViewExtensions;
 .super Ljava/lang/Object;
+.source "ViewExtensions.kt"
 
 
 # static fields
@@ -945,6 +946,8 @@
     :goto_0
     invoke-virtual {p0, p1}, Landroid/view/View;->setVisibility(I)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali
index 580d0add11..a04021e5b2 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/grid/FrameGridLayout$Children;
 .super Ljava/lang/Object;
+.source "FrameGridLayout.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Companion.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Companion.smali
index 020962acab..607f996924 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/grid/FrameGridLayout$Companion;
 .super Ljava/lang/Object;
+.source "FrameGridLayout.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Data.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Data.smali
index 2ea37bad76..7bac2cba35 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Data.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Data.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/view/grid/FrameGridLayout$Data;
 .super Ljava/lang/Object;
+.source "FrameGridLayout.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView$DefaultImpls.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView$DefaultImpls.smali
index 437400c3e8..581715b164 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView$DefaultImpls.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/grid/FrameGridLayout$DataView$DefaultImpls;
 .super Ljava/lang/Object;
+.source "FrameGridLayout.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView.smali
index 28ff2e0772..7e695c0b54 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$DataView.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/view/grid/FrameGridLayout$DataView;
 .super Ljava/lang/Object;
+.source "FrameGridLayout.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$PositionSpec.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$PositionSpec.smali
index acb971260b..d68d60b9fd 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$PositionSpec.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$PositionSpec.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;
 .super Ljava/lang/Object;
+.source "FrameGridLayout.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$SizeCalculator.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$SizeCalculator.smali
index 2017948fb8..0f314635cd 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$SizeCalculator.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$SizeCalculator.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/grid/FrameGridLayout$SizeCalculator;
 .super Ljava/lang/Object;
+.source "FrameGridLayout.kt"
 
 
 # annotations
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 96bc002acc..bdf6d8eaa2 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$bindViews$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$bindViews$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/grid/FrameGridLayout$bindViews$1;
 .super Lkotlin/jvm/internal/k;
+.source "FrameGridLayout.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -76,7 +77,7 @@
     :cond_0
     check-cast p2, Lcom/discord/utilities/view/grid/FrameGridLayout$DataView;
 
-    if-eqz p2, :cond_2
+    if-eqz p2, :cond_3
 
     invoke-interface {p2, p1}, Lcom/discord/utilities/view/grid/FrameGridLayout$DataView;->onBind(Lcom/discord/utilities/view/grid/FrameGridLayout$Data;)V
 
@@ -107,4 +108,7 @@
 
     :cond_2
     return-void
+
+    :cond_3
+    return-void
 .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 f0d33108c4..41e9110916 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onLayout$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onLayout$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/grid/FrameGridLayout$onLayout$1;
 .super Lkotlin/jvm/internal/k;
+.source "FrameGridLayout.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 b440cb7dc7..548a0d1b08 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onMeasure$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onMeasure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/view/grid/FrameGridLayout$onMeasure$1;
 .super Lkotlin/jvm/internal/k;
+.source "FrameGridLayout.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
index bbb2313194..5a142be138 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/grid/FrameGridLayout;
 .super Landroid/widget/FrameLayout;
+.source "FrameGridLayout.kt"
 
 
 # annotations
@@ -480,7 +481,7 @@
 
     if-gez v2, :cond_5
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_5
     check-cast v4, Lcom/discord/utilities/view/grid/FrameGridLayout$Data;
diff --git a/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali b/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali
index 16151851bb..fda8bf1c93 100644
--- a/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt;
 .super Ljava/lang/Object;
+.source "LayoutParamsExtensions.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali b/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali
index 7abc7e946d..58ec94b231 100644
--- a/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali
+++ b/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/recycler/MaxHeightRecyclerView;
 .super Landroidx/recyclerview/widget/RecyclerView;
+.source "MaxHeightRecyclerView.kt"
 
 
 # instance fields
@@ -125,11 +126,9 @@
 
     if-lez v0, :cond_0
 
-    iget p2, p0, Lcom/discord/utilities/view/recycler/MaxHeightRecyclerView;->maxHeight:I
+    const/high16 p2, -0x80000000
 
-    const/high16 v0, -0x80000000
-
-    invoke-static {p2, v0}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    invoke-static {v0, p2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result p2
 
diff --git a/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali b/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali
index 481e0ec92b..6d884faacb 100644
--- a/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali
+++ b/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/recycler/PaddedItemDecorator;
 .super Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;
+.source "PaddedItemDecorator.kt"
 
 
 # instance fields
@@ -142,9 +143,6 @@
 
     iput p2, p1, Landroid/graphics/Rect;->left:I
 
-    :goto_0
-    iget p2, p0, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;->spaceHorz:I
-
     iput p2, p1, Landroid/graphics/Rect;->right:I
 
     return-void
@@ -154,8 +152,6 @@
 
     iput p4, p1, Landroid/graphics/Rect;->top:I
 
-    iget p4, p0, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;->spaceVert:I
-
     iput p4, p1, Landroid/graphics/Rect;->bottom:I
 
     invoke-virtual {p3, p2}, Landroidx/recyclerview/widget/RecyclerView;->getChildAdapterPosition(Landroid/view/View;)I
@@ -169,7 +165,11 @@
     :cond_1
     iput v0, p1, Landroid/graphics/Rect;->left:I
 
-    goto :goto_0
+    iget p2, p0, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;->spaceHorz:I
+
+    iput p2, p1, Landroid/graphics/Rect;->right:I
+
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali b/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali
index 426d50b120..343faaed7d 100644
--- a/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali
+++ b/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/scroll/MaxHeightScrollView;
 .super Landroid/widget/ScrollView;
+.source "MaxHeightScrollView.kt"
 
 
 # instance fields
@@ -125,11 +126,9 @@
 
     if-lez v0, :cond_0
 
-    iget p2, p0, Lcom/discord/utilities/view/scroll/MaxHeightScrollView;->maxHeight:I
+    const/high16 p2, -0x80000000
 
-    const/high16 v0, -0x80000000
-
-    invoke-static {p2, v0}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    invoke-static {v0, p2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result p2
 
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 5f1f53f181..6f5f01fce9 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;
 .super Ljava/lang/Object;
+.source "LinkifiedTextView.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
index 7377e39c67..fe85c845f2 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/view/text/LinkifiedTextView;
 .super Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
+.source "LinkifiedTextView.kt"
 
 
 # annotations
@@ -231,7 +232,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/view/text/LinkifiedTextView;->getTouchedLinks(Landroid/text/Spanned;Landroid/view/MotionEvent;)[Landroid/text/style/ClickableSpan;
 
@@ -252,7 +253,7 @@
     :cond_1
     check-cast v2, Landroid/text/style/ClickableSpan;
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_5
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
@@ -260,11 +261,11 @@
 
     const/4 v0, 0x1
 
-    if-ne p1, v0, :cond_3
+    if-ne p1, v0, :cond_4
 
     instance-of p1, v2, Landroid/text/style/URLSpan;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     sget-object p1, Lcom/discord/utilities/view/text/LinkifiedTextView;->onURLSpanClicked:Lkotlin/jvm/functions/Function2;
 
@@ -291,11 +292,20 @@
 
     invoke-virtual {v2, p1}, Landroid/text/style/ClickableSpan;->onClick(Landroid/view/View;)V
 
+    goto :goto_0
+
     :cond_3
+    move-object p1, p0
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-virtual {v2, p1}, Landroid/text/style/ClickableSpan;->onClick(Landroid/view/View;)V
+
+    :cond_4
     :goto_0
     return v0
 
-    :cond_4
+    :cond_5
     return v1
 .end method
 
diff --git a/com.discord/smali/com/discord/utilities/view/text/SimpleDraweeSpanTextView.smali b/com.discord/smali/com/discord/utilities/view/text/SimpleDraweeSpanTextView.smali
index e1ccdbef53..bd56e70cd5 100644
--- a/com.discord/smali/com/discord/utilities/view/text/SimpleDraweeSpanTextView.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/SimpleDraweeSpanTextView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 .super Landroidx/appcompat/widget/AppCompatTextView;
+.source "SimpleDraweeSpanTextView.java"
 
 
 # instance fields
@@ -62,8 +63,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mDraweeStringBuilder:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->e(Landroid/view/View;)V
 
     :cond_0
@@ -87,8 +86,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mDraweeStringBuilder:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->d(Landroid/view/View;)V
 
     :cond_0
@@ -106,8 +103,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mDraweeStringBuilder:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->e(Landroid/view/View;)V
 
     :cond_0
@@ -129,8 +124,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mDraweeStringBuilder:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->d(Landroid/view/View;)V
 
     :cond_0
@@ -148,8 +141,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mDraweeStringBuilder:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->e(Landroid/view/View;)V
 
     :cond_0
@@ -181,11 +172,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-boolean p1, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mIsAttached:Z
+    iget-boolean v0, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mIsAttached:Z
 
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->mDraweeStringBuilder:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    if-eqz v0, :cond_0
 
     invoke-virtual {p1, p0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->d(Landroid/view/View;)V
 
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory.smali
index ea72b5b8e3..6354ca1adb 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory;
 .super Ljava/lang/Object;
+.source "FloatingButtonMenuInitializer.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali
index 7fbb0c03f7..586d4d5799 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1;
 .super Ljava/lang/Object;
+.source "FloatingButtonMenuInitializer.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory;
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 f2a2f6403c..fe8b6f8fb7 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1;
 .super Ljava/lang/Object;
+.source "FloatingButtonMenuInitializer.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory;
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali
index 9ed5c01b31..3784289561 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1;
 .super Ljava/lang/Object;
+.source "FloatingButtonMenuInitializer.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory;
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali
index 37cdd580ed..cdc0c3d978 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FloatingButtonMenuInitializer.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1.smali
index 9cb9a81ae3..6f4c22cd1e 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1;
 .super Ljava/lang/Object;
+.source "FloatingButtonMenuInitializer.kt"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;
@@ -45,15 +46,13 @@
 
 # virtual methods
 .method public final onGlobalLayout()V
-    .locals 3
+    .locals 2
 
     iget-object v0, p0, Lcom/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1;->this$0:Lcom/discord/utilities/views/FloatingButtonMenuInitializer;
 
-    iget-object v1, p0, Lcom/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1;->this$0:Lcom/discord/utilities/views/FloatingButtonMenuInitializer;
+    iget-object v1, p0, Lcom/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1;->$menuContainer:Landroid/view/ViewGroup;
 
-    iget-object v2, p0, Lcom/discord/utilities/views/FloatingButtonMenuInitializer$initialize$1;->$menuContainer:Landroid/view/ViewGroup;
-
-    invoke-static {v1, v2}, Lcom/discord/utilities/views/FloatingButtonMenuInitializer;->access$getMenuAnimators(Lcom/discord/utilities/views/FloatingButtonMenuInitializer;Landroid/view/ViewGroup;)[Landroid/animation/Animator;
+    invoke-static {v0, v1}, Lcom/discord/utilities/views/FloatingButtonMenuInitializer;->access$getMenuAnimators(Lcom/discord/utilities/views/FloatingButtonMenuInitializer;Landroid/view/ViewGroup;)[Landroid/animation/Animator;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
index e8f02aaea7..207a760cd7 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/FloatingButtonMenuInitializer;
 .super Ljava/lang/Object;
+.source "FloatingButtonMenuInitializer.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
index 4d7b389938..6a1e3de642 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/SimpleRecyclerAdapter$Companion;
 .super Ljava/lang/Object;
+.source "SimpleRecyclerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$SimpleViewHolder.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$SimpleViewHolder.smali
index fa0688c70e..e683428c75 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$SimpleViewHolder.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$SimpleViewHolder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/SimpleRecyclerAdapter$SimpleViewHolder;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "SimpleRecyclerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$onBindViewHolder$1.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$onBindViewHolder$1.smali
index 861129666b..2ecc2d0c30 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$onBindViewHolder$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$onBindViewHolder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/views/SimpleRecyclerAdapter$onBindViewHolder$1;
 .super Ljava/lang/Object;
+.source "SimpleRecyclerAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
index 4d33e984b2..e6a7069486 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "SimpleRecyclerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali
index 0ed9b6fa82..0591a56981 100644
--- a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali
+++ b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager;
 .super Ljava/lang/Object;
+.source "StickyHeaderItemDecoration.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter.smali b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter.smali
index 165658f22c..d239e2a81d 100644
--- a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter;
 .super Ljava/lang/Object;
+.source "StickyHeaderItemDecoration.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali
index c9097c0232..8290e09280 100644
--- a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1;
 .super Landroidx/recyclerview/widget/RecyclerView$SimpleOnItemTouchListener;
+.source "StickyHeaderItemDecoration.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali
index e71542dec7..22bf8d1936 100644
--- a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali
+++ b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/StickyHeaderItemDecoration;
 .super Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;
+.source "StickyHeaderItemDecoration.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration.smali b/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration.smali
index 7f08dd32a2..6a356ef950 100644
--- a/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration.smali
+++ b/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration;
 .super Ljava/lang/Object;
+.source "SwipeableItemTouchHelper.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali b/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali
index 24586e687a..2952fd34fe 100644
--- a/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali
+++ b/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/views/SwipeableItemTouchHelper;
 .super Landroidx/recyclerview/widget/ItemTouchHelper$SimpleCallback;
+.source "SwipeableItemTouchHelper.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali
index 3955ff43c6..72fe613078 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$1.smali
index 7ffbc431cf..4d1ea8eeb0 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection$1;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 # interfaces
 .implements Landroid/content/ServiceConnection;
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali
index 8bb111daec..1b205a38f5 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali
index 2c37713873..297064bf06 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali
index 779ddd6f3a..66fdd4d845 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants.smali
index 308a777f28..1a17f1d77f 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/voice/VoiceEngineForegroundService$Constants;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler.smali
index 244f87e342..ec22a0e60e 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
@@ -57,8 +58,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler;->intent:Landroid/content/Intent;
-
     invoke-virtual {v0}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
     move-result-object v0
@@ -239,9 +238,7 @@
 
     iget-object v2, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler;->intent:Landroid/content/Intent;
 
-    iget-object v3, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$IntentHandler;->service:Landroid/app/Service;
-
-    invoke-static {v2, v3}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;->access$500(Landroid/content/Intent;Landroid/content/Context;)Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;
+    invoke-static {v2, v0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;->access$500(Landroid/content/Intent;Landroid/content/Context;)Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;
 
     move-result-object v2
 
@@ -251,10 +248,14 @@
 
     invoke-virtual {v0, v1, v2}, Landroid/app/Service;->startForeground(ILandroid/app/Notification;)V
 
+    return-void
+
     :cond_1
     :goto_1
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x78b14b10 -> :sswitch_4
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali
index 8775e3adb3..d1d51766eb 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder;
 .super Landroid/os/Binder;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
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 9574525025..b2dbb5bb68 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
@@ -348,12 +349,11 @@
 
     const v9, 0x7f120e8e
 
-    :goto_1
     invoke-virtual {v2, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -362,9 +362,11 @@
 
     const v9, 0x7f1209bd
 
-    goto :goto_1
+    invoke-virtual {v2, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
-    :goto_2
+    move-result-object v2
+
+    :goto_1
     invoke-direct {v4, v8, v2, v6}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
 
     aput-object v4, v7, v3
@@ -377,12 +379,12 @@
 
     const v4, 0x7f080239
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const v4, 0x7f080238
 
-    :goto_3
+    :goto_2
     if-eqz p0, :cond_3
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -391,12 +393,11 @@
 
     const v6, 0x7f120e87
 
-    :goto_4
     invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p0
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_3
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -405,9 +406,11 @@
 
     const v6, 0x7f12040a
 
-    goto :goto_4
+    invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
-    :goto_5
+    move-result-object p0
+
+    :goto_3
     invoke-direct {v3, v4, p0, v5}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
 
     aput-object v3, v7, v2
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali
index e04351619a..44ddfede2e 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock;
 .super Ljava/lang/Object;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
index 4a31daa7b6..35c9d961d4 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/utilities/voice/VoiceEngineForegroundService;
 .super Landroid/app/Service;
+.source "VoiceEngineForegroundService.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$1.smali
index 80cf2c46d1..71407903eb 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$1;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali
index 94ec9b1e83..121c44073d 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$2;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Closed.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Closed.smali
index f65941d73a..f0c5fdf416 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Closed.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Closed.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$Closed;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Companion.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Companion.smali
index b00a89ce0a..41cd6cf2db 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$Companion;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali
index 17a2788eef..8aaf256397 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$Error;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Opened.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Opened.smali
index 03319200da..d42e7f6683 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Opened.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Opened.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$Opened;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$State.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$State.smali
index 9f7fb75c39..669439909e 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$State.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$State.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/utilities/websocket/WebSocket$State;
 .super Ljava/lang/Enum;
+.source "WebSocket.kt"
 
 
 # annotations
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 2757c67c04..65a4d079d1 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onClosed$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onClosed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$connect$1$onClosed$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 099e27a042..ba4603f6c6 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onFailure$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onFailure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$connect$1$onFailure$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 2d2582486b..04ab0032ca 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$connect$1$onMessage$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 66167a76ad..d21c17de83 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onOpen$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onOpen$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$connect$1$onOpen$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali
index 603c6cc818..d0d947621b 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$connect$1;
 .super Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
+.source "WebSocket.kt"
 
 
 # annotations
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 2c91383b6f..81b3865002 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onClosed$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onClosed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$onClosed$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 099674649b..fd24d0817b 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onError$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onError$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$onError$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3600ec4368..4200df12be 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onMessage$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onMessage$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$onMessage$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ba70764884..54092fa891 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onOpened$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onOpened$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$onOpened$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 667677b1be..10fabf53be 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$resetListeners$1;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 cde179aa3b..da656d105d 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$2.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$resetListeners$2;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1c050f6d3a..7850205de9 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$3.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$resetListeners$3;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 c95a1c1576..3d49a04443 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$4.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/WebSocket$resetListeners$4;
 .super Lkotlin/jvm/internal/k;
+.source "WebSocket.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
index 078e822ea6..613952c26e 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
 
 
 # annotations
@@ -151,7 +152,7 @@
 
     iput-object p3, p0, Lcom/discord/utilities/websocket/WebSocket;->socketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -187,13 +188,13 @@
 
     iget-object p2, p0, Lcom/discord/utilities/websocket/WebSocket;->schedulerSubject:Lrx/subjects/PublishSubject;
 
-    invoke-virtual {p2}, Lrx/subjects/PublishSubject;->KE()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/subjects/PublishSubject;->KD()Lrx/Observable;
 
     move-result-object p2
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mf()Lrx/Scheduler;
 
     move-result-object p1
 
@@ -291,7 +292,7 @@
 
     invoke-virtual {v0, v1, v2, p2}, Lokhttp3/t$a;->b(JLjava/util/concurrent/TimeUnit;)Lokhttp3/t$a;
 
-    invoke-virtual {v0}, Lokhttp3/t$a;->Hz()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->Hy()Lokhttp3/t;
 
     move-result-object p2
 
@@ -303,7 +304,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocketKt.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocketKt.smali
index 511c0a5930..bf076c7e7d 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocketKt.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocketKt.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/discord/utilities/websocket/WebSocketKt;
 .super Ljava/lang/Object;
+.source "WebSocket.kt"
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali
index 83dccd1180..2d18b20d43 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
 .super Lokhttp3/WebSocketListener;
+.source "ZLibWebSocketListener.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream$Companion.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream$Companion.smali
index c409947783..51ab0fe40f 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream$Companion;
 .super Ljava/lang/Object;
+.source "ZLibWebSocketListener.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali
index 512d921c31..0736284bef 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;
 .super Ljava/io/ByteArrayOutputStream;
+.source "ZLibWebSocketListener.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
index 972bf2e7c0..4cdce1b704 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utilities/websocket/ZLibWebSocketListener;
 .super Lokhttp3/WebSocketListener;
+.source "ZLibWebSocketListener.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utils/R$a.smali b/com.discord/smali/com/discord/utils/R$a.smali
index a0995fb83f..6d8991fb12 100644
--- a/com.discord/smali/com/discord/utils/R$a.smali
+++ b/com.discord/smali/com/discord/utils/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utils/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utils/R$b.smali b/com.discord/smali/com/discord/utils/R$b.smali
index f5634f8669..01bbeeb6ce 100644
--- a/com.discord/smali/com/discord/utils/R$b.smali
+++ b/com.discord/smali/com/discord/utils/R$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utils/R$b;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utils/R.smali b/com.discord/smali/com/discord/utils/R.smali
index 5fda7226ac..032c0e43ff 100644
--- a/com.discord/smali/com/discord/utils/R.smali
+++ b/com.discord/smali/com/discord/utils/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/utils/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/ChatActionItem.smali b/com.discord/smali/com/discord/views/ChatActionItem.smali
index 0a95cbc1d5..3f356c26d3 100644
--- a/com.discord/smali/com/discord/views/ChatActionItem.smali
+++ b/com.discord/smali/com/discord/views/ChatActionItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/ChatActionItem;
 .super Landroid/widget/RelativeLayout;
+.source "ChatActionItem.kt"
 
 
 # instance fields
@@ -11,227 +12,160 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 3
 
     invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    invoke-direct {p0, p2}, Lcom/discord/views/ChatActionItem;->a(Landroid/util/AttributeSet;)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/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    invoke-direct {p0, p2}, Lcom/discord/views/ChatActionItem;->a(Landroid/util/AttributeSet;)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/ChatActionItem;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/discord/views/ChatActionItem;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method private final a(Landroid/util/AttributeSet;)V
-    .locals 4
-
     invoke-virtual {p0}, Lcom/discord/views/ChatActionItem;->getContext()Landroid/content/Context;
 
-    move-result-object v0
-
-    move-object v1, p0
-
-    check-cast v1, Landroid/view/ViewGroup;
-
-    const v2, 0x7f0d0067
-
-    invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    const v0, 0x7f0a0143
-
-    invoke-virtual {p0, v0}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.chat_action_item_text)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Lcom/discord/app/AppTextView;
-
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->yM:Lcom/discord/app/AppTextView;
-
-    const v0, 0x7f0a0142
-
-    invoke-virtual {p0, v0}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.chat_action_item_subtext)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Lcom/discord/app/AppTextView;
-
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->yN:Lcom/discord/app/AppTextView;
-
-    const v0, 0x7f0a0141
-
-    invoke-virtual {p0, v0}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.chat_action_item_image)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Landroid/widget/ImageView;
-
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->yL:Landroid/widget/ImageView;
-
-    invoke-virtual {p0}, Lcom/discord/views/ChatActionItem;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/R$a;->ChatActionItem:[I
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, p1, v1, v2, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
-
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->yM:Lcom/discord/app/AppTextView;
+    move-object v0, p0
 
-    if-nez v0, :cond_0
+    check-cast v0, Landroid/view/ViewGroup;
 
-    const-string v1, "primaryText"
+    const v1, 0x7f0d0067
 
-    invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
+    invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    :cond_0
-    const/4 v1, 0x3
+    const p1, 0x7f0a0143
 
-    invoke-virtual {p1, v1}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, p1}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object p1
 
-    new-array v3, v2, [Ljava/lang/Object;
+    const-string v0, "findViewById(R.id.chat_action_item_text)"
 
-    invoke-virtual {v0, v1, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->yN:Lcom/discord/app/AppTextView;
+    check-cast p1, Lcom/discord/app/AppTextView;
 
-    if-nez v0, :cond_1
+    iput-object p1, p0, Lcom/discord/views/ChatActionItem;->yM:Lcom/discord/app/AppTextView;
 
-    const-string v1, "subtext"
+    const p1, 0x7f0a0142
 
-    invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
 
-    :cond_1
-    const/4 v1, 0x2
+    move-result-object p1
 
-    invoke-virtual {p1, v1}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+    const-string v0, "findViewById(R.id.chat_action_item_subtext)"
 
-    move-result-object v1
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v3, v2, [Ljava/lang/Object;
+    check-cast p1, Lcom/discord/app/AppTextView;
 
-    invoke-virtual {v0, v1, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+    iput-object p1, p0, Lcom/discord/views/ChatActionItem;->yN:Lcom/discord/app/AppTextView;
 
-    const/4 v0, 0x1
+    const p1, 0x7f0a0141
 
-    const v1, 0x7f0800dd
+    invoke-virtual {p0, p1}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
 
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getResourceId(II)I
+    move-result-object p1
 
-    move-result v0
+    const-string v0, "findViewById(R.id.chat_action_item_image)"
 
-    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->yL:Landroid/widget/ImageView;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-nez v1, :cond_2
+    check-cast p1, Landroid/widget/ImageView;
 
-    const-string v3, "image"
-
-    invoke-static {v3}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
-
-    :cond_2
-    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    const/4 v0, -0x1
-
-    invoke-virtual {p1, v2, v0}, Landroid/content/res/TypedArray;->getResourceId(II)I
-
-    move-result v0
+    iput-object p1, p0, Lcom/discord/views/ChatActionItem;->yL:Landroid/widget/ImageView;
 
     invoke-virtual {p0}, Lcom/discord/views/ChatActionItem;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object p1
 
-    invoke-static {v1, v0}, Landroidx/appcompat/content/res/AppCompatResources;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/discord/R$a;->ChatActionItem:[I
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, p2, v0, v1, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+
+    move-result-object p1
+
+    iget-object p2, p0, Lcom/discord/views/ChatActionItem;->yM:Lcom/discord/app/AppTextView;
+
+    if-nez p2, :cond_0
+
+    const-string v0, "primaryText"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
+
+    :cond_0
+    const/4 v0, 0x3
+
+    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
-    if-eqz v0, :cond_4
+    new-array v2, v1, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->yL:Landroid/widget/ImageView;
+    invoke-virtual {p2, v0, v2}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    if-nez v1, :cond_3
+    iget-object p2, p0, Lcom/discord/views/ChatActionItem;->yN:Lcom/discord/app/AppTextView;
+
+    if-nez p2, :cond_1
+
+    const-string v0, "subtext"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
+
+    :cond_1
+    const/4 v0, 0x2
+
+    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-array v2, v1, [Ljava/lang/Object;
+
+    invoke-virtual {p2, v0, v2}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    const/4 p2, 0x1
+
+    const v0, 0x7f0800dd
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getResourceId(II)I
+
+    move-result p2
+
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->yL:Landroid/widget/ImageView;
+
+    if-nez v0, :cond_2
 
     const-string v2, "image"
 
     invoke-static {v2}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
+    :cond_2
+    invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    const/4 p2, -0x1
+
+    invoke-virtual {p1, v1, p2}, Landroid/content/res/TypedArray;->getResourceId(II)I
+
+    move-result p2
+
+    invoke-virtual {p0}, Lcom/discord/views/ChatActionItem;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-static {v0, p2}, Landroidx/appcompat/content/res/AppCompatResources;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_4
+
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->yL:Landroid/widget/ImageView;
+
+    if-nez v0, :cond_3
+
+    const-string v1, "image"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
+
     :cond_3
-    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setBackground(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setBackground(Landroid/graphics/drawable/Drawable;)V
 
     :cond_4
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
diff --git a/com.discord/smali/com/discord/views/CheckableImageView.smali b/com.discord/smali/com/discord/views/CheckableImageView.smali
index 57a957dc1e..7824df6d9a 100644
--- a/com.discord/smali/com/discord/views/CheckableImageView.smali
+++ b/com.discord/smali/com/discord/views/CheckableImageView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/CheckableImageView;
 .super Landroidx/appcompat/widget/AppCompatImageView;
+.source "CheckableImageView.kt"
 
 # interfaces
 .implements Landroid/widget/Checkable;
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$a.smali b/com.discord/smali/com/discord/views/CheckedSetting$a.smali
index 285211b455..e3193c7298 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$a.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/CheckedSetting$a;
 .super Ljava/lang/Object;
+.source "CheckedSetting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$b$a.smali b/com.discord/smali/com/discord/views/CheckedSetting$b$a.smali
index fd545f84c7..b99992e2cd 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$b$a.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/CheckedSetting$b$a;
 .super Ljava/lang/Object;
+.source "CheckedSetting.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$b.smali b/com.discord/smali/com/discord/views/CheckedSetting$b.smali
index 904095e661..c60f017e2f 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$b.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/CheckedSetting$b;
 .super Ljava/lang/Enum;
+.source "CheckedSetting.kt"
 
 
 # annotations
@@ -71,7 +72,7 @@
 
     sput-object v0, Lcom/discord/views/CheckedSetting$b;->yZ:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eo()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->en()[I
 
     move-result-object v0
 
@@ -89,7 +90,7 @@
     .end array-data
 .end method
 
-.method public static final synthetic en()[I
+.method public static final synthetic em()[I
     .locals 1
 
     sget-object v0, Lcom/discord/views/CheckedSetting$b;->yY:[I
@@ -97,7 +98,7 @@
     return-object v0
 .end method
 
-.method public static eo()[I
+.method public static en()[I
     .locals 1
 
     sget-object v0, Lcom/discord/views/CheckedSetting$b;->yX:[I
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$c.smali b/com.discord/smali/com/discord/views/CheckedSetting$c.smali
index 4120896068..b044754008 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$c.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/CheckedSetting$c;
 .super Ljava/lang/Object;
+.source "CheckedSetting.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$d.smali b/com.discord/smali/com/discord/views/CheckedSetting$d.smali
index 1116ec6944..4ced841187 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$d.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/CheckedSetting$d;
 .super Ljava/lang/Object;
+.source "CheckedSetting.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$e.smali b/com.discord/smali/com/discord/views/CheckedSetting$e.smali
index c3a2055892..d735b7b6cb 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$e.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/CheckedSetting$e;
 .super Ljava/lang/Object;
+.source "CheckedSetting.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$f.smali b/com.discord/smali/com/discord/views/CheckedSetting$f.smali
index b5d00fb6fa..a663030103 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$f.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/CheckedSetting$f;
 .super Ljava/lang/Object;
+.source "CheckedSetting.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
@@ -46,6 +47,8 @@
 
     invoke-interface {p1, p2}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$g.smali b/com.discord/smali/com/discord/views/CheckedSetting$g.smali
index 698a22f9a5..ca723b9931 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$g.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/CheckedSetting$g;
 .super Ljava/lang/Object;
+.source "CheckedSetting.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/views/CheckedSetting.smali b/com.discord/smali/com/discord/views/CheckedSetting.smali
index 906014a52b..a306f14366 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/CheckedSetting;
 .super Landroid/widget/RelativeLayout;
+.source "CheckedSetting.kt"
 
 # interfaces
 .implements Landroid/widget/Checkable;
@@ -56,52 +57,34 @@
     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/CheckedSetting;-><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
+    .locals 1
 
-    const/4 v3, 0x0
+    const/4 v0, 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/CheckedSetting;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/discord/views/CheckedSetting;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.method private synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+    .locals 0
+
+    const/4 p3, 0x0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/views/CheckedSetting;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
     .locals 7
 
-    const-string v0, "context"
+    const-string p3, "context"
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p3, 0x0
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -118,42 +101,40 @@
 
     move-result-object p1
 
-    sget-object p3, Lcom/discord/R$a;->CheckedSetting:[I
+    sget-object v0, Lcom/discord/R$a;->CheckedSetting:[I
 
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, p2, p3, v0, v0}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p2, v0, p3, p3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p1
 
     const/16 p2, 0xd
 
     :try_start_0
-    sget p3, Lcom/discord/views/CheckedSetting$b;->yU:I
+    sget v0, Lcom/discord/views/CheckedSetting$b;->yU:I
 
     const/4 v1, 0x1
 
-    sub-int/2addr p3, v1
+    sub-int/2addr v0, v1
 
-    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
-    sget-object p3, Lcom/discord/views/CheckedSetting$b;->yZ:Lcom/discord/views/CheckedSetting$b$a;
+    sget-object v0, Lcom/discord/views/CheckedSetting$b;->yZ:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->en()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->em()[I
 
-    move-result-object p3
+    move-result-object v0
 
-    aget p2, p3, p2
+    aget p2, v0, p2
 
     invoke-direct {p0, p2}, Lcom/discord/views/CheckedSetting;->B(I)V
 
     const/16 p2, 0xc
 
-    const/high16 p3, -0x40800000    # -1.0f
+    const/high16 v0, -0x40800000    # -1.0f
 
-    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getDimension(IF)F
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimension(IF)F
 
     move-result p2
 
@@ -172,7 +153,7 @@
     invoke-static {v4}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
     :cond_1
-    invoke-virtual {v3, v0, p2}, Landroid/widget/TextView;->setTextSize(IF)V
+    invoke-virtual {v3, p3, p2}, Landroid/widget/TextView;->setTextSize(IF)V
 
     :cond_2
     const/16 p2, 0xa
@@ -361,27 +342,27 @@
     invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
     :cond_f
-    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setVisibility(I)V
+    invoke-virtual {p2, p3}, Landroid/widget/TextView;->setVisibility(I)V
 
     :goto_1
-    invoke-virtual {p1, v3, p3}, Landroid/content/res/TypedArray;->getDimension(IF)F
+    invoke-virtual {p1, v3, v0}, Landroid/content/res/TypedArray;->getDimension(IF)F
 
     move-result p2
 
-    cmpl-float p3, p2, v2
+    cmpl-float v0, p2, v2
 
-    if-lez p3, :cond_11
+    if-lez v0, :cond_11
 
-    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->yS:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->yS:Landroid/widget/TextView;
 
-    if-nez p3, :cond_10
+    if-nez v0, :cond_10
 
     const-string v1, "subLabel"
 
     invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
     :cond_10
-    invoke-virtual {p3, v0, p2}, Landroid/widget/TextView;->setTextSize(IF)V
+    invoke-virtual {v0, p3, p2}, Landroid/widget/TextView;->setTextSize(IF)V
 
     :cond_11
     const/4 p2, 0x7
@@ -392,19 +373,19 @@
 
     if-eqz p2, :cond_13
 
-    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->yS:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->yS:Landroid/widget/TextView;
 
-    if-nez p3, :cond_12
+    if-nez v0, :cond_12
 
     const-string v1, "subLabel"
 
     invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
     :cond_12
-    invoke-virtual {p3, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v0, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_13
-    invoke-virtual {p1, v0}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p1, p3}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
 
     move-result-object p2
 
@@ -434,28 +415,6 @@
     throw p2
 .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/CheckedSetting;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
 .method private final B(I)V
     .locals 3
 
@@ -568,7 +527,6 @@
 
     invoke-direct {v0, p0}, Lcom/discord/views/CheckedSetting$d;-><init>(Lcom/discord/views/CheckedSetting;)V
 
-    :goto_1
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
@@ -589,9 +547,11 @@
 
     invoke-direct {v0, p0}, Lcom/discord/views/CheckedSetting$e;-><init>(Lcom/discord/views/CheckedSetting;)V
 
-    goto :goto_1
+    check-cast v0, Landroid/view/View$OnClickListener;
 
-    nop
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$a.smali b/com.discord/smali/com/discord/views/DigitVerificationView$a.smali
index 8bf4513d2f..e3ee364140 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$a.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/DigitVerificationView$a;
 .super Ljava/lang/Object;
+.source "DigitVerificationView.kt"
 
 
 # annotations
@@ -67,6 +68,8 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/EditText;->setFocusableInTouchMode(Z)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$b.smali b/com.discord/smali/com/discord/views/DigitVerificationView$b.smali
index 4f55ca51c6..fe6f56a51c 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$b.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/DigitVerificationView$b;
 .super Ljava/lang/Object;
+.source "DigitVerificationView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnKeyListener;
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$c.smali b/com.discord/smali/com/discord/views/DigitVerificationView$c.smali
index 457fa81453..e136265019 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$c.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/DigitVerificationView$c;
 .super Lcom/discord/utilities/mg_views/LambdaTextWatcher;
+.source "DigitVerificationView.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$d.smali b/com.discord/smali/com/discord/views/DigitVerificationView$d.smali
index e0ad2c18ef..6834049b61 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$d.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/views/DigitVerificationView$d;
 .super Ljava/lang/Object;
+.source "DigitVerificationView.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$e.smali b/com.discord/smali/com/discord/views/DigitVerificationView$e.smali
index 0425177dd4..4767d6e317 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$e.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/DigitVerificationView$e;
 .super Lkotlin/jvm/internal/k;
+.source "DigitVerificationView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/DigitVerificationView;->ep()Landroid/view/ViewGroup;
+    value = Lcom/discord/views/DigitVerificationView;->eo()Landroid/view/ViewGroup;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$f.smali b/com.discord/smali/com/discord/views/DigitVerificationView$f.smali
index 2c2bd85fdf..4d0a1d299d 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$f.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/DigitVerificationView$f;
 .super Lkotlin/jvm/internal/k;
+.source "DigitVerificationView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView.smali b/com.discord/smali/com/discord/views/DigitVerificationView.smali
index e35e3958a8..553ee07dbd 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/DigitVerificationView;
 .super Lcom/discord/views/b$a;
+.source "DigitVerificationView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnFocusChangeListener;
@@ -50,80 +51,40 @@
     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/DigitVerificationView;-><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/DigitVerificationView;-><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"
+    const/4 v0, 0x0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1, p2, p3}, Lcom/discord/views/b$a;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/discord/views/DigitVerificationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method private synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)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/DigitVerificationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     return-void
 .end method
 
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 0
+
+    const-string p3, "context"
+
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p3, 0x0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/views/b$a;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
 .method public static final synthetic a(Lcom/discord/views/DigitVerificationView;)Ljava/lang/String;
     .locals 0
 
@@ -254,7 +215,7 @@
     return-void
 .end method
 
-.method public final ep()Landroid/view/ViewGroup;
+.method public final eo()Landroid/view/ViewGroup;
     .locals 12
 
     invoke-virtual {p0}, Lcom/discord/views/DigitVerificationView;->getInflater()Landroid/view/LayoutInflater;
@@ -427,7 +388,7 @@
 
     if-gez v4, :cond_2
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_2
     check-cast v6, Landroid/widget/EditText;
@@ -552,19 +513,18 @@
 
     const-string p2, ""
 
-    :goto_0
-    check-cast p2, Ljava/lang/CharSequence;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string p2, "0"
 
-    goto :goto_0
+    :goto_0
+    check-cast p2, Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setHint(Ljava/lang/CharSequence;)V
 
+    return-void
+
     :cond_2
     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 a778ff54de..f6ebdcb595 100644
--- a/com.discord/smali/com/discord/views/RadioManager.smali
+++ b/com.discord/smali/com/discord/views/RadioManager.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/views/RadioManager;
 .super Ljava/lang/Object;
+.source "RadioManager.java"
 
 
 # instance fields
@@ -120,6 +121,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -168,7 +171,7 @@
     return-void
 .end method
 
-.method public final eq()I
+.method public final ep()I
     .locals 3
 
     const/4 v0, 0x0
@@ -209,12 +212,12 @@
     return v0
 .end method
 
-.method public final er()Landroid/widget/Checkable;
+.method public final eq()Landroid/widget/Checkable;
     .locals 2
 
     iget-object v0, p0, Lcom/discord/views/RadioManager;->zo:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->eq()I
+    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->ep()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$a.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$a.smali
index bb146e8525..e32005bafe 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$a.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/TernaryCheckBox$a;
 .super Ljava/lang/Object;
+.source "TernaryCheckBox.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$b.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$b.smali
index 3a492f8a63..70dffe29fd 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$b.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/views/TernaryCheckBox$b;
 .super Ljava/lang/Object;
+.source "TernaryCheckBox.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
index b2bb5079f3..8e2b18f0e5 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
@@ -1,13 +1,14 @@
 .class final Lcom/discord/views/TernaryCheckBox$c;
 .super Ljava/lang/Object;
+.source "TernaryCheckBox.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/views/TernaryCheckBox;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -38,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->zF:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->ev()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eu()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 3337eff75e..30b4314454 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
@@ -1,13 +1,14 @@
 .class final Lcom/discord/views/TernaryCheckBox$d;
 .super Ljava/lang/Object;
+.source "TernaryCheckBox.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/views/TernaryCheckBox;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -38,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->zF:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->ev()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eu()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 1fd355de8e..40a2f9db98 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$e.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$e.smali
@@ -1,13 +1,14 @@
 .class final Lcom/discord/views/TernaryCheckBox$e;
 .super Ljava/lang/Object;
+.source "TernaryCheckBox.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/views/TernaryCheckBox;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -38,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->zF:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->ev()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eu()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 7d789d4d71..6dfc9d0ca1 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$f.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/TernaryCheckBox$f;
 .super Ljava/lang/Object;
+.source "TernaryCheckBox.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali
index 4ed26f9775..106309802b 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/TernaryCheckBox$g;
 .super Ljava/lang/Object;
+.source "TernaryCheckBox.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox.smali b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
index 2d350326ea..595290e597 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/TernaryCheckBox;
 .super Landroid/widget/RelativeLayout;
+.source "TernaryCheckBox.kt"
 
 
 # annotations
@@ -57,28 +58,8 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
-
-    const/4 v0, -0x1
-
-    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->zD:I
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
+    .locals 3
 
     const-string v0, "context"
 
@@ -90,40 +71,6 @@
 
     iput v0, p0, Lcom/discord/views/TernaryCheckBox;->zD:I
 
-    invoke-direct {p0, p1, p2}, Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)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/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    const/4 p3, -0x1
-
-    iput p3, p0, Lcom/discord/views/TernaryCheckBox;->zD:I
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method public static final synthetic a(Lcom/discord/views/TernaryCheckBox;I)V
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/TernaryCheckBox;->setSwitchStatus(I)V
-
-    return-void
-.end method
-
-.method private final b(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 3
-
     const/4 v0, 0x0
 
     if-eqz p2, :cond_0
@@ -402,7 +349,15 @@
     return-void
 .end method
 
-.method public static final synthetic ev()Lcom/discord/views/TernaryCheckBox$a;
+.method public static final synthetic a(Lcom/discord/views/TernaryCheckBox;I)V
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/views/TernaryCheckBox;->setSwitchStatus(I)V
+
+    return-void
+.end method
+
+.method public static final synthetic eu()Lcom/discord/views/TernaryCheckBox$a;
     .locals 1
 
     sget-object v0, Lcom/discord/views/TernaryCheckBox;->zE:Lcom/discord/views/TernaryCheckBox$a;
@@ -534,7 +489,7 @@
 
 
 # virtual methods
-.method public final es()Z
+.method public final er()Z
     .locals 2
 
     iget v0, p0, Lcom/discord/views/TernaryCheckBox;->zD:I
@@ -551,7 +506,7 @@
     return v0
 .end method
 
-.method public final et()Z
+.method public final es()Z
     .locals 2
 
     iget v0, p0, Lcom/discord/views/TernaryCheckBox;->zD:I
@@ -570,7 +525,7 @@
     return v0
 .end method
 
-.method public final eu()V
+.method public final et()V
     .locals 3
 
     iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->zw:Lcom/discord/views/CheckableImageView;
@@ -752,6 +707,8 @@
 
     invoke-interface {v0, p1}, Lcom/discord/views/TernaryCheckBox$b;->onSwitchStatusChanged(I)V
 
+    return-void
+
     :cond_6
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
index ac3bcb68ae..82545264bc 100644
--- a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
+++ b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/ToolbarTitleLayout;
 .super Lcom/discord/views/b$a;
+.source "ToolbarTitleLayout.kt"
 
 
 # static fields
@@ -157,7 +158,7 @@
 
 
 # virtual methods
-.method public final ep()Landroid/view/ViewGroup;
+.method public final eo()Landroid/view/ViewGroup;
     .locals 4
 
     invoke-virtual {p0}, Lcom/discord/views/ToolbarTitleLayout;->getInflater()Landroid/view/LayoutInflater;
diff --git a/com.discord/smali/com/discord/views/UploadProgressView$a.smali b/com.discord/smali/com/discord/views/UploadProgressView$a.smali
index 90d7d0e5cc..7a1fd20a01 100644
--- a/com.discord/smali/com/discord/views/UploadProgressView$a.smali
+++ b/com.discord/smali/com/discord/views/UploadProgressView$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/UploadProgressView$a;
 .super Ljava/lang/Object;
+.source "UploadProgressView.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/UploadProgressView.smali b/com.discord/smali/com/discord/views/UploadProgressView.smali
index 15cbf72215..14751df333 100644
--- a/com.discord/smali/com/discord/views/UploadProgressView.smali
+++ b/com.discord/smali/com/discord/views/UploadProgressView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/UploadProgressView;
 .super Landroidx/constraintlayout/widget/ConstraintLayout;
+.source "UploadProgressView.kt"
 
 
 # annotations
@@ -43,124 +44,6 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 4
-
-    invoke-direct {p0, p1}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;)V
-
-    invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    move-object v0, p0
-
-    check-cast v0, Landroid/view/ViewGroup;
-
-    const v1, 0x7f0d007e
-
-    invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    const p1, 0x7f0a0413
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.progress_text)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zJ:Landroid/widget/TextView;
-
-    const p1, 0x7f0a0412
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.progress_subtext)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zu:Landroid/widget/TextView;
-
-    const p1, 0x7f0a040c
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.progress_bar)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ProgressBar;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->progressBar:Landroid/widget/ProgressBar;
-
-    const p1, 0x7f0a0410
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.progress_file_image)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->icon:Landroid/widget/ImageView;
-
-    invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    const v0, 0x7f0402a4
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    const/4 v3, 0x0
-
-    invoke-static {p0, v0, v1, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p1
-
-    const-string v0, "resources.getDrawable(ge\u2026.attr.progress_gradient))"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zL:Landroid/graphics/drawable/Drawable;
-
-    invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    const v0, 0x7f080116
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p1
-
-    const-string v0, "resources.getDrawable(R.\u2026.drawable_progress_green)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zK:Landroid/graphics/drawable/Drawable;
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 3
 
@@ -279,165 +162,6 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 2
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    move-object p2, p0
-
-    check-cast p2, Landroid/view/ViewGroup;
-
-    const p3, 0x7f0d007e
-
-    invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    const p1, 0x7f0a0413
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.progress_text)"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zJ:Landroid/widget/TextView;
-
-    const p1, 0x7f0a0412
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.progress_subtext)"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zu:Landroid/widget/TextView;
-
-    const p1, 0x7f0a040c
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.progress_bar)"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ProgressBar;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->progressBar:Landroid/widget/ProgressBar;
-
-    const p1, 0x7f0a0410
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.progress_file_image)"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->icon:Landroid/widget/ImageView;
-
-    invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    const p2, 0x7f0402a4
-
-    const/4 p3, 0x0
-
-    const/4 v0, 0x2
-
-    const/4 v1, 0x0
-
-    invoke-static {p0, p2, p3, v0, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
-
-    move-result p2
-
-    invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p1
-
-    const-string p2, "resources.getDrawable(ge\u2026.attr.progress_gradient))"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zL:Landroid/graphics/drawable/Drawable;
-
-    invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    const p2, 0x7f080116
-
-    invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p1
-
-    const-string p2, "resources.getDrawable(R.\u2026.drawable_progress_green)"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->zK:Landroid/graphics/drawable/Drawable;
-
-    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/UploadProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/discord/views/UploadProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public static synthetic a(Lcom/discord/views/UploadProgressView;Ljava/lang/String;I)V
     .locals 1
 
diff --git a/com.discord/smali/com/discord/views/UserListItemView.smali b/com.discord/smali/com/discord/views/UserListItemView.smali
index f95b4f20f9..7158bff34b 100644
--- a/com.discord/smali/com/discord/views/UserListItemView.smali
+++ b/com.discord/smali/com/discord/views/UserListItemView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/UserListItemView;
 .super Landroid/widget/RelativeLayout;
+.source "UserListItemView.kt"
 
 
 # instance fields
@@ -15,52 +16,34 @@
 
 
 # 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/UserListItemView;-><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/UserListItemView;-><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"
+    const/4 v0, 0x0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/discord/views/UserListItemView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+    .locals 0
+
+    const/4 p3, 0x0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/views/UserListItemView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 1
+
+    const-string p3, "context"
+
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p3, 0x0
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -153,28 +136,6 @@
     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/UserListItemView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
 
 # virtual methods
 .method public final getUserName()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$a.smali b/com.discord/smali/com/discord/views/VoiceUserView$a.smali
index b5acef5fe7..c79236e2c8 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$a.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$a.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/discord/views/VoiceUserView$a;
 .super Ljava/lang/Enum;
+.source "VoiceUserView.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$b.smali b/com.discord/smali/com/discord/views/VoiceUserView$b.smali
index 8faa581e59..09d2e47358 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$b.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/VoiceUserView$b;
 .super Lkotlin/jvm/internal/k;
+.source "VoiceUserView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$c.smali b/com.discord/smali/com/discord/views/VoiceUserView$c.smali
index 3eb19b6903..b8c600e914 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$c.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/VoiceUserView$c;
 .super Lkotlin/jvm/internal/k;
+.source "VoiceUserView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -93,8 +94,6 @@
 
     iput v1, v0, Landroid/view/ViewGroup$LayoutParams;->width:I
 
-    iget v1, p0, Lcom/discord/views/VoiceUserView$c;->$avatarSize:I
-
     iput v1, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
diff --git a/com.discord/smali/com/discord/views/VoiceUserView.smali b/com.discord/smali/com/discord/views/VoiceUserView.smali
index 229bddac31..267a1d48c9 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/VoiceUserView;
 .super Landroid/widget/FrameLayout;
+.source "VoiceUserView.kt"
 
 
 # annotations
@@ -87,110 +88,90 @@
     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/VoiceUserView;-><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/VoiceUserView;-><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 3
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    const p3, 0x7f0a066b
-
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p3
-
-    iput-object p3, p0, Lcom/discord/views/VoiceUserView;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p3, 0x7f0a0671
-
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p3
-
-    iput-object p3, p0, Lcom/discord/views/VoiceUserView;->username$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    new-instance p3, Lcom/discord/utilities/anim/RingAnimator;
-
-    move-object v0, p0
-
-    check-cast v0, Landroid/view/View;
-
-    new-instance v1, Lcom/discord/views/VoiceUserView$b;
-
-    invoke-direct {v1, p0}, Lcom/discord/views/VoiceUserView$b;-><init>(Lcom/discord/views/VoiceUserView;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function0;
-
-    const v2, 0x3f866666    # 1.05f
-
-    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;->zR:Lcom/discord/utilities/anim/RingAnimator;
-
-    move-object p3, p0
-
-    check-cast p3, Landroid/view/ViewGroup;
-
-    const v0, 0x7f0d0083
-
-    invoke-static {p1, v0, p3}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    if-eqz p2, :cond_0
-
-    sget-object p3, Lcom/discord/R$a;->VoiceUserView:[I
+    .locals 1
 
     const/4 v0, 0x0
 
-    invoke-virtual {p1, p2, p3, v0, v0}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-direct {p0, p1, p2, v0}, Lcom/discord/views/VoiceUserView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+    .locals 0
+
+    const/4 p3, 0x0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/views/VoiceUserView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 4
+
+    const-string p3, "context"
+
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p3, 0x0
+
+    invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    const v0, 0x7f0a066b
+
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/views/VoiceUserView;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0671
+
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/views/VoiceUserView;->username$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    new-instance v0, Lcom/discord/utilities/anim/RingAnimator;
+
+    move-object v1, p0
+
+    check-cast v1, Landroid/view/View;
+
+    new-instance v2, Lcom/discord/views/VoiceUserView$b;
+
+    invoke-direct {v2, p0}, Lcom/discord/views/VoiceUserView$b;-><init>(Lcom/discord/views/VoiceUserView;)V
+
+    check-cast v2, Lkotlin/jvm/functions/Function0;
+
+    const v3, 0x3f866666    # 1.05f
+
+    invoke-direct {v0, v1, v2, v3, v3}, Lcom/discord/utilities/anim/RingAnimator;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function0;FF)V
+
+    iput-object v0, p0, Lcom/discord/views/VoiceUserView;->zR:Lcom/discord/utilities/anim/RingAnimator;
+
+    move-object v0, p0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    const v1, 0x7f0d0083
+
+    invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    if-eqz p2, :cond_0
+
+    sget-object v0, Lcom/discord/R$a;->VoiceUserView:[I
+
+    invoke-virtual {p1, p2, v0, p3, p3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    invoke-virtual {p1, v0, p2}, Landroid/content/res/TypedArray;->getDimension(IF)F
+    invoke-virtual {p1, p3, p2}, Landroid/content/res/TypedArray;->getDimension(IF)F
 
     move-result p2
 
@@ -204,28 +185,6 @@
     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/VoiceUserView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
 .method public static final synthetic a(Lcom/discord/views/VoiceUserView;)Lcom/discord/views/VoiceUserView$a;
     .locals 0
 
diff --git a/com.discord/smali/com/discord/views/a.smali b/com.discord/smali/com/discord/views/a.smali
index 4531ae5ff5..61b96e2715 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;->eo()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->en()[I
 
     move-result-object v0
 
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 e53794b0ca..b4bff4df18 100644
--- a/com.discord/smali/com/discord/views/b$a$1.smali
+++ b/com.discord/smali/com/discord/views/b$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/b$a$1;
 .super Ljava/lang/Object;
+.source "NestableLayout.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 32b258a632..a298ba83c6 100644
--- a/com.discord/smali/com/discord/views/b$a$2.smali
+++ b/com.discord/smali/com/discord/views/b$a$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/b$a$2;
 .super Ljava/lang/Object;
+.source "NestableLayout.java"
 
 # interfaces
 .implements Lrx/functions/Action2;
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 01010709ff..f46966095c 100644
--- a/com.discord/smali/com/discord/views/b$a$3.smali
+++ b/com.discord/smali/com/discord/views/b$a$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/b$a$3;
 .super Ljava/lang/Object;
+.source "NestableLayout.java"
 
 # interfaces
 .implements Lrx/functions/Action3;
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 0ee1dbfe02..5dd09e0efd 100644
--- a/com.discord/smali/com/discord/views/b$a$4.smali
+++ b/com.discord/smali/com/discord/views/b$a$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/b$a$4;
 .super Ljava/lang/Object;
+.source "NestableLayout.java"
 
 # interfaces
 .implements Lrx/functions/Action2;
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 5d46f9fe91..441c6ed9f4 100644
--- a/com.discord/smali/com/discord/views/b$a$5.smali
+++ b/com.discord/smali/com/discord/views/b$a$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/b$a$5;
 .super Ljava/lang/Object;
+.source "NestableLayout.java"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/views/b$a.smali b/com.discord/smali/com/discord/views/b$a.smali
index 53920996cb..091c5f2d45 100644
--- a/com.discord/smali/com/discord/views/b$a.smali
+++ b/com.discord/smali/com/discord/views/b$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/views/b$a;
 .super Landroid/widget/LinearLayout;
+.source "NestableLayout.java"
 
 # interfaces
 .implements Lcom/discord/views/b$b;
diff --git a/com.discord/smali/com/discord/views/b$b.smali b/com.discord/smali/com/discord/views/b$b.smali
index 8ec91a8410..187cb3c25e 100644
--- a/com.discord/smali/com/discord/views/b$b.smali
+++ b/com.discord/smali/com/discord/views/b$b.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/discord/views/b$b;
 .super Ljava/lang/Object;
+.source "NestableLayout.java"
 
 
 # annotations
@@ -14,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract ep()Landroid/view/ViewGroup;
+.method public abstract eo()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 7f5461edc6..a01e48a641 100644
--- a/com.discord/smali/com/discord/views/b.smali
+++ b/com.discord/smali/com/discord/views/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/b;
 .super Ljava/lang/Object;
+.source "NestableLayout.java"
 
 
 # annotations
@@ -37,7 +38,7 @@
 .method static synthetic a(Lcom/discord/views/b;Lcom/discord/views/b$b;)V
     .locals 0
 
-    invoke-interface {p1}, Lcom/discord/views/b$b;->ep()Landroid/view/ViewGroup;
+    invoke-interface {p1}, Lcom/discord/views/b$b;->eo()Landroid/view/ViewGroup;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/views/c.smali b/com.discord/smali/com/discord/views/c.smali
index 2ffb3111b4..4f0cef24f3 100644
--- a/com.discord/smali/com/discord/views/c.smali
+++ b/com.discord/smali/com/discord/views/c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/views/c;
 .super Ljava/lang/Object;
+.source "OnSeekBarChangeListenerAdapter.java"
 
 # interfaces
 .implements Landroid/widget/SeekBar$OnSeekBarChangeListener;
diff --git a/com.discord/smali/com/discord/views/d.smali b/com.discord/smali/com/discord/views/d.smali
index 77a7c24cf3..d070f53cdd 100644
--- a/com.discord/smali/com/discord/views/d.smali
+++ b/com.discord/smali/com/discord/views/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/d;
 .super Landroid/widget/LinearLayout;
+.source "ReactionView.java"
 
 
 # instance fields
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 4ee5ae3816..9708235cd0 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 .super Ljava/lang/Object;
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/view/grid/FrameGridLayout$Data;
@@ -72,7 +73,7 @@
 
 # virtual methods
 .method public final createView(Landroid/content/Context;)Landroid/view/View;
-    .locals 7
+    .locals 4
 
     const-string v0, "context"
 
@@ -80,19 +81,13 @@
 
     new-instance v0, Lcom/discord/views/video/VideoCallParticipantView;
 
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
     const/4 v3, 0x0
 
-    const/4 v4, 0x0
-
-    const/4 v5, 0x6
-
-    const/4 v6, 0x0
-
-    move-object v1, v0
-
-    move-object v2, p1
-
-    invoke-direct/range {v1 .. v6}, Lcom/discord/views/video/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, p1, v1, v2, v3}, Lcom/discord/views/video/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IB)V
 
     check-cast v0, Landroid/view/View;
 
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 5cc658f11b..797a03e4e6 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/video/VideoCallParticipantView$a;
 .super Lkotlin/jvm/internal/k;
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -92,7 +93,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Ljp/wasabeef/fresco/a/c$a;->EX()Ljp/wasabeef/fresco/a/c;
+    invoke-virtual {v0}, Ljp/wasabeef/fresco/a/c$a;->EW()Ljp/wasabeef/fresco/a/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
index 82eb50a0a5..56c82fbba1 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/video/VideoCallParticipantView$b$1;
 .super Ljava/lang/Object;
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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
index 309f023965..40a53e9284 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$2.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/video/VideoCallParticipantView$b$2;
 .super Lkotlin/jvm/internal/k;
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
index cf98b25eb1..896a82919d 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/video/VideoCallParticipantView$b$3;
 .super Lkotlin/jvm/internal/k;
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali
index cddaaa87e2..0b06a486d4 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/video/VideoCallParticipantView$b;
 .super Lkotlin/jvm/internal/k;
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
index d80c7bd111..3a6ae00124 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/video/VideoCallParticipantView;
 .super Landroid/widget/RelativeLayout;
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/view/grid/FrameGridLayout$DataView;
@@ -222,152 +223,124 @@
     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/VideoCallParticipantView;-><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
+    .locals 2
 
-    const/4 v3, 0x0
+    const/4 v0, 0x4
 
-    const/4 v4, 0x4
+    const/4 v1, 0x0
 
-    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/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, p1, p2, v0, v1}, Lcom/discord/views/video/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IB)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 1
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 2
 
-    const-string v0, "context"
+    const-string p3, "context"
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p3, 0x0
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a03de
+    const v0, 0x7f0a03de
 
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object p3
+    move-result-object v0
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ab:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ab:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a03e1
+    const v0, 0x7f0a03e1
 
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object p3
+    move-result-object v0
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ac:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ac:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a03dc
+    const v0, 0x7f0a03dc
 
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object p3
+    move-result-object v0
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ad:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ad:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a03e0
+    const v0, 0x7f0a03e0
 
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object p3
+    move-result-object v0
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ae:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ae:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a03df
+    const v0, 0x7f0a03df
 
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object p3
+    move-result-object v0
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Af:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Af:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a03dd
+    const v0, 0x7f0a03dd
 
-    invoke-static {p0, p3}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lkotterknife/b;->e(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object p3
+    move-result-object v0
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ag:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ag:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getResources()Landroid/content/res/Resources;
 
-    move-result-object p3
+    move-result-object v0
 
-    const v0, 0x7f070052
+    const v1, 0x7f070052
 
-    invoke-virtual {p3, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
-    move-result p3
+    move-result v0
 
-    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ah:I
+    iput v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ah:I
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getResources()Landroid/content/res/Resources;
 
-    move-result-object p3
+    move-result-object v0
 
-    const v0, 0x7f070064
+    const v1, 0x7f070064
 
-    invoke-virtual {p3, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
-    move-result p3
+    move-result v0
 
-    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ai:I
+    iput v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ai:I
 
-    sget-object p3, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
-    invoke-static {p3}, Lrx/subjects/BehaviorSubject;->cl(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->cl(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object p3
+    move-result-object v0
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Aj:Lrx/subjects/BehaviorSubject;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Aj:Lrx/subjects/BehaviorSubject;
 
-    sget-object p3, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+    sget-object v0, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ap:Lorg/webrtc/RendererCommon$ScalingType;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ap:Lorg/webrtc/RendererCommon$ScalingType;
 
-    sget-object p3, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+    sget-object v0, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
 
-    move-object p3, p0
+    move-object v0, p0
 
-    check-cast p3, Landroid/view/ViewGroup;
+    check-cast v0, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0082
+    const v1, 0x7f0d0082
 
-    invoke-static {p1, v0, p3}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    const/4 p3, 0x0
+    invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     if-eqz p2, :cond_0
 
@@ -403,23 +376,18 @@
     return-void
 .end method
 
-.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IB)V
     .locals 0
 
-    and-int/lit8 p5, p4, 0x2
+    and-int/lit8 p3, p3, 0x2
 
-    if-eqz p5, :cond_0
+    if-eqz p3, :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/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     return-void
@@ -511,7 +479,7 @@
     :cond_4
     iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ao:Lco/discord/media_engine/VideoStreamRenderer;
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_9
 
     if-eqz v1, :cond_5
 
@@ -574,6 +542,9 @@
 
     :cond_8
     return-void
+
+    :cond_9
+    return-void
 .end method
 
 .method public static final synthetic a(Lcom/discord/views/video/VideoCallParticipantView;Lrx/Subscription;)V
@@ -602,7 +573,7 @@
     return-object p0
 .end method
 
-.method private final ew()V
+.method private final ev()V
     .locals 7
 
     iget-object v6, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ao:Lco/discord/media_engine/VideoStreamRenderer;
@@ -662,6 +633,8 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -844,7 +817,7 @@
 
     invoke-super {p0}, Landroid/widget/RelativeLayout;->onDetachedFromWindow()V
 
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->ew()V
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->ev()V
 
     const/4 v0, 0x0
 
@@ -1294,7 +1267,7 @@
     return-void
 
     :cond_18
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->ew()V
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->ev()V
 
     iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->streamId:Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/views/video/a$a.smali b/com.discord/smali/com/discord/views/video/a$a.smali
index 7216981d87..9522ae6415 100644
--- a/com.discord/smali/com/discord/views/video/a$a.smali
+++ b/com.discord/smali/com/discord/views/video/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/video/a$a;
 .super Ljava/lang/Object;
+.source "RxRendererEvents.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/views/video/a$b.smali b/com.discord/smali/com/discord/views/video/a$b.smali
index 2f0a334442..41053fa254 100644
--- a/com.discord/smali/com/discord/views/video/a$b.smali
+++ b/com.discord/smali/com/discord/views/video/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/views/video/a$b;
 .super Ljava/lang/Object;
+.source "RxRendererEvents.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/views/video/a.smali b/com.discord/smali/com/discord/views/video/a.smali
index 5c5c619404..9c63843241 100644
--- a/com.discord/smali/com/discord/views/video/a.smali
+++ b/com.discord/smali/com/discord/views/video/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/views/video/a;
 .super Ljava/lang/Object;
+.source "RxRendererEvents.kt"
 
 # interfaces
 .implements Lorg/webrtc/RendererCommon$RendererEvents;
@@ -31,7 +32,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -61,11 +62,11 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KF()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KE()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali
index 577bdc6ec8..36923488ae 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthCaptcha$Companion;
 .super Ljava/lang/Object;
+.source "WidgetAuthCaptcha.kt"
 
 
 # annotations
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 95d1b4a7a5..79f712148a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthCaptcha.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -95,6 +96,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali
index 69b27a365a..d255487763 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthCaptcha.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 00a003f01e..b3b3c483f2 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthCaptcha.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 6770a375ef..b5c9daed53 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthCaptcha.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2.smali
index 94f2e1bdbe..22bbaba11d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthCaptcha.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
index 864cbbe7db..748ee4b63d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthCaptcha;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthCaptcha.kt"
 
 
 # annotations
@@ -170,8 +171,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthCaptcha;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 fd3d59cbf3..b8efd9bace 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthInviteInfo$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthInviteInfo.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
index 55c47adf37..26df75cb04 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthInviteInfo;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthInviteInfo.kt"
 
 
 # static fields
@@ -154,9 +155,10 @@
 
     const/16 v0, 0x8
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
+    return-void
+
     :cond_0
     return-void
 
@@ -177,15 +179,15 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     move-object v0, v1
 
-    :goto_1
+    :goto_0
     if-nez v0, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -194,10 +196,10 @@
 
     if-eqz v2, :cond_b
 
-    :goto_2
+    :goto_1
     if-nez v0, :cond_4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -208,13 +210,13 @@
 
     if-ne v2, v3, :cond_5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
-    :goto_3
+    :goto_2
     if-nez v0, :cond_6
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :cond_6
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -314,17 +316,19 @@
 
     move-result-object p1
 
-    goto :goto_5
+    check-cast p1, Ljava/lang/CharSequence;
+
+    goto :goto_4
 
     :cond_a
     move-object p1, v0
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_b
-    :goto_4
+    :goto_3
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
@@ -377,14 +381,13 @@
 
     move-result-object p1
 
-    :goto_5
     check-cast p1, Ljava/lang/CharSequence;
 
-    :goto_6
+    :goto_4
     invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_c
-    :goto_7
+    :goto_5
     invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getView()Landroid/view/View;
 
     move-result-object p1
@@ -393,7 +396,9 @@
 
     const/4 v0, 0x0
 
-    goto/16 :goto_0
+    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
 
     :cond_d
     return-void
@@ -587,7 +592,6 @@
     :goto_4
     const-string v0, "if (channel.name == null\u2026nviter?.username)\n      }"
 
-    :goto_5
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -611,7 +615,7 @@
 
     move-result-object p1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     const p1, 0x7f12085e
@@ -620,10 +624,12 @@
 
     move-result-object p1
 
-    :goto_6
+    :goto_5
     const-string v0, "if (approximateMemberCou\u2026_invited_to_join)\n      }"
 
-    goto :goto_5
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
 
 .method private final getInvitedText()Landroid/widget/TextView;
@@ -655,8 +661,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali
index 2fd76b37b4..ed80fdcd5d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthLanding.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali
index a1d373bfdf..5fad04ad08 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthLanding.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali
index c95a5b8ed0..f0ded8ab1e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetAuthLanding.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$4.smali
index 473aedbb86..ac8ec7c0fa 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLanding.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$5.smali
index 294c22f40b..b10372d1a5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$5;
 .super Ljava/lang/Object;
+.source "WidgetAuthLanding.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$6.smali
index 7c2c9ade49..a8bd15f7bd 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$6;
 .super Ljava/lang/Object;
+.source "WidgetAuthLanding.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$7.smali
index a7dd6d574f..b4064405bb 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$7;
 .super Ljava/lang/Object;
+.source "WidgetAuthLanding.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
index c75b4cfca1..b42ab5c86c 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLanding;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthLanding.kt"
 
 
 # static fields
@@ -148,8 +149,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLanding;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -276,7 +275,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object 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 9364919a32..2979d6305c 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6ee71f4403..20495d4526 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 5f82fd4f34..1b9b27f72f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$login$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b9639377b3..4272982aa4 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$login$3;
 .super Ljava/lang/Object;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 70de68cfca..e176d17517 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 dcbfbeca15..e259348b7e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 10e2f4afa3..a4e46d4705 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$2.smali
index 76746f8a50..37ccc2c517 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 2c0fee4b31..0d8ca6d0ce 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$4.smali
index 4a052fd7a8..1419bbec38 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 3647028c2a..83337f7610 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 30f456f576..e131a7131c 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5;
 .super Ljava/lang/Object;
+.source "WidgetAuthLogin.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
index 78b049b583..52e66bf3a8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthLogin.kt"
 
 
 # static fields
@@ -764,7 +765,11 @@
 
     move-result-object v1
 
-    goto :goto_4
+    invoke-virtual {v1}, Landroid/widget/EditText;->requestFocus()Z
+
+    const/4 v1, 0x1
+
+    goto :goto_3
 
     :cond_7
     const-string v5, "captcha_key"
@@ -783,7 +788,9 @@
 
     invoke-virtual {v1, v5}, Lcom/discord/widgets/auth/WidgetAuthCaptcha$Companion;->launch(Lcom/discord/app/AppFragment;)V
 
-    goto :goto_5
+    const/4 v1, 0x1
+
+    goto :goto_3
 
     :cond_8
     const-string v7, "email"
@@ -814,10 +821,8 @@
 
     move-result-object v1
 
-    :goto_4
     invoke-virtual {v1}, Landroid/widget/EditText;->requestFocus()Z
 
-    :goto_5
     const/4 v1, 0x1
 
     goto/16 :goto_3
@@ -849,7 +854,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     check-cast v0, Ljava/lang/CharSequence;
 
@@ -877,6 +882,9 @@
 
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
 
 .method private final login(Ljava/lang/String;Z)V
@@ -941,9 +949,9 @@
 
     move-result v3
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
     if-nez v3, :cond_1
 
@@ -984,9 +992,12 @@
 
     if-nez v3, :cond_3
 
-    const/4 v4, 0x1
+    goto :goto_1
 
     :cond_3
+    const/4 v4, 0x0
+
+    :goto_1
     if-eqz v4, :cond_4
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;
@@ -1128,8 +1139,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali
index cb09153248..1c03d4656a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthMfa$Companion;
 .super Ljava/lang/Object;
+.source "WidgetAuthMfa.kt"
 
 
 # annotations
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 d355d1fd1e..c9d915e996 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthMfa.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$2.smali
index a83d7f663a..f220a54ed6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthMfa$evaluateCode$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthMfa.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 b50e81bca7..24219095db 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthMfa.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali
index 9940046a86..2ca4180c01 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthMfa$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthMfa.kt"
 
 # interfaces
 .implements Lcom/discord/views/DigitVerificationView$d;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali
index 3fbdda07d2..88818cc308 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthMfa.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$2.smali
index ff5cddccf0..79bf214d73 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthMfa.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showInfoDialog$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showInfoDialog$1.smali
index b1e5f277a1..64617203bb 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showInfoDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showInfoDialog$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthMfa$showInfoDialog$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthMfa.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
index 8237c30929..b577a55d24 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthMfa;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthMfa.kt"
 
 
 # annotations
@@ -523,8 +524,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthMfa;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -682,6 +681,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -789,6 +790,8 @@
 
     invoke-virtual {v1, v0}, Lcom/discord/views/DigitVerificationView;->setText(Ljava/lang/CharSequence;)V
 
+    return-void
+
     :cond_4
     return-void
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$1.smali
index 05a6f5505d..67e403bc27 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali
index 38f2a74bf8..81a6fbe7af 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$handleError$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$handleError$1.smali
index 1e6adfec6a..77b50761d7 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$handleError$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$handleError$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$handleError$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -111,7 +112,7 @@
 
     if-eq v0, v1, :cond_0
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     const-string v0, "password"
@@ -144,6 +145,8 @@
 
     move-result-object p2
 
+    invoke-interface {p1, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
     goto :goto_0
 
     :cond_1
@@ -163,7 +166,7 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/auth/WidgetAuthCaptcha$Companion;->launch(Lcom/discord/app/AppFragment;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const-string v0, "email"
@@ -196,6 +199,8 @@
 
     move-result-object p2
 
+    invoke-interface {p1, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
     goto :goto_0
 
     :cond_3
@@ -229,16 +234,15 @@
 
     move-result-object p2
 
-    :goto_0
     invoke-interface {p1, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :goto_1
+    :goto_0
     const/4 p1, 0x1
 
     return p1
 
     :cond_4
-    :goto_2
+    :goto_1
     const/4 p1, 0x0
 
     return p1
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 054cdb1ce9..c4f1ee4484 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 be34f82157..1a8c9769b6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a7da126cdf..6cebb41993 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$3.smali
index 4d821913a5..c87cb00d72 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
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 a377ae9f8c..5593264e7b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$register$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b4eb54d6a8..59ba3268d2 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$register$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$textWatcher$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$textWatcher$1.smali
index 7eed5a29bb..71aee95bc7 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$textWatcher$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$textWatcher$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegister$textWatcher$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegister.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
index 050ffe995d..6db32098eb 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthRegister.kt"
 
 
 # static fields
@@ -1148,6 +1149,8 @@
 
     invoke-virtual {v1}, Landroid/widget/EditText;->requestFocus()Z
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -1547,8 +1550,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1$2$1.smali
index 4ee13d4a0e..107bdc9aa1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1$2$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1.smali
index 9ba19026a8..fc74cf547d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$Companion$getInvite$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion.smali
index b957cd7b7e..ea75304144 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$Companion;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$1.smali
index 9df1a24e0d..b0aa142c9a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2$1.smali
index 5c120df8b7..499deea8e2 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali
index 17eafe2701..e38372d96a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$3.smali
index 390826874b..8724c99c49 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$3;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4$1.smali
index a03700b4c4..ddf8a43670 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4.smali
index 7caed74167..08fce52d64 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1.smali
index cc9867982c..a16252d04c 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$1.smali
index 5ee319ed7b..6ad3499b47 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali
index f018e5fdad..c54c89f8ac 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$handleError$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$handleError$1.smali
index 60aa24ae16..1e54c74661 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$handleError$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$handleError$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$handleError$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onActivityResult$1.smali
index a3776bd4b2..29acdfb50a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onActivityResult$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onActivityResult$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onPostRegistration$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onPostRegistration$1.smali
index 9d72910aef..db4113837c 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onPostRegistration$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onPostRegistration$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onPostRegistration$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$1.smali
index 29f5a1b728..d697f9f5ff 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$2.smali
index 9cc39a2047..341a3e4222 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$3.smali
index f1e95d523e..83215b350b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$4.smali
index 65a4c9a9ca..463bcde7be 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali
index 1f43e4d7ee..f48b657bd5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6.smali
index 9cc30823d8..2d66646dca 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -66,6 +67,8 @@
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->onBackPressed()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$1.smali
index c139bf1c21..ffa3899913 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$register$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -84,6 +85,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->onBackPressed()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$2.smali
index a2a298783c..799e8ab323 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$register$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$register$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$textWatcher$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$textWatcher$1.smali
index 4550820394..6ff57b7658 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$textWatcher$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$textWatcher$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$textWatcher$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthRegisterInvite.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali
index 6328420aeb..d8157ca822 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthRegisterInvite.kt"
 
 
 # annotations
@@ -1140,8 +1141,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
index 493351c947..9a1c471e5d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion;
 .super Ljava/lang/Object;
+.source "WidgetAuthUndeleteAccount.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali
index f8fe587d06..75e035bdf0 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetAuthUndeleteAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$2.smali
index 125487ccb7..4bf19ad829 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$2;
 .super Ljava/lang/Object;
+.source "WidgetAuthUndeleteAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -69,6 +70,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
index e7c6727934..c4813c9e5f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetAuthUndeleteAccount.kt"
 
 
 # annotations
@@ -280,8 +281,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -428,10 +427,9 @@
 
     const v1, 0x7f120031
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;->getTextTitle()Landroid/widget/TextView;
@@ -448,9 +446,9 @@
 
     const v1, 0x7f120038
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
-    :goto_1
+    :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;->getButtonDelete()Landroid/widget/Button;
 
     move-result-object v0
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 2e50699b98..c129f5da6d 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "SimpleMembersAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem_ViewBinding.smali
index de79900073..75c6e6d9e7 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "SimpleMembersAdapter$MemberAdapterItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberItem.smali b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberItem.smali
index afdd5431d5..cca44a3a3d 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/SimpleMembersAdapter$MemberItem;
 .super Ljava/lang/Object;
+.source "SimpleMembersAdapter.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter.smali b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter.smali
index aff250f046..3a96ec790e 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/SimpleMembersAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "SimpleMembersAdapter.java"
 
 
 # annotations
@@ -55,8 +56,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/SimpleMembersAdapter;->onUserClickedListener:Lrx/functions/Action1;
-
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$1.smali b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$1.smali
index 7724e675cd..cd7cd99db3 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/channels/SimpleRolesAdapter$1;
 .super Ljava/lang/Object;
+.source "SimpleRolesAdapter.java"
 
 
 # annotations
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 dfc1f9b215..1c837e80fe 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "SimpleRolesAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem_ViewBinding.smali
index 73f46864af..018ea42ee2 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "SimpleRolesAdapter$RoleAdapterItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleItem.smali b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleItem.smali
index 4cb99d3436..998928a98b 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/SimpleRolesAdapter$RoleItem;
 .super Ljava/lang/Object;
+.source "SimpleRolesAdapter.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter.smali b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter.smali
index fceee6e598..06b50b5a77 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/SimpleRolesAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "SimpleRolesAdapter.java"
 
 
 # annotations
@@ -55,8 +56,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/SimpleRolesAdapter;->onRoleClickedListener:Lrx/functions/Action1;
-
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings.smali
index 1b935bedce..4a4ce7a62f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings;
 .super Ljava/lang/Object;
+.source "WidgetChannelGroupDMSettings.java"
 
 
 # annotations
@@ -72,7 +73,6 @@
 
     move-result p1
 
-    :goto_0
     iput-boolean p1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings;->isMuted:Z
 
     return-void
@@ -82,7 +82,9 @@
 
     move-result p1
 
-    goto :goto_0
+    iput-boolean p1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings;->isMuted:Z
+
+    return-void
 .end method
 
 .method static synthetic access$000(Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings$ModelAppChannelSettings;)Lcom/discord/models/domain/ModelChannel;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
index fd9bb4c508..d48b298b80 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelGroupDMSettings.java"
 
 
 # annotations
@@ -257,9 +258,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v4, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->channelSettingsName:Landroid/widget/EditText;
-
-    invoke-virtual {v4}, Landroid/widget/EditText;->getId()I
+    invoke-virtual {v2}, Landroid/widget/EditText;->getId()I
 
     move-result v4
 
@@ -273,9 +272,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->channelSettingsName:Landroid/widget/EditText;
 
-    iget-object v3, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->channelSettingsName:Landroid/widget/EditText;
-
-    invoke-virtual {v3}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
+    invoke-virtual {v2}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
 
     move-result-object v3
 
@@ -299,11 +296,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    iget-object v3, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v3, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->saveButton:Landroid/view/View;
-
-    invoke-virtual {v2, v3}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
+    invoke-virtual {v3, v2}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
 
     iget-object v2, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->saveButton:Landroid/view/View;
 
@@ -326,8 +321,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->muteToggle:Lcom/discord/views/CheckedSetting;
-
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$IEfDrTwjlMwbuQkFqCZjAynJbOQ;
 
     invoke-direct {v1, p0, v0}, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$IEfDrTwjlMwbuQkFqCZjAynJbOQ;-><init>(Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;Lcom/discord/models/domain/ModelChannel;)V
@@ -837,9 +830,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconLabel:Lcom/discord/app/AppTextView;
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconLabel:Lcom/discord/app/AppTextView;
-
-    invoke-virtual {v1}, Lcom/discord/app/AppTextView;->getAttrText()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/app/AppTextView;->getAttrText()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings_ViewBinding.smali
index 7e30dc744c..b96b1f46c9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChannelGroupDMSettings_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
index effcb3dfcd..36a77f1947 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
index bdddd259b3..5fa7ca16e3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -51,7 +52,7 @@
 .method public final call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUserGuildSettings;)Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
     .locals 10
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_5
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1;->$channel$inlined:Lcom/discord/models/domain/ModelChannel;
 
@@ -109,7 +110,7 @@
     :goto_2
     sget v1, Lcom/discord/models/domain/ModelUserGuildSettings;->FREQUENCY_UNSET:I
 
-    if-ne v0, v1, :cond_3
+    if-ne v0, v1, :cond_4
 
     const-string v0, "guildSettings"
 
@@ -134,6 +135,11 @@
     :cond_3
     move v8, v0
 
+    goto :goto_3
+
+    :cond_4
+    move v8, v0
+
     :goto_3
     new-instance p1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
 
@@ -151,7 +157,7 @@
 
     return-object p1
 
-    :cond_4
+    :cond_5
     const/4 p1, 0x0
 
     return-object p1
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali
index a9cc01ee3f..5c4e9117ed 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 756b371492..d51faa219c 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 
 # annotations
@@ -67,7 +68,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
index 01183856ba..24e72dc641 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali
index 3e9235ed37..db1445fe9a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 000c8bd25c..c659831a2e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali
index 3e4837546c..c680c888b3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali
index e111b86017..711920bf0b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 e3e6be2257..9d78e8b60d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
index 4edd22be37..ecd1585dfd 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelNotificationSettings.kt"
 
 
 # annotations
@@ -423,10 +424,9 @@
 
     move-result-object v1
 
-    :goto_0
     check-cast v1, Ljava/lang/CharSequence;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const v1, 0x7f1209be
@@ -439,9 +439,9 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_0
+    check-cast v1, Ljava/lang/CharSequence;
 
-    :goto_1
+    :goto_0
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->configureNotificationRadios(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;)V
@@ -546,8 +546,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel$1.smali
index f28a02746a..16dd67dcd4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelSelector.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
index 56ad9e6d10..8457a9e291 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetChannelSelector.kt"
 
 
 # annotations
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 4f9d7f7f99..a60f9dd312 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetChannelSelector.kt"
 
 
 # annotations
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 d93524710f..fa834c82c9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelSelector.kt"
 
 
 # annotations
@@ -141,6 +142,8 @@
 
     invoke-interface {p3, v0, p2, p1}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_3
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali
index d3635f6195..5fcac38e62 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelSelector.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 286cc61b42..9b69264a9e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelSelector.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali
index 24f797540b..2f86d74401 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Item;
 .super Ljava/lang/Object;
+.source "WidgetChannelSelector.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model.smali
index 4fb43eba6f..d127be5bc9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSelector$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelSelector.kt"
 
 
 # annotations
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 b845d42bbb..e3851b6f45 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelSelector.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
index a6235f4c88..d145da0d23 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSelector;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetChannelSelector.kt"
 
 
 # annotations
@@ -200,8 +201,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSelector;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
index 6850d1b585..2ca59f642b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsEditPermissions.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model.smali
index f4fe631f8f..e709f42fd2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsEditPermissions.java"
 
 
 # annotations
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 19f7450470..d2a6a82cae 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsEditPermissions.java"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model;
@@ -182,13 +183,13 @@
 
     move-result-wide v1
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
-    cmp-long v7, p4, v1
+    cmp-long v5, p4, v1
 
-    if-nez v7, :cond_0
+    if-nez v5, :cond_0
 
     const/4 v1, 0x1
 
@@ -206,7 +207,7 @@
 
     iget-boolean v2, v0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole;->isEveryoneRole:Z
 
-    if-nez v2, :cond_1
+    if-nez v2, :cond_2
 
     invoke-static/range {p4 .. p5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -216,12 +217,15 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
+
+    goto :goto_1
 
     :cond_1
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     :cond_2
+    :goto_1
     iput-boolean v3, v0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole;->meHasRole:Z
 
     return-void
@@ -311,7 +315,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -672,9 +676,9 @@
 
     iget-boolean v1, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole;->meHasRole:Z
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_3
 
@@ -694,9 +698,12 @@
 
     if-eqz v1, :cond_4
 
-    const/16 v2, 0x4f
+    goto :goto_4
 
     :cond_4
+    const/16 v2, 0x61
+
+    :goto_4
     add-int/2addr v0, v2
 
     return v0
@@ -812,7 +819,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eu()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->et()V
 
     return-void
 
@@ -829,18 +836,18 @@
     return-void
 
     :cond_4
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->et()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->es()Z
 
     move-result v0
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eu()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->et()V
 
     return-void
 
     :cond_5
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->es()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->er()Z
 
     move-result v0
 
@@ -874,7 +881,7 @@
 
     if-eqz p2, :cond_8
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eu()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->et()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 2d542d5810..a4be46364e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsEditPermissions.java"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model;
@@ -368,7 +369,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->es()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->er()Z
 
     move-result p2
 
@@ -394,7 +395,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eu()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->et()V
 
     return-void
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
index 55dfcb4164..d6e6ef2a8d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelSettingsEditPermissions.java"
 
 
 # annotations
@@ -199,14 +200,10 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->targetName:Landroid/widget/TextView;
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->userAvatar:Landroid/widget/ImageView;
-
     iget-object v2, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->targetName:Landroid/widget/TextView;
 
+    if-eqz v2, :cond_1
+
     invoke-interface {p1, v1, v2}, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model;->setupHeader(Landroid/widget/ImageView;Landroid/widget/TextView;)V
 
     :cond_1
@@ -214,8 +211,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->channelName:Landroid/widget/TextView;
-
     invoke-interface {p1}, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object v2
@@ -235,17 +230,15 @@
 
     const/16 v2, 0x8
 
-    const/4 v3, 0x0
+    const/4 v3, 0x4
 
-    const/4 v4, 0x4
+    const/4 v4, 0x0
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->textPermissionsContainer:Landroid/view/View;
-
     if-eqz v0, :cond_4
 
-    if-ne v0, v4, :cond_3
+    if-ne v0, v3, :cond_3
 
     goto :goto_0
 
@@ -266,13 +259,11 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->voicePermissionsContainer:Landroid/view/View;
-
     const/4 v5, 0x2
 
     if-eq v0, v5, :cond_6
 
-    if-ne v0, v4, :cond_7
+    if-ne v0, v3, :cond_7
 
     :cond_6
     const/4 v2, 0x0
@@ -285,8 +276,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->permissionCheckboxes:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
@@ -345,8 +334,6 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->saveFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
-
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelSettingsEditPermissions$VsY3Y-UkvzsaaTHgqPqd8l_MfD8;
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelSettingsEditPermissions$VsY3Y-UkvzsaaTHgqPqd8l_MfD8;-><init>(Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$Model;)V
@@ -665,7 +652,7 @@
 
     check-cast v3, Lcom/discord/views/TernaryCheckBox;
 
-    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->es()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->er()Z
 
     move-result v4
 
@@ -684,7 +671,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->et()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->es()Z
 
     move-result v4
 
@@ -994,10 +981,9 @@
 
     const/4 p2, 0x1
 
-    :goto_1
     invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setSwitchStatus(I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     and-int/2addr p2, v3
@@ -1006,12 +992,14 @@
 
     const/4 p2, -0x1
 
+    invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setSwitchStatus(I)V
+
     goto :goto_1
 
     :cond_2
     invoke-virtual {p1, v0}, Lcom/discord/views/TernaryCheckBox;->setSwitchStatus(I)V
 
-    :goto_2
+    :goto_1
     iget-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
     invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->getSwitchStatus()I
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions_ViewBinding.smali
index d774bdb5b3..d9f7946485 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsEditPermissions_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 97267b4421..b12ad46e21 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsPermissionsAddMember.java"
 
 
 # annotations
@@ -304,7 +305,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -565,7 +566,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
index 524723ae41..238d8d3c38 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelSettingsPermissionsAddMember.java"
 
 
 # annotations
@@ -123,8 +124,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->viewFlipper:Landroid/widget/ViewFlipper;
-
     invoke-static {p1}, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model;->access$200(Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model;)Ljava/util/List;
 
     move-result-object p1
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember_ViewBinding.smali
index 62ace448f5..2c005061a4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsPermissionsAddMember_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 7d0206f236..bc1d8915a0 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsPermissionsAddRole.java"
 
 
 # annotations
@@ -315,7 +316,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
index 7bf1a1c498..ac4d3552af 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelSettingsPermissionsAddRole.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole_ViewBinding.smali
index 5b94acfadb..d5a8901faa 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsPermissionsAddRole_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 b1f4ef9805..d8b6a6eb4c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsPermissionsOverview.java"
 
 
 # annotations
@@ -546,7 +547,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
@@ -812,9 +813,9 @@
 
     iget-boolean v1, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model;->canManage:Z
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_4
 
@@ -834,9 +835,12 @@
 
     if-eqz v1, :cond_5
 
-    const/16 v2, 0x4f
+    goto :goto_5
 
     :cond_5
+    const/16 v2, 0x61
+
+    :goto_5
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
index 5c2b6fbfa8..79adba214c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelSettingsPermissionsOverview.java"
 
 
 # annotations
@@ -76,7 +77,6 @@
 
     const/16 v0, 0x8
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
     return-void
@@ -98,7 +98,9 @@
 
     const/4 v0, 0x0
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
 .end method
 
 .method private configureRoles(Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model;)V
@@ -118,7 +120,6 @@
 
     const/16 v0, 0x8
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
     return-void
@@ -140,7 +141,9 @@
 
     const/4 v0, 0x0
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
 .end method
 
 .method private configureToolbar(Lcom/discord/models/domain/ModelChannel;)V
@@ -193,8 +196,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addRole:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelSettingsPermissionsOverview$owP_Cil-OkZ6JbcYrYMx-Rms8ns;
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelSettingsPermissionsOverview$owP_Cil-OkZ6JbcYrYMx-Rms8ns;-><init>(Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model;)V
@@ -206,8 +207,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addMember:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelSettingsPermissionsOverview$reZErhnOboevtpNOtmpnw9xqgzI;
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelSettingsPermissionsOverview$reZErhnOboevtpNOtmpnw9xqgzI;-><init>(Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview_ViewBinding.smali
index 64faddb760..1abbd8b87b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChannelSettingsPermissionsOverview_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$1.smali
index 297baf50cc..77ff46201a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelTopic.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali
index 45a834adae..892a131835 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelTopic.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$1.smali
index 14c974648e..c0510b82d5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelTopic.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 8948119834..65ec179988 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelTopic.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2.smali
index ad12aab183..fa738df77f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelTopic.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali
index 29bd66a12a..f07f1101df 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;
 .super Ljava/lang/Object;
+.source "WidgetChannelTopic.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 97efd31c09..478ff05493 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelTopic.kt"
 
 
 # annotations
@@ -66,7 +67,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_0
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getTopic()Ljava/lang/String;
@@ -101,7 +102,7 @@
     :goto_0
     if-eqz v0, :cond_2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     sget-object v0, Lkotlin/a/z;->bPD:Lkotlin/a/z;
@@ -144,13 +145,12 @@
 
     const-string p2, "Observable\n            .\u2026          }\n            }"
 
-    :goto_1
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
     :cond_3
-    :goto_2
+    :goto_1
     new-instance p2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;
 
     const p3, 0x7f120329
@@ -169,10 +169,12 @@
 
     const-string p2, "Observable.just(Model(co\u2026ng.channel_topic_empty)))"
 
-    goto :goto_1
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_4
-    :goto_3
+    :goto_2
     new-instance p1, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;
 
     const/4 p2, 0x0
@@ -185,7 +187,9 @@
 
     const-string p2, "Observable.just(Model(null))"
 
-    goto :goto_1
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
 
 
@@ -241,7 +245,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model.smali
index 8acb8681bb..92acb36d9e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelTopic.kt"
 
 
 # annotations
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 118097666a..67c1d12dd4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChannelTopic.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
index 7b6f07eb20..6ce458b8b3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopic;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelTopic.kt"
 
 
 # annotations
@@ -149,8 +150,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
index f626bd3aec..95cc9e51f3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetCreateChannel$Model;
 .super Ljava/lang/Object;
+.source "WidgetCreateChannel.java"
 
 
 # annotations
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 704d1f0237..8de37eb638 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetCreateChannel.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem_ViewBinding.smali
index 381313ddff..a09e63ecac 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetCreateChannel$RolesAdapter$RoleListItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter.smali
index 996e30c282..efdf92b02e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetCreateChannel$RolesAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetCreateChannel.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
index 7837d4561c..dcd3ddf2df 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetCreateChannel;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetCreateChannel.java"
 
 
 # annotations
@@ -501,19 +502,17 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->roleHeader:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->roleHeader:Landroid/widget/TextView;
 
-    if-eqz p1, :cond_1
+    if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    if-nez p1, :cond_0
+    if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateSwitch:Landroid/widget/Switch;
-
     invoke-virtual {p1}, Landroid/widget/Switch;->isChecked()Z
 
     move-result p1
@@ -532,6 +531,8 @@
 
     invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -834,24 +835,21 @@
 
     iget-object v1, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->textRadio:Landroid/widget/RadioButton;
 
-    :goto_0
     invoke-virtual {v0, v1}, Lcom/discord/views/RadioManager;->a(Landroid/widget/Checkable;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    iget v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->type:I
-
     if-ne v0, v1, :cond_2
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->radioManager:Lcom/discord/views/RadioManager;
 
     iget-object v1, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->voiceRadio:Landroid/widget/RadioButton;
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Lcom/discord/views/RadioManager;->a(Landroid/widget/Checkable;)V
 
     :cond_2
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateChannelContainer:Landroid/view/View;
 
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetCreateChannel$CUPmx5nXP5n2C3ngIfNrq0wCgcc;
@@ -881,12 +879,12 @@
 
     const v1, 0x7f120bbd
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const v1, 0x7f120bbf
 
-    :goto_2
+    :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateInfo:Landroid/widget/TextView;
@@ -897,12 +895,12 @@
 
     const v1, 0x7f120bbe
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     const v1, 0x7f120bc0
 
-    :goto_3
+    :goto_2
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->roleHeader:Landroid/widget/TextView;
@@ -913,12 +911,12 @@
 
     const v1, 0x7f12051d
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const v1, 0x7f120520
 
-    :goto_4
+    :goto_3
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->channelNameLayout:Lcom/google/android/material/textfield/TextInputLayout;
@@ -929,12 +927,12 @@
 
     const v1, 0x7f1202f5
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_7
     const v1, 0x7f12051e
 
-    :goto_5
+    :goto_4
     invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetCreateChannel;->getString(I)Ljava/lang/String;
 
     move-result-object v1
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel_ViewBinding.smali
index 22021e1626..30713a368a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetCreateChannel_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetCreateChannel_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali
index 2597fc948e..6baf4a2d1e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;
 .super Ljava/lang/Object;
+.source "WidgetGroupInviteFriends.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali
index cd140c99e4..e095e196ea 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;
 .super Ljava/lang/Object;
+.source "WidgetGroupInviteFriends.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
index 738f65a42f..aa824e0d5a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;
 .super Ljava/lang/Object;
+.source "WidgetGroupInviteFriends.java"
 
 
 # annotations
@@ -251,7 +252,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
@@ -377,7 +378,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -393,8 +394,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->selectedUsers:Ljava/util/Collection;
-
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
     move-result v0
@@ -406,8 +405,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->channel:Lcom/discord/models/domain/ModelChannel;
-
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
 
     move-result-object v0
@@ -686,7 +683,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$UserDataContract.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$UserDataContract.smali
index b709263da1..3ed15d987c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$UserDataContract.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$UserDataContract.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetGroupInviteFriends$UserDataContract;
 .super Ljava/lang/Object;
+.source "WidgetGroupInviteFriends.java"
 
 # interfaces
 .implements Lcom/discord/chipsview/ChipsView$c;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
index 2b4cbc8bfa..fe302528da 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGroupInviteFriends.java"
 
 
 # annotations
@@ -302,8 +303,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->adapter:Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter;
-
     new-instance v2, Lcom/discord/widgets/channels/-$$Lambda$WidgetGroupInviteFriends$p8B2pmr0E3-eqD4XBEO6u1U2KB0;
 
     invoke-direct {v2, p0, p1}, Lcom/discord/widgets/channels/-$$Lambda$WidgetGroupInviteFriends$p8B2pmr0E3-eqD4XBEO6u1U2KB0;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends;Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;)V
@@ -798,7 +797,7 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     invoke-static {p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->access$700(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;)I
@@ -823,12 +822,11 @@
 
     aput-object v4, v0, v3
 
-    :goto_0
     invoke-virtual {p1, v1, v2, v0}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     if-nez v2, :cond_2
@@ -839,7 +837,7 @@
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     mul-int/lit8 v2, v2, -0x1
@@ -858,14 +856,16 @@
 
     aput-object v4, v0, v3
 
-    goto :goto_0
+    invoke-virtual {p1, v1, v2, v0}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    :goto_1
+    move-result-object p1
+
+    :goto_0
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->recipientsContainer:Landroid/view/View;
 
     invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
     return-void
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 067b452dec..359f45e56d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetGroupInviteFriendsAdapter.java"
 
 
 # annotations
@@ -127,8 +128,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->friendNameTextView:Landroid/widget/TextView;
-
     invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem_ViewBinding.smali
index 89d60c0103..99ef0b8e5b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali
index a4d6c98e98..ad1041f60a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetGroupInviteFriendsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends_ViewBinding.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends_ViewBinding.smali
index 1aed5830b7..740de6c2b5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/WidgetGroupInviteFriends_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetGroupInviteFriends_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
index a255312c4d..bc6fe20bd6 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
index a94fb298b6..2db50f98d2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali
index 9652e767b1..af25b57852 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 2b44539f92..c2b322eb70 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali
index 10f6c9ba64..300f53b9c7 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 
 # annotations
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 47a551a826..bbe5e7ad36 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
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 56e2c3d67a..2d296f6ee3 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.smali
index afe648d435..0c13ebc839 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali
index 5a39a6fd6e..ee68951c0c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 19c9370af9..7596fd3247 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali
index 33642156d1..64030bf355 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.smali
index 079b9292f5..a6d2d779cd 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$1.smali
index a58e595473..23bc9c723e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$1;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali
index 397b0f4dea..c01405ce13 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2;
 .super Ljava/lang/Object;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
index d20ce4b534..c711e0f7f1 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1;
 .super Lcom/discord/views/c;
+.source "WidgetTextChannelSettings.kt"
 
 
 # annotations
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 9c4af6712c..5f868ca7cc 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f7b3b84ddc..1cd9b67960 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetTextChannelSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
index b6cb22f415..6c802a4470 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetTextChannelSettings.kt"
 
 
 # annotations
@@ -810,6 +811,8 @@
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
+    return-void
+
     :cond_0
     return-void
 
@@ -906,9 +909,9 @@
 
     move-result v1
 
-    const v3, 0x7f1202f5
+    const v3, 0x7f12051e
 
-    const v4, 0x7f12051e
+    const v4, 0x7f1202f5
 
     if-eqz v1, :cond_4
 
@@ -966,9 +969,12 @@
 
     if-eqz v1, :cond_5
 
-    const v3, 0x7f12051e
+    goto :goto_3
 
     :cond_5
+    const v3, 0x7f1202f5
+
+    :goto_3
     invoke-virtual {v0, v3}, Landroid/widget/EditText;->setHint(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getChannelSettingsTopic()Landroid/widget/EditText;
@@ -1152,18 +1158,18 @@
 
     if-eqz v1, :cond_7
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_7
     const/4 v1, 0x0
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_8
-    :goto_3
+    :goto_4
     const/4 v1, 0x1
 
-    :goto_4
+    :goto_5
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getChannelSettingsPrivacySafetyContainer()Landroid/view/View;
@@ -1188,12 +1194,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_9
     const/4 v1, 0x0
 
-    :goto_5
+    :goto_6
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getChannelSettingsNsfw()Lcom/discord/views/CheckedSetting;
@@ -1256,12 +1262,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_6
+    goto :goto_7
 
     :cond_a
     const/4 v1, 0x0
 
-    :goto_6
+    :goto_7
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
@@ -1300,7 +1306,7 @@
 
     const/4 v1, 0x0
 
-    :goto_7
+    :goto_8
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
@@ -1321,25 +1327,25 @@
 
     const/4 v4, 0x1
 
-    goto :goto_8
+    goto :goto_9
 
     :cond_b
     const/4 v4, 0x0
 
-    :goto_8
+    :goto_9
     if-eqz v4, :cond_c
 
-    goto :goto_9
+    goto :goto_a
 
     :cond_c
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_7
+    goto :goto_8
 
     :cond_d
     const/4 v1, -0x1
 
-    :goto_9
+    :goto_a
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getChannelSettingsSlowModeSlider()Landroid/widget/SeekBar;
 
     move-result-object p1
@@ -1892,63 +1898,63 @@
 .end method
 
 .method static synthetic saveChannel$default(Lcom/discord/widgets/channels/WidgetTextChannelSettings;JLjava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Integer;ILjava/lang/Object;)V
-    .locals 10
+    .locals 9
 
-    and-int/lit8 v1, p7, 0x2
+    and-int/lit8 v0, p7, 0x2
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v6, v2
+    move-object v5, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v6, p3
+    move-object v5, p3
 
     :goto_0
-    and-int/lit8 v1, p7, 0x4
+    and-int/lit8 v0, p7, 0x4
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v7, v2
+    move-object v6, v1
 
     goto :goto_1
 
     :cond_1
-    move-object v7, p4
+    move-object v6, p4
 
     :goto_1
-    and-int/lit8 v1, p7, 0x8
+    and-int/lit8 v0, p7, 0x8
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_2
 
     :cond_2
-    move-object v8, p5
+    move-object v7, p5
 
     :goto_2
     and-int/lit8 v0, p7, 0x10
 
     if-eqz v0, :cond_3
 
-    move-object v9, v2
+    move-object v8, v1
 
     goto :goto_3
 
     :cond_3
-    move-object/from16 v9, p6
+    move-object v8, p6
 
     :goto_3
-    move-object v3, p0
+    move-object v2, p0
 
-    move-wide v4, p1
+    move-wide v3, p1
 
-    invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->saveChannel(JLjava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Integer;)V
+    invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->saveChannel(JLjava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Integer;)V
 
     return-void
 .end method
@@ -1999,8 +2005,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali
index 93b94f7290..8a759518c7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 ad9648a02c..70e57741f7 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func6;
@@ -67,7 +68,7 @@
 
 # virtual methods
 .method public final call(Ljava/util/Map;Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
-    .locals 14
+    .locals 13
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -94,80 +95,124 @@
         }
     .end annotation
 
-    move-object/from16 v1, p3
+    move-object/from16 v0, p3
 
-    move-object/from16 v2, p4
+    move-object/from16 v1, p4
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    sget-object v4, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
-
-    const-string v5, "mostRecentMessageIds"
-
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4, v2}, Lcom/discord/utilities/channel/ChannelUtils;->createMostRecentChannelComparator(Ljava/util/Map;)Ljava/util/Comparator;
-
-    move-result-object v2
-
-    invoke-static {v3, v2}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
-
     move-result-object v2
 
     check-cast v2, Ljava/lang/Iterable;
 
-    new-instance v3, Ljava/util/ArrayList;
+    sget-object v3, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
 
-    const/16 v4, 0xa
+    const-string v4, "mostRecentMessageIds"
 
-    invoke-static {v2, v4}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result v4
+    invoke-virtual {v3, v1}, Lcom/discord/utilities/channel/ChannelUtils;->createMostRecentChannelComparator(Ljava/util/Map;)Ljava/util/Comparator;
 
-    invoke-direct {v3, v4}, Ljava/util/ArrayList;-><init>(I)V
+    move-result-object v1
 
-    check-cast v3, Ljava/util/Collection;
+    invoke-static {v2, v1}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    move-result-object v1
 
-    move-result-object v2
+    check-cast v1, Ljava/lang/Iterable;
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    const/16 v3, 0xa
+
+    invoke-static {v1, v3}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I
+
+    move-result v3
+
+    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
 
     :goto_0
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v3
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
+    const/4 v5, 0x0
+
+    if-eqz v3, :cond_4
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelChannel;
+
+    const-string v6, "it"
+
+    invoke-static {v3, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "presences"
+
+    invoke-static {v0, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_0
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v6
+
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v6
+
+    goto :goto_1
+
+    :cond_0
     const/4 v6, 0x0
 
-    if-eqz v4, :cond_4
+    :goto_1
+    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    move-result-object v6
 
-    move-result-object v4
+    check-cast v6, Lcom/discord/models/domain/ModelPresence;
 
-    check-cast v4, Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    const-string v7, "it"
+    move-result-wide v7
 
-    invoke-static {v4, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    if-nez p2, :cond_1
 
-    const-string v7, "presences"
+    goto :goto_2
 
-    invoke-static {v1, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    :cond_1
+    invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
+    move-result-wide v9
 
-    move-result-object v7
+    cmp-long v11, v7, v9
 
-    if-eqz v7, :cond_0
+    if-nez v11, :cond_2
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getId()J
+    goto :goto_3
+
+    :cond_2
+    :goto_2
+    const/4 v4, 0x0
+
+    :goto_3
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v7
 
@@ -175,171 +220,126 @@
 
     move-result-object v7
 
-    goto :goto_1
+    move-object/from16 v8, p6
 
-    :cond_0
-    const/4 v7, 0x0
-
-    :goto_1
-    invoke-interface {v1, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v8, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v7
 
-    check-cast v7, Lcom/discord/models/domain/ModelPresence;
+    check-cast v7, Ljava/lang/Integer;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    if-eqz v7, :cond_3
 
-    move-result-wide v8
+    invoke-virtual {v7}, Ljava/lang/Integer;->intValue()I
 
-    if-nez p2, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    invoke-virtual/range {p2 .. p2}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v10
-
-    cmp-long v12, v8, v10
-
-    if-nez v12, :cond_2
-
-    goto :goto_3
-
-    :cond_2
-    :goto_2
-    const/4 v5, 0x0
-
-    :goto_3
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v8
-
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v8
-
-    move-object/from16 v9, p6
-
-    invoke-interface {v9, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v8
-
-    check-cast v8, Ljava/lang/Integer;
-
-    if-eqz v8, :cond_3
-
-    invoke-virtual {v8}, Ljava/lang/Integer;->intValue()I
-
-    move-result v6
+    move-result v5
 
     :cond_3
-    new-instance v8, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
+    new-instance v7, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
 
-    invoke-direct {v8, v4, v7, v5, v6}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZI)V
+    invoke-direct {v7, v3, v6, v4, v5}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZI)V
 
-    invoke-interface {v3, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v2, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_4
-    check-cast v3, Ljava/util/List;
+    check-cast v2, Ljava/util/List;
 
-    new-instance v1, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;
+    new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;
 
     if-nez p2, :cond_5
 
     goto :goto_4
 
     :cond_5
-    invoke-virtual/range {p2 .. p2}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    const-wide/16 v9, 0x0
+    const-wide/16 v8, 0x0
 
-    cmp-long v0, v7, v9
+    cmp-long v1, v6, v8
 
-    if-nez v0, :cond_6
+    if-nez v1, :cond_6
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     goto :goto_5
 
     :cond_6
     :goto_4
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_5
-    const-string v2, "pendingFriendCount"
+    const-string v3, "pendingFriendCount"
 
-    move-object/from16 v4, p5
+    move-object/from16 v6, p5
 
-    invoke-static {v4, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p5 .. p5}, Ljava/lang/Integer;->intValue()I
 
-    move-result v2
+    move-result v3
 
-    invoke-direct {v1, v0, v2}, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;-><init>(ZI)V
+    invoke-direct {v0, v1, v3}, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;-><init>(ZI)V
 
-    new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;
+    new-instance v1, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;
 
-    const-wide/16 v8, 0x0
+    const-wide/16 v7, 0x0
 
-    const v10, 0x7f12043f
+    const v9, 0x7f12043f
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
-    const-wide/16 v12, 0x0
+    const-wide/16 v11, 0x0
 
-    move-object v7, v0
+    move-object v6, v1
 
-    invoke-direct/range {v7 .. v13}, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;-><init>(JIZJ)V
+    invoke-direct/range {v6 .. v12}, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;-><init>(JIZJ)V
 
-    invoke-interface {v3}, Ljava/util/List;->isEmpty()Z
+    invoke-interface {v2}, Ljava/util/List;->isEmpty()Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_7
+    if-eqz v3, :cond_7
 
-    invoke-static {v1}, Lkotlin/a/l;->by(Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/l;->by(Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    :goto_6
     move-object v3, v0
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_7
-    const/4 v2, 0x2
+    const/4 v3, 0x2
 
-    new-array v2, v2, [Lcom/discord/widgets/channels/list/items/ChannelListItem;
-
-    check-cast v1, Lcom/discord/widgets/channels/list/items/ChannelListItem;
-
-    aput-object v1, v2, v6
+    new-array v3, v3, [Lcom/discord/widgets/channels/list/items/ChannelListItem;
 
     check-cast v0, Lcom/discord/widgets/channels/list/items/ChannelListItem;
 
-    aput-object v0, v2, v5
+    aput-object v0, v3, v5
 
-    invoke-static {v2}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
+    check-cast v1, Lcom/discord/widgets/channels/list/items/ChannelListItem;
+
+    aput-object v1, v3, v4
+
+    invoke-static {v3}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
     check-cast v0, Ljava/util/Collection;
 
-    check-cast v3, Ljava/lang/Iterable;
+    check-cast v2, Ljava/lang/Iterable;
 
-    invoke-static {v0, v3}, Lkotlin/a/l;->b(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0, v2}, Lkotlin/a/l;->b(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
-    goto :goto_6
+    move-object v3, v0
 
-    :goto_7
+    :goto_6
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
 
     const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
index 58d1e54316..f98400626f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func8;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali
index 4a92065ffd..7beebe4efc 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali
index 62705654fa..7129bee7e1 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -133,9 +134,9 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;->$selectedVoiceChannelId$inlined:J
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
     cmp-long v6, v0, v2
 
@@ -171,9 +172,9 @@
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
-    move-result v4
+    move-result v5
 
-    move v11, v4
+    move v11, v5
 
     goto :goto_1
 
@@ -195,9 +196,9 @@
 
     move-result-object v2
 
-    iget-wide v3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;->$selectedGuildId$inlined:J
+    iget-wide v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;->$selectedGuildId$inlined:J
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
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 6aa2ef7f67..6faa01e608 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -75,7 +76,7 @@
 
     check-cast v0, Lcom/discord/widgets/channels/list/items/ChannelListItem;
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-interface {v0}, Lcom/discord/widgets/channels/list/items/ChannelListItem;->getType()I
 
@@ -125,9 +126,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->$items:Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->$items:Ljava/util/ArrayList;
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
@@ -137,4 +136,7 @@
 
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .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 36caad6534..ec8f7f94e6 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 
 # annotations
@@ -145,7 +146,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -157,7 +158,7 @@
 .end method
 
 .method private final guildListBuilder(JLcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/Map;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)Ljava/util/List;
-    .locals 36
+    .locals 35
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -440,23 +441,23 @@
 
     move-object v8, v14
 
-    move-object/from16 v30, v9
+    move-object/from16 p4, v9
 
-    move/from16 v31, v10
+    move/from16 v30, v10
 
     move-wide/from16 v9, p5
 
-    move/from16 v32, v11
+    move/from16 v31, v11
 
     move-object/from16 v11, p10
 
-    move-object/from16 v33, v12
+    move-object/from16 v32, v12
 
     move-object/from16 v12, p11
 
-    move-object/from16 v34, v13
+    move-object/from16 v33, v13
 
-    move-object/from16 v35, v14
+    move-object/from16 v34, v14
 
     move-wide/from16 v13, p1
 
@@ -466,9 +467,9 @@
 
     move-object/from16 v18, p9
 
-    move-object/from16 v19, v34
+    move-object/from16 v19, v33
 
-    move-object/from16 v20, v33
+    move-object/from16 v20, v32
 
     invoke-direct/range {v0 .. v20}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;-><init>(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;ZZLcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/HashSet;JLjava/util/Map;Ljava/util/Set;JLjava/util/Set;JLjava/util/Map;Ljava/util/ArrayList;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;)V
 
@@ -478,11 +479,11 @@
 
     move-wide/from16 v1, v28
 
-    move-object/from16 v3, v30
+    move-object/from16 v3, p4
 
     move-object/from16 v5, p3
 
-    move-object/from16 v6, v35
+    move-object/from16 v6, v34
 
     move-wide/from16 v7, p5
 
@@ -498,36 +499,36 @@
 
     move-object/from16 v16, p9
 
-    move-object/from16 v17, v34
+    move-object/from16 v17, v33
 
-    move-object/from16 v18, v33
+    move-object/from16 v18, v32
 
     invoke-direct/range {v0 .. v18}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;-><init>(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/HashSet;JLjava/util/Map;Ljava/util/Set;JLjava/util/Set;JLjava/util/Map;Ljava/util/ArrayList;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;)V
 
-    invoke-virtual/range {v30 .. v30}, Lcom/discord/models/domain/ModelChannel;->getType()I
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result v0
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_9
 
     const/4 v1, 0x2
 
-    if-eq v0, v1, :cond_7
+    if-eq v0, v1, :cond_6
 
     const/4 v1, 0x4
 
     if-eq v0, v1, :cond_5
 
-    move/from16 v3, v32
+    move/from16 v3, v31
 
-    move-object/from16 v1, v34
+    move-object/from16 v1, v33
 
     move-object/from16 v2, p12
 
     goto :goto_4
 
     :cond_5
-    invoke-virtual/range {v33 .. v33}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->invoke()V
+    invoke-virtual/range {v32 .. v32}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->invoke()V
 
     new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
 
@@ -541,19 +542,18 @@
 
     move-result v1
 
-    move-object/from16 v4, v30
+    move-object/from16 v4, p4
 
-    move/from16 v5, v31
+    move/from16 v5, v30
 
-    move/from16 v3, v32
+    move/from16 v3, v31
 
     invoke-direct {v0, v4, v1, v5, v3}, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
 
-    move-object/from16 v1, v34
+    move-object/from16 v1, v33
 
-    goto :goto_5
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :cond_6
     :goto_4
     move-object v13, v1
 
@@ -561,16 +561,16 @@
 
     move v11, v3
 
-    move-object/from16 v12, v33
+    move-object/from16 v12, v32
 
-    move-object/from16 v14, v35
+    move-object/from16 v14, v34
 
     goto/16 :goto_2
 
-    :cond_7
-    move/from16 v3, v32
+    :cond_6
+    move/from16 v3, v31
 
-    move-object/from16 v1, v34
+    move-object/from16 v1, v33
 
     move-object/from16 v2, p12
 
@@ -578,7 +578,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_8
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -594,7 +594,7 @@
 
     check-cast v0, Ljava/util/Collection;
 
-    if-nez v0, :cond_8
+    if-nez v0, :cond_7
 
     sget-object v0, Lkotlin/a/x;->bPB:Lkotlin/a/x;
 
@@ -602,22 +602,33 @@
 
     check-cast v0, Ljava/util/Collection;
 
-    :cond_8
+    :cond_7
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    goto :goto_4
+    goto :goto_5
+
+    :cond_8
+    move-object/from16 v4, p9
+
+    :goto_5
+    move-object v13, v1
+
+    move-object v15, v2
+
+    move v11, v3
+
+    move-object/from16 v12, v32
+
+    move-object/from16 v14, v34
+
+    goto/16 :goto_2
 
     :cond_9
     move-object/from16 v4, p9
 
-    goto :goto_4
+    move/from16 v3, v31
 
-    :cond_a
-    move-object/from16 v4, p9
-
-    move/from16 v3, v32
-
-    move-object/from16 v1, v34
+    move-object/from16 v1, v33
 
     move-object/from16 v2, p12
 
@@ -625,12 +636,22 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_a
 
-    :goto_5
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_4
+    :cond_a
+    move-object v13, v1
+
+    move-object v15, v2
+
+    move v11, v3
+
+    move-object/from16 v12, v32
+
+    move-object/from16 v14, v34
+
+    goto/16 :goto_2
 
     :cond_b
     move-object/from16 v4, p9
@@ -638,11 +659,11 @@
     goto/16 :goto_0
 
     :cond_c
-    move-object/from16 v33, v12
+    move-object/from16 v32, v12
 
     move-object v1, v13
 
-    invoke-virtual/range {v33 .. v33}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->invoke()V
+    invoke-virtual/range {v32 .. v32}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->invoke()V
 
     move-object v13, v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$createVoiceStates$group$1$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$createVoiceStates$group$1$1.smali
index 7074ec5ede..93f8120053 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$createVoiceStates$group$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$createVoiceStates$group$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$createVoiceStates$group$1$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali
index 5fcbaad163..416087c663 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
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 b05fcc0486..8eeed0100e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 
 # annotations
@@ -272,7 +273,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$sam$rx_functions_Func4$0.smali
index 48f6ef9493..0bad683f07 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$sam$rx_functions_Func4$0.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$sam$rx_functions_Func4$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListModel$sam$rx_functions_Func4$0;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
index 213b76eefa..40f1f123de 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel;
 .super Ljava/lang/Object;
+.source "WidgetChannelListModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali
index 3e03ba75ea..5b16ca1e17 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$1;
 .super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "WidgetChannelListUnreads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2$1.smali
index 285b4e0dab..5e589a384d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$2$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChannelListUnreads.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2.smali
index d5f4bd275f..35da01f5d3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Companion.smali
index f84bc35b44..b9af1d2514 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali
index 5264ecf002..a93a659829 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali
index 7c81cef1fc..1b3a3172e9 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali
index b03247be5c..e8e713a96c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem.smali
index e89daa4afc..e88ceae892 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$handleVisibleRangeUpdate$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$handleVisibleRangeUpdate$1.smali
index 9faa0e9c3d..984b56f475 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$handleVisibleRangeUpdate$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$handleVisibleRangeUpdate$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$handleVisibleRangeUpdate$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali
index 971785b473..4eecc8e929 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali
index a0d99a699a..f6da678271 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelListUnreads.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
index 8d1c1ccef9..09d53c4e0a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelListUnreads.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 5eb03f5438..b2afd2ba92 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;
 .super Ljava/lang/Object;
+.source "WidgetChannelListUnreads.kt"
 
 
 # annotations
@@ -723,9 +724,9 @@
 
     move-result p2
 
-    const/4 v1, 0x6
+    const/16 v1, 0x8
 
-    const/16 v2, 0x8
+    const/4 v2, 0x6
 
     if-eqz v0, :cond_3
 
@@ -746,12 +747,9 @@
 
     if-eqz p3, :cond_4
 
-    goto :goto_2
+    const/4 v1, 0x6
 
     :cond_4
-    const/16 v1, 0x8
-
-    :goto_2
     iget-object p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->unreadsAdapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 
     invoke-virtual {p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
index 72c1639464..fcee360fb3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 233cb1929c..c6e11657e0 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 4dc98e786a..d9bc7b0d1e 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 df0208a8f3..43198b2685 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -104,10 +105,10 @@
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion;->show(Landroidx/fragment/app/FragmentManager;J)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
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 dfb1b5cfed..e17fc5dca7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 65dceaa610..bb4250cd56 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 6df9418562..28b2f9e4ad 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7349443f23..b293ebf321 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7c9abfca8b..270df629bc 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 13cac23990..fc0c190400 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChannelsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 508b6e91fa..f2b033f97d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelsList.kt"
 
 
 # static fields
@@ -406,8 +407,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali
index ab02bb6fc7..06fd961a8b 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali
index f2e501bca1..f01caeec18 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
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 35e854bddb..cdeade52dd 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
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
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 b5fa7eaebf..d88754dc77 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali
index 4169dcd8ef..3c9ff5073e 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 2f406be07f..d1bae2fa62 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
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 8d0efdae92..62ed857149 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
@@ -492,10 +493,9 @@
 
     move-result-object v1
 
-    :goto_0
     check-cast v1, Ljava/lang/CharSequence;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget-object v1, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
@@ -524,9 +524,9 @@
 
     move-result-object v1
 
-    goto :goto_0
+    check-cast v1, Ljava/lang/CharSequence;
 
-    :goto_1
+    :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemAvatar()Landroid/widget/ImageView;
@@ -581,12 +581,12 @@
 
     move-result-object v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/4 v1, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackground(Landroid/graphics/drawable/Drawable;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemPresence()Landroid/widget/ImageView;
@@ -627,7 +627,7 @@
 
     check-cast v1, Ljava/lang/CharSequence;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemDesc()Landroid/widget/TextView;
@@ -638,7 +638,7 @@
 
     move-result-object v1
 
-    :goto_3
+    :goto_2
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemMentions()Landroid/widget/TextView;
@@ -666,12 +666,12 @@
 
     const/4 p2, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     const/4 p2, 0x0
 
-    :goto_4
+    :goto_3
     invoke-static {v0, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     iget-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemView:Landroid/view/View;
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 ff1dc9e22f..ce3b457e47 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
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 4bd3469d01..292d6ad0bf 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali
index 265890c9e3..2224fea58f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali
index 7818a42700..3d7557bd88 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali
index 922612fbd7..d032fdd9a7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 d1194ac13f..3c8f00597e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
@@ -181,7 +182,7 @@
 
     const/4 v3, 0x4
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     const v0, 0x7f120aa2
 
@@ -197,7 +198,7 @@
 
     if-eq p1, p2, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
@@ -214,6 +215,10 @@
 
     invoke-direct {v0, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2;-><init>(J)V
 
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
     goto :goto_0
 
     :cond_1
@@ -231,12 +236,11 @@
 
     invoke-direct {v0, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1;-><init>(J)V
 
-    :goto_0
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
@@ -251,7 +255,22 @@
 
     invoke-virtual {v0, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    :goto_1
+    goto :goto_0
+
+    :cond_3
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemHeader()Landroid/widget/TextView;
 
     move-result-object p2
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali
index a2f76de98e..57aa18bf5f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali
index a48c46cde6..b7bcae7c6f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnLongClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali
index 17a178333a..d071d35f69 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali
index b2028f4a8d..04b87945fd 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 9f282e2c11..7c633dda11 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
index 0de1bac45c..0a6e75095b 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;
 .super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
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 693ed0c427..e852458ee3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1ce4cc4ada..faa875eb34 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 c1bdf53a62..c4f06e95fc 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f74afaaf29..76e2469fde 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 497cca5c0b..8b67329fae 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 14c0053b02..8b08a11b22 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 63b8d1d76a..500fc5f564 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetChannelsListAdapter.kt"
 
 
 # annotations
@@ -308,7 +309,6 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
@@ -320,7 +320,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_3
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;
@@ -329,7 +331,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_4
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;
@@ -338,7 +342,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_5
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends;
@@ -347,7 +353,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_6
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;
@@ -356,7 +364,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_7
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;
@@ -365,7 +375,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_8
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;
@@ -374,7 +386,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_9
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;
@@ -383,7 +397,9 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali
index e622c41998..bd7b749788 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali
index a0a8cb40c2..3ca8aab899 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 c9bcba6f1d..1b134c1358 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 
 # annotations
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 f190118403..c8d7562b42 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 
 # annotations
@@ -336,7 +337,6 @@
 
     move-result-object p1
 
-    :goto_0
     check-cast p1, Ljava/lang/CharSequence;
 
     return-object p1
@@ -372,7 +372,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Ljava/lang/CharSequence;
+
+    return-object p1
 .end method
 
 .method public final getMuteIconResId(Landroid/content/Context;)I
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 fc4d2f24b6..b0aaf51de8 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 45886aa1f1..740d858043 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1e5acd631c..71209bdd27 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 47b1caca3c..1e14147d44 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 08a40dd542..bf65f2b907 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali
index 605b3a1ddf..2fe49b07dd 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 5b871e4793..f31bfcab80 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d9817a1fd0..41ad7124b9 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 bd2ebe03fe..ffe3e8696c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetChannelsListItemChannelActions.kt"
 
 
 # annotations
@@ -1007,8 +1008,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$1.smali
index 03639ebcf6..95e93e85b3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 afdafe663b..b4538a86cb 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion.smali
index 4c86ac806e..7d79a13c61 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion$get$1.smali
index c1e0c7b67c..8c3b1a9fe8 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
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 763ec2b2ca..a89020d068 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model.smali
index 8546826d98..59615d5be9 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 
 # annotations
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 a9fdf7cb02..a1ba0c9375 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 75d25696e8..bb2ccdc326 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 56f86a59e3..101159e053 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1.smali
index 6065a97bdf..e1fa2fa1c3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 2c40c87960..e18e3b311c 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3.smali
index 2448bf9f66..7c4ea172c3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3;
 .super Ljava/lang/Object;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 1f0022031f..f0e051b557 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$6;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 bee6cad861..e0878f2a7f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetChannelsListItemVoiceActions.kt"
 
 
 # annotations
@@ -993,8 +994,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali
index 1645327e75..2dc10b0bf0 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration;
 .super Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;
+.source "WidgetCollapsedUsersListAdapter.kt"
 
 
 # annotations
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 13d846f416..e3debdd69e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetCollapsedUsersListAdapter.kt"
 
 
 # annotations
@@ -174,7 +175,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_2
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->getExtraCount()I
 
@@ -261,6 +262,9 @@
 
     :cond_1
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 .method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
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 a9d58b53ec..b4ec9cba34 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetCollapsedUsersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
index a7038c0e5d..4e40f7a4f5 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItem$Companion;
 .super Ljava/lang/Object;
+.source "ChannelListItem.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$DefaultImpls.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$DefaultImpls.smali
index 4b449d8bce..86d442d51f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$DefaultImpls.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItem$DefaultImpls;
 .super Ljava/lang/Object;
+.source "ChannelListItem.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali
index 0c42ae1557..93593d5664 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/channels/list/items/ChannelListItem;
 .super Ljava/lang/Object;
+.source "ChannelListItem.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali
index 39e37d1303..b129c8dc7b 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
 .super Ljava/lang/Object;
+.source "ChannelListItemCategory.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali
index a39e3199a4..1a34b1bdc7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;
 .super Ljava/lang/Object;
+.source "ChannelListItemFriends.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali
index 5fa81ea491..1c64c7b7f5 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;
 .super Ljava/lang/Object;
+.source "ChannelListItemHeader.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemInvite.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemInvite.smali
index ff422fcd79..a7355ec7f7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemInvite.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemInvite;
 .super Ljava/lang/Object;
+.source "ChannelListItemInvite.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemMfaNotice.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemMfaNotice.smali
index 8ce98ae4de..d1a0b5ca41 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemMfaNotice.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemMfaNotice.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemMfaNotice;
 .super Ljava/lang/Object;
+.source "ChannelListItemMfaNotice.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali
index 3910bf1d0a..21fdcaaaa4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
 .super Ljava/lang/Object;
+.source "ChannelListItemPrivate.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali
index 5e1c52a8a3..66771dba90 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
 .super Ljava/lang/Object;
+.source "ChannelListItemTextChannel.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali
index 383ce40c9d..feed259f6a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
 .super Ljava/lang/Object;
+.source "ChannelListItemVoiceChannel.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion$COMPARATOR$1.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion$COMPARATOR$1.smali
index a066377e41..79c9bac4ee 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion$COMPARATOR$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion$COMPARATOR$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion$COMPARATOR$1;
 .super Ljava/lang/Object;
+.source "ChannelListItemVoiceUser.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion.smali
index 1643ffcd63..c6a0e3bd6a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser$Companion;
 .super Ljava/lang/Object;
+.source "ChannelListItemVoiceUser.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali
index 58eb9e01dd..871fa56d5d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
 .super Ljava/lang/Object;
+.source "ChannelListItemVoiceUser.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali
index f62a1b4fbd..783cde3dc7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;
 .super Ljava/lang/Object;
+.source "CollapsedUser.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali
index b18438730f..bb15faeb04 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/list/items/CollapsedUser$userId$2;
 .super Lkotlin/jvm/internal/k;
+.source "CollapsedUser.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali
index 52b0eb5492..0122d2a69f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/list/items/CollapsedUser;
 .super Ljava/lang/Object;
+.source "CollapsedUser.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList.smali
index 340cc69556..a4a8935cc6 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList;
 .super Ljava/lang/Object;
+.source "PrivateChannelMembersListModelProvider.java"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList;
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 75dfe5a555..4d83250b1f 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider;
 .super Ljava/lang/Object;
+.source "PrivateChannelMembersListModelProvider.java"
 
 
 # annotations
@@ -54,7 +55,7 @@
 .end method
 
 .method private static buildModel(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;J)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList;
-    .locals 14
+    .locals 13
     .param p0    # Lcom/discord/models/domain/ModelChannel;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
@@ -75,72 +76,124 @@
         }
     .end annotation
 
-    new-instance v1, Ljava/util/TreeMap;
+    new-instance v0, Ljava/util/TreeMap;
 
-    sget-object v2, Lcom/discord/widgets/channels/memberlist/-$$Lambda$TEfSBt3hRUlBSSARfPEHsJesTtE;->INSTANCE:Lcom/discord/widgets/channels/memberlist/-$$Lambda$TEfSBt3hRUlBSSARfPEHsJesTtE;
+    sget-object v1, Lcom/discord/widgets/channels/memberlist/-$$Lambda$TEfSBt3hRUlBSSARfPEHsJesTtE;->INSTANCE:Lcom/discord/widgets/channels/memberlist/-$$Lambda$TEfSBt3hRUlBSSARfPEHsJesTtE;
 
-    invoke-direct {v1, v2}, Ljava/util/TreeMap;-><init>(Ljava/util/Comparator;)V
+    invoke-direct {v0, v1}, Ljava/util/TreeMap;-><init>(Ljava/util/Comparator;)V
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     if-eqz p0, :cond_0
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
 
-    move-result-object v3
+    move-result-object v2
 
     goto :goto_0
 
     :cond_0
-    move-object v3, v2
+    move-object v2, v1
 
     :goto_0
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-interface {v4}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
-    move-result-object v4
+    move-result-object v3
 
     :goto_1
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v4
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
-    if-eqz v5, :cond_4
+    if-eqz v4, :cond_4
 
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v4
 
-    check-cast v5, Lcom/discord/models/domain/ModelUser;
+    check-cast v4, Lcom/discord/models/domain/ModelUser;
 
-    new-instance v7, Ljava/lang/StringBuilder;
+    new-instance v6, Ljava/lang/StringBuilder;
 
-    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getUsernameLower()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsernameLower()Ljava/lang/String;
 
     move-result-object v7
 
-    if-eqz v3, :cond_1
+    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v4}, 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/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+
+    goto :goto_2
+
+    :cond_1
+    move-object v7, v1
+
+    :goto_2
+    if-eqz v7, :cond_2
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getNick()Ljava/lang/String;
+
+    move-result-object v7
+
+    goto :goto_3
+
+    :cond_2
+    move-object v7, v1
+
+    :goto_3
+    if-eqz p0, :cond_3
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getOwnerId()J
+
+    move-result-wide v8
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v10
+
+    cmp-long v12, v8, v10
+
+    if-nez v12, :cond_3
+
+    goto :goto_4
+
+    :cond_3
+    const/4 v5, 0x0
+
+    :goto_4
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v8
 
@@ -148,84 +201,32 @@
 
     move-result-object v8
 
-    invoke-interface {v3, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    move-object v9, p2
+
+    invoke-interface {p2, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v8
 
-    check-cast v8, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+    check-cast v8, Lcom/discord/models/domain/ModelPresence;
 
-    goto :goto_2
+    invoke-static {v4, v8, v5, v7}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider;->createGroupDMMember(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;ZLjava/lang/String;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
 
-    :cond_1
-    move-object v8, v2
+    move-result-object v4
 
-    :goto_2
-    if-eqz v8, :cond_2
-
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getNick()Ljava/lang/String;
-
-    move-result-object v8
-
-    goto :goto_3
-
-    :cond_2
-    move-object v8, v2
-
-    :goto_3
-    if-eqz p0, :cond_3
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getOwnerId()J
-
-    move-result-wide v9
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v11
-
-    cmp-long v13, v9, v11
-
-    if-nez v13, :cond_3
-
-    goto :goto_4
-
-    :cond_3
-    const/4 v6, 0x0
-
-    :goto_4
-    invoke-virtual {v5}, 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
-
-    move-object/from16 v10, p2
-
-    invoke-interface {v10, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Lcom/discord/models/domain/ModelPresence;
-
-    invoke-static {v5, v9, v6, v8}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider;->createGroupDMMember(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;ZLjava/lang/String;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
-
-    move-result-object v5
-
-    invoke-interface {v1, v7, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v6, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_1
 
     :cond_4
-    new-instance v0, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    invoke-interface {v1}, Ljava/util/Map;->size()I
+    invoke-interface {v0}, Ljava/util/Map;->size()I
 
     move-result v2
 
-    add-int/2addr v2, v6
+    add-int/2addr v2, v5
 
-    invoke-direct {v0, v2}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {p1}, Ljava/util/Map;->size()I
 
@@ -235,23 +236,23 @@
 
     move-result-object v2
 
-    invoke-interface {v0, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
+    invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
+    invoke-interface {v1, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    new-instance v1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList;
+    new-instance v0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList;
 
     invoke-static/range {p3 .. p4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList;-><init>(Ljava/lang/String;Ljava/util/List;)V
+    invoke-direct {v0, v2, v1}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider$MemberList;-><init>(Ljava/lang/String;Ljava/util/List;)V
 
-    return-object v1
+    return-object v0
 .end method
 
 .method private static createGroupDMHeader(I)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
@@ -279,19 +280,16 @@
 
     if-eqz p3, :cond_0
 
-    :goto_0
-    move-object v3, p3
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object p3
 
-    goto :goto_0
+    :goto_0
+    move-object v3, p3
 
-    :goto_1
     const/4 p3, -0x1
 
     invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -375,7 +373,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
@@ -401,7 +399,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion$EMPTY_MEMBER_LIST$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion$EMPTY_MEMBER_LIST$1.smali
index e688722543..8a2aad5783 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion$EMPTY_MEMBER_LIST$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion$EMPTY_MEMBER_LIST$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion$EMPTY_MEMBER_LIST$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion.smali
index 339b116f29..48af81044e 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList.smali
index 001999598e..2861164de8 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali
index 22037ede94..32e1d1c250 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 
 # annotations
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 7bf209e1ff..4a1b01d761 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$RxOnScrollListener;
 .super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "WidgetChannelMembersList.kt"
 
 
 # annotations
@@ -31,7 +32,7 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
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 870bd5751c..46f5205801 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -96,6 +97,8 @@
 
     invoke-virtual/range {v1 .. v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$1.smali
index 86d976b2de..27c70ad5c9 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$2.smali
index 47d8a65396..d6a9b0dec7 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$2;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3$1.smali
index c4688a0235..84ec8f1c94 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -77,17 +78,14 @@
 
     move-result-wide v0
 
-    :goto_0
-    move-wide v3, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 v0, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v3, v0
 
-    :goto_1
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3$1;->$selectedGuild:Lcom/discord/models/domain/ModelGuild;
 
     if-eqz p1, :cond_1
@@ -100,17 +98,14 @@
 
     move-result-object p1
 
-    :goto_2
-    move-object v5, p1
-
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     const/4 p1, 0x0
 
-    goto :goto_2
+    :goto_1
+    move-object v5, p1
 
-    :goto_3
     move-object v0, v6
 
     move-object v1, p2
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3.smali
index c282d92c28..0fc71691a9 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$getModelObservable$3;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 52aac558f6..ba7b9b13c2 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ef16283ec0..656567a6d9 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali
index 5792b9b2b6..4268454eae 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChannelMembersList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 1ccb3889e0..be6f8ed462 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelMembersList.kt"
 
 
 # annotations
@@ -347,7 +348,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -355,7 +356,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KF()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KE()Lrx/Observable;
 
     move-result-object v0
 
@@ -387,7 +388,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;->channelId:Ljava/lang/Long;
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     if-nez v1, :cond_0
 
@@ -466,6 +467,9 @@
     throw v0
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_0
     return-void
 .end method
@@ -479,8 +483,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -704,7 +706,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListKt.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListKt.smali
index af7e137abb..d441a03967 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListKt.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListKt;
 .super Ljava/lang/Object;
+.source "WidgetChannelMembersList.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali
index a41913f42c..59286616b7 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1;
 .super Lkotlin/jvm/internal/k;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -77,7 +78,6 @@
 
     invoke-direct {p1, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;
 
     return-object p1
@@ -150,7 +150,9 @@
 
     invoke-direct {p1, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;
+
+    return-object p1
 .end method
 
 .method public final bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali
index f8cb8b5257..4de4a4819b 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$3.smali
index 92867656c7..8cd0faaee6 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$3;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 e94789863e..f3a5bd73a5 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$4;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali
index 025f3515ad..9c3d2e546d 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback;
 .super Landroidx/recyclerview/widget/DiffUtil$Callback;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$1.smali
index 07870b15ff..8560ba1e07 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$1;
 .super Lkotlin/jvm/internal/k;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Companion.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Companion.smali
index c73bd5e115..751600ff9a 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Companion;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali
index 86cee18387..a3200ac4ef 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
 .super Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali
index b410d4cbe7..d57a5ed75e 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
 .super Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
@@ -73,103 +74,103 @@
 
     move-object v0, p0
 
-    and-int/lit8 v2, p9, 0x1
+    and-int/lit8 v1, p9, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-wide v2, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->userId:J
+    iget-wide v1, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->userId:J
 
     goto :goto_0
 
     :cond_0
-    move-wide v2, p1
+    move-wide v1, p1
 
     :goto_0
-    and-int/lit8 v4, p9, 0x2
+    and-int/lit8 v3, p9, 0x2
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    iget-object v4, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->name:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->name:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    move-object v4, p3
+    move-object v3, p3
 
     :goto_1
-    and-int/lit8 v5, p9, 0x4
+    and-int/lit8 v4, p9, 0x4
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
-    iget-boolean v5, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->isBot:Z
+    iget-boolean v4, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->isBot:Z
 
     goto :goto_2
 
     :cond_2
-    move v5, p4
+    move v4, p4
 
     :goto_2
-    and-int/lit8 v6, p9, 0x8
+    and-int/lit8 v5, p9, 0x8
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    iget-object v6, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v5, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->presence:Lcom/discord/models/domain/ModelPresence;
 
     goto :goto_3
 
     :cond_3
-    move-object v6, p5
+    move-object v5, p5
 
     :goto_3
-    and-int/lit8 v7, p9, 0x10
+    and-int/lit8 v6, p9, 0x10
 
-    if-eqz v7, :cond_4
+    if-eqz v6, :cond_4
 
-    iget-object v7, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->color:Ljava/lang/Integer;
+    iget-object v6, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->color:Ljava/lang/Integer;
 
     goto :goto_4
 
     :cond_4
-    move-object v7, p6
+    move-object v6, p6
 
     :goto_4
-    and-int/lit8 v8, p9, 0x20
+    and-int/lit8 v7, p9, 0x20
 
-    if-eqz v8, :cond_5
+    if-eqz v7, :cond_5
 
-    iget-object v8, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->avatarUrl:Ljava/lang/String;
+    iget-object v7, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->avatarUrl:Ljava/lang/String;
 
     goto :goto_5
 
     :cond_5
-    move-object/from16 v8, p7
+    move-object/from16 v7, p7
 
     :goto_5
-    and-int/lit8 v1, p9, 0x40
+    and-int/lit8 v8, p9, 0x40
 
-    if-eqz v1, :cond_6
+    if-eqz v8, :cond_6
 
-    iget-boolean v1, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->showOwnerIndicator:Z
+    iget-boolean v8, v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->showOwnerIndicator:Z
 
     goto :goto_6
 
     :cond_6
-    move/from16 v1, p8
+    move/from16 v8, p8
 
     :goto_6
-    move-wide p1, v2
+    move-wide p1, v1
 
-    move-object p3, v4
+    move-object p3, v3
 
-    move p4, v5
+    move p4, v4
 
-    move-object p5, v6
+    move-object p5, v5
 
-    move-object p6, v7
+    move-object p6, v6
 
-    move-object/from16 p7, v8
+    move-object/from16 p7, v7
 
-    move/from16 p8, v1
+    move/from16 p8, v8
 
     invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->copy(JLjava/lang/String;ZLcom/discord/models/domain/ModelPresence;Ljava/lang/Integer;Ljava/lang/String;Z)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item.smali
index 001daf7495..0af56e5d4f 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali
index fca2c2689b..2c34691ba0 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate;
 .super Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali
index 4d83cbb101..b84b645be7 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate;
 .super Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation.smali
index aa55bc092d..4053e29a26 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali
index 91e3c27e01..07bc697714 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType$Companion.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType$Companion.smali
index 9fb84209e9..4054e9aa8c 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType$Companion;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType.smali
index 30188b8fbf..4546582b52 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
 .super Ljava/lang/Enum;
+.source "ChannelMembersListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onAttachedToRecyclerView$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onAttachedToRecyclerView$1.smali
index 286450edff..593ec87fdd 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onAttachedToRecyclerView$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onAttachedToRecyclerView$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onAttachedToRecyclerView$1;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnLayoutChangeListener;
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 130b8b30a3..99b78f394d 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1;
 .super Lkotlin/jvm/internal/k;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali
index 024df48baf..50e49ff0bf 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;
 .super Lkotlin/jvm/internal/k;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 af2d389596..b59687cb75 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "ChannelMembersListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter;
@@ -62,7 +63,7 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -102,7 +103,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->updatesSubject:Lrx/subjects/PublishSubject;
 
-    invoke-virtual {v1}, Lrx/subjects/PublishSubject;->KF()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/PublishSubject;->KE()Lrx/Observable;
 
     move-result-object v1
 
@@ -114,11 +115,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KG()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -126,7 +127,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -572,7 +573,6 @@
 
     invoke-direct {p1, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading;-><init>(Landroid/view/View;)V
 
-    :goto_0
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
     return-object p1
@@ -588,7 +588,9 @@
 
     invoke-direct {p1, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;-><init>(Landroid/view/View;)V
 
-    goto :goto_0
+    check-cast p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+
+    return-object p1
 
     :pswitch_2
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;
@@ -601,7 +603,9 @@
 
     invoke-direct {p1, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;-><init>(Landroid/view/View;)V
 
-    goto :goto_0
+    check-cast p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapterKt.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapterKt.smali
index 58ebcda144..096afb0a37 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapterKt.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapterKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapterKt;
 .super Ljava/lang/Object;
+.source "ChannelMembersListAdapter.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
index 333d0f7ee6..319c1671a1 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "ChannelMembersListViewHolderHeader.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading$Companion.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading$Companion.smali
index 442bfca797..e9a4e78286 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading$Companion;
 .super Ljava/lang/Object;
+.source "ChannelMembersListViewHolderLoading.kt"
 
 
 # annotations
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 46a705493c..bed0a78d99 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "ChannelMembersListViewHolderLoading.kt"
 
 
 # annotations
@@ -269,7 +270,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     check-cast p1, Ljava/lang/Number;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$1.smali
index 9f8199180e..ecbbabaa52 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$1;
 .super Ljava/lang/Object;
+.source "ChannelMembersListViewHolderMember.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 105d3532f8..440e3153a9 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "ChannelMembersListViewHolderMember.kt"
 
 
 # instance fields
@@ -195,7 +196,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v0
 
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 73c8ed383e..c513552618 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChatDetached.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$2.smali
index 80653b86b3..c1b8bdac06 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetChatDetached.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 f932545263..9bb2445757 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatDetached.kt"
 
 
 # annotations
@@ -75,7 +76,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali
index 2579ca484c..8085299ff8 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatDetached.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$configureUI$1.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$configureUI$1.smali
index 7b0263d5eb..a28603df77 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/detached/WidgetChatDetached$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetChatDetached.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 b90532d53a..f06d39c208 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/detached/WidgetChatDetached$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatDetached.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d4f73d1249..c17b78414a 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/detached/WidgetChatDetached;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChatDetached.kt"
 
 
 # annotations
@@ -136,8 +137,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/detached/WidgetChatDetached;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali b/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali
index 520442e2cb..942a5d8ebd 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/SourcedAttachment;
 .super Lcom/lytefast/flexinput/model/Attachment;
+.source "SourcedAttachment.kt"
 
 
 # annotations
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 2babfc8f93..e4cc844005 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInput$chatInput$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatInput.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 5791a80571..c3b0e043aa 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChatInput.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3d22344d81..c24295b52e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInput;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChatInput.kt"
 
 
 # static fields
@@ -597,8 +598,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment$initPermissionsView$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment$initPermissionsView$1.smali
index 8138f87488..686220b837 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment$initPermissionsView$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment$initPermissionsView$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment$initPermissionsView$1;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 25603bfe35..95a3f4f7e2 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment;
 .super Lcom/lytefast/flexinput/fragment/CameraFragment;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
@@ -43,8 +44,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 0b63f41690..8a0c82e156 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment;
 .super Lcom/lytefast/flexinput/fragment/FilesFragment;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
@@ -35,8 +36,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 9e04b2d378..ec6bab10b6 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordPhotosFragment;
 .super Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
@@ -35,8 +36,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordPhotosFragment;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 9c5526388f..3accf2ddde 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter;
 .super Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$1.smali
index 5ec0159aea..9e4ce2cdca 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/managers/a;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2$1.smali
index 0ed6036fc6..987fae07fb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2$1;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2.smali
index 27f9558d9b..7a07579e64 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$3.smali
index a1861120fd..e41432b722 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$3;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$OnBackspacePressedListener;
@@ -62,6 +63,8 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->dispatchKeyEvent(Landroid/view/KeyEvent;)Z
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
index 5a1077f9a9..5f0c3aa289 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1.smali
index 303f4f40dc..3e19b757b6 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;
 .super Lcom/lytefast/flexinput/adapters/a$b;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2.smali
index 61d1b60bf3..a93da0e1ff 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;
 .super Lcom/lytefast/flexinput/adapters/a$b;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3.smali
index 2438dd06e7..1991938371 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;
 .super Lcom/lytefast/flexinput/adapters/a$b;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$3.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$3.smali
index 5e4f5c3010..e7326ad17f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$3;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali
index b9bf0460b9..8751a108f6 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
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 5ecb2d315f..c5de8a9ea4 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;
 .super Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
@@ -106,7 +107,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->De()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dd()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali
index eb2048b5f7..86f7ae698d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatInputAttachments.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 70365b6100..02fda66650 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;
 .super Ljava/lang/Object;
+.source "WidgetChatInputAttachments.kt"
 
 
 # annotations
@@ -171,6 +172,8 @@
 
     invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/model/Attachment;)V
 
+    return-void
+
     :cond_3
     return-void
 .end method
@@ -407,7 +410,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Z
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dn()Z
 
     move-result v0
 
@@ -426,7 +429,9 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->ad(Z)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->ac(Z)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+
+    return-void
 
     :cond_0
     return-void
@@ -445,6 +450,8 @@
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/InputListener;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item$1.smali
index b5806d4d26..2353444c67 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item$1;
 .super Ljava/lang/Object;
+.source "WidgetChatInputCommandsAdapter.java"
 
 # interfaces
 .implements Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;
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 a29ed3f6ba..9887fdb818 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetChatInputCommandsAdapter.java"
 
 
 # annotations
@@ -103,7 +104,7 @@
 
 # virtual methods
 .method protected onConfigure(ILcom/discord/widgets/chat/input/WidgetChatInputCommandsModel;)V
-    .locals 5
+    .locals 4
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "SetTextI18n"
@@ -161,11 +162,9 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemName:Landroid/widget/TextView;
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemName:Landroid/widget/TextView;
+    const v3, 0x7f06010f
 
-    const v4, 0x7f06010f
-
-    invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
+    invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
     move-result v3
 
@@ -362,10 +361,14 @@
 
     invoke-static {p1, p2}, Lcom/discord/utilities/presence/PresenceUtils;->setPresence(Lcom/discord/models/domain/ModelPresence;Landroid/widget/ImageView;)V
 
+    return-void
+
     :cond_1
     :goto_1
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item_ViewBinding.smali
index abc8f109d7..9be0bf1986 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatInputCommandsAdapter$Item_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 fc51c395a1..cc854958c5 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetChatInputCommandsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel$Channel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel$Channel.smali
index 7a9270cf69..3f2ae6fee0 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel$Channel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel$Channel.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/WidgetChatInputCommandsModel$Channel;
 .super Ljava/lang/Object;
+.source "WidgetChatInputCommandsModel.java"
 
 
 # annotations
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 4faf3577ea..7dc31d5cd4 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/WidgetChatInputCommandsModel;
 .super Ljava/lang/Object;
+.source "WidgetChatInputCommandsModel.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/input/WidgetChatInputMentions$TagObject;
@@ -453,10 +454,9 @@
 
     if-eqz v2, :cond_1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
-    :goto_2
     move/from16 v1, v21
 
     goto :goto_1
@@ -466,7 +466,7 @@
 
     move-object v1, v11
 
-    :goto_3
+    :goto_2
     invoke-interface/range {v17 .. v17}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
     move-result-object v2
@@ -487,12 +487,12 @@
 
     move-result-object v11
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     move-object v11, v1
 
-    :goto_4
+    :goto_3
     invoke-static/range {v18 .. v19}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
@@ -511,12 +511,16 @@
 
     invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    move/from16 v1, v21
+
+    goto :goto_1
 
     :cond_4
     move-object/from16 v4, p10
 
-    goto :goto_2
+    move/from16 v1, v21
+
+    goto :goto_1
 
     :cond_5
     move-object v1, v11
@@ -581,7 +585,7 @@
     move-result-object v1
 
     :cond_7
-    :goto_5
+    :goto_4
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
@@ -622,7 +626,7 @@
 
     invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
     return-object v0
@@ -795,7 +799,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -885,7 +889,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v2
 
@@ -963,7 +967,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -985,7 +989,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object v0
 
@@ -997,7 +1001,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -1043,10 +1047,9 @@
 
     move-result-object p0
 
-    :goto_1
     iput-object p0, v0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsModel;->tag:Ljava/lang/String;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     new-instance p2, Ljava/lang/StringBuilder;
@@ -1069,9 +1072,9 @@
 
     move-result-object p0
 
-    goto :goto_1
+    iput-object p0, v0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsModel;->tag:Ljava/lang/String;
 
-    :goto_2
+    :goto_1
     return-object v0
 .end method
 
@@ -1509,19 +1512,16 @@
 
     if-eqz v5, :cond_1
 
+    goto :goto_2
+
+    :cond_1
+    const/4 v4, 0x2
+
     :goto_2
     invoke-virtual {v2, v4}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object v4
 
-    goto :goto_3
-
-    :cond_1
-    const/4 v4, 0x2
-
-    goto :goto_2
-
-    :goto_3
     invoke-virtual {p0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     iget-object v4, v1, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsModel;->emoji:Lcom/discord/models/domain/emoji/Emoji;
@@ -1570,7 +1570,6 @@
 
     move-result-wide v5
 
-    :goto_4
     invoke-virtual {v3, v5, v6}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
@@ -1644,7 +1643,19 @@
 
     move-result-wide v5
 
-    goto :goto_4
+    invoke-virtual {v3, v5, v6}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p0, v2, v1}, Ljava/lang/String;->replaceAll(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    goto/16 :goto_0
 
     :cond_7
     new-instance p1, Lcom/discord/models/domain/ModelMessage$Content;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
index a301a8f8cd..ec898d257e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/WidgetChatInputEditText$1;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEditText.java"
 
 # interfaces
 .implements Landroid/text/TextWatcher;
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 dae1844238..21ab326bd9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
 .super Lcom/lytefast/flexinput/widget/FlexEditText;
+.source "WidgetChatInputEditText.java"
 
 
 # instance fields
@@ -300,13 +301,11 @@
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x6
+    const/4 p3, 0x6
 
-    if-ne p1, p2, :cond_0
+    if-ne p1, p3, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->onSendListener:Lrx/functions/Action0;
-
-    invoke-interface {p1}, Lrx/functions/Action0;->call()V
+    invoke-interface {p2}, Lrx/functions/Action0;->call()V
 
     const/4 p1, 0x1
 
@@ -361,9 +360,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -381,7 +380,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setMaxLines(IZ)V
+    invoke-virtual {p0, v1, v2}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setMaxLines(IZ)V
 
     sget-object v0, Landroid/text/TextUtils$TruncateAt;->END:Landroid/text/TextUtils$TruncateAt;
 
@@ -389,7 +388,6 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->hint:Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setHint(Ljava/lang/CharSequence;)V
 
     return-void
@@ -403,7 +401,9 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setEllipsize(Landroid/text/TextUtils$TruncateAt;)V
 
-    goto :goto_1
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setHint(Ljava/lang/CharSequence;)V
+
+    return-void
 .end method
 
 
@@ -472,7 +472,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -554,8 +554,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->mentions:Lcom/discord/widgets/chat/input/WidgetChatInputMentions;
-
     invoke-virtual {v1, v0}, Lcom/discord/widgets/chat/input/WidgetChatInputMentions;->getMentions(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v1
@@ -639,8 +637,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->mentions:Lcom/discord/widgets/chat/input/WidgetChatInputMentions;
-
     const/4 p2, 0x0
 
     invoke-virtual {p1, p0, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputMentions;->processMentions(Landroid/widget/EditText;Z)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$OnTagsMatched.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$OnTagsMatched.smali
index 542e2f6db3..3408dd856e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$OnTagsMatched.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$OnTagsMatched.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/input/WidgetChatInputMentions$OnTagsMatched;
 .super Ljava/lang/Object;
+.source "WidgetChatInputMentions.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$TagObject.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$TagObject.smali
index 0b6af28d85..59110dc38f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$TagObject.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions$TagObject.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/input/WidgetChatInputMentions$TagObject;
 .super Ljava/lang/Object;
+.source "WidgetChatInputMentions.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 85bbab4a15..34b111ecf4 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/WidgetChatInputMentions;
 .super Ljava/lang/Object;
+.source "WidgetChatInputMentions.java"
 
 
 # annotations
@@ -431,9 +432,9 @@
 
     move-result v1
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
     if-ne p0, v1, :cond_1
 
@@ -483,7 +484,7 @@
     return-object v2
 
     :cond_5
-    invoke-virtual {v0, v3, p0}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v0, v4, p0}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object p0
 
@@ -502,7 +503,7 @@
     :cond_6
     array-length v0, p0
 
-    sub-int/2addr v0, v4
+    sub-int/2addr v0, v3
 
     aget-object p0, p0, v0
 
@@ -515,7 +516,7 @@
     return-object v2
 
     :cond_7
-    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {p0, v4}, Ljava/lang/String;->charAt(I)C
 
     move-result v0
 
@@ -678,8 +679,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputMentions;->onTagsMatched:Lcom/discord/widgets/chat/input/WidgetChatInputMentions$OnTagsMatched;
-
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputMentions;->tagsMatchedCache:Ljava/util/List;
 
     invoke-interface {p1, v0, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputMentions$OnTagsMatched;->onTagsMatched(Ljava/util/List;Ljava/util/List;)V
@@ -966,7 +965,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/discord/widgets/chat/input/-$$Lambda$WidgetChatInputMentions$qhdYoO3FoqmtjAHMBH45jZ8Zen8;-><init>(Lcom/discord/widgets/chat/input/WidgetChatInputMentions;Ljava/lang/String;)V
 
-    sget p1, Lrx/Emitter$a;->cmM:I
+    sget p1, Lrx/Emitter$a;->cmg:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -976,12 +975,10 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputMentions;->dataSubscription:Lrx/Subscription;
-
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -989,7 +986,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->KQ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->KP()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 0eaed0ea70..90aee5a3b2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/WidgetChatInputModel;
 .super Ljava/lang/Object;
+.source "WidgetChatInputModel.java"
 
 
 # instance fields
@@ -216,7 +217,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -388,7 +389,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v8
 
@@ -540,7 +541,7 @@
 
     if-eqz v0, :cond_4
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_4
     invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
@@ -549,12 +550,11 @@
 
     packed-switch p0, :pswitch_data_0
 
-    goto :goto_5
+    goto :goto_4
 
     :pswitch_0
     const/4 p0, 0x4
 
-    :goto_4
     invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p0
@@ -574,7 +574,11 @@
 
     const/4 p0, 0x3
 
-    goto :goto_4
+    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_5
     :pswitch_2
@@ -589,7 +593,11 @@
     :cond_6
     const/4 p0, 0x2
 
-    goto :goto_4
+    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_7
     :pswitch_3
@@ -609,7 +617,7 @@
     return-object p0
 
     :cond_9
-    :goto_5
+    :goto_4
     invoke-static {p5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p0
@@ -617,7 +625,7 @@
     return-object p0
 
     :cond_a
-    :goto_6
+    :goto_5
     invoke-static {p5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p0
@@ -688,31 +696,31 @@
 
     if-eqz v3, :cond_0
 
+    const/4 v5, 0x1
+
+    move-object v5, p1
+
     const/4 v6, 0x1
 
-    move-object v6, p1
-
-    const/4 v7, 0x1
-
     goto :goto_0
 
     :cond_0
+    const/4 v5, 0x0
+
+    move-object v5, p1
+
     const/4 v6, 0x0
 
-    move-object v6, p1
-
-    const/4 v7, 0x0
-
     :goto_0
     invoke-static {p1, p0, v4, v3}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->getHint(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;ZZ)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v5
 
     new-instance v10, Lcom/discord/widgets/chat/input/WidgetChatInputModel;
 
     invoke-virtual/range {p6 .. p6}, Ljava/lang/Integer;->intValue()I
 
-    move-result v8
+    move-result v7
 
     invoke-virtual/range {p8 .. p8}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -724,12 +732,6 @@
 
     move-object v4, p3
 
-    move-object v5, v6
-
-    move v6, v7
-
-    move v7, v8
-
     move-object/from16 v8, p7
 
     invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;-><init>(JLcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreChat$EditingMessage;Ljava/lang/String;ZILjava/lang/String;Z)V
@@ -787,7 +789,6 @@
     :cond_0
     const v0, 0x7f120f78
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
@@ -797,7 +798,11 @@
     :cond_1
     const v0, 0x7f120f6e
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public getVerificationText(Landroid/content/Context;)Ljava/lang/String;
@@ -885,8 +890,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->editingMessage:Lcom/discord/stores/StoreChat$EditingMessage;
-
     invoke-virtual {v0}, Lcom/discord/stores/StoreChat$EditingMessage;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
     move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1.smali
index e6998f8647..dfcb86e83a 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatInputSend.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
index 6739c91de9..0ed30ddcde 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatInputSend.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 5dc7b3cb2b..dee87f1ae9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatInputSend.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali
index e14db69206..95a8295f55 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3;
 .super Ljava/lang/Object;
+.source "WidgetChatInputSend.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$4.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$4.smali
index 63068698ec..311d524964 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$4;
 .super Ljava/lang/Object;
+.source "WidgetChatInputSend.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 3ee37da31d..a946123853 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;
 .super Ljava/lang/Object;
+.source "WidgetChatInputSend.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/InputListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
index 1fea2805fa..d40f3b32f6 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend;
 .super Ljava/lang/Object;
+.source "WidgetChatInputSend.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/OnEmojiSelectedListener.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/OnEmojiSelectedListener.smali
index 8172c682f9..96b9389b9e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/OnEmojiSelectedListener.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/OnEmojiSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/input/emoji/OnEmojiSelectedListener;
 .super Ljava/lang/Object;
+.source "OnEmojiSelectedListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$1.smali
index d50d08f857..935ce7305f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$1;
 .super Landroidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup;
+.source "WidgetChatInputEmojiAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$2.smali
index 568e1e6aed..a9ee900c1d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$2.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$2;
 .super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "WidgetChatInputEmojiAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$3.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$3.smali
index 5a101f3741..b575b47623 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$3.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$3;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiItem.smali
index abee8be97f..e4ced6c782 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiItem;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiAdapter.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 10f3042728..b6947ef5b4 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetChatInputEmojiAdapter.java"
 
 
 # annotations
@@ -84,6 +85,8 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder_ViewBinding.smali
index cefda21dd1..8e7db5ac82 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiAdapter$EmojiViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 619f41d1fd..9cda1628da 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiAdapter.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 ce2498abf9..7308ff795a 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetChatInputEmojiAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder_ViewBinding.smali
index 0324d2cd13..5fea3a5717 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiAdapter$HeaderViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 b34291a69e..d19540373a 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetChatInputEmojiAdapter.java"
 
 
 # annotations
@@ -181,8 +182,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter;->onScrollPositionListener:Lrx/functions/Action1;
-
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter;->layoutManager:Landroidx/recyclerview/widget/GridLayoutManager;
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/GridLayoutManager;->findFirstVisibleItemPosition()I
@@ -206,7 +205,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/chat/input/emoji/-$$Lambda$WidgetChatInputEmojiAdapter$A6taHeYwkO3i7nA60SAn8D4ZzZ4;-><init>(Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter;)V
 
-    sget v1, Lrx/Emitter$a;->cmO:I
+    sget v1, Lrx/Emitter$a;->cmi:I
 
     invoke-static {v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$1.smali
index 2750c2c040..50240af5bb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$1;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiPicker.java"
 
 # interfaces
 .implements Lcom/google/android/material/tabs/TabLayout$OnTabSelectedListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$2.smali
index 2269ae8756..13ebffe349 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$2.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$2;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiPicker.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener.smali
index 8baedc46d7..db5861e5f5 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiPicker.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode.smali
index 0a22aeca90..4d83c50ddc 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode;
 .super Ljava/lang/Enum;
+.source "WidgetChatInputEmojiPicker.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali
index 3c05534298..9f93262629 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiPicker.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$OnBackspacePressedListener.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$OnBackspacePressedListener.smali
index bdecb15ea3..98b688110d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$OnBackspacePressedListener.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$OnBackspacePressedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$OnBackspacePressedListener;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiPicker.java"
 
 
 # annotations
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 b49ab4c3e8..6f6a4eeed9 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChatInputEmojiPicker.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/input/emoji/OnEmojiSelectedListener;
@@ -312,7 +313,7 @@
 
     sget-object v0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->state:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -439,7 +440,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -523,6 +524,9 @@
 
     :cond_2
     return-void
+
+    :cond_3
+    return-void
 .end method
 
 .method private static initCategoryIndices()Ljava/util/Map;
@@ -668,6 +672,8 @@
 
     invoke-virtual {v0, v9}, Landroid/widget/ImageView;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
+    return-void
+
     :cond_5
     :goto_2
     return-void
@@ -865,8 +871,6 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->listener:Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener;
-
     const/4 v0, 0x1
 
     invoke-interface {p2, p1, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener;->onEmojiPicked(Lcom/discord/models/domain/emoji/Emoji;Z)V
@@ -1030,7 +1034,6 @@
 
     check-cast p1, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode;
 
-    :goto_0
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->mode:Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode;
 
     return-void
@@ -1038,7 +1041,9 @@
     :cond_0
     sget-object p1, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode;->FULLSCREEN:Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode;
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->mode:Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Mode;
+
+    return-void
 .end method
 
 .method public onEmojiSelected(Lcom/discord/models/domain/emoji/Emoji;)V
@@ -1090,8 +1095,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->listener:Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener;
-
     const/4 v1, 0x0
 
     invoke-interface {v0, p1, v1}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Listener;->onEmojiPicked(Lcom/discord/models/domain/emoji/Emoji;Z)V
@@ -1139,8 +1142,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->searchInput:Landroid/widget/EditText;
-
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/-$$Lambda$LTCuhE-9C9k6AuePQXPc1u1Eaik;
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/chat/input/emoji/-$$Lambda$LTCuhE-9C9k6AuePQXPc1u1Eaik;-><init>(Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker_ViewBinding.smali
index 4b644d473c..d71fff7f8c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatInputEmojiPicker_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 e36c77e8a7..6d7a4c94a5 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatList$1;
 .super Ljava/lang/Object;
+.source "WidgetChatList.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler$UpdateRequest.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler$UpdateRequest.smali
index 8cc73996d6..9c6fc5cb53 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler$UpdateRequest.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler$UpdateRequest.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatList$UserReactionHandler$UpdateRequest;
 .super Ljava/lang/Object;
+.source "WidgetChatList.java"
 
 
 # annotations
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 10e0f55f9a..ebedebd3ba 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatList$UserReactionHandler;
 .super Ljava/lang/Object;
+.source "WidgetChatList.java"
 
 
 # annotations
@@ -66,7 +67,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -84,7 +85,7 @@
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()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 0edeadded3..89f5072d6a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatList;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChatList.java"
 
 
 # annotations
@@ -55,8 +56,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->chatListRecycler:Landroidx/recyclerview/widget/RecyclerView;
-
     if-nez p1, :cond_0
 
     const/16 v1, 0x8
@@ -76,8 +75,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setData(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;)V
 
     :cond_2
@@ -173,8 +170,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v1, p1, p2, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->scrollToMessageId(JLrx/functions/Action0;)V
 
     return-void
@@ -216,8 +211,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->chatListRecycler:Landroidx/recyclerview/widget/RecyclerView;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
@@ -231,8 +224,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->dispose()V
 
     :cond_1
@@ -250,8 +241,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->disposeHandlers()V
 
     :cond_0
@@ -288,8 +277,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->chatListRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setRecycler(Landroidx/recyclerview/widget/RecyclerView;)V
@@ -392,8 +379,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setHandlers()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$Model.smali
index 995fb62fdd..e1bd60f5fa 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$Model.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatListActions.java"
 
 
 # annotations
@@ -67,65 +68,65 @@
         .end annotation
     .end param
 
-    const/4 v2, 0x0
+    const/4 v0, 0x0
 
     if-nez p0, :cond_0
 
-    return-object v2
+    return-object v0
 
     :cond_0
     if-eqz p3, :cond_1
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
     goto :goto_0
 
     :cond_1
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    invoke-static {p0, p1, v4, v5, v3}, Lcom/discord/utilities/permissions/ManageMessageContext;->from(Lcom/discord/models/domain/ModelMessage;Ljava/lang/Integer;JZ)Lcom/discord/utilities/permissions/ManageMessageContext;
+    invoke-static {p0, p1, v3, v4, v2}, Lcom/discord/utilities/permissions/ManageMessageContext;->from(Lcom/discord/models/domain/ModelMessage;Ljava/lang/Integer;JZ)Lcom/discord/utilities/permissions/ManageMessageContext;
 
     move-result-object v6
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object v4
 
     invoke-static {p4}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    move-result v3
+    move-result v2
 
-    if-nez v3, :cond_2
+    if-nez v2, :cond_2
 
     invoke-interface {p4}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v0
 
-    const-string v3, "(edited)"
+    const-string v2, "(edited)"
 
-    const-string v5, ""
+    const-string v3, ""
 
-    invoke-virtual {v2, v3, v5}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
+    invoke-virtual {v0, v2, v3}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v0
 
     :cond_2
-    move-object v5, v2
+    move-object v5, v0
 
     if-nez p3, :cond_3
 
@@ -232,7 +233,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali
index 3bfe3cebf7..db9156342f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListActions;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetChatListActions.java"
 
 
 # annotations
@@ -131,9 +132,9 @@
     :cond_0
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsEdit:Landroid/view/View;
 
-    const/4 v1, 0x0
+    const/16 v1, 0x8
 
-    const/16 v2, 0x8
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_2
 
@@ -146,7 +147,7 @@
     :pswitch_0
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsEdit:Landroid/view/View;
 
-    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     goto :goto_1
 
@@ -205,8 +206,6 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsAddReaction:Landroid/view/View;
-
     iget-object v5, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->manageMessageContext:Lcom/discord/utilities/permissions/ManageMessageContext;
 
     invoke-virtual {v5}, Lcom/discord/utilities/permissions/ManageMessageContext;->getCanAddReactions()Z
@@ -238,8 +237,6 @@
 
     if-eqz v3, :cond_7
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsManageReactions:Landroid/widget/TextView;
-
     iget-object v5, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->message:Lcom/discord/models/domain/ModelMessage;
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getReactions()Ljava/util/Map;
@@ -275,8 +272,6 @@
 
     if-eqz v3, :cond_9
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsResend:Landroid/view/View;
-
     if-eqz v0, :cond_8
 
     const/4 v0, 0x0
@@ -302,8 +297,6 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsCopy:Landroid/view/View;
-
     iget-object v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->formattedMessageContent:Ljava/lang/CharSequence;
 
     if-eqz v3, :cond_a
@@ -331,8 +324,6 @@
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsCopyId:Landroid/view/View;
-
     iget-boolean v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->isDeveloper:Z
 
     invoke-static {v0, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
@@ -350,8 +341,6 @@
 
     if-eqz v0, :cond_d
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsShare:Landroid/view/View;
-
     iget-boolean v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->isDeveloper:Z
 
     invoke-static {v0, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
@@ -369,8 +358,6 @@
 
     if-eqz v0, :cond_10
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsPin:Landroid/widget/TextView;
-
     iget-object v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->manageMessageContext:Lcom/discord/utilities/permissions/ManageMessageContext;
 
     invoke-virtual {v3}, Lcom/discord/utilities/permissions/ManageMessageContext;->getCanTogglePinned()Z
@@ -422,8 +409,6 @@
 
     if-eqz v0, :cond_12
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsDelete:Landroid/view/View;
-
     iget-object v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->manageMessageContext:Lcom/discord/utilities/permissions/ManageMessageContext;
 
     invoke-virtual {v3}, Lcom/discord/utilities/permissions/ManageMessageContext;->getCanDelete()Z
@@ -432,12 +417,9 @@
 
     if-eqz v3, :cond_11
 
-    goto :goto_9
+    const/4 v1, 0x0
 
     :cond_11
-    const/16 v1, 0x8
-
-    :goto_9
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsDelete:Landroid/view/View;
@@ -453,8 +435,6 @@
 
     if-eqz v0, :cond_13
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsTitle:Landroid/widget/TextView;
-
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->messageAuthorName:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
@@ -479,8 +459,6 @@
 
     if-eqz v0, :cond_15
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsAvatar:Lcom/facebook/drawee/view/SimpleDraweeView;
-
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;->message:Lcom/discord/models/domain/ModelMessage;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
@@ -498,8 +476,6 @@
 
     if-eqz v0, :cond_16
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsProfile:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListActions$n2b_vIADSvv0ikBDW_hOyOrLnI4;
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListActions$n2b_vIADSvv0ikBDW_hOyOrLnI4;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;)V
@@ -511,8 +487,6 @@
 
     if-eqz v0, :cond_17
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions;->chatActionsHeader:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListActions$kSx85IyfeZJRMyMAzsGT3cBVtdM;
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListActions$kSx85IyfeZJRMyMAzsGT3cBVtdM;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListActions$Model;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali
index 16efb3ebdd..2f2fc79267 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
index f7b0b6116c..0d63cc199d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler.smali
index 14048741b4..c4d9c8f5cc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali
index 58a449891a..d4a2cbe68d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls;
 .super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "WidgetChatListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches.smali
index 841c2b4332..3acc9ca8cf 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
@@ -41,9 +42,9 @@
 .method public final onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
     .locals 2
 
-    const/4 p1, 0x0
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
     if-eqz p2, :cond_0
 
@@ -75,12 +76,12 @@
 
     iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
-    invoke-static {p2, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->access$setTouchedSinceLastJump$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;Z)V
+    invoke-static {p2, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->access$setTouchedSinceLastJump$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;Z)V
 
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfTouches;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
-    invoke-static {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->access$publishInteractionState(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
+    invoke-static {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->access$publishInteractionState(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     :cond_1
-    return p1
+    return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates$run$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates$run$1.smali
index 1404e92a17..7a6a875d18 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates$run$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates$run$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates$run$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates.smali
index b95854ddbe..e2c804c693 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.smali
index 99f4c69e75..2161092bff 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 f7d321f7b7..bcaed09e71 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -149,8 +150,6 @@
 
     if-lez v4, :cond_0
 
-    iget-wide v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->messageId:J
-
     goto :goto_0
 
     :cond_0
@@ -324,8 +323,6 @@
 
     if-ge v0, v1, :cond_0
 
-    iget v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->attempts:I
-
     add-int/lit8 v0, v0, 0x1
 
     iput v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->attempts:I
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali
index 90f1b20b5d..432e439855 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
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 bbcfe9c07b..13df007772 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali
index 78acc0d6c5..fe9201a318 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
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 901f6a6cbd..2ee78ccced 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetChatListAdapter.kt"
 
 
 # annotations
@@ -686,7 +687,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->getMessageId()J
 
@@ -709,23 +710,28 @@
     :cond_0
     const/4 v0, 0x0
 
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
     :goto_0
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     invoke-interface {p3}, Lrx/functions/Action0;->call()V
 
     return-void
 
-    :cond_1
+    :cond_2
     iput-boolean v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->isTouchedSinceLastJump:Z
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->scrollToWithHighlight:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->cancel()V
 
-    :cond_2
+    :cond_3
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;
 
     iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->handler:Landroid/os/Handler;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked$1.smali
index 820ff62ab2..32da022b23 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemBlocked.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
@@ -77,6 +78,8 @@
 
     invoke-interface {p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onMessageBlockedGroupClicked(Lcom/discord/models/domain/ModelMessage;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
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 82a4df9252..a26704b9e0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemBlocked.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus.smali
index 5a9fde0beb..0833a2bf62 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus;
 .super Ljava/lang/Enum;
+.source "WidgetChatListAdapterItemCallMessage.java"
 
 
 # annotations
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 3b03f7813b..d71ae4283c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemCallMessage.java"
 
 
 # annotations
@@ -156,8 +157,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemTimestamp:Landroid/widget/TextView;
-
     invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
 
     move-result-object v2
@@ -189,20 +188,19 @@
 
     const v2, 0x7f0801b8
 
-    :goto_0
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->statusIcon:Landroid/widget/ImageView;
 
     const v2, 0x7f0801ba
 
-    goto :goto_0
+    invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
     :cond_2
-    :goto_1
+    :goto_0
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemText:Landroid/widget/TextView;
 
     if-eqz v1, :cond_4
@@ -239,9 +237,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemText:Landroid/widget/TextView;
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemText:Landroid/widget/TextView;
-
-    invoke-virtual {v0}, Landroid/widget/TextView;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {p2}, Landroid/widget/TextView;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
@@ -262,9 +258,7 @@
     :cond_3
     iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemText:Landroid/widget/TextView;
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemText:Landroid/widget/TextView;
-
-    invoke-virtual {v0}, Landroid/widget/TextView;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {p2}, Landroid/widget/TextView;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage_ViewBinding.smali
index a3a3c9d89c..feaf91bdfc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemCallMessage_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali
index 6331fe1ee9..746bb8edf5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Landroid/view/View$OnLongClickListener;
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 bcdfdb2ac8..2ff831c191 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali
index 23a582b9b6..0144414707 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 b11fbbdbf1..ccd6db0872 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 
 # annotations
@@ -140,7 +141,7 @@
 
     if-nez v2, :cond_0
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_0
     const/4 v3, 0x0
@@ -207,12 +208,11 @@
 
     move-result-object v7
 
-    :goto_1
     invoke-static {v6, v7}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
     move-result-object v6
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -223,9 +223,11 @@
 
     move-result-object v7
 
-    goto :goto_1
+    invoke-static {v6, v7}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    :goto_2
+    move-result-object v6
+
+    :goto_1
     iget-object v7, v6, Lkotlin/Pair;->first:Ljava/lang/Object;
 
     check-cast v7, Ljava/lang/Number;
@@ -314,8 +316,10 @@
 
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;[Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_5
-    :goto_3
+    :goto_2
     return-void
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali
index 870af72b3d..a50cc9bc34 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali
index db1a92d697..4e42c7f4f9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lcom/discord/simpleast/core/b/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException.smali
index df33c324e1..a246df8639 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException;
 .super Ljava/lang/RuntimeException;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali
index 00f6c1d482..006f126ffa 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 
 # annotations
@@ -277,28 +278,29 @@
     :try_end_0
     .catch Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
+    const/4 p1, 0x0
+
     goto :goto_1
 
     :catch_0
     const/4 p1, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    :goto_1
     const/4 p1, 0x0
 
-    :goto_2
+    :goto_1
     if-eqz p1, :cond_2
 
     const/4 p1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const/4 p1, 0x0
 
-    :goto_3
+    :goto_2
     iput-boolean p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->isEmbedUrlFoundInVisibleSpoilerNode:Z
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
@@ -315,56 +317,56 @@
 
     if-eqz p1, :cond_3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/4 p2, 0x0
 
-    :goto_4
+    :goto_3
     iput-boolean p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->isSpoilerHidden:Z
 
     return-void
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 12
+    .locals 11
 
-    and-int/lit8 v1, p9, 0x8
+    and-int/lit8 v0, p9, 0x8
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object v7, v2
+    move-object v6, v1
 
     goto :goto_0
 
     :cond_0
-    move-object/from16 v7, p4
+    move-object v6, p4
 
     :goto_0
-    and-int/lit8 v1, p9, 0x10
+    and-int/lit8 v0, p9, 0x10
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_1
 
     :cond_1
-    move-object/from16 v8, p5
+    move-object/from16 v7, p5
 
     :goto_1
-    and-int/lit8 v1, p9, 0x20
+    and-int/lit8 v0, p9, 0x20
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    move-object v9, v2
+    move-object v8, v1
 
     goto :goto_2
 
     :cond_2
-    move-object/from16 v9, p6
+    move-object/from16 v8, p6
 
     :goto_2
     and-int/lit8 v0, p9, 0x40
@@ -373,129 +375,129 @@
 
     const-wide/16 v0, 0x0
 
-    move-wide v10, v0
+    move-wide v9, v0
 
     goto :goto_3
 
     :cond_3
-    move-wide/from16 v10, p7
+    move-wide/from16 v9, p7
 
     :goto_3
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object v4, p1
+    move-object v3, p1
 
-    move-object v5, p2
+    move-object v4, p2
 
-    move-object v6, p3
+    move-object v5, p3
 
-    invoke-direct/range {v3 .. v11}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;-><init>(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
+    invoke-direct/range {v2 .. v10}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;-><init>(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
 
     return-void
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;JILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;
-    .locals 10
+    .locals 9
 
     move-object v0, p0
 
-    and-int/lit8 v2, p9, 0x1
+    and-int/lit8 v1, p9, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-object v2, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
+    iget-object v1, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
     goto :goto_0
 
     :cond_0
-    move-object v2, p1
+    move-object v1, p1
 
     :goto_0
-    and-int/lit8 v3, p9, 0x2
+    and-int/lit8 v2, p9, 0x2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    iget-object v3, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->parsedDescription:Ljava/util/Collection;
+    iget-object v2, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->parsedDescription:Ljava/util/Collection;
 
     goto :goto_1
 
     :cond_1
-    move-object v3, p2
+    move-object v2, p2
 
     :goto_1
-    and-int/lit8 v4, p9, 0x4
+    and-int/lit8 v3, p9, 0x4
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
-    iget-object v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->parsedFields:Ljava/util/List;
+    iget-object v3, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->parsedFields:Ljava/util/List;
 
     goto :goto_2
 
     :cond_2
-    move-object v4, p3
+    move-object v3, p3
 
     :goto_2
-    and-int/lit8 v5, p9, 0x8
+    and-int/lit8 v4, p9, 0x8
 
-    if-eqz v5, :cond_3
+    if-eqz v4, :cond_3
 
-    iget-object v5, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->channelNames:Ljava/util/Map;
+    iget-object v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->channelNames:Ljava/util/Map;
 
     goto :goto_3
 
     :cond_3
-    move-object v5, p4
+    move-object v4, p4
 
     :goto_3
-    and-int/lit8 v6, p9, 0x10
+    and-int/lit8 v5, p9, 0x10
 
-    if-eqz v6, :cond_4
+    if-eqz v5, :cond_4
 
-    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->userNames:Ljava/util/Map;
+    iget-object v5, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->userNames:Ljava/util/Map;
 
     goto :goto_4
 
     :cond_4
-    move-object v6, p5
+    move-object v5, p5
 
     :goto_4
-    and-int/lit8 v7, p9, 0x20
+    and-int/lit8 v6, p9, 0x20
 
-    if-eqz v7, :cond_5
+    if-eqz v6, :cond_5
 
-    iget-object v7, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->roles:Ljava/util/Map;
+    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->roles:Ljava/util/Map;
 
     goto :goto_5
 
     :cond_5
-    move-object/from16 v7, p6
+    move-object v6, p6
 
     :goto_5
-    and-int/lit8 v1, p9, 0x40
+    and-int/lit8 v7, p9, 0x40
 
-    if-eqz v1, :cond_6
+    if-eqz v7, :cond_6
 
-    iget-wide v8, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->myId:J
+    iget-wide v7, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->myId:J
 
     goto :goto_6
 
     :cond_6
-    move-wide/from16 v8, p7
+    move-wide/from16 v7, p7
 
     :goto_6
-    move-object p1, v2
+    move-object p1, v1
 
-    move-object p2, v3
+    move-object p2, v2
 
-    move-object p3, v4
+    move-object p3, v3
 
-    move-object p4, v5
+    move-object p4, v4
 
-    move-object p5, v6
+    move-object p5, v5
 
-    move-object/from16 p6, v7
+    move-object p6, v6
 
-    move-wide/from16 p7, v8
+    move-wide/from16 p7, v7
 
     invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->copy(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;
 
@@ -505,7 +507,7 @@
 .end method
 
 .method private final isSpoilerEmbed()Z
-    .locals 4
+    .locals 5
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
@@ -537,7 +539,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    if-nez v0, :cond_4
+    if-nez v0, :cond_5
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
@@ -549,45 +551,83 @@
 
     move-result v0
 
-    if-nez v0, :cond_3
+    if-nez v0, :cond_4
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->spoilers:Ljava/util/List;
 
-    check-cast v0, Ljava/util/Collection;
+    if-eqz v0, :cond_4
 
-    if-eqz v0, :cond_2
+    check-cast v0, Ljava/lang/Iterable;
 
-    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+    instance-of v1, v0, Ljava/util/Collection;
 
-    move-result v0
+    if-eqz v1, :cond_1
 
-    if-eqz v0, :cond_1
+    move-object v1, v0
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v1
+
+    if-nez v1, :cond_3
+
+    :cond_1
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/utilities/textprocessing/node/SpoilerNode;
+
+    invoke-virtual {v1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->getContent()Ljava/lang/String;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    const-string v4, "http"
+
+    check-cast v4, Ljava/lang/CharSequence;
+
+    invoke-static {v1, v4, v3}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    const/4 v0, 0x1
 
     goto :goto_1
 
-    :cond_1
+    :cond_3
     const/4 v0, 0x0
 
-    goto :goto_2
-
-    :cond_2
     :goto_1
-    const/4 v0, 0x1
-
-    :goto_2
-    if-nez v0, :cond_3
+    if-ne v0, v2, :cond_4
 
     iget-boolean v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->isEmbedUrlFoundInVisibleSpoilerNode:Z
 
-    if-nez v0, :cond_3
+    if-nez v0, :cond_4
 
-    goto :goto_3
-
-    :cond_3
-    return v3
+    goto :goto_2
 
     :cond_4
-    :goto_3
+    return v3
+
+    :cond_5
+    :goto_2
     return v2
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$1.smali
index 7f96aa3cc1..170fae152a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$2.smali
index 9a3e77653f..4103c6882a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2.smali
index 7241d21d30..848830f0e7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider$get$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -87,7 +88,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/Observable;->KC()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider.smali
index 50246f8e29..79f861e27c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$ModelProvider;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 
 # annotations
@@ -142,7 +143,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$1$1.smali
index c87203c24b..f88b3a466e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$1$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 2bb9cc1c92..461ad7e447 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 aef5ddfd7e..2ed305dbc1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$3.smali
index 286273255a..e990648bee 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1.smali
index 4568cf94b6..2344620371 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6d91acfd69..4a57fb4b7c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 dc75aac0af..7c42d12d69 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 
 # annotations
@@ -806,12 +807,6 @@
 
     move-result-object v2
 
-    iget v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
-
-    iget v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
-
-    iget v5, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
-
     iget v6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getProxyIconUrl()Ljava/lang/String;
@@ -820,6 +815,12 @@
 
     const/high16 v8, 0x3fc00000    # 1.5f
 
+    move v3, v6
+
+    move v4, v6
+
+    move v5, v6
+
     invoke-static/range {v1 .. v8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;->access$configureEmbedImage(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;Landroid/widget/ImageView;IIIILjava/lang/String;F)V
 
     return-void
@@ -867,7 +868,6 @@
 
     const/4 p2, 0x0
 
-    :goto_0
     invoke-virtual {p1, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView;->setVisibility(I)V
 
     return-void
@@ -879,7 +879,9 @@
 
     const/16 p2, 0x8
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView;->setVisibility(I)V
+
+    return-void
 .end method
 
 .method private final configureEmbedDivider(Ljava/lang/Integer;)V
@@ -1195,12 +1197,11 @@
 
     invoke-static {v9, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :goto_2
     const/high16 v10, 0x3fc00000    # 1.5f
 
     invoke-static/range {v5 .. v10}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;->access$configureEmbedImage(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;Landroid/widget/ImageView;IILcom/discord/models/domain/ModelMessageEmbed$Item;F)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageEmbed;->isMediaContent()Z
@@ -1229,6 +1230,10 @@
 
     move-result-object v9
 
+    const/high16 v10, 0x3fc00000    # 1.5f
+
+    invoke-static/range {v5 .. v10}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;->access$configureEmbedImage(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;Landroid/widget/ImageView;IILcom/discord/models/domain/ModelMessageEmbed$Item;F)V
+
     goto :goto_2
 
     :cond_4
@@ -1238,7 +1243,7 @@
 
     invoke-virtual {v3, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    :goto_3
+    :goto_2
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->getEmbedImageIcons()Landroid/widget/ImageView;
 
     move-result-object v1
@@ -1369,7 +1374,6 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
 
     return-void
@@ -1381,7 +1385,9 @@
 
     const/16 v0, 0x8
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
+
+    return-void
 .end method
 
 .method private final configureEmbedTitle(Ljava/lang/String;Ljava/lang/String;)V
@@ -1522,12 +1528,6 @@
 
     move-result-object v5
 
-    iget v6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
-
-    iget v7, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
-
-    iget v8, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
-
     iget v9, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTinyIconSize:I
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getProxyIconUrl()Ljava/lang/String;
@@ -1536,6 +1536,12 @@
 
     const/high16 v11, 0x3fc00000    # 1.5f
 
+    move v6, v9
+
+    move v7, v9
+
+    move v8, v9
+
     invoke-static/range {v4 .. v11}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;->access$configureEmbedImage(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;Landroid/widget/ImageView;IIIILjava/lang/String;F)V
 
     goto :goto_4
@@ -1615,12 +1621,11 @@
 
     move-result-object p1
 
-    :goto_7
     move-object v1, p1
 
     check-cast v1, Ljava/lang/CharSequence;
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_8
     if-eqz p1, :cond_9
@@ -1629,19 +1634,23 @@
 
     move-result-object v4
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_9
     move-object v4, v1
 
-    :goto_8
+    :goto_7
     if-eqz v4, :cond_a
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getText()Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_7
+    move-object v1, p1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    goto :goto_8
 
     :cond_a
     if-eqz p2, :cond_b
@@ -1651,7 +1660,7 @@
     check-cast v1, Ljava/lang/CharSequence;
 
     :cond_b
-    :goto_9
+    :goto_8
     invoke-virtual {v3, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     move-object p1, v3
@@ -1770,10 +1779,22 @@
     invoke-virtual {v3, v4}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :try_start_0
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->isSpoilerHidden()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed;->getColor()Ljava/lang/Integer;
 
     move-result-object v0
 
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->configureEmbedDivider(Ljava/lang/Integer;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed;->getProvider()Lcom/discord/models/domain/ModelMessageEmbed$Item;
@@ -2409,7 +2430,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbedKt.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbedKt.smali
index fee8f7aae9..73c8c867d3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbedKt.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbedKt.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbedKt;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmbed.kt"
 
 
 # static fields
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 21c16093c1..0afd0cbdd0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemEmptyPins.java"
 
 
 # instance fields
@@ -35,8 +36,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins;->textView:Landroid/widget/TextView;
-
     check-cast p2, Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;->getText()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins_ViewBinding.smali
index 8e5cf9c289..a18d200404 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemEmptyPins_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion.smali
index 81606fb013..944ade578c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1.smali
index 14fa23349d..fd72d43fb0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali
index 6faf5b5e81..c7e4e90924 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 
 # annotations
@@ -33,7 +34,7 @@
 
 # virtual methods
 .method public final create(Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-    .locals 9
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -61,83 +62,89 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v1
 
-    check-cast v1, Ljava/lang/Iterable;
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object v4, v2
-
-    check-cast v4, Lcom/discord/models/domain/ModelUser;
-
-    new-instance v2, Lcom/discord/widgets/channels/list/items/CollapsedUser;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x6
-
-    const/4 v8, 0x0
-
-    move-object v3, v2
-
-    invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/channels/list/items/CollapsedUser;-><init>(Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
     goto :goto_0
 
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    :goto_0
+    invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
     move-result-object v2
 
-    if-eqz v2, :cond_1
+    check-cast v2, Ljava/lang/Iterable;
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v2
 
-    if-eqz v2, :cond_1
+    :goto_1
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
+    move-result v3
 
-    move-result v2
+    if-eqz v3, :cond_1
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    move-object v5, v3
+
+    check-cast v5, Lcom/discord/models/domain/ModelUser;
+
+    new-instance v3, Lcom/discord/widgets/channels/list/items/CollapsedUser;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x6
+
+    const/4 v9, 0x0
+
+    move-object v4, v3
+
+    invoke-direct/range {v4 .. v9}, Lcom/discord/widgets/channels/list/items/CollapsedUser;-><init>(Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_1
     const/4 v2, 0x0
 
-    :goto_1
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
+
+    move-result v1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
     invoke-interface {p2}, Ljava/util/Map;->size()I
 
     move-result p2
 
     const/4 v3, 0x6
 
-    invoke-static {v3, v2}, Ljava/lang/Math;->min(II)I
+    invoke-static {v3, v1}, Ljava/lang/Math;->min(II)I
 
     move-result v4
 
@@ -151,12 +158,12 @@
 
     move-result-object p2
 
-    :goto_2
+    :goto_3
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
-    if-eqz v4, :cond_3
+    if-eqz v4, :cond_4
 
     move-object v4, p2
 
@@ -170,25 +177,25 @@
 
     const/4 v6, 0x5
 
-    if-ne v4, v6, :cond_2
+    if-ne v4, v6, :cond_3
 
-    add-int/lit8 v4, v2, -0x6
+    add-int/lit8 v4, v1, -0x6
 
-    goto :goto_3
+    goto :goto_4
 
-    :cond_2
+    :cond_3
     const/4 v4, 0x0
 
-    :goto_3
+    :goto_4
     invoke-virtual {v5, v4}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser;
 
     move-result-object v4
 
     invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_3
+    :cond_4
     new-instance p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
 
     check-cast v0, Ljava/util/List;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model.smali
index 4f0ea2d332..d92814d064 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
index dc633fa226..472de1782c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 14c9698db2..c079d711db 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 78c10e0d80..e981c8be90 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func3$0.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func3$0.smali
index 444c9540d3..2ebd5454d6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func3$0.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func3$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func3$0;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2.smali
index 0f3522b7e0..55d7e1c950 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 2f622d9847..1fd5a9aefe 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemGameInvite.kt"
 
 
 # annotations
@@ -245,27 +246,33 @@
 .method private final isDeadInvite(Lcom/discord/models/domain/ModelPresence;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Z
     .locals 6
 
-    const/4 v0, 0x0
-
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Party;->getId()Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
 
@@ -279,12 +286,12 @@
 
     move-result p1
 
-    goto :goto_0
+    goto :goto_1
 
-    :cond_0
+    :cond_1
     const/4 p1, 0x0
 
-    :goto_0
+    :goto_1
     invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
 
     move-result-object v1
@@ -313,27 +320,27 @@
 
     cmp-long v5, v1, v3
 
-    if-gez v5, :cond_1
+    if-gez v5, :cond_2
 
     const/4 v1, 0x1
 
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz p1, :cond_3
-
-    if-eqz v1, :cond_2
-
     goto :goto_2
 
     :cond_2
-    return v0
+    const/4 v1, 0x0
+
+    :goto_2
+    if-eqz p1, :cond_4
+
+    if-eqz v1, :cond_3
+
+    goto :goto_3
 
     :cond_3
-    :goto_2
+    return v0
+
+    :cond_4
+    :goto_3
     return p2
 .end method
 
@@ -362,132 +369,132 @@
 
     move-result v1
 
-    const/4 v3, 0x0
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
-    if-eqz v1, :cond_1
+    move-result-object v3
 
-    :cond_0
     const/4 v4, 0x0
 
+    if-eqz v3, :cond_0
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v3
+
     goto :goto_0
 
-    :cond_1
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_0
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_0
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_0
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Party;->getOpenSlots()I
-
-    move-result v4
+    :cond_0
+    move-object v3, v4
 
     :goto_0
-    if-gtz v4, :cond_2
+    const/4 v5, 0x0
 
-    const/4 v3, 0x1
+    if-eqz v1, :cond_1
+
+    const/4 v6, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    if-eqz v3, :cond_2
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_2
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelPresence$Party;->getOpenSlots()I
+
+    move-result v6
+
+    goto :goto_1
 
     :cond_2
-    iget-object v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->statusText:Landroid/widget/TextView;
-
-    if-eqz v1, :cond_3
-
-    const v3, 0x7f120886
-
-    goto :goto_1
-
-    :cond_3
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
-
-    move-result v5
-
-    const/4 v6, 0x2
-
-    if-ne v5, v6, :cond_4
-
-    const v3, 0x7f120897
-
-    goto :goto_1
-
-    :cond_4
-    if-eqz v3, :cond_5
-
-    const v3, 0x7f120884
-
-    goto :goto_1
-
-    :cond_5
-    const v3, 0x7f12088f
+    const/4 v6, 0x0
 
     :goto_1
-    invoke-virtual {v4, v3}, Landroid/widget/TextView;->setText(I)V
+    if-gtz v6, :cond_3
 
-    iget-object v3, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    const/4 v5, 0x1
 
-    check-cast v3, Landroid/view/View;
+    :cond_3
+    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->statusText:Landroid/widget/TextView;
 
-    xor-int/lit8 v4, v1, 0x1
+    if-eqz v1, :cond_4
 
-    invoke-static {v3, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+    const v5, 0x7f120886
 
-    if-nez v1, :cond_6
+    goto :goto_2
+
+    :cond_4
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
+
+    move-result-object v7
+
+    invoke-virtual {v7}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-result-object v7
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
+
+    move-result v7
+
+    const/4 v8, 0x2
+
+    if-ne v7, v8, :cond_5
+
+    const v5, 0x7f120897
+
+    goto :goto_2
+
+    :cond_5
+    if-eqz v5, :cond_6
+
+    const v5, 0x7f120884
+
+    goto :goto_2
+
+    :cond_6
+    const v5, 0x7f12088f
+
+    :goto_2
+    invoke-virtual {v6, v5}, Landroid/widget/TextView;->setText(I)V
+
+    iget-object v5, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    check-cast v5, Landroid/view/View;
+
+    xor-int/lit8 v6, v1, 0x1
+
+    invoke-static {v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+
+    if-nez v1, :cond_7
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->getUserAdapter()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 
-    move-result-object v3
+    move-result-object v5
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getUsers()Ljava/util/List;
 
-    move-result-object v4
+    move-result-object v6
 
-    invoke-virtual {v3, v4}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;->setData(Ljava/util/List;)V
+    invoke-virtual {v5, v6}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;->setData(Ljava/util/List;)V
 
-    :cond_6
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    if-eqz v3, :cond_7
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_7
+    :cond_7
+    if-eqz v3, :cond_8
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
 
     move-result-object v3
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_7
+    :cond_8
     move-object v3, v4
 
-    :goto_2
-    if-eqz v3, :cond_8
+    :goto_3
+    if-eqz v3, :cond_9
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeImage()Ljava/lang/String;
 
@@ -495,15 +502,15 @@
 
     move-object v8, v5
 
-    goto :goto_3
+    goto :goto_4
 
-    :cond_8
+    :cond_9
     move-object v8, v4
 
-    :goto_3
-    if-nez v1, :cond_9
+    :goto_4
+    if-nez v1, :cond_a
 
-    if-eqz v8, :cond_9
+    if-eqz v8, :cond_a
 
     sget-object v6, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
@@ -533,7 +540,7 @@
 
     move-result-object v13
 
-    if-eqz v13, :cond_a
+    if-eqz v13, :cond_b
 
     iget-object v1, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -557,9 +564,9 @@
 
     invoke-static/range {v12 .. v20}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    goto :goto_4
+    goto :goto_5
 
-    :cond_9
+    :cond_a
     iget-object v1, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-object v5, v1
@@ -632,17 +639,17 @@
 
     invoke-static/range {v5 .. v13}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    :cond_a
-    :goto_4
+    :cond_b
+    :goto_5
     iget-object v1, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_c
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
 
     move-result-object v4
 
-    :cond_b
+    :cond_c
     check-cast v4, Ljava/lang/CharSequence;
 
     invoke-virtual {v1, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setContentDescription(Ljava/lang/CharSequence;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Companion.smali
index d35d9be106..721d96d0f6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 
 # annotations
@@ -141,7 +142,6 @@
 
     const-string p2, "resources.getQuantityStr\u2026ours_hours, hours, hours)"
 
-    :goto_0
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -167,5 +167,7 @@
 
     const-string p2, "resources.getQuantityStr\u2026s_mins, minutes, minutes)"
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali
index 3c2adc1c5f..f7db5e47eb 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;
+.source "WidgetChatListAdapterItemGift.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Loading.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Loading.smali
index 0835635883..668bcae534 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Loading.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Loading.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Loading;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;
+.source "WidgetChatListAdapterItemGift.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali
index 85aa3c0edd..f90512f1b0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;
+.source "WidgetChatListAdapterItemGift.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model.smali
index 71149d341a..510561455d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali
index 511cb7b990..0d9b0d3c71 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali
index f8c885e529..567018f0f6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali
index d8cb692ad6..8c082aa270 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali
index c83274b7a4..c0f3146ad1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali
index f37045bbbc..439a81ee3d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 76ec0cbb9b..66e5164956 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali
index 07fa95745b..c744f65711 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 7c2b8d2fba..0d35d99b1c 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali
index 808b7613e0..7039bb0587 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 07a0e37bee..93265e4da3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1495913b25..ee1eb25d2e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1a77cf543e..6915a47da1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1d75764011..8a576802a5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemGift.kt"
 
 
 # annotations
@@ -611,21 +612,24 @@
 
     const p1, 0x7f1206b5
 
-    :goto_2
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const p1, 0x7f1206b4
 
-    goto :goto_2
+    invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    :goto_3
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    :goto_2
     invoke-virtual {v2, p1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getNameText()Landroid/widget/TextView;
@@ -1072,14 +1076,13 @@
 
     invoke-virtual {v12, v10}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
 
-    :goto_5
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v10
 
     invoke-virtual {v10, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_5
     if-eqz v18, :cond_6
@@ -1112,6 +1115,12 @@
 
     invoke-static/range {v17 .. v25}, 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
 
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v10
+
+    invoke-virtual {v10, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
+
     goto :goto_5
 
     :cond_6
@@ -1121,7 +1130,7 @@
 
     invoke-virtual {v10, v11}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    :goto_6
+    :goto_5
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getHeader()Lcom/discord/app/AppTextView;
 
     move-result-object v10
@@ -1130,21 +1139,24 @@
 
     const v3, 0x7f1206b9
 
-    :goto_7
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_7
     const v3, 0x7f1206b8
 
-    goto :goto_7
+    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    :goto_8
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    :goto_6
     invoke-virtual {v10, v3}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getNameText()Landroid/widget/TextView;
@@ -1207,12 +1219,12 @@
 
     const/4 v10, 0x1
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_8
     const/4 v10, 0x0
 
-    :goto_9
+    :goto_7
     invoke-static {v3, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
@@ -1306,7 +1318,7 @@
 
     invoke-static {v3, v10, v4, v11, v4}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_a
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
@@ -1361,19 +1373,19 @@
 
     move-result-object v15
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_b
     move-object v15, v4
 
-    :goto_a
+    :goto_8
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v3
 
     invoke-virtual {v3, v15}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
 
-    :goto_b
+    :goto_9
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v3
@@ -1396,7 +1408,6 @@
 
     const-string v7, "(onClick)"
 
-    :goto_c
     const-string v10, ""
 
     invoke-static {v3, v7, v10, v5}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
@@ -1419,26 +1430,29 @@
 
     move-result-object v15
 
-    goto :goto_e
+    goto :goto_a
 
     :cond_c
     if-eqz v6, :cond_d
 
     const v3, 0x7f120694
 
-    :goto_d
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v15
 
-    goto :goto_e
+    goto :goto_a
 
     :cond_d
     if-eqz v8, :cond_e
 
     const v3, 0x7f120671
 
-    goto :goto_d
+    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v15
+
+    goto :goto_a
 
     :cond_e
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getInLibrary()Z
@@ -1467,19 +1481,45 @@
 
     const-string v7, "()"
 
-    goto :goto_c
+    const-string v10, ""
+
+    invoke-static {v3, v7, v10, v5}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v7, "["
+
+    const-string v10, ""
+
+    invoke-static {v3, v7, v10, v5}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v7, "]"
+
+    const-string v10, ""
+
+    invoke-static {v3, v7, v10, v5}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
+
+    move-result-object v15
+
+    goto :goto_a
 
     :cond_f
     if-eqz v7, :cond_10
 
     const v3, 0x7f120664
 
-    goto :goto_d
+    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v15
+
+    goto :goto_a
 
     :cond_10
     move-object v15, v4
 
-    :goto_e
+    :goto_a
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getSubText()Landroid/widget/TextView;
 
     move-result-object v3
@@ -1508,7 +1548,7 @@
 
     move-result-object v3
 
-    goto :goto_10
+    goto :goto_c
 
     :cond_11
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
@@ -1535,7 +1575,7 @@
 
     move-result-object v3
 
-    goto :goto_10
+    goto :goto_c
 
     :cond_12
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getCannotClaimButton()Landroid/widget/Button;
@@ -1546,7 +1586,7 @@
 
     const v6, 0x7f1206a7
 
-    goto :goto_f
+    goto :goto_b
 
     :cond_13
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getRedeeming()Z
@@ -1557,7 +1597,7 @@
 
     const v6, 0x7f1206a9
 
-    goto :goto_f
+    goto :goto_b
 
     :cond_14
     if-nez v6, :cond_15
@@ -1570,19 +1610,19 @@
 
     const v6, 0x7f1206aa
 
-    goto :goto_f
+    goto :goto_b
 
     :cond_15
     const v6, 0x7f1206a8
 
-    :goto_f
+    :goto_b
     invoke-virtual {v3, v6}, Landroid/widget/Button;->setText(I)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getCannotClaimButton()Landroid/widget/Button;
 
     move-result-object v3
 
-    :goto_10
+    :goto_c
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getButtons()Ljava/util/List;
 
     move-result-object v6
@@ -1593,7 +1633,7 @@
 
     move-result-object v6
 
-    :goto_11
+    :goto_d
     invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v7
@@ -1612,14 +1652,14 @@
 
     invoke-virtual {v7, v5}, Landroid/widget/Button;->setVisibility(I)V
 
-    goto :goto_11
+    goto :goto_d
 
     :cond_16
     const/16 v8, 0x8
 
     invoke-virtual {v7, v8}, Landroid/view/View;->setVisibility(I)V
 
-    goto :goto_11
+    goto :goto_d
 
     :cond_17
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali
index 5b5e760675..66002dcd97 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGuildWelcome.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali
index 72762638c7..de08b26001 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemGuildWelcome.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 442209fc77..92d1495dea 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemGuildWelcome.kt"
 
 
 # static fields
@@ -315,14 +316,13 @@
 
     aput-object v0, v6, v3
 
-    :goto_1
     invoke-static {v2, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/CharSequence;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->getHeader()Landroid/widget/TextView;
@@ -337,9 +337,13 @@
 
     aput-object v0, v6, v3
 
-    goto :goto_1
+    invoke-static {v2, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    :goto_2
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    :goto_1
     invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->getSubheader()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali
index 5687839e93..5f143ce842 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Loading.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Loading.smali
index 6e0f2ae650..bd5e8babe4 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Loading.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Loading.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Loading;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali
index fc5b5b0412..fddcf6ccec 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model.smali
index 799dc27384..02fce6c2f7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali
index 25f3f2fa16..7bf69b88b6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali
index b1f0960443..aaf4495eb8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali
index fc2e2c9eaf..b6faba40a6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali
index 2958f39dab..c4b4fc2c1e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 f4875d88af..2b4591b641 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 
 # annotations
@@ -182,7 +183,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali
index afb9f73a6b..275a44312e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 6b433a236b..7ad02a7ac0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 39e862def5..3ea0b71f3f 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$2.smali
index 0f5b5f8cd9..98a37ae607 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 120afb6f64..57d173207d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 24a72426fa..7655f45754 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7f616c1d37..3d5364c361 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 59e510aed9..c65c81caa8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemInvite.kt"
 
 
 # annotations
@@ -618,21 +619,24 @@
 
     const v4, 0x7f120881
 
-    :goto_2
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
     check-cast v4, Ljava/lang/CharSequence;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const v4, 0x7f12087e
 
-    goto :goto_2
+    invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    :goto_3
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/CharSequence;
+
+    :goto_2
     invoke-virtual {v3, v4}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getNameText()Landroid/widget/TextView;
@@ -687,12 +691,12 @@
 
     move-result-object v3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     move-object v3, v1
 
-    :goto_4
+    :goto_3
     if-eqz v3, :cond_4
 
     const v3, 0x7f120846
@@ -715,7 +719,7 @@
 
     move-result-object v3
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_4
     if-nez v2, :cond_6
@@ -726,34 +730,37 @@
 
     move-result-object v3
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     move-object v3, v1
 
-    :goto_5
+    :goto_4
     if-nez v3, :cond_6
 
     const v3, 0x7f120845
 
-    goto :goto_6
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    goto :goto_5
 
     :cond_6
     if-eqz v2, :cond_7
 
     const v3, 0x7f120879
 
-    :goto_6
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_7
     move-object v3, v1
 
-    :goto_7
+    :goto_5
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getMemberContainer()Landroid/view/View;
 
     move-result-object v6
@@ -796,21 +803,24 @@
 
     const v3, 0x7f1203d1
 
-    :goto_8
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    goto :goto_9
+    goto :goto_6
 
     :cond_8
     const v3, 0x7f12097c
 
-    goto :goto_8
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    :goto_9
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    :goto_6
     invoke-virtual {v1, v3}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getMentionButton()Landroid/widget/Button;
@@ -1079,19 +1089,22 @@
 
     const v2, 0x7f120880
 
-    :goto_4
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_4
     if-eqz v2, :cond_5
 
     const v2, 0x7f12087f
 
-    goto :goto_4
+    invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_5
 
     :cond_5
     if-eqz v4, :cond_6
@@ -1100,7 +1113,11 @@
 
     const v2, 0x7f12087d
 
-    goto :goto_4
+    invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_5
 
     :cond_6
     if-eqz v3, :cond_8
@@ -1125,26 +1142,28 @@
 
     move-result-object v11
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_7
     move-object v11, v10
 
-    :goto_5
+    :goto_4
     aput-object v11, v3, v9
 
     invoke-virtual {v7, v2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_8
     const v2, 0x7f12087c
 
-    goto :goto_4
+    invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    :goto_6
+    move-result-object v2
+
+    :goto_5
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getHeaderText()Lcom/discord/app/AppTextView;
 
     move-result-object v3
@@ -1169,7 +1188,7 @@
 
     move-result-object v3
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_9
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -1182,12 +1201,12 @@
 
     move-result-object v3
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_a
     move-object v3, v10
 
-    :goto_7
+    :goto_6
     check-cast v3, Ljava/lang/CharSequence;
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
@@ -1248,7 +1267,7 @@
 
     invoke-static {v2, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_b
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -1291,12 +1310,12 @@
 
     move-result-object v2
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
     move-object v2, v10
 
-    :goto_8
+    :goto_7
     check-cast v2, Ljava/lang/CharSequence;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -1315,12 +1334,12 @@
 
     move-result-object v2
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_d
     move-object v2, v10
 
-    :goto_9
+    :goto_8
     const-string v3, "ICON_UNSET"
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -1333,12 +1352,12 @@
 
     const/4 v2, 0x1
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_e
     const/4 v2, 0x0
 
-    :goto_a
+    :goto_9
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getImageText()Landroid/widget/TextView;
 
     move-result-object v3
@@ -1348,7 +1367,7 @@
     :cond_f
     move-object v2, v10
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_10
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -1361,14 +1380,14 @@
 
     move-result-object v2
 
-    :goto_b
+    :goto_a
     check-cast v2, Ljava/lang/CharSequence;
 
     const/4 v11, 0x2
 
     invoke-static {v3, v2, v9, v11, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
 
-    :goto_c
+    :goto_b
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getMemberContainer()Landroid/view/View;
 
     move-result-object v2
@@ -1383,12 +1402,12 @@
 
     const/4 v3, 0x1
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_11
     const/4 v3, 0x0
 
-    :goto_d
+    :goto_c
     invoke-static {v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getOnlineMemberText()Landroid/widget/TextView;
@@ -1427,12 +1446,12 @@
 
     const/4 v3, 0x1
 
-    goto :goto_e
+    goto :goto_d
 
     :cond_12
     const/4 v3, 0x0
 
-    :goto_e
+    :goto_d
     invoke-static {v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getTotalDot()Landroid/view/View;
@@ -1491,13 +1510,13 @@
 
     const/4 v5, 0x1
 
-    goto :goto_f
+    goto :goto_e
 
     :cond_13
     const/4 v5, 0x0
 
     :cond_14
-    :goto_f
+    :goto_e
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getLoadingButton()Landroid/view/View;
 
     move-result-object v2
@@ -1522,12 +1541,12 @@
 
     if-nez v5, :cond_15
 
-    goto :goto_10
+    goto :goto_f
 
     :cond_15
     const/4 v8, 0x0
 
-    :goto_10
+    :goto_f
     invoke-static {v2, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getMentionButton()Landroid/widget/Button;
@@ -1948,6 +1967,8 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreGuildSelected;->set$default(Lcom/discord/stores/StoreGuildSelected;JLrx/functions/Action0;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_4
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Companion.smali
index 8e316615b4..acddd638b8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali
index 499dd07a45..16e186ec70 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 739487337e..49f2baf966 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 
 # annotations
@@ -105,39 +106,45 @@
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
-
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getListeningActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
-    move-result-object v2
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
-
-    move-result v2
+    move-result-object v1
 
     goto :goto_1
 
     :cond_1
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_1
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
+
+    move-result v1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
     invoke-interface {p2}, Ljava/util/Map;->size()I
 
     move-result p2
 
     const/4 v3, 0x6
 
-    invoke-static {v3, v2}, Ljava/lang/Math;->min(II)I
+    invoke-static {v3, v1}, Ljava/lang/Math;->min(II)I
 
     move-result v4
 
@@ -151,12 +158,12 @@
 
     move-result-object p2
 
-    :goto_2
+    :goto_3
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
-    if-eqz v4, :cond_3
+    if-eqz v4, :cond_4
 
     move-object v4, p2
 
@@ -170,25 +177,25 @@
 
     const/4 v6, 0x5
 
-    if-ne v4, v6, :cond_2
+    if-ne v4, v6, :cond_3
 
-    add-int/lit8 v4, v2, -0x6
+    add-int/lit8 v4, v1, -0x6
 
-    goto :goto_3
+    goto :goto_4
 
-    :cond_2
+    :cond_3
     const/4 v4, 0x0
 
-    :goto_3
+    :goto_4
     invoke-virtual {v5, v4}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser;
 
     move-result-object v4
 
     invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_3
+    :cond_4
     new-instance p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
 
     check-cast v0, Ljava/util/List;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali
index 86f3394b6d..7b0f1cadb8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali
index a6d4e1205a..7bebb4fb8e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic $this_configureUI:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
+.field final synthetic $listeningActivity:Lcom/discord/models/domain/ModelPresence$Activity;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
+.method constructor <init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;->$this_configureUI:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;->$listeningActivity:Lcom/discord/models/domain/ModelPresence$Activity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,24 +51,8 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;->$this_configureUI:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;->$listeningActivity:Lcom/discord/models/domain/ModelPresence$Activity;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
     invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/integrations/SpotifyHelper;->launchTrack(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali
index b0f23741cf..3562a6d858 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -17,15 +18,19 @@
 
 
 # instance fields
+.field final synthetic $listeningActivity:Lcom/discord/models/domain/ModelPresence$Activity;
+
 .field final synthetic $this_configureUI:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
+.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;Lcom/discord/models/domain/ModelPresence$Activity;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;->$this_configureUI:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
 
+    iput-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;->$listeningActivity:Lcom/discord/models/domain/ModelPresence$Activity;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -50,29 +55,8 @@
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;->$this_configureUI:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
+    iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;->$listeningActivity:Lcom/discord/models/domain/ModelPresence$Activity;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object p1
-
-    :goto_0
-    move-object v2, p1
-
-    goto :goto_1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    goto :goto_0
-
-    :goto_1
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;->$this_configureUI:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getItem()Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
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 6dfef80ad7..83c5537175 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3afd3b0b5c..783241e8cd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali
index b00ca57205..df4f5823bc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 8a8ac2bdce..5c6addbaca 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemListenTogether.kt"
 
 
 # annotations
@@ -373,271 +374,257 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
-    .locals 18
+    .locals 17
 
     move-object/from16 v0, p0
 
-    move-object/from16 v1, p1
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getInviteText()Landroid/widget/TextView;
+
+    move-result-object v1
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getInviteText()Landroid/widget/TextView;
 
     move-result-object v2
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getInviteText()Landroid/widget/TextView;
+    invoke-virtual {v2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    const/4 v3, 0x1
 
-    move-result-object v3
-
-    const/4 v4, 0x1
-
-    new-array v5, v4, [Ljava/lang/Object;
+    new-array v4, v3, [Ljava/lang/Object;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getInviteText()Landroid/widget/TextView;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-virtual {v6}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v5}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v6
+    move-result-object v5
 
-    const-string v7, "inviteText.context"
+    const-string v6, "inviteText.context"
 
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getItem()Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
 
-    move-result-object v7
-
-    invoke-direct {v0, v6, v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getActivityName(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;)Ljava/lang/String;
-
     move-result-object v6
 
-    const/4 v7, 0x0
+    invoke-direct {v0, v5, v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getActivityName(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;)Ljava/lang/String;
 
-    aput-object v6, v5, v7
+    move-result-object v5
 
-    const v6, 0x7f12088c
+    const/4 v6, 0x0
 
-    invoke-virtual {v3, v6, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v5, v4, v6
 
-    move-result-object v3
+    const v5, 0x7f12088c
 
-    check-cast v3, Ljava/lang/CharSequence;
+    invoke-virtual {v2, v5, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getItem()Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
+
+    move-result-object v2
+
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->isDeadInvite(Lcom/discord/models/domain/ModelPresence;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;)Z
+
+    move-result v1
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v2
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getItem()Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
+    const/4 v4, 0x0
 
-    move-result-object v3
+    if-eqz v2, :cond_0
 
-    invoke-direct {v0, v2, v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->isDeadInvite(Lcom/discord/models/domain/ModelPresence;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;)Z
-
-    move-result v2
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getEndedText()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    invoke-static {v3, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    xor-int/lit8 v5, v2, 0x1
-
-    invoke-static {v3, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getTrackText()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    xor-int/lit8 v5, v2, 0x1
-
-    invoke-static {v3, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getArtistText()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    xor-int/lit8 v5, v2, 0x1
-
-    invoke-static {v3, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getAlbumImage()Landroid/widget/ImageView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    xor-int/lit8 v5, v2, 0x1
-
-    invoke-static {v3, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getContainer()Landroid/view/View;
-
-    move-result-object v3
-
-    invoke-virtual {v3, v4}, Landroid/view/View;->setSelected(Z)V
-
-    if-nez v2, :cond_5
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getUserAdapter()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getListeningActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v2
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getUsers()Ljava/util/List;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;->setData(Ljava/util/List;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getTrackText()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v3
-
-    const/4 v5, 0x0
-
-    if-eqz v3, :cond_0
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_0
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Activity;->getDetails()Ljava/lang/String;
-
-    move-result-object v3
-
     goto :goto_0
 
     :cond_0
-    move-object v3, v5
+    move-object v2, v4
 
     :goto_0
-    check-cast v3, Ljava/lang/CharSequence;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getEndedText()Landroid/widget/TextView;
 
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v5
+
+    check-cast v5, Landroid/view/View;
+
+    invoke-static {v5, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v5
+
+    check-cast v5, Landroid/view/View;
+
+    xor-int/lit8 v7, v1, 0x1
+
+    invoke-static {v5, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getTrackText()Landroid/widget/TextView;
+
+    move-result-object v5
+
+    check-cast v5, Landroid/view/View;
+
+    xor-int/lit8 v7, v1, 0x1
+
+    invoke-static {v5, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getArtistText()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v5
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getArtistText()Landroid/widget/TextView;
+    check-cast v5, Landroid/view/View;
 
-    move-result-object v3
+    xor-int/lit8 v7, v1, 0x1
 
-    invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-static {v5, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
-    move-result-object v3
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getAlbumImage()Landroid/widget/ImageView;
 
-    const v6, 0x7f120ee6
+    move-result-object v5
 
-    new-array v4, v4, [Ljava/lang/Object;
+    check-cast v5, Landroid/view/View;
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    xor-int/lit8 v7, v1, 0x1
 
-    move-result-object v8
+    invoke-static {v5, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
-    if-eqz v8, :cond_1
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getContainer()Landroid/view/View;
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    move-result-object v5
 
-    move-result-object v8
+    invoke-virtual {v5, v3}, Landroid/view/View;->setSelected(Z)V
 
-    if-eqz v8, :cond_1
+    if-nez v1, :cond_6
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelPresence$Activity;->getState()Ljava/lang/String;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getUserAdapter()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 
-    move-result-object v8
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getUsers()Ljava/util/List;
+
+    move-result-object v5
+
+    invoke-virtual {v1, v5}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;->setData(Ljava/util/List;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getTrackText()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Activity;->getDetails()Ljava/lang/String;
+
+    move-result-object v5
 
     goto :goto_1
 
     :cond_1
-    move-object v8, v5
+    move-object v5, v4
 
     :goto_1
-    aput-object v8, v4, v7
+    check-cast v5, Ljava/lang/CharSequence;
 
-    invoke-virtual {v3, v6, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v1, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getArtistText()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getArtistText()Landroid/widget/TextView;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+
+    move-result-object v5
+
+    const v7, 0x7f120ee6
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Activity;->getState()Ljava/lang/String;
+
+    move-result-object v8
+
+    goto :goto_2
+
+    :cond_2
+    move-object v8, v4
+
+    :goto_2
+    aput-object v8, v3, v6
+
+    invoke-virtual {v5, v7, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_3
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
 
-    move-result-object v2
+    move-result-object v1
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_2
-    move-object v2, v5
+    :cond_3
+    move-object v1, v4
 
-    :goto_2
-    if-eqz v2, :cond_3
+    :goto_3
+    if-eqz v1, :cond_4
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeImage()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeImage()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    if-eqz v8, :cond_3
+    if-eqz v7, :cond_4
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getAlbumImage()Landroid/widget/ImageView;
 
     move-result-object v3
 
-    sget-object v6, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+    sget-object v5, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    const-string v4, "it"
+    const-string v8, "it"
 
-    invoke-static {v8, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    const/4 v10, 0x4
+    const/4 v9, 0x4
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
-    invoke-static/range {v6 .. v11}, Lcom/discord/utilities/icon/IconUtils;->getAssetImage$default(Lcom/discord/utilities/icon/IconUtils;Ljava/lang/Long;Ljava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
+    invoke-static/range {v5 .. v10}, Lcom/discord/utilities/icon/IconUtils;->getAssetImage$default(Lcom/discord/utilities/icon/IconUtils;Ljava/lang/Long;Ljava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v10
+    move-result-object v9
+
+    const/4 v10, 0x0
 
     const/4 v11, 0x0
 
@@ -647,57 +634,57 @@
 
     const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v15, 0x7c
 
-    const/16 v16, 0x7c
+    const/16 v16, 0x0
 
-    const/16 v17, 0x0
+    move-object v8, v3
 
-    move-object v9, v3
+    invoke-static/range {v8 .. v16}, 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
 
-    invoke-static/range {v9 .. v17}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
-
-    :cond_3
+    :cond_4
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getAlbumImage()Landroid/widget/ImageView;
 
     move-result-object v3
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_5
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    :cond_4
-    check-cast v5, Ljava/lang/CharSequence;
+    :cond_5
+    check-cast v4, Ljava/lang/CharSequence;
 
-    invoke-virtual {v3, v5}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual {v3, v4}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getTrackText()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v1
 
     new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;
 
-    invoke-direct {v3, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
+    invoke-direct {v3, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
 
     check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->getAlbumImage()Landroid/widget/ImageView;
 
-    move-result-object v2
+    move-result-object v1
 
     new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;
 
-    invoke-direct {v3, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
+    move-object/from16 v4, p1
+
+    invoke-direct {v3, v4, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
     check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v2, v3}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v3}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    :cond_5
+    :cond_6
     return-void
 .end method
 
@@ -901,27 +888,33 @@
 .method private final isDeadInvite(Lcom/discord/models/domain/ModelPresence;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;)Z
     .locals 5
 
-    const/4 v0, 0x0
-
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getListeningActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Party;->getId()Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
 
@@ -935,19 +928,19 @@
 
     move-result p1
 
-    goto :goto_0
+    goto :goto_1
 
-    :cond_0
+    :cond_1
     const/4 p1, 0x0
 
-    :goto_0
+    :goto_1
     const/4 v1, 0x1
 
-    if-nez p1, :cond_1
+    if-nez p1, :cond_2
 
     return v1
 
-    :cond_1
+    :cond_2
     invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
 
     move-result-object p1
@@ -974,11 +967,11 @@
 
     cmp-long v4, p1, v2
 
-    if-gez v4, :cond_2
+    if-gez v4, :cond_3
 
     return v1
 
-    :cond_2
+    :cond_3
     return v0
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
index 1077d22038..cacac2d360 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemMentionFooter.java"
 
 
 # instance fields
@@ -84,8 +85,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter;->divider:Landroid/view/View;
-
     if-eqz v0, :cond_1
 
     const/16 p2, 0x8
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter_ViewBinding.smali
index 008ddf9ba4..5ed9d4689d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemMentionFooter_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 51940f6a75..3ea16ce1a0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemMessage.java"
 
 
 # static fields
@@ -476,8 +477,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemName:Landroid/widget/TextView;
-
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getNickOrUsernames()Ljava/util/Map;
 
     move-result-object v1
@@ -519,8 +518,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemBot:Landroid/view/View;
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v1
@@ -546,8 +543,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemTimestamp:Landroid/widget/TextView;
-
     invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
 
     move-result-object v1
@@ -575,8 +570,6 @@
 
     if-eqz p2, :cond_5
 
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemAvatar:Landroid/widget/ImageView;
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p1
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 10d3c08934..5942f561fc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemMessageHeader.java"
 
 
 # instance fields
@@ -50,14 +51,12 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->headerDivider:Landroid/view/View;
 
-    const/16 v1, 0x8
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/16 v2, 0x8
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->headerDivider:Landroid/view/View;
-
     if-lez p1, :cond_0
 
     const/4 v3, 0x0
@@ -75,16 +74,11 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->headerSpacer:Landroid/view/View;
-
     if-lez p1, :cond_2
 
-    goto :goto_1
+    const/16 v1, 0x8
 
     :cond_2
-    const/4 v1, 0x0
-
-    :goto_1
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     :cond_3
@@ -92,8 +86,6 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->headerChannel:Landroid/widget/TextView;
-
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->getChannelName()Ljava/lang/String;
 
     move-result-object v0
@@ -105,8 +97,6 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->headerGuild:Landroid/widget/TextView;
-
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->getText()Ljava/lang/String;
 
     move-result-object p2
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader_ViewBinding.smali
index 0e527472ed..9256cdacfe 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemMessageHeader_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage_ViewBinding.smali
index 4e56c9f0b6..11c4464135 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemMessage_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 24bd30ef41..01a82adae7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemNewMessages.kt"
 
 
 # static fields
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 f77dadb239..fe12805fec 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemReactions;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemReactions.java"
 
 
 # static fields
@@ -215,7 +216,7 @@
 
     invoke-virtual {v6, v9}, Landroid/widget/TextSwitcher;->setCurrentText(Ljava/lang/CharSequence;)V
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_5
     iget-object v6, v5, Lcom/discord/views/d;->zp:Landroid/widget/TextSwitcher;
@@ -238,10 +239,9 @@
 
     const v10, 0x7f01002b
 
-    :goto_5
     invoke-virtual {v9, v6, v10}, Landroid/widget/TextSwitcher;->setOutAnimation(Landroid/content/Context;I)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_6
     iget-object v9, v5, Lcom/discord/views/d;->zp:Landroid/widget/TextSwitcher;
@@ -254,9 +254,9 @@
 
     const v10, 0x7f01002a
 
-    goto :goto_5
+    invoke-virtual {v9, v6, v10}, Landroid/widget/TextSwitcher;->setOutAnimation(Landroid/content/Context;I)V
 
-    :goto_6
+    :goto_5
     iget-object v6, v5, Lcom/discord/views/d;->zp:Landroid/widget/TextSwitcher;
 
     invoke-static {v8}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
@@ -265,7 +265,7 @@
 
     invoke-virtual {v6, v9}, Landroid/widget/TextSwitcher;->setText(Ljava/lang/CharSequence;)V
 
-    :goto_7
+    :goto_6
     iput v8, v5, Lcom/discord/views/d;->zs:I
 
     :cond_7
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions_ViewBinding.smali
index 0486e980ab..9a49cba06d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemReactions_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemReactions_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 3d016ec266..c264bd50e3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemSearchResultCount.java"
 
 
 # instance fields
@@ -35,8 +36,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount;->textView:Landroid/widget/TextView;
-
     check-cast p2, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;->getText()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount_ViewBinding.smali
index 768d956e1b..0055eabd53 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemSearchResultCount_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 43055f3dc0..21fc815711 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemStart;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemStart.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali
index bea3c08b59..a78105d7a4 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemSystemMessage.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali
index 7b8a22b9c6..31d5f4e03c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemSystemMessage.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
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 1693518fb9..077d2f9125 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemSystemMessage.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -118,7 +119,6 @@
 
     aput-object v2, v1, v3
 
-    :goto_0
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
@@ -134,7 +134,11 @@
 
     aput-object v2, v1, v3
 
-    goto :goto_0
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_3
     const v0, 0x7f120db8
@@ -145,7 +149,11 @@
 
     aput-object v2, v1, v3
 
-    goto :goto_0
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_4
     const v0, 0x7f120db9
@@ -164,7 +172,11 @@
 
     aput-object v3, v1, v2
 
-    goto :goto_0
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_5
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserId:Ljava/lang/Long;
@@ -185,7 +197,7 @@
 
     if-nez v0, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -204,10 +216,14 @@
 
     aput-object v2, v1, v3
 
-    goto :goto_0
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_1
-    :goto_1
+    :goto_0
     const v0, 0x7f120de7
 
     new-array v1, v1, [Ljava/lang/Object;
@@ -220,7 +236,11 @@
 
     aput-object v3, v1, v2
 
-    goto :goto_0
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_6
     const v0, 0x7f120de6
@@ -235,7 +255,11 @@
 
     aput-object v3, v1, v2
 
-    goto :goto_0
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali
index 440bb72cb1..d7357b5fcf 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemSystemMessage.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 2c318a4042..e08b8da92a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemSystemMessage.kt"
 
 
 # static fields
@@ -513,7 +514,7 @@
 
     sget-object v3, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ee()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ed()Ljava/util/regex/Pattern;
 
     move-result-object v3
 
@@ -537,7 +538,7 @@
 
     sget-object v1, Lcom/discord/simpleast/core/a/a;->yy:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eh()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eg()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 09a3cb0b42..4d5f67f932 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemTimestamp.kt"
 
 
 # static fields
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Companion.smali
index 455c8c2049..efc87d11cd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Companion.smali
index fed75a8cad..f8d0406fa9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali
index 94a4d386f7..cb98dc7b5d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali
index d5b1d817b4..40f55eb629 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None.smali
index aff9cde2b9..bd9aa4d4d1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali
index 85acd2fbdd..4325425ae6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali
index 62b4e8f8cf..c4380c806f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;
 .super Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model.smali
index b78430bfff..f519bb1f63 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali
index 8edb5755ae..c7583aacd9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali
index 39bc5e2ed2..5485628156 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lrx/functions/FuncN;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali
index 4b80b74e83..af624f28cd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lrx/functions/FuncN;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali
index 945c27503f..b6dfd379db 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali
index 6c5284c456..8ad2419589 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali
index 9b790a88e0..8f39e4d9f0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali
index 794710ce4a..d14e6e1dd2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 93448a50f6..47c3307b55 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
@@ -206,7 +207,6 @@
 
     if-gtz v10, :cond_0
 
-    :goto_1
     iput-wide v6, v0, Lkotlin/jvm/internal/Ref$LongRef;->element:J
 
     goto :goto_0
@@ -220,7 +220,9 @@
 
     add-long/2addr v6, v8
 
-    goto :goto_1
+    iput-wide v6, v0, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+
+    goto :goto_0
 
     :cond_1
     iget-wide v4, v0, Lkotlin/jvm/internal/Ref$LongRef;->element:J
@@ -245,7 +247,6 @@
 
     const-string p2, "Observable\n            .\u2026.PROGRESS_INDETERMINATE))"
 
-    :goto_2
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -267,7 +268,7 @@
 
     move-result-object v2
 
-    :goto_3
+    :goto_1
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
@@ -292,7 +293,7 @@
 
     invoke-interface {v1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     check-cast v1, Ljava/util/List;
@@ -315,7 +316,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p2
 
@@ -331,7 +332,9 @@
 
     const-string p2, "Observable\n            .\u2026overallProgressPercent) }"
 
-    goto :goto_2
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
 
 .method private final getPercentage(JJ)I
@@ -430,7 +433,6 @@
 
     const-string p2, "Observable.just(\n       \u2026.PROGRESS_INDETERMINATE))"
 
-    :goto_0
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -456,7 +458,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p2
 
@@ -472,7 +474,9 @@
 
     const-string p2, "upload\n            .byte\u2026essPercent)\n            }"
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali
index c742de6ba7..da3fd3f10a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7bd38b882e..9073ed0562 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$3.smali
index 630744d211..578682c0c8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$3;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$4.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$4.smali
index 8d600ff993..430f17b23b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$4;
 .super Ljava/lang/Object;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 23244f7b0a..62e7186d40 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 4f8677e3c3..c2ea10dac5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;
 .super Lcom/discord/widgets/chat/list/WidgetChatListItem;
+.source "WidgetChatListAdapterItemUploadProgress.kt"
 
 
 # annotations
@@ -610,7 +611,7 @@
 
     const/4 v4, 0x0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     move-object p2, p1
 
@@ -624,7 +625,6 @@
 
     invoke-static {p1, p2, v4}, Lcom/discord/views/UploadProgressView;->a(Lcom/discord/views/UploadProgressView;Ljava/lang/String;I)V
 
-    :cond_0
     invoke-virtual {p1}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p2
@@ -637,12 +637,11 @@
 
     move-result p2
 
-    :goto_0
     invoke-virtual {p1, p2}, Lcom/discord/views/UploadProgressView;->setIcon(I)V
 
     return-void
 
-    :cond_1
+    :cond_0
     instance-of v0, p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;
 
     const/4 v5, 0x1
@@ -659,7 +658,7 @@
 
     move-result-object v0
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/views/UploadProgressView;->getResources()Landroid/content/res/Resources;
 
@@ -685,7 +684,7 @@
 
     move-result-object v0
 
-    :cond_2
+    :cond_1
     const-string v5, "title"
 
     invoke-static {v0, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
@@ -696,7 +695,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
@@ -710,12 +709,30 @@
 
     move-result-object p2
 
-    :goto_1
     invoke-direct {p0, v0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->getIconForFiletype(Landroid/content/Context;Ljava/lang/String;)I
 
     move-result p2
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lcom/discord/views/UploadProgressView;->setIcon(I)V
+
+    return-void
+
+    :cond_2
+    invoke-virtual {p1}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
+
+    move-result-object p2
+
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v3, v4, v2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result p2
+
+    invoke-virtual {p1, p2}, Lcom/discord/views/UploadProgressView;->setIcon(I)V
+
+    return-void
 
     :cond_3
     instance-of v0, p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;
@@ -734,14 +751,14 @@
 
     if-ne v1, v7, :cond_4
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_4
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->getProgress()I
 
     move-result v7
 
-    :goto_2
+    :goto_0
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->getSizeBytes()J
 
     move-result-wide v1
@@ -764,7 +781,13 @@
 
     move-result-object p2
 
-    goto :goto_1
+    invoke-direct {p0, v0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->getIconForFiletype(Landroid/content/Context;Ljava/lang/String;)I
+
+    move-result p2
+
+    invoke-virtual {p1, p2}, Lcom/discord/views/UploadProgressView;->setIcon(I)V
+
+    return-void
 
     :cond_5
     instance-of v0, p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;
@@ -803,14 +826,14 @@
 
     if-ne v5, v7, :cond_6
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_6
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;->getProgress()I
 
     move-result v7
 
-    :goto_3
+    :goto_1
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;->getSizeBytes()J
 
     move-result-wide v5
@@ -878,7 +901,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KF()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KE()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
index 4f6a273e6c..9bc86c35dd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetChatListItem.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList_ViewBinding.smali
index 3b8e5ec389..501b4f2865 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/WidgetChatList_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChatList_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali
index ab3447455c..26815b39d2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/BlockedMessagesEntry;
 .super Ljava/lang/Object;
+.source "BlockedMessagesEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$Companion.smali
index aaacb43ba9..4954dfc4e8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/ChatListEntry$Companion;
 .super Ljava/lang/Object;
+.source "ChatListEntry.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$DefaultImpls.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$DefaultImpls.smali
index eb50f468d7..6b987fa570 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry$DefaultImpls.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/ChatListEntry$DefaultImpls;
 .super Ljava/lang/Object;
+.source "ChatListEntry.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry.smali
index a1911eacf9..3b6f65b072 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ChatListEntry.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/chat/list/entries/ChatListEntry;
 .super Ljava/lang/Object;
+.source "ChatListEntry.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/DividerEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/DividerEntry.smali
index d7e2d355c6..54aded009d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/DividerEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/DividerEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/DividerEntry;
 .super Ljava/lang/Object;
+.source "DividerEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali
index a63e386fd0..785fe8eb65 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 .super Ljava/lang/Object;
+.source "EmbedEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
@@ -83,103 +84,103 @@
 
     move-object v0, p0
 
-    and-int/lit8 v2, p9, 0x1
+    and-int/lit8 v1, p9, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget v2, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->embedIndex:I
+    iget v1, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->embedIndex:I
 
     goto :goto_0
 
     :cond_0
-    move v2, p1
+    move v1, p1
 
     :goto_0
-    and-int/lit8 v3, p9, 0x2
+    and-int/lit8 v2, p9, 0x2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    iget-wide v3, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->guildId:J
+    iget-wide v2, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->guildId:J
 
     goto :goto_1
 
     :cond_1
-    move-wide v3, p2
+    move-wide v2, p2
 
     :goto_1
-    and-int/lit8 v5, p9, 0x4
+    and-int/lit8 v4, p9, 0x4
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
-    iget-object v5, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->message:Lcom/discord/models/domain/ModelMessage;
+    iget-object v4, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->message:Lcom/discord/models/domain/ModelMessage;
 
     goto :goto_2
 
     :cond_2
-    move-object v5, p4
+    move-object v4, p4
 
     :goto_2
-    and-int/lit8 v6, p9, 0x8
+    and-int/lit8 v5, p9, 0x8
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    iget-object v6, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->messageState:Lcom/discord/stores/StoreMessageState$State;
+    iget-object v5, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->messageState:Lcom/discord/stores/StoreMessageState$State;
 
     goto :goto_3
 
     :cond_3
-    move-object v6, p5
+    move-object v5, p5
 
     :goto_3
-    and-int/lit8 v7, p9, 0x10
+    and-int/lit8 v6, p9, 0x10
 
-    if-eqz v7, :cond_4
+    if-eqz v6, :cond_4
 
-    iget-object v7, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->embed:Lcom/discord/models/domain/ModelMessageEmbed;
+    iget-object v6, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->embed:Lcom/discord/models/domain/ModelMessageEmbed;
 
     goto :goto_4
 
     :cond_4
-    move-object v7, p6
+    move-object v6, p6
 
     :goto_4
-    and-int/lit8 v8, p9, 0x20
+    and-int/lit8 v7, p9, 0x20
 
-    if-eqz v8, :cond_5
+    if-eqz v7, :cond_5
 
-    iget-boolean v8, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->isBlockedExpanded:Z
+    iget-boolean v7, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->isBlockedExpanded:Z
 
     goto :goto_5
 
     :cond_5
-    move/from16 v8, p7
+    move/from16 v7, p7
 
     :goto_5
-    and-int/lit8 v1, p9, 0x40
+    and-int/lit8 v8, p9, 0x40
 
-    if-eqz v1, :cond_6
+    if-eqz v8, :cond_6
 
-    iget-boolean v1, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->allowAnimatedEmojis:Z
+    iget-boolean v8, v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->allowAnimatedEmojis:Z
 
     goto :goto_6
 
     :cond_6
-    move/from16 v1, p8
+    move/from16 v8, p8
 
     :goto_6
-    move p1, v2
+    move p1, v1
 
-    move-wide p2, v3
+    move-wide p2, v2
 
-    move-object p4, v5
+    move-object p4, v4
 
-    move-object p5, v6
+    move-object p5, v5
 
-    move-object p6, v7
+    move-object p6, v6
 
-    move/from16 p7, v8
+    move/from16 p7, v7
 
-    move/from16 p8, v1
+    move/from16 p8, v8
 
     invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->copy(IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageEmbed;ZZ)Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali
index 37dd2d825d..1e3c1c36df 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;
 .super Ljava/lang/Object;
+.source "EmptyPinsEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali
index db4375394e..6890be78e1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
 .super Ljava/lang/Object;
+.source "GameInviteEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali
index 12decde699..0ba6f71264 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/GiftEntry;
 .super Ljava/lang/Object;
+.source "GiftEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
@@ -41,61 +42,61 @@
 
     move-object v0, p0
 
-    and-int/lit8 v2, p8, 0x1
+    and-int/lit8 v1, p8, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-wide v2, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->userId:J
+    iget-wide v1, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->userId:J
 
     goto :goto_0
 
     :cond_0
-    move-wide v2, p1
+    move-wide v1, p1
 
     :goto_0
-    and-int/lit8 v4, p8, 0x2
+    and-int/lit8 v3, p8, 0x2
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    iget-wide v4, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->messageId:J
+    iget-wide v3, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->messageId:J
 
     goto :goto_1
 
     :cond_1
-    move-wide v4, p3
+    move-wide v3, p3
 
     :goto_1
-    and-int/lit8 v6, p8, 0x4
+    and-int/lit8 v5, p8, 0x4
 
-    if-eqz v6, :cond_2
+    if-eqz v5, :cond_2
 
-    iget-wide v6, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->channelId:J
+    iget-wide v5, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->channelId:J
 
     goto :goto_2
 
     :cond_2
-    move-wide v6, p5
+    move-wide v5, p5
 
     :goto_2
-    and-int/lit8 v1, p8, 0x8
+    and-int/lit8 v7, p8, 0x8
 
-    if-eqz v1, :cond_3
+    if-eqz v7, :cond_3
 
-    iget-object v1, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->giftCode:Ljava/lang/String;
+    iget-object v7, v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->giftCode:Ljava/lang/String;
 
     goto :goto_3
 
     :cond_3
-    move-object v1, p7
+    move-object v7, p7
 
     :goto_3
-    move-wide p1, v2
+    move-wide p1, v1
 
-    move-wide p3, v4
+    move-wide p3, v3
 
-    move-wide p5, v6
+    move-wide p5, v5
 
-    move-object p7, v1
+    move-object p7, v7
 
     invoke-virtual/range {p0 .. p7}, Lcom/discord/widgets/chat/list/entries/GiftEntry;->copy(JJJLjava/lang/String;)Lcom/discord/widgets/chat/list/entries/GiftEntry;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali
index 8144b31147..5a956d0754 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
 .super Ljava/lang/Object;
+.source "GuildWelcomeEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali
index e19f98ce90..6ff0168ca8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/InviteEntry;
 .super Ljava/lang/Object;
+.source "InviteEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
@@ -37,65 +38,65 @@
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/InviteEntry;JJLjava/lang/String;JILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/InviteEntry;
-    .locals 9
+    .locals 8
 
     move-object v0, p0
 
-    and-int/lit8 v2, p8, 0x1
+    and-int/lit8 v1, p8, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-wide v2, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->userId:J
+    iget-wide v1, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->userId:J
 
     goto :goto_0
 
     :cond_0
-    move-wide v2, p1
+    move-wide v1, p1
 
     :goto_0
-    and-int/lit8 v4, p8, 0x2
+    and-int/lit8 v3, p8, 0x2
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    iget-wide v4, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->messageId:J
+    iget-wide v3, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->messageId:J
 
     goto :goto_1
 
     :cond_1
-    move-wide v4, p3
+    move-wide v3, p3
 
     :goto_1
-    and-int/lit8 v6, p8, 0x4
+    and-int/lit8 v5, p8, 0x4
 
-    if-eqz v6, :cond_2
+    if-eqz v5, :cond_2
 
-    iget-object v6, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->inviteCode:Ljava/lang/String;
+    iget-object v5, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->inviteCode:Ljava/lang/String;
 
     goto :goto_2
 
     :cond_2
-    move-object v6, p5
+    move-object v5, p5
 
     :goto_2
-    and-int/lit8 v1, p8, 0x8
+    and-int/lit8 v6, p8, 0x8
 
-    if-eqz v1, :cond_3
+    if-eqz v6, :cond_3
 
-    iget-wide v7, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->guildId:J
+    iget-wide v6, v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->guildId:J
 
     goto :goto_3
 
     :cond_3
-    move-wide v7, p6
+    move-wide v6, p6
 
     :goto_3
-    move-wide p1, v2
+    move-wide p1, v1
 
-    move-wide p3, v4
+    move-wide p3, v3
 
-    move-object p5, v6
+    move-object p5, v5
 
-    move-wide p6, v7
+    move-wide p6, v6
 
     invoke-virtual/range {p0 .. p7}, Lcom/discord/widgets/chat/list/entries/InviteEntry;->copy(JJLjava/lang/String;J)Lcom/discord/widgets/chat/list/entries/InviteEntry;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali
index 9b78ccc33b..b147959041 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
 .super Ljava/lang/Object;
+.source "ListenTogetherEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/LoadingEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/LoadingEntry.smali
index 25b1fa7d73..73c97f3535 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/LoadingEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/LoadingEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/LoadingEntry;
 .super Ljava/lang/Object;
+.source "LoadingEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/MentionFooterEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/MentionFooterEntry.smali
index 60a678628e..3cec8f5539 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/MentionFooterEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/MentionFooterEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;
 .super Ljava/lang/Object;
+.source "MentionFooterEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali
index 0334d34ab1..f23065b929 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/MessageEntry;
 .super Ljava/lang/Object;
+.source "MessageEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali
index d28951ca32..7a5ccc46c3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;
 .super Ljava/lang/Object;
+.source "MessageHeaderEntry.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali
index c673302e01..d0b9a821ba 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
 .super Ljava/lang/Object;
+.source "MessageHeaderEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali
index 22679665ae..17783bc139 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;
 .super Ljava/lang/Object;
+.source "NewMessagesEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali
index b3ec162adc..9c793f9b4d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/ReactionsEntry;
 .super Ljava/lang/Object;
+.source "ReactionsEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchEmptyEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchEmptyEntry.smali
index 6d0344e2c6..f659b19673 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchEmptyEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchEmptyEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/SearchEmptyEntry;
 .super Ljava/lang/Object;
+.source "SearchEmptyEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchErrorEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchErrorEntry.smali
index fe07a73df2..1e30086532 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchErrorEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchErrorEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/SearchErrorEntry;
 .super Ljava/lang/Object;
+.source "SearchErrorEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchIndexingEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchIndexingEntry.smali
index 16f55e6a82..6406a63cac 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchIndexingEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchIndexingEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/SearchIndexingEntry;
 .super Ljava/lang/Object;
+.source "SearchIndexingEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali
index c61c592b8c..d3392d1f63 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;
 .super Ljava/lang/Object;
+.source "SearchResultCountEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali
index 98095f5a29..acc861350d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/SpacerEntry;
 .super Ljava/lang/Object;
+.source "SpacerEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali
index 6f198d4d41..5b86008445 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;
 .super Ljava/lang/Object;
+.source "StartOfChatEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali
index 1da4fd7953..9209cd833c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/TimestampEntry;
 .super Ljava/lang/Object;
+.source "TimestampEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali
index 932434397b..7d9275a7a0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;
 .super Ljava/lang/Object;
+.source "UploadProgressEntry.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/entries/ChatListEntry;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState.smali
index b6716def15..8d475842c3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;
 .super Ljava/lang/Enum;
+.source "WidgetChatListModel.java"
 
 
 # annotations
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 8ee0537423..05418ad1b3 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
 .super Ljava/lang/Object;
+.source "WidgetChatListModel.java"
 
 
 # annotations
@@ -444,7 +445,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_9
+    if-eqz v1, :cond_a
 
     invoke-interface {v12}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -468,9 +469,14 @@
 
     move-result v0
 
+    move v10, v0
+
+    goto :goto_1
+
     :cond_0
     move v10, v0
 
+    :goto_1
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
     move-result-wide v1
@@ -497,12 +503,12 @@
 
     const/4 v6, 0x1
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_1
     const/4 v6, 0x0
 
-    :goto_1
+    :goto_2
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v0
@@ -521,7 +527,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     add-int/lit8 v10, v10, 0x1
 
@@ -541,67 +547,65 @@
 
     move-result v8
 
-    move v1, v10
+    move-object/from16 v7, v16
 
-    move-object/from16 v10, v16
-
-    goto :goto_2
+    goto :goto_3
 
     :cond_2
     move-object/from16 v4, p3
 
-    move v1, v10
+    goto :goto_3
 
-    move-object v10, v7
+    :cond_3
+    move-object/from16 v4, p3
 
-    :goto_2
-    if-eqz v0, :cond_4
+    :goto_3
+    if-eqz v0, :cond_5
 
-    if-eqz v6, :cond_3
+    if-eqz v6, :cond_4
 
     goto :goto_4
 
-    :cond_3
-    :goto_3
-    move/from16 v19, v1
+    :cond_4
+    move/from16 v19, v10
 
     goto :goto_5
 
-    :cond_4
+    :cond_5
     :goto_4
-    invoke-direct {v11, v10, v1, v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addBlockedMessage(Lcom/discord/models/domain/ModelMessage;IZ)I
+    invoke-direct {v11, v7, v10, v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addBlockedMessage(Lcom/discord/models/domain/ModelMessage;IZ)I
 
     move-result v1
 
-    goto :goto_3
+    move/from16 v19, v1
 
     :goto_5
-    if-nez v0, :cond_5
+    if-nez v0, :cond_6
 
-    if-eqz v8, :cond_5
+    if-eqz v8, :cond_6
 
     const/16 v20, 0x0
 
     goto :goto_6
 
-    :cond_5
+    :cond_6
     move/from16 v20, v8
 
     :goto_6
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
-    if-eqz v20, :cond_6
+    if-eqz v20, :cond_7
 
     goto :goto_7
 
-    :cond_6
+    :cond_7
     move v13, v6
 
-    move-object/from16 v23, v10
+    move-object/from16 v23, v7
 
     goto :goto_8
 
-    :cond_7
+    :cond_8
     :goto_7
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
 
@@ -615,15 +619,15 @@
 
     move-result-object v0
 
-    move-object/from16 v8, p5
+    move-object/from16 v10, p5
 
-    invoke-interface {v8, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v10, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    move-object v7, v0
+    move-object v8, v0
 
-    check-cast v7, Lcom/discord/stores/StoreMessageState$State;
+    check-cast v8, Lcom/discord/stores/StoreMessageState$State;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
 
@@ -635,7 +639,7 @@
 
     move-object/from16 v3, v16
 
-    move-object v4, v7
+    move-object v4, v8
 
     move-object v5, v9
 
@@ -643,20 +647,20 @@
 
     move/from16 v6, v20
 
+    move-object/from16 v23, v7
+
     move/from16 v7, p7
 
     move/from16 v8, p8
 
     move v13, v9
 
-    move-object/from16 v23, v10
-
     move-wide/from16 v9, v21
 
     invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addMessage(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessage;ZZZJ)V
 
     :goto_8
-    if-nez v15, :cond_8
+    if-nez v15, :cond_9
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
@@ -672,7 +676,7 @@
 
     goto :goto_9
 
-    :cond_8
+    :cond_9
     move-object/from16 v2, p1
 
     :goto_9
@@ -690,7 +694,7 @@
 
     goto/16 :goto_0
 
-    :cond_9
+    :cond_a
     iget-object v0, v11, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->items:Ljava/util/List;
 
     invoke-static {v0}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
@@ -1102,7 +1106,7 @@
 
     check-cast v3, Lkotlin/text/MatchResult;
 
-    invoke-interface {v3}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {v3}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object v3
 
@@ -1207,7 +1211,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_0
     new-instance v0, Ljava/util/HashMap;
@@ -1242,7 +1246,7 @@
 
     check-cast v3, Lkotlin/text/MatchResult;
 
-    invoke-interface {v3}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {v3}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object v3
 
@@ -1292,17 +1296,14 @@
 
     move-result-wide v9
 
-    :goto_1
-    move-wide v10, v9
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const-wide/16 v9, 0x0
 
-    goto :goto_1
+    :goto_1
+    move-wide v10, v9
 
-    :goto_2
     move-object v4, v12
 
     move-object v9, v3
@@ -1330,7 +1331,7 @@
     return-object p0
 
     :cond_5
-    :goto_3
+    :goto_2
     return-object v1
 .end method
 
@@ -1856,9 +1857,9 @@
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->newMessagesMarkerMessageId:J
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     const-wide/16 v4, 0x0
 
@@ -1894,9 +1895,12 @@
 
     if-nez p1, :cond_1
 
-    const/4 v2, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
     if-eqz v2, :cond_2
 
     new-instance p1, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;
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 14871caee8..c0e12c8a40 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
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/list/model/WidgetChatListModel;
 .super Ljava/lang/Object;
+.source "WidgetChatListModel.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
@@ -283,10 +284,9 @@
 
     invoke-direct {p3}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;-><init>()V
 
-    :goto_0
     invoke-interface {v0, p3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance p3, Lcom/discord/widgets/chat/list/entries/SpacerEntry;
@@ -295,9 +295,9 @@
 
     invoke-direct {p3, v1, v2}, Lcom/discord/widgets/chat/list/entries/SpacerEntry;-><init>(J)V
 
-    goto :goto_0
+    invoke-interface {v0, p3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :goto_1
+    :goto_0
     invoke-static {p2}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->access$200(Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;)Ljava/util/List;
 
     move-result-object p2
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali
index 4cdd2bb58e..b64bfe2451 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListModelTop.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali
index b5489f5a4b..fb503bd725 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListModelTop.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -87,7 +88,7 @@
 
     move-result-object p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->isTouchedSinceLastJump()Z
@@ -115,6 +116,10 @@
 
     invoke-direct {p1, v0, v1}, Lcom/discord/widgets/chat/list/entries/SpacerEntry;-><init>(J)V
 
+    invoke-static {p1}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
     goto :goto_1
 
     :cond_2
@@ -123,12 +128,11 @@
 
     invoke-direct {p1}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;-><init>()V
 
-    :goto_1
     invoke-static {p1}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     sget-object v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1;->INSTANCE:Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1;
 
     check-cast v0, Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali
index 3242115227..c03ae2ddd2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1;
 .super Ljava/lang/Object;
+.source "WidgetChatListModelTop.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali
index 7bde757ed5..87087ddf6a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2;
 .super Ljava/lang/Object;
+.source "WidgetChatListModelTop.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
@@ -187,7 +188,6 @@
 
     invoke-direct/range {v8 .. v14}, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;-><init>(Ljava/lang/String;ZZZJ)V
 
-    :goto_4
     check-cast v1, Lcom/discord/widgets/chat/list/entries/ChatListEntry;
 
     return-object v1
@@ -221,7 +221,9 @@
 
     invoke-direct/range {v12 .. v17}, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;-><init>(JLjava/lang/String;IZ)V
 
-    goto :goto_4
+    check-cast v1, Lcom/discord/widgets/chat/list/entries/ChatListEntry;
+
+    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;
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 513087f556..2be6214b62 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChatListModelTop.kt"
 
 
 # annotations
@@ -107,7 +108,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v3}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v3
 
@@ -169,7 +170,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali
index 0d8b179a12..825dfee975 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;
 .super Ljava/lang/Object;
+.source "WidgetChatListModelTop.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$Companion.smali
index 53d76b48a4..0e49b22c5d 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$Companion;
 .super Ljava/lang/Object;
+.source "ManageReactionsEmojisAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali
index 34bdeecdf5..106d7b7931 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;
 .super Ljava/lang/Object;
+.source "ManageReactionsEmojisAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$Companion.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$Companion.smali
index 56c83c2bc4..ce8284d7e1 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$Companion;
 .super Ljava/lang/Object;
+.source "ManageReactionsEmojisAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali
index 995114bb52..70aa8f9896 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1;
 .super Ljava/lang/Object;
+.source "ManageReactionsEmojisAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
@@ -80,6 +81,8 @@
 
     invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali
index bd7e36cde9..94ff162c84 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "ManageReactionsEmojisAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter.smali
index 75c316f52e..b02ca16b60 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsEmojisAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "ManageReactionsEmojisAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModel.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModel.smali
index 3f1d741a73..756fb2d780 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModel;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$Companion.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$Companion.smali
index f38bda1455..0fcc44786a 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$Companion;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$RequestState.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$RequestState.smali
index b3b24ad638..9c725b8e6b 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$RequestState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$RequestState.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$RequestState;
 .super Ljava/lang/Enum;
+.source "ManageReactionsModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$UsersRequest.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$UsersRequest.smali
index 9eb8e26d3b..12649f321b 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$UsersRequest.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$UsersRequest.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$UsersRequest;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$1.smali
index 00832a7eb8..c409011264 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$1;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2$$special$$inlined$sortedByDescending$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2$$special$$inlined$sortedByDescending$1.smali
index 09fe9729a6..49610e64e5 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2$$special$$inlined$sortedByDescending$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2$$special$$inlined$sortedByDescending$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2$$special$$inlined$sortedByDescending$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2.smali
index 44ae0b079d..11277a11da 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$2;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$1.smali
index d2c13b8c3b..7d2669f47c 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$1;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$1.smali
index 999d3026e5..0f30aca95e 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$1;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$2.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$2.smali
index 3abbf3bf3b..d361a8d262 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2$2;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2.smali
index 9738e10d56..1cb6abb6bb 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3$2;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3.smali
index 58df66fee4..6a9555959a 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$get$3;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -97,7 +98,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/subjects/Subject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/Subject;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$1.smali
index db7cdc872f..bec382d86b 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$1;
 .super Lkotlin/jvm/internal/i;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$2.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$2.smali
index e3bb525d76..c48f899382 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$2;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$3.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$3.smali
index f77c74e36c..c03d1ba5da 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$getUsersForReaction$3;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$sam$rx_functions_Action1$0.smali
index 1daa386cc0..3a3531dfc7 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$sam$rx_functions_Action1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$sam$rx_functions_Action1$0;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider.smali
index 5b70916c06..9ee6b0b18e 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider;
 .super Ljava/lang/Object;
+.source "ManageReactionsModel.kt"
 
 
 # annotations
@@ -90,7 +91,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -251,19 +252,22 @@
 
     invoke-direct {p1}, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorItem;-><init>()V
 
-    goto :goto_1
+    invoke-static {p1}, Lkotlin/a/l;->by(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    goto :goto_2
 
     :pswitch_1
     new-instance p1, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingItem;
 
     invoke-direct {p1}, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingItem;-><init>()V
 
-    :goto_1
     invoke-static {p1}, Lkotlin/a/l;->by(Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_2
     invoke-virtual {p2}, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModelProvider$UsersRequest;->getUsers()Ljava/util/List;
@@ -288,7 +292,7 @@
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p3
@@ -307,7 +311,7 @@
 
     invoke-interface {p2, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     check-cast p2, Ljava/util/List;
@@ -318,7 +322,7 @@
 
     move-result-object p1
 
-    :goto_3
+    :goto_2
     new-instance p2, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsModel;
 
     check-cast v0, Ljava/util/List;
@@ -520,7 +524,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$Companion.smali
index e5b769f0e5..b8923aabd5 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$Companion;
 .super Ljava/lang/Object;
+.source "ManageReactionsResultsAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorItem.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorItem.smali
index ac66d0b8b7..ea1f14f073 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorItem;
 .super Ljava/lang/Object;
+.source "ManageReactionsResultsAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali
index 383b3e35bb..1ccba7e2a5 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1;
 .super Ljava/lang/Object;
+.source "ManageReactionsResultsAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali
index fa3bcc0bba..8c0ac4dbaa 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "ManageReactionsResultsAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingItem.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingItem.smali
index 07464d5d87..437ecf55cb 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingItem;
 .super Ljava/lang/Object;
+.source "ManageReactionsResultsAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali
index 1a00f27630..28856b64df 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "ManageReactionsResultsAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserItem.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserItem.smali
index 2ff07de9f5..38cd727e50 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserItem;
 .super Ljava/lang/Object;
+.source "ManageReactionsResultsAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder$onConfigure$1.smali
index 5b8938158f..87650f1858 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder$onConfigure$1;
 .super Ljava/lang/Object;
+.source "ManageReactionsResultsAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali
index 8343dc51c1..6fcbc8029b 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "ManageReactionsResultsAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter.smali
index 10e2d4d8d0..0041022010 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "ManageReactionsResultsAdapter.kt"
 
 
 # annotations
@@ -136,7 +137,6 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ErrorViewHolder;-><init>(Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
@@ -146,14 +146,18 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$LoadingViewHolder;-><init>(Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_2
     new-instance p1, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter$ReactionUserViewHolder;-><init>(Lcom/discord/widgets/chat/manage_reactions/ManageReactionsResultsAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali
index c6cba82b62..f3e0e35929 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/manage_reactions/WidgetManageReactions;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetManageReactions.java"
 
 
 # static fields
@@ -144,8 +145,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/manage_reactions/WidgetManageReactions;->dataSubscription:Lrx/Subscription;
-
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions_ViewBinding.smali
index 7ed970ac41..0e25fa8e57 100644
--- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/manage_reactions/WidgetManageReactions_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetManageReactions_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$1.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$1.smali
index 28592cda74..557cf01620 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$1;
 .super Ljava/lang/Object;
+.source "WidgetChannelPinnedMessages.java"
 
 
 # annotations
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 eb11b2ac20..5e6a007552 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
 .super Ljava/lang/Object;
+.source "WidgetChannelPinnedMessages.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
@@ -98,7 +99,7 @@
 .end method
 
 .method private static create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Z)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
-    .locals 16
+    .locals 15
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -124,7 +125,7 @@
         }
     .end annotation
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
     move-object/from16 v1, p1
 
@@ -140,10 +141,10 @@
 
     if-nez p7, :cond_0
 
-    goto/16 :goto_6
+    goto/16 :goto_4
 
     :cond_0
-    if-nez v1, :cond_2
+    if-nez v1, :cond_1
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/LoadingEntry;
 
@@ -153,34 +154,32 @@
 
     move-result-object v0
 
-    :cond_1
-    :goto_0
     move-object v5, v0
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_2
+    :cond_1
     invoke-interface/range {p1 .. p1}, Ljava/util/List;->isEmpty()Z
 
     move-result v2
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_3
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     const v1, 0x7f120a0f
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_3
+    :cond_2
     const v1, 0x7f120a0e
 
-    :goto_1
-    invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    :goto_0
+    invoke-virtual {p0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -192,25 +191,27 @@
 
     move-result-object v0
 
-    goto :goto_0
+    move-object v5, v0
 
-    :cond_4
+    goto :goto_2
+
+    :cond_3
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     const/4 v2, 0x0
 
-    const/4 v11, 0x0
+    const/4 v14, 0x0
 
-    :goto_2
+    :goto_1
     invoke-interface/range {p1 .. p1}, Ljava/util/List;->size()I
 
     move-result v2
 
-    if-ge v11, v2, :cond_1
+    if-ge v14, v2, :cond_5
 
-    invoke-interface {v1, v11}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v1, v14}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -232,7 +233,7 @@
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
 
-    move-result-wide v14
+    move-result-wide v11
 
     move-object/from16 v3, p2
 
@@ -240,10 +241,6 @@
 
     move/from16 v10, p8
 
-    move v1, v11
-
-    move-wide v11, v14
-
     invoke-static/range {v2 .. v12}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List;
 
     move-result-object v2
@@ -256,7 +253,7 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    if-ge v1, v2, :cond_5
+    if-ge v14, v2, :cond_4
 
     new-instance v2, Lcom/discord/widgets/chat/list/entries/DividerEntry;
 
@@ -264,14 +261,15 @@
 
     invoke-interface {v0, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
+    :cond_4
+    add-int/lit8 v14, v14, 0x1
+
+    goto :goto_1
+
     :cond_5
-    add-int/lit8 v11, v1, 0x1
+    move-object v5, v0
 
-    move-object/from16 v1, p1
-
-    goto :goto_2
-
-    :goto_3
+    :goto_2
     invoke-static/range {p5 .. p6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
@@ -300,19 +298,16 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    :goto_4
-    move-object v6, v0
-
-    goto :goto_5
+    goto :goto_3
 
     :cond_6
     invoke-static {}, Ljava/util/Collections;->emptySet()Ljava/util/Set;
 
     move-result-object v0
 
-    goto :goto_4
+    :goto_3
+    move-object v6, v0
 
-    :goto_5
     new-instance v7, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
 
     move-object v0, v7
@@ -328,7 +323,7 @@
     return-object v7
 
     :cond_7
-    :goto_6
+    :goto_4
     const/4 v0, 0x0
 
     return-object v0
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali
index 5f14f20688..fcb592486e 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler;
 .super Ljava/lang/Object;
+.source "WidgetChannelPinnedMessages.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
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 33c1df45dd..c90d0f022c 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChannelPinnedMessages.java"
 
 
 # annotations
@@ -144,8 +145,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->dispose()V
 
     :cond_0
@@ -161,8 +160,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->disposeHandlers()V
 
     :cond_0
@@ -254,8 +251,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setHandlers()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages_ViewBinding.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages_ViewBinding.smali
index 4bb7942fee..04607cd5e5 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetChannelPinnedMessages_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1$1.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1$1.smali
index 8b659b0791..e3dc9e2d40 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1$1;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1.smali
index d43096dd84..7353ec794e 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1.smali
index 415b17b088..f6af564591 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/ChatTypingModel$Companion$get$1;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTarget$1.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTarget$1.smali
index e2ff97a50b..a94a9372c1 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTarget$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTarget$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/ChatTypingModel$Companion$getTarget$1;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1$1.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1$1.smali
index 034d9d7214..5edfcc1111 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1$1;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1.smali
index 52af669728..d5ba903c0d 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/ChatTypingModel$Companion$getTypingUsers$1;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 ac98e9615c..074401f8f6 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/typing/ChatTypingModel$Companion;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 
 # annotations
@@ -114,7 +115,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
@@ -154,7 +155,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Hide.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Hide.smali
index 00f956b2b5..890b68ccc0 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Hide.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Hide.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/typing/ChatTypingModel$Hide;
 .super Lcom/discord/widgets/chat/typing/ChatTypingModel;
+.source "ChatTypingModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali
index 249e6b8bcf..f3251fc77a 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/typing/ChatTypingModel$Typing;
 .super Lcom/discord/widgets/chat/typing/ChatTypingModel;
+.source "ChatTypingModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel.smali
index aa68deeb2b..518a63427e 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/chat/typing/ChatTypingModel;
 .super Ljava/lang/Object;
+.source "ChatTypingModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$Animator.smali b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$Animator.smali
index 4e99ea15ee..056ad5385e 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$Animator.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$Animator.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers$Animator;
 .super Ljava/lang/Object;
+.source "WidgetChatTypingUsers.kt"
 
 
 # annotations
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 155fbd84d9..74c58abd11 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetChatTypingUsers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 cc64911086..7d9458125b 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChatTypingUsers.kt"
 
 
 # annotations
@@ -615,8 +616,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -740,7 +739,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
index a10d69e087..096110452d 100644
--- a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
+++ b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/client/WidgetClientOutdated;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetClientOutdated.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding$1.smali b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding$1.smali
index 3ed6b1a899..5c3d96e13a 100644
--- a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding$1.smali
+++ b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/client/WidgetClientOutdated_ViewBinding$1;
 .super Lbutterknife/a/a;
+.source "WidgetClientOutdated_ViewBinding.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding.smali b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding.smali
index 59420d9953..c93633101f 100644
--- a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/client/WidgetClientOutdated_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetClientOutdated_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali
index 0f6c335579..3cff3e498d 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$1;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali
index 9b999445dc..3bdbed4015 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$onConfigure$2.smali
index 641aa0141e..0939399eb4 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item$onConfigure$2;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 956f5925ec..082a9f1428 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetDebugging.kt"
 
 
 # annotations
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 61e3fb2a08..e58b1d8016 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetDebugging.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali
index 3e7587fdaf..cead4b5ebf 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/debugging/WidgetDebugging$Companion;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali
index 2dc007f90e..7beadcc47a 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$Model;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 
 # annotations
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 9b543813e0..3b6142917a 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
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 69d8322166..2eed0c8c7b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali
index 9cf2fedf05..eefd816564 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali
index a5ce1e395a..b7c1210058 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 ea9b3777dc..745a9b4c92 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali
index c462bf3285..bffcd2b27d 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali
index ce6067e76c..1e8cfdf283 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2;
 .super Ljava/lang/Object;
+.source "WidgetDebugging.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
index c2e997ce8d..3b49c41c71 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/debugging/WidgetDebugging;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetDebugging.kt"
 
 
 # annotations
@@ -195,8 +196,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/debugging/WidgetDebugging;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -398,7 +397,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/debugging/WidgetDebugging;->filterSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
index ced87ca65c..c97b1277ce 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/debugging/WidgetFatalCrash$Companion;
 .super Ljava/lang/Object;
+.source "WidgetFatalCrash.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 8cf1feedd6..e7c37e5ce5 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/debugging/WidgetFatalCrash;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetFatalCrash.kt"
 
 
 # annotations
@@ -396,8 +397,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -593,7 +592,7 @@
 
     new-array v2, v0, [Ljava/lang/Object;
 
-    const-string v4, "8.3.0"
+    const-string v4, "8.3.1"
 
     aput-object v4, v2, v3
 
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$Companion.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$Companion.smali
index 91b73fb263..786491431e 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager$Companion;
 .super Ljava/lang/Object;
+.source "NearbyManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali
index 7397eca272..a30c3bc810 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;
 .super Lcom/discord/widgets/friends/NearbyManager$NearbyState;
+.source "NearbyManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali
index d5a2140688..fbd0ce5dc0 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager$NearbyState$Disconnected;
 .super Lcom/discord/widgets/friends/NearbyManager$NearbyState;
+.source "NearbyManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Uninitialized.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Uninitialized.smali
index a80e1d77dd..16c30e4047 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Uninitialized.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Uninitialized.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager$NearbyState$Uninitialized;
 .super Lcom/discord/widgets/friends/NearbyManager$NearbyState;
+.source "NearbyManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState.smali
index 1406e3061f..cb7c41ad5a 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/friends/NearbyManager$NearbyState;
 .super Ljava/lang/Object;
+.source "NearbyManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$buildClient$$inlined$also$lambda$1.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$buildClient$$inlined$also$lambda$1.smali
index 0770b08d92..556217910c 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$buildClient$$inlined$also$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$buildClient$$inlined$also$lambda$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager$buildClient$$inlined$also$lambda$1;
 .super Lcom/google/android/gms/nearby/messages/d;
+.source "NearbyManager.kt"
 
 
 # annotations
@@ -49,7 +50,6 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Disconnected;-><init>(I)V
 
-    :goto_0
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
@@ -81,5 +81,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;-><init>(Ljava/util/Set;)V
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupBroadcaster$1.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupBroadcaster$1.smali
index 38c955d9bf..52cf8d7c1e 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupBroadcaster$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupBroadcaster$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager$setupBroadcaster$1;
 .super Lcom/google/android/gms/nearby/messages/c;
+.source "NearbyManager.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupListener$1.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupListener$1.smali
index c505260e3a..1465e2d63e 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$setupListener$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager$setupListener$1;
 .super Lcom/google/android/gms/nearby/messages/MessageListener;
+.source "NearbyManager.kt"
 
 
 # annotations
@@ -40,7 +41,7 @@
 
     invoke-super {p0, p1}, Lcom/google/android/gms/nearby/messages/MessageListener;->onFound(Lcom/google/android/gms/nearby/messages/Message;)V
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager$setupListener$1;->this$0:Lcom/discord/widgets/friends/NearbyManager;
 
@@ -60,8 +61,13 @@
 
     invoke-static {v0, v1, v2}, Lcom/discord/widgets/friends/NearbyManager;->access$foundUserId(Lcom/discord/widgets/friends/NearbyManager;J)V
 
+    return-void
+
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
 
 .method public final onLost(Lcom/google/android/gms/nearby/messages/Message;)V
@@ -69,7 +75,7 @@
 
     invoke-super {p0, p1}, Lcom/google/android/gms/nearby/messages/MessageListener;->onLost(Lcom/google/android/gms/nearby/messages/Message;)V
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager$setupListener$1;->this$0:Lcom/discord/widgets/friends/NearbyManager;
 
@@ -89,6 +95,11 @@
 
     invoke-static {v0, v1, v2}, Lcom/discord/widgets/friends/NearbyManager;->access$lostUserId(Lcom/discord/widgets/friends/NearbyManager;J)V
 
+    return-void
+
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
index 8f0f70dc76..f1e4224348 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/NearbyManager;
 .super Ljava/lang/Object;
+.source "NearbyManager.kt"
 
 
 # annotations
@@ -139,7 +140,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/b$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/b$a;->AJ()Lcom/google/android/gms/nearby/messages/b;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/b$a;->AI()Lcom/google/android/gms/nearby/messages/b;
 
     move-result-object v0
 
@@ -259,7 +260,7 @@
 .method private final parseUserId(Lcom/google/android/gms/nearby/messages/Message;)Ljava/lang/Long;
     .locals 4
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/Message;->AI()[B
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/Message;->AH()[B
 
     move-result-object p1
 
@@ -302,17 +303,12 @@
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p1
+    move-result-object v1
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_0
-
     :catch_0
-    move-object p1, v1
-
-    :goto_0
-    return-object p1
+    return-object v1
 
     :cond_0
     return-object v1
@@ -335,7 +331,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->AK()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->AJ()Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     move-result-object v0
 
@@ -402,7 +398,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->AM()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->AL()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator.smali
index 333a56f58b..952c21e26d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAdd.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
index c24df75ced..d63feb782f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAdd.kt"
 
 
 # annotations
@@ -59,7 +60,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object v1
 
@@ -79,7 +80,7 @@
 
     new-instance p1, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator;
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object v1
 
@@ -89,7 +90,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fv()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->Fu()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali
index 1a8510c07c..48d12e075f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAdd.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 f2f4949ac4..e7141574cb 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAdd.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
@@ -46,9 +47,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -85,9 +86,12 @@
 
     if-lez p1, :cond_2
 
-    const/4 v1, 0x1
+    goto :goto_1
 
     :cond_2
+    const/4 v1, 0x0
+
+    :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setEnabled(Z)V
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$3.smali
index 2f2599ff3a..3bbd3654c7 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAdd.kt"
 
 # interfaces
 .implements Landroid/widget/TextView$OnEditorActionListener;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
index c15352be57..1b225b1c05 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAdd.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
index b6f87e44a8..7a30cfd39f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAdd.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
index 7b0149856c..6dd49c279a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAdd;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetFriendsAdd.kt"
 
 
 # annotations
@@ -224,17 +225,14 @@
 
     if-eqz v1, :cond_0
 
-    :goto_0
-    check-cast v1, Ljava/lang/CharSequence;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v1, ""
 
-    goto :goto_0
+    :goto_0
+    check-cast v1, Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-static {v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;->access$extractUsernameAndDiscriminator(Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;Ljava/lang/CharSequence;)Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator;
 
     move-result-object v0
@@ -446,8 +444,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAdd;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -658,6 +654,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/Window;->setSoftInputMode(I)V
 
+    return-void
+
     :cond_4
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$Companion.smali
index 3590418e8e..9519c9588d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$Companion;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali
index cf38408359..e0ebeb24cc 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali
index d364032b3c..f5b4048ee1 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$1.smali
index 8d18536f50..2f38cd01cc 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -74,6 +75,8 @@
 
     invoke-interface {p1, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$2.smali
index 953b5847c0..d87395ee89 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$2;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -64,6 +65,8 @@
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
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 7217750034..d1eb4e4453 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3;
 .super Ljava/lang/Object;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 dbf709d519..f5c497a67d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 
 # annotations
@@ -442,12 +443,11 @@
 
     const p2, 0x7f12005e
 
-    :goto_4
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_6
     if-eqz p1, :cond_7
@@ -462,6 +462,10 @@
 
     const p2, 0x7f1208a5
 
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
     goto :goto_4
 
     :cond_7
@@ -477,12 +481,16 @@
 
     const p2, 0x7f120972
 
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
     goto :goto_4
 
     :cond_8
     move-object p1, v3
 
-    :goto_5
+    :goto_4
     check-cast p1, Ljava/lang/CharSequence;
 
     const/4 p2, 0x2
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
index 711aa36b08..76759eabbe 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetFriendsAddUserAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Companion.smali
index e2cde3ea71..7a6b34fe25 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Disconnected.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Disconnected.smali
index 29fe996adb..fd7a46ed65 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Disconnected.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Disconnected.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Disconnected;
 .super Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Empty.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Empty.smali
index 5e62b7456e..0730767dc3 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Empty.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Empty.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Empty;
 .super Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali
index 1f7e41ba56..236398b284 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;
 .super Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Uninitialized.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Uninitialized.smali
index 0d5786c248..91fcb52d9e 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Uninitialized.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Uninitialized.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Uninitialized;
 .super Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model.smali
index ffa680abe1..aa4c49db71 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali
index 43f9ce030d..076a042261 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali
index 33b0fd7188..c42a955abe 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali
index 00b400d718..59056575f7 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
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 090951ef9a..d185d525ca 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6946b758ee..535d90eec0 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -100,14 +101,16 @@
 
     if-eqz v0, :cond_0
 
+    check-cast v0, Ljava/lang/CharSequence;
+
     goto :goto_0
 
     :cond_0
     const-string v0, ""
 
-    :goto_0
     check-cast v0, Ljava/lang/CharSequence;
 
+    :goto_0
     invoke-static {v0}, Lcom/discord/simpleast/core/a/b;->a(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v0
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 adef2d4c2e..051f471790 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 a63cbbf9ec..04ac9be9fd 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e878d79371..ac7c707e16 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a6a5d8b515..f7fe8d496f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 e881d33ab8..ec07391fef 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 57918c95c5..f79fd4f56a 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
 .super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 b8aa062a46..2aa46a9988 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1c679ba529..9480883a2f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetFriendsFindNearby.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
index 8894ef80b9..c4924cecfc 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetFriendsFindNearby.kt"
 
 
 # annotations
@@ -704,7 +705,7 @@
 
     if-nez p1, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
@@ -723,7 +724,6 @@
 
     const v0, 0x7f120063
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
@@ -734,10 +734,10 @@
     return-object v0
 
     :cond_2
-    :goto_1
+    :goto_0
     if-nez p1, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
@@ -756,13 +756,17 @@
 
     const v0, 0x7f12006c
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_4
     return-object v0
 
     :cond_5
-    :goto_2
+    :goto_1
     invoke-virtual {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getContext()Landroid/content/Context;
 
     move-result-object p1
@@ -771,7 +775,11 @@
 
     const v0, 0x7f120068
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_6
     return-object v0
@@ -906,8 +914,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1047,7 +1053,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p1
 
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 cd1d9f9ea9..4f78fedc3e 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lrx/functions/Func7;
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 3b577f8746..3f0d958205 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$getConsideringSelectedChannel$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$getConsideringSelectedChannel$1.smali
index 4b80af466e..0858113d13 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$getConsideringSelectedChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$getConsideringSelectedChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$getConsideringSelectedChannel$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$1.smali
index 1903a54bc0..dcff82435a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$2.smali
index 7ae07ceded..623f9df007 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1$sharedGuilds$2;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1.smali
index cab4281077..4641a885de 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$2.smali
index 74fc8f4c5c..3d8f17f926 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$2;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$3.smali
index aa59349a2e..d045557add 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$4.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$4.smali
index 56d10c3652..fee1f7bffd 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$4.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$toSortedList$4;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
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 a6b2809892..f65aa2b36b 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 
 # annotations
@@ -346,7 +347,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Companion.smali
index 6b7b20c0be..4809bda0da 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Companion;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali
index 7e653ef227..8e5231e69f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty;
 .super Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item;
+.source "WidgetFriendsList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali
index 3a5d4fd540..057ac4e272 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship;
 .super Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item;
+.source "WidgetFriendsList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Suggestion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Suggestion.smali
index 682bd5dc18..53d6a339a3 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Suggestion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Suggestion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Suggestion;
 .super Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item;
+.source "WidgetFriendsList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item.smali
index 42c3115153..c7a5048586 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali
index 89e33d616e..08ef41eb68 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$Model;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 
 # annotations
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 9819b05973..df61993e24 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$addTab$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$1.smali
index e37febb3ab..2d2da9d1b5 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$configure$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lcom/google/android/material/tabs/TabLayout$OnTabSelectedListener;
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 7bf5b3e828..763097bf0c 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$configure$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 022c5065da..e93d2915d1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
index cbb5d11e91..e7a08be73a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$configure$5$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 6e36ce609b..ae84e6af54 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$configure$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$6.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$6.smali
index 8e88171aad..41c8e2243d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$6.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$configure$6;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 75d10f992c..c7976f07ec 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0e9f580cdc..b99f1b73fc 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
index 8e90633864..a78506f59f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/friends/WidgetFriendsList;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetFriendsList.kt"
 
 
 # annotations
@@ -43,7 +44,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -271,6 +272,8 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickIgnoreFriend(Lkotlin/jvm/functions/Function1;)V
 
+    return-void
+
     :cond_7
     return-void
 .end method
@@ -282,9 +285,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->tabs:Lcom/google/android/material/tabs/TabLayout;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
@@ -385,9 +388,12 @@
 
     if-lez v3, :cond_8
 
-    const/4 v1, 0x1
+    goto :goto_3
 
     :cond_8
+    const/4 v1, 0x0
+
+    :goto_3
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->tabBadgeSuggestions:Landroid/widget/TextView;
@@ -406,6 +412,8 @@
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
+    return-void
+
     :cond_9
     return-void
 .end method
@@ -419,8 +427,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -610,6 +616,8 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/main/WidgetMain;->setOnTabsLayoutCreate(Lkotlin/jvm/functions/Function1;)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali
index 2b88c6c8ba..543d19ac70 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetFriendsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty$1.smali
index 2a7a8f37a6..16f4a369b6 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
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 921d07b507..68f367daeb 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty;
 .super Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;
+.source "WidgetFriendsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$1.smali
index 822846851b..32992ec831 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$2.smali
index 850f21b227..3491e3f1e2 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$2;
 .super Ljava/lang/Object;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$3.smali
index 81beb55088..86a3e8dda7 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion$3;
 .super Ljava/lang/Object;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali
index 2dc755d890..f6f2bc1e7f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion;
 .super Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;
+.source "WidgetFriendsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali
index 2af17e11be..630ab049d6 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1;
 .super Ljava/lang/Object;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
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 522f2e947b..0f2a789952 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;
 .super Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;
+.source "WidgetFriendsListAdapter.kt"
 
 
 # annotations
@@ -716,7 +717,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->getItemGame()Landroid/widget/TextView;
@@ -733,6 +734,14 @@
 
     const v5, 0x7f120aa6
 
+    invoke-virtual {v1, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-static {p1, v1, v3, v4, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
+
     goto :goto_2
 
     :pswitch_1
@@ -750,7 +759,6 @@
 
     const v5, 0x7f120834
 
-    :goto_2
     invoke-virtual {v1, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v1
@@ -759,7 +767,7 @@
 
     invoke-static {p1, v1, v3, v4, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
 
-    :goto_3
+    :goto_2
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->getItemAvatar()Landroid/widget/ImageView;
 
     move-result-object v5
@@ -782,7 +790,7 @@
 
     const/4 p1, 0x0
 
-    :goto_4
+    :goto_3
     if-gt p1, v4, :cond_8
 
     invoke-virtual {p2}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship;->getSharedGuilds()Ljava/util/List;
@@ -809,12 +817,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_2
     const/4 v1, 0x0
 
-    :goto_5
+    :goto_4
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->getMutualGuildContainers()Ljava/util/List;
 
     move-result-object v5
@@ -835,22 +843,22 @@
 
     move-result-object v1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_3
     move-object v1, v0
 
-    :goto_6
+    :goto_5
     if-eqz v1, :cond_4
 
     const/4 v1, 0x1
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_4
     const/4 v1, 0x0
 
-    :goto_7
+    :goto_6
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->getMutualGuildIcons()Ljava/util/List;
 
     move-result-object v5
@@ -901,7 +909,7 @@
 
     invoke-static/range {v5 .. v10}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelGuild;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_5
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->getMutualGuildLetters()Ljava/util/List;
@@ -920,25 +928,27 @@
 
     move-result-object v5
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_6
     move-object v5, v0
 
-    :goto_8
+    :goto_7
     check-cast v5, Ljava/lang/CharSequence;
 
     invoke-virtual {v1, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_7
-    :goto_9
+    :goto_8
     add-int/lit8 p1, p1, 0x1
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_8
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x3
         :pswitch_1
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 b6d6e968af..87aa375b7a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ccf32cdc1d..91d482ccde 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickAddFriends$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickIgnoreFriend$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickIgnoreFriend$1.smali
index bea40471b3..44fce5e890 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickIgnoreFriend$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickIgnoreFriend$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickIgnoreFriend$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 da47c05cea..967e20ff34 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetFriendsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali
index ee27cfbcf9..e2581a4dd6 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetFriendsListAdapter.kt"
 
 
 # annotations
@@ -226,7 +227,6 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty;-><init>(Lcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
@@ -236,14 +236,18 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion;-><init>(Lcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_2
     new-instance p1, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;-><init>(Lcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali
index 84334be3db..25edd338c7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsAdd.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali
index 64cb971e71..7409f4fcaa 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsAdd.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali
index bd92eab067..55c7c0279c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsAdd.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 95fa4e8138..fef579cf98 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetGuildActionsAdd.kt"
 
 
 # annotations
@@ -176,8 +177,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -322,6 +321,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundColor(I)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion.smali
index eefe61f006..1c54ee4beb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1$1.smali
index 1445f625f7..dd1e4e07f2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1.smali
index bec19edbf1..69ea44bdc7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali
index 11a08a8a6d..3f767de1f4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Func8;
@@ -71,7 +72,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/List;Ljava/lang/Integer;Ljava/util/Map;Ljava/util/List;Ljava/lang/Boolean;)Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model;
-    .locals 16
+    .locals 15
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -104,15 +105,15 @@
 
     const-string v1, "me"
 
-    move-object/from16 v10, p2
+    move-object/from16 v9, p2
 
-    invoke-static {v10, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "restrictedGuildIds"
 
-    move-object/from16 v11, p7
+    move-object/from16 v10, p7
 
-    invoke-static {v11, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -248,11 +249,11 @@
 
     new-instance v12, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model;
 
-    const/4 v13, 0x0
+    const/4 v11, 0x0
 
-    const/16 v14, 0x100
+    const/16 v13, 0x100
 
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
     move-object v0, v12
 
@@ -264,11 +265,11 @@
 
     move-object/from16 v4, p7
 
-    move v9, v13
+    move v9, v11
 
-    move v10, v14
+    move v10, v13
 
-    move-object v11, v15
+    move-object v11, v14
 
     invoke-direct/range {v0 .. v11}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/List;ZZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
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 baebd0872f..325e4c783e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model.smali
index e9dd30a601..0bfa59617a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 
 # annotations
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 f20e23f3a2..b054abc15d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 eb447c9f02..d2c8576445 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4f7a44014b..33c6a786d1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 25ce22632f..b2a4ec1f19 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$3.smali
index 0bbf4d6917..3874bbe0a9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$3;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 915a2baf44..5803cad0bf 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 38b010cadd..6e82b35d10 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$6.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$6.smali
index cf640649fc..820b160f9b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$6.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$6;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 c62f980d02..9f5c37c040 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$7;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 983296e1fb..c2b1507b5d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$10$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$10$1.smali
index e18951ae8b..06faa10ea4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$10$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$10$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$10$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d0fbcad165..b2202615c2 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$8;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -94,6 +95,8 @@
 
     invoke-virtual {v0, v1, v2, p1}, Lcom/discord/widgets/servers/WidgetServerNotifications$Companion;->launch(JLandroid/content/Context;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$9.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$9.smali
index e5cfd02708..369ae948fb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$9.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$9;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$1.smali
index 84b160b11b..308d582be8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 0465a6ef96..376cdf202f 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2.smali
index 1e940b1787..fd0ba595c7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3$1.smali
index 001423bb4f..905fc3f97f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3.smali
index bcb634e7c5..f96d0a0c36 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$3;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$1.smali
index 6bd7b50b3a..78b4d624d8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2$1.smali
index 650136bc9d..0bce8393c0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali
index 5e4470ba43..2c8e574b06 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildActionsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 c5b2190171..506ed60974 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetGuildActionsSheet.kt"
 
 
 # annotations
@@ -1657,8 +1658,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 ff6093a15b..c9b12505c2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGuildCreate.java"
 
 
 # static fields
@@ -105,8 +106,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateWrap:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/guilds/create/-$$Lambda$WidgetGuildCreate$UgXcfCWNN8D_J8vfCFU5utmUP-s;
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/create/-$$Lambda$WidgetGuildCreate$UgXcfCWNN8D_J8vfCFU5utmUP-s;-><init>(Lcom/discord/widgets/guilds/create/WidgetGuildCreate;)V
@@ -118,8 +117,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateGuidelines:Landroid/widget/TextView;
-
     invoke-direct {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->getCommunityGuidelines()Ljava/lang/CharSequence;
 
     move-result-object v1
@@ -285,9 +282,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->radioManager:Lcom/discord/views/RadioManager;
-
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->er()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eq()Landroid/widget/Checkable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate_ViewBinding.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate_ViewBinding.smali
index 164b3b9ae0..1ca9ecd134 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/create/WidgetGuildCreate_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetGuildCreate_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali
index 3c9f0e0ae9..e405954e90 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
 .super Ljava/lang/Object;
+.source "InviteGenerator.kt"
 
 
 # annotations
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 7581bbacfb..00e1f3b7b3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/InviteGenerator$generate$1;
 .super Lkotlin/jvm/internal/i;
+.source "InviteGenerator.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$2.smali
index 2687f42ea2..5d491a61c4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/InviteGenerator$generate$2;
 .super Ljava/lang/Object;
+.source "InviteGenerator.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 2e23ec1d14..e595b8529f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/InviteGenerator;
 .super Ljava/lang/Object;
+.source "InviteGenerator.kt"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -59,7 +60,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali
index bf2568a42a..2ba69ed02d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1;
 .super Lkotlin/jvm/internal/i;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali
index 3da29096a6..07d61a1ea3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2;
 .super Lkotlin/jvm/internal/i;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6645a252fc..43cbeca702 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;
 .super Landroid/widget/ArrayAdapter;
+.source "ViewInviteSettingsSheet.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali
index b063e65aee..d58b485031 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10;
 .super Ljava/lang/Object;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali
index ca6b529626..3b4ef5db0b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;
 .super Ljava/lang/Object;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Landroid/widget/RadioGroup$OnCheckedChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali
index 30692a5c1d..b09e8c4c8e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;
 .super Ljava/lang/Object;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Landroid/widget/RadioGroup$OnCheckedChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali
index 31f72d4db3..56e9d6ab15 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;
 .super Ljava/lang/Object;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 9cdb2568c8..0d18543395 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;
 .super Lkotlin/jvm/internal/k;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali
index 41e042769d..f966c0d8ac 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;
 .super Ljava/lang/Object;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemSelectedListener;
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 57556bf7b3..aed79802cb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1;
 .super Lkotlin/jvm/internal/k;
+.source "ViewInviteSettingsSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f3bb61f6cd..f227e3988d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 .super Landroidx/core/widget/NestedScrollView;
+.source "ViewInviteSettingsSheet.kt"
 
 
 # annotations
@@ -1093,8 +1094,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1590,6 +1589,8 @@
     invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final getOnGenerateLinkListener()Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali
index f1ced9fe89..0475cabb4b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildInvite.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$1.smali
index 249c72e448..6e255cef0c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$2.smali
index 33546b6c58..55adc01d2c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.smali
index a79e602be2..8083c4fb39 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali
index 2bd8b586fc..a10e091c0d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildInvite.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBound$1.smali
index 4d7a04aa60..194ef7380e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 a7cb14fd81..780656136f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$2.smali
index f3002d586e..63e494412e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 da335104c9..9a6d208910 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGuildInvite.kt"
 
 
 # annotations
@@ -487,9 +488,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->inviteState:Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;
-
-    invoke-static {p1}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
+    invoke-static {v0}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
@@ -645,8 +644,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem.smali
index f673747e34..794bad7145 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1.smali
index 7167db5db6..cf750c0e11 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali
index b72853a6b3..3eecbd9ef9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 
 # annotations
@@ -72,7 +73,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali
index 866a504ae0..2414940fa5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 38cba8b155..4a631f932b 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetGuildInviteShare.kt"
 
 
 # annotations
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 b1bc84d2f8..3f959bec23 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali
index 10cfe35496..48ed106244 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetGuildInviteShare.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali
index aa1bb254bd..34e35a72a1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 6e94a24b99..ae5277c778 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali
index ba8277ee4a..d6554cccc7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali
index 1fa7546e93..b834b993af 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -58,9 +59,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting;
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting;
 
     move-result-object v1
 
@@ -123,6 +122,8 @@
 
     invoke-virtual {p1, v2, v0, v1}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generate(Lcom/discord/app/AppFragment;J)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali
index 538658f326..ed4691edaa 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1.smali
index 7147469604..bdcf127bad 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2.smali
index f69f4a1d93..7360edecbb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3.smali
index fb07319e5c..8308c5bd3c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4.smali
index 0b1eb01255..89f481efef 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4;
 .super Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
+.source "WidgetGuildInviteShare.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali
index 549fa32eec..c8155e3da8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
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 c0d11b3187..fd34b936c8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$3.smali
index 1f6bf339fa..2d17413f03 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$4.smali
index 8a48605f73..fe3a3517d9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$5.smali
index cad6150cdb..eb22239e32 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$5;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 91ded11247..46a0fd6665 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2.smali
index 6000b7a1ef..132ab84158 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 c89ee2d655..5fc86e3e70 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildInviteShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 25fa3b8d26..647cf62ae6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGuildInviteShare.kt"
 
 
 # annotations
@@ -1588,6 +1589,8 @@
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1613,8 +1616,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1979,7 +1980,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.smali
index 8799b10906..36e401e75f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1;
 .super Ljava/lang/Object;
+.source "WidgetInviteInfo.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -68,8 +69,6 @@
 
     iput v2, v1, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    iget v2, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1;->$size:I
-
     iput v2, v1, Landroid/view/ViewGroup$LayoutParams;->width:I
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
@@ -99,8 +98,6 @@
 
     iput v2, v1, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    iget v2, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1;->$userSize:I
-
     iput v2, v1, Landroid/view/ViewGroup$LayoutParams;->width:I
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)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 7fea5e6345..36968f427a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 .super Landroidx/appcompat/widget/LinearLayoutCompat;
+.source "WidgetInviteInfo.kt"
 
 
 # static fields
@@ -970,7 +971,6 @@
 
     move-result-object p1
 
-    :goto_0
     check-cast p1, Ljava/lang/CharSequence;
 
     invoke-static {p1}, Lcom/discord/simpleast/core/a/b;->a(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
@@ -996,7 +996,15 @@
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-static {p1}, Lcom/discord/simpleast/core/a/b;->a(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    return-object p1
 .end method
 
 .method private final getIntroTextForGroup(Ljava/lang/String;Z)Ljava/lang/CharSequence;
@@ -1018,7 +1026,6 @@
 
     move-result-object p1
 
-    :goto_0
     check-cast p1, Ljava/lang/CharSequence;
 
     invoke-static {p1}, Lcom/discord/simpleast/core/a/b;->a(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
@@ -1036,7 +1043,15 @@
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-static {p1}, Lcom/discord/simpleast/core/a/b;->a(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    return-object p1
 .end method
 
 .method private final getInviteMessage()Landroid/widget/TextView;
@@ -1295,8 +1310,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1.smali
index f53a19a4b0..220e8608f2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetInviteModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali
index 601448d810..3321078e47 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetInviteModel.kt"
 
 
 # annotations
@@ -95,13 +96,11 @@
 
     move-result-object p2
 
-    :goto_0
     check-cast p2, Lcom/discord/models/domain/ModelChannel;
 
-    :goto_1
     move-object v1, p2
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
@@ -114,14 +113,18 @@
 
     move-result-object p2
 
+    check-cast p2, Lcom/discord/models/domain/ModelChannel;
+
+    move-object v1, p2
+
     goto :goto_0
 
     :cond_1
     const/4 p2, 0x0
 
-    goto :goto_1
+    move-object v1, p2
 
-    :goto_2
+    :goto_0
     if-eqz v3, :cond_2
 
     if-eqz v1, :cond_2
@@ -156,12 +159,12 @@
 
     const/4 v5, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_2
     const/4 v5, 0x0
 
-    :goto_3
+    :goto_1
     new-instance p2, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
     invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->isGenerating()Z
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
index 6a2896250c..7e804af2b2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 .super Ljava/lang/Object;
+.source "WidgetInviteModel.kt"
 
 
 # annotations
@@ -99,47 +100,47 @@
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 11
+    .locals 10
 
-    and-int/lit8 v1, p8, 0x8
+    and-int/lit8 v0, p8, 0x8
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     goto :goto_0
 
     :cond_0
-    move v7, p4
+    move v6, p4
 
     :goto_0
     and-int/lit8 v0, p8, 0x10
 
     if-eqz v0, :cond_1
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
     goto :goto_1
 
     :cond_1
-    move/from16 v8, p5
+    move v7, p5
 
     :goto_1
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object v4, p1
+    move-object v3, p1
 
-    move-object v5, p2
+    move-object v4, p2
 
-    move-object v6, p3
+    move-object v5, p3
 
-    move-object/from16 v9, p6
+    move-object/from16 v8, p6
 
-    move-object/from16 v10, p7
+    move-object/from16 v9, p7
 
-    invoke-direct/range {v3 .. v10}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali
index 4335db976c..68845a82ea 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/join/WidgetGuildJoin$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildJoin.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton$onActivityCreated$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton$onActivityCreated$1.smali
index bf307b2834..2bba54752f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton$onActivityCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton$onActivityCreated$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton$onActivityCreated$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildJoin.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 7f97274eac..8ad20e16f7 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton;
 .super Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
+.source "WidgetGuildJoin.kt"
 
 
 # annotations
@@ -35,8 +36,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -143,6 +142,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/Window;->setSoftInputMode(I)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$handleGuildJoin$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$handleGuildJoin$1.smali
index 87b35ef8af..05f0320ecd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$handleGuildJoin$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$handleGuildJoin$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/join/WidgetGuildJoin$handleGuildJoin$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildJoin.kt"
 
 # interfaces
 .implements Landroid/view/MenuItem$OnMenuItemClickListener;
@@ -38,9 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$handleGuildJoin$1;->this$0:Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$handleGuildJoin$1;->this$0:Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;->getGuildJoinInvite()Landroid/widget/EditText;
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;->getGuildJoinInvite()Landroid/widget/EditText;
 
     move-result-object v0
 
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 300a91bc69..efa0928772 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildJoin.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6a039c54a1..6ad8cc31d6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGuildJoin.kt"
 
 
 # annotations
@@ -93,8 +94,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -207,6 +206,8 @@
 
     invoke-interface {p1, v0}, Landroid/view/MenuItem;->setOnMenuItemClickListener(Landroid/view/MenuItem$OnMenuItemClickListener;)Landroid/view/MenuItem;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali
index 5701454cf8..e035c5abc2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali
index 5d42422404..431a38143c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali
index 5280f6a345..8a0228c78b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3;
 .super Ljava/lang/Object;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali
index 3cde5706fd..71bb3e4a03 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali
index 626629b4f3..368dc0bc7a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildsList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint.smali
index 60e375e6a3..3f5c5873ef 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;
 .super Ljava/lang/Object;
+.source "WidgetGuildsList.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureGuildHint$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureGuildHint$1.smali
index b7c7dee68a..55815bc16f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureGuildHint$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureGuildHint$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$configureGuildHint$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali
index 6d1385fa8c..41fc657ae7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
@@ -80,7 +81,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     sget-object v0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->Companion:Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;
@@ -101,17 +102,14 @@
 
     move-result-wide p1
 
-    :goto_0
-    move-wide v2, p1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 p1, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v2, p1
 
-    :goto_1
     const/4 v4, 0x0
 
     const/4 v5, 0x4
@@ -120,7 +118,7 @@
 
     invoke-static/range {v0 .. v6}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;->show$default(Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;Landroidx/fragment/app/Fragment;JZILjava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_1
     sget-object p1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion;
@@ -137,7 +135,9 @@
 
     invoke-virtual {p1, p2, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion;->show(Landroidx/fragment/app/FragmentManager;J)V
 
-    :goto_2
+    return-void
+
+    :goto_1
     return-void
 
     :pswitch_data_0
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 a86bd98803..5c3ecf3720 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3$1.smali
index c2b572cf87..4e2cecc095 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3.smali
index 18d69ae667..22b0a5effb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -82,6 +83,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$1.smali
index a72a4b9736..d896e93291 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$2.smali
index a3f9b075f5..7e19024ae2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$3.smali
index 839dc828a9..d6e90782e3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBoundOrOnResume$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsList.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 105e4a2b09..4efc1399cd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGuildsList.kt"
 
 
 # annotations
@@ -271,6 +272,8 @@
 
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeIn$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_6
     return-void
 .end method
@@ -280,7 +283,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->guildListAddHint:Landroid/view/View;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
 
@@ -309,6 +312,9 @@
 
     :cond_1
     return-void
+
+    :cond_2
+    return-void
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/guilds/list/WidgetGuildsListModel;)V
@@ -387,8 +393,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -611,6 +615,8 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/main/WidgetMain;->setOnGuildListAddHintCreate(Lkotlin/jvm/functions/Function1;)V
 
+    return-void
+
     :cond_6
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$1.smali
index 508b77aae7..103fb20789 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$2.smali
index c27fa2781d..de4d2849d9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item$2;
 .super Ljava/lang/Object;
+.source "WidgetGuildsListAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali
index 39d2cebe86..e03eb5776e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDirectMessage.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDirectMessage.smali
index 4298b6d048..177c874e21 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDirectMessage.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDirectMessage.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDirectMessage;
 .super Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDivider.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDivider.smali
index c1e389bb9b..2fe6db48fe 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDivider.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDivider.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDivider;
 .super Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuild.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuild.smali
index f183f4be8c..d4e1daa683 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuild.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuild.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuild;
 .super Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildCreate.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildCreate.smali
index 011b1cb1d8..2258b6ced6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildCreate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildCreate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildCreate;
 .super Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildUnavailable.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildUnavailable.smali
index 10f44094c3..d8f8ad4c7c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildUnavailable.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildUnavailable.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildUnavailable;
 .super Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemProfile.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemProfile.smali
index 9070a382fe..0c908bcbf5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemProfile.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemProfile.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemProfile;
 .super Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onClickListener$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onClickListener$1.smali
index 4e85dae72e..df3d475d42 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onClickListener$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$onClickListener$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onLongClickListener$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onLongClickListener$1.smali
index 1b2289f1c1..9c7298e6ad 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onLongClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$onLongClickListener$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$onLongClickListener$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter.smali
index 67bb93d9bc..4027829627 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetGuildsListAdapter.kt"
 
 
 # annotations
@@ -231,7 +232,6 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter;->holderGuildCreate:Ljava/lang/ref/WeakReference;
 
-    :goto_1
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
@@ -245,15 +245,17 @@
 
     const p2, 0x7f0d010b
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const p2, 0x7f0d010a
 
-    :goto_2
+    :goto_1
     invoke-direct {p1, p0, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuildUnavailable;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter;I)V
 
-    goto :goto_1
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_2
     new-instance p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuild;
@@ -264,15 +266,17 @@
 
     const p2, 0x7f0d0107
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const p2, 0x7f0d010c
 
-    :goto_3
+    :goto_2
     invoke-direct {p1, p0, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemGuild;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter;I)V
 
-    goto :goto_1
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_3
     new-instance p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDirectMessage;
@@ -283,15 +287,17 @@
 
     const p2, 0x7f0d0104
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const p2, 0x7f0d0105
 
-    :goto_4
+    :goto_3
     invoke-direct {p1, p0, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDirectMessage;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter;I)V
 
-    goto :goto_1
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_4
     new-instance p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDivider;
@@ -302,15 +308,17 @@
 
     const p2, 0x7f0d0102
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_4
     const p2, 0x7f0d0101
 
-    :goto_5
+    :goto_4
     invoke-direct {p1, p0, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemDivider;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter;I)V
 
-    goto :goto_1
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_5
     new-instance p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemProfile;
@@ -321,15 +329,17 @@
 
     const p2, 0x7f0d010e
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_5
     const p2, 0x7f0d010d
 
-    :goto_6
+    :goto_5
     invoke-direct {p1, p0, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter$ItemProfile;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListAdapter;I)V
 
-    goto :goto_1
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$1.smali
index a385b4dacd..ab4ff2d761 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$2.smali
index f6fa94ffe1..edacaa8275 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asDirectMessageItems$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asGuildItems$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asGuildItems$1.smali
index d3e7326a5a..1b78839dbf 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asGuildItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asGuildItems$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asGuildItems$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -213,7 +214,7 @@
     const/4 v9, 0x0
 
     :goto_3
-    if-nez v9, :cond_8
+    if-nez v9, :cond_9
 
     iget-wide v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$asGuildItems$1;->$selectedVoiceChannelId:J
 
@@ -221,9 +222,9 @@
 
     cmp-long v4, v0, v10
 
-    if-lez v4, :cond_8
+    if-lez v4, :cond_9
 
-    if-eqz v2, :cond_8
+    if-eqz v2, :cond_9
 
     check-cast v2, Ljava/lang/Iterable;
 
@@ -239,7 +240,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_8
+    if-nez v0, :cond_9
 
     :cond_5
     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
@@ -286,6 +287,11 @@
     :cond_8
     const/4 v10, 0x0
 
+    goto :goto_5
+
+    :cond_9
+    const/4 v10, 0x0
+
     :goto_5
     sget-object v5, Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Item;->Companion:Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Item$Companion;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$$inlined$sortedByDescending$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$$inlined$sortedByDescending$1.smali
index 1778056bf3..cdc4f21b6c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$$inlined$sortedByDescending$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$$inlined$sortedByDescending$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$$inlined$sortedByDescending$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$guildItems$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$guildItems$1.smali
index 0316be4bbe..6b00cab4c7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$guildItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$guildItems$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$createForGlobalSearch$guildItems$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGuildsListModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$get$1.smali
index 9dc740d5d4..2eedd3ed82 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetGuildsListModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func9;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion.smali
index 6590cea5e9..7fda004bb3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildsListModel.kt"
 
 
 # annotations
@@ -495,7 +496,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v6
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item$Companion.smali
index eb9540f602..099507aab7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Item$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGuildsListModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item.smali
index 78900fd59d..5d8511673e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel$Item.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Item;
 .super Ljava/lang/Object;
+.source "WidgetGuildsListModel.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel.smali
index 30f4d85245..e6bfdc4c3c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListModel;
 .super Ljava/lang/Object;
+.source "WidgetGuildsListModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild.smali
index 69a357ccb8..fa056f53f2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetGuildManagement.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder;
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild_ViewBinding.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild_ViewBinding.smali
index 299a343a64..184eca4ce4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemGuild_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetGuildManagement$Adapter$ItemGuild_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemHeader.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemHeader.smali
index 565fca5c46..51c79c3bad 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemHeader.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/management/WidgetGuildManagement$Adapter$ItemHeader;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetGuildManagement.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder;
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter.smali
index 6feb6f43c7..62d49325f6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Adapter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/management/WidgetGuildManagement$Adapter;
 .super Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;
+.source "WidgetGuildManagement.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$GuildItem.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$GuildItem.smali
index b71e116861..a3e71041ab 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$GuildItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$GuildItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/guilds/management/WidgetGuildManagement$Model$GuildItem;
 .super Ljava/lang/Object;
+.source "WidgetGuildManagement.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropAdapter$Payload;
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$HeaderItem.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$HeaderItem.smali
index 814042fd73..f544364b6b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$HeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model$HeaderItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/guilds/management/WidgetGuildManagement$Model$HeaderItem;
 .super Ljava/lang/Object;
+.source "WidgetGuildManagement.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropAdapter$Payload;
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model.smali
index 66442dd55d..985c37e7e1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/guilds/management/WidgetGuildManagement$Model;
 .super Ljava/lang/Object;
+.source "WidgetGuildManagement.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali
index 682cc34d58..2955144a1d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/management/WidgetGuildManagement;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGuildManagement.java"
 
 
 # annotations
@@ -66,8 +67,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->guildAddButton:Landroid/view/View;
-
     new-instance v0, Lcom/discord/widgets/guilds/management/-$$Lambda$WidgetGuildManagement$2qV6bw0EG7SHAYjcO_gohK9VBsQ;
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/management/-$$Lambda$WidgetGuildManagement$2qV6bw0EG7SHAYjcO_gohK9VBsQ;-><init>(Lcom/discord/widgets/guilds/management/WidgetGuildManagement;)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement_ViewBinding.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement_ViewBinding.smali
index 393546f855..385e77e7a5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/guilds/management/WidgetGuildManagement_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetGuildManagement_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$Companion.smali
index f7e152fca1..d47e9d065f 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMain$Companion;
 .super Ljava/lang/Object;
+.source "WidgetMain.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1$1.smali
index 4e24a2783f..807c4dab27 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureEnabledAction$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1.smali
index 26d5167b68..bb93303f99 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureEnabledAction$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureEnabledAction$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 02df7cbcb7..924d3b883d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureFirstOpen$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2$1.smali
index 1e887ebdde..60f626d8e6 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureFirstOpen$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 2bd32541db..19f3aa62ad 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureFirstOpen$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 7dd5811ee2..cfc7babfd6 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureFirstOpen$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 692cce0d20..32d7d4e501 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureNavigationDrawerAction$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 7b233dde8e..7be14ef153 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$configureOpenDrawerAction$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ea80463508..5bd2c953f9 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$onGuildListAddHintCreate$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 5f6f08f0a1..f75641c0cc 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$onTabsLayoutCreate$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBound$2.smali
index 5a0aade553..f9b1be346e 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
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 5683b5aef3..b838ac30b9 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali
index b30e8e3ac2..9cd2eeaa89 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
 .super Ljava/lang/Object;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 8d91bcfc31..f3b247801d 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMain.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
index 1329b637d3..f31d7421ae 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMain;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetMain.kt"
 
 
 # annotations
@@ -228,7 +229,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->unreadCountView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Ml()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Mk()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -555,6 +556,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/main/WidgetMainPanelNoChannels;->configureUI(Lcom/discord/widgets/main/WidgetMainModel;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -705,8 +708,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -871,6 +872,8 @@
 
     invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainPanelNsfw;->unbind()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle$Companion.smali
index 448a96c851..a44c6afeac 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle$Companion;
 .super Ljava/lang/Object;
+.source "WidgetMainDrawerLayout.kt"
 
 
 # annotations
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 e78e9bfac3..d4460ec353 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle;
 .super Landroidx/appcompat/app/ActionBarDrawerToggle;
+.source "WidgetMainDrawerLayout.kt"
 
 
 # annotations
@@ -139,6 +140,8 @@
     :goto_0
     invoke-virtual {p1, p2}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali
index c9fec73dde..9452b78ac7 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainDrawerLayout;
 .super Landroidx/drawerlayout/widget/DrawerLayout;
+.source "WidgetMainDrawerLayout.kt"
 
 
 # annotations
@@ -120,8 +121,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainDrawerLayout;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -232,6 +231,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
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 0d68c918b1..8e4ff085b8 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetMainHeaderManager.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 0b8496f2d3..42f0888850 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1;
 .super Ljava/lang/Object;
+.source "WidgetMainHeaderManager.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -80,12 +81,11 @@
 
     const-string v3, "menu.findItem(R.id.menu_chat_start_group)"
 
-    :goto_0
     invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1;->$this_getOnConfigureAction:Lcom/discord/widgets/main/WidgetMainModel;
@@ -116,10 +116,12 @@
 
     const-string v3, "menu.findItem(R.id.menu_chat_pins)"
 
-    goto :goto_0
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v0, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1;->$this_getOnConfigureAction:Lcom/discord/widgets/main/WidgetMainModel;
 
     invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainModel;->getType()I
@@ -134,7 +136,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_0
     const v0, 0x7f0a037e
@@ -167,7 +169,11 @@
 
     const-string v5, "menu.findItem(R.id.menu_chat_search)"
 
-    goto :goto_2
+    invoke-static {v0, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v0, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+    goto :goto_1
 
     :pswitch_1
     const v0, 0x7f0a0379
@@ -202,12 +208,11 @@
 
     const-string v5, "menu.findItem(R.id.menu_chat_side_panel)"
 
-    :goto_2
     invoke-static {v0, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_2
     const v0, 0x7f0a037f
@@ -230,9 +235,11 @@
 
     const-string v5, "menu.findItem(R.id.menu_chat_group_settings)"
 
-    goto :goto_2
+    invoke-static {v0, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :goto_3
+    invoke-interface {v0, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+    :goto_1
     iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1;->$this_getOnConfigureAction:Lcom/discord/widgets/main/WidgetMainModel;
 
     invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainModel;->getType()I
@@ -314,12 +321,12 @@
     :cond_7
     const/4 v0, 0x1
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_8
     const/4 v0, 0x0
 
-    :goto_4
+    :goto_2
     const v3, 0x7f0a0384
 
     invoke-interface {p1, v3}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
@@ -342,12 +349,12 @@
 
     const/4 v4, 0x1
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_9
     const/4 v4, 0x0
 
-    :goto_5
+    :goto_3
     invoke-interface {v3, v4}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
     const v3, 0x7f0a0386
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 3300c06bfa..56de42bc83 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;
 .super Ljava/lang/Object;
+.source "WidgetMainHeaderManager.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
index f06fe0bb26..461a51cf11 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainHeaderManager;
 .super Ljava/lang/Object;
+.source "WidgetMainHeaderManager.kt"
 
 
 # static fields
@@ -124,23 +125,26 @@
 
     move-result-object v2
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const p1, 0x7f12032d
 
+    invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
     goto :goto_0
 
     :pswitch_1
     const p1, 0x7f1205ae
 
-    :goto_0
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
     :cond_0
-    :goto_1
+    :goto_0
     check-cast v2, Ljava/lang/CharSequence;
 
     return-object v2
@@ -425,6 +429,8 @@
 
     invoke-static {v0, p1, v1, p2, v1}, Lcom/discord/utilities/presence/PresenceUtils;->setPresence$default(Lcom/discord/models/domain/ModelPresence;Landroid/widget/ImageView;Landroid/widget/TextView;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_7
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion$get$1.smali
index 2dcc84ff15..7d3ebdbda8 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainModel$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetMainModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func7;
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 837586acbc..0a0fb6142b 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainModel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetMainModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali
index 1b073ea0b4..1ffe7455fb 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainModel;
 .super Ljava/lang/Object;
+.source "WidgetMainModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$Companion.smali
index 4abd00a42c..84f5de4115 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainPanelLoading$Companion;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelLoading.kt"
 
 
 # annotations
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 644b56437a..cf78e60b10 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainPanelLoading$configure$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMainPanelLoading.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali
index e252ae08e3..480a726daf 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainPanelLoading;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelLoading.kt"
 
 
 # annotations
@@ -82,33 +83,33 @@
 .end method
 
 .method private final setLoadingPanelVisibility(ZZ)V
-    .locals 18
+    .locals 17
 
     move-object/from16 v0, p0
 
-    iget-object v2, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelCenter:Landroid/view/View;
+    iget-object v1, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelCenter:Landroid/view/View;
 
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v2}, Landroid/view/View;->getVisibility()I
+    invoke-virtual {v1}, Landroid/view/View;->getVisibility()I
 
-    move-result v2
+    move-result v1
 
-    if-ne v2, v3, :cond_0
+    if-ne v1, v2, :cond_0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    if-nez v2, :cond_1
+    if-nez v1, :cond_1
 
     if-eqz p1, :cond_1
 
@@ -121,31 +122,31 @@
 
     if-eqz p2, :cond_2
 
-    iget-object v5, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelLoading:Landroid/view/View;
+    iget-object v4, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelLoading:Landroid/view/View;
 
-    const-wide/16 v6, 0x0
+    const-wide/16 v5, 0x0
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    const/4 v9, 0x3
+    const/4 v8, 0x3
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
-    invoke-static/range {v5 .. v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeOut$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v4 .. v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeOut$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
-    iget-object v11, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelCenter:Landroid/view/View;
+    iget-object v10, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelCenter:Landroid/view/View;
 
-    const-wide/16 v12, 0x0
+    const-wide/16 v11, 0x0
+
+    const/4 v13, 0x0
 
     const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/4 v15, 0x7
 
-    const/16 v16, 0x7
+    const/16 v16, 0x0
 
-    const/16 v17, 0x0
-
-    invoke-static/range {v11 .. v17}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeIn$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeIn$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     goto :goto_1
 
@@ -154,14 +155,14 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     :cond_3
     iget-object v1, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelCenter:Landroid/view/View;
 
     if-eqz v1, :cond_4
 
-    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
 
     :cond_4
     :goto_1
@@ -182,31 +183,31 @@
 
     move-result-object v1
 
-    const-string v2, "view.resources"
+    const-string v4, "view.resources"
 
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/display/DisplayUtils;->hasNavigationBar(Landroid/content/res/Resources;)Z
 
     move-result v1
 
-    iget-object v2, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->view:Landroid/view/View;
+    iget-object v4, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->view:Landroid/view/View;
 
-    invoke-virtual {v2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v4}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v4
 
     const-string v5, "view.resources"
 
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lcom/discord/utilities/display/DisplayUtils;->getStatusBarHeight(Landroid/content/res/Resources;)I
+    invoke-static {v4}, Lcom/discord/utilities/display/DisplayUtils;->getStatusBarHeight(Landroid/content/res/Resources;)I
 
-    move-result v2
+    move-result v4
 
     if-eqz v1, :cond_6
 
-    move v5, v2
+    move v5, v4
 
     goto :goto_2
 
@@ -219,28 +220,30 @@
     goto :goto_3
 
     :cond_7
-    const/4 v2, 0x0
+    const/4 v4, 0x0
 
     :goto_3
     iget-object v1, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelCenter:Landroid/view/View;
 
     if-eqz v1, :cond_8
 
-    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     :cond_8
     iget-object v1, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelLoading:Landroid/view/View;
 
     if-eqz v1, :cond_9
 
-    invoke-virtual {v1, v4, v5, v4, v2}, Landroid/view/View;->setPadding(IIII)V
+    invoke-virtual {v1, v3, v5, v3, v4}, Landroid/view/View;->setPadding(IIII)V
 
     :cond_9
     iget-object v1, v0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->panelLoading:Landroid/view/View;
 
     if-eqz v1, :cond_a
 
-    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
 
     :cond_a
     return-void
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
index db5101a7c1..abee697041 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainPanelNoChannels;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelNoChannels.kt"
 
 
 # instance fields
@@ -171,6 +172,8 @@
 
     invoke-static/range {v8 .. v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeOut$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_6
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$Companion.smali
index f2135bf76c..7837d89d0f 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$Companion.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainPanelNsfw$Companion;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelNsfw.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali
index e06104f670..4979d9b532 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelNsfw.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali
index 96e22a777d..4375cace89 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelNsfw.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$guildsNsfwHideRunnable$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$guildsNsfwHideRunnable$1.smali
index a23b032ba7..e851d3c1aa 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$guildsNsfwHideRunnable$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$guildsNsfwHideRunnable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainPanelNsfw$guildsNsfwHideRunnable$1;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelNsfw.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali
index 602dc779fe..212121af17 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainPanelNsfw;
 .super Ljava/lang/Object;
+.source "WidgetMainPanelNsfw.kt"
 
 
 # annotations
@@ -350,6 +351,8 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion$SURVEY_URL$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion$SURVEY_URL$1.smali
index 2a964bea38..053e70b597 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion$SURVEY_URL$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion$SURVEY_URL$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainSurveyDialog$Companion$SURVEY_URL$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMainSurveyDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ae851584ff..e85ffe84f4 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainSurveyDialog$Companion;
 .super Ljava/lang/Object;
+.source "WidgetMainSurveyDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$1.smali
index b003b67f2d..a6e2815459 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetMainSurveyDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2$1.smali
index 76cc417b98..fb4f601fb8 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMainSurveyDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2.smali
index 3db13e74d3..c66ad0f66e 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/main/WidgetMainSurveyDialog$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetMainSurveyDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
index e38300e5f4..ff552ef0f9 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/main/WidgetMainSurveyDialog;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetMainSurveyDialog.kt"
 
 
 # annotations
@@ -299,8 +300,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
index ae1362667a..27272ce684 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/media/WidgetMedia$Companion;
 .super Ljava/lang/Object;
+.source "WidgetMedia.kt"
 
 
 # annotations
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 7beda20d16..22ac67d396 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3af950c206..88ad680fa1 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali
index 381156bdce..e76f1ec82d 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1;
 .super Ljava/lang/Object;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
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 e09fd2db00..8dbbce8cb0 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
@@ -124,10 +125,10 @@
 
     invoke-static {p2, p1, v1, v0, v1}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x7f0a0396
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$2.smali
index 12a5b99536..b6c696b385 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$2;
 .super Ljava/lang/Object;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Landroid/media/MediaPlayer$OnCompletionListener;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$3.smali
index a9a1b9fe15..aea0edc4bc 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$3;
 .super Ljava/lang/Object;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Landroid/media/MediaPlayer$OnPreparedListener;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$1.smali
index afa9e64e7a..0294780a4f 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$startVideo$1;
 .super Ljava/lang/Object;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Landroid/media/MediaPlayer$OnInfoListener;
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 3f2fd74286..5b26096aed 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/media/WidgetMedia$startVideo$2;
 .super Ljava/lang/Object;
+.source "WidgetMedia.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
index 43910def27..f65c2c52e3 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/media/WidgetMedia;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetMedia.kt"
 
 
 # annotations
@@ -355,8 +356,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali
index 54aabecdfe..b36ef3ee7c 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;
 .super Landroid/text/method/LinkMovementMethod;
+.source "WidgetNoticeDialog.kt"
 
 
 # annotations
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 f3decf5803..86d2886c9a 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d3408ebedf..684ea9da48 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 4d3d045af1..a96f129dc1 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6d91e23804..8bca5a9f5f 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b4173a4bb6..41e96d8dcd 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 c6ab583472..df11e3d41b 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 d57e87123f..10aa3ee903 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 .super Ljava/lang/Object;
+.source "WidgetNoticeDialog.kt"
 
 
 # annotations
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 7fc8cbb5ce..ea8779231f 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 .super Ljava/lang/Object;
+.source "WidgetNoticeDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1.smali
index 6e805feb4f..ab02101db6 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$4.smali
index 0235e405dd..645b7550b3 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$6.smali
index 473ecd8436..3e5dff72cd 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$6;
 .super Ljava/lang/Object;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$7.smali
index 9df1f9af68..1814be2fc5 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$7;
 .super Ljava/lang/Object;
+.source "WidgetNoticeDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
index 483f5d3165..b42a65864e 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetNoticeDialog.kt"
 
 
 # annotations
@@ -570,8 +571,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1006,7 +1005,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->listenerMap:Ljava/util/Map;
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_c
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1058,6 +1057,9 @@
 
     :cond_b
     return-void
+
+    :cond_c
+    return-void
 .end method
 
 .method public final setListenerMap(Ljava/util/Map;)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 7e0432280f..6d028e1a6f 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali
index 0cf1d5314c..d212aa14b7 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali
index 6f099865e3..67034f56d6 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali
index 7dd1227f23..d8d5036457 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopup.kt"
 
 
 # annotations
@@ -119,9 +120,14 @@
 
     const/4 p4, 0x0
 
+    move-object v4, p4
+
+    goto :goto_0
+
     :cond_0
     move-object v4, p4
 
+    :goto_0
     and-int/lit8 p4, p7, 0x10
 
     if-eqz p4, :cond_1
@@ -130,12 +136,12 @@
 
     const/4 v5, 0x5
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     move v5, p5
 
-    :goto_0
+    :goto_1
     move-object v0, p0
 
     move-object v1, p1
@@ -240,9 +246,14 @@
 
     const/4 p4, 0x0
 
+    move-object v4, p4
+
+    goto :goto_0
+
     :cond_0
     move-object v4, p4
 
+    :goto_0
     and-int/lit8 p4, p7, 0x10
 
     if-eqz p4, :cond_1
@@ -251,12 +262,12 @@
 
     const/4 v5, 0x5
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     move v5, p5
 
-    :goto_0
+    :goto_1
     move-object v0, p0
 
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali
index e0ee864716..b7917d3fc7 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$2.smali
index 7e42e2a49f..7f99a909b7 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Landroid/animation/Animator$AnimatorListener;
@@ -48,6 +49,8 @@
 
     invoke-virtual {p1, v0}, Landroid/animation/Animator;->removeListener(Landroid/animation/Animator$AnimatorListener;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali
index 57bf087356..732a9b57f4 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$name$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 df32d9e782..c2cb9b95c7 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onClick$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$onClick$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali
index 2f6cf6d1d0..6e502551ac 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1;
 .super Landroid/text/method/LinkMovementMethod;
+.source "WidgetNoticePopup.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$2.smali
index cd0b445ec2..e7f7557183 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali
index 658f0a3c8a..b2d910a4ac 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali
index 92f8489cef..461983473f 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopup$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopup.kt"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
index 44109b9e94..7ce418bc29 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/notice/WidgetNoticePopup;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetNoticePopup.kt"
 
 
 # annotations
@@ -418,6 +419,8 @@
 
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->start()V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -481,8 +484,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -569,7 +570,11 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -948,6 +953,8 @@
 
     invoke-virtual {v0, v1, v2}, Landroid/view/Window;->setLayout(II)V
 
+    return-void
+
     :cond_3
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali
index 743594f5ec..aef81abf29 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopupChannel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 f62784463a..2ed22a0a53 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetNoticePopupChannel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6987ad2d13..3a30ecaecb 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopupChannel.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali
index ba865549b3..5073f488df 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopupChannel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali
index efad6db11f..986cd7fa52 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopupChannel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali
index 947ed4689f..f3b10b9085 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopupChannel.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -54,7 +55,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_0
+    if-nez v0, :cond_1
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1;->this$0:Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
 
@@ -84,8 +85,12 @@
 
     invoke-static {v0, p1, v1, v2}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;->access$openChannelNotificationSettings(Lcom/discord/widgets/notice/WidgetNoticePopupChannel;Landroid/content/Context;J)V
 
-    nop
+    goto :goto_0
 
     :cond_0
     return-void
+
+    :cond_1
+    :goto_0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali
index d2786b8baf..0ee854b9da 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopupChannel.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
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 004539519f..372db3b9f8 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetNoticePopupChannel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali
index 2c9e719f13..6522baef79 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1;
 .super Ljava/lang/Object;
+.source "WidgetNoticePopupChannel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
index de11100df7..cccbf31895 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
 .super Lcom/discord/widgets/notice/WidgetNoticePopup;
+.source "WidgetNoticePopupChannel.kt"
 
 
 # annotations
@@ -674,9 +675,14 @@
 
     const-string p4, "asset://asset/images/default_icon.jpg"
 
+    move-object v6, p4
+
+    goto :goto_5
+
     :cond_6
     move-object v6, p4
 
+    :goto_5
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result p4
@@ -693,12 +699,12 @@
 
     const/4 v8, 0x0
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_7
     const/4 v8, 0x1
 
-    :goto_5
+    :goto_6
     move-object p4, p5
 
     check-cast p4, Ljava/lang/CharSequence;
@@ -871,8 +877,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1024,7 +1028,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v6
 
@@ -1097,7 +1101,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali
index 3c4ed8ed09..4a4d64ce86 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion;
 .super Ljava/lang/Object;
+.source "WidgetNuxPostRegistrationJoin.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onActivityCreated$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onActivityCreated$1.smali
index ac1ee6f60b..5c8101cf6f 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onActivityCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onActivityCreated$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onActivityCreated$1;
 .super Ljava/lang/Object;
+.source "WidgetNuxPostRegistrationJoin.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali
index fd67c9cf15..5b0082c8c1 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetNuxPostRegistrationJoin.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -132,9 +133,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1;->this$0:Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;
 
-    iget-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1;->this$0:Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;->getGuildJoinInvite()Landroid/widget/EditText;
+    invoke-virtual {p1}, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;->getGuildJoinInvite()Landroid/widget/EditText;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
index a447dd8844..59b964aa9e 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetNuxPostRegistrationJoin.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
@@ -78,6 +79,8 @@
     :goto_2
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatButton;->setText(I)V
 
+    return-void
+
     :cond_3
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
index 201e95d6c0..3f2195f9b4 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;
 .super Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
+.source "WidgetNuxPostRegistrationJoin.kt"
 
 
 # annotations
@@ -152,8 +153,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/roles/RolesAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/roles/RolesAdapter$Companion.smali
index 09038dfe31..6b867d8b61 100644
--- a/com.discord/smali/com/discord/widgets/roles/RolesAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/roles/RolesAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/roles/RolesAdapter$Companion;
 .super Ljava/lang/Object;
+.source "RolesAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/roles/RolesAdapter$RoleViewHolder.smali b/com.discord/smali/com/discord/widgets/roles/RolesAdapter$RoleViewHolder.smali
index b2e1d20dac..cd092d263c 100644
--- a/com.discord/smali/com/discord/widgets/roles/RolesAdapter$RoleViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/roles/RolesAdapter$RoleViewHolder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/roles/RolesAdapter$RoleViewHolder;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "RolesAdapter.kt"
 
 
 # annotations
@@ -146,6 +147,8 @@
 
     invoke-static/range {v5 .. v11}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_2
     return-void
 
@@ -164,4 +167,6 @@
     check-cast p1, Ljava/lang/Throwable;
 
     throw p1
+
+    return-void
 .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 7731850106..5f1bd8c9f6 100644
--- a/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/roles/RolesAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "RolesAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch$1.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch$1.smali
index 1aeb6c191f..b733b05109 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/search/WidgetSearch$1;
 .super Ljava/lang/Object;
+.source "WidgetSearch.java"
 
 
 # annotations
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 f4371228df..76f7b57ffb 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/WidgetSearch$Model;
 .super Ljava/lang/Object;
+.source "WidgetSearch.java"
 
 
 # annotations
@@ -273,7 +274,7 @@
 
     if-eq p1, v3, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const p1, 0x7f120cd0
@@ -282,7 +283,6 @@
 
     aput-object v0, v2, v1
 
-    :goto_0
     invoke-virtual {p0, p1, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
@@ -296,10 +296,14 @@
 
     aput-object v0, v2, v1
 
-    goto :goto_0
+    invoke-virtual {p0, p1, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_2
-    :goto_1
+    :goto_0
     const/4 p0, 0x0
 
     return-object p0
diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
index 5a616d1811..2a8a0fa479 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/WidgetSearch;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSearch.java"
 
 
 # annotations
@@ -243,9 +244,13 @@
     :cond_2
     invoke-virtual {v0, v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->setVisibility(I)V
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -379,9 +384,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/WidgetSearch;->searchInput:Landroid/widget/EditText;
 
-    iget-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->searchInput:Landroid/widget/EditText;
-
-    invoke-virtual {v0}, Landroid/widget/EditText;->length()I
+    invoke-virtual {p1}, Landroid/widget/EditText;->length()I
 
     move-result v0
 
@@ -512,8 +515,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->searchInput:Landroid/widget/EditText;
-
     new-instance v1, Lcom/discord/widgets/search/-$$Lambda$WidgetSearch$bQnt0xhcPp6foT-mYXBYfourDME;
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/search/-$$Lambda$WidgetSearch$bQnt0xhcPp6foT-mYXBYfourDME;-><init>(Lcom/discord/widgets/search/WidgetSearch;)V
@@ -623,8 +624,6 @@
     return-void
 
     :cond_1
-    iget v0, p0, Lcom/discord/widgets/search/WidgetSearch;->targetType:I
-
     if-ne v0, p1, :cond_2
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getSearch()Lcom/discord/stores/StoreSearch;
diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch_ViewBinding.smali
index b0168512c9..b3c96b592c 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/WidgetSearch_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearch_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$1.smali b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$1.smali
index 8a0acd15be..0f7ca2c720 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/search/results/WidgetSearchResults$1;
 .super Ljava/lang/Object;
+.source "WidgetSearchResults.java"
 
 
 # annotations
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 4d1cd359a6..e59dc7cf8f 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/results/WidgetSearchResults$Model;
 .super Ljava/lang/Object;
+.source "WidgetSearchResults.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
@@ -152,102 +153,105 @@
 
     if-nez p7, :cond_0
 
-    goto/16 :goto_b
+    goto/16 :goto_7
 
     :cond_0
-    new-instance v8, Ljava/util/ArrayList;
+    new-instance v7, Ljava/util/ArrayList;
 
-    invoke-direct {v8}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v7}, Ljava/util/ArrayList;-><init>()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/utilities/search/network/state/SearchState;->getQueryFetchState()Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    move-result-object v9
+    move-result-object v6
 
     new-instance v13, Ljava/util/HashSet;
 
     invoke-direct {v13}, Ljava/util/HashSet;-><init>()V
 
-    sget-object v11, Lcom/discord/utilities/search/network/state/QueryFetchState;->COMPLETED:Lcom/discord/utilities/search/network/state/QueryFetchState;
+    sget-object v8, Lcom/discord/utilities/search/network/state/QueryFetchState;->COMPLETED:Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    if-eq v9, v11, :cond_4
+    if-eq v6, v8, :cond_4
 
-    sget-object v11, Lcom/discord/utilities/search/network/state/QueryFetchState;->LOADING_MORE:Lcom/discord/utilities/search/network/state/QueryFetchState;
+    sget-object v8, Lcom/discord/utilities/search/network/state/QueryFetchState;->LOADING_MORE:Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    if-ne v9, v11, :cond_1
+    if-ne v6, v8, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     sget-object v1, Lcom/discord/utilities/search/network/state/QueryFetchState;->IN_PROGRESS:Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    if-ne v9, v1, :cond_2
+    if-ne v6, v1, :cond_2
 
     new-instance v1, Lcom/discord/widgets/chat/list/entries/LoadingEntry;
 
     invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;-><init>()V
 
-    :goto_0
-    invoke-interface {v8, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v7, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto/16 :goto_8
+    goto/16 :goto_5
 
     :cond_2
     sget-object v1, Lcom/discord/utilities/search/network/state/QueryFetchState;->INDEXING:Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    if-ne v9, v1, :cond_3
+    if-ne v6, v1, :cond_3
 
     new-instance v1, Lcom/discord/widgets/chat/list/entries/SearchIndexingEntry;
 
     invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/SearchIndexingEntry;-><init>()V
 
-    goto :goto_0
+    invoke-interface {v7, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto/16 :goto_5
 
     :cond_3
     sget-object v1, Lcom/discord/utilities/search/network/state/QueryFetchState;->FAILED:Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    if-ne v9, v1, :cond_d
+    if-ne v6, v1, :cond_d
 
     new-instance v1, Lcom/discord/widgets/chat/list/entries/SearchErrorEntry;
 
     invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/SearchErrorEntry;-><init>()V
 
-    goto :goto_0
+    invoke-interface {v7, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto/16 :goto_5
 
     :cond_4
-    :goto_1
+    :goto_0
     invoke-virtual/range {p0 .. p0}, Lcom/discord/utilities/search/network/state/SearchState;->getHits()Ljava/util/List;
 
-    move-result-object v11
+    move-result-object v8
 
-    if-eqz v11, :cond_5
+    if-eqz v8, :cond_5
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/utilities/search/network/state/SearchState;->getHits()Ljava/util/List;
 
-    move-result-object v11
+    move-result-object v8
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
-    new-instance v11, Ljava/util/ArrayList;
+    new-instance v8, Ljava/util/ArrayList;
 
-    invoke-direct {v11}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v8}, Ljava/util/ArrayList;-><init>()V
 
-    :goto_2
-    invoke-interface {v11}, Ljava/util/List;->isEmpty()Z
+    :goto_1
+    invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
 
-    move-result v12
+    move-result v9
 
-    if-nez v12, :cond_6
+    if-nez v9, :cond_6
 
-    invoke-interface {v11}, Ljava/util/List;->size()I
+    invoke-interface {v8}, Ljava/util/List;->size()I
 
     move-result v5
 
-    const/4 v12, 0x1
+    const/4 v9, 0x1
 
-    sub-int/2addr v5, v12
+    sub-int/2addr v5, v9
 
-    invoke-interface {v11, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v8, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -255,195 +259,193 @@
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
-    move-result-wide v14
+    move-result-wide v10
 
-    invoke-static {v14, v15}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v5
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/utilities/search/network/state/SearchState;->getTotalResults()I
 
-    move-result v6
+    move-result v10
 
     invoke-virtual/range {p7 .. p7}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v7
+    move-result-object v11
 
-    const v14, 0x7f10008d
+    const v12, 0x7f10008d
 
-    new-array v12, v12, [Ljava/lang/Object;
+    new-array v9, v9, [Ljava/lang/Object;
 
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v16
+    move-result-object v15
 
-    aput-object v16, v12, v15
+    aput-object v15, v9, v14
 
-    invoke-virtual {v7, v14, v6, v12}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v11, v12, v10, v9}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v9
 
-    new-instance v7, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;
+    new-instance v10, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;
 
-    invoke-direct {v7, v6}, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;-><init>(Ljava/lang/String;)V
+    invoke-direct {v10, v9}, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {v8, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v7, v10}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_6
-    invoke-interface {v11}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+    invoke-interface {v8}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v6
+    move-result-object v8
 
     :cond_7
-    :goto_3
-    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
+    :goto_2
+    invoke-interface {v8}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v9
 
-    if-eqz v7, :cond_b
+    if-eqz v9, :cond_b
 
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v8}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v9
 
-    check-cast v7, Lcom/discord/models/domain/ModelMessage;
+    check-cast v9, Lcom/discord/models/domain/ModelMessage;
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    move-result-wide v11
+    move-result-wide v10
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v14
+    move-result-object v12
 
-    invoke-interface {v4, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v12}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v14
+    move-result-object v12
 
-    check-cast v14, Lcom/discord/models/domain/ModelChannel;
+    check-cast v12, Lcom/discord/models/domain/ModelChannel;
 
-    if-eqz v14, :cond_7
+    if-eqz v12, :cond_7
 
-    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+    invoke-virtual {v12}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
 
     move-result-wide v23
 
     invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v15
+    move-result-object v14
 
-    invoke-interface {v2, v15}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v14
+
+    check-cast v14, Ljava/util/Map;
+
+    if-eqz v14, :cond_8
+
+    invoke-interface {v14, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v15
 
-    check-cast v15, Ljava/util/Map;
-
     if-eqz v15, :cond_8
 
-    invoke-interface {v15, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v14, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v16
+    move-result-object v14
 
-    if-eqz v16, :cond_8
+    check-cast v14, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    invoke-interface {v15, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
-    move-result-object v15
+    move-result-object v14
 
-    check-cast v15, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    invoke-virtual {v15}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
-
-    move-result-object v15
-
-    invoke-interface {v13, v15}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
+    invoke-interface {v13, v14}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
 
     :cond_8
     invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v15
+    move-result-object v14
 
-    invoke-interface {v1, v15}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v15
+    move-result-object v14
 
-    check-cast v15, Lcom/discord/models/domain/ModelGuild;
+    check-cast v14, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v7, v14, v15}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->create(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
+    invoke-static {v9, v12, v14}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->create(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
 
-    move-result-object v15
+    move-result-object v14
 
-    invoke-interface {v8, v15}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v7, v14}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v15
+    move-result-object v14
 
-    invoke-interface {v2, v15}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v2, v14}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    move-result v15
+    move-result v14
 
-    if-eqz v15, :cond_9
+    if-eqz v14, :cond_9
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v11
+    move-result-object v10
 
-    invoke-interface {v2, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v11
+    move-result-object v10
 
-    check-cast v11, Ljava/util/Map;
+    check-cast v10, Ljava/util/Map;
 
-    :goto_4
-    move-object v15, v11
+    move-object v15, v10
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_9
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
-    move-result-object v11
+    move-result-object v10
+
+    move-object v15, v10
+
+    :goto_3
+    invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v10
+
+    invoke-interface {v3, v10}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_a
+
+    invoke-static/range {v23 .. v24}, 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
+
+    check-cast v10, Ljava/util/Map;
+
+    move-object/from16 v16, v10
 
     goto :goto_4
 
-    :goto_5
-    invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v11
-
-    invoke-interface {v3, v11}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
-
-    move-result v11
-
-    if-eqz v11, :cond_a
-
-    invoke-static/range {v23 .. v24}, 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
-
-    check-cast v11, Ljava/util/Map;
-
-    :goto_6
-    move-object/from16 v16, v11
-
-    goto :goto_7
-
     :cond_a
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
-    move-result-object v11
+    move-result-object v10
 
-    goto :goto_6
+    move-object/from16 v16, v10
 
-    :goto_7
-    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
+    :goto_4
+    invoke-virtual {v12}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
 
     move-result-object v14
 
@@ -455,31 +457,33 @@
 
     const/16 v21, 0x0
 
-    move-object/from16 v17, v7
+    move-object/from16 v17, v9
 
     move/from16 v22, p8
 
     invoke-static/range {v14 .. v24}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List;
 
-    move-result-object v7
+    move-result-object v9
 
-    invoke-interface {v8, v7}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
+    invoke-interface {v7, v9}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_b
     sget-object v1, Lcom/discord/utilities/search/network/state/QueryFetchState;->LOADING_MORE:Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    if-ne v9, v1, :cond_c
+    if-ne v6, v1, :cond_c
 
     new-instance v1, Lcom/discord/widgets/chat/list/entries/LoadingEntry;
 
     invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;-><init>()V
 
-    goto/16 :goto_0
+    invoke-interface {v7, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_5
 
     :cond_c
-    invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
+    invoke-interface {v7}, Ljava/util/List;->isEmpty()Z
 
     move-result v1
 
@@ -489,39 +493,32 @@
 
     invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/SearchEmptyEntry;-><init>()V
 
-    goto/16 :goto_0
+    invoke-interface {v7, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_d
-    :goto_8
+    :goto_5
     new-instance v1, Lcom/discord/widgets/search/results/WidgetSearchResults$Model;
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v8
 
     if-eqz v5, :cond_e
 
     invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v2
 
-    :goto_9
-    move-wide v11, v4
-
-    goto :goto_a
+    goto :goto_6
 
     :cond_e
-    const-wide/16 v4, 0x0
+    const-wide/16 v2, 0x0
 
-    goto :goto_9
+    :goto_6
+    move-wide v11, v2
 
-    :goto_a
     move-object v6, v1
 
-    move-object v7, v8
-
-    move-wide v8, v2
-
     move-object/from16 v10, p2
 
     invoke-direct/range {v6 .. v13}, Lcom/discord/widgets/search/results/WidgetSearchResults$Model;-><init>(Ljava/util/List;JLjava/util/Map;JLjava/util/Set;)V
@@ -529,7 +526,7 @@
     return-object v1
 
     :cond_f
-    :goto_b
+    :goto_7
     return-object v5
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali
index 97cab5b288..205bc60e2d 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler;
 .super Ljava/lang/Object;
+.source "WidgetSearchResults.java"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
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 b88ae8b524..950a5db9dc 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/results/WidgetSearchResults;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSearchResults.java"
 
 
 # annotations
@@ -44,8 +45,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/search/results/WidgetSearchResults;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setData(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;)V
 
     :cond_1
@@ -79,8 +78,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/search/results/WidgetSearchResults;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->dispose()V
 
     :cond_0
@@ -96,8 +93,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/search/results/WidgetSearchResults;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->disposeHandlers()V
 
     :cond_0
@@ -179,8 +174,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/search/results/WidgetSearchResults;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setHandlers()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults_ViewBinding.smali
index 3e76267d6b..2a14884f0d 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/results/WidgetSearchResults_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchResults_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$1.smali
index 13b7324045..4c1ea88f90 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$1;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestions.java"
 
 # interfaces
 .implements Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$OnSuggestionClickedListener;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$2.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$2.smali
index 58142bd637..68b2540c9d 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$2.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$2.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$2;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestions.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali
index d641b16960..dc357c1839 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestions.java"
 
 
 # annotations
@@ -120,7 +121,6 @@
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;)V
 
-    :goto_1
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
@@ -134,7 +134,9 @@
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;)V
 
-    goto :goto_1
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
 
     :pswitch_2
     iget-object v1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->suggestionItems:Ljava/util/List;
@@ -145,7 +147,9 @@
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)V
 
-    goto :goto_1
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
 
     :pswitch_3
     iget-object v1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->suggestionItems:Ljava/util/List;
@@ -156,7 +160,9 @@
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)V
 
-    goto :goto_1
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
 
     :pswitch_4
     iget-object v1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->suggestionItems:Ljava/util/List;
@@ -167,7 +173,9 @@
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;)V
 
-    goto :goto_1
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
 
     :cond_2
     return-void
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 958e9a4cf3..3a01a47764 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSearchSuggestions.java"
 
 
 # annotations
@@ -45,8 +46,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;->adapter:Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
-
     invoke-virtual {p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->getSuggestionItems()Ljava/util/List;
 
     move-result-object v1
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$1.smali
index 4580bd3d27..8d9a43396e 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$1;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali
index 0473173905..45d496b0d2 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
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 6477f556d9..8a8937a12d 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
@@ -280,9 +281,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->icon:Landroid/widget/ImageView;
 
-    iget-object v2, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->icon:Landroid/widget/ImageView;
-
-    invoke-static {v2, p2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;I)I
+    invoke-static {p1, p2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;I)I
 
     move-result p2
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder_ViewBinding.smali
index 376663c1c6..c6a96fd584 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter$FilterViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali
index d51462f474..bcf18eedea 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
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 5ee3e73b67..04c9aa112a 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
@@ -174,9 +175,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->iconImageView:Landroid/widget/ImageView;
 
-    iget-object v0, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->iconImageView:Landroid/widget/ImageView;
-
-    invoke-virtual {v0}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
+    invoke-virtual {p2}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder_ViewBinding.smali
index 2636a937dd..df234e35cf 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter$HasViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali
index 4b9b5b51d8..42cac245f0 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
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 d697624654..249837e547 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder_ViewBinding.smali
index 52c5c095bf..f3a9db79e5 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter$HeaderViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 4d1ddc0c40..343d535907 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder_ViewBinding.smali
index 1f1d6bfa49..3f6ec53a33 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali
index 236084478a..c9d63bf24e 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
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 062bc43af7..80e95cc8cb 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder_ViewBinding.smali
index ed751a8f88..75cab6f6e1 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter$InChannelViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$OnSuggestionClickedListener.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$OnSuggestionClickedListener.smali
index f9ba0defb6..a287893217 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$OnSuggestionClickedListener.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$OnSuggestionClickedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$OnSuggestionClickedListener;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali
index 4de2e42944..4afb694a97 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
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 307f8b290d..c1aab4600a 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
@@ -80,9 +81,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;->headerTextView:Landroid/widget/TextView;
 
-    iget-object v0, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;->headerTextView:Landroid/widget/TextView;
-
-    invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {p2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder_ViewBinding.smali
index 193cb4a990..bab2f67c4c 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter$RecentQueryViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali
index 4b145462f5..1af78f9e23 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
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 892d2f5c2d..97b724d4e4 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder_ViewBinding.smali
index c766f105a7..bf54134d6c 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestionsAdapter$UserViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali
index 67ee3862d1..f353d84ee1 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetSearchSuggestionsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions_ViewBinding.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions_ViewBinding.smali
index 3b93d37438..338c35efa0 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSearchSuggestions_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali
index ab9288c42a..81ea2a46b3 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback;
 .super Landroidx/recyclerview/widget/DiffUtil$Callback;
+.source "NotificationsOverridesAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali
index 9ee8cc0581..4db14e49bc 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;
 .super Ljava/lang/Object;
+.source "NotificationsOverridesAdapter.kt"
 
 
 # annotations
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 7ef94450c6..9b704185c1 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder;
 .super Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;
+.source "NotificationsOverridesAdapter.kt"
 
 
 # annotations
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 069824b8b7..b55e972bbd 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;
 .super Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;
+.source "NotificationsOverridesAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali
index b64c331c3c..4b7f81d5c7 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1;
 .super Ljava/lang/Object;
+.source "NotificationsOverridesAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 9b55220db4..dd06593d0b 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "NotificationsOverridesAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
index 59ae04fd9c..56c29d0ea7 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/NotificationsOverridesAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "NotificationsOverridesAdapter.kt"
 
 
 # annotations
@@ -228,7 +229,6 @@
 
     invoke-direct {p2, p1, v0}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function2;)V
 
-    :goto_0
     check-cast p2, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;
 
     return-object p2
@@ -285,7 +285,9 @@
 
     invoke-direct {p2, p1, v0}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function2;)V
 
-    goto :goto_0
+    check-cast p2, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;
+
+    return-object p2
 .end method
 
 .method public final setData(Ljava/util/List;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
index 47b5116f9e..08fc5cb175 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;
 .super Ljava/lang/Object;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem$onConfigure$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem$onConfigure$$inlined$let$lambda$1.smali
index 1fab465b0a..b2c2bb7477 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem$onConfigure$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem$onConfigure$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem$onConfigure$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 65d31c94fa..969455139a 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder;
@@ -90,7 +91,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;->isDraggable()Z
 
@@ -110,6 +111,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method protected final onConfigure(ILcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;)V
@@ -158,10 +162,7 @@
 
     if-eqz p1, :cond_1
 
-    :goto_0
-    check-cast p1, Ljava/lang/CharSequence;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;->itemView:Landroid/view/View;
@@ -180,9 +181,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    :goto_0
+    check-cast p1, Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-virtual {p2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;->dragIcon:Landroid/view/View;
@@ -193,6 +194,8 @@
 
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
index 2e1819f24f..8c95c28f42 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;
 .super Ljava/lang/Object;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.smali
index 05b390c39a..a44b057df6 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 7705da4a09..9d7791bc75 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder;
@@ -126,7 +127,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;->isDraggable()Z
 
@@ -146,6 +147,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method protected final onConfigure(ILcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;)V
@@ -238,6 +242,8 @@
 
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$Companion.smali
index d6292b7c9f..1cb8525250 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$Companion;
 .super Ljava/lang/Object;
+.source "SettingsChannelListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
index d4d6596ca3..bdb6a2a077 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition;
 .super Ljava/lang/Object;
+.source "SettingsChannelListAdapter.kt"
 
 
 # annotations
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 a2d747d8d8..642c5e08d5 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1;
 .super Lkotlin/jvm/internal/k;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali
index 5137f40ea5..fa7f4585f1 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2;
 .super Lkotlin/jvm/internal/k;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali
index 8d85d68820..9551c69a9b 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3;
 .super Lkotlin/jvm/internal/k;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e28e93d1ea..ec5ebddf1b 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1;
 .super Lkotlin/jvm/internal/k;
+.source "SettingsChannelListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
index 32adac358c..8688fbe6e2 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter;
 .super Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter;
+.source "SettingsChannelListAdapter.kt"
 
 
 # annotations
@@ -215,6 +216,8 @@
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -278,7 +281,7 @@
 
     if-gez v4, :cond_0
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_0
     check-cast v6, Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;
@@ -579,7 +582,6 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;-><init>(Lcom/discord/widgets/servers/SettingsChannelListAdapter;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
@@ -589,7 +591,9 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;-><init>(Lcom/discord/widgets/servers/SettingsChannelListAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali
index 24658733cb..9fcd6ee476 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerDeleteDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali
index 2e20012e18..abee8a35c3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetServerDeleteDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
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 96b1fc18be..c970c2c089 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerDeleteDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali
index 7b94d6f5e9..756b24b42f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerDeleteDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$1.smali
index af09790c0c..d2f7c5eb90 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetServerDeleteDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2$1.smali
index cefb3a4a2b..a642ff524c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2$1;
 .super Ljava/lang/Object;
+.source "WidgetServerDeleteDialog.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali
index bf69fbb594..0d65d197ac 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetServerDeleteDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 f110ba9f54..8f707288af 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerDeleteDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$sam$rx_functions_Func2$0.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$sam$rx_functions_Func2$0.smali
index bf12bdd701..c72d7184f4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$sam$rx_functions_Func2$0.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$sam$rx_functions_Func2$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$sam$rx_functions_Func2$0;
 .super Ljava/lang/Object;
+.source "WidgetServerDeleteDialog.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
index 8acb32603c..db9d2f8d33 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetServerDeleteDialog.kt"
 
 
 # annotations
@@ -546,8 +547,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali
index c7d38146af..4e20b718cf 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali
index f776819b1e..d873b37ffa 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
index ae690d3e3f..bf46204535 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali
index bc3e644d7d..588b1c8dd1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 0b253baa2b..43d56f3eb4 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 
 # annotations
@@ -75,7 +76,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali
index 9cac41d885..81a698f092 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali
index 5d806a44e8..c3a09e2f0e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$configureRadio$1;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali
index 08c601cc2f..6cbb45ebaf 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali
index 5a8d5a7fd8..9fd5b06fb2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali
index bfd6ccd796..023de33d4e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali
index f521b435fa..f782a82a13 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1;
 .super Lcom/discord/utilities/views/SwipeableItemTouchHelper;
+.source "WidgetServerNotifications.kt"
 
 
 # annotations
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 6b78dac891..5101a4ed5c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali
index 7c0c06c235..e36f864276 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 af444cf354..3615d696d3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ff61c77502..597bb4ef32 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
index d99de0ff67..2693d7f6cd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerNotifications.kt"
 
 
 # annotations
@@ -458,6 +459,8 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -475,6 +478,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->onBackPressed()V
 
+    return-void
+
     :cond_0
     return-void
 
@@ -969,8 +974,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali
index 21bd30594a..85b5877a9e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerNotificationsOverrideSelector.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
@@ -242,10 +243,9 @@
 
     invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;-><init>(Ljava/lang/String;JIZZZ)V
 
-    :goto_3
     check-cast p3, Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isTextChannel()Z
@@ -268,12 +268,14 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;-><init>(Lcom/discord/models/domain/ModelChannel;ZJZ)V
 
+    check-cast p3, Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;
+
     goto :goto_3
 
     :cond_6
     const/4 p3, 0x0
 
-    :goto_4
+    :goto_3
     if-eqz p3, :cond_4
 
     invoke-interface {p1, p3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
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 44c79f7d58..e1b30dd28b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerNotificationsOverrideSelector.kt"
 
 
 # annotations
@@ -95,7 +96,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
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 e15d04d9d7..fa0b0a3cee 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetServerNotificationsOverrideSelector.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
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 edee4e7cba..40250a8d0d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerNotificationsOverrideSelector.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -88,6 +89,8 @@
 
     invoke-static/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;->launch$default(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;Landroid/content/Context;JZILjava/lang/Object;)V
 
+    return-void
+
     :cond_0
     return-void
 .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 48322ecd35..917669b5ab 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerNotificationsOverrideSelector.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
index db17ce64ea..b8cdf094eb 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerNotificationsOverrideSelector.kt"
 
 
 # annotations
@@ -217,8 +218,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali
index 3810774cba..7dc4eb68ee 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerRegionSelectDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali
index 1d530ff368..c50b49742d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 4c483c0552..6c2a1043e8 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerRegionSelectDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali
index eb3d67e32b..6366a81a8d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerRegionSelectDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali
index 924914020b..bc3a1bb8e2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1;
 .super Ljava/lang/Object;
+.source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
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 657366027b..294b3178c3 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerRegionSelectDialog.kt"
 
 
 # annotations
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 7829efaabc..ac9aa28ea5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerRegionSelectDialog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali
index 5acf2880c3..bd7306ef63 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;
 .super Ljava/lang/Object;
+.source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$1.smali
index 48c4ceebac..98d84c2b8b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 0d1b11104a..e188e1c6dc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 ce4e7d9e0e..c66e0f75c7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
index 6f479f665f..c7ae0dff9d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetServerRegionSelectDialog.kt"
 
 
 # annotations
@@ -243,8 +244,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
index 402706f732..c4aa4d4610 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettings$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali
index b38427a6f3..693e67988c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
@@ -65,7 +66,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Ljava/util/List;Ljava/util/Map;)Lcom/discord/widgets/servers/WidgetServerSettings$Model;
-    .locals 19
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -105,9 +106,9 @@
 
     const/16 v2, 0x10
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
     if-eqz v1, :cond_1
 
@@ -171,17 +172,17 @@
     :goto_0
     const-string v1, "me"
 
-    move-object/from16 v11, p1
+    move-object/from16 v10, p1
 
-    invoke-static {v11, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
-    move-result v12
+    move-result v11
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
 
-    move-result v13
+    move-result v12
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getOwnerId()J
 
@@ -195,19 +196,19 @@
 
     if-nez v1, :cond_4
 
-    const/4 v14, 0x1
+    const/4 v13, 0x1
 
     goto :goto_1
 
     :cond_4
-    const/4 v14, 0x0
+    const/4 v13, 0x0
 
     :goto_1
-    if-nez v14, :cond_6
+    if-nez v13, :cond_6
 
     const/16 v1, 0x20
 
-    invoke-static {v1, v7, v12, v13}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v1, v7, v11, v12}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
 
     move-result v1
 
@@ -216,18 +217,18 @@
     goto :goto_2
 
     :cond_5
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
     goto :goto_3
 
     :cond_6
     :goto_2
-    const/4 v15, 0x1
+    const/4 v14, 0x1
 
     :goto_3
-    if-nez v14, :cond_8
+    if-nez v13, :cond_8
 
-    invoke-static {v2, v7, v12, v13}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v2, v7, v11, v12}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
 
     move-result v1
 
@@ -238,20 +239,20 @@
     goto :goto_4
 
     :cond_7
-    const/16 v16, 0x0
+    const/4 v15, 0x0
 
     goto :goto_5
 
     :cond_8
     :goto_4
-    const/16 v16, 0x1
+    const/4 v15, 0x1
 
     :goto_5
-    if-nez v14, :cond_a
+    if-nez v13, :cond_a
 
     const/high16 v0, 0x10000000
 
-    invoke-static {v0, v7, v12, v13}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v0, v7, v11, v12}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
 
     move-result v0
 
@@ -260,20 +261,20 @@
     goto :goto_6
 
     :cond_9
-    const/16 v17, 0x0
+    const/16 v16, 0x0
 
     goto :goto_7
 
     :cond_a
     :goto_6
-    const/16 v17, 0x1
+    const/16 v16, 0x1
 
     :goto_7
-    if-nez v14, :cond_c
+    if-nez v13, :cond_c
 
     const/4 v0, 0x4
 
-    invoke-static {v0, v7, v12, v13}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v0, v7, v11, v12}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
 
     move-result v0
 
@@ -282,16 +283,16 @@
     goto :goto_8
 
     :cond_b
-    const/16 v18, 0x0
+    const/16 v17, 0x0
 
     goto :goto_9
 
     :cond_c
     :goto_8
-    const/16 v18, 0x1
+    const/16 v17, 0x1
 
     :goto_9
-    if-nez v14, :cond_d
+    if-nez v13, :cond_e
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -301,9 +302,9 @@
 
     move-result-wide v3
 
-    move v2, v12
+    move v2, v11
 
-    move v5, v13
+    move v5, v12
 
     move-object/from16 v6, p3
 
@@ -311,12 +312,15 @@
 
     move-result v0
 
-    if-eqz v0, :cond_e
+    if-eqz v0, :cond_d
+
+    goto :goto_a
 
     :cond_d
-    const/4 v10, 0x1
+    const/4 v8, 0x0
 
     :cond_e
+    :goto_a
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
@@ -325,9 +329,9 @@
 
     move-result-wide v3
 
-    move v2, v12
+    move v2, v11
 
-    move v5, v13
+    move v5, v12
 
     move-object/from16 v6, p3
 
@@ -335,29 +339,29 @@
 
     move-result v9
 
-    new-instance v11, Lcom/discord/widgets/servers/WidgetServerSettings$Model;
+    new-instance v10, Lcom/discord/widgets/servers/WidgetServerSettings$Model;
 
-    move-object v0, v11
+    move-object v0, v10
 
     move-object/from16 v1, p2
 
-    move v2, v14
+    move v2, v13
 
-    move v3, v15
+    move v3, v14
 
-    move/from16 v4, v16
+    move v4, v15
 
-    move/from16 v5, v17
+    move/from16 v5, v16
 
-    move/from16 v6, v18
+    move/from16 v6, v17
 
-    move v7, v10
+    move v7, v8
 
     move v8, v9
 
     invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/servers/WidgetServerSettings$Model;-><init>(Lcom/discord/models/domain/ModelGuild;ZZZZZZZ)V
 
-    return-object v11
+    return-object v10
 .end method
 
 .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
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 a675719544..504412fa6c 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettings$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali
index ed0027c51e..d38bc4d0b6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 
 # annotations
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 b54f25584b..07d153e976 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureToolbar$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali
index f89631153a..7c0c1547fc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali
index 7aa6a426eb..4efb274bc3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$10;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali
index f79a160cd3..a8e1792a45 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$11;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali
index 5a5fdf7b41..1a54141f31 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali
index 5b2a56474e..b275bc4928 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali
index 38312431a8..3c1fab2453 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$4;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali
index 3fd2a83ce1..f30ae23e91 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali
index 28620467b3..00de1e43e6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$6;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali
index faced23c5b..493e74299c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$7;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali
index c9fcb6634a..bc26c5da03 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$8;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali
index db656b07ad..0f90b00b58 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$9;
 .super Ljava/lang/Object;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 c8dc8c76f1..ae3f7aec40 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetServerSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
index 730c95ac77..15561431d6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettings;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettings.kt"
 
 
 # annotations
@@ -1321,6 +1322,8 @@
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
+    return-void
+
     :cond_3
     return-void
 .end method
@@ -1674,8 +1677,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem$onConfigure$1.smali
index 030ed2f9c1..71839640ff 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -46,7 +47,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem$onConfigure$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;
 
@@ -62,6 +63,11 @@
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
+
+    :cond_1
+    return-void
 .end method
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 c432a9c07b..b899a73a57 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsBans.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali
index 24928b30d5..440fafb312 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerSettingsBans.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
index a438faddfa..1b04c52a95 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali
index 2f33acf8be..4d93ca20cd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali
index 502e014bce..81be5b4d35 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali
index 36b71d6bab..f365dcb706 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali
index 44df2f03b3..664056dfb5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali
index a4970ac863..fc5619d55f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali
index 762d3e3cad..53c3fa282e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali
index 29c2f26d92..436e7745e3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali
index 475457ff4d..1a51b3a59f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali
index 0b995618a1..73e038dca9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali
index 1714cdacef..6ea8d2e8ff 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
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 f005125d55..56777ddfb7 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
index 8f6a5429ba..76c6460d90 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 
 # annotations
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 690ef58992..0e7f3a02ed 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 52892a512c..734029996a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$onResume$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
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 fb9c32d4f1..1c54835558 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$onResume$2;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 92fb14be60..4739b9ed18 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2$1.smali
index d160d70100..80b52c5b6b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -70,6 +71,8 @@
 
     invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2.smali
index a1f0d1d05c..a7270d683c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsBans.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
index 07e320981f..a2861d7582 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsBans.kt"
 
 
 # annotations
@@ -272,6 +273,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->onBackPressed()V
 
+    return-void
+
     :cond_1
     return-void
 
@@ -294,10 +297,9 @@
 
     const/4 v1, 0x0
 
-    :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;->getTotalBannedUsers()I
@@ -312,6 +314,8 @@
 
     const/4 v1, 0x2
 
+    invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
+
     goto :goto_1
 
     :cond_4
@@ -331,6 +335,8 @@
 
     const/4 v1, 0x3
 
+    invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
+
     goto :goto_1
 
     :cond_5
@@ -340,9 +346,9 @@
 
     const/4 v1, 0x1
 
-    goto :goto_1
+    invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
 
-    :goto_2
+    :goto_1
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->adapter:Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter;
 
     if-eqz v0, :cond_6
@@ -366,6 +372,8 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter;->setData(Ljava/util/List;)V
 
+    return-void
+
     :cond_7
     return-void
 .end method
@@ -578,6 +586,8 @@
 
     invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->show()V
 
+    return-void
+
     :cond_5
     return-void
 .end method
@@ -591,8 +601,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 44e757f319..21a4e7a80b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsChannels.java"
 
 
 # annotations
@@ -82,7 +83,7 @@
 .end method
 
 .method private static create(Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/util/List;Ljava/util/Map;I)Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;
-    .locals 29
+    .locals 27
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -113,277 +114,283 @@
 
     const/4 v4, 0x0
 
-    if-eqz p0, :cond_15
+    if-eqz p0, :cond_16
 
-    if-eqz v1, :cond_15
+    if-eqz v1, :cond_16
 
-    if-eqz v0, :cond_15
+    if-eqz v0, :cond_16
 
-    if-eqz p3, :cond_15
+    if-eqz p3, :cond_16
 
     if-nez v2, :cond_0
 
     goto/16 :goto_a
 
     :cond_0
-    const/4 v7, -0x1
-
-    const/4 v9, 0x1
-
-    if-eq v3, v7, :cond_1
+    const/4 v5, -0x1
 
     const/4 v7, 0x1
 
+    if-eq v3, v5, :cond_1
+
+    const/4 v5, 0x1
+
     goto :goto_0
 
     :cond_1
-    const/4 v7, 0x0
+    const/4 v5, 0x0
 
     :goto_0
     invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
-    move-result v5
+    move-result v8
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
 
-    move-result v10
+    move-result v9
 
-    const/16 v11, 0x10
+    const/16 v10, 0x10
 
-    invoke-static {v11, v0, v5, v10}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v10, v0, v8, v9}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
 
     move-result v0
 
-    new-instance v5, Ljava/util/ArrayList;
+    new-instance v8, Ljava/util/ArrayList;
 
-    invoke-direct {v5}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v8}, Ljava/util/ArrayList;-><init>()V
 
-    new-instance v10, Ljava/util/LinkedHashMap;
+    new-instance v9, Ljava/util/LinkedHashMap;
 
-    invoke-direct {v10}, Ljava/util/LinkedHashMap;-><init>()V
+    invoke-direct {v9}, Ljava/util/LinkedHashMap;-><init>()V
 
     new-instance v15, Ljava/util/HashSet;
 
     invoke-direct {v15}, Ljava/util/HashSet;-><init>()V
 
-    const-wide/16 v19, 0x0
+    const-wide/16 v18, 0x0
 
-    if-eqz v7, :cond_2
+    if-eqz v5, :cond_2
 
     if-eqz v0, :cond_3
 
     :cond_2
-    invoke-static/range {v19 .. v20}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {v18 .. v19}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v12
+    move-result-object v11
 
-    invoke-interface {v15, v12}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-interface {v15, v11}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    invoke-static/range {v19 .. v20}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {v18 .. v19}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v12
+    move-result-object v11
 
-    new-instance v13, Ljava/util/ArrayList;
+    new-instance v12, Ljava/util/ArrayList;
 
-    invoke-direct {v13}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v12}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-interface {v10, v12, v13}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v9, v11, v12}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static/range {v19 .. v20}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {v18 .. v19}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v12
+    move-result-object v11
 
-    invoke-interface {v10, v12}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v9, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v12
+    move-result-object v11
 
-    check-cast v12, Ljava/util/List;
+    check-cast v11, Ljava/util/List;
 
-    const/16 v21, 0x0
+    const/16 v20, 0x0
 
-    const-wide/16 v22, 0x0
+    const-wide/16 v21, 0x0
+
+    const/16 v23, 0x0
 
     const/16 v24, 0x0
 
     const/16 v25, 0x0
 
-    const/16 v26, 0x0
+    const/16 v26, 0x1
 
-    const/16 v27, 0x1
+    invoke-static/range {v20 .. v26}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->createCategoryItem(Ljava/lang/String;JIZZZ)Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;
 
-    invoke-static/range {v21 .. v27}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->createCategoryItem(Ljava/lang/String;JIZZZ)Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;
+    move-result-object v12
 
-    move-result-object v13
-
-    invoke-interface {v12, v13}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v11, v12}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_3
     invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator;
 
-    move-result-object v12
+    move-result-object v11
 
-    move-object/from16 v13, p4
+    move-object/from16 v12, p4
 
-    invoke-static {v13, v12}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
+    invoke-static {v12, v11}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
 
     invoke-interface/range {p4 .. p4}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v21
+    move-result-object v20
 
     :goto_1
-    invoke-interface/range {v21 .. v21}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface/range {v20 .. v20}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v12
+    move-result v11
 
-    if-eqz v12, :cond_a
+    if-eqz v11, :cond_b
 
-    invoke-interface/range {v21 .. v21}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface/range {v20 .. v20}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v12
+    move-result-object v11
 
-    move-object v13, v12
+    move-object v14, v11
 
-    check-cast v13, Lcom/discord/models/domain/ModelChannel;
+    check-cast v14, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v13, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccess(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Z
+    invoke-static {v14, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccess(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Z
 
-    move-result v12
+    move-result v11
 
-    if-nez v12, :cond_5
+    if-nez v11, :cond_5
 
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v16
+    move-result-wide v11
 
-    cmp-long v12, v16, v19
+    cmp-long v13, v11, v18
 
-    if-nez v12, :cond_4
+    if-nez v13, :cond_4
 
     goto :goto_2
 
     :cond_4
-    move-object/from16 v28, v15
+    move-object/from16 p0, v15
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_5
     :goto_2
-    new-instance v14, Ljava/util/ArrayList;
+    new-instance v12, Ljava/util/ArrayList;
 
-    invoke-direct {v14}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v12}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v16
 
     invoke-static/range {v16 .. v17}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v12
+    move-result-object v11
 
-    invoke-interface {v2, v12}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v12
+    move-result-object v11
 
-    check-cast v12, Ljava/lang/Integer;
+    check-cast v11, Ljava/lang/Integer;
 
-    invoke-static {v11, v12}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+    invoke-static {v10, v11}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
-    move-result v18
+    move-result v17
 
-    if-nez v18, :cond_6
+    if-nez v17, :cond_6
 
     if-eqz v0, :cond_7
 
     :cond_6
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v16
+    move-result-wide v21
 
-    invoke-static/range {v16 .. v17}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {v21 .. v22}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v12
+    move-result-object v11
 
-    invoke-interface {v15, v12}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-interface {v15, v11}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     :cond_7
-    if-eqz v7, :cond_8
+    if-eqz v5, :cond_9
 
-    if-eqz v18, :cond_4
-
-    :cond_8
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
-
-    move-result-object v12
-
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v16
-
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelChannel;->getPosition()I
-
-    move-result v22
-
-    const/4 v8, 0x4
-
-    if-ne v3, v8, :cond_9
-
-    const/4 v8, 0x1
+    if-eqz v17, :cond_8
 
     goto :goto_3
 
+    :cond_8
+    move-object/from16 p0, v15
+
+    goto :goto_5
+
     :cond_9
-    const/4 v8, 0x0
-
     :goto_3
-    move-object/from16 v23, v13
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-object v11, v14
+    move-result-object v11
 
-    move-wide/from16 v13, v16
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-object/from16 v28, v15
+    move-result-wide v21
 
-    move/from16 v15, v22
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelChannel;->getPosition()I
 
-    move/from16 v16, v8
+    move-result v16
 
-    move/from16 v17, v0
+    const/4 v13, 0x4
 
-    invoke-static/range {v12 .. v18}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->createCategoryItem(Ljava/lang/String;JIZZZ)Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;
+    if-ne v3, v13, :cond_a
 
-    move-result-object v8
+    const/16 v23, 0x1
 
-    invoke-interface {v11, v8}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    invoke-virtual/range {v23 .. v23}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v12
-
-    invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v8
-
-    invoke-interface {v10, v8, v11}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :goto_4
-    move-object/from16 v15, v28
-
-    const/16 v11, 0x10
-
-    goto :goto_1
+    goto :goto_4
 
     :cond_a
-    move-object/from16 v28, v15
+    const/16 v23, 0x0
 
-    invoke-interface/range {v28 .. v28}, Ljava/util/Set;->isEmpty()Z
+    :goto_4
+    move-object v6, v12
+
+    move-wide/from16 v12, v21
+
+    move-object/from16 v21, v14
+
+    move/from16 v14, v16
+
+    move-object/from16 p0, v15
+
+    move/from16 v15, v23
+
+    move/from16 v16, v0
+
+    invoke-static/range {v11 .. v17}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->createCategoryItem(Ljava/lang/String;JIZZZ)Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;
+
+    move-result-object v11
+
+    invoke-interface {v6, v11}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    invoke-virtual/range {v21 .. v21}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v11
+
+    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v11
+
+    invoke-interface {v9, v11, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :goto_5
+    move-object/from16 v15, p0
+
+    goto/16 :goto_1
+
+    :cond_b
+    move-object/from16 p0, v15
+
+    invoke-interface/range {p0 .. p0}, Ljava/util/Set;->isEmpty()Z
 
     move-result v0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_c
 
     return-object v4
 
-    :cond_b
+    :cond_c
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
@@ -396,12 +403,12 @@
 
     move-result-object v4
 
-    :goto_5
+    :goto_6
     invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v6
 
-    if-eqz v6, :cond_f
+    if-eqz v6, :cond_10
 
     invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -411,23 +418,23 @@
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
-    move-result-wide v11
+    move-result-wide v10
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v8
+    move-result-object v10
 
-    move-object/from16 v11, v28
+    move-object/from16 v11, p0
 
-    invoke-interface {v11, v8}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {v11, v10}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v10
 
-    invoke-static {v6, v7, v8}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->createChannelItem(Lcom/discord/models/domain/ModelChannel;ZZ)Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;
+    invoke-static {v6, v5, v10}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->createChannelItem(Lcom/discord/models/domain/ModelChannel;ZZ)Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;
 
-    move-result-object v8
+    move-result-object v10
 
-    if-eqz v7, :cond_c
+    if-eqz v5, :cond_d
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
@@ -441,60 +448,61 @@
 
     move-result v12
 
-    if-eqz v12, :cond_e
-
-    :cond_c
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getType()I
-
-    move-result v12
-
-    if-nez v12, :cond_d
-
-    invoke-static {v6, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccess(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_d
-
-    invoke-interface {v0, v8}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_6
+    if-eqz v12, :cond_f
 
     :cond_d
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result v12
 
+    if-nez v12, :cond_e
+
+    invoke-static {v6, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccess(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_e
+
+    invoke-interface {v0, v10}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    move-object/from16 p0, v11
+
+    goto :goto_6
+
+    :cond_e
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v12
+
     const/4 v13, 0x2
 
-    if-ne v12, v13, :cond_e
+    if-ne v12, v13, :cond_f
 
     invoke-static {v6, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccess(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Z
 
     move-result v6
 
-    if-eqz v6, :cond_e
+    if-eqz v6, :cond_f
 
-    invoke-interface {v3, v8}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_e
-    :goto_6
-    move-object/from16 v28, v11
-
-    goto :goto_5
+    invoke-interface {v3, v10}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_f
+    move-object/from16 p0, v11
+
+    goto :goto_6
+
+    :cond_10
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
 
-    :cond_10
+    :cond_11
     :goto_7
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
-    if-eqz v2, :cond_11
+    if-eqz v2, :cond_12
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -508,17 +516,17 @@
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
-    move-result-wide v11
+    move-result-wide v10
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v4
 
-    invoke-interface {v10, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v9, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v4
 
-    if-eqz v4, :cond_10
+    if-eqz v4, :cond_11
 
     invoke-virtual {v2}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -526,13 +534,13 @@
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
-    move-result-wide v11
+    move-result-wide v10
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v4
 
-    invoke-interface {v10, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v9, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -542,18 +550,18 @@
 
     goto :goto_7
 
-    :cond_11
+    :cond_12
     invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
 
-    :cond_12
+    :cond_13
     :goto_8
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
-    if-eqz v2, :cond_13
+    if-eqz v2, :cond_14
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -573,11 +581,11 @@
 
     move-result-object v3
 
-    invoke-interface {v10, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v9, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_12
+    if-eqz v3, :cond_13
 
     invoke-virtual {v2}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -591,7 +599,7 @@
 
     move-result-object v3
 
-    invoke-interface {v10, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v9, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -601,8 +609,8 @@
 
     goto :goto_8
 
-    :cond_13
-    invoke-interface {v10}, Ljava/util/Map;->values()Ljava/util/Collection;
+    :cond_14
+    invoke-interface {v9}, Ljava/util/Map;->values()Ljava/util/Collection;
 
     move-result-object v0
 
@@ -615,7 +623,7 @@
 
     move-result v2
 
-    if-eqz v2, :cond_14
+    if-eqz v2, :cond_15
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -623,18 +631,18 @@
 
     check-cast v2, Ljava/util/List;
 
-    invoke-interface {v5, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
+    invoke-interface {v8, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
     goto :goto_9
 
-    :cond_14
+    :cond_15
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;
 
-    invoke-direct {v0, v9, v1, v5, v7}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;-><init>(ZLcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V
+    invoke-direct {v0, v7, v1, v8, v5}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;-><init>(ZLcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V
 
     return-object v0
 
-    :cond_15
+    :cond_16
     :goto_a
     return-object v4
 .end method
@@ -889,7 +897,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
@@ -1004,9 +1012,9 @@
 
     iget-boolean v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->canManageGuildChannels:Z
 
-    const/16 v1, 0x61
+    const/16 v1, 0x4f
 
-    const/16 v2, 0x4f
+    const/16 v2, 0x61
 
     if-eqz v0, :cond_0
 
@@ -1062,9 +1070,12 @@
 
     if-eqz v3, :cond_3
 
-    const/16 v1, 0x4f
+    goto :goto_3
 
     :cond_3
+    const/16 v1, 0x61
+
+    :goto_3
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
index bd07730c0b..9ed95245ff 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsChannels;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsChannels.java"
 
 
 # annotations
@@ -303,10 +304,10 @@
 
     invoke-static {p1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;->show(Landroidx/fragment/app/FragmentManager;Lrx/functions/Action1;)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x7f0a03a3
@@ -482,11 +483,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->adapter:Lcom/discord/widgets/servers/SettingsChannelListAdapter;
+    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->adapter:Lcom/discord/widgets/servers/SettingsChannelListAdapter;
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->createFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    if-eqz v1, :cond_1
 
     invoke-static {p1}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;->access$200(Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;)Z
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
index 190cdcc12e..befbd46f80 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment;
 .super Landroidx/fragment/app/Fragment;
+.source "WidgetServerSettingsChannelsFabMenuFragment.java"
 
 
 # static fields
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 ff64fce549..ccbfcfa7f2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsChannelsSortActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -78,6 +79,8 @@
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali
index 7c6f7efe5b..e6e76e0879 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsChannelsSortActions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$1.smali
index 66c1cb4378..3dee61d37e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsChannelsSortActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$2.smali
index 71ecf230b0..20033b4385 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsChannelsSortActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$3.smali
index 4b144a9c0b..aab5432c60 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsChannelsSortActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
index c72666dfde..b50dc57199 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetServerSettingsChannelsSortActions.kt"
 
 
 # annotations
@@ -293,8 +294,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels_ViewBinding.smali
index d989bda7bb..c81b85540e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsChannels_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsChannels_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali
index 281c2f64d0..ba2436ff2a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditIntegration.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
index 7ca92827fd..5f0e0b047f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsEditIntegration.java"
 
 
 # annotations
@@ -213,8 +214,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationName:Landroid/widget/TextView;
-
     iget-object v2, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildIntegration;->getDisplayName()Ljava/lang/String;
@@ -228,8 +227,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationOwnerName:Landroid/widget/TextView;
-
     iget-object v2, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildIntegration;->getUser()Lcom/discord/models/domain/ModelUser;
@@ -247,8 +244,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationIcon:Landroid/widget/ImageView;
-
     if-eqz v0, :cond_3
 
     const v2, 0x7f08005d
@@ -266,8 +261,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncContainer:Landroid/view/View;
-
     new-instance v2, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsEditIntegration$jXFm0n0i2C5whrdQWuDG7NHKQH0;
 
     invoke-direct {v2, p0, p1}, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsEditIntegration$jXFm0n0i2C5whrdQWuDG7NHKQH0;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;)V
@@ -279,8 +272,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->dimmer:Lcom/discord/utilities/dimmer/DimmerView;
-
     iget-object v2, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildIntegration;->isSyncing()Z
@@ -325,8 +316,6 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->subscriberCount:Landroid/widget/TextView;
-
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->getSubscriberCountText(ZLcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;)Ljava/lang/CharSequence;
 
     move-result-object v2
@@ -338,8 +327,6 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncedRoleContainer:Landroid/view/View;
-
     iget-object v2, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->role:Lcom/discord/models/domain/ModelGuildRole;
 
     if-eqz v2, :cond_9
@@ -361,8 +348,6 @@
 
     if-eqz v1, :cond_c
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncedRole:Landroid/widget/TextView;
-
     iget-object v2, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->role:Lcom/discord/models/domain/ModelGuildRole;
 
     if-eqz v2, :cond_b
@@ -488,11 +473,9 @@
 
     if-eqz v1, :cond_10
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->customEmotesCheckedSetting:Lcom/discord/views/CheckedSetting;
+    iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->customEmotesCheckedSetting:Lcom/discord/views/CheckedSetting;
 
-    if-eqz v1, :cond_10
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->customEmotesContainer:Landroid/view/View;
+    if-eqz v2, :cond_10
 
     if-eqz v0, :cond_f
 
@@ -510,9 +493,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->customEmotesCheckedSetting:Lcom/discord/views/CheckedSetting;
-
-    invoke-virtual {v2}, Lcom/discord/views/CheckedSetting;->getId()I
+    invoke-virtual {v0}, Lcom/discord/views/CheckedSetting;->getId()I
 
     move-result v2
 
@@ -543,11 +524,9 @@
 
     if-eqz v0, :cond_11
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->saveFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->saveFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
@@ -752,7 +731,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->expiryBehaviorRadioManager:Lcom/discord/views/RadioManager;
 
-    invoke-virtual {p2}, Lcom/discord/views/RadioManager;->eq()I
+    invoke-virtual {p2}, Lcom/discord/views/RadioManager;->ep()I
 
     move-result p2
 
@@ -760,7 +739,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->gracePeriodRadioManager:Lcom/discord/views/RadioManager;
 
-    invoke-virtual {v1}, Lcom/discord/views/RadioManager;->eq()I
+    invoke-virtual {v1}, Lcom/discord/views/RadioManager;->ep()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration_ViewBinding.smali
index 0c02ac520a..c8b1733989 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditIntegration_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$1.smali
index c6ff261b9d..128820c0ec 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditMember.java"
 
 
 # annotations
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 12bfd3e909..f2eb4b988a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditMember.java"
 
 
 # annotations
@@ -99,7 +100,7 @@
 .end method
 
 .method private static create(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;
-    .locals 27
+    .locals 25
     .param p0    # Lcom/discord/models/domain/ModelGuild;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
@@ -150,24 +151,36 @@
 
     const/4 v1, 0x0
 
-    if-eqz p0, :cond_5
+    if-eqz p0, :cond_6
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
-    if-eqz v7, :cond_5
+    if-eqz v7, :cond_6
 
     if-nez p3, :cond_0
 
-    goto/16 :goto_3
+    goto/16 :goto_4
 
     :cond_0
     invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v10
+    move-result-wide v8
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v12
+    move-result-wide v10
+
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    move-object v12, v2
+
+    check-cast v12, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
     invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -175,36 +188,24 @@
 
     invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v2
-
-    move-object v14, v2
-
-    check-cast v14, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
     move-result-object v0
 
-    move-object v15, v0
+    move-object v13, v0
 
-    check-cast v15, Lcom/discord/models/domain/ModelGuildMember$Computed;
+    check-cast v13, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    if-eqz v14, :cond_5
+    if-eqz v12, :cond_5
 
-    if-nez v15, :cond_1
+    if-nez v13, :cond_1
 
     goto/16 :goto_3
 
     :cond_1
-    invoke-virtual {v14}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+    invoke-virtual {v12}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+    invoke-virtual {v13}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
     move-result-object v4
 
@@ -224,13 +225,13 @@
 
     new-instance v1, Ljava/util/HashSet;
 
-    invoke-virtual {v15}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+    invoke-virtual {v13}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
     move-result-object v2
 
     invoke-direct {v1, v2}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    invoke-static {v7, v14}, Lcom/discord/models/domain/ModelGuildRole;->getHighestRole(Ljava/util/Map;Lcom/discord/models/domain/ModelGuildMember$Computed;)Lcom/discord/models/domain/ModelGuildRole;
+    invoke-static {v7, v12}, Lcom/discord/models/domain/ModelGuildRole;->getHighestRole(Ljava/util/Map;Lcom/discord/models/domain/ModelGuildMember$Computed;)Lcom/discord/models/domain/ModelGuildRole;
 
     move-result-object v2
 
@@ -244,13 +245,13 @@
 
     invoke-static {v3}, Ljava/util/Collections;->sort(Ljava/util/List;)V
 
-    new-instance v14, Ljava/util/ArrayList;
+    new-instance v12, Ljava/util/ArrayList;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
     move-result v4
 
-    invoke-direct {v14, v4}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v12, v4}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanManageRoles()Z
 
@@ -258,15 +259,15 @@
 
     invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageUserContext;->canManage()Z
 
-    move-result v23
+    move-result v21
 
     invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanKick()Z
 
-    move-result v24
+    move-result v22
 
     invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanBan()Z
 
-    move-result v25
+    move-result v23
 
     invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanChangeNickname()Z
 
@@ -276,13 +277,13 @@
 
     move-result-wide v5
 
-    const/4 v7, 0x0
+    const/4 v7, 0x1
 
-    const/16 v16, 0x1
+    const/4 v14, 0x0
 
-    cmp-long v17, v10, v5
+    cmp-long v15, v8, v5
 
-    if-nez v17, :cond_2
+    if-nez v15, :cond_2
 
     const/4 v5, 0x1
 
@@ -292,18 +293,18 @@
     const/4 v5, 0x0
 
     :goto_0
-    cmp-long v6, v10, v12
+    cmp-long v6, v8, v10
 
     if-eqz v6, :cond_3
 
     if-eqz v5, :cond_3
 
-    const/16 v26, 0x1
+    const/16 v24, 0x1
 
     goto :goto_1
 
     :cond_3
-    const/16 v26, 0x0
+    const/16 v24, 0x0
 
     :goto_1
     invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
@@ -321,74 +322,78 @@
 
     move-result-object v6
 
-    move-object/from16 v17, v6
+    move-object v15, v6
 
-    check-cast v17, Lcom/discord/models/domain/ModelGuildRole;
+    check-cast v15, Lcom/discord/models/domain/ModelGuildRole;
 
     new-instance v6, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem;
 
-    invoke-virtual/range {v17 .. v17}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
+    invoke-virtual {v15}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
 
-    move-result-wide v12
+    move-result-wide v10
 
-    invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v10, v11}, 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 v18
+    move-result v16
 
-    const/16 v22, 0x0
+    const/16 v20, 0x0
 
-    move-object/from16 v16, v6
+    move-object v14, v6
 
-    move-object/from16 v19, v2
+    move-object/from16 v17, v2
 
-    move/from16 v20, v5
+    move/from16 v18, v5
 
-    move/from16 v21, v4
+    move/from16 v19, v4
 
-    invoke-direct/range {v16 .. v22}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem;-><init>(Lcom/discord/models/domain/ModelGuildRole;ZLcom/discord/models/domain/ModelGuildRole;ZZLcom/discord/widgets/servers/WidgetServerSettingsEditMember$1;)V
+    invoke-direct/range {v14 .. v20}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem;-><init>(Lcom/discord/models/domain/ModelGuildRole;ZLcom/discord/models/domain/ModelGuildRole;ZZLcom/discord/widgets/servers/WidgetServerSettingsEditMember$1;)V
 
-    invoke-interface {v14, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v12, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
     :cond_4
-    new-instance v16, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;
+    new-instance v15, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;
 
-    move-object/from16 v2, v16
+    move-object v2, v15
 
-    move-wide v3, v10
+    move-wide v3, v8
 
     move-object/from16 v5, p0
 
-    move-object v6, v15
+    move-object v6, v13
 
     move-object v7, v1
 
     move-object/from16 v8, p1
 
-    move-object v9, v14
+    move-object v9, v12
 
-    move/from16 v10, v23
+    move/from16 v10, v21
 
-    move/from16 v11, v24
+    move/from16 v11, v22
 
-    move/from16 v12, v25
+    move/from16 v12, v23
 
     move v13, v0
 
-    move/from16 v14, v26
+    move/from16 v14, v24
 
     invoke-direct/range {v2 .. v14}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;-><init>(JLcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Set;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ZZZZZ)V
 
-    return-object v16
+    return-object v15
 
     :cond_5
     :goto_3
     return-object v1
+
+    :cond_6
+    :goto_4
+    return-object v1
 .end method
 
 .method public static get(JJ)Lrx/Observable;
@@ -450,7 +455,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v5
 
@@ -870,9 +875,9 @@
 
     iget-boolean v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;->canManage:Z
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_5
 
@@ -940,9 +945,12 @@
 
     if-eqz v1, :cond_9
 
-    const/16 v2, 0x4f
+    goto :goto_9
 
     :cond_9
+    const/16 v2, 0x61
+
+    :goto_9
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem.smali
index 0e0714fccd..1c2323018e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$RoleItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditMember.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
@@ -248,9 +249,9 @@
 
     move-result v1
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_1
 
@@ -290,9 +291,12 @@
 
     if-eqz v1, :cond_3
 
-    const/16 v2, 0x4f
+    goto :goto_3
 
     :cond_3
+    const/16 v2, 0x61
+
+    :goto_3
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
index 96630da258..2957c4f970 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsEditMember.java"
 
 
 # annotations
@@ -151,7 +152,6 @@
 
     invoke-direct {v0, p0, p2}, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsEditMember$xSLbTzDy3-HDW7NTKDpWoA8Tznc;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;Ljava/lang/String;)V
 
-    :goto_0
     invoke-static {v0, p0}, Lcom/discord/app/g;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$Transformer;
 
     move-result-object p2
@@ -205,7 +205,13 @@
 
     invoke-direct {v0, p0, p2}, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsEditMember$96V9H0EW2Gs2BEPKoDyEji3FZtE;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;Ljava/lang/String;)V
 
-    goto :goto_0
+    invoke-static {v0, p0}, Lcom/discord/app/g;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$Transformer;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable;
+
+    return-void
 .end method
 
 .method private configureUI(Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;)V
@@ -230,11 +236,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->saveFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->saveFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
@@ -392,8 +396,6 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->administrativeContainer:Landroid/view/View;
-
     iget-boolean v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember$Model;->canKick:Z
 
     if-nez v1, :cond_8
@@ -568,8 +570,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->nicknameText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->clearFocus()V
 
     :cond_0
@@ -854,9 +854,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->nicknameText:Landroid/widget/EditText;
-
-    invoke-virtual {v2}, Landroid/widget/EditText;->getId()I
+    invoke-virtual {p1}, Landroid/widget/EditText;->getId()I
 
     move-result v2
 
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 88a120d71d..829aeb1247 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsEditMemberRolesAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem_ViewBinding.smali
index 1467fc7689..22f5924472 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditMemberRolesAdapter$RoleListItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali
index 0887dd3fd1..b1c10733fd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerSettingsEditMemberRolesAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember_ViewBinding.smali
index 6eff588d8c..b401c7758d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditMember_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditMember_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$1.smali
index 16a0bc5d2e..3d78eee9a5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditRole.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus.smali
index afc7712af1..7bf34ca047 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;
 .super Ljava/lang/Enum;
+.source "WidgetServerSettingsEditRole.java"
 
 
 # annotations
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 9510c99ec5..f96a0c4eab 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditRole.java"
 
 
 # annotations
@@ -287,26 +288,26 @@
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getOwnerId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v9
+    move-result-wide v5
 
-    cmp-long v7, v4, v9
+    cmp-long v7, v3, v5
 
     if-nez v7, :cond_2
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     goto :goto_1
 
     :cond_2
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     :goto_1
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
@@ -321,7 +322,7 @@
 
     move-result v3
 
-    if-nez v7, :cond_8
+    if-nez v6, :cond_8
 
     const/16 v4, 0x8
 
@@ -354,6 +355,8 @@
 
     sget-object v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;->LOCKED_HIGHER:Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;
 
+    move-object v9, v2
+
     goto :goto_3
 
     :cond_4
@@ -365,6 +368,8 @@
 
     sget-object v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;->LOCKED_HIGHEST:Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;
 
+    move-object v9, v2
+
     goto :goto_3
 
     :cond_5
@@ -384,6 +389,8 @@
 
     sget-object v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;->CAN_MANAGE_CONDITIONAL:Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;
 
+    move-object v9, v2
+
     goto :goto_3
 
     :cond_6
@@ -391,20 +398,24 @@
 
     sget-object v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;->USER_NOT_ELEVATED:Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;
 
+    move-object v9, v2
+
     goto :goto_3
 
     :cond_7
     sget-object v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;->NO_MANAGE_ROLES_PERMISSION:Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;
 
+    move-object v9, v2
+
     goto :goto_3
 
     :cond_8
     :goto_2
     sget-object v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;->CAN_MANAGE_ADMIN:Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model$ManageStatus;
 
-    :goto_3
     move-object v9, v2
 
+    :goto_3
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
     move-result-object v0
@@ -433,7 +444,7 @@
 
     move-object v4, v0
 
-    move v5, v7
+    move v5, v6
 
     move-wide v6, v1
 
@@ -475,7 +486,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
index 8aa02db1f8..ee294621ec 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsEditRole.java"
 
 
 # annotations
@@ -327,7 +328,6 @@
 
     const p1, 0x7f12052a
 
-    :goto_0
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
     move-result-object p1
@@ -356,22 +356,38 @@
     :pswitch_0
     const p1, 0x7f120e62
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_1
     const p1, 0x7f12079f
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_2
     const p1, 0x7f12079e
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_3
     const p1, 0x7f12079c
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x3
@@ -1476,7 +1492,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_4
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -1565,29 +1581,33 @@
 
     if-eqz v3, :cond_0
 
-    goto :goto_2
+    invoke-virtual {v1, v6}, Lcom/discord/views/CheckedSetting;->A(I)V
+
+    goto :goto_0
 
     :cond_0
-    :goto_1
     invoke-direct {p0, v1, p1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->enableSetting(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model;I)V
 
     goto :goto_0
 
     :pswitch_1
-    if-eqz v4, :cond_1
+    if-eqz v4, :cond_2
 
     invoke-virtual {p1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model;->isSingular(I)Z
 
     move-result v5
 
-    if-eqz v5, :cond_0
+    if-eqz v5, :cond_1
 
-    if-nez v3, :cond_1
-
-    goto :goto_1
+    if-nez v3, :cond_2
 
     :cond_1
-    if-nez v4, :cond_2
+    invoke-direct {p0, v1, p1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->enableSetting(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/servers/WidgetServerSettingsEditRole$Model;I)V
+
+    goto :goto_0
+
+    :cond_2
+    if-nez v4, :cond_3
 
     const v2, 0x7f12079d
 
@@ -1595,15 +1615,16 @@
 
     goto :goto_0
 
-    :cond_2
-    :goto_2
+    :cond_3
     invoke-virtual {v1, v6}, Lcom/discord/views/CheckedSetting;->A(I)V
 
-    goto :goto_0
+    goto/16 :goto_0
 
-    :cond_3
+    :cond_4
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -1618,9 +1639,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->roleName:Lcom/discord/app/AppEditText;
-
-    invoke-virtual {v2}, Lcom/discord/app/AppEditText;->getId()I
+    invoke-virtual {v0}, Lcom/discord/app/AppEditText;->getId()I
 
     move-result v2
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali
index c53d857186..f53be6d447 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetServerSettingsEditRoleColorPicker.java"
 
 
 # static fields
@@ -43,8 +44,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker;->listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
-
     invoke-interface {v0, p1}, Lcom/angarron/colorpicker/OnColorSelectedListener;->onColorSelected(I)V
 
     :cond_0
@@ -66,8 +65,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker;->listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
-
     const/4 v0, 0x0
 
     invoke-interface {p1, v0}, Lcom/angarron/colorpicker/OnColorSelectedListener;->onColorSelected(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker_ViewBinding.smali
index 95b0bd3587..0e5190df9d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditRoleColorPicker_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole_ViewBinding.smali
index 3732524494..4b054ed5fd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsEditRole_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsEditRole_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter.smali
index 3ed5ab695e..fd642c0a30 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerSettingsInstantInvites.java"
 
 
 # annotations
@@ -116,8 +117,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter;->onInviteExpiredListener:Lrx/functions/Action1;
-
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
     :cond_0
@@ -131,8 +130,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter;->onInviteSelectedListener:Lrx/functions/Action1;
-
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem.smali
index b0cf8b9c09..8e7ed0eace 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvites.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 fc121e11ea..25ee365c12 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvites.java"
 
 
 # annotations
@@ -149,7 +150,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -196,11 +197,11 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KL()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KK()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
index 30f470e7df..bf5af19dd2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsInstantInvites.java"
 
 
 # annotations
@@ -89,10 +90,9 @@
 
     const/4 v1, 0x0
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object v0, p1, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model;->inviteItems:Ljava/util/List;
@@ -107,6 +107,8 @@
 
     const/4 v1, 0x2
 
+    invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
+
     goto :goto_0
 
     :cond_3
@@ -129,7 +131,7 @@
     invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter;->configure(Ljava/util/List;Lrx/functions/Action1;Lrx/functions/Action1;)V
 
     :cond_4
-    :goto_1
+    :goto_0
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model;->guildName:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;->configureToolbar(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali
index 656d770861..9598c77dd4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvitesActions.kt"
 
 
 # annotations
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 e1673da257..0149a4180c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetServerSettingsInstantInvitesActions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali
index 2c5d9debb9..a5cc959dab 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvitesActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali
index 75fa29eb7a..792925f02a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvitesActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 a326438061..a49dccbffc 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvitesActions.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -38,7 +39,7 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 5
+    .locals 4
 
     const-string v0, "it"
 
@@ -60,11 +61,9 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3;->$inviteUrl:Ljava/lang/String;
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
-
-    aput-object v3, v2, v4
+    aput-object v0, v2, v3
 
     const v3, 0x7f120d44
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali
index ff847d13a9..0093d070b9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvitesActions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
index 9b232b7264..1f461ea26d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetServerSettingsInstantInvitesActions.kt"
 
 
 # annotations
@@ -316,8 +317,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem$1.smali
index 14f3926709..edc7e98808 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem$1;
 .super Landroid/os/CountDownTimer;
+.source "WidgetServerSettingsInstantInvitesListItem.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
index 08ae656c13..1cdb6333bd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsInstantInvitesListItem.java"
 
 
 # annotations
@@ -88,8 +89,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->countdownTimer:Landroid/os/CountDownTimer;
-
     invoke-virtual {v0}, Landroid/os/CountDownTimer;->cancel()V
 
     const/4 v0, 0x0
@@ -232,11 +231,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
 
-    iget-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
+    const p2, 0x7f060106
 
-    const v0, 0x7f060106
-
-    invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
+    invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
     move-result p2
 
@@ -269,17 +266,14 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
+    const v0, 0x7f060075
 
-    const v1, 0x7f060075
-
-    invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
+    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
     move-result v0
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setTextColor(I)V
 
-    :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->cancelTimer()V
 
     return-void
@@ -297,15 +291,15 @@
 
     invoke-direct {p0, v0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->setCountdownText(J)V
 
-    goto :goto_0
+    invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->cancelTimer()V
+
+    return-void
 
     :cond_2
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->currentInviteCode:Ljava/lang/String;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->currentInviteCode:Ljava/lang/String;
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getCode()Ljava/lang/String;
 
     move-result-object v1
@@ -371,8 +365,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->containerView:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsInstantInvitesListItem$atSJ43JtTjLxKGn05mcdGfMD8v4;
 
     invoke-direct {v1, p0, p2}, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsInstantInvitesListItem$atSJ43JtTjLxKGn05mcdGfMD8v4;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem;)V
@@ -384,8 +376,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteCode:Landroid/widget/TextView;
-
     iget-object v1, p2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem;->invite:Lcom/discord/models/domain/ModelInvite;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite;->getCode()Ljava/lang/String;
@@ -399,8 +389,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteChannel:Landroid/widget/TextView;
-
     iget-object v1, p2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem;->invite:Lcom/discord/models/domain/ModelInvite;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
@@ -426,8 +414,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteUserName:Landroid/widget/TextView;
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object v1
@@ -437,8 +423,6 @@
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteUserName:Landroid/widget/TextView;
-
     const v1, 0x7f12084c
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -449,8 +433,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteUses:Landroid/widget/TextView;
-
     iget-object v1, p2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model$InviteItem;->invite:Lcom/discord/models/domain/ModelInvite;
 
     invoke-direct {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->getUsesText(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
@@ -464,8 +446,6 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteUserAvatar:Landroid/widget/ImageView;
-
     const v1, 0x7f070056
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem_ViewBinding.smali
index 68d32f5854..76d803d727 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvitesListItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites_ViewBinding.smali
index e2f145d3e7..122162cb41 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsInstantInvites_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali
index 0a0c5752a3..097c3f7d6c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerSettingsIntegrations.kt"
 
 
 # annotations
@@ -133,6 +134,8 @@
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
index e7c67a1df7..fb9ca198c4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali
index cb02ef9723..0a4bc364b1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali
index 610bcbb458..22e43fe228 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali
index 60cafc3b53..38e702d7ac 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
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 42484a85ba..5f52ab411e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem$Companion.smali
index 323e6f0613..1135ae207b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali
index 934c3c97f4..36efc7deda 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
index 08b3573ad4..6505aac030 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrations.kt"
 
 
 # annotations
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 a0bf976bed..6b6c424dcf 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e6e8d49518..fed6ae17da 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
index 49b11e04f2..3dbe9d2efa 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsIntegrations.kt"
 
 
 # annotations
@@ -206,6 +207,8 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter;->configure(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -269,8 +272,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$1.smali
index 0d76a7b30d..6a063b8812 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrationsListItem.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2$1.smali
index 5f9e8320bd..9120ded3c1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrationsListItem.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali
index dec8925e22..396cc0072f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrationsListItem.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1.smali
index ee91f08281..23847673b0 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrationsListItem.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2$1.smali
index 45fb74a888..e0dd725649 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrationsListItem.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -66,6 +67,8 @@
 
     invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali
index 08efcc0b88..d70b827c4a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsIntegrationsListItem.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
index de85d4b4a5..7b3d10444b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsIntegrationsListItem.kt"
 
 
 # annotations
@@ -735,17 +736,14 @@
 
     move-result-wide v3
 
-    :goto_3
-    move-wide v5, v3
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const-wide/16 v3, 0x0
 
-    goto :goto_3
+    :goto_3
+    move-wide v5, v3
 
-    :goto_4
     if-nez p1, :cond_4
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->getHeaderContainer()Landroid/view/View;
@@ -760,7 +758,7 @@
 
     invoke-virtual {v3, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_4
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->getHeaderContainer()Landroid/view/View;
@@ -769,7 +767,7 @@
 
     invoke-virtual {v3, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    :goto_5
+    :goto_4
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->getIntegrationName()Landroid/widget/TextView;
 
     move-result-object v3
@@ -784,12 +782,12 @@
 
     move-result-object v4
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_5
     move-object v4, v0
 
-    :goto_6
+    :goto_5
     check-cast v4, Ljava/lang/CharSequence;
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
@@ -814,12 +812,12 @@
 
     move-result-object v4
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_6
     move-object v4, v0
 
-    :goto_7
+    :goto_6
     check-cast v4, Ljava/lang/CharSequence;
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
@@ -832,12 +830,12 @@
 
     const v4, 0x7f08005d
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_7
     const v4, 0x7f08005e
 
-    :goto_8
+    :goto_7
     invoke-virtual {v3, v4}, Landroid/widget/ImageView;->setImageResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->getHeaderDisabledOverlay()Landroid/view/View;
@@ -850,18 +848,18 @@
 
     if-nez v2, :cond_8
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_8
     const/4 v8, 0x0
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_9
-    :goto_9
+    :goto_8
     const/4 v8, 0x1
 
-    :goto_a
+    :goto_9
     invoke-static {v3, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->showSyncingUI(Z)V
@@ -901,7 +899,6 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    :goto_b
     invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
 
     return-void
@@ -911,7 +908,9 @@
 
     move-result-object p1
 
-    goto :goto_b
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    return-void
 .end method
 
 .method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali
index 4dd959e283..f0f55ff74e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsMembers$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsMembers.java"
 
 # interfaces
 .implements Landroid/widget/AdapterView$OnItemSelectedListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model$MemberItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model$MemberItem.smali
index b60cc35c3b..e9ed72d9fc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model$MemberItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model$MemberItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsMembers$Model$MemberItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsMembers.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
index 23a1f031a9..56f25b5ff1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsMembers$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsMembers.java"
 
 
 # annotations
@@ -187,11 +188,11 @@
 
     const/4 v1, 0x0
 
-    if-eqz v8, :cond_9
+    if-eqz v8, :cond_a
 
     if-nez v9, :cond_0
 
-    goto/16 :goto_5
+    goto/16 :goto_6
 
     :cond_0
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -242,7 +243,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_7
 
     invoke-interface {v15}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -268,7 +269,7 @@
 
     check-cast v6, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    if-eqz v6, :cond_5
+    if-eqz v6, :cond_6
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -297,7 +298,7 @@
     :cond_2
     move-object/from16 v16, v11
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     :goto_1
@@ -313,13 +314,13 @@
 
     move-result v1
 
-    if-nez v1, :cond_4
+    if-nez v1, :cond_5
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
 
     move-result-object v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_4
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
 
@@ -333,9 +334,17 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_4
+
+    goto :goto_2
 
     :cond_4
+    move-object/from16 v16, v11
+
+    goto :goto_3
+
+    :cond_5
+    :goto_2
     invoke-virtual {v11}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
     move-result-object v4
@@ -374,15 +383,19 @@
 
     invoke-interface {v13, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    :goto_2
+    :goto_3
     move-object/from16 v11, v16
 
-    :cond_5
     move-object/from16 v0, p0
 
     goto/16 :goto_0
 
     :cond_6
+    move-object/from16 v0, p0
+
+    goto/16 :goto_0
+
+    :cond_7
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
@@ -391,7 +404,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_8
+    if-nez v0, :cond_9
 
     const/4 v0, 0x2
 
@@ -407,24 +420,24 @@
 
     move-result v0
 
-    if-eqz v0, :cond_7
-
-    goto :goto_3
-
-    :cond_7
-    const/4 v0, 0x0
-
-    const/4 v7, 0x0
+    if-eqz v0, :cond_8
 
     goto :goto_4
 
     :cond_8
-    :goto_3
+    const/4 v0, 0x0
+
+    const/4 v7, 0x0
+
+    goto :goto_5
+
+    :cond_9
+    :goto_4
     const/4 v0, 0x1
 
     const/4 v7, 0x1
 
-    :goto_4
+    :goto_5
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
@@ -473,8 +486,8 @@
 
     return-object v10
 
-    :cond_9
-    :goto_5
+    :cond_a
+    :goto_6
     return-object v1
 .end method
 
@@ -967,9 +980,9 @@
 
     iget-boolean v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$Model;->canKick:Z
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_5
 
@@ -989,9 +1002,12 @@
 
     if-eqz v1, :cond_6
 
-    const/16 v2, 0x4f
+    goto :goto_6
 
     :cond_6
+    const/16 v2, 0x61
+
+    :goto_6
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter$RoleSpinnerItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter$RoleSpinnerItem.smali
index 1733718b8d..fcb14a220f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter$RoleSpinnerItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter$RoleSpinnerItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter$RoleSpinnerItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsMembers.java"
 
 
 # annotations
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 578143495c..63b952e7ae 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter;
 .super Landroid/widget/ArrayAdapter;
+.source "WidgetServerSettingsMembers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
index 4e369fd7b2..d944c2b7f3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsMembers;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsMembers.java"
 
 
 # annotations
@@ -177,8 +178,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->viewFlipper:Landroid/widget/ViewFlipper;
-
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$Model;->memberItems:Ljava/util/List;
 
     if-eqz v1, :cond_1
@@ -206,8 +205,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->guildRoles:Ljava/util/Map;
-
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$Model;->roles:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->equals(Ljava/lang/Object;)Z
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 ea9f50f5da..a22197cc86 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsMembersAdapter.java"
 
 
 # annotations
@@ -58,7 +59,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter;)V
-    .locals 2
+    .locals 1
 
     const v0, 0x7f0d014a
 
@@ -66,11 +67,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
+    const v0, 0x7f06010f
 
-    const v1, 0x7f06010f
-
-    invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
+    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
     move-result v0
 
@@ -152,9 +151,9 @@
 
     iget-boolean v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$Model$MemberItem;->isManagable:Z
 
-    const/4 v2, 0x0
+    const/16 v2, 0x8
 
-    const/16 v3, 0x8
+    const/4 v3, 0x0
 
     if-eqz v1, :cond_0
 
@@ -174,12 +173,9 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_1
+    const/4 v2, 0x0
 
     :cond_1
-    const/16 v2, 0x8
-
-    :goto_1
     invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem_ViewBinding.smali
index 3a0480e5e3..fb32d15bf7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsMembersAdapter$MemberListItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter.smali
index 2c5e88736f..25544472cf 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerSettingsMembersAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers_ViewBinding.smali
index 784e9317f7..ec1412b756 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsMembers_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsMembers_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali
index 7117db3084..1d3934e9fe 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsModeration$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsModeration.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index 1bec981788..0bcef63d8f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsModeration;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsModeration.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration_ViewBinding.smali
index 5554846784..28b17421ba 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsModeration_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsModeration_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali
index 4e44693e63..ad521a35c3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 ded48da428..dfc542851e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetServerSettingsOverview.kt"
 
 
 # annotations
@@ -126,8 +127,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
index 0cb01b21ec..b2833c110d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1.smali
index 549a79743d..8d0d55b9d7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali
index 966045d98d..386a57e0f6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali
index 3dfad31549..2b24ccac1e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 6eb0b15ad7..39167cd77f 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 
 # annotations
@@ -134,7 +135,6 @@
 
     const-string p2, "context.resources.getQua\u2026ration_hours_hours, 1, 1)"
 
-    :goto_0
     invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
@@ -160,7 +160,9 @@
 
     const-string p2, "context.resources.getQua\u2026_minutes_minutes, 30, 30)"
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_2
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -183,7 +185,9 @@
 
     const-string p2, "context.resources.getQua\u2026_minutes_minutes, 15, 15)"
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_3
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -206,7 +210,9 @@
 
     const-string p2, "context.resources.getQua\u2026on_minutes_minutes, 5, 5)"
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :cond_4
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -227,5 +233,7 @@
 
     const-string p2, "context.resources.getQua\u2026on_minutes_minutes, 1, 1)"
 
-    goto :goto_0
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali
index bb84f18acf..2dda515dcc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 02ec6b729b..b74b7d59d6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali
index 4474bce335..1a2f513ab9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1.smali
index 241b19235a..afb027a5a0 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$2.smali
index d67d4608ce..7153878763 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$3.smali
index 42335e60ee..c72a482f6c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1.smali
index 1cc76c1fa7..b835593862 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$1.smali
index 0e85753b3a..e3a509b7f4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 cd723311ca..de9bdfb336 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali
index be757a4f9c..809d991555 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 fb29259c76..a996368613 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1$1.smali
index 00a2716c2f..0138826093 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1.smali
index ff0306b584..8f43a98650 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$2.smali
index 3ff446fa46..324606b250 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$3.smali
index c1e959f610..c2aa84a2ef 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5.smali
index 376c354ec4..c7109da0d3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 b66f0f3120..8edb79a235 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 ff6dfccd26..0034c68c48 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 5e98330698..b714acbdff 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 6e14d74fe2..9312163530 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 294ee0b24c..f98af9f1d3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
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 8601121f70..8ebd076a12 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a0cc7d7ba1..a551c407e3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsOverview.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
index d5a724bfa5..96a16e653c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsOverview.kt"
 
 
 # annotations
@@ -1237,7 +1238,7 @@
 
     if-gez v1, :cond_1
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_1
     check-cast v2, Lcom/discord/views/CheckedSetting;
@@ -1309,7 +1310,7 @@
 
     if-eq v0, v1, :cond_0
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -1436,10 +1437,7 @@
 
     if-eqz v1, :cond_1
 
-    :goto_0
-    check-cast v1, Ljava/lang/CharSequence;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const v1, 0x7f120d06
@@ -1448,9 +1446,9 @@
 
     move-result-object v1
 
-    goto :goto_0
+    :goto_0
+    check-cast v1, Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     sget-object v0, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
@@ -1728,7 +1726,7 @@
     return-void
 
     :cond_2
-    :goto_2
+    :goto_1
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getAppActivity()Lcom/discord/app/AppActivity;
 
     move-result-object p1
@@ -1737,6 +1735,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
+    return-void
+
     :cond_3
     return-void
 .end method
@@ -2318,8 +2318,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 893ad3224f..3e4489f972 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsRolesList.java"
 
 
 # annotations
@@ -93,7 +94,7 @@
 
     move-object/from16 v1, p3
 
-    move-object/from16 v3, p4
+    move-object/from16 v2, p4
 
     if-eqz p0, :cond_5
 
@@ -103,24 +104,24 @@
 
     if-eqz v1, :cond_5
 
-    if-nez v3, :cond_0
+    if-nez v2, :cond_0
 
     goto/16 :goto_4
 
     :cond_0
     invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v5
+    move-result-wide v3
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v5
 
-    const/high16 v8, 0x10000000
+    const/high16 v6, 0x10000000
 
-    invoke-static {v8, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+    invoke-static {v6, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
-    move-result v8
+    move-result v6
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
@@ -128,141 +129,143 @@
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
 
-    move-result v9
+    move-result v7
 
-    invoke-static {v1, v9}, Lcom/discord/utilities/permissions/PermissionUtils;->isElevated(ZI)Z
+    invoke-static {v1, v7}, Lcom/discord/utilities/permissions/PermissionUtils;->isElevated(ZI)Z
 
-    move-result v15
+    move-result v13
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelGuild;->getOwnerId()J
 
-    move-result-wide v1
+    move-result-wide v7
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v9
 
-    const/16 v16, 0x1
+    const/4 v14, 0x0
 
-    cmp-long v11, v1, v9
+    cmp-long v11, v7, v9
 
     if-nez v11, :cond_1
 
-    const/4 v1, 0x1
+    const/4 v15, 0x1
 
     goto :goto_0
 
     :cond_1
-    const/4 v1, 0x0
+    const/4 v15, 0x0
 
     :goto_0
-    invoke-static {v3, v0}, Lcom/discord/models/domain/ModelGuildRole;->getHighestRole(Ljava/util/Map;Lcom/discord/models/domain/ModelGuildMember$Computed;)Lcom/discord/models/domain/ModelGuildRole;
+    invoke-static {v2, v0}, Lcom/discord/models/domain/ModelGuildRole;->getHighestRole(Ljava/util/Map;Lcom/discord/models/domain/ModelGuildMember$Computed;)Lcom/discord/models/domain/ModelGuildRole;
 
     move-result-object v0
 
-    new-instance v2, Ljava/util/ArrayList;
+    new-instance v7, Ljava/util/ArrayList;
 
     invoke-interface/range {p4 .. p4}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v3
-
-    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    invoke-static {v2}, Ljava/util/Collections;->sort(Ljava/util/List;)V
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    invoke-interface {v2}, Ljava/util/List;->size()I
-
-    move-result v9
-
-    invoke-direct {v3, v9}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
     move-result-object v2
 
+    invoke-direct {v7, v2}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    invoke-static {v7}, Ljava/util/Collections;->sort(Ljava/util/List;)V
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-interface {v7}, Ljava/util/List;->size()I
+
+    move-result v8
+
+    invoke-direct {v2, v8}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v7}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v16
+
     :goto_1
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v9
+    move-result v7
 
-    if-eqz v9, :cond_4
+    if-eqz v7, :cond_4
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object v7
 
-    move-object v10, v9
+    move-object v8, v7
 
-    check-cast v10, Lcom/discord/models/domain/ModelGuildRole;
+    check-cast v8, Lcom/discord/models/domain/ModelGuildRole;
 
-    new-instance v14, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem;
+    new-instance v12, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem;
 
-    invoke-virtual {v10}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
+    invoke-virtual {v8}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
 
-    move-result-wide v11
+    move-result-wide v9
 
-    cmp-long v9, v5, v11
+    cmp-long v7, v3, v9
 
-    if-nez v9, :cond_2
+    if-nez v7, :cond_2
 
-    const/4 v11, 0x1
+    const/4 v9, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v11, 0x0
+    const/4 v9, 0x0
 
     :goto_2
-    if-nez v1, :cond_3
+    if-nez v15, :cond_3
 
-    invoke-static {v0, v10}, Lcom/discord/models/domain/ModelGuildRole;->rankIsHigher(Lcom/discord/models/domain/ModelGuildRole;Lcom/discord/models/domain/ModelGuildRole;)Z
+    invoke-static {v0, v8}, Lcom/discord/models/domain/ModelGuildRole;->rankIsHigher(Lcom/discord/models/domain/ModelGuildRole;Lcom/discord/models/domain/ModelGuildRole;)Z
 
-    move-result v9
+    move-result v7
 
-    if-nez v9, :cond_3
+    if-nez v7, :cond_3
 
-    const/4 v12, 0x1
+    const/4 v10, 0x1
 
     goto :goto_3
 
     :cond_3
-    const/4 v12, 0x0
+    const/4 v10, 0x0
 
     :goto_3
-    move-object v9, v14
+    move-object v7, v12
 
-    move v13, v8
+    move v11, v6
 
-    move-object v4, v14
+    move-object v1, v12
 
-    move v14, v15
+    move v12, v13
 
-    invoke-direct/range {v9 .. v14}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem;-><init>(Lcom/discord/models/domain/ModelGuildRole;ZZZZ)V
+    invoke-direct/range {v7 .. v12}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem;-><init>(Lcom/discord/models/domain/ModelGuildRole;ZZZZ)V
 
-    invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v2, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_4
-    new-instance v9, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;
+    new-instance v7, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;
 
-    move-object v0, v9
+    move-object v0, v7
 
-    move-wide v1, v5
+    move-object v8, v2
 
-    move-object v6, v3
+    move-wide v1, v3
 
-    move-object v3, v7
+    move-object v3, v5
 
-    move v4, v8
+    move v4, v6
 
-    move v5, v15
+    move v5, v13
+
+    move-object v6, v8
 
     invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;-><init>(JLjava/lang/String;ZZLjava/util/List;)V
 
-    return-object v9
+    return-object v7
 
     :cond_5
     :goto_4
@@ -298,7 +301,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p0
 
@@ -554,9 +557,9 @@
 
     iget-boolean v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;->canManageRoles:Z
 
-    const/16 v3, 0x61
+    const/16 v3, 0x4f
 
-    const/16 v4, 0x4f
+    const/16 v4, 0x61
 
     if-eqz v1, :cond_1
 
@@ -576,9 +579,12 @@
 
     if-eqz v1, :cond_2
 
-    const/16 v3, 0x4f
+    goto :goto_2
 
     :cond_2
+    const/16 v3, 0x61
+
+    :goto_2
     add-int/2addr v0, v3
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;->roleItems:Ljava/util/List;
@@ -587,14 +593,14 @@
 
     if-nez v1, :cond_3
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
-    :goto_2
+    :goto_3
     add-int/2addr v0, v2
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
index 780da59fd2..67f3d528cc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsRolesList.java"
 
 
 # annotations
@@ -65,8 +66,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->itemTouchHelper:Landroidx/recyclerview/widget/ItemTouchHelper;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/ItemTouchHelper;->attachToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
@@ -133,8 +132,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->adapter:Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter;
-
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;->roleItems:Ljava/util/List;
 
     new-instance v2, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsRolesList$eBE0fLUJbHat_E9fg6AasIDXYo0;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem.smali
index d23535de9b..2e99cc7ced 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsRolesListAdapter.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropAdapter$Payload;
@@ -273,9 +274,9 @@
 
     move-result v1
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_1
 
@@ -333,9 +334,12 @@
 
     if-eqz v1, :cond_4
 
-    const/16 v2, 0x4f
+    goto :goto_4
 
     :cond_4
+    const/16 v2, 0x61
+
+    :goto_4
     add-int/2addr v0, v2
 
     return v0
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 a060e92cf1..4e05986429 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsRolesListAdapter.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/DragAndDropHelper$DraggableViewHolder;
@@ -214,10 +215,9 @@
 
     sget-object v0, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsRolesListAdapter$RoleListItem$grocAgR4M3O7w5ENGKbcuI3wbuI;->INSTANCE:Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsRolesListAdapter$RoleListItem$grocAgR4M3O7w5ENGKbcuI3wbuI;
 
-    :goto_1
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem;->isUserAbleToManageRoles()Z
@@ -230,6 +230,8 @@
 
     sget-object v0, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsRolesListAdapter$RoleListItem$cAETUd_2jtYn9i5D1HHLF2H4AU4;->INSTANCE:Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsRolesListAdapter$RoleListItem$cAETUd_2jtYn9i5D1HHLF2H4AU4;
 
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
+
     goto :goto_1
 
     :cond_2
@@ -243,6 +245,8 @@
 
     sget-object v0, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsRolesListAdapter$RoleListItem$VT18kDoFGPMNjVpPqtKlQSnNZhU;->INSTANCE:Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsRolesListAdapter$RoleListItem$VT18kDoFGPMNjVpPqtKlQSnNZhU;
 
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
+
     goto :goto_1
 
     :cond_3
@@ -250,9 +254,9 @@
 
     const/4 v0, 0x0
 
-    goto :goto_1
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
-    :goto_2
+    :goto_1
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem;->lockIndicator:Landroid/view/View;
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleItem;->isLocked()Z
@@ -263,12 +267,12 @@
 
     const/4 p2, 0x0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/16 p2, 0x8
 
-    :goto_3
+    :goto_2
     invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem_ViewBinding.smali
index fa1ce34d15..b89181f9d8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsRolesListAdapter$RoleListItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.smali
index cf95b5a5a1..ac3a950130 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter;
 .super Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;
+.source "WidgetServerSettingsRolesListAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList_ViewBinding.smali
index 957f23d474..e39c03777f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsRolesList_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsRolesList_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
index f3565e4d54..25b8e8f0f9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsSecurity.java"
 
 
 # annotations
@@ -78,9 +79,9 @@
 
     move-result-wide v7
 
-    const/4 p0, 0x0
+    const/4 p0, 0x1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
     cmp-long v9, v4, v7
 
@@ -321,9 +322,9 @@
 
     iget-boolean v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$Model;->isOwner:Z
 
-    const/16 v2, 0x61
+    const/16 v2, 0x4f
 
-    const/16 v3, 0x4f
+    const/16 v3, 0x61
 
     if-eqz v1, :cond_1
 
@@ -343,9 +344,12 @@
 
     if-eqz v1, :cond_2
 
-    const/16 v2, 0x4f
+    goto :goto_2
 
     :cond_2
+    const/16 v2, 0x61
+
+    :goto_2
     add-int/2addr v0, v2
 
     return v0
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 62aa63766f..6a69b2ff44 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetServerSettingsSecurity.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog_ViewBinding.smali
index 7bacaa3b4f..c524a34eaf 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsSecurity$ToggleMfaDialog_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
index 71242d1d2f..211dc5774c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsSecurity.java"
 
 
 # annotations
@@ -64,7 +65,7 @@
 
     if-nez v0, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object v0, p1, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$Model;->guildName:Ljava/lang/String;
@@ -85,10 +86,9 @@
 
     const v1, 0x7f0800c5
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setBackgroundResource(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->toggleMfaButton:Landroid/widget/Button;
@@ -101,9 +101,9 @@
 
     const v1, 0x7f0800bc
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setBackgroundResource(I)V
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
@@ -136,7 +136,7 @@
     return-void
 
     :cond_3
-    :goto_2
+    :goto_1
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->getAppActivity()Lcom/discord/app/AppActivity;
 
     move-result-object p1
@@ -321,11 +321,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaDescriptionText:Lcom/discord/app/AppTextView;
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaDescriptionText:Lcom/discord/app/AppTextView;
-
-    invoke-virtual {v0}, Lcom/discord/app/AppTextView;->getAttrText()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/discord/app/AppTextView;->getAttrText()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity_ViewBinding.smali
index 0ca2bf436e..807dc437e7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsSecurity_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsSecurity_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali
index e4cb4591b9..e6a03e6003 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsTransferOwnership.java"
 
 
 # annotations
@@ -300,9 +301,9 @@
 
     iget-boolean v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model;->isOwner:Z
 
-    const/16 v1, 0x61
+    const/16 v1, 0x4f
 
-    const/16 v2, 0x4f
+    const/16 v2, 0x61
 
     if-eqz v0, :cond_0
 
@@ -372,9 +373,12 @@
 
     if-eqz v3, :cond_3
 
-    const/16 v1, 0x4f
+    goto :goto_3
 
     :cond_3
+    const/16 v1, 0x61
+
+    :goto_3
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
index 9e60726ca9..f6e84d8f0e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetServerSettingsTransferOwnership.java"
 
 
 # annotations
@@ -81,8 +82,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->mfaWrap:Landroid/view/View;
-
     iget-boolean v2, p1, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model;->mfaEnabled:Z
 
     if-eqz v2, :cond_1
@@ -102,8 +101,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->cancel:Landroid/view/View;
-
     new-instance v2, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsTransferOwnership$MPIeoaJKtyQlbc0VzSamWUHMJY8;
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsTransferOwnership$MPIeoaJKtyQlbc0VzSamWUHMJY8;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;)V
@@ -115,14 +112,10 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->acknowledgeCheck:Lcom/discord/views/CheckedSetting;
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->confirm:Landroid/view/View;
-
     iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->acknowledgeCheck:Lcom/discord/views/CheckedSetting;
 
+    if-eqz v2, :cond_4
+
     invoke-virtual {v2}, Lcom/discord/views/CheckedSetting;->isChecked()Z
 
     move-result v2
@@ -227,8 +220,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->mfaInput:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->getVisibility()I
 
     move-result v0
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership_ViewBinding.smali
index 4526160d78..38a394c6db 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsTransferOwnership_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali
index 4621df84ac..dd6d601cc2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsVanityUrl.java"
 
 
 # annotations
@@ -51,7 +52,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
     if-nez p2, :cond_0
 
@@ -102,6 +103,9 @@
     return p0
 
     :cond_3
+    return v0
+
+    :cond_4
     :goto_1
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
index 512e5db9ae..7ec749840c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsVanityUrl.java"
 
 
 # annotations
@@ -64,8 +65,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->vanityInput:Lcom/discord/app/AppEditText;
-
     invoke-virtual {v0, p1}, Lcom/discord/app/AppEditText;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->vanityInput:Lcom/discord/app/AppEditText;
@@ -126,8 +125,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->remove:Landroid/widget/TextView;
-
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
     move-result p1
@@ -195,8 +192,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->vanityInput:Lcom/discord/app/AppEditText;
-
     new-instance v1, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsVanityUrl$qLyMySALWEw4HEgs_ljgZRC7eY0;
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsVanityUrl$qLyMySALWEw4HEgs_ljgZRC7eY0;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model;)V
@@ -208,8 +203,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->remove:Landroid/widget/TextView;
-
     new-instance v1, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsVanityUrl$6Pl1NWiTxQjBULbPwhtSC0442yc;
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/servers/-$$Lambda$WidgetServerSettingsVanityUrl$6Pl1NWiTxQjBULbPwhtSC0442yc;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding$1.smali
index a6cd7a28b7..c0e9dd5033 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding$1;
 .super Lbutterknife/a/a;
+.source "WidgetServerSettingsVanityUrl_ViewBinding.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding.smali
index e98540f595..1d86efd73e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsVanityUrl_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali
index 124c0ac20c..422f34ddeb 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 
 # annotations
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 ed36ffaff0..803f598a8f 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
@@ -59,7 +60,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/stores/StoreAuditLog$AuditLogState;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;
-    .locals 21
+    .locals 20
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -93,15 +94,15 @@
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getEntries()Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v4
 
     goto :goto_0
 
     :cond_0
-    move-object v5, v3
+    move-object v4, v3
 
     :goto_0
-    if-nez v5, :cond_1
+    if-nez v4, :cond_1
 
     sget-object v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loading;->INSTANCE:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loading;
 
@@ -110,87 +111,87 @@
     return-object v1
 
     :cond_1
-    new-instance v5, Ljava/util/HashMap;
+    new-instance v4, Ljava/util/HashMap;
 
-    invoke-direct {v5}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v4}, Ljava/util/HashMap;-><init>()V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getDeletedTargets()Ljava/util/Map;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-virtual {v5, v6}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
+    invoke-virtual {v4, v5}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getEntries()Ljava/util/List;
 
-    move-result-object v6
+    move-result-object v5
 
-    check-cast v6, Ljava/lang/Iterable;
+    check-cast v5, Ljava/lang/Iterable;
 
-    invoke-interface {v6}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v6
+    move-result-object v5
 
     :cond_2
     :goto_1
-    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v6
 
-    if-eqz v7, :cond_6
+    if-eqz v6, :cond_8
 
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Lcom/discord/models/domain/ModelAuditLogEntry;
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
     move-result-object v7
 
-    check-cast v7, Lcom/discord/models/domain/ModelAuditLogEntry;
+    invoke-virtual {v4, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    move-result-object v7
+
+    if-nez v7, :cond_3
+
+    move-object v7, v4
+
+    check-cast v7, Ljava/util/Map;
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
     move-result-object v8
 
-    invoke-virtual {v5, v8}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    const-string v9, "entry.targetType"
 
-    move-result-object v8
+    invoke-static {v8, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-nez v8, :cond_3
+    new-instance v9, Ljava/util/HashMap;
 
-    move-object v8, v5
+    invoke-direct {v9}, Ljava/util/HashMap;-><init>()V
 
-    check-cast v8, Ljava/util/Map;
-
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
-    move-result-object v9
-
-    const-string v10, "entry.targetType"
-
-    invoke-static {v9, v10}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v10, Ljava/util/HashMap;
-
-    invoke-direct {v10}, Ljava/util/HashMap;-><init>()V
-
-    invoke-interface {v8, v9, v10}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v7, v8, v9}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_3
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    move-result-object v8
+    move-result-object v7
 
-    if-nez v8, :cond_4
+    if-nez v7, :cond_4
 
     goto :goto_2
 
     :cond_4
-    sget-object v9, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v8, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ordinal()I
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ordinal()I
 
-    move-result v8
+    move-result v7
 
-    aget v8, v9, v8
+    aget v7, v8, v7
 
-    packed-switch v8, :pswitch_data_0
+    packed-switch v7, :pswitch_data_0
 
     new-instance v1, Lkotlin/k;
 
@@ -200,147 +201,161 @@
 
     :goto_2
     :pswitch_0
-    move-object/from16 v9, p5
+    move-object/from16 v8, p5
 
-    :cond_5
-    move-object v8, v3
+    move-object v7, v3
 
     goto :goto_3
 
     :pswitch_1
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
-    move-result-wide v8
+    move-result-wide v7
 
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v8
+    move-result-object v7
 
-    move-object/from16 v9, p5
+    move-object/from16 v8, p5
 
-    invoke-interface {v9, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v8, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v7
 
-    check-cast v8, Lcom/discord/models/domain/ModelGuildRole;
+    check-cast v7, Lcom/discord/models/domain/ModelGuildRole;
 
-    if-eqz v8, :cond_5
+    if-eqz v7, :cond_5
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
+
+    goto :goto_3
+
+    :cond_5
+    move-object v7, v3
 
     goto :goto_3
 
     :pswitch_2
-    move-object/from16 v9, p5
+    move-object/from16 v8, p5
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
-    move-result-wide v10
+    move-result-wide v9
 
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-interface {v2, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v7
 
-    check-cast v8, Lcom/discord/models/domain/ModelUser;
+    check-cast v7, Lcom/discord/models/domain/ModelUser;
 
-    if-eqz v8, :cond_5
+    if-eqz v7, :cond_6
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
+
+    goto :goto_3
+
+    :cond_6
+    move-object v7, v3
 
     goto :goto_3
 
     :pswitch_3
-    move-object/from16 v9, p5
+    move-object/from16 v8, p5
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
+
+    move-result-wide v9
+
+    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v7
+
+    invoke-interface {v1, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Lcom/discord/models/domain/ModelChannel;
+
+    if-eqz v7, :cond_7
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_7
+
+    const-string v9, "#"
+
+    invoke-static {v7}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-virtual {v9, v7}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v7
+
+    goto :goto_3
+
+    :cond_7
+    move-object v7, v3
+
+    :goto_3
+    if-eqz v7, :cond_2
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+    move-result-object v9
+
+    invoke-virtual {v4, v9}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/Map;
+
+    if-eqz v9, :cond_2
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
     move-result-wide v10
 
     invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v8
+    move-result-object v6
 
-    invoke-interface {v1, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v8
-
-    check-cast v8, Lcom/discord/models/domain/ModelChannel;
-
-    if-eqz v8, :cond_5
-
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
-
-    move-result-object v8
-
-    if-eqz v8, :cond_5
-
-    const-string v10, "#"
-
-    invoke-static {v8}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v10, v8}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v8
-
-    :goto_3
-    if-eqz v8, :cond_2
-
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
-    move-result-object v10
-
-    invoke-virtual {v5, v10}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v10
-
-    check-cast v10, Ljava/util/Map;
-
-    if-eqz v10, :cond_2
-
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
-
-    move-result-wide v11
-
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v7
-
-    invoke-interface {v10, v7, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v9, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto/16 :goto_1
 
-    :cond_6
+    :cond_8
     sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    invoke-virtual {v5, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
-    if-nez v3, :cond_7
+    if-nez v3, :cond_9
 
-    move-object v3, v5
+    move-object v3, v4
 
     check-cast v3, Ljava/util/Map;
 
-    sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    new-instance v7, Ljava/util/HashMap;
+    new-instance v6, Ljava/util/HashMap;
 
-    invoke-direct {v7}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v6}, Ljava/util/HashMap;-><init>()V
 
-    invoke-interface {v3, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_7
+    :cond_9
     const-string v3, "channels"
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
@@ -353,79 +368,21 @@
 
     move-result-object v3
 
-    :cond_8
+    :cond_a
     :goto_4
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v5
 
-    if-eqz v6, :cond_a
+    if-eqz v5, :cond_c
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v5
 
-    check-cast v6, Ljava/util/Map$Entry;
+    check-cast v5, Ljava/util/Map$Entry;
 
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v7
-
-    const-string v8, "it.value"
-
-    invoke-static {v7, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v7, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->isGuildTextChannel()Z
-
-    move-result v7
-
-    if-eqz v7, :cond_9
-
-    const-string v7, "#"
-
-    goto :goto_5
-
-    :cond_9
-    const-string v7, ""
-
-    :goto_5
-    sget-object v8, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
-    invoke-virtual {v5, v8}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v8
-
-    check-cast v8, Ljava/util/Map;
-
-    if-eqz v8, :cond_8
-
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v9
-
-    const-string v10, "it.value"
-
-    invoke-static {v9, v10}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v9, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v9
-
-    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v9
-
-    new-instance v10, Ljava/lang/StringBuilder;
-
-    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v10, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -435,42 +392,100 @@
 
     check-cast v6, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->isGuildTextChannel()Z
 
-    move-result-object v6
+    move-result v6
 
-    invoke-virtual {v10, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    if-eqz v6, :cond_b
 
-    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    const-string v6, "#"
 
-    move-result-object v6
+    goto :goto_5
 
-    invoke-interface {v8, v9, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    :cond_b
+    const-string v6, ""
+
+    :goto_5
+    sget-object v7, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+    invoke-virtual {v4, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Ljava/util/Map;
+
+    if-eqz v7, :cond_a
+
+    invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v8
+
+    const-string v9, "it.value"
+
+    invoke-static {v8, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v8, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v8
+
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v8
+
+    new-instance v9, Ljava/lang/StringBuilder;
+
+    invoke-direct {v9}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v5
+
+    const-string v6, "it.value"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v5, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-interface {v7, v8, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_4
 
-    :cond_a
+    :cond_c
     sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    invoke-virtual {v5, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
-    if-nez v3, :cond_b
+    if-nez v3, :cond_d
 
-    move-object v3, v5
+    move-object v3, v4
 
     check-cast v3, Ljava/util/Map;
 
-    sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    new-instance v7, Ljava/util/HashMap;
+    new-instance v6, Ljava/util/HashMap;
 
-    invoke-direct {v7}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v6}, Ljava/util/HashMap;-><init>()V
 
-    invoke-interface {v3, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_b
+    :cond_d
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getUsers()Ljava/util/Map;
 
     move-result-object v3
@@ -483,120 +498,120 @@
 
     move-result-object v3
 
-    :cond_c
+    :cond_e
     :goto_6
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v5
 
-    if-eqz v6, :cond_d
+    if-eqz v5, :cond_f
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
+    move-result-object v5
+
+    check-cast v5, Ljava/util/Map$Entry;
+
+    sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+    invoke-virtual {v4, v6}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
     move-result-object v6
 
-    check-cast v6, Ljava/util/Map$Entry;
+    check-cast v6, Ljava/util/Map;
 
-    sget-object v7, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    if-eqz v6, :cond_e
 
-    invoke-virtual {v5, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v5}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
     move-result-object v7
 
-    check-cast v7, Ljava/util/Map;
+    invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    if-eqz v7, :cond_c
+    move-result-object v5
 
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+    check-cast v5, Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v8
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
 
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    move-result-object v5
 
-    move-result-object v6
-
-    check-cast v6, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-interface {v7, v8, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v6, v7, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_6
 
-    :cond_d
-    sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
-    invoke-virtual {v5, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    if-nez v3, :cond_e
-
-    move-object v3, v5
-
-    check-cast v3, Ljava/util/Map;
-
-    sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
-    new-instance v7, Ljava/util/HashMap;
-
-    invoke-direct {v7}, Ljava/util/HashMap;-><init>()V
-
-    invoke-interface {v3, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_e
-    sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
-    invoke-virtual {v5, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/Map;
-
-    if-eqz v3, :cond_f
-
-    iget-wide v6, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$guildId:J
-
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v6
-
-    const-string v7, "guild"
-
-    move-object/from16 v8, p2
-
-    invoke-static {v8, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-interface {v3, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
     :cond_f
-    sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    invoke-virtual {v5, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
     if-nez v3, :cond_10
 
-    move-object v3, v5
+    move-object v3, v4
 
     check-cast v3, Ljava/util/Map;
 
-    sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    new-instance v7, Ljava/util/HashMap;
+    new-instance v6, Ljava/util/HashMap;
 
-    invoke-direct {v7}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v6}, Ljava/util/HashMap;-><init>()V
 
-    invoke-interface {v3, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_10
+    sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+    invoke-virtual {v4, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/Map;
+
+    if-eqz v3, :cond_11
+
+    iget-wide v5, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$guildId:J
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v5
+
+    const-string v6, "guild"
+
+    move-object/from16 v7, p2
+
+    invoke-static {v7, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-interface {v3, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_11
+    sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+    invoke-virtual {v4, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-nez v3, :cond_12
+
+    move-object v3, v4
+
+    check-cast v3, Ljava/util/Map;
+
+    sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+    new-instance v6, Ljava/util/HashMap;
+
+    invoke-direct {v6}, Ljava/util/HashMap;-><init>()V
+
+    invoke-interface {v3, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_12
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getWebhooks()Ljava/util/List;
 
     move-result-object v3
@@ -607,99 +622,135 @@
 
     move-result-object v3
 
-    :cond_11
+    :cond_13
     :goto_7
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v5
 
-    if-eqz v6, :cond_12
+    if-eqz v5, :cond_14
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/models/domain/ModelWebhook;
+
+    sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+    invoke-virtual {v4, v6}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
     move-result-object v6
 
-    check-cast v6, Lcom/discord/models/domain/ModelWebhook;
+    check-cast v6, Ljava/util/Map;
 
-    sget-object v7, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    if-eqz v6, :cond_13
 
-    invoke-virtual {v5, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelWebhook;->getId()J
+
+    move-result-wide v7
+
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v7
 
-    check-cast v7, Ljava/util/Map;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelWebhook;->getName()Ljava/lang/String;
 
-    if-eqz v7, :cond_11
+    move-result-object v5
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelWebhook;->getId()J
-
-    move-result-wide v8
-
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v8
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelWebhook;->getName()Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-interface {v7, v8, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v6, v7, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_7
 
-    :cond_12
+    :cond_14
     new-instance v3, Ljava/util/ArrayList;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getEntries()Ljava/util/List;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-interface {v6}, Ljava/util/List;->size()I
+    invoke-interface {v5}, Ljava/util/List;->size()I
 
-    move-result v6
+    move-result v5
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
-    add-int/2addr v6, v7
+    add-int/2addr v5, v6
 
-    invoke-direct {v3, v6}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getEntries()Ljava/util/List;
 
-    move-result-object v6
+    move-result-object v5
 
-    check-cast v6, Ljava/lang/Iterable;
+    check-cast v5, Ljava/lang/Iterable;
 
-    invoke-interface {v6}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v6
+    move-result-object v5
 
     :goto_8
-    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_18
+    if-eqz v7, :cond_1a
 
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v7
 
-    move-object v9, v3
+    move-object v8, v3
 
-    check-cast v9, Ljava/util/Collection;
+    check-cast v8, Ljava/util/Collection;
 
-    check-cast v8, Lcom/discord/models/domain/ModelAuditLogEntry;
+    check-cast v7, Lcom/discord/models/domain/ModelAuditLogEntry;
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    move-result-object v10
+    move-result-object v9
 
-    sget-object v11, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+    sget-object v10, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    if-ne v10, v11, :cond_13
+    if-ne v9, v10, :cond_15
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()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/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Lcom/discord/models/domain/ModelChannel;
+
+    if-eqz v9, :cond_15
+
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->isGuildTextChannel()Z
+
+    move-result v9
+
+    if-ne v9, v6, :cond_15
+
+    const-string v9, "#"
+
+    goto :goto_9
+
+    :cond_15
+    const-string v9, ""
+
+    :goto_9
+    move-object v14, v9
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getUsers()Ljava/util/Map;
+
+    move-result-object v9
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getUserId()J
 
     move-result-wide v10
 
@@ -707,199 +758,150 @@
 
     move-result-object v10
 
-    invoke-interface {v1, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v9, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v10
+    move-result-object v9
 
-    check-cast v10, Lcom/discord/models/domain/ModelChannel;
+    check-cast v9, Lcom/discord/models/domain/ModelUser;
 
-    if-eqz v10, :cond_13
+    if-eqz v9, :cond_16
 
-    invoke-virtual {v10}, Lcom/discord/models/domain/ModelChannel;->isGuildTextChannel()Z
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
 
-    move-result v10
+    move-result-object v9
 
-    if-ne v10, v7, :cond_13
+    if-nez v9, :cond_17
 
-    const-string v10, "#"
+    :cond_16
+    const-string v9, ""
 
-    goto :goto_9
+    :cond_17
+    move-object v11, v9
 
-    :cond_13
-    const-string v10, ""
+    new-instance v15, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;
 
-    :goto_9
-    move-object v15, v10
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getId()J
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getUsers()Ljava/util/Map;
-
-    move-result-object v10
-
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelAuditLogEntry;->getUserId()J
-
-    move-result-wide v11
-
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v11
-
-    invoke-interface {v10, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v10
-
-    check-cast v10, Lcom/discord/models/domain/ModelUser;
-
-    if-eqz v10, :cond_15
-
-    invoke-virtual {v10}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
-
-    move-result-object v10
-
-    if-nez v10, :cond_14
-
-    goto :goto_b
-
-    :cond_14
-    :goto_a
-    move-object v12, v10
-
-    goto :goto_c
-
-    :cond_15
-    :goto_b
-    const-string v10, ""
-
-    goto :goto_a
-
-    :goto_c
-    new-instance v14, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;
-
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelAuditLogEntry;->getId()J
-
-    move-result-wide v10
+    move-result-wide v9
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getSelectedItemId()Ljava/lang/Long;
 
-    move-result-object v13
+    move-result-object v12
 
-    if-nez v13, :cond_16
+    if-nez v12, :cond_18
 
-    goto :goto_d
+    goto :goto_a
 
-    :cond_16
-    invoke-virtual {v13}, Ljava/lang/Long;->longValue()J
+    :cond_18
+    invoke-virtual {v12}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v16
+    move-result-wide v12
 
-    cmp-long v13, v10, v16
+    cmp-long v16, v9, v12
 
-    if-nez v13, :cond_17
+    if-nez v16, :cond_19
 
     const/16 v16, 0x1
 
-    goto :goto_e
+    goto :goto_b
 
-    :cond_17
-    :goto_d
-    const/4 v10, 0x0
+    :cond_19
+    :goto_a
+    const/4 v9, 0x0
 
     const/16 v16, 0x0
 
-    :goto_e
+    :goto_b
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getUsers()Ljava/util/Map;
 
-    move-result-object v10
+    move-result-object v9
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelAuditLogEntry;->getUserId()J
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelAuditLogEntry;->getUserId()J
 
-    move-result-wide v17
+    move-result-wide v12
 
-    invoke-static/range {v17 .. v18}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v11
-
-    invoke-interface {v10, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v10
 
-    move-object/from16 v17, v10
+    invoke-interface {v9, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v9
+
+    move-object/from16 v17, v9
 
     check-cast v17, Lcom/discord/models/domain/ModelUser;
 
-    sget-object v10, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v9, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    iget-object v13, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
+    iget-object v12, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
-    move-object v11, v5
+    move-object v13, v4
 
-    check-cast v11, Ljava/util/Map;
+    check-cast v13, Ljava/util/Map;
 
-    move-object/from16 v19, v11
+    move-object v10, v7
 
-    move-object v11, v8
+    move-object/from16 p2, v13
 
-    move-object/from16 v20, v14
+    invoke-virtual/range {v9 .. v14}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getHeaderString(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Landroid/content/Context;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
 
-    move-object/from16 v14, v19
+    move-result-object v9
 
-    invoke-virtual/range {v10 .. v15}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getHeaderString(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Landroid/content/Context;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+    move-object v13, v9
 
-    move-result-object v10
+    check-cast v13, Ljava/lang/CharSequence;
 
-    move-object v14, v10
+    sget-object v9, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    check-cast v14, Ljava/lang/CharSequence;
+    iget-object v10, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
-    sget-object v10, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
+    move-object/from16 v11, p2
 
-    iget-object v11, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
+    invoke-virtual {v9, v10, v7, v11}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getChangeSummary(Landroid/content/Context;Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/util/Map;)Ljava/lang/CharSequence;
 
-    move-object/from16 v12, v19
+    move-result-object v14
 
-    invoke-virtual {v10, v11, v8, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getChangeSummary(Landroid/content/Context;Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/util/Map;)Ljava/lang/CharSequence;
+    sget-object v9, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    move-result-object v15
-
-    sget-object v10, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
-
-    invoke-virtual {v10, v8}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->hasChangesToRender(Lcom/discord/models/domain/ModelAuditLogEntry;)Z
+    invoke-virtual {v9, v7}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->hasChangesToRender(Lcom/discord/models/domain/ModelAuditLogEntry;)Z
 
     move-result v18
 
-    sget-object v10, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v9, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    iget-object v11, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
+    iget-object v10, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
-    invoke-virtual {v10, v8, v11}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTimestampString(Lcom/discord/models/domain/ModelAuditLogEntry;Landroid/content/Context;)Ljava/lang/CharSequence;
+    invoke-virtual {v9, v7, v10}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTimestampString(Lcom/discord/models/domain/ModelAuditLogEntry;Landroid/content/Context;)Ljava/lang/CharSequence;
 
     move-result-object v19
 
-    move-object/from16 v10, v20
+    move-object v9, v15
 
-    move-object v11, v8
+    move-object v10, v7
 
-    move/from16 v12, v16
+    move/from16 v11, v16
 
-    move-object/from16 v13, v17
+    move-object/from16 v12, v17
 
-    move/from16 v16, v18
+    move-object v7, v15
 
-    move-object/from16 v17, v19
+    move/from16 v15, v18
 
-    invoke-direct/range {v10 .. v17}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;-><init>(Lcom/discord/models/domain/ModelAuditLogEntry;ZLcom/discord/models/domain/ModelUser;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZLjava/lang/CharSequence;)V
+    move-object/from16 v16, v19
 
-    move-object/from16 v8, v20
+    invoke-direct/range {v9 .. v16}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;-><init>(Lcom/discord/models/domain/ModelAuditLogEntry;ZLcom/discord/models/domain/ModelUser;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZLjava/lang/CharSequence;)V
 
-    invoke-interface {v9, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v8, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto/16 :goto_8
 
-    :cond_18
+    :cond_1a
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->isLoading()Z
 
     move-result v1
 
-    if-eqz v1, :cond_19
+    if-eqz v1, :cond_1b
 
     new-instance v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingItem;
 
@@ -907,16 +909,16 @@
 
     invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :cond_19
+    :cond_1b
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getFilter()Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->getUserFilter()J
 
-    move-result-wide v5
+    move-result-wide v4
 
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -926,15 +928,15 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelUser;
 
-    if-eqz v1, :cond_1a
+    if-eqz v1, :cond_1c
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
 
     move-result-object v1
 
-    if-nez v1, :cond_1b
+    if-nez v1, :cond_1d
 
-    :cond_1a
+    :cond_1c
     iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
     const v2, 0x7f12077f
@@ -943,20 +945,20 @@
 
     move-result-object v1
 
-    :cond_1b
+    :cond_1d
     iget-object v2, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
-    sget-object v5, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getFilter()Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
-    move-result-object v4
+    move-result-object v5
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->getActionFilter()I
+    invoke-virtual {v5}, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->getActionFilter()I
 
-    move-result v4
+    move-result v5
 
-    invoke-virtual {v5, v4}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getActionName(I)I
+    invoke-virtual {v4, v5}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getActionName(I)I
 
     move-result v4
 
@@ -982,8 +984,6 @@
 
     return-object v4
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_3
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 8e41f51d0c..a935e1c3c4 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali
index 620f924e45..74e1d0526b 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded;
 .super Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;
+.source "WidgetServerSettingsAuditLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loading.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loading.smali
index 017fcee761..15bafa8371 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loading.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loading.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loading;
 .super Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;
+.source "WidgetServerSettingsAuditLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model.smali
index b97bdbf0d1..e0bb8c2c59 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 
 # annotations
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 edfeb5baf4..794093d5a1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 # interfaces
 .implements Landroidx/appcompat/widget/PopupMenu$OnMenuItemClickListener;
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 c9418bc198..76bb9b9894 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali
index 1d8a5fa4fd..dfa3a7dcd7 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2;
 .super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "WidgetServerSettingsAuditLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali
index f18548951d..9ee6066cc9 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali
index 5787c0ea7d..ce73981830 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 8c31baa4b1..4d69ccbce5 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetServerSettingsAuditLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1e778c8705..c97c83a8aa 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsAuditLog.kt"
 
 
 # annotations
@@ -490,8 +491,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali
index 77b3015188..66021316cd 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$2.smali
index 9c34972860..821659f731 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 4862abf4b2..d5a9b00fe0 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsAuditLogAdapter.kt"
 
 
 # annotations
@@ -688,6 +689,12 @@
 
     const v1, 0x7f040292
 
+    invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundColor(I)V
+
     goto :goto_3
 
     :cond_3
@@ -711,13 +718,13 @@
 
     const v1, 0x7f04028a
 
-    :goto_3
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
     move-result v0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundColor(I)V
 
+    :goto_3
     iget-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->itemView:Landroid/view/View;
 
     new-instance v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$2;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingItem.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingItem.smali
index 62b5d48db5..6fc1f01c09 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 26e70873fb..32c442f87b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsAuditLogAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$Companion.smali
index 42100f707e..fdfc852155 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali
index f0cc661a56..1344d2fff1 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerSettingsAuditLogAdapter.kt"
 
 
 # annotations
@@ -121,7 +122,6 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingViewHolder;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
@@ -131,7 +131,9 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali
index 776ba3ab59..21f60d0181 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder$onConfigure$1.smali
index 6b3a783568..7810747c5a 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -78,6 +79,8 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder.smali
index 49d79939ea..4b9c70970d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$1.smali
index bc928321df..8b33ef9185 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -78,6 +79,8 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
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 e17d48856e..ba3960b29f 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali
index c3b56883c7..266cecc625 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$Companion.smali
index b154eb684a..c99d6fe402 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali
index b5a4a2ee57..722ba2f80a 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetServerSettingsAuditLogFilterAdapter.kt"
 
 
 # annotations
@@ -162,7 +163,6 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
@@ -172,7 +172,9 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali
index d9aa469966..fec99ebdb5 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali
index 546eebd82f..7b7dbecb07 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
index 8f07dc2965..0954987cee 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2.smali
index 549d66e63e..280b06f209 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali
index 3701745b78..d11e84c966 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali
index 5d0e85389d..4306d4f9c9 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali
index 02a852f353..baf3585b9e 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali
index 4adb452fe0..d60c62f9a1 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 a0fe10b84c..3a993b0134 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 3009b9d9b8..03e22366c8 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 
 # annotations
@@ -98,7 +99,7 @@
 
     move-result-object p5
 
-    invoke-virtual {p5}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p5}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p5
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali
index 310e7e5e5b..9146f63ca6 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 
 # annotations
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 6673d974c8..33e58cb536 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -67,6 +68,8 @@
 
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali
index 3bf3243eae..2e4d7d756e 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 87878a2b9e..cea843ed9d 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 e584916bb1..d30d71b6f6 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1;
 .super Ljava/lang/Object;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
 .implements Landroid/text/TextWatcher;
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 6144bceeaf..4e4aa21dc9 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 
 # annotations
@@ -211,6 +212,8 @@
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;->configure(Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -264,8 +267,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -519,6 +520,8 @@
 
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$Companion.smali
index 75962e72e1..60708bf9e1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetChangeLog$Companion;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
index 682a066a32..8a960000d2 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
index 1abb096bc7..a32150f963 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
index 1896606bc8..4ea50d930b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali
index 315ef4ef86..4e7b299936 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$configureMedia$1;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Landroid/media/MediaPlayer$OnCompletionListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
index a0491991f1..be6c3090a7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$configureMedia$2;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
index 289c58ad08..5a217cb6f7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$configureMedia$3;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Landroid/media/MediaPlayer$OnPreparedListener;
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 dae316267a..ac68c1f051 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b89e210e6d..c3b94a0dde 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8102c9d14f..0c2db20c22 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 cc909d05cb..e799a05ecb 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1;
 .super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -56,7 +57,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/a;->gk()Landroid/graphics/drawable/Animatable;
+    invoke-interface {p1}, Lcom/facebook/drawee/d/a;->gj()Landroid/graphics/drawable/Animatable;
 
     move-result-object p1
 
@@ -64,6 +65,8 @@
 
     invoke-interface {p1}, Landroid/graphics/drawable/Animatable;->start()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
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 1bd13a75fa..d0eeaca94a 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1;
 .super Lcom/facebook/drawee/controller/b;
+.source "WidgetChangeLog.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
index 98ef1bd6c4..f31c1666ff 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetChangeLog;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetChangeLog.kt"
 
 
 # annotations
@@ -307,6 +308,8 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -348,7 +351,7 @@
 
     invoke-static {v0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fN()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
@@ -370,7 +373,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Lcom/facebook/drawee/backends/pipeline/e;->x(Z)Lcom/facebook/drawee/controller/a;
+    invoke-virtual {p1, v1}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
 
     move-result-object p1
 
@@ -386,7 +389,7 @@
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -644,8 +647,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Companion.smali
index ea1be6b788..9731f2d3dc 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettings$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
index 229e8e3001..c4b0357de9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 2548e66d2d..7e6e5d8843 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
index 6da4844654..dfe1d52bb2 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$10;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
index ee450402da..8f0cad8dcf 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$11;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
index 441f173d70..14932b9fc3 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$12;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
index d5f25274a7..01f01f386f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$13;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
index 08e19d867e..45955969e5 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$14;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
index abe1ee53c3..c21e6dd0a3 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$15;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
index b83a438adc..ddeff82232 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$16;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
index 0d9cbc28df..db5ffd1487 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
index deeb50b544..88aadb3724 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
index 07ff602296..8bb250b287 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$5;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
index 64c8a3801e..551e22836e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$6;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
index 01f4ced7a6..8e54c6e5f7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$7;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
index 3e34851ec8..5c257f184f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$8;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
index a19cc1aae9..7825b90777 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$9;
 .super Ljava/lang/Object;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 88daa91dc8..540ca81b20 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 18c10dc856..63db366202 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettings$showLogoutDialog$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 17dfd1b63d..d966161d68 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettings;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettings.kt"
 
 
 # annotations
@@ -1207,8 +1208,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1345,7 +1344,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, " - 8.3.0 (830)"
+    const-string v0, " - 8.3.1 (831)"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$Companion.smali
index 3344219b71..b033f56757 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAccount$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$1.smali
index 4ac2917f5e..c433aa28ac 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$2.smali
index c411d8174f..81d673fb33 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$3.smali
index 06a590f682..3d6989a5a7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$4.smali
index 63f31cdae9..48bdab1994 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$4;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$5.smali
index c36268ebe1..b95f076591 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali
index 53563351f9..b482139630 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6.smali
index 63bc4109db..b30a0da20e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$6;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7$1.smali
index 5b465847d8..82947191bb 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$7$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali
index 0089a0d600..b1ff1376e0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$7;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$1.smali
index cbc5fdd357..bdb5ab9d46 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$2.smali
index 15f79e31f5..8b6867922f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$3.smali
index 568adba58a..be57985f4c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$4.smali
index df5ec48412..269b43cce2 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
index ba805cf483..79407c8db6 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAccount$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsAccount.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali
index 1ba43271d3..4c8534cd22 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAccount;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsAccount.kt"
 
 
 # annotations
@@ -1683,8 +1684,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAccount;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model.smali
index 984fd55b86..29e4c57236 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccountChangePassword.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword.smali
index f9a30e2259..0fb91009d9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetSettingsAccountChangePassword.java"
 
 
 # annotations
@@ -74,8 +75,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword;->mfaContainer:Landroid/view/View;
-
     invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model;->access$100(Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model;)Lcom/discord/models/domain/ModelUser;
 
     move-result-object v1
@@ -101,8 +100,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword;->cancel:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/settings/-$$Lambda$WidgetSettingsAccountChangePassword$cyuTxPJAqmVaVxSPKgGqtX0ElPU;
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/settings/-$$Lambda$WidgetSettingsAccountChangePassword$cyuTxPJAqmVaVxSPKgGqtX0ElPU;-><init>(Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword;)V
@@ -114,8 +111,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword;->confirm:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/settings/-$$Lambda$WidgetSettingsAccountChangePassword$_YaugBntobNoGZv4e_WxnCK-jQM;
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/settings/-$$Lambda$WidgetSettingsAccountChangePassword$_YaugBntobNoGZv4e_WxnCK-jQM;-><init>(Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword;Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model;)V
@@ -197,17 +192,14 @@
 
     move-result-object p2
 
-    :goto_0
-    move-object v7, p2
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p2, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v7, p2
 
-    :goto_1
     new-instance p2, Lcom/discord/restapi/RestAPIParams$UserInfo;
 
     invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model;->access$100(Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword$Model;)Lcom/discord/models/domain/ModelUser;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword_ViewBinding.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword_ViewBinding.smali
index 683e4889e4..8d4ff4262d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccountChangePassword_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/settings/WidgetSettingsAccountChangePassword_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAccountChangePassword_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
index 2561489efc..ad4c683a0b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAppearance$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAppearance.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
index f8d71359f2..7e0a83f4db 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAppearance.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 c09fd4f7c0..1700b99b1e 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsAppearance.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0880af4a67..7a10e6efa5 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsAppearance.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
index 8d3a0db457..53775ef0dc 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsAppearance.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
index 36c4590f00..45261803d0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsAppearance.kt"
 
 
 # annotations
@@ -352,8 +353,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
index 41b30e39f0..6108898d67 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsBehavior$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsBehavior.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
index 3096721913..76ab68c6e4 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsBehavior.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
index 9924633b3e..a76e150084 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsBehavior.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
index a931f34965..73dc4b8b5d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsBehavior.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$4.smali
index 42c21a158c..8f4568e17c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$4;
 .super Ljava/lang/Object;
+.source "WidgetSettingsBehavior.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$3$1.smali
index 30197f91d4..6d423ca624 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$3$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsBehavior.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
index 6de7039404..f677b779c0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsBehavior;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsBehavior.kt"
 
 
 # annotations
@@ -286,8 +287,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
index 192073b90a..29b197da51 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsDeveloper.kt"
 
 
 # instance fields
@@ -24,8 +25,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion$get$1.smali
index 319f7c1422..d027bcbd16 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion$get$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetSettingsGames.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion.smali
index 122a46795a..67976c82da 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsGames$Companion$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsGames.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model.smali
index 2ba650e6cb..e0a506e3f4 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsGames$Companion$Model;
 .super Ljava/lang/Object;
+.source "WidgetSettingsGames.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion.smali
index 642e609ed2..12ce1617fd 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsGames$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsGames.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$1.smali
index ef4ee57197..00cc69fb05 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsGames.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2$1.smali
index 3427e1aae0..42ed9a9d6f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsGames.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali
index cb4e4a0671..35a1caa9fd 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsGames.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$onResume$1.smali
index 8795b67761..39c3dbb8a7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$onResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsGames$onResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetSettingsGames.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$sam$rx_functions_Func3$0.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$sam$rx_functions_Func3$0.smali
index 80fd710bf2..d99150f5ba 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$sam$rx_functions_Func3$0.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$sam$rx_functions_Func3$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsGames$sam$rx_functions_Func3$0;
 .super Ljava/lang/Object;
+.source "WidgetSettingsGames.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali
index ebf33072c4..878f19a849 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsGames;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsGames.kt"
 
 
 # annotations
@@ -372,9 +373,9 @@
 
     move-result-object v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eqz v1, :cond_1
 
@@ -444,9 +445,12 @@
 
     if-eqz v4, :cond_4
 
-    const/4 v2, 0x1
+    goto :goto_4
 
     :cond_4
+    const/4 v2, 0x0
+
+    :goto_4
     invoke-virtual {v0, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsGames$Companion$Model;->getAppHasUsagePermission()Z
@@ -463,12 +467,12 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_5
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->af(Ljava/lang/String;)V
 
-    :goto_4
+    :goto_5
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getTrackCS()Lcom/discord/views/CheckedSetting;
 
     move-result-object v0
@@ -667,8 +671,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGames;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
index b125a28a64..c43571eb52 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/settings/WidgetSettingsLanguage;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsLanguage.java"
 
 
 # instance fields
@@ -40,8 +41,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->languageText:Landroid/widget/TextView;
-
     invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->getLocaleResId(Ljava/lang/String;)I
 
     move-result v1
@@ -57,8 +56,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->languageFlag:Landroid/widget/ImageView;
-
     invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->getLocaleFlagResId(Ljava/lang/String;)I
 
     move-result p1
@@ -1879,8 +1876,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->syncSwitch:Lcom/discord/views/CheckedSetting;
-
     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getLocaleSync()Z
 
     move-result v2
@@ -1902,8 +1897,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->language:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/settings/-$$Lambda$WidgetSettingsLanguage$Zp4pidMnvB30jk2LvaG609Kp1nU;
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/settings/-$$Lambda$WidgetSettingsLanguage$Zp4pidMnvB30jk2LvaG609Kp1nU;-><init>(Lcom/discord/widgets/settings/WidgetSettingsLanguage;)V
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali
index 0e58d3e381..d0de81b800 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsLanguageSelect.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
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 346f9c5251..814ba80be0 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSettingsLanguageSelect.kt"
 
 
 # annotations
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 886b759779..2cd64cea37 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetSettingsLanguageSelect.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
index 969fc5a7cd..e0c3c51242 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsLanguageSelect.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
index dd68507027..5cf1fdcb66 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;
 .super Ljava/lang/Object;
+.source "WidgetSettingsLanguageSelect.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
index 04f1a9e7a5..4fd716c2e0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model;
 .super Ljava/lang/Object;
+.source "WidgetSettingsLanguageSelect.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
index 03448a7b20..19c59aa22f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetSettingsLanguageSelect.kt"
 
 
 # annotations
@@ -126,8 +127,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage_ViewBinding.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage_ViewBinding.smali
index 1a04eba8bb..d9bd0cfca2 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/settings/WidgetSettingsLanguage_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetSettingsLanguage_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
index 084e9b3cf0..8ae28529f0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsMedia.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
index 9e4a384871..5bb2241795 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsMedia.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
index 021400a564..13c3a167c4 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsMedia.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
index 085f7a9139..13b40d2fbb 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsMedia.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
index 556b3c0ad4..9f2ec4d1da 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsMedia.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
index 85b67a67e3..daaa44027e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetSettingsMedia.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 b00ce41464..fb424e2eed 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsMedia.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
index 2f32df166a..9e7b828950 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsMedia;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsMedia.kt"
 
 
 # annotations
@@ -373,8 +374,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
index d6fd112b5d..85c2f0b601 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsNotifications$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotifications.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
index c1aabdef3c..db656923fc 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
index ea11710dd9..8ad3217ee4 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
index ab6a9e2f4d..f3ede737e0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
index a952ce9623..f098f8dd9c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
index 35a1107508..81c34f38b0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$6.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$6.smali
index c9b17481a2..798585fb9b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$6.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$6;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotifications.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 59e3cb719d..12c1665854 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsNotifications.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
index 6fa567ba00..c4dfda228e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsNotifications;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsNotifications.kt"
 
 
 # annotations
@@ -524,8 +525,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
index c6f1c5f6cc..ad3e4d1a8b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotificationsOs.kt"
 
 
 # annotations
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 5a8408e677..16e4fe4ca2 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsNotificationsOs.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
index 18ccf0b5f3..bae5c8b387 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotificationsOs.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
index cfa706f4c6..201b871ade 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotificationsOs.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali
index 5965ffe5df..c92715811c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsNotificationsOs.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
index 4e2d8dd6e5..16493e8c76 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetSettingsNotificationsOs.kt"
 
 
 # annotations
@@ -254,8 +255,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
index 64d7873923..38c4cf6c78 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
index 36d0207336..4ae5ca5c66 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
index f3ec40d9f2..5a5690c4ff 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
index 98c423575c..5b8714945e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -95,7 +96,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/d/a;->Mi()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.smali
index f14622dd68..3df4e7e4c0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function6;
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 bc276f3201..5e26a6f581 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
index fb78578c7d..7ce27d11ea 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali
index 9b60426027..be36b67258 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali
index d107058f11..c8c44fcaf1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
index 0612bce6d8..12f1f38514 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
index b545cff5c6..4914335f73 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
index d1f537b660..a9e529cec2 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali
index ac4d2a7164..0d7b6e30de 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
index a0e66bc3b5..90f2c491a1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 13c3c9d9c6..73fcaeb921 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function5;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
index 6506cdb936..fc488c91e1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali
index 21dcf933cf..a6e82f09c8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
index 3536799ca5..777ad556c7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 cba2c056f5..3dcabcac5a 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function5;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
index a602c65f23..2d04e67ba5 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 71737315f2..62874a425b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -67,11 +68,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1;->$harvestState:Lcom/discord/utilities/rest/RestAPI$HarvestState;
-
-    invoke-static {v0, p1, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$onRequestDataClick(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;Landroid/content/Context;Lcom/discord/utilities/rest/RestAPI$HarvestState;)V
+    invoke-static {v1, p1, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$onRequestDataClick(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;Landroid/content/Context;Lcom/discord/utilities/rest/RestAPI$HarvestState;)V
 
     return-void
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
index b14e70deee..5763580c8d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
index ef7a045f8d..ef045d6423 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 33315b4a86..fdcf196d14 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 35765dc116..af77512c05 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 32d410ef49..ef763d69d3 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 994c5b0fe8..7f1b859536 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 333b409f0d..21b9d86835 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 a87c1d54ca..5ad7b3ba21 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 0ba959568c..2b4470b79d 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1.smali
index 55ad4453da..571fd74454 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
index f6989a8090..c06fb37ff1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 f92560a660..54667922e8 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func6$0.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func6$0.smali
index ae63fbc74b..21031769a5 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func6$0.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func6$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func6$0;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Func6;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali
index d0a813a518..e95fd6f3bb 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali
index dfd0b9aaae..b015689d23 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 edfe0a5e84..a39157ac4c 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali
index db9dbd0300..1eeb09cc8a 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
index 11f2e090b0..cc7156af4b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 f6fef93b59..6f0934ee5f 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsPrivacy.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
index b44e4ba7b6..efdbade874 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsPrivacy.kt"
 
 
 # annotations
@@ -775,6 +776,8 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/views/RadioManager;->a(Landroid/widget/Checkable;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1690,6 +1693,8 @@
 
     invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->show()V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -1837,12 +1842,11 @@
 
     const/4 p2, 0x0
 
-    :goto_0
     invoke-static {p2}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     if-nez p1, :cond_1
@@ -1851,6 +1855,10 @@
 
     check-cast p2, Ljava/util/Set;
 
+    invoke-static {p2}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p2
+
     goto :goto_0
 
     :cond_1
@@ -1870,8 +1878,8 @@
 
     move-result-object p2
 
-    :goto_1
-    invoke-virtual {p2}, Lrx/Observable;->KI()Lrx/Observable;
+    :goto_0
+    invoke-virtual {p2}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p2
 
@@ -1921,6 +1929,8 @@
 
     invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -2025,8 +2035,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -2117,6 +2125,8 @@
 
     invoke-virtual {v0}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
index e9fc0bb206..c92523c8b0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
index 142309d62d..a3e91f11e3 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali
index b298ce61c1..37124f045f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali
index 1747c6bf38..e2db81214a 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali
index 23b7f4dcd2..80dd0ae03e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali
index 81bcab464e..727e15e07d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 2e724eab3e..9e2a9aabf6 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSettingsUserConnections.kt"
 
 
 # annotations
@@ -467,7 +468,7 @@
 .end method
 
 .method private final updateUserConnection(Lcom/discord/models/domain/ModelConnectedAccount;)V
-    .locals 4
+    .locals 6
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserConnections()Lcom/discord/stores/StoreUserConnections;
 
@@ -527,15 +528,19 @@
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getPresences()Lcom/discord/stores/StoreUserPresence;
 
-    move-result-object p1
-
-    const/4 v0, 0x0
+    move-result-object v0
 
     const/4 v1, 0x2
 
     const/4 v2, 0x0
 
-    invoke-static {p1, v2, v0, v1, v2}, Lcom/discord/stores/StoreUserPresence;->updateActivity$default(Lcom/discord/stores/StoreUserPresence;Lcom/discord/models/domain/ModelPresence$Activity;ZILjava/lang/Object;)V
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreUserPresence;->updateActivity$default(Lcom/discord/stores/StoreUserPresence;ILcom/discord/models/domain/ModelPresence$Activity;ZILjava/lang/Object;)V
 
     :cond_0
     return-void
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 d2880b1980..c2b03e2fb1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetSettingsUserConnections.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
index aa58adbc1c..2e3cdd4826 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
index 961188563e..daf1de6f55 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 27e597fa22..cdb9f50047 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
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 939f10646e..2d72073627 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$2.smali
index 427e36cc02..1dc1ebe4bb 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsUserConnections.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
index 933c7d3968..bb545d382c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsUserConnections.kt"
 
 
 # annotations
@@ -314,8 +315,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
index 3859b7d1e3..3fb55ca4b6 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnectionsAdd.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
index 266c20eb02..11a66a928f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSettingsUserConnectionsAdd.kt"
 
 
 # annotations
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 91c414677e..e1b11f30ea 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetSettingsUserConnectionsAdd.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
index cf1d80e12a..c6da9d78d7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnectionsAdd.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
index bc35de7e3e..178dde9652 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnectionsAdd.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
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 7517379003..416902e23b 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsUserConnectionsAdd.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
index 56ffade025..7beebea6ac 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetSettingsUserConnectionsAdd.kt"
 
 
 # annotations
@@ -126,8 +127,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -350,6 +349,8 @@
 
     invoke-virtual {p2, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;->setData(Ljava/util/List;)V
 
+    return-void
+
     :cond_3
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
index ab7c313dec..e2d20af4a9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnectionsAddXbox.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
index 76f427c617..fed04b6d7b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnectionsAddXbox.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$onCodeEntered$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$onCodeEntered$1.smali
index c682a8304d..168093630b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$onCodeEntered$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$onCodeEntered$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$onCodeEntered$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnectionsAddXbox.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
index 850da85f9f..4eb95a5447 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsUserConnectionsAddXbox.kt"
 
 # interfaces
 .implements Lcom/discord/views/DigitVerificationView$d;
@@ -71,8 +72,6 @@
 
     check-cast v6, Lcom/discord/app/AppComponent;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
-
     invoke-virtual {v0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
index be0a14c92e..d01ff62c26 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsUserConnectionsAddXbox.kt"
 
 
 # annotations
@@ -342,8 +343,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
index 2560daaa48..75057c113c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
index 8e0a7b9392..55cc8df14b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
index 85cbc216ac..c35812a422 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function6;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
index 8b90e7d78e..ea4613c229 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 b42b59428f..f53d0d57de 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 
 # annotations
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 021226fee9..dcdcf84374 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 
 # annotations
@@ -83,9 +84,9 @@
 
     sget-object p2, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
-    const/4 p3, 0x0
+    const/4 p3, 0x1
 
-    const/4 p4, 0x1
+    const/4 p4, 0x0
 
     if-ne p1, p2, :cond_0
 
@@ -129,9 +130,12 @@
 
     if-ne p1, p2, :cond_2
 
-    const/4 p3, 0x1
+    goto :goto_2
 
     :cond_2
+    const/4 p3, 0x0
+
+    :goto_2
     iput-boolean p3, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->modeVAD:Z
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
index 5d4148c7d7..de4ba3c7dd 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2.smali
index d081ef45d6..12649e97a5 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 b13984b4cc..41bbe40986 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$10.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$10.smali
index 64f0051297..af120dad8f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$10.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$10;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 93b2e98f2f..406d945473 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali
index 9ce37a6426..c3b29cfd18 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali
index 6490f7d3df..a577403e68 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
index 72682ac0f1..82c3a9ea95 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$7;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
index cd2c8063bb..e3c5f1d8af 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$8;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$9.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$9.smali
index 02a58fc1c7..8b020a9450 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$9.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali
index 50bcd42ef3..6df91a66a1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
index aac692fe80..de8c142a3c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali
index 444173944b..01d7e6d9aa 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
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 57f8cece97..9f9d371499 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0.smali
index 5eaad459aa..aaf3b190ed 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0;
 .super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
 
 # interfaces
 .implements Lrx/functions/Func6;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
index a60656d0eb..bceb4f8a5e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsVoice;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsVoice.kt"
 
 
 # annotations
@@ -982,6 +983,12 @@
 
     packed-switch v1, :pswitch_data_0
 
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCommunication()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    goto :goto_0
+
     :pswitch_0
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCommunication()Lcom/discord/views/CheckedSetting;
 
@@ -1292,6 +1299,8 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x2
         :pswitch_1
@@ -1947,7 +1956,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->er()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eq()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -1963,12 +1972,11 @@
 
     const/4 v0, 0x3
 
-    :goto_0
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCall()Lcom/discord/views/CheckedSetting;
@@ -1983,12 +1991,16 @@
 
     const/4 v0, 0x2
 
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_2
     const/4 v0, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz v0, :cond_3
 
     move-object v1, v0
@@ -2007,6 +2019,8 @@
 
     invoke-virtual {v1, v0}, Lcom/discord/stores/StoreMediaSettings;->updateAudioMode(I)V
 
+    return-void
+
     :cond_3
     return-void
 .end method
@@ -2023,7 +2037,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/j;->dZ(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->er()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eq()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -2089,8 +2103,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 c37fe4efc3..cc3c63ebf1 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder$bind$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder$bind$1.smali
index 5b21f0db50..a073d8a089 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder$bind$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder$bind$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder$bind$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali
index f6d9569dd6..17fa1459b0 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "WidgetIncomingShare.kt"
 
 
 # annotations
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 427db3457a..d3931a53ee 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "WidgetIncomingShare.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Companion.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Companion.smali
index 6dd7dabed1..6dd6f83c23 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$Companion;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
index b843b11fc5..a09da49b11 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
index 783e0585fc..80b070e1d4 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Model.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Model.smali
index 3882fb5f49..96119dc820 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Model.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali
index f146f98a00..e8c2452975 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2$1.smali
index 3c592f974a..497903b0ba 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 996e1fc462..5d159aaf76 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
index f70f973de0..180b7dda56 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Landroid/widget/TextView$OnEditorActionListener;
@@ -59,9 +60,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    iget-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
-
-    invoke-static {p2}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$getCommentTv$p(Lcom/discord/widgets/share/WidgetIncomingShare;)Landroid/widget/TextView;
+    invoke-static {p1}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$getCommentTv$p(Lcom/discord/widgets/share/WidgetIncomingShare;)Landroid/widget/TextView;
 
     move-result-object p2
 
@@ -99,6 +98,8 @@
 
     const/4 p1, 0x1
 
+    return p1
+
     :cond_1
     return p1
 .end method
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 2ce25f01ab..15a1207541 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
index 7fe9d32905..fdd64e8a44 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -66,9 +67,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
index 3e947b68bd..506b71c7b2 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali
index b3f4c8b045..6e26d153d3 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 a7213d58e8..cab45e5050 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -214,7 +215,7 @@
     if-nez p1, :cond_3
 
     :cond_2
-    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KA()Lrx/Observable;
 
     move-result-object p1
 
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 dbe2a1b58e..63a28781e5 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
index cdd665f22f..f44f04bc72 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
index 606c8be1a8..d8ae818c5f 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
index 59b31d93c2..625803b968 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$4.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$4.smali
index 93edbb609e..577c8d58f4 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$4.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 bc07be63ae..ee198b8a01 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
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 e7c41a2137..de49912238 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali
index bd60a321ab..3fed542b53 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnFocusChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4$1.smali
index c4d126ebc8..b54e8c50d8 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$4$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.smali
index af5730eea5..704ab008fa 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 e4472eb6d7..f3f06b3eda 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
index 35fc7bcbda..83000abd66 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
index b4ac492784..0b294457b7 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
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 5a85080e61..0cc1849e07 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -156,7 +157,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v3}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v3
 
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 83bcea9be7..a856cadcf3 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetIncomingShare.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
index 60357906b1..e251ddec2d 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetIncomingShare.kt"
 
 
 # annotations
@@ -405,7 +406,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverRemoveIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -427,7 +428,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchQueryPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -1021,6 +1022,8 @@
 
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1226,7 +1229,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -1251,7 +1254,7 @@
 
     if-gez v0, :cond_0
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_0
     check-cast v1, Landroid/net/Uri;
@@ -1290,6 +1293,9 @@
 
     :cond_2
     return-void
+
+    :cond_3
+    return-void
 .end method
 
 .method private final onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;Z)V
@@ -1343,12 +1349,11 @@
 
     move-result-object p2
 
-    :goto_0
     invoke-static {p4, p2}, Lcom/discord/app/g;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$Transformer;
 
     move-result-object p2
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     instance-of p4, p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
@@ -1381,13 +1386,16 @@
 
     invoke-direct {p4, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
-    :goto_1
     check-cast p4, Lkotlin/jvm/functions/Function1;
 
     invoke-interface {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object p2
 
+    invoke-static {p4, p2}, Lcom/discord/app/g;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$Transformer;
+
+    move-result-object p2
+
     goto :goto_0
 
     :cond_2
@@ -1423,9 +1431,17 @@
 
     invoke-direct {p4, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$4;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
-    goto :goto_1
+    check-cast p4, Lkotlin/jvm/functions/Function1;
 
-    :goto_2
+    invoke-interface {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object p2
+
+    invoke-static {p4, p2}, Lcom/discord/app/g;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$Transformer;
+
+    move-result-object p2
+
+    :goto_0
     invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser;
 
     move-result-object p4
@@ -1474,7 +1490,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object p2
 
@@ -1555,6 +1571,8 @@
 
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
+    return-void
+
     :cond_4
     return-void
 .end method
@@ -1610,8 +1628,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1922,7 +1938,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->KD()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$1.smali
index 1daa6ed14f..a2e5169ada 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$1.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/status/WidgetStatus$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "WidgetStatus.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali
index 4e73f25fc2..ba5ba7c8b5 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/status/WidgetStatus$Model;
 .super Ljava/lang/Object;
+.source "WidgetStatus.java"
 
 
 # annotations
@@ -379,9 +380,9 @@
 
     iget-boolean v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model;->offline:Z
 
-    const/16 v1, 0x61
+    const/16 v1, 0x4f
 
-    const/16 v2, 0x4f
+    const/16 v2, 0x61
 
     if-eqz v0, :cond_0
 
@@ -455,9 +456,12 @@
 
     if-eqz v3, :cond_2
 
-    const/16 v1, 0x4f
+    goto :goto_2
 
     :cond_2
+    const/16 v1, 0x61
+
+    :goto_2
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
index a63871fca5..1a0f236c6c 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/status/WidgetStatus;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetStatus.java"
 
 
 # annotations
@@ -90,8 +91,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusWrap:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->animate()Landroid/view/ViewPropertyAnimator;
 
     move-result-object v0
@@ -148,7 +147,6 @@
 
     move-result-object p1
 
-    :goto_0
     invoke-virtual {p1}, Landroid/view/ViewPropertyAnimator;->start()V
 
     return-void
@@ -196,7 +194,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p1}, Landroid/view/ViewPropertyAnimator;->start()V
+
+    return-void
 
     :cond_1
     invoke-direct {p0, p1}, Lcom/discord/widgets/status/WidgetStatus;->configureUIContent(Lcom/discord/widgets/status/WidgetStatus$Model;)V
@@ -227,8 +227,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivity:Landroid/view/View;
-
     iget-boolean v4, p1, Lcom/discord/widgets/status/WidgetStatus$Model;->connecting:Z
 
     if-nez v4, :cond_2
@@ -256,8 +254,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivityText:Landroid/widget/TextView;
-
     invoke-static {v0, p1}, Lcom/discord/widgets/status/WidgetStatus;->getConnectivityText(Landroid/content/Context;Lcom/discord/widgets/status/WidgetStatus$Model;)Ljava/lang/String;
 
     move-result-object v0
@@ -269,8 +265,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivitySpinner:Landroid/view/View;
-
     iget-boolean v1, p1, Lcom/discord/widgets/status/WidgetStatus$Model;->connecting:Z
 
     if-eqz v1, :cond_5
@@ -290,8 +284,6 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivityLimited:Landroid/view/View;
-
     iget-boolean v1, p1, Lcom/discord/widgets/status/WidgetStatus$Model;->offline:Z
 
     if-eqz v1, :cond_7
@@ -311,8 +303,6 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusUnreadMessages:Landroid/view/View;
-
     iget-wide v4, p1, Lcom/discord/widgets/status/WidgetStatus$Model;->unreadChannelId:J
 
     const-wide/16 v6, 0x0
@@ -362,8 +352,6 @@
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusUnreadMessagesMark:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/status/-$$Lambda$WidgetStatus$q6VYowIeDUq1Y5wjTKFfqMmdPxY;
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/status/-$$Lambda$WidgetStatus$q6VYowIeDUq1Y5wjTKFfqMmdPxY;-><init>(Lcom/discord/widgets/status/WidgetStatus$Model;)V
@@ -455,9 +443,9 @@
 
     const/4 p4, 0x2
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
     if-eqz p1, :cond_0
 
@@ -473,9 +461,9 @@
 
     move-result-object p2
 
-    aput-object p2, p4, v1
+    aput-object p2, p4, v0
 
-    aput-object p3, p4, v0
+    aput-object p3, p4, v1
 
     invoke-virtual {p1, v2, p4}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -490,13 +478,13 @@
 
     const v2, 0x7f100074
 
-    new-array v3, v0, [Ljava/lang/Object;
+    new-array v3, v1, [Ljava/lang/Object;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    aput-object v4, v3, v1
+    aput-object v4, v3, v0
 
     invoke-virtual {p1, v2, p2, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -510,9 +498,9 @@
 
     new-array p4, p4, [Ljava/lang/Object;
 
-    aput-object p1, p4, v1
+    aput-object p1, p4, v0
 
-    aput-object p3, p4, v0
+    aput-object p3, p4, v1
 
     invoke-virtual {p2, v2, p4}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus_ViewBinding.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus_ViewBinding.smali
index d8f4c2c0c8..8a727f23c6 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/status/WidgetStatus_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetStatus_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$Companion.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$Companion.smali
index 2c9d47420f..a95d9c744b 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/tos/WidgetTosAccept$Companion;
 .super Ljava/lang/Object;
+.source "WidgetTosAccept.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.smali
index c2764e5983..f8fdcd5fe1 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetTosAccept.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
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 e96a596ff6..538f61ff8a 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetTosAccept.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 384dd6da50..5f49ee5baa 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetTosAccept.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali
index 37d2746355..b0ee4f2523 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetTosAccept.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
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 cc0d8215c0..e441f9d272 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetTosAccept.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
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 fd8704d3a2..9f41fd2a35 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetTosAccept.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
index e3fae99b49..6181ec76d2 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/tos/WidgetTosAccept;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetTosAccept.kt"
 
 
 # annotations
@@ -408,8 +409,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/tos/WidgetTosAccept;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
index 35df213a20..e71a987b73 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/ViewHolderGameRichPresence;
 .super Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.source "ViewHolderGameRichPresence.kt"
 
 
 # instance fields
@@ -42,19 +43,19 @@
 
     const/4 v3, 0x0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
 
     move-result-object v4
 
-    if-eqz v4, :cond_1
+    if-eqz v4, :cond_2
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
 
     move-result v5
 
-    if-eqz v5, :cond_0
+    if-eqz v5, :cond_1
 
     iget-object v5, p0, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->containerView:Landroid/view/View;
 
@@ -99,13 +100,18 @@
     :cond_0
     move-object v4, v3
 
-    :goto_0
-    if-nez v4, :cond_2
+    goto :goto_0
 
     :cond_1
-    const-string v4, ""
+    move-object v4, v3
+
+    :goto_0
+    if-nez v4, :cond_3
 
     :cond_2
+    const-string v4, ""
+
+    :cond_3
     new-instance v5, Ljava/lang/StringBuilder;
 
     invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
@@ -122,7 +128,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     check-cast v0, Ljava/lang/CharSequence;
 
@@ -136,7 +142,7 @@
 
     goto :goto_1
 
-    :cond_3
+    :cond_4
     new-instance p1, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.CharSequence"
@@ -145,7 +151,7 @@
 
     throw p1
 
-    :cond_4
+    :cond_5
     move-object v0, v3
 
     :goto_1
@@ -235,7 +241,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
 
@@ -243,7 +249,7 @@
 
     goto :goto_2
 
-    :cond_5
+    :cond_6
     move-object p1, v3
 
     :goto_2
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1.smali
index 424e7a1123..8135916f5c 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1;
 .super Ljava/lang/Object;
+.source "ViewHolderMusicRichPresence.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2.smali
index d428e8bd66..7a4c9339f0 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2;
 .super Ljava/lang/Object;
+.source "ViewHolderMusicRichPresence.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3.smali
index 6bf7a68c47..af8eacd4ea 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;
 .super Ljava/lang/Object;
+.source "ViewHolderMusicRichPresence.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4.smali
index 473383fff0..91a4e396c4 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;
 .super Ljava/lang/Object;
+.source "ViewHolderMusicRichPresence.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
index de5878388c..b1556fbe04 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/ViewHolderMusicRichPresence;
 .super Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.source "ViewHolderMusicRichPresence.kt"
 
 
 # instance fields
@@ -559,6 +560,8 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1.smali
index 946102823a..7f66851de8 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1;
 .super Ljava/lang/Object;
+.source "ViewHolderPlatformRichPresence.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2.smali
index 0d6dc713b3..3d77e477a3 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2;
 .super Lkotlin/jvm/internal/i;
+.source "ViewHolderPlatformRichPresence.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3.smali
index af12555834..d4dd7b1537 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3;
 .super Lkotlin/jvm/internal/k;
+.source "ViewHolderPlatformRichPresence.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4.smali
index 901ac8f7d0..40205d9ced 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4;
 .super Ljava/lang/Object;
+.source "ViewHolderPlatformRichPresence.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
index b5378030d6..577c8aa877 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;
 .super Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.source "ViewHolderPlatformRichPresence.kt"
 
 
 # instance fields
@@ -225,7 +226,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$Companion.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$Companion.smali
index 9567d08ba2..bac2cfbd01 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
 .super Ljava/lang/Object;
+.source "ViewHolderUserRichPresence.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
index ad8e5aa274..06d60556c1 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1;
 .super Lkotlin/jvm/internal/k;
+.source "ViewHolderUserRichPresence.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
index 8384f6a6ff..3c56d496a4 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;
 .super Lkotlin/jvm/internal/k;
+.source "ViewHolderUserRichPresence.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
index 760d71cd94..6d24e81bed 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/ViewHolderUserRichPresence;
 .super Ljava/lang/Object;
+.source "ViewHolderUserRichPresence.kt"
 
 
 # annotations
@@ -408,6 +409,8 @@
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -429,19 +432,19 @@
 
     const/4 v3, 0x0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
 
     move-result-object v4
 
-    if-eqz v4, :cond_1
+    if-eqz v4, :cond_2
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
 
     move-result v5
 
-    if-eqz v5, :cond_0
+    if-eqz v5, :cond_1
 
     iget-object v5, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
@@ -486,13 +489,18 @@
     :cond_0
     move-object v4, v3
 
-    :goto_0
-    if-nez v4, :cond_2
+    goto :goto_0
 
     :cond_1
-    const-string v4, ""
+    move-object v4, v3
+
+    :goto_0
+    if-nez v4, :cond_3
 
     :cond_2
+    const-string v4, ""
+
+    :cond_3
     new-instance v5, Ljava/lang/StringBuilder;
 
     invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
@@ -509,7 +517,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     check-cast v0, Ljava/lang/CharSequence;
 
@@ -523,7 +531,7 @@
 
     goto :goto_1
 
-    :cond_3
+    :cond_4
     new-instance p1, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.CharSequence"
@@ -532,7 +540,7 @@
 
     throw p1
 
-    :cond_4
+    :cond_5
     move-object v0, v3
 
     :goto_1
@@ -596,7 +604,7 @@
 
     move-result-object v4
 
-    if-eqz v4, :cond_5
+    if-eqz v4, :cond_6
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
 
@@ -604,7 +612,7 @@
 
     goto :goto_2
 
-    :cond_5
+    :cond_6
     move-object v4, v3
 
     :goto_2
@@ -622,7 +630,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
 
@@ -630,7 +638,7 @@
 
     goto :goto_3
 
-    :cond_6
+    :cond_7
     move-object p1, v3
 
     :goto_3
@@ -856,7 +864,6 @@
 
     const p1, 0x7f120eee
 
-    :goto_0
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
     move-result-object v10
@@ -888,7 +895,15 @@
 
     const p1, 0x7f120ef0
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-virtual/range {v5 .. v10}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyString(JJLjava/lang/String;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_1
     const/4 p1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$Companion.smali
index 8428f51732..bb79e367e4 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetBanUser$Companion;
 .super Ljava/lang/Object;
+.source "WidgetBanUser.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$$inlined$forEach$lambda$1.smali
index ddc0aedb60..512ec2ae84 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetBanUser$onViewBound$$inlined$forEach$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetBanUser.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$2.smali
index 64a31f0b22..6fc1a4de25 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetBanUser$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetBanUser.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 3041c16a42..a76b1714b7 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetBanUser$onViewBound$3$1;
 .super Ljava/lang/Object;
+.source "WidgetBanUser.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
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 2ef97b9eec..01eb094672 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetBanUser$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetBanUser.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -64,7 +65,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eq()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->ep()I
 
     move-result v0
 
@@ -88,6 +89,10 @@
 
     packed-switch p1, :pswitch_data_0
 
+    const/4 v7, 0x0
+
+    goto :goto_1
+
     :pswitch_0
     const/4 v7, 0x0
 
@@ -130,17 +135,16 @@
 
     if-eqz v0, :cond_1
 
-    :goto_2
     move-object v8, p1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     const/4 p1, 0x0
 
-    goto :goto_2
+    move-object v8, p1
 
-    :goto_3
+    :goto_2
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali
index 97f2835238..2395ea8bcb 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetBanUser;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetBanUser.kt"
 
 
 # annotations
@@ -459,8 +460,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetBanUser;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$Companion.smali
index 54b13075c5..bc7a785c5a 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetKickUser$Companion;
 .super Ljava/lang/Object;
+.source "WidgetKickUser.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$1.smali
index baecb839d2..5083d0da16 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$1;
 .super Ljava/lang/Object;
+.source "WidgetKickUser.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 233634ac9e..7156a6fd79 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1;
 .super Ljava/lang/Object;
+.source "WidgetKickUser.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali
index 40d0c954c0..50254f9d99 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2;
 .super Ljava/lang/Object;
+.source "WidgetKickUser.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -74,17 +75,16 @@
 
     if-eqz v0, :cond_0
 
-    :goto_0
     move-object v5, p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    move-object v5, p1
 
-    :goto_1
+    :goto_0
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali
index d0bae691cf..28932b8dd5 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetKickUser;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetKickUser.kt"
 
 
 # annotations
@@ -356,8 +357,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali
index a8592bfb22..c52e15429b 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetPruneUsers$Model;
 .super Ljava/lang/Object;
+.source "WidgetPruneUsers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
index f72a5bb32c..186ed96c41 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetPruneUsers;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetPruneUsers.java"
 
 
 # annotations
@@ -173,8 +174,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->cancel:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetPruneUsers$jIh7JeA_iHXNTlKlM1h8rEofTHs;
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetPruneUsers$jIh7JeA_iHXNTlKlM1h8rEofTHs;-><init>(Lcom/discord/widgets/user/WidgetPruneUsers;)V
@@ -190,8 +189,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->prune:Landroid/view/View;
-
     iget v3, p1, Lcom/discord/widgets/user/WidgetPruneUsers$Model;->pruneCount:I
 
     if-lez v3, :cond_4
@@ -341,7 +338,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->radioManager:Lcom/discord/views/RadioManager;
 
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eq()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->ep()I
 
     move-result v0
 
@@ -517,11 +514,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;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers_ViewBinding.smali
index 5c530c3e9b..13db60b096 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetPruneUsers_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetPruneUsers_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
index befc12925b..9b7d308858 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lrx/functions/Func9;
@@ -73,7 +74,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/Boolean;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
-    .locals 34
+    .locals 33
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -110,47 +111,41 @@
         }
     .end annotation
 
-    move-object/from16 v1, p6
+    move-object/from16 v0, p6
 
-    move-object/from16 v2, p7
+    move-object/from16 v1, p7
 
-    move-object/from16 v3, p9
+    move-object/from16 v2, p9
 
     if-eqz p2, :cond_0
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v4
-
-    :goto_0
-    move-wide v11, v4
-
-    goto :goto_1
-
-    :cond_0
-    const-wide/16 v4, 0x0
+    move-result-wide v3
 
     goto :goto_0
 
-    :goto_1
+    :cond_0
+    const-wide/16 v3, 0x0
+
+    :goto_0
+    move-wide v10, v3
+
     if-eqz p2, :cond_1
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v3
 
-    :goto_2
-    move-object/from16 v22, v0
-
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
-    const/4 v0, 0x0
+    const/4 v3, 0x0
 
-    goto :goto_2
+    :goto_1
+    move-object/from16 v21, v3
 
-    :goto_3
-    new-instance v0, Ljava/util/ArrayList;
+    new-instance v3, Ljava/util/ArrayList;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List;
 
@@ -162,13 +157,13 @@
 
     mul-int/lit8 v4, v4, 0x2
 
-    invoke-direct {v0, v4}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v3, v4}, Ljava/util/ArrayList;-><init>(I)V
 
     sget-object v4, Lkotlin/a/z;->bPD:Lkotlin/a/z;
 
-    move-object/from16 v17, v4
+    move-object/from16 v16, v4
 
-    check-cast v17, Ljava/util/Set;
+    check-cast v16, Ljava/util/Set;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List;
 
@@ -178,7 +173,7 @@
 
     move-result-object v4
 
-    :goto_4
+    :goto_2
     invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
@@ -209,41 +204,14 @@
 
     if-nez v6, :cond_2
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_2
     const-string v8, "members"
 
-    invoke-static {v2, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
-
-    move-result-wide v8
-
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v8
-
-    invoke-interface {v2, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v8
-
-    if-nez v8, :cond_3
-
-    invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map;
-
-    move-result-object v8
-
-    :cond_3
-    move-object/from16 v24, v8
-
-    check-cast v24, Ljava/util/Map;
-
-    const-string v8, "roles"
-
     invoke-static {v1, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
     move-result-wide v8
 
@@ -255,6 +223,33 @@
 
     move-result-object v8
 
+    if-nez v8, :cond_3
+
+    invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map;
+
+    move-result-object v8
+
+    :cond_3
+    move-object/from16 v23, v8
+
+    check-cast v23, Ljava/util/Map;
+
+    const-string v8, "roles"
+
+    invoke-static {v0, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+
+    move-result-wide v8
+
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v8
+
+    invoke-interface {v0, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v8
+
     if-nez v8, :cond_4
 
     invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map;
@@ -262,23 +257,23 @@
     move-result-object v8
 
     :cond_4
-    move-object/from16 v25, v8
+    move-object/from16 v24, v8
 
-    check-cast v25, Ljava/util/Map;
+    check-cast v24, Ljava/util/Map;
 
     sget-object v8, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->Companion:Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
 
-    move-result-wide v9
+    move-result-wide v12
 
-    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v9
 
-    move-object/from16 v10, p5
+    move-object/from16 v12, p5
 
-    invoke-interface {v10, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v12, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -288,11 +283,13 @@
 
     move-result-object v8
 
-    invoke-virtual {v0, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v3, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
 
-    move-result-object v23
+    move-result-object v22
+
+    const/16 v26, 0x0
 
     const/16 v27, 0x0
 
@@ -300,112 +297,109 @@
 
     const/16 v29, 0x0
 
-    const/16 v30, 0x0
-
     const-string v8, "allowAnimatedEmojis"
 
-    invoke-static {v3, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v31
+    move-result v30
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
 
-    move-result-wide v32
+    move-result-wide v31
 
-    move-object/from16 v26, v5
+    move-object/from16 v25, v5
 
-    invoke-static/range {v23 .. v33}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List;
+    invoke-static/range {v22 .. v32}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List;
 
     move-result-object v5
 
     check-cast v5, Ljava/util/Collection;
 
-    invoke-virtual {v0, v5}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    goto/16 :goto_4
+    goto/16 :goto_2
 
     :cond_5
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->isLoading()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
-    new-instance v1, Lcom/discord/widgets/chat/list/entries/LoadingEntry;
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/LoadingEntry;
 
-    invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;-><init>()V
 
-    :goto_5
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_6
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->isAllLoaded()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_7
+    if-eqz v0, :cond_7
 
-    new-instance v1, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;
 
-    invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;-><init>()V
 
-    goto :goto_5
+    invoke-virtual {v3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_7
-    :goto_6
-    new-instance v1, Lcom/discord/widgets/user/WidgetUserMentions$Model;
+    :goto_3
+    new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;
 
-    move-object v6, v1
+    move-object v5, v0
 
-    const-string v2, "userId"
+    const-string v1, "userId"
 
     move-object/from16 v4, p8
 
-    invoke-static {v4, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p8 .. p8}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    const-wide/16 v9, -0x1
+    const-wide/16 v8, -0x1
 
-    const-string v2, "names"
+    const-string v1, "names"
 
     move-object/from16 v4, p4
 
-    invoke-static {v4, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-wide/16 v14, -0x1
+    const-wide/16 v13, -0x1
 
-    move-object/from16 v16, v0
+    move-object v15, v3
 
-    check-cast v16, Ljava/util/List;
+    check-cast v15, Ljava/util/List;
 
-    const-wide/16 v18, -0x1
+    const-wide/16 v17, -0x1
 
-    const/16 v20, 0x0
+    const/16 v19, 0x0
 
-    const-string v0, "allowAnimatedEmojis"
+    const-string v1, "allowAnimatedEmojis"
 
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v21
+    move-result v20
 
-    const/16 v23, 0x100
+    const/16 v22, 0x100
 
-    const/16 v24, 0x0
+    const/16 v23, 0x0
 
-    move-object/from16 v13, p4
+    move-object/from16 v12, p4
 
-    invoke-direct/range {v6 .. v24}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v5 .. v23}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v1
+    return-object v0
 .end method
 
 .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
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 1db28119e5..7837f5654b 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali
index c36a4852b0..6b8b38c3f9 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 
 # annotations
@@ -71,9 +72,14 @@
 
     const-wide/16 p1, 0x0
 
+    move-wide v1, p1
+
+    goto :goto_0
+
     :cond_0
     move-wide v1, p1
 
+    :goto_0
     and-int/lit8 p1, p6, 0x2
 
     const/4 p2, 0x1
@@ -82,36 +88,36 @@
 
     const/4 v3, 0x1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     move v3, p3
 
-    :goto_0
+    :goto_1
     and-int/lit8 p1, p6, 0x4
 
     if-eqz p1, :cond_2
 
     const/4 v4, 0x1
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     move v4, p4
 
-    :goto_1
+    :goto_2
     and-int/lit8 p1, p6, 0x8
 
     if-eqz p1, :cond_3
 
     const/4 v5, 0x1
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     move v5, p5
 
-    :goto_2
+    :goto_3
     move-object v0, p0
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;-><init>(JZZZ)V
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
index 77e4f16316..fbd84e9876 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali
index 9f343ad672..04e57c6a77 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali
index 3d5a68cba2..42da9c154d 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1.smali
index 75d4416b81..d9a83411d8 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali
index 65ed8c5771..9d71eb017a 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1.smali
index 0564fecd88..6a9af448e0 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali
index 8d28df29c1..da1ed84b26 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali
index 69793b32b2..8bc7fbe449 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.smali
index 881f063a9d..e5bbff97c6 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali
index 22fdfa5a70..df03f47b63 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 
 # annotations
@@ -604,6 +605,8 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->loadSubscription:Lrx/Subscription;
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
index 8bc214c523..7256d49cb1 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
@@ -221,7 +222,7 @@
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model;JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
-    .locals 17
+    .locals 16
 
     move-object/from16 v0, p0
 
@@ -353,7 +354,7 @@
     move/from16 v15, p14
 
     :goto_8
-    move/from16 v16, v15
+    move/from16 p14, v15
 
     and-int/lit16 v15, v1, 0x200
 
@@ -395,8 +396,6 @@
 
     move-wide/from16 p12, v13
 
-    move/from16 p14, v16
-
     move/from16 p15, v15
 
     move-object/from16 p16, v1
@@ -542,7 +541,7 @@
 .end method
 
 .method public final copy(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
-    .locals 20
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(JJJ",
@@ -586,8 +585,6 @@
 
     const-string v0, "channelNames"
 
-    move-wide/from16 v17, v1
-
     move-object/from16 v1, p7
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
@@ -604,15 +601,15 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v19, Lcom/discord/widgets/user/WidgetUserMentions$Model;
+    new-instance v17, Lcom/discord/widgets/user/WidgetUserMentions$Model;
 
-    move-object/from16 v0, v19
+    move-object/from16 v0, v17
 
-    move-wide/from16 v1, v17
+    move-wide/from16 v1, p1
 
     invoke-direct/range {v0 .. v16}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
 
-    return-object v19
+    return-object v17
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali
index 4c32b272db..4051932e90 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 
 # annotations
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 dc2185b1e2..bdfd98190f 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1.smali
index 459026bdd7..14a274523c 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -46,39 +47,37 @@
 
 # virtual methods
 .method public final call(Ljava/lang/Boolean;)V
-    .locals 9
+    .locals 8
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v0}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilters$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
-
-    move-result-object v1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v0}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilterSelectedGuildCs$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/views/CheckedSetting;
+    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilters$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/views/CheckedSetting;->isChecked()Z
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    move-result v0
+    invoke-static {v1}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilterSelectedGuildCs$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/views/CheckedSetting;
 
-    xor-int/lit8 v4, v0, 0x1
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/views/CheckedSetting;->isChecked()Z
+
+    move-result v1
+
+    xor-int/lit8 v3, v1, 0x1
+
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xd
 
-    const/16 v7, 0xd
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const-wide/16 v1, 0x0
 
-    const-wide/16 v2, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
+    invoke-static/range {v0 .. v7}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2.smali
index b309ee34f1..57e04a2236 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -46,37 +47,35 @@
 
 # virtual methods
 .method public final call(Ljava/lang/Boolean;)V
-    .locals 9
+    .locals 8
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v0}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilters$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
-
-    move-result-object v1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v0}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilterIncludeEveryoneCs$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/views/CheckedSetting;
+    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilters$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/views/CheckedSetting;->isChecked()Z
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$2;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    move-result v5
+    invoke-static {v1}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilterIncludeEveryoneCs$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/views/CheckedSetting;
 
-    const-wide/16 v2, 0x0
+    move-result-object v1
 
-    const/4 v4, 0x0
+    invoke-virtual {v1}, Lcom/discord/views/CheckedSetting;->isChecked()Z
 
-    const/4 v6, 0x0
+    move-result v4
 
-    const/16 v7, 0xb
+    const-wide/16 v1, 0x0
 
-    const/4 v8, 0x0
+    const/4 v3, 0x0
 
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
+    const/4 v5, 0x0
+
+    const/16 v6, 0xb
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v0 .. v7}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.smali
index a21122d137..7f600e2158 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -46,37 +47,35 @@
 
 # virtual methods
 .method public final call(Ljava/lang/Boolean;)V
-    .locals 9
+    .locals 8
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v0}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilters$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
-
-    move-result-object v1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v0}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilterIncludeRolesCs$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/views/CheckedSetting;
+    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilters$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/views/CheckedSetting;->isChecked()Z
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    move-result v6
+    invoke-static {v1}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->access$getFilterIncludeRolesCs$p(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)Lcom/discord/views/CheckedSetting;
 
-    const-wide/16 v2, 0x0
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/views/CheckedSetting;->isChecked()Z
+
+    move-result v5
+
+    const-wide/16 v1, 0x0
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v6, 0x7
 
-    const/4 v7, 0x7
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
+    invoke-static/range {v0 .. v7}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     move-result-object v0
 
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 87ea6ebc58..7bbe665c15 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetUserMentions.kt"
 
 
 # annotations
@@ -402,8 +403,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 0eacae5b41..205bb655d9 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$configureUI$1$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 90cdfda3d2..2fe629d036 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali
index ff2161d43e..3da6cd0e7b 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
@@ -77,6 +78,8 @@
 
     invoke-static {p1, v1, v1, v0}, Lcom/discord/app/e;->a(Landroid/content/Context;ZZI)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
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 e28830fabe..5ff4713f71 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$onViewBound$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 8e67ec33cf..a476dc3d20 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali
index 23dee47ca4..a92c4824ab 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0;
 .super Ljava/lang/Object;
+.source "WidgetUserMentions.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
index c2fe8266c4..603b490461 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserMentions.kt"
 
 
 # annotations
@@ -152,9 +153,7 @@
     :cond_1
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsLoader:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsLoader:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->getFilters()Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->getFilters()Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     move-result-object v1
 
@@ -293,8 +292,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -375,6 +372,8 @@
 
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->dispose()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -400,6 +399,8 @@
 
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->disposeHandlers()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -470,6 +471,8 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setMentionMeMessageLevelHighlighting(Z)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model$Item.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model$Item.smali
index 0e15e22e75..a9069b7621 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model$Item.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualFriends.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
@@ -198,8 +199,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;->user:Lcom/discord/models/domain/ModelUser;
-
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
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 4f998b0038..c11c25ccbc 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualFriends.java"
 
 
 # annotations
@@ -261,7 +262,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
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 a3b523b326..ce1ffad701 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetUserMutualFriends.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder_ViewBinding.smali
index c77c09f3f3..17d06c560c 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 3d17d60695..08f4e37388 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetUserMutualFriends.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
index 6d7dc8ecc5..cf192b5e7e 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualFriends;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserMutualFriends.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends_ViewBinding.smali
index 97e20093fb..0de6815431 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualFriends_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualFriends_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 463326064c..f063144eb2 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
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetUserMutualGuilds.java"
 
 
 # annotations
@@ -120,14 +121,12 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->serverImage:Landroid/widget/ImageView;
 
-    const/4 v1, 0x0
+    const/16 v1, 0x8
 
-    const/16 v2, 0x8
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->serverImage:Landroid/widget/ImageView;
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String;
 
     move-result-object v3
@@ -153,8 +152,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->serverText:Landroid/widget/TextView;
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String;
 
     move-result-object v3
@@ -184,8 +181,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->serverName:Landroid/widget/TextView;
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
     move-result-object p1
@@ -197,8 +192,6 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->serverNick:Landroid/widget/TextView;
-
     invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model$Item;->access$200(Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model$Item;)Ljava/lang/String;
 
     move-result-object v0
@@ -213,12 +206,9 @@
 
     if-eqz p2, :cond_5
 
-    goto :goto_2
+    const/4 v1, 0x0
 
     :cond_5
-    const/16 v1, 0x8
-
-    :goto_2
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setVisibility(I)V
 
     :cond_6
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder_ViewBinding.smali
index cf536de0d5..20b3a522a3 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualGuilds$Adapter$ViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 64450ab171..82067f3707 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetUserMutualGuilds.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model$Item.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model$Item.smali
index 403b9e1f96..b75ff93ed0 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model$Item.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model$Item;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualGuilds.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
@@ -171,8 +172,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model$Item;->guild:Lcom/discord/models/domain/ModelGuild;
-
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
index a6823794fb..2a3a0536bc 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualGuilds.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
index 902a4d0a7d..aacfc4cfef 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualGuilds;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserMutualGuilds.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds_ViewBinding.smali
index 745276bc29..727003fc68 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserMutualGuilds_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserMutualGuilds_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$Model.smali
index ad117a8c4c..dff5d468b1 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserProfile$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserProfile.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
index c606c17116..520319b304 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserProfile;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserProfile.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem.smali
index c0ed161b92..88dbc29219 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetUserProfileEmptyListItem.java"
 
 
 # annotations
@@ -55,11 +56,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->empty:Landroid/view/View;
-
-    iget-object p2, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->empty:Landroid/view/View;
-
-    invoke-static {p2, p3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;I)I
+    invoke-static {p1, p3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;I)I
 
     move-result p2
 
@@ -70,8 +67,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->emptyText:Landroid/widget/TextView;
-
     invoke-virtual {p1, p4}, Landroid/widget/TextView;->setText(I)V
 
     :cond_1
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem_ViewBinding.smali
index ff8ec88f5d..9865a00f5a 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileEmptyListItem_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getToastClickListener$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getToastClickListener$1.smali
index ab379e7db6..edaca0ee64 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getToastClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getToastClickListener$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getToastClickListener$1;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileHeader.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -52,10 +53,7 @@
 
     if-eqz v0, :cond_0
 
-    :goto_0
-    check-cast v0, Ljava/lang/CharSequence;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getToastClickListener$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
@@ -64,9 +62,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    :goto_0
+    check-cast v0, Ljava/lang/CharSequence;
 
-    :goto_1
     invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/CharSequence;)V
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge.smali
index 3fd0a95c7e..1cd33b979a 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileHeader.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1.smali
index 0b30af2442..2c8e4286f4 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileHeader.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1.smali
index db039df84f..298099091c 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetUserProfileHeader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion.smali
index 24f8bb7736..9c4b2002df 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileHeader.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model.smali
index aa1286a61a..063c05acd1 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileHeader.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1.smali
index 0e7a54a02c..6375edccd9 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserProfileHeader.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0.smali
index ca6819b8b8..95a17e1062 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileHeader.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
index eeb2f485f0..10262a43e9 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserProfileHeader;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserProfileHeader.kt"
 
 
 # annotations
@@ -294,7 +295,7 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;)V
-    .locals 18
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -305,17 +306,25 @@
     :cond_0
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserAvatar()Landroid/widget/ImageView;
 
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
     move-result-object v2
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v3
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
 
     move-result-object v3
 
@@ -323,63 +332,57 @@
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getDiscriminator()I
+
+    move-result v4
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+    const/4 v8, 0x1
 
-    move-result-object v5
+    invoke-static {v2, v3, v4, v8}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Z)Ljava/lang/String;
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getDiscriminator()I
+    move-result-object v2
 
-    move-result v5
+    const v3, 0x7f070052
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const/4 v4, 0x0
 
-    move-result-object v5
+    iget-object v5, v0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
 
-    const/4 v9, 0x1
+    check-cast v5, Lcom/discord/utilities/images/MGImages$ChangeDetector;
 
-    invoke-static {v3, v4, v5, v9}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Z)Ljava/lang/String;
+    const/16 v6, 0x8
 
-    move-result-object v3
+    const/4 v7, 0x0
 
-    const v4, 0x7f070052
-
-    const/4 v5, 0x0
-
-    iget-object v6, v0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
-
-    check-cast v6, Lcom/discord/utilities/images/MGImages$ChangeDetector;
-
-    const/16 v7, 0x8
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getProfile()Lcom/discord/models/domain/ModelUserProfile;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getSnowsGivingHypeSquadEventWinner()I
 
-    move-result v3
+    move-result v2
 
-    invoke-direct {v0, v2, v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeInfo(Lcom/discord/models/domain/ModelUserProfile;I)Ljava/util/List;
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeInfo(Lcom/discord/models/domain/ModelUserProfile;I)Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lkotlin/a/l;->at(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v2
 
-    invoke-static {v2}, Lkotlin/a/l;->at(Ljava/util/List;)Ljava/lang/Object;
+    check-cast v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
 
-    move-result-object v3
+    if-nez v2, :cond_1
 
-    check-cast v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
 
-    if-nez v3, :cond_1
-
-    new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    const/4 v10, 0x0
 
     const/4 v11, 0x0
 
@@ -389,230 +392,230 @@
 
     const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v15, 0x1f
 
-    const/16 v16, 0x1f
+    const/16 v16, 0x0
 
-    const/16 v17, 0x0
+    move-object v9, v2
 
-    move-object v10, v3
-
-    invoke-direct/range {v10 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IIZLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v9 .. v16}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IIZLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     :cond_1
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserName()Landroid/widget/TextView;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v5
+    move-result-object v4
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getContext()Landroid/content/Context;
 
-    move-result-object v6
-
-    const v7, 0x7f04026a
-
-    invoke-static {v6, v7}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
-    move-result v6
-
-    invoke-virtual {v5, v6}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator(I)Ljava/lang/CharSequence;
-
     move-result-object v5
 
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    const v6, 0x7f04026a
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    invoke-virtual {v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getText()Ljava/lang/String;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/CharSequence;
-
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    invoke-virtual {v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getTextColor()I
+    invoke-static {v5, v6}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v5
 
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setTextColor(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
+    invoke-virtual {v4, v5}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator(I)Ljava/lang/CharSequence;
 
     move-result-object v4
 
-    check-cast v4, Landroid/view/View;
+    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
 
-    move-result v5
+    move-result-object v3
 
-    const/4 v6, 0x0
+    invoke-virtual {v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getText()Ljava/lang/String;
 
-    if-ne v5, v9, :cond_2
+    move-result-object v4
 
-    const/4 v5, 0x1
+    check-cast v4, Ljava/lang/CharSequence;
+
+    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
+
+    move-result-object v3
+
+    invoke-virtual {v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getTextColor()I
+
+    move-result v4
+
+    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setTextColor(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
+
+    move-result-object v3
+
+    check-cast v3, Landroid/view/View;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v4
+
+    const/4 v5, 0x0
+
+    if-ne v4, v8, :cond_2
+
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_2
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-static {v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+    invoke-static {v3, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeWrapOuter()Landroid/view/View;
 
-    move-result-object v4
-
-    move-object v5, v2
-
-    check-cast v5, Ljava/util/Collection;
-
-    invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v5
-
-    xor-int/2addr v5, v9
-
-    invoke-static {v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeWrapOuter()Landroid/view/View;
-
-    move-result-object v4
-
-    invoke-interface {v2}, Ljava/util/List;->size()I
-
-    move-result v5
-
-    if-ne v5, v9, :cond_3
-
-    invoke-virtual {v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getToastClickListener()Landroid/view/View$OnClickListener;
-
     move-result-object v3
 
+    move-object v4, v1
+
+    check-cast v4, Ljava/util/Collection;
+
+    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v4
+
+    xor-int/2addr v4, v8
+
+    invoke-static {v3, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeWrapOuter()Landroid/view/View;
+
+    move-result-object v3
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v4
+
+    if-ne v4, v8, :cond_3
+
+    invoke-virtual {v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getToastClickListener()Landroid/view/View$OnClickListener;
+
+    move-result-object v2
+
     goto :goto_1
 
     :cond_3
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_1
-    invoke-virtual {v4, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v3, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgesWrap()Landroid/view/ViewGroup;
 
+    move-result-object v2
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v3
+
+    invoke-virtual {v2}, Landroid/view/ViewGroup;->getChildCount()I
+
+    move-result v4
+
+    sub-int/2addr v3, v4
+
+    invoke-static {v5, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v3
+
+    invoke-static {v5, v3}, Lkotlin/ranges/b;->aq(II)Lkotlin/ranges/IntRange;
+
     move-result-object v3
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    check-cast v3, Ljava/lang/Iterable;
 
-    move-result v4
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    invoke-virtual {v3}, Landroid/view/ViewGroup;->getChildCount()I
-
-    move-result v5
-
-    sub-int/2addr v4, v5
-
-    invoke-static {v6, v4}, Ljava/lang/Math;->max(II)I
-
-    move-result v4
-
-    invoke-static {v6, v4}, Lkotlin/ranges/b;->aq(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/Iterable;
-
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v4
+    move-result-object v3
 
     :goto_2
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_4
+    if-eqz v4, :cond_4
 
-    move-object v5, v4
+    move-object v4, v3
 
-    check-cast v5, Lkotlin/a/aa;
+    check-cast v4, Lkotlin/a/aa;
 
-    invoke-virtual {v5}, Lkotlin/a/aa;->nextInt()I
+    invoke-virtual {v4}, Lkotlin/a/aa;->nextInt()I
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getLayoutInflater()Landroid/view/LayoutInflater;
 
-    move-result-object v5
+    move-result-object v4
 
-    const v7, 0x7f0d0182
+    const v6, 0x7f0d0182
 
-    invoke-virtual {v5, v7, v3, v9}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {v4, v6, v2, v8}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     goto :goto_2
 
     :cond_4
-    invoke-virtual {v3}, Landroid/view/ViewGroup;->getChildCount()I
+    invoke-virtual {v2}, Landroid/view/ViewGroup;->getChildCount()I
+
+    move-result v3
+
+    invoke-static {v5, v3}, Lkotlin/ranges/b;->aq(II)Lkotlin/ranges/IntRange;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Iterable;
+
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :goto_3
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
-    invoke-static {v6, v4}, Lkotlin/ranges/b;->aq(II)Lkotlin/ranges/IntRange;
+    if-eqz v4, :cond_9
 
-    move-result-object v4
+    move-object v4, v3
 
-    check-cast v4, Ljava/lang/Iterable;
+    check-cast v4, Lkotlin/a/aa;
 
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-virtual {v4}, Lkotlin/a/aa;->nextInt()I
 
-    move-result-object v4
+    move-result v4
 
-    :goto_3
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+    invoke-virtual {v2, v4}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
 
-    move-result v5
+    move-result-object v6
 
-    if-eqz v5, :cond_9
+    if-eqz v6, :cond_8
 
-    move-object v5, v4
+    check-cast v6, Landroid/widget/ImageView;
 
-    check-cast v5, Lkotlin/a/aa;
+    if-ltz v4, :cond_5
 
-    invoke-virtual {v5}, Lkotlin/a/aa;->nextInt()I
+    invoke-static {v1}, Lkotlin/a/l;->ap(Ljava/util/List;)I
 
-    move-result v5
+    move-result v7
 
-    invoke-virtual {v3, v5}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+    if-gt v4, v7, :cond_5
+
+    invoke-interface {v1, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v7
 
-    if-eqz v7, :cond_8
-
-    check-cast v7, Landroid/widget/ImageView;
-
-    if-ltz v5, :cond_5
-
-    invoke-static {v2}, Lkotlin/a/l;->ap(Ljava/util/List;)I
-
-    move-result v8
-
-    if-gt v5, v8, :cond_5
-
-    invoke-interface {v2, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v8
-
     goto :goto_4
 
     :cond_5
-    new-instance v8, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    new-instance v7, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+
+    const/4 v10, 0x0
 
     const/4 v11, 0x0
 
@@ -622,65 +625,63 @@
 
     const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v15, 0x1f
 
-    const/16 v16, 0x1f
+    const/16 v16, 0x0
 
-    const/16 v17, 0x0
+    move-object v9, v7
 
-    move-object v10, v8
-
-    invoke-direct/range {v10 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IIZLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v9 .. v16}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IIZLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     :goto_4
-    check-cast v8, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    check-cast v7, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
 
-    move-object v10, v7
+    move-object v9, v6
 
-    check-cast v10, Landroid/view/View;
+    check-cast v9, Landroid/view/View;
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-interface {v1}, Ljava/util/List;->size()I
 
-    move-result v11
+    move-result v10
 
-    if-le v11, v5, :cond_6
+    if-le v10, v4, :cond_6
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
     goto :goto_5
 
     :cond_6
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_5
-    invoke-static {v10, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+    invoke-static {v9, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
-    invoke-virtual {v8}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getIcon()I
+    invoke-virtual {v7}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getIcon()I
 
-    move-result v5
+    move-result v4
 
-    invoke-virtual {v7, v5}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v6, v4}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    invoke-virtual {v8}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getTintSnowsgiving()Z
+    invoke-virtual {v7}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getTintSnowsgiving()Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_7
+    if-eqz v4, :cond_7
 
-    const-string v5, "#ffd56c"
+    const-string v4, "#ffd56c"
 
-    invoke-static {v5}, Landroid/graphics/Color;->parseColor(Ljava/lang/String;)I
+    invoke-static {v4}, Landroid/graphics/Color;->parseColor(Ljava/lang/String;)I
 
-    move-result v5
+    move-result v4
 
-    invoke-virtual {v7, v5}, Landroid/widget/ImageView;->setColorFilter(I)V
+    invoke-virtual {v6, v4}, Landroid/widget/ImageView;->setColorFilter(I)V
 
     :cond_7
-    invoke-virtual {v8}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getToastClickListener()Landroid/view/View$OnClickListener;
+    invoke-virtual {v7}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getToastClickListener()Landroid/view/View$OnClickListener;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v7, v5}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v6, v4}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     goto :goto_3
 
@@ -1381,8 +1382,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder.smali
index 958520f3ec..0139352a49 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetUserProfileInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder_ViewBinding.smali
index 59a1c18557..b515e84d34 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileInfo$Adapter$ViewHolder_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter.smali
index de0ace21da..50ddd92d09 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetUserProfileInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model$Item.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model$Item.smali
index 0c68eb8b17..9f814a744e 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model$Item.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileInfo.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model.smali
index 08ec333714..98e4fb4f27 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo.smali
index a1d1533728..c19ab7c29c 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserProfileInfo;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserProfileInfo.java"
 
 
 # annotations
@@ -225,7 +226,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v0
 
@@ -276,9 +277,9 @@
 
     move-result v1
 
-    const/4 v2, 0x0
+    const/16 v2, 0x8
 
-    const/16 v3, 0x8
+    const/4 v3, 0x0
 
     if-eqz v1, :cond_2
 
@@ -304,9 +305,12 @@
 
     if-eqz p1, :cond_3
 
-    const/16 v2, 0x8
+    goto :goto_2
 
     :cond_3
+    const/4 v2, 0x0
+
+    :goto_2
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
@@ -329,8 +333,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
     invoke-virtual {v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->disposeSubscriptions()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo_ViewBinding.smali
index 10048585d7..5add550bcc 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserProfileInfo_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileInfo_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1.smali
index c9d4468527..bc1b33b336 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
@@ -90,7 +91,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p1, p3, v0, v0}, Lcom/discord/models/domain/ModelPresence;-><init>(ILcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {p1, p3, v0, v0}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;Lcom/discord/models/domain/ModelUser;)V
 
     :goto_1
     new-instance p3, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion.smali
index c4d4b923c7..d42cbc4f93 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model.smali
index 3881d28153..95305850cd 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$1.smali
index 98cec1b7a1..4408c29608 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$2.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$2.smali
index 7c9e3df25f..f76a1f0e07 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$3.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$3.smali
index b51eb7249e..b0df322078 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$4.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$4.smali
index 7dddf2d74c..79704981ca 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$4;
 .super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
index bb722be3fd..2b30e96b4b 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetUserProfileStrip.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
index 96e0b950e3..e6d924b3a7 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserProfileStrip;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserProfileStrip.kt"
 
 
 # annotations
@@ -679,8 +680,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding$1.smali
index df851f4943..df7956d907 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/WidgetUserProfile_ViewBinding$1;
 .super Ljava/lang/Object;
+.source "WidgetUserProfile_ViewBinding.java"
 
 # interfaces
 .implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding.smali
index 86839967f0..b55a6fc954 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/WidgetUserProfile_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserProfile_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali
index 8f43f6e1b8..928e55f8eb 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserStatusSheet$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserStatusSheet.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$1.smali
index fac89b9d7b..e4e01f1f7c 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$1;
 .super Ljava/lang/Object;
+.source "WidgetUserStatusSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$2.smali
index 130181f910..2b3766fba7 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$2;
 .super Ljava/lang/Object;
+.source "WidgetUserStatusSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$3.smali
index f2afe36567..1427738af5 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$3;
 .super Ljava/lang/Object;
+.source "WidgetUserStatusSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$4.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$4.smali
index 1605f7e3a3..941d4ed2e1 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$4;
 .super Ljava/lang/Object;
+.source "WidgetUserStatusSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 1dafd91770..725dbcdbd7 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/WidgetUserStatusSheet$updateStateAndDismiss$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserStatusSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
index 0add3fd3b3..6845df503f 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/WidgetUserStatusSheet;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetUserStatusSheet.kt"
 
 
 # annotations
@@ -440,8 +441,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 1f788e9cc7..1ce1793ebe 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/account/WidgetUserAccountVerify;
 .super Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
+.source "WidgetUserAccountVerify.java"
 
 
 # instance fields
@@ -218,9 +219,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/account/WidgetUserAccountVerify;->verifyAccountBodyTextView:Landroid/widget/TextView;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/account/WidgetUserAccountVerify;->verifyAccountBodyTextView:Landroid/widget/TextView;
-
-    invoke-virtual {v1}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -248,9 +247,9 @@
 
     move-result v0
 
-    const/16 v1, 0x8
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/16 v2, 0x8
 
     if-eqz v0, :cond_0
 
@@ -306,9 +305,12 @@
 
     if-eqz v0, :cond_2
 
-    const/4 v1, 0x0
+    goto :goto_2
 
     :cond_2
+    const/16 v1, 0x8
+
+    :goto_2
     invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/account/WidgetUserAccountVerify;->verifyByCaptcha:Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali
index 0088e05b7b..4b5a1d9431 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserAccountVerifyBase.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali
index dee5199c8e..cf8e9b9c28 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1;
 .super Ljava/lang/Object;
+.source "WidgetUserAccountVerifyBase.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 d6b16e0844..adc8d7ae36 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetUserAccountVerifyBase.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f24469411d..41e7ba7947 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1;
 .super Ljava/lang/Object;
+.source "WidgetUserAccountVerifyBase.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
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 752287fe38..ec4bfce43d 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetUserAccountVerifyBase.kt"
 
 
 # annotations
@@ -325,8 +326,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify_ViewBinding.smali
index 2a01a6833a..ac52099d69 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/account/WidgetUserAccountVerify_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserAccountVerify_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali
index b42322bcae..ea79cf3f9c 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserCaptchaVerify.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali
index d41019d390..83c097f1d3 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1;
 .super Ljava/lang/Object;
+.source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
 .implements Lrx/functions/b;
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 f22b113325..f0c05277d8 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2;
 .super Ljava/lang/Object;
+.source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -76,6 +77,8 @@
 
     invoke-static {p1, v1, v1, v0}, Lcom/discord/app/e;->a(Landroid/content/Context;ZZI)V
 
+    return-void
+
     :cond_0
     return-void
 .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 eaf917fbc7..a59d7007e6 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3;
 .super Ljava/lang/Object;
+.source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -99,6 +100,8 @@
 
     invoke-static {v0, p1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali
index 4ca90a122f..a71fe4d53b 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$2.smali
index d4c6a0c735..35da75af7d 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -46,6 +47,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$3.smali
index 94f17af412..c384dc5351 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 b8cb9fae24..de0ff8849e 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 .super Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
+.source "WidgetUserCaptchaVerify.kt"
 
 
 # annotations
@@ -294,8 +295,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali
index 07eb699e8c..fc9278499c 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserEmailUpdate.kt"
 
 
 # annotations
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 3bd331061d..e4deb0be93 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetUserEmailUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
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 f55bfcb834..3e36d61a98 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2;
 .super Ljava/lang/Object;
+.source "WidgetUserEmailUpdate.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3$1.smali
index 346d31144b..51292f512e 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3$1;
 .super Ljava/lang/Object;
+.source "WidgetUserEmailUpdate.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali
index dcc6055857..d26c55cb27 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetUserEmailUpdate.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 28b711fe84..03adcd6092 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 .super Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
+.source "WidgetUserEmailUpdate.kt"
 
 
 # annotations
@@ -421,8 +422,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
index 081b089afa..bbde8aad80 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/user/email/WidgetUserEmailVerify$Model;
 .super Ljava/lang/Object;
+.source "WidgetUserEmailVerify.java"
 
 
 # annotations
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 2de9a696b3..fb60786df3 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/email/WidgetUserEmailVerify;
 .super Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
+.source "WidgetUserEmailVerify.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify_ViewBinding.smali
index b560b4a890..d4c8f7cced 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/email/WidgetUserEmailVerify_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserEmailVerify_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 042802166e..437364f0a5 100644
--- a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
+++ b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 .super Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
+.source "WidgetUserPhoneAdd.java"
 
 
 # instance fields
@@ -310,11 +311,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneAddWrap:Landroid/widget/ScrollView;
+    const/16 p1, 0x82
 
-    const/16 v0, 0x82
-
-    invoke-virtual {p1, v0}, Landroid/widget/ScrollView;->fullScroll(I)Z
+    invoke-virtual {v0, p1}, Landroid/widget/ScrollView;->fullScroll(I)Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd_ViewBinding.smali
index c963c53e43..8b8e863b8d 100644
--- a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserPhoneAdd_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
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 412bb27bd0..7f1ad31464 100644
--- a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;
 .super Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
+.source "WidgetUserPhoneVerify.java"
 
 
 # instance fields
@@ -99,11 +100,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->verifyWrap:Landroid/widget/ScrollView;
+    const/16 p1, 0x82
 
-    const/16 v0, 0x82
-
-    invoke-virtual {p1, v0}, Landroid/widget/ScrollView;->fullScroll(I)Z
+    invoke-virtual {v0, p1}, Landroid/widget/ScrollView;->fullScroll(I)Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify_ViewBinding.smali b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify_ViewBinding.smali
index a19fb0ae39..7583ccaf91 100644
--- a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetUserPhoneVerify_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/user/search/ChannelFrecencyTracker.smali b/com.discord/smali/com/discord/widgets/user/search/ChannelFrecencyTracker.smali
index bf315f20d5..530080785b 100644
--- a/com.discord/smali/com/discord/widgets/user/search/ChannelFrecencyTracker.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/ChannelFrecencyTracker.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/ChannelFrecencyTracker;
 .super Lcom/discord/utilities/frecency/FrecencyTracker;
+.source "ChannelFrecencyTracker.kt"
 
 
 # annotations
@@ -95,8 +96,6 @@
 
     long-to-double v2, v2
 
-    iget-wide v4, p0, Lcom/discord/widgets/user/search/ChannelFrecencyTracker;->oldestAllowedDeltaMs:J
-
     long-to-double v4, v4
 
     invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z
diff --git a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali
index b743efe894..c362bed03e 100644
--- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2;
 .super Lkotlin/jvm/internal/k;
+.source "ViewGlobalSearchItem.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 47af5e1146..c23183e634 100644
--- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 .super Landroidx/constraintlayout/widget/ConstraintLayout;
+.source "ViewGlobalSearchItem.kt"
 
 
 # static fields
@@ -493,8 +494,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
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 9e8939b28c..314a2d317d 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 
 # annotations
@@ -92,7 +93,6 @@
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    :goto_0
     check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
     return-object v0
@@ -110,12 +110,12 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     move-object v0, v1
 
-    :goto_1
+    :goto_0
     if-eqz v0, :cond_2
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
@@ -164,7 +164,9 @@
 
     invoke-direct/range {v2 .. v12}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ZLcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelChannel;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    goto :goto_0
+    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    return-object v0
 
     :cond_2
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Item;->getChannel()Lcom/discord/models/domain/ModelChannel;
@@ -211,7 +213,9 @@
 
     invoke-direct/range {v2 .. v10}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    goto :goto_0
+    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    return-object v0
 
     :cond_3
     return-object v1
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali
index 07d2844bd8..bfa0ddada9 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
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 d1eb67643e..a480fc084e 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
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 8b9be15f42..a3539560ba 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
@@ -80,7 +81,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     sget-object v0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->Companion:Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;
@@ -101,17 +102,14 @@
 
     move-result-wide p1
 
-    :goto_0
-    move-wide v2, p1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-wide/16 p1, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-wide v2, p1
 
-    :goto_1
     const/4 v4, 0x0
 
     const/4 v5, 0x4
@@ -120,7 +118,7 @@
 
     invoke-static/range {v0 .. v6}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;->show$default(Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;Landroidx/fragment/app/Fragment;JZILjava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_1
     sget-object p1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion;
@@ -137,7 +135,9 @@
 
     invoke-virtual {p1, p2, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion;->show(Landroidx/fragment/app/FragmentManager;J)V
 
-    :goto_2
+    return-void
+
+    :goto_1
     return-void
 
     :pswitch_data_0
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 97130d7ce9..25a7500ea6 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
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 e4b7338c74..333bce9436 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_views/LambdaTextWatcher$OnAfterChanged;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$3.smali
index 586c872321..2693f0e0d8 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$3;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.smali
index d4b8abf3d7..3853372b93 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali
index 30da5ad1cb..d5a4dee39c 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali
index 50a6431119..54e17d47f0 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$7.smali
index 50757c059d..9470df10de 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$7;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 a8df200eec..1c40f2c483 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 1b8b0d37f5..0304a231b9 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$setSearchPrefix$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$setSearchPrefix$$inlined$apply$lambda$1.smali
index 91c3e66188..7ed559e3e5 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$setSearchPrefix$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$setSearchPrefix$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$setSearchPrefix$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$2.smali
index 39a3f3ecab..bbfaf82a99 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearch.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 3ae494930a..a91b067677 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetGlobalSearch.kt"
 
 
 # annotations
@@ -1003,9 +1004,9 @@
 
     move-result v2
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
     if-nez v2, :cond_0
 
@@ -1023,7 +1024,6 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    :goto_1
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
@@ -1032,10 +1032,9 @@
 
     move-result-object p1
 
-    :goto_2
     check-cast p1, Ljava/lang/CharSequence;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     invoke-static {v1}, Lkotlin/text/l;->m(Ljava/lang/CharSequence;)C
@@ -1058,30 +1057,43 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
     goto :goto_1
 
     :cond_2
     check-cast p1, Ljava/lang/CharSequence;
 
-    invoke-interface {v0, v3, v4, p1}, Landroid/text/Editable;->replace(IILjava/lang/CharSequence;)Landroid/text/Editable;
+    invoke-interface {v0, v4, v3, p1}, Landroid/text/Editable;->replace(IILjava/lang/CharSequence;)Landroid/text/Editable;
 
     move-result-object p1
 
-    goto :goto_2
+    check-cast p1, Ljava/lang/CharSequence;
 
-    :goto_3
-    if-eqz p1, :cond_3
+    :goto_1
+    if-eqz p1, :cond_4
 
     invoke-static {p1}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_3
+
+    goto :goto_2
 
     :cond_3
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     :cond_4
+    :goto_2
     if-nez v3, :cond_5
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getSearchInput()Landroid/widget/EditText;
@@ -1310,6 +1322,8 @@
     invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 
@@ -1321,8 +1335,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1471,6 +1483,8 @@
 
     invoke-virtual {v0, v1}, Landroid/view/Window;->setSoftInputMode(I)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1744,11 +1758,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KG()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali
index 96d0a9cb9a..f0dafc687a 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder;
 .super Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder;
+.source "WidgetGlobalSearchAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali
index fd26976fff..4f49d0bb19 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder;
 .super Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder;
+.source "WidgetGlobalSearchAdapter.kt"
 
 
 # annotations
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 51d41ced4c..33c956143c 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder;
 .super Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
+.source "WidgetGlobalSearchAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali
index f57b084cb9..89415bf3ca 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali
index ae0dadd994..a61de8ced9 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali
index 008322faa1..b4caacea81 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetGlobalSearchAdapter.kt"
 
 
 # annotations
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 877d33cada..d1f04a069a 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
@@ -1,5 +1,6 @@
 .class abstract Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder;
 .super Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
+.source "WidgetGlobalSearchAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali
index b088d292df..c801fae3d5 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder;
 .super Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder;
+.source "WidgetGlobalSearchAdapter.kt"
 
 
 # annotations
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 05f00db924..7f88915a11 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
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali
index 6a47678a3e..621eef3d3b 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetGlobalSearchAdapter.kt"
 
 
 # annotations
@@ -118,7 +119,6 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    :goto_0
     check-cast p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
 
     return-object p1
@@ -128,21 +128,27 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
+
+    return-object p1
 
     :pswitch_2
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
+
+    return-object p1
 
     :pswitch_3
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    goto :goto_0
+    check-cast p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
+
+    return-object p1
 
     nop
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali
index 8514eccecd..d3147e3ab2 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali
index 013a98a392..6153098c95 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1.smali
index 5e907b0312..aebda323a7 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali
index 9a66853c79..9c8b056192 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali
index 457dcd6c3b..d3fb3ba72f 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
@@ -73,7 +74,7 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
-    .locals 11
+    .locals 10
 
     const-string v1, "receiver$0"
 
@@ -123,13 +124,13 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v7
+    move-result-object v6
 
-    invoke-interface {v4, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -183,13 +184,13 @@
 
     check-cast v4, Ljava/lang/String;
 
-    sget-object v7, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
+    sget-object v6, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    const-string v8, "it"
+    const-string v7, "it"
 
-    invoke-static {v4, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v7, v4, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    invoke-virtual {v6, v4, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     move-result-object v4
 
@@ -240,22 +241,21 @@
     :goto_2
     sget-object v4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    const-string v7, "nameToMatch"
+    const-string v6, "nameToMatch"
 
-    invoke-static {v1, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4, v1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     move-result-object v4
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     if-eqz v4, :cond_6
 
-    :goto_3
     move-object v1, v4
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     move-object v4, v3
@@ -266,7 +266,7 @@
 
     move-result v4
 
-    xor-int/2addr v4, v7
+    xor-int/2addr v4, v6
 
     if-eqz v4, :cond_7
 
@@ -278,20 +278,20 @@
 
     move-object v1, v0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     sget-object v4, Lcom/discord/utilities/search/SearchUtils;->INSTANCE:Lcom/discord/utilities/search/SearchUtils;
 
     invoke-virtual {v1}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    const-string v9, "(this as java.lang.String).toLowerCase()"
+    const-string v8, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v8, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v4, p2, v8}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
+    invoke-virtual {v4, p2, v7}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
     move-result v4
 
@@ -301,20 +301,22 @@
 
     check-cast v1, Ljava/lang/CharSequence;
 
-    const/4 v8, -0x1
+    const/4 v7, -0x1
 
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
     move-result v0
 
-    invoke-direct {v4, v1, v8, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;-><init>(Ljava/lang/CharSequence;II)V
+    invoke-direct {v4, v1, v7, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;-><init>(Ljava/lang/CharSequence;II)V
+
+    move-object v1, v4
 
     goto :goto_3
 
     :cond_8
     move-object v1, v5
 
-    :goto_4
+    :goto_3
     if-eqz v1, :cond_e
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$usersContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
@@ -341,22 +343,22 @@
 
     if-nez v0, :cond_9
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
 
-    if-ne v0, v7, :cond_a
+    if-ne v0, v6, :cond_a
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_a
-    :goto_5
-    const/4 v7, 0x0
+    :goto_4
+    const/4 v6, 0x0
 
-    :goto_6
+    :goto_5
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
@@ -387,13 +389,13 @@
 
     new-instance v5, Ljava/util/ArrayList;
 
-    const/16 v8, 0xa
+    const/16 v7, 0xa
 
-    invoke-static {v3, v8}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I
+    invoke-static {v3, v7}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I
 
-    move-result v8
+    move-result v7
 
-    invoke-direct {v5, v8}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v5, v7}, Ljava/util/ArrayList;-><init>(I)V
 
     check-cast v5, Ljava/util/Collection;
 
@@ -401,26 +403,26 @@
 
     move-result-object v3
 
-    :goto_7
+    :goto_6
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_b
+    if-eqz v7, :cond_b
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v7
 
-    check-cast v8, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    check-cast v7, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
-    invoke-virtual {v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getValue()Ljava/lang/CharSequence;
+    invoke-virtual {v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getValue()Ljava/lang/CharSequence;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-interface {v5, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v5, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_b
     check-cast v5, Ljava/util/List;
@@ -441,9 +443,9 @@
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v8
+    move-result-wide v7
 
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v5
 
@@ -459,14 +461,14 @@
 
     move-result v0
 
-    move v8, v0
+    move v7, v0
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    :goto_8
+    :goto_7
     if-eqz p3, :cond_d
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
@@ -487,15 +489,15 @@
 
     move-result v0
 
-    move v9, v0
+    move v8, v0
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_d
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    :goto_9
-    new-instance v10, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    :goto_8
+    new-instance v9, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$usersContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
 
@@ -519,21 +521,17 @@
 
     check-cast v5, Lcom/discord/models/domain/ModelPresence;
 
-    move-object v0, v10
+    move-object v0, v9
 
     move-object v2, p1
 
-    move v4, v7
+    move v4, v6
 
     move-object v6, p3
 
-    move v7, v8
-
-    move v8, v9
-
     invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ZLcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelChannel;IZ)V
 
-    return-object v10
+    return-object v9
 
     :cond_e
     return-object v5
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali
index 4e10c3497f..9fe256ab47 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -75,7 +76,7 @@
 
     move-result-object v4
 
-    if-eqz v4, :cond_6
+    if-eqz v4, :cond_7
 
     iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
@@ -169,7 +170,7 @@
     const/4 v7, 0x0
 
     :goto_2
-    if-eqz p2, :cond_5
+    if-eqz p2, :cond_6
 
     check-cast p2, Ljava/lang/Iterable;
 
@@ -187,6 +188,8 @@
 
     if-eqz v1, :cond_3
 
+    const/4 v8, 0x0
+
     goto :goto_3
 
     :cond_3
@@ -231,13 +234,17 @@
 
     const/4 v8, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
-    :goto_3
     const/4 v8, 0x0
 
-    :goto_4
+    goto :goto_3
+
+    :cond_6
+    const/4 v8, 0x0
+
+    :goto_3
     new-instance p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
     const/4 v6, 0x0
@@ -254,7 +261,7 @@
 
     return-object p2
 
-    :cond_6
+    :cond_7
     const/4 p1, 0x0
 
     return-object p1
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali
index 70e610adb2..90acd8bb65 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali
index 2d4fc69178..fe31eb1a12 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali
index efc3bf5fd0..4524186de8 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali
index 6443be07ef..86cc11818a 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali
index 3aadac2549..0494b2bd2b 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali
index 690947725f..71ea50285a 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali
index 2c834c5d72..c2206ae29c 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali
index 98c27bde4c..f8fd68e0f3 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali
index 34b816670c..709543e87e 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali
index af26dd3b5c..1d5ab5082e 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali
index 12474e0cb0..6c9a824634 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali
index ce28710e18..c26c2c581f 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali
index 5f463f2661..d077446e93 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali
index 6d44125988..878eb65ce7 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali
index 445465e80b..22ebdedc5d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function6;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali
index a6d28cf590..ca1e28662d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function7;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali
index 71048e1703..1b74e9f71c 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali
index a9c03bdcfe..2339dacb7b 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali
index a122988eaf..35acf1377e 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function7;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali
index 69ba595ef2..3113815729 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali
index dfa1a616b8..be83917c47 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function4;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali
index 2082e27a23..4aa47c4cd6 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali
index 38dbf3c3bc..c2aab235f3 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali
index b24a7581df..e5596db5c1 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali
index 2c63fd7168..4e9b439223 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali
index 7db4ba6570..fcc4e4e336 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali
index 58c1a4b1b4..02f548470d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali
index 767725c296..7e02e7e9f8 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali
index c88b2d0947..a52626c696 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali
index 4a499d2ef7..179b615e08 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 dda440d440..c78620754f 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
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 
 # annotations
@@ -39,9 +40,14 @@
 
     const/4 p5, 0x0
 
+    move-object v5, p5
+
+    goto :goto_0
+
     :cond_0
     move-object v5, p5
 
+    :goto_0
     and-int/lit8 p5, p7, 0x20
 
     if-eqz p5, :cond_1
@@ -52,9 +58,14 @@
 
     check-cast p6, Lkotlin/jvm/functions/Function1;
 
+    move-object v6, p6
+
+    goto :goto_1
+
     :cond_1
     move-object v6, p6
 
+    :goto_1
     move-object v0, p0
 
     move-object v1, p1
@@ -73,7 +84,7 @@
 .end method
 
 .method private final get(Lrx/Observable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lrx/Observable;
-    .locals 15
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -193,7 +204,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v2
 
@@ -207,13 +218,13 @@
 
     sget-object v6, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    move-object/from16 v1, p1
+    move-object v1, p1
 
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -290,7 +301,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v1
 
@@ -415,7 +426,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v2
 
@@ -461,7 +472,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v2
 
@@ -499,9 +510,9 @@
 
     check-cast v8, Lrx/functions/Func6;
 
-    const-wide/16 v13, 0xc8
+    const-wide/16 v11, 0xc8
 
-    sget-object v11, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v13, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
     move-object v2, v0
 
@@ -509,13 +520,15 @@
 
     move-object v4, v10
 
-    move-wide v9, v13
+    move-wide v9, v11
+
+    move-object v11, v13
 
     invoke-static/range {v2 .. v11}, 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 v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -798,213 +811,191 @@
         }
     .end annotation
 
-    move-object/from16 v1, p1
+    move-object/from16 v0, p1
 
-    move-object/from16 v8, p2
+    move-object/from16 v7, p2
 
-    move-object/from16 v9, p3
+    move-object/from16 v8, p3
 
-    move-object/from16 v10, p5
+    move-object/from16 v9, p5
 
-    move-object/from16 v11, p6
+    move-object/from16 v10, p6
 
-    const-string v2, "searchContext"
+    const-string v1, "searchContext"
 
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "usersContext"
+    const-string v1, "usersContext"
 
-    invoke-static {v8, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "channelContext"
+    const-string v1, "channelContext"
 
-    invoke-static {v9, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "widgetGuildsListModel"
+    const-string v1, "widgetGuildsListModel"
 
-    move-object/from16 v12, p4
+    move-object/from16 v11, p4
 
-    invoke-static {v12, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "lastChannelIdProvider"
+    const-string v1, "lastChannelIdProvider"
 
-    invoke-static {v11, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
+    new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
 
-    invoke-direct {v13, v8, v1, v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;)V
+    invoke-direct {v12, v7, v0, v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;)V
 
-    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;
+    new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;
 
-    invoke-direct {v2, v9, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)V
+    invoke-direct {v1, v8, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)V
 
-    new-instance v14, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;
+    new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;
 
-    invoke-direct {v14, v9, v13, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)V
+    invoke-direct {v13, v8, v12, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getSearchType()I
 
-    move-result v15
+    move-result v14
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getSanitizedFilter()Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v15
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->getComputed()Ljava/util/Map;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getRecentGuildIds()Ljava/util/List;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-static {v4}, Lkotlin/a/l;->as(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v3}, Lkotlin/a/l;->as(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v3
 
-    check-cast v3, Ljava/util/Map;
+    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v3, :cond_1
+    move-result-object v2
 
-    invoke-interface {v3}, Ljava/util/Map;->keySet()Ljava/util/Set;
+    check-cast v2, Ljava/util/Map;
 
-    move-result-object v3
+    if-eqz v2, :cond_1
 
-    if-nez v3, :cond_0
+    invoke-interface {v2}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
-    goto :goto_1
+    move-result-object v2
 
-    :cond_0
-    :goto_0
-    move-object v6, v3
-
-    goto :goto_2
-
-    :cond_1
-    :goto_1
-    sget-object v3, Lkotlin/a/z;->bPD:Lkotlin/a/z;
-
-    check-cast v3, Ljava/util/Set;
+    if-nez v2, :cond_0
 
     goto :goto_0
 
-    :goto_2
-    packed-switch v15, :pswitch_data_0
+    :cond_0
+    move-object v6, v2
 
-    move-object v2, v7
+    goto :goto_1
 
-    check-cast v2, Ljava/lang/CharSequence;
+    :cond_1
+    :goto_0
+    sget-object v2, Lkotlin/a/z;->bPD:Lkotlin/a/z;
 
-    invoke-static {v2}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
+    check-cast v2, Ljava/util/Set;
 
-    move-result v2
+    move-object v6, v2
 
-    if-eqz v2, :cond_3
+    :goto_1
+    packed-switch v14, :pswitch_data_0
 
-    move-object/from16 v2, p0
+    move-object v1, v15
 
-    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
+    check-cast v1, Ljava/lang/CharSequence;
 
-    invoke-direct {v2, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getRecentChannelIds(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)Lkotlin/sequences/Sequence;
+    invoke-static {v1}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
 
-    move-result-object v2
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    move-object/from16 v1, p0
+
+    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
+
+    invoke-direct {v1, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getRecentChannelIds(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)Lkotlin/sequences/Sequence;
+
+    move-result-object v1
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getMentionCounts()Ljava/util/Map;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-interface {v3}, Ljava/util/Map;->keySet()Ljava/util/Set;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-static {v2}, Lkotlin/sequences/i;->j(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
+    invoke-interface {v2}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v2
 
-    const-string v4, "receiver$0"
+    check-cast v2, Ljava/lang/Iterable;
 
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/sequences/i;->j(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
 
-    const-string v4, "other"
+    move-result-object v1
 
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v3, "receiver$0"
 
-    invoke-static {v3}, Lkotlin/a/l;->l(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v3
+    const-string v3, "other"
 
-    move-object v4, v3
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v4, Ljava/util/Collection;
-
-    invoke-static {v4, v2}, Lkotlin/a/l;->a(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-static {v3}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v2}, Lkotlin/a/l;->l(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v2
 
-    new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5;
+    move-object v3, v2
 
-    invoke-direct {v3, v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;)V
+    check-cast v3, Ljava/util/Collection;
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
+    invoke-static {v3, v1}, Lkotlin/a/l;->a(Ljava/util/Collection;Ljava/lang/Iterable;)Z
 
-    invoke-static {v2, v3}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    check-cast v2, Ljava/lang/Iterable;
 
-    move-result-object v2
+    invoke-static {v2}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
-    sget-object v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6;
+    move-result-object v1
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
+    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5;
 
-    invoke-static {v2, v3}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-direct {v2, v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;)V
 
-    move-result-object v2
+    check-cast v2, Lkotlin/jvm/functions/Function1;
 
-    new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7;
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
-    invoke-direct {v3, v14, v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;Ljava/lang/String;)V
+    move-result-object v1
 
-    goto :goto_3
+    sget-object v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6;
+
+    check-cast v2, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7;
+
+    invoke-direct {v2, v13, v15}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;Ljava/lang/String;)V
+
+    check-cast v2, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object v1
+
+    goto/16 :goto_3
 
     :pswitch_0
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getGuilds()Ljava/util/Map;
 
-    move-result-object v3
-
-    invoke-interface {v3}, Ljava/util/Map;->values()Ljava/util/Collection;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-static {v3}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
-
-    move-result-object v3
-
-    new-instance v4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2;
-
-    invoke-direct {v4, v2, v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;Ljava/lang/String;)V
-
-    check-cast v4, Lkotlin/jvm/functions/Function1;
-
-    invoke-static {v3, v4}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
-
-    move-result-object v2
-
-    goto :goto_4
-
-    :pswitch_1
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getChannels()Ljava/util/Map;
-
     move-result-object v2
 
     invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
@@ -1017,70 +1008,99 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3;
+    new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2;
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
+    invoke-direct {v3, v1, v15}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;Ljava/lang/String;)V
 
-    invoke-static {v2, v3}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
-
-    move-result-object v2
-
-    new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4;
-
-    invoke-direct {v3, v14, v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;Ljava/lang/String;)V
-
-    :goto_3
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
     invoke-static {v2, v3}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    :goto_4
-    move-object v12, v7
+    goto/16 :goto_3
 
-    goto/16 :goto_6
+    :pswitch_1
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getChannels()Ljava/util/Map;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    invoke-static {v1}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3;
+
+    check-cast v2, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4;
+
+    invoke-direct {v2, v13, v15}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;Ljava/lang/String;)V
+
+    check-cast v2, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object v1
+
+    goto/16 :goto_3
 
     :pswitch_2
-    move-object v2, v7
+    move-object v1, v15
 
-    check-cast v2, Ljava/lang/CharSequence;
+    check-cast v1, Ljava/lang/CharSequence;
 
-    invoke-static {v2}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
+    invoke-static {v1}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
-    move-object/from16 v2, p0
+    move-object/from16 v1, p0
 
-    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
+    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    invoke-direct {v2, v1, v9, v8, v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getDefaultUserSearch(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/util/Set;)Lkotlin/sequences/Sequence;
+    invoke-direct {v1, v0, v8, v7, v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getDefaultUserSearch(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/util/Set;)Lkotlin/sequences/Sequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    goto :goto_5
+    goto :goto_2
 
     :cond_2
     invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->getUsers()Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
+    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Ljava/lang/Iterable;
+    check-cast v1, Ljava/lang/Iterable;
 
-    invoke-static {v2}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v1}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    :goto_5
-    new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;
+    :goto_2
+    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;
 
-    invoke-direct {v3, v13, v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Ljava/lang/String;)V
+    invoke-direct {v2, v12, v15}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Ljava/lang/String;)V
+
+    check-cast v2, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object v1
 
     goto :goto_3
 
@@ -1091,57 +1111,55 @@
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getChannels()Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
+    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Ljava/lang/Iterable;
+    check-cast v1, Ljava/lang/Iterable;
 
-    invoke-static {v2}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v1}, Lkotlin/a/l;->n(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    sget-object v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1;
+    sget-object v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1;
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
+    check-cast v2, Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v2, v3}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object v4
 
     new-instance v16, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2;
 
-    move-object/from16 v2, v16
+    move-object/from16 v1, v16
 
-    move-object v3, v5
+    move-object v2, v5
 
-    move-object v0, v4
+    move-object v3, v12
 
-    move-object v4, v13
+    move-object v8, v4
 
-    move-object v9, v5
+    move-object/from16 v4, p2
 
-    move-object/from16 v5, p2
+    move-object v11, v5
+
+    move-object v5, v15
 
     move-object/from16 v17, v6
 
-    move-object v6, v7
+    move-object v6, v13
 
-    move-object v12, v7
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2;-><init>(Ljava/util/HashSet;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;)V
 
-    move-object v7, v14
+    move-object/from16 v1, v16
 
-    invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2;-><init>(Ljava/util/HashSet;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;)V
+    check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    move-object/from16 v2, v16
+    invoke-static {v8, v1}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
-    check-cast v2, Lkotlin/jvm/functions/Function1;
-
-    invoke-static {v0, v2}, Lkotlin/sequences/i;->e(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
-
-    move-result-object v0
+    move-result-object v1
 
     move-object/from16 v6, v17
 
@@ -1153,7 +1171,7 @@
 
     new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1;
 
-    invoke-direct {v3, v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1;-><init>(Ljava/util/HashSet;)V
+    invoke-direct {v3, v11}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1;-><init>(Ljava/util/HashSet;)V
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
@@ -1163,7 +1181,7 @@
 
     new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2;
 
-    invoke-direct {v3, v13, v8, v12}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/lang/String;)V
+    invoke-direct {v3, v12, v7, v15}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/lang/String;)V
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
@@ -1171,39 +1189,39 @@
 
     move-result-object v2
 
-    invoke-static {v0, v2}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    :goto_6
-    if-eqz v10, :cond_4
+    :goto_3
+    if-eqz v9, :cond_4
 
-    invoke-static {v2, v10}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-static {v1, v9}, Lkotlin/sequences/i;->b(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
-    move-result-object v2
+    move-result-object v1
 
     :cond_4
-    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1;
+    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1;
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)V
 
-    check-cast v0, Ljava/util/Comparator;
+    check-cast v2, Ljava/util/Comparator;
 
-    invoke-static {v2, v0}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
 
-    move-result-object v0
+    move-result-object v1
 
     const/16 v2, 0x32
 
-    invoke-static {v0, v2}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
+    invoke-static {v1, v2}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
 
-    move-result-object v0
+    move-result-object v1
 
     const/4 v2, 0x1
 
     const/4 v3, 0x0
 
-    if-nez v15, :cond_5
+    if-nez v14, :cond_5
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getFilter()Ljava/lang/String;
 
@@ -1219,45 +1237,45 @@
 
     const/4 v4, 0x1
 
-    goto :goto_7
+    goto :goto_4
 
     :cond_5
     const/4 v4, 0x0
 
-    :goto_7
+    :goto_4
     if-eqz v4, :cond_8
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getChannels()Ljava/util/Map;
 
     move-result-object v4
 
-    invoke-interface {v11, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v10, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/discord/models/domain/ModelChannel;
+    check-cast v0, Lcom/discord/models/domain/ModelChannel;
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
     const-string v4, ""
 
-    invoke-virtual {v14, v1, v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->invoke(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    invoke-virtual {v13, v0, v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->invoke(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
     move-result-object v4
 
-    goto :goto_8
+    goto :goto_5
 
     :cond_6
     const/4 v4, 0x0
 
-    :goto_8
+    :goto_5
     if-nez v4, :cond_7
 
-    new-array v1, v2, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
+    new-array v0, v2, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
     new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
@@ -1275,24 +1293,24 @@
 
     invoke-direct/range {v4 .. v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;-><init>(IIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    aput-object v2, v1, v3
+    aput-object v2, v0, v3
 
-    invoke-static {v1}, Lkotlin/sequences/i;->m([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
-
-    move-result-object v1
-
-    invoke-static {v1, v0}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
+    invoke-static {v0}, Lkotlin/sequences/i;->m([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object v0
 
-    goto :goto_9
+    invoke-static {v0, v1}, Lkotlin/sequences/i;->a(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
+
+    move-result-object v0
+
+    goto :goto_6
 
     :cond_7
     const/4 v5, 0x2
 
     new-array v5, v5, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
+    new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
     const v7, 0x7f120bd2
 
@@ -1304,13 +1322,13 @@
 
     const/4 v11, 0x0
 
-    move-object v6, v13
+    move-object v6, v12
 
     invoke-direct/range {v6 .. v11}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;-><init>(IIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    check-cast v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    check-cast v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    aput-object v13, v5, v3
+    aput-object v12, v5, v3
 
     aput-object v4, v5, v2
 
@@ -1346,11 +1364,11 @@
 
     new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1;
 
-    invoke-direct {v3, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
+    invoke-direct {v3, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v0, v3}, Lkotlin/sequences/i;->c(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-static {v1, v3}, Lkotlin/sequences/i;->c(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object v0
 
@@ -1358,7 +1376,7 @@
 
     move-result-object v0
 
-    :goto_9
+    :goto_6
     new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 
     invoke-static {v0}, Lkotlin/sequences/i;->f(Lkotlin/sequences/Sequence;)Ljava/util/List;
@@ -1369,32 +1387,32 @@
 
     move-result-object v2
 
-    invoke-direct {v1, v12, v15, v0, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/util/List;)V
+    invoke-direct {v1, v15, v14, v0, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/util/List;)V
 
     return-object v1
 
     :cond_8
-    new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
+    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 
-    invoke-static {v0}, Lkotlin/sequences/i;->f(Lkotlin/sequences/Sequence;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/sequences/i;->f(Lkotlin/sequences/Sequence;)Ljava/util/List;
 
-    move-result-object v6
+    move-result-object v5
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    move-object v3, v1
+    move-object v2, v0
 
-    move-object v4, v12
+    move-object v3, v15
 
-    move v5, v15
+    move v4, v14
 
-    invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v1
+    return-object v0
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
index 230639286c..5bcec8d5bb 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
@@ -60,45 +61,45 @@
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 10
+    .locals 9
 
-    and-int/lit8 v1, p7, 0x10
+    and-int/lit8 v0, p7, 0x10
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
     goto :goto_0
 
     :cond_0
-    move v8, p5
+    move v7, p5
 
     :goto_0
     and-int/lit8 v0, p7, 0x20
 
     if-eqz v0, :cond_1
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     goto :goto_1
 
     :cond_1
-    move/from16 v9, p6
+    move v8, p6
 
     :goto_1
-    move-object v3, p0
+    move-object v2, p0
 
-    move-object v4, p1
+    move-object v3, p1
 
-    move-object v5, p2
+    move-object v4, p2
 
-    move-object v6, p3
+    move-object v5, p3
 
-    move-object v7, p4
+    move-object v6, p4
 
-    invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZ)V
+    invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZ)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload.smali
index b4d62682dc..f44011d65d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
index ce32bb2fd1..88ff15a9c7 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
@@ -64,9 +65,14 @@
 
     const/4 p3, 0x0
 
+    move-object v3, p3
+
+    goto :goto_0
+
     :cond_0
     move-object v3, p3
 
+    :goto_0
     and-int/lit8 p3, p6, 0x8
 
     const/4 p7, 0x0
@@ -75,24 +81,24 @@
 
     const/4 v4, 0x0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     move v4, p4
 
-    :goto_0
+    :goto_1
     and-int/lit8 p3, p6, 0x10
 
     if-eqz p3, :cond_2
 
     const/4 v5, 0x0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     move v5, p5
 
-    :goto_1
+    :goto_2
     move-object v0, p0
 
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali
index 1fbcee17fa..9fe05009bc 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
index 064447624b..bfab87d6e8 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
index 941aa740b2..e96a6ca141 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
index c706ff330c..145eddd184 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 
 # annotations
@@ -317,103 +318,103 @@
 
     move-object v0, p0
 
-    and-int/lit8 v2, p11, 0x1
+    and-int/lit8 v1, p11, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-object v2, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->filter:Ljava/lang/String;
+    iget-object v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->filter:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_0
-    move-object v2, p1
+    move-object v1, p1
 
     :goto_0
-    and-int/lit8 v3, p11, 0x2
+    and-int/lit8 v2, p11, 0x2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    iget-object v3, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->recentGuildIds:Ljava/util/List;
+    iget-object v2, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->recentGuildIds:Ljava/util/List;
 
     goto :goto_1
 
     :cond_1
-    move-object v3, p2
+    move-object v2, p2
 
     :goto_1
-    and-int/lit8 v4, p11, 0x4
+    and-int/lit8 v3, p11, 0x4
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
-    iget-wide v4, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->selectedChannelId:J
+    iget-wide v3, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->selectedChannelId:J
 
     goto :goto_2
 
     :cond_2
-    move-wide v4, p3
+    move-wide v3, p3
 
     :goto_2
-    and-int/lit8 v6, p11, 0x8
+    and-int/lit8 v5, p11, 0x8
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    iget-wide v6, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->prevSelectedChannelId:J
+    iget-wide v5, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->prevSelectedChannelId:J
 
     goto :goto_3
 
     :cond_3
-    move-wide/from16 v6, p5
+    move-wide/from16 v5, p5
 
     :goto_3
-    and-int/lit8 v8, p11, 0x10
+    and-int/lit8 v7, p11, 0x10
 
-    if-eqz v8, :cond_4
+    if-eqz v7, :cond_4
 
-    iget-wide v8, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->selectedVoiceChannelId:J
+    iget-wide v7, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->selectedVoiceChannelId:J
 
     goto :goto_4
 
     :cond_4
-    move-wide/from16 v8, p7
+    move-wide/from16 v7, p7
 
     :goto_4
-    and-int/lit8 v10, p11, 0x20
+    and-int/lit8 v9, p11, 0x20
 
-    if-eqz v10, :cond_5
+    if-eqz v9, :cond_5
 
-    iget-object v10, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->mostRecent:Ljava/util/Map;
+    iget-object v9, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->mostRecent:Ljava/util/Map;
 
     goto :goto_5
 
     :cond_5
-    move-object/from16 v10, p9
+    move-object/from16 v9, p9
 
     :goto_5
-    and-int/lit8 v1, p11, 0x40
+    and-int/lit8 v10, p11, 0x40
 
-    if-eqz v1, :cond_6
+    if-eqz v10, :cond_6
 
-    iget-object v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->mentionCounts:Ljava/util/Map;
+    iget-object v10, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->mentionCounts:Ljava/util/Map;
 
     goto :goto_6
 
     :cond_6
-    move-object/from16 v1, p10
+    move-object/from16 v10, p10
 
     :goto_6
-    move-object p1, v2
+    move-object p1, v1
 
-    move-object p2, v3
+    move-object p2, v2
 
-    move-wide p3, v4
+    move-wide p3, v3
 
-    move-wide/from16 p5, v6
+    move-wide/from16 p5, v5
 
-    move-wide/from16 p7, v8
+    move-wide/from16 p7, v7
 
-    move-object/from16 p9, v10
+    move-object/from16 p9, v9
 
-    move-object/from16 p10, v1
+    move-object/from16 p10, v10
 
     invoke-virtual/range {p0 .. p10}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->copy(Ljava/lang/String;Ljava/util/List;JJJLjava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali
index e7104689ed..39335e00ae 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func4$0.smali
index 79eaafe314..b0db272a6d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func4$0.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func4$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func4$0;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func6$0.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func6$0.smali
index abab536bab..a194388e0f 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func6$0.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func6$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func6$0;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func6;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func7$0.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func7$0.smali
index 980dccfd17..f6c414746a 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func7$0.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func7$0.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$sam$rx_functions_Func7$0;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func7;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
index 6ac8925a9b..84b3845ae2 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy$SearchType.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy$SearchType.smali
index daf4b70fc8..f8ac98a3bf 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy$SearchType.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy$SearchType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy$SearchType;
 .super Ljava/lang/Enum;
+.source "WidgetGlobalSearchScoreStrategy.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali
index a825d2926a..9ae7adaa0b 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy;
 .super Ljava/lang/Object;
+.source "WidgetGlobalSearchScoreStrategy.kt"
 
 
 # annotations
@@ -100,10 +101,9 @@
 
     move-result p2
 
-    :goto_1
     add-int/2addr p3, p2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     instance-of p2, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
@@ -118,10 +118,10 @@
 
     move-result p2
 
-    goto :goto_1
+    add-int/2addr p3, p2
 
     :cond_2
-    :goto_2
+    :goto_1
     invoke-interface {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getMentions()I
 
     move-result p2
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
index 48e2ae6265..16a47d5142 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 
 # annotations
@@ -39,9 +40,14 @@
 
     const/4 p6, 0x0
 
+    move-object v6, p6
+
+    goto :goto_0
+
     :cond_0
     move-object v6, p6
 
+    :goto_0
     move-object v0, p0
 
     move-wide v1, p1
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
index 7837016e67..74fe1aa4cf 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
index 7608f317d9..dfe85d195c 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali
index b10bb973e3..9dd2a56c69 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali
index 4b9239afb1..208a88a98b 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali
index de702d11c2..2f2c9f83f0 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali
index 20bc579238..62c3f69994 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali
index 0222d7b432..ea49234d21 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6$1.smali
index 1d3d0de715..55447c3c51 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali
index 22f4e526cb..f4fb2b3bad 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7$1.smali
index 513723c526..00ccabbca7 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali
index b64c9bd828..f3139d6a49 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali
index 4c82138610..a987876dd5 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali
index 054dda94f9..1da26047ff 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali
index fa4fb2a477..1479332464 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
index 7aa04f30d0..9e81c4a451 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
index 49dbba4ed1..6f1baba576 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
index 4f25c1f134..9b337f4afd 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .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;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
index a2df0442ec..946d8c93c7 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
@@ -1,5 +1,6 @@
 .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;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
index fec79d245e..c5e095e6c8 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali
index 977ea5478c..724414fa0e 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onResume$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onResume$1.smali
index 3d88d62a0f..373ab3c325 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onResume$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onResume$1;
 .super Lcom/discord/views/c;
+.source "WidgetUserSheet.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
index 058dbb23a0..f6866baabf 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 .super Lcom/discord/app/AppBottomSheet;
+.source "WidgetUserSheet.kt"
 
 
 # annotations
@@ -1127,12 +1128,11 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
 
-    :goto_2
     check-cast v1, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
@@ -1155,12 +1155,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/4 v1, 0x0
 
-    :goto_3
+    :goto_2
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
@@ -1179,9 +1179,11 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
 
-    goto :goto_2
+    check-cast v1, Landroid/view/View$OnClickListener;
 
-    :goto_4
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    :goto_3
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
 
     move-result-object v0
@@ -1202,12 +1204,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     const/4 v1, 0x0
 
-    :goto_5
+    :goto_4
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
@@ -1248,12 +1250,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_6
     const/4 v1, 0x0
 
-    :goto_6
+    :goto_5
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
@@ -1282,14 +1284,14 @@
 
     const v5, 0x7f08026c
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_7
     const v0, 0x7f08026e
 
     const v5, 0x7f08026e
 
-    :goto_7
+    :goto_6
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -1314,12 +1316,12 @@
 
     const v1, 0x7f120d0c
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_8
     const v1, 0x7f120cff
 
-    :goto_8
+    :goto_7
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
@@ -1348,12 +1350,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_9
     const/4 v1, 0x0
 
-    :goto_9
+    :goto_8
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
@@ -1382,14 +1384,14 @@
 
     const v5, 0x7f080234
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_a
     const v0, 0x7f080237
 
     const v5, 0x7f080237
 
-    :goto_a
+    :goto_9
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -1414,12 +1416,12 @@
 
     const v1, 0x7f120d0b
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_b
     const v1, 0x7f120cfc
 
-    :goto_b
+    :goto_a
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
@@ -1446,12 +1448,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_c
     const/4 v1, 0x0
 
-    :goto_c
+    :goto_b
     invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
@@ -1524,7 +1526,7 @@
 
     const/4 v1, 0x0
 
-    :goto_d
+    :goto_c
     if-ge v1, p1, :cond_f
 
     aget-object v4, v0, v1
@@ -1537,25 +1539,25 @@
 
     const/4 v4, 0x1
 
-    goto :goto_e
+    goto :goto_d
 
     :cond_d
     const/4 v4, 0x0
 
-    :goto_e
+    :goto_d
     if-eqz v4, :cond_e
 
     const/4 v2, 0x1
 
-    goto :goto_f
+    goto :goto_e
 
     :cond_e
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_f
-    :goto_f
+    :goto_e
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAdministrativeHeader()Landroid/view/View;
 
     move-result-object p1
@@ -1669,12 +1671,14 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/roles/RolesAdapter;->setData(Ljava/util/List;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-    .locals 19
+    .locals 24
 
     move-object/from16 v6, p0
 
@@ -1705,33 +1709,43 @@
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x1
-
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->isRichPresence()Z
-
-    move-result v0
-
-    if-ne v0, v8, :cond_1
-
-    const/4 v0, 0x1
+    move-object v14, v0
 
     goto :goto_0
 
     :cond_1
-    const/4 v0, 0x0
+    move-object v14, v7
 
     :goto_0
+    const/4 v15, 0x0
+
+    const/4 v5, 0x1
+
+    if-eqz v14, :cond_2
+
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelPresence$Activity;->isRichPresence()Z
+
+    move-result v0
+
+    if-ne v0, v5, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v9
+    move-result-object v4
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUserNickname()Ljava/lang/String;
 
@@ -1739,7 +1753,7 @@
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
 
-    move-result v10
+    move-result v16
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getNowPlaying()Landroid/widget/TextView;
 
@@ -1747,7 +1761,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    if-nez v0, :cond_4
+    if-nez v0, :cond_5
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getNowPlaying()Landroid/widget/TextView;
 
@@ -1757,57 +1771,57 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_4
 
     invoke-static {v3}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v3, 0x0
+    if-eqz v3, :cond_3
 
     goto :goto_2
 
     :cond_3
-    :goto_1
-    const/4 v3, 0x1
-
-    :goto_2
-    if-nez v3, :cond_4
-
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     goto :goto_3
 
     :cond_4
-    const/4 v3, 0x0
+    :goto_2
+    const/4 v3, 0x1
 
     :goto_3
+    if-nez v3, :cond_5
+
+    const/4 v3, 0x1
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v3, 0x0
+
+    :goto_4
     invoke-static {v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActivityDivider()Landroid/view/View;
 
     move-result-object v2
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
-    if-nez v10, :cond_5
+    if-nez v16, :cond_6
 
     const/4 v0, 0x1
 
-    goto :goto_4
+    goto :goto_5
 
-    :cond_5
+    :cond_6
     const/4 v0, 0x0
 
-    :goto_4
+    :goto_5
     invoke-static {v2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
-    if-nez v10, :cond_6
+    if-nez v16, :cond_7
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActionsDivider()Landroid/view/View;
 
@@ -1815,46 +1829,26 @@
 
     invoke-virtual {v6, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->setPeekHeightBottomView(Landroid/view/View;)V
 
-    :cond_6
-    sget-object v11, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+    :cond_7
+    sget-object v8, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getRichPresenceContainer()Landroid/widget/FrameLayout;
 
     move-result-object v0
 
-    move-object v12, v0
+    move-object v9, v0
 
-    check-cast v12, Landroid/view/ViewGroup;
+    check-cast v9, Landroid/view/ViewGroup;
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-object v0
+    move-result-wide v11
 
-    const/4 v5, 0x0
+    iget-object v13, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
 
-    if-eqz v0, :cond_7
+    move-object v10, v14
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v0
-
-    move-object v13, v0
-
-    goto :goto_5
-
-    :cond_7
-    move-object v13, v5
-
-    :goto_5
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v14
-
-    iget-object v0, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    move-object/from16 v16, v0
-
-    invoke-virtual/range {v11 .. v16}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;JLcom/discord/widgets/user/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    invoke-virtual/range {v8 .. v13}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;JLcom/discord/widgets/user/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
 
     move-result-object v0
 
@@ -1862,64 +1856,32 @@
 
     iget-object v0, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_8
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_8
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v2
-
-    goto :goto_6
-
-    :cond_8
-    move-object v2, v5
-
-    :goto_6
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
 
-    move-result v3
+    move-result v2
 
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUi(Lcom/discord/models/domain/ModelPresence$Activity;Z)V
+    invoke-virtual {v0, v14, v2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUi(Lcom/discord/models/domain/ModelPresence$Activity;Z)V
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    move-object v2, v6
 
-    move-result-object v2
+    check-cast v2, Lcom/discord/app/AppComponent;
 
-    if-eqz v2, :cond_9
+    invoke-virtual {v0, v14, v2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v2
-
-    goto :goto_7
-
-    :cond_9
-    move-object v2, v5
-
-    :goto_7
-    move-object v3, v6
-
-    check-cast v3, Lcom/discord/app/AppComponent;
-
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
-
-    :cond_a
+    :cond_8
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1931,7 +1893,7 @@
 
     const/4 v2, 0x2
 
-    if-eqz v1, :cond_b
+    if-eqz v1, :cond_9
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPrimaryName()Landroid/widget/TextView;
 
@@ -1947,11 +1909,11 @@
 
     check-cast v0, Ljava/lang/CharSequence;
 
-    invoke-static {v1, v0, v7, v2, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
+    invoke-static {v1, v0, v15, v2, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
 
-    goto :goto_8
+    goto :goto_6
 
-    :cond_b
+    :cond_9
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPrimaryName()Landroid/widget/TextView;
 
     move-result-object v1
@@ -1964,32 +1926,32 @@
 
     move-result-object v0
 
-    invoke-static {v0, v5, v7, v2, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
+    invoke-static {v0, v7, v15, v2, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy$default(Landroid/widget/TextView;Ljava/lang/CharSequence;IILjava/lang/Object;)V
 
-    :goto_8
+    :goto_6
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAvatar()Landroid/widget/ImageView;
 
-    move-result-object v11
+    move-result-object v17
 
-    invoke-static {v9, v8}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Lcom/discord/models/domain/ModelUser;Z)Ljava/lang/String;
+    invoke-static {v4, v5}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Lcom/discord/models/domain/ModelUser;Z)Ljava/lang/String;
 
-    move-result-object v12
+    move-result-object v18
 
-    const/4 v13, 0x0
+    const/16 v19, 0x0
 
-    const/4 v14, 0x0
+    const/16 v20, 0x0
 
     iget-object v0, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
 
-    move-object v15, v0
+    move-object/from16 v21, v0
 
-    check-cast v15, Lcom/discord/utilities/images/MGImages$ChangeDetector;
+    check-cast v21, Lcom/discord/utilities/images/MGImages$ChangeDetector;
 
-    const/16 v16, 0xc
+    const/16 v22, 0xc
 
-    const/16 v17, 0x0
+    const/16 v23, 0x0
 
-    invoke-static/range {v11 .. v17}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static/range {v17 .. v23}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getRoleItems()Ljava/util/List;
 
@@ -1999,108 +1961,121 @@
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getViewProfileButton()Landroid/widget/TextView;
 
-    move-result-object v11
+    move-result-object v8
 
-    const v12, 0x7f04014d
+    const v9, 0x7f040194
 
-    const v13, 0x7f040194
+    const v10, 0x7f04014d
 
-    if-eqz v10, :cond_c
+    if-eqz v16, :cond_a
 
     const v0, 0x7f120d16
 
-    invoke-virtual {v11, v0}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
 
-    new-instance v14, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
+    new-instance v11, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
 
-    move-object v0, v14
+    move-object v0, v11
 
-    move-object v1, v11
+    move-object v1, v8
 
     move-object/from16 v2, p0
 
-    move v3, v10
+    move/from16 v3, v16
 
-    move-object v4, v9
+    move-object v12, v4
 
-    move-object/from16 v18, v5
+    const/4 v13, 0x1
 
     move-object/from16 v5, p1
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
 
-    check-cast v14, Landroid/view/View$OnClickListener;
+    check-cast v11, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v11, v14}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v8, v11}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    move-object v0, v11
+    move-object v0, v8
 
     check-cast v0, Landroid/view/View;
 
-    invoke-static {v0, v13, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {v0, v9, v10}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v12
+    move-result v18
 
-    :goto_9
-    const/4 v13, 0x0
+    const/16 v19, 0x0
 
-    const/4 v14, 0x0
+    const/16 v20, 0x0
 
-    const/4 v15, 0x0
+    const/16 v21, 0x0
 
-    const/16 v16, 0xe
+    const/16 v22, 0xe
 
-    const/16 v17, 0x0
+    const/16 v23, 0x0
 
-    invoke-static/range {v11 .. v17}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    move-object/from16 v17, v8
 
-    goto :goto_a
+    invoke-static/range {v17 .. v23}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    :cond_c
-    move-object/from16 v18, v5
+    goto :goto_7
+
+    :cond_a
+    move-object v12, v4
+
+    const/4 v13, 0x1
 
     const v0, 0x7f120bc1
 
-    invoke-virtual {v11, v0}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
 
-    new-instance v14, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
+    new-instance v11, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
 
-    move-object v0, v14
+    move-object v0, v11
 
-    move-object v1, v11
+    move-object v1, v8
 
     move-object/from16 v2, p0
 
-    move v3, v10
-
-    move-object v4, v9
+    move/from16 v3, v16
 
     move-object/from16 v5, p1
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
 
-    check-cast v14, Landroid/view/View$OnClickListener;
+    check-cast v11, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v11, v14}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v8, v11}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    move-object v0, v11
+    move-object v0, v8
 
     check-cast v0, Landroid/view/View;
 
-    invoke-static {v0, v12, v13}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {v0, v10, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v12
+    move-result v18
 
-    goto :goto_9
+    const/16 v19, 0x0
 
-    :goto_a
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    const/16 v22, 0xe
+
+    const/16 v23, 0x0
+
+    move-object/from16 v17, v8
+
+    invoke-static/range {v17 .. v23}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    :goto_7
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getHeader()Landroid/view/View;
 
     move-result-object v0
 
     new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;
 
-    invoke-direct {v1, v6, v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {v1, v6, v12}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
@@ -2108,9 +2083,9 @@
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getSendMessageButton()Landroid/view/View;
 
-    move-result-object v11
+    move-result-object v8
 
-    if-nez v10, :cond_d
+    if-nez v16, :cond_b
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -2120,32 +2095,32 @@
 
     move-result v0
 
-    if-eq v0, v8, :cond_d
+    if-eq v0, v13, :cond_b
 
-    const/4 v7, 0x1
+    const/4 v15, 0x1
 
-    :cond_d
-    invoke-static {v11, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+    :cond_b
+    invoke-static {v8, v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
-    new-instance v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;
+    new-instance v9, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;
 
-    move-object v0, v7
+    move-object v0, v9
 
-    move-object v1, v11
+    move-object v1, v8
 
     move-object/from16 v2, p0
 
-    move v3, v10
+    move/from16 v3, v16
 
     move-object/from16 v4, p1
 
-    move-object v5, v9
+    move-object v5, v12
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;-><init>(Landroid/view/View;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/widgets/user/usersheet/WidgetUserSheetModel;Lcom/discord/models/domain/ModelUser;)V
 
-    check-cast v7, Landroid/view/View$OnClickListener;
+    check-cast v9, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v11, v7}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v8, v9}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
 
@@ -2155,51 +2130,26 @@
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    if-eqz v14, :cond_c
+
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
 
     move-result-object v1
 
-    if-eqz v1, :cond_e
+    goto :goto_8
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    :cond_c
+    move-object v1, v7
 
-    move-result-object v1
+    :goto_8
+    if-eqz v14, :cond_d
 
-    if-eqz v1, :cond_e
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelPresence$Activity;->getGamePlatform()Ljava/lang/String;
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+    move-result-object v7
 
-    move-result-object v5
-
-    goto :goto_b
-
-    :cond_e
-    move-object/from16 v5, v18
-
-    :goto_b
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_f
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_f
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$Activity;->getGamePlatform()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_c
-
-    :cond_f
-    move-object/from16 v1, v18
-
-    :goto_c
-    invoke-virtual {v0, v5, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
+    :cond_d
+    invoke-virtual {v0, v1, v7}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -2918,8 +2868,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1.smali
index 7037f59417..ee42990f03 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheetModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func8;
@@ -118,9 +119,9 @@
 
     move-result-wide v4
 
-    const/4 v9, 0x0
+    const/4 v9, 0x1
 
-    const/4 v10, 0x1
+    const/4 v10, 0x0
 
     cmp-long v6, v2, v4
 
@@ -166,13 +167,13 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    if-eqz v2, :cond_3
+    if-eqz v2, :cond_4
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
     move-result-object v3
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_4
 
     check-cast v3, Ljava/lang/Iterable;
 
@@ -221,16 +222,24 @@
 
     move-result-object v3
 
-    if-nez v3, :cond_4
+    if-nez v3, :cond_3
+
+    goto :goto_2
 
     :cond_3
+    move-object/from16 v19, v3
+
+    goto :goto_3
+
+    :cond_4
+    :goto_2
     sget-object v3, Lkotlin/a/x;->bPB:Lkotlin/a/x;
 
     check-cast v3, Ljava/util/List;
 
-    :cond_4
     move-object/from16 v19, v3
 
+    :goto_3
     const/4 v3, 0x0
 
     if-eqz v2, :cond_5
@@ -241,38 +250,38 @@
 
     move-object/from16 v20, v4
 
-    goto :goto_2
+    goto :goto_4
 
     :cond_5
     move-object/from16 v20, v3
 
-    :goto_2
+    :goto_4
     if-eqz v2, :cond_7
 
     if-eqz v1, :cond_7
 
     if-nez p7, :cond_6
 
-    goto :goto_3
+    goto :goto_5
 
     :cond_6
     sget-object v3, Lcom/discord/utilities/permissions/ManageUserContext;->Companion:Lcom/discord/utilities/permissions/ManageUserContext$Companion;
 
-    iget-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$me:Lcom/discord/models/domain/ModelUser;
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$me:Lcom/discord/models/domain/ModelUser;
 
-    iget-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
+    iget-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
     move-result-object v1
 
-    const-string v7, "memberMe.roles"
+    const-string v6, "memberMe.roles"
 
-    invoke-static {v1, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v7, v1
+    move-object v6, v1
 
-    check-cast v7, Ljava/util/Collection;
+    check-cast v6, Ljava/util/Collection;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
@@ -282,9 +291,9 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v11, v1
+    move-object v7, v1
 
-    check-cast v11, Ljava/util/Collection;
+    check-cast v7, Ljava/util/Collection;
 
     const-string v1, "guildRoles"
 
@@ -294,13 +303,13 @@
 
     move-object/from16 v2, p7
 
-    move-object v3, v5
+    move-object v3, v4
 
-    move-object v4, v6
+    move-object v4, v5
 
-    move-object v5, v7
+    move-object v5, v6
 
-    move-object v6, v11
+    move-object v6, v7
 
     move-object/from16 v7, p8
 
@@ -312,13 +321,13 @@
 
     move-object/from16 v22, v1
 
-    goto :goto_4
+    goto :goto_6
 
     :cond_7
-    :goto_3
+    :goto_5
     move-object/from16 v22, v3
 
-    :goto_4
+    :goto_6
     iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
 
     iget-wide v1, v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;->$userId:J
@@ -355,12 +364,12 @@
 
     const/4 v14, 0x1
 
-    goto :goto_5
+    goto :goto_7
 
     :cond_8
     const/4 v14, 0x0
 
-    :goto_5
+    :goto_7
     new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
 
     iget-object v12, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1.smali
index d4f9e29aec..dd68b808fd 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetUserSheetModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function3;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2.smali
index fc58d5fdd8..457b2734e1 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetUserSheetModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1.smali
index 7c9629f0f9..52e4bbe03e 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetUserSheetModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3.smali
index 6fedf51c3d..5c9de30008 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;
 .super Ljava/lang/Object;
+.source "WidgetUserSheetModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion.smali
index 66bc25f6bf..c203e3b565 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;
 .super Ljava/lang/Object;
+.source "WidgetUserSheetModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel.smali
index bf5925daed..8ab11a7298 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
 .super Ljava/lang/Object;
+.source "WidgetUserSheetModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali
index 882a9db98e..ff16f841ac 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem;
 .super Ljava/lang/Object;
+.source "PrivateCallUsersAdapter.kt"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali
index ffcff3f577..3dc40a1b86 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1;
 .super Ljava/lang/Object;
+.source "PrivateCallUsersAdapter.kt"
 
 # interfaces
 .implements Lrx/functions/Action3;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
index 68b1e011af..0a077f9013 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "PrivateCallUsersAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali
index cef8e34566..98c60248e2 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion;
 .super Ljava/lang/Object;
+.source "PrivateCallUsersAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali
index 663bb483d8..c9b4fae22a 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "PrivateCallUsersAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
index 154806f105..ba1402d6d8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetCallFailed$Companion;
 .super Ljava/lang/Object;
+.source "WidgetCallFailed.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
index 7d4e5c918f..1fb801d51a 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetCallFailed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali
index 7405a0b212..7fe50e187f 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1;
 .super Ljava/lang/Object;
+.source "WidgetCallFailed.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
index 3c4670f65e..1aa44826b1 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetCallFailed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
index 545e80a55f..ee1b04c0c6 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetCallFailed.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
index 550e33845b..6a85f57198 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetCallFailed;
 .super Lcom/discord/app/AppDialog;
+.source "WidgetCallFailed.kt"
 
 
 # annotations
@@ -405,8 +406,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
index 139dcfa954..d9987c2c4d 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
index 01220f7071..8617e11e87 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
index 9838e51155..dd2af686b8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali
index 0afd15c4d5..9e0d325b3f 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali
index 46394b3bfc..23dc0eb07b 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali
index 51a09102b6..77a0f62f2d 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
index 081e5e4643..accb44a43b 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -98,6 +99,8 @@
 
     invoke-virtual {v1, v2, v3, v0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->launch(JLandroid/content/Context;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
index 93e99d41af..4c621f4d15 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
index f82cc367a9..5e249a6db0 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
index ecfc9f5248..9652b2e0c1 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
index 49fd397ac7..fd6e19f8ae 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -112,7 +113,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KI()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KH()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
index 80c48ab6f1..befb599338 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali
index 29d805062f..6367cc2943 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali
index 2be46d1423..4448dc97f8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali
index c466b7575b..cda7fcbe3d 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -98,9 +99,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_2
 
@@ -119,11 +120,11 @@
     goto :goto_0
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     :goto_0
-    return v2
+    return v1
 
     :cond_2
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->isMe()Z
@@ -132,8 +133,8 @@
 
     if-nez p1, :cond_3
 
-    return v2
+    return v1
 
     :cond_3
-    return v1
+    return v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
index 1964460ba6..b108c835ef 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
index 0577f8d5d4..cb70c1bea8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Func6;
@@ -67,7 +68,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/widgets/voice/model/CallModel;Ljava/util/Set;Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;Ljava/lang/Boolean;Ljava/lang/Long;Lco/discord/media_engine/VideoInputDeviceDescription;)Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;
-    .locals 20
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -229,6 +230,8 @@
 
     const/4 v1, 0x1
 
+    const/4 v4, 0x0
+
     if-eqz v0, :cond_3
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/model/CallModel;->isConnected()Z
@@ -269,36 +272,34 @@
 
     move-result v6
 
-    move v10, v6
-
     goto :goto_3
 
     :cond_4
-    const/4 v10, 0x0
+    const/4 v6, 0x0
 
     :goto_3
     if-eqz p6, :cond_5
 
     invoke-virtual/range {p6 .. p6}, Lco/discord/media_engine/VideoInputDeviceDescription;->getFacing()Lco/discord/media_engine/VideoInputDeviceFacing;
 
-    move-result-object v6
+    move-result-object v10
 
     goto :goto_4
 
     :cond_5
-    move-object v6, v8
+    move-object v10, v8
 
     :goto_4
     sget-object v11, Lco/discord/media_engine/VideoInputDeviceFacing;->Front:Lco/discord/media_engine/VideoInputDeviceFacing;
 
-    if-ne v6, v11, :cond_6
+    if-ne v10, v11, :cond_6
 
-    const/4 v6, 0x1
+    const/4 v10, 0x1
 
     goto :goto_5
 
     :cond_6
-    const/4 v6, 0x0
+    const/4 v10, 0x0
 
     :goto_5
     if-eqz v0, :cond_f
@@ -339,19 +340,19 @@
 
     check-cast v14, Lcom/discord/models/domain/ModelVoice$User;
 
-    if-eqz v10, :cond_a
+    if-eqz v6, :cond_a
 
     invoke-virtual {v14}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v14
 
-    const-string v4, "it.user"
+    const-string v15, "it.user"
 
-    invoke-static {v14, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v15}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v14}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v16
+    move-result-wide v14
 
     if-nez v7, :cond_8
 
@@ -360,29 +361,29 @@
     :cond_8
     invoke-virtual/range {p5 .. p5}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v18
+    move-result-wide v16
 
-    cmp-long v4, v16, v18
+    cmp-long v18, v14, v16
 
-    if-nez v4, :cond_9
+    if-nez v18, :cond_9
 
-    const/4 v4, 0x1
+    const/4 v14, 0x1
 
     goto :goto_8
 
     :cond_9
     :goto_7
-    const/4 v4, 0x0
+    const/4 v14, 0x0
 
     goto :goto_8
 
     :cond_a
     invoke-virtual {v9, v14}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1;->invoke(Lcom/discord/models/domain/ModelVoice$User;)Z
 
-    move-result v4
+    move-result v14
 
     :goto_8
-    if-eqz v4, :cond_7
+    if-eqz v14, :cond_7
 
     invoke-interface {v12, v13}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
@@ -393,89 +394,87 @@
 
     check-cast v12, Ljava/lang/Iterable;
 
-    new-instance v4, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1;
+    new-instance v9, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1;
 
-    invoke-direct {v4}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1;-><init>()V
+    invoke-direct {v9}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1;-><init>()V
 
-    check-cast v4, Ljava/util/Comparator;
+    check-cast v9, Ljava/util/Comparator;
 
-    invoke-static {v12, v4}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v12, v9}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
-    move-result-object v4
+    move-result-object v9
 
-    invoke-interface {v4}, Ljava/util/List;->size()I
+    invoke-interface {v9}, Ljava/util/List;->size()I
 
-    move-result v9
+    move-result v11
 
-    if-ne v9, v1, :cond_c
+    if-ne v11, v1, :cond_c
 
-    sget-object v9, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_FIT:Lorg/webrtc/RendererCommon$ScalingType;
+    sget-object v11, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_FIT:Lorg/webrtc/RendererCommon$ScalingType;
 
     goto :goto_9
 
     :cond_c
-    sget-object v9, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+    sget-object v11, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
 
     :goto_9
-    check-cast v4, Ljava/lang/Iterable;
+    check-cast v9, Ljava/lang/Iterable;
 
-    new-instance v11, Ljava/util/ArrayList;
+    new-instance v12, Ljava/util/ArrayList;
 
-    invoke-static {v4, v2}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I
+    invoke-static {v9, v2}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I
 
     move-result v2
 
-    invoke-direct {v11, v2}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v12, v2}, Ljava/util/ArrayList;-><init>(I)V
 
-    check-cast v11, Ljava/util/Collection;
+    check-cast v12, Ljava/util/Collection;
 
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v9}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v2
 
     :goto_a
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v9
 
-    if-eqz v4, :cond_e
+    if-eqz v9, :cond_e
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v9
 
-    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
+    check-cast v9, Lcom/discord/models/domain/ModelVoice$User;
 
-    new-instance v12, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
+    new-instance v13, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$User;->isMe()Z
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelVoice$User;->isMe()Z
 
-    move-result v13
+    move-result v14
 
-    if-eqz v13, :cond_d
+    if-eqz v14, :cond_d
 
-    if-eqz v6, :cond_d
+    if-eqz v10, :cond_d
 
-    const/4 v13, 0x1
+    const/4 v14, 0x1
 
     goto :goto_b
 
     :cond_d
-    const/4 v13, 0x0
+    const/4 v14, 0x0
 
     :goto_b
-    sget-object v14, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+    sget-object v15, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
 
-    invoke-direct {v12, v4, v13, v14, v9}, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;-><init>(Lcom/discord/models/domain/ModelVoice$User;ZLorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;)V
+    invoke-direct {v13, v9, v14, v15, v11}, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;-><init>(Lcom/discord/models/domain/ModelVoice$User;ZLorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;)V
 
-    invoke-interface {v11, v12}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v12, v13}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_a
 
     :cond_e
-    check-cast v11, Ljava/util/List;
-
-    move-object v4, v11
+    check-cast v12, Ljava/util/List;
 
     goto :goto_c
 
@@ -484,14 +483,14 @@
 
     check-cast v2, Ljava/util/List;
 
-    move-object v4, v2
+    move-object v12, v2
 
     :goto_c
     if-eqz v0, :cond_15
 
     if-nez v5, :cond_15
 
-    if-eqz v10, :cond_14
+    if-eqz v6, :cond_14
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/model/CallModel;->getParticipants()Ljava/util/Map;
 
@@ -518,21 +517,21 @@
 
     move-result-object v5
 
-    move-object v9, v5
+    move-object v6, v5
 
-    check-cast v9, Lcom/discord/models/domain/ModelVoice$User;
+    check-cast v6, Lcom/discord/models/domain/ModelVoice$User;
 
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v9
+    move-result-object v6
 
-    const-string v10, "it.user"
+    const-string v9, "it.user"
 
-    invoke-static {v9, v10}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v9
+    move-result-wide v13
 
     if-nez v7, :cond_11
 
@@ -541,22 +540,22 @@
     :cond_11
     invoke-virtual/range {p5 .. p5}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v11
+    move-result-wide v15
 
-    cmp-long v13, v9, v11
+    cmp-long v6, v13, v15
 
-    if-eqz v13, :cond_12
+    if-eqz v6, :cond_12
 
     :goto_d
-    const/4 v9, 0x1
+    const/4 v6, 0x1
 
     goto :goto_e
 
     :cond_12
-    const/4 v9, 0x0
+    const/4 v6, 0x0
 
     :goto_e
-    if-eqz v9, :cond_10
+    if-eqz v6, :cond_10
 
     goto :goto_f
 
@@ -577,9 +576,9 @@
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/model/CallModel;->getMyId()J
 
-    move-result-wide v9
+    move-result-wide v5
 
-    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v5
 
@@ -605,7 +604,7 @@
 
     if-eqz v5, :cond_16
 
-    if-eqz v6, :cond_16
+    if-eqz v10, :cond_16
 
     const/4 v5, 0x1
 
@@ -632,24 +631,25 @@
 
     sget-object v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;->PARTICIPANT_LIST:Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;
 
-    :goto_12
     move-object v6, v0
 
-    goto :goto_13
+    goto :goto_12
 
     :cond_18
     if-eqz v0, :cond_19
 
     sget-object v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;->VIDEO_GRID:Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;
 
+    move-object v6, v0
+
     goto :goto_12
 
     :cond_19
     sget-object v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;->VOICE_CALL_STATUS:Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;
 
-    goto :goto_12
+    move-object v6, v0
 
-    :goto_13
+    :goto_12
     const-string v0, "userRecentlyInteracted"
 
     move-object/from16 v2, p4
@@ -666,21 +666,21 @@
 
     if-eq v6, v0, :cond_1a
 
-    goto :goto_14
+    goto :goto_13
 
     :cond_1a
-    const/4 v15, 0x0
+    const/4 v7, 0x0
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_1b
+    :goto_13
+    const/4 v7, 0x1
+
     :goto_14
-    const/4 v15, 0x1
+    new-instance v8, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;
 
-    :goto_15
-    new-instance v7, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;
-
-    move-object v0, v7
+    move-object v0, v8
 
     move-object/from16 v1, p1
 
@@ -688,11 +688,13 @@
 
     move-object v3, v6
 
-    move v6, v15
+    move-object v4, v12
+
+    move v6, v7
 
     invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;-><init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/util/List;Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;Ljava/util/List;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;Z)V
 
-    return-object v7
+    return-object v8
 
     :cond_1c
     return-object v8
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
index d4d529228b..4688b49ca2 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 
 # annotations
@@ -87,7 +88,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali
index e0b40ef3aa..606a95c64e 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali
index 682388daad..2fa11fb604 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;
 .super Ljava/lang/Enum;
+.source "WidgetPrivateCall.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
index b39bf7f3f3..460094b835 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
@@ -161,9 +162,13 @@
 
     invoke-static {v0, v1, p2}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->create(JLandroid/content/Context;)V
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x7f0a0399
         :pswitch_4
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali
index fbbf51145b..008cf7ab77 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
index 26cb696e56..7f2540451b 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
index 52a16747ed..2773eeb8ed 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
index 8d10b6769b..df1c9e8d5c 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -104,7 +105,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->KC()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
index 048914f51c..9d245c30c5 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali
index 8c8d69c749..9f6452e103 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali
index 7d6a3162bf..f6275d2027 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
index 36e20d6423..6b4a50f1ba 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali
index 276dcd19b0..01c4839854 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali
index df62684548..4e0066c8b2 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali
index 66718863dd..9e514af5b8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali
index 5373527108..8ce07573db 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali
index f79117ac1d..7bf65f23b6 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
index ff2f0e6762..f9daef9935 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
index 14fdaac8b2..5964f25b23 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali
index 77e7f10e28..8760b72f2f 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Landroid/view/View$OnApplyWindowInsetsListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
index 3be8c98872..40af3b0d24 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
index 4ed53d8981..0af387b4f7 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali
index 815686838b..9d87affd0c 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Landroid/view/View$OnApplyWindowInsetsListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
index 813d92745e..7a10c9ace5 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali
index a02fbe560f..545c43c9ea 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
index 369dfb8f6b..a8f518712e 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
index f3180065ca..1a034641e7 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali
index 5bb85a41c4..397714d10a 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
index 2a1bbdad38..1e58de9491 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5;
 .super Lkotlin/jvm/internal/i;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
index 31ce245464..63e3365821 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
index fd4a3e733b..de244c01f0 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
index df4b0a714f..f0bcffd152 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetPrivateCall.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
index 4685569c2f..6b2e5cf519 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetPrivateCall;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetPrivateCall.kt"
 
 
 # annotations
@@ -676,6 +677,14 @@
 
     const v4, 0x7f04014e
 
+    invoke-static {v0, v4, v2, v1, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
     goto :goto_0
 
     :pswitch_1
@@ -687,7 +696,6 @@
 
     const v4, 0x7f04014f
 
-    :goto_0
     invoke-static {v0, v4, v2, v1, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result v0
@@ -697,6 +705,7 @@
     move-result-object v3
 
     :cond_0
+    :goto_0
     const/4 v0, 0x1
 
     invoke-virtual {p0, v0, v3}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
@@ -801,9 +810,13 @@
 
     invoke-virtual {p0, v0, v1, v2}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
 
+    return-void
+
     :cond_2
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -1071,6 +1084,8 @@
     :goto_0
     invoke-virtual {v0, p1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -1102,6 +1117,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
+    return-void
+
     :cond_1
     return-void
 
@@ -1572,9 +1589,9 @@
 
     sget-object v1, Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;->VOICE_CALL_STATUS:Lcom/discord/widgets/voice/call/WidgetPrivateCall$UiState;
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-ne p1, v1, :cond_0
 
@@ -1618,9 +1635,12 @@
 
     if-ne p1, v1, :cond_2
 
-    const/4 v2, 0x1
+    goto :goto_2
 
     :cond_2
+    const/4 v2, 0x0
+
+    :goto_2
     invoke-static {v0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
 
     return-void
@@ -1738,8 +1758,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1842,34 +1860,34 @@
 
     const/4 v4, 0x2
 
-    invoke-static {v0, v3, v2, v4, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v0, v3, v1, v4, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result v0
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v2
 
     :cond_0
     const/4 v0, 0x1
 
-    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+    invoke-virtual {p0, v0, v2}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
 
     new-instance v0, Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->getCallUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v0, v2}, Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    new-instance v1, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1;
+    new-instance v2, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/voice/call/WidgetPrivateCall;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/voice/call/WidgetPrivateCall;)V
 
-    check-cast v1, Lkotlin/jvm/functions/Function1;
+    check-cast v2, Lkotlin/jvm/functions/Function1;
 
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter;->setOnUserTappedListener(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v2}, Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter;->setOnUserTappedListener(Lkotlin/jvm/functions/Function1;)V
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->callUsersAdapter:Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter;
 
@@ -1877,7 +1895,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->getCallUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali
index bfa453b375..c8f10d02e9 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCallControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -52,6 +53,8 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali
index f2cf100cba..8c2e37cec3 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCallControlsView.kt"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali
index f9b5e5fc85..7c10c05ee0 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCallControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -56,6 +57,8 @@
 
     invoke-interface {p1, v0}, Lcom/discord/app/AppPermissions$Requests;->requestVideoCallPermissions(Lrx/functions/Action0;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali
index f6f86e9a2a..879bd6e53d 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2;
 .super Ljava/lang/Object;
+.source "WidgetPrivateCallControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
index d5bc2b79af..20c4f253a2 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;
 .super Landroid/widget/FrameLayout;
+.source "WidgetPrivateCallControlsView.kt"
 
 
 # static fields
@@ -292,8 +293,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$$special$$inlined$let$lambda$1.smali
index 4bad00b659..77a568c10c 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$$special$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$$special$$inlined$let$lambda$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -82,9 +83,9 @@
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_2
 
@@ -103,11 +104,11 @@
     goto :goto_0
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     :goto_0
-    return v2
+    return v1
 
     :cond_2
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->isMe()Z
@@ -116,8 +117,8 @@
 
     if-nez p1, :cond_3
 
-    return v2
+    return v1
 
     :cond_3
-    return v1
+    return v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
index 82813dd1c0..d62086a89d 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
index b0f4a8e3ff..7ca25e2e30 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
index fe031d8aaa..94d473781a 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
index 2b79a0b0e8..b9b2e8f252 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
index f13849e10d..800aa6ce41 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Lrx/functions/Func0;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali
index e217c6b943..be55f02f18 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali
index 872ec1af55..87edc2c942 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali
index 733c6becf9..594643de55 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
index 5fa6c3e47d..1333d997d4 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
index 080179266b..68259672a7 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetVoiceCallIncoming.kt"
 
 
 # annotations
@@ -338,6 +339,8 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
+    return-void
+
     :cond_1
     return-void
 
@@ -792,8 +795,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali
index 05276944af..3b2e710fe5 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallIncomingRinger.kt"
 
 
 # instance fields
@@ -86,6 +87,8 @@
 
     invoke-virtual {p1}, Landroid/media/MediaPlayer;->start()V
 
+    return-void
+
     :cond_1
     return-void
 .end method
@@ -105,6 +108,8 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger;->mediaPlayer:Landroid/media/MediaPlayer;
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$1.smali
index fdde0bf7cd..7a3a80df10 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallInline.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
index 6db9b1f4a2..2409d83afc 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetVoiceCallInline.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser_ViewBinding.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser_ViewBinding.smali
index 86b75e7907..ac0428733f 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallInline$Adapter$ItemUser_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
index 3f5cdd321d..f2fa55d4c8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetVoiceCallInline.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
index bbe696a45e..fe3b290aed 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallInline.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
index 6c08aff354..2624771529 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallInline.java"
 
 # interfaces
 .implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
index b5db9ee483..4e27e0f449 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallInline.java"
 
 
 # annotations
@@ -262,7 +263,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {v3}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v3
 
@@ -284,7 +285,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KD()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KC()Lrx/Observable;
 
     move-result-object v4
 
@@ -370,7 +371,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->KJ()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->KI()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
index 3856aacacd..6c2c70a4e7 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallInline.java"
 
 
 # annotations
@@ -136,8 +137,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->voiceConnected:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
-
     invoke-static {v0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->access$1300(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)Lcom/discord/models/domain/ModelChannel;
 
     move-result-object v0
@@ -148,8 +147,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->ongoingCall:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;
-
     iget-wide v0, v0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;->callChannelId:J
 
     iget-object v2, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->voiceConnected:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
@@ -184,11 +181,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->ongoingCall:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;
+    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->ongoingCall:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->voiceConnected:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
+    if-eqz v1, :cond_0
 
     invoke-static {v0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->access$1300(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)Lcom/discord/models/domain/ModelChannel;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
index 6f1efa5166..b92ec6b0bc 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetVoiceCallInline.java"
 
 
 # annotations
@@ -177,8 +178,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->container:Landroid/view/View;
-
     if-eqz p1, :cond_0
 
     invoke-static {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->access$100(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;)Z
@@ -232,8 +231,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->adapter:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter;
-
     invoke-static {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->access$600(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)Ljava/util/List;
 
     move-result-object v2
@@ -247,8 +244,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedPTT:Landroid/view/View;
-
     invoke-static {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->access$700(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     move-result-object v3
@@ -272,8 +267,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->connectionIndicator:Landroid/view/View;
-
     invoke-static {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->access$800(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)Lcom/discord/rtcconnection/RtcConnection$State;
 
     move-result-object v3
@@ -292,8 +285,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedDescription:Landroid/widget/TextView;
-
     invoke-static {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->access$900(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)Ljava/lang/String;
 
     move-result-object v1
@@ -305,8 +296,6 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedText:Landroid/widget/TextView;
-
     invoke-static {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->access$800(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)Lcom/discord/rtcconnection/RtcConnection$State;
 
     move-result-object v1
@@ -374,8 +363,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceInfoOverlay:Landroid/view/View;
-
     new-instance v1, Lcom/discord/widgets/voice/call/-$$Lambda$WidgetVoiceCallInline$j8gCcGiAttK8D-LQbKENVakEQ6w;
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/voice/call/-$$Lambda$WidgetVoiceCallInline$j8gCcGiAttK8D-LQbKENVakEQ6w;-><init>(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;)V
@@ -397,9 +384,9 @@
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State;->wK:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    const v1, 0x7f060126
+    const v1, 0x7f06011b
 
-    const v2, 0x7f06011b
+    const v2, 0x7f060126
 
     if-ne p0, v0, :cond_0
 
@@ -422,14 +409,14 @@
     return p0
 
     :pswitch_0
-    invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-static {p2, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result p0
 
     return p0
 
     :pswitch_1
-    invoke-static {p2, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result p0
 
@@ -455,14 +442,14 @@
     return p0
 
     :pswitch_2
-    invoke-static {p2, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result p0
 
     return p0
 
     :pswitch_3
-    invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-static {p2, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result p0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline_ViewBinding.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline_ViewBinding.smali
index d3eda24e11..2f95766f2b 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/call/WidgetVoiceCallInline_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetVoiceCallInline_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali
index 2de10dd355..47263b6580 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "CallParticipantsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali
index 5af5d0506d..841ee42a4d 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "CallParticipantsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali
index 0a91fbf9b9..020674dba5 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
 .super Lcom/discord/utilities/mg_recycler/SingleTypePayload;
+.source "CallParticipantsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
index c2f7d08c6c..7547bbd3b5 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "CallParticipantsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
index 3a620b88eb..0c99c1be03 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "CallParticipantsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader_ViewBinding.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader_ViewBinding.smali
index e77f6e8901..2a26c08c55 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader_ViewBinding;
 .super Ljava/lang/Object;
+.source "CallParticipantsAdapter$ViewHolderHeader_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
index 402f479bb8..a8b878d379 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
@@ -1,5 +1,6 @@
 .class Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "CallParticipantsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser_ViewBinding.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser_ViewBinding.smali
index 27c9c84c18..c3d4a68ddc 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser_ViewBinding;
 .super Ljava/lang/Object;
+.source "CallParticipantsAdapter$ViewHolderUser_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali
index 828b8a0499..90071675c3 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "CallParticipantsAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
index 8ccfd8a32d..d71832e9cb 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$1;
 .super Lkotlin/jvm/internal/k;
+.source "VoiceControlsView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali
index 6f9e02a60f..e7f81d0169 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali
index 1423ee23aa..1adc15d9e7 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$Model;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali
index 339d03a0df..1273ec07f7 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
index 9395b02656..552752f8b5 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
index fa77d40bc9..8ae3b6522c 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
index 0d7359aa92..d9ba3933b4 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali
index e52d870e28..f69e5d025d 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali
index 6073a9b7c3..0ffc490f67 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1;
 .super Ljava/lang/Object;
+.source "VoiceControlsView.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
index 540b411f7e..cf7326c5f0 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;
 .super Landroid/widget/FrameLayout;
+.source "VoiceControlsView.kt"
 
 
 # annotations
@@ -755,8 +756,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
@@ -1046,6 +1045,8 @@
 
     const v4, 0x7f120e7b
 
+    invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V
+
     goto :goto_5
 
     :cond_6
@@ -1070,7 +1071,7 @@
 
     invoke-virtual {v0, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->getConnectButton()Landroid/widget/Button;
@@ -1087,10 +1088,9 @@
 
     const v4, 0x7f120319
 
-    :goto_5
     invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V
 
-    :goto_6
+    :goto_5
     invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->getConnectButton()Landroid/widget/Button;
 
     move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
index 7395845aed..e3095515ea 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetGuildCall.java"
 
 
 # static fields
@@ -51,7 +52,6 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
 
     return-void
@@ -61,7 +61,9 @@
 
     const/4 v0, 0x1
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
+
+    return-void
 .end method
 
 .method private configureMenu(Lcom/discord/widgets/voice/model/CallModel;)V
@@ -239,9 +241,13 @@
 
     invoke-static {p0, p1, p2}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->launch(JLandroid/content/Context;)V
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x7f0a038f
         :pswitch_1
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall_ViewBinding.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall_ViewBinding.smali
index a4677d50ef..ac48b4783e 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall_ViewBinding.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall_ViewBinding.smali
@@ -1,5 +1,6 @@
 .class public Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall_ViewBinding;
 .super Ljava/lang/Object;
+.source "WidgetGuildCall_ViewBinding.java"
 
 # interfaces
 .implements Lbutterknife/Unbinder;
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
index 0590492338..3c021c1cc4 100644
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
 .super Lkotlin/jvm/internal/i;
+.source "CallModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function9;
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
index a69925a25f..486703391f 100644
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
 .super Ljava/lang/Object;
+.source "CallModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali
index 9dd1db51a8..22edfc35d8 100644
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/model/CallModel$Companion;
 .super Ljava/lang/Object;
+.source "CallModel.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali
index e233fbb6f1..d5505a68a1 100644
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali
+++ b/com.discord/smali/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali
@@ -1,5 +1,6 @@
 .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;
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel.smali
index 3305e2c874..27d804b005 100644
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel.smali
+++ b/com.discord/smali/com/discord/widgets/voice/model/CallModel.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/model/CallModel;
 .super Ljava/lang/Object;
+.source "CallModel.kt"
 
 # interfaces
 .implements Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$Model;
@@ -872,6 +873,8 @@
     :cond_2
     check-cast v1, Lcom/discord/models/domain/ModelVoice$User;
 
+    return-object v1
+
     :cond_3
     return-object v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
index 1f9e32be2d..d5334f5955 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
index c865650c4f..113e58d2b3 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Func3;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
index 43989852bc..1b1d49ecaa 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
index bbdf0c9760..04179d713d 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
index edcffa9f56..07cd8c9506 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
index 9c509ac978..7be6b078b5 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Lrx/functions/Action2;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
index dcd662198e..a188dc4f48 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2;
 .super Lcom/discord/views/c;
+.source "WidgetVoiceChannelSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
index 223e7b4054..fbe780710c 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3;
 .super Lcom/discord/views/c;
+.source "WidgetVoiceChannelSettings.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali
index fe374672cd..9ab041f0d3 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
index f02ebc9859..f4edde97d0 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali
index 7f36cb1f28..509e3a8fab 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
index 48225267b9..77b0d14287 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2;
 .super Ljava/lang/Object;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
index 43148825b6..88e86d2e5a 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
index 3786f371c1..c0e6ddacca 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1;
 .super Lkotlin/jvm/internal/k;
+.source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
index 03f824a7d4..5d823de1e4 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 .super Lcom/discord/app/AppFragment;
+.source "WidgetVoiceChannelSettings.kt"
 
 
 # annotations
@@ -824,6 +825,8 @@
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
+    return-void
+
     :cond_2
     return-void
 .end method
@@ -1284,8 +1287,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->_$_findViewCache:Ljava/util/HashMap;
-
     invoke-virtual {v0}, Ljava/util/HashMap;->clear()V
 
     :cond_0
diff --git a/com.discord/smali/com/discord/workers/MessageAckWorker$a.smali b/com.discord/smali/com/discord/workers/MessageAckWorker$a.smali
index e4799eb64e..86325b3cb3 100644
--- a/com.discord/smali/com/discord/workers/MessageAckWorker$a.smali
+++ b/com.discord/smali/com/discord/workers/MessageAckWorker$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/workers/MessageAckWorker$a;
 .super Ljava/lang/Object;
+.source "MessageAckWorker.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/workers/MessageAckWorker.smali b/com.discord/smali/com/discord/workers/MessageAckWorker.smali
index 81e50c2f0a..e3cb7ee904 100644
--- a/com.discord/smali/com/discord/workers/MessageAckWorker.smali
+++ b/com.discord/smali/com/discord/workers/MessageAckWorker.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/workers/MessageAckWorker;
 .super Landroidx/work/Worker;
+.source "MessageAckWorker.kt"
 
 
 # annotations
@@ -205,7 +206,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lrx/b/a;->LP()Ljava/lang/Object;
+    invoke-virtual {v5}, Lrx/b/a;->LO()Ljava/lang/Object;
 
     sget-object v6, Lcom/discord/app/AppLog;->tv:Lcom/discord/app/AppLog;
 
@@ -257,11 +258,11 @@
 
     invoke-virtual {v5, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->ackMessage(J)V
 
-    sget-object v5, Landroidx/work/ListenableWorker$Result;->SUCCESS:Landroidx/work/ListenableWorker$Result;
+    sget-object v0, Landroidx/work/ListenableWorker$Result;->SUCCESS:Landroidx/work/ListenableWorker$Result;
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception v5
@@ -308,16 +309,11 @@
 
     sget-object v0, Landroidx/work/ListenableWorker$Result;->RETRY:Landroidx/work/ListenableWorker$Result;
 
-    :goto_0
-    move-object v5, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     sget-object v0, Landroidx/work/ListenableWorker$Result;->FAILURE:Landroidx/work/ListenableWorker$Result;
 
-    goto :goto_0
-
-    :goto_1
-    return-object v5
+    :goto_0
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/workers/MessageSendWorker$a.smali b/com.discord/smali/com/discord/workers/MessageSendWorker$a.smali
index 39508ec2c5..95c94ff05d 100644
--- a/com.discord/smali/com/discord/workers/MessageSendWorker$a.smali
+++ b/com.discord/smali/com/discord/workers/MessageSendWorker$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/workers/MessageSendWorker$a;
 .super Ljava/lang/Object;
+.source "MessageSendWorker.kt"
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/workers/MessageSendWorker.smali b/com.discord/smali/com/discord/workers/MessageSendWorker.smali
index 40e7d9ff1c..4a3f886834 100644
--- a/com.discord/smali/com/discord/workers/MessageSendWorker.smali
+++ b/com.discord/smali/com/discord/workers/MessageSendWorker.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/discord/workers/MessageSendWorker;
 .super Landroidx/work/Worker;
+.source "MessageSendWorker.kt"
 
 
 # annotations
@@ -252,7 +253,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/b/a;->LP()Ljava/lang/Object;
+    invoke-virtual {v3}, Lrx/b/a;->LO()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -310,7 +311,7 @@
 
     invoke-virtual {v3, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->ackMessage(J)V
 
-    sget-object v3, Landroidx/work/ListenableWorker$Result;->SUCCESS:Landroidx/work/ListenableWorker$Result;
+    sget-object v2, Landroidx/work/ListenableWorker$Result;->SUCCESS:Landroidx/work/ListenableWorker$Result;
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -372,20 +373,20 @@
 
     invoke-virtual/range {v4 .. v9}, Lcom/discord/utilities/fcm/NotificationRenderer;->displaySent(Landroid/content/Context;JLjava/lang/CharSequence;Z)V
 
-    sget-object v3, Landroidx/work/ListenableWorker$Result;->FAILURE:Landroidx/work/ListenableWorker$Result;
+    sget-object v2, Landroidx/work/ListenableWorker$Result;->FAILURE:Landroidx/work/ListenableWorker$Result;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    sget-object v2, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+    sget-object v3, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
     invoke-virtual {p0}, Lcom/discord/workers/MessageSendWorker;->getApplicationContext()Landroid/content/Context;
 
     move-result-object v4
 
-    invoke-virtual {v2, v0, v1, v4}, Lcom/discord/utilities/fcm/NotificationClient;->clear(JLandroid/content/Context;)V
+    invoke-virtual {v3, v0, v1, v4}, Lcom/discord/utilities/fcm/NotificationClient;->clear(JLandroid/content/Context;)V
 
-    return-object v3
+    return-object v2
 
     :goto_1
     sget-object v3, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
diff --git a/com.discord/smali/com/esotericsoftware/a/a$a.smali b/com.discord/smali/com/esotericsoftware/a/a$a.smali
index 555446bbf0..b475bab726 100644
--- a/com.discord/smali/com/esotericsoftware/a/a$a.smali
+++ b/com.discord/smali/com/esotericsoftware/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/a/a$a;
 .super Ljava/lang/Object;
+.source "Log.java"
 
 
 # annotations
@@ -99,35 +100,42 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const-string p1, " ERROR: "
 
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :pswitch_1
     const-string p1, "  WARN: "
 
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :pswitch_2
     const-string p1, "  INFO: "
 
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :pswitch_3
     const-string p1, " DEBUG: "
 
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_0
 
     :pswitch_4
     const-string p1, " TRACE: "
 
-    :goto_0
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_1
+    :goto_0
     if-eqz p2, :cond_2
 
     const/16 p1, 0x5b
diff --git a/com.discord/smali/com/esotericsoftware/a/a.smali b/com.discord/smali/com/esotericsoftware/a/a.smali
index 969be69106..d7b86bd798 100644
--- a/com.discord/smali/com/esotericsoftware/a/a.smali
+++ b/com.discord/smali/com/esotericsoftware/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/a/a;
 .super Ljava/lang/Object;
+.source "Log.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/b/a.smali b/com.discord/smali/com/esotericsoftware/b/a.smali
index 604a1786b1..0e50d194bb 100644
--- a/com.discord/smali/com/esotericsoftware/b/a.smali
+++ b/com.discord/smali/com/esotericsoftware/b/a.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/b/a;
 .super Ljava/lang/ClassLoader;
+.source "AccessClassLoader.java"
 
 
 # static fields
@@ -125,7 +126,7 @@
     return v2
 .end method
 
-.method private static ex()Ljava/lang/reflect/Method;
+.method private static ew()Ljava/lang/reflect/Method;
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -372,7 +373,7 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/esotericsoftware/b/a;->ex()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/esotericsoftware/b/a;->ew()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/esotericsoftware/b/b.smali b/com.discord/smali/com/esotericsoftware/b/b.smali
index bb60d00a29..4af0e32209 100644
--- a/com.discord/smali/com/esotericsoftware/b/b.smali
+++ b/com.discord/smali/com/esotericsoftware/b/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/esotericsoftware/b/b;
 .super Ljava/lang/Object;
+.source "ConstructorAccess.java"
 
 
 # annotations
@@ -120,11 +121,11 @@
     :try_start_0
     invoke-virtual {v7, v6}, Lcom/esotericsoftware/b/a;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v8
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto/16 :goto_6
+    goto/16 :goto_5
 
     :catch_0
     monitor-enter v7
@@ -132,17 +133,17 @@
     :try_start_1
     invoke-virtual {v7, v6}, Lcom/esotericsoftware/b/a;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v8
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :catchall_0
     move-exception v0
 
-    goto/16 :goto_8
+    goto/16 :goto_7
 
     :catch_1
     const/16 v8, 0x2f
@@ -183,10 +184,9 @@
 
     if-nez v8, :cond_2
 
-    :goto_1
     move-object v8, v10
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     new-instance v0, Ljava/lang/RuntimeException;
@@ -270,9 +270,9 @@
 
     if-nez v8, :cond_8
 
-    goto :goto_1
+    move-object v8, v10
 
-    :goto_2
+    :goto_1
     invoke-static {v0}, Ljava/lang/reflect/Modifier;->isPublic(I)Z
 
     move-result v0
@@ -281,12 +281,12 @@
 
     const-string v0, "com/esotericsoftware/reflectasm/PublicConstructorAccess"
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const-string v0, "com/esotericsoftware/reflectasm/ConstructorAccess"
 
-    :goto_3
+    :goto_2
     new-instance v9, Lorg/a/a/g;
 
     invoke-direct {v9, v2}, Lorg/a/a/g;-><init>(I)V
@@ -451,7 +451,7 @@
 
     invoke-virtual {v0, v2, v3}, Lorg/a/a/q;->aD(II)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const/4 v3, 0x2
@@ -482,7 +482,7 @@
 
     invoke-virtual {v0, v2, v3}, Lorg/a/a/q;->aD(II)V
 
-    :goto_4
+    :goto_3
     invoke-virtual {v9}, Lorg/a/a/g;->toByteArray()[B
 
     move-result-object v0
@@ -491,32 +491,30 @@
 
     move-result-object v0
 
-    move-object v8, v0
-
-    :goto_5
+    :goto_4
     monitor-exit v7
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    :goto_6
+    :goto_5
     :try_start_7
-    invoke-virtual {v8}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+    invoke-virtual {v0}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v2
 
-    check-cast v0, Lcom/esotericsoftware/b/b;
+    check-cast v2, Lcom/esotericsoftware/b/b;
     :try_end_7
     .catch Ljava/lang/Throwable; {:try_start_7 .. :try_end_7} :catch_3
 
-    instance-of v2, v0, Lcom/esotericsoftware/b/e;
+    instance-of v3, v2, Lcom/esotericsoftware/b/e;
 
-    if-nez v2, :cond_7
+    if-nez v3, :cond_7
 
-    invoke-static {v1, v8}, Lcom/esotericsoftware/b/a;->a(Ljava/lang/Class;Ljava/lang/Class;)Z
+    invoke-static {v1, v0}, Lcom/esotericsoftware/b/a;->a(Ljava/lang/Class;Ljava/lang/Class;)Z
 
-    move-result v2
+    move-result v0
 
-    if-nez v2, :cond_7
+    if-nez v0, :cond_7
 
     new-instance v0, Ljava/lang/RuntimeException;
 
@@ -528,12 +526,12 @@
 
     const-string v3, "Class cannot be created (the no-arg constructor is protected or package-protected, and its ConstructorAccess could not be defined in the same class loader): "
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_6
     const-string v3, "Non-static member class cannot be created (the enclosing class constructor is protected or package-protected, and its ConstructorAccess could not be defined in the same class loader): "
 
-    :goto_7
+    :goto_6
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual/range {p0 .. p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
@@ -551,9 +549,9 @@
     throw v0
 
     :cond_7
-    iput-boolean v4, v0, Lcom/esotericsoftware/b/b;->AH:Z
+    iput-boolean v4, v2, Lcom/esotericsoftware/b/b;->AH:Z
 
-    return-object v0
+    return-object v2
 
     :catch_3
     move-exception v0
@@ -623,7 +621,7 @@
 
     throw v2
 
-    :goto_8
+    :goto_7
     monitor-exit v7
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
diff --git a/com.discord/smali/com/esotericsoftware/b/c.smali b/com.discord/smali/com/esotericsoftware/b/c.smali
index c61460fdbd..be6f1e10e1 100644
--- a/com.discord/smali/com/esotericsoftware/b/c.smali
+++ b/com.discord/smali/com/esotericsoftware/b/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/esotericsoftware/b/c;
 .super Ljava/lang/Object;
+.source "FieldAccess.java"
 
 
 # instance fields
@@ -311,30 +312,31 @@
 
     invoke-virtual {v1, v7, v9}, Lorg/a/a/q;->aB(II)V
 
-    iget v7, v2, Lorg/a/a/t;->ciC:I
+    iget v7, v2, Lorg/a/a/t;->chW:I
 
     const/16 v9, 0xb6
 
     packed-switch v7, :pswitch_data_0
 
-    goto/16 :goto_4
+    goto/16 :goto_2
 
     :pswitch_0
-    invoke-virtual {v2}, Lorg/a/a/t;->JN()Ljava/lang/String;
+    invoke-virtual {v2}, Lorg/a/a/t;->JM()Ljava/lang/String;
 
     move-result-object v7
 
-    goto :goto_2
+    invoke-virtual {v1, v8, v7}, Lorg/a/a/q;->k(ILjava/lang/String;)V
+
+    goto/16 :goto_2
 
     :pswitch_1
     invoke-virtual {v2}, Lorg/a/a/t;->getDescriptor()Ljava/lang/String;
 
     move-result-object v7
 
-    :goto_2
     invoke-virtual {v1, v8, v7}, Lorg/a/a/q;->k(ILjava/lang/String;)V
 
-    goto :goto_4
+    goto/16 :goto_2
 
     :pswitch_2
     const-string v7, "java/lang/Double"
@@ -347,7 +349,9 @@
 
     const-string v10, "()D"
 
-    goto :goto_3
+    invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_2
 
     :pswitch_3
     const-string v7, "java/lang/Long"
@@ -360,7 +364,9 @@
 
     const-string v10, "()J"
 
-    goto :goto_3
+    invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_2
 
     :pswitch_4
     const-string v7, "java/lang/Float"
@@ -373,7 +379,9 @@
 
     const-string v10, "()F"
 
-    goto :goto_3
+    invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_2
 
     :pswitch_5
     const-string v7, "java/lang/Integer"
@@ -386,7 +394,9 @@
 
     const-string v10, "()I"
 
-    goto :goto_3
+    invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_2
 
     :pswitch_6
     const-string v7, "java/lang/Short"
@@ -399,7 +409,9 @@
 
     const-string v10, "()S"
 
-    goto :goto_3
+    invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_2
 
     :pswitch_7
     const-string v7, "java/lang/Byte"
@@ -412,7 +424,9 @@
 
     const-string v10, "()B"
 
-    goto :goto_3
+    invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_2
 
     :pswitch_8
     const-string v7, "java/lang/Character"
@@ -425,7 +439,9 @@
 
     const-string v10, "()C"
 
-    goto :goto_3
+    invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_2
 
     :pswitch_9
     const-string v7, "java/lang/Boolean"
@@ -438,10 +454,9 @@
 
     const-string v10, "()Z"
 
-    :goto_3
     invoke-virtual {v1, v9, v7, v8, v10}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    :goto_4
+    :goto_2
     const/16 v7, 0xb5
 
     invoke-virtual {v15}, Ljava/lang/reflect/Field;->getName()Ljava/lang/String;
@@ -481,12 +496,12 @@
 
     const/4 v2, 0x5
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_2
     const/4 v2, 0x6
 
-    :goto_5
+    :goto_3
     invoke-static {v1}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/q;)Lorg/a/a/q;
 
     move-result-object v0
@@ -537,7 +552,7 @@
 
     move-result-object v3
 
-    iget v4, v2, Lorg/a/a/t;->ciC:I
+    iget v4, v2, Lorg/a/a/t;->chW:I
 
     const/16 v5, 0x19
 
@@ -551,17 +566,21 @@
 
     move-object v11, v4
 
-    const/4 v4, 0x4
+    const/16 v4, 0x19
 
-    const/16 v8, 0x19
-
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_0
     const-string v4, "setDouble"
 
     const/16 v8, 0x18
 
+    move-object v11, v4
+
+    const/16 v4, 0x18
+
+    const/4 v8, 0x5
+
     goto :goto_0
 
     :pswitch_1
@@ -569,12 +588,13 @@
 
     const/16 v8, 0x16
 
-    :goto_0
     move-object v11, v4
 
-    const/4 v4, 0x5
+    const/16 v4, 0x16
 
-    goto :goto_2
+    const/4 v8, 0x5
+
+    goto :goto_0
 
     :pswitch_2
     const-string v4, "setFloat"
@@ -583,43 +603,54 @@
 
     move-object v11, v4
 
-    const/4 v4, 0x4
+    const/16 v4, 0x17
 
-    const/16 v8, 0x17
-
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_3
     const-string v4, "setInt"
 
-    goto :goto_1
+    move-object v11, v4
+
+    const/16 v4, 0x15
+
+    goto :goto_0
 
     :pswitch_4
     const-string v4, "setShort"
 
-    goto :goto_1
+    move-object v11, v4
+
+    const/16 v4, 0x15
+
+    goto :goto_0
 
     :pswitch_5
     const-string v4, "setByte"
 
-    goto :goto_1
+    move-object v11, v4
+
+    const/16 v4, 0x15
+
+    goto :goto_0
 
     :pswitch_6
     const-string v4, "setChar"
 
-    goto :goto_1
+    move-object v11, v4
+
+    const/16 v4, 0x15
+
+    goto :goto_0
 
     :pswitch_7
     const-string v4, "setBoolean"
 
-    :goto_1
     move-object v11, v4
 
-    const/4 v4, 0x4
+    const/16 v4, 0x15
 
-    const/16 v8, 0x15
-
-    :goto_2
+    :goto_0
     const/4 v10, 0x1
 
     new-instance v9, Ljava/lang/StringBuilder;
@@ -676,7 +707,7 @@
 
     const/4 v14, 0x0
 
-    :goto_3
+    :goto_1
     const/4 v15, 0x1
 
     if-ge v13, v11, :cond_1
@@ -707,17 +738,17 @@
 
     aput-object v6, v7, v13
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_0
     aput-object v10, v7, v13
 
     const/4 v14, 0x1
 
-    :goto_4
+    :goto_2
     add-int/lit8 v13, v13, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     new-instance v6, Lorg/a/a/p;
@@ -732,7 +763,7 @@
 
     array-length v11, v7
 
-    :goto_5
+    :goto_3
     if-ge v12, v11, :cond_3
 
     aget-object v13, v7, v12
@@ -771,7 +802,7 @@
 
     const/4 v15, 0x3
 
-    invoke-virtual {v9, v8, v15}, Lorg/a/a/q;->aB(II)V
+    invoke-virtual {v9, v4, v15}, Lorg/a/a/q;->aB(II)V
 
     const/16 v15, 0xb5
 
@@ -791,19 +822,19 @@
 
     invoke-virtual {v9, v5}, Lorg/a/a/q;->fO(I)V
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_2
     const/4 v13, 0x1
 
-    :goto_6
+    :goto_4
     add-int/lit8 v12, v12, 0x1
 
     const/16 v5, 0x19
 
     const/4 v15, 0x1
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_3
     if-eqz v14, :cond_4
@@ -849,22 +880,20 @@
 
     const/4 v6, 0x5
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_5
     const/4 v6, 0x6
 
-    :goto_7
+    :goto_5
     invoke-static {v9}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/q;)Lorg/a/a/q;
 
     move-result-object v0
 
-    invoke-virtual {v0, v6, v4}, Lorg/a/a/q;->aD(II)V
+    invoke-virtual {v0, v6, v8}, Lorg/a/a/q;->aD(II)V
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_7
@@ -1020,13 +1049,13 @@
 
     move-result-object v6
 
-    iget v6, v6, Lorg/a/a/t;->ciC:I
+    iget v6, v6, Lorg/a/a/t;->chW:I
 
     const/16 v7, 0xb8
 
     packed-switch v6, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     const-string v6, "java/lang/Double"
@@ -1035,6 +1064,8 @@
 
     const-string v9, "(D)Ljava/lang/Double;"
 
+    invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_1
@@ -1044,6 +1075,8 @@
 
     const-string v9, "(J)Ljava/lang/Long;"
 
+    invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_2
@@ -1053,6 +1086,8 @@
 
     const-string v9, "(F)Ljava/lang/Float;"
 
+    invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_3
@@ -1062,6 +1097,8 @@
 
     const-string v9, "(I)Ljava/lang/Integer;"
 
+    invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_4
@@ -1071,6 +1108,8 @@
 
     const-string v9, "(S)Ljava/lang/Short;"
 
+    invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_5
@@ -1080,6 +1119,8 @@
 
     const-string v9, "(B)Ljava/lang/Byte;"
 
+    invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_6
@@ -1089,6 +1130,8 @@
 
     const-string v9, "(C)Ljava/lang/Character;"
 
+    invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_2
 
     :pswitch_7
@@ -1098,10 +1141,9 @@
 
     const-string v9, "(Z)Ljava/lang/Boolean;"
 
-    :goto_2
     invoke-virtual {p0, v7, v6, v8, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    :goto_3
+    :goto_2
     const/16 v6, 0xb0
 
     invoke-virtual {p0, v6}, Lorg/a/a/q;->fO(I)V
@@ -1127,12 +1169,12 @@
 
     invoke-virtual/range {v6 .. v11}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_2
     const/4 v0, 0x6
 
-    :goto_4
+    :goto_3
     invoke-static {p0}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/q;)Lorg/a/a/q;
 
     const/4 p1, 0x3
@@ -1141,6 +1183,8 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_7
@@ -1179,7 +1223,7 @@
 
     move-result-object v3
 
-    iget v4, v2, Lorg/a/a/t;->ciC:I
+    iget v4, v2, Lorg/a/a/t;->chW:I
 
     const/16 v5, 0xac
 
@@ -1189,16 +1233,17 @@
 
     const/16 v5, 0xb0
 
-    :goto_0
     move-object v8, v4
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     const-string v4, "getDouble"
 
     const/16 v5, 0xaf
 
+    move-object v8, v4
+
     goto :goto_0
 
     :pswitch_1
@@ -1206,6 +1251,8 @@
 
     const/16 v5, 0xad
 
+    move-object v8, v4
+
     goto :goto_0
 
     :pswitch_2
@@ -1213,34 +1260,44 @@
 
     const/16 v5, 0xae
 
+    move-object v8, v4
+
     goto :goto_0
 
     :pswitch_3
     const-string v4, "getInt"
 
+    move-object v8, v4
+
     goto :goto_0
 
     :pswitch_4
     const-string v4, "getShort"
 
+    move-object v8, v4
+
     goto :goto_0
 
     :pswitch_5
     const-string v4, "getByte"
 
+    move-object v8, v4
+
     goto :goto_0
 
     :pswitch_6
     const-string v4, "getChar"
 
+    move-object v8, v4
+
     goto :goto_0
 
     :pswitch_7
     const-string v4, "getBoolean"
 
-    goto :goto_0
+    move-object v8, v4
 
-    :goto_1
+    :goto_0
     const/4 v7, 0x1
 
     const-string v4, "(Ljava/lang/Object;I)"
@@ -1293,7 +1350,7 @@
 
     const/16 v18, 0x0
 
-    :goto_2
+    :goto_1
     const/4 v15, 0x1
 
     if-ge v11, v9, :cond_1
@@ -1324,17 +1381,17 @@
 
     aput-object v12, v7, v11
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_0
     aput-object v8, v7, v11
 
     const/16 v18, 0x1
 
-    :goto_3
+    :goto_2
     add-int/lit8 v11, v11, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     new-instance v9, Lorg/a/a/p;
@@ -1349,7 +1406,7 @@
 
     array-length v11, v7
 
-    :goto_4
+    :goto_3
     if-ge v10, v11, :cond_3
 
     invoke-virtual {v1, v10}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -1412,17 +1469,17 @@
 
     invoke-virtual {v4, v5}, Lorg/a/a/q;->fO(I)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_2
     const/4 v6, 0x1
 
-    :goto_5
+    :goto_4
     add-int/lit8 v10, v10, 0x1
 
     const/4 v15, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     if-eqz v18, :cond_4
@@ -1468,12 +1525,12 @@
 
     const/4 v6, 0x5
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_5
     const/4 v6, 0x6
 
-    :goto_6
+    :goto_5
     invoke-static {v4}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/q;)Lorg/a/a/q;
 
     move-result-object v0
@@ -1484,6 +1541,8 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_7
@@ -1894,7 +1953,7 @@
     :try_start_0
     invoke-virtual {v6, v5}, Lcom/esotericsoftware/b/a;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v7
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1906,7 +1965,7 @@
     :try_start_1
     invoke-virtual {v6, v5}, Lcom/esotericsoftware/b/a;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v7
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -1992,67 +2051,67 @@
 
     invoke-static {v7, v4, v0}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    sget-object v3, Lorg/a/a/t;->cjX:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjr:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cjX:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjr:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cjZ:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjt:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cjZ:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjt:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cka:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cju:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cka:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cju:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->ckb:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjv:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->ckb:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjv:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->ckd:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjx:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->ckd:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjx:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cke:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjy:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cke:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjy:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->ckc:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjw:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->ckc:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjw:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cjY:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjs:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
-    sget-object v3, Lorg/a/a/t;->cjY:Lorg/a/a/t;
+    sget-object v3, Lorg/a/a/t;->cjs:Lorg/a/a/t;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/g;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/t;)V
 
@@ -2066,8 +2125,6 @@
 
     move-result-object v0
 
-    move-object v7, v0
-
     :goto_3
     monitor-exit v6
     :try_end_2
@@ -2075,7 +2132,7 @@
 
     :goto_4
     :try_start_3
-    invoke-virtual {v7}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+    invoke-virtual {v0}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2115,38 +2172,40 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public abstract eA()C
+.method public abstract eA()Z
 .end method
 
-.method public abstract eB()Z
+.method public abstract eB()B
 .end method
 
-.method public abstract eC()B
+.method public abstract eC()S
 .end method
 
-.method public abstract eD()S
+.method public abstract eD()I
 .end method
 
-.method public abstract eE()I
+.method public abstract eE()J
 .end method
 
-.method public abstract eF()J
+.method public abstract eF()D
 .end method
 
-.method public abstract eG()D
+.method public abstract eG()F
 .end method
 
-.method public abstract eH()F
+.method public abstract ex()Ljava/lang/Object;
 .end method
 
-.method public abstract ey()Ljava/lang/Object;
+.method public abstract ey()Ljava/lang/String;
 .end method
 
-.method public abstract ez()Ljava/lang/String;
+.method public abstract ez()C
 .end method
 
 .method public final getIndex(Ljava/lang/String;)I
@@ -2194,4 +2253,6 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/esotericsoftware/b/d.smali b/com.discord/smali/com/esotericsoftware/b/d.smali
index dc5fe4ab6e..6ef4be8ca3 100644
--- a/com.discord/smali/com/esotericsoftware/b/d.smali
+++ b/com.discord/smali/com/esotericsoftware/b/d.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/esotericsoftware/b/d;
 .super Ljava/lang/Object;
+.source "MethodAccess.java"
 
 
 # instance fields
@@ -103,7 +104,7 @@
 .end method
 
 .method public static k(Ljava/lang/Class;)Lcom/esotericsoftware/b/d;
-    .locals 34
+    .locals 32
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -231,15 +232,15 @@
     :try_start_0
     invoke-virtual {v2, v9}, Lcom/esotericsoftware/b/a;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v10
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v30, v6
+    move-object/from16 v29, v6
 
-    goto/16 :goto_11
+    goto/16 :goto_c
 
     :catch_0
     monitor-enter v2
@@ -247,21 +248,21 @@
     :try_start_1
     invoke-virtual {v2, v9}, Lcom/esotericsoftware/b/a;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v10
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v30, v6
+    move-object/from16 v29, v6
 
-    goto/16 :goto_10
+    goto/16 :goto_b
 
     :catchall_0
     move-exception v0
 
-    goto/16 :goto_12
+    goto/16 :goto_d
 
     :catch_1
     const/16 v10, 0x2f
@@ -384,11 +385,11 @@
     :goto_3
     if-ge v14, v3, :cond_4
 
-    new-instance v16, Lorg/a/a/p;
+    new-instance v20, Lorg/a/a/p;
 
-    invoke-direct/range {v16 .. v16}, Lorg/a/a/p;-><init>()V
+    invoke-direct/range {v20 .. v20}, Lorg/a/a/p;-><init>()V
 
-    aput-object v16, v13, v14
+    aput-object v20, v13, v14
 
     add-int/lit8 v14, v14, 0x1
 
@@ -444,6 +445,10 @@
 
     invoke-virtual/range {v22 .. v27}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
+    const/16 v3, 0x19
+
+    const/4 v7, 0x4
+
     goto :goto_5
 
     :cond_5
@@ -463,11 +468,11 @@
 
     invoke-virtual/range {v22 .. v27}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
-    :goto_5
     const/16 v3, 0x19
 
     const/4 v7, 0x4
 
+    :goto_5
     invoke-virtual {v11, v3, v7}, Lorg/a/a/q;->aB(II)V
 
     const/4 v3, 0x0
@@ -480,9 +485,9 @@
 
     aget-object v3, v5, v12
 
-    aget-object v16, v6, v12
+    aget-object v21, v6, v12
 
-    move-object/from16 v29, v13
+    move-object/from16 v23, v13
 
     const/4 v7, 0x0
 
@@ -493,7 +498,7 @@
 
     const/4 v13, 0x3
 
-    move-object/from16 v30, v6
+    move-object/from16 v29, v6
 
     const/16 v6, 0x19
 
@@ -513,35 +518,37 @@
 
     move-result-object v13
 
-    iget v6, v13, Lorg/a/a/t;->ciC:I
+    iget v6, v13, Lorg/a/a/t;->chW:I
 
     packed-switch v6, :pswitch_data_0
 
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    :goto_7
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
-    goto/16 :goto_a
+    goto/16 :goto_7
 
     :pswitch_0
-    invoke-virtual {v13}, Lorg/a/a/t;->JN()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/t;->JM()Ljava/lang/String;
 
     move-result-object v6
 
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
     const/16 v3, 0xc0
 
-    :goto_8
     invoke-virtual {v11, v3, v6}, Lorg/a/a/q;->k(ILjava/lang/String;)V
 
-    goto :goto_7
+    move-object/from16 v30, v5
+
+    move-object/from16 v31, v9
+
+    goto/16 :goto_7
 
     :pswitch_1
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
     const/16 v3, 0xc0
 
@@ -549,10 +556,16 @@
 
     move-result-object v6
 
-    goto :goto_8
+    invoke-virtual {v11, v3, v6}, Lorg/a/a/q;->k(ILjava/lang/String;)V
+
+    move-object/from16 v30, v5
+
+    move-object/from16 v31, v9
+
+    goto/16 :goto_7
 
     :pswitch_2
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
     const/16 v3, 0xc0
 
@@ -564,24 +577,24 @@
 
     const-string v6, "doubleValue"
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
     const-string v5, "()D"
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const/16 v9, 0xb6
 
     invoke-virtual {v11, v9, v3, v6, v5}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto/16 :goto_a
+    goto/16 :goto_7
 
     :pswitch_3
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const-string v3, "java/lang/Long"
 
@@ -597,17 +610,16 @@
 
     const/16 v9, 0xb6
 
-    :goto_9
     invoke-virtual {v11, v9, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto/16 :goto_a
+    goto/16 :goto_7
 
     :pswitch_4
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const-string v3, "java/lang/Float"
 
@@ -623,14 +635,16 @@
 
     const/16 v9, 0xb6
 
-    goto :goto_9
+    invoke-virtual {v11, v9, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto/16 :goto_7
 
     :pswitch_5
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const-string v3, "java/lang/Integer"
 
@@ -646,14 +660,16 @@
 
     const/16 v9, 0xb6
 
-    goto :goto_9
+    invoke-virtual {v11, v9, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_7
 
     :pswitch_6
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const-string v3, "java/lang/Short"
 
@@ -669,14 +685,16 @@
 
     const/16 v9, 0xb6
 
-    goto :goto_9
+    invoke-virtual {v11, v9, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_7
 
     :pswitch_7
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const-string v3, "java/lang/Byte"
 
@@ -692,14 +710,16 @@
 
     const/16 v9, 0xb6
 
-    goto :goto_9
+    invoke-virtual {v11, v9, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_7
 
     :pswitch_8
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const-string v3, "java/lang/Character"
 
@@ -715,14 +735,16 @@
 
     const/16 v9, 0xb6
 
-    goto :goto_9
+    invoke-virtual {v11, v9, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_7
 
     :pswitch_9
-    move-object/from16 v31, v3
+    move-object/from16 v24, v3
 
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const-string v3, "java/lang/Boolean"
 
@@ -740,7 +762,7 @@
 
     invoke-virtual {v11, v5, v3, v6, v9}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    :goto_a
+    :goto_7
     invoke-virtual {v13}, Lorg/a/a/t;->getDescriptor()Ljava/lang/String;
 
     move-result-object v3
@@ -749,28 +771,28 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    move-object/from16 v6, v30
+    move-object/from16 v3, v24
 
-    move-object/from16 v3, v31
+    move-object/from16 v6, v29
 
-    move-object/from16 v5, v32
+    move-object/from16 v5, v30
 
-    move-object/from16 v9, v33
+    move-object/from16 v9, v31
 
     goto/16 :goto_6
 
     :cond_6
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v30, v6
+    move-object/from16 v29, v6
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     const/16 v3, 0x29
 
     invoke-virtual {v15, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-static/range {v16 .. v16}, Lorg/a/a/t;->aj(Ljava/lang/Class;)Ljava/lang/String;
+    invoke-static/range {v21 .. v21}, Lorg/a/a/t;->aj(Ljava/lang/Class;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -782,7 +804,7 @@
 
     const/16 v3, 0xb9
 
-    goto :goto_b
+    goto :goto_8
 
     :cond_7
     invoke-virtual {v0, v12}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -803,12 +825,12 @@
 
     const/16 v3, 0xb8
 
-    goto :goto_b
+    goto :goto_8
 
     :cond_8
     const/16 v3, 0xb6
 
-    :goto_b
+    :goto_8
     aget-object v5, v4, v12
 
     invoke-virtual {v15}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -817,18 +839,17 @@
 
     invoke-virtual {v11, v3, v8, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static/range {v16 .. v16}, Lorg/a/a/t;->ai(Ljava/lang/Class;)Lorg/a/a/t;
+    invoke-static/range {v21 .. v21}, Lorg/a/a/t;->ai(Ljava/lang/Class;)Lorg/a/a/t;
 
     move-result-object v3
 
-    iget v3, v3, Lorg/a/a/t;->ciC:I
+    iget v3, v3, Lorg/a/a/t;->chW:I
 
     packed-switch v3, :pswitch_data_1
 
-    :goto_c
     const/4 v3, 0x1
 
-    goto :goto_e
+    goto :goto_9
 
     :pswitch_a
     const-string v3, "java/lang/Double"
@@ -837,10 +858,11 @@
 
     const-string v6, "(D)Ljava/lang/Double;"
 
-    :goto_d
     invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_c
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_b
     const-string v3, "java/lang/Long"
@@ -849,7 +871,11 @@
 
     const-string v6, "(J)Ljava/lang/Long;"
 
-    goto :goto_d
+    invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_c
     const-string v3, "java/lang/Float"
@@ -858,7 +884,11 @@
 
     const-string v6, "(F)Ljava/lang/Float;"
 
-    goto :goto_d
+    invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_d
     const-string v3, "java/lang/Integer"
@@ -867,7 +897,11 @@
 
     const-string v6, "(I)Ljava/lang/Integer;"
 
-    goto :goto_d
+    invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_e
     const-string v3, "java/lang/Short"
@@ -876,7 +910,11 @@
 
     const-string v6, "(S)Ljava/lang/Short;"
 
-    goto :goto_d
+    invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_f
     const-string v3, "java/lang/Byte"
@@ -885,7 +923,11 @@
 
     const-string v6, "(B)Ljava/lang/Byte;"
 
-    goto :goto_d
+    invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_10
     const-string v3, "java/lang/Character"
@@ -894,7 +936,11 @@
 
     const-string v6, "(C)Ljava/lang/Character;"
 
-    goto :goto_d
+    invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_11
     const-string v3, "java/lang/Boolean"
@@ -903,40 +949,44 @@
 
     const-string v6, "(Z)Ljava/lang/Boolean;"
 
-    goto :goto_d
+    invoke-virtual {v11, v13, v3, v5, v6}, Lorg/a/a/q;->d(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    goto :goto_9
 
     :pswitch_12
     const/4 v3, 0x1
 
     invoke-virtual {v11, v3}, Lorg/a/a/q;->fO(I)V
 
-    :goto_e
+    :goto_9
     const/16 v5, 0xb0
 
     invoke-virtual {v11, v5}, Lorg/a/a/q;->fO(I)V
 
     add-int/lit8 v12, v12, 0x1
 
+    move-object/from16 v13, v23
+
     move/from16 v3, v28
 
-    move-object/from16 v13, v29
+    move-object/from16 v6, v29
 
-    move-object/from16 v6, v30
+    move-object/from16 v5, v30
 
-    move-object/from16 v5, v32
-
-    move-object/from16 v9, v33
+    move-object/from16 v9, v31
 
     const/4 v7, 0x0
 
     goto/16 :goto_4
 
     :cond_9
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v30, v6
+    move-object/from16 v29, v6
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
     invoke-virtual {v11, v14}, Lorg/a/a/q;->a(Lorg/a/a/p;)V
 
@@ -954,16 +1004,16 @@
 
     invoke-virtual/range {v22 .. v27}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
-    goto :goto_f
+    goto :goto_a
 
     :cond_a
-    move-object/from16 v32, v5
+    move-object/from16 v30, v5
 
-    move-object/from16 v30, v6
+    move-object/from16 v29, v6
 
-    move-object/from16 v33, v9
+    move-object/from16 v31, v9
 
-    :goto_f
+    :goto_a
     const-string v0, "java/lang/IllegalArgumentException"
 
     const/16 v1, 0xbb
@@ -1040,22 +1090,20 @@
 
     move-result-object v0
 
-    move-object/from16 v9, v33
+    move-object/from16 v9, v31
 
     invoke-virtual {v2, v9, v0}, Lcom/esotericsoftware/b/a;->a(Ljava/lang/String;[B)Ljava/lang/Class;
 
     move-result-object v0
 
-    move-object v10, v0
-
-    :goto_10
+    :goto_b
     monitor-exit v2
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    :goto_11
+    :goto_c
     :try_start_3
-    invoke-virtual {v10}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+    invoke-virtual {v0}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1063,11 +1111,11 @@
 
     iput-object v4, v0, Lcom/esotericsoftware/b/d;->AL:[Ljava/lang/String;
 
-    move-object/from16 v1, v32
+    move-object/from16 v1, v30
 
     iput-object v1, v0, Lcom/esotericsoftware/b/d;->AM:[[Ljava/lang/Class;
 
-    move-object/from16 v1, v30
+    move-object/from16 v1, v29
 
     iput-object v1, v0, Lcom/esotericsoftware/b/d;->AN:[Ljava/lang/Class;
     :try_end_3
@@ -1094,7 +1142,7 @@
 
     throw v1
 
-    :goto_12
+    :goto_d
     :try_start_4
     monitor-exit v2
     :try_end_4
@@ -1102,6 +1150,10 @@
 
     throw v0
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_9
@@ -1199,7 +1251,9 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
-.method public varargs abstract eI()Ljava/lang/Object;
+.method public varargs abstract eH()Ljava/lang/Object;
 .end method
diff --git a/com.discord/smali/com/esotericsoftware/b/e.smali b/com.discord/smali/com/esotericsoftware/b/e.smali
index 671eb1e8ce..7a0e88b12f 100644
--- a/com.discord/smali/com/esotericsoftware/b/e.smali
+++ b/com.discord/smali/com/esotericsoftware/b/e.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/esotericsoftware/b/e;
 .super Lcom/esotericsoftware/b/b;
+.source "PublicConstructorAccess.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/ClassResolver.smali b/com.discord/smali/com/esotericsoftware/kryo/ClassResolver.smali
index 6f0737043e..49114b63c4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/ClassResolver.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/ClassResolver.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/ClassResolver;
 .super Ljava/lang/Object;
+.source "ClassResolver.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/DefaultSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/DefaultSerializer.smali
index 488d913857..183af25c64 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/DefaultSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/DefaultSerializer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/DefaultSerializer;
 .super Ljava/lang/Object;
+.source "DefaultSerializer.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
index 898c3f62ff..1a51306d5d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1;
 .super Ljava/lang/Object;
+.source "Kryo.java"
 
 # interfaces
 .implements Lorg/b/a/a;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
index 1bea5faefe..83fbe9494f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2;
 .super Ljava/lang/Object;
+.source "Kryo.java"
 
 # interfaces
 .implements Lorg/b/a/a;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
index bcdb35d39f..00e4634268 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;
 .super Ljava/lang/Object;
+.source "Kryo.java"
 
 # interfaces
 .implements Lorg/b/b/b;
@@ -110,7 +111,7 @@
     :try_start_1
     invoke-virtual {p1, v0}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
 
-    move-result-object v2
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
 
@@ -120,18 +121,18 @@
     :try_start_2
     invoke-virtual {p1, v0}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
 
-    move-result-object v2
+    move-result-object v0
 
-    invoke-virtual {v2, v1}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
 
     :goto_1
-    new-instance v0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2;
+    new-instance v1, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2;
 
-    invoke-direct {v0, p0, v2, p1}, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2;-><init>(Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;Ljava/lang/reflect/Constructor;Ljava/lang/Class;)V
+    invoke-direct {v1, p0, v0, p1}, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2;-><init>(Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;Ljava/lang/reflect/Constructor;Ljava/lang/Class;)V
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_2
 
-    return-object v0
+    return-object v1
 
     :catch_2
     nop
@@ -235,8 +236,6 @@
     throw p1
 
     :cond_5
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lorg/b/b/b;
-
     invoke-interface {v0, p1}, Lorg/b/b/b;->newInstantiatorOf(Ljava/lang/Class;)Lorg/b/a/a;
 
     move-result-object p1
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali
index 76159d17d5..097dc47095 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/Kryo$DefaultSerializerEntry;
 .super Ljava/lang/Object;
+.source "Kryo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
index 57eac02cab..9eaac3e4fc 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/Kryo;
 .super Ljava/lang/Object;
+.source "Kryo.java"
 
 
 # annotations
@@ -621,8 +622,6 @@
 
     if-eq v0, v1, :cond_3
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/Kryo;->depth:I
-
     add-int/lit8 v0, v0, 0x1
 
     iput v0, p0, Lcom/esotericsoftware/kryo/Kryo;->depth:I
@@ -670,9 +669,7 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->defaultSerializers:Ljava/util/ArrayList;
 
-    iget-object p2, p0, Lcom/esotericsoftware/kryo/Kryo;->defaultSerializers:Ljava/util/ArrayList;
-
-    invoke-virtual {p2}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
     move-result p2
 
@@ -716,9 +713,7 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->defaultSerializers:Ljava/util/ArrayList;
 
-    iget-object p2, p0, Lcom/esotericsoftware/kryo/Kryo;->defaultSerializers:Ljava/util/ArrayList;
-
-    invoke-virtual {p2}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
     move-result p2
 
@@ -776,9 +771,7 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->defaultSerializers:Ljava/util/ArrayList;
 
-    iget-object p2, p0, Lcom/esotericsoftware/kryo/Kryo;->defaultSerializers:Ljava/util/ArrayList;
-
-    invoke-virtual {p2}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
     move-result p2
 
@@ -1557,6 +1550,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method protected getDefaultSerializerForAnnotatedType(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
@@ -1655,11 +1650,9 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->classResolver:Lcom/esotericsoftware/kryo/ClassResolver;
+    iget-object v1, p0, Lcom/esotericsoftware/kryo/Kryo;->classResolver:Lcom/esotericsoftware/kryo/ClassResolver;
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/Kryo;->nextRegisterID:I
-
-    invoke-interface {v0, v1}, Lcom/esotericsoftware/kryo/ClassResolver;->getRegistration(I)Lcom/esotericsoftware/kryo/Registration;
+    invoke-interface {v1, v0}, Lcom/esotericsoftware/kryo/ClassResolver;->getRegistration(I)Lcom/esotericsoftware/kryo/Registration;
 
     move-result-object v0
 
@@ -1686,6 +1679,8 @@
     invoke-direct {v0, v1}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public getOriginalToCopyMap()Lcom/esotericsoftware/kryo/util/IdentityMap;
@@ -1745,12 +1740,11 @@
 
     const-class v0, Ljava/lang/reflect/InvocationHandler;
 
-    :goto_0
     invoke-virtual {p0, v0}, Lcom/esotericsoftware/kryo/Kryo;->getRegistration(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Registration;
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p1}, Ljava/lang/Class;->isEnum()Z
@@ -1771,6 +1765,10 @@
 
     move-result-object v0
 
+    invoke-virtual {p0, v0}, Lcom/esotericsoftware/kryo/Kryo;->getRegistration(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Registration;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_1
@@ -1786,12 +1784,11 @@
 
     const-class v1, Ljava/util/EnumSet;
 
-    :goto_1
     invoke-interface {v0, v1}, Lcom/esotericsoftware/kryo/ClassResolver;->getRegistration(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Registration;
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_2
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/Kryo;->isClosure(Ljava/lang/Class;)Z
@@ -1804,10 +1801,12 @@
 
     const-class v1, Lcom/esotericsoftware/kryo/serializers/ClosureSerializer$Closure;
 
-    goto :goto_1
+    invoke-interface {v0, v1}, Lcom/esotericsoftware/kryo/ClassResolver;->getRegistration(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Registration;
+
+    move-result-object v0
 
     :cond_3
-    :goto_2
+    :goto_0
     if-nez v0, :cond_6
 
     iget-boolean v0, p0, Lcom/esotericsoftware/kryo/Kryo;->registrationRequired:Z
@@ -1831,7 +1830,7 @@
 
     move-result-object v0
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_5
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -1845,7 +1844,7 @@
     throw v0
 
     :cond_6
-    :goto_3
+    :goto_1
     return-object v0
 
     :cond_7
@@ -1939,6 +1938,16 @@
 
     move-result-object p1
 
+    invoke-virtual {p1}, Ljava/lang/Class;->getModifiers()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/reflect/Modifier;->isFinal(I)Z
+
+    move-result p1
+
+    return p1
+
     :cond_0
     invoke-virtual {p1}, Ljava/lang/Class;->getModifiers()I
 
@@ -3116,12 +3125,10 @@
     :cond_3
     if-nez v0, :cond_6
 
-    :goto_0
     iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->readReferenceIds:Lcom/esotericsoftware/kryo/util/IntArray;
 
     invoke-virtual {p1, v2}, Lcom/esotericsoftware/kryo/util/IntArray;->add(I)V
 
-    :goto_1
     iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->readReferenceIds:Lcom/esotericsoftware/kryo/util/IntArray;
 
     iget p1, p1, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
@@ -3131,7 +3138,15 @@
     :cond_4
     if-nez v0, :cond_5
 
-    goto :goto_0
+    iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->readReferenceIds:Lcom/esotericsoftware/kryo/util/IntArray;
+
+    invoke-virtual {p1, v2}, Lcom/esotericsoftware/kryo/util/IntArray;->add(I)V
+
+    iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->readReferenceIds:Lcom/esotericsoftware/kryo/util/IntArray;
+
+    iget p1, p1, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
+
+    return p1
 
     :cond_5
     invoke-virtual {p1, v3}, Lcom/esotericsoftware/kryo/io/Input;->readVarInt(Z)I
@@ -3182,7 +3197,11 @@
 
     invoke-virtual {p2, p1}, Lcom/esotericsoftware/kryo/util/IntArray;->add(I)V
 
-    goto :goto_1
+    iget-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->readReferenceIds:Lcom/esotericsoftware/kryo/util/IntArray;
+
+    iget p1, p1, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
+
+    return p1
 
     :cond_8
     add-int/2addr p1, v2
@@ -3244,11 +3263,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->originalToCopy:Lcom/esotericsoftware/kryo/util/IdentityMap;
+    iget-object v1, p0, Lcom/esotericsoftware/kryo/Kryo;->originalToCopy:Lcom/esotericsoftware/kryo/util/IdentityMap;
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/Kryo;->needsCopyReference:Ljava/lang/Object;
-
-    invoke-virtual {v0, v1, p1}, Lcom/esotericsoftware/kryo/util/IdentityMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v0, p1}, Lcom/esotericsoftware/kryo/util/IdentityMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const/4 p1, 0x0
 
@@ -3507,8 +3524,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/Kryo;->graphContext:Lcom/esotericsoftware/kryo/util/ObjectMap;
-
     invoke-virtual {v1}, Lcom/esotericsoftware/kryo/util/ObjectMap;->clear()V
 
     :cond_0
@@ -3535,8 +3550,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->originalToCopy:Lcom/esotericsoftware/kryo/util/IdentityMap;
-
     const/16 v1, 0x800
 
     invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/util/IdentityMap;->clear(I)V
@@ -3975,11 +3988,6 @@
     :cond_0
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_1
     :try_start_1
     invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
@@ -4069,10 +4077,14 @@
 
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/Kryo;->reset()V
 
+    return-void
+
     :cond_6
     return-void
 
-    :goto_0
+    :catchall_0
+    move-exception p1
+
     iget p2, p0, Lcom/esotericsoftware/kryo/Kryo;->depth:I
 
     sub-int/2addr p2, v1
@@ -4209,6 +4221,8 @@
 
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/Kryo;->reset()V
 
+    return-void
+
     :cond_4
     return-void
 
@@ -4338,6 +4352,8 @@
 
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/Kryo;->reset()V
 
+    return-void
+
     :cond_4
     return-void
 
@@ -4526,6 +4542,8 @@
 
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/Kryo;->reset()V
 
+    return-void
+
     :cond_9
     return-void
 
@@ -4711,6 +4729,8 @@
 
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/Kryo;->reset()V
 
+    return-void
+
     :cond_9
     return-void
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/KryoCopyable.smali b/com.discord/smali/com/esotericsoftware/kryo/KryoCopyable.smali
index 3c81881193..2e51187909 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/KryoCopyable.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/KryoCopyable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/KryoCopyable;
 .super Ljava/lang/Object;
+.source "KryoCopyable.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/KryoException.smali b/com.discord/smali/com/esotericsoftware/kryo/KryoException.smali
index 6a535f9a1d..33fa739efc 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/KryoException.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/KryoException.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/KryoException;
 .super Ljava/lang/RuntimeException;
+.source "KryoException.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/KryoSerializable.smali b/com.discord/smali/com/esotericsoftware/kryo/KryoSerializable.smali
index d6c8a86f5d..158acae397 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/KryoSerializable.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/KryoSerializable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/KryoSerializable;
 .super Ljava/lang/Object;
+.source "KryoSerializable.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/NotNull.smali b/com.discord/smali/com/esotericsoftware/kryo/NotNull.smali
index 7f6b1e0425..6c9bfc212d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/NotNull.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/NotNull.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/NotNull;
 .super Ljava/lang/Object;
+.source "NotNull.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/ReferenceResolver.smali b/com.discord/smali/com/esotericsoftware/kryo/ReferenceResolver.smali
index 4045c611db..e8182d703d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/ReferenceResolver.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/ReferenceResolver.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/ReferenceResolver;
 .super Ljava/lang/Object;
+.source "ReferenceResolver.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Registration.smali b/com.discord/smali/com/esotericsoftware/kryo/Registration.smali
index 55a7b308a2..f21f206298 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Registration.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Registration.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/Registration;
 .super Ljava/lang/Object;
+.source "Registration.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Serializer.smali b/com.discord/smali/com/esotericsoftware/kryo/Serializer.smali
index fa1dbd6628..ac474c8de9 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Serializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Serializer.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/esotericsoftware/kryo/Serializer;
 .super Ljava/lang/Object;
+.source "Serializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/StreamFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/StreamFactory.smali
index 2156afb068..75610b72a8 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/StreamFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/StreamFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/StreamFactory;
 .super Ljava/lang/Object;
+.source "StreamFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali
index 8f49db8a03..7ef5705213 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/factories/PseudoSerializerFactory;
 .super Ljava/lang/Object;
+.source "PseudoSerializerFactory.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/factories/SerializerFactory;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali
index c6e24f6f28..6e44bcf6ad 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/factories/ReflectionSerializerFactory;
 .super Ljava/lang/Object;
+.source "ReflectionSerializerFactory.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/factories/SerializerFactory;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/factories/SerializerFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/factories/SerializerFactory.smali
index 2c3b970bc0..eed649e16d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/factories/SerializerFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/factories/SerializerFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/factories/SerializerFactory;
 .super Ljava/lang/Object;
+.source "SerializerFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInput.smali
index 9d293c9225..bd28bd5409 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInput.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/ByteBufferInput;
 .super Lcom/esotericsoftware/kryo/io/Input;
+.source "ByteBufferInput.java"
 
 
 # static fields
@@ -353,9 +354,7 @@
 
     add-int/lit8 v3, v0, -0x1
 
-    iget-object v4, p0, Lcom/esotericsoftware/kryo/io/ByteBufferInput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v4, v3}, Ljava/nio/ByteBuffer;->get(I)B
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->get(I)B
 
     move-result v4
 
@@ -385,9 +384,7 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/io/ByteBufferInput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    iget-object v4, p0, Lcom/esotericsoftware/kryo/io/ByteBufferInput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v4, v3}, Ljava/nio/ByteBuffer;->get(I)B
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->get(I)B
 
     move-result v4
 
@@ -1707,6 +1704,8 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -1949,6 +1948,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public readBoolean()Z
@@ -2122,6 +2123,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public readBytes(I)[B
@@ -3557,6 +3560,8 @@
     invoke-direct {v0, p1}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public rewind()V
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali
index b0b2b3a96f..82d3415833 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/ByteBufferInputStream;
 .super Ljava/io/InputStream;
+.source "ByteBufferInputStream.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutput.smali
index cb6ad03fb3..5bf0aed405 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutput.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/ByteBufferOutput;
 .super Lcom/esotericsoftware/kryo/io/Output;
+.source "ByteBufferOutput.java"
 
 
 # static fields
@@ -343,12 +344,11 @@
 
     iput v3, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
-    :goto_1
     int-to-byte v0, v0
 
     invoke-virtual {v1, v2, v0}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     const/16 v1, 0x7ff
@@ -395,7 +395,6 @@
 
     invoke-virtual {v1, v2, v3}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
 
-    :goto_2
     iget-object v1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
@@ -408,6 +407,10 @@
 
     or-int/lit16 v0, v0, 0x80
 
+    int-to-byte v0, v0
+
+    invoke-virtual {v1, v2, v0}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
+
     goto :goto_1
 
     :cond_2
@@ -433,12 +436,26 @@
 
     invoke-virtual {p0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
-    goto :goto_2
+    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    :goto_3
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    add-int/lit8 v3, v2, 0x1
+
+    iput v3, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    and-int/lit8 v0, v0, 0x3f
+
+    or-int/lit16 v0, v0, 0x80
+
+    int-to-byte v0, v0
+
+    invoke-virtual {v1, v2, v0}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
+
+    :goto_1
     add-int/lit8 p3, p3, 0x1
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :cond_3
     return-void
@@ -467,7 +484,6 @@
 
     add-int/2addr p1, v0
 
-    :goto_0
     iput p1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
     return-void
@@ -501,7 +517,9 @@
 
     add-int/2addr p1, v1
 
-    goto :goto_0
+    iput p1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return-void
 
     :cond_1
     ushr-int/lit8 v2, p1, 0x14
@@ -540,7 +558,9 @@
 
     add-int/2addr p1, v2
 
-    goto :goto_0
+    iput p1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return-void
 
     :cond_2
     ushr-int/lit8 v3, p1, 0x1b
@@ -587,7 +607,9 @@
 
     add-int/2addr p1, v3
 
-    goto :goto_0
+    iput p1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return-void
 
     :cond_3
     const/4 v4, 0x5
@@ -638,7 +660,9 @@
 
     add-int/2addr p1, v4
 
-    goto/16 :goto_0
+    iput p1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return-void
 .end method
 
 
@@ -682,6 +706,8 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -895,8 +921,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->isDirect()Z
 
     move-result v0
@@ -1023,6 +1047,8 @@
     invoke-direct {v0, p1}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public setBuffer(Ljava/nio/ByteBuffer;)V
@@ -1509,6 +1535,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public writeChar(C)V
@@ -1935,7 +1963,7 @@
 .end method
 
 .method public writeLongS(JZ)I
-    .locals 29
+    .locals 25
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lcom/esotericsoftware/kryo/KryoException;
@@ -1944,27 +1972,27 @@
 
     move-object/from16 v0, p0
 
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     if-nez p3, :cond_0
 
-    shl-long v4, p1, v3
+    shl-long v2, p1, v1
 
-    const/16 v6, 0x3f
+    const/16 v4, 0x3f
 
-    shr-long v1, p1, v6
+    shr-long v4, p1, v4
 
-    xor-long/2addr v1, v4
+    xor-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_0
-    move-wide/from16 v1, p1
+    move-wide/from16 v2, p1
 
     :goto_0
     const/4 v4, 0x7
 
-    ushr-long v5, v1, v4
+    ushr-long v5, v2, v4
 
     const-wide/16 v7, 0x0
 
@@ -1972,338 +2000,383 @@
 
     if-nez v9, :cond_1
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v4, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    invoke-virtual {v4, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v4, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    :goto_1
-    iget v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
-    add-int/2addr v1, v3
+    add-int/2addr v2, v1
 
-    iput v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
-    return v3
+    return v1
 
     :cond_1
-    const/16 v3, 0xe
+    const/16 v1, 0xe
 
-    ushr-long v9, v1, v3
+    ushr-long v9, v2, v1
 
     const-wide/16 v11, 0x7f
 
     const-wide/16 v13, 0x80
 
-    cmp-long v3, v9, v7
+    cmp-long v1, v9, v7
 
-    if-nez v3, :cond_2
+    if-nez v1, :cond_2
 
-    const/4 v3, 0x2
+    const/4 v1, 0x2
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v4, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
-    or-long/2addr v1, v13
+    or-long/2addr v2, v13
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
-
-    invoke-virtual {v4, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    long-to-int v2, v5
-
-    :goto_2
     int-to-byte v2, v2
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v4, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    goto :goto_1
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    long-to-int v3, v5
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    add-int/2addr v2, v1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return v1
 
     :cond_2
-    const/16 v3, 0x15
+    const/16 v1, 0x15
 
-    move-wide v15, v5
+    move-wide/from16 p2, v5
 
-    ushr-long v4, v1, v3
+    ushr-long v4, v2, v1
 
-    cmp-long v3, v4, v7
+    cmp-long v1, v4, v7
 
-    if-nez v3, :cond_3
+    if-nez v1, :cond_3
 
-    const/4 v3, 0x3
+    const/4 v1, 0x3
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v4, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
-    or-long/2addr v1, v13
+    or-long/2addr v2, v13
 
-    long-to-int v1, v1
-
-    int-to-byte v1, v1
-
-    invoke-virtual {v4, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long v4, v15, v13
-
-    long-to-int v2, v4
+    long-to-int v2, v2
 
     int-to-byte v2, v2
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v4, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    long-to-int v2, v9
+    or-long v3, p2, v13
 
-    goto :goto_2
+    long-to-int v3, v3
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    long-to-int v3, v9
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    add-int/2addr v2, v1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return v1
 
     :cond_3
-    const/16 v3, 0x1c
+    const/16 v1, 0x1c
 
-    ushr-long v13, v1, v3
+    ushr-long v13, v2, v1
 
-    cmp-long v3, v13, v7
+    cmp-long v1, v13, v7
 
-    if-nez v3, :cond_4
+    if-nez v1, :cond_4
 
-    const/4 v3, 0x4
+    const/4 v1, 0x4
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v6, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
     const-wide/16 v7, 0x80
 
-    or-long/2addr v1, v7
+    or-long/2addr v2, v7
 
-    long-to-int v1, v1
-
-    int-to-byte v1, v1
-
-    invoke-virtual {v6, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long v11, v15, v7
-
-    long-to-int v2, v11
+    long-to-int v2, v2
 
     int-to-byte v2, v2
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v6, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    or-long v11, p2, v7
+
+    long-to-int v3, v11
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     or-long/2addr v7, v9
 
-    long-to-int v2, v7
+    long-to-int v3, v7
 
-    int-to-byte v2, v2
+    int-to-byte v3, v3
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    :goto_3
-    long-to-int v2, v4
+    long-to-int v3, v4
 
-    goto :goto_2
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    add-int/2addr v2, v1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return v1
 
     :cond_4
-    const/16 v3, 0x23
+    const/16 v1, 0x23
 
-    ushr-long v11, v1, v3
+    ushr-long v11, v2, v1
 
-    cmp-long v3, v11, v7
+    cmp-long v1, v11, v7
 
-    if-nez v3, :cond_5
+    if-nez v1, :cond_5
 
-    const/4 v3, 0x5
+    const/4 v1, 0x5
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v6, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     const-wide/16 v7, 0x7f
 
-    and-long/2addr v1, v7
+    and-long/2addr v2, v7
 
     const-wide/16 v7, 0x80
 
-    or-long/2addr v1, v7
+    or-long/2addr v2, v7
 
-    long-to-int v1, v1
-
-    int-to-byte v1, v1
-
-    invoke-virtual {v6, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long v11, v15, v7
-
-    long-to-int v2, v11
+    long-to-int v2, v2
 
     int-to-byte v2, v2
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v6, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    or-long v11, p2, v7
+
+    long-to-int v3, v11
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     or-long/2addr v9, v7
 
-    long-to-int v2, v9
+    long-to-int v3, v9
 
-    int-to-byte v2, v2
+    int-to-byte v3, v3
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     or-long/2addr v4, v7
 
-    long-to-int v2, v4
+    long-to-int v3, v4
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    long-to-int v3, v13
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    add-int/2addr v2, v1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return v1
+
+    :cond_5
+    const/16 v1, 0x2a
+
+    move-wide/from16 v19, v11
+
+    ushr-long v11, v2, v1
+
+    cmp-long v1, v11, v7
+
+    if-nez v1, :cond_6
+
+    const/4 v1, 0x6
+
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+
+    iget-object v6, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    const-wide/16 v7, 0x7f
+
+    and-long/2addr v2, v7
+
+    const-wide/16 v7, 0x80
+
+    or-long/2addr v2, v7
+
+    long-to-int v2, v2
 
     int-to-byte v2, v2
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v6, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    long-to-int v2, v13
+    or-long v11, p2, v7
 
-    goto/16 :goto_2
+    long-to-int v3, v11
 
-    :cond_5
-    const/16 v3, 0x2a
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    or-long/2addr v9, v7
+
+    long-to-int v3, v9
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    or-long/2addr v4, v7
+
+    long-to-int v3, v4
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    or-long v3, v13, v7
+
+    long-to-int v3, v3
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    move-wide/from16 v3, v19
+
+    long-to-int v3, v3
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    add-int/2addr v2, v1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return v1
+
+    :cond_6
+    const/16 v1, 0x31
 
     move-wide/from16 v21, v11
 
-    ushr-long v11, v1, v3
+    ushr-long v11, v2, v1
 
-    cmp-long v3, v11, v7
+    cmp-long v1, v11, v7
 
-    if-nez v3, :cond_6
+    if-nez v1, :cond_7
 
-    const/4 v3, 0x6
+    const/4 v1, 0x7
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
-
-    iget-object v6, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    const-wide/16 v7, 0x7f
-
-    and-long/2addr v1, v7
-
-    const-wide/16 v7, 0x80
-
-    or-long/2addr v1, v7
-
-    long-to-int v1, v1
-
-    int-to-byte v1, v1
-
-    invoke-virtual {v6, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v11, v15, v7
-
-    long-to-int v2, v11
-
-    int-to-byte v2, v2
-
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long/2addr v9, v7
-
-    long-to-int v2, v9
-
-    int-to-byte v2, v2
-
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long/2addr v4, v7
-
-    long-to-int v2, v4
-
-    int-to-byte v2, v2
-
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long v4, v13, v7
-
-    long-to-int v2, v4
-
-    int-to-byte v2, v2
-
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    move-wide/from16 v4, v21
-
-    goto :goto_3
-
-    :cond_6
-    const/16 v3, 0x31
-
-    move-wide/from16 v23, v11
-
-    ushr-long v11, v1, v3
-
-    cmp-long v3, v11, v7
-
-    if-nez v3, :cond_7
-
-    const/4 v3, 0x7
-
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
-
-    iget-object v3, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
     const-wide/16 v6, 0x7f
 
-    and-long/2addr v1, v6
+    and-long/2addr v2, v6
 
     const-wide/16 v6, 0x80
 
-    or-long/2addr v1, v6
+    or-long/2addr v2, v6
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    invoke-virtual {v3, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v2, v15, v6
+    or-long v2, p2, v6
 
     long-to-int v2, v2
 
@@ -2343,7 +2416,7 @@
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v2, v21, v6
+    or-long v2, v19, v6
 
     long-to-int v2, v2
 
@@ -2353,7 +2426,7 @@
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    move-wide/from16 v2, v23
+    move-wide/from16 v2, v21
 
     long-to-int v2, v2
 
@@ -2365,7 +2438,6 @@
 
     const/4 v2, 0x7
 
-    :goto_4
     add-int/2addr v1, v2
 
     iput v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
@@ -2373,142 +2445,152 @@
     return v2
 
     :cond_7
-    const/16 v3, 0x38
+    const/16 v1, 0x38
 
-    move-wide/from16 v25, v11
+    move-wide/from16 v23, v11
 
-    ushr-long v11, v1, v3
+    ushr-long v11, v2, v1
 
-    cmp-long v3, v11, v7
+    cmp-long v1, v11, v7
 
-    if-nez v3, :cond_8
+    if-nez v1, :cond_8
 
-    const/16 v3, 0x8
+    const/16 v1, 0x8
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v6, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     const-wide/16 v7, 0x7f
 
-    and-long/2addr v1, v7
+    and-long/2addr v2, v7
 
     const-wide/16 v7, 0x80
 
-    or-long/2addr v1, v7
+    or-long/2addr v2, v7
 
-    long-to-int v1, v1
-
-    int-to-byte v1, v1
-
-    invoke-virtual {v6, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long v11, v15, v7
-
-    long-to-int v2, v11
+    long-to-int v2, v2
 
     int-to-byte v2, v2
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v6, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    or-long v11, p2, v7
+
+    long-to-int v3, v11
+
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     or-long/2addr v9, v7
 
-    long-to-int v2, v9
+    long-to-int v3, v9
 
-    int-to-byte v2, v2
+    int-to-byte v3, v3
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     or-long/2addr v4, v7
 
-    long-to-int v2, v4
+    long-to-int v3, v4
 
-    int-to-byte v2, v2
+    int-to-byte v3, v3
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v4, v13, v7
+    or-long v3, v13, v7
 
-    long-to-int v2, v4
+    long-to-int v3, v3
 
-    int-to-byte v2, v2
+    int-to-byte v3, v3
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v4, v21, v7
+    or-long v3, v19, v7
 
-    long-to-int v2, v4
+    long-to-int v3, v3
 
-    int-to-byte v2, v2
+    int-to-byte v3, v3
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v4, v23, v7
+    or-long v3, v21, v7
 
-    long-to-int v2, v4
+    long-to-int v3, v3
 
-    int-to-byte v2, v2
+    int-to-byte v3, v3
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    move-wide/from16 v6, v25
+    move-wide/from16 v6, v23
 
-    long-to-int v2, v6
+    long-to-int v3, v6
 
-    goto/16 :goto_2
+    int-to-byte v3, v3
+
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    add-int/2addr v2, v1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return v1
 
     :cond_8
-    move-wide/from16 v6, v25
+    move-wide/from16 v6, v23
 
-    const/16 v3, 0x9
+    const/16 v1, 0x9
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->require(I)Z
 
     iget-object v8, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    const-wide/16 v19, 0x7f
+    const-wide/16 v17, 0x7f
 
-    and-long v1, v1, v19
+    and-long v2, v2, v17
 
-    const-wide/16 v17, 0x80
+    const-wide/16 v15, 0x80
 
-    or-long v1, v1, v17
+    or-long/2addr v2, v15
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    invoke-virtual {v8, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+
+    move-object v3, v2
+
+    or-long v1, p2, v15
 
     long-to-int v1, v1
 
     int-to-byte v1, v1
 
-    invoke-virtual {v8, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+    invoke-virtual {v3, v1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    move-wide/from16 v27, v4
-
-    or-long v3, v15, v17
-
-    long-to-int v2, v3
-
-    int-to-byte v2, v2
-
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
-
-    or-long v2, v9, v17
+    or-long v2, v9, v15
 
     long-to-int v2, v2
 
@@ -2518,7 +2600,7 @@
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v2, v27, v17
+    or-long v2, v4, v15
 
     long-to-int v2, v2
 
@@ -2528,7 +2610,7 @@
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v2, v13, v17
+    or-long v2, v13, v15
 
     long-to-int v2, v2
 
@@ -2538,7 +2620,7 @@
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v2, v21, v17
+    or-long v2, v19, v15
 
     long-to-int v2, v2
 
@@ -2548,7 +2630,7 @@
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v2, v23, v17
+    or-long v2, v21, v15
 
     long-to-int v2, v2
 
@@ -2558,7 +2640,7 @@
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    or-long v2, v6, v17
+    or-long v2, v6, v15
 
     long-to-int v2, v2
 
@@ -2578,7 +2660,11 @@
 
     const/16 v2, 0x9
 
-    goto/16 :goto_4
+    add-int/2addr v1, v2
+
+    iput v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+
+    return v2
 .end method
 
 .method public writeLongs([J)V
@@ -2864,6 +2950,8 @@
 
     if-le v6, v2, :cond_2
 
+    const/4 v5, 0x0
+
     goto :goto_1
 
     :cond_2
@@ -2874,13 +2962,12 @@
     :cond_3
     const/4 v5, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
-    :goto_1
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_1
     if-eqz v5, :cond_6
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->capacity:I
@@ -2893,7 +2980,7 @@
 
     invoke-direct {p0, p1, v1}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeAscii_slow(Ljava/lang/String;I)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     invoke-virtual {p1}, Ljava/lang/String;->getBytes()[B
@@ -2912,7 +2999,7 @@
 
     iput p1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
-    :goto_3
+    :goto_2
     iget-object p1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     iget v1, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
@@ -2952,7 +3039,7 @@
 
     iget v0, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
-    :goto_4
+    :goto_3
     if-ge v3, v1, :cond_7
 
     invoke-virtual {p1, v3}, Ljava/lang/String;->charAt(I)C
@@ -2973,7 +3060,7 @@
 
     move v0, v6
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     iput v0, p0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
@@ -3219,50 +3306,50 @@
 
     move-object/from16 v0, p0
 
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     if-nez p3, :cond_0
 
-    shl-long v4, p1, v3
+    shl-long v2, p1, v1
 
-    const/16 v6, 0x3f
+    const/16 v4, 0x3f
 
-    shr-long v1, p1, v6
+    shr-long v4, p1, v4
 
-    xor-long/2addr v1, v4
+    xor-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_0
-    move-wide/from16 v1, p1
+    move-wide/from16 v2, p1
 
     :goto_0
     const-wide/16 v4, 0x7f
 
-    and-long v6, v1, v4
+    and-long v6, v2, v4
 
     long-to-int v6, v6
 
     const/4 v7, 0x7
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const-wide/16 v8, 0x0
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_1
 
     invoke-virtual {v0, v6}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeByte(I)V
 
-    return v3
+    return v1
 
     :cond_1
     or-int/lit16 v6, v6, 0x80
 
     int-to-long v10, v6
 
-    and-long v12, v1, v4
+    and-long v12, v2, v4
 
     const/16 v6, 0x8
 
@@ -3272,11 +3359,11 @@
 
     long-to-int v10, v10
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const/4 v11, 0x2
 
-    cmp-long v12, v1, v8
+    cmp-long v12, v2, v8
 
     if-nez v12, :cond_2
 
@@ -3315,7 +3402,7 @@
 
     int-to-long v12, v10
 
-    and-long v14, v1, v4
+    and-long v14, v2, v4
 
     const/16 v10, 0x10
 
@@ -3325,33 +3412,33 @@
 
     long-to-int v10, v12
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const/4 v12, 0x3
 
-    cmp-long v13, v1, v8
+    cmp-long v13, v2, v8
 
     if-nez v13, :cond_3
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    sget-object v2, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
+    sget-object v3, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, v10}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeInt(I)V
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->byteOrder:Ljava/nio/ByteOrder;
+    iget-object v3, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->byteOrder:Ljava/nio/ByteOrder;
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
 
-    iget v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v2, v1
 
-    iput v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
@@ -3368,7 +3455,7 @@
 
     int-to-long v13, v10
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x18
 
@@ -3378,9 +3465,9 @@
 
     long-to-int v10, v13
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v13, v1, v8
+    cmp-long v13, v2, v8
 
     if-nez v13, :cond_4
 
@@ -3419,7 +3506,7 @@
 
     and-long/2addr v13, v15
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x20
 
@@ -3427,9 +3514,9 @@
 
     or-long/2addr v13, v15
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_5
 
@@ -3468,7 +3555,7 @@
 
     or-long/2addr v13, v15
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x28
 
@@ -3476,9 +3563,9 @@
 
     or-long/2addr v13, v15
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_6
 
@@ -3517,7 +3604,7 @@
 
     or-long/2addr v10, v13
 
-    and-long v12, v1, v4
+    and-long v12, v2, v4
 
     const/16 v14, 0x30
 
@@ -3525,31 +3612,31 @@
 
     or-long/2addr v10, v12
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v12, v1, v8
+    cmp-long v12, v2, v8
 
     if-nez v12, :cond_7
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    sget-object v2, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
+    sget-object v3, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, v10, v11}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeLong(J)V
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
-    iget-object v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->byteOrder:Ljava/nio/ByteOrder;
+    iget-object v3, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->byteOrder:Ljava/nio/ByteOrder;
 
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
+    invoke-virtual {v2, v3}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
 
-    iget v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v2, v1
 
-    iput v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->position:I
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
@@ -3564,19 +3651,19 @@
 
     or-long/2addr v10, v12
 
-    and-long/2addr v4, v1
+    and-long/2addr v4, v2
 
-    const/16 v3, 0x38
+    const/16 v1, 0x38
 
-    shl-long v3, v4, v3
+    shl-long/2addr v4, v1
 
-    or-long/2addr v3, v10
+    or-long/2addr v4, v10
 
-    ushr-long/2addr v1, v7
+    ushr-long v1, v2, v7
 
-    cmp-long v5, v1, v8
+    cmp-long v3, v1, v8
 
-    if-nez v5, :cond_8
+    if-nez v3, :cond_8
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
@@ -3584,7 +3671,7 @@
 
     invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
 
-    invoke-virtual {v0, v3, v4}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeLong(J)V
+    invoke-virtual {v0, v4, v5}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeLong(J)V
 
     iget-object v1, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
@@ -3595,17 +3682,17 @@
     return v6
 
     :cond_8
-    const-wide/high16 v5, -0x8000000000000000L
+    const-wide/high16 v6, -0x8000000000000000L
 
-    or-long/2addr v3, v5
+    or-long/2addr v4, v6
 
-    iget-object v5, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
+    iget-object v3, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
     sget-object v6, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
 
-    invoke-virtual {v5, v6}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
+    invoke-virtual {v3, v6}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
 
-    invoke-virtual {v0, v3, v4}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeLong(J)V
+    invoke-virtual {v0, v4, v5}, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->writeLong(J)V
 
     iget-object v3, v0, Lcom/esotericsoftware/kryo/io/ByteBufferOutput;->niobuffer:Ljava/nio/ByteBuffer;
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali
index f43c8b2e3d..9762e91338 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/ByteBufferOutputStream;
 .super Ljava/io/OutputStream;
+.source "ByteBufferOutputStream.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/FastInput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/FastInput.smali
index c99870ef04..e20c83c2b3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/FastInput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/FastInput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/io/FastInput;
 .super Lcom/esotericsoftware/kryo/io/Input;
+.source "FastInput.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/FastOutput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/FastOutput.smali
index 852f85adf4..6aaedca023 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/FastOutput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/FastOutput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/io/FastOutput;
 .super Lcom/esotericsoftware/kryo/io/Output;
+.source "FastOutput.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/Input.smali b/com.discord/smali/com/esotericsoftware/kryo/io/Input.smali
index 73dad128a4..e38bd39b41 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/Input.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/Input.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/Input;
 .super Ljava/io/InputStream;
+.source "Input.java"
 
 
 # instance fields
@@ -134,7 +135,7 @@
 .end method
 
 .method private optional(I)I
-    .locals 8
+    .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lcom/esotericsoftware/kryo/KryoException;
@@ -164,9 +165,7 @@
 
     iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->capacity:I
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
-    sub-int/2addr v3, v4
+    sub-int/2addr v3, v2
 
     invoke-virtual {p0, v1, v2, v3}, Lcom/esotericsoftware/kryo/io/Input;->fill([BII)I
 
@@ -205,23 +204,21 @@
 
     iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    iget-object v4, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    invoke-static {v1, v3, v1, v4, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    invoke-static {v1, v3, v4, v5, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget-wide v3, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
+    iget-wide v5, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
 
     iget v1, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    int-to-long v6, v1
+    int-to-long v7, v1
 
-    add-long/2addr v3, v6
+    add-long/2addr v5, v7
 
-    iput-wide v3, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
+    iput-wide v5, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
 
-    iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iput v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
     :cond_4
     iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
@@ -1183,8 +1180,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Input;->inputStream:Ljava/io/InputStream;
-
     invoke-virtual {v1}, Ljava/io/InputStream;->available()I
 
     move-result v1
@@ -1201,7 +1196,7 @@
 .end method
 
 .method public canReadInt()Z
-    .locals 5
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lcom/esotericsoftware/kryo/KryoException;
@@ -1256,62 +1251,50 @@
     return v1
 
     :cond_3
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v5, v4, 0x1
 
-    add-int/lit8 v3, v4, 0x1
+    aget-byte v4, v3, v4
 
-    aget-byte v0, v0, v4
+    and-int/lit16 v4, v4, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_4
+    if-nez v4, :cond_4
 
     return v2
 
     :cond_4
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
-    if-ne v3, v0, :cond_5
+    if-ne v5, v0, :cond_5
 
     return v1
 
     :cond_5
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v4, v5, 0x1
 
-    add-int/lit8 v4, v3, 0x1
+    aget-byte v5, v3, v5
 
-    aget-byte v0, v0, v3
+    and-int/lit16 v5, v5, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_6
+    if-nez v5, :cond_6
 
     return v2
 
     :cond_6
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
     if-ne v4, v0, :cond_7
 
     return v1
 
     :cond_7
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v5, v4, 0x1
 
-    add-int/lit8 v3, v4, 0x1
+    aget-byte v3, v3, v4
 
-    aget-byte v0, v0, v4
+    and-int/lit16 v3, v3, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_8
+    if-nez v3, :cond_8
 
     return v2
 
     :cond_8
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
-    if-ne v3, v0, :cond_9
+    if-ne v5, v0, :cond_9
 
     return v1
 
@@ -1320,7 +1303,7 @@
 .end method
 
 .method public canReadLong()Z
-    .locals 5
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lcom/esotericsoftware/kryo/KryoException;
@@ -1377,142 +1360,114 @@
     return v2
 
     :cond_3
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v5, v4, 0x1
 
-    add-int/lit8 v3, v4, 0x1
+    aget-byte v4, v3, v4
 
-    aget-byte v0, v0, v4
+    and-int/lit16 v4, v4, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_4
+    if-nez v4, :cond_4
 
     return v1
 
     :cond_4
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
-    if-ne v3, v0, :cond_5
+    if-ne v5, v0, :cond_5
 
     return v2
 
     :cond_5
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v4, v5, 0x1
 
-    add-int/lit8 v4, v3, 0x1
+    aget-byte v5, v3, v5
 
-    aget-byte v0, v0, v3
+    and-int/lit16 v5, v5, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_6
+    if-nez v5, :cond_6
 
     return v1
 
     :cond_6
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
     if-ne v4, v0, :cond_7
 
     return v2
 
     :cond_7
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v5, v4, 0x1
 
-    add-int/lit8 v3, v4, 0x1
+    aget-byte v4, v3, v4
 
-    aget-byte v0, v0, v4
+    and-int/lit16 v4, v4, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_8
+    if-nez v4, :cond_8
 
     return v1
 
     :cond_8
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
-    if-ne v3, v0, :cond_9
+    if-ne v5, v0, :cond_9
 
     return v2
 
     :cond_9
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v4, v5, 0x1
 
-    add-int/lit8 v4, v3, 0x1
+    aget-byte v5, v3, v5
 
-    aget-byte v0, v0, v3
+    and-int/lit16 v5, v5, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_a
+    if-nez v5, :cond_a
 
     return v1
 
     :cond_a
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
     if-ne v4, v0, :cond_b
 
     return v2
 
     :cond_b
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v5, v4, 0x1
 
-    add-int/lit8 v3, v4, 0x1
+    aget-byte v4, v3, v4
 
-    aget-byte v0, v0, v4
+    and-int/lit16 v4, v4, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_c
+    if-nez v4, :cond_c
 
     return v1
 
     :cond_c
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
-    if-ne v3, v0, :cond_d
+    if-ne v5, v0, :cond_d
 
     return v2
 
     :cond_d
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v4, v5, 0x1
 
-    add-int/lit8 v4, v3, 0x1
+    aget-byte v5, v3, v5
 
-    aget-byte v0, v0, v3
+    and-int/lit16 v5, v5, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_e
+    if-nez v5, :cond_e
 
     return v1
 
     :cond_e
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
     if-ne v4, v0, :cond_f
 
     return v2
 
     :cond_f
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    add-int/lit8 v5, v4, 0x1
 
-    add-int/lit8 v3, v4, 0x1
+    aget-byte v3, v3, v4
 
-    aget-byte v0, v0, v4
+    and-int/lit16 v3, v3, 0x80
 
-    and-int/lit16 v0, v0, 0x80
-
-    if-nez v0, :cond_10
+    if-nez v3, :cond_10
 
     return v1
 
     :cond_10
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
-
-    if-ne v3, v0, :cond_11
+    if-ne v5, v0, :cond_11
 
     return v2
 
@@ -1533,12 +1488,12 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->inputStream:Ljava/io/InputStream;
-
     invoke-virtual {v0}, Ljava/io/InputStream;->close()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -1581,8 +1536,6 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->inputStream:Ljava/io/InputStream;
-
     invoke-virtual {v0, p1, p2, p3}, Ljava/io/InputStream;->read([BII)I
 
     move-result p1
@@ -1761,6 +1714,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public readBoolean()Z
@@ -1924,6 +1879,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public readBytes(I)[B
@@ -1963,13 +1920,11 @@
 
     iput v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v0, v0, v1
+    aget-byte v1, v0, v1
 
-    and-int/lit16 v0, v0, 0xff
+    and-int/lit16 v1, v1, 0xff
 
-    shl-int/lit8 v0, v0, 0x8
-
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    shl-int/lit8 v1, v1, 0x8
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
@@ -1977,9 +1932,9 @@
 
     iput v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v1, v1, v2
+    aget-byte v0, v0, v2
 
-    and-int/lit16 v1, v1, 0xff
+    and-int/lit16 v0, v0, 0xff
 
     or-int/2addr v0, v1
 
@@ -2525,13 +2480,11 @@
 
     iput v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v0, v0, v1
+    aget-byte v1, v0, v1
 
-    and-int/lit16 v0, v0, 0xff
+    and-int/lit16 v1, v1, 0xff
 
-    shl-int/lit8 v0, v0, 0x8
-
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    shl-int/lit8 v1, v1, 0x8
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
@@ -2539,9 +2492,9 @@
 
     iput v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v1, v1, v2
+    aget-byte v0, v0, v2
 
-    and-int/lit16 v1, v1, 0xff
+    and-int/lit16 v0, v0, 0xff
 
     or-int/2addr v0, v1
 
@@ -2570,13 +2523,11 @@
 
     iput v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v0, v0, v1
+    aget-byte v1, v0, v1
 
-    and-int/lit16 v0, v0, 0xff
+    and-int/lit16 v1, v1, 0xff
 
-    shl-int/lit8 v0, v0, 0x8
-
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    shl-int/lit8 v1, v1, 0x8
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
@@ -2584,9 +2535,9 @@
 
     iput v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v1, v1, v2
+    aget-byte v0, v0, v2
 
-    and-int/lit16 v1, v1, 0xff
+    and-int/lit16 v0, v0, 0xff
 
     or-int/2addr v0, v1
 
@@ -2853,93 +2804,91 @@
 
     iput v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v1, v1, v2
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v2, v1, 0x7f
+    and-int/lit8 v3, v2, 0x7f
 
-    and-int/lit16 v1, v1, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v1, :cond_1
+    if-eqz v2, :cond_1
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
-
-    add-int/lit8 v4, v3, 0x1
+    add-int/lit8 v4, v2, 0x1
 
     iput v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v3, v1, v3
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v4, v3, 0x7f
+    and-int/lit8 v4, v2, 0x7f
 
     shl-int/lit8 v4, v4, 0x7
 
-    or-int/2addr v2, v4
+    or-int/2addr v3, v4
 
-    and-int/lit16 v3, v3, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v4, v3, 0x1
+    add-int/lit8 v4, v2, 0x1
 
     iput v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v3, v1, v3
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v4, v3, 0x7f
+    and-int/lit8 v4, v2, 0x7f
 
     shl-int/lit8 v4, v4, 0xe
 
-    or-int/2addr v2, v4
+    or-int/2addr v3, v4
 
-    and-int/lit16 v3, v3, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v4, v3, 0x1
+    add-int/lit8 v4, v2, 0x1
 
     iput v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v3, v1, v3
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v4, v3, 0x7f
+    and-int/lit8 v4, v2, 0x7f
 
     shl-int/lit8 v4, v4, 0x15
 
-    or-int/2addr v2, v4
+    or-int/2addr v3, v4
 
-    and-int/lit16 v3, v3, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v4, v3, 0x1
+    add-int/lit8 v4, v2, 0x1
 
     iput v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v1, v1, v3
+    aget-byte v1, v1, v2
 
     and-int/lit8 v1, v1, 0x7f
 
     shl-int/lit8 v1, v1, 0x1c
 
-    or-int/2addr v2, v1
+    or-int/2addr v3, v1
 
     :cond_1
     if-eqz p1, :cond_2
 
-    return v2
+    return v3
 
     :cond_2
-    ushr-int/lit8 p1, v2, 0x1
+    ushr-int/lit8 p1, v3, 0x1
 
-    and-int/2addr v0, v2
+    and-int/2addr v0, v3
 
     neg-int v0, v0
 
@@ -2981,87 +2930,85 @@
 
     iput v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v1, v1, v2
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v2, v1, 0x7f
+    and-int/lit8 v3, v2, 0x7f
 
-    int-to-long v2, v2
+    int-to-long v3, v3
 
-    and-int/lit16 v1, v1, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v1, :cond_1
+    if-eqz v2, :cond_1
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
-
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v4, v1, v4
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v5, v4, 0x7f
+    and-int/lit8 v5, v2, 0x7f
 
     shl-int/lit8 v5, v5, 0x7
 
     int-to-long v5, v5
 
-    or-long/2addr v2, v5
+    or-long/2addr v3, v5
 
-    and-int/lit16 v4, v4, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v4, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v4, v1, v4
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v5, v4, 0x7f
+    and-int/lit8 v5, v2, 0x7f
 
     shl-int/lit8 v5, v5, 0xe
 
     int-to-long v5, v5
 
-    or-long/2addr v2, v5
+    or-long/2addr v3, v5
 
-    and-int/lit16 v4, v4, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v4, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v4, v1, v4
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v5, v4, 0x7f
+    and-int/lit8 v5, v2, 0x7f
 
     shl-int/lit8 v5, v5, 0x15
 
     int-to-long v5, v5
 
-    or-long/2addr v2, v5
+    or-long/2addr v3, v5
 
-    and-int/lit16 v4, v4, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v4, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v4, v1, v4
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v5, v4, 0x7f
+    and-int/lit8 v5, v2, 0x7f
 
     int-to-long v5, v5
 
@@ -3069,21 +3016,21 @@
 
     shl-long/2addr v5, v7
 
-    or-long/2addr v2, v5
+    or-long/2addr v3, v5
 
-    and-int/lit16 v4, v4, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v4, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v4, v1, v4
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v5, v4, 0x7f
+    and-int/lit8 v5, v2, 0x7f
 
     int-to-long v5, v5
 
@@ -3091,21 +3038,21 @@
 
     shl-long/2addr v5, v7
 
-    or-long/2addr v2, v5
+    or-long/2addr v3, v5
 
-    and-int/lit16 v4, v4, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v4, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v4, v1, v4
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v5, v4, 0x7f
+    and-int/lit8 v5, v2, 0x7f
 
     int-to-long v5, v5
 
@@ -3113,21 +3060,21 @@
 
     shl-long/2addr v5, v7
 
-    or-long/2addr v2, v5
+    or-long/2addr v3, v5
 
-    and-int/lit16 v4, v4, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v4, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v4, v1, v4
+    aget-byte v2, v1, v2
 
-    and-int/lit8 v5, v4, 0x7f
+    and-int/lit8 v5, v2, 0x7f
 
     int-to-long v5, v5
 
@@ -3135,47 +3082,52 @@
 
     shl-long/2addr v5, v7
 
-    or-long/2addr v2, v5
+    or-long/2addr v3, v5
 
-    and-int/lit16 v4, v4, 0x80
+    and-int/lit16 v2, v2, 0x80
 
-    if-eqz v4, :cond_1
+    if-eqz v2, :cond_1
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, v2, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    aget-byte v1, v1, v4
+    aget-byte v1, v1, v2
 
-    int-to-long v4, v1
+    int-to-long v1, v1
 
-    const/16 v1, 0x38
+    const/16 v5, 0x38
 
-    shl-long/2addr v4, v1
+    shl-long/2addr v1, v5
 
-    or-long/2addr v2, v4
+    or-long/2addr v3, v1
 
     :cond_1
     if-nez p1, :cond_2
 
-    ushr-long v0, v2, v0
+    ushr-long v0, v3, v0
 
-    const-wide/16 v4, 0x1
+    const-wide/16 v5, 0x1
 
-    and-long/2addr v2, v4
+    and-long/2addr v3, v5
 
-    neg-long v2, v2
+    neg-long v2, v3
 
-    xor-long/2addr v2, v0
+    xor-long/2addr v0, v2
+
+    goto :goto_0
 
     :cond_2
-    return-wide v2
+    move-wide v0, v3
+
+    :goto_0
+    return-wide v0
 .end method
 
 .method protected require(I)I
-    .locals 8
+    .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lcom/esotericsoftware/kryo/KryoException;
@@ -3186,48 +3138,42 @@
 
     iget v1, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    sub-int/2addr v0, v1
+    sub-int v1, v0, v1
 
-    if-lt v0, p1, :cond_0
+    if-lt v1, p1, :cond_0
 
-    return v0
+    return v1
 
     :cond_0
-    iget v1, p0, Lcom/esotericsoftware/kryo/io/Input;->capacity:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->capacity:I
 
-    if-gt p1, v1, :cond_6
+    if-gt p1, v2, :cond_6
 
-    const/4 v1, -0x1
+    const/4 v3, -0x1
 
-    if-lez v0, :cond_2
+    if-lez v1, :cond_2
 
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    iget-object v4, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
+    sub-int/2addr v2, v0
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->capacity:I
+    invoke-virtual {p0, v4, v0, v2}, Lcom/esotericsoftware/kryo/io/Input;->fill([BII)I
 
-    iget v5, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
+    move-result v0
 
-    sub-int/2addr v4, v5
+    if-eq v0, v3, :cond_1
 
-    invoke-virtual {p0, v2, v3, v4}, Lcom/esotericsoftware/kryo/io/Input;->fill([BII)I
+    add-int/2addr v1, v0
 
-    move-result v2
-
-    if-eq v2, v1, :cond_1
-
-    add-int/2addr v0, v2
-
-    if-lt v0, p1, :cond_2
+    if-lt v1, p1, :cond_2
 
     iget p1, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
 
-    add-int/2addr p1, v2
+    add-int/2addr p1, v0
 
     iput p1, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
 
-    return v0
+    return v1
 
     :cond_1
     new-instance p1, Lcom/esotericsoftware/kryo/KryoException;
@@ -3239,42 +3185,40 @@
     throw p1
 
     :cond_2
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    iget-object v4, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    invoke-static {v0, v2, v0, v4, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    invoke-static {v2, v3, v4, v5, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    iget-wide v5, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
 
-    iget-wide v2, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
+    iget v0, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    int-to-long v7, v0
 
-    int-to-long v6, v4
+    add-long/2addr v5, v7
 
-    add-long/2addr v2, v6
+    iput-wide v5, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
 
-    iput-wide v2, p0, Lcom/esotericsoftware/kryo/io/Input;->total:J
-
-    iput v5, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
+    iput v4, p0, Lcom/esotericsoftware/kryo/io/Input;->position:I
 
     :cond_3
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
+    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Input;->buffer:[B
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Input;->capacity:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Input;->capacity:I
 
-    sub-int/2addr v3, v0
+    sub-int/2addr v2, v1
 
-    invoke-virtual {p0, v2, v0, v3}, Lcom/esotericsoftware/kryo/io/Input;->fill([BII)I
+    invoke-virtual {p0, v0, v1, v2}, Lcom/esotericsoftware/kryo/io/Input;->fill([BII)I
 
-    move-result v2
+    move-result v0
 
-    if-ne v2, v1, :cond_5
+    if-ne v0, v3, :cond_5
 
-    if-lt v0, p1, :cond_4
+    if-lt v1, p1, :cond_4
 
     goto :goto_0
 
@@ -3288,14 +3232,14 @@
     throw p1
 
     :cond_5
-    add-int/2addr v0, v2
+    add-int/2addr v1, v0
 
-    if-lt v0, p1, :cond_3
+    if-lt v1, p1, :cond_3
 
     :goto_0
-    iput v0, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
+    iput v1, p0, Lcom/esotericsoftware/kryo/io/Input;->limit:I
 
-    return v0
+    return v1
 
     :cond_6
     new-instance v0, Lcom/esotericsoftware/kryo/KryoException;
@@ -3323,6 +3267,8 @@
     invoke-direct {v0, p1}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public rewind()V
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/InputChunked.smali b/com.discord/smali/com/esotericsoftware/kryo/io/InputChunked.smali
index 9baed53ea4..47aa8c37b2 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/InputChunked.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/InputChunked.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/InputChunked;
 .super Lcom/esotericsoftware/kryo/io/Input;
+.source "InputChunked.java"
 
 
 # instance fields
@@ -154,6 +155,8 @@
     invoke-direct {v1, v0}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/Throwable;)V
 
     throw v1
+
+    return-void
 .end method
 
 
@@ -177,8 +180,6 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/InputChunked;->chunkSize:I
-
     if-nez v0, :cond_1
 
     return v1
@@ -228,8 +229,6 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/InputChunked;->chunkSize:I
-
     invoke-virtual {p0, v0}, Lcom/esotericsoftware/kryo/io/InputChunked;->skip(I)V
 
     goto :goto_0
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataInput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataInput.smali
index c6c7bfab5f..33c71126e4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataInput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataInput.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/KryoDataInput;
 .super Ljava/lang/Object;
+.source "KryoDataInput.java"
 
 # interfaces
 .implements Ljava/io/DataInput;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataOutput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataOutput.smali
index e625baf55a..6b6ce17621 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataOutput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataOutput.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/KryoDataOutput;
 .super Ljava/lang/Object;
+.source "KryoDataOutput.java"
 
 # interfaces
 .implements Ljava/io/DataOutput;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectInput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectInput.smali
index 0f99c318d1..c53a83f1f4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectInput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectInput.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/KryoObjectInput;
 .super Lcom/esotericsoftware/kryo/io/KryoDataInput;
+.source "KryoObjectInput.java"
 
 # interfaces
 .implements Ljava/io/ObjectInput;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectOutput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectOutput.smali
index 9e07ea7f36..869da032db 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectOutput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectOutput.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/KryoObjectOutput;
 .super Lcom/esotericsoftware/kryo/io/KryoDataOutput;
+.source "KryoObjectOutput.java"
 
 # interfaces
 .implements Ljava/io/ObjectOutput;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/Output.smali b/com.discord/smali/com/esotericsoftware/kryo/io/Output.smali
index 2bd3a2cfe4..72fa575b70 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/Output.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/Output.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/Output;
 .super Ljava/io/OutputStream;
+.source "Output.java"
 
 
 # instance fields
@@ -447,11 +448,9 @@
 
     if-ne v0, v1, :cond_0
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Output;->capacity:I
+    sub-int v0, p2, p3
 
-    sub-int v1, p2, p3
-
-    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
+    invoke-static {v1, v0}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
@@ -525,8 +524,6 @@
 
     aput-byte v3, v1, v2
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v3, v2, 0x1
@@ -866,12 +863,12 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Output;->outputStream:Ljava/io/OutputStream;
-
     invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -893,8 +890,6 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Output;->outputStream:Ljava/io/OutputStream;
-
     iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
@@ -989,23 +984,19 @@
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    sub-int/2addr v0, v2
+    sub-int v2, v0, v2
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    if-ge v0, p1, :cond_4
+    if-ge v2, p1, :cond_4
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Output;->capacity:I
+    iget v2, p0, Lcom/esotericsoftware/kryo/io/Output;->maxCapacity:I
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Output;->maxCapacity:I
-
-    if-eq v0, v3, :cond_3
-
-    iget v0, p0, Lcom/esotericsoftware/kryo/io/Output;->capacity:I
+    if-eq v0, v2, :cond_3
 
     if-nez v0, :cond_1
 
-    iput v2, p0, Lcom/esotericsoftware/kryo/io/Output;->capacity:I
+    iput v3, p0, Lcom/esotericsoftware/kryo/io/Output;->capacity:I
 
     :cond_1
     iget v0, p0, Lcom/esotericsoftware/kryo/io/Output;->capacity:I
@@ -1075,7 +1066,7 @@
     throw v0
 
     :cond_4
-    return v2
+    return v3
 
     :cond_5
     new-instance v0, Lcom/esotericsoftware/kryo/KryoException;
@@ -1103,6 +1094,8 @@
     invoke-direct {v0, p1}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public setBuffer([B)V
@@ -1244,17 +1237,15 @@
 
     iget v0, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    new-array v0, v0, [B
+    new-array v1, v0, [B
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iget-object v2, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v3, v1, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    return-object v0
+    return-object v1
 .end method
 
 .method public total()J
@@ -1406,8 +1397,6 @@
     :cond_1
     iget-object v3, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
     invoke-virtual {p1, v2, v1, v3, v4}, Ljava/lang/String;->getBytes(II[BI)V
 
     iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
@@ -1630,6 +1619,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public writeChar(C)V
@@ -1658,8 +1649,6 @@
 
     aput-byte v2, v0, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v2, v1, 0x1
@@ -2192,8 +2181,6 @@
 
     aput-byte v2, v0, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v2, v1, 0x1
@@ -2246,7 +2233,6 @@
 
     const/16 p1, 0x80
 
-    :goto_0
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/io/Output;->writeByte(I)V
 
     return-void
@@ -2260,7 +2246,9 @@
 
     const/16 p1, 0x81
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/io/Output;->writeByte(I)V
+
+    return-void
 
     :cond_1
     add-int/lit8 v1, v0, 0x1
@@ -2279,9 +2267,7 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    :goto_1
+    :goto_0
     if-ge v1, v0, :cond_2
 
     invoke-interface {p1, v1}, Ljava/lang/CharSequence;->charAt(I)C
@@ -2302,7 +2288,7 @@
 
     move v3, v5
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iput v3, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
@@ -2369,6 +2355,8 @@
 
     if-le v6, v2, :cond_2
 
+    const/4 v5, 0x0
+
     goto :goto_1
 
     :cond_2
@@ -2379,13 +2367,12 @@
     :cond_3
     const/4 v5, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
-    :goto_1
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_1
     if-eqz v5, :cond_6
 
     iget v2, p0, Lcom/esotericsoftware/kryo/io/Output;->capacity:I
@@ -2398,13 +2385,11 @@
 
     invoke-direct {p0, p1, v1}, Lcom/esotericsoftware/kryo/io/Output;->writeAscii_slow(Ljava/lang/String;I)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     iget-object v2, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
-    iget v5, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
     invoke-virtual {p1, v3, v1, v2, v5}, Ljava/lang/String;->getBytes(II[BI)V
 
     iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
@@ -2413,7 +2398,7 @@
 
     iput p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    :goto_3
+    :goto_2
     iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
     iget v1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
@@ -2445,9 +2430,7 @@
 
     iget-object v0, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    :goto_4
+    :goto_3
     if-ge v3, v1, :cond_7
 
     invoke-virtual {p1, v3}, Ljava/lang/String;->charAt(I)C
@@ -2466,7 +2449,7 @@
 
     move v4, v6
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     iput v4, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
@@ -2544,17 +2527,15 @@
 
     aput-byte p1, v1, v2
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, p1, 0x1
 
     iput v2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     int-to-byte p2, p2
 
-    aput-byte p2, p1, v1
+    aput-byte p2, v1, p1
 
     return v0
 
@@ -2583,11 +2564,9 @@
 
     aput-byte p1, v2, v3
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget v2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v3, p1, 0x1
 
     iput v3, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -2595,19 +2574,17 @@
 
     int-to-byte p2, p2
 
-    aput-byte p2, p1, v2
+    aput-byte p2, v2, p1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    add-int/lit8 p2, p1, 0x1
 
-    add-int/lit8 v2, p2, 0x1
+    iput p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iput v2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    int-to-byte p2, v0
 
-    int-to-byte v0, v0
-
-    aput-byte v0, p1, p2
+    aput-byte p2, v2, p1
 
     return v1
 
@@ -2636,11 +2613,9 @@
 
     aput-byte p1, v3, v4
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget v3, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v4, v3, 0x1
+    add-int/lit8 v4, p1, 0x1
 
     iput v4, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -2648,33 +2623,29 @@
 
     int-to-byte p2, p2
 
-    aput-byte p2, p1, v3
+    aput-byte p2, v3, p1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    add-int/lit8 p2, p1, 0x1
 
-    add-int/lit8 v3, p2, 0x1
+    iput p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iput v3, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    or-int/lit16 p2, v0, 0x80
 
-    or-int/lit16 v0, v0, 0x80
+    int-to-byte p2, p2
 
-    int-to-byte v0, v0
+    aput-byte p2, v3, p1
 
-    aput-byte v0, p1, p2
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    add-int/lit8 p2, p1, 0x1
 
-    iget p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v0, p2, 0x1
+    int-to-byte p2, v1
 
-    iput v0, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    int-to-byte v0, v1
-
-    aput-byte v0, p1, p2
+    aput-byte p2, v3, p1
 
     return v2
 
@@ -2699,11 +2670,9 @@
 
     aput-byte p1, v4, v5
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget v4, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v5, v4, 0x1
+    add-int/lit8 v5, p1, 0x1
 
     iput v5, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -2711,53 +2680,47 @@
 
     int-to-byte p2, p2
 
-    aput-byte p2, p1, v4
+    aput-byte p2, v4, p1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    add-int/lit8 p2, p1, 0x1
 
-    add-int/lit8 v4, p2, 0x1
+    iput p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iput v4, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    or-int/lit16 p2, v0, 0x80
 
-    or-int/lit16 v0, v0, 0x80
+    int-to-byte p2, p2
 
-    int-to-byte v0, v0
+    aput-byte p2, v4, p1
 
-    aput-byte v0, p1, p2
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    add-int/lit8 p2, p1, 0x1
 
-    iget p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v0, p2, 0x1
+    or-int/lit16 p2, v1, 0x80
 
-    iput v0, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    int-to-byte p2, p2
 
-    or-int/lit16 v0, v1, 0x80
+    aput-byte p2, v4, p1
 
-    int-to-byte v0, v0
+    iget p1, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    aput-byte v0, p1, p2
+    add-int/lit8 p2, p1, 0x1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iput p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    iget p2, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    int-to-byte p2, v2
 
-    add-int/lit8 v0, p2, 0x1
-
-    iput v0, p0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    int-to-byte v0, v2
-
-    aput-byte v0, p1, p2
+    aput-byte p2, v4, p1
 
     return v3
 .end method
 
 .method public writeVarLong(JZ)I
-    .locals 30
+    .locals 24
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lcom/esotericsoftware/kryo/KryoException;
@@ -2766,27 +2729,27 @@
 
     move-object/from16 v0, p0
 
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     if-nez p3, :cond_0
 
-    shl-long v4, p1, v3
+    shl-long v2, p1, v1
 
-    const/16 v6, 0x3f
+    const/16 v4, 0x3f
 
-    shr-long v1, p1, v6
+    shr-long v4, p1, v4
 
-    xor-long/2addr v1, v4
+    xor-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_0
-    move-wide/from16 v1, p1
+    move-wide/from16 v2, p1
 
     :goto_0
     const/4 v4, 0x7
 
-    ushr-long v5, v1, v4
+    ushr-long v5, v2, v4
 
     const-wide/16 v7, 0x0
 
@@ -2794,7 +2757,7 @@
 
     if-nez v9, :cond_1
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
     iget-object v4, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
@@ -2804,30 +2767,30 @@
 
     iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v4, v5
+    aput-byte v2, v4, v5
 
-    return v3
+    return v1
 
     :cond_1
-    const/16 v3, 0xe
+    const/16 v1, 0xe
 
-    ushr-long v9, v1, v3
+    ushr-long v9, v2, v1
 
     const-wide/16 v11, 0x7f
 
     const-wide/16 v13, 0x80
 
-    cmp-long v3, v9, v7
+    cmp-long v1, v9, v7
 
-    if-nez v3, :cond_2
+    if-nez v1, :cond_2
 
-    const/4 v3, 0x2
+    const/4 v1, 0x2
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
     iget-object v4, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
@@ -2837,46 +2800,44 @@
 
     iput v8, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
-    or-long/2addr v1, v13
+    or-long/2addr v2, v13
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v4, v7
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v2, v4, v7
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v4, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    long-to-int v4, v5
+    long-to-int v3, v5
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
+    aput-byte v3, v4, v2
 
-    return v3
+    return v1
 
     :cond_2
-    const/16 v3, 0x15
+    const/16 v1, 0x15
 
-    move-wide/from16 v16, v5
+    move-wide/from16 p2, v5
 
-    ushr-long v4, v1, v3
+    ushr-long v4, v2, v1
 
-    cmp-long v3, v4, v7
+    cmp-long v1, v4, v7
 
-    if-nez v3, :cond_3
+    if-nez v1, :cond_3
 
-    const/4 v3, 0x3
+    const/4 v1, 0x3
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
     iget-object v4, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
@@ -2886,60 +2847,56 @@
 
     iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
-    or-long/2addr v1, v13
+    or-long/2addr v2, v13
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v4, v5
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v2, v4, v5
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v4, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v4, v16, v13
+    or-long v5, p2, v13
 
-    long-to-int v4, v4
+    long-to-int v3, v5
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v4, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v4, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    long-to-int v4, v9
+    long-to-int v3, v9
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
+    aput-byte v3, v4, v2
 
-    return v3
+    return v1
 
     :cond_3
-    const/16 v3, 0x1c
+    const/16 v1, 0x1c
 
-    ushr-long v13, v1, v3
+    ushr-long v13, v2, v1
 
-    cmp-long v3, v13, v7
+    cmp-long v1, v13, v7
 
-    if-nez v3, :cond_4
+    if-nez v1, :cond_4
 
-    const/4 v3, 0x4
+    const/4 v1, 0x4
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
     iget-object v6, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
@@ -2949,78 +2906,72 @@
 
     iput v8, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
     const-wide/16 v11, 0x80
 
-    or-long/2addr v1, v11
+    or-long/2addr v2, v11
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v6, v7
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v2, v6, v7
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v16, v11
+    or-long v7, p2, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v9, v11
+    or-long v7, v9, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    long-to-int v4, v4
+    long-to-int v3, v4
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
+    aput-byte v3, v6, v2
 
-    return v3
+    return v1
 
     :cond_4
-    const/16 v3, 0x23
+    const/16 v1, 0x23
 
-    ushr-long v11, v1, v3
+    ushr-long v11, v2, v1
 
-    cmp-long v3, v11, v7
+    cmp-long v1, v11, v7
 
-    if-nez v3, :cond_5
+    if-nez v1, :cond_5
 
-    const/4 v3, 0x5
+    const/4 v1, 0x5
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
     iget-object v6, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
@@ -3032,96 +2983,88 @@
 
     const-wide/16 v11, 0x7f
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
     const-wide/16 v11, 0x80
 
-    or-long/2addr v1, v11
+    or-long/2addr v2, v11
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v6, v7
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v2, v6, v7
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v16, v11
+    or-long v7, p2, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v9, v11
+    or-long v7, v9, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     or-long/2addr v4, v11
 
-    long-to-int v4, v4
+    long-to-int v3, v4
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v4, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    long-to-int v4, v13
+    long-to-int v3, v13
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
+    aput-byte v3, v6, v2
 
-    return v3
+    return v1
 
     :cond_5
-    const/16 v3, 0x2a
+    const/16 v1, 0x2a
 
-    move-wide/from16 v22, v11
+    move-wide/from16 v18, v11
 
-    ushr-long v11, v1, v3
+    ushr-long v11, v2, v1
 
-    cmp-long v3, v11, v7
+    cmp-long v1, v11, v7
 
-    if-nez v3, :cond_6
+    if-nez v1, :cond_6
 
-    const/4 v3, 0x6
+    const/4 v1, 0x6
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
     iget-object v6, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
@@ -3133,116 +3076,106 @@
 
     const-wide/16 v11, 0x7f
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
     const-wide/16 v11, 0x80
 
-    or-long/2addr v1, v11
+    or-long/2addr v2, v11
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v6, v7
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v2, v6, v7
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v16, v11
+    or-long v7, p2, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v9, v11
+    or-long v7, v9, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     or-long/2addr v4, v11
 
-    long-to-int v4, v4
+    long-to-int v3, v4
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v4, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v4, v13, v11
+    or-long v3, v13, v11
 
-    long-to-int v4, v4
+    long-to-int v3, v3
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v4, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    move-wide/from16 v4, v22
+    move-wide/from16 v3, v18
 
-    long-to-int v4, v4
+    long-to-int v3, v3
 
-    int-to-byte v4, v4
+    int-to-byte v3, v3
 
-    aput-byte v4, v1, v2
+    aput-byte v3, v6, v2
 
-    return v3
+    return v1
 
     :cond_6
-    const/16 v3, 0x31
+    const/16 v1, 0x31
 
-    move-wide/from16 v24, v11
+    move-wide/from16 v20, v11
 
-    ushr-long v11, v1, v3
+    ushr-long v11, v2, v1
 
-    cmp-long v3, v11, v7
+    cmp-long v1, v11, v7
 
-    if-nez v3, :cond_7
+    if-nez v1, :cond_7
 
-    const/4 v3, 0x7
+    const/4 v1, 0x7
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
-    iget-object v3, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
     iget v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -3252,19 +3185,17 @@
 
     const-wide/16 v7, 0x7f
 
-    and-long/2addr v1, v7
+    and-long/2addr v2, v7
 
     const-wide/16 v7, 0x80
 
-    or-long/2addr v1, v7
+    or-long/2addr v2, v7
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v3, v6
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v2, v1, v6
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -3272,7 +3203,7 @@
 
     iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v11, v16, v7
+    or-long v11, p2, v7
 
     long-to-int v3, v11
 
@@ -3280,8 +3211,6 @@
 
     aput-byte v3, v1, v2
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v3, v2, 0x1
@@ -3296,8 +3225,6 @@
 
     aput-byte v3, v1, v2
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v3, v2, 0x1
@@ -3312,8 +3239,6 @@
 
     aput-byte v3, v1, v2
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v3, v2, 0x1
@@ -3328,15 +3253,13 @@
 
     aput-byte v3, v1, v2
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v3, v2, 0x1
 
     iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v3, v22, v7
+    or-long v3, v18, v7
 
     long-to-int v3, v3
 
@@ -3344,15 +3267,13 @@
 
     aput-byte v3, v1, v2
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     add-int/lit8 v3, v2, 0x1
 
     iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    move-wide/from16 v3, v24
+    move-wide/from16 v3, v20
 
     long-to-int v3, v3
 
@@ -3365,19 +3286,19 @@
     return v1
 
     :cond_7
-    const/16 v3, 0x38
+    const/16 v1, 0x38
 
-    move-wide/from16 v26, v11
+    move-wide/from16 v22, v11
 
-    ushr-long v11, v1, v3
+    ushr-long v11, v2, v1
 
-    cmp-long v3, v11, v7
+    cmp-long v1, v11, v7
 
-    if-nez v3, :cond_8
+    if-nez v1, :cond_8
 
-    const/16 v3, 0x8
+    const/16 v1, 0x8
 
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
     iget-object v6, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
@@ -3389,212 +3310,59 @@
 
     const-wide/16 v11, 0x7f
 
-    and-long/2addr v1, v11
+    and-long/2addr v2, v11
 
     const-wide/16 v11, 0x80
 
-    or-long/2addr v1, v11
+    or-long/2addr v2, v11
 
-    long-to-int v1, v1
+    long-to-int v2, v2
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v6, v7
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v2, v6, v7
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v16, v11
+    or-long v7, p2, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v6, v9, v11
+    or-long v7, v9, v11
 
-    long-to-int v6, v6
+    long-to-int v3, v7
 
-    int-to-byte v6, v6
+    int-to-byte v3, v3
 
-    aput-byte v6, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    add-int/lit8 v6, v2, 0x1
+    add-int/lit8 v3, v2, 0x1
 
-    iput v6, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
     or-long/2addr v4, v11
 
-    long-to-int v4, v4
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v4, v2, 0x1
-
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    or-long v4, v13, v11
-
-    long-to-int v4, v4
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v4, v2, 0x1
-
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    or-long v4, v22, v11
-
-    long-to-int v4, v4
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v4, v2, 0x1
-
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    or-long v4, v24, v11
-
-    long-to-int v4, v4
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v4, v2, 0x1
-
-    iput v4, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    move-wide/from16 v6, v26
-
-    long-to-int v4, v6
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    return v3
-
-    :cond_8
-    move-wide/from16 v6, v26
-
-    const/16 v3, 0x9
-
-    invoke-virtual {v0, v3}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
-
-    iget-object v8, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v15, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v3, v15, 0x1
-
-    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    const-wide/16 v20, 0x7f
-
-    and-long v1, v1, v20
-
-    const-wide/16 v18, 0x80
-
-    or-long v1, v1, v18
-
-    long-to-int v1, v1
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v8, v15
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    move-wide/from16 v28, v11
-
-    or-long v11, v16, v18
-
-    long-to-int v3, v11
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    or-long v9, v9, v18
-
-    long-to-int v3, v9
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
-
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
-
-    or-long v4, v4, v18
-
     long-to-int v3, v4
 
     int-to-byte v3, v3
 
-    aput-byte v3, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -3602,15 +3370,13 @@
 
     iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v3, v13, v18
+    or-long v3, v13, v11
 
     long-to-int v3, v3
 
     int-to-byte v3, v3
 
-    aput-byte v3, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -3618,15 +3384,13 @@
 
     iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v3, v22, v18
+    or-long v3, v18, v11
 
     long-to-int v3, v3
 
     int-to-byte v3, v3
 
-    aput-byte v3, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -3634,15 +3398,13 @@
 
     iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v3, v24, v18
+    or-long v3, v20, v11
 
     long-to-int v3, v3
 
     int-to-byte v3, v3
 
-    aput-byte v3, v1, v2
-
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    aput-byte v3, v6, v2
 
     iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
@@ -3650,29 +3412,154 @@
 
     iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    or-long v3, v6, v18
+    move-wide/from16 v7, v22
 
-    long-to-int v3, v3
+    long-to-int v3, v7
 
     int-to-byte v3, v3
 
-    aput-byte v3, v1, v2
+    aput-byte v3, v6, v2
 
-    iget-object v1, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
+    return v1
 
-    iget v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    :cond_8
+    move-wide/from16 v7, v22
 
-    add-int/lit8 v3, v2, 0x1
+    const/16 v1, 0x9
 
-    iput v3, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/io/Output;->require(I)Z
 
-    move-wide/from16 v3, v28
+    iget-object v6, v0, Lcom/esotericsoftware/kryo/io/Output;->buffer:[B
 
-    long-to-int v3, v3
+    iget v15, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
 
-    int-to-byte v3, v3
+    add-int/lit8 v1, v15, 0x1
 
-    aput-byte v3, v1, v2
+    iput v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    const-wide/16 v16, 0x7f
+
+    and-long v2, v2, v16
+
+    const-wide/16 v16, 0x80
+
+    or-long v2, v2, v16
+
+    long-to-int v1, v2
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v6, v15
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    or-long v2, p2, v16
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    or-long v2, v9, v16
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    or-long v2, v4, v16
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    or-long v2, v13, v16
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    or-long v2, v18, v16
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    or-long v2, v20, v16
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    or-long v2, v7, v16
+
+    long-to-int v2, v2
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
+
+    iget v1, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/Output;->position:I
+
+    long-to-int v2, v11
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v6, v1
 
     const/16 v1, 0x9
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/OutputChunked.smali b/com.discord/smali/com/esotericsoftware/kryo/io/OutputChunked.smali
index 6b91f05bf4..542235f592 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/OutputChunked.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/OutputChunked.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/io/OutputChunked;
 .super Lcom/esotericsoftware/kryo/io/Output;
+.source "OutputChunked.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeInput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeInput.smali
index 9e1edc687c..4ea464e0c7 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeInput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeInput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/io/UnsafeInput;
 .super Lcom/esotericsoftware/kryo/io/Input;
+.source "UnsafeInput.java"
 
 
 # instance fields
@@ -124,11 +125,11 @@
 
     add-long v10, p2, v1
 
-    int-to-long v12, v3
+    int-to-long v14, v3
 
     move-object/from16 v9, p1
 
-    move-wide v14, v12
+    move-wide v12, v14
 
     invoke-virtual/range {v5 .. v13}, Lsun/misc/Unsafe;->copyMemory(Ljava/lang/Object;JLjava/lang/Object;JJ)V
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali
index 96f934b5f3..b88d8a5cc0 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/io/UnsafeMemoryInput;
 .super Lcom/esotericsoftware/kryo/io/ByteBufferInput;
+.source "UnsafeMemoryInput.java"
 
 
 # instance fields
@@ -148,11 +149,11 @@
 
     add-long v10, p2, v1
 
-    int-to-long v12, v3
+    int-to-long v14, v3
 
     move-object/from16 v9, p1
 
-    move-wide v14, v12
+    move-wide v12, v14
 
     invoke-virtual/range {v5 .. v13}, Lsun/misc/Unsafe;->copyMemory(Ljava/lang/Object;JLjava/lang/Object;JJ)V
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali
index 07e900ec00..9ace747cff 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;
 .super Lcom/esotericsoftware/kryo/io/ByteBufferOutput;
+.source "UnsafeMemoryOutput.java"
 
 
 # static fields
@@ -193,8 +194,6 @@
     return-void
 
     :cond_0
-    const/4 v3, 0x0
-
     add-long/2addr v1, v15
 
     iget v3, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->capacity:I
@@ -1060,50 +1059,50 @@
 
     move-object/from16 v0, p0
 
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     if-nez p3, :cond_0
 
-    shl-long v4, p1, v3
+    shl-long v2, p1, v1
 
-    const/16 v6, 0x3f
+    const/16 v4, 0x3f
 
-    shr-long v1, p1, v6
+    shr-long v4, p1, v4
 
-    xor-long/2addr v1, v4
+    xor-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_0
-    move-wide/from16 v1, p1
+    move-wide/from16 v2, p1
 
     :goto_0
     const-wide/16 v4, 0x7f
 
-    and-long v6, v1, v4
+    and-long v6, v2, v4
 
     long-to-int v6, v6
 
     const/4 v7, 0x7
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const-wide/16 v8, 0x0
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_1
 
     invoke-virtual {v0, v6}, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->writeByte(I)V
 
-    return v3
+    return v1
 
     :cond_1
     or-int/lit16 v6, v6, 0x80
 
     int-to-long v10, v6
 
-    and-long v12, v1, v4
+    and-long v12, v2, v4
 
     const/16 v6, 0x8
 
@@ -1113,11 +1112,11 @@
 
     long-to-int v10, v10
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const/4 v11, 0x2
 
-    cmp-long v12, v1, v8
+    cmp-long v12, v2, v8
 
     if-nez v12, :cond_2
 
@@ -1138,7 +1137,7 @@
 
     int-to-long v12, v10
 
-    and-long v14, v1, v4
+    and-long v14, v2, v4
 
     const/16 v10, 0x10
 
@@ -1148,21 +1147,21 @@
 
     long-to-int v10, v12
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const/4 v12, 0x3
 
-    cmp-long v13, v1, v8
+    cmp-long v13, v2, v8
 
     if-nez v13, :cond_3
 
     invoke-direct {v0, v10}, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->writeLittleEndianInt(I)V
 
-    iget v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v2, v1
 
-    iput v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
 
     return v12
 
@@ -1173,7 +1172,7 @@
 
     int-to-long v13, v10
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x18
 
@@ -1183,9 +1182,9 @@
 
     long-to-int v10, v13
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v13, v1, v8
+    cmp-long v13, v2, v8
 
     if-nez v13, :cond_4
 
@@ -1216,7 +1215,7 @@
 
     and-long/2addr v13, v15
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x20
 
@@ -1224,9 +1223,9 @@
 
     or-long/2addr v13, v15
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_5
 
@@ -1247,7 +1246,7 @@
 
     or-long/2addr v13, v15
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x28
 
@@ -1255,9 +1254,9 @@
 
     or-long/2addr v13, v15
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_6
 
@@ -1278,7 +1277,7 @@
 
     or-long/2addr v10, v13
 
-    and-long v12, v1, v4
+    and-long v12, v2, v4
 
     const/16 v14, 0x30
 
@@ -1286,19 +1285,19 @@
 
     or-long/2addr v10, v12
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v12, v1, v8
+    cmp-long v12, v2, v8
 
     if-nez v12, :cond_7
 
     invoke-direct {v0, v10, v11}, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->writeLittleEndianLong(J)V
 
-    iget v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v2, v1
 
-    iput v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->position:I
 
     return v7
 
@@ -1307,30 +1306,30 @@
 
     or-long/2addr v10, v12
 
-    and-long/2addr v4, v1
+    and-long/2addr v4, v2
 
-    const/16 v3, 0x38
+    const/16 v1, 0x38
 
-    shl-long v3, v4, v3
+    shl-long/2addr v4, v1
 
-    or-long/2addr v3, v10
+    or-long/2addr v4, v10
 
-    ushr-long/2addr v1, v7
+    ushr-long v1, v2, v7
 
-    cmp-long v5, v1, v8
+    cmp-long v3, v1, v8
 
-    if-nez v5, :cond_8
+    if-nez v3, :cond_8
 
-    invoke-direct {v0, v3, v4}, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->writeLittleEndianLong(J)V
+    invoke-direct {v0, v4, v5}, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->writeLittleEndianLong(J)V
 
     return v6
 
     :cond_8
-    const-wide/high16 v5, -0x8000000000000000L
+    const-wide/high16 v6, -0x8000000000000000L
 
-    or-long/2addr v3, v5
+    or-long/2addr v4, v6
 
-    invoke-direct {v0, v3, v4}, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->writeLittleEndianLong(J)V
+    invoke-direct {v0, v4, v5}, Lcom/esotericsoftware/kryo/io/UnsafeMemoryOutput;->writeLittleEndianLong(J)V
 
     const-wide/16 v3, 0xff
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeOutput.smali b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeOutput.smali
index 7e9b6a7e3f..7ea7c12016 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeOutput.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeOutput.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/io/UnsafeOutput;
 .super Lcom/esotericsoftware/kryo/io/Output;
+.source "UnsafeOutput.java"
 
 
 # static fields
@@ -179,8 +180,6 @@
     return-void
 
     :cond_0
-    const/4 v3, 0x0
-
     add-long/2addr v1, v15
 
     iget v3, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->capacity:I
@@ -945,50 +944,50 @@
 
     move-object/from16 v0, p0
 
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     if-nez p3, :cond_0
 
-    shl-long v4, p1, v3
+    shl-long v2, p1, v1
 
-    const/16 v6, 0x3f
+    const/16 v4, 0x3f
 
-    shr-long v1, p1, v6
+    shr-long v4, p1, v4
 
-    xor-long/2addr v1, v4
+    xor-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_0
-    move-wide/from16 v1, p1
+    move-wide/from16 v2, p1
 
     :goto_0
     const-wide/16 v4, 0x7f
 
-    and-long v6, v1, v4
+    and-long v6, v2, v4
 
     long-to-int v6, v6
 
     const/4 v7, 0x7
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const-wide/16 v8, 0x0
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_1
 
     invoke-virtual {v0, v6}, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->writeByte(I)V
 
-    return v3
+    return v1
 
     :cond_1
     or-int/lit16 v6, v6, 0x80
 
     int-to-long v10, v6
 
-    and-long v12, v1, v4
+    and-long v12, v2, v4
 
     const/16 v6, 0x8
 
@@ -998,11 +997,11 @@
 
     long-to-int v10, v10
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const/4 v11, 0x2
 
-    cmp-long v12, v1, v8
+    cmp-long v12, v2, v8
 
     if-nez v12, :cond_2
 
@@ -1023,7 +1022,7 @@
 
     int-to-long v12, v10
 
-    and-long v14, v1, v4
+    and-long v14, v2, v4
 
     const/16 v10, 0x10
 
@@ -1033,21 +1032,21 @@
 
     long-to-int v10, v12
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
     const/4 v12, 0x3
 
-    cmp-long v13, v1, v8
+    cmp-long v13, v2, v8
 
     if-nez v13, :cond_3
 
     invoke-direct {v0, v10}, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->writeLittleEndianInt(I)V
 
-    iget v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v2, v1
 
-    iput v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
 
     return v12
 
@@ -1058,7 +1057,7 @@
 
     int-to-long v13, v10
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x18
 
@@ -1068,9 +1067,9 @@
 
     long-to-int v10, v13
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v13, v1, v8
+    cmp-long v13, v2, v8
 
     if-nez v13, :cond_4
 
@@ -1097,7 +1096,7 @@
 
     or-long/2addr v13, v15
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x20
 
@@ -1105,9 +1104,9 @@
 
     or-long/2addr v13, v15
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_5
 
@@ -1128,7 +1127,7 @@
 
     or-long/2addr v13, v15
 
-    and-long v15, v1, v4
+    and-long v15, v2, v4
 
     const/16 v10, 0x28
 
@@ -1136,9 +1135,9 @@
 
     or-long/2addr v13, v15
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v10, v1, v8
+    cmp-long v10, v2, v8
 
     if-nez v10, :cond_6
 
@@ -1159,7 +1158,7 @@
 
     or-long/2addr v10, v13
 
-    and-long v12, v1, v4
+    and-long v12, v2, v4
 
     const/16 v14, 0x30
 
@@ -1167,19 +1166,19 @@
 
     or-long/2addr v10, v12
 
-    ushr-long/2addr v1, v7
+    ushr-long/2addr v2, v7
 
-    cmp-long v12, v1, v8
+    cmp-long v12, v2, v8
 
     if-nez v12, :cond_7
 
     invoke-direct {v0, v10, v11}, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->writeLittleEndianLong(J)V
 
-    iget v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
+    iget v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
 
-    sub-int/2addr v1, v3
+    sub-int/2addr v2, v1
 
-    iput v1, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
+    iput v2, v0, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->position:I
 
     return v7
 
@@ -1188,30 +1187,30 @@
 
     or-long/2addr v10, v12
 
-    and-long/2addr v4, v1
+    and-long/2addr v4, v2
 
-    const/16 v3, 0x38
+    const/16 v1, 0x38
 
-    shl-long v3, v4, v3
+    shl-long/2addr v4, v1
 
-    or-long/2addr v3, v10
+    or-long/2addr v4, v10
 
-    ushr-long/2addr v1, v7
+    ushr-long v1, v2, v7
 
-    cmp-long v5, v1, v8
+    cmp-long v3, v1, v8
 
-    if-nez v5, :cond_8
+    if-nez v3, :cond_8
 
-    invoke-direct {v0, v3, v4}, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->writeLittleEndianLong(J)V
+    invoke-direct {v0, v4, v5}, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->writeLittleEndianLong(J)V
 
     return v6
 
     :cond_8
-    const-wide/high16 v5, -0x8000000000000000L
+    const-wide/high16 v6, -0x8000000000000000L
 
-    or-long/2addr v3, v5
+    or-long/2addr v4, v6
 
-    invoke-direct {v0, v3, v4}, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->writeLittleEndianLong(J)V
+    invoke-direct {v0, v4, v5}, Lcom/esotericsoftware/kryo/io/UnsafeOutput;->writeLittleEndianLong(J)V
 
     const-wide/16 v3, 0xff
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/Util.smali b/com.discord/smali/com/esotericsoftware/kryo/io/Util.smali
index a7b30e8867..7694b692e4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/Util.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/io/Util.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/io/Util;
 .super Ljava/lang/Object;
+.source "Util.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoCallback.smali b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoCallback.smali
index 225c62b427..ee4ebd6ea3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoCallback.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/pool/KryoCallback;
 .super Ljava/lang/Object;
+.source "KryoCallback.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoFactory.smali
index 0794bf12a0..7e5c557214 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/pool/KryoFactory;
 .super Ljava/lang/Object;
+.source "KryoFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali
index b0b1c8f60a..329c2ee312 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/pool/KryoPool$Builder;
 .super Ljava/lang/Object;
+.source "KryoPool.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool.smali b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool.smali
index 75a3b13d05..c4339c6481 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/pool/KryoPool;
 .super Ljava/lang/Object;
+.source "KryoPool.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali
index ad9b30a19f..a4b9461e4f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/pool/KryoPoolQueueImpl;
 .super Ljava/lang/Object;
+.source "KryoPoolQueueImpl.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/pool/KryoPool;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali b/com.discord/smali/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali
index d7d4aa3548..2a6f5f1b93 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/pool/SoftReferenceQueue;
 .super Ljava/lang/Object;
+.source "SoftReferenceQueue.java"
 
 # interfaces
 .implements Ljava/util/Queue;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali
index 79fba3e1a6..378678b3fe 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -43,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;->eB()Z
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eA()Z
 
     move-result p2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali
index c81b94ca12..380fa8b7c7 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -43,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;->eC()B
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eB()B
 
     move-result p2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField.smali
index 9ad9482c6f..98e23be9c2 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
 .super Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali
index 1ffdb2bf5d..380da4cc59 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -43,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;->eA()C
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->ez()C
 
     move-result p2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali
index 0f5a8b01a3..f865cc27f6 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -43,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;->eG()D
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eF()D
 
     move-result-wide v0
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali
index 605e9a1ba4..fd851f186c 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -43,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;->eH()F
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eG()F
 
     move-result p2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali
index 7c72f6a469..0da811dbcd 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -58,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;->eE()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eD()I
 
     move-result p2
 
@@ -71,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;->eE()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eD()I
 
     move-result p2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali
index 063fe693f6..67122973b9 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -58,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;->eF()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eE()J
 
     move-result-wide v0
 
@@ -71,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;->eF()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eE()J
 
     move-result-wide v0
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali
index d70d26c9bb..25357ac8f2 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -38,7 +39,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->ey()Ljava/lang/Object;
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->ex()Ljava/lang/Object;
 
     move-result-object p2
 
@@ -146,7 +147,7 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->ey()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->ex()Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali
index 011b6e29a9..02016983d8 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -43,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;->eD()S
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eC()S
 
     move-result p2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali
index 9ff74c80b8..b9785a0151 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField;
 .super Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCachedField;
+.source "AsmCacheFields.java"
 
 
 # annotations
@@ -43,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;->ez()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->ey()Ljava/lang/String;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields.smali
index 18bf5fb4f4..4c8c156457 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCacheFields.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/AsmCacheFields;
 .super Ljava/lang/Object;
+.source "AsmCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCachedFieldFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCachedFieldFactory.smali
index 924ae8ad57..5a92e5ac53 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCachedFieldFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/AsmCachedFieldFactory.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/AsmCachedFieldFactory;
 .super Ljava/lang/Object;
+.source "AsmCachedFieldFactory.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$1.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$1.smali
index 9e9f62cd2b..02a9218f49 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/BeanSerializer$1;
 .super Ljava/lang/Object;
+.source "BeanSerializer.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali
index ffeac71ef1..20cbac5525 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty;
 .super Ljava/lang/Object;
+.source "BeanSerializer.java"
 
 
 # annotations
@@ -74,7 +75,7 @@
 
     check-cast p1, Lcom/esotericsoftware/b/d;
 
-    invoke-virtual {p1}, Lcom/esotericsoftware/b/d;->eI()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/d;->eH()Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
index 71582bac24..4d488b7708 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/BeanSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "BeanSerializer.java"
 
 
 # annotations
@@ -237,10 +238,12 @@
 
     goto :goto_1
 
-    :catch_0
     :cond_3
     return-void
 
+    :catch_0
+    return-void
+
     :catch_1
     move-exception p1
 
@@ -251,6 +254,8 @@
     invoke-direct {p2, v0, p1}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw p2
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer$1.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer$1.smali
index 89f9f9fa3e..133b8d50df 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/BlowfishSerializer$1;
 .super Lcom/esotericsoftware/kryo/io/Output;
+.source "BlowfishSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer.smali
index 96c9de7686..aabd2a4deb 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/BlowfishSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/BlowfishSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "BlowfishSerializer.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer$Closure.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer$Closure.smali
index d31bc6c572..e516f2dba3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer$Closure.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer$Closure.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/ClosureSerializer$Closure;
 .super Ljava/lang/Object;
+.source "ClosureSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer.smali
index 1123f6caa9..01884880f0 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ClosureSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/ClosureSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "ClosureSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer$BindCollection.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer$BindCollection.smali
index aa9cf96c99..a91e9b4d93 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer$BindCollection.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer$BindCollection.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/serializers/CollectionSerializer$BindCollection;
 .super Ljava/lang/Object;
+.source "CollectionSerializer.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer.smali
index 7ece7b00c5..d056e04107 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/CollectionSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/CollectionSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "CollectionSerializer.java"
 
 
 # annotations
@@ -217,13 +218,13 @@
 
     if-nez v2, :cond_1
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/CollectionSerializer;->genericType:Ljava/lang/Class;
+    invoke-virtual {p1, v3}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
 
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/CollectionSerializer;->genericType:Ljava/lang/Class;
+    move-result-object v1
 
-    invoke-virtual {p1, v2}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
+    move-object v2, v1
 
-    move-result-object v2
+    move-object v1, v3
 
     :cond_1
     const/4 v3, 0x0
@@ -362,9 +363,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/CollectionSerializer;->genericType:Ljava/lang/Class;
-
-    invoke-virtual {p1, v0}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
+    invoke-virtual {p1, v1}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali
index 84e0d19262..7ef63e0c88 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/CompatibleFieldSerializer;
 .super Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+.source "CompatibleFieldSerializer.java"
 
 
 # annotations
@@ -320,11 +321,11 @@
     move-result-object v7
 
     :cond_e
-    if-nez v7, :cond_f
+    if-nez v7, :cond_10
 
     sget-boolean v7, Lcom/esotericsoftware/a/a;->Az:Z
 
-    if-eqz v7, :cond_10
+    if-eqz v7, :cond_f
 
     const-string v7, "kryo"
 
@@ -332,15 +333,17 @@
 
     invoke-static {v7, v8}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_a
-
     :cond_f
-    invoke-virtual {v7, v3, v2}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;->read(Lcom/esotericsoftware/kryo/io/Input;Ljava/lang/Object;)V
-
-    :cond_10
-    :goto_a
     invoke-virtual {v3}, Lcom/esotericsoftware/kryo/io/InputChunked;->nextChunks()V
 
+    goto :goto_a
+
+    :cond_10
+    invoke-virtual {v7, v3, v2}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;->read(Lcom/esotericsoftware/kryo/io/Input;Ljava/lang/Object;)V
+
+    invoke-virtual {v3}, Lcom/esotericsoftware/kryo/io/InputChunked;->nextChunks()V
+
+    :goto_a
     add-int/lit8 v5, v5, 0x1
 
     goto :goto_9
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$BooleanArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$BooleanArraySerializer.smali
index 8bff415559..0250e724b2 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$BooleanArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$BooleanArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$BooleanArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ByteArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ByteArraySerializer.smali
index a02f6454f0..f125e0e8ee 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ByteArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ByteArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$ByteArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$CharArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$CharArraySerializer.smali
index 1d325d04b6..54bd4d7b55 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$CharArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$CharArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$CharArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$DoubleArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$DoubleArraySerializer.smali
index 631e45f4ea..240434489e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$DoubleArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$DoubleArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$DoubleArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$FloatArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$FloatArraySerializer.smali
index 86422ff0be..b26db095ab 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$FloatArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$FloatArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$FloatArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$IntArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$IntArraySerializer.smali
index b535ab9322..b975aefd1f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$IntArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$IntArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$IntArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$LongArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$LongArraySerializer.smali
index c349fc4305..e14bce0ec5 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$LongArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$LongArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$LongArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali
index 47dc22fb63..e1651f96c5 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ShortArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ShortArraySerializer.smali
index 4bdd6e3f9e..d8f4b373b5 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ShortArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ShortArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$ShortArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$StringArraySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$StringArraySerializer.smali
index bbeb5828b5..3d75ca9f81 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$StringArraySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$StringArraySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers$StringArraySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers.smali
index 5b9397ef58..9d758d7162 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultArraySerializers.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultArraySerializers;
 .super Ljava/lang/Object;
+.source "DefaultArraySerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigDecimalSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigDecimalSerializer.smali
index 6d3b2814bc..9218d8be83 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigDecimalSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigDecimalSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$BigDecimalSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigIntegerSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigIntegerSerializer.smali
index 37e2ac07f2..728a7ce2cd 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigIntegerSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BigIntegerSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$BigIntegerSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BooleanSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BooleanSerializer.smali
index 63bba08da1..14752cf260 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BooleanSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$BooleanSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$BooleanSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ByteSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ByteSerializer.smali
index abbe8023ce..752267e8eb 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ByteSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ByteSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$ByteSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CalendarSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CalendarSerializer.smali
index b7c3a72bb7..95c4588a30 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CalendarSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CalendarSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CalendarSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
@@ -225,7 +226,6 @@
 
     move-result-wide v1
 
-    :goto_0
     invoke-virtual {p2, v1, v2, v0}, Lcom/esotericsoftware/kryo/io/Output;->writeLong(JZ)I
 
     return-void
@@ -233,5 +233,7 @@
     :cond_0
     const-wide v1, -0xb1d069b5400L
 
-    goto :goto_0
+    invoke-virtual {p2, v1, v2, v0}, Lcom/esotericsoftware/kryo/io/Output;->writeLong(JZ)I
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharSerializer.smali
index 03d7599ae8..d2948006d1 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CharSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharsetSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharsetSerializer.smali
index 8ebf1aa2be..b21ef426e2 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharsetSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CharsetSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CharsetSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ClassSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ClassSerializer.smali
index caa224020c..87e3d55ce6 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ClassSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ClassSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$ClassSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
@@ -94,6 +95,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_3
     :goto_1
     return-object p1
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyListSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyListSerializer.smali
index 94f72502d0..954791f8f3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyListSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyListSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyListSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyMapSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyMapSerializer.smali
index 537633637b..a47433b3ff 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyMapSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyMapSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptyMapSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptySetSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptySetSerializer.smali
index a81f16bd6f..8994a1e5af 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptySetSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptySetSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsEmptySetSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonListSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonListSerializer.smali
index 3e67afe38e..ad1fc97fca 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonListSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonListSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonListSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonMapSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonMapSerializer.smali
index f2b06703ea..797cadfc76 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonMapSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonMapSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonMapSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonSetSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonSetSerializer.smali
index 7233594fb3..0ff972750d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonSetSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonSetSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CollectionsSingletonSetSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CurrencySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CurrencySerializer.smali
index e029d3b418..df8bf931b6 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CurrencySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$CurrencySerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$CurrencySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DateSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DateSerializer.smali
index ce913a72a6..58d8c80001 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DateSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DateSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$DateSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DoubleSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DoubleSerializer.smali
index 4ce665d2af..1f3af6f767 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DoubleSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$DoubleSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$DoubleSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSerializer.smali
index fea486baa8..8e5fd767af 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
@@ -111,15 +112,13 @@
 
     iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSerializer;->enumConstants:[Ljava/lang/Object;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    sub-int/2addr v0, p1
+    sub-int/2addr v1, p1
 
-    if-gt p2, v0, :cond_1
+    if-gt p2, v1, :cond_1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSerializer;->enumConstants:[Ljava/lang/Object;
-
-    aget-object p1, p1, p2
+    aget-object p1, v0, p2
 
     check-cast p1, Ljava/lang/Enum;
 
@@ -174,7 +173,6 @@
 
     const/4 p3, 0x0
 
-    :goto_0
     invoke-virtual {p2, p3, p1}, Lcom/esotericsoftware/kryo/io/Output;->writeVarInt(IZ)I
 
     return-void
@@ -186,7 +184,9 @@
 
     add-int/2addr p3, p1
 
-    goto :goto_0
+    invoke-virtual {p2, p3, p1}, Lcom/esotericsoftware/kryo/io/Output;->writeVarInt(IZ)I
+
+    return-void
 .end method
 
 .method public bridge synthetic write(Lcom/esotericsoftware/kryo/Kryo;Lcom/esotericsoftware/kryo/io/Output;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSetSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSetSerializer.smali
index 879c424ef5..141cb2ea17 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSetSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSetSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$EnumSetSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
@@ -154,23 +155,6 @@
 
     move-result-object v0
 
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lcom/esotericsoftware/kryo/KryoException;
-
-    const-string p2, "An EnumSet must have a defined Enum to be serialized."
-
-    invoke-direct {p1, p2}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    invoke-virtual {p3}, Ljava/util/EnumSet;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v0
@@ -187,6 +171,39 @@
 
     move-result-object v0
 
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lcom/esotericsoftware/kryo/KryoException;
+
+    const-string p2, "An EnumSet must have a defined Enum to be serialized."
+
+    invoke-direct {p1, p2}, Lcom/esotericsoftware/kryo/KryoException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    invoke-virtual {p3}, Ljava/util/EnumSet;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {p1, p2, v0}, Lcom/esotericsoftware/kryo/Kryo;->writeClass(Lcom/esotericsoftware/kryo/io/Output;Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Registration;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/esotericsoftware/kryo/Registration;->getSerializer()Lcom/esotericsoftware/kryo/Serializer;
+
+    move-result-object v0
+
+    :goto_0
     invoke-virtual {p3}, Ljava/util/EnumSet;->size()I
 
     move-result v1
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$FloatSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$FloatSerializer.smali
index ebbec42e2d..e58624fb62 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$FloatSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$FloatSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$FloatSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$IntSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$IntSerializer.smali
index a4e25ba281..32fa2e2097 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$IntSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$IntSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$IntSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$KryoSerializableSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$KryoSerializableSerializer.smali
index f4f68a7eb2..9036ffe32d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$KryoSerializableSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$KryoSerializableSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$KryoSerializableSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LocaleSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LocaleSerializer.smali
index 673843836a..535c49630f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LocaleSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LocaleSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$LocaleSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
@@ -112,9 +113,11 @@
 
     return p0
 
-    :catch_0
     :cond_0
     return v0
+
+    :catch_0
+    return v0
 .end method
 
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LongSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LongSerializer.smali
index 763db765b5..21e544f0ef 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LongSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$LongSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$LongSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ShortSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ShortSerializer.smali
index 3e4134dc0b..3829dcf862 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ShortSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$ShortSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$ShortSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBufferSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBufferSerializer.smali
index e3b78caf70..3519891938 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBufferSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBufferSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$StringBufferSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBuilderSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBuilderSerializer.smali
index ca8479257c..4f5bec318a 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBuilderSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringBuilderSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$StringBuilderSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringSerializer.smali
index d8dd968ba9..55b8b4f8c9 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$StringSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$StringSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TimeZoneSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TimeZoneSerializer.smali
index 793b175acb..b13bb29060 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TimeZoneSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TimeZoneSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$TimeZoneSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeMapSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeMapSerializer.smali
index d1756eb99f..fc1d1920dd 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeMapSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeMapSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$TreeMapSerializer;
 .super Lcom/esotericsoftware/kryo/serializers/MapSerializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeSetSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeSetSerializer.smali
index cd57c3c97f..d237d173ca 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeSetSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$TreeSetSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$TreeSetSerializer;
 .super Lcom/esotericsoftware/kryo/serializers/CollectionSerializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$URLSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$URLSerializer.smali
index 5ab54a284b..5ef74b549e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$URLSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$URLSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$URLSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$VoidSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$VoidSerializer.smali
index a09895c3ad..7e7f178bf4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$VoidSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers$VoidSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers$VoidSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers.smali
index 9d02dfece2..17bdc041cd 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DefaultSerializers.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DefaultSerializers;
 .super Ljava/lang/Object;
+.source "DefaultSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/DeflateSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/DeflateSerializer.smali
index 0d62147961..76344cdced 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/DeflateSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/DeflateSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/DeflateSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "DeflateSerializer.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/EnumNameSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/EnumNameSerializer.smali
index d936d54ef7..c53fea10c2 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/EnumNameSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/EnumNameSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/EnumNameSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "EnumNameSerializer.java"
 
 
 # annotations
@@ -91,11 +92,11 @@
 
     invoke-static {p2, p1}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
 
-    move-result-object p2
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p2
+    return-object p1
 
     :catch_0
     move-exception p2
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ExternalizableSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ExternalizableSerializer.smali
index e961117363..717487b010 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ExternalizableSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ExternalizableSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/ExternalizableSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "ExternalizableSerializer.java"
 
 
 # instance fields
@@ -52,8 +53,6 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/ExternalizableSerializer;->javaSerializerByType:Lcom/esotericsoftware/kryo/util/ObjectMap;
-
     invoke-virtual {v0, p1}, Lcom/esotericsoftware/kryo/util/ObjectMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
@@ -102,9 +101,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/ExternalizableSerializer;->objectInput:Lcom/esotericsoftware/kryo/io/KryoObjectInput;
-
-    invoke-virtual {p1, p2}, Lcom/esotericsoftware/kryo/io/KryoObjectInput;->setInput(Lcom/esotericsoftware/kryo/io/Input;)V
+    invoke-virtual {v0, p2}, Lcom/esotericsoftware/kryo/io/KryoObjectInput;->setInput(Lcom/esotericsoftware/kryo/io/Input;)V
 
     :goto_0
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/ExternalizableSerializer;->objectInput:Lcom/esotericsoftware/kryo/io/KryoObjectInput;
@@ -128,9 +125,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/ExternalizableSerializer;->objectOutput:Lcom/esotericsoftware/kryo/io/KryoObjectOutput;
-
-    invoke-virtual {p1, p2}, Lcom/esotericsoftware/kryo/io/KryoObjectOutput;->setOutput(Lcom/esotericsoftware/kryo/io/Output;)V
+    invoke-virtual {v0, p2}, Lcom/esotericsoftware/kryo/io/KryoObjectOutput;->setOutput(Lcom/esotericsoftware/kryo/io/Output;)V
 
     :goto_0
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/ExternalizableSerializer;->objectOutput:Lcom/esotericsoftware/kryo/io/KryoObjectOutput;
@@ -151,7 +146,7 @@
 
     invoke-virtual {p0, p1, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    move-result-object v1
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -165,12 +160,12 @@
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 p0, 0x0
 
     :goto_1
-    if-eqz v1, :cond_1
+    if-eqz p0, :cond_1
 
-    invoke-virtual {v1}, Ljava/lang/reflect/Method;->getReturnType()Ljava/lang/Class;
+    invoke-virtual {p0}, Ljava/lang/reflect/Method;->getReturnType()Ljava/lang/Class;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Bind.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Bind.smali
index a441d9a062..18c99a70fd 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Bind.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Bind.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/serializers/FieldSerializer$Bind;
 .super Ljava/lang/Object;
+.source "FieldSerializer.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedField.smali
index 3fb3b0feb6..b02225d07d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedField.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 .super Ljava/lang/Object;
+.source "FieldSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory.smali
index 187a2e6386..40a6170c37 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory;
 .super Ljava/lang/Object;
+.source "FieldSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$1.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$1.smali
index 65d4f3853f..5384cfb1b1 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$1;
 .super Ljava/lang/Object;
+.source "FieldSerializer.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$2.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$2.smali
index f1bba9f2a7..e7fbec3ca5 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$2.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy$2;
 .super Ljava/lang/Object;
+.source "FieldSerializer.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy.smali
index 3fd45ae020..d64638a269 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy;
 .super Ljava/lang/Object;
+.source "FieldSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Optional.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Optional.smali
index 452efd75a8..d86fd80479 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Optional.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer$Optional.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/serializers/FieldSerializer$Optional;
 .super Ljava/lang/Object;
+.source "FieldSerializer.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer.smali
index cc2e8088ca..9e5c6b7aa0 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "FieldSerializer.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
@@ -272,8 +273,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->typeParameters:[Ljava/lang/reflect/TypeVariable;
-
     array-length p1, p1
 
     if-nez p1, :cond_1
@@ -283,6 +282,8 @@
     :cond_1
     const/4 p1, 0x0
 
+    iput-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->componentType:Ljava/lang/Class;
+
     goto :goto_1
 
     :cond_2
@@ -291,9 +292,9 @@
 
     move-result-object p1
 
-    :goto_1
     iput-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->componentType:Ljava/lang/Class;
 
+    :goto_1
     new-instance p1, Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;
 
     invoke-direct {p1, p0}, Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;-><init>(Lcom/esotericsoftware/kryo/serializers/FieldSerializer;)V
@@ -956,6 +957,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public getFields()[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
@@ -1071,17 +1074,14 @@
 
     move-result-object v1
 
-    :goto_0
-    move-object v7, v1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v1, 0x0
 
-    goto :goto_0
+    :goto_0
+    move-object v7, v1
 
-    :goto_1
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->config:Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;
 
     invoke-virtual {v1}, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->isOptimizedGenerics()Z
@@ -1094,7 +1094,7 @@
 
     if-ne v7, v1, :cond_1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->genericsUtil:Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;
@@ -1103,10 +1103,10 @@
 
     move-result-object v1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
-    :goto_2
+    :goto_1
     sget-boolean v1, Lcom/esotericsoftware/a/a;->Az:Z
 
     if-eqz v1, :cond_3
@@ -1154,7 +1154,7 @@
 
     move-result-object v1
 
-    :goto_3
+    :goto_2
     instance-of v3, v1, Lcom/esotericsoftware/kryo/serializers/ObjectField;
 
     if-eqz v3, :cond_4
@@ -1217,12 +1217,12 @@
 
     if-nez p1, :cond_6
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const/4 p2, 0x0
 
-    :goto_4
+    :goto_3
     iput-boolean p2, v1, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;->canBeNull:Z
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->kryo:Lcom/esotericsoftware/kryo/Kryo;
@@ -1263,12 +1263,11 @@
 
     move-result-object p2
 
-    :goto_0
     invoke-interface {p2, p3, p1, p0}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory;->createCachedField(Ljava/lang/Class;Ljava/lang/reflect/Field;Lcom/esotericsoftware/kryo/serializers/FieldSerializer;)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->config:Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;
@@ -1283,6 +1282,10 @@
 
     move-result-object p2
 
+    invoke-interface {p2, p3, p1, p0}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory;->createCachedField(Ljava/lang/Class;Ljava/lang/reflect/Field;Lcom/esotericsoftware/kryo/serializers/FieldSerializer;)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+
+    move-result-object p1
+
     goto :goto_0
 
     :cond_1
@@ -1310,7 +1313,7 @@
 
     iput-object p5, p2, Lcom/esotericsoftware/kryo/serializers/ObjectField;->generics:[Ljava/lang/Class;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     if-eqz p4, :cond_3
@@ -1352,7 +1355,7 @@
     invoke-static {p3, p2}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_3
-    :goto_1
+    :goto_0
     return-object p1
 .end method
 
@@ -1511,6 +1514,8 @@
 
     :cond_5
     throw p2
+
+    return-void
 .end method
 
 .method protected rebuildCachedFields()V
@@ -1915,44 +1920,37 @@
     :goto_0
     iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
+    if-ge v1, v3, :cond_1
 
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    aget-object v3, v2, v1
 
-    aget-object v2, v2, v1
+    if-ne v3, p1, :cond_0
 
-    if-ne v2, p1, :cond_0
-
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
-
-    array-length p1, p1
+    array-length p1, v2
 
     add-int/lit8 p1, p1, -0x1
 
     new-array p1, p1, [Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    iget-object v3, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
-
-    invoke-static {v3, v0, p1, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v0, p1, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    add-int/lit8 v3, v1, 0x1
+    add-int/lit8 v2, v1, 0x1
 
     array-length v4, p1
 
     sub-int/2addr v4, v1
 
-    invoke-static {v0, v3, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v2, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iput-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    :goto_1
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->removedFields:Ljava/util/HashSet;
 
-    invoke-virtual {p1, v2}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v3}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
     return-void
 
@@ -1964,49 +1962,47 @@
     :cond_1
     const/4 v1, 0x0
 
-    :goto_2
+    :goto_1
     iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_3
+    if-ge v1, v3, :cond_3
 
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    aget-object v3, v2, v1
 
-    aget-object v2, v2, v1
+    if-ne v3, p1, :cond_2
 
-    if-ne v2, p1, :cond_2
-
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
-
-    array-length p1, p1
+    array-length p1, v2
 
     add-int/lit8 p1, p1, -0x1
 
     new-array p1, p1, [Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    iget-object v3, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
-
-    invoke-static {v3, v0, p1, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v0, p1, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    add-int/lit8 v3, v1, 0x1
+    add-int/lit8 v2, v1, 0x1
 
     array-length v4, p1
 
     sub-int/2addr v4, v1
 
-    invoke-static {v0, v3, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v2, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iput-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    goto :goto_1
+    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->removedFields:Ljava/util/HashSet;
+
+    invoke-virtual {p1, v3}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+    return-void
 
     :cond_2
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -2038,6 +2034,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public removeField(Ljava/lang/String;)V
@@ -2050,11 +2048,9 @@
     :goto_0
     iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
-
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    if-ge v1, v3, :cond_1
 
     aget-object v2, v2, v1
 
@@ -2070,29 +2066,26 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    array-length p1, p1
+    array-length v3, p1
 
-    add-int/lit8 p1, p1, -0x1
+    add-int/lit8 v3, v3, -0x1
 
-    new-array p1, p1, [Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    new-array v3, v3, [Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    iget-object v3, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    invoke-static {p1, v0, v3, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    invoke-static {v3, v0, p1, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    add-int/lit8 v0, v1, 0x1
 
-    add-int/lit8 v3, v1, 0x1
-
-    array-length v4, p1
+    array-length v4, v3
 
     sub-int/2addr v4, v1
 
-    invoke-static {v0, v3, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, v3, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    iput-object v3, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->fields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    :goto_1
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->removedFields:Ljava/util/HashSet;
 
     invoke-virtual {p1, v2}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
@@ -2107,14 +2100,12 @@
     :cond_1
     const/4 v1, 0x0
 
-    :goto_2
+    :goto_1
     iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_3
-
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    if-ge v1, v3, :cond_3
 
     aget-object v2, v2, v1
 
@@ -2130,34 +2121,36 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    array-length p1, p1
+    array-length v3, p1
 
-    add-int/lit8 p1, p1, -0x1
+    add-int/lit8 v3, v3, -0x1
 
-    new-array p1, p1, [Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    new-array v3, v3, [Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    iget-object v3, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    invoke-static {p1, v0, v3, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    invoke-static {v3, v0, p1, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    add-int/lit8 v0, v1, 0x1
 
-    add-int/lit8 v3, v1, 0x1
-
-    array-length v4, p1
+    array-length v4, v3
 
     sub-int/2addr v4, v1
 
-    invoke-static {v0, v3, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, v3, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    iput-object v3, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->transientFields:[Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    goto :goto_1
+    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->removedFields:Ljava/util/HashSet;
+
+    invoke-virtual {p1, v2}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+    return-void
 
     :cond_2
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -2189,6 +2182,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public setCopyTransient(Z)V
@@ -2257,8 +2252,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->typeParameters:[Ljava/lang/reflect/TypeVariable;
-
     array-length p1, p1
 
     if-lez p1, :cond_1
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerAnnotationsUtil.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerAnnotationsUtil.smali
index 544d77b000..2439df4d7b 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerAnnotationsUtil.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerAnnotationsUtil.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/FieldSerializerAnnotationsUtil;
 .super Ljava/lang/Object;
+.source "FieldSerializerAnnotationsUtil.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali
index fdbbf9a0e4..ca140dceb9 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;
 .super Ljava/lang/Object;
+.source "FieldSerializerConfig.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali
index 526382e2c1..82a6b7d3ca 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;
 .super Ljava/lang/Object;
+.source "FieldSerializerGenericsUtil.java"
 
 
 # instance fields
@@ -644,7 +645,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_d
+    if-eqz p1, :cond_c
 
     instance-of v1, p1, Ljava/lang/reflect/TypeVariable;
 
@@ -652,7 +653,7 @@
 
     const/4 v3, 0x0
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_0
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
@@ -660,7 +661,7 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_0
 
     check-cast p1, Ljava/lang/reflect/TypeVariable;
 
@@ -678,21 +679,21 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_d
+    if-eqz p1, :cond_c
 
     aput-object p1, p3, v3
 
-    new-array p1, v2, [Ljava/lang/Class;
+    new-array v0, v2, [Ljava/lang/Class;
 
-    aget-object v0, p3, v3
+    aget-object p1, p3, v3
 
-    aput-object v0, p1, v3
+    aput-object p1, v0, v3
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Az:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->Az:Z
 
-    if-eqz v0, :cond_0
+    if-eqz p1, :cond_c
 
-    const-string v0, "kryo"
+    const-string p1, "kryo"
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -722,17 +723,14 @@
 
     move-result-object p2
 
-    invoke-static {v0, p2}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
+
+    goto/16 :goto_2
 
     :cond_0
-    move-object v0, p1
-
-    goto/16 :goto_3
-
-    :cond_1
     instance-of v1, p1, Ljava/lang/reflect/ParameterizedType;
 
-    if-eqz v1, :cond_b
+    if-eqz v1, :cond_a
 
     move-object p3, p1
 
@@ -742,7 +740,7 @@
 
     move-result-object p3
 
-    if-eqz p3, :cond_d
+    if-eqz p3, :cond_c
 
     array-length v1, p3
 
@@ -753,13 +751,13 @@
     :goto_0
     array-length v4, p3
 
-    if-ge v2, v4, :cond_9
+    if-ge v2, v4, :cond_8
 
     aget-object v4, p3, v2
 
     instance-of v5, v4, Ljava/lang/Class;
 
-    if-eqz v5, :cond_2
+    if-eqz v5, :cond_1
 
     check-cast v4, Ljava/lang/Class;
 
@@ -767,10 +765,10 @@
 
     goto/16 :goto_1
 
-    :cond_2
+    :cond_1
     instance-of v5, v4, Ljava/lang/reflect/ParameterizedType;
 
-    if-eqz v5, :cond_3
+    if-eqz v5, :cond_2
 
     check-cast v4, Ljava/lang/reflect/ParameterizedType;
 
@@ -784,10 +782,10 @@
 
     goto/16 :goto_1
 
-    :cond_3
+    :cond_2
     instance-of v5, v4, Ljava/lang/reflect/TypeVariable;
 
-    if-eqz v5, :cond_4
+    if-eqz v5, :cond_3
 
     iget-object v5, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
@@ -795,7 +793,7 @@
 
     move-result-object v5
 
-    if-eqz v5, :cond_4
+    if-eqz v5, :cond_3
 
     iget-object v5, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
@@ -817,7 +815,18 @@
 
     aget-object v4, v1, v2
 
-    if-nez v4, :cond_8
+    if-nez v4, :cond_7
+
+    const-class v4, Ljava/lang/Object;
+
+    aput-object v4, v1, v2
+
+    goto :goto_1
+
+    :cond_3
+    instance-of v5, v4, Ljava/lang/reflect/WildcardType;
+
+    if-eqz v5, :cond_4
 
     const-class v4, Ljava/lang/Object;
 
@@ -826,20 +835,9 @@
     goto :goto_1
 
     :cond_4
-    instance-of v5, v4, Ljava/lang/reflect/WildcardType;
-
-    if-eqz v5, :cond_5
-
-    const-class v4, Ljava/lang/Object;
-
-    aput-object v4, v1, v2
-
-    goto :goto_1
-
-    :cond_5
     instance-of v5, v4, Ljava/lang/reflect/GenericArrayType;
 
-    if-eqz v5, :cond_7
+    if-eqz v5, :cond_6
 
     check-cast v4, Ljava/lang/reflect/GenericArrayType;
 
@@ -849,7 +847,7 @@
 
     instance-of v5, v4, Ljava/lang/Class;
 
-    if-eqz v5, :cond_6
+    if-eqz v5, :cond_5
 
     check-cast v4, Ljava/lang/Class;
 
@@ -865,10 +863,10 @@
 
     goto :goto_1
 
-    :cond_6
+    :cond_5
     instance-of v5, v4, Ljava/lang/reflect/TypeVariable;
 
-    if-eqz v5, :cond_8
+    if-eqz v5, :cond_7
 
     iget-object v5, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
@@ -876,7 +874,7 @@
 
     move-result-object v5
 
-    if-eqz v5, :cond_8
+    if-eqz v5, :cond_7
 
     check-cast v4, Ljava/lang/reflect/TypeVariable;
 
@@ -888,7 +886,7 @@
 
     move-result-object v4
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_7
 
     invoke-static {v4, v3}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;I)Ljava/lang/Object;
 
@@ -902,19 +900,19 @@
 
     goto :goto_1
 
-    :cond_7
+    :cond_6
     aput-object v0, v1, v2
 
-    :cond_8
+    :cond_7
     :goto_1
     add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_0
 
-    :cond_9
+    :cond_8
     sget-boolean p3, Lcom/esotericsoftware/a/a;->Az:Z
 
-    if-eqz p3, :cond_a
+    if-eqz p3, :cond_9
 
     const-string p3, "kryo"
 
@@ -952,15 +950,15 @@
 
     invoke-static {p3, p1}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
 
-    :cond_a
+    :cond_9
     move-object v0, v1
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_b
+    :cond_a
     instance-of v1, p1, Ljava/lang/reflect/GenericArrayType;
 
-    if-eqz v1, :cond_d
+    if-eqz v1, :cond_c
 
     move-object v0, p1
 
@@ -982,9 +980,9 @@
 
     sget-boolean p3, Lcom/esotericsoftware/a/a;->Az:Z
 
-    if-eqz p3, :cond_c
+    if-eqz p3, :cond_b
 
-    if-eqz v0, :cond_c
+    if-eqz v0, :cond_b
 
     const-string p3, "kryo"
 
@@ -1016,19 +1014,18 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_2
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     invoke-static {p3, p1}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_c
+    :cond_b
     sget-boolean p3, Lcom/esotericsoftware/a/a;->Az:Z
 
-    if-eqz p3, :cond_d
+    if-eqz p3, :cond_c
 
     const-string p3, "kryo"
 
@@ -1050,10 +1047,14 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    :cond_d
-    :goto_3
+    move-result-object p1
+
+    invoke-static {p3, p1}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_c
+    :goto_2
     return-object v0
 .end method
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil$Factory.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil$Factory.smali
index 8d4840eb57..78de2998d0 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil$Factory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil$Factory.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil$Factory;
 .super Ljava/lang/Object;
+.source "FieldSerializerUnsafeUtil.java"
 
 
 # annotations
@@ -60,6 +61,8 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -79,11 +82,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil$Factory;->fieldSerializerUnsafeUtilConstructor:Ljava/lang/reflect/Constructor;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil.smali
index 6a0ba26a12..5a2a25a67d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil;
 .super Ljava/lang/Object;
+.source "FieldSerializerUnsafeUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali
index b863012733..5fc0993f0e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;
 .super Ljava/lang/Object;
+.source "FieldSerializerUnsafeUtilImpl.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil;
@@ -141,7 +142,7 @@
 
     const-wide/16 v8, -0x1
 
-    move-wide v11, v5
+    move-wide v12, v5
 
     move-object v10, v7
 
@@ -151,7 +152,7 @@
 
     const/4 v7, 0x0
 
-    const/4 v13, -0x1
+    const/4 v11, -0x1
 
     :goto_0
     const/4 v14, 0x1
@@ -174,41 +175,41 @@
 
     if-eqz v4, :cond_0
 
+    add-int v4, p3, v5
+
     move/from16 v17, v2
 
-    add-int v2, p3, v5
+    move-object/from16 v2, p4
 
-    move-object/from16 v4, p4
+    invoke-virtual {v2, v4}, Lcom/esotericsoftware/kryo/util/IntArray;->get(I)I
 
-    invoke-virtual {v4, v2}, Lcom/esotericsoftware/kryo/util/IntArray;->get(I)I
+    move-result v4
 
-    move-result v2
+    if-ne v4, v14, :cond_1
 
-    if-ne v2, v14, :cond_1
+    iget-object v4, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
-    iget-object v2, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+    iget-object v4, v4, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->access:Ljava/lang/Object;
 
-    iget-object v2, v2, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->access:Ljava/lang/Object;
-
-    check-cast v2, Lcom/esotericsoftware/b/c;
+    check-cast v4, Lcom/esotericsoftware/b/c;
 
     invoke-virtual {v3}, Ljava/lang/reflect/Field;->getName()Ljava/lang/String;
 
     move-result-object v14
 
-    invoke-virtual {v2, v14}, Lcom/esotericsoftware/b/c;->getIndex(Ljava/lang/String;)I
+    invoke-virtual {v4, v14}, Lcom/esotericsoftware/b/c;->getIndex(Ljava/lang/String;)I
 
-    move-result v2
+    move-result v4
 
     goto :goto_1
 
     :cond_0
-    move-object/from16 v4, p4
-
     move/from16 v17, v2
 
+    move-object/from16 v2, p4
+
     :cond_1
-    const/4 v2, -0x1
+    const/4 v4, -0x1
 
     :goto_1
     invoke-static {}, Lcom/esotericsoftware/kryo/util/UnsafeUtil;->unsafe()Lsun/misc/Unsafe;
@@ -233,69 +234,69 @@
 
     invoke-virtual {v3}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
 
-    move-result-object v16
+    move-result-object v20
 
-    invoke-virtual/range {v16 .. v16}, Ljava/lang/Class;->isPrimitive()Z
+    invoke-virtual/range {v20 .. v20}, Ljava/lang/Class;->isPrimitive()Z
 
-    move-result v16
+    move-result v20
 
-    if-nez v16, :cond_5
+    if-nez v20, :cond_5
 
     if-eqz v6, :cond_5
 
-    const/4 v4, 0x1
+    const/4 v2, 0x1
 
-    if-le v7, v4, :cond_3
+    if-le v7, v2, :cond_3
 
-    sget-boolean v4, Lcom/esotericsoftware/a/a;->Az:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->Az:Z
 
-    if-eqz v4, :cond_2
+    if-eqz v2, :cond_2
 
-    const-string v4, "kryo"
+    const-string v2, "kryo"
 
     new-instance v6, Ljava/lang/StringBuilder;
 
-    const-string v13, "Class "
+    const-string v11, "Class "
 
-    invoke-direct {v6, v13}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v6, v11}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v13, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+    iget-object v11, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
-    invoke-virtual {v13}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->getType()Ljava/lang/Class;
+    invoke-virtual {v11}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->getType()Ljava/lang/Class;
 
-    move-result-object v13
+    move-result-object v11
 
-    invoke-virtual {v13}, Ljava/lang/Class;->getName()Ljava/lang/String;
+    invoke-virtual {v11}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
-    move-result-object v13
+    move-result-object v11
 
-    invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v13, ". Found a set of consecutive primitive fields. Number of fields = "
+    const-string v11, ". Found a set of consecutive primitive fields. Number of fields = "
 
-    invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    const-string v13, ". Byte length = "
+    const-string v11, ". Byte length = "
 
-    invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-wide/from16 v20, v14
 
-    sub-long v13, v8, v11
+    sub-long v14, v8, v12
 
-    invoke-virtual {v6, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v14, v15}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    const-string v13, " Start offset = "
+    const-string v11, " Start offset = "
 
-    invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6, v11, v12}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v12, v13}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    const-string v13, " endOffset="
+    const-string v11, " endOffset="
 
-    invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v6, v8, v9}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -303,7 +304,7 @@
 
     move-result-object v6
 
-    invoke-static {v4, v6}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -311,102 +312,101 @@
     move-wide/from16 v20, v14
 
     :goto_2
-    new-instance v4, Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;
+    new-instance v2, Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;
 
-    sub-long/2addr v8, v11
+    sub-long/2addr v8, v12
 
-    invoke-direct {v4, v11, v12, v8, v9}, Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;-><init>(JJ)V
+    invoke-direct {v2, v12, v13, v8, v9}, Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;-><init>(JJ)V
 
-    iput-object v10, v4, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;->field:Ljava/lang/reflect/Field;
+    iput-object v10, v2, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;->field:Ljava/lang/reflect/Field;
 
-    :goto_3
-    invoke-interface {v1, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     move-wide/from16 v20, v14
 
     if-eqz v10, :cond_4
 
-    iget-object v4, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
     invoke-interface/range {p2 .. p2}, Ljava/util/List;->size()I
 
     move-result v6
 
-    invoke-virtual {v4, v10, v6, v13}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    invoke-virtual {v2, v10, v6, v11}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    move-result-object v4
+    move-result-object v2
 
-    goto :goto_3
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_4
-    :goto_4
-    iget-object v4, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+    :goto_3
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
     invoke-interface/range {p2 .. p2}, Ljava/util/List;->size()I
 
     move-result v6
 
-    invoke-virtual {v4, v3, v6, v2}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    invoke-virtual {v2, v3, v6, v4}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    move-result-object v4
+    move-result-object v2
 
-    invoke-interface {v1, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     const/4 v6, 0x0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     move-wide/from16 v20, v14
 
     invoke-virtual {v3}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
 
-    move-result-object v4
+    move-result-object v2
 
-    invoke-virtual {v4}, Ljava/lang/Class;->isPrimitive()Z
+    invoke-virtual {v2}, Ljava/lang/Class;->isPrimitive()Z
 
-    move-result v4
+    move-result v2
 
-    if-nez v4, :cond_6
+    if-nez v2, :cond_6
 
-    iget-object v4, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+    iget-object v2, v0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl;->serializer:Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
 
     invoke-interface/range {p2 .. p2}, Ljava/util/List;->size()I
 
     move-result v8
 
-    invoke-virtual {v4, v3, v8, v2}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    invoke-virtual {v2, v3, v8, v4}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
-    move-result-object v4
+    move-result-object v2
 
-    invoke-interface {v1, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_6
     if-nez v6, :cond_7
 
-    move-wide/from16 v11, v18
+    move-wide/from16 v12, v18
 
     const/4 v6, 0x1
 
     const/4 v7, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_7
     add-int/lit8 v7, v7, 0x1
 
-    :goto_5
+    :goto_4
     add-int/lit8 v5, v5, 0x1
 
-    move v13, v2
-
     move-object v10, v3
 
+    move v11, v4
+
     move/from16 v2, v17
 
     move-wide/from16 v8, v20
@@ -470,7 +470,7 @@
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sub-long v4, v8, v11
+    sub-long v4, v8, v12
 
     invoke-virtual {v3, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -478,7 +478,7 @@
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, v11, v12}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v12, v13}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     const-string v4, " endOffset="
 
@@ -495,9 +495,9 @@
     :cond_9
     new-instance v2, Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;
 
-    sub-long/2addr v8, v11
+    sub-long/2addr v8, v12
 
-    invoke-direct {v2, v11, v12, v8, v9}, Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;-><init>(JJ)V
+    invoke-direct {v2, v12, v13, v8, v9}, Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;-><init>(JJ)V
 
     iput-object v10, v2, Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;->field:Ljava/lang/reflect/Field;
 
@@ -514,7 +514,7 @@
 
     move-result v3
 
-    invoke-virtual {v2, v10, v3, v13}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+    invoke-virtual {v2, v10, v3, v11}, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->newCachedField(Ljava/lang/reflect/Field;II)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/Generics.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/Generics.smali
index 181c610126..64fae649d1 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/Generics.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/Generics.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/Generics;
 .super Ljava/lang/Object;
+.source "Generics.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/GenericsResolver.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/GenericsResolver.smali
index 44174b74a1..3059c74aa3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/GenericsResolver.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/GenericsResolver.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/serializers/GenericsResolver;
 .super Ljava/lang/Object;
+.source "GenericsResolver.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer$ObjectInputStreamWithKryoClassLoader.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer$ObjectInputStreamWithKryoClassLoader.smali
index 4ee32d0206..9b871d207e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer$ObjectInputStreamWithKryoClassLoader.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer$ObjectInputStreamWithKryoClassLoader.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/JavaSerializer$ObjectInputStreamWithKryoClassLoader;
 .super Ljava/io/ObjectInputStream;
+.source "JavaSerializer.java"
 
 
 # annotations
@@ -62,11 +63,11 @@
 
     invoke-static {v0, v1, v2}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     move-exception v0
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer.smali
index 6833637a10..35db12c7fe 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/JavaSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/JavaSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "JavaSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer$BindMap.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer$BindMap.smali
index 6e88fae70e..0bfd7f9f4e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer$BindMap.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer$BindMap.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/serializers/MapSerializer$BindMap;
 .super Ljava/lang/Object;
+.source "MapSerializer.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer.smali
index c4f8ad23d8..f9eb23c14e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/MapSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/MapSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "MapSerializer.java"
 
 
 # annotations
@@ -202,17 +203,17 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/MapSerializer;->keyGenericType:Ljava/lang/Class;
-
     if-nez v3, :cond_0
 
-    invoke-virtual {p1, v1}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
+    invoke-virtual {p1, v4}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
 
     move-result-object v3
 
     :cond_0
     iput-object v5, p0, Lcom/esotericsoftware/kryo/serializers/MapSerializer;->keyGenericType:Ljava/lang/Class;
 
+    move-object v1, v4
+
     :cond_1
     iget-object v4, p0, Lcom/esotericsoftware/kryo/serializers/MapSerializer;->valueSerializer:Lcom/esotericsoftware/kryo/Serializer;
 
@@ -220,17 +221,17 @@
 
     if-eqz v6, :cond_3
 
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/MapSerializer;->valueGenericType:Ljava/lang/Class;
-
     if-nez v4, :cond_2
 
-    invoke-virtual {p1, v2}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
+    invoke-virtual {p1, v6}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
 
     move-result-object v4
 
     :cond_2
     iput-object v5, p0, Lcom/esotericsoftware/kryo/serializers/MapSerializer;->valueGenericType:Ljava/lang/Class;
 
+    move-object v2, v6
+
     :cond_3
     invoke-virtual {p1, p3}, Lcom/esotericsoftware/kryo/Kryo;->reference(Ljava/lang/Object;)V
 
@@ -426,9 +427,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/serializers/MapSerializer;->keyGenericType:Ljava/lang/Class;
-
-    invoke-virtual {p1, v0}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
+    invoke-virtual {p1, v1}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
 
     move-result-object v0
 
@@ -444,9 +443,7 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/MapSerializer;->valueGenericType:Ljava/lang/Class;
-
-    invoke-virtual {p1, v1}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
+    invoke-virtual {p1, v3}, Lcom/esotericsoftware/kryo/Kryo;->getSerializer(Ljava/lang/Class;)Lcom/esotericsoftware/kryo/Serializer;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectCachedFieldFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectCachedFieldFactory.smali
index 2820918eb6..b60df1c91f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectCachedFieldFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectCachedFieldFactory.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/ObjectCachedFieldFactory;
 .super Ljava/lang/Object;
+.source "ObjectCachedFieldFactory.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali
index 884364c24a..1ee947cda3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali
index 48cb1261bc..53f8c60ce5 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali
index 16edb5bd66..85f7ae2b59 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali
index 7feca64d0b..d4ceabf197 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali
index f8d553f010..9ec72bc61b 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali
index 8fe325c7d8..c00345a185 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali
index d4f2c1a1de..3f5880e60a 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali
index a719175b81..8e88720294 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "ObjectField.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField.smali
index 2948316547..12ce099f2d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/ObjectField.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/ObjectField;
 .super Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+.source "ObjectField.java"
 
 
 # annotations
@@ -66,7 +67,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->kryo:Lcom/esotericsoftware/kryo/Kryo;
 
-    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->ey()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->ex()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -282,7 +283,7 @@
 
     const/4 p1, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     if-nez v1, :cond_2
@@ -304,12 +305,11 @@
 
     move-result-object v0
 
-    :goto_0
     invoke-virtual {v2, p1, v0, v1}, Lcom/esotericsoftware/kryo/Kryo;->readObject(Lcom/esotericsoftware/kryo/io/Input;Ljava/lang/Class;Lcom/esotericsoftware/kryo/Serializer;)Ljava/lang/Object;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     if-nez v1, :cond_4
@@ -341,14 +341,16 @@
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_5
     iget-object v2, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->kryo:Lcom/esotericsoftware/kryo/Kryo;
 
-    goto :goto_0
+    invoke-virtual {v2, p1, v0, v1}, Lcom/esotericsoftware/kryo/Kryo;->readObject(Lcom/esotericsoftware/kryo/io/Input;Ljava/lang/Class;Lcom/esotericsoftware/kryo/Serializer;)Ljava/lang/Object;
 
-    :goto_1
+    move-result-object p1
+
+    :goto_0
     invoke-virtual {p0, p2, p1}, Lcom/esotericsoftware/kryo/serializers/ObjectField;->setField(Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
@@ -361,7 +363,7 @@
     :catchall_0
     move-exception p1
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception p1
@@ -473,7 +475,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :goto_2
+    :goto_1
     throw p1
 .end method
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$1.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$1.smali
index d6c7a6574b..c530b0561f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/esotericsoftware/kryo/serializers/OptionalSerializers$1;
 .super Ljava/lang/Object;
+.source "OptionalSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalDoubleSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalDoubleSerializer.smali
index 2956e27022..ab6d0ad4e5 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalDoubleSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalDoubleSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalDoubleSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "OptionalSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalIntSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalIntSerializer.smali
index 4d09375433..b1d671306b 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalIntSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalIntSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalIntSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "OptionalSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalLongSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalLongSerializer.smali
index 90b278f502..7fc5bd9f08 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalLongSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalLongSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalLongSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "OptionalSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalSerializer.smali
index 17782762e2..9a3f189d4a 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/OptionalSerializers$OptionalSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "OptionalSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers.smali
index 73d618e06c..2e65164925 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/OptionalSerializers.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/serializers/OptionalSerializers;
 .super Ljava/lang/Object;
+.source "OptionalSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$1.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$1.smali
index 3a31290d21..56609e58cc 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/TaggedFieldSerializer$1;
 .super Ljava/lang/Object;
+.source "TaggedFieldSerializer.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$Tag.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$Tag.smali
index 50a4605d3e..7d963a4470 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$Tag.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer$Tag.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/serializers/TaggedFieldSerializer$Tag;
 .super Ljava/lang/Object;
+.source "TaggedFieldSerializer.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali
index d6bdd094fc..8ae9c0ffcb 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/TaggedFieldSerializer;
 .super Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+.source "TaggedFieldSerializer.java"
 
 
 # annotations
@@ -203,15 +204,13 @@
 
     iget-object v6, p0, Lcom/esotericsoftware/kryo/serializers/TaggedFieldSerializer;->tags:[I
 
-    aget v6, v6, v3
-
-    iget-object v7, p0, Lcom/esotericsoftware/kryo/serializers/TaggedFieldSerializer;->tags:[I
+    aget v7, v6, v3
 
     add-int/lit8 v8, v3, -0x1
 
-    aget v7, v7, v8
+    aget v6, v6, v8
 
-    if-eq v6, v7, :cond_3
+    if-eq v7, v6, :cond_3
 
     goto :goto_2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali
index 495049dc62..e1c9de6193 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig;
 .super Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;
+.source "TaggedFieldSerializerConfig.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$1.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$1.smali
index e9e9ad5823..7b5adf50b9 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/esotericsoftware/kryo/serializers/TimeSerializers$1;
 .super Ljava/lang/Object;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$DurationSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$DurationSerializer.smali
index d23a65088e..96ffb8dd05 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$DurationSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$DurationSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$DurationSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$InstantSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$InstantSerializer.smali
index 751b19c159..1aa82d3156 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$InstantSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$InstantSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$InstantSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateSerializer.smali
index 30f0850a0b..dedc10df8a 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateTimeSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateTimeSerializer.smali
index dd02c0f12b..0dc7cc6ccc 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateTimeSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateTimeSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$LocalDateTimeSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalTimeSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalTimeSerializer.smali
index 59f2f45019..9afee1df52 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalTimeSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$LocalTimeSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$LocalTimeSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
@@ -59,7 +60,7 @@
 
     const/4 v2, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/io/Input;->readByte()B
@@ -72,10 +73,9 @@
 
     move v2, p0
 
-    :goto_0
     const/4 p0, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/io/Input;->readByte()B
@@ -88,6 +88,8 @@
 
     move v1, p0
 
+    const/4 p0, 0x0
+
     goto :goto_0
 
     :cond_2
@@ -101,7 +103,7 @@
 
     move v1, v3
 
-    :goto_1
+    :goto_0
     invoke-static {v0, v2, v1, p0}, Ljava/time/LocalTime;->of(IIII)Ljava/time/LocalTime;
 
     move-result-object p0
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$MonthDaySerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$MonthDaySerializer.smali
index 766f177a39..5d62fc1e9a 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$MonthDaySerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$MonthDaySerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$MonthDaySerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetDateTimeSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetDateTimeSerializer.smali
index 9ab3c889d5..4b87aae07b 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetDateTimeSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetDateTimeSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$OffsetDateTimeSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetTimeSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetTimeSerializer.smali
index a29360641a..e3fbb789cb 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetTimeSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$OffsetTimeSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$OffsetTimeSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$PeriodSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$PeriodSerializer.smali
index b583636497..4a21d71392 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$PeriodSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$PeriodSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$PeriodSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearMonthSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearMonthSerializer.smali
index ae4723da88..1f3f6253ae 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearMonthSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearMonthSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$YearMonthSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearSerializer.smali
index 8fa5d83ede..b2c70669cd 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$YearSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$YearSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneIdSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneIdSerializer.smali
index 57eade6cb7..0eba2e877c 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneIdSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneIdSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$ZoneIdSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneOffsetSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneOffsetSerializer.smali
index 03fefec0e2..c823b21c00 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneOffsetSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZoneOffsetSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$ZoneOffsetSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZonedDateTimeSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZonedDateTimeSerializer.smali
index 278a0e2ff2..b28cc8ef45 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZonedDateTimeSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers$ZonedDateTimeSerializer.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/TimeSerializers$ZonedDateTimeSerializer;
 .super Lcom/esotericsoftware/kryo/Serializer;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers.smali
index ccd6ba632f..a7c6d8aed8 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/TimeSerializers.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/esotericsoftware/kryo/serializers/TimeSerializers;
 .super Ljava/lang/Object;
+.source "TimeSerializers.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeBooleanField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeBooleanField.smali
index bea90090b7..f5b0ea4d64 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeBooleanField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeBooleanField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeBooleanField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeByteField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeByteField.smali
index 31b87f7f64..f523f44a2e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeByteField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeByteField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeByteField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField.smali
index c7a623afca..62ae04dd71 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
 .super Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCharField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCharField.smali
index 4735a949ee..13e072fdee 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCharField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCharField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCharField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeDoubleField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeDoubleField.smali
index eb4843a2e3..858f2a977a 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeDoubleField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeDoubleField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeDoubleField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeFloatField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeFloatField.smali
index 656a2bc179..04d832cf5d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeFloatField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeFloatField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeFloatField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeIntField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeIntField.smali
index 0bbc8fad11..ccbc754cc9 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeIntField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeIntField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeIntField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
@@ -75,7 +76,6 @@
 
     move-result p1
 
-    :goto_0
     invoke-virtual {v0, p2, v1, v2, p1}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
     return-void
@@ -91,7 +91,9 @@
 
     move-result p1
 
-    goto :goto_0
+    invoke-virtual {v0, p2, v1, v2, p1}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    return-void
 .end method
 
 .method public final write(Lcom/esotericsoftware/kryo/io/Output;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeLongField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeLongField.smali
index a4e54a8b63..5af854d0b9 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeLongField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeLongField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeLongField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali
index 671dd8ae30..513c5265bf 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField;
 .super Lcom/esotericsoftware/kryo/serializers/ObjectField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField.smali
index 4e04fb611e..f2ddffee3d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeRegionField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeShortField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeShortField.smali
index 663b36368b..94d799ad3e 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeShortField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeShortField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeShortField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeStringField.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeStringField.smali
index d8d1dbede6..8182af453f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeStringField.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeStringField.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeStringField;
 .super Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeCachedField;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields.smali
index 39ac790583..17aa565413 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCacheFields.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/UnsafeCacheFields;
 .super Ljava/lang/Object;
+.source "UnsafeCacheFields.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCachedFieldFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCachedFieldFactory.smali
index 14f6a811c7..071145f5d3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCachedFieldFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/UnsafeCachedFieldFactory.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/serializers/UnsafeCachedFieldFactory;
 .super Ljava/lang/Object;
+.source "UnsafeCachedFieldFactory.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldFactory;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer$Since.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer$Since.smali
index 4d0185653c..0be4a57780 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer$Since.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer$Since.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/esotericsoftware/kryo/serializers/VersionFieldSerializer$Since;
 .super Ljava/lang/Object;
+.source "VersionFieldSerializer.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer.smali b/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer.smali
index ee5c19a964..867ecbb1d2 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/serializers/VersionFieldSerializer.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/serializers/VersionFieldSerializer;
 .super Lcom/esotericsoftware/kryo/serializers/FieldSerializer;
+.source "VersionFieldSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/DefaultClassResolver.smali b/com.discord/smali/com/esotericsoftware/kryo/util/DefaultClassResolver.smali
index 3af22dd032..a8ccc4e19f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/DefaultClassResolver.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/DefaultClassResolver.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/DefaultClassResolver;
 .super Ljava/lang/Object;
+.source "DefaultClassResolver.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/ClassResolver;
@@ -162,8 +163,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/DefaultClassResolver;->nameToClass:Lcom/esotericsoftware/kryo/util/ObjectMap;
-
     invoke-virtual {v0, p1}, Lcom/esotericsoftware/kryo/util/ObjectMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
@@ -401,12 +400,10 @@
     :try_start_1
     invoke-static {p1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v2
+    move-result-object v1
     :try_end_1
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
 
-    move-object v1, v2
-
     :goto_0
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/DefaultClassResolver;->nameToClass:Lcom/esotericsoftware/kryo/util/ObjectMap;
 
@@ -727,8 +724,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/DefaultClassResolver;->classToNameId:Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;
-
     invoke-virtual {v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->clear()V
 
     :cond_0
@@ -736,8 +731,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/DefaultClassResolver;->nameIdToClass:Lcom/esotericsoftware/kryo/util/IntMap;
-
     invoke-virtual {v0}, Lcom/esotericsoftware/kryo/util/IntMap;->clear()V
 
     :cond_1
@@ -872,8 +865,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/DefaultClassResolver;->classToNameId:Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;
-
     const/4 v1, -0x1
 
     invoke-virtual {v0, p2, v1}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->get(Ljava/lang/Object;I)I
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/DefaultStreamFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/util/DefaultStreamFactory.smali
index bd5829f5aa..7ece5da3ab 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/DefaultStreamFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/DefaultStreamFactory.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/DefaultStreamFactory;
 .super Ljava/lang/Object;
+.source "DefaultStreamFactory.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/StreamFactory;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/FastestStreamFactory.smali b/com.discord/smali/com/esotericsoftware/kryo/util/FastestStreamFactory.smali
index 873c35e86a..a50cd09ba4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/FastestStreamFactory.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/FastestStreamFactory.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/FastestStreamFactory;
 .super Ljava/lang/Object;
+.source "FastestStreamFactory.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/StreamFactory;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entries.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entries.smali
index 0177a6e7fe..1e88182f18 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entries.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entries.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IdentityMap$Entries;
 .super Lcom/esotericsoftware/kryo/util/IdentityMap$MapIterator;
+.source "IdentityMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entry.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entry.smali
index 04610954eb..6a0f0ed0db 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entry.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Entry.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IdentityMap$Entry;
 .super Ljava/lang/Object;
+.source "IdentityMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Keys.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Keys.smali
index cbb8120cb9..3993d28946 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Keys.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Keys.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IdentityMap$Keys;
 .super Lcom/esotericsoftware/kryo/util/IdentityMap$MapIterator;
+.source "IdentityMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$MapIterator.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$MapIterator.smali
index 09e452503e..f5f6d345f8 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$MapIterator.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$MapIterator.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/util/IdentityMap$MapIterator;
 .super Ljava/lang/Object;
+.source "IdentityMap.java"
 
 
 # annotations
@@ -114,8 +115,6 @@
 
     if-ltz v0, :cond_1
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap$MapIterator;->currentIndex:I
-
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap$MapIterator;->map:Lcom/esotericsoftware/kryo/util/IdentityMap;
 
     iget v1, v1, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Values.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Values.smali
index c09ee3fa0c..87eca070de 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Values.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap$Values.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IdentityMap$Values;
 .super Lcom/esotericsoftware/kryo/util/IdentityMap$MapIterator;
+.source "IdentityMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap.smali
index a20989e4ec..c38ac7c6d5 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityMap.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IdentityMap;
 .super Ljava/lang/Object;
+.source "IdentityMap.java"
 
 
 # annotations
@@ -129,8 +130,6 @@
 
     ushr-int/lit8 p1, p1, 0x10
 
-    const/4 v0, 0x1
-
     if-eqz p1, :cond_0
 
     const/4 p1, 0x1
@@ -145,21 +144,17 @@
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
 
-    int-to-float p1, p1
+    int-to-float v0, p1
 
-    mul-float p1, p1, p2
+    mul-float v0, v0, p2
 
-    float-to-int p1, p1
+    float-to-int p2, v0
 
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->threshold:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->threshold:I
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
+    add-int/lit8 p2, p1, -0x1
 
-    sub-int/2addr p1, v0
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->mask:I
-
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->mask:I
 
     invoke-static {p1}, Ljava/lang/Integer;->numberOfTrailingZeros(I)I
 
@@ -481,7 +476,7 @@
 
     move/from16 v8, p9
 
-    move-object/from16 v18, p10
+    move-object/from16 p1, p10
 
     const/16 v17, 0x0
 
@@ -500,9 +495,9 @@
 
     aput-object v10, v2, v8
 
-    move-object v10, v7
+    move-object/from16 v9, p1
 
-    move-object/from16 v9, v18
+    move-object v10, v7
 
     goto :goto_2
 
@@ -676,16 +671,29 @@
     return-void
 
     :cond_8
-    move-object/from16 v18, v8
+    move-object/from16 v18, v1
 
-    move v8, v7
+    goto :goto_3
 
     :cond_9
-    add-int/lit8 v7, v17, 0x1
+    move-object/from16 v18, v1
 
-    if-eq v7, v5, :cond_a
+    move v7, v8
 
-    move/from16 v17, v7
+    move-object/from16 v8, p1
+
+    :goto_3
+    add-int/lit8 v1, v17, 0x1
+
+    if-eq v1, v5, :cond_a
+
+    move/from16 v17, v1
+
+    move-object/from16 p1, v8
+
+    move-object/from16 v1, v18
+
+    move v8, v7
 
     goto/16 :goto_1
 
@@ -724,9 +732,7 @@
 
     if-nez v6, :cond_1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v5
+    aput-object p1, v1, v5
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
@@ -762,9 +768,7 @@
 
     if-nez v8, :cond_3
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v7
+    aput-object p1, v1, v7
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
@@ -800,9 +804,7 @@
 
     if-nez v10, :cond_5
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v9
+    aput-object p1, v1, v9
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
@@ -842,11 +844,9 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    if-nez v1, :cond_7
-
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
+    if-nez v2, :cond_7
 
     aput-object p1, v1, v0
 
@@ -876,7 +876,7 @@
     :cond_7
     move v11, v0
 
-    move-object v12, v1
+    move-object v12, v2
 
     goto :goto_0
 
@@ -898,7 +898,7 @@
 .end method
 
 .method private putStash(Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TK;TV;)V"
@@ -922,25 +922,21 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
+    iget v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashSize:I
+    add-int/2addr v1, v0
 
-    add-int/2addr v0, v1
+    iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v1, v0
+    aput-object p1, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aput-object p2, p1, v0
+    aput-object p2, p1, v1
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashSize:I
+    add-int/lit8 v0, v0, 0x1
 
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashSize:I
+    iput v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashSize:I
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
 
@@ -952,7 +948,7 @@
 .end method
 
 .method private resize(I)V
-    .locals 5
+    .locals 6
 
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
 
@@ -1050,15 +1046,13 @@
 
     iget v4, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashCapacity:I
 
-    add-int/2addr v4, p1
+    add-int v5, p1, v4
 
-    new-array v4, v4, [Ljava/lang/Object;
+    new-array v5, v5, [Ljava/lang/Object;
 
-    check-cast v4, [Ljava/lang/Object;
+    check-cast v5, [Ljava/lang/Object;
 
-    iput-object v4, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    iget v4, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashCapacity:I
+    iput-object v5, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
     add-int/2addr p1, v4
 
@@ -1379,8 +1373,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->entries:Lcom/esotericsoftware/kryo/util/IdentityMap$Entries;
-
     invoke-virtual {v0}, Lcom/esotericsoftware/kryo/util/IdentityMap$Entries;->reset()V
 
     :goto_0
@@ -1678,8 +1670,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keys:Lcom/esotericsoftware/kryo/util/IdentityMap$Keys;
-
     invoke-virtual {v0}, Lcom/esotericsoftware/kryo/util/IdentityMap$Keys;->reset()V
 
     :goto_0
@@ -1704,32 +1694,30 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
-    iget v3, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->mask:I
+    iget v2, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->mask:I
 
-    iget-boolean v4, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->isBigTable:Z
+    iget-boolean v3, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->isBigTable:Z
 
     invoke-static/range {p1 .. p1}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
-    move-result v5
+    move-result v4
 
-    and-int/2addr v3, v5
+    and-int v5, v4, v2
 
-    aget-object v6, v0, v3
+    aget-object v6, v0, v5
 
     if-ne v6, v1, :cond_0
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v3
+    aget-object v1, v0, v5
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v5
 
-    aput-object p2, v1, v3
-
-    return-object v0
+    return-object v1
 
     :cond_0
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash2(I)I
+    invoke-direct {v11, v4}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash2(I)I
 
     move-result v7
 
@@ -1739,16 +1727,14 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v7
+    aget-object v1, v0, v7
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v7
 
-    aput-object p2, v1, v7
-
-    return-object v0
+    return-object v1
 
     :cond_1
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash3(I)I
+    invoke-direct {v11, v4}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash3(I)I
 
     move-result v9
 
@@ -1758,84 +1744,82 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v9
+    aget-object v1, v0, v9
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v9
 
-    aput-object p2, v1, v9
-
-    return-object v0
+    return-object v1
 
     :cond_2
-    const/4 v12, -0x1
+    const/4 v2, -0x1
 
-    if-eqz v4, :cond_4
+    const/4 v12, 0x0
 
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash4(I)I
+    if-eqz v3, :cond_4
 
-    move-result v5
+    invoke-direct {v11, v4}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash4(I)I
 
-    aget-object v12, v0, v5
+    move-result v2
 
-    if-ne v12, v1, :cond_3
+    aget-object v4, v0, v2
+
+    if-ne v4, v1, :cond_3
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v5
+    aget-object v1, v0, v2
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v2
 
-    aput-object p2, v1, v5
-
-    return-object v0
+    return-object v1
 
     :cond_3
-    move v14, v5
+    move v14, v2
+
+    move-object v13, v4
 
     goto :goto_0
 
     :cond_4
-    const/4 v12, 0x0
+    move-object v13, v12
 
     const/4 v14, -0x1
 
     :goto_0
-    iget v5, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
+    iget v2, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
 
-    iget v15, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashSize:I
+    iget v4, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->stashSize:I
 
-    add-int/2addr v15, v5
+    add-int/2addr v4, v2
 
     :goto_1
-    if-ge v5, v15, :cond_6
+    if-ge v2, v4, :cond_6
 
-    aget-object v13, v0, v5
+    aget-object v15, v0, v2
 
-    if-ne v13, v1, :cond_5
+    if-ne v15, v1, :cond_5
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v5
+    aget-object v1, v0, v2
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v2
 
-    aput-object p2, v1, v5
-
-    return-object v0
+    return-object v1
 
     :cond_5
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
 
     :cond_6
     if-nez v6, :cond_8
 
-    aput-object v1, v0, v3
+    aput-object v1, v0, v5
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aput-object p2, v0, v3
+    aput-object p2, v0, v5
 
     iget v0, v11, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
 
@@ -1854,9 +1838,7 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityMap;->resize(I)V
 
     :cond_7
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_8
     if-nez v8, :cond_a
@@ -1884,9 +1866,7 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityMap;->resize(I)V
 
     :cond_9
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_a
     if-nez v10, :cond_c
@@ -1914,14 +1894,12 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityMap;->resize(I)V
 
     :cond_b
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_c
-    if-eqz v4, :cond_e
+    if-eqz v3, :cond_e
 
-    if-nez v12, :cond_e
+    if-nez v13, :cond_e
 
     aput-object v1, v0, v14
 
@@ -1946,9 +1924,7 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityMap;->resize(I)V
 
     :cond_d
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_e
     move-object/from16 v0, p0
@@ -1957,6 +1933,8 @@
 
     move-object/from16 v2, p2
 
+    move v3, v5
+
     move-object v4, v6
 
     move v5, v7
@@ -1969,13 +1947,11 @@
 
     move v9, v14
 
-    move-object v10, v12
+    move-object v10, v13
 
     invoke-direct/range {v0 .. v10}, Lcom/esotericsoftware/kryo/util/IdentityMap;->push(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;)V
 
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_f
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -1985,10 +1961,12 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public remove(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TK;)TV;"
@@ -2005,32 +1983,27 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    if-ne v2, p1, :cond_0
+    if-ne v3, p1, :cond_0
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v1
+    aput-object v4, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v1
+    aget-object v0, p1, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object v4, p1, v1
 
-    aput-object v3, v0, v1
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
 
-    :goto_0
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
+    add-int/lit8 p1, p1, -0x1
 
-    add-int/lit8 v0, v0, -0x1
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
 
-    iput v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
-
-    return-object p1
+    return-object v0
 
     :cond_0
     invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash2(I)I
@@ -2039,23 +2012,25 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    if-ne v2, p1, :cond_1
+    if-ne v3, p1, :cond_1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v1
+    aput-object v4, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v1
+    aget-object v0, p1, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object v4, p1, v1
 
-    aput-object v3, v0, v1
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
+
+    return-object v0
 
     :cond_1
     invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/IdentityMap;->hash3(I)I
@@ -2064,23 +2039,25 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    if-ne v2, p1, :cond_2
+    if-ne v3, p1, :cond_2
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v1
+    aput-object v4, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v1
+    aget-object v0, p1, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object v4, p1, v1
 
-    aput-object v3, v0, v1
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
+
+    return-object v0
 
     :cond_2
     iget-boolean v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->isBigTable:Z
@@ -2093,23 +2070,25 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    if-ne v1, p1, :cond_3
+    if-ne v2, p1, :cond_3
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v0
+    aput-object v4, v1, v0
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v0
+    aget-object v1, p1, v0
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
+    aput-object v4, p1, v0
 
-    aput-object v3, v1, v0
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
+
+    return-object v1
 
     :cond_3
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/util/IdentityMap;->removeStash(Ljava/lang/Object;)Ljava/lang/Object;
@@ -2198,9 +2177,7 @@
 
     aput-object v3, v2, p1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->valueTable:[Ljava/lang/Object;
-
-    aput-object v1, p1, v0
+    aput-object v1, v2, v0
 
     return-void
 
@@ -2221,7 +2198,7 @@
 
     if-le v0, p1, :cond_0
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->size:I
+    move p1, v0
 
     :cond_0
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->capacity:I
@@ -2373,8 +2350,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityMap;->values:Lcom/esotericsoftware/kryo/util/IdentityMap$Values;
-
     invoke-virtual {v0}, Lcom/esotericsoftware/kryo/util/IdentityMap$Values;->reset()V
 
     :goto_0
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityObjectIntMap.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityObjectIntMap.smali
index ec1029f473..3cfe55457f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IdentityObjectIntMap.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IdentityObjectIntMap.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;
 .super Ljava/lang/Object;
+.source "IdentityObjectIntMap.java"
 
 
 # annotations
@@ -107,8 +108,6 @@
 
     ushr-int/lit8 p1, p1, 0x10
 
-    const/4 v0, 0x1
-
     if-eqz p1, :cond_0
 
     const/4 p1, 0x1
@@ -123,21 +122,17 @@
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
 
-    int-to-float p1, p1
+    int-to-float v0, p1
 
-    mul-float p1, p1, p2
+    mul-float v0, v0, p2
 
-    float-to-int p1, p1
+    float-to-int p2, v0
 
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->threshold:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->threshold:I
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
+    add-int/lit8 p2, p1, -0x1
 
-    sub-int/2addr p1, v0
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->mask:I
-
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->mask:I
 
     invoke-static {p1}, Ljava/lang/Integer;->numberOfTrailingZeros(I)I
 
@@ -334,15 +329,13 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aget p1, p1, v1
+    aget p2, p1, v1
 
-    iget-object p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
+    add-int/2addr p3, p2
 
-    add-int/2addr p3, p1
+    aput p3, p1, v1
 
-    aput p3, p2, v1
-
-    return p1
+    return p2
 
     :cond_0
     add-int/lit8 v1, v1, 0x1
@@ -505,7 +498,7 @@
 
     move/from16 v8, p9
 
-    move-object/from16 v18, p10
+    move-object/from16 p1, p10
 
     const/16 v17, 0x0
 
@@ -524,9 +517,9 @@
 
     aput v10, v2, v8
 
-    move v10, v7
+    move-object/from16 v9, p1
 
-    move-object/from16 v9, v18
+    move v10, v7
 
     goto :goto_2
 
@@ -700,16 +693,29 @@
     return-void
 
     :cond_8
-    move-object/from16 v18, v8
+    move-object/from16 v18, v1
 
-    move v8, v7
+    goto :goto_3
 
     :cond_9
-    add-int/lit8 v7, v17, 0x1
+    move-object/from16 v18, v1
 
-    if-eq v7, v5, :cond_a
+    move v7, v8
 
-    move/from16 v17, v7
+    move-object/from16 v8, p1
+
+    :goto_3
+    add-int/lit8 v1, v17, 0x1
+
+    if-eq v1, v5, :cond_a
+
+    move/from16 v17, v1
+
+    move-object/from16 p1, v8
+
+    move-object/from16 v1, v18
+
+    move v8, v7
 
     goto/16 :goto_1
 
@@ -748,9 +754,7 @@
 
     if-nez v6, :cond_1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v5
+    aput-object p1, v1, v5
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
@@ -786,9 +790,7 @@
 
     if-nez v8, :cond_3
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v7
+    aput-object p1, v1, v7
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
@@ -824,9 +826,7 @@
 
     if-nez v10, :cond_5
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v9
+    aput-object p1, v1, v9
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
@@ -866,11 +866,9 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    if-nez v1, :cond_7
-
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
+    if-nez v2, :cond_7
 
     aput-object p1, v1, v0
 
@@ -900,7 +898,7 @@
     :cond_7
     move v11, v0
 
-    move-object v12, v1
+    move-object v12, v2
 
     goto :goto_0
 
@@ -922,7 +920,7 @@
 .end method
 
 .method private putStash(Ljava/lang/Object;I)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TK;I)V"
@@ -946,25 +944,21 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
+    iget v1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashSize:I
+    add-int/2addr v1, v0
 
-    add-int/2addr v0, v1
+    iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v1, v0
+    aput-object p1, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aput p2, p1, v0
+    aput p2, p1, v1
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashSize:I
+    add-int/lit8 v0, v0, 0x1
 
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashSize:I
+    iput v0, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashSize:I
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
 
@@ -976,7 +970,7 @@
 .end method
 
 .method private resize(I)V
-    .locals 5
+    .locals 6
 
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
 
@@ -1074,15 +1068,13 @@
 
     iget v4, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashCapacity:I
 
-    add-int/2addr v4, p1
+    add-int v5, p1, v4
 
-    new-array v4, v4, [Ljava/lang/Object;
+    new-array v5, v5, [Ljava/lang/Object;
 
-    check-cast v4, [Ljava/lang/Object;
+    check-cast v5, [Ljava/lang/Object;
 
-    iput-object v4, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    iget v4, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashCapacity:I
+    iput-object v5, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
     add-int/2addr p1, v4
 
@@ -1515,26 +1507,24 @@
     :cond_1
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aget p1, p1, v1
+    aget p2, p1, v1
 
-    iget-object p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
+    add-int/2addr p3, p2
 
-    add-int/2addr p3, p1
+    aput p3, p1, v1
 
-    aput p3, p2, v1
-
-    return p1
+    return p2
 .end method
 
 .method public put(Ljava/lang/Object;I)V
-    .locals 16
+    .locals 15
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TK;I)V"
         }
     .end annotation
 
-    move-object/from16 v11, p0
+    move-object v11, p0
 
     move-object/from16 v1, p1
 
@@ -1542,28 +1532,28 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
-    iget v3, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->mask:I
+    iget v2, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->mask:I
 
-    iget-boolean v4, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->isBigTable:Z
+    iget-boolean v3, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->isBigTable:Z
 
     invoke-static/range {p1 .. p1}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
-    move-result v5
+    move-result v4
 
-    and-int/2addr v3, v5
+    and-int v5, v4, v2
 
-    aget-object v6, v0, v3
+    aget-object v6, v0, v5
 
     if-ne v1, v6, :cond_0
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aput p2, v0, v3
+    aput p2, v0, v5
 
     return-void
 
     :cond_0
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->hash2(I)I
+    invoke-direct {p0, v4}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->hash2(I)I
 
     move-result v7
 
@@ -1578,7 +1568,7 @@
     return-void
 
     :cond_1
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->hash3(I)I
+    invoke-direct {p0, v4}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->hash3(I)I
 
     move-result v9
 
@@ -1593,64 +1583,69 @@
     return-void
 
     :cond_2
-    const/4 v12, -0x1
+    const/4 v2, -0x1
 
-    const/4 v13, 0x0
+    const/4 v12, 0x0
 
-    if-eqz v4, :cond_4
+    if-eqz v3, :cond_4
 
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->hash4(I)I
+    invoke-direct {p0, v4}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->hash4(I)I
 
-    move-result v5
+    move-result v2
 
-    aget-object v12, v0, v5
+    aget-object v4, v0, v2
 
-    if-ne v1, v12, :cond_3
+    if-ne v1, v4, :cond_3
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aput p2, v0, v5
+    aput p2, v0, v2
 
     return-void
 
     :cond_3
-    move-object v13, v12
+    move v13, v2
 
-    move v12, v5
+    move-object v12, v4
+
+    goto :goto_0
 
     :cond_4
-    iget v5, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
-
-    iget v14, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashSize:I
-
-    add-int/2addr v14, v5
+    const/4 v13, -0x1
 
     :goto_0
-    if-ge v5, v14, :cond_6
+    iget v2, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
 
-    aget-object v15, v0, v5
+    iget v4, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->stashSize:I
 
-    if-ne v15, v1, :cond_5
+    add-int/2addr v4, v2
+
+    :goto_1
+    if-ge v2, v4, :cond_6
+
+    aget-object v14, v0, v2
+
+    if-ne v14, v1, :cond_5
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aput p2, v0, v5
+    aput p2, v0, v2
 
     return-void
 
     :cond_5
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v2, v2, 0x1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_6
     if-nez v6, :cond_8
 
-    aput-object v1, v0, v3
+    aput-object v1, v0, v5
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aput p2, v0, v3
+    aput p2, v0, v5
 
     iget v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
 
@@ -1666,7 +1661,7 @@
 
     shl-int/lit8 v0, v0, 0x1
 
-    invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
+    invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
 
     :cond_7
     return-void
@@ -1694,7 +1689,7 @@
 
     shl-int/lit8 v0, v0, 0x1
 
-    invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
+    invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
 
     :cond_9
     return-void
@@ -1722,21 +1717,21 @@
 
     shl-int/lit8 v0, v0, 0x1
 
-    invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
+    invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
 
     :cond_b
     return-void
 
     :cond_c
-    if-eqz v4, :cond_e
+    if-eqz v3, :cond_e
 
-    if-nez v13, :cond_e
+    if-nez v12, :cond_e
 
-    aput-object v1, v0, v12
+    aput-object v1, v0, v13
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
-    aput p2, v0, v12
+    aput p2, v0, v13
 
     iget v0, v11, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
 
@@ -1752,18 +1747,20 @@
 
     shl-int/lit8 v0, v0, 0x1
 
-    invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
+    invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->resize(I)V
 
     :cond_d
     return-void
 
     :cond_e
-    move-object/from16 v0, p0
+    move-object v0, p0
 
     move-object/from16 v1, p1
 
     move/from16 v2, p2
 
+    move v3, v5
+
     move-object v4, v6
 
     move v5, v7
@@ -1774,9 +1771,9 @@
 
     move-object v8, v10
 
-    move v9, v12
+    move v9, v13
 
-    move-object v10, v13
+    move-object v10, v12
 
     invoke-direct/range {v0 .. v10}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->push(Ljava/lang/Object;IILjava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;)V
 
@@ -1790,10 +1787,12 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public remove(Ljava/lang/Object;I)I
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TK;I)I"
@@ -1810,21 +1809,18 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    if-ne p1, v2, :cond_0
+    if-ne p1, v3, :cond_0
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v1
+    aput-object v4, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
     aget p1, p1, v1
 
-    :goto_0
     iget p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
 
     add-int/lit8 p2, p2, -0x1
@@ -1840,19 +1836,23 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    if-ne p1, v2, :cond_1
+    if-ne p1, v3, :cond_1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v1
+    aput-object v4, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
     aget p1, p1, v1
 
-    goto :goto_0
+    iget p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
+
+    add-int/lit8 p2, p2, -0x1
+
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
+
+    return p1
 
     :cond_1
     invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->hash3(I)I
@@ -1861,19 +1861,23 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    if-ne p1, v2, :cond_2
+    if-ne p1, v3, :cond_2
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v1
+    aput-object v4, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
     aget p1, p1, v1
 
-    goto :goto_0
+    iget p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
+
+    add-int/lit8 p2, p2, -0x1
+
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
+
+    return p1
 
     :cond_2
     iget-boolean v1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->isBigTable:Z
@@ -1886,19 +1890,23 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    if-ne p1, v1, :cond_3
+    if-ne p1, v2, :cond_3
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object v3, p1, v0
+    aput-object v4, v1, v0
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->valueTable:[I
 
     aget p1, p1, v0
 
-    goto :goto_0
+    iget p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
+
+    add-int/lit8 p2, p2, -0x1
+
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
+
+    return p1
 
     :cond_3
     invoke-virtual {p0, p1, p2}, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->removeStash(Ljava/lang/Object;I)I
@@ -1996,7 +2004,7 @@
 
     if-le v0, p1, :cond_0
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->size:I
+    move p1, v0
 
     :cond_0
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IdentityObjectIntMap;->capacity:I
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IntArray.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IntArray.smali
index 74601ba5a2..4a88b06133 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IntArray.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IntArray.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IntArray;
 .super Ljava/lang/Object;
+.source "IntArray.java"
 
 
 # instance fields
@@ -48,19 +49,17 @@
 
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
 
-    new-array v0, v0, [I
+    new-array v1, v0, [I
 
-    iput-object v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
+    iput-object v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
 
     iget-object p1, p1, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
-
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
+    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
 
     const/4 v2, 0x0
 
-    invoke-static {p1, v2, v0, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v2, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     return-void
 .end method
@@ -126,8 +125,6 @@
 
     const/16 v0, 0x8
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
-
     int-to-float v1, v1
 
     const/high16 v2, 0x3fe00000    # 1.75f
@@ -413,8 +410,6 @@
 
     const/16 v0, 0x8
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
-
     int-to-float v1, v1
 
     const/high16 v2, 0x3fe00000    # 1.75f
@@ -502,39 +497,37 @@
 
     if-ge p1, v0, :cond_1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
+    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
 
-    aget v1, v0, p1
+    aget v2, v1, p1
 
-    iget v2, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v2, v2, -0x1
+    iput v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
 
-    iput v2, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
+    iget-boolean v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->ordered:Z
 
-    iget-boolean v2, p0, Lcom/esotericsoftware/kryo/util/IntArray;->ordered:Z
+    if-eqz v0, :cond_0
 
-    if-eqz v2, :cond_0
-
-    add-int/lit8 v2, p1, 0x1
+    add-int/lit8 v0, p1, 0x1
 
     iget v3, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
 
     sub-int/2addr v3, p1
 
-    invoke-static {v0, v2, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v0, v1, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v2, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
+    iget v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
 
-    aget v2, v0, v2
+    aget v0, v1, v0
 
-    aput v2, v0, p1
+    aput v0, v1, p1
 
     :goto_0
-    return v1
+    return v2
 
     :cond_1
     new-instance v0, Ljava/lang/IndexOutOfBoundsException;
@@ -608,32 +601,26 @@
 
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v1, v0, -0x1
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
-
-    div-int/lit8 v1, v1, 0x2
+    div-int/lit8 v0, v0, 0x2
 
     const/4 v2, 0x0
 
     :goto_0
-    if-ge v2, v1, :cond_0
+    if-ge v2, v0, :cond_0
 
-    sub-int v3, v0, v2
+    sub-int v3, v1, v2
 
     iget-object v4, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
 
-    aget v4, v4, v2
+    aget v5, v4, v2
 
-    iget-object v5, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
+    aget v6, v4, v3
 
-    aget v6, v5, v3
+    aput v6, v4, v2
 
-    aput v6, v5, v2
-
-    iget-object v5, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
-
-    aput v4, v5, v3
+    aput v5, v4, v3
 
     add-int/lit8 v2, v2, 0x1
 
@@ -699,8 +686,6 @@
 
     if-ge p1, v0, :cond_1
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
-
     if-ge p2, v0, :cond_0
 
     iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
@@ -743,17 +728,15 @@
 
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
 
-    new-array v0, v0, [I
+    new-array v1, v0, [I
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
-
-    iget v2, p0, Lcom/esotericsoftware/kryo/util/IntArray;->size:I
+    iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IntArray;->items:[I
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v3, v1, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    return-object v0
+    return-object v1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entries.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entries.smali
index 217f1b8136..c7c345289a 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entries.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entries.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IntMap$Entries;
 .super Lcom/esotericsoftware/kryo/util/IntMap$MapIterator;
+.source "IntMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
@@ -113,16 +114,13 @@
 
     iput v1, v0, Lcom/esotericsoftware/kryo/util/IntMap$Entry;->key:I
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntMap$Entries;->entry:Lcom/esotericsoftware/kryo/util/IntMap$Entry;
-
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap$Entries;->map:Lcom/esotericsoftware/kryo/util/IntMap;
 
     iget-object v1, v1, Lcom/esotericsoftware/kryo/util/IntMap;->zeroValue:Ljava/lang/Object;
 
-    :goto_0
     iput-object v1, v0, Lcom/esotericsoftware/kryo/util/IntMap$Entry;->value:Ljava/lang/Object;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap$Entries;->entry:Lcom/esotericsoftware/kryo/util/IntMap$Entry;
@@ -143,9 +141,9 @@
 
     aget-object v1, v1, v2
 
-    goto :goto_0
+    iput-object v1, v0, Lcom/esotericsoftware/kryo/util/IntMap$Entry;->value:Ljava/lang/Object;
 
-    :goto_1
+    :goto_0
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IntMap$Entries;->nextIndex:I
 
     iput v0, p0, Lcom/esotericsoftware/kryo/util/IntMap$Entries;->currentIndex:I
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entry.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entry.smali
index fc45d7da26..f98818f529 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entry.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Entry.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IntMap$Entry;
 .super Ljava/lang/Object;
+.source "IntMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Keys.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Keys.smali
index 2c5295fb66..32e72aea39 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Keys.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Keys.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IntMap$Keys;
 .super Lcom/esotericsoftware/kryo/util/IntMap$MapIterator;
+.source "IntMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$MapIterator.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$MapIterator.smali
index e38d57ac34..07460aeea1 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$MapIterator.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$MapIterator.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/util/IntMap$MapIterator;
 .super Ljava/lang/Object;
+.source "IntMap.java"
 
 
 # annotations
@@ -134,8 +135,6 @@
 
     iput-object v2, v0, Lcom/esotericsoftware/kryo/util/IntMap;->zeroValue:Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntMap$MapIterator;->map:Lcom/esotericsoftware/kryo/util/IntMap;
-
     iput-boolean v1, v0, Lcom/esotericsoftware/kryo/util/IntMap;->hasZeroValue:Z
 
     goto :goto_0
@@ -145,8 +144,6 @@
 
     if-ltz v0, :cond_2
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/IntMap$MapIterator;->currentIndex:I
-
     iget-object v3, p0, Lcom/esotericsoftware/kryo/util/IntMap$MapIterator;->map:Lcom/esotericsoftware/kryo/util/IntMap;
 
     iget v3, v3, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Values.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Values.smali
index bd9aed8de9..f0872bdc5d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Values.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap$Values.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IntMap$Values;
 .super Lcom/esotericsoftware/kryo/util/IntMap$MapIterator;
+.source "IntMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap.smali b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap.smali
index 6ec17ef1c5..42380ccab3 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/IntMap.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/IntMap.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/IntMap;
 .super Ljava/lang/Object;
+.source "IntMap.java"
 
 
 # annotations
@@ -127,8 +128,6 @@
 
     ushr-int/lit8 p1, p1, 0x10
 
-    const/4 v0, 0x1
-
     if-eqz p1, :cond_0
 
     const/4 p1, 0x1
@@ -143,21 +142,17 @@
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
 
-    int-to-float p1, p1
+    int-to-float v0, p1
 
-    mul-float p1, p1, p2
+    mul-float v0, v0, p2
 
-    float-to-int p1, p1
+    float-to-int p2, v0
 
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->threshold:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IntMap;->threshold:I
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
+    add-int/lit8 p2, p1, -0x1
 
-    sub-int/2addr p1, v0
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->mask:I
-
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/IntMap;->mask:I
 
     invoke-static {p1}, Ljava/lang/Integer;->numberOfTrailingZeros(I)I
 
@@ -315,9 +310,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
-    iget-object v2, p1, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
-    array-length v2, v2
+    array-length v2, v0
 
     const/4 v3, 0x0
 
@@ -327,9 +320,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    iget-object v2, p1, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
-
-    array-length v2, v2
+    array-length v2, v0
 
     invoke-static {v0, v3, v1, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -480,7 +471,7 @@
 .end method
 
 .method private push(ILjava/lang/Object;IIIIIIII)V
-    .locals 19
+    .locals 20
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ITV;IIIIIIII)V"
@@ -529,7 +520,7 @@
 
     move/from16 v8, p9
 
-    move/from16 v18, p10
+    move/from16 p1, p10
 
     const/16 v17, 0x0
 
@@ -548,9 +539,9 @@
 
     aput-object v10, v2, v8
 
-    move-object v10, v7
+    move/from16 v9, p1
 
-    move/from16 v9, v18
+    move-object v10, v7
 
     goto :goto_2
 
@@ -720,16 +711,31 @@
     return-void
 
     :cond_8
-    move/from16 v18, v8
+    move-object/from16 v18, v1
+
+    move/from16 v19, v8
 
     move v8, v7
 
+    move/from16 v7, v19
+
+    goto :goto_3
+
     :cond_9
-    add-int/lit8 v7, v17, 0x1
+    move/from16 v7, p1
 
-    if-eq v7, v5, :cond_a
+    move-object/from16 v18, v1
 
-    move/from16 v17, v7
+    :goto_3
+    add-int/lit8 v1, v17, 0x1
+
+    if-eq v1, v5, :cond_a
+
+    move/from16 v17, v1
+
+    move/from16 p1, v7
+
+    move-object/from16 v1, v18
 
     goto/16 :goto_1
 
@@ -738,6 +744,8 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
@@ -775,8 +783,6 @@
 
     if-nez v6, :cond_2
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
     aput p1, v1, v5
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
@@ -813,8 +819,6 @@
 
     if-nez v8, :cond_4
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
     aput p1, v1, v7
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
@@ -851,8 +855,6 @@
 
     if-nez v10, :cond_6
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
     aput p1, v1, v9
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
@@ -891,11 +893,9 @@
 
     iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
-    aget v2, v2, v1
+    aget v3, v2, v1
 
-    if-nez v2, :cond_8
-
-    iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
+    if-nez v3, :cond_8
 
     aput p1, v2, v1
 
@@ -925,7 +925,7 @@
     :cond_8
     move v11, v1
 
-    move v12, v2
+    move v12, v3
 
     goto :goto_0
 
@@ -947,7 +947,7 @@
 .end method
 
 .method private putStash(ILjava/lang/Object;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ITV;)V"
@@ -971,25 +971,21 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
+    iget v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->stashSize:I
+    add-int/2addr v1, v0
 
-    add-int/2addr v0, v1
+    iget-object v2, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
-    aput p1, v1, v0
+    aput p1, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aput-object p2, p1, v0
+    aput-object p2, p1, v1
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->stashSize:I
+    add-int/lit8 v0, v0, 0x1
 
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->stashSize:I
+    iput v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->stashSize:I
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
 
@@ -1001,7 +997,7 @@
 .end method
 
 .method private resize(I)V
-    .locals 5
+    .locals 6
 
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
 
@@ -1099,13 +1095,11 @@
 
     iget v4, p0, Lcom/esotericsoftware/kryo/util/IntMap;->stashCapacity:I
 
-    add-int/2addr v4, p1
+    add-int v5, p1, v4
 
-    new-array v4, v4, [I
+    new-array v5, v5, [I
 
-    iput-object v4, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
-    iget v4, p0, Lcom/esotericsoftware/kryo/util/IntMap;->stashCapacity:I
+    iput-object v5, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
     add-int/2addr p1, v4
 
@@ -1837,13 +1831,11 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v4
+    aget-object v1, v0, v4
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v2, v0, v4
 
-    aput-object v2, v1, v4
-
-    return-object v0
+    return-object v1
 
     :cond_2
     invoke-direct/range {p0 .. p1}, Lcom/esotericsoftware/kryo/util/IntMap;->hash2(I)I
@@ -1856,13 +1848,11 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v7
+    aget-object v1, v0, v7
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v2, v0, v7
 
-    aput-object v2, v1, v7
-
-    return-object v0
+    return-object v1
 
     :cond_3
     invoke-direct/range {p0 .. p1}, Lcom/esotericsoftware/kryo/util/IntMap;->hash3(I)I
@@ -1875,13 +1865,11 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v9
+    aget-object v1, v0, v9
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v2, v0, v9
 
-    aput-object v2, v1, v9
-
-    return-object v0
+    return-object v1
 
     :cond_4
     const/4 v12, -0x1
@@ -1898,13 +1886,11 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v12
+    aget-object v1, v0, v12
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v2, v0, v12
 
-    aput-object v2, v1, v12
-
-    return-object v0
+    return-object v1
 
     :cond_5
     const/4 v13, -0x1
@@ -1925,13 +1911,11 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v14
+    aget-object v1, v0, v14
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v2, v0, v14
 
-    aput-object v2, v1, v14
-
-    return-object v0
+    return-object v1
 
     :cond_7
     add-int/lit8 v14, v14, 0x1
@@ -2136,7 +2120,7 @@
 .end method
 
 .method public remove(I)Ljava/lang/Object;
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I)TV;"
@@ -2162,7 +2146,6 @@
 
     iput-boolean v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->hasZeroValue:Z
 
-    :goto_0
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
 
     add-int/lit8 v0, v0, -0x1
@@ -2178,23 +2161,25 @@
 
     iget-object v3, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
-    aget v3, v3, v2
+    aget v4, v3, v2
 
-    if-ne v3, p1, :cond_2
+    if-ne v4, p1, :cond_2
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
-    aput v0, p1, v2
+    aput v0, v3, v2
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v2
+    aget-object v0, p1, v2
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v1, p1, v2
 
-    aput-object v1, v0, v2
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
+
+    return-object v0
 
     :cond_2
     invoke-direct {p0, p1}, Lcom/esotericsoftware/kryo/util/IntMap;->hash2(I)I
@@ -2203,23 +2188,25 @@
 
     iget-object v3, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
-    aget v3, v3, v2
+    aget v4, v3, v2
 
-    if-ne v3, p1, :cond_3
+    if-ne v4, p1, :cond_3
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
-    aput v0, p1, v2
+    aput v0, v3, v2
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v2
+    aget-object v0, p1, v2
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v1, p1, v2
 
-    aput-object v1, v0, v2
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
+
+    return-object v0
 
     :cond_3
     invoke-direct {p0, p1}, Lcom/esotericsoftware/kryo/util/IntMap;->hash3(I)I
@@ -2228,23 +2215,25 @@
 
     iget-object v3, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
-    aget v3, v3, v2
+    aget v4, v3, v2
 
-    if-ne v3, p1, :cond_4
+    if-ne v4, p1, :cond_4
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
-    aput v0, p1, v2
+    aput v0, v3, v2
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v2
+    aget-object v0, p1, v2
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v1, p1, v2
 
-    aput-object v1, v0, v2
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
+
+    return-object v0
 
     :cond_4
     iget-boolean v2, p0, Lcom/esotericsoftware/kryo/util/IntMap;->isBigTable:Z
@@ -2257,23 +2246,25 @@
 
     iget-object v3, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
 
-    aget v3, v3, v2
+    aget v4, v3, v2
 
-    if-ne v3, p1, :cond_5
+    if-ne v4, p1, :cond_5
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->keyTable:[I
-
-    aput v0, p1, v2
+    aput v0, v3, v2
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v2
+    aget-object v0, p1, v2
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
+    aput-object v1, p1, v2
 
-    aput-object v1, v0, v2
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
+
+    return-object v0
 
     :cond_5
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/util/IntMap;->removeStash(I)Ljava/lang/Object;
@@ -2362,9 +2353,7 @@
 
     aput-object v3, v2, p1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->valueTable:[Ljava/lang/Object;
-
-    aput-object v1, p1, v0
+    aput-object v1, v2, v0
 
     return-void
 
@@ -2385,7 +2374,7 @@
 
     if-le v0, p1, :cond_0
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/IntMap;->size:I
+    move p1, v0
 
     :cond_0
     iget v0, p0, Lcom/esotericsoftware/kryo/util/IntMap;->capacity:I
@@ -2463,7 +2452,7 @@
 
     invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     :goto_0
@@ -2481,10 +2470,9 @@
 
     aget-object v3, v2, v4
 
-    :goto_1
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     move v3, v4
@@ -2492,10 +2480,10 @@
     goto :goto_0
 
     :cond_3
-    :goto_2
+    :goto_1
     move v3, v4
 
-    :goto_3
+    :goto_2
     add-int/lit8 v4, v3, -0x1
 
     if-lez v3, :cond_4
@@ -2514,6 +2502,8 @@
 
     aget-object v3, v2, v4
 
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_4
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/ListReferenceResolver.smali b/com.discord/smali/com/esotericsoftware/kryo/util/ListReferenceResolver.smali
index 0fb7c339b1..a39404ef00 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/ListReferenceResolver.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/ListReferenceResolver.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/ListReferenceResolver;
 .super Ljava/lang/Object;
+.source "ListReferenceResolver.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/ReferenceResolver;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/MapReferenceResolver.smali b/com.discord/smali/com/esotericsoftware/kryo/util/MapReferenceResolver.smali
index 6d6e2d17dd..32fd3d112f 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/MapReferenceResolver.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/MapReferenceResolver.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/MapReferenceResolver;
 .super Ljava/lang/Object;
+.source "MapReferenceResolver.java"
 
 # interfaces
 .implements Lcom/esotericsoftware/kryo/ReferenceResolver;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entries.smali b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entries.smali
index fee52684da..d063962008 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entries.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entries.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/ObjectMap$Entries;
 .super Lcom/esotericsoftware/kryo/util/ObjectMap$MapIterator;
+.source "ObjectMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entry.smali b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entry.smali
index bc55897a66..a074d64ca7 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entry.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Entry.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/ObjectMap$Entry;
 .super Ljava/lang/Object;
+.source "ObjectMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Keys.smali b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Keys.smali
index a945150bbb..0194e615b4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Keys.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Keys.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/ObjectMap$Keys;
 .super Lcom/esotericsoftware/kryo/util/ObjectMap$MapIterator;
+.source "ObjectMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$MapIterator.smali b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$MapIterator.smali
index 1ded448fee..8545925ff6 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$MapIterator.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$MapIterator.smali
@@ -1,5 +1,6 @@
 .class Lcom/esotericsoftware/kryo/util/ObjectMap$MapIterator;
 .super Ljava/lang/Object;
+.source "ObjectMap.java"
 
 
 # annotations
@@ -114,8 +115,6 @@
 
     if-ltz v0, :cond_1
 
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap$MapIterator;->currentIndex:I
-
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap$MapIterator;->map:Lcom/esotericsoftware/kryo/util/ObjectMap;
 
     iget v1, v1, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Values.smali b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Values.smali
index 0369f0ddf0..c2b3491830 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Values.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap$Values.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/ObjectMap$Values;
 .super Lcom/esotericsoftware/kryo/util/ObjectMap$MapIterator;
+.source "ObjectMap.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap.smali b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap.smali
index e38802c2e3..55bc422bdc 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/ObjectMap.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/ObjectMap;
 .super Ljava/lang/Object;
+.source "ObjectMap.java"
 
 
 # annotations
@@ -137,8 +138,6 @@
 
     ushr-int/lit8 p1, p1, 0x10
 
-    const/4 v0, 0x1
-
     if-eqz p1, :cond_0
 
     const/4 p1, 0x1
@@ -153,21 +152,17 @@
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
 
-    int-to-float p1, p1
+    int-to-float v0, p1
 
-    mul-float p1, p1, p2
+    mul-float v0, v0, p2
 
-    float-to-int p1, p1
+    float-to-int p2, v0
 
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->threshold:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->threshold:I
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
+    add-int/lit8 p2, p1, -0x1
 
-    sub-int/2addr p1, v0
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->mask:I
-
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
+    iput p2, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->mask:I
 
     invoke-static {p1}, Ljava/lang/Integer;->numberOfTrailingZeros(I)I
 
@@ -327,9 +322,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
 
-    iget-object v2, p1, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
-
-    array-length v2, v2
+    array-length v2, v0
 
     const/4 v3, 0x0
 
@@ -339,9 +332,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    iget-object v2, p1, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
-
-    array-length v2, v2
+    array-length v2, v0
 
     invoke-static {v0, v3, v1, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -627,7 +618,7 @@
 
     move/from16 v8, p9
 
-    move-object/from16 v18, p10
+    move-object/from16 p1, p10
 
     const/16 v17, 0x0
 
@@ -646,9 +637,9 @@
 
     aput-object v10, v2, v8
 
-    move-object v10, v7
+    move-object/from16 v9, p1
 
-    move-object/from16 v9, v18
+    move-object v10, v7
 
     goto :goto_2
 
@@ -822,16 +813,29 @@
     return-void
 
     :cond_8
-    move-object/from16 v18, v8
+    move-object/from16 v18, v1
 
-    move v8, v7
+    goto :goto_3
 
     :cond_9
-    add-int/lit8 v7, v17, 0x1
+    move-object/from16 v18, v1
 
-    if-eq v7, v5, :cond_a
+    move v7, v8
 
-    move/from16 v17, v7
+    move-object/from16 v8, p1
+
+    :goto_3
+    add-int/lit8 v1, v17, 0x1
+
+    if-eq v1, v5, :cond_a
+
+    move/from16 v17, v1
+
+    move-object/from16 p1, v8
+
+    move-object/from16 v1, v18
+
+    move v8, v7
 
     goto/16 :goto_1
 
@@ -870,9 +874,7 @@
 
     if-nez v6, :cond_1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v5
+    aput-object p1, v1, v5
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
@@ -908,9 +910,7 @@
 
     if-nez v8, :cond_3
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v7
+    aput-object p1, v1, v7
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
@@ -946,9 +946,7 @@
 
     if-nez v10, :cond_5
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v0, v9
+    aput-object p1, v1, v9
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
@@ -988,11 +986,9 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
 
-    aget-object v1, v1, v0
+    aget-object v2, v1, v0
 
-    if-nez v1, :cond_7
-
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
+    if-nez v2, :cond_7
 
     aput-object p1, v1, v0
 
@@ -1022,7 +1018,7 @@
     :cond_7
     move v11, v0
 
-    move-object v12, v1
+    move-object v12, v2
 
     goto :goto_0
 
@@ -1044,7 +1040,7 @@
 .end method
 
 .method private putStash(Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TK;TV;)V"
@@ -1068,25 +1064,21 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
+    iget v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
 
-    iget v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashSize:I
+    add-int/2addr v1, v0
 
-    add-int/2addr v0, v1
+    iget-object v2, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
-
-    aput-object p1, v1, v0
+    aput-object p1, v2, v1
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aput-object p2, p1, v0
+    aput-object p2, p1, v1
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashSize:I
+    add-int/lit8 v0, v0, 0x1
 
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashSize:I
+    iput v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashSize:I
 
     iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
 
@@ -1111,36 +1103,34 @@
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
 
-    iget v3, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->mask:I
+    iget v2, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->mask:I
 
-    iget-boolean v4, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->isBigTable:Z
+    iget-boolean v3, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->isBigTable:Z
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v5
+    move-result v4
 
-    and-int/2addr v3, v5
+    and-int v5, v4, v2
 
-    aget-object v6, v0, v3
+    aget-object v6, v0, v5
 
     invoke-virtual {v1, v6}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    move-result v7
+    move-result v2
 
-    if-eqz v7, :cond_0
+    if-eqz v2, :cond_0
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v3
+    aget-object v1, v0, v5
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v5
 
-    aput-object p2, v1, v3
-
-    return-object v0
+    return-object v1
 
     :cond_0
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash2(I)I
+    invoke-direct {v11, v4}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash2(I)I
 
     move-result v7
 
@@ -1148,22 +1138,20 @@
 
     invoke-virtual {v1, v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    move-result v9
+    move-result v2
 
-    if-eqz v9, :cond_1
+    if-eqz v2, :cond_1
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v7
+    aget-object v1, v0, v7
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v7
 
-    aput-object p2, v1, v7
-
-    return-object v0
+    return-object v1
 
     :cond_1
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash3(I)I
+    invoke-direct {v11, v4}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash3(I)I
 
     move-result v9
 
@@ -1171,98 +1159,96 @@
 
     invoke-virtual {v1, v10}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    move-result v12
+    move-result v2
 
-    if-eqz v12, :cond_2
+    if-eqz v2, :cond_2
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v9
+    aget-object v1, v0, v9
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v9
 
-    aput-object p2, v1, v9
-
-    return-object v0
+    return-object v1
 
     :cond_2
-    const/4 v12, -0x1
+    const/4 v2, -0x1
 
-    if-eqz v4, :cond_4
+    const/4 v12, 0x0
 
-    invoke-direct {v11, v5}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash4(I)I
+    if-eqz v3, :cond_4
 
-    move-result v5
+    invoke-direct {v11, v4}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash4(I)I
 
-    aget-object v12, v0, v5
+    move-result v2
 
-    invoke-virtual {v1, v12}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    aget-object v4, v0, v2
 
-    move-result v14
+    invoke-virtual {v1, v4}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    if-eqz v14, :cond_3
+    move-result v13
+
+    if-eqz v13, :cond_3
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v5
+    aget-object v1, v0, v2
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v2
 
-    aput-object p2, v1, v5
-
-    return-object v0
+    return-object v1
 
     :cond_3
-    move v14, v5
+    move v14, v2
+
+    move-object v13, v4
 
     goto :goto_0
 
     :cond_4
-    const/4 v12, 0x0
+    move-object v13, v12
 
     const/4 v14, -0x1
 
     :goto_0
-    iget v5, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
+    iget v2, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
 
-    iget v15, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashSize:I
+    iget v4, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashSize:I
 
-    add-int/2addr v15, v5
+    add-int/2addr v4, v2
 
     :goto_1
-    if-ge v5, v15, :cond_6
+    if-ge v2, v4, :cond_6
 
-    aget-object v13, v0, v5
+    aget-object v15, v0, v2
 
-    invoke-virtual {v1, v13}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v15}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    move-result v13
+    move-result v15
 
-    if-eqz v13, :cond_5
+    if-eqz v15, :cond_5
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object v0, v0, v5
+    aget-object v1, v0, v2
 
-    iget-object v1, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object p2, v0, v2
 
-    aput-object p2, v1, v5
-
-    return-object v0
+    return-object v1
 
     :cond_5
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
 
     :cond_6
     if-nez v6, :cond_8
 
-    aput-object v1, v0, v3
+    aput-object v1, v0, v5
 
     iget-object v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aput-object p2, v0, v3
+    aput-object p2, v0, v5
 
     iget v0, v11, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
 
@@ -1281,9 +1267,7 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/ObjectMap;->resize(I)V
 
     :cond_7
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_8
     if-nez v8, :cond_a
@@ -1311,9 +1295,7 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/ObjectMap;->resize(I)V
 
     :cond_9
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_a
     if-nez v10, :cond_c
@@ -1341,14 +1323,12 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/ObjectMap;->resize(I)V
 
     :cond_b
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_c
-    if-eqz v4, :cond_e
+    if-eqz v3, :cond_e
 
-    if-nez v12, :cond_e
+    if-nez v13, :cond_e
 
     aput-object v1, v0, v14
 
@@ -1373,9 +1353,7 @@
     invoke-direct {v11, v0}, Lcom/esotericsoftware/kryo/util/ObjectMap;->resize(I)V
 
     :cond_d
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 
     :cond_e
     move-object/from16 v0, p0
@@ -1384,6 +1362,8 @@
 
     move-object/from16 v2, p2
 
+    move v3, v5
+
     move-object v4, v6
 
     move v5, v7
@@ -1396,17 +1376,15 @@
 
     move v9, v14
 
-    move-object v10, v12
+    move-object v10, v13
 
     invoke-direct/range {v0 .. v10}, Lcom/esotericsoftware/kryo/util/ObjectMap;->push(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;ILjava/lang/Object;)V
 
-    const/4 v0, 0x0
-
-    return-object v0
+    return-object v12
 .end method
 
 .method private resize(I)V
-    .locals 5
+    .locals 6
 
     iget v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
 
@@ -1504,15 +1482,13 @@
 
     iget v4, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashCapacity:I
 
-    add-int/2addr v4, p1
+    add-int v5, p1, v4
 
-    new-array v4, v4, [Ljava/lang/Object;
+    new-array v5, v5, [Ljava/lang/Object;
 
-    check-cast v4, [Ljava/lang/Object;
+    check-cast v5, [Ljava/lang/Object;
 
-    iput-object v4, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
-
-    iget v4, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->stashCapacity:I
+    iput-object v5, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->keyTable:[Ljava/lang/Object;
 
     add-int/2addr p1, v4
 
@@ -2263,20 +2239,17 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v1
+    aget-object v0, p1, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object v3, p1, v1
 
-    aput-object v3, v0, v1
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
 
-    :goto_0
-    iget v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
+    add-int/lit8 p1, p1, -0x1
 
-    add-int/lit8 v0, v0, -0x1
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
 
-    iput v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
-
-    return-object p1
+    return-object v0
 
     :cond_0
     invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash2(I)I
@@ -2299,13 +2272,17 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v1
+    aget-object v0, p1, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object v3, p1, v1
 
-    aput-object v3, v0, v1
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
+
+    return-object v0
 
     :cond_1
     invoke-direct {p0, v0}, Lcom/esotericsoftware/kryo/util/ObjectMap;->hash3(I)I
@@ -2328,13 +2305,17 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v1
+    aget-object v0, p1, v1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object v3, p1, v1
 
-    aput-object v3, v0, v1
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
+
+    return-object v0
 
     :cond_2
     iget-boolean v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->isBigTable:Z
@@ -2361,13 +2342,17 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
 
-    aget-object p1, p1, v0
+    aget-object v1, p1, v0
 
-    iget-object v1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
+    aput-object v3, p1, v0
 
-    aput-object v3, v1, v0
+    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
 
-    goto :goto_0
+    add-int/lit8 p1, p1, -0x1
+
+    iput p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
+
+    return-object v1
 
     :cond_3
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/util/ObjectMap;->removeStash(Ljava/lang/Object;)Ljava/lang/Object;
@@ -2460,9 +2445,7 @@
 
     aput-object v3, v2, p1
 
-    iget-object p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->valueTable:[Ljava/lang/Object;
-
-    aput-object v1, p1, v0
+    aput-object v1, v2, v0
 
     return-void
 
@@ -2483,7 +2466,7 @@
 
     if-le v0, p1, :cond_0
 
-    iget p1, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->size:I
+    move p1, v0
 
     :cond_0
     iget v0, p0, Lcom/esotericsoftware/kryo/util/ObjectMap;->capacity:I
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil$1.smali b/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil$1.smali
index dde1a20824..25bfdc714d 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil$1.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/esotericsoftware/kryo/util/UnsafeUtil$1;
 .super Ljava/lang/Object;
+.source "UnsafeUtil.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil.smali b/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil.smali
index 76ac362144..49d0fbe787 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/UnsafeUtil.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/UnsafeUtil;
 .super Ljava/lang/Object;
+.source "UnsafeUtil.java"
 
 
 # static fields
@@ -365,11 +366,9 @@
     return-object v1
 
     :cond_0
-    :try_start_0
-    sget-object v0, Lcom/esotericsoftware/kryo/util/UnsafeUtil;->directByteBufferConstr:Ljava/lang/reflect/Constructor;
-
     const/4 v2, 0x3
 
+    :try_start_0
     new-array v2, v2, [Ljava/lang/Object;
 
     const/4 v3, 0x0
diff --git a/com.discord/smali/com/esotericsoftware/kryo/util/Util.smali b/com.discord/smali/com/esotericsoftware/kryo/util/Util.smali
index f88213d4d3..b2072900b4 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/util/Util.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/util/Util.smali
@@ -1,5 +1,6 @@
 .class public Lcom/esotericsoftware/kryo/util/Util;
 .super Ljava/lang/Object;
+.source "Util.java"
 
 
 # static fields
@@ -304,6 +305,8 @@
 
     sget-object p0, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
 
+    return-object p0
+
     :cond_8
     return-object p0
 .end method
@@ -625,6 +628,8 @@
 
     invoke-static {v0, p0}, Lcom/esotericsoftware/a/a;->q(Ljava/lang/String;Ljava/lang/String;)V
 
+    return-void
+
     :cond_4
     :goto_1
     return-void
@@ -682,18 +687,18 @@
 
     invoke-static {v0}, Lcom/esotericsoftware/kryo/util/Util;->className(Ljava/lang/Class;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object p0
 
-    return-object v1
+    return-object p0
 
     :cond_2
     invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v1
+    return-object p0
 
     :catch_0
     :cond_3
diff --git a/com.discord/smali/com/facebook/a/a.smali b/com.discord/smali/com/facebook/a/a.smali
index 121e52e62b..318fc1b788 100644
--- a/com.discord/smali/com/facebook/a/a.smali
+++ b/com.discord/smali/com/facebook/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/a/a;
 .super Ljava/lang/Object;
+.source "BinaryResource.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/a/b.smali b/com.discord/smali/com/facebook/a/b.smali
index 7b13128b83..6ac406be26 100644
--- a/com.discord/smali/com/facebook/a/b.smali
+++ b/com.discord/smali/com/facebook/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/a/b;
 .super Ljava/lang/Object;
+.source "FileBinaryResource.java"
 
 # interfaces
 .implements Lcom/facebook/a/a;
diff --git a/com.discord/smali/com/facebook/animated/drawable/R.smali b/com.discord/smali/com/facebook/animated/drawable/R.smali
index bc0fa83d16..7d8af7dc62 100644
--- a/com.discord/smali/com/facebook/animated/drawable/R.smali
+++ b/com.discord/smali/com/facebook/animated/drawable/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/animated/drawable/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/animated/gif/GifFrame.smali b/com.discord/smali/com/facebook/animated/gif/GifFrame.smali
index c27b2ecff0..6b96dadd88 100644
--- a/com.discord/smali/com/facebook/animated/gif/GifFrame.smali
+++ b/com.discord/smali/com/facebook/animated/gif/GifFrame.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/animated/gif/GifFrame;
 .super Ljava/lang/Object;
+.source "GifFrame.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/a/d;
diff --git a/com.discord/smali/com/facebook/animated/gif/GifImage.smali b/com.discord/smali/com/facebook/animated/gif/GifImage.smali
index ef4108ef62..2482fde226 100644
--- a/com.discord/smali/com/facebook/animated/gif/GifImage.smali
+++ b/com.discord/smali/com/facebook/animated/gif/GifImage.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/animated/gif/GifImage;
 .super Ljava/lang/Object;
+.source "GifImage.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/a/c;
@@ -48,7 +49,7 @@
     return-void
 .end method
 
-.method private static declared-synchronized eJ()V
+.method private static declared-synchronized eI()V
     .locals 2
 
     const-class v0, Lcom/facebook/animated/gif/GifImage;
@@ -189,6 +190,8 @@
 
     sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->LQ:I
 
+    move v8, v1
+
     goto :goto_0
 
     :cond_0
@@ -198,14 +201,16 @@
 
     sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->LR:I
 
+    move v8, v1
+
     goto :goto_0
 
     :cond_1
     sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->LP:I
 
-    :goto_0
     move v8, v1
 
+    :goto_0
     move-object v1, v9
 
     move v2, p1
@@ -239,7 +244,7 @@
 .method public final a(Ljava/nio/ByteBuffer;)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 0
 
-    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->eJ()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->eI()V
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->rewind()Ljava/nio/Buffer;
 
@@ -253,7 +258,7 @@
 .method public final b(JI)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 3
 
-    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->eJ()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->eI()V
 
     const-wide/16 v0, 0x0
 
@@ -278,7 +283,7 @@
     return-object p1
 .end method
 
-.method public final eK()[I
+.method public final eJ()[I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetFrameDurations()[I
@@ -288,7 +293,7 @@
     return-object v0
 .end method
 
-.method public final eL()I
+.method public final eK()I
     .locals 2
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetLoopCount()I
@@ -320,7 +325,7 @@
     .end packed-switch
 .end method
 
-.method public final eM()Z
+.method public final eL()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -328,7 +333,7 @@
     return v0
 .end method
 
-.method public final eN()I
+.method public final eM()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetSizeInBytes()I
diff --git a/com.discord/smali/com/facebook/animated/gif/R.smali b/com.discord/smali/com/facebook/animated/gif/R.smali
index 3d0f7c3016..2f07000b34 100644
--- a/com.discord/smali/com/facebook/animated/gif/R.smali
+++ b/com.discord/smali/com/facebook/animated/gif/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/animated/gif/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/animated/webp/R.smali b/com.discord/smali/com/facebook/animated/webp/R.smali
index 1cf12a0b9c..360041c2b9 100644
--- a/com.discord/smali/com/facebook/animated/webp/R.smali
+++ b/com.discord/smali/com/facebook/animated/webp/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/animated/webp/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/animated/webp/WebPFrame.smali b/com.discord/smali/com/facebook/animated/webp/WebPFrame.smali
index b4a5848180..88382deb19 100644
--- a/com.discord/smali/com/facebook/animated/webp/WebPFrame.smali
+++ b/com.discord/smali/com/facebook/animated/webp/WebPFrame.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/animated/webp/WebPFrame;
 .super Ljava/lang/Object;
+.source "WebPFrame.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/a/d;
diff --git a/com.discord/smali/com/facebook/animated/webp/WebPImage.smali b/com.discord/smali/com/facebook/animated/webp/WebPImage.smali
index 456ea0b388..85584280b9 100644
--- a/com.discord/smali/com/facebook/animated/webp/WebPImage.smali
+++ b/com.discord/smali/com/facebook/animated/webp/WebPImage.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/animated/webp/WebPImage;
 .super Ljava/lang/Object;
+.source "WebPImage.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/a/c;
@@ -173,7 +174,7 @@
 .method public final a(Ljava/nio/ByteBuffer;)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eJ()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eI()V
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->rewind()Ljava/nio/Buffer;
 
@@ -187,7 +188,7 @@
 .method public final b(JI)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eJ()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eI()V
 
     const-wide/16 v0, 0x0
 
@@ -212,7 +213,7 @@
     return-object p1
 .end method
 
-.method public final eK()[I
+.method public final eJ()[I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetFrameDurations()[I
@@ -222,7 +223,7 @@
     return-object v0
 .end method
 
-.method public final eL()I
+.method public final eK()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetLoopCount()I
@@ -232,7 +233,7 @@
     return v0
 .end method
 
-.method public final eM()Z
+.method public final eL()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -240,7 +241,7 @@
     return v0
 .end method
 
-.method public final eN()I
+.method public final eM()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetSizeInBytes()I
diff --git a/com.discord/smali/com/facebook/b/a/a.smali b/com.discord/smali/com/facebook/b/a/a.smali
index dca0a6debd..f217d49cbf 100644
--- a/com.discord/smali/com/facebook/b/a/a.smali
+++ b/com.discord/smali/com/facebook/b/a/a.smali
@@ -1,7 +1,8 @@
 .class public interface abstract Lcom/facebook/b/a/a;
 .super Ljava/lang/Object;
+.source "DrawableWithCaches.java"
 
 
 # virtual methods
-.method public abstract fN()V
+.method public abstract fM()V
 .end method
diff --git a/com.discord/smali/com/facebook/c/a.smali b/com.discord/smali/com/facebook/c/a.smali
index 09c315cd58..2b2765341d 100644
--- a/com.discord/smali/com/facebook/c/a.smali
+++ b/com.discord/smali/com/facebook/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/c/a;
 .super Ljava/lang/Object;
+.source "DefaultImageFormatChecker.java"
 
 # interfaces
 .implements Lcom/facebook/c/c$a;
@@ -340,13 +341,11 @@
     :cond_5
     sget-object v1, Lcom/facebook/c/a;->Le:[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    if-lt p2, v1, :cond_6
-
-    sget-object v1, Lcom/facebook/c/a;->Le:[B
+    if-lt p2, v2, :cond_6
 
     invoke-static {p1, v1}, Lcom/facebook/c/e;->a([B[B)Z
 
@@ -371,11 +370,9 @@
     :cond_7
     sget-object v1, Lcom/facebook/c/a;->Lg:[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-lt p2, v1, :cond_8
-
-    sget-object v1, Lcom/facebook/c/a;->Lg:[B
+    if-lt p2, v2, :cond_8
 
     invoke-static {p1, v1}, Lcom/facebook/c/e;->a([B[B)Z
 
@@ -436,17 +433,15 @@
     :cond_c
     sget-object v1, Lcom/facebook/c/a;->Lk:[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge p2, v1, :cond_d
+    if-ge p2, v2, :cond_d
 
     const/4 v1, 0x0
 
     goto :goto_3
 
     :cond_d
-    sget-object v1, Lcom/facebook/c/a;->Lk:[B
-
     invoke-static {p1, v1}, Lcom/facebook/c/e;->a([B[B)Z
 
     move-result v1
@@ -461,17 +456,15 @@
     :cond_e
     sget-object v1, Lcom/facebook/c/a;->Lm:[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge p2, v1, :cond_f
+    if-ge p2, v2, :cond_f
 
     const/4 v1, 0x0
 
     goto :goto_4
 
     :cond_f
-    sget-object v1, Lcom/facebook/c/a;->Lm:[B
-
     invoke-static {p1, v1}, Lcom/facebook/c/e;->a([B[B)Z
 
     move-result v1
@@ -500,12 +493,12 @@
 
     array-length v1, p2
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_5
-    if-ge v3, v1, :cond_12
+    if-ge v2, v1, :cond_12
 
-    aget-object v4, p2, v3
+    aget-object v4, p2, v2
 
     array-length v5, p1
 
@@ -536,7 +529,7 @@
     goto :goto_6
 
     :cond_11
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_5
 
@@ -554,7 +547,7 @@
     return-object p1
 .end method
 
-.method public final gW()I
+.method public final gV()I
     .locals 1
 
     iget v0, p0, Lcom/facebook/c/a;->Ld:I
diff --git a/com.discord/smali/com/facebook/c/b.smali b/com.discord/smali/com/facebook/c/b.smali
index 74baee81e7..c46e1a1622 100644
--- a/com.discord/smali/com/facebook/c/b.smali
+++ b/com.discord/smali/com/facebook/c/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/c/b;
 .super Ljava/lang/Object;
+.source "DefaultImageFormats.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/c/c$a.smali b/com.discord/smali/com/facebook/c/c$a.smali
index 410b8e342e..dfe7a98338 100644
--- a/com.discord/smali/com/facebook/c/c$a.smali
+++ b/com.discord/smali/com/facebook/c/c$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/c/c$a;
 .super Ljava/lang/Object;
+.source "ImageFormat.java"
 
 
 # annotations
@@ -19,5 +20,5 @@
     .end annotation
 .end method
 
-.method public abstract gW()I
+.method public abstract gV()I
 .end method
diff --git a/com.discord/smali/com/facebook/c/c.smali b/com.discord/smali/com/facebook/c/c.smali
index 184911fcf1..e9bc777be3 100644
--- a/com.discord/smali/com/facebook/c/c.smali
+++ b/com.discord/smali/com/facebook/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/c/c;
 .super Ljava/lang/Object;
+.source "ImageFormat.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/c/d.smali b/com.discord/smali/com/facebook/c/d.smali
index 79cb674f11..aa98948dc8 100644
--- a/com.discord/smali/com/facebook/c/d.smali
+++ b/com.discord/smali/com/facebook/c/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/c/d;
 .super Ljava/lang/Object;
+.source "ImageFormatChecker.java"
 
 
 # static fields
@@ -37,7 +38,7 @@
 
     iput-object v0, p0, Lcom/facebook/c/d;->LG:Lcom/facebook/c/c$a;
 
-    invoke-virtual {p0}, Lcom/facebook/c/d;->gX()V
+    invoke-virtual {p0}, Lcom/facebook/c/d;->gW()V
 
     return-void
 .end method
@@ -106,7 +107,7 @@
     .locals 4
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/c/d;->gY()Lcom/facebook/c/d;
+    invoke-static {}, Lcom/facebook/c/d;->gX()Lcom/facebook/c/d;
 
     move-result-object v0
 
@@ -187,9 +188,11 @@
     move-result-object p0
 
     throw p0
+
+    return-void
 .end method
 
-.method public static declared-synchronized gY()Lcom/facebook/c/d;
+.method public static declared-synchronized gX()Lcom/facebook/c/d;
     .locals 2
 
     const-class v0, Lcom/facebook/c/d;
@@ -226,12 +229,12 @@
 
 
 # virtual methods
-.method public final gX()V
+.method public final gW()V
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/c/d;->LG:Lcom/facebook/c/c$a;
 
-    invoke-interface {v0}, Lcom/facebook/c/c$a;->gW()I
+    invoke-interface {v0}, Lcom/facebook/c/c$a;->gV()I
 
     move-result v0
 
@@ -241,8 +244,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/d;->LF:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
@@ -262,7 +263,7 @@
 
     iget v2, p0, Lcom/facebook/c/d;->LE:I
 
-    invoke-interface {v1}, Lcom/facebook/c/c$a;->gW()I
+    invoke-interface {v1}, Lcom/facebook/c/c$a;->gV()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/facebook/c/e.smali b/com.discord/smali/com/facebook/c/e.smali
index fa1ce0b72b..4906cecb3c 100644
--- a/com.discord/smali/com/facebook/c/e.smali
+++ b/com.discord/smali/com/facebook/c/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/c/e;
 .super Ljava/lang/Object;
+.source "ImageFormatCheckerUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/cache/common/CacheKey.smali b/com.discord/smali/com/facebook/cache/common/CacheKey.smali
index 766455fd93..2e8579c956 100644
--- a/com.discord/smali/com/facebook/cache/common/CacheKey.smali
+++ b/com.discord/smali/com/facebook/cache/common/CacheKey.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/common/CacheKey;
 .super Ljava/lang/Object;
+.source "CacheKey.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/cache/common/a$a.smali b/com.discord/smali/com/facebook/cache/common/a$a.smali
index 1a88df3d3f..5191b8f1ea 100644
--- a/com.discord/smali/com/facebook/cache/common/a$a.smali
+++ b/com.discord/smali/com/facebook/cache/common/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/common/a$a;
 .super Ljava/lang/Enum;
+.source "CacheErrorLogger.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/common/a.smali b/com.discord/smali/com/facebook/cache/common/a.smali
index 201b3f89c6..83da12a37e 100644
--- a/com.discord/smali/com/facebook/cache/common/a.smali
+++ b/com.discord/smali/com/facebook/cache/common/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/common/a;
 .super Ljava/lang/Object;
+.source "CacheErrorLogger.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/common/b$a.smali b/com.discord/smali/com/facebook/cache/common/b$a.smali
index 6c868af9f6..6e37b35aff 100644
--- a/com.discord/smali/com/facebook/cache/common/b$a.smali
+++ b/com.discord/smali/com/facebook/cache/common/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/common/b$a;
 .super Ljava/lang/Enum;
+.source "CacheEventListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/common/b.smali b/com.discord/smali/com/facebook/cache/common/b.smali
index 031492db2d..7b6f3d03d2 100644
--- a/com.discord/smali/com/facebook/cache/common/b.smali
+++ b/com.discord/smali/com/facebook/cache/common/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/common/b;
 .super Ljava/lang/Object;
+.source "CacheEventListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/common/c.smali b/com.discord/smali/com/facebook/cache/common/c.smali
index abb43b63ab..b382892a7d 100644
--- a/com.discord/smali/com/facebook/cache/common/c.smali
+++ b/com.discord/smali/com/facebook/cache/common/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/common/c;
 .super Ljava/lang/Object;
+.source "CacheKeyUtil.java"
 
 
 # direct methods
@@ -84,6 +85,8 @@
     invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public static b(Lcom/facebook/cache/common/CacheKey;)Ljava/lang/String;
diff --git a/com.discord/smali/com/facebook/cache/common/d.smali b/com.discord/smali/com/facebook/cache/common/d.smali
index 58b0cf7211..c20c90e555 100644
--- a/com.discord/smali/com/facebook/cache/common/d.smali
+++ b/com.discord/smali/com/facebook/cache/common/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/common/d;
 .super Ljava/lang/Object;
+.source "MultiCacheKey.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/CacheKey;
diff --git a/com.discord/smali/com/facebook/cache/common/e.smali b/com.discord/smali/com/facebook/cache/common/e.smali
index b239e4afb8..9f25bf3b1e 100644
--- a/com.discord/smali/com/facebook/cache/common/e.smali
+++ b/com.discord/smali/com/facebook/cache/common/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/common/e;
 .super Ljava/lang/Object;
+.source "NoOpCacheErrorLogger.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/a;
@@ -24,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized eO()Lcom/facebook/cache/common/e;
+.method public static declared-synchronized eN()Lcom/facebook/cache/common/e;
     .locals 2
 
     const-class v0, Lcom/facebook/cache/common/e;
diff --git a/com.discord/smali/com/facebook/cache/common/f.smali b/com.discord/smali/com/facebook/cache/common/f.smali
index c1a9883fd3..8aebf2dd2f 100644
--- a/com.discord/smali/com/facebook/cache/common/f.smali
+++ b/com.discord/smali/com/facebook/cache/common/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/common/f;
 .super Ljava/lang/Object;
+.source "NoOpCacheEventListener.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/b;
@@ -24,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized eP()Lcom/facebook/cache/common/f;
+.method public static declared-synchronized eO()Lcom/facebook/cache/common/f;
     .locals 2
 
     const-class v0, Lcom/facebook/cache/common/f;
diff --git a/com.discord/smali/com/facebook/cache/common/g.smali b/com.discord/smali/com/facebook/cache/common/g.smali
index 3a76238c1b..c408eaefef 100644
--- a/com.discord/smali/com/facebook/cache/common/g.smali
+++ b/com.discord/smali/com/facebook/cache/common/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/common/g;
 .super Ljava/lang/Object;
+.source "SimpleCacheKey.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/CacheKey;
diff --git a/com.discord/smali/com/facebook/cache/common/h.smali b/com.discord/smali/com/facebook/cache/common/h.smali
index c3a51b1416..1700ffbb11 100644
--- a/com.discord/smali/com/facebook/cache/common/h.smali
+++ b/com.discord/smali/com/facebook/cache/common/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/common/h;
 .super Ljava/lang/Object;
+.source "WriterCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a$1.smali b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a$1.smali
index e6d3b77e0c..25826499be 100644
--- a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a$1.smali
+++ b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/DiskCacheConfig$a$1;
 .super Ljava/lang/Object;
+.source "DiskCacheConfig.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/cache/disk/DiskCacheConfig$a;->eX()Lcom/facebook/cache/disk/DiskCacheConfig;
+    value = Lcom/facebook/cache/disk/DiskCacheConfig$a;->eW()Lcom/facebook/cache/disk/DiskCacheConfig;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 fc72fefdf1..f1747e58a0 100644
--- a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/disk/DiskCacheConfig$a;
 .super Ljava/lang/Object;
+.source "DiskCacheConfig.java"
 
 
 # annotations
@@ -109,7 +110,7 @@
     return-object p0
 .end method
 
-.method public final eW()Lcom/facebook/cache/disk/DiskCacheConfig$a;
+.method public final eV()Lcom/facebook/cache/disk/DiskCacheConfig$a;
     .locals 2
 
     const-wide/32 v0, 0x2800000
@@ -119,7 +120,7 @@
     return-object p0
 .end method
 
-.method public final eX()Lcom/facebook/cache/disk/DiskCacheConfig;
+.method public final eW()Lcom/facebook/cache/disk/DiskCacheConfig;
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->BF:Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
index 74612d4dd6..a9a39cf75e 100644
--- a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
+++ b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/cache/disk/DiskCacheConfig;
 .super Ljava/lang/Object;
+.source "DiskCacheConfig.java"
 
 
 # annotations
@@ -100,7 +101,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/cache/common/e;->eO()Lcom/facebook/cache/common/e;
+    invoke-static {}, Lcom/facebook/cache/common/e;->eN()Lcom/facebook/cache/common/e;
 
     move-result-object v0
 
@@ -116,7 +117,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/cache/common/f;->eP()Lcom/facebook/cache/common/f;
+    invoke-static {}, Lcom/facebook/cache/common/f;->eO()Lcom/facebook/cache/common/f;
 
     move-result-object v0
 
@@ -132,7 +133,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/common/a/b;->fc()Lcom/facebook/common/a/b;
+    invoke-static {}, Lcom/facebook/common/a/b;->fb()Lcom/facebook/common/a/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/cache/disk/a$a.smali b/com.discord/smali/com/facebook/cache/disk/a$a.smali
index e766a1ea82..cb6ef03cc9 100644
--- a/com.discord/smali/com/facebook/cache/disk/a$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/a$a;
 .super Ljava/lang/Object;
+.source "DefaultDiskStorage.java"
 
 # interfaces
 .implements Lcom/facebook/common/c/b;
diff --git a/com.discord/smali/com/facebook/cache/disk/a$b.smali b/com.discord/smali/com/facebook/cache/disk/a$b.smali
index f3ec3bed3d..f28845c0df 100644
--- a/com.discord/smali/com/facebook/cache/disk/a$b.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/a$b;
 .super Ljava/lang/Object;
+.source "DefaultDiskStorage.java"
 
 # interfaces
 .implements Lcom/facebook/cache/disk/c$a;
diff --git a/com.discord/smali/com/facebook/cache/disk/a$c.smali b/com.discord/smali/com/facebook/cache/disk/a$c.smali
index df152643d2..b997e0c484 100644
--- a/com.discord/smali/com/facebook/cache/disk/a$c.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/a$c;
 .super Ljava/lang/Object;
+.source "DefaultDiskStorage.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/disk/a$d.smali b/com.discord/smali/com/facebook/cache/disk/a$d.smali
index af601fbfb3..a37ccc7146 100644
--- a/com.discord/smali/com/facebook/cache/disk/a$d.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/a$d;
 .super Ljava/io/IOException;
+.source "DefaultDiskStorage.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/disk/a$e.smali b/com.discord/smali/com/facebook/cache/disk/a$e.smali
index 8c7c905712..12609e4d26 100644
--- a/com.discord/smali/com/facebook/cache/disk/a$e.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/a$e;
 .super Ljava/lang/Object;
+.source "DefaultDiskStorage.java"
 
 # interfaces
 .implements Lcom/facebook/cache/disk/c$b;
@@ -114,12 +115,12 @@
 
     sget v0, Lcom/facebook/cache/common/a$a;->AV:I
 
-    invoke-static {}, Lcom/facebook/cache/disk/a;->eS()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->eR()Ljava/lang/Class;
 
     throw p1
 .end method
 
-.method public final eT()Lcom/facebook/a/a;
+.method public final eS()Lcom/facebook/a/a;
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -273,26 +274,31 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_7
 
     instance-of v2, v1, Lcom/facebook/common/c/c$c;
 
-    if-nez v2, :cond_5
+    if-nez v2, :cond_6
 
     instance-of v1, v1, Ljava/io/FileNotFoundException;
 
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_5
 
     sget v1, Lcom/facebook/cache/common/a$a;->AW:I
 
     goto :goto_1
 
     :cond_5
-    sget v1, Lcom/facebook/cache/common/a$a;->AX:I
+    sget v1, Lcom/facebook/cache/common/a$a;->AY:I
 
     goto :goto_1
 
     :cond_6
+    sget v1, Lcom/facebook/cache/common/a$a;->AX:I
+
+    goto :goto_1
+
+    :cond_7
     sget v1, Lcom/facebook/cache/common/a$a;->AY:I
 
     :goto_1
@@ -300,12 +306,12 @@
 
     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;->eS()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->eR()Ljava/lang/Class;
 
     throw v0
 .end method
 
-.method public final eU()Z
+.method public final eT()Z
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->BB:Ljava/io/File;
diff --git a/com.discord/smali/com/facebook/cache/disk/a$f.smali b/com.discord/smali/com/facebook/cache/disk/a$f.smali
index 3adc9863a8..18ada281e8 100644
--- a/com.discord/smali/com/facebook/cache/disk/a$f.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/a$f;
 .super Ljava/lang/Object;
+.source "DefaultDiskStorage.java"
 
 # interfaces
 .implements Lcom/facebook/common/c/b;
@@ -87,14 +88,13 @@
 
     const/4 v2, 0x0
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_0
 
-    :cond_0
     const/4 v1, 0x0
 
     goto :goto_0
 
-    :cond_1
+    :cond_0
     iget-object v3, v0, Lcom/facebook/cache/disk/a$c;->type:Ljava/lang/String;
 
     const-string v4, ".tmp"
@@ -121,7 +121,12 @@
 
     cmp-long v0, v3, v5
 
-    if-lez v0, :cond_0
+    if-lez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/facebook/cache/disk/a.smali b/com.discord/smali/com/facebook/cache/disk/a.smali
index 1f19bab993..34c484a0f9 100644
--- a/com.discord/smali/com/facebook/cache/disk/a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/cache/disk/a;
 .super Ljava/lang/Object;
+.source "DefaultDiskStorage.java"
 
 # interfaces
 .implements Lcom/facebook/cache/disk/c;
@@ -180,7 +181,7 @@
 
     :cond_2
     :goto_1
-    invoke-static {}, Lcom/facebook/common/time/c;->fz()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->fy()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
@@ -206,10 +207,9 @@
 
     if-gtz v2, :cond_0
 
-    :goto_0
     move-object v1, v3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     invoke-virtual {v0, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
@@ -226,7 +226,7 @@
 
     const-string v4, ".cnt"
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string v5, ".tmp"
@@ -239,15 +239,17 @@
 
     const-string v4, ".tmp"
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     move-object v4, v3
 
-    :goto_1
+    :goto_0
     if-nez v4, :cond_3
 
-    goto :goto_0
+    move-object v1, v3
+
+    goto :goto_1
 
     :cond_3
     const/4 v5, 0x0
@@ -270,7 +272,9 @@
 
     if-gtz v1, :cond_4
 
-    goto :goto_0
+    move-object v1, v3
+
+    goto :goto_1
 
     :cond_4
     invoke-virtual {v0, v5, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
@@ -282,7 +286,7 @@
 
     invoke-direct {v1, v4, v0}, Lcom/facebook/cache/disk/a$c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    :goto_2
+    :goto_1
     if-eqz v1, :cond_6
 
     iget-object v0, v1, Lcom/facebook/cache/disk/a$c;->Bz:Ljava/lang/String;
@@ -391,7 +395,7 @@
     return-object p0
 .end method
 
-.method static synthetic eS()Ljava/lang/Class;
+.method static synthetic eR()Ljava/lang/Class;
     .locals 1
 
     sget-object v0, Lcom/facebook/cache/disk/a;->Bp:Ljava/lang/Class;
@@ -674,7 +678,7 @@
     return-object p1
 .end method
 
-.method public final eQ()V
+.method public final eP()V
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/cache/disk/a;->Br:Ljava/io/File;
@@ -690,7 +694,7 @@
     return-void
 .end method
 
-.method public final synthetic eR()Ljava/util/Collection;
+.method public final synthetic eQ()Ljava/util/Collection;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/com/facebook/cache/disk/b$1.smali b/com.discord/smali/com/facebook/cache/disk/b$1.smali
index 33571b871f..a081bd50a1 100644
--- a/com.discord/smali/com/facebook/cache/disk/b$1.smali
+++ b/com.discord/smali/com/facebook/cache/disk/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/b$1;
 .super Ljava/lang/Object;
+.source "DefaultEntryEvictionComparatorSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/cache/disk/f;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/cache/disk/b;->eV()Lcom/facebook/cache/disk/f;
+    value = Lcom/facebook/cache/disk/b;->eU()Lcom/facebook/cache/disk/f;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/facebook/cache/disk/b.smali b/com.discord/smali/com/facebook/cache/disk/b.smali
index d997ad6b85..f3f30a1bc2 100644
--- a/com.discord/smali/com/facebook/cache/disk/b.smali
+++ b/com.discord/smali/com/facebook/cache/disk/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/disk/b;
 .super Ljava/lang/Object;
+.source "DefaultEntryEvictionComparatorSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/cache/disk/g;
@@ -16,7 +17,7 @@
 
 
 # virtual methods
-.method public final eV()Lcom/facebook/cache/disk/f;
+.method public final eU()Lcom/facebook/cache/disk/f;
     .locals 1
 
     new-instance v0, Lcom/facebook/cache/disk/b$1;
diff --git a/com.discord/smali/com/facebook/cache/disk/c$a.smali b/com.discord/smali/com/facebook/cache/disk/c$a.smali
index 10da834ee2..b661b42b25 100644
--- a/com.discord/smali/com/facebook/cache/disk/c$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/c$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/disk/c$a;
 .super Ljava/lang/Object;
+.source "DiskStorage.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/disk/c$b.smali b/com.discord/smali/com/facebook/cache/disk/c$b.smali
index 9be66bf03f..1f91884a03 100644
--- a/com.discord/smali/com/facebook/cache/disk/c$b.smali
+++ b/com.discord/smali/com/facebook/cache/disk/c$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/disk/c$b;
 .super Ljava/lang/Object;
+.source "DiskStorage.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract eT()Lcom/facebook/a/a;
+.method public abstract eS()Lcom/facebook/a/a;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -30,5 +31,5 @@
     .end annotation
 .end method
 
-.method public abstract eU()Z
+.method public abstract eT()Z
 .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 6644082838..af4feed5e2 100644
--- a/com.discord/smali/com/facebook/cache/disk/c.smali
+++ b/com.discord/smali/com/facebook/cache/disk/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/disk/c;
 .super Ljava/lang/Object;
+.source "DiskStorage.java"
 
 
 # annotations
@@ -44,10 +45,10 @@
     .end annotation
 .end method
 
-.method public abstract eQ()V
+.method public abstract eP()V
 .end method
 
-.method public abstract eR()Ljava/util/Collection;
+.method public abstract eQ()Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/facebook/cache/disk/d$1.smali b/com.discord/smali/com/facebook/cache/disk/d$1.smali
index 3d5b2a5950..5f95cd3ae7 100644
--- a/com.discord/smali/com/facebook/cache/disk/d$1.smali
+++ b/com.discord/smali/com/facebook/cache/disk/d$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/d$1;
 .super Ljava/lang/Object;
+.source "DiskStorageCache.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/facebook/cache/disk/d$a.smali b/com.discord/smali/com/facebook/cache/disk/d$a.smali
index 91c3efee4b..809013b117 100644
--- a/com.discord/smali/com/facebook/cache/disk/d$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/d$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/d$a;
 .super Ljava/lang/Object;
+.source "DiskStorageCache.java"
 
 
 # annotations
@@ -43,7 +44,7 @@
 
 # virtual methods
 .method public final declared-synchronized b(JJ)V
-    .locals 3
+    .locals 2
 
     monitor-enter p0
 
@@ -54,16 +55,12 @@
 
     iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Cf:J
 
-    const/4 v2, 0x0
-
     add-long/2addr v0, p1
 
     iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Cf:J
 
     iget-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Cg:J
 
-    const/4 v0, 0x0
-
     add-long/2addr p1, p3
 
     iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Cg:J
diff --git a/com.discord/smali/com/facebook/cache/disk/d$b.smali b/com.discord/smali/com/facebook/cache/disk/d$b.smali
index a7c264ed86..5685a49b88 100644
--- a/com.discord/smali/com/facebook/cache/disk/d$b.smali
+++ b/com.discord/smali/com/facebook/cache/disk/d$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/disk/d$b;
 .super Ljava/lang/Object;
+.source "DiskStorageCache.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/disk/d.smali b/com.discord/smali/com/facebook/cache/disk/d.smali
index b2738c954d..675c8dfaee 100644
--- a/com.discord/smali/com/facebook/cache/disk/d.smali
+++ b/com.discord/smali/com/facebook/cache/disk/d.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/cache/disk/d;
 .super Ljava/lang/Object;
+.source "DiskStorageCache.java"
 
 # interfaces
 .implements Lcom/facebook/cache/disk/h;
@@ -134,7 +135,7 @@
 
     iput-wide v0, p0, Lcom/facebook/cache/disk/d;->BW:J
 
-    invoke-static {}, Lcom/facebook/common/h/a;->fv()Lcom/facebook/common/h/a;
+    invoke-static {}, Lcom/facebook/common/h/a;->fu()Lcom/facebook/common/h/a;
 
     move-result-object v0
 
@@ -162,7 +163,7 @@
 
     iput-object p1, p0, Lcom/facebook/cache/disk/d;->Cc:Lcom/facebook/cache/disk/d$a;
 
-    invoke-static {}, Lcom/facebook/common/time/c;->fz()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->fy()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
@@ -221,7 +222,7 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->eT()Lcom/facebook/a/a;
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->eS()Lcom/facebook/a/a;
 
     move-result-object p1
 
@@ -268,7 +269,7 @@
     monitor-enter v2
 
     :try_start_0
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->eY()Z
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->eX()Z
 
     move-result v0
 
@@ -298,13 +299,11 @@
 
     move-result-wide v7
 
-    const/4 v9, 0x0
-
     sub-long/2addr v5, v7
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fw()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fv()V
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fw()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fv()V
 
     iget-object v7, v4, Lcom/facebook/common/h/a;->Dt:Ljava/util/concurrent/locks/Lock;
 
@@ -323,8 +322,6 @@
 
     iget-wide v9, v4, Lcom/facebook/common/h/a;->Ds:J
 
-    const/4 v11, 0x0
-
     sub-long/2addr v7, v9
 
     sget-wide v9, Lcom/facebook/common/h/a;->Dn:J
@@ -333,7 +330,7 @@
 
     if-lez v11, :cond_1
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fx()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fw()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -432,17 +429,16 @@
 
     iget-wide v3, v1, Lcom/facebook/cache/disk/d;->BT:J
 
-    :goto_6
     iput-wide v3, v1, Lcom/facebook/cache/disk/d;->BW:J
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_7
     iget-wide v3, v1, Lcom/facebook/cache/disk/d;->BU:J
 
-    goto :goto_6
+    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->BW:J
 
-    :goto_7
+    :goto_6
     iget-object v3, v1, Lcom/facebook/cache/disk/d;->Cc:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v3}, Lcom/facebook/cache/disk/d$a;->getSize()J
@@ -461,7 +457,7 @@
 
     invoke-virtual {v0}, Lcom/facebook/cache/disk/d$a;->reset()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->eY()Z
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->eX()Z
 
     :cond_8
     iget-wide v5, v1, Lcom/facebook/cache/disk/d;->BW:J
@@ -487,7 +483,7 @@
     :try_start_3
     iget-object v5, v1, Lcom/facebook/cache/disk/d;->Cb:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/c;->eR()Ljava/util/Collection;
+    invoke-interface {v5}, Lcom/facebook/cache/disk/c;->eQ()Ljava/util/Collection;
 
     move-result-object v5
 
@@ -499,8 +495,6 @@
 
     sget-wide v12, Lcom/facebook/cache/disk/d;->BR:J
 
-    const/4 v6, 0x0
-
     add-long/2addr v10, v12
 
     new-instance v6, Ljava/util/ArrayList;
@@ -523,7 +517,7 @@
 
     move-result-object v5
 
-    :goto_8
+    :goto_7
     invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v13
@@ -546,17 +540,17 @@
 
     invoke-virtual {v6, v13}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_9
     invoke-virtual {v12, v13}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_a
     iget-object v5, v1, Lcom/facebook/cache/disk/d;->BJ:Lcom/facebook/cache/disk/g;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->eV()Lcom/facebook/cache/disk/f;
+    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->eU()Lcom/facebook/cache/disk/f;
 
     move-result-object v5
 
@@ -574,8 +568,6 @@
 
     move-result-wide v10
 
-    const/4 v5, 0x0
-
     sub-long v12, v10, v3
 
     invoke-interface {v6}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
@@ -584,7 +576,7 @@
 
     move-wide v14, v7
 
-    :goto_9
+    :goto_8
     invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v6
@@ -629,7 +621,7 @@
 
     add-long/2addr v14, v7
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fb()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fa()Lcom/facebook/cache/disk/i;
 
     move-result-object v5
 
@@ -643,8 +635,6 @@
 
     iput-wide v7, v5, Lcom/facebook/cache/disk/i;->Co:J
 
-    const/4 v6, 0x0
-
     sub-long v6, v10, v14
 
     iput-wide v6, v5, Lcom/facebook/cache/disk/i;->Cq:J
@@ -660,7 +650,7 @@
 
     move-wide/from16 v12, v18
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_c
     iget-object v0, v1, Lcom/facebook/cache/disk/d;->Cc:Lcom/facebook/cache/disk/d$a;
@@ -675,9 +665,9 @@
 
     iget-object v0, v1, Lcom/facebook/cache/disk/d;->Cb:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->eQ()V
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->eP()V
 
-    goto :goto_a
+    goto :goto_9
 
     :catch_0
     move-exception v0
@@ -699,7 +689,7 @@
     throw v0
 
     :cond_d
-    :goto_a
+    :goto_9
     monitor-exit v2
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
@@ -725,6 +715,8 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
     throw v0
+
+    return-void
 .end method
 
 .method static synthetic a(Lcom/facebook/cache/disk/d;)Ljava/lang/Object;
@@ -738,7 +730,7 @@
 .method static synthetic b(Lcom/facebook/cache/disk/d;)Z
     .locals 0
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->eY()Z
+    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->eX()Z
 
     move-result p0
 
@@ -763,7 +755,7 @@
     return-object p0
 .end method
 
-.method private eY()Z
+.method private eX()Z
     .locals 7
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "mLock"
@@ -791,8 +783,6 @@
 
     if-eqz v6, :cond_1
 
-    iget-wide v2, p0, Lcom/facebook/cache/disk/d;->BY:J
-
     sub-long/2addr v0, v2
 
     sget-wide v2, Lcom/facebook/cache/disk/d;->BS:J
@@ -810,14 +800,14 @@
 
     :cond_1
     :goto_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->eZ()Z
+    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->eY()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method private eZ()Z
+.method private eY()Z
     .locals 23
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "mLock"
@@ -869,7 +859,7 @@
     :try_start_0
     iget-object v7, v1, Lcom/facebook/cache/disk/d;->Cb:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->eR()Ljava/util/Collection;
+    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->eQ()Ljava/util/Collection;
 
     move-result-object v7
 
@@ -914,8 +904,6 @@
 
     move-result-wide v17
 
-    const/16 v19, 0x0
-
     add-long v11, v11, v17
 
     invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->getTimestamp()J
@@ -928,17 +916,15 @@
 
     add-int/lit8 v13, v13, 0x1
 
-    move-object/from16 v20, v7
+    move-object/from16 v18, v7
 
     int-to-long v6, v14
 
     invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->getSize()J
 
-    move-result-wide v17
+    move-result-wide v19
 
-    const/4 v14, 0x0
-
-    add-long v6, v6, v17
+    add-long v6, v6, v19
 
     long-to-int v14, v6
 
@@ -946,22 +932,20 @@
 
     move-result-wide v6
 
-    const/4 v15, 0x0
-
     sub-long/2addr v6, v2
 
     invoke-static {v6, v7, v8, v9}, Ljava/lang/Math;->max(JJ)J
 
     move-result-wide v8
 
-    move-object/from16 v7, v20
+    move-object/from16 v7, v18
 
     const/4 v15, 0x1
 
     goto :goto_1
 
     :cond_2
-    move-object/from16 v20, v7
+    move-object/from16 v18, v7
 
     iget-boolean v6, v1, Lcom/facebook/cache/disk/d;->BM:Z
 
@@ -974,7 +958,7 @@
     invoke-interface {v0, v6}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     :cond_3
-    move-object/from16 v7, v20
+    move-object/from16 v7, v18
 
     goto :goto_1
 
@@ -1093,7 +1077,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fb()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fa()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
@@ -1146,7 +1130,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->eU()Z
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->eT()Z
 
     move-result p1
 
@@ -1170,7 +1154,7 @@
     move-exception p2
 
     :try_start_4
-    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->eU()Z
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->eT()Z
 
     move-result p1
 
@@ -1228,7 +1212,7 @@
 .method public final d(Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/a/a;
     .locals 8
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fb()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fa()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
@@ -1342,6 +1326,8 @@
     invoke-virtual {v0}, Lcom/facebook/cache/disk/i;->recycle()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final e(Lcom/facebook/cache/common/CacheKey;)V
@@ -1420,4 +1406,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
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 08bce9259a..ac735166cc 100644
--- a/com.discord/smali/com/facebook/cache/disk/e$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/e$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/cache/disk/e$a;
 .super Ljava/lang/Object;
+.source "DynamicDefaultDiskStorage.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/cache/disk/e.smali b/com.discord/smali/com/facebook/cache/disk/e.smali
index 48d0bfbb28..267a10b656 100644
--- a/com.discord/smali/com/facebook/cache/disk/e.smali
+++ b/com.discord/smali/com/facebook/cache/disk/e.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/cache/disk/e;
 .super Ljava/lang/Object;
+.source "DynamicDefaultDiskStorage.java"
 
 # interfaces
 .implements Lcom/facebook/cache/disk/c;
@@ -90,7 +91,7 @@
     return-void
 .end method
 
-.method private declared-synchronized fa()Lcom/facebook/cache/disk/c;
+.method private declared-synchronized eZ()Lcom/facebook/cache/disk/c;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -244,7 +245,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fa()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->eZ()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -263,7 +264,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fa()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->eZ()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -282,7 +283,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fa()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->eZ()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -301,7 +302,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fa()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->eZ()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -312,15 +313,15 @@
     return-object p1
 .end method
 
-.method public final eQ()V
+.method public final eP()V
     .locals 3
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fa()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->eZ()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->eQ()V
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->eP()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -338,7 +339,7 @@
     return-void
 .end method
 
-.method public final eR()Ljava/util/Collection;
+.method public final eQ()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -355,11 +356,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fa()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->eZ()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->eR()Ljava/util/Collection;
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->eQ()Ljava/util/Collection;
 
     move-result-object v0
 
@@ -370,7 +371,7 @@
     .locals 1
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fa()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->eZ()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/cache/disk/f.smali b/com.discord/smali/com/facebook/cache/disk/f.smali
index a0979e2a08..13e555df5a 100644
--- a/com.discord/smali/com/facebook/cache/disk/f.smali
+++ b/com.discord/smali/com/facebook/cache/disk/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/disk/f;
 .super Ljava/lang/Object;
+.source "EntryEvictionComparator.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali/com/facebook/cache/disk/g.smali b/com.discord/smali/com/facebook/cache/disk/g.smali
index 7a845ad9f4..e3dcfc5344 100644
--- a/com.discord/smali/com/facebook/cache/disk/g.smali
+++ b/com.discord/smali/com/facebook/cache/disk/g.smali
@@ -1,7 +1,8 @@
 .class public interface abstract Lcom/facebook/cache/disk/g;
 .super Ljava/lang/Object;
+.source "EntryEvictionComparatorSupplier.java"
 
 
 # virtual methods
-.method public abstract eV()Lcom/facebook/cache/disk/f;
+.method public abstract eU()Lcom/facebook/cache/disk/f;
 .end method
diff --git a/com.discord/smali/com/facebook/cache/disk/h.smali b/com.discord/smali/com/facebook/cache/disk/h.smali
index feb454d2c8..58f1dc9f59 100644
--- a/com.discord/smali/com/facebook/cache/disk/h.smali
+++ b/com.discord/smali/com/facebook/cache/disk/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/cache/disk/h;
 .super Ljava/lang/Object;
+.source "FileCache.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/cache/disk/i.smali b/com.discord/smali/com/facebook/cache/disk/i.smali
index 1bb2858f83..e342d684eb 100644
--- a/com.discord/smali/com/facebook/cache/disk/i.smali
+++ b/com.discord/smali/com/facebook/cache/disk/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/cache/disk/i;
 .super Ljava/lang/Object;
+.source "SettableCacheEvent.java"
 
 
 # static fields
@@ -49,7 +50,7 @@
     return-void
 .end method
 
-.method public static fb()Lcom/facebook/cache/disk/i;
+.method public static fa()Lcom/facebook/cache/disk/i;
     .locals 3
     .annotation build Lcom/facebook/infer/annotation/ReturnsOwnership;
     .end annotation
diff --git a/com.discord/smali/com/facebook/common/a/a.smali b/com.discord/smali/com/facebook/common/a/a.smali
index ee778411a9..93588e7054 100644
--- a/com.discord/smali/com/facebook/common/a/a.smali
+++ b/com.discord/smali/com/facebook/common/a/a.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/common/a/a;
 .super Ljava/lang/Object;
+.source "DiskTrimmableRegistry.java"
diff --git a/com.discord/smali/com/facebook/common/a/b.smali b/com.discord/smali/com/facebook/common/a/b.smali
index 32db917f85..af185ac10f 100644
--- a/com.discord/smali/com/facebook/common/a/b.smali
+++ b/com.discord/smali/com/facebook/common/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/a/b;
 .super Ljava/lang/Object;
+.source "NoOpDiskTrimmableRegistry.java"
 
 # interfaces
 .implements Lcom/facebook/common/a/a;
@@ -27,7 +28,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized fc()Lcom/facebook/common/a/b;
+.method public static declared-synchronized fb()Lcom/facebook/common/a/b;
     .locals 2
 
     const-class v0, Lcom/facebook/common/a/b;
diff --git a/com.discord/smali/com/facebook/common/b/a.smali b/com.discord/smali/com/facebook/common/b/a.smali
index fb6fc4b03d..5e406cc275 100644
--- a/com.discord/smali/com/facebook/common/b/a.smali
+++ b/com.discord/smali/com/facebook/common/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/b/a;
 .super Ljava/util/concurrent/AbstractExecutorService;
+.source "CallerThreadExecutor.java"
 
 
 # static fields
@@ -27,7 +28,7 @@
     return-void
 .end method
 
-.method public static fd()Lcom/facebook/common/b/a;
+.method public static fc()Lcom/facebook/common/b/a;
     .locals 1
 
     sget-object v0, Lcom/facebook/common/b/a;->Cv:Lcom/facebook/common/b/a;
diff --git a/com.discord/smali/com/facebook/common/b/b$a.smali b/com.discord/smali/com/facebook/common/b/b$a.smali
index a8435cea49..3e4ec3c542 100644
--- a/com.discord/smali/com/facebook/common/b/b$a.smali
+++ b/com.discord/smali/com/facebook/common/b/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/common/b/b$a;
 .super Ljava/lang/Object;
+.source "ConstrainedExecutorService.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -64,7 +65,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/facebook/common/b/b;->ff()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->fe()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -110,7 +111,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/facebook/common/b/b;->ff()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->fe()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -162,7 +163,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {}, Lcom/facebook/common/b/b;->ff()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->fe()Ljava/lang/Class;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/facebook/common/b/b.smali b/com.discord/smali/com/facebook/common/b/b.smali
index 2faffe7b34..6dd14d2782 100644
--- a/com.discord/smali/com/facebook/common/b/b.smali
+++ b/com.discord/smali/com/facebook/common/b/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/common/b/b;
 .super Ljava/util/concurrent/AbstractExecutorService;
+.source "ConstrainedExecutorService.java"
 
 
 # annotations
@@ -131,21 +132,21 @@
 .method static synthetic d(Lcom/facebook/common/b/b;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/facebook/common/b/b;->fe()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->fd()V
 
     return-void
 .end method
 
-.method private fe()V
+.method private fd()V
     .locals 5
 
-    :goto_0
     iget-object v0, p0, Lcom/facebook/common/b/b;->Cz: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;->Cw:I
 
     if-ge v0, v1, :cond_1
@@ -195,13 +196,19 @@
 
     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/common/b/b;->Cz:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+
+    move-result v0
+
     goto :goto_0
 
     :cond_1
     return-void
 .end method
 
-.method static synthetic ff()Ljava/lang/Class;
+.method static synthetic fe()Ljava/lang/Class;
     .locals 1
 
     sget-object v0, Lcom/facebook/common/b/b;->Bp:Ljava/lang/Class;
@@ -274,7 +281,7 @@
     invoke-static {v0, v1, v2, 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;->fe()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->fd()V
 
     return-void
 
diff --git a/com.discord/smali/com/facebook/common/b/c.smali b/com.discord/smali/com/facebook/common/b/c.smali
index 4d5bc2fbfa..e51b67f762 100644
--- a/com.discord/smali/com/facebook/common/b/c.smali
+++ b/com.discord/smali/com/facebook/common/b/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/b/c;
 .super Lcom/facebook/common/b/b;
+.source "DefaultSerialExecutorService.java"
 
 # interfaces
 .implements Lcom/facebook/common/b/g;
diff --git a/com.discord/smali/com/facebook/common/b/e.smali b/com.discord/smali/com/facebook/common/b/e.smali
index 28eb314931..88b6c29061 100644
--- a/com.discord/smali/com/facebook/common/b/e.smali
+++ b/com.discord/smali/com/facebook/common/b/e.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/common/b/e;
 .super Ljava/util/concurrent/AbstractExecutorService;
+.source "HandlerExecutorServiceImpl.java"
 
 # interfaces
 .implements Lcom/facebook/common/b/d;
diff --git a/com.discord/smali/com/facebook/common/b/f.smali b/com.discord/smali/com/facebook/common/b/f.smali
index 08153df801..853df29818 100644
--- a/com.discord/smali/com/facebook/common/b/f.smali
+++ b/com.discord/smali/com/facebook/common/b/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/b/f;
 .super Ljava/lang/Object;
+.source "ScheduledFutureImpl.java"
 
 # interfaces
 .implements Ljava/util/concurrent/RunnableFuture;
diff --git a/com.discord/smali/com/facebook/common/b/h.smali b/com.discord/smali/com/facebook/common/b/h.smali
index fe91a60162..a1bc077680 100644
--- a/com.discord/smali/com/facebook/common/b/h.smali
+++ b/com.discord/smali/com/facebook/common/b/h.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/common/b/h;
 .super Ljava/lang/Object;
+.source "StatefulRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -55,13 +56,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/b/h;->fg()V
+    invoke-virtual {p0}, Lcom/facebook/common/b/h;->ff()V
 
     :cond_0
     return-void
 .end method
 
-.method protected fg()V
+.method protected ff()V
     .locals 0
 
     return-void
diff --git a/com.discord/smali/com/facebook/common/b/i.smali b/com.discord/smali/com/facebook/common/b/i.smali
index 7a85a68683..46c812940d 100644
--- a/com.discord/smali/com/facebook/common/b/i.smali
+++ b/com.discord/smali/com/facebook/common/b/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/b/i;
 .super Lcom/facebook/common/b/e;
+.source "UiThreadImmediateExecutorService.java"
 
 
 # static fields
@@ -29,7 +30,7 @@
     return-void
 .end method
 
-.method public static fh()Lcom/facebook/common/b/i;
+.method public static fg()Lcom/facebook/common/b/i;
     .locals 1
 
     sget-object v0, Lcom/facebook/common/b/i;->CE:Lcom/facebook/common/b/i;
diff --git a/com.discord/smali/com/facebook/common/c/a.smali b/com.discord/smali/com/facebook/common/c/a.smali
index c169a406e0..407160d17c 100644
--- a/com.discord/smali/com/facebook/common/c/a.smali
+++ b/com.discord/smali/com/facebook/common/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/c/a;
 .super Ljava/lang/Object;
+.source "FileTree.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/common/c/b.smali b/com.discord/smali/com/facebook/common/c/b.smali
index 8f664f3563..8cf0689146 100644
--- a/com.discord/smali/com/facebook/common/c/b.smali
+++ b/com.discord/smali/com/facebook/common/c/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/c/b;
 .super Ljava/lang/Object;
+.source "FileTreeVisitor.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/common/c/c$a.smali b/com.discord/smali/com/facebook/common/c/c$a.smali
index 32612da155..bdb3183ce3 100644
--- a/com.discord/smali/com/facebook/common/c/c$a.smali
+++ b/com.discord/smali/com/facebook/common/c/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/c/c$a;
 .super Ljava/io/IOException;
+.source "FileUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/c/c$b.smali b/com.discord/smali/com/facebook/common/c/c$b.smali
index 3a477ccc5e..22626f909b 100644
--- a/com.discord/smali/com/facebook/common/c/c$b.smali
+++ b/com.discord/smali/com/facebook/common/c/c$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/c/c$b;
 .super Ljava/io/IOException;
+.source "FileUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/c/c$c.smali b/com.discord/smali/com/facebook/common/c/c$c.smali
index c105c23669..37b0213a20 100644
--- a/com.discord/smali/com/facebook/common/c/c$c.smali
+++ b/com.discord/smali/com/facebook/common/c/c$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/c/c$c;
 .super Ljava/io/FileNotFoundException;
+.source "FileUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/c/c$d.smali b/com.discord/smali/com/facebook/common/c/c$d.smali
index b5e5766113..487c490de1 100644
--- a/com.discord/smali/com/facebook/common/c/c$d.smali
+++ b/com.discord/smali/com/facebook/common/c/c$d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/c/c$d;
 .super Ljava/io/IOException;
+.source "FileUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/c/c.smali b/com.discord/smali/com/facebook/common/c/c.smali
index 4dcd08f346..2ddfac6705 100644
--- a/com.discord/smali/com/facebook/common/c/c.smali
+++ b/com.discord/smali/com/facebook/common/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/c/c;
 .super Ljava/lang/Object;
+.source "FileUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/d/a.smali b/com.discord/smali/com/facebook/common/d/a.smali
index b0065387f2..c3f250962b 100644
--- a/com.discord/smali/com/facebook/common/d/a.smali
+++ b/com.discord/smali/com/facebook/common/d/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/a;
 .super Ljava/lang/Object;
+.source "ByteStreams.java"
 
 
 # direct methods
@@ -49,6 +50,8 @@
     invoke-direct {p0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
diff --git a/com.discord/smali/com/facebook/common/d/b.smali b/com.discord/smali/com/facebook/common/d/b.smali
index d601d7b24d..7914c4b976 100644
--- a/com.discord/smali/com/facebook/common/d/b.smali
+++ b/com.discord/smali/com/facebook/common/d/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/b;
 .super Ljava/lang/Object;
+.source "Closeables.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/common/d/c.smali b/com.discord/smali/com/facebook/common/d/c.smali
index 2ebf730383..6a4244107b 100644
--- a/com.discord/smali/com/facebook/common/d/c.smali
+++ b/com.discord/smali/com/facebook/common/d/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/c;
 .super Ljava/io/FilterOutputStream;
+.source "CountingOutputStream.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/common/d/d.smali b/com.discord/smali/com/facebook/common/d/d.smali
index d76de32df6..0e88b365e2 100644
--- a/com.discord/smali/com/facebook/common/d/d.smali
+++ b/com.discord/smali/com/facebook/common/d/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/facebook/common/d/d;
 .super Ljava/lang/Object;
+.source "DoNotStrip.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/facebook/common/d/e.smali b/com.discord/smali/com/facebook/common/d/e.smali
index f07f9ed9df..f06c5b0070 100644
--- a/com.discord/smali/com/facebook/common/d/e.smali
+++ b/com.discord/smali/com/facebook/common/d/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/e;
 .super Ljava/util/ArrayList;
+.source "ImmutableList.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/d/f.smali b/com.discord/smali/com/facebook/common/d/f.smali
index c45ae9fc74..cb47edb603 100644
--- a/com.discord/smali/com/facebook/common/d/f.smali
+++ b/com.discord/smali/com/facebook/common/d/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/f;
 .super Ljava/util/HashMap;
+.source "ImmutableMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/d/g.smali b/com.discord/smali/com/facebook/common/d/g.smali
index 7a5dd960aa..8945162c7d 100644
--- a/com.discord/smali/com/facebook/common/d/g.smali
+++ b/com.discord/smali/com/facebook/common/d/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/g;
 .super Ljava/lang/Object;
+.source "Ints.java"
 
 
 # direct methods
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 d9910d470b..525cb1822b 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
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/common/d/h$a$a;
 .super Ljava/lang/Object;
+.source "Objects.java"
 
 
 # annotations
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 93760a17b5..ea04b966b5 100644
--- a/com.discord/smali/com/facebook/common/d/h$a.smali
+++ b/com.discord/smali/com/facebook/common/d/h$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/h$a;
 .super Ljava/lang/Object;
+.source "Objects.java"
 
 
 # annotations
@@ -68,7 +69,7 @@
     return-void
 .end method
 
-.method private fi()Lcom/facebook/common/d/h$a$a;
+.method private fh()Lcom/facebook/common/d/h$a$a;
     .locals 2
 
     new-instance v0, Lcom/facebook/common/d/h$a$a;
@@ -109,7 +110,7 @@
         .end annotation
     .end param
 
-    invoke-direct {p0}, Lcom/facebook/common/d/h$a;->fi()Lcom/facebook/common/d/h$a$a;
+    invoke-direct {p0}, Lcom/facebook/common/d/h$a;->fh()Lcom/facebook/common/d/h$a$a;
 
     move-result-object v0
 
@@ -163,26 +164,25 @@
 
     iget-object v3, p0, Lcom/facebook/common/d/h$a;->CF:Lcom/facebook/common/d/h$a$a;
 
-    :cond_0
-    :goto_0
     iget-object v3, v3, Lcom/facebook/common/d/h$a$a;->CI:Lcom/facebook/common/d/h$a$a;
 
+    :goto_0
     if-eqz v3, :cond_3
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     iget-object v4, v3, Lcom/facebook/common/d/h$a$a;->value:Ljava/lang/Object;
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_2
 
-    :cond_1
+    :cond_0
     invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v1, ", "
 
     iget-object v4, v3, Lcom/facebook/common/d/h$a$a;->name:Ljava/lang/String;
 
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_1
 
     iget-object v4, v3, Lcom/facebook/common/d/h$a$a;->name:Ljava/lang/String;
 
@@ -192,11 +192,14 @@
 
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    :cond_2
+    :cond_1
     iget-object v4, v3, Lcom/facebook/common/d/h$a$a;->value:Ljava/lang/Object;
 
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    :cond_2
+    iget-object v3, v3, Lcom/facebook/common/d/h$a$a;->CI:Lcom/facebook/common/d/h$a$a;
+
     goto :goto_0
 
     :cond_3
diff --git a/com.discord/smali/com/facebook/common/d/h.smali b/com.discord/smali/com/facebook/common/d/h.smali
index e6d482de18..454644eebd 100644
--- a/com.discord/smali/com/facebook/common/d/h.smali
+++ b/com.discord/smali/com/facebook/common/d/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/h;
 .super Ljava/lang/Object;
+.source "Objects.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/d/i.smali b/com.discord/smali/com/facebook/common/d/i.smali
index 2c11607edf..abd51e63d5 100644
--- a/com.discord/smali/com/facebook/common/d/i.smali
+++ b/com.discord/smali/com/facebook/common/d/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/i;
 .super Ljava/lang/Object;
+.source "Preconditions.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/common/d/j.smali b/com.discord/smali/com/facebook/common/d/j.smali
index a04ece0564..b7d14e174d 100644
--- a/com.discord/smali/com/facebook/common/d/j.smali
+++ b/com.discord/smali/com/facebook/common/d/j.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/d/j;
 .super Ljava/lang/Object;
+.source "Predicate.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/d/k.smali b/com.discord/smali/com/facebook/common/d/k.smali
index 32d8c66199..c2ae72f8ba 100644
--- a/com.discord/smali/com/facebook/common/d/k.smali
+++ b/com.discord/smali/com/facebook/common/d/k.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/d/k;
 .super Ljava/lang/Object;
+.source "Supplier.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/d/l$1.smali b/com.discord/smali/com/facebook/common/d/l$1.smali
index 5c2184225f..8a0177403b 100644
--- a/com.discord/smali/com/facebook/common/d/l$1.smali
+++ b/com.discord/smali/com/facebook/common/d/l$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/common/d/l$1;
 .super Ljava/lang/Object;
+.source "Suppliers.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/common/d/l$2.smali b/com.discord/smali/com/facebook/common/d/l$2.smali
index 3aaecfdafb..eba8ce5ebb 100644
--- a/com.discord/smali/com/facebook/common/d/l$2.smali
+++ b/com.discord/smali/com/facebook/common/d/l$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/common/d/l$2;
 .super Ljava/lang/Object;
+.source "Suppliers.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/common/d/l$3.smali b/com.discord/smali/com/facebook/common/d/l$3.smali
index f5d8ff9c48..d289456673 100644
--- a/com.discord/smali/com/facebook/common/d/l$3.smali
+++ b/com.discord/smali/com/facebook/common/d/l$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/common/d/l$3;
 .super Ljava/lang/Object;
+.source "Suppliers.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/common/d/l.smali b/com.discord/smali/com/facebook/common/d/l.smali
index 8c37d5c8a6..427028fec0 100644
--- a/com.discord/smali/com/facebook/common/d/l.smali
+++ b/com.discord/smali/com/facebook/common/d/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/l;
 .super Ljava/lang/Object;
+.source "Suppliers.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/common/d/m.smali b/com.discord/smali/com/facebook/common/d/m.smali
index 692724f586..257a80cfb0 100644
--- a/com.discord/smali/com/facebook/common/d/m.smali
+++ b/com.discord/smali/com/facebook/common/d/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/d/m;
 .super Ljava/lang/Object;
+.source "Throwables.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/common/e/a.smali b/com.discord/smali/com/facebook/common/e/a.smali
index 89ea070b10..b7f5d6e148 100644
--- a/com.discord/smali/com/facebook/common/e/a.smali
+++ b/com.discord/smali/com/facebook/common/e/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/e/a;
 .super Ljava/lang/Object;
+.source "FLog.java"
 
 
 # static fields
@@ -10,7 +11,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/common/e/b;->fj()Lcom/facebook/common/e/b;
+    invoke-static {}, Lcom/facebook/common/e/b;->fi()Lcom/facebook/common/e/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/common/e/b.smali b/com.discord/smali/com/facebook/common/e/b.smali
index adca0c4012..31ae67eaae 100644
--- a/com.discord/smali/com/facebook/common/e/b.smali
+++ b/com.discord/smali/com/facebook/common/e/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/e/b;
 .super Ljava/lang/Object;
+.source "FLogDefaultLoggingDelegate.java"
 
 # interfaces
 .implements Lcom/facebook/common/e/c;
@@ -85,6 +86,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_0
     return-object p1
 .end method
@@ -127,7 +130,7 @@
     return-void
 .end method
 
-.method public static fj()Lcom/facebook/common/e/b;
+.method public static fi()Lcom/facebook/common/e/b;
     .locals 1
 
     sget-object v0, Lcom/facebook/common/e/b;->CN:Lcom/facebook/common/e/b;
diff --git a/com.discord/smali/com/facebook/common/e/c.smali b/com.discord/smali/com/facebook/common/e/c.smali
index 95642acbdd..fe384ad4ad 100644
--- a/com.discord/smali/com/facebook/common/e/c.smali
+++ b/com.discord/smali/com/facebook/common/e/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/e/c;
 .super Ljava/lang/Object;
+.source "LoggingDelegate.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/common/f/a.smali b/com.discord/smali/com/facebook/common/f/a.smali
index 98ce62b73b..37d4468dfc 100644
--- a/com.discord/smali/com/facebook/common/f/a.smali
+++ b/com.discord/smali/com/facebook/common/f/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/f/a;
 .super Ljava/lang/Object;
+.source "MediaUtils.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/common/f/b.smali b/com.discord/smali/com/facebook/common/f/b.smali
index 855ab9b027..1b309d6261 100644
--- a/com.discord/smali/com/facebook/common/f/b.smali
+++ b/com.discord/smali/com/facebook/common/f/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/f/b;
 .super Ljava/lang/Object;
+.source "MimeTypeMapWrapper.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/common/g/a.smali b/com.discord/smali/com/facebook/common/g/a.smali
index bf0251539f..9d914bcee1 100644
--- a/com.discord/smali/com/facebook/common/g/a.smali
+++ b/com.discord/smali/com/facebook/common/g/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/g/a;
 .super Ljava/lang/Object;
+.source "ByteArrayPool.java"
 
 # interfaces
 .implements Lcom/facebook/common/g/d;
diff --git a/com.discord/smali/com/facebook/common/g/b.smali b/com.discord/smali/com/facebook/common/g/b.smali
index 2510f17f02..4e360a85e7 100644
--- a/com.discord/smali/com/facebook/common/g/b.smali
+++ b/com.discord/smali/com/facebook/common/g/b.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/common/g/b;
 .super Ljava/lang/Object;
+.source "MemoryTrimmableRegistry.java"
diff --git a/com.discord/smali/com/facebook/common/g/c.smali b/com.discord/smali/com/facebook/common/g/c.smali
index a7824bf1c6..401b12b38e 100644
--- a/com.discord/smali/com/facebook/common/g/c.smali
+++ b/com.discord/smali/com/facebook/common/g/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/g/c;
 .super Ljava/lang/Object;
+.source "NoOpMemoryTrimmableRegistry.java"
 
 # interfaces
 .implements Lcom/facebook/common/g/b;
@@ -24,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized fk()Lcom/facebook/common/g/c;
+.method public static declared-synchronized fj()Lcom/facebook/common/g/c;
     .locals 2
 
     const-class v0, Lcom/facebook/common/g/c;
diff --git a/com.discord/smali/com/facebook/common/g/d.smali b/com.discord/smali/com/facebook/common/g/d.smali
index 0d4acd5b3b..d05c597cf5 100644
--- a/com.discord/smali/com/facebook/common/g/d.smali
+++ b/com.discord/smali/com/facebook/common/g/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/g/d;
 .super Ljava/lang/Object;
+.source "Pool.java"
 
 # interfaces
 .implements Lcom/facebook/common/references/b;
diff --git a/com.discord/smali/com/facebook/common/g/e.smali b/com.discord/smali/com/facebook/common/g/e.smali
index 4746652f77..e4d4785460 100644
--- a/com.discord/smali/com/facebook/common/g/e.smali
+++ b/com.discord/smali/com/facebook/common/g/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/g/e;
 .super Ljava/io/InputStream;
+.source "PooledByteArrayBufferedInputStream.java"
 
 
 # annotations
@@ -78,7 +79,7 @@
     return-void
 .end method
 
-.method private fl()Z
+.method private fk()Z
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -119,7 +120,7 @@
     return v2
 .end method
 
-.method private fm()V
+.method private fl()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -169,7 +170,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fm()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fl()V
 
     iget v0, p0, Lcom/facebook/common/g/e;->CY:I
 
@@ -266,9 +267,9 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fm()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fl()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fl()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fk()Z
 
     move-result v0
 
@@ -318,9 +319,9 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fm()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fl()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fl()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fk()Z
 
     move-result v0
 
@@ -357,7 +358,7 @@
 .end method
 
 .method public final skip(J)J
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -380,23 +381,21 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fm()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fl()V
 
     iget v0, p0, Lcom/facebook/common/g/e;->CY:I
 
     iget v1, p0, Lcom/facebook/common/g/e;->CZ:I
 
-    sub-int/2addr v0, v1
+    sub-int v2, v0, v1
 
-    int-to-long v0, v0
+    int-to-long v2, v2
 
-    cmp-long v2, v0, p1
+    cmp-long v4, v2, p1
 
-    if-ltz v2, :cond_1
+    if-ltz v4, :cond_1
 
-    iget v0, p0, Lcom/facebook/common/g/e;->CZ:I
-
-    int-to-long v0, v0
+    int-to-long v0, v1
 
     add-long/2addr v0, p1
 
@@ -407,19 +406,17 @@
     return-wide p1
 
     :cond_1
-    iget v2, p0, Lcom/facebook/common/g/e;->CY:I
+    iput v0, p0, Lcom/facebook/common/g/e;->CZ:I
 
-    iput v2, p0, Lcom/facebook/common/g/e;->CZ:I
+    iget-object v0, p0, Lcom/facebook/common/g/e;->CV:Ljava/io/InputStream;
 
-    iget-object v2, p0, Lcom/facebook/common/g/e;->CV:Ljava/io/InputStream;
+    sub-long/2addr p1, v2
 
-    sub-long/2addr p1, v0
-
-    invoke-virtual {v2, p1, p2}, Ljava/io/InputStream;->skip(J)J
+    invoke-virtual {v0, p1, p2}, Ljava/io/InputStream;->skip(J)J
 
     move-result-wide p1
 
-    add-long/2addr v0, p1
+    add-long/2addr v2, p1
 
-    return-wide v0
+    return-wide v2
 .end method
diff --git a/com.discord/smali/com/facebook/common/g/f$a.smali b/com.discord/smali/com/facebook/common/g/f$a.smali
index 9b4ff58d7e..a5e0912a7b 100644
--- a/com.discord/smali/com/facebook/common/g/f$a.smali
+++ b/com.discord/smali/com/facebook/common/g/f$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/g/f$a;
 .super Ljava/lang/RuntimeException;
+.source "PooledByteBuffer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/g/f.smali b/com.discord/smali/com/facebook/common/g/f.smali
index 05cc062d80..2164eda019 100644
--- a/com.discord/smali/com/facebook/common/g/f.smali
+++ b/com.discord/smali/com/facebook/common/g/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/g/f;
 .super Ljava/lang/Object;
+.source "PooledByteBuffer.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -20,7 +21,7 @@
 .method public abstract a(I[BII)I
 .end method
 
-.method public abstract fn()J
+.method public abstract fm()J
 .end method
 
 .method public abstract getByteBuffer()Ljava/nio/ByteBuffer;
diff --git a/com.discord/smali/com/facebook/common/g/g.smali b/com.discord/smali/com/facebook/common/g/g.smali
index c44f294c75..2451dd1fec 100644
--- a/com.discord/smali/com/facebook/common/g/g.smali
+++ b/com.discord/smali/com/facebook/common/g/g.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/g/g;
 .super Ljava/lang/Object;
+.source "PooledByteBufferFactory.java"
 
 
 # virtual methods
@@ -25,5 +26,5 @@
     .end annotation
 .end method
 
-.method public abstract fo()Lcom/facebook/common/g/i;
+.method public abstract fn()Lcom/facebook/common/g/i;
 .end method
diff --git a/com.discord/smali/com/facebook/common/g/h.smali b/com.discord/smali/com/facebook/common/g/h.smali
index 9ed92328ca..7015d179d8 100644
--- a/com.discord/smali/com/facebook/common/g/h.smali
+++ b/com.discord/smali/com/facebook/common/g/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/g/h;
 .super Ljava/io/InputStream;
+.source "PooledByteBufferInputStream.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/g/i.smali b/com.discord/smali/com/facebook/common/g/i.smali
index 77e285ea57..e6fff28b87 100644
--- a/com.discord/smali/com/facebook/common/g/i.smali
+++ b/com.discord/smali/com/facebook/common/g/i.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/common/g/i;
 .super Ljava/io/OutputStream;
+.source "PooledByteBufferOutputStream.java"
 
 
 # direct methods
@@ -31,7 +32,7 @@
     return-void
 .end method
 
-.method public abstract fp()Lcom/facebook/common/g/f;
+.method public abstract fo()Lcom/facebook/common/g/f;
 .end method
 
 .method public abstract size()I
diff --git a/com.discord/smali/com/facebook/common/g/j.smali b/com.discord/smali/com/facebook/common/g/j.smali
index 3c45997bf1..956025b51e 100644
--- a/com.discord/smali/com/facebook/common/g/j.smali
+++ b/com.discord/smali/com/facebook/common/g/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/g/j;
 .super Ljava/lang/Object;
+.source "PooledByteStreams.java"
 
 
 # instance fields
@@ -101,4 +102,6 @@
     invoke-interface {p2, v0}, Lcom/facebook/common/g/a;->w(Ljava/lang/Object;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/common/h/a$a.smali b/com.discord/smali/com/facebook/common/h/a$a.smali
index b33b0dfe9c..ccb7d9ac0f 100644
--- a/com.discord/smali/com/facebook/common/h/a$a.smali
+++ b/com.discord/smali/com/facebook/common/h/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/h/a$a;
 .super Ljava/lang/Enum;
+.source "StatFsHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/h/a.smali b/com.discord/smali/com/facebook/common/h/a.smali
index 7cf16a5621..1aaeb82926 100644
--- a/com.discord/smali/com/facebook/common/h/a.smali
+++ b/com.discord/smali/com/facebook/common/h/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/h/a;
 .super Ljava/lang/Object;
+.source "StatFsHelper.java"
 
 
 # annotations
@@ -101,7 +102,7 @@
 
     if-nez v1, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     if-nez p0, :cond_1
@@ -117,11 +118,6 @@
 
     move-object p0, p1
 
-    goto :goto_1
-
-    :catch_0
-    move-exception p0
-
     goto :goto_0
 
     :cond_1
@@ -134,9 +130,11 @@
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_1
+    goto :goto_0
+
+    :catch_0
+    move-exception p0
 
-    :goto_0
     invoke-static {p0}, Lcom/facebook/common/d/m;->c(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
 
     move-result-object p0
@@ -146,15 +144,15 @@
     :catch_1
     move-object p0, v0
 
-    :goto_1
+    :goto_0
     return-object p0
 
     :cond_2
-    :goto_2
+    :goto_1
     return-object v0
 .end method
 
-.method public static declared-synchronized fv()Lcom/facebook/common/h/a;
+.method public static declared-synchronized fu()Lcom/facebook/common/h/a;
     .locals 2
 
     const-class v0, Lcom/facebook/common/h/a;
@@ -191,7 +189,7 @@
 
 
 # virtual methods
-.method public final fw()V
+.method public final fv()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/facebook/common/h/a;->mInitialized:Z
@@ -219,7 +217,7 @@
 
     iput-object v0, p0, Lcom/facebook/common/h/a;->Dr:Ljava/io/File;
 
-    invoke-virtual {p0}, Lcom/facebook/common/h/a;->fx()V
+    invoke-virtual {p0}, Lcom/facebook/common/h/a;->fw()V
 
     const/4 v0, 0x1
 
@@ -247,7 +245,7 @@
     return-void
 .end method
 
-.method public fx()V
+.method public fw()V
     .locals 2
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "lock"
diff --git a/com.discord/smali/com/facebook/common/i/a.smali b/com.discord/smali/com/facebook/common/i/a.smali
index b0433613ab..00188196c8 100644
--- a/com.discord/smali/com/facebook/common/i/a.smali
+++ b/com.discord/smali/com/facebook/common/i/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/i/a;
 .super Ljava/io/FilterInputStream;
+.source "LimitedInputStream.java"
 
 
 # instance fields
@@ -143,8 +144,6 @@
     return p1
 
     :cond_0
-    iget v0, p0, Lcom/facebook/common/i/a;->Dx:I
-
     invoke-static {p3, v0}, Ljava/lang/Math;->min(II)I
 
     move-result p3
diff --git a/com.discord/smali/com/facebook/common/i/b.smali b/com.discord/smali/com/facebook/common/i/b.smali
index c093219e29..c7bd10f83e 100644
--- a/com.discord/smali/com/facebook/common/i/b.smali
+++ b/com.discord/smali/com/facebook/common/i/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/i/b;
 .super Ljava/io/FilterInputStream;
+.source "TailAppendingInputStream.java"
 
 
 # instance fields
@@ -39,31 +40,27 @@
     throw p1
 .end method
 
-.method private fy()I
+.method private fx()I
     .locals 3
 
     iget v0, p0, Lcom/facebook/common/i/b;->DA:I
 
     iget-object v1, p0, Lcom/facebook/common/i/b;->Dz:[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-lt v0, v1, :cond_0
+    if-lt v0, v2, :cond_0
 
     const/4 v0, -0x1
 
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/i/b;->Dz:[B
-
-    iget v1, p0, Lcom/facebook/common/i/b;->DA:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
     iput v2, p0, Lcom/facebook/common/i/b;->DA:I
 
-    aget-byte v0, v0, v1
+    aget-byte v0, v1, v0
 
     and-int/lit16 v0, v0, 0xff
 
@@ -114,7 +111,7 @@
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->fy()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->fx()I
 
     move-result v0
 
@@ -171,7 +168,7 @@
     :goto_0
     if-ge v0, p3, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->fy()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->fx()I
 
     move-result v2
 
diff --git a/com.discord/smali/com/facebook/common/j/a.smali b/com.discord/smali/com/facebook/common/j/a.smali
index aaa617051c..21022e1a87 100644
--- a/com.discord/smali/com/facebook/common/j/a.smali
+++ b/com.discord/smali/com/facebook/common/j/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/j/a;
 .super Ljava/lang/Exception;
+.source "ExceptionWithNoStacktrace.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/common/j/b.smali b/com.discord/smali/com/facebook/common/j/b.smali
index 3d87fc2f74..a394ed5578 100644
--- a/com.discord/smali/com/facebook/common/j/b.smali
+++ b/com.discord/smali/com/facebook/common/j/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/j/b;
 .super Ljava/lang/Object;
+.source "HashCodeUtil.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/common/j/c.smali b/com.discord/smali/com/facebook/common/j/c.smali
index 627c3a3b3c..52e6253bbd 100644
--- a/com.discord/smali/com/facebook/common/j/c.smali
+++ b/com.discord/smali/com/facebook/common/j/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/j/c;
 .super Ljava/lang/Object;
+.source "SecureHashUtil.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/common/j/d.smali b/com.discord/smali/com/facebook/common/j/d.smali
index 7e4360279f..5a048d8bbf 100644
--- a/com.discord/smali/com/facebook/common/j/d.smali
+++ b/com.discord/smali/com/facebook/common/j/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/j/d;
 .super Ljava/lang/Object;
+.source "StreamUtil.java"
 
 
 # direct methods
@@ -44,7 +45,6 @@
 
     if-lez v6, :cond_1
 
-    :goto_2
     sub-long/2addr v2, v4
 
     goto :goto_1
@@ -60,13 +60,15 @@
 
     const-wide/16 v4, 0x1
 
-    goto :goto_2
+    sub-long/2addr v2, v4
+
+    goto :goto_1
 
     :cond_2
-    const/4 p0, 0x0
-
     sub-long/2addr p1, v2
 
+    return-wide p1
+
     :cond_3
     return-wide p1
 .end method
diff --git a/com.discord/smali/com/facebook/common/j/e.smali b/com.discord/smali/com/facebook/common/j/e.smali
index a0ea81ef97..a36321e23b 100644
--- a/com.discord/smali/com/facebook/common/j/e.smali
+++ b/com.discord/smali/com/facebook/common/j/e.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/facebook/common/j/e;
 .super Ljava/lang/Enum;
+.source "TriState.java"
 
 
 # annotations
@@ -90,6 +91,23 @@
     return-void
 .end method
 
+.method public static v(Z)Lcom/facebook/common/j/e;
+    .locals 0
+    .annotation build Lcom/facebook/infer/annotation/Functional;
+    .end annotation
+
+    if-eqz p0, :cond_0
+
+    sget-object p0, Lcom/facebook/common/j/e;->DF:Lcom/facebook/common/j/e;
+
+    return-object p0
+
+    :cond_0
+    sget-object p0, Lcom/facebook/common/j/e;->DG:Lcom/facebook/common/j/e;
+
+    return-object p0
+.end method
+
 .method public static valueOf(Ljava/lang/String;)Lcom/facebook/common/j/e;
     .locals 1
 
@@ -117,20 +135,3 @@
 
     return-object v0
 .end method
-
-.method public static w(Z)Lcom/facebook/common/j/e;
-    .locals 0
-    .annotation build Lcom/facebook/infer/annotation/Functional;
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    sget-object p0, Lcom/facebook/common/j/e;->DF:Lcom/facebook/common/j/e;
-
-    return-object p0
-
-    :cond_0
-    sget-object p0, Lcom/facebook/common/j/e;->DG:Lcom/facebook/common/j/e;
-
-    return-object p0
-.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 7bb9eafb5f..bdfbb320c9 100644
--- a/com.discord/smali/com/facebook/common/j/f.smali
+++ b/com.discord/smali/com/facebook/common/j/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/j/f;
 .super Ljava/lang/Object;
+.source "UriUtil.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/common/k/a.smali b/com.discord/smali/com/facebook/common/k/a.smali
index 386a27b7d2..ad2694fe7b 100644
--- a/com.discord/smali/com/facebook/common/k/a.smali
+++ b/com.discord/smali/com/facebook/common/k/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/k/a;
 .super Ljava/lang/Object;
+.source "BitmapCreator.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/common/k/b$a.smali b/com.discord/smali/com/facebook/common/k/b$a.smali
index 6b26ab2804..cb65bbc2e5 100644
--- a/com.discord/smali/com/facebook/common/k/b$a.smali
+++ b/com.discord/smali/com/facebook/common/k/b$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/k/b$a;
 .super Ljava/lang/Object;
+.source "WebpBitmapFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/k/b.smali b/com.discord/smali/com/facebook/common/k/b.smali
index 24fa7b68fa..fd9002d346 100644
--- a/com.discord/smali/com/facebook/common/k/b.smali
+++ b/com.discord/smali/com/facebook/common/k/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/k/b;
 .super Ljava/lang/Object;
+.source "WebpBitmapFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/k/c.smali b/com.discord/smali/com/facebook/common/k/c.smali
index d63e4939f0..e641534735 100644
--- a/com.discord/smali/com/facebook/common/k/c.smali
+++ b/com.discord/smali/com/facebook/common/k/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/k/c;
 .super Ljava/lang/Object;
+.source "WebpSupportStatus.java"
 
 
 # static fields
@@ -69,15 +70,13 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-ge v0, v1, :cond_3
+    if-ge v0, v1, :cond_2
 
-    :cond_2
-    :goto_2
     const/4 v2, 0x0
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_3
+    :cond_2
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     if-ne v0, v1, :cond_4
@@ -100,16 +99,17 @@
 
     iget v0, v1, Landroid/graphics/BitmapFactory$Options;->outHeight:I
 
-    if-ne v0, v2, :cond_2
+    if-ne v0, v2, :cond_3
 
     iget v0, v1, Landroid/graphics/BitmapFactory$Options;->outWidth:I
 
     if-eq v0, v2, :cond_4
 
-    goto :goto_2
+    :cond_3
+    const/4 v2, 0x0
 
     :cond_4
-    :goto_3
+    :goto_2
     sput-boolean v2, Lcom/facebook/common/k/c;->DN:Z
 
     const/4 v0, 0x0
@@ -323,9 +323,9 @@
 
     and-int/2addr p0, v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-ne p0, v1, :cond_0
 
@@ -341,10 +341,10 @@
 
     if-eqz p0, :cond_1
 
-    return v3
+    return v2
 
     :cond_1
-    return v2
+    return v3
 .end method
 
 .method public static d([B)Z
@@ -394,9 +394,9 @@
 
     and-int/2addr p0, v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-ne p0, v1, :cond_0
 
@@ -412,13 +412,13 @@
 
     if-eqz p0, :cond_1
 
-    return v3
+    return v2
 
     :cond_1
-    return v2
+    return v3
 .end method
 
-.method public static fA()Lcom/facebook/common/k/b;
+.method public static fz()Lcom/facebook/common/k/b;
     .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali/com/facebook/common/references/CloseableReference$1.smali b/com.discord/smali/com/facebook/common/references/CloseableReference$1.smali
index 5e68511473..e6d32fbcef 100644
--- a/com.discord/smali/com/facebook/common/references/CloseableReference$1.smali
+++ b/com.discord/smali/com/facebook/common/references/CloseableReference$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/common/references/CloseableReference$1;
 .super Ljava/lang/Object;
+.source "CloseableReference.java"
 
 # interfaces
 .implements Lcom/facebook/common/references/b;
@@ -46,6 +47,8 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/common/references/CloseableReference.smali b/com.discord/smali/com/facebook/common/references/CloseableReference.smali
index 5297788ad7..173da26c39 100644
--- a/com.discord/smali/com/facebook/common/references/CloseableReference.smali
+++ b/com.discord/smali/com/facebook/common/references/CloseableReference.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/references/CloseableReference;
 .super Ljava/lang/Object;
+.source "CloseableReference.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -99,7 +100,7 @@
 
     iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Df:Lcom/facebook/common/references/c;
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/c;->fs()V
+    invoke-virtual {p1}, Lcom/facebook/common/references/c;->fr()V
 
     return-void
 .end method
@@ -259,7 +260,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fr()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fq()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p0
 
@@ -399,7 +400,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fq()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fp()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -431,7 +432,7 @@
 
     iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Df:Lcom/facebook/common/references/c;
 
-    invoke-virtual {v0}, Lcom/facebook/common/references/c;->ft()I
+    invoke-virtual {v0}, Lcom/facebook/common/references/c;->fs()I
 
     move-result v1
 
@@ -599,7 +600,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fq()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized fp()Lcom/facebook/common/references/CloseableReference;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -638,7 +639,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fr()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized fq()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -660,7 +661,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fq()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fp()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
     :try_end_0
@@ -698,8 +699,16 @@
     :try_start_0
     iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->De:Z
 
-    xor-int/lit8 v0, v0, 0x1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Df:Lcom/facebook/common/references/c;
@@ -752,4 +761,6 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/common/references/a.smali b/com.discord/smali/com/facebook/common/references/a.smali
index 4feae43b23..5c5a6a9b5c 100644
--- a/com.discord/smali/com/facebook/common/references/a.smali
+++ b/com.discord/smali/com/facebook/common/references/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/references/a;
 .super Ljava/lang/Object;
+.source "OOMSoftReference.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/references/b.smali b/com.discord/smali/com/facebook/common/references/b.smali
index 1aa958e947..cee6b3f66b 100644
--- a/com.discord/smali/com/facebook/common/references/b.smali
+++ b/com.discord/smali/com/facebook/common/references/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/references/b;
 .super Ljava/lang/Object;
+.source "ResourceReleaser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/references/c$a.smali b/com.discord/smali/com/facebook/common/references/c$a.smali
index 186d78cf41..84266d7f47 100644
--- a/com.discord/smali/com/facebook/common/references/c$a.smali
+++ b/com.discord/smali/com/facebook/common/references/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/references/c$a;
 .super Ljava/lang/RuntimeException;
+.source "SharedReference.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/references/c.smali b/com.discord/smali/com/facebook/common/references/c.smali
index 51a040f99f..77f3898988 100644
--- a/com.discord/smali/com/facebook/common/references/c.smali
+++ b/com.discord/smali/com/facebook/common/references/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/references/c;
 .super Ljava/lang/Object;
+.source "SharedReference.java"
 
 
 # annotations
@@ -189,7 +190,7 @@
     return p0
 .end method
 
-.method private fu()V
+.method private ft()V
     .locals 1
 
     invoke-static {p0}, Lcom/facebook/common/references/c;->a(Lcom/facebook/common/references/c;)Z
@@ -238,6 +239,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method static x(Ljava/lang/Object;)V
@@ -323,13 +326,13 @@
 
 
 # virtual methods
-.method public final declared-synchronized fs()V
+.method public final declared-synchronized fr()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->fu()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->ft()V
 
     iget v0, p0, Lcom/facebook/common/references/c;->Dl:I
 
@@ -351,13 +354,13 @@
     throw v0
 .end method
 
-.method final declared-synchronized ft()I
+.method final declared-synchronized fs()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->fu()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->ft()V
 
     iget v0, p0, Lcom/facebook/common/references/c;->Dl:I
 
diff --git a/com.discord/smali/com/facebook/common/time/AwakeTimeSinceBootClock.smali b/com.discord/smali/com/facebook/common/time/AwakeTimeSinceBootClock.smali
index ce5e83a40a..f64a9f52a5 100644
--- a/com.discord/smali/com/facebook/common/time/AwakeTimeSinceBootClock.smali
+++ b/com.discord/smali/com/facebook/common/time/AwakeTimeSinceBootClock.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/common/time/AwakeTimeSinceBootClock;
 .super Ljava/lang/Object;
+.source "AwakeTimeSinceBootClock.java"
 
 # interfaces
 .implements Lcom/facebook/common/time/b;
diff --git a/com.discord/smali/com/facebook/common/time/RealtimeSinceBootClock.smali b/com.discord/smali/com/facebook/common/time/RealtimeSinceBootClock.smali
index 988b519a3f..21df81b6fb 100644
--- a/com.discord/smali/com/facebook/common/time/RealtimeSinceBootClock.smali
+++ b/com.discord/smali/com/facebook/common/time/RealtimeSinceBootClock.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/common/time/RealtimeSinceBootClock;
 .super Ljava/lang/Object;
+.source "RealtimeSinceBootClock.java"
 
 # interfaces
 .implements Lcom/facebook/common/time/b;
diff --git a/com.discord/smali/com/facebook/common/time/a.smali b/com.discord/smali/com/facebook/common/time/a.smali
index cbfcca9250..e23d393f92 100644
--- a/com.discord/smali/com/facebook/common/time/a.smali
+++ b/com.discord/smali/com/facebook/common/time/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/time/a;
 .super Ljava/lang/Object;
+.source "Clock.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/time/b.smali b/com.discord/smali/com/facebook/common/time/b.smali
index 0741958744..18119e5d38 100644
--- a/com.discord/smali/com/facebook/common/time/b.smali
+++ b/com.discord/smali/com/facebook/common/time/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/common/time/b;
 .super Ljava/lang/Object;
+.source "MonotonicClock.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/common/time/c.smali b/com.discord/smali/com/facebook/common/time/c.smali
index 89e48600b4..4ada8a982b 100644
--- a/com.discord/smali/com/facebook/common/time/c.smali
+++ b/com.discord/smali/com/facebook/common/time/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/common/time/c;
 .super Ljava/lang/Object;
+.source "SystemClock.java"
 
 # interfaces
 .implements Lcom/facebook/common/time/a;
@@ -30,7 +31,7 @@
     return-void
 .end method
 
-.method public static fz()Lcom/facebook/common/time/c;
+.method public static fy()Lcom/facebook/common/time/c;
     .locals 1
 
     sget-object v0, Lcom/facebook/common/time/c;->DD:Lcom/facebook/common/time/c;
diff --git a/com.discord/smali/com/facebook/d/a/a/a.smali b/com.discord/smali/com/facebook/d/a/a/a.smali
index cfaaa9930a..aa96f4b8e0 100644
--- a/com.discord/smali/com/facebook/d/a/a/a.smali
+++ b/com.discord/smali/com/facebook/d/a/a/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/d/a/a/a;
 .super Landroid/text/style/ReplacementSpan;
+.source "BetterImageSpan.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/datasource/DataSource.smali b/com.discord/smali/com/facebook/datasource/DataSource.smali
index 70ba5f516a..5dbf66f5bd 100644
--- a/com.discord/smali/com/facebook/datasource/DataSource.smali
+++ b/com.discord/smali/com/facebook/datasource/DataSource.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/datasource/DataSource;
 .super Ljava/lang/Object;
+.source "DataSource.java"
 
 
 # annotations
@@ -26,15 +27,15 @@
     .end annotation
 .end method
 
-.method public abstract fB()Z
+.method public abstract fA()Z
 .end method
 
-.method public abstract fD()Ljava/lang/Throwable;
+.method public abstract fC()Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
-.method public abstract fE()Z
+.method public abstract fD()Z
 .end method
 
 .method public abstract getProgress()F
diff --git a/com.discord/smali/com/facebook/datasource/a$1.smali b/com.discord/smali/com/facebook/datasource/a$1.smali
index 89f299985d..ca3e5c869f 100644
--- a/com.discord/smali/com/facebook/datasource/a$1.smali
+++ b/com.discord/smali/com/facebook/datasource/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/datasource/a$1;
 .super Ljava/lang/Object;
+.source "AbstractDataSource.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/facebook/datasource/a$2.smali b/com.discord/smali/com/facebook/datasource/a$2.smali
index 886e4f79c2..3d8ad0a8b2 100644
--- a/com.discord/smali/com/facebook/datasource/a$2.smali
+++ b/com.discord/smali/com/facebook/datasource/a$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/datasource/a$2;
 .super Ljava/lang/Object;
+.source "AbstractDataSource.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/facebook/datasource/a$a.smali b/com.discord/smali/com/facebook/datasource/a$a.smali
index 78190a80bb..61f257be1f 100644
--- a/com.discord/smali/com/facebook/datasource/a$a.smali
+++ b/com.discord/smali/com/facebook/datasource/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/datasource/a$a;
 .super Ljava/lang/Enum;
+.source "AbstractDataSource.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/datasource/a.smali b/com.discord/smali/com/facebook/datasource/a.smali
index 511e1b02b0..b134b6ab8e 100644
--- a/com.discord/smali/com/facebook/datasource/a.smali
+++ b/com.discord/smali/com/facebook/datasource/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/datasource/a;
 .super Ljava/lang/Object;
+.source "AbstractDataSource.java"
 
 # interfaces
 .implements Lcom/facebook/datasource/DataSource;
@@ -284,7 +285,7 @@
 
     if-eq v0, v1, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget v0, Lcom/facebook/datasource/a$a;->Eh:I
@@ -297,16 +298,17 @@
 
     const/4 p1, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return p1
 
     :cond_1
-    :goto_1
+    :goto_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return p1
 
     :catchall_0
     move-exception p1
@@ -316,7 +318,7 @@
     throw p1
 .end method
 
-.method private declared-synchronized fC()Z
+.method private declared-synchronized fB()Z
     .locals 2
 
     monitor-enter p0
@@ -348,16 +350,18 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method private fF()V
+.method private fE()V
     .locals 5
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fC()Z
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fB()Z
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fG()Z
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fF()Z
 
     move-result v1
 
@@ -396,7 +400,7 @@
     return-void
 .end method
 
-.method private declared-synchronized fG()Z
+.method private declared-synchronized fF()Z
     .locals 1
 
     monitor-enter p0
@@ -434,6 +438,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method private declared-synchronized h(F)Z
@@ -540,7 +546,7 @@
     invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    invoke-virtual {p0}, Lcom/facebook/datasource/a;->fB()Z
+    invoke-virtual {p0}, Lcom/facebook/datasource/a;->fA()Z
 
     move-result v0
 
@@ -552,7 +558,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fG()Z
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fF()Z
 
     move-result v0
 
@@ -576,11 +582,11 @@
 
     if-eqz v0, :cond_4
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fC()Z
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fB()Z
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fG()Z
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fF()Z
 
     move-result v1
 
@@ -618,7 +624,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fF()V
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fE()V
 
     :cond_0
     return p1
@@ -633,13 +639,13 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fF()V
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fE()V
 
     :cond_0
     return p1
 .end method
 
-.method public declared-synchronized fB()Z
+.method public declared-synchronized fA()Z
     .locals 1
 
     monitor-enter p0
@@ -669,9 +675,11 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final declared-synchronized fD()Ljava/lang/Throwable;
+.method public final declared-synchronized fC()Ljava/lang/Throwable;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -695,7 +703,7 @@
     throw v0
 .end method
 
-.method public fE()Z
+.method public fD()Z
     .locals 3
 
     monitor-enter p0
@@ -737,7 +745,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/datasource/a;->fF()V
+    invoke-direct {p0}, Lcom/facebook/datasource/a;->fE()V
 
     :cond_2
     monitor-enter p0
@@ -925,6 +933,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method protected y(Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/facebook/datasource/b.smali b/com.discord/smali/com/facebook/datasource/b.smali
index a08ce6ca99..9d203c43e5 100644
--- a/com.discord/smali/com/facebook/datasource/b.smali
+++ b/com.discord/smali/com/facebook/datasource/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/datasource/b;
 .super Ljava/lang/Object;
+.source "BaseDataSubscriber.java"
 
 # interfaces
 .implements Lcom/facebook/datasource/d;
@@ -57,14 +58,14 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     throw v0
 .end method
@@ -100,7 +101,9 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fD()Z
+
+    return-void
 
     :cond_0
     return-void
@@ -110,7 +113,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     :cond_1
     throw v1
diff --git a/com.discord/smali/com/facebook/datasource/c$1.smali b/com.discord/smali/com/facebook/datasource/c$1.smali
index c46e85d1b7..a243c4b17b 100644
--- a/com.discord/smali/com/facebook/datasource/c$1.smali
+++ b/com.discord/smali/com/facebook/datasource/c$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/datasource/c$1;
 .super Ljava/lang/Object;
+.source "DataSources.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/datasource/c.smali b/com.discord/smali/com/facebook/datasource/c.smali
index b648646e6d..b8f35b6f79 100644
--- a/com.discord/smali/com/facebook/datasource/c.smali
+++ b/com.discord/smali/com/facebook/datasource/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/datasource/c;
 .super Ljava/lang/Object;
+.source "DataSources.java"
 
 
 # direct methods
@@ -17,7 +18,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/datasource/g;->fM()Lcom/facebook/datasource/g;
+    invoke-static {}, Lcom/facebook/datasource/g;->fL()Lcom/facebook/datasource/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/datasource/d.smali b/com.discord/smali/com/facebook/datasource/d.smali
index 698a477239..0aa8a3c1a9 100644
--- a/com.discord/smali/com/facebook/datasource/d.smali
+++ b/com.discord/smali/com/facebook/datasource/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/datasource/d;
 .super Ljava/lang/Object;
+.source "DataSubscriber.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/datasource/e$a$a.smali b/com.discord/smali/com/facebook/datasource/e$a$a.smali
index b78aee4ac8..82e75a2ce5 100644
--- a/com.discord/smali/com/facebook/datasource/e$a$a.smali
+++ b/com.discord/smali/com/facebook/datasource/e$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/datasource/e$a$a;
 .super Ljava/lang/Object;
+.source "FirstAvailableDataSourceSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/datasource/d;
@@ -89,7 +90,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fB()Z
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fA()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/facebook/datasource/e$a.smali b/com.discord/smali/com/facebook/datasource/e$a.smali
index 1afc0e3cbc..d06ed91e9a 100644
--- a/com.discord/smali/com/facebook/datasource/e$a.smali
+++ b/com.discord/smali/com/facebook/datasource/e$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/datasource/e$a;
 .super Lcom/facebook/datasource/a;
+.source "FirstAvailableDataSourceSupplier.java"
 
 
 # annotations
@@ -71,7 +72,7 @@
 
     iput-object p1, p0, Lcom/facebook/datasource/e$a;->Em:Lcom/facebook/datasource/DataSource;
 
-    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fH()Z
+    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fG()Z
 
     move-result p1
 
@@ -98,7 +99,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
@@ -107,13 +108,13 @@
     invoke-static {p1}, Lcom/facebook/datasource/e$a;->c(Lcom/facebook/datasource/DataSource;)V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fH()Z
+    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fG()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fD()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fC()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -146,7 +147,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     monitor-exit p0
 
     return p1
@@ -159,7 +159,9 @@
 
     const/4 p1, 0x1
 
-    goto :goto_0
+    monitor-exit p0
+
+    return p1
 
     :catchall_0
     move-exception p1
@@ -228,7 +230,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_3
-    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
@@ -277,7 +279,7 @@
 
     if-eq p1, v0, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
@@ -288,16 +290,17 @@
 
     const/4 p1, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return p1
 
     :cond_1
-    :goto_1
+    :goto_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return p1
 
     :catchall_0
     move-exception p1
@@ -319,16 +322,16 @@
 
     if-eqz p0, :cond_0
 
-    invoke-interface {p0}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p0}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     :cond_0
     return-void
 .end method
 
-.method private fH()Z
+.method private fG()Z
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fI()Lcom/facebook/common/d/k;
+    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fH()Lcom/facebook/common/d/k;
 
     move-result-object v0
 
@@ -360,7 +363,7 @@
 
     invoke-direct {v1, p0, v2}, Lcom/facebook/datasource/e$a$a;-><init>(Lcom/facebook/datasource/e$a;B)V
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fd()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fc()Lcom/facebook/common/b/a;
 
     move-result-object v2
 
@@ -376,7 +379,7 @@
     return v2
 .end method
 
-.method private declared-synchronized fI()Lcom/facebook/common/d/k;
+.method private declared-synchronized fH()Lcom/facebook/common/d/k;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -448,7 +451,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized fJ()Lcom/facebook/datasource/DataSource;
+.method private declared-synchronized fI()Lcom/facebook/datasource/DataSource;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -482,19 +485,19 @@
 
 
 # virtual methods
-.method public final declared-synchronized fB()Z
+.method public final declared-synchronized fA()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/datasource/DataSource;->fB()Z
+    invoke-interface {v0}, Lcom/facebook/datasource/DataSource;->fA()Z
 
     move-result v0
     :try_end_0
@@ -520,15 +523,17 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final fE()Z
+.method public final fD()Z
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/datasource/a;->fE()Z
+    invoke-super {p0}, Lcom/facebook/datasource/a;->fD()Z
 
     move-result v0
 
@@ -588,7 +593,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/e$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/datasource/e.smali b/com.discord/smali/com/facebook/datasource/e.smali
index 3a7d0e4e6a..839eb51927 100644
--- a/com.discord/smali/com/facebook/datasource/e.smali
+++ b/com.discord/smali/com/facebook/datasource/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/datasource/e;
 .super Ljava/lang/Object;
+.source "FirstAvailableDataSourceSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/datasource/f$a$a.smali b/com.discord/smali/com/facebook/datasource/f$a$a.smali
index ee65469bd5..b28a80560c 100644
--- a/com.discord/smali/com/facebook/datasource/f$a$a.smali
+++ b/com.discord/smali/com/facebook/datasource/f$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/datasource/f$a$a;
 .super Ljava/lang/Object;
+.source "IncreasingQualityDataSourceSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/datasource/d;
@@ -87,7 +88,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fB()Z
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fA()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/facebook/datasource/f$a.smali b/com.discord/smali/com/facebook/datasource/f$a.smali
index 4a093bd976..d2fe7769d8 100644
--- a/com.discord/smali/com/facebook/datasource/f$a.smali
+++ b/com.discord/smali/com/facebook/datasource/f$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/datasource/f$a;
 .super Lcom/facebook/datasource/a;
+.source "IncreasingQualityDataSourceSupplier.java"
 
 
 # annotations
@@ -77,7 +78,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fK()V
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()V
 
     :cond_0
     return-void
@@ -215,7 +216,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
     :try_end_0
@@ -287,7 +288,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v3
 
@@ -330,7 +331,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :cond_4
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
@@ -357,7 +358,7 @@
     invoke-virtual {p0, v0, p1}, Lcom/facebook/datasource/f$a;->a(Ljava/lang/Object;Z)Z
 
     :cond_6
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fL()V
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fK()V
 
     return-void
 
@@ -370,6 +371,8 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method static synthetic b(Lcom/facebook/datasource/f$a;ILcom/facebook/datasource/DataSource;)V
@@ -383,14 +386,14 @@
 
     if-nez p1, :cond_0
 
-    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fD()Ljava/lang/Throwable;
+    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fC()Ljava/lang/Throwable;
 
     move-result-object p1
 
     iput-object p1, p0, Lcom/facebook/datasource/f$a;->Eu:Ljava/lang/Throwable;
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fL()V
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fK()V
 
     return-void
 .end method
@@ -407,13 +410,13 @@
 
     if-eqz p0, :cond_0
 
-    invoke-interface {p0}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p0}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     :cond_0
     return-void
 .end method
 
-.method private declared-synchronized fJ()Lcom/facebook/datasource/DataSource;
+.method private declared-synchronized fI()Lcom/facebook/datasource/DataSource;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -449,7 +452,7 @@
     throw v0
 .end method
 
-.method private fK()V
+.method private fJ()V
     .locals 5
 
     iget-object v0, p0, Lcom/facebook/datasource/f$a;->Et:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -519,13 +522,13 @@
 
     invoke-direct {v3, p0, v1}, Lcom/facebook/datasource/f$a$a;-><init>(Lcom/facebook/datasource/f$a;I)V
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fd()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fc()Lcom/facebook/common/b/a;
 
     move-result-object v4
 
     invoke-interface {v2, v3, v4}, Lcom/facebook/datasource/DataSource;->a(Lcom/facebook/datasource/d;Ljava/util/concurrent/Executor;)V
 
-    invoke-interface {v2}, Lcom/facebook/datasource/DataSource;->fB()Z
+    invoke-interface {v2}, Lcom/facebook/datasource/DataSource;->fA()Z
 
     move-result v2
 
@@ -548,9 +551,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
-.method private fL()V
+.method private fK()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/datasource/f$a;->Et:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -567,8 +572,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/datasource/f$a;->Eu:Ljava/lang/Throwable;
-
     invoke-virtual {p0, v0}, Lcom/facebook/datasource/f$a;->d(Ljava/lang/Throwable;)Z
 
     :cond_0
@@ -577,7 +580,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized fB()Z
+.method public final declared-synchronized fA()Z
     .locals 1
 
     monitor-enter p0
@@ -589,16 +592,16 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fK()V
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/datasource/DataSource;->fB()Z
+    invoke-interface {v0}, Lcom/facebook/datasource/DataSource;->fA()Z
 
     move-result v0
     :try_end_0
@@ -624,9 +627,11 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final fE()Z
+.method public final fD()Z
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/datasource/f$a;->Ev:Lcom/facebook/datasource/f;
@@ -635,13 +640,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fK()V
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()V
 
     :cond_0
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/datasource/a;->fE()Z
+    invoke-super {p0}, Lcom/facebook/datasource/a;->fD()Z
 
     move-result v0
 
@@ -699,6 +704,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized getResult()Ljava/lang/Object;
@@ -721,10 +728,10 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fK()V
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fJ()Lcom/facebook/datasource/DataSource;
+    invoke-direct {p0}, Lcom/facebook/datasource/f$a;->fI()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/datasource/f.smali b/com.discord/smali/com/facebook/datasource/f.smali
index f4f254f872..ae07d0dfc8 100644
--- a/com.discord/smali/com/facebook/datasource/f.smali
+++ b/com.discord/smali/com/facebook/datasource/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/datasource/f;
 .super Ljava/lang/Object;
+.source "IncreasingQualityDataSourceSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/datasource/g.smali b/com.discord/smali/com/facebook/datasource/g.smali
index 7f39ddee22..a06ed33d31 100644
--- a/com.discord/smali/com/facebook/datasource/g.smali
+++ b/com.discord/smali/com/facebook/datasource/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/datasource/g;
 .super Lcom/facebook/datasource/a;
+.source "SimpleDataSource.java"
 
 
 # annotations
@@ -23,7 +24,7 @@
     return-void
 .end method
 
-.method public static fM()Lcom/facebook/datasource/g;
+.method public static fL()Lcom/facebook/datasource/g;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/facebook/drawee/R$a.smali b/com.discord/smali/com/facebook/drawee/R$a.smali
index a1954340bc..4e2d58c563 100644
--- a/com.discord/smali/com/facebook/drawee/R$a.smali
+++ b/com.discord/smali/com/facebook/drawee/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/R.smali b/com.discord/smali/com/facebook/drawee/R.smali
index 1307598422..b77ef4a841 100644
--- a/com.discord/smali/com/facebook/drawee/R.smali
+++ b/com.discord/smali/com/facebook/drawee/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/a/a$1.smali b/com.discord/smali/com/facebook/drawee/a/a$1.smali
index db4233dffd..62fa131063 100644
--- a/com.discord/smali/com/facebook/drawee/a/a$1.smali
+++ b/com.discord/smali/com/facebook/drawee/a/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/a/a$1;
 .super Ljava/lang/Object;
+.source "DeferredReleaser.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -36,7 +37,7 @@
 .method public final run()V
     .locals 2
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gb()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->ga()V
 
     iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->FD:Lcom/facebook/drawee/a/a;
 
diff --git a/com.discord/smali/com/facebook/drawee/a/a$a.smali b/com.discord/smali/com/facebook/drawee/a/a$a.smali
index 1e732dbc10..7d967dab1f 100644
--- a/com.discord/smali/com/facebook/drawee/a/a$a.smali
+++ b/com.discord/smali/com/facebook/drawee/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/a/a$a;
 .super Ljava/lang/Object;
+.source "DeferredReleaser.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/a/a.smali b/com.discord/smali/com/facebook/drawee/a/a.smali
index 980b98153e..c774f6d1f5 100644
--- a/com.discord/smali/com/facebook/drawee/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/a/a;
 .super Ljava/lang/Object;
+.source "DeferredReleaser.java"
 
 
 # annotations
@@ -75,7 +76,7 @@
     return-object p0
 .end method
 
-.method public static declared-synchronized fZ()Lcom/facebook/drawee/a/a;
+.method public static declared-synchronized fY()Lcom/facebook/drawee/a/a;
     .locals 2
 
     const-class v0, Lcom/facebook/drawee/a/a;
@@ -110,7 +111,7 @@
     throw v1
 .end method
 
-.method public static ga()V
+.method public static fZ()V
     .locals 2
 
     invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
@@ -140,10 +141,10 @@
     return-void
 .end method
 
-.method static synthetic gb()V
+.method static synthetic ga()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->ga()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->fZ()V
 
     return-void
 .end method
@@ -153,7 +154,7 @@
 .method public final a(Lcom/facebook/drawee/a/a$a;)V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->ga()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->fZ()V
 
     iget-object v0, p0, Lcom/facebook/drawee/a/a;->FA:Ljava/util/Set;
 
diff --git a/com.discord/smali/com/facebook/drawee/a/b$a.smali b/com.discord/smali/com/facebook/drawee/a/b$a.smali
index 7cdb33d677..f7e3ff1a8c 100644
--- a/com.discord/smali/com/facebook/drawee/a/b$a.smali
+++ b/com.discord/smali/com/facebook/drawee/a/b$a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/facebook/drawee/a/b$a;
 .super Ljava/lang/Enum;
+.source "DraweeEventTracker.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/a/b.smali b/com.discord/smali/com/facebook/drawee/a/b.smali
index 23a10df57a..61e063af53 100644
--- a/com.discord/smali/com/facebook/drawee/a/b.smali
+++ b/com.discord/smali/com/facebook/drawee/a/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/a/b;
 .super Ljava/lang/Object;
+.source "DraweeEventTracker.java"
 
 
 # annotations
@@ -61,7 +62,7 @@
     return-void
 .end method
 
-.method public static gd()Lcom/facebook/drawee/a/b;
+.method public static gb()Lcom/facebook/drawee/a/b;
     .locals 1
 
     sget-boolean v0, Lcom/facebook/drawee/a/b;->FG:Z
diff --git a/com.discord/smali/com/facebook/drawee/a/c.smali b/com.discord/smali/com/facebook/drawee/a/c.smali
index 2d6efa1cd1..35a167b5c2 100644
--- a/com.discord/smali/com/facebook/drawee/a/c.smali
+++ b/com.discord/smali/com/facebook/drawee/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/a/c;
 .super Ljava/lang/Object;
+.source "RetryManager.java"
 
 
 # instance fields
@@ -23,7 +24,7 @@
 
 
 # virtual methods
-.method public final ge()Z
+.method public final gd()Z
     .locals 2
 
     iget-boolean v0, p0, Lcom/facebook/drawee/a/c;->Gg:Z
diff --git a/com.discord/smali/com/facebook/drawee/b/a.smali b/com.discord/smali/com/facebook/drawee/b/a.smali
index 8d8b98e970..f17eed8a62 100644
--- a/com.discord/smali/com/facebook/drawee/b/a.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/b/a;
 .super Landroid/graphics/drawable/Drawable;
+.source "DebugControllerOverlayDrawable.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/b/a/b;
@@ -245,11 +246,11 @@
 
     const/4 v15, 0x0
 
-    if-lez v4, :cond_3
+    if-lez v4, :cond_4
 
-    if-lez v5, :cond_3
+    if-lez v5, :cond_4
 
-    if-lez v2, :cond_3
+    if-lez v2, :cond_4
 
     if-gtz v3, :cond_0
 
@@ -260,18 +261,12 @@
 
     iget-object v10, v0, Lcom/facebook/drawee/b/a;->mRect:Landroid/graphics/Rect;
 
-    iget-object v11, v0, Lcom/facebook/drawee/b/a;->mRect:Landroid/graphics/Rect;
-
-    iput v15, v11, Landroid/graphics/Rect;->top:I
+    iput v15, v10, Landroid/graphics/Rect;->top:I
 
     iput v15, v10, Landroid/graphics/Rect;->left:I
 
-    iget-object v10, v0, Lcom/facebook/drawee/b/a;->mRect:Landroid/graphics/Rect;
-
     iput v4, v10, Landroid/graphics/Rect;->right:I
 
-    iget-object v10, v0, Lcom/facebook/drawee/b/a;->mRect:Landroid/graphics/Rect;
-
     iput v5, v10, Landroid/graphics/Rect;->bottom:I
 
     iget-object v10, v0, Lcom/facebook/drawee/b/a;->mMatrix:Landroid/graphics/Matrix;
@@ -298,29 +293,21 @@
 
     iget-object v9, v0, Lcom/facebook/drawee/b/a;->He:Landroid/graphics/RectF;
 
-    iget-object v10, v0, Lcom/facebook/drawee/b/a;->He:Landroid/graphics/RectF;
-
-    iput v6, v10, Landroid/graphics/RectF;->top:F
+    iput v6, v9, Landroid/graphics/RectF;->top:F
 
     iput v6, v9, Landroid/graphics/RectF;->left:F
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->He:Landroid/graphics/RectF;
-
     int-to-float v10, v2
 
     iput v10, v9, Landroid/graphics/RectF;->right:F
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->He:Landroid/graphics/RectF;
-
     int-to-float v10, v3
 
     iput v10, v9, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->mMatrix:Landroid/graphics/Matrix;
+    iget-object v10, v0, Lcom/facebook/drawee/b/a;->mMatrix:Landroid/graphics/Matrix;
 
-    iget-object v10, v0, Lcom/facebook/drawee/b/a;->He:Landroid/graphics/RectF;
-
-    invoke-virtual {v9, v10}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
+    invoke-virtual {v10, v9}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
     iget-object v9, v0, Lcom/facebook/drawee/b/a;->He:Landroid/graphics/RectF;
 
@@ -401,13 +388,13 @@
     :cond_2
     cmpg-float v2, v2, v9
 
-    if-gez v2, :cond_4
+    if-gez v2, :cond_3
 
     int-to-float v2, v3
 
     cmpg-float v2, v2, v13
 
-    if-gez v2, :cond_4
+    if-gez v2, :cond_3
 
     const v16, 0x66ff9800
 
@@ -416,10 +403,14 @@
     goto :goto_2
 
     :cond_3
+    const v2, 0x66f44336
+
+    goto :goto_2
+
+    :cond_4
     :goto_1
     const/16 v18, 0x0
 
-    :cond_4
     const v2, 0x66f44336
 
     :goto_2
@@ -483,22 +474,19 @@
 
     if-eqz v1, :cond_5
 
-    const-string v1, "IDs: %s, %s"
+    const-string v4, "IDs: %s, %s"
 
-    new-array v4, v2, [Ljava/lang/Object;
+    new-array v5, v2, [Ljava/lang/Object;
 
-    iget-object v5, v0, Lcom/facebook/drawee/b/a;->EW:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/drawee/b/a;->EW:Ljava/lang/String;
 
-    aput-object v5, v4, v18
+    aput-object v6, v5, v18
 
-    iget-object v5, v0, Lcom/facebook/drawee/b/a;->GV:Ljava/lang/String;
+    aput-object v1, v5, v3
 
-    aput-object v5, v4, v3
+    invoke-direct {v0, v7, v4, v5}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_3
-    invoke-direct {v0, v7, v1, v4}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const-string v1, "ID: %s"
@@ -509,9 +497,9 @@
 
     aput-object v5, v4, v18
 
-    goto :goto_3
+    invoke-direct {v0, v7, v1, v4}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_4
+    :goto_3
     const-string v1, "D: %dx%d"
 
     new-array v4, v2, [Ljava/lang/Object;
@@ -580,57 +568,51 @@
 
     if-eqz v1, :cond_6
 
-    const-string v1, "i format: %s"
+    const-string v4, "i format: %s"
 
-    new-array v4, v3, [Ljava/lang/Object;
+    new-array v5, v3, [Ljava/lang/Object;
 
-    iget-object v5, v0, Lcom/facebook/drawee/b/a;->GZ:Ljava/lang/String;
+    aput-object v1, v5, v18
 
-    aput-object v5, v4, v18
-
-    invoke-direct {v0, v7, v1, v4}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-direct {v0, v7, v4, v5}, 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;->Hb:I
 
     if-lez v1, :cond_7
 
-    const-string v1, "anim: f %d, l %d"
+    const-string v4, "anim: f %d, l %d"
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->Hb:I
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v1
 
-    move-result-object v4
+    aput-object v1, v2, v18
 
-    aput-object v4, v2, v18
+    iget v1, v0, Lcom/facebook/drawee/b/a;->Hc:I
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->Hc:I
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v1
 
-    move-result-object v4
+    aput-object v1, v2, v3
 
-    aput-object v4, v2, v3
-
-    invoke-direct {v0, v7, v1, v2}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-direct {v0, v7, v4, v2}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_7
     iget-object v1, v0, Lcom/facebook/drawee/b/a;->Ha:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     if-eqz v1, :cond_8
 
-    const-string v1, "scale: %s"
+    const-string v2, "scale: %s"
 
-    new-array v2, v3, [Ljava/lang/Object;
+    new-array v4, v3, [Ljava/lang/Object;
 
-    iget-object v4, v0, Lcom/facebook/drawee/b/a;->Ha:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    aput-object v1, v4, v18
 
-    aput-object v4, v2, v18
-
-    invoke-direct {v0, v7, v1, v2}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-direct {v0, v7, v2, v4}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_8
     iget-wide v1, v0, Lcom/facebook/drawee/b/a;->Hk:J
@@ -641,34 +623,30 @@
 
     if-ltz v6, :cond_9
 
-    const-string v1, "t: %d ms"
+    const-string v4, "t: %d ms"
 
-    new-array v2, v3, [Ljava/lang/Object;
+    new-array v5, v3, [Ljava/lang/Object;
 
-    iget-wide v4, v0, Lcom/facebook/drawee/b/a;->Hk:J
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v1
 
-    move-result-object v4
+    aput-object v1, v5, v18
 
-    aput-object v4, v2, v18
-
-    invoke-direct {v0, v7, v1, v2}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-direct {v0, v7, v4, v5}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_9
     iget-object v1, v0, Lcom/facebook/drawee/b/a;->mOrigin:Ljava/lang/String;
 
     if-eqz v1, :cond_a
 
-    const-string v1, "origin: %s"
+    const-string v2, "origin: %s"
 
-    new-array v2, v3, [Ljava/lang/Object;
+    new-array v3, v3, [Ljava/lang/Object;
 
-    iget-object v3, v0, Lcom/facebook/drawee/b/a;->mOrigin:Ljava/lang/String;
+    aput-object v1, v3, v18
 
-    aput-object v3, v2, v18
-
-    invoke-direct {v0, v7, v1, v2}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-direct {v0, v7, v2, v3}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_a
     return-void
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 8a2dcf6224..bc87135d85 100644
--- a/com.discord/smali/com/facebook/drawee/b/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/b/a/a;
 .super Lcom/facebook/drawee/controller/b;
+.source "ImageLoadingTimeControllerListener.java"
 
 
 # instance fields
@@ -57,8 +58,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/b/a/a;->Hn:Lcom/facebook/drawee/b/a/b;
-
     iget-wide p2, p0, Lcom/facebook/drawee/b/a/a;->Hm:J
 
     iget-wide v0, p0, Lcom/facebook/drawee/b/a/a;->Hl:J
diff --git a/com.discord/smali/com/facebook/drawee/b/a/b.smali b/com.discord/smali/com/facebook/drawee/b/a/b.smali
index 194302779a..c57158f866 100644
--- a/com.discord/smali/com/facebook/drawee/b/a/b.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/b/a/b;
 .super Ljava/lang/Object;
+.source "ImageLoadingTimeListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/R.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/R.smali
index 1c3e3b6654..ea096046da 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/R.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 a13b6597da..be872e62f9 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/a.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/a;
 .super Ljava/lang/Object;
+.source "DefaultDrawableFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/e/a;
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/a/a.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/a/a.smali
index bf11558b9f..f515ed1ec1 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/a/a;
 .super Ljava/lang/Object;
+.source "DebugOverlayImageOriginListener.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/backends/pipeline/b/b;
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 7cf7d54fbe..2536bf5dc6 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b;
 .super Ljava/lang/Object;
+.source "DraweeConfig.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a.smali
index 5968cc3ee0..595f65a5bb 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/a;
 .super Ljava/lang/Object;
+.source "ForwardingImageOriginListener.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/backends/pipeline/b/b;
@@ -130,6 +131,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized b(Lcom/facebook/drawee/backends/pipeline/b/b;)V
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 a7e8960c57..27c0e1b2bb 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
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/a/a;
 .super Lcom/facebook/drawee/controller/b;
+.source "ImagePerfControllerListener.java"
 
 
 # annotations
@@ -50,9 +51,7 @@
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    invoke-virtual {p1, p2}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;)V
+    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;)V
 
     return-void
 .end method
@@ -72,14 +71,10 @@
 
     iput-wide v0, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ff:J
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
     iput-object p1, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->EW:Ljava/lang/String;
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
     const/4 v2, 0x5
 
     invoke-virtual {p1, p2, v2}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
@@ -112,25 +107,17 @@
 
     iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Fe:J
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
     iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Fi:J
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
     iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->EW:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    iput-object p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Fb:Lcom/facebook/imagepipeline/f/f;
+    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Fb:Lcom/facebook/imagepipeline/f/f;
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    const/4 p2, 0x3
 
-    const/4 p3, 0x3
-
-    invoke-virtual {p1, p2, p3}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
+    invoke-virtual {p1, p3, p2}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
 
     return-void
 .end method
@@ -154,21 +141,15 @@
 
     iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Fd:J
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->EW:Ljava/lang/String;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->EW:Ljava/lang/String;
-
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    iput-object p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Fb:Lcom/facebook/imagepipeline/f/f;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Fb:Lcom/facebook/imagepipeline/f/f;
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    const/4 p2, 0x2
 
-    const/4 v0, 0x2
-
-    invoke-virtual {p1, p2, v0}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
+    invoke-virtual {p1, v2, p2}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
 
     return-void
 .end method
@@ -200,14 +181,10 @@
 
     iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Fg:J
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
     iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->EW:Ljava/lang/String;
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
     const/4 v3, 0x4
 
     invoke-virtual {p1, v2, v3}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
@@ -231,21 +208,15 @@
 
     iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Fc:J
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
     iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->EW:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    iput-object p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->EZ:Ljava/lang/Object;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->EZ:Ljava/lang/Object;
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    const/4 p2, 0x0
 
-    const/4 v2, 0x0
-
-    invoke-virtual {p1, p2, v2}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
+    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;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
 
@@ -257,11 +228,9 @@
 
     iput-wide v0, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Fn:J
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    invoke-virtual {p1, p2}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;)V
+    invoke-virtual {p2, p1}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/b.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/b.smali
index 5591913765..f21adb74ac 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/b.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/a/b;
 .super Ljava/lang/Object;
+.source "ImagePerfImageOriginListener.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/backends/pipeline/b/b;
@@ -33,13 +34,11 @@
 
     iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->EU:I
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
-
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->EI:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 p3, 0x1
 
-    invoke-virtual {p1, p2, p3}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
+    invoke-virtual {p2, p1, p3}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/c.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/c.smali
index e00b320ba0..b8d70b0abb 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/c.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/a/c;
 .super Lcom/facebook/imagepipeline/g/a;
+.source "ImagePerfRequestListener.java"
 
 
 # instance fields
@@ -40,17 +41,11 @@
 
     iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Fa:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->EZ:Ljava/lang/Object;
 
-    iput-object p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->EZ:Ljava/lang/Object;
+    iput-object p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->EY:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    iput-object p3, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->EY:Ljava/lang/String;
-
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    iput-boolean p4, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Fj:Z
+    iput-boolean p4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Fj:Z
 
     return-void
 .end method
@@ -72,13 +67,9 @@
 
     iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Fa:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->EY:Ljava/lang/String;
 
-    iput-object p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->EY:Ljava/lang/String;
-
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    iput-boolean p4, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Fj:Z
+    iput-boolean p4, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Fj:Z
 
     return-void
 .end method
@@ -100,13 +91,9 @@
 
     iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Fa:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->EY:Ljava/lang/String;
 
-    iput-object p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->EY:Ljava/lang/String;
-
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Fr:Lcom/facebook/drawee/backends/pipeline/b/h;
-
-    iput-boolean p3, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Fj:Z
+    iput-boolean p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Fj:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/b.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/b.smali
index 0c269467d1..ad7c8cee58 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/b.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/backends/pipeline/b/b;
 .super Ljava/lang/Object;
+.source "ImageOriginListener.java"
 
 
 # virtual methods
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 12ca7e599b..efad8614fe 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
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/c;
 .super Lcom/facebook/imagepipeline/g/a;
+.source "ImageOriginRequestListener.java"
 
 
 # instance fields
@@ -37,8 +38,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->EX:Lcom/facebook/drawee/backends/pipeline/b/b;
-
     iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->EW:Ljava/lang/String;
 
     const/4 v1, -0x1
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/d.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/d.smali
index 14c2fadae8..f27d253dff 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/d.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/d;
 .super Ljava/lang/Object;
+.source "ImageOriginUtils.java"
 
 
 # direct methods
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 fa9d5f9cde..5b67db5e12 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
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/e;
 .super Ljava/lang/Object;
+.source "ImagePerfData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/f.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/f.smali
index 0575d2df17..228cf8c449 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/f.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/f.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/drawee/backends/pipeline/b/f;
 .super Ljava/lang/Object;
+.source "ImagePerfDataListener.java"
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 2730e2a3fa..b1c3556ef6 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
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/g;
 .super Lcom/facebook/imagepipeline/g/a;
+.source "ImagePerfMonitor.java"
 
 
 # instance fields
@@ -69,7 +70,7 @@
     return-void
 .end method
 
-.method private fX()V
+.method private fW()V
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fu:Lcom/facebook/drawee/backends/pipeline/b/a/a;
@@ -134,8 +135,6 @@
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fs:Lcom/facebook/drawee/backends/pipeline/b/c;
-
     iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
 
     iget-object v1, v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
@@ -180,13 +179,11 @@
 
     iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->mEnabled:Z
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fw:Ljava/util/List;
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fw:Ljava/util/List;
+    if-eqz v0, :cond_2
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -197,7 +194,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->fY()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->fX()Lcom/facebook/drawee/backends/pipeline/b/e;
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fw:Ljava/util/List;
 
@@ -217,6 +214,9 @@
     goto :goto_0
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_1
     return-void
 .end method
@@ -228,13 +228,11 @@
 
     iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->mEnabled:Z
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fw:Ljava/util/List;
 
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fw:Ljava/util/List;
+    if-eqz v0, :cond_3
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -286,7 +284,7 @@
     iput p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Fl:I
 
     :cond_1
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->fY()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->fX()Lcom/facebook/drawee/backends/pipeline/b/e;
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fw:Ljava/util/List;
 
@@ -306,6 +304,9 @@
     goto :goto_0
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_1
     return-void
 .end method
@@ -317,39 +318,33 @@
 
     if-eqz p1, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/b/g;->fX()V
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/b/g;->fW()V
 
     iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->EK:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->EK:Lcom/facebook/drawee/backends/pipeline/b/b;
-
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/backends/pipeline/b/b;)V
+    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;->Fu:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fu:Lcom/facebook/drawee/backends/pipeline/b/a/a;
-
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
+    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;->Fv:Lcom/facebook/imagepipeline/g/b;
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fv:Lcom/facebook/imagepipeline/g/b;
-
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/imagepipeline/g/c;)V
+    invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/imagepipeline/g/c;)V
 
     return-void
 
@@ -358,33 +353,27 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->EK:Lcom/facebook/drawee/backends/pipeline/b/b;
-
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/drawee/backends/pipeline/b/b;)V
+    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;->Fu:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fu:Lcom/facebook/drawee/backends/pipeline/b/a/a;
-
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/drawee/controller/ControllerListener;)V
+    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;->Fv:Lcom/facebook/imagepipeline/g/b;
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fp:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Fv:Lcom/facebook/imagepipeline/g/b;
-
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/imagepipeline/g/c;)V
+    invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/imagepipeline/g/c;)V
 
     :cond_5
     return-void
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 45888518e3..d745559422 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
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/b/h;
 .super Ljava/lang/Object;
+.source "ImagePerfState.java"
 
 
 # instance fields
@@ -102,7 +103,7 @@
 
 
 # virtual methods
-.method public final fY()Lcom/facebook/drawee/backends/pipeline/b/e;
+.method public final fX()Lcom/facebook/drawee/backends/pipeline/b/e;
     .locals 33
 
     move-object/from16 v0, p0
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 ecb8342ec1..2b41dcd25d 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/c.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/backends/pipeline/c;
 .super Ljava/lang/Object;
+.source "Fresco.java"
 
 
 # static fields
@@ -118,26 +119,26 @@
     throw p1
 .end method
 
-.method public static fO()Lcom/facebook/drawee/backends/pipeline/e;
+.method public static fN()Lcom/facebook/drawee/backends/pipeline/e;
     .locals 1
 
     sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->EB:Lcom/facebook/drawee/backends/pipeline/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->fW()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->fV()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static fP()Lcom/facebook/imagepipeline/b/g;
+.method public static fO()Lcom/facebook/imagepipeline/b/g;
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->hF()Lcom/facebook/imagepipeline/b/j;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->hE()Lcom/facebook/imagepipeline/b/j;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/j;->fP()Lcom/facebook/imagepipeline/b/g;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/j;->fO()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali
index 8ac894b3ca..17648d3e56 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/backends/pipeline/d;
 .super Lcom/facebook/drawee/controller/AbstractDraweeController;
+.source "PipelineDraweeController.java"
 
 
 # annotations
@@ -341,7 +342,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/facebook/drawee/b/a;->i(II)V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->eN()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->eM()I
 
     move-result p1
 
@@ -459,7 +460,7 @@
     throw p1
 .end method
 
-.method private fS()Lcom/facebook/common/references/CloseableReference;
+.method private fR()Lcom/facebook/common/references/CloseableReference;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -502,11 +503,11 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/f/c;->ih()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/f/c;->ig()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v2
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/f/h;->iu()Z
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/f/h;->it()Z
 
     move-result v2
 
@@ -552,7 +553,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->isValid()Z
 
@@ -574,6 +575,9 @@
 
     :cond_0
     return v0
+
+    :cond_1
+    return v0
 .end method
 
 .method public final synthetic B(Ljava/lang/Object;)Ljava/lang/Object;
@@ -621,7 +625,7 @@
 
     check-cast p1, Lcom/facebook/b/a/a;
 
-    invoke-interface {p1}, Lcom/facebook/b/a/a;->fN()V
+    invoke-interface {p1}, Lcom/facebook/b/a/a;->fM()V
 
     :cond_0
     return-void
@@ -1090,7 +1094,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized fQ()Lcom/facebook/imagepipeline/g/c;
+.method public final declared-synchronized fP()Lcom/facebook/imagepipeline/g/c;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -1149,7 +1153,7 @@
     throw v0
 .end method
 
-.method public final fR()Lcom/facebook/datasource/DataSource;
+.method public final fQ()Lcom/facebook/datasource/DataSource;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1199,10 +1203,10 @@
     return-object v0
 .end method
 
-.method public final synthetic fT()Ljava/lang/Object;
+.method public final synthetic fS()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->fS()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->fR()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/e$1.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/e$1.smali
index eb69a30e1f..8b4194e29b 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/e$1.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/e$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/facebook/drawee/backends/pipeline/e$1;
 .super Ljava/lang/Object;
+.source "PipelineDraweeControllerBuilder.java"
 
 
 # annotations
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 33967b2cf9..85b9e9560c 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/e;
 .super Lcom/facebook/drawee/controller/a;
+.source "PipelineDraweeControllerBuilder.java"
 
 
 # annotations
@@ -70,7 +71,7 @@
     return-void
 .end method
 
-.method private fU()Lcom/facebook/drawee/backends/pipeline/d;
+.method private fT()Lcom/facebook/drawee/backends/pipeline/d;
     .locals 13
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
@@ -167,10 +168,9 @@
 
     move-result-object v1
 
-    :goto_1
     move-object v6, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     iget-object v3, p0, Lcom/facebook/drawee/controller/a;->EZ:Ljava/lang/Object;
@@ -179,12 +179,14 @@
 
     move-result-object v1
 
+    move-object v6, v1
+
     goto :goto_1
 
     :cond_3
     move-object v6, v3
 
-    :goto_2
+    :goto_1
     iget-object v7, p0, Lcom/facebook/drawee/controller/a;->EZ:Ljava/lang/Object;
 
     iget-object v8, p0, Lcom/facebook/drawee/backends/pipeline/e;->Ey:Lcom/facebook/common/d/e;
@@ -274,7 +276,7 @@
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/d;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/d;->fQ()Lcom/facebook/imagepipeline/g/c;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/d;->fP()Lcom/facebook/imagepipeline/g/c;
 
     move-result-object p1
 
@@ -356,7 +358,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -371,10 +373,10 @@
     return-object p1
 .end method
 
-.method public final synthetic fV()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final synthetic fU()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->fU()Lcom/facebook/drawee/backends/pipeline/d;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->fT()Lcom/facebook/drawee/backends/pipeline/d;
 
     move-result-object v0
 
@@ -392,7 +394,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     invoke-super {p0, p1}, Lcom/facebook/drawee/controller/a;->F(Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
 
     move-result-object p1
@@ -406,17 +407,23 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hs()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hr()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
     iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->MM:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-super {p0, p1}, Lcom/facebook/drawee/controller/a;->F(Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
+
+    return-object p1
 .end method
 
 .method public final synthetic m(Landroid/net/Uri;)Lcom/facebook/drawee/d/d;
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 4188b7f3ca..ba76bf0335 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/f;
 .super Ljava/lang/Object;
+.source "PipelineDraweeControllerBuilderSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
@@ -42,7 +43,7 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->hF()Lcom/facebook/imagepipeline/b/j;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->hE()Lcom/facebook/imagepipeline/b/j;
 
     move-result-object p2
 
@@ -87,7 +88,7 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/f;->mContext:Landroid/content/Context;
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->fP()Lcom/facebook/imagepipeline/b/g;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->fO()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object p4
 
@@ -101,6 +102,8 @@
 
     iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->Ez:Lcom/facebook/drawee/backends/pipeline/g;
 
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ez:Lcom/facebook/drawee/backends/pipeline/g;
+
     goto :goto_0
 
     :cond_0
@@ -108,20 +111,20 @@
 
     invoke-direct {p4}, Lcom/facebook/drawee/backends/pipeline/g;-><init>()V
 
-    :goto_0
     iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ez:Lcom/facebook/drawee/backends/pipeline/g;
 
+    :goto_0
     iget-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ez: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;->fZ()Lcom/facebook/drawee/a/a;
+    invoke-static {}, Lcom/facebook/drawee/a/a;->fY()Lcom/facebook/drawee/a/a;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->hG()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->hF()Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object p2
 
@@ -134,12 +137,12 @@
     goto :goto_1
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/b/a;->gT()Lcom/facebook/imagepipeline/e/a;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/b/a;->gS()Lcom/facebook/imagepipeline/e/a;
 
     move-result-object p2
 
     :goto_1
-    invoke-static {}, Lcom/facebook/common/b/i;->fh()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->fg()Lcom/facebook/common/b/i;
 
     move-result-object v2
 
@@ -188,7 +191,7 @@
 
 
 # virtual methods
-.method public final fW()Lcom/facebook/drawee/backends/pipeline/e;
+.method public final fV()Lcom/facebook/drawee/backends/pipeline/e;
     .locals 5
 
     new-instance v0, Lcom/facebook/drawee/backends/pipeline/e;
@@ -209,7 +212,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/f;->fW()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/f;->fV()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 c2666cec15..6f4e81a519 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/backends/pipeline/g;
 .super Ljava/lang/Object;
+.source "PipelineDraweeControllerFactory.java"
 
 
 # instance fields
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 8eca5b0e96..a746030a70 100644
--- a/com.discord/smali/com/facebook/drawee/c/a$a.smali
+++ b/com.discord/smali/com/facebook/drawee/c/a$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/c/a$a;
 .super Ljava/lang/Object;
+.source "GestureDetector.java"
 
 
 # annotations
@@ -14,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract gi()Z
+.method public abstract gh()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 1961ce6c1d..a566a6fdef 100644
--- a/com.discord/smali/com/facebook/drawee/c/a.smali
+++ b/com.discord/smali/com/facebook/drawee/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/c/a;
 .super Ljava/lang/Object;
+.source "GestureDetector.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$1.smali b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$1.smali
index 398928db48..2ae7fec514 100644
--- a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$1.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$1.smali
@@ -1,10 +1,11 @@
 .class final Lcom/facebook/drawee/controller/AbstractDraweeController$1;
 .super Lcom/facebook/datasource/b;
+.source "AbstractDraweeController.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/drawee/controller/AbstractDraweeController;->gj()V
+    value = Lcom/facebook/drawee/controller/AbstractDraweeController;->gi()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -59,7 +60,7 @@
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->val$id:Ljava/lang/String;
 
-    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fD()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->fC()Ljava/lang/Throwable;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$a.smali b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$a.smali
index d7561c2958..2102f36d72 100644
--- a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$a.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 .super Lcom/facebook/drawee/controller/d;
+.source "AbstractDraweeController.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali
index 3e4c9545b6..2c6cc9c458 100644
--- a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/drawee/controller/AbstractDraweeController;
 .super Ljava/lang/Object;
+.source "AbstractDraweeController.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/a/a$a;
@@ -153,7 +154,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/drawee/a/b;->gd()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->gb()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
@@ -220,7 +221,7 @@
 
     invoke-direct {p0, p1, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->c(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     return-void
 
@@ -301,7 +302,7 @@
 
     invoke-virtual {p0, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->z(Ljava/lang/Object;)V
 
-    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fD()Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
@@ -330,19 +331,19 @@
     :try_start_2
     invoke-virtual {p0, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->C(Ljava/lang/Object;)Landroid/graphics/drawable/Drawable;
 
-    move-result-object v0
+    move-result-object p2
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    iget-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gx:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gx: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;->Gx:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
@@ -361,9 +362,9 @@
 
     iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p4, v0, v2, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
+    invoke-interface {p4, p2, v2, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -371,19 +372,18 @@
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gk()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gj()Landroid/graphics/drawable/Animatable;
 
     move-result-object p6
 
-    :goto_1
     invoke-interface {p4, p1, p5, p6}, Lcom/facebook/drawee/controller/ControllerListener;->onFinalImageSet(Ljava/lang/String;Ljava/lang/Object;Landroid/graphics/drawable/Animatable;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :catchall_0
     move-exception p1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     if-eqz p7, :cond_3
@@ -394,9 +394,9 @@
 
     iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p4, v0, v2, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
+    invoke-interface {p4, p2, v2, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -404,10 +404,12 @@
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gk()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gj()Landroid/graphics/drawable/Animatable;
 
     move-result-object p6
 
+    invoke-interface {p4, p1, p5, p6}, Lcom/facebook/drawee/controller/ControllerListener;->onFinalImageSet(Ljava/lang/String;Ljava/lang/Object;Landroid/graphics/drawable/Animatable;)V
+
     goto :goto_1
 
     :cond_3
@@ -417,9 +419,9 @@
 
     iget-object p5, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p5, v0, p4, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
+    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;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -431,24 +433,24 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    :goto_2
+    :goto_1
     if-eqz v1, :cond_4
 
-    if-eq v1, v0, :cond_4
+    if-eq v1, p2, :cond_4
 
     :try_start_5
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Landroid/graphics/drawable/Drawable;)V
 
     :cond_4
-    if-eqz p2, :cond_5
+    if-eqz v0, :cond_5
 
-    if-eq p2, p3, :cond_5
+    if-eq v0, p3, :cond_5
 
     const-string p1, "release_previous_result @ onNewResult"
 
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p0, p1, v0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0, p2}, Lcom/facebook/drawee/controller/AbstractDraweeController;->z(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->z(Ljava/lang/Object;)V
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
@@ -457,24 +459,24 @@
 
     return-void
 
-    :goto_3
+    :goto_2
     if-eqz v1, :cond_6
 
-    if-eq v1, v0, :cond_6
+    if-eq v1, p2, :cond_6
 
     :try_start_6
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Landroid/graphics/drawable/Drawable;)V
 
     :cond_6
-    if-eqz p2, :cond_7
+    if-eqz v0, :cond_7
 
-    if-eq p2, p3, :cond_7
+    if-eq v0, p3, :cond_7
 
-    const-string p3, "release_previous_result @ onNewResult"
+    const-string p2, "release_previous_result @ onNewResult"
 
-    invoke-direct {p0, p3, p2}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p0, p2, v0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0, p2}, Lcom/facebook/drawee/controller/AbstractDraweeController;->z(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->z(Ljava/lang/Object;)V
 
     :cond_7
     throw p1
@@ -529,7 +531,7 @@
 
     invoke-direct {p0, p1, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->c(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {p2}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
@@ -572,18 +574,16 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
-
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    invoke-interface {p2, p4, v0, p1}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
+    invoke-interface {p4, p2, v0, p1}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
 
     goto :goto_1
 
     :cond_2
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->ge()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gd()Z
 
     move-result p1
 
@@ -591,17 +591,17 @@
 
     iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->gD()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->gC()V
 
     goto :goto_1
 
     :cond_3
     iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->gC()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->gB()V
 
     :goto_1
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p1
 
@@ -616,7 +616,7 @@
 
     invoke-direct {p0, p1, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->c(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p1
 
@@ -783,7 +783,7 @@
     return-void
 .end method
 
-.method private ge()Z
+.method private gd()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gt:Z
@@ -794,9 +794,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gl:Lcom/facebook/drawee/a/c;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->ge()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->gd()Z
 
     move-result v0
 
@@ -812,7 +810,7 @@
     return v0
 .end method
 
-.method private gf()V
+.method private ge()V
     .locals 4
 
     iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gr:Z
@@ -829,9 +827,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gw:Lcom/facebook/datasource/DataSource;
-
-    invoke-interface {v1}, Lcom/facebook/datasource/DataSource;->fE()Z
+    invoke-interface {v1}, Lcom/facebook/datasource/DataSource;->fD()Z
 
     iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gw:Lcom/facebook/datasource/DataSource;
 
@@ -840,8 +836,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Landroid/graphics/drawable/Drawable;)V
 
     :cond_1
@@ -858,11 +852,9 @@
 
     if-eqz v1, :cond_3
 
-    const-string v1, "release"
+    const-string v3, "release"
 
-    iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gx:Ljava/lang/Object;
-
-    invoke-direct {p0, v1, v3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p0, v3, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gx:Ljava/lang/Object;
 
@@ -873,7 +865,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object v0
 
@@ -885,7 +877,7 @@
     return-void
 .end method
 
-.method private gg()Lcom/facebook/drawee/controller/ControllerListener;
+.method private gf()Lcom/facebook/drawee/controller/ControllerListener;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -906,17 +898,15 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
-
     return-object v0
 .end method
 
-.method private gj()V
+.method private gi()V
     .locals 8
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->fT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->fS()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -942,7 +932,7 @@
 
     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;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object v0
 
@@ -974,7 +964,6 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    :goto_0
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     return-void
@@ -986,7 +975,7 @@
 
     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;->gg()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object v2
 
@@ -1006,7 +995,7 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gt:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->fR()Lcom/facebook/datasource/DataSource;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->fQ()Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
@@ -1051,7 +1040,7 @@
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gw:Lcom/facebook/datasource/DataSource;
 
-    invoke-interface {v1}, Lcom/facebook/datasource/DataSource;->fB()Z
+    invoke-interface {v1}, Lcom/facebook/datasource/DataSource;->fA()Z
 
     move-result v1
 
@@ -1065,7 +1054,9 @@
 
     invoke-interface {v0, v2, v1}, Lcom/facebook/datasource/DataSource;->a(Lcom/facebook/datasource/d;Ljava/util/concurrent/Executor;)V
 
-    goto :goto_0
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
+
+    return-void
 .end method
 
 
@@ -1117,7 +1108,7 @@
 .end method
 
 .method public final a(Lcom/facebook/drawee/controller/ControllerListener;)V
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1130,11 +1121,9 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
 
-    instance-of v0, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
+    instance-of v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
+    if-eqz v1, :cond_0
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -1143,12 +1132,8 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
-
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
-
     invoke-static {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->a(Lcom/facebook/drawee/controller/ControllerListener;Lcom/facebook/drawee/controller/ControllerListener;)Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
     move-result-object p1
@@ -1176,8 +1161,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
-
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gq:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
@@ -1187,7 +1170,7 @@
 .end method
 
 .method public final b(Lcom/facebook/drawee/controller/ControllerListener;)V
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1200,11 +1183,9 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
 
-    instance-of v0, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
+    instance-of v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
+    if-eqz v1, :cond_0
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -1213,8 +1194,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
-
     if-ne v0, p1, :cond_1
 
     const/4 p1, 0x0
@@ -1271,7 +1250,7 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gs:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->ge()V
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gu:Z
 
@@ -1309,7 +1288,7 @@
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->go()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->gn()V
 
     goto :goto_0
 
@@ -1381,7 +1360,7 @@
     throw p1
 .end method
 
-.method protected abstract fR()Lcom/facebook/datasource/DataSource;
+.method protected abstract fQ()Lcom/facebook/datasource/DataSource;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -1391,7 +1370,7 @@
     .end annotation
 .end method
 
-.method protected fT()Ljava/lang/Object;
+.method protected fS()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1414,7 +1393,7 @@
     return-object v0
 .end method
 
-.method public final gh()V
+.method public final gg()V
     .locals 5
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
@@ -1478,7 +1457,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gj()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gi()V
 
     :cond_2
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
@@ -1486,7 +1465,7 @@
     return-void
 .end method
 
-.method public final gi()Z
+.method public final gh()Z
     .locals 4
 
     const/4 v0, 0x2
@@ -1514,7 +1493,7 @@
     invoke-static {v0, v1, v2, v3}, 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;->ge()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gd()Z
 
     move-result v0
 
@@ -1534,7 +1513,7 @@
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gj()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gi()V
 
     return v2
 
@@ -1544,18 +1523,16 @@
     return v0
 .end method
 
-.method public final gk()Landroid/graphics/drawable/Animatable;
-    .locals 1
+.method public final gj()Landroid/graphics/drawable/Animatable;
+    .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
 
-    instance-of v0, v0, Landroid/graphics/drawable/Animatable;
+    instance-of v1, v0, Landroid/graphics/drawable/Animatable;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
+    if-eqz v1, :cond_0
 
     check-cast v0, Landroid/graphics/drawable/Animatable;
 
@@ -1609,7 +1586,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->ER:Lcom/facebook/drawee/a/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->ga()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->fZ()V
 
     iget-object v1, v0, Lcom/facebook/drawee/a/a;->FA:Ljava/util/Set;
 
@@ -1678,13 +1655,11 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gm:Lcom/facebook/drawee/c/a;
-
     iget-boolean v0, v0, Lcom/facebook/drawee/c/a;->Jx:Z
 
     if-nez v0, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->ge()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gd()Z
 
     move-result v0
 
@@ -1749,10 +1724,9 @@
 
     cmpl-float p1, p1, v2
 
-    if-lez p1, :cond_7
+    if-lez p1, :cond_8
 
     :cond_4
-    :goto_1
     iput-boolean v1, v0, Lcom/facebook/drawee/c/a;->Jy:Z
 
     goto :goto_2
@@ -1802,7 +1776,7 @@
     :cond_6
     iget-boolean v2, v0, Lcom/facebook/drawee/c/a;->Jy:Z
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_7
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
 
@@ -1820,17 +1794,21 @@
 
     cmp-long p1, v4, v6
 
-    if-gtz p1, :cond_4
+    if-gtz p1, :cond_7
 
     iget-object p1, v0, Lcom/facebook/drawee/c/a;->Jv:Lcom/facebook/drawee/c/a$a;
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_7
 
     iget-object p1, v0, Lcom/facebook/drawee/c/a;->Jv:Lcom/facebook/drawee/c/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->gi()Z
+    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->gh()Z
 
-    goto :goto_1
+    :cond_7
+    :goto_1
+    iput-boolean v1, v0, Lcom/facebook/drawee/c/a;->Jy:Z
+
+    goto :goto_2
 
     :pswitch_3
     iput-boolean v3, v0, Lcom/facebook/drawee/c/a;->Jx:Z
@@ -1855,7 +1833,7 @@
 
     iput p1, v0, Lcom/facebook/drawee/c/a;->JB:F
 
-    :cond_7
+    :cond_8
     :goto_2
     return v3
 
@@ -1883,8 +1861,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gl:Lcom/facebook/drawee/a/c;
-
     const/4 v1, 0x0
 
     iput v1, v0, Lcom/facebook/drawee/a/c;->Gi:I
@@ -1894,8 +1870,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gm:Lcom/facebook/drawee/c/a;
-
     invoke-virtual {v0}, Lcom/facebook/drawee/c/a;->reset()V
 
     :cond_1
@@ -1903,12 +1877,10 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
-
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
     :cond_2
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gf()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->ge()V
 
     return-void
 .end method
@@ -1974,8 +1946,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gp:Lcom/facebook/drawee/d/c;
-
     const/4 v1, 0x0
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
diff --git a/com.discord/smali/com/facebook/drawee/controller/ControllerListener.smali b/com.discord/smali/com/facebook/drawee/controller/ControllerListener.smali
index 3806af534b..2860e50ee7 100644
--- a/com.discord/smali/com/facebook/drawee/controller/ControllerListener.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/ControllerListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/controller/ControllerListener;
 .super Ljava/lang/Object;
+.source "ControllerListener.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/controller/a$1.smali b/com.discord/smali/com/facebook/drawee/controller/a$1.smali
index 46bd83b769..f29ee2dd19 100644
--- a/com.discord/smali/com/facebook/drawee/controller/a$1.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/controller/a$1;
 .super Lcom/facebook/drawee/controller/b;
+.source "AbstractDraweeControllerBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/controller/a$2.smali b/com.discord/smali/com/facebook/drawee/controller/a$2.smali
index 90d91c9196..ad83c30535 100644
--- a/com.discord/smali/com/facebook/drawee/controller/a$2.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/a$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/controller/a$2;
 .super Ljava/lang/Object;
+.source "AbstractDraweeControllerBuilder.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/drawee/controller/a$a.smali b/com.discord/smali/com/facebook/drawee/controller/a$a.smali
index 11a9e39831..f8d2bca75c 100644
--- a/com.discord/smali/com/facebook/drawee/controller/a$a.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/a$a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/facebook/drawee/controller/a$a;
 .super Ljava/lang/Enum;
+.source "AbstractDraweeControllerBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/controller/a.smali b/com.discord/smali/com/facebook/drawee/controller/a.smali
index 3c4ef3240c..c0be583e39 100644
--- a/com.discord/smali/com/facebook/drawee/controller/a.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/drawee/controller/a;
 .super Ljava/lang/Object;
+.source "AbstractDraweeControllerBuilder.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/d/d;
@@ -330,9 +331,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/a;->EG:Lcom/facebook/common/d/k;
-
-    return-object p1
+    return-object v0
 
     :cond_0
     const/4 v0, 0x0
@@ -345,9 +344,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->GD:Ljava/lang/Object;
-
-    invoke-direct {p0, p1, p2, v0}, Lcom/facebook/drawee/controller/a;->a(Lcom/facebook/drawee/d/a;Ljava/lang/String;Ljava/lang/Object;)Lcom/facebook/common/d/k;
+    invoke-direct {p0, p1, p2, v1}, Lcom/facebook/drawee/controller/a;->a(Lcom/facebook/drawee/d/a;Ljava/lang/String;Ljava/lang/Object;)Lcom/facebook/common/d/k;
 
     move-result-object v0
 
@@ -358,28 +355,26 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->GF:[Ljava/lang/Object;
-
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->GG:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/a;->GG:Z
 
     new-instance v4, Ljava/util/ArrayList;
 
-    array-length v5, v0
+    array-length v5, v1
 
     mul-int/lit8 v5, v5, 0x2
 
     invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    array-length v5, v0
+    array-length v5, v1
 
-    if-ge v1, v5, :cond_2
+    if-ge v0, v5, :cond_2
 
-    aget-object v5, v0, v1
+    aget-object v5, v1, v0
 
     sget-object v6, Lcom/facebook/drawee/controller/a$a;->GS:Lcom/facebook/drawee/controller/a$a;
 
@@ -389,19 +384,19 @@
 
     invoke-interface {v4, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
-    array-length v5, v0
+    array-length v5, v1
 
-    if-ge v1, v5, :cond_3
+    if-ge v0, v5, :cond_3
 
-    aget-object v5, v0, v1
+    aget-object v5, v1, v0
 
     invoke-direct {p0, p1, p2, v5}, Lcom/facebook/drawee/controller/a;->a(Lcom/facebook/drawee/d/a;Ljava/lang/String;Ljava/lang/Object;)Lcom/facebook/common/d/k;
 
@@ -409,7 +404,7 @@
 
     invoke-interface {v4, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v0, v0, 0x1
 
     goto :goto_1
 
@@ -560,12 +555,12 @@
     return-object p0
 .end method
 
-.method protected abstract fV()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method protected abstract fU()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .annotation build Lcom/facebook/infer/annotation/ReturnsOwnership;
     .end annotation
 .end method
 
-.method public final gl()Lcom/facebook/drawee/controller/a;
+.method public final gk()Lcom/facebook/drawee/controller/a;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -581,7 +576,7 @@
     return-object p0
 .end method
 
-.method public final gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/drawee/controller/a;->GF:[Ljava/lang/Object;
@@ -648,8 +643,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->GE:Ljava/lang/Object;
-
     iput-object v0, p0, Lcom/facebook/drawee/controller/a;->GD:Ljava/lang/Object;
 
     const/4 v0, 0x0
@@ -659,7 +652,7 @@
     :cond_4
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->fV()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->fU()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
@@ -721,8 +714,6 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->EP:Ljava/util/Set;
-
     invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
     move-result-object v1
@@ -749,8 +740,6 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
-
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     :cond_8
@@ -768,17 +757,17 @@
     return-object v0
 .end method
 
-.method public final synthetic gn()Lcom/facebook/drawee/d/a;
+.method public final synthetic gm()Lcom/facebook/drawee/d/a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final x(Z)Lcom/facebook/drawee/controller/a;
+.method public final w(Z)Lcom/facebook/drawee/controller/a;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/facebook/drawee/controller/b.smali b/com.discord/smali/com/facebook/drawee/controller/b.smali
index 7bb6f321ec..1d4b2ba993 100644
--- a/com.discord/smali/com/facebook/drawee/controller/b.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/controller/b;
 .super Ljava/lang/Object;
+.source "BaseControllerListener.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/controller/ControllerListener;
diff --git a/com.discord/smali/com/facebook/drawee/controller/c.smali b/com.discord/smali/com/facebook/drawee/controller/c.smali
index 4e0b9ff86a..7e223024cc 100644
--- a/com.discord/smali/com/facebook/drawee/controller/c.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/c.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/drawee/controller/c;
 .super Ljava/lang/Object;
+.source "ControllerViewportVisibilityListener.java"
diff --git a/com.discord/smali/com/facebook/drawee/controller/d.smali b/com.discord/smali/com/facebook/drawee/controller/d.smali
index 7245d4012a..c648323ce5 100644
--- a/com.discord/smali/com/facebook/drawee/controller/d.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/d.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/controller/d;
 .super Ljava/lang/Object;
+.source "ForwardingControllerListener.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/controller/ControllerListener;
@@ -151,7 +152,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized go()V
+.method public final declared-synchronized gn()V
     .locals 1
 
     monitor-enter p0
@@ -239,6 +240,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public declared-synchronized onFinalImageSet(Ljava/lang/String;Ljava/lang/Object;Landroid/graphics/drawable/Animatable;)V
@@ -322,6 +325,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public onIntermediateImageFailed(Ljava/lang/String;Ljava/lang/Throwable;)V
@@ -495,6 +500,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public declared-synchronized onSubmit(Ljava/lang/String;Ljava/lang/Object;)V
@@ -561,4 +568,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/d/a.smali b/com.discord/smali/com/facebook/drawee/d/a.smali
index cf49f719bb..779c48794f 100644
--- a/com.discord/smali/com/facebook/drawee/d/a.smali
+++ b/com.discord/smali/com/facebook/drawee/d/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/d/a;
 .super Ljava/lang/Object;
+.source "DraweeController.java"
 
 
 # annotations
@@ -13,10 +14,10 @@
     .end annotation
 .end method
 
-.method public abstract gh()V
+.method public abstract gg()V
 .end method
 
-.method public abstract gk()Landroid/graphics/drawable/Animatable;
+.method public abstract gj()Landroid/graphics/drawable/Animatable;
 .end method
 
 .method public abstract onDetach()V
diff --git a/com.discord/smali/com/facebook/drawee/d/b.smali b/com.discord/smali/com/facebook/drawee/d/b.smali
index 732a9f21fe..da36fca327 100644
--- a/com.discord/smali/com/facebook/drawee/d/b.smali
+++ b/com.discord/smali/com/facebook/drawee/d/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/d/b;
 .super Ljava/lang/Object;
+.source "DraweeHierarchy.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/d/c.smali b/com.discord/smali/com/facebook/drawee/d/c.smali
index 08c638d76c..786b2ab9ca 100644
--- a/com.discord/smali/com/facebook/drawee/d/c.smali
+++ b/com.discord/smali/com/facebook/drawee/d/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/d/c;
 .super Ljava/lang/Object;
+.source "SettableDraweeHierarchy.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/d/b;
@@ -20,10 +21,10 @@
 .method public abstract b(Landroid/graphics/drawable/Drawable;)V
 .end method
 
-.method public abstract gC()V
+.method public abstract gB()V
 .end method
 
-.method public abstract gD()V
+.method public abstract gC()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 c0bd8375f2..2e309182f2 100644
--- a/com.discord/smali/com/facebook/drawee/d/d.smali
+++ b/com.discord/smali/com/facebook/drawee/d/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/d/d;
 .super Ljava/lang/Object;
+.source "SimpleDraweeControllerBuilder.java"
 
 
 # virtual methods
@@ -10,7 +11,7 @@
     .end param
 .end method
 
-.method public abstract gn()Lcom/facebook/drawee/d/a;
+.method public abstract gm()Lcom/facebook/drawee/d/a;
 .end method
 
 .method public abstract m(Landroid/net/Uri;)Lcom/facebook/drawee/d/d;
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali
index 3d17f217eb..6772c0a095 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 .super Ljava/lang/Object;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$a.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$a.smali
index 05da089d66..0d58a6af25 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$a.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/drawee/drawable/ScalingUtils$a;
 .super Ljava/lang/Object;
+.source "ScalingUtils.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$b.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$b.smali
index c411ba5d8d..13334e1743 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$b.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$b;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$c.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$c.smali
index 911e0a7a7e..d3a8bc751e 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$c.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$c;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$d.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$d.smali
index e952f02ae9..2951c39773 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$d.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$d;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$e.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$e.smali
index 0509ad7b7c..6073b8549a 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$e.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$e;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$f.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$f.smali
index 5807cbfec6..597863f201 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$f.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$f;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$g.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$g.smali
index 6a46bd8dcc..8ab3f9ecf2 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$g.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$g;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$h.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$h.smali
index 8edce6369e..c93f460c11 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$h.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$h;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$i.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$i.smali
index 840c3d3d04..ede3e690d9 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$i.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$i;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$j.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$j.smali
index d1632981e8..e6217d042e 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$j.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$j.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/drawable/ScalingUtils$j;
 .super Lcom/facebook/drawee/drawable/ScalingUtils$a;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$k.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$k.smali
index 3273bc0d73..5ef2dd2ec3 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$k.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils$k.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/ScalingUtils$k;
 .super Ljava/lang/Object;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
index b30d71e366..12a390d47b 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/ScalingUtils;
 .super Ljava/lang/Object;
+.source "ScalingUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/drawable/a$1.smali b/com.discord/smali/com/facebook/drawee/drawable/a$1.smali
index c66003fe6d..6b0ded6b27 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/a$1.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/a$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/a$1;
 .super Ljava/lang/Object;
+.source "ArrayDrawable.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/drawable/c;
diff --git a/com.discord/smali/com/facebook/drawee/drawable/a.smali b/com.discord/smali/com/facebook/drawee/drawable/a.smali
index b558973097..31e22f3341 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/a.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/drawable/a;
 .super Landroid/graphics/drawable/Drawable;
+.source "ArrayDrawable.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
@@ -27,7 +28,7 @@
 
 # direct methods
 .method public constructor <init>([Landroid/graphics/drawable/Drawable;)V
-    .locals 1
+    .locals 2
 
     invoke-direct {p0}, Landroid/graphics/drawable/Drawable;-><init>()V
 
@@ -58,11 +59,9 @@
     :goto_0
     iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length p1, p1
+    array-length v1, p1
 
-    if-ge v0, p1, :cond_0
-
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v1, :cond_0
 
     aget-object p1, p1, v0
 
@@ -73,8 +72,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
-
     array-length p1, p1
 
     new-array p1, p1, [Lcom/facebook/drawee/drawable/c;
@@ -177,8 +174,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Ho:Lcom/facebook/drawee/drawable/r;
-
     invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/r;->a(Landroid/graphics/RectF;)V
 
     return-void
@@ -208,8 +203,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Ho:Lcom/facebook/drawee/drawable/r;
-
     invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/r;->b(Landroid/graphics/Matrix;)V
 
     return-void
@@ -221,18 +214,16 @@
 .end method
 
 .method public draw(Landroid/graphics/Canvas;)V
-    .locals 2
+    .locals 3
 
     const/4 v0, 0x0
 
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -254,9 +245,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-ltz p1, :cond_0
 
@@ -276,9 +267,12 @@
 
     if-ge p1, v2, :cond_1
 
-    const/4 v0, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
@@ -289,7 +283,7 @@
 .end method
 
 .method public getIntrinsicHeight()I
-    .locals 4
+    .locals 5
 
     const/4 v0, -0x1
 
@@ -300,11 +294,9 @@
     :goto_0
     iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v1, v3, :cond_1
-
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v1, v4, :cond_1
 
     aget-object v3, v3, v1
 
@@ -333,7 +325,7 @@
 .end method
 
 .method public getIntrinsicWidth()I
-    .locals 4
+    .locals 5
 
     const/4 v0, -0x1
 
@@ -344,11 +336,9 @@
     :goto_0
     iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v1, v3, :cond_1
-
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v1, v4, :cond_1
 
     aget-object v3, v3, v1
 
@@ -377,7 +367,7 @@
 .end method
 
 .method public getOpacity()I
-    .locals 3
+    .locals 4
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
@@ -397,11 +387,9 @@
     :goto_0
     iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_2
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v1, v3, :cond_2
 
     aget-object v2, v2, v1
 
@@ -442,11 +430,9 @@
     :goto_0
     iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_1
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v3, :cond_1
 
     aget-object v2, v2, v0
 
@@ -529,17 +515,15 @@
     :goto_0
     iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
-    if-ge v1, v2, :cond_1
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v1, v3, :cond_1
 
     aget-object v2, v2, v1
 
-    iget-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->Hs:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/a;->Hs:Z
 
     if-eqz v2, :cond_0
 
@@ -552,10 +536,10 @@
     goto :goto_1
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     :goto_1
-    or-int v2, v4, v3
+    or-int v2, v3, v4
 
     iput-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->Hs:Z
 
@@ -564,7 +548,7 @@
     goto :goto_0
 
     :cond_1
-    iput-boolean v3, p0, Lcom/facebook/drawee/drawable/a;->Ht:Z
+    iput-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->Ht:Z
 
     :cond_2
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Hs:Z
@@ -573,18 +557,16 @@
 .end method
 
 .method public mutate()Landroid/graphics/drawable/Drawable;
-    .locals 2
+    .locals 3
 
     const/4 v0, 0x0
 
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -606,18 +588,16 @@
 .end method
 
 .method protected onBoundsChange(Landroid/graphics/Rect;)V
-    .locals 2
+    .locals 3
 
     const/4 v0, 0x0
 
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -635,7 +615,7 @@
 .end method
 
 .method protected onLevelChange(I)Z
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x0
 
@@ -644,11 +624,9 @@
     :goto_0
     iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_1
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v3, :cond_1
 
     aget-object v2, v2, v0
 
@@ -672,7 +650,7 @@
 .end method
 
 .method protected onStateChange([I)Z
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x0
 
@@ -681,11 +659,9 @@
     :goto_0
     iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_1
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v3, :cond_1
 
     aget-object v2, v2, v0
 
@@ -717,7 +693,7 @@
 .end method
 
 .method public setAlpha(I)V
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Hp:Lcom/facebook/drawee/drawable/d;
 
@@ -728,11 +704,9 @@
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -750,7 +724,7 @@
 .end method
 
 .method public setColorFilter(Landroid/graphics/ColorFilter;)V
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Hp:Lcom/facebook/drawee/drawable/d;
 
@@ -761,11 +735,9 @@
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -783,7 +755,7 @@
 .end method
 
 .method public setDither(Z)V
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Hp:Lcom/facebook/drawee/drawable/d;
 
@@ -794,11 +766,9 @@
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -816,7 +786,7 @@
 .end method
 
 .method public setFilterBitmap(Z)V
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Hp:Lcom/facebook/drawee/drawable/d;
 
@@ -827,11 +797,9 @@
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -849,7 +817,7 @@
 .end method
 
 .method public setHotspot(FF)V
-    .locals 2
+    .locals 3
     .annotation build Landroid/annotation/TargetApi;
         value = 0x15
     .end annotation
@@ -859,11 +827,9 @@
     :goto_0
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -881,7 +847,7 @@
 .end method
 
 .method public setVisible(ZZ)Z
-    .locals 3
+    .locals 4
 
     invoke-super {p0, p1, p2}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
@@ -892,11 +858,9 @@
     :goto_0
     iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v1, v3, :cond_1
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/b.smali b/com.discord/smali/com/facebook/drawee/drawable/b.smali
index 17b0b30b2f..b063538198 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/b.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/b;
 .super Lcom/facebook/drawee/drawable/g;
+.source "AutoRotateDrawable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -85,11 +86,9 @@
 
     if-nez v5, :cond_0
 
-    const/high16 v4, 0x43b40000    # 360.0f
+    const/high16 v5, 0x43b40000    # 360.0f
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/b;->Hy:F
-
-    sub-float/2addr v4, v5
+    sub-float v4, v5, v4
 
     :cond_0
     iget v5, v1, Landroid/graphics/Rect;->left:I
diff --git a/com.discord/smali/com/facebook/drawee/drawable/c.smali b/com.discord/smali/com/facebook/drawee/drawable/c.smali
index afbd208f1f..0a54eba2cd 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/c.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/c;
 .super Ljava/lang/Object;
+.source "DrawableParent.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/drawee/drawable/d.smali b/com.discord/smali/com/facebook/drawee/drawable/d.smali
index 23b4462e34..1a1bdb7e03 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/d.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/d;
 .super Ljava/lang/Object;
+.source "DrawableProperties.java"
 
 
 # instance fields
@@ -60,8 +61,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/d;->mAlpha:I
-
     invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
 
     :cond_1
@@ -76,14 +75,12 @@
     :cond_2
     iget v0, p0, Lcom/facebook/drawee/drawable/d;->HB:I
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eq v0, v1, :cond_4
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/d;->HB:I
-
     if-eqz v0, :cond_3
 
     const/4 v0, 0x1
@@ -101,13 +98,14 @@
 
     if-eq v0, v1, :cond_6
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/d;->HC:I
-
     if-eqz v0, :cond_5
 
-    const/4 v2, 0x1
+    goto :goto_1
 
     :cond_5
+    const/4 v2, 0x0
+
+    :goto_1
     invoke-virtual {p1, v2}, Landroid/graphics/drawable/Drawable;->setFilterBitmap(Z)V
 
     :cond_6
diff --git a/com.discord/smali/com/facebook/drawee/drawable/e.smali b/com.discord/smali/com/facebook/drawee/drawable/e.smali
index ecb08a1531..1b1ecf43cb 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/e.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/e;
 .super Ljava/lang/Object;
+.source "DrawableUtils.java"
 
 
 # direct methods
@@ -84,6 +85,8 @@
 
     invoke-virtual {p0, p1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -109,6 +112,8 @@
     :cond_0
     invoke-virtual {p1, p0}, Lcom/facebook/drawee/drawable/d;->d(Landroid/graphics/drawable/Drawable;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/com/facebook/drawee/drawable/f.smali b/com.discord/smali/com/facebook/drawee/drawable/f.smali
index ac635e15fd..dbe4e56f1a 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/f.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/f;
 .super Lcom/facebook/drawee/drawable/a;
+.source "FadeDrawable.java"
 
 
 # instance fields
@@ -159,24 +160,18 @@
 
     aput v4, v5, v2
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->HH:[I
-
-    aget v4, v4, v2
+    aget v4, v5, v2
 
     if-gez v4, :cond_1
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->HH:[I
-
-    aput v1, v4, v2
+    aput v1, v5, v2
 
     :cond_1
     iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->HH:[I
 
-    aget v4, v4, v2
+    aget v5, v4, v2
 
-    if-le v4, v7, :cond_2
-
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->HH:[I
+    if-le v5, v7, :cond_2
 
     aput v7, v4, v2
 
@@ -268,10 +263,14 @@
 
     packed-switch v0, :pswitch_data_0
 
+    const/4 v0, 0x1
+
+    goto :goto_4
+
     :pswitch_0
     const/4 v0, 0x1
 
-    goto :goto_3
+    goto :goto_4
 
     :pswitch_1
     iget v0, p0, Lcom/facebook/drawee/drawable/f;->HE:I
@@ -308,9 +307,17 @@
 
     move-result v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
-    goto :goto_2
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x1
+
+    :goto_1
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->HD:I
+
+    goto :goto_4
 
     :pswitch_2
     iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->HH:[I
@@ -331,38 +338,36 @@
 
     iget v0, p0, Lcom/facebook/drawee/drawable/f;->HE:I
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_2
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
-    invoke-direct {p0, v0}, Lcom/facebook/drawee/drawable/f;->i(F)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
     goto :goto_2
 
     :cond_2
-    const/4 v1, 0x1
+    const/4 v0, 0x0
 
     :goto_2
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->HD:I
+    invoke-direct {p0, v0}, Lcom/facebook/drawee/drawable/f;->i(F)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v1, 0x1
 
     :goto_3
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->HD:I
+
+    :goto_4
     iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Hq:[Landroid/graphics/drawable/Drawable;
 
-    array-length v1, v1
+    array-length v4, v1
 
-    if-ge v2, v1, :cond_4
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Hq:[Landroid/graphics/drawable/Drawable;
+    if-ge v2, v4, :cond_5
 
     aget-object v1, v1, v2
 
@@ -376,9 +381,9 @@
 
     div-int/lit16 v4, v4, 0xff
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_4
 
-    if-lez v4, :cond_3
+    if-lez v4, :cond_4
 
     iget v5, p0, Lcom/facebook/drawee/drawable/f;->HJ:I
 
@@ -400,17 +405,17 @@
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
-    :cond_3
+    :cond_4
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_3
+    goto :goto_4
 
-    :cond_4
-    if-nez v0, :cond_5
+    :cond_5
+    if-nez v0, :cond_6
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
 
-    :cond_5
+    :cond_6
     return-void
 
     nop
@@ -431,7 +436,7 @@
     return v0
 .end method
 
-.method public final gp()V
+.method public final go()V
     .locals 1
 
     iget v0, p0, Lcom/facebook/drawee/drawable/f;->HJ:I
@@ -443,7 +448,7 @@
     return-void
 .end method
 
-.method public final gq()V
+.method public final gp()V
     .locals 1
 
     iget v0, p0, Lcom/facebook/drawee/drawable/f;->HJ:I
@@ -457,7 +462,7 @@
     return-void
 .end method
 
-.method public final gr()V
+.method public final gq()V
     .locals 2
 
     const/4 v0, 0x0
@@ -475,7 +480,7 @@
     return-void
 .end method
 
-.method public final gs()V
+.method public final gr()V
     .locals 4
 
     const/4 v0, 0x2
diff --git a/com.discord/smali/com/facebook/drawee/drawable/g.smali b/com.discord/smali/com/facebook/drawee/drawable/g.smali
index a52781621f..7f8d8ed3fc 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/g.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/g.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/drawable/g;
 .super Landroid/graphics/drawable/Drawable;
+.source "ForwardingDrawable.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
@@ -69,8 +70,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ho:Lcom/facebook/drawee/drawable/r;
-
     invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/r;->a(Landroid/graphics/RectF;)V
 
     return-void
@@ -142,8 +141,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ho:Lcom/facebook/drawee/drawable/r;
-
     invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/r;->b(Landroid/graphics/Matrix;)V
 
     return-void
@@ -161,8 +158,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
     :cond_0
@@ -217,8 +212,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getConstantState()Landroid/graphics/drawable/Drawable$ConstantState;
 
     move-result-object v0
@@ -262,8 +255,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
     move-result v0
@@ -285,8 +276,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
 
     move-result v0
@@ -306,8 +295,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getOpacity()I
 
     move-result v0
@@ -329,8 +316,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z
 
     move-result p1
@@ -358,8 +343,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result v0
@@ -374,8 +357,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
     :cond_0
@@ -389,8 +370,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
     :cond_0
@@ -411,8 +390,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setLevel(I)Z
 
     move-result p1
@@ -434,8 +411,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
     move-result p1
@@ -462,8 +437,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
 
     :cond_0
@@ -481,8 +454,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
     :cond_0
@@ -500,8 +471,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setDither(Z)V
 
     :cond_0
@@ -519,8 +488,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setFilterBitmap(Z)V
 
     :cond_0
@@ -537,8 +504,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1, p2}, Landroid/graphics/drawable/Drawable;->setHotspot(FF)V
 
     :cond_0
@@ -559,9 +524,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->HK:Landroid/graphics/drawable/Drawable;
-
-    invoke-virtual {v0, p1, p2}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
+    invoke-virtual {v1, p1, p2}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/h.smali b/com.discord/smali/com/facebook/drawee/drawable/h.smali
index 0da1e6b69f..b6c575aadc 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/h.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/h;
 .super Lcom/facebook/drawee/drawable/g;
+.source "MatrixDrawable.java"
 
 
 # instance fields
@@ -13,7 +14,7 @@
 
 
 # direct methods
-.method private gt()V
+.method private gs()V
     .locals 4
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/h;->getCurrent()Landroid/graphics/drawable/Drawable;
@@ -40,7 +41,7 @@
 
     if-gtz v3, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v1, 0x0
@@ -49,18 +50,19 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->mMatrix:Landroid/graphics/Matrix;
 
-    :goto_0
     iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->HM:Landroid/graphics/Matrix;
 
     return-void
 
     :cond_1
-    :goto_1
+    :goto_0
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
     const/4 v0, 0x0
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->HM:Landroid/graphics/Matrix;
+
+    return-void
 .end method
 
 
@@ -74,8 +76,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->HM:Landroid/graphics/Matrix;
-
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
     :cond_0
@@ -110,7 +110,7 @@
     if-eq v0, v1, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gs()V
 
     :cond_1
     iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->HM:Landroid/graphics/Matrix;
@@ -150,7 +150,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gs()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;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gs()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/drawable/i.smali b/com.discord/smali/com/facebook/drawee/drawable/i.smali
index 2573883875..7e2416c13e 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/i.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/i;
 .super Lcom/facebook/drawee/drawable/g;
+.source "OrientedDrawable.java"
 
 
 # instance fields
@@ -34,9 +35,9 @@
 
     rem-int/lit8 p1, p2, 0x5a
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-nez p1, :cond_0
 
@@ -56,9 +57,12 @@
 
     if-gt p3, p1, :cond_1
 
-    const/4 v0, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     new-instance p1, Landroid/graphics/Matrix;
@@ -108,8 +112,6 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->HR:I
-
     const/4 v1, 0x1
 
     if-ne v0, v1, :cond_1
@@ -144,8 +146,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->HR:I
-
     const/4 v1, 0x7
 
     if-eq v0, v1, :cond_1
@@ -183,8 +183,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->HR:I
-
     const/4 v1, 0x7
 
     if-eq v0, v1, :cond_1
@@ -228,8 +226,6 @@
 
     if-eqz v1, :cond_0
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->HR:I
-
     const/4 v2, 0x1
 
     if-eq v1, v2, :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 19e9fb3d73..07377165fa 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/j.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/j.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/j;
 .super Ljava/lang/Object;
+.source "Rounded.java"
 
 
 # virtual methods
@@ -9,14 +10,14 @@
 .method public abstract a([F)V
 .end method
 
-.method public abstract gu()V
+.method public abstract gt()V
 .end method
 
 .method public abstract j(F)V
 .end method
 
-.method public abstract y(Z)V
+.method public abstract x(Z)V
 .end method
 
-.method public abstract z(Z)V
+.method public abstract y(Z)V
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/drawable/k.smali b/com.discord/smali/com/facebook/drawee/drawable/k.smali
index 7e22c9e757..5745e5190f 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/k.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/k;
 .super Lcom/facebook/drawee/drawable/n;
+.source "RoundedBitmapDrawable.java"
 
 
 # instance fields
@@ -84,7 +85,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gv()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gu()Z
 
     move-result v0
 
@@ -92,22 +93,19 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/n;->draw(Landroid/graphics/Canvas;)V
 
-    :goto_0
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gy()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gx()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gw()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gv()V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->HT:Ljava/lang/ref/WeakReference;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->HT:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
@@ -214,13 +212,15 @@
     :cond_4
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
-    goto :goto_0
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
+
+    return-void
 .end method
 
-.method final gv()Z
+.method final gu()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->gv()Z
+    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->gu()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 6093b8b2a4..7ba956197c 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/l.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/l;
 .super Landroid/graphics/drawable/Drawable;
+.source "RoundedColorDrawable.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/drawable/j;
@@ -129,7 +130,7 @@
     return-object v0
 .end method
 
-.method private gw()V
+.method private gv()V
     .locals 7
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->mPath:Landroid/graphics/Path;
@@ -154,13 +155,11 @@
 
     const/high16 v2, 0x40000000    # 2.0f
 
+    div-float v3, v1, v2
+
     div-float/2addr v1, v2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/l;->HY:F
-
-    div-float/2addr v3, v2
-
-    invoke-virtual {v0, v1, v3}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v3, v1}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->HX:Z
 
@@ -212,11 +211,9 @@
     :goto_0
     iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->HV:[F
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_1
-
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->HV:[F
+    if-ge v0, v4, :cond_1
 
     iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->HU:[F
 
@@ -241,30 +238,26 @@
     :cond_1
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ib:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Ic:Landroid/graphics/RectF;
-
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->HV:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Ic:Landroid/graphics/RectF;
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
-    invoke-virtual {v0, v3, v4, v5}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
+    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;->Ic:Landroid/graphics/RectF;
 
     iget v3, p0, Lcom/facebook/drawee/drawable/l;->HY:F
 
+    neg-float v4, v3
+
+    div-float/2addr v4, v2
+
     neg-float v3, v3
 
     div-float/2addr v3, v2
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/l;->HY:F
-
-    neg-float v4, v4
-
-    div-float/2addr v4, v2
-
-    invoke-virtual {v0, v3, v4}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v4, v3}, Landroid/graphics/RectF;->inset(FF)V
 
     iget v0, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
@@ -326,7 +319,7 @@
 
     invoke-virtual {v2, v3, v4, v1, v5}, Landroid/graphics/Path;->addCircle(FFFLandroid/graphics/Path$Direction;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_3
     iget-boolean v2, p0, Lcom/facebook/drawee/drawable/l;->Ia:Z
@@ -347,11 +340,9 @@
     :goto_3
     iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->HW:[F
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_5
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->HW:[F
+    if-ge v1, v3, :cond_5
 
     iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->HU:[F
 
@@ -370,9 +361,11 @@
     :cond_5
     iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->mPath:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Ic:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Ic:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->HW:[F
+    sget-object v4, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
+
+    invoke-virtual {v1, v3, v2, v4}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
 
     goto :goto_4
 
@@ -383,12 +376,11 @@
 
     iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->HU:[F
 
-    :goto_4
     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_5
+    :goto_4
     iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->Ic:Landroid/graphics/RectF;
 
     neg-float v0, v0
@@ -420,7 +412,7 @@
 
     iput p2, p0, Lcom/facebook/drawee/drawable/l;->HY:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -467,7 +459,7 @@
     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;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -585,7 +577,7 @@
     return v0
 .end method
 
-.method public final gu()V
+.method public final gt()V
     .locals 2
 
     const-string v0, "radius should be non negative"
@@ -600,7 +592,7 @@
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -618,7 +610,7 @@
 
     iput p1, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -631,7 +623,7 @@
 
     invoke-super {p0, p1}, Landroid/graphics/drawable/Drawable;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gv()V
 
     return-void
 .end method
@@ -657,19 +649,19 @@
     return-void
 .end method
 
-.method public final y(Z)V
+.method public final x(Z)V
     .locals 0
 
     iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->HX:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
     return-void
 .end method
 
-.method public final z(Z)V
+.method public final y(Z)V
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Ia:Z
@@ -678,7 +670,7 @@
 
     iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Ia:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/m$1.smali b/com.discord/smali/com/facebook/drawee/drawable/m$1.smali
index 01134eaf7f..8af00694e2 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/m$1.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/m$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/facebook/drawee/drawable/m$1;
 .super Ljava/lang/Object;
+.source "RoundedCornersDrawable.java"
 
 
 # annotations
@@ -21,7 +22,7 @@
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->gx()[I
+    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->gw()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/m$a.smali b/com.discord/smali/com/facebook/drawee/drawable/m$a.smali
index 19c435bcf6..7e91783e96 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/m$a.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/m$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/m$a;
 .super Ljava/lang/Enum;
+.source "RoundedCornersDrawable.java"
 
 
 # annotations
@@ -54,7 +55,7 @@
     return-void
 .end method
 
-.method public static gx()[I
+.method public static gw()[I
     .locals 1
 
     sget-object v0, Lcom/facebook/drawee/drawable/m$a;->Im:[I
diff --git a/com.discord/smali/com/facebook/drawee/drawable/m.smali b/com.discord/smali/com/facebook/drawee/drawable/m.smali
index 4cdb8e0d0b..dcad102d97 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/m.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/m;
 .super Lcom/facebook/drawee/drawable/g;
+.source "RoundedCornersDrawable.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/drawable/j;
@@ -130,7 +131,7 @@
     return-void
 .end method
 
-.method private gw()V
+.method private gv()V
     .locals 6
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
@@ -153,9 +154,7 @@
 
     iget v1, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
-
-    invoke-virtual {v0, v1, v2}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
 
@@ -225,25 +224,21 @@
 
     iget v2, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
+    neg-float v3, v2
+
     neg-float v2, v2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
-
-    neg-float v3, v3
-
-    invoke-virtual {v0, v2, v3}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v3, v2}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ii:Landroid/graphics/RectF;
 
     iget v2, p0, Lcom/facebook/drawee/drawable/m;->HY:F
 
+    div-float v3, v2, v1
+
     div-float/2addr v2, v1
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/m;->HY:F
-
-    div-float/2addr v3, v1
-
-    invoke-virtual {v0, v2, v3}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v3, v2}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->HX:Z
 
@@ -293,11 +288,9 @@
     :goto_1
     iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->HV:[F
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->HV:[F
+    if-ge v0, v3, :cond_2
 
     iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->HU:[F
 
@@ -322,30 +315,26 @@
     :cond_2
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ib:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Ii:Landroid/graphics/RectF;
-
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->HV:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Ii:Landroid/graphics/RectF;
 
     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
+    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;->Ii:Landroid/graphics/RectF;
 
     iget v2, p0, Lcom/facebook/drawee/drawable/m;->HY:F
 
+    neg-float v3, v2
+
+    div-float/2addr v3, v1
+
     neg-float v2, v2
 
     div-float/2addr v2, v1
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/m;->HY:F
-
-    neg-float v3, v3
-
-    div-float/2addr v3, v1
-
-    invoke-virtual {v0, v2, v3}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v3, v2}, Landroid/graphics/RectF;->inset(FF)V
 
     return-void
 .end method
@@ -369,7 +358,7 @@
 
     iput p2, p0, Lcom/facebook/drawee/drawable/m;->HY:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -415,7 +404,7 @@
     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;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -471,8 +460,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->If:Landroid/graphics/RectF;
-
     iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Ie:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
@@ -482,9 +469,7 @@
 
     iget v1, p0, Lcom/facebook/drawee/drawable/m;->HY:F
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->HY:F
-
-    invoke-virtual {v0, v1, v2}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ig:Landroid/graphics/Matrix;
 
@@ -764,7 +749,7 @@
     .end packed-switch
 .end method
 
-.method public final gu()V
+.method public final gt()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->HU:[F
@@ -773,7 +758,7 @@
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -785,7 +770,7 @@
 
     iput p1, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -797,7 +782,19 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/g;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gv()V
+
+    return-void
+.end method
+
+.method public final x(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->HX:Z
+
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gv()V
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
     return-void
 .end method
@@ -805,21 +802,9 @@
 .method public final y(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->HX:Z
-
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gw()V
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
-
-    return-void
-.end method
-
-.method public final z(Z)V
-    .locals 0
-
     iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Ia:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gw()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gv()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/n.smali b/com.discord/smali/com/facebook/drawee/drawable/n.smali
index 39ace3aeab..b1cef29234 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/n.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/n.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/drawee/drawable/n;
 .super Landroid/graphics/drawable/Drawable;
+.source "RoundedDrawable.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/drawable/j;
@@ -415,7 +416,7 @@
     return v0
 .end method
 
-.method public final gu()V
+.method public final gt()V
     .locals 3
 
     const/4 v0, 0x1
@@ -439,7 +440,7 @@
     return-void
 .end method
 
-.method gv()Z
+.method gu()Z
     .locals 2
 
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->HX:Z
@@ -472,7 +473,7 @@
     return v0
 .end method
 
-.method protected final gw()V
+.method protected final gv()V
     .locals 8
 
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->IC:Z
@@ -489,13 +490,11 @@
 
     const/high16 v2, 0x40000000    # 2.0f
 
+    div-float v3, v1, v2
+
     div-float/2addr v1, v2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/n;->HY:F
-
-    div-float/2addr v3, v2
-
-    invoke-virtual {v0, v1, v3}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v3, v1}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->HX:Z
 
@@ -547,11 +546,9 @@
     :goto_0
     iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->HV:[F
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_1
-
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->HV:[F
+    if-ge v0, v4, :cond_1
 
     iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Iq:[F
 
@@ -576,30 +573,26 @@
     :cond_1
     iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ib:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ir:Landroid/graphics/RectF;
-
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->HV:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Ir:Landroid/graphics/RectF;
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
-    invoke-virtual {v0, v3, v4, v5}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
+    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;->Ir:Landroid/graphics/RectF;
 
     iget v3, p0, Lcom/facebook/drawee/drawable/n;->HY:F
 
+    neg-float v4, v3
+
+    div-float/2addr v4, v2
+
     neg-float v3, v3
 
     div-float/2addr v3, v2
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/n;->HY:F
-
-    neg-float v4, v4
-
-    div-float/2addr v4, v2
-
-    invoke-virtual {v0, v3, v4}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v4, v3}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->mPath:Landroid/graphics/Path;
 
@@ -665,7 +658,7 @@
 
     invoke-virtual {v3, v4, v5, v6, v2}, Landroid/graphics/Path;->addCircle(FFFLandroid/graphics/Path$Direction;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_3
     iget-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Ia:Z
@@ -715,6 +708,10 @@
 
     iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->HW:[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 :goto_4
 
     :cond_6
@@ -724,12 +721,11 @@
 
     iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Iq:[F
 
-    :goto_4
     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_5
+    :goto_4
     iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Ir:Landroid/graphics/RectF;
 
     neg-float v0, v0
@@ -748,15 +744,13 @@
     return-void
 .end method
 
-.method protected final gy()V
+.method protected final gx()V
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ho:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ho:Lcom/facebook/drawee/drawable/r;
-
     iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Ix:Landroid/graphics/Matrix;
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/drawable/r;->b(Landroid/graphics/Matrix;)V
@@ -840,8 +834,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->If:Landroid/graphics/RectF;
-
     iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Ir:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
@@ -851,9 +843,7 @@
 
     iget v1, p0, Lcom/facebook/drawee/drawable/n;->HY:F
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/n;->HY:F
-
-    invoke-virtual {v0, v1, v2}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ig:Landroid/graphics/Matrix;
 
@@ -883,8 +873,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ig:Landroid/graphics/Matrix;
-
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
     :cond_4
@@ -915,8 +903,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ig:Landroid/graphics/Matrix;
-
     iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->IA:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
@@ -988,8 +974,6 @@
     goto :goto_3
 
     :cond_7
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->IA:Landroid/graphics/Matrix;
-
     iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Ig:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
@@ -1001,8 +985,6 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->IA:Landroid/graphics/Matrix;
-
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
     :cond_9
@@ -1098,7 +1080,7 @@
     return-void
 .end method
 
-.method public final y(Z)V
+.method public final x(Z)V
     .locals 0
 
     iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->HX:Z
@@ -1112,7 +1094,7 @@
     return-void
 .end method
 
-.method public final z(Z)V
+.method public final y(Z)V
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ia:Z
diff --git a/com.discord/smali/com/facebook/drawee/drawable/o.smali b/com.discord/smali/com/facebook/drawee/drawable/o.smali
index 588eab7689..13070feb4c 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/o.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/o.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/o;
 .super Lcom/facebook/drawee/drawable/n;
+.source "RoundedNinePatchDrawable.java"
 
 
 # direct methods
@@ -18,13 +19,12 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gv()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gu()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    :goto_0
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/n;->draw(Landroid/graphics/Canvas;)V
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
@@ -32,13 +32,17 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gy()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gx()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gw()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gv()V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/o;->mPath:Landroid/graphics/Path;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->clipPath(Landroid/graphics/Path;)Z
 
-    goto :goto_0
+    invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/n;->draw(Landroid/graphics/Canvas;)V
+
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/drawable/p.smali b/com.discord/smali/com/facebook/drawee/drawable/p.smali
index 2a49a1300d..0e36ed6aae 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/p.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/drawable/p;
 .super Lcom/facebook/drawee/drawable/g;
+.source "ScaleTypeDrawable.java"
 
 
 # instance fields
@@ -51,7 +52,7 @@
     return-void
 .end method
 
-.method private gt()V
+.method private gs()V
     .locals 8
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
@@ -129,8 +130,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->IE:Landroid/graphics/PointF;
-
     iget v0, v0, Landroid/graphics/PointF;->x:F
 
     goto :goto_0
@@ -143,9 +142,7 @@
 
     if-eqz v7, :cond_4
 
-    iget-object v6, p0, Lcom/facebook/drawee/drawable/p;->IE:Landroid/graphics/PointF;
-
-    iget v6, v6, Landroid/graphics/PointF;->y:F
+    iget v6, v7, Landroid/graphics/PointF;->y:F
 
     move v7, v6
 
@@ -174,20 +171,18 @@
     return-void
 .end method
 
-.method private gz()V
+.method private gy()V
     .locals 5
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ha:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    instance-of v0, v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
+    instance-of v1, v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ha:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    if-eqz v1, :cond_2
 
     check-cast v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
 
@@ -197,24 +192,24 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/p;->ID:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->ID:Ljava/lang/Object;
 
-    invoke-virtual {v0, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    move-result v3
+    move-result v1
 
-    if-nez v3, :cond_0
+    if-nez v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v1, 0x0
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     :goto_1
     iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->ID:Ljava/lang/Object;
@@ -222,7 +217,7 @@
     goto :goto_2
 
     :cond_2
-    const/4 v3, 0x0
+    const/4 v1, 0x0
 
     :goto_2
     iget v0, p0, Lcom/facebook/drawee/drawable/p;->HN:I
@@ -252,16 +247,16 @@
     goto :goto_3
 
     :cond_3
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     :cond_4
     :goto_3
-    if-nez v1, :cond_5
+    if-nez v2, :cond_5
 
-    if-eqz v3, :cond_6
+    if-eqz v1, :cond_6
 
     :cond_5
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gs()V
 
     :cond_6
     return-void
@@ -298,7 +293,7 @@
 
     invoke-virtual {v0, p1}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gs()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->invalidateSelf()V
 
@@ -325,7 +320,7 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->ID:Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gs()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->invalidateSelf()V
 
@@ -337,14 +332,12 @@
 
     invoke-virtual {p0, p1}, Lcom/facebook/drawee/drawable/p;->c(Landroid/graphics/Matrix;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gz()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gy()V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->HM:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->HM:Landroid/graphics/Matrix;
-
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
     :cond_0
@@ -354,7 +347,7 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gz()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gy()V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->HM:Landroid/graphics/Matrix;
 
@@ -393,7 +386,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gs()V
 
     return-object p1
 .end method
@@ -401,7 +394,7 @@
 .method protected final onBoundsChange(Landroid/graphics/Rect;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gt()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gs()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/drawable/q.smali b/com.discord/smali/com/facebook/drawee/drawable/q.smali
index a024e9d3c6..ee56ce39e0 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/q.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/q.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/q;
 .super Ljava/lang/Object;
+.source "TransformAwareDrawable.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/drawee/drawable/r.smali b/com.discord/smali/com/facebook/drawee/drawable/r.smali
index 5b4a3179d5..6fbaa9ab07 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/r.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/r.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/r;
 .super Ljava/lang/Object;
+.source "TransformCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/drawee/drawable/s.smali b/com.discord/smali/com/facebook/drawee/drawable/s.smali
index b0af20b945..6806abcc3c 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/s.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/s.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/s;
 .super Ljava/lang/Object;
+.source "VisibilityAwareDrawable.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/drawee/drawable/t.smali b/com.discord/smali/com/facebook/drawee/drawable/t.smali
index 5c7f0c4b87..e4b62f15db 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/t.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/t.smali
@@ -1,10 +1,11 @@
 .class public interface abstract Lcom/facebook/drawee/drawable/t;
 .super Ljava/lang/Object;
+.source "VisibilityCallback.java"
 
 
 # virtual methods
-.method public abstract A(Z)V
-.end method
-
 .method public abstract onDraw()V
 .end method
+
+.method public abstract z(Z)V
+.end method
diff --git a/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali b/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
index 9bcc3a7c96..4b3f6e6bdf 100644
--- a/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 .super Ljava/lang/Object;
+.source "GenericDraweeHierarchy.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/d/c;
@@ -261,7 +262,7 @@
 
     invoke-virtual {p1}, Lcom/facebook/drawee/generic/c;->mutate()Landroid/graphics/drawable/Drawable;
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gA()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gz()V
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
@@ -299,9 +300,9 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-ltz p1, :cond_0
 
@@ -321,9 +322,12 @@
 
     if-ge p1, v3, :cond_1
 
-    const/4 v1, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->Hr:[Lcom/facebook/drawee/drawable/c;
@@ -471,39 +475,6 @@
 .method private gA()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gp()V
-
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gr()V
-
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gB()V
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->K(I)V
-
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gs()V
-
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gq()V
-
-    :cond_0
-    return-void
-.end method
-
-.method private gB()V
-    .locals 1
-
     const/4 v0, 0x1
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->L(I)V
@@ -527,6 +498,37 @@
     return-void
 .end method
 
+.method private gz()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->go()V
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
+
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gq()V
+
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gA()V
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->K(I)V
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
+
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gr()V
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
+
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gp()V
+
+    :cond_0
+    return-void
+.end method
+
 .method private setProgress(F)V
     .locals 3
 
@@ -626,7 +628,7 @@
     :cond_0
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gp()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->go()V
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->setProgress(F)V
 
@@ -634,12 +636,12 @@
 
     iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gs()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gr()V
 
     :cond_1
     iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gq()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gp()V
 
     return-void
 .end method
@@ -685,9 +687,9 @@
 
     iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gp()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->go()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gA()V
 
     const/4 p1, 0x2
 
@@ -699,12 +701,12 @@
 
     iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gs()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gr()V
 
     :cond_0
     iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gq()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gp()V
 
     return-void
 .end method
@@ -785,14 +787,14 @@
     return-void
 .end method
 
-.method public final gC()V
+.method public final gB()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gp()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->go()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gA()V
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
@@ -816,19 +818,19 @@
     :goto_0
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gq()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gp()V
 
     return-void
 .end method
 
-.method public final gD()V
+.method public final gC()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gp()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->go()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gA()V
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
@@ -852,7 +854,7 @@
     :goto_0
     iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->IT:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gq()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gp()V
 
     return-void
 .end method
@@ -886,7 +888,7 @@
 
     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;->gA()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gz()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 4fa3f740b0..d57c90aa56 100644
--- a/com.discord/smali/com/facebook/drawee/generic/a.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/generic/a;
 .super Ljava/lang/Object;
+.source "GenericDraweeHierarchyBuilder.java"
 
 
 # static fields
@@ -99,20 +100,14 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Jb:Landroid/graphics/drawable/Drawable;
 
-    sget-object v0, Lcom/facebook/drawee/generic/a;->IV:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
     iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Jc:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Jd:Landroid/graphics/drawable/Drawable;
 
-    sget-object v0, Lcom/facebook/drawee/generic/a;->IV:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
     iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Je:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Jf:Landroid/graphics/drawable/Drawable;
 
-    sget-object v0, Lcom/facebook/drawee/generic/a;->IV:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
     iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Jg:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     sget-object v0, Lcom/facebook/drawee/generic/a;->IW:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
@@ -164,15 +159,13 @@
     return-object p0
 .end method
 
-.method public final gE()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+.method public final gD()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/a;->Jl:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->Jl:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
diff --git a/com.discord/smali/com/facebook/drawee/generic/b.smali b/com.discord/smali/com/facebook/drawee/generic/b.smali
index 8c7a37f1a5..35bc3b1c06 100644
--- a/com.discord/smali/com/facebook/drawee/generic/b.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/generic/b;
 .super Ljava/lang/Object;
+.source "GenericDraweeHierarchyInflater.java"
 
 
 # direct methods
@@ -104,7 +105,7 @@
 
     move-object/from16 v2, p2
 
-    if-eqz v2, :cond_2b
+    if-eqz v2, :cond_2c
 
     sget-object v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy:[I
 
@@ -156,16 +157,11 @@
 
     invoke-virtual {v0, v3}, Lcom/facebook/drawee/generic/a;->c(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
 
-    :goto_1
-    move/from16 v19, v7
+    move/from16 v20, v7
 
-    :goto_2
-    move/from16 v20, v16
-
-    :goto_3
     move/from16 v5, v17
 
-    goto/16 :goto_8
+    goto/16 :goto_3
 
     :cond_0
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_placeholderImage:I
@@ -178,7 +174,11 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->IZ:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_1
+    move/from16 v20, v7
+
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_1
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_pressedStateOverlayImage:I
@@ -195,14 +195,18 @@
 
     iput-object v5, v0, Lcom/facebook/drawee/generic/a;->Jm:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_1
+    move/from16 v20, v7
+
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_2
     new-instance v4, Landroid/graphics/drawable/StateListDrawable;
 
     invoke-direct {v4}, Landroid/graphics/drawable/StateListDrawable;-><init>()V
 
-    move/from16 v19, v7
+    move/from16 v20, v7
 
     const/4 v5, 0x1
 
@@ -210,18 +214,20 @@
 
     const v5, 0x10100a7
 
-    const/16 v18, 0x0
+    const/16 v19, 0x0
 
-    aput v5, v7, v18
+    aput v5, v7, v19
 
     invoke-virtual {v4, v7, v3}, Landroid/graphics/drawable/StateListDrawable;->addState([ILandroid/graphics/drawable/Drawable;)V
 
     iput-object v4, v0, Lcom/facebook/drawee/generic/a;->Jm:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_3
-    move/from16 v19, v7
+    move/from16 v20, v7
 
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarImage:I
 
@@ -233,7 +239,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Jf:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_4
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_fadeDuration:I
@@ -248,7 +256,9 @@
 
     iput v3, v0, Lcom/facebook/drawee/generic/a;->IX:I
 
-    goto :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_5
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_viewAspectRatio:I
@@ -263,7 +273,9 @@
 
     iput v3, v0, Lcom/facebook/drawee/generic/a;->IY:F
 
-    goto :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_6
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_placeholderImageScaleType:I
@@ -276,7 +288,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Ja:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    goto :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_7
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_retryImage:I
@@ -289,7 +303,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Jb:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_8
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_retryImageScaleType:I
@@ -302,7 +318,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Jc:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    goto :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_9
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_failureImage:I
@@ -315,7 +333,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Jd:Landroid/graphics/drawable/Drawable;
 
-    goto/16 :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_a
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_failureImageScaleType:I
@@ -328,7 +348,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Je:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    goto/16 :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_b
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarImageScaleType:I
@@ -341,7 +363,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Jg:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    goto/16 :goto_2
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_c
     sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarAutoRotateInterval:I
@@ -352,9 +376,11 @@
 
     invoke-virtual {v2, v3, v4}, Landroid/content/res/TypedArray;->getInteger(II)I
 
-    move-result v16
+    move-result v3
 
-    goto/16 :goto_9
+    move/from16 v16, v3
+
+    goto/16 :goto_4
 
     :cond_d
     move/from16 v4, v16
@@ -369,8 +395,9 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->mBackground:Landroid/graphics/drawable/Drawable;
 
-    :goto_4
-    move/from16 v20, v4
+    move/from16 v16, v4
+
+    move/from16 v5, v17
 
     goto/16 :goto_3
 
@@ -387,7 +414,11 @@
 
     iput-object v5, v0, Lcom/facebook/drawee/generic/a;->Jl:Ljava/util/List;
 
-    goto :goto_4
+    move/from16 v16, v4
+
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_f
     const/4 v5, 0x1
@@ -404,7 +435,11 @@
 
     iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Jl:Ljava/util/List;
 
-    goto :goto_4
+    move/from16 v16, v4
+
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_10
     sget v5, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundAsCircle:I
@@ -423,7 +458,11 @@
 
     iput-boolean v3, v5, Lcom/facebook/drawee/generic/d;->Jp:Z
 
-    goto :goto_4
+    move/from16 v16, v4
+
+    move/from16 v5, v17
+
+    goto/16 :goto_3
 
     :cond_11
     sget v5, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundedCornerRadius:I
@@ -434,11 +473,13 @@
 
     invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
 
-    move-result v17
+    move-result v3
+
+    move/from16 v17, v3
 
     move/from16 v16, v4
 
-    goto/16 :goto_9
+    goto/16 :goto_4
 
     :cond_12
     move/from16 v5, v17
@@ -447,44 +488,51 @@
 
     if-ne v3, v7, :cond_13
 
-    invoke-virtual {v2, v3, v9}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {v2, v3, v10}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result v3
 
-    move v9, v3
+    move v10, v3
 
-    :goto_5
     move/from16 v16, v4
 
     move/from16 v17, v5
 
-    goto/16 :goto_9
+    goto/16 :goto_4
 
     :cond_13
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopRight:I
 
     if-ne v3, v7, :cond_14
 
-    invoke-virtual {v2, v3, v12}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {v2, v3, v11}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result v3
 
-    move v12, v3
+    move v11, v3
 
-    goto :goto_5
+    move/from16 v16, v4
+
+    move/from16 v17, v5
+
+    goto/16 :goto_4
 
     :cond_14
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomLeft:I
 
     if-ne v3, v7, :cond_15
 
-    invoke-virtual {v2, v3, v6}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {v2, v3, v15}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result v3
 
-    move v6, v3
+    move v15, v3
 
-    goto :goto_5
+    move/from16 v16, v4
+
+    move/from16 v17, v5
+
+    goto/16 :goto_4
 
     :cond_15
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomRight:I
@@ -497,46 +545,62 @@
 
     move v13, v3
 
-    goto :goto_5
+    move/from16 v16, v4
+
+    move/from16 v17, v5
+
+    goto/16 :goto_4
 
     :cond_16
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopStart:I
 
     if-ne v3, v7, :cond_17
 
-    invoke-virtual {v2, v3, v10}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {v2, v3, v9}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result v3
 
-    move v10, v3
+    move v9, v3
 
-    goto :goto_5
+    move/from16 v16, v4
+
+    move/from16 v17, v5
+
+    goto/16 :goto_4
 
     :cond_17
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopEnd:I
 
     if-ne v3, v7, :cond_18
 
-    invoke-virtual {v2, v3, v11}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {v2, v3, v12}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result v3
 
-    move v11, v3
+    move v12, v3
 
-    goto :goto_5
+    move/from16 v16, v4
+
+    move/from16 v17, v5
+
+    goto/16 :goto_4
 
     :cond_18
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomStart:I
 
     if-ne v3, v7, :cond_19
 
-    invoke-virtual {v2, v3, v15}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {v2, v3, v6}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result v3
 
-    move v15, v3
+    move v6, v3
 
-    goto :goto_5
+    move/from16 v16, v4
+
+    move/from16 v17, v5
+
+    goto/16 :goto_4
 
     :cond_19
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomEnd:I
@@ -549,7 +613,11 @@
 
     move v14, v3
 
-    goto :goto_5
+    move/from16 v16, v4
+
+    move/from16 v17, v5
+
+    goto/16 :goto_4
 
     :cond_1a
     sget v7, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundWithOverlayColor:I
@@ -572,9 +640,9 @@
 
     iput-object v1, v7, Lcom/facebook/drawee/generic/d;->Jo:Lcom/facebook/drawee/generic/d$a;
 
-    move/from16 v20, v4
+    move/from16 v16, v4
 
-    goto :goto_8
+    goto :goto_3
 
     :cond_1b
     sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderWidth:I
@@ -599,28 +667,28 @@
 
     if-ltz v16, :cond_1c
 
-    move/from16 v20, v4
+    move/from16 v16, v4
 
     const/4 v7, 0x1
 
-    goto :goto_6
+    goto :goto_1
 
     :cond_1c
-    move/from16 v20, v4
+    move/from16 v16, v4
 
     const/4 v7, 0x0
 
-    :goto_6
+    :goto_1
     const-string v4, "the border width cannot be < 0"
 
     invoke-static {v7, v4}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
     iput v3, v1, Lcom/facebook/drawee/generic/d;->HY:F
 
-    goto :goto_8
+    goto :goto_3
 
     :cond_1d
-    move/from16 v20, v4
+    move/from16 v16, v4
 
     sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderColor:I
 
@@ -638,7 +706,7 @@
 
     iput v3, v1, Lcom/facebook/drawee/generic/d;->HZ:I
 
-    goto :goto_8
+    goto :goto_3
 
     :cond_1e
     sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderPadding:I
@@ -665,12 +733,12 @@
 
     const/4 v7, 0x1
 
-    goto :goto_7
+    goto :goto_2
 
     :cond_1f
     const/4 v7, 0x0
 
-    :goto_7
+    :goto_2
     const-string v4, "the padding cannot be < 0"
 
     invoke-static {v7, v4}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
@@ -680,23 +748,19 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_20
-    :goto_8
+    :goto_3
     move/from16 v17, v5
 
-    move/from16 v16, v20
-
-    :goto_9
+    :goto_4
     add-int/lit8 v8, v8, 0x1
 
-    move/from16 v7, v19
+    move/from16 v7, v20
 
     move-object/from16 v1, p1
 
     goto/16 :goto_0
 
     :cond_21
-    move/from16 v20, v16
-
     move/from16 v5, v17
 
     invoke-virtual {v2}, Landroid/content/res/TypedArray;->recycle()V
@@ -705,7 +769,7 @@
 
     const/16 v2, 0x11
 
-    if-lt v1, v2, :cond_25
+    if-lt v1, v2, :cond_26
 
     invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -721,100 +785,56 @@
 
     const/4 v2, 0x1
 
-    if-ne v1, v2, :cond_25
+    if-ne v1, v2, :cond_26
 
-    if-eqz v9, :cond_22
+    if-eqz v10, :cond_22
 
-    if-eqz v11, :cond_22
+    if-eqz v12, :cond_22
 
     const/4 v1, 0x1
 
-    goto :goto_a
+    goto :goto_5
 
     :cond_22
     const/4 v1, 0x0
 
-    :goto_a
-    if-eqz v12, :cond_23
+    :goto_5
+    if-eqz v11, :cond_23
 
-    if-eqz v10, :cond_23
+    if-eqz v9, :cond_23
 
     const/4 v2, 0x1
 
-    goto :goto_b
+    goto :goto_6
 
     :cond_23
     const/4 v2, 0x0
 
-    :goto_b
+    :goto_6
     if-eqz v13, :cond_24
 
-    if-eqz v15, :cond_24
+    if-eqz v6, :cond_24
 
     const/4 v3, 0x1
 
-    goto :goto_c
+    goto :goto_7
 
     :cond_24
     const/4 v3, 0x0
 
-    :goto_c
-    if-eqz v6, :cond_29
+    :goto_7
+    if-eqz v15, :cond_25
 
-    if-eqz v14, :cond_29
+    if-eqz v14, :cond_25
 
-    goto :goto_10
-
-    :cond_25
-    if-eqz v9, :cond_26
-
-    if-eqz v10, :cond_26
-
-    const/4 v1, 0x1
-
-    goto :goto_d
-
-    :cond_26
-    const/4 v1, 0x0
-
-    :goto_d
-    if-eqz v12, :cond_27
-
-    if-eqz v11, :cond_27
-
-    const/4 v2, 0x1
-
-    goto :goto_e
-
-    :cond_27
-    const/4 v2, 0x0
-
-    :goto_e
-    if-eqz v13, :cond_28
-
-    if-eqz v14, :cond_28
-
-    const/4 v3, 0x1
-
-    goto :goto_f
-
-    :cond_28
-    const/4 v3, 0x0
-
-    :goto_f
-    if-eqz v6, :cond_29
-
-    if-eqz v15, :cond_29
-
-    :goto_10
     const/4 v4, 0x1
 
-    goto :goto_11
+    goto :goto_8
 
-    :cond_29
+    :cond_25
     const/4 v4, 0x0
 
-    :goto_11
+    :goto_8
     move v6, v4
 
     move v4, v3
@@ -823,9 +843,70 @@
 
     move v2, v1
 
-    move/from16 v1, v20
+    move/from16 v1, v16
 
-    goto :goto_12
+    goto :goto_d
+
+    :cond_26
+    if-eqz v10, :cond_27
+
+    if-eqz v9, :cond_27
+
+    const/4 v1, 0x1
+
+    goto :goto_9
+
+    :cond_27
+    const/4 v1, 0x0
+
+    :goto_9
+    if-eqz v11, :cond_28
+
+    if-eqz v12, :cond_28
+
+    const/4 v2, 0x1
+
+    goto :goto_a
+
+    :cond_28
+    const/4 v2, 0x0
+
+    :goto_a
+    if-eqz v13, :cond_29
+
+    if-eqz v14, :cond_29
+
+    const/4 v3, 0x1
+
+    goto :goto_b
+
+    :cond_29
+    const/4 v3, 0x0
+
+    :goto_b
+    if-eqz v15, :cond_2a
+
+    if-eqz v6, :cond_2a
+
+    const/4 v4, 0x1
+
+    goto :goto_c
+
+    :cond_2a
+    const/4 v4, 0x0
+
+    :goto_c
+    move v6, v4
+
+    move v4, v3
+
+    move v3, v2
+
+    move v2, v1
+
+    move/from16 v1, v16
+
+    goto :goto_d
 
     :catchall_0
     move-exception v0
@@ -836,7 +917,7 @@
 
     const/16 v2, 0x11
 
-    if-lt v1, v2, :cond_2a
+    if-lt v1, v2, :cond_2b
 
     invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -848,10 +929,10 @@
 
     invoke-virtual {v1}, Landroid/content/res/Configuration;->getLayoutDirection()I
 
-    :cond_2a
+    :cond_2b
     throw v0
 
-    :cond_2b
+    :cond_2c
     const/4 v1, 0x0
 
     const/4 v2, 0x1
@@ -864,12 +945,12 @@
 
     const/4 v6, 0x1
 
-    :goto_12
+    :goto_d
     iget-object v7, v0, Lcom/facebook/drawee/generic/a;->Jf:Landroid/graphics/drawable/Drawable;
 
-    if-eqz v7, :cond_2c
+    if-eqz v7, :cond_2d
 
-    if-lez v1, :cond_2c
+    if-lez v1, :cond_2d
 
     new-instance v7, Lcom/facebook/drawee/drawable/b;
 
@@ -879,70 +960,72 @@
 
     iput-object v7, v0, Lcom/facebook/drawee/generic/a;->Jf:Landroid/graphics/drawable/Drawable;
 
-    :cond_2c
-    if-lez v5, :cond_31
+    :cond_2d
+    if-lez v5, :cond_32
 
     invoke-static/range {p0 .. p0}, Lcom/facebook/drawee/generic/b;->a(Lcom/facebook/drawee/generic/a;)Lcom/facebook/drawee/generic/d;
 
     move-result-object v1
 
-    if-eqz v2, :cond_2d
+    if-eqz v2, :cond_2e
 
     int-to-float v2, v5
 
-    goto :goto_13
+    goto :goto_e
 
-    :cond_2d
+    :cond_2e
     const/4 v2, 0x0
 
-    :goto_13
-    if-eqz v3, :cond_2e
+    :goto_e
+    if-eqz v3, :cond_2f
 
     int-to-float v3, v5
 
-    goto :goto_14
+    goto :goto_f
 
-    :cond_2e
+    :cond_2f
     const/4 v3, 0x0
 
-    :goto_14
-    if-eqz v4, :cond_2f
+    :goto_f
+    if-eqz v4, :cond_30
 
     int-to-float v4, v5
 
-    goto :goto_15
+    goto :goto_10
 
-    :cond_2f
+    :cond_30
     const/4 v4, 0x0
 
-    :goto_15
-    if-eqz v6, :cond_30
+    :goto_10
+    if-eqz v6, :cond_31
 
     int-to-float v5, v5
 
-    goto :goto_16
+    move/from16 v18, v5
 
-    :cond_30
-    const/4 v5, 0x0
+    goto :goto_11
 
-    :goto_16
-    invoke-virtual {v1}, Lcom/facebook/drawee/generic/d;->gF()[F
+    :cond_31
+    const/16 v18, 0x0
+
+    :goto_11
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/d;->gE()[F
 
     move-result-object v1
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
-    aput v2, v1, v6
+    aput v2, v1, v5
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    aput v2, v1, v6
+    aput v2, v1, v5
 
     const/4 v2, 0x2
 
-    const/4 v6, 0x3
+    const/4 v5, 0x3
 
-    aput v3, v1, v6
+    aput v3, v1, v5
 
     aput v3, v1, v2
 
@@ -958,11 +1041,11 @@
 
     const/4 v3, 0x7
 
-    aput v5, v1, v3
+    aput v18, v1, v3
 
-    aput v5, v1, v2
+    aput v18, v1, v2
 
-    :cond_31
+    :cond_32
     return-object v0
 .end method
 
@@ -987,32 +1070,6 @@
     return-object p0
 .end method
 
-.method public static c(Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/facebook/drawee/generic/a;
-    .locals 2
-    .param p1    # Landroid/util/AttributeSet;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
-
-    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/facebook/drawee/generic/a;
-
-    invoke-direct {v1, v0}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
-
-    invoke-static {v1, p0, p1}, Lcom/facebook/drawee/generic/b;->a(Lcom/facebook/drawee/generic/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/facebook/drawee/generic/a;
-
-    move-result-object p0
-
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
-
-    return-object p0
-.end method
-
 .method private static getDrawable(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
diff --git a/com.discord/smali/com/facebook/drawee/generic/c.smali b/com.discord/smali/com/facebook/drawee/generic/c.smali
index ca5d816a2e..7b01667abf 100644
--- a/com.discord/smali/com/facebook/drawee/generic/c.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/generic/c;
 .super Lcom/facebook/drawee/drawable/g;
+.source "RootDrawable.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/drawable/s;
@@ -65,8 +66,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->Jn:Lcom/facebook/drawee/drawable/t;
-
     invoke-interface {v0}, Lcom/facebook/drawee/drawable/t;->onDraw()V
 
     :cond_1
@@ -76,8 +75,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->Gq:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p0}, Lcom/facebook/drawee/generic/c;->getBounds()Landroid/graphics/Rect;
 
     move-result-object v1
@@ -115,9 +112,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->Jn:Lcom/facebook/drawee/drawable/t;
-
-    invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/t;->A(Z)V
+    invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/t;->z(Z)V
 
     :cond_0
     invoke-super {p0, p1, p2}, Lcom/facebook/drawee/drawable/g;->setVisible(ZZ)Z
diff --git a/com.discord/smali/com/facebook/drawee/generic/d$a.smali b/com.discord/smali/com/facebook/drawee/generic/d$a.smali
index 87ce58de18..5c4aa5c6b8 100644
--- a/com.discord/smali/com/facebook/drawee/generic/d$a.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/d$a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/facebook/drawee/generic/d$a;
 .super Ljava/lang/Enum;
+.source "RoundingParams.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/generic/d.smali b/com.discord/smali/com/facebook/drawee/generic/d.smali
index 0ce57bee29..e6613b2d10 100644
--- a/com.discord/smali/com/facebook/drawee/generic/d.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/generic/d;
 .super Ljava/lang/Object;
+.source "RoundingParams.java"
 
 
 # annotations
@@ -61,7 +62,7 @@
     return-void
 .end method
 
-.method public static gG()Lcom/facebook/drawee/generic/d;
+.method public static gF()Lcom/facebook/drawee/generic/d;
     .locals 2
 
     new-instance v0, Lcom/facebook/drawee/generic/d;
@@ -82,7 +83,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/generic/d;-><init>()V
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/generic/d;->gF()[F
+    invoke-virtual {v0}, Lcom/facebook/drawee/generic/d;->gE()[F
 
     move-result-object v1
 
@@ -212,7 +213,7 @@
     return v0
 .end method
 
-.method final gF()[F
+.method final gE()[F
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/d;->Jq:[F
@@ -232,7 +233,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 5
 
     iget-object v0, p0, Lcom/facebook/drawee/generic/d;->Jo:Lcom/facebook/drawee/generic/d$a;
 
@@ -240,8 +241,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->Jo:Lcom/facebook/drawee/generic/d$a;
-
     invoke-virtual {v0}, Lcom/facebook/drawee/generic/d$a;->hashCode()I
 
     move-result v0
@@ -264,8 +263,6 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/drawee/generic/d;->Jq:[F
-
     invoke-static {v2}, Ljava/util/Arrays;->hashCode([F)I
 
     move-result v2
@@ -290,11 +287,9 @@
 
     const/4 v3, 0x0
 
-    cmpl-float v2, v2, v3
+    cmpl-float v4, v2, v3
 
-    if-eqz v2, :cond_2
-
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->HY:F
+    if-eqz v4, :cond_2
 
     invoke-static {v2}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -318,13 +313,11 @@
 
     iget v2, p0, Lcom/facebook/drawee/generic/d;->mPadding:F
 
-    cmpl-float v2, v2, v3
+    cmpl-float v3, v2, v3
 
-    if-eqz v2, :cond_3
+    if-eqz v3, :cond_3
 
-    iget v1, p0, Lcom/facebook/drawee/generic/d;->mPadding:F
-
-    invoke-static {v1}, Ljava/lang/Float;->floatToIntBits(F)I
+    invoke-static {v2}, Ljava/lang/Float;->floatToIntBits(F)I
 
     move-result v1
 
diff --git a/com.discord/smali/com/facebook/drawee/generic/e.smali b/com.discord/smali/com/facebook/drawee/generic/e.smali
index 82fdda5082..85a49f49a8 100644
--- a/com.discord/smali/com/facebook/drawee/generic/e.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/generic/e;
 .super Ljava/lang/Object;
+.source "WrappingUtils.java"
 
 
 # static fields
@@ -387,9 +388,9 @@
 
     const/4 p0, 0x0
 
-    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->y(Z)V
+    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->x(Z)V
 
-    invoke-interface {v0}, Lcom/facebook/drawee/drawable/j;->gu()V
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/j;->gt()V
 
     const/4 p1, 0x0
 
@@ -397,7 +398,7 @@
 
     invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/j;->j(F)V
 
-    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->z(Z)V
+    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->y(Z)V
 
     :cond_2
     return-void
@@ -408,7 +409,7 @@
 
     iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->Jp:Z
 
-    invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->y(Z)V
+    invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->x(Z)V
 
     iget-object v0, p1, Lcom/facebook/drawee/generic/d;->Jq:[F
 
@@ -426,7 +427,7 @@
 
     iget-boolean p1, p1, Lcom/facebook/drawee/generic/d;->Ia:Z
 
-    invoke-interface {p0, p1}, Lcom/facebook/drawee/drawable/j;->z(Z)V
+    invoke-interface {p0, p1}, Lcom/facebook/drawee/drawable/j;->y(Z)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali
index fede529d86..8be1645703 100644
--- a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali
+++ b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
 .super Ljava/lang/Object;
+.source "DraweeSpanStringBuilder.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
diff --git a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali
index 9868589a86..793472a48d 100644
--- a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali
+++ b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;
 .super Lcom/facebook/drawee/controller/b;
+.source "DraweeSpanStringBuilder.java"
 
 
 # annotations
@@ -95,8 +96,6 @@
 
     if-eq v0, v1, :cond_2
 
-    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->JL:I
-
     int-to-float v0, v0
 
     invoke-interface {p2}, Lcom/facebook/imagepipeline/f/f;->getHeight()I
diff --git a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$c.smali b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$c.smali
index 6bb37806ef..08f43a69ef 100644
--- a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$c.smali
+++ b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 .super Ljava/lang/Object;
+.source "DraweeSpanStringBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder.smali b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder.smali
index 252dd66a03..a752e8a83d 100644
--- a/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder.smali
+++ b/com.discord/smali/com/facebook/drawee/span/DraweeSpanStringBuilder.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 .super Landroid/text/SpannableStringBuilder;
+.source "DraweeSpanStringBuilder.java"
 
 
 # annotations
@@ -173,14 +174,12 @@
 .end method
 
 .method public final d(Landroid/view/View;)V
-    .locals 2
+    .locals 1
 
     iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->JF:Landroid/view/View;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->JF:Landroid/view/View;
-
     invoke-direct {p0, v0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->f(Landroid/view/View;)V
 
     :cond_0
@@ -188,11 +187,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->JG:Landroid/graphics/drawable/Drawable;
-
-    iget-object v1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->JG:Landroid/graphics/drawable/Drawable;
-
-    if-ne v0, v1, :cond_1
+    if-ne v0, v0, :cond_1
 
     const/4 v0, 0x0
 
@@ -222,7 +217,7 @@
 
     iget-object v0, v0, Lcom/facebook/drawee/span/a;->JC:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gh()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gg()V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/facebook/drawee/span/R.smali b/com.discord/smali/com/facebook/drawee/span/R.smali
index b1efbf3f1c..ffb5d1faf5 100644
--- a/com.discord/smali/com/facebook/drawee/span/R.smali
+++ b/com.discord/smali/com/facebook/drawee/span/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/span/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/drawee/span/a.smali b/com.discord/smali/com/facebook/drawee/span/a.smali
index 97248d1f8d..181999f7fa 100644
--- a/com.discord/smali/com/facebook/drawee/span/a.smali
+++ b/com.discord/smali/com/facebook/drawee/span/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/span/a;
 .super Lcom/facebook/d/a/a/a;
+.source "DraweeSpan.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/drawee/view/DraweeView.smali b/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
index 60ce48849d..28fc649e6c 100644
--- a/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
+++ b/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/view/DraweeView;
 .super Landroid/widget/ImageView;
+.source "DraweeView.java"
 
 
 # annotations
@@ -43,32 +44,6 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Landroid/widget/ImageView;-><init>(Landroid/content/Context;)V
-
-    new-instance v0, Lcom/facebook/drawee/view/a$a;
-
-    invoke-direct {v0}, Lcom/facebook/drawee/view/a$a;-><init>()V
-
-    iput-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->JR:Lcom/facebook/drawee/view/a$a;
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lcom/facebook/drawee/view/DraweeView;->JS:F
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->JT:Z
-
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->JU:Z
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 0
 
@@ -95,62 +70,7 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2, p3}, Landroid/widget/ImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    new-instance p2, Lcom/facebook/drawee/view/a$a;
-
-    invoke-direct {p2}, Lcom/facebook/drawee/view/a$a;-><init>()V
-
-    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->JR:Lcom/facebook/drawee/view/a$a;
-
-    const/4 p2, 0x0
-
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->JS:F
-
-    const/4 p2, 0x0
-
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->JT:Z
-
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->JU:Z
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 0
-    .annotation build Landroid/annotation/TargetApi;
-        value = 0x15
-    .end annotation
-
-    invoke-direct {p0, p1, p2, p3, p4}, Landroid/widget/ImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-
-    new-instance p2, Lcom/facebook/drawee/view/a$a;
-
-    invoke-direct {p2}, Lcom/facebook/drawee/view/a$a;-><init>()V
-
-    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->JR:Lcom/facebook/drawee/view/a$a;
-
-    const/4 p2, 0x0
-
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->JS:F
-
-    const/4 p2, 0x0
-
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->JT:Z
-
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->JU:Z
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
-
-    return-void
-.end method
-
-.method private gM()V
+.method private gL()V
     .locals 3
 
     iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->JU:Z
@@ -288,7 +208,7 @@
 
 
 # virtual methods
-.method public final gL()Z
+.method public final gK()Z
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->JC:Lcom/facebook/drawee/view/b;
@@ -367,11 +287,11 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onAttachedToWindow()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gL()V
 
     iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->JC:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gh()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gg()V
 
     return-void
 .end method
@@ -381,7 +301,7 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onDetachedFromWindow()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gL()V
 
     iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->JC:Lcom/facebook/drawee/view/b;
 
@@ -395,11 +315,11 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onFinishTemporaryDetach()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gL()V
 
     iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->JC:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gh()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gg()V
 
     return-void
 .end method
@@ -411,17 +331,13 @@
 
     iput p1, v0, Lcom/facebook/drawee/view/a$a;->width:I
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->JR:Lcom/facebook/drawee/view/a$a;
+    iput p2, v0, Lcom/facebook/drawee/view/a$a;->height:I
 
-    iput p2, p1, Lcom/facebook/drawee/view/a$a;->height:I
-
-    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->JR:Lcom/facebook/drawee/view/a$a;
-
-    iget p2, p0, Lcom/facebook/drawee/view/DraweeView;->JS:F
+    iget p1, p0, Lcom/facebook/drawee/view/DraweeView;->JS:F
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/DraweeView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v0
+    move-result-object p2
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/DraweeView;->getPaddingLeft()I
 
@@ -445,16 +361,16 @@
 
     const/4 v3, 0x0
 
-    cmpg-float v3, p2, v3
+    cmpg-float v3, p1, v3
 
     if-lez v3, :cond_2
 
-    if-nez v0, :cond_0
+    if-nez p2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget v3, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
+    iget v3, p2, Landroid/view/ViewGroup$LayoutParams;->height:I
 
     invoke-static {v3}, Lcom/facebook/drawee/view/a;->Q(I)Z
 
@@ -464,76 +380,76 @@
 
     if-eqz v3, :cond_1
 
-    iget v0, p1, Lcom/facebook/drawee/view/a$a;->width:I
+    iget p2, v0, Lcom/facebook/drawee/view/a$a;->width:I
 
-    invoke-static {v0}, Landroid/view/View$MeasureSpec;->getSize(I)I
-
-    move-result v0
-
-    sub-int/2addr v0, v1
-
-    int-to-float v0, v0
-
-    div-float/2addr v0, p2
-
-    int-to-float p2, v2
-
-    add-float/2addr v0, p2
-
-    float-to-int p2, v0
-
-    iget v0, p1, Lcom/facebook/drawee/view/a$a;->height:I
-
-    invoke-static {p2, v0}, Landroid/view/View;->resolveSize(II)I
+    invoke-static {p2}, Landroid/view/View$MeasureSpec;->getSize(I)I
 
     move-result p2
 
-    invoke-static {p2, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    sub-int/2addr p2, v1
 
-    move-result p2
+    int-to-float p2, p2
 
-    iput p2, p1, Lcom/facebook/drawee/view/a$a;->height:I
+    div-float/2addr p2, p1
+
+    int-to-float p1, v2
+
+    add-float/2addr p2, p1
+
+    float-to-int p1, p2
+
+    iget p2, v0, Lcom/facebook/drawee/view/a$a;->height:I
+
+    invoke-static {p1, p2}, Landroid/view/View;->resolveSize(II)I
+
+    move-result p1
+
+    invoke-static {p1, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result p1
+
+    iput p1, v0, Lcom/facebook/drawee/view/a$a;->height:I
 
     goto :goto_0
 
     :cond_1
-    iget v0, v0, Landroid/view/ViewGroup$LayoutParams;->width:I
+    iget p2, p2, Landroid/view/ViewGroup$LayoutParams;->width:I
 
-    invoke-static {v0}, Lcom/facebook/drawee/view/a;->Q(I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    iget v0, p1, Lcom/facebook/drawee/view/a$a;->height:I
-
-    invoke-static {v0}, Landroid/view/View$MeasureSpec;->getSize(I)I
-
-    move-result v0
-
-    sub-int/2addr v0, v2
-
-    int-to-float v0, v0
-
-    mul-float v0, v0, p2
-
-    int-to-float p2, v1
-
-    add-float/2addr v0, p2
-
-    float-to-int p2, v0
-
-    iget v0, p1, Lcom/facebook/drawee/view/a$a;->width:I
-
-    invoke-static {p2, v0}, Landroid/view/View;->resolveSize(II)I
+    invoke-static {p2}, Lcom/facebook/drawee/view/a;->Q(I)Z
 
     move-result p2
 
-    invoke-static {p2, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    if-eqz p2, :cond_2
+
+    iget p2, v0, Lcom/facebook/drawee/view/a$a;->height:I
+
+    invoke-static {p2}, Landroid/view/View$MeasureSpec;->getSize(I)I
 
     move-result p2
 
-    iput p2, p1, Lcom/facebook/drawee/view/a$a;->width:I
+    sub-int/2addr p2, v2
+
+    int-to-float p2, p2
+
+    mul-float p2, p2, p1
+
+    int-to-float p1, v1
+
+    add-float/2addr p2, p1
+
+    float-to-int p1, p2
+
+    iget p2, v0, Lcom/facebook/drawee/view/a$a;->width:I
+
+    invoke-static {p1, p2}, Landroid/view/View;->resolveSize(II)I
+
+    move-result p1
+
+    invoke-static {p1, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result p1
+
+    iput p1, v0, Lcom/facebook/drawee/view/a$a;->width:I
 
     :cond_2
     :goto_0
@@ -555,7 +471,7 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onStartTemporaryDetach()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gL()V
 
     iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->JC:Lcom/facebook/drawee/view/b;
 
@@ -569,7 +485,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->JC:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gH()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gG()Z
 
     move-result v1
 
@@ -606,7 +522,7 @@
 
     invoke-super {p0, p1, p2}, Landroid/widget/ImageView;->onVisibilityChanged(Landroid/view/View;I)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->gL()V
 
     return-void
 .end method
@@ -784,8 +700,6 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/drawee/view/DraweeView;->JC:Lcom/facebook/drawee/view/b;
-
     invoke-virtual {v2}, Lcom/facebook/drawee/view/b;->toString()Ljava/lang/String;
 
     move-result-object v2
diff --git a/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali b/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali
index a6e48dda20..cf48788497 100644
--- a/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali
+++ b/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/view/SimpleDraweeView;
 .super Lcom/facebook/drawee/view/c;
+.source "SimpleDraweeView.java"
 
 
 # static fields
@@ -20,123 +21,11 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/c;-><init>(Landroid/content/Context;)V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->e(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 4
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/c;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->e(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2, p3}, Lcom/facebook/drawee/view/c;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->e(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 0
-    .annotation build Landroid/annotation/TargetApi;
-        value = 0x15
-    .end annotation
-
-    invoke-direct {p0, p1, p2, p3, p4}, Lcom/facebook/drawee/view/c;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->e(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Lcom/facebook/drawee/generic/GenericDraweeHierarchy;)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/c;-><init>(Landroid/content/Context;Lcom/facebook/drawee/generic/GenericDraweeHierarchy;)V
-
-    const/4 p2, 0x0
-
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->e(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method private a(Landroid/net/Uri;Ljava/lang/Object;)V
-    .locals 1
-    .param p2    # Ljava/lang/Object;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-
-    iget-object p2, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->JX:Lcom/facebook/drawee/controller/a;
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p2, v0}, Lcom/facebook/drawee/controller/a;->E(Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
-
-    move-result-object p2
-
-    invoke-virtual {p2, p1}, Lcom/facebook/drawee/controller/a;->m(Landroid/net/Uri;)Lcom/facebook/drawee/d/d;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/SimpleDraweeView;->getController()Lcom/facebook/drawee/d/a;
-
-    move-result-object p2
-
-    invoke-interface {p1, p2}, Lcom/facebook/drawee/d/d;->b(Lcom/facebook/drawee/d/a;)Lcom/facebook/drawee/d/d;
-
-    move-result-object p1
-
-    invoke-interface {p1}, Lcom/facebook/drawee/d/d;->gn()Lcom/facebook/drawee/d/a;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setController(Lcom/facebook/drawee/d/a;)V
-
-    return-void
-.end method
-
-.method public static a(Lcom/facebook/common/d/k;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/facebook/common/d/k<",
-            "+",
-            "Lcom/facebook/drawee/controller/a;",
-            ">;)V"
-        }
-    .end annotation
-
-    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->JW:Lcom/facebook/common/d/k;
-
-    return-void
-.end method
-
-.method private e(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 4
-    .param p2    # Landroid/util/AttributeSet;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
@@ -289,6 +178,59 @@
     throw p1
 .end method
 
+.method private a(Landroid/net/Uri;Ljava/lang/Object;)V
+    .locals 1
+    .param p2    # Ljava/lang/Object;
+        .annotation runtime Ljavax/annotation/Nullable;
+        .end annotation
+    .end param
+
+    iget-object p2, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->JX:Lcom/facebook/drawee/controller/a;
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p2, v0}, Lcom/facebook/drawee/controller/a;->E(Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
+
+    move-result-object p2
+
+    invoke-virtual {p2, p1}, Lcom/facebook/drawee/controller/a;->m(Landroid/net/Uri;)Lcom/facebook/drawee/d/d;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/SimpleDraweeView;->getController()Lcom/facebook/drawee/d/a;
+
+    move-result-object p2
+
+    invoke-interface {p1, p2}, Lcom/facebook/drawee/d/d;->b(Lcom/facebook/drawee/d/a;)Lcom/facebook/drawee/d/d;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Lcom/facebook/drawee/d/d;->gm()Lcom/facebook/drawee/d/a;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setController(Lcom/facebook/drawee/d/a;)V
+
+    return-void
+.end method
+
+.method public static a(Lcom/facebook/common/d/k;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/facebook/common/d/k<",
+            "+",
+            "Lcom/facebook/drawee/controller/a;",
+            ">;)V"
+        }
+    .end annotation
+
+    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->JW:Lcom/facebook/common/d/k;
+
+    return-void
+.end method
+
 
 # virtual methods
 .method protected getControllerBuilder()Lcom/facebook/drawee/controller/a;
@@ -334,7 +276,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/controller/a;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/controller/a;->gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/drawee/view/a$a.smali b/com.discord/smali/com/facebook/drawee/view/a$a.smali
index 0c09ff12fa..fc2595f4c8 100644
--- a/com.discord/smali/com/facebook/drawee/view/a$a.smali
+++ b/com.discord/smali/com/facebook/drawee/view/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/view/a$a;
 .super Ljava/lang/Object;
+.source "AspectRatioMeasure.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/view/a.smali b/com.discord/smali/com/facebook/drawee/view/a.smali
index 1e167362b0..b62917eecd 100644
--- a/com.discord/smali/com/facebook/drawee/view/a.smali
+++ b/com.discord/smali/com/facebook/drawee/view/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/view/a;
 .super Ljava/lang/Object;
+.source "AspectRatioMeasure.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/drawee/view/b.smali b/com.discord/smali/com/facebook/drawee/view/b.smali
index 4fa532864c..8039bb3bec 100644
--- a/com.discord/smali/com/facebook/drawee/view/b.smali
+++ b/com.discord/smali/com/facebook/drawee/view/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/drawee/view/b;
 .super Ljava/lang/Object;
+.source "DraweeHolder.java"
 
 # interfaces
 .implements Lcom/facebook/drawee/drawable/t;
@@ -66,7 +67,7 @@
 
     iput-object v0, p0, Lcom/facebook/drawee/view/b;->JQ:Lcom/facebook/drawee/d/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/b;->gd()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->gb()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
@@ -126,7 +127,7 @@
     return-void
 .end method
 
-.method private gI()V
+.method private gH()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->JM:Z
@@ -150,8 +151,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->JQ:Lcom/facebook/drawee/d/a;
-
     invoke-interface {v0}, Lcom/facebook/drawee/d/a;->getHierarchy()Lcom/facebook/drawee/d/b;
 
     move-result-object v0
@@ -160,13 +159,13 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/view/b;->JQ:Lcom/facebook/drawee/d/a;
 
-    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->gh()V
+    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->gg()V
 
     :cond_1
     return-void
 .end method
 
-.method private gJ()V
+.method private gI()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->JM:Z
@@ -186,7 +185,7 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->JM:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->gH()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->gG()Z
 
     move-result v0
 
@@ -200,7 +199,7 @@
     return-void
 .end method
 
-.method private gK()V
+.method private gJ()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->JN:Z
@@ -211,58 +210,25 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gI()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gH()V
 
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gJ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gI()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final A(Z)V
-    .locals 2
-
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->JO:Z
-
-    if-ne v0, p1, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Gj:Lcom/facebook/drawee/a/b;
-
-    if-eqz p1, :cond_1
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->FX:Lcom/facebook/drawee/a/b$a;
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->FY: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;->JO:Z
-
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gK()V
-
-    return-void
-.end method
-
-.method public final gH()Z
+.method public final gG()Z
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/drawee/view/b;->JQ:Lcom/facebook/drawee/d/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->JQ:Lcom/facebook/drawee/d/a;
-
     invoke-interface {v0}, Lcom/facebook/drawee/d/a;->getHierarchy()Lcom/facebook/drawee/d/b;
 
     move-result-object v0
@@ -293,8 +259,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->JP:Lcom/facebook/drawee/d/b;
-
     invoke-interface {v0}, Lcom/facebook/drawee/d/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -302,7 +266,7 @@
     return-object v0
 .end method
 
-.method public final gh()V
+.method public final gg()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/drawee/view/b;->Gj:Lcom/facebook/drawee/a/b;
@@ -315,7 +279,7 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->JN:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gK()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gJ()V
 
     return-void
 .end method
@@ -333,7 +297,7 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->JN:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gK()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gJ()V
 
     return-void
 .end method
@@ -396,7 +360,7 @@
 
     iput-boolean v4, p0, Lcom/facebook/drawee/view/b;->JO:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gK()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gJ()V
 
     return-void
 .end method
@@ -412,10 +376,10 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gJ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gI()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->gH()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->gG()Z
 
     move-result v1
 
@@ -464,7 +428,7 @@
     :goto_0
     if-eqz v0, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gI()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gH()V
 
     :cond_3
     return-void
@@ -484,7 +448,7 @@
 
     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;->gH()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->gG()Z
 
     move-result v0
 
@@ -526,7 +490,7 @@
     const/4 v1, 0x1
 
     :goto_1
-    invoke-virtual {p0, v1}, Lcom/facebook/drawee/view/b;->A(Z)V
+    invoke-virtual {p0, v1}, Lcom/facebook/drawee/view/b;->z(Z)V
 
     invoke-direct {p0, p0}, Lcom/facebook/drawee/view/b;->a(Lcom/facebook/drawee/drawable/t;)V
 
@@ -589,3 +553,34 @@
 
     return-object v0
 .end method
+
+.method public final z(Z)V
+    .locals 2
+
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->JO:Z
+
+    if-ne v0, p1, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Gj:Lcom/facebook/drawee/a/b;
+
+    if-eqz p1, :cond_1
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->FX:Lcom/facebook/drawee/a/b$a;
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->FY: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;->JO:Z
+
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->gJ()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 7edc43be58..a3c7ba7ad7 100644
--- a/com.discord/smali/com/facebook/drawee/view/c.smali
+++ b/com.discord/smali/com/facebook/drawee/view/c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/drawee/view/c;
 .super Lcom/facebook/drawee/view/DraweeView;
+.source "GenericDraweeView.java"
 
 
 # annotations
@@ -13,79 +14,34 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;)V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/facebook/drawee/view/c;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 2
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/c;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2, p3}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/c;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 0
-    .annotation build Landroid/annotation/TargetApi;
-        value = 0x15
-    .end annotation
-
-    invoke-direct {p0, p1, p2, p3, p4}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-
-    invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/c;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Lcom/facebook/drawee/generic/GenericDraweeHierarchy;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;)V
-
-    invoke-virtual {p0, p2}, Lcom/facebook/drawee/view/c;->setHierarchy(Lcom/facebook/drawee/d/b;)V
-
-    return-void
-.end method
-
-.method private d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
-    .param p2    # Landroid/util/AttributeSet;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-static {p1, p2}, Lcom/facebook/drawee/generic/b;->c(Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/facebook/drawee/generic/a;
+    invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/facebook/drawee/generic/a;
+
+    invoke-direct {v1, v0}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
+
+    invoke-static {v1, p1, p2}, Lcom/facebook/drawee/generic/b;->a(Lcom/facebook/drawee/generic/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/facebook/drawee/generic/a;
 
     move-result-object p1
 
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
+
     iget p2, p1, Lcom/facebook/drawee/generic/a;->IY:F
 
     invoke-virtual {p0, p2}, Lcom/facebook/drawee/view/c;->setAspectRatio(F)V
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->gE()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->gD()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/fbcore/R.smali b/com.discord/smali/com/facebook/fbcore/R.smali
index 442bb8f4f8..202c237f35 100644
--- a/com.discord/smali/com/facebook/fbcore/R.smali
+++ b/com.discord/smali/com/facebook/fbcore/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fbcore/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/fresco/animation/a/a.smali b/com.discord/smali/com/facebook/fresco/animation/a/a.smali
index 5814ad755f..063828beb6 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/a/a;
 .super Ljava/lang/Object;
+.source "AnimationBackend.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/a/d;
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 8b105c9152..579dae327b 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/a/b;
 .super Ljava/lang/Object;
+.source "AnimationBackendDelegate.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/a/a;
@@ -85,8 +86,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/a;->R(I)I
 
     move-result p1
@@ -101,8 +100,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1, p2, p3}, Lcom/facebook/fresco/animation/a/a;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/Canvas;I)Z
 
     move-result p1
@@ -126,15 +123,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->clear()V
 
     :cond_0
     return-void
 .end method
 
-.method public final eL()I
+.method public final eK()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
@@ -146,9 +141,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->eL()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->eK()I
 
     move-result v0
 
@@ -167,8 +160,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->getFrameCount()I
 
     move-result v0
@@ -188,8 +179,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicHeight()I
 
     move-result v0
@@ -209,8 +198,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicWidth()I
 
     move-result v0
@@ -231,8 +218,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/a;->setAlpha(I)V
 
     :cond_0
@@ -252,8 +237,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/a;->setBounds(Landroid/graphics/Rect;)V
 
     :cond_0
@@ -269,8 +252,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/a;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
     :cond_0
diff --git a/com.discord/smali/com/facebook/fresco/animation/a/c$1.smali b/com.discord/smali/com/facebook/fresco/animation/a/c$1.smali
index 0cefea8f2f..c40e9e4fe6 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/c$1.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/a/c$1;
 .super Ljava/lang/Object;
+.source "AnimationBackendDelegateWithInactivityCheck.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -34,7 +35,7 @@
 
 # virtual methods
 .method public final run()V
-    .locals 8
+    .locals 7
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/a/c$1;->Kg:Lcom/facebook/fresco/animation/a/c;
 
@@ -57,8 +58,6 @@
 
     iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->Kb:J
 
-    const/4 v7, 0x0
-
     sub-long/2addr v3, v5
 
     iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->Kc:J
@@ -89,7 +88,7 @@
     :cond_1
     iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Kg:Lcom/facebook/fresco/animation/a/c;
 
-    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->gN()V
+    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->gM()V
 
     :cond_2
     :goto_0
diff --git a/com.discord/smali/com/facebook/fresco/animation/a/c$a.smali b/com.discord/smali/com/facebook/fresco/animation/a/c$a.smali
index 6e4b50c865..277ff7f23a 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/c$a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/c$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/a/c$a;
 .super Ljava/lang/Object;
+.source "AnimationBackendDelegateWithInactivityCheck.java"
 
 
 # annotations
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 87cffea461..7463f5c0b9 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/c.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/a/c;
 .super Lcom/facebook/fresco/animation/a/b;
+.source "AnimationBackendDelegateWithInactivityCheck.java"
 
 
 # annotations
@@ -108,12 +109,12 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/facebook/fresco/animation/a/c;->gN()V
+    invoke-virtual {p0}, Lcom/facebook/fresco/animation/a/c;->gM()V
 
     return p1
 .end method
 
-.method final declared-synchronized gN()V
+.method final declared-synchronized gM()V
     .locals 5
 
     monitor-enter p0
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 074d4f099c..088c105c9b 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/d.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/d.smali
@@ -1,12 +1,13 @@
 .class public interface abstract Lcom/facebook/fresco/animation/a/d;
 .super Ljava/lang/Object;
+.source "AnimationInformation.java"
 
 
 # virtual methods
 .method public abstract R(I)I
 .end method
 
-.method public abstract eL()I
+.method public abstract eK()I
 .end method
 
 .method public abstract getFrameCount()I
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/a.smali b/com.discord/smali/com/facebook/fresco/animation/b/a.smali
index 358d078150..ea199f542e 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/b/a;
 .super Ljava/lang/Object;
+.source "BitmapAnimationBackend.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/a/a;
@@ -98,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;->gO()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->gN()V
 
     return-void
 .end method
@@ -251,25 +252,22 @@
     :try_start_0
     iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Ki:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->gP()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->gO()Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p3
+    move-result-object v3
+
+    invoke-direct {p0, p2, v3, p1, v1}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
+
+    move-result p3
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-direct {p0, p2, p3, p1, v1}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
-
-    move-result v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 v1, -0x1
+    const/4 v0, -0x1
 
     goto :goto_2
 
     :pswitch_1
-    :try_start_2
+    :try_start_1
     iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Kh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     iget v6, p0, Lcom/facebook/fresco/animation/b/a;->mBitmapWidth:I
@@ -280,140 +278,122 @@
 
     invoke-virtual {p3, v6, v7, v8}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;->c(IILandroid/graphics/Bitmap$Config;)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p3
-    :try_end_2
-    .catch Ljava/lang/RuntimeException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    move-result-object v3
+    :try_end_1
+    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :try_start_3
-    invoke-direct {p0, p2, p3}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;)Z
+    :try_start_2
+    invoke-direct {p0, p2, v3}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;)Z
 
-    move-result v3
+    move-result p3
 
-    if-eqz v3, :cond_0
+    if-eqz p3, :cond_0
 
-    invoke-direct {p0, p2, p3, p1, v0}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
+    invoke-direct {p0, p2, v3, p1, v0}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
 
-    move-result v0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    move-result p3
 
-    if-eqz v0, :cond_0
+    if-eqz p3, :cond_0
 
-    const/4 v0, 0x1
+    const/4 p3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 p3, 0x0
+
+    :goto_1
+    const/4 v0, 0x3
 
     goto :goto_2
 
     :catch_0
     move-exception p1
 
-    :try_start_4
     sget-object p2, Lcom/facebook/fresco/animation/b/a;->Bp:Ljava/lang/Class;
 
     const-string p3, "Failed to create frame bitmap"
 
     invoke-static {p2, p3, p1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Throwable;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     invoke-static {v3}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     return v5
 
     :pswitch_2
-    :try_start_5
+    :try_start_3
     iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Ki:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->gQ()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->gP()Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p3
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+    move-result-object v3
 
-    :try_start_6
-    invoke-direct {p0, p2, p3}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;)Z
+    invoke-direct {p0, p2, v3}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;)Z
 
-    move-result v1
+    move-result p3
 
-    if-eqz v1, :cond_1
+    if-eqz p3, :cond_1
 
-    invoke-direct {p0, p2, p3, p1, v4}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
+    invoke-direct {p0, p2, v3, p1, v4}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
 
-    move-result v1
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_0
+    move-result p3
 
-    if-eqz v1, :cond_1
+    if-eqz p3, :cond_1
 
-    goto :goto_1
+    const/4 p3, 0x1
+
+    goto :goto_2
 
     :cond_1
-    const/4 v4, 0x0
-
-    :goto_1
-    move v0, v4
-
-    const/4 v1, 0x2
+    const/4 p3, 0x0
 
     goto :goto_2
 
     :pswitch_3
-    :try_start_7
     iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Ki:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {p3, p2}, Lcom/facebook/fresco/animation/b/b;->S(I)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p3
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_1
+    move-result-object v3
 
-    :try_start_8
-    invoke-direct {p0, p2, p3, p1, v5}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
+    invoke-direct {p0, p2, v3, p1, v5}, Lcom/facebook/fresco/animation/b/a;->a(ILcom/facebook/common/references/CloseableReference;Landroid/graphics/Canvas;I)Z
 
-    move-result v0
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_0
+    move-result p3
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     :goto_2
-    invoke-static {p3}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    invoke-static {v3}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    if-nez v0, :cond_3
+    if-nez p3, :cond_3
 
-    if-ne v1, v2, :cond_2
+    if-ne v0, v2, :cond_2
 
     goto :goto_3
 
     :cond_2
-    move p3, v1
+    move p3, v0
 
     goto :goto_0
 
     :cond_3
     :goto_3
-    return v0
+    return p3
 
     :catchall_0
     move-exception p1
 
-    move-object v3, p3
-
-    goto :goto_4
-
-    :catchall_1
-    move-exception p1
-
-    :goto_4
     invoke-static {v3}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     throw p1
 
+    return-void
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
@@ -423,7 +403,7 @@
     .end packed-switch
 .end method
 
-.method private gO()V
+.method private gN()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Kk:Lcom/facebook/fresco/animation/b/c;
@@ -449,8 +429,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->mBounds:Landroid/graphics/Rect;
-
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
@@ -478,8 +456,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->mBounds:Landroid/graphics/Rect;
-
     invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
     move-result v1
@@ -518,14 +494,10 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a;->Km:Lcom/facebook/fresco/animation/b/b/b;
-
-    if-eqz p2, :cond_0
-
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a;->Kl:Lcom/facebook/fresco/animation/b/b/a;
-
     iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Km:Lcom/facebook/fresco/animation/b/b/b;
 
+    if-eqz v0, :cond_0
+
     iget-object v1, p0, Lcom/facebook/fresco/animation/b/a;->Ki: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
@@ -544,12 +516,12 @@
     return-void
 .end method
 
-.method public final eL()I
+.method public final eK()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Kj:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->eL()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->eK()I
 
     move-result v0
 
@@ -621,7 +593,7 @@
 
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/b/c;->setBounds(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->gO()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->gN()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/a/a.smali b/com.discord/smali/com/facebook/fresco/animation/b/a/a.smali
index cb0f6bb8fe..dede29d5be 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
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/b/a/a;
 .super Ljava/lang/Object;
+.source "FrescoFrameCache.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/b/b;
@@ -176,7 +177,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/d;->ij()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/d;->ii()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
     :try_end_0
@@ -298,66 +299,52 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/fresco/animation/b/a/a;->T(I)V
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     const/4 v0, 0x0
 
     :try_start_1
     invoke-static {p2}, Lcom/facebook/fresco/animation/b/a/a;->f(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p2
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    move-result-object v0
 
-    if-eqz p2, :cond_0
+    if-eqz v0, :cond_0
 
-    :try_start_2
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Kr:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->Kr:Lcom/facebook/common/references/CloseableReference;
 
-    invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Ko:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->Ko:Lcom/facebook/imagepipeline/animated/c/c;
 
-    invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/animated/c/c;->e(ILcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
+    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;->Kr:Lcom/facebook/common/references/CloseableReference;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :cond_0
-    :goto_0
-    :try_start_3
-    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+    :try_start_2
+    invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     monitor-exit p0
 
     return-void
 
-    :catchall_1
+    :catchall_0
     move-exception p1
 
-    move-object p2, v0
-
-    :goto_1
-    :try_start_4
-    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    :try_start_3
+    invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     throw p1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    :catchall_2
+    :catchall_1
     move-exception p1
 
     monitor-exit p0
@@ -381,23 +368,23 @@
     :try_start_0
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     const/4 v0, 0x0
 
     :try_start_1
     invoke-static {p2}, Lcom/facebook/fresco/animation/b/a/a;->f(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p2
+    move-result-object v0
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-nez p2, :cond_0
+    if-nez v0, :cond_0
 
     :try_start_2
-    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
     :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     monitor-exit p0
 
@@ -405,13 +392,13 @@
 
     :cond_0
     :try_start_3
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Ko:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->Ko:Lcom/facebook/imagepipeline/animated/c/c;
 
-    invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/animated/c/c;->e(ILcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
+    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 v0
+    move-result-object p2
 
-    invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
+    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
     move-result v1
 
@@ -429,9 +416,9 @@
 
     iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->Kq:Landroid/util/SparseArray;
 
-    invoke-virtual {v1, p1, v0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
+    invoke-virtual {v1, p1, p2}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
-    sget-object v0, Lcom/facebook/fresco/animation/b/a/a;->Bp:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/fresco/animation/b/a/a;->Bp:Ljava/lang/Class;
 
     const-string v1, "cachePreparedFrame(%d) cached. Pending frames: %s"
 
@@ -441,15 +428,15 @@
 
     iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->Kq: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
+    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
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :cond_1
     :try_start_4
-    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
     :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     monitor-exit p0
 
@@ -458,22 +445,14 @@
     :catchall_0
     move-exception p1
 
-    goto :goto_0
-
-    :catchall_1
-    move-exception p1
-
-    move-object p2, v0
-
-    :goto_0
     :try_start_5
-    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     throw p1
     :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
-    :catchall_2
+    :catchall_1
     move-exception p1
 
     monitor-exit p0
@@ -537,6 +516,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized contains(I)Z
@@ -571,7 +552,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized gP()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gO()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -612,7 +593,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized gQ()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gP()Lcom/facebook/common/references/CloseableReference;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -646,7 +627,7 @@
     iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Ko:Lcom/facebook/imagepipeline/animated/c/c;
 
     :cond_1
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->hd()Lcom/facebook/cache/common/CacheKey;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->hc()Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v2
 
@@ -682,4 +663,6 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
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 558daee0c1..a3c61ff6eb 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
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/b/a/b;
 .super Ljava/lang/Object;
+.source "KeepLastFrameCache.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/b/b;
@@ -39,7 +40,7 @@
     return-void
 .end method
 
-.method private declared-synchronized gR()V
+.method private declared-synchronized gQ()V
     .locals 1
 
     monitor-enter p0
@@ -165,11 +166,6 @@
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     :try_start_1
     iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Kt:Lcom/facebook/common/references/CloseableReference;
@@ -190,7 +186,9 @@
 
     return-void
 
-    :goto_0
+    :catchall_0
+    move-exception p1
+
     monitor-exit p0
 
     throw p1
@@ -216,7 +214,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->gR()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->gQ()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -270,9 +268,11 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
-.method public final declared-synchronized gP()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gO()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -309,7 +309,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized gQ()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gP()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -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;->gR()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->gQ()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;->gR()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->gQ()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 efeb2f5f12..9748279560 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
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/b/a/c;
 .super Ljava/lang/Object;
+.source "NoOpCache.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/b/b;
@@ -77,6 +78,25 @@
     return p1
 .end method
 
+.method public final gO()Lcom/facebook/common/references/CloseableReference;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Landroid/graphics/Bitmap;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
 .method public final gP()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -95,22 +115,3 @@
 
     return-object v0
 .end method
-
-.method public final gQ()Lcom/facebook/common/references/CloseableReference;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Landroid/graphics/Bitmap;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
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 00de1d4c7f..fd0340af82 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/b/b;
 .super Ljava/lang/Object;
+.source "BitmapFrameCache.java"
 
 
 # virtual methods
@@ -45,6 +46,20 @@
 .method public abstract contains(I)Z
 .end method
 
+.method public abstract gO()Lcom/facebook/common/references/CloseableReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Landroid/graphics/Bitmap;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end method
+
 .method public abstract gP()Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -58,17 +73,3 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
-
-.method public abstract gQ()Lcom/facebook/common/references/CloseableReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Landroid/graphics/Bitmap;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end method
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/b/a.smali b/com.discord/smali/com/facebook/fresco/animation/b/b/a.smali
index e7708bde1f..4a24b36ab5 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/b/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/b/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/b/b/a;
 .super Ljava/lang/Object;
+.source "BitmapFramePreparationStrategy.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/b/b.smali b/com.discord/smali/com/facebook/fresco/animation/b/b/b.smali
index b4d7873933..d1cded32fa 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/b/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/b/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/b/b/b;
 .super Ljava/lang/Object;
+.source "BitmapFramePreparer.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/b/c$a.smali b/com.discord/smali/com/facebook/fresco/animation/b/b/c$a.smali
index 2bad252293..c2844ca727 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/b/c$a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/b/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/b/b/c$a;
 .super Ljava/lang/Object;
+.source "DefaultBitmapFramePreparer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -90,7 +91,7 @@
     return v1
 
     :cond_1
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gS()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gR()Ljava/lang/Class;
 
     move-result-object p1
 
@@ -196,7 +197,7 @@
     move-exception p1
 
     :try_start_1
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gS()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gR()Ljava/lang/Class;
 
     move-result-object p2
 
@@ -216,7 +217,7 @@
     :try_start_2
     iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ki:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p2}, Lcom/facebook/fresco/animation/b/b;->gQ()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p2}, Lcom/facebook/fresco/animation/b/b;->gP()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p2
 
@@ -252,6 +253,8 @@
     invoke-static {v3}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -270,7 +273,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gS()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gR()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -330,7 +333,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gS()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gR()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -347,7 +350,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gS()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gR()Ljava/lang/Class;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/b/c.smali b/com.discord/smali/com/facebook/fresco/animation/b/b/c.smali
index ee83bee1e0..aafd472fd3 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/b/c.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/b/c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/b/b/c;
 .super Ljava/lang/Object;
+.source "DefaultBitmapFramePreparer.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/b/b/b;
@@ -109,7 +110,7 @@
     return-object p0
 .end method
 
-.method static synthetic gS()Ljava/lang/Class;
+.method static synthetic gR()Ljava/lang/Class;
     .locals 1
 
     sget-object v0, Lcom/facebook/fresco/animation/b/b/c;->Bp:Ljava/lang/Class;
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/b/d.smali b/com.discord/smali/com/facebook/fresco/animation/b/b/d.smali
index b3ba9e1567..2c8fc537bd 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/b/d.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/b/d.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/b/b/d;
 .super Ljava/lang/Object;
+.source "FixedNumberBitmapFramePreparationStrategy.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/b/b/a;
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/c.smali b/com.discord/smali/com/facebook/fresco/animation/b/c.smali
index f294ffaf7e..0af04d8233 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/c.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/b/c;
 .super Ljava/lang/Object;
+.source "BitmapFrameRenderer.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/c/a.smali b/com.discord/smali/com/facebook/fresco/animation/b/c/a.smali
index d6afa056c2..067b566771 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/c/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/b/c/a;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableBackendAnimationInformation.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/a/d;
@@ -34,12 +35,12 @@
     return p1
 .end method
 
-.method public final eL()I
+.method public final eK()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->KA:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->eL()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->eK()I
 
     move-result v0
 
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 44552a9459..acd6962202 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
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/b/c/b$1;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableBackendFrameRenderer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/c/d$a;
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 7745f1b9e7..684c085224 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
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/b/c/b;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableBackendFrameRenderer.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/b/c;
diff --git a/com.discord/smali/com/facebook/fresco/animation/c/a$1.smali b/com.discord/smali/com/facebook/fresco/animation/c/a$1.smali
index 6a8ce8be95..f13e1be097 100644
--- a/com.discord/smali/com/facebook/fresco/animation/c/a$1.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/c/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/c/a$1;
 .super Ljava/lang/Object;
+.source "AnimatedDrawable2.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -38,9 +39,7 @@
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->KQ:Lcom/facebook/fresco/animation/c/a;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/c/a$1;->KQ:Lcom/facebook/fresco/animation/c/a;
-
-    invoke-static {v1}, Lcom/facebook/fresco/animation/c/a;->a(Lcom/facebook/fresco/animation/c/a;)Ljava/lang/Runnable;
+    invoke-static {v0}, Lcom/facebook/fresco/animation/c/a;->a(Lcom/facebook/fresco/animation/c/a;)Ljava/lang/Runnable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/c/a$a.smali b/com.discord/smali/com/facebook/fresco/animation/c/a$a.smali
index aa0be18732..09fe9e40e4 100644
--- a/com.discord/smali/com/facebook/fresco/animation/c/a$a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/c/a$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/c/a$a;
 .super Ljava/lang/Object;
+.source "AnimatedDrawable2.java"
 
 
 # annotations
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 5091bb05f6..7c168daa8f 100644
--- a/com.discord/smali/com/facebook/fresco/animation/c/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/c/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/c/a;
 .super Landroid/graphics/drawable/Drawable;
+.source "AnimatedDrawable2.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Animatable;
@@ -333,20 +334,20 @@
     :cond_7
     iput-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->KH:J
 
+    return-void
+
     :cond_8
     :goto_2
     return-void
 .end method
 
-.method public final fN()V
+.method public final fM()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->clear()V
 
     :cond_0
@@ -367,8 +368,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicHeight()I
 
     move-result v0
@@ -390,8 +389,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicWidth()I
 
     move-result v0
@@ -424,8 +421,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/a;->setBounds(Landroid/graphics/Rect;)V
 
     :cond_0
@@ -486,8 +481,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/a;->setAlpha(I)V
 
     :cond_1
@@ -516,8 +509,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/a;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
     :cond_1
@@ -535,8 +526,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->JY:Lcom/facebook/fresco/animation/a/a;
-
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->getFrameCount()I
 
     move-result v0
@@ -572,6 +561,8 @@
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->KN:Lcom/facebook/fresco/animation/c/b;
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/com/facebook/fresco/animation/c/b.smali b/com.discord/smali/com/facebook/fresco/animation/c/b.smali
index c744909fe0..3ace940831 100644
--- a/com.discord/smali/com/facebook/fresco/animation/c/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/c/b.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/fresco/animation/c/b;
 .super Ljava/lang/Object;
+.source "AnimationListener.java"
diff --git a/com.discord/smali/com/facebook/fresco/animation/c/c.smali b/com.discord/smali/com/facebook/fresco/animation/c/c.smali
index 8d269e50d3..8375756c46 100644
--- a/com.discord/smali/com/facebook/fresco/animation/c/c.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/c/c;
 .super Ljava/lang/Object;
+.source "BaseAnimationListener.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/c/b;
diff --git a/com.discord/smali/com/facebook/fresco/animation/d/a.smali b/com.discord/smali/com/facebook/fresco/animation/d/a.smali
index a826d1b3f9..0cccf4d299 100644
--- a/com.discord/smali/com/facebook/fresco/animation/d/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/d/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/d/a;
 .super Ljava/lang/Object;
+.source "DropFramesFrameScheduler.java"
 
 # interfaces
 .implements Lcom/facebook/fresco/animation/d/b;
@@ -26,7 +27,7 @@
     return-void
 .end method
 
-.method private gU()J
+.method private gT()J
     .locals 6
 
     iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Lc:J
@@ -37,8 +38,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Lc:J
-
     return-wide v0
 
     :cond_0
@@ -81,12 +80,12 @@
     return-wide v0
 .end method
 
-.method private gV()Z
+.method private gU()Z
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->Kj:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->eL()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->eK()I
 
     move-result v0
 
@@ -107,13 +106,13 @@
 .method public final p(J)I
     .locals 5
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gV()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gU()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gU()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gT()J
 
     move-result-wide v0
 
@@ -121,7 +120,7 @@
 
     iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->Kj:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->eL()I
+    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->eK()I
 
     move-result v2
 
@@ -136,7 +135,7 @@
     return p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gU()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gT()J
 
     move-result-wide v0
 
@@ -171,7 +170,7 @@
 .method public final q(J)J
     .locals 11
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gU()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gT()J
 
     move-result-wide v0
 
@@ -186,13 +185,13 @@
     return-wide v2
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gV()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gU()Z
 
     move-result v6
 
     if-nez v6, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gU()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->gT()J
 
     move-result-wide v6
 
@@ -200,7 +199,7 @@
 
     iget-object v8, p0, Lcom/facebook/fresco/animation/d/a;->Kj:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->eL()I
+    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->eK()I
 
     move-result v8
 
@@ -245,8 +244,6 @@
     goto :goto_0
 
     :cond_2
-    const/4 v2, 0x0
-
     sub-long/2addr v4, v0
 
     add-long/2addr p1, v4
diff --git a/com.discord/smali/com/facebook/fresco/animation/d/b.smali b/com.discord/smali/com/facebook/fresco/animation/d/b.smali
index c3ad0139a4..ef1ed37356 100644
--- a/com.discord/smali/com/facebook/fresco/animation/d/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/d/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/fresco/animation/d/b;
 .super Ljava/lang/Object;
+.source "FrameScheduler.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali
index ae67bd4fee..bb5871f1a1 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryV2Impl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/d/c;
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali
index 3138ffcf4f..ce4935ac1d 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryV2Impl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/d/c;
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali
index 0d1e736402..dbc267536c 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryV2Impl.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali
index d557a6b177..925d1ccc88 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryV2Impl.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali
index 22aba7bb18..24a873f221 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryV2Impl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/c/b;
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali
index 9070bf0f7b..0843819166 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryV2Impl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/c/b;
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 b434604c91..bc631ea562 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryV2Impl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/b/a;
@@ -145,7 +146,7 @@
     return-object v0
 .end method
 
-.method public final gT()Lcom/facebook/imagepipeline/e/a;
+.method public final gS()Lcom/facebook/imagepipeline/e/a;
     .locals 10
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -162,7 +163,7 @@
 
     iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hy()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hx()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
@@ -187,7 +188,7 @@
     :cond_0
     iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->KU:Lcom/facebook/imagepipeline/animated/c/b;
 
-    invoke-static {}, Lcom/facebook/common/b/i;->fh()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->fg()Lcom/facebook/common/b/i;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/a$a.smali b/com.discord/smali/com/facebook/fresco/animation/factory/a$a.smali
index 053aa7b085..2e07b25cc6 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/a$a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/factory/a$a;
 .super Ljava/lang/Object;
+.source "ExperimentalBitmapAnimationDrawableFactory.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/CacheKey;
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/a.smali b/com.discord/smali/com/facebook/fresco/animation/factory/a.smali
index 01db359292..f16f057265 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/fresco/animation/factory/a;
 .super Ljava/lang/Object;
+.source "ExperimentalBitmapAnimationDrawableFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/e/a;
@@ -138,7 +139,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/a;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/a;->if()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/a;->ie()Lcom/facebook/imagepipeline/animated/a/e;
 
     move-result-object p1
 
@@ -182,16 +183,17 @@
 
     invoke-direct {p1}, Lcom/facebook/fresco/animation/b/a/c;-><init>()V
 
-    :goto_0
     move-object v4, p1
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_0
     new-instance p1, Lcom/facebook/fresco/animation/b/a/b;
 
     invoke-direct {p1}, Lcom/facebook/fresco/animation/b/a/b;-><init>()V
 
+    move-object v4, p1
+
     goto :goto_0
 
     :pswitch_1
@@ -203,7 +205,9 @@
 
     invoke-direct {v2, p1, v4}, Lcom/facebook/fresco/animation/b/a/a;-><init>(Lcom/facebook/imagepipeline/animated/c/c;Z)V
 
-    goto :goto_1
+    move-object v4, v2
+
+    goto :goto_0
 
     :pswitch_2
     new-instance v2, Lcom/facebook/fresco/animation/b/a/a;
@@ -216,10 +220,9 @@
 
     invoke-direct {v2, p1, v3}, Lcom/facebook/fresco/animation/b/a/a;-><init>(Lcom/facebook/imagepipeline/animated/c/c;Z)V
 
-    :goto_1
     move-object v4, v2
 
-    :goto_2
+    :goto_0
     new-instance v6, Lcom/facebook/fresco/animation/b/c/b;
 
     invoke-direct {v6, v4, v1}, Lcom/facebook/fresco/animation/b/c/b;-><init>(Lcom/facebook/fresco/animation/b/b;Lcom/facebook/imagepipeline/animated/a/a;)V
@@ -258,14 +261,14 @@
 
     move-object v7, v2
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_0
     move-object v7, v2
 
     move-object v8, v7
 
-    :goto_3
+    :goto_1
     new-instance p1, Lcom/facebook/fresco/animation/b/a;
 
     iget-object v3, p0, Lcom/facebook/fresco/animation/factory/a;->Kh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
diff --git a/com.discord/smali/com/facebook/imagepipeline/R.smali b/com.discord/smali/com/facebook/imagepipeline/R.smali
index 0fb0da40bb..71a50684b8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/R.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/a.smali b/com.discord/smali/com/facebook/imagepipeline/a/a.smali
index 104bef5dab..6097a85842 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/a/a;
 .super Ljava/lang/Object;
+.source "BytesRange.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/b.smali b/com.discord/smali/com/facebook/imagepipeline/a/b.smali
index ea0d992b72..c25a048f18 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/a/b;
 .super Ljava/lang/Object;
+.source "ImageDecodeOptions.java"
 
 
 # annotations
@@ -98,7 +99,7 @@
     return-void
 .end method
 
-.method public static hq()Lcom/facebook/imagepipeline/a/b;
+.method public static hp()Lcom/facebook/imagepipeline/a/b;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/a/b;->NG:Lcom/facebook/imagepipeline/a/b;
@@ -269,8 +270,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->NP:Lcom/facebook/imagepipeline/d/c;
-
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
@@ -289,8 +288,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->NQ:Lcom/facebook/imagepipeline/l/a;
-
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/c.smali b/com.discord/smali/com/facebook/imagepipeline/a/c.smali
index a405b5b3d3..118a974788 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/a/c;
 .super Ljava/lang/Object;
+.source "ImageDecodeOptionsBuilder.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/d.smali b/com.discord/smali/com/facebook/imagepipeline/a/d.smali
index 8939daea1c..467f9aa34c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/d.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/facebook/imagepipeline/a/d;
 .super Ljava/lang/Enum;
+.source "Priority.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/e.smali b/com.discord/smali/com/facebook/imagepipeline/a/e.smali
index a572e8e81a..52a41b68cb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/a/e;
 .super Ljava/lang/Object;
+.source "ResizeOptions.java"
 
 
 # instance fields
@@ -38,9 +39,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const/4 p3, 0x0
+    const/4 p3, 0x1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
     if-lez p1, :cond_0
 
@@ -56,9 +57,12 @@
 
     if-lez p2, :cond_1
 
-    const/4 p3, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 p3, 0x0
+
+    :goto_1
     invoke-static {p3}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     iput p1, p0, Lcom/facebook/imagepipeline/a/e;->width:I
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/f.smali b/com.discord/smali/com/facebook/imagepipeline/a/f.smali
index 6e1ee2e895..031140ce84 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/a/f;
 .super Ljava/lang/Object;
+.source "RotationOptions.java"
 
 
 # static fields
@@ -61,7 +62,7 @@
     return-void
 .end method
 
-.method public static hr()Lcom/facebook/imagepipeline/a/f;
+.method public static hq()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/a/f;->Oh:Lcom/facebook/imagepipeline/a/f;
@@ -69,7 +70,7 @@
     return-object v0
 .end method
 
-.method public static hs()Lcom/facebook/imagepipeline/a/f;
+.method public static hr()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/a/f;->Oj:Lcom/facebook/imagepipeline/a/f;
@@ -140,7 +141,7 @@
     return v0
 .end method
 
-.method public final ht()Z
+.method public final hs()Z
     .locals 2
 
     iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Of:I
@@ -159,7 +160,7 @@
     return v0
 .end method
 
-.method public final hu()Z
+.method public final ht()Z
     .locals 2
 
     iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Of:I
@@ -178,10 +179,10 @@
     return v0
 .end method
 
-.method public final hv()I
+.method public final hu()I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->ht()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hs()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/g.smali b/com.discord/smali/com/facebook/imagepipeline/a/g.smali
index 76d69eb4ef..02bd9182ba 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/a/g;
 .super Ljava/lang/RuntimeException;
+.source "TooManyBitmapsException.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/R.smali b/com.discord/smali/com/facebook/imagepipeline/animated/R.smali
index 37557777fe..d164fa9966 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/R.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 979f7a1998..1be39ebc6b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/a/a;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableBackend.java"
 
 
 # virtual methods
@@ -15,7 +16,10 @@
 .method public abstract a(ILandroid/graphics/Canvas;)V
 .end method
 
-.method public abstract eL()I
+.method public abstract eK()I
+.end method
+
+.method public abstract gY()I
 .end method
 
 .method public abstract gZ()I
@@ -29,6 +33,3 @@
 
 .method public abstract getWidth()I
 .end method
-
-.method public abstract ha()I
-.end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/b$a.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/b$a.smali
index 4209f7d62b..d320e91d99 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/b$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/a/b$a;
 .super Ljava/lang/Enum;
+.source "AnimatedDrawableFrameInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/b$b.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/b$b.smali
index 2e654110bf..90981218cd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/b$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/b$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/a/b$b;
 .super Ljava/lang/Enum;
+.source "AnimatedDrawableFrameInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/b.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/b.smali
index 7433e6b3d1..6f00170fbf 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/a/b;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableFrameInfo.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/c.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/c.smali
index f962a8b2bf..6f49c108d1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/a/c;
 .super Ljava/lang/Object;
+.source "AnimatedImage.java"
 
 
 # virtual methods
@@ -9,16 +10,16 @@
 .method public abstract D(I)Lcom/facebook/imagepipeline/animated/a/d;
 .end method
 
-.method public abstract eK()[I
+.method public abstract eJ()[I
 .end method
 
-.method public abstract eL()I
+.method public abstract eK()I
 .end method
 
-.method public abstract eM()Z
+.method public abstract eL()Z
 .end method
 
-.method public abstract eN()I
+.method public abstract eM()I
 .end method
 
 .method public abstract getFrameCount()I
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/d.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/d.smali
index e667429fc2..4d4260d7b2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/a/d;
 .super Ljava/lang/Object;
+.source "AnimatedImageFrame.java"
 
 
 # virtual methods
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 34985b65c7..37abf58857 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/a/e;
 .super Ljava/lang/Object;
+.source "AnimatedImageResult.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/f.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/f.smali
index 52d4c91a05..4e3dbb6ae8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/a/f;
 .super Ljava/lang/Object;
+.source "AnimatedImageResultBuilder.java"
 
 
 # instance fields
@@ -42,7 +43,7 @@
 
 
 # virtual methods
-.method public final hb()Lcom/facebook/imagepipeline/animated/a/e;
+.method public final ha()Lcom/facebook/imagepipeline/animated/a/e;
     .locals 3
 
     const/4 v0, 0x0
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 f525c4b5c6..f732764d12 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/b/a;
 .super Ljava/lang/Object;
+.source "AnimatedFactory.java"
 
 
 # annotations
@@ -18,7 +19,7 @@
     .end annotation
 .end method
 
-.method public abstract gT()Lcom/facebook/imagepipeline/e/a;
+.method public abstract gS()Lcom/facebook/imagepipeline/e/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/b/b.smali b/com.discord/smali/com/facebook/imagepipeline/animated/b/b.smali
index a42c5ed95f..8a08def9e0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/b/b;
 .super Ljava/lang/Object;
+.source "AnimatedFactoryProvider.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/b/c.smali b/com.discord/smali/com/facebook/imagepipeline/animated/b/c.smali
index b6f899089e..96ad167f2c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/b/c;
 .super Ljava/lang/Object;
+.source "AnimatedImageDecoder.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/b/d.smali b/com.discord/smali/com/facebook/imagepipeline/animated/b/d.smali
index fa62f862d4..7519ce9b70 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/b/d;
 .super Ljava/lang/Object;
+.source "AnimatedImageFactory.java"
 
 
 # virtual methods
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 3ec072d189..083d1c7685 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
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/animated/b/e$1;
 .super Ljava/lang/Object;
+.source "AnimatedImageFactoryImpl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/c/d$a;
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/b/e$2.smali b/com.discord/smali/com/facebook/imagepipeline/animated/b/e$2.smali
index 467e1316f1..a848f53be3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/e$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/e$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/animated/b/e$2;
 .super Ljava/lang/Object;
+.source "AnimatedImageFactoryImpl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/c/d$a;
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 3df8ee17bb..581b7cda22 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/b/e;
 .super Ljava/lang/Object;
+.source "AnimatedImageFactoryImpl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/b/d;
@@ -232,9 +233,7 @@
 
     invoke-static {v2}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object v2
-
-    move-object v0, v2
+    move-result-object v0
 
     goto :goto_2
 
@@ -273,7 +272,7 @@
 
     iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->LX:Ljava/util/List;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->hb()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->ha()Lcom/facebook/imagepipeline/animated/a/e;
 
     move-result-object p1
 
@@ -305,6 +304,8 @@
     invoke-static {v4}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Iterable;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static av(Ljava/lang/String;)Lcom/facebook/imagepipeline/animated/b/c;
@@ -431,7 +432,7 @@
     :cond_0
     sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Mb:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->fn()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->fm()J
 
     move-result-wide v2
 
@@ -514,7 +515,7 @@
     :cond_0
     sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Mc:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->fn()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->fm()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 92a7ad48c8..0bce9d8152 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/c/a;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableBackendImpl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/animated/a/a;
@@ -64,7 +65,7 @@
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Mg:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->eK()[I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->eJ()[I
 
     move-result-object p1
 
@@ -190,7 +191,7 @@
     return-object v1
 .end method
 
-.method private declared-synchronized hc()V
+.method private declared-synchronized hb()V
     .locals 1
 
     monitor-enter p0
@@ -250,7 +251,7 @@
     if-ge v0, p2, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/animated/c/a;->hc()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/animated/c/a;->hb()V
 
     :cond_1
     iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Mn:Landroid/graphics/Bitmap;
@@ -351,7 +352,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Mg:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->eM()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->eL()Z
 
     move-result v0
 
@@ -620,12 +621,24 @@
     throw p2
 .end method
 
-.method public final eL()I
+.method public final eK()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Mg:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->eL()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->eK()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final gY()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Mh:Landroid/graphics/Rect;
+
+    invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
@@ -637,7 +650,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Mh:Landroid/graphics/Rect;
 
-    invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
+    invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
     move-result v0
 
@@ -679,15 +692,3 @@
 
     return v0
 .end method
-
-.method public final ha()I
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Mh:Landroid/graphics/Rect;
-
-    invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
-
-    move-result v0
-
-    return v0
-.end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/b.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/b.smali
index 6b61ac09f3..2bc732eded 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/c/b;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableBackendProvider.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/c$1.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/c$1.smali
index 43e9c7de9b..fc930d1e6b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/c$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/animated/c/c$1;
 .super Ljava/lang/Object;
+.source "AnimatedFrameCache.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/h$c;
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 a25890fc95..9266be2516 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
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/animated/c/c$a;
 .super Ljava/lang/Object;
+.source "AnimatedFrameCache.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/CacheKey;
@@ -51,7 +52,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_2
 
     check-cast p1, Lcom/facebook/imagepipeline/animated/c/c$a;
 
@@ -75,6 +76,9 @@
 
     :cond_1
     return v2
+
+    :cond_2
+    return v2
 .end method
 
 .method public final getUriString()Ljava/lang/String;
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 f2a3cc8a8b..6614c2706f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/c/c;
 .super Ljava/lang/Object;
+.source "AnimatedFrameCache.java"
 
 
 # annotations
@@ -116,11 +117,6 @@
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     :try_start_1
     iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Mq:Ljava/util/LinkedHashSet;
@@ -133,7 +129,9 @@
 
     return-void
 
-    :goto_0
+    :catchall_0
+    move-exception p1
+
     monitor-exit p0
 
     throw p1
@@ -171,7 +169,7 @@
     return-object p1
 .end method
 
-.method public final declared-synchronized hd()Lcom/facebook/cache/common/CacheKey;
+.method public final declared-synchronized hc()Lcom/facebook/cache/common/CacheKey;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/d$1.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/d$1.smali
index e0e70f8047..efe4f36fb8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/d$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/d$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/facebook/imagepipeline/animated/c/d$1;
 .super Ljava/lang/Object;
+.source "AnimatedImageCompositor.java"
 
 
 # annotations
@@ -21,7 +22,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->he()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->hd()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/d$a.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/d$a.smali
index debb190c31..0e89e594dc 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/d$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/d$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/animated/c/d$a;
 .super Ljava/lang/Object;
+.source "AnimatedImageCompositor.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/d$b.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/d$b.smali
index 59becad7c4..89548808ab 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/d$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/d$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/animated/c/d$b;
 .super Ljava/lang/Enum;
+.source "AnimatedImageCompositor.java"
 
 
 # annotations
@@ -70,7 +71,7 @@
     return-void
 .end method
 
-.method public static he()[I
+.method public static hd()[I
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Mz:[I
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/d.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/d.smali
index ded2df0f1a..55b95c103c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/c/d;
 .super Ljava/lang/Object;
+.source "AnimatedImageCompositor.java"
 
 
 # annotations
@@ -170,7 +171,7 @@
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->KA:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->gZ()I
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->gY()I
 
     move-result v1
 
@@ -180,7 +181,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->KA:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->ha()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->gZ()I
 
     move-result v0
 
@@ -212,14 +213,13 @@
 
     sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->LP:I
 
-    if-ne v1, v2, :cond_1
+    if-ne v1, v2, :cond_0
 
-    :cond_0
     sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Mv:I
 
     goto :goto_1
 
-    :cond_1
+    :cond_0
     sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->LQ:I
 
     if-ne v1, v2, :cond_2
@@ -228,12 +228,17 @@
 
     move-result v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Mw:I
 
     goto :goto_1
 
+    :cond_1
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Mv:I
+
+    goto :goto_1
+
     :cond_2
     sget v0, Lcom/facebook/imagepipeline/animated/a/b$b;->LR:I
 
@@ -337,6 +342,8 @@
 
     return p1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/d/a.smali b/com.discord/smali/com/facebook/imagepipeline/animated/d/a.smali
index 1c9171d29a..244fabc545 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/d/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/d/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/animated/d/a;
 .super Ljava/lang/Object;
+.source "AnimatedDrawableUtil.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/a.smali b/com.discord/smali/com/facebook/imagepipeline/b/a.smali
index 48050f906c..8f19897aa7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/a;
 .super Ljava/lang/Object;
+.source "DefaultExecutorSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/b/e;
@@ -78,10 +79,10 @@
 
 
 # virtual methods
-.method public final hA()Ljava/util/concurrent/Executor;
+.method public final hv()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Om:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Ok:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
@@ -97,7 +98,7 @@
 .method public final hx()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Ok:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Ol:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
@@ -105,7 +106,7 @@
 .method public final hy()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Ol:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->mBackgroundExecutor:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
@@ -113,7 +114,7 @@
 .method public final hz()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->mBackgroundExecutor:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Om:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/b.smali b/com.discord/smali/com/facebook/imagepipeline/b/b.smali
index adb332536b..4e59ce60e0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/b;
 .super Ljava/lang/Object;
+.source "DiskStorageCacheFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/b/f;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/c.smali b/com.discord/smali/com/facebook/imagepipeline/b/c.smali
index 2d6ce088ec..529b9bc7c9 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/b/c;
 .super Ljava/lang/Object;
+.source "DiskStorageFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/d.smali b/com.discord/smali/com/facebook/imagepipeline/b/d.smali
index 6930618dff..c9d9a4c876 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/d;
 .super Ljava/lang/Object;
+.source "DynamicDefaultDiskStorageFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/b/c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/e.smali b/com.discord/smali/com/facebook/imagepipeline/b/e.smali
index bbf63c51f6..0dbdf74b8d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/e.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lcom/facebook/imagepipeline/b/e;
 .super Ljava/lang/Object;
+.source "ExecutorSupplier.java"
 
 
 # virtual methods
-.method public abstract hA()Ljava/util/concurrent/Executor;
+.method public abstract hv()Ljava/util/concurrent/Executor;
 .end method
 
 .method public abstract hw()Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/f.smali b/com.discord/smali/com/facebook/imagepipeline/b/f.smali
index 21e3b0944c..7978fb3277 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/b/f;
 .super Ljava/lang/Object;
+.source "FileCacheFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/g$1.smali b/com.discord/smali/com/facebook/imagepipeline/b/g$1.smali
index f3a7c87c26..37410db7bd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/g$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/g$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/b/g$1;
 .super Ljava/lang/Object;
+.source "ImagePipeline.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/j;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/b/g;->hB()V
+    value = Lcom/facebook/imagepipeline/b/g;->hA()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/g.smali b/com.discord/smali/com/facebook/imagepipeline/b/g.smali
index afb2a56624..c993262a60 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/g;
 .super Ljava/lang/Object;
+.source "ImagePipeline.java"
 
 
 # annotations
@@ -195,92 +196,92 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     if-nez p5, :cond_1
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->Oq:Lcom/facebook/imagepipeline/g/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->Oq:Lcom/facebook/imagepipeline/g/c;
 
-    if-nez v2, :cond_0
+    if-nez v5, :cond_0
 
     iget-object v2, v1, Lcom/facebook/imagepipeline/b/g;->Oq:Lcom/facebook/imagepipeline/g/c;
 
-    :goto_0
     move-object v11, v2
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_0
-    new-instance v2, Lcom/facebook/imagepipeline/g/b;
+    new-instance v5, Lcom/facebook/imagepipeline/g/b;
 
-    new-array v3, v3, [Lcom/facebook/imagepipeline/g/c;
+    new-array v2, v2, [Lcom/facebook/imagepipeline/g/c;
 
     iget-object v6, v1, Lcom/facebook/imagepipeline/b/g;->Oq:Lcom/facebook/imagepipeline/g/c;
 
-    aput-object v6, v3, v5
+    aput-object v6, v2, v4
 
     iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->Oq:Lcom/facebook/imagepipeline/g/c;
 
-    aput-object v6, v3, v4
+    aput-object v6, v2, v3
 
-    invoke-direct {v2, v3}, Lcom/facebook/imagepipeline/g/b;-><init>([Lcom/facebook/imagepipeline/g/c;)V
+    invoke-direct {v5, v2}, Lcom/facebook/imagepipeline/g/b;-><init>([Lcom/facebook/imagepipeline/g/c;)V
+
+    move-object v11, v5
 
     goto :goto_0
 
     :cond_1
-    iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->Oq:Lcom/facebook/imagepipeline/g/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->Oq:Lcom/facebook/imagepipeline/g/c;
 
-    if-nez v6, :cond_2
+    if-nez v5, :cond_2
 
-    new-instance v6, Lcom/facebook/imagepipeline/g/b;
+    new-instance v5, Lcom/facebook/imagepipeline/g/b;
 
-    new-array v3, v3, [Lcom/facebook/imagepipeline/g/c;
+    new-array v2, v2, [Lcom/facebook/imagepipeline/g/c;
+
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/g;->Oq:Lcom/facebook/imagepipeline/g/c;
+
+    aput-object v6, v2, v4
+
+    aput-object p5, v2, v3
+
+    invoke-direct {v5, v2}, Lcom/facebook/imagepipeline/g/b;-><init>([Lcom/facebook/imagepipeline/g/c;)V
+
+    move-object v11, v5
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v5, Lcom/facebook/imagepipeline/g/b;
+
+    const/4 v6, 0x3
+
+    new-array v6, v6, [Lcom/facebook/imagepipeline/g/c;
 
     iget-object v7, v1, Lcom/facebook/imagepipeline/b/g;->Oq:Lcom/facebook/imagepipeline/g/c;
 
-    aput-object v7, v3, v5
+    aput-object v7, v6, v4
 
-    aput-object p5, v3, v4
+    aput-object p5, v6, v3
 
-    invoke-direct {v6, v3}, Lcom/facebook/imagepipeline/g/b;-><init>([Lcom/facebook/imagepipeline/g/c;)V
+    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Oq:Lcom/facebook/imagepipeline/g/c;
 
-    :goto_1
-    move-object v11, v6
+    aput-object v7, v6, v2
 
-    goto :goto_2
+    invoke-direct {v5, v6}, Lcom/facebook/imagepipeline/g/b;-><init>([Lcom/facebook/imagepipeline/g/c;)V
 
-    :cond_2
-    new-instance v6, Lcom/facebook/imagepipeline/g/b;
+    move-object v11, v5
 
-    const/4 v7, 0x3
-
-    new-array v7, v7, [Lcom/facebook/imagepipeline/g/c;
-
-    iget-object v8, v1, Lcom/facebook/imagepipeline/b/g;->Oq:Lcom/facebook/imagepipeline/g/c;
-
-    aput-object v8, v7, v5
-
-    aput-object p5, v7, v4
-
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->Oq:Lcom/facebook/imagepipeline/g/c;
-
-    aput-object v2, v7, v3
-
-    invoke-direct {v6, v7}, Lcom/facebook/imagepipeline/g/b;-><init>([Lcom/facebook/imagepipeline/g/c;)V
-
-    goto :goto_1
-
-    :goto_2
+    :goto_0
     :try_start_0
     iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->Sa:Lcom/facebook/imagepipeline/request/b$b;
 
-    move-object/from16 v3, p3
+    move-object/from16 v5, p3
 
-    invoke-static {v2, v3}, Lcom/facebook/imagepipeline/request/b$b;->a(Lcom/facebook/imagepipeline/request/b$b;Lcom/facebook/imagepipeline/request/b$b;)Lcom/facebook/imagepipeline/request/b$b;
+    invoke-static {v2, v5}, Lcom/facebook/imagepipeline/request/b$b;->a(Lcom/facebook/imagepipeline/request/b$b;Lcom/facebook/imagepipeline/request/b$b;)Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v7
 
@@ -290,11 +291,11 @@
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
-    move-result-wide v2
+    move-result-wide v5
 
-    invoke-static {v2, v3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {v5, v6}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v5
 
     const/4 v8, 0x0
 
@@ -310,25 +311,25 @@
 
     if-nez v2, :cond_3
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     const/4 v9, 0x0
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_4
-    :goto_3
+    :goto_1
     const/4 v9, 0x1
 
-    :goto_4
+    :goto_2
     iget-object v10, v0, Lcom/facebook/imagepipeline/request/b;->Up:Lcom/facebook/imagepipeline/a/d;
 
     move-object v2, v12
 
     move-object v3, p2
 
-    move-object v4, v6
+    move-object v4, v5
 
     move-object v5, v11
 
@@ -352,7 +353,7 @@
     :catchall_0
     move-exception v0
 
-    goto :goto_5
+    goto :goto_3
 
     :catch_0
     move-exception v0
@@ -368,7 +369,7 @@
 
     return-object v0
 
-    :goto_5
+    :goto_3
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     throw v0
@@ -479,7 +480,7 @@
     return-object p1
 .end method
 
-.method public final hB()V
+.method public final hA()V
     .locals 2
 
     new-instance v0, Lcom/facebook/imagepipeline/b/g$1;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/h$1.smali b/com.discord/smali/com/facebook/imagepipeline/b/h$1.smali
index e380ab8c6f..44f9ab416b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/b/h$1;
 .super Ljava/lang/Object;
+.source "ImagePipelineConfig.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali b/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali
index f8bdc8d111..72a462713e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/h$a;
 .super Ljava/lang/Object;
+.source "ImagePipelineConfig.java"
 
 
 # annotations
@@ -201,7 +202,7 @@
     return-object p0
 .end method
 
-.method public final hD()Lcom/facebook/imagepipeline/b/h$a;
+.method public final hC()Lcom/facebook/imagepipeline/b/h$a;
     .locals 1
 
     const/4 v0, 0x1
@@ -211,7 +212,7 @@
     return-object p0
 .end method
 
-.method public final hE()Lcom/facebook/imagepipeline/b/h;
+.method public final hD()Lcom/facebook/imagepipeline/b/h;
     .locals 2
 
     new-instance v0, Lcom/facebook/imagepipeline/b/h;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/h$b.smali b/com.discord/smali/com/facebook/imagepipeline/b/h$b.smali
index 8ec17616cc..09c6c7badc 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/h$b;
 .super Ljava/lang/Object;
+.source "ImagePipelineConfig.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/h.smali b/com.discord/smali/com/facebook/imagepipeline/b/h.smali
index fd96a2b206..a7afefb222 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/h;
 .super Ljava/lang/Object;
+.source "ImagePipelineConfig.java"
 
 
 # annotations
@@ -212,7 +213,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->hm()Lcom/facebook/imagepipeline/cache/i;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->hl()Lcom/facebook/imagepipeline/cache/i;
 
     move-result-object v0
 
@@ -278,7 +279,7 @@
 
     if-nez v0, :cond_6
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->hn()Lcom/facebook/imagepipeline/cache/r;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->hm()Lcom/facebook/imagepipeline/cache/r;
 
     move-result-object v0
 
@@ -371,7 +372,7 @@
 
     if-nez v0, :cond_c
 
-    invoke-static {}, Lcom/facebook/common/g/c;->fk()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->fj()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
@@ -532,7 +533,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->OQ:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ac;->iK()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ac;->iJ()I
 
     move-result v0
 
@@ -568,12 +569,11 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/bitmaps/d;-><init>(Lcom/facebook/imagepipeline/memory/ac;)V
 
-    :goto_14
     iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->OV:Lcom/facebook/imagepipeline/b/i;
 
     invoke-static {p1, v1, v0}, Lcom/facebook/imagepipeline/b/h;->a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/i;Lcom/facebook/common/k/a;)V
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_16
     iget-object p1, p0, Lcom/facebook/imagepipeline/b/h;->OV:Lcom/facebook/imagepipeline/b/i;
@@ -586,7 +586,7 @@
 
     if-eqz p1, :cond_17
 
-    invoke-static {}, Lcom/facebook/common/k/c;->fA()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->fz()Lcom/facebook/common/k/b;
 
     move-result-object p1
 
@@ -598,10 +598,12 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/bitmaps/d;-><init>(Lcom/facebook/imagepipeline/memory/ac;)V
 
-    goto :goto_14
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->OV:Lcom/facebook/imagepipeline/b/i;
+
+    invoke-static {p1, v1, v0}, Lcom/facebook/imagepipeline/b/h;->a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/i;Lcom/facebook/common/k/a;)V
 
     :cond_17
-    :goto_15
+    :goto_14
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     return-void
@@ -644,7 +646,7 @@
     return-void
 .end method
 
-.method public static hC()Lcom/facebook/imagepipeline/b/h$b;
+.method public static hB()Lcom/facebook/imagepipeline/b/h$b;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/b/h;->OX:Lcom/facebook/imagepipeline/b/h$b;
@@ -662,7 +664,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->eX()Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-virtual {p0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->eW()Lcom/facebook/cache/disk/DiskCacheConfig;
 
     move-result-object p0
     :try_end_0
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 aaa29747bd..13968fe107 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/i$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/i$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/i$a;
 .super Ljava/lang/Object;
+.source "ImagePipelineExperiments.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/i$b.smali b/com.discord/smali/com/facebook/imagepipeline/b/i$b.smali
index 3e96279a11..e814d2344f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/i$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/i$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/i$b;
 .super Ljava/lang/Object;
+.source "ImagePipelineExperiments.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/b/i$c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/i$c.smali b/com.discord/smali/com/facebook/imagepipeline/b/i$c.smali
index 07a931b80b..7b319f4b0b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/i$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/i$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/b/i$c;
 .super Ljava/lang/Object;
+.source "ImagePipelineExperiments.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/i.smali b/com.discord/smali/com/facebook/imagepipeline/b/i.smali
index 82fe84c67a..7def723519 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/i.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/i;
 .super Ljava/lang/Object;
+.source "ImagePipelineExperiments.java"
 
 
 # annotations
@@ -112,17 +113,16 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/b/i$b;-><init>()V
 
-    :goto_0
     iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Pp:Lcom/facebook/imagepipeline/b/i$c;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Pp:Lcom/facebook/imagepipeline/b/i$c;
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Pp:Lcom/facebook/imagepipeline/b/i$c;
 
-    :goto_1
+    :goto_0
     iget-object p1, p1, Lcom/facebook/imagepipeline/b/i$a;->OA:Lcom/facebook/common/d/k;
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/b/i;->OA:Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/j.smali b/com.discord/smali/com/facebook/imagepipeline/b/j.smali
index beee83aef1..bb12ea8145 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/j.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/j.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/b/j;
 .super Ljava/lang/Object;
+.source "ImagePipelineFactory.java"
 
 
 # annotations
@@ -124,7 +125,7 @@
 
     iget-object p1, p1, Lcom/facebook/imagepipeline/b/h;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/b/e;->hA()Ljava/util/concurrent/Executor;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/b/e;->hz()Ljava/util/concurrent/Executor;
 
     move-result-object p1
 
@@ -148,7 +149,7 @@
 
     new-instance p1, Lcom/facebook/imagepipeline/bitmaps/a;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iH()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iG()Lcom/facebook/imagepipeline/memory/d;
 
     move-result-object p0
 
@@ -196,13 +197,13 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iK()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iJ()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/h/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iH()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iG()Lcom/facebook/imagepipeline/memory/d;
 
     move-result-object p0
 
@@ -221,13 +222,13 @@
 
     if-lt v0, v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iK()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iJ()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/h/a;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iH()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iG()Lcom/facebook/imagepipeline/memory/d;
 
     move-result-object p0
 
@@ -257,7 +258,7 @@
     :cond_2
     new-instance p1, Lcom/facebook/imagepipeline/h/d;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iJ()Lcom/facebook/imagepipeline/memory/n;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iI()Lcom/facebook/imagepipeline/memory/n;
 
     move-result-object p0
 
@@ -305,7 +306,7 @@
     throw p0
 .end method
 
-.method public static hF()Lcom/facebook/imagepipeline/b/j;
+.method public static hE()Lcom/facebook/imagepipeline/b/j;
     .locals 2
 
     sget-object v0, Lcom/facebook/imagepipeline/b/j;->Pr:Lcom/facebook/imagepipeline/b/j;
@@ -321,7 +322,7 @@
     return-object v0
 .end method
 
-.method private hH()Lcom/facebook/imagepipeline/cache/h;
+.method private hG()Lcom/facebook/imagepipeline/cache/h;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -357,7 +358,7 @@
     return-object v0
 .end method
 
-.method private hI()Lcom/facebook/imagepipeline/cache/n;
+.method private hH()Lcom/facebook/imagepipeline/cache/n;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -373,7 +374,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hH()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hG()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v0
 
@@ -397,7 +398,7 @@
     return-object v0
 .end method
 
-.method private hJ()Lcom/facebook/imagepipeline/cache/n;
+.method private hI()Lcom/facebook/imagepipeline/cache/n;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -458,7 +459,7 @@
     return-object v0
 .end method
 
-.method private hK()Lcom/facebook/imagepipeline/cache/e;
+.method private hJ()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Ou:Lcom/facebook/imagepipeline/cache/e;
@@ -504,7 +505,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OQ:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->iM()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->iL()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
@@ -512,7 +513,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
@@ -520,7 +521,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hx()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
@@ -540,7 +541,7 @@
     return-object v0
 .end method
 
-.method private hL()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.method private hK()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Kh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
@@ -551,7 +552,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->OQ:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hM()Lcom/facebook/imagepipeline/h/f;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hL()Lcom/facebook/imagepipeline/h/f;
 
     move-result-object v1
 
@@ -567,7 +568,7 @@
     return-object v0
 .end method
 
-.method private hM()Lcom/facebook/imagepipeline/h/f;
+.method private hL()Lcom/facebook/imagepipeline/h/f;
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->PA:Lcom/facebook/imagepipeline/h/f;
@@ -596,7 +597,7 @@
     return-object v0
 .end method
 
-.method private hN()Lcom/facebook/imagepipeline/b/l;
+.method private hM()Lcom/facebook/imagepipeline/b/l;
     .locals 22
 
     move-object/from16 v0, p0
@@ -619,7 +620,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OQ:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->iN()Lcom/facebook/common/g/a;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->iM()Lcom/facebook/common/g/a;
 
     move-result-object v4
 
@@ -642,7 +643,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hG()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hF()Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object v1
 
@@ -680,7 +681,7 @@
 
     new-instance v6, Lcom/facebook/imagepipeline/d/b;
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hM()Lcom/facebook/imagepipeline/h/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hL()Lcom/facebook/imagepipeline/h/f;
 
     move-result-object v7
 
@@ -693,7 +694,7 @@
     :cond_2
     new-instance v6, Lcom/facebook/imagepipeline/d/b;
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hM()Lcom/facebook/imagepipeline/h/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hL()Lcom/facebook/imagepipeline/h/f;
 
     move-result-object v7
 
@@ -707,7 +708,7 @@
 
     iput-object v6, v0, Lcom/facebook/imagepipeline/b/j;->OH:Lcom/facebook/imagepipeline/d/c;
 
-    invoke-static {}, Lcom/facebook/c/d;->gY()Lcom/facebook/c/d;
+    invoke-static {}, Lcom/facebook/c/d;->gX()Lcom/facebook/c/d;
 
     move-result-object v1
 
@@ -719,7 +720,7 @@
 
     iput-object v5, v1, Lcom/facebook/c/d;->LF:Ljava/util/List;
 
-    invoke-virtual {v1}, Lcom/facebook/c/d;->gX()V
+    invoke-virtual {v1}, Lcom/facebook/c/d;->gW()V
 
     :cond_3
     :goto_1
@@ -759,19 +760,19 @@
 
     move-result-object v11
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hI()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hH()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v12
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hJ()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hI()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v13
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hK()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hJ()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v14
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hQ()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hP()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v15
 
@@ -781,7 +782,7 @@
 
     move-object/from16 v16, v1
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hL()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->hK()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v17
 
@@ -829,7 +830,7 @@
     return-object v1
 .end method
 
-.method private hO()Lcom/facebook/imagepipeline/b/m;
+.method private hN()Lcom/facebook/imagepipeline/b/m;
     .locals 13
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -876,7 +877,7 @@
 
     move-result-object v2
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hN()Lcom/facebook/imagepipeline/b/l;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hM()Lcom/facebook/imagepipeline/b/l;
 
     move-result-object v3
 
@@ -910,7 +911,7 @@
 
     iget-boolean v11, v1, Lcom/facebook/imagepipeline/b/h;->OW:Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hR()Lcom/facebook/imagepipeline/k/c;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hQ()Lcom/facebook/imagepipeline/k/c;
 
     move-result-object v12
 
@@ -926,7 +927,7 @@
     return-object v0
 .end method
 
-.method private hP()Lcom/facebook/cache/disk/h;
+.method private hO()Lcom/facebook/cache/disk/h;
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Pz:Lcom/facebook/cache/disk/h;
@@ -953,7 +954,7 @@
     return-object v0
 .end method
 
-.method private hQ()Lcom/facebook/imagepipeline/cache/e;
+.method private hP()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Ov:Lcom/facebook/imagepipeline/cache/e;
@@ -962,7 +963,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/e;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hP()Lcom/facebook/cache/disk/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hO()Lcom/facebook/cache/disk/h;
 
     move-result-object v2
 
@@ -982,7 +983,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OQ:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->iM()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->iL()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
@@ -990,7 +991,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
@@ -998,7 +999,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hx()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
@@ -1018,7 +1019,7 @@
     return-object v0
 .end method
 
-.method private hR()Lcom/facebook/imagepipeline/k/c;
+.method private hQ()Lcom/facebook/imagepipeline/k/c;
     .locals 5
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->OI:Lcom/facebook/imagepipeline/k/c;
@@ -1055,6 +1056,8 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/k/g;-><init>(I)V
 
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->OI:Lcom/facebook/imagepipeline/k/c;
+
     goto :goto_0
 
     :cond_0
@@ -1082,10 +1085,10 @@
 
     invoke-direct {v0, v1, v2, v3, v4}, Lcom/facebook/imagepipeline/k/e;-><init>(IZLcom/facebook/imagepipeline/k/c;Ljava/lang/Integer;)V
 
-    :goto_0
     iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->OI:Lcom/facebook/imagepipeline/k/c;
 
     :cond_1
+    :goto_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->OI:Lcom/facebook/imagepipeline/k/c;
 
     return-object v0
@@ -1105,7 +1108,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/b/h$a;->hE()Lcom/facebook/imagepipeline/b/h;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/b/h$a;->hD()Lcom/facebook/imagepipeline/b/h;
 
     move-result-object p0
 
@@ -1129,7 +1132,7 @@
 
 
 # virtual methods
-.method public final fP()Lcom/facebook/imagepipeline/b/g;
+.method public final fO()Lcom/facebook/imagepipeline/b/g;
     .locals 13
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->EM:Lcom/facebook/imagepipeline/b/g;
@@ -1138,7 +1141,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/b/g;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hO()Lcom/facebook/imagepipeline/b/m;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hN()Lcom/facebook/imagepipeline/b/m;
 
     move-result-object v2
 
@@ -1154,19 +1157,19 @@
 
     iget-object v4, v1, Lcom/facebook/imagepipeline/b/h;->Or:Lcom/facebook/common/d/k;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hI()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hH()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v5
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hJ()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hI()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v6
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hK()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hJ()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v7
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hQ()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hP()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v8
 
@@ -1200,7 +1203,7 @@
     return-object v0
 .end method
 
-.method public final hG()Lcom/facebook/imagepipeline/animated/b/a;
+.method public final hF()Lcom/facebook/imagepipeline/animated/b/a;
     .locals 3
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -1209,7 +1212,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hL()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hK()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v0
 
@@ -1217,7 +1220,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hH()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->hG()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/k$1.smali b/com.discord/smali/com/facebook/imagepipeline/b/k$1.smali
index e617b654f9..22215d23f6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/k$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/b/k$1;
 .super Ljava/lang/Object;
+.source "PriorityThreadFactory.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/k.smali b/com.discord/smali/com/facebook/imagepipeline/b/k.smali
index a5c22b80cb..7ff28e6b0e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/k.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/k;
 .super Ljava/lang/Object;
+.source "PriorityThreadFactory.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/l.smali b/com.discord/smali/com/facebook/imagepipeline/b/l.smali
index 41fb141004..8fd274f705 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/l.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/l;
 .super Ljava/lang/Object;
+.source "ProducerFactory.java"
 
 
 # instance fields
@@ -305,7 +306,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hz()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hy()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
@@ -412,7 +413,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hy()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hx()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
@@ -518,14 +519,14 @@
     return-object v6
 .end method
 
-.method public final hS()Lcom/facebook/imagepipeline/i/z;
+.method public final hR()Lcom/facebook/imagepipeline/i/z;
     .locals 4
 
     new-instance v0, Lcom/facebook/imagepipeline/i/z;
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
@@ -600,7 +601,7 @@
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hA()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hz()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
@@ -625,7 +626,7 @@
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hz()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hy()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/m.smali b/com.discord/smali/com/facebook/imagepipeline/b/m.smali
index cf0ebec1cb..23ef59dff6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/m.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/b/m;
 .super Ljava/lang/Object;
+.source "ProducerSequenceFactory.java"
 
 
 # instance fields
@@ -332,7 +333,7 @@
     return-object p1
 .end method
 
-.method private declared-synchronized hT()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hS()Lcom/facebook/imagepipeline/i/ak;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -355,7 +356,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hU()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hT()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object v0
 
@@ -386,7 +387,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hU()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hT()Lcom/facebook/imagepipeline/i/ak;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -479,7 +480,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hV()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hU()Lcom/facebook/imagepipeline/i/ak;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -504,7 +505,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
@@ -535,7 +536,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hW()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hV()Lcom/facebook/imagepipeline/i/ak;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -560,7 +561,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
@@ -591,7 +592,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hX()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hW()Lcom/facebook/imagepipeline/i/ak;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -616,7 +617,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
@@ -638,7 +639,7 @@
 
     iget-object v5, v3, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v5}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
@@ -654,7 +655,7 @@
 
     iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Py:Lcom/facebook/imagepipeline/b/l;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/b/l;->hS()Lcom/facebook/imagepipeline/i/z;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/b/l;->hR()Lcom/facebook/imagepipeline/i/z;
 
     move-result-object v3
 
@@ -683,7 +684,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hY()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hX()Lcom/facebook/imagepipeline/i/ak;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -708,7 +709,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
@@ -741,7 +742,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hZ()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hY()Lcom/facebook/imagepipeline/i/ak;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -766,7 +767,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
@@ -799,7 +800,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized ia()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized hZ()Lcom/facebook/imagepipeline/i/ak;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -824,7 +825,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hw()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hv()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
@@ -857,7 +858,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized ib()Lcom/facebook/imagepipeline/i/ak;
+.method private declared-synchronized ia()Lcom/facebook/imagepipeline/i/ak;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -962,7 +963,7 @@
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Py:Lcom/facebook/imagepipeline/b/l;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/l;->hS()Lcom/facebook/imagepipeline/i/z;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/l;->hR()Lcom/facebook/imagepipeline/i/z;
 
     move-result-object v1
 
@@ -1093,6 +1094,14 @@
 
     move-result-object p1
 
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Py:Lcom/facebook/imagepipeline/b/l;
+
+    invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->g(Lcom/facebook/imagepipeline/i/ak;)Lcom/facebook/imagepipeline/i/p;
+
+    move-result-object p1
+
+    goto :goto_0
+
     :cond_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Py:Lcom/facebook/imagepipeline/b/l;
 
@@ -1100,6 +1109,7 @@
 
     move-result-object p1
 
+    :goto_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Py:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->f(Lcom/facebook/imagepipeline/i/ak;)Lcom/facebook/imagepipeline/i/o;
@@ -1239,7 +1249,7 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hY()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hX()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_0
@@ -1251,7 +1261,7 @@
 
     :pswitch_1
     :try_start_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ib()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ia()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_1
@@ -1263,7 +1273,7 @@
 
     :pswitch_2
     :try_start_2
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hZ()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hY()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_2
@@ -1275,7 +1285,7 @@
 
     :pswitch_3
     :try_start_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ia()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hZ()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_3
@@ -1299,7 +1309,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hW()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hV()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_4
@@ -1311,7 +1321,7 @@
 
     :cond_1
     :try_start_5
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hX()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hW()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_5
@@ -1323,7 +1333,7 @@
 
     :pswitch_5
     :try_start_6
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hV()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hU()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_6
@@ -1335,7 +1345,7 @@
 
     :pswitch_6
     :try_start_7
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hW()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hV()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_7
@@ -1347,7 +1357,7 @@
 
     :cond_2
     :try_start_8
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hT()Lcom/facebook/imagepipeline/i/ak;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->hS()Lcom/facebook/imagepipeline/i/ak;
 
     move-result-object p1
     :try_end_8
@@ -1413,7 +1423,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->KR:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hz()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hy()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/backends/okhttp3/R.smali b/com.discord/smali/com/facebook/imagepipeline/backends/okhttp3/R.smali
index 58d49e52ec..bf70b1fa85 100644
--- a/com.discord/smali/com/facebook/imagepipeline/backends/okhttp3/R.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/backends/okhttp3/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/backends/okhttp3/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali b/com.discord/smali/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali
index 05959581c7..4b3d0ece65 100644
--- a/com.discord/smali/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 .super Ljava/lang/Object;
+.source "PlatformBitmapFactory.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/bitmaps/a.smali b/com.discord/smali/com/facebook/imagepipeline/bitmaps/a.smali
index 570396eb62..16db1bbbbe 100644
--- a/com.discord/smali/com/facebook/imagepipeline/bitmaps/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/bitmaps/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/bitmaps/a;
 .super Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.source "ArtBitmapFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/bitmaps/b.smali b/com.discord/smali/com/facebook/imagepipeline/bitmaps/b.smali
index 4ddea62136..ba46fc5218 100644
--- a/com.discord/smali/com/facebook/imagepipeline/bitmaps/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/bitmaps/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/bitmaps/b;
 .super Ljava/lang/Object;
+.source "EmptyJpegGenerator.java"
 
 
 # static fields
@@ -626,95 +627,76 @@
 
     invoke-interface {v1, v2}, Lcom/facebook/common/g/g;->G(I)Lcom/facebook/common/g/i;
 
-    move-result-object v1
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v0
 
-    :try_start_1
-    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->MB:[B
+    sget-object v1, Lcom/facebook/imagepipeline/bitmaps/b;->MB:[B
 
-    invoke-virtual {v1, v0}, Lcom/facebook/common/g/i;->write([B)V
+    invoke-virtual {v0, v1}, Lcom/facebook/common/g/i;->write([B)V
 
-    shr-int/lit8 v0, p2, 0x8
+    shr-int/lit8 v1, p2, 0x8
 
-    int-to-byte v0, v0
+    int-to-byte v1, v1
 
-    invoke-virtual {v1, v0}, Lcom/facebook/common/g/i;->write(I)V
+    invoke-virtual {v0, v1}, Lcom/facebook/common/g/i;->write(I)V
 
     and-int/lit16 p2, p2, 0xff
 
     int-to-byte p2, p2
 
-    invoke-virtual {v1, p2}, Lcom/facebook/common/g/i;->write(I)V
+    invoke-virtual {v0, p2}, Lcom/facebook/common/g/i;->write(I)V
 
     shr-int/lit8 p2, p1, 0x8
 
     int-to-byte p2, p2
 
-    invoke-virtual {v1, p2}, Lcom/facebook/common/g/i;->write(I)V
+    invoke-virtual {v0, p2}, Lcom/facebook/common/g/i;->write(I)V
 
     and-int/lit16 p1, p1, 0xff
 
     int-to-byte p1, p1
 
-    invoke-virtual {v1, p1}, Lcom/facebook/common/g/i;->write(I)V
+    invoke-virtual {v0, p1}, Lcom/facebook/common/g/i;->write(I)V
 
     sget-object p1, Lcom/facebook/imagepipeline/bitmaps/b;->MC:[B
 
-    invoke-virtual {v1, p1}, Lcom/facebook/common/g/i;->write([B)V
+    invoke-virtual {v0, p1}, Lcom/facebook/common/g/i;->write([B)V
 
-    invoke-virtual {v1}, Lcom/facebook/common/g/i;->fp()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fo()Lcom/facebook/common/g/f;
 
     move-result-object p1
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Ljava/io/Closeable;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :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-virtual {v1}, Lcom/facebook/common/g/i;->close()V
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->close()V
 
     return-object p1
 
     :catchall_0
     move-exception p1
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception p1
 
-    move-object v0, v1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p1
-
-    move-object v1, v0
-
-    goto :goto_1
-
-    :catch_1
-    move-exception p1
-
-    :goto_0
-    :try_start_2
+    :try_start_1
     new-instance p2, Ljava/lang/RuntimeException;
 
     invoke-direct {p2, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
 
     throw p2
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :goto_1
-    if-eqz v1, :cond_0
+    :goto_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/facebook/common/g/i;->close()V
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->close()V
 
     :cond_0
     throw p1
diff --git a/com.discord/smali/com/facebook/imagepipeline/bitmaps/c.smali b/com.discord/smali/com/facebook/imagepipeline/bitmaps/c.smali
index 36146629fc..bf970b8819 100644
--- a/com.discord/smali/com/facebook/imagepipeline/bitmaps/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/bitmaps/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/bitmaps/c;
 .super Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.source "GingerbreadBitmapFactory.java"
 
 
 # direct methods
@@ -30,7 +31,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->hf()Lcom/facebook/imagepipeline/bitmaps/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->he()Lcom/facebook/imagepipeline/bitmaps/f;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/bitmaps/d.smali b/com.discord/smali/com/facebook/imagepipeline/bitmaps/d.smali
index b29236fab7..9fff350e02 100644
--- a/com.discord/smali/com/facebook/imagepipeline/bitmaps/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/bitmaps/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/bitmaps/d;
 .super Ljava/lang/Object;
+.source "HoneycombBitmapCreator.java"
 
 # interfaces
 .implements Lcom/facebook/common/k/a;
@@ -17,7 +18,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/ac;->iJ()Lcom/facebook/imagepipeline/memory/n;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/ac;->iI()Lcom/facebook/imagepipeline/memory/n;
 
     move-result-object v0
 
@@ -63,7 +64,7 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
     sget-object v1, Lcom/facebook/c/b;->Lq:Lcom/facebook/c/c;
@@ -119,54 +120,44 @@
 
     invoke-virtual {v4, v5}, Lcom/facebook/imagepipeline/memory/n;->ap(I)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object v4
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :try_start_2
-    invoke-virtual {v4}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
-
     move-result-object p2
 
-    check-cast p2, [B
+    invoke-virtual {p2}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, [B
 
     const/4 v5, 0x0
 
-    invoke-interface {v1, v5, p2, v5, p3}, Lcom/facebook/common/g/f;->a(I[BII)I
+    invoke-interface {v1, v5, v4, v5, p3}, Lcom/facebook/common/g/f;->a(I[BII)I
 
-    invoke-static {p2, v5, p3, v2}, Landroid/graphics/BitmapFactory;->decodeByteArray([BIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
+    invoke-static {v4, v5, p3, v2}, Landroid/graphics/BitmapFactory;->decodeByteArray([BIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
-    move-result-object p2
+    move-result-object p3
 
-    invoke-virtual {p2, v3}, Landroid/graphics/Bitmap;->setHasAlpha(Z)V
+    invoke-virtual {p3, v3}, Landroid/graphics/Bitmap;->setHasAlpha(Z)V
 
-    invoke-virtual {p2, v5}, Landroid/graphics/Bitmap;->eraseColor(I)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    invoke-virtual {p3, v5}, Landroid/graphics/Bitmap;->eraseColor(I)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {v4}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    return-object p2
+    return-object p3
 
     :catchall_0
     move-exception p3
 
-    move-object p2, v4
-
     goto :goto_0
 
     :catchall_1
     move-exception p3
 
-    goto :goto_0
-
-    :catchall_2
-    move-exception p3
-
     move-object v0, p2
 
     :goto_0
diff --git a/com.discord/smali/com/facebook/imagepipeline/bitmaps/e.smali b/com.discord/smali/com/facebook/imagepipeline/bitmaps/e.smali
index fcdaa59417..7c7a145cdd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/bitmaps/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/bitmaps/e.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/bitmaps/e;
 .super Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.source "HoneycombBitmapFactory.java"
 
 
 # annotations
@@ -59,7 +60,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->hf()Lcom/facebook/imagepipeline/bitmaps/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->he()Lcom/facebook/imagepipeline/bitmaps/f;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/bitmaps/f.smali b/com.discord/smali/com/facebook/imagepipeline/bitmaps/f.smali
index 84f184d8ec..4246c3f592 100644
--- a/com.discord/smali/com/facebook/imagepipeline/bitmaps/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/bitmaps/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/bitmaps/f;
 .super Ljava/lang/Object;
+.source "SimpleBitmapReleaser.java"
 
 # interfaces
 .implements Lcom/facebook/common/references/b;
@@ -29,7 +30,7 @@
     return-void
 .end method
 
-.method public static hf()Lcom/facebook/imagepipeline/bitmaps/f;
+.method public static he()Lcom/facebook/imagepipeline/bitmaps/f;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/bitmaps/f;->MI:Lcom/facebook/imagepipeline/bitmaps/f;
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 da574e109a..20aad2efb9 100644
--- a/com.discord/smali/com/facebook/imagepipeline/c/a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/c/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/c/a$1;
 .super Lcom/facebook/imagepipeline/i/b;
+.source "AbstractProducerToDataSourceAdapter.java"
 
 
 # annotations
@@ -66,7 +67,7 @@
     return-void
 .end method
 
-.method public final ic()V
+.method public final ib()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->PV:Lcom/facebook/imagepipeline/c/a;
diff --git a/com.discord/smali/com/facebook/imagepipeline/c/a.smali b/com.discord/smali/com/facebook/imagepipeline/c/a.smali
index e2cfeee667..53376327d4 100644
--- a/com.discord/smali/com/facebook/imagepipeline/c/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/c/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/c/a;
 .super Lcom/facebook/datasource/a;
+.source "AbstractProducerToDataSourceAdapter.java"
 
 
 # annotations
@@ -87,7 +88,7 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/c/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/c/a;->ic()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/c/a;->ib()V
 
     return-void
 .end method
@@ -133,7 +134,7 @@
     return p0
 .end method
 
-.method private declared-synchronized ic()V
+.method private declared-synchronized ib()V
     .locals 1
 
     monitor-enter p0
@@ -207,10 +208,10 @@
     return-void
 .end method
 
-.method public final fE()Z
+.method public final fD()Z
     .locals 2
 
-    invoke-super {p0}, Lcom/facebook/datasource/a;->fE()Z
+    invoke-super {p0}, Lcom/facebook/datasource/a;->fD()Z
 
     move-result v0
 
@@ -237,7 +238,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->PU:Lcom/facebook/imagepipeline/i/aq;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/d;->iX()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/d;->iW()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/c/b.smali b/com.discord/smali/com/facebook/imagepipeline/c/b.smali
index 4b826aa090..63657d2fbb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/c/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/c/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/c/b;
 .super Lcom/facebook/datasource/b;
+.source "BaseBitmapDataSubscriber.java"
 
 
 # annotations
@@ -76,7 +77,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/f/b;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/b;->ig()Landroid/graphics/Bitmap;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/b;->if()Landroid/graphics/Bitmap;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/c/c.smali b/com.discord/smali/com/facebook/imagepipeline/c/c.smali
index c9910591d7..ad30327e4c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/c/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/c/c;
 .super Lcom/facebook/imagepipeline/c/a;
+.source "CloseableProducerToDataSourceAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier.smali b/com.discord/smali/com/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier.smali
index effccd8f5a..9364cfb869 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier;
 .super Ljava/lang/Object;
+.source "DefaultBitmapMemoryCacheParamsSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/MemoryCacheParams.smali b/com.discord/smali/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
index a5b1f7ae1f..3cbc58ddb3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 .super Ljava/lang/Object;
+.source "MemoryCacheParams.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/a$1.smali b/com.discord/smali/com/facebook/imagepipeline/cache/a$1.smali
index babe4336bc..f783aa68c0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/a$1;
 .super Ljava/lang/Object;
+.source "BitmapCountingMemoryCacheFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/t;
@@ -41,7 +42,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->eN()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->eM()I
 
     move-result p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/a.smali b/com.discord/smali/com/facebook/imagepipeline/cache/a.smali
index 2cd407e101..bea2343bf2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/a;
 .super Ljava/lang/Object;
+.source "BitmapCountingMemoryCacheFactory.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/b$1.smali b/com.discord/smali/com/facebook/imagepipeline/cache/b$1.smali
index cccaee93f1..85c85ac0d1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/b$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/b$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/b$1;
 .super Ljava/lang/Object;
+.source "BitmapMemoryCacheFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/p;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/b.smali b/com.discord/smali/com/facebook/imagepipeline/cache/b.smali
index f593b8312e..27d489d844 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/b.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/facebook/imagepipeline/cache/b;
 .super Ljava/lang/Object;
+.source "BitmapMemoryCacheFactory.java"
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/c.smali b/com.discord/smali/com/facebook/imagepipeline/cache/c.smali
index d8282baa7f..42a399ab39 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/c;
 .super Ljava/lang/Object;
+.source "BitmapMemoryCacheKey.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/CacheKey;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/d.smali b/com.discord/smali/com/facebook/imagepipeline/cache/d.smali
index 7471939c04..43ae802808 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/d;
 .super Ljava/lang/Object;
+.source "BitmapMemoryCacheTrimStrategy.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/h$a;
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 77a09ef658..61d8d013aa 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/e$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/e$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/e$1;
 .super Ljava/lang/Object;
+.source "BufferedDiskCache.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -48,7 +49,7 @@
     return-void
 .end method
 
-.method private hg()Lcom/facebook/imagepipeline/f/e;
+.method private hf()Lcom/facebook/imagepipeline/f/e;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -81,7 +82,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ff()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fe()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -102,7 +103,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ff()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fe()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -161,7 +162,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ff()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fe()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -233,7 +234,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/e$1;->hg()Lcom/facebook/imagepipeline/f/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/e$1;->hf()Lcom/facebook/imagepipeline/f/e;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/e$2.smali b/com.discord/smali/com/facebook/imagepipeline/cache/e$2.smali
index 29fd8fa364..6f1e7a5fcf 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/e$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/e$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/e$2;
 .super Ljava/lang/Object;
+.source "BufferedDiskCache.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/e$3.smali b/com.discord/smali/com/facebook/imagepipeline/cache/e$3.smali
index 0c21eb9022..ef266964a1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/e$3.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/e$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/e$3;
 .super Ljava/lang/Object;
+.source "BufferedDiskCache.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/e$4.smali b/com.discord/smali/com/facebook/imagepipeline/cache/e$4.smali
index c35c061268..25ed8a4fbc 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/e$4.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/e$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/e$4;
 .super Ljava/lang/Object;
+.source "BufferedDiskCache.java"
 
 # interfaces
 .implements Lcom/facebook/cache/common/h;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/e.smali b/com.discord/smali/com/facebook/imagepipeline/cache/e.smali
index 8df75b8679..0402bbf1c0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/e.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/cache/e;
 .super Ljava/lang/Object;
+.source "BufferedDiskCache.java"
 
 
 # static fields
@@ -57,7 +58,7 @@
 
     iput-object p6, p0, Lcom/facebook/imagepipeline/cache/e;->MX:Lcom/facebook/imagepipeline/cache/m;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->ho()Lcom/facebook/imagepipeline/cache/s;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->hn()Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object p1
 
@@ -172,11 +173,11 @@
 
     invoke-static {v0, p2}, La/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)La/h;
 
-    move-result-object p2
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p2
+    return-object p1
 
     :catch_0
     move-exception p2
@@ -230,7 +231,7 @@
     return-object p0
 .end method
 
-.method static synthetic ff()Ljava/lang/Class;
+.method static synthetic fe()Ljava/lang/Class;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Bp:Ljava/lang/Class;
@@ -535,11 +536,11 @@
 
     invoke-static {v0, v1}, La/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)La/h;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     move-exception v0
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/f.smali b/com.discord/smali/com/facebook/imagepipeline/cache/f.smali
index 15035d1233..2f0237ba74 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/cache/f;
 .super Ljava/lang/Object;
+.source "CacheKeyFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/g.smali b/com.discord/smali/com/facebook/imagepipeline/cache/g.smali
index 69b0b429bb..7d4a1633cf 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/g;
 .super Ljava/lang/Object;
+.source "CountingLruMap.java"
 
 
 # annotations
@@ -190,6 +191,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized contains(Ljava/lang/Object;)Z
@@ -223,7 +226,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized eN()I
+.method public final declared-synchronized eM()I
     .locals 1
 
     monitor-enter p0
@@ -305,7 +308,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized hh()Ljava/lang/Object;
+.method public final declared-synchronized hg()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/h$1.smali b/com.discord/smali/com/facebook/imagepipeline/cache/h$1.smali
index c0b3911a36..f5e2defff4 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/h$1;
 .super Ljava/lang/Object;
+.source "CountingMemoryCache.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/t;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/h$2.smali b/com.discord/smali/com/facebook/imagepipeline/cache/h$2.smali
index 64d58e8ce2..5ef2d92ef3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/h$2;
 .super Ljava/lang/Object;
+.source "CountingMemoryCache.java"
 
 # interfaces
 .implements Lcom/facebook/common/references/b;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/h$a.smali b/com.discord/smali/com/facebook/imagepipeline/cache/h$a.smali
index 755b011b63..28d2052530 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/cache/h$a;
 .super Ljava/lang/Object;
+.source "CountingMemoryCache.java"
 
 
 # annotations
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 72b2534197..06d1b89d60 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/cache/h$b;
 .super Ljava/lang/Object;
+.source "CountingMemoryCache.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/h$c.smali b/com.discord/smali/com/facebook/imagepipeline/cache/h$c.smali
index 398d50e607..af14a8cd2e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/cache/h$c;
 .super Ljava/lang/Object;
+.source "CountingMemoryCache.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/h.smali b/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
index b6cb229589..b9542476d6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/cache/h;
 .super Ljava/lang/Object;
+.source "CountingMemoryCache.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/o;
@@ -222,7 +223,7 @@
 
     if-gt p1, v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hk()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hj()I
 
     move-result v0
 
@@ -236,7 +237,7 @@
 
     if-gt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hl()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hk()I
 
     move-result v0
 
@@ -381,9 +382,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;->hi()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hh()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hj()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hi()V
 
     return-void
 
@@ -517,7 +518,6 @@
 
     const/4 p1, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return p1
@@ -525,7 +525,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return p1
 
     :catchall_0
     move-exception p1
@@ -646,8 +648,16 @@
 
     const/4 v1, 0x1
 
-    xor-int/2addr v0, v1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iput-boolean v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ns:Z
@@ -667,7 +677,7 @@
 .end method
 
 .method private declared-synchronized e(Lcom/facebook/imagepipeline/cache/h$b;)V
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -683,13 +693,23 @@
 
     iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ns:Z
 
-    xor-int/lit8 v0, v0, 0x1
+    const/4 v1, 0x1
 
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->clientCount:I
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/2addr v0, v1
 
     iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->clientCount:I
     :try_end_0
@@ -809,7 +829,7 @@
     throw p1
 .end method
 
-.method private declared-synchronized hi()V
+.method private declared-synchronized hh()V
     .locals 5
 
     monitor-enter p0
@@ -819,8 +839,6 @@
 
     sget-wide v2, Lcom/facebook/imagepipeline/cache/h;->Ng:J
 
-    const/4 v4, 0x0
-
     add-long/2addr v0, v2
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
@@ -869,7 +887,7 @@
     throw v0
 .end method
 
-.method private hj()V
+.method private hi()V
     .locals 4
 
     monitor-enter p0
@@ -883,7 +901,7 @@
 
     iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ny:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hk()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hj()I
 
     move-result v2
 
@@ -901,7 +919,7 @@
 
     iget v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Nx:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hl()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hk()I
 
     move-result v3
 
@@ -938,7 +956,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hk()I
+.method private declared-synchronized hj()I
     .locals 2
 
     monitor-enter p0
@@ -972,7 +990,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized hl()I
+.method private declared-synchronized hk()I
     .locals 2
 
     monitor-enter p0
@@ -980,13 +998,13 @@
     :try_start_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Ni:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->eN()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->eM()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Nh:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->eN()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->eM()I
 
     move-result v1
     :try_end_0
@@ -1043,7 +1061,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Nh:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->eN()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->eM()I
 
     move-result v0
     :try_end_0
@@ -1074,7 +1092,7 @@
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Nh:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->eN()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->eM()I
 
     move-result v1
     :try_end_1
@@ -1094,7 +1112,7 @@
     :try_start_2
     iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Nh:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->hh()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->hg()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1120,6 +1138,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -1176,9 +1196,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;->hi()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hh()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hj()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hi()V
 
     return-object p1
 
@@ -1315,7 +1335,7 @@
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hi()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hh()V
 
     monitor-enter p0
 
@@ -1383,7 +1403,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;->hj()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hi()V
 
     return-object v2
 
@@ -1433,9 +1453,9 @@
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/h;->b(Ljava/util/ArrayList;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hi()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hh()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hj()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hi()V
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/i.smali b/com.discord/smali/com/facebook/imagepipeline/cache/i.smali
index 0761e3e819..d4e7edfa55 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/i.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/i;
 .super Ljava/lang/Object;
+.source "DefaultCacheKeyFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/f;
@@ -24,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized hm()Lcom/facebook/imagepipeline/cache/i;
+.method public static declared-synchronized hl()Lcom/facebook/imagepipeline/cache/i;
     .locals 2
 
     const-class v0, Lcom/facebook/imagepipeline/cache/i;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/j.smali b/com.discord/smali/com/facebook/imagepipeline/cache/j.smali
index 5221fcd6fa..430caae8a8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/j.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/j;
 .super Ljava/lang/Object;
+.source "DefaultEncodedMemoryCacheParamsSupplier.java"
 
 # interfaces
 .implements Lcom/facebook/common/d/k;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/k$1.smali b/com.discord/smali/com/facebook/imagepipeline/cache/k$1.smali
index 2c14ca9c30..d7fe669369 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/k$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/k$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/k$1;
 .super Ljava/lang/Object;
+.source "EncodedCountingMemoryCacheFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/t;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/k.smali b/com.discord/smali/com/facebook/imagepipeline/cache/k.smali
index 0495ab40cf..6ad76da0b2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/k.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/k.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/facebook/imagepipeline/cache/k;
 .super Ljava/lang/Object;
+.source "EncodedCountingMemoryCacheFactory.java"
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/l$1.smali b/com.discord/smali/com/facebook/imagepipeline/cache/l$1.smali
index 3851c1a2ea..69ea2b39f5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/l$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/l$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/l$1;
 .super Ljava/lang/Object;
+.source "EncodedMemoryCacheFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/p;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/l.smali b/com.discord/smali/com/facebook/imagepipeline/cache/l.smali
index c25bf351be..b2f05299ec 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/l.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/l.smali
@@ -1,2 +1,3 @@
 .class public final Lcom/facebook/imagepipeline/cache/l;
 .super Ljava/lang/Object;
+.source "EncodedMemoryCacheFactory.java"
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/m.smali b/com.discord/smali/com/facebook/imagepipeline/cache/m.smali
index fb25f7304c..43033fe514 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/m.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/m.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/imagepipeline/cache/m;
 .super Ljava/lang/Object;
+.source "ImageCacheStatsTracker.java"
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/n.smali b/com.discord/smali/com/facebook/imagepipeline/cache/n.smali
index cc50d985fa..fe5a4e2d88 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/n.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/n;
 .super Ljava/lang/Object;
+.source "InstrumentedMemoryCache.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/o;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/o.smali b/com.discord/smali/com/facebook/imagepipeline/cache/o.smali
index 726d80b97d..5de3a25b79 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/o.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/o.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/cache/o;
 .super Ljava/lang/Object;
+.source "MemoryCache.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/p.smali b/com.discord/smali/com/facebook/imagepipeline/cache/p.smali
index e8f78f03ea..fd23c299cf 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/p.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/p.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/cache/p;
 .super Ljava/lang/Object;
+.source "MemoryCacheTracker.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/q.smali b/com.discord/smali/com/facebook/imagepipeline/cache/q.smali
index 38d11abdd8..712b62a938 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/q.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/q.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/q;
 .super Ljava/lang/Object;
+.source "NativeMemoryCacheTrimStrategy.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/h$a;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/r.smali b/com.discord/smali/com/facebook/imagepipeline/cache/r.smali
index d511341301..9eca0c1ae3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/r.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/r.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/cache/r;
 .super Ljava/lang/Object;
+.source "NoOpImageCacheStatsTracker.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/cache/m;
@@ -24,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized hn()Lcom/facebook/imagepipeline/cache/r;
+.method public static declared-synchronized hm()Lcom/facebook/imagepipeline/cache/r;
     .locals 2
 
     const-class v0, Lcom/facebook/imagepipeline/cache/r;
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/s.smali b/com.discord/smali/com/facebook/imagepipeline/cache/s.smali
index 667285469b..aa9a5a1472 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/s.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/s.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/cache/s;
 .super Ljava/lang/Object;
+.source "StagingArea.java"
 
 
 # static fields
@@ -55,7 +56,7 @@
     return-void
 .end method
 
-.method public static ho()Lcom/facebook/imagepipeline/cache/s;
+.method public static hn()Lcom/facebook/imagepipeline/cache/s;
     .locals 1
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/s;
@@ -65,7 +66,7 @@
     return-object v0
 .end method
 
-.method private declared-synchronized hp()V
+.method private declared-synchronized ho()V
     .locals 3
 
     monitor-enter p0
@@ -131,7 +132,7 @@
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->hp()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->ho()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -228,7 +229,7 @@
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->hp()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->ho()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/t.smali b/com.discord/smali/com/facebook/imagepipeline/cache/t.smali
index b0db6d4805..47b0e53190 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/t.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/t.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/cache/t;
 .super Ljava/lang/Object;
+.source "ValueDescriptor.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/a.smali b/com.discord/smali/com/facebook/imagepipeline/d/a.smali
index 57f0191c8a..3b57bf15fd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/d/a;
 .super Ljava/lang/RuntimeException;
+.source "DecodeException.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/b$1.smali b/com.discord/smali/com/facebook/imagepipeline/d/b$1.smali
index 3b9c133267..70b715f9e8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/b$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/d/b$1;
 .super Ljava/lang/Object;
+.source "DefaultImageDecoder.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/d/c;
@@ -36,7 +37,7 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
     .locals 2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/b.smali b/com.discord/smali/com/facebook/imagepipeline/d/b.smali
index d136e133ce..43ca5be567 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/d/b;
 .super Ljava/lang/Object;
+.source "DefaultImageDecoder.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/d/c;
@@ -111,7 +112,7 @@
 
     if-lt v0, v1, :cond_1
 
-    invoke-interface {p0}, Lcom/facebook/imagepipeline/l/a;->jz()Z
+    invoke-interface {p0}, Lcom/facebook/imagepipeline/l/a;->jy()Z
 
     move-result p0
 
@@ -136,7 +137,6 @@
 
     iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->NP:Lcom/facebook/imagepipeline/d/c;
 
-    :goto_0
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
 
     move-result-object p1
@@ -144,7 +144,7 @@
     return-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v0
 
@@ -170,8 +170,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/d/b;->Qa:Ljava/util/Map;
-
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
@@ -189,7 +187,11 @@
     :cond_3
     iget-object v0, p0, Lcom/facebook/imagepipeline/d/b;->PZ:Lcom/facebook/imagepipeline/d/c;
 
-    goto :goto_0
+    invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public final a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/d;
@@ -216,11 +218,11 @@
 
     sget-object v1, Lcom/facebook/imagepipeline/f/g;->Qw:Lcom/facebook/imagepipeline/f/h;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result p1
 
@@ -266,11 +268,11 @@
 
     new-instance p4, Lcom/facebook/imagepipeline/f/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result v0
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/c.smali b/com.discord/smali/com/facebook/imagepipeline/d/c.smali
index 70006c5b14..3bbff35c0e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/d/c;
 .super Ljava/lang/Object;
+.source "ImageDecoder.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/d.smali b/com.discord/smali/com/facebook/imagepipeline/d/d.smali
index 9778abfad0..e6c9967653 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/d/d;
 .super Ljava/lang/Object;
+.source "ImageDecoderConfig.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/e.smali b/com.discord/smali/com/facebook/imagepipeline/d/e.smali
index 9bec2cef12..1186e41e69 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/d/e;
 .super Ljava/lang/Object;
+.source "ProgressiveJpegConfig.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/f.smali b/com.discord/smali/com/facebook/imagepipeline/d/f.smali
index 25d68332d6..c882a1035a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/d/f;
 .super Ljava/lang/Object;
+.source "ProgressiveJpegParser.java"
 
 
 # instance fields
@@ -87,7 +88,7 @@
     :try_start_0
     iget v4, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    if-eq v4, v2, :cond_a
+    if-eq v4, v2, :cond_b
 
     invoke-virtual {p1}, Ljava/io/InputStream;->read()I
 
@@ -95,7 +96,7 @@
 
     const/4 v5, -0x1
 
-    if-eq v4, v5, :cond_a
+    if-eq v4, v5, :cond_b
 
     iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Qg:I
 
@@ -128,7 +129,7 @@
 
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    goto :goto_4
+    goto/16 :goto_2
 
     :pswitch_0
     iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Qf:I
@@ -149,36 +150,35 @@
 
     iput v6, p0, Lcom/facebook/imagepipeline/d/f;->Qg:I
 
-    :cond_1
-    :goto_1
     iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    goto :goto_4
+    goto :goto_2
 
     :pswitch_1
     const/4 v5, 0x5
 
     iput v5, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    goto :goto_4
+    goto :goto_2
 
     :pswitch_2
-    if-ne v4, v8, :cond_2
+    if-ne v4, v8, :cond_1
 
-    :goto_2
     iput v6, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    goto :goto_4
+    goto :goto_2
+
+    :cond_1
+    if-nez v4, :cond_2
+
+    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
+
+    goto :goto_2
 
     :cond_2
-    if-nez v4, :cond_3
-
-    goto :goto_1
-
-    :cond_3
     const/16 v5, 0xd9
 
-    if-ne v4, v5, :cond_4
+    if-ne v4, v5, :cond_3
 
     iput-boolean v3, p0, Lcom/facebook/imagepipeline/d/f;->Qk:Z
 
@@ -188,12 +188,14 @@
 
     invoke-direct {p0, v5}, Lcom/facebook/imagepipeline/d/f;->ab(I)V
 
-    goto :goto_1
+    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    :cond_4
+    goto :goto_2
+
+    :cond_3
     const/16 v6, 0xda
 
-    if-ne v4, v6, :cond_5
+    if-ne v4, v6, :cond_4
 
     iget v6, p0, Lcom/facebook/imagepipeline/d/f;->Qg:I
 
@@ -201,60 +203,74 @@
 
     invoke-direct {p0, v6}, Lcom/facebook/imagepipeline/d/f;->ab(I)V
 
-    :cond_5
-    if-eq v4, v3, :cond_7
+    :cond_4
+    if-eq v4, v3, :cond_6
 
     const/16 v6, 0xd0
 
-    if-lt v4, v6, :cond_6
+    if-lt v4, v6, :cond_5
 
     const/16 v6, 0xd7
 
-    if-le v4, v6, :cond_7
+    if-le v4, v6, :cond_6
 
-    :cond_6
-    if-eq v4, v5, :cond_7
+    :cond_5
+    if-eq v4, v5, :cond_6
 
-    if-eq v4, v7, :cond_7
+    if-eq v4, v7, :cond_6
 
     const/4 v5, 0x1
 
-    goto :goto_3
+    goto :goto_1
 
-    :cond_7
+    :cond_6
     const/4 v5, 0x0
 
-    :goto_3
-    if-eqz v5, :cond_1
+    :goto_1
+    if-eqz v5, :cond_7
 
     const/4 v5, 0x4
 
     iput v5, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    goto :goto_4
+    goto :goto_2
+
+    :cond_7
+    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
+
+    goto :goto_2
 
     :pswitch_3
-    if-ne v4, v8, :cond_9
+    if-ne v4, v8, :cond_a
+
+    iput v6, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
     goto :goto_2
 
     :pswitch_4
     if-ne v4, v7, :cond_8
 
-    goto :goto_1
+    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
+
+    goto :goto_2
 
     :cond_8
     iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    goto :goto_4
+    goto :goto_2
 
     :pswitch_5
-    if-ne v4, v8, :cond_8
+    if-ne v4, v8, :cond_9
 
     iput v3, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
+    goto :goto_2
+
     :cond_9
-    :goto_4
+    iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
+
+    :cond_a
+    :goto_2
     iput v4, p0, Lcom/facebook/imagepipeline/d/f;->Qf:I
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
@@ -266,20 +282,22 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/m;->c(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
 
-    :cond_a
+    :cond_b
     iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Qe:I
 
-    if-eq p1, v2, :cond_b
+    if-eq p1, v2, :cond_c
 
     iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Qi:I
 
-    if-eq p1, v0, :cond_b
+    if-eq p1, v0, :cond_c
 
     return v3
 
-    :cond_b
+    :cond_c
     return v1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_5
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/g$a.smali b/com.discord/smali/com/facebook/imagepipeline/d/g$a.smali
index 55e7f47baa..ce072aa21e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/g$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/d/g$a;
 .super Ljava/lang/Object;
+.source "SimpleProgressiveJpegConfig.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/d/g$b;
@@ -35,7 +36,7 @@
 
 
 # virtual methods
-.method public final ie()Ljava/util/List;
+.method public final ic()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/g$b.smali b/com.discord/smali/com/facebook/imagepipeline/d/g$b.smali
index da838c2dcc..d3defc196f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/g$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/g$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/d/g$b;
 .super Ljava/lang/Object;
+.source "SimpleProgressiveJpegConfig.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract ie()Ljava/util/List;
+.method public abstract ic()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/g.smali b/com.discord/smali/com/facebook/imagepipeline/d/g.smali
index ef4c0e6e08..b81593f34f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/d/g;
 .super Ljava/lang/Object;
+.source "SimpleProgressiveJpegConfig.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/d/e;
@@ -56,7 +57,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/d/g;->Ql:Lcom/facebook/imagepipeline/d/g$b;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/d/g$b;->ie()Ljava/util/List;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/d/g$b;->ic()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/e/a.smali b/com.discord/smali/com/facebook/imagepipeline/e/a.smali
index 26e90406fb..bead7a054b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/e/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/e/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/e/a;
 .super Ljava/lang/Object;
+.source "DrawableFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/a.smali b/com.discord/smali/com/facebook/imagepipeline/f/a.smali
index 834b7abc5a..e7852b4086 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/f/a;
 .super Lcom/facebook/imagepipeline/f/c;
+.source "CloseableAnimatedImage.java"
 
 
 # instance fields
@@ -59,7 +60,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized eN()I
+.method public final declared-synchronized eM()I
     .locals 1
 
     monitor-enter p0
@@ -85,7 +86,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->LU:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->eN()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->eM()I
 
     move-result v0
     :try_end_1
@@ -191,7 +192,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized if()Lcom/facebook/imagepipeline/animated/a/e;
+.method public final declared-synchronized ie()Lcom/facebook/imagepipeline/animated/a/e;
     .locals 1
 
     monitor-enter p0
@@ -243,6 +244,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final isStateful()Z
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/b.smali b/com.discord/smali/com/facebook/imagepipeline/f/b.smali
index f87a7e5149..27e85b2eb4 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/f/b;
 .super Lcom/facebook/imagepipeline/f/c;
+.source "CloseableBitmap.java"
 
 
 # direct methods
@@ -13,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract ig()Landroid/graphics/Bitmap;
+.method public abstract if()Landroid/graphics/Bitmap;
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/c.smali b/com.discord/smali/com/facebook/imagepipeline/f/c.smali
index 92298ecc6d..203647e6bb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/f/c;
 .super Ljava/lang/Object;
+.source "CloseableImage.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/f/f;
@@ -20,7 +21,7 @@
 .method public abstract close()V
 .end method
 
-.method public abstract eN()I
+.method public abstract eM()I
 .end method
 
 .method protected finalize()V
@@ -91,7 +92,7 @@
     throw v0
 .end method
 
-.method public ih()Lcom/facebook/imagepipeline/f/h;
+.method public ig()Lcom/facebook/imagepipeline/f/h;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/f/g;->Qw:Lcom/facebook/imagepipeline/f/h;
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/d.smali b/com.discord/smali/com/facebook/imagepipeline/f/d.smali
index edb1349f01..799668aa75 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/f/d;
 .super Lcom/facebook/imagepipeline/f/b;
+.source "CloseableStaticBitmap.java"
 
 
 # annotations
@@ -137,7 +138,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/f/b;-><init>()V
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fr()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fq()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
@@ -210,7 +211,7 @@
     return p0
 .end method
 
-.method private declared-synchronized ii()Lcom/facebook/common/references/CloseableReference;
+.method private declared-synchronized ih()Lcom/facebook/common/references/CloseableReference;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -251,7 +252,7 @@
 .method public final close()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/d;->ii()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/d;->ih()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -263,7 +264,7 @@
     return-void
 .end method
 
-.method public final eN()I
+.method public final eM()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->mBitmap:Landroid/graphics/Bitmap;
@@ -290,8 +291,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->HR:I
-
     const/4 v1, 0x7
 
     if-ne v0, v1, :cond_0
@@ -333,8 +332,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->HR:I
-
     const/4 v1, 0x7
 
     if-ne v0, v1, :cond_0
@@ -361,7 +358,7 @@
     return v0
 .end method
 
-.method public final ig()Landroid/graphics/Bitmap;
+.method public final if()Landroid/graphics/Bitmap;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->mBitmap:Landroid/graphics/Bitmap;
@@ -369,7 +366,7 @@
     return-object v0
 .end method
 
-.method public final ih()Lcom/facebook/imagepipeline/f/h;
+.method public final ig()Lcom/facebook/imagepipeline/f/h;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->Qo:Lcom/facebook/imagepipeline/f/h;
@@ -377,7 +374,7 @@
     return-object v0
 .end method
 
-.method public final declared-synchronized ij()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized ii()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -444,4 +441,6 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/e.smali b/com.discord/smali/com/facebook/imagepipeline/f/e.smali
index 57659a0d6c..d4d9f237a1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/f/e;
 .super Ljava/lang/Object;
+.source "EncodedImage.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -168,7 +169,7 @@
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fq()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fp()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
@@ -186,7 +187,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/imagepipeline/f/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ij()Lcom/facebook/imagepipeline/f/e;
 
     move-result-object p0
 
@@ -268,27 +269,25 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->io()V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Qv:Landroid/graphics/ColorSpace;
 
     return-object v0
 .end method
 
-.method private ik()Lcom/facebook/imagepipeline/f/e;
+.method private ij()Lcom/facebook/imagepipeline/f/e;
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Qq:Lcom/facebook/common/d/k;
 
     if-eqz v0, :cond_0
 
-    new-instance v0, Lcom/facebook/imagepipeline/f/e;
-
-    iget-object v1, p0, Lcom/facebook/imagepipeline/f/e;->Qq:Lcom/facebook/common/d/k;
+    new-instance v1, Lcom/facebook/imagepipeline/f/e;
 
     iget v2, p0, Lcom/facebook/imagepipeline/f/e;->Qt:I
 
-    invoke-direct {v0, v1, v2}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/d/k;I)V
+    invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/d/k;I)V
 
     goto :goto_1
 
@@ -316,15 +315,13 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    move-object v0, v1
-
     :goto_1
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-virtual {v0, p0}, Lcom/facebook/imagepipeline/f/e;->c(Lcom/facebook/imagepipeline/f/e;)V
+    invoke-virtual {v1, p0}, Lcom/facebook/imagepipeline/f/e;->c(Lcom/facebook/imagepipeline/f/e;)V
 
     :cond_2
-    return-object v0
+    return-object v1
 
     :catchall_0
     move-exception v1
@@ -334,7 +331,7 @@
     throw v1
 .end method
 
-.method private ip()V
+.method private io()V
     .locals 1
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->mWidth:I
@@ -346,13 +343,13 @@
     if-gez v0, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iq()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->ip()V
 
     :cond_1
     return-void
 .end method
 
-.method private ir()Landroid/util/Pair;
+.method private iq()Landroid/util/Pair;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -398,7 +395,7 @@
     return-object v0
 .end method
 
-.method private is()Lcom/facebook/imageutils/b;
+.method private ir()Lcom/facebook/imageutils/b;
     .locals 4
 
     :try_start_0
@@ -483,7 +480,7 @@
 .method public final c(Lcom/facebook/imagepipeline/f/e;)V
     .locals 1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v0
 
@@ -501,13 +498,13 @@
 
     iput v0, p0, Lcom/facebook/imagepipeline/f/e;->mHeight:I
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result v0
 
     iput v0, p0, Lcom/facebook/imagepipeline/f/e;->HQ:I
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result v0
 
@@ -549,7 +546,7 @@
 .method public final getHeight()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->io()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->mHeight:I
 
@@ -563,8 +560,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Qq:Lcom/facebook/common/d/k;
-
     invoke-interface {v0}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
     move-result-object v0
@@ -619,8 +614,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Qp:Lcom/facebook/common/references/CloseableReference;
-
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
     move-result-object v0
@@ -650,44 +643,44 @@
 .method public final getWidth()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->io()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->mWidth:I
 
     return v0
 .end method
 
-.method public final il()Lcom/facebook/c/c;
+.method public final ik()Lcom/facebook/c/c;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->io()V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Qr:Lcom/facebook/c/c;
 
     return-object v0
 .end method
 
-.method public final im()I
+.method public final il()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->io()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->HQ:I
 
     return v0
 .end method
 
-.method public final in()I
+.method public final im()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->io()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->HR:I
 
     return v0
 .end method
 
-.method public final io()Ljava/lang/String;
+.method public final in()Ljava/lang/String;
     .locals 8
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Qp:Lcom/facebook/common/references/CloseableReference;
@@ -790,9 +783,11 @@
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->close()V
 
     throw v1
+
+    return-void
 .end method
 
-.method public final iq()V
+.method public final ip()V
     .locals 4
 
     invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->getInputStream()Ljava/io/InputStream;
@@ -811,14 +806,14 @@
 
     if-eqz v1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ir()Landroid/util/Pair;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iq()Landroid/util/Pair;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->is()Lcom/facebook/imageutils/b;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->ir()Lcom/facebook/imageutils/b;
 
     move-result-object v1
 
@@ -845,7 +840,6 @@
 
     move-result v0
 
-    :goto_1
     iput v0, p0, Lcom/facebook/imagepipeline/f/e;->HR:I
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->HR:I
@@ -875,7 +869,17 @@
 
     move-result v0
 
-    goto :goto_1
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->HR:I
+
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->HR:I
+
+    invoke-static {v0}, Lcom/facebook/imageutils/e;->aB(I)I
+
+    move-result v0
+
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->HQ:I
+
+    return-void
 
     :cond_2
     const/4 v0, 0x0
@@ -928,4 +932,6 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/f.smali b/com.discord/smali/com/facebook/imagepipeline/f/f.smali
index a2bbaa206a..abd6288c90 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/f/f;
 .super Ljava/lang/Object;
+.source "ImageInfo.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/g.smali b/com.discord/smali/com/facebook/imagepipeline/f/g.smali
index 530bbcd7ed..30996d8318 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/f/g;
 .super Ljava/lang/Object;
+.source "ImmutableQualityInfo.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/f/h;
@@ -146,7 +147,7 @@
     return v0
 .end method
 
-.method public final it()Z
+.method public final is()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/imagepipeline/f/g;->Qy:Z
@@ -154,7 +155,7 @@
     return v0
 .end method
 
-.method public final iu()Z
+.method public final it()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/imagepipeline/f/g;->Qz:Z
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/h.smali b/com.discord/smali/com/facebook/imagepipeline/f/h.smali
index 680b213b94..36ab259756 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/h.smali
@@ -1,13 +1,14 @@
 .class public interface abstract Lcom/facebook/imagepipeline/f/h;
 .super Ljava/lang/Object;
+.source "QualityInfo.java"
 
 
 # virtual methods
 .method public abstract getQuality()I
 .end method
 
-.method public abstract it()Z
+.method public abstract is()Z
 .end method
 
-.method public abstract iu()Z
+.method public abstract it()Z
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/a.smali b/com.discord/smali/com/facebook/imagepipeline/g/a.smali
index 0a7f8625bb..e510ded438 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/g/a;
 .super Ljava/lang/Object;
+.source "BaseRequestListener.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/g/c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/b.smali b/com.discord/smali/com/facebook/imagepipeline/g/b.smali
index 69bb85b0b0..c2a3c75ddb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/g/b;
 .super Ljava/lang/Object;
+.source "ForwardingRequestListener.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/g/c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/c.smali b/com.discord/smali/com/facebook/imagepipeline/g/c.smali
index 5063098fbe..4ad3e81865 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/g/c;
 .super Ljava/lang/Object;
+.source "RequestListener.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/an;
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/a.smali b/com.discord/smali/com/facebook/imagepipeline/h/a.smali
index d9a0e09ae1..965ab39de2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/h/a;
 .super Lcom/facebook/imagepipeline/h/b;
+.source "ArtDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/b.smali b/com.discord/smali/com/facebook/imagepipeline/h/b.smali
index 4b801ef329..41cc3a0a38 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/h/b;
 .super Ljava/lang/Object;
+.source "DefaultDecoder.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/h/f;
@@ -279,7 +280,7 @@
     :try_start_2
     invoke-virtual {v0, p3, p2}, Landroid/graphics/BitmapRegionDecoder;->decodeRegion(Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
-    move-result-object v1
+    move-result-object p3
     :try_end_2
     .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
@@ -341,15 +342,15 @@
 
     :cond_4
     :goto_1
-    move-object v1, v3
+    move-object p3, v3
 
     :cond_5
     :goto_2
-    if-nez v1, :cond_6
+    if-nez p3, :cond_6
 
     invoke-static {p1, v3, p2}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
-    move-result-object v1
+    move-result-object p3
     :try_end_5
     .catch Ljava/lang/IllegalArgumentException; {:try_start_5 .. :try_end_5} :catch_3
     .catch Ljava/lang/RuntimeException; {:try_start_5 .. :try_end_5} :catch_2
@@ -360,11 +361,11 @@
 
     invoke-virtual {p1, p4}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
-    if-ne v2, v1, :cond_7
+    if-ne v2, p3, :cond_7
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/h/b;->MA:Lcom/facebook/imagepipeline/memory/d;
 
-    invoke-static {v1, p1}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
+    invoke-static {p3, p1}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
@@ -375,7 +376,7 @@
 
     invoke-interface {p1, v2}, Lcom/facebook/imagepipeline/memory/d;->w(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Landroid/graphics/Bitmap;->recycle()V
+    invoke-virtual {p3}, Landroid/graphics/Bitmap;->recycle()V
 
     new-instance p1, Ljava/lang/IllegalStateException;
 
@@ -416,7 +417,7 @@
 
     if-eqz p1, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->hf()Lcom/facebook/imagepipeline/bitmaps/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->he()Lcom/facebook/imagepipeline/bitmaps/f;
 
     move-result-object p3
 
@@ -531,16 +532,17 @@
 
     if-eq p3, v0, :cond_0
 
-    :goto_1
     const/4 p3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->Qq:Lcom/facebook/common/d/k;
 
     if-eqz p3, :cond_1
 
+    const/4 p3, 0x1
+
     goto :goto_1
 
     :cond_1
@@ -576,12 +578,14 @@
 
     if-ne p3, v0, :cond_2
 
+    const/4 p3, 0x1
+
     goto :goto_1
 
     :cond_2
     const/4 p3, 0x0
 
-    :goto_2
+    :goto_1
     invoke-static {p1, p2}, Lcom/facebook/imagepipeline/h/b;->a(Lcom/facebook/imagepipeline/f/e;Landroid/graphics/Bitmap$Config;)Landroid/graphics/BitmapFactory$Options;
 
     move-result-object p2
@@ -613,12 +617,12 @@
 
     invoke-direct {p3, v0, v3}, Lcom/facebook/common/i/b;-><init>(Ljava/io/InputStream;[B)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     move-object p3, v0
 
-    :goto_3
+    :goto_2
     iget-object v0, p2, Landroid/graphics/BitmapFactory$Options;->inPreferredConfig:Landroid/graphics/Bitmap$Config;
 
     sget-object v3, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
@@ -633,11 +637,11 @@
     :try_start_0
     invoke-direct {p0, p3, p2, v0, p5}, Lcom/facebook/imagepipeline/h/b;->a(Ljava/io/InputStream;Landroid/graphics/BitmapFactory$Options;Landroid/graphics/Rect;Z)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p2
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p2
+    return-object p1
 
     :catch_0
     move-exception p2
@@ -650,6 +654,8 @@
 
     :cond_6
     throw p2
+
+    return-void
 .end method
 
 .method public final a(Lcom/facebook/imagepipeline/f/e;Landroid/graphics/Bitmap$Config;Landroid/graphics/Rect;Z)Lcom/facebook/common/references/CloseableReference;
@@ -699,11 +705,11 @@
 
     invoke-direct {p0, v0, p2, v1, p4}, Lcom/facebook/imagepipeline/h/b;->a(Ljava/io/InputStream;Landroid/graphics/BitmapFactory$Options;Landroid/graphics/Rect;Z)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object p2
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p2
+    return-object p1
 
     :catch_0
     move-exception p2
@@ -716,4 +722,6 @@
 
     :cond_1
     throw p2
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/c.smali b/com.discord/smali/com/facebook/imagepipeline/h/c.smali
index 229a2522bb..e78396931b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/h/c;
 .super Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;
+.source "GingerbreadPurgeableDecoder.java"
 
 
 # static fields
@@ -19,7 +20,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;-><init>()V
 
-    invoke-static {}, Lcom/facebook/common/k/c;->fA()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->fz()Lcom/facebook/common/k/b;
 
     move-result-object v0
 
@@ -47,93 +48,74 @@
     :try_start_0
     invoke-static {p1, p2, p3}, Lcom/facebook/imagepipeline/h/c;->a(Lcom/facebook/common/references/CloseableReference;I[B)Landroid/os/MemoryFile;
 
+    move-result-object v0
+
+    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/h/c;->a(Landroid/os/MemoryFile;)Ljava/io/FileDescriptor;
+
     move-result-object p1
+
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/c;->Pg:Lcom/facebook/common/k/b;
+
+    if-eqz p2, :cond_0
+
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/c;->Pg: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;
+
+    move-result-object p1
+
+    const-string p2, "BitmapFactory returned null"
+
+    invoke-static {p1, p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/graphics/Bitmap;
     :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    invoke-virtual {v0}, Landroid/os/MemoryFile;->close()V
+
+    return-object p1
+
+    :cond_0
     :try_start_1
-    invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/c;->a(Landroid/os/MemoryFile;)Ljava/io/FileDescriptor;
+    new-instance p1, Ljava/lang/IllegalStateException;
 
-    move-result-object p2
+    const-string p2, "WebpBitmapFactory is null"
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/h/c;->Pg:Lcom/facebook/common/k/b;
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
-
-    iget-object p3, p0, Lcom/facebook/imagepipeline/h/c;->Pg:Lcom/facebook/common/k/b;
-
-    invoke-interface {p3, p2, p4}, Lcom/facebook/common/k/b;->a(Ljava/io/FileDescriptor;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
-
-    move-result-object p2
-
-    const-string p3, "BitmapFactory returned null"
-
-    invoke-static {p2, p3}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Landroid/graphics/Bitmap;
+    throw p1
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual {p1}, Landroid/os/MemoryFile;->close()V
-
-    return-object p2
-
-    :cond_0
-    :try_start_2
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    const-string p3, "WebpBitmapFactory is null"
-
-    invoke-direct {p2, p3}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
     :catchall_0
-    move-exception p2
-
-    goto :goto_1
-
-    :catch_0
-    move-exception p2
-
-    move-object v0, p1
+    move-exception p1
 
     goto :goto_0
 
-    :catchall_1
-    move-exception p2
+    :catch_0
+    move-exception p1
 
-    move-object p1, v0
-
-    goto :goto_1
-
-    :catch_1
-    move-exception p2
-
-    :goto_0
-    :try_start_3
-    invoke-static {p2}, Lcom/facebook/common/d/m;->c(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+    :try_start_2
+    invoke-static {p1}, Lcom/facebook/common/d/m;->c(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
 
     move-result-object p1
 
     throw p1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    :goto_1
-    if-eqz p1, :cond_1
+    :goto_0
+    if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Landroid/os/MemoryFile;->close()V
+    invoke-virtual {v0}, Landroid/os/MemoryFile;->close()V
 
     :cond_1
-    throw p2
+    throw p1
 .end method
 
 .method private static a(Lcom/facebook/common/references/CloseableReference;I[B)Landroid/os/MemoryFile;
@@ -191,32 +173,29 @@
 
     invoke-direct {v1, v4}, Lcom/facebook/common/g/h;-><init>(Lcom/facebook/common/g/f;)V
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_3
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
     new-instance v4, Lcom/facebook/common/i/a;
 
     invoke-direct {v4, v1, p1}, Lcom/facebook/common/i/a;-><init>(Ljava/io/InputStream;I)V
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
     invoke-virtual {v2}, Landroid/os/MemoryFile;->getOutputStream()Ljava/io/OutputStream;
 
-    move-result-object v5
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    move-result-object v3
 
-    :try_start_3
-    invoke-static {v4, v5}, Lcom/facebook/common/d/a;->a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
+    invoke-static {v4, v3}, Lcom/facebook/common/d/a;->a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
 
     if-eqz p2, :cond_1
 
-    array-length v3, p2
+    array-length v5, p2
 
-    invoke-virtual {v2, p2, v0, p1, v3}, Landroid/os/MemoryFile;->writeBytes([BIII)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    invoke-virtual {v2, p2, v0, p1, v5}, Landroid/os/MemoryFile;->writeBytes([BIII)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :cond_1
     invoke-static {p0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
@@ -225,47 +204,41 @@
 
     invoke-static {v4}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
 
-    invoke-static {v5}, Lcom/facebook/common/d/b;->a(Ljava/io/Closeable;)V
+    invoke-static {v3}, Lcom/facebook/common/d/b;->a(Ljava/io/Closeable;)V
 
     return-object v2
 
     :catchall_0
     move-exception p1
 
+    move-object p2, v3
+
+    move-object v3, v4
+
     goto :goto_1
 
     :catchall_1
     move-exception p1
 
-    move-object v5, v3
+    move-object p2, v3
 
-    :goto_1
-    move-object v3, v4
-
-    goto :goto_2
+    goto :goto_1
 
     :catchall_2
     move-exception p1
 
-    move-object v5, v3
+    move-object p2, v3
 
-    goto :goto_2
+    move-object v1, p2
 
-    :catchall_3
-    move-exception p1
-
-    move-object v1, v3
-
-    move-object v5, v1
-
-    :goto_2
+    :goto_1
     invoke-static {p0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     invoke-static {v1}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
 
     invoke-static {v3}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
 
-    invoke-static {v5}, Lcom/facebook/common/d/b;->a(Ljava/io/Closeable;)V
+    invoke-static {p2}, Lcom/facebook/common/d/b;->a(Ljava/io/Closeable;)V
 
     throw p1
 .end method
@@ -274,7 +247,7 @@
     .locals 2
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/c;->iQ()Ljava/lang/reflect/Method;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/c;->iP()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
@@ -302,7 +275,7 @@
     throw p1
 .end method
 
-.method private declared-synchronized iQ()Ljava/lang/reflect/Method;
+.method private declared-synchronized iP()Ljava/lang/reflect/Method;
     .locals 3
 
     monitor-enter p0
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/d.smali b/com.discord/smali/com/facebook/imagepipeline/h/d.smali
index aef70d3318..fa3f1558e3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/h/d;
 .super Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;
+.source "KitKatPurgeableDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/e.smali b/com.discord/smali/com/facebook/imagepipeline/h/e.smali
index 13d1800229..1735482735 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/h/e;
 .super Lcom/facebook/imagepipeline/h/b;
+.source "OreoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/f.smali b/com.discord/smali/com/facebook/imagepipeline/h/f.smali
index 2b6cd111d7..6c244f9628 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/h/f;
 .super Ljava/lang/Object;
+.source "PlatformDecoder.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/a$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/a$a.smali
index 5e04c055f4..f944e421ff 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/a$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/a$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "AddImageTransformMetaDataProducer.java"
 
 
 # annotations
@@ -71,7 +72,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iq()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ip()V
 
     :cond_1
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/a.smali b/com.discord/smali/com/facebook/imagepipeline/i/a.smali
index dc801ef378..13c2541272 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/a;
 .super Ljava/lang/Object;
+.source "AddImageTransformMetaDataProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aa$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/aa$1.smali
index 8ed48fca02..5000cb17cd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aa$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aa$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aa$1;
 .super Lcom/facebook/imagepipeline/i/ar;
+.source "LocalFetchProducer.java"
 
 
 # annotations
@@ -74,7 +75,7 @@
 
     iget-object v2, p0, Lcom/facebook/imagepipeline/i/aa$1;->Tl:Lcom/facebook/imagepipeline/i/aa;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/aa;->jc()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/aa;->jb()Ljava/lang/String;
 
     move-result-object v2
 
@@ -87,7 +88,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/e;->iq()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/e;->ip()V
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/i/aa$1;->Sz:Lcom/facebook/imagepipeline/i/an;
 
@@ -95,7 +96,7 @@
 
     iget-object v3, p0, Lcom/facebook/imagepipeline/i/aa$1;->Tl:Lcom/facebook/imagepipeline/i/aa;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/aa;->jc()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/aa;->jb()Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aa$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/aa$2.smali
index 25d3f42f43..d1d86d231a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aa$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aa$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aa$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "LocalFetchProducer.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/aa$2;->Tk:Lcom/facebook/imagepipeline/i/ar;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aa.smali b/com.discord/smali/com/facebook/imagepipeline/i/aa.smali
index 0b58e152d0..35e6c662da 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aa.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aa.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/i/aa;
 .super Ljava/lang/Object;
+.source "LocalFetchProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -50,7 +51,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v7
 
@@ -58,13 +59,13 @@
 
     move-result-object v8
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
     new-instance v9, Lcom/facebook/imagepipeline/i/aa$1;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aa;->jc()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aa;->jb()Ljava/lang/String;
 
     move-result-object v4
 
@@ -120,19 +121,13 @@
 
     move-result-object p2
 
-    :goto_0
     invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->b(Ljava/io/Closeable;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p2
 
     move-object v0, p2
 
-    goto :goto_1
-
-    :catchall_0
-    move-exception p2
-
-    goto :goto_2
+    goto :goto_0
 
     :cond_0
     iget-object v1, p0, Lcom/facebook/imagepipeline/i/aa;->MD:Lcom/facebook/common/g/g;
@@ -141,9 +136,13 @@
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->b(Ljava/io/Closeable;)Lcom/facebook/common/references/CloseableReference;
 
-    :goto_1
+    move-result-object p2
+
+    move-object v0, p2
+
+    :goto_0
     new-instance p2, Lcom/facebook/imagepipeline/f/e;
 
     invoke-direct {p2, v0}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
@@ -156,7 +155,9 @@
 
     return-object p2
 
-    :goto_2
+    :catchall_0
+    move-exception p2
+
     invoke-static {p1}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
@@ -179,5 +180,5 @@
     return-object p1
 .end method
 
-.method protected abstract jc()Ljava/lang/String;
+.method protected abstract jb()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ab.smali b/com.discord/smali/com/facebook/imagepipeline/i/ab.smali
index 1f2170e40c..068a074890 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ab.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ab.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ab;
 .super Lcom/facebook/imagepipeline/i/aa;
+.source "LocalFileFetchProducer.java"
 
 
 # direct methods
@@ -23,7 +24,7 @@
 
     new-instance v0, Ljava/io/FileInputStream;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jw()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jv()Ljava/io/File;
 
     move-result-object v1
 
@@ -33,7 +34,7 @@
 
     invoke-direct {v0, v1}, Ljava/io/FileInputStream;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jw()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jv()Ljava/io/File;
 
     move-result-object p1
 
@@ -50,7 +51,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalFileFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ac.smali b/com.discord/smali/com/facebook/imagepipeline/i/ac.smali
index 0e08a74288..3384f66e8b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ac.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ac.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ac;
 .super Lcom/facebook/imagepipeline/i/aa;
+.source "LocalResourceFetchProducer.java"
 
 
 # instance fields
@@ -31,70 +32,51 @@
 
     invoke-virtual {v1, p1}, Landroid/content/res/Resources;->openRawResourceFd(I)Landroid/content/res/AssetFileDescriptor;
 
-    move-result-object p1
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->getLength()J
+
+    move-result-wide v1
     :try_end_0
     .catch Landroid/content/res/Resources$NotFoundException; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    long-to-int p1, v1
+
+    if-eqz v0, :cond_0
 
     :try_start_1
-    invoke-virtual {p1}, Landroid/content/res/AssetFileDescriptor;->getLength()J
-
-    move-result-wide v0
+    invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->close()V
     :try_end_1
-    .catch Landroid/content/res/Resources$NotFoundException; {:try_start_1 .. :try_end_1} :catch_3
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    long-to-int v0, v0
-
-    if-eqz p1, :cond_0
-
-    :try_start_2
-    invoke-virtual {p1}, Landroid/content/res/AssetFileDescriptor;->close()V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
     :catch_0
     :cond_0
-    return v0
+    return p1
 
     :catchall_0
-    move-exception v0
-
-    move-object v2, v0
-
-    move-object v0, p1
-
-    move-object p1, v2
-
-    goto :goto_0
-
-    :catchall_1
     move-exception p1
 
-    :goto_0
     if-eqz v0, :cond_1
 
-    :try_start_3
+    :try_start_2
     invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->close()V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_1
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
 
     :catch_1
     :cond_1
     throw p1
 
     :catch_2
-    move-object p1, v0
+    if-eqz v0, :cond_2
+
+    :try_start_3
+    invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->close()V
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_3
 
     :catch_3
-    if-eqz p1, :cond_2
-
-    :try_start_4
-    invoke-virtual {p1}, Landroid/content/res/AssetFileDescriptor;->close()V
-    :try_end_4
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_4
-
-    :catch_4
     :cond_2
     const/4 p1, -0x1
 
@@ -154,7 +136,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalResourceFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ad$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/ad$1.smali
index 4f8f1459a0..2f348941e8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ad$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ad$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ad$1;
 .super Lcom/facebook/imagepipeline/i/ar;
+.source "LocalVideoThumbnailProducer.java"
 
 
 # annotations
@@ -158,7 +159,7 @@
     :cond_5
     new-instance v1, Lcom/facebook/imagepipeline/f/d;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->hf()Lcom/facebook/imagepipeline/bitmaps/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/f;->he()Lcom/facebook/imagepipeline/bitmaps/f;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ad$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/ad$2.smali
index 31dbac14f4..3f41cc70a6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ad$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ad$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ad$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "LocalVideoThumbnailProducer.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$2;->Tk:Lcom/facebook/imagepipeline/i/ar;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ad.smali b/com.discord/smali/com/facebook/imagepipeline/i/ad.smali
index 0254324cff..af7fe733ab 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ad.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ad.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ad;
 .super Ljava/lang/Object;
+.source "LocalVideoThumbnailProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -52,7 +53,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v6
 
@@ -60,7 +61,7 @@
 
     move-result-object v7
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v8
 
@@ -106,7 +107,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jw()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jv()Ljava/io/File;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ae$a$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/ae$a$1.smali
index 35a20e4739..6cb6a4169a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ae$a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ae$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ae$a$1;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "MultiplexProducer.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 7
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
@@ -72,24 +73,26 @@
 
     move-object v4, v2
 
+    move-object v5, v4
+
     goto :goto_0
 
     :cond_0
     iget-object v3, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ae$a;->jl()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ae$a;->jk()Ljava/util/List;
 
     move-result-object v3
 
     iget-object v4, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/i/ae$a;->jp()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/i/ae$a;->jo()Ljava/util/List;
 
     move-result-object v4
 
     iget-object v5, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
 
-    invoke-virtual {v5}, Lcom/facebook/imagepipeline/i/ae$a;->jn()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/facebook/imagepipeline/i/ae$a;->jm()Ljava/util/List;
 
     move-result-object v5
 
@@ -99,17 +102,16 @@
 
     move-object v2, v6
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     move-object v3, v2
 
     move-object v4, v3
 
-    :goto_0
     move-object v5, v4
 
-    :goto_1
+    :goto_0
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -122,7 +124,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/d;->iX()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/d;->iW()Ljava/util/List;
 
     move-result-object v0
 
@@ -137,7 +139,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     :cond_3
     return-void
@@ -153,16 +155,30 @@
     throw v1
 .end method
 
+.method public final iY()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
+
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jk()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/facebook/imagepipeline/i/d;->k(Ljava/util/List;)V
+
+    return-void
+.end method
+
 .method public final iZ()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jl()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jm()Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/imagepipeline/i/d;->k(Ljava/util/List;)V
+    invoke-static {v0}, Lcom/facebook/imagepipeline/i/d;->l(Ljava/util/List;)V
 
     return-void
 .end method
@@ -172,21 +188,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jn()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lcom/facebook/imagepipeline/i/d;->l(Ljava/util/List;)V
-
-    return-void
-.end method
-
-.method public final jb()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a$1;->Tw:Lcom/facebook/imagepipeline/i/ae$a;
-
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jp()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jo()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ae$a$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ae$a$a.smali
index ea2cc3dc6d..6611ebc928 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ae$a$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ae$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ae$a$a;
 .super Lcom/facebook/imagepipeline/i/b;
+.source "MultiplexProducer.java"
 
 
 # annotations
@@ -187,9 +188,11 @@
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     throw p1
+
+    return-void
 .end method
 
-.method protected final ic()V
+.method protected final ib()V
     .locals 3
 
     :try_start_0
@@ -228,7 +231,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jk()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ae$a;->jj()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -358,4 +361,6 @@
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ae$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ae$a.smali
index 7a31a320c7..cd9fd25c75 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ae$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ae$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ae$a;
 .super Ljava/lang/Object;
+.source "MultiplexProducer.java"
 
 
 # annotations
@@ -146,7 +147,7 @@
     return-void
 .end method
 
-.method private declared-synchronized jm()Z
+.method private declared-synchronized jl()Z
     .locals 2
 
     monitor-enter p0
@@ -185,7 +186,6 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     monitor-exit p0
 
     return v0
@@ -193,7 +193,9 @@
     :cond_1
     const/4 v0, 0x1
 
-    goto :goto_0
+    monitor-exit p0
+
+    return v0
 
     :catchall_0
     move-exception v0
@@ -201,9 +203,11 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method private declared-synchronized jo()Z
+.method private declared-synchronized jn()Z
     .locals 2
 
     monitor-enter p0
@@ -232,7 +236,7 @@
 
     check-cast v1, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/al;->iW()Z
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/al;->iV()Z
 
     move-result v1
     :try_end_0
@@ -242,7 +246,6 @@
 
     const/4 v0, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return v0
@@ -250,7 +253,9 @@
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return v0
 
     :catchall_0
     move-exception v0
@@ -258,9 +263,11 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method private declared-synchronized jq()Lcom/facebook/imagepipeline/a/d;
+.method private declared-synchronized jp()Lcom/facebook/imagepipeline/a/d;
     .locals 3
 
     monitor-enter p0
@@ -291,7 +298,7 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iV()Lcom/facebook/imagepipeline/a/d;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v2
 
@@ -314,6 +321,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 
@@ -435,6 +444,8 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final c(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/al;)Z
@@ -477,15 +488,15 @@
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jl()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jk()Ljava/util/List;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jp()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jo()Ljava/util/List;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jn()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jm()Ljava/util/List;
 
     move-result-object v3
 
@@ -598,7 +609,7 @@
     throw p1
 .end method
 
-.method final jk()V
+.method final jj()V
     .locals 12
 
     monitor-enter p0
@@ -671,7 +682,7 @@
 
     new-instance v1, Lcom/facebook/imagepipeline/i/d;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
@@ -679,27 +690,27 @@
 
     move-result-object v5
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v6
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iT()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iS()Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v8
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jm()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jl()Z
 
     move-result v9
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jo()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jn()Z
 
     move-result v10
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jq()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jp()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v11
 
@@ -742,7 +753,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized jl()Ljava/util/List;
+.method final declared-synchronized jk()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -775,7 +786,62 @@
     :try_start_1
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a;->Ts:Lcom/facebook/imagepipeline/i/d;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jm()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jl()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/d;->A(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 jm()Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/facebook/imagepipeline/i/am;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a;->Ts: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/ae$a;->Ts:Lcom/facebook/imagepipeline/i/d;
+
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jn()Z
 
     move-result v1
 
@@ -797,7 +863,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized jn()Ljava/util/List;
+.method final declared-synchronized jo()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -830,62 +896,7 @@
     :try_start_1
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a;->Ts:Lcom/facebook/imagepipeline/i/d;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jo()Z
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/d;->C(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 jp()Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/facebook/imagepipeline/i/am;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$a;->Ts: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/ae$a;->Ts:Lcom/facebook/imagepipeline/i/d;
-
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jq()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ae$a;->jp()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 62ccd2ac8c..3de8e33c47 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ae.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ae.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/i/ae;
 .super Ljava/lang/Object;
+.source "MultiplexProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -214,7 +215,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/ae$a;->jk()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/ae$a;->jj()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -242,6 +243,8 @@
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     throw p1
+
+    return-void
 .end method
 
 .method final declared-synchronized a(Ljava/lang/Object;Lcom/facebook/imagepipeline/i/ae$a;)V
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/af$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/af$1.smali
index 646733d2dd..211ed555e0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/af$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/af$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/af$1;
 .super Ljava/lang/Object;
+.source "NetworkFetchProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ag$a;
@@ -37,12 +38,12 @@
 
 
 # virtual methods
-.method public final fg()V
+.method public final ff()V
     .locals 5
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/af$1;->SJ:Lcom/facebook/imagepipeline/i/t;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/t;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/t;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v1
 
@@ -58,7 +59,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/t;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     return-void
 .end method
@@ -79,7 +80,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/i/af;->MD:Lcom/facebook/common/g/g;
 
-    invoke-interface {v2}, Lcom/facebook/common/g/g;->fo()Lcom/facebook/common/g/i;
+    invoke-interface {v2}, Lcom/facebook/common/g/g;->fn()Lcom/facebook/common/g/i;
 
     move-result-object v2
 
@@ -114,7 +115,7 @@
 
     iget-object v6, v1, Lcom/facebook/imagepipeline/i/t;->SF:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v6}, Lcom/facebook/imagepipeline/i/al;->iW()Z
+    invoke-interface {v6}, Lcom/facebook/imagepipeline/i/al;->iV()Z
 
     move-result v6
 
@@ -122,8 +123,6 @@
 
     iget-wide v6, v1, Lcom/facebook/imagepipeline/i/t;->SG:J
 
-    const/4 v8, 0x0
-
     sub-long v6, v4, v6
 
     const-wide/16 v8, 0x64
@@ -134,7 +133,7 @@
 
     iput-wide v4, v1, Lcom/facebook/imagepipeline/i/t;->SG:J
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/t;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/t;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v4
 
@@ -191,7 +190,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/t;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/t;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object p1
 
@@ -201,7 +200,7 @@
 
     invoke-interface {p1, v4}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/t;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/t;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object p1
 
@@ -257,6 +256,8 @@
     invoke-virtual {v2}, Lcom/facebook/common/g/i;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final h(Ljava/lang/Throwable;)V
@@ -264,7 +265,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/af$1;->SJ:Lcom/facebook/imagepipeline/i/t;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/t;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/t;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v1
 
@@ -278,7 +279,7 @@
 
     invoke-interface {v1, v2, v3, p1, v4}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/t;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/t;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/af.smali b/com.discord/smali/com/facebook/imagepipeline/i/af.smali
index 0500c944d5..2f7e869ab0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/af.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/af.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/af;
 .super Ljava/lang/Object;
+.source "NetworkFetchProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -57,7 +58,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/g/i;->fp()Lcom/facebook/common/g/f;
+    invoke-virtual {p0}, Lcom/facebook/common/g/i;->fo()Lcom/facebook/common/g/f;
 
     move-result-object p0
 
@@ -77,7 +78,7 @@
     :try_start_1
     iput-object p2, v1, Lcom/facebook/imagepipeline/f/e;->Qu:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->iq()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->ip()V
 
     invoke-interface {p3, v1, p1}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_1
@@ -122,7 +123,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v0
 
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 0f6b803bc7..8119ed9557 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ag$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ag$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/ag$a;
 .super Ljava/lang/Object;
+.source "NetworkFetcher.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract fg()V
+.method public abstract ff()V
 .end method
 
 .method public abstract g(Ljava/io/InputStream;)V
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ag.smali b/com.discord/smali/com/facebook/imagepipeline/i/ag.smali
index 500966aec2..e5755cd990 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ag.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ag.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/ag;
 .super Ljava/lang/Object;
+.source "NetworkFetcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ah$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/ah$1.smali
index 15c18d647a..7dad873766 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ah$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ah$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ah$1;
 .super Ljava/lang/Object;
+.source "PartialDiskCacheProducer.java"
 
 # interfaces
 .implements La/f;
@@ -121,7 +122,7 @@
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/ah$1;->SB:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     goto/16 :goto_4
 
@@ -171,15 +172,11 @@
 
     const-string v5, "PartialDiskCacheProducer"
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ah$1;->Sz:Lcom/facebook/imagepipeline/i/an;
-
-    iget-object v7, p0, Lcom/facebook/imagepipeline/i/ah$1;->SA:Ljava/lang/String;
-
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
-    move-result v8
+    move-result v6
 
-    invoke-static {v6, v7, v2, v8}, Lcom/facebook/imagepipeline/i/ah;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
+    invoke-static {v0, v4, v2, v6}, Lcom/facebook/imagepipeline/i/ah;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
 
     move-result-object v6
 
@@ -215,7 +212,7 @@
 
     iget-object v5, p0, Lcom/facebook/imagepipeline/i/ah$1;->Su:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v5}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v5
 
@@ -289,7 +286,7 @@
 
     iput-object v1, v4, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Qu:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -316,11 +313,7 @@
 
     const-string v4, "PartialDiskCacheProducer"
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ah$1;->Sz:Lcom/facebook/imagepipeline/i/an;
-
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ah$1;->SA:Ljava/lang/String;
-
-    invoke-static {v5, v6, v1, v1}, Lcom/facebook/imagepipeline/i/ah;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
+    invoke-static {v0, v2, v1, v1}, Lcom/facebook/imagepipeline/i/ah;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ah$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/ah$2.smali
index 587eeeed3c..ca1a083f86 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ah$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ah$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ah$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "PartialDiskCacheProducer.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah$2;->MY:Ljava/util/concurrent/atomic/AtomicBoolean;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ah$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ah$a.smali
index 599f3d070e..d77fe39ef1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ah$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ah$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ah$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "PartialDiskCacheProducer.java"
 
 
 # annotations
@@ -179,6 +180,8 @@
     invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -241,7 +244,7 @@
 
     invoke-direct {p0, p2, v0, v1}, Lcom/facebook/imagepipeline/i/ah$a;->a(Ljava/io/InputStream;Ljava/io/OutputStream;I)V
 
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fp()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fo()Lcom/facebook/common/g/f;
 
     move-result-object p2
 
@@ -262,7 +265,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->iq()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->ip()V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
@@ -363,7 +366,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ah.smali b/com.discord/smali/com/facebook/imagepipeline/i/ah.smali
index 34c42d796a..2d33fb79bd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ah.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ah.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ah;
 .super Ljava/lang/Object;
+.source "PartialDiskCacheProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -181,7 +182,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -196,7 +197,7 @@
     return-void
 
     :cond_0
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v1
 
@@ -248,7 +249,7 @@
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     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 4541b91938..7cda29ed33 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ai$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "PostprocessedBitmapMemoryCacheProducer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ai.smali b/com.discord/smali/com/facebook/imagepipeline/i/ai.smali
index 88999a721e..0dd33c5fb5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ai.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ai.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ai;
 .super Ljava/lang/Object;
+.source "PostprocessedBitmapMemoryCacheProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -94,7 +95,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v0
 
@@ -102,11 +103,11 @@
 
     move-result-object v1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -181,7 +182,7 @@
     :cond_2
     instance-of v9, v4, Lcom/facebook/imagepipeline/request/d;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aj$a$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/aj$a$1.smali
index 8ca487cb3f..88c7b83a75 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aj$a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aj$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aj$a$1;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "PostprocessorProducer.java"
 
 
 # annotations
@@ -34,12 +35,12 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/aj$a$1;->TL:Lcom/facebook/imagepipeline/i/aj$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aj$a;->jt()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aj$a;->js()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aj$a$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/aj$a$2.smali
index 9aab458632..30177490da 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aj$a$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aj$a$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aj$a$2;
 .super Ljava/lang/Object;
+.source "PostprocessorProducer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/i/aj$a;->jr()V
+    value = Lcom/facebook/imagepipeline/i/aj$a;->jq()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -63,7 +64,7 @@
 
     monitor-exit v0
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_4
+    .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -92,7 +93,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/facebook/imagepipeline/i/aj$a;->b(Lcom/facebook/common/references/CloseableReference;I)V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_0
     iget-object v3, v0, Lcom/facebook/imagepipeline/i/aj$a;->TE:Lcom/facebook/imagepipeline/i/an;
@@ -103,7 +104,7 @@
 
     invoke-interface {v3, v6, v7}, Lcom/facebook/imagepipeline/i/an;->s(Ljava/lang/String;Ljava/lang/String;)V
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
     invoke-virtual {v1}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
@@ -114,13 +115,13 @@
 
     invoke-virtual {v0, v3}, Lcom/facebook/imagepipeline/i/aj$a;->d(Lcom/facebook/imagepipeline/f/c;)Lcom/facebook/common/references/CloseableReference;
 
-    move-result-object v3
+    move-result-object v4
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v4, v0, Lcom/facebook/imagepipeline/i/aj$a;->TE:Lcom/facebook/imagepipeline/i/an;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/aj$a;->TE:Lcom/facebook/imagepipeline/i/an;
 
     iget-object v6, v0, Lcom/facebook/imagepipeline/i/aj$a;->EY:Ljava/lang/String;
 
@@ -136,30 +137,24 @@
 
     move-result-object v8
 
-    invoke-interface {v4, v6, v7, v8}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
+    invoke-interface {v3, v6, v7, v8}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-virtual {v0, v3, v2}, Lcom/facebook/imagepipeline/i/aj$a;->b(Lcom/facebook/common/references/CloseableReference;I)V
+    invoke-virtual {v0, v4, v2}, Lcom/facebook/imagepipeline/i/aj$a;->b(Lcom/facebook/common/references/CloseableReference;I)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
+    :goto_0
     :try_start_4
-    invoke-static {v3}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+    invoke-static {v4}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
     :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
-    goto :goto_0
+    goto :goto_1
 
     :catchall_0
     move-exception v0
 
-    move-object v4, v3
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception v0
-
-    goto :goto_1
+    goto :goto_2
 
     :catch_0
     move-exception v2
@@ -185,27 +180,24 @@
 
     invoke-virtual {v0, v2}, Lcom/facebook/imagepipeline/i/aj$a;->i(Ljava/lang/Throwable;)V
     :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    :try_start_6
-    invoke-static {v4}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_2
-
-    :goto_0
-    invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
-
-    goto :goto_2
+    goto :goto_0
 
     :goto_1
-    :try_start_7
+    invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
+
+    goto :goto_3
+
+    :goto_2
+    :try_start_6
     invoke-static {v4}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     throw v0
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
-    :catchall_2
+    :catchall_1
     move-exception v0
 
     invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
@@ -213,46 +205,48 @@
     throw v0
 
     :cond_1
-    :goto_2
+    :goto_3
     iget-object v1, p0, Lcom/facebook/imagepipeline/i/aj$a$2;->TL:Lcom/facebook/imagepipeline/i/aj$a;
 
     monitor-enter v1
 
-    :try_start_8
+    :try_start_7
     iput-boolean v5, v1, Lcom/facebook/imagepipeline/i/aj$a;->TI:Z
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/aj$a;->js()Z
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/aj$a;->jr()Z
 
     move-result v0
 
     monitor-exit v1
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_3
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/aj$a;->jr()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/aj$a;->jq()V
 
     :cond_2
     return-void
 
-    :catchall_3
+    :catchall_2
     move-exception v0
 
-    :try_start_9
+    :try_start_8
     monitor-exit v1
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_3
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_2
 
     throw v0
 
-    :catchall_4
+    :catchall_3
     move-exception v1
 
-    :try_start_a
+    :try_start_9
     monitor-exit v0
-    :try_end_a
-    .catchall {:try_start_a .. :try_end_a} :catchall_4
+    :try_end_9
+    .catchall {:try_start_9 .. :try_end_9} :catchall_3
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aj$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/aj$a.smali
index 7358e40195..47b2617630 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aj$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aj$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aj$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "PostprocessorProducer.java"
 
 
 # annotations
@@ -165,7 +166,7 @@
     return-object p0
 .end method
 
-.method private fE()Z
+.method private fD()Z
     .locals 2
 
     monitor-enter p0
@@ -286,7 +287,7 @@
 
     iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/aj$a;->TH:Z
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$a;->js()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$a;->jr()Z
 
     move-result p1
 
@@ -298,7 +299,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$a;->jr()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$a;->jq()V
 
     :cond_3
     return-void
@@ -340,7 +341,7 @@
     :cond_0
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/aj$a;->fE()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/aj$a;->fD()Z
 
     move-result v0
 
@@ -391,7 +392,7 @@
     :try_start_0
     new-instance v3, Lcom/facebook/imagepipeline/f/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->ih()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->ig()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object p1
 
@@ -426,7 +427,7 @@
 .method final i(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/aj$a;->fE()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/aj$a;->fD()Z
 
     move-result v0
 
@@ -440,15 +441,15 @@
     return-void
 .end method
 
-.method protected final ic()V
+.method protected final ib()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$a;->jt()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$a;->js()V
 
     return-void
 .end method
 
-.method final jr()V
+.method final jq()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/aj$a;->TJ:Lcom/facebook/imagepipeline/i/aj;
@@ -464,7 +465,7 @@
     return-void
 .end method
 
-.method final declared-synchronized js()Z
+.method final declared-synchronized jr()Z
     .locals 1
 
     monitor-enter p0
@@ -515,10 +516,10 @@
     throw v0
 .end method
 
-.method final jt()V
+.method final js()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/aj$a;->fE()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/aj$a;->fD()Z
 
     move-result v0
 
@@ -526,7 +527,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aj$b$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/aj$b$1.smali
index 59c8d48420..d534e8a743 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aj$b$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aj$b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aj$b$1;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "PostprocessorProducer.java"
 
 
 # annotations
@@ -34,12 +35,12 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/aj$b$1;->TM:Lcom/facebook/imagepipeline/i/aj$b;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aj$b;->fE()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aj$b;->fD()Z
 
     move-result v0
 
@@ -49,7 +50,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aj$b.smali b/com.discord/smali/com/facebook/imagepipeline/i/aj$b.smali
index e6baa986e5..1e1e269d80 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aj$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aj$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aj$b;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "PostprocessorProducer.java"
 
 
 # annotations
@@ -191,7 +192,7 @@
     return-void
 .end method
 
-.method final fE()Z
+.method final fD()Z
     .locals 2
 
     monitor-enter p0
@@ -240,7 +241,7 @@
 .method protected final g(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$b;->fE()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$b;->fD()Z
 
     move-result v0
 
@@ -254,10 +255,10 @@
     return-void
 .end method
 
-.method protected final ic()V
+.method protected final ib()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$b;->fE()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/aj$b;->fD()Z
 
     move-result v0
 
@@ -265,7 +266,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aj$c.smali b/com.discord/smali/com/facebook/imagepipeline/i/aj$c.smali
index 289540f16c..10a4021bb8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aj$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aj$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/aj$c;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "PostprocessorProducer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aj.smali b/com.discord/smali/com/facebook/imagepipeline/i/aj.smali
index 8dac55c6e6..8c7990d91e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aj.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aj.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/aj;
 .super Ljava/lang/Object;
+.source "PostprocessorProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -97,11 +98,11 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ak.smali b/com.discord/smali/com/facebook/imagepipeline/i/ak.smali
index 3d9d293da8..4752fdb714 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ak.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ak.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/ak;
 .super Ljava/lang/Object;
+.source "Producer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/al.smali b/com.discord/smali/com/facebook/imagepipeline/i/al.smali
index 1f3eed68d0..a5b0ee5e05 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/al.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/al.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/al;
 .super Ljava/lang/Object;
+.source "ProducerContext.java"
 
 
 # virtual methods
@@ -9,22 +10,22 @@
 .method public abstract getId()Ljava/lang/String;
 .end method
 
-.method public abstract iR()Lcom/facebook/imagepipeline/request/b;
+.method public abstract iQ()Lcom/facebook/imagepipeline/request/b;
 .end method
 
-.method public abstract iS()Lcom/facebook/imagepipeline/i/an;
+.method public abstract iR()Lcom/facebook/imagepipeline/i/an;
 .end method
 
-.method public abstract iT()Ljava/lang/Object;
+.method public abstract iS()Ljava/lang/Object;
 .end method
 
-.method public abstract iU()Lcom/facebook/imagepipeline/request/b$b;
+.method public abstract iT()Lcom/facebook/imagepipeline/request/b$b;
 .end method
 
-.method public abstract iV()Lcom/facebook/imagepipeline/a/d;
+.method public abstract iU()Lcom/facebook/imagepipeline/a/d;
 .end method
 
-.method public abstract iW()Z
+.method public abstract iV()Z
 .end method
 
 .method public abstract isPrefetch()Z
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/am.smali b/com.discord/smali/com/facebook/imagepipeline/i/am.smali
index 00e2ab96bf..915d32ae55 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/am.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/am.smali
@@ -1,8 +1,12 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/am;
 .super Ljava/lang/Object;
+.source "ProducerContextCallbacks.java"
 
 
 # virtual methods
+.method public abstract iX()V
+.end method
+
 .method public abstract iY()V
 .end method
 
@@ -11,6 +15,3 @@
 
 .method public abstract ja()V
 .end method
-
-.method public abstract jb()V
-.end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/an.smali b/com.discord/smali/com/facebook/imagepipeline/i/an.smali
index f981cbe1af..8a6ebb84f0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/an.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/an.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/an;
 .super Ljava/lang/Object;
+.source "ProducerListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ao.smali b/com.discord/smali/com/facebook/imagepipeline/i/ao.smali
index 9a0e954b32..1ed86919c2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ao.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ao.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ao;
 .super Lcom/facebook/imagepipeline/i/aa;
+.source "QualifiedResourceFetchProducer.java"
 
 
 # instance fields
@@ -44,7 +45,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "QualifiedResourceFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ap$a$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/ap$a$1.smali
index c0d5a1d253..181c3c2648 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ap$a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ap$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ap$a$1;
 .super Ljava/lang/Object;
+.source "ResizeAndRotateProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/v$a;
@@ -42,11 +43,9 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ap$a$1;->TQ:Lcom/facebook/imagepipeline/i/ap$a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ap$a$1;->TQ:Lcom/facebook/imagepipeline/i/ap$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ap$a;->OI:Lcom/facebook/imagepipeline/k/c;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ap$a;->OI:Lcom/facebook/imagepipeline/k/c;
-
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v2
 
@@ -66,7 +65,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v2
 
@@ -82,7 +81,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v8
 
@@ -90,7 +89,7 @@
 
     iget-object v2, v2, Lcom/facebook/imagepipeline/i/ap;->MD:Lcom/facebook/common/g/g;
 
-    invoke-interface {v2}, Lcom/facebook/common/g/g;->fo()Lcom/facebook/common/g/i;
+    invoke-interface {v2}, Lcom/facebook/common/g/g;->fn()Lcom/facebook/common/g/i;
 
     move-result-object v9
 
@@ -131,7 +130,7 @@
 
     iget-object v4, v0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v4
 
@@ -208,7 +207,7 @@
 
     const-string v6, "Image format"
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object p1
 
@@ -230,7 +229,7 @@
 
     iget-object v3, v0, Lcom/facebook/imagepipeline/i/ap$a;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/v;->jh()J
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/v;->jg()J
 
     move-result-wide v3
 
@@ -259,7 +258,7 @@
     move-object v10, p1
 
     :goto_1
-    invoke-virtual {v9}, Lcom/facebook/common/g/i;->fp()Lcom/facebook/common/g/f;
+    invoke-virtual {v9}, Lcom/facebook/common/g/i;->fo()Lcom/facebook/common/g/f;
 
     move-result-object p1
 
@@ -282,11 +281,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->iq()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->ip()V
 
     iget-object v3, v0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v3
 
@@ -371,7 +370,7 @@
     :try_start_7
     iget-object v1, v0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ap$a$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/ap$a$2.smali
index 06654d09e2..420e43be87 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ap$a$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ap$a$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ap$a$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "ResizeAndRotateProducer.java"
 
 
 # annotations
@@ -38,14 +39,14 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ap$a$2;->TQ:Lcom/facebook/imagepipeline/i/ap$a;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/ap$a;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->je()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->jd()V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ap$a$2;->TQ:Lcom/facebook/imagepipeline/i/ap$a;
 
@@ -55,19 +56,19 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ap$a$2;->SB:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     return-void
 .end method
 
-.method public final ja()V
+.method public final iZ()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ap$a$2;->TQ:Lcom/facebook/imagepipeline/i/ap$a;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iW()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iV()Z
 
     move-result v0
 
@@ -77,7 +78,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/ap$a;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->jf()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->je()Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ap$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ap$a.smali
index ecefab8ba2..be98f823c2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ap$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ap$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ap$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "ResizeAndRotateProducer.java"
 
 
 # annotations
@@ -128,13 +129,13 @@
     :cond_1
     iget-object v2, p0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
     iget-object v3, p0, Lcom/facebook/imagepipeline/i/ap$a;->OI:Lcom/facebook/imagepipeline/k/c;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v4
 
@@ -154,7 +155,7 @@
 
     if-eqz p1, :cond_a
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v5
 
@@ -165,7 +166,7 @@
     goto :goto_4
 
     :cond_2
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v5
 
@@ -192,7 +193,7 @@
 
     if-nez v6, :cond_6
 
-    invoke-virtual {v5}, Lcom/facebook/imagepipeline/a/f;->hu()Z
+    invoke-virtual {v5}, Lcom/facebook/imagepipeline/a/f;->ht()Z
 
     move-result v6
 
@@ -207,7 +208,7 @@
     :cond_4
     sget-object v5, Lcom/facebook/imagepipeline/k/d;->UD:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result v6
 
@@ -258,7 +259,7 @@
 
     :cond_9
     :goto_3
-    invoke-static {v1}, Lcom/facebook/common/j/e;->w(Z)Lcom/facebook/common/j/e;
+    invoke-static {v1}, Lcom/facebook/common/j/e;->v(Z)Lcom/facebook/common/j/e;
 
     move-result-object v1
 
@@ -282,7 +283,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -292,13 +293,13 @@
 
     if-nez v0, :cond_c
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result v0
 
     if-eqz v0, :cond_c
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result v0
 
@@ -336,7 +337,7 @@
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/ap$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iW()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iV()Z
 
     move-result p1
 
@@ -345,7 +346,7 @@
     :cond_e
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/ap$a;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/v;->jf()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/v;->je()Z
 
     :cond_f
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ap.smali b/com.discord/smali/com/facebook/imagepipeline/i/ap.smali
index 3f5a10c397..cde4c03d41 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ap.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ap.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ap;
 .super Ljava/lang/Object;
+.source "ResizeAndRotateProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aq.smali b/com.discord/smali/com/facebook/imagepipeline/i/aq.smali
index 34cb2d801e..e65ab67e68 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aq.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aq.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/aq;
 .super Lcom/facebook/imagepipeline/i/d;
+.source "SettableProducerContext.java"
 
 
 # annotations
@@ -15,15 +16,15 @@
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v5
 
@@ -31,11 +32,11 @@
 
     move-result v6
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iW()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iV()Z
 
     move-result v7
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iV()Lcom/facebook/imagepipeline/a/d;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v8
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ar.smali b/com.discord/smali/com/facebook/imagepipeline/i/ar.smali
index d6d92fdf62..d2281c81a2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ar.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ar.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/i/ar;
 .super Lcom/facebook/common/b/h;
+.source "StatefulProducerRunnable.java"
 
 
 # annotations
@@ -86,8 +87,8 @@
     return-object p1
 .end method
 
-.method public fg()V
-    .locals 5
+.method public ff()V
+    .locals 4
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar;->RZ:Lcom/facebook/imagepipeline/i/an;
 
@@ -95,11 +96,7 @@
 
     iget-object v2, p0, Lcom/facebook/imagepipeline/i/ar;->TR:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ar;->RZ:Lcom/facebook/imagepipeline/i/an;
-
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ar;->EY:Ljava/lang/String;
-
-    invoke-interface {v3, v4}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
 
     const/4 v3, 0x0
 
@@ -107,13 +104,13 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     return-void
 .end method
 
 .method public onFailure(Ljava/lang/Exception;)V
-    .locals 5
+    .locals 4
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar;->RZ:Lcom/facebook/imagepipeline/i/an;
 
@@ -121,11 +118,7 @@
 
     iget-object v2, p0, Lcom/facebook/imagepipeline/i/ar;->TR:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ar;->RZ:Lcom/facebook/imagepipeline/i/an;
-
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ar;->EY:Ljava/lang/String;
-
-    invoke-interface {v3, v4}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
 
     const/4 v3, 0x0
 
@@ -139,7 +132,7 @@
 .end method
 
 .method public onSuccess(Ljava/lang/Object;)V
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;)V"
@@ -152,11 +145,7 @@
 
     iget-object v2, p0, Lcom/facebook/imagepipeline/i/ar;->TR:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ar;->RZ:Lcom/facebook/imagepipeline/i/an;
-
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ar;->EY:Ljava/lang/String;
-
-    invoke-interface {v3, v4}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
 
     move-result v3
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/as$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/as$1.smali
index f5c1a09746..a056269d33 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/as$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/as$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/as$1;
 .super Lcom/facebook/imagepipeline/i/ar;
+.source "ThreadHandoffProducer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/as$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/as$2.smali
index c50e0aa2d5..496807c087 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/as$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/as$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/as$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "ThreadHandoffProducer.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/as$2;->TV:Lcom/facebook/imagepipeline/i/ar;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/as.smali b/com.discord/smali/com/facebook/imagepipeline/i/as.smali
index 8d9fa60caa..760fb9dfae 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/as.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/as.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/as;
 .super Ljava/lang/Object;
+.source "ThreadHandoffProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -73,7 +74,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v6
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/at.smali b/com.discord/smali/com/facebook/imagepipeline/i/at.smali
index bc9bcb8f9d..afe61ea5f3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/at.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/at.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/at;
 .super Ljava/lang/Object;
+.source "ThreadHandoffProducerQueue.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/au$a$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/au$a$1.smali
index ccb5fb7fc8..5b632bafd2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/au$a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/au$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/au$a$1;
 .super Ljava/lang/Object;
+.source "ThrottlingProducer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/i/au$a;->ju()V
+    value = Lcom/facebook/imagepipeline/i/au$a;->jt()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/au$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/au$a.smali
index e18149e126..0f5568dc30 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/au$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/au$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/au$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "ThrottlingProducer.java"
 
 
 # annotations
@@ -50,7 +51,7 @@
     return-void
 .end method
 
-.method private ju()V
+.method private jt()V
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/au$a;->Ub:Lcom/facebook/imagepipeline/i/au;
@@ -125,7 +126,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/au$a;->ju()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/au$a;->jt()V
 
     :cond_0
     return-void
@@ -138,19 +139,19 @@
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->h(Ljava/lang/Throwable;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/au$a;->ju()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/au$a;->jt()V
 
     return-void
 .end method
 
-.method protected final ic()V
+.method protected final ib()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/au$a;->ju()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/au$a;->jt()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/au.smali b/com.discord/smali/com/facebook/imagepipeline/i/au.smali
index aeab8f08ec..cf391917f2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/au.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/au.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/au;
 .super Ljava/lang/Object;
+.source "ThrottlingProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -135,7 +136,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v0
 
@@ -212,7 +213,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/av$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/av$a.smali
index cc695fc7e4..e1df2e49e1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/av$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/av$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/av$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "ThumbnailBranchProducer.java"
 
 
 # annotations
@@ -56,7 +57,7 @@
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/av$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/av.smali b/com.discord/smali/com/facebook/imagepipeline/i/av.smali
index 411e4d679e..8ea1960dd1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/av.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/av.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/av;
 .super Ljava/lang/Object;
+.source "ThumbnailBranchProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -125,16 +126,14 @@
 .end method
 
 .method private a(ILcom/facebook/imagepipeline/a/e;)I
-    .locals 1
+    .locals 2
 
     :goto_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/av;->Ue:[Lcom/facebook/imagepipeline/i/aw;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-ge p1, v0, :cond_1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/av;->Ue:[Lcom/facebook/imagepipeline/i/aw;
+    if-ge p1, v1, :cond_1
 
     aget-object v0, v0, p1
 
@@ -172,7 +171,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -216,7 +215,7 @@
         }
     .end annotation
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aw.smali b/com.discord/smali/com/facebook/imagepipeline/i/aw.smali
index e1461a96a2..8237913041 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aw.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aw.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/aw;
 .super Ljava/lang/Object;
+.source "ThumbnailProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ax.smali b/com.discord/smali/com/facebook/imagepipeline/i/ax.smali
index 5952014b10..3e0308e41a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ax.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ax.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ax;
 .super Ljava/lang/Object;
+.source "ThumbnailSizeChecker.java"
 
 
 # direct methods
@@ -80,7 +81,7 @@
     return p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result v0
 
@@ -100,7 +101,6 @@
 
     move-result p0
 
-    :goto_0
     invoke-static {v0, p0, p1}, Lcom/facebook/imagepipeline/i/ax;->a(IILcom/facebook/imagepipeline/a/e;)Z
 
     move-result p0
@@ -116,5 +116,9 @@
 
     move-result p0
 
-    goto :goto_0
+    invoke-static {v0, p0, p1}, Lcom/facebook/imagepipeline/i/ax;->a(IILcom/facebook/imagepipeline/a/e;)Z
+
+    move-result p0
+
+    return p0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ay$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/ay$1.smali
index eea36ab46f..59e76ed7ba 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ay$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ay$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ay$1;
 .super Lcom/facebook/imagepipeline/i/ar;
+.source "WebpTranscodeProducer.java"
 
 
 # annotations
@@ -40,7 +41,7 @@
     return-void
 .end method
 
-.method private jv()Lcom/facebook/imagepipeline/f/e;
+.method private ju()Lcom/facebook/imagepipeline/f/e;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -52,7 +53,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/ay;->MD:Lcom/facebook/common/g/g;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/g;->fo()Lcom/facebook/common/g/i;
+    invoke-interface {v0}, Lcom/facebook/common/g/g;->fn()Lcom/facebook/common/g/i;
 
     move-result-object v0
 
@@ -75,7 +76,7 @@
 
     if-ne v3, v4, :cond_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     sget-object v4, Lcom/facebook/c/b;->Lw:Lcom/facebook/c/c;
@@ -99,7 +100,7 @@
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/e;->iP()Lcom/facebook/imagepipeline/nativecode/d;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/e;->iO()Lcom/facebook/imagepipeline/nativecode/d;
 
     move-result-object v3
 
@@ -107,14 +108,13 @@
 
     sget-object v2, Lcom/facebook/c/b;->Lr:Lcom/facebook/c/c;
 
-    :goto_1
     iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->Qr:Lcom/facebook/c/c;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
-    :goto_2
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/e;->iP()Lcom/facebook/imagepipeline/nativecode/d;
+    :goto_1
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/e;->iO()Lcom/facebook/imagepipeline/nativecode/d;
 
     move-result-object v3
 
@@ -122,10 +122,10 @@
 
     sget-object v2, Lcom/facebook/c/b;->Lq:Lcom/facebook/c/c;
 
-    goto :goto_1
+    iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->Qr:Lcom/facebook/c/c;
 
-    :goto_3
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fp()Lcom/facebook/common/g/f;
+    :goto_2
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fo()Lcom/facebook/common/g/f;
 
     move-result-object v1
 
@@ -175,14 +175,14 @@
 
 
 # virtual methods
-.method public final fg()V
+.method public final ff()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/ay$1;->Uh:Lcom/facebook/imagepipeline/f/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-super {p0}, Lcom/facebook/imagepipeline/i/ar;->fg()V
+    invoke-super {p0}, Lcom/facebook/imagepipeline/i/ar;->ff()V
 
     return-void
 .end method
@@ -195,7 +195,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ay$1;->jv()Lcom/facebook/imagepipeline/f/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ay$1;->ju()Lcom/facebook/imagepipeline/f/e;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ay$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ay$a.smali
index 1d82dd92f9..7867773b61 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ay$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ay$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/ay$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "WebpTranscodeProducer.java"
 
 
 # annotations
@@ -92,7 +93,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/e;->iP()Lcom/facebook/imagepipeline/nativecode/d;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/e;->iO()Lcom/facebook/imagepipeline/nativecode/d;
 
     move-result-object v1
 
@@ -104,7 +105,7 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    invoke-static {v0}, Lcom/facebook/common/j/e;->w(Z)Lcom/facebook/common/j/e;
+    invoke-static {v0}, Lcom/facebook/common/j/e;->v(Z)Lcom/facebook/common/j/e;
 
     move-result-object v0
 
@@ -160,7 +161,7 @@
 
     new-instance p1, Lcom/facebook/imagepipeline/i/ay$1;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ay.smali b/com.discord/smali/com/facebook/imagepipeline/i/ay.smali
index 99b2fe0930..45ce75b5af 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ay.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ay.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/ay;
 .super Ljava/lang/Object;
+.source "WebpTranscodeProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/b.smali b/com.discord/smali/com/facebook/imagepipeline/i/b.smali
index 80dc153928..5fc08f1cff 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/i/b;
 .super Ljava/lang/Object;
+.source "BaseConsumer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/k;
@@ -197,7 +198,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized fg()V
+.method public final declared-synchronized ff()V
     .locals 1
 
     monitor-enter p0
@@ -222,7 +223,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/b;->ic()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/b;->ib()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
@@ -308,7 +309,7 @@
     throw p1
 .end method
 
-.method protected abstract ic()V
+.method protected abstract ib()V
 .end method
 
 .method protected l(F)V
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/c.smali b/com.discord/smali/com/facebook/imagepipeline/i/c.smali
index 33a68a6ba6..0622026228 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/i/c;
 .super Ljava/lang/Object;
+.source "BaseNetworkFetcher.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ag;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/d.smali b/com.discord/smali/com/facebook/imagepipeline/i/d.smali
index c637866fc8..f8316954d3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/d.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/i/d;
 .super Ljava/lang/Object;
+.source "BaseProducerContext.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/al;
@@ -127,7 +128,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/am;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->iY()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->iX()V
 
     goto :goto_0
 
@@ -172,7 +173,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/am;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->iZ()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->iY()V
 
     goto :goto_0
 
@@ -217,7 +218,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/am;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->ja()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->iZ()V
 
     goto :goto_0
 
@@ -262,7 +263,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/am;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->jb()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/am;->ja()V
 
     goto :goto_0
 
@@ -272,7 +273,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized B(Z)Ljava/util/List;
+.method public final declared-synchronized A(Z)Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -325,7 +326,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized C(Z)Ljava/util/List;
+.method public final declared-synchronized B(Z)Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -451,7 +452,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/am;->iY()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/am;->iX()V
 
     :cond_0
     return-void
@@ -475,7 +476,7 @@
     return-object v0
 .end method
 
-.method public final iR()Lcom/facebook/imagepipeline/request/b;
+.method public final iQ()Lcom/facebook/imagepipeline/request/b;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Fa:Lcom/facebook/imagepipeline/request/b;
@@ -483,7 +484,7 @@
     return-object v0
 .end method
 
-.method public final iS()Lcom/facebook/imagepipeline/i/an;
+.method public final iR()Lcom/facebook/imagepipeline/i/an;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->RZ:Lcom/facebook/imagepipeline/i/an;
@@ -491,7 +492,7 @@
     return-object v0
 .end method
 
-.method public final iT()Ljava/lang/Object;
+.method public final iS()Ljava/lang/Object;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->EZ:Ljava/lang/Object;
@@ -499,7 +500,7 @@
     return-object v0
 .end method
 
-.method public final iU()Lcom/facebook/imagepipeline/request/b$b;
+.method public final iT()Lcom/facebook/imagepipeline/request/b$b;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Sa:Lcom/facebook/imagepipeline/request/b$b;
@@ -507,7 +508,7 @@
     return-object v0
 .end method
 
-.method public final declared-synchronized iV()Lcom/facebook/imagepipeline/a/d;
+.method public final declared-synchronized iU()Lcom/facebook/imagepipeline/a/d;
     .locals 1
 
     monitor-enter p0
@@ -529,7 +530,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized iW()Z
+.method public final declared-synchronized iV()Z
     .locals 1
 
     monitor-enter p0
@@ -551,7 +552,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized iX()Ljava/util/List;
+.method public final declared-synchronized iW()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/e.smali b/com.discord/smali/com/facebook/imagepipeline/i/e.smali
index 2ba9deb52c..367d11aa58 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/e.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/i/e;
 .super Ljava/lang/Object;
+.source "BaseProducerContextCallbacks.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/am;
@@ -16,6 +17,12 @@
 
 
 # virtual methods
+.method public iX()V
+    .locals 0
+
+    return-void
+.end method
+
 .method public iY()V
     .locals 0
 
@@ -33,9 +40,3 @@
 
     return-void
 .end method
-
-.method public jb()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/f.smali b/com.discord/smali/com/facebook/imagepipeline/i/f.smali
index dfc140c7fa..ae55a7a190 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/f;
 .super Lcom/facebook/imagepipeline/i/h;
+.source "BitmapMemoryCacheGetProducer.java"
 
 
 # direct methods
@@ -48,7 +49,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "BitmapMemoryCacheGetProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/g.smali b/com.discord/smali/com/facebook/imagepipeline/i/g.smali
index c3a59423b2..bbc65f150b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/g;
 .super Lcom/facebook/imagepipeline/i/ae;
+.source "BitmapMemoryCacheKeyMultiplexProducer.java"
 
 
 # annotations
@@ -39,11 +40,11 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/g;->Ow:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iT()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iS()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -51,7 +52,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/h$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/h$1.smali
index 58920e8f5b..06dec5289c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/h$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/h$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/h$1;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "BitmapMemoryCacheProducer.java"
 
 
 # annotations
@@ -101,7 +102,7 @@
 
     if-eqz v2, :cond_2
 
-    goto/16 :goto_4
+    goto/16 :goto_2
 
     :cond_2
     if-nez v0, :cond_5
@@ -127,7 +128,7 @@
 
     check-cast v3, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/f/c;->ih()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/f/c;->ig()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v3
 
@@ -137,11 +138,11 @@
 
     check-cast v4, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/f/c;->ih()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/f/c;->ig()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v4
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/f/h;->iu()Z
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/f/h;->it()Z
 
     move-result v5
 
@@ -223,15 +224,7 @@
 
     invoke-interface {v0, v2}, Lcom/facebook/imagepipeline/i/k;->m(F)V
 
-    goto :goto_2
-
-    :catchall_1
-    move-exception p1
-
-    goto :goto_3
-
     :cond_7
-    :goto_2
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
     if-eqz v1, :cond_8
@@ -252,14 +245,16 @@
 
     return-void
 
-    :goto_3
+    :catchall_1
+    move-exception p1
+
     :try_start_9
     invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     throw p1
 
     :cond_9
-    :goto_4
+    :goto_2
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy: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/h.smali b/com.discord/smali/com/facebook/imagepipeline/i/h.smali
index 7094e18827..f95d0607ba 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/h.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/i/h;
 .super Ljava/lang/Object;
+.source "BitmapMemoryCacheProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -100,7 +101,7 @@
 .end method
 
 .method public final a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/al;)V
-    .locals 10
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -116,7 +117,7 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v0
 
@@ -124,17 +125,17 @@
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jc()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jb()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/imagepipeline/i/an;->s(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -150,92 +151,104 @@
 
     move-result-object v3
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x1
 
-    if-eqz v3, :cond_2
+    const/4 v6, 0x0
+
+    if-eqz v3, :cond_3
 
     invoke-virtual {v3}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v7
 
-    check-cast v6, Lcom/facebook/imagepipeline/f/c;
+    check-cast v7, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v6}, Lcom/facebook/imagepipeline/f/c;->ih()Lcom/facebook/imagepipeline/f/h;
-
-    move-result-object v6
-
-    invoke-interface {v6}, Lcom/facebook/imagepipeline/f/h;->iu()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_1
-
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jc()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/facebook/imagepipeline/f/c;->ig()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v7
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
+    invoke-interface {v7}, Lcom/facebook/imagepipeline/f/h;->it()Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_0
+    if-eqz v7, :cond_1
 
-    const-string v8, "cached_value_found"
-
-    const-string v9, "true"
-
-    invoke-static {v8, v9}, Lcom/facebook/common/d/f;->c(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jb()Ljava/lang/String;
 
     move-result-object v8
 
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/an;->aw(Ljava/lang/String;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_0
+
+    const-string v9, "cached_value_found"
+
+    const-string v10, "true"
+
+    invoke-static {v9, v10}, Lcom/facebook/common/d/f;->c(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
+
+    move-result-object v9
+
     goto :goto_0
 
     :cond_0
-    move-object v8, v5
+    move-object v9, v6
 
     :goto_0
-    invoke-interface {v0, v1, v7, v8}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
+    invoke-interface {v0, v1, v8, v9}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jc()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jb()Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v8
 
-    invoke-interface {v0, v1, v7, v4}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Z)V
+    invoke-interface {v0, v1, v8, v5}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    const/high16 v7, 0x3f800000    # 1.0f
+    const/high16 v8, 0x3f800000    # 1.0f
 
-    invoke-interface {p1, v7}, Lcom/facebook/imagepipeline/i/k;->m(F)V
+    invoke-interface {p1, v8}, Lcom/facebook/imagepipeline/i/k;->m(F)V
 
     :cond_1
-    invoke-interface {p1, v3, v6}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
+    if-eqz v7, :cond_2
+
+    const/4 v8, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v8, 0x0
+
+    :goto_1
+    invoke-interface {p1, v3, v8}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
     invoke-virtual {v3}, Lcom/facebook/common/references/CloseableReference;->close()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v6, :cond_2
+    if-eqz v7, :cond_3
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
     return-void
 
-    :cond_2
+    :cond_3
     :try_start_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v3
 
     iget v3, v3, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
-    sget-object v6, Lcom/facebook/imagepipeline/request/b$b;->Ux:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v7, Lcom/facebook/imagepipeline/request/b$b;->Ux:Lcom/facebook/imagepipeline/request/b$b;
 
-    iget v6, v6, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
+    iget v7, v7, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
-    if-lt v3, v6, :cond_4
+    if-lt v3, v7, :cond_5
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jc()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jb()Ljava/lang/String;
 
     move-result-object p2
 
@@ -243,7 +256,7 @@
 
     move-result v2
 
-    if-eqz v2, :cond_3
+    if-eqz v2, :cond_4
 
     const-string v2, "cached_value_found"
 
@@ -253,23 +266,21 @@
 
     move-result-object v2
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_3
-    move-object v2, v5
+    :cond_4
+    move-object v2, v6
 
-    :goto_1
+    :goto_2
     invoke-interface {v0, v1, p2, v2}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jc()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jb()Ljava/lang/String;
 
     move-result-object p2
 
-    const/4 v2, 0x0
+    invoke-interface {v0, v1, p2, v4}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    invoke-interface {v0, v1, p2, v2}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    invoke-interface {p1, v5, v4}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
+    invoke-interface {p1, v6, v5}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -277,9 +288,9 @@
 
     return-void
 
-    :cond_4
+    :cond_5
     :try_start_2
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
@@ -289,7 +300,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jc()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->jb()Ljava/lang/String;
 
     move-result-object v2
 
@@ -297,7 +308,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_5
+    if-eqz v3, :cond_6
 
     const-string v3, "cached_value_found"
 
@@ -305,10 +316,10 @@
 
     invoke-static {v3, v4}, Lcom/facebook/common/d/f;->c(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
 
-    move-result-object v5
+    move-result-object v6
 
-    :cond_5
-    invoke-interface {v0, v1, v2, v5}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
+    :cond_6
+    invoke-interface {v0, v1, v2, v6}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
@@ -332,7 +343,7 @@
     throw p1
 .end method
 
-.method protected jc()Ljava/lang/String;
+.method protected jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "BitmapMemoryCacheProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/i$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/i$a.smali
index 397324ae8b..a3e36ecee1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/i$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/i$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/i$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "BitmapPrepareProducer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/i.smali b/com.discord/smali/com/facebook/imagepipeline/i/i.smali
index 8ba13a1df8..e1be8260d6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/i.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/i;
 .super Ljava/lang/Object;
+.source "BitmapPrepareProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/j$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/j$a.smali
index d1aeb31605..f2495913ab 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/j$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/j$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/j$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "BranchOnSeparateImagesProducer.java"
 
 
 # annotations
@@ -68,7 +69,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -95,17 +96,21 @@
 
     if-eqz v2, :cond_1
 
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
+
+    invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
+
     goto :goto_0
 
     :cond_1
     and-int/lit8 p2, p2, -0x2
 
-    :goto_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
     :cond_2
+    :goto_0
     if-eqz v1, :cond_3
 
     if-nez v2, :cond_3
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/j.smali b/com.discord/smali/com/facebook/imagepipeline/i/j.smali
index e1b53c3389..a37ab8e888 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/j.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/j;
 .super Ljava/lang/Object;
+.source "BranchOnSeparateImagesProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/k.smali b/com.discord/smali/com/facebook/imagepipeline/i/k.smali
index 51605db1ce..b80970587f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/k.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/k.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/k;
 .super Ljava/lang/Object;
+.source "Consumer.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract fg()V
+.method public abstract ff()V
 .end method
 
 .method public abstract h(Ljava/lang/Throwable;)V
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/l.smali b/com.discord/smali/com/facebook/imagepipeline/i/l.smali
index 9cf1ed9e10..6915f40730 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/l.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/l.smali
@@ -1,12 +1,13 @@
 .class public final Lcom/facebook/imagepipeline/i/l;
 .super Lcom/facebook/imagepipeline/i/aa;
+.source "DataFetchProducer.java"
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/common/g/g;)V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fd()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fc()Lcom/facebook/common/b/a;
 
     move-result-object v0
 
@@ -130,7 +131,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "DataFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/m$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/m$a.smali
index 9dbb424b18..1c80c7ffd3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/m$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/m$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/m$a;
 .super Lcom/facebook/imagepipeline/i/m$c;
+.source "DecodeProducer.java"
 
 
 # annotations
@@ -91,7 +92,7 @@
     return p1
 .end method
 
-.method protected final ih()Lcom/facebook/imagepipeline/f/h;
+.method protected final ig()Lcom/facebook/imagepipeline/f/h;
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/m$b.smali b/com.discord/smali/com/facebook/imagepipeline/i/m$b.smali
index 6a4ca1b0cc..22182d5bd6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/m$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/m$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/m$b;
 .super Lcom/facebook/imagepipeline/i/m$c;
+.source "DecodeProducer.java"
 
 
 # annotations
@@ -120,7 +121,7 @@
 
     if-eqz p2, :cond_4
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object p2
 
@@ -213,7 +214,7 @@
     return p1
 .end method
 
-.method protected final ih()Lcom/facebook/imagepipeline/f/h;
+.method protected final ig()Lcom/facebook/imagepipeline/f/h;
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$b;->OR:Lcom/facebook/imagepipeline/d/e;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/m$c$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/m$c$1.smali
index 43804da157..4106a69857 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/m$c$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/m$c$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/m$c$1;
 .super Ljava/lang/Object;
+.source "DecodeProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/v$a;
@@ -69,7 +70,7 @@
     :cond_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Su:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/m$c$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/m$c$2.smali
index 4c324c9597..e7742afb49 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/m$c$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/m$c$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/m$c$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "DecodeProducer.java"
 
 
 # annotations
@@ -38,7 +39,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Sx:Z
@@ -47,20 +48,20 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Sw:Lcom/facebook/imagepipeline/i/m$c;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/m$c;->jd()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/m$c;->jc()V
 
     :cond_0
     return-void
 .end method
 
-.method public final ja()V
+.method public final iZ()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Sw:Lcom/facebook/imagepipeline/i/m$c;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iW()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iV()Z
 
     move-result v0
 
@@ -70,7 +71,7 @@
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->jf()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->je()Z
 
     :cond_0
     return-void
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 847cad4814..ef432b70fe 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/m$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/m$c.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/facebook/imagepipeline/i/m$c;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "DecodeProducer.java"
 
 
 # annotations
@@ -68,13 +69,13 @@
 
     iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object p2
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->RZ:Lcom/facebook/imagepipeline/i/an;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p2
 
@@ -113,7 +114,7 @@
     return-void
 .end method
 
-.method private D(Z)V
+.method private C(Z)V
     .locals 1
 
     monitor-enter p0
@@ -144,15 +145,10 @@
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/v;->je()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/v;->jd()V
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_1
     :goto_0
     :try_start_1
@@ -160,7 +156,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_0
+    move-exception p1
+
     monitor-exit p0
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -216,7 +214,7 @@
 
     move-result-object p2
 
-    invoke-interface {p4}, Lcom/facebook/imagepipeline/f/h;->it()Z
+    invoke-interface {p4}, Lcom/facebook/imagepipeline/f/h;->is()Z
 
     move-result p3
 
@@ -355,7 +353,7 @@
 
     move/from16 v0, p2
 
-    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v1
 
@@ -388,10 +386,10 @@
 
     if-nez v1, :cond_2
 
-    goto/16 :goto_c
+    goto/16 :goto_9
 
     :cond_2
-    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v1
 
@@ -399,17 +397,16 @@
 
     iget-object v1, v1, Lcom/facebook/c/c;->mName:Ljava/lang/String;
 
-    :goto_1
     move-object v7, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const-string v1, "unknown"
 
-    goto :goto_1
+    move-object v7, v1
 
-    :goto_2
+    :goto_1
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
@@ -456,12 +453,12 @@
 
     const/4 v3, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/4 v3, 0x0
 
-    :goto_3
+    :goto_2
     const/4 v4, 0x4
 
     invoke-static {v0, v4}, Lcom/facebook/imagepipeline/i/m$c;->o(II)Z
@@ -470,7 +467,7 @@
 
     iget-object v9, v11, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v9}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v9}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v9
 
@@ -498,22 +495,22 @@
 
     move-result-object v9
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const-string v9, "unknown"
 
-    :goto_4
+    :goto_3
     :try_start_0
     iget-object v13, v11, Lcom/facebook/imagepipeline/i/m$c;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {v13}, Lcom/facebook/imagepipeline/i/v;->jh()J
+    invoke-virtual {v13}, Lcom/facebook/imagepipeline/i/v;->jg()J
 
     move-result-wide v13
 
     iget-object v15, v11, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v15}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v15}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v15
 
@@ -527,50 +524,48 @@
 
     if-eqz v5, :cond_6
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_6
     invoke-virtual/range {p0 .. p1}, Lcom/facebook/imagepipeline/i/m$c;->g(Lcom/facebook/imagepipeline/f/e;)I
 
     move-result v16
 
-    :goto_5
     move/from16 v1, v16
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_7
-    :goto_6
+    :goto_4
     invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
     move-result v16
 
-    goto :goto_5
+    move/from16 v1, v16
 
-    :goto_7
+    :goto_5
     if-nez v3, :cond_9
 
     if-eqz v5, :cond_8
 
-    goto :goto_9
+    goto :goto_6
 
     :cond_8
-    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/i/m$c;->ih()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/i/m$c;->ig()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v3
 
-    :goto_8
     move-object v5, v3
 
-    goto :goto_a
+    goto :goto_7
 
     :cond_9
-    :goto_9
+    :goto_6
     sget-object v3, Lcom/facebook/imagepipeline/f/g;->Qw:Lcom/facebook/imagepipeline/f/h;
 
-    goto :goto_8
+    move-object v5, v3
 
-    :goto_a
+    :goto_7
     iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->RZ:Lcom/facebook/imagepipeline/i/an;
 
     iget-object v4, v11, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/i/al;
@@ -594,7 +589,7 @@
 
     invoke-interface {v3, v12, v1, v5, v4}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
 
-    move-result-object v16
+    move-result-object v15
     :try_end_1
     .catch Lcom/facebook/imagepipeline/d/a; {:try_start_1 .. :try_end_1} :catch_2
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
@@ -615,7 +610,7 @@
     :cond_a
     move-object/from16 v1, p0
 
-    move-object/from16 v2, v16
+    move-object v2, v15
 
     move-wide v3, v13
 
@@ -636,7 +631,7 @@
 
     invoke-interface {v2, v3, v4, v1}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-static/range {v16 .. v16}, Lcom/facebook/common/references/CloseableReference;->b(Ljava/io/Closeable;)Lcom/facebook/common/references/CloseableReference;
+    invoke-static {v15}, Lcom/facebook/common/references/CloseableReference;->b(Ljava/io/Closeable;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v1
     :try_end_3
@@ -647,7 +642,7 @@
 
     move-result v2
 
-    invoke-direct {v11, v2}, Lcom/facebook/imagepipeline/i/m$c;->D(Z)V
+    invoke-direct {v11, v2}, Lcom/facebook/imagepipeline/i/m$c;->C(Z)V
 
     iget-object v2, v11, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
@@ -677,16 +672,16 @@
     :catch_0
     move-exception v0
 
-    move-object/from16 v2, v16
+    move-object v2, v15
 
-    goto :goto_b
+    goto :goto_8
 
     :catch_1
     move-exception v0
 
     const/4 v2, 0x0
 
-    goto :goto_b
+    goto :goto_8
 
     :catch_2
     move-exception v0
@@ -716,7 +711,7 @@
 
     const/4 v15, 0x2
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->io()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->in()Ljava/lang/String;
 
     move-result-object v16
 
@@ -741,7 +736,7 @@
     .catch Ljava/lang/Exception; {:try_start_7 .. :try_end_7} :catch_1
     .catchall {:try_start_7 .. :try_end_7} :catchall_1
 
-    :goto_b
+    :goto_8
     move-object/from16 v1, p0
 
     move-wide v3, v13
@@ -779,7 +774,7 @@
     throw v0
 
     :cond_b
-    :goto_c
+    :goto_9
     return-void
 .end method
 
@@ -788,7 +783,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/i/m$c;->D(Z)V
+    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/i/m$c;->C(Z)V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
@@ -883,7 +878,7 @@
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iW()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iV()Z
 
     move-result p1
 
@@ -892,7 +887,7 @@
     :cond_2
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Ss:Lcom/facebook/imagepipeline/i/v;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/v;->jf()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/v;->je()Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -932,27 +927,27 @@
     return-void
 .end method
 
-.method public final ic()V
+.method public final ib()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/m$c;->jd()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/m$c;->jc()V
 
     return-void
 .end method
 
-.method protected abstract ih()Lcom/facebook/imagepipeline/f/h;
+.method protected abstract ig()Lcom/facebook/imagepipeline/f/h;
 .end method
 
-.method final jd()V
+.method final jc()V
     .locals 1
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/i/m$c;->D(Z)V
+    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/i/m$c;->C(Z)V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/m.smali b/com.discord/smali/com/facebook/imagepipeline/i/m.smali
index 584b38f744..15567f7cf2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/m.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/m;
 .super Ljava/lang/Object;
+.source "DecodeProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -142,7 +143,7 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/j/b;->isTracing()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/n.smali b/com.discord/smali/com/facebook/imagepipeline/i/n.smali
index 66db705d09..75aed10fd1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/n.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/n.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/i/n;
 .super Lcom/facebook/imagepipeline/i/b;
+.source "DelegatingConsumer.java"
 
 
 # annotations
@@ -57,12 +58,12 @@
     return-void
 .end method
 
-.method protected ic()V
+.method protected ib()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/o$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/o$1.smali
index ae26dfd9b8..8588add38d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/o$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/o$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/o$1;
 .super Ljava/lang/Object;
+.source "DiskCacheReadProducer.java"
 
 # interfaces
 .implements La/f;
@@ -60,7 +61,7 @@
 
 # virtual methods
 .method public final synthetic a(La/h;)Ljava/lang/Object;
-    .locals 8
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/Exception;
@@ -117,9 +118,9 @@
 
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->SB:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->fg()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->ff()V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     invoke-virtual {p1}, La/h;->w()Z
@@ -140,7 +141,6 @@
 
     invoke-interface {v0, v1, v2, p1, v3}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    :goto_2
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->SC:Lcom/facebook/imagepipeline/i/o;
 
     iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->RX:Lcom/facebook/imagepipeline/i/ak;
@@ -151,7 +151,7 @@
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/i/ak;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/al;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     invoke-virtual {p1}, La/h;->getResult()Ljava/lang/Object;
@@ -168,15 +168,11 @@
 
     const-string v4, "DiskCacheProducer"
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/o$1;->Sz:Lcom/facebook/imagepipeline/i/an;
-
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/o$1;->SA:Ljava/lang/String;
-
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
-    move-result v7
+    move-result v5
 
-    invoke-static {v5, v6, v2, v7}, Lcom/facebook/imagepipeline/i/o;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
+    invoke-static {v0, v1, v2, v5}, Lcom/facebook/imagepipeline/i/o;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
 
     move-result-object v5
 
@@ -202,7 +198,7 @@
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->close()V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Sz:Lcom/facebook/imagepipeline/i/an;
@@ -211,18 +207,22 @@
 
     const-string v2, "DiskCacheProducer"
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/o$1;->Sz:Lcom/facebook/imagepipeline/i/an;
-
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/o$1;->SA:Ljava/lang/String;
-
-    invoke-static {v4, v5, v1, v1}, Lcom/facebook/imagepipeline/i/o;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
+    invoke-static {p1, v0, v1, v1}, Lcom/facebook/imagepipeline/i/o;->a(Lcom/facebook/imagepipeline/i/an;Ljava/lang/String;ZI)Ljava/util/Map;
 
     move-result-object v1
 
     invoke-interface {p1, v0, v2, v1}, Lcom/facebook/imagepipeline/i/an;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    goto :goto_2
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->SC:Lcom/facebook/imagepipeline/i/o;
 
-    :goto_3
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->RX:Lcom/facebook/imagepipeline/i/ak;
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->SB:Lcom/facebook/imagepipeline/i/k;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Su:Lcom/facebook/imagepipeline/i/al;
+
+    invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/i/ak;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/al;)V
+
+    :goto_2
     return-object v3
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/o$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/o$2.smali
index 13c52d8362..48e69de0c3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/o$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/o$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/o$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "DiskCacheReadProducer.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$2;->MY:Ljava/util/concurrent/atomic/AtomicBoolean;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/o.smali b/com.discord/smali/com/facebook/imagepipeline/i/o.smali
index ae67afcbcd..e503353c90 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/o.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/o.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/o;
 .super Ljava/lang/Object;
+.source "DiskCacheReadProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -137,7 +138,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -147,7 +148,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v0
 
@@ -173,7 +174,7 @@
     return-void
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v1
 
@@ -227,7 +228,7 @@
 
     move-result-object v6
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/p$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/p$a.smali
index 8043670b14..d986cc8b4a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/p$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/p$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/p$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "DiskCacheWriteProducer.java"
 
 
 # annotations
@@ -91,7 +92,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v0
 
@@ -104,7 +105,7 @@
     :cond_0
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Sm:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -122,15 +123,21 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Ov:Lcom/facebook/imagepipeline/cache/e;
 
-    :goto_0
     invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->PH:Lcom/facebook/imagepipeline/cache/e;
 
-    goto :goto_0
+    invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
+
+    :goto_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Sy:Lcom/facebook/imagepipeline/i/k;
+
+    invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
+
+    return-void
 
     :cond_2
     :goto_1
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/p.smali b/com.discord/smali/com/facebook/imagepipeline/i/p.smali
index c26e581621..ce365197af 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/p.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/p;
 .super Ljava/lang/Object;
+.source "DiskCacheWriteProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -83,7 +84,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v0
 
@@ -104,7 +105,7 @@
     return-void
 
     :cond_0
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/q.smali b/com.discord/smali/com/facebook/imagepipeline/i/q.smali
index 7e2bba2dcd..43a6d22ecb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/q.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/q.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/q;
 .super Ljava/lang/Object;
+.source "DownsampleUtil.java"
 
 
 # direct methods
@@ -214,7 +215,7 @@
 
     move-result p0
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v0
 
@@ -264,7 +265,7 @@
 
     if-lez p3, :cond_4
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object p3
 
@@ -288,7 +289,7 @@
 .method private static a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->ht()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hs()Z
 
     move-result p0
 
@@ -299,7 +300,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/r.smali b/com.discord/smali/com/facebook/imagepipeline/i/r.smali
index ae20201dfe..c49d50cc8b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/r.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/r.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/r;
 .super Lcom/facebook/imagepipeline/i/ae;
+.source "EncodedCacheKeyMultiplexProducer.java"
 
 
 # annotations
@@ -38,7 +39,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/r;->Ow:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
@@ -46,7 +47,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/s$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/s$a.smali
index 8d6d2812ab..388ed54af2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/s$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/s$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/s$a;
 .super Lcom/facebook/imagepipeline/i/n;
+.source "EncodedMemoryCacheProducer.java"
 
 
 # annotations
@@ -92,7 +93,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->il()Lcom/facebook/c/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->ik()Lcom/facebook/c/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/s.smali b/com.discord/smali/com/facebook/imagepipeline/i/s.smali
index 5fd0cd4fa2..2f48bb765e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/s.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/s.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/s;
 .super Ljava/lang/Object;
+.source "EncodedMemoryCacheProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/ak;
@@ -97,7 +98,7 @@
 
     move-result-object v0
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v1
 
@@ -105,7 +106,7 @@
 
     invoke-interface {v1, v0, v2}, Lcom/facebook/imagepipeline/i/an;->s(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
@@ -190,13 +191,8 @@
 
     throw p1
 
-    :catchall_1
-    move-exception p1
-
-    goto :goto_1
-
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iU()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iT()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v6
 
@@ -253,7 +249,7 @@
 
     :cond_3
     :try_start_7
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
@@ -299,7 +295,9 @@
 
     return-void
 
-    :goto_1
+    :catchall_1
+    move-exception p1
+
     :try_start_9
     invoke-static {v3}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/t.smali b/com.discord/smali/com/facebook/imagepipeline/i/t.smali
index 6ef00bea5b..5e5022adf7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/t.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/t.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/t;
 .super Ljava/lang/Object;
+.source "FetchState.java"
 
 
 # instance fields
@@ -66,12 +67,12 @@
     return-object v0
 .end method
 
-.method public final iS()Lcom/facebook/imagepipeline/i/an;
+.method public final iR()Lcom/facebook/imagepipeline/i/an;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->SF:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/u$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/u$1.smali
index 3f0057eac1..2e488dfc23 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/u$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/u$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/u$1;
 .super Ljava/lang/Object;
+.source "HttpUrlConnectionNetworkFetcher.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -55,7 +56,7 @@
     :try_start_0
     iget-object v1, v1, Lcom/facebook/imagepipeline/i/t;->SF:Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
@@ -88,8 +89,8 @@
 
     move-result v6
     :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_3
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     const/16 v7, 0xc8
 
@@ -118,52 +119,32 @@
     :try_start_1
     invoke-virtual {v5}, Ljava/net/HttpURLConnection;->getInputStream()Ljava/io/InputStream;
 
-    move-result-object v0
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+    move-result-object v3
 
-    :try_start_2
-    invoke-interface {v2, v0}, Lcom/facebook/imagepipeline/i/ag$a;->g(Ljava/io/InputStream;)V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    invoke-interface {v2, v3}, Lcom/facebook/imagepipeline/i/ag$a;->g(Ljava/io/InputStream;)V
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     goto :goto_2
 
-    :catchall_0
-    move-exception v1
-
-    move-object v3, v0
-
-    goto/16 :goto_a
-
     :catch_0
-    move-exception v1
+    move-exception v0
 
-    move-object v3, v0
-
-    goto/16 :goto_8
-
-    :catch_1
-    move-exception v1
-
-    goto/16 :goto_8
+    goto/16 :goto_7
 
     :cond_1
-    move-object v0, v3
-
     :goto_2
-    if-eqz v0, :cond_2
+    if-eqz v3, :cond_2
 
-    :try_start_3
-    invoke-virtual {v0}, Ljava/io/InputStream;->close()V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
+    :try_start_2
+    invoke-virtual {v3}, Ljava/io/InputStream;->close()V
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
 
     goto :goto_3
 
-    :catch_2
+    :catch_1
     nop
 
     :cond_2
@@ -190,7 +171,7 @@
 
     if-eqz v7, :cond_7
 
-    :try_start_4
+    :try_start_3
     const-string v7, "Location"
 
     invoke-virtual {v5, v7}, Ljava/net/HttpURLConnection;->getHeaderField(Ljava/lang/String;)Ljava/lang/String;
@@ -248,12 +229,11 @@
 
     aput-object v1, v4, v8
 
-    :goto_6
     invoke-static {v0, v4}, Lcom/facebook/imagepipeline/i/u;->h(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_6
     const-string v0, "URL %s returned %d without a valid redirect"
@@ -272,9 +252,11 @@
 
     aput-object v1, v4, v9
 
-    goto :goto_6
+    invoke-static {v0, v4}, Lcom/facebook/imagepipeline/i/u;->h(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
-    :goto_7
+    move-result-object v0
+
+    :goto_6
     new-instance v1, Ljava/io/IOException;
 
     invoke-direct {v1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
@@ -309,73 +291,77 @@
     invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
     throw v0
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :catchall_0
+    move-exception v0
+
+    move-object v5, v3
+
+    goto :goto_9
+
+    :catch_2
+    move-exception v0
+
+    move-object v5, v3
+
+    :goto_7
+    :try_start_4
+    invoke-interface {v2, v0}, Lcom/facebook/imagepipeline/i/ag$a;->h(Ljava/lang/Throwable;)V
     :try_end_4
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_3
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
-    :catchall_1
-    move-exception v1
+    if-eqz v3, :cond_8
 
-    move-object v5, v3
+    :try_start_5
+    invoke-virtual {v3}, Ljava/io/InputStream;->close()V
+    :try_end_5
+    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
 
-    goto :goto_a
+    goto :goto_8
 
     :catch_3
-    move-exception v1
-
-    move-object v5, v3
+    nop
 
+    :cond_8
     :goto_8
-    :try_start_5
-    invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/i/ag$a;->h(Ljava/lang/Throwable;)V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+    if-eqz v5, :cond_9
 
-    if-eqz v3, :cond_8
+    invoke-virtual {v5}, Ljava/net/HttpURLConnection;->disconnect()V
+
+    return-void
+
+    :cond_9
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    :goto_9
+    if-eqz v3, :cond_a
 
     :try_start_6
     invoke-virtual {v3}, Ljava/io/InputStream;->close()V
     :try_end_6
     .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_4
 
-    goto :goto_9
+    goto :goto_a
 
     :catch_4
     nop
 
-    :cond_8
-    :goto_9
-    if-eqz v5, :cond_9
-
-    invoke-virtual {v5}, Ljava/net/HttpURLConnection;->disconnect()V
-
-    :cond_9
-    return-void
-
-    :catchall_2
-    move-exception v1
-
-    :goto_a
-    if-eqz v3, :cond_a
-
-    :try_start_7
-    invoke-virtual {v3}, Ljava/io/InputStream;->close()V
-    :try_end_7
-    .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_5
-
-    goto :goto_b
-
-    :catch_5
-    nop
-
     :cond_a
-    :goto_b
+    :goto_a
     if-eqz v5, :cond_b
 
     invoke-virtual {v5}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_b
-    throw v1
+    throw v0
+
+    return-void
 
     nop
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/u$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/u$2.smali
index 16b4ae214c..32746e2d86 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/u$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/u$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/u$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "HttpUrlConnectionNetworkFetcher.java"
 
 
 # annotations
@@ -38,7 +39,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/u$2;->SM:Ljava/util/concurrent/Future;
@@ -53,7 +54,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/u$2;->SK:Lcom/facebook/imagepipeline/i/ag$a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ag$a;->fg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ag$a;->ff()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/u.smali b/com.discord/smali/com/facebook/imagepipeline/i/u.smali
index e722931cd9..2efae08521 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/u.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/u.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/u;
 .super Lcom/facebook/imagepipeline/i/c;
+.source "HttpUrlConnectionNetworkFetcher.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/v$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/v$1.smali
index 5ea35d1370..70bd515ab5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/v$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/v$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/v$1;
 .super Ljava/lang/Object;
+.source "JobScheduler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -83,7 +84,7 @@
     :cond_0
     invoke-static {v3}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->jg()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->jf()V
 
     return-void
 
@@ -92,7 +93,7 @@
 
     invoke-static {v3}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->jg()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/v;->jf()V
 
     throw v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/v$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/v$2.smali
index e258e92f99..dfd36f70c5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/v$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/v$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/v$2;
 .super Ljava/lang/Object;
+.source "JobScheduler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/v$3.smali b/com.discord/smali/com/facebook/imagepipeline/i/v$3.smali
index 5da4131baa..11f41aabcc 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/v$3.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/v$3.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/facebook/imagepipeline/i/v$3;
 .super Ljava/lang/Object;
+.source "JobScheduler.java"
 
 
 # annotations
@@ -21,7 +22,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/v$c;->jj()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/i/v$c;->ji()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/v$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/v$a.smali
index 6459033a8a..94f3b6d6e9 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/v$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/v$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/i/v$a;
 .super Ljava/lang/Object;
+.source "JobScheduler.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/v$b.smali b/com.discord/smali/com/facebook/imagepipeline/i/v$b.smali
index 63c8f3723e..be00860b5c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/v$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/v$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/v$b;
 .super Ljava/lang/Object;
+.source "JobScheduler.java"
 
 
 # annotations
@@ -18,7 +19,7 @@
 
 
 # direct methods
-.method static ji()Ljava/util/concurrent/ScheduledExecutorService;
+.method static jh()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/i/v$b;->SY:Ljava/util/concurrent/ScheduledExecutorService;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/v$c.smali b/com.discord/smali/com/facebook/imagepipeline/i/v$c.smali
index a0e8abb423..f7a71fd2eb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/v$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/v$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/v$c;
 .super Ljava/lang/Enum;
+.source "JobScheduler.java"
 
 
 # annotations
@@ -70,7 +71,7 @@
     return-void
 .end method
 
-.method public static jj()[I
+.method public static ji()[I
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/i/v$c;->Td:[I
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/v.smali b/com.discord/smali/com/facebook/imagepipeline/i/v.smali
index 30f3630d5a..d0734c3325 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/v.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/v.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/v;
 .super Ljava/lang/Object;
+.source "JobScheduler.java"
 
 
 # annotations
@@ -145,7 +146,7 @@
 
     if-lez v2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/v$b;->ji()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lcom/facebook/imagepipeline/i/v$b;->jh()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object v0
 
@@ -215,7 +216,7 @@
     throw p1
 .end method
 
-.method public final je()V
+.method public final jd()V
     .locals 2
 
     monitor-enter p0
@@ -250,7 +251,7 @@
     throw v0
 .end method
 
-.method public final jf()Z
+.method public final je()Z
     .locals 8
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
@@ -361,7 +362,7 @@
     .end packed-switch
 .end method
 
-.method final jg()V
+.method final jf()V
     .locals 6
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
@@ -433,8 +434,8 @@
     throw v0
 .end method
 
-.method public final declared-synchronized jh()J
-    .locals 5
+.method public final declared-synchronized jg()J
+    .locals 4
 
     monitor-enter p0
 
@@ -445,8 +446,6 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    const/4 v4, 0x0
-
     sub-long/2addr v0, v2
 
     monitor-exit p0
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/w.smali b/com.discord/smali/com/facebook/imagepipeline/i/w.smali
index 395ad462b3..328ad1f7d1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/w.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/w.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/w;
 .super Lcom/facebook/imagepipeline/i/aa;
+.source "LocalAssetFetchProducer.java"
 
 
 # instance fields
@@ -31,70 +32,51 @@
 
     invoke-virtual {v1, p1}, Landroid/content/res/AssetManager;->openFd(Ljava/lang/String;)Landroid/content/res/AssetFileDescriptor;
 
-    move-result-object p1
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->getLength()J
+
+    move-result-wide v1
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    long-to-int p1, v1
+
+    if-eqz v0, :cond_0
 
     :try_start_1
-    invoke-virtual {p1}, Landroid/content/res/AssetFileDescriptor;->getLength()J
-
-    move-result-wide v0
+    invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->close()V
     :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_3
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    long-to-int v0, v0
-
-    if-eqz p1, :cond_0
-
-    :try_start_2
-    invoke-virtual {p1}, Landroid/content/res/AssetFileDescriptor;->close()V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
     :catch_0
     :cond_0
-    return v0
+    return p1
 
     :catchall_0
-    move-exception v0
-
-    move-object v2, v0
-
-    move-object v0, p1
-
-    move-object p1, v2
-
-    goto :goto_0
-
-    :catchall_1
     move-exception p1
 
-    :goto_0
     if-eqz v0, :cond_1
 
-    :try_start_3
+    :try_start_2
     invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->close()V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_1
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
 
     :catch_1
     :cond_1
     throw p1
 
     :catch_2
-    move-object p1, v0
+    if-eqz v0, :cond_2
+
+    :try_start_3
+    invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->close()V
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_3
 
     :catch_3
-    if-eqz p1, :cond_2
-
-    :try_start_4
-    invoke-virtual {p1}, Landroid/content/res/AssetFileDescriptor;->close()V
-    :try_end_4
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_4
-
-    :catch_4
     :cond_2
     const/4 p1, -0x1
 
@@ -152,7 +134,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalAssetFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/x.smali b/com.discord/smali/com/facebook/imagepipeline/i/x.smali
index 01eab6655e..870c81299d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/x.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/x.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/i/x;
 .super Lcom/facebook/imagepipeline/i/aa;
+.source "LocalContentUriFetchProducer.java"
 
 
 # static fields
@@ -191,8 +192,6 @@
 
     move-result-object p1
 
-    move-object v0, p1
-
     goto :goto_0
 
     :cond_0
@@ -219,7 +218,7 @@
 
     invoke-virtual {v0}, Landroid/content/res/AssetFileDescriptor;->createInputStream()Ljava/io/FileInputStream;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -251,8 +250,10 @@
 
     if-eqz v0, :cond_2
 
+    move-object p1, v0
+
     :goto_0
-    invoke-virtual {p0, v0, v1}, Lcom/facebook/imagepipeline/i/x;->e(Ljava/io/InputStream;I)Lcom/facebook/imagepipeline/f/e;
+    invoke-virtual {p0, p1, v1}, Lcom/facebook/imagepipeline/i/x;->e(Ljava/io/InputStream;I)Lcom/facebook/imagepipeline/f/e;
 
     move-result-object p1
 
@@ -304,7 +305,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalContentUriFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/y.smali b/com.discord/smali/com/facebook/imagepipeline/i/y.smali
index 9c9d71627f..48a8313132 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/y.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/y.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/i/y;
 .super Lcom/facebook/imagepipeline/i/aa;
+.source "LocalContentUriThumbnailFetchProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/aw;
@@ -408,11 +409,11 @@
 
     invoke-static {v2}, Lcom/facebook/imageutils/e;->aB(I)I
 
-    move-result v2
+    move-result p0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v2
+    return p0
 
     :catch_0
     move-exception v2
@@ -487,7 +488,7 @@
     return-object p1
 .end method
 
-.method protected final jc()Ljava/lang/String;
+.method protected final jb()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalContentUriThumbnailFetchProducer"
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 47c1d494dd..0b1c9b36cb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/z$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/z$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/z$1;
 .super Lcom/facebook/imagepipeline/i/ar;
+.source "LocalExifThumbnailProducer.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/z$2.smali b/com.discord/smali/com/facebook/imagepipeline/i/z$2.smali
index 9b3a55adb8..96c593bbc2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/z$2.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/z$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/i/z$2;
 .super Lcom/facebook/imagepipeline/i/e;
+.source "LocalExifThumbnailProducer.java"
 
 
 # annotations
@@ -34,7 +35,7 @@
 
 
 # virtual methods
-.method public final iY()V
+.method public final iX()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$2;->Tk:Lcom/facebook/imagepipeline/i/ar;
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/z.smali b/com.discord/smali/com/facebook/imagepipeline/i/z.smali
index 9bd0816371..650680750c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/z.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/z.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/i/z;
 .super Ljava/lang/Object;
+.source "LocalExifThumbnailProducer.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/i/aw;
@@ -159,7 +160,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iS()Lcom/facebook/imagepipeline/i/an;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/i/an;
 
     move-result-object v3
 
@@ -167,7 +168,7 @@
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iR()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/al;->iQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/a.smali b/com.discord/smali/com/facebook/imagepipeline/j/a.smali
index 6237ae6c51..bb07c3fa22 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/j/a;
 .super Ljava/lang/Object;
+.source "DefaultFrescoSystrace.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/j/b$c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/b$a.smali b/com.discord/smali/com/facebook/imagepipeline/j/b$a.smali
index 7c85859a20..2fa0c2a1f6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/b$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/b$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/j/b$a;
 .super Ljava/lang/Object;
+.source "FrescoSystrace.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/b$b.smali b/com.discord/smali/com/facebook/imagepipeline/j/b$b.smali
index f3b0bce51b..0022e44075 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/b$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/j/b$b;
 .super Ljava/lang/Object;
+.source "FrescoSystrace.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/j/b$a;
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/b$c.smali b/com.discord/smali/com/facebook/imagepipeline/j/b$c.smali
index 45a51b9d76..f4825a1593 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/b$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/b$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/j/b$c;
 .super Ljava/lang/Object;
+.source "FrescoSystrace.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/b.smali b/com.discord/smali/com/facebook/imagepipeline/j/b.smali
index 79724d86dc..d3ea579fdf 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/j/b;
 .super Ljava/lang/Object;
+.source "FrescoSystrace.java"
 
 
 # annotations
@@ -48,14 +49,14 @@
 .method public static isTracing()Z
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->jy()Lcom/facebook/imagepipeline/j/b$c;
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->jx()Lcom/facebook/imagepipeline/j/b$c;
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method private static jy()Lcom/facebook/imagepipeline/j/b$c;
+.method private static jx()Lcom/facebook/imagepipeline/j/b$c;
     .locals 2
 
     sget-object v0, Lcom/facebook/imagepipeline/j/b;->UB:Lcom/facebook/imagepipeline/j/b$c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/a.smali b/com.discord/smali/com/facebook/imagepipeline/k/a.smali
index 409b08546e..68e5a2db4d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/k/a;
 .super Ljava/lang/Object;
+.source "ImageTranscodeResult.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/b.smali b/com.discord/smali/com/facebook/imagepipeline/k/b.smali
index 0e28887e79..f8e591ee4f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/k/b;
 .super Ljava/lang/Object;
+.source "ImageTranscoder.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/c.smali b/com.discord/smali/com/facebook/imagepipeline/k/c.smali
index ffecb92a16..2e40c619dc 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/k/c;
 .super Ljava/lang/Object;
+.source "ImageTranscoderFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/d.smali b/com.discord/smali/com/facebook/imagepipeline/k/d.smali
index ccd6f3c099..04d77c3c5e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/k/d;
 .super Ljava/lang/Object;
+.source "JpegTranscoderUtils.java"
 
 
 # static fields
@@ -92,7 +93,7 @@
 
     sget-object v1, Lcom/facebook/imagepipeline/k/d;->UD:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result v2
 
@@ -252,7 +253,7 @@
 .method public static a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hu()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->ht()Z
 
     move-result v0
 
@@ -267,7 +268,7 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->ht()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hs()Z
 
     move-result v0
 
@@ -276,7 +277,7 @@
     return p1
 
     :cond_1
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hv()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hu()I
 
     move-result p0
 
@@ -294,7 +295,7 @@
 
     sget-object v0, Lcom/facebook/imagepipeline/k/d;->UD:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result v1
 
@@ -332,35 +333,42 @@
 
     packed-switch p0, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     const/high16 p0, 0x42b40000    # 90.0f
 
+    invoke-virtual {p1, p0}, Landroid/graphics/Matrix;->setRotate(F)V
+
+    invoke-virtual {p1, v3, v2}, Landroid/graphics/Matrix;->postScale(FF)Z
+
     goto :goto_0
 
     :pswitch_1
     const/high16 p0, 0x43340000    # 180.0f
 
-    :goto_0
     invoke-virtual {p1, p0}, Landroid/graphics/Matrix;->setRotate(F)V
 
     invoke-virtual {p1, v3, v2}, Landroid/graphics/Matrix;->postScale(FF)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/high16 p0, -0x3d4c0000    # -90.0f
 
+    invoke-virtual {p1, p0}, Landroid/graphics/Matrix;->setRotate(F)V
+
+    invoke-virtual {p1, v3, v2}, Landroid/graphics/Matrix;->postScale(FF)Z
+
     goto :goto_0
 
     :cond_1
     invoke-virtual {p1, v3, v2}, Landroid/graphics/Matrix;->setScale(FF)V
 
-    :goto_1
+    :goto_0
     move-object v1, p1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-static {p1, p0}, Lcom/facebook/imagepipeline/k/d;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
@@ -378,7 +386,7 @@
     invoke-virtual {v1, p0}, Landroid/graphics/Matrix;->setRotate(F)V
 
     :cond_3
-    :goto_2
+    :goto_1
     return-object v1
 
     :pswitch_data_0
@@ -459,7 +467,7 @@
 .method public static b(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
     .locals 2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result p1
 
@@ -477,13 +485,13 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->ht()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hs()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hv()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hu()I
 
     move-result v0
 
@@ -494,9 +502,7 @@
 
     add-int/2addr p1, v0
 
-    sget-object v0, Lcom/facebook/imagepipeline/k/d;->UD:Lcom/facebook/common/d/e;
-
-    invoke-virtual {v0}, Lcom/facebook/common/d/e;->size()I
+    invoke-virtual {p0}, Lcom/facebook/common/d/e;->size()I
 
     move-result v0
 
@@ -527,7 +533,7 @@
 .method private static h(Lcom/facebook/imagepipeline/f/e;)I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->il()I
 
     move-result v0
 
@@ -548,7 +554,7 @@
     return p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->im()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->il()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 42206b6dd4..9ecfb1a73a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/k/e;
 .super Ljava/lang/Object;
+.source "MultiImageTranscoderFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/k/c;
@@ -98,8 +99,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/k/e;->UE:Lcom/facebook/imagepipeline/k/c;
-
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/k/c;->a(Lcom/facebook/c/c;Z)Lcom/facebook/imagepipeline/k/b;
 
     move-result-object v0
@@ -111,14 +110,11 @@
 
     if-nez v0, :cond_1
 
-    :goto_1
     move-object v0, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/k/e;->OJ:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -138,6 +134,8 @@
 
     move-result-object v1
 
+    move-object v0, v1
+
     goto :goto_1
 
     :pswitch_1
@@ -145,10 +143,10 @@
 
     move-result-object v1
 
-    goto :goto_1
+    move-object v0, v1
 
     :cond_2
-    :goto_2
+    :goto_1
     if-nez v0, :cond_3
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/k/e;->b(Lcom/facebook/c/c;Z)Lcom/facebook/imagepipeline/k/b;
@@ -167,6 +165,8 @@
     :cond_4
     return-object v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/f.smali b/com.discord/smali/com/facebook/imagepipeline/k/f.smali
index f5bf1d6bc9..75a28c9000 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/k/f;
 .super Ljava/lang/Object;
+.source "SimpleImageTranscoder.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/k/b;
@@ -53,24 +54,22 @@
 
     move-result-object v2
 
-    move-object v3, v2
-
     goto :goto_0
 
     :cond_0
-    move-object/from16 v3, p5
+    move-object/from16 v2, p5
 
     :goto_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hr()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hq()Lcom/facebook/imagepipeline/a/f;
 
-    move-result-object v2
+    move-result-object v3
 
     goto :goto_1
 
     :cond_1
-    move-object/from16 v2, p3
+    move-object/from16 v3, p3
 
     :goto_1
     iget-boolean v4, v1, Lcom/facebook/imagepipeline/k/f;->RP:Z
@@ -88,7 +87,7 @@
 
     move-object/from16 v6, p4
 
-    invoke-static {v2, v6, v0, v4}, Lcom/facebook/imagepipeline/i/q;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/f/e;I)I
+    invoke-static {v3, v6, v0, v4}, Lcom/facebook/imagepipeline/i/q;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/f/e;I)I
 
     move-result v4
 
@@ -129,7 +128,7 @@
     return-object v0
 
     :cond_3
-    invoke-static {v0, v2}, Lcom/facebook/imagepipeline/k/d;->a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/f;)Landroid/graphics/Matrix;
+    invoke-static {v0, v3}, Lcom/facebook/imagepipeline/k/d;->a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/f;)Landroid/graphics/Matrix;
 
     move-result-object v15
 
@@ -159,38 +158,38 @@
     .catch Ljava/lang/OutOfMemoryError; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    move-object v2, v0
+    move-object v3, v0
 
     goto :goto_3
 
     :catchall_0
     move-exception v0
 
-    move-object v2, v6
+    move-object v3, v6
 
     goto :goto_5
 
     :catch_0
     move-exception v0
 
-    move-object v2, v6
+    move-object v3, v6
 
     goto :goto_4
 
     :cond_4
-    move-object v2, v6
+    move-object v3, v6
 
     :goto_3
     :try_start_2
     sget-object v0, Landroid/graphics/Bitmap$CompressFormat;->JPEG:Landroid/graphics/Bitmap$CompressFormat;
 
-    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
-    move-result v3
+    move-result v2
 
     move-object/from16 v8, p2
 
-    invoke-virtual {v2, v0, v3, v8}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
+    invoke-virtual {v3, v0, v2, v8}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     new-instance v0, Lcom/facebook/imagepipeline/k/a;
 
@@ -204,7 +203,7 @@
     .catch Ljava/lang/OutOfMemoryError; {:try_start_2 .. :try_end_2} :catch_1
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
-    invoke-virtual {v2}, Landroid/graphics/Bitmap;->recycle()V
+    invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
     invoke-virtual {v6}, Landroid/graphics/Bitmap;->recycle()V
 
@@ -220,11 +219,11 @@
 
     :goto_4
     :try_start_3
-    const-string v3, "SimpleImageTranscoder"
+    const-string v2, "SimpleImageTranscoder"
 
     const-string v4, "Out-Of-Memory during transcode"
 
-    invoke-static {v3, v4, v0}, Lcom/facebook/common/e/a;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    invoke-static {v2, v4, v0}, Lcom/facebook/common/e/a;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     new-instance v0, Lcom/facebook/imagepipeline/k/a;
 
@@ -232,14 +231,14 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    invoke-virtual {v2}, Landroid/graphics/Bitmap;->recycle()V
+    invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
     invoke-virtual {v6}, Landroid/graphics/Bitmap;->recycle()V
 
     return-object v0
 
     :goto_5
-    invoke-virtual {v2}, Landroid/graphics/Bitmap;->recycle()V
+    invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
     invoke-virtual {v6}, Landroid/graphics/Bitmap;->recycle()V
 
@@ -274,7 +273,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hr()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hq()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/g.smali b/com.discord/smali/com/facebook/imagepipeline/k/g.smali
index aa32522a16..a7968e7492 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/k/g;
 .super Ljava/lang/Object;
+.source "SimpleImageTranscoderFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/k/c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/l/a.smali b/com.discord/smali/com/facebook/imagepipeline/l/a.smali
index 9e1517b8f8..d36da89aff 100644
--- a/com.discord/smali/com/facebook/imagepipeline/l/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/l/a.smali
@@ -1,7 +1,8 @@
 .class public interface abstract Lcom/facebook/imagepipeline/l/a;
 .super Ljava/lang/Object;
+.source "BitmapTransformation.java"
 
 
 # virtual methods
-.method public abstract jz()Z
+.method public abstract jy()Z
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali b/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
index 7b4d58b49e..c3535b8c4d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;
 .super Ljava/lang/Object;
+.source "NativeMemoryChunk.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/memory/r;
@@ -23,7 +24,7 @@
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iO()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iN()V
 
     return-void
 .end method
@@ -115,7 +116,7 @@
 
     invoke-static {v0, p1, v0, p4, p3}, Lcom/facebook/imagepipeline/memory/t;->b(IIIII)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/memory/r;->fn()J
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/memory/r;->fm()J
 
     move-result-wide p1
 
@@ -185,33 +186,44 @@
 
     const/4 v1, 0x1
 
-    xor-int/2addr v0, v1
+    const/4 v2, 0x0
 
-    invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
+    if-nez v0, :cond_0
 
-    const/4 v0, 0x0
-
-    if-ltz p1, :cond_0
-
-    const/4 v2, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v2}, Lcom/facebook/common/d/i;->checkArgument(Z)V
+    invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->mSize:I
-
-    if-ge p1, v2, :cond_1
+    if-ltz p1, :cond_1
 
     const/4 v0, 0x1
 
+    goto :goto_1
+
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->mSize:I
+
+    if-ge p1, v0, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
+    invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
+
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Ro:J
 
     int-to-long v2, p1
@@ -248,8 +260,16 @@
 
     move-result v0
 
-    xor-int/lit8 v0, v0, 0x1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->mSize:I
@@ -291,7 +311,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iD()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iC()J
 
     move-result-wide v0
 
@@ -356,7 +376,7 @@
     invoke-static {v4}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     :cond_0
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iD()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iC()J
 
     move-result-wide v0
 
@@ -462,8 +482,16 @@
 
     move-result v0
 
-    xor-int/lit8 v0, v0, 0x1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->mSize:I
@@ -595,7 +623,7 @@
     throw v0
 .end method
 
-.method public final fn()J
+.method public final fm()J
     .locals 2
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Ro:J
@@ -621,7 +649,7 @@
     return v0
 .end method
 
-.method public final iD()J
+.method public final iC()J
     .locals 2
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Ro:J
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/a$a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/a$a.smali
index c36d57cdfa..675111e824 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/a$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/memory/a$a;
 .super Ljava/lang/Object;
+.source "BasePool.java"
 
 
 # annotations
@@ -60,17 +61,13 @@
 
     if-lt v0, p1, :cond_0
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
+    iget v2, p0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
 
-    if-lez v0, :cond_0
+    if-lez v2, :cond_0
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
-
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->QI:I
+    iput v2, p0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
 
     sub-int/2addr v0, p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/a$b.smali b/com.discord/smali/com/facebook/imagepipeline/memory/a$b.smali
index 1504e0871a..df6d6654fe 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/a$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/a$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/a$b;
 .super Ljava/lang/RuntimeException;
+.source "BasePool.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/a$c.smali b/com.discord/smali/com/facebook/imagepipeline/memory/a$c.smali
index f3709d579b..5618fb63b9 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/a$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/a$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/a$c;
 .super Ljava/lang/RuntimeException;
+.source "BasePool.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/a.smali
index 6282f460d7..6caedd88ad 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/memory/a;
 .super Ljava/lang/Object;
+.source "BasePool.java"
 
 # interfaces
 .implements Lcom/facebook/common/g/d;
@@ -124,7 +125,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iv()V
 
     goto :goto_0
 
@@ -251,6 +252,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method private declared-synchronized af(I)Lcom/facebook/imagepipeline/memory/f;
@@ -451,7 +454,7 @@
     throw p1
 .end method
 
-.method private hp()V
+.method private ho()V
     .locals 7
     .annotation build Landroid/annotation/SuppressLint;
         value = {
@@ -509,13 +512,13 @@
     return-void
 .end method
 
-.method private declared-synchronized iv()V
+.method private declared-synchronized iu()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ix()Z
 
     move-result v0
 
@@ -555,7 +558,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized iw()V
+.method private declared-synchronized iv()V
     .locals 9
 
     monitor-enter p0
@@ -637,15 +640,17 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method private declared-synchronized ix()V
+.method private declared-synchronized iw()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ix()Z
 
     move-result v0
 
@@ -672,7 +677,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized iy()Z
+.method private declared-synchronized ix()Z
     .locals 2
 
     monitor-enter p0
@@ -698,7 +703,6 @@
 
     const/4 v0, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return v0
@@ -706,7 +710,9 @@
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return v0
 
     :catchall_0
     move-exception v0
@@ -789,7 +795,7 @@
     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;->hp()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ho()V
 
     const/4 v2, 0x0
 
@@ -841,7 +847,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hp()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ho()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->E(I)Z
 
@@ -886,6 +892,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -1015,7 +1023,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iu()V
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->ad(I)I
 
@@ -1062,7 +1070,7 @@
 
     invoke-virtual {v3, v0}, Lcom/facebook/imagepipeline/memory/a$a;->ak(I)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hp()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ho()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->E(I)Z
 
@@ -1126,12 +1134,10 @@
     :try_start_1
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->ac(I)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
 
-    move-object v0, v3
-
     goto :goto_0
 
     :catch_0
@@ -1150,7 +1156,7 @@
 
     if-eqz v2, :cond_3
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iB()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iA()V
 
     :cond_3
     monitor-exit p0
@@ -1171,9 +1177,9 @@
 
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ix()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iw()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hp()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ho()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->E(I)Z
 
@@ -1318,7 +1324,7 @@
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->L(Ljava/lang/Object;)V
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_0
     if-eqz v2, :cond_6
@@ -1347,7 +1353,7 @@
     :goto_0
     if-nez v3, :cond_6
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ix()Z
 
     move-result v3
 
@@ -1359,7 +1365,7 @@
 
     if-nez v3, :cond_2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
@@ -1383,10 +1389,9 @@
 
     iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->QU:I
 
-    :goto_1
     invoke-virtual {v2, p1}, Lcom/facebook/imagepipeline/memory/f;->P(Ljava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->QU:I
@@ -1399,6 +1404,8 @@
 
     iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->QU:I
 
+    invoke-virtual {v2, p1}, Lcom/facebook/imagepipeline/memory/f;->P(Ljava/lang/Object;)V
+
     goto :goto_1
 
     :cond_5
@@ -1412,7 +1419,7 @@
 
     invoke-static {v2, v3, v6}, Lcom/facebook/common/e/a;->c(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    :goto_2
+    :goto_1
     iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->QG:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/memory/a$a;->aj(I)V
@@ -1445,13 +1452,13 @@
 
     invoke-static {v1, v2, p1, v0}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
-    :goto_3
+    :goto_2
     if-eqz v2, :cond_7
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iB()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iA()V
 
     :cond_7
     invoke-static {v4}, Lcom/facebook/common/e/a;->E(I)Z
@@ -1486,8 +1493,8 @@
     invoke-virtual {p1, v1}, Lcom/facebook/imagepipeline/memory/a$a;->ak(I)V
 
     :cond_9
-    :goto_4
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hp()V
+    :goto_3
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->ho()V
 
     monitor-exit p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/aa.smali b/com.discord/smali/com/facebook/imagepipeline/memory/aa.smali
index b2e492c9a6..92ccf90da6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/aa.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/aa.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/facebook/imagepipeline/memory/aa;
 .super Ljava/lang/Object;
+.source "PoolBackend.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ab$a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ab$a.smali
index 1bb264dc00..29b7ca2c1d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ab$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ab$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/ab$a;
 .super Ljava/lang/Object;
+.source "PoolConfig.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali
index 0311bbd159..edd3016e7d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/ab;
 .super Ljava/lang/Object;
+.source "PoolConfig.java"
 
 
 # annotations
@@ -49,7 +50,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iE()Lcom/facebook/imagepipeline/memory/ad;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iD()Lcom/facebook/imagepipeline/memory/ad;
 
     move-result-object v0
 
@@ -65,7 +66,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iG()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iF()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v0
 
@@ -81,7 +82,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->iE()Lcom/facebook/imagepipeline/memory/ad;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->iD()Lcom/facebook/imagepipeline/memory/ad;
 
     move-result-object v0
 
@@ -97,7 +98,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/common/g/c;->fk()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->fj()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
@@ -244,7 +245,7 @@
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iG()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iF()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v0
 
@@ -284,7 +285,7 @@
 
     if-nez v0, :cond_a
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iG()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iF()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ac.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ac.smali
index 3061619e31..c7cadcc1c1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ac.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ac.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/ac;
 .super Ljava/lang/Object;
+.source "PoolFactory.java"
 
 
 # annotations
@@ -56,14 +57,14 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->iI()Lcom/facebook/imagepipeline/memory/j;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->iH()Lcom/facebook/imagepipeline/memory/j;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->iL()Lcom/facebook/imagepipeline/memory/x;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->iK()Lcom/facebook/imagepipeline/memory/x;
 
     move-result-object p1
 
@@ -78,7 +79,7 @@
     .end packed-switch
 .end method
 
-.method private iI()Lcom/facebook/imagepipeline/memory/j;
+.method private iH()Lcom/facebook/imagepipeline/memory/j;
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->RC:Lcom/facebook/imagepipeline/memory/j;
@@ -109,7 +110,7 @@
     return-object v0
 .end method
 
-.method private iL()Lcom/facebook/imagepipeline/memory/x;
+.method private iK()Lcom/facebook/imagepipeline/memory/x;
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->RD:Lcom/facebook/imagepipeline/memory/x;
@@ -155,7 +156,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iM()Lcom/facebook/common/g/j;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iL()Lcom/facebook/common/g/j;
 
     move-result-object v1
 
@@ -169,7 +170,7 @@
     return-object p1
 .end method
 
-.method public final iH()Lcom/facebook/imagepipeline/memory/d;
+.method public final iG()Lcom/facebook/imagepipeline/memory/d;
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MA:Lcom/facebook/imagepipeline/memory/d;
@@ -274,10 +275,9 @@
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/h;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    :goto_1
     iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MA:Lcom/facebook/imagepipeline/memory/d;
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     new-instance v0, Lcom/facebook/imagepipeline/memory/h;
@@ -286,7 +286,7 @@
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->OM:Lcom/facebook/common/g/b;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iE()Lcom/facebook/imagepipeline/memory/ad;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iD()Lcom/facebook/imagepipeline/memory/ad;
 
     move-result-object v2
 
@@ -296,6 +296,8 @@
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/h;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MA:Lcom/facebook/imagepipeline/memory/d;
+
     goto :goto_1
 
     :pswitch_1
@@ -309,12 +311,14 @@
 
     iget v2, v2, Lcom/facebook/imagepipeline/memory/ab;->RA:I
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iG()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iF()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v3
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/p;-><init>(IILcom/facebook/imagepipeline/memory/ae;)V
 
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MA:Lcom/facebook/imagepipeline/memory/d;
+
     goto :goto_1
 
     :pswitch_2
@@ -322,16 +326,14 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/memory/m;-><init>()V
 
-    goto :goto_1
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MA:Lcom/facebook/imagepipeline/memory/d;
 
     :cond_5
-    :goto_2
+    :goto_1
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MA:Lcom/facebook/imagepipeline/memory/d;
 
     return-object v0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
@@ -340,7 +342,7 @@
     .end packed-switch
 .end method
 
-.method public final iJ()Lcom/facebook/imagepipeline/memory/n;
+.method public final iI()Lcom/facebook/imagepipeline/memory/n;
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MF:Lcom/facebook/imagepipeline/memory/n;
@@ -367,7 +369,7 @@
     return-object v0
 .end method
 
-.method public final iK()I
+.method public final iJ()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->RB:Lcom/facebook/imagepipeline/memory/ab;
@@ -379,7 +381,7 @@
     return v0
 .end method
 
-.method public final iM()Lcom/facebook/common/g/j;
+.method public final iL()Lcom/facebook/common/g/j;
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->MT:Lcom/facebook/common/g/j;
@@ -388,7 +390,7 @@
 
     new-instance v0, Lcom/facebook/common/g/j;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iN()Lcom/facebook/common/g/a;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->iM()Lcom/facebook/common/g/a;
 
     move-result-object v1
 
@@ -402,7 +404,7 @@
     return-object v0
 .end method
 
-.method public final iN()Lcom/facebook/common/g/a;
+.method public final iM()Lcom/facebook/common/g/a;
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->RE:Lcom/facebook/common/g/a;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali
index e78d6ecc94..445a9006ea 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/ad;
 .super Ljava/lang/Object;
+.source "PoolParams.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali
index dcbb6bfeda..7ca4ba9096 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/imagepipeline/memory/ae;
 .super Ljava/lang/Object;
+.source "PoolStatsTracker.java"
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/b$1.smali b/com.discord/smali/com/facebook/imagepipeline/memory/b$1.smali
index fc5a59c745..da489b0b4e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/b$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/memory/b$1;
 .super Ljava/lang/Object;
+.source "BitmapCounter.java"
 
 # interfaces
 .implements Lcom/facebook/common/references/b;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/b.smali b/com.discord/smali/com/facebook/imagepipeline/memory/b.smali
index 21b972b609..09f240786f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/b;
 .super Ljava/lang/Object;
+.source "BitmapCounter.java"
 
 
 # instance fields
@@ -36,9 +37,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-lez p1, :cond_0
 
@@ -54,9 +55,12 @@
 
     if-lez p2, :cond_1
 
-    const/4 v0, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     iput p1, p0, Lcom/facebook/imagepipeline/memory/b;->QJ:I
@@ -117,8 +121,6 @@
 
     iget-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Cf:J
 
-    const/4 p1, 0x0
-
     add-long/2addr v4, v2
 
     iput-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Cf:J
@@ -215,8 +217,6 @@
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Cf:J
 
-    const/4 p1, 0x0
-
     sub-long/2addr v0, v3
 
     iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Cf:J
@@ -321,7 +321,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized iz()I
+.method public final declared-synchronized iy()I
     .locals 1
 
     monitor-enter p0
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/c.smali b/com.discord/smali/com/facebook/imagepipeline/memory/c.smali
index 5842addb27..bb6d79dc85 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/memory/c;
 .super Ljava/lang/Object;
+.source "BitmapCounterProvider.java"
 
 
 # static fields
@@ -78,7 +79,7 @@
     return-void
 .end method
 
-.method public static iA()Lcom/facebook/imagepipeline/memory/b;
+.method public static iz()Lcom/facebook/imagepipeline/memory/b;
     .locals 4
     .annotation build Lcom/facebook/infer/annotation/ThreadSafe;
     .end annotation
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/d.smali b/com.discord/smali/com/facebook/imagepipeline/memory/d.smali
index 69b1ed272d..3e9bb01c40 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/memory/d;
 .super Ljava/lang/Object;
+.source "BitmapPool.java"
 
 # interfaces
 .implements Lcom/facebook/common/g/d;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/e.smali b/com.discord/smali/com/facebook/imagepipeline/memory/e.smali
index f9b86fb9d0..51a4ea801d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/e;
 .super Lcom/facebook/imagepipeline/memory/q;
+.source "BitmapPoolBackend.java"
 
 
 # annotations
@@ -51,7 +52,6 @@
 
     aput-object p0, v2, v0
 
-    :goto_0
     invoke-static {v1, v3, v2}, Lcom/facebook/common/e/a;->d(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
 
     return v0
@@ -71,7 +71,9 @@
 
     aput-object p0, v2, v0
 
-    goto :goto_0
+    invoke-static {v1, v3, v2}, Lcom/facebook/common/e/a;->d(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
+
+    return v0
 
     :cond_2
     return v2
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/f.smali b/com.discord/smali/com/facebook/imagepipeline/memory/f.smali
index dcd1301db4..dca00f889d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/f.smali
@@ -1,5 +1,6 @@
 .class Lcom/facebook/imagepipeline/memory/f;
 .super Ljava/lang/Object;
+.source "Bucket.java"
 
 
 # annotations
@@ -34,9 +35,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-lez p1, :cond_0
 
@@ -64,9 +65,12 @@
 
     if-ltz p3, :cond_2
 
-    const/4 v0, 0x1
+    goto :goto_2
 
     :cond_2
+    const/4 v0, 0x0
+
+    :goto_2
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iput p1, p0, Lcom/facebook/imagepipeline/memory/f;->QQ:I
@@ -103,7 +107,7 @@
     return-void
 .end method
 
-.method public final iB()V
+.method public final iA()V
     .locals 2
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->QU:I
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 e7f49d642e..1efddfbfd5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/g$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/memory/g$a;
 .super Ljava/lang/Object;
+.source "BucketMap.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/g.smali b/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
index 2a9059cd42..70ac1325ef 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/g;
 .super Ljava/lang/Object;
+.source "BucketMap.java"
 
 
 # annotations
@@ -164,12 +165,8 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->QW:Lcom/facebook/imagepipeline/memory/g$a;
-
     iput-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->Ra:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->QW:Lcom/facebook/imagepipeline/memory/g$a;
-
     iput-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->QY:Lcom/facebook/imagepipeline/memory/g$a;
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->QW:Lcom/facebook/imagepipeline/memory/g$a;
@@ -289,7 +286,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized iC()Ljava/lang/Object;
+.method public final declared-synchronized iB()Ljava/lang/Object;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/h.smali b/com.discord/smali/com/facebook/imagepipeline/memory/h.smali
index 04fb12bc24..8bcf58f8e1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/h;
 .super Lcom/facebook/imagepipeline/memory/a;
+.source "BucketsBitmapPool.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/memory/d;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/i.smali b/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
index f34c65533c..55d292de76 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/i;
 .super Ljava/lang/Object;
+.source "BufferMemoryChunk.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/memory/r;
@@ -120,33 +121,44 @@
 
     const/4 v1, 0x1
 
-    xor-int/2addr v0, v1
+    const/4 v2, 0x0
 
-    invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
+    if-nez v0, :cond_0
 
-    const/4 v0, 0x0
-
-    if-ltz p1, :cond_0
-
-    const/4 v2, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v2}, Lcom/facebook/common/d/i;->checkArgument(Z)V
+    invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v2, p0, Lcom/facebook/imagepipeline/memory/i;->mSize:I
-
-    if-ge p1, v2, :cond_1
+    if-ltz p1, :cond_1
 
     const/4 v0, 0x1
 
+    goto :goto_1
+
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/i;->mSize:I
+
+    if-ge p1, v0, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
+    invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
+
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Rb:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->get(I)B
@@ -179,8 +191,16 @@
 
     move-result v0
 
-    xor-int/lit8 v0, v0, 0x1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/i;->mSize:I
@@ -222,7 +242,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iD()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iC()J
 
     move-result-wide v0
 
@@ -254,7 +274,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iD()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iC()J
 
     move-result-wide v2
 
@@ -277,7 +297,7 @@
     invoke-static {v4}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     :cond_0
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iD()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iC()J
 
     move-result-wide v0
 
@@ -383,8 +403,16 @@
 
     move-result v0
 
-    xor-int/lit8 v0, v0, 0x1
+    if-nez v0, :cond_0
 
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/i;->mSize:I
@@ -445,7 +473,7 @@
     throw v0
 .end method
 
-.method public final fn()J
+.method public final fm()J
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -489,7 +517,7 @@
     return v0
 .end method
 
-.method public final iD()J
+.method public final iC()J
     .locals 2
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->aC:J
@@ -527,4 +555,6 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/j.smali b/com.discord/smali/com/facebook/imagepipeline/memory/j.smali
index 5debaa60bd..973049de1d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/j.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/j;
 .super Lcom/facebook/imagepipeline/memory/s;
+.source "BufferMemoryChunkPool.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/k.smali b/com.discord/smali/com/facebook/imagepipeline/memory/k.smali
index 2ca0a235fd..a121fa494c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/k.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/k;
 .super Ljava/lang/Object;
+.source "DefaultBitmapPoolParams.java"
 
 
 # static fields
@@ -21,7 +22,7 @@
     return-void
 .end method
 
-.method public static iE()Lcom/facebook/imagepipeline/memory/ad;
+.method public static iD()Lcom/facebook/imagepipeline/memory/ad;
     .locals 5
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/ad;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/l.smali b/com.discord/smali/com/facebook/imagepipeline/memory/l.smali
index b97a57849c..a09c68299c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/l.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/l;
 .super Ljava/lang/Object;
+.source "DefaultFlexByteArrayPoolParams.java"
 
 
 # static fields
@@ -47,7 +48,7 @@
     return-object v0
 .end method
 
-.method public static iE()Lcom/facebook/imagepipeline/memory/ad;
+.method public static iD()Lcom/facebook/imagepipeline/memory/ad;
     .locals 8
 
     new-instance v7, Lcom/facebook/imagepipeline/memory/ad;
@@ -58,8 +59,6 @@
 
     mul-int v2, v0, v1
 
-    sget v0, Lcom/facebook/imagepipeline/memory/l;->Rd:I
-
     invoke-static {v0}, Lcom/facebook/imagepipeline/memory/l;->ao(I)Landroid/util/SparseIntArray;
 
     move-result-object v3
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/m.smali b/com.discord/smali/com/facebook/imagepipeline/memory/m.smali
index 9ddfead4bc..73d58f4549 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/m.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/m;
 .super Ljava/lang/Object;
+.source "DummyBitmapPool.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/memory/d;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/n$1.smali b/com.discord/smali/com/facebook/imagepipeline/memory/n$1.smali
index 8ba5217017..4fe239c86d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/n$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/n$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/memory/n$1;
 .super Ljava/lang/Object;
+.source "FlexByteArrayPool.java"
 
 # interfaces
 .implements Lcom/facebook/common/references/b;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/n$a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/n$a.smali
index 0ec3d6a890..728526a9ef 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/n$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/n$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/memory/n$a;
 .super Lcom/facebook/imagepipeline/memory/o;
+.source "FlexByteArrayPool.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/n.smali b/com.discord/smali/com/facebook/imagepipeline/memory/n.smali
index cec3983b58..b5b3a994d2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/n.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/n;
 .super Ljava/lang/Object;
+.source "FlexByteArrayPool.java"
 
 
 # annotations
@@ -48,7 +49,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/n$a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iG()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iF()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/o.smali b/com.discord/smali/com/facebook/imagepipeline/memory/o.smali
index 3b25558648..793fbd8dc3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/o.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/o.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/memory/o;
 .super Lcom/facebook/imagepipeline/memory/a;
+.source "GenericByteArrayPool.java"
 
 # interfaces
 .implements Lcom/facebook/common/g/a;
@@ -133,6 +134,8 @@
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/memory/a$b;-><init>(Ljava/lang/Object;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method protected final ae(I)I
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/p.smali b/com.discord/smali/com/facebook/imagepipeline/memory/p.smali
index 3eeedc0a5e..e132884020 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/p.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/p;
 .super Ljava/lang/Object;
+.source "LruBitmapPool.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/memory/d;
@@ -94,6 +95,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method private declared-synchronized ar(I)Landroid/graphics/Bitmap;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/q.smali b/com.discord/smali/com/facebook/imagepipeline/memory/q.smali
index e186662e03..682d077d7d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/q.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/q.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/memory/q;
 .super Ljava/lang/Object;
+.source "LruBucketsPoolBackend.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/memory/aa;
@@ -137,7 +138,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Rl:Lcom/facebook/imagepipeline/memory/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->iC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->iB()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/r.smali b/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
index d73aff2da4..a8374536f8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/memory/r;
 .super Ljava/lang/Object;
+.source "MemoryChunk.java"
 
 
 # virtual methods
@@ -18,7 +19,7 @@
 .method public abstract close()V
 .end method
 
-.method public abstract fn()J
+.method public abstract fm()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/UnsupportedOperationException;
@@ -34,7 +35,7 @@
 .method public abstract getSize()I
 .end method
 
-.method public abstract iD()J
+.method public abstract iC()J
 .end method
 
 .method public abstract isClosed()Z
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/s.smali b/com.discord/smali/com/facebook/imagepipeline/memory/s.smali
index 11d7719c30..1b55f60b34 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/s.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/s.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/memory/s;
 .super Lcom/facebook/imagepipeline/memory/a;
+.source "MemoryChunkPool.java"
 
 
 # annotations
@@ -40,11 +41,9 @@
     :goto_0
     iget-object p3, p0, Lcom/facebook/imagepipeline/memory/s;->Rg:[I
 
-    array-length p3, p3
+    array-length v0, p3
 
-    if-ge p2, p3, :cond_0
-
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/s;->Rg:[I
+    if-ge p2, v0, :cond_0
 
     invoke-virtual {p1, p2}, Landroid/util/SparseIntArray;->keyAt(I)I
 
@@ -159,6 +158,8 @@
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/memory/a$b;-><init>(Ljava/lang/Object;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method protected final ae(I)I
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/t.smali b/com.discord/smali/com/facebook/imagepipeline/memory/t.smali
index 3c7baf2917..1b323198e8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/t.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/t.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/t;
 .super Ljava/lang/Object;
+.source "MemoryChunkUtil.java"
 
 
 # direct methods
@@ -24,9 +25,9 @@
 .method static b(IIIII)V
     .locals 3
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-ltz p3, :cond_0
 
@@ -82,9 +83,12 @@
 
     if-gt p2, p1, :cond_4
 
-    const/4 v0, 0x1
+    goto :goto_4
 
     :cond_4
+    const/4 v0, 0x0
+
+    :goto_4
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/u.smali b/com.discord/smali/com/facebook/imagepipeline/memory/u.smali
index 42fc992fdc..fea4c1d1ad 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/u.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/u.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/u;
 .super Ljava/lang/Object;
+.source "MemoryPooledByteBuffer.java"
 
 # interfaces
 .implements Lcom/facebook/common/g/f;
@@ -68,7 +69,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fq()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fp()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
@@ -79,7 +80,7 @@
     return-void
 .end method
 
-.method private declared-synchronized fu()V
+.method private declared-synchronized ft()V
     .locals 1
 
     monitor-enter p0
@@ -123,11 +124,11 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fu()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->ft()V
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-ltz p1, :cond_0
 
@@ -145,9 +146,12 @@
 
     if-ge p1, v2, :cond_1
 
-    const/4 v0, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Rm:Lcom/facebook/common/references/CloseableReference;
@@ -182,7 +186,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fu()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->ft()V
 
     add-int v0, p1, p4
 
@@ -254,7 +258,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fn()J
+.method public final declared-synchronized fm()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -265,7 +269,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fu()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->ft()V
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Rm:Lcom/facebook/common/references/CloseableReference;
 
@@ -275,7 +279,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/memory/r;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/r;->fn()J
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/r;->fm()J
 
     move-result-wide v0
     :try_end_0
@@ -361,6 +365,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized size()I
@@ -369,7 +375,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fu()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->ft()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/u;->mSize:I
     :try_end_0
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/v.smali b/com.discord/smali/com/facebook/imagepipeline/memory/v.smali
index 753eaf9245..f1ece9529e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/v.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/v.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/v;
 .super Ljava/lang/Object;
+.source "MemoryPooledByteBufferFactory.java"
 
 # interfaces
 .implements Lcom/facebook/common/g/g;
@@ -41,7 +42,7 @@
 
     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/w;->iF()Lcom/facebook/imagepipeline/memory/u;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/memory/w;->iE()Lcom/facebook/imagepipeline/memory/u;
 
     move-result-object p1
 
@@ -132,7 +133,7 @@
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/facebook/imagepipeline/memory/w;->write([BII)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/w;->iF()Lcom/facebook/imagepipeline/memory/u;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/w;->iE()Lcom/facebook/imagepipeline/memory/u;
 
     move-result-object p1
     :try_end_0
@@ -220,7 +221,7 @@
     return-object p1
 .end method
 
-.method public final synthetic fo()Lcom/facebook/common/g/i;
+.method public final synthetic fn()Lcom/facebook/common/g/i;
     .locals 2
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/w;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/w$a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/w$a.smali
index 6e20b134b1..464f7384f2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/w$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/w$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/w$a;
 .super Ljava/lang/RuntimeException;
+.source "MemoryPooledByteBufferOutputStream.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/w.smali b/com.discord/smali/com/facebook/imagepipeline/memory/w.smali
index 0dfd30beb0..d790e31a08 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/w.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/w.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/w;
 .super Lcom/facebook/common/g/i;
+.source "MemoryPooledByteBufferOutputStream.java"
 
 
 # annotations
@@ -90,7 +91,7 @@
     return-void
 .end method
 
-.method private fu()V
+.method private ft()V
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Rm:Lcom/facebook/common/references/CloseableReference;
@@ -133,20 +134,20 @@
     return-void
 .end method
 
-.method public final synthetic fp()Lcom/facebook/common/g/f;
+.method public final synthetic fo()Lcom/facebook/common/g/f;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/w;->iF()Lcom/facebook/imagepipeline/memory/u;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/w;->iE()Lcom/facebook/imagepipeline/memory/u;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final iF()Lcom/facebook/imagepipeline/memory/u;
+.method public final iE()Lcom/facebook/imagepipeline/memory/u;
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fu()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->ft()V
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/u;
 
@@ -208,13 +209,13 @@
 
     if-gt v0, v1, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fu()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->ft()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/w;->mCount:I
 
     add-int/2addr v0, p3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fu()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->ft()V
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Rm:Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/x.smali b/com.discord/smali/com/facebook/imagepipeline/memory/x.smali
index 2dd134cfcc..21045bb5fb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/x.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/x.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/x;
 .super Lcom/facebook/imagepipeline/memory/s;
+.source "NativeMemoryChunkPool.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/y.smali b/com.discord/smali/com/facebook/imagepipeline/memory/y.smali
index 9d81120108..c357cfb9d0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/y.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/y.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/memory/y;
 .super Ljava/lang/Object;
+.source "NoOpPoolStatsTracker.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/memory/ae;
@@ -24,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized iG()Lcom/facebook/imagepipeline/memory/y;
+.method public static declared-synchronized iF()Lcom/facebook/imagepipeline/memory/y;
     .locals 2
 
     const-class v0, Lcom/facebook/imagepipeline/memory/y;
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/z.smali b/com.discord/smali/com/facebook/imagepipeline/memory/z.smali
index 952ad14187..db3834b72c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/z.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/z.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imagepipeline/memory/z;
 .super Lcom/facebook/imagepipeline/memory/f;
+.source "OOMSoftReferenceBucket.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/Bitmaps.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/Bitmaps.smali
index 62cf536a68..0e3a41fcbc 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/Bitmaps.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/Bitmaps.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/nativecode/Bitmaps;
 .super Ljava/lang/Object;
+.source "Bitmaps.java"
 
 
 # annotations
@@ -11,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iO()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iN()V
 
     return-void
 .end method
@@ -35,9 +36,9 @@
 
     move-result-object v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-ne v0, v1, :cond_0
 
@@ -87,9 +88,12 @@
 
     if-ne v0, v1, :cond_2
 
-    const/4 v2, 0x1
+    goto :goto_2
 
     :cond_2
+    const/4 v2, 0x0
+
+    :goto_2
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     invoke-virtual {p0}, Landroid/graphics/Bitmap;->getRowBytes()I
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
index 019c797b0a..44595de105 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;
 .super Ljava/lang/Object;
+.source "DalvikPurgeableDecoder.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/h/f;
@@ -22,7 +23,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iO()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iN()V
 
     const/4 v0, 0x2
 
@@ -46,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->iA()Lcom/facebook/imagepipeline/memory/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->iz()Lcom/facebook/imagepipeline/memory/b;
 
     move-result-object v0
 
@@ -228,7 +229,7 @@
 
     iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->RN:Lcom/facebook/imagepipeline/memory/b;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->iz()I
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->iy()I
 
     move-result v2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali
index f23e90cb4d..bedef2159e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/nativecode/NativeBlurFilter;
 .super Ljava/lang/Object;
+.source "NativeBlurFilter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
index da95cf0edd..e73581e234 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;
 .super Ljava/lang/Object;
+.source "NativeJpegTranscoder.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/k/b;
@@ -22,7 +23,7 @@
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iO()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->iN()V
 
     return-void
 .end method
@@ -96,7 +97,7 @@
     :cond_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hr()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hq()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p3
 
@@ -129,14 +130,11 @@
     :cond_2
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getInputStream()Ljava/io/InputStream;
 
-    move-result-object v2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v1
 
-    :try_start_1
-    sget-object v1, Lcom/facebook/imagepipeline/k/d;->UD:Lcom/facebook/common/d/e;
+    sget-object v2, Lcom/facebook/imagepipeline/k/d;->UD:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->in()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->im()I
 
     move-result v3
 
@@ -144,9 +142,9 @@
 
     move-result-object v3
 
-    invoke-virtual {v1, v3}, Lcom/facebook/common/d/e;->contains(Ljava/lang/Object;)Z
+    invoke-virtual {v2, v3}, Lcom/facebook/common/d/e;->contains(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v2
 
     const/16 v3, 0x8
 
@@ -158,7 +156,7 @@
 
     const/4 v7, 0x1
 
-    if-eqz v1, :cond_9
+    if-eqz v2, :cond_9
 
     invoke-static {p3, p1}, Lcom/facebook/imagepipeline/k/d;->b(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
 
@@ -238,11 +236,11 @@
     const/4 p5, 0x1
 
     :goto_5
-    const-string v1, "no transformation requested"
+    const-string v2, "no transformation requested"
 
-    invoke-static {p5, v1}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
+    invoke-static {p5, v2}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    invoke-static {v2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p5
 
@@ -337,11 +335,11 @@
     const/4 p5, 0x1
 
     :goto_b
-    const-string v1, "no transformation requested"
+    const-string v2, "no transformation requested"
 
-    invoke-static {p5, v1}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
+    invoke-static {p5, v2}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    invoke-static {v2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p5
 
@@ -354,11 +352,11 @@
     check-cast p2, Ljava/io/OutputStream;
 
     invoke-static {p5, p2, p1, p4, p3}, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->nativeTranscodeJpeg(Ljava/io/InputStream;Ljava/io/OutputStream;III)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_c
-    invoke-static {v2}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
+    invoke-static {v1}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
 
     new-instance p1, Lcom/facebook/imagepipeline/k/a;
 
@@ -374,15 +372,7 @@
     :catchall_0
     move-exception p1
 
-    goto :goto_d
-
-    :catchall_1
-    move-exception p1
-
-    move-object v2, v1
-
-    :goto_d
-    invoke-static {v2}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
+    invoke-static {v1}, Lcom/facebook/common/d/b;->b(Ljava/io/InputStream;)V
 
     throw p1
 .end method
@@ -400,7 +390,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hr()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hq()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali
index 55c016a767..8014c47181 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/nativecode/NativeRoundingFilter;
 .super Ljava/lang/Object;
+.source "NativeRoundingFilter.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
index bcbe74f9e5..e3689ecd04 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/nativecode/WebpTranscoderImpl;
 .super Ljava/lang/Object;
+.source "WebpTranscoderImpl.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/nativecode/d;
@@ -51,7 +52,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eJ()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eI()V
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -80,7 +81,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eJ()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eI()V
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/a.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/a.smali
index 22b0615ff4..d417acd050 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/nativecode/a;
 .super Ljava/lang/Object;
+.source "ImagePipelineNativeLoader.java"
 
 
 # static fields
@@ -31,7 +32,7 @@
     return-void
 .end method
 
-.method public static iO()V
+.method public static iN()V
     .locals 1
 
     const-string v0, "imagepipeline"
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/b.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/b.smali
index 16859a5b52..30fa4f31b2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/nativecode/b;
 .super Ljava/lang/Object;
+.source "NativeJpegTranscoderFactory.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/k/c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/c.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/c.smali
index 87de0536cf..2758d70283 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/nativecode/c;
 .super Ljava/lang/Object;
+.source "StaticWebpNativeLoader.java"
 
 
 # static fields
@@ -7,7 +8,7 @@
 
 
 # direct methods
-.method public static declared-synchronized eJ()V
+.method public static declared-synchronized eI()V
     .locals 3
 
     const-class v0, Lcom/facebook/imagepipeline/nativecode/c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/d.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/d.smali
index c881915417..0d8787be8a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/nativecode/d;
 .super Ljava/lang/Object;
+.source "WebpTranscoder.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/e.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/e.smali
index fa846456cc..d9a2b43e9d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/nativecode/e;
 .super Ljava/lang/Object;
+.source "WebpTranscoderFactory.java"
 
 
 # static fields
@@ -43,7 +44,7 @@
     return-void
 .end method
 
-.method public static iP()Lcom/facebook/imagepipeline/nativecode/d;
+.method public static iO()Lcom/facebook/imagepipeline/nativecode/d;
     .locals 1
 
     sget-object v0, Lcom/facebook/imagepipeline/nativecode/e;->RS:Lcom/facebook/imagepipeline/nativecode/d;
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder$a.smali b/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder$a.smali
index 78e22bd69e..2257675b7a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/request/ImageRequestBuilder$a;
 .super Ljava/lang/RuntimeException;
+.source "ImageRequestBuilder.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali b/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
index 6e4deefa4a..eef17c8aa3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 .super Ljava/lang/Object;
+.source "ImageRequestBuilder.java"
 
 
 # annotations
@@ -73,7 +74,7 @@
 
     iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->MM:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->hq()Lcom/facebook/imagepipeline/a/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->hp()Lcom/facebook/imagepipeline/a/b;
 
     move-result-object v1
 
@@ -83,7 +84,7 @@
 
     iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Uk:Lcom/facebook/imagepipeline/request/b$a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/h;->hC()Lcom/facebook/imagepipeline/b/h$b;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/h;->hB()Lcom/facebook/imagepipeline/b/h$b;
 
     move-result-object v1
 
@@ -232,15 +233,13 @@
     return-object p0
 .end method
 
-.method public final jx()Lcom/facebook/imagepipeline/request/b;
+.method public final jw()Lcom/facebook/imagepipeline/request/b;
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ul:Landroid/net/Uri;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ul:Landroid/net/Uri;
-
     invoke-static {v0}, Lcom/facebook/common/j/f;->h(Landroid/net/Uri;)Z
 
     move-result v0
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/a.smali b/com.discord/smali/com/facebook/imagepipeline/request/a.smali
index 6ad9d16ad4..bb011872e6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/imagepipeline/request/a;
 .super Ljava/lang/Object;
+.source "BasePostprocessor.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/request/c;
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/b$a.smali b/com.discord/smali/com/facebook/imagepipeline/request/b$a.smali
index dba0a0742d..149aa5ef19 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/b$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/b$a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/facebook/imagepipeline/request/b$a;
 .super Ljava/lang/Enum;
+.source "ImageRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/b$b.smali b/com.discord/smali/com/facebook/imagepipeline/request/b$b.smali
index 7eb8934ae0..53e4d25622 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/b$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/b$b.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/facebook/imagepipeline/request/b$b;
 .super Ljava/lang/Enum;
+.source "ImageRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/b.smali b/com.discord/smali/com/facebook/imagepipeline/request/b.smali
index 8f80e8e530..1abddc68fe 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipeline/request/b;
 .super Ljava/lang/Object;
+.source "ImageRequest.java"
 
 
 # annotations
@@ -201,7 +202,7 @@
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hr()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hq()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
@@ -352,8 +353,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->TF:Lcom/facebook/imagepipeline/request/c;
-
     invoke-interface {v0}, Lcom/facebook/imagepipeline/request/c;->getPostprocessorCacheKey()Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v0
@@ -364,12 +363,10 @@
     move-object v0, v1
 
     :goto_0
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->TF:Lcom/facebook/imagepipeline/request/c;
-
-    if-eqz v2, :cond_3
-
     iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->TF:Lcom/facebook/imagepipeline/request/c;
 
+    if-eqz p1, :cond_3
+
     invoke-interface {p1}, Lcom/facebook/imagepipeline/request/c;->getPostprocessorCacheKey()Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v1
@@ -393,8 +390,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->TF:Lcom/facebook/imagepipeline/request/c;
-
     invoke-interface {v0}, Lcom/facebook/imagepipeline/request/c;->getPostprocessorCacheKey()Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v0
@@ -462,7 +457,7 @@
     return v0
 .end method
 
-.method public final declared-synchronized jw()Ljava/io/File;
+.method public final declared-synchronized jv()Ljava/io/File;
     .locals 2
 
     monitor-enter p0
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/c.smali b/com.discord/smali/com/facebook/imagepipeline/request/c.smali
index b6b17a3dd0..a1526fddf7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/request/c;
 .super Ljava/lang/Object;
+.source "Postprocessor.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/d.smali b/com.discord/smali/com/facebook/imagepipeline/request/d.smali
index db04aa44ac..d6693fde54 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/imagepipeline/request/d;
 .super Ljava/lang/Object;
+.source "RepeatedPostprocessor.java"
 
 # interfaces
 .implements Lcom/facebook/imagepipeline/request/c;
diff --git a/com.discord/smali/com/facebook/imagepipelinebase/R.smali b/com.discord/smali/com/facebook/imagepipelinebase/R.smali
index 3ad604b996..84adcf3711 100644
--- a/com.discord/smali/com/facebook/imagepipelinebase/R.smali
+++ b/com.discord/smali/com/facebook/imagepipelinebase/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imagepipelinebase/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/imageutils/HeifExifUtil$HeifExifUtilAndroidN.smali b/com.discord/smali/com/facebook/imageutils/HeifExifUtil$HeifExifUtilAndroidN.smali
index 3c6f3a0b4e..31b7016b8f 100644
--- a/com.discord/smali/com/facebook/imageutils/HeifExifUtil$HeifExifUtilAndroidN.smali
+++ b/com.discord/smali/com/facebook/imageutils/HeifExifUtil$HeifExifUtilAndroidN.smali
@@ -1,5 +1,6 @@
 .class Lcom/facebook/imageutils/HeifExifUtil$HeifExifUtilAndroidN;
 .super Ljava/lang/Object;
+.source "HeifExifUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imageutils/HeifExifUtil.smali b/com.discord/smali/com/facebook/imageutils/HeifExifUtil.smali
index de6a6d0f8d..4e9145f496 100644
--- a/com.discord/smali/com/facebook/imageutils/HeifExifUtil.smali
+++ b/com.discord/smali/com/facebook/imageutils/HeifExifUtil.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imageutils/HeifExifUtil;
 .super Ljava/lang/Object;
+.source "HeifExifUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imageutils/a$1.smali b/com.discord/smali/com/facebook/imageutils/a$1.smali
index 87cb54750b..b43fbe3fe6 100644
--- a/com.discord/smali/com/facebook/imageutils/a$1.smali
+++ b/com.discord/smali/com/facebook/imageutils/a$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/facebook/imageutils/a$1;
 .super Ljava/lang/Object;
+.source "BitmapUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imageutils/a.smali b/com.discord/smali/com/facebook/imageutils/a.smali
index 1b1fdf58c8..09772df632 100644
--- a/com.discord/smali/com/facebook/imageutils/a.smali
+++ b/com.discord/smali/com/facebook/imageutils/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imageutils/a;
 .super Ljava/lang/Object;
+.source "BitmapUtil.java"
 
 
 # static fields
@@ -61,21 +62,26 @@
     return v0
 
     :pswitch_2
+    return v0
+
+    :pswitch_3
     const/4 p0, 0x1
 
     return p0
 
-    :pswitch_3
+    :pswitch_4
     const/4 p0, 0x4
 
     return p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
+        :pswitch_4
         :pswitch_3
         :pswitch_2
         :pswitch_1
-        :pswitch_1
         :pswitch_0
     .end packed-switch
 .end method
@@ -122,11 +128,11 @@
     :try_start_0
     invoke-virtual {p0}, Landroid/graphics/Bitmap;->getAllocationByteCount()I
 
-    move-result v0
+    move-result p0
     :try_end_0
     .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v0
+    return p0
 
     :catch_0
     :cond_1
diff --git a/com.discord/smali/com/facebook/imageutils/b.smali b/com.discord/smali/com/facebook/imageutils/b.smali
index a7bcbe7876..d61bb12adf 100644
--- a/com.discord/smali/com/facebook/imageutils/b.smali
+++ b/com.discord/smali/com/facebook/imageutils/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imageutils/b;
 .super Ljava/lang/Object;
+.source "ImageMetaData.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/imageutils/c.smali b/com.discord/smali/com/facebook/imageutils/c.smali
index 537437a9cc..46567e6ae5 100644
--- a/com.discord/smali/com/facebook/imageutils/c.smali
+++ b/com.discord/smali/com/facebook/imageutils/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imageutils/c;
 .super Ljava/lang/Object;
+.source "JfifUtil.java"
 
 
 # direct methods
@@ -23,7 +24,7 @@
 
     const/4 v4, 0x2
 
-    if-ne v2, v3, :cond_4
+    if-ne v2, v3, :cond_5
 
     const/16 v2, 0xff
 
@@ -77,8 +78,13 @@
     :goto_2
     const/4 v1, 0x0
 
+    goto :goto_3
+
+    :cond_5
+    const/4 v1, 0x0
+
     :goto_3
-    if-eqz v1, :cond_5
+    if-eqz v1, :cond_6
 
     invoke-static {p0, v4, v0}, Lcom/facebook/imageutils/d;->a(Ljava/io/InputStream;IZ)I
 
@@ -88,7 +94,7 @@
 
     const/4 v2, 0x6
 
-    if-le v1, v2, :cond_5
+    if-le v1, v2, :cond_6
 
     const/4 v2, 0x4
 
@@ -106,21 +112,21 @@
 
     const v4, 0x45786966
 
-    if-ne v2, v4, :cond_5
+    if-ne v2, v4, :cond_6
 
-    if-nez v3, :cond_5
+    if-nez v3, :cond_6
 
     goto :goto_4
 
-    :cond_5
+    :cond_6
     const/4 v1, 0x0
 
     :goto_4
-    if-nez v1, :cond_6
+    if-nez v1, :cond_7
 
     return v0
 
-    :cond_6
+    :cond_7
     invoke-static {p0, v1}, Lcom/facebook/imageutils/e;->f(Ljava/io/InputStream;I)I
 
     move-result p0
diff --git a/com.discord/smali/com/facebook/imageutils/d.smali b/com.discord/smali/com/facebook/imageutils/d.smali
index 7a0c9d3adc..55b54c72e1 100644
--- a/com.discord/smali/com/facebook/imageutils/d.smali
+++ b/com.discord/smali/com/facebook/imageutils/d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imageutils/d;
 .super Ljava/lang/Object;
+.source "StreamProcessor.java"
 
 
 # direct methods
@@ -34,19 +35,18 @@
 
     shl-int/2addr v2, v3
 
-    :goto_1
     or-int/2addr v1, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     shl-int/lit8 v1, v1, 0x8
 
     and-int/lit16 v2, v2, 0xff
 
-    goto :goto_1
+    or-int/2addr v1, v2
 
-    :goto_2
+    :goto_1
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali/com/facebook/imageutils/e$a.smali b/com.discord/smali/com/facebook/imageutils/e$a.smali
index 374ad9a2dd..9bc6bfeb2b 100644
--- a/com.discord/smali/com/facebook/imageutils/e$a.smali
+++ b/com.discord/smali/com/facebook/imageutils/e$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/imageutils/e$a;
 .super Ljava/lang/Object;
+.source "TiffUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/imageutils/e.smali b/com.discord/smali/com/facebook/imageutils/e.smali
index 51b748a480..71635a3a4e 100644
--- a/com.discord/smali/com/facebook/imageutils/e.smali
+++ b/com.discord/smali/com/facebook/imageutils/e.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/imageutils/e;
 .super Ljava/lang/Object;
+.source "TiffUtil.java"
 
 
 # annotations
@@ -59,6 +60,8 @@
 
     packed-switch p0, :pswitch_data_0
 
+    return v0
+
     :pswitch_0
     return v0
 
@@ -77,6 +80,8 @@
 
     return p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_0
@@ -106,10 +111,9 @@
 
     if-gt p1, v4, :cond_0
 
-    :goto_0
     const/4 p1, 0x0
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_0
     invoke-static {p0, v3, v1}, Lcom/facebook/imageutils/d;->a(Ljava/io/InputStream;IZ)I
@@ -136,10 +140,11 @@
 
     const-string v5, "Invalid TIFF header"
 
-    :goto_1
     invoke-static {p1, v5}, Lcom/facebook/common/e/a;->c(Ljava/lang/Class;Ljava/lang/String;)V
 
-    goto :goto_0
+    const/4 p1, 0x0
+
+    goto :goto_1
 
     :cond_1
     iget v5, v0, Lcom/facebook/imageutils/e$a;->UI:I
@@ -148,12 +153,12 @@
 
     const/4 v5, 0x1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_2
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_0
     iput-boolean v5, v0, Lcom/facebook/imageutils/e$a;->isLittleEndian:Z
 
     iget-boolean v5, v0, Lcom/facebook/imageutils/e$a;->isLittleEndian:Z
@@ -181,10 +186,12 @@
 
     const-string v5, "Invalid offset"
 
-    goto :goto_1
+    invoke-static {p1, v5}, Lcom/facebook/common/e/a;->c(Ljava/lang/Class;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
 
     :cond_4
-    :goto_3
+    :goto_1
     iget v5, v0, Lcom/facebook/imageutils/e$a;->UJ:I
 
     sub-int/2addr v5, v4
@@ -193,7 +200,7 @@
 
     if-le v5, p1, :cond_5
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_5
     int-to-long v6, v5
@@ -216,7 +223,7 @@
 
     add-int/lit8 p1, p1, -0x2
 
-    :goto_4
+    :goto_2
     add-int/lit8 v7, v5, -0x1
 
     if-lez v5, :cond_7
@@ -235,7 +242,7 @@
 
     if-ne v5, v8, :cond_6
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_6
     const-wide/16 v8, 0xa
@@ -246,12 +253,12 @@
 
     move v5, v7
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_7
     const/4 p1, 0x0
 
-    :goto_5
+    :goto_3
     iget-boolean v0, v0, Lcom/facebook/imageutils/e$a;->isLittleEndian:Z
 
     const/16 v4, 0xa
@@ -290,6 +297,6 @@
     return p1
 
     :cond_b
-    :goto_6
+    :goto_4
     return v1
 .end method
diff --git a/com.discord/smali/com/facebook/imageutils/f.smali b/com.discord/smali/com/facebook/imageutils/f.smali
index fdf16b718b..e0b55e4b57 100644
--- a/com.discord/smali/com/facebook/imageutils/f.smali
+++ b/com.discord/smali/com/facebook/imageutils/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/imageutils/f;
 .super Ljava/lang/Object;
+.source "WebpUtil.java"
 
 
 # direct methods
@@ -483,6 +484,8 @@
     :cond_f
     :goto_b
     throw v0
+
+    return-void
 .end method
 
 .method private static l(Ljava/io/InputStream;)I
diff --git a/com.discord/smali/com/facebook/nativefilters/R.smali b/com.discord/smali/com/facebook/nativefilters/R.smali
index 157bb3bc59..6be740d81e 100644
--- a/com.discord/smali/com/facebook/nativefilters/R.smali
+++ b/com.discord/smali/com/facebook/nativefilters/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/nativefilters/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/samples/a/a$a.smali b/com.discord/smali/com/facebook/samples/a/a$a.smali
index a93a34ebcb..57b78b7d33 100644
--- a/com.discord/smali/com/facebook/samples/a/a$a.smali
+++ b/com.discord/smali/com/facebook/samples/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/samples/a/a$a;
 .super Ljava/lang/Object;
+.source "MultiPointerGestureDetector.java"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # virtual methods
+.method public abstract jB()V
+.end method
+
 .method public abstract jC()V
 .end method
 
 .method public abstract jD()V
 .end method
-
-.method public abstract jE()V
-.end method
diff --git a/com.discord/smali/com/facebook/samples/a/a.smali b/com.discord/smali/com/facebook/samples/a/a.smali
index 47fde82dbb..9c9ac1ecee 100644
--- a/com.discord/smali/com/facebook/samples/a/a.smali
+++ b/com.discord/smali/com/facebook/samples/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/samples/a/a;
 .super Ljava/lang/Object;
+.source "MultiPointerGestureDetector.java"
 
 
 # annotations
@@ -74,30 +75,6 @@
 
     iget-boolean v0, p0, Lcom/facebook/samples/a/a;->UK:Z
 
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->UT:Lcom/facebook/samples/a/a$a;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->UT:Lcom/facebook/samples/a/a$a;
-
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jC()V
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->UK:Z
-
-    :cond_1
-    return-void
-.end method
-
-.method public final jB()V
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->UK:Z
-
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
@@ -108,14 +85,34 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->UT:Lcom/facebook/samples/a/a$a;
-
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jE()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jD()V
 
     :cond_0
     return-void
 .end method
 
+.method public final jz()V
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->UK:Z
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lcom/facebook/samples/a/a;->UT:Lcom/facebook/samples/a/a$a;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jB()V
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->UK:Z
+
+    :cond_1
+    return-void
+.end method
+
 .method public final reset()V
     .locals 3
 
diff --git a/com.discord/smali/com/facebook/samples/a/b$a.smali b/com.discord/smali/com/facebook/samples/a/b$a.smali
index d4b633ea07..538569bffc 100644
--- a/com.discord/smali/com/facebook/samples/a/b$a.smali
+++ b/com.discord/smali/com/facebook/samples/a/b$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/samples/a/b$a;
 .super Ljava/lang/Object;
+.source "TransformGestureDetector.java"
 
 
 # annotations
@@ -20,5 +21,5 @@
 .method public abstract b(Lcom/facebook/samples/a/b;)V
 .end method
 
-.method public abstract jG()V
+.method public abstract jF()V
 .end method
diff --git a/com.discord/smali/com/facebook/samples/a/b.smali b/com.discord/smali/com/facebook/samples/a/b.smali
index 52edcda461..c198f63be9 100644
--- a/com.discord/smali/com/facebook/samples/a/b.smali
+++ b/com.discord/smali/com/facebook/samples/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/samples/a/b;
 .super Ljava/lang/Object;
+.source "TransformGestureDetector.java"
 
 # interfaces
 .implements Lcom/facebook/samples/a/a$a;
@@ -109,6 +110,19 @@
     return v0
 .end method
 
+.method public final jB()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->UV:Lcom/facebook/samples/a/b$a;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p0}, Lcom/facebook/samples/a/b$a;->a(Lcom/facebook/samples/a/b;)V
+
+    :cond_0
+    return-void
+.end method
+
 .method public final jC()V
     .locals 1
 
@@ -116,9 +130,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->UV:Lcom/facebook/samples/a/b$a;
-
-    invoke-interface {v0, p0}, Lcom/facebook/samples/a/b$a;->a(Lcom/facebook/samples/a/b;)V
+    invoke-interface {v0, p0}, Lcom/facebook/samples/a/b$a;->b(Lcom/facebook/samples/a/b;)V
 
     :cond_0
     return-void
@@ -131,30 +143,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->UV:Lcom/facebook/samples/a/b$a;
-
-    invoke-interface {v0, p0}, Lcom/facebook/samples/a/b$a;->b(Lcom/facebook/samples/a/b;)V
+    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->jF()V
 
     :cond_0
     return-void
 .end method
 
 .method public final jE()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->UV:Lcom/facebook/samples/a/b$a;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->UV:Lcom/facebook/samples/a/b$a;
-
-    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->jG()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public final jF()V
     .locals 4
 
     iget-object v0, p0, Lcom/facebook/samples/a/b;->UU:Lcom/facebook/samples/a/a;
@@ -163,7 +158,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jB()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jA()V
 
     const/4 v1, 0x0
 
@@ -193,7 +188,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jA()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jz()V
 
     :cond_1
     return-void
diff --git a/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali b/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali
index ba1b9c8988..c3429e7ab1 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;
 .super Lcom/facebook/drawee/controller/b;
+.source "ZoomableDraweeView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali b/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali
index c7fe35ab3e..84edbbd57c 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;
 .super Ljava/lang/Object;
+.source "ZoomableDraweeView.java"
 
 # interfaces
 .implements Lcom/facebook/samples/zoomable/f$a;
diff --git a/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView.smali b/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView.smali
index 1b969777d0..c98d8afb7a 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/ZoomableDraweeView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 .super Lcom/facebook/drawee/view/DraweeView;
+.source "ZoomableDraweeView.java"
 
 # interfaces
 .implements Landroidx/core/view/ScrollingView;
@@ -60,60 +61,8 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;)V
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VB:Z
-
-    new-instance v0, Landroid/graphics/RectF;
-
-    invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
-
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Vo: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;->Vn:Landroid/graphics/RectF;
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VF: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;->Gn: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;->VG: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;->VH:Lcom/facebook/samples/zoomable/e;
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->init()V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
+    .locals 2
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -155,109 +104,55 @@
 
     iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VH:Lcom/facebook/samples/zoomable/e;
 
-    invoke-direct {p0, p1, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->init()V
+    move-result-object v0
 
-    return-void
-.end method
+    new-instance v1, Lcom/facebook/drawee/generic/a;
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    invoke-direct {v1, v0}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
 
-    invoke-direct {p0, p1, p2, p3}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->IH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    const/4 p3, 0x0
+    invoke-virtual {v1, v0}, Lcom/facebook/drawee/generic/a;->c(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
 
-    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VB:Z
+    move-result-object v0
 
-    new-instance p3, Landroid/graphics/RectF;
+    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;
 
-    invoke-direct {p3}, Landroid/graphics/RectF;-><init>()V
+    iget p1, v0, Lcom/facebook/drawee/generic/a;->IY:F
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Vo:Landroid/graphics/RectF;
+    invoke-virtual {p0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setAspectRatio(F)V
 
-    new-instance p3, Landroid/graphics/RectF;
+    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->gD()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    invoke-direct {p3}, Landroid/graphics/RectF;-><init>()V
+    move-result-object p1
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Vn:Landroid/graphics/RectF;
+    invoke-virtual {p0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
-    const/4 p3, 0x1
+    invoke-static {}, Lcom/facebook/samples/zoomable/b;->jH()Lcom/facebook/samples/zoomable/b;
 
-    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VF:Z
+    move-result-object p1
 
-    new-instance p3, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VD:Lcom/facebook/samples/zoomable/f;
 
-    invoke-direct {p3, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VD:Lcom/facebook/samples/zoomable/f;
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Gn:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object p2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VG:Lcom/facebook/samples/zoomable/f$a;
 
-    new-instance p3, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;
+    invoke-interface {p1, p2}, Lcom/facebook/samples/zoomable/f;->a(Lcom/facebook/samples/zoomable/f$a;)V
 
-    invoke-direct {p3, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
+    new-instance p1, Landroid/view/GestureDetector;
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VG:Lcom/facebook/samples/zoomable/f$a;
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->getContext()Landroid/content/Context;
 
-    new-instance p3, Lcom/facebook/samples/zoomable/e;
+    move-result-object p2
 
-    invoke-direct {p3}, Lcom/facebook/samples/zoomable/e;-><init>()V
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VH:Lcom/facebook/samples/zoomable/e;
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VH:Lcom/facebook/samples/zoomable/e;
+    invoke-direct {p1, p2, v0}, Landroid/view/GestureDetector;-><init>(Landroid/content/Context;Landroid/view/GestureDetector$OnGestureListener;)V
 
-    invoke-direct {p0, p1, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->init()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Lcom/facebook/drawee/generic/GenericDraweeHierarchy;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;-><init>(Landroid/content/Context;)V
-
-    const/4 p1, 0x0
-
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VB:Z
-
-    new-instance p1, Landroid/graphics/RectF;
-
-    invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
-
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Vo: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;->Vn:Landroid/graphics/RectF;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VF: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;->Gn: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;->VG: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;->VH:Lcom/facebook/samples/zoomable/e;
-
-    invoke-virtual {p0, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setHierarchy(Lcom/facebook/drawee/d/b;)V
-
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->init()V
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VE:Landroid/view/GestureDetector;
 
     return-void
 .end method
@@ -317,7 +212,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->jN()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->jM()V
 
     iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VD:Lcom/facebook/samples/zoomable/f;
 
@@ -374,42 +269,6 @@
     return-void
 .end method
 
-.method private d(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 2
-    .param p2    # Landroid/util/AttributeSet;
-        .annotation build Landroidx/annotation/Nullable;
-        .end annotation
-    .end param
-
-    invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/facebook/drawee/generic/a;
-
-    invoke-direct {v1, v0}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
-
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->IH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    invoke-virtual {v1, v0}, Lcom/facebook/drawee/generic/a;->c(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
-
-    move-result-object v0
-
-    invoke-static {v0, p1, p2}, Lcom/facebook/drawee/generic/b;->a(Lcom/facebook/drawee/generic/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/facebook/drawee/generic/a;
-
-    iget p1, v0, Lcom/facebook/drawee/generic/a;->IY:F
-
-    invoke-virtual {p0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setAspectRatio(F)V
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->gE()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setHierarchy(Lcom/facebook/drawee/d/b;)V
-
-    return-void
-.end method
-
 .method private d(Lcom/facebook/drawee/d/a;)V
     .locals 1
 
@@ -465,37 +324,7 @@
     return-void
 .end method
 
-.method private init()V
-    .locals 3
-
-    invoke-static {}, Lcom/facebook/samples/zoomable/b;->jI()Lcom/facebook/samples/zoomable/b;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VD:Lcom/facebook/samples/zoomable/f;
-
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VD:Lcom/facebook/samples/zoomable/f;
-
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VG:Lcom/facebook/samples/zoomable/f$a;
-
-    invoke-interface {v0, v1}, Lcom/facebook/samples/zoomable/f;->a(Lcom/facebook/samples/zoomable/f$a;)V
-
-    new-instance v0, Landroid/view/GestureDetector;
-
-    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VH: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;->VE:Landroid/view/GestureDetector;
-
-    return-void
-.end method
-
-.method private jN()V
+.method private jM()V
     .locals 5
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Vo:Landroid/graphics/RectF;
@@ -694,7 +523,7 @@
 
     iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VD:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->jL()Landroid/graphics/Matrix;
+    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->jK()Landroid/graphics/Matrix;
 
     move-result-object v1
 
@@ -728,7 +557,7 @@
 
     invoke-super/range {p0 .. p5}, Lcom/facebook/drawee/view/DraweeView;->onLayout(ZIIII)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->jN()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->jM()V
 
     return-void
 .end method
@@ -776,7 +605,6 @@
 
     const-string v1, "onTouchEvent: %d, view %x, handled by tap gesture detector"
 
-    :goto_0
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
@@ -836,7 +664,7 @@
 
     iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->VD:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->jK()Z
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->jJ()Z
 
     move-result p1
 
@@ -856,7 +684,21 @@
 
     const-string v1, "onTouchEvent: %d, view %x, handled by zoomable controller"
 
-    goto :goto_0
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-static {p1, v1, v0, v3}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return v2
 
     :cond_5
     invoke-super {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->onTouchEvent(Landroid/view/MotionEvent;)Z
@@ -871,7 +713,21 @@
 
     const-string v1, "onTouchEvent: %d, view %x, handled by the super"
 
-    goto :goto_0
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-static {p1, v1, v0, v3}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return v2
 
     :cond_6
     invoke-static {p1}, Landroid/view/MotionEvent;->obtain(Landroid/view/MotionEvent;)Landroid/view/MotionEvent;
diff --git a/com.discord/smali/com/facebook/samples/zoomable/a.smali b/com.discord/smali/com/facebook/samples/zoomable/a.smali
index c1ca16b513..af5743dcc8 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/a.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/samples/zoomable/a;
 .super Lcom/facebook/samples/zoomable/c;
+.source "AbstractAnimatedZoomableController.java"
 
 
 # instance fields
@@ -99,7 +100,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;->jH()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->jG()V
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Vb:Landroid/graphics/Matrix;
 
@@ -109,7 +110,7 @@
 
     iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Vf:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->jF()V
+    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->jE()V
 
     return-void
 .end method
@@ -183,7 +184,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;->jH()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->jG()V
 
     invoke-super {p0, p1}, Lcom/facebook/samples/zoomable/c;->a(Lcom/facebook/samples/a/b;)V
 
@@ -265,7 +266,7 @@
     return v0
 .end method
 
-.method protected abstract jH()V
+.method protected abstract jG()V
 .end method
 
 .method public final reset()V
@@ -279,7 +280,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;->jH()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->jG()V
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Vb:Landroid/graphics/Matrix;
 
diff --git a/com.discord/smali/com/facebook/samples/zoomable/b$1.smali b/com.discord/smali/com/facebook/samples/zoomable/b$1.smali
index 0039fca041..427959630f 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/b$1.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/samples/zoomable/b$1;
 .super Ljava/lang/Object;
+.source "AnimatedZoomableController.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
@@ -38,9 +39,7 @@
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/b$1;->Vc:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/b$1;->Vc:Lcom/facebook/samples/zoomable/b;
-
-    iget-object v1, v1, Lcom/facebook/samples/zoomable/a;->Vb:Landroid/graphics/Matrix;
+    iget-object v1, v0, Lcom/facebook/samples/zoomable/a;->Vb:Landroid/graphics/Matrix;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
@@ -92,9 +91,7 @@
 
     iget-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->Vc:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$1;->Vc:Lcom/facebook/samples/zoomable/b;
-
-    iget-object v0, v0, Lcom/facebook/samples/zoomable/a;->Vb:Landroid/graphics/Matrix;
+    iget-object v0, p1, Lcom/facebook/samples/zoomable/a;->Vb: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/com/facebook/samples/zoomable/b$2.smali b/com.discord/smali/com/facebook/samples/zoomable/b$2.smali
index a9dc3a3d81..e8b6d5a749 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/b$2.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/b$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/samples/zoomable/b$2;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "AnimatedZoomableController.java"
 
 
 # annotations
@@ -32,15 +33,13 @@
     return-void
 .end method
 
-.method private jJ()V
+.method private jI()V
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->Vd:Ljava/lang/Runnable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->Vd:Ljava/lang/Runnable;
-
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
     :cond_0
@@ -50,11 +49,9 @@
 
     iput-boolean v1, v0, Lcom/facebook/samples/zoomable/a;->UW:Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->Vc:Lcom/facebook/samples/zoomable/b;
-
     iget-object v0, v0, Lcom/facebook/samples/zoomable/c;->Vf:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->jF()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->jE()V
 
     return-void
 .end method
@@ -70,7 +67,7 @@
 
     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;->jJ()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->jI()V
 
     return-void
 .end method
@@ -84,7 +81,7 @@
 
     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;->jJ()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->jI()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/samples/zoomable/b.smali b/com.discord/smali/com/facebook/samples/zoomable/b.smali
index 213c66c7c0..2afb053b0e 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/b.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/samples/zoomable/b;
 .super Lcom/facebook/samples/zoomable/a;
+.source "AnimatedZoomableController.java"
 
 
 # static fields
@@ -75,7 +76,7 @@
     return-void
 .end method
 
-.method public static jI()Lcom/facebook/samples/zoomable/b;
+.method public static jH()Lcom/facebook/samples/zoomable/b;
     .locals 3
 
     new-instance v0, Lcom/facebook/samples/zoomable/b;
@@ -117,7 +118,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->jH()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->jG()V
 
     const/4 v0, 0x1
 
@@ -197,7 +198,7 @@
     return-object v0
 .end method
 
-.method public final jH()V
+.method public final jG()V
     .locals 2
     .annotation build Landroid/annotation/SuppressLint;
         value = {
diff --git a/com.discord/smali/com/facebook/samples/zoomable/c.smali b/com.discord/smali/com/facebook/samples/zoomable/c.smali
index 5fb6e030b5..a9c6536eb9 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/c.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/samples/zoomable/c;
 .super Ljava/lang/Object;
+.source "DefaultZoomableController.java"
 
 # interfaces
 .implements Lcom/facebook/samples/a/b$a;
@@ -487,7 +488,7 @@
     return p1
 .end method
 
-.method private jM()V
+.method private jL()V
     .locals 3
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Vr:Landroid/graphics/Matrix;
@@ -502,11 +503,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Vh:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->Vh:Z
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Vg:Lcom/facebook/samples/zoomable/f$a;
+    if-eqz v1, :cond_0
 
     iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Vr:Landroid/graphics/Matrix;
 
@@ -558,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;->jM()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jL()V
 
     return-void
 .end method
@@ -1133,13 +1132,13 @@
 
     or-int/2addr p1, v1
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jM()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jL()V
 
     if-eqz p1, :cond_5
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Vf:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->jF()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->jE()V
 
     :cond_5
     iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->Vu:Z
@@ -1162,7 +1161,7 @@
 
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jM()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jL()V
 
     :cond_0
     return-void
@@ -1311,8 +1310,6 @@
 
     aput v2, v0, v1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Vt:[F
-
     const/4 v2, 0x4
 
     aget v4, v0, v2
@@ -1321,8 +1318,6 @@
 
     aput v4, v0, v2
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Vt:[F
-
     const/16 v2, 0x8
 
     aget v4, v0, v2
@@ -1365,7 +1360,7 @@
     return v0
 .end method
 
-.method public final jG()V
+.method public final jF()V
     .locals 2
 
     sget-object v0, Lcom/facebook/samples/zoomable/c;->Bp:Ljava/lang/Class;
@@ -1377,7 +1372,7 @@
     return-void
 .end method
 
-.method public final jK()Z
+.method public final jJ()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Vu:Z
@@ -1385,7 +1380,7 @@
     return v0
 .end method
 
-.method public final jL()Landroid/graphics/Matrix;
+.method public final jK()Landroid/graphics/Matrix;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Vr:Landroid/graphics/Matrix;
@@ -1438,7 +1433,7 @@
     :pswitch_1
     iput v1, v0, Lcom/facebook/samples/a/a;->UM:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jB()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jA()V
 
     invoke-virtual {v0}, Lcom/facebook/samples/a/a;->reset()V
 
@@ -1488,7 +1483,7 @@
 
     if-lez p1, :cond_2
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jA()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jz()V
 
     :cond_2
     iget-boolean p1, v0, Lcom/facebook/samples/a/a;->UK:Z
@@ -1501,7 +1496,7 @@
 
     iget-object p1, v0, Lcom/facebook/samples/a/a;->UT:Lcom/facebook/samples/a/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->jD()V
+    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->jC()V
 
     goto :goto_5
 
@@ -1526,7 +1521,7 @@
     :cond_4
     iput v2, v0, Lcom/facebook/samples/a/a;->UM:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jB()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jA()V
 
     iput v1, v0, Lcom/facebook/samples/a/a;->UL:I
 
@@ -1625,7 +1620,7 @@
 
     if-lez p1, :cond_a
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jA()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jz()V
 
     :cond_a
     :goto_5
@@ -1669,7 +1664,7 @@
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jM()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jL()V
 
     return-void
 .end method
@@ -1700,7 +1695,7 @@
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jM()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->jL()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/samples/zoomable/d.smali b/com.discord/smali/com/facebook/samples/zoomable/d.smali
index e6ab5f4513..22b56c1ec8 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/d.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/samples/zoomable/d;
 .super Landroid/view/GestureDetector$SimpleOnGestureListener;
+.source "DoubleTapGestureListener.java"
 
 
 # instance fields
@@ -129,7 +130,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :pswitch_0
     iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->Vz:Z
@@ -196,7 +197,7 @@
 
     invoke-virtual {v1, p1, v0, v2}, Lcom/facebook/samples/zoomable/a;->a(FLandroid/graphics/PointF;Landroid/graphics/PointF;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_1
     iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->Vz:Z
@@ -213,7 +214,7 @@
 
     invoke-virtual {v1, p1, v2, v3}, Lcom/facebook/samples/zoomable/a;->a(FLandroid/graphics/PointF;Landroid/graphics/PointF;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget v2, v1, Lcom/facebook/samples/zoomable/c;->Vm:F
@@ -236,22 +237,21 @@
 
     const-wide/16 v5, 0x12c
 
-    :goto_1
     invoke-virtual/range {v1 .. v6}, Lcom/facebook/samples/zoomable/a;->a(FLandroid/graphics/PointF;Landroid/graphics/PointF;J)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const-wide/16 v5, 0x12c
 
     move v2, p1
 
-    goto :goto_1
+    invoke-virtual/range {v1 .. v6}, Lcom/facebook/samples/zoomable/a;->a(FLandroid/graphics/PointF;Landroid/graphics/PointF;J)V
 
-    :goto_2
+    :goto_1
     iput-boolean v0, p0, Lcom/facebook/samples/zoomable/d;->Vz:Z
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_2
     iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->Vw:Landroid/graphics/PointF;
@@ -269,7 +269,7 @@
     iput p1, p0, Lcom/facebook/samples/zoomable/d;->Vy:F
 
     :cond_5
-    :goto_3
+    :goto_2
     return v7
 
     :pswitch_data_0
diff --git a/com.discord/smali/com/facebook/samples/zoomable/e.smali b/com.discord/smali/com/facebook/samples/zoomable/e.smali
index 1fa713c728..61447f2b7a 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/e.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/samples/zoomable/e;
 .super Landroid/view/GestureDetector$SimpleOnGestureListener;
+.source "GestureListenerWrapper.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/samples/zoomable/f$a.smali b/com.discord/smali/com/facebook/samples/zoomable/f$a.smali
index f4862640e1..bcb94c8d35 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/f$a.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/f$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/samples/zoomable/f$a;
 .super Ljava/lang/Object;
+.source "ZoomableController.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/samples/zoomable/f.smali b/com.discord/smali/com/facebook/samples/zoomable/f.smali
index 083f72ea6b..6ad298e475 100644
--- a/com.discord/smali/com/facebook/samples/zoomable/f.smali
+++ b/com.discord/smali/com/facebook/samples/zoomable/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/samples/zoomable/f;
 .super Ljava/lang/Object;
+.source "ZoomableController.java"
 
 
 # annotations
@@ -47,10 +48,10 @@
 .method public abstract isIdentity()Z
 .end method
 
-.method public abstract jK()Z
+.method public abstract jJ()Z
 .end method
 
-.method public abstract jL()Landroid/graphics/Matrix;
+.method public abstract jK()Landroid/graphics/Matrix;
 .end method
 
 .method public abstract onTouchEvent(Landroid/view/MotionEvent;)Z
diff --git a/com.discord/smali/com/facebook/soloader/Api18TraceUtils.smali b/com.discord/smali/com/facebook/soloader/Api18TraceUtils.smali
index f97a03c7a5..e78948540c 100644
--- a/com.discord/smali/com/facebook/soloader/Api18TraceUtils.smali
+++ b/com.discord/smali/com/facebook/soloader/Api18TraceUtils.smali
@@ -1,5 +1,6 @@
 .class Lcom/facebook/soloader/Api18TraceUtils;
 .super Ljava/lang/Object;
+.source "Api18TraceUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/soloader/R.smali b/com.discord/smali/com/facebook/soloader/R.smali
index e6a01a5bba..c32807cbbb 100644
--- a/com.discord/smali/com/facebook/soloader/R.smali
+++ b/com.discord/smali/com/facebook/soloader/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/soloader/SoLoader$1.smali b/com.discord/smali/com/facebook/soloader/SoLoader$1.smali
index 8dd1de8379..d0c3b0e740 100644
--- a/com.discord/smali/com/facebook/soloader/SoLoader$1.smali
+++ b/com.discord/smali/com/facebook/soloader/SoLoader$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/soloader/SoLoader$1;
 .super Ljava/lang/Object;
+.source "SoLoader.java"
 
 # interfaces
 .implements Lcom/facebook/soloader/h;
@@ -191,9 +192,9 @@
 
     and-int/2addr p2, v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-ne p2, v0, :cond_0
 
@@ -244,15 +245,15 @@
 
     new-array v7, v7, [Ljava/lang/Object;
 
-    aput-object p1, v7, v1
+    aput-object p1, v7, v2
 
-    const-class v1, Lcom/facebook/soloader/SoLoader;
+    const-class v2, Lcom/facebook/soloader/SoLoader;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+    invoke-virtual {v2}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
 
-    move-result-object v1
+    move-result-object v2
 
-    aput-object v1, v7, v2
+    aput-object v2, v7, v1
 
     aput-object p2, v7, v6
 
@@ -260,10 +261,9 @@
 
     move-result-object v1
 
-    :goto_2
     check-cast v1, Ljava/lang/String;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     iget-object v4, p0, Lcom/facebook/soloader/SoLoader$1;->Wp:Ljava/lang/reflect/Method;
@@ -272,25 +272,25 @@
 
     new-array v6, v6, [Ljava/lang/Object;
 
-    aput-object p1, v6, v1
+    aput-object p1, v6, v2
 
-    const-class v1, Lcom/facebook/soloader/SoLoader;
+    const-class v2, Lcom/facebook/soloader/SoLoader;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+    invoke-virtual {v2}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
 
-    move-result-object v1
+    move-result-object v2
 
-    aput-object v1, v6, v2
+    aput-object v2, v6, v1
 
     invoke-virtual {v4, v5, v6}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
+
+    check-cast v1, Ljava/lang/String;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    goto :goto_2
-
-    :goto_3
+    :goto_2
     if-nez v1, :cond_4
 
     :try_start_2
@@ -332,9 +332,22 @@
 
     invoke-static {v0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-void
+
     :cond_3
     return-void
 
+    :catchall_0
+    move-exception v0
+
+    move-object v8, v1
+
+    move-object v1, v0
+
+    move-object v0, v8
+
+    goto :goto_3
+
     :cond_4
     :try_start_3
     new-instance v0, Ljava/lang/UnsatisfiedLinkError;
@@ -345,21 +358,10 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :catchall_0
-    move-exception v0
-
-    move-object v8, v1
-
-    move-object v1, v0
-
-    move-object v0, v8
-
-    goto :goto_4
-
     :catchall_1
     move-exception v1
 
-    :goto_4
+    :goto_3
     :try_start_4
     monitor-exit v3
     :try_end_4
@@ -376,7 +378,7 @@
     :catchall_2
     move-exception v1
 
-    goto :goto_5
+    goto :goto_4
 
     :catch_0
     move-exception v1
@@ -390,25 +392,17 @@
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v0
+
+    new-instance v2, Ljava/lang/RuntimeException;
+
+    invoke-direct {v2, v0, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v2
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_2
 
-    :try_start_7
-    new-instance v0, Ljava/lang/RuntimeException;
-
-    invoke-direct {v0, v2, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v0
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_3
-
-    :catchall_3
-    move-exception v1
-
-    move-object v0, v2
-
-    :goto_5
+    :goto_4
     if-eqz v0, :cond_5
 
     new-instance v2, Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/facebook/soloader/SoLoader$Api14Utils.smali b/com.discord/smali/com/facebook/soloader/SoLoader$Api14Utils.smali
index 85271af5f2..3bf62533c3 100644
--- a/com.discord/smali/com/facebook/soloader/SoLoader$Api14Utils.smali
+++ b/com.discord/smali/com/facebook/soloader/SoLoader$Api14Utils.smali
@@ -1,5 +1,6 @@
 .class Lcom/facebook/soloader/SoLoader$Api14Utils;
 .super Ljava/lang/Object;
+.source "SoLoader.java"
 
 
 # annotations
@@ -29,7 +30,7 @@
     return-void
 .end method
 
-.method public static jX()Ljava/lang/String;
+.method public static jW()Ljava/lang/String;
     .locals 5
 
     const-class v0, Lcom/facebook/soloader/SoLoader;
diff --git a/com.discord/smali/com/facebook/soloader/SoLoader$a.smali b/com.discord/smali/com/facebook/soloader/SoLoader$a.smali
index e46c66b897..1db510fa26 100644
--- a/com.discord/smali/com/facebook/soloader/SoLoader$a.smali
+++ b/com.discord/smali/com/facebook/soloader/SoLoader$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/SoLoader$a;
 .super Ljava/lang/UnsatisfiedLinkError;
+.source "SoLoader.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/soloader/SoLoader.smali b/com.discord/smali/com/facebook/soloader/SoLoader.smali
index 6cb5153ef6..4956672f8c 100644
--- a/com.discord/smali/com/facebook/soloader/SoLoader.smali
+++ b/com.discord/smali/com/facebook/soloader/SoLoader.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/soloader/SoLoader;
 .super Ljava/lang/Object;
+.source "SoLoader.java"
 
 
 # annotations
@@ -413,7 +414,7 @@
 
     check-cast p0, [Lcom/facebook/soloader/i;
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader;->jV()I
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->jU()I
 
     move-result v1
 
@@ -535,6 +536,8 @@
     invoke-static {v0}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static declared-synchronized a(Lcom/facebook/soloader/h;)V
@@ -553,7 +556,7 @@
 
     move-result-object v4
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader;->jW()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->jV()Ljava/lang/reflect/Method;
 
     move-result-object v5
 
@@ -573,7 +576,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->jX()Ljava/lang/String;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->jW()Ljava/lang/String;
 
     move-result-object v3
 
@@ -658,6 +661,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method private static a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)Z
@@ -1147,7 +1152,7 @@
     :try_start_0
     sget-object v0, Lcom/facebook/soloader/SoLoader;->Wc:[Lcom/facebook/soloader/i;
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_4
+    .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     if-eqz v0, :cond_14
 
@@ -1217,7 +1222,7 @@
     sget v5, Lcom/facebook/soloader/SoLoader;->Wd:I
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_3
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     const/4 v6, 0x0
 
@@ -1237,64 +1242,51 @@
 
     invoke-virtual {v7, p0, p1, p2}, Lcom/facebook/soloader/i;->a(Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)I
 
-    move-result v7
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    move-result v3
 
-    if-ne v7, v4, :cond_3
+    if-ne v3, v4, :cond_3
 
-    :try_start_3
-    sget-object v3, Lcom/facebook/soloader/SoLoader;->We:Lcom/facebook/soloader/l;
+    sget-object v7, Lcom/facebook/soloader/SoLoader;->We:Lcom/facebook/soloader/l;
 
-    if-eqz v3, :cond_3
+    if-eqz v7, :cond_3
 
-    const-string v3, "SoLoader"
+    const-string v6, "SoLoader"
 
-    const-string v6, "Trying backup SoSource for "
+    const-string v7, "Trying backup SoSource for "
 
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v6, v8}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v7, v8}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-static {v3, v6}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+    invoke-static {v6, v7}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v3, Lcom/facebook/soloader/SoLoader;->We:Lcom/facebook/soloader/l;
+    sget-object v6, Lcom/facebook/soloader/SoLoader;->We:Lcom/facebook/soloader/l;
 
-    invoke-virtual {v3, p0}, Lcom/facebook/soloader/l;->aD(Ljava/lang/String;)V
+    invoke-virtual {v6, p0}, Lcom/facebook/soloader/l;->aD(Ljava/lang/String;)V
 
-    sget-object v3, Lcom/facebook/soloader/SoLoader;->We:Lcom/facebook/soloader/l;
+    sget-object v6, Lcom/facebook/soloader/SoLoader;->We:Lcom/facebook/soloader/l;
 
-    invoke-virtual {v3, p0, p1, p2}, Lcom/facebook/soloader/l;->a(Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)I
+    invoke-virtual {v6, p0, p1, p2}, Lcom/facebook/soloader/l;->a(Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)I
 
     move-result v3
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    goto :goto_3
-
-    :catchall_0
-    move-exception p1
-
-    move v3, v7
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     goto :goto_2
 
     :cond_3
     add-int/lit8 v6, v6, 0x1
 
-    move v3, v7
-
     goto :goto_1
 
-    :catchall_1
+    :catchall_0
     move-exception p1
 
-    :goto_2
-    :try_start_4
+    :try_start_3
     sget-object v0, Lcom/facebook/soloader/SoLoader;->Wb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
@@ -1306,7 +1298,7 @@
     throw p1
 
     :cond_4
-    :goto_3
+    :goto_2
     sget-object v6, Lcom/facebook/soloader/SoLoader;->Wb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v6}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
@@ -1324,18 +1316,18 @@
     move-result-object v6
 
     invoke-virtual {v6}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
-    :try_end_4
-    .catch Ljava/lang/Throwable; {:try_start_4 .. :try_end_4} :catch_0
-    .catchall {:try_start_4 .. :try_end_4} :catchall_3
+    :try_end_3
+    .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
-    :try_start_5
+    :try_start_4
     sget-object v6, Lcom/facebook/soloader/SoLoader;->Wf:Lcom/facebook/soloader/b;
 
     if-eqz v6, :cond_5
 
     sget-object v6, Lcom/facebook/soloader/SoLoader;->Wf:Lcom/facebook/soloader/b;
 
-    invoke-virtual {v6}, Lcom/facebook/soloader/b;->jQ()Z
+    invoke-virtual {v6}, Lcom/facebook/soloader/b;->jP()Z
 
     move-result v6
 
@@ -1349,20 +1341,20 @@
 
     :cond_5
     sget v6, Lcom/facebook/soloader/SoLoader;->Wd:I
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     if-eq v6, v5, :cond_6
 
     const/4 v5, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const/4 v5, 0x0
 
-    :goto_4
-    :try_start_6
+    :goto_3
+    :try_start_5
     sget-object v6, Lcom/facebook/soloader/SoLoader;->Wb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v6}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
@@ -1371,9 +1363,9 @@
 
     invoke-virtual {v6}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
 
-    goto :goto_5
+    goto :goto_4
 
-    :catchall_2
+    :catchall_1
     move-exception p1
 
     sget-object v0, Lcom/facebook/soloader/SoLoader;->Wb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
@@ -1385,14 +1377,14 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
 
     throw p1
-    :try_end_6
-    .catch Ljava/lang/Throwable; {:try_start_6 .. :try_end_6} :catch_0
-    .catchall {:try_start_6 .. :try_end_6} :catchall_3
+    :try_end_5
+    .catch Ljava/lang/Throwable; {:try_start_5 .. :try_end_5} :catch_0
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
 
     :cond_7
     const/4 v5, 0x0
 
-    :goto_5
+    :goto_4
     if-nez v5, :cond_2
 
     sget-boolean p1, Lcom/facebook/soloader/SoLoader;->VZ:Z
@@ -1411,7 +1403,7 @@
 
     if-eq v3, v4, :cond_a
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_a
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -1434,7 +1426,7 @@
 
     throw p1
 
-    :catchall_3
+    :catchall_2
     move-exception p1
 
     sget-boolean v0, Lcom/facebook/soloader/SoLoader;->VZ:Z
@@ -1453,13 +1445,13 @@
 
     if-ne v3, v4, :cond_d
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_d
     throw p1
 
     :cond_e
-    :goto_6
+    :goto_5
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
@@ -1499,14 +1491,14 @@
 
     if-ne v3, v4, :cond_11
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_11
-    :goto_7
+    :goto_6
     return-void
 
     :cond_12
-    :goto_8
+    :goto_7
     const-string p2, "couldn\'t find DSO to load: "
 
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -1555,7 +1547,7 @@
     throw p1
 
     :cond_14
-    :try_start_7
+    :try_start_6
     const-string p1, "SoLoader"
 
     new-instance p2, Ljava/lang/StringBuilder;
@@ -1591,10 +1583,10 @@
     invoke-direct {p1, p0}, Ljava/lang/UnsatisfiedLinkError;-><init>(Ljava/lang/String;)V
 
     throw p1
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_4
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_3
 
-    :catchall_4
+    :catchall_3
     move-exception p0
 
     sget-object p1, Lcom/facebook/soloader/SoLoader;->Wb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
@@ -1606,9 +1598,11 @@
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
 
     throw p0
+
+    return-void
 .end method
 
-.method private static jV()I
+.method private static jU()I
     .locals 2
 
     sget-object v0, Lcom/facebook/soloader/SoLoader;->Wb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
@@ -1660,7 +1654,7 @@
     throw v0
 .end method
 
-.method private static jW()Ljava/lang/reflect/Method;
+.method private static jV()Ljava/lang/reflect/Method;
     .locals 8
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali/com/facebook/soloader/a$a.smali b/com.discord/smali/com/facebook/soloader/a$a.smali
index 1628297342..27a5da0ad9 100644
--- a/com.discord/smali/com/facebook/soloader/a$a.smali
+++ b/com.discord/smali/com/facebook/soloader/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/a$a;
 .super Lcom/facebook/soloader/e$b;
+.source "ApkSoSource.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/soloader/a.smali b/com.discord/smali/com/facebook/soloader/a.smali
index e1a274b9ea..1ed8e540ec 100644
--- a/com.discord/smali/com/facebook/soloader/a.smali
+++ b/com.discord/smali/com/facebook/soloader/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/a;
 .super Lcom/facebook/soloader/e;
+.source "ApkSoSource.java"
 
 
 # annotations
@@ -39,7 +40,7 @@
 
 
 # virtual methods
-.method protected final jO()Lcom/facebook/soloader/l$e;
+.method protected final jN()Lcom/facebook/soloader/l$e;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -54,7 +55,7 @@
     return-object v0
 .end method
 
-.method protected final jP()[B
+.method protected final jO()[B
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/com/facebook/soloader/b.smali b/com.discord/smali/com/facebook/soloader/b.smali
index d49679c5f6..b235bd8912 100644
--- a/com.discord/smali/com/facebook/soloader/b.smali
+++ b/com.discord/smali/com/facebook/soloader/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/b;
 .super Lcom/facebook/soloader/i;
+.source "ApplicationSoSource.java"
 
 
 # instance fields
@@ -92,7 +93,7 @@
     return-void
 .end method
 
-.method public final jQ()Z
+.method public final jP()Z
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -183,6 +184,8 @@
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return v3
+
     :cond_0
     return v3
 
diff --git a/com.discord/smali/com/facebook/soloader/c.smali b/com.discord/smali/com/facebook/soloader/c.smali
index ccffa12baf..157c20007f 100644
--- a/com.discord/smali/com/facebook/soloader/c.smali
+++ b/com.discord/smali/com/facebook/soloader/c.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/soloader/c;
 .super Lcom/facebook/soloader/i;
+.source "DirectorySoSource.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/facebook/soloader/d.smali b/com.discord/smali/com/facebook/soloader/d.smali
index a709d8951e..755fb629e0 100644
--- a/com.discord/smali/com/facebook/soloader/d.smali
+++ b/com.discord/smali/com/facebook/soloader/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/facebook/soloader/d;
 .super Ljava/lang/Object;
+.source "DoNotOptimize.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/facebook/soloader/e$a.smali b/com.discord/smali/com/facebook/soloader/e$a.smali
index 8d32e16e4e..4af427c247 100644
--- a/com.discord/smali/com/facebook/soloader/e$a.smali
+++ b/com.discord/smali/com/facebook/soloader/e$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/soloader/e$a;
 .super Lcom/facebook/soloader/l$a;
+.source "ExtractFromZipSoSource.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
diff --git a/com.discord/smali/com/facebook/soloader/e$b$a.smali b/com.discord/smali/com/facebook/soloader/e$b$a.smali
index f72f6455f3..ab48164484 100644
--- a/com.discord/smali/com/facebook/soloader/e$b$a.smali
+++ b/com.discord/smali/com/facebook/soloader/e$b$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/soloader/e$b$a;
 .super Lcom/facebook/soloader/l$d;
+.source "ExtractFromZipSoSource.java"
 
 
 # annotations
@@ -45,7 +46,7 @@
 
     iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->VW:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->jR()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->jQ()[Lcom/facebook/soloader/e$a;
 
     iget v0, p0, Lcom/facebook/soloader/e$b$a;->VV:I
 
@@ -67,7 +68,7 @@
     return v0
 .end method
 
-.method public final jU()Lcom/facebook/soloader/l$c;
+.method public final jT()Lcom/facebook/soloader/l$c;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -77,7 +78,7 @@
 
     iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->VW:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->jR()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->jQ()[Lcom/facebook/soloader/e$a;
 
     iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->VW:Lcom/facebook/soloader/e$b;
 
diff --git a/com.discord/smali/com/facebook/soloader/e$b.smali b/com.discord/smali/com/facebook/soloader/e$b.smali
index 4fc108c1e1..0843eab27e 100644
--- a/com.discord/smali/com/facebook/soloader/e$b.smali
+++ b/com.discord/smali/com/facebook/soloader/e$b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/soloader/e$b;
 .super Lcom/facebook/soloader/l$e;
+.source "ExtractFromZipSoSource.java"
 
 
 # annotations
@@ -83,7 +84,7 @@
     return-void
 .end method
 
-.method final jR()[Lcom/facebook/soloader/e$a;
+.method final jQ()[Lcom/facebook/soloader/e$a;
     .locals 9
 
     iget-object v0, p0, Lcom/facebook/soloader/e$b;->VR:[Lcom/facebook/soloader/e$a;
@@ -291,7 +292,7 @@
     return-object v0
 .end method
 
-.method protected final jS()Lcom/facebook/soloader/l$b;
+.method protected final jR()Lcom/facebook/soloader/l$b;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -301,7 +302,7 @@
 
     new-instance v0, Lcom/facebook/soloader/l$b;
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/e$b;->jR()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {p0}, Lcom/facebook/soloader/e$b;->jQ()[Lcom/facebook/soloader/e$a;
 
     move-result-object v1
 
@@ -310,7 +311,7 @@
     return-object v0
 .end method
 
-.method protected final jT()Lcom/facebook/soloader/l$d;
+.method protected final jS()Lcom/facebook/soloader/l$d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/com/facebook/soloader/e.smali b/com.discord/smali/com/facebook/soloader/e.smali
index e5a25fa9e9..6c1ebbaf7d 100644
--- a/com.discord/smali/com/facebook/soloader/e.smali
+++ b/com.discord/smali/com/facebook/soloader/e.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/soloader/e;
 .super Lcom/facebook/soloader/l;
+.source "ExtractFromZipSoSource.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
 
 
 # virtual methods
-.method protected jO()Lcom/facebook/soloader/l$e;
+.method protected jN()Lcom/facebook/soloader/l$e;
     .locals 1
     .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 00a0dd89da..0b58ed7425 100644
--- a/com.discord/smali/com/facebook/soloader/f.smali
+++ b/com.discord/smali/com/facebook/soloader/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/f;
 .super Ljava/lang/Object;
+.source "FileLocker.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/com/facebook/soloader/g$a.smali b/com.discord/smali/com/facebook/soloader/g$a.smali
index 1664c0e00e..9d4c5ad5e3 100644
--- a/com.discord/smali/com/facebook/soloader/g$a.smali
+++ b/com.discord/smali/com/facebook/soloader/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/soloader/g$a;
 .super Ljava/lang/RuntimeException;
+.source "MinElf.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/soloader/g.smali b/com.discord/smali/com/facebook/soloader/g.smali
index f68f93ff5f..d7d2f93281 100644
--- a/com.discord/smali/com/facebook/soloader/g.smali
+++ b/com.discord/smali/com/facebook/soloader/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/g;
 .super Ljava/lang/Object;
+.source "MinElf.java"
 
 
 # annotations
@@ -84,10 +85,12 @@
     invoke-direct {p0, p1}, Lcom/facebook/soloader/g$a;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static a(Ljava/nio/channels/FileChannel;)[Ljava/lang/String;
-    .locals 34
+    .locals 33
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -149,20 +152,20 @@
     invoke-virtual {v1, v6}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
 
     :cond_1
-    const-wide/16 v11, 0x20
+    const-wide/16 v11, 0x1c
 
-    const-wide/16 v13, 0x1c
+    const-wide/16 v13, 0x20
 
     if-eqz v8, :cond_2
 
-    invoke-static {v0, v1, v13, v14}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    invoke-static {v0, v1, v11, v12}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v15
 
     goto :goto_1
 
     :cond_2
-    invoke-static {v0, v1, v11, v12}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    invoke-static {v0, v1, v13, v14}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v15
 
@@ -193,19 +196,20 @@
 
     const-wide/16 v2, 0x2a
 
-    :goto_3
     invoke-static {v0, v1, v2, v3}, Lcom/facebook/soloader/g;->c(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
 
     move-result v2
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     const-wide/16 v2, 0x36
 
-    goto :goto_3
+    invoke-static {v0, v1, v2, v3}, Lcom/facebook/soloader/g;->c(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
 
-    :goto_4
+    move-result v2
+
+    :goto_3
     const-wide/32 v23, 0xffff
 
     const-wide/16 v9, 0x28
@@ -216,47 +220,48 @@
 
     if-eqz v8, :cond_5
 
-    invoke-static {v0, v1, v11, v12}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    invoke-static {v0, v1, v13, v14}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v3
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     invoke-static {v0, v1, v9, v10}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v3
 
-    :goto_5
+    :goto_4
     if-eqz v8, :cond_6
 
-    add-long/2addr v3, v13
+    add-long/2addr v3, v11
 
-    :goto_6
     invoke-static {v0, v1, v3, v4}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v3
 
     move-wide v4, v3
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_6
-    const/4 v5, 0x0
-
     const-wide/16 v5, 0x2c
 
     add-long/2addr v3, v5
 
-    goto :goto_6
+    invoke-static {v0, v1, v3, v4}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v3
+
+    move-wide v4, v3
 
     :cond_7
-    :goto_7
+    :goto_5
     move-wide v13, v15
 
     const-wide/16 v11, 0x0
 
-    :goto_8
+    :goto_6
     const-wide/16 v23, 0x1
 
     const-wide/16 v25, 0x8
@@ -289,18 +294,19 @@
 
     move-result-wide v9
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_8
-    const/4 v3, 0x0
-
     add-long v13, v13, v25
 
     invoke-static {v0, v1, v13, v14}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v9
 
-    goto :goto_9
+    :goto_7
+    const-wide/16 v21, 0x0
+
+    goto :goto_8
 
     :cond_9
     int-to-long v9, v2
@@ -311,14 +317,14 @@
 
     const-wide/16 v9, 0x28
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_a
     const-wide/16 v9, 0x0
 
-    :goto_9
     const-wide/16 v21, 0x0
 
+    :goto_8
     cmp-long v3, v9, v21
 
     if-eqz v3, :cond_22
@@ -329,46 +335,44 @@
 
     const/4 v3, 0x0
 
-    :goto_a
+    :goto_9
     if-eqz v8, :cond_b
 
-    move/from16 v29, v8
+    move/from16 v27, v8
 
     add-long v7, v11, v21
 
     invoke-static {v0, v1, v7, v8}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
-    move-result-wide v6
+    move-result-wide v7
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_b
-    move/from16 v29, v8
+    move/from16 v27, v8
 
-    const/4 v6, 0x0
+    add-long v7, v11, v21
 
-    add-long v6, v11, v21
+    invoke-static {v0, v1, v7, v8}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
-    invoke-static {v0, v1, v6, v7}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    move-result-wide v7
 
-    move-result-wide v6
+    :goto_a
+    const v6, 0x7fffffff
 
-    :goto_b
-    const v8, 0x7fffffff
+    cmp-long v29, v7, v23
 
-    cmp-long v27, v6, v23
+    if-nez v29, :cond_d
 
-    if-nez v27, :cond_d
-
-    if-eq v3, v8, :cond_c
+    if-eq v3, v6, :cond_c
 
     add-int/lit8 v3, v3, 0x1
 
-    move-wide/from16 v30, v9
+    move-wide/from16 v29, v7
 
     const-wide/16 v17, 0x5
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_c
     new-instance v0, Lcom/facebook/soloader/g$a;
@@ -382,152 +386,146 @@
     :cond_d
     const-wide/16 v17, 0x5
 
-    cmp-long v27, v6, v17
+    cmp-long v29, v7, v17
 
-    if-nez v27, :cond_f
+    if-nez v29, :cond_f
 
-    if-eqz v29, :cond_e
+    if-eqz v27, :cond_e
 
-    move-wide/from16 v30, v9
+    move-wide/from16 v29, v7
 
     const-wide/16 v13, 0x4
 
-    add-long v8, v11, v13
+    add-long v6, v11, v13
+
+    invoke-static {v0, v1, v6, v7}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v6
+
+    goto :goto_b
+
+    :cond_e
+    move-wide/from16 v29, v7
+
+    add-long v6, v11, v25
+
+    invoke-static {v0, v1, v6, v7}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v6
+
+    :goto_b
+    move-wide v13, v6
+
+    goto :goto_c
+
+    :cond_f
+    move-wide/from16 v29, v7
+
+    :goto_c
+    const-wide/16 v6, 0x10
+
+    if-eqz v27, :cond_10
+
+    move-wide/from16 v31, v25
+
+    goto :goto_d
+
+    :cond_10
+    move-wide/from16 v31, v6
+
+    :goto_d
+    add-long v11, v11, v31
+
+    const-wide/16 v21, 0x0
+
+    cmp-long v31, v29, v21
+
+    if-nez v31, :cond_21
+
+    cmp-long v11, v13, v21
+
+    if-eqz v11, :cond_20
+
+    move-wide/from16 v29, v9
+
+    const/4 v11, 0x0
+
+    :goto_e
+    int-to-long v8, v11
+
+    cmp-long v12, v8, v4
+
+    if-gez v12, :cond_16
+
+    add-long v8, v15, v21
 
     invoke-static {v0, v1, v8, v9}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v8
 
-    goto :goto_c
+    cmp-long v12, v8, v23
 
-    :cond_e
-    move-wide/from16 v30, v9
+    if-nez v12, :cond_14
 
-    const/4 v8, 0x0
+    if-eqz v27, :cond_11
 
-    add-long v8, v11, v25
+    add-long v8, v15, v25
+
+    invoke-static {v0, v1, v8, v9}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v8
+
+    goto :goto_f
+
+    :cond_11
+    add-long v8, v15, v6
 
     invoke-static {v0, v1, v8, v9}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v8
 
-    :goto_c
-    move-wide v13, v8
-
-    goto :goto_d
-
-    :cond_f
-    move-wide/from16 v30, v9
-
-    :goto_d
-    const-wide/16 v8, 0x10
-
-    if-eqz v29, :cond_10
-
-    move-wide/from16 v27, v25
-
-    goto :goto_e
-
-    :cond_10
-    move-wide/from16 v27, v8
-
-    :goto_e
-    const/4 v10, 0x0
-
-    add-long v11, v11, v27
-
-    const-wide/16 v21, 0x0
-
-    cmp-long v10, v6, v21
-
-    if-nez v10, :cond_21
-
-    cmp-long v6, v13, v21
-
-    if-eqz v6, :cond_20
-
-    const/4 v6, 0x0
-
     :goto_f
-    int-to-long v10, v6
+    if-eqz v27, :cond_12
 
-    cmp-long v7, v10, v4
+    const-wide/16 v17, 0x14
 
-    if-gez v7, :cond_16
+    add-long v6, v15, v17
 
-    add-long v10, v15, v21
+    invoke-static {v0, v1, v6, v7}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
-    invoke-static {v0, v1, v10, v11}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    move-result-wide v6
 
-    move-result-wide v10
+    move v12, v11
 
-    cmp-long v7, v10, v23
+    move-wide v10, v6
 
-    if-nez v7, :cond_14
-
-    if-eqz v29, :cond_11
-
-    add-long v10, v15, v25
-
-    invoke-static {v0, v1, v10, v11}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v10
+    const-wide/16 v6, 0x28
 
     goto :goto_10
 
-    :cond_11
-    const/4 v7, 0x0
+    :cond_12
+    move v12, v11
 
-    add-long v10, v15, v8
+    const-wide/16 v6, 0x28
+
+    add-long v10, v15, v6
 
     invoke-static {v0, v1, v10, v11}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v10
 
     :goto_10
-    if-eqz v29, :cond_12
+    cmp-long v18, v8, v13
 
-    const-wide/16 v17, 0x14
+    if-gtz v18, :cond_15
 
-    add-long v8, v15, v17
+    add-long/2addr v10, v8
 
-    invoke-static {v0, v1, v8, v9}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    cmp-long v18, v13, v10
 
-    move-result-wide v7
+    if-gez v18, :cond_15
 
-    move-wide/from16 v32, v4
-
-    move-wide v4, v7
-
-    const-wide/16 v7, 0x28
-
-    goto :goto_11
-
-    :cond_12
-    const/4 v7, 0x0
-
-    move-wide/from16 v32, v4
-
-    const-wide/16 v7, 0x28
-
-    add-long v4, v15, v7
-
-    invoke-static {v0, v1, v4, v5}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v4
-
-    :goto_11
-    cmp-long v9, v10, v13
-
-    if-gtz v9, :cond_15
-
-    add-long/2addr v4, v10
-
-    cmp-long v9, v13, v4
-
-    if-gez v9, :cond_15
-
-    if-eqz v29, :cond_13
+    if-eqz v27, :cond_13
 
     const-wide/16 v4, 0x4
 
@@ -537,52 +535,48 @@
 
     move-result-wide v4
 
-    goto :goto_12
+    goto :goto_11
 
     :cond_13
-    const/4 v2, 0x0
-
     add-long v4, v15, v25
 
     invoke-static {v0, v1, v4, v5}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v4
 
-    :goto_12
-    const/4 v2, 0x0
-
-    sub-long/2addr v13, v10
+    :goto_11
+    sub-long/2addr v13, v8
 
     add-long/2addr v4, v13
 
-    goto :goto_13
+    const-wide/16 v6, 0x0
+
+    goto :goto_12
 
     :cond_14
-    move-wide/from16 v32, v4
+    move v12, v11
 
-    const-wide/16 v7, 0x28
+    const-wide/16 v6, 0x28
 
     :cond_15
-    int-to-long v4, v2
+    int-to-long v8, v2
 
-    add-long/2addr v15, v4
+    add-long/2addr v15, v8
 
-    add-int/lit8 v6, v6, 0x1
+    add-int/lit8 v11, v12, 0x1
 
-    move-wide/from16 v4, v32
-
-    const-wide/16 v8, 0x10
+    const-wide/16 v6, 0x10
 
     const-wide/16 v21, 0x0
 
-    goto :goto_f
+    goto :goto_e
 
     :cond_16
     const-wide/16 v4, 0x0
 
-    :goto_13
     const-wide/16 v6, 0x0
 
+    :goto_12
     cmp-long v2, v4, v6
 
     if-eqz v2, :cond_1f
@@ -591,66 +585,58 @@
 
     const/4 v3, 0x0
 
-    :goto_14
-    if-eqz v29, :cond_17
+    :goto_13
+    if-eqz v27, :cond_17
 
-    add-long v8, v30, v6
+    add-long v8, v29, v6
 
     invoke-static {v0, v1, v8, v9}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v8
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_17
-    const/4 v8, 0x0
-
-    add-long v8, v30, v6
+    add-long v8, v29, v6
 
     invoke-static {v0, v1, v8, v9}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v8
 
-    :goto_15
+    :goto_14
     cmp-long v6, v8, v23
 
     if-nez v6, :cond_1b
 
-    if-eqz v29, :cond_18
+    if-eqz v27, :cond_18
 
     const-wide/16 v19, 0x4
 
-    add-long v6, v30, v19
+    add-long v6, v29, v19
 
     invoke-static {v0, v1, v6, v7}, Lcom/facebook/soloader/g;->b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v6
 
-    goto :goto_16
+    goto :goto_15
 
     :cond_18
     const-wide/16 v19, 0x4
 
-    const/4 v6, 0x0
-
-    add-long v6, v30, v25
+    add-long v6, v29, v25
 
     invoke-static {v0, v1, v6, v7}, Lcom/facebook/soloader/g;->a(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
 
     move-result-wide v6
 
-    :goto_16
-    const/4 v10, 0x0
-
+    :goto_15
     add-long/2addr v6, v4
 
     new-instance v10, Ljava/lang/StringBuilder;
 
     invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
 
-    :goto_17
-    const/4 v11, 0x0
-
+    :goto_16
     add-long v11, v6, v23
 
     invoke-static {v0, v1, v6, v7}, Lcom/facebook/soloader/g;->d(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
@@ -665,7 +651,7 @@
 
     move-wide v6, v11
 
-    goto :goto_17
+    goto :goto_16
 
     :cond_19
     invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -680,7 +666,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_18
+    goto :goto_17
 
     :cond_1a
     new-instance v0, Lcom/facebook/soloader/g$a;
@@ -696,20 +682,18 @@
 
     const-wide/16 v19, 0x4
 
-    :goto_18
-    if-eqz v29, :cond_1c
+    :goto_17
+    if-eqz v27, :cond_1c
 
     move-wide/from16 v10, v25
 
-    goto :goto_19
+    goto :goto_18
 
     :cond_1c
     const-wide/16 v10, 0x10
 
-    :goto_19
-    const/4 v7, 0x0
-
-    add-long v30, v30, v10
+    :goto_18
+    add-long v29, v29, v10
 
     const-wide/16 v21, 0x0
 
@@ -735,7 +719,7 @@
     :cond_1e
     move-wide/from16 v6, v21
 
-    goto :goto_14
+    goto :goto_13
 
     :cond_1f
     new-instance v0, Lcom/facebook/soloader/g$a;
@@ -758,11 +742,9 @@
     :cond_21
     const-wide/16 v19, 0x4
 
-    move/from16 v8, v29
+    move/from16 v8, v27
 
-    move-wide/from16 v9, v30
-
-    goto/16 :goto_a
+    goto/16 :goto_9
 
     :cond_22
     new-instance v0, Lcom/facebook/soloader/g$a;
@@ -781,6 +763,8 @@
     invoke-direct {v0, v1}, Lcom/facebook/soloader/g$a;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static b(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
diff --git a/com.discord/smali/com/facebook/soloader/h.smali b/com.discord/smali/com/facebook/soloader/h.smali
index a6d8e6079f..09231790be 100644
--- a/com.discord/smali/com/facebook/soloader/h.smali
+++ b/com.discord/smali/com/facebook/soloader/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/facebook/soloader/h;
 .super Ljava/lang/Object;
+.source "SoFileLoader.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/com/facebook/soloader/i.smali b/com.discord/smali/com/facebook/soloader/i.smali
index 2747671ee3..2134c962f8 100644
--- a/com.discord/smali/com/facebook/soloader/i.smali
+++ b/com.discord/smali/com/facebook/soloader/i.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/soloader/i;
 .super Ljava/lang/Object;
+.source "SoSource.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/soloader/j$a.smali b/com.discord/smali/com/facebook/soloader/j$a.smali
index 7e04b7d9f8..36be483df1 100644
--- a/com.discord/smali/com/facebook/soloader/j$a.smali
+++ b/com.discord/smali/com/facebook/soloader/j$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/soloader/j$a;
 .super Ljava/lang/Object;
+.source "SysUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/soloader/j.smali b/com.discord/smali/com/facebook/soloader/j.smali
index 1e25943416..4344027c86 100644
--- a/com.discord/smali/com/facebook/soloader/j.smali
+++ b/com.discord/smali/com/facebook/soloader/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/j;
 .super Ljava/lang/Object;
+.source "SysUtil.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/soloader/k.smali b/com.discord/smali/com/facebook/soloader/k.smali
index c3a52458e2..6c42b77ffd 100644
--- a/com.discord/smali/com/facebook/soloader/k.smali
+++ b/com.discord/smali/com/facebook/soloader/k.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/facebook/soloader/k;
 .super Ljava/lang/Object;
+.source "SystemLoadLibraryWrapper.java"
diff --git a/com.discord/smali/com/facebook/soloader/l$1.smali b/com.discord/smali/com/facebook/soloader/l$1.smali
index b9afe21218..f194395827 100644
--- a/com.discord/smali/com/facebook/soloader/l$1.smali
+++ b/com.discord/smali/com/facebook/soloader/l$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/facebook/soloader/l$1;
 .super Ljava/lang/Object;
+.source "UnpackingSoSource.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali/com/facebook/soloader/l$a.smali b/com.discord/smali/com/facebook/soloader/l$a.smali
index bdac61bd92..61c61a86c4 100644
--- a/com.discord/smali/com/facebook/soloader/l$a.smali
+++ b/com.discord/smali/com/facebook/soloader/l$a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/soloader/l$a;
 .super Ljava/lang/Object;
+.source "UnpackingSoSource.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/facebook/soloader/l$b.smali b/com.discord/smali/com/facebook/soloader/l$b.smali
index e42c476e0a..a28f767388 100644
--- a/com.discord/smali/com/facebook/soloader/l$b.smali
+++ b/com.discord/smali/com/facebook/soloader/l$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/l$b;
 .super Ljava/lang/Object;
+.source "UnpackingSoSource.java"
 
 
 # annotations
@@ -99,12 +100,14 @@
     invoke-direct {p0, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 
 # virtual methods
 .method public final a(Ljava/io/DataOutput;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -126,11 +129,9 @@
     :goto_0
     iget-object v1, p0, Lcom/facebook/soloader/l$b;->WA:[Lcom/facebook/soloader/l$a;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
-
-    iget-object v1, p0, Lcom/facebook/soloader/l$b;->WA:[Lcom/facebook/soloader/l$a;
+    if-ge v0, v2, :cond_0
 
     aget-object v1, v1, v0
 
diff --git a/com.discord/smali/com/facebook/soloader/l$c.smali b/com.discord/smali/com/facebook/soloader/l$c.smali
index e4f1442743..d62a5c6dd1 100644
--- a/com.discord/smali/com/facebook/soloader/l$c.smali
+++ b/com.discord/smali/com/facebook/soloader/l$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/soloader/l$c;
 .super Ljava/lang/Object;
+.source "UnpackingSoSource.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/com/facebook/soloader/l$d.smali b/com.discord/smali/com/facebook/soloader/l$d.smali
index 3582de1c4c..cbe092680c 100644
--- a/com.discord/smali/com/facebook/soloader/l$d.smali
+++ b/com.discord/smali/com/facebook/soloader/l$d.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/soloader/l$d;
 .super Ljava/lang/Object;
+.source "UnpackingSoSource.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -41,7 +42,7 @@
 .method public abstract hasNext()Z
 .end method
 
-.method public abstract jU()Lcom/facebook/soloader/l$c;
+.method public abstract jT()Lcom/facebook/soloader/l$c;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/com/facebook/soloader/l$e.smali b/com.discord/smali/com/facebook/soloader/l$e.smali
index 97592e0966..c3d99703cd 100644
--- a/com.discord/smali/com/facebook/soloader/l$e.smali
+++ b/com.discord/smali/com/facebook/soloader/l$e.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/soloader/l$e;
 .super Ljava/lang/Object;
+.source "UnpackingSoSource.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -38,7 +39,7 @@
     return-void
 .end method
 
-.method protected abstract jS()Lcom/facebook/soloader/l$b;
+.method protected abstract jR()Lcom/facebook/soloader/l$b;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -46,7 +47,7 @@
     .end annotation
 .end method
 
-.method protected abstract jT()Lcom/facebook/soloader/l$d;
+.method protected abstract jS()Lcom/facebook/soloader/l$d;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/com/facebook/soloader/l.smali b/com.discord/smali/com/facebook/soloader/l.smali
index 7ecd5c5555..55010fa8e0 100644
--- a/com.discord/smali/com/facebook/soloader/l.smali
+++ b/com.discord/smali/com/facebook/soloader/l.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/facebook/soloader/l;
 .super Lcom/facebook/soloader/c;
+.source "UnpackingSoSource.java"
 
 
 # annotations
@@ -189,11 +190,18 @@
 
     invoke-direct {v0, v6}, Lcom/facebook/soloader/l$b;-><init>([Lcom/facebook/soloader/l$a;)V
 
+    move-object/from16 v6, p2
+
+    move-object v7, v0
+
+    goto :goto_1
+
     :cond_1
     move-object/from16 v6, p2
 
     move-object v7, v0
 
+    :goto_1
     iget-object v0, v6, Lcom/facebook/soloader/l$b;->WA:[Lcom/facebook/soloader/l$a;
 
     invoke-direct {p0, v0}, Lcom/facebook/soloader/l;->a([Lcom/facebook/soloader/l$a;)V
@@ -202,14 +210,14 @@
 
     new-array v6, v0, [B
 
-    :goto_1
+    :goto_2
     invoke-virtual/range {p3 .. p3}, Lcom/facebook/soloader/l$d;->hasNext()Z
 
     move-result v0
 
     if-eqz v0, :cond_9
 
-    invoke-virtual/range {p3 .. p3}, Lcom/facebook/soloader/l$d;->jU()Lcom/facebook/soloader/l$c;
+    invoke-virtual/range {p3 .. p3}, Lcom/facebook/soloader/l$d;->jT()Lcom/facebook/soloader/l$c;
 
     move-result-object v8
     :try_end_1
@@ -220,7 +228,7 @@
 
     const/4 v9, 0x0
 
-    :goto_2
+    :goto_3
     if-eqz v0, :cond_3
 
     :try_start_2
@@ -267,7 +275,7 @@
     :cond_2
     add-int/lit8 v9, v9, 0x1
 
-    goto :goto_2
+    goto :goto_3
 
     :catchall_1
     move-exception v0
@@ -338,7 +346,6 @@
     .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_2
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    :goto_3
     move-object v10, v0
 
     goto :goto_4
@@ -378,7 +385,7 @@
     .catch Ljava/lang/Throwable; {:try_start_4 .. :try_end_4} :catch_2
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
-    goto :goto_3
+    move-object v10, v0
 
     :goto_4
     :try_start_5
@@ -533,7 +540,7 @@
     .catch Ljava/lang/Throwable; {:try_start_c .. :try_end_c} :catch_0
     .catchall {:try_start_c .. :try_end_c} :catchall_0
 
-    goto/16 :goto_1
+    goto/16 :goto_2
 
     :cond_9
     invoke-virtual {v2}, Ljava/io/RandomAccessFile;->close()V
@@ -586,6 +593,8 @@
     :catch_6
     :goto_c
     throw v0
+
+    return-void
 .end method
 
 .method static a(Ljava/io/File;B)V
@@ -801,6 +810,8 @@
     invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private a(Lcom/facebook/soloader/f;I[B)Z
@@ -864,6 +875,8 @@
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    const/4 v3, 0x0
+
     goto :goto_2
 
     :catchall_0
@@ -899,10 +912,10 @@
     throw p1
 
     :catch_2
-    :goto_2
     const/4 v3, 0x0
 
     :cond_1
+    :goto_2
     invoke-virtual {v0}, Ljava/io/RandomAccessFile;->close()V
 
     new-instance v4, Ljava/io/File;
@@ -983,7 +996,7 @@
 
     invoke-static {v5, v2}, Lcom/facebook/soloader/l;->a(Ljava/io/File;B)V
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/l;->jO()Lcom/facebook/soloader/l$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/l;->jN()Lcom/facebook/soloader/l$e;
 
     move-result-object v6
     :try_end_3
@@ -991,11 +1004,11 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_5
 
     :try_start_4
-    invoke-virtual {v6}, Lcom/facebook/soloader/l$e;->jS()Lcom/facebook/soloader/l$b;
+    invoke-virtual {v6}, Lcom/facebook/soloader/l$e;->jR()Lcom/facebook/soloader/l$b;
 
     move-result-object v8
 
-    invoke-virtual {v6}, Lcom/facebook/soloader/l$e;->jT()Lcom/facebook/soloader/l$d;
+    invoke-virtual {v6}, Lcom/facebook/soloader/l$e;->jS()Lcom/facebook/soloader/l$d;
 
     move-result-object v9
     :try_end_4
@@ -1355,7 +1368,7 @@
 
     invoke-static {v1, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/l;->jP()[B
+    invoke-virtual {p0}, Lcom/facebook/soloader/l;->jO()[B
 
     move-result-object v1
 
@@ -1549,7 +1562,7 @@
     throw p1
 .end method
 
-.method protected abstract jO()Lcom/facebook/soloader/l$e;
+.method protected abstract jN()Lcom/facebook/soloader/l$e;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -1557,7 +1570,7 @@
     .end annotation
 .end method
 
-.method protected jP()[B
+.method protected jO()[B
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1569,14 +1582,14 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/l;->jO()Lcom/facebook/soloader/l$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/l;->jN()Lcom/facebook/soloader/l$e;
 
     move-result-object v1
 
     const/4 v2, 0x0
 
     :try_start_0
-    invoke-virtual {v1}, Lcom/facebook/soloader/l$e;->jS()Lcom/facebook/soloader/l$b;
+    invoke-virtual {v1}, Lcom/facebook/soloader/l$e;->jR()Lcom/facebook/soloader/l$b;
 
     move-result-object v3
 
@@ -1658,4 +1671,6 @@
     :catch_1
     :goto_2
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/facebook/webpsupport/R.smali b/com.discord/smali/com/facebook/webpsupport/R.smali
index 600ef26003..cc37788a33 100644
--- a/com.discord/smali/com/facebook/webpsupport/R.smali
+++ b/com.discord/smali/com/facebook/webpsupport/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/facebook/webpsupport/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali b/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali
index 09712b2cc8..c766b7425c 100644
--- a/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali
+++ b/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali
@@ -1,5 +1,6 @@
 .class public Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;
 .super Ljava/lang/Object;
+.source "WebpBitmapFactoryImpl.java"
 
 # interfaces
 .implements Lcom/facebook/common/k/b;
@@ -52,7 +53,7 @@
 .method private static a(Landroid/graphics/Bitmap;Landroid/graphics/BitmapFactory$Options;)V
     .locals 3
 
-    if-eqz p0, :cond_4
+    if-eqz p0, :cond_6
 
     if-nez p1, :cond_0
 
@@ -61,15 +62,15 @@
     :cond_0
     iget v0, p1, Landroid/graphics/BitmapFactory$Options;->inDensity:I
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     invoke-virtual {p0, v0}, Landroid/graphics/Bitmap;->setDensity(I)V
 
     iget v1, p1, Landroid/graphics/BitmapFactory$Options;->inTargetDensity:I
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
-    if-eq v0, v1, :cond_2
+    if-eq v0, v1, :cond_3
 
     iget v2, p1, Landroid/graphics/BitmapFactory$Options;->inScreenDensity:I
 
@@ -85,23 +86,29 @@
     invoke-virtual {p0, v1}, Landroid/graphics/Bitmap;->setDensity(I)V
 
     :cond_2
-    :goto_0
     return-void
 
     :cond_3
+    :goto_0
+    return-void
+
+    :cond_4
     sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->WD:Z
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     iget-object p1, p1, Landroid/graphics/BitmapFactory$Options;->inBitmap:Landroid/graphics/Bitmap;
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_5
 
     const/16 p1, 0xa0
 
     invoke-virtual {p0, p1}, Landroid/graphics/Bitmap;->setDensity(I)V
 
-    :cond_4
+    :cond_5
+    return-void
+
+    :cond_6
     :goto_1
     return-void
 .end method
@@ -296,7 +303,7 @@
     .annotation build Lcom/facebook/common/d/d;
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eJ()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eI()V
 
     sget-boolean v0, Lcom/facebook/common/k/c;->DK:Z
 
@@ -372,7 +379,7 @@
     :try_start_1
     invoke-static {v1, v0, p1}, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->hookDecodeStream(Ljava/io/InputStream;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
-    move-result-object p0
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -380,7 +387,7 @@
     :try_start_2
     invoke-virtual {v1}, Ljava/io/InputStream;->close()V
     :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_3
+    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_2
 
     goto :goto_2
 
@@ -430,11 +437,8 @@
     .catch Ljava/lang/Exception; {:try_start_5 .. :try_end_5} :catch_2
 
     :catch_2
-    move-object p0, v0
-
-    :catch_3
     :goto_2
-    return-object p0
+    return-object v0
 .end method
 
 .method public static hookDecodeFileDescriptor(Ljava/io/FileDescriptor;)Landroid/graphics/Bitmap;
@@ -456,7 +460,7 @@
     .annotation build Lcom/facebook/common/d/d;
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eJ()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eI()V
 
     const/4 v0, 0x0
 
@@ -596,7 +600,7 @@
     :try_start_1
     invoke-static {p0, v0, p1, v1, p2}, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->hookDecodeResourceStream(Landroid/content/res/Resources;Landroid/util/TypedValue;Ljava/io/InputStream;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
-    move-result-object p0
+    move-result-object v1
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -606,7 +610,7 @@
     :try_start_2
     invoke-virtual {p1}, Ljava/io/InputStream;->close()V
     :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_3
+    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_2
 
     goto :goto_2
 
@@ -659,22 +663,19 @@
     .catch Ljava/lang/Exception; {:try_start_5 .. :try_end_5} :catch_2
 
     :catch_2
-    move-object p0, v1
-
-    :catch_3
     :cond_2
     :goto_2
-    sget-boolean p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->WD:Z
+    sget-boolean p0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->WD:Z
 
-    if-eqz p1, :cond_4
+    if-eqz p0, :cond_4
 
-    if-nez p0, :cond_4
+    if-nez v1, :cond_4
 
     if-eqz p2, :cond_4
 
-    iget-object p1, p2, Landroid/graphics/BitmapFactory$Options;->inBitmap:Landroid/graphics/Bitmap;
+    iget-object p0, p2, Landroid/graphics/BitmapFactory$Options;->inBitmap:Landroid/graphics/Bitmap;
 
-    if-nez p1, :cond_3
+    if-nez p0, :cond_3
 
     goto :goto_3
 
@@ -689,7 +690,7 @@
 
     :cond_4
     :goto_3
-    return-object p0
+    return-object v1
 .end method
 
 .method public static hookDecodeResourceStream(Landroid/content/res/Resources;Landroid/util/TypedValue;Ljava/io/InputStream;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
@@ -716,20 +717,19 @@
 
     const/16 p1, 0xa0
 
-    :goto_0
     iput p1, p4, Landroid/graphics/BitmapFactory$Options;->inDensity:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const v0, 0xffff
 
     if-eq p1, v0, :cond_2
 
-    goto :goto_0
+    iput p1, p4, Landroid/graphics/BitmapFactory$Options;->inDensity:I
 
     :cond_2
-    :goto_1
+    :goto_0
     iget p1, p4, Landroid/graphics/BitmapFactory$Options;->inTargetDensity:I
 
     if-nez p1, :cond_3
@@ -771,7 +771,7 @@
     .annotation build Lcom/facebook/common/d/d;
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eJ()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->eI()V
 
     invoke-static {p0}, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->q(Ljava/io/InputStream;)Ljava/io/InputStream;
 
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/BuildConfig.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/BuildConfig.smali
index 58eb87fa3c..c808788fdf 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/BuildConfig.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/franmontiel/persistentcookiejar/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali
index fef8470cd8..757a907a6b 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/franmontiel/persistentcookiejar/ClearableCookieJar;
 .super Ljava/lang/Object;
+.source "ClearableCookieJar.java"
 
 # interfaces
 .implements Lokhttp3/m;
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
index 75c7817611..2a4fb7d5c1 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
@@ -1,5 +1,6 @@
 .class public Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;
 .super Ljava/lang/Object;
+.source "PersistentCookieJar.java"
 
 # interfaces
 .implements Lcom/franmontiel/persistentcookiejar/ClearableCookieJar;
@@ -23,7 +24,7 @@
 
     iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->WH:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->jY()Ljava/util/List;
+    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->jX()Ljava/util/List;
 
     move-result-object p2
 
@@ -78,7 +79,7 @@
 
     check-cast v3, Lokhttp3/l;
 
-    iget-wide v4, v3, Lokhttp3/l;->bYA:J
+    iget-wide v4, v3, Lokhttp3/l;->bXU:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -109,13 +110,13 @@
     goto :goto_0
 
     :cond_2
-    iget-boolean v4, v3, Lokhttp3/l;->bYF:Z
+    iget-boolean v4, v3, Lokhttp3/l;->bXZ:Z
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -124,9 +125,9 @@
     goto :goto_2
 
     :cond_3
-    iget-object v4, p1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-static {v4, v5}, Lokhttp3/l;->domainMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -149,11 +150,11 @@
     goto :goto_3
 
     :cond_5
-    iget-boolean v4, v3, Lokhttp3/l;->bYC:Z
+    iget-boolean v4, v3, Lokhttp3/l;->bXW:Z
 
     if-eqz v4, :cond_6
 
-    invoke-virtual {p1}, Lokhttp3/s;->Hl()Z
+    invoke-virtual {p1}, Lokhttp3/s;->Hk()Z
 
     move-result v4
 
@@ -188,6 +189,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized n(Ljava/util/List;)V
@@ -232,7 +235,7 @@
 
     check-cast v2, Lokhttp3/l;
 
-    iget-boolean v3, v2, Lokhttp3/l;->bYE:Z
+    iget-boolean v3, v2, Lokhttp3/l;->bXY:Z
 
     if-eqz v3, :cond_0
 
@@ -255,4 +258,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/R$string.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/R$string.smali
index 190632570e..60894268aa 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/R$string.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/R$string.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/franmontiel/persistentcookiejar/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/R.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/R.smali
index 5687f9ed23..3f339dc5a0 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/R.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/franmontiel/persistentcookiejar/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/CookieCache.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/CookieCache.smali
index ce3082216d..f41e69ebf0 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/CookieCache.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/CookieCache.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 .super Ljava/lang/Object;
+.source "CookieCache.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
index 8d8cae4dd8..dc5f304df0 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
@@ -1,5 +1,6 @@
 .class Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;
 .super Ljava/lang/Object;
+.source "IdentifiableCookie.java"
 
 
 # instance fields
@@ -100,11 +101,11 @@
 
     iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-object v2, v2, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -128,21 +129,21 @@
 
     iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bYC:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bXW:Z
 
     iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v2, v2, Lokhttp3/l;->bYC:Z
+    iget-boolean v2, v2, Lokhttp3/l;->bXW:Z
 
     if-ne v0, v2, :cond_1
 
     iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean p1, p1, Lokhttp3/l;->bYF:Z
+    iget-boolean p1, p1, Lokhttp3/l;->bXZ:Z
 
     iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bYF:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bXZ:Z
 
     if-ne p1, v0, :cond_1
 
@@ -171,7 +172,7 @@
 
     iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-object v1, v1, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -195,7 +196,7 @@
 
     iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->bYC:Z
+    iget-boolean v1, v1, Lokhttp3/l;->bXW:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -205,7 +206,7 @@
 
     iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->bYF:Z
+    iget-boolean v1, v1, Lokhttp3/l;->bXZ:Z
 
     xor-int/lit8 v1, v1, 0x1
 
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali
index 9638b534f2..3041b9335a 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali
@@ -1,5 +1,6 @@
 .class Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;
 .super Ljava/lang/Object;
+.source "SetCookieCache.java"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
index 99888b88c7..da726c0a3f 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
@@ -1,5 +1,6 @@
 .class public Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
 .super Ljava/lang/Object;
+.source "SetCookieCache.java"
 
 # interfaces
 .implements Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
index ab8f247a0d..898eb48b2f 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 .super Ljava/lang/Object;
+.source "CookiePersistor.java"
 
 
 # virtual methods
@@ -25,7 +26,7 @@
     .end annotation
 .end method
 
-.method public abstract jY()Ljava/util/List;
+.method public abstract jX()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
index cdc35b7a9d..6707a9c2a4 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
@@ -1,5 +1,6 @@
 .class public Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;
 .super Ljava/lang/Object;
+.source "SerializableCookie.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -105,7 +106,7 @@
 
     check-cast p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;
 
-    iget-object p0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ: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
@@ -116,18 +117,18 @@
     :try_end_2
     .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_0
-    move-exception v0
+    move-exception p0
 
     sget-object v1, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->TAG:Ljava/lang/String;
 
     const-string v2, "Stream not closed in decodeCookie"
 
-    invoke-static {v1, v2, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v1, v2, p0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_1
     move-exception p0
@@ -144,7 +145,7 @@
 
     move-object v1, v0
 
-    goto :goto_5
+    goto :goto_4
 
     :catch_3
     move-exception p0
@@ -166,7 +167,7 @@
     :try_start_4
     invoke-virtual {v1}, Ljava/io/ObjectInputStream;->close()V
     :try_end_4
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_5
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
 
     goto :goto_3
 
@@ -190,40 +191,26 @@
     :try_start_6
     invoke-virtual {v1}, Ljava/io/ObjectInputStream;->close()V
     :try_end_6
-    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_5
-
-    goto :goto_3
-
-    :catch_5
-    move-exception p0
-
-    sget-object v1, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->TAG:Ljava/lang/String;
-
-    const-string v2, "Stream not closed in decodeCookie"
-
-    invoke-static {v1, v2, p0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_0
 
     :cond_1
     :goto_3
-    move-object p0, v0
-
-    :goto_4
-    return-object p0
+    return-object v0
 
     :catchall_1
     move-exception p0
 
-    :goto_5
+    :goto_4
     if-eqz v1, :cond_2
 
     :try_start_7
     invoke-virtual {v1}, Ljava/io/ObjectInputStream;->close()V
     :try_end_7
-    .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_6
+    .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_5
 
-    goto :goto_6
+    goto :goto_5
 
-    :catch_6
+    :catch_5
     move-exception v0
 
     sget-object v1, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->TAG:Ljava/lang/String;
@@ -233,8 +220,10 @@
     invoke-static {v1, v2, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_2
-    :goto_6
+    :goto_5
     throw p0
+
+    return-void
 .end method
 
 .method private static h([B)Ljava/lang/String;
@@ -369,9 +358,9 @@
     move-wide v1, v3
 
     :cond_1
-    iput-wide v1, v0, Lokhttp3/l$a;->bYA:J
+    iput-wide v1, v0, Lokhttp3/l$a;->bXU:J
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->bYE:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bXY:Z
 
     :cond_2
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
@@ -406,7 +395,7 @@
 
     if-eqz v2, :cond_3
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->bYC:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bXW:Z
 
     :cond_3
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readBoolean()Z
@@ -415,7 +404,7 @@
 
     if-eqz v2, :cond_4
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->bYD:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bXX:Z
 
     :cond_4
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readBoolean()Z
@@ -503,13 +492,13 @@
 
     iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bYE:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bXY:Z
 
     if-eqz v0, :cond_0
 
     iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ:Lokhttp3/l;
 
-    iget-wide v0, v0, Lokhttp3/l;->bYA:J
+    iget-wide v0, v0, Lokhttp3/l;->bXU:J
 
     goto :goto_0
 
@@ -521,7 +510,7 @@
 
     iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
@@ -533,19 +522,19 @@
 
     iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bYC:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bXW:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
     iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bYD:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bXX:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
     iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->WJ:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bYF:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bXZ:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
index bc7729b1c1..2a5458d588 100644
--- a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
+++ b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
@@ -1,5 +1,6 @@
 .class public Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;
 .super Ljava/lang/Object;
+.source "SharedPrefsCookiePersistor.java"
 
 # interfaces
 .implements Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
@@ -51,7 +52,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-boolean v1, p0, Lokhttp3/l;->bYC:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXW:Z
 
     if-eqz v1, :cond_0
 
@@ -69,7 +70,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -198,7 +199,7 @@
     return-void
 .end method
 
-.method public final jY()Ljava/util/List;
+.method public final jX()Ljava/util/List;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/a/a/a/a.smali b/com.discord/smali/com/google/a/a/a/a.smali
index be6e04a008..291db075aa 100644
--- a/com.discord/smali/com/google/a/a/a/a.smali
+++ b/com.discord/smali/com/google/a/a/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/a/a/a/a;
 .super Ljava/lang/Object;
+.source "ListenableFuture.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Future;
diff --git a/com.discord/smali/com/google/android/cameraview/AspectRatio$1.smali b/com.discord/smali/com/google/android/cameraview/AspectRatio$1.smali
index 8f216c577e..e09dd67453 100644
--- a/com.discord/smali/com/google/android/cameraview/AspectRatio$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/AspectRatio$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/cameraview/AspectRatio$1;
 .super Ljava/lang/Object;
+.source "AspectRatio.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/com/google/android/cameraview/AspectRatio.smali b/com.discord/smali/com/google/android/cameraview/AspectRatio.smali
index fca1095654..e7880e1a83 100644
--- a/com.discord/smali/com/google/android/cameraview/AspectRatio.smali
+++ b/com.discord/smali/com/google/android/cameraview/AspectRatio.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/cameraview/AspectRatio;
 .super Ljava/lang/Object;
+.source "AspectRatio.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -83,17 +84,23 @@
 .method private static gcd(II)I
     .locals 1
 
-    :goto_0
     move v0, p1
 
     move p1, p0
 
     move p0, v0
 
+    :goto_0
     if-eqz p0, :cond_0
 
     rem-int/2addr p1, p0
 
+    move v0, p1
+
+    move p1, p0
+
+    move p0, v0
+
     goto :goto_0
 
     :cond_0
@@ -192,11 +199,11 @@
 
     invoke-static {v1, v0}, Lcom/google/android/cameraview/AspectRatio;->of(II)Lcom/google/android/cameraview/AspectRatio;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
     move-exception v0
@@ -324,7 +331,7 @@
     :cond_1
     instance-of v2, p1, Lcom/google/android/cameraview/AspectRatio;
 
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_3
 
     check-cast p1, Lcom/google/android/cameraview/AspectRatio;
 
@@ -344,6 +351,9 @@
 
     :cond_2
     return v0
+
+    :cond_3
+    return v0
 .end method
 
 .method public getX()I
@@ -369,11 +379,9 @@
 
     iget v1, p0, Lcom/google/android/cameraview/AspectRatio;->mX:I
 
-    shl-int/lit8 v1, v1, 0x10
+    shl-int/lit8 v2, v1, 0x10
 
-    iget v2, p0, Lcom/google/android/cameraview/AspectRatio;->mX:I
-
-    ushr-int/lit8 v2, v2, 0x10
+    ushr-int/lit8 v1, v1, 0x10
 
     or-int/2addr v1, v2
 
diff --git a/com.discord/smali/com/google/android/cameraview/BuildConfig.smali b/com.discord/smali/com/google/android/cameraview/BuildConfig.smali
index 1ca20c6ee4..26310c0bd5 100644
--- a/com.discord/smali/com/google/android/cameraview/BuildConfig.smali
+++ b/com.discord/smali/com/google/android/cameraview/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/cameraview/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/google/android/cameraview/Camera1$1.smali b/com.discord/smali/com/google/android/cameraview/Camera1$1.smali
index 08e42c07b1..8ccaf0875a 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera1$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera1$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera1$1;
 .super Ljava/lang/Object;
+.source "Camera1.java"
 
 # interfaces
 .implements Lcom/google/android/cameraview/PreviewImpl$Callback;
diff --git a/com.discord/smali/com/google/android/cameraview/Camera1$2.smali b/com.discord/smali/com/google/android/cameraview/Camera1$2.smali
index a914612078..7d79afa2b4 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera1$2.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera1$2.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera1$2;
 .super Ljava/lang/Object;
+.source "Camera1.java"
 
 # interfaces
 .implements Landroid/hardware/Camera$AutoFocusCallback;
diff --git a/com.discord/smali/com/google/android/cameraview/Camera1$3.smali b/com.discord/smali/com/google/android/cameraview/Camera1$3.smali
index aa4551b80a..ec302f6825 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera1$3.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera1$3.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera1$3;
 .super Ljava/lang/Object;
+.source "Camera1.java"
 
 # interfaces
 .implements Landroid/hardware/Camera$PictureCallback;
diff --git a/com.discord/smali/com/google/android/cameraview/Camera1.smali b/com.discord/smali/com/google/android/cameraview/Camera1.smali
index 3aad8c1a9e..faa764375e 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera1.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera1.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera1;
 .super Lcom/google/android/cameraview/CameraViewImpl;
+.source "Camera1.java"
 
 
 # static fields
@@ -218,6 +219,8 @@
 
     if-eqz v2, :cond_0
 
+    return-object v1
+
     :cond_1
     return-object v1
 .end method
@@ -310,8 +313,6 @@
 
     if-eq v2, v3, :cond_1
 
-    iget v2, p0, Lcom/google/android/cameraview/Camera1;->mDisplayOrientation:I
-
     const/16 v3, 0x10e
 
     if-ne v2, v3, :cond_2
@@ -355,6 +356,8 @@
 
     if-gt v1, v3, :cond_3
 
+    return-object v2
+
     :cond_4
     return-object v2
 .end method
@@ -504,8 +507,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/cameraview/Camera1;->mCamera:Landroid/hardware/Camera;
-
     invoke-virtual {v0}, Landroid/hardware/Camera;->release()V
 
     const/4 v0, 0x0
@@ -553,10 +554,9 @@
 
     const-string v0, "continuous-picture"
 
-    :goto_0
     invoke-virtual {p1, v0}, Landroid/hardware/Camera$Parameters;->setFocusMode(Ljava/lang/String;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string p1, "fixed"
@@ -571,6 +571,8 @@
 
     const-string v0, "fixed"
 
+    invoke-virtual {p1, v0}, Landroid/hardware/Camera$Parameters;->setFocusMode(Ljava/lang/String;)V
+
     goto :goto_0
 
     :cond_1
@@ -586,6 +588,8 @@
 
     const-string v0, "infinity"
 
+    invoke-virtual {p1, v0}, Landroid/hardware/Camera$Parameters;->setFocusMode(Ljava/lang/String;)V
+
     goto :goto_0
 
     :cond_2
@@ -597,9 +601,9 @@
 
     check-cast v0, Ljava/lang/String;
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Landroid/hardware/Camera$Parameters;->setFocusMode(Ljava/lang/String;)V
 
-    :goto_1
+    :goto_0
     const/4 p1, 0x1
 
     return p1
@@ -1317,8 +1321,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/cameraview/Camera1;->mCamera:Landroid/hardware/Camera;
-
     invoke-virtual {v0}, Landroid/hardware/Camera;->stopPreview()V
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2$1.smali b/com.discord/smali/com/google/android/cameraview/Camera2$1.smali
index d1e4a7982f..65f0272b67 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2$1;
 .super Landroid/hardware/camera2/CameraDevice$StateCallback;
+.source "Camera2.java"
 
 
 # annotations
@@ -119,9 +120,7 @@
 
     iput-object p1, v0, Lcom/google/android/cameraview/Camera2;->mCamera:Landroid/hardware/camera2/CameraDevice;
 
-    iget-object p1, p0, Lcom/google/android/cameraview/Camera2$1;->this$0:Lcom/google/android/cameraview/Camera2;
-
-    iget-object p1, p1, Lcom/google/android/cameraview/Camera2;->mCallback:Lcom/google/android/cameraview/CameraViewImpl$Callback;
+    iget-object p1, v0, Lcom/google/android/cameraview/Camera2;->mCallback:Lcom/google/android/cameraview/CameraViewImpl$Callback;
 
     invoke-interface {p1}, Lcom/google/android/cameraview/CameraViewImpl$Callback;->onCameraOpened()V
 
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2$2.smali b/com.discord/smali/com/google/android/cameraview/Camera2$2.smali
index 48603f71a5..01a3171e9e 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2$2.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2$2.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2$2;
 .super Landroid/hardware/camera2/CameraCaptureSession$StateCallback;
+.source "Camera2.java"
 
 
 # annotations
@@ -99,9 +100,7 @@
 
     iput-object p1, v0, Lcom/google/android/cameraview/Camera2;->mCaptureSession:Landroid/hardware/camera2/CameraCaptureSession;
 
-    iget-object p1, p0, Lcom/google/android/cameraview/Camera2$2;->this$0:Lcom/google/android/cameraview/Camera2;
-
-    invoke-virtual {p1}, Lcom/google/android/cameraview/Camera2;->updateAutoFocus()V
+    invoke-virtual {v0}, Lcom/google/android/cameraview/Camera2;->updateAutoFocus()V
 
     iget-object p1, p0, Lcom/google/android/cameraview/Camera2$2;->this$0:Lcom/google/android/cameraview/Camera2;
 
@@ -140,7 +139,6 @@
 
     const-string v1, "Failed to start camera preview."
 
-    :goto_0
     invoke-static {v0, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     return-void
@@ -152,5 +150,7 @@
 
     const-string v1, "Failed to start camera preview because it couldn\'t access camera"
 
-    goto :goto_0
+    invoke-static {v0, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2$3.smali b/com.discord/smali/com/google/android/cameraview/Camera2$3.smali
index 67c636dc27..8506c56918 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2$3.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2$3.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2$3;
 .super Lcom/google/android/cameraview/Camera2$PictureCaptureCallback;
+.source "Camera2.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2$4.smali b/com.discord/smali/com/google/android/cameraview/Camera2$4.smali
index 741e0065ab..449f617185 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2$4.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2$4.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2$4;
 .super Ljava/lang/Object;
+.source "Camera2.java"
 
 # interfaces
 .implements Landroid/media/ImageReader$OnImageAvailableListener;
@@ -81,6 +82,8 @@
 
     invoke-virtual {p1}, Landroid/media/Image;->close()V
 
+    return-void
+
     :cond_1
     return-void
 
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2$5.smali b/com.discord/smali/com/google/android/cameraview/Camera2$5.smali
index dc12ffcd24..89f68ec6b2 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2$5.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2$5.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2$5;
 .super Ljava/lang/Object;
+.source "Camera2.java"
 
 # interfaces
 .implements Lcom/google/android/cameraview/PreviewImpl$Callback;
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2$6.smali b/com.discord/smali/com/google/android/cameraview/Camera2$6.smali
index 996c7b8d90..28cfefa3ca 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2$6.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2$6.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2$6;
 .super Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
+.source "Camera2.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2$PictureCaptureCallback.smali b/com.discord/smali/com/google/android/cameraview/Camera2$PictureCaptureCallback.smali
index f161d490cf..42509000fb 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2$PictureCaptureCallback.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2$PictureCaptureCallback.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/cameraview/Camera2$PictureCaptureCallback;
 .super Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
+.source "Camera2.java"
 
 
 # annotations
@@ -176,10 +177,14 @@
 
     invoke-virtual {p0}, Lcom/google/android/cameraview/Camera2$PictureCaptureCallback;->onReady()V
 
+    return-void
+
     :cond_6
     :goto_1
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x3
         :pswitch_1
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2.smali b/com.discord/smali/com/google/android/cameraview/Camera2.smali
index 6a0b6d51a2..1b8c9d3103 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2;
 .super Lcom/google/android/cameraview/CameraViewImpl;
+.source "Camera2.java"
 
 
 # annotations
@@ -371,6 +372,8 @@
     invoke-direct {v1, v2, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method private chooseOptimalSize()Lcom/google/android/cameraview/Size;
@@ -620,6 +623,8 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private lockFocus()V
@@ -800,7 +805,7 @@
 
     packed-switch v2, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_0
     sget-object v2, Landroid/hardware/camera2/CaptureRequest;->CONTROL_AE_MODE:Landroid/hardware/camera2/CaptureRequest$Key;
@@ -809,10 +814,9 @@
 
     move-result-object v1
 
-    :goto_0
     invoke-virtual {v0, v2, v1}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_1
     sget-object v2, Landroid/hardware/camera2/CaptureRequest;->CONTROL_AE_MODE:Landroid/hardware/camera2/CaptureRequest$Key;
@@ -821,6 +825,8 @@
 
     move-result-object v1
 
+    invoke-virtual {v0, v2, v1}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :pswitch_2
@@ -838,6 +844,8 @@
 
     move-result-object v1
 
+    invoke-virtual {v0, v2, v1}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :pswitch_3
@@ -849,10 +857,9 @@
 
     move-result-object v2
 
-    :goto_1
     invoke-virtual {v0, v1, v2}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_4
     sget-object v1, Landroid/hardware/camera2/CaptureRequest;->CONTROL_AE_MODE:Landroid/hardware/camera2/CaptureRequest$Key;
@@ -871,9 +878,9 @@
 
     move-result-object v2
 
-    goto :goto_1
+    invoke-virtual {v0, v1, v2}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
 
-    :goto_2
+    :goto_0
     iget-object v1, p0, Lcom/google/android/cameraview/Camera2;->mCameraCharacteristics:Landroid/hardware/camera2/CameraCharacteristics;
 
     sget-object v2, Landroid/hardware/camera2/CameraCharacteristics;->SENSOR_ORIENTATION:Landroid/hardware/camera2/CameraCharacteristics$Key;
@@ -896,12 +903,12 @@
 
     if-ne v5, v3, :cond_0
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_0
     const/4 v3, -0x1
 
-    :goto_3
+    :goto_1
     mul-int v4, v4, v3
 
     add-int/2addr v1, v4
@@ -1106,8 +1113,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/cameraview/Camera2;->mCaptureSession:Landroid/hardware/camera2/CameraCaptureSession;
-
     invoke-virtual {p1}, Landroid/hardware/camera2/CameraCaptureSession;->close()V
 
     const/4 p1, 0x0
@@ -1166,8 +1171,6 @@
     if-eqz p1, :cond_1
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/cameraview/Camera2;->mCaptureSession:Landroid/hardware/camera2/CameraCaptureSession;
-
     iget-object v0, p0, Lcom/google/android/cameraview/Camera2;->mPreviewRequestBuilder:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     invoke-virtual {v0}, Landroid/hardware/camera2/CaptureRequest$Builder;->build()Landroid/hardware/camera2/CaptureRequest;
@@ -1245,8 +1248,6 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/cameraview/Camera2;->mFlash:I
-
     iput p1, p0, Lcom/google/android/cameraview/Camera2;->mFlash:I
 
     iget-object p1, p0, Lcom/google/android/cameraview/Camera2;->mPreviewRequestBuilder:Landroid/hardware/camera2/CaptureRequest$Builder;
@@ -1260,8 +1261,6 @@
     if-eqz p1, :cond_1
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/cameraview/Camera2;->mCaptureSession:Landroid/hardware/camera2/CameraCaptureSession;
-
     iget-object v1, p0, Lcom/google/android/cameraview/Camera2;->mPreviewRequestBuilder:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     invoke-virtual {v1}, Landroid/hardware/camera2/CaptureRequest$Builder;->build()Landroid/hardware/camera2/CaptureRequest;
@@ -1403,6 +1402,8 @@
 
     invoke-virtual {v1, v0, v2, v3}, Landroid/hardware/camera2/CameraDevice;->createCaptureSession(Ljava/util/List;Landroid/hardware/camera2/CameraCaptureSession$StateCallback;Landroid/os/Handler;)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -1417,8 +1418,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/cameraview/Camera2;->mCaptureSession:Landroid/hardware/camera2/CameraCaptureSession;
-
     invoke-virtual {v0}, Landroid/hardware/camera2/CameraCaptureSession;->close()V
 
     iput-object v1, p0, Lcom/google/android/cameraview/Camera2;->mCaptureSession:Landroid/hardware/camera2/CameraCaptureSession;
@@ -1428,8 +1427,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/cameraview/Camera2;->mCamera:Landroid/hardware/camera2/CameraDevice;
-
     invoke-virtual {v0}, Landroid/hardware/camera2/CameraDevice;->close()V
 
     iput-object v1, p0, Lcom/google/android/cameraview/Camera2;->mCamera:Landroid/hardware/camera2/CameraDevice;
@@ -1439,8 +1436,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/cameraview/Camera2;->mImageReader:Landroid/media/ImageReader;
-
     invoke-virtual {v0}, Landroid/media/ImageReader;->close()V
 
     iput-object v1, p0, Lcom/google/android/cameraview/Camera2;->mImageReader:Landroid/media/ImageReader;
@@ -1746,9 +1741,13 @@
 
     invoke-virtual {v0, v1, v2}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
 
+    return-void
+
     :goto_0
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
diff --git a/com.discord/smali/com/google/android/cameraview/Camera2Api23.smali b/com.discord/smali/com/google/android/cameraview/Camera2Api23.smali
index e89cf86cb4..f40ad0056a 100644
--- a/com.discord/smali/com/google/android/cameraview/Camera2Api23.smali
+++ b/com.discord/smali/com/google/android/cameraview/Camera2Api23.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/Camera2Api23;
 .super Lcom/google/android/cameraview/Camera2;
+.source "Camera2Api23.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView$1.smali b/com.discord/smali/com/google/android/cameraview/CameraView$1.smali
index 370f0998e5..f69d96af00 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/CameraView$1;
 .super Lcom/google/android/cameraview/DisplayOrientationDetector;
+.source "CameraView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView$Callback.smali b/com.discord/smali/com/google/android/cameraview/CameraView$Callback.smali
index 168169e7f2..c4e8e550ce 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView$Callback.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView$Callback.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/cameraview/CameraView$Callback;
 .super Ljava/lang/Object;
+.source "CameraView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView$CallbackBridge.smali b/com.discord/smali/com/google/android/cameraview/CameraView$CallbackBridge.smali
index 209d9784c3..74ea2c3165 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView$CallbackBridge.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView$CallbackBridge.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/CameraView$CallbackBridge;
 .super Ljava/lang/Object;
+.source "CameraView.java"
 
 # interfaces
 .implements Lcom/google/android/cameraview/CameraViewImpl$Callback;
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView$Facing.smali b/com.discord/smali/com/google/android/cameraview/CameraView$Facing.smali
index 264a752b0b..f4e1ffbe6c 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView$Facing.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView$Facing.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/cameraview/CameraView$Facing;
 .super Ljava/lang/Object;
+.source "CameraView.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView$Flash.smali b/com.discord/smali/com/google/android/cameraview/CameraView$Flash.smali
index 99de47fed7..0c70cc5cc8 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView$Flash.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView$Flash.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/cameraview/CameraView$Flash;
 .super Ljava/lang/Object;
+.source "CameraView.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView$SavedState$1.smali b/com.discord/smali/com/google/android/cameraview/CameraView$SavedState$1.smali
index 80ef2e37ca..1e24f93c55 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView$SavedState$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/cameraview/CameraView$SavedState$1;
 .super Ljava/lang/Object;
+.source "CameraView.java"
 
 # interfaces
 .implements Landroidx/core/os/ParcelableCompatCreatorCallbacks;
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView$SavedState.smali b/com.discord/smali/com/google/android/cameraview/CameraView$SavedState.smali
index 3a3244f129..9fd7e3c63a 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView$SavedState.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/cameraview/CameraView$SavedState;
 .super Landroid/view/View$BaseSavedState;
+.source "CameraView.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/CameraView.smali b/com.discord/smali/com/google/android/cameraview/CameraView.smali
index e4f821fe6c..3f2ba05bb8 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraView.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/cameraview/CameraView;
 .super Landroid/widget/FrameLayout;
+.source "CameraView.java"
 
 
 # annotations
@@ -111,10 +112,9 @@
 
     invoke-direct {v1, v2, v0}, Lcom/google/android/cameraview/Camera1;-><init>(Lcom/google/android/cameraview/CameraViewImpl$Callback;Lcom/google/android/cameraview/PreviewImpl;)V
 
-    :goto_0
     iput-object v1, p0, Lcom/google/android/cameraview/CameraView;->mImpl:Lcom/google/android/cameraview/CameraViewImpl;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -129,6 +129,8 @@
 
     invoke-direct {v1, v2, v0, p1}, Lcom/google/android/cameraview/Camera2;-><init>(Lcom/google/android/cameraview/CameraViewImpl$Callback;Lcom/google/android/cameraview/PreviewImpl;Landroid/content/Context;)V
 
+    iput-object v1, p0, Lcom/google/android/cameraview/CameraView;->mImpl:Lcom/google/android/cameraview/CameraViewImpl;
+
     goto :goto_0
 
     :cond_2
@@ -138,9 +140,9 @@
 
     invoke-direct {v1, v2, v0, p1}, Lcom/google/android/cameraview/Camera2Api23;-><init>(Lcom/google/android/cameraview/CameraViewImpl$Callback;Lcom/google/android/cameraview/PreviewImpl;Landroid/content/Context;)V
 
-    goto :goto_0
+    iput-object v1, p0, Lcom/google/android/cameraview/CameraView;->mImpl:Lcom/google/android/cameraview/CameraViewImpl;
 
-    :goto_1
+    :goto_0
     sget-object v0, Lcom/google/android/cameraview/R$styleable;->CameraView:[I
 
     sget v1, Lcom/google/android/cameraview/R$style;->Widget_CameraView:I
@@ -179,17 +181,16 @@
 
     move-result-object p3
 
-    :goto_2
     invoke-virtual {p0, p3}, Lcom/google/android/cameraview/CameraView;->setAspectRatio(Lcom/google/android/cameraview/AspectRatio;)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     sget-object p3, Lcom/google/android/cameraview/Constants;->DEFAULT_ASPECT_RATIO:Lcom/google/android/cameraview/AspectRatio;
 
-    goto :goto_2
+    invoke-virtual {p0, p3}, Lcom/google/android/cameraview/CameraView;->setAspectRatio(Lcom/google/android/cameraview/AspectRatio;)V
 
-    :goto_3
+    :goto_1
     sget p3, Lcom/google/android/cameraview/R$styleable;->CameraView_autoFocus:I
 
     const/4 v0, 0x1
@@ -415,7 +416,7 @@
 
     const/high16 v1, 0x40000000    # 2.0f
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     invoke-virtual {p0}, Lcom/google/android/cameraview/CameraView;->isCameraOpened()Z
 
@@ -479,6 +480,8 @@
 
     move-result p2
 
+    invoke-super {p0, p1, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V
+
     goto :goto_0
 
     :cond_3
@@ -519,10 +522,19 @@
 
     move-result p1
 
-    :cond_5
-    :goto_0
     invoke-super {p0, p1, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V
 
+    goto :goto_0
+
+    :cond_5
+    invoke-super {p0, p1, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V
+
+    goto :goto_0
+
+    :cond_6
+    invoke-super {p0, p1, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V
+
+    :goto_0
     invoke-virtual {p0}, Lcom/google/android/cameraview/CameraView;->getMeasuredWidth()I
 
     move-result p1
@@ -543,13 +555,13 @@
 
     rem-int/lit16 v2, v2, 0xb4
 
-    if-nez v2, :cond_6
+    if-nez v2, :cond_7
 
     invoke-virtual {v0}, Lcom/google/android/cameraview/AspectRatio;->inverse()Lcom/google/android/cameraview/AspectRatio;
 
     move-result-object v0
 
-    :cond_6
+    :cond_7
     invoke-virtual {v0}, Lcom/google/android/cameraview/AspectRatio;->getY()I
 
     move-result v2
@@ -562,7 +574,7 @@
 
     div-int/2addr v2, v3
 
-    if-ge p2, v2, :cond_7
+    if-ge p2, v2, :cond_8
 
     iget-object p2, p0, Lcom/google/android/cameraview/CameraView;->mImpl:Lcom/google/android/cameraview/CameraViewImpl;
 
@@ -594,7 +606,7 @@
 
     return-void
 
-    :cond_7
+    :cond_8
     iget-object p1, p0, Lcom/google/android/cameraview/CameraView;->mImpl:Lcom/google/android/cameraview/CameraViewImpl;
 
     invoke-virtual {p1}, Lcom/google/android/cameraview/CameraViewImpl;->getView()Landroid/view/View;
diff --git a/com.discord/smali/com/google/android/cameraview/CameraViewImpl$Callback.smali b/com.discord/smali/com/google/android/cameraview/CameraViewImpl$Callback.smali
index 9287820e21..2e422d5c72 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraViewImpl$Callback.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraViewImpl$Callback.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/cameraview/CameraViewImpl$Callback;
 .super Ljava/lang/Object;
+.source "CameraViewImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/CameraViewImpl.smali b/com.discord/smali/com/google/android/cameraview/CameraViewImpl.smali
index 3c50d2826a..e6bf4bd427 100644
--- a/com.discord/smali/com/google/android/cameraview/CameraViewImpl.smali
+++ b/com.discord/smali/com/google/android/cameraview/CameraViewImpl.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/cameraview/CameraViewImpl;
 .super Ljava/lang/Object;
+.source "CameraViewImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/Constants.smali b/com.discord/smali/com/google/android/cameraview/Constants.smali
index fdce7d7f7a..b3393f4b2a 100644
--- a/com.discord/smali/com/google/android/cameraview/Constants.smali
+++ b/com.discord/smali/com/google/android/cameraview/Constants.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/cameraview/Constants;
 .super Ljava/lang/Object;
+.source "Constants.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector$1.smali b/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector$1.smali
index 9083661de6..10579ac8f1 100644
--- a/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/DisplayOrientationDetector$1;
 .super Landroid/view/OrientationEventListener;
+.source "DisplayOrientationDetector.java"
 
 
 # annotations
@@ -41,7 +42,7 @@
 
     const/4 v0, -0x1
 
-    if-eq p1, v0, :cond_1
+    if-eq p1, v0, :cond_2
 
     iget-object p1, p0, Lcom/google/android/cameraview/DisplayOrientationDetector$1;->this$0:Lcom/google/android/cameraview/DisplayOrientationDetector;
 
@@ -77,6 +78,9 @@
     invoke-virtual {v0, p1}, Lcom/google/android/cameraview/DisplayOrientationDetector;->dispatchOnDisplayOrientationChanged(I)V
 
     :cond_1
+    return-void
+
+    :cond_2
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector.smali b/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector.smali
index d015a616bd..f72314440a 100644
--- a/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector.smali
+++ b/com.discord/smali/com/google/android/cameraview/DisplayOrientationDetector.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/cameraview/DisplayOrientationDetector;
 .super Ljava/lang/Object;
+.source "DisplayOrientationDetector.java"
 
 
 # static fields
diff --git a/com.discord/smali/com/google/android/cameraview/PreviewImpl$Callback.smali b/com.discord/smali/com/google/android/cameraview/PreviewImpl$Callback.smali
index a755e712aa..7d176cc417 100644
--- a/com.discord/smali/com/google/android/cameraview/PreviewImpl$Callback.smali
+++ b/com.discord/smali/com/google/android/cameraview/PreviewImpl$Callback.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/cameraview/PreviewImpl$Callback;
 .super Ljava/lang/Object;
+.source "PreviewImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/PreviewImpl.smali b/com.discord/smali/com/google/android/cameraview/PreviewImpl.smali
index f5b38bd3e1..bb2886f02e 100644
--- a/com.discord/smali/com/google/android/cameraview/PreviewImpl.smali
+++ b/com.discord/smali/com/google/android/cameraview/PreviewImpl.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/cameraview/PreviewImpl;
 .super Ljava/lang/Object;
+.source "PreviewImpl.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/R$attr.smali b/com.discord/smali/com/google/android/cameraview/R$attr.smali
index 45fd6834e1..83d039cfd5 100644
--- a/com.discord/smali/com/google/android/cameraview/R$attr.smali
+++ b/com.discord/smali/com/google/android/cameraview/R$attr.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/cameraview/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/R$id.smali b/com.discord/smali/com/google/android/cameraview/R$id.smali
index c491f7931b..20010e0ee9 100644
--- a/com.discord/smali/com/google/android/cameraview/R$id.smali
+++ b/com.discord/smali/com/google/android/cameraview/R$id.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/cameraview/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/R$layout.smali b/com.discord/smali/com/google/android/cameraview/R$layout.smali
index 7cba82ba87..62744e1f9d 100644
--- a/com.discord/smali/com/google/android/cameraview/R$layout.smali
+++ b/com.discord/smali/com/google/android/cameraview/R$layout.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/cameraview/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/R$style.smali b/com.discord/smali/com/google/android/cameraview/R$style.smali
index 788b8d5391..658038eb67 100644
--- a/com.discord/smali/com/google/android/cameraview/R$style.smali
+++ b/com.discord/smali/com/google/android/cameraview/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/cameraview/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/R$styleable.smali b/com.discord/smali/com/google/android/cameraview/R$styleable.smali
index 5644b0022b..178a4fb75a 100644
--- a/com.discord/smali/com/google/android/cameraview/R$styleable.smali
+++ b/com.discord/smali/com/google/android/cameraview/R$styleable.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/cameraview/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/R.smali b/com.discord/smali/com/google/android/cameraview/R.smali
index 1645b5cb9f..58eca7a2c2 100644
--- a/com.discord/smali/com/google/android/cameraview/R.smali
+++ b/com.discord/smali/com/google/android/cameraview/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/cameraview/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/cameraview/Size.smali b/com.discord/smali/com/google/android/cameraview/Size.smali
index d45fd8c429..89771f30f4 100644
--- a/com.discord/smali/com/google/android/cameraview/Size.smali
+++ b/com.discord/smali/com/google/android/cameraview/Size.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/cameraview/Size;
 .super Ljava/lang/Object;
+.source "Size.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
@@ -96,7 +97,7 @@
     :cond_1
     instance-of v2, p1, Lcom/google/android/cameraview/Size;
 
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_3
 
     check-cast p1, Lcom/google/android/cameraview/Size;
 
@@ -116,6 +117,9 @@
 
     :cond_2
     return v0
+
+    :cond_3
+    return v0
 .end method
 
 .method public getHeight()I
@@ -141,11 +145,9 @@
 
     iget v1, p0, Lcom/google/android/cameraview/Size;->mWidth:I
 
-    shl-int/lit8 v1, v1, 0x10
+    shl-int/lit8 v2, v1, 0x10
 
-    iget v2, p0, Lcom/google/android/cameraview/Size;->mWidth:I
-
-    ushr-int/lit8 v2, v2, 0x10
+    ushr-int/lit8 v1, v1, 0x10
 
     or-int/2addr v1, v2
 
diff --git a/com.discord/smali/com/google/android/cameraview/SizeMap.smali b/com.discord/smali/com/google/android/cameraview/SizeMap.smali
index 3f482a2757..f4183480f4 100644
--- a/com.discord/smali/com/google/android/cameraview/SizeMap.smali
+++ b/com.discord/smali/com/google/android/cameraview/SizeMap.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/SizeMap;
 .super Ljava/lang/Object;
+.source "SizeMap.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview$1.smali b/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview$1.smali
index ba2e39af13..23d04178cc 100644
--- a/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/SurfaceViewPreview$1;
 .super Ljava/lang/Object;
+.source "SurfaceViewPreview.java"
 
 # interfaces
 .implements Landroid/view/SurfaceHolder$Callback;
diff --git a/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview.smali b/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview.smali
index 35b3273672..894dca8194 100644
--- a/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview.smali
+++ b/com.discord/smali/com/google/android/cameraview/SurfaceViewPreview.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/SurfaceViewPreview;
 .super Lcom/google/android/cameraview/PreviewImpl;
+.source "SurfaceViewPreview.java"
 
 
 # instance fields
diff --git a/com.discord/smali/com/google/android/cameraview/TextureViewPreview$1.smali b/com.discord/smali/com/google/android/cameraview/TextureViewPreview$1.smali
index ddd0499f0b..9389ba2634 100644
--- a/com.discord/smali/com/google/android/cameraview/TextureViewPreview$1.smali
+++ b/com.discord/smali/com/google/android/cameraview/TextureViewPreview$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/TextureViewPreview$1;
 .super Ljava/lang/Object;
+.source "TextureViewPreview.java"
 
 # interfaces
 .implements Landroid/view/TextureView$SurfaceTextureListener;
diff --git a/com.discord/smali/com/google/android/cameraview/TextureViewPreview.smali b/com.discord/smali/com/google/android/cameraview/TextureViewPreview.smali
index d888a244ca..f908b77d87 100644
--- a/com.discord/smali/com/google/android/cameraview/TextureViewPreview.smali
+++ b/com.discord/smali/com/google/android/cameraview/TextureViewPreview.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/cameraview/TextureViewPreview;
 .super Lcom/google/android/cameraview/PreviewImpl;
+.source "TextureViewPreview.java"
 
 
 # annotations
@@ -60,15 +61,13 @@
 
     iget v1, v0, Lcom/google/android/cameraview/TextureViewPreview;->mDisplayOrientation:I
 
-    const/16 v2, 0xb4
-
-    rem-int/2addr v1, v2
+    rem-int/lit16 v2, v1, 0xb4
 
     const/16 v3, 0x5a
 
     const/4 v4, 0x2
 
-    if-ne v1, v3, :cond_1
+    if-ne v2, v3, :cond_1
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/cameraview/TextureViewPreview;->getWidth()I
 
@@ -144,10 +143,7 @@
 
     aput v9, v3, v15
 
-    :goto_0
-    move-object v4, v3
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v15, 0x7
@@ -170,9 +166,9 @@
 
     aput v2, v3, v15
 
-    goto :goto_0
+    :goto_0
+    move-object v4, v3
 
-    :goto_1
     const/4 v5, 0x0
 
     const/4 v8, 0x4
@@ -187,10 +183,10 @@
 
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Matrix;->setPolyToPoly([FI[FII)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    iget v1, v0, Lcom/google/android/cameraview/TextureViewPreview;->mDisplayOrientation:I
+    const/16 v2, 0xb4
 
     if-ne v1, v2, :cond_2
 
@@ -215,7 +211,7 @@
     invoke-virtual {v7, v1, v2, v3}, Landroid/graphics/Matrix;->postRotate(FFF)Z
 
     :cond_2
-    :goto_2
+    :goto_1
     iget-object v1, v0, Lcom/google/android/cameraview/TextureViewPreview;->mTextureView:Landroid/view/TextureView;
 
     invoke-virtual {v1, v7}, Landroid/view/TextureView;->setTransform(Landroid/graphics/Matrix;)V
diff --git a/com.discord/smali/com/google/android/flexbox/FlexItem.smali b/com.discord/smali/com/google/android/flexbox/FlexItem.smali
index db0a6616a4..79f4dbef91 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexItem.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexItem.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/flexbox/FlexItem;
 .super Ljava/lang/Object;
+.source "FlexItem.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -27,19 +28,22 @@
 .method public abstract getWidth()I
 .end method
 
+.method public abstract jZ()F
+.end method
+
 .method public abstract ka()F
 .end method
 
-.method public abstract kb()F
+.method public abstract kb()I
 .end method
 
-.method public abstract kc()I
+.method public abstract kc()Z
 .end method
 
-.method public abstract kd()Z
+.method public abstract kd()F
 .end method
 
-.method public abstract ke()F
+.method public abstract ke()I
 .end method
 
 .method public abstract kf()I
@@ -50,6 +54,3 @@
 
 .method public abstract kh()I
 .end method
-
-.method public abstract ki()I
-.end method
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams$1.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams$1.smali
index de016470f7..a354dbb1e1 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams$1.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/flexbox/FlexboxLayout$LayoutParams$1;
 .super Ljava/lang/Object;
+.source "FlexboxLayout.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali
index ee483a52a1..6f762e9b2f 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "FlexboxLayout.java"
 
 # interfaces
 .implements Lcom/google/android/flexbox/FlexItem;
@@ -532,7 +533,7 @@
     return v0
 .end method
 
-.method public final ka()F
+.method public final jZ()F
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->Xw:F
@@ -540,7 +541,7 @@
     return v0
 .end method
 
-.method public final kb()F
+.method public final ka()F
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->Xx:F
@@ -548,7 +549,7 @@
     return v0
 .end method
 
-.method public final kc()I
+.method public final kb()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->Xy:I
@@ -556,7 +557,7 @@
     return v0
 .end method
 
-.method public final kd()Z
+.method public final kc()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->XA:Z
@@ -564,7 +565,7 @@
     return v0
 .end method
 
-.method public final ke()F
+.method public final kd()F
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->Xz:F
@@ -572,7 +573,7 @@
     return v0
 .end method
 
-.method public final kf()I
+.method public final ke()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
@@ -580,7 +581,7 @@
     return v0
 .end method
 
-.method public final kg()I
+.method public final kf()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
@@ -588,7 +589,7 @@
     return v0
 .end method
 
-.method public final kh()I
+.method public final kg()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
@@ -596,7 +597,7 @@
     return v0
 .end method
 
-.method public final ki()I
+.method public final kh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->bottomMargin:I
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayout.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayout.smali
index 17cf00af5c..b82a07c0b3 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayout.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/flexbox/FlexboxLayout;
 .super Landroid/view/ViewGroup;
+.source "FlexboxLayout.java"
 
 # interfaces
 .implements Lcom/google/android/flexbox/a;
@@ -62,28 +63,20 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/google/android/flexbox/FlexboxLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/flexbox/FlexboxLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/flexbox/FlexboxLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 2
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+    .locals 1
+
+    const/4 p3, 0x0
 
     invoke-direct {p0, p1, p2, p3}, Landroid/view/ViewGroup;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -107,15 +100,13 @@
 
     sget-object v0, Lcom/google/android/flexbox/R$a;->FlexboxLayout:[I
 
-    const/4 v1, 0x0
-
-    invoke-virtual {p1, p2, v0, p3, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p2, v0, p3, p3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p1
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_flexDirection:I
 
-    invoke-virtual {p1, p2, v1}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -123,7 +114,7 @@
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_flexWrap:I
 
-    invoke-virtual {p1, p2, v1}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -131,7 +122,7 @@
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_justifyContent:I
 
-    invoke-virtual {p1, p2, v1}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -139,9 +130,9 @@
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_alignItems:I
 
-    const/4 p3, 0x4
+    const/4 v0, 0x4
 
-    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -149,9 +140,9 @@
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_alignContent:I
 
-    const/4 p3, 0x5
+    const/4 v0, 0x5
 
-    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -194,7 +185,7 @@
     :cond_2
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_showDivider:I
 
-    invoke-virtual {p1, p2, v1}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -207,7 +198,7 @@
     :cond_3
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_showDividerVertical:I
 
-    invoke-virtual {p1, p2, v1}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -218,7 +209,7 @@
     :cond_4
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_showDividerHorizontal:I
 
-    invoke-virtual {p1, p2, v1}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
@@ -328,18 +319,16 @@
 
     if-ge v1, v4, :cond_0
 
-    :goto_1
     invoke-static {p4, v5}, Landroid/view/View;->combineMeasuredStates(II)I
 
     move-result p4
 
     :cond_0
-    :goto_2
     invoke-static {v1, p2, p4}, Landroid/view/View;->resolveSizeAndState(III)I
 
     move-result p2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -363,19 +352,26 @@
 
     move-result p2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     if-ge v1, v4, :cond_4
 
+    invoke-static {p4, v5}, Landroid/view/View;->combineMeasuredStates(II)I
+
+    move-result p4
+
     goto :goto_1
 
     :cond_4
     move v1, v4
 
-    goto :goto_2
+    :goto_1
+    invoke-static {v1, p2, p4}, Landroid/view/View;->resolveSizeAndState(III)I
 
-    :goto_3
+    move-result p2
+
+    :goto_2
     const/16 v0, 0x100
 
     if-eq v2, v7, :cond_8
@@ -395,7 +391,7 @@
 
     move-result p1
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_6
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -415,15 +411,14 @@
     throw p1
 
     :cond_7
-    :goto_4
     invoke-static {p1, p3, p4}, Landroid/view/View;->resolveSizeAndState(III)I
 
     move-result p1
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_8
-    if-ge v3, p1, :cond_7
+    if-ge v3, p1, :cond_9
 
     invoke-static {p4, v0}, Landroid/view/View;->combineMeasuredStates(II)I
 
@@ -431,9 +426,12 @@
 
     move p1, v3
 
-    goto :goto_4
+    :cond_9
+    invoke-static {p1, p3, p4}, Landroid/view/View;->resolveSizeAndState(III)I
 
-    :goto_5
+    move-result p1
+
+    :goto_3
     invoke-virtual {p0, p2, p1}, Lcom/google/android/flexbox/FlexboxLayout;->setMeasuredDimension(II)V
 
     return-void
@@ -459,8 +457,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xm:Landroid/graphics/drawable/Drawable;
-
     iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
     add-int/2addr v1, p2
@@ -701,79 +697,77 @@
 .end method
 
 .method private a(ZIIII)V
-    .locals 28
+    .locals 26
 
     move-object/from16 v0, p0
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingLeft()I
 
-    move-result v2
+    move-result v1
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingRight()I
 
-    move-result v3
+    move-result v2
 
-    sub-int v4, p5, p3
+    sub-int v3, p5, p3
 
-    sub-int v5, p4, p2
+    sub-int v4, p4, p2
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingBottom()I
 
-    move-result v6
+    move-result v5
 
-    sub-int/2addr v4, v6
+    sub-int/2addr v3, v5
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingTop()I
 
+    move-result v5
+
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
+
+    invoke-interface {v6}, Ljava/util/List;->size()I
+
     move-result v6
 
-    iget-object v7, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
+    move v8, v5
 
-    invoke-interface {v7}, Ljava/util/List;->size()I
+    move v5, v3
 
-    move-result v7
-
-    move v9, v6
-
-    move v6, v4
-
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :goto_0
-    if-ge v4, v7, :cond_b
+    if-ge v3, v6, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
 
-    invoke-interface {v10, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v9, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    move-result-object v10
+    move-result-object v9
 
-    check-cast v10, Lcom/google/android/flexbox/b;
+    check-cast v9, Lcom/google/android/flexbox/b;
 
-    invoke-direct {v0, v4}, Lcom/google/android/flexbox/FlexboxLayout;->aM(I)Z
+    invoke-direct {v0, v3}, Lcom/google/android/flexbox/FlexboxLayout;->aM(I)Z
 
-    move-result v11
+    move-result v10
 
-    if-eqz v11, :cond_0
+    if-eqz v10, :cond_0
 
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
 
-    sub-int/2addr v6, v11
+    sub-int/2addr v5, v10
 
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
-
-    add-int/2addr v9, v11
+    add-int/2addr v8, v10
 
     :cond_0
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xi:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xi:I
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
-    const/high16 v13, 0x40000000    # 2.0f
+    const/high16 v12, 0x40000000    # 2.0f
 
     const/4 v15, 0x1
 
-    packed-switch v11, :pswitch_data_0
+    packed-switch v10, :pswitch_data_0
 
     new-instance v1, Ljava/lang/IllegalStateException;
 
@@ -796,496 +790,494 @@
     throw v1
 
     :pswitch_0
-    invoke-virtual {v10}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->ki()I
 
-    move-result v11
+    move-result v10
 
-    if-eqz v11, :cond_1
+    if-eqz v10, :cond_1
 
-    iget v14, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v13, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v14, v5, v14
+    sub-int v13, v4, v13
 
-    int-to-float v14, v14
+    int-to-float v13, v13
 
-    int-to-float v11, v11
+    int-to-float v10, v10
 
-    div-float v11, v14, v11
+    div-float v10, v13, v10
 
     goto :goto_1
 
     :cond_1
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
     :goto_1
-    int-to-float v14, v2
+    int-to-float v13, v1
 
-    div-float v13, v11, v13
+    div-float v12, v10, v12
 
-    add-float/2addr v14, v13
+    add-float/2addr v13, v12
 
-    sub-int v8, v5, v3
+    sub-int v14, v4, v2
 
-    int-to-float v8, v8
+    int-to-float v14, v14
 
-    sub-float/2addr v8, v13
+    sub-float/2addr v14, v12
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_1
-    int-to-float v14, v2
+    int-to-float v13, v1
 
-    invoke-virtual {v10}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->ki()I
 
-    move-result v8
+    move-result v10
 
-    if-eq v8, v15, :cond_2
+    if-eq v10, v15, :cond_2
 
-    add-int/lit8 v8, v8, -0x1
+    add-int/lit8 v10, v10, -0x1
 
-    int-to-float v8, v8
+    int-to-float v10, v10
 
     goto :goto_2
 
     :cond_2
-    const/high16 v8, 0x3f800000    # 1.0f
+    const/high16 v10, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v11, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v11, v5, v11
+    sub-int v12, v4, v12
 
-    int-to-float v11, v11
+    int-to-float v12, v12
 
-    div-float v8, v11, v8
+    div-float v10, v12, v10
 
-    sub-int v11, v5, v3
+    sub-int v12, v4, v2
 
-    int-to-float v11, v11
+    int-to-float v14, v12
 
-    move/from16 v27, v11
-
-    move v11, v8
-
-    move/from16 v8, v27
-
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_2
-    int-to-float v8, v2
+    int-to-float v10, v1
 
-    iget v11, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v13, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v11, v5, v11
+    sub-int v13, v4, v13
 
-    int-to-float v11, v11
+    int-to-float v13, v13
 
-    div-float/2addr v11, v13
+    div-float/2addr v13, v12
 
-    add-float v14, v8, v11
+    add-float/2addr v13, v10
 
-    sub-int v8, v5, v3
+    sub-int v10, v4, v2
 
-    int-to-float v8, v8
+    int-to-float v10, v10
 
-    iget v11, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v11, v5, v11
+    sub-int v14, v4, v14
 
-    int-to-float v11, v11
+    int-to-float v14, v14
 
-    div-float/2addr v11, v13
+    div-float/2addr v14, v12
 
-    sub-float/2addr v8, v11
+    sub-float v14, v10, v14
 
-    goto :goto_4
+    const/4 v10, 0x0
+
+    goto :goto_3
 
     :pswitch_3
-    iget v8, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v8, v5, v8
+    sub-int v10, v4, v10
 
-    add-int/2addr v8, v3
+    add-int/2addr v10, v2
 
-    int-to-float v14, v8
+    int-to-float v13, v10
 
-    iget v8, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int/2addr v8, v2
+    sub-int/2addr v10, v1
+
+    int-to-float v14, v10
+
+    const/4 v10, 0x0
 
     goto :goto_3
 
     :pswitch_4
-    int-to-float v14, v2
+    int-to-float v13, v1
 
-    sub-int v8, v5, v3
+    sub-int v10, v4, v2
+
+    int-to-float v14, v10
+
+    const/4 v10, 0x0
 
     :goto_3
-    int-to-float v8, v8
+    invoke-static {v10, v11}, Ljava/lang/Math;->max(FF)F
+
+    move-result v17
+
+    move v10, v14
+
+    const/4 v14, 0x0
 
     :goto_4
-    const/4 v11, 0x0
+    iget v11, v9, Lcom/google/android/flexbox/b;->mItemCount:I
 
-    :goto_5
-    invoke-static {v11, v12}, Ljava/lang/Math;->max(FF)F
+    if-ge v14, v11, :cond_a
 
-    move-result v18
+    iget v11, v9, Lcom/google/android/flexbox/b;->WY:I
 
-    move v11, v8
+    add-int/2addr v11, v14
 
-    const/4 v8, 0x0
+    invoke-direct {v0, v11}, Lcom/google/android/flexbox/FlexboxLayout;->aL(I)Landroid/view/View;
 
-    :goto_6
-    iget v12, v10, Lcom/google/android/flexbox/b;->mItemCount:I
+    move-result-object v18
 
-    if-ge v8, v12, :cond_a
+    if-eqz v18, :cond_9
 
-    iget v12, v10, Lcom/google/android/flexbox/b;->WY:I
-
-    add-int/2addr v12, v8
-
-    invoke-direct {v0, v12}, Lcom/google/android/flexbox/FlexboxLayout;->aL(I)Landroid/view/View;
-
-    move-result-object v19
-
-    if-eqz v19, :cond_9
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getVisibility()I
-
-    move-result v13
-
-    const/16 v15, 0x8
-
-    if-eq v13, v15, :cond_9
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v13
-
-    move-object v15, v13
-
-    check-cast v15, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
-
-    iget v13, v15, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
-
-    int-to-float v13, v13
-
-    add-float/2addr v14, v13
-
-    iget v13, v15, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
-
-    int-to-float v13, v13
-
-    sub-float/2addr v11, v13
-
-    invoke-direct {v0, v12, v8}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getVisibility()I
 
     move-result v12
 
-    if-eqz v12, :cond_3
+    const/16 v7, 0x8
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
+    if-eq v12, v7, :cond_9
 
-    int-to-float v13, v12
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    add-float/2addr v14, v13
+    move-result-object v7
 
-    sub-float/2addr v11, v13
+    check-cast v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
 
-    move/from16 v21, v11
-
-    move/from16 v23, v12
-
-    move/from16 v22, v14
-
-    goto :goto_7
-
-    :cond_3
-    move/from16 v21, v11
-
-    move/from16 v22, v14
-
-    const/16 v23, 0x0
-
-    :goto_7
-    iget v11, v10, Lcom/google/android/flexbox/b;->mItemCount:I
-
-    const/16 v16, 0x1
-
-    add-int/lit8 v11, v11, -0x1
-
-    if-ne v8, v11, :cond_4
-
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xo:I
-
-    and-int/lit8 v11, v11, 0x4
-
-    if-lez v11, :cond_4
-
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
-
-    move/from16 v20, v11
-
-    goto :goto_8
-
-    :cond_4
-    const/16 v20, 0x0
-
-    :goto_8
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xh:I
-
-    const/4 v12, 0x2
-
-    if-ne v11, v12, :cond_6
-
-    if-eqz p1, :cond_5
-
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
-
-    invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
-
-    move-result v12
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v13
-
-    sub-int v14, v12, v13
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v12
-
-    sub-int v17, v6, v12
-
-    invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
-
-    move-result v24
-
-    move-object/from16 v12, v19
-
-    move-object v13, v10
-
-    move/from16 v25, v2
-
-    move-object v2, v15
-
-    const/16 v26, 0x1
-
-    move/from16 v15, v17
-
-    move/from16 v16, v24
-
-    :goto_9
-    move/from16 v17, v6
-
-    :goto_a
-    invoke-virtual/range {v11 .. v17}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;IIII)V
-
-    goto :goto_c
-
-    :cond_5
-    move/from16 v25, v2
-
-    move-object v2, v15
-
-    const/16 v26, 0x1
-
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
-
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
-
-    move-result v14
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v12
-
-    sub-int v15, v6, v12
-
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
-
-    move-result v12
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v13
-
-    add-int v16, v12, v13
-
-    move-object/from16 v12, v19
-
-    move-object v13, v10
-
-    goto :goto_9
-
-    :cond_6
-    move/from16 v25, v2
-
-    move-object v2, v15
-
-    const/16 v26, 0x1
-
-    if-eqz p1, :cond_7
-
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
-
-    invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
-
-    move-result v12
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v13
-
-    sub-int v14, v12, v13
-
-    invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
-
-    move-result v16
-
-    :goto_b
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v12
-
-    add-int v17, v9, v12
-
-    move-object/from16 v12, v19
-
-    move-object v13, v10
-
-    move v15, v9
-
-    goto :goto_a
-
-    :cond_7
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
-
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
-
-    move-result v14
-
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
-
-    move-result v12
-
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v13
-
-    add-int v16, v12, v13
-
-    goto :goto_b
-
-    :goto_c
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v11
-
-    int-to-float v11, v11
-
-    add-float v11, v11, v18
-
-    iget v12, v2, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
+    iget v12, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
 
     int-to-float v12, v12
 
-    add-float/2addr v11, v12
+    add-float/2addr v13, v12
 
-    add-float v22, v22, v11
+    iget v12, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
 
-    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
+    int-to-float v12, v12
+
+    sub-float/2addr v10, v12
+
+    invoke-direct {v0, v11, v14}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
 
     move-result v11
 
-    int-to-float v11, v11
+    if-eqz v11, :cond_3
 
-    add-float v11, v11, v18
+    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
-    iget v2, v2, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
+    int-to-float v12, v11
 
-    int-to-float v2, v2
+    add-float/2addr v13, v12
 
-    add-float/2addr v11, v2
+    sub-float/2addr v10, v12
 
-    sub-float v21, v21, v11
+    move/from16 v20, v10
 
-    if-eqz p1, :cond_8
+    move/from16 v21, v11
 
-    const/4 v14, 0x0
+    move/from16 v19, v13
 
-    const/16 v16, 0x0
+    goto :goto_5
 
-    move-object v11, v10
+    :cond_3
+    move/from16 v20, v10
 
-    move-object/from16 v12, v19
+    move/from16 v19, v13
 
-    move/from16 v13, v20
+    const/16 v21, 0x0
+
+    :goto_5
+    iget v10, v9, Lcom/google/android/flexbox/b;->mItemCount:I
+
+    sub-int/2addr v10, v15
+
+    if-ne v14, v10, :cond_4
+
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xo:I
+
+    and-int/lit8 v10, v10, 0x4
+
+    if-lez v10, :cond_4
+
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
+
+    move/from16 v22, v10
+
+    goto :goto_6
+
+    :cond_4
+    const/16 v22, 0x0
+
+    :goto_6
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xh:I
+
+    const/4 v11, 0x2
+
+    if-ne v10, v11, :cond_6
+
+    if-eqz p1, :cond_5
+
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+
+    move-result v11
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v12
+
+    sub-int v13, v11, v12
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v11
+
+    sub-int v16, v5, v11
+
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+
+    move-result v23
+
+    move-object/from16 v11, v18
+
+    move-object v12, v9
+
+    move/from16 v24, v14
+
+    move/from16 v14, v16
+
+    const/16 v25, 0x1
 
     move/from16 v15, v23
 
-    :goto_d
-    invoke-virtual/range {v11 .. v16}, Lcom/google/android/flexbox/b;->a(Landroid/view/View;IIII)V
+    move/from16 v16, v5
 
-    goto :goto_e
+    invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;IIII)V
+
+    goto :goto_7
+
+    :cond_5
+    move/from16 v24, v14
+
+    const/16 v25, 0x1
+
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+
+    invoke-static/range {v19 .. v19}, Ljava/lang/Math;->round(F)I
+
+    move-result v13
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v11
+
+    sub-int v14, v5, v11
+
+    invoke-static/range {v19 .. v19}, Ljava/lang/Math;->round(F)I
+
+    move-result v11
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v12
+
+    add-int v15, v11, v12
+
+    move-object/from16 v11, v18
+
+    move-object v12, v9
+
+    move/from16 v16, v5
+
+    invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;IIII)V
+
+    goto :goto_7
+
+    :cond_6
+    move/from16 v24, v14
+
+    const/16 v25, 0x1
+
+    if-eqz p1, :cond_7
+
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+
+    move-result v11
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v12
+
+    sub-int v13, v11, v12
+
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+
+    move-result v15
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v11
+
+    add-int v16, v8, v11
+
+    move-object/from16 v11, v18
+
+    move-object v12, v9
+
+    move v14, v8
+
+    invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;IIII)V
+
+    goto :goto_7
+
+    :cond_7
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+
+    invoke-static/range {v19 .. v19}, Ljava/lang/Math;->round(F)I
+
+    move-result v13
+
+    invoke-static/range {v19 .. v19}, Ljava/lang/Math;->round(F)I
+
+    move-result v11
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v12
+
+    add-int v15, v11, v12
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v11
+
+    add-int v16, v8, v11
+
+    move-object/from16 v11, v18
+
+    move-object v12, v9
+
+    move v14, v8
+
+    invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;IIII)V
+
+    :goto_7
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v10
+
+    int-to-float v10, v10
+
+    add-float v10, v10, v17
+
+    iget v11, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
+
+    int-to-float v11, v11
+
+    add-float/2addr v10, v11
+
+    add-float v19, v19, v10
+
+    invoke-virtual/range {v18 .. v18}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v10
+
+    int-to-float v10, v10
+
+    add-float v10, v10, v17
+
+    iget v7, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
+
+    int-to-float v7, v7
+
+    add-float/2addr v10, v7
+
+    sub-float v20, v20, v10
+
+    if-eqz p1, :cond_8
+
+    const/4 v13, 0x0
+
+    const/4 v15, 0x0
+
+    move-object v10, v9
+
+    move-object/from16 v11, v18
+
+    move/from16 v12, v22
+
+    move/from16 v14, v21
+
+    invoke-virtual/range {v10 .. v15}, Lcom/google/android/flexbox/b;->a(Landroid/view/View;IIII)V
+
+    goto :goto_8
 
     :cond_8
-    const/4 v14, 0x0
+    const/4 v13, 0x0
 
-    const/16 v16, 0x0
+    const/4 v15, 0x0
 
-    move-object v11, v10
+    move-object v10, v9
 
-    move-object/from16 v12, v19
+    move-object/from16 v11, v18
 
-    move/from16 v13, v23
-
-    move/from16 v15, v20
-
-    goto :goto_d
-
-    :goto_e
-    move/from16 v11, v21
+    move/from16 v12, v21
 
     move/from16 v14, v22
 
-    goto :goto_f
+    invoke-virtual/range {v10 .. v15}, Lcom/google/android/flexbox/b;->a(Landroid/view/View;IIII)V
+
+    :goto_8
+    move/from16 v13, v19
+
+    move/from16 v10, v20
+
+    goto :goto_9
 
     :cond_9
-    move/from16 v25, v2
+    move/from16 v24, v14
 
-    const/16 v26, 0x1
+    const/16 v25, 0x1
 
-    :goto_f
-    add-int/lit8 v8, v8, 0x1
-
-    move/from16 v2, v25
+    :goto_9
+    add-int/lit8 v14, v24, 0x1
 
     const/4 v15, 0x1
 
-    goto/16 :goto_6
+    goto/16 :goto_4
 
     :cond_a
-    move/from16 v25, v2
+    iget v7, v9, Lcom/google/android/flexbox/b;->WQ:I
 
-    iget v2, v10, Lcom/google/android/flexbox/b;->WQ:I
+    add-int/2addr v8, v7
 
-    add-int/2addr v9, v2
+    iget v7, v9, Lcom/google/android/flexbox/b;->WQ:I
 
-    iget v2, v10, Lcom/google/android/flexbox/b;->WQ:I
+    sub-int/2addr v5, v7
 
-    sub-int/2addr v6, v2
-
-    add-int/lit8 v4, v4, 0x1
-
-    move/from16 v2, v25
+    add-int/lit8 v3, v3, 0x1
 
     goto/16 :goto_0
 
     :cond_b
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
@@ -1297,79 +1289,77 @@
 .end method
 
 .method private a(ZZIIII)V
-    .locals 29
+    .locals 27
 
     move-object/from16 v0, p0
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingTop()I
 
-    move-result v2
+    move-result v1
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingBottom()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingRight()I
 
-    move-result v4
+    move-result v3
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingLeft()I
 
-    move-result v5
-
-    sub-int v6, p5, p3
-
-    sub-int v7, p6, p4
-
-    sub-int/2addr v6, v4
-
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->size()I
-
     move-result v4
 
-    move v9, v6
+    sub-int v5, p5, p3
 
-    move v6, v5
+    sub-int v6, p6, p4
 
-    const/4 v5, 0x0
+    sub-int/2addr v5, v3
+
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
+
+    invoke-interface {v3}, Ljava/util/List;->size()I
+
+    move-result v3
+
+    move v8, v5
+
+    move v5, v4
+
+    const/4 v4, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_b
+    if-ge v4, v3, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
 
-    invoke-interface {v10, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v9, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    move-result-object v10
+    move-result-object v9
 
-    check-cast v10, Lcom/google/android/flexbox/b;
+    check-cast v9, Lcom/google/android/flexbox/b;
 
-    invoke-direct {v0, v5}, Lcom/google/android/flexbox/FlexboxLayout;->aM(I)Z
+    invoke-direct {v0, v4}, Lcom/google/android/flexbox/FlexboxLayout;->aM(I)Z
 
-    move-result v11
+    move-result v10
 
-    if-eqz v11, :cond_0
+    if-eqz v10, :cond_0
 
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
-    add-int/2addr v6, v11
+    add-int/2addr v5, v10
 
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
-
-    sub-int/2addr v9, v11
+    sub-int/2addr v8, v10
 
     :cond_0
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xi:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xi:I
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
-    const/high16 v13, 0x40000000    # 2.0f
+    const/high16 v12, 0x40000000    # 2.0f
 
     const/4 v15, 0x1
 
-    packed-switch v11, :pswitch_data_0
+    packed-switch v10, :pswitch_data_0
 
     new-instance v1, Ljava/lang/IllegalStateException;
 
@@ -1392,491 +1382,492 @@
     throw v1
 
     :pswitch_0
-    invoke-virtual {v10}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->ki()I
 
-    move-result v11
+    move-result v10
 
-    if-eqz v11, :cond_1
+    if-eqz v10, :cond_1
 
-    iget v14, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v13, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v14, v7, v14
+    sub-int v13, v6, v13
 
-    int-to-float v14, v14
+    int-to-float v13, v13
 
-    int-to-float v11, v11
+    int-to-float v10, v10
 
-    div-float v11, v14, v11
+    div-float v10, v13, v10
 
     goto :goto_1
 
     :cond_1
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
     :goto_1
-    int-to-float v14, v2
+    int-to-float v13, v1
 
-    div-float v13, v11, v13
+    div-float v12, v10, v12
 
-    add-float/2addr v14, v13
+    add-float/2addr v13, v12
 
-    sub-int v8, v7, v3
+    sub-int v14, v6, v2
 
-    int-to-float v8, v8
+    int-to-float v14, v14
 
-    sub-float/2addr v8, v13
+    sub-float/2addr v14, v12
 
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_1
-    int-to-float v14, v2
+    int-to-float v13, v1
 
-    invoke-virtual {v10}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->ki()I
 
-    move-result v8
+    move-result v10
 
-    if-eq v8, v15, :cond_2
+    if-eq v10, v15, :cond_2
 
-    add-int/lit8 v8, v8, -0x1
+    add-int/lit8 v10, v10, -0x1
 
-    int-to-float v8, v8
+    int-to-float v10, v10
 
     goto :goto_2
 
     :cond_2
-    const/high16 v8, 0x3f800000    # 1.0f
+    const/high16 v10, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v11, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v11, v7, v11
+    sub-int v12, v6, v12
 
-    int-to-float v11, v11
+    int-to-float v12, v12
 
-    div-float v8, v11, v8
+    div-float v10, v12, v10
 
-    sub-int v11, v7, v3
+    sub-int v12, v6, v2
 
-    int-to-float v11, v11
+    int-to-float v14, v12
 
-    move/from16 v28, v11
-
-    move v11, v8
-
-    move/from16 v8, v28
-
-    goto :goto_5
+    goto :goto_3
 
     :pswitch_2
-    int-to-float v8, v2
+    int-to-float v10, v1
 
-    iget v11, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v13, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v11, v7, v11
+    sub-int v13, v6, v13
 
-    int-to-float v11, v11
+    int-to-float v13, v13
 
-    div-float/2addr v11, v13
+    div-float/2addr v13, v12
 
-    add-float v14, v8, v11
+    add-float/2addr v13, v10
 
-    sub-int v8, v7, v3
+    sub-int v10, v6, v2
 
-    int-to-float v8, v8
+    int-to-float v10, v10
 
-    iget v11, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v11, v7, v11
+    sub-int v14, v6, v14
 
-    int-to-float v11, v11
+    int-to-float v14, v14
 
-    div-float/2addr v11, v13
+    div-float/2addr v14, v12
 
-    sub-float/2addr v8, v11
+    sub-float v14, v10, v14
 
-    goto :goto_4
+    const/4 v10, 0x0
+
+    goto :goto_3
 
     :pswitch_3
-    iget v8, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int v8, v7, v8
+    sub-int v10, v6, v10
 
-    add-int/2addr v8, v3
+    add-int/2addr v10, v2
 
-    int-to-float v14, v8
+    int-to-float v13, v10
 
-    iget v8, v10, Lcom/google/android/flexbox/b;->WO:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->WO:I
 
-    sub-int/2addr v8, v2
+    sub-int/2addr v10, v1
+
+    int-to-float v14, v10
+
+    const/4 v10, 0x0
 
     goto :goto_3
 
     :pswitch_4
-    int-to-float v14, v2
+    int-to-float v13, v1
 
-    sub-int v8, v7, v3
+    sub-int v10, v6, v2
+
+    int-to-float v14, v10
+
+    const/4 v10, 0x0
 
     :goto_3
-    int-to-float v8, v8
+    invoke-static {v10, v11}, Ljava/lang/Math;->max(FF)F
+
+    move-result v18
+
+    move v10, v14
+
+    const/4 v14, 0x0
 
     :goto_4
-    const/4 v11, 0x0
+    iget v11, v9, Lcom/google/android/flexbox/b;->mItemCount:I
 
-    :goto_5
-    invoke-static {v11, v12}, Ljava/lang/Math;->max(FF)F
+    if-ge v14, v11, :cond_a
 
-    move-result v19
+    iget v11, v9, Lcom/google/android/flexbox/b;->WY:I
 
-    move v11, v8
+    add-int/2addr v11, v14
 
-    const/4 v8, 0x0
+    invoke-direct {v0, v11}, Lcom/google/android/flexbox/FlexboxLayout;->aL(I)Landroid/view/View;
 
-    :goto_6
-    iget v12, v10, Lcom/google/android/flexbox/b;->mItemCount:I
+    move-result-object v19
 
-    if-ge v8, v12, :cond_a
+    if-eqz v19, :cond_9
 
-    iget v12, v10, Lcom/google/android/flexbox/b;->WY:I
-
-    add-int/2addr v12, v8
-
-    invoke-direct {v0, v12}, Lcom/google/android/flexbox/FlexboxLayout;->aL(I)Landroid/view/View;
-
-    move-result-object v20
-
-    if-eqz v20, :cond_9
-
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getVisibility()I
-
-    move-result v13
-
-    const/16 v15, 0x8
-
-    if-eq v13, v15, :cond_9
-
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v13
-
-    move-object v15, v13
-
-    check-cast v15, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
-
-    iget v13, v15, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
-
-    int-to-float v13, v13
-
-    add-float/2addr v14, v13
-
-    iget v13, v15, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->bottomMargin:I
-
-    int-to-float v13, v13
-
-    sub-float/2addr v11, v13
-
-    invoke-direct {v0, v12, v8}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getVisibility()I
 
     move-result v12
 
-    if-eqz v12, :cond_3
+    const/16 v7, 0x8
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
+    if-eq v12, v7, :cond_9
 
-    int-to-float v13, v12
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    add-float/2addr v14, v13
+    move-result-object v7
 
-    sub-float/2addr v11, v13
+    check-cast v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
 
-    move/from16 v21, v11
+    iget v12, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
 
-    move/from16 v23, v12
+    int-to-float v12, v12
 
-    move/from16 v22, v14
+    add-float/2addr v13, v12
 
-    goto :goto_7
+    iget v12, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->bottomMargin:I
 
-    :cond_3
-    move/from16 v21, v11
+    int-to-float v12, v12
 
-    move/from16 v22, v14
+    sub-float/2addr v10, v12
 
-    const/16 v23, 0x0
+    invoke-direct {v0, v11, v14}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
 
-    :goto_7
-    iget v11, v10, Lcom/google/android/flexbox/b;->mItemCount:I
+    move-result v11
 
-    const/16 v16, 0x1
-
-    add-int/lit8 v11, v11, -0x1
-
-    if-ne v8, v11, :cond_4
-
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xn:I
-
-    and-int/lit8 v11, v11, 0x4
-
-    if-lez v11, :cond_4
+    if-eqz v11, :cond_3
 
     iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
 
-    move/from16 v24, v11
+    int-to-float v12, v11
 
-    goto :goto_8
+    add-float/2addr v13, v12
+
+    sub-float/2addr v10, v12
+
+    move/from16 v21, v10
+
+    move/from16 v22, v11
+
+    move/from16 v20, v13
+
+    goto :goto_5
+
+    :cond_3
+    move/from16 v21, v10
+
+    move/from16 v20, v13
+
+    const/16 v22, 0x0
+
+    :goto_5
+    iget v10, v9, Lcom/google/android/flexbox/b;->mItemCount:I
+
+    sub-int/2addr v10, v15
+
+    if-ne v14, v10, :cond_4
+
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xn:I
+
+    and-int/lit8 v10, v10, 0x4
+
+    if-lez v10, :cond_4
+
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
+
+    move/from16 v23, v10
+
+    goto :goto_6
 
     :cond_4
-    const/16 v24, 0x0
+    const/16 v23, 0x0
 
-    :goto_8
+    :goto_6
     if-eqz p1, :cond_6
 
     if-eqz p2, :cond_5
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
 
-    const/4 v14, 0x1
+    const/4 v13, 0x1
 
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
 
-    move-result v12
+    move-result v11
 
-    sub-int v17, v9, v12
+    sub-int v16, v8, v11
 
     invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
 
+    move-result v11
+
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
+
     move-result v12
 
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v13
-
-    sub-int v18, v12, v13
+    sub-int v17, v11, v12
 
     invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
 
-    move-result v25
+    move-result v24
 
-    move-object/from16 v12, v20
+    move-object/from16 v11, v19
 
-    move-object v13, v10
+    move-object v12, v9
 
-    move-object/from16 v26, v15
+    move/from16 v25, v14
 
-    const/16 v27, 0x1
+    move/from16 v14, v16
+
+    const/16 v26, 0x1
 
     move/from16 v15, v17
 
-    move/from16 v16, v18
+    move/from16 v16, v8
 
-    move/from16 v17, v9
+    move/from16 v17, v24
 
-    move/from16 v18, v25
+    invoke-virtual/range {v10 .. v17}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
 
-    :goto_9
-    invoke-virtual/range {v11 .. v18}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
-
-    goto :goto_b
+    goto :goto_7
 
     :cond_5
-    move-object/from16 v26, v15
+    move/from16 v25, v14
 
-    const/16 v27, 0x1
+    const/16 v26, 0x1
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
 
-    const/4 v14, 0x1
+    const/4 v13, 0x1
 
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v11
+
+    sub-int v14, v8, v11
+
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+
+    move-result v15
+
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+
+    move-result v11
+
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v12
 
-    sub-int v15, v9, v12
+    add-int v17, v11, v12
 
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
+    move-object/from16 v11, v19
 
-    move-result v16
+    move-object v12, v9
 
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
+    move/from16 v16, v8
 
-    move-result v12
+    invoke-virtual/range {v10 .. v17}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
 
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v13
-
-    add-int v18, v12, v13
-
-    move-object/from16 v12, v20
-
-    move-object v13, v10
-
-    move/from16 v17, v9
-
-    goto :goto_9
+    goto :goto_7
 
     :cond_6
-    move-object/from16 v26, v15
+    move/from16 v25, v14
 
-    const/16 v27, 0x1
+    const/16 v26, 0x1
 
     if-eqz p2, :cond_7
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
 
-    const/4 v14, 0x0
+    const/4 v13, 0x0
 
     invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
 
-    move-result v12
+    move-result v11
 
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v13
-
-    sub-int v16, v12, v13
-
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredWidth()I
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v12
 
-    add-int v17, v6, v12
+    sub-int v15, v11, v12
+
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v11
+
+    add-int v16, v5, v11
 
     invoke-static/range {v21 .. v21}, Ljava/lang/Math;->round(F)I
 
-    move-result v18
+    move-result v17
 
-    :goto_a
-    move-object/from16 v12, v20
+    move-object/from16 v11, v19
 
-    move-object v13, v10
+    move-object v12, v9
 
-    move v15, v6
+    move v14, v5
 
-    goto :goto_9
+    invoke-virtual/range {v10 .. v17}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
+
+    goto :goto_7
 
     :cond_7
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
 
-    const/4 v14, 0x0
+    const/4 v13, 0x0
 
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
 
-    move-result v16
+    move-result v15
 
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v12
-
-    add-int v17, v6, v12
-
-    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
-
-    move-result v12
-
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v13
-
-    add-int v18, v12, v13
-
-    goto :goto_a
-
-    :goto_b
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v11
 
-    int-to-float v11, v11
+    add-int v16, v5, v11
 
-    add-float v11, v11, v19
-
-    move-object/from16 v13, v26
-
-    iget v12, v13, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->bottomMargin:I
-
-    int-to-float v12, v12
-
-    add-float/2addr v11, v12
-
-    add-float v22, v22, v11
-
-    invoke-virtual/range {v20 .. v20}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
 
     move-result v11
 
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v12
+
+    add-int v17, v11, v12
+
+    move-object/from16 v11, v19
+
+    move-object v12, v9
+
+    move v14, v5
+
+    invoke-virtual/range {v10 .. v17}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
+
+    :goto_7
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v10
+
+    int-to-float v10, v10
+
+    add-float v10, v10, v18
+
+    iget v11, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->bottomMargin:I
+
     int-to-float v11, v11
 
-    add-float v11, v11, v19
+    add-float/2addr v10, v11
 
-    iget v12, v13, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
+    add-float v20, v20, v10
 
-    int-to-float v12, v12
+    invoke-virtual/range {v19 .. v19}, Landroid/view/View;->getMeasuredHeight()I
 
-    add-float/2addr v11, v12
+    move-result v10
 
-    sub-float v21, v21, v11
+    int-to-float v10, v10
+
+    add-float v10, v10, v18
+
+    iget v7, v7, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
+
+    int-to-float v7, v7
+
+    add-float/2addr v10, v7
+
+    sub-float v21, v21, v10
 
     if-eqz p2, :cond_8
 
-    const/4 v13, 0x0
+    const/4 v12, 0x0
 
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
-    move-object v11, v10
+    move-object v10, v9
 
-    move-object/from16 v12, v20
+    move-object/from16 v11, v19
 
-    move/from16 v14, v24
+    move/from16 v13, v23
 
-    move/from16 v16, v23
+    move/from16 v15, v22
 
-    :goto_c
-    invoke-virtual/range {v11 .. v16}, Lcom/google/android/flexbox/b;->a(Landroid/view/View;IIII)V
+    invoke-virtual/range {v10 .. v15}, Lcom/google/android/flexbox/b;->a(Landroid/view/View;IIII)V
 
-    goto :goto_d
+    goto :goto_8
 
     :cond_8
-    const/4 v13, 0x0
+    const/4 v12, 0x0
 
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
-    move-object v11, v10
+    move-object v10, v9
 
-    move-object/from16 v12, v20
+    move-object/from16 v11, v19
 
-    move/from16 v14, v23
+    move/from16 v13, v22
 
-    move/from16 v16, v24
+    move/from16 v15, v23
 
-    goto :goto_c
+    invoke-virtual/range {v10 .. v15}, Lcom/google/android/flexbox/b;->a(Landroid/view/View;IIII)V
 
-    :goto_d
-    move/from16 v11, v21
+    :goto_8
+    move/from16 v13, v20
 
-    move/from16 v14, v22
+    move/from16 v10, v21
 
-    goto :goto_e
+    goto :goto_9
 
     :cond_9
-    const/16 v27, 0x1
+    move/from16 v25, v14
 
-    :goto_e
-    add-int/lit8 v8, v8, 0x1
+    const/16 v26, 0x1
+
+    :goto_9
+    add-int/lit8 v14, v25, 0x1
 
     const/4 v15, 0x1
 
-    goto/16 :goto_6
+    goto/16 :goto_4
 
     :cond_a
-    iget v8, v10, Lcom/google/android/flexbox/b;->WQ:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->WQ:I
 
-    add-int/2addr v6, v8
+    add-int/2addr v5, v7
 
-    iget v8, v10, Lcom/google/android/flexbox/b;->WQ:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->WQ:I
 
-    sub-int/2addr v9, v8
+    sub-int/2addr v8, v7
 
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v4, v4, 0x1
 
     goto/16 :goto_0
 
@@ -1894,21 +1885,19 @@
 .end method
 
 .method private aL(I)Landroid/view/View;
-    .locals 1
+    .locals 2
 
     if-ltz p1, :cond_1
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xr:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-lt p1, v0, :cond_0
+    if-lt p1, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xr:[I
-
     aget p1, v0, p1
 
     invoke-virtual {p0, p1}, Lcom/google/android/flexbox/FlexboxLayout;->getChildAt(I)Landroid/view/View;
@@ -1929,7 +1918,7 @@
 
     const/4 v0, 0x0
 
-    if-ltz p1, :cond_7
+    if-ltz p1, :cond_8
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
 
@@ -1950,7 +1939,7 @@
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result p1
 
@@ -1980,7 +1969,7 @@
     return v0
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result p1
 
@@ -2007,6 +1996,9 @@
     return v1
 
     :cond_7
+    return v0
+
+    :cond_8
     :goto_0
     return v0
 .end method
@@ -2029,7 +2021,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->ki()I
 
     move-result v2
 
@@ -2053,7 +2045,7 @@
 
     const/4 v0, 0x0
 
-    if-ltz p1, :cond_5
+    if-ltz p1, :cond_6
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xe:Ljava/util/List;
 
@@ -2087,7 +2079,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->ki()I
 
     move-result v2
 
@@ -2101,7 +2093,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result p1
 
@@ -2128,6 +2120,9 @@
     return v1
 
     :cond_5
+    return v0
+
+    :cond_6
     :goto_1
     return v0
 .end method
@@ -2142,8 +2137,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xl:Landroid/graphics/drawable/Drawable;
-
     add-int/2addr p4, p2
 
     iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
@@ -2383,7 +2376,7 @@
     return-void
 .end method
 
-.method private kl()V
+.method private kk()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xl:Landroid/graphics/drawable/Drawable;
@@ -2396,7 +2389,6 @@
 
     const/4 v0, 0x1
 
-    :goto_0
     invoke-virtual {p0, v0}, Lcom/google/android/flexbox/FlexboxLayout;->setWillNotDraw(Z)V
 
     return-void
@@ -2404,7 +2396,9 @@
     :cond_0
     const/4 v0, 0x0
 
-    goto :goto_0
+    invoke-virtual {p0, v0}, Lcom/google/android/flexbox/FlexboxLayout;->setWillNotDraw(Z)V
+
+    return-void
 .end method
 
 .method private measureHorizontal(II)V
@@ -2538,12 +2532,11 @@
 
     add-int/2addr v5, v6
 
-    :goto_2
     invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I
 
     move-result v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_0
     iget v7, v2, Lcom/google/android/flexbox/b;->WV:I
@@ -2576,10 +2569,12 @@
 
     add-int/2addr v5, v7
 
-    goto :goto_2
+    invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I
+
+    move-result v4
 
     :cond_1
-    :goto_3
+    :goto_2
     add-int/lit8 v3, v3, 0x1
 
     goto :goto_1
@@ -2632,7 +2627,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result p1
 
@@ -2662,7 +2657,7 @@
     return p2
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result p1
 
@@ -2736,7 +2731,7 @@
 .method public final a(Landroid/view/View;II)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result p1
 
@@ -2763,10 +2758,9 @@
 
     iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
-    :goto_0
     add-int/2addr v0, p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     invoke-direct {p0, p2, p3}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
@@ -2788,10 +2782,10 @@
 
     iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
 
-    goto :goto_0
+    add-int/2addr v0, p1
 
     :cond_3
-    :goto_1
+    :goto_0
     return v0
 .end method
 
@@ -2810,7 +2804,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result p1
 
@@ -2858,7 +2852,7 @@
 .method public final a(Lcom/google/android/flexbox/b;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result v0
 
@@ -3149,7 +3143,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->ki()I
 
     move-result v3
 
@@ -3277,7 +3271,7 @@
 
     if-eqz v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result v4
 
@@ -3285,25 +3279,24 @@
 
     iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
 
-    :goto_1
     add-int/2addr v2, v4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
-    goto :goto_1
+    add-int/2addr v2, v4
 
     :cond_1
-    :goto_2
+    :goto_1
     invoke-direct {p0, v1}, Lcom/google/android/flexbox/FlexboxLayout;->aO(I)Z
 
     move-result v4
 
     if-eqz v4, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->jY()Z
 
     move-result v4
 
@@ -3311,18 +3304,17 @@
 
     iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
 
-    :goto_3
     add-int/2addr v2, v4
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_2
     iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
-    goto :goto_3
+    add-int/2addr v2, v4
 
     :cond_3
-    :goto_4
+    :goto_2
     iget v3, v3, Lcom/google/android/flexbox/b;->WQ:I
 
     add-int/2addr v2, v3
@@ -3335,7 +3327,7 @@
     return v2
 .end method
 
-.method public final jZ()Z
+.method public final jY()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xg:I
@@ -3344,8 +3336,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xg:I
-
     if-ne v0, v1, :cond_0
 
     goto :goto_0
@@ -3480,9 +3470,13 @@
     :cond_9
     invoke-direct {p0, p1, v0, v3}, Lcom/google/android/flexbox/FlexboxLayout;->a(Landroid/graphics/Canvas;ZZ)V
 
+    return-void
+
     :goto_3
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
@@ -3766,7 +3760,7 @@
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xt:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->kk()V
+    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->kj()V
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xg:I
 
@@ -3854,18 +3848,17 @@
 
     move-result p1
 
-    :goto_0
     iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    goto :goto_0
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xp:I
 
-    :goto_1
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kl()V
+    :goto_0
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kk()V
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -3894,18 +3887,17 @@
 
     move-result p1
 
-    :goto_0
     iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    goto :goto_0
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->Xq:I
 
-    :goto_1
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kl()V
+    :goto_0
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kk()V
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams$1.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams$1.smali
index 3376844a0d..8db88dbe48 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams$1.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams$1;
 .super Ljava/lang/Object;
+.source "FlexboxLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali
index d850db0256..2deec30989 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;
 .super Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+.source "FlexboxLayoutManager.java"
 
 # interfaces
 .implements Lcom/google/android/flexbox/FlexItem;
@@ -321,7 +322,7 @@
     return v0
 .end method
 
-.method public final ka()F
+.method public final jZ()F
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->Xw:F
@@ -329,7 +330,7 @@
     return v0
 .end method
 
-.method public final kb()F
+.method public final ka()F
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->Xx:F
@@ -337,7 +338,7 @@
     return v0
 .end method
 
-.method public final kc()I
+.method public final kb()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->Xy:I
@@ -345,7 +346,7 @@
     return v0
 .end method
 
-.method public final kd()Z
+.method public final kc()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->XA:Z
@@ -353,7 +354,7 @@
     return v0
 .end method
 
-.method public final ke()F
+.method public final kd()F
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->Xz:F
@@ -361,7 +362,7 @@
     return v0
 .end method
 
-.method public final kf()I
+.method public final ke()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->leftMargin:I
@@ -369,7 +370,7 @@
     return v0
 .end method
 
-.method public final kg()I
+.method public final kf()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->topMargin:I
@@ -377,7 +378,7 @@
     return v0
 .end method
 
-.method public final kh()I
+.method public final kg()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->rightMargin:I
@@ -385,7 +386,7 @@
     return v0
 .end method
 
-.method public final ki()I
+.method public final kh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->bottomMargin:I
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState$1.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState$1.smali
index d0b30d5324..fbba21267f 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState$1.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState$1;
 .super Ljava/lang/Object;
+.source "FlexboxLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState.smali
index 692d72619b..9fb006d5b9 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$SavedState.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 .super Ljava/lang/Object;
+.source "FlexboxLayoutManager.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -150,14 +151,12 @@
 .end method
 
 .method static synthetic c(Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;I)Z
-    .locals 1
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;->mAnchorPosition:I
-
-    if-ltz v0, :cond_0
+    .locals 0
 
     iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;->mAnchorPosition:I
 
+    if-ltz p0, :cond_0
+
     if-ge p0, p1, :cond_0
 
     const/4 p0, 0x1
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$a.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$a.smali
index 8de40ffdd6..db507592af 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$a.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 .super Ljava/lang/Object;
+.source "FlexboxLayoutManager.java"
 
 
 # annotations
@@ -79,7 +80,7 @@
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->XP:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -107,6 +108,20 @@
 
     move-result v0
 
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->XP:Lcom/google/android/flexbox/FlexboxLayoutManager;
+
+    invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroidx/recyclerview/widget/OrientationHelper;->getTotalSpaceChange()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mCoordinate:I
+
     goto :goto_0
 
     :cond_0
@@ -120,7 +135,9 @@
 
     move-result v0
 
-    goto :goto_1
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mCoordinate:I
+
+    goto :goto_0
 
     :cond_1
     iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mLayoutFromEnd:Z
@@ -137,7 +154,6 @@
 
     move-result v0
 
-    :goto_0
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->XP:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
@@ -150,10 +166,9 @@
 
     add-int/2addr v0, v1
 
-    :goto_1
     iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mCoordinate:I
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->XP:Lcom/google/android/flexbox/FlexboxLayoutManager;
@@ -166,9 +181,9 @@
 
     move-result v0
 
-    goto :goto_1
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mCoordinate:I
 
-    :goto_2
+    :goto_0
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->XP:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-virtual {v0, p1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getPosition(Landroid/view/View;)I
@@ -283,7 +298,7 @@
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->XP:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v1
 
@@ -430,7 +445,7 @@
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->XP:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$b.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$b.smali
index 6d0142e3bb..b1f540a7c6 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$b.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 .super Ljava/lang/Object;
+.source "FlexboxLayoutManager.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager.smali b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager.smali
index 127745dc45..859d3d1e47 100644
--- a/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager.smali
+++ b/com.discord/smali/com/google/android/flexbox/FlexboxLayoutManager.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/flexbox/FlexboxLayoutManager;
 .super Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+.source "FlexboxLayoutManager.java"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider;
@@ -171,7 +172,7 @@
 
     invoke-direct {p0, p2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexWrap(I)V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->km()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kl()V
 
     invoke-virtual {p0, p2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setAutoMeasureEnabled(Z)V
 
@@ -241,7 +242,7 @@
 
     packed-switch p3, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     iget-boolean p2, p2, Landroidx/recyclerview/widget/RecyclerView$LayoutManager$Properties;->reverseLayout:Z
@@ -250,14 +251,15 @@
 
     const/4 p2, 0x3
 
-    :goto_0
     invoke-direct {p0, p2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexDirection(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p2, 0x2
 
+    invoke-direct {p0, p2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexDirection(I)V
+
     goto :goto_0
 
     :pswitch_1
@@ -267,15 +269,15 @@
 
     invoke-direct {p0, p4}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexDirection(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     invoke-direct {p0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexDirection(I)V
 
-    :goto_1
+    :goto_0
     invoke-direct {p0, p4}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexWrap(I)V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->km()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kl()V
 
     invoke-virtual {p0, p4}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setAutoMeasureEnabled(Z)V
 
@@ -283,8 +285,6 @@
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
@@ -301,14 +301,14 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
     if-nez p1, :cond_0
 
     goto :goto_3
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kn()V
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
@@ -316,7 +316,7 @@
 
     iput-boolean v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->XQ:Z
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -348,7 +348,12 @@
     goto :goto_1
 
     :cond_3
-    if-lez p1, :cond_2
+    if-lez p1, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v2, -0x1
 
     :goto_1
     invoke-static {p1}, Ljava/lang/Math;->abs(I)I
@@ -369,14 +374,14 @@
 
     add-int/2addr v4, p2
 
-    if-gez v4, :cond_4
+    if-gez v4, :cond_5
 
     return v1
 
-    :cond_4
-    if-eqz v0, :cond_5
+    :cond_5
+    if-eqz v0, :cond_6
 
-    if-le v3, v4, :cond_6
+    if-le v3, v4, :cond_7
 
     neg-int p1, v2
 
@@ -384,12 +389,12 @@
 
     goto :goto_2
 
-    :cond_5
-    if-le v3, v4, :cond_6
+    :cond_6
+    if-le v3, v4, :cond_7
 
     mul-int p1, v2, v4
 
-    :cond_6
+    :cond_7
     :goto_2
     iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -403,13 +408,13 @@
 
     return p1
 
-    :cond_7
+    :cond_8
     :goto_3
     return v1
 .end method
 
 .method private a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
-    .locals 26
+    .locals 28
 
     move-object/from16 v0, p0
 
@@ -443,7 +448,7 @@
 
     iget v5, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v6
 
@@ -461,9 +466,9 @@
     goto :goto_1
 
     :cond_2
-    move/from16 v22, v3
+    move/from16 v20, v3
 
-    goto/16 :goto_f
+    goto/16 :goto_d
 
     :cond_3
     :goto_1
@@ -503,7 +508,7 @@
     const/4 v9, 0x0
 
     :goto_2
-    if-eqz v9, :cond_2
+    if-eqz v9, :cond_f
 
     iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
 
@@ -519,7 +524,7 @@
 
     iput v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v10
 
@@ -549,9 +554,14 @@
 
     sub-int/2addr v14, v7
 
+    move v7, v14
+
+    goto :goto_3
+
     :cond_5
     move v7, v14
 
+    :goto_3
     iget v15, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
     iget v14, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xi:I
@@ -597,12 +607,12 @@
 
     div-float v4, v14, v4
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_6
     const/4 v4, 0x0
 
-    :goto_3
+    :goto_4
     int-to-float v10, v10
 
     div-float v14, v4, v16
@@ -630,12 +640,12 @@
 
     int-to-float v4, v4
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_7
     const/high16 v4, 0x3f800000    # 1.0f
 
-    :goto_4
+    :goto_5
     iget v14, v9, Lcom/google/android/flexbox/b;->WO:I
 
     sub-int v14, v13, v14
@@ -677,7 +687,9 @@
 
     sub-float v12, v4, v12
 
-    goto :goto_5
+    const/4 v4, 0x0
+
+    goto :goto_6
 
     :pswitch_3
     iget v4, v9, Lcom/google/android/flexbox/b;->WO:I
@@ -696,7 +708,9 @@
 
     move v10, v4
 
-    goto :goto_5
+    const/4 v4, 0x0
+
+    goto :goto_6
 
     :pswitch_4
     int-to-float v10, v10
@@ -705,7 +719,6 @@
 
     int-to-float v12, v13
 
-    :goto_5
     const/4 v4, 0x0
 
     :goto_6
@@ -756,11 +769,11 @@
 
     if-eqz v11, :cond_b
 
-    move/from16 v21, v14
+    move/from16 v17, v14
 
     iget v14, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
-    move/from16 v22, v3
+    move/from16 v20, v3
 
     const/4 v3, 0x1
 
@@ -772,10 +785,9 @@
 
     invoke-virtual {v0, v11}, Lcom/google/android/flexbox/FlexboxLayoutManager;->addView(Landroid/view/View;)V
 
-    :goto_8
     move/from16 v19, v12
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_8
     sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->XB:Landroid/graphics/Rect;
@@ -786,36 +798,36 @@
 
     add-int/lit8 v12, v12, 0x1
 
-    goto :goto_8
+    move/from16 v19, v12
 
-    :goto_9
+    :goto_8
     iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
     iget-object v12, v12, Lcom/google/android/flexbox/c;->Xc:[J
 
-    aget-wide v17, v12, v10
+    aget-wide v21, v12, v10
 
-    invoke-static/range {v17 .. v18}, Lcom/google/android/flexbox/c;->s(J)I
+    invoke-static/range {v21 .. v22}, Lcom/google/android/flexbox/c;->s(J)I
 
     move-result v12
 
-    invoke-static/range {v17 .. v18}, Lcom/google/android/flexbox/c;->t(J)I
+    invoke-static/range {v21 .. v22}, Lcom/google/android/flexbox/c;->t(J)I
 
     move-result v14
 
     invoke-virtual {v11}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v17
+    move-result-object v18
 
-    move-object/from16 v3, v17
+    move-object/from16 v3, v18
 
     check-cast v3, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;
 
     invoke-direct {v0, v11, v12, v14, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager;->shouldMeasureChild(Landroid/view/View;IILandroidx/recyclerview/widget/RecyclerView$LayoutParams;)Z
 
-    move-result v17
+    move-result v18
 
-    if-eqz v17, :cond_9
+    if-eqz v18, :cond_9
 
     invoke-virtual {v11, v12, v14}, Landroid/view/View;->measure(II)V
 
@@ -830,7 +842,7 @@
 
     int-to-float v12, v12
 
-    add-float v20, v13, v12
+    add-float v22, v13, v12
 
     iget v12, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->rightMargin:I
 
@@ -864,45 +876,48 @@
 
     move-result v14
 
-    sub-int v17, v13, v14
+    sub-int v18, v13, v14
 
     invoke-static/range {v23 .. v23}, Ljava/lang/Math;->round(F)I
 
-    move-result v18
+    move-result v24
 
     invoke-virtual {v11}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v13
 
-    add-int v24, v16, v13
+    add-int v25, v16, v13
 
     move-object v13, v11
 
+    move/from16 v26, v17
+
     move-object v14, v9
 
-    move/from16 v25, v15
+    move/from16 v27, v15
 
-    move/from16 v15, v17
+    move/from16 v15, v18
 
-    move/from16 v17, v18
+    move/from16 v17, v24
 
-    move/from16 v18, v24
+    move/from16 v18, v25
 
-    :goto_a
     invoke-virtual/range {v12 .. v18}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;IIII)V
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_a
-    move/from16 v25, v15
+    move/from16 v27, v15
+
+    move/from16 v26, v17
 
     iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
-    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
 
     move-result v15
 
-    invoke-static/range {v20 .. v20}, Ljava/lang/Math;->round(F)I
+    invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
 
     move-result v13
 
@@ -922,9 +937,9 @@
 
     move-object v14, v9
 
-    goto :goto_a
+    invoke-virtual/range {v12 .. v18}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;IIII)V
 
-    :goto_b
+    :goto_9
     invoke-virtual {v11}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v12
@@ -943,7 +958,7 @@
 
     add-float/2addr v12, v4
 
-    add-float v20, v20, v12
+    add-float v22, v22, v12
 
     invoke-virtual {v11}, Landroid/view/View;->getMeasuredWidth()I
 
@@ -967,32 +982,32 @@
 
     move/from16 v12, v19
 
-    move/from16 v13, v20
+    move/from16 v13, v22
 
     move/from16 v16, v23
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_b
-    move/from16 v22, v3
+    move/from16 v20, v3
 
-    move/from16 v21, v14
+    move/from16 v26, v14
 
-    move/from16 v25, v15
+    move/from16 v27, v15
 
-    :goto_c
+    :goto_a
     add-int/lit8 v10, v10, 0x1
 
-    move/from16 v14, v21
+    move/from16 v3, v20
 
-    move/from16 v3, v22
+    move/from16 v14, v26
 
-    move/from16 v15, v25
+    move/from16 v15, v27
 
     goto/16 :goto_7
 
     :cond_c
-    move/from16 v22, v3
+    move/from16 v20, v3
 
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->XM:I
 
@@ -1006,16 +1021,16 @@
 
     iget v3, v9, Lcom/google/android/flexbox/b;->WQ:I
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_d
-    move/from16 v22, v3
+    move/from16 v20, v3
 
     invoke-direct {v0, v9, v2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Lcom/google/android/flexbox/b;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
     move-result v3
 
-    :goto_d
+    :goto_b
     add-int/2addr v8, v3
 
     if-nez v6, :cond_e
@@ -1034,7 +1049,9 @@
 
     sub-int/2addr v3, v4
 
-    goto :goto_e
+    iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
+
+    goto :goto_c
 
     :cond_e
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
@@ -1047,20 +1064,23 @@
 
     add-int/2addr v3, v4
 
-    :goto_e
     iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
+    :goto_c
     iget v3, v9, Lcom/google/android/flexbox/b;->WQ:I
 
     sub-int/2addr v5, v3
 
-    move/from16 v3, v22
+    move/from16 v3, v20
 
     const/high16 v4, -0x80000000
 
     goto/16 :goto_0
 
-    :goto_f
+    :cond_f
+    move/from16 v20, v3
+
+    :goto_d
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
     sub-int/2addr v3, v8
@@ -1071,7 +1091,7 @@
 
     const/high16 v4, -0x80000000
 
-    if-eq v3, v4, :cond_10
+    if-eq v3, v4, :cond_11
 
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
@@ -1081,7 +1101,7 @@
 
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
-    if-gez v3, :cond_f
+    if-gez v3, :cond_10
 
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
@@ -1091,16 +1111,18 @@
 
     iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
-    :cond_f
+    :cond_10
     invoke-direct {v0, v1, v2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)V
 
-    :cond_10
+    :cond_11
     iget v1, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
-    sub-int v3, v22, v1
+    sub-int v3, v20, v1
 
     return v3
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
@@ -1158,11 +1180,18 @@
 
     add-int/2addr v5, v6
 
+    move v11, v4
+
+    move v12, v5
+
+    goto :goto_0
+
     :cond_0
     move v11, v4
 
     move v12, v5
 
+    :goto_0
     iget v13, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
     iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xi:I
@@ -1212,12 +1241,12 @@
 
     div-float/2addr v4, v7
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     const/4 v4, 0x0
 
-    :goto_0
+    :goto_1
     int-to-float v1, v1
 
     div-float v6, v4, v6
@@ -1245,12 +1274,12 @@
 
     int-to-float v4, v4
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     const/high16 v4, 0x3f800000    # 1.0f
 
-    :goto_1
+    :goto_2
     iget v6, v9, Lcom/google/android/flexbox/b;->WO:I
 
     sub-int v6, v3, v6
@@ -1292,7 +1321,9 @@
 
     sub-float/2addr v2, v3
 
-    goto :goto_2
+    const/4 v4, 0x0
+
+    goto :goto_3
 
     :pswitch_3
     iget v4, v9, Lcom/google/android/flexbox/b;->WO:I
@@ -1326,7 +1357,6 @@
 
     int-to-float v2, v3
 
-    :goto_2
     const/4 v4, 0x0
 
     :goto_3
@@ -1424,7 +1454,7 @@
 
     int-to-float v1, v1
 
-    sub-float v17, v2, v1
+    sub-float v18, v2, v1
 
     iget v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
@@ -1438,10 +1468,9 @@
 
     invoke-virtual {v0, v6}, Lcom/google/android/flexbox/FlexboxLayoutManager;->addView(Landroid/view/View;)V
 
-    :goto_5
-    move/from16 v18, v3
+    move/from16 v17, v3
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_4
     sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->XB:Landroid/graphics/Rect;
@@ -1452,9 +1481,9 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_5
+    move/from16 v17, v3
 
-    :goto_6
+    :goto_5
     invoke-virtual {v0, v6}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getLeftDecorationWidth(Landroid/view/View;)I
 
     move-result v1
@@ -1467,9 +1496,9 @@
 
     sub-int v20, v12, v1
 
-    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
+    iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    if-eqz v1, :cond_6
+    if-eqz v4, :cond_6
 
     iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XC:Z
 
@@ -1477,15 +1506,13 @@
 
     iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
-    iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
-
     invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v2
 
     sub-int v19, v20, v2
 
-    invoke-static/range {v17 .. v17}, Ljava/lang/Math;->round(F)I
+    invoke-static/range {v18 .. v18}, Ljava/lang/Math;->round(F)I
 
     move-result v2
 
@@ -1495,7 +1522,7 @@
 
     sub-int v21, v2, v3
 
-    invoke-static/range {v17 .. v17}, Ljava/lang/Math;->round(F)I
+    invoke-static/range {v18 .. v18}, Ljava/lang/Math;->round(F)I
 
     move-result v22
 
@@ -1519,10 +1546,9 @@
 
     move/from16 v8, v22
 
-    :goto_7
     invoke-virtual/range {v1 .. v8}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
 
-    goto/16 :goto_9
+    goto/16 :goto_6
 
     :cond_5
     move-object/from16 v24, v6
@@ -1535,8 +1561,6 @@
 
     iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
-    iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
-
     invoke-virtual/range {v24 .. v24}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v2
@@ -1563,7 +1587,9 @@
 
     move/from16 v7, v20
 
-    goto :goto_7
+    invoke-virtual/range {v1 .. v8}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
+
+    goto :goto_6
 
     :cond_6
     move-object/from16 v24, v6
@@ -1580,9 +1606,7 @@
 
     iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
-    iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
-
-    invoke-static/range {v17 .. v17}, Ljava/lang/Math;->round(F)I
+    invoke-static/range {v18 .. v18}, Ljava/lang/Math;->round(F)I
 
     move-result v2
 
@@ -1598,24 +1622,23 @@
 
     add-int v7, v19, v2
 
-    invoke-static/range {v17 .. v17}, Ljava/lang/Math;->round(F)I
+    invoke-static/range {v18 .. v18}, Ljava/lang/Math;->round(F)I
 
     move-result v8
 
-    :goto_8
     move-object/from16 v2, v24
 
     move-object/from16 v3, p1
 
     move/from16 v5, v19
 
-    goto :goto_7
+    invoke-virtual/range {v1 .. v8}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
+
+    goto :goto_6
 
     :cond_7
     iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
-    iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
-
     invoke-static/range {v16 .. v16}, Ljava/lang/Math;->round(F)I
 
     move-result v6
@@ -1636,9 +1659,15 @@
 
     add-int v8, v2, v3
 
-    goto :goto_8
+    move-object/from16 v2, v24
 
-    :goto_9
+    move-object/from16 v3, p1
+
+    move/from16 v5, v19
+
+    invoke-virtual/range {v1 .. v8}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Lcom/google/android/flexbox/b;ZIIII)V
+
+    :goto_6
     invoke-virtual/range {v24 .. v24}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v1
@@ -1679,15 +1708,15 @@
 
     add-float/2addr v1, v15
 
-    sub-float v17, v17, v1
+    sub-float v18, v18, v1
 
     move/from16 v1, v16
 
-    move/from16 v2, v17
+    move/from16 v3, v17
 
-    move/from16 v3, v18
+    move/from16 v2, v18
 
-    goto :goto_a
+    goto :goto_7
 
     :cond_8
     move/from16 v21, v7
@@ -1696,7 +1725,7 @@
 
     const/16 v23, 0x1
 
-    :goto_a
+    :goto_7
     add-int/lit8 v7, v21, 0x1
 
     move/from16 v8, v25
@@ -1720,6 +1749,8 @@
 
     return v1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_4
@@ -1733,7 +1764,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;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -1838,7 +1869,7 @@
 
     if-eqz p3, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kn()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->km()V
 
     goto :goto_0
 
@@ -1850,7 +1881,7 @@
     iput-boolean v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result p3
 
@@ -1870,6 +1901,10 @@
 
     move-result v1
 
+    sub-int/2addr v0, v1
+
+    iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
+
     goto :goto_1
 
     :cond_1
@@ -1885,11 +1920,11 @@
 
     move-result v1
 
-    :goto_1
     sub-int/2addr v0, v1
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
+    :goto_1
     iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
@@ -1904,12 +1939,8 @@
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mItemDirection:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->j(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v1
@@ -1922,8 +1953,6 @@
 
     iput v1, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->f(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v1
@@ -2059,7 +2088,7 @@
 
     iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result p1
 
@@ -2083,7 +2112,6 @@
 
     add-int/2addr p1, v0
 
-    :goto_0
     iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
     return-void
@@ -2103,7 +2131,9 @@
 
     sub-int/2addr p1, v0
 
-    goto :goto_0
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
+
+    return-void
 .end method
 
 .method private aQ(I)Landroid/view/View;
@@ -2218,12 +2248,12 @@
 
     if-nez p1, :cond_0
 
-    goto :goto_4
+    goto/16 :goto_3
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kn()V
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -2270,7 +2300,7 @@
     const/4 v1, 0x1
 
     :cond_3
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_5
 
     invoke-static {p1}, Ljava/lang/Math;->abs(I)I
 
@@ -2292,10 +2322,9 @@
 
     move-result p1
 
-    :goto_2
     neg-int p1, p1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
@@ -2308,17 +2337,18 @@
 
     if-lez v0, :cond_8
 
-    :cond_5
     iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result p1
 
+    neg-int p1, p1
+
     goto :goto_2
 
-    :cond_6
-    if-lez p1, :cond_7
+    :cond_5
+    if-lez p1, :cond_6
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
@@ -2334,9 +2364,9 @@
 
     move-result p1
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_7
+    :cond_6
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
@@ -2345,14 +2375,25 @@
 
     add-int/2addr v0, p1
 
-    if-ltz v0, :cond_5
+    if-ltz v0, :cond_7
+
+    goto :goto_2
+
+    :cond_7
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+
+    invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
+
+    move-result p1
+
+    neg-int p1, p1
 
     :cond_8
-    :goto_3
+    :goto_2
     return p1
 
     :cond_9
-    :goto_4
+    :goto_3
     return v1
 .end method
 
@@ -2367,7 +2408,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;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -2575,7 +2616,7 @@
 
     if-eqz p3, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kn()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->km()V
 
     goto :goto_0
 
@@ -2587,7 +2628,7 @@
     iput-boolean v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result p3
 
@@ -2611,16 +2652,6 @@
 
     sub-int/2addr v0, v1
 
-    goto :goto_1
-
-    :cond_1
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
-    invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->j(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
-
-    move-result v0
-
-    :goto_1
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v1}, Landroidx/recyclerview/widget/OrientationHelper;->getStartAfterPadding()I
@@ -2631,6 +2662,26 @@
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
+    goto :goto_1
+
+    :cond_1
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+
+    invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->j(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
+
+    move-result v0
+
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
+
+    invoke-virtual {v1}, Landroidx/recyclerview/widget/OrientationHelper;->getStartAfterPadding()I
+
+    move-result v1
+
+    sub-int/2addr v0, v1
+
+    iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
+
+    :goto_1
     iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
@@ -2645,14 +2696,10 @@
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mItemDirection:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
     const/4 v0, -0x1
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->j(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v0
@@ -2665,8 +2712,6 @@
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->f(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v0
@@ -2837,13 +2882,13 @@
 .method private c(Landroid/view/View;I)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_1
 
@@ -2867,10 +2912,10 @@
 
     if-gt v0, p2, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -2881,10 +2926,10 @@
 
     if-gt p1, p2, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 .method private c(Landroid/view/View;Z)Z
@@ -3046,7 +3091,7 @@
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kn()V
 
     invoke-direct {p0, v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->aQ(I)Landroid/view/View;
 
@@ -3130,13 +3175,13 @@
 
     move-result p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
-    if-eqz v2, :cond_3
+    if-eqz v2, :cond_4
 
     if-nez v0, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     invoke-virtual {p0, v2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getPosition(Landroid/view/View;)I
@@ -3227,6 +3272,10 @@
     :cond_3
     :goto_0
     return v1
+
+    :cond_4
+    :goto_1
+    return v1
 .end method
 
 .method private computeScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;)I
@@ -3332,13 +3381,13 @@
 .method private d(Landroid/view/View;I)Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_1
 
@@ -3354,10 +3403,10 @@
 
     if-gt p1, p2, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -3376,10 +3425,10 @@
 
     if-lt p1, v0, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 .method static synthetic e(Lcom/google/android/flexbox/FlexboxLayoutManager;)Lcom/google/android/flexbox/c;
@@ -3474,7 +3523,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;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -3567,7 +3616,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;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -3640,6 +3689,8 @@
 
     sub-int/2addr p2, p1
 
+    return p2
+
     :cond_2
     return p2
 
@@ -3650,7 +3701,7 @@
 .method private g(III)Landroid/view/View;
     .locals 7
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kn()V
 
     invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
@@ -3810,7 +3861,7 @@
     return v1
 .end method
 
-.method private km()V
+.method private kl()V
     .locals 2
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xj:I
@@ -3821,7 +3872,7 @@
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->removeAllViews()V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kp()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
 
     iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xj:I
 
@@ -3831,10 +3882,10 @@
     return-void
 .end method
 
-.method private kn()V
+.method private km()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -3877,7 +3928,7 @@
     return-void
 .end method
 
-.method private ko()V
+.method private kn()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -3887,7 +3938,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -3897,7 +3948,6 @@
 
     if-eqz v0, :cond_2
 
-    :goto_0
     invoke-static {p0}, Landroidx/recyclerview/widget/OrientationHelper;->createVerticalHelper(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
     move-result-object v0
@@ -3908,7 +3958,6 @@
 
     move-result-object v0
 
-    :goto_1
     iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XF:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
@@ -3918,7 +3967,19 @@
 
     if-nez v0, :cond_2
 
-    goto :goto_0
+    invoke-static {p0}, Landroidx/recyclerview/widget/OrientationHelper;->createVerticalHelper(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
+
+    invoke-static {p0}, Landroidx/recyclerview/widget/OrientationHelper;->createHorizontalHelper(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XF:Landroidx/recyclerview/widget/OrientationHelper;
+
+    return-void
 
     :cond_2
     invoke-static {p0}, Landroidx/recyclerview/widget/OrientationHelper;->createHorizontalHelper(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
@@ -3931,10 +3992,12 @@
 
     move-result-object v0
 
-    goto :goto_1
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XF:Landroidx/recyclerview/widget/OrientationHelper;
+
+    return-void
 .end method
 
-.method private kp()V
+.method private ko()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
@@ -3987,7 +4050,7 @@
 
     iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XF:Landroidx/recyclerview/widget/OrientationHelper;
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kp()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
 
@@ -4004,13 +4067,11 @@
 
     if-eq p1, v0, :cond_1
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xh:I
-
     if-nez p1, :cond_0
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->removeAllViews()V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kp()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
 
     :cond_0
     iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xh:I
@@ -4087,7 +4148,7 @@
 
     iput p1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -4183,8 +4244,6 @@
 
     iput v4, v8, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mItemDirection:I
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
     iget v9, v8, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mItemDirection:I
 
     add-int/2addr v7, v9
@@ -4259,9 +4318,7 @@
 
     iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
-    iget v5, v5, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
+    iget v5, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
     if-ltz v5, :cond_2
 
@@ -4529,9 +4586,7 @@
 
     iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
-    iget v0, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
     if-ltz v0, :cond_a
 
@@ -4633,7 +4688,7 @@
 .method public final a(Landroid/view/View;II)I
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result p2
 
@@ -4647,7 +4702,6 @@
 
     move-result p1
 
-    :goto_0
     add-int/2addr p2, p1
 
     return p2
@@ -4661,7 +4715,9 @@
 
     move-result p1
 
-    goto :goto_0
+    add-int/2addr p2, p1
+
+    return p2
 .end method
 
 .method public final a(ILandroid/view/View;)V
@@ -4681,7 +4737,7 @@
 
     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;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result p2
 
@@ -4695,7 +4751,6 @@
 
     move-result p1
 
-    :goto_0
     add-int/2addr p2, p1
 
     iget p1, p4, Lcom/google/android/flexbox/b;->WO:I
@@ -4721,7 +4776,21 @@
 
     move-result p1
 
-    goto :goto_0
+    add-int/2addr p2, p1
+
+    iget p1, p4, Lcom/google/android/flexbox/b;->WO:I
+
+    add-int/2addr p1, p2
+
+    iput p1, p4, Lcom/google/android/flexbox/b;->WO:I
+
+    iget p1, p4, Lcom/google/android/flexbox/b;->WP:I
+
+    add-int/2addr p1, p2
+
+    iput p1, p4, Lcom/google/android/flexbox/b;->WP:I
+
+    return-void
 .end method
 
 .method public final a(Lcom/google/android/flexbox/b;)V
@@ -4790,7 +4859,7 @@
 .method public canScrollHorizontally()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -4825,7 +4894,7 @@
 .method public canScrollVertically()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -4931,7 +5000,7 @@
     const/4 p1, 0x1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -5012,7 +5081,7 @@
 .method public final g(Landroid/view/View;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -5026,7 +5095,6 @@
 
     move-result p1
 
-    :goto_0
     add-int/2addr v0, p1
 
     return v0
@@ -5040,7 +5108,9 @@
 
     move-result p1
 
-    goto :goto_0
+    add-int/2addr v0, p1
+
+    return v0
 .end method
 
 .method public generateDefaultLayoutParams()Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
@@ -5208,7 +5278,7 @@
     return v2
 .end method
 
-.method public final jZ()Z
+.method public final jY()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xg:I
@@ -5217,8 +5287,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xg:I
-
     if-ne v0, v1, :cond_0
 
     goto :goto_0
@@ -5372,20 +5440,46 @@
 
     iput-boolean v8, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    :cond_1
-    :goto_0
     iput-boolean v8, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XC:Z
 
-    goto :goto_7
+    goto :goto_6
 
     :pswitch_0
-    if-ne v4, v7, :cond_2
+    if-ne v4, v7, :cond_1
+
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v4, 0x0
+
+    :goto_0
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
+
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xh:I
+
+    if-ne v4, v6, :cond_2
+
+    iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
+
+    xor-int/2addr v4, v7
+
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
+
+    :cond_2
+    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XC:Z
+
+    goto :goto_6
+
+    :pswitch_1
+    if-ne v4, v7, :cond_3
 
     const/4 v4, 0x1
 
     goto :goto_1
 
-    :cond_2
+    :cond_3
     const/4 v4, 0x0
 
     :goto_1
@@ -5393,7 +5487,7 @@
 
     iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xh:I
 
-    if-ne v4, v6, :cond_3
+    if-ne v4, v6, :cond_4
 
     iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
@@ -5401,19 +5495,19 @@
 
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    :cond_3
-    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XC:Z
+    :cond_4
+    iput-boolean v8, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XC:Z
 
-    goto :goto_7
+    goto :goto_6
 
-    :pswitch_1
-    if-ne v4, v7, :cond_4
+    :pswitch_2
+    if-eq v4, v7, :cond_5
 
     const/4 v4, 0x1
 
     goto :goto_2
 
-    :cond_4
+    :cond_5
     const/4 v4, 0x0
 
     :goto_2
@@ -5421,43 +5515,28 @@
 
     iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xh:I
 
-    if-ne v4, v6, :cond_1
-
-    iget-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
-
-    xor-int/2addr v4, v7
-
-    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
-
-    goto :goto_0
-
-    :pswitch_2
-    if-eq v4, v7, :cond_5
+    if-ne v4, v6, :cond_6
 
     const/4 v4, 0x1
 
     goto :goto_3
 
-    :cond_5
+    :cond_6
     const/4 v4, 0x0
 
     :goto_3
-    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XC:Z
 
-    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xh:I
-
-    if-ne v4, v6, :cond_7
-
-    goto :goto_5
+    goto :goto_6
 
     :pswitch_3
-    if-ne v4, v7, :cond_6
+    if-ne v4, v7, :cond_7
 
     const/4 v4, 0x1
 
     goto :goto_4
 
-    :cond_6
+    :cond_7
     const/4 v4, 0x0
 
     :goto_4
@@ -5465,21 +5544,20 @@
 
     iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xh:I
 
-    if-ne v4, v6, :cond_7
+    if-ne v4, v6, :cond_8
 
-    :goto_5
     const/4 v4, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_7
+    :cond_8
     const/4 v4, 0x0
 
-    :goto_6
+    :goto_5
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XC:Z
 
-    :goto_7
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ko()V
+    :goto_6
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kn()V
 
     invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
@@ -5501,15 +5579,13 @@
 
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
-    if-eqz v4, :cond_8
-
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    if-eqz v4, :cond_9
 
     invoke-static {v4, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;->c(Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_9
 
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
@@ -5519,7 +5595,7 @@
 
     iput v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
-    :cond_8
+    :cond_9
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
@@ -5530,17 +5606,17 @@
 
     const/4 v6, -0x1
 
-    if-eqz v4, :cond_9
+    if-eqz v4, :cond_a
 
     iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
-    if-ne v4, v6, :cond_9
+    if-ne v4, v6, :cond_a
 
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
-    if-eqz v4, :cond_1f
+    if-eqz v4, :cond_20
 
-    :cond_9
+    :cond_a
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
@@ -5553,30 +5629,26 @@
 
     move-result v10
 
-    if-nez v10, :cond_17
+    if-nez v10, :cond_18
 
     iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
-    if-ne v10, v6, :cond_a
+    if-ne v10, v6, :cond_b
 
-    goto/16 :goto_d
+    goto/16 :goto_c
 
-    :cond_a
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
-
-    if-ltz v10, :cond_16
-
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
+    :cond_b
+    if-ltz v10, :cond_17
 
     invoke-virtual/range {p2 .. p2}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
     move-result v11
 
-    if-lt v10, v11, :cond_b
+    if-lt v10, v11, :cond_c
 
-    goto/16 :goto_c
+    goto/16 :goto_b
 
-    :cond_b
+    :cond_c
     iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
     invoke-static {v4, v10}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
@@ -5595,9 +5667,7 @@
 
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
-    if-eqz v10, :cond_c
-
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    if-eqz v10, :cond_d
 
     invoke-virtual/range {p2 .. p2}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
@@ -5607,7 +5677,7 @@
 
     move-result v10
 
-    if-eqz v10, :cond_c
+    if-eqz v10, :cond_d
 
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -5627,12 +5697,12 @@
 
     invoke-static {v4, v6}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
-    :cond_c
+    :cond_d
     iget v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
-    if-ne v9, v5, :cond_14
+    if-ne v9, v5, :cond_15
 
     iget v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
@@ -5656,11 +5726,9 @@
 
     if-le v10, v11, :cond_e
 
-    :cond_d
-    :goto_8
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->g(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :cond_e
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -5689,7 +5757,7 @@
 
     invoke-static {v4, v8}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;Z)Z
 
-    goto/16 :goto_b
+    goto/16 :goto_a
 
     :cond_f
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -5718,7 +5786,7 @@
 
     invoke-static {v4, v7}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;Z)Z
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_10
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
@@ -5741,7 +5809,7 @@
 
     add-int/2addr v9, v10
 
-    goto :goto_a
+    goto :goto_7
 
     :cond_11
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -5750,14 +5818,17 @@
 
     move-result v9
 
-    goto :goto_a
+    :goto_7
+    invoke-static {v4, v9}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->c(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
+
+    goto :goto_9
 
     :cond_12
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getChildCount()I
 
     move-result v9
 
-    if-lez v9, :cond_d
+    if-lez v9, :cond_14
 
     invoke-virtual {v0, v8}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getChildAt(I)Landroid/view/View;
 
@@ -5773,26 +5844,32 @@
 
     const/4 v9, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_13
     const/4 v9, 0x0
 
-    :goto_9
+    :goto_8
     invoke-static {v4, v9}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;Z)Z
 
-    goto :goto_8
-
     :cond_14
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->g(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
+
+    :goto_9
+    const/4 v9, 0x1
+
+    goto :goto_d
+
+    :cond_15
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v9
 
-    if-nez v9, :cond_15
+    if-nez v9, :cond_16
 
     iget-boolean v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    if-eqz v9, :cond_15
+    if-eqz v9, :cond_16
 
     iget v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
@@ -5804,9 +5881,11 @@
 
     sub-int/2addr v9, v10
 
+    invoke-static {v4, v9}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->c(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
+
     goto :goto_a
 
-    :cond_15
+    :cond_16
     iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v9}, Landroidx/recyclerview/widget/OrientationHelper;->getStartAfterPadding()I
@@ -5817,38 +5896,41 @@
 
     add-int/2addr v9, v10
 
-    :goto_a
     invoke-static {v4, v9}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->c(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    :goto_b
+    :goto_a
     const/4 v9, 0x1
 
-    goto :goto_e
+    goto :goto_d
 
-    :cond_16
-    :goto_c
+    :cond_17
+    :goto_b
     iput v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
     iput v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
-    :cond_17
-    :goto_d
     const/4 v9, 0x0
 
-    :goto_e
-    if-nez v9, :cond_1e
+    goto :goto_d
+
+    :cond_18
+    :goto_c
+    const/4 v9, 0x0
+
+    :goto_d
+    if-nez v9, :cond_1f
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getChildCount()I
 
     move-result v9
 
-    if-eqz v9, :cond_1d
+    if-eqz v9, :cond_1e
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
     move-result v9
 
-    if-eqz v9, :cond_18
+    if-eqz v9, :cond_19
 
     invoke-virtual/range {p2 .. p2}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
@@ -5858,9 +5940,9 @@
 
     move-result-object v9
 
-    goto :goto_f
+    goto :goto_e
 
-    :cond_18
+    :cond_19
     invoke-virtual/range {p2 .. p2}, Landroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
 
     move-result v9
@@ -5869,8 +5951,8 @@
 
     move-result-object v9
 
-    :goto_f
-    if-eqz v9, :cond_1d
+    :goto_e
+    if-eqz v9, :cond_1e
 
     invoke-static {v4, v9}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;Landroid/view/View;)V
 
@@ -5878,13 +5960,13 @@
 
     move-result v10
 
-    if-nez v10, :cond_1c
+    if-nez v10, :cond_1d
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->supportsPredictiveItemAnimations()Z
 
     move-result v10
 
-    if-eqz v10, :cond_1c
+    if-eqz v10, :cond_1d
 
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -5898,7 +5980,7 @@
 
     move-result v11
 
-    if-ge v10, v11, :cond_1a
+    if-ge v10, v11, :cond_1b
 
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -5912,27 +5994,27 @@
 
     move-result v10
 
-    if-ge v9, v10, :cond_19
+    if-ge v9, v10, :cond_1a
+
+    goto :goto_f
+
+    :cond_1a
+    const/4 v9, 0x0
 
     goto :goto_10
 
-    :cond_19
-    const/4 v9, 0x0
-
-    goto :goto_11
-
-    :cond_1a
-    :goto_10
+    :cond_1b
+    :goto_f
     const/4 v9, 0x1
 
-    :goto_11
-    if-eqz v9, :cond_1c
+    :goto_10
+    if-eqz v9, :cond_1d
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
     move-result v9
 
-    if-eqz v9, :cond_1b
+    if-eqz v9, :cond_1c
 
     iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -5940,28 +6022,28 @@
 
     move-result v9
 
-    goto :goto_12
+    goto :goto_11
 
-    :cond_1b
+    :cond_1c
     iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {v9}, Landroidx/recyclerview/widget/OrientationHelper;->getStartAfterPadding()I
 
     move-result v9
 
-    :goto_12
+    :goto_11
     invoke-static {v4, v9}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->c(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    :cond_1c
+    :cond_1d
     const/4 v9, 0x1
 
-    goto :goto_13
+    goto :goto_12
 
-    :cond_1d
+    :cond_1e
     const/4 v9, 0x0
 
-    :goto_13
-    if-nez v9, :cond_1e
+    :goto_12
+    if-nez v9, :cond_1f
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->g(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
 
@@ -5969,12 +6051,12 @@
 
     invoke-static {v4, v8}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    :cond_1e
+    :cond_1f
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->c(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
-    :cond_1f
+    :cond_20
     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;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
@@ -5983,20 +6065,20 @@
 
     move-result v4
 
-    if-eqz v4, :cond_20
+    if-eqz v4, :cond_21
 
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-direct {v0, v4, v8, v7}, Lcom/google/android/flexbox/FlexboxLayoutManager;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;ZZ)V
 
-    goto :goto_14
+    goto :goto_13
 
-    :cond_20
+    :cond_21
     iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE: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
 
-    :goto_14
+    :goto_13
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getWidth()I
 
     move-result v4
@@ -6029,33 +6111,31 @@
 
     move-result v11
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v12
 
-    if-eqz v12, :cond_23
+    if-eqz v12, :cond_24
 
     iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XH:I
 
-    if-eq v12, v5, :cond_21
+    if-eq v12, v5, :cond_22
 
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XH:I
-
-    if-eq v5, v10, :cond_21
+    if-eq v12, v10, :cond_22
 
     const/4 v5, 0x1
 
-    goto :goto_15
+    goto :goto_14
 
-    :cond_21
+    :cond_22
     const/4 v5, 0x0
 
-    :goto_15
+    :goto_14
     iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-boolean v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
-    if-eqz v12, :cond_22
+    if-eqz v12, :cond_23
 
     iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mContext:Landroid/content/Context;
 
@@ -6069,40 +6149,38 @@
 
     iget v12, v12, Landroid/util/DisplayMetrics;->heightPixels:I
 
-    goto :goto_16
+    goto :goto_15
 
-    :cond_22
+    :cond_23
     iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
-    :goto_16
+    :goto_15
     move v14, v12
 
     goto :goto_18
 
-    :cond_23
+    :cond_24
     iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XI:I
 
-    if-eq v12, v5, :cond_24
+    if-eq v12, v5, :cond_25
 
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XI:I
-
-    if-eq v5, v11, :cond_24
+    if-eq v12, v11, :cond_25
 
     const/4 v5, 0x1
 
-    goto :goto_17
+    goto :goto_16
 
-    :cond_24
+    :cond_25
     const/4 v5, 0x0
 
-    :goto_17
+    :goto_16
     iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-boolean v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
-    if-eqz v12, :cond_22
+    if-eqz v12, :cond_26
 
     iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mContext:Landroid/content/Context;
 
@@ -6116,7 +6194,15 @@
 
     iget v12, v12, Landroid/util/DisplayMetrics;->widthPixels:I
 
-    goto :goto_16
+    goto :goto_17
+
+    :cond_26
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+
+    iget v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
+
+    :goto_17
+    move v14, v12
 
     :goto_18
     iput v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XH:I
@@ -6125,22 +6211,22 @@
 
     iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XL:I
 
-    if-ne v10, v6, :cond_27
+    if-ne v10, v6, :cond_29
 
     iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
-    if-ne v10, v6, :cond_25
+    if-ne v10, v6, :cond_27
 
-    if-eqz v5, :cond_27
+    if-eqz v5, :cond_29
 
-    :cond_25
+    :cond_27
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
     move-result v3
 
-    if-nez v3, :cond_2c
+    if-nez v3, :cond_2e
 
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
 
@@ -6150,11 +6236,11 @@
 
     invoke-virtual {v3}, Lcom/google/android/flexbox/c$a;->reset()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v3
 
-    if-eqz v3, :cond_26
+    if-eqz v3, :cond_28
 
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
@@ -6178,7 +6264,7 @@
 
     goto :goto_19
 
-    :cond_26
+    :cond_28
     iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
     iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xu:Lcom/google/android/flexbox/c$a;
@@ -6212,7 +6298,7 @@
 
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->kk()V
+    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->kj()V
 
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
@@ -6240,14 +6326,12 @@
 
     iput v4, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->XM:I
 
-    goto/16 :goto_1d
+    goto/16 :goto_1c
 
-    :cond_27
+    :cond_29
     iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XL:I
 
-    if-eq v5, v6, :cond_28
-
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XL:I
+    if-eq v5, v6, :cond_2a
 
     iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
@@ -6261,7 +6345,7 @@
 
     goto :goto_1a
 
-    :cond_28
+    :cond_2a
     iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v5}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
@@ -6273,11 +6357,11 @@
 
     invoke-virtual {v6}, Lcom/google/android/flexbox/c$a;->reset()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jZ()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v6
 
-    if-eqz v6, :cond_2a
+    if-eqz v6, :cond_2c
 
     iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
 
@@ -6285,69 +6369,6 @@
 
     move-result v6
 
-    if-lez v6, :cond_29
-
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
-
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe: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;->Xt:Lcom/google/android/flexbox/c;
-
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xu:Lcom/google/android/flexbox/c$a;
-
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE: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;->Xe:Ljava/util/List;
-
-    move v12, v4
-
-    move v13, v9
-
-    :goto_1b
-    move v15, v5
-
-    move-object/from16 v17, v3
-
-    invoke-virtual/range {v10 .. v17}, Lcom/google/android/flexbox/c;->a(Lcom/google/android/flexbox/c$a;IIIIILjava/util/List;)V
-
-    goto :goto_1c
-
-    :cond_29
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
-
-    invoke-virtual {v6, v3}, Lcom/google/android/flexbox/c;->aK(I)V
-
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
-
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xu:Lcom/google/android/flexbox/c$a;
-
-    const/4 v15, 0x0
-
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
-
-    move v12, v4
-
-    move v13, v9
-
-    move-object/from16 v16, v3
-
-    invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->a(Lcom/google/android/flexbox/c$a;IIIILjava/util/List;)V
-
-    goto :goto_1c
-
-    :cond_2a
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
-
-    invoke-interface {v6}, Ljava/util/List;->size()I
-
-    move-result v6
-
     if-lez v6, :cond_2b
 
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
@@ -6368,9 +6389,15 @@
 
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
 
-    move v12, v9
+    move v12, v4
 
-    move v13, v4
+    move v13, v9
+
+    move v15, v5
+
+    move-object/from16 v17, v3
+
+    invoke-virtual/range {v10 .. v17}, Lcom/google/android/flexbox/c;->a(Lcom/google/android/flexbox/c$a;IIIIILjava/util/List;)V
 
     goto :goto_1b
 
@@ -6393,9 +6420,71 @@
 
     move-object/from16 v16, v3
 
+    invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->a(Lcom/google/android/flexbox/c$a;IIIILjava/util/List;)V
+
+    goto :goto_1b
+
+    :cond_2c
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
+
+    invoke-interface {v6}, Ljava/util/List;->size()I
+
+    move-result v6
+
+    if-lez v6, :cond_2d
+
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
+
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe: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;->Xt:Lcom/google/android/flexbox/c;
+
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xu:Lcom/google/android/flexbox/c$a;
+
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE: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;->Xe:Ljava/util/List;
+
+    move v12, v9
+
+    move v13, v4
+
+    move v15, v5
+
+    move-object/from16 v17, v3
+
+    invoke-virtual/range {v10 .. v17}, Lcom/google/android/flexbox/c;->a(Lcom/google/android/flexbox/c$a;IIIIILjava/util/List;)V
+
+    goto :goto_1b
+
+    :cond_2d
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
+
+    invoke-virtual {v6, v3}, Lcom/google/android/flexbox/c;->aK(I)V
+
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xt:Lcom/google/android/flexbox/c;
+
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xu:Lcom/google/android/flexbox/c$a;
+
+    const/4 v15, 0x0
+
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xe:Ljava/util/List;
+
+    move v12, v4
+
+    move v13, v9
+
+    move-object/from16 v16, v3
+
     invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->c(Lcom/google/android/flexbox/c$a;IIIILjava/util/List;)V
 
-    :goto_1c
+    :goto_1b
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->Xu:Lcom/google/android/flexbox/c$a;
 
     iget-object v3, v3, Lcom/google/android/flexbox/c$a;->Xe:Ljava/util/List;
@@ -6410,15 +6499,15 @@
 
     invoke-virtual {v3, v5}, Lcom/google/android/flexbox/c;->aH(I)V
 
-    :cond_2c
-    :goto_1d
+    :cond_2e
+    :goto_1c
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_2d
+    if-eqz v3, :cond_2f
 
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
@@ -6440,9 +6529,9 @@
 
     iget v4, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    goto :goto_1e
+    goto :goto_1d
 
-    :cond_2d
+    :cond_2f
     iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XD: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
@@ -6463,12 +6552,12 @@
 
     iget v3, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    :goto_1e
+    :goto_1d
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getChildCount()I
 
     move-result v5
 
-    if-lez v5, :cond_2f
+    if-lez v5, :cond_31
 
     iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XE:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
@@ -6476,7 +6565,7 @@
 
     move-result v5
 
-    if-eqz v5, :cond_2e
+    if-eqz v5, :cond_30
 
     invoke-direct {v0, v4, v1, v2, v7}, Lcom/google/android/flexbox/FlexboxLayoutManager;->fixLayoutEndGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
@@ -6488,7 +6577,7 @@
 
     return-void
 
-    :cond_2e
+    :cond_30
     invoke-direct {v0, v3, v1, v2, v7}, Lcom/google/android/flexbox/FlexboxLayoutManager;->fixLayoutStartGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
     move-result v3
@@ -6497,7 +6586,7 @@
 
     invoke-direct {v0, v4, v1, v2, v8}, Lcom/google/android/flexbox/FlexboxLayoutManager;->fixLayoutEndGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 
-    :cond_2f
+    :cond_31
     return-void
 
     nop
@@ -6567,13 +6656,11 @@
 
     if-eqz v0, :cond_0
 
-    new-instance v0, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    new-instance v2, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    invoke-direct {v2, v0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;-><init>(Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;B)V
 
-    invoke-direct {v0, v2, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;-><init>(Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;B)V
-
-    return-object v0
+    return-object v2
 
     :cond_0
     new-instance v0, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
@@ -6624,7 +6711,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;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
@@ -6677,8 +6764,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->XG:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
-
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;)V
 
     :cond_0
@@ -6690,7 +6775,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;->jZ()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->jY()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/flexbox/R$a.smali b/com.discord/smali/com/google/android/flexbox/R$a.smali
index a75f2a1020..d0e530e92d 100644
--- a/com.discord/smali/com/google/android/flexbox/R$a.smali
+++ b/com.discord/smali/com/google/android/flexbox/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/flexbox/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/flexbox/R.smali b/com.discord/smali/com/google/android/flexbox/R.smali
index 0d26a6ae0f..1e0926e46f 100644
--- a/com.discord/smali/com/google/android/flexbox/R.smali
+++ b/com.discord/smali/com/google/android/flexbox/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/flexbox/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/flexbox/a.smali b/com.discord/smali/com/google/android/flexbox/a.smali
index 90bfbace75..738d4c4cfe 100644
--- a/com.discord/smali/com/google/android/flexbox/a.smali
+++ b/com.discord/smali/com/google/android/flexbox/a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/flexbox/a;
 .super Ljava/lang/Object;
+.source "FlexContainer.java"
 
 
 # virtual methods
@@ -80,7 +81,7 @@
 .method public abstract getSumOfCrossSize()I
 .end method
 
-.method public abstract jZ()Z
+.method public abstract jY()Z
 .end method
 
 .method public abstract setFlexLines(Ljava/util/List;)V
diff --git a/com.discord/smali/com/google/android/flexbox/b.smali b/com.discord/smali/com/google/android/flexbox/b.smali
index d3cb1eb2d0..002a104785 100644
--- a/com.discord/smali/com/google/android/flexbox/b.smali
+++ b/com.discord/smali/com/google/android/flexbox/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/flexbox/b;
 .super Ljava/lang/Object;
+.source "FlexLine.java"
 
 
 # instance fields
@@ -88,7 +89,7 @@
 
     move-result v2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result v3
 
@@ -108,7 +109,7 @@
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result v2
 
@@ -128,7 +129,7 @@
 
     move-result p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result v1
 
@@ -148,7 +149,7 @@
 
     move-result p1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p3
 
@@ -165,7 +166,7 @@
     return-void
 .end method
 
-.method public final kj()I
+.method public final ki()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/flexbox/b;->mItemCount:I
diff --git a/com.discord/smali/com/google/android/flexbox/c$a.smali b/com.discord/smali/com/google/android/flexbox/c$a.smali
index bbfce25eb0..8d8350afcc 100644
--- a/com.discord/smali/com/google/android/flexbox/c$a.smali
+++ b/com.discord/smali/com/google/android/flexbox/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/flexbox/c$a;
 .super Ljava/lang/Object;
+.source "FlexboxHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/flexbox/c$b.smali b/com.discord/smali/com/google/android/flexbox/c$b.smali
index c943e26b35..1c8e5dd5f6 100644
--- a/com.discord/smali/com/google/android/flexbox/c$b.smali
+++ b/com.discord/smali/com/google/android/flexbox/c$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/flexbox/c$b;
 .super Ljava/lang/Object;
+.source "FlexboxHelper.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
@@ -65,12 +66,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lcom/google/android/flexbox/c$b;->order:I
-
-    iget p1, p1, Lcom/google/android/flexbox/c$b;->order:I
-
-    :goto_0
-    sub-int/2addr v0, p1
+    sub-int/2addr v0, v1
 
     return v0
 
@@ -79,7 +75,9 @@
 
     iget p1, p1, Lcom/google/android/flexbox/c$b;->index:I
 
-    goto :goto_0
+    sub-int/2addr v0, p1
+
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/google/android/flexbox/c.smali b/com.discord/smali/com/google/android/flexbox/c.smali
index d6cb19ceef..912e0cc6de 100644
--- a/com.discord/smali/com/google/android/flexbox/c.smali
+++ b/com.discord/smali/com/google/android/flexbox/c.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/flexbox/c;
 .super Ljava/lang/Object;
+.source "FlexboxHelper.java"
 
 
 # annotations
@@ -53,7 +54,7 @@
     return-void
 .end method
 
-.method private E(Z)I
+.method private D(Z)I
     .locals 0
 
     if-eqz p1, :cond_0
@@ -76,7 +77,7 @@
     return p1
 .end method
 
-.method private F(Z)I
+.method private E(Z)I
     .locals 0
 
     if-eqz p1, :cond_0
@@ -99,7 +100,7 @@
     return p1
 .end method
 
-.method private G(Z)I
+.method private F(Z)I
     .locals 0
 
     if-eqz p1, :cond_0
@@ -122,7 +123,7 @@
     return p1
 .end method
 
-.method private H(Z)I
+.method private G(Z)I
     .locals 0
 
     if-eqz p1, :cond_0
@@ -162,13 +163,13 @@
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result v2
 
@@ -198,7 +199,6 @@
 
     move-result p2
 
-    :goto_0
     invoke-static {p1}, Landroid/view/View$MeasureSpec;->getMode(I)I
 
     move-result p1
@@ -207,7 +207,7 @@
 
     move-result p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->getMinWidth()I
@@ -220,10 +220,16 @@
 
     move-result p2
 
-    goto :goto_0
+    invoke-static {p1}, Landroid/view/View$MeasureSpec;->getMode(I)I
+
+    move-result p1
+
+    invoke-static {p2, p1}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result p1
 
     :cond_1
-    :goto_1
+    :goto_0
     return p1
 .end method
 
@@ -341,8 +347,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xc:[J
-
     invoke-static {p2, p3}, Lcom/google/android/flexbox/c;->r(II)J
 
     move-result-wide p2
@@ -354,8 +358,6 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->Xd:[J
-
     invoke-virtual {p4}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result p3
@@ -394,13 +396,13 @@
 
     cmpg-float v5, v5, v6
 
-    if-lez v5, :cond_14
+    if-lez v5, :cond_15
 
     iget v5, v1, Lcom/google/android/flexbox/b;->WO:I
 
     if-ge v2, v5, :cond_0
 
-    goto/16 :goto_c
+    goto/16 :goto_a
 
     :cond_0
     iget v5, v1, Lcom/google/android/flexbox/b;->WO:I
@@ -473,467 +475,214 @@
 
     move-result v14
 
-    const-wide/high16 v15, -0x4010000000000000L    # -1.0
+    const-wide/high16 v16, -0x4010000000000000L    # -1.0
 
-    const/16 v17, 0x20
+    const/16 v18, 0x20
 
-    const-wide/high16 v18, 0x3ff0000000000000L    # 1.0
+    const-wide/high16 v19, 0x3ff0000000000000L    # 1.0
 
     if-eqz v14, :cond_a
 
     if-ne v14, v3, :cond_2
 
-    goto/16 :goto_6
+    goto/16 :goto_5
 
     :cond_2
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v14
 
-    iget-object v6, v0, Lcom/google/android/flexbox/c;->Xd:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->Xd:[J
 
-    if-eqz v6, :cond_3
+    if-eqz v15, :cond_3
 
-    iget-object v6, v0, Lcom/google/android/flexbox/c;->Xd:[J
+    aget-wide v14, v15, v11
 
-    aget-wide v20, v6, v11
+    shr-long v14, v14, v18
 
-    move/from16 v22, v4
-
-    shr-long v3, v20, v17
-
-    long-to-int v14, v3
-
-    goto :goto_2
+    long-to-int v14, v14
 
     :cond_3
-    move/from16 v22, v4
-
-    :goto_2
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
 
-    move-result v3
-
-    iget-object v4, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    if-eqz v4, :cond_4
+    move-result v15
 
     iget-object v3, v0, Lcom/google/android/flexbox/c;->Xd:[J
 
-    aget-wide v2, v3, v11
+    if-eqz v3, :cond_4
 
-    long-to-int v3, v2
+    move/from16 v21, v7
+
+    aget-wide v6, v3, v11
+
+    long-to-int v15, v6
+
+    goto :goto_2
 
     :cond_4
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+    move/from16 v21, v7
 
-    aget-boolean v2, v2, v11
+    :goto_2
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xa:[Z
 
-    if-nez v2, :cond_9
+    aget-boolean v3, v3, v11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
+    if-nez v3, :cond_9
 
-    move-result v2
-
-    const/4 v4, 0x0
-
-    cmpl-float v2, v2, v4
-
-    if-lez v2, :cond_9
-
-    int-to-float v2, v14
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->jZ()F
 
     move-result v3
 
-    mul-float v3, v3, v7
+    const/4 v6, 0x0
 
-    add-float/2addr v2, v3
+    cmpl-float v3, v3, v6
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->mItemCount:I
+    if-lez v3, :cond_9
 
-    const/4 v4, 0x1
+    int-to-float v3, v14
 
-    sub-int/2addr v3, v4
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->jZ()F
 
-    move/from16 v6, v22
+    move-result v6
 
-    if-ne v6, v3, :cond_5
+    mul-float v7, v21, v6
 
-    add-float/2addr v2, v9
+    add-float/2addr v3, v7
+
+    iget v6, v1, Lcom/google/android/flexbox/b;->mItemCount:I
+
+    const/4 v7, 0x1
+
+    sub-int/2addr v6, v7
+
+    if-ne v4, v6, :cond_5
+
+    add-float/2addr v3, v9
 
     const/4 v9, 0x0
 
     :cond_5
-    invoke-static {v2}, Ljava/lang/Math;->round(F)I
+    invoke-static {v3}, Ljava/lang/Math;->round(F)I
 
-    move-result v3
+    move-result v6
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMaxHeight()I
 
     move-result v14
 
-    if-le v3, v14, :cond_6
+    if-le v6, v14, :cond_6
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMaxHeight()I
 
-    move-result v3
+    move-result v6
 
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xa:[Z
 
-    aput-boolean v4, v2, v11
+    aput-boolean v7, v3, v11
 
-    iget v2, v1, Lcom/google/android/flexbox/b;->WT:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->WT:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->jZ()F
 
-    move-result v4
+    move-result v7
 
-    sub-float/2addr v2, v4
+    sub-float/2addr v3, v7
 
-    iput v2, v1, Lcom/google/android/flexbox/b;->WT:F
-
-    move/from16 v23, v5
+    iput v3, v1, Lcom/google/android/flexbox/b;->WT:F
 
     const/4 v8, 0x1
 
-    goto :goto_4
-
-    :cond_6
-    int-to-float v4, v3
-
-    sub-float/2addr v2, v4
-
-    add-float/2addr v9, v2
-
-    move/from16 v23, v5
-
-    float-to-double v4, v9
-
-    cmpl-double v2, v4, v18
-
-    if-lez v2, :cond_7
-
-    add-int/lit8 v3, v3, 0x1
-
-    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
-
-    sub-double v4, v4, v18
-
-    :goto_3
-    double-to-float v2, v4
-
-    move v9, v2
-
-    goto :goto_4
-
-    :cond_7
-    cmpg-double v2, v4, v15
-
-    if-gez v2, :cond_8
-
-    add-int/lit8 v3, v3, -0x1
-
-    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
-
-    add-double v4, v4, v18
-
     goto :goto_3
 
+    :cond_6
+    int-to-float v7, v6
+
+    sub-float/2addr v3, v7
+
+    add-float/2addr v9, v3
+
+    float-to-double v14, v9
+
+    cmpl-double v3, v14, v19
+
+    if-lez v3, :cond_7
+
+    add-int/lit8 v6, v6, 0x1
+
+    invoke-static {v14, v15}, Ljava/lang/Double;->isNaN(D)Z
+
+    sub-double v14, v14, v19
+
+    double-to-float v3, v14
+
+    move v9, v3
+
+    goto :goto_3
+
+    :cond_7
+    cmpg-double v3, v14, v16
+
+    if-gez v3, :cond_8
+
+    add-int/lit8 v6, v6, -0x1
+
+    invoke-static {v14, v15}, Ljava/lang/Double;->isNaN(D)Z
+
+    add-double v14, v14, v19
+
+    double-to-float v3, v14
+
+    move v9, v3
+
     :cond_8
-    :goto_4
-    iget v2, v1, Lcom/google/android/flexbox/b;->WW:I
+    :goto_3
+    iget v3, v1, Lcom/google/android/flexbox/b;->WW:I
 
-    move/from16 v4, p1
+    move/from16 v7, p1
 
-    invoke-direct {v0, v4, v13, v2}, Lcom/google/android/flexbox/c;->a(ILcom/google/android/flexbox/FlexItem;I)I
-
-    move-result v2
-
-    const/high16 v5, 0x40000000    # 2.0f
-
-    invoke-static {v3, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    invoke-direct {v0, v7, v13, v3}, Lcom/google/android/flexbox/c;->a(ILcom/google/android/flexbox/FlexItem;I)I
 
     move-result v3
 
-    invoke-virtual {v12, v2, v3}, Landroid/view/View;->measure(II)V
+    const/high16 v14, 0x40000000    # 2.0f
+
+    invoke-static {v6, v14}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v6
+
+    invoke-virtual {v12, v3, v6}, Landroid/view/View;->measure(II)V
 
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
 
-    move-result v5
+    move-result v15
 
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v14
 
-    invoke-direct {v0, v11, v2, v3, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
+    invoke-direct {v0, v11, v3, v6, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v2, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
-    move v3, v5
-
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
-    move/from16 v4, p1
+    move/from16 v7, p1
 
-    move/from16 v23, v5
-
-    move/from16 v6, v22
-
-    :goto_5
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kf()I
-
-    move-result v2
-
-    add-int/2addr v3, v2
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kh()I
-
-    move-result v2
-
-    add-int/2addr v3, v2
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
-
-    invoke-interface {v2, v12}, Lcom/google/android/flexbox/a;->g(Landroid/view/View;)I
-
-    move-result v2
-
-    add-int/2addr v3, v2
-
-    invoke-static {v10, v3}, Ljava/lang/Math;->max(II)I
-
-    move-result v2
-
-    iget v3, v1, Lcom/google/android/flexbox/b;->WO:I
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kg()I
-
-    move-result v5
-
-    add-int/2addr v14, v5
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ki()I
-
-    move-result v5
-
-    add-int/2addr v14, v5
-
-    add-int/2addr v3, v14
-
-    iput v3, v1, Lcom/google/android/flexbox/b;->WO:I
-
-    move/from16 v4, p2
-
-    goto/16 :goto_a
-
-    :cond_a
-    :goto_6
-    move v6, v4
-
-    move/from16 v23, v5
-
-    move/from16 v4, p1
-
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v2
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    if-eqz v3, :cond_b
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    aget-wide v3, v2, v11
-
-    long-to-int v2, v3
-
-    :cond_b
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
+    :goto_4
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result v3
 
-    iget-object v4, v0, Lcom/google/android/flexbox/c;->Xd:[J
+    add-int/2addr v15, v3
 
-    if-eqz v4, :cond_c
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    aget-wide v4, v3, v11
-
-    shr-long v3, v4, v17
-
-    long-to-int v3, v3
-
-    :cond_c
-    iget-object v4, v0, Lcom/google/android/flexbox/c;->Xa:[Z
-
-    aget-boolean v4, v4, v11
-
-    if-nez v4, :cond_11
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
-
-    move-result v4
-
-    const/4 v5, 0x0
-
-    cmpl-float v4, v4, v5
-
-    if-lez v4, :cond_11
-
-    int-to-float v2, v2
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
-
-    move-result v3
-
-    mul-float v3, v3, v7
-
-    add-float/2addr v2, v3
-
-    iget v3, v1, Lcom/google/android/flexbox/b;->mItemCount:I
-
-    const/4 v4, 0x1
-
-    sub-int/2addr v3, v4
-
-    if-ne v6, v3, :cond_d
-
-    add-float/2addr v2, v9
-
-    const/4 v9, 0x0
-
-    :cond_d
-    invoke-static {v2}, Ljava/lang/Math;->round(F)I
-
-    move-result v3
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMaxWidth()I
-
-    move-result v14
-
-    if-le v3, v14, :cond_e
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMaxWidth()I
-
-    move-result v3
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xa:[Z
-
-    aput-boolean v4, v2, v11
-
-    iget v2, v1, Lcom/google/android/flexbox/b;->WT:F
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
-
-    move-result v8
-
-    sub-float/2addr v2, v8
-
-    iput v2, v1, Lcom/google/android/flexbox/b;->WT:F
-
-    const/4 v8, 0x1
-
-    goto :goto_8
-
-    :cond_e
-    int-to-float v14, v3
-
-    sub-float/2addr v2, v14
-
-    add-float/2addr v9, v2
-
-    float-to-double v4, v9
-
-    cmpl-double v2, v4, v18
-
-    if-lez v2, :cond_f
-
-    add-int/lit8 v3, v3, 0x1
-
-    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
-
-    sub-double v4, v4, v18
-
-    :goto_7
-    double-to-float v2, v4
-
-    move v9, v2
-
-    goto :goto_8
-
-    :cond_f
-    cmpg-double v2, v4, v15
-
-    if-gez v2, :cond_10
-
-    add-int/lit8 v3, v3, -0x1
-
-    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
-
-    add-double v4, v4, v18
-
-    goto :goto_7
-
-    :cond_10
-    :goto_8
-    iget v2, v1, Lcom/google/android/flexbox/b;->WW:I
-
-    move/from16 v4, p2
-
-    invoke-direct {v0, v4, v13, v2}, Lcom/google/android/flexbox/c;->b(ILcom/google/android/flexbox/FlexItem;I)I
-
-    move-result v2
-
-    const/high16 v5, 0x40000000    # 2.0f
-
-    invoke-static {v3, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
-
-    move-result v3
-
-    invoke-virtual {v12, v3, v2}, Landroid/view/View;->measure(II)V
-
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v5
-
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v14
-
-    invoke-direct {v0, v11, v3, v2, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
-
-    invoke-interface {v2, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
-
-    move v2, v5
-
-    goto :goto_9
-
-    :cond_11
-    move/from16 v4, p2
-
-    move v14, v3
-
-    :goto_9
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result v3
 
-    add-int/2addr v14, v3
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ki()I
-
-    move-result v3
-
-    add-int/2addr v14, v3
+    add-int/2addr v15, v3
 
     iget-object v3, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
@@ -941,60 +690,287 @@
 
     move-result v3
 
-    add-int/2addr v14, v3
+    add-int/2addr v15, v3
 
-    invoke-static {v10, v14}, Ljava/lang/Math;->max(II)I
+    invoke-static {v10, v15}, Ljava/lang/Math;->max(II)I
 
     move-result v3
 
-    iget v5, v1, Lcom/google/android/flexbox/b;->WO:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->WO:I
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result v10
 
-    add-int/2addr v2, v10
+    add-int/2addr v14, v10
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result v10
 
-    add-int/2addr v2, v10
+    add-int/2addr v14, v10
 
-    add-int/2addr v5, v2
+    add-int/2addr v6, v14
 
-    iput v5, v1, Lcom/google/android/flexbox/b;->WO:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->WO:I
 
-    move v2, v3
+    move/from16 v14, p2
 
-    :goto_a
-    iget v3, v1, Lcom/google/android/flexbox/b;->WQ:I
+    goto/16 :goto_8
 
-    invoke-static {v3, v2}, Ljava/lang/Math;->max(II)I
+    :cond_a
+    :goto_5
+    move/from16 v21, v7
+
+    move/from16 v7, p1
+
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v3
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->WQ:I
+    iget-object v6, v0, Lcom/google/android/flexbox/c;->Xd:[J
 
-    move v10, v2
+    if-eqz v6, :cond_b
 
-    goto :goto_b
+    aget-wide v14, v6, v11
+
+    long-to-int v3, v14
+
+    :cond_b
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v6
+
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->Xd:[J
+
+    if-eqz v14, :cond_c
+
+    aget-wide v22, v14, v11
+
+    shr-long v14, v22, v18
+
+    long-to-int v6, v14
+
+    :cond_c
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+
+    aget-boolean v14, v14, v11
+
+    if-nez v14, :cond_11
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->jZ()F
+
+    move-result v14
+
+    const/4 v15, 0x0
+
+    cmpl-float v14, v14, v15
+
+    if-lez v14, :cond_11
+
+    int-to-float v3, v3
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->jZ()F
+
+    move-result v6
+
+    mul-float v6, v6, v21
+
+    add-float/2addr v3, v6
+
+    iget v6, v1, Lcom/google/android/flexbox/b;->mItemCount:I
+
+    const/4 v14, 0x1
+
+    sub-int/2addr v6, v14
+
+    if-ne v4, v6, :cond_d
+
+    add-float/2addr v3, v9
+
+    const/4 v9, 0x0
+
+    :cond_d
+    invoke-static {v3}, Ljava/lang/Math;->round(F)I
+
+    move-result v6
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMaxWidth()I
+
+    move-result v15
+
+    if-le v6, v15, :cond_e
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMaxWidth()I
+
+    move-result v6
+
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+
+    aput-boolean v14, v3, v11
+
+    iget v3, v1, Lcom/google/android/flexbox/b;->WT:F
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->jZ()F
+
+    move-result v8
+
+    sub-float/2addr v3, v8
+
+    iput v3, v1, Lcom/google/android/flexbox/b;->WT:F
+
+    const/4 v8, 0x1
+
+    goto :goto_6
+
+    :cond_e
+    int-to-float v15, v6
+
+    sub-float/2addr v3, v15
+
+    add-float/2addr v9, v3
+
+    float-to-double v14, v9
+
+    cmpl-double v3, v14, v19
+
+    if-lez v3, :cond_f
+
+    add-int/lit8 v6, v6, 0x1
+
+    invoke-static {v14, v15}, Ljava/lang/Double;->isNaN(D)Z
+
+    sub-double v14, v14, v19
+
+    double-to-float v3, v14
+
+    move v9, v3
+
+    goto :goto_6
+
+    :cond_f
+    cmpg-double v3, v14, v16
+
+    if-gez v3, :cond_10
+
+    add-int/lit8 v6, v6, -0x1
+
+    invoke-static {v14, v15}, Ljava/lang/Double;->isNaN(D)Z
+
+    add-double v14, v14, v19
+
+    double-to-float v3, v14
+
+    move v9, v3
+
+    :cond_10
+    :goto_6
+    iget v3, v1, Lcom/google/android/flexbox/b;->WW:I
+
+    move/from16 v14, p2
+
+    invoke-direct {v0, v14, v13, v3}, Lcom/google/android/flexbox/c;->b(ILcom/google/android/flexbox/FlexItem;I)I
+
+    move-result v3
+
+    const/high16 v15, 0x40000000    # 2.0f
+
+    invoke-static {v6, v15}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v6
+
+    invoke-virtual {v12, v6, v3}, Landroid/view/View;->measure(II)V
+
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v15
+
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v16
+
+    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;->WZ:Lcom/google/android/flexbox/a;
+
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+
+    goto :goto_7
+
+    :cond_11
+    move/from16 v14, p2
+
+    move v15, v3
+
+    move/from16 v16, v6
+
+    :goto_7
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kf()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kh()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
+
+    invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->g(Landroid/view/View;)I
+
+    move-result v3
+
+    add-int v3, v16, v3
+
+    invoke-static {v10, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v3
+
+    iget v6, v1, Lcom/google/android/flexbox/b;->WO:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ke()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kg()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
+
+    add-int/2addr v6, v15
+
+    iput v6, v1, Lcom/google/android/flexbox/b;->WO:I
+
+    :goto_8
+    iget v6, v1, Lcom/google/android/flexbox/b;->WQ:I
+
+    invoke-static {v6, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v6
+
+    iput v6, v1, Lcom/google/android/flexbox/b;->WQ:I
+
+    move v10, v3
+
+    goto :goto_9
 
     :cond_12
-    move v6, v4
+    move/from16 v14, p2
 
-    move/from16 v23, v5
+    move/from16 v21, v7
 
-    move/from16 v4, p2
+    move/from16 v7, p1
 
-    :goto_b
-    add-int/lit8 v2, v6, 0x1
+    :goto_9
+    add-int/lit8 v4, v4, 0x1
 
-    move v4, v2
-
-    move/from16 v5, v23
-
-    move/from16 v2, p4
+    move/from16 v7, v21
 
     const/4 v3, 0x1
 
@@ -1003,19 +979,15 @@
     goto/16 :goto_1
 
     :cond_13
-    move/from16 v4, p2
+    move/from16 v7, p1
 
-    move/from16 v23, v5
+    move/from16 v14, p2
 
     if-eqz v8, :cond_14
 
-    iget v2, v1, Lcom/google/android/flexbox/b;->WO:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->WO:I
 
-    move/from16 v3, v23
-
-    if-eq v3, v2, :cond_14
-
-    move/from16 v2, p4
+    if-eq v5, v3, :cond_14
 
     const/4 v3, 0x1
 
@@ -1024,7 +996,10 @@
     goto/16 :goto_0
 
     :cond_14
-    :goto_c
+    return-void
+
+    :cond_15
+    :goto_a
     return-void
 .end method
 
@@ -1063,7 +1038,7 @@
 
     if-ne p0, p1, :cond_0
 
-    invoke-virtual {p2}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual {p2}, Lcom/google/android/flexbox/b;->ki()I
 
     move-result p0
 
@@ -1093,7 +1068,7 @@
     return v1
 
     :cond_0
-    invoke-interface {p6}, Lcom/google/android/flexbox/FlexItem;->kd()Z
+    invoke-interface {p6}, Lcom/google/android/flexbox/FlexItem;->kc()Z
 
     move-result p6
 
@@ -1246,7 +1221,7 @@
 .end method
 
 .method private aG(I)V
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/google/android/flexbox/c;->Xa:[Z
 
@@ -1266,13 +1241,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xa:[Z
+    array-length v1, v0
 
-    array-length v0, v0
-
-    if-ge v0, p1, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xa:[Z
+    if-ge v1, p1, :cond_3
 
     array-length v0, v0
 
@@ -1290,11 +1261,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->Xa:[Z
+    const/4 p1, 0x0
 
-    const/4 v0, 0x0
-
-    invoke-static {p1, v0}, Ljava/util/Arrays;->fill([ZZ)V
+    invoke-static {v0, p1}, Ljava/util/Arrays;->fill([ZZ)V
 
     return-void
 .end method
@@ -1316,13 +1285,13 @@
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result v2
 
@@ -1352,7 +1321,6 @@
 
     move-result p2
 
-    :goto_0
     invoke-static {p1}, Landroid/view/View$MeasureSpec;->getMode(I)I
 
     move-result p1
@@ -1361,7 +1329,7 @@
 
     move-result p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->getMinHeight()I
@@ -1374,10 +1342,16 @@
 
     move-result p2
 
-    goto :goto_0
+    invoke-static {p1}, Landroid/view/View$MeasureSpec;->getMode(I)I
+
+    move-result p1
+
+    invoke-static {p2, p1}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result p1
 
     :cond_1
-    :goto_1
+    :goto_0
     return p1
 .end method
 
@@ -1420,7 +1394,7 @@
 .end method
 
 .method private b(IILcom/google/android/flexbox/b;IIZ)V
-    .locals 25
+    .locals 23
 
     move-object/from16 v0, p0
 
@@ -1441,13 +1415,13 @@
 
     cmpg-float v6, v6, v7
 
-    if-lez v6, :cond_14
+    if-lez v6, :cond_15
 
     iget v6, v1, Lcom/google/android/flexbox/b;->WO:I
 
     if-le v2, v6, :cond_0
 
-    goto/16 :goto_a
+    goto/16 :goto_9
 
     :cond_0
     iget v6, v1, Lcom/google/android/flexbox/b;->WO:I
@@ -1518,447 +1492,211 @@
 
     move-result v14
 
-    const-wide/high16 v15, -0x4010000000000000L    # -1.0
+    const-wide/high16 v16, -0x4010000000000000L    # -1.0
 
-    const-wide/high16 v17, 0x3ff0000000000000L    # 1.0
+    const-wide/high16 v18, 0x3ff0000000000000L    # 1.0
 
-    const/16 v19, 0x20
+    const/16 v20, 0x20
 
-    const/high16 v20, 0x3f800000    # 1.0f
+    const/high16 v21, 0x3f800000    # 1.0f
 
     if-eqz v14, :cond_a
 
     if-ne v14, v3, :cond_2
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_2
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
 
     move-result v14
 
-    iget-object v7, v0, Lcom/google/android/flexbox/c;->Xd:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->Xd:[J
 
-    if-eqz v7, :cond_3
+    if-eqz v15, :cond_3
 
-    iget-object v7, v0, Lcom/google/android/flexbox/c;->Xd:[J
+    aget-wide v14, v15, v11
 
-    aget-wide v21, v7, v11
+    shr-long v14, v14, v20
 
-    move/from16 v23, v4
-
-    shr-long v3, v21, v19
-
-    long-to-int v14, v3
-
-    goto :goto_2
+    long-to-int v14, v14
 
     :cond_3
-    move/from16 v23, v4
-
-    :goto_2
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
 
-    move-result v3
-
-    iget-object v4, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    if-eqz v4, :cond_4
+    move-result v15
 
     iget-object v3, v0, Lcom/google/android/flexbox/c;->Xd:[J
 
-    aget-wide v2, v3, v11
+    if-eqz v3, :cond_4
 
-    long-to-int v3, v2
+    move/from16 v22, v8
+
+    aget-wide v7, v3, v11
+
+    long-to-int v15, v7
+
+    goto :goto_2
 
     :cond_4
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+    move/from16 v22, v8
 
-    aget-boolean v2, v2, v11
+    :goto_2
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xa:[Z
 
-    if-nez v2, :cond_9
+    aget-boolean v3, v3, v11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kb()F
+    if-nez v3, :cond_9
 
-    move-result v2
-
-    const/4 v4, 0x0
-
-    cmpl-float v2, v2, v4
-
-    if-lez v2, :cond_9
-
-    int-to-float v2, v14
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kb()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
 
     move-result v3
 
-    mul-float v3, v3, v6
+    const/4 v7, 0x0
 
-    sub-float/2addr v2, v3
+    cmpl-float v3, v3, v7
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->mItemCount:I
+    if-lez v3, :cond_9
 
-    const/4 v4, 0x1
+    int-to-float v3, v14
 
-    sub-int/2addr v3, v4
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
 
-    move/from16 v7, v23
+    move-result v7
 
-    if-ne v7, v3, :cond_5
+    mul-float v7, v7, v6
 
-    add-float/2addr v2, v9
+    sub-float/2addr v3, v7
+
+    iget v7, v1, Lcom/google/android/flexbox/b;->mItemCount:I
+
+    const/4 v8, 0x1
+
+    sub-int/2addr v7, v8
+
+    if-ne v4, v7, :cond_5
+
+    add-float/2addr v3, v9
 
     const/4 v9, 0x0
 
     :cond_5
-    invoke-static {v2}, Ljava/lang/Math;->round(F)I
+    invoke-static {v3}, Ljava/lang/Math;->round(F)I
 
-    move-result v3
+    move-result v7
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMinHeight()I
 
     move-result v14
 
-    if-ge v3, v14, :cond_6
+    if-ge v7, v14, :cond_6
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMinHeight()I
 
-    move-result v3
+    move-result v7
 
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xa:[Z
 
-    aput-boolean v4, v2, v11
+    aput-boolean v8, v3, v11
 
-    iget v2, v1, Lcom/google/android/flexbox/b;->WU:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->WU:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kb()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
 
-    move-result v4
+    move-result v8
 
-    sub-float/2addr v2, v4
+    sub-float/2addr v3, v8
 
-    iput v2, v1, Lcom/google/android/flexbox/b;->WU:F
-
-    move/from16 v24, v5
+    iput v3, v1, Lcom/google/android/flexbox/b;->WU:F
 
     const/4 v8, 0x1
 
     goto :goto_3
 
     :cond_6
-    int-to-float v4, v3
+    int-to-float v8, v7
 
-    sub-float/2addr v2, v4
+    sub-float/2addr v3, v8
 
-    add-float/2addr v9, v2
+    add-float/2addr v9, v3
 
-    move/from16 v24, v5
+    float-to-double v14, v9
 
-    float-to-double v4, v9
+    cmpl-double v3, v14, v18
 
-    cmpl-double v2, v4, v17
+    if-lez v3, :cond_7
 
-    if-lez v2, :cond_7
+    add-int/lit8 v7, v7, 0x1
 
-    add-int/lit8 v3, v3, 0x1
+    sub-float v9, v9, v21
 
-    sub-float v9, v9, v20
+    move/from16 v8, v22
 
     goto :goto_3
 
     :cond_7
-    cmpg-double v2, v4, v15
+    cmpg-double v3, v14, v16
 
-    if-gez v2, :cond_8
+    if-gez v3, :cond_8
 
-    add-int/lit8 v3, v3, -0x1
+    add-int/lit8 v7, v7, -0x1
 
-    add-float v9, v9, v20
+    add-float v9, v9, v21
+
+    move/from16 v8, v22
+
+    goto :goto_3
 
     :cond_8
+    move/from16 v8, v22
+
     :goto_3
-    iget v2, v1, Lcom/google/android/flexbox/b;->WW:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->WW:I
 
-    move/from16 v4, p1
+    move/from16 v14, p1
 
-    invoke-direct {v0, v4, v13, v2}, Lcom/google/android/flexbox/c;->a(ILcom/google/android/flexbox/FlexItem;I)I
-
-    move-result v2
-
-    const/high16 v5, 0x40000000    # 2.0f
-
-    invoke-static {v3, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    invoke-direct {v0, v14, v13, v3}, Lcom/google/android/flexbox/c;->a(ILcom/google/android/flexbox/FlexItem;I)I
 
     move-result v3
 
-    invoke-virtual {v12, v2, v3}, Landroid/view/View;->measure(II)V
+    const/high16 v15, 0x40000000    # 2.0f
+
+    invoke-static {v7, v15}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v7
+
+    invoke-virtual {v12, v3, v7}, Landroid/view/View;->measure(II)V
 
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
 
-    move-result v5
+    move-result v15
 
     invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
 
-    move-result v14
+    move-result v16
 
-    invoke-direct {v0, v11, v2, v3, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
+    invoke-direct {v0, v11, v3, v7, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v2, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
-    move v3, v5
+    move/from16 v22, v8
 
-    goto :goto_4
+    move/from16 v14, v16
 
     :cond_9
-    move/from16 v4, p1
-
-    move/from16 v24, v5
-
-    move/from16 v7, v23
-
-    :goto_4
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kf()I
-
-    move-result v2
-
-    add-int/2addr v3, v2
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kh()I
-
-    move-result v2
-
-    add-int/2addr v3, v2
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
-
-    invoke-interface {v2, v12}, Lcom/google/android/flexbox/a;->g(Landroid/view/View;)I
-
-    move-result v2
-
-    add-int/2addr v3, v2
-
-    invoke-static {v10, v3}, Ljava/lang/Math;->max(II)I
-
-    move-result v2
-
-    iget v3, v1, Lcom/google/android/flexbox/b;->WO:I
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kg()I
-
-    move-result v5
-
-    add-int/2addr v14, v5
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ki()I
-
-    move-result v5
-
-    add-int/2addr v14, v5
-
-    add-int/2addr v3, v14
-
-    iput v3, v1, Lcom/google/android/flexbox/b;->WO:I
-
-    move/from16 v4, p2
-
-    goto/16 :goto_8
-
-    :cond_a
-    :goto_5
-    move v7, v4
-
-    move/from16 v24, v5
-
-    move/from16 v4, p1
-
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v2
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    if-eqz v3, :cond_b
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    aget-wide v3, v2, v11
-
-    long-to-int v2, v3
-
-    :cond_b
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result v3
 
-    iget-object v4, v0, Lcom/google/android/flexbox/c;->Xd:[J
+    add-int/2addr v15, v3
 
-    if-eqz v4, :cond_c
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xd:[J
-
-    aget-wide v4, v3, v11
-
-    shr-long v3, v4, v19
-
-    long-to-int v3, v3
-
-    :cond_c
-    iget-object v4, v0, Lcom/google/android/flexbox/c;->Xa:[Z
-
-    aget-boolean v4, v4, v11
-
-    if-nez v4, :cond_11
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kb()F
-
-    move-result v4
-
-    const/4 v5, 0x0
-
-    cmpl-float v4, v4, v5
-
-    if-lez v4, :cond_11
-
-    int-to-float v2, v2
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kb()F
-
-    move-result v3
-
-    mul-float v3, v3, v6
-
-    sub-float/2addr v2, v3
-
-    iget v3, v1, Lcom/google/android/flexbox/b;->mItemCount:I
-
-    const/4 v4, 0x1
-
-    sub-int/2addr v3, v4
-
-    if-ne v7, v3, :cond_d
-
-    add-float/2addr v2, v9
-
-    const/4 v9, 0x0
-
-    :cond_d
-    invoke-static {v2}, Ljava/lang/Math;->round(F)I
-
-    move-result v3
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMinWidth()I
-
-    move-result v14
-
-    if-ge v3, v14, :cond_e
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMinWidth()I
-
-    move-result v3
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->Xa:[Z
-
-    aput-boolean v4, v2, v11
-
-    iget v2, v1, Lcom/google/android/flexbox/b;->WU:F
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kb()F
-
-    move-result v8
-
-    sub-float/2addr v2, v8
-
-    iput v2, v1, Lcom/google/android/flexbox/b;->WU:F
-
-    const/4 v8, 0x1
-
-    goto :goto_6
-
-    :cond_e
-    int-to-float v14, v3
-
-    sub-float/2addr v2, v14
-
-    add-float/2addr v9, v2
-
-    float-to-double v4, v9
-
-    cmpl-double v2, v4, v17
-
-    if-lez v2, :cond_f
-
-    add-int/lit8 v3, v3, 0x1
-
-    sub-float v9, v9, v20
-
-    goto :goto_6
-
-    :cond_f
-    cmpg-double v2, v4, v15
-
-    if-gez v2, :cond_10
-
-    add-int/lit8 v3, v3, -0x1
-
-    add-float v9, v9, v20
-
-    :cond_10
-    :goto_6
-    iget v2, v1, Lcom/google/android/flexbox/b;->WW:I
-
-    move/from16 v4, p2
-
-    invoke-direct {v0, v4, v13, v2}, Lcom/google/android/flexbox/c;->b(ILcom/google/android/flexbox/FlexItem;I)I
-
-    move-result v2
-
-    const/high16 v5, 0x40000000    # 2.0f
-
-    invoke-static {v3, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
-
-    move-result v3
-
-    invoke-virtual {v12, v3, v2}, Landroid/view/View;->measure(II)V
-
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
-
-    move-result v5
-
-    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
-
-    move-result v14
-
-    invoke-direct {v0, v11, v3, v2, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
-
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
-
-    invoke-interface {v2, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
-
-    move v2, v5
-
-    goto :goto_7
-
-    :cond_11
-    move/from16 v4, p2
-
-    move v14, v3
-
-    :goto_7
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result v3
 
-    add-int/2addr v14, v3
-
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ki()I
-
-    move-result v3
-
-    add-int/2addr v14, v3
+    add-int/2addr v15, v3
 
     iget-object v3, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
@@ -1966,60 +1704,277 @@
 
     move-result v3
 
-    add-int/2addr v14, v3
+    add-int/2addr v15, v3
 
-    invoke-static {v10, v14}, Ljava/lang/Math;->max(II)I
+    invoke-static {v10, v15}, Ljava/lang/Math;->max(II)I
 
     move-result v3
 
-    iget v5, v1, Lcom/google/android/flexbox/b;->WO:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->WO:I
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
-    move-result v10
+    move-result v8
 
-    add-int/2addr v2, v10
+    add-int/2addr v14, v8
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
-    move-result v10
+    move-result v8
 
-    add-int/2addr v2, v10
+    add-int/2addr v14, v8
 
-    add-int/2addr v5, v2
+    add-int/2addr v7, v14
 
-    iput v5, v1, Lcom/google/android/flexbox/b;->WO:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->WO:I
 
-    move v2, v3
+    move/from16 v14, p2
 
-    :goto_8
-    iget v3, v1, Lcom/google/android/flexbox/b;->WQ:I
+    const/4 v8, 0x1
 
-    invoke-static {v3, v2}, Ljava/lang/Math;->max(II)I
+    goto/16 :goto_7
+
+    :cond_a
+    :goto_4
+    move/from16 v22, v8
+
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
 
     move-result v3
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->WQ:I
+    iget-object v7, v0, Lcom/google/android/flexbox/c;->Xd:[J
 
-    move v10, v2
+    if-eqz v7, :cond_b
 
-    goto :goto_9
+    aget-wide v14, v7, v11
+
+    long-to-int v3, v14
+
+    :cond_b
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v7
+
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->Xd:[J
+
+    if-eqz v8, :cond_c
+
+    aget-wide v7, v8, v11
+
+    shr-long v7, v7, v20
+
+    long-to-int v7, v7
+
+    :cond_c
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+
+    aget-boolean v8, v8, v11
+
+    if-nez v8, :cond_11
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
+
+    move-result v8
+
+    const/4 v14, 0x0
+
+    cmpl-float v8, v8, v14
+
+    if-lez v8, :cond_11
+
+    int-to-float v3, v3
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
+
+    move-result v7
+
+    mul-float v7, v7, v6
+
+    sub-float/2addr v3, v7
+
+    iget v7, v1, Lcom/google/android/flexbox/b;->mItemCount:I
+
+    const/4 v8, 0x1
+
+    sub-int/2addr v7, v8
+
+    if-ne v4, v7, :cond_d
+
+    add-float/2addr v3, v9
+
+    const/4 v9, 0x0
+
+    :cond_d
+    invoke-static {v3}, Ljava/lang/Math;->round(F)I
+
+    move-result v7
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMinWidth()I
+
+    move-result v15
+
+    if-ge v7, v15, :cond_e
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->getMinWidth()I
+
+    move-result v7
+
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->Xa:[Z
+
+    aput-boolean v8, v3, v11
+
+    iget v3, v1, Lcom/google/android/flexbox/b;->WU:F
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ka()F
+
+    move-result v15
+
+    sub-float/2addr v3, v15
+
+    iput v3, v1, Lcom/google/android/flexbox/b;->WU:F
+
+    const/16 v22, 0x1
+
+    goto :goto_5
+
+    :cond_e
+    int-to-float v15, v7
+
+    sub-float/2addr v3, v15
+
+    add-float/2addr v9, v3
+
+    float-to-double v14, v9
+
+    cmpl-double v3, v14, v18
+
+    if-lez v3, :cond_f
+
+    add-int/lit8 v7, v7, 0x1
+
+    sub-float v9, v9, v21
+
+    goto :goto_5
+
+    :cond_f
+    cmpg-double v3, v14, v16
+
+    if-gez v3, :cond_10
+
+    add-int/lit8 v7, v7, -0x1
+
+    add-float v9, v9, v21
+
+    :cond_10
+    :goto_5
+    iget v3, v1, Lcom/google/android/flexbox/b;->WW:I
+
+    move/from16 v14, p2
+
+    invoke-direct {v0, v14, v13, v3}, Lcom/google/android/flexbox/c;->b(ILcom/google/android/flexbox/FlexItem;I)I
+
+    move-result v3
+
+    const/high16 v15, 0x40000000    # 2.0f
+
+    invoke-static {v7, v15}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result v7
+
+    invoke-virtual {v12, v7, v3}, Landroid/view/View;->measure(II)V
+
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredWidth()I
+
+    move-result v15
+
+    invoke-virtual {v12}, Landroid/view/View;->getMeasuredHeight()I
+
+    move-result v16
+
+    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;->WZ:Lcom/google/android/flexbox/a;
+
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+
+    goto :goto_6
+
+    :cond_11
+    move/from16 v14, p2
+
+    const/4 v8, 0x1
+
+    move v15, v3
+
+    move/from16 v16, v7
+
+    :goto_6
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kf()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kh()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
+
+    invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->g(Landroid/view/View;)I
+
+    move-result v3
+
+    add-int v3, v16, v3
+
+    invoke-static {v10, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v3
+
+    iget v7, v1, Lcom/google/android/flexbox/b;->WO:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ke()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kg()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
+
+    add-int/2addr v7, v15
+
+    iput v7, v1, Lcom/google/android/flexbox/b;->WO:I
+
+    :goto_7
+    iget v7, v1, Lcom/google/android/flexbox/b;->WQ:I
+
+    invoke-static {v7, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v7
+
+    iput v7, v1, Lcom/google/android/flexbox/b;->WQ:I
+
+    move v10, v3
+
+    goto :goto_8
 
     :cond_12
-    move v7, v4
+    move/from16 v14, p2
 
-    move/from16 v24, v5
+    move/from16 v22, v8
 
-    move/from16 v4, p2
+    const/4 v8, 0x1
 
-    :goto_9
-    add-int/lit8 v2, v7, 0x1
+    :goto_8
+    add-int/lit8 v4, v4, 0x1
 
-    move v4, v2
-
-    move/from16 v5, v24
-
-    move/from16 v2, p4
+    move/from16 v8, v22
 
     const/4 v3, 0x1
 
@@ -2028,19 +1983,17 @@
     goto/16 :goto_1
 
     :cond_13
-    move/from16 v4, p2
+    move/from16 v14, p2
 
-    move/from16 v24, v5
+    move/from16 v22, v8
 
-    if-eqz v8, :cond_14
+    const/4 v8, 0x1
 
-    iget v2, v1, Lcom/google/android/flexbox/b;->WO:I
+    if-eqz v22, :cond_14
 
-    move/from16 v3, v24
+    iget v3, v1, Lcom/google/android/flexbox/b;->WO:I
 
-    if-eq v3, v2, :cond_14
-
-    move/from16 v2, p4
+    if-eq v5, v3, :cond_14
 
     const/4 v3, 0x1
 
@@ -2049,7 +2002,10 @@
     goto/16 :goto_0
 
     :cond_14
-    :goto_a
+    return-void
+
+    :cond_15
+    :goto_9
     return-void
 .end method
 
@@ -2082,10 +2038,9 @@
 
     move-result v1
 
-    :goto_0
     const/4 v3, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->getMaxWidth()I
@@ -2098,12 +2053,14 @@
 
     move-result v1
 
+    const/4 v3, 0x1
+
     goto :goto_0
 
     :cond_1
     const/4 v3, 0x0
 
-    :goto_1
+    :goto_0
     invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->getMinHeight()I
 
     move-result v5
@@ -2114,7 +2071,7 @@
 
     move-result v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->getMaxHeight()I
@@ -2127,12 +2084,12 @@
 
     move-result v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     move v4, v3
 
-    :goto_2
+    :goto_1
     if-eqz v4, :cond_4
 
     const/high16 v0, 0x40000000    # 2.0f
@@ -2166,13 +2123,13 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result v1
 
@@ -2206,8 +2163,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xd:[J
-
     aget-wide v1, v0, p3
 
     long-to-int v0, v1
@@ -2246,14 +2201,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result p0
 
@@ -2269,13 +2224,13 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result v1
 
@@ -2309,8 +2264,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xd:[J
-
     aget-wide v1, v0, p3
 
     const/16 v0, 0x20
@@ -2353,14 +2306,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p0
 
@@ -2372,14 +2325,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result p0
 
@@ -2391,14 +2344,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result p0
 
@@ -2464,7 +2417,7 @@
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kc()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kb()I
 
     move-result v2
 
@@ -2472,7 +2425,7 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kc()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kb()I
 
     move-result v1
 
@@ -2502,7 +2455,7 @@
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result v0
 
@@ -2533,7 +2486,7 @@
 
     add-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result v0
 
@@ -2556,13 +2509,13 @@
 
     sub-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result p2
 
     add-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p2
 
@@ -2620,13 +2573,13 @@
 
     sub-int p2, p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p6
 
     sub-int/2addr p2, p6
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p6
 
@@ -2645,7 +2598,7 @@
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result p2
 
@@ -2659,7 +2612,7 @@
 
     add-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result p2
 
@@ -2678,13 +2631,13 @@
 
     if-eq p2, v3, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result p2
 
@@ -2695,13 +2648,13 @@
     return-void
 
     :cond_4
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result p2
 
@@ -2709,10 +2662,10 @@
 
     invoke-virtual {p1, p3, p4, p5, p6}, Landroid/view/View;->layout(IIII)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -2739,7 +2692,7 @@
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kc()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kb()I
 
     move-result v2
 
@@ -2747,7 +2700,7 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kc()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kb()I
 
     move-result v1
 
@@ -2756,7 +2709,7 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto :goto_4
+    goto/16 :goto_0
 
     :pswitch_0
     invoke-virtual {p1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
@@ -2789,10 +2742,8 @@
 
     add-int/2addr p4, p2
 
-    :goto_0
     add-int/2addr p6, p2
 
-    :goto_1
     invoke-virtual {p1, p4, p5, p6, p7}, Landroid/view/View;->layout(IIII)V
 
     return-void
@@ -2804,7 +2755,7 @@
 
     invoke-virtual {p1, p4, p5, p6, p7}, Landroid/view/View;->layout(IIII)V
 
-    goto :goto_4
+    goto :goto_0
 
     :pswitch_1
     if-nez p3, :cond_2
@@ -2817,7 +2768,7 @@
 
     sub-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result p3
 
@@ -2831,14 +2782,15 @@
 
     sub-int/2addr p6, p2
 
-    :goto_2
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result p2
 
     sub-int/2addr p6, p2
 
-    goto :goto_1
+    invoke-virtual {p1, p4, p5, p6, p7}, Landroid/view/View;->layout(IIII)V
+
+    return-void
 
     :cond_2
     sub-int/2addr p4, p2
@@ -2849,7 +2801,7 @@
 
     add-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result p3
 
@@ -2863,34 +2815,53 @@
 
     add-int/2addr p6, p2
 
-    :goto_3
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result p2
 
-    goto :goto_0
+    add-int/2addr p6, p2
+
+    invoke-virtual {p1, p4, p5, p6, p7}, Landroid/view/View;->layout(IIII)V
+
+    return-void
 
     :pswitch_2
     if-nez p3, :cond_3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    goto :goto_3
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ke()I
+
+    move-result p2
+
+    add-int/2addr p6, p2
+
+    invoke-virtual {p1, p4, p5, p6, p7}, Landroid/view/View;->layout(IIII)V
+
+    return-void
 
     :cond_3
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    goto :goto_2
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
-    :goto_4
+    move-result p2
+
+    sub-int/2addr p6, p2
+
+    invoke-virtual {p1, p4, p5, p6, p7}, Landroid/view/View;->layout(IIII)V
+
+    return-void
+
+    :goto_0
     return-void
 
     :pswitch_data_0
@@ -2928,7 +2899,7 @@
 .end method
 
 .method final a(Lcom/google/android/flexbox/c$a;IIIIILjava/util/List;)V
-    .locals 36
+    .locals 31
     .param p7    # Ljava/util/List;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
@@ -2956,7 +2927,7 @@
 
     iget-object v0, v9, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/a;->jZ()Z
+    invoke-interface {v0}, Lcom/google/android/flexbox/a;->jY()Z
 
     move-result v14
 
@@ -2996,19 +2967,19 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->E(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->D(Z)I
 
     move-result v1
 
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->F(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->E(Z)I
 
     move-result v2
 
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->G(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->F(Z)I
 
     move-result v16
 
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->H(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->G(Z)I
 
     move-result v17
 
@@ -3030,20 +3001,20 @@
 
     move-result v1
 
-    const/high16 v19, -0x80000000
+    const/high16 v18, -0x80000000
 
-    move/from16 v23, v0
+    move/from16 v22, v0
 
     const/4 v0, 0x0
 
+    const/16 v19, 0x0
+
     const/16 v20, 0x0
 
-    const/16 v21, 0x0
-
-    const/high16 v22, -0x80000000
+    const/high16 v21, -0x80000000
 
     :goto_2
-    if-ge v6, v1, :cond_14
+    if-ge v6, v1, :cond_16
 
     iget-object v5, v9, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
@@ -3059,10 +3030,9 @@
 
     if-eqz v5, :cond_3
 
-    :goto_3
     invoke-direct {v9, v7, v3, v6, v0}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;Lcom/google/android/flexbox/b;II)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_2
     invoke-virtual {v5}, Landroid/view/View;->getVisibility()I
@@ -3093,21 +3063,21 @@
 
     if-eqz v4, :cond_3
 
-    goto :goto_3
+    invoke-direct {v9, v7, v3, v6, v0}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;Lcom/google/android/flexbox/b;II)V
 
     :cond_3
-    :goto_4
+    :goto_3
     move/from16 v11, p4
 
-    move/from16 v18, v8
+    move/from16 v24, v8
 
-    move/from16 v33, v15
+    move/from16 v27, v15
 
     const/4 v8, -0x1
 
     const/4 v10, 0x1
 
-    const/16 v24, 0x0
+    const/16 v29, 0x0
 
     move-object v15, v7
 
@@ -3124,11 +3094,11 @@
 
     check-cast v10, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kc()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kb()I
 
     move-result v4
 
-    move/from16 v26, v1
+    move/from16 v25, v1
 
     const/4 v1, 0x4
 
@@ -3147,13 +3117,13 @@
 
     move-result v1
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ke()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kd()F
 
     move-result v4
 
-    const/high16 v27, -0x40800000    # -1.0f
+    const/high16 v26, -0x40800000    # -1.0f
 
-    cmpl-float v4, v4, v27
+    cmpl-float v4, v4, v26
 
     if-eqz v4, :cond_6
 
@@ -3163,7 +3133,7 @@
 
     int-to-float v1, v8
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ke()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kd()F
 
     move-result v4
 
@@ -3178,21 +3148,21 @@
 
     iget-object v4, v9, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
-    move-object/from16 v28, v7
+    move-object/from16 v26, v7
 
     const/4 v7, 0x1
 
     invoke-static {v10, v7}, Lcom/google/android/flexbox/c;->c(Lcom/google/android/flexbox/FlexItem;Z)I
 
-    move-result v25
+    move-result v24
 
-    add-int v25, v2, v25
+    add-int v24, v2, v24
 
     invoke-static {v10, v7}, Lcom/google/android/flexbox/c;->d(Lcom/google/android/flexbox/FlexItem;Z)I
 
     move-result v27
 
-    add-int v7, v25, v27
+    add-int v7, v24, v27
 
     invoke-interface {v4, v11, v7, v1}, Lcom/google/android/flexbox/a;->c(III)I
 
@@ -3206,19 +3176,19 @@
 
     invoke-static {v10, v13}, Lcom/google/android/flexbox/c;->e(Lcom/google/android/flexbox/FlexItem;Z)I
 
-    move-result v25
+    move-result v24
 
-    add-int v7, v7, v25
+    add-int v7, v7, v24
 
     invoke-static {v10, v13}, Lcom/google/android/flexbox/c;->f(Lcom/google/android/flexbox/FlexItem;Z)I
 
-    move-result v25
+    move-result v24
 
-    add-int v7, v7, v25
+    add-int v7, v7, v24
 
     add-int/2addr v7, v0
 
-    move/from16 v29, v8
+    move/from16 v24, v8
 
     invoke-static {v10, v13}, Lcom/google/android/flexbox/c;->b(Lcom/google/android/flexbox/FlexItem;Z)I
 
@@ -3236,12 +3206,12 @@
 
     const/4 v8, 0x0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_7
-    move-object/from16 v28, v7
+    move-object/from16 v26, v7
 
-    move/from16 v29, v8
+    move/from16 v24, v8
 
     const/4 v13, 0x1
 
@@ -3253,15 +3223,15 @@
 
     invoke-static {v10, v8}, Lcom/google/android/flexbox/c;->e(Lcom/google/android/flexbox/FlexItem;Z)I
 
-    move-result v24
+    move-result v23
 
-    add-int v7, v7, v24
+    add-int v7, v7, v23
 
     invoke-static {v10, v8}, Lcom/google/android/flexbox/c;->f(Lcom/google/android/flexbox/FlexItem;Z)I
 
-    move-result v24
+    move-result v23
 
-    add-int v7, v7, v24
+    add-int v7, v7, v23
 
     add-int/2addr v7, v0
 
@@ -3283,9 +3253,9 @@
 
     invoke-static {v10, v8}, Lcom/google/android/flexbox/c;->d(Lcom/google/android/flexbox/FlexItem;Z)I
 
-    move-result v24
+    move-result v23
 
-    add-int v13, v13, v24
+    add-int v13, v13, v23
 
     invoke-interface {v7, v11, v13, v1}, Lcom/google/android/flexbox/a;->d(III)I
 
@@ -3297,7 +3267,7 @@
 
     move v13, v1
 
-    :goto_5
+    :goto_4
     iget-object v1, v9, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1, v6, v5}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
@@ -3308,11 +3278,11 @@
 
     move-result v1
 
-    move/from16 v4, v20
+    move/from16 v4, v19
 
     invoke-static {v4, v1}, Landroid/view/View;->combineMeasuredStates(II)I
 
-    move-result v20
+    move-result v19
 
     iget v4, v3, Lcom/google/android/flexbox/b;->WO:I
 
@@ -3338,25 +3308,23 @@
 
     move v11, v1
 
-    move/from16 v30, v26
-
     move-object v1, v5
 
-    move/from16 v31, v2
+    move/from16 v28, v2
 
     move v2, v15
 
-    move-object/from16 v32, v3
+    move-object/from16 v23, v3
 
-    move/from16 v3, v29
+    move/from16 v3, v24
 
-    move/from16 v33, v15
+    move/from16 v27, v15
 
     const/4 v15, 0x1
 
     move-object v8, v5
 
-    const/16 v24, 0x0
+    const/16 v29, 0x0
 
     move v5, v7
 
@@ -3366,17 +3334,15 @@
 
     move-object v6, v10
 
-    move/from16 v34, v7
+    move-object/from16 v15, v26
 
-    move-object/from16 v15, v28
+    move/from16 v26, v7
 
-    move/from16 v35, v13
-
-    move/from16 v18, v29
+    move/from16 v30, v13
 
     move-object v13, v8
 
-    move/from16 v8, v21
+    move/from16 v8, v20
 
     invoke-direct/range {v0 .. v8}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;IIIILcom/google/android/flexbox/FlexItem;II)Z
 
@@ -3384,42 +3350,42 @@
 
     if-eqz v0, :cond_c
 
-    invoke-virtual/range {v32 .. v32}, Lcom/google/android/flexbox/b;->kj()I
+    invoke-virtual/range {v23 .. v23}, Lcom/google/android/flexbox/b;->ki()I
 
     move-result v0
 
     if-lez v0, :cond_9
 
-    move/from16 v6, v34
+    move/from16 v6, v26
 
     if-lez v6, :cond_8
 
     add-int/lit8 v5, v6, -0x1
 
-    move-object/from16 v3, v32
+    move-object/from16 v3, v23
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_8
-    move-object/from16 v3, v32
+    move-object/from16 v3, v23
 
     const/4 v5, 0x0
 
-    :goto_6
+    :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;->WQ:I
 
     add-int/2addr v0, v11
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_9
-    move/from16 v6, v34
+    move/from16 v6, v26
 
     move v0, v11
 
-    :goto_7
+    :goto_6
     if-eqz v14, :cond_a
 
     invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->getHeight()I
@@ -3444,13 +3410,13 @@
 
     add-int/2addr v2, v3
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result v3
 
@@ -3466,17 +3432,16 @@
 
     move-result v1
 
-    move/from16 v2, v35
+    move/from16 v2, v30
 
     invoke-virtual {v13, v2, v1}, Landroid/view/View;->measure(II)V
 
-    :goto_8
     invoke-direct {v9, v13, v6}, Lcom/google/android/flexbox/c;->b(Landroid/view/View;I)V
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_a
-    move/from16 v2, v35
+    move/from16 v2, v30
 
     invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->getWidth()I
 
@@ -3500,13 +3465,13 @@
 
     add-int/2addr v3, v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kf()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ke()I
 
     move-result v4
 
     add-int/2addr v3, v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kh()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kg()I
 
     move-result v4
 
@@ -3524,10 +3489,10 @@
 
     invoke-virtual {v13, v1, v2}, Landroid/view/View;->measure(II)V
 
-    goto :goto_8
+    invoke-direct {v9, v13, v6}, Lcom/google/android/flexbox/c;->b(Landroid/view/View;I)V
 
     :cond_b
-    :goto_9
+    :goto_7
     new-instance v3, Lcom/google/android/flexbox/b;
 
     invoke-direct {v3}, Lcom/google/android/flexbox/b;-><init>()V
@@ -3536,7 +3501,7 @@
 
     iput v1, v3, Lcom/google/android/flexbox/b;->mItemCount:I
 
-    move/from16 v2, v31
+    move/from16 v2, v28
 
     iput v2, v3, Lcom/google/android/flexbox/b;->WO:I
 
@@ -3548,14 +3513,14 @@
 
     const/4 v5, 0x0
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_c
-    move/from16 v2, v31
+    move-object/from16 v3, v23
 
-    move-object/from16 v3, v32
+    move/from16 v6, v26
 
-    move/from16 v6, v34
+    move/from16 v2, v28
 
     const/4 v1, 0x1
 
@@ -3565,17 +3530,15 @@
 
     iput v0, v3, Lcom/google/android/flexbox/b;->mItemCount:I
 
-    add-int/lit8 v5, v21, 0x1
+    add-int/lit8 v5, v20, 0x1
 
-    move/from16 v0, v22
+    move/from16 v0, v21
 
-    :goto_a
+    :goto_8
     iget-object v1, v9, Lcom/google/android/flexbox/c;->Xb:[I
 
     if-eqz v1, :cond_d
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->Xb:[I
-
     invoke-interface {v15}, Ljava/util/List;->size()I
 
     move-result v4
@@ -3607,7 +3570,7 @@
 
     iget v1, v3, Lcom/google/android/flexbox/b;->WT:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ka()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->jZ()F
 
     move-result v4
 
@@ -3617,7 +3580,7 @@
 
     iget v1, v3, Lcom/google/android/flexbox/b;->WU:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kb()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ka()F
 
     move-result v4
 
@@ -3683,11 +3646,10 @@
 
     move-result v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kg()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kf()I
 
     move-result v7
 
-    :goto_b
     add-int/2addr v4, v7
 
     invoke-static {v1, v4}, Ljava/lang/Math;->max(II)I
@@ -3696,7 +3658,9 @@
 
     iput v1, v3, Lcom/google/android/flexbox/b;->WV:I
 
-    goto :goto_c
+    move/from16 v1, v25
+
+    goto :goto_9
 
     :cond_e
     iget v1, v3, Lcom/google/android/flexbox/b;->WV:I
@@ -3711,16 +3675,26 @@
 
     sub-int/2addr v4, v7
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ki()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kh()I
 
     move-result v7
 
-    goto :goto_b
+    add-int/2addr v4, v7
+
+    invoke-static {v1, v4}, Ljava/lang/Math;->max(II)I
+
+    move-result v1
+
+    iput v1, v3, Lcom/google/android/flexbox/b;->WV:I
+
+    move/from16 v1, v25
+
+    goto :goto_9
 
     :cond_f
-    :goto_c
-    move/from16 v1, v30
+    move/from16 v1, v25
 
+    :goto_9
     invoke-static {v6, v1, v3}, Lcom/google/android/flexbox/c;->a(IILcom/google/android/flexbox/b;)Z
 
     move-result v4
@@ -3733,12 +3707,19 @@
 
     add-int/2addr v11, v4
 
+    move/from16 v7, p6
+
+    const/4 v8, -0x1
+
+    goto :goto_a
+
     :cond_10
     move/from16 v7, p6
 
     const/4 v8, -0x1
 
-    if-eq v7, v8, :cond_11
+    :goto_a
+    if-eq v7, v8, :cond_12
 
     invoke-interface {v15}, Ljava/util/List;->size()I
 
@@ -3762,11 +3743,11 @@
 
     iget v4, v4, Lcom/google/android/flexbox/b;->mLastIndex:I
 
-    if-lt v4, v7, :cond_12
+    if-lt v4, v7, :cond_13
 
-    if-lt v6, v7, :cond_12
+    if-lt v6, v7, :cond_13
 
-    if-nez v23, :cond_12
+    if-nez v22, :cond_13
 
     iget v4, v3, Lcom/google/android/flexbox/b;->WQ:I
 
@@ -3774,29 +3755,47 @@
 
     move v4, v11
 
-    const/16 v23, 0x1
+    const/16 v22, 0x1
 
-    goto :goto_d
+    move/from16 v11, p4
+
+    goto :goto_c
 
     :cond_11
     const/4 v10, 0x1
 
+    goto :goto_b
+
     :cond_12
-    move v4, v11
-
-    :goto_d
-    move/from16 v11, p4
-
-    if-le v4, v11, :cond_13
-
-    if-nez v23, :cond_14
+    const/4 v10, 0x1
 
     :cond_13
-    move/from16 v22, v0
+    :goto_b
+    move v4, v11
+
+    move/from16 v11, p4
+
+    :goto_c
+    if-le v4, v11, :cond_15
+
+    if-nez v22, :cond_14
+
+    goto :goto_d
+
+    :cond_14
+    move/from16 v4, v19
+
+    move-object/from16 v0, p1
+
+    goto :goto_f
+
+    :cond_15
+    :goto_d
+    move/from16 v21, v0
 
     move v0, v4
 
-    move/from16 v21, v5
+    move/from16 v20, v5
 
     :goto_e
     add-int/lit8 v6, v6, 0x1
@@ -3805,9 +3804,9 @@
 
     move-object v7, v15
 
-    move/from16 v8, v18
+    move/from16 v8, v24
 
-    move/from16 v15, v33
+    move/from16 v15, v27
 
     move-object/from16 v10, p1
 
@@ -3815,11 +3814,12 @@
 
     goto/16 :goto_2
 
-    :cond_14
-    move/from16 v4, v20
+    :cond_16
+    move/from16 v4, v19
 
     move-object/from16 v0, p1
 
+    :goto_f
     iput v4, v0, Lcom/google/android/flexbox/c$a;->Xf:I
 
     return-void
@@ -3903,44 +3903,36 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/flexbox/c;->Xb:[I
 
-    array-length p1, p1
+    array-length v0, p1
 
-    add-int/lit8 p1, p1, -0x1
+    add-int/lit8 v0, v0, -0x1
 
-    if-le p2, p1, :cond_2
-
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->Xb:[I
+    if-le p2, v0, :cond_2
 
     invoke-static {p1, v1}, Ljava/util/Arrays;->fill([II)V
 
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xb:[I
-
-    invoke-static {v0, p2, p1, v1}, Ljava/util/Arrays;->fill([IIII)V
+    invoke-static {p1, p2, v0, v1}, Ljava/util/Arrays;->fill([IIII)V
 
     :goto_1
     iget-object p1, p0, Lcom/google/android/flexbox/c;->Xc:[J
 
-    array-length p1, p1
+    array-length v0, p1
 
-    add-int/lit8 p1, p1, -0x1
+    add-int/lit8 v0, v0, -0x1
 
-    const-wide/16 v0, 0x0
+    const-wide/16 v1, 0x0
 
-    if-le p2, p1, :cond_3
+    if-le p2, v0, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->Xc:[J
-
-    invoke-static {p1, v0, v1}, Ljava/util/Arrays;->fill([JJ)V
+    invoke-static {p1, v1, v2}, Ljava/util/Arrays;->fill([JJ)V
 
     return-void
 
     :cond_3
-    iget-object v2, p0, Lcom/google/android/flexbox/c;->Xc:[J
-
-    invoke-static {v2, p2, p1, v0, v1}, Ljava/util/Arrays;->fill([JIIJ)V
+    invoke-static {p1, p2, v0, v1, v2}, Ljava/util/Arrays;->fill([JIIJ)V
 
     return-void
 .end method
@@ -3988,7 +3980,7 @@
     :goto_0
     const/4 p1, -0x1
 
-    if-eq p2, p1, :cond_2
+    if-eq p2, p1, :cond_3
 
     if-ne p2, v0, :cond_1
 
@@ -4006,7 +3998,7 @@
     iput p2, v2, Lcom/google/android/flexbox/c$b;->index:I
 
     :goto_1
-    if-ge p2, v0, :cond_3
+    if-ge p2, v0, :cond_4
 
     invoke-interface {v1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -4025,10 +4017,16 @@
     goto :goto_1
 
     :cond_2
+    iput v0, v2, Lcom/google/android/flexbox/c$b;->index:I
+
+    goto :goto_3
+
+    :cond_3
     :goto_2
     iput v0, v2, Lcom/google/android/flexbox/c$b;->index:I
 
-    :cond_3
+    :cond_4
+    :goto_3
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     add-int/2addr v0, v3
@@ -4076,8 +4074,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->Xb:[I
-
     aget p1, v1, p1
 
     goto :goto_0
@@ -4146,7 +4142,7 @@
 
     check-cast v10, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kc()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kb()I
 
     move-result v11
 
@@ -4154,7 +4150,7 @@
 
     if-eq v11, v12, :cond_2
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kc()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kb()I
 
     move-result v10
 
@@ -4321,7 +4317,7 @@
 .end method
 
 .method final aI(I)V
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/google/android/flexbox/c;->Xd:[J
 
@@ -4341,13 +4337,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xd:[J
+    array-length v1, v0
 
-    array-length v0, v0
-
-    if-ge v0, p1, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xd:[J
+    if-ge v1, p1, :cond_3
 
     array-length v0, v0
 
@@ -4371,7 +4363,7 @@
 .end method
 
 .method final aJ(I)V
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/google/android/flexbox/c;->Xc:[J
 
@@ -4391,13 +4383,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xc:[J
+    array-length v1, v0
 
-    array-length v0, v0
-
-    if-ge v0, p1, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xc:[J
+    if-ge v1, p1, :cond_3
 
     array-length v0, v0
 
@@ -4421,7 +4409,7 @@
 .end method
 
 .method final aK(I)V
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/google/android/flexbox/c;->Xb:[I
 
@@ -4441,13 +4429,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xb:[I
+    array-length v1, v0
 
-    array-length v0, v0
-
-    if-ge v0, p1, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->Xb:[I
+    if-ge v1, p1, :cond_3
 
     array-length v0, v0
 
@@ -4745,6 +4729,8 @@
 
     move-result v2
 
+    add-int/2addr v0, v2
+
     goto :goto_2
 
     :pswitch_1
@@ -4782,18 +4768,16 @@
 
     move-result v2
 
-    :goto_2
     add-int/2addr v0, v2
 
+    :goto_2
     const/4 v2, 0x0
 
     iget-object v3, p0, Lcom/google/android/flexbox/c;->Xb:[I
 
     if-eqz v3, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/flexbox/c;->Xb:[I
-
-    aget v2, v2, p3
+    aget v2, v3, p3
 
     :cond_3
     iget-object p3, p0, Lcom/google/android/flexbox/c;->WZ:Lcom/google/android/flexbox/a;
@@ -4862,6 +4846,8 @@
     :cond_5
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
@@ -5318,7 +5304,7 @@
     .end packed-switch
 .end method
 
-.method final kk()V
+.method final kj()V
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/com/google/android/gms/a/b.smali b/com.discord/smali/com/google/android/gms/a/b.smali
index 5140150487..fd61c6ae0d 100644
--- a/com.discord/smali/com/google/android/gms/a/b.smali
+++ b/com.discord/smali/com/google/android/gms/a/b.smali
@@ -200,4 +200,6 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    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 35c7e24920..2b3b18b855 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
@@ -191,8 +191,6 @@
 
     move-result-wide v4
 
-    const/4 v6, 0x0
-
     sub-long v6, v4, v2
 
     const/4 v9, 0x0
@@ -339,7 +337,7 @@
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -391,7 +389,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;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     const/4 p1, 0x1
 
@@ -891,7 +889,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;->mt()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/a/e;->ms()Z
 
     move-result v0
     :try_end_6
@@ -980,7 +978,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->mContext:Landroid/content/Context;
 
@@ -1155,7 +1153,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;->ms()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/a/e;->mr()Z
 
     move-result v2
 
diff --git a/com.discord/smali/com/google/android/gms/ads_identifier/R.smali b/com.discord/smali/com/google/android/gms/ads_identifier/R.smali
index 028c1b10bc..96cbbdacfa 100644
--- a/com.discord/smali/com/google/android/gms/ads_identifier/R.smali
+++ b/com.discord/smali/com/google/android/gms/ads_identifier/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/ads_identifier/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/google/android/gms/analytics/AnalyticsJobService.smali b/com.discord/smali/com/google/android/gms/analytics/AnalyticsJobService.smali
index 58f209c684..0aa9489e18 100644
--- a/com.discord/smali/com/google/android/gms/analytics/AnalyticsJobService.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/AnalyticsJobService.smali
@@ -32,7 +32,7 @@
     return-void
 .end method
 
-.method private final kq()Lcom/google/android/gms/internal/measurement/br;
+.method private final kp()Lcom/google/android/gms/internal/measurement/br;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +95,7 @@
 
     invoke-super {p0}, Landroid/app/job/JobService;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object v0
 
@@ -113,7 +113,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object v0
 
@@ -133,7 +133,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object p2
 
@@ -147,7 +147,7 @@
 .method public final onStartJob(Landroid/app/job/JobParameters;)Z
     .locals 4
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object v0
 
@@ -157,7 +157,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/analytics/AnalyticsService.smali b/com.discord/smali/com/google/android/gms/analytics/AnalyticsService.smali
index 5c4976ecd8..5dda311de5 100644
--- a/com.discord/smali/com/google/android/gms/analytics/AnalyticsService.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/AnalyticsService.smali
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method private final kq()Lcom/google/android/gms/internal/measurement/br;
+.method private final kp()Lcom/google/android/gms/internal/measurement/br;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -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;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     const/4 p1, 0x0
 
@@ -96,7 +96,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object v0
 
@@ -114,7 +114,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object v0
 
@@ -134,7 +134,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kq()Lcom/google/android/gms/internal/measurement/br;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kp()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/google/android/gms/analytics/a.smali b/com.discord/smali/com/google/android/gms/analytics/a.smali
index c81f45857d..3e57e1d223 100644
--- a/com.discord/smali/com/google/android/gms/analytics/a.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/a.smali
@@ -24,9 +24,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/analytics/a;->XZ:Ljava/lang/Boolean;
-
-    invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result p0
 
@@ -65,7 +63,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -109,7 +107,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uu()I
 
     move-result p2
 
@@ -149,7 +147,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/analytics/a/b.smali b/com.discord/smali/com/google/android/gms/analytics/a/b.smali
index bd00414e95..9511608ba7 100644
--- a/com.discord/smali/com/google/android/gms/analytics/a/b.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/a/b.smali
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public final ks()Ljava/util/Map;
+.method public final kr()Ljava/util/Map;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -93,7 +93,6 @@
 
     move-result-object v3
 
-    :goto_1
     invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v2
@@ -111,7 +110,15 @@
 
     check-cast v3, Ljava/lang/String;
 
-    goto :goto_1
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
 
     :cond_1
     invoke-static {v0}, Lcom/google/android/gms/analytics/k;->n(Ljava/util/Map;)Ljava/lang/String;
diff --git a/com.discord/smali/com/google/android/gms/analytics/b.smali b/com.discord/smali/com/google/android/gms/analytics/b.smali
index 6980584ec5..dc86e2a58a 100644
--- a/com.discord/smali/com/google/android/gms/analytics/b.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/b.smali
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method public static kr()V
+.method public static kq()V
     .locals 3
 
     const-class v0, Lcom/google/android/gms/analytics/b;
@@ -112,6 +112,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/com/google/android/gms/analytics/d.smali b/com.discord/smali/com/google/android/gms/analytics/d.smali
index d832729a6a..4ba0a5be78 100644
--- a/com.discord/smali/com/google/android/gms/analytics/d.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/d.smali
@@ -22,7 +22,7 @@
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/t;)V
     .locals 2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -58,11 +58,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/analytics/d;->Yg:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tW()Lcom/google/android/gms/internal/measurement/al;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tV()Lcom/google/android/gms/internal/measurement/al;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al;->uo()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al;->un()Ljava/lang/String;
 
     move-result-object v0
 
@@ -89,13 +89,13 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/t;->aUu:Lcom/google/android/gms/internal/measurement/k;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/k;->tD()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/k;->tC()Ljava/lang/String;
 
     move-result-object v1
 
     iput-object v1, p1, Lcom/google/android/gms/internal/measurement/g;->aTE:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/k;->tC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/k;->tB()Z
 
     move-result v0
 
@@ -136,7 +136,7 @@
 
     check-cast v2, Lcom/google/android/gms/analytics/p;
 
-    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->ku()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->kt()Landroid/net/Uri;
 
     move-result-object v2
 
@@ -166,12 +166,12 @@
     return-void
 .end method
 
-.method public final kt()Lcom/google/android/gms/analytics/j;
+.method public final ks()Lcom/google/android/gms/analytics/j;
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/analytics/l;->Yz:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kv()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->ku()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/internal/measurement/t;->aUv:Lcom/google/android/gms/internal/measurement/ae;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ae;->ue()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ae;->ud()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v1
 
@@ -193,13 +193,13 @@
 
     iget-object v1, v1, Lcom/google/android/gms/internal/measurement/t;->aUw:Lcom/google/android/gms/internal/measurement/ax;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ax;->uH()Lcom/google/android/gms/internal/measurement/c;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ax;->uG()Lcom/google/android/gms/internal/measurement/c;
 
     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;->kx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->kw()V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/analytics/e.smali b/com.discord/smali/com/google/android/gms/analytics/e.smali
index 556795c1bc..ad6bf4732e 100644
--- a/com.discord/smali/com/google/android/gms/analytics/e.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/e.smali
@@ -793,7 +793,7 @@
 
     if-eqz v2, :cond_13
 
-    invoke-virtual {v2}, Lcom/google/android/gms/analytics/a/b;->ks()Ljava/util/Map;
+    invoke-virtual {v2}, Lcom/google/android/gms/analytics/a/b;->kr()Ljava/util/Map;
 
     move-result-object v2
 
@@ -842,7 +842,6 @@
 
     move-result-object v5
 
-    :goto_5
     invoke-interface {v4}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v4
@@ -860,7 +859,15 @@
 
     check-cast v5, Ljava/lang/String;
 
-    goto :goto_5
+    invoke-interface {v4}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/String;
+
+    invoke-interface {v0, v5, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_4
 
     :cond_13
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/d;->aTw:Ljava/util/List;
@@ -875,7 +882,7 @@
 
     const/4 v4, 0x1
 
-    :goto_6
+    :goto_5
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
@@ -902,7 +909,7 @@
 
     add-int/2addr v4, v3
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_14
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/d;->aTv:Ljava/util/List;
@@ -917,7 +924,7 @@
 
     const/4 v4, 0x1
 
-    :goto_7
+    :goto_6
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
@@ -944,7 +951,7 @@
 
     add-int/2addr v4, v3
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_15
     iget-object v1, v1, Lcom/google/android/gms/internal/measurement/d;->aTx:Ljava/util/Map;
@@ -959,7 +966,7 @@
 
     const/4 v2, 0x1
 
-    :goto_8
+    :goto_7
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
@@ -990,7 +997,7 @@
 
     const/4 v7, 0x1
 
-    :goto_9
+    :goto_8
     invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v8
@@ -1027,7 +1034,7 @@
 
     move-result-object v9
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_16
     new-instance v10, Ljava/lang/String;
@@ -1036,7 +1043,7 @@
 
     move-object v9, v10
 
-    :goto_a
+    :goto_9
     invoke-virtual {v8, v9}, Lcom/google/android/gms/analytics/a/a;->aG(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v8
@@ -1045,7 +1052,7 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_17
     invoke-interface {v4}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
@@ -1080,7 +1087,7 @@
 
     move-result-object v5
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_18
     new-instance v6, Ljava/lang/String;
@@ -1089,7 +1096,7 @@
 
     move-object v5, v6
 
-    :goto_b
+    :goto_a
     invoke-interface {v4}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
     move-result-object v4
@@ -1101,7 +1108,7 @@
     :cond_19
     add-int/lit8 v2, v2, 0x1
 
-    goto/16 :goto_8
+    goto/16 :goto_7
 
     :cond_1a
     const-class v1, Lcom/google/android/gms/internal/measurement/c;
@@ -1227,7 +1234,7 @@
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/q;->aQ(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/analytics/j;->kv()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p1}, Lcom/google/android/gms/analytics/j;->ku()Lcom/google/android/gms/analytics/j;
 
     move-result-object v1
 
@@ -1249,7 +1256,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -1274,7 +1281,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -1291,7 +1298,7 @@
     :cond_1
     iget-object v3, p0, Lcom/google/android/gms/analytics/e;->Yg:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/t;->tU()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/analytics/b;
 
     move-result-object v3
 
@@ -1347,7 +1354,7 @@
 
     iget-object v3, p0, Lcom/google/android/gms/analytics/e;->Yg:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/t;->tU()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/analytics/b;
 
     move-result-object v3
 
@@ -1500,7 +1507,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object v2
 
@@ -1520,7 +1527,7 @@
 
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v3
 
@@ -1530,7 +1537,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object v0
 
@@ -1539,7 +1546,7 @@
     return-void
 .end method
 
-.method public final ku()Landroid/net/Uri;
+.method public final kt()Landroid/net/Uri;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/analytics/e;->Yk:Landroid/net/Uri;
diff --git a/com.discord/smali/com/google/android/gms/analytics/f.smali b/com.discord/smali/com/google/android/gms/analytics/f.smali
index 53ccb6aaf1..ef583f22c8 100644
--- a/com.discord/smali/com/google/android/gms/analytics/f.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/f.smali
@@ -29,8 +29,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/f;->Yl:Landroid/content/BroadcastReceiver$PendingResult;
-
     invoke-virtual {v0}, Landroid/content/BroadcastReceiver$PendingResult;->finish()V
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/analytics/h.smali b/com.discord/smali/com/google/android/gms/analytics/h.smali
index 634bf7881e..558dc6c767 100644
--- a/com.discord/smali/com/google/android/gms/analytics/h.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/h.smali
@@ -138,7 +138,7 @@
     return-void
 .end method
 
-.method public final ku()Landroid/net/Uri;
+.method public final kt()Landroid/net/Uri;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/analytics/h;->Yk:Landroid/net/Uri;
diff --git a/com.discord/smali/com/google/android/gms/analytics/j.smali b/com.discord/smali/com/google/android/gms/analytics/j.smali
index 4f15ab6059..ffabb6863e 100644
--- a/com.discord/smali/com/google/android/gms/analytics/j.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/j.smali
@@ -320,7 +320,7 @@
     throw p1
 .end method
 
-.method public final kv()Lcom/google/android/gms/analytics/j;
+.method public final ku()Lcom/google/android/gms/analytics/j;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/analytics/j;
@@ -330,7 +330,7 @@
     return-object v0
 .end method
 
-.method public final kw()V
+.method public final kv()V
     .locals 7
 
     iget-object v0, p0, Lcom/google/android/gms/analytics/j;->Yn:Lcom/google/android/gms/analytics/l;
@@ -345,7 +345,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->kv()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->ku()Lcom/google/android/gms/analytics/j;
 
     move-result-object v1
 
@@ -365,12 +365,9 @@
 
     if-eqz v6, :cond_0
 
-    iget-wide v2, v1, Lcom/google/android/gms/analytics/j;->Yr:J
-
-    :goto_0
     iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->Yq:J
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v2, v1, Lcom/google/android/gms/analytics/j;->Yo:Lcom/google/android/gms/common/util/d;
@@ -379,9 +376,9 @@
 
     move-result-wide v2
 
-    goto :goto_0
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->Yq:J
 
-    :goto_1
+    :goto_0
     const/4 v2, 0x1
 
     iput-boolean v2, v1, Lcom/google/android/gms/analytics/j;->Yp:Z
diff --git a/com.discord/smali/com/google/android/gms/analytics/l.smali b/com.discord/smali/com/google/android/gms/analytics/l.smali
index 77eff31c6e..fae12a957f 100644
--- a/com.discord/smali/com/google/android/gms/analytics/l.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/l.smali
@@ -66,21 +66,21 @@
     return-void
 .end method
 
-.method public kt()Lcom/google/android/gms/analytics/j;
+.method public ks()Lcom/google/android/gms/analytics/j;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/analytics/l;->Yz:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kv()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->ku()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->kx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->kw()V
 
     return-object v0
 .end method
 
-.method protected final kx()V
+.method protected final kw()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/analytics/l;->YA:Ljava/util/List;
diff --git a/com.discord/smali/com/google/android/gms/analytics/m.smali b/com.discord/smali/com/google/android/gms/analytics/m.smali
index ba82c987ec..0dffb2329c 100644
--- a/com.discord/smali/com/google/android/gms/analytics/m.smali
+++ b/com.discord/smali/com/google/android/gms/analytics/m.smali
@@ -183,7 +183,7 @@
 
     check-cast v2, Lcom/google/android/gms/analytics/p;
 
-    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->ku()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->kt()Landroid/net/Uri;
 
     move-result-object v3
 
@@ -203,7 +203,7 @@
     return-void
 .end method
 
-.method public static kz()V
+.method public static ky()V
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
@@ -282,7 +282,7 @@
     return-void
 .end method
 
-.method public final ky()Lcom/google/android/gms/internal/measurement/hh;
+.method public final kx()Lcom/google/android/gms/internal/measurement/hh;
     .locals 7
 
     iget-object v0, p0, Lcom/google/android/gms/analytics/m;->YG:Lcom/google/android/gms/internal/measurement/hh;
@@ -358,13 +358,11 @@
     move-object v2, v1
 
     :cond_0
-    iget-object v1, v4, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
+    iget-object v3, v4, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
     :try_end_1
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    move-object v3, v1
-
     goto :goto_1
 
     :catch_0
diff --git a/com.discord/smali/com/google/android/gms/analytics/p.smali b/com.discord/smali/com/google/android/gms/analytics/p.smali
index 2af6a1c790..a00aa3aba2 100644
--- a/com.discord/smali/com/google/android/gms/analytics/p.smali
+++ b/com.discord/smali/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 ku()Landroid/net/Uri;
+.method public abstract kt()Landroid/net/Uri;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/analyticsservices/R.smali b/com.discord/smali/com/google/android/gms/analyticsservices/R.smali
index 9ecd832488..f15cfd35ee 100644
--- a/com.discord/smali/com/google/android/gms/analyticsservices/R.smali
+++ b/com.discord/smali/com/google/android/gms/analyticsservices/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/analyticsservices/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/google/android/gms/analyticsservices_app_library/R.smali b/com.discord/smali/com/google/android/gms/analyticsservices_app_library/R.smali
index 06353c8a59..5ce111e855 100644
--- a/com.discord/smali/com/google/android/gms/analyticsservices_app_library/R.smali
+++ b/com.discord/smali/com/google/android/gms/analyticsservices_app_library/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/analyticsservices_app_library/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/google/android/gms/appinvite/R.smali b/com.discord/smali/com/google/android/gms/appinvite/R.smali
index bd53523236..51de6383e9 100644
--- a/com.discord/smali/com/google/android/gms/appinvite/R.smali
+++ b/com.discord/smali/com/google/android/gms/appinvite/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/appinvite/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali b/com.discord/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali
index 290a853a2a..8c893b186d 100644
--- a/com.discord/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali
+++ b/com.discord/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali
@@ -73,7 +73,7 @@
 
     sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->CREATOR:Landroid/os/Parcelable$Creator;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/f;->lZ()Lcom/google/android/gms/common/util/d;
+    invoke-static {}, Lcom/google/android/gms/common/util/f;->lY()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -388,11 +388,11 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kA()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kz()Ljava/util/Set;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kA()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kz()Ljava/util/Set;
 
     move-result-object v1
 
@@ -421,7 +421,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kA()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kz()Ljava/util/Set;
 
     move-result-object v1
 
@@ -434,7 +434,7 @@
     return v0
 .end method
 
-.method public final kA()Ljava/util/Set;
+.method public final kz()Ljava/util/Set;
     .locals 2
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
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 d41f21f1c2..9656143580 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
@@ -176,6 +176,8 @@
     return-object p1
 
     :catch_0
+    return-object v1
+
     :cond_1
     return-object v1
 .end method
diff --git a/com.discord/smali/com/google/android/gms/b/a.smali b/com.discord/smali/com/google/android/gms/b/a.smali
index 52cbe00797..fc1248c727 100644
--- a/com.discord/smali/com/google/android/gms/b/a.smali
+++ b/com.discord/smali/com/google/android/gms/b/a.smali
@@ -14,7 +14,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/base/R$a.smali b/com.discord/smali/com/google/android/gms/base/R$a.smali
index e6a015b1e5..3cb14d6c18 100644
--- a/com.discord/smali/com/google/android/gms/base/R$a.smali
+++ b/com.discord/smali/com/google/android/gms/base/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/base/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/gms/base/R$b.smali b/com.discord/smali/com/google/android/gms/base/R$b.smali
index 5b4f4a0434..0bbf96a419 100644
--- a/com.discord/smali/com/google/android/gms/base/R$b.smali
+++ b/com.discord/smali/com/google/android/gms/base/R$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/base/R$b;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/gms/base/R.smali b/com.discord/smali/com/google/android/gms/base/R.smali
index 0104d26c9c..f4066307d4 100644
--- a/com.discord/smali/com/google/android/gms/base/R.smali
+++ b/com.discord/smali/com/google/android/gms/base/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/base/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/gms/clearcut/R.smali b/com.discord/smali/com/google/android/gms/clearcut/R.smali
index ad4777023d..653dfe397a 100644
--- a/com.discord/smali/com/google/android/gms/clearcut/R.smali
+++ b/com.discord/smali/com/google/android/gms/clearcut/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/clearcut/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali/com/google/android/gms/clearcut/a$c.smali b/com.discord/smali/com/google/android/gms/clearcut/a$c.smali
index 3ada065bda..c318e5ffe0 100644
--- a/com.discord/smali/com/google/android/gms/clearcut/a$c.smali
+++ b/com.discord/smali/com/google/android/gms/clearcut/a$c.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract kC()[B
+.method public abstract kB()[B
 .end method
diff --git a/com.discord/smali/com/google/android/gms/clearcut/a.smali b/com.discord/smali/com/google/android/gms/clearcut/a.smali
index 17343e775c..81005b3b8e 100644
--- a/com.discord/smali/com/google/android/gms/clearcut/a.smali
+++ b/com.discord/smali/com/google/android/gms/clearcut/a.smali
@@ -210,7 +210,7 @@
 
     move-result-object p0
 
-    iget p0, p0, Landroid/content/pm/PackageInfo;->versionCode:I
+    iget v0, p0, Landroid/content/pm/PackageInfo;->versionCode:I
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -225,10 +225,8 @@
 
     invoke-static {v1, v2, p0}, Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    const/4 p0, 0x0
-
     :goto_0
-    return p0
+    return v0
 .end method
 
 .method static synthetic a(Lcom/google/android/gms/clearcut/a;)I
@@ -280,7 +278,7 @@
 
     invoke-direct {v3, p0}, Lcom/google/android/gms/internal/clearcut/cy;-><init>(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/util/f;->lZ()Lcom/google/android/gms/common/util/d;
+    invoke-static {}, Lcom/google/android/gms/common/util/f;->lY()Lcom/google/android/gms/common/util/d;
 
     move-result-object v4
 
@@ -347,7 +345,7 @@
     return-object p0
 .end method
 
-.method public static synthetic kB()[I
+.method public static synthetic kA()[I
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/com/google/android/gms/clearcut/zze.smali b/com.discord/smali/com/google/android/gms/clearcut/zze.smali
index 796d827b86..872407a876 100644
--- a/com.discord/smali/com/google/android/gms/clearcut/zze.smali
+++ b/com.discord/smali/com/google/android/gms/clearcut/zze.smali
@@ -355,11 +355,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance v1, Ljava/lang/String;
+    new-instance v2, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/clearcut/zze;->ZI:[B
+    invoke-direct {v2, v1}, Ljava/lang/String;-><init>([B)V
 
-    invoke-direct {v1, v2}, Ljava/lang/String;-><init>([B)V
+    move-object v1, v2
 
     :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/google/android/gms/common/ConnectionResult.smali b/com.discord/smali/com/google/android/gms/common/ConnectionResult.smali
index d18fda5ee9..7680501cd4 100644
--- a/com.discord/smali/com/google/android/gms/common/ConnectionResult.smali
+++ b/com.discord/smali/com/google/android/gms/common/ConnectionResult.smali
@@ -378,7 +378,7 @@
     return v0
 .end method
 
-.method public final kD()Z
+.method public final kC()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->ZT:I
@@ -399,7 +399,7 @@
     return v0
 .end method
 
-.method public final kE()Z
+.method public final kD()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->ZT:I
diff --git a/com.discord/smali/com/google/android/gms/common/Feature.smali b/com.discord/smali/com/google/android/gms/common/Feature.smali
index e0e0c6aeaa..ce9da4289c 100644
--- a/com.discord/smali/com/google/android/gms/common/Feature.smali
+++ b/com.discord/smali/com/google/android/gms/common/Feature.smali
@@ -65,7 +65,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     check-cast p1, Lcom/google/android/gms/common/Feature;
 
@@ -73,8 +73,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/Feature;->name:Ljava/lang/String;
-
     iget-object v2, p1, Lcom/google/android/gms/common/Feature;->name:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -93,11 +91,11 @@
     if-nez v0, :cond_2
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kF()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kE()J
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->kF()J
+    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->kE()J
 
     move-result-wide v4
 
@@ -111,6 +109,9 @@
 
     :cond_2
     return v1
+
+    :cond_3
+    return v1
 .end method
 
 .method public hashCode()I
@@ -126,7 +127,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kF()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kE()J
 
     move-result-wide v1
 
@@ -145,7 +146,7 @@
     return v0
 .end method
 
-.method public final kF()J
+.method public final kE()J
     .locals 5
 
     iget-wide v0, p0, Lcom/google/android/gms/common/Feature;->ZW:J
@@ -160,11 +161,7 @@
 
     int-to-long v0, v0
 
-    return-wide v0
-
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/common/Feature;->ZW:J
-
     return-wide v0
 .end method
 
@@ -185,7 +182,7 @@
 
     const-string v1, "version"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kF()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kE()J
 
     move-result-wide v2
 
@@ -225,7 +222,7 @@
 
     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;->kF()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kE()J
 
     move-result-wide v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability$a.smali b/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability$a.smali
index dd0aecc059..e5139d30af 100644
--- a/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability$a.smali
@@ -118,6 +118,8 @@
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/common/GoogleApiAvailability;->e(Landroid/content/Context;I)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability.smali b/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability.smali
index cc5505348c..fc6347c06a 100644
--- a/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability.smali
+++ b/com.discord/smali/com/google/android/gms/common/GoogleApiAvailability.smali
@@ -319,7 +319,7 @@
 
     if-eqz v4, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->mb()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->ma()Z
 
     move-result v1
 
@@ -406,7 +406,7 @@
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/q;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->kH()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->kG()Ljava/lang/String;
 
     move-result-object p3
 
@@ -430,10 +430,9 @@
 
     invoke-direct {v1, p3, p1, v2}, Landroid/app/NotificationChannel;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;I)V
 
-    :goto_1
     invoke-virtual {v3, v1}, Landroid/app/NotificationManager;->createNotificationChannel(Landroid/app/NotificationChannel;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     invoke-virtual {v1}, Landroid/app/NotificationChannel;->getName()Ljava/lang/CharSequence;
@@ -448,10 +447,10 @@
 
     invoke-virtual {v1, p1}, Landroid/app/NotificationChannel;->setName(Ljava/lang/CharSequence;)V
 
-    goto :goto_1
+    invoke-virtual {v3, v1}, Landroid/app/NotificationManager;->createNotificationChannel(Landroid/app/NotificationChannel;)V
 
     :cond_6
-    :goto_2
+    :goto_1
     invoke-virtual {v0, p3}, Landroidx/core/app/NotificationCompat$Builder;->setChannelId(Ljava/lang/String;)Landroidx/core/app/NotificationCompat$Builder;
 
     :cond_7
@@ -463,7 +462,7 @@
 
     const p2, 0x9b6d
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     const/16 p2, 0x28c4
@@ -474,7 +473,7 @@
 
     invoke-virtual {p3, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
-    :goto_3
+    :goto_2
     invoke-virtual {v3, p2, p1}, Landroid/app/NotificationManager;->notify(ILandroid/app/Notification;)V
 
     return-void
@@ -487,7 +486,7 @@
     .end packed-switch
 .end method
 
-.method public static kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+.method public static kF()Lcom/google/android/gms/common/GoogleApiAvailability;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->ZX:Lcom/google/android/gms/common/GoogleApiAvailability;
@@ -495,7 +494,7 @@
     return-object v0
 .end method
 
-.method private final kH()Ljava/lang/String;
+.method private final kG()Ljava/lang/String;
     .locals 2
     .annotation build Landroidx/annotation/VisibleForTesting;
         otherwise = 0x2
@@ -616,7 +615,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;->kD()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->kC()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/GooglePlayServicesUtil.smali b/com.discord/smali/com/google/android/gms/common/GooglePlayServicesUtil.smali
index e8561caeb5..b2bf7270a8 100644
--- a/com.discord/smali/com/google/android/gms/common/GooglePlayServicesUtil.smali
+++ b/com.discord/smali/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;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()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;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()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;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()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;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/R$a.smali b/com.discord/smali/com/google/android/gms/common/R$a.smali
index a93bce3e7d..f0acef34c1 100644
--- a/com.discord/smali/com/google/android/gms/common/R$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/common/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/gms/common/R.smali b/com.discord/smali/com/google/android/gms/common/R.smali
index e5ed411101..a05bd42cd5 100644
--- a/com.discord/smali/com/google/android/gms/common/R.smali
+++ b/com.discord/smali/com/google/android/gms/common/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/common/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali/com/google/android/gms/common/api/GoogleApiActivity.smali b/com.discord/smali/com/google/android/gms/common/api/GoogleApiActivity.smali
index 82e50bd775..992a895119 100644
--- a/com.discord/smali/com/google/android/gms/common/api/GoogleApiActivity.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/GoogleApiActivity.smali
@@ -134,7 +134,7 @@
     goto :goto_0
 
     :pswitch_1
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d;->ld()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d;->lc()V
 
     goto :goto_0
 
@@ -212,10 +212,8 @@
 
     const-string v0, "Activity started without extras"
 
-    :goto_0
     invoke-static {p1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    :goto_1
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/GoogleApiActivity;->finish()V
 
     return-void
@@ -245,7 +243,11 @@
 
     const-string v0, "Activity started without resolution"
 
-    goto :goto_0
+    invoke-static {p1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/GoogleApiActivity;->finish()V
+
+    return-void
 
     :cond_2
     if-eqz v1, :cond_3
@@ -284,10 +286,12 @@
 
     invoke-static {v0, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto :goto_1
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/GoogleApiActivity;->finish()V
+
+    return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/Status.smali b/com.discord/smali/com/google/android/gms/common/api/Status.smali
index b22cf7be66..f18b583117 100644
--- a/com.discord/smali/com/google/android/gms/common/api/Status.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/Status.smali
@@ -287,7 +287,7 @@
     return v0
 .end method
 
-.method public final kD()Z
+.method public final kC()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->ZU:Landroid/app/PendingIntent;
@@ -304,7 +304,7 @@
     return v0
 .end method
 
-.method public final kE()Z
+.method public final kD()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/common/api/Status;->ZT:I
@@ -321,7 +321,7 @@
     return v0
 .end method
 
-.method public final kZ()Lcom/google/android/gms/common/api/Status;
+.method public final kY()Lcom/google/android/gms/common/api/Status;
     .locals 0
 
     return-object p0
@@ -340,8 +340,6 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/Status;->Zl:Ljava/lang/String;
-
     goto :goto_0
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/common/api/a$d$a.smali b/com.discord/smali/com/google/android/gms/common/api/a$d$a.smali
index ecfef1e2be..95b1fd76f7 100644
--- a/com.discord/smali/com/google/android/gms/common/api/a$d$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/a$d$a.smali
@@ -18,5 +18,5 @@
 
 
 # virtual methods
-.method public abstract kJ()Landroid/accounts/Account;
+.method public abstract kI()Landroid/accounts/Account;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/a$d$b.smali b/com.discord/smali/com/google/android/gms/common/api/a$d$b.smali
index 0ac62a8572..cc4f934d6b 100644
--- a/com.discord/smali/com/google/android/gms/common/api/a$d$b.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/a$d$b.smali
@@ -17,5 +17,5 @@
 
 
 # virtual methods
-.method public abstract kK()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.method public abstract kJ()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/a$f.smali b/com.discord/smali/com/google/android/gms/common/api/a$f.smali
index d177172496..9d4302c8d1 100644
--- a/com.discord/smali/com/google/android/gms/common/api/a$f.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/a$f.smali
@@ -44,17 +44,17 @@
 .method public abstract isConnecting()Z
 .end method
 
+.method public abstract kK()Z
+.end method
+
 .method public abstract kL()Z
 .end method
 
-.method public abstract kM()Z
+.method public abstract kM()Ljava/lang/String;
 .end method
 
-.method public abstract kN()Ljava/lang/String;
+.method public abstract kN()I
 .end method
 
-.method public abstract kO()I
-.end method
-
-.method public abstract kP()[Lcom/google/android/gms/common/Feature;
+.method public abstract kO()[Lcom/google/android/gms/common/Feature;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/a$h.smali b/com.discord/smali/com/google/android/gms/common/api/a$h.smali
index cd0730596c..f5d1c998bd 100644
--- a/com.discord/smali/com/google/android/gms/common/api/a$h.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/a$h.smali
@@ -27,13 +27,13 @@
 
 
 # virtual methods
+.method public abstract kP()Ljava/lang/String;
+.end method
+
 .method public abstract kQ()Ljava/lang/String;
 .end method
 
-.method public abstract kR()Ljava/lang/String;
-.end method
-
-.method public abstract kS()Landroid/os/IInterface;
+.method public abstract kR()Landroid/os/IInterface;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali/com/google/android/gms/common/api/c.smali b/com.discord/smali/com/google/android/gms/common/api/c.smali
index 6d6dc6e218..b9eed856fb 100644
--- a/com.discord/smali/com/google/android/gms/common/api/c.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/c.smali
@@ -79,7 +79,7 @@
 
     check-cast v4, Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/common/ConnectionResult;->kE()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
 
     move-result v5
 
@@ -145,17 +145,16 @@
 
     const-string v2, "None of the queried APIs are available. "
 
-    :goto_1
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const-string v2, "Some of the queried APIs are unavailable. "
 
-    goto :goto_1
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_2
+    :goto_1
     const-string v2, "; "
 
     invoke-static {v2, v0}, Landroid/text/TextUtils;->join(Ljava/lang/CharSequence;Ljava/lang/Iterable;)Ljava/lang/String;
diff --git a/com.discord/smali/com/google/android/gms/common/api/e$a$a.smali b/com.discord/smali/com/google/android/gms/common/api/e$a$a.smali
index 588ae1a05d..e86587a7ba 100644
--- a/com.discord/smali/com/google/android/gms/common/api/e$a$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/e$a$a.smali
@@ -42,7 +42,7 @@
     return-object p0
 .end method
 
-.method public final kU()Lcom/google/android/gms/common/api/e$a;
+.method public final kT()Lcom/google/android/gms/common/api/e$a;
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->aam:Lcom/google/android/gms/common/api/internal/k;
diff --git a/com.discord/smali/com/google/android/gms/common/api/e$a.smali b/com.discord/smali/com/google/android/gms/common/api/e$a.smali
index edf83c8d2f..860e3bd3bf 100644
--- a/com.discord/smali/com/google/android/gms/common/api/e$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/e$a.smali
@@ -37,7 +37,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/e$a$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/e$a$a;->kU()Lcom/google/android/gms/common/api/e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/e$a$a;->kT()Lcom/google/android/gms/common/api/e$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/e.smali b/com.discord/smali/com/google/android/gms/common/api/e.smali
index 2d38fea391..b3b3f6082e 100644
--- a/com.discord/smali/com/google/android/gms/common/api/e.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/e.smali
@@ -202,7 +202,7 @@
 
     iput-object v0, p3, Lcom/google/android/gms/common/api/e$a$a;->aak:Landroid/os/Looper;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/common/api/e$a$a;->kU()Lcom/google/android/gms/common/api/e$a;
+    invoke-virtual {p3}, Lcom/google/android/gms/common/api/e$a$a;->kT()Lcom/google/android/gms/common/api/e$a;
 
     move-result-object p3
 
@@ -333,7 +333,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/common/api/e$a$a;->kU()Lcom/google/android/gms/common/api/e$a;
+    invoke-virtual {p3}, Lcom/google/android/gms/common/api/e$a$a;->kT()Lcom/google/android/gms/common/api/e$a;
 
     move-result-object p3
 
@@ -442,11 +442,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->kT()Lcom/google/android/gms/common/internal/e$a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->kS()Lcom/google/android/gms/common/internal/e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/e$a;->lM()Lcom/google/android/gms/common/internal/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/e$a;->lL()Lcom/google/android/gms/common/internal/e;
 
     move-result-object v4
 
@@ -492,11 +492,11 @@
 
     new-instance v0, Lcom/google/android/gms/common/api/internal/ak;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->kT()Lcom/google/android/gms/common/internal/e$a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->kS()Lcom/google/android/gms/common/internal/e$a;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/e$a;->lM()Lcom/google/android/gms/common/internal/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/e$a;->lL()Lcom/google/android/gms/common/internal/e;
 
     move-result-object v1
 
@@ -813,7 +813,7 @@
     return-object v1
 .end method
 
-.method protected kT()Lcom/google/android/gms/common/internal/e$a;
+.method protected kS()Lcom/google/android/gms/common/internal/e$a;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/common/internal/e$a;
@@ -822,15 +822,13 @@
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/e;->aai:Lcom/google/android/gms/common/api/a$d;
 
-    instance-of v1, v1, Lcom/google/android/gms/common/api/a$d$b;
+    instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$b;
 
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->aai:Lcom/google/android/gms/common/api/a$d;
+    if-eqz v2, :cond_0
 
     check-cast v1, Lcom/google/android/gms/common/api/a$d$b;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->kK()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->kJ()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
     move-result-object v1
 
@@ -853,15 +851,13 @@
     :cond_0
     iget-object v1, p0, Lcom/google/android/gms/common/api/e;->aai:Lcom/google/android/gms/common/api/a$d;
 
-    instance-of v1, v1, Lcom/google/android/gms/common/api/a$d$a;
+    instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$a;
 
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->aai:Lcom/google/android/gms/common/api/a$d;
+    if-eqz v2, :cond_1
 
     check-cast v1, Lcom/google/android/gms/common/api/a$d$a;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$a;->kJ()Landroid/accounts/Account;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$a;->kI()Landroid/accounts/Account;
 
     move-result-object v2
 
@@ -875,21 +871,19 @@
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/e;->aai:Lcom/google/android/gms/common/api/a$d;
 
-    instance-of v1, v1, Lcom/google/android/gms/common/api/a$d$b;
+    instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$b;
 
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->aai:Lcom/google/android/gms/common/api/a$d;
+    if-eqz v2, :cond_2
 
     check-cast v1, Lcom/google/android/gms/common/api/a$d$b;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->kK()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->kJ()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;->kA()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kz()Ljava/util/Set;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/f$a.smali b/com.discord/smali/com/google/android/gms/common/api/f$a.smali
index 1fa991ad13..452971df90 100644
--- a/com.discord/smali/com/google/android/gms/common/api/f$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/f$a.smali
@@ -14,8 +14,8 @@
 
 
 # virtual methods
-.method public abstract kX()V
+.method public abstract kW()V
 .end method
 
-.method public abstract kY()V
+.method public abstract kX()V
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/f.smali b/com.discord/smali/com/google/android/gms/common/api/f.smali
index a3396f47db..9db1ec727e 100644
--- a/com.discord/smali/com/google/android/gms/common/api/f.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/f.smali
@@ -89,6 +89,16 @@
     throw v0
 .end method
 
+.method public kU()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
 .method public kV()V
     .locals 1
 
@@ -98,13 +108,3 @@
 
     throw v0
 .end method
-
-.method public kW()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/com/google/android/gms/common/api/internal/BasePendingResult.smali b/com.discord/smali/com/google/android/gms/common/api/internal/BasePendingResult.smali
index bfcd8f664b..eb11a56be1 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/BasePendingResult.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/BasePendingResult.smali
@@ -293,7 +293,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaQ:Lcom/google/android/gms/common/api/k;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/k;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/k;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v0
 
@@ -339,7 +339,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaO:Lcom/google/android/gms/common/api/l;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lc()Lcom/google/android/gms/common/api/k;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lb()Lcom/google/android/gms/common/api/k;
 
     move-result-object v2
 
@@ -462,7 +462,7 @@
     return v0
 .end method
 
-.method private final lc()Lcom/google/android/gms/common/api/k;
+.method private final lb()Lcom/google/android/gms/common/api/k;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -479,8 +479,16 @@
 
     const/4 v2, 0x1
 
-    xor-int/2addr v1, v2
+    if-nez v1, :cond_0
 
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
     const-string v3, "Result has already been consumed."
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
@@ -594,7 +602,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lc()Lcom/google/android/gms/common/api/k;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lb()Lcom/google/android/gms/common/api/k;
 
     move-result-object p1
 
@@ -648,7 +656,7 @@
 .end method
 
 .method public final a(Lcom/google/android/gms/common/api/l;)V
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -666,22 +674,32 @@
 
     const/4 v2, 0x1
 
-    xor-int/2addr v1, v2
-
-    const-string v3, "Result has already been consumed."
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaV:Lcom/google/android/gms/common/api/internal/ao;
+    const/4 v3, 0x0
 
     if-nez v1, :cond_0
 
+    const/4 v1, 0x1
+
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_0
+    const-string v4, "Result has already been consumed."
+
+    invoke-static {v1, v4}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
+
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaV:Lcom/google/android/gms/common/api/internal/ao;
+
+    if-nez v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
     const-string v1, "Cannot set callbacks if then() has been called."
 
     invoke-static {v2, v1}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
@@ -690,33 +708,33 @@
 
     move-result v1
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_2
 
     monitor-exit v0
 
     return-void
 
-    :cond_1
+    :cond_2
     invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->isReady()Z
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaK:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lc()Lcom/google/android/gms/common/api/k;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lb()Lcom/google/android/gms/common/api/k;
 
     move-result-object v2
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/common/api/internal/BasePendingResult$a;->a(Lcom/google/android/gms/common/api/l;Lcom/google/android/gms/common/api/k;)V
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_2
+    :cond_3
     iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaO:Lcom/google/android/gms/common/api/l;
 
-    :goto_1
+    :goto_2
     monitor-exit v0
 
     return-void
@@ -732,7 +750,7 @@
 .end method
 
 .method public final b(Lcom/google/android/gms/common/api/k;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TR;)V"
@@ -746,11 +764,11 @@
     :try_start_0
     iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaT:Z
 
-    if-nez v1, :cond_0
+    if-nez v1, :cond_2
 
     iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaS:Z
 
-    if-nez v1, :cond_0
+    if-nez v1, :cond_2
 
     invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->isReady()Z
 
@@ -758,19 +776,37 @@
 
     move-result v1
 
-    xor-int/lit8 v1, v1, 0x1
+    const/4 v2, 0x1
 
-    const-string v2, "Results have already been set"
+    const/4 v3, 0x0
 
-    invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
+    if-nez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    const-string v4, "Results have already been set"
+
+    invoke-static {v1, v4}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
 
     iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aaR:Z
 
-    xor-int/lit8 v1, v1, 0x1
+    if-nez v1, :cond_1
 
-    const-string v2, "Result has already been consumed"
+    goto :goto_1
 
-    invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    const-string v1, "Result has already been consumed"
+
+    invoke-static {v2, v1}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->c(Lcom/google/android/gms/common/api/k;)V
 
@@ -778,7 +814,7 @@
 
     return-void
 
-    :cond_0
+    :cond_2
     invoke-static {p1}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->d(Lcom/google/android/gms/common/api/k;)V
 
     monitor-exit v0
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/LifecycleCallback.smali b/com.discord/smali/com/google/android/gms/common/api/internal/LifecycleCallback.smali
index e24bb81df5..59a23a803b 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/LifecycleCallback.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/LifecycleCallback.smali
@@ -88,7 +88,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->abL:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->lr()Landroid/app/Activity;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->lq()Landroid/app/Activity;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/aa.smali b/com.discord/smali/com/google/android/gms/common/api/internal/aa.smali
index 2d8e6996a3..527cfcf2fc 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/aa.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/aa.smali
@@ -31,7 +31,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->acg:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
 
     move-result v0
 
@@ -43,11 +43,9 @@
 
     iput-boolean v1, v0, Lcom/google/android/gms/common/api/internal/d$c;->abE:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->ach:Lcom/google/android/gms/common/api/internal/d$c;
-
     iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->kL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->kK()Z
 
     move-result v0
 
@@ -55,7 +53,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->ach:Lcom/google/android/gms/common/api/internal/d$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->lo()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->ln()V
 
     return-void
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ab.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ab.smali
index 0dad7015d6..027586e316 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ab.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ab.smali
@@ -83,14 +83,14 @@
     return-object v0
 .end method
 
+.method public final kU()V
+    .locals 0
+
+    return-void
+.end method
+
 .method public final kV()V
     .locals 0
 
     return-void
 .end method
-
-.method public final kW()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ac.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ac.smali
index ffd1262225..2404c0c211 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ac.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ac.smali
@@ -50,7 +50,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ac;->acj:Lcom/google/android/gms/common/api/internal/ad;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ad;->lx()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ad;->lw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ac;->unregister()V
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ad.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ad.smali
index 6208ed9b56..775d0100f9 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ad.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ad.smali
@@ -13,5 +13,5 @@
 
 
 # virtual methods
-.method public abstract lx()V
+.method public abstract lw()V
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ae.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ae.smali
index fa5f28dd68..aa0fba015b 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ae.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ae.smali
@@ -107,14 +107,14 @@
     return-void
 .end method
 
-.method protected final ld()V
+.method protected final lc()V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ae;->acZ:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ae;->abL:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->lr()Landroid/app/Activity;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->lq()Landroid/app/Activity;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ai.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ai.smali
index 01b8d4895f..31022e817c 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ai.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ai.smali
@@ -39,7 +39,7 @@
     return-void
 .end method
 
-.method public static ly()Ljava/util/concurrent/ExecutorService;
+.method public static lx()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/ai;->acr:Ljava/util/concurrent/ExecutorService;
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ak.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ak.smali
index 77e3306602..a9891491fa 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ak.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ak.smali
@@ -142,7 +142,7 @@
 
     iget-object v0, p1, Lcom/google/android/gms/signin/internal/zaj;->adb:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
 
     move-result v1
 
@@ -152,7 +152,7 @@
 
     iget-object v0, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->adb:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
 
     move-result v1
 
@@ -194,6 +194,10 @@
 
     invoke-static {p1, v1, v2}, 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/ak;->acw:Lcom/google/android/gms/common/api/internal/an;
+
+    invoke-interface {p1, v0}, Lcom/google/android/gms/common/api/internal/an;->e(Lcom/google/android/gms/common/ConnectionResult;)V
+
     goto :goto_0
 
     :cond_0
@@ -209,15 +213,14 @@
 
     invoke-interface {v0, p1, v1}, Lcom/google/android/gms/common/api/internal/an;->b(Lcom/google/android/gms/common/internal/k;Ljava/util/Set;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    :goto_0
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ak;->acw:Lcom/google/android/gms/common/api/internal/an;
 
     invoke-interface {p1, v0}, Lcom/google/android/gms/common/api/internal/an;->e(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    :goto_1
+    :goto_0
     iget-object p0, p0, Lcom/google/android/gms/common/api/internal/ak;->acv:Lcom/google/android/gms/signin/e;
 
     invoke-interface {p0}, Lcom/google/android/gms/signin/e;->disconnect()V
@@ -252,8 +255,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ak;->acv:Lcom/google/android/gms/signin/e;
-
     invoke-interface {v0}, Lcom/google/android/gms/signin/e;->disconnect()V
 
     :cond_0
@@ -281,9 +282,7 @@
 
     iget-object v5, p0, Lcom/google/android/gms/common/api/internal/ak;->acu:Lcom/google/android/gms/common/internal/e;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ak;->acu:Lcom/google/android/gms/common/internal/e;
-
-    iget-object v6, v0, Lcom/google/android/gms/common/internal/e;->aeD:Lcom/google/android/gms/signin/a;
+    iget-object v6, v5, Lcom/google/android/gms/common/internal/e;->aeD:Lcom/google/android/gms/signin/a;
 
     move-object v7, p0
 
@@ -303,8 +302,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ak;->act:Ljava/util/Set;
-
     invoke-interface {p1}, Ljava/util/Set;->isEmpty()Z
 
     move-result p1
@@ -349,7 +346,7 @@
     return-void
 .end method
 
-.method public final kX()V
+.method public final kW()V
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -361,7 +358,7 @@
     return-void
 .end method
 
-.method public final kY()V
+.method public final kX()V
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ao.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ao.smali
index 38977a25b7..85617b1280 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ao.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ao.smali
@@ -143,7 +143,7 @@
     return-void
 .end method
 
-.method private final lz()Z
+.method private final ly()Z
     .locals 2
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "mSyncToken"
@@ -188,11 +188,11 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v1
 
@@ -202,7 +202,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/ai;->ly()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/ai;->lx()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v1
 
@@ -215,7 +215,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/ao;->lz()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/ao;->ly()Z
 
     move-result p1
 
@@ -226,7 +226,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v1
 
@@ -301,7 +301,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/ao;->lz()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/ao;->ly()Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ap.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ap.smali
index 94d28caeab..36de4b05fe 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ap.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ap.smali
@@ -42,7 +42,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ao;->acz:Lcom/google/android/gms/common/api/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/n;->la()Lcom/google/android/gms/common/api/g;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/n;->kZ()Lcom/google/android/gms/common/api/g;
 
     move-result-object v0
 
@@ -87,7 +87,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->kW()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->kV()V
 
     :cond_0
     return-void
@@ -141,7 +141,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->kW()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->kV()V
 
     :cond_1
     return-void
@@ -169,7 +169,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/api/f;->kW()V
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/f;->kV()V
 
     :cond_2
     throw v0
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/aq.smali b/com.discord/smali/com/google/android/gms/common/api/internal/aq.smali
index da13b1465f..5a4bc4b3c0 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/aq.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/aq.smali
@@ -109,11 +109,6 @@
 
     goto :goto_2
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_3
-
     :cond_1
     instance-of v1, p1, Lcom/google/android/gms/common/api/internal/aj;
 
@@ -140,7 +135,7 @@
 
     monitor-enter v2
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
     iput-object p1, v1, Lcom/google/android/gms/common/api/internal/ao;->acC:Lcom/google/android/gms/common/api/g;
@@ -172,7 +167,7 @@
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/f;->kV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/f;->kU()V
 
     const/4 p1, 0x1
 
@@ -202,36 +197,36 @@
     :goto_1
     monitor-exit v2
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_2
     :try_start_2
     monitor-exit v0
     :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     return-void
 
-    :catchall_1
+    :catchall_0
     move-exception p1
 
     :try_start_3
     monitor-exit v2
     :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :try_start_4
     throw p1
 
-    :goto_3
+    :catchall_1
+    move-exception p1
+
     monitor-exit v0
     :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     throw p1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/ay.smali b/com.discord/smali/com/google/android/gms/common/api/internal/ay.smali
index 87ca67eec6..18eeff51c9 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/ay.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/ay.smali
@@ -79,7 +79,7 @@
 
     iput p1, p0, Lcom/google/android/gms/common/api/internal/ay;->acV:I
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->kE()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/az.smali b/com.discord/smali/com/google/android/gms/common/api/internal/az.smali
index 0c9e676f1a..578c0446be 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/az.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/az.smali
@@ -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;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
@@ -117,7 +117,10 @@
     return-void
 .end method
 
-.method protected final lA()V
+.method protected abstract lc()V
+.end method
+
+.method protected final lz()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/az;->acX:Ljava/util/concurrent/atomic/AtomicReference;
@@ -126,14 +129,11 @@
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/az;->ld()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/az;->lc()V
 
     return-void
 .end method
 
-.method protected abstract ld()V
-.end method
-
 .method public final onActivityResult(IILandroid/content/Intent;)V
     .locals 3
 
@@ -230,6 +230,10 @@
 
     move-object v0, p2
 
+    const/4 v1, 0x0
+
+    goto :goto_2
+
     :cond_4
     :goto_1
     const/4 v1, 0x0
@@ -238,7 +242,7 @@
     :goto_2
     if-eqz v1, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/az;->lA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/az;->lz()V
 
     return-void
 
@@ -286,7 +290,7 @@
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/common/api/internal/az;->b(Lcom/google/android/gms/common/ConnectionResult;I)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/az;->lA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/az;->lz()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/b$a.smali b/com.discord/smali/com/google/android/gms/common/api/internal/b$a.smali
index e987885e81..48ee41f5f7 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/b$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/b$a.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract I(Z)V
+.method public abstract H(Z)V
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/b.smali b/com.discord/smali/com/google/android/gms/common/api/internal/b.smali
index 6a1b4e6036..d1238a4053 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/b.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/b.smali
@@ -87,7 +87,7 @@
     return-void
 .end method
 
-.method private final I(Z)V
+.method private final H(Z)V
     .locals 5
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/b;->aaC:Lcom/google/android/gms/common/api/internal/b;
@@ -116,7 +116,7 @@
 
     check-cast v4, Lcom/google/android/gms/common/api/internal/b$a;
 
-    invoke-interface {v4, p1}, Lcom/google/android/gms/common/api/internal/b$a;->I(Z)V
+    invoke-interface {v4, p1}, Lcom/google/android/gms/common/api/internal/b$a;->H(Z)V
 
     goto :goto_0
 
@@ -133,6 +133,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public static initialize(Landroid/app/Application;)V
@@ -178,7 +180,7 @@
     throw p0
 .end method
 
-.method public static lb()Lcom/google/android/gms/common/api/internal/b;
+.method public static la()Lcom/google/android/gms/common/api/internal/b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/b;->aaC:Lcom/google/android/gms/common/api/internal/b;
@@ -233,7 +235,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0, p2}, Lcom/google/android/gms/common/api/internal/b;->I(Z)V
+    invoke-direct {p0, p2}, Lcom/google/android/gms/common/api/internal/b;->H(Z)V
 
     :cond_0
     return-void
@@ -270,7 +272,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/b;->I(Z)V
+    invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/b;->H(Z)V
 
     :cond_0
     return-void
@@ -329,7 +331,7 @@
 
     invoke-virtual {p1, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
-    invoke-direct {p0, v1}, Lcom/google/android/gms/common/api/internal/b;->I(Z)V
+    invoke-direct {p0, v1}, Lcom/google/android/gms/common/api/internal/b;->H(Z)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/bb.smali b/com.discord/smali/com/google/android/gms/common/api/internal/bb.smali
index 43aa7e60b9..55153730ca 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/bb.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/bb.smali
@@ -44,7 +44,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ba;->adb:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kC()Z
 
     move-result v1
 
@@ -172,7 +172,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ad;->lx()V
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ad;->lw()V
 
     invoke-virtual {v3}, Lcom/google/android/gms/common/api/internal/ac;->unregister()V
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/bc.smali b/com.discord/smali/com/google/android/gms/common/api/internal/bc.smali
index 4ba9596d00..e3a331a54d 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/bc.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/bc.smali
@@ -23,14 +23,14 @@
 
 
 # virtual methods
-.method public final lx()V
+.method public final lw()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bc;->adg:Lcom/google/android/gms/common/api/internal/bb;
 
     iget-object v0, v0, Lcom/google/android/gms/common/api/internal/bb;->ade:Lcom/google/android/gms/common/api/internal/az;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/az;->lA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/az;->lz()V
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bc;->adf:Landroid/app/Dialog;
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/bf.smali b/com.discord/smali/com/google/android/gms/common/api/internal/bf.smali
index 07f3d31223..ac45aaa5ae 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/bf.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/bf.smali
@@ -310,7 +310,7 @@
     return-void
 .end method
 
-.method public final lr()Landroid/app/Activity;
+.method public final lq()Landroid/app/Activity;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/bf;->getActivity()Landroid/app/Activity;
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/bh.smali b/com.discord/smali/com/google/android/gms/common/api/internal/bh.smali
index a8d8bb663e..7eee4aca89 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/bh.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/bh.smali
@@ -310,7 +310,7 @@
     return-void
 .end method
 
-.method public final synthetic lr()Landroid/app/Activity;
+.method public final synthetic lq()Landroid/app/Activity;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/bh;->getActivity()Landroidx/fragment/app/FragmentActivity;
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/c$a.smali b/com.discord/smali/com/google/android/gms/common/api/internal/c$a.smali
index 43d8e64557..14cb3b5e7e 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/c$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/c$a.smali
@@ -208,7 +208,7 @@
         .end annotation
     .end param
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/d$a.smali b/com.discord/smali/com/google/android/gms/common/api/internal/d$a.smali
index 33d1cb2891..318fa09124 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/d$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/d$a.smali
@@ -101,7 +101,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/api/internal/d;Lcom/google/android/gms/common/api/e;)V
-    .locals 2
+    .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
@@ -161,27 +161,22 @@
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    instance-of v1, v1, Lcom/google/android/gms/common/internal/r;
+    instance-of v2, v1, Lcom/google/android/gms/common/internal/r;
 
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
+    if-eqz v2, :cond_0
 
     check-cast v1, Lcom/google/android/gms/common/internal/r;
 
     iget-object v1, v1, Lcom/google/android/gms/common/internal/r;->afh:Lcom/google/android/gms/common/api/a$h;
 
-    :goto_0
     iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abp:Lcom/google/android/gms/common/api/a$b;
 
-    goto :goto_1
-
-    :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
-
     goto :goto_0
 
-    :goto_1
+    :cond_0
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abp:Lcom/google/android/gms/common/api/a$b;
+
+    :goto_0
     iget-object v1, p2, Lcom/google/android/gms/common/api/e;->aaj:Lcom/google/android/gms/common/api/internal/ax;
 
     iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abq:Lcom/google/android/gms/common/api/internal/ax;
@@ -198,7 +193,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->kL()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->kK()Z
 
     move-result v1
 
@@ -240,7 +235,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
     array-length v1, p1
 
@@ -251,7 +246,7 @@
     :cond_0
     iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->kP()[Lcom/google/android/gms/common/Feature;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->kO()[Lcom/google/android/gms/common/Feature;
 
     move-result-object v1
 
@@ -279,7 +274,7 @@
 
     iget-object v7, v6, Lcom/google/android/gms/common/Feature;->name:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/common/Feature;->kF()J
+    invoke-virtual {v6}, Lcom/google/android/gms/common/Feature;->kE()J
 
     move-result-wide v8
 
@@ -321,7 +316,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->kF()J
+    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->kE()J
 
     move-result-wide v7
 
@@ -341,6 +336,9 @@
     return-object v4
 
     :cond_5
+    return-object v0
+
+    :cond_6
     :goto_3
     return-object v0
 .end method
@@ -348,7 +346,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;->lg()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lf()V
 
     return-void
 .end method
@@ -362,7 +360,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->le()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->ld()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -650,7 +648,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->kN()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->kM()Ljava/lang/String;
 
     move-result-object v2
 
@@ -676,7 +674,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abr:Lcom/google/android/gms/common/api/internal/o;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->kL()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->kK()Z
 
     move-result v1
 
@@ -690,7 +688,7 @@
     return-void
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->kY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->kX()V
 
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
@@ -699,18 +697,18 @@
     return-void
 .end method
 
-.method private final lg()V
+.method private final lf()V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lk()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lj()V
 
     sget-object v0, Lcom/google/android/gms/common/ConnectionResult;->ZR: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;->lm()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ll()V
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abt:Ljava/util/Map;
 
@@ -745,7 +743,6 @@
 
     if-eqz v2, :cond_0
 
-    :catch_0
     invoke-interface {v0}, Ljava/util/Iterator;->remove()V
 
     goto :goto_0
@@ -767,22 +764,27 @@
 
     goto :goto_0
 
+    :catch_0
+    invoke-interface {v0}, Ljava/util/Iterator;->remove()V
+
+    goto :goto_0
+
     :catch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->kY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->kX()V
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo: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;->li()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lh()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ln()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lm()V
 
     return-void
 .end method
 
-.method private final ln()V
+.method private final lm()V
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abz:Lcom/google/android/gms/common/api/internal/d;
@@ -828,7 +830,7 @@
 
 
 # virtual methods
-.method final J(Z)Z
+.method final I(Z)Z
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -861,7 +863,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abr:Lcom/google/android/gms/common/api/internal/o;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/o;->ls()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/o;->lr()Z
 
     move-result v0
 
@@ -869,7 +871,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ln()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lm()V
 
     :cond_0
     return v1
@@ -908,8 +910,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abv:Lcom/google/android/gms/common/api/internal/ak;
-
     iget-object v1, v0, Lcom/google/android/gms/common/api/internal/ak;->acv:Lcom/google/android/gms/signin/e;
 
     if-eqz v1, :cond_0
@@ -919,7 +919,7 @@
     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;->lk()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lj()V
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abz:Lcom/google/android/gms/common/api/internal/d;
 
@@ -939,7 +939,7 @@
 
     if-ne v0, v1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->lf()Lcom/google/android/gms/common/api/Status;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->le()Lcom/google/android/gms/common/api/Status;
 
     move-result-object p1
 
@@ -1224,7 +1224,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ln()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lm()V
 
     return-void
 
@@ -1244,9 +1244,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aby:Lcom/google/android/gms/common/ConnectionResult;
-
-    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kC()Z
 
     move-result p1
 
@@ -1339,7 +1337,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->kL()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->kK()Z
 
     move-result v1
 
@@ -1354,6 +1352,8 @@
 
     invoke-interface {v1, v0}, Lcom/google/android/gms/common/api/a$f;->a(Lcom/google/android/gms/common/internal/d$c;)V
 
+    return-void
+
     :cond_3
     :goto_0
     return-void
@@ -1403,18 +1403,57 @@
     return-void
 .end method
 
-.method public final kL()Z
+.method public final kK()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->kL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->kK()Z
 
     move-result v0
 
     return v0
 .end method
 
+.method public final kW()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;->abz: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
+
+    invoke-virtual {v1}, Landroid/os/Handler;->getLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    if-ne v0, v1, :cond_0
+
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lf()V
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abz: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
+
+    new-instance v1, Lcom/google/android/gms/common/api/internal/w;
+
+    invoke-direct {v1, p0}, Lcom/google/android/gms/common/api/internal/w;-><init>(Lcom/google/android/gms/common/api/internal/d$a;)V
+
+    invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
+
 .method public final kX()V
     .locals 2
 
@@ -1434,46 +1473,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lg()V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abz: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
-
-    new-instance v1, Lcom/google/android/gms/common/api/internal/w;
-
-    invoke-direct {v1, p0}, Lcom/google/android/gms/common/api/internal/w;-><init>(Lcom/google/android/gms/common/api/internal/d$a;)V
-
-    invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
-
-    return-void
-.end method
-
-.method public final kY()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;->abz: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
-
-    invoke-virtual {v1}, Landroid/os/Handler;->getLooper()Landroid/os/Looper;
-
-    move-result-object v1
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lg()V
 
     return-void
 
@@ -1493,12 +1493,12 @@
     return-void
 .end method
 
-.method final lh()V
+.method final lg()V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lk()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lj()V
 
     const/4 v0, 0x1
 
@@ -1506,7 +1506,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abr:Lcom/google/android/gms/common/api/internal/o;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/o;->lu()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/o;->lt()V
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abz:Lcom/google/android/gms/common/api/internal/d;
 
@@ -1577,7 +1577,7 @@
     return-void
 .end method
 
-.method final li()V
+.method final lh()V
     .locals 5
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1632,7 +1632,7 @@
     return-void
 .end method
 
-.method public final lj()V
+.method public final li()V
     .locals 6
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1651,7 +1651,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abr:Lcom/google/android/gms/common/api/internal/o;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/o;->lt()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/o;->ls()V
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->abt:Ljava/util/Map;
 
@@ -1725,7 +1725,7 @@
     return-void
 .end method
 
-.method public final lk()V
+.method public final lj()V
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1745,7 +1745,7 @@
     return-void
 .end method
 
-.method public final ll()Lcom/google/android/gms/common/ConnectionResult;
+.method public final lk()Lcom/google/android/gms/common/ConnectionResult;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1763,7 +1763,7 @@
     return-object v0
 .end method
 
-.method final lm()V
+.method final ll()V
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/d$b.smali b/com.discord/smali/com/google/android/gms/common/api/internal/d$b.smali
index d450395667..3bc5e2ebe4 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/d$b.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/d$b.smali
@@ -63,11 +63,11 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     instance-of v1, p1, Lcom/google/android/gms/common/api/internal/d$b;
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$b;
 
@@ -97,6 +97,9 @@
 
     :cond_0
     return v0
+
+    :cond_1
+    return v0
 .end method
 
 .method public final hashCode()I
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/d$c.smali b/com.discord/smali/com/google/android/gms/common/api/internal/d$c.smali
index 94a1abfa70..cbaf4a42a8 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/d$c.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/d$c.smali
@@ -107,7 +107,7 @@
 
     iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->abD:Ljava/util/Set;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->lo()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->ln()V
 
     return-void
 
@@ -192,7 +192,7 @@
     return-void
 .end method
 
-.method final lo()V
+.method final ln()V
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -205,13 +205,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->abo:Lcom/google/android/gms/common/api/a$f;
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->abC:Lcom/google/android/gms/common/internal/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->abo:Lcom/google/android/gms/common/api/a$f;
 
     iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$c;->abD:Ljava/util/Set;
 
-    invoke-interface {v0, v1, v2}, Lcom/google/android/gms/common/api/a$f;->a(Lcom/google/android/gms/common/internal/k;Ljava/util/Set;)V
+    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
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/d.smali b/com.discord/smali/com/google/android/gms/common/api/internal/d.smali
index 09b9cb8169..7e7d618d17 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/d.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/d.smali
@@ -199,11 +199,9 @@
 
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
+    const/4 p2, 0x6
 
-    const/4 p3, 0x6
-
-    invoke-virtual {p2, p3}, Landroid/os/Handler;->obtainMessage(I)Landroid/os/Message;
+    invoke-virtual {p1, p2}, Landroid/os/Handler;->obtainMessage(I)Landroid/os/Message;
 
     move-result-object p2
 
@@ -244,7 +242,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v3
 
@@ -319,7 +317,7 @@
     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;->kL()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/internal/d$a;->kK()Z
 
     move-result p1
 
@@ -391,7 +389,7 @@
     return-object p0
 .end method
 
-.method static synthetic le()Ljava/lang/Object;
+.method static synthetic ld()Ljava/lang/Object;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/d;->lock:Ljava/lang/Object;
@@ -399,7 +397,7 @@
     return-object v0
 .end method
 
-.method static synthetic lf()Lcom/google/android/gms/common/api/Status;
+.method static synthetic le()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aaZ:Lcom/google/android/gms/common/api/Status;
@@ -410,7 +408,7 @@
 
 # virtual methods
 .method public final a(Lcom/google/android/gms/common/api/e;)V
-    .locals 3
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -421,11 +419,9 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
+    const/4 v1, 0x7
 
-    const/4 v2, 0x7
-
-    invoke-virtual {v1, v2, p1}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
+    invoke-virtual {v0, v1, p1}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object p1
 
@@ -492,7 +488,7 @@
 .end method
 
 .method public final b(Lcom/google/android/gms/common/ConnectionResult;I)V
-    .locals 4
+    .locals 3
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/ConnectionResult;I)Z
 
@@ -502,13 +498,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
+    const/4 v1, 0x5
 
-    const/4 v2, 0x5
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v2, p2, v3, p1}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
+    invoke-virtual {v0, v1, p2, v2, p1}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object p1
 
@@ -586,7 +580,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/internal/d$a;->a(Lcom/google/android/gms/common/api/internal/d$b;)V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_1
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -635,12 +629,12 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->connect()V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->li()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lh()V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_2
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -661,10 +655,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    :goto_0
     invoke-virtual {p1, v0}, Lcom/google/android/gms/tasks/h;->k(Ljava/lang/Object;)V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->abj:Ljava/util/Map;
@@ -675,7 +668,7 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0, v4}, Lcom/google/android/gms/common/api/internal/d$a;->J(Z)Z
+    invoke-virtual {v0, v4}, Lcom/google/android/gms/common/api/internal/d$a;->I(Z)Z
 
     move-result v0
 
@@ -685,7 +678,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/tasks/h;->k(Ljava/lang/Object;)V
+
+    goto/16 :goto_8
 
     :pswitch_3
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->abj:Ljava/util/Map;
@@ -708,9 +703,9 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {p1, v5}, Lcom/google/android/gms/common/api/internal/d$a;->J(Z)Z
+    invoke-virtual {p1, v5}, Lcom/google/android/gms/common/api/internal/d$a;->I(Z)Z
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_4
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->abj:Ljava/util/Map;
@@ -743,7 +738,7 @@
 
     if-eqz v0, :cond_10
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->lm()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->ll()V
 
     iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->abz:Lcom/google/android/gms/common/api/internal/d;
 
@@ -769,7 +764,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     new-instance v0, Lcom/google/android/gms/common/api/Status;
@@ -778,14 +773,14 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;)V
 
-    :goto_1
+    :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;->abo:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {p1}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_5
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->abm:Ljava/util/Set;
@@ -794,7 +789,7 @@
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
@@ -815,16 +810,16 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->li()V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->abm:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->clear()V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_6
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->abj:Ljava/util/Map;
@@ -859,7 +854,7 @@
 
     invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->connect()V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_7
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -868,7 +863,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/api/internal/d;->b(Lcom/google/android/gms/common/api/e;)V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_8
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->abe:Landroid/content/Context;
@@ -891,7 +886,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;->lb()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->la()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p1
 
@@ -901,7 +896,7 @@
 
     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;->lb()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->la()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p1
 
@@ -948,27 +943,27 @@
 
     invoke-virtual {v0, v5}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     const/4 p1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
-    :goto_3
+    :goto_2
     iget-object p1, p1, Lcom/google/android/gms/common/api/internal/b;->aaD:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
     move-result p1
 
-    :goto_4
+    :goto_3
     if-nez p1, :cond_10
 
     iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->abc:J
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_9
     iget v0, p1, Landroid/os/Message;->arg1:I
@@ -1004,12 +999,12 @@
 
     if-ne v4, v0, :cond_7
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
     move-object v2, v3
 
-    :goto_5
+    :goto_4
     if-eqz v2, :cond_9
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
@@ -1070,7 +1065,7 @@
 
     invoke-virtual {v2, v0}, Lcom/google/android/gms/common/api/internal/d$a;->f(Lcom/google/android/gms/common/api/Status;)V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :cond_9
     const-string p1, "GoogleApiManager"
@@ -1101,7 +1096,7 @@
 
     invoke-static {p1, v0, v1}, Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_a
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -1139,7 +1134,7 @@
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
     :cond_a
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->kL()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->kK()Z
 
     move-result v1
 
@@ -1161,16 +1156,16 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/common/api/internal/u;->g(Lcom/google/android/gms/common/api/Status;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->li()V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :cond_b
     iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->acm:Lcom/google/android/gms/common/api/internal/u;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/internal/d$a;->a(Lcom/google/android/gms/common/api/internal/u;)V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :pswitch_b
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->abj:Ljava/util/Map;
@@ -1183,7 +1178,7 @@
 
     move-result-object p1
 
-    :goto_6
+    :goto_5
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
@@ -1196,11 +1191,11 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lk()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lj()V
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->connect()V
 
-    goto :goto_6
+    goto :goto_5
 
     :pswitch_c
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -1217,7 +1212,7 @@
 
     move-result-object v0
 
-    :goto_7
+    :goto_6
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
@@ -1248,7 +1243,7 @@
 
     invoke-virtual {p1, v1, v0, v3}, Lcom/google/android/gms/common/api/internal/ay;->a(Lcom/google/android/gms/common/api/internal/ax;Lcom/google/android/gms/common/ConnectionResult;Ljava/lang/String;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_c
     iget-object v4, v2, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
@@ -1263,28 +1258,28 @@
 
     iget-object v2, v2, Lcom/google/android/gms/common/api/internal/d$a;->abo:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->kN()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->kM()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {p1, v1, v4, v2}, Lcom/google/android/gms/common/api/internal/ay;->a(Lcom/google/android/gms/common/api/internal/ax;Lcom/google/android/gms/common/ConnectionResult;Ljava/lang/String;)V
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_d
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->ll()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->lk()Lcom/google/android/gms/common/ConnectionResult;
 
     move-result-object v4
 
     if-eqz v4, :cond_e
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->ll()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->lk()Lcom/google/android/gms/common/ConnectionResult;
 
     move-result-object v2
 
     invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/common/api/internal/ay;->a(Lcom/google/android/gms/common/api/internal/ax;Lcom/google/android/gms/common/ConnectionResult;Ljava/lang/String;)V
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_e
     iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->abz:Lcom/google/android/gms/common/api/internal/d;
@@ -1299,7 +1294,7 @@
 
     invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->connect()V
 
-    goto :goto_7
+    goto :goto_6
 
     :pswitch_d
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -1333,7 +1328,7 @@
 
     move-result-object p1
 
-    :goto_8
+    :goto_7
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
@@ -1348,9 +1343,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
-
-    invoke-virtual {v3, v0, v1}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
+    invoke-virtual {v2, v0, v1}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object v1
 
@@ -1358,10 +1351,10 @@
 
     invoke-virtual {v2, v1, v3, v4}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_10
-    :goto_9
+    :goto_8
     return v5
 
     nop
@@ -1387,16 +1380,14 @@
     .end packed-switch
 .end method
 
-.method public final ld()V
-    .locals 3
+.method public final lc()V
+    .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
+    const/4 v1, 0x3
 
-    const/4 v2, 0x3
-
-    invoke-virtual {v1, v2}, Landroid/os/Handler;->obtainMessage(I)Landroid/os/Message;
+    invoke-virtual {v0, v1}, Landroid/os/Handler;->obtainMessage(I)Landroid/os/Message;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/e.smali b/com.discord/smali/com/google/android/gms/common/api/internal/e.smali
index 13a1f17331..d85ef017eb 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/e.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/e.smali
@@ -246,7 +246,7 @@
     throw p0
 .end method
 
-.method public static lp()Ljava/lang/String;
+.method public static lo()Ljava/lang/String;
     .locals 1
 
     const-string v0, "getGoogleAppId"
@@ -260,7 +260,7 @@
     return-object v0
 .end method
 
-.method public static lq()Z
+.method public static lp()Z
     .locals 1
 
     const-string v0, "isMeasurementExplicitlyDisabled"
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/g.smali b/com.discord/smali/com/google/android/gms/common/api/internal/g.smali
index 57e97e776a..2d9cbc824c 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/g.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/g.smali
@@ -23,7 +23,7 @@
     .end param
 .end method
 
-.method public abstract lr()Landroid/app/Activity;
+.method public abstract lq()Landroid/app/Activity;
 .end method
 
 .method public abstract startActivityForResult(Landroid/content/Intent;I)V
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/o.smali b/com.discord/smali/com/google/android/gms/common/api/internal/o.smali
index 43bb7b0d92..88be6aabc3 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/o.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/o.smali
@@ -211,11 +211,13 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p1
+
+    return-void
 .end method
 
 
 # virtual methods
-.method final ls()Z
+.method final lr()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/o;->abW:Ljava/util/Map;
@@ -248,7 +250,7 @@
     return v0
 .end method
 
-.method public final lt()V
+.method public final ls()V
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aaY:Lcom/google/android/gms/common/api/Status;
@@ -260,7 +262,7 @@
     return-void
 .end method
 
-.method public final lu()V
+.method public final lt()V
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/ar;->acI:Lcom/google/android/gms/common/api/Status;
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/r.smali b/com.discord/smali/com/google/android/gms/common/api/internal/r.smali
index f21979e915..e54223ce81 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/r.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/r.smali
@@ -85,7 +85,7 @@
     return-void
 .end method
 
-.method private final lv()V
+.method private final lu()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/r;->acb:Landroidx/collection/ArraySet;
@@ -116,12 +116,12 @@
     return-void
 .end method
 
-.method protected final ld()V
+.method protected final lc()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/r;->aan:Lcom/google/android/gms/common/api/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->ld()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->lc()V
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     invoke-super {p0}, Lcom/google/android/gms/common/api/internal/az;->onResume()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/r;->lv()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/r;->lu()V
 
     return-void
 .end method
@@ -141,7 +141,7 @@
 
     invoke-super {p0}, Lcom/google/android/gms/common/api/internal/az;->onStart()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/r;->lv()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/r;->lu()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/v.smali b/com.discord/smali/com/google/android/gms/common/api/internal/v.smali
index 59be3a7737..7d121d486a 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/v.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/v.smali
@@ -22,7 +22,7 @@
 
 
 # virtual methods
-.method public final I(Z)V
+.method public final H(Z)V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/v;->abz:Lcom/google/android/gms/common/api/internal/d;
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/x.smali b/com.discord/smali/com/google/android/gms/common/api/internal/x.smali
index a6ebfab764..ddd2a9e017 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/x.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/x.smali
@@ -27,7 +27,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/x;->ace:Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lh()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lg()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/internal/y.smali b/com.discord/smali/com/google/android/gms/common/api/internal/y.smali
index c3e01e0b6b..8a45d6f864 100644
--- a/com.discord/smali/com/google/android/gms/common/api/internal/y.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/internal/y.smali
@@ -22,7 +22,7 @@
 
 
 # virtual methods
-.method public final lw()V
+.method public final lv()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/y;->ace:Lcom/google/android/gms/common/api/internal/d$a;
diff --git a/com.discord/smali/com/google/android/gms/common/api/k.smali b/com.discord/smali/com/google/android/gms/common/api/k.smali
index a8c2662242..2b834d0f39 100644
--- a/com.discord/smali/com/google/android/gms/common/api/k.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/k.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract kZ()Lcom/google/android/gms/common/api/Status;
+.method public abstract kY()Lcom/google/android/gms/common/api/Status;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/api/n.smali b/com.discord/smali/com/google/android/gms/common/api/n.smali
index ddeedf4555..d890b70b0e 100644
--- a/com.discord/smali/com/google/android/gms/common/api/n.smali
+++ b/com.discord/smali/com/google/android/gms/common/api/n.smali
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public abstract la()Lcom/google/android/gms/common/api/g;
+.method public abstract kZ()Lcom/google/android/gms/common/api/g;
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
diff --git a/com.discord/smali/com/google/android/gms/common/b.smali b/com.discord/smali/com/google/android/gms/common/b.smali
index b299531080..9d0bdd4496 100644
--- a/com.discord/smali/com/google/android/gms/common/b.smali
+++ b/com.discord/smali/com/google/android/gms/common/b.smali
@@ -63,8 +63,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/b;->ZV:Landroid/content/DialogInterface$OnCancelListener;
-
     invoke-interface {v0, p1}, Landroid/content/DialogInterface$OnCancelListener;->onCancel(Landroid/content/DialogInterface;)V
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/common/b/a.smali b/com.discord/smali/com/google/android/gms/common/b/a.smali
index 42a68b1724..91c2773507 100644
--- a/com.discord/smali/com/google/android/gms/common/b/a.smali
+++ b/com.discord/smali/com/google/android/gms/common/b/a.smali
@@ -15,7 +15,7 @@
 
 
 # direct methods
-.method public static declared-synchronized lU()Lcom/google/android/gms/common/b/a$a;
+.method public static declared-synchronized lT()Lcom/google/android/gms/common/b/a$a;
     .locals 2
 
     const-class v0, Lcom/google/android/gms/common/b/a;
diff --git a/com.discord/smali/com/google/android/gms/common/c.smali b/com.discord/smali/com/google/android/gms/common/c.smali
index a247c5f84d..93d9c64fc1 100644
--- a/com.discord/smali/com/google/android/gms/common/c.smali
+++ b/com.discord/smali/com/google/android/gms/common/c.smali
@@ -144,7 +144,7 @@
     return p0
 .end method
 
-.method public static kI()Lcom/google/android/gms/common/c;
+.method public static kH()Lcom/google/android/gms/common/c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/c;->aab:Lcom/google/android/gms/common/c;
@@ -216,7 +216,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/internal/ah;->lR()Landroid/content/Intent;
+    invoke-static {}, Lcom/google/android/gms/common/internal/ah;->lQ()Landroid/content/Intent;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/common/c/a.smali b/com.discord/smali/com/google/android/gms/common/c/a.smali
index d3803c5f16..88934c18d0 100644
--- a/com.discord/smali/com/google/android/gms/common/c/a.smali
+++ b/com.discord/smali/com/google/android/gms/common/c/a.smali
@@ -69,12 +69,11 @@
 
     move-result-object p0
 
-    :goto_0
     sput-object p0, Lcom/google/android/gms/common/c/a;->agV:Ljava/lang/Boolean;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     :try_start_2
@@ -93,15 +92,15 @@
     .catch Ljava/lang/ClassNotFoundException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     :try_start_3
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    goto :goto_0
+    sput-object p0, Lcom/google/android/gms/common/c/a;->agV:Ljava/lang/Boolean;
 
-    :goto_1
+    :goto_0
     sput-object v1, Lcom/google/android/gms/common/c/a;->agU:Landroid/content/Context;
 
     sget-object p0, Lcom/google/android/gms/common/c/a;->agV:Ljava/lang/Boolean;
diff --git a/com.discord/smali/com/google/android/gms/common/c/b.smali b/com.discord/smali/com/google/android/gms/common/c/b.smali
index 593ef58ac8..7fcf501139 100644
--- a/com.discord/smali/com/google/android/gms/common/c/b.smali
+++ b/com.discord/smali/com/google/android/gms/common/c/b.smali
@@ -60,9 +60,9 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/16 v3, 0x13
 
@@ -93,10 +93,10 @@
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v2
+    return v1
 
     :catch_0
-    return v1
+    return v2
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/common/c/b;->agW:Landroid/content/Context;
@@ -128,7 +128,7 @@
 
     if-eqz v3, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
     add-int/lit8 v0, v0, 0x1
@@ -136,7 +136,7 @@
     goto :goto_1
 
     :cond_3
-    return v1
+    return v2
 .end method
 
 .method public final checkCallingOrSelfPermission(Ljava/lang/String;)I
@@ -193,7 +193,7 @@
     return-object p1
 .end method
 
-.method public final ml()Z
+.method public final mk()Z
     .locals 2
 
     invoke-static {}, Landroid/os/Binder;->getCallingUid()I
diff --git a/com.discord/smali/com/google/android/gms/common/data/DataHolder$a.smali b/com.discord/smali/com/google/android/gms/common/data/DataHolder$a.smali
index 528c1543a7..039eff1194 100644
--- a/com.discord/smali/com/google/android/gms/common/data/DataHolder$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/data/DataHolder$a.smali
@@ -172,20 +172,19 @@
 
     if-nez v0, :cond_0
 
-    :goto_0
     const/4 v0, -0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->adJ:Ljava/lang/String;
-
     invoke-virtual {p1, v0}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
+    const/4 v0, -0x1
+
     goto :goto_0
 
     :cond_1
@@ -213,6 +212,8 @@
 
     invoke-virtual {v2, v0, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    const/4 v0, -0x1
+
     goto :goto_0
 
     :cond_2
@@ -220,14 +221,14 @@
 
     move-result v0
 
-    :goto_1
+    :goto_0
     if-ne v0, v1, :cond_3
 
     iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->adI:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->adI:Ljava/util/ArrayList;
@@ -238,7 +239,7 @@
 
     invoke-virtual {v1, v0, p1}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V
 
-    :goto_2
+    :goto_1
     const/4 p1, 0x0
 
     iput-boolean p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->adL:Z
diff --git a/com.discord/smali/com/google/android/gms/common/data/DataHolder.smali b/com.discord/smali/com/google/android/gms/common/data/DataHolder.smali
index 31236e1198..6925aae3e3 100644
--- a/com.discord/smali/com/google/android/gms/common/data/DataHolder.smali
+++ b/com.discord/smali/com/google/android/gms/common/data/DataHolder.smali
@@ -163,7 +163,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder;->adD:Landroid/os/Bundle;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/data/DataHolder;->lC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/data/DataHolder;->lB()V
 
     return-void
 .end method
@@ -336,7 +336,7 @@
 
     move-result v10
 
-    goto :goto_3
+    goto/16 :goto_3
 
     :cond_2
     instance-of v12, v11, Ljava/lang/String;
@@ -362,7 +362,6 @@
 
     move-result-wide v10
 
-    :goto_2
     invoke-virtual {v5, v10, v11, v3, v9}, Landroid/database/CursorWindow;->putLong(JII)Z
 
     move-result v10
@@ -408,7 +407,12 @@
     :cond_6
     const-wide/16 v10, 0x0
 
-    goto :goto_2
+    :goto_2
+    invoke-virtual {v5, v10, v11, v3, v9}, Landroid/database/CursorWindow;->putLong(JII)Z
+
+    move-result v10
+
+    goto :goto_3
 
     :cond_7
     instance-of v12, v11, [B
@@ -460,7 +464,7 @@
     :goto_3
     add-int/lit8 v9, v9, 0x1
 
-    goto :goto_1
+    goto/16 :goto_1
 
     :cond_a
     new-instance p0, Ljava/lang/IllegalArgumentException;
@@ -672,6 +676,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 .method protected final finalize()V
@@ -774,7 +780,7 @@
     throw v0
 .end method
 
-.method public final lC()V
+.method public final lB()V
     .locals 4
 
     new-instance v0, Landroid/os/Bundle;
@@ -790,17 +796,15 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/common/data/DataHolder;->adz:[Ljava/lang/String;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_0
+    if-ge v1, v3, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/common/data/DataHolder;->adA:Landroid/os/Bundle;
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->adA:Landroid/os/Bundle;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->adz:[Ljava/lang/String;
+    aget-object v2, v2, v1
 
-    aget-object v3, v3, v1
-
-    invoke-virtual {v2, v3, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v3, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     add-int/lit8 v1, v1, 0x1
 
@@ -820,15 +824,13 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/common/data/DataHolder;->adB:[Landroid/database/CursorWindow;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_1
+    if-ge v0, v3, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/data/DataHolder;->adE:[I
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->adE:[I
 
-    aput v1, v2, v0
-
-    iget-object v2, p0, Lcom/google/android/gms/common/data/DataHolder;->adB:[Landroid/database/CursorWindow;
+    aput v1, v3, v0
 
     aget-object v2, v2, v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/data/a.smali b/com.discord/smali/com/google/android/gms/common/data/a.smali
index f96689d94a..28a10f2704 100644
--- a/com.discord/smali/com/google/android/gms/common/data/a.smali
+++ b/com.discord/smali/com/google/android/gms/common/data/a.smali
@@ -47,8 +47,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/data/a;->adt:Lcom/google/android/gms/common/data/DataHolder;
-
     iget v0, v0, Lcom/google/android/gms/common/data/DataHolder;->adF:I
 
     return v0
@@ -78,8 +76,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/data/a;->adt:Lcom/google/android/gms/common/data/DataHolder;
-
     invoke-virtual {v0}, Lcom/google/android/gms/common/data/DataHolder;->close()V
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/common/data/d.smali b/com.discord/smali/com/google/android/gms/common/data/d.smali
index 579f0bd998..c9a25b1a93 100644
--- a/com.discord/smali/com/google/android/gms/common/data/d.smali
+++ b/com.discord/smali/com/google/android/gms/common/data/d.smali
@@ -105,7 +105,7 @@
     return-void
 .end method
 
-.method public static lB()Lcom/google/android/gms/common/data/DataHolder$a;
+.method public static lA()Lcom/google/android/gms/common/data/DataHolder$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/data/d;->adw:[Ljava/lang/String;
@@ -295,4 +295,6 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/data/f.smali b/com.discord/smali/com/google/android/gms/common/data/f.smali
index 9a7fc924a2..12c6f3514f 100644
--- a/com.discord/smali/com/google/android/gms/common/data/f.smali
+++ b/com.discord/smali/com/google/android/gms/common/data/f.smali
@@ -123,7 +123,7 @@
 
     invoke-direct/range {v3 .. v8}, Lcom/google/android/gms/common/data/DataHolder;-><init>(I[Ljava/lang/String;[Landroid/database/CursorWindow;ILandroid/os/Bundle;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/data/DataHolder;->lC()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/data/DataHolder;->lB()V
 
     return-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/common/f.smali b/com.discord/smali/com/google/android/gms/common/f.smali
index b991c7d990..71062a9e39 100644
--- a/com.discord/smali/com/google/android/gms/common/f.smali
+++ b/com.discord/smali/com/google/android/gms/common/f.smali
@@ -96,9 +96,11 @@
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
-    :catch_0
     :cond_1
     return-void
+
+    :catch_0
+    return-void
 .end method
 
 .method public static enableUsingApkIndependentContext()V
@@ -125,7 +127,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -135,7 +137,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -275,7 +277,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -303,7 +305,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -412,7 +414,10 @@
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    goto :goto_0
+    :goto_0
+    sput-boolean v2, Lcom/google/android/gms/common/f;->zzaj:Z
+
+    goto :goto_2
 
     :catchall_0
     move-exception p0
@@ -431,7 +436,6 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :goto_0
     sput-boolean v2, Lcom/google/android/gms/common/f;->zzaj:Z
 
     goto :goto_2
@@ -542,19 +546,17 @@
     :cond_0
     new-instance p0, Ljava/lang/IllegalStateException;
 
-    sget p1, Lcom/google/android/gms/common/f;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
-
-    const/16 v1, 0x140
+    const/16 p1, 0x140
 
     new-instance v2, Ljava/lang/StringBuilder;
 
-    invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(I)V
+    invoke-direct {v2, p1}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    const-string v1, "The meta-data tag in your app\'s AndroidManifest.xml does not have the right value.  Expected "
+    const-string p1, "The meta-data tag in your app\'s AndroidManifest.xml does not have the right value.  Expected "
 
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string p1, " but found "
 
@@ -734,7 +736,7 @@
         value = 0x12
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->ma()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->lZ()Z
 
     move-result v0
 
@@ -806,7 +808,7 @@
 
     move-result v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->mc()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->mb()Z
 
     move-result v1
 
@@ -896,9 +898,11 @@
 
     return v2
 
-    :catch_1
     :cond_3
     return v3
+
+    :catch_1
+    return v3
 .end method
 
 .method public static isUserRecoverableError(I)Z
@@ -951,9 +955,9 @@
 .method private static zza(Landroid/content/Context;ZI)I
     .locals 7
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-ltz p2, :cond_0
 
@@ -988,20 +992,19 @@
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     const-string p0, "GooglePlayServicesUtil"
 
     const-string p1, "Google Play Store is missing."
 
-    :goto_1
     invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return v4
 
     :cond_1
-    :goto_2
+    :goto_1
     :try_start_1
     const-string v5, "com.google.android.gms"
 
@@ -1015,7 +1018,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/g;->J(Landroid/content/Context;)Lcom/google/android/gms/common/g;
 
-    invoke-static {v5, v1}, Lcom/google/android/gms/common/g;->a(Landroid/content/pm/PackageInfo;Z)Z
+    invoke-static {v5, v0}, Lcom/google/android/gms/common/g;->a(Landroid/content/pm/PackageInfo;Z)Z
 
     move-result p0
 
@@ -1025,12 +1028,14 @@
 
     const-string p1, "Google Play services signature invalid."
 
-    goto :goto_1
+    invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return v4
 
     :cond_2
     if-eqz p1, :cond_4
 
-    invoke-static {v3, v1}, Lcom/google/android/gms/common/g;->a(Landroid/content/pm/PackageInfo;Z)Z
+    invoke-static {v3, v0}, Lcom/google/android/gms/common/g;->a(Landroid/content/pm/PackageInfo;Z)Z
 
     move-result p0
 
@@ -1038,11 +1043,11 @@
 
     iget-object p0, v3, Landroid/content/pm/PackageInfo;->signatures:[Landroid/content/pm/Signature;
 
-    aget-object p0, p0, v0
+    aget-object p0, p0, v1
 
     iget-object p1, v5, Landroid/content/pm/PackageInfo;->signatures:[Landroid/content/pm/Signature;
 
-    aget-object p1, p1, v0
+    aget-object p1, p1, v1
 
     invoke-virtual {p0, p1}, Landroid/content/pm/Signature;->equals(Ljava/lang/Object;)Z
 
@@ -1055,7 +1060,9 @@
 
     const-string p1, "Google Play Store signature invalid."
 
-    goto :goto_1
+    invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return v4
 
     :cond_4
     iget p0, v5, Landroid/content/pm/PackageInfo;->versionCode:I
@@ -1110,13 +1117,13 @@
     :try_start_2
     const-string p0, "com.google.android.gms"
 
-    invoke-virtual {v2, p0, v0}, Landroid/content/pm/PackageManager;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
+    invoke-virtual {v2, p0, v1}, Landroid/content/pm/PackageManager;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
 
     move-result-object p0
     :try_end_2
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_2 .. :try_end_2} :catch_1
 
-    goto :goto_3
+    goto :goto_2
 
     :catch_1
     move-exception p0
@@ -1127,10 +1134,10 @@
 
     invoke-static {p1, p2, p0}, Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    return v1
+    return v0
 
     :cond_6
-    :goto_3
+    :goto_2
     iget-boolean p0, p0, Landroid/content/pm/ApplicationInfo;->enabled:Z
 
     if-nez p0, :cond_7
@@ -1140,7 +1147,7 @@
     return p0
 
     :cond_7
-    return v0
+    return v1
 
     :catch_2
     const-string p0, "GooglePlayServicesUtil"
@@ -1149,5 +1156,5 @@
 
     invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    return v1
+    return v0
 .end method
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 56bc7ef3b7..a5ea0c21ec 100644
--- a/com.discord/smali/com/google/android/gms/common/g.smali
+++ b/com.discord/smali/com/google/android/gms/common/g.smali
@@ -158,12 +158,11 @@
 
     sget-object p1, Lcom/google/android/gms/common/q;->ahj:[Lcom/google/android/gms/common/n;
 
-    :goto_0
     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;
 
     move-result-object p0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-array p1, v1, [Lcom/google/android/gms/common/n;
@@ -174,9 +173,11 @@
 
     aput-object v2, p1, v0
 
-    goto :goto_0
+    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;
 
-    :goto_1
+    move-result-object p0
+
+    :goto_0
     if-eqz p0, :cond_1
 
     return v1
@@ -219,9 +220,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/v;->aX(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
-    move-result-object v0
+    move-result-object p1
 
-    return-object v0
+    return-object p1
 
     :cond_0
     iget-object v2, v0, Landroid/content/pm/PackageInfo;->signatures:[Landroid/content/pm/Signature;
@@ -236,9 +237,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/v;->aX(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
-    move-result-object v0
+    move-result-object p1
 
-    return-object v0
+    return-object p1
 
     :cond_1
     new-instance v2, Lcom/google/android/gms/common/o;
@@ -292,11 +293,11 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/v;->aX(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :cond_3
     return-object v5
@@ -417,7 +418,7 @@
 
     const-string p1, "GoogleCertificatesRslt"
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mo()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mn()Ljava/lang/String;
 
     move-result-object v1
 
@@ -430,7 +431,7 @@
     :cond_3
     const-string p1, "GoogleCertificatesRslt"
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mo()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mn()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/common/h.smali b/com.discord/smali/com/google/android/gms/common/h.smali
index 92733e5c39..976b5cd10d 100644
--- a/com.discord/smali/com/google/android/gms/common/h.smali
+++ b/com.discord/smali/com/google/android/gms/common/h.smali
@@ -63,8 +63,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/h;->ZV:Landroid/content/DialogInterface$OnCancelListener;
-
     invoke-interface {v0, p1}, Landroid/content/DialogInterface$OnCancelListener;->onCancel(Landroid/content/DialogInterface;)V
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/common/internal/a.smali b/com.discord/smali/com/google/android/gms/common/internal/a.smali
index 624c812dab..2107767eb4 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/a.smali
+++ b/com.discord/smali/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;->kJ()Landroid/accounts/Account;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/k;->kI()Landroid/accounts/Account;
 
     move-result-object p0
     :try_end_0
@@ -68,7 +68,7 @@
     throw p1
 .end method
 
-.method public final kJ()Landroid/accounts/Account;
+.method public final kI()Landroid/accounts/Account;
     .locals 1
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
diff --git a/com.discord/smali/com/google/android/gms/common/internal/aa.smali b/com.discord/smali/com/google/android/gms/common/internal/aa.smali
index c690886eab..502e08dc41 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/aa.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/aa.smali
@@ -39,7 +39,5 @@
 
     iput-object p1, v0, Lcom/google/android/gms/common/api/j;->aat:Lcom/google/android/gms/common/api/k;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/aa;->aft:Lcom/google/android/gms/common/api/j;
-
-    return-object p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/af.smali b/com.discord/smali/com/google/android/gms/common/internal/af.smali
index ebfc03515d..f6db3f1e7b 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/af.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/af.smali
@@ -60,7 +60,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/common/internal/af;->mHandler:Landroid/os/Handler;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     move-result-object p1
 
@@ -151,7 +151,7 @@
 
     invoke-interface {v2, p2}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/ag;->lQ()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/ag;->lP()Z
 
     move-result p2
 
@@ -284,7 +284,7 @@
 
     invoke-virtual {v0, p2}, Lcom/google/android/gms/common/internal/ag;->a(Landroid/content/ServiceConnection;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ag;->lP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ag;->lO()V
 
     iget-object p2, p0, Lcom/google/android/gms/common/internal/af;->afw:Ljava/util/HashMap;
 
@@ -314,7 +314,7 @@
     goto :goto_0
 
     :pswitch_0
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ag;->lP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ag;->lO()V
 
     goto :goto_0
 
@@ -514,7 +514,7 @@
 
     if-eqz v3, :cond_4
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/ag;->lQ()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/ag;->lP()Z
 
     move-result v4
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/ag.smali b/com.discord/smali/com/google/android/gms/common/internal/ag.smali
index 97f3461d00..332fb2c962 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/ag.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/ag.smali
@@ -71,7 +71,7 @@
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/af;->c(Lcom/google/android/gms/common/internal/af;)Landroid/content/Context;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/i$a;->lO()Landroid/content/Intent;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/i$a;->lN()Landroid/content/Intent;
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->afB:Ljava/util/Set;
 
@@ -92,7 +92,7 @@
     return p1
 .end method
 
-.method public final lP()V
+.method public final lO()V
     .locals 4
 
     const/4 v0, 0x3
@@ -115,7 +115,7 @@
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/af;->c(Lcom/google/android/gms/common/internal/af;)Landroid/content/Context;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/i$a;->lO()Landroid/content/Intent;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/i$a;->lN()Landroid/content/Intent;
 
     move-result-object v1
 
@@ -183,11 +183,13 @@
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
 
-.method public final lQ()Z
+.method public final lP()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->afB:Ljava/util/Set;
@@ -265,6 +267,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final onServiceDisconnected(Landroid/content/ComponentName;)V
@@ -337,4 +341,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/ah.smali b/com.discord/smali/com/google/android/gms/common/internal/ah.smali
index d233834646..d17c2bd400 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/ah.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/ah.smali
@@ -67,7 +67,7 @@
     return-object v0
 .end method
 
-.method public static lR()Landroid/content/Intent;
+.method public static lQ()Landroid/content/Intent;
     .locals 2
 
     new-instance v0, Landroid/content/Intent;
diff --git a/com.discord/smali/com/google/android/gms/common/internal/aj.smali b/com.discord/smali/com/google/android/gms/common/internal/aj.smali
index 13d2e849b6..3b4b4cd5f9 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/aj.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/aj.smali
@@ -6,7 +6,7 @@
 
 
 # virtual methods
-.method public abstract lS()Lcom/google/android/gms/a/a;
+.method public abstract lR()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 lT()I
+.method public abstract lS()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali/com/google/android/gms/common/internal/ak.smali b/com.discord/smali/com/google/android/gms/common/internal/ak.smali
index f3e332ef9c..c7450fe878 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/ak.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/ak.smali
@@ -65,7 +65,7 @@
     return p1
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/ak;->lT()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/ak;->lS()I
 
     move-result p1
 
@@ -76,7 +76,7 @@
     goto :goto_0
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/ak;->lS()Lcom/google/android/gms/a/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/ak;->lR()Lcom/google/android/gms/a/a;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/al.smali b/com.discord/smali/com/google/android/gms/common/internal/al.smali
index 731a9127fb..abe854b081 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/al.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/al.smali
@@ -18,7 +18,7 @@
 
 
 # virtual methods
-.method public final lS()Lcom/google/android/gms/a/a;
+.method public final lR()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;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
     return-object v1
 .end method
 
-.method public final lT()I
+.method public final lS()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;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/am.smali b/com.discord/smali/com/google/android/gms/common/internal/am.smali
index 02cbc951d7..b73aba58b5 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/am.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/am.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/ap.smali b/com.discord/smali/com/google/android/gms/common/internal/ap.smali
index 73acbcbd9b..0262aeb233 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/ap.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/ap.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/b.smali b/com.discord/smali/com/google/android/gms/common/internal/b.smali
index 7c2d7e46fc..44eec9f970 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/b.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/b.smali
@@ -12,7 +12,7 @@
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/Status;->kD()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/Status;->kC()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$a.smali b/com.discord/smali/com/google/android/gms/common/internal/d$a.smali
index 55f8700e3e..aef1fedb7a 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$a.smali
@@ -14,8 +14,8 @@
 
 
 # virtual methods
-.method public abstract kX()V
+.method public abstract kW()V
 .end method
 
-.method public abstract kY()V
+.method public abstract kX()V
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$d.smali b/com.discord/smali/com/google/android/gms/common/internal/d$d.smali
index a8f51de999..a003dea626 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$d.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$d.smali
@@ -40,7 +40,7 @@
         .end annotation
     .end param
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kD()Z
 
     move-result v0
 
@@ -50,9 +50,7 @@
 
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/d$d;->aeo:Lcom/google/android/gms/common/internal/d;
-
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/d;->lI()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/d;->lH()Ljava/util/Set;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$e.smali b/com.discord/smali/com/google/android/gms/common/internal/d$e.smali
index e59c065513..a2d573eaa9 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$e.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$e.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract lw()V
+.method public abstract lv()V
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$f.smali b/com.discord/smali/com/google/android/gms/common/internal/d$f.smali
index 96171c2775..ae8d41c276 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$f.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$f.smali
@@ -84,8 +84,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/d$f;->aep:Landroid/os/Bundle;
-
     const-string v0, "pendingIntent"
 
     invoke-virtual {p1, v0}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
@@ -132,7 +130,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/common/internal/d$f;->aeo:Lcom/google/android/gms/common/internal/d;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/d;->kP()Ljava/lang/String;
 
     move-result-object v2
 
@@ -142,7 +140,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/common/internal/d$f;->aeo:Lcom/google/android/gms/common/internal/d;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/d;->kR()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -159,7 +157,7 @@
     throw p1
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d$f;->lK()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d$f;->lJ()Z
 
     move-result p1
 
@@ -177,6 +175,8 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/common/internal/d$f;->f(Lcom/google/android/gms/common/ConnectionResult;)V
 
+    return-void
+
     :cond_4
     :goto_0
     return-void
@@ -185,5 +185,5 @@
 .method protected abstract f(Lcom/google/android/gms/common/ConnectionResult;)V
 .end method
 
-.method protected abstract lK()Z
+.method protected abstract lJ()Z
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$g.smali b/com.discord/smali/com/google/android/gms/common/internal/d$g.smali
index 0e30558e46..d27b2e06b4 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$g.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$g.smali
@@ -319,7 +319,7 @@
 
     iget v4, p1, Landroid/os/Message;->arg2:I
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/internal/d$a;->kY()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/d$a;->kX()V
 
     :cond_b
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d$g;->aeo:Lcom/google/android/gms/common/internal/d;
@@ -364,7 +364,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/d$h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/d$h;->lL()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/d$h;->lK()V
 
     return-void
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$h.smali b/com.discord/smali/com/google/android/gms/common/internal/d$h.smali
index 6ce380484a..3a08cf359e 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$h.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$h.smali
@@ -73,7 +73,7 @@
     .end annotation
 .end method
 
-.method public final lL()V
+.method public final lK()V
     .locals 5
 
     monitor-enter p0
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$k.smali b/com.discord/smali/com/google/android/gms/common/internal/d$k.smali
index 559908aace..2832dde3fb 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$k.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$k.smali
@@ -69,7 +69,7 @@
     return-void
 .end method
 
-.method protected final lK()Z
+.method protected final lJ()Z
     .locals 6
 
     const/4 v0, 0x0
@@ -85,7 +85,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/common/internal/d$k;->aeo:Lcom/google/android/gms/common/internal/d;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/d;->kR()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -99,7 +99,7 @@
 
     iget-object v3, p0, Lcom/google/android/gms/common/internal/d$k;->aeo:Lcom/google/android/gms/common/internal/d;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/d;->kR()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
 
     move-result-object v3
 
@@ -201,11 +201,13 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/internal/d$a;->kX()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/d$a;->kW()V
 
     :cond_2
     const/4 v0, 0x1
 
+    return v0
+
     :cond_3
     return v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d$l.smali b/com.discord/smali/com/google/android/gms/common/internal/d$l.smali
index a074f69c2a..392c355bf0 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d$l.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d$l.smali
@@ -56,7 +56,7 @@
     return-void
 .end method
 
-.method protected final lK()Z
+.method protected final lJ()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d$l;->aeo:Lcom/google/android/gms/common/internal/d;
diff --git a/com.discord/smali/com/google/android/gms/common/internal/d.smali b/com.discord/smali/com/google/android/gms/common/internal/d.smali
index cc82481b69..6d9e6484ae 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/d.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/d.smali
@@ -164,7 +164,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v4
 
@@ -454,7 +454,7 @@
 
     iget-object v6, p0, Lcom/google/android/gms/common/internal/d;->aed:Lcom/google/android/gms/common/internal/d$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lD()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lC()Ljava/lang/String;
 
     move-result-object v7
 
@@ -481,7 +481,7 @@
 
     const-string p2, "com.google.android.gms"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kP()Ljava/lang/String;
 
     move-result-object v2
 
@@ -505,7 +505,7 @@
 
     iget-object v3, p0, Lcom/google/android/gms/common/internal/d;->aed:Lcom/google/android/gms/common/internal/d$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lD()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lC()Ljava/lang/String;
 
     move-result-object v4
 
@@ -590,7 +590,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/common/internal/d;->adV:Lcom/google/android/gms/common/internal/i;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kP()Ljava/lang/String;
 
     move-result-object v2
 
@@ -600,7 +600,7 @@
 
     iget-object v5, p0, Lcom/google/android/gms/common/internal/d;->aed:Lcom/google/android/gms/common/internal/d$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lD()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lC()Ljava/lang/String;
 
     move-result-object v6
 
@@ -637,9 +637,9 @@
 .end method
 
 .method static synthetic a(Lcom/google/android/gms/common/internal/d;)V
-    .locals 4
+    .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lE()Z
 
     move-result v0
 
@@ -659,17 +659,15 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
-
     iget-object p0, p0, Lcom/google/android/gms/common/internal/d;->aem:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
     move-result p0
 
-    const/16 v3, 0x10
+    const/16 v2, 0x10
 
-    invoke-virtual {v2, v0, p0, v3}, Landroid/os/Handler;->obtainMessage(III)Landroid/os/Message;
+    invoke-virtual {v1, v0, p0, v2}, Landroid/os/Handler;->obtainMessage(III)Landroid/os/Message;
 
     move-result-object p0
 
@@ -759,7 +757,7 @@
 .method static synthetic c(Lcom/google/android/gms/common/internal/d;)Z
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lJ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/d;->lI()Z
 
     move-result p0
 
@@ -806,7 +804,7 @@
     return-object p0
 .end method
 
-.method private final lD()Ljava/lang/String;
+.method private final lC()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -825,15 +823,11 @@
 
     move-result-object v0
 
-    return-object v0
-
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->aei:Ljava/lang/String;
-
     return-object v0
 .end method
 
-.method private final lF()Z
+.method private final lE()Z
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->mLock:Ljava/lang/Object;
@@ -869,7 +863,7 @@
     throw v1
 .end method
 
-.method private final lJ()Z
+.method private final lI()Z
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/common/internal/d;->aek:Z
@@ -881,7 +875,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kR()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
 
     move-result-object v0
 
@@ -906,7 +900,7 @@
 
     :cond_2
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kR()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kQ()Ljava/lang/String;
 
     move-result-object v0
 
@@ -925,21 +919,19 @@
 
 # virtual methods
 .method protected final a(ILandroid/os/IBinder;Landroid/os/Bundle;I)V
-    .locals 3
+    .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
+    new-instance v1, Lcom/google/android/gms/common/internal/d$k;
 
-    new-instance v2, Lcom/google/android/gms/common/internal/d$k;
-
-    invoke-direct {v2, p0, p1, p2, p3}, Lcom/google/android/gms/common/internal/d$k;-><init>(Lcom/google/android/gms/common/internal/d;ILandroid/os/IBinder;Landroid/os/Bundle;)V
+    invoke-direct {v1, p0, p1, p2, p3}, Lcom/google/android/gms/common/internal/d$k;-><init>(Lcom/google/android/gms/common/internal/d;ILandroid/os/IBinder;Landroid/os/Bundle;)V
 
     const/4 p1, 0x1
 
     const/4 p2, -0x1
 
-    invoke-virtual {v1, p1, p4, p2, v2}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
+    invoke-virtual {v0, p1, p4, p2, v1}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object p1
 
@@ -1023,7 +1015,7 @@
         .end annotation
     .end param
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/d$e;->lw()V
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/d$e;->lv()V
 
     return-void
 .end method
@@ -1043,7 +1035,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->lG()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->lF()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -1080,19 +1072,19 @@
     iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aeL:[Lcom/google/android/gms/common/api/Scope;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kL()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kK()Z
 
     move-result p2
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kJ()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kI()Landroid/accounts/Account;
 
     move-result-object p2
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kJ()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kI()Landroid/accounts/Account;
 
     move-result-object p2
 
@@ -1123,8 +1115,6 @@
 
     iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aeO:[Lcom/google/android/gms/common/Feature;
 
-    sget-object p1, Lcom/google/android/gms/common/internal/d;->adN:[Lcom/google/android/gms/common/Feature;
-
     iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aeP:[Lcom/google/android/gms/common/Feature;
 
     :try_start_0
@@ -1224,19 +1214,17 @@
 
     iget-object p1, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
+    const/4 p2, 0x6
 
-    const/4 v0, 0x6
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->aem:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/d;->aem:Ljava/util/concurrent/atomic/AtomicInteger;
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+    move-result v0
 
-    move-result v1
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
-
-    invoke-virtual {p2, v0, v1, v2}, Landroid/os/Handler;->obtainMessage(III)Landroid/os/Message;
+    invoke-virtual {p1, p2, v0, v1}, Landroid/os/Handler;->obtainMessage(III)Landroid/os/Message;
 
     move-result-object p2
 
@@ -1358,6 +1346,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw v1
+
+    return-void
 .end method
 
 .method public final isConnected()Z
@@ -1442,7 +1432,7 @@
     throw v1
 .end method
 
-.method public kJ()Landroid/accounts/Account;
+.method public kI()Landroid/accounts/Account;
     .locals 1
 
     const/4 v0, 0x0
@@ -1450,7 +1440,7 @@
     return-object v0
 .end method
 
-.method public kL()Z
+.method public kK()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1458,7 +1448,7 @@
     return v0
 .end method
 
-.method public kM()Z
+.method public kL()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -1466,7 +1456,7 @@
     return v0
 .end method
 
-.method public final kN()Ljava/lang/String;
+.method public final kM()Ljava/lang/String;
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->isConnected()Z
@@ -1479,8 +1469,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->adT:Lcom/google/android/gms/common/internal/ai;
-
     iget-object v0, v0, Lcom/google/android/gms/common/internal/ai;->mPackageName:Ljava/lang/String;
 
     return-object v0
@@ -1495,7 +1483,7 @@
     throw v0
 .end method
 
-.method public kO()I
+.method public kN()I
     .locals 1
 
     sget v0, Lcom/google/android/gms/common/c;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
@@ -1503,7 +1491,7 @@
     return v0
 .end method
 
-.method public final kP()[Lcom/google/android/gms/common/Feature;
+.method public final kO()[Lcom/google/android/gms/common/Feature;
     .locals 1
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -1522,24 +1510,24 @@
     return-object v0
 .end method
 
+.method protected abstract kP()Ljava/lang/String;
+    .annotation build Landroidx/annotation/NonNull;
+    .end annotation
+.end method
+
 .method protected abstract kQ()Ljava/lang/String;
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 .end method
 
-.method protected abstract kR()Ljava/lang/String;
-    .annotation build Landroidx/annotation/NonNull;
-    .end annotation
-.end method
-
-.method public final lE()V
-    .locals 6
+.method public final lD()V
+    .locals 5
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->adW:Lcom/google/android/gms/common/c;
 
     iget-object v1, p0, Lcom/google/android/gms/common/internal/d;->mContext:Landroid/content/Context;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kO()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/d;->kN()I
 
     move-result v2
 
@@ -1571,17 +1559,15 @@
 
     iget-object v1, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
+    const/4 v3, 0x3
 
-    const/4 v4, 0x3
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/d;->aem:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iget-object v5, p0, Lcom/google/android/gms/common/internal/d;->aem:Ljava/util/concurrent/atomic/AtomicInteger;
+    invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
-    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+    move-result v4
 
-    move-result v5
-
-    invoke-virtual {v3, v4, v5, v0, v2}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
+    invoke-virtual {v1, v3, v4, v0, v2}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object v0
 
@@ -1599,7 +1585,7 @@
     return-void
 .end method
 
-.method protected lG()Landroid/os/Bundle;
+.method protected lF()Landroid/os/Bundle;
     .locals 1
 
     new-instance v0, Landroid/os/Bundle;
@@ -1609,7 +1595,7 @@
     return-object v0
 .end method
 
-.method public final lH()Landroid/os/IInterface;
+.method public final lG()Landroid/os/IInterface;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1688,7 +1674,7 @@
     throw v1
 .end method
 
-.method protected lI()Ljava/util/Set;
+.method protected lH()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1705,21 +1691,19 @@
 .end method
 
 .method protected final w(II)V
-    .locals 4
+    .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/d;->mHandler:Landroid/os/Handler;
+    new-instance v1, Lcom/google/android/gms/common/internal/d$l;
 
-    new-instance v2, Lcom/google/android/gms/common/internal/d$l;
-
-    invoke-direct {v2, p0, p1}, Lcom/google/android/gms/common/internal/d$l;-><init>(Lcom/google/android/gms/common/internal/d;I)V
+    invoke-direct {v1, p0, p1}, Lcom/google/android/gms/common/internal/d$l;-><init>(Lcom/google/android/gms/common/internal/d;I)V
 
     const/4 p1, 0x7
 
-    const/4 v3, -0x1
+    const/4 v2, -0x1
 
-    invoke-virtual {v1, p1, p2, v3, v2}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
+    invoke-virtual {v0, p1, p2, v2, v1}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/e$a.smali b/com.discord/smali/com/google/android/gms/common/internal/e$a.smali
index e865667b69..219e5e8f31 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/e$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/e$a.smali
@@ -68,7 +68,7 @@
 
 
 # virtual methods
-.method public final lM()Lcom/google/android/gms/common/internal/e;
+.method public final lL()Lcom/google/android/gms/common/internal/e;
     .locals 10
 
     new-instance v9, Lcom/google/android/gms/common/internal/e;
diff --git a/com.discord/smali/com/google/android/gms/common/internal/f.smali b/com.discord/smali/com/google/android/gms/common/internal/f.smali
index 37696f42c7..6948ee4eed 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/f.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/f.smali
@@ -50,12 +50,12 @@
 
     invoke-interface {v1}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object p0
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v1
+    return-object p0
 
     :catch_0
     nop
@@ -172,7 +172,6 @@
 
     move-result-object p1
 
-    :goto_0
     invoke-static {p0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
     return-object v1
@@ -197,35 +196,45 @@
 
     const-string p1, "One of the API components you attempted to connect to is not available."
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v1
 
     :pswitch_2
     const-string p0, "GoogleApiAvailability"
 
     const-string p1, "The application is not licensed to the user."
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v1
 
     :pswitch_3
     const-string p0, "GoogleApiAvailability"
 
     const-string p1, "Developer error occurred. Please see logs for detailed information"
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v1
 
     :pswitch_4
     const-string p0, "GoogleApiAvailability"
 
     const-string p1, "Google Play services is invalid. Cannot recover."
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v1
 
     :pswitch_5
     const-string p0, "GoogleApiAvailability"
 
     const-string p1, "Internal error occurred. Please see logs for detailed information"
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v1
 
     :pswitch_6
     const-string p1, "GoogleApiAvailability"
@@ -302,8 +311,6 @@
 
     return-object p0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_b
@@ -739,7 +746,6 @@
 
     const p1, 0x104000a
 
-    :goto_0
     invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p0
@@ -749,17 +755,29 @@
     :pswitch_0
     sget p1, Lcom/google/android/gms/base/R$b;->common_google_play_services_enable_button:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_1
     sget p1, Lcom/google/android/gms/base/R$b;->common_google_play_services_update_button:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_2
     sget p1, Lcom/google/android/gms/base/R$b;->common_google_play_services_install_button:I
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali/com/google/android/gms/common/internal/g.smali b/com.discord/smali/com/google/android/gms/common/internal/g.smali
index e39777f39d..d297b7c188 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/g.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/g.smali
@@ -56,14 +56,14 @@
 
 
 # virtual methods
-.method protected abstract lN()V
+.method protected abstract lM()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/g;->lN()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/g;->lM()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/com/google/android/gms/common/internal/h.smali b/com.discord/smali/com/google/android/gms/common/internal/h.smali
index 658ade49ee..3f37ec42bf 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/h.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/h.smali
@@ -42,7 +42,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v4
 
@@ -184,7 +184,7 @@
 
 
 # virtual methods
-.method public final kJ()Landroid/accounts/Account;
+.method public final kI()Landroid/accounts/Account;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/h;->aev:Landroid/accounts/Account;
@@ -192,17 +192,17 @@
     return-object v0
 .end method
 
-.method public kO()I
+.method public kN()I
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/d;->kO()I
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/d;->kN()I
 
     move-result v0
 
     return v0
 .end method
 
-.method protected final lI()Ljava/util/Set;
+.method protected final lH()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/common/internal/i$a.smali b/com.discord/smali/com/google/android/gms/common/internal/i$a.smali
index 938e1ec3cb..9fc097c04a 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/i$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/i$a.smali
@@ -157,22 +157,20 @@
     return v0
 .end method
 
-.method public final lO()Landroid/content/Intent;
+.method public final lN()Landroid/content/Intent;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/i$a;->aeT:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    new-instance v0, Landroid/content/Intent;
+    new-instance v1, Landroid/content/Intent;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/i$a;->aeT:Ljava/lang/String;
+    invoke-direct {v1, v0}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/i$a;->aeU:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/i$a;->aeU:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
+    invoke-virtual {v1, v0}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
     move-result-object v0
 
@@ -206,10 +204,6 @@
 
     move-result-object v0
 
-    return-object v0
-
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/i$a;->aeT:Ljava/lang/String;
-
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/j.smali b/com.discord/smali/com/google/android/gms/common/internal/j.smali
index 0b24171e23..743d60ec2d 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/j.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/j.smali
@@ -12,7 +12,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kG()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kF()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
@@ -60,7 +60,7 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->kM()Z
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->kL()Z
 
     move-result v0
 
@@ -71,7 +71,7 @@
     return v1
 
     :cond_0
-    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->kO()I
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->kN()I
 
     move-result p2
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/k$a$a.smali b/com.discord/smali/com/google/android/gms/common/internal/k$a$a.smali
index e33db15331..6ab5775d37 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/k$a$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/k$a$a.smali
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public final kJ()Landroid/accounts/Account;
+.method public final kI()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;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/k$a.smali b/com.discord/smali/com/google/android/gms/common/internal/k$a.smali
index bcc4bacc77..d66a8253d8 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/k$a.smali
+++ b/com.discord/smali/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;->kJ()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/k$a;->kI()Landroid/accounts/Account;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/common/internal/k.smali b/com.discord/smali/com/google/android/gms/common/internal/k.smali
index 30d3e292d1..4ea9c2def3 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/k.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/k.smali
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method public abstract kJ()Landroid/accounts/Account;
+.method public abstract kI()Landroid/accounts/Account;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali/com/google/android/gms/common/internal/n$a.smali b/com.discord/smali/com/google/android/gms/common/internal/n$a.smali
index 2b522d3386..87bbd6a8e3 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/n$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/n$a.smali
@@ -178,7 +178,7 @@
 
     packed-switch p1, :pswitch_data_2
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
@@ -189,6 +189,10 @@
 
     if-eqz p1, :cond_b
 
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
     goto :goto_1
 
     :pswitch_1
@@ -196,7 +200,7 @@
 
     invoke-virtual {p2}, Landroid/os/Parcel;->createStringArray()[Ljava/lang/String;
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_2
     invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
@@ -215,6 +219,10 @@
 
     if-eqz p1, :cond_b
 
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
     goto :goto_1
 
     :pswitch_3
@@ -230,17 +238,16 @@
 
     if-eqz p1, :cond_b
 
-    :goto_1
     sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
 
     invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_8
     invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_9
     :pswitch_4
@@ -254,6 +261,10 @@
 
     if-eqz p1, :cond_b
 
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
     goto :goto_1
 
     :cond_a
@@ -264,18 +275,18 @@
 
     if-eqz p1, :cond_b
 
-    goto :goto_1
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
 
     :cond_b
-    :goto_2
+    :goto_1
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_3
diff --git a/com.discord/smali/com/google/android/gms/common/internal/r.smali b/com.discord/smali/com/google/android/gms/common/internal/r.smali
index a0b3dfa36b..70b7bc3058 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/r.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/r.smali
@@ -38,23 +38,35 @@
 
     iget-object p1, p0, Lcom/google/android/gms/common/internal/r;->afh:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->kS()Landroid/os/IInterface;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->kR()Landroid/os/IInterface;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/h;->kO()I
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/h;->kN()I
 
     move-result v0
 
     return v0
 .end method
 
+.method protected final kP()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/r;->afh:Lcom/google/android/gms/common/api/a$h;
+
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->kP()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method protected final kQ()Ljava/lang/String;
     .locals 1
 
@@ -66,15 +78,3 @@
 
     return-object v0
 .end method
-
-.method protected final kR()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/r;->afh:Lcom/google/android/gms/common/api/a$h;
-
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->kR()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/t.smali b/com.discord/smali/com/google/android/gms/common/internal/t.smali
index d1e06bf18c..f07c064827 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
@@ -27,20 +27,18 @@
 
 
 # virtual methods
-.method public final lN()V
+.method public final lM()V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->afl:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->val$activity:Landroid/app/Activity;
-
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->afl:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->val$activity:Landroid/app/Activity;
 
     iget v2, p0, Lcom/google/android/gms/common/internal/t;->val$requestCode:I
 
-    invoke-virtual {v0, v1, v2}, Landroid/app/Activity;->startActivityForResult(Landroid/content/Intent;I)V
+    invoke-virtual {v1, v0, v2}, Landroid/app/Activity;->startActivityForResult(Landroid/content/Intent;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/google/android/gms/common/internal/u.smali b/com.discord/smali/com/google/android/gms/common/internal/u.smali
index a4e9f97fb1..fd4e5b2839 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/u.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/u.smali
@@ -27,20 +27,18 @@
 
 
 # virtual methods
-.method public final lN()V
+.method public final lM()V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->afl:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->val$fragment:Landroidx/fragment/app/Fragment;
-
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/u;->afl:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/u;->val$fragment:Landroidx/fragment/app/Fragment;
 
     iget v2, p0, Lcom/google/android/gms/common/internal/u;->val$requestCode:I
 
-    invoke-virtual {v0, v1, v2}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
+    invoke-virtual {v1, v0, v2}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/google/android/gms/common/internal/v.smali b/com.discord/smali/com/google/android/gms/common/internal/v.smali
index 6a59018075..9580ca734a 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/v.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/v.smali
@@ -29,20 +29,18 @@
 
 
 # virtual methods
-.method public final lN()V
+.method public final lM()V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->afl:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->afm:Lcom/google/android/gms/common/api/internal/g;
-
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/v;->afl:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/v;->afm:Lcom/google/android/gms/common/api/internal/g;
 
     iget v2, p0, Lcom/google/android/gms/common/internal/v;->val$requestCode:I
 
-    invoke-interface {v0, v1, v2}, Lcom/google/android/gms/common/api/internal/g;->startActivityForResult(Landroid/content/Intent;I)V
+    invoke-interface {v1, v0, v2}, Lcom/google/android/gms/common/api/internal/g;->startActivityForResult(Landroid/content/Intent;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/google/android/gms/common/internal/w.smali b/com.discord/smali/com/google/android/gms/common/internal/w.smali
index d1cdd8f2c9..8fe511e103 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/w.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/w.smali
@@ -22,6 +22,16 @@
 
 
 # virtual methods
+.method public final kW()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->afn:Lcom/google/android/gms/common/api/f$a;
+
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/f$a;->kW()V
+
+    return-void
+.end method
+
 .method public final kX()V
     .locals 1
 
@@ -31,13 +41,3 @@
 
     return-void
 .end method
-
-.method public final kY()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->afn:Lcom/google/android/gms/common/api/f$a;
-
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/f$a;->kY()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/z.smali b/com.discord/smali/com/google/android/gms/common/internal/z.smali
index acc1337fae..8e52fe47da 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/z.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/z.smali
@@ -37,7 +37,7 @@
 .method public final a(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v0
 
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 cf28937376..df8835a089 100644
--- a/com.discord/smali/com/google/android/gms/common/l.smali
+++ b/com.discord/smali/com/google/android/gms/common/l.smali
@@ -229,7 +229,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/v;->mn()Lcom/google/android/gms/common/v;
+    invoke-static {}, Lcom/google/android/gms/common/v;->mm()Lcom/google/android/gms/common/v;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/google/android/gms/common/n.smali b/com.discord/smali/com/google/android/gms/common/n.smali
index 9c058f2715..003307e286 100644
--- a/com.discord/smali/com/google/android/gms/common/n.smali
+++ b/com.discord/smali/com/google/android/gms/common/n.smali
@@ -80,7 +80,7 @@
     :try_start_0
     check-cast p1, Lcom/google/android/gms/common/internal/aj;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/aj;->lT()I
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/aj;->lS()I
 
     move-result v1
 
@@ -93,7 +93,7 @@
     return v0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/aj;->lS()Lcom/google/android/gms/a/a;
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/aj;->lR()Lcom/google/android/gms/a/a;
 
     move-result-object p1
 
@@ -129,6 +129,8 @@
 
     invoke-static {v1, v2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    return v0
+
     :cond_3
     :goto_0
     return v0
@@ -145,7 +147,7 @@
     return v0
 .end method
 
-.method public final lS()Lcom/google/android/gms/a/a;
+.method public final lR()Lcom/google/android/gms/a/a;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/n;->getBytes()[B
@@ -159,7 +161,7 @@
     return-object v0
 .end method
 
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/n;->hashCode()I
diff --git a/com.discord/smali/com/google/android/gms/common/p.smali b/com.discord/smali/com/google/android/gms/common/p.smali
index 0822a5ca38..5a4592576c 100644
--- a/com.discord/smali/com/google/android/gms/common/p.smali
+++ b/com.discord/smali/com/google/android/gms/common/p.smali
@@ -69,7 +69,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/p;->mm()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/p;->ml()[B
 
     move-result-object v0
 
@@ -94,5 +94,5 @@
     throw v0
 .end method
 
-.method protected abstract mm()[B
+.method protected abstract ml()[B
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/s.smali b/com.discord/smali/com/google/android/gms/common/s.smali
index 91c0de1e80..b806d2a78a 100644
--- a/com.discord/smali/com/google/android/gms/common/s.smali
+++ b/com.discord/smali/com/google/android/gms/common/s.smali
@@ -13,7 +13,7 @@
 
 
 # virtual methods
-.method protected final mm()[B
+.method protected final ml()[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/com/google/android/gms/common/stats/StatsEvent.smali b/com.discord/smali/com/google/android/gms/common/stats/StatsEvent.smali
index d110d0d4e0..dfd6552150 100644
--- a/com.discord/smali/com/google/android/gms/common/stats/StatsEvent.smali
+++ b/com.discord/smali/com/google/android/gms/common/stats/StatsEvent.smali
@@ -22,10 +22,10 @@
 .method public abstract getTimeMillis()J
 .end method
 
-.method public abstract lW()J
+.method public abstract lV()J
 .end method
 
-.method public abstract lX()Ljava/lang/String;
+.method public abstract lW()Ljava/lang/String;
 .end method
 
 .method public toString()Ljava/lang/String;
@@ -39,11 +39,11 @@
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->lW()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->lV()J
 
     move-result-wide v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->lX()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->lW()Ljava/lang/String;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/google/android/gms/common/stats/WakeLockEvent.smali b/com.discord/smali/com/google/android/gms/common/stats/WakeLockEvent.smali
index ef2c68baf9..b57ad93431 100644
--- a/com.discord/smali/com/google/android/gms/common/stats/WakeLockEvent.smali
+++ b/com.discord/smali/com/google/android/gms/common/stats/WakeLockEvent.smali
@@ -227,7 +227,7 @@
     return-wide v0
 .end method
 
-.method public final lW()J
+.method public final lV()J
     .locals 2
 
     iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->agj:J
@@ -235,7 +235,7 @@
     return-wide v0
 .end method
 
-.method public final lX()Ljava/lang/String;
+.method public final lW()Ljava/lang/String;
     .locals 10
 
     iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->afZ:Ljava/lang/String;
@@ -251,11 +251,9 @@
     goto :goto_0
 
     :cond_0
-    const-string v2, ","
+    const-string v3, ","
 
-    iget-object v3, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->agd:Ljava/util/List;
-
-    invoke-static {v2, v3}, Landroid/text/TextUtils;->join(Ljava/lang/CharSequence;Ljava/lang/Iterable;)Ljava/lang/String;
+    invoke-static {v3, v2}, Landroid/text/TextUtils;->join(Ljava/lang/CharSequence;Ljava/lang/Iterable;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -268,24 +266,14 @@
 
     const-string v4, ""
 
-    goto :goto_1
-
     :cond_1
-    iget-object v4, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aga:Ljava/lang/String;
-
-    :goto_1
     iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->agh:Ljava/lang/String;
 
     if-nez v5, :cond_2
 
     const-string v5, ""
 
-    goto :goto_2
-
     :cond_2
-    iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->agh:Ljava/lang/String;
-
-    :goto_2
     iget v6, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->agi:F
 
     iget-object v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->agb:Ljava/lang/String;
@@ -294,12 +282,7 @@
 
     const-string v7, ""
 
-    goto :goto_3
-
     :cond_3
-    iget-object v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->agb:Ljava/lang/String;
-
-    :goto_3
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v8
diff --git a/com.discord/smali/com/google/android/gms/common/stats/a.smali b/com.discord/smali/com/google/android/gms/common/stats/a.smali
index 8874afe319..1979ccdbcb 100644
--- a/com.discord/smali/com/google/android/gms/common/stats/a.smali
+++ b/com.discord/smali/com/google/android/gms/common/stats/a.smali
@@ -165,7 +165,7 @@
     return p0
 .end method
 
-.method public static lV()Lcom/google/android/gms/common/stats/a;
+.method public static lU()Lcom/google/android/gms/common/stats/a;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/common/stats/a;->afN:Lcom/google/android/gms/common/stats/a;
diff --git a/com.discord/smali/com/google/android/gms/common/stats/d.smali b/com.discord/smali/com/google/android/gms/common/stats/d.smali
index df4c311eb5..c95a3f5dec 100644
--- a/com.discord/smali/com/google/android/gms/common/stats/d.smali
+++ b/com.discord/smali/com/google/android/gms/common/stats/d.smali
@@ -134,14 +134,14 @@
 
     const/16 v4, 0xb
 
-    if-ne v4, v0, :cond_7
+    if-ne v4, v0, :cond_8
 
     :cond_4
     new-instance v15, Lcom/google/android/gms/common/stats/WakeLockEvent;
 
     const/4 v4, 0x0
 
-    if-eqz v1, :cond_5
+    if-eqz v1, :cond_6
 
     invoke-interface/range {p7 .. p7}, Ljava/util/List;->size()I
 
@@ -149,7 +149,7 @@
 
     const/4 v6, 0x1
 
-    if-ne v5, v6, :cond_5
+    if-ne v5, v6, :cond_6
 
     const-string v5, "com.google.android.gms"
 
@@ -170,6 +170,12 @@
     :cond_5
     move-object v7, v1
 
+    goto :goto_1
+
+    :cond_6
+    move-object v7, v1
+
+    :goto_1
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
     move-result-wide v9
@@ -188,16 +194,16 @@
 
     move-result v5
 
-    if-eqz v5, :cond_6
+    if-eqz v5, :cond_7
 
     move-object v13, v4
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_6
+    :cond_7
     move-object v13, v1
 
-    :goto_1
+    :goto_2
     invoke-static/range {p0 .. p0}, Lcom/google/android/gms/common/util/p;->X(Landroid/content/Context;)F
 
     move-result v14
@@ -254,7 +260,7 @@
 
     invoke-static {v1, v0}, Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    :cond_7
+    :cond_8
     return-void
 .end method
 
@@ -297,7 +303,7 @@
     return-void
 .end method
 
-.method public static lY()Lcom/google/android/gms/common/stats/d;
+.method public static lX()Lcom/google/android/gms/common/stats/d;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/stats/d;->agk:Lcom/google/android/gms/common/stats/d;
diff --git a/com.discord/smali/com/google/android/gms/common/t.smali b/com.discord/smali/com/google/android/gms/common/t.smali
index 5bfec31de9..b1e4f55d84 100644
--- a/com.discord/smali/com/google/android/gms/common/t.smali
+++ b/com.discord/smali/com/google/android/gms/common/t.smali
@@ -13,7 +13,7 @@
 
 
 # virtual methods
-.method protected final mm()[B
+.method protected final ml()[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/com/google/android/gms/common/util/c.smali b/com.discord/smali/com/google/android/gms/common/util/c.smali
index 3e24cf141e..8a528d5003 100644
--- a/com.discord/smali/com/google/android/gms/common/util/c.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/c.smali
@@ -61,7 +61,9 @@
 
     return p0
 
-    :catch_0
     :cond_0
     return v0
+
+    :catch_0
+    return v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/util/f.smali b/com.discord/smali/com/google/android/gms/common/util/f.smali
index ce9d1fd9e1..a8f9490e87 100644
--- a/com.discord/smali/com/google/android/gms/common/util/f.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/f.smali
@@ -30,7 +30,7 @@
     return-void
 .end method
 
-.method public static lZ()Lcom/google/android/gms/common/util/d;
+.method public static lY()Lcom/google/android/gms/common/util/d;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/util/f;->agt:Lcom/google/android/gms/common/util/f;
diff --git a/com.discord/smali/com/google/android/gms/common/util/g.smali b/com.discord/smali/com/google/android/gms/common/util/g.smali
index 76a0661b05..6afa2915c3 100644
--- a/com.discord/smali/com/google/android/gms/common/util/g.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/g.smali
@@ -21,7 +21,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->mb()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->ma()Z
 
     move-result v0
 
@@ -114,7 +114,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->mc()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->mb()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/common/util/h.smali b/com.discord/smali/com/google/android/gms/common/util/h.smali
index bdabcd0483..eaf432ce39 100644
--- a/com.discord/smali/com/google/android/gms/common/util/h.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/h.smali
@@ -149,14 +149,12 @@
 
     ushr-int/lit8 v6, v3, 0x4
 
-    aget-char v5, v5, v6
+    aget-char v6, v5, v6
 
-    aput-char v5, v0, v2
+    aput-char v6, v0, v2
 
     add-int/lit8 v2, v4, 0x1
 
-    sget-object v5, Lcom/google/android/gms/common/util/h;->agy:[C
-
     and-int/lit8 v3, v3, 0xf
 
     aget-char v3, v5, v3
diff --git a/com.discord/smali/com/google/android/gms/common/util/j.smali b/com.discord/smali/com/google/android/gms/common/util/j.smali
index e1b85ff25f..03a594854d 100644
--- a/com.discord/smali/com/google/android/gms/common/util/j.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/j.smali
@@ -17,6 +17,8 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
diff --git a/com.discord/smali/com/google/android/gms/common/util/k.smali b/com.discord/smali/com/google/android/gms/common/util/k.smali
index e8d1fcc769..219191b811 100644
--- a/com.discord/smali/com/google/android/gms/common/util/k.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/k.smali
@@ -60,7 +60,7 @@
     return v0
 .end method
 
-.method public static ma()Z
+.method public static lZ()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -79,7 +79,7 @@
     return v0
 .end method
 
-.method public static mb()Z
+.method public static ma()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method public static mc()Z
+.method public static mb()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
diff --git a/com.discord/smali/com/google/android/gms/common/util/l.smali b/com.discord/smali/com/google/android/gms/common/util/l.smali
index f634281f80..69776a9053 100644
--- a/com.discord/smali/com/google/android/gms/common/util/l.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/l.smali
@@ -97,15 +97,13 @@
 
     invoke-virtual {v1}, Ljava/lang/String;->trim()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     invoke-static {p0}, Lcom/google/android/gms/common/util/j;->closeQuietly(Ljava/io/Closeable;)V
 
-    move-object v0, v1
-
     goto :goto_1
 
     :catchall_0
@@ -137,7 +135,7 @@
     return-object v0
 .end method
 
-.method public static md()Ljava/lang/String;
+.method public static mc()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali/com/google/android/gms/common/util/o.smali b/com.discord/smali/com/google/android/gms/common/util/o.smali
index b1a03aa623..55d74af984 100644
--- a/com.discord/smali/com/google/android/gms/common/util/o.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/o.smali
@@ -30,43 +30,43 @@
 
     sput v0, Lcom/google/android/gms/common/util/o;->agF:I
 
-    invoke-static {}, Lcom/google/android/gms/common/util/o;->me()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/common/util/o;->md()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/common/util/o;->agG:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/o;->mf()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/common/util/o;->me()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/common/util/o;->agH:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/o;->mg()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/common/util/o;->mf()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/common/util/o;->agI:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/o;->mh()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/common/util/o;->mg()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/common/util/o;->agJ:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/o;->mi()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/common/util/o;->mh()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/common/util/o;->agK:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/o;->mj()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/common/util/o;->mi()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/common/util/o;->agL:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/o;->mk()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/common/util/o;->mj()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
@@ -134,8 +134,6 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/common/util/o;->agI:Ljava/lang/reflect/Method;
-
     new-array v2, v1, [Ljava/lang/Object;
 
     invoke-virtual {v0, p0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -223,8 +221,6 @@
     if-eqz p1, :cond_2
 
     :try_start_1
-    sget-object p1, Lcom/google/android/gms/common/util/o;->agG:Ljava/lang/reflect/Method;
-
     new-array v1, v3, [Ljava/lang/Object;
 
     invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -235,7 +231,18 @@
 
     invoke-virtual {p1, v0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+
+    goto :goto_0
+
+    :catch_1
+    move-exception p0
+
+    const-string p1, "WorkSourceUtil"
+
+    const-string v1, "Unable to assign blame through WorkSource"
+
+    invoke-static {p1, v1, p0}, Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_2
     :goto_0
@@ -251,11 +258,9 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Lcom/google/android/gms/common/util/o;->agK:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -466,12 +471,14 @@
     :goto_1
     invoke-static {p0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-object v0
+
     :cond_4
     :goto_2
     return-object v0
 .end method
 
-.method private static me()Ljava/lang/reflect/Method;
+.method private static md()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -504,10 +511,10 @@
     return-object v0
 .end method
 
-.method private static mf()Ljava/lang/reflect/Method;
+.method private static me()Ljava/lang/reflect/Method;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->ma()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->lZ()Z
 
     move-result v0
 
@@ -550,7 +557,7 @@
     return-object v0
 .end method
 
-.method private static mg()Ljava/lang/reflect/Method;
+.method private static mf()Ljava/lang/reflect/Method;
     .locals 3
 
     :try_start_0
@@ -577,7 +584,7 @@
     return-object v0
 .end method
 
-.method private static mh()Ljava/lang/reflect/Method;
+.method private static mg()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -610,10 +617,10 @@
     return-object v0
 .end method
 
-.method private static mi()Ljava/lang/reflect/Method;
+.method private static mh()Ljava/lang/reflect/Method;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->ma()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->lZ()Z
 
     move-result v0
 
@@ -650,7 +657,7 @@
     return-object v0
 .end method
 
-.method private static final mj()Ljava/lang/reflect/Method;
+.method private static final mi()Ljava/lang/reflect/Method;
     .locals 3
 
     invoke-static {}, Lcom/google/android/gms/common/util/k;->isAtLeastP()Z
@@ -692,7 +699,7 @@
     return-object v0
 .end method
 
-.method private static final mk()Ljava/lang/reflect/Method;
+.method private static final mj()Ljava/lang/reflect/Method;
     .locals 5
     .annotation build Landroid/annotation/SuppressLint;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/common/util/p.smali b/com.discord/smali/com/google/android/gms/common/util/p.smali
index fdb5d8fc52..129b765373 100644
--- a/com.discord/smali/com/google/android/gms/common/util/p.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/p.smali
@@ -103,7 +103,7 @@
     return v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->mb()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->ma()Z
 
     move-result v0
 
@@ -151,8 +151,6 @@
 
     sget-wide v3, Lcom/google/android/gms/common/util/p;->agR:J
 
-    const/4 v5, 0x0
-
     sub-long/2addr v1, v3
 
     const-wide/32 v3, 0xea60
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 96a7643362..22ea00c0c9 100644
--- a/com.discord/smali/com/google/android/gms/common/v.smali
+++ b/com.discord/smali/com/google/android/gms/common/v.smali
@@ -187,7 +187,7 @@
     return-object v0
 .end method
 
-.method static mn()Lcom/google/android/gms/common/v;
+.method static mm()Lcom/google/android/gms/common/v;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/v;->ahn:Lcom/google/android/gms/common/v;
@@ -197,7 +197,7 @@
 
 
 # virtual methods
-.method mo()Ljava/lang/String;
+.method mn()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali/com/google/android/gms/common/w.smali b/com.discord/smali/com/google/android/gms/common/w.smali
index 86e3eefe3c..3c6bb64df3 100644
--- a/com.discord/smali/com/google/android/gms/common/w.smali
+++ b/com.discord/smali/com/google/android/gms/common/w.smali
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method final mo()Ljava/lang/String;
+.method final mn()Ljava/lang/String;
     .locals 2
 
     :try_start_0
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 567a321964..823a1dd6cc 100644
--- a/com.discord/smali/com/google/android/gms/common/zzk.smali
+++ b/com.discord/smali/com/google/android/gms/common/zzk.smali
@@ -99,7 +99,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/common/internal/aj;->lS()Lcom/google/android/gms/a/a;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/aj;->lR()Lcom/google/android/gms/a/a;
 
     move-result-object p0
     :try_end_0
@@ -181,8 +181,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/zzk;->ahl:Lcom/google/android/gms/common/n;
-
     invoke-virtual {v0}, Lcom/google/android/gms/internal/c/b;->asBinder()Landroid/os/IBinder;
 
     move-result-object v0
diff --git a/com.discord/smali/com/google/android/gms/dynamite/DynamiteModule.smali b/com.discord/smali/com/google/android/gms/dynamite/DynamiteModule.smali
index 244c4aef90..a66a48d3d0 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/DynamiteModule.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/DynamiteModule.smali
@@ -211,12 +211,11 @@
 
     if-ne v4, v2, :cond_0
 
-    :goto_0
     sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     :try_start_4
@@ -229,7 +228,7 @@
     :try_start_5
     sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const-string v4, "com.google.android.gms"
@@ -253,10 +252,12 @@
     move-result-object v4
 
     invoke-virtual {v2, v3, v4}, Ljava/lang/reflect/Field;->set(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_2
     :try_start_6
@@ -276,7 +277,7 @@
 
     if-eqz v5, :cond_3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     new-instance v5, Lcom/google/android/gms/dynamite/h;
@@ -313,7 +314,7 @@
     return v4
 
     :cond_4
-    :goto_1
+    :goto_0
     :try_start_9
     monitor-exit v1
     :try_end_9
@@ -334,14 +335,14 @@
 
     invoke-virtual {v2, v3, v4}, Ljava/lang/reflect/Field;->set(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_0
+    sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    :goto_2
+    :goto_1
     monitor-exit v1
 
     move-object v1, v2
 
-    goto :goto_3
+    goto :goto_2
 
     :catchall_0
     move-exception v2
@@ -396,7 +397,7 @@
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    :goto_3
+    :goto_2
     sput-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->ahs:Ljava/lang/Boolean;
 
     :cond_5
@@ -416,12 +417,12 @@
     :try_start_f
     invoke-static {p0, p1, p2}, Lcom/google/android/gms/dynamite/DynamiteModule;->c(Landroid/content/Context;Ljava/lang/String;Z)I
 
-    move-result p1
+    move-result p0
     :try_end_f
     .catch Lcom/google/android/gms/dynamite/DynamiteModule$a; {:try_start_f .. :try_end_f} :catch_3
     .catch Ljava/lang/Throwable; {:try_start_f .. :try_end_f} :catch_4
 
-    return p1
+    return p0
 
     :catch_3
     move-exception p1
@@ -449,14 +450,14 @@
 
     move-result-object p1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     new-instance p1, Ljava/lang/String;
 
     invoke-direct {p1, v0}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_4
+    :goto_3
     invoke-static {p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     const/4 p0, 0x0
@@ -466,11 +467,11 @@
     :cond_7
     invoke-static {p0, p1, p2}, Lcom/google/android/gms/dynamite/DynamiteModule;->b(Landroid/content/Context;Ljava/lang/String;Z)I
 
-    move-result p1
+    move-result p0
     :try_end_10
     .catch Ljava/lang/Throwable; {:try_start_10 .. :try_end_10} :catch_4
 
-    return p1
+    return p0
 
     :catchall_1
     move-exception p1
@@ -501,7 +502,7 @@
     :try_start_0
     invoke-static {v0}, Lcom/google/android/gms/a/b;->Z(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
-    invoke-static {}, Lcom/google/android/gms/dynamite/DynamiteModule;->mp()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/dynamite/DynamiteModule;->mo()Ljava/lang/Boolean;
 
     move-result-object v1
 
@@ -694,7 +695,7 @@
 
     iget v4, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_9
 
     iget v4, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
@@ -704,7 +705,7 @@
 
     iget v4, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_9
 
     :cond_0
     iget v4, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
@@ -715,7 +716,7 @@
 
     iget v4, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_9
 
     :cond_1
     iget v4, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
@@ -732,7 +733,6 @@
 
     if-eqz p1, :cond_2
 
-    :goto_0
     iget-object p1, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
@@ -750,32 +750,32 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-ne v4, v6, :cond_7
+    if-ne v4, v6, :cond_8
 
     :try_start_2
     iget v4, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
 
     invoke-static {p0, p2, v4}, Lcom/google/android/gms/dynamite/DynamiteModule;->a(Landroid/content/Context;Ljava/lang/String;I)Lcom/google/android/gms/dynamite/DynamiteModule;
 
-    move-result-object v4
+    move-result-object p0
     :try_end_2
     .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 p0, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
+    iget-object p1, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
 
-    if-eqz p0, :cond_4
+    if-eqz p1, :cond_4
 
-    iget-object p0, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
+    iget-object p1, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
 
-    invoke-interface {p0}, Landroid/database/Cursor;->close()V
+    invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_4
-    sget-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->ahx:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->ahx:Ljava/lang/ThreadLocal;
 
-    invoke-virtual {p0, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
-    return-object v4
+    return-object p0
 
     :catch_0
     move-exception v4
@@ -803,7 +803,7 @@
 
     move-result-object v7
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_5
     new-instance v8, Ljava/lang/String;
@@ -812,12 +812,12 @@
 
     move-object v7, v8
 
-    :goto_1
+    :goto_0
     invoke-static {v6, v7}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     iget v6, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
 
-    if-eqz v6, :cond_6
+    if-eqz v6, :cond_7
 
     new-instance v6, Lcom/google/android/gms/dynamite/DynamiteModule$d;
 
@@ -831,7 +831,7 @@
 
     iget p1, p1, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    if-ne p1, v5, :cond_6
+    if-ne p1, v5, :cond_7
 
     invoke-static {p0, p2}, Lcom/google/android/gms/dynamite/DynamiteModule;->l(Landroid/content/Context;Ljava/lang/String;)Lcom/google/android/gms/dynamite/DynamiteModule;
 
@@ -841,11 +841,20 @@
 
     iget-object p1, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_6
 
-    goto :goto_0
+    iget-object p1, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
+
+    invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_6
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->ahx:Ljava/lang/ThreadLocal;
+
+    invoke-virtual {p1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
+
+    return-object p0
+
+    :cond_7
     :try_start_4
     new-instance p0, Lcom/google/android/gms/dynamite/DynamiteModule$a;
 
@@ -855,7 +864,7 @@
 
     throw p0
 
-    :cond_7
+    :cond_8
     new-instance p0, Lcom/google/android/gms/dynamite/DynamiteModule$a;
 
     iget p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
@@ -880,7 +889,7 @@
 
     throw p0
 
-    :cond_8
+    :cond_9
     new-instance p0, Lcom/google/android/gms/dynamite/DynamiteModule$a;
 
     iget p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
@@ -924,13 +933,13 @@
 
     iget-object p1, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
 
-    if-eqz p1, :cond_9
+    if-eqz p1, :cond_a
 
     iget-object p1, v1, Lcom/google/android/gms/dynamite/DynamiteModule$c;->ahJ:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
-    :cond_9
+    :cond_a
     sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->ahx:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
@@ -971,16 +980,16 @@
 
     invoke-static {p0, p1, p2}, Lcom/google/android/gms/dynamite/DynamiteModule;->c(Landroid/content/Context;Ljava/lang/String;I)Lcom/google/android/gms/dynamite/DynamiteModule;
 
-    move-result-object p1
+    move-result-object p0
 
-    return-object p1
+    return-object p0
 
     :cond_0
     invoke-static {p0, p1, p2}, Lcom/google/android/gms/dynamite/DynamiteModule;->b(Landroid/content/Context;Ljava/lang/String;I)Lcom/google/android/gms/dynamite/DynamiteModule;
 
-    move-result-object p1
+    move-result-object p0
 
-    return-object p1
+    return-object p0
 
     :cond_1
     new-instance p1, Lcom/google/android/gms/dynamite/DynamiteModule$a;
@@ -1123,7 +1132,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v1
 
@@ -1275,7 +1284,7 @@
 
     :cond_0
     :try_start_0
-    invoke-interface {v0}, Lcom/google/android/gms/dynamite/i;->mq()I
+    invoke-interface {v0}, Lcom/google/android/gms/dynamite/i;->mp()I
 
     move-result v2
 
@@ -1401,7 +1410,7 @@
     if-eqz v0, :cond_2
 
     :try_start_0
-    invoke-interface {v0}, Lcom/google/android/gms/dynamite/i;->mq()I
+    invoke-interface {v0}, Lcom/google/android/gms/dynamite/i;->mp()I
 
     move-result v2
 
@@ -1668,24 +1677,6 @@
     :cond_3
     return p1
 
-    :catchall_1
-    move-exception p1
-
-    move-object v0, p0
-
-    move-object p0, p1
-
-    goto :goto_3
-
-    :catch_0
-    move-exception p1
-
-    move-object v0, p0
-
-    move-object p0, p1
-
-    goto :goto_2
-
     :cond_4
     :try_start_6
     const-string p1, "DynamiteModule"
@@ -1705,6 +1696,24 @@
     .catch Ljava/lang/Exception; {:try_start_6 .. :try_end_6} :catch_0
     .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
+    :catchall_1
+    move-exception p1
+
+    move-object v0, p0
+
+    move-object p0, p1
+
+    goto :goto_3
+
+    :catch_0
+    move-exception p1
+
+    move-object v0, p0
+
+    move-object p0, p1
+
+    goto :goto_2
+
     :catchall_2
     move-exception p0
 
@@ -2122,7 +2131,7 @@
     return-object p1
 .end method
 
-.method private static mp()Ljava/lang/Boolean;
+.method private static mo()Ljava/lang/Boolean;
     .locals 3
 
     const-class v0, Lcom/google/android/gms/dynamite/DynamiteModule;
diff --git a/com.discord/smali/com/google/android/gms/dynamite/d.smali b/com.discord/smali/com/google/android/gms/dynamite/d.smali
index c15ec231a4..165ad31997 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/d.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/d.smali
@@ -52,10 +52,9 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
@@ -66,11 +65,13 @@
 
     const/4 p1, -0x1
 
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
+
     goto :goto_0
 
     :cond_1
     iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    :goto_1
+    :goto_0
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/dynamite/e.smali b/com.discord/smali/com/google/android/gms/dynamite/e.smali
index c9f4f6abea..7e0e60f442 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/e.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/e.smali
@@ -36,29 +36,28 @@
 
     iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
     if-eqz v1, :cond_0
 
-    invoke-interface {p3, p1, p2, v3}, Lcom/google/android/gms/dynamite/DynamiteModule$b$a;->a(Landroid/content/Context;Ljava/lang/String;Z)I
-
-    move-result p1
-
-    :goto_0
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
-
-    goto :goto_1
-
-    :cond_0
     invoke-interface {p3, p1, p2, v2}, Lcom/google/android/gms/dynamite/DynamiteModule$b$a;->a(Landroid/content/Context;Ljava/lang/String;Z)I
 
     move-result p1
 
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
+
     goto :goto_0
 
-    :goto_1
+    :cond_0
+    invoke-interface {p3, p1, p2, v3}, Lcom/google/android/gms/dynamite/DynamiteModule$b$a;->a(Landroid/content/Context;Ljava/lang/String;Z)I
+
+    move-result p1
+
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
+
+    :goto_0
     iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
 
     if-nez p1, :cond_1
@@ -67,9 +66,9 @@
 
     if-nez p1, :cond_1
 
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
@@ -82,11 +81,11 @@
 
     iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    :goto_2
+    :goto_1
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/dynamite/f.smali b/com.discord/smali/com/google/android/gms/dynamite/f.smali
index 30069bea25..3fbd777b65 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/f.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/f.smali
@@ -52,10 +52,9 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
@@ -66,13 +65,13 @@
 
     iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 p1, -0x1
 
-    goto :goto_0
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    :goto_1
+    :goto_0
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/dynamite/g.smali b/com.discord/smali/com/google/android/gms/dynamite/g.smali
index ba2bba700b..995b147df1 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/g.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/g.smali
@@ -36,29 +36,28 @@
 
     iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
     if-eqz v1, :cond_0
 
-    invoke-interface {p3, p1, p2, v3}, Lcom/google/android/gms/dynamite/DynamiteModule$b$a;->a(Landroid/content/Context;Ljava/lang/String;Z)I
-
-    move-result p1
-
-    :goto_0
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
-
-    goto :goto_1
-
-    :cond_0
     invoke-interface {p3, p1, p2, v2}, Lcom/google/android/gms/dynamite/DynamiteModule$b$a;->a(Landroid/content/Context;Ljava/lang/String;Z)I
 
     move-result p1
 
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
+
     goto :goto_0
 
-    :goto_1
+    :cond_0
+    invoke-interface {p3, p1, p2, v3}, Lcom/google/android/gms/dynamite/DynamiteModule$b$a;->a(Landroid/content/Context;Ljava/lang/String;Z)I
+
+    move-result p1
+
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
+
+    :goto_0
     iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahG:I
 
     if-nez p1, :cond_1
@@ -67,9 +66,9 @@
 
     if-nez p1, :cond_1
 
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahH:I
@@ -78,15 +77,15 @@
 
     if-lt p1, p2, :cond_2
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 p1, -0x1
 
     iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ahI:I
 
-    :goto_2
+    :goto_1
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/dynamite/h.smali b/com.discord/smali/com/google/android/gms/dynamite/h.smali
index 5afc2b6256..76521d701e 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/h.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/h.smali
@@ -50,11 +50,11 @@
     :try_start_0
     invoke-virtual {p0, p1}, Lcom/google/android/gms/dynamite/h;->findClass(Ljava/lang/String;)Ljava/lang/Class;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/dynamite/i.smali b/com.discord/smali/com/google/android/gms/dynamite/i.smali
index 0d39069004..0c32b1f72a 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/i.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/i.smali
@@ -38,7 +38,7 @@
     .end annotation
 .end method
 
-.method public abstract mq()I
+.method public abstract mp()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali/com/google/android/gms/dynamite/j.smali b/com.discord/smali/com/google/android/gms/dynamite/j.smali
index c4df7656b8..ef252729a7 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/j.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/j.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -158,7 +158,7 @@
     return-object p2
 .end method
 
-.method public final mq()I
+.method public final mp()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;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/dynamite/l.smali b/com.discord/smali/com/google/android/gms/dynamite/l.smali
index 40a8623ed0..0924614d4f 100644
--- a/com.discord/smali/com/google/android/gms/dynamite/l.smali
+++ b/com.discord/smali/com/google/android/gms/dynamite/l.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->pz()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->py()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/a/a.smali b/com.discord/smali/com/google/android/gms/internal/a/a.smali
index e2a26ec638..fe91d85c1c 100644
--- a/com.discord/smali/com/google/android/gms/internal/a/a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/a/a.smali
@@ -83,7 +83,7 @@
     return-object v0
 .end method
 
-.method protected final mr()Landroid/os/Parcel;
+.method protected final mq()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
diff --git a/com.discord/smali/com/google/android/gms/internal/a/e.smali b/com.discord/smali/com/google/android/gms/internal/a/e.smali
index 20b8d3abcd..a1b7dfe25f 100644
--- a/com.discord/smali/com/google/android/gms/internal/a/e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/a/e.smali
@@ -14,7 +14,7 @@
     .end annotation
 .end method
 
-.method public abstract ms()Z
+.method public abstract mr()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -22,7 +22,7 @@
     .end annotation
 .end method
 
-.method public abstract mt()Z
+.method public abstract ms()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali/com/google/android/gms/internal/a/g.smali b/com.discord/smali/com/google/android/gms/internal/a/g.smali
index 3700b74230..8bd21583de 100644
--- a/com.discord/smali/com/google/android/gms/internal/a/g.smali
+++ b/com.discord/smali/com/google/android/gms/internal/a/g.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -45,7 +45,7 @@
     return-object v1
 .end method
 
-.method public final ms()Z
+.method public final mr()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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
     return v1
 .end method
 
-.method public final mt()Z
+.method public final ms()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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/b/c.smali b/com.discord/smali/com/google/android/gms/internal/b/c.smali
index 53b1c4c1e7..2ce1f3505b 100644
--- a/com.discord/smali/com/google/android/gms/internal/b/c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/b/c.smali
@@ -69,7 +69,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
 
     return-void
@@ -79,7 +78,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    return-void
 .end method
 
 .method public static a(Landroid/os/Parcel;Landroid/os/Parcelable;)V
diff --git a/com.discord/smali/com/google/android/gms/internal/c/a.smali b/com.discord/smali/com/google/android/gms/internal/c/a.smali
index 2e1a16f620..5d35eab64d 100644
--- a/com.discord/smali/com/google/android/gms/internal/c/a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/c/a.smali
@@ -122,7 +122,7 @@
     throw p1
 .end method
 
-.method protected final pz()Landroid/os/Parcel;
+.method protected final py()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
diff --git a/com.discord/smali/com/google/android/gms/internal/c/c.smali b/com.discord/smali/com/google/android/gms/internal/c/c.smali
index 980a07b0e9..9bfd7a9a6b 100644
--- a/com.discord/smali/com/google/android/gms/internal/c/c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/c/c.smali
@@ -69,7 +69,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
 
     return-void
@@ -79,7 +78,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    return-void
 .end method
 
 .method public static b(Landroid/os/Parcel;Landroid/os/Parcelable;)V
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ab.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ab.smali
index 5ec20321e6..bf4d1b4622 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ab.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ab.smali
@@ -40,7 +40,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/clearcut/ab;->aiO:Lcom/google/android/gms/internal/clearcut/ab;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mI()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mH()Z
 
     move-result v0
 
@@ -286,7 +286,7 @@
     return-object v0
 .end method
 
-.method public final mK()Ljava/lang/String;
+.method public final mJ()Ljava/lang/String;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/bh;->UTF_8:Ljava/nio/charset/Charset;
@@ -309,7 +309,7 @@
     return-object v0
 .end method
 
-.method public abstract mL()Z
+.method public abstract mK()Z
 .end method
 
 .method public abstract size()I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ae.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ae.smali
index 7ac62bca3b..86f12d929b 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ae.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ae.smali
@@ -109,7 +109,7 @@
     return p1
 .end method
 
-.method protected final mM()I
+.method protected final mL()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/ae;->zzfm:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ag.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ag.smali
index 1fbc923746..2dcfb2d9f3 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ag.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ag.smali
@@ -39,12 +39,12 @@
 
 
 # virtual methods
-.method public final mN()Lcom/google/android/gms/internal/clearcut/ab;
+.method public final mM()Lcom/google/android/gms/internal/clearcut/ab;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ag;->aiR:Lcom/google/android/gms/internal/clearcut/am;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/am;->mW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/am;->mV()I
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ai.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ai.smali
index 6096b1e827..6d1256599d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ai.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ai.smali
@@ -26,7 +26,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ai;->zzfp:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result v2
 
@@ -49,7 +49,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ai;->zzfp:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result v1
 
@@ -87,17 +87,17 @@
 
     iget-object v1, p1, Lcom/google/android/gms/internal/clearcut/ai;->zzfp:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result v2
 
     add-int/2addr v2, p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result p1
 
@@ -202,6 +202,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public bg(I)B
@@ -238,7 +240,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ai;->zzfp:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result v2
 
@@ -329,10 +331,10 @@
     return p1
 .end method
 
-.method public final mL()Z
+.method public final mK()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result v0
 
@@ -351,7 +353,7 @@
     return v0
 .end method
 
-.method protected mM()I
+.method protected mL()I
     .locals 1
 
     const/4 v0, 0x0
@@ -374,7 +376,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ai;->zzfp:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ai;->mL()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ak.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ak.smali
index 74cfd2b2e9..9b293cda83 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ak.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ak.smali
@@ -115,5 +115,5 @@
     .end annotation
 .end method
 
-.method public abstract mO()I
+.method public abstract mN()I
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/al.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/al.smali
index b9a980ea3d..8ec3db4b2d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/al.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/al.smali
@@ -60,7 +60,7 @@
 
 # virtual methods
 .method public final bj(I)I
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lcom/google/android/gms/internal/clearcut/bn;
@@ -69,7 +69,7 @@
 
     if-ltz p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ak;->mO()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ak;->mN()I
 
     move-result v0
 
@@ -93,19 +93,15 @@
 
     iget v1, p0, Lcom/google/android/gms/internal/clearcut/al;->aiY:I
 
-    sub-int/2addr p1, v1
+    sub-int v1, p1, v1
 
-    iget v1, p0, Lcom/google/android/gms/internal/clearcut/al;->agg:I
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/al;->agg:I
 
-    if-le p1, v1, :cond_0
+    if-le v1, v2, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/clearcut/al;->agg:I
+    sub-int/2addr v1, v2
 
-    sub-int/2addr p1, v1
-
-    iput p1, p0, Lcom/google/android/gms/internal/clearcut/al;->aiX:I
-
-    iget p1, p0, Lcom/google/android/gms/internal/clearcut/al;->limit:I
+    iput v1, p0, Lcom/google/android/gms/internal/clearcut/al;->aiX:I
 
     iget v1, p0, Lcom/google/android/gms/internal/clearcut/al;->aiX:I
 
@@ -124,7 +120,7 @@
     return v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p1
 
@@ -140,7 +136,7 @@
     throw p1
 .end method
 
-.method public final mO()I
+.method public final mN()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/al;->pos:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/am$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/am$a.smali
index a152d3bf51..6a2868e425 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/am$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/am$a.smali
@@ -192,7 +192,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/clearcut/r;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/r;->mE()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/r;->mD()I
 
     move-result v0
 
@@ -247,7 +247,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/r;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/r;->mE()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/r;->mD()I
 
     move-result v1
 
@@ -404,7 +404,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cm;->nj()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cm;->ni()I
 
     move-result v0
 
@@ -467,7 +467,7 @@
 
     iget v3, p0, Lcom/google/android/gms/internal/clearcut/am$a;->position:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mV()I
 
     move-result v4
 
@@ -498,7 +498,7 @@
 
     iget v2, p0, Lcom/google/android/gms/internal/clearcut/am$a;->position:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mV()I
 
     move-result v3
 
@@ -566,7 +566,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mV()I
 
     move-result v0
 
@@ -639,11 +639,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/am$a;->buffer:[B
 
@@ -667,7 +662,9 @@
 
     goto :goto_1
 
-    :goto_2
+    :catch_0
+    move-exception p1
+
     new-instance v0, Lcom/google/android/gms/internal/clearcut/am$c;
 
     const/4 v1, 0x3
@@ -711,6 +708,8 @@
     invoke-direct {v0, v1, p1}, Lcom/google/android/gms/internal/clearcut/am$c;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final bo(I)V
@@ -919,7 +918,7 @@
     return-void
 .end method
 
-.method public final mW()I
+.method public final mV()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/am$a;->limit:I
@@ -949,7 +948,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/am;->mV()I
 
     move-result v0
 
@@ -1032,11 +1031,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/am$a;->buffer:[B
 
@@ -1062,7 +1056,9 @@
 
     goto :goto_1
 
-    :goto_2
+    :catch_0
+    move-exception p1
+
     new-instance p2, Lcom/google/android/gms/internal/clearcut/am$c;
 
     const/4 v0, 0x3
@@ -1106,6 +1102,8 @@
     invoke-direct {p2, v0, p1}, Lcom/google/android/gms/internal/clearcut/am$c;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final write([BII)V
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/am$d.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/am$d.smali
index 6307aeeae9..9ca50798c1 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/am$d.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/am$d.smali
@@ -197,7 +197,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/r;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/r;->mE()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/r;->mD()I
 
     move-result v1
 
@@ -310,7 +310,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cm;->nj()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cm;->ni()I
 
     move-result v0
 
@@ -482,11 +482,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/am$d;->aje:Ljava/nio/ByteBuffer;
 
@@ -504,12 +499,16 @@
 
     goto :goto_0
 
-    :goto_1
+    :catch_0
+    move-exception p1
+
     new-instance v0, Lcom/google/android/gms/internal/clearcut/am$c;
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/internal/clearcut/am$c;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final bo(I)V
@@ -642,7 +641,7 @@
     return-void
 .end method
 
-.method public final mW()I
+.method public final mV()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/am$d;->aje:Ljava/nio/ByteBuffer;
@@ -684,11 +683,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/am$d;->aje:Ljava/nio/ByteBuffer;
 
@@ -710,12 +704,16 @@
 
     goto :goto_0
 
-    :goto_1
+    :catch_0
+    move-exception p1
+
     new-instance p2, Lcom/google/android/gms/internal/clearcut/am$c;
 
     invoke-direct {p2, p1}, Lcom/google/android/gms/internal/clearcut/am$c;-><init>(Ljava/lang/Throwable;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final write([BII)V
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/am$e.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/am$e.smali
index 0458495da2..6f054e25c1 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/am$e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/am$e.smali
@@ -230,7 +230,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/r;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/r;->mE()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/r;->mD()I
 
     move-result v1
 
@@ -270,8 +270,6 @@
 
     if-gez v4, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
-
     const-wide/16 v2, 0x1
 
     add-long/2addr v2, v0
@@ -285,41 +283,39 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/internal/clearcut/am$c;
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v2
+    aput-object v0, v2, v3
 
-    aput-object v2, v0, v1
+    iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajh:J
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajh:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    aput-object v0, v2, v1
+
+    const/4 v0, 0x2
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    aput-object v1, v2, v0
 
-    aput-object v1, v0, v2
+    const-string v0, "Pos: %d, limit: %d, len: %d"
 
-    const/4 v1, 0x2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    aput-object v2, v0, v1
-
-    const-string v1, "Pos: %d, limit: %d, len: %d"
-
-    invoke-static {v1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -390,7 +386,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cm;->nj()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cm;->ni()I
 
     move-result v0
 
@@ -449,8 +445,6 @@
 
     iget-wide v6, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajf:J
 
-    const/4 v2, 0x0
-
     sub-long/2addr v4, v6
 
     long-to-int v2, v4
@@ -591,9 +585,9 @@
 
     if-nez v0, :cond_0
 
-    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
 
+    :goto_1
     add-long/2addr v4, v0
 
     iput-wide v4, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
@@ -633,15 +627,13 @@
 
     if-gez v6, :cond_3
 
-    and-int/lit8 v0, p1, -0x80
+    and-int/lit8 v2, p1, -0x80
 
-    if-nez v0, :cond_2
+    if-nez v2, :cond_2
 
     goto :goto_1
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
-
     add-long v2, v0, v4
 
     iput-wide v2, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
@@ -661,47 +653,47 @@
     :cond_3
     new-instance p1, Lcom/google/android/gms/internal/clearcut/am$c;
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v2
+    aput-object v0, v2, v3
 
-    aput-object v2, v0, v1
+    iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajh:J
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajh:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    aput-object v0, v2, v1
+
+    const/4 v0, 0x2
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    aput-object v1, v2, v0
 
-    aput-object v1, v0, v2
+    const-string v0, "Pos: %d, limit: %d, len: %d"
 
-    const/4 v1, 0x2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    aput-object v2, v0, v1
-
-    const-string v1, "Pos: %d, limit: %d, len: %d"
-
-    invoke-static {v1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/internal/clearcut/am$c;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final bo(I)V
@@ -840,7 +832,7 @@
     return-void
 .end method
 
-.method public final mW()I
+.method public final mV()I
     .locals 4
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajh:J
@@ -885,9 +877,9 @@
 
     if-nez v2, :cond_0
 
-    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
 
+    :goto_1
     add-long/2addr v9, v0
 
     iput-wide v9, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
@@ -931,17 +923,15 @@
 
     if-gez v11, :cond_3
 
-    and-long v0, p1, v7
+    and-long v2, p1, v7
 
-    cmp-long v2, v0, v5
+    cmp-long v11, v2, v5
 
-    if-nez v2, :cond_2
+    if-nez v11, :cond_2
 
     goto :goto_1
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
-
     add-long v2, v0, v9
 
     iput-wide v2, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
@@ -967,15 +957,13 @@
 
     new-array p2, p2, [Ljava/lang/Object;
 
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v1
-
-    aput-object v1, p2, v0
+    aput-object v0, p2, v2
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajh:J
 
@@ -1004,6 +992,8 @@
     invoke-direct {p1, p2}, Lcom/google/android/gms/internal/clearcut/am$c;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final write([BII)V
@@ -1032,19 +1022,17 @@
 
     sub-long/2addr v0, v9
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
+    iget-wide v5, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
 
-    cmp-long v4, v0, v2
+    cmp-long v2, v0, v5
 
-    if-gez v4, :cond_0
+    if-gez v2, :cond_0
 
     goto :goto_0
 
     :cond_0
     int-to-long v3, p2
 
-    iget-wide v5, p0, Lcom/google/android/gms/internal/clearcut/am$e;->ajj:J
-
     move-object v2, p1
 
     move-wide v7, v9
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/am.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/am.smali
index d2fd7c680f..3d08ebad9a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/am.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/am.smali
@@ -40,7 +40,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/clearcut/am;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->os()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->or()Z
 
     move-result v0
 
@@ -180,7 +180,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/bt;->nj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/bt;->ni()I
 
     move-result p1
 
@@ -198,7 +198,7 @@
 .method public static a(Lcom/google/android/gms/internal/clearcut/bt;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bt;->nj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bt;->ni()I
 
     move-result p0
 
@@ -280,7 +280,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/clearcut/r;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/r;->mE()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/r;->mD()I
 
     move-result v0
 
@@ -332,7 +332,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ot()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->os()Z
 
     move-result v0
 
@@ -389,7 +389,7 @@
     :try_start_0
     invoke-static {p0}, Lcom/google/android/gms/internal/clearcut/ed;->b(Ljava/lang/CharSequence;)I
 
-    move-result v0
+    move-result p0
     :try_end_0
     .catch Lcom/google/android/gms/internal/clearcut/eg; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -402,16 +402,16 @@
 
     move-result-object p0
 
-    array-length v0, p0
+    array-length p0, p0
 
     :goto_0
-    invoke-static {v0}, Lcom/google/android/gms/internal/clearcut/am;->by(I)I
+    invoke-static {p0}, Lcom/google/android/gms/internal/clearcut/am;->by(I)I
 
-    move-result p0
+    move-result v0
 
-    add-int/2addr p0, v0
+    add-int/2addr v0, p0
 
-    return p0
+    return v0
 .end method
 
 .method public static bp(I)I
@@ -660,7 +660,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/clearcut/r;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/r;->mE()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/r;->mD()I
 
     move-result v0
 
@@ -683,7 +683,7 @@
 .method public static c(Lcom/google/android/gms/internal/clearcut/cm;)I
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cm;->nj()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cm;->ni()I
 
     move-result p0
 
@@ -779,7 +779,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cm;->nj()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cm;->ni()I
 
     move-result p0
 
@@ -872,6 +872,14 @@
     return v0
 .end method
 
+.method public static mO()I
+    .locals 1
+
+    const/4 v0, 0x4
+
+    return v0
+.end method
+
 .method public static mP()I
     .locals 1
 
@@ -883,7 +891,7 @@
 .method public static mQ()I
     .locals 1
 
-    const/4 v0, 0x4
+    const/16 v0, 0x8
 
     return v0
 .end method
@@ -899,7 +907,7 @@
 .method public static mS()I
     .locals 1
 
-    const/16 v0, 0x8
+    const/4 v0, 0x4
 
     return v0
 .end method
@@ -907,20 +915,12 @@
 .method public static mT()I
     .locals 1
 
-    const/4 v0, 0x4
-
-    return v0
-.end method
-
-.method public static mU()I
-    .locals 1
-
     const/16 v0, 0x8
 
     return v0
 .end method
 
-.method public static mV()I
+.method public static mU()I
     .locals 1
 
     const/4 v0, 0x1
@@ -1345,7 +1345,7 @@
     .end annotation
 .end method
 
-.method public abstract mW()I
+.method public abstract mV()I
 .end method
 
 .method public final p(F)V
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/an.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/an.smali
index fa619f203a..add1b90e0d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/an.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/an.smali
@@ -665,7 +665,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mP()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mO()I
 
     move-result v1
 
@@ -1165,7 +1165,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mR()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mQ()I
 
     move-result v1
 
@@ -1284,7 +1284,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mT()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mS()I
 
     move-result v1
 
@@ -1403,7 +1403,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mU()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mT()I
 
     move-result v1
 
@@ -1658,7 +1658,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mV()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mU()I
 
     move-result v1
 
@@ -1913,7 +1913,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mQ()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mP()I
 
     move-result v1
 
@@ -2032,7 +2032,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mS()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mR()I
 
     move-result v1
 
@@ -2226,7 +2226,7 @@
     return-void
 .end method
 
-.method public final mq()I
+.method public final mp()I
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/clearcut/bf$g;->ald:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ao.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ao.smali
index fa0b1c898b..d25f0ef608 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ao.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ao.smali
@@ -76,7 +76,7 @@
 .method private final b(ID)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-ltz p1, :cond_1
 
@@ -84,29 +84,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -115,8 +107,6 @@
 
     new-array v0, v0, [D
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -245,7 +235,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/bh;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -271,48 +261,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/ao;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/ao;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([DI)[D
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([DI)[D
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
+    iget-object v0, p1, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
 
     iget v4, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/clearcut/ao;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/ao;->modCount:I
 
@@ -488,9 +470,9 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 6
+    .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/ao;->zzg(I)V
 
@@ -498,23 +480,17 @@
 
     aget-wide v1, v0, p1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v4, v3, -0x1
 
-    if-ge p1, v0, :cond_0
+    if-ge p1, v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
+    add-int/lit8 v4, p1, 0x1
 
-    add-int/lit8 v3, p1, 0x1
+    sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
-
-    iget v5, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
-
-    sub-int/2addr v5, p1
-
-    invoke-static {v0, v3, v4, p1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
@@ -539,7 +515,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     const/4 v0, 0x0
 
@@ -568,13 +544,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/ao;->size:I
 
@@ -604,7 +578,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-lt p2, p1, :cond_0
 
@@ -651,7 +625,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/ao;->zzg(I)V
 
@@ -659,8 +633,6 @@
 
     aget-wide v2, p2, p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/clearcut/ao;->ajl:[D
-
     aput-wide v0, p2, p1
 
     invoke-static {v2, v3}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/aq.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/aq.smali
index 80988ebdd9..ff485b13a7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/aq.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/aq.smali
@@ -17,7 +17,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/aq;->mX()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/aq;->mW()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method private static mX()Ljava/lang/Class;
+.method private static mW()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -53,7 +53,7 @@
     return-object v0
 .end method
 
-.method public static mY()Lcom/google/android/gms/internal/clearcut/ar;
+.method public static mX()Lcom/google/android/gms/internal/clearcut/ar;
     .locals 4
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/aq;->ajm:Ljava/lang/Class;
@@ -61,15 +61,13 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    const-string v0, "getEmptyRegistry"
-
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/aq;->ajm:Ljava/lang/Class;
+    const-string v1, "getEmptyRegistry"
 
     const/4 v2, 0x0
 
     new-array v3, v2, [Ljava/lang/Class;
 
-    invoke-virtual {v1, v0, v3}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+    invoke-virtual {v0, v1, v3}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ar.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ar.smali
index c877bc716a..3435b44b31 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ar.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ar.smali
@@ -34,7 +34,7 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ar;->mZ()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ar;->mY()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -79,7 +79,7 @@
     return-void
 .end method
 
-.method private static mZ()Ljava/lang/Class;
+.method private static mY()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -106,10 +106,10 @@
     return-object v0
 .end method
 
-.method public static na()Lcom/google/android/gms/internal/clearcut/ar;
+.method public static mZ()Lcom/google/android/gms/internal/clearcut/ar;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/aq;->mY()Lcom/google/android/gms/internal/clearcut/ar;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/aq;->mX()Lcom/google/android/gms/internal/clearcut/ar;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/at.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/at.smali
index f7bb69ff4a..47bc4dc157 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/at.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/at.smali
@@ -88,7 +88,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v2
 
@@ -115,7 +115,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v2
 
@@ -502,7 +502,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/aw;->mH()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/aw;->mG()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/av.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/av.smali
index dd318ee1d2..29687cb5d3 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/av.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/av.smali
@@ -32,7 +32,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/clearcut/av;->ajs:Lcom/google/android/gms/internal/clearcut/as;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nb()Lcom/google/android/gms/internal/clearcut/as;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->na()Lcom/google/android/gms/internal/clearcut/as;
 
     move-result-object v0
 
@@ -41,7 +41,7 @@
     return-void
 .end method
 
-.method private static nb()Lcom/google/android/gms/internal/clearcut/as;
+.method private static na()Lcom/google/android/gms/internal/clearcut/as;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -84,7 +84,7 @@
     return-object v0
 .end method
 
-.method static nc()Lcom/google/android/gms/internal/clearcut/as;
+.method static nb()Lcom/google/android/gms/internal/clearcut/as;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -99,7 +99,7 @@
     return-object v0
 .end method
 
-.method static nd()Lcom/google/android/gms/internal/clearcut/as;
+.method static nc()Lcom/google/android/gms/internal/clearcut/as;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -113,8 +113,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/av;->ajt:Lcom/google/android/gms/internal/clearcut/as;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/aw.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/aw.smali
index fa5b8ec5d6..78fa5a55c8 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/aw.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/aw.smali
@@ -84,7 +84,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/aw;->mH()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/aw;->mG()V
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 
     if-ne p0, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bh;->nu()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bh;->nt()Z
 
     shl-int/lit8 p1, p1, 0x1
 
@@ -130,7 +130,16 @@
 
     check-cast p2, Lcom/google/android/gms/internal/clearcut/bi;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/bi;->lT()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/bi;->lS()I
+
+    move-result p0
+
+    goto :goto_0
+
+    :cond_1
+    check-cast p2, Ljava/lang/Integer;
+
+    invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
     move-result p0
 
@@ -141,15 +150,6 @@
 
     goto/16 :goto_2
 
-    :cond_1
-    check-cast p2, Ljava/lang/Integer;
-
-    invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
-
-    move-result p0
-
-    goto :goto_0
-
     :pswitch_1
     check-cast p2, Ljava/lang/Long;
 
@@ -181,7 +181,7 @@
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mS()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mR()I
 
     move-result p0
 
@@ -192,7 +192,7 @@
 
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mQ()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mP()I
 
     move-result p0
 
@@ -286,7 +286,7 @@
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mV()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mU()I
 
     move-result p0
 
@@ -297,7 +297,7 @@
 
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mP()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mO()I
 
     move-result p0
 
@@ -308,7 +308,7 @@
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mR()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mQ()I
 
     move-result p0
 
@@ -358,7 +358,7 @@
 
     invoke-virtual {p2}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mT()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mS()I
 
     move-result p0
 
@@ -369,7 +369,7 @@
 
     invoke-virtual {p2}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mU()I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/am;->mT()I
 
     move-result p0
 
@@ -415,7 +415,7 @@
 
     if-ne p1, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bh;->nu()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bh;->nt()Z
 
     check-cast p3, Lcom/google/android/gms/internal/clearcut/cm;
 
@@ -455,7 +455,7 @@
 
     check-cast p3, Lcom/google/android/gms/internal/clearcut/bi;
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/clearcut/bi;->lT()I
+    invoke-interface {p3}, Lcom/google/android/gms/internal/clearcut/bi;->lS()I
 
     move-result p1
 
@@ -705,7 +705,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/az;->nf()Lcom/google/android/gms/internal/clearcut/ei;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/az;->ne()Lcom/google/android/gms/internal/clearcut/ei;
 
     move-result-object v0
 
@@ -823,7 +823,7 @@
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -848,7 +848,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/clearcut/ct;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/ct;->nS()Lcom/google/android/gms/internal/clearcut/ct;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/ct;->nR()Lcom/google/android/gms/internal/clearcut/ct;
 
     move-result-object p0
 
@@ -889,11 +889,11 @@
         }
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->nf()Lcom/google/android/gms/internal/clearcut/ei;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->ne()Lcom/google/android/gms/internal/clearcut/ei;
 
     move-result-object v0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->lT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->lS()I
 
     move-result p0
 
@@ -922,7 +922,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/az;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->ng()Lcom/google/android/gms/internal/clearcut/en;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->nf()Lcom/google/android/gms/internal/clearcut/en;
 
     move-result-object v0
 
@@ -994,7 +994,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->ng()Lcom/google/android/gms/internal/clearcut/en;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->nf()Lcom/google/android/gms/internal/clearcut/en;
 
     move-result-object v2
 
@@ -1012,7 +1012,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/clearcut/az;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->lT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->lS()I
 
     move-result p0
 
@@ -1031,7 +1031,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/clearcut/az;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->lT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/az;->lS()I
 
     move-result p0
 
@@ -1051,7 +1051,7 @@
     return p0
 .end method
 
-.method public static ne()Lcom/google/android/gms/internal/clearcut/aw;
+.method public static nd()Lcom/google/android/gms/internal/clearcut/aw;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1096,12 +1096,12 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bq;->nA()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bq;->nz()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object p1
 
     :cond_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->ng()Lcom/google/android/gms/internal/clearcut/en;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->nf()Lcom/google/android/gms/internal/clearcut/en;
 
     move-result-object v1
 
@@ -1119,7 +1119,7 @@
 
     if-eqz v2, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bq;->nA()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bq;->nz()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v1
 
@@ -1143,7 +1143,7 @@
 
     if-eqz v2, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->nh()Lcom/google/android/gms/internal/clearcut/ct;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/az;->ng()Lcom/google/android/gms/internal/clearcut/ct;
 
     move-result-object p1
 
@@ -1152,7 +1152,7 @@
     :cond_4
     check-cast v1, Lcom/google/android/gms/internal/clearcut/cm;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/cm;->nk()Lcom/google/android/gms/internal/clearcut/cn;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/cm;->nj()Lcom/google/android/gms/internal/clearcut/cn;
 
     move-result-object v1
 
@@ -1162,7 +1162,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cn;->nr()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/cn;->nq()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object p1
 
@@ -1189,7 +1189,7 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v2
 
@@ -1220,7 +1220,7 @@
     :cond_0
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dh;->oh()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1317,7 +1317,7 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v2
 
@@ -1345,7 +1345,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dh;->oh()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1427,7 +1427,7 @@
     return-object v0
 .end method
 
-.method public final mH()V
+.method public final mG()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/aw;->ajv:Z
@@ -1439,7 +1439,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->mH()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->mG()V
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/az.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/az.smali
index 31bb2aeefc..e3fabe4995 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/az.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/az.smali
@@ -22,14 +22,14 @@
 .method public abstract a(Lcom/google/android/gms/internal/clearcut/cn;Lcom/google/android/gms/internal/clearcut/cm;)Lcom/google/android/gms/internal/clearcut/cn;
 .end method
 
-.method public abstract lT()I
+.method public abstract lS()I
 .end method
 
-.method public abstract nf()Lcom/google/android/gms/internal/clearcut/ei;
+.method public abstract ne()Lcom/google/android/gms/internal/clearcut/ei;
 .end method
 
-.method public abstract ng()Lcom/google/android/gms/internal/clearcut/en;
+.method public abstract nf()Lcom/google/android/gms/internal/clearcut/en;
 .end method
 
-.method public abstract nh()Lcom/google/android/gms/internal/clearcut/ct;
+.method public abstract ng()Lcom/google/android/gms/internal/clearcut/ct;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/b.smali
index cf84ffa4d7..7fe1d701de 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/b.smali
@@ -12,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/b;->mu()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/b;->mt()Z
 
     move-result v0
 
@@ -34,7 +34,7 @@
 .method public static ad(Landroid/content/Context;)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/b;->mu()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/b;->mt()Z
 
     move-result v0
 
@@ -134,7 +134,7 @@
     return v0
 .end method
 
-.method private static mu()Z
+.method private static mt()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ba.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ba.smali
index e0c9fe79d9..61e5dd2b23 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ba.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ba.smali
@@ -1451,6 +1451,11 @@
 
     goto :goto_0
 
+    :pswitch_1
+    iget-object p1, p5, Lcom/google/android/gms/internal/clearcut/bp;->zzli:Ljava/lang/Class;
+
+    iput-object p1, p0, Lcom/google/android/gms/internal/clearcut/ba;->zziz:Ljava/lang/Class;
+
     :goto_1
     const/4 p1, 0x0
 
@@ -1471,7 +1476,7 @@
     const/4 p1, 0x1
 
     :cond_0
-    :pswitch_1
+    :pswitch_2
     iput-boolean p1, p0, Lcom/google/android/gms/internal/clearcut/ba;->zzja:Z
 
     return-void
@@ -1480,15 +1485,15 @@
 
     :pswitch_data_0
     .packed-switch 0x1
-        :pswitch_0
+        :pswitch_1
         :pswitch_0
     .end packed-switch
 
     :pswitch_data_1
     .packed-switch 0x1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
     .end packed-switch
 .end method
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bd.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bd.smali
index 59d0472f33..886dab7d20 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bd.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bd.smali
@@ -106,7 +106,7 @@
 .method private final c(IF)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-ltz p1, :cond_1
 
@@ -114,29 +114,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -145,8 +137,6 @@
 
     new-array v0, v0, [F
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -245,7 +235,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/bh;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -271,48 +261,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/bd;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/bd;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([FI)[F
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([FI)[F
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    iget-object v0, p1, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
 
     iget v4, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/clearcut/bd;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/bd;->modCount:I
 
@@ -484,33 +466,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/bd;->zzg(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
-
-    iget v4, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
@@ -525,7 +501,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/clearcut/bd;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
@@ -533,9 +509,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     const/4 v0, 0x0
 
@@ -564,13 +540,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/bd;->size:I
 
@@ -600,7 +574,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-lt p2, p1, :cond_0
 
@@ -647,19 +621,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/bd;->zzg(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bd;->akJ:[F
+    aput p2, v0, p1
 
-    aput p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/be.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/be.smali
index 5a9388f935..3e55c1964a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/be.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/be.smali
@@ -30,7 +30,7 @@
     return-void
 .end method
 
-.method public static ni()Lcom/google/android/gms/internal/clearcut/be;
+.method public static nh()Lcom/google/android/gms/internal/clearcut/be;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/be;->akK:Lcom/google/android/gms/internal/clearcut/be;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$a.smali
index 39009a9661..026c225615 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$a.smali
@@ -85,7 +85,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nm()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bf$a;->akM:Lcom/google/android/gms/internal/clearcut/bf;
 
@@ -151,7 +151,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/bf$a;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nq()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->np()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v1
 
@@ -174,7 +174,7 @@
     return v0
 .end method
 
-.method public final synthetic mF()Lcom/google/android/gms/internal/clearcut/s;
+.method public final synthetic mE()Lcom/google/android/gms/internal/clearcut/s;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/s;->clone()Ljava/lang/Object;
@@ -186,7 +186,7 @@
     return-object v0
 .end method
 
-.method public final synthetic nm()Lcom/google/android/gms/internal/clearcut/cm;
+.method public final synthetic nl()Lcom/google/android/gms/internal/clearcut/cm;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bf$a;->akL:Lcom/google/android/gms/internal/clearcut/bf;
@@ -194,7 +194,7 @@
     return-object v0
 .end method
 
-.method protected nn()V
+.method protected nm()V
     .locals 3
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/bf$a;->akN:Z
@@ -227,7 +227,7 @@
     return-void
 .end method
 
-.method public no()Lcom/google/android/gms/internal/clearcut/bf;
+.method public nn()Lcom/google/android/gms/internal/clearcut/bf;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -246,7 +246,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bf$a;->akM:Lcom/google/android/gms/internal/clearcut/bf;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v1
 
@@ -265,7 +265,7 @@
     return-object v0
 .end method
 
-.method public final np()Lcom/google/android/gms/internal/clearcut/bf;
+.method public final no()Lcom/google/android/gms/internal/clearcut/bf;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -273,7 +273,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nq()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->np()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v0
 
@@ -307,7 +307,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v1
 
@@ -341,20 +341,20 @@
     throw v0
 .end method
 
-.method public synthetic nq()Lcom/google/android/gms/internal/clearcut/cm;
+.method public synthetic np()Lcom/google/android/gms/internal/clearcut/cm;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->no()Lcom/google/android/gms/internal/clearcut/bf;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nn()Lcom/google/android/gms/internal/clearcut/bf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final synthetic nr()Lcom/google/android/gms/internal/clearcut/cm;
+.method public final synthetic nq()Lcom/google/android/gms/internal/clearcut/cm;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nq()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->np()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v0
 
@@ -388,7 +388,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$c.smali
index 63b483bdf2..869a7ef9f0 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$c.smali
@@ -45,7 +45,7 @@
 
 
 # virtual methods
-.method protected final nn()V
+.method protected final nm()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/bf$c;->akN:Z
@@ -55,7 +55,7 @@
     return-void
 
     :cond_0
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nn()V
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nm()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bf$c;->akM:Lcom/google/android/gms/internal/clearcut/bf;
 
@@ -78,10 +78,10 @@
     return-void
 .end method
 
-.method public final synthetic no()Lcom/google/android/gms/internal/clearcut/bf;
+.method public final synthetic nn()Lcom/google/android/gms/internal/clearcut/bf;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nq()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->np()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v0
 
@@ -90,7 +90,7 @@
     return-object v0
 .end method
 
-.method public final synthetic nq()Lcom/google/android/gms/internal/clearcut/cm;
+.method public final synthetic np()Lcom/google/android/gms/internal/clearcut/cm;
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/bf$c;->akN:Z
@@ -111,9 +111,9 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/clearcut/bf$d;->zzjv:Lcom/google/android/gms/internal/clearcut/aw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/aw;->mH()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/aw;->mG()V
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->no()Lcom/google/android/gms/internal/clearcut/bf;
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nn()Lcom/google/android/gms/internal/clearcut/bf;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$d.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$d.smali
index 6bbe4c2092..f4ebe8cf93 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$d.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$d.smali
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/bf;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/aw;->ne()Lcom/google/android/gms/internal/clearcut/aw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/aw;->nd()Lcom/google/android/gms/internal/clearcut/aw;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$e.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$e.smali
index 0c8153c150..be28c8de51 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$e.smali
@@ -106,7 +106,7 @@
     return v0
 .end method
 
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/bf$e;->number:I
@@ -114,7 +114,7 @@
     return v0
 .end method
 
-.method public final nf()Lcom/google/android/gms/internal/clearcut/ei;
+.method public final ne()Lcom/google/android/gms/internal/clearcut/ei;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bf$e;->akP:Lcom/google/android/gms/internal/clearcut/ei;
@@ -122,7 +122,7 @@
     return-object v0
 .end method
 
-.method public final ng()Lcom/google/android/gms/internal/clearcut/en;
+.method public final nf()Lcom/google/android/gms/internal/clearcut/en;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bf$e;->akP:Lcom/google/android/gms/internal/clearcut/ei;
@@ -132,7 +132,7 @@
     return-object v0
 .end method
 
-.method public final nh()Lcom/google/android/gms/internal/clearcut/ct;
+.method public final ng()Lcom/google/android/gms/internal/clearcut/ct;
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$g.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$g.smali
index 96ba245ba7..1f82d99bfc 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bf$g.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bf$g.smali
@@ -136,7 +136,7 @@
     return-void
 .end method
 
-.method public static ns()[I
+.method public static nr()[I
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/bf$g;->ala:[I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bf.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bf.smali
index 6863302031..a5bd6a92cf 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bf.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bf.smali
@@ -65,7 +65,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/r;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->op()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v0
 
@@ -105,7 +105,7 @@
     check-cast p0, Lcom/google/android/gms/internal/clearcut/bf;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -127,7 +127,7 @@
 
     invoke-interface/range {v0 .. v5}, Lcom/google/android/gms/internal/clearcut/de;->a(Ljava/lang/Object;[BIILcom/google/android/gms/internal/clearcut/x;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object p1
 
@@ -154,7 +154,7 @@
     .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p1
 
@@ -320,7 +320,7 @@
     return p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -385,7 +385,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object p1
 
@@ -543,7 +543,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -614,7 +614,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -643,7 +643,7 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -693,7 +693,7 @@
     return v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -717,7 +717,7 @@
     return v0
 .end method
 
-.method final mE()I
+.method final mD()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/bf;->zzjq:I
@@ -725,7 +725,7 @@
     return v0
 .end method
 
-.method public final nj()I
+.method public final ni()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/bf;->zzjq:I
@@ -734,7 +734,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -754,7 +754,7 @@
     return v0
 .end method
 
-.method public final synthetic nk()Lcom/google/android/gms/internal/clearcut/cn;
+.method public final synthetic nj()Lcom/google/android/gms/internal/clearcut/cn;
     .locals 2
 
     sget v0, Lcom/google/android/gms/internal/clearcut/bf$g;->akZ:I
@@ -772,7 +772,7 @@
     return-object v0
 .end method
 
-.method public final synthetic nl()Lcom/google/android/gms/internal/clearcut/cn;
+.method public final synthetic nk()Lcom/google/android/gms/internal/clearcut/cn;
     .locals 2
 
     sget v0, Lcom/google/android/gms/internal/clearcut/bf$g;->akZ:I
@@ -788,7 +788,7 @@
     return-object v0
 .end method
 
-.method public final synthetic nm()Lcom/google/android/gms/internal/clearcut/cm;
+.method public final synthetic nl()Lcom/google/android/gms/internal/clearcut/cm;
     .locals 2
 
     sget v0, Lcom/google/android/gms/internal/clearcut/bf$g;->zzki:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bg.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bg.smali
index a2a5a6d6a5..5333a3216e 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bg.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bg.smali
@@ -76,7 +76,7 @@
 .method private final J(II)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-ltz p1, :cond_1
 
@@ -84,29 +84,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -115,8 +107,6 @@
 
     new-array v0, v0, [I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -194,7 +184,7 @@
     return-object p1
 .end method
 
-.method public static nt()Lcom/google/android/gms/internal/clearcut/bg;
+.method public static ns()Lcom/google/android/gms/internal/clearcut/bg;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/bg;->alf:Lcom/google/android/gms/internal/clearcut/bg;
@@ -253,7 +243,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/bh;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -279,48 +269,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/bg;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/bg;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([II)[I
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([II)[I
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    iget-object v0, p1, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
 
     iget v4, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/clearcut/bg;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/bg;->modCount:I
 
@@ -496,33 +478,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/bg;->zzg(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
@@ -537,7 +513,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/clearcut/bg;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
@@ -545,9 +521,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     const/4 v0, 0x0
 
@@ -576,13 +552,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/bg;->size:I
 
@@ -612,7 +586,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-lt p2, p1, :cond_0
 
@@ -659,19 +633,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/bg;->zzg(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/bg;->alg:[I
+    aput p2, v0, p1
 
-    aput p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bh.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bh.smali
index 8764a25a97..6da82a763c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bh.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bh.smali
@@ -73,7 +73,7 @@
     return p0
 .end method
 
-.method public static K(Z)I
+.method public static J(Z)I
     .locals 0
 
     if-eqz p0, :cond_0
@@ -165,7 +165,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/clearcut/cm;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cm;->nk()Lcom/google/android/gms/internal/clearcut/cn;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cm;->nj()Lcom/google/android/gms/internal/clearcut/cn;
 
     move-result-object p0
 
@@ -175,7 +175,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cn;->nq()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/cn;->np()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object p0
 
@@ -211,7 +211,7 @@
     return p0
 .end method
 
-.method static nu()Z
+.method static nt()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bi.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bi.smali
index 9fc0ed7d21..cf4de9768a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bi.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bi.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract lT()I
+.method public abstract lS()I
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bm.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bm.smali
index 6cf48a1baf..f49d4e1e35 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bm.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bm.smali
@@ -31,8 +31,8 @@
     .end annotation
 .end method
 
-.method public abstract mG()Z
+.method public abstract mF()Z
 .end method
 
-.method public abstract mH()V
+.method public abstract mG()V
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bn.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bn.smali
index 269d8b8ee5..b02b8822fc 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bn.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bn.smali
@@ -19,7 +19,7 @@
     return-void
 .end method
 
-.method static nv()Lcom/google/android/gms/internal/clearcut/bn;
+.method static nu()Lcom/google/android/gms/internal/clearcut/bn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/bn;
@@ -31,7 +31,7 @@
     return-object v0
 .end method
 
-.method static nw()Lcom/google/android/gms/internal/clearcut/bn;
+.method static nv()Lcom/google/android/gms/internal/clearcut/bn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/bn;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method static nx()Lcom/google/android/gms/internal/clearcut/bo;
+.method static nw()Lcom/google/android/gms/internal/clearcut/bo;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/bo;
@@ -55,7 +55,7 @@
     return-object v0
 .end method
 
-.method static ny()Lcom/google/android/gms/internal/clearcut/bn;
+.method static nx()Lcom/google/android/gms/internal/clearcut/bn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/bn;
@@ -67,7 +67,7 @@
     return-object v0
 .end method
 
-.method static nz()Lcom/google/android/gms/internal/clearcut/bn;
+.method static ny()Lcom/google/android/gms/internal/clearcut/bn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/bn;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bq.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bq.smali
index fcbfe8eebf..74f9dad4d6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bq.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bq.smali
@@ -3,7 +3,7 @@
 
 
 # direct methods
-.method public static nA()Lcom/google/android/gms/internal/clearcut/cm;
+.method public static nz()Lcom/google/android/gms/internal/clearcut/cm;
     .locals 1
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/br.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/br.smali
index e04b2e6cb7..f4b5d543f4 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/br.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/br.smali
@@ -98,7 +98,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bq;->nA()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bq;->nz()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bt.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bt.smali
index 83b0e3b862..5e716961b3 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bt.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bt.smali
@@ -18,7 +18,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ar;->na()Lcom/google/android/gms/internal/clearcut/ar;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ar;->mZ()Lcom/google/android/gms/internal/clearcut/ar;
 
     move-result-object v0
 
@@ -126,11 +126,11 @@
 
     if-nez v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bt;->mD()Lcom/google/android/gms/internal/clearcut/ab;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bt;->mC()Lcom/google/android/gms/internal/clearcut/ab;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/bt;->mD()Lcom/google/android/gms/internal/clearcut/ab;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/bt;->mC()Lcom/google/android/gms/internal/clearcut/ab;
 
     move-result-object p1
 
@@ -154,7 +154,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->nm()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->nl()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v1
 
@@ -169,7 +169,7 @@
     return p1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/cm;->nm()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/cm;->nl()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object p1
 
@@ -192,7 +192,7 @@
     return v0
 .end method
 
-.method public final mD()Lcom/google/android/gms/internal/clearcut/ab;
+.method public final mC()Lcom/google/android/gms/internal/clearcut/ab;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bt;->alA:Lcom/google/android/gms/internal/clearcut/ab;
@@ -232,7 +232,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bt;->alz:Lcom/google/android/gms/internal/clearcut/cm;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->mD()Lcom/google/android/gms/internal/clearcut/ab;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->mC()Lcom/google/android/gms/internal/clearcut/ab;
 
     move-result-object v0
 
@@ -253,9 +253,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final nj()I
+.method public final ni()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bt;->alA:Lcom/google/android/gms/internal/clearcut/ab;
@@ -277,7 +279,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bt;->alz:Lcom/google/android/gms/internal/clearcut/cm;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->nj()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->ni()I
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bu.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bu.smali
index a4f2b05e78..94c5758f6f 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bu.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bu.smali
@@ -115,7 +115,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/clearcut/ab;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ab;->mK()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ab;->mJ()Ljava/lang/String;
 
     move-result-object p0
 
@@ -138,7 +138,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bu;->alD:Ljava/util/List;
 
@@ -165,7 +165,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     instance-of v0, p2, Lcom/google/android/gms/internal/clearcut/bv;
 
@@ -173,7 +173,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/clearcut/bv;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/bv;->nB()Ljava/util/List;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/bv;->nA()Ljava/util/List;
 
     move-result-object p2
 
@@ -262,7 +262,7 @@
 .method public final clear()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bu;->alD:Ljava/util/List;
 
@@ -311,11 +311,11 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/ab;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/ab;->mK()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/ab;->mJ()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/ab;->mL()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/ab;->mK()Z
 
     move-result v0
 
@@ -359,17 +359,17 @@
     return v0
 .end method
 
-.method public final bridge synthetic mG()Z
+.method public final bridge synthetic mF()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/u;->mG()Z
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/u;->mF()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final nB()Ljava/util/List;
+.method public final nA()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -388,10 +388,10 @@
     return-object v0
 .end method
 
-.method public final nC()Lcom/google/android/gms/internal/clearcut/bv;
+.method public final nB()Lcom/google/android/gms/internal/clearcut/bv;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->mG()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->mF()Z
 
     move-result v0
 
@@ -410,7 +410,7 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bu;->alD:Ljava/util/List;
 
@@ -466,7 +466,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bu;->alD:Ljava/util/List;
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bv.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bv.smali
index 23236db5de..437498ee35 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bv.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bv.smali
@@ -9,7 +9,7 @@
 .method public abstract bF(I)Ljava/lang/Object;
 .end method
 
-.method public abstract nB()Ljava/util/List;
+.method public abstract nA()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -19,5 +19,5 @@
     .end annotation
 .end method
 
-.method public abstract nC()Lcom/google/android/gms/internal/clearcut/bv;
+.method public abstract nB()Lcom/google/android/gms/internal/clearcut/bv;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bw.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bw.smali
index 46ea7efba2..d9abfe16f0 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bw.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bw.smali
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method static nD()Lcom/google/android/gms/internal/clearcut/bw;
+.method static nC()Lcom/google/android/gms/internal/clearcut/bw;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/bw;->alE:Lcom/google/android/gms/internal/clearcut/bw;
@@ -53,7 +53,7 @@
     return-object v0
 .end method
 
-.method static nE()Lcom/google/android/gms/internal/clearcut/bw;
+.method static nD()Lcom/google/android/gms/internal/clearcut/bw;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/bw;->alF:Lcom/google/android/gms/internal/clearcut/bw;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/by.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/by.smali
index 53e39e52ef..f0691a26e9 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/by.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/by.smali
@@ -92,7 +92,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/bv;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bv;->nC()Lcom/google/android/gms/internal/clearcut/bv;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bv;->nB()Lcom/google/android/gms/internal/clearcut/bv;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/bz.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/bz.smali
index 4c0990d697..f553e83974 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/bz.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/bz.smali
@@ -53,7 +53,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/bm;->mH()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/bm;->mG()V
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->mG()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->mF()Z
 
     move-result v3
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/c.smali
index 9f3364a550..433c9f682c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/c.smali
@@ -159,6 +159,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p0
+
+    return-void
 .end method
 
 .method public static b(Landroid/content/ContentResolver;Landroid/net/Uri;)Lcom/google/android/gms/internal/clearcut/c;
@@ -208,7 +210,7 @@
     return-object v0
 .end method
 
-.method private final mw()Ljava/util/Map;
+.method private final mv()Ljava/util/Map;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -306,7 +308,7 @@
 
 
 # virtual methods
-.method public final mv()Ljava/util/Map;
+.method public final mu()Ljava/util/Map;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -326,7 +328,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/c;->mw()Ljava/util/Map;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/c;->mv()Ljava/util/Map;
 
     move-result-object v0
 
@@ -347,7 +349,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/c;->mw()Ljava/util/Map;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/c;->mv()Ljava/util/Map;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ca.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ca.smali
index 1f479d6cfa..55911a6ae4 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ca.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ca.smali
@@ -106,7 +106,7 @@
 .method private final k(IJ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-ltz p1, :cond_1
 
@@ -114,29 +114,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -145,8 +137,6 @@
 
     new-array v0, v0, [J
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -194,7 +184,7 @@
     throw p2
 .end method
 
-.method public static nF()Lcom/google/android/gms/internal/clearcut/ca;
+.method public static nE()Lcom/google/android/gms/internal/clearcut/ca;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/ca;->alH:Lcom/google/android/gms/internal/clearcut/ca;
@@ -263,7 +253,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/bh;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -289,48 +279,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/ca;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/ca;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([JI)[J
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([JI)[J
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
+    iget-object v0, p1, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
 
     iget v4, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/clearcut/ca;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/ca;->modCount:I
 
@@ -502,9 +484,9 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 6
+    .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/ca;->zzg(I)V
 
@@ -512,23 +494,17 @@
 
     aget-wide v1, v0, p1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v4, v3, -0x1
 
-    if-ge p1, v0, :cond_0
+    if-ge p1, v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
+    add-int/lit8 v4, p1, 0x1
 
-    add-int/lit8 v3, p1, 0x1
+    sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
-
-    iget v5, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
-
-    sub-int/2addr v5, p1
-
-    invoke-static {v0, v3, v4, p1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
@@ -553,7 +529,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     const/4 v0, 0x0
 
@@ -582,13 +558,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/ca;->size:I
 
@@ -618,7 +592,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-lt p2, p1, :cond_0
 
@@ -665,7 +639,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/ca;->zzg(I)V
 
@@ -673,8 +647,6 @@
 
     aget-wide v2, p2, p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/clearcut/ca;->alI:[J
-
     aput-wide v0, p2, p1
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cb.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cb.smali
index 61b8b25f0b..0ac603f3db 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cb.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cb.smali
@@ -35,7 +35,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/clearcut/cl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/be;->ni()Lcom/google/android/gms/internal/clearcut/be;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/be;->nh()Lcom/google/android/gms/internal/clearcut/be;
 
     move-result-object v2
 
@@ -43,7 +43,7 @@
 
     aput-object v2, v1, v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cb;->nG()Lcom/google/android/gms/internal/clearcut/cl;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cb;->nF()Lcom/google/android/gms/internal/clearcut/cl;
 
     move-result-object v2
 
@@ -79,7 +79,7 @@
 .method private static a(Lcom/google/android/gms/internal/clearcut/ck;)Z
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/ck;->nP()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/ck;->nO()I
 
     move-result p0
 
@@ -97,7 +97,7 @@
     return p0
 .end method
 
-.method private static nG()Lcom/google/android/gms/internal/clearcut/cl;
+.method private static nF()Lcom/google/android/gms/internal/clearcut/cl;
     .locals 4
 
     :try_start_0
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/ck;->nQ()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/ck;->nP()Z
 
     move-result v0
 
@@ -175,15 +175,15 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->oe()Lcom/google/android/gms/internal/clearcut/dv;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->od()Lcom/google/android/gms/internal/clearcut/dv;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nc()Lcom/google/android/gms/internal/clearcut/as;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nb()Lcom/google/android/gms/internal/clearcut/as;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/ck;->nR()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/ck;->nQ()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v1
 
@@ -194,15 +194,15 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->oc()Lcom/google/android/gms/internal/clearcut/dv;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->ob()Lcom/google/android/gms/internal/clearcut/dv;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nd()Lcom/google/android/gms/internal/clearcut/as;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nc()Lcom/google/android/gms/internal/clearcut/as;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/ck;->nR()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/clearcut/ck;->nQ()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v1
 
@@ -227,64 +227,6 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nU()Lcom/google/android/gms/internal/clearcut/cu;
-
-    move-result-object v2
-
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bw;->nE()Lcom/google/android/gms/internal/clearcut/bw;
-
-    move-result-object v3
-
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->oe()Lcom/google/android/gms/internal/clearcut/dv;
-
-    move-result-object v4
-
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nc()Lcom/google/android/gms/internal/clearcut/as;
-
-    move-result-object v5
-
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cj;->nN()Lcom/google/android/gms/internal/clearcut/ch;
-
-    move-result-object v6
-
-    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/ck;Lcom/google/android/gms/internal/clearcut/cu;Lcom/google/android/gms/internal/clearcut/bw;Lcom/google/android/gms/internal/clearcut/dv;Lcom/google/android/gms/internal/clearcut/as;Lcom/google/android/gms/internal/clearcut/ch;)Lcom/google/android/gms/internal/clearcut/cq;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nU()Lcom/google/android/gms/internal/clearcut/cu;
-
-    move-result-object v2
-
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bw;->nE()Lcom/google/android/gms/internal/clearcut/bw;
-
-    move-result-object v3
-
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->oe()Lcom/google/android/gms/internal/clearcut/dv;
-
-    move-result-object v4
-
-    const/4 v5, 0x0
-
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cj;->nN()Lcom/google/android/gms/internal/clearcut/ch;
-
-    move-result-object v6
-
-    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/ck;Lcom/google/android/gms/internal/clearcut/cu;Lcom/google/android/gms/internal/clearcut/bw;Lcom/google/android/gms/internal/clearcut/dv;Lcom/google/android/gms/internal/clearcut/as;Lcom/google/android/gms/internal/clearcut/ch;)Lcom/google/android/gms/internal/clearcut/cq;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    invoke-static {v1}, Lcom/google/android/gms/internal/clearcut/cb;->a(Lcom/google/android/gms/internal/clearcut/ck;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
     invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nT()Lcom/google/android/gms/internal/clearcut/cu;
 
     move-result-object v2
@@ -293,11 +235,11 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->oc()Lcom/google/android/gms/internal/clearcut/dv;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->od()Lcom/google/android/gms/internal/clearcut/dv;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nd()Lcom/google/android/gms/internal/clearcut/as;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nb()Lcom/google/android/gms/internal/clearcut/as;
 
     move-result-object v5
 
@@ -311,7 +253,7 @@
 
     return-object p1
 
-    :cond_4
+    :cond_2
     invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nT()Lcom/google/android/gms/internal/clearcut/cu;
 
     move-result-object v2
@@ -335,4 +277,62 @@
     move-result-object p1
 
     return-object p1
+
+    :cond_3
+    invoke-static {v1}, Lcom/google/android/gms/internal/clearcut/cb;->a(Lcom/google/android/gms/internal/clearcut/ck;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nS()Lcom/google/android/gms/internal/clearcut/cu;
+
+    move-result-object v2
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bw;->nC()Lcom/google/android/gms/internal/clearcut/bw;
+
+    move-result-object v3
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->ob()Lcom/google/android/gms/internal/clearcut/dv;
+
+    move-result-object v4
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/av;->nc()Lcom/google/android/gms/internal/clearcut/as;
+
+    move-result-object v5
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cj;->nL()Lcom/google/android/gms/internal/clearcut/ch;
+
+    move-result-object v6
+
+    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/ck;Lcom/google/android/gms/internal/clearcut/cu;Lcom/google/android/gms/internal/clearcut/bw;Lcom/google/android/gms/internal/clearcut/dv;Lcom/google/android/gms/internal/clearcut/as;Lcom/google/android/gms/internal/clearcut/ch;)Lcom/google/android/gms/internal/clearcut/cq;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_4
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nS()Lcom/google/android/gms/internal/clearcut/cu;
+
+    move-result-object v2
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bw;->nC()Lcom/google/android/gms/internal/clearcut/bw;
+
+    move-result-object v3
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->oc()Lcom/google/android/gms/internal/clearcut/dv;
+
+    move-result-object v4
+
+    const/4 v5, 0x0
+
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cj;->nL()Lcom/google/android/gms/internal/clearcut/ch;
+
+    move-result-object v6
+
+    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/ck;Lcom/google/android/gms/internal/clearcut/cu;Lcom/google/android/gms/internal/clearcut/bw;Lcom/google/android/gms/internal/clearcut/dv;Lcom/google/android/gms/internal/clearcut/as;Lcom/google/android/gms/internal/clearcut/ch;)Lcom/google/android/gms/internal/clearcut/cq;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cd.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cd.smali
index b0ff6b6771..88d5990fc6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cd.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cd.smali
@@ -137,4 +137,6 @@
     invoke-direct {v0, p1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cg.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cg.smali
index ce8388ab1e..1221d247d3 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cg.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cg.smali
@@ -106,7 +106,7 @@
     throw p0
 .end method
 
-.method public static nH()Lcom/google/android/gms/internal/clearcut/cg;
+.method public static nG()Lcom/google/android/gms/internal/clearcut/cg;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -130,7 +130,7 @@
 .method public final clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nI()V
 
     invoke-super {p0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -337,7 +337,7 @@
     return v1
 .end method
 
-.method public final nI()Lcom/google/android/gms/internal/clearcut/cg;
+.method public final nH()Lcom/google/android/gms/internal/clearcut/cg;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -367,7 +367,7 @@
     return-object v0
 .end method
 
-.method final nJ()V
+.method final nI()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/cg;->zzfa:Z
@@ -392,7 +392,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nI()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/bh;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nI()V
 
     invoke-interface {p1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -462,7 +462,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/cg;->nI()V
 
     invoke-super {p0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ch.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ch.smali
index 2dc64e5064..cf1749f62f 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ch.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ch.smali
@@ -39,10 +39,10 @@
 .method public abstract f(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 .end method
 
-.method public abstract nK()Ljava/lang/Object;
+.method public abstract nJ()Ljava/lang/Object;
 .end method
 
-.method public abstract nL()Lcom/google/android/gms/internal/clearcut/cf;
+.method public abstract nK()Lcom/google/android/gms/internal/clearcut/cf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ci.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ci.smali
index 802e5920fb..d1e805ef9a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ci.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ci.smali
@@ -150,12 +150,12 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/cg;->nI()Lcom/google/android/gms/internal/clearcut/cg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/cg;->nH()Lcom/google/android/gms/internal/clearcut/cg;
 
     move-result-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/cg;->nJ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/cg;->nI()V
 
     invoke-virtual {p2}, Lcom/google/android/gms/internal/clearcut/cg;->isEmpty()Z
 
@@ -169,21 +169,21 @@
     return-object p1
 .end method
 
-.method public final nK()Ljava/lang/Object;
+.method public final nJ()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cg;->nH()Lcom/google/android/gms/internal/clearcut/cg;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cg;->nG()Lcom/google/android/gms/internal/clearcut/cg;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/cg;->nI()Lcom/google/android/gms/internal/clearcut/cg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/cg;->nH()Lcom/google/android/gms/internal/clearcut/cg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final nL()Lcom/google/android/gms/internal/clearcut/cf;
+.method public final nK()Lcom/google/android/gms/internal/clearcut/cf;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cj.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cj.smali
index 10699703c0..858ff4582c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cj.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cj.smali
@@ -12,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cj;->nO()Lcom/google/android/gms/internal/clearcut/ch;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cj;->nN()Lcom/google/android/gms/internal/clearcut/ch;
 
     move-result-object v0
 
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method static nM()Lcom/google/android/gms/internal/clearcut/ch;
+.method static nL()Lcom/google/android/gms/internal/clearcut/ch;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/cj;->alQ:Lcom/google/android/gms/internal/clearcut/ch;
@@ -35,7 +35,7 @@
     return-object v0
 .end method
 
-.method static nN()Lcom/google/android/gms/internal/clearcut/ch;
+.method static nM()Lcom/google/android/gms/internal/clearcut/ch;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/cj;->alR:Lcom/google/android/gms/internal/clearcut/ch;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method private static nO()Lcom/google/android/gms/internal/clearcut/ch;
+.method private static nN()Lcom/google/android/gms/internal/clearcut/ch;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ck.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ck.smali
index 52cda4d8f8..6fdc75b8da 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ck.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ck.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
-.method public abstract nP()I
+.method public abstract nO()I
 .end method
 
-.method public abstract nQ()Z
+.method public abstract nP()Z
 .end method
 
-.method public abstract nR()Lcom/google/android/gms/internal/clearcut/cm;
+.method public abstract nQ()Lcom/google/android/gms/internal/clearcut/cm;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cm.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cm.smali
index 03b7c1b56c..fcd2274ca0 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cm.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cm.smali
@@ -14,14 +14,14 @@
     .end annotation
 .end method
 
-.method public abstract mD()Lcom/google/android/gms/internal/clearcut/ab;
+.method public abstract mC()Lcom/google/android/gms/internal/clearcut/ab;
 .end method
 
-.method public abstract nj()I
+.method public abstract ni()I
+.end method
+
+.method public abstract nj()Lcom/google/android/gms/internal/clearcut/cn;
 .end method
 
 .method public abstract nk()Lcom/google/android/gms/internal/clearcut/cn;
 .end method
-
-.method public abstract nl()Lcom/google/android/gms/internal/clearcut/cn;
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cn.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cn.smali
index c1cfe12915..a0bfa00b75 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cn.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cn.smali
@@ -10,8 +10,8 @@
 .method public abstract a(Lcom/google/android/gms/internal/clearcut/cm;)Lcom/google/android/gms/internal/clearcut/cn;
 .end method
 
-.method public abstract nq()Lcom/google/android/gms/internal/clearcut/cm;
+.method public abstract np()Lcom/google/android/gms/internal/clearcut/cm;
 .end method
 
-.method public abstract nr()Lcom/google/android/gms/internal/clearcut/cm;
+.method public abstract nq()Lcom/google/android/gms/internal/clearcut/cm;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/co.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/co.smali
index 5722e91e1e..786f4674b7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/co.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/co.smali
@@ -6,5 +6,5 @@
 .method public abstract isInitialized()Z
 .end method
 
-.method public abstract nm()Lcom/google/android/gms/internal/clearcut/cm;
+.method public abstract nl()Lcom/google/android/gms/internal/clearcut/cm;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cp.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cp.smali
index 0c22489110..618f373355 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cp.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cp.smali
@@ -641,7 +641,7 @@
 
     check-cast v4, Lcom/google/android/gms/internal/clearcut/cm;
 
-    invoke-interface {v4}, Lcom/google/android/gms/internal/clearcut/cm;->nm()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {v4}, Lcom/google/android/gms/internal/clearcut/cm;->nl()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cq.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cq.smali
index 28d86a4663..b64f73659f 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cq.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cq.smali
@@ -78,7 +78,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ou()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ot()Lsun/misc/Unsafe;
 
     move-result-object v0
 
@@ -339,7 +339,7 @@
     return p2
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
@@ -673,7 +673,7 @@
     goto :goto_4
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nz()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -898,7 +898,7 @@
 
     check-cast v11, Lcom/google/android/gms/internal/clearcut/bm;
 
-    invoke-interface {v11}, Lcom/google/android/gms/internal/clearcut/bm;->mG()Z
+    invoke-interface {v11}, Lcom/google/android/gms/internal/clearcut/bm;->mF()Z
 
     move-result v12
 
@@ -1027,7 +1027,7 @@
     goto/16 :goto_1f
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1099,7 +1099,7 @@
     goto/16 :goto_1f
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1168,7 +1168,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/internal/clearcut/bf;->zzjp:Lcom/google/android/gms/internal/clearcut/dw;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->op()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v4
 
@@ -1419,14 +1419,14 @@
     goto :goto_e
 
     :cond_11
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nz()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
     throw v1
 
     :cond_12
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nz()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1478,7 +1478,7 @@
     goto/16 :goto_7
 
     :cond_15
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1564,7 +1564,7 @@
     goto/16 :goto_1f
 
     :cond_19
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1634,7 +1634,7 @@
     goto/16 :goto_1f
 
     :cond_1c
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1732,7 +1732,7 @@
     goto/16 :goto_1f
 
     :cond_20
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1796,7 +1796,7 @@
     goto :goto_1f
 
     :cond_23
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1866,7 +1866,7 @@
     goto :goto_1f
 
     :cond_26
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v1
 
@@ -1952,7 +1952,7 @@
 .end method
 
 .method private final a(Ljava/lang/Object;[BIIILcom/google/android/gms/internal/clearcut/x;)I
-    .locals 31
+    .locals 26
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;[BIII",
@@ -1996,7 +1996,7 @@
     :goto_0
     const v17, 0xfffff
 
-    if-ge v0, v13, :cond_1c
+    if-ge v0, v13, :cond_1b
 
     add-int/lit8 v1, v0, 0x1
 
@@ -2030,112 +2030,94 @@
 
     move-result v1
 
-    if-eq v1, v8, :cond_18
+    if-eq v1, v8, :cond_17
 
     iget-object v0, v15, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
     add-int/lit8 v18, v1, 0x1
 
-    aget v0, v0, v18
+    aget v8, v0, v18
 
     const/high16 v18, 0xff00000
 
-    and-int v18, v0, v18
+    and-int v18, v8, v18
 
-    ushr-int/lit8 v8, v18, 0x14
+    ushr-int/lit8 v11, v18, 0x14
 
-    move/from16 v20, v5
+    move/from16 p3, v5
 
-    and-int v5, v0, v17
+    and-int v5, v8, v17
 
-    int-to-long v11, v5
+    int-to-long v12, v5
 
     const/16 v5, 0x11
 
-    move/from16 v21, v0
+    move/from16 v18, v8
 
-    if-gt v8, v5, :cond_10
+    if-gt v11, v5, :cond_f
 
-    iget-object v5, v15, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    add-int/lit8 v5, v1, 0x2
 
-    add-int/lit8 v18, v1, 0x2
+    aget v0, v0, v5
 
-    aget v5, v5, v18
+    ushr-int/lit8 v5, v0, 0x14
 
-    ushr-int/lit8 v18, v5, 0x14
+    const/4 v8, 0x1
 
-    const/4 v0, 0x1
+    shl-int v20, v8, v5
 
-    shl-int v18, v0, v18
+    and-int v0, v0, v17
 
-    and-int v5, v5, v17
+    if-eq v0, v7, :cond_2
 
-    if-eq v5, v7, :cond_2
+    const/4 v5, -0x1
 
-    const/4 v13, -0x1
+    if-eq v7, v5, :cond_1
 
-    if-eq v7, v13, :cond_1
+    int-to-long v8, v7
 
-    move/from16 v22, v1
+    invoke-virtual {v10, v14, v8, v9, v6}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    int-to-long v0, v7
+    :cond_1
+    int-to-long v6, v0
 
-    invoke-virtual {v10, v14, v0, v1, v6}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+    invoke-virtual {v10, v14, v6, v7}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+
+    move-result v6
+
+    move v7, v0
 
     goto :goto_2
 
-    :cond_1
-    move/from16 v22, v1
+    :cond_2
+    const/4 v5, -0x1
 
     :goto_2
-    int-to-long v0, v5
-
-    invoke-virtual {v10, v14, v0, v1}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
-
-    move-result v0
-
-    move v6, v0
-
-    move v7, v5
-
-    goto :goto_3
-
-    :cond_2
-    move/from16 v22, v1
-
-    const/4 v13, -0x1
-
-    :goto_3
     const/4 v0, 0x5
 
-    packed-switch v8, :pswitch_data_0
+    packed-switch v11, :pswitch_data_0
+
+    move/from16 v9, p3
 
-    :cond_3
     move v5, v4
 
-    move/from16 v24, v7
+    move/from16 p3, v7
 
-    move/from16 v25, v20
-
-    const/4 v11, -0x1
+    move-object/from16 v11, p6
 
+    :goto_3
     move-object/from16 v12, p2
 
-    :goto_4
-    move/from16 v13, p4
-
-    goto/16 :goto_14
+    goto/16 :goto_13
 
     :pswitch_0
     const/4 v0, 0x3
 
-    if-ne v2, v0, :cond_3
+    if-ne v2, v0, :cond_4
 
     shl-int/lit8 v0, v3, 0x3
 
-    or-int/lit8 v5, v0, 0x4
-
-    move/from16 v1, v22
+    or-int/lit8 v8, v0, 0x4
 
     invoke-direct {v15, v1}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
@@ -2147,9 +2129,11 @@
 
     move/from16 v3, p4
 
-    move v4, v5
+    move v4, v8
 
-    move/from16 v8, v20
+    move/from16 v9, p3
+
+    const/4 v8, -0x1
 
     move-object/from16 v5, p6
 
@@ -2157,57 +2141,73 @@
 
     move-result v0
 
-    and-int v1, v6, v18
+    and-int v1, v6, v20
 
-    if-nez v1, :cond_4
+    if-nez v1, :cond_3
 
-    iget-object v1, v9, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
+    move-object/from16 v11, p6
 
-    :goto_5
-    invoke-virtual {v10, v14, v11, v12, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
+    iget-object v1, v11, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
 
-    goto :goto_6
+    goto :goto_4
 
-    :cond_4
-    invoke-virtual {v10, v14, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    :cond_3
+    move-object/from16 v11, p6
+
+    invoke-virtual {v10, v14, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, v9, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
+    iget-object v2, v11, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
 
     invoke-static {v1, v2}, Lcom/google/android/gms/internal/clearcut/bh;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
-    goto :goto_5
+    :goto_4
+    invoke-virtual {v10, v14, v12, v13, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :goto_6
-    or-int v6, v6, v18
+    or-int v6, v6, v20
 
-    move v1, v8
+    move v1, v9
 
-    const/4 v8, -0x1
+    move-object v9, v11
 
     move/from16 v11, p5
 
     move-object/from16 v12, p2
 
-    goto/16 :goto_b
+    goto/16 :goto_9
+
+    :cond_4
+    move/from16 v9, p3
+
+    move-object/from16 v11, p6
+
+    move v5, v4
+
+    move/from16 p3, v7
+
+    goto :goto_3
 
     :pswitch_1
-    move/from16 v8, v20
+    move/from16 v9, p3
+
+    const/4 v8, -0x1
+
+    move-object/from16 v11, p6
 
     if-nez v2, :cond_5
 
-    move-wide v2, v11
+    move-wide v2, v12
 
     move-object/from16 v12, p2
 
-    invoke-static {v12, v4, v9}, Lcom/google/android/gms/internal/clearcut/w;->b([BILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v12, v4, v11}, Lcom/google/android/gms/internal/clearcut/w;->b([BILcom/google/android/gms/internal/clearcut/x;)I
 
-    move-result v11
+    move-result v13
 
-    iget-wide v0, v9, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
+    iget-wide v0, v11, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/clearcut/ak;->u(J)J
 
@@ -2219,33 +2219,39 @@
 
     invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putLong(Ljava/lang/Object;JJ)V
 
-    or-int v6, v6, v18
+    or-int v6, v6, v20
 
-    move v1, v8
+    move v1, v9
 
-    move v0, v11
+    move-object v9, v11
 
-    goto/16 :goto_a
+    move v0, v13
+
+    goto/16 :goto_8
 
     :cond_5
     move-object/from16 v12, p2
 
-    goto/16 :goto_c
+    goto/16 :goto_a
 
     :pswitch_2
-    move-wide v0, v11
+    move/from16 v9, p3
 
-    move/from16 v8, v20
+    move-wide v0, v12
+
+    const/4 v8, -0x1
+
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    if-nez v2, :cond_9
+    if-nez v2, :cond_8
 
-    invoke-static {v12, v4, v9}, Lcom/google/android/gms/internal/clearcut/w;->a([BILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v12, v4, v11}, Lcom/google/android/gms/internal/clearcut/w;->a([BILcom/google/android/gms/internal/clearcut/x;)I
 
     move-result v2
 
-    iget v3, v9, Lcom/google/android/gms/internal/clearcut/x;->aiI:I
+    iget v3, v11, Lcom/google/android/gms/internal/clearcut/x;->aiI:I
 
     invoke-static {v3}, Lcom/google/android/gms/internal/clearcut/ak;->bk(I)I
 
@@ -2253,24 +2259,26 @@
 
     invoke-virtual {v10, v14, v0, v1, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    goto :goto_8
+    goto :goto_6
 
     :pswitch_3
-    move-wide v13, v11
+    move/from16 v9, p3
 
-    move/from16 v8, v20
+    move-wide/from16 v21, v12
 
-    move/from16 v1, v22
+    const/4 v8, -0x1
+
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
     if-nez v2, :cond_8
 
-    invoke-static {v12, v4, v9}, Lcom/google/android/gms/internal/clearcut/w;->a([BILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v12, v4, v11}, Lcom/google/android/gms/internal/clearcut/w;->a([BILcom/google/android/gms/internal/clearcut/x;)I
 
     move-result v0
 
-    iget v2, v9, Lcom/google/android/gms/internal/clearcut/x;->aiI:I
+    iget v2, v11, Lcom/google/android/gms/internal/clearcut/x;->aiI:I
 
     invoke-direct {v15, v1}, Lcom/google/android/gms/internal/clearcut/cq;->bH(I)Lcom/google/android/gms/internal/clearcut/bj;
 
@@ -2284,7 +2292,7 @@
 
     if-eqz v1, :cond_6
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_6
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/internal/clearcut/cq;->am(Ljava/lang/Object;)Lcom/google/android/gms/internal/clearcut/dw;
@@ -2297,236 +2305,215 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, v8, v2}, Lcom/google/android/gms/internal/clearcut/dw;->e(ILjava/lang/Object;)V
+    invoke-virtual {v1, v9, v2}, Lcom/google/android/gms/internal/clearcut/dw;->e(ILjava/lang/Object;)V
 
-    move v1, v8
-
-    const/4 v8, -0x1
-
-    move/from16 v11, p5
-
-    move/from16 v13, p4
-
-    move-object/from16 v14, p1
-
-    goto/16 :goto_0
+    goto :goto_7
 
     :cond_7
-    :goto_7
-    move-wide v3, v13
-
-    move-object/from16 v14, p1
+    :goto_5
+    move-wide/from16 v3, v21
 
     invoke-virtual {v10, v14, v3, v4, v2}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    or-int v6, v6, v18
+    or-int v6, v6, v20
 
-    goto :goto_9
-
-    :cond_8
-    move-object/from16 v14, p1
-
-    goto :goto_c
+    goto :goto_7
 
     :pswitch_4
-    move-wide v0, v11
+    move/from16 v9, p3
 
-    move/from16 v8, v20
+    move-wide v0, v12
 
     const/4 v3, 0x2
 
+    const/4 v8, -0x1
+
+    move-object/from16 v11, p6
+
     move-object/from16 v12, p2
 
-    if-ne v2, v3, :cond_9
+    if-ne v2, v3, :cond_8
 
-    invoke-static {v12, v4, v9}, Lcom/google/android/gms/internal/clearcut/w;->e([BILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v12, v4, v11}, Lcom/google/android/gms/internal/clearcut/w;->e([BILcom/google/android/gms/internal/clearcut/x;)I
 
     move-result v2
 
-    iget-object v3, v9, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
+    iget-object v3, v11, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
 
     invoke-virtual {v10, v14, v0, v1, v3}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :goto_8
-    or-int v6, v6, v18
+    :goto_6
+    or-int v6, v6, v20
 
     move v0, v2
 
-    :goto_9
-    move v1, v8
+    :goto_7
+    move v1, v9
 
-    :goto_a
-    const/4 v8, -0x1
+    move-object v9, v11
 
+    :goto_8
     move/from16 v11, p5
 
-    :goto_b
+    :goto_9
     move/from16 v13, p4
 
     goto/16 :goto_0
 
-    :cond_9
-    :goto_c
+    :cond_8
+    :goto_a
     move v5, v4
 
-    move/from16 v24, v7
+    move/from16 p3, v7
 
-    move/from16 v25, v8
-
-    const/4 v11, -0x1
-
-    goto/16 :goto_4
+    goto/16 :goto_13
 
     :pswitch_5
-    move/from16 v24, v7
+    move/from16 v9, p3
 
-    move-wide v7, v11
+    move/from16 p3, v7
 
-    move/from16 v25, v20
-
-    move/from16 v1, v22
+    move-wide v7, v12
 
     const/4 v3, 0x2
 
+    move-object/from16 v11, p6
+
     move-object/from16 v12, p2
 
-    if-ne v2, v3, :cond_b
+    if-ne v2, v3, :cond_a
 
     invoke-direct {v15, v1}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
     move-result-object v0
 
-    const/4 v11, -0x1
+    move/from16 v5, p4
 
-    move/from16 v13, p4
-
-    invoke-static {v0, v12, v4, v13, v9}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/de;[BIILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v0, v12, v4, v5, v11}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/de;[BIILcom/google/android/gms/internal/clearcut/x;)I
 
     move-result v0
 
-    and-int v1, v6, v18
+    and-int v1, v6, v20
 
-    if-nez v1, :cond_a
+    if-nez v1, :cond_9
 
-    iget-object v1, v9, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
+    iget-object v1, v11, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
 
-    goto :goto_e
+    goto :goto_c
 
-    :cond_a
+    :cond_9
     invoke-virtual {v10, v14, v7, v8}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, v9, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
+    iget-object v2, v11, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
 
     invoke-static {v1, v2}, Lcom/google/android/gms/internal/clearcut/bh;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
-    goto :goto_e
+    goto :goto_c
 
-    :cond_b
-    const/4 v11, -0x1
+    :cond_a
+    move/from16 v5, p4
 
-    move/from16 v13, p4
-
-    goto/16 :goto_10
+    goto/16 :goto_f
 
     :pswitch_6
-    move/from16 v24, v7
+    move/from16 v9, p3
 
-    move-wide v7, v11
+    move/from16 p3, v7
 
-    move/from16 v25, v20
+    move-wide v7, v12
 
     const/4 v0, 0x2
 
-    const/4 v11, -0x1
+    move/from16 v5, p4
+
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    move/from16 v13, p4
-
-    if-ne v2, v0, :cond_e
+    if-ne v2, v0, :cond_d
 
     const/high16 v0, 0x20000000
 
-    and-int v0, v21, v0
+    and-int v0, v18, v0
 
-    if-nez v0, :cond_c
+    if-nez v0, :cond_b
 
-    invoke-static {v12, v4, v9}, Lcom/google/android/gms/internal/clearcut/w;->c([BILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v12, v4, v11}, Lcom/google/android/gms/internal/clearcut/w;->c([BILcom/google/android/gms/internal/clearcut/x;)I
 
     move-result v0
 
+    goto :goto_b
+
+    :cond_b
+    invoke-static {v12, v4, v11}, Lcom/google/android/gms/internal/clearcut/w;->d([BILcom/google/android/gms/internal/clearcut/x;)I
+
+    move-result v0
+
+    :goto_b
+    iget-object v1, v11, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
+
+    :goto_c
+    invoke-virtual {v10, v14, v7, v8, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    goto :goto_e
+
+    :pswitch_7
+    move/from16 v9, p3
+
+    move/from16 p3, v7
+
+    move-wide v7, v12
+
+    move/from16 v5, p4
+
+    move-object/from16 v11, p6
+
+    move-object/from16 v12, p2
+
+    if-nez v2, :cond_d
+
+    invoke-static {v12, v4, v11}, Lcom/google/android/gms/internal/clearcut/w;->b([BILcom/google/android/gms/internal/clearcut/x;)I
+
+    move-result v0
+
+    iget-wide v1, v11, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v17, v1, v3
+
+    if-eqz v17, :cond_c
+
+    const/4 v1, 0x1
+
     goto :goto_d
 
     :cond_c
-    invoke-static {v12, v4, v9}, Lcom/google/android/gms/internal/clearcut/w;->d([BILcom/google/android/gms/internal/clearcut/x;)I
-
-    move-result v0
-
-    :goto_d
-    iget-object v1, v9, Lcom/google/android/gms/internal/clearcut/x;->aiK:Ljava/lang/Object;
-
-    :goto_e
-    invoke-virtual {v10, v14, v7, v8, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
-
-    goto/16 :goto_11
-
-    :pswitch_7
-    move/from16 v24, v7
-
-    move-wide v7, v11
-
-    move/from16 v25, v20
-
-    const/4 v11, -0x1
-
-    move-object/from16 v12, p2
-
-    move/from16 v13, p4
-
-    if-nez v2, :cond_e
-
-    invoke-static {v12, v4, v9}, Lcom/google/android/gms/internal/clearcut/w;->b([BILcom/google/android/gms/internal/clearcut/x;)I
-
-    move-result v0
-
-    iget-wide v1, v9, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-eqz v5, :cond_d
-
-    const/4 v1, 0x1
-
-    goto :goto_f
-
-    :cond_d
     const/4 v1, 0x0
 
-    :goto_f
+    :goto_d
     invoke-static {v14, v7, v8, v1}, Lcom/google/android/gms/internal/clearcut/eb;->a(Ljava/lang/Object;JZ)V
 
-    goto/16 :goto_11
+    goto :goto_e
 
     :pswitch_8
-    move/from16 v24, v7
+    move/from16 v9, p3
 
-    move-wide v7, v11
+    move/from16 p3, v7
 
-    move/from16 v25, v20
+    move-wide v7, v12
 
-    const/4 v11, -0x1
+    move/from16 v5, p4
+
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    move/from16 v13, p4
-
-    if-ne v2, v0, :cond_e
+    if-ne v2, v0, :cond_d
 
     invoke-static {v12, v4}, Lcom/google/android/gms/internal/clearcut/w;->d([BI)I
 
@@ -2536,28 +2523,35 @@
 
     add-int/lit8 v0, v4, 0x4
 
+    :goto_e
+    or-int v6, v6, v20
+
+    move/from16 v7, p3
+
+    move v13, v5
+
     goto/16 :goto_11
 
     :pswitch_9
-    move/from16 v24, v7
+    move/from16 v9, p3
 
-    move-wide v7, v11
+    move/from16 p3, v7
 
-    move/from16 v25, v20
+    move-wide v7, v12
 
     const/4 v0, 0x1
 
-    const/4 v11, -0x1
+    move/from16 v5, p4
+
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    move/from16 v13, p4
-
-    if-ne v2, v0, :cond_e
+    if-ne v2, v0, :cond_d
 
     invoke-static {v12, v4}, Lcom/google/android/gms/internal/clearcut/w;->e([BI)J
 
-    move-result-wide v19
+    move-result-wide v17
 
     move-object v0, v10
 
@@ -2567,69 +2561,65 @@
 
     move v7, v4
 
-    move-wide/from16 v4, v19
+    move-wide/from16 v4, v17
 
     invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putLong(Ljava/lang/Object;JJ)V
 
     add-int/lit8 v0, v7, 0x8
 
-    goto/16 :goto_11
+    goto/16 :goto_10
 
-    :cond_e
-    :goto_10
+    :cond_d
+    :goto_f
     move v5, v4
 
-    goto/16 :goto_14
+    goto/16 :goto_13
 
     :pswitch_a
+    move/from16 v9, p3
+
     move v5, v4
 
-    move/from16 v24, v7
+    move/from16 p3, v7
 
-    move-wide v7, v11
+    move-wide v7, v12
 
-    move/from16 v25, v20
-
-    const/4 v11, -0x1
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    move/from16 v13, p4
+    if-nez v2, :cond_e
 
-    if-nez v2, :cond_f
-
-    invoke-static {v12, v5, v9}, Lcom/google/android/gms/internal/clearcut/w;->a([BILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v12, v5, v11}, Lcom/google/android/gms/internal/clearcut/w;->a([BILcom/google/android/gms/internal/clearcut/x;)I
 
     move-result v0
 
-    iget v1, v9, Lcom/google/android/gms/internal/clearcut/x;->aiI:I
+    iget v1, v11, Lcom/google/android/gms/internal/clearcut/x;->aiI:I
 
     invoke-virtual {v10, v14, v7, v8, v1}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    goto :goto_11
+    goto :goto_10
 
     :pswitch_b
+    move/from16 v9, p3
+
     move v5, v4
 
-    move/from16 v24, v7
+    move/from16 p3, v7
 
-    move-wide v7, v11
+    move-wide v7, v12
 
-    move/from16 v25, v20
-
-    const/4 v11, -0x1
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    move/from16 v13, p4
+    if-nez v2, :cond_e
 
-    if-nez v2, :cond_f
-
-    invoke-static {v12, v5, v9}, Lcom/google/android/gms/internal/clearcut/w;->b([BILcom/google/android/gms/internal/clearcut/x;)I
+    invoke-static {v12, v5, v11}, Lcom/google/android/gms/internal/clearcut/w;->b([BILcom/google/android/gms/internal/clearcut/x;)I
 
     move-result v17
 
-    iget-wide v4, v9, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
+    iget-wide v4, v11, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
 
     move-object v0, v10
 
@@ -2639,28 +2629,34 @@
 
     invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putLong(Ljava/lang/Object;JJ)V
 
-    or-int v6, v6, v18
+    or-int v6, v6, v20
+
+    move/from16 v7, p3
+
+    move/from16 v13, p4
+
+    move v1, v9
+
+    move-object v9, v11
 
     move/from16 v0, v17
 
     goto :goto_12
 
     :pswitch_c
+    move/from16 v9, p3
+
     move v5, v4
 
-    move/from16 v24, v7
+    move/from16 p3, v7
 
-    move-wide v7, v11
+    move-wide v7, v12
 
-    move/from16 v25, v20
-
-    const/4 v11, -0x1
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    move/from16 v13, p4
-
-    if-ne v2, v0, :cond_f
+    if-ne v2, v0, :cond_e
 
     invoke-static {v12, v5}, Lcom/google/android/gms/internal/clearcut/w;->g([BI)F
 
@@ -2670,26 +2666,24 @@
 
     add-int/lit8 v0, v5, 0x4
 
-    goto :goto_11
+    goto :goto_10
 
     :pswitch_d
+    move/from16 v9, p3
+
     move v5, v4
 
-    move/from16 v24, v7
+    move/from16 p3, v7
 
-    move-wide v7, v11
-
-    move/from16 v25, v20
+    move-wide v7, v12
 
     const/4 v0, 0x1
 
-    const/4 v11, -0x1
+    move-object/from16 v11, p6
 
     move-object/from16 v12, p2
 
-    move/from16 v13, p4
-
-    if-ne v2, v0, :cond_f
+    if-ne v2, v0, :cond_e
 
     invoke-static {v12, v5}, Lcom/google/android/gms/internal/clearcut/w;->f([BI)D
 
@@ -2699,53 +2693,57 @@
 
     add-int/lit8 v0, v5, 0x8
 
+    :goto_10
+    or-int v6, v6, v20
+
+    move/from16 v7, p3
+
+    move/from16 v13, p4
+
     :goto_11
-    or-int v6, v6, v18
+    move v1, v9
+
+    move-object v9, v11
 
     :goto_12
-    move/from16 v7, v24
-
-    move/from16 v1, v25
-
-    :goto_13
     const/4 v8, -0x1
 
     move/from16 v11, p5
 
     goto/16 :goto_0
 
-    :cond_f
-    :goto_14
+    :cond_e
+    :goto_13
+    move/from16 v19, p3
+
     move v2, v5
 
-    move/from16 v18, v6
+    move/from16 v20, v6
 
-    move-object/from16 v29, v10
+    move v7, v9
 
-    move/from16 v7, v25
+    move-object/from16 v25, v10
 
-    goto/16 :goto_19
+    goto/16 :goto_17
+
+    :cond_f
+    move/from16 v9, p3
 
-    :cond_10
     move v5, v4
 
-    move/from16 v24, v7
+    move/from16 v19, v7
 
-    move v0, v8
-
-    move-wide v7, v11
-
-    move/from16 v4, v20
+    move-wide v7, v12
 
     move-object/from16 v12, p2
 
-    const/16 v11, 0x1b
+    const/16 v0, 0x1b
 
-    if-ne v0, v11, :cond_14
+    if-ne v11, v0, :cond_13
 
-    const/4 v11, 0x2
+    const/4 v0, 0x2
 
-    if-ne v2, v11, :cond_13
+    if-ne v2, v0, :cond_12
 
     invoke-virtual {v10, v14, v7, v8}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -2753,52 +2751,50 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/bm;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->mG()Z
-
-    move-result v2
-
-    if-nez v2, :cond_12
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->size()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->mF()Z
 
     move-result v2
 
     if-nez v2, :cond_11
 
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->size()I
+
+    move-result v2
+
+    if-nez v2, :cond_10
+
     const/16 v2, 0xa
 
-    goto :goto_15
+    goto :goto_14
 
-    :cond_11
+    :cond_10
     shl-int/lit8 v2, v2, 0x1
 
-    :goto_15
+    :goto_14
     invoke-interface {v0, v2}, Lcom/google/android/gms/internal/clearcut/bm;->bf(I)Lcom/google/android/gms/internal/clearcut/bm;
 
     move-result-object v0
 
     invoke-virtual {v10, v14, v7, v8, v0}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :cond_12
+    :cond_11
     move-object v7, v0
 
     invoke-direct {v15, v1}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
     move-result-object v0
 
-    move v1, v4
+    move v1, v9
 
     move-object/from16 v2, p2
 
     move v3, v5
 
-    move v11, v4
-
     move/from16 v4, p4
 
     move-object v5, v7
 
-    move/from16 v18, v6
+    move/from16 v20, v6
 
     move-object/from16 v6, p6
 
@@ -2806,43 +2802,43 @@
 
     move-result v0
 
-    move v1, v11
+    move/from16 v13, p4
 
-    move/from16 v6, v18
+    move/from16 v7, v19
 
-    move/from16 v7, v24
+    move/from16 v6, v20
 
-    goto :goto_13
+    const/4 v8, -0x1
 
-    :cond_13
-    move/from16 v18, v6
+    move/from16 v11, p5
 
-    move/from16 v30, v4
+    move-object/from16 v9, p6
+
+    goto/16 :goto_0
+
+    :cond_12
+    move/from16 v20, v6
 
     move v15, v5
 
-    goto/16 :goto_17
+    move/from16 p3, v9
 
-    :cond_14
-    move v11, v4
+    goto/16 :goto_16
 
-    move/from16 v18, v6
+    :cond_13
+    move/from16 v20, v6
 
-    const/16 v4, 0x31
+    const/16 v0, 0x31
 
-    if-gt v0, v4, :cond_16
+    if-gt v11, v0, :cond_15
 
-    move-object/from16 v26, v10
+    move/from16 v6, v18
 
-    move/from16 v4, v21
-
-    int-to-long v9, v4
-
-    move/from16 v19, v0
+    int-to-long v13, v6
 
     move-object/from16 v0, p0
 
-    move/from16 v20, v1
+    move/from16 v18, v1
 
     move-object/from16 v1, p1
 
@@ -2858,27 +2854,27 @@
 
     move v15, v5
 
-    move v5, v11
+    move v5, v9
 
-    move/from16 v27, v6
+    move/from16 v22, v6
 
     move/from16 v6, v21
 
-    move-wide/from16 v22, v7
+    move-wide/from16 v23, v7
 
-    move/from16 v7, v27
+    move/from16 v7, v22
 
-    move/from16 v28, v19
+    move/from16 v8, v18
 
-    move/from16 v8, v20
+    move/from16 p3, v9
 
-    move-object/from16 v29, v26
+    move-object/from16 v25, v10
 
-    move/from16 v30, v11
+    move-wide v9, v13
 
-    move/from16 v11, v28
+    move/from16 v14, p5
 
-    move-wide/from16 v12, v22
+    move-wide/from16 v12, v23
 
     move-object/from16 v14, p6
 
@@ -2886,62 +2882,55 @@
 
     move-result v0
 
-    if-ne v0, v15, :cond_15
+    if-ne v0, v15, :cond_14
 
-    :goto_16
-    move v2, v0
+    goto/16 :goto_15
 
-    goto/16 :goto_18
-
-    :cond_15
+    :cond_14
     move-object/from16 v12, p2
 
+    move/from16 v1, p3
+
     move-object/from16 v9, p6
 
-    move/from16 v6, v18
+    move/from16 v7, v19
 
-    move/from16 v7, v24
+    move/from16 v6, v20
 
-    move-object/from16 v10, v29
-
-    move/from16 v1, v30
+    move-object/from16 v10, v25
 
     const/4 v8, -0x1
 
     move/from16 v11, p5
 
-    goto/16 :goto_1b
+    goto/16 :goto_19
 
-    :cond_16
-    move/from16 v28, v0
-
-    move/from16 v20, v1
-
-    move/from16 v27, v2
-
-    move v15, v5
-
-    move-wide/from16 v22, v7
-
-    move-object/from16 v29, v10
-
-    move/from16 v30, v11
-
-    move/from16 v4, v21
+    :cond_15
+    move/from16 v22, v2
 
     move/from16 v21, v3
 
+    move v15, v5
+
+    move-wide/from16 v23, v7
+
+    move/from16 p3, v9
+
+    move-object/from16 v25, v10
+
+    move/from16 v6, v18
+
+    move/from16 v18, v1
+
     const/16 v0, 0x32
 
-    move/from16 v9, v28
+    if-ne v11, v0, :cond_16
 
-    if-ne v9, v0, :cond_17
-
-    move/from16 v7, v27
+    move/from16 v7, v22
 
     const/4 v0, 0x2
 
-    if-ne v7, v0, :cond_19
+    if-ne v7, v0, :cond_18
 
     move-object/from16 v0, p0
 
@@ -2953,7 +2942,7 @@
 
     move/from16 v4, p4
 
-    move-wide/from16 v5, v22
+    move-wide/from16 v5, v23
 
     move-object/from16 v7, p6
 
@@ -2961,14 +2950,12 @@
 
     move-result v0
 
-    if-ne v0, v15, :cond_15
+    if-ne v0, v15, :cond_14
 
-    goto :goto_16
+    goto :goto_15
 
-    :cond_17
-    move v8, v4
-
-    move/from16 v7, v27
+    :cond_16
+    move/from16 v7, v22
 
     move-object/from16 v0, p0
 
@@ -2980,13 +2967,17 @@
 
     move/from16 v4, p4
 
-    move/from16 v5, v30
+    move/from16 v5, p3
+
+    move v8, v6
 
     move/from16 v6, v21
 
-    move-wide/from16 v10, v22
+    move v9, v11
 
-    move/from16 v12, v20
+    move-wide/from16 v10, v23
+
+    move/from16 v12, v18
 
     move-object/from16 v13, p6
 
@@ -2994,50 +2985,54 @@
 
     move-result v0
 
-    if-ne v0, v15, :cond_15
+    if-ne v0, v15, :cond_14
 
-    goto :goto_16
+    :goto_15
+    move/from16 v7, p3
 
-    :cond_18
+    move v2, v0
+
+    goto :goto_17
+
+    :cond_17
     move v15, v4
 
-    move/from16 v30, v5
+    move/from16 p3, v5
 
-    move/from16 v18, v6
+    move/from16 v20, v6
 
-    move/from16 v24, v7
+    move/from16 v19, v7
 
-    :goto_17
-    move-object/from16 v29, v10
+    :goto_16
+    move-object/from16 v25, v10
+
+    :cond_18
+    move/from16 v7, p3
 
-    :cond_19
     move v2, v15
 
-    :goto_18
-    move/from16 v7, v30
-
-    :goto_19
+    :goto_17
     move/from16 v6, p5
 
-    if-ne v7, v6, :cond_1b
+    if-ne v7, v6, :cond_1a
 
-    if-nez v6, :cond_1a
+    if-nez v6, :cond_19
+
+    goto :goto_18
+
+    :cond_19
+    move v8, v7
+
+    move/from16 v0, v19
+
+    move/from16 v1, v20
+
+    move v7, v2
 
     goto :goto_1a
 
     :cond_1a
-    move v8, v7
-
-    move/from16 v1, v18
-
-    move/from16 v0, v24
-
-    move v7, v2
-
-    goto :goto_1c
-
-    :cond_1b
-    :goto_1a
+    :goto_18
     move v0, v7
 
     move-object/from16 v1, p2
@@ -3060,15 +3055,15 @@
 
     move v1, v7
 
-    move/from16 v6, v18
+    move/from16 v7, v19
 
-    move/from16 v7, v24
+    move/from16 v6, v20
 
-    move-object/from16 v10, v29
+    move-object/from16 v10, v25
 
     const/4 v8, -0x1
 
-    :goto_1b
+    :goto_19
     move/from16 v13, p4
 
     move-object/from16 v14, p1
@@ -3077,12 +3072,12 @@
 
     goto/16 :goto_0
 
-    :cond_1c
-    move/from16 v18, v6
+    :cond_1b
+    move/from16 v20, v6
 
-    move/from16 v24, v7
+    move/from16 v19, v7
 
-    move-object/from16 v29, v10
+    move-object/from16 v25, v10
 
     move v6, v11
 
@@ -3090,47 +3085,45 @@
 
     move v8, v1
 
-    move/from16 v1, v18
+    move/from16 v0, v19
 
-    move/from16 v0, v24
+    move/from16 v1, v20
 
-    :goto_1c
+    :goto_1a
     const/4 v2, -0x1
 
-    if-eq v0, v2, :cond_1d
+    if-eq v0, v2, :cond_1c
 
     int-to-long v2, v0
 
-    move-object/from16 v0, v29
+    move-object/from16 v0, v25
 
     move-object/from16 v9, p1
 
     invoke-virtual {v0, v9, v2, v3, v1}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    goto :goto_1d
+    goto :goto_1b
 
-    :cond_1d
+    :cond_1c
     move-object/from16 v9, p1
 
-    :goto_1d
+    :goto_1b
     move-object/from16 v10, p0
 
-    iget-object v0, v10, Lcom/google/android/gms/internal/clearcut/cq;->ame:[I
+    iget-object v11, v10, Lcom/google/android/gms/internal/clearcut/cq;->ame:[I
 
-    if-eqz v0, :cond_21
+    if-eqz v11, :cond_20
 
     const/4 v0, 0x0
 
-    iget-object v11, v10, Lcom/google/android/gms/internal/clearcut/cq;->ame:[I
-
     array-length v12, v11
 
     move-object v4, v0
 
     const/4 v13, 0x0
 
-    :goto_1e
-    if-ge v13, v12, :cond_20
+    :goto_1c
+    if-ge v13, v12, :cond_1f
 
     aget v0, v11, v13
 
@@ -3152,20 +3145,20 @@
 
     move-result-object v2
 
-    if-nez v2, :cond_1e
+    if-nez v2, :cond_1d
 
-    goto :goto_1f
+    goto :goto_1d
 
-    :cond_1e
+    :cond_1d
     invoke-direct {v10, v0}, Lcom/google/android/gms/internal/clearcut/cq;->bH(I)Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v3
 
-    if-nez v3, :cond_1f
+    if-nez v3, :cond_1e
 
-    goto :goto_1f
+    goto :goto_1d
 
-    :cond_1f
+    :cond_1e
     iget-object v0, v10, Lcom/google/android/gms/internal/clearcut/cq;->amk:Lcom/google/android/gms/internal/clearcut/ch;
 
     invoke-interface {v0, v2}, Lcom/google/android/gms/internal/clearcut/ch;->ag(Ljava/lang/Object;)Ljava/util/Map;
@@ -3178,53 +3171,55 @@
 
     move-result-object v4
 
-    :goto_1f
+    :goto_1d
     check-cast v4, Lcom/google/android/gms/internal/clearcut/dw;
 
     add-int/lit8 v13, v13, 0x1
 
-    goto :goto_1e
+    goto :goto_1c
 
-    :cond_20
-    if-eqz v4, :cond_21
+    :cond_1f
+    if-eqz v4, :cond_20
 
     iget-object v0, v10, Lcom/google/android/gms/internal/clearcut/cq;->ami:Lcom/google/android/gms/internal/clearcut/dv;
 
     invoke-virtual {v0, v9, v4}, Lcom/google/android/gms/internal/clearcut/dv;->j(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_21
-    if-nez v6, :cond_23
+    :cond_20
+    if-nez v6, :cond_22
 
     move/from16 v0, p4
 
-    if-ne v7, v0, :cond_22
+    if-ne v7, v0, :cond_21
 
-    goto :goto_20
+    goto :goto_1e
+
+    :cond_21
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bn;
+
+    move-result-object v0
+
+    throw v0
 
     :cond_22
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_23
     move/from16 v0, p4
 
-    if-gt v7, v0, :cond_24
+    if-gt v7, v0, :cond_23
 
-    if-ne v8, v6, :cond_24
+    if-ne v8, v6, :cond_23
 
-    :goto_20
+    :goto_1e
     return v7
 
-    :cond_24
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
+    :cond_23
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v0
 
     throw v0
 
+    return-void
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_d
@@ -3284,7 +3279,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/cq;->amk:Lcom/google/android/gms/internal/clearcut/ch;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/ch;->nK()Ljava/lang/Object;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/ch;->nJ()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -3299,7 +3294,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/clearcut/cq;->amk:Lcom/google/android/gms/internal/clearcut/ch;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/ch;->nL()Lcom/google/android/gms/internal/clearcut/cf;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/ch;->nK()Lcom/google/android/gms/internal/clearcut/cf;
 
     move-result-object p1
 
@@ -3423,20 +3418,20 @@
     return p6
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p1
 
     throw p1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p1
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -3516,7 +3511,7 @@
     goto :goto_1
 
     :pswitch_3
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object p3
 
@@ -3675,7 +3670,7 @@
 .end method
 
 .method static a(Lcom/google/android/gms/internal/clearcut/ck;Lcom/google/android/gms/internal/clearcut/cu;Lcom/google/android/gms/internal/clearcut/bw;Lcom/google/android/gms/internal/clearcut/dv;Lcom/google/android/gms/internal/clearcut/as;Lcom/google/android/gms/internal/clearcut/ch;)Lcom/google/android/gms/internal/clearcut/cq;
-    .locals 23
+    .locals 21
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -3703,7 +3698,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/db;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/db;->nP()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/db;->nO()I
 
     move-result v1
 
@@ -3850,16 +3845,16 @@
     goto :goto_5
 
     :cond_4
-    move/from16 v22, v9
+    move/from16 v18, v9
 
-    move/from16 v21, v12
+    move/from16 v17, v12
 
     const/4 v3, 0x1
 
-    goto/16 :goto_12
+    goto/16 :goto_10
 
     :cond_5
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dc;->oa()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dc;->nZ()Z
 
     move-result v2
 
@@ -3939,6 +3934,8 @@
 
     long-to-int v3, v3
 
+    const/4 v4, 0x0
+
     goto :goto_9
 
     :cond_8
@@ -3950,7 +3947,7 @@
 
     long-to-int v2, v2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dc;->ob()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dc;->oa()Z
 
     move-result v3
 
@@ -4004,22 +4001,21 @@
 
     rem-int/lit8 v4, v4, 0x20
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_a
     const/4 v3, 0x0
 
-    :goto_9
     const/4 v4, 0x0
 
-    :goto_a
+    :goto_9
     iget v13, v1, Lcom/google/android/gms/internal/clearcut/dc;->amI:I
 
     aput v13, v6, v5
 
     add-int/lit8 v13, v5, 0x1
 
-    move/from16 v21, v12
+    move/from16 v17, v12
 
     iget v12, v1, Lcom/google/android/gms/internal/clearcut/dc;->amJ:I
 
@@ -4029,26 +4025,26 @@
 
     const/4 v12, 0x1
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_b
     const/4 v12, 0x0
 
-    :goto_b
+    :goto_a
     if-eqz v12, :cond_c
 
     const/high16 v12, 0x20000000
 
-    move/from16 v22, v9
+    move/from16 v18, v9
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_c
-    move/from16 v22, v9
+    move/from16 v18, v9
 
     const/4 v12, 0x0
 
-    :goto_c
+    :goto_b
     iget v9, v1, Lcom/google/android/gms/internal/clearcut/dc;->amJ:I
 
     and-int/lit16 v9, v9, 0x100
@@ -4057,22 +4053,22 @@
 
     const/4 v9, 0x1
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_d
     const/4 v9, 0x0
 
-    :goto_d
+    :goto_c
     if-eqz v9, :cond_e
 
     const/high16 v9, 0x10000000
 
-    goto :goto_e
+    goto :goto_d
 
     :cond_e
     const/4 v9, 0x0
 
-    :goto_e
+    :goto_d
     or-int/2addr v9, v12
 
     iget v12, v1, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
@@ -4109,7 +4105,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/internal/clearcut/dc;->amO:Ljava/lang/Object;
 
-    if-eqz v3, :cond_10
+    if-eqz v3, :cond_f
 
     add-int/lit8 v2, v2, 0x1
 
@@ -4117,16 +4113,14 @@
 
     aput-object v3, v7, v2
 
-    :cond_f
-    :goto_f
     const/4 v3, 0x1
 
-    goto :goto_10
+    goto :goto_e
 
-    :cond_10
+    :cond_f
     iget-object v3, v1, Lcom/google/android/gms/internal/clearcut/dc;->amP:Ljava/lang/Object;
 
-    if-eqz v3, :cond_f
+    if-eqz v3, :cond_10
 
     add-int/lit8 v2, v2, 0x1
 
@@ -4134,7 +4128,14 @@
 
     aput-object v3, v7, v2
 
-    goto :goto_f
+    const/4 v3, 0x1
+
+    goto :goto_e
+
+    :cond_10
+    const/4 v3, 0x1
+
+    goto :goto_e
 
     :cond_11
     iget-object v2, v1, Lcom/google/android/gms/internal/clearcut/dc;->amO:Ljava/lang/Object;
@@ -4153,7 +4154,7 @@
 
     aput-object v4, v7, v2
 
-    goto :goto_10
+    goto :goto_e
 
     :cond_12
     const/4 v3, 0x1
@@ -4173,7 +4174,7 @@
     aput-object v4, v7, v2
 
     :cond_13
-    :goto_10
+    :goto_e
     iget v2, v1, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
 
     sget-object v4, Lcom/google/android/gms/internal/clearcut/ba;->akx:Lcom/google/android/gms/internal/clearcut/ba;
@@ -4190,7 +4191,7 @@
 
     move v10, v2
 
-    goto :goto_11
+    goto :goto_f
 
     :cond_14
     const/16 v4, 0x12
@@ -4214,7 +4215,7 @@
     move v11, v2
 
     :cond_15
-    :goto_11
+    :goto_f
     invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dc;->next()Z
 
     move-result v2
@@ -4223,21 +4224,21 @@
 
     iget v2, v1, Lcom/google/android/gms/internal/clearcut/dc;->amI:I
 
-    :goto_12
+    :goto_10
     add-int/lit8 v5, v5, 0x4
 
-    move/from16 v12, v21
+    move/from16 v12, v17
 
-    move/from16 v9, v22
+    move/from16 v9, v18
 
     const/4 v4, 0x1
 
     goto/16 :goto_4
 
     :cond_16
-    move/from16 v22, v9
+    move/from16 v18, v9
 
-    move/from16 v21, v12
+    move/from16 v17, v12
 
     :cond_17
     new-instance v1, Lcom/google/android/gms/internal/clearcut/cq;
@@ -4254,9 +4255,9 @@
 
     move-object v5, v1
 
-    move/from16 v9, v22
+    move/from16 v9, v18
 
-    move/from16 v12, v21
+    move/from16 v12, v17
 
     move-object/from16 v16, p1
 
@@ -4278,6 +4279,8 @@
     invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
 
     throw v0
+
+    return-void
 .end method
 
 .method private final a(ILjava/util/Map;Lcom/google/android/gms/internal/clearcut/bj;Ljava/lang/Object;Lcom/google/android/gms/internal/clearcut/dv;)Ljava/lang/Object;
@@ -4304,7 +4307,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->amk:Lcom/google/android/gms/internal/clearcut/ch;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/ch;->nL()Lcom/google/android/gms/internal/clearcut/cf;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/ch;->nK()Lcom/google/android/gms/internal/clearcut/cf;
 
     move-result-object v0
 
@@ -4348,7 +4351,7 @@
 
     if-nez p4, :cond_1
 
-    invoke-virtual {p5}, Lcom/google/android/gms/internal/clearcut/dv;->op()Ljava/lang/Object;
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/clearcut/dv;->oo()Ljava/lang/Object;
 
     move-result-object p4
 
@@ -4384,7 +4387,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/ag;->mN()Lcom/google/android/gms/internal/clearcut/ab;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/ag;->mM()Lcom/google/android/gms/internal/clearcut/ab;
 
     move-result-object v1
 
@@ -4490,7 +4493,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->amk:Lcom/google/android/gms/internal/clearcut/ch;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/ch;->nL()Lcom/google/android/gms/internal/clearcut/cf;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/ch;->nK()Lcom/google/android/gms/internal/clearcut/cf;
 
     move-result-object v0
 
@@ -4660,13 +4663,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/bf;->zzjp:Lcom/google/android/gms/internal/clearcut/dw;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->op()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->or()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v0
 
@@ -4700,7 +4703,7 @@
 .end method
 
 .method private final b(Ljava/lang/Object;Lcom/google/android/gms/internal/clearcut/eo;)V
-    .locals 19
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;",
@@ -4780,60 +4783,64 @@
 
     iget-object v13, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    aget v13, v13, v5
+    aget v14, v13, v5
 
-    const/high16 v14, 0xff00000
+    const/high16 v15, 0xff00000
 
-    and-int/2addr v14, v12
+    and-int/2addr v15, v12
 
-    ushr-int/lit8 v14, v14, 0x14
+    ushr-int/lit8 v15, v15, 0x14
 
-    iget-boolean v15, v0, Lcom/google/android/gms/internal/clearcut/cq;->amb:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->amb:Z
 
     const v16, 0xfffff
 
-    if-nez v15, :cond_2
+    if-nez v4, :cond_2
 
-    const/16 v15, 0x11
+    const/16 v4, 0x11
 
-    if-gt v14, v15, :cond_2
+    if-gt v15, v4, :cond_2
 
-    iget-object v15, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    add-int/lit8 v4, v5, 0x2
 
-    add-int/lit8 v17, v5, 0x2
+    aget v4, v13, v4
 
-    aget v15, v15, v17
+    and-int v13, v4, v16
 
-    and-int v9, v15, v16
+    if-eq v13, v6, :cond_1
 
-    if-eq v9, v6, :cond_1
+    move-object/from16 v17, v10
 
-    move/from16 v18, v5
+    int-to-long v9, v13
 
-    int-to-long v4, v9
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v9, v10}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v11
 
-    move v6, v9
-
     goto :goto_2
 
     :cond_1
-    move/from16 v18, v5
+    move-object/from16 v17, v10
+
+    move v13, v6
 
     :goto_2
-    ushr-int/lit8 v4, v15, 0x14
+    ushr-int/lit8 v4, v4, 0x14
 
-    const/4 v5, 0x1
+    const/4 v6, 0x1
 
-    shl-int v9, v5, v4
+    shl-int v9, v6, v4
+
+    move v6, v13
+
+    move-object/from16 v10, v17
 
     goto :goto_3
 
     :cond_2
-    move/from16 v18, v5
+    move-object/from16 v17, v10
+
+    move-object/from16 v10, v17
 
     const/4 v9, 0x0
 
@@ -4846,7 +4853,7 @@
 
     move-result v4
 
-    if-gt v4, v13, :cond_4
+    if-gt v4, v14, :cond_4
 
     iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->amj:Lcom/google/android/gms/internal/clearcut/as;
 
@@ -4876,1244 +4883,1108 @@
     :cond_4
     and-int v4, v12, v16
 
-    int-to-long v4, v4
+    int-to-long v12, v4
 
-    packed-switch v14, :pswitch_data_0
-
-    move/from16 v12, v18
+    packed-switch v15, :pswitch_data_0
 
     :cond_5
     :goto_4
-    const/4 v14, 0x0
+    const/4 v15, 0x0
 
     goto/16 :goto_b
 
     :pswitch_0
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/clearcut/eo;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
 
     goto :goto_4
 
     :pswitch_1
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->d(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->d(IJ)V
 
     goto :goto_4
 
     :pswitch_2
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->B(II)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->B(II)V
 
     goto :goto_4
 
     :pswitch_3
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->j(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->j(IJ)V
 
     goto :goto_4
 
     :pswitch_4
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->H(II)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->H(II)V
 
     goto :goto_4
 
     :pswitch_5
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->I(II)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->I(II)V
 
     goto :goto_4
 
     :pswitch_6
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->A(II)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->A(II)V
 
     goto :goto_4
 
     :pswitch_7
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
     check-cast v4, Lcom/google/android/gms/internal/clearcut/ab;
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILcom/google/android/gms/internal/clearcut/ab;)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILcom/google/android/gms/internal/clearcut/ab;)V
 
-    goto/16 :goto_4
+    goto :goto_4
 
     :pswitch_8
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
 
     goto/16 :goto_4
 
     :pswitch_9
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-static {v13, v4, v2}, Lcom/google/android/gms/internal/clearcut/cq;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/eo;)V
+    invoke-static {v14, v4, v2}, Lcom/google/android/gms/internal/clearcut/cq;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/eo;)V
 
     goto/16 :goto_4
 
     :pswitch_a
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->i(Ljava/lang/Object;J)Z
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->d(IZ)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->i(Ljava/lang/Object;J)Z
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->d(IZ)V
 
     goto/16 :goto_4
 
     :pswitch_b
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->C(II)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->C(II)V
 
     goto/16 :goto_4
 
     :pswitch_c
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->e(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->e(IJ)V
 
     goto/16 :goto_4
 
     :pswitch_d
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->z(II)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->g(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->z(II)V
 
     goto/16 :goto_4
 
     :pswitch_e
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->c(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->c(IJ)V
 
     goto/16 :goto_4
 
     :pswitch_f
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->h(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->i(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->i(IJ)V
 
     goto/16 :goto_4
 
     :pswitch_10
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->f(Ljava/lang/Object;J)F
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->b(IF)V
+    if-eqz v4, :cond_5
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->f(Ljava/lang/Object;J)F
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->b(IF)V
 
     goto/16 :goto_4
 
     :pswitch_11
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/cq;->e(Ljava/lang/Object;J)D
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/cq;->e(Ljava/lang/Object;J)D
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->a(ID)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->a(ID)V
 
     goto/16 :goto_4
 
     :pswitch_12
-    move/from16 v12, v18
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/eo;ILjava/lang/Object;)V
+    invoke-direct {v0, v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/cq;->a(Lcom/google/android/gms/internal/clearcut/eo;ILjava/lang/Object;)V
 
     goto/16 :goto_4
 
     :pswitch_13
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
+    move-result-object v12
 
-    move-result-object v5
-
-    invoke-static {v9, v4, v2, v5}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Lcom/google/android/gms/internal/clearcut/de;)V
+    invoke-static {v4, v9, v2, v12}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Lcom/google/android/gms/internal/clearcut/de;)V
 
     goto/16 :goto_4
 
     :pswitch_14
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    const/4 v13, 0x1
+    const/4 v14, 0x1
 
     goto/16 :goto_5
 
     :pswitch_15
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     goto/16 :goto_6
 
     :pswitch_16
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     goto/16 :goto_7
 
     :pswitch_17
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     goto/16 :goto_8
 
     :pswitch_18
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     goto/16 :goto_9
 
     :pswitch_19
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     goto/16 :goto_a
 
     :pswitch_1a
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->n(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->n(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_1b
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->k(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->k(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_1c
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->f(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->f(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_1d
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->h(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->h(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_1e
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_1f
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_20
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_21
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_22
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    const/4 v13, 0x0
+    const/4 v14, 0x0
 
     :goto_5
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->e(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->e(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_23
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     :goto_6
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v9
 
-    check-cast v4, Ljava/util/List;
+    check-cast v9, Ljava/util/List;
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->j(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->j(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_24
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     :goto_7
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v9
 
-    check-cast v4, Ljava/util/List;
+    check-cast v9, Ljava/util/List;
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->g(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->g(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_25
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     :goto_8
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v9
 
-    check-cast v4, Ljava/util/List;
+    check-cast v9, Ljava/util/List;
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->l(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->l(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_26
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     :goto_9
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v9
 
-    check-cast v4, Ljava/util/List;
+    check-cast v9, Ljava/util/List;
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->m(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->m(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_27
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
-
-    aget v9, v9, v12
+    aget v4, v4, v5
 
     :goto_a
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v9
 
-    check-cast v4, Ljava/util/List;
+    check-cast v9, Ljava/util/List;
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/clearcut/dg;->i(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->i(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_4
 
     :pswitch_28
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;)V
+    invoke-static {v4, v9, v2}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;)V
 
     goto/16 :goto_4
 
     :pswitch_29
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
+    move-result-object v12
 
-    move-result-object v5
-
-    invoke-static {v9, v4, v2, v5}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Lcom/google/android/gms/internal/clearcut/de;)V
+    invoke-static {v4, v9, v2, v12}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Lcom/google/android/gms/internal/clearcut/de;)V
 
     goto/16 :goto_4
 
     :pswitch_2a
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;)V
+    invoke-static {v4, v9, v2}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;)V
 
     goto/16 :goto_4
 
     :pswitch_2b
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->n(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->n(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_2c
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->k(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->k(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_2d
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->f(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->f(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_2e
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->h(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->h(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_2f
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_30
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_31
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->b(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_32
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
-
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/clearcut/dg;->a(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/eo;Z)V
 
     goto/16 :goto_b
 
     :pswitch_33
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/clearcut/eo;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
 
     goto/16 :goto_b
 
     :pswitch_34
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->d(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->d(IJ)V
 
     goto/16 :goto_b
 
     :pswitch_35
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->B(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->B(II)V
 
     goto/16 :goto_b
 
     :pswitch_36
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->j(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->j(IJ)V
 
     goto/16 :goto_b
 
     :pswitch_37
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->H(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->H(II)V
 
     goto/16 :goto_b
 
     :pswitch_38
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->I(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->I(II)V
 
     goto/16 :goto_b
 
     :pswitch_39
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->A(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->A(II)V
 
     goto/16 :goto_b
 
     :pswitch_3a
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
     check-cast v4, Lcom/google/android/gms/internal/clearcut/ab;
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILcom/google/android/gms/internal/clearcut/ab;)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILcom/google/android/gms/internal/clearcut/ab;)V
 
     goto/16 :goto_b
 
     :pswitch_3b
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/clearcut/cq;->bG(I)Lcom/google/android/gms/internal/clearcut/de;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/clearcut/eo;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)V
 
     goto/16 :goto_b
 
     :pswitch_3c
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-static {v13, v4, v2}, Lcom/google/android/gms/internal/clearcut/cq;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/eo;)V
+    invoke-static {v14, v4, v2}, Lcom/google/android/gms/internal/clearcut/cq;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/eo;)V
 
     goto/16 :goto_b
 
     :pswitch_3d
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/eb;->l(Ljava/lang/Object;J)Z
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/eb;->l(Ljava/lang/Object;J)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->d(IZ)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->d(IZ)V
 
     goto :goto_b
 
     :pswitch_3e
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->C(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->C(II)V
 
     goto :goto_b
 
     :pswitch_3f
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->e(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->e(IJ)V
 
     goto :goto_b
 
     :pswitch_40
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->z(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->z(II)V
 
     goto :goto_b
 
     :pswitch_41
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->c(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->c(IJ)V
 
     goto :goto_b
 
     :pswitch_42
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->i(IJ)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->i(IJ)V
 
     goto :goto_b
 
     :pswitch_43
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/eb;->m(Ljava/lang/Object;J)F
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/eb;->m(Ljava/lang/Object;J)F
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/clearcut/eo;->b(IF)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/clearcut/eo;->b(IF)V
 
     goto :goto_b
 
     :pswitch_44
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_6
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/clearcut/eb;->n(Ljava/lang/Object;J)D
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/clearcut/eb;->n(Ljava/lang/Object;J)D
+    move-result-wide v12
 
-    move-result-wide v4
-
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/clearcut/eo;->a(ID)V
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/clearcut/eo;->a(ID)V
 
     :cond_6
     :goto_b
-    add-int/lit8 v5, v12, 0x4
+    add-int/lit8 v5, v5, 0x4
 
     goto/16 :goto_1
 
     :cond_7
+    move-object/from16 v17, v10
+
+    move-object/from16 v4, v17
+
     :goto_c
-    if-eqz v10, :cond_9
+    if-eqz v4, :cond_9
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->amj:Lcom/google/android/gms/internal/clearcut/as;
+    iget-object v5, v0, Lcom/google/android/gms/internal/clearcut/cq;->amj:Lcom/google/android/gms/internal/clearcut/as;
 
-    invoke-virtual {v4, v2, v10}, Lcom/google/android/gms/internal/clearcut/as;->a(Lcom/google/android/gms/internal/clearcut/eo;Ljava/util/Map$Entry;)V
+    invoke-virtual {v5, v2, v4}, Lcom/google/android/gms/internal/clearcut/as;->a(Lcom/google/android/gms/internal/clearcut/eo;Ljava/util/Map$Entry;)V
 
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
@@ -6127,12 +5998,10 @@
 
     check-cast v4, Ljava/util/Map$Entry;
 
-    move-object v10, v4
-
     goto :goto_c
 
     :cond_8
-    const/4 v10, 0x0
+    const/4 v4, 0x0
 
     goto :goto_c
 
@@ -6143,6 +6012,8 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_44
@@ -6299,7 +6170,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v0
 
@@ -6380,11 +6251,9 @@
 
     if-lt p1, v0, :cond_4
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->alX:I
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/cq;->alX:I
 
-    if-ge p1, v0, :cond_1
-
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->alV:I
+    if-ge p1, v2, :cond_1
 
     sub-int v0, p1, v0
 
@@ -6402,28 +6271,24 @@
     return v1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->alW:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/cq;->alW:I
 
-    if-gt p1, v0, :cond_4
+    if-gt p1, v3, :cond_4
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->alX:I
+    sub-int/2addr v2, v0
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/cq;->alV:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    sub-int/2addr v0, v2
+    array-length v0, v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    div-int/lit8 v0, v0, 0x4
 
-    array-length v2, v2
-
-    div-int/lit8 v2, v2, 0x4
-
-    add-int/lit8 v2, v2, -0x1
+    add-int/lit8 v0, v0, -0x1
 
     :goto_0
-    if-gt v0, v2, :cond_4
+    if-gt v2, v0, :cond_4
 
-    add-int v3, v2, v0
+    add-int v3, v0, v2
 
     ushr-int/lit8 v3, v3, 0x1
 
@@ -6440,12 +6305,12 @@
     :cond_2
     if-ge p1, v5, :cond_3
 
-    add-int/lit8 v2, v3, -0x1
+    add-int/lit8 v0, v3, -0x1
 
     goto :goto_0
 
     :cond_3
-    add-int/lit8 v0, v3, 0x1
+    add-int/lit8 v2, v3, 0x1
 
     goto :goto_0
 
@@ -7042,7 +6907,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/eo;->mq()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/eo;->mp()I
 
     move-result v0
 
@@ -7090,7 +6955,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/util/Set;
 
     move-result-object v0
 
@@ -7107,7 +6972,7 @@
     :cond_0
     iget-object v0, v0, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/util/Set;
 
     move-result-object v0
 
@@ -10070,7 +9935,7 @@
 .end method
 
 .method public final a(Ljava/lang/Object;[BIILcom/google/android/gms/internal/clearcut/x;)V
-    .locals 23
+    .locals 22
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;[BII",
@@ -10399,7 +10264,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/clearcut/bm;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->mG()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bm;->mF()Z
 
     move-result v1
 
@@ -10471,17 +10336,17 @@
 
     move/from16 v4, p4
 
-    move/from16 v21, v5
+    move/from16 p3, v5
 
     move/from16 v5, v16
 
-    move-object/from16 v22, v9
+    move-object/from16 v21, v9
 
     move v15, v10
 
     move-wide/from16 v9, v17
 
-    move/from16 v11, v21
+    move/from16 v11, p3
 
     move-wide/from16 v12, v19
 
@@ -10493,23 +10358,20 @@
 
     if-ne v0, v15, :cond_c
 
-    :goto_b
-    move v2, v0
-
-    goto :goto_d
+    goto :goto_b
 
     :cond_8
     move-wide/from16 v19, v2
 
-    move/from16 v21, v4
+    move/from16 p3, v4
 
-    move-object/from16 v22, v9
+    move-object/from16 v21, v9
 
     move v15, v10
 
     const/16 v0, 0x32
 
-    move/from16 v9, v21
+    move/from16 v9, p3
 
     if-ne v9, v0, :cond_9
 
@@ -10566,11 +10428,14 @@
 
     if-ne v0, v15, :cond_c
 
-    goto :goto_b
+    :goto_b
+    move v2, v0
+
+    goto :goto_d
 
     :cond_a
     :goto_c
-    move-object/from16 v22, v9
+    move-object/from16 v21, v9
 
     move v15, v10
 
@@ -10599,7 +10464,7 @@
 
     move-object/from16 v11, p5
 
-    move-object/from16 v9, v22
+    move-object/from16 v9, v21
 
     move/from16 v13, p4
 
@@ -10615,7 +10480,7 @@
     return-void
 
     :cond_e
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object v0
 
@@ -10680,8 +10545,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->ame:[I
-
     array-length v2, v0
 
     const/4 v3, 0x0
@@ -10725,8 +10588,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/cq;->amf:[I
-
     array-length v2, v0
 
     :goto_1
@@ -11863,25 +11724,23 @@
 
     iget-object v11, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
-    aget v11, v11, v6
+    aget v12, v11, v6
 
-    and-int v12, v10, v3
+    and-int v13, v10, v3
 
-    ushr-int/lit8 v12, v12, 0x14
+    ushr-int/lit8 v13, v13, 0x14
 
-    const/16 v13, 0x11
+    const/16 v14, 0x11
 
-    if-gt v12, v13, :cond_7
-
-    iget-object v13, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    if-gt v13, v14, :cond_7
 
     add-int/lit8 v14, v6, 0x2
 
-    aget v13, v13, v14
+    aget v11, v11, v14
 
-    and-int v14, v13, v4
+    and-int v14, v11, v4
 
-    ushr-int/lit8 v15, v13, 0x14
+    ushr-int/lit8 v15, v11, 0x14
 
     const/16 v16, 0x1
 
@@ -11906,34 +11765,34 @@
     goto :goto_1b
 
     :cond_7
-    iget-boolean v13, v0, Lcom/google/android/gms/internal/clearcut/cq;->amc:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/clearcut/cq;->amc:Z
 
-    if-eqz v13, :cond_8
+    if-eqz v11, :cond_8
 
-    sget-object v13, Lcom/google/android/gms/internal/clearcut/ba;->aki:Lcom/google/android/gms/internal/clearcut/ba;
+    sget-object v11, Lcom/google/android/gms/internal/clearcut/ba;->aki:Lcom/google/android/gms/internal/clearcut/ba;
 
-    iget v13, v13, Lcom/google/android/gms/internal/clearcut/ba;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/clearcut/ba;->id:I
 
-    if-lt v12, v13, :cond_8
+    if-lt v13, v11, :cond_8
 
-    sget-object v13, Lcom/google/android/gms/internal/clearcut/ba;->akv:Lcom/google/android/gms/internal/clearcut/ba;
+    sget-object v11, Lcom/google/android/gms/internal/clearcut/ba;->akv:Lcom/google/android/gms/internal/clearcut/ba;
 
-    iget v13, v13, Lcom/google/android/gms/internal/clearcut/ba;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/clearcut/ba;->id:I
 
-    if-gt v12, v13, :cond_8
+    if-gt v13, v11, :cond_8
 
-    iget-object v13, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/clearcut/cq;->alT:[I
 
     add-int/lit8 v14, v6, 0x2
 
-    aget v13, v13, v14
+    aget v11, v11, v14
 
-    and-int/2addr v13, v4
+    and-int/2addr v11, v4
 
     goto :goto_1a
 
     :cond_8
-    const/4 v13, 0x0
+    const/4 v11, 0x0
 
     :goto_1a
     const/4 v15, 0x0
@@ -11943,12 +11802,12 @@
 
     int-to-long v3, v10
 
-    packed-switch v12, :pswitch_data_1
+    packed-switch v13, :pswitch_data_1
 
     goto/16 :goto_31
 
     :pswitch_41
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -11957,7 +11816,7 @@
     goto/16 :goto_1e
 
     :pswitch_42
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -11970,7 +11829,7 @@
     goto/16 :goto_1f
 
     :pswitch_43
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -11983,7 +11842,7 @@
     goto/16 :goto_20
 
     :pswitch_44
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
@@ -11992,7 +11851,7 @@
     goto/16 :goto_21
 
     :pswitch_45
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
@@ -12001,7 +11860,7 @@
     goto/16 :goto_22
 
     :pswitch_46
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12014,7 +11873,7 @@
     goto/16 :goto_23
 
     :pswitch_47
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12027,7 +11886,7 @@
     goto/16 :goto_24
 
     :pswitch_48
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12036,7 +11895,7 @@
     goto/16 :goto_25
 
     :pswitch_49
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12045,7 +11904,7 @@
     goto/16 :goto_27
 
     :pswitch_4a
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12062,7 +11921,7 @@
     goto/16 :goto_28
 
     :pswitch_4b
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
@@ -12071,7 +11930,7 @@
     goto/16 :goto_29
 
     :pswitch_4c
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
@@ -12080,7 +11939,7 @@
     goto/16 :goto_2a
 
     :pswitch_4d
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
@@ -12089,7 +11948,7 @@
     goto/16 :goto_2b
 
     :pswitch_4e
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12102,7 +11961,7 @@
     goto/16 :goto_2c
 
     :pswitch_4f
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12115,7 +11974,7 @@
     goto/16 :goto_2d
 
     :pswitch_50
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
@@ -12128,7 +11987,7 @@
     goto/16 :goto_2e
 
     :pswitch_51
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
@@ -12137,7 +11996,7 @@
     goto/16 :goto_2f
 
     :pswitch_52
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/clearcut/cq;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
@@ -12169,7 +12028,7 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/de;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/de;)I
 
     move-result v3
 
@@ -12440,12 +12299,12 @@
     if-eqz v4, :cond_9
 
     :goto_1c
-    int-to-long v12, v13
+    int-to-long v10, v11
 
-    invoke-virtual {v2, v1, v12, v13, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
     :cond_9
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->bw(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->bw(I)I
 
     move-result v4
 
@@ -12468,7 +12327,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->e(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->e(ILjava/util/List;)I
 
     move-result v3
 
@@ -12481,7 +12340,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->i(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->i(ILjava/util/List;)I
 
     move-result v3
 
@@ -12494,7 +12353,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->f(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->f(ILjava/util/List;)I
 
     move-result v3
 
@@ -12507,7 +12366,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->h(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->h(ILjava/util/List;)I
 
     move-result v3
 
@@ -12520,7 +12379,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->n(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->n(ILjava/util/List;)I
 
     move-result v3
 
@@ -12537,7 +12396,7 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/de;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;Lcom/google/android/gms/internal/clearcut/de;)I
 
     move-result v3
 
@@ -12550,7 +12409,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->m(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->m(ILjava/util/List;)I
 
     move-result v3
 
@@ -12563,7 +12422,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->l(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->l(ILjava/util/List;)I
 
     move-result v3
 
@@ -12576,7 +12435,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->g(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->g(ILjava/util/List;)I
 
     move-result v3
 
@@ -12589,7 +12448,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->d(ILjava/util/List;)I
 
     move-result v3
 
@@ -12602,7 +12461,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/util/List;)I
 
     move-result v3
 
@@ -12615,7 +12474,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->j(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->j(ILjava/util/List;)I
 
     move-result v3
 
@@ -12628,7 +12487,7 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/dg;->k(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/dg;->k(ILjava/util/List;)I
 
     move-result v3
 
@@ -12653,7 +12512,7 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/cm;Lcom/google/android/gms/internal/clearcut/de;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/cm;Lcom/google/android/gms/internal/clearcut/de;)I
 
     move-result v3
 
@@ -12669,7 +12528,7 @@
     move-result-wide v3
 
     :goto_1f
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->h(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->h(IJ)I
 
     move-result v3
 
@@ -12685,7 +12544,7 @@
     move-result v3
 
     :goto_20
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/am;->F(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/am;->F(II)I
 
     move-result v3
 
@@ -12697,7 +12556,7 @@
     if-eqz v3, :cond_b
 
     :goto_21
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->bs(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->bs(I)I
 
     move-result v3
 
@@ -12709,7 +12568,7 @@
     if-eqz v3, :cond_b
 
     :goto_22
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->bq(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->bq(I)I
 
     move-result v3
 
@@ -12725,7 +12584,7 @@
     move-result v3
 
     :goto_23
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/am;->G(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/am;->G(II)I
 
     move-result v3
 
@@ -12741,7 +12600,7 @@
     move-result v3
 
     :goto_24
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/am;->E(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/am;->E(II)I
 
     move-result v3
 
@@ -12760,7 +12619,7 @@
     :goto_26
     check-cast v3, Lcom/google/android/gms/internal/clearcut/ab;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/ab;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/ab;)I
 
     move-result v3
 
@@ -12780,7 +12639,7 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/clearcut/dg;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/clearcut/de;)I
 
     move-result v3
 
@@ -12805,7 +12664,7 @@
     :cond_a
     check-cast v3, Ljava/lang/String;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/am;->d(ILjava/lang/String;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/am;->d(ILjava/lang/String;)I
 
     move-result v3
 
@@ -12817,7 +12676,7 @@
     if-eqz v3, :cond_b
 
     :goto_29
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->bv(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->bv(I)I
 
     move-result v3
 
@@ -12829,7 +12688,7 @@
     if-eqz v3, :cond_b
 
     :goto_2a
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->bp(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->bp(I)I
 
     move-result v3
 
@@ -12841,7 +12700,7 @@
     if-eqz v3, :cond_b
 
     :goto_2b
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->br(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->br(I)I
 
     move-result v3
 
@@ -12857,7 +12716,7 @@
     move-result v3
 
     :goto_2c
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/clearcut/am;->D(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/clearcut/am;->D(II)I
 
     move-result v3
 
@@ -12873,7 +12732,7 @@
     move-result-wide v3
 
     :goto_2d
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->g(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->g(IJ)I
 
     move-result v3
 
@@ -12889,7 +12748,7 @@
     move-result-wide v3
 
     :goto_2e
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->f(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/clearcut/am;->f(IJ)I
 
     move-result v3
 
@@ -12901,7 +12760,7 @@
     if-eqz v3, :cond_b
 
     :goto_2f
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->bt(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->bt(I)I
 
     move-result v3
 
@@ -12913,7 +12772,7 @@
     if-eqz v3, :cond_b
 
     :goto_30
-    invoke-static {v11}, Lcom/google/android/gms/internal/clearcut/am;->bu(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/clearcut/am;->bu(I)I
 
     move-result v3
 
@@ -12953,7 +12812,7 @@
     :goto_32
     iget-object v3, v1, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v3
 
@@ -12988,7 +12847,7 @@
     :cond_d
     iget-object v1, v1, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/dh;->oh()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -13198,33 +13057,29 @@
 
     if-eqz v2, :cond_10
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/clearcut/cq;->amd:[I
+    array-length v4, v2
 
-    array-length v2, v2
-
-    if-nez v2, :cond_0
+    if-nez v4, :cond_0
 
     goto/16 :goto_7
 
     :cond_0
-    const/4 v2, -0x1
+    const/4 v4, -0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->amd:[I
-
-    array-length v5, v4
+    array-length v5, v2
 
     const/4 v6, 0x0
 
-    const/4 v2, 0x0
+    const/4 v4, 0x0
 
     const/4 v7, -0x1
 
     const/4 v8, 0x0
 
     :goto_0
-    if-ge v2, v5, :cond_e
+    if-ge v4, v5, :cond_e
 
-    aget v9, v4, v2
+    aget v9, v2, v4
 
     invoke-direct {v0, v9}, Lcom/google/android/gms/internal/clearcut/cq;->bK(I)I
 
@@ -13256,7 +13111,7 @@
 
     sget-object v7, Lcom/google/android/gms/internal/clearcut/cq;->alS:Lsun/misc/Unsafe;
 
-    move-object v15, v4
+    move v15, v4
 
     int-to-long v3, v14
 
@@ -13271,12 +13126,12 @@
     goto :goto_1
 
     :cond_1
-    move-object v15, v4
+    move v15, v4
 
     goto :goto_1
 
     :cond_2
-    move-object v15, v4
+    move v15, v4
 
     const/4 v12, 0x0
 
@@ -13359,7 +13214,7 @@
 
     iget-object v4, v0, Lcom/google/android/gms/internal/clearcut/cq;->amk:Lcom/google/android/gms/internal/clearcut/ch;
 
-    invoke-interface {v4}, Lcom/google/android/gms/internal/clearcut/ch;->nL()Lcom/google/android/gms/internal/clearcut/cf;
+    invoke-interface {v4}, Lcom/google/android/gms/internal/clearcut/ch;->nK()Lcom/google/android/gms/internal/clearcut/cf;
 
     move-result-object v4
 
@@ -13394,7 +13249,7 @@
 
     if-nez v4, :cond_6
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nW()Lcom/google/android/gms/internal/clearcut/cz;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cz;->nV()Lcom/google/android/gms/internal/clearcut/cz;
 
     move-result-object v4
 
@@ -13523,9 +13378,7 @@
 
     :cond_d
     :goto_6
-    add-int/lit8 v2, v2, 0x1
-
-    move-object v4, v15
+    add-int/lit8 v4, v15, 0x1
 
     const/4 v3, 0x1
 
@@ -13561,8 +13414,6 @@
 
     return v1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x31
         :pswitch_1
@@ -14480,7 +14331,7 @@
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -14870,7 +14721,7 @@
     move-result v3
 
     :goto_9
-    invoke-static {v3}, Lcom/google/android/gms/internal/clearcut/bh;->K(Z)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/clearcut/bh;->J(Z)I
 
     move-result v3
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cs.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cs.smali
index dc33035c3b..2b90e3a32e 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cs.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cs.smali
@@ -146,7 +146,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/clearcut/az;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/az;->ng()Lcom/google/android/gms/internal/clearcut/en;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/az;->nf()Lcom/google/android/gms/internal/clearcut/en;
 
     move-result-object v3
 
@@ -158,7 +158,7 @@
 
     if-eqz v3, :cond_0
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/az;->lT()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/az;->lS()I
 
     move-result v2
 
@@ -172,17 +172,14 @@
 
     check-cast v1, Lcom/google/android/gms/internal/clearcut/bq;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/bt;->mD()Lcom/google/android/gms/internal/clearcut/ab;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/bt;->mC()Lcom/google/android/gms/internal/clearcut/ab;
 
     move-result-object v1
 
-    :goto_1
-    invoke-interface {p2, v2, v1}, Lcom/google/android/gms/internal/clearcut/eo;->d(ILjava/lang/Object;)V
-
-    goto :goto_0
+    goto :goto_1
 
     :cond_0
-    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/az;->lT()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/clearcut/az;->lS()I
 
     move-result v2
 
@@ -190,7 +187,10 @@
 
     move-result-object v1
 
-    goto :goto_1
+    :goto_1
+    invoke-interface {p2, v2, v1}, Lcom/google/android/gms/internal/clearcut/eo;->d(ILjava/lang/Object;)V
+
+    goto :goto_0
 
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -233,13 +233,13 @@
 
     iget-object v0, p1, Lcom/google/android/gms/internal/clearcut/bf;->zzjp:Lcom/google/android/gms/internal/clearcut/dw;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->op()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->or()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v0
 
@@ -366,13 +366,13 @@
     return-void
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p1
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x2
@@ -437,7 +437,7 @@
     :goto_0
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v3
 
@@ -462,7 +462,7 @@
     :cond_0
     iget-object p1, p1, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dh;->oh()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -652,11 +652,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/cs;->alY:Lcom/google/android/gms/internal/clearcut/cm;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->nl()Lcom/google/android/gms/internal/clearcut/cn;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cm;->nk()Lcom/google/android/gms/internal/clearcut/cn;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cn;->nq()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/cn;->np()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ct.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ct.smali
index e18d320bbd..dd527d9b5e 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ct.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ct.smali
@@ -7,5 +7,5 @@
 
 
 # virtual methods
-.method public abstract nS()Lcom/google/android/gms/internal/clearcut/ct;
+.method public abstract nR()Lcom/google/android/gms/internal/clearcut/ct;
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cw.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cw.smali
index 5a8e02f8f9..30ed186950 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cw.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cw.smali
@@ -12,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nV()Lcom/google/android/gms/internal/clearcut/cu;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/cw;->nU()Lcom/google/android/gms/internal/clearcut/cu;
 
     move-result-object v0
 
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method static nT()Lcom/google/android/gms/internal/clearcut/cu;
+.method static nS()Lcom/google/android/gms/internal/clearcut/cu;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/cw;->aml:Lcom/google/android/gms/internal/clearcut/cu;
@@ -35,7 +35,7 @@
     return-object v0
 .end method
 
-.method static nU()Lcom/google/android/gms/internal/clearcut/cu;
+.method static nT()Lcom/google/android/gms/internal/clearcut/cu;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/cw;->amm:Lcom/google/android/gms/internal/clearcut/cu;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method private static nV()Lcom/google/android/gms/internal/clearcut/cu;
+.method private static nU()Lcom/google/android/gms/internal/clearcut/cu;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/cz.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/cz.smali
index 8050bbd5a0..43ca07439e 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/cz.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/cz.smali
@@ -124,7 +124,7 @@
     return-object p0
 .end method
 
-.method public static nW()Lcom/google/android/gms/internal/clearcut/cz;
+.method public static nV()Lcom/google/android/gms/internal/clearcut/cz;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/cz;->amn:Lcom/google/android/gms/internal/clearcut/cz;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/da.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/da.smali
index d197e1b056..f5c81ab995 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/da.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/da.smali
@@ -85,7 +85,7 @@
     return-void
 .end method
 
-.method public static nX()Lcom/google/android/gms/internal/clearcut/da;
+.method public static nW()Lcom/google/android/gms/internal/clearcut/da;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/da;->alD:Ljava/util/List;
 
@@ -183,7 +183,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/da;->alD:Ljava/util/List;
 
@@ -208,7 +208,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/da;->alD:Ljava/util/List;
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/db.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/db.smali
index 7c44c2fb27..0b6f8c5a1a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/db.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/db.smali
@@ -38,7 +38,7 @@
 
 
 # virtual methods
-.method public final nP()I
+.method public final nO()I
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/db;->amr:Lcom/google/android/gms/internal/clearcut/dc;
@@ -61,7 +61,7 @@
     return v0
 .end method
 
-.method public final nQ()Z
+.method public final nP()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/db;->amr:Lcom/google/android/gms/internal/clearcut/dc;
@@ -84,7 +84,7 @@
     return v0
 .end method
 
-.method public final nR()Lcom/google/android/gms/internal/clearcut/cm;
+.method public final nQ()Lcom/google/android/gms/internal/clearcut/cm;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/db;->alY:Lcom/google/android/gms/internal/clearcut/cm;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dc.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dc.smali
index b119cd9fda..a007cd4978 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dc.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dc.smali
@@ -274,11 +274,11 @@
     :try_start_0
     invoke-virtual {p0, p1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
     invoke-virtual {p0}, Ljava/lang/Class;->getDeclaredFields()[Ljava/lang/reflect/Field;
@@ -381,9 +381,11 @@
     invoke-direct {v1, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
-.method private final nY()Ljava/lang/Object;
+.method private final nX()Ljava/lang/Object;
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->alU:[Ljava/lang/Object;
@@ -399,7 +401,7 @@
     return-object v0
 .end method
 
-.method private final nZ()Z
+.method private final nY()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->flags:I
@@ -420,6 +422,27 @@
 
 
 # virtual methods
+.method final nZ()Z
+    .locals 2
+
+    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
+
+    sget-object v1, Lcom/google/android/gms/internal/clearcut/ba;->akx:Lcom/google/android/gms/internal/clearcut/ba;
+
+    iget v1, v1, Lcom/google/android/gms/internal/clearcut/ba;->id:I
+
+    if-le v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
 .method final next()Z
     .locals 5
 
@@ -464,8 +487,6 @@
 
     if-ge v0, v2, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amI:I
-
     iput v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->zznr:I
 
     :cond_1
@@ -475,8 +496,6 @@
 
     if-le v0, v2, :cond_2
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amI:I
-
     iput v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amC:I
 
     :cond_2
@@ -553,19 +572,16 @@
 
     sub-int/2addr v0, v2
 
-    :goto_1
-    iput v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amF:I
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amF:I
 
     add-int/2addr v0, v3
 
-    goto :goto_1
+    :goto_1
+    iput v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amF:I
 
-    :goto_2
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amJ:I
 
     and-int/lit16 v0, v0, 0x400
@@ -574,12 +590,12 @@
 
     const/4 v0, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     const/4 v0, 0x0
 
-    :goto_3
+    :goto_2
     if-eqz v0, :cond_7
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amd:[I
@@ -603,7 +619,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amQ:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dc;->oa()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nZ()Z
 
     move-result v0
 
@@ -637,7 +653,7 @@
 
     if-ne v0, v1, :cond_8
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_8
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
@@ -648,38 +664,36 @@
 
     add-int/lit8 v1, v1, 0x33
 
-    if-ne v0, v1, :cond_12
+    if-ne v0, v1, :cond_13
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nY()Z
 
     move-result v0
 
-    if-eqz v0, :cond_12
+    if-eqz v0, :cond_13
 
-    :goto_4
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nY()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nX()Ljava/lang/Object;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amP:Ljava/lang/Object;
 
-    goto/16 :goto_9
+    goto/16 :goto_7
 
     :cond_9
-    :goto_5
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nY()Ljava/lang/Object;
+    :goto_3
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nX()Ljava/lang/Object;
 
     move-result-object v0
 
-    :goto_6
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amO:Ljava/lang/Object;
 
-    goto/16 :goto_9
+    goto/16 :goto_7
 
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amt:Ljava/lang/Class;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nY()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nX()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -691,7 +705,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amN:Ljava/lang/reflect/Field;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dc;->ob()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dc;->oa()Z
 
     move-result v0
 
@@ -712,7 +726,7 @@
 
     iget v2, v2, Lcom/google/android/gms/internal/clearcut/ba;->id:I
 
-    if-eq v0, v2, :cond_11
+    if-eq v0, v2, :cond_12
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
 
@@ -722,7 +736,7 @@
 
     if-ne v0, v2, :cond_c
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_c
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
@@ -731,7 +745,7 @@
 
     iget v2, v2, Lcom/google/android/gms/internal/clearcut/ba;->id:I
 
-    if-eq v0, v2, :cond_9
+    if-eq v0, v2, :cond_11
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
 
@@ -768,7 +782,7 @@
 
     if-ne v0, v2, :cond_e
 
-    goto :goto_7
+    goto :goto_4
 
     :cond_e
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
@@ -777,9 +791,9 @@
 
     iget v2, v2, Lcom/google/android/gms/internal/clearcut/ba;->id:I
 
-    if-ne v0, v2, :cond_12
+    if-ne v0, v2, :cond_13
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nY()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -794,60 +808,61 @@
     const/4 v1, 0x1
 
     :cond_f
-    if-eqz v1, :cond_12
+    if-eqz v1, :cond_13
 
-    goto :goto_4
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nX()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amP:Ljava/lang/Object;
+
+    goto :goto_7
 
     :cond_10
-    :goto_7
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nZ()Z
+    :goto_4
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nY()Z
 
     move-result v0
 
-    if-eqz v0, :cond_12
+    if-eqz v0, :cond_13
 
-    goto/16 :goto_4
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nX()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amP:Ljava/lang/Object;
+
+    goto :goto_7
 
     :cond_11
-    :goto_8
+    :goto_5
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nX()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amO:Ljava/lang/Object;
+
+    goto :goto_7
+
+    :cond_12
+    :goto_6
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amN:Ljava/lang/reflect/Field;
 
     invoke-virtual {v0}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
 
     move-result-object v0
 
-    goto/16 :goto_6
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amO:Ljava/lang/Object;
 
-    :cond_12
-    :goto_9
+    :cond_13
+    :goto_7
     return v3
 .end method
 
 .method final oa()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dc;->amK:I
-
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/ba;->akx:Lcom/google/android/gms/internal/clearcut/ba;
-
-    iget v1, v1, Lcom/google/android/gms/internal/clearcut/ba;->id:I
-
-    if-le v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method final ob()Z
-    .locals 2
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dc;->nY()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dg.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dg.smali
index a088c1ef3c..30c46b786c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dg.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dg.smali
@@ -44,7 +44,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->of()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->oe()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/clearcut/dg;->L(Z)Lcom/google/android/gms/internal/clearcut/dv;
+    invoke-static {v0}, Lcom/google/android/gms/internal/clearcut/dg;->K(Z)Lcom/google/android/gms/internal/clearcut/dv;
 
     move-result-object v0
 
@@ -60,7 +60,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/clearcut/dg;->L(Z)Lcom/google/android/gms/internal/clearcut/dv;
+    invoke-static {v0}, Lcom/google/android/gms/internal/clearcut/dg;->K(Z)Lcom/google/android/gms/internal/clearcut/dv;
 
     move-result-object v0
 
@@ -75,7 +75,7 @@
     return-void
 .end method
 
-.method private static L(Z)Lcom/google/android/gms/internal/clearcut/dv;
+.method private static K(Z)Lcom/google/android/gms/internal/clearcut/dv;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,7 +88,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->og()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dg;->of()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -149,7 +149,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/clearcut/dv;->op()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/clearcut/dv;->oo()Ljava/lang/Object;
 
     move-result-object p2
 
@@ -430,7 +430,7 @@
     :goto_0
     iget-object v0, p2, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v0
 
@@ -451,7 +451,7 @@
     :cond_0
     iget-object p1, p2, Lcom/google/android/gms/internal/clearcut/aw;->aju:Lcom/google/android/gms/internal/clearcut/dh;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dh;->oh()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -753,10 +753,7 @@
 
     move-result v2
 
-    :goto_1
-    add-int/2addr p0, v2
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     check-cast v2, Lcom/google/android/gms/internal/clearcut/cm;
@@ -765,9 +762,9 @@
 
     move-result v2
 
-    goto :goto_1
+    :goto_1
+    add-int/2addr p0, v2
 
-    :goto_2
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
@@ -1598,10 +1595,7 @@
 
     move-result v2
 
-    :goto_1
-    add-int/2addr p0, v2
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     check-cast v2, Ljava/lang/String;
@@ -1610,15 +1604,15 @@
 
     move-result v2
 
-    goto :goto_1
+    :goto_1
+    add-int/2addr p0, v2
 
-    :goto_2
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_2
-    :goto_3
+    :goto_2
     if-ge v1, v0, :cond_4
 
     invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -1635,10 +1629,7 @@
 
     move-result v2
 
-    :goto_4
-    add-int/2addr p0, v2
-
-    goto :goto_5
+    goto :goto_3
 
     :cond_3
     check-cast v2, Ljava/lang/String;
@@ -1647,12 +1638,12 @@
 
     move-result v2
 
-    goto :goto_4
+    :goto_3
+    add-int/2addr p0, v2
 
-    :goto_5
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     return p0
@@ -1856,7 +1847,7 @@
     return v2
 .end method
 
-.method public static oc()Lcom/google/android/gms/internal/clearcut/dv;
+.method public static ob()Lcom/google/android/gms/internal/clearcut/dv;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1871,7 +1862,7 @@
     return-object v0
 .end method
 
-.method public static od()Lcom/google/android/gms/internal/clearcut/dv;
+.method public static oc()Lcom/google/android/gms/internal/clearcut/dv;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1886,7 +1877,7 @@
     return-object v0
 .end method
 
-.method public static oe()Lcom/google/android/gms/internal/clearcut/dv;
+.method public static od()Lcom/google/android/gms/internal/clearcut/dv;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1901,7 +1892,7 @@
     return-object v0
 .end method
 
-.method private static of()Ljava/lang/Class;
+.method private static oe()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1928,7 +1919,7 @@
     return-object v0
 .end method
 
-.method private static og()Ljava/lang/Class;
+.method private static of()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2362,8 +2353,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/dg;->amR:Ljava/lang/Class;
-
     invoke-virtual {v0, p0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result p0
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dh.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dh.smali
index 0797961d70..56dfa49fe6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dh.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dh.smali
@@ -217,7 +217,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/clearcut/dh;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()V
 
     return-void
 .end method
@@ -259,7 +259,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dh;->amW:Ljava/util/List;
 
@@ -281,7 +281,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ol()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -329,7 +329,7 @@
     return-object p0
 .end method
 
-.method private final ok()V
+.method private final oj()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/dh;->ajv:Z
@@ -346,7 +346,7 @@
     throw v0
 .end method
 
-.method private final ol()Ljava/util/SortedMap;
+.method private final ok()Ljava/util/SortedMap;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -356,7 +356,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dh;->amX:Ljava/util/Map;
 
@@ -406,7 +406,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/dh;->a(Ljava/lang/Comparable;)I
 
@@ -429,7 +429,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()V
 
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/dh;->amW:Ljava/util/List;
 
@@ -462,7 +462,7 @@
 
     if-lt v0, v1, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ol()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -485,8 +485,6 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/dh;->amW:Ljava/util/List;
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/dh;->amV:I
-
     add-int/lit8 v2, v2, -0x1
 
     invoke-interface {v1, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
@@ -495,7 +493,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/clearcut/do;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ol()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()Ljava/util/SortedMap;
 
     move-result-object v2
 
@@ -549,7 +547,7 @@
 .method public clear()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dh;->amW:Ljava/util/List;
 
@@ -680,11 +678,11 @@
     return v3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v4
 
@@ -793,7 +791,7 @@
 .method public hashCode()I
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v0
 
@@ -843,7 +841,7 @@
     return v2
 .end method
 
-.method public mH()V
+.method public mG()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/dh;->ajv:Z
@@ -906,7 +904,7 @@
     return-void
 .end method
 
-.method public final oh()I
+.method public final og()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dh;->amW:Ljava/util/List;
@@ -918,7 +916,7 @@
     return v0
 .end method
 
-.method public final oi()Ljava/lang/Iterable;
+.method public final oh()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -937,7 +935,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dl;->on()Ljava/lang/Iterable;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dl;->om()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -953,7 +951,7 @@
     return-object v0
 .end method
 
-.method final oj()Ljava/util/Set;
+.method final oi()Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1004,7 +1002,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->ok()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oj()V
 
     check-cast p1, Ljava/lang/Comparable;
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/di.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/di.smali
index d4cb876996..0a1a90d0e7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/di.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/di.smali
@@ -26,7 +26,7 @@
 
 
 # virtual methods
-.method public final mH()V
+.method public final mG()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/dh;->ajv:Z
@@ -36,7 +36,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->og()I
 
     move-result v1
 
@@ -53,7 +53,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oi()Ljava/lang/Iterable;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/dh;->oh()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -79,7 +79,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/dh;->mH()V
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/dh;->mG()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dj.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dj.smali
index da13c28d96..e74efa3ac6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dj.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dj.smali
@@ -63,7 +63,7 @@
     return-void
 .end method
 
-.method private final om()Ljava/util/Iterator;
+.method private final ol()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,8 +109,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dj;->pos:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/dj;->anc:Lcom/google/android/gms/internal/clearcut/dh;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/clearcut/dh;->b(Lcom/google/android/gms/internal/clearcut/dh;)Ljava/util/List;
@@ -124,7 +122,7 @@
     if-le v0, v1, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dj;->om()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dj;->ol()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -148,7 +146,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dj;->om()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dj;->ol()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -158,7 +156,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dj;->om()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dj;->ol()Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dl.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dl.smali
index a4a2a0cd7f..f5f0821561 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dl.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dl.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method static on()Ljava/lang/Iterable;
+.method static om()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,7 +60,7 @@
     return-object v0
 .end method
 
-.method static synthetic oo()Ljava/util/Iterator;
+.method static synthetic on()Ljava/util/Iterator;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/dl;->and:Ljava/util/Iterator;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dn.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dn.smali
index 093e1092da..3cf9e6aba9 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dn.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dn.smali
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dl;->oo()Ljava/util/Iterator;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dl;->on()Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/do.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/do.smali
index ae121a2c7d..363a9cb2ca 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/do.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/do.smali
@@ -220,8 +220,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/do;->anf:Ljava/lang/Comparable;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -234,9 +232,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/do;->value:Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dp.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dp.smali
index 126e86de3e..f286a4eaab 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dp.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dp.smali
@@ -57,7 +57,7 @@
     return-void
 .end method
 
-.method private final om()Ljava/util/Iterator;
+.method private final ol()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -129,7 +129,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dp;->om()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dp;->ol()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -194,7 +194,7 @@
     return-object v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dp;->om()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dp;->ol()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -247,7 +247,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dp;->om()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/dp;->ol()Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dv.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dv.smali
index 04e652aac2..2b825fd90d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dv.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dv.smali
@@ -133,7 +133,7 @@
     .end annotation
 .end method
 
-.method abstract op()Ljava/lang/Object;
+.method abstract oo()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TB;"
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dw.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dw.smali
index acf0947468..38a764f7db 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dw.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dw.smali
@@ -143,7 +143,7 @@
 
     new-instance p0, Ljava/lang/RuntimeException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bo;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nw()Lcom/google/android/gms/internal/clearcut/bo;
 
     move-result-object p1
 
@@ -152,7 +152,7 @@
     throw p0
 
     :pswitch_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/eo;->mq()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/eo;->mp()I
 
     move-result p0
 
@@ -230,7 +230,7 @@
     .end packed-switch
 .end method
 
-.method public static oq()Lcom/google/android/gms/internal/clearcut/dw;
+.method public static op()Lcom/google/android/gms/internal/clearcut/dw;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/dw;->ani:Lcom/google/android/gms/internal/clearcut/dw;
@@ -238,7 +238,7 @@
     return-object v0
 .end method
 
-.method static or()Lcom/google/android/gms/internal/clearcut/dw;
+.method static oq()Lcom/google/android/gms/internal/clearcut/dw;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/dw;
@@ -265,7 +265,7 @@
     return-void
 
     :cond_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/eo;->mq()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/clearcut/eo;->mp()I
 
     move-result v0
 
@@ -372,8 +372,6 @@
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
-
     const/4 v1, 0x4
 
     if-ge v0, v1, :cond_0
@@ -383,8 +381,6 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
-
     shr-int/lit8 v0, v0, 0x1
 
     :goto_0
@@ -417,15 +413,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/clearcut/dw;->alU:[Ljava/lang/Object;
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
+    aput-object p2, p1, v1
 
-    aput-object p2, p1, v0
+    add-int/lit8 v1, v1, 0x1
 
-    iget p1, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
+    iput v1, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
 
     return-void
 
@@ -469,20 +461,18 @@
 
     if-ne v2, v3, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/dw;->anj:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/dw;->anj:[I
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/dw;->anj:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
+    iget-object v4, p1, Lcom/google/android/gms/internal/clearcut/dw;->anj:[I
 
     const/4 v5, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_4
+    if-ge v5, v2, :cond_4
 
-    aget v6, v2, v5
+    aget v6, v3, v5
 
-    aget v7, v3, v5
+    aget v7, v4, v5
 
     if-eq v6, v7, :cond_3
 
@@ -552,13 +542,11 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
 
-    add-int/lit16 v0, v0, 0x20f
+    add-int/lit16 v1, v0, 0x20f
 
-    mul-int/lit8 v0, v0, 0x1f
+    mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/dw;->anj:[I
-
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
+    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/dw;->anj:[I
 
     const/4 v3, 0x0
 
@@ -569,11 +557,11 @@
     const/16 v6, 0x11
 
     :goto_0
-    if-ge v5, v2, :cond_0
+    if-ge v5, v0, :cond_0
 
     mul-int/lit8 v6, v6, 0x1f
 
-    aget v7, v1, v5
+    aget v7, v2, v5
 
     add-int/2addr v6, v7
 
@@ -582,11 +570,11 @@
     goto :goto_0
 
     :cond_0
-    add-int/2addr v0, v6
+    add-int/2addr v1, v6
 
-    mul-int/lit8 v0, v0, 0x1f
+    mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/dw;->alU:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dw;->alU:[Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/android/gms/internal/clearcut/dw;->count:I
 
@@ -595,7 +583,7 @@
 
     mul-int/lit8 v4, v4, 0x1f
 
-    aget-object v5, v1, v3
+    aget-object v5, v0, v3
 
     invoke-virtual {v5}, Ljava/lang/Object;->hashCode()I
 
@@ -608,12 +596,12 @@
     goto :goto_1
 
     :cond_1
-    add-int/2addr v0, v4
+    add-int/2addr v1, v4
 
-    return v0
+    return v1
 .end method
 
-.method public final nj()I
+.method public final ni()I
     .locals 6
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/dw;->zzjq:I
@@ -650,7 +638,7 @@
 
     new-instance v0, Ljava/lang/IllegalStateException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bo;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nw()Lcom/google/android/gms/internal/clearcut/bo;
 
     move-result-object v1
 
@@ -671,7 +659,7 @@
 
     check-cast v3, Lcom/google/android/gms/internal/clearcut/dw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/dw;->nj()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/dw;->ni()I
 
     move-result v3
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dx.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dx.smali
index acaaa467da..b53ecd8c11 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dx.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dx.smali
@@ -98,7 +98,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/clearcut/dw;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dw;->nj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/dw;->ni()I
 
     move-result p1
 
@@ -176,7 +176,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/clearcut/dw;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/eo;->mq()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/clearcut/eo;->mp()I
 
     move-result v0
 
@@ -265,7 +265,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/clearcut/dw;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->op()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v0
 
@@ -285,10 +285,10 @@
     return-object p1
 .end method
 
-.method final synthetic op()Ljava/lang/Object;
+.method final synthetic oo()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->or()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/dy.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/dy.smali
index 183b1a8a82..8ee686c561 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/dy.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/dy.smali
@@ -105,7 +105,7 @@
     return-object v0
 .end method
 
-.method public final nB()Ljava/util/List;
+.method public final nA()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -117,14 +117,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/dy;->ank:Lcom/google/android/gms/internal/clearcut/bv;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bv;->nB()Ljava/util/List;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/clearcut/bv;->nA()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final nC()Lcom/google/android/gms/internal/clearcut/bv;
+.method public final nB()Lcom/google/android/gms/internal/clearcut/bv;
     .locals 0
 
     return-object p0
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/e.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/e.smali
index d00f82ba60..b57cb66c9c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/e.smali
@@ -261,14 +261,12 @@
     .end annotation
 
     :try_start_0
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/l;->mA()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/l;->mz()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object p0, v0
-
     goto :goto_0
 
     :catch_0
@@ -277,7 +275,7 @@
     move-result-wide v0
 
     :try_start_1
-    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/l;->mA()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/clearcut/l;->mz()Ljava/lang/Object;
 
     move-result-object p0
     :try_end_1
@@ -386,7 +384,7 @@
 .method static ba(Ljava/lang/String;)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/e;->mz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/e;->my()Z
 
     move-result v0
 
@@ -434,7 +432,7 @@
     return-object p0
 .end method
 
-.method private final mx()Ljava/lang/Object;
+.method private final mw()Ljava/lang/Object;
     .locals 5
     .annotation build Landroid/annotation/TargetApi;
         value = 0x18
@@ -650,7 +648,7 @@
     return-object v1
 .end method
 
-.method private final my()Ljava/lang/Object;
+.method private final mx()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -667,7 +665,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/e;->mz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/e;->my()Z
 
     move-result v0
 
@@ -697,7 +695,7 @@
     return-object v0
 .end method
 
-.method private static mz()Z
+.method private static my()Z
     .locals 3
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/e;->aig:Ljava/lang/Boolean;
@@ -710,8 +708,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/e;->Zj:Landroid/content/Context;
-
     const-string v2, "com.google.android.providers.gsf.permission.READ_GSERVICES"
 
     invoke-static {v0, v2}, Landroidx/core/content/PermissionChecker;->checkCallingOrSelfPermission(Landroid/content/Context;Ljava/lang/String;)I
@@ -785,7 +781,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->my()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->mx()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -794,7 +790,7 @@
     return-object v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->mx()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->mw()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -803,7 +799,7 @@
     return-object v0
 
     :cond_1
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->mx()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->mw()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -812,7 +808,7 @@
     return-object v0
 
     :cond_2
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->my()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/e;->mx()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/eb$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/eb$a.smali
index ab7a275011..b3fcd78232 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/eb$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/eb$a.smali
@@ -71,7 +71,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
@@ -108,7 +108,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
@@ -127,7 +127,7 @@
 .method public final l(Ljava/lang/Object;J)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
@@ -178,7 +178,7 @@
 .method public final v(Ljava/lang/Object;J)B
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/eb$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/eb$b.smali
index 9d940b3d04..1ab9d97295 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/eb$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/eb$b.smali
@@ -65,7 +65,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
@@ -96,7 +96,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
@@ -115,7 +115,7 @@
 .method public final l(Ljava/lang/Object;J)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
@@ -166,7 +166,7 @@
 .method public final v(Ljava/lang/Object;J)B
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/eb$c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/eb$c.smali
index a77effed7b..0f62da6c29 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/eb$c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/eb$c.smali
@@ -77,7 +77,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/internal/clearcut/eb$c;->anJ:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->oy()J
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ox()J
 
     move-result-wide v2
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/eb.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/eb.smali
index 461ef1a71c..5d2cf43bb6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/eb.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/eb.smali
@@ -86,13 +86,13 @@
 
     sput-object v0, Lcom/google/android/gms/internal/clearcut/eb;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ou()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ot()Lsun/misc/Unsafe;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/internal/clearcut/eb;->alS:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mJ()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mI()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mI()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mH()Z
 
     move-result v0
 
@@ -167,13 +167,13 @@
     :goto_0
     sput-object v0, Lcom/google/android/gms/internal/clearcut/eb;->anr:Lcom/google/android/gms/internal/clearcut/eb$d;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ow()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ov()Z
 
     move-result v0
 
     sput-boolean v0, Lcom/google/android/gms/internal/clearcut/eb;->ans:Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ov()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ou()Z
 
     move-result v0
 
@@ -309,7 +309,7 @@
 
     sput-wide v2, Lcom/google/android/gms/internal/clearcut/eb;->anF:J
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ox()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ow()Ljava/lang/reflect/Field;
 
     move-result-object v0
 
@@ -572,8 +572,6 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/eb;->anr:Lcom/google/android/gms/internal/clearcut/eb$d;
-
     invoke-virtual {v0, p0}, Lcom/google/android/gms/internal/clearcut/eb$d;->a(Ljava/lang/reflect/Field;)J
 
     move-result-wide v0
@@ -780,7 +778,7 @@
     return-object p0
 .end method
 
-.method static os()Z
+.method static or()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/clearcut/eb;->aiZ:Z
@@ -788,7 +786,7 @@
     return v0
 .end method
 
-.method static ot()Z
+.method static os()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/clearcut/eb;->ans:Z
@@ -796,7 +794,7 @@
     return v0
 .end method
 
-.method static ou()Lsun/misc/Unsafe;
+.method static ot()Lsun/misc/Unsafe;
     .locals 1
 
     :try_start_0
@@ -821,7 +819,7 @@
     return-object v0
 .end method
 
-.method private static ov()Z
+.method private static ou()Z
     .locals 8
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/eb;->alS:Lsun/misc/Unsafe;
@@ -834,8 +832,6 @@
 
     :cond_0
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/eb;->alS:Lsun/misc/Unsafe;
-
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v0
@@ -972,7 +968,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/clearcut/v;->mI()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mH()Z
 
     move-result v2
 
@@ -1157,7 +1153,7 @@
     return v1
 .end method
 
-.method private static ow()Z
+.method private static ov()Z
     .locals 8
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/eb;->alS:Lsun/misc/Unsafe;
@@ -1170,8 +1166,6 @@
 
     :cond_0
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/eb;->alS:Lsun/misc/Unsafe;
-
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v0
@@ -1204,7 +1198,7 @@
 
     invoke-virtual {v0, v2, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ox()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ow()Ljava/lang/reflect/Field;
 
     move-result-object v2
 
@@ -1213,7 +1207,7 @@
     return v1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mI()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mH()Z
 
     move-result v2
 
@@ -1392,10 +1386,10 @@
     return v1
 .end method
 
-.method private static ox()Ljava/lang/reflect/Field;
+.method private static ow()Ljava/lang/reflect/Field;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mI()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mH()Z
 
     move-result v0
 
@@ -1440,7 +1434,7 @@
     return-object v0
 .end method
 
-.method static synthetic oy()J
+.method static synthetic ox()J
     .locals 2
 
     sget-wide v0, Lcom/google/android/gms/internal/clearcut/eb;->ant:J
@@ -1448,7 +1442,7 @@
     return-wide v0
 .end method
 
-.method static synthetic oz()Z
+.method static synthetic oy()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/clearcut/eb;->anI:Z
@@ -1644,7 +1638,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mI()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/v;->mH()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ed.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ed.smali
index b7a0320513..d8292d8288 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ed.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ed.smali
@@ -10,13 +10,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->os()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->or()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->ot()Z
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/eb;->os()Z
 
     move-result v0
 
@@ -298,6 +298,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static bO(I)I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ee.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ee.smali
index 4bdf342f2d..0ced6954a9 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ee.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ee.smali
@@ -328,6 +328,8 @@
     invoke-direct {p1, p0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/eh.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/eh.smali
index b987961177..ba548f8d44 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/eh.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/eh.smali
@@ -428,10 +428,12 @@
     invoke-direct {v1, v0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method final b(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
-    .locals 20
+    .locals 21
 
     move-object/from16 v0, p1
 
@@ -497,9 +499,9 @@
     goto :goto_0
 
     :cond_0
-    if-ne v9, v8, :cond_1
+    if-ne v9, v8, :cond_2
 
-    :goto_1
+    :cond_1
     sub-long/2addr v4, v2
 
     long-to-int v0, v4
@@ -508,19 +510,19 @@
 
     return-void
 
-    :cond_1
-    :goto_2
-    if-ge v9, v8, :cond_b
+    :cond_2
+    :goto_1
+    if-ge v9, v8, :cond_1
 
     invoke-interface {v0, v9}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result v13
 
-    if-ge v13, v10, :cond_2
+    if-ge v13, v10, :cond_3
 
     cmp-long v14, v4, v6
 
-    if-gez v14, :cond_2
+    if-gez v14, :cond_3
 
     add-long v14, v4, v11
 
@@ -528,18 +530,18 @@
 
     invoke-static {v4, v5, v13}, Lcom/google/android/gms/internal/clearcut/eb;->a(JB)V
 
-    :goto_3
+    :goto_2
     move-wide v4, v11
 
-    :goto_4
+    :goto_3
     const/16 v11, 0x80
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
-    :cond_2
+    :cond_3
     const/16 v14, 0x800
 
-    if-ge v13, v14, :cond_3
+    if-ge v13, v14, :cond_4
 
     const-wide/16 v14, 0x2
 
@@ -547,7 +549,7 @@
 
     cmp-long v16, v4, v14
 
-    if-gtz v16, :cond_3
+    if-gtz v16, :cond_4
 
     add-long v14, v4, v11
 
@@ -573,25 +575,25 @@
 
     move-wide v14, v4
 
-    goto :goto_3
+    goto :goto_2
 
-    :cond_3
+    :cond_4
     const v10, 0xdfff
 
     const v14, 0xd800
 
-    if-lt v13, v14, :cond_4
+    if-lt v13, v14, :cond_5
 
-    if-ge v10, v13, :cond_5
+    if-ge v10, v13, :cond_6
 
-    :cond_4
-    const-wide/16 v15, 0x3
+    :cond_5
+    const-wide/16 v17, 0x3
 
-    sub-long v15, v6, v15
+    sub-long v17, v6, v17
 
-    cmp-long v17, v4, v15
+    cmp-long v15, v4, v17
 
-    if-gtz v17, :cond_5
+    if-gtz v15, :cond_6
 
     add-long v14, v4, v11
 
@@ -619,7 +621,7 @@
 
     const-wide/16 v14, 0x1
 
-    add-long v18, v4, v14
+    add-long v19, v4, v14
 
     and-int/lit8 v10, v13, 0x3f
 
@@ -629,24 +631,24 @@
 
     invoke-static {v4, v5, v10}, Lcom/google/android/gms/internal/clearcut/eb;->a(JB)V
 
-    move-wide/from16 v14, v18
+    move-wide/from16 v14, v19
 
     const-wide/16 v4, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
-    :cond_5
+    :cond_6
     const-wide/16 v11, 0x4
 
     sub-long v11, v6, v11
 
     cmp-long v15, v4, v11
 
-    if-gtz v15, :cond_8
+    if-gtz v15, :cond_9
 
     add-int/lit8 v10, v9, 0x1
 
-    if-eq v10, v8, :cond_7
+    if-eq v10, v8, :cond_8
 
     invoke-interface {v0, v10}, Ljava/lang/CharSequence;->charAt(I)C
 
@@ -656,7 +658,7 @@
 
     move-result v11
 
-    if-eqz v11, :cond_6
+    if-eqz v11, :cond_7
 
     invoke-static {v13, v9}, Ljava/lang/Character;->toCodePoint(CC)I
 
@@ -718,7 +720,7 @@
 
     move-wide v14, v12
 
-    :goto_5
+    :goto_4
     add-int/lit8 v9, v9, 0x1
 
     move-wide v11, v4
@@ -727,12 +729,12 @@
 
     const/16 v10, 0x80
 
-    goto/16 :goto_2
-
-    :cond_6
-    move v9, v10
+    goto/16 :goto_1
 
     :cond_7
+    move v9, v10
+
+    :cond_8
     new-instance v0, Lcom/google/android/gms/internal/clearcut/eg;
 
     add-int/lit8 v9, v9, -0x1
@@ -741,14 +743,14 @@
 
     throw v0
 
-    :cond_8
-    if-gt v14, v13, :cond_a
+    :cond_9
+    if-gt v14, v13, :cond_b
 
-    if-gt v13, v10, :cond_a
+    if-gt v13, v10, :cond_b
 
     add-int/lit8 v1, v9, 0x1
 
-    if-eq v1, v8, :cond_9
+    if-eq v1, v8, :cond_a
 
     invoke-interface {v0, v1}, Ljava/lang/CharSequence;->charAt(I)C
 
@@ -758,16 +760,16 @@
 
     move-result v0
 
-    if-nez v0, :cond_a
+    if-nez v0, :cond_b
 
-    :cond_9
+    :cond_a
     new-instance v0, Lcom/google/android/gms/internal/clearcut/eg;
 
     invoke-direct {v0, v9, v8}, Lcom/google/android/gms/internal/clearcut/eg;-><init>(II)V
 
     throw v0
 
-    :cond_a
+    :cond_b
     new-instance v0, Ljava/lang/ArrayIndexOutOfBoundsException;
 
     const/16 v1, 0x2e
@@ -796,11 +798,6 @@
 
     throw v0
 
-    :cond_b
-    const/4 v0, 0x0
-
-    goto/16 :goto_1
-
     :cond_c
     new-instance v2, Ljava/lang/ArrayIndexOutOfBoundsException;
 
@@ -839,6 +836,8 @@
     invoke-direct {v2, v0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v2
+
+    return-void
 .end method
 
 .method final g([BII)I
@@ -1021,8 +1020,6 @@
     if-ge v4, v5, :cond_e
 
     :cond_d
-    const/4 p3, 0x0
-
     add-long v4, v10, v6
 
     invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/clearcut/eb;->a([BJ)B
@@ -1119,4 +1116,6 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/eo.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/eo.smali
index 153e9a4487..c2b3198048 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/eo.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/eo.smali
@@ -488,7 +488,7 @@
     .end annotation
 .end method
 
-.method public abstract mq()I
+.method public abstract mp()I
 .end method
 
 .method public abstract n(ILjava/util/List;Z)V
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ep.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ep.smali
index 8e6da47a00..01905feaec 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ep.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ep.smali
@@ -193,7 +193,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/ew;->nj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/ew;->ni()I
 
     move-result p1
 
@@ -386,6 +386,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private final bQ(I)V
@@ -1063,6 +1065,8 @@
     invoke-direct {p0}, Ljava/nio/ReadOnlyBufferException;-><init>()V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static f(IJ)I
@@ -1168,7 +1172,7 @@
 
     if-gez p1, :cond_0
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/clearcut/ew;->nj()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/clearcut/ew;->ni()I
 
     :cond_0
     iget p1, p2, Lcom/google/android/gms/internal/clearcut/ew;->aoy:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/er.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/er.smali
index b496707a78..9c764631a3 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/er.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/er.smali
@@ -58,7 +58,7 @@
 
     aget-object v0, v0, p1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/eu;->oD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/eu;->oC()V
 
     add-int/lit8 p1, p1, 0x1
 
@@ -76,14 +76,56 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/er;->oB()Lcom/google/android/gms/internal/clearcut/er;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()Lcom/google/android/gms/internal/clearcut/er;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected oA()I
+.method public oA()Lcom/google/android/gms/internal/clearcut/er;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TM;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/ew;->oB()Lcom/google/android/gms/internal/clearcut/ew;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/er;
+
+    invoke-static {p0, v0}, Lcom/google/android/gms/internal/clearcut/ev;->a(Lcom/google/android/gms/internal/clearcut/er;Lcom/google/android/gms/internal/clearcut/er;)V
+
+    return-object v0
+.end method
+
+.method public synthetic oB()Lcom/google/android/gms/internal/clearcut/ew;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/er;
+
+    return-object v0
+.end method
+
+.method protected oz()I
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/er;->aoq:Lcom/google/android/gms/internal/clearcut/et;
@@ -107,7 +149,7 @@
 
     aget-object v2, v2, v0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/eu;->oA()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/eu;->oz()I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -116,45 +158,3 @@
     :cond_0
     return v1
 .end method
-
-.method public oB()Lcom/google/android/gms/internal/clearcut/er;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TM;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/ew;->oC()Lcom/google/android/gms/internal/clearcut/ew;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/er;
-
-    invoke-static {p0, v0}, Lcom/google/android/gms/internal/clearcut/ev;->a(Lcom/google/android/gms/internal/clearcut/er;Lcom/google/android/gms/internal/clearcut/er;)V
-
-    return-object v0
-.end method
-
-.method public synthetic oC()Lcom/google/android/gms/internal/clearcut/ew;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/er;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/et.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/et.smali
index 5bb9ae981f..44558c491c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/et.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/et.smali
@@ -125,23 +125,21 @@
 
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/et;->aou:[Lcom/google/android/gms/internal/clearcut/eu;
 
+    aget-object v3, v2, v4
+
+    if-eqz v3, :cond_0
+
+    iget-object v3, v1, Lcom/google/android/gms/internal/clearcut/et;->aou:[Lcom/google/android/gms/internal/clearcut/eu;
+
     aget-object v2, v2, v4
 
-    if-eqz v2, :cond_0
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/eu;->clone()Ljava/lang/Object;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/clearcut/et;->aou:[Lcom/google/android/gms/internal/clearcut/eu;
+    move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/et;->aou:[Lcom/google/android/gms/internal/clearcut/eu;
+    check-cast v2, Lcom/google/android/gms/internal/clearcut/eu;
 
-    aget-object v3, v3, v4
-
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/eu;->clone()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/google/android/gms/internal/clearcut/eu;
-
-    aput-object v3, v2, v4
+    aput-object v2, v3, v4
 
     :cond_0
     add-int/lit8 v4, v4, 0x1
@@ -184,20 +182,18 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/et;->aot:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/et;->aot:[I
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/et;->aot:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/clearcut/et;->mSize:I
+    iget-object v4, p1, Lcom/google/android/gms/internal/clearcut/et;->aot:[I
 
     const/4 v5, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_4
+    if-ge v5, v1, :cond_4
 
-    aget v6, v1, v5
+    aget v6, v3, v5
 
-    aget v7, v3, v5
+    aget v7, v4, v5
 
     if-eq v6, v7, :cond_3
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/eu.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/eu.smali
index 9fef5a7a85..1fd1301149 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/eu.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/eu.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method private final oE()Lcom/google/android/gms/internal/clearcut/eu;
+.method private final oD()Lcom/google/android/gms/internal/clearcut/eu;
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/eu;
@@ -288,6 +288,8 @@
     invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method private final toByteArray()[B
@@ -298,7 +300,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/eu;->oA()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/eu;->oz()I
 
     move-result v0
 
@@ -308,7 +310,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/clearcut/ep;->j([BI)Lcom/google/android/gms/internal/clearcut/ep;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/eu;->oD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/eu;->oC()V
 
     return-object v0
 .end method
@@ -323,7 +325,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/eu;->oE()Lcom/google/android/gms/internal/clearcut/eu;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/eu;->oD()Lcom/google/android/gms/internal/clearcut/eu;
 
     move-result-object v0
 
@@ -368,8 +370,6 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->aov:Lcom/google/android/gms/internal/clearcut/es;
-
     iget-object v0, v0, Lcom/google/android/gms/internal/clearcut/es;->aor:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Class;->isArray()Z
@@ -391,11 +391,9 @@
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, [B
+    instance-of v1, v0, [B
 
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_4
 
     check-cast v0, [B
 
@@ -410,13 +408,9 @@
     return p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    instance-of v1, v0, [I
 
-    instance-of v0, v0, [I
-
-    if-eqz v0, :cond_5
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_5
 
     check-cast v0, [I
 
@@ -431,13 +425,9 @@
     return p1
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    instance-of v1, v0, [J
 
-    instance-of v0, v0, [J
-
-    if-eqz v0, :cond_6
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_6
 
     check-cast v0, [J
 
@@ -452,13 +442,9 @@
     return p1
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    instance-of v1, v0, [F
 
-    instance-of v0, v0, [F
-
-    if-eqz v0, :cond_7
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_7
 
     check-cast v0, [F
 
@@ -473,13 +459,9 @@
     return p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    instance-of v1, v0, [D
 
-    instance-of v0, v0, [D
-
-    if-eqz v0, :cond_8
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_8
 
     check-cast v0, [D
 
@@ -494,13 +476,9 @@
     return p1
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    instance-of v1, v0, [Z
 
-    instance-of v0, v0, [Z
-
-    if-eqz v0, :cond_9
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_9
 
     check-cast v0, [Z
 
@@ -515,8 +493,6 @@
     return p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
-
     check-cast v0, [Ljava/lang/Object;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
@@ -534,15 +510,11 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/clearcut/eu;->aow:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/internal/clearcut/eu;->aow:Ljava/util/List;
 
-    if-eqz v0, :cond_b
+    if-eqz v1, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->aow:Ljava/util/List;
-
-    iget-object p1, p1, Lcom/google/android/gms/internal/clearcut/eu;->aow:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
+    invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -604,47 +576,7 @@
     throw v1
 .end method
 
-.method final oA()I
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->aow:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_0
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    new-instance v0, Ljava/lang/NoSuchMethodError;
-
-    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
-
-    throw v0
-
-    :cond_1
-    new-instance v0, Ljava/lang/NoSuchMethodError;
-
-    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
-
-    throw v0
-.end method
-
-.method final oD()V
+.method final oC()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -686,3 +618,43 @@
 
     throw v0
 .end method
+
+.method final oz()I
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->value:Ljava/lang/Object;
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/eu;->aow:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    new-instance v0, Ljava/lang/NoSuchMethodError;
+
+    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
+
+    throw v0
+
+    :cond_1
+    new-instance v0, Ljava/lang/NoSuchMethodError;
+
+    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
+
+    throw v0
+.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ew.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ew.smali
index f4e6a3ad1a..c74ff90a8a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ew.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ew.smali
@@ -105,17 +105,17 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->oC()Lcom/google/android/gms/internal/clearcut/ew;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->oB()Lcom/google/android/gms/internal/clearcut/ew;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final nj()I
+.method public final ni()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->oA()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->oz()I
 
     move-result v0
 
@@ -124,15 +124,7 @@
     return v0
 .end method
 
-.method protected oA()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public oC()Lcom/google/android/gms/internal/clearcut/ew;
+.method public oB()Lcom/google/android/gms/internal/clearcut/ew;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -149,6 +141,14 @@
     return-object v0
 .end method
 
+.method protected oz()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
 .method public toString()Ljava/lang/String;
     .locals 1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ex.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ex.smali
index 4dda7d8854..6c88a95241 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ex.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ex.smali
@@ -31,6 +31,16 @@
     throw p1
 .end method
 
+.method public final oE()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
 .method public final oF()V
     .locals 1
 
@@ -100,13 +110,3 @@
 
     throw v0
 .end method
-
-.method public final oM()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/com/google/android/gms/internal/clearcut/f.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/f.smali
index 2672c3c125..c6019ec0d7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/f.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/f.smali
@@ -26,14 +26,14 @@
 
 
 # virtual methods
-.method public final mA()Ljava/lang/Object;
+.method public final mz()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/f;->aio:Lcom/google/android/gms/internal/clearcut/e;
 
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/f;->aip:Lcom/google/android/gms/internal/clearcut/c;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/c;->mv()Ljava/util/Map;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/c;->mu()Ljava/util/Map;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fa$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fa$a.smali
index a98245cf7b..fed1b70df5 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fa$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fa$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fa;->oO()Lcom/google/android/gms/internal/clearcut/fa;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fa;->oN()Lcom/google/android/gms/internal/clearcut/fa;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fa.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fa.smali
index 192feb3fd7..8f5496b751 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fa.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fa.smali
@@ -72,7 +72,7 @@
     return-void
 .end method
 
-.method public static oN()Lcom/google/android/gms/internal/clearcut/fa;
+.method public static oM()Lcom/google/android/gms/internal/clearcut/fa;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fa;->zzsg:Lcom/google/android/gms/internal/clearcut/fa;
@@ -80,7 +80,7 @@
     return-object v0
 .end method
 
-.method static synthetic oO()Lcom/google/android/gms/internal/clearcut/fa;
+.method static synthetic oN()Lcom/google/android/gms/internal/clearcut/fa;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fa;->zzsg:Lcom/google/android/gms/internal/clearcut/fa;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fb.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fb.smali
index 8cb8ba0bd3..1b5d7013b0 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fb.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fb.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a$a.smali
index 1e6d98b67d..51adbe9fc8 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$a;->oP()Lcom/google/android/gms/internal/clearcut/fc$a;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$a;->oO()Lcom/google/android/gms/internal/clearcut/fc$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a.smali
index bbb3729cf1..354624c386 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$a.smali
@@ -98,31 +98,31 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/bf;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$a;->zzsh:Lcom/google/android/gms/internal/clearcut/bm;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$a;->zzsi:Lcom/google/android/gms/internal/clearcut/bm;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bg;->nt()Lcom/google/android/gms/internal/clearcut/bg;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bg;->ns()Lcom/google/android/gms/internal/clearcut/bg;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$a;->zzsj:Lcom/google/android/gms/internal/clearcut/bk;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ca;->nF()Lcom/google/android/gms/internal/clearcut/ca;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ca;->nE()Lcom/google/android/gms/internal/clearcut/ca;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$a;->zzsk:Lcom/google/android/gms/internal/clearcut/bl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ca;->nF()Lcom/google/android/gms/internal/clearcut/ca;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ca;->nE()Lcom/google/android/gms/internal/clearcut/ca;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
     return-void
 .end method
 
-.method static synthetic oP()Lcom/google/android/gms/internal/clearcut/fc$a;
+.method static synthetic oO()Lcom/google/android/gms/internal/clearcut/fc$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$a;->zzsm:Lcom/google/android/gms/internal/clearcut/fc$a;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b$a.smali
index 2dab7a90a1..93c3c71bac 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$b;->oQ()Lcom/google/android/gms/internal/clearcut/fc$b;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$b;->oP()Lcom/google/android/gms/internal/clearcut/fc$b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b.smali
index d368224f1a..33388a500e 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$b.smali
@@ -218,7 +218,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$b;->zzto:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
@@ -227,7 +227,7 @@
     return-void
 .end method
 
-.method static synthetic oQ()Lcom/google/android/gms/internal/clearcut/fc$b;
+.method static synthetic oP()Lcom/google/android/gms/internal/clearcut/fc$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$b;->zztq:Lcom/google/android/gms/internal/clearcut/fc$b;
@@ -470,7 +470,7 @@
 
     const/16 p2, 0x17
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fr$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fr$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c$a.smali
index 00363cb7f3..9891b58632 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$c;->oR()Lcom/google/android/gms/internal/clearcut/fc$c;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$c;->oQ()Lcom/google/android/gms/internal/clearcut/fc$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c.smali
index 6813875a1b..ce619cff2c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$c.smali
@@ -81,7 +81,7 @@
     return-void
 .end method
 
-.method static synthetic oR()Lcom/google/android/gms/internal/clearcut/fc$c;
+.method static synthetic oQ()Lcom/google/android/gms/internal/clearcut/fc$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$c;->zztt:Lcom/google/android/gms/internal/clearcut/fc$c;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d$a.smali
index 636c57dc9c..6127f49323 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$d;->oS()Lcom/google/android/gms/internal/clearcut/fc$d;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$d;->oR()Lcom/google/android/gms/internal/clearcut/fc$d;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d.smali
index 9829a3fb66..b7194883dd 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$d.smali
@@ -91,7 +91,7 @@
     return-void
 .end method
 
-.method static synthetic oS()Lcom/google/android/gms/internal/clearcut/fc$d;
+.method static synthetic oR()Lcom/google/android/gms/internal/clearcut/fc$d;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$d;->zztx:Lcom/google/android/gms/internal/clearcut/fc$d;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$a.smali
index 4c77b9866c..34b5549c73 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$e;->oT()Lcom/google/android/gms/internal/clearcut/fc$e;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$e;->oS()Lcom/google/android/gms/internal/clearcut/fc$e;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$b.smali
index 8e413c6bc6..d1291aa286 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e$b.smali
@@ -201,7 +201,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -233,7 +233,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$e$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e.smali
index db3926c545..8a8147b618 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$e.smali
@@ -92,7 +92,7 @@
     return-void
 .end method
 
-.method static synthetic oT()Lcom/google/android/gms/internal/clearcut/fc$e;
+.method static synthetic oS()Lcom/google/android/gms/internal/clearcut/fc$e;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$e;->zzub:Lcom/google/android/gms/internal/clearcut/fc$e;
@@ -195,7 +195,7 @@
 
     const/4 p2, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$e$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$e$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f$a.smali
index a2aa4d293d..dde7464913 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$f;->oU()Lcom/google/android/gms/internal/clearcut/fc$f;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$f;->oT()Lcom/google/android/gms/internal/clearcut/fc$f;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f.smali
index c72de1ef5e..cbf53d424b 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$f.smali
@@ -101,7 +101,7 @@
     return-void
 .end method
 
-.method static synthetic oU()Lcom/google/android/gms/internal/clearcut/fc$f;
+.method static synthetic oT()Lcom/google/android/gms/internal/clearcut/fc$f;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$f;->zzul:Lcom/google/android/gms/internal/clearcut/fc$f;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$a.smali
index 4b3b674a7c..350d6be2fc 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$g;->oV()Lcom/google/android/gms/internal/clearcut/fc$g;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$g;->oU()Lcom/google/android/gms/internal/clearcut/fc$g;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$b.smali
index 6845bd1a3f..5eb3ebb2a6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g$b.smali
@@ -479,7 +479,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -511,7 +511,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$g$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g.smali
index 492de96a84..1c545ad395 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$g.smali
@@ -110,7 +110,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/clearcut/bf;->a(Ljava/lang/Class;Lcom/google/android/gms/internal/clearcut/bf;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fa;->oN()Lcom/google/android/gms/internal/clearcut/fa;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fa;->oM()Lcom/google/android/gms/internal/clearcut/fa;
 
     move-result-object v0
 
@@ -151,7 +151,7 @@
     return-void
 .end method
 
-.method static synthetic oV()Lcom/google/android/gms/internal/clearcut/fc$g;
+.method static synthetic oU()Lcom/google/android/gms/internal/clearcut/fc$g;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$g;->zzva:Lcom/google/android/gms/internal/clearcut/fc$g;
@@ -268,7 +268,7 @@
 
     const/4 p2, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$g$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$g$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h$a.smali
index 963c4c432d..cac7968a1d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$h;->oW()Lcom/google/android/gms/internal/clearcut/fc$h;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$h;->oV()Lcom/google/android/gms/internal/clearcut/fc$h;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h.smali
index f4994a03de..b15bc956af 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$h.smali
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method static synthetic oW()Lcom/google/android/gms/internal/clearcut/fc$h;
+.method static synthetic oV()Lcom/google/android/gms/internal/clearcut/fc$h;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$h;->zzvx:Lcom/google/android/gms/internal/clearcut/fc$h;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i$a.smali
index bc3c8fb820..a10929ed99 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$i;->oX()Lcom/google/android/gms/internal/clearcut/fc$i;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$i;->oW()Lcom/google/android/gms/internal/clearcut/fc$i;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i.smali
index 13ee4e9f26..e2f9fa04b6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$i.smali
@@ -123,7 +123,7 @@
     return-void
 .end method
 
-.method static synthetic oX()Lcom/google/android/gms/internal/clearcut/fc$i;
+.method static synthetic oW()Lcom/google/android/gms/internal/clearcut/fc$i;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$i;->zzwe:Lcom/google/android/gms/internal/clearcut/fc$i;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$a.smali
index a34a7b5ae2..4d2dea521d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$a.smali
@@ -157,7 +157,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -189,7 +189,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$j$a;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$b.smali
index 80844ccbac..ed88f5b647 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j$b.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$j;->oY()Lcom/google/android/gms/internal/clearcut/fc$j;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$j;->oX()Lcom/google/android/gms/internal/clearcut/fc$j;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j.smali
index 526b44b4d7..10267de274 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$j.smali
@@ -86,7 +86,7 @@
     return-void
 .end method
 
-.method static synthetic oY()Lcom/google/android/gms/internal/clearcut/fc$j;
+.method static synthetic oX()Lcom/google/android/gms/internal/clearcut/fc$j;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$j;->zzwj:Lcom/google/android/gms/internal/clearcut/fc$j;
@@ -201,7 +201,7 @@
 
     const/4 p2, 0x4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$j$a;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$j$a;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k$a.smali
index 487cf56639..21eaeb7de7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$k;->oZ()Lcom/google/android/gms/internal/clearcut/fc$k;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$k;->oY()Lcom/google/android/gms/internal/clearcut/fc$k;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k.smali
index 4cfa9846bf..74e0102dbf 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$k.smali
@@ -98,7 +98,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$k;->zzwp:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
@@ -107,7 +107,7 @@
     return-void
 .end method
 
-.method static synthetic oZ()Lcom/google/android/gms/internal/clearcut/fc$k;
+.method static synthetic oY()Lcom/google/android/gms/internal/clearcut/fc$k;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$k;->zzws:Lcom/google/android/gms/internal/clearcut/fc$k;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l$a.smali
index cde1741b7f..ea22c91ff3 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$l;->pa()Lcom/google/android/gms/internal/clearcut/fc$l;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$l;->oZ()Lcom/google/android/gms/internal/clearcut/fc$l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l.smali
index 33256cb946..8144667f43 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$l.smali
@@ -87,7 +87,7 @@
     return-void
 .end method
 
-.method static synthetic pa()Lcom/google/android/gms/internal/clearcut/fc$l;
+.method static synthetic oZ()Lcom/google/android/gms/internal/clearcut/fc$l;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$l;->zzww:Lcom/google/android/gms/internal/clearcut/fc$l;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m$a.smali
index cbf9b3ff51..c9fc40cd27 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$m;->pb()Lcom/google/android/gms/internal/clearcut/fc$m;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$m;->pa()Lcom/google/android/gms/internal/clearcut/fc$m;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m.smali
index ab15206edb..42b9dc3880 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$m.smali
@@ -141,7 +141,7 @@
     return-void
 .end method
 
-.method static synthetic pb()Lcom/google/android/gms/internal/clearcut/fc$m;
+.method static synthetic pa()Lcom/google/android/gms/internal/clearcut/fc$m;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$m;->zzxa:Lcom/google/android/gms/internal/clearcut/fc$m;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$a.smali
index 9646d18189..b1bc5dcb33 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$n;->pc()Lcom/google/android/gms/internal/clearcut/fc$n;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$n;->pb()Lcom/google/android/gms/internal/clearcut/fc$n;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$b.smali
index de250505e2..3f4e6c8628 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$b.smali
@@ -201,7 +201,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -233,7 +233,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$n$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$c.smali
index 04bea8c19e..8e096b06f9 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n$c.smali
@@ -313,7 +313,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -345,7 +345,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$n$c;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n.smali
index 2eea2ae6d8..88cc872030 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$n.smali
@@ -113,7 +113,7 @@
     return-void
 .end method
 
-.method static synthetic pc()Lcom/google/android/gms/internal/clearcut/fc$n;
+.method static synthetic pb()Lcom/google/android/gms/internal/clearcut/fc$n;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$n;->zzxe:Lcom/google/android/gms/internal/clearcut/fc$n;
@@ -228,7 +228,7 @@
 
     const/4 p2, 0x4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$n$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$n$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -254,7 +254,7 @@
 
     const/16 p2, 0x8
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$n$c;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$n$c;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$a.smali
index 65632c9685..4eb9ae6776 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$o;->pd()Lcom/google/android/gms/internal/clearcut/fc$o;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$o;->pc()Lcom/google/android/gms/internal/clearcut/fc$o;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$b.smali
index e2032a4f15..0e5426adae 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o$b.smali
@@ -157,7 +157,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -189,7 +189,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$o$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o.smali
index 2bfd8e8835..bfc1181e6b 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$o.smali
@@ -147,7 +147,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$o;->zzyb:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
@@ -185,7 +185,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$o;->zzyp:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bg;->nt()Lcom/google/android/gms/internal/clearcut/bg;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bg;->ns()Lcom/google/android/gms/internal/clearcut/bg;
 
     move-result-object v0
 
@@ -194,7 +194,7 @@
     return-void
 .end method
 
-.method static synthetic pd()Lcom/google/android/gms/internal/clearcut/fc$o;
+.method static synthetic pc()Lcom/google/android/gms/internal/clearcut/fc$o;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$o;->zzyv:Lcom/google/android/gms/internal/clearcut/fc$o;
@@ -419,7 +419,7 @@
 
     const/16 p2, 0x14
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$o$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$o$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p$a.smali
index fb0e140ab8..d0e73a8d8d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$p;->pe()Lcom/google/android/gms/internal/clearcut/fc$p;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$p;->pd()Lcom/google/android/gms/internal/clearcut/fc$p;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p.smali
index 622447a377..cd91d80bdc 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$p.smali
@@ -89,7 +89,7 @@
     return-void
 .end method
 
-.method static synthetic pe()Lcom/google/android/gms/internal/clearcut/fc$p;
+.method static synthetic pd()Lcom/google/android/gms/internal/clearcut/fc$p;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$p;->zzzc:Lcom/google/android/gms/internal/clearcut/fc$p;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$a.smali
index c0eba51ef5..c6d406f67f 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q;->pf()Lcom/google/android/gms/internal/clearcut/fc$q;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q;->pe()Lcom/google/android/gms/internal/clearcut/fc$q;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$b.smali
index fab3c98098..6dd0435926 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$b.smali
@@ -12325,3753 +12325,3741 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v2, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb2
+    const/16 v4, 0xb2
 
-    aput-object v1, v0, v2
+    aput-object v2, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v4, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb3
+    const/16 v5, 0xb3
 
-    aput-object v1, v0, v2
+    aput-object v4, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ath:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v5, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ath:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb4
+    const/16 v6, 0xb4
 
-    aput-object v1, v0, v2
+    aput-object v5, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ati:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ati:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb5
+    const/16 v7, 0xb5
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb6
+    const/16 v7, 0xb6
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb7
+    const/16 v7, 0xb7
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb8
+    const/16 v7, 0xb8
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xb9
+    const/16 v7, 0xb9
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xba
+    const/16 v7, 0xba
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ato:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ato:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xbb
+    const/16 v7, 0xbb
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xbc
+    const/16 v7, 0xbc
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xbd
+    const/16 v7, 0xbd
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xbe
+    const/16 v7, 0xbe
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ats:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ats:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xbf
+    const/16 v7, 0xbf
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->att:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->att:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc0
+    const/16 v7, 0xc0
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc1
+    const/16 v7, 0xc1
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc2
+    const/16 v7, 0xc2
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc3
+    const/16 v7, 0xc3
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc4
+    const/16 v7, 0xc4
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aty:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aty:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc5
+    const/16 v7, 0xc5
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc6
+    const/16 v7, 0xc6
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc7
+    const/16 v7, 0xc7
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc8
+    const/16 v7, 0xc8
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xc9
+    const/16 v7, 0xc9
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xca
+    const/16 v7, 0xca
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xcb
+    const/16 v7, 0xcb
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xcc
+    const/16 v7, 0xcc
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xcd
+    const/16 v7, 0xcd
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xce
+    const/16 v7, 0xce
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xcf
+    const/16 v7, 0xcf
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd0
+    const/16 v7, 0xd0
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd1
+    const/16 v7, 0xd1
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd2
+    const/16 v7, 0xd2
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd3
+    const/16 v7, 0xd3
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd4
+    const/16 v7, 0xd4
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd5
+    const/16 v7, 0xd5
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd6
+    const/16 v7, 0xd6
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd7
+    const/16 v7, 0xd7
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd8
+    const/16 v7, 0xd8
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xd9
+    const/16 v7, 0xd9
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xda
+    const/16 v7, 0xda
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xdb
+    const/16 v7, 0xdb
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xdc
+    const/16 v7, 0xdc
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xdd
+    const/16 v7, 0xdd
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xde
+    const/16 v7, 0xde
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xdf
+    const/16 v7, 0xdf
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe0
+    const/16 v7, 0xe0
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aua:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aua:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe1
+    const/16 v7, 0xe1
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aub:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aub:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe2
+    const/16 v7, 0xe2
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe3
+    const/16 v7, 0xe3
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aud:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aud:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe4
+    const/16 v7, 0xe4
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aue:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aue:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe5
+    const/16 v7, 0xe5
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe6
+    const/16 v7, 0xe6
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aug:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aug:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe7
+    const/16 v7, 0xe7
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe8
+    const/16 v7, 0xe8
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aui:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aui:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xe9
+    const/16 v7, 0xe9
 
-    aput-object v1, v0, v2
+    aput-object v6, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xea
+    const/16 v8, 0xea
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xeb
+    const/16 v8, 0xeb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aul:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aul:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xec
+    const/16 v8, 0xec
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aum:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aum:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xed
+    const/16 v8, 0xed
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aun:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aun:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xee
+    const/16 v8, 0xee
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xef
+    const/16 v8, 0xef
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aup:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aup:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf0
+    const/16 v8, 0xf0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf1
+    const/16 v8, 0xf1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aur:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aur:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf2
+    const/16 v8, 0xf2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aus:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aus:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf3
+    const/16 v8, 0xf3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aut:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aut:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf4
+    const/16 v8, 0xf4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf5
+    const/16 v8, 0xf5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf6
+    const/16 v8, 0xf6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf7
+    const/16 v8, 0xf7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aux:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aux:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf8
+    const/16 v8, 0xf8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xf9
+    const/16 v8, 0xf9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xfa
+    const/16 v8, 0xfa
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xfb
+    const/16 v8, 0xfb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xfc
+    const/16 v8, 0xfc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xfd
+    const/16 v8, 0xfd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xfe
+    const/16 v8, 0xfe
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0xff
+    const/16 v8, 0xff
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x100
+    const/16 v8, 0x100
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x101
+    const/16 v8, 0x101
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x102
+    const/16 v8, 0x102
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x103
+    const/16 v8, 0x103
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x104
+    const/16 v8, 0x104
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    aput-object v1, v0, v10
+    aput-object v7, v0, v10
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x106
+    const/16 v8, 0x106
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x107
+    const/16 v8, 0x107
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x108
+    const/16 v8, 0x108
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x109
+    const/16 v8, 0x109
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x10a
+    const/16 v8, 0x10a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x10b
+    const/16 v8, 0x10b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x10c
+    const/16 v8, 0x10c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x10d
+    const/16 v8, 0x10d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x10e
+    const/16 v8, 0x10e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x10f
+    const/16 v8, 0x10f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x110
+    const/16 v8, 0x110
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x111
+    const/16 v8, 0x111
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x112
+    const/16 v8, 0x112
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x113
+    const/16 v8, 0x113
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->auZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x114
+    const/16 v8, 0x114
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ava:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ava:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x115
+    const/16 v8, 0x115
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x116
+    const/16 v8, 0x116
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x117
+    const/16 v8, 0x117
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x118
+    const/16 v8, 0x118
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ave:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ave:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x119
+    const/16 v8, 0x119
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x11a
+    const/16 v8, 0x11a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x11b
+    const/16 v8, 0x11b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x11c
+    const/16 v8, 0x11c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x11d
+    const/16 v8, 0x11d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x11e
+    const/16 v8, 0x11e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x11f
+    const/16 v8, 0x11f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x120
+    const/16 v8, 0x120
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x121
+    const/16 v8, 0x121
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x122
+    const/16 v8, 0x122
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x123
+    const/16 v8, 0x123
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x124
+    const/16 v8, 0x124
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x125
+    const/16 v8, 0x125
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x126
+    const/16 v8, 0x126
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x127
+    const/16 v8, 0x127
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x128
+    const/16 v8, 0x128
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x129
+    const/16 v8, 0x129
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x12a
+    const/16 v8, 0x12a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x12b
+    const/16 v8, 0x12b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x12c
+    const/16 v8, 0x12c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x12d
+    const/16 v8, 0x12d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x12e
+    const/16 v8, 0x12e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x12f
+    const/16 v8, 0x12f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x130
+    const/16 v8, 0x130
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x131
+    const/16 v8, 0x131
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x132
+    const/16 v8, 0x132
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x133
+    const/16 v8, 0x133
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x134
+    const/16 v8, 0x134
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x135
+    const/16 v8, 0x135
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x136
+    const/16 v8, 0x136
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x137
+    const/16 v8, 0x137
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x138
+    const/16 v8, 0x138
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x139
+    const/16 v8, 0x139
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x13a
+    const/16 v8, 0x13a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x13b
+    const/16 v8, 0x13b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x13c
+    const/16 v8, 0x13c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x13d
+    const/16 v8, 0x13d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x13e
+    const/16 v8, 0x13e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x13f
+    const/16 v8, 0x13f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x140
+    const/16 v8, 0x140
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x141
+    const/16 v8, 0x141
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x142
+    const/16 v8, 0x142
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x143
+    const/16 v8, 0x143
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x144
+    const/16 v8, 0x144
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x145
+    const/16 v8, 0x145
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x146
+    const/16 v8, 0x146
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x147
+    const/16 v8, 0x147
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->avZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x148
+    const/16 v8, 0x148
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x149
+    const/16 v8, 0x149
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x14a
+    const/16 v8, 0x14a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x14b
+    const/16 v8, 0x14b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x14c
+    const/16 v8, 0x14c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x14d
+    const/16 v8, 0x14d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x14e
+    const/16 v8, 0x14e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x14f
+    const/16 v8, 0x14f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x150
+    const/16 v8, 0x150
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x151
+    const/16 v8, 0x151
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x152
+    const/16 v8, 0x152
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x153
+    const/16 v8, 0x153
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x154
+    const/16 v8, 0x154
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x155
+    const/16 v8, 0x155
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x156
+    const/16 v8, 0x156
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x157
+    const/16 v8, 0x157
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x158
+    const/16 v8, 0x158
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x159
+    const/16 v8, 0x159
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x15a
+    const/16 v8, 0x15a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aws:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aws:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x15b
+    const/16 v8, 0x15b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x15c
+    const/16 v8, 0x15c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x15d
+    const/16 v8, 0x15d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x15e
+    const/16 v8, 0x15e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aww:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aww:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x15f
+    const/16 v8, 0x15f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x160
+    const/16 v8, 0x160
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x161
+    const/16 v8, 0x161
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x162
+    const/16 v8, 0x162
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x163
+    const/16 v8, 0x163
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x164
+    const/16 v8, 0x164
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    aput-object v1, v0, v3
+    aput-object v7, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x166
+    const/16 v7, 0x166
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x167
+    const/16 v7, 0x167
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x168
+    const/16 v7, 0x168
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x169
+    const/16 v7, 0x169
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x16a
+    const/16 v7, 0x16a
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x16b
+    const/16 v7, 0x16b
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x16c
+    const/16 v7, 0x16c
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x16d
+    const/16 v7, 0x16d
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x16e
+    const/16 v7, 0x16e
 
-    aput-object v1, v0, v2
+    aput-object v3, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x16f
+    const/16 v8, 0x16f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x170
+    const/16 v8, 0x170
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x171
+    const/16 v8, 0x171
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x172
+    const/16 v8, 0x172
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x173
+    const/16 v8, 0x173
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x174
+    const/16 v8, 0x174
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x175
+    const/16 v8, 0x175
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x176
+    const/16 v8, 0x176
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x177
+    const/16 v8, 0x177
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x178
+    const/16 v8, 0x178
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x179
+    const/16 v8, 0x179
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x17a
+    const/16 v8, 0x17a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x17b
+    const/16 v8, 0x17b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x17c
+    const/16 v8, 0x17c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x17d
+    const/16 v8, 0x17d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x17e
+    const/16 v8, 0x17e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x17f
+    const/16 v8, 0x17f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x180
+    const/16 v8, 0x180
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x181
+    const/16 v8, 0x181
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x182
+    const/16 v8, 0x182
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x183
+    const/16 v8, 0x183
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x184
+    const/16 v8, 0x184
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x185
+    const/16 v8, 0x185
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x186
+    const/16 v8, 0x186
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x187
+    const/16 v8, 0x187
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x188
+    const/16 v8, 0x188
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x189
+    const/16 v8, 0x189
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x18a
+    const/16 v8, 0x18a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x18b
+    const/16 v8, 0x18b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x18c
+    const/16 v8, 0x18c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x18d
+    const/16 v8, 0x18d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x18e
+    const/16 v8, 0x18e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x18f
+    const/16 v8, 0x18f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x190
+    const/16 v8, 0x190
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x191
+    const/16 v8, 0x191
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x192
+    const/16 v8, 0x192
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x193
+    const/16 v8, 0x193
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x194
+    const/16 v8, 0x194
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x195
+    const/16 v8, 0x195
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x196
+    const/16 v8, 0x196
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x197
+    const/16 v8, 0x197
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x198
+    const/16 v8, 0x198
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x199
+    const/16 v8, 0x199
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x19a
+    const/16 v8, 0x19a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x19b
+    const/16 v8, 0x19b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x19c
+    const/16 v8, 0x19c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x19d
+    const/16 v8, 0x19d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x19e
+    const/16 v8, 0x19e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x19f
+    const/16 v8, 0x19f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a0
+    const/16 v8, 0x1a0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a1
+    const/16 v8, 0x1a1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a2
+    const/16 v8, 0x1a2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a3
+    const/16 v8, 0x1a3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a4
+    const/16 v8, 0x1a4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a5
+    const/16 v8, 0x1a5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a6
+    const/16 v8, 0x1a6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a7
+    const/16 v8, 0x1a7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a8
+    const/16 v8, 0x1a8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1a9
+    const/16 v8, 0x1a9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1aa
+    const/16 v8, 0x1aa
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ab
+    const/16 v8, 0x1ab
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ac
+    const/16 v8, 0x1ac
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ad
+    const/16 v8, 0x1ad
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ae
+    const/16 v8, 0x1ae
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1af
+    const/16 v8, 0x1af
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->axZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b0
+    const/16 v8, 0x1b0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aya:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aya:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b1
+    const/16 v8, 0x1b1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b2
+    const/16 v8, 0x1b2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b3
+    const/16 v8, 0x1b3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b4
+    const/16 v8, 0x1b4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aye:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aye:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b5
+    const/16 v8, 0x1b5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b6
+    const/16 v8, 0x1b6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b7
+    const/16 v8, 0x1b7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b8
+    const/16 v8, 0x1b8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1b9
+    const/16 v8, 0x1b9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ba
+    const/16 v8, 0x1ba
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1bb
+    const/16 v8, 0x1bb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1bc
+    const/16 v8, 0x1bc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aym:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aym:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1bd
+    const/16 v8, 0x1bd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1be
+    const/16 v8, 0x1be
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1bf
+    const/16 v8, 0x1bf
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c0
+    const/16 v8, 0x1c0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c1
+    const/16 v8, 0x1c1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c2
+    const/16 v8, 0x1c2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ays:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ays:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c3
+    const/16 v8, 0x1c3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c4
+    const/16 v8, 0x1c4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c5
+    const/16 v8, 0x1c5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c6
+    const/16 v8, 0x1c6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c7
+    const/16 v8, 0x1c7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c8
+    const/16 v8, 0x1c8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1c9
+    const/16 v8, 0x1c9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ca
+    const/16 v8, 0x1ca
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1cb
+    const/16 v8, 0x1cb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1cc
+    const/16 v8, 0x1cc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1cd
+    const/16 v8, 0x1cd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ce
+    const/16 v8, 0x1ce
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1cf
+    const/16 v8, 0x1cf
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d0
+    const/16 v8, 0x1d0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d1
+    const/16 v8, 0x1d1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d2
+    const/16 v8, 0x1d2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d3
+    const/16 v8, 0x1d3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d4
+    const/16 v8, 0x1d4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d5
+    const/16 v8, 0x1d5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d6
+    const/16 v8, 0x1d6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d7
+    const/16 v8, 0x1d7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d8
+    const/16 v8, 0x1d8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1d9
+    const/16 v8, 0x1d9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1da
+    const/16 v8, 0x1da
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1db
+    const/16 v8, 0x1db
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1dc
+    const/16 v8, 0x1dc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1dd
+    const/16 v8, 0x1dd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1de
+    const/16 v8, 0x1de
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1df
+    const/16 v8, 0x1df
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e0
+    const/16 v8, 0x1e0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e1
+    const/16 v8, 0x1e1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e2
+    const/16 v8, 0x1e2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e3
+    const/16 v8, 0x1e3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ayZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e4
+    const/16 v8, 0x1e4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aza:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aza:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e5
+    const/16 v8, 0x1e5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e6
+    const/16 v8, 0x1e6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e7
+    const/16 v8, 0x1e7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e8
+    const/16 v8, 0x1e8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aze:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aze:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1e9
+    const/16 v8, 0x1e9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ea
+    const/16 v8, 0x1ea
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1eb
+    const/16 v8, 0x1eb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ec
+    const/16 v8, 0x1ec
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ed
+    const/16 v8, 0x1ed
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ee
+    const/16 v8, 0x1ee
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ef
+    const/16 v8, 0x1ef
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f0
+    const/16 v8, 0x1f0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f1
+    const/16 v8, 0x1f1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f2
+    const/16 v8, 0x1f2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f3
+    const/16 v8, 0x1f3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f4
+    const/16 v8, 0x1f4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f5
+    const/16 v8, 0x1f5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f6
+    const/16 v8, 0x1f6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f7
+    const/16 v8, 0x1f7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f8
+    const/16 v8, 0x1f8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1f9
+    const/16 v8, 0x1f9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1fa
+    const/16 v8, 0x1fa
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1fb
+    const/16 v8, 0x1fb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1fc
+    const/16 v8, 0x1fc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1fd
+    const/16 v8, 0x1fd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1fe
+    const/16 v8, 0x1fe
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x1ff
+    const/16 v8, 0x1ff
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x200
+    const/16 v8, 0x200
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x201
+    const/16 v8, 0x201
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x202
+    const/16 v8, 0x202
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x203
+    const/16 v8, 0x203
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x204
+    const/16 v8, 0x204
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x205
+    const/16 v8, 0x205
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x206
+    const/16 v8, 0x206
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x207
+    const/16 v8, 0x207
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x208
+    const/16 v8, 0x208
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x209
+    const/16 v8, 0x209
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x20a
+    const/16 v8, 0x20a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x20b
+    const/16 v8, 0x20b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x20c
+    const/16 v8, 0x20c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x20d
+    const/16 v8, 0x20d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x20e
+    const/16 v8, 0x20e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x20f
+    const/16 v8, 0x20f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x210
+    const/16 v8, 0x210
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x211
+    const/16 v8, 0x211
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x212
+    const/16 v8, 0x212
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x213
+    const/16 v8, 0x213
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x214
+    const/16 v8, 0x214
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x215
+    const/16 v8, 0x215
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x216
+    const/16 v8, 0x216
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x217
+    const/16 v8, 0x217
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->azZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x218
+    const/16 v8, 0x218
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x219
+    const/16 v8, 0x219
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x21a
+    const/16 v8, 0x21a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x21b
+    const/16 v8, 0x21b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x21c
+    const/16 v8, 0x21c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x21d
+    const/16 v8, 0x21d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x21e
+    const/16 v8, 0x21e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x21f
+    const/16 v8, 0x21f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x220
+    const/16 v8, 0x220
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x221
+    const/16 v8, 0x221
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x222
+    const/16 v8, 0x222
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x223
+    const/16 v8, 0x223
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x224
+    const/16 v8, 0x224
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x225
+    const/16 v8, 0x225
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x226
+    const/16 v8, 0x226
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x227
+    const/16 v8, 0x227
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x228
+    const/16 v8, 0x228
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x229
+    const/16 v8, 0x229
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x22a
+    const/16 v8, 0x22a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x22b
+    const/16 v8, 0x22b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x22c
+    const/16 v8, 0x22c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x22d
+    const/16 v8, 0x22d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x22e
+    const/16 v8, 0x22e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x22f
+    const/16 v8, 0x22f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x230
+    const/16 v8, 0x230
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x231
+    const/16 v8, 0x231
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x232
+    const/16 v8, 0x232
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x233
+    const/16 v8, 0x233
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x234
+    const/16 v8, 0x234
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x235
+    const/16 v8, 0x235
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x236
+    const/16 v8, 0x236
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x237
+    const/16 v8, 0x237
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x238
+    const/16 v8, 0x238
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x239
+    const/16 v8, 0x239
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x23a
+    const/16 v8, 0x23a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x23b
+    const/16 v8, 0x23b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x23c
+    const/16 v8, 0x23c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x23d
+    const/16 v8, 0x23d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x23e
+    const/16 v8, 0x23e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x23f
+    const/16 v8, 0x23f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x240
+    const/16 v8, 0x240
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x241
+    const/16 v8, 0x241
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x242
+    const/16 v8, 0x242
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x243
+    const/16 v8, 0x243
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x244
+    const/16 v8, 0x244
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x245
+    const/16 v8, 0x245
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x246
+    const/16 v8, 0x246
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x247
+    const/16 v8, 0x247
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x248
+    const/16 v8, 0x248
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x249
+    const/16 v8, 0x249
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x24a
+    const/16 v8, 0x24a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x24b
+    const/16 v8, 0x24b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aAZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x24c
+    const/16 v8, 0x24c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x24d
+    const/16 v8, 0x24d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x24e
+    const/16 v8, 0x24e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x24f
+    const/16 v8, 0x24f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x250
+    const/16 v8, 0x250
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x251
+    const/16 v8, 0x251
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x252
+    const/16 v8, 0x252
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x253
+    const/16 v8, 0x253
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x254
+    const/16 v8, 0x254
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x255
+    const/16 v8, 0x255
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x256
+    const/16 v8, 0x256
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x257
+    const/16 v8, 0x257
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x258
+    const/16 v8, 0x258
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x259
+    const/16 v8, 0x259
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x25a
+    const/16 v8, 0x25a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x25b
+    const/16 v8, 0x25b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x25c
+    const/16 v8, 0x25c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x25d
+    const/16 v8, 0x25d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x25e
+    const/16 v8, 0x25e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x25f
+    const/16 v8, 0x25f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x260
+    const/16 v8, 0x260
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x261
+    const/16 v8, 0x261
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x262
+    const/16 v8, 0x262
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x263
+    const/16 v8, 0x263
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x264
+    const/16 v8, 0x264
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x265
+    const/16 v8, 0x265
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x266
+    const/16 v8, 0x266
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x267
+    const/16 v8, 0x267
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x268
+    const/16 v8, 0x268
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x269
+    const/16 v8, 0x269
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x26a
+    const/16 v8, 0x26a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x26b
+    const/16 v8, 0x26b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x26c
+    const/16 v8, 0x26c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x26d
+    const/16 v8, 0x26d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x26e
+    const/16 v8, 0x26e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x26f
+    const/16 v8, 0x26f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x270
+    const/16 v8, 0x270
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x271
+    const/16 v8, 0x271
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x272
+    const/16 v8, 0x272
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x273
+    const/16 v8, 0x273
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x274
+    const/16 v8, 0x274
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x275
+    const/16 v8, 0x275
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x276
+    const/16 v8, 0x276
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x277
+    const/16 v8, 0x277
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x278
+    const/16 v8, 0x278
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x279
+    const/16 v8, 0x279
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x27a
+    const/16 v8, 0x27a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x27b
+    const/16 v8, 0x27b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x27c
+    const/16 v8, 0x27c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x27d
+    const/16 v8, 0x27d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x27e
+    const/16 v8, 0x27e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x27f
+    const/16 v8, 0x27f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aBZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x280
+    const/16 v8, 0x280
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x281
+    const/16 v8, 0x281
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x282
+    const/16 v8, 0x282
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x283
+    const/16 v8, 0x283
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x284
+    const/16 v8, 0x284
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x285
+    const/16 v8, 0x285
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x286
+    const/16 v8, 0x286
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x287
+    const/16 v8, 0x287
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x288
+    const/16 v8, 0x288
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x289
+    const/16 v8, 0x289
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x28a
+    const/16 v8, 0x28a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x28b
+    const/16 v8, 0x28b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x28c
+    const/16 v8, 0x28c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x28d
+    const/16 v8, 0x28d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x28e
+    const/16 v8, 0x28e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x28f
+    const/16 v8, 0x28f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x290
+    const/16 v8, 0x290
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x291
+    const/16 v8, 0x291
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x292
+    const/16 v8, 0x292
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x293
+    const/16 v8, 0x293
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x294
+    const/16 v8, 0x294
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x295
+    const/16 v8, 0x295
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x296
+    const/16 v8, 0x296
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x297
+    const/16 v8, 0x297
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x298
+    const/16 v8, 0x298
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x299
+    const/16 v8, 0x299
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x29a
+    const/16 v8, 0x29a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x29b
+    const/16 v8, 0x29b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x29c
+    const/16 v8, 0x29c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x29d
+    const/16 v8, 0x29d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x29e
+    const/16 v8, 0x29e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x29f
+    const/16 v8, 0x29f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a0
+    const/16 v8, 0x2a0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a1
+    const/16 v8, 0x2a1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a2
+    const/16 v8, 0x2a2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a3
+    const/16 v8, 0x2a3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a4
+    const/16 v8, 0x2a4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a5
+    const/16 v8, 0x2a5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a6
+    const/16 v8, 0x2a6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a7
+    const/16 v8, 0x2a7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a8
+    const/16 v8, 0x2a8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2a9
+    const/16 v8, 0x2a9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2aa
+    const/16 v8, 0x2aa
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ab
+    const/16 v8, 0x2ab
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ac
+    const/16 v8, 0x2ac
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ad
+    const/16 v8, 0x2ad
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ae
+    const/16 v8, 0x2ae
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2af
+    const/16 v8, 0x2af
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b0
+    const/16 v8, 0x2b0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b1
+    const/16 v8, 0x2b1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b2
+    const/16 v8, 0x2b2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b3
+    const/16 v8, 0x2b3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aCZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b4
+    const/16 v8, 0x2b4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b5
+    const/16 v8, 0x2b5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b6
+    const/16 v8, 0x2b6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b7
+    const/16 v8, 0x2b7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b8
+    const/16 v8, 0x2b8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2b9
+    const/16 v8, 0x2b9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ba
+    const/16 v8, 0x2ba
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2bb
+    const/16 v8, 0x2bb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2bc
+    const/16 v8, 0x2bc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2bd
+    const/16 v8, 0x2bd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2be
+    const/16 v8, 0x2be
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2bf
+    const/16 v8, 0x2bf
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c0
+    const/16 v8, 0x2c0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c1
+    const/16 v8, 0x2c1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c2
+    const/16 v8, 0x2c2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c3
+    const/16 v8, 0x2c3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c4
+    const/16 v8, 0x2c4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c5
+    const/16 v8, 0x2c5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c6
+    const/16 v8, 0x2c6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c7
+    const/16 v8, 0x2c7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c8
+    const/16 v8, 0x2c8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2c9
+    const/16 v8, 0x2c9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ca
+    const/16 v8, 0x2ca
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2cb
+    const/16 v8, 0x2cb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2cc
+    const/16 v8, 0x2cc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2cd
+    const/16 v8, 0x2cd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ce
+    const/16 v8, 0x2ce
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2cf
+    const/16 v8, 0x2cf
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d0
+    const/16 v8, 0x2d0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d1
+    const/16 v8, 0x2d1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDD:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d2
+    const/16 v8, 0x2d2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d3
+    const/16 v8, 0x2d3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d4
+    const/16 v8, 0x2d4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d5
+    const/16 v8, 0x2d5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d6
+    const/16 v8, 0x2d6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d7
+    const/16 v8, 0x2d7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d8
+    const/16 v8, 0x2d8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2d9
+    const/16 v8, 0x2d9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2da
+    const/16 v8, 0x2da
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2db
+    const/16 v8, 0x2db
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2dc
+    const/16 v8, 0x2dc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2dd
+    const/16 v8, 0x2dd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2de
+    const/16 v8, 0x2de
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2df
+    const/16 v8, 0x2df
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDR:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e0
+    const/16 v8, 0x2e0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDS:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e1
+    const/16 v8, 0x2e1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDT:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e2
+    const/16 v8, 0x2e2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e3
+    const/16 v8, 0x2e3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e4
+    const/16 v8, 0x2e4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e5
+    const/16 v8, 0x2e5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e6
+    const/16 v8, 0x2e6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e7
+    const/16 v8, 0x2e7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aDZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e8
+    const/16 v8, 0x2e8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2e9
+    const/16 v8, 0x2e9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ea
+    const/16 v8, 0x2ea
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2eb
+    const/16 v8, 0x2eb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ec
+    const/16 v8, 0x2ec
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ed
+    const/16 v8, 0x2ed
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ee
+    const/16 v8, 0x2ee
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ef
+    const/16 v8, 0x2ef
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f0
+    const/16 v8, 0x2f0
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEi:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f1
+    const/16 v8, 0x2f1
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEj:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f2
+    const/16 v8, 0x2f2
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEk:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f3
+    const/16 v8, 0x2f3
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEl:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f4
+    const/16 v8, 0x2f4
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEm:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f5
+    const/16 v8, 0x2f5
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEn:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f6
+    const/16 v8, 0x2f6
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEo:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f7
+    const/16 v8, 0x2f7
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEp:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f8
+    const/16 v8, 0x2f8
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEq:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2f9
+    const/16 v8, 0x2f9
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEr:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2fa
+    const/16 v8, 0x2fa
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEs:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2fb
+    const/16 v8, 0x2fb
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEt:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2fc
+    const/16 v8, 0x2fc
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEu:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2fd
+    const/16 v8, 0x2fd
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEv:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2fe
+    const/16 v8, 0x2fe
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEw:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x2ff
+    const/16 v8, 0x2ff
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEx:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x300
+    const/16 v8, 0x300
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEy:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x301
+    const/16 v8, 0x301
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEz:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x302
+    const/16 v8, 0x302
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEA:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x303
+    const/16 v8, 0x303
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEB:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x304
+    const/16 v8, 0x304
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEC:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x305
+    const/16 v8, 0x305
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aED:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aED:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x306
+    const/16 v8, 0x306
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEE:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x307
+    const/16 v8, 0x307
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEF:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x308
+    const/16 v8, 0x308
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEG:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x309
+    const/16 v8, 0x309
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEH:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x30a
+    const/16 v8, 0x30a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEI:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x30b
+    const/16 v8, 0x30b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEJ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x30c
+    const/16 v8, 0x30c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEK:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x30d
+    const/16 v8, 0x30d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x30e
+    const/16 v8, 0x30e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEM:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x30f
+    const/16 v8, 0x30f
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEN:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x310
+    const/16 v8, 0x310
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEO:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x311
+    const/16 v8, 0x311
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEP:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x312
+    const/16 v8, 0x312
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEQ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x313
+    const/16 v8, 0x313
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aER:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aER:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x314
+    const/16 v8, 0x314
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aES:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aES:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x315
+    const/16 v8, 0x315
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aET:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aET:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x316
+    const/16 v8, 0x316
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEU:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x317
+    const/16 v8, 0x317
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEV:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x318
+    const/16 v8, 0x318
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEW:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x319
+    const/16 v8, 0x319
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEX:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x31a
+    const/16 v8, 0x31a
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEY:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x31b
+    const/16 v8, 0x31b
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aEZ:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x31c
+    const/16 v8, 0x31c
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFa:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x31d
+    const/16 v8, 0x31d
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sget-object v7, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFb:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    const/16 v2, 0x31e
+    const/16 v8, 0x31e
 
-    aput-object v1, v0, v2
+    aput-object v7, v0, v8
 
     sput-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFi:[Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ate:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sput-object v1, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    sput-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFc:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sput-object v2, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sput-object v4, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    sput-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFd:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sput-object v5, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->atg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sput-object v6, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
-    sput-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFe:Lcom/google/android/gms/internal/clearcut/fc$q$b;
-
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->ath:Lcom/google/android/gms/internal/clearcut/fc$q$b;
-
-    sput-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFf:Lcom/google/android/gms/internal/clearcut/fc$q$b;
-
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aui:Lcom/google/android/gms/internal/clearcut/fc$q$b;
-
-    sput-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFg:Lcom/google/android/gms/internal/clearcut/fc$q$b;
-
-    sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->awL:Lcom/google/android/gms/internal/clearcut/fc$q$b;
-
-    sput-object v0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
+    sput-object v3, Lcom/google/android/gms/internal/clearcut/fc$q$b;->aFh:Lcom/google/android/gms/internal/clearcut/fc$q$b;
 
     new-instance v0, Lcom/google/android/gms/internal/clearcut/fk;
 
@@ -20912,7 +20900,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -20944,7 +20932,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$q$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$c.smali
index 8144a8f713..5210e64846 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q$c.smali
@@ -225,7 +225,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -257,7 +257,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$q$c;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q.smali
index 1441c1f349..112c1393be 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$q.smali
@@ -138,13 +138,13 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$q;->zzzi:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/fc$q;->zzzj:Lcom/google/android/gms/internal/clearcut/bm;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
@@ -153,7 +153,7 @@
     return-void
 .end method
 
-.method static synthetic pf()Lcom/google/android/gms/internal/clearcut/fc$q;
+.method static synthetic pe()Lcom/google/android/gms/internal/clearcut/fc$q;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$q;->zzzr:Lcom/google/android/gms/internal/clearcut/fc$q;
@@ -276,7 +276,7 @@
 
     const/4 p2, 0x3
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -332,7 +332,7 @@
 
     const/16 p2, 0xc
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$v$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$v$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -346,7 +346,7 @@
 
     const/16 p2, 0xe
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q$c;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q$c;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r$a.smali
index 53e9726cc3..f4e40c2a45 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$r;->pg()Lcom/google/android/gms/internal/clearcut/fc$r;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$r;->pf()Lcom/google/android/gms/internal/clearcut/fc$r;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r.smali
index d9fd2e66ae..78ea7fdeae 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$r.smali
@@ -111,7 +111,7 @@
     return-void
 .end method
 
-.method static synthetic pg()Lcom/google/android/gms/internal/clearcut/fc$r;
+.method static synthetic pf()Lcom/google/android/gms/internal/clearcut/fc$r;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$r;->zzbez:Lcom/google/android/gms/internal/clearcut/fc$r;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$a.smali
index 1cf87e49de..95c8a7aa00 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$s;->ph()Lcom/google/android/gms/internal/clearcut/fc$s;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$s;->pg()Lcom/google/android/gms/internal/clearcut/fc$s;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$b.smali
index 481872b888..4edb3919fe 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$b.smali
@@ -586,7 +586,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -618,7 +618,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$s$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$c.smali
index 3f2037987c..39400576ec 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s$c.smali
@@ -529,7 +529,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -561,7 +561,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$s$c;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s.smali
index e2e77abe0c..3ca729f12f 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$s.smali
@@ -87,7 +87,7 @@
     return-void
 .end method
 
-.method static synthetic ph()Lcom/google/android/gms/internal/clearcut/fc$s;
+.method static synthetic pg()Lcom/google/android/gms/internal/clearcut/fc$s;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$s;->zzbfc:Lcom/google/android/gms/internal/clearcut/fc$s;
@@ -190,7 +190,7 @@
 
     const/4 p2, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$s$c;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$s$c;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -204,7 +204,7 @@
 
     const/4 p2, 0x4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$s$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$s$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$a.smali
index 78d717afa6..8fe40543d5 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$t;->pi()Lcom/google/android/gms/internal/clearcut/fc$t;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$t;->ph()Lcom/google/android/gms/internal/clearcut/fc$t;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$b.smali
index 1dc989120c..581ee43e13 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t$b.smali
@@ -245,7 +245,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -277,7 +277,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$t$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t.smali
index 55f42ac867..c14004ed53 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$t.smali
@@ -104,7 +104,7 @@
     return-void
 .end method
 
-.method static synthetic pi()Lcom/google/android/gms/internal/clearcut/fc$t;
+.method static synthetic ph()Lcom/google/android/gms/internal/clearcut/fc$t;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$t;->zzbgx:Lcom/google/android/gms/internal/clearcut/fc$t;
@@ -213,7 +213,7 @@
 
     const/4 p2, 0x3
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$t$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$t$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u$a.smali
index d2d21afe40..4a43f7b7c9 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$u;->pj()Lcom/google/android/gms/internal/clearcut/fc$u;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$u;->pi()Lcom/google/android/gms/internal/clearcut/fc$u;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u.smali
index 58b13bdd68..8328c148a8 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$u.smali
@@ -119,7 +119,7 @@
     return-void
 .end method
 
-.method static synthetic pj()Lcom/google/android/gms/internal/clearcut/fc$u;
+.method static synthetic pi()Lcom/google/android/gms/internal/clearcut/fc$u;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$u;->zzbhi:Lcom/google/android/gms/internal/clearcut/fc$u;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$a.smali
index bb44d9463c..e3715b56a1 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$v;->pk()Lcom/google/android/gms/internal/clearcut/fc$v;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$v;->pj()Lcom/google/android/gms/internal/clearcut/fc$v;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$b.smali
index aaf1cd3e73..17a87efbcd 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v$b.smali
@@ -201,7 +201,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -233,7 +233,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$v$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v.smali
index 0f0236e98d..2c579af022 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$v.smali
@@ -92,7 +92,7 @@
     return-void
 .end method
 
-.method static synthetic pk()Lcom/google/android/gms/internal/clearcut/fc$v;
+.method static synthetic pj()Lcom/google/android/gms/internal/clearcut/fc$v;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$v;->zzbhj:Lcom/google/android/gms/internal/clearcut/fc$v;
@@ -201,7 +201,7 @@
 
     const/4 p2, 0x3
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$v$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$v$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -215,7 +215,7 @@
 
     const/4 p2, 0x5
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$q$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$a.smali
index b65a3efdaa..013af45abb 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$w;->pl()Lcom/google/android/gms/internal/clearcut/fc$w;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$w;->pk()Lcom/google/android/gms/internal/clearcut/fc$w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$b.smali
index 9f18bf1b9b..6b537384f4 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w$b.smali
@@ -225,7 +225,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -257,7 +257,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fc$w$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w.smali
index 6c4843cdb8..10c02cbda2 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$w.smali
@@ -134,7 +134,7 @@
     return-void
 .end method
 
-.method static synthetic pl()Lcom/google/android/gms/internal/clearcut/fc$w;
+.method static synthetic pk()Lcom/google/android/gms/internal/clearcut/fc$w;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$w;->zzbhw:Lcom/google/android/gms/internal/clearcut/fc$w;
@@ -237,7 +237,7 @@
 
     const/4 p2, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$w$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$w$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x$a.smali
index ceecf84626..fd641b99db 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$x;->pm()Lcom/google/android/gms/internal/clearcut/fc$x;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fc$x;->pl()Lcom/google/android/gms/internal/clearcut/fc$x;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x.smali
index f67c062b0e..ef9a5e807d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fc$x.smali
@@ -119,7 +119,7 @@
     return-void
 .end method
 
-.method static synthetic pm()Lcom/google/android/gms/internal/clearcut/fc$x;
+.method static synthetic pl()Lcom/google/android/gms/internal/clearcut/fc$x;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fc$x;->zzbik:Lcom/google/android/gms/internal/clearcut/fc$x;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fd.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fd.smali
index 0e2d88bdff..3f0a1769d0 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fd.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fd.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$a.smali
index 1034844092..4ea0bad44d 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fr$a;->pn()Lcom/google/android/gms/internal/clearcut/fr$a;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fr$a;->pm()Lcom/google/android/gms/internal/clearcut/fr$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$b.smali
index 8e66156936..fe747a685b 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a$b.smali
@@ -157,7 +157,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -189,7 +189,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fr$a$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a.smali
index 4ff7210ad6..e762a9b824 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fr$a.smali
@@ -74,7 +74,7 @@
     return-void
 .end method
 
-.method static synthetic pn()Lcom/google/android/gms/internal/clearcut/fr$a;
+.method static synthetic pm()Lcom/google/android/gms/internal/clearcut/fr$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fr$a;->zzbil:Lcom/google/android/gms/internal/clearcut/fr$a;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fs.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fs.smali
index 72a6a6e1a7..2b08034933 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fs.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fs.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$a.smali
index 793ba53ff2..dfbdcc3614 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a;->pp()Lcom/google/android/gms/internal/clearcut/fu$a;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a;->po()Lcom/google/android/gms/internal/clearcut/fu$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b$a.smali
index 0ba2bf72b0..c5a031ce54 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a$b;->pr()Lcom/google/android/gms/internal/clearcut/fu$a$b;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a$b;->pq()Lcom/google/android/gms/internal/clearcut/fu$a$b;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 .method public final H(J)Lcom/google/android/gms/internal/clearcut/fu$a$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nm()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fu$a$b$a;->akM:Lcom/google/android/gms/internal/clearcut/bf;
 
@@ -66,7 +66,7 @@
 .method public final I(J)Lcom/google/android/gms/internal/clearcut/fu$a$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nm()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fu$a$b$a;->akM:Lcom/google/android/gms/internal/clearcut/bf;
 
@@ -80,7 +80,7 @@
 .method public final bl(Ljava/lang/String;)Lcom/google/android/gms/internal/clearcut/fu$a$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->nm()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fu$a$b$a;->akM:Lcom/google/android/gms/internal/clearcut/bf;
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b.smali
index e5617f5997..6cc4d56fc5 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a$b.smali
@@ -140,7 +140,7 @@
     return-void
 .end method
 
-.method public static pq()Lcom/google/android/gms/internal/clearcut/fu$a$b$a;
+.method public static pp()Lcom/google/android/gms/internal/clearcut/fu$a$b$a;
     .locals 3
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fu$a$b;->zzbiv:Lcom/google/android/gms/internal/clearcut/fu$a$b;
@@ -160,7 +160,7 @@
     return-object v0
 .end method
 
-.method static synthetic pr()Lcom/google/android/gms/internal/clearcut/fu$a$b;
+.method static synthetic pq()Lcom/google/android/gms/internal/clearcut/fu$a$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fu$a$b;->zzbiv:Lcom/google/android/gms/internal/clearcut/fu$a$b;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a.smali
index b4c289d2be..b9844ade25 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fu$a.smali
@@ -83,7 +83,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/bf;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nX()Lcom/google/android/gms/internal/clearcut/da;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/da;->nW()Lcom/google/android/gms/internal/clearcut/da;
 
     move-result-object v0
 
@@ -92,7 +92,7 @@
     return-void
 .end method
 
-.method public static po()Lcom/google/android/gms/internal/clearcut/fu$a;
+.method public static pn()Lcom/google/android/gms/internal/clearcut/fu$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fu$a;->zzbir:Lcom/google/android/gms/internal/clearcut/fu$a;
@@ -100,7 +100,7 @@
     return-object v0
 .end method
 
-.method static synthetic pp()Lcom/google/android/gms/internal/clearcut/fu$a;
+.method static synthetic po()Lcom/google/android/gms/internal/clearcut/fu$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/fu$a;->zzbir:Lcom/google/android/gms/internal/clearcut/fu$a;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fv.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fv.smali
index b444b4d936..3e2f8767bd 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fv.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fv.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fw.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fw.smali
index 041796c191..c8ae3e2b58 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fw.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fw.smali
@@ -65,11 +65,11 @@
     return-void
 .end method
 
-.method private final ps()Lcom/google/android/gms/internal/clearcut/fw;
-    .locals 2
+.method private final pr()Lcom/google/android/gms/internal/clearcut/fw;
+    .locals 3
 
     :try_start_0
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oB()Lcom/google/android/gms/internal/clearcut/er;
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()Lcom/google/android/gms/internal/clearcut/er;
 
     move-result-object v0
 
@@ -81,13 +81,9 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
+    if-lez v2, :cond_0
 
     invoke-virtual {v1}, [Ljava/lang/String;->clone()Ljava/lang/Object;
 
@@ -102,13 +98,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_1
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
+    if-lez v2, :cond_1
 
     invoke-virtual {v1}, [Ljava/lang/String;->clone()Ljava/lang/Object;
 
@@ -123,13 +115,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_2
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
+    if-lez v2, :cond_2
 
     invoke-virtual {v1}, [I->clone()Ljava/lang/Object;
 
@@ -144,13 +132,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_3
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
+    if-lez v2, :cond_3
 
     invoke-virtual {v1}, [J->clone()Ljava/lang/Object;
 
@@ -165,13 +149,9 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_4
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
+    if-lez v2, :cond_4
 
     invoke-virtual {v1}, [J->clone()Ljava/lang/Object;
 
@@ -210,8 +190,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
-
     array-length v0, v0
 
     if-lez v0, :cond_1
@@ -221,11 +199,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_1
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
+    if-ge v0, v3, :cond_1
 
     aget-object v2, v2, v0
 
@@ -245,8 +221,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
-
     array-length v0, v0
 
     if-lez v0, :cond_3
@@ -256,11 +230,9 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_3
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
+    if-ge v0, v3, :cond_3
 
     aget-object v2, v2, v0
 
@@ -280,8 +252,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
-
     array-length v0, v0
 
     if-lez v0, :cond_4
@@ -291,17 +261,15 @@
     :goto_2
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_4
+    if-ge v0, v3, :cond_4
 
-    const/4 v2, 0x3
+    const/4 v3, 0x3
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
+    aget v2, v2, v0
 
-    aget v3, v3, v0
-
-    invoke-virtual {p1, v2, v3}, Lcom/google/android/gms/internal/clearcut/ep;->z(II)V
+    invoke-virtual {p1, v3, v2}, Lcom/google/android/gms/internal/clearcut/ep;->z(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -312,8 +280,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
-
     array-length v0, v0
 
     if-lez v0, :cond_5
@@ -323,17 +289,15 @@
     :goto_3
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_5
+    if-ge v0, v3, :cond_5
 
-    const/4 v2, 0x4
+    const/4 v3, 0x4
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
+    aget-wide v4, v2, v0
 
-    aget-wide v4, v3, v0
-
-    invoke-virtual {p1, v2, v4, v5}, Lcom/google/android/gms/internal/clearcut/ep;->i(IJ)V
+    invoke-virtual {p1, v3, v4, v5}, Lcom/google/android/gms/internal/clearcut/ep;->i(IJ)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -344,8 +308,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
-
     array-length v0, v0
 
     if-lez v0, :cond_6
@@ -353,17 +315,15 @@
     :goto_4
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_6
+    if-ge v1, v2, :cond_6
 
-    const/4 v0, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
+    aget-wide v3, v0, v1
 
-    aget-wide v3, v2, v1
-
-    invoke-virtual {p1, v0, v3, v4}, Lcom/google/android/gms/internal/clearcut/ep;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/clearcut/ep;->i(IJ)V
 
     add-int/lit8 v1, v1, 0x1
 
@@ -383,7 +343,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/fw;->ps()Lcom/google/android/gms/internal/clearcut/fw;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/fw;->pr()Lcom/google/android/gms/internal/clearcut/fw;
 
     move-result-object v0
 
@@ -627,10 +587,44 @@
     return v0
 .end method
 
-.method protected final oA()I
+.method public final synthetic oA()Lcom/google/android/gms/internal/clearcut/er;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/fw;
+
+    return-object v0
+.end method
+
+.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/ew;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/fw;
+
+    return-object v0
+.end method
+
+.method protected final oz()I
     .locals 7
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oz()I
 
     move-result v0
 
@@ -640,8 +634,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
-
     array-length v1, v1
 
     if-lez v1, :cond_2
@@ -655,11 +647,9 @@
     :goto_0
     iget-object v5, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
 
-    array-length v5, v5
+    array-length v6, v5
 
-    if-ge v1, v5, :cond_1
-
-    iget-object v5, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGF:[Ljava/lang/String;
+    if-ge v1, v6, :cond_1
 
     aget-object v5, v5, v1
 
@@ -690,8 +680,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
-
     array-length v1, v1
 
     if-lez v1, :cond_5
@@ -705,11 +693,9 @@
     :goto_1
     iget-object v5, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
 
-    array-length v5, v5
+    array-length v6, v5
 
-    if-ge v1, v5, :cond_4
-
-    iget-object v5, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGG:[Ljava/lang/String;
+    if-ge v1, v6, :cond_4
 
     aget-object v5, v5, v1
 
@@ -740,8 +726,6 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
-
     array-length v1, v1
 
     if-lez v1, :cond_7
@@ -753,11 +737,9 @@
     :goto_2
     iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v1, v4, :cond_6
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
+    if-ge v1, v5, :cond_6
 
     aget v4, v4, v1
 
@@ -774,9 +756,7 @@
     :cond_6
     add-int/2addr v0, v3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGH:[I
-
-    array-length v1, v1
+    array-length v1, v4
 
     mul-int/lit8 v1, v1, 0x1
 
@@ -787,8 +767,6 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
-
     array-length v1, v1
 
     if-lez v1, :cond_9
@@ -800,11 +778,9 @@
     :goto_3
     iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v1, v4, :cond_8
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
+    if-ge v1, v5, :cond_8
 
     aget-wide v5, v4, v1
 
@@ -821,9 +797,7 @@
     :cond_8
     add-int/2addr v0, v3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGI:[J
-
-    array-length v1, v1
+    array-length v1, v4
 
     mul-int/lit8 v1, v1, 0x1
 
@@ -834,8 +808,6 @@
 
     if-eqz v1, :cond_b
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
-
     array-length v1, v1
 
     if-lez v1, :cond_b
@@ -845,11 +817,9 @@
     :goto_4
     iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v2, v3, :cond_a
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
+    if-ge v2, v4, :cond_a
 
     aget-wide v4, v3, v2
 
@@ -866,9 +836,7 @@
     :cond_a
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fw;->aGJ:[J
-
-    array-length v1, v1
+    array-length v1, v3
 
     mul-int/lit8 v1, v1, 0x1
 
@@ -877,37 +845,3 @@
     :cond_b
     return v0
 .end method
-
-.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/er;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/fw;
-
-    return-object v0
-.end method
-
-.method public final synthetic oC()Lcom/google/android/gms/internal/clearcut/ew;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/fw;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fx.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fx.smali
index 16de4e7157..3219de8b54 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fx.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fx.smali
@@ -59,11 +59,11 @@
     return-void
 .end method
 
-.method private final pt()Lcom/google/android/gms/internal/clearcut/fx;
-    .locals 2
+.method private final ps()Lcom/google/android/gms/internal/clearcut/fx;
+    .locals 3
 
     :try_start_0
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oB()Lcom/google/android/gms/internal/clearcut/er;
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()Lcom/google/android/gms/internal/clearcut/er;
 
     move-result-object v0
 
@@ -75,13 +75,9 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
+    if-lez v2, :cond_0
 
     invoke-virtual {v1}, [[B->clone()Ljava/lang/Object;
 
@@ -135,8 +131,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
-
     array-length v0, v0
 
     if-lez v0, :cond_2
@@ -146,11 +140,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_2
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
+    if-ge v0, v2, :cond_2
 
     aget-object v1, v1, v0
 
@@ -170,8 +162,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGL:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -200,7 +190,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/fx;->pt()Lcom/google/android/gms/internal/clearcut/fx;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/fx;->ps()Lcom/google/android/gms/internal/clearcut/fx;
 
     move-result-object v0
 
@@ -252,8 +242,6 @@
     return v2
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGL:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fx;->aGL:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -367,8 +355,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGL:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -420,10 +406,44 @@
     return v0
 .end method
 
-.method protected final oA()I
-    .locals 6
+.method public final synthetic oA()Lcom/google/android/gms/internal/clearcut/er;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/fx;
+
+    return-object v0
+.end method
+
+.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/ew;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/fx;
+
+    return-object v0
+.end method
+
+.method protected final oz()I
+    .locals 7
+
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oz()I
 
     move-result v0
 
@@ -452,8 +472,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
-
     array-length v1, v1
 
     if-lez v1, :cond_3
@@ -467,11 +485,9 @@
     :goto_0
     iget-object v5, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
 
-    array-length v5, v5
+    array-length v6, v5
 
-    if-ge v1, v5, :cond_2
-
-    iget-object v5, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGM:[[B
+    if-ge v1, v6, :cond_2
 
     aget-object v5, v5, v1
 
@@ -502,8 +518,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fx;->aGL:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -525,37 +539,3 @@
     :cond_4
     return v0
 .end method
-
-.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/er;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/fx;
-
-    return-object v0
-.end method
-
-.method public final synthetic oC()Lcom/google/android/gms/internal/clearcut/ew;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/fx;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fy.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fy.smali
index d43763dd4d..a7c3b6b10a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fy.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fy.smali
@@ -65,7 +65,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/clearcut/zze;->Zu:Lcom/google/android/gms/clearcut/a$c;
 
-    invoke-interface {v3}, Lcom/google/android/gms/clearcut/a$c;->kC()[B
+    invoke-interface {v3}, Lcom/google/android/gms/clearcut/a$c;->kB()[B
 
     move-result-object v3
 
@@ -88,7 +88,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/clearcut/zze;->ZO:Lcom/google/android/gms/clearcut/a$c;
 
-    invoke-interface {v3}, Lcom/google/android/gms/clearcut/a$c;->kC()[B
+    invoke-interface {v3}, Lcom/google/android/gms/clearcut/a$c;->kB()[B
 
     move-result-object v3
 
@@ -97,7 +97,7 @@
     :cond_1
     iget-object v2, v1, Lcom/google/android/gms/clearcut/zze;->ZB:Lcom/google/android/gms/internal/clearcut/fz;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/ew;->nj()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/ew;->ni()I
 
     move-result v3
 
@@ -111,7 +111,7 @@
     :try_end_0
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/gc;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/clearcut/gc;->lG()Landroid/os/IInterface;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/fz.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/fz.smali
index e16285dfdd..f16f9b66bf 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/fz.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/fz.smali
@@ -98,7 +98,7 @@
 
     iput-boolean v2, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGV:Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ga;->pv()[Lcom/google/android/gms/internal/clearcut/ga;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ga;->pu()[Lcom/google/android/gms/internal/clearcut/ga;
 
     move-result-object v3
 
@@ -165,11 +165,11 @@
     return-void
 .end method
 
-.method private final pu()Lcom/google/android/gms/internal/clearcut/fz;
+.method private final pt()Lcom/google/android/gms/internal/clearcut/fz;
     .locals 4
 
     :try_start_0
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oB()Lcom/google/android/gms/internal/clearcut/er;
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()Lcom/google/android/gms/internal/clearcut/er;
 
     move-result-object v0
 
@@ -181,13 +181,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_1
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    if-lez v2, :cond_1
 
     array-length v1, v1
 
@@ -200,29 +196,25 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
+    if-ge v1, v3, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    aget-object v3, v2, v1
+
+    if-eqz v3, :cond_0
+
+    iget-object v3, v0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
 
     aget-object v2, v2, v1
 
-    if-eqz v2, :cond_0
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    check-cast v2, Lcom/google/android/gms/internal/clearcut/ga;
 
-    aget-object v3, v3, v1
-
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/google/android/gms/internal/clearcut/ga;
-
-    aput-object v3, v2, v1
+    aput-object v2, v3, v1
 
     :cond_0
     add-int/lit8 v1, v1, 0x1
@@ -234,8 +226,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
-
     iput-object v1, v0, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
 
     :cond_2
@@ -243,8 +233,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHc:Lcom/google/android/gms/internal/clearcut/fw;
-
     invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
 
     move-result-object v1
@@ -258,8 +246,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHf:Lcom/google/android/gms/internal/clearcut/fx;
-
     invoke-virtual {v1}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
 
     move-result-object v1
@@ -273,13 +259,9 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
+    array-length v2, v1
 
-    array-length v1, v1
-
-    if-lez v1, :cond_5
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
+    if-lez v2, :cond_5
 
     invoke-virtual {v1}, [I->clone()Ljava/lang/Object;
 
@@ -294,8 +276,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHl:Lcom/google/android/gms/internal/clearcut/fc$s;
-
     iput-object v1, v0, Lcom/google/android/gms/internal/clearcut/fz;->aHl:Lcom/google/android/gms/internal/clearcut/fc$s;
 
     :cond_6
@@ -309,6 +289,8 @@
     invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw v1
+
+    return-void
 .end method
 
 
@@ -329,8 +311,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGP:J
-
     const/4 v4, 0x1
 
     invoke-virtual {p1, v4, v0, v1}, Lcom/google/android/gms/internal/clearcut/ep;->i(IJ)V
@@ -340,8 +320,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->tag:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -363,8 +341,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
-
     array-length v0, v0
 
     if-lez v0, :cond_3
@@ -374,11 +350,9 @@
     :goto_0
     iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v0, v4, :cond_3
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    if-ge v0, v5, :cond_3
 
     aget-object v4, v4, v0
 
@@ -432,19 +406,15 @@
 
     if-eqz v0, :cond_6
 
-    const/4 v0, 0x7
+    const/4 v4, 0x7
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHc:Lcom/google/android/gms/internal/clearcut/fw;
-
-    invoke-virtual {p1, v0, v4}, Lcom/google/android/gms/internal/clearcut/ep;->a(ILcom/google/android/gms/internal/clearcut/ew;)V
+    invoke-virtual {p1, v4, v0}, Lcom/google/android/gms/internal/clearcut/ep;->a(ILcom/google/android/gms/internal/clearcut/ew;)V
 
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
-
     const-string v4, ""
 
     invoke-virtual {v0, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -464,30 +434,24 @@
 
     if-eqz v0, :cond_8
 
-    const/16 v0, 0x9
+    const/16 v4, 0x9
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
-
-    invoke-virtual {p1, v0, v4}, Lcom/google/android/gms/internal/clearcut/ep;->e(ILcom/google/android/gms/internal/clearcut/cm;)V
+    invoke-virtual {p1, v4, v0}, Lcom/google/android/gms/internal/clearcut/ep;->e(ILcom/google/android/gms/internal/clearcut/cm;)V
 
     :cond_8
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGS:I
 
     if-eqz v0, :cond_9
 
-    const/16 v0, 0xb
+    const/16 v4, 0xb
 
-    iget v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGS:I
-
-    invoke-virtual {p1, v0, v4}, Lcom/google/android/gms/internal/clearcut/ep;->z(II)V
+    invoke-virtual {p1, v4, v0}, Lcom/google/android/gms/internal/clearcut/ep;->z(II)V
 
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
-
     const-string v4, ""
 
     invoke-virtual {v0, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -507,8 +471,6 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHd:Ljava/lang/String;
-
     const-string v4, ""
 
     invoke-virtual {v0, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -532,8 +494,6 @@
 
     if-eqz v0, :cond_c
 
-    iget-wide v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHe:J
-
     const/16 v0, 0xf
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/clearcut/ep;->y(II)V
@@ -549,11 +509,9 @@
 
     if-eqz v0, :cond_d
 
-    const/16 v0, 0x10
+    const/16 v4, 0x10
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHf:Lcom/google/android/gms/internal/clearcut/fx;
-
-    invoke-virtual {p1, v0, v4}, Lcom/google/android/gms/internal/clearcut/ep;->a(ILcom/google/android/gms/internal/clearcut/ew;)V
+    invoke-virtual {p1, v4, v0}, Lcom/google/android/gms/internal/clearcut/ep;->a(ILcom/google/android/gms/internal/clearcut/ew;)V
 
     :cond_d
     iget-wide v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGQ:J
@@ -564,9 +522,7 @@
 
     const/16 v0, 0x11
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGQ:J
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/clearcut/ep;->i(IJ)V
+    invoke-virtual {p1, v0, v4, v5}, Lcom/google/android/gms/internal/clearcut/ep;->i(IJ)V
 
     :cond_e
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHg:[B
@@ -590,8 +546,6 @@
 
     if-eqz v0, :cond_10
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
-
     array-length v0, v0
 
     if-lez v0, :cond_10
@@ -601,17 +555,15 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_10
+    if-ge v0, v3, :cond_10
 
-    const/16 v2, 0x14
+    const/16 v3, 0x14
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
+    aget v2, v2, v0
 
-    aget v3, v3, v0
-
-    invoke-virtual {p1, v2, v3}, Lcom/google/android/gms/internal/clearcut/ep;->z(II)V
+    invoke-virtual {p1, v3, v2}, Lcom/google/android/gms/internal/clearcut/ep;->z(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -622,19 +574,15 @@
 
     if-eqz v0, :cond_11
 
-    const/16 v0, 0x17
+    const/16 v2, 0x17
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHl:Lcom/google/android/gms/internal/clearcut/fc$s;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/clearcut/ep;->e(ILcom/google/android/gms/internal/clearcut/cm;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/clearcut/ep;->e(ILcom/google/android/gms/internal/clearcut/cm;)V
 
     :cond_11
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHh:Ljava/lang/String;
 
     if-eqz v0, :cond_12
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHh:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -654,8 +602,6 @@
 
     if-eqz v0, :cond_14
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHm:Z
-
     const/16 v2, 0x19
 
     invoke-virtual {p1, v2, v1}, Lcom/google/android/gms/internal/clearcut/ep;->y(II)V
@@ -701,8 +647,6 @@
 
     if-eqz v0, :cond_15
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGT:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -731,7 +675,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/fz;->pu()Lcom/google/android/gms/internal/clearcut/fz;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/fz;->pt()Lcom/google/android/gms/internal/clearcut/fz;
 
     move-result-object v0
 
@@ -792,8 +736,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->tag:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->tag:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -825,8 +767,6 @@
     return v2
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGT:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aGT:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -875,8 +815,6 @@
     return v2
 
     :cond_b
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/clearcut/bf;->equals(Ljava/lang/Object;)Z
@@ -912,8 +850,6 @@
     return v2
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -936,8 +872,6 @@
     return v2
 
     :cond_10
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -960,8 +894,6 @@
     return v2
 
     :cond_12
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHc:Lcom/google/android/gms/internal/clearcut/fw;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aHc:Lcom/google/android/gms/internal/clearcut/fw;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/clearcut/fw;->equals(Ljava/lang/Object;)Z
@@ -984,8 +916,6 @@
     return v2
 
     :cond_14
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHd:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aHd:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1019,8 +949,6 @@
     return v2
 
     :cond_17
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHf:Lcom/google/android/gms/internal/clearcut/fx;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aHf:Lcom/google/android/gms/internal/clearcut/fx;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/clearcut/fx;->equals(Ljava/lang/Object;)Z
@@ -1056,8 +984,6 @@
     return v2
 
     :cond_1a
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHh:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aHh:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1093,8 +1019,6 @@
     return v2
 
     :cond_1d
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHl:Lcom/google/android/gms/internal/clearcut/fc$s;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/fz;->aHl:Lcom/google/android/gms/internal/clearcut/fc$s;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/clearcut/bf;->equals(Ljava/lang/Object;)Z
@@ -1185,13 +1109,11 @@
 
     iget-wide v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGP:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGP:J
+    const/16 v3, 0x20
 
-    const/16 v5, 0x20
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -1201,11 +1123,9 @@
 
     iget-wide v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGQ:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGQ:J
+    ushr-long v4, v1, v3
 
-    ushr-long/2addr v3, v5
-
-    xor-long/2addr v1, v3
+    xor-long/2addr v1, v4
 
     long-to-int v1, v1
 
@@ -1226,8 +1146,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->tag:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -1252,8 +1170,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGT:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -1271,141 +1187,133 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
 
-    invoke-static {v3}, Lcom/google/android/gms/internal/clearcut/ev;->hashCode([Ljava/lang/Object;)I
+    invoke-static {v4}, Lcom/google/android/gms/internal/clearcut/ev;->hashCode([Ljava/lang/Object;)I
 
-    move-result v3
+    move-result v4
 
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGX:[B
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGX:[B
 
-    invoke-static {v3}, Ljava/util/Arrays;->hashCode([B)I
+    invoke-static {v4}, Ljava/util/Arrays;->hashCode([B)I
 
-    move-result v3
+    move-result v4
 
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
 
     mul-int/lit8 v0, v0, 0x1f
 
-    if-nez v3, :cond_2
+    if-nez v4, :cond_2
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     goto :goto_2
 
     :cond_2
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/bf;->hashCode()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/clearcut/bf;->hashCode()I
 
-    move-result v3
+    move-result v4
 
     :goto_2
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGZ:[B
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGZ:[B
 
-    invoke-static {v3}, Ljava/util/Arrays;->hashCode([B)I
+    invoke-static {v4}, Ljava/util/Arrays;->hashCode([B)I
 
-    move-result v3
+    move-result v4
 
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
 
-    if-nez v3, :cond_3
+    if-nez v4, :cond_3
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     goto :goto_3
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
+    invoke-virtual {v4}, Ljava/lang/String;->hashCode()I
 
-    invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
-
-    move-result v3
+    move-result v4
 
     :goto_3
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
 
-    if-nez v3, :cond_4
+    if-nez v4, :cond_4
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     goto :goto_4
 
     :cond_4
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
+    invoke-virtual {v4}, Ljava/lang/String;->hashCode()I
 
-    invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
-
-    move-result v3
+    move-result v4
 
     :goto_4
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHc:Lcom/google/android/gms/internal/clearcut/fw;
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHc:Lcom/google/android/gms/internal/clearcut/fw;
 
     mul-int/lit8 v0, v0, 0x1f
 
-    if-nez v3, :cond_5
+    if-nez v4, :cond_5
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     goto :goto_5
 
     :cond_5
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/clearcut/fw;->hashCode()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/clearcut/fw;->hashCode()I
 
-    move-result v3
+    move-result v4
 
     :goto_5
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHd:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHd:Ljava/lang/String;
 
-    if-nez v3, :cond_6
+    if-nez v4, :cond_6
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     goto :goto_6
 
     :cond_6
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHd:Ljava/lang/String;
+    invoke-virtual {v4}, Ljava/lang/String;->hashCode()I
 
-    invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
-
-    move-result v3
+    move-result v4
 
     :goto_6
-    add-int/2addr v0, v3
+    add-int/2addr v0, v4
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHe:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHe:J
 
-    iget-wide v6, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHe:J
+    ushr-long v6, v4, v3
 
-    ushr-long v5, v6, v5
+    xor-long/2addr v4, v6
 
-    xor-long/2addr v3, v5
-
-    long-to-int v3, v3
+    long-to-int v3, v4
 
     add-int/2addr v0, v3
 
@@ -1448,8 +1356,6 @@
     goto :goto_8
 
     :cond_8
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHh:Ljava/lang/String;
-
     invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
 
     move-result v3
@@ -1530,10 +1436,44 @@
     return v0
 .end method
 
-.method protected final oA()I
+.method public final synthetic oA()Lcom/google/android/gms/internal/clearcut/er;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/fz;
+
+    return-object v0
+.end method
+
+.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/ew;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/fz;
+
+    return-object v0
+.end method
+
+.method protected final oz()I
     .locals 11
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oz()I
 
     move-result v0
 
@@ -1547,8 +1487,6 @@
 
     if-eqz v6, :cond_0
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGP:J
-
     invoke-static {v5, v1, v2}, Lcom/google/android/gms/internal/clearcut/ep;->f(IJ)I
 
     move-result v1
@@ -1562,8 +1500,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->tag:Ljava/lang/String;
-
     const-string v6, ""
 
     invoke-virtual {v1, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1587,8 +1523,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
-
     array-length v1, v1
 
     if-lez v1, :cond_4
@@ -1600,11 +1534,9 @@
     :goto_0
     iget-object v7, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
 
-    array-length v7, v7
+    array-length v8, v7
 
-    if-ge v0, v7, :cond_3
-
-    iget-object v7, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGW:[Lcom/google/android/gms/internal/clearcut/ga;
+    if-ge v0, v8, :cond_3
 
     aget-object v7, v7, v0
 
@@ -1673,11 +1605,9 @@
 
     if-eqz v1, :cond_7
 
-    const/4 v1, 0x7
+    const/4 v7, 0x7
 
-    iget-object v7, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHc:Lcom/google/android/gms/internal/clearcut/fw;
-
-    invoke-static {v1, v7}, Lcom/google/android/gms/internal/clearcut/ep;->b(ILcom/google/android/gms/internal/clearcut/ew;)I
+    invoke-static {v7, v1}, Lcom/google/android/gms/internal/clearcut/ep;->b(ILcom/google/android/gms/internal/clearcut/ew;)I
 
     move-result v1
 
@@ -1688,8 +1618,6 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHa:Ljava/lang/String;
-
     const-string v7, ""
 
     invoke-virtual {v1, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1713,11 +1641,9 @@
 
     if-eqz v1, :cond_9
 
-    const/16 v1, 0x9
+    const/16 v7, 0x9
 
-    iget-object v7, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGY:Lcom/google/android/gms/internal/clearcut/fc$d;
-
-    invoke-static {v1, v7}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/cm;)I
+    invoke-static {v7, v1}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/cm;)I
 
     move-result v1
 
@@ -1728,8 +1654,6 @@
 
     if-eqz v1, :cond_a
 
-    iget v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGS:I
-
     const/16 v7, 0x58
 
     invoke-static {v7}, Lcom/google/android/gms/internal/clearcut/ep;->bS(I)I
@@ -1749,8 +1673,6 @@
 
     if-eqz v1, :cond_b
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHb:Ljava/lang/String;
-
     const-string v7, ""
 
     invoke-virtual {v1, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1774,8 +1696,6 @@
 
     if-eqz v1, :cond_c
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHd:Ljava/lang/String;
-
     const-string v7, ""
 
     invoke-virtual {v1, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1803,8 +1723,6 @@
 
     if-eqz v1, :cond_d
 
-    iget-wide v7, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHe:J
-
     const/16 v1, 0x78
 
     invoke-static {v1}, Lcom/google/android/gms/internal/clearcut/ep;->bS(I)I
@@ -1828,11 +1746,9 @@
 
     if-eqz v1, :cond_e
 
-    const/16 v1, 0x10
+    const/16 v7, 0x10
 
-    iget-object v7, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHf:Lcom/google/android/gms/internal/clearcut/fx;
-
-    invoke-static {v1, v7}, Lcom/google/android/gms/internal/clearcut/ep;->b(ILcom/google/android/gms/internal/clearcut/ew;)I
+    invoke-static {v7, v1}, Lcom/google/android/gms/internal/clearcut/ep;->b(ILcom/google/android/gms/internal/clearcut/ew;)I
 
     move-result v1
 
@@ -1847,9 +1763,7 @@
 
     const/16 v1, 0x11
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGQ:J
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/clearcut/ep;->f(IJ)I
+    invoke-static {v1, v7, v8}, Lcom/google/android/gms/internal/clearcut/ep;->f(IJ)I
 
     move-result v1
 
@@ -1881,8 +1795,6 @@
 
     if-eqz v1, :cond_12
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
-
     array-length v1, v1
 
     if-lez v1, :cond_12
@@ -1892,11 +1804,9 @@
     :goto_1
     iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v6, v3, :cond_11
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
+    if-ge v6, v4, :cond_11
 
     aget v3, v3, v6
 
@@ -1913,9 +1823,7 @@
     :cond_11
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHj:[I
-
-    array-length v1, v1
+    array-length v1, v3
 
     mul-int/lit8 v1, v1, 0x2
 
@@ -1926,11 +1834,9 @@
 
     if-eqz v1, :cond_13
 
-    const/16 v1, 0x17
+    const/16 v2, 0x17
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHl:Lcom/google/android/gms/internal/clearcut/fc$s;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/cm;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/clearcut/am;->c(ILcom/google/android/gms/internal/clearcut/cm;)I
 
     move-result v1
 
@@ -1941,8 +1847,6 @@
 
     if-eqz v1, :cond_14
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aHh:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1981,8 +1885,6 @@
 
     if-eqz v1, :cond_16
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/fz;->aGT:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2004,37 +1906,3 @@
     :cond_16
     return v0
 .end method
-
-.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/er;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/fz;
-
-    return-object v0
-.end method
-
-.method public final synthetic oC()Lcom/google/android/gms/internal/clearcut/ew;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/fz;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/g.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/g.smali
index 30f24b8fc9..a515ae1324 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/g.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/g.smali
@@ -22,7 +22,7 @@
 
 
 # virtual methods
-.method public final mA()Ljava/lang/Object;
+.method public final mz()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/g;->aio:Lcom/google/android/gms/internal/clearcut/e;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ga.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ga.smali
index 949c5d79e2..63831ab6d5 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ga.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ga.smali
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method public static pv()[Lcom/google/android/gms/internal/clearcut/ga;
+.method public static pu()[Lcom/google/android/gms/internal/clearcut/ga;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/ga;->aHn:[Lcom/google/android/gms/internal/clearcut/ga;
@@ -94,11 +94,11 @@
     return-object v0
 .end method
 
-.method private final pw()Lcom/google/android/gms/internal/clearcut/ga;
+.method private final pv()Lcom/google/android/gms/internal/clearcut/ga;
     .locals 2
 
     :try_start_0
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oB()Lcom/google/android/gms/internal/clearcut/er;
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()Lcom/google/android/gms/internal/clearcut/er;
 
     move-result-object v0
 
@@ -132,8 +132,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ga;->aHo:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -153,8 +151,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/ga;->value:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -183,7 +179,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/ga;->pw()Lcom/google/android/gms/internal/clearcut/ga;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/clearcut/ga;->pv()Lcom/google/android/gms/internal/clearcut/ga;
 
     move-result-object v0
 
@@ -222,8 +218,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ga;->aHo:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/ga;->aHo:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -246,8 +240,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ga;->value:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/clearcut/ga;->value:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -338,8 +330,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ga;->aHo:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -358,8 +348,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ga;->value:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -397,10 +385,44 @@
     return v0
 .end method
 
-.method protected final oA()I
+.method public final synthetic oA()Lcom/google/android/gms/internal/clearcut/er;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/ga;
+
+    return-object v0
+.end method
+
+.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/ew;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/clearcut/ga;
+
+    return-object v0
+.end method
+
+.method protected final oz()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oA()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/clearcut/er;->oz()I
 
     move-result v0
 
@@ -408,8 +430,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ga;->aHo:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -433,8 +453,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/ga;->value:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -456,37 +474,3 @@
     :cond_1
     return v0
 .end method
-
-.method public final synthetic oB()Lcom/google/android/gms/internal/clearcut/er;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/ga;
-
-    return-object v0
-.end method
-
-.method public final synthetic oC()Lcom/google/android/gms/internal/clearcut/ew;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/ew;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/clearcut/ga;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gc.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gc.smali
index d409b0a6bb..7721597630 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gc.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gc.smali
@@ -69,7 +69,7 @@
     return-object v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xb5f608
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.clearcut.service.START"
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.clearcut.internal.IClearcutLoggerService"
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gd.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gd.smali
index 3e82bfa189..2fc1fb2917 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gd.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gd.smali
@@ -154,7 +154,7 @@
 .end method
 
 .method public static r([B)J
-    .locals 28
+    .locals 29
 
     move-object/from16 v7, p0
 
@@ -168,9 +168,13 @@
 
     const/16 v8, 0x25
 
-    const/4 v1, 0x2
+    const/16 v1, 0x12
 
-    const/16 v4, 0x2b
+    const/16 v2, 0x1e
+
+    const/16 v3, 0x2b
+
+    const/4 v4, 0x2
 
     const/16 v5, 0x20
 
@@ -235,9 +239,9 @@
     return-wide v0
 
     :cond_0
-    const/4 v2, 0x4
+    const/4 v1, 0x4
 
-    if-lt v0, v2, :cond_1
+    if-lt v0, v1, :cond_1
 
     shl-int/lit8 v1, v0, 0x1
 
@@ -288,35 +292,35 @@
     :cond_1
     if-lez v0, :cond_2
 
-    aget-byte v2, v7, v14
+    aget-byte v1, v7, v14
 
-    shr-int/lit8 v3, v0, 0x1
+    shr-int/lit8 v2, v0, 0x1
+
+    add-int/2addr v2, v14
+
+    aget-byte v2, v7, v2
+
+    add-int/lit8 v3, v0, -0x1
 
     add-int/2addr v3, v14
 
     aget-byte v3, v7, v3
 
-    add-int/lit8 v4, v0, -0x1
-
-    add-int/2addr v4, v14
-
-    aget-byte v4, v7, v4
+    and-int/lit16 v1, v1, 0xff
 
     and-int/lit16 v2, v2, 0xff
 
-    and-int/lit16 v3, v3, 0xff
+    shl-int/2addr v2, v6
 
-    shl-int/2addr v3, v6
+    add-int/2addr v1, v2
 
-    add-int/2addr v2, v3
+    and-int/lit16 v2, v3, 0xff
 
-    and-int/lit16 v3, v4, 0xff
+    shl-int/2addr v2, v4
 
-    shl-int/lit8 v1, v3, 0x2
+    add-int/2addr v0, v2
 
-    add-int/2addr v0, v1
-
-    int-to-long v1, v2
+    int-to-long v1, v1
 
     mul-long v1, v1, v12
 
@@ -342,67 +346,65 @@
     return-wide v12
 
     :cond_3
-    shl-int/lit8 v1, v0, 0x1
+    shl-int/lit8 v4, v0, 0x1
 
-    int-to-long v2, v1
+    int-to-long v4, v4
 
-    add-long v19, v2, v12
+    add-long v19, v4, v12
 
     invoke-static {v7, v14}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v1
+    move-result-wide v4
 
-    mul-long v1, v1, v9
+    mul-long v4, v4, v9
 
     invoke-static {v7, v6}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v5
+    move-result-wide v8
 
     add-int/2addr v0, v14
 
-    add-int/lit8 v3, v0, -0x8
+    add-int/lit8 v6, v0, -0x8
 
-    invoke-static {v7, v3}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+    invoke-static {v7, v6}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v8
+    move-result-wide v14
 
-    mul-long v8, v8, v19
+    mul-long v14, v14, v19
 
     sub-int/2addr v0, v11
 
     invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
+    move-result-wide v6
+
+    mul-long v6, v6, v12
+
+    add-long v10, v4, v8
+
+    invoke-static {v10, v11, v3}, Ljava/lang/Long;->rotateRight(JI)J
+
     move-result-wide v10
 
-    mul-long v10, v10, v12
+    invoke-static {v14, v15, v2}, Ljava/lang/Long;->rotateRight(JI)J
 
-    add-long v14, v1, v5
+    move-result-wide v2
 
-    invoke-static {v14, v15, v4}, Ljava/lang/Long;->rotateRight(JI)J
+    add-long/2addr v10, v2
 
-    move-result-wide v3
+    add-long v2, v10, v6
 
-    const/16 v0, 0x1e
+    add-long/2addr v8, v12
 
-    invoke-static {v8, v9, v0}, Ljava/lang/Long;->rotateRight(JI)J
+    invoke-static {v8, v9, v1}, Ljava/lang/Long;->rotateRight(JI)J
 
-    move-result-wide v14
+    move-result-wide v0
 
-    add-long/2addr v3, v14
+    add-long/2addr v4, v0
 
-    add-long v15, v3, v10
+    add-long v17, v4, v14
 
-    add-long/2addr v5, v12
-
-    const/16 v0, 0x12
-
-    invoke-static {v5, v6, v0}, Ljava/lang/Long;->rotateRight(JI)J
-
-    move-result-wide v3
-
-    add-long/2addr v1, v3
-
-    add-long v17, v1, v8
+    move-wide v15, v2
 
     invoke-static/range {v15 .. v20}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
 
@@ -415,11 +417,11 @@
 
     if-gt v0, v15, :cond_5
 
-    shl-int/lit8 v1, v0, 0x1
+    shl-int/lit8 v4, v0, 0x1
 
-    int-to-long v1, v1
+    int-to-long v4, v4
 
-    add-long/2addr v1, v12
+    add-long/2addr v4, v12
 
     invoke-static {v7, v14}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
@@ -429,129 +431,125 @@
 
     invoke-static {v7, v6}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v5
+    move-result-wide v15
 
     add-int/2addr v0, v14
 
-    add-int/lit8 v3, v0, -0x8
+    add-int/lit8 v6, v0, -0x8
 
-    invoke-static {v7, v3}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+    invoke-static {v7, v6}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v14
+    move-result-wide v17
 
-    mul-long v14, v14, v1
+    mul-long v1, v17, v4
 
-    add-int/lit8 v3, v0, -0x10
+    add-int/lit8 v10, v0, -0x10
 
-    invoke-static {v7, v3}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+    invoke-static {v7, v10}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v16
+    move-result-wide v17
 
-    mul-long v16, v16, v12
+    mul-long v17, v17, v12
 
-    add-long v11, v8, v5
+    add-long v6, v8, v15
 
-    invoke-static {v11, v12, v4}, Ljava/lang/Long;->rotateRight(JI)J
+    invoke-static {v6, v7, v3}, Ljava/lang/Long;->rotateRight(JI)J
 
-    move-result-wide v10
+    move-result-wide v19
 
-    const/16 v3, 0x1e
+    const/16 v6, 0x1e
 
-    invoke-static {v14, v15, v3}, Ljava/lang/Long;->rotateRight(JI)J
+    invoke-static {v1, v2, v6}, Ljava/lang/Long;->rotateRight(JI)J
+
+    move-result-wide v22
+
+    add-long v19, v19, v22
+
+    add-long v22, v19, v17
+
+    add-long/2addr v12, v15
+
+    const/16 v7, 0x12
+
+    invoke-static {v12, v13, v7}, Ljava/lang/Long;->rotateRight(JI)J
 
     move-result-wide v12
 
-    add-long/2addr v10, v12
+    add-long/2addr v12, v8
 
-    add-long v10, v10, v16
+    add-long v17, v12, v1
 
-    const-wide v12, -0x651e95c4d06fbfb1L    # -3.35749372464804E-179
+    move-wide/from16 v15, v22
 
-    add-long/2addr v5, v12
-
-    const/16 v3, 0x12
-
-    invoke-static {v5, v6, v3}, Ljava/lang/Long;->rotateRight(JI)J
-
-    move-result-wide v5
-
-    add-long/2addr v5, v8
-
-    add-long v17, v5, v14
-
-    move-wide v15, v10
-
-    move-wide/from16 v19, v1
+    move-wide/from16 v19, v4
 
     invoke-static/range {v15 .. v20}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
 
-    move-result-wide v5
+    move-result-wide v1
 
-    const/16 v3, 0x10
+    move-object/from16 v7, p0
 
-    invoke-static {v7, v3}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+    invoke-static {v7, v11}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+
+    move-result-wide v10
+
+    mul-long v10, v10, v4
+
+    const/16 v12, 0x18
+
+    invoke-static {v7, v12}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
     move-result-wide v12
 
-    mul-long v12, v12, v1
+    add-int/lit8 v14, v0, -0x20
 
-    const/16 v3, 0x18
-
-    invoke-static {v7, v3}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+    invoke-static {v7, v14}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
     move-result-wide v14
 
-    add-int/lit8 v4, v0, -0x20
+    add-long v22, v22, v14
 
-    invoke-static {v7, v4}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+    mul-long v14, v22, v4
 
-    move-result-wide v16
-
-    add-long v10, v10, v16
-
-    mul-long v10, v10, v1
-
-    sub-int/2addr v0, v3
+    add-int/lit8 v0, v0, -0x18
 
     invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v3
+    move-result-wide v16
 
-    add-long/2addr v5, v3
+    add-long v1, v1, v16
 
-    mul-long v5, v5, v1
+    mul-long v1, v1, v4
 
-    add-long v3, v12, v14
+    add-long v6, v10, v12
 
-    const/16 v0, 0x2b
+    invoke-static {v6, v7, v3}, Ljava/lang/Long;->rotateRight(JI)J
 
-    invoke-static {v3, v4, v0}, Ljava/lang/Long;->rotateRight(JI)J
-
-    move-result-wide v3
+    move-result-wide v6
 
     const/16 v0, 0x1e
 
-    invoke-static {v10, v11, v0}, Ljava/lang/Long;->rotateRight(JI)J
+    invoke-static {v14, v15, v0}, Ljava/lang/Long;->rotateRight(JI)J
 
     move-result-wide v16
 
-    add-long v3, v3, v16
+    add-long v6, v6, v16
 
-    add-long/2addr v3, v5
+    add-long/2addr v1, v6
 
-    add-long/2addr v14, v8
+    add-long/2addr v12, v8
 
     const/16 v0, 0x12
 
-    invoke-static {v14, v15, v0}, Ljava/lang/Long;->rotateRight(JI)J
+    invoke-static {v12, v13, v0}, Ljava/lang/Long;->rotateRight(JI)J
 
-    move-result-wide v5
+    move-result-wide v6
 
-    add-long/2addr v12, v5
+    add-long/2addr v10, v6
 
-    add-long v17, v12, v10
+    add-long v17, v10, v14
 
-    move-wide v15, v3
+    move-wide v15, v1
 
     invoke-static/range {v15 .. v20}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
 
@@ -560,56 +558,54 @@
     return-wide v0
 
     :cond_5
-    const-wide v2, 0x226bb95b4e64b6d4L    # 7.104748899679321E-143
+    const-wide v1, 0x226bb95b4e64b6d4L    # 7.104748899679321E-143
 
-    const-wide v4, 0x134a747f856d0526L    # 9.592726139023731E-216
+    const-wide v5, 0x134a747f856d0526L    # 9.592726139023731E-216
 
-    new-array v11, v1, [J
+    new-array v12, v4, [J
 
-    new-array v12, v1, [J
+    new-array v13, v4, [J
 
-    const-wide v16, 0x1529cba0ca458ffL
+    const-wide v3, 0x1529cba0ca458ffL
 
     invoke-static {v7, v14}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v18
+    move-result-wide v16
 
-    add-long v18, v18, v16
+    add-long v16, v16, v3
 
-    const/4 v13, 0x1
+    const/16 v18, 0x1
 
-    sub-int/2addr v0, v13
+    add-int/lit8 v0, v0, -0x1
 
-    div-int/lit8 v1, v0, 0x40
+    div-int/lit8 v3, v0, 0x40
 
-    shl-int/lit8 v1, v1, 0x6
+    shl-int/lit8 v3, v3, 0x6
 
-    add-int/lit8 v6, v1, 0x0
+    add-int/lit8 v4, v3, 0x0
 
-    and-int/lit8 v1, v0, 0x3f
+    and-int/lit8 v3, v0, 0x3f
 
-    add-int v0, v6, v1
+    add-int v0, v4, v3
 
-    add-int/lit8 v16, v0, -0x3f
+    add-int/lit8 v19, v0, -0x3f
 
-    const/16 v17, 0x0
+    const/16 v20, 0x0
 
     :goto_0
-    const/4 v0, 0x0
+    add-long v16, v16, v1
 
-    add-long v18, v18, v2
+    aget-wide v21, v12, v14
 
-    aget-wide v20, v11, v14
+    add-long v16, v16, v21
 
-    add-long v18, v18, v20
-
-    add-int/lit8 v0, v17, 0x8
+    add-int/lit8 v0, v20, 0x8
 
     invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v20
+    move-result-wide v21
 
-    add-long v14, v18, v20
+    add-long v14, v16, v21
 
     invoke-static {v14, v15, v8}, Ljava/lang/Long;->rotateRight(JI)J
 
@@ -617,171 +613,175 @@
 
     mul-long v14, v14, v9
 
-    aget-wide v18, v11, v13
+    aget-wide v16, v12, v18
 
-    add-long v2, v2, v18
+    add-long v1, v1, v16
 
-    add-int/lit8 v0, v17, 0x30
+    add-int/lit8 v0, v20, 0x30
 
     invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v18
+    move-result-wide v16
 
-    add-long v2, v2, v18
+    add-long v1, v1, v16
 
     const/16 v0, 0x2a
 
-    invoke-static {v2, v3, v0}, Ljava/lang/Long;->rotateRight(JI)J
-
-    move-result-wide v2
-
-    mul-long v2, v2, v9
-
-    aget-wide v18, v12, v13
-
-    xor-long v14, v14, v18
-
-    const/4 v0, 0x0
-
-    aget-wide v18, v11, v0
-
-    add-int/lit8 v8, v17, 0x28
-
-    invoke-static {v7, v8}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
-
-    move-result-wide v20
-
-    add-long v18, v18, v20
-
-    add-long v18, v2, v18
-
-    aget-wide v2, v12, v0
-
-    add-long/2addr v4, v2
-
-    const/16 v2, 0x21
-
-    invoke-static {v4, v5, v2}, Ljava/lang/Long;->rotateRight(JI)J
-
-    move-result-wide v2
-
-    mul-long v20, v2, v9
-
-    aget-wide v2, v11, v13
-
-    mul-long v2, v2, v9
-
-    aget-wide v4, v12, v0
-
-    add-long/2addr v4, v14
-
-    move-object/from16 v0, p0
-
-    move v8, v1
-
-    move/from16 v1, v17
-
-    move v9, v6
-
-    move-object v6, v11
-
-    invoke-static/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/gd;->a([BIJJ[J)V
-
-    add-int/lit8 v1, v17, 0x20
-
-    aget-wide v2, v12, v13
-
-    add-long v2, v20, v2
-
-    add-int/lit8 v0, v17, 0x10
-
-    invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
-
-    move-result-wide v4
-
-    add-long v4, v18, v4
-
-    move-object/from16 v0, p0
-
-    move-object v6, v12
-
-    invoke-static/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/gd;->a([BIJJ[J)V
-
-    const/16 v1, 0x40
-
-    add-int/lit8 v0, v17, 0x40
-
-    if-ne v0, v9, :cond_6
-
-    const-wide/16 v0, 0xff
-
-    and-long/2addr v0, v14
-
-    shl-long/2addr v0, v13
-
-    const-wide v2, -0x4b6d499041670d8dL    # -1.9079014105469082E-55
-
-    add-long v9, v0, v2
-
-    const/4 v0, 0x0
-
-    aget-wide v1, v12, v0
-
-    int-to-long v3, v8
-
-    add-long/2addr v1, v3
-
-    aput-wide v1, v12, v0
-
-    aget-wide v1, v11, v0
-
-    aget-wide v3, v12, v0
-
-    add-long/2addr v1, v3
-
-    aput-wide v1, v11, v0
-
-    aget-wide v1, v12, v0
-
-    aget-wide v3, v11, v0
-
-    add-long/2addr v1, v3
-
-    aput-wide v1, v12, v0
-
-    add-long v20, v20, v18
-
-    aget-wide v1, v11, v0
-
-    add-long v20, v20, v1
-
-    add-int/lit8 v0, v16, 0x8
-
-    invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
-
-    move-result-wide v0
-
-    add-long v0, v20, v0
-
-    const/16 v4, 0x25
-
-    invoke-static {v0, v1, v4}, Ljava/lang/Long;->rotateRight(JI)J
+    invoke-static {v1, v2, v0}, Ljava/lang/Long;->rotateRight(JI)J
 
     move-result-wide v0
 
     mul-long v0, v0, v9
 
-    aget-wide v2, v11, v13
+    aget-wide v16, v13, v18
 
-    add-long v18, v18, v2
+    xor-long v14, v14, v16
 
-    add-int/lit8 v2, v16, 0x30
+    const/4 v2, 0x0
+
+    aget-wide v16, v12, v2
+
+    add-int/lit8 v11, v20, 0x28
+
+    invoke-static {v7, v11}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+
+    move-result-wide v24
+
+    add-long v16, v16, v24
+
+    add-long v16, v0, v16
+
+    aget-wide v0, v13, v2
+
+    add-long/2addr v5, v0
+
+    const/16 v0, 0x21
+
+    invoke-static {v5, v6, v0}, Ljava/lang/Long;->rotateRight(JI)J
+
+    move-result-wide v0
+
+    mul-long v25, v0, v9
+
+    aget-wide v0, v12, v18
+
+    mul-long v5, v0, v9
+
+    aget-wide v0, v13, v2
+
+    add-long v27, v14, v0
+
+    move-object/from16 v0, p0
+
+    move/from16 v1, v20
+
+    move v11, v3
+
+    move-wide v2, v5
+
+    move v6, v4
+
+    move-wide/from16 v4, v27
+
+    move v8, v6
+
+    move-object v6, v12
+
+    invoke-static/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/gd;->a([BIJJ[J)V
+
+    add-int/lit8 v1, v20, 0x20
+
+    aget-wide v2, v13, v18
+
+    add-long v2, v25, v2
+
+    add-int/lit8 v0, v20, 0x10
+
+    invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+
+    move-result-wide v4
+
+    add-long v4, v16, v4
+
+    move-object/from16 v0, p0
+
+    move-object v6, v13
+
+    invoke-static/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/gd;->a([BIJJ[J)V
+
+    const/16 v1, 0x40
+
+    add-int/lit8 v0, v20, 0x40
+
+    if-ne v0, v8, :cond_6
+
+    const-wide/16 v0, 0xff
+
+    and-long/2addr v0, v14
+
+    shl-long v0, v0, v18
+
+    add-long/2addr v9, v0
+
+    const/4 v0, 0x0
+
+    aget-wide v1, v13, v0
+
+    int-to-long v3, v11
+
+    add-long/2addr v1, v3
+
+    aput-wide v1, v13, v0
+
+    aget-wide v1, v12, v0
+
+    aget-wide v3, v13, v0
+
+    add-long/2addr v1, v3
+
+    aput-wide v1, v12, v0
+
+    aget-wide v1, v13, v0
+
+    aget-wide v3, v12, v0
+
+    add-long/2addr v1, v3
+
+    aput-wide v1, v13, v0
+
+    add-long v25, v25, v16
+
+    aget-wide v1, v12, v0
+
+    add-long v25, v25, v1
+
+    add-int/lit8 v0, v19, 0x8
+
+    invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+
+    move-result-wide v0
+
+    add-long v0, v25, v0
+
+    const/16 v2, 0x25
+
+    invoke-static {v0, v1, v2}, Ljava/lang/Long;->rotateRight(JI)J
+
+    move-result-wide v0
+
+    mul-long v0, v0, v9
+
+    aget-wide v2, v12, v18
+
+    add-long v16, v16, v2
+
+    add-int/lit8 v2, v19, 0x30
 
     invoke-static {v7, v2}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
     move-result-wide v2
 
-    add-long v2, v18, v2
+    add-long v2, v16, v2
 
     const/16 v4, 0x2a
 
@@ -791,33 +791,33 @@
 
     mul-long v2, v2, v9
 
-    aget-wide v4, v12, v13
+    aget-wide v4, v13, v18
 
-    const-wide/16 v17, 0x9
+    const-wide/16 v16, 0x9
 
-    mul-long v4, v4, v17
+    mul-long v4, v4, v16
 
-    xor-long v17, v0, v4
+    xor-long v16, v0, v4
 
     const/4 v0, 0x0
 
-    aget-wide v4, v11, v0
+    aget-wide v4, v12, v0
 
-    const-wide/16 v19, 0x9
+    const-wide/16 v22, 0x9
 
-    mul-long v4, v4, v19
+    mul-long v4, v4, v22
 
-    add-int/lit8 v1, v16, 0x28
+    add-int/lit8 v1, v19, 0x28
 
     invoke-static {v7, v1}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
 
-    move-result-wide v19
+    move-result-wide v22
 
-    add-long v4, v4, v19
+    add-long v4, v4, v22
 
-    add-long v19, v2, v4
+    add-long v22, v2, v4
 
-    aget-wide v1, v12, v0
+    aget-wide v1, v13, v0
 
     add-long/2addr v14, v1
 
@@ -829,61 +829,63 @@
 
     mul-long v14, v1, v9
 
-    aget-wide v1, v11, v13
+    aget-wide v1, v12, v18
 
     mul-long v2, v1, v9
 
-    aget-wide v4, v12, v0
+    aget-wide v4, v13, v0
 
-    add-long v4, v17, v4
+    add-long v4, v16, v4
 
     move-object/from16 v0, p0
 
-    move/from16 v1, v16
-
-    move-object v6, v11
-
-    invoke-static/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/gd;->a([BIJJ[J)V
-
-    add-int/lit8 v1, v16, 0x20
-
-    aget-wide v2, v12, v13
-
-    add-long/2addr v2, v14
-
-    const/16 v5, 0x10
-
-    add-int/lit8 v0, v16, 0x10
-
-    invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
-
-    move-result-wide v4
-
-    add-long v4, v19, v4
-
-    move-object/from16 v0, p0
+    move/from16 v1, v19
 
     move-object v6, v12
 
     invoke-static/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/gd;->a([BIJJ[J)V
 
-    const/4 v6, 0x0
+    add-int/lit8 v1, v19, 0x20
 
-    aget-wide v22, v11, v6
+    aget-wide v2, v13, v18
 
-    aget-wide v24, v12, v6
+    add-long/2addr v2, v14
 
-    move-wide/from16 v26, v9
+    const/16 v4, 0x10
 
-    invoke-static/range {v22 .. v27}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
+    add-int/lit8 v0, v19, 0x10
+
+    invoke-static {v7, v0}, Lcom/google/android/gms/internal/clearcut/gd;->l([BI)J
+
+    move-result-wide v4
+
+    add-long v4, v22, v4
+
+    move-object/from16 v0, p0
+
+    move-object v6, v13
+
+    invoke-static/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/gd;->a([BIJJ[J)V
+
+    const/4 v3, 0x0
+
+    aget-wide v0, v12, v3
+
+    aget-wide v4, v13, v3
+
+    move-wide v2, v0
+
+    move-wide v6, v9
+
+    invoke-static/range {v2 .. v7}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
 
     move-result-wide v0
 
     const/16 v2, 0x2f
 
-    ushr-long v2, v19, v2
+    ushr-long v2, v22, v2
 
-    xor-long v2, v19, v2
+    xor-long v2, v22, v2
 
     const-wide v4, -0x3c5a37a36834ced9L    # -7.8480313857871552E17
 
@@ -891,42 +893,42 @@
 
     add-long/2addr v0, v2
 
-    add-long v0, v0, v17
+    add-long v0, v0, v16
 
-    aget-wide v22, v11, v13
+    aget-wide v2, v12, v18
 
-    aget-wide v24, v12, v13
+    aget-wide v4, v13, v18
 
-    invoke-static/range {v22 .. v27}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
+    invoke-static/range {v2 .. v7}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
 
     move-result-wide v2
 
-    add-long v24, v2, v14
+    add-long v4, v2, v14
 
-    move-wide/from16 v22, v0
+    move-wide v2, v0
 
-    invoke-static/range {v22 .. v27}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
+    invoke-static/range {v2 .. v7}, Lcom/google/android/gms/internal/clearcut/gd;->a(JJJ)J
 
     move-result-wide v0
 
     return-wide v0
 
     :cond_6
-    move/from16 v17, v0
+    move/from16 v20, v0
 
-    move v1, v8
+    move v4, v8
 
-    move v6, v9
+    move v3, v11
 
-    move-wide v4, v14
+    move-wide v5, v14
 
-    move-wide/from16 v2, v18
+    move-wide/from16 v1, v16
 
-    move-wide/from16 v18, v20
+    move-wide/from16 v16, v25
 
     const/16 v8, 0x25
 
-    const-wide v9, -0x4b6d499041670d8dL    # -1.9079014105469082E-55
+    const/16 v11, 0x10
 
     const/4 v14, 0x0
 
@@ -956,4 +958,6 @@
     invoke-direct {v1, v0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/ge.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/ge.smali
index 04055dade1..80f73a182c 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/ge.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/ge.smali
@@ -14,6 +14,14 @@
     .end annotation
 .end method
 
+.method public abstract oE()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
 .method public abstract oF()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -69,11 +77,3 @@
         }
     .end annotation
 .end method
-
-.method public abstract oM()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gf.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gf.smali
index 2ab32e087f..1c12ed13e8 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gf.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gf.smali
@@ -41,7 +41,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/clearcut/ay;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oJ()V
 
     goto :goto_0
 
@@ -54,7 +54,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/clearcut/ay;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oH()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oG()V
 
     goto :goto_0
 
@@ -63,7 +63,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/clearcut/ay;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oL()V
 
     goto :goto_0
 
@@ -76,7 +76,7 @@
 
     invoke-virtual {p2, p1}, Landroid/os/Parcel;->createTypedArray(Landroid/os/Parcelable$Creator;)[Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oL()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oK()V
 
     goto :goto_0
 
@@ -87,7 +87,7 @@
 
     invoke-virtual {p2}, Landroid/os/Parcel;->readLong()J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oI()V
 
     goto :goto_0
 
@@ -96,7 +96,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/clearcut/ay;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oH()V
 
     goto :goto_0
 
@@ -107,7 +107,7 @@
 
     invoke-virtual {p2}, Landroid/os/Parcel;->readLong()J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oG()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oF()V
 
     goto :goto_0
 
@@ -116,7 +116,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/clearcut/ay;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/gf;->oE()V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gi.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gi.smali
index aa7fccf1aa..6810d1f33b 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gi.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gi.smali
@@ -157,8 +157,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/clearcut/gi;->Zj:Landroid/content/Context;
-
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/e;->af(Landroid/content/Context;)V
 
     :cond_0
@@ -417,7 +415,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a$b;->pq()Lcom/google/android/gms/internal/clearcut/fu$a$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a$b;->pp()Lcom/google/android/gms/internal/clearcut/fu$a$b$a;
 
     move-result-object p0
 
@@ -433,7 +431,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->np()Lcom/google/android/gms/internal/clearcut/bf;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/bf$a;->no()Lcom/google/android/gms/internal/clearcut/bf;
 
     move-result-object p0
 
@@ -645,8 +643,6 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/clearcut/gi;->Zj:Landroid/content/Context;
-
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/gi;->ag(Landroid/content/Context;)Z
 
     move-result p1
@@ -764,7 +760,7 @@
 
     sget-object v1, Lcom/google/android/gms/internal/clearcut/gi;->aHq:Lcom/google/android/gms/internal/clearcut/n;
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a;->po()Lcom/google/android/gms/internal/clearcut/fu$a;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/fu$a;->pn()Lcom/google/android/gms/internal/clearcut/fu$a;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$a.smali
index 260d2fd6ee..da536ad081 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a;->px()Lcom/google/android/gms/internal/clearcut/gl$a;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a;->pw()Lcom/google/android/gms/internal/clearcut/gl$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$b.smali
index d7fd6b1b80..16a09b7fa0 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$b.smali
@@ -291,7 +291,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -323,7 +323,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/gl$a$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$c.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$c.smali
index 455eea9272..8122d939f7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$c.smali
@@ -357,7 +357,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -389,7 +389,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/gl$a$c;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$d.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$d.smali
index 3e8ee85c30..bab5d66f7a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$d.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a$d.smali
@@ -315,7 +315,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -347,7 +347,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/gl$a$d;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a.smali
index 7136f0e874..bc80ac7329 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gl$a.smali
@@ -86,7 +86,7 @@
     return-void
 .end method
 
-.method static synthetic px()Lcom/google/android/gms/internal/clearcut/gl$a;
+.method static synthetic pw()Lcom/google/android/gms/internal/clearcut/gl$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/gl$a;->zzbf:Lcom/google/android/gms/internal/clearcut/gl$a;
@@ -189,7 +189,7 @@
 
     const/4 p2, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a$c;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a$c;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -203,7 +203,7 @@
 
     const/4 p2, 0x4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -217,7 +217,7 @@
 
     const/4 p2, 0x6
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a$d;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gl$a$d;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gm.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gm.smali
index eee022ed5f..f212937094 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gm.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gm.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gq.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gq.smali
index 762e8237d8..3251240146 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gq.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gq.smali
@@ -415,11 +415,6 @@
     :cond_a
     return-object v0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_5
-
     :cond_b
     :goto_4
     :try_start_2
@@ -434,7 +429,9 @@
     :cond_c
     return-object v3
 
-    :goto_5
+    :catchall_0
+    move-exception p1
+
     if-eqz p0, :cond_d
 
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
@@ -451,6 +448,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p0
+
+    return-void
 .end method
 
 .method private static varargs a(Landroid/content/ContentResolver;[Ljava/lang/String;)Ljava/util/Map;
@@ -531,6 +530,8 @@
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static a(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V
@@ -774,12 +775,10 @@
 
     invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p0
+    move-result-object v1
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object v1, p0
-
     move-wide v2, v4
 
     :catch_0
@@ -897,7 +896,7 @@
     throw p0
 .end method
 
-.method static synthetic py()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic px()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/gq;->aIl:Ljava/util/concurrent/atomic/AtomicBoolean;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/gr.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/gr.smali
index 47d06d7b90..53394148e5 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/gr.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/gr.smali
@@ -18,7 +18,7 @@
 .method public final onChange(Z)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gq;->py()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/gq;->px()Ljava/util/concurrent/atomic/AtomicBoolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/h.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/h.smali
index a2973228e5..8c51ee0342 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/h.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/h.smali
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public final mA()Ljava/lang/Object;
+.method public final mz()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/h;->aiq:Ljava/lang/String;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/l.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/l.smali
index cd0f9b5830..5710d29a8a 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/l.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/l.smali
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method public abstract mA()Ljava/lang/Object;
+.method public abstract mz()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TV;"
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/n.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/n.smali
index 8c8da2ea19..3d082db646 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/n.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/n.smali
@@ -64,29 +64,27 @@
 .method public final bb(Ljava/lang/String;)Lcom/google/android/gms/internal/clearcut/n;
     .locals 8
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/n;->aiy:Z
+    iget-boolean v5, p0, Lcom/google/android/gms/internal/clearcut/n;->aiy:Z
 
-    if-nez v0, :cond_0
+    if-nez v5, :cond_0
 
-    new-instance v0, Lcom/google/android/gms/internal/clearcut/n;
+    new-instance v7, Lcom/google/android/gms/internal/clearcut/n;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/n;->aiu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/n;->aiu:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/n;->aiv:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/n;->aiv:Landroid/net/Uri;
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/clearcut/n;->aix:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/clearcut/n;->aix:Ljava/lang/String;
 
-    iget-boolean v6, p0, Lcom/google/android/gms/internal/clearcut/n;->aiy:Z
+    iget-boolean v6, p0, Lcom/google/android/gms/internal/clearcut/n;->afJ:Z
 
-    iget-boolean v7, p0, Lcom/google/android/gms/internal/clearcut/n;->afJ:Z
+    move-object v0, v7
 
-    move-object v1, v0
+    move-object v3, p1
 
-    move-object v4, p1
+    invoke-direct/range {v0 .. v6}, Lcom/google/android/gms/internal/clearcut/n;-><init>(Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;ZZ)V
 
-    invoke-direct/range {v1 .. v7}, Lcom/google/android/gms/internal/clearcut/n;-><init>(Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;ZZ)V
-
-    return-object v0
+    return-object v7
 
     :cond_0
     new-instance p1, Ljava/lang/IllegalStateException;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$a.smali
index 28591272bc..4e6675db56 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a;->mB()Lcom/google/android/gms/internal/clearcut/o$a;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a;->mA()Lcom/google/android/gms/internal/clearcut/o$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$b.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$b.smali
index 58fb4d8498..601690bc71 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/o$a$b.smali
@@ -157,7 +157,7 @@
     .end packed-switch
 .end method
 
-.method public static mC()Lcom/google/android/gms/internal/clearcut/bj;
+.method public static mB()Lcom/google/android/gms/internal/clearcut/bj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -189,7 +189,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/clearcut/o$a$b;->value:I
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/o$a.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/o$a.smali
index 5a94afe49b..271a5a4641 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/o$a.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/o$a.smali
@@ -92,7 +92,7 @@
     return-void
 .end method
 
-.method static synthetic mB()Lcom/google/android/gms/internal/clearcut/o$a;
+.method static synthetic mA()Lcom/google/android/gms/internal/clearcut/o$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/o$a;->zzes:Lcom/google/android/gms/internal/clearcut/o$a;
@@ -195,7 +195,7 @@
 
     const/4 p2, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -209,7 +209,7 @@
 
     const/4 p2, 0x4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -223,7 +223,7 @@
 
     const/4 p2, 0x6
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -237,7 +237,7 @@
 
     const/16 p2, 0x8
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -251,7 +251,7 @@
 
     const/16 p2, 0xa
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -265,7 +265,7 @@
 
     const/16 p2, 0xc
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
@@ -279,7 +279,7 @@
 
     const/16 p2, 0xe
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mC()Lcom/google/android/gms/internal/clearcut/bj;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/o$a$b;->mB()Lcom/google/android/gms/internal/clearcut/bj;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/p.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/p.smali
index 2673c6b13c..bf18669f75 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/p.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/p.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bf$g;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/r.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/r.smali
index aeec9cc64e..a2fa52b5fc 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/r.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/r.smali
@@ -48,11 +48,11 @@
 
 
 # virtual methods
-.method public final mD()Lcom/google/android/gms/internal/clearcut/ab;
+.method public final mC()Lcom/google/android/gms/internal/clearcut/ab;
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/r;->nj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/r;->ni()I
 
     move-result v0
 
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/clearcut/r;->a(Lcom/google/android/gms/internal/clearcut/am;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/ag;->mN()Lcom/google/android/gms/internal/clearcut/ab;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/clearcut/ag;->mM()Lcom/google/android/gms/internal/clearcut/ab;
 
     move-result-object v0
     :try_end_0
@@ -136,7 +136,7 @@
     throw v1
 .end method
 
-.method mE()I
+.method mD()I
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/s.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/s.smali
index f5fbbdc155..0f8e9148d7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/s.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/s.smali
@@ -33,7 +33,7 @@
 .method public final synthetic a(Lcom/google/android/gms/internal/clearcut/cm;)Lcom/google/android/gms/internal/clearcut/cn;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/s;->nm()Lcom/google/android/gms/internal/clearcut/cm;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/s;->nl()Lcom/google/android/gms/internal/clearcut/cm;
 
     move-result-object v0
 
@@ -81,14 +81,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/s;->mF()Lcom/google/android/gms/internal/clearcut/s;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/s;->mE()Lcom/google/android/gms/internal/clearcut/s;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public abstract mF()Lcom/google/android/gms/internal/clearcut/s;
+.method public abstract mE()Lcom/google/android/gms/internal/clearcut/s;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TBuilderType;"
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/t.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/t.smali
index 4a21809b06..0b0f1043f6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/t.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/t.smali
@@ -21,7 +21,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ar;->na()Lcom/google/android/gms/internal/clearcut/ar;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/ar;->mZ()Lcom/google/android/gms/internal/clearcut/ar;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/u.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/u.smali
index 716fd6cf9c..3c5227dacf 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/u.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/u.smali
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->add(ILjava/lang/Object;)V
 
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->add(Ljava/lang/Object;)Z
 
@@ -80,7 +80,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->addAll(ILjava/util/Collection;)Z
 
@@ -99,7 +99,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->addAll(Ljava/util/Collection;)Z
 
@@ -111,7 +111,7 @@
 .method public clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0}, Ljava/util/AbstractList;->clear()V
 
@@ -227,7 +227,7 @@
     return v1
 .end method
 
-.method protected final kw()V
+.method protected final kv()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/u;->zzfa:Z
@@ -244,7 +244,7 @@
     throw v0
 .end method
 
-.method public mG()Z
+.method public mF()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/clearcut/u;->zzfa:Z
@@ -252,7 +252,7 @@
     return v0
 .end method
 
-.method public final mH()V
+.method public final mG()V
     .locals 1
 
     const/4 v0, 0x0
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(I)Ljava/lang/Object;
 
@@ -282,7 +282,7 @@
 .method public remove(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
 
@@ -301,7 +301,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->removeAll(Ljava/util/Collection;)Z
 
@@ -320,7 +320,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->retainAll(Ljava/util/Collection;)Z
 
@@ -337,7 +337,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/v.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/v.smali
index 49db2fad41..d0c3b587b7 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/v.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/v.smali
@@ -77,7 +77,7 @@
     return-object p0
 .end method
 
-.method static mI()Z
+.method static mH()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/clearcut/v;->aiG:Ljava/lang/Class;
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method static mJ()Ljava/lang/Class;
+.method static mI()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/w.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/w.smali
index 61169f8a89..1c55933ce6 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/w.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/w.smali
@@ -66,14 +66,14 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nw()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
     throw p0
 
     :pswitch_0
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->or()Lcom/google/android/gms/internal/clearcut/dw;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/dw;->oq()Lcom/google/android/gms/internal/clearcut/dw;
 
     move-result-object v6
 
@@ -131,7 +131,7 @@
     return p2
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
@@ -148,19 +148,16 @@
 
     sget-object p1, Lcom/google/android/gms/internal/clearcut/ab;->aiO:Lcom/google/android/gms/internal/clearcut/ab;
 
-    :goto_1
-    invoke-virtual {p4, p0, p1}, Lcom/google/android/gms/internal/clearcut/dw;->e(ILjava/lang/Object;)V
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-static {p1, p2, p3}, Lcom/google/android/gms/internal/clearcut/ab;->c([BII)Lcom/google/android/gms/internal/clearcut/ab;
 
     move-result-object p1
 
-    goto :goto_1
+    :goto_1
+    invoke-virtual {p4, p0, p1}, Lcom/google/android/gms/internal/clearcut/dw;->e(ILjava/lang/Object;)V
 
-    :goto_2
     add-int/2addr p2, p3
 
     return p2
@@ -211,12 +208,14 @@
     return p2
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nw()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
     throw p0
 
+    return-void
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
@@ -246,7 +245,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nw()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
@@ -284,7 +283,7 @@
     return p2
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nx()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
@@ -319,13 +318,13 @@
     return p2
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nw()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
     throw p0
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -483,11 +482,13 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nv()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nu()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
     throw p0
+
+    return-void
 .end method
 
 .method static a([BILcom/google/android/gms/internal/clearcut/x;)I
@@ -549,9 +550,7 @@
 
     or-long/2addr v1, v3
 
-    move-wide v2, v1
-
-    const/4 v1, 0x7
+    const/4 v3, 0x7
 
     :goto_0
     if-gez v0, :cond_1
@@ -560,15 +559,15 @@
 
     aget-byte p1, p0, p1
 
-    add-int/2addr v1, v5
+    add-int/2addr v3, v5
 
     and-int/lit8 v4, p1, 0x7f
 
     int-to-long v6, v4
 
-    shl-long/2addr v6, v1
+    shl-long/2addr v6, v3
 
-    or-long/2addr v2, v6
+    or-long/2addr v1, v6
 
     move v8, v0
 
@@ -579,7 +578,7 @@
     goto :goto_0
 
     :cond_1
-    iput-wide v2, p2, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
+    iput-wide v1, p2, Lcom/google/android/gms/internal/clearcut/x;->aiJ:J
 
     return p1
 .end method
@@ -697,7 +696,7 @@
     return v1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->nz()Lcom/google/android/gms/internal/clearcut/bn;
+    invoke-static {}, Lcom/google/android/gms/internal/clearcut/bn;->ny()Lcom/google/android/gms/internal/clearcut/bn;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/clearcut/y.smali b/com.discord/smali/com/google/android/gms/internal/clearcut/y.smali
index b4eff4b0f0..5190d1108e 100644
--- a/com.discord/smali/com/google/android/gms/internal/clearcut/y.smali
+++ b/com.discord/smali/com/google/android/gms/internal/clearcut/y.smali
@@ -106,7 +106,7 @@
 .method private final c(IZ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-ltz p1, :cond_1
 
@@ -114,29 +114,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -145,8 +137,6 @@
 
     new-array v0, v0, [Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -245,7 +235,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/clearcut/bh;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -271,48 +261,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/y;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
 
-    iget v2, p1, Lcom/google/android/gms/internal/clearcut/y;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([ZI)[Z
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([ZI)[Z
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    iget-object v0, p1, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
 
     iget v4, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/clearcut/y;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/y;->modCount:I
 
@@ -467,7 +449,7 @@
 
     aget-boolean v2, v2, v1
 
-    invoke-static {v2}, Lcom/google/android/gms/internal/clearcut/bh;->K(Z)I
+    invoke-static {v2}, Lcom/google/android/gms/internal/clearcut/bh;->J(Z)I
 
     move-result v2
 
@@ -482,33 +464,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/y;->zzg(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
 
-    aget-boolean v0, v0, p1
+    aget-boolean v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
-
-    iget v4, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
@@ -523,7 +499,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/clearcut/y;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -531,9 +507,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     const/4 v0, 0x0
 
@@ -562,13 +538,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    iget v2, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/clearcut/y;->size:I
 
@@ -598,7 +572,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     if-lt p2, p1, :cond_0
 
@@ -645,19 +619,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/clearcut/u;->kv()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/clearcut/y;->zzg(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
 
-    aget-boolean v0, v0, p1
+    aget-boolean v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/clearcut/y;->aiM:[Z
+    aput-boolean p2, v0, p1
 
-    aput-boolean p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/ab.smali b/com.discord/smali/com/google/android/gms/internal/config/ab.smali
index 9adf0c9e42..0cc3c3a8c2 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/ab.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/ab.smali
@@ -135,23 +135,21 @@
 
     iget-object v2, p0, Lcom/google/android/gms/internal/config/ab;->aJG:[Lcom/google/android/gms/internal/config/ac;
 
+    aget-object v3, v2, v4
+
+    if-eqz v3, :cond_0
+
+    iget-object v3, v1, Lcom/google/android/gms/internal/config/ab;->aJG:[Lcom/google/android/gms/internal/config/ac;
+
     aget-object v2, v2, v4
 
-    if-eqz v2, :cond_0
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/config/ac;->clone()Ljava/lang/Object;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/config/ab;->aJG:[Lcom/google/android/gms/internal/config/ac;
+    move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/config/ab;->aJG:[Lcom/google/android/gms/internal/config/ac;
+    check-cast v2, Lcom/google/android/gms/internal/config/ac;
 
-    aget-object v3, v3, v4
-
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/config/ac;->clone()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/google/android/gms/internal/config/ac;
-
-    aput-object v3, v2, v4
+    aput-object v2, v3, v4
 
     :cond_0
     add-int/lit8 v4, v4, 0x1
@@ -236,20 +234,18 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/ab;->aJF:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/config/ab;->aJF:[I
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/config/ab;->aJF:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/config/ab;->mSize:I
+    iget-object v4, p1, Lcom/google/android/gms/internal/config/ab;->aJF:[I
 
     const/4 v5, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_4
+    if-ge v5, v1, :cond_4
 
-    aget v6, v1, v5
+    aget v6, v3, v5
 
-    aget v7, v3, v5
+    aget v7, v4, v5
 
     if-eq v6, v7, :cond_3
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/ac.smali b/com.discord/smali/com/google/android/gms/internal/config/ac.smali
index 86c8e6315c..92804cc0e6 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/ac.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/ac.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method private final pO()Lcom/google/android/gms/internal/config/ac;
+.method private final pN()Lcom/google/android/gms/internal/config/ac;
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/internal/config/ac;
@@ -93,10 +93,9 @@
 
     check-cast v1, Lcom/google/android/gms/internal/config/af;
 
-    :goto_1
     iput-object v1, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -113,7 +112,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+
+    goto/16 :goto_3
 
     :cond_2
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -134,7 +135,7 @@
 
     iput-object v3, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
 
-    :goto_2
+    :goto_1
     array-length v4, v1
 
     if-ge v2, v4, :cond_9
@@ -151,7 +152,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -168,7 +169,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_4
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -185,7 +188,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_5
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -202,7 +207,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_6
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -219,7 +226,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_7
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -236,7 +245,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_8
     iget-object v1, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -255,7 +266,7 @@
 
     iput-object v3, v0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
 
-    :goto_3
+    :goto_2
     array-length v4, v1
 
     if-ge v2, v4, :cond_9
@@ -274,10 +285,10 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_9
-    :goto_4
+    :goto_3
     return-object v0
 
     :catch_0
@@ -288,6 +299,8 @@
     invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method private final toByteArray()[B
@@ -298,7 +311,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/ac;->pE()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/ac;->pD()I
 
     move-result v0
 
@@ -367,6 +380,8 @@
     invoke-direct {p1}, Ljava/lang/NoSuchMethodError;-><init>()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final synthetic clone()Ljava/lang/Object;
@@ -377,7 +392,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/ac;->pO()Lcom/google/android/gms/internal/config/ac;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/ac;->pN()Lcom/google/android/gms/internal/config/ac;
 
     move-result-object v0
 
@@ -422,8 +437,6 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->aJH:Lcom/google/android/gms/internal/config/aa;
-
     iget-object v0, v0, Lcom/google/android/gms/internal/config/aa;->aJC:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Class;->isArray()Z
@@ -445,11 +458,9 @@
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, [B
+    instance-of v1, v0, [B
 
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_4
 
     check-cast v0, [B
 
@@ -464,13 +475,9 @@
     return p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    instance-of v1, v0, [I
 
-    instance-of v0, v0, [I
-
-    if-eqz v0, :cond_5
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_5
 
     check-cast v0, [I
 
@@ -485,13 +492,9 @@
     return p1
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    instance-of v1, v0, [J
 
-    instance-of v0, v0, [J
-
-    if-eqz v0, :cond_6
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_6
 
     check-cast v0, [J
 
@@ -506,13 +509,9 @@
     return p1
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    instance-of v1, v0, [F
 
-    instance-of v0, v0, [F
-
-    if-eqz v0, :cond_7
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_7
 
     check-cast v0, [F
 
@@ -527,13 +526,9 @@
     return p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    instance-of v1, v0, [D
 
-    instance-of v0, v0, [D
-
-    if-eqz v0, :cond_8
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_8
 
     check-cast v0, [D
 
@@ -548,13 +543,9 @@
     return p1
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    instance-of v1, v0, [Z
 
-    instance-of v0, v0, [Z
-
-    if-eqz v0, :cond_9
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_9
 
     check-cast v0, [Z
 
@@ -569,8 +560,6 @@
     return p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
-
     check-cast v0, [Ljava/lang/Object;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -588,15 +577,11 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/config/ac;->aJI:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/internal/config/ac;->aJI:Ljava/util/List;
 
-    if-eqz v0, :cond_b
+    if-eqz v1, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->aJI:Ljava/util/List;
-
-    iget-object p1, p1, Lcom/google/android/gms/internal/config/ac;->aJI:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
+    invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -658,7 +643,7 @@
     throw v1
 .end method
 
-.method final pE()I
+.method final pD()I
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/gms/internal/config/ac;->value:Ljava/lang/Object;
@@ -715,4 +700,6 @@
     invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/config/ae.smali b/com.discord/smali/com/google/android/gms/internal/config/ae.smali
index 184330f455..b86dbf6b02 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/ae.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/ae.smali
@@ -11,7 +11,7 @@
     return-void
 .end method
 
-.method static pP()Lcom/google/android/gms/internal/config/ae;
+.method static pO()Lcom/google/android/gms/internal/config/ae;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/config/ae;
@@ -23,7 +23,7 @@
     return-object v0
 .end method
 
-.method static pQ()Lcom/google/android/gms/internal/config/ae;
+.method static pP()Lcom/google/android/gms/internal/config/ae;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/config/ae;
diff --git a/com.discord/smali/com/google/android/gms/internal/config/af.smali b/com.discord/smali/com/google/android/gms/internal/config/af.smali
index e1faac0166..5909255422 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/af.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/af.smali
@@ -48,14 +48,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/af;->pN()Lcom/google/android/gms/internal/config/af;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/af;->pM()Lcom/google/android/gms/internal/config/af;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected pE()I
+.method protected pD()I
     .locals 1
 
     const/4 v0, 0x0
@@ -63,7 +63,7 @@
     return v0
 .end method
 
-.method public pN()Lcom/google/android/gms/internal/config/af;
+.method public pM()Lcom/google/android/gms/internal/config/af;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -80,10 +80,10 @@
     return-object v0
 .end method
 
-.method public final pR()I
+.method public final pQ()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/af;->pE()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/af;->pD()I
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/ag.smali b/com.discord/smali/com/google/android/gms/internal/config/ag.smali
index 501e8cddfb..e249b600f9 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/ag.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/ag.smali
@@ -427,7 +427,9 @@
 
     const-string p0, "\""
 
-    goto :goto_8
+    invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
+
+    goto :goto_b
 
     :cond_e
     instance-of p0, p1, [B
@@ -440,17 +442,16 @@
 
     const-string p0, "\"\""
 
-    :goto_8
     invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_f
     invoke-virtual {p3, v0}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
     const/4 p0, 0x0
 
-    :goto_9
+    :goto_8
     array-length v3, p1
 
     if-ge p0, v3, :cond_13
@@ -465,7 +466,7 @@
 
     if-ne v3, v0, :cond_10
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_10
     if-lt v3, p2, :cond_11
@@ -474,7 +475,11 @@
 
     if-ge v3, v4, :cond_11
 
-    goto :goto_b
+    int-to-char v3, v3
+
+    invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
+    goto :goto_a
 
     :cond_11
     const-string v4, "\\%03o"
@@ -493,31 +498,30 @@
 
     invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_12
-    :goto_a
+    :goto_9
     invoke-virtual {p3, v4}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    :goto_b
     int-to-char v3, v3
 
     invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    :goto_c
+    :goto_a
     add-int/lit8 p0, p0, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_13
     invoke-virtual {p3, v0}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_14
     invoke-virtual {p3, p1}, Ljava/lang/StringBuffer;->append(Ljava/lang/Object;)Ljava/lang/StringBuffer;
 
-    :goto_d
+    :goto_b
     const-string p0, "\n"
 
     invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
@@ -644,32 +648,39 @@
 
     move-result v2
 
-    if-nez v1, :cond_1
+    if-nez v1, :cond_0
 
-    :goto_1
     invoke-static {v2}, Ljava/lang/Character;->toLowerCase(C)C
 
     move-result v2
 
-    :cond_0
     invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_1
+    :cond_0
     invoke-static {v2}, Ljava/lang/Character;->isUpperCase(C)Z
 
     move-result v3
 
-    if-eqz v3, :cond_0
+    if-eqz v3, :cond_1
 
     const/16 v3, 0x5f
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
+    invoke-static {v2}, Ljava/lang/Character;->toLowerCase(C)C
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
     goto :goto_1
 
-    :goto_2
+    :cond_1
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali/com/google/android/gms/internal/config/ai.smali b/com.discord/smali/com/google/android/gms/internal/config/ai.smali
index b2bdb683a9..308c28d9d1 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/ai.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/ai.smali
@@ -86,7 +86,7 @@
     const/4 v1, 0x1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v2
 
@@ -176,4 +176,6 @@
     invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/config/aj.smali b/com.discord/smali/com/google/android/gms/internal/config/aj.smali
index 0c47aae20e..136133a6cb 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/aj.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/aj.smali
@@ -69,7 +69,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
 
     return-void
@@ -79,7 +78,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    return-void
 .end method
 
 .method public static b(Landroid/os/Parcel;Landroid/os/Parcelable;)V
diff --git a/com.discord/smali/com/google/android/gms/internal/config/aq.smali b/com.discord/smali/com/google/android/gms/internal/config/aq.smali
index bb68ae465a..4394c4a375 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/aq.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/aq.smali
@@ -6,10 +6,10 @@
 
 
 # virtual methods
-.method public abstract kZ()Lcom/google/android/gms/common/api/Status;
+.method public abstract kY()Lcom/google/android/gms/common/api/Status;
 .end method
 
-.method public abstract mw()Ljava/util/Map;
+.method public abstract mv()Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -22,10 +22,10 @@
     .end annotation
 .end method
 
-.method public abstract pS()J
+.method public abstract pR()J
 .end method
 
-.method public abstract pT()Ljava/util/List;
+.method public abstract pS()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/google/android/gms/internal/config/as.smali b/com.discord/smali/com/google/android/gms/internal/config/as.smali
index 81b4a8ab8e..8acec2a728 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/as.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/as.smali
@@ -65,13 +65,13 @@
     :try_start_0
     iget-object p0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object p0
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0, v2}, Lcom/google/android/gms/measurement/internal/br;->W(Z)Ljava/util/List;
+    invoke-virtual {p0, v2}, Lcom/google/android/gms/measurement/internal/br;->V(Z)Ljava/util/List;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/au.smali b/com.discord/smali/com/google/android/gms/internal/config/au.smali
index cfd908fef5..87dac3a5ad 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/au.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/au.smali
@@ -29,7 +29,7 @@
 
     move-object/from16 v1, p0
 
-    invoke-static {}, Lcom/google/android/gms/common/data/d;->lB()Lcom/google/android/gms/common/data/DataHolder$a;
+    invoke-static {}, Lcom/google/android/gms/common/data/d;->lA()Lcom/google/android/gms/common/data/DataHolder$a;
 
     move-result-object v0
 
@@ -100,24 +100,24 @@
     const/4 v3, 0x0
 
     :try_start_0
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()Ljava/lang/String;
 
     move-result-object v4
     :try_end_0
     .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_1
 
     :try_start_1
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()Lcom/google/firebase/iid/z;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BM()Lcom/google/firebase/iid/z;
 
     move-result-object v5
 
@@ -125,7 +125,7 @@
 
     iget-object v6, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v6}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object v6
 
@@ -141,31 +141,28 @@
     :cond_3
     if-eqz v5, :cond_4
 
-    iget-object v0, v5, Lcom/google/firebase/iid/z;->bzf:Ljava/lang/String;
+    iget-object v3, v5, Lcom/google/firebase/iid/z;->bzf:Ljava/lang/String;
     :try_end_1
     .catch Ljava/lang/IllegalStateException; {:try_start_1 .. :try_end_1} :catch_0
 
-    goto :goto_2
-
     :cond_4
-    move-object v0, v3
+    move-object v13, v3
 
-    :goto_2
-    move-object v13, v0
+    move-object v12, v4
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_0
     move-exception v0
 
-    goto :goto_3
+    goto :goto_2
 
     :catch_1
     move-exception v0
 
     move-object v4, v3
 
-    :goto_3
+    :goto_2
     const-string v5, "ConfigApiImpl"
 
     const/4 v6, 0x3
@@ -185,9 +182,9 @@
     :cond_5
     move-object v13, v3
 
-    :goto_4
     move-object v12, v4
 
+    :goto_3
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/internal/config/as;->aj(Landroid/content/Context;)Ljava/util/List;
 
     move-result-object v16
@@ -249,6 +246,8 @@
     invoke-virtual {v2}, Lcom/google/android/gms/common/data/DataHolder;->close()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final synthetic e(Lcom/google/android/gms/common/api/Status;)Lcom/google/android/gms/common/api/k;
diff --git a/com.discord/smali/com/google/android/gms/internal/config/av.smali b/com.discord/smali/com/google/android/gms/internal/config/av.smali
index ec1ff48ffa..1767544974 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/av.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/av.smali
@@ -43,7 +43,7 @@
     throw v0
 .end method
 
-.method public final pC()V
+.method public final pz()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali/com/google/android/gms/internal/config/aw.smali b/com.discord/smali/com/google/android/gms/internal/config/aw.smali
index 9345366b8e..af65fbfec1 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/aw.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/aw.smali
@@ -49,7 +49,7 @@
 
     iget-object v0, p1, Lcom/google/android/gms/common/internal/d;->mContext:Landroid/content/Context;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/bb;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/bb;->lG()Landroid/os/IInterface;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/az.smali b/com.discord/smali/com/google/android/gms/internal/config/az.smali
index 1065869db6..6034cc2d7e 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/az.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/az.smali
@@ -145,7 +145,7 @@
 
 
 # virtual methods
-.method public final kZ()Lcom/google/android/gms/common/api/Status;
+.method public final kY()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/config/az;->mStatus:Lcom/google/android/gms/common/api/Status;
@@ -153,7 +153,7 @@
     return-object v0
 .end method
 
-.method public final mw()Ljava/util/Map;
+.method public final mv()Ljava/util/Map;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -174,8 +174,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/az;->aKe:Ljava/util/Map;
-
     invoke-interface {v1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v1
@@ -220,7 +218,7 @@
     return-object v0
 .end method
 
-.method public final pS()J
+.method public final pR()J
     .locals 2
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/config/az;->zzs:J
@@ -228,7 +226,7 @@
     return-wide v0
 .end method
 
-.method public final pT()Ljava/util/List;
+.method public final pS()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -252,8 +250,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/az;->aKe:Ljava/util/Map;
-
     invoke-interface {v0, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
diff --git a/com.discord/smali/com/google/android/gms/internal/config/bb.smali b/com.discord/smali/com/google/android/gms/internal/config/bb.smali
index bda9f34a8e..c88ed83f2b 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/bb.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/bb.smali
@@ -69,7 +69,7 @@
     return-object v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.config.START"
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.config.internal.IConfigService"
diff --git a/com.discord/smali/com/google/android/gms/internal/config/e.smali b/com.discord/smali/com/google/android/gms/internal/config/e.smali
index 546b22eeee..f4e7bd966f 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/e.smali
@@ -30,7 +30,7 @@
     .end annotation
 .end method
 
-.method public abstract pC()V
+.method public abstract pz()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali/com/google/android/gms/internal/config/f.smali b/com.discord/smali/com/google/android/gms/internal/config/f.smali
index 7d61b056c7..448218b593 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/f.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/f.smali
@@ -54,7 +54,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/config/aj;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/f;->pC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/f;->pB()V
 
     goto :goto_0
 
@@ -65,7 +65,7 @@
 
     invoke-static {p2}, Lcom/google/android/gms/internal/config/aj;->d(Landroid/os/Parcel;)Ljava/util/HashMap;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/f;->pB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/f;->pA()V
 
     goto :goto_0
 
@@ -76,7 +76,7 @@
 
     invoke-virtual {p2}, Landroid/os/Parcel;->createByteArray()[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/f;->pA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/f;->pz()V
 
     :goto_0
     const/4 p1, 0x1
diff --git a/com.discord/smali/com/google/android/gms/internal/config/k.smali b/com.discord/smali/com/google/android/gms/internal/config/k.smali
index ebab57c983..95873f65e7 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/k.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/k.smali
@@ -209,8 +209,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/k;->aIJ:Lcom/google/android/gms/internal/config/l;
-
     invoke-static {v1}, Lcom/google/android/gms/internal/config/k;->a(Lcom/google/android/gms/internal/config/l;)Lcom/google/android/gms/internal/config/p;
 
     move-result-object v1
@@ -222,8 +220,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/k;->aIK:Lcom/google/android/gms/internal/config/l;
-
     invoke-static {v1}, Lcom/google/android/gms/internal/config/k;->a(Lcom/google/android/gms/internal/config/l;)Lcom/google/android/gms/internal/config/p;
 
     move-result-object v1
@@ -235,8 +231,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/k;->aIL:Lcom/google/android/gms/internal/config/l;
-
     invoke-static {v1}, Lcom/google/android/gms/internal/config/k;->a(Lcom/google/android/gms/internal/config/l;)Lcom/google/android/gms/internal/config/p;
 
     move-result-object v1
@@ -271,8 +265,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/k;->aIM:Lcom/google/android/gms/internal/config/o;
-
     iget-object v1, v1, Lcom/google/android/gms/internal/config/o;->aIW:Ljava/util/Map;
 
     if-eqz v1, :cond_6
@@ -359,7 +351,7 @@
     iput-object v1, v0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
 
     :cond_6
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/config/af;->pR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/config/af;->pQ()I
 
     move-result v1
 
@@ -456,4 +448,6 @@
     invoke-direct {v1, v2, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/config/l.smali b/com.discord/smali/com/google/android/gms/internal/config/l.smali
index f8f4a7c4da..b097a8b611 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/l.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/l.smali
@@ -64,7 +64,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/l;->lQ()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/l;->lP()Z
 
     move-result v1
 
@@ -102,15 +102,13 @@
 
 
 # virtual methods
-.method public final lQ()Z
+.method public final lP()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/config/l;->aIN:Ljava/util/Map;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/l;->aIN:Ljava/util/Map;
-
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
     move-result v0
@@ -130,7 +128,7 @@
 .method public final x(Ljava/lang/String;Ljava/lang/String;)Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/l;->lQ()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/l;->lP()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/m.smali b/com.discord/smali/com/google/android/gms/internal/config/m.smali
index 0917336f3e..d01a56ebc0 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/m.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/m.smali
@@ -24,7 +24,7 @@
 
 
 # virtual methods
-.method public final pD()I
+.method public final pC()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/config/m;->aIR:I
diff --git a/com.discord/smali/com/google/android/gms/internal/config/p.smali b/com.discord/smali/com/google/android/gms/internal/config/p.smali
index f23f27d1aa..d7dd5dd9f6 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/p.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/p.smali
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/config/z;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/config/s;->pG()[Lcom/google/android/gms/internal/config/s;
+    invoke-static {}, Lcom/google/android/gms/internal/config/s;->pF()[Lcom/google/android/gms/internal/config/s;
 
     move-result-object v0
 
@@ -63,7 +63,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v0
 
@@ -105,8 +105,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/p;->aIZ:[[B
-
     array-length v1, v1
 
     :goto_1
@@ -134,7 +132,7 @@
 
     aput-object v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -152,7 +150,7 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pK()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pJ()J
 
     move-result-wide v0
 
@@ -174,8 +172,6 @@
     goto :goto_3
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/p;->aIY:[Lcom/google/android/gms/internal/config/s;
-
     array-length v1, v1
 
     :goto_3
@@ -207,7 +203,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/config/v;->a(Lcom/google/android/gms/internal/config/af;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -246,8 +242,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/p;->aIY:[Lcom/google/android/gms/internal/config/s;
-
     array-length v0, v0
 
     if-lez v0, :cond_1
@@ -257,11 +251,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/config/p;->aIY:[Lcom/google/android/gms/internal/config/s;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_1
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/p;->aIY:[Lcom/google/android/gms/internal/config/s;
+    if-ge v0, v3, :cond_1
 
     aget-object v2, v2, v0
 
@@ -287,8 +279,6 @@
 
     const/4 v0, 0x2
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/config/p;->timestamp:J
-
     invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/config/w;->c(IJ)V
 
     :cond_2
@@ -296,8 +286,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/p;->aIZ:[[B
-
     array-length v0, v0
 
     if-lez v0, :cond_4
@@ -305,11 +293,9 @@
     :goto_1
     iget-object v0, p0, Lcom/google/android/gms/internal/config/p;->aIZ:[[B
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_4
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/p;->aIZ:[[B
+    if-ge v1, v2, :cond_4
 
     aget-object v0, v0, v1
 
@@ -438,7 +424,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 5
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -468,11 +454,9 @@
 
     iget-wide v1, p0, Lcom/google/android/gms/internal/config/p;->timestamp:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/config/p;->timestamp:J
+    const/16 v3, 0x20
 
-    const/16 v5, 0x20
-
-    ushr-long/2addr v3, v5
+    ushr-long v3, v1, v3
 
     xor-long/2addr v1, v3
 
@@ -525,10 +509,10 @@
     return v0
 .end method
 
-.method protected final pE()I
+.method protected final pD()I
     .locals 8
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pE()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pD()I
 
     move-result v0
 
@@ -540,8 +524,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/p;->aIY:[Lcom/google/android/gms/internal/config/s;
-
     array-length v1, v1
 
     if-lez v1, :cond_2
@@ -553,11 +535,9 @@
     :goto_0
     iget-object v4, p0, Lcom/google/android/gms/internal/config/p;->aIY:[Lcom/google/android/gms/internal/config/s;
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v0, v4, :cond_1
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/config/p;->aIY:[Lcom/google/android/gms/internal/config/s;
+    if-ge v0, v5, :cond_1
 
     aget-object v4, v4, v0
 
@@ -601,8 +581,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/p;->aIZ:[[B
-
     array-length v1, v1
 
     if-lez v1, :cond_6
@@ -614,11 +592,9 @@
     :goto_1
     iget-object v5, p0, Lcom/google/android/gms/internal/config/p;->aIZ:[[B
 
-    array-length v5, v5
+    array-length v6, v5
 
-    if-ge v2, v5, :cond_5
-
-    iget-object v5, p0, Lcom/google/android/gms/internal/config/p;->aIZ:[[B
+    if-ge v2, v6, :cond_5
 
     aget-object v5, v5, v2
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/q.smali b/com.discord/smali/com/google/android/gms/internal/config/q.smali
index 161ea9316d..808d2c42e1 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/q.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/q.smali
@@ -47,7 +47,7 @@
     return-void
 .end method
 
-.method public static pF()[Lcom/google/android/gms/internal/config/q;
+.method public static pE()[Lcom/google/android/gms/internal/config/q;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/config/q;->aJa:[Lcom/google/android/gms/internal/config/q;
@@ -102,7 +102,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v0
 
@@ -158,8 +158,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/q;->aJb:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -229,8 +227,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/q;->aJb:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/config/q;->aJb:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -334,8 +330,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/q;->aJb:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -383,10 +377,10 @@
     return v0
 .end method
 
-.method protected final pE()I
+.method protected final pD()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pE()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pD()I
 
     move-result v0
 
@@ -394,8 +388,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/q;->aJb:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/com/google/android/gms/internal/config/r.smali b/com.discord/smali/com/google/android/gms/internal/config/r.smali
index fd73f94601..c4323ae970 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/r.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/r.smali
@@ -59,7 +59,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v0
 
@@ -86,7 +86,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pK()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pJ()J
 
     move-result-wide v0
 
@@ -95,7 +95,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v0
 
@@ -114,7 +114,7 @@
     goto :goto_0
 
     :cond_4
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v0
 
@@ -138,8 +138,6 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/config/r;->aJd:I
-
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/config/w;->cm(I)V
 
     :cond_0
@@ -147,8 +145,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/config/r;->aJe:Z
-
     const/4 v1, 0x2
 
     const/4 v2, 0x0
@@ -200,11 +196,9 @@
 
     if-eqz v4, :cond_3
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/config/r;->aJf:J
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/config/w;->c(IJ)V
+    invoke-virtual {p1, v2, v0, v1}, Lcom/google/android/gms/internal/config/w;->c(IJ)V
 
     :cond_3
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/config/z;->a(Lcom/google/android/gms/internal/config/w;)V
@@ -312,7 +306,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 5
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -354,11 +348,9 @@
 
     iget-wide v1, p0, Lcom/google/android/gms/internal/config/r;->aJf:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/config/r;->aJf:J
+    const/16 v3, 0x20
 
-    const/16 v5, 0x20
-
-    ushr-long/2addr v3, v5
+    ushr-long v3, v1, v3
 
     xor-long/2addr v1, v3
 
@@ -401,10 +393,10 @@
     return v0
 .end method
 
-.method protected final pE()I
+.method protected final pD()I
     .locals 6
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pE()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pD()I
 
     move-result v0
 
@@ -412,8 +404,6 @@
 
     if-eqz v1, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/config/r;->aJd:I
-
     invoke-static {v1}, Lcom/google/android/gms/internal/config/w;->cn(I)I
 
     move-result v1
diff --git a/com.discord/smali/com/google/android/gms/internal/config/s.smali b/com.discord/smali/com/google/android/gms/internal/config/s.smali
index a001020ad0..9023b4042e 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/s.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/s.smali
@@ -32,7 +32,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/config/s;->aJh:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/config/q;->pF()[Lcom/google/android/gms/internal/config/q;
+    invoke-static {}, Lcom/google/android/gms/internal/config/q;->pE()[Lcom/google/android/gms/internal/config/q;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
     return-void
 .end method
 
-.method public static pG()[Lcom/google/android/gms/internal/config/s;
+.method public static pF()[Lcom/google/android/gms/internal/config/s;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/config/s;->aJg:[Lcom/google/android/gms/internal/config/s;
@@ -104,7 +104,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v0
 
@@ -142,8 +142,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/s;->aJi:[Lcom/google/android/gms/internal/config/q;
-
     array-length v1, v1
 
     :goto_1
@@ -175,7 +173,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/config/v;->a(Lcom/google/android/gms/internal/config/af;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -221,8 +219,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/s;->aJh:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -242,8 +238,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/s;->aJi:[Lcom/google/android/gms/internal/config/q;
-
     array-length v0, v0
 
     if-lez v0, :cond_2
@@ -253,11 +247,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/config/s;->aJi:[Lcom/google/android/gms/internal/config/q;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_2
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/s;->aJi:[Lcom/google/android/gms/internal/config/q;
+    if-ge v0, v2, :cond_2
 
     aget-object v1, v1, v0
 
@@ -310,8 +302,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/s;->aJh:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/config/s;->aJh:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -415,8 +405,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/s;->aJh:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -464,10 +452,10 @@
     return v0
 .end method
 
-.method protected final pE()I
+.method protected final pD()I
     .locals 4
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pE()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pD()I
 
     move-result v0
 
@@ -475,8 +463,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/s;->aJh:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -500,8 +486,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/s;->aJi:[Lcom/google/android/gms/internal/config/q;
-
     array-length v1, v1
 
     if-lez v1, :cond_2
@@ -511,11 +495,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/config/s;->aJi:[Lcom/google/android/gms/internal/config/q;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/s;->aJi:[Lcom/google/android/gms/internal/config/q;
+    if-ge v1, v3, :cond_2
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/t.smali b/com.discord/smali/com/google/android/gms/internal/config/t.smali
index 21f5fd66af..d3bb7b423d 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/t.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/t.smali
@@ -40,7 +40,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJm:Lcom/google/android/gms/internal/config/r;
 
-    invoke-static {}, Lcom/google/android/gms/internal/config/u;->pH()[Lcom/google/android/gms/internal/config/u;
+    invoke-static {}, Lcom/google/android/gms/internal/config/u;->pG()[Lcom/google/android/gms/internal/config/u;
 
     move-result-object v1
 
@@ -67,7 +67,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v0
 
@@ -117,8 +117,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
-
     array-length v1, v1
 
     :goto_1
@@ -150,7 +148,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/config/v;->a(Lcom/google/android/gms/internal/config/af;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -185,7 +183,9 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJm:Lcom/google/android/gms/internal/config/r;
 
-    goto :goto_3
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/config/v;->a(Lcom/google/android/gms/internal/config/af;)V
+
+    goto :goto_0
 
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJl:Lcom/google/android/gms/internal/config/p;
@@ -201,7 +201,9 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJl:Lcom/google/android/gms/internal/config/p;
 
-    goto :goto_3
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/config/v;->a(Lcom/google/android/gms/internal/config/af;)V
+
+    goto :goto_0
 
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJk:Lcom/google/android/gms/internal/config/p;
@@ -217,7 +219,9 @@
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJk:Lcom/google/android/gms/internal/config/p;
 
-    goto :goto_3
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/config/v;->a(Lcom/google/android/gms/internal/config/af;)V
+
+    goto/16 :goto_0
 
     :cond_b
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJj:Lcom/google/android/gms/internal/config/p;
@@ -233,7 +237,6 @@
     :cond_c
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJj:Lcom/google/android/gms/internal/config/p;
 
-    :goto_3
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/config/v;->a(Lcom/google/android/gms/internal/config/af;)V
 
     goto/16 :goto_0
@@ -254,8 +257,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJj:Lcom/google/android/gms/internal/config/p;
-
     const/4 v1, 0x1
 
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/config/w;->a(ILcom/google/android/gms/internal/config/af;)V
@@ -265,41 +266,33 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJk:Lcom/google/android/gms/internal/config/p;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/config/w;->a(ILcom/google/android/gms/internal/config/af;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/config/w;->a(ILcom/google/android/gms/internal/config/af;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJl:Lcom/google/android/gms/internal/config/p;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJl:Lcom/google/android/gms/internal/config/p;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/config/w;->a(ILcom/google/android/gms/internal/config/af;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/config/w;->a(ILcom/google/android/gms/internal/config/af;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJm:Lcom/google/android/gms/internal/config/r;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJm:Lcom/google/android/gms/internal/config/r;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/config/w;->a(ILcom/google/android/gms/internal/config/af;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/config/w;->a(ILcom/google/android/gms/internal/config/af;)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
-
     array-length v0, v0
 
     if-lez v0, :cond_5
@@ -309,11 +302,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_5
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
+    if-ge v0, v2, :cond_5
 
     aget-object v1, v1, v0
 
@@ -366,8 +357,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJj:Lcom/google/android/gms/internal/config/p;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/config/t;->aJj:Lcom/google/android/gms/internal/config/p;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/config/p;->equals(Ljava/lang/Object;)Z
@@ -390,8 +379,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJk:Lcom/google/android/gms/internal/config/p;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/config/t;->aJk:Lcom/google/android/gms/internal/config/p;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/config/p;->equals(Ljava/lang/Object;)Z
@@ -414,8 +401,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJl:Lcom/google/android/gms/internal/config/p;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/config/t;->aJl:Lcom/google/android/gms/internal/config/p;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/config/p;->equals(Ljava/lang/Object;)Z
@@ -438,8 +423,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJm:Lcom/google/android/gms/internal/config/r;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/config/t;->aJm:Lcom/google/android/gms/internal/config/r;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/config/r;->equals(Ljava/lang/Object;)Z
@@ -644,10 +627,10 @@
     return v0
 .end method
 
-.method protected final pE()I
+.method protected final pD()I
     .locals 4
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pE()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pD()I
 
     move-result v0
 
@@ -655,8 +638,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJj:Lcom/google/android/gms/internal/config/p;
-
     const/4 v2, 0x1
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/config/w;->b(ILcom/google/android/gms/internal/config/af;)I
@@ -670,11 +651,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/t;->aJk:Lcom/google/android/gms/internal/config/p;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/config/w;->b(ILcom/google/android/gms/internal/config/af;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/config/w;->b(ILcom/google/android/gms/internal/config/af;)I
 
     move-result v1
 
@@ -685,11 +664,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/t;->aJl:Lcom/google/android/gms/internal/config/p;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/config/w;->b(ILcom/google/android/gms/internal/config/af;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/config/w;->b(ILcom/google/android/gms/internal/config/af;)I
 
     move-result v1
 
@@ -700,11 +677,9 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/t;->aJm:Lcom/google/android/gms/internal/config/r;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/config/w;->b(ILcom/google/android/gms/internal/config/af;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/config/w;->b(ILcom/google/android/gms/internal/config/af;)I
 
     move-result v1
 
@@ -715,8 +690,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
-
     array-length v1, v1
 
     if-lez v1, :cond_5
@@ -726,11 +699,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_5
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/t;->aJn:[Lcom/google/android/gms/internal/config/u;
+    if-ge v1, v3, :cond_5
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/u.smali b/com.discord/smali/com/google/android/gms/internal/config/u.smali
index 0dc43f686b..e12523f71d 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/u.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/u.smali
@@ -53,7 +53,7 @@
     return-void
 .end method
 
-.method public static pH()[Lcom/google/android/gms/internal/config/u;
+.method public static pG()[Lcom/google/android/gms/internal/config/u;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/config/u;->aJo:[Lcom/google/android/gms/internal/config/u;
@@ -108,7 +108,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v0
 
@@ -144,7 +144,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pK()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pJ()J
 
     move-result-wide v0
 
@@ -153,7 +153,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v0
 
@@ -177,8 +177,6 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/config/u;->resourceId:I
-
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/config/w;->cm(I)V
 
     :cond_0
@@ -190,19 +188,15 @@
 
     if-eqz v4, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v2, 0x2
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/config/u;->adS:J
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/config/w;->c(IJ)V
+    invoke-virtual {p1, v2, v0, v1}, Lcom/google/android/gms/internal/config/w;->c(IJ)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/config/u;->aJh:Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/u;->aJh:Ljava/lang/String;
-
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -275,8 +269,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/u;->aJh:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/config/u;->aJh:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -338,7 +330,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 5
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -364,11 +356,9 @@
 
     iget-wide v1, p0, Lcom/google/android/gms/internal/config/u;->adS:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/config/u;->adS:J
+    const/16 v3, 0x20
 
-    const/16 v5, 0x20
-
-    ushr-long/2addr v3, v5
+    ushr-long v3, v1, v3
 
     xor-long/2addr v1, v3
 
@@ -389,8 +379,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/u;->aJh:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -428,10 +416,10 @@
     return v0
 .end method
 
-.method protected final pE()I
+.method protected final pD()I
     .locals 6
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pE()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/config/z;->pD()I
 
     move-result v0
 
@@ -439,8 +427,6 @@
 
     if-eqz v1, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/config/u;->resourceId:I
-
     invoke-static {v1}, Lcom/google/android/gms/internal/config/w;->cn(I)I
 
     move-result v1
@@ -471,8 +457,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/config/u;->aJh:Ljava/lang/String;
-
     const-string v2, ""
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/com/google/android/gms/internal/config/v.smali b/com.discord/smali/com/google/android/gms/internal/config/v.smali
index c26ac04a06..28ffb44a0d 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/v.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/v.smali
@@ -62,7 +62,7 @@
 .end method
 
 .method private final cl(I)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -73,21 +73,17 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
 
-    add-int/2addr v0, p1
+    add-int v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/config/v;->aJv:I
+    iget v2, p0, Lcom/google/android/gms/internal/config/v;->aJv:I
 
-    if-gt v0, v1, :cond_1
+    if-gt v1, v2, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJr:I
+    iget v1, p0, Lcom/google/android/gms/internal/config/v;->aJr:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
+    sub-int/2addr v1, v0
 
-    sub-int/2addr v0, v1
-
-    if-gt p1, v0, :cond_0
-
-    iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
+    if-gt p1, v1, :cond_0
 
     add-int/2addr v0, p1
 
@@ -96,29 +92,25 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pO()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    iget p1, p0, Lcom/google/android/gms/internal/config/v;->aJv:I
+    sub-int/2addr v2, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
+    invoke-direct {p0, v2}, Lcom/google/android/gms/internal/config/v;->cl(I)V
 
-    sub-int/2addr p1, v0
-
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/config/v;->cl(I)V
-
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pO()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pQ()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object p1
 
@@ -135,7 +127,7 @@
     return-object v0
 .end method
 
-.method private final pL()V
+.method private final pK()V
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJr:I
@@ -152,13 +144,9 @@
 
     if-le v0, v1, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/config/v;->aJv:I
+    sub-int v1, v0, v1
 
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Lcom/google/android/gms/internal/config/v;->aJs:I
-
-    iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJr:I
+    iput v1, p0, Lcom/google/android/gms/internal/config/v;->aJs:I
 
     iget v1, p0, Lcom/google/android/gms/internal/config/v;->aJs:I
 
@@ -176,7 +164,7 @@
     return-void
 .end method
 
-.method private final pM()B
+.method private final pL()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -190,20 +178,18 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/config/v;->buffer:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/config/v;->buffer:[B
 
-    iget v1, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
     iput v2, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
 
-    aget-byte v0, v0, v1
+    aget-byte v0, v1, v0
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pO()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object v0
 
@@ -244,7 +230,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v0
 
@@ -266,7 +252,7 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/config/v;->aJv:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pK()V
 
     iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJw:I
 
@@ -288,19 +274,19 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/config/v;->aJv:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pK()V
 
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pO()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pQ()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object p1
 
@@ -339,13 +325,13 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     return v1
 
@@ -356,7 +342,7 @@
 
     :cond_0
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pH()I
 
     move-result v0
 
@@ -380,7 +366,7 @@
     return v1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result p1
 
@@ -389,12 +375,12 @@
     return v1
 
     :pswitch_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pK()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pJ()J
 
     return v1
 
     :pswitch_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     return v1
 
@@ -423,7 +409,7 @@
     return v0
 .end method
 
-.method public final pI()I
+.method public final pH()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -444,7 +430,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v0
 
@@ -454,8 +440,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/config/v;->aJu:I
-
     return v0
 
     :cond_1
@@ -468,7 +452,7 @@
     throw v0
 .end method
 
-.method public final pJ()I
+.method public final pI()I
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -476,7 +460,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v0
 
@@ -487,7 +471,7 @@
     :cond_0
     and-int/lit8 v0, v0, 0x7f
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v1
 
@@ -495,10 +479,9 @@
 
     shl-int/lit8 v1, v1, 0x7
 
-    :goto_0
     or-int/2addr v0, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     and-int/lit8 v1, v1, 0x7f
@@ -507,7 +490,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v1
 
@@ -515,7 +498,9 @@
 
     shl-int/lit8 v1, v1, 0xe
 
-    goto :goto_0
+    or-int/2addr v0, v1
+
+    goto :goto_1
 
     :cond_2
     and-int/lit8 v1, v1, 0x7f
@@ -524,7 +509,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v1
 
@@ -532,7 +517,9 @@
 
     shl-int/lit8 v1, v1, 0x15
 
-    goto :goto_0
+    or-int/2addr v0, v1
+
+    goto :goto_1
 
     :cond_3
     and-int/lit8 v1, v1, 0x7f
@@ -541,7 +528,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v1
 
@@ -553,12 +540,12 @@
 
     const/4 v1, 0x0
 
-    :goto_1
+    :goto_0
     const/4 v2, 0x5
 
     if-ge v1, v2, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v2
 
@@ -569,7 +556,7 @@
     :cond_4
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_5
     new-instance v0, Lcom/google/android/gms/internal/config/ae;
@@ -581,11 +568,11 @@
     throw v0
 
     :cond_6
-    :goto_2
+    :goto_1
     return v0
 .end method
 
-.method public final pK()J
+.method public final pJ()J
     .locals 13
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -593,35 +580,35 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v3
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v4
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v6
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pM()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/config/v;->pL()B
 
     move-result v7
 
@@ -712,7 +699,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v0
 
@@ -735,13 +722,11 @@
 
     new-array v1, v0, [B
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/v;->buffer:[B
-
-    iget v3, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
+    iget-object v3, p0, Lcom/google/android/gms/internal/config/v;->buffer:[B
 
     const/4 v4, 0x0
 
-    invoke-static {v2, v3, v1, v4, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v3, v2, v1, v4, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget v2, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
 
@@ -752,14 +737,14 @@
     return-object v1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pO()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pQ()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object v0
 
@@ -774,7 +759,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v0
 
@@ -790,13 +775,11 @@
 
     new-instance v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/config/v;->buffer:[B
-
-    iget v3, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
+    iget-object v3, p0, Lcom/google/android/gms/internal/config/v;->buffer:[B
 
     sget-object v4, Lcom/google/android/gms/internal/config/ad;->UTF_8:Ljava/nio/charset/Charset;
 
-    invoke-direct {v1, v2, v3, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
+    invoke-direct {v1, v3, v2, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
     iget v2, p0, Lcom/google/android/gms/internal/config/v;->aJt:I
 
@@ -807,14 +790,14 @@
     return-object v1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pO()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object v0
 
     throw v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pQ()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/config/w.smali b/com.discord/smali/com/google/android/gms/internal/config/w.smali
index 1c3dedca4c..7928fb8b5b 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/w.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/w.smali
@@ -115,7 +115,7 @@
 
     add-int/2addr v7, v9
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_1
     add-int/2addr v7, v5
@@ -137,10 +137,9 @@
 
     aput-byte v10, v0, v7
 
-    :goto_2
     move v7, v11
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     if-ge v10, v4, :cond_3
@@ -169,7 +168,7 @@
 
     aput-byte v10, v0, v11
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     if-lt v10, v3, :cond_4
@@ -213,6 +212,8 @@
 
     aput-byte v10, v0, v7
 
+    move v7, v11
+
     goto :goto_2
 
     :cond_5
@@ -288,7 +289,7 @@
 
     move v5, v11
 
-    :goto_3
+    :goto_2
     add-int/lit8 v5, v5, 0x1
 
     goto/16 :goto_1
@@ -349,7 +350,7 @@
     throw p0
 
     :cond_9
-    :goto_4
+    :goto_3
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->arrayOffset()I
 
     move-result p0
@@ -378,7 +379,7 @@
 
     move-result v0
 
-    :goto_5
+    :goto_4
     if-ge v5, v0, :cond_11
 
     invoke-interface {p0, v5}, Ljava/lang/CharSequence;->charAt(I)C
@@ -387,12 +388,11 @@
 
     if-ge v7, v6, :cond_b
 
-    :goto_6
     int-to-byte v7, v7
 
     invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    goto/16 :goto_9
+    goto/16 :goto_6
 
     :cond_b
     if-ge v7, v4, :cond_c
@@ -401,7 +401,6 @@
 
     or-int/lit16 v8, v8, 0x3c0
 
-    :goto_7
     int-to-byte v8, v8
 
     invoke-virtual {p1, v8}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
@@ -410,6 +409,10 @@
 
     or-int/2addr v7, v6
 
+    int-to-byte v7, v7
+
+    invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
     goto :goto_6
 
     :cond_c
@@ -417,7 +420,7 @@
 
     if-ge v2, v7, :cond_d
 
-    goto :goto_8
+    goto :goto_5
 
     :cond_d
     add-int/lit8 v8, v5, 0x1
@@ -480,7 +483,7 @@
 
     move v5, v8
 
-    goto :goto_9
+    goto :goto_6
 
     :cond_e
     move v5, v8
@@ -509,7 +512,7 @@
     throw p0
 
     :cond_10
-    :goto_8
+    :goto_5
     ushr-int/lit8 v8, v7, 0xc
 
     or-int/lit16 v8, v8, 0x1e0
@@ -524,12 +527,22 @@
 
     or-int/2addr v8, v6
 
-    goto :goto_7
+    int-to-byte v8, v8
 
-    :goto_9
+    invoke-virtual {p1, v8}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    and-int/lit8 v7, v7, 0x3f
+
+    or-int/2addr v7, v6
+
+    int-to-byte v7, v7
+
+    invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    :goto_6
     add-int/lit8 v5, v5, 0x1
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_11
     return-void
@@ -540,6 +553,8 @@
     invoke-direct {p0}, Ljava/nio/ReadOnlyBufferException;-><init>()V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static b(ILcom/google/android/gms/internal/config/af;)I
@@ -551,7 +566,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/af;->pR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/config/af;->pQ()I
 
     move-result p1
 
@@ -726,6 +741,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static cn(I)I
@@ -940,7 +957,7 @@
 
     if-gez p1, :cond_0
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/config/af;->pR()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/config/af;->pQ()I
 
     :cond_0
     iget p1, p2, Lcom/google/android/gms/internal/config/af;->aJK:I
@@ -1270,6 +1287,8 @@
     invoke-direct {p1, v0, v1}, Lcom/google/android/gms/internal/config/y;-><init>(II)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final cq(I)V
diff --git a/com.discord/smali/com/google/android/gms/internal/config/z.smali b/com.discord/smali/com/google/android/gms/internal/config/z.smali
index 740b60c765..851d200e19 100644
--- a/com.discord/smali/com/google/android/gms/internal/config/z.smali
+++ b/com.discord/smali/com/google/android/gms/internal/config/z.smali
@@ -127,7 +127,7 @@
 
     const/4 p2, 0x0
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_2
 
     new-instance p1, Lcom/google/android/gms/internal/config/ab;
 
@@ -135,20 +135,16 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/config/z;->aJB:Lcom/google/android/gms/internal/config/ab;
 
-    :cond_2
-    :goto_1
     move-object p1, p2
 
     goto :goto_2
 
-    :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/config/z;->aJB:Lcom/google/android/gms/internal/config/ab;
-
+    :cond_2
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/config/ab;->cs(I)I
 
     move-result v3
 
-    if-ltz v3, :cond_2
+    if-ltz v3, :cond_4
 
     iget-object v4, p1, Lcom/google/android/gms/internal/config/ab;->aJG:[Lcom/google/android/gms/internal/config/ac;
 
@@ -156,15 +152,21 @@
 
     sget-object v5, Lcom/google/android/gms/internal/config/ab;->aJD:Lcom/google/android/gms/internal/config/ac;
 
-    if-ne v4, v5, :cond_4
+    if-ne v4, v5, :cond_3
 
     goto :goto_1
 
-    :cond_4
+    :cond_3
     iget-object p1, p1, Lcom/google/android/gms/internal/config/ab;->aJG:[Lcom/google/android/gms/internal/config/ac;
 
     aget-object p1, p1, v3
 
+    goto :goto_2
+
+    :cond_4
+    :goto_1
+    move-object p1, p2
+
     :goto_2
     const/4 v3, 0x1
 
@@ -321,7 +323,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/config/v;->pJ()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/config/v;->pI()I
 
     move-result v2
 
@@ -355,7 +357,7 @@
     return v3
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pP()Lcom/google/android/gms/internal/config/ae;
+    invoke-static {}, Lcom/google/android/gms/internal/config/ae;->pO()Lcom/google/android/gms/internal/config/ae;
 
     move-result-object p1
 
@@ -394,7 +396,7 @@
         }
     .end annotation
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/config/af;->pN()Lcom/google/android/gms/internal/config/af;
+    invoke-super {p0}, Lcom/google/android/gms/internal/config/af;->pM()Lcom/google/android/gms/internal/config/af;
 
     move-result-object v0
 
@@ -405,7 +407,7 @@
     return-object v0
 .end method
 
-.method protected pE()I
+.method protected pD()I
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/internal/config/z;->aJB:Lcom/google/android/gms/internal/config/ab;
@@ -429,7 +431,7 @@
 
     aget-object v2, v2, v1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/config/ac;->pE()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/config/ac;->pD()I
 
     move-result v2
 
@@ -446,7 +448,7 @@
     return v0
 .end method
 
-.method public final synthetic pN()Lcom/google/android/gms/internal/config/af;
+.method public final synthetic pM()Lcom/google/android/gms/internal/config/af;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/d/c.smali b/com.discord/smali/com/google/android/gms/internal/d/c.smali
index 79ed36d23d..3348f6bb98 100644
--- a/com.discord/smali/com/google/android/gms/internal/d/c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/d/c.smali
@@ -23,7 +23,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/d/c;->tA()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/d/c;->tz()Ljava/lang/Integer;
 
     move-result-object v1
     :try_end_0
@@ -46,11 +46,6 @@
 
     goto :goto_1
 
-    :catch_0
-    move-exception v2
-
-    goto :goto_0
-
     :cond_0
     const-string v2, "com.google.devtools.build.android.desugar.runtime.twr_disable_mimic"
 
@@ -77,6 +72,11 @@
 
     goto :goto_1
 
+    :catch_0
+    move-exception v2
+
+    goto :goto_0
+
     :catch_1
     move-exception v2
 
@@ -157,7 +157,7 @@
     return-void
 .end method
 
-.method private static tA()Ljava/lang/Integer;
+.method private static tz()Ljava/lang/Integer;
     .locals 4
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/com/google/android/gms/internal/d/e.smali b/com.discord/smali/com/google/android/gms/internal/d/e.smali
index 2aac9b0531..c3df2cec97 100644
--- a/com.discord/smali/com/google/android/gms/internal/d/e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/d/e.smali
@@ -68,19 +68,25 @@
         }
     .end annotation
 
-    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/d/e;->aTl:Ljava/lang/ref/ReferenceQueue;
 
     invoke-virtual {v0}, Ljava/lang/ref/ReferenceQueue;->poll()Ljava/lang/ref/Reference;
 
     move-result-object v0
 
+    :goto_0
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/d/e;->aTk: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/d/e;->aTl:Ljava/lang/ref/ReferenceQueue;
+
+    invoke-virtual {v0}, Ljava/lang/ref/ReferenceQueue;->poll()Ljava/lang/ref/Reference;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_0
diff --git a/com.discord/smali/com/google/android/gms/internal/d/f.smali b/com.discord/smali/com/google/android/gms/internal/d/f.smali
index bcc065f8fb..7cb616fa8d 100644
--- a/com.discord/smali/com/google/android/gms/internal/d/f.smali
+++ b/com.discord/smali/com/google/android/gms/internal/d/f.smali
@@ -58,7 +58,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -101,6 +101,9 @@
     return v1
 
     :cond_2
+    return v0
+
+    :cond_3
     :goto_0
     return v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/e/e.smali b/com.discord/smali/com/google/android/gms/internal/e/e.smali
index 1923e019b9..375695c509 100644
--- a/com.discord/smali/com/google/android/gms/internal/e/e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/e/e.smali
@@ -69,7 +69,7 @@
     return-object v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xb5f608
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.phenotype.service.START"
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.phenotype.internal.IPhenotypeService"
diff --git a/com.discord/smali/com/google/android/gms/internal/f/e.smali b/com.discord/smali/com/google/android/gms/internal/f/e.smali
index 13e439fcd7..3f07c86635 100644
--- a/com.discord/smali/com/google/android/gms/internal/f/e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/f/e.smali
@@ -23,7 +23,17 @@
     throw p1
 .end method
 
-.method public final pC()V
+.method public final pB()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final yo()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -35,6 +45,11 @@
 
 .method public final yp()V
     .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
 
@@ -45,11 +60,6 @@
 
 .method public final yq()V
     .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
 
@@ -97,13 +107,3 @@
 
     throw v0
 .end method
-
-.method public final yv()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/com/google/android/gms/internal/f/g.smali b/com.discord/smali/com/google/android/gms/internal/f/g.smali
index 181b4f67bb..ab480cd2c5 100644
--- a/com.discord/smali/com/google/android/gms/internal/f/g.smali
+++ b/com.discord/smali/com/google/android/gms/internal/f/g.smali
@@ -14,7 +14,15 @@
     .end annotation
 .end method
 
-.method public abstract pC()V
+.method public abstract pB()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract yo()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -69,11 +77,3 @@
         }
     .end annotation
 .end method
-
-.method public abstract yv()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/com/google/android/gms/internal/f/h.smali b/com.discord/smali/com/google/android/gms/internal/f/h.smali
index e53bf8df9f..f5546c1592 100644
--- a/com.discord/smali/com/google/android/gms/internal/f/h.smali
+++ b/com.discord/smali/com/google/android/gms/internal/f/h.smali
@@ -42,7 +42,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;->yv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->yu()V
 
     goto :goto_0
 
@@ -51,7 +51,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;->pC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->pB()V
 
     goto :goto_0
 
@@ -62,7 +62,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;->yu()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->yt()V
 
     goto :goto_0
 
@@ -75,7 +75,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;->yt()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->ys()V
 
     goto :goto_0
 
@@ -107,7 +107,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;->ys()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->yr()V
 
     goto :goto_0
 
@@ -120,14 +120,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;->yr()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->yq()V
 
     goto :goto_0
 
     :pswitch_8
     invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->yq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->yp()V
 
     goto :goto_0
 
@@ -140,7 +140,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;->yp()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->yo()V
 
     :goto_0
     const/4 p1, 0x1
diff --git a/com.discord/smali/com/google/android/gms/internal/f/k$b.smali b/com.discord/smali/com/google/android/gms/internal/f/k$b.smali
index 0e13258cda..1eb0a688ca 100644
--- a/com.discord/smali/com/google/android/gms/internal/f/k$b.smali
+++ b/com.discord/smali/com/google/android/gms/internal/f/k$b.smali
@@ -37,7 +37,7 @@
 
 
 # virtual methods
-.method public final kZ()Lcom/google/android/gms/common/api/Status;
+.method public final kY()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->bic:Lcom/google/android/gms/common/api/Status;
@@ -45,7 +45,7 @@
     return-object v0
 .end method
 
-.method public final yw()Ljava/lang/String;
+.method public final yv()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->bid:Lcom/google/android/gms/safetynet/zzf;
@@ -57,8 +57,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->bid:Lcom/google/android/gms/safetynet/zzf;
-
     iget-object v0, v0, Lcom/google/android/gms/safetynet/zzf;->Zl:Ljava/lang/String;
 
     return-object v0
diff --git a/com.discord/smali/com/google/android/gms/internal/f/l.smali b/com.discord/smali/com/google/android/gms/internal/f/l.smali
index a275854788..2e15431379 100644
--- a/com.discord/smali/com/google/android/gms/internal/f/l.smali
+++ b/com.discord/smali/com/google/android/gms/internal/f/l.smali
@@ -33,7 +33,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/f/l;->bie:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/f/n;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/f/n;->lG()Landroid/os/IInterface;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/google/android/gms/internal/f/n.smali b/com.discord/smali/com/google/android/gms/internal/f/n.smali
index 9597896f7a..e045487439 100644
--- a/com.discord/smali/com/google/android/gms/internal/f/n.smali
+++ b/com.discord/smali/com/google/android/gms/internal/f/n.smali
@@ -75,7 +75,7 @@
     return-object v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xba2840
@@ -83,7 +83,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()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 kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.safetynet.internal.ISafetyNetService"
diff --git a/com.discord/smali/com/google/android/gms/internal/firebase-perf/c.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/c.smali
index faee3e2501..7ab918948c 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/c.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/c.smali
@@ -61,7 +61,7 @@
 .method final a([Ljava/lang/Object;I)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/ib;
 
     move-result-object v0
 
@@ -100,14 +100,14 @@
 .method public final synthetic iterator()Ljava/util/Iterator;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/f;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pU()Lcom/google/android/gms/internal/firebase-perf/f;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final pV()Lcom/google/android/gms/internal/firebase-perf/f;
+.method public final pU()Lcom/google/android/gms/internal/firebase-perf/f;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -117,7 +117,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/ib;
 
     move-result-object v0
 
@@ -130,7 +130,7 @@
     return-object v0
 .end method
 
-.method public final pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+.method public final pV()Lcom/google/android/gms/internal/firebase-perf/ib;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/firebase-perf/e.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/e.smali
index 87dabd9474..bd75c2cb46 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/e.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/e.smali
@@ -30,7 +30,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_2
 
     check-cast p1, Ljava/util/Set;
 
@@ -56,9 +56,14 @@
 
     return v0
 
-    :catch_0
     :cond_1
     return v2
+
+    :catch_0
+    return v2
+
+    :cond_2
+    return v2
 .end method
 
 .method static b(Ljava/util/Set;)I
diff --git a/com.discord/smali/com/google/android/gms/internal/firebase-perf/ec.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ec.smali
index 394a6431f7..ff1575bd25 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/ec.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ec.smali
@@ -13,22 +13,22 @@
     :try_start_0
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
-    move-exception v0
+    move-exception v6
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -38,7 +38,17 @@
 
     move-result-object p0
 
-    invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x1
+
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -46,77 +56,67 @@
 
     move-result v2
 
-    add-int/lit8 v2, v2, 0x1
+    add-int/2addr v1, v2
 
-    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    move-result-object v3
+    invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    invoke-virtual {v3}, Ljava/lang/String;->length()I
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result v3
+    const/16 v0, 0x40
 
-    add-int/2addr v2, v3
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-direct {v3, v2}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p0
 
-    const-string v1, "com.google.common.base.Strings"
+    const-string v0, "com.google.common.base.Strings"
 
-    invoke-static {v1}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
+    invoke-static {v0}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
+    sget-object v1, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
-    const-string v3, "com.google.common.base.Strings"
+    const-string v2, "com.google.common.base.Strings"
 
-    const-string v4, "lenientToString"
+    const-string v3, "lenientToString"
 
-    const-string v5, "Exception during lenientFormat for "
+    const-string v4, "Exception during lenientFormat for "
 
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-virtual {v6}, Ljava/lang/String;->length()I
+    invoke-virtual {v5}, Ljava/lang/String;->length()I
 
     move-result v7
 
     if-eqz v7, :cond_0
 
-    invoke-virtual {v5, v6}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
     goto :goto_0
 
     :cond_0
-    new-instance v6, Ljava/lang/String;
+    new-instance v5, Ljava/lang/String;
 
-    invoke-direct {v6, v5}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
+    invoke-direct {v5, v4}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    move-object v5, v6
+    move-object v4, v5
 
     :goto_0
-    move-object v6, v0
+    move-object v5, v6
 
-    invoke-virtual/range {v1 .. v6}, Ljava/util/logging/Logger;->logp(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    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
 
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v6}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/firebase-perf/hy.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/hy.smali
index 5c08bbaec5..7e6cabad66 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/hy.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/hy.smali
@@ -137,14 +137,14 @@
 .method public synthetic iterator()Ljava/util/Iterator;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/f;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pU()Lcom/google/android/gms/internal/firebase-perf/f;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public abstract pV()Lcom/google/android/gms/internal/firebase-perf/f;
+.method public abstract pU()Lcom/google/android/gms/internal/firebase-perf/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -154,7 +154,7 @@
     .end annotation
 .end method
 
-.method public pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+.method public pV()Lcom/google/android/gms/internal/firebase-perf/ib;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -170,7 +170,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ib;->ts()Lcom/google/android/gms/internal/firebase-perf/ib;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ib;->tr()Lcom/google/android/gms/internal/firebase-perf/ib;
 
     move-result-object v0
 
@@ -240,6 +240,14 @@
     throw p1
 .end method
 
+.method tn()[Ljava/lang/Object;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
 .method public final toArray()[Ljava/lang/Object;
     .locals 1
 
@@ -272,17 +280,17 @@
 
     if-ge v1, v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tp()[Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tn()[Ljava/lang/Object;
 
     move-result-object v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tq()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tp()I
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tr()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tq()I
 
     move-result v2
 
@@ -331,12 +339,14 @@
     return-object p1
 .end method
 
-.method tp()[Ljava/lang/Object;
+.method tp()I
     .locals 1
 
-    const/4 v0, 0x0
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
 
-    return-object v0
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
 .end method
 
 .method tq()I
@@ -348,13 +358,3 @@
 
     throw v0
 .end method
-
-.method tr()I
-    .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/com/google/android/gms/internal/firebase-perf/ib.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ib.smali
index 5349ff151c..f34db70a52 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/ib.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ib.smali
@@ -109,7 +109,7 @@
     return-object p0
 .end method
 
-.method public static ts()Lcom/google/android/gms/internal/firebase-perf/ib;
+.method public static tr()Lcom/google/android/gms/internal/firebase-perf/ib;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -126,7 +126,7 @@
     return-object v0
 .end method
 
-.method public static tt()Lcom/google/android/gms/internal/firebase-perf/ic;
+.method public static ts()Lcom/google/android/gms/internal/firebase-perf/ic;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -504,7 +504,7 @@
 .method public synthetic iterator()Ljava/util/Iterator;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/f;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pU()Lcom/google/android/gms/internal/firebase-perf/f;
 
     move-result-object v0
 
@@ -621,7 +621,7 @@
     return-object v0
 .end method
 
-.method public final pV()Lcom/google/android/gms/internal/firebase-perf/f;
+.method public final pU()Lcom/google/android/gms/internal/firebase-perf/f;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -640,7 +640,7 @@
     return-object v0
 .end method
 
-.method public final pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+.method public final pV()Lcom/google/android/gms/internal/firebase-perf/ib;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/firebase-perf/if.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/if.smali
index 3ca0edb8ad..da9ad85465 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/if.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/if.smali
@@ -174,14 +174,14 @@
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/ig;->ty()Lcom/google/android/gms/internal/firebase-perf/if;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/ig;->tx()Lcom/google/android/gms/internal/firebase-perf/if;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static tu()Lcom/google/android/gms/internal/firebase-perf/if;
+.method public static tt()Lcom/google/android/gms/internal/firebase-perf/if;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -264,12 +264,14 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/if;->tv()Lcom/google/android/gms/internal/firebase-perf/ih;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/if;->tu()Lcom/google/android/gms/internal/firebase-perf/ih;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/if;->aSX:Lcom/google/android/gms/internal/firebase-perf/ih;
 
+    return-object v0
+
     :cond_0
     return-object v0
 .end method
@@ -400,12 +402,14 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/if;->tw()Lcom/google/android/gms/internal/firebase-perf/ih;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/if;->tv()Lcom/google/android/gms/internal/firebase-perf/ih;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/if;->aSY:Lcom/google/android/gms/internal/firebase-perf/ih;
 
+    return-object v0
+
     :cond_0
     return-object v0
 .end method
@@ -563,7 +567,7 @@
     return-object v0
 .end method
 
-.method abstract tv()Lcom/google/android/gms/internal/firebase-perf/ih;
+.method abstract tu()Lcom/google/android/gms/internal/firebase-perf/ih;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -574,7 +578,7 @@
     .end annotation
 .end method
 
-.method abstract tw()Lcom/google/android/gms/internal/firebase-perf/ih;
+.method abstract tv()Lcom/google/android/gms/internal/firebase-perf/ih;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -584,7 +588,7 @@
     .end annotation
 .end method
 
-.method abstract tx()Lcom/google/android/gms/internal/firebase-perf/hy;
+.method abstract tw()Lcom/google/android/gms/internal/firebase-perf/hy;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -601,12 +605,14 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/if;->tx()Lcom/google/android/gms/internal/firebase-perf/hy;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/if;->tw()Lcom/google/android/gms/internal/firebase-perf/hy;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/if;->aSZ:Lcom/google/android/gms/internal/firebase-perf/hy;
 
+    return-object v0
+
     :cond_0
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/firebase-perf/ih.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ih.smali
index 5fca6702e7..ca9f64cebc 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/ih.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ih.smali
@@ -78,14 +78,14 @@
 .method public synthetic iterator()Ljava/util/Iterator;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/f;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pU()Lcom/google/android/gms/internal/firebase-perf/f;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+.method public pV()Lcom/google/android/gms/internal/firebase-perf/ib;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -99,7 +99,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/ih;->tz()Lcom/google/android/gms/internal/firebase-perf/ib;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/ih;->ty()Lcom/google/android/gms/internal/firebase-perf/ib;
 
     move-result-object v0
 
@@ -109,7 +109,7 @@
     return-object v0
 .end method
 
-.method tz()Lcom/google/android/gms/internal/firebase-perf/ib;
+.method ty()Lcom/google/android/gms/internal/firebase-perf/ib;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/firebase-perf/ij.smali b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ij.smali
index 5b6b299817..26f14f4e69 100644
--- a/com.discord/smali/com/google/android/gms/internal/firebase-perf/ij.smali
+++ b/com.discord/smali/com/google/android/gms/internal/firebase-perf/ij.smali
@@ -366,6 +366,8 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 
@@ -479,7 +481,7 @@
     return v0
 .end method
 
-.method final tv()Lcom/google/android/gms/internal/firebase-perf/ih;
+.method final tu()Lcom/google/android/gms/internal/firebase-perf/ih;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -501,7 +503,7 @@
     return-object v0
 .end method
 
-.method final tw()Lcom/google/android/gms/internal/firebase-perf/ih;
+.method final tv()Lcom/google/android/gms/internal/firebase-perf/ih;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -528,7 +530,7 @@
     return-object v1
 .end method
 
-.method final tx()Lcom/google/android/gms/internal/firebase-perf/hy;
+.method final tw()Lcom/google/android/gms/internal/firebase-perf/hy;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/de.smali b/com.discord/smali/com/google/android/gms/internal/measurement/de.smali
index ef0ebc15af..673fe303a6 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/de.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/de.smali
@@ -272,14 +272,12 @@
     .end annotation
 
     :try_start_0
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dn;->vC()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dn;->vB()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object p0, v0
-
     goto :goto_0
 
     :catch_0
@@ -288,7 +286,7 @@
     move-result-wide v0
 
     :try_start_1
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dn;->vC()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dn;->vB()Ljava/lang/Object;
 
     move-result-object p0
     :try_end_1
@@ -313,7 +311,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->vB()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->vA()Z
 
     move-result v1
 
@@ -439,40 +437,7 @@
     throw p0
 .end method
 
-.method private final vA()Lcom/google/android/gms/internal/measurement/dc;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->bae:Lcom/google/android/gms/internal/measurement/dc;
-
-    if-nez v0, :cond_0
-
-    :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->YC:Landroid/content/Context;
-
-    invoke-virtual {v0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aZZ:Lcom/google/android/gms/internal/measurement/do;
-
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/do;->bal:Landroid/net/Uri;
-
-    invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/dc;->c(Landroid/content/ContentResolver;Landroid/net/Uri;)Lcom/google/android/gms/internal/measurement/dc;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->bae:Lcom/google/android/gms/internal/measurement/dc;
-    :try_end_0
-    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->bae:Lcom/google/android/gms/internal/measurement/dc;
-
-    return-object v0
-.end method
-
-.method private static vB()Z
+.method private static vA()Z
     .locals 3
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/de;->aZY:Ljava/lang/Boolean;
@@ -485,8 +450,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->YC:Landroid/content/Context;
-
     const-string v2, "com.google.android.providers.gsf.permission.READ_GSERVICES"
 
     invoke-static {v0, v2}, Landroidx/core/content/PermissionChecker;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I
@@ -520,7 +483,7 @@
     return v0
 .end method
 
-.method private final vz()Ljava/lang/Object;
+.method private final vy()Ljava/lang/Object;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -531,7 +494,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->vB()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->vA()Z
 
     move-result v0
 
@@ -599,6 +562,39 @@
     return-object v0
 .end method
 
+.method private final vz()Lcom/google/android/gms/internal/measurement/dc;
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->bae:Lcom/google/android/gms/internal/measurement/dc;
+
+    if-nez v0, :cond_0
+
+    :try_start_0
+    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->YC:Landroid/content/Context;
+
+    invoke-virtual {v0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aZZ:Lcom/google/android/gms/internal/measurement/do;
+
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/do;->bal:Landroid/net/Uri;
+
+    invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/dc;->c(Landroid/content/ContentResolver;Landroid/net/Uri;)Lcom/google/android/gms/internal/measurement/dc;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->bae:Lcom/google/android/gms/internal/measurement/dc;
+    :try_end_0
+    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    :cond_0
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->bae:Lcom/google/android/gms/internal/measurement/dc;
+
+    return-object v0
+.end method
+
 
 # virtual methods
 .method protected abstract bX(Ljava/lang/String;)Ljava/lang/Object;
@@ -637,7 +633,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/de;->vA()Lcom/google/android/gms/internal/measurement/dc;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/de;->vz()Lcom/google/android/gms/internal/measurement/dc;
 
     move-result-object v0
 
@@ -703,7 +699,7 @@
     return-object v0
 
     :cond_3
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/de;->vz()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/de;->vy()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/google/android/material/appbar/AppBarLayout$LayoutParams$ScrollFlags.smali b/com.discord/smali/com/google/android/material/appbar/AppBarLayout$LayoutParams$ScrollFlags.smali
index b3f59a87b6..2f22e95d47 100644
--- a/com.discord/smali/com/google/android/material/appbar/AppBarLayout$LayoutParams$ScrollFlags.smali
+++ b/com.discord/smali/com/google/android/material/appbar/AppBarLayout$LayoutParams$ScrollFlags.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/appbar/AppBarLayout$LayoutParams$ScrollFlags;
 .super Ljava/lang/Object;
+.source "AppBarLayout.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/bottomappbar/BottomAppBar$FabAlignmentMode.smali b/com.discord/smali/com/google/android/material/bottomappbar/BottomAppBar$FabAlignmentMode.smali
index 467962498a..fe3bd7556a 100644
--- a/com.discord/smali/com/google/android/material/bottomappbar/BottomAppBar$FabAlignmentMode.smali
+++ b/com.discord/smali/com/google/android/material/bottomappbar/BottomAppBar$FabAlignmentMode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/bottomappbar/BottomAppBar$FabAlignmentMode;
 .super Ljava/lang/Object;
+.source "BottomAppBar.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/bottomnavigation/LabelVisibilityMode.smali b/com.discord/smali/com/google/android/material/bottomnavigation/LabelVisibilityMode.smali
index 31520b5cf1..fd7859cdaa 100644
--- a/com.discord/smali/com/google/android/material/bottomnavigation/LabelVisibilityMode.smali
+++ b/com.discord/smali/com/google/android/material/bottomnavigation/LabelVisibilityMode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/bottomnavigation/LabelVisibilityMode;
 .super Ljava/lang/Object;
+.source "LabelVisibilityMode.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/bottomsheet/BottomSheetBehavior$State.smali b/com.discord/smali/com/google/android/material/bottomsheet/BottomSheetBehavior$State.smali
index 0c5a29e7d1..8e6877b48e 100644
--- a/com.discord/smali/com/google/android/material/bottomsheet/BottomSheetBehavior$State.smali
+++ b/com.discord/smali/com/google/android/material/bottomsheet/BottomSheetBehavior$State.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/bottomsheet/BottomSheetBehavior$State;
 .super Ljava/lang/Object;
+.source "BottomSheetBehavior.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/button/MaterialButton$IconGravity.smali b/com.discord/smali/com/google/android/material/button/MaterialButton$IconGravity.smali
index f114208a4f..29e3b8f091 100644
--- a/com.discord/smali/com/google/android/material/button/MaterialButton$IconGravity.smali
+++ b/com.discord/smali/com/google/android/material/button/MaterialButton$IconGravity.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/button/MaterialButton$IconGravity;
 .super Ljava/lang/Object;
+.source "MaterialButton.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/circularreveal/CircularRevealHelper$Strategy.smali b/com.discord/smali/com/google/android/material/circularreveal/CircularRevealHelper$Strategy.smali
index 1a8916be93..2b8ac40ab9 100644
--- a/com.discord/smali/com/google/android/material/circularreveal/CircularRevealHelper$Strategy.smali
+++ b/com.discord/smali/com/google/android/material/circularreveal/CircularRevealHelper$Strategy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/circularreveal/CircularRevealHelper$Strategy;
 .super Ljava/lang/Object;
+.source "CircularRevealHelper.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/floatingactionbutton/FloatingActionButton$Size.smali b/com.discord/smali/com/google/android/material/floatingactionbutton/FloatingActionButton$Size.smali
index dd62df9ac7..247e379b82 100644
--- a/com.discord/smali/com/google/android/material/floatingactionbutton/FloatingActionButton$Size.smali
+++ b/com.discord/smali/com/google/android/material/floatingactionbutton/FloatingActionButton$Size.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/floatingactionbutton/FloatingActionButton$Size;
 .super Ljava/lang/Object;
+.source "FloatingActionButton.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/internal/Experimental.smali b/com.discord/smali/com/google/android/material/internal/Experimental.smali
index 40a03cc0e0..b4d3889f54 100644
--- a/com.discord/smali/com/google/android/material/internal/Experimental.smali
+++ b/com.discord/smali/com/google/android/material/internal/Experimental.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/internal/Experimental;
 .super Ljava/lang/Object;
+.source "Experimental.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback$DismissEvent.smali b/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback$DismissEvent.smali
index 9320f19a4e..7cec063518 100644
--- a/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback$DismissEvent.smali
+++ b/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback$DismissEvent.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback$DismissEvent;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$Duration.smali b/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$Duration.smali
index de59e4897c..2a9fc35d8f 100644
--- a/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$Duration.smali
+++ b/com.discord/smali/com/google/android/material/snackbar/BaseTransientBottomBar$Duration.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/snackbar/BaseTransientBottomBar$Duration;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/snackbar/Snackbar$Duration.smali b/com.discord/smali/com/google/android/material/snackbar/Snackbar$Duration.smali
index cc03705e06..b0c7c97c8e 100644
--- a/com.discord/smali/com/google/android/material/snackbar/Snackbar$Duration.smali
+++ b/com.discord/smali/com/google/android/material/snackbar/Snackbar$Duration.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/snackbar/Snackbar$Duration;
 .super Ljava/lang/Object;
+.source "Snackbar.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/tabs/TabLayout$Mode.smali b/com.discord/smali/com/google/android/material/tabs/TabLayout$Mode.smali
index 2448b862ec..7614415a5b 100644
--- a/com.discord/smali/com/google/android/material/tabs/TabLayout$Mode.smali
+++ b/com.discord/smali/com/google/android/material/tabs/TabLayout$Mode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/tabs/TabLayout$Mode;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/tabs/TabLayout$TabGravity.smali b/com.discord/smali/com/google/android/material/tabs/TabLayout$TabGravity.smali
index 9fb6f4db35..5c5d7c20b4 100644
--- a/com.discord/smali/com/google/android/material/tabs/TabLayout$TabGravity.smali
+++ b/com.discord/smali/com/google/android/material/tabs/TabLayout$TabGravity.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/tabs/TabLayout$TabGravity;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/tabs/TabLayout$TabIndicatorGravity.smali b/com.discord/smali/com/google/android/material/tabs/TabLayout$TabIndicatorGravity.smali
index df943706ca..4a64419809 100644
--- a/com.discord/smali/com/google/android/material/tabs/TabLayout$TabIndicatorGravity.smali
+++ b/com.discord/smali/com/google/android/material/tabs/TabLayout$TabIndicatorGravity.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/tabs/TabLayout$TabIndicatorGravity;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/android/material/textfield/TextInputLayout$BoxBackgroundMode.smali b/com.discord/smali/com/google/android/material/textfield/TextInputLayout$BoxBackgroundMode.smali
index fe45c07915..d63911d45a 100644
--- a/com.discord/smali/com/google/android/material/textfield/TextInputLayout$BoxBackgroundMode.smali
+++ b/com.discord/smali/com/google/android/material/textfield/TextInputLayout$BoxBackgroundMode.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/android/material/textfield/TextInputLayout$BoxBackgroundMode;
 .super Ljava/lang/Object;
+.source "TextInputLayout.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/com/google/firebase/iid/ab.smali b/com.discord/smali/com/google/firebase/iid/ab.smali
index 54bb05a554..82f8a4e381 100644
--- a/com.discord/smali/com/google/firebase/iid/ab.smali
+++ b/com.discord/smali/com/google/firebase/iid/ab.smali
@@ -32,9 +32,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/firebase/iid/ab;->bzk:Lcom/google/firebase/iid/aa;
-
-    invoke-virtual {p1}, Lcom/google/firebase/iid/aa;->Ce()Z
+    invoke-virtual {p1}, Lcom/google/firebase/iid/aa;->Cd()Z
 
     move-result p1
 
@@ -43,7 +41,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lJ()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lI()Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/google/firebase/perf/internal/FeatureControl.smali b/com.discord/smali/com/google/firebase/perf/internal/FeatureControl.smali
index e2344910b2..8cfc3b47ea 100644
--- a/com.discord/smali/com/google/firebase/perf/internal/FeatureControl.smali
+++ b/com.discord/smali/com/google/firebase/perf/internal/FeatureControl.smali
@@ -50,7 +50,7 @@
 
     iput-object v0, p0, Lcom/google/firebase/perf/internal/FeatureControl;->zzcu:Lcom/google/firebase/perf/internal/RemoteConfigManager;
 
-    invoke-static {}, Lcom/google/firebase/perf/a;->Cq()Lcom/google/firebase/perf/a;
+    invoke-static {}, Lcom/google/firebase/perf/a;->Cp()Lcom/google/firebase/perf/a;
 
     move-result-object v0
 
@@ -66,7 +66,6 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/firebase-perf/z;-><init>()V
 
-    :goto_0
     iput-object v0, p0, Lcom/google/firebase/perf/internal/FeatureControl;->zzcv:Lcom/google/android/gms/internal/firebase-perf/z;
 
     return-void
@@ -74,7 +73,9 @@
     :cond_0
     iget-object v0, v0, Lcom/google/firebase/perf/a;->bAa:Lcom/google/android/gms/internal/firebase-perf/z;
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/firebase/perf/internal/FeatureControl;->zzcv:Lcom/google/android/gms/internal/firebase-perf/z;
+
+    return-void
 .end method
 
 .method public static declared-synchronized zzar()Lcom/google/firebase/perf/internal/FeatureControl;
diff --git a/com.discord/smali/com/google/gson/a/a.smali b/com.discord/smali/com/google/gson/a/a.smali
index 359237eb92..9d6a73fa90 100644
--- a/com.discord/smali/com/google/gson/a/a.smali
+++ b/com.discord/smali/com/google/gson/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/gson/a/a;
 .super Ljava/lang/Object;
+.source "Expose.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,8 +9,8 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lcom/google/gson/a/a;
+        CQ = true
         CR = true
-        CS = true
     .end subannotation
 .end annotation
 
@@ -28,8 +29,8 @@
 
 
 # virtual methods
-.method public abstract CR()Z
+.method public abstract CQ()Z
 .end method
 
-.method public abstract CS()Z
+.method public abstract CR()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 cb0fce3bd7..6419bb0ddf 100644
--- a/com.discord/smali/com/google/gson/a/b.smali
+++ b/com.discord/smali/com/google/gson/a/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/gson/a/b;
 .super Ljava/lang/Object;
+.source "JsonAdapter.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lcom/google/gson/a/b;
-        CT = true
+        CS = true
     .end subannotation
 .end annotation
 
@@ -25,7 +26,7 @@
 
 
 # virtual methods
-.method public abstract CT()Z
+.method public abstract CS()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 18ce35245a..ef321c0093 100644
--- a/com.discord/smali/com/google/gson/a/c.smali
+++ b/com.discord/smali/com/google/gson/a/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/gson/a/c;
 .super Ljava/lang/Object;
+.source "SerializedName.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lcom/google/gson/a/c;
-        CU = {}
+        CT = {}
     .end subannotation
 .end annotation
 
@@ -28,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract CU()[Ljava/lang/String;
+.method public abstract CT()[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 af8b223803..a8e3e9ed1d 100644
--- a/com.discord/smali/com/google/gson/a/d.smali
+++ b/com.discord/smali/com/google/gson/a/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/gson/a/d;
 .super Ljava/lang/Object;
+.source "Since.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -22,5 +23,5 @@
 
 
 # virtual methods
-.method public abstract CV()D
+.method public abstract CU()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 a3c99f693a..8e5ae9ba0c 100644
--- a/com.discord/smali/com/google/gson/a/e.smali
+++ b/com.discord/smali/com/google/gson/a/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lcom/google/gson/a/e;
 .super Ljava/lang/Object;
+.source "Until.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -22,5 +23,5 @@
 
 
 # virtual methods
-.method public abstract CV()D
+.method public abstract CU()D
 .end method
diff --git a/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali b/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
index 2113187125..5a8fa1d274 100644
--- a/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
+++ b/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/backgrounded/Backgrounded;
 .super Ljava/lang/Object;
+.source "Backgrounded.java"
 
 
 # annotations
@@ -31,7 +32,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -105,7 +106,7 @@
 
     sget-object v0, Lcom/miguelgaeta/backgrounded/Backgrounded;->emitter:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KD()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->KC()Lrx/Observable;
 
     move-result-object v0
 
@@ -144,7 +145,7 @@
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iget-object v0, v0, Lrx/b/a;->cuA:Lrx/Observable;
+    iget-object v0, v0, Lrx/b/a;->ctU:Lrx/Observable;
 
     new-instance v2, Lrx/internal/a/b$1;
 
diff --git a/com.discord/smali/io/fabric/sdk/android/a/c/d.smali b/com.discord/smali/io/fabric/sdk/android/a/c/d.smali
index ca8020a54e..ca685d0fb7 100644
--- a/com.discord/smali/io/fabric/sdk/android/a/c/d.smali
+++ b/com.discord/smali/io/fabric/sdk/android/a/c/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lio/fabric/sdk/android/a/c/d;
 .super Ljava/lang/Object;
+.source "DependsOn.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/kotlin/Unit.smali b/com.discord/smali/kotlin/Unit.smali
index d46fed6077..7f0a1cd306 100644
--- a/com.discord/smali/kotlin/Unit.smali
+++ b/com.discord/smali/kotlin/Unit.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/Unit;
 .super Ljava/lang/Object;
+.source "Unit.kt"
 
 
 # static fields
diff --git a/com.discord/smali/kotlin/a/aa.smali b/com.discord/smali/kotlin/a/aa.smali
index d195b1838b..94a2a218df 100644
--- a/com.discord/smali/kotlin/a/aa.smali
+++ b/com.discord/smali/kotlin/a/aa.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/a/aa;
 .super Ljava/lang/Object;
+.source "Iterators.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali/kotlin/a/am.smali b/com.discord/smali/kotlin/a/am.smali
index 9925d6f067..dc49ffdad7 100644
--- a/com.discord/smali/kotlin/a/am.smali
+++ b/com.discord/smali/kotlin/a/am.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/am;
 .super Ljava/lang/Object;
+.source "SlidingWindow.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/h.smali b/com.discord/smali/kotlin/a/h.smali
index 4f6a48cce5..ac64aa49b7 100644
--- a/com.discord/smali/kotlin/a/h.smali
+++ b/com.discord/smali/kotlin/a/h.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/a/h;
 .super Ljava/lang/Object;
+.source "ArraysJVM.kt"
diff --git a/com.discord/smali/kotlin/a/i.smali b/com.discord/smali/kotlin/a/i.smali
index f4ec474a49..50449acebd 100644
--- a/com.discord/smali/kotlin/a/i.smali
+++ b/com.discord/smali/kotlin/a/i.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/a/i;
 .super Lkotlin/a/h;
+.source "Arrays.kt"
diff --git a/com.discord/smali/kotlin/a/j.smali b/com.discord/smali/kotlin/a/j.smali
index c0b51249f4..c4ae64445a 100644
--- a/com.discord/smali/kotlin/a/j.smali
+++ b/com.discord/smali/kotlin/a/j.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/j;
 .super Lkotlin/a/i;
+.source "_ArraysJvm.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/k.smali b/com.discord/smali/kotlin/a/k.smali
index 67170aaf3d..db0cf25b24 100644
--- a/com.discord/smali/kotlin/a/k.smali
+++ b/com.discord/smali/kotlin/a/k.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/k;
 .super Lkotlin/a/j;
+.source "_Arrays.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/m.smali b/com.discord/smali/kotlin/a/m.smali
index 77e82023a7..3137e7ab5a 100644
--- a/com.discord/smali/kotlin/a/m.smali
+++ b/com.discord/smali/kotlin/a/m.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/m;
 .super Ljava/lang/Object;
+.source "CollectionsJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/n.smali b/com.discord/smali/kotlin/a/n.smali
index 0bb5b51479..2f6b9a57bd 100644
--- a/com.discord/smali/kotlin/a/n.smali
+++ b/com.discord/smali/kotlin/a/n.smali
@@ -1,9 +1,10 @@
 .class public Lkotlin/a/n;
 .super Lkotlin/a/m;
+.source "Collections.kt"
 
 
 # direct methods
-.method public static final EZ()V
+.method public static final EY()V
     .locals 2
 
     new-instance v0, Ljava/lang/ArithmeticException;
@@ -17,7 +18,7 @@
     throw v0
 .end method
 
-.method public static final Fa()V
+.method public static final EZ()V
     .locals 2
 
     new-instance v0, Ljava/lang/ArithmeticException;
diff --git a/com.discord/smali/kotlin/a/o.smali b/com.discord/smali/kotlin/a/o.smali
index fbc153bb04..83e13c877e 100644
--- a/com.discord/smali/kotlin/a/o.smali
+++ b/com.discord/smali/kotlin/a/o.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/o;
 .super Lkotlin/a/n;
+.source "Iterables.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/p.smali b/com.discord/smali/kotlin/a/p.smali
index 94b86b1351..4d96c0b2a4 100644
--- a/com.discord/smali/kotlin/a/p.smali
+++ b/com.discord/smali/kotlin/a/p.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/a/p;
 .super Lkotlin/a/o;
+.source "IteratorsJVM.kt"
diff --git a/com.discord/smali/kotlin/a/q.smali b/com.discord/smali/kotlin/a/q.smali
index 3661bdb6f1..1482ab65bd 100644
--- a/com.discord/smali/kotlin/a/q.smali
+++ b/com.discord/smali/kotlin/a/q.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/a/q;
 .super Lkotlin/a/p;
+.source "Iterators.kt"
diff --git a/com.discord/smali/kotlin/a/r.smali b/com.discord/smali/kotlin/a/r.smali
index d3c3e1222f..a8bbddd52b 100644
--- a/com.discord/smali/kotlin/a/r.smali
+++ b/com.discord/smali/kotlin/a/r.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/r;
 .super Lkotlin/a/q;
+.source "MutableCollectionsJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/s.smali b/com.discord/smali/kotlin/a/s.smali
index 75524941a7..ea10062065 100644
--- a/com.discord/smali/kotlin/a/s.smali
+++ b/com.discord/smali/kotlin/a/s.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/s;
 .super Lkotlin/a/r;
+.source "MutableCollections.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/t.smali b/com.discord/smali/kotlin/a/t.smali
index 27877316e0..a649c3a51d 100644
--- a/com.discord/smali/kotlin/a/t.smali
+++ b/com.discord/smali/kotlin/a/t.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/t;
 .super Lkotlin/a/s;
+.source "ReversedViews.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/u.smali b/com.discord/smali/kotlin/a/u.smali
index 69481338f7..08ecf27eb4 100644
--- a/com.discord/smali/kotlin/a/u.smali
+++ b/com.discord/smali/kotlin/a/u.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/a/u;
 .super Lkotlin/a/t;
+.source "_CollectionsJvm.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/a/v.smali b/com.discord/smali/kotlin/a/v.smali
index fe0d28ca72..4d7764815b 100644
--- a/com.discord/smali/kotlin/a/v.smali
+++ b/com.discord/smali/kotlin/a/v.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/v;
 .super Lkotlin/a/u;
+.source "_Collections.kt"
 
 
 # direct methods
@@ -192,9 +193,14 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
+    move-object v1, p1
+
+    goto :goto_0
+
     :cond_0
     move-object v1, p1
 
+    :goto_0
     and-int/lit8 p1, p7, 0x2
 
     if-eqz p1, :cond_1
@@ -229,12 +235,12 @@
 
     const/4 v4, -0x1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_3
     move v4, p4
 
-    :goto_0
+    :goto_1
     and-int/lit8 p1, p7, 0x10
 
     if-eqz p1, :cond_4
@@ -701,7 +707,7 @@
 
     if-gez v0, :cond_1
 
-    invoke-static {}, Lkotlin/a/l;->EZ()V
+    invoke-static {}, Lkotlin/a/l;->EY()V
 
     :cond_1
     invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -1035,6 +1041,8 @@
     check-cast p1, Ljava/lang/Throwable;
 
     throw p1
+
+    return-void
 .end method
 
 .method public static final b(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
@@ -1164,7 +1172,6 @@
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    :goto_0
     check-cast v0, Ljava/util/List;
 
     return-object v0
@@ -1180,7 +1187,9 @@
 
     invoke-static {p0, p1}, Lkotlin/a/l;->a(Ljava/util/Collection;Ljava/lang/Iterable;)Z
 
-    goto :goto_0
+    check-cast v0, Ljava/util/List;
+
+    return-object v0
 .end method
 
 .method public static final c(Ljava/lang/Iterable;)Ljava/lang/Object;
@@ -1245,6 +1254,8 @@
     check-cast p0, Ljava/lang/Throwable;
 
     throw p0
+
+    return-void
 .end method
 
 .method public static final c(Ljava/util/List;I)Ljava/lang/Object;
@@ -1426,6 +1437,8 @@
     check-cast p1, Ljava/lang/Throwable;
 
     throw p1
+
+    return-void
 .end method
 
 .method public static final d(Ljava/lang/Iterable;)Ljava/util/List;
@@ -2171,7 +2184,7 @@
 
     if-gez v2, :cond_0
 
-    invoke-static {}, Lkotlin/a/l;->Fa()V
+    invoke-static {}, Lkotlin/a/l;->EZ()V
 
     goto :goto_0
 
@@ -2180,7 +2193,7 @@
 
     sget-object p0, Lkotlin/jvm/internal/g;->bQb:Lkotlin/jvm/internal/g;
 
-    invoke-static {}, Lkotlin/jvm/internal/g;->Fk()D
+    invoke-static {}, Lkotlin/jvm/internal/g;->Fj()D
 
     move-result-wide v0
 
diff --git a/com.discord/smali/kotlin/c.smali b/com.discord/smali/kotlin/c.smali
index 6a3692e310..76c27a7ffc 100644
--- a/com.discord/smali/kotlin/c.smali
+++ b/com.discord/smali/kotlin/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/c;
 .super Ljava/lang/Object;
+.source "Function.kt"
 
 
 # annotations
diff --git a/com.discord/smali/kotlin/c/b/a/e.smali b/com.discord/smali/kotlin/c/b/a/e.smali
index 3e189e0301..c8a40e426a 100644
--- a/com.discord/smali/kotlin/c/b/a/e.smali
+++ b/com.discord/smali/kotlin/c/b/a/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lkotlin/c/b/a/e;
 .super Ljava/lang/Object;
+.source "DebugMetadata.kt"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
@@ -8,11 +9,11 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lkotlin/c/b/a/e;
-        Fc = 0x1
-        Fd = ""
-        Fe = {}
+        Fb = 0x1
+        Fc = ""
+        Fd = {}
+        Fe = ""
         Ff = ""
-        Fg = ""
     .end subannotation
 .end annotation
 
@@ -28,17 +29,17 @@
 
 
 # virtual methods
-.method public abstract Fc()I
+.method public abstract Fb()I
 .end method
 
-.method public abstract Fd()Ljava/lang/String;
+.method public abstract Fc()Ljava/lang/String;
 .end method
 
-.method public abstract Fe()[I
+.method public abstract Fd()[I
+.end method
+
+.method public abstract Fe()Ljava/lang/String;
 .end method
 
 .method public abstract Ff()Ljava/lang/String;
 .end method
-
-.method public abstract Fg()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali/kotlin/d/c.smali b/com.discord/smali/kotlin/d/c.smali
index 639c69e251..dc39ef98cd 100644
--- a/com.discord/smali/kotlin/d/c.smali
+++ b/com.discord/smali/kotlin/d/c.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/d/c;
 .super Ljava/lang/Object;
+.source "progressionUtil.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/e.smali b/com.discord/smali/kotlin/e.smali
index 21b5d7aaf0..0ff319b65e 100644
--- a/com.discord/smali/kotlin/e.smali
+++ b/com.discord/smali/kotlin/e.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/e;
 .super Ljava/lang/NullPointerException;
+.source "KotlinNullPointerException.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/jvm/functions/Function1.smali b/com.discord/smali/kotlin/jvm/functions/Function1.smali
index 0c7bebcc17..798e41fb8c 100644
--- a/com.discord/smali/kotlin/jvm/functions/Function1.smali
+++ b/com.discord/smali/kotlin/jvm/functions/Function1.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function1;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali/kotlin/jvm/functions/Function2.smali b/com.discord/smali/kotlin/jvm/functions/Function2.smali
index 46e57b554e..bbcf4241ad 100644
--- a/com.discord/smali/kotlin/jvm/functions/Function2.smali
+++ b/com.discord/smali/kotlin/jvm/functions/Function2.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function2;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali/kotlin/jvm/functions/Function4.smali b/com.discord/smali/kotlin/jvm/functions/Function4.smali
index 3f127d41ce..efecbc1482 100644
--- a/com.discord/smali/kotlin/jvm/functions/Function4.smali
+++ b/com.discord/smali/kotlin/jvm/functions/Function4.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function4;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali/kotlin/jvm/internal/a/a.smali b/com.discord/smali/kotlin/jvm/internal/a/a.smali
index a2397ceb1d..1f3733e211 100644
--- a/com.discord/smali/kotlin/jvm/internal/a/a.smali
+++ b/com.discord/smali/kotlin/jvm/internal/a/a.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lkotlin/jvm/internal/a/a;
 .super Ljava/lang/Object;
+.source "KMarkers.kt"
diff --git a/com.discord/smali/kotlin/jvm/internal/c.smali b/com.discord/smali/kotlin/jvm/internal/c.smali
index 2ac20332f4..23e624cbd0 100644
--- a/com.discord/smali/kotlin/jvm/internal/c.smali
+++ b/com.discord/smali/kotlin/jvm/internal/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/jvm/internal/c;
 .super Ljava/lang/Object;
+.source "CallableReference.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -28,7 +29,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lkotlin/jvm/internal/c$a;->Fi()Lkotlin/jvm/internal/c$a;
+    invoke-static {}, Lkotlin/jvm/internal/c$a;->Fh()Lkotlin/jvm/internal/c$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/kotlin/jvm/internal/h.smali b/com.discord/smali/kotlin/jvm/internal/h.smali
index ce2fb45b25..a383b638a1 100644
--- a/com.discord/smali/kotlin/jvm/internal/h.smali
+++ b/com.discord/smali/kotlin/jvm/internal/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/internal/h;
 .super Ljava/lang/Object;
+.source "FunctionBase.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali/kotlin/jvm/internal/i.smali b/com.discord/smali/kotlin/jvm/internal/i.smali
index 66977ca0b4..70471f3759 100644
--- a/com.discord/smali/kotlin/jvm/internal/i.smali
+++ b/com.discord/smali/kotlin/jvm/internal/i.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/jvm/internal/i;
 .super Lkotlin/jvm/internal/c;
+.source "FunctionReference.java"
 
 # interfaces
 .implements Lkotlin/jvm/internal/h;
diff --git a/com.discord/smali/kotlin/jvm/internal/j.smali b/com.discord/smali/kotlin/jvm/internal/j.smali
index 7b57d4e933..a18084427f 100644
--- a/com.discord/smali/kotlin/jvm/internal/j.smali
+++ b/com.discord/smali/kotlin/jvm/internal/j.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/jvm/internal/j;
 .super Ljava/lang/Object;
+.source "Intrinsics.java"
 
 
 # direct methods
@@ -11,7 +12,7 @@
     return-void
 .end method
 
-.method public static Fl()V
+.method public static Fk()V
     .locals 1
 
     new-instance v0, Lkotlin/e;
@@ -27,7 +28,7 @@
     throw v0
 .end method
 
-.method private static Fm()V
+.method private static Fl()V
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -39,18 +40,18 @@
     throw v0
 .end method
 
-.method public static Fn()V
+.method public static Fm()V
     .locals 0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
 
     return-void
 .end method
 
-.method public static Fo()V
+.method public static Fn()V
     .locals 0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fm()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
 
     return-void
 .end method
diff --git a/com.discord/smali/kotlin/jvm/internal/k.smali b/com.discord/smali/kotlin/jvm/internal/k.smali
index 9e83109f47..436798622a 100644
--- a/com.discord/smali/kotlin/jvm/internal/k.smali
+++ b/com.discord/smali/kotlin/jvm/internal/k.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/jvm/internal/k;
 .super Ljava/lang/Object;
+.source "Lambda.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali/kotlin/ranges/IntProgression$a.smali b/com.discord/smali/kotlin/ranges/IntProgression$a.smali
index d92ca76876..98c68df7e5 100644
--- a/com.discord/smali/kotlin/ranges/IntProgression$a.smali
+++ b/com.discord/smali/kotlin/ranges/IntProgression$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/ranges/IntProgression$a;
 .super Ljava/lang/Object;
+.source "Progressions.kt"
 
 
 # annotations
diff --git a/com.discord/smali/kotlin/ranges/IntProgression.smali b/com.discord/smali/kotlin/ranges/IntProgression.smali
index 4bf07c1d8a..2103b7e2a7 100644
--- a/com.discord/smali/kotlin/ranges/IntProgression.smali
+++ b/com.discord/smali/kotlin/ranges/IntProgression.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/ranges/IntProgression;
 .super Ljava/lang/Object;
+.source "Progressions.kt"
 
 # interfaces
 .implements Ljava/lang/Iterable;
@@ -229,9 +230,9 @@
 
     iget v0, p0, Lkotlin/ranges/IntProgression;->bQk:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-lez v0, :cond_1
 
@@ -241,10 +242,10 @@
 
     if-le v0, v3, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
-    return v1
+    return v2
 
     :cond_1
     iget v0, p0, Lkotlin/ranges/IntProgression;->bQi:I
@@ -253,10 +254,10 @@
 
     if-ge v0, v3, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
-    return v1
+    return v2
 .end method
 
 .method public synthetic iterator()Ljava/util/Iterator;
diff --git a/com.discord/smali/kotlin/ranges/IntRange$a.smali b/com.discord/smali/kotlin/ranges/IntRange$a.smali
index c726bf73be..649117baa4 100644
--- a/com.discord/smali/kotlin/ranges/IntRange$a.smali
+++ b/com.discord/smali/kotlin/ranges/IntRange$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/ranges/IntRange$a;
 .super Ljava/lang/Object;
+.source "Ranges.kt"
 
 
 # annotations
diff --git a/com.discord/smali/kotlin/ranges/IntRange.smali b/com.discord/smali/kotlin/ranges/IntRange.smali
index 56a012923a..597edf7b80 100644
--- a/com.discord/smali/kotlin/ranges/IntRange.smali
+++ b/com.discord/smali/kotlin/ranges/IntRange.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/ranges/IntRange;
 .super Lkotlin/ranges/IntProgression;
+.source "Ranges.kt"
 
 
 # annotations
@@ -55,7 +56,7 @@
     return-void
 .end method
 
-.method public static final synthetic Fs()Lkotlin/ranges/IntRange;
+.method public static final synthetic Fr()Lkotlin/ranges/IntRange;
     .locals 1
 
     sget-object v0, Lkotlin/ranges/IntRange;->bQo:Lkotlin/ranges/IntRange;
diff --git a/com.discord/smali/kotlin/ranges/a.smali b/com.discord/smali/kotlin/ranges/a.smali
index e34f040f93..73c40567f9 100644
--- a/com.discord/smali/kotlin/ranges/a.smali
+++ b/com.discord/smali/kotlin/ranges/a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/ranges/a;
 .super Lkotlin/a/aa;
+.source "ProgressionIterators.kt"
 
 
 # instance fields
@@ -24,18 +25,15 @@
 
     iget p3, p0, Lkotlin/ranges/a;->bQk:I
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-lez p3, :cond_0
 
     if-gt p1, p2, :cond_1
 
-    :goto_0
-    const/4 v0, 0x1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     if-lt p1, p2, :cond_1
@@ -43,19 +41,21 @@
     goto :goto_0
 
     :cond_1
-    :goto_1
+    const/4 v0, 0x0
+
+    :goto_0
     iput-boolean v0, p0, Lkotlin/ranges/a;->hasNext:Z
 
     iget-boolean p2, p0, Lkotlin/ranges/a;->hasNext:Z
 
     if-eqz p2, :cond_2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     iget p1, p0, Lkotlin/ranges/a;->bQm:I
 
-    :goto_2
+    :goto_1
     iput p1, p0, Lkotlin/ranges/a;->bQn:I
 
     return-void
@@ -72,7 +72,7 @@
 .end method
 
 .method public final nextInt()I
-    .locals 3
+    .locals 2
 
     iget v0, p0, Lkotlin/ranges/a;->bQn:I
 
@@ -100,11 +100,9 @@
     throw v0
 
     :cond_1
-    iget v1, p0, Lkotlin/ranges/a;->bQn:I
+    iget v1, p0, Lkotlin/ranges/a;->bQk:I
 
-    iget v2, p0, Lkotlin/ranges/a;->bQk:I
-
-    add-int/2addr v1, v2
+    add-int/2addr v1, v0
 
     iput v1, p0, Lkotlin/ranges/a;->bQn:I
 
diff --git a/com.discord/smali/kotlin/ranges/c.smali b/com.discord/smali/kotlin/ranges/c.smali
index 1296dbbc3e..a6a2066934 100644
--- a/com.discord/smali/kotlin/ranges/c.smali
+++ b/com.discord/smali/kotlin/ranges/c.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/ranges/c;
 .super Ljava/lang/Object;
+.source "RangesJVM.kt"
diff --git a/com.discord/smali/kotlin/ranges/d.smali b/com.discord/smali/kotlin/ranges/d.smali
index 6d0e768ae3..d29179cf70 100644
--- a/com.discord/smali/kotlin/ranges/d.smali
+++ b/com.discord/smali/kotlin/ranges/d.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/ranges/d;
 .super Lkotlin/ranges/c;
+.source "Ranges.kt"
diff --git a/com.discord/smali/kotlin/ranges/e.smali b/com.discord/smali/kotlin/ranges/e.smali
index 7fe1cfba01..9ba8dcf89c 100644
--- a/com.discord/smali/kotlin/ranges/e.smali
+++ b/com.discord/smali/kotlin/ranges/e.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/ranges/e;
 .super Lkotlin/ranges/d;
+.source "_Ranges.kt"
 
 
 # direct methods
@@ -26,7 +27,7 @@
 
     sget-object p0, Lkotlin/ranges/IntRange;->bQp:Lkotlin/ranges/IntRange$a;
 
-    invoke-static {}, Lkotlin/ranges/IntRange;->Fs()Lkotlin/ranges/IntRange;
+    invoke-static {}, Lkotlin/ranges/IntRange;->Fr()Lkotlin/ranges/IntRange;
 
     move-result-object p0
 
diff --git a/com.discord/smali/kotlin/reflect/KCallable.smali b/com.discord/smali/kotlin/reflect/KCallable.smali
index e8ed8afeb5..033a6579c7 100644
--- a/com.discord/smali/kotlin/reflect/KCallable.smali
+++ b/com.discord/smali/kotlin/reflect/KCallable.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/KCallable;
 .super Ljava/lang/Object;
+.source "KCallable.kt"
 
 # interfaces
 .implements Lkotlin/reflect/a;
diff --git a/com.discord/smali/kotlin/reflect/KFunction.smali b/com.discord/smali/kotlin/reflect/KFunction.smali
index 06c47bdafe..353da0b236 100644
--- a/com.discord/smali/kotlin/reflect/KFunction.smali
+++ b/com.discord/smali/kotlin/reflect/KFunction.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/KFunction;
 .super Ljava/lang/Object;
+.source "KFunction.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali/kotlin/reflect/a.smali b/com.discord/smali/kotlin/reflect/a.smali
index a7fd17477a..ecd862f295 100644
--- a/com.discord/smali/kotlin/reflect/a.smali
+++ b/com.discord/smali/kotlin/reflect/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/a;
 .super Ljava/lang/Object;
+.source "KAnnotatedElement.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali/kotlin/sequences/Sequence.smali b/com.discord/smali/kotlin/sequences/Sequence.smali
index 475f4f6d07..d15d2b352f 100644
--- a/com.discord/smali/kotlin/sequences/Sequence.smali
+++ b/com.discord/smali/kotlin/sequences/Sequence.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/sequences/Sequence;
 .super Ljava/lang/Object;
+.source "Sequence.kt"
 
 
 # annotations
diff --git a/com.discord/smali/kotlin/sequences/j.smali b/com.discord/smali/kotlin/sequences/j.smali
index 7efe94d31d..8a6145c30a 100644
--- a/com.discord/smali/kotlin/sequences/j.smali
+++ b/com.discord/smali/kotlin/sequences/j.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/sequences/j;
 .super Ljava/lang/Object;
+.source "SequenceBuilder.kt"
diff --git a/com.discord/smali/kotlin/sequences/k.smali b/com.discord/smali/kotlin/sequences/k.smali
index 75524eb121..c224b3f20a 100644
--- a/com.discord/smali/kotlin/sequences/k.smali
+++ b/com.discord/smali/kotlin/sequences/k.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/sequences/k;
 .super Lkotlin/sequences/j;
+.source "SequencesJVM.kt"
diff --git a/com.discord/smali/kotlin/sequences/l.smali b/com.discord/smali/kotlin/sequences/l.smali
index 35524424dc..57c39c478d 100644
--- a/com.discord/smali/kotlin/sequences/l.smali
+++ b/com.discord/smali/kotlin/sequences/l.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/sequences/l;
 .super Lkotlin/sequences/k;
+.source "Sequences.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/sequences/m.smali b/com.discord/smali/kotlin/sequences/m.smali
index cd1aecd922..e4014040a6 100644
--- a/com.discord/smali/kotlin/sequences/m.smali
+++ b/com.discord/smali/kotlin/sequences/m.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/sequences/m;
 .super Lkotlin/sequences/l;
+.source "_SequencesJvm.kt"
diff --git a/com.discord/smali/kotlin/sequences/n.smali b/com.discord/smali/kotlin/sequences/n.smali
index 62df88b108..2ed1c2dcbd 100644
--- a/com.discord/smali/kotlin/sequences/n.smali
+++ b/com.discord/smali/kotlin/sequences/n.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/sequences/n;
 .super Lkotlin/sequences/m;
+.source "_Sequences.kt"
 
 
 # direct methods
@@ -111,9 +112,14 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
+    move-object v1, p1
+
+    goto :goto_0
+
     :cond_0
     move-object v1, p1
 
+    :goto_0
     and-int/lit8 p1, p6, 0x2
 
     if-eqz p1, :cond_1
@@ -148,12 +154,12 @@
 
     const/4 v4, -0x1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_3
     move v4, p4
 
-    :goto_0
+    :goto_1
     and-int/lit8 p1, p6, 0x10
 
     if-eqz p1, :cond_4
diff --git a/com.discord/smali/kotlin/t.smali b/com.discord/smali/kotlin/t.smali
index 8ad2f7c6c9..d147ce0d0c 100644
--- a/com.discord/smali/kotlin/t.smali
+++ b/com.discord/smali/kotlin/t.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/t;
 .super Ljava/lang/RuntimeException;
+.source "UninitializedPropertyAccessException.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/b.smali b/com.discord/smali/kotlin/text/b.smali
index 208a2be4ea..61082cb539 100644
--- a/com.discord/smali/kotlin/text/b.smali
+++ b/com.discord/smali/kotlin/text/b.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/text/b;
 .super Ljava/lang/Object;
+.source "CharJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/c.smali b/com.discord/smali/kotlin/text/c.smali
index 702b3e0834..e9350f5bc9 100644
--- a/com.discord/smali/kotlin/text/c.smali
+++ b/com.discord/smali/kotlin/text/c.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/text/c;
 .super Lkotlin/text/b;
+.source "Char.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/e.smali b/com.discord/smali/kotlin/text/e.smali
index bcc3c085bd..a14aa258ea 100644
--- a/com.discord/smali/kotlin/text/e.smali
+++ b/com.discord/smali/kotlin/text/e.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/e;
 .super Ljava/lang/Object;
+.source "Strings.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali/kotlin/text/m.smali b/com.discord/smali/kotlin/text/m.smali
index 8951588a2b..4f4c34eb4b 100644
--- a/com.discord/smali/kotlin/text/m.smali
+++ b/com.discord/smali/kotlin/text/m.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/text/m;
 .super Ljava/lang/Object;
+.source "Indent.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/n.smali b/com.discord/smali/kotlin/text/n.smali
index 92b9fa9154..c6a7e7239d 100644
--- a/com.discord/smali/kotlin/text/n.smali
+++ b/com.discord/smali/kotlin/text/n.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/text/n;
 .super Lkotlin/text/m;
+.source "RegexExtensionsJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/o.smali b/com.discord/smali/kotlin/text/o.smali
index 5983936a54..f721b2d50b 100644
--- a/com.discord/smali/kotlin/text/o.smali
+++ b/com.discord/smali/kotlin/text/o.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/text/o;
 .super Lkotlin/text/n;
+.source "RegexExtensions.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/p.smali b/com.discord/smali/kotlin/text/p.smali
index 97bb78d443..55c96edb43 100644
--- a/com.discord/smali/kotlin/text/p.smali
+++ b/com.discord/smali/kotlin/text/p.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/text/p;
 .super Lkotlin/text/o;
+.source "StringBuilderJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/q.smali b/com.discord/smali/kotlin/text/q.smali
index 72ac5607ca..cde09f7186 100644
--- a/com.discord/smali/kotlin/text/q.smali
+++ b/com.discord/smali/kotlin/text/q.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/text/q;
 .super Lkotlin/text/p;
+.source "StringBuilder.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/r.smali b/com.discord/smali/kotlin/text/r.smali
index 9afa25378b..1ee2a1133d 100644
--- a/com.discord/smali/kotlin/text/r.smali
+++ b/com.discord/smali/kotlin/text/r.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/text/r;
 .super Lkotlin/text/q;
+.source "StringNumberConversionsJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/s.smali b/com.discord/smali/kotlin/text/s.smali
index 2d85c96f01..7fd265d4d8 100644
--- a/com.discord/smali/kotlin/text/s.smali
+++ b/com.discord/smali/kotlin/text/s.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/text/s;
 .super Lkotlin/text/r;
+.source "StringNumberConversions.kt"
 
 
 # direct methods
@@ -72,7 +73,7 @@
 
     const/4 v4, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/16 v4, 0x2b
@@ -81,6 +82,8 @@
 
     const/4 v3, 0x1
 
+    const/4 v4, 0x0
+
     goto :goto_0
 
     :cond_3
@@ -89,15 +92,14 @@
     :cond_4
     const/4 v3, 0x0
 
-    :goto_0
     const/4 v4, 0x0
 
-    :goto_1
+    :goto_0
     sub-int/2addr v0, v6
 
     if-gt v3, v0, :cond_8
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
 
     move-result v6
@@ -135,7 +137,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_8
     if-eqz v4, :cond_9
@@ -217,7 +219,7 @@
 
     const/4 v3, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/16 v4, 0x2b
@@ -226,23 +228,24 @@
 
     const/4 v2, 0x1
 
+    const/4 v3, 0x0
+
     goto :goto_0
 
     :cond_3
     return-object v1
 
     :cond_4
-    :goto_0
     const/4 v3, 0x0
 
-    :goto_1
+    :goto_0
     const-wide/16 v8, 0x0
 
     sub-int/2addr v0, v7
 
     if-gt v2, v0, :cond_8
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
 
     move-result v4
@@ -282,15 +285,13 @@
     return-object v1
 
     :cond_7
-    const/4 v4, 0x0
-
     sub-long/2addr v8, v10
 
     if-eq v2, v0, :cond_8
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_8
     if-eqz v3, :cond_9
diff --git a/com.discord/smali/kotlin/text/t.smali b/com.discord/smali/kotlin/text/t.smali
index 071fdf05cd..f594f30bb8 100644
--- a/com.discord/smali/kotlin/text/t.smali
+++ b/com.discord/smali/kotlin/text/t.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/text/t;
 .super Lkotlin/text/s;
+.source "StringsJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/u$a.smali b/com.discord/smali/kotlin/text/u$a.smali
index 91818932fe..6451db717a 100644
--- a/com.discord/smali/kotlin/text/u$a.smali
+++ b/com.discord/smali/kotlin/text/u$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/u$a;
 .super Lkotlin/jvm/internal/k;
+.source "Strings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/kotlin/text/u$b.smali b/com.discord/smali/kotlin/text/u$b.smali
index 99a9d772e2..ea7273c618 100644
--- a/com.discord/smali/kotlin/text/u$b.smali
+++ b/com.discord/smali/kotlin/text/u$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/u$b;
 .super Lkotlin/jvm/internal/k;
+.source "Strings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/kotlin/text/u$c.smali b/com.discord/smali/kotlin/text/u$c.smali
index fa42edc8a3..55866291fa 100644
--- a/com.discord/smali/kotlin/text/u$c.smali
+++ b/com.discord/smali/kotlin/text/u$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/u$c;
 .super Lkotlin/jvm/internal/k;
+.source "Strings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/kotlin/text/u.smali b/com.discord/smali/kotlin/text/u.smali
index cdfb3587b7..5166dec512 100644
--- a/com.discord/smali/kotlin/text/u.smali
+++ b/com.discord/smali/kotlin/text/u.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/text/u;
 .super Lkotlin/text/t;
+.source "Strings.kt"
 
 
 # direct methods
@@ -493,9 +494,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     if-ltz p3, :cond_0
 
@@ -509,7 +510,7 @@
     :goto_0
     if-eqz v2, :cond_8
 
-    invoke-static {p0, p1, v0, p2}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
+    invoke-static {p0, p1, v1, p2}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
 
     move-result v2
 
@@ -517,7 +518,7 @@
 
     if-eq v2, v3, :cond_7
 
-    if-ne p3, v1, :cond_1
+    if-ne p3, v0, :cond_1
 
     goto :goto_2
 
@@ -546,21 +547,21 @@
     invoke-direct {v5, v6}, Ljava/util/ArrayList;-><init>(I)V
 
     :cond_4
-    invoke-interface {p0, v0, v2}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
+    invoke-interface {p0, v1, v2}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v5, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v5, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
-    move-result v0
+    move-result v1
 
-    add-int/2addr v0, v2
+    add-int/2addr v1, v2
 
     if-eqz v4, :cond_5
 
@@ -573,7 +574,7 @@
     if-eq v2, v6, :cond_6
 
     :cond_5
-    invoke-static {p0, p1, v0, p2}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
+    invoke-static {p0, p1, v1, p2}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
 
     move-result v2
 
@@ -584,7 +585,7 @@
 
     move-result p1
 
-    invoke-interface {p0, v0, p1}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
+    invoke-interface {p0, v1, p1}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
 
     move-result-object p0
 
@@ -638,6 +639,8 @@
     check-cast p1, Ljava/lang/Throwable;
 
     throw p1
+
+    return-void
 .end method
 
 .method public static synthetic a(Ljava/lang/CharSequence;[CII)Ljava/util/List;
@@ -797,6 +800,8 @@
     check-cast p1, Ljava/lang/Throwable;
 
     throw p1
+
+    return-void
 .end method
 
 .method private static final a(Ljava/lang/CharSequence;[Ljava/lang/String;IZI)Lkotlin/sequences/Sequence;
@@ -1022,7 +1027,7 @@
 
     instance-of p3, p0, Ljava/lang/String;
 
-    if-nez p3, :cond_0
+    if-nez p3, :cond_5
 
     const/4 v0, 0x1
 
@@ -1040,13 +1045,12 @@
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    if-eqz p3, :cond_0
 
     invoke-static {v1}, Lkotlin/a/g;->a([C)C
 
     move-result p1
 
-    :cond_0
     check-cast p0, Ljava/lang/String;
 
     invoke-virtual {p0, p1, p2}, Ljava/lang/String;->lastIndexOf(II)I
@@ -1055,7 +1059,7 @@
 
     return p0
 
-    :cond_1
+    :cond_0
     invoke-static {p0}, Lkotlin/text/l;->l(Ljava/lang/CharSequence;)I
 
     move-result p1
@@ -1065,7 +1069,7 @@
     move-result p1
 
     :goto_0
-    if-ltz p1, :cond_5
+    if-ltz p1, :cond_4
 
     invoke-interface {p0, p1}, Ljava/lang/CharSequence;->charAt(I)C
 
@@ -1074,7 +1078,7 @@
     const/4 p3, 0x0
 
     :goto_1
-    if-gtz p3, :cond_3
+    if-gtz p3, :cond_2
 
     aget-char v3, v1, p3
 
@@ -1082,34 +1086,43 @@
 
     move-result v3
 
-    if-eqz v3, :cond_2
+    if-eqz v3, :cond_1
 
     const/4 p2, 0x1
 
     goto :goto_2
 
-    :cond_2
+    :cond_1
     add-int/lit8 p3, p3, 0x1
 
     goto :goto_1
 
-    :cond_3
+    :cond_2
     const/4 p2, 0x0
 
     :goto_2
-    if-eqz p2, :cond_4
+    if-eqz p2, :cond_3
 
     return p1
 
-    :cond_4
+    :cond_3
     add-int/lit8 p1, p1, -0x1
 
     goto :goto_0
 
-    :cond_5
+    :cond_4
     const/4 p0, -0x1
 
     return p0
+
+    :cond_5
+    check-cast p0, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->lastIndexOf(II)I
+
+    move-result p0
+
+    return p0
 .end method
 
 .method private static synthetic b(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZ)I
diff --git a/com.discord/smali/kotlin/text/v.smali b/com.discord/smali/kotlin/text/v.smali
index ee9de868bb..6d7a7d5812 100644
--- a/com.discord/smali/kotlin/text/v.smali
+++ b/com.discord/smali/kotlin/text/v.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/text/v;
 .super Lkotlin/text/u;
+.source "_StringsJvm.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/kotlin/text/w$a.smali b/com.discord/smali/kotlin/text/w$a.smali
index a012cac2e6..0977fd125f 100644
--- a/com.discord/smali/kotlin/text/w$a.smali
+++ b/com.discord/smali/kotlin/text/w$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/w$a;
 .super Lkotlin/jvm/internal/k;
+.source "_Strings.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/kotlin/text/w.smali b/com.discord/smali/kotlin/text/w.smali
index d55e3a5a9d..9fefd9c085 100644
--- a/com.discord/smali/kotlin/text/w.smali
+++ b/com.discord/smali/kotlin/text/w.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/text/w;
 .super Lkotlin/text/v;
+.source "_Strings.kt"
 
 
 # direct methods
diff --git a/com.discord/smali/okhttp3/Headers.smali b/com.discord/smali/okhttp3/Headers.smali
index bb6659fc79..167b206275 100644
--- a/com.discord/smali/okhttp3/Headers.smali
+++ b/com.discord/smali/okhttp3/Headers.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/Headers;
 .super Ljava/lang/Object;
+.source "Headers.java"
 
 
 # annotations
@@ -11,7 +12,7 @@
 
 
 # instance fields
-.field public final bYZ:[Ljava/lang/String;
+.field public final bYt:[Ljava/lang/String;
 
 
 # direct methods
@@ -20,9 +21,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -36,7 +37,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     return-void
 .end method
@@ -46,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     return-void
 .end method
@@ -213,20 +214,22 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public final Hh()Lokhttp3/Headers$a;
+.method public final Hg()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;->bZa:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
-    iget-object v2, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     invoke-static {v1, v2}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
@@ -246,9 +249,9 @@
 
     check-cast p1, Lokhttp3/Headers;
 
-    iget-object p1, p1, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     invoke-static {p1, v0}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -269,7 +272,7 @@
 .method public final fb(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     mul-int/lit8 p1, p1, 0x2
 
@@ -281,7 +284,7 @@
 .method public final fc(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     mul-int/lit8 p1, p1, 0x2
 
@@ -297,7 +300,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     invoke-static {v0, p1}, Lokhttp3/Headers;->b([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -309,7 +312,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     invoke-static {v0}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
@@ -325,7 +328,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->bYt:[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 0bdbfe8d86..0e7f486002 100644
--- a/com.discord/smali/okhttp3/Interceptor$Chain.smali
+++ b/com.discord/smali/okhttp3/Interceptor$Chain.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/Interceptor$Chain;
 .super Ljava/lang/Object;
+.source "Interceptor.java"
 
 
 # annotations
@@ -14,23 +15,23 @@
 
 
 # virtual methods
-.method public abstract GY()Lokhttp3/w;
+.method public abstract GX()Lokhttp3/w;
 .end method
 
-.method public abstract Hu()Lokhttp3/i;
+.method public abstract Ht()Lokhttp3/i;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
+.method public abstract Hu()I
+.end method
+
 .method public abstract Hv()I
 .end method
 
 .method public abstract Hw()I
 .end method
 
-.method public abstract Hx()I
-.end method
-
 .method public abstract b(Lokhttp3/w;)Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/okhttp3/MediaType.smali b/com.discord/smali/okhttp3/MediaType.smali
index 9b0ff2aba7..314dfc2fe2 100644
--- a/com.discord/smali/okhttp3/MediaType.smali
+++ b/com.discord/smali/okhttp3/MediaType.smali
@@ -1,17 +1,18 @@
 .class public final Lokhttp3/MediaType;
 .super Ljava/lang/Object;
+.source "MediaType.java"
 
 
 # static fields
-.field private static final bZl:Ljava/util/regex/Pattern;
+.field private static final bYF:Ljava/util/regex/Pattern;
 
-.field private static final bZm:Ljava/util/regex/Pattern;
+.field private static final bYG:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bZn:Ljava/lang/String;
+.field private final bYH:Ljava/lang/String;
 
-.field public final bZo:Ljava/lang/String;
+.field public final bYI:Ljava/lang/String;
 
 .field private final charset:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -31,7 +32,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MediaType;->bZl:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->bYF:Ljava/util/regex/Pattern;
 
     const-string v0, ";\\s*(?:([a-zA-Z0-9-!#$%&\'*+.^_`{|}~]+)=(?:([a-zA-Z0-9-!#$%&\'*+.^_`{|}~]+)|\"([^\"]*)\"))?"
 
@@ -39,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MediaType;->bZm:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->bYG:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -53,11 +54,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/MediaType;->bZn:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/MediaType;->bYH:Ljava/lang/String;
 
     iput-object p2, p0, Lokhttp3/MediaType;->type:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/MediaType;->bZo:Ljava/lang/String;
+    iput-object p3, p0, Lokhttp3/MediaType;->bYI:Ljava/lang/String;
 
     iput-object p4, p0, Lokhttp3/MediaType;->charset:Ljava/lang/String;
 
@@ -67,7 +68,7 @@
 .method public static eq(Ljava/lang/String;)Lokhttp3/MediaType;
     .locals 9
 
-    sget-object v0, Lokhttp3/MediaType;->bZl:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/MediaType;->bYF:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -107,7 +108,7 @@
 
     const/4 v6, 0x0
 
-    sget-object v7, Lokhttp3/MediaType;->bZm:Ljava/util/regex/Pattern;
+    sget-object v7, Lokhttp3/MediaType;->bYG:Ljava/util/regex/Pattern;
 
     invoke-virtual {v7, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -311,6 +312,8 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public static er(Ljava/lang/String;)Lokhttp3/MediaType;
@@ -353,14 +356,14 @@
 
     invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    :cond_0
+    return-object p1
 
     :catch_0
-    :cond_0
     return-object p1
 .end method
 
@@ -377,9 +380,9 @@
 
     check-cast p1, Lokhttp3/MediaType;
 
-    iget-object p1, p1, Lokhttp3/MediaType;->bZn:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/MediaType;->bYH:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/MediaType;->bZn:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bYH:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -400,7 +403,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/MediaType;->bZn:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bYH:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
@@ -412,7 +415,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/MediaType;->bZn:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bYH: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 ec4871cf23..92617889c2 100644
--- a/com.discord/smali/okhttp3/MultipartBody$Part.smali
+++ b/com.discord/smali/okhttp3/MultipartBody$Part.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/MultipartBody$Part;
 .super Ljava/lang/Object;
+.source "MultipartBody.java"
 
 
 # annotations
@@ -14,12 +15,12 @@
 
 
 # instance fields
-.field final bZC:Lokhttp3/Headers;
+.field final bYW:Lokhttp3/Headers;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bZD:Lokhttp3/RequestBody;
+.field final bYX:Lokhttp3/RequestBody;
 
 
 # direct methods
@@ -32,9 +33,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->bZC:Lokhttp3/Headers;
+    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->bYW:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->bZD:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->bYX: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 39a0c077e7..9650d84962 100644
--- a/com.discord/smali/okhttp3/MultipartBody$a.smali
+++ b/com.discord/smali/okhttp3/MultipartBody$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/MultipartBody$a;
 .super Ljava/lang/Object;
+.source "MultipartBody.java"
 
 
 # annotations
@@ -14,7 +15,9 @@
 
 
 # instance fields
-.field public final bZA:Ljava/util/List;
+.field public final bYR:Lokio/ByteString;
+
+.field public final bYU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,9 +27,7 @@
     .end annotation
 .end field
 
-.field public bZB:Lokhttp3/MediaType;
-
-.field public final bZx:Lokio/ByteString;
+.field public bYV:Lokhttp3/MediaType;
 
 
 # direct methods
@@ -51,21 +52,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/MultipartBody;->bZp:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/MultipartBody;->bYJ:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->bZB:Lokhttp3/MediaType;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->bYV:Lokhttp3/MediaType;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->bZA:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->bYU:Ljava/util/List;
 
     invoke-static {p1}, Lokio/ByteString;->eM(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody$a;->bZx:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody$a;->bYR:Lokio/ByteString;
 
     return-void
 .end method
@@ -95,7 +96,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/MultipartBody$a;->bZA:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/MultipartBody$a;->bYU: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 a3b28eec66..9e8754c79e 100644
--- a/com.discord/smali/okhttp3/MultipartBody.smali
+++ b/com.discord/smali/okhttp3/MultipartBody.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/MultipartBody;
 .super Lokhttp3/RequestBody;
+.source "MultipartBody.java"
 
 
 # annotations
@@ -12,25 +13,31 @@
 
 
 # static fields
-.field public static final bZp:Lokhttp3/MediaType;
+.field public static final bYJ:Lokhttp3/MediaType;
 
-.field public static final bZq:Lokhttp3/MediaType;
+.field public static final bYK:Lokhttp3/MediaType;
 
-.field public static final bZr:Lokhttp3/MediaType;
+.field public static final bYL:Lokhttp3/MediaType;
 
-.field public static final bZs:Lokhttp3/MediaType;
+.field public static final bYM:Lokhttp3/MediaType;
 
-.field public static final bZt:Lokhttp3/MediaType;
+.field public static final bYN:Lokhttp3/MediaType;
 
-.field private static final bZu:[B
+.field private static final bYO:[B
 
-.field private static final bZv:[B
+.field private static final bYP:[B
 
-.field private static final bZw:[B
+.field private static final bYQ:[B
 
 
 # instance fields
-.field private final bZA:Ljava/util/List;
+.field private final bYR:Lokio/ByteString;
+
+.field private final bYS:Lokhttp3/MediaType;
+
+.field private final bYT:Lokhttp3/MediaType;
+
+.field private final bYU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -40,12 +47,6 @@
     .end annotation
 .end field
 
-.field private final bZx:Lokio/ByteString;
-
-.field private final bZy:Lokhttp3/MediaType;
-
-.field private final bZz:Lokhttp3/MediaType;
-
 .field private contentLength:J
 
 
@@ -59,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bZp:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bYJ:Lokhttp3/MediaType;
 
     const-string v0, "multipart/alternative"
 
@@ -67,7 +68,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bZq:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bYK:Lokhttp3/MediaType;
 
     const-string v0, "multipart/digest"
 
@@ -75,7 +76,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bZr:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bYL:Lokhttp3/MediaType;
 
     const-string v0, "multipart/parallel"
 
@@ -83,7 +84,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bZs:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bYM:Lokhttp3/MediaType;
 
     const-string v0, "multipart/form-data"
 
@@ -91,7 +92,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bZt:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bYN:Lokhttp3/MediaType;
 
     const/4 v0, 0x2
 
@@ -99,19 +100,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/MultipartBody;->bZu:[B
+    sput-object v1, Lokhttp3/MultipartBody;->bYO:[B
 
     new-array v1, v0, [B
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lokhttp3/MultipartBody;->bZv:[B
+    sput-object v1, Lokhttp3/MultipartBody;->bYP:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_2
 
-    sput-object v0, Lokhttp3/MultipartBody;->bZw:[B
+    sput-object v0, Lokhttp3/MultipartBody;->bYQ:[B
 
     return-void
 
@@ -159,9 +160,9 @@
 
     iput-wide v0, p0, Lokhttp3/MultipartBody;->contentLength:J
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->bZx:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->bYR:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody;->bZy:Lokhttp3/MediaType;
+    iput-object p2, p0, Lokhttp3/MultipartBody;->bYS:Lokhttp3/MediaType;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -173,7 +174,7 @@
 
     invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Jj()Ljava/lang/String;
 
     move-result-object p1
 
@@ -187,13 +188,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->bZz:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->bYT:Lokhttp3/MediaType;
 
     invoke-static {p3}, Lokhttp3/internal/c;->aw(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->bZA:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->bYU:Ljava/util/List;
 
     return-void
 .end method
@@ -224,7 +225,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/MultipartBody;->bZA:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->bYU:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -241,7 +242,7 @@
     :goto_1
     if-ge v3, v1, :cond_6
 
-    iget-object v6, p0, Lokhttp3/MultipartBody;->bZA:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/MultipartBody;->bYU:Ljava/util/List;
 
     invoke-interface {v6, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -249,25 +250,25 @@
 
     check-cast v6, Lokhttp3/MultipartBody$Part;
 
-    iget-object v7, v6, Lokhttp3/MultipartBody$Part;->bZC:Lokhttp3/Headers;
+    iget-object v7, v6, Lokhttp3/MultipartBody$Part;->bYW:Lokhttp3/Headers;
 
-    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->bZD:Lokhttp3/RequestBody;
+    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->bYX:Lokhttp3/RequestBody;
 
-    sget-object v8, Lokhttp3/MultipartBody;->bZw:[B
+    sget-object v8, Lokhttp3/MultipartBody;->bYQ:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
-    iget-object v8, p0, Lokhttp3/MultipartBody;->bZx:Lokio/ByteString;
+    iget-object v8, p0, Lokhttp3/MultipartBody;->bYR:Lokio/ByteString;
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->i(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v8, Lokhttp3/MultipartBody;->bZv:[B
+    sget-object v8, Lokhttp3/MultipartBody;->bYP:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
     if-eqz v7, :cond_1
 
-    iget-object v8, v7, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v8, v7, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v8, v8
 
@@ -286,7 +287,7 @@
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->bZu:[B
+    sget-object v11, Lokhttp3/MultipartBody;->bYO:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
@@ -300,7 +301,7 @@
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->bZv:[B
+    sget-object v11, Lokhttp3/MultipartBody;->bYP:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
@@ -329,7 +330,7 @@
 
     move-result-object v7
 
-    sget-object v8, Lokhttp3/MultipartBody;->bZv:[B
+    sget-object v8, Lokhttp3/MultipartBody;->bYP:[B
 
     invoke-interface {v7, v8}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
@@ -354,7 +355,7 @@
 
     move-result-object v9
 
-    sget-object v10, Lokhttp3/MultipartBody;->bZv:[B
+    sget-object v10, Lokhttp3/MultipartBody;->bYP:[B
 
     invoke-interface {v9, v10}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
@@ -369,7 +370,7 @@
 
     :cond_4
     :goto_3
-    sget-object v9, Lokhttp3/MultipartBody;->bZv:[B
+    sget-object v9, Lokhttp3/MultipartBody;->bYP:[B
 
     invoke-interface {p1, v9}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
@@ -383,7 +384,7 @@
     invoke-virtual {v6, p1}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
     :goto_4
-    sget-object v6, Lokhttp3/MultipartBody;->bZv:[B
+    sget-object v6, Lokhttp3/MultipartBody;->bYP:[B
 
     invoke-interface {p1, v6}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
@@ -392,19 +393,19 @@
     goto/16 :goto_1
 
     :cond_6
-    sget-object v1, Lokhttp3/MultipartBody;->bZw:[B
+    sget-object v1, Lokhttp3/MultipartBody;->bYQ:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/MultipartBody;->bZx:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->bYR:Lokio/ByteString;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->i(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->bZw:[B
+    sget-object v1, Lokhttp3/MultipartBody;->bYQ:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->bZv:[B
+    sget-object v1, Lokhttp3/MultipartBody;->bYP:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
@@ -452,25 +453,28 @@
 
     invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     const-string v3, "%22"
 
+    invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_1
     const-string v3, "%0D"
 
+    invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_2
     const-string v3, "%0A"
 
-    :goto_1
     invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_2
+    :goto_1
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
@@ -518,7 +522,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/MultipartBody;->bZz:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/MultipartBody;->bYT: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 f940da841c..a274a4bd8c 100644
--- a/com.discord/smali/okhttp3/RequestBody$1.smali
+++ b/com.discord/smali/okhttp3/RequestBody$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/RequestBody$1;
 .super Lokhttp3/RequestBody;
+.source "RequestBody.java"
 
 
 # annotations
@@ -14,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic cam:Lokhttp3/MediaType;
+.field final synthetic bZG:Lokhttp3/MediaType;
 
-.field final synthetic can:Lokio/ByteString;
+.field final synthetic bZH:Lokio/ByteString;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Lokio/ByteString;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$1;->cam:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$1;->bZG:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$1;->can:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/RequestBody$1;->bZH:Lokio/ByteString;
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -42,7 +43,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->can:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bZH:Lokio/ByteString;
 
     invoke-virtual {v0}, Lokio/ByteString;->size()I
 
@@ -58,7 +59,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->cam:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bZG:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -71,7 +72,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->can:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bZH:Lokio/ByteString;
 
     invoke-interface {p1, v0}, Lokio/BufferedSink;->i(Lokio/ByteString;)Lokio/BufferedSink;
 
diff --git a/com.discord/smali/okhttp3/RequestBody$2.smali b/com.discord/smali/okhttp3/RequestBody$2.smali
index 0d72307346..1f1c197126 100644
--- a/com.discord/smali/okhttp3/RequestBody$2.smali
+++ b/com.discord/smali/okhttp3/RequestBody$2.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/RequestBody$2;
 .super Lokhttp3/RequestBody;
+.source "RequestBody.java"
 
 
 # annotations
@@ -14,26 +15,26 @@
 
 
 # instance fields
-.field final synthetic cam:Lokhttp3/MediaType;
+.field final synthetic bZG:Lokhttp3/MediaType;
 
-.field final synthetic cao:I
+.field final synthetic bZI:I
 
-.field final synthetic cap:[B
+.field final synthetic bZJ:[B
 
-.field final synthetic caq:I
+.field final synthetic bZK:I
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;I[BI)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$2;->cam:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$2;->bZG:Lokhttp3/MediaType;
 
-    iput p2, p0, Lokhttp3/RequestBody$2;->cao:I
+    iput p2, p0, Lokhttp3/RequestBody$2;->bZI:I
 
-    iput-object p3, p0, Lokhttp3/RequestBody$2;->cap:[B
+    iput-object p3, p0, Lokhttp3/RequestBody$2;->bZJ:[B
 
-    iput p4, p0, Lokhttp3/RequestBody$2;->caq:I
+    iput p4, p0, Lokhttp3/RequestBody$2;->bZK:I
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -45,7 +46,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget v0, p0, Lokhttp3/RequestBody$2;->cao:I
+    iget v0, p0, Lokhttp3/RequestBody$2;->bZI:I
 
     int-to-long v0, v0
 
@@ -57,7 +58,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->cam:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bZG:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -70,11 +71,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->cap:[B
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bZJ:[B
 
-    iget v1, p0, Lokhttp3/RequestBody$2;->caq:I
+    iget v1, p0, Lokhttp3/RequestBody$2;->bZK:I
 
-    iget v2, p0, Lokhttp3/RequestBody$2;->cao:I
+    iget v2, p0, Lokhttp3/RequestBody$2;->bZI:I
 
     invoke-interface {p1, v0, v1, v2}, Lokio/BufferedSink;->r([BII)Lokio/BufferedSink;
 
diff --git a/com.discord/smali/okhttp3/RequestBody$3.smali b/com.discord/smali/okhttp3/RequestBody$3.smali
index 841aca5237..8aa1e70ea7 100644
--- a/com.discord/smali/okhttp3/RequestBody$3.smali
+++ b/com.discord/smali/okhttp3/RequestBody$3.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/RequestBody$3;
 .super Lokhttp3/RequestBody;
+.source "RequestBody.java"
 
 
 # annotations
@@ -14,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic cam:Lokhttp3/MediaType;
+.field final synthetic bZG:Lokhttp3/MediaType;
 
-.field final synthetic car:Ljava/io/File;
+.field final synthetic bZL:Ljava/io/File;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Ljava/io/File;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$3;->cam:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$3;->bZG:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$3;->car:Ljava/io/File;
+    iput-object p2, p0, Lokhttp3/RequestBody$3;->bZL:Ljava/io/File;
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -37,7 +38,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/RequestBody$3;->car:Ljava/io/File;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bZL:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->length()J
 
@@ -51,7 +52,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$3;->cam:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bZG:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -67,34 +68,23 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/RequestBody$3;->car:Ljava/io/File;
+    iget-object v1, p0, Lokhttp3/RequestBody$3;->bZL:Ljava/io/File;
 
     invoke-static {v1}, Lokio/j;->B(Ljava/io/File;)Lokio/q;
 
-    move-result-object v1
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lokio/BufferedSink;->a(Lokio/q;)J
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {p1, v1}, Lokio/BufferedSink;->a(Lokio/q;)J
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    invoke-static {v1}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
+    invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    move-object v0, v1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p1
-
-    :goto_0
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     throw p1
diff --git a/com.discord/smali/okhttp3/RequestBody.smali b/com.discord/smali/okhttp3/RequestBody.smali
index da84ca8294..b7751b7347 100644
--- a/com.discord/smali/okhttp3/RequestBody.smali
+++ b/com.discord/smali/okhttp3/RequestBody.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/RequestBody;
 .super Ljava/lang/Object;
+.source "RequestBody.java"
 
 
 # direct methods
diff --git a/com.discord/smali/okhttp3/Response$a.smali b/com.discord/smali/okhttp3/Response$a.smali
index e8f06ba218..85c0f35681 100644
--- a/com.discord/smali/okhttp3/Response$a.smali
+++ b/com.discord/smali/okhttp3/Response$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/Response$a;
 .super Ljava/lang/Object;
+.source "Response.java"
 
 
 # annotations
@@ -14,28 +15,28 @@
 
 
 # instance fields
-.field public caA:J
+.field bZF:Lokhttp3/Headers$a;
 
-.field cal:Lokhttp3/Headers$a;
+.field public bZM:Lokhttp3/w;
 
-.field public cas:Lokhttp3/w;
+.field public bZN:Lokhttp3/u;
 
-.field public cat:Lokhttp3/u;
-
-.field public cau:Lokhttp3/r;
+.field public bZO:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public cav:Lokhttp3/x;
+.field public bZP:Lokhttp3/x;
 
-.field caw:Lokhttp3/Response;
+.field bZQ:Lokhttp3/Response;
 
-.field cax:Lokhttp3/Response;
+.field bZR:Lokhttp3/Response;
 
-.field public cay:Lokhttp3/Response;
+.field public bZS:Lokhttp3/Response;
 
-.field public caz:J
+.field public bZT:J
+
+.field public bZU:J
 
 .field public code:I
 
@@ -56,7 +57,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cal:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZF:Lokhttp3/Headers$a;
 
     return-void
 .end method
@@ -70,13 +71,13 @@
 
     iput v0, p0, Lokhttp3/Response$a;->code:I
 
-    iget-object v0, p1, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response;->cat:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response;->bZN:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cat:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZN:Lokhttp3/u;
 
     iget v0, p1, Lokhttp3/Response;->code:I
 
@@ -86,41 +87,41 @@
 
     iput-object v0, p0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/Response;->cau:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response;->bZO:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cau:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZO:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v0, p1, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
-    invoke-virtual {v0}, Lokhttp3/Headers;->Hh()Lokhttp3/Headers$a;
+    invoke-virtual {v0}, Lokhttp3/Headers;->Hg()Lokhttp3/Headers$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cal:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZF:Lokhttp3/Headers$a;
 
-    iget-object v0, p1, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response;->caw:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bZQ:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->caw:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZQ:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->cax:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bZR:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cax:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZR:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->cay:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bZS:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cay:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZS:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response;->caz:J
+    iget-wide v0, p1, Lokhttp3/Response;->bZT:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->caz:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bZT:J
 
-    iget-wide v0, p1, Lokhttp3/Response;->caA:J
+    iget-wide v0, p1, Lokhttp3/Response;->bZU:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->caA:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bZU:J
 
     return-void
 .end method
@@ -128,19 +129,19 @@
 .method private static a(Ljava/lang/String;Lokhttp3/Response;)V
     .locals 1
 
-    iget-object v0, p1, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p1, Lokhttp3/Response;->caw:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bZQ:Lokhttp3/Response;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p1, Lokhttp3/Response;->cax:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bZR:Lokhttp3/Response;
 
     if-nez v0, :cond_1
 
-    iget-object p1, p1, Lokhttp3/Response;->cay:Lokhttp3/Response;
+    iget-object p1, p1, Lokhttp3/Response;->bZS:Lokhttp3/Response;
 
     if-nez p1, :cond_0
 
@@ -233,14 +234,14 @@
 
 
 # virtual methods
-.method public final HJ()Lokhttp3/Response;
+.method public final HI()Lokhttp3/Response;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->cat:Lokhttp3/u;
+    iget-object v0, p0, Lokhttp3/Response$a;->bZN:Lokhttp3/u;
 
     if-eqz v0, :cond_2
 
@@ -321,7 +322,7 @@
     invoke-static {v0, p1}, Lokhttp3/Response$a;->a(Ljava/lang/String;Lokhttp3/Response;)V
 
     :cond_0
-    iput-object p1, p0, Lokhttp3/Response$a;->caw:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bZQ:Lokhttp3/Response;
 
     return-object p0
 .end method
@@ -329,7 +330,7 @@
 .method public final ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Response$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response$a;->cal:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/Response$a;->bZF:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->ah(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -350,7 +351,7 @@
     invoke-static {v0, p1}, Lokhttp3/Response$a;->a(Ljava/lang/String;Lokhttp3/Response;)V
 
     :cond_0
-    iput-object p1, p0, Lokhttp3/Response$a;->cax:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bZR:Lokhttp3/Response;
 
     return-object p0
 .end method
@@ -358,11 +359,11 @@
 .method public final c(Lokhttp3/Headers;)Lokhttp3/Response$a;
     .locals 0
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Hh()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Hg()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/Response$a;->cal:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/Response$a;->bZF:Lokhttp3/Headers$a;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/Response.smali b/com.discord/smali/okhttp3/Response.smali
index 2b318e1bbd..87f875cf4b 100644
--- a/com.discord/smali/okhttp3/Response.smali
+++ b/com.discord/smali/okhttp3/Response.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/Response;
 .super Ljava/lang/Object;
+.source "Response.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -14,42 +15,42 @@
 
 
 # instance fields
-.field public final bZC:Lokhttp3/Headers;
+.field public final bYW:Lokhttp3/Headers;
 
-.field public final caA:J
+.field private volatile bZE:Lokhttp3/d;
 
-.field private volatile cak:Lokhttp3/d;
+.field public final bZM:Lokhttp3/w;
 
-.field public final cas:Lokhttp3/w;
+.field final bZN:Lokhttp3/u;
 
-.field final cat:Lokhttp3/u;
-
-.field public final cau:Lokhttp3/r;
+.field public final bZO:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final cav:Lokhttp3/x;
+.field public final bZP:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final caw:Lokhttp3/Response;
+.field final bZQ:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final cax:Lokhttp3/Response;
+.field final bZR:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final cay:Lokhttp3/Response;
+.field public final bZS:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final caz:J
+.field public final bZT:J
+
+.field public final bZU:J
 
 .field public final code:I
 
@@ -62,13 +63,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->cat:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZN:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response;->cat:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response;->bZN:Lokhttp3/u;
 
     iget v0, p1, Lokhttp3/Response$a;->code:I
 
@@ -78,48 +79,48 @@
 
     iput-object v0, p0, Lokhttp3/Response;->message:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->cau:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZO:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response;->cau:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response;->bZO:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->cal:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZF:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->caw:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZQ:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->caw:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bZQ:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->cax:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZR:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->cax:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bZR:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->cay:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bZS:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->cay:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bZS:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->caz:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bZT:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->caz:J
+    iput-wide v0, p0, Lokhttp3/Response;->bZT:J
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->caA:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bZU:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->caA:J
+    iput-wide v0, p0, Lokhttp3/Response;->bZU:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final AQ()Z
+.method public final AP()Z
     .locals 2
 
     iget v0, p0, Lokhttp3/Response;->code:I
@@ -128,8 +129,6 @@
 
     if-lt v0, v1, :cond_0
 
-    iget v0, p0, Lokhttp3/Response;->code:I
-
     const/16 v1, 0x12c
 
     if-ge v0, v1, :cond_0
@@ -144,36 +143,36 @@
     return v0
 .end method
 
-.method public final GY()Lokhttp3/w;
+.method public final GX()Lokhttp3/w;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
     return-object v0
 .end method
 
-.method public final HG()Lokhttp3/d;
+.method public final HF()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->cak:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/Response;->bZE:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->cak:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/Response;->bZE:Lokhttp3/d;
 
     return-object v0
 .end method
 
-.method public final HI()Lokhttp3/Response$a;
+.method public final HH()Lokhttp3/Response$a;
     .locals 1
 
     new-instance v0, Lokhttp3/Response$a;
@@ -186,12 +185,10 @@
 .method public final close()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/Response;->cav:Lokhttp3/x;
-
     invoke-virtual {v0}, Lokhttp3/x;->close()V
 
     return-void
@@ -211,7 +208,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers;->get(Ljava/lang/String;)Ljava/lang/String;
 
@@ -236,7 +233,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/Response;->cat:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/Response;->bZN:Lokhttp3/u;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -260,9 +257,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object v1, v1, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/WebSocket.smali b/com.discord/smali/okhttp3/WebSocket.smali
index cb4e2ffe20..f6316e7441 100644
--- a/com.discord/smali/okhttp3/WebSocket.smali
+++ b/com.discord/smali/okhttp3/WebSocket.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/WebSocket;
 .super Ljava/lang/Object;
+.source "WebSocket.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/okhttp3/WebSocketListener.smali b/com.discord/smali/okhttp3/WebSocketListener.smali
index bd0134f845..34122fbd06 100644
--- a/com.discord/smali/okhttp3/WebSocketListener.smali
+++ b/com.discord/smali/okhttp3/WebSocketListener.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/WebSocketListener;
 .super Ljava/lang/Object;
+.source "WebSocketListener.java"
 
 
 # direct methods
diff --git a/com.discord/smali/okhttp3/a.smali b/com.discord/smali/okhttp3/a.smali
index 5711cf8ed5..fa06841470 100644
--- a/com.discord/smali/okhttp3/a.smali
+++ b/com.discord/smali/okhttp3/a.smali
@@ -1,17 +1,18 @@
 .class public final Lokhttp3/a;
 .super Ljava/lang/Object;
+.source "Address.java"
 
 
 # instance fields
-.field public final bVp:Lokhttp3/s;
+.field public final bUJ:Lokhttp3/s;
 
-.field public final bVq:Lokhttp3/o;
+.field public final bUK:Lokhttp3/o;
 
-.field public final bVr:Ljavax/net/SocketFactory;
+.field public final bUL:Ljavax/net/SocketFactory;
 
-.field final bVs:Lokhttp3/b;
+.field final bUM:Lokhttp3/b;
 
-.field public final bVt:Ljava/util/List;
+.field public final bUN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -21,7 +22,7 @@
     .end annotation
 .end field
 
-.field public final bVu:Ljava/util/List;
+.field public final bUO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,12 +32,12 @@
     .end annotation
 .end field
 
-.field public final bVv:Ljava/net/Proxy;
+.field public final bUP:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bVw:Lokhttp3/g;
+.field public final bUQ:Lokhttp3/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -122,10 +123,9 @@
 
     const-string v1, "http"
 
-    :goto_1
-    iput-object v1, v0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const-string v2, "https"
@@ -138,9 +138,9 @@
 
     const-string v1, "https"
 
-    goto :goto_1
+    iput-object v1, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
-    :goto_2
+    :goto_1
     if-eqz p1, :cond_a
 
     const/4 v1, 0x0
@@ -155,7 +155,7 @@
 
     if-eqz v1, :cond_9
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     if-lez p2, :cond_8
 
@@ -165,23 +165,23 @@
 
     iput p2, v0, Lokhttp3/s$a;->port:I
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->Ht()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Hs()Lokhttp3/s;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iput-object p1, p0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     if-eqz p3, :cond_7
 
-    iput-object p3, p0, Lokhttp3/a;->bVq:Lokhttp3/o;
+    iput-object p3, p0, Lokhttp3/a;->bUK:Lokhttp3/o;
 
     if-eqz p4, :cond_6
 
-    iput-object p4, p0, Lokhttp3/a;->bVr:Ljavax/net/SocketFactory;
+    iput-object p4, p0, Lokhttp3/a;->bUL:Ljavax/net/SocketFactory;
 
     if-eqz p8, :cond_5
 
-    iput-object p8, p0, Lokhttp3/a;->bVs:Lokhttp3/b;
+    iput-object p8, p0, Lokhttp3/a;->bUM:Lokhttp3/b;
 
     if-eqz p10, :cond_4
 
@@ -189,7 +189,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/a;->bVt:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/a;->bUN:Ljava/util/List;
 
     if-eqz p11, :cond_3
 
@@ -197,19 +197,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/a;->bVu:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/a;->bUO:Ljava/util/List;
 
     if-eqz p12, :cond_2
 
     iput-object p12, p0, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
-    iput-object p9, p0, Lokhttp3/a;->bVv:Ljava/net/Proxy;
+    iput-object p9, p0, Lokhttp3/a;->bUP:Ljava/net/Proxy;
 
     iput-object p5, p0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     iput-object p6, p0, Lokhttp3/a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iput-object p7, p0, Lokhttp3/a;->bVw:Lokhttp3/g;
+    iput-object p7, p0, Lokhttp3/a;->bUQ:Lokhttp3/g;
 
     return-void
 
@@ -333,9 +333,9 @@
 .method final a(Lokhttp3/a;)Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/a;->bVq:Lokhttp3/o;
+    iget-object v0, p0, Lokhttp3/a;->bUK:Lokhttp3/o;
 
-    iget-object v1, p1, Lokhttp3/a;->bVq:Lokhttp3/o;
+    iget-object v1, p1, Lokhttp3/a;->bUK:Lokhttp3/o;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -343,9 +343,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bVs:Lokhttp3/b;
+    iget-object v0, p0, Lokhttp3/a;->bUM:Lokhttp3/b;
 
-    iget-object v1, p1, Lokhttp3/a;->bVs:Lokhttp3/b;
+    iget-object v1, p1, Lokhttp3/a;->bUM:Lokhttp3/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -353,9 +353,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bVt:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bUN:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bVt:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bUN:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -363,9 +363,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bVu:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bUO:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bVu:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bUO:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -383,9 +383,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bVv:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/a;->bUP:Ljava/net/Proxy;
 
-    iget-object v1, p1, Lokhttp3/a;->bVv:Ljava/net/Proxy;
+    iget-object v1, p1, Lokhttp3/a;->bUP:Ljava/net/Proxy;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -413,9 +413,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bVw:Lokhttp3/g;
+    iget-object v0, p0, Lokhttp3/a;->bUQ:Lokhttp3/g;
 
-    iget-object v1, p1, Lokhttp3/a;->bVw:Lokhttp3/g;
+    iget-object v1, p1, Lokhttp3/a;->bUQ:Lokhttp3/g;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -423,11 +423,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     iget v0, v0, Lokhttp3/s;->port:I
 
-    iget-object p1, p1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     iget p1, p1, Lokhttp3/s;->port:I
 
@@ -454,11 +454,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     check-cast p1, Lokhttp3/a;
 
-    iget-object v1, p1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, p1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v0, v1}, Lokhttp3/s;->equals(Ljava/lang/Object;)Z
 
@@ -485,7 +485,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v0}, Lokhttp3/s;->hashCode()I
 
@@ -495,7 +495,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bVq:Lokhttp3/o;
+    iget-object v1, p0, Lokhttp3/a;->bUK:Lokhttp3/o;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -505,7 +505,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bVs:Lokhttp3/b;
+    iget-object v1, p0, Lokhttp3/a;->bUM:Lokhttp3/b;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -515,7 +515,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bVt:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bUN:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
@@ -525,7 +525,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bVu:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bUO:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
@@ -545,14 +545,12 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bVv:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bUP:Ljava/net/Proxy;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/a;->bVv:Ljava/net/Proxy;
-
     invoke-virtual {v1}, Ljava/net/Proxy;->hashCode()I
 
     move-result v1
@@ -571,8 +569,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
-
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
@@ -591,8 +587,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lokhttp3/a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
-
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
@@ -607,12 +601,10 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bVw:Lokhttp3/g;
+    iget-object v1, p0, Lokhttp3/a;->bUQ:Lokhttp3/g;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lokhttp3/a;->bVw:Lokhttp3/g;
-
     invoke-virtual {v1}, Lokhttp3/g;->hashCode()I
 
     move-result v2
@@ -632,9 +624,9 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -642,13 +634,13 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bUJ: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;->bVv:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bUP:Ljava/net/Proxy;
 
     if-eqz v1, :cond_0
 
@@ -656,12 +648,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/a;->bVv:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bUP:Ljava/net/Proxy;
 
-    :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v1, ", proxySelector="
@@ -670,9 +661,9 @@
 
     iget-object v1, p0, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    :goto_1
+    :goto_0
     const-string v1, "}"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/okhttp3/d.smali b/com.discord/smali/okhttp3/d.smali
index ecf3e26298..5173eb34b5 100644
--- a/com.discord/smali/okhttp3/d.smali
+++ b/com.discord/smali/okhttp3/d.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/d;
 .super Ljava/lang/Object;
+.source "CacheControl.java"
 
 
 # annotations
@@ -11,35 +12,35 @@
 
 
 # static fields
-.field public static final bVA:Lokhttp3/d;
+.field public static final bUU:Lokhttp3/d;
 
-.field public static final bVB:Lokhttp3/d;
+.field public static final bUV:Lokhttp3/d;
 
 
 # instance fields
-.field public final bVC:Z
+.field public final bUW:Z
 
-.field public final bVD:Z
+.field public final bUX:Z
 
-.field public final bVE:I
+.field public final bUY:I
 
-.field private final bVF:I
+.field private final bUZ:I
 
-.field public final bVG:Z
+.field public final bVa:Z
 
-.field public final bVH:Z
+.field public final bVb:Z
 
-.field public final bVI:Z
+.field public final bVc:Z
 
-.field public final bVJ:I
+.field public final bVd:I
 
-.field public final bVK:I
+.field public final bVe:I
 
-.field public final bVL:Z
+.field public final bVf:Z
 
-.field private final bVM:Z
+.field private final bVg:Z
 
-.field bVN:Ljava/lang/String;
+.field bVh:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -57,19 +58,19 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lokhttp3/d$a;->bVC:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bUW:Z
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->GX()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->GW()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bVA:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bUU:Lokhttp3/d;
 
     new-instance v0, Lokhttp3/d$a;
 
     invoke-direct {v0}, Lokhttp3/d$a;-><init>()V
 
-    iput-boolean v1, v0, Lokhttp3/d$a;->bVL:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bVf:Z
 
     sget-object v1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -91,13 +92,13 @@
     long-to-int v1, v4
 
     :goto_0
-    iput v1, v0, Lokhttp3/d$a;->bVJ:I
+    iput v1, v0, Lokhttp3/d$a;->bVd:I
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->GX()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->GW()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bVB:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bUV:Lokhttp3/d;
 
     return-void
 .end method
@@ -107,45 +108,45 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bVC:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bUW:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bVC:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bUW:Z
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bVD:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bUX:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bVD:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bUX:Z
 
-    iget v0, p1, Lokhttp3/d$a;->bVE:I
+    iget v0, p1, Lokhttp3/d$a;->bUY:I
 
-    iput v0, p0, Lokhttp3/d;->bVE:I
+    iput v0, p0, Lokhttp3/d;->bUY:I
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/d;->bVF:I
+    iput v0, p0, Lokhttp3/d;->bUZ:I
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/d;->bVG:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bVa:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bVH:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bVb:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bVI:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bVc:Z
 
-    iget v0, p1, Lokhttp3/d$a;->bVJ:I
+    iget v0, p1, Lokhttp3/d$a;->bVd:I
 
-    iput v0, p0, Lokhttp3/d;->bVJ:I
+    iput v0, p0, Lokhttp3/d;->bVd:I
 
-    iget v0, p1, Lokhttp3/d$a;->bVK:I
+    iget v0, p1, Lokhttp3/d$a;->bVe:I
 
-    iput v0, p0, Lokhttp3/d;->bVK:I
+    iput v0, p0, Lokhttp3/d;->bVe:I
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bVL:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bVf:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bVL:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bVf:Z
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bVM:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bVg:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bVM:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bVg:Z
 
     iget-boolean p1, p1, Lokhttp3/d$a;->immutable:Z
 
@@ -163,41 +164,41 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/d;->bVC:Z
+    iput-boolean p1, p0, Lokhttp3/d;->bUW:Z
 
-    iput-boolean p2, p0, Lokhttp3/d;->bVD:Z
+    iput-boolean p2, p0, Lokhttp3/d;->bUX:Z
 
-    iput p3, p0, Lokhttp3/d;->bVE:I
+    iput p3, p0, Lokhttp3/d;->bUY:I
 
-    iput p4, p0, Lokhttp3/d;->bVF:I
+    iput p4, p0, Lokhttp3/d;->bUZ:I
 
-    iput-boolean p5, p0, Lokhttp3/d;->bVG:Z
+    iput-boolean p5, p0, Lokhttp3/d;->bVa:Z
 
-    iput-boolean p6, p0, Lokhttp3/d;->bVH:Z
+    iput-boolean p6, p0, Lokhttp3/d;->bVb:Z
 
-    iput-boolean p7, p0, Lokhttp3/d;->bVI:Z
+    iput-boolean p7, p0, Lokhttp3/d;->bVc:Z
 
-    iput p8, p0, Lokhttp3/d;->bVJ:I
+    iput p8, p0, Lokhttp3/d;->bVd:I
 
-    iput p9, p0, Lokhttp3/d;->bVK:I
+    iput p9, p0, Lokhttp3/d;->bVe:I
 
-    iput-boolean p10, p0, Lokhttp3/d;->bVL:Z
+    iput-boolean p10, p0, Lokhttp3/d;->bVf:Z
 
-    iput-boolean p11, p0, Lokhttp3/d;->bVM:Z
+    iput-boolean p11, p0, Lokhttp3/d;->bVg:Z
 
     iput-boolean p12, p0, Lokhttp3/d;->immutable:Z
 
-    iput-object p13, p0, Lokhttp3/d;->bVN:Ljava/lang/String;
+    iput-object p13, p0, Lokhttp3/d;->bVh:Ljava/lang/String;
 
     return-void
 .end method
 
 .method public static a(Lokhttp3/Headers;)Lokhttp3/d;
-    .locals 23
+    .locals 22
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -209,405 +210,439 @@
 
     const/4 v8, 0x0
 
+    const/4 v9, 0x0
+
     const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    const/4 v11, -0x1
 
     const/4 v12, -0x1
 
-    const/4 v13, -0x1
+    const/4 v13, 0x0
 
     const/4 v14, 0x0
 
     const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    const/16 v16, -0x1
 
     const/16 v17, -0x1
 
-    const/16 v18, -0x1
+    const/16 v18, 0x0
 
     const/16 v19, 0x0
 
     const/16 v20, 0x0
 
-    const/16 v21, 0x0
-
     :goto_0
-    if-ge v6, v1, :cond_12
+    if-ge v6, v1, :cond_13
 
     invoke-virtual {v0, v6}, Lokhttp3/Headers;->fb(I)Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v2
 
     invoke-virtual {v0, v6}, Lokhttp3/Headers;->fc(I)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v4
 
-    const-string v4, "Cache-Control"
+    const-string v3, "Cache-Control"
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
     if-eqz v8, :cond_0
 
-    :goto_1
     const/4 v7, 0x0
 
-    goto :goto_2
-
-    :cond_0
-    move-object v8, v2
-
-    goto :goto_2
-
-    :cond_1
-    const-string v4, "Pragma"
-
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_11
-
     goto :goto_1
 
+    :cond_0
+    move-object v8, v4
+
+    goto :goto_1
+
+    :cond_1
+    const-string v3, "Pragma"
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_12
+
+    const/4 v7, 0x0
+
+    :goto_1
+    const/4 v2, 0x0
+
     :goto_2
-    const/4 v4, 0x0
-
-    :goto_3
-    invoke-virtual {v2}, Ljava/lang/String;->length()I
-
-    move-result v9
-
-    if-ge v4, v9, :cond_11
-
-    const-string v9, "=,;"
-
-    invoke-static {v2, v4, v9}, Lokhttp3/internal/c/e;->c(Ljava/lang/String;ILjava/lang/String;)I
-
-    move-result v9
-
-    invoke-virtual {v2, v4, v9}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Ljava/lang/String;->trim()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {v2}, Ljava/lang/String;->length()I
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
 
     move-result v3
 
-    if-eq v9, v3, :cond_4
+    if-ge v2, v3, :cond_11
 
-    invoke-virtual {v2, v9}, Ljava/lang/String;->charAt(I)C
+    const-string v3, "=,;"
+
+    invoke-static {v4, v2, v3}, Lokhttp3/internal/c/e;->c(Ljava/lang/String;ILjava/lang/String;)I
 
     move-result v3
 
-    const/16 v5, 0x2c
+    invoke-virtual {v4, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/String;->trim()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
+
+    move-result v5
 
     if-eq v3, v5, :cond_4
 
-    invoke-virtual {v2, v9}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v4, v3}, Ljava/lang/String;->charAt(I)C
 
-    move-result v3
+    move-result v5
+
+    const/16 v0, 0x2c
+
+    if-eq v5, v0, :cond_4
+
+    invoke-virtual {v4, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
 
     const/16 v5, 0x3b
 
-    if-ne v3, v5, :cond_2
+    if-ne v0, v5, :cond_2
+
+    goto :goto_3
+
+    :cond_2
+    add-int/lit8 v3, v3, 0x1
+
+    invoke-static {v4, v3}, Lokhttp3/internal/c/e;->k(Ljava/lang/String;I)I
+
+    move-result v0
+
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    if-ge v0, v3, :cond_3
+
+    invoke-virtual {v4, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v3
+
+    const/16 v5, 0x22
+
+    if-ne v3, v5, :cond_3
+
+    add-int/lit8 v0, v0, 0x1
+
+    const-string v3, "\""
+
+    invoke-static {v4, v0, v3}, Lokhttp3/internal/c/e;->c(Ljava/lang/String;ILjava/lang/String;)I
+
+    move-result v3
+
+    invoke-virtual {v4, v0, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v5, 0x1
+
+    add-int/2addr v3, v5
 
     goto :goto_4
 
-    :cond_2
-    add-int/lit8 v9, v9, 0x1
+    :cond_3
+    const/4 v5, 0x1
 
-    invoke-static {v2, v9}, Lokhttp3/internal/c/e;->k(Ljava/lang/String;I)I
+    const-string v3, ",;"
+
+    invoke-static {v4, v0, v3}, Lokhttp3/internal/c/e;->c(Ljava/lang/String;ILjava/lang/String;)I
 
     move-result v3
 
-    invoke-virtual {v2}, Ljava/lang/String;->length()I
+    invoke-virtual {v4, v0, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
-    move-result v5
+    move-result-object v0
 
-    if-ge v3, v5, :cond_3
+    invoke-virtual {v0}, Ljava/lang/String;->trim()Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/String;->charAt(I)C
+    move-result-object v0
 
-    move-result v5
+    goto :goto_4
 
-    const/16 v9, 0x22
-
-    if-ne v5, v9, :cond_3
+    :cond_4
+    :goto_3
+    const/4 v5, 0x1
 
     add-int/lit8 v3, v3, 0x1
 
-    const-string v5, "\""
+    const/4 v0, 0x0
 
-    invoke-static {v2, v3, v5}, Lokhttp3/internal/c/e;->c(Ljava/lang/String;ILjava/lang/String;)I
-
-    move-result v5
-
-    invoke-virtual {v2, v3, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v3
-
-    const/16 v22, 0x1
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_5
-
-    :cond_3
-    const/16 v22, 0x1
-
-    const-string v5, ",;"
-
-    invoke-static {v2, v3, v5}, Lokhttp3/internal/c/e;->c(Ljava/lang/String;ILjava/lang/String;)I
-
-    move-result v5
-
-    invoke-virtual {v2, v3, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Ljava/lang/String;->trim()Ljava/lang/String;
-
-    move-result-object v3
-
-    goto :goto_5
-
-    :cond_4
     :goto_4
-    const/16 v22, 0x1
+    const-string v5, "no-cache"
 
-    add-int/lit8 v9, v9, 0x1
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move v5, v9
+    move-result v5
 
-    const/4 v3, 0x0
+    if-eqz v5, :cond_5
 
-    :goto_5
-    const-string v9, "no-cache"
+    move v2, v3
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    move-object/from16 v0, p0
 
-    move-result v9
+    const/4 v9, 0x1
 
-    if-eqz v9, :cond_5
+    goto :goto_2
 
-    move v4, v5
+    :cond_5
+    const-string v5, "no-store"
+
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    move v2, v3
+
+    move-object/from16 v0, p0
 
     const/4 v10, 0x1
 
-    goto :goto_3
-
-    :cond_5
-    const-string v9, "no-store"
-
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_6
-
-    move v4, v5
-
-    const/4 v11, 0x1
-
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
-    const-string v9, "max-age"
+    const-string v5, "max-age"
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_8
+    if-eqz v5, :cond_7
 
-    const/4 v9, -0x1
+    const/4 v5, -0x1
 
-    invoke-static {v3, v9}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
+    invoke-static {v0, v5}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
+
+    move-result v11
+
+    move v2, v3
+
+    move-object/from16 v0, p0
+
+    goto/16 :goto_2
+
+    :cond_7
+    const-string v5, "s-maxage"
+
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_8
+
+    const/4 v5, -0x1
+
+    invoke-static {v0, v5}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
 
     move-result v12
 
-    :cond_7
-    :goto_6
-    move v4, v5
+    move v2, v3
 
-    goto/16 :goto_3
+    move-object/from16 v0, p0
+
+    goto/16 :goto_2
 
     :cond_8
-    const-string v9, "s-maxage"
+    const-string v5, "private"
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_9
+    if-eqz v5, :cond_9
 
-    const/4 v9, -0x1
+    move v2, v3
 
-    invoke-static {v3, v9}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
+    move-object/from16 v0, p0
 
-    move-result v13
+    const/4 v13, 0x1
 
-    goto :goto_6
+    goto/16 :goto_2
 
     :cond_9
-    const-string v9, "private"
+    const-string v5, "public"
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_a
+    if-eqz v5, :cond_a
 
-    move v4, v5
+    move v2, v3
+
+    move-object/from16 v0, p0
 
     const/4 v14, 0x1
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_a
-    const-string v9, "public"
+    const-string v5, "must-revalidate"
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_b
+    if-eqz v5, :cond_b
 
-    move v4, v5
+    move v2, v3
+
+    move-object/from16 v0, p0
 
     const/4 v15, 0x1
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_b
-    const-string v9, "must-revalidate"
+    const-string v5, "max-stale"
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_c
+    if-eqz v5, :cond_c
 
-    move v4, v5
+    const v2, 0x7fffffff
 
-    const/16 v16, 0x1
+    invoke-static {v0, v2}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
 
-    goto/16 :goto_3
+    move-result v16
+
+    move v2, v3
+
+    move-object/from16 v0, p0
+
+    goto/16 :goto_2
 
     :cond_c
-    const-string v9, "max-stale"
+    const-string v5, "min-fresh"
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_d
+    if-eqz v5, :cond_d
 
-    const v4, 0x7fffffff
+    const/4 v5, -0x1
 
-    invoke-static {v3, v4}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
+    invoke-static {v0, v5}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
 
     move-result v17
 
-    goto :goto_6
+    move v2, v3
+
+    move-object/from16 v0, p0
+
+    goto/16 :goto_2
 
     :cond_d
-    const-string v9, "min-fresh"
+    const/4 v5, -0x1
 
-    invoke-virtual {v9, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    const-string v0, "only-if-cached"
 
-    move-result v9
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    if-eqz v9, :cond_e
+    move-result v0
 
-    const/4 v9, -0x1
+    if-eqz v0, :cond_e
 
-    invoke-static {v3, v9}, Lokhttp3/internal/c/e;->l(Ljava/lang/String;I)I
+    move v2, v3
 
-    move-result v18
+    move-object/from16 v0, p0
 
-    goto :goto_6
+    const/16 v18, 0x1
+
+    goto/16 :goto_2
 
     :cond_e
-    const/4 v9, -0x1
+    const-string v0, "no-transform"
 
-    const-string v3, "only-if-cached"
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    invoke-virtual {v3, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    move-result v0
 
-    move-result v3
+    if-eqz v0, :cond_f
 
-    if-eqz v3, :cond_f
+    move v2, v3
 
-    move v4, v5
+    move-object/from16 v0, p0
 
     const/16 v19, 0x1
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_f
-    const-string v3, "no-transform"
+    const-string v0, "immutable"
 
-    invoke-virtual {v3, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v3
+    move-result v0
 
-    if-eqz v3, :cond_10
-
-    move v4, v5
+    if-eqz v0, :cond_10
 
     const/16 v20, 0x1
 
-    goto/16 :goto_3
-
     :cond_10
-    const-string v3, "immutable"
+    move v2, v3
 
-    invoke-virtual {v3, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    move-object/from16 v0, p0
 
-    move-result v3
-
-    if-eqz v3, :cond_7
-
-    const/16 v21, 0x1
-
-    goto :goto_6
+    goto/16 :goto_2
 
     :cond_11
-    const/4 v9, -0x1
+    const/4 v5, -0x1
 
-    const/16 v22, 0x1
+    goto :goto_5
 
+    :cond_12
+    const/4 v5, -0x1
+
+    :goto_5
     add-int/lit8 v6, v6, 0x1
 
+    move-object/from16 v0, p0
+
     goto/16 :goto_0
 
-    :cond_12
-    if-nez v7, :cond_13
-
-    const/16 v22, 0x0
-
-    goto :goto_7
-
     :cond_13
-    move-object/from16 v22, v8
+    if-nez v7, :cond_14
 
-    :goto_7
+    const/16 v21, 0x0
+
+    goto :goto_6
+
+    :cond_14
+    move-object/from16 v21, v8
+
+    :goto_6
     new-instance v0, Lokhttp3/d;
 
-    move-object v9, v0
+    move-object v8, v0
 
-    invoke-direct/range {v9 .. v22}, Lokhttp3/d;-><init>(ZZIIZZZIIZZZLjava/lang/String;)V
+    invoke-direct/range {v8 .. v21}, Lokhttp3/d;-><init>(ZZIIZZZIIZZZLjava/lang/String;)V
 
     return-object v0
 .end method
@@ -617,7 +652,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/d;->bVN:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/d;->bVh:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -628,7 +663,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-boolean v1, p0, Lokhttp3/d;->bVC:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bUW:Z
 
     if-eqz v1, :cond_1
 
@@ -637,7 +672,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_1
-    iget-boolean v1, p0, Lokhttp3/d;->bVD:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bUX:Z
 
     if-eqz v1, :cond_2
 
@@ -646,7 +681,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_2
-    iget v1, p0, Lokhttp3/d;->bVE:I
+    iget v1, p0, Lokhttp3/d;->bUY:I
 
     const/4 v2, -0x1
 
@@ -656,7 +691,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bVE:I
+    iget v1, p0, Lokhttp3/d;->bUY:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -665,7 +700,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_3
-    iget v1, p0, Lokhttp3/d;->bVF:I
+    iget v1, p0, Lokhttp3/d;->bUZ:I
 
     if-eq v1, v2, :cond_4
 
@@ -673,7 +708,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bVF:I
+    iget v1, p0, Lokhttp3/d;->bUZ:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -682,7 +717,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_4
-    iget-boolean v1, p0, Lokhttp3/d;->bVG:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bVa:Z
 
     if-eqz v1, :cond_5
 
@@ -691,7 +726,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_5
-    iget-boolean v1, p0, Lokhttp3/d;->bVH:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bVb:Z
 
     if-eqz v1, :cond_6
 
@@ -700,7 +735,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_6
-    iget-boolean v1, p0, Lokhttp3/d;->bVI:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bVc:Z
 
     if-eqz v1, :cond_7
 
@@ -709,7 +744,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_7
-    iget v1, p0, Lokhttp3/d;->bVJ:I
+    iget v1, p0, Lokhttp3/d;->bVd:I
 
     if-eq v1, v2, :cond_8
 
@@ -717,7 +752,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bVJ:I
+    iget v1, p0, Lokhttp3/d;->bVd:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -726,7 +761,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_8
-    iget v1, p0, Lokhttp3/d;->bVK:I
+    iget v1, p0, Lokhttp3/d;->bVe:I
 
     if-eq v1, v2, :cond_9
 
@@ -734,7 +769,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bVK:I
+    iget v1, p0, Lokhttp3/d;->bVe:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -743,7 +778,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_9
-    iget-boolean v1, p0, Lokhttp3/d;->bVL:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bVf:Z
 
     if-eqz v1, :cond_a
 
@@ -752,7 +787,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_a
-    iget-boolean v1, p0, Lokhttp3/d;->bVM:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bVg:Z
 
     if-eqz v1, :cond_b
 
@@ -798,7 +833,7 @@
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/d;->bVN:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/d;->bVh:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/e$a.smali b/com.discord/smali/okhttp3/e$a.smali
index 25d90d03b8..4503ddf609 100644
--- a/com.discord/smali/okhttp3/e$a.smali
+++ b/com.discord/smali/okhttp3/e$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/e$a;
 .super Ljava/lang/Object;
+.source "Call.java"
 
 
 # annotations
diff --git a/com.discord/smali/okhttp3/g.smali b/com.discord/smali/okhttp3/g.smali
index 4e6a4e56b8..cd9dcd9f6d 100644
--- a/com.discord/smali/okhttp3/g.smali
+++ b/com.discord/smali/okhttp3/g.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/g;
 .super Ljava/lang/Object;
+.source "CertificatePinner.java"
 
 
 # annotations
@@ -12,11 +13,11 @@
 
 
 # static fields
-.field public static final bVO:Lokhttp3/g;
+.field public static final bVi:Lokhttp3/g;
 
 
 # instance fields
-.field final bVP:Ljava/util/Set;
+.field final bVj:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -26,7 +27,7 @@
     .end annotation
 .end field
 
-.field final bVQ:Lokhttp3/internal/h/c;
+.field final bVk:Lokhttp3/internal/h/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -52,7 +53,7 @@
 
     invoke-direct {v1, v2, v0}, Lokhttp3/g;-><init>(Ljava/util/Set;Lokhttp3/internal/h/c;)V
 
-    sput-object v1, Lokhttp3/g;->bVO:Lokhttp3/g;
+    sput-object v1, Lokhttp3/g;->bVi:Lokhttp3/g;
 
     return-void
 .end method
@@ -76,9 +77,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/g;->bVP:Ljava/util/Set;
+    iput-object p1, p0, Lokhttp3/g;->bVj:Ljava/util/Set;
 
-    iput-object p2, p0, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
+    iput-object p2, p0, Lokhttp3/g;->bVk:Lokhttp3/internal/h/c;
 
     return-void
 .end method
@@ -102,7 +103,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->Jl()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Jk()Ljava/lang/String;
 
     move-result-object p0
 
@@ -139,7 +140,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->Jn()Lokio/ByteString;
+    invoke-virtual {p0}, Lokio/ByteString;->Jm()Lokio/ByteString;
 
     move-result-object p0
 
@@ -174,7 +175,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lokhttp3/g;->bVP:Ljava/util/Set;
+    iget-object v2, v0, Lokhttp3/g;->bVj:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -226,7 +227,7 @@
 
     sub-int/2addr v2, v12
 
-    iget-object v3, v11, Lokhttp3/g$b;->bVR:Ljava/lang/String;
+    iget-object v3, v11, Lokhttp3/g$b;->bVl:Ljava/lang/String;
 
     invoke-virtual {v3}, Ljava/lang/String;->length()I
 
@@ -238,11 +239,11 @@
 
     add-int/lit8 v3, v1, 0x1
 
-    iget-object v4, v11, Lokhttp3/g$b;->bVR:Ljava/lang/String;
+    iget-object v4, v11, Lokhttp3/g$b;->bVl:Ljava/lang/String;
 
     const/4 v5, 0x0
 
-    iget-object v1, v11, Lokhttp3/g$b;->bVR:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bVl:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -261,7 +262,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, v11, Lokhttp3/g$b;->bVR:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bVl:Ljava/lang/String;
 
     invoke-virtual {v7, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -296,12 +297,10 @@
     return-void
 
     :cond_5
-    iget-object v1, v0, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v1, v0, Lokhttp3/g;->bVk:Lokhttp3/internal/h/c;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
-
     move-object/from16 v2, p2
 
     invoke-virtual {v1, v2, v7}, Lokhttp3/internal/h/c;->b(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
@@ -352,7 +351,7 @@
 
     check-cast v12, Lokhttp3/g$b;
 
-    iget-object v13, v12, Lokhttp3/g$b;->bVS:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bVm:Ljava/lang/String;
 
     const-string v14, "sha256/"
 
@@ -369,7 +368,7 @@
     move-result-object v8
 
     :cond_7
-    iget-object v12, v12, Lokhttp3/g$b;->bVT:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bVn:Lokio/ByteString;
 
     invoke-virtual {v12, v8}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -380,7 +379,7 @@
     return-void
 
     :cond_8
-    iget-object v13, v12, Lokhttp3/g$b;->bVS:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bVm:Ljava/lang/String;
 
     const-string v14, "sha1/"
 
@@ -404,12 +403,12 @@
 
     move-result-object v11
 
-    invoke-virtual {v11}, Lokio/ByteString;->Jm()Lokio/ByteString;
+    invoke-virtual {v11}, Lokio/ByteString;->Jl()Lokio/ByteString;
 
     move-result-object v11
 
     :cond_9
-    iget-object v12, v12, Lokhttp3/g$b;->bVT:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bVn:Lokio/ByteString;
 
     invoke-virtual {v12, v11}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -433,7 +432,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, v12, Lokhttp3/g$b;->bVS:Ljava/lang/String;
+    iget-object v3, v12, Lokhttp3/g$b;->bVm:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -544,6 +543,8 @@
     invoke-direct {v1, v2}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
@@ -564,11 +565,11 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v1, p0, Lokhttp3/g;->bVk:Lokhttp3/internal/h/c;
 
     check-cast p1, Lokhttp3/g;
 
-    iget-object v2, p1, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v2, p1, Lokhttp3/g;->bVk:Lokhttp3/internal/h/c;
 
     invoke-static {v1, v2}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -576,9 +577,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/g;->bVP:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bVj:Ljava/util/Set;
 
-    iget-object p1, p1, Lokhttp3/g;->bVP:Ljava/util/Set;
+    iget-object p1, p1, Lokhttp3/g;->bVj:Ljava/util/Set;
 
     invoke-interface {v1, p1}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
 
@@ -597,12 +598,10 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v0, p0, Lokhttp3/g;->bVk:Lokhttp3/internal/h/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -615,7 +614,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/g;->bVP:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bVj: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 bf8d0b0b1a..11e1722e98 100644
--- a/com.discord/smali/okhttp3/i.smali
+++ b/com.discord/smali/okhttp3/i.smali
@@ -1,7 +1,8 @@
 .class public interface abstract Lokhttp3/i;
 .super Ljava/lang/Object;
+.source "Connection.java"
 
 
 # virtual methods
-.method public abstract Ha()Lokhttp3/u;
+.method public abstract GZ()Lokhttp3/u;
 .end method
diff --git a/com.discord/smali/okhttp3/internal/a/c.smali b/com.discord/smali/okhttp3/internal/a/c.smali
index e74fb02808..a1c299a5a5 100644
--- a/com.discord/smali/okhttp3/internal/a/c.smali
+++ b/com.discord/smali/okhttp3/internal/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/a/c;
 .super Ljava/lang/Object;
+.source "CacheStrategy.java"
 
 
 # annotations
@@ -11,12 +12,12 @@
 
 
 # instance fields
-.field public final cax:Lokhttp3/Response;
+.field public final bZR:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final cbk:Lokhttp3/w;
+.field public final caE:Lokhttp3/w;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -28,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/a/c;->cbk:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/a/c;->caE:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/a/c;->cax:Lokhttp3/Response;
+    iput-object p2, p0, Lokhttp3/internal/a/c;->bZR:Lokhttp3/Response;
 
     return-void
 .end method
@@ -55,29 +56,29 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->HG()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->HF()Lokhttp3/d;
 
     move-result-object v0
 
-    iget v0, v0, Lokhttp3/d;->bVE:I
+    iget v0, v0, Lokhttp3/d;->bUY:I
 
     const/4 v2, -0x1
 
     if-ne v0, v2, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->HG()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->HF()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bVH:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bVb:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->HG()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->HF()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bVG:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bVa:Z
 
     if-nez v0, :cond_0
 
@@ -85,19 +86,19 @@
 
     :cond_0
     :sswitch_1
-    invoke-virtual {p0}, Lokhttp3/Response;->HG()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->HF()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bVD:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bUX:Z
 
     if-nez p0, :cond_1
 
-    invoke-virtual {p1}, Lokhttp3/w;->HG()Lokhttp3/d;
+    invoke-virtual {p1}, Lokhttp3/w;->HF()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bVD:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bUX:Z
 
     if-nez p0, :cond_1
 
@@ -106,9 +107,13 @@
     return p0
 
     :cond_1
+    return v1
+
     :goto_0
     return v1
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         0xc8 -> :sswitch_1
diff --git a/com.discord/smali/okhttp3/internal/b/c.smali b/com.discord/smali/okhttp3/internal/b/c.smali
index ac4c84eddc..c70d3acee4 100644
--- a/com.discord/smali/okhttp3/internal/b/c.smali
+++ b/com.discord/smali/okhttp3/internal/b/c.smali
@@ -1,36 +1,37 @@
 .class public final Lokhttp3/internal/b/c;
 .super Lokhttp3/internal/e/g$b;
+.source "RealConnection.java"
 
 # interfaces
 .implements Lokhttp3/i;
 
 
 # instance fields
-.field private final bZM:Lokhttp3/j;
+.field private bZN:Lokhttp3/u;
 
-.field public caE:Lokio/d;
+.field public bZO:Lokhttp3/r;
 
-.field private cat:Lokhttp3/u;
+.field public bZY:Lokio/d;
 
-.field public cau:Lokhttp3/r;
+.field private final bZg:Lokhttp3/j;
 
-.field public final cbN:Lokhttp3/y;
+.field public final cbh:Lokhttp3/y;
 
-.field public cbO:Ljava/net/Socket;
+.field public cbi:Ljava/net/Socket;
 
-.field public cbP:Ljava/net/Socket;
+.field public cbj:Ljava/net/Socket;
 
-.field cbQ:Lokhttp3/internal/e/g;
+.field cbk:Lokhttp3/internal/e/g;
 
-.field public cbR:Lokio/BufferedSink;
+.field public cbl:Lokio/BufferedSink;
 
-.field public cbS:Z
+.field public cbm:Z
 
-.field public cbT:I
+.field public cbn:I
 
-.field public cbU:I
+.field public cbo:I
 
-.field public final cbV:Ljava/util/List;
+.field public final cbp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,7 +42,7 @@
     .end annotation
 .end field
 
-.field public cbW:J
+.field public cbq:J
 
 
 # direct methods
@@ -52,21 +53,21 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/b/c;->cbU:I
+    iput v0, p0, Lokhttp3/internal/b/c;->cbo:I
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     const-wide v0, 0x7fffffffffffffffL
 
-    iput-wide v0, p0, Lokhttp3/internal/b/c;->cbW:J
+    iput-wide v0, p0, Lokhttp3/internal/b/c;->cbq:J
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->bZM:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->bZg:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iput-object p2, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
     return-void
 .end method
@@ -79,13 +80,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->caa:Lokhttp3/a;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -114,36 +115,36 @@
 
     :cond_1
     :goto_0
-    iget-object v0, v1, Lokhttp3/a;->bVr:Ljavax/net/SocketFactory;
+    iget-object v0, v1, Lokhttp3/a;->bUL: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;->cbO:Ljava/net/Socket;
+    iput-object v1, p0, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     invoke-virtual {v0, p2}, Ljava/net/Socket;->setSoTimeout(I)V
 
     :try_start_0
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->cab: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;->cbO:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     invoke-static {p1}, Lokio/j;->c(Ljava/net/Socket;)Lokio/q;
 
@@ -153,9 +154,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     invoke-static {p1}, Lokio/j;->b(Ljava/net/Socket;)Lokio/p;
 
@@ -165,7 +166,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->cbl:Lokio/BufferedSink;
     :try_end_1
     .catch Ljava/lang/NullPointerException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -206,9 +207,9 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -231,7 +232,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     const/4 v1, 0x0
 
@@ -241,47 +242,55 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/g$a;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
-    iget-object v2, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v2, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v2, v2, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v2, v2, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    iget-object v4, p0, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iget-object v4, p0, Lokhttp3/internal/b/c;->cbl: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;->cdI:Lokhttp3/internal/e/g$b;
+    iput-object p0, v0, Lokhttp3/internal/e/g$a;->cdc:Lokhttp3/internal/e/g$b;
 
-    iput p1, v0, Lokhttp3/internal/e/g$a;->cef:I
+    iput p1, v0, Lokhttp3/internal/e/g$a;->cdz:I
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->Ip()Lokhttp3/internal/e/g;
+    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->Io()Lokhttp3/internal/e/g;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->In()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Im()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HT()Z
+.method public final GZ()Lokhttp3/u;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bZN:Lokhttp3/u;
+
+    return-object v0
+.end method
+
+.method public final HS()Z
+    .locals 1
+
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
@@ -295,14 +304,6 @@
     return v0
 .end method
 
-.method public final Ha()Lokhttp3/u;
-    .locals 1
-
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
-
-    return-object v0
-.end method
-
 .method public final a(IIIIZLokhttp3/e;Lokhttp3/p;)V
     .locals 17
 
@@ -310,29 +311,29 @@
 
     move/from16 v2, p4
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bZN:Lokhttp3/u;
 
     if-nez v0, :cond_1c
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bVu:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bUO: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;->cbN:Lokhttp3/y;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v4, v4, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v4, v4, Lokhttp3/y;->caa:Lokhttp3/a;
 
     iget-object v4, v4, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-nez v4, :cond_2
 
-    sget-object v4, Lokhttp3/k;->bYr:Lokhttp3/k;
+    sget-object v4, Lokhttp3/k;->bXL:Lokhttp3/k;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -340,15 +341,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v4
 
@@ -401,13 +402,13 @@
     throw v0
 
     :cond_2
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bVt:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bUN:Ljava/util/List;
 
-    sget-object v4, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -426,9 +427,9 @@
     const/4 v7, 0x1
 
     :try_start_0
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->HM()Z
+    invoke-virtual {v0}, Lokhttp3/y;->HL()Z
 
     move-result v0
 
@@ -438,11 +439,11 @@
 
     invoke-direct {v0}, Lokhttp3/w$a;-><init>()V
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v8, v8, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v8, v8, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v8, v8, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v8, v8, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v0, v8}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
@@ -450,11 +451,11 @@
 
     const-string v8, "Host"
 
-    iget-object v9, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v9, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v9, v9, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v9, v9, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v9, v9, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     invoke-static {v9, v7}, Lokhttp3/internal/c;->a(Lokhttp3/s;Z)Ljava/lang/String;
 
@@ -480,11 +481,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v0
 
-    iget-object v8, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v8, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->at(II)V
 
@@ -510,13 +511,13 @@
 
     new-instance v9, Lokhttp3/internal/d/a;
 
-    iget-object v10, v1, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object v10, v1, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    iget-object v11, v1, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iget-object v11, v1, Lokhttp3/internal/b/c;->cbl:Lokio/BufferedSink;
 
     invoke-direct {v9, v4, v4, v10, v11}, Lokhttp3/internal/d/a;-><init>(Lokhttp3/t;Lokhttp3/internal/b/g;Lokio/d;Lokio/BufferedSink;)V
 
-    iget-object v10, v1, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object v10, v1, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
     invoke-interface {v10}, Lokio/d;->timeout()Lokio/r;
 
@@ -533,7 +534,7 @@
 
     invoke-virtual {v10, v12, v13, v14}, Lokio/r;->d(JLjava/util/concurrent/TimeUnit;)Lokio/r;
 
-    iget-object v10, v1, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iget-object v10, v1, Lokhttp3/internal/b/c;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v10}, Lokio/BufferedSink;->timeout()Lokio/r;
 
@@ -550,19 +551,19 @@
 
     invoke-virtual {v10, v13, v14, v15}, Lokio/r;->d(JLjava/util/concurrent/TimeUnit;)Lokio/r;
 
-    iget-object v10, v0, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object v10, v0, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
     invoke-virtual {v9, v10, v8}, Lokhttp3/internal/d/a;->a(Lokhttp3/Headers;Ljava/lang/String;)V
 
-    invoke-virtual {v9}, Lokhttp3/internal/d/a;->Ic()V
+    invoke-virtual {v9}, Lokhttp3/internal/d/a;->Ib()V
 
-    invoke-virtual {v9, v6}, Lokhttp3/internal/d/a;->ah(Z)Lokhttp3/Response$a;
+    invoke-virtual {v9, v6}, Lokhttp3/internal/d/a;->ag(Z)Lokhttp3/Response$a;
 
     move-result-object v8
 
-    iput-object v0, v8, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iput-object v0, v8, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
-    invoke-virtual {v8}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v8}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -631,35 +632,35 @@
     throw v0
 
     :cond_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->IZ()Z
+    invoke-virtual {v0}, Lokio/c;->IY()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbl:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->IW()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->IZ()Z
+    invoke-virtual {v0}, Lokio/c;->IY()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     if-nez v0, :cond_8
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_6
     new-instance v0, Ljava/io/IOException;
@@ -673,7 +674,7 @@
     :catch_0
     move-exception v0
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :cond_7
     move/from16 v11, p2
@@ -683,21 +684,21 @@
     invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->at(II)V
 
     :cond_8
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->caa: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;->cbN:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bVt:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bUN:Ljava/util/List;
 
-    sget-object v8, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object v8, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     invoke-interface {v0, v8}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -705,47 +706,46 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZs:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bZN:Lokhttp3/u;
 
-    :goto_2
     invoke-direct {v1, v2}, Lokhttp3/internal/b/c;->fd(I)V
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_9
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZp:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bZN:Lokhttp3/u;
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_a
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->caa:Lokhttp3/a;
 
     iget-object v8, 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 v9, v1, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v9, v1, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
-    iget-object v10, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v10, v10, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v10, v10, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v13, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v13, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     iget v13, v13, Lokhttp3/s;->port:I
 
@@ -763,19 +763,19 @@
 
     move-result-object v9
 
-    iget-boolean v10, v9, Lokhttp3/k;->bYt:Z
+    iget-boolean v10, v9, Lokhttp3/k;->bXN:Z
 
     if-eqz v10, :cond_b
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v10
 
-    iget-object v13, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v13, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v13, v13, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v13, v13, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v14, v0, Lokhttp3/a;->bVt:Ljava/util/List;
+    iget-object v14, v0, Lokhttp3/a;->bUN:Ljava/util/List;
 
     invoke-virtual {v10, v8, v13, v14}, Lokhttp3/internal/g/f;->a(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
 
@@ -792,9 +792,9 @@
 
     iget-object v14, v0, Lokhttp3/a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v15, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v15, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v15, v15, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v15, v15, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-interface {v14, v15, v10}, Ljavax/net/ssl/HostnameVerifier;->verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
 
@@ -802,21 +802,21 @@
 
     if-eqz v10, :cond_13
 
-    iget-object v10, v0, Lokhttp3/a;->bVw:Lokhttp3/g;
+    iget-object v10, v0, Lokhttp3/a;->bUQ:Lokhttp3/g;
 
-    iget-object v0, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v14, v13, Lokhttp3/r;->bYX:Ljava/util/List;
+    iget-object v14, v13, Lokhttp3/r;->bYr:Ljava/util/List;
 
     invoke-virtual {v10, v0, v14}, Lokhttp3/g;->d(Ljava/lang/String;Ljava/util/List;)V
 
-    iget-boolean v0, v9, Lokhttp3/k;->bYt:Z
+    iget-boolean v0, v9, Lokhttp3/k;->bXN:Z
 
     if-eqz v0, :cond_c
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -824,15 +824,15 @@
 
     move-result-object v0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_c
     move-object v0, v4
 
-    :goto_3
-    iput-object v8, v1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    :goto_2
+    iput-object v8, v1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
-    iget-object v9, v1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v9, v1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-static {v9}, Lokio/j;->c(Ljava/net/Socket;)Lokio/q;
 
@@ -842,9 +842,9 @@
 
     move-result-object v9
 
-    iput-object v9, v1, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iput-object v9, v1, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    iget-object v9, v1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v9, v1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-static {v9}, Lokio/j;->b(Ljava/net/Socket;)Lokio/p;
 
@@ -854,9 +854,9 @@
 
     move-result-object v9
 
-    iput-object v9, v1, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iput-object v9, v1, Lokhttp3/internal/b/c;->cbl:Lokio/BufferedSink;
 
-    iput-object v13, v1, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iput-object v13, v1, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
     if-eqz v0, :cond_d
 
@@ -864,13 +864,13 @@
 
     move-result-object v0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_d
-    sget-object v0, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZp:Lokhttp3/u;
 
-    :goto_4
-    iput-object v0, v1, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
+    :goto_3
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bZN: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
@@ -878,38 +878,38 @@
     if-eqz v8, :cond_e
 
     :try_start_5
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
     invoke-virtual {v0, v8}, Lokhttp3/internal/g/f;->f(Ljavax/net/ssl/SSLSocket;)V
 
     :cond_e
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bZN:Lokhttp3/u;
 
-    sget-object v8, Lokhttp3/u;->bZX:Lokhttp3/u;
-    :try_end_5
-    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
+    sget-object v8, Lokhttp3/u;->bZr:Lokhttp3/u;
 
     if-ne v0, v8, :cond_f
 
-    goto/16 :goto_2
+    invoke-direct {v1, v2}, Lokhttp3/internal/b/c;->fd(I)V
+    :try_end_5
+    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
 
     :cond_f
-    :goto_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    :goto_4
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->HM()Z
+    invoke-virtual {v0}, Lokhttp3/y;->HL()Z
 
     move-result v0
 
     if-eqz v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     if-eqz v0, :cond_10
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_10
     new-instance v0, Ljava/net/ProtocolException;
@@ -925,23 +925,23 @@
     throw v2
 
     :cond_11
-    :goto_6
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    :goto_5
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_12
 
-    iget-object v2, v1, Lokhttp3/internal/b/c;->bZM:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/c;->bZg:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_6
-    iget-object v0, v1, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Il()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Ik()I
 
     move-result v0
 
-    iput v0, v1, Lokhttp3/internal/b/c;->cbU:I
+    iput v0, v1, Lokhttp3/internal/b/c;->cbo:I
 
     monitor-exit v2
 
@@ -961,7 +961,7 @@
 
     :cond_13
     :try_start_7
-    iget-object v9, v13, Lokhttp3/r;->bYX:Ljava/util/List;
+    iget-object v9, v13, Lokhttp3/r;->bYr:Ljava/util/List;
 
     invoke-interface {v9, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -977,9 +977,9 @@
 
     invoke-direct {v13, v14}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v13, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1031,21 +1031,21 @@
     :catch_1
     move-exception v0
 
-    goto :goto_7
+    goto :goto_6
 
     :catchall_1
     move-exception v0
 
     move-object v8, v4
 
-    goto :goto_8
+    goto :goto_7
 
     :catch_2
     move-exception v0
 
     move-object v8, v4
 
-    :goto_7
+    :goto_6
     :try_start_8
     invoke-static {v0}, Lokhttp3/internal/c;->a(Ljava/lang/AssertionError;)Z
 
@@ -1067,11 +1067,11 @@
     :catchall_2
     move-exception v0
 
-    :goto_8
+    :goto_7
     if-eqz v8, :cond_15
 
     :try_start_9
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v9
 
@@ -1087,38 +1087,38 @@
     :catch_3
     move-exception v0
 
-    goto :goto_a
+    goto :goto_9
 
     :catch_4
     move-exception v0
 
     move/from16 v11, p2
 
-    :goto_9
+    :goto_8
     move/from16 v12, p3
 
-    :goto_a
-    iget-object v8, v1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    :goto_9
+    iget-object v8, v1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-static {v8}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     invoke-static {v8}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->cbl:Lokio/BufferedSink;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bZN:Lokhttp3/u;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
     if-nez v5, :cond_16
 
@@ -1126,10 +1126,7 @@
 
     invoke-direct {v5, v0}, Lokhttp3/internal/b/e;-><init>(Ljava/io/IOException;)V
 
-    :goto_b
-    move-object v8, v5
-
-    goto :goto_c
+    goto :goto_a
 
     :cond_16
     iget-object v8, v5, Lokhttp3/internal/b/e;->firstException:Ljava/io/IOException;
@@ -1138,43 +1135,41 @@
 
     iput-object v0, v5, Lokhttp3/internal/b/e;->lastException:Ljava/io/IOException;
 
-    goto :goto_b
-
-    :goto_c
+    :goto_a
     if-eqz p5, :cond_1a
 
-    iput-boolean v7, v3, Lokhttp3/internal/b/b;->cbM:Z
+    iput-boolean v7, v3, Lokhttp3/internal/b/b;->cbg:Z
 
-    iget-boolean v9, v3, Lokhttp3/internal/b/b;->cbL:Z
+    iget-boolean v8, v3, Lokhttp3/internal/b/b;->cbf:Z
 
-    if-eqz v9, :cond_19
+    if-eqz v8, :cond_19
 
-    instance-of v9, v0, Ljava/net/ProtocolException;
+    instance-of v8, v0, Ljava/net/ProtocolException;
 
-    if-nez v9, :cond_19
+    if-nez v8, :cond_19
 
-    instance-of v9, v0, Ljava/io/InterruptedIOException;
+    instance-of v8, v0, Ljava/io/InterruptedIOException;
 
-    if-nez v9, :cond_19
+    if-nez v8, :cond_19
 
-    instance-of v9, v0, Ljavax/net/ssl/SSLHandshakeException;
+    instance-of v8, v0, Ljavax/net/ssl/SSLHandshakeException;
 
-    if-eqz v9, :cond_17
+    if-eqz v8, :cond_17
 
     invoke-virtual {v0}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
 
-    move-result-object v10
+    move-result-object v9
 
-    instance-of v10, v10, Ljava/security/cert/CertificateException;
+    instance-of v9, v9, Ljava/security/cert/CertificateException;
 
-    if-nez v10, :cond_19
+    if-nez v9, :cond_19
 
     :cond_17
-    instance-of v10, v0, Ljavax/net/ssl/SSLPeerUnverifiedException;
+    instance-of v9, v0, Ljavax/net/ssl/SSLPeerUnverifiedException;
 
-    if-nez v10, :cond_19
+    if-nez v9, :cond_19
 
-    if-nez v9, :cond_18
+    if-nez v8, :cond_18
 
     instance-of v0, v0, Ljavax/net/ssl/SSLProtocolException;
 
@@ -1186,12 +1181,10 @@
     :cond_19
     if-eqz v6, :cond_1a
 
-    move-object v5, v8
-
     goto/16 :goto_1
 
     :cond_1a
-    throw v8
+    throw v5
 
     :cond_1b
     new-instance v0, Lokhttp3/internal/b/e;
@@ -1214,21 +1207,23 @@
     invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final a(Lokhttp3/internal/e/g;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bZM:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bZg:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Il()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Ik()I
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/internal/b/c;->cbU:I
+    iput p1, p0, Lokhttp3/internal/b/c;->cbo:I
 
     monitor-exit v0
 
@@ -1252,7 +1247,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccJ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->ccd:Lokhttp3/internal/e/b;
 
     invoke-virtual {p1, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
@@ -1266,30 +1261,30 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget v1, p0, Lokhttp3/internal/b/c;->cbU:I
+    iget v1, p0, Lokhttp3/internal/b/c;->cbo:I
 
     const/4 v2, 0x0
 
     if-ge v0, v1, :cond_a
 
-    iget-boolean v0, p0, Lokhttp3/internal/b/c;->cbS:Z
+    iget-boolean v0, p0, Lokhttp3/internal/b/c;->cbm:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->caa:Lokhttp3/a;
 
     invoke-virtual {v0, v1, p1}, Lokhttp3/internal/a;->a(Lokhttp3/a;Lokhttp3/a;)Z
 
@@ -1300,17 +1295,17 @@
     return v2
 
     :cond_1
-    iget-object v0, p1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1323,7 +1318,7 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
     if-nez v0, :cond_3
 
@@ -1335,7 +1330,7 @@
     return v2
 
     :cond_4
-    iget-object v0, p2, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v0, p2, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1348,9 +1343,9 @@
     return v2
 
     :cond_5
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1363,11 +1358,11 @@
     return v2
 
     :cond_6
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v0, v0, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
-    iget-object v3, p2, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v3, p2, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v3}, Ljava/net/InetSocketAddress;->equals(Ljava/lang/Object;)Z
 
@@ -1378,18 +1373,18 @@
     return v2
 
     :cond_7
-    iget-object p2, p2, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object p2, p2, Lokhttp3/y;->caa:Lokhttp3/a;
 
     iget-object p2, p2, Lokhttp3/a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/internal/h/d;->cfC:Lokhttp3/internal/h/d;
+    sget-object v0, Lokhttp3/internal/h/d;->ceW:Lokhttp3/internal/h/d;
 
     if-eq p2, v0, :cond_8
 
     return v2
 
     :cond_8
-    iget-object p2, p1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     invoke-virtual {p0, p2}, Lokhttp3/internal/b/c;->c(Lokhttp3/s;)Z
 
@@ -1401,15 +1396,15 @@
 
     :cond_9
     :try_start_0
-    iget-object p2, p1, Lokhttp3/a;->bVw:Lokhttp3/g;
+    iget-object p2, p1, Lokhttp3/a;->bUQ:Lokhttp3/g;
 
-    iget-object p1, p1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
-    iget-object v0, v0, Lokhttp3/r;->bYX:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/r;->bYr:Ljava/util/List;
 
     invoke-virtual {p2, p1, v0}, Lokhttp3/g;->d(Ljava/lang/String;Ljava/util/List;)V
     :try_end_0
@@ -1418,15 +1413,17 @@
     return v1
 
     :catch_0
+    return v2
+
     :cond_a
     :goto_0
     return v2
 .end method
 
-.method public final ag(Z)Z
+.method public final af(Z)Z
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-virtual {v0}, Ljava/net/Socket;->isClosed()Z
 
@@ -1436,7 +1433,7 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-virtual {v0}, Ljava/net/Socket;->isInputShutdown()Z
 
@@ -1444,7 +1441,7 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-virtual {v0}, Ljava/net/Socket;->isOutputShutdown()Z
 
@@ -1455,15 +1452,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
     const/4 v2, 0x1
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
-
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->isShutdown()Z
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->isShutdown()Z
 
     move-result p1
 
@@ -1478,7 +1473,7 @@
     if-eqz p1, :cond_4
 
     :try_start_0
-    iget-object p1, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-virtual {p1}, Ljava/net/Socket;->getSoTimeout()I
 
@@ -1488,13 +1483,13 @@
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-virtual {v0, v2}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IZ()Z
+    invoke-interface {v0}, Lokio/d;->IY()Z
 
     move-result v0
     :try_end_1
@@ -1503,14 +1498,14 @@
     if-eqz v0, :cond_3
 
     :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbj: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;->cbP:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-virtual {v0, p1}, Ljava/net/Socket;->setSoTimeout(I)V
 
@@ -1519,7 +1514,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-virtual {v3, p1}, Ljava/net/Socket;->setSoTimeout(I)V
 
@@ -1545,11 +1540,11 @@
 
     iget v0, p1, Lokhttp3/s;->port:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     iget v1, v1, Lokhttp3/s;->port:I
 
@@ -1560,15 +1555,15 @@
     return v2
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1578,17 +1573,17 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/h/d;->cfC:Lokhttp3/internal/h/d;
+    sget-object v0, Lokhttp3/internal/h/d;->ceW:Lokhttp3/internal/h/d;
 
-    iget-object p1, p1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
-    iget-object v3, v3, Lokhttp3/r;->bYX:Ljava/util/List;
+    iget-object v3, v3, Lokhttp3/r;->bYr:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1620,13 +1615,13 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1634,11 +1629,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     iget v1, v1, Lokhttp3/s;->port:I
 
@@ -1648,9 +1643,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v1, v1, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1658,9 +1653,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1668,13 +1663,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
-
-    iget-object v1, v1, Lokhttp3/r;->bYW:Lokhttp3/h;
+    iget-object v1, v1, Lokhttp3/r;->bYq:Lokhttp3/h;
 
     goto :goto_0
 
@@ -1688,7 +1681,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->cat:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bZN: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 6ca489b385..0dbf7469e7 100644
--- a/com.discord/smali/okhttp3/internal/c.smali
+++ b/com.discord/smali/okhttp3/internal/c.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/c;
 .super Ljava/lang/Object;
+.source "Util.java"
 
 
 # static fields
@@ -21,33 +22,33 @@
     .end annotation
 .end field
 
-.field public static final caP:Lokhttp3/x;
+.field public static final caj:Lokhttp3/x;
 
-.field public static final caQ:Lokhttp3/RequestBody;
+.field public static final cak:Lokhttp3/RequestBody;
 
-.field private static final caR:Lokio/ByteString;
+.field private static final cal:Lokio/ByteString;
 
-.field private static final caS:Lokio/ByteString;
+.field private static final cam:Lokio/ByteString;
 
-.field private static final caT:Lokio/ByteString;
+.field private static final can:Lokio/ByteString;
 
-.field private static final caU:Lokio/ByteString;
+.field private static final cao:Lokio/ByteString;
 
-.field private static final caV:Lokio/ByteString;
+.field private static final cap:Lokio/ByteString;
 
-.field private static final caW:Ljava/nio/charset/Charset;
+.field private static final caq:Ljava/nio/charset/Charset;
 
-.field private static final caX:Ljava/nio/charset/Charset;
+.field private static final car:Ljava/nio/charset/Charset;
 
-.field private static final caY:Ljava/nio/charset/Charset;
+.field private static final cas:Ljava/nio/charset/Charset;
 
-.field private static final caZ:Ljava/nio/charset/Charset;
+.field private static final cat:Ljava/nio/charset/Charset;
 
-.field public static final cba:Ljava/util/TimeZone;
+.field public static final cau:Ljava/util/TimeZone;
 
-.field private static final cbb:Ljava/lang/reflect/Method;
+.field private static final cav:Ljava/lang/reflect/Method;
 
-.field private static final cbc:Ljava/util/regex/Pattern;
+.field private static final caw:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -70,7 +71,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caP:Lokhttp3/x;
+    sput-object v1, Lokhttp3/internal/c;->caj:Lokhttp3/x;
 
     sget-object v1, Lokhttp3/internal/c;->aOW:[B
 
@@ -80,7 +81,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caQ:Lokhttp3/RequestBody;
+    sput-object v1, Lokhttp3/internal/c;->cak:Lokhttp3/RequestBody;
 
     const-string v1, "efbbbf"
 
@@ -88,7 +89,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caR:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->cal:Lokio/ByteString;
 
     const-string v1, "feff"
 
@@ -96,7 +97,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caS:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->cam:Lokio/ByteString;
 
     const-string v1, "fffe"
 
@@ -104,7 +105,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caT:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->can:Lokio/ByteString;
 
     const-string v1, "0000ffff"
 
@@ -112,7 +113,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caU:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->cao:Lokio/ByteString;
 
     const-string v1, "ffff0000"
 
@@ -120,7 +121,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caV:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->cap:Lokio/ByteString;
 
     const-string v1, "UTF-8"
 
@@ -144,7 +145,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caW:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->caq:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-16LE"
 
@@ -152,7 +153,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caX:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->car:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32BE"
 
@@ -160,7 +161,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caY:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->cas:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32LE"
 
@@ -168,7 +169,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->caZ:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->cat:Ljava/nio/charset/Charset;
 
     const-string v1, "GMT"
 
@@ -176,7 +177,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->cba:Ljava/util/TimeZone;
+    sput-object v1, Lokhttp3/internal/c;->cau:Ljava/util/TimeZone;
 
     new-instance v1, Lokhttp3/internal/c$1;
 
@@ -199,17 +200,12 @@
 
     invoke-virtual {v1, v3, v4}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    move-result-object v0
+    move-result-object v2
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_0
-
     :catch_0
-    move-object v0, v2
-
-    :goto_0
-    sput-object v0, Lokhttp3/internal/c;->cbb:Ljava/lang/reflect/Method;
+    sput-object v2, Lokhttp3/internal/c;->cav:Ljava/lang/reflect/Method;
 
     const-string v0, "([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)"
 
@@ -217,12 +213,12 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c;->cbc:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/c;->caw:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method public static HN()Ljavax/net/ssl/X509TrustManager;
+.method public static HM()Ljavax/net/ssl/X509TrustManager;
     .locals 4
 
     :try_start_0
@@ -522,7 +518,7 @@
 .method public static a(Lokhttp3/s;Z)Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     const-string v1, ":"
 
@@ -538,7 +534,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -553,14 +549,14 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     :goto_0
     if-nez p1, :cond_2
 
     iget p1, p0, Lokhttp3/s;->port:I
 
-    iget-object v1, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-static {v1}, Lokhttp3/s;->ej(Ljava/lang/String;)I
 
@@ -604,7 +600,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/c;->caR:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->cal:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->h(Lokio/ByteString;)Z
 
@@ -612,7 +608,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lokhttp3/internal/c;->caR:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->cal:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -627,7 +623,7 @@
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/c;->caS:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->cam:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->h(Lokio/ByteString;)Z
 
@@ -635,7 +631,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lokhttp3/internal/c;->caS:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->cam:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -645,12 +641,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->bc(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->caW:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->caq:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/internal/c;->caT:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->can:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->h(Lokio/ByteString;)Z
 
@@ -658,7 +654,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Lokhttp3/internal/c;->caT:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->can:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -668,12 +664,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->bc(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->caX:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->car:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/internal/c;->caU:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->cao:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->h(Lokio/ByteString;)Z
 
@@ -681,7 +677,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p1, Lokhttp3/internal/c;->caU:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->cao:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -691,12 +687,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->bc(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->caY:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->cas:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/internal/c;->caV:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->cap:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->h(Lokio/ByteString;)Z
 
@@ -704,7 +700,7 @@
 
     if-eqz v0, :cond_4
 
-    sget-object p1, Lokhttp3/internal/c;->caV:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->cap:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -714,7 +710,7 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->bc(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->caZ:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->cat:Ljava/nio/charset/Charset;
 
     return-object p0
 
@@ -813,7 +809,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/r;->Jr()Z
+    invoke-virtual {v2}, Lokio/r;->Jq()Z
 
     move-result v2
 
@@ -825,7 +821,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/r;->Js()J
+    invoke-virtual {v2}, Lokio/r;->Jr()J
 
     move-result-wide v5
 
@@ -889,7 +885,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/r;->Ju()Lokio/r;
+    invoke-virtual {p0}, Lokio/r;->Jt()Lokio/r;
 
     goto :goto_2
 
@@ -918,7 +914,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/r;->Ju()Lokio/r;
+    invoke-virtual {p0}, Lokio/r;->Jt()Lokio/r;
 
     goto :goto_3
 
@@ -945,7 +941,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/r;->Ju()Lokio/r;
+    invoke-virtual {p0}, Lokio/r;->Jt()Lokio/r;
 
     goto :goto_4
 
@@ -1104,13 +1100,13 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_4
 
     array-length v1, p1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_4
 
     array-length v1, p2
 
@@ -1158,6 +1154,9 @@
     goto :goto_0
 
     :cond_3
+    return v0
+
+    :cond_4
     :goto_2
     return v0
 .end method
@@ -1243,15 +1242,13 @@
 .method public static d(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
     .locals 3
 
-    sget-object v0, Lokhttp3/internal/c;->cbb:Ljava/lang/reflect/Method;
+    sget-object v0, Lokhttp3/internal/c;->cav:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    sget-object v0, Lokhttp3/internal/c;->cbb:Ljava/lang/reflect/Method;
-
     const/4 v1, 0x1
 
+    :try_start_0
     new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v2, 0x0
@@ -1263,6 +1260,8 @@
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
@@ -1292,7 +1291,6 @@
 
     if-gt p0, v1, :cond_1
 
-    :goto_0
     sub-int/2addr p0, v0
 
     add-int/lit8 p0, p0, 0xa
@@ -1308,7 +1306,11 @@
 
     if-gt p0, v1, :cond_2
 
-    goto :goto_0
+    sub-int/2addr p0, v0
+
+    add-int/lit8 p0, p0, 0xa
+
+    return p0
 
     :cond_2
     const/4 p0, -0x1
@@ -1319,7 +1321,7 @@
 .method public static eA(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/c;->cbc:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/internal/c;->caw:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -1433,9 +1435,9 @@
 
     const/4 p0, 0x0
 
-    const/4 v1, 0x0
+    const/4 v1, -0x1
 
-    const/4 v4, -0x1
+    const/4 v4, 0x0
 
     :goto_1
     array-length v5, v0
@@ -1464,15 +1466,15 @@
     :cond_2
     sub-int v6, v5, p0
 
-    if-le v6, v1, :cond_3
+    if-le v6, v4, :cond_3
 
     const/4 v7, 0x4
 
     if-lt v6, v7, :cond_3
 
-    move v4, p0
+    move v1, p0
 
-    move v1, v6
+    move v4, v6
 
     :cond_3
     add-int/lit8 p0, v5, 0x2
@@ -1492,11 +1494,11 @@
 
     const/16 v5, 0x3a
 
-    if-ne v2, v4, :cond_6
+    if-ne v2, v1, :cond_6
 
     invoke-virtual {p0, v5}, Lokio/c;->fs(I)Lokio/c;
 
-    add-int/2addr v2, v1
+    add-int/2addr v2, v4
 
     if-ne v2, v3, :cond_5
 
@@ -1533,7 +1535,7 @@
     goto :goto_3
 
     :cond_8
-    invoke-virtual {p0}, Lokio/c;->Jf()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/c;->Je()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1898,14 +1900,16 @@
 
     move v8, v7
 
-    goto/16 :goto_9
+    const/16 v0, 0x10
+
+    goto/16 :goto_7
 
     :cond_2
     move v8, v7
 
     move v9, v11
 
-    goto/16 :goto_6
+    goto/16 :goto_4
 
     :cond_3
     if-eqz v7, :cond_10
@@ -1922,7 +1926,9 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto/16 :goto_5
+    move v9, v6
+
+    goto/16 :goto_4
 
     :cond_4
     const-string v11, "."
@@ -1942,7 +1948,7 @@
 
     if-ne v11, v2, :cond_5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     if-eq v11, v6, :cond_7
@@ -1955,7 +1961,7 @@
 
     if-eq v15, v14, :cond_6
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     add-int/lit8 v9, v9, 0x1
@@ -1984,6 +1990,8 @@
 
     if-eq v9, v14, :cond_8
 
+    const/4 v5, 0x0
+
     goto :goto_3
 
     :cond_8
@@ -1995,6 +2003,8 @@
 
     if-le v15, v12, :cond_9
 
+    const/4 v5, 0x0
+
     goto :goto_3
 
     :cond_9
@@ -2013,6 +2023,8 @@
 
     if-nez v2, :cond_b
 
+    const/4 v5, 0x0
+
     goto :goto_3
 
     :cond_b
@@ -2041,15 +2053,14 @@
 
     if-eq v11, v6, :cond_d
 
-    :goto_3
     const/4 v5, 0x0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_d
     const/4 v5, 0x1
 
-    :goto_4
+    :goto_3
     if-nez v5, :cond_e
 
     return-object v10
@@ -2057,21 +2068,22 @@
     :cond_e
     add-int/lit8 v7, v7, 0x2
 
-    goto :goto_9
+    const/16 v0, 0x10
+
+    goto :goto_7
 
     :cond_f
     return-object v10
 
     :cond_10
-    :goto_5
     move v9, v6
 
-    :goto_6
+    :goto_4
     move v6, v9
 
     const/4 v2, 0x0
 
-    :goto_7
+    :goto_5
     if-ge v6, v1, :cond_11
 
     invoke-virtual {v0, v6}, Ljava/lang/String;->charAt(I)C
@@ -2092,7 +2104,7 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_11
     sub-int v4, v6, v9
@@ -2101,7 +2113,7 @@
 
     if-le v4, v13, :cond_12
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_12
     add-int/lit8 v4, v7, 0x1
@@ -2131,13 +2143,13 @@
     goto/16 :goto_0
 
     :cond_13
-    :goto_8
+    :goto_6
     return-object v10
 
     :cond_14
-    :goto_9
     const/16 v0, 0x10
 
+    :goto_7
     if-eq v7, v0, :cond_16
 
     const/4 v1, -0x1
@@ -2177,6 +2189,8 @@
     invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public static s(Ljava/util/Map;)Ljava/util/Map;
diff --git a/com.discord/smali/okhttp3/internal/c/h.smali b/com.discord/smali/okhttp3/internal/c/h.smali
index 196419b978..01edfb5b21 100644
--- a/com.discord/smali/okhttp3/internal/c/h.smali
+++ b/com.discord/smali/okhttp3/internal/c/h.smali
@@ -1,11 +1,12 @@
 .class public final Lokhttp3/internal/c/h;
 .super Lokhttp3/x;
+.source "RealResponseBody.java"
 
 
 # instance fields
-.field private final caE:Lokio/d;
+.field private final bZY:Lokio/d;
 
-.field private final ccw:Ljava/lang/String;
+.field private final cbQ:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -23,21 +24,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/h;->ccw:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/c/h;->cbQ:Ljava/lang/String;
 
     iput-wide p2, p0, Lokhttp3/internal/c/h;->contentLength:J
 
-    iput-object p4, p0, Lokhttp3/internal/c/h;->caE:Lokio/d;
+    iput-object p4, p0, Lokhttp3/internal/c/h;->bZY:Lokio/d;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HK()Lokio/d;
+.method public final HJ()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->bZY:Lokio/d;
 
     return-object v0
 .end method
@@ -53,12 +54,10 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->ccw:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->cbQ:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->ccw:Ljava/lang/String;
-
     invoke-static {v0}, Lokhttp3/MediaType;->er(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
diff --git a/com.discord/smali/okhttp3/internal/e/g$b.smali b/com.discord/smali/okhttp3/internal/e/g$b.smali
index d35a09d142..6c3ad6fe8e 100644
--- a/com.discord/smali/okhttp3/internal/e/g$b.smali
+++ b/com.discord/smali/okhttp3/internal/e/g$b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/internal/e/g$b;
 .super Ljava/lang/Object;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field public static final ceg:Lokhttp3/internal/e/g$b;
+.field public static final cdA:Lokhttp3/internal/e/g$b;
 
 
 # direct methods
@@ -25,7 +26,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/g$b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/g$b;->ceg:Lokhttp3/internal/e/g$b;
+    sput-object v0, Lokhttp3/internal/e/g$b;->cdA:Lokhttp3/internal/e/g$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/okhttp3/internal/g/a.smali b/com.discord/smali/okhttp3/internal/g/a.smali
index c10a1af2b5..5738ef2b32 100644
--- a/com.discord/smali/okhttp3/internal/g/a.smali
+++ b/com.discord/smali/okhttp3/internal/g/a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/g/a;
 .super Lokhttp3/internal/g/f;
+.source "AndroidPlatform.java"
 
 
 # annotations
@@ -13,7 +14,7 @@
 
 
 # instance fields
-.field private final ceU:Ljava/lang/Class;
+.field private final ceo:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -22,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final ceV:Lokhttp3/internal/g/e;
+.field private final cep:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -32,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final ceW:Lokhttp3/internal/g/e;
+.field private final ceq:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -42,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final ceX:Lokhttp3/internal/g/e;
+.field private final cer:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -52,7 +53,7 @@
     .end annotation
 .end field
 
-.field private final ceY:Lokhttp3/internal/g/e;
+.field private final ces:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -62,7 +63,7 @@
     .end annotation
 .end field
 
-.field private final ceZ:Lokhttp3/internal/g/a$c;
+.field private final cet:Lokhttp3/internal/g/a$c;
 
 
 # direct methods
@@ -90,26 +91,26 @@
 
     invoke-direct {p0}, Lokhttp3/internal/g/f;-><init>()V
 
-    invoke-static {}, Lokhttp3/internal/g/a$c;->IJ()Lokhttp3/internal/g/a$c;
+    invoke-static {}, Lokhttp3/internal/g/a$c;->II()Lokhttp3/internal/g/a$c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/g/a;->ceZ:Lokhttp3/internal/g/a$c;
+    iput-object v0, p0, Lokhttp3/internal/g/a;->cet:Lokhttp3/internal/g/a$c;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a;->ceU:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/a;->ceo:Ljava/lang/Class;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a;->ceV:Lokhttp3/internal/g/e;
+    iput-object p2, p0, Lokhttp3/internal/g/a;->cep:Lokhttp3/internal/g/e;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a;->ceW:Lokhttp3/internal/g/e;
+    iput-object p3, p0, Lokhttp3/internal/g/a;->ceq:Lokhttp3/internal/g/e;
 
-    iput-object p4, p0, Lokhttp3/internal/g/a;->ceX:Lokhttp3/internal/g/e;
+    iput-object p4, p0, Lokhttp3/internal/g/a;->cer:Lokhttp3/internal/g/e;
 
-    iput-object p5, p0, Lokhttp3/internal/g/a;->ceY:Lokhttp3/internal/g/e;
+    iput-object p5, p0, Lokhttp3/internal/g/a;->ces:Lokhttp3/internal/g/e;
 
     return-void
 .end method
 
-.method private static IG()Z
+.method private static IF()Z
     .locals 2
 
     const-string v0, "GMSCore_OpenSSL"
@@ -140,7 +141,7 @@
     return v0
 .end method
 
-.method public static IH()Lokhttp3/internal/g/f;
+.method public static IG()Lokhttp3/internal/g/f;
     .locals 10
 
     const/4 v0, 0x0
@@ -154,10 +155,9 @@
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    :goto_0
     move-object v3, v1
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     :try_start_1
@@ -167,9 +167,9 @@
 
     move-result-object v1
 
-    goto :goto_0
+    move-object v3, v1
 
-    :goto_1
+    :goto_0
     new-instance v4, Lokhttp3/internal/g/e;
 
     const-string v1, "setUseSessionTickets"
@@ -198,7 +198,7 @@
 
     invoke-direct {v5, v0, v1, v6}, Lokhttp3/internal/g/e;-><init>(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;)V
 
-    invoke-static {}, Lokhttp3/internal/g/a;->IG()Z
+    invoke-static {}, Lokhttp3/internal/g/a;->IF()Z
 
     move-result v1
 
@@ -230,14 +230,14 @@
 
     move-object v6, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     move-object v6, v0
 
     move-object v7, v6
 
-    :goto_2
+    :goto_1
     new-instance v1, Lokhttp3/internal/g/a;
 
     move-object v2, v1
@@ -301,11 +301,11 @@
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v0
+    move-result p1
     :try_end_0
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v0
+    return p1
 
     :catch_0
     invoke-direct {p0, p1, p2, p3}, Lokhttp3/internal/g/a;->b(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;)Z
@@ -356,11 +356,11 @@
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result p2
+    move-result p1
     :try_end_0
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return p2
+    return p1
 
     :catch_0
     invoke-super {p0, p1}, Lokhttp3/internal/g/f;->isCleartextTrafficPermitted(Ljava/lang/String;)Z
@@ -372,7 +372,7 @@
 
 
 # virtual methods
-.method public final II()Ljavax/net/ssl/SSLContext;
+.method public final IH()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -601,7 +601,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/g/a;->ceV:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->cep:Lokhttp3/internal/g/e;
 
     new-array v3, v1, [Ljava/lang/Object;
 
@@ -611,7 +611,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;->ceW:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->ceq:Lokhttp3/internal/g/e;
 
     new-array v3, v1, [Ljava/lang/Object;
 
@@ -620,12 +620,10 @@
     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;->ceY:Lokhttp3/internal/g/e;
+    iget-object p2, p0, Lokhttp3/internal/g/a;->ces:Lokhttp3/internal/g/e;
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lokhttp3/internal/g/a;->ceY:Lokhttp3/internal/g/e;
-
     invoke-virtual {p2, p1}, Lokhttp3/internal/g/e;->bW(Ljava/lang/Object;)Z
 
     move-result p2
@@ -653,7 +651,7 @@
 
     check-cast v4, Lokhttp3/u;
 
-    sget-object v5, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object v5, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     if-eq v4, v5, :cond_1
 
@@ -685,7 +683,7 @@
 
     aput-object p3, p2, v0
 
-    iget-object p3, p0, Lokhttp3/internal/g/a;->ceY:Lokhttp3/internal/g/e;
+    iget-object p3, p0, Lokhttp3/internal/g/a;->ces:Lokhttp3/internal/g/e;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/internal/g/e;->c(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -696,7 +694,7 @@
 .method protected final b(Ljavax/net/ssl/SSLSocketFactory;)Ljavax/net/ssl/X509TrustManager;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->ceU:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->ceo:Ljava/lang/Class;
 
     const-string v1, "sslParameters"
 
@@ -889,7 +887,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->ceX:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->cer:Lokhttp3/internal/g/e;
 
     const/4 v1, 0x0
 
@@ -898,8 +896,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/g/a;->ceX:Lokhttp3/internal/g/e;
-
     invoke-virtual {v0, p1}, Lokhttp3/internal/g/e;->bW(Ljava/lang/Object;)Z
 
     move-result v0
@@ -909,7 +905,7 @@
     return-object v1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/g/a;->ceX:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->cer:Lokhttp3/internal/g/e;
 
     const/4 v2, 0x0
 
@@ -938,7 +934,7 @@
 .method public final eG(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->ceZ:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->cet:Lokhttp3/internal/g/a$c;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/g/a$c;->eH(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -977,7 +973,7 @@
 
     invoke-direct {p0, p1, v0, v1}, Lokhttp3/internal/g/a;->a(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result p1
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_1
@@ -985,7 +981,7 @@
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v0
+    return p1
 
     :catch_0
     move-exception p1
@@ -1009,7 +1005,7 @@
 .method public final s(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->ceZ:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->cet:Lokhttp3/internal/g/a$c;
 
     invoke-virtual {v0, p2}, Lokhttp3/internal/g/a$c;->bV(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 fd7068349f..821d97ed76 100644
--- a/com.discord/smali/okhttp3/internal/g/b.smali
+++ b/com.discord/smali/okhttp3/internal/g/b.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/g/b;
 .super Lokhttp3/internal/g/f;
+.source "ConscryptPlatform.java"
 
 
 # direct methods
@@ -11,7 +12,7 @@
     return-void
 .end method
 
-.method public static IH()Lokhttp3/internal/g/f;
+.method public static IG()Lokhttp3/internal/g/f;
     .locals 2
 
     const/4 v0, 0x0
@@ -44,7 +45,7 @@
 
 
 # virtual methods
-.method public final II()Ljavax/net/ssl/SSLContext;
+.method public final IH()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali/okhttp3/internal/g/c.smali b/com.discord/smali/okhttp3/internal/g/c.smali
index 614edfc9fd..1737b6360d 100644
--- a/com.discord/smali/okhttp3/internal/g/c.smali
+++ b/com.discord/smali/okhttp3/internal/g/c.smali
@@ -1,11 +1,12 @@
 .class final Lokhttp3/internal/g/c;
 .super Lokhttp3/internal/g/f;
+.source "Jdk9Platform.java"
 
 
 # instance fields
-.field final cfg:Ljava/lang/reflect/Method;
+.field final ceA:Ljava/lang/reflect/Method;
 
-.field final cfh:Ljava/lang/reflect/Method;
+.field final ceB:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -14,14 +15,14 @@
 
     invoke-direct {p0}, Lokhttp3/internal/g/f;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/c;->cfg:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/c;->ceA:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lokhttp3/internal/g/c;->cfh:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/c;->ceB:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method public static IK()Lokhttp3/internal/g/c;
+.method public static IJ()Lokhttp3/internal/g/c;
     .locals 5
 
     :try_start_0
@@ -91,7 +92,7 @@
 
     move-result-object p3
 
-    iget-object v0, p0, Lokhttp3/internal/g/c;->cfg:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->ceA:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x1
 
@@ -150,7 +151,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/g/c;->cfh:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->ceB: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 21344f51fb..d2328c35a8 100644
--- a/com.discord/smali/okhttp3/internal/g/d.smali
+++ b/com.discord/smali/okhttp3/internal/g/d.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/g/d;
 .super Lokhttp3/internal/g/f;
+.source "JdkWithJettyBootPlatform.java"
 
 
 # annotations
@@ -11,11 +12,11 @@
 
 
 # instance fields
-.field private final cfi:Ljava/lang/reflect/Method;
+.field private final ceC:Ljava/lang/reflect/Method;
 
-.field private final cfj:Ljava/lang/reflect/Method;
+.field private final ceD:Ljava/lang/reflect/Method;
 
-.field private final cfk:Ljava/lang/Class;
+.field private final ceE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final cfl:Ljava/lang/Class;
+.field private final ceF:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -54,20 +55,20 @@
 
     invoke-direct {p0}, Lokhttp3/internal/g/f;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/d;->cfi:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/d;->ceC: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;->cfj:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/d;->ceD:Ljava/lang/reflect/Method;
 
-    iput-object p4, p0, Lokhttp3/internal/g/d;->cfk:Ljava/lang/Class;
+    iput-object p4, p0, Lokhttp3/internal/g/d;->ceE:Ljava/lang/Class;
 
-    iput-object p5, p0, Lokhttp3/internal/g/d;->cfl:Ljava/lang/Class;
+    iput-object p5, p0, Lokhttp3/internal/g/d;->ceF:Ljava/lang/Class;
 
     return-void
 .end method
 
-.method public static IH()Lokhttp3/internal/g/f;
+.method public static IG()Lokhttp3/internal/g/f;
     .locals 10
 
     :try_start_0
@@ -224,13 +225,13 @@
 
     new-array v1, v0, [Ljava/lang/Class;
 
-    iget-object v2, p0, Lokhttp3/internal/g/d;->cfk:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->ceE:Ljava/lang/Class;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lokhttp3/internal/g/d;->cfl:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->ceF:Ljava/lang/Class;
 
     const/4 v4, 0x1
 
@@ -244,7 +245,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lokhttp3/internal/g/d;->cfi:Ljava/lang/reflect/Method;
+    iget-object p3, p0, Lokhttp3/internal/g/d;->ceC:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -301,15 +302,15 @@
 
     check-cast v0, Lokhttp3/internal/g/d$a;
 
-    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->cfm:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->ceG:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lokhttp3/internal/g/d$a;->cfn:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/internal/g/d$a;->ceH:Ljava/lang/String;
 
     if-nez v1, :cond_0
 
-    sget-object v0, Lokhttp3/internal/g/f;->cfr:Lokhttp3/internal/g/f;
+    sget-object v0, Lokhttp3/internal/g/f;->ceL:Lokhttp3/internal/g/f;
 
     const/4 v1, 0x4
 
@@ -320,14 +321,14 @@
     return-object p1
 
     :cond_0
-    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->cfm:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->ceG:Z
 
     if-eqz v1, :cond_1
 
     return-object p1
 
     :cond_1
-    iget-object p1, v0, Lokhttp3/internal/g/d$a;->cfn:Ljava/lang/String;
+    iget-object p1, v0, Lokhttp3/internal/g/d$a;->ceH:Ljava/lang/String;
     :try_end_0
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
@@ -350,7 +351,7 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/g/d;->cfj:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/d;->ceD: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 0d95a3fb49..7208d9b29c 100644
--- a/com.discord/smali/okhttp3/internal/g/f.smali
+++ b/com.discord/smali/okhttp3/internal/g/f.smali
@@ -1,9 +1,10 @@
 .class public Lokhttp3/internal/g/f;
 .super Ljava/lang/Object;
+.source "Platform.java"
 
 
 # static fields
-.field static final cfr:Lokhttp3/internal/g/f;
+.field static final ceL:Lokhttp3/internal/g/f;
 
 .field private static final logger:Ljava/util/logging/Logger;
 
@@ -12,7 +13,7 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/a;->IH()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/a;->IG()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -61,7 +62,7 @@
     :goto_0
     if-eqz v0, :cond_2
 
-    invoke-static {}, Lokhttp3/internal/g/b;->IH()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/b;->IG()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -70,7 +71,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {}, Lokhttp3/internal/g/c;->IK()Lokhttp3/internal/g/c;
+    invoke-static {}, Lokhttp3/internal/g/c;->IJ()Lokhttp3/internal/g/c;
 
     move-result-object v0
 
@@ -79,7 +80,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/g/d;->IH()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/d;->IG()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -93,7 +94,7 @@
     invoke-direct {v0}, Lokhttp3/internal/g/f;-><init>()V
 
     :goto_1
-    sput-object v0, Lokhttp3/internal/g/f;->cfr:Lokhttp3/internal/g/f;
+    sput-object v0, Lokhttp3/internal/g/f;->ceL:Lokhttp3/internal/g/f;
 
     const-class v0, Lokhttp3/t;
 
@@ -118,10 +119,10 @@
     return-void
 .end method
 
-.method public static IL()Lokhttp3/internal/g/f;
+.method public static IK()Lokhttp3/internal/g/f;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/g/f;->cfr:Lokhttp3/internal/g/f;
+    sget-object v0, Lokhttp3/internal/g/f;->ceL:Lokhttp3/internal/g/f;
 
     return-object v0
 .end method
@@ -179,12 +180,12 @@
     :cond_0
     invoke-virtual {p1, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v1
+    return-object p0
 
     :cond_1
     :goto_2
@@ -266,7 +267,7 @@
 
     check-cast v3, Lokhttp3/u;
 
-    sget-object v4, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     if-eq v3, v4, :cond_0
 
@@ -287,7 +288,7 @@
 
 
 # virtual methods
-.method public II()Ljavax/net/ssl/SSLContext;
+.method public IH()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     const-string v0, "java.specification.version"
@@ -490,7 +491,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v2, Lokhttp3/internal/g/f;->cfr:Lokhttp3/internal/g/f;
+    sget-object v2, Lokhttp3/internal/g/f;->ceL:Lokhttp3/internal/g/f;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/internal/i/a.smali b/com.discord/smali/okhttp3/internal/i/a.smali
index 2a6d9d9552..23e0056dec 100644
--- a/com.discord/smali/okhttp3/internal/i/a.smali
+++ b/com.discord/smali/okhttp3/internal/i/a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/i/a;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 # interfaces
 .implements Lokhttp3/WebSocket;
@@ -21,7 +22,7 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field public static final cfD:Ljava/util/List;
+.field public static final ceX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,25 +34,25 @@
 
 
 # instance fields
-.field public final cae:Lokhttp3/w;
+.field public final bZy:Lokhttp3/w;
 
-.field public cca:Lokhttp3/e;
+.field public cbu:Lokhttp3/e;
 
-.field cdP:Z
+.field cdj:Z
 
-.field final cfE:Lokhttp3/WebSocketListener;
+.field final ceY:Lokhttp3/WebSocketListener;
 
-.field final cfF:J
+.field final ceZ:J
 
-.field private final cfG:Ljava/lang/Runnable;
+.field private final cfa:Ljava/lang/Runnable;
 
-.field private cfH:Lokhttp3/internal/i/c;
+.field private cfb:Lokhttp3/internal/i/c;
 
-.field cfI:Lokhttp3/internal/i/d;
+.field cfc:Lokhttp3/internal/i/d;
 
-.field private cfJ:Lokhttp3/internal/i/a$e;
+.field private cfd:Lokhttp3/internal/i/a$e;
 
-.field private final cfK:Ljava/util/ArrayDeque;
+.field private final cfe:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -61,7 +62,7 @@
     .end annotation
 .end field
 
-.field private final cfL:Ljava/util/ArrayDeque;
+.field private final cff:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -71,11 +72,11 @@
     .end annotation
 .end field
 
-.field private cfM:J
+.field private cfg:J
 
-.field private cfN:Z
+.field private cfh:Z
 
-.field private cfO:Ljava/util/concurrent/ScheduledFuture;
+.field private cfi:Ljava/util/concurrent/ScheduledFuture;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ScheduledFuture<",
@@ -84,17 +85,17 @@
     .end annotation
 .end field
 
-.field private cfP:I
+.field private cfj:I
 
-.field private cfQ:Ljava/lang/String;
+.field private cfk:Ljava/lang/String;
 
-.field cfR:Z
+.field cfl:Z
 
-.field cfS:I
+.field cfm:I
 
-.field private cfT:I
+.field private cfn:I
 
-.field private cfU:I
+.field private cfo:I
 
 .field public final key:Ljava/lang/String;
 
@@ -107,13 +108,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     invoke-static {v0}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/i/a;->cfD:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/i/a;->ceX:Ljava/util/List;
 
     return-void
 .end method
@@ -127,17 +128,17 @@
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/i/a;->cfK:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/i/a;->cfe:Ljava/util/ArrayDeque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/i/a;->cfL:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/i/a;->cff:Ljava/util/ArrayDeque;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/i/a;->cfP:I
+    iput v0, p0, Lokhttp3/internal/i/a;->cfj:I
 
     const-string v0, "GET"
 
@@ -149,13 +150,13 @@
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/i/a;->cae:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/i/a;->bZy:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iput-object p2, p0, Lokhttp3/internal/i/a;->ceY:Lokhttp3/WebSocketListener;
 
     iput-object p3, p0, Lokhttp3/internal/i/a;->random:Ljava/util/Random;
 
-    iput-wide p4, p0, Lokhttp3/internal/i/a;->cfF:J
+    iput-wide p4, p0, Lokhttp3/internal/i/a;->ceZ:J
 
     const/16 p1, 0x10
 
@@ -167,7 +168,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Jl()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Jk()Ljava/lang/String;
 
     move-result-object p1
 
@@ -177,7 +178,7 @@
 
     invoke-direct {p1, p0}, Lokhttp3/internal/i/a$1;-><init>(Lokhttp3/internal/i/a;)V
 
-    iput-object p1, p0, Lokhttp3/internal/i/a;->cfG:Ljava/lang/Runnable;
+    iput-object p1, p0, Lokhttp3/internal/i/a;->cfa:Ljava/lang/Runnable;
 
     return-void
 
@@ -203,16 +204,14 @@
     throw p2
 .end method
 
-.method private IP()V
+.method private IO()V
     .locals 2
 
     iget-object v0, p0, Lokhttp3/internal/i/a;->nK:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->nK:Ljava/util/concurrent/ScheduledExecutorService;
-
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfG:Ljava/lang/Runnable;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->cfa:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledExecutorService;->execute(Ljava/lang/Runnable;)V
 
@@ -226,20 +225,20 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfR:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfl:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfN:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfh:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-wide v2, p0, Lokhttp3/internal/i/a;->cfM:J
+    iget-wide v2, p0, Lokhttp3/internal/i/a;->cfg:J
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -269,7 +268,7 @@
 
     :cond_1
     :try_start_1
-    iget-wide v0, p0, Lokhttp3/internal/i/a;->cfM:J
+    iget-wide v0, p0, Lokhttp3/internal/i/a;->cfg:J
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -279,9 +278,9 @@
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lokhttp3/internal/i/a;->cfM:J
+    iput-wide v0, p0, Lokhttp3/internal/i/a;->cfg:J
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfL:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cff:Ljava/util/ArrayDeque;
 
     new-instance v1, Lokhttp3/internal/i/a$c;
 
@@ -291,7 +290,7 @@
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/i/a;->IP()V
+    invoke-direct {p0}, Lokhttp3/internal/i/a;->IO()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -362,11 +361,11 @@
 
     :cond_1
     :goto_0
-    iget-boolean p2, p0, Lokhttp3/internal/i/a;->cfR:Z
+    iget-boolean p2, p0, Lokhttp3/internal/i/a;->cfl:Z
 
     if-nez p2, :cond_3
 
-    iget-boolean p2, p0, Lokhttp3/internal/i/a;->cfN:Z
+    iget-boolean p2, p0, Lokhttp3/internal/i/a;->cfh:Z
 
     if-eqz p2, :cond_2
 
@@ -375,9 +374,9 @@
     :cond_2
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lokhttp3/internal/i/a;->cfN:Z
+    iput-boolean p2, p0, Lokhttp3/internal/i/a;->cfh:Z
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfL:Ljava/util/ArrayDeque;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->cff:Ljava/util/ArrayDeque;
 
     new-instance v2, Lokhttp3/internal/i/a$b;
 
@@ -387,7 +386,7 @@
 
     invoke-virtual {v1, v2}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/i/a;->IP()V
+    invoke-direct {p0}, Lokhttp3/internal/i/a;->IO()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -413,7 +412,7 @@
 
 
 # virtual methods
-.method public final IN()V
+.method public final IM()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -422,21 +421,21 @@
     .end annotation
 
     :goto_0
-    iget v0, p0, Lokhttp3/internal/i/a;->cfP:I
+    iget v0, p0, Lokhttp3/internal/i/a;->cfj:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfH:Lokhttp3/internal/i/c;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cfb:Lokhttp3/internal/i/c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/i/c;->IR()V
+    invoke-virtual {v0}, Lokhttp3/internal/i/c;->IQ()V
 
-    iget-boolean v1, v0, Lokhttp3/internal/i/c;->cgf:Z
+    iget-boolean v1, v0, Lokhttp3/internal/i/c;->cfz:Z
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/i/c;->IS()V
+    invoke-virtual {v0}, Lokhttp3/internal/i/c;->IR()V
 
     goto :goto_0
 
@@ -478,15 +477,15 @@
 
     :cond_2
     :goto_1
-    invoke-virtual {v0}, Lokhttp3/internal/i/c;->IU()V
+    invoke-virtual {v0}, Lokhttp3/internal/i/c;->IT()V
 
     if-ne v1, v2, :cond_3
 
-    iget-object v1, v0, Lokhttp3/internal/i/c;->cgc:Lokhttp3/internal/i/c$a;
+    iget-object v1, v0, Lokhttp3/internal/i/c;->cfw:Lokhttp3/internal/i/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/i/c;->cgh:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/i/c;->cfB:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Jf()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Je()Ljava/lang/String;
 
     move-result-object v0
 
@@ -495,11 +494,11 @@
     goto :goto_0
 
     :cond_3
-    iget-object v1, v0, Lokhttp3/internal/i/c;->cgc:Lokhttp3/internal/i/c$a;
+    iget-object v1, v0, Lokhttp3/internal/i/c;->cfw:Lokhttp3/internal/i/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/i/c;->cgh:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/i/c;->cfB:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Ij()Lokio/ByteString;
 
     move-result-object v0
 
@@ -511,21 +510,21 @@
     return-void
 .end method
 
-.method public final declared-synchronized IO()V
+.method public final declared-synchronized IN()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lokhttp3/internal/i/a;->cfU:I
+    iget v0, p0, Lokhttp3/internal/i/a;->cfo:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/i/a;->cfU:I
+    iput v0, p0, Lokhttp3/internal/i/a;->cfo:I
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/i/a;->cdP:Z
+    iput-boolean v0, p0, Lokhttp3/internal/i/a;->cdj:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -541,7 +540,7 @@
     throw v0
 .end method
 
-.method final IQ()Z
+.method final IP()Z
     .locals 12
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -552,7 +551,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfR:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfl:Z
 
     const/4 v1, 0x0
 
@@ -563,9 +562,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfI:Lokhttp3/internal/i/d;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cfc:Lokhttp3/internal/i/d;
 
-    iget-object v2, p0, Lokhttp3/internal/i/a;->cfK:Ljava/util/ArrayDeque;
+    iget-object v2, p0, Lokhttp3/internal/i/a;->cfe:Ljava/util/ArrayDeque;
 
     invoke-virtual {v2}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
 
@@ -577,7 +576,7 @@
 
     if-nez v2, :cond_4
 
-    iget-object v4, p0, Lokhttp3/internal/i/a;->cfL:Ljava/util/ArrayDeque;
+    iget-object v4, p0, Lokhttp3/internal/i/a;->cff:Ljava/util/ArrayDeque;
 
     invoke-virtual {v4}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
 
@@ -587,26 +586,25 @@
 
     if-eqz v5, :cond_2
 
-    iget v5, p0, Lokhttp3/internal/i/a;->cfP:I
+    iget v5, p0, Lokhttp3/internal/i/a;->cfj:I
 
-    iget-object v6, p0, Lokhttp3/internal/i/a;->cfQ:Ljava/lang/String;
+    iget-object v6, p0, Lokhttp3/internal/i/a;->cfk:Ljava/lang/String;
 
     const/4 v7, -0x1
 
     if-eq v5, v7, :cond_1
 
-    iget-object v7, p0, Lokhttp3/internal/i/a;->cfJ:Lokhttp3/internal/i/a$e;
+    iget-object v7, p0, Lokhttp3/internal/i/a;->cfd:Lokhttp3/internal/i/a$e;
 
-    iput-object v3, p0, Lokhttp3/internal/i/a;->cfJ:Lokhttp3/internal/i/a$e;
+    iput-object v3, p0, Lokhttp3/internal/i/a;->cfd:Lokhttp3/internal/i/a$e;
 
     iget-object v3, p0, Lokhttp3/internal/i/a;->nK:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
-    :goto_0
-    move-object v3, v6
+    move-object v3, v7
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     iget-object v7, p0, Lokhttp3/internal/i/a;->nK:Ljava/util/concurrent/ScheduledExecutorService;
@@ -619,7 +617,7 @@
 
     check-cast v9, Lokhttp3/internal/i/a$b;
 
-    iget-wide v9, v9, Lokhttp3/internal/i/a$b;->cfY:J
+    iget-wide v9, v9, Lokhttp3/internal/i/a$b;->cfs:J
 
     sget-object v11, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -627,9 +625,7 @@
 
     move-result-object v7
 
-    iput-object v7, p0, Lokhttp3/internal/i/a;->cfO:Ljava/util/concurrent/ScheduledFuture;
-
-    move-object v7, v3
+    iput-object v7, p0, Lokhttp3/internal/i/a;->cfi:Ljava/util/concurrent/ScheduledFuture;
 
     goto :goto_0
 
@@ -641,24 +637,25 @@
     return v1
 
     :cond_3
-    move-object v7, v3
+    move-object v6, v3
 
-    goto :goto_1
+    const/4 v5, 0x0
+
+    goto :goto_0
 
     :cond_4
     move-object v4, v3
 
-    move-object v7, v4
+    move-object v6, v4
 
-    :goto_1
     const/4 v5, 0x0
 
-    :goto_2
+    :goto_0
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
-    const/4 v6, 0x1
+    const/4 v7, 0x1
 
     if-eqz v2, :cond_5
 
@@ -667,12 +664,7 @@
     :try_start_1
     invoke-virtual {v0, v1, v2}, Lokhttp3/internal/i/d;->a(ILokio/ByteString;)V
 
-    goto/16 :goto_3
-
-    :catchall_0
-    move-exception v0
-
-    goto/16 :goto_4
+    goto/16 :goto_1
 
     :cond_5
     instance-of v2, v4, Lokhttp3/internal/i/a$c;
@@ -683,41 +675,41 @@
 
     check-cast v2, Lokhttp3/internal/i/a$c;
 
-    iget-object v2, v2, Lokhttp3/internal/i/a$c;->cga:Lokio/ByteString;
+    iget-object v2, v2, Lokhttp3/internal/i/a$c;->cfu:Lokio/ByteString;
 
     check-cast v4, Lokhttp3/internal/i/a$c;
 
-    iget v3, v4, Lokhttp3/internal/i/a$c;->cfZ:I
+    iget v4, v4, Lokhttp3/internal/i/a$c;->cft:I
 
     invoke-virtual {v2}, Lokio/ByteString;->size()I
 
-    move-result v4
+    move-result v5
 
-    int-to-long v4, v4
+    int-to-long v5, v5
 
-    iget-boolean v8, v0, Lokhttp3/internal/i/d;->cgo:Z
+    iget-boolean v8, v0, Lokhttp3/internal/i/d;->cfI:Z
 
     if-nez v8, :cond_6
 
-    iput-boolean v6, v0, Lokhttp3/internal/i/d;->cgo:Z
+    iput-boolean v7, v0, Lokhttp3/internal/i/d;->cfI:Z
 
-    iget-object v8, v0, Lokhttp3/internal/i/d;->cgn:Lokhttp3/internal/i/d$a;
+    iget-object v8, v0, Lokhttp3/internal/i/d;->cfH:Lokhttp3/internal/i/d$a;
 
-    iput v3, v8, Lokhttp3/internal/i/d$a;->cfZ:I
+    iput v4, v8, Lokhttp3/internal/i/d$a;->cft:I
 
-    iget-object v3, v0, Lokhttp3/internal/i/d;->cgn:Lokhttp3/internal/i/d$a;
+    iget-object v4, v0, Lokhttp3/internal/i/d;->cfH:Lokhttp3/internal/i/d$a;
 
-    iput-wide v4, v3, Lokhttp3/internal/i/d$a;->contentLength:J
+    iput-wide v5, v4, Lokhttp3/internal/i/d$a;->contentLength:J
 
-    iget-object v3, v0, Lokhttp3/internal/i/d;->cgn:Lokhttp3/internal/i/d$a;
+    iget-object v4, v0, Lokhttp3/internal/i/d;->cfH:Lokhttp3/internal/i/d$a;
 
-    iput-boolean v6, v3, Lokhttp3/internal/i/d$a;->cgp:Z
+    iput-boolean v7, v4, Lokhttp3/internal/i/d$a;->cfJ:Z
 
-    iget-object v3, v0, Lokhttp3/internal/i/d;->cgn:Lokhttp3/internal/i/d$a;
+    iget-object v4, v0, Lokhttp3/internal/i/d;->cfH:Lokhttp3/internal/i/d$a;
 
-    iput-boolean v1, v3, Lokhttp3/internal/i/d$a;->closed:Z
+    iput-boolean v1, v4, Lokhttp3/internal/i/d$a;->closed:Z
 
-    iget-object v0, v0, Lokhttp3/internal/i/d;->cgn:Lokhttp3/internal/i/d$a;
+    iget-object v0, v0, Lokhttp3/internal/i/d;->cfH:Lokhttp3/internal/i/d$a;
 
     invoke-static {v0}, Lokio/j;->b(Lokio/p;)Lokio/BufferedSink;
 
@@ -729,31 +721,31 @@
 
     monitor-enter p0
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
-    iget-wide v0, p0, Lokhttp3/internal/i/a;->cfM:J
+    iget-wide v0, p0, Lokhttp3/internal/i/a;->cfg:J
 
     invoke-virtual {v2}, Lokio/ByteString;->size()I
 
     move-result v2
 
-    int-to-long v2, v2
+    int-to-long v4, v2
 
-    sub-long/2addr v0, v2
+    sub-long/2addr v0, v4
 
-    iput-wide v0, p0, Lokhttp3/internal/i/a;->cfM:J
+    iput-wide v0, p0, Lokhttp3/internal/i/a;->cfg:J
 
     monitor-exit p0
 
-    goto :goto_3
+    goto :goto_1
 
-    :catchall_1
+    :catchall_0
     move-exception v0
 
     monitor-exit p0
     :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
     throw v0
@@ -776,9 +768,9 @@
 
     iget v1, v4, Lokhttp3/internal/i/a$b;->code:I
 
-    iget-object v2, v4, Lokhttp3/internal/i/a$b;->cfX:Lokio/ByteString;
+    iget-object v2, v4, Lokhttp3/internal/i/a$b;->cfr:Lokio/ByteString;
 
-    sget-object v4, Lokio/ByteString;->cgQ:Lokio/ByteString;
+    sget-object v4, Lokio/ByteString;->cgk:Lokio/ByteString;
 
     if-nez v1, :cond_8
 
@@ -801,11 +793,11 @@
     invoke-virtual {v4, v2}, Lokio/c;->g(Lokio/ByteString;)Lokio/c;
 
     :cond_a
-    invoke-virtual {v4}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/c;->Ij()Lokio/ByteString;
 
     move-result-object v4
     :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
     :cond_b
     const/16 v1, 0x8
@@ -813,30 +805,30 @@
     :try_start_4
     invoke-virtual {v0, v1, v4}, Lokhttp3/internal/i/d;->a(ILokio/ByteString;)V
     :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     :try_start_5
-    iput-boolean v6, v0, Lokhttp3/internal/i/d;->cgl:Z
+    iput-boolean v7, v0, Lokhttp3/internal/i/d;->cfF:Z
 
-    if-eqz v7, :cond_c
+    if-eqz v3, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->ceY:Lokhttp3/WebSocketListener;
 
-    invoke-virtual {v0, p0, v5, v3}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
+    invoke-virtual {v0, p0, v5, v6}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_0
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
 
     :cond_c
-    :goto_3
-    invoke-static {v7}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
+    :goto_1
+    invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
-    return v6
+    return v7
 
-    :catchall_2
+    :catchall_1
     move-exception v1
 
     :try_start_6
-    iput-boolean v6, v0, Lokhttp3/internal/i/d;->cgl:Z
+    iput-boolean v7, v0, Lokhttp3/internal/i/d;->cfF:Z
 
     throw v1
 
@@ -847,10 +839,12 @@
 
     throw v0
     :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_0
+    .catchall {:try_start_6 .. :try_end_6} :catchall_2
 
-    :goto_4
-    invoke-static {v7}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
+    :catchall_2
+    move-exception v0
+
+    invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     throw v0
 
@@ -875,7 +869,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfR:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfl:Z
 
     if-eqz v0, :cond_0
 
@@ -886,19 +880,19 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/i/a;->cfR:Z
+    iput-boolean v0, p0, Lokhttp3/internal/i/a;->cfl:Z
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfJ:Lokhttp3/internal/i/a$e;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cfd:Lokhttp3/internal/i/a$e;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokhttp3/internal/i/a;->cfJ:Lokhttp3/internal/i/a$e;
+    iput-object v1, p0, Lokhttp3/internal/i/a;->cfd:Lokhttp3/internal/i/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfO:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->cfi:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfO:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->cfi:Ljava/util/concurrent/ScheduledFuture;
 
     const/4 v2, 0x0
 
@@ -919,7 +913,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->ceY:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
     :try_end_1
@@ -958,19 +952,19 @@
     monitor-enter p0
 
     :try_start_0
-    iput-object p2, p0, Lokhttp3/internal/i/a;->cfJ:Lokhttp3/internal/i/a$e;
+    iput-object p2, p0, Lokhttp3/internal/i/a;->cfd:Lokhttp3/internal/i/a$e;
 
     new-instance v0, Lokhttp3/internal/i/d;
 
-    iget-boolean v1, p2, Lokhttp3/internal/i/a$e;->cdH:Z
+    iget-boolean v1, p2, Lokhttp3/internal/i/a$e;->cdb:Z
 
-    iget-object v2, p2, Lokhttp3/internal/i/a$e;->cbR:Lokio/BufferedSink;
+    iget-object v2, p2, Lokhttp3/internal/i/a$e;->cbl:Lokio/BufferedSink;
 
     iget-object v3, p0, Lokhttp3/internal/i/a;->random:Ljava/util/Random;
 
     invoke-direct {v0, v1, v2, v3}, Lokhttp3/internal/i/d;-><init>(ZLokio/BufferedSink;Ljava/util/Random;)V
 
-    iput-object v0, p0, Lokhttp3/internal/i/a;->cfI:Lokhttp3/internal/i/d;
+    iput-object v0, p0, Lokhttp3/internal/i/a;->cfc:Lokhttp3/internal/i/d;
 
     new-instance v0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
@@ -986,7 +980,7 @@
 
     iput-object v0, p0, Lokhttp3/internal/i/a;->nK:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-wide v0, p0, Lokhttp3/internal/i/a;->cfF:J
+    iget-wide v0, p0, Lokhttp3/internal/i/a;->ceZ:J
 
     const-wide/16 v2, 0x0
 
@@ -1000,16 +994,16 @@
 
     invoke-direct {v1, p0}, Lokhttp3/internal/i/a$d;-><init>(Lokhttp3/internal/i/a;)V
 
-    iget-wide v2, p0, Lokhttp3/internal/i/a;->cfF:J
+    iget-wide v2, p0, Lokhttp3/internal/i/a;->ceZ:J
 
-    iget-wide v4, p0, Lokhttp3/internal/i/a;->cfF:J
+    iget-wide v4, p0, Lokhttp3/internal/i/a;->ceZ: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/i/a;->cfL:Ljava/util/ArrayDeque;
+    iget-object p1, p0, Lokhttp3/internal/i/a;->cff:Ljava/util/ArrayDeque;
 
     invoke-virtual {p1}, Ljava/util/ArrayDeque;->isEmpty()Z
 
@@ -1017,7 +1011,7 @@
 
     if-nez p1, :cond_1
 
-    invoke-direct {p0}, Lokhttp3/internal/i/a;->IP()V
+    invoke-direct {p0}, Lokhttp3/internal/i/a;->IO()V
 
     :cond_1
     monitor-exit p0
@@ -1026,13 +1020,13 @@
 
     new-instance p1, Lokhttp3/internal/i/c;
 
-    iget-boolean v0, p2, Lokhttp3/internal/i/a$e;->cdH:Z
+    iget-boolean v0, p2, Lokhttp3/internal/i/a$e;->cdb:Z
 
-    iget-object p2, p2, Lokhttp3/internal/i/a$e;->caE:Lokio/d;
+    iget-object p2, p2, Lokhttp3/internal/i/a$e;->bZY:Lokio/d;
 
     invoke-direct {p1, v0, p2, p0}, Lokhttp3/internal/i/c;-><init>(ZLokio/d;Lokhttp3/internal/i/c$a;)V
 
-    iput-object p1, p0, Lokhttp3/internal/i/a;->cfH:Lokhttp3/internal/i/c;
+    iput-object p1, p0, Lokhttp3/internal/i/a;->cfb:Lokhttp3/internal/i/c;
 
     return-void
 
@@ -1055,7 +1049,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->ceY:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
 
@@ -1068,15 +1062,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfR:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfl:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfN:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfh:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfL:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cff:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
 
@@ -1087,17 +1081,17 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfK:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cfe:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/i/a;->IP()V
+    invoke-direct {p0}, Lokhttp3/internal/i/a;->IO()V
 
-    iget p1, p0, Lokhttp3/internal/i/a;->cfT:I
+    iget p1, p0, Lokhttp3/internal/i/a;->cfn:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/i/a;->cfT:I
+    iput p1, p0, Lokhttp3/internal/i/a;->cfn:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1127,7 +1121,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->ceY:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
 
@@ -1179,21 +1173,21 @@
     monitor-enter p0
 
     :try_start_0
-    iget v1, p0, Lokhttp3/internal/i/a;->cfP:I
+    iget v1, p0, Lokhttp3/internal/i/a;->cfj:I
 
     if-ne v1, v0, :cond_3
 
-    iput p1, p0, Lokhttp3/internal/i/a;->cfP:I
+    iput p1, p0, Lokhttp3/internal/i/a;->cfj:I
 
-    iput-object p2, p0, Lokhttp3/internal/i/a;->cfQ:Ljava/lang/String;
+    iput-object p2, p0, Lokhttp3/internal/i/a;->cfk:Ljava/lang/String;
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfN:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/a;->cfh:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfL:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cff:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
 
@@ -1201,15 +1195,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->cfJ:Lokhttp3/internal/i/a$e;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->cfd:Lokhttp3/internal/i/a$e;
 
-    iput-object v1, p0, Lokhttp3/internal/i/a;->cfJ:Lokhttp3/internal/i/a$e;
+    iput-object v1, p0, Lokhttp3/internal/i/a;->cfd:Lokhttp3/internal/i/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfO:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->cfi:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfO:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->cfi:Ljava/util/concurrent/ScheduledFuture;
 
     const/4 v2, 0x0
 
@@ -1231,13 +1225,13 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->ceY: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/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->ceY:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     :try_end_1
diff --git a/com.discord/smali/okhttp3/internal/i/c$a.smali b/com.discord/smali/okhttp3/internal/i/c$a.smali
index 1e790a678d..1af3c29900 100644
--- a/com.discord/smali/okhttp3/internal/i/c$a.smali
+++ b/com.discord/smali/okhttp3/internal/i/c$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/internal/i/c$a;
 .super Ljava/lang/Object;
+.source "WebSocketReader.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract IO()V
+.method public abstract IN()V
 .end method
 
 .method public abstract d(Lokio/ByteString;)V
diff --git a/com.discord/smali/okhttp3/k$a.smali b/com.discord/smali/okhttp3/k$a.smali
index 866c69721c..26c81ebacd 100644
--- a/com.discord/smali/okhttp3/k$a.smali
+++ b/com.discord/smali/okhttp3/k$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/k$a;
 .super Ljava/lang/Object;
+.source "ConnectionSpec.java"
 
 
 # annotations
@@ -14,16 +15,16 @@
 
 
 # instance fields
-.field bYs:Z
+.field bXM:Z
 
-.field bYt:Z
+.field bXN:Z
 
-.field bYu:[Ljava/lang/String;
+.field bXO:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bYv:[Ljava/lang/String;
+.field bXP:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -35,21 +36,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lokhttp3/k;->bYs:Z
+    iget-boolean v0, p1, Lokhttp3/k;->bXM:Z
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bYs:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->bXM:Z
 
-    iget-object v0, p1, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->bYu:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->bXO:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->bYv:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->bXP:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k;->bYt:Z
+    iget-boolean p1, p1, Lokhttp3/k;->bXN:Z
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bYt:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->bXN:Z
 
     return-void
 .end method
@@ -59,23 +60,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bYs:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->bXM:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hb()Lokhttp3/k$a;
+.method public final Ha()Lokhttp3/k$a;
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bXM:Z
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bYt:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->bXN:Z
 
     return-object p0
 
@@ -89,7 +90,7 @@
     throw v0
 .end method
 
-.method public final Hc()Lokhttp3/k;
+.method public final Hb()Lokhttp3/k;
     .locals 1
 
     new-instance v0, Lokhttp3/k;
@@ -102,7 +103,7 @@
 .method public final varargs a([Lokhttp3/h;)Lokhttp3/k$a;
     .locals 3
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bXM:Z
 
     if-eqz v0, :cond_1
 
@@ -142,12 +143,14 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final varargs a([Lokhttp3/z;)Lokhttp3/k$a;
     .locals 3
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bXM:Z
 
     if-eqz v0, :cond_1
 
@@ -187,12 +190,14 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final varargs d([Ljava/lang/String;)Lokhttp3/k$a;
     .locals 1
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bXM:Z
 
     if-eqz v0, :cond_1
 
@@ -206,7 +211,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->bYu:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->bXO:[Ljava/lang/String;
 
     return-object p0
 
@@ -232,7 +237,7 @@
 .method public final varargs e([Ljava/lang/String;)Lokhttp3/k$a;
     .locals 1
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bXM:Z
 
     if-eqz v0, :cond_1
 
@@ -246,7 +251,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->bYv:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->bXP:[Ljava/lang/String;
 
     return-object p0
 
diff --git a/com.discord/smali/okhttp3/k.smali b/com.discord/smali/okhttp3/k.smali
index 23e51dc534..c7c97ec324 100644
--- a/com.discord/smali/okhttp3/k.smali
+++ b/com.discord/smali/okhttp3/k.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/k;
 .super Ljava/lang/Object;
+.source "ConnectionSpec.java"
 
 
 # annotations
@@ -11,30 +12,30 @@
 
 
 # static fields
-.field private static final bYm:[Lokhttp3/h;
+.field private static final bXG:[Lokhttp3/h;
 
-.field private static final bYn:[Lokhttp3/h;
+.field private static final bXH:[Lokhttp3/h;
 
-.field public static final bYo:Lokhttp3/k;
+.field public static final bXI:Lokhttp3/k;
 
-.field public static final bYp:Lokhttp3/k;
+.field public static final bXJ:Lokhttp3/k;
 
-.field public static final bYq:Lokhttp3/k;
+.field public static final bXK:Lokhttp3/k;
 
-.field public static final bYr:Lokhttp3/k;
+.field public static final bXL:Lokhttp3/k;
 
 
 # instance fields
-.field final bYs:Z
+.field final bXM:Z
 
-.field public final bYt:Z
+.field public final bXN:Z
 
-.field final bYu:[Ljava/lang/String;
+.field final bXO:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bYv:[Ljava/lang/String;
+.field final bXP:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -48,119 +49,119 @@
 
     new-array v1, v0, [Lokhttp3/h;
 
-    sget-object v2, Lokhttp3/h;->bXS:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXm:Lokhttp3/h;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bXW:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXq:Lokhttp3/h;
 
     const/4 v4, 0x1
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bXT:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXn:Lokhttp3/h;
 
     const/4 v5, 0x2
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bXX:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXr:Lokhttp3/h;
 
     const/4 v6, 0x3
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bYd:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXx:Lokhttp3/h;
 
     const/4 v7, 0x4
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bYc:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXw:Lokhttp3/h;
 
     const/4 v8, 0x5
 
     aput-object v2, v1, v8
 
-    sput-object v1, Lokhttp3/k;->bYm:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->bXG:[Lokhttp3/h;
 
     const/16 v1, 0xd
 
     new-array v1, v1, [Lokhttp3/h;
 
-    sget-object v2, Lokhttp3/h;->bXS:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXm:Lokhttp3/h;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bXW:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXq:Lokhttp3/h;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bXT:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXn:Lokhttp3/h;
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bXX:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXr:Lokhttp3/h;
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bYd:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXx:Lokhttp3/h;
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bYc:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bXw:Lokhttp3/h;
 
     aput-object v2, v1, v8
 
-    sget-object v2, Lokhttp3/h;->bXD:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bWX:Lokhttp3/h;
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lokhttp3/h;->bXE:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bWY:Lokhttp3/h;
 
     const/4 v2, 0x7
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bXb:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bWv:Lokhttp3/h;
 
     const/16 v2, 0x8
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bXc:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bWw:Lokhttp3/h;
 
     const/16 v2, 0x9
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bWz:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bVT:Lokhttp3/h;
 
     const/16 v2, 0xa
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bWD:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bVX:Lokhttp3/h;
 
     const/16 v2, 0xb
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bWd:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bVx:Lokhttp3/h;
 
     const/16 v2, 0xc
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lokhttp3/k;->bYn:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->bXH:[Lokhttp3/h;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bYm:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bXG:[Lokhttp3/h;
 
     invoke-virtual {v0, v1}, Lokhttp3/k$a;->a([Lokhttp3/h;)Lokhttp3/k$a;
 
@@ -168,7 +169,7 @@
 
     new-array v1, v4, [Lokhttp3/z;
 
-    sget-object v2, Lokhttp3/z;->caJ:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->cad:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
@@ -176,21 +177,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Hb()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Ha()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Hc()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Hb()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bYo:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bXI:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bYn:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bXH:[Lokhttp3/h;
 
     invoke-virtual {v0, v1}, Lokhttp3/k$a;->a([Lokhttp3/h;)Lokhttp3/k$a;
 
@@ -198,15 +199,15 @@
 
     new-array v1, v6, [Lokhttp3/z;
 
-    sget-object v2, Lokhttp3/z;->caJ:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->cad:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/z;->caK:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->cae:Lokhttp3/z;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/z;->caL:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->caf:Lokhttp3/z;
 
     aput-object v2, v1, v5
 
@@ -214,25 +215,25 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Hb()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Ha()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Hc()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Hb()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bYp:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bXJ:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
-    sget-object v1, Lokhttp3/k;->bYp:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->bXJ:Lokhttp3/k;
 
     invoke-direct {v0, v1}, Lokhttp3/k$a;-><init>(Lokhttp3/k;)V
 
     new-array v1, v4, [Lokhttp3/z;
 
-    sget-object v2, Lokhttp3/z;->caL:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->caf:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
@@ -240,25 +241,25 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Hb()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Ha()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Hc()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Hb()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bYq:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bXK:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v3}, Lokhttp3/k$a;-><init>(Z)V
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Hc()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Hb()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bYr:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bXL:Lokhttp3/k;
 
     return-void
 .end method
@@ -268,21 +269,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lokhttp3/k$a;->bYs:Z
+    iget-boolean v0, p1, Lokhttp3/k$a;->bXM:Z
 
-    iput-boolean v0, p0, Lokhttp3/k;->bYs:Z
+    iput-boolean v0, p0, Lokhttp3/k;->bXM:Z
 
-    iget-object v0, p1, Lokhttp3/k$a;->bYu:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->bXO:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k$a;->bYv:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->bXP:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k$a;->bYt:Z
+    iget-boolean p1, p1, Lokhttp3/k$a;->bXN:Z
 
-    iput-boolean p1, p0, Lokhttp3/k;->bYt:Z
+    iput-boolean p1, p0, Lokhttp3/k;->bXN:Z
 
     return-void
 .end method
@@ -292,7 +293,7 @@
 .method public final b(Ljavax/net/ssl/SSLSocket;)Z
     .locals 4
 
-    iget-boolean v0, p0, Lokhttp3/k;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bXM:Z
 
     const/4 v1, 0x0
 
@@ -301,13 +302,13 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
     sget-object v0, Lokhttp3/internal/c;->bDp:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
@@ -322,13 +323,13 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/h;->bVU:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bVo:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
@@ -373,22 +374,20 @@
     :cond_1
     check-cast p1, Lokhttp3/k;
 
-    iget-boolean v2, p0, Lokhttp3/k;->bYs:Z
+    iget-boolean v2, p0, Lokhttp3/k;->bXM:Z
 
-    iget-boolean v3, p1, Lokhttp3/k;->bYs:Z
+    iget-boolean v3, p1, Lokhttp3/k;->bXM:Z
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget-boolean v2, p0, Lokhttp3/k;->bYs:Z
-
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -399,9 +398,9 @@
     return v1
 
     :cond_3
-    iget-object v2, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -412,9 +411,9 @@
     return v1
 
     :cond_4
-    iget-boolean v2, p0, Lokhttp3/k;->bYt:Z
+    iget-boolean v2, p0, Lokhttp3/k;->bXN:Z
 
-    iget-boolean p1, p1, Lokhttp3/k;->bYt:Z
+    iget-boolean p1, p1, Lokhttp3/k;->bXN:Z
 
     if-eq v2, p1, :cond_5
 
@@ -427,11 +426,11 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bXM:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     invoke-static {v0}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
@@ -441,7 +440,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
@@ -451,7 +450,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/k;->bYt:Z
+    iget-boolean v1, p0, Lokhttp3/k;->bXN:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -469,7 +468,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-boolean v0, p0, Lokhttp3/k;->bYs:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bXM:Z
 
     if-nez v0, :cond_0
 
@@ -478,18 +477,14 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
-
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/k;->bYu:[Ljava/lang/String;
-
     invoke-static {v0}, Lokhttp3/h;->c([Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v0
@@ -510,17 +505,13 @@
     const-string v0, "[all enabled]"
 
     :goto_1
-    iget-object v2, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     if-eqz v2, :cond_4
 
-    iget-object v2, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
-
     if-eqz v2, :cond_3
 
-    iget-object v1, p0, Lokhttp3/k;->bYv:[Ljava/lang/String;
-
-    invoke-static {v1}, Lokhttp3/z;->c([Ljava/lang/String;)Ljava/util/List;
+    invoke-static {v2}, Lokhttp3/z;->c([Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v1
 
@@ -553,7 +544,7 @@
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v0, p0, Lokhttp3/k;->bYt:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bXN:Z
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/l.smali b/com.discord/smali/okhttp3/l.smali
index dc70b098f5..0d56606057 100644
--- a/com.discord/smali/okhttp3/l.smali
+++ b/com.discord/smali/okhttp3/l.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/l;
 .super Ljava/lang/Object;
+.source "Cookie.java"
 
 
 # annotations
@@ -11,27 +12,27 @@
 
 
 # static fields
-.field private static final bYw:Ljava/util/regex/Pattern;
+.field private static final bXQ:Ljava/util/regex/Pattern;
 
-.field private static final bYx:Ljava/util/regex/Pattern;
+.field private static final bXR:Ljava/util/regex/Pattern;
 
-.field private static final bYy:Ljava/util/regex/Pattern;
+.field private static final bXS:Ljava/util/regex/Pattern;
 
-.field private static final bYz:Ljava/util/regex/Pattern;
+.field private static final bXT:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field public final bYA:J
+.field public final bXU:J
 
-.field public final bYB:Ljava/lang/String;
+.field public final bXV:Ljava/lang/String;
 
-.field public final bYC:Z
+.field public final bXW:Z
 
-.field public final bYD:Z
+.field public final bXX:Z
 
-.field public final bYE:Z
+.field public final bXY:Z
 
-.field public final bYF:Z
+.field public final bXZ:Z
 
 .field public final name:Ljava/lang/String;
 
@@ -50,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bYw:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bXQ:Ljava/util/regex/Pattern;
 
     const-string v0, "(?i)(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*"
 
@@ -58,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bYx:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bXR:Ljava/util/regex/Pattern;
 
     const-string v0, "(\\d{1,2})[^\\d]*"
 
@@ -66,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bYy:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bXS:Ljava/util/regex/Pattern;
 
     const-string v0, "(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[^\\d]*"
 
@@ -74,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bYz:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bXT:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -88,19 +89,19 @@
 
     iput-object p2, p0, Lokhttp3/l;->value:Ljava/lang/String;
 
-    iput-wide p3, p0, Lokhttp3/l;->bYA:J
+    iput-wide p3, p0, Lokhttp3/l;->bXU:J
 
-    iput-object p5, p0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iput-object p5, p0, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     iput-object p6, p0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iput-boolean p7, p0, Lokhttp3/l;->bYC:Z
+    iput-boolean p7, p0, Lokhttp3/l;->bXW:Z
 
-    iput-boolean p8, p0, Lokhttp3/l;->bYD:Z
+    iput-boolean p8, p0, Lokhttp3/l;->bXX:Z
 
-    iput-boolean p9, p0, Lokhttp3/l;->bYF:Z
+    iput-boolean p9, p0, Lokhttp3/l;->bXZ:Z
 
-    iput-boolean p10, p0, Lokhttp3/l;->bYE:Z
+    iput-boolean p10, p0, Lokhttp3/l;->bXY:Z
 
     return-void
 .end method
@@ -118,7 +119,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l$a;->bYB:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->bXV:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -130,33 +131,33 @@
 
     iput-object v0, p0, Lokhttp3/l;->value:Ljava/lang/String;
 
-    iget-wide v0, p1, Lokhttp3/l$a;->bYA:J
+    iget-wide v0, p1, Lokhttp3/l$a;->bXU:J
 
-    iput-wide v0, p0, Lokhttp3/l;->bYA:J
+    iput-wide v0, p0, Lokhttp3/l;->bXU:J
 
-    iget-object v0, p1, Lokhttp3/l$a;->bYB:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->bXV:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l;->bXV: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;->bYC:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bXW:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bYC:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bXW:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->bYD:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bXX:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bYD:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bXX:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->bYE:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bXY:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bYE:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bXY:Z
 
-    iget-boolean p1, p1, Lokhttp3/l$a;->bYF:Z
+    iget-boolean p1, p1, Lokhttp3/l$a;->bXZ:Z
 
-    iput-boolean p1, p0, Lokhttp3/l;->bYF:Z
+    iput-boolean p1, p0, Lokhttp3/l;->bXZ:Z
 
     return-void
 
@@ -287,7 +288,7 @@
 
     const-string v0, "Set-Cookie"
 
-    iget-object v1, p1, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -404,183 +405,193 @@
 .end method
 
 .method private static a(JLokhttp3/s;Ljava/lang/String;)Lokhttp3/l;
-    .locals 30
+    .locals 28
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    move-object/from16 v2, p3
+    move-object/from16 v0, p3
 
     invoke-virtual/range {p3 .. p3}, Ljava/lang/String;->length()I
 
-    move-result v3
+    move-result v1
 
-    const/16 v4, 0x3b
+    const/16 v2, 0x3b
 
-    const/4 v5, 0x0
+    const/4 v3, 0x0
 
-    invoke-static {v2, v5, v3, v4}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
+    invoke-static {v0, v3, v1, v2}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
+
+    move-result v4
+
+    const/16 v5, 0x3d
+
+    invoke-static {v0, v3, v4, v5}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
 
     move-result v6
 
-    const/16 v7, 0x3d
+    const/4 v7, 0x0
 
-    invoke-static {v2, v5, v6, v7}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
+    if-ne v6, v4, :cond_0
+
+    return-object v7
+
+    :cond_0
+    invoke-static {v0, v3, v6}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-virtual {v9}, Ljava/lang/String;->isEmpty()Z
 
     move-result v8
 
-    const/4 v9, 0x0
+    if-nez v8, :cond_2a
 
-    if-ne v8, v6, :cond_0
+    invoke-static {v9}, Lokhttp3/internal/c;->ez(Ljava/lang/String;)I
 
-    return-object v9
+    move-result v8
 
-    :cond_0
-    invoke-static {v2, v5, v8}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
+    const/4 v10, -0x1
 
-    move-result-object v11
+    if-eq v8, v10, :cond_1
 
-    invoke-virtual {v11}, Ljava/lang/String;->isEmpty()Z
-
-    move-result v10
-
-    if-nez v10, :cond_29
-
-    invoke-static {v11}, Lokhttp3/internal/c;->ez(Ljava/lang/String;)I
-
-    move-result v10
-
-    const/4 v12, -0x1
-
-    if-eq v10, v12, :cond_1
-
-    goto/16 :goto_11
+    goto/16 :goto_e
 
     :cond_1
-    const/4 v10, 0x1
+    const/4 v8, 0x1
 
-    add-int/2addr v8, v10
+    add-int/2addr v6, v8
 
-    invoke-static {v2, v8, v6}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-static {v8}, Lokhttp3/internal/c;->ez(Ljava/lang/String;)I
-
-    move-result v13
-
-    if-eq v13, v12, :cond_2
-
-    return-object v9
-
-    :cond_2
-    add-int/2addr v6, v10
-
-    move-object/from16 v21, v9
-
-    const-wide/16 v17, -0x1
-
-    const-wide v19, 0xe677d21fdbffL
-
-    const/16 v22, 0x0
-
-    const/16 v23, 0x0
-
-    const/16 v24, 0x1
-
-    const/16 v25, 0x0
-
-    :goto_0
-    if-ge v6, v3, :cond_1d
-
-    invoke-static {v2, v6, v3, v4}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
-
-    move-result v15
-
-    invoke-static {v2, v6, v15, v7}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
-
-    move-result v13
-
-    invoke-static {v2, v6, v13}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
+    invoke-static {v0, v6, v4}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
 
     move-result-object v6
 
-    if-ge v13, v15, :cond_3
+    invoke-static {v6}, Lokhttp3/internal/c;->ez(Ljava/lang/String;)I
 
-    add-int/lit8 v13, v13, 0x1
+    move-result v11
 
-    invoke-static {v2, v13, v15}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
+    if-eq v11, v10, :cond_2
 
-    move-result-object v13
+    return-object v7
+
+    :cond_2
+    add-int/2addr v4, v8
+
+    move-object/from16 v19, v7
+
+    const-wide/16 v15, -0x1
+
+    const/16 v18, 0x0
+
+    const-wide v20, 0xe677d21fdbffL
+
+    const/16 v22, 0x0
+
+    const/16 v23, 0x1
+
+    const/16 v24, 0x0
+
+    :goto_0
+    if-ge v4, v1, :cond_1d
+
+    invoke-static {v0, v4, v1, v2}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
+
+    move-result v13
+
+    invoke-static {v0, v4, v13, v5}, Lokhttp3/internal/c;->a(Ljava/lang/String;IIC)I
+
+    move-result v14
+
+    invoke-static {v0, v4, v14}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
+
+    move-result-object v4
+
+    if-ge v14, v13, :cond_3
+
+    add-int/lit8 v14, v14, 0x1
+
+    invoke-static {v0, v14, v13}, Lokhttp3/internal/c;->n(Ljava/lang/String;II)Ljava/lang/String;
+
+    move-result-object v14
 
     goto :goto_1
 
     :cond_3
-    const-string v13, ""
+    const-string v14, ""
 
     :goto_1
-    const-string v14, "expires"
+    const-string v5, "expires"
 
-    invoke-virtual {v6, v14}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v4, v5}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v14
+    move-result v5
 
-    if-eqz v14, :cond_14
+    if-eqz v5, :cond_14
 
     :try_start_0
-    invoke-virtual {v13}, Ljava/lang/String;->length()I
+    invoke-virtual {v14}, Ljava/lang/String;->length()I
 
-    move-result v6
+    move-result v4
 
-    invoke-static {v13, v5, v6, v5}, Lokhttp3/l;->a(Ljava/lang/String;IIZ)I
+    invoke-static {v14, v3, v4, v3}, Lokhttp3/l;->a(Ljava/lang/String;IIZ)I
 
-    move-result v14
+    move-result v5
 
-    sget-object v7, Lokhttp3/l;->bYz:Ljava/util/regex/Pattern;
+    sget-object v11, Lokhttp3/l;->bXT:Ljava/util/regex/Pattern;
 
-    invoke-virtual {v7, v13}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+    invoke-virtual {v11, v14}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
-    move-result-object v7
+    move-result-object v11
 
-    const/4 v4, -0x1
+    const/4 v2, -0x1
 
-    const/4 v5, -0x1
+    const/4 v3, -0x1
+
+    const/4 v12, -0x1
+
+    const/16 v25, -0x1
 
     const/16 v26, -0x1
 
     const/16 v27, -0x1
 
-    const/16 v28, -0x1
-
-    const/16 v29, -0x1
-
     :goto_2
-    if-ge v14, v6, :cond_a
+    if-ge v5, v4, :cond_a
 
-    add-int/lit8 v12, v14, 0x1
+    add-int/lit8 v10, v5, 0x1
 
-    invoke-static {v13, v12, v6, v10}, Lokhttp3/l;->a(Ljava/lang/String;IIZ)I
+    invoke-static {v14, v10, v4, v8}, Lokhttp3/l;->a(Ljava/lang/String;IIZ)I
 
-    move-result v12
+    move-result v10
 
-    invoke-virtual {v7, v14, v12}, Ljava/util/regex/Matcher;->region(II)Ljava/util/regex/Matcher;
+    invoke-virtual {v11, v5, v10}, Ljava/util/regex/Matcher;->region(II)Ljava/util/regex/Matcher;
 
-    const/4 v14, -0x1
+    const/4 v5, -0x1
 
-    if-ne v5, v14, :cond_5
+    if-ne v2, v5, :cond_4
 
-    sget-object v14, Lokhttp3/l;->bYz:Ljava/util/regex/Pattern;
+    sget-object v5, Lokhttp3/l;->bXT:Ljava/util/regex/Pattern;
 
-    invoke-virtual {v7, v14}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+    invoke-virtual {v11, v5}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
 
-    move-result-object v14
+    move-result-object v5
 
-    invoke-virtual {v14}, Ljava/util/regex/Matcher;->matches()Z
+    invoke-virtual {v5}, Ljava/util/regex/Matcher;->matches()Z
 
-    move-result v14
+    move-result v5
 
-    if-eqz v14, :cond_4
+    if-eqz v5, :cond_4
 
-    invoke-virtual {v7, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v2
+
+    const/4 v5, 0x2
+
+    invoke-virtual {v11, v5}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -588,280 +599,266 @@
 
     move-result v5
 
-    const/4 v14, 0x2
+    const/4 v8, 0x3
 
-    invoke-virtual {v7, v14}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v14
+    move-result-object v8
 
-    invoke-static {v14}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+    invoke-static {v8}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
 
-    move-result v14
+    move-result v8
 
-    const/4 v10, 0x3
+    move/from16 v26, v5
 
-    invoke-virtual {v7, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    move/from16 v27, v8
 
-    move-result-object v10
-
-    invoke-static {v10}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v10
-
-    move/from16 v29, v10
-
-    move/from16 v28, v14
-
-    goto/16 :goto_5
+    goto :goto_3
 
     :cond_4
-    move/from16 v10, v27
+    move/from16 v5, v25
 
-    const/4 v14, -0x1
+    const/4 v8, -0x1
+
+    if-ne v5, v8, :cond_6
+
+    sget-object v8, Lokhttp3/l;->bXS:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+
+    move-result-object v8
+
+    invoke-virtual {v8}, Ljava/util/regex/Matcher;->matches()Z
+
+    move-result v8
+
+    if-eqz v8, :cond_5
+
+    const/4 v8, 0x1
+
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-static {v5}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v5
+
+    move/from16 v25, v5
 
     goto :goto_3
 
     :cond_5
-    move/from16 v10, v27
-
-    :goto_3
-    if-ne v10, v14, :cond_6
-
-    sget-object v14, Lokhttp3/l;->bYy:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v7, v14}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
-
-    move-result-object v14
-
-    invoke-virtual {v14}, Ljava/util/regex/Matcher;->matches()Z
-
-    move-result v14
-
-    if-eqz v14, :cond_6
-
-    const/4 v14, 0x1
-
-    invoke-virtual {v7, v14}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-static {v10}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v10
-
-    :goto_4
-    move/from16 v27, v10
-
-    goto :goto_5
+    const/4 v8, -0x1
 
     :cond_6
-    move/from16 v14, v26
+    if-ne v3, v8, :cond_8
 
-    const/4 v2, -0x1
+    sget-object v8, Lokhttp3/l;->bXR:Ljava/util/regex/Pattern;
 
-    if-ne v14, v2, :cond_8
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
 
-    sget-object v2, Lokhttp3/l;->bYx:Ljava/util/regex/Pattern;
+    move-result-object v8
 
-    invoke-virtual {v7, v2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+    invoke-virtual {v8}, Ljava/util/regex/Matcher;->matches()Z
 
-    move-result-object v2
+    move-result v8
 
-    invoke-virtual {v2}, Ljava/util/regex/Matcher;->matches()Z
+    if-eqz v8, :cond_7
 
-    move-result v2
+    const/4 v8, 0x1
 
-    if-eqz v2, :cond_7
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    const/4 v2, 0x1
+    move-result-object v3
 
-    invoke-virtual {v7, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    sget-object v8, Ljava/util/Locale;->US:Ljava/util/Locale;
 
-    move-result-object v14
+    invoke-virtual {v3, v8}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
-    sget-object v2, Ljava/util/Locale;->US:Ljava/util/Locale;
+    move-result-object v3
 
-    invoke-virtual {v14, v2}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+    sget-object v8, Lokhttp3/l;->bXR:Ljava/util/regex/Pattern;
 
-    move-result-object v2
+    invoke-virtual {v8}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
 
-    sget-object v14, Lokhttp3/l;->bYx:Ljava/util/regex/Pattern;
+    move-result-object v8
 
-    invoke-virtual {v14}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
+    invoke-virtual {v8, v3}, Ljava/lang/String;->indexOf(Ljava/lang/String;)I
 
-    move-result-object v14
+    move-result v3
 
-    invoke-virtual {v14, v2}, Ljava/lang/String;->indexOf(Ljava/lang/String;)I
+    div-int/lit8 v3, v3, 0x4
 
-    move-result v2
+    move/from16 v25, v5
 
-    div-int/lit8 v2, v2, 0x4
-
-    move/from16 v26, v2
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
-    const/4 v2, -0x1
+    const/4 v8, -0x1
 
     :cond_8
-    if-ne v4, v2, :cond_9
+    if-ne v12, v8, :cond_9
 
-    sget-object v2, Lokhttp3/l;->bYw:Ljava/util/regex/Pattern;
+    sget-object v8, Lokhttp3/l;->bXQ:Ljava/util/regex/Pattern;
 
-    invoke-virtual {v7, v2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
 
-    move-result-object v2
+    move-result-object v8
 
-    invoke-virtual {v2}, Ljava/util/regex/Matcher;->matches()Z
+    invoke-virtual {v8}, Ljava/util/regex/Matcher;->matches()Z
 
-    move-result v2
+    move-result v8
 
-    if-eqz v2, :cond_9
+    if-eqz v8, :cond_9
 
-    const/4 v2, 0x1
+    const/4 v8, 0x1
 
-    invoke-virtual {v7, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {v11, v8}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v12
 
-    invoke-static {v4}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+    invoke-static {v12}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
 
-    move-result v2
+    move-result v8
 
-    move v4, v2
+    move/from16 v25, v5
+
+    move v12, v8
+
+    goto :goto_3
 
     :cond_9
-    move/from16 v27, v10
+    move/from16 v25, v5
 
-    move/from16 v26, v14
+    :goto_3
+    add-int/lit8 v10, v10, 0x1
 
-    :goto_5
-    add-int/lit8 v12, v12, 0x1
+    const/4 v5, 0x0
 
-    const/4 v2, 0x0
+    invoke-static {v14, v10, v4, v5}, Lokhttp3/l;->a(Ljava/lang/String;IIZ)I
 
-    invoke-static {v13, v12, v6, v2}, Lokhttp3/l;->a(Ljava/lang/String;IIZ)I
-
-    move-result v14
+    move-result v8
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object/from16 v2, p3
+    move v5, v8
 
-    const/4 v10, 0x1
+    const/4 v8, 0x1
 
     goto/16 :goto_2
 
     :cond_a
-    move/from16 v14, v26
+    move/from16 v5, v25
 
-    move/from16 v10, v27
+    const/16 v4, 0x46
 
-    const/16 v2, 0x46
+    if-lt v12, v4, :cond_b
 
-    if-lt v4, v2, :cond_b
+    const/16 v4, 0x63
 
-    const/16 v2, 0x63
+    if-gt v12, v4, :cond_b
 
-    if-gt v4, v2, :cond_b
-
-    add-int/lit16 v4, v4, 0x76c
+    add-int/lit16 v12, v12, 0x76c
 
     :cond_b
-    if-ltz v4, :cond_c
+    if-ltz v12, :cond_c
 
-    const/16 v2, 0x45
+    const/16 v4, 0x45
 
-    if-gt v4, v2, :cond_c
+    if-gt v12, v4, :cond_c
 
-    add-int/lit16 v4, v4, 0x7d0
+    add-int/lit16 v12, v12, 0x7d0
 
     :cond_c
-    const/16 v2, 0x641
+    const/16 v4, 0x641
 
-    if-lt v4, v2, :cond_13
+    if-lt v12, v4, :cond_13
 
-    const/4 v2, -0x1
+    const/4 v8, -0x1
 
-    if-eq v14, v2, :cond_12
+    if-eq v3, v8, :cond_12
 
-    if-lez v10, :cond_11
+    if-lez v5, :cond_11
 
-    const/16 v6, 0x1f
+    const/16 v4, 0x1f
 
-    if-gt v10, v6, :cond_11
+    if-gt v5, v4, :cond_11
 
-    if-ltz v5, :cond_10
+    if-ltz v2, :cond_10
 
-    const/16 v6, 0x17
+    const/16 v4, 0x17
 
-    if-gt v5, v6, :cond_10
+    if-gt v2, v4, :cond_10
 
-    move/from16 v12, v28
+    move/from16 v10, v26
 
-    if-ltz v12, :cond_e
+    if-ltz v10, :cond_e
 
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
-    if-gt v12, v7, :cond_f
+    if-gt v10, v11, :cond_f
 
-    move/from16 v6, v29
+    move/from16 v4, v27
 
-    if-ltz v6, :cond_d
+    if-ltz v4, :cond_d
 
-    if-gt v6, v7, :cond_d
+    if-gt v4, v11, :cond_d
 
     :try_start_1
-    new-instance v13, Ljava/util/GregorianCalendar;
+    new-instance v14, Ljava/util/GregorianCalendar;
 
-    sget-object v2, Lokhttp3/internal/c;->cba:Ljava/util/TimeZone;
+    sget-object v8, Lokhttp3/internal/c;->cau:Ljava/util/TimeZone;
 
-    invoke-direct {v13, v2}, Ljava/util/GregorianCalendar;-><init>(Ljava/util/TimeZone;)V
+    invoke-direct {v14, v8}, Ljava/util/GregorianCalendar;-><init>(Ljava/util/TimeZone;)V
 
-    const/4 v2, 0x0
+    const/4 v8, 0x0
 
-    invoke-virtual {v13, v2}, Ljava/util/Calendar;->setLenient(Z)V
+    invoke-virtual {v14, v8}, Ljava/util/Calendar;->setLenient(Z)V
 
-    const/4 v2, 0x1
+    const/4 v8, 0x1
 
-    invoke-virtual {v13, v2, v4}, Ljava/util/Calendar;->set(II)V
+    invoke-virtual {v14, v8, v12}, Ljava/util/Calendar;->set(II)V
 
-    add-int/lit8 v2, v14, -0x1
+    add-int/lit8 v3, v3, -0x1
 
-    const/4 v4, 0x2
+    const/4 v8, 0x2
 
-    invoke-virtual {v13, v4, v2}, Ljava/util/Calendar;->set(II)V
+    invoke-virtual {v14, v8, v3}, Ljava/util/Calendar;->set(II)V
 
-    const/4 v2, 0x5
+    const/4 v3, 0x5
 
-    invoke-virtual {v13, v2, v10}, Ljava/util/Calendar;->set(II)V
+    invoke-virtual {v14, v3, v5}, Ljava/util/Calendar;->set(II)V
 
-    const/16 v2, 0xb
+    const/16 v3, 0xb
 
-    invoke-virtual {v13, v2, v5}, Ljava/util/Calendar;->set(II)V
+    invoke-virtual {v14, v3, v2}, Ljava/util/Calendar;->set(II)V
 
     const/16 v2, 0xc
 
-    invoke-virtual {v13, v2, v12}, Ljava/util/Calendar;->set(II)V
+    invoke-virtual {v14, v2, v10}, Ljava/util/Calendar;->set(II)V
 
     const/16 v2, 0xd
 
-    invoke-virtual {v13, v2, v6}, Ljava/util/Calendar;->set(II)V
+    invoke-virtual {v14, v2, v4}, Ljava/util/Calendar;->set(II)V
 
     const/16 v2, 0xe
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    invoke-virtual {v13, v2, v4}, Ljava/util/Calendar;->set(II)V
+    invoke-virtual {v14, v2, v3}, Ljava/util/Calendar;->set(II)V
 
-    invoke-virtual {v13}, Ljava/util/Calendar;->getTimeInMillis()J
+    invoke-virtual {v14}, Ljava/util/Calendar;->getTimeInMillis()J
 
-    move-result-wide v4
+    move-result-wide v2
 
-    move-wide/from16 v19, v4
+    move-wide/from16 v20, v2
 
-    goto :goto_6
+    const/4 v2, 0x1
+
+    const/16 v24, 0x1
+
+    goto/16 :goto_5
 
     :cond_d
     new-instance v2, Ljava/lang/IllegalArgumentException;
@@ -871,7 +868,7 @@
     throw v2
 
     :cond_e
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
     :cond_f
     new-instance v2, Ljava/lang/IllegalArgumentException;
@@ -881,7 +878,7 @@
     throw v2
 
     :cond_10
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
     new-instance v2, Ljava/lang/IllegalArgumentException;
 
@@ -890,7 +887,7 @@
     throw v2
 
     :cond_11
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
     new-instance v2, Ljava/lang/IllegalArgumentException;
 
@@ -899,7 +896,7 @@
     throw v2
 
     :cond_12
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
     new-instance v2, Ljava/lang/IllegalArgumentException;
 
@@ -908,7 +905,7 @@
     throw v2
 
     :cond_13
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
     new-instance v2, Ljava/lang/IllegalArgumentException;
 
@@ -919,41 +916,48 @@
     .catch Ljava/lang/IllegalArgumentException; {:try_start_1 .. :try_end_1} :catch_1
 
     :catch_0
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
-    goto :goto_8
+    :catch_1
+    const/4 v2, 0x1
+
+    goto/16 :goto_5
 
     :cond_14
-    const/16 v7, 0x3b
+    const/16 v11, 0x3b
 
     const-string v2, "max-age"
 
-    invoke-virtual {v6, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v4, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
     move-result v2
 
     if-eqz v2, :cond_15
 
     :try_start_2
-    invoke-static {v13}, Lokhttp3/l;->eg(Ljava/lang/String;)J
+    invoke-static {v14}, Lokhttp3/l;->eg(Ljava/lang/String;)J
 
-    move-result-wide v4
+    move-result-wide v2
     :try_end_2
-    .catch Ljava/lang/NumberFormatException; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Ljava/lang/NumberFormatException; {:try_start_2 .. :try_end_2} :catch_2
 
-    move-wide/from16 v17, v4
+    move-wide v15, v2
 
-    :goto_6
     const/4 v2, 0x1
 
-    const/16 v25, 0x1
+    const/16 v24, 0x1
 
-    goto :goto_9
+    goto :goto_5
+
+    :catch_2
+    const/4 v2, 0x1
+
+    goto :goto_5
 
     :cond_15
     const-string v2, "domain"
 
-    invoke-virtual {v6, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v4, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -962,7 +966,7 @@
     :try_start_3
     const-string v2, "."
 
-    invoke-virtual {v13, v2}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
+    invoke-virtual {v14, v2}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -970,202 +974,203 @@
 
     const-string v2, "."
 
-    invoke-virtual {v13, v2}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+    invoke-virtual {v14, v2}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
     move-result v2
     :try_end_3
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_3 .. :try_end_3} :catch_1
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_3 .. :try_end_3} :catch_3
 
     if-eqz v2, :cond_16
 
     const/4 v2, 0x1
 
     :try_start_4
-    invoke-virtual {v13, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+    invoke-virtual {v14, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
-    move-result-object v13
+    move-result-object v14
 
-    goto :goto_7
+    goto :goto_4
 
     :cond_16
     const/4 v2, 0x1
 
-    :goto_7
-    invoke-static {v13}, Lokhttp3/internal/c;->ex(Ljava/lang/String;)Ljava/lang/String;
+    :goto_4
+    invoke-static {v14}, Lokhttp3/internal/c;->ex(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-eqz v4, :cond_17
+    if-eqz v3, :cond_17
 
-    move-object v9, v4
+    move-object v7, v3
 
-    const/16 v24, 0x0
+    const/16 v23, 0x0
 
-    goto :goto_9
+    goto :goto_5
 
     :cond_17
-    new-instance v4, Ljava/lang/IllegalArgumentException;
+    new-instance v3, Ljava/lang/IllegalArgumentException;
 
-    invoke-direct {v4}, Ljava/lang/IllegalArgumentException;-><init>()V
+    invoke-direct {v3}, Ljava/lang/IllegalArgumentException;-><init>()V
 
-    throw v4
+    throw v3
 
     :cond_18
     const/4 v2, 0x1
 
-    new-instance v4, Ljava/lang/IllegalArgumentException;
+    new-instance v3, Ljava/lang/IllegalArgumentException;
 
-    invoke-direct {v4}, Ljava/lang/IllegalArgumentException;-><init>()V
+    invoke-direct {v3}, Ljava/lang/IllegalArgumentException;-><init>()V
 
-    throw v4
+    throw v3
     :try_end_4
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_4 .. :try_end_4} :catch_2
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_4 .. :try_end_4} :catch_4
 
-    :catch_1
-    :goto_8
+    :catch_3
     const/4 v2, 0x1
 
-    goto :goto_9
+    goto :goto_5
 
     :cond_19
     const/4 v2, 0x1
 
-    const-string v4, "path"
+    const-string v3, "path"
 
-    invoke-virtual {v6, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v4, v3}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_1a
+    if-eqz v3, :cond_1a
 
-    move-object/from16 v21, v13
+    move-object/from16 v19, v14
 
-    goto :goto_9
+    goto :goto_5
 
     :cond_1a
-    const-string v4, "secure"
+    const-string v3, "secure"
 
-    invoke-virtual {v6, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+    invoke-virtual {v4, v3}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_1b
+    if-eqz v3, :cond_1b
+
+    const/16 v18, 0x1
+
+    goto :goto_5
+
+    :cond_1b
+    const-string v3, "httponly"
+
+    invoke-virtual {v4, v3}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1c
 
     const/16 v22, 0x1
 
-    goto :goto_9
-
-    :cond_1b
-    const-string v4, "httponly"
-
-    invoke-virtual {v6, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1c
-
-    const/16 v23, 0x1
-
-    :catch_2
+    :catch_4
     :cond_1c
-    :goto_9
-    add-int/lit8 v6, v15, 0x1
+    :goto_5
+    add-int/lit8 v4, v13, 0x1
 
-    move-object/from16 v2, p3
+    const/16 v2, 0x3b
 
-    const/16 v4, 0x3b
+    const/4 v3, 0x0
 
-    const/4 v5, 0x0
+    const/16 v5, 0x3d
 
-    const/16 v7, 0x3d
+    const/4 v8, 0x1
 
-    const/4 v10, 0x1
-
-    const/4 v12, -0x1
+    const/4 v10, -0x1
 
     goto/16 :goto_0
 
     :cond_1d
-    const-wide/high16 v2, -0x8000000000000000L
+    const-wide/high16 v0, -0x8000000000000000L
 
-    cmp-long v4, v17, v2
+    cmp-long v2, v15, v0
 
-    if-nez v4, :cond_1f
+    if-nez v2, :cond_1e
+
+    move-wide v11, v0
+
+    move-object/from16 v0, p2
+
+    goto :goto_8
 
     :cond_1e
-    move-object/from16 v0, p2
+    const-wide/16 v0, -0x1
 
-    move-wide v13, v2
+    cmp-long v2, v15, v0
 
-    goto :goto_c
+    if-eqz v2, :cond_22
+
+    const-wide v0, 0x20c49ba5e353f7L
+
+    cmp-long v2, v15, v0
+
+    if-gtz v2, :cond_1f
+
+    const-wide/16 v0, 0x3e8
+
+    mul-long v15, v15, v0
+
+    goto :goto_6
 
     :cond_1f
-    const-wide/16 v2, -0x1
+    const-wide v15, 0x7fffffffffffffffL
 
-    cmp-long v4, v17, v2
+    :goto_6
+    add-long v0, p0, v15
 
-    if-eqz v4, :cond_22
+    cmp-long v2, v0, p0
 
-    const-wide v2, 0x20c49ba5e353f7L
+    if-ltz v2, :cond_21
 
-    cmp-long v4, v17, v2
+    const-wide v2, 0xe677d21fdbffL
 
-    if-gtz v4, :cond_20
+    cmp-long v4, v0, v2
 
-    const-wide/16 v2, 0x3e8
+    if-lez v4, :cond_20
 
-    mul-long v17, v17, v2
-
-    goto :goto_a
+    goto :goto_7
 
     :cond_20
-    const-wide v17, 0x7fffffffffffffffL
-
-    :goto_a
-    const/4 v2, 0x0
-
-    add-long v2, p0, v17
-
-    cmp-long v4, v2, p0
-
-    if-ltz v4, :cond_21
-
-    const-wide v0, 0xe677d21fdbffL
-
-    cmp-long v4, v2, v0
-
-    if-lez v4, :cond_1e
-
-    goto :goto_b
-
-    :cond_21
-    const-wide v0, 0xe677d21fdbffL
-
-    :goto_b
-    move-wide v13, v0
+    move-wide v11, v0
 
     move-object/from16 v0, p2
 
-    goto :goto_c
+    goto :goto_8
+
+    :cond_21
+    const-wide v2, 0xe677d21fdbffL
+
+    :goto_7
+    move-object/from16 v0, p2
+
+    move-wide v11, v2
+
+    goto :goto_8
 
     :cond_22
     move-object/from16 v0, p2
 
-    move-wide/from16 v13, v19
+    move-wide/from16 v11, v20
 
-    :goto_c
-    iget-object v1, v0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    :goto_8
+    iget-object v1, v0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    if-nez v9, :cond_23
+    if-nez v7, :cond_23
 
-    move-object v15, v1
+    move-object v13, v1
 
     const/4 v2, 0x0
 
-    goto :goto_d
+    goto :goto_9
 
     :cond_23
-    invoke-static {v1, v9}, Lokhttp3/l;->domainMatch(Ljava/lang/String;Ljava/lang/String;)Z
+    invoke-static {v1, v7}, Lokhttp3/l;->domainMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
     move-result v2
 
@@ -1178,24 +1183,24 @@
     :cond_24
     const/4 v2, 0x0
 
-    move-object v15, v9
+    move-object v13, v7
 
-    :goto_d
+    :goto_9
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
     move-result v1
 
-    invoke-virtual {v15}, Ljava/lang/String;->length()I
+    invoke-virtual {v13}, Ljava/lang/String;->length()I
 
     move-result v3
 
-    if-eq v1, v3, :cond_25
+    if-eq v1, v3, :cond_26
 
-    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->IM()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->IL()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     move-result-object v1
 
-    invoke-virtual {v1, v15}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->eI(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v13}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->eI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1204,28 +1209,34 @@
     return-object v2
 
     :cond_25
-    move-object/from16 v9, v21
+    move-object/from16 v7, v19
 
-    if-eqz v9, :cond_27
+    goto :goto_a
+
+    :cond_26
+    move-object/from16 v7, v19
+
+    :goto_a
+    if-eqz v7, :cond_28
 
     const-string v1, "/"
 
-    invoke-virtual {v9, v1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+    invoke-virtual {v7, v1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
     move-result v1
 
-    if-nez v1, :cond_26
+    if-nez v1, :cond_27
 
-    goto :goto_e
-
-    :cond_26
-    move-object/from16 v16, v9
-
-    goto :goto_10
+    goto :goto_b
 
     :cond_27
-    :goto_e
-    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->Ho()Ljava/lang/String;
+    move-object v14, v7
+
+    goto :goto_d
+
+    :cond_28
+    :goto_b
+    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->Hn()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1235,7 +1246,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_28
+    if-eqz v1, :cond_29
 
     const/4 v2, 0x0
 
@@ -1243,36 +1254,36 @@
 
     move-result-object v0
 
-    goto :goto_f
+    goto :goto_c
 
-    :cond_28
+    :cond_29
     const-string v0, "/"
 
-    :goto_f
-    move-object/from16 v16, v0
+    :goto_c
+    move-object v14, v0
 
-    :goto_10
+    :goto_d
     new-instance v0, Lokhttp3/l;
 
-    move-object v10, v0
+    move-object v8, v0
 
-    move-object v12, v8
+    move-object v10, v6
 
-    move/from16 v17, v22
+    move/from16 v15, v18
 
-    move/from16 v18, v23
+    move/from16 v16, v22
 
-    move/from16 v19, v24
+    move/from16 v17, v23
 
-    move/from16 v20, v25
+    move/from16 v18, v24
 
-    invoke-direct/range {v10 .. v20}, Lokhttp3/l;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZ)V
+    invoke-direct/range {v8 .. v18}, Lokhttp3/l;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZ)V
 
     return-object v0
 
-    :cond_29
-    :goto_11
-    move-object v0, v9
+    :cond_2a
+    :goto_e
+    move-object v0, v7
 
     return-object v0
 .end method
@@ -1280,7 +1291,7 @@
 .method public static a(Lokhttp3/s;Ljava/lang/String;)Z
     .locals 2
 
-    invoke-virtual {p0}, Lokhttp3/s;->Ho()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Hn()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1479,9 +1490,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l;->bXV:Ljava/lang/String;
 
-    iget-object v2, p0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1499,35 +1510,35 @@
 
     if-eqz v0, :cond_1
 
-    iget-wide v2, p1, Lokhttp3/l;->bYA:J
+    iget-wide v2, p1, Lokhttp3/l;->bXU:J
 
-    iget-wide v4, p0, Lokhttp3/l;->bYA:J
+    iget-wide v4, p0, Lokhttp3/l;->bXU:J
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bYC:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bXW:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bYC:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bXW:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bYD:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bXX:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bYD:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bXX:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bYE:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bXY:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bYE:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bXY:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean p1, p1, Lokhttp3/l;->bYF:Z
+    iget-boolean p1, p1, Lokhttp3/l;->bXZ:Z
 
-    iget-boolean v0, p0, Lokhttp3/l;->bYF:Z
+    iget-boolean v0, p0, Lokhttp3/l;->bXZ:Z
 
     if-ne p1, v0, :cond_1
 
@@ -1540,7 +1551,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 5
 
     iget-object v0, p0, Lokhttp3/l;->name:Ljava/lang/String;
 
@@ -1562,7 +1573,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -1582,13 +1593,11 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-wide v1, p0, Lokhttp3/l;->bYA:J
+    iget-wide v1, p0, Lokhttp3/l;->bXU:J
 
-    iget-wide v3, p0, Lokhttp3/l;->bYA:J
+    const/16 v3, 0x20
 
-    const/16 v5, 0x20
-
-    ushr-long/2addr v3, v5
+    ushr-long v3, v1, v3
 
     xor-long/2addr v1, v3
 
@@ -1598,7 +1607,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bYC:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXW:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1606,7 +1615,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bYD:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXX:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1614,7 +1623,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bYE:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXY:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1622,7 +1631,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bYF:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXZ:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1650,11 +1659,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lokhttp3/l;->bYE:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXY:Z
 
     if-eqz v1, :cond_1
 
-    iget-wide v1, p0, Lokhttp3/l;->bYA:J
+    iget-wide v1, p0, Lokhttp3/l;->bXU:J
 
     const-wide/high16 v3, -0x8000000000000000L
 
@@ -1664,10 +1673,9 @@
 
     const-string v1, "; max-age=0"
 
-    :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v1, "; expires="
@@ -1676,7 +1684,7 @@
 
     new-instance v1, Ljava/util/Date;
 
-    iget-wide v2, p0, Lokhttp3/l;->bYA:J
+    iget-wide v2, p0, Lokhttp3/l;->bXU:J
 
     invoke-direct {v1, v2, v3}, Ljava/util/Date;-><init>(J)V
 
@@ -1684,11 +1692,11 @@
 
     move-result-object v1
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_1
-    :goto_1
-    iget-boolean v1, p0, Lokhttp3/l;->bYF:Z
+    :goto_0
+    iget-boolean v1, p0, Lokhttp3/l;->bXZ:Z
 
     if-nez v1, :cond_2
 
@@ -1696,7 +1704,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/l;->bYB:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bXV:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1709,7 +1717,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lokhttp3/l;->bYC:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXW:Z
 
     if-eqz v1, :cond_3
 
@@ -1718,7 +1726,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_3
-    iget-boolean v1, p0, Lokhttp3/l;->bYD:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bXX:Z
 
     if-eqz v1, :cond_4
 
diff --git a/com.discord/smali/okhttp3/n.smali b/com.discord/smali/okhttp3/n.smali
index 0b8eeefecf..832325f813 100644
--- a/com.discord/smali/okhttp3/n.smali
+++ b/com.discord/smali/okhttp3/n.smali
@@ -1,18 +1,19 @@
 .class public final Lokhttp3/n;
 .super Ljava/lang/Object;
+.source "Dispatcher.java"
 
 
 # instance fields
-.field private bYH:I
+.field private bYb:I
 
-.field private bYI:I
+.field private bYc:I
 
-.field private bYJ:Ljava/lang/Runnable;
+.field private bYd:Ljava/lang/Runnable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bYK:Ljava/util/Deque;
+.field private final bYe:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -22,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final bYL:Ljava/util/Deque;
+.field private final bYf:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -32,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final bYM:Ljava/util/Deque;
+.field private final bYg:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -56,34 +57,34 @@
 
     const/16 v0, 0x40
 
-    iput v0, p0, Lokhttp3/n;->bYH:I
+    iput v0, p0, Lokhttp3/n;->bYb:I
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/n;->bYI:I
+    iput v0, p0, Lokhttp3/n;->bYc:I
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bYK:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bYe:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bYM:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bYg:Ljava/util/Deque;
 
     return-void
 .end method
 
-.method private declared-synchronized Hd()Ljava/util/concurrent/ExecutorService;
+.method private declared-synchronized Hc()Ljava/util/concurrent/ExecutorService;
     .locals 9
 
     monitor-enter p0
@@ -138,23 +139,23 @@
     throw v0
 .end method
 
-.method private He()V
+.method private Hd()V
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->size()I
 
     move-result v0
 
-    iget v1, p0, Lokhttp3/n;->bYH:I
+    iget v1, p0, Lokhttp3/n;->bYb:I
 
     if-lt v0, v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/n;->bYK:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYe:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->isEmpty()Z
 
@@ -165,7 +166,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/n;->bYK:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYe:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -188,50 +189,52 @@
 
     move-result v2
 
-    iget v3, p0, Lokhttp3/n;->bYI:I
+    iget v3, p0, Lokhttp3/n;->bYc:I
 
     if-ge v2, v3, :cond_3
 
     invoke-interface {v0}, Ljava/util/Iterator;->remove()V
 
-    iget-object v2, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v2, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v2, v1}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/n;->Hd()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lokhttp3/n;->Hc()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v2
 
     invoke-interface {v2, v1}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
 
     :cond_3
-    iget-object v1, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v1}, Ljava/util/Deque;->size()I
 
     move-result v1
 
-    iget v2, p0, Lokhttp3/n;->bYH:I
+    iget v2, p0, Lokhttp3/n;->bYb:I
 
     if-lt v1, v2, :cond_2
 
+    return-void
+
     :cond_4
     return-void
 .end method
 
-.method private declared-synchronized Hf()I
+.method private declared-synchronized He()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/n;->bYM:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->bYg:Ljava/util/Deque;
 
     invoke-interface {v1}, Ljava/util/Deque;->size()I
 
@@ -276,14 +279,14 @@
 
     if-eqz p3, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/n;->He()V
+    invoke-direct {p0}, Lokhttp3/n;->Hd()V
 
     :cond_0
-    invoke-direct {p0}, Lokhttp3/n;->Hf()I
+    invoke-direct {p0}, Lokhttp3/n;->He()I
 
     move-result p1
 
-    iget-object p2, p0, Lokhttp3/n;->bYJ:Ljava/lang/Runnable;
+    iget-object p2, p0, Lokhttp3/n;->bYd:Ljava/lang/Runnable;
 
     monitor-exit p0
     :try_end_0
@@ -321,7 +324,7 @@
 .method private b(Lokhttp3/v$a;)I
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -343,17 +346,17 @@
 
     check-cast v2, Lokhttp3/v$a;
 
-    iget-object v3, v2, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v3, v2, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    iget-boolean v3, v3, Lokhttp3/v;->caf:Z
+    iget-boolean v3, v3, Lokhttp3/v;->bZz:Z
 
     if-nez v3, :cond_0
 
-    invoke-virtual {v2}, Lokhttp3/v$a;->HD()Ljava/lang/String;
+    invoke-virtual {v2}, Lokhttp3/v$a;->HC()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lokhttp3/v$a;->HD()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v$a;->HC()Ljava/lang/String;
 
     move-result-object v3
 
@@ -379,13 +382,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->size()I
 
     move-result v0
 
-    iget v1, p0, Lokhttp3/n;->bYH:I
+    iget v1, p0, Lokhttp3/n;->bYb:I
 
     if-ge v0, v1, :cond_0
 
@@ -393,15 +396,15 @@
 
     move-result v0
 
-    iget v1, p0, Lokhttp3/n;->bYI:I
+    iget v1, p0, Lokhttp3/n;->bYc:I
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v0, p1}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/n;->Hd()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lokhttp3/n;->Hc()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -415,7 +418,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lokhttp3/n;->bYK:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYe:Ljava/util/Deque;
 
     invoke-interface {v0, p1}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
     :try_end_1
@@ -439,7 +442,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->bYM:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYg:Ljava/util/Deque;
 
     invoke-interface {v0, p1}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -460,7 +463,7 @@
 .method final b(Lokhttp3/v;)V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/n;->bYM:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYg:Ljava/util/Deque;
 
     const/4 v1, 0x0
 
@@ -472,7 +475,7 @@
 .method final c(Lokhttp3/v$a;)V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     const/4 v1, 0x1
 
@@ -487,7 +490,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->bYK:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYe:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -506,16 +509,16 @@
 
     check-cast v1, Lokhttp3/v$a;
 
-    iget-object v1, v1, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/n;->bYL:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYf:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -534,16 +537,16 @@
 
     check-cast v1, Lokhttp3/v$a;
 
-    iget-object v1, v1, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/n;->bYM:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bYg:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -562,7 +565,7 @@
 
     check-cast v1, Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
     :try_end_0
@@ -581,4 +584,6 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali/okhttp3/q.smali b/com.discord/smali/okhttp3/q.smali
index 4788bd1dbd..8e82944f99 100644
--- a/com.discord/smali/okhttp3/q.smali
+++ b/com.discord/smali/okhttp3/q.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/q;
 .super Lokhttp3/RequestBody;
+.source "FormBody.java"
 
 
 # annotations
@@ -11,11 +12,11 @@
 
 
 # static fields
-.field private static final bYQ:Lokhttp3/MediaType;
+.field private static final bYk:Lokhttp3/MediaType;
 
 
 # instance fields
-.field private final bYR:Ljava/util/List;
+.field private final bYl:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final bYS:Ljava/util/List;
+.field private final bYm:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,7 +47,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/q;->bYQ:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/q;->bYk:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -71,13 +72,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/q;->bYR:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->bYl:Ljava/util/List;
 
     invoke-static {p2}, Lokhttp3/internal/c;->aw(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/q;->bYS:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->bYm:Ljava/util/List;
 
     return-void
 .end method
@@ -98,14 +99,14 @@
     goto :goto_0
 
     :cond_0
-    invoke-interface {p1}, Lokio/BufferedSink;->IX()Lokio/c;
+    invoke-interface {p1}, Lokio/BufferedSink;->IW()Lokio/c;
 
     move-result-object p1
 
     :goto_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lokhttp3/q;->bYR:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/q;->bYl:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -121,7 +122,7 @@
     invoke-virtual {p1, v2}, Lokio/c;->fs(I)Lokio/c;
 
     :cond_1
-    iget-object v2, p0, Lokhttp3/q;->bYR:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->bYl:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -135,7 +136,7 @@
 
     invoke-virtual {p1, v2}, Lokio/c;->fs(I)Lokio/c;
 
-    iget-object v2, p0, Lokhttp3/q;->bYS:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->bYm:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -184,7 +185,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    sget-object v0, Lokhttp3/q;->bYQ:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/q;->bYk:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/r.smali b/com.discord/smali/okhttp3/r.smali
index 97e4232fde..c83dfed165 100644
--- a/com.discord/smali/okhttp3/r.smali
+++ b/com.discord/smali/okhttp3/r.smali
@@ -1,13 +1,14 @@
 .class public final Lokhttp3/r;
 .super Ljava/lang/Object;
+.source "Handshake.java"
 
 
 # instance fields
-.field private final bYV:Lokhttp3/z;
+.field private final bYp:Lokhttp3/z;
 
-.field public final bYW:Lokhttp3/h;
+.field public final bYq:Lokhttp3/h;
 
-.field public final bYX:Ljava/util/List;
+.field public final bYr:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -17,7 +18,7 @@
     .end annotation
 .end field
 
-.field private final bYY:Ljava/util/List;
+.field private final bYs:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,13 +48,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/r;->bYV:Lokhttp3/z;
+    iput-object p1, p0, Lokhttp3/r;->bYp:Lokhttp3/z;
 
-    iput-object p2, p0, Lokhttp3/r;->bYW:Lokhttp3/h;
+    iput-object p2, p0, Lokhttp3/r;->bYq:Lokhttp3/h;
 
-    iput-object p3, p0, Lokhttp3/r;->bYX:Ljava/util/List;
+    iput-object p3, p0, Lokhttp3/r;->bYr:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/r;->bYY:Ljava/util/List;
+    iput-object p4, p0, Lokhttp3/r;->bYs:Ljava/util/List;
 
     return-void
 .end method
@@ -210,9 +211,9 @@
     :cond_0
     check-cast p1, Lokhttp3/r;
 
-    iget-object v0, p0, Lokhttp3/r;->bYV:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->bYp:Lokhttp3/z;
 
-    iget-object v2, p1, Lokhttp3/r;->bYV:Lokhttp3/z;
+    iget-object v2, p1, Lokhttp3/r;->bYp:Lokhttp3/z;
 
     invoke-virtual {v0, v2}, Lokhttp3/z;->equals(Ljava/lang/Object;)Z
 
@@ -220,9 +221,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/r;->bYW:Lokhttp3/h;
+    iget-object v0, p0, Lokhttp3/r;->bYq:Lokhttp3/h;
 
-    iget-object v2, p1, Lokhttp3/r;->bYW:Lokhttp3/h;
+    iget-object v2, p1, Lokhttp3/r;->bYq:Lokhttp3/h;
 
     invoke-virtual {v0, v2}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -230,9 +231,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/r;->bYX:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->bYr:Ljava/util/List;
 
-    iget-object v2, p1, Lokhttp3/r;->bYX:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/r;->bYr:Ljava/util/List;
 
     invoke-interface {v0, v2}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -240,9 +241,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/r;->bYY:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->bYs:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/r;->bYY:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/r;->bYs:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -261,7 +262,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/r;->bYV:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->bYp:Lokhttp3/z;
 
     invoke-virtual {v0}, Lokhttp3/z;->hashCode()I
 
@@ -271,7 +272,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/r;->bYW:Lokhttp3/h;
+    iget-object v1, p0, Lokhttp3/r;->bYq:Lokhttp3/h;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -281,7 +282,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/r;->bYX:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->bYr:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
@@ -291,7 +292,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/r;->bYY:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->bYs: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 1f62c414c9..67cdee73ec 100644
--- a/com.discord/smali/okhttp3/s$a.smali
+++ b/com.discord/smali/okhttp3/s$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/s$a;
 .super Ljava/lang/Object;
+.source "HttpUrl.java"
 
 
 # annotations
@@ -14,21 +15,11 @@
 
 
 # instance fields
-.field bZc:Ljava/lang/String;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field bYA:Ljava/lang/String;
 
-.field bZd:Ljava/lang/String;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field bYB:Ljava/lang/String;
 
-.field bZg:Ljava/lang/String;
-
-.field bZh:Ljava/lang/String;
-
-.field final bZi:Ljava/util/List;
+.field final bYC:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,7 +29,7 @@
     .end annotation
 .end field
 
-.field bZj:Ljava/util/List;
+.field bYD:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -51,7 +42,17 @@
     .end annotation
 .end field
 
-.field bZk:Ljava/lang/String;
+.field bYE:Ljava/lang/String;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field bYw:Ljava/lang/String;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field bYx:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -67,11 +68,11 @@
 
     const-string v0, ""
 
-    iput-object v0, p0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     const-string v0, ""
 
-    iput-object v0, p0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     const/4 v0, -0x1
 
@@ -81,9 +82,9 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     const-string v1, ""
 
@@ -117,11 +118,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -135,22 +134,22 @@
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     const-string v1, ""
 
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto/16 :goto_8
+    add-int/lit8 p2, p2, 0x1
 
-    :cond_3
     :goto_1
     move v4, p2
 
+    :goto_2
     if-ge v4, p3, :cond_d
 
     const-string p2, "/\\"
@@ -161,16 +160,16 @@
 
     const/4 v0, 0x0
 
-    if-ge p2, p3, :cond_4
+    if-ge p2, p3, :cond_3
 
     const/4 v1, 0x1
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_4
+    :cond_3
     const/4 v1, 0x0
 
-    :goto_2
+    :goto_3
     const-string v6, " \"<>^`{}|/\\?#"
 
     const/4 v7, 0x1
@@ -197,7 +196,7 @@
 
     move-result v4
 
-    if-nez v4, :cond_6
+    if-nez v4, :cond_5
 
     const-string v4, "%2e"
 
@@ -205,21 +204,21 @@
 
     move-result v4
 
-    if-eqz v4, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v4, 0x0
+    if-eqz v4, :cond_4
 
     goto :goto_4
 
-    :cond_6
-    :goto_3
+    :cond_4
+    const/4 v4, 0x0
+
+    goto :goto_5
+
+    :cond_5
+    :goto_4
     const/4 v4, 0x1
 
-    :goto_4
-    if-nez v4, :cond_c
+    :goto_5
+    if-nez v4, :cond_b
 
     const-string v4, ".."
 
@@ -227,7 +226,7 @@
 
     move-result v4
 
-    if-nez v4, :cond_7
+    if-nez v4, :cond_6
 
     const-string v4, "%2e."
 
@@ -235,7 +234,7 @@
 
     move-result v4
 
-    if-nez v4, :cond_7
+    if-nez v4, :cond_6
 
     const-string v4, ".%2e"
 
@@ -243,7 +242,7 @@
 
     move-result v4
 
-    if-nez v4, :cond_7
+    if-nez v4, :cond_6
 
     const-string v4, "%2e%2e"
 
@@ -251,19 +250,17 @@
 
     move-result v4
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_7
 
-    :cond_7
+    :cond_6
     const/4 v0, 0x1
 
-    :cond_8
-    if-eqz v0, :cond_a
+    :cond_7
+    if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    iget-object v3, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
-
-    invoke-interface {v3}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v3
 
@@ -279,21 +276,19 @@
 
     move-result v0
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
     move-result v0
 
-    if-nez v0, :cond_9
+    if-nez v0, :cond_8
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    iget-object v3, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
-
-    invoke-interface {v3}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v3
 
@@ -305,9 +300,8 @@
 
     goto :goto_7
 
-    :cond_9
-    :goto_5
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    :cond_8
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     const-string v3, ""
 
@@ -315,12 +309,10 @@
 
     goto :goto_7
 
-    :cond_a
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    :cond_9
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    iget-object v4, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v4
 
@@ -336,13 +328,11 @@
 
     move-result v0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    iget-object v4, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v4
 
@@ -352,24 +342,30 @@
 
     goto :goto_6
 
-    :cond_b
-    iget-object v0, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    :cond_a
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-interface {v0, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :goto_6
+    if-eqz v1, :cond_b
+
+    iget-object v0, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
+
+    const-string v3, ""
+
+    invoke-interface {v0, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_b
+    :goto_7
     if-eqz v1, :cond_c
 
-    goto :goto_5
-
-    :cond_c
-    :goto_7
-    if-eqz v1, :cond_3
-
-    :goto_8
     add-int/lit8 p2, p2, 0x1
 
-    goto/16 :goto_1
+    :cond_c
+    move v4, p2
+
+    goto/16 :goto_2
 
     :cond_d
     return-void
@@ -395,18 +391,18 @@
 
     const/16 v2, 0x5a
 
-    const/16 v3, 0x41
+    const/16 v3, 0x7a
 
-    const/16 v4, 0x7a
+    const/16 v4, 0x41
 
     const/16 v5, 0x61
 
     if-lt v0, v5, :cond_1
 
-    if-le v0, v4, :cond_2
+    if-le v0, v3, :cond_2
 
     :cond_1
-    if-lt v0, v3, :cond_6
+    if-lt v0, v4, :cond_8
 
     if-le v0, v2, :cond_2
 
@@ -415,7 +411,7 @@
     :cond_2
     add-int/lit8 p1, p1, 0x1
 
-    if-ge p1, p2, :cond_6
+    if-ge p1, p2, :cond_7
 
     invoke-virtual {p0, p1}, Ljava/lang/String;->charAt(I)C
 
@@ -423,10 +419,10 @@
 
     if-lt v0, v5, :cond_3
 
-    if-le v0, v4, :cond_2
+    if-le v0, v3, :cond_2
 
     :cond_3
-    if-lt v0, v3, :cond_4
+    if-lt v0, v4, :cond_4
 
     if-le v0, v2, :cond_2
 
@@ -459,6 +455,12 @@
     return p1
 
     :cond_6
+    return v1
+
+    :cond_7
+    return v1
+
+    :cond_8
     :goto_0
     return v1
 .end method
@@ -598,14 +600,16 @@
 
     return p0
 
-    :catch_0
     :cond_0
     return v0
+
+    :catch_0
+    return v0
 .end method
 
 
 # virtual methods
-.method final Hs()I
+.method final Hr()I
     .locals 2
 
     iget v0, p0, Lokhttp3/s$a;->port:I
@@ -614,12 +618,10 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lokhttp3/s$a;->port:I
-
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     invoke-static {v0}, Lokhttp3/s;->ej(Ljava/lang/String;)I
 
@@ -628,14 +630,14 @@
     return v0
 .end method
 
-.method public final Ht()Lokhttp3/s;
+.method public final Hs()Lokhttp3/s;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -673,7 +675,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -681,10 +683,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     const-string v2, " !\"#$&\'(),/:;<=>?@[]\\^`{|}~"
 
@@ -704,7 +706,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -753,7 +755,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -761,10 +763,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     const-string v2, " \"\'<>#&="
 
@@ -784,7 +786,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -883,7 +885,7 @@
 
     const-string v2, "https"
 
-    iput-object v2, v0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     add-int/lit8 v9, v9, 0x6
 
@@ -910,7 +912,7 @@
 
     const-string v2, "http"
 
-    iput-object v2, v0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     add-int/lit8 v9, v9, 0x5
 
@@ -946,9 +948,9 @@
     :cond_2
     if-eqz v1, :cond_11
 
-    iget-object v2, v1, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v2, v1, Lokhttp3/s;->bYw:Ljava/lang/String;
 
-    iput-object v2, v0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     :goto_0
     invoke-static {v10, v9, v11}, Lokhttp3/s$a;->h(Ljava/lang/String;II)I
@@ -963,9 +965,9 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v3, v1, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v3, v1, Lokhttp3/s;->bYw:Ljava/lang/String;
 
-    iget-object v4, v0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iget-object v4, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -976,33 +978,33 @@
     goto :goto_1
 
     :cond_3
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hl()Ljava/lang/String;
+
+    move-result-object v2
+
+    iput-object v2, v0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
+
     invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hm()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hn()Ljava/lang/String;
+    iget-object v2, v1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    move-result-object v2
-
-    iput-object v2, v0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
-
-    iget-object v2, v1, Lokhttp3/s;->bZd:Ljava/lang/String;
-
-    iput-object v2, v0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bYx: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;->bZi:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->clear()V
 
-    iget-object v2, v0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hp()Ljava/util/List;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Ho()Ljava/util/List;
 
     move-result-object v3
 
@@ -1017,7 +1019,7 @@
     if-ne v2, v12, :cond_d
 
     :cond_4
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hq()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hp()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1113,7 +1115,7 @@
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1128,7 +1130,7 @@
     move-result-object v1
 
     :cond_7
-    iput-object v1, v0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     if-eq v14, v12, :cond_8
 
@@ -1154,7 +1156,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     const/4 v15, 0x1
 
@@ -1170,7 +1172,7 @@
 
     invoke-direct {v14}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, v0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     invoke-virtual {v14, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1204,7 +1206,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     :goto_4
     add-int/lit8 v2, v12, 0x1
@@ -1231,7 +1233,7 @@
 
     move-result-object v5
 
-    iput-object v5, v0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iput-object v5, v0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     invoke-static {v10, v3, v12}, Lokhttp3/s$a;->k(Ljava/lang/String;II)I
 
@@ -1275,9 +1277,9 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iput-object v3, v0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
-    iget-object v3, v0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     invoke-static {v3}, Lokhttp3/s;->ej(Ljava/lang/String;)I
 
@@ -1286,7 +1288,7 @@
     iput v3, v0, Lokhttp3/s$a;->port:I
 
     :goto_5
-    iget-object v3, v0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     if-eqz v3, :cond_10
 
@@ -1344,7 +1346,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     move v1, v12
 
@@ -1383,7 +1385,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
     :cond_f
     return-object v0
@@ -1422,6 +1424,10 @@
 
     throw v1
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x3f
         :pswitch_1
@@ -1464,7 +1470,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     return-object p0
 .end method
@@ -1476,7 +1482,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1484,7 +1490,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->isEmpty()Z
 
@@ -1494,7 +1500,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->isEmpty()Z
 
@@ -1503,11 +1509,11 @@
     if-nez v1, :cond_2
 
     :cond_0
-    iget-object v1, p0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->isEmpty()Z
 
@@ -1517,7 +1523,7 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1527,7 +1533,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :cond_2
-    iget-object v1, p0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->indexOf(I)I
 
@@ -1541,7 +1547,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1552,16 +1558,16 @@
     goto :goto_0
 
     :cond_3
-    iget-object v1, p0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :goto_0
-    invoke-virtual {p0}, Lokhttp3/s$a;->Hs()I
+    invoke-virtual {p0}, Lokhttp3/s$a;->Hr()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iget-object v3, p0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
     invoke-static {v3}, Lokhttp3/s;->ej(Ljava/lang/String;)I
 
@@ -1574,11 +1580,11 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     :cond_4
-    iget-object v1, p0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-static {v0, v1}, Lokhttp3/s;->a(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     if-eqz v1, :cond_5
 
@@ -1586,12 +1592,12 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     invoke-static {v0, v1}, Lokhttp3/s;->b(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
     :cond_5
-    iget-object v1, p0, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
     if-eqz v1, :cond_6
 
@@ -1599,7 +1605,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bYE: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 6e5a20a9b2..3e1a22707b 100644
--- a/com.discord/smali/okhttp3/s.smali
+++ b/com.discord/smali/okhttp3/s.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/s;
 .super Ljava/lang/Object;
+.source "HttpUrl.java"
 
 
 # annotations
@@ -11,15 +12,15 @@
 
 
 # static fields
-.field private static final bZb:[C
+.field private static final bYv:[C
 
 
 # instance fields
-.field public final bZc:Ljava/lang/String;
+.field public final bYw:Ljava/lang/String;
 
-.field public final bZd:Ljava/lang/String;
+.field public final bYx:Ljava/lang/String;
 
-.field public final bZe:Ljava/util/List;
+.field public final bYy:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,7 +30,7 @@
     .end annotation
 .end field
 
-.field public final bZf:Ljava/util/List;
+.field public final bYz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -66,7 +67,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokhttp3/s;->bZb:[C
+    sput-object v0, Lokhttp3/s;->bYv:[C
 
     return-void
 
@@ -96,11 +97,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bYw:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -110,7 +111,7 @@
 
     iput-object v0, p0, Lokhttp3/s;->username:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lokhttp3/s;->i(Ljava/lang/String;Z)Ljava/lang/String;
 
@@ -118,31 +119,31 @@
 
     iput-object v0, p0, Lokhttp3/s;->password:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->Hs()I
+    invoke-virtual {p1}, Lokhttp3/s$a;->Hr()I
 
     move-result v0
 
     iput v0, p0, Lokhttp3/s;->port:I
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->bYC: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;->bZe:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->bYy:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     const/4 v3, 0x1
 
@@ -156,13 +157,13 @@
     move-object v0, v2
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/s;->bZf:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->bYz:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lokhttp3/s;->i(Ljava/lang/String;Z)Ljava/lang/String;
 
@@ -181,265 +182,243 @@
 .end method
 
 .method static a(Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;)Ljava/lang/String;
-    .locals 14
+    .locals 16
 
-    move-object v0, p0
+    move-object/from16 v0, p0
 
     move/from16 v1, p2
 
     move-object/from16 v2, p3
 
-    move-object/from16 v4, p8
+    move-object/from16 v3, p8
 
-    move v5, p1
+    move/from16 v4, p1
 
     :goto_0
-    if-ge v5, v1, :cond_17
+    if-ge v4, v1, :cond_15
 
-    invoke-virtual {p0, v5}, Ljava/lang/String;->codePointAt(I)I
+    invoke-virtual {v0, v4}, Ljava/lang/String;->codePointAt(I)I
 
-    move-result v6
+    move-result v5
 
-    const/16 v7, 0x2b
+    const/16 v6, 0x2b
 
-    const/4 v8, -0x1
+    const/4 v7, -0x1
 
-    const/16 v9, 0x80
+    const/16 v8, 0x80
 
-    const/16 v10, 0x7f
+    const/16 v9, 0x7f
 
-    const/16 v11, 0x20
+    const/16 v10, 0x20
 
-    const/16 v12, 0x25
+    const/16 v11, 0x25
 
-    if-lt v6, v11, :cond_3
+    if-lt v5, v10, :cond_3
 
-    if-eq v6, v10, :cond_3
+    if-eq v5, v9, :cond_3
 
-    if-lt v6, v9, :cond_0
+    if-lt v5, v8, :cond_0
 
     if-nez p7, :cond_3
 
     :cond_0
-    invoke-virtual {v2, v6}, Ljava/lang/String;->indexOf(I)I
+    invoke-virtual {v2, v5}, Ljava/lang/String;->indexOf(I)I
 
-    move-result v9
+    move-result v12
 
-    if-ne v9, v8, :cond_3
+    if-ne v12, v7, :cond_3
 
-    if-ne v6, v12, :cond_1
+    if-ne v5, v11, :cond_1
 
     if-eqz p4, :cond_3
 
     if-eqz p5, :cond_1
 
-    invoke-static {p0, v5, v1}, Lokhttp3/s;->e(Ljava/lang/String;II)Z
+    invoke-static {v0, v4, v1}, Lokhttp3/s;->e(Ljava/lang/String;II)Z
 
-    move-result v9
+    move-result v12
 
-    if-eqz v9, :cond_3
+    if-eqz v12, :cond_3
 
     :cond_1
-    if-ne v6, v7, :cond_2
+    if-ne v5, v6, :cond_2
 
     if-eqz p6, :cond_2
 
     goto :goto_1
 
     :cond_2
-    invoke-static {v6}, Ljava/lang/Character;->charCount(I)I
+    invoke-static {v5}, Ljava/lang/Character;->charCount(I)I
 
-    move-result v6
+    move-result v5
 
-    add-int/2addr v5, v6
+    add-int/2addr v4, v5
 
     goto :goto_0
 
     :cond_3
     :goto_1
-    new-instance v6, Lokio/c;
+    new-instance v5, Lokio/c;
 
-    invoke-direct {v6}, Lokio/c;-><init>()V
+    invoke-direct {v5}, Lokio/c;-><init>()V
 
-    move v9, p1
+    move/from16 v12, p1
 
-    invoke-virtual {v6, p0, p1, v5}, Lokio/c;->p(Ljava/lang/String;II)Lokio/c;
+    invoke-virtual {v5, v0, v12, v4}, Lokio/c;->p(Ljava/lang/String;II)Lokio/c;
 
-    const/4 v9, 0x0
+    const/4 v12, 0x0
 
     :goto_2
-    if-ge v5, v1, :cond_16
+    if-ge v4, v1, :cond_14
 
-    invoke-virtual {p0, v5}, Ljava/lang/String;->codePointAt(I)I
+    invoke-virtual {v0, v4}, Ljava/lang/String;->codePointAt(I)I
 
-    move-result v12
+    move-result v13
+
+    if-eqz p4, :cond_4
+
+    const/16 v14, 0x9
+
+    if-eq v13, v14, :cond_13
+
+    const/16 v14, 0xa
+
+    if-eq v13, v14, :cond_13
+
+    const/16 v14, 0xc
+
+    if-eq v13, v14, :cond_13
+
+    const/16 v14, 0xd
+
+    if-eq v13, v14, :cond_13
+
+    :cond_4
+    if-ne v13, v6, :cond_6
+
+    if-eqz p6, :cond_6
 
     if-eqz p4, :cond_5
 
-    const/16 v8, 0x9
-
-    if-eq v12, v8, :cond_4
-
-    const/16 v8, 0xa
-
-    if-eq v12, v8, :cond_4
-
-    const/16 v8, 0xc
-
-    if-eq v12, v8, :cond_4
-
-    const/16 v8, 0xd
-
-    if-eq v12, v8, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    :goto_3
-    const/4 v8, -0x1
-
-    goto :goto_6
-
-    :cond_5
-    :goto_4
-    if-ne v12, v7, :cond_7
-
-    if-eqz p6, :cond_7
-
-    if-eqz p4, :cond_6
-
-    const-string v8, "+"
-
-    goto :goto_5
-
-    :cond_6
-    const-string v8, "%2B"
-
-    :goto_5
-    invoke-virtual {v6, v8}, Lokio/c;->eK(Ljava/lang/String;)Lokio/c;
+    const-string v14, "+"
 
     goto :goto_3
 
+    :cond_5
+    const-string v14, "%2B"
+
+    :goto_3
+    invoke-virtual {v5, v14}, Lokio/c;->eK(Ljava/lang/String;)Lokio/c;
+
+    goto/16 :goto_7
+
+    :cond_6
+    if-lt v13, v10, :cond_9
+
+    if-eq v13, v9, :cond_9
+
+    if-lt v13, v8, :cond_7
+
+    if-nez p7, :cond_9
+
     :cond_7
-    if-lt v12, v11, :cond_b
+    invoke-virtual {v2, v13}, Ljava/lang/String;->indexOf(I)I
 
-    if-eq v12, v10, :cond_b
+    move-result v14
 
-    const/16 v8, 0x80
+    if-ne v14, v7, :cond_9
 
-    if-lt v12, v8, :cond_8
+    if-ne v13, v11, :cond_8
 
-    if-nez p7, :cond_b
+    if-eqz p4, :cond_9
+
+    if-eqz p5, :cond_8
+
+    invoke-static {v0, v4, v1}, Lokhttp3/s;->e(Ljava/lang/String;II)Z
+
+    move-result v14
+
+    if-nez v14, :cond_8
+
+    goto :goto_4
 
     :cond_8
-    invoke-virtual {v2, v12}, Ljava/lang/String;->indexOf(I)I
+    invoke-virtual {v5, v13}, Lokio/c;->fr(I)Lokio/c;
 
-    move-result v7
-
-    const/4 v8, -0x1
-
-    if-ne v7, v8, :cond_c
-
-    const/16 v7, 0x25
-
-    if-ne v12, v7, :cond_9
-
-    if-eqz p4, :cond_c
-
-    if-eqz p5, :cond_9
-
-    invoke-static {p0, v5, v1}, Lokhttp3/s;->e(Ljava/lang/String;II)Z
-
-    move-result v7
-
-    if-nez v7, :cond_9
-
-    goto :goto_7
+    goto/16 :goto_7
 
     :cond_9
-    invoke-virtual {v6, v12}, Lokio/c;->fr(I)Lokio/c;
+    :goto_4
+    if-nez v12, :cond_a
+
+    new-instance v12, Lokio/c;
+
+    invoke-direct {v12}, Lokio/c;-><init>()V
 
     :cond_a
-    :goto_6
-    const/16 v8, 0x25
+    if-eqz v3, :cond_12
 
-    goto/16 :goto_a
+    sget-object v14, Lokhttp3/internal/c;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-virtual {v3, v14}, Ljava/nio/charset/Charset;->equals(Ljava/lang/Object;)Z
+
+    move-result v14
+
+    if-eqz v14, :cond_b
+
+    goto/16 :goto_5
 
     :cond_b
-    const/4 v8, -0x1
+    invoke-static {v13}, Ljava/lang/Character;->charCount(I)I
+
+    move-result v14
+
+    add-int/2addr v14, v4
+
+    if-eqz v0, :cond_11
+
+    if-ltz v4, :cond_10
+
+    if-lt v14, v4, :cond_f
+
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/String;->length()I
+
+    move-result v15
+
+    if-gt v14, v15, :cond_e
+
+    if-eqz v3, :cond_d
+
+    sget-object v15, Lokio/s;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-virtual {v3, v15}, Ljava/nio/charset/Charset;->equals(Ljava/lang/Object;)Z
+
+    move-result v15
+
+    if-eqz v15, :cond_c
+
+    invoke-virtual {v12, v0, v4, v14}, Lokio/c;->p(Ljava/lang/String;II)Lokio/c;
+
+    goto :goto_6
 
     :cond_c
-    :goto_7
-    if-nez v9, :cond_d
+    invoke-virtual {v0, v4, v14}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
-    new-instance v9, Lokio/c;
+    move-result-object v14
 
-    invoke-direct {v9}, Lokio/c;-><init>()V
+    invoke-virtual {v14, v3}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+
+    move-result-object v14
+
+    const/4 v15, 0x0
+
+    array-length v6, v14
+
+    invoke-virtual {v12, v14, v15, v6}, Lokio/c;->q([BII)Lokio/c;
+
+    goto :goto_6
 
     :cond_d
-    if-eqz v4, :cond_15
-
-    sget-object v7, Lokhttp3/internal/c;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-virtual {v4, v7}, Ljava/nio/charset/Charset;->equals(Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_e
-
-    goto/16 :goto_8
-
-    :cond_e
-    invoke-static {v12}, Ljava/lang/Character;->charCount(I)I
-
-    move-result v7
-
-    add-int/2addr v7, v5
-
-    if-eqz v0, :cond_14
-
-    if-ltz v5, :cond_13
-
-    if-lt v7, v5, :cond_12
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v8
-
-    if-gt v7, v8, :cond_11
-
-    if-eqz v4, :cond_10
-
-    sget-object v8, Lokio/s;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-virtual {v4, v8}, Ljava/nio/charset/Charset;->equals(Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_f
-
-    invoke-virtual {v9, p0, v5, v7}, Lokio/c;->p(Ljava/lang/String;II)Lokio/c;
-
-    goto :goto_9
-
-    :cond_f
-    invoke-virtual {p0, v5, v7}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-virtual {v7, v4}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
-
-    move-result-object v7
-
-    const/4 v8, 0x0
-
-    array-length v10, v7
-
-    invoke-virtual {v9, v7, v8, v10}, Lokio/c;->q([BII)Lokio/c;
-
-    goto :goto_9
-
-    :cond_10
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
     const-string v1, "charset == null"
@@ -448,7 +427,7 @@
 
     throw v0
 
-    :cond_11
+    :cond_e
     new-instance v1, Ljava/lang/IllegalArgumentException;
 
     new-instance v2, Ljava/lang/StringBuilder;
@@ -457,13 +436,13 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v2, v7}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v14}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string v3, " > "
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/String;->length()I
 
     move-result v0
 
@@ -477,7 +456,7 @@
 
     throw v1
 
-    :cond_12
+    :cond_f
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
     new-instance v1, Ljava/lang/StringBuilder;
@@ -486,13 +465,13 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v14}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string v2, " < "
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -502,10 +481,10 @@
 
     throw v0
 
-    :cond_13
+    :cond_10
     new-instance v0, Ljava/lang/IllegalAccessError;
 
-    invoke-static {v5}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v4}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -519,7 +498,7 @@
 
     throw v0
 
-    :cond_14
+    :cond_11
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
     const-string v1, "string == null"
@@ -528,73 +507,66 @@
 
     throw v0
 
-    :cond_15
-    :goto_8
-    invoke-virtual {v9, v12}, Lokio/c;->fr(I)Lokio/c;
+    :cond_12
+    :goto_5
+    invoke-virtual {v12, v13}, Lokio/c;->fr(I)Lokio/c;
 
-    :goto_9
-    invoke-virtual {v9}, Lokio/c;->IZ()Z
+    :goto_6
+    invoke-virtual {v12}, Lokio/c;->IY()Z
 
-    move-result v7
+    move-result v6
 
-    if-nez v7, :cond_a
+    if-nez v6, :cond_13
 
-    invoke-virtual {v9}, Lokio/c;->readByte()B
+    invoke-virtual {v12}, Lokio/c;->readByte()B
 
-    move-result v7
+    move-result v6
 
-    and-int/lit16 v7, v7, 0xff
+    and-int/lit16 v6, v6, 0xff
 
-    const/16 v8, 0x25
+    invoke-virtual {v5, v11}, Lokio/c;->fs(I)Lokio/c;
 
-    invoke-virtual {v6, v8}, Lokio/c;->fs(I)Lokio/c;
+    sget-object v14, Lokhttp3/s;->bYv:[C
 
-    sget-object v10, Lokhttp3/s;->bZb:[C
+    shr-int/lit8 v15, v6, 0x4
 
-    shr-int/lit8 v13, v7, 0x4
+    and-int/lit8 v15, v15, 0xf
 
-    and-int/lit8 v13, v13, 0xf
+    aget-char v14, v14, v15
 
-    aget-char v10, v10, v13
+    invoke-virtual {v5, v14}, Lokio/c;->fs(I)Lokio/c;
 
-    invoke-virtual {v6, v10}, Lokio/c;->fs(I)Lokio/c;
+    sget-object v14, Lokhttp3/s;->bYv:[C
 
-    sget-object v10, Lokhttp3/s;->bZb:[C
+    and-int/lit8 v6, v6, 0xf
 
-    and-int/lit8 v7, v7, 0xf
+    aget-char v6, v14, v6
 
-    aget-char v7, v10, v7
+    invoke-virtual {v5, v6}, Lokio/c;->fs(I)Lokio/c;
 
-    invoke-virtual {v6, v7}, Lokio/c;->fs(I)Lokio/c;
+    goto :goto_6
 
-    goto :goto_9
+    :cond_13
+    :goto_7
+    invoke-static {v13}, Ljava/lang/Character;->charCount(I)I
 
-    :goto_a
-    invoke-static {v12}, Ljava/lang/Character;->charCount(I)I
+    move-result v6
 
-    move-result v7
+    add-int/2addr v4, v6
 
-    add-int/2addr v5, v7
-
-    const/16 v7, 0x2b
-
-    const/4 v8, -0x1
-
-    const/16 v10, 0x7f
-
-    const/16 v12, 0x25
+    const/16 v6, 0x2b
 
     goto/16 :goto_2
 
-    :cond_16
-    invoke-virtual {v6}, Lokio/c;->Jf()Ljava/lang/String;
+    :cond_14
+    invoke-virtual {v5}, Lokio/c;->Je()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
-    :cond_17
-    move v9, p1
+    :cond_15
+    move/from16 v12, p1
 
     invoke-virtual/range {p0 .. p2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -824,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;->Jf()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->Je()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1107,6 +1079,8 @@
 
     move-result-object v1
 
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
     goto :goto_2
 
     :cond_2
@@ -1119,9 +1093,9 @@
 
     const/4 v1, 0x0
 
-    :goto_2
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
+    :goto_2
     add-int/lit8 v1, v2, 0x1
 
     goto :goto_0
@@ -1163,7 +1137,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokhttp3/s$a;->Ht()Lokhttp3/s;
+    invoke-virtual {p0}, Lokhttp3/s$a;->Hs()Lokhttp3/s;
 
     move-result-object p0
 
@@ -1188,7 +1162,7 @@
 
 
 # virtual methods
-.method public final Hj()Ljava/net/URL;
+.method public final Hi()Ljava/net/URL;
     .locals 2
 
     :try_start_0
@@ -1212,36 +1186,36 @@
     throw v1
 .end method
 
-.method public final Hk()Ljava/net/URI;
+.method public final Hj()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;->bZc:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZc:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYw:Ljava/lang/String;
+
+    invoke-virtual {p0}, Lokhttp3/s;->Hl()Ljava/lang/String;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     invoke-virtual {p0}, Lokhttp3/s;->Hm()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/s;->Hn()Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    move-result-object v1
-
-    iput-object v1, v0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
-
-    iget-object v1, p0, Lokhttp3/s;->bZd:Ljava/lang/String;
-
-    iput-object v1, v0, Lokhttp3/s$a;->bZd:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYx:Ljava/lang/String;
 
     iget v1, p0, Lokhttp3/s;->port:I
 
-    iget-object v2, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-static {v2}, Lokhttp3/s;->ej(Ljava/lang/String;)I
 
@@ -1259,19 +1233,19 @@
     :goto_0
     iput v1, v0, Lokhttp3/s$a;->port:I
 
-    iget-object v1, v0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
-    iget-object v1, v0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
-    invoke-virtual {p0}, Lokhttp3/s;->Hp()Ljava/util/List;
+    invoke-virtual {p0}, Lokhttp3/s;->Ho()Ljava/util/List;
 
     move-result-object v2
 
     invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    invoke-virtual {p0}, Lokhttp3/s;->Hq()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Hp()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1303,9 +1277,9 @@
     move-result-object v1
 
     :goto_1
-    iput-object v1, v0, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
-    iget-object v1, v0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -1318,7 +1292,7 @@
     :goto_2
     if-ge v3, v1, :cond_2
 
-    iget-object v4, v0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     invoke-interface {v4, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1328,7 +1302,7 @@
 
     check-cast v5, Ljava/lang/String;
 
-    iget-object v4, v0, Lokhttp3/s$a;->bZi:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bYC:Ljava/util/List;
 
     const-string v6, "[]"
 
@@ -1351,11 +1325,11 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, v0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -1364,7 +1338,7 @@
     :goto_3
     if-ge v2, v1, :cond_4
 
-    iget-object v3, v0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1376,7 +1350,7 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v3, v0, Lokhttp3/s$a;->bZj:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->bYD:Ljava/util/List;
 
     const-string v5, "\\^`{|}"
 
@@ -1400,11 +1374,11 @@
     goto :goto_3
 
     :cond_4
-    iget-object v1, v0, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
     if-eqz v1, :cond_5
 
-    iget-object v2, v0, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
     const-string v3, " \"#<>\\^`{|}"
 
@@ -1420,7 +1394,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZk:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYE:Ljava/lang/String;
 
     :cond_5
     invoke-virtual {v0}, Lokhttp3/s$a;->toString()Ljava/lang/String;
@@ -1462,12 +1436,14 @@
     invoke-direct {v0, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
-.method public final Hl()Z
+.method public final Hk()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     const-string v1, "https"
 
@@ -1478,7 +1454,7 @@
     return v0
 .end method
 
-.method public final Hm()Ljava/lang/String;
+.method public final Hl()Ljava/lang/String;
     .locals 4
 
     iget-object v0, p0, Lokhttp3/s;->username:Ljava/lang/String;
@@ -1494,7 +1470,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
@@ -1523,7 +1499,7 @@
     return-object v0
 .end method
 
-.method public final Hn()Ljava/lang/String;
+.method public final Hm()Ljava/lang/String;
     .locals 3
 
     iget-object v0, p0, Lokhttp3/s;->password:Ljava/lang/String;
@@ -1543,7 +1519,7 @@
 
     const/16 v1, 0x3a
 
-    iget-object v2, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-virtual {v2}, Ljava/lang/String;->length()I
 
@@ -1574,12 +1550,12 @@
     return-object v0
 .end method
 
-.method public final Ho()Ljava/lang/String;
+.method public final Hn()Ljava/lang/String;
     .locals 4
 
     iget-object v0, p0, Lokhttp3/s;->url:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1614,7 +1590,7 @@
     return-object v0
 .end method
 
-.method public final Hp()Ljava/util/List;
+.method public final Ho()Ljava/util/List;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1627,7 +1603,7 @@
 
     iget-object v0, p0, Lokhttp3/s;->url:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1684,12 +1660,12 @@
     return-object v3
 .end method
 
-.method public final Hq()Ljava/lang/String;
+.method public final Hp()Ljava/lang/String;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/s;->bZf:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s;->bYz:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -1729,7 +1705,7 @@
     return-object v0
 .end method
 
-.method public final Hr()Ljava/lang/String;
+.method public final Hq()Ljava/lang/String;
     .locals 8
 
     const-string v0, "/..."
@@ -1754,7 +1730,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZg:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYA:Ljava/lang/String;
 
     const-string v2, ""
 
@@ -1768,9 +1744,9 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bZh:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bYB:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->Ht()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Hs()Lokhttp3/s;
 
     move-result-object v0
 
@@ -1792,7 +1768,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->Ht()Lokhttp3/s;
+    invoke-virtual {p1}, Lokhttp3/s$a;->Hs()Lokhttp3/s;
 
     move-result-object p1
 
diff --git a/com.discord/smali/okhttp3/t$a.smali b/com.discord/smali/okhttp3/t$a.smali
index c3ef068901..83be432e54 100644
--- a/com.discord/smali/okhttp3/t$a.smali
+++ b/com.discord/smali/okhttp3/t$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/t$a;
 .super Ljava/lang/Object;
+.source "OkHttpClient.java"
 
 
 # annotations
@@ -14,18 +15,13 @@
 
 
 # instance fields
-.field bVQ:Lokhttp3/internal/h/c;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field bUK:Lokhttp3/o;
 
-.field bVq:Lokhttp3/o;
+.field bUL:Ljavax/net/SocketFactory;
 
-.field bVr:Ljavax/net/SocketFactory;
+.field bUM:Lokhttp3/b;
 
-.field bVs:Lokhttp3/b;
-
-.field bVt:Ljava/util/List;
+.field bUN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,7 +31,7 @@
     .end annotation
 .end field
 
-.field bVu:Ljava/util/List;
+.field bUO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,21 +41,26 @@
     .end annotation
 .end field
 
-.field bVv:Ljava/net/Proxy;
+.field bUP:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bVw:Lokhttp3/g;
+.field bUQ:Lokhttp3/g;
 
-.field bVy:Lokhttp3/internal/a/e;
+.field bUS:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bZG:Lokhttp3/n;
+.field bVk:Lokhttp3/internal/h/c;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field final bZH:Ljava/util/List;
+.field bZa:Lokhttp3/n;
+
+.field final bZb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -69,7 +70,7 @@
     .end annotation
 .end field
 
-.field final bZI:Ljava/util/List;
+.field final bZc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -79,30 +80,30 @@
     .end annotation
 .end field
 
-.field bZJ:Lokhttp3/p$a;
+.field bZd:Lokhttp3/p$a;
 
-.field bZK:Lokhttp3/c;
+.field bZe:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bZL:Lokhttp3/b;
+.field bZf:Lokhttp3/b;
 
-.field bZM:Lokhttp3/j;
+.field bZg:Lokhttp3/j;
 
-.field bZN:Z
+.field bZh:Z
 
-.field bZO:Z
+.field bZi:Z
 
-.field bZP:Z
+.field bZj:Z
 
-.field bZQ:I
+.field bZk:I
 
-.field bZR:I
+.field bZl:I
 
-.field bZS:I
+.field bZm:I
 
-.field bZT:I
+.field bZn:I
 
 .field cookieJar:Lokhttp3/m;
 
@@ -126,35 +127,35 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZH:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bZb:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZI:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bZc:Ljava/util/List;
 
     new-instance v0, Lokhttp3/n;
 
     invoke-direct {v0}, Lokhttp3/n;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZG:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->bZa:Lokhttp3/n;
 
-    sget-object v0, Lokhttp3/t;->bZE:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->bYY:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVt:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bUN:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/t;->bZF:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->bYZ:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVu:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bUO:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/p;->bYO:Lokhttp3/p;
+    sget-object v0, Lokhttp3/p;->bYi:Lokhttp3/p;
 
     invoke-static {v0}, Lokhttp3/p;->a(Lokhttp3/p;)Lokhttp3/p$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZJ:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->bZd:Lokhttp3/p$a;
 
     invoke-static {}, Ljava/net/ProxySelector;->getDefault()Ljava/net/ProxySelector;
 
@@ -162,7 +163,7 @@
 
     iput-object v0, p0, Lokhttp3/t$a;->proxySelector:Ljava/net/ProxySelector;
 
-    sget-object v0, Lokhttp3/m;->bYG:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->bYa:Lokhttp3/m;
 
     iput-object v0, p0, Lokhttp3/t$a;->cookieJar:Lokhttp3/m;
 
@@ -170,53 +171,53 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVr:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bUL:Ljavax/net/SocketFactory;
 
-    sget-object v0, Lokhttp3/internal/h/d;->cfC:Lokhttp3/internal/h/d;
+    sget-object v0, Lokhttp3/internal/h/d;->ceW:Lokhttp3/internal/h/d;
 
     iput-object v0, p0, Lokhttp3/t$a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/g;->bVO:Lokhttp3/g;
+    sget-object v0, Lokhttp3/g;->bVi:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVw:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bUQ:Lokhttp3/g;
 
-    sget-object v0, Lokhttp3/b;->bVx:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bUR:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVs:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bUM:Lokhttp3/b;
 
-    sget-object v0, Lokhttp3/b;->bVx:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bUR:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZL:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bZf:Lokhttp3/b;
 
     new-instance v0, Lokhttp3/j;
 
     invoke-direct {v0}, Lokhttp3/j;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZM:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->bZg:Lokhttp3/j;
 
-    sget-object v0, Lokhttp3/o;->bYN:Lokhttp3/o;
+    sget-object v0, Lokhttp3/o;->bYh:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVq:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bUK:Lokhttp3/o;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->bZN:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->bZh:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->bZO:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->bZi:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->bZP:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->bZj:Z
 
     const/16 v0, 0x2710
 
-    iput v0, p0, Lokhttp3/t$a;->bZQ:I
+    iput v0, p0, Lokhttp3/t$a;->bZk:I
 
-    iput v0, p0, Lokhttp3/t$a;->bZR:I
+    iput v0, p0, Lokhttp3/t$a;->bZl:I
 
-    iput v0, p0, Lokhttp3/t$a;->bZS:I
+    iput v0, p0, Lokhttp3/t$a;->bZm:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/t$a;->bZT:I
+    iput v0, p0, Lokhttp3/t$a;->bZn:I
 
     return-void
 .end method
@@ -230,45 +231,45 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZH:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bZb:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZI:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bZc:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t;->bZa:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZG:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->bZa:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t;->bVv:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t;->bUP:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVv:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t$a;->bUP:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t;->bVt:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bUN:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVt:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bUN:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->bVu:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bUO:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVu:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bUO:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/t$a;->bZH:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->bZb:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->bZH:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->bZb:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/t$a;->bZI:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->bZc:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->bZI:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->bZc:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p1, Lokhttp3/t;->bZJ:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t;->bZd:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZJ:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->bZd:Lokhttp3/p$a;
 
     iget-object v0, p1, Lokhttp3/t;->proxySelector:Ljava/net/ProxySelector;
 
@@ -278,84 +279,84 @@
 
     iput-object v0, p0, Lokhttp3/t$a;->cookieJar:Lokhttp3/m;
 
-    iget-object v0, p1, Lokhttp3/t;->bVy:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t;->bUS:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVy:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t$a;->bUS:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t;->bZK:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t;->bZe:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZK:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t$a;->bZe:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t;->bVr:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t;->bUL:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVr:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bUL: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;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v0, p1, Lokhttp3/t;->bVk:Lokhttp3/internal/h/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVQ:Lokhttp3/internal/h/c;
+    iput-object v0, p0, Lokhttp3/t$a;->bVk:Lokhttp3/internal/h/c;
 
     iget-object v0, p1, Lokhttp3/t;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
     iput-object v0, p0, Lokhttp3/t$a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t;->bVw:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t;->bUQ:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVw:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bUQ:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t;->bVs:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->bUM:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVs:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bUM:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->bZL:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->bZf:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZL:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bZf:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->bZM:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t;->bZg:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bZM:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->bZg:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t;->bVq:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t;->bUK:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bVq:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bUK:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t;->bZN:Z
+    iget-boolean v0, p1, Lokhttp3/t;->bZh:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->bZN:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->bZh:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->bZO:Z
+    iget-boolean v0, p1, Lokhttp3/t;->bZi:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->bZO:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->bZi:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->bZP:Z
+    iget-boolean v0, p1, Lokhttp3/t;->bZj:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->bZP:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->bZj:Z
 
-    iget v0, p1, Lokhttp3/t;->bZQ:I
+    iget v0, p1, Lokhttp3/t;->bZk:I
 
-    iput v0, p0, Lokhttp3/t$a;->bZQ:I
+    iput v0, p0, Lokhttp3/t$a;->bZk:I
 
-    iget v0, p1, Lokhttp3/t;->bZR:I
+    iget v0, p1, Lokhttp3/t;->bZl:I
 
-    iput v0, p0, Lokhttp3/t$a;->bZR:I
+    iput v0, p0, Lokhttp3/t$a;->bZl:I
 
-    iget v0, p1, Lokhttp3/t;->bZS:I
+    iget v0, p1, Lokhttp3/t;->bZm:I
 
-    iput v0, p0, Lokhttp3/t$a;->bZS:I
+    iput v0, p0, Lokhttp3/t$a;->bZm:I
 
-    iget p1, p1, Lokhttp3/t;->bZT:I
+    iget p1, p1, Lokhttp3/t;->bZn:I
 
-    iput p1, p0, Lokhttp3/t$a;->bZT:I
+    iput p1, p0, Lokhttp3/t$a;->bZn:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hz()Lokhttp3/t;
+.method public final Hy()Lokhttp3/t;
     .locals 1
 
     new-instance v0, Lokhttp3/t;
@@ -374,7 +375,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->bZQ:I
+    iput p1, p0, Lokhttp3/t$a;->bZk:I
 
     return-object p0
 .end method
@@ -386,7 +387,7 @@
 
     iput-object p1, p0, Lokhttp3/t$a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -394,7 +395,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/t$a;->bVQ:Lokhttp3/internal/h/c;
+    iput-object p1, p0, Lokhttp3/t$a;->bVk:Lokhttp3/internal/h/c;
 
     return-object p0
 
@@ -413,7 +414,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/t$a;->bZH:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->bZb:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -457,7 +458,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->bZR:I
+    iput p1, p0, Lokhttp3/t$a;->bZl:I
 
     return-object p0
 .end method
@@ -471,7 +472,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->bZS:I
+    iput p1, p0, Lokhttp3/t$a;->bZm:I
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/t.smali b/com.discord/smali/okhttp3/t.smali
index 666c82ac38..13b7b30bd6 100644
--- a/com.discord/smali/okhttp3/t.smali
+++ b/com.discord/smali/okhttp3/t.smali
@@ -1,5 +1,6 @@
 .class public Lokhttp3/t;
 .super Ljava/lang/Object;
+.source "OkHttpClient.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field static final bZE:Ljava/util/List;
+.field static final bYY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +26,7 @@
     .end annotation
 .end field
 
-.field static final bZF:Ljava/util/List;
+.field static final bYZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,18 +38,13 @@
 
 
 # instance fields
-.field final bVQ:Lokhttp3/internal/h/c;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field public final bUK:Lokhttp3/o;
 
-.field public final bVq:Lokhttp3/o;
+.field public final bUL:Ljavax/net/SocketFactory;
 
-.field public final bVr:Ljavax/net/SocketFactory;
+.field public final bUM:Lokhttp3/b;
 
-.field public final bVs:Lokhttp3/b;
-
-.field public final bVt:Ljava/util/List;
+.field public final bUN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -58,7 +54,7 @@
     .end annotation
 .end field
 
-.field public final bVu:Ljava/util/List;
+.field public final bUO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -68,21 +64,26 @@
     .end annotation
 .end field
 
-.field public final bVv:Ljava/net/Proxy;
+.field public final bUP:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bVw:Lokhttp3/g;
+.field public final bUQ:Lokhttp3/g;
 
-.field final bVy:Lokhttp3/internal/a/e;
+.field final bUS:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bZG:Lokhttp3/n;
+.field final bVk:Lokhttp3/internal/h/c;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field final bZH:Ljava/util/List;
+.field public final bZa:Lokhttp3/n;
+
+.field final bZb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -92,7 +93,7 @@
     .end annotation
 .end field
 
-.field final bZI:Ljava/util/List;
+.field final bZc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -102,30 +103,30 @@
     .end annotation
 .end field
 
-.field final bZJ:Lokhttp3/p$a;
+.field final bZd:Lokhttp3/p$a;
 
-.field final bZK:Lokhttp3/c;
+.field final bZe:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bZL:Lokhttp3/b;
+.field final bZf:Lokhttp3/b;
 
-.field public final bZM:Lokhttp3/j;
+.field public final bZg:Lokhttp3/j;
 
-.field public final bZN:Z
+.field public final bZh:Z
 
-.field public final bZO:Z
+.field public final bZi:Z
 
-.field public final bZP:Z
+.field public final bZj:Z
 
-.field final bZQ:I
+.field final bZk:I
 
-.field final bZR:I
+.field final bZl:I
 
-.field final bZS:I
+.field final bZm:I
 
-.field public final bZT:I
+.field public final bZn:I
 
 .field public final cookieJar:Lokhttp3/m;
 
@@ -147,13 +148,13 @@
 
     new-array v1, v0, [Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->bZX:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bZr:Lokhttp3/u;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     const/4 v4, 0x1
 
@@ -163,15 +164,15 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/t;->bZE:Ljava/util/List;
+    sput-object v1, Lokhttp3/t;->bYY:Ljava/util/List;
 
     new-array v0, v0, [Lokhttp3/k;
 
-    sget-object v1, Lokhttp3/k;->bYp:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->bXJ:Lokhttp3/k;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/k;->bYr:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->bXL:Lokhttp3/k;
 
     aput-object v1, v0, v4
 
@@ -179,13 +180,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/t;->bZF:Ljava/util/List;
+    sput-object v0, Lokhttp3/t;->bYZ:Ljava/util/List;
 
     new-instance v0, Lokhttp3/t$1;
 
     invoke-direct {v0}, Lokhttp3/t$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sput-object v0, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
     return-void
 .end method
@@ -207,41 +208,41 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/t$a;->bZG:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t$a;->bZa:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t;->bZa:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVv:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t$a;->bUP:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t;->bVv:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t;->bUP:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVt:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bUN:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bVt:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bUN:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVu:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bUO:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bVu:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bUO:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bZH:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bZb:Ljava/util/List;
 
     invoke-static {v0}, Lokhttp3/internal/c;->aw(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->bZH:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bZb:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bZI:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bZc:Ljava/util/List;
 
     invoke-static {v0}, Lokhttp3/internal/c;->aw(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->bZI:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bZc:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bZJ:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t$a;->bZd:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t;->bZJ:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t;->bZd:Lokhttp3/p$a;
 
     iget-object v0, p1, Lokhttp3/t$a;->proxySelector:Ljava/net/ProxySelector;
 
@@ -251,19 +252,19 @@
 
     iput-object v0, p0, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bZK:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t$a;->bZe:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t;->bZK:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t;->bZe:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVy:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t$a;->bUS:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t;->bVy:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t;->bUS:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVr:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t$a;->bUL:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t;->bVr:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t;->bUL:Ljavax/net/SocketFactory;
 
-    iget-object v0, p0, Lokhttp3/t;->bVu:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t;->bUO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -271,7 +272,6 @@
 
     const/4 v1, 0x0
 
-    :cond_0
     const/4 v2, 0x0
 
     :goto_0
@@ -289,11 +289,19 @@
 
     if-nez v2, :cond_1
 
-    iget-boolean v2, v3, Lokhttp3/k;->bYs:Z
+    iget-boolean v2, v3, Lokhttp3/k;->bXM:Z
 
     if-eqz v2, :cond_0
 
+    goto :goto_1
+
+    :cond_0
+    const/4 v2, 0x0
+
+    goto :goto_0
+
     :cond_1
+    :goto_1
     const/4 v2, 0x1
 
     goto :goto_0
@@ -305,10 +313,10 @@
 
     if-nez v2, :cond_3
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/c;->HN()Ljavax/net/ssl/X509TrustManager;
+    invoke-static {}, Lokhttp3/internal/c;->HM()Ljavax/net/ssl/X509TrustManager;
 
     move-result-object v0
 
@@ -318,7 +326,7 @@
 
     iput-object v1, p0, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v1
 
@@ -326,24 +334,26 @@
 
     move-result-object v0
 
-    goto :goto_2
+    iput-object v0, p0, Lokhttp3/t;->bVk:Lokhttp3/internal/h/c;
+
+    goto :goto_3
 
     :cond_4
-    :goto_1
+    :goto_2
     iget-object v0, p1, Lokhttp3/t$a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     iput-object v0, p0, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v0, p1, Lokhttp3/t$a;->bVk:Lokhttp3/internal/h/c;
 
-    :goto_2
-    iput-object v0, p0, Lokhttp3/t;->bVQ:Lokhttp3/internal/h/c;
+    iput-object v0, p0, Lokhttp3/t;->bVk:Lokhttp3/internal/h/c;
 
+    :goto_3
     iget-object v0, p0, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v0, :cond_5
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -356,11 +366,11 @@
 
     iput-object v0, p0, Lokhttp3/t;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVw:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t$a;->bUQ:Lokhttp3/g;
 
-    iget-object v1, p0, Lokhttp3/t;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v1, p0, Lokhttp3/t;->bVk:Lokhttp3/internal/h/c;
 
-    iget-object v2, v0, Lokhttp3/g;->bVQ:Lokhttp3/internal/h/c;
+    iget-object v2, v0, Lokhttp3/g;->bVk:Lokhttp3/internal/h/c;
 
     invoke-static {v2, v1}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -368,65 +378,65 @@
 
     if-eqz v2, :cond_6
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_6
     new-instance v2, Lokhttp3/g;
 
-    iget-object v0, v0, Lokhttp3/g;->bVP:Ljava/util/Set;
+    iget-object v0, v0, Lokhttp3/g;->bVj:Ljava/util/Set;
 
     invoke-direct {v2, v0, v1}, Lokhttp3/g;-><init>(Ljava/util/Set;Lokhttp3/internal/h/c;)V
 
     move-object v0, v2
 
-    :goto_3
-    iput-object v0, p0, Lokhttp3/t;->bVw:Lokhttp3/g;
+    :goto_4
+    iput-object v0, p0, Lokhttp3/t;->bUQ:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVs:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->bUM:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->bVs:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->bUM:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bZL:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->bZf:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->bZL:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->bZf:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bZM:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t$a;->bZg:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t;->bZM:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t;->bZg:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bVq:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t$a;->bUK:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t;->bVq:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t;->bUK:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->bZN:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->bZh:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->bZN:Z
+    iput-boolean v0, p0, Lokhttp3/t;->bZh:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->bZO:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->bZi:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->bZO:Z
+    iput-boolean v0, p0, Lokhttp3/t;->bZi:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->bZP:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->bZj:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->bZP:Z
+    iput-boolean v0, p0, Lokhttp3/t;->bZj:Z
 
-    iget v0, p1, Lokhttp3/t$a;->bZQ:I
+    iget v0, p1, Lokhttp3/t$a;->bZk:I
 
-    iput v0, p0, Lokhttp3/t;->bZQ:I
+    iput v0, p0, Lokhttp3/t;->bZk:I
 
-    iget v0, p1, Lokhttp3/t$a;->bZR:I
+    iget v0, p1, Lokhttp3/t$a;->bZl:I
 
-    iput v0, p0, Lokhttp3/t;->bZR:I
+    iput v0, p0, Lokhttp3/t;->bZl:I
 
-    iget v0, p1, Lokhttp3/t$a;->bZS:I
+    iget v0, p1, Lokhttp3/t$a;->bZm:I
 
-    iput v0, p0, Lokhttp3/t;->bZS:I
+    iput v0, p0, Lokhttp3/t;->bZm:I
 
-    iget p1, p1, Lokhttp3/t$a;->bZT:I
+    iget p1, p1, Lokhttp3/t$a;->bZn:I
 
-    iput p1, p0, Lokhttp3/t;->bZT:I
+    iput p1, p0, Lokhttp3/t;->bZn:I
 
-    iget-object p1, p0, Lokhttp3/t;->bZH:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->bZb:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -436,7 +446,7 @@
 
     if-nez p1, :cond_8
 
-    iget-object p1, p0, Lokhttp3/t;->bZI:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->bZc:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -455,7 +465,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/t;->bZI:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->bZc:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -476,7 +486,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/t;->bZH:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->bZb:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -487,17 +497,19 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static a(Ljavax/net/ssl/X509TrustManager;)Ljavax/net/ssl/SSLSocketFactory;
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/internal/g/f;->II()Ljavax/net/ssl/SSLContext;
+    invoke-virtual {v0}, Lokhttp3/internal/g/f;->IH()Ljavax/net/ssl/SSLContext;
 
     move-result-object v0
 
@@ -535,21 +547,19 @@
 
 
 # virtual methods
-.method final Hy()Lokhttp3/internal/a/e;
+.method final Hx()Lokhttp3/internal/a/e;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/t;->bZK:Lokhttp3/c;
+    iget-object v0, p0, Lokhttp3/t;->bZe:Lokhttp3/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/t;->bZK:Lokhttp3/c;
-
-    iget-object v0, v0, Lokhttp3/c;->bVy:Lokhttp3/internal/a/e;
+    iget-object v0, v0, Lokhttp3/c;->bUS:Lokhttp3/internal/a/e;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/t;->bVy:Lokhttp3/internal/a/e;
+    iget-object v0, p0, Lokhttp3/t;->bUS:Lokhttp3/internal/a/e;
 
     return-object v0
 .end method
@@ -563,7 +573,7 @@
 
     invoke-direct {v3}, Ljava/util/Random;-><init>()V
 
-    iget v0, p0, Lokhttp3/t;->bZT:I
+    iget v0, p0, Lokhttp3/t;->bZn:I
 
     int-to-long v4, v0
 
@@ -579,7 +589,7 @@
 
     invoke-direct {p1, p0}, Lokhttp3/t$a;-><init>(Lokhttp3/t;)V
 
-    sget-object p2, Lokhttp3/p;->bYO:Lokhttp3/p;
+    sget-object p2, Lokhttp3/p;->bYi:Lokhttp3/p;
 
     if-eqz p2, :cond_6
 
@@ -587,15 +597,15 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lokhttp3/t$a;->bZJ:Lokhttp3/p$a;
+    iput-object p2, p1, Lokhttp3/t$a;->bZd:Lokhttp3/p$a;
 
-    sget-object p2, Lokhttp3/internal/i/a;->cfD:Ljava/util/List;
+    sget-object p2, Lokhttp3/internal/i/a;->ceX: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;->bZY:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -603,7 +613,7 @@
 
     if-nez p2, :cond_1
 
-    sget-object p2, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -632,7 +642,7 @@
 
     :cond_1
     :goto_0
-    sget-object p2, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -669,7 +679,7 @@
 
     :cond_3
     :goto_1
-    sget-object p2, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -685,7 +695,7 @@
 
     if-nez p2, :cond_4
 
-    sget-object p2, Lokhttp3/u;->bZW:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bZq:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
@@ -693,15 +703,15 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lokhttp3/t$a;->bVt:Ljava/util/List;
+    iput-object p2, p1, Lokhttp3/t$a;->bUN:Ljava/util/List;
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->Hz()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->Hy()Lokhttp3/t;
 
     move-result-object p1
 
-    iget-object p2, v6, Lokhttp3/internal/i/a;->cae:Lokhttp3/w;
+    iget-object p2, v6, Lokhttp3/internal/i/a;->bZy:Lokhttp3/w;
 
-    invoke-virtual {p2}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {p2}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object p2
 
@@ -737,19 +747,19 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {p2}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object p2
 
-    sget-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->cai: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/i/a;->cca:Lokhttp3/e;
+    iput-object p1, v6, Lokhttp3/internal/i/a;->cbu:Lokhttp3/e;
 
-    iget-object p1, v6, Lokhttp3/internal/i/a;->cca:Lokhttp3/e;
+    iget-object p1, v6, Lokhttp3/internal/i/a;->cbu:Lokhttp3/e;
 
     new-instance v0, Lokhttp3/internal/i/a$2;
 
diff --git a/com.discord/smali/okhttp3/w$a.smali b/com.discord/smali/okhttp3/w$a.smali
index ca60cb53e8..b9eadcfa2a 100644
--- a/com.discord/smali/okhttp3/w$a.smali
+++ b/com.discord/smali/okhttp3/w$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/w$a;
 .super Ljava/lang/Object;
+.source "Request.java"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # instance fields
-.field bVp:Lokhttp3/s;
+.field bUJ:Lokhttp3/s;
 
-.field bZD:Lokhttp3/RequestBody;
+.field bYX:Lokhttp3/RequestBody;
 
-.field caj:Ljava/util/Map;
+.field bZD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -30,7 +31,7 @@
     .end annotation
 .end field
 
-.field cal:Lokhttp3/Headers$a;
+.field bZF:Lokhttp3/Headers$a;
 
 .field method:Ljava/lang/String;
 
@@ -45,7 +46,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->caj:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bZD:Ljava/util/Map;
 
     const-string v0, "GET"
 
@@ -55,7 +56,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/w$a;->cal:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/w$a;->bZF:Lokhttp3/Headers$a;
 
     return-void
 .end method
@@ -69,21 +70,21 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->caj:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bZD:Ljava/util/Map;
 
-    iget-object v0, p1, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bVp:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w$a;->bUJ:Lokhttp3/s;
 
     iget-object v0, p1, Lokhttp3/w;->method:Ljava/lang/String;
 
     iput-object v0, p0, Lokhttp3/w$a;->method:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bZD:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w$a;->bYX:Lokhttp3/RequestBody;
 
-    iget-object v0, p1, Lokhttp3/w;->caj:Ljava/util/Map;
+    iget-object v0, p1, Lokhttp3/w;->bZD:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -100,30 +101,30 @@
     :cond_0
     new-instance v0, Ljava/util/LinkedHashMap;
 
-    iget-object v1, p1, Lokhttp3/w;->caj:Ljava/util/Map;
+    iget-object v1, p1, Lokhttp3/w;->bZD:Ljava/util/Map;
 
     invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/w$a;->caj:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bZD:Ljava/util/Map;
 
-    iget-object p1, p1, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Hh()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Hg()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->cal:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bZF:Lokhttp3/Headers$a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HH()Lokhttp3/w;
+.method public final HG()Lokhttp3/w;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/w$a;->bVp:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w$a;->bUJ:Lokhttp3/s;
 
     if-eqz v0, :cond_0
 
@@ -278,7 +279,7 @@
     :goto_3
     iput-object p1, p0, Lokhttp3/w$a;->method:Ljava/lang/String;
 
-    iput-object p2, p0, Lokhttp3/w$a;->bZD:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/w$a;->bYX:Lokhttp3/RequestBody;
 
     return-object p0
 
@@ -304,7 +305,7 @@
 .method public final an(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->cal:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bZF:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->aj(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -314,7 +315,7 @@
 .method public final ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->cal:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bZF:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->ah(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -324,11 +325,11 @@
 .method public final b(Lokhttp3/Headers;)Lokhttp3/w$a;
     .locals 0
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Hh()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Hg()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->cal:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bZF:Lokhttp3/Headers$a;
 
     return-object p0
 .end method
@@ -338,7 +339,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokhttp3/w$a;->bVp:Lokhttp3/s;
+    iput-object p1, p0, Lokhttp3/w$a;->bUJ:Lokhttp3/s;
 
     return-object p0
 
@@ -383,7 +384,6 @@
 
     const/4 v1, 0x3
 
-    :goto_0
     invoke-virtual {p1, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
     move-result-object p1
@@ -394,7 +394,7 @@
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v1, 0x1
@@ -423,10 +423,18 @@
 
     const/4 v1, 0x4
 
-    goto :goto_0
+    invoke-virtual {p1, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
 
     :cond_1
-    :goto_1
+    :goto_0
     invoke-static {p1}, Lokhttp3/s;->eo(Ljava/lang/String;)Lokhttp3/s;
 
     move-result-object p1
@@ -450,7 +458,7 @@
 .method public final eu(Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->cal:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bZF:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers$a;->ei(Ljava/lang/String;)Lokhttp3/Headers$a;
 
diff --git a/com.discord/smali/okhttp3/w.smali b/com.discord/smali/okhttp3/w.smali
index 9124881d39..8502f6fe2e 100644
--- a/com.discord/smali/okhttp3/w.smali
+++ b/com.discord/smali/okhttp3/w.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/w;
 .super Ljava/lang/Object;
+.source "Request.java"
 
 
 # annotations
@@ -11,16 +12,16 @@
 
 
 # instance fields
-.field public final bVp:Lokhttp3/s;
+.field public final bUJ:Lokhttp3/s;
 
-.field public final bZC:Lokhttp3/Headers;
+.field public final bYW:Lokhttp3/Headers;
 
-.field public final bZD:Lokhttp3/RequestBody;
+.field public final bYX:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final caj:Ljava/util/Map;
+.field final bZD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,7 +33,7 @@
     .end annotation
 .end field
 
-.field private volatile cak:Lokhttp3/d;
+.field private volatile bZE:Lokhttp3/d;
 
 .field public final method:Ljava/lang/String;
 
@@ -43,48 +44,48 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/w$a;->bVp:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w$a;->bUJ:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     iget-object v0, p1, Lokhttp3/w$a;->method:Ljava/lang/String;
 
     iput-object v0, p0, Lokhttp3/w;->method:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w$a;->cal:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/w$a;->bZF:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/w$a;->bZD:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w$a;->bYX:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
-    iget-object p1, p1, Lokhttp3/w$a;->caj:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/w$a;->bZD:Ljava/util/Map;
 
     invoke-static {p1}, Lokhttp3/internal/c;->s(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w;->caj:Ljava/util/Map;
+    iput-object p1, p0, Lokhttp3/w;->bZD:Ljava/util/Map;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HE()Lokhttp3/s;
+.method public final HD()Lokhttp3/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     return-object v0
 .end method
 
-.method public final HF()Lokhttp3/w$a;
+.method public final HE()Lokhttp3/w$a;
     .locals 1
 
     new-instance v0, Lokhttp3/w$a;
@@ -94,23 +95,23 @@
     return-object v0
 .end method
 
-.method public final HG()Lokhttp3/d;
+.method public final HF()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->cak:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/w;->bZE:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->cak:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/w;->bZE:Lokhttp3/d;
 
     return-object v0
 .end method
@@ -120,7 +121,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers;->get(Ljava/lang/String;)Ljava/lang/String;
 
@@ -154,7 +155,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -162,7 +163,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/w;->caj:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/w;->bZD: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 37a73c3bfe..b7ed60c2e0 100644
--- a/com.discord/smali/okhttp3/x$1.smali
+++ b/com.discord/smali/okhttp3/x$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/x$1;
 .super Lokhttp3/x;
+.source "ResponseBody.java"
 
 
 # annotations
@@ -14,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic caC:J
+.field final synthetic bZG:Lokhttp3/MediaType;
 
-.field final synthetic caD:Lokio/d;
+.field final synthetic bZW:J
 
-.field final synthetic cam:Lokhttp3/MediaType;
+.field final synthetic bZX:Lokio/d;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;JLokio/d;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/x$1;->cam:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/x$1;->bZG:Lokhttp3/MediaType;
 
-    iput-wide p2, p0, Lokhttp3/x$1;->caC:J
+    iput-wide p2, p0, Lokhttp3/x$1;->bZW:J
 
-    iput-object p4, p0, Lokhttp3/x$1;->caD:Lokio/d;
+    iput-object p4, p0, Lokhttp3/x$1;->bZX:Lokio/d;
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
@@ -38,10 +39,10 @@
 
 
 # virtual methods
-.method public final HK()Lokio/d;
+.method public final HJ()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/x$1;->caD:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$1;->bZX:Lokio/d;
 
     return-object v0
 .end method
@@ -49,7 +50,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget-wide v0, p0, Lokhttp3/x$1;->caC:J
+    iget-wide v0, p0, Lokhttp3/x$1;->bZW:J
 
     return-wide v0
 .end method
@@ -59,7 +60,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/x$1;->cam:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/x$1;->bZG:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/x.smali b/com.discord/smali/okhttp3/x.smali
index 595ae546d3..382273134c 100644
--- a/com.discord/smali/okhttp3/x.smali
+++ b/com.discord/smali/okhttp3/x.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/x;
 .super Ljava/lang/Object;
+.source "ResponseBody.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field public caB:Ljava/io/Reader;
+.field public bZV:Ljava/io/Reader;
 
 
 # direct methods
@@ -77,10 +78,10 @@
 
 
 # virtual methods
-.method public abstract HK()Lokio/d;
+.method public abstract HJ()Lokio/d;
 .end method
 
-.method public final HL()Ljava/lang/String;
+.method public final HK()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -88,7 +89,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v0
 
@@ -145,7 +146,7 @@
 .method public close()V
     .locals 1
 
-    invoke-virtual {p0}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v0
 
diff --git a/com.discord/smali/okhttp3/y.smali b/com.discord/smali/okhttp3/y.smali
index 97b59258bb..b745e0b4c4 100644
--- a/com.discord/smali/okhttp3/y.smali
+++ b/com.discord/smali/okhttp3/y.smali
@@ -1,13 +1,14 @@
 .class public final Lokhttp3/y;
 .super Ljava/lang/Object;
+.source "Route.java"
 
 
 # instance fields
-.field public final bVv:Ljava/net/Proxy;
+.field public final bUP:Ljava/net/Proxy;
 
-.field public final caG:Lokhttp3/a;
+.field public final caa:Lokhttp3/a;
 
-.field public final caH:Ljava/net/InetSocketAddress;
+.field public final cab:Ljava/net/InetSocketAddress;
 
 
 # direct methods
@@ -22,11 +23,11 @@
 
     if-eqz p3, :cond_0
 
-    iput-object p1, p0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iput-object p2, p0, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
-    iput-object p3, p0, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iput-object p3, p0, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
     return-void
 
@@ -60,16 +61,16 @@
 
 
 # virtual methods
-.method public final HM()Z
+.method public final HL()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->caa:Lokhttp3/a;
 
     iget-object v0, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -102,9 +103,9 @@
 
     check-cast p1, Lokhttp3/y;
 
-    iget-object v0, p1, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, p1, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v1, p0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v1, p0, Lokhttp3/y;->caa:Lokhttp3/a;
 
     invoke-virtual {v0, v1}, Lokhttp3/a;->equals(Ljava/lang/Object;)Z
 
@@ -112,9 +113,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v0, v1}, Ljava/net/Proxy;->equals(Ljava/lang/Object;)Z
 
@@ -122,9 +123,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p1, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object p1, p1, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
-    iget-object v0, p0, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v0, p0, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
     invoke-virtual {p1, v0}, Ljava/net/InetSocketAddress;->equals(Ljava/lang/Object;)Z
 
@@ -145,7 +146,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->caa:Lokhttp3/a;
 
     invoke-virtual {v0}, Lokhttp3/a;->hashCode()I
 
@@ -155,7 +156,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v1}, Ljava/net/Proxy;->hashCode()I
 
@@ -165,7 +166,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->cab:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v1}, Ljava/net/InetSocketAddress;->hashCode()I
 
@@ -185,7 +186,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/y;->caH:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->cab: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 72379a664a..11a392371d 100644
--- a/com.discord/smali/okio/BufferedSink.smali
+++ b/com.discord/smali/okio/BufferedSink.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokio/BufferedSink;
 .super Ljava/lang/Object;
+.source "BufferedSink.java"
 
 # interfaces
 .implements Ljava/nio/channels/WritableByteChannel;
@@ -7,10 +8,10 @@
 
 
 # virtual methods
-.method public abstract IX()Lokio/c;
+.method public abstract IW()Lokio/c;
 .end method
 
-.method public abstract IY()Lokio/BufferedSink;
+.method public abstract IX()Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -18,7 +19,7 @@
     .end annotation
 .end method
 
-.method public abstract Jj()Lokio/BufferedSink;
+.method public abstract Ji()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 3ebdd344c8..468d2c56da 100644
--- a/com.discord/smali/okio/a.smali
+++ b/com.discord/smali/okio/a.smali
@@ -1,5 +1,6 @@
 .class public Lokio/a;
 .super Lokio/r;
+.source "AsyncTimeout.java"
 
 
 # annotations
@@ -11,25 +12,25 @@
 
 
 # static fields
-.field private static final cgA:J
+.field private static final cfU:J
 
-.field private static final cgB:J
+.field private static final cfV:J
 
-.field static cgC:Lokio/a;
+.field static cfW:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 
 # instance fields
-.field private cgD:Z
+.field private cfX:Z
 
-.field private cgE:Lokio/a;
+.field private cfY:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private cgF:J
+.field private cfZ:J
 
 
 # direct methods
@@ -44,17 +45,17 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->cgA:J
+    sput-wide v0, Lokio/a;->cfU:J
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-wide v1, Lokio/a;->cgA:J
+    sget-wide v1, Lokio/a;->cfU:J
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->cgB:J
+    sput-wide v0, Lokio/a;->cfV:J
 
     return-void
 .end method
@@ -67,7 +68,7 @@
     return-void
 .end method
 
-.method static IW()Lokio/a;
+.method static IV()Lokio/a;
     .locals 8
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -78,9 +79,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lokio/a;->cgC:Lokio/a;
+    sget-object v0, Lokio/a;->cfW:Lokio/a;
 
-    iget-object v0, v0, Lokio/a;->cgE:Lokio/a;
+    iget-object v0, v0, Lokio/a;->cfY:Lokio/a;
 
     const/4 v1, 0x0
 
@@ -92,13 +93,13 @@
 
     const-class v0, Lokio/a;
 
-    sget-wide v4, Lokio/a;->cgA:J
+    sget-wide v4, Lokio/a;->cfU:J
 
     invoke-virtual {v0, v4, v5}, Ljava/lang/Object;->wait(J)V
 
-    sget-object v0, Lokio/a;->cgC:Lokio/a;
+    sget-object v0, Lokio/a;->cfW:Lokio/a;
 
-    iget-object v0, v0, Lokio/a;->cgE:Lokio/a;
+    iget-object v0, v0, Lokio/a;->cfY:Lokio/a;
 
     if-nez v0, :cond_0
 
@@ -108,13 +109,13 @@
 
     sub-long/2addr v4, v2
 
-    sget-wide v2, Lokio/a;->cgB:J
+    sget-wide v2, Lokio/a;->cfV:J
 
     cmp-long v0, v4, v2
 
     if-ltz v0, :cond_0
 
-    sget-object v0, Lokio/a;->cgC:Lokio/a;
+    sget-object v0, Lokio/a;->cfW:Lokio/a;
 
     return-object v0
 
@@ -126,7 +127,7 @@
 
     move-result-wide v2
 
-    iget-wide v4, v0, Lokio/a;->cgF:J
+    iget-wide v4, v0, Lokio/a;->cfZ:J
 
     sub-long/2addr v4, v2
 
@@ -153,13 +154,13 @@
     return-object v1
 
     :cond_2
-    sget-object v2, Lokio/a;->cgC:Lokio/a;
+    sget-object v2, Lokio/a;->cfW:Lokio/a;
 
-    iget-object v3, v0, Lokio/a;->cgE:Lokio/a;
+    iget-object v3, v0, Lokio/a;->cfY:Lokio/a;
 
-    iput-object v3, v2, Lokio/a;->cgE:Lokio/a;
+    iput-object v3, v2, Lokio/a;->cfY:Lokio/a;
 
-    iput-object v1, v0, Lokio/a;->cgE:Lokio/a;
+    iput-object v1, v0, Lokio/a;->cfY:Lokio/a;
 
     return-object v0
 .end method
@@ -172,7 +173,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->cgC:Lokio/a;
+    sget-object v1, Lokio/a;->cfW:Lokio/a;
 
     if-nez v1, :cond_0
 
@@ -180,7 +181,7 @@
 
     invoke-direct {v1}, Lokio/a;-><init>()V
 
-    sput-object v1, Lokio/a;->cgC:Lokio/a;
+    sput-object v1, Lokio/a;->cfW:Lokio/a;
 
     new-instance v1, Lokio/a$a;
 
@@ -201,23 +202,19 @@
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->Js()J
+    invoke-virtual {p0}, Lokio/a;->Jr()J
 
     move-result-wide v3
 
-    const/4 p3, 0x0
-
     sub-long/2addr v3, v1
 
     invoke-static {p1, p2, v3, v4}, Ljava/lang/Math;->min(JJ)J
 
     move-result-wide p1
 
-    const/4 p3, 0x0
-
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->cgF:J
+    iput-wide p1, p0, Lokio/a;->cfZ:J
 
     goto :goto_0
 
@@ -228,38 +225,34 @@
 
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->cgF:J
+    iput-wide p1, p0, Lokio/a;->cfZ:J
 
     goto :goto_0
 
     :cond_2
     if-eqz p3, :cond_6
 
-    invoke-virtual {p0}, Lokio/a;->Js()J
+    invoke-virtual {p0}, Lokio/a;->Jr()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/a;->cgF:J
+    iput-wide p1, p0, Lokio/a;->cfZ:J
 
     :goto_0
-    iget-wide p1, p0, Lokio/a;->cgF:J
-
-    const/4 p3, 0x0
+    iget-wide p1, p0, Lokio/a;->cfZ:J
 
     sub-long/2addr p1, v1
 
-    sget-object p3, Lokio/a;->cgC:Lokio/a;
+    sget-object p3, Lokio/a;->cfW:Lokio/a;
 
     :goto_1
-    iget-object v3, p3, Lokio/a;->cgE:Lokio/a;
+    iget-object v3, p3, Lokio/a;->cfY:Lokio/a;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, p3, Lokio/a;->cgE:Lokio/a;
+    iget-object v3, p3, Lokio/a;->cfY:Lokio/a;
 
-    iget-wide v3, v3, Lokio/a;->cgF:J
-
-    const/4 v5, 0x0
+    iget-wide v3, v3, Lokio/a;->cfZ:J
 
     sub-long/2addr v3, v1
 
@@ -270,19 +263,19 @@
     goto :goto_2
 
     :cond_3
-    iget-object p3, p3, Lokio/a;->cgE:Lokio/a;
+    iget-object p3, p3, Lokio/a;->cfY:Lokio/a;
 
     goto :goto_1
 
     :cond_4
     :goto_2
-    iget-object p1, p3, Lokio/a;->cgE:Lokio/a;
+    iget-object p1, p3, Lokio/a;->cfY:Lokio/a;
 
-    iput-object p1, p0, Lokio/a;->cgE:Lokio/a;
+    iput-object p1, p0, Lokio/a;->cfY:Lokio/a;
 
-    iput-object p0, p3, Lokio/a;->cgE:Lokio/a;
+    iput-object p0, p3, Lokio/a;->cfY:Lokio/a;
 
-    sget-object p0, Lokio/a;->cgC:Lokio/a;
+    sget-object p0, Lokio/a;->cfW:Lokio/a;
 
     if-ne p3, p0, :cond_5
 
@@ -317,6 +310,8 @@
     monitor-exit v0
 
     throw p0
+
+    return-void
 .end method
 
 .method private static declared-synchronized a(Lokio/a;)Z
@@ -327,35 +322,34 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->cgC:Lokio/a;
+    sget-object v1, Lokio/a;->cfW:Lokio/a;
 
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v2, v1, Lokio/a;->cgE:Lokio/a;
+    iget-object v2, v1, Lokio/a;->cfY:Lokio/a;
 
     if-ne v2, p0, :cond_0
 
-    iget-object v2, p0, Lokio/a;->cgE:Lokio/a;
+    iget-object v2, p0, Lokio/a;->cfY:Lokio/a;
 
-    iput-object v2, v1, Lokio/a;->cgE:Lokio/a;
+    iput-object v2, v1, Lokio/a;->cfY:Lokio/a;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokio/a;->cgE:Lokio/a;
+    iput-object v1, p0, Lokio/a;->cfY:Lokio/a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     const/4 p0, 0x0
 
-    :goto_1
     monitor-exit v0
 
     return p0
 
     :cond_0
     :try_start_1
-    iget-object v1, v1, Lokio/a;->cgE:Lokio/a;
+    iget-object v1, v1, Lokio/a;->cfY:Lokio/a;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -364,7 +358,9 @@
     :cond_1
     const/4 p0, 0x1
 
-    goto :goto_1
+    monitor-exit v0
+
+    return p0
 
     :catchall_0
     move-exception p0
@@ -372,14 +368,16 @@
     monitor-exit v0
 
     throw p0
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public final IV()Z
+.method public final IU()Z
     .locals 2
 
-    iget-boolean v0, p0, Lokio/a;->cgD:Z
+    iget-boolean v0, p0, Lokio/a;->cfX:Z
 
     const/4 v1, 0x0
 
@@ -388,7 +386,7 @@
     return v1
 
     :cond_0
-    iput-boolean v1, p0, Lokio/a;->cgD:Z
+    iput-boolean v1, p0, Lokio/a;->cfX:Z
 
     invoke-static {p0}, Lokio/a;->a(Lokio/a;)Z
 
@@ -397,13 +395,13 @@
     return v0
 .end method
 
-.method protected Iz()V
+.method protected Iy()V
     .locals 0
 
     return-void
 .end method
 
-.method final aj(Z)V
+.method final ai(Z)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -411,7 +409,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/a;->IV()Z
+    invoke-virtual {p0}, Lokio/a;->IU()Z
 
     move-result v0
 
@@ -464,7 +462,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/a;->IV()Z
+    invoke-virtual {p0}, Lokio/a;->IU()Z
 
     move-result v0
 
@@ -483,15 +481,15 @@
 .method public final enter()V
     .locals 6
 
-    iget-boolean v0, p0, Lokio/a;->cgD:Z
+    iget-boolean v0, p0, Lokio/a;->cfX:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->Jq()J
+    invoke-virtual {p0}, Lokio/a;->Jp()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lokio/a;->Jr()Z
+    invoke-virtual {p0}, Lokio/a;->Jq()Z
 
     move-result v2
 
@@ -508,7 +506,7 @@
     :cond_0
     const/4 v3, 0x1
 
-    iput-boolean v3, p0, Lokio/a;->cgD:Z
+    iput-boolean v3, p0, Lokio/a;->cfX:Z
 
     invoke-static {p0, v0, v1, v2}, Lokio/a;->a(Lokio/a;JZ)V
 
diff --git a/com.discord/smali/okio/c.smali b/com.discord/smali/okio/c.smali
index 15c5fdc864..4b0376dd5c 100644
--- a/com.discord/smali/okio/c.smali
+++ b/com.discord/smali/okio/c.smali
@@ -1,5 +1,6 @@
 .class public final Lokio/c;
 .super Ljava/lang/Object;
+.source "Buffer.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
@@ -17,11 +18,11 @@
 
 
 # static fields
-.field private static final cgL:[B
+.field private static final cgf:[B
 
 
 # instance fields
-.field cgM:Lokio/m;
+.field cgg:Lokio/m;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -39,7 +40,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokio/c;->cgL:[B
+    sput-object v0, Lokio/c;->cgf:[B
 
     return-void
 
@@ -107,7 +108,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v0, Lokio/m;->pos:I
 
@@ -166,11 +167,11 @@
 
     if-ne p1, p2, :cond_2
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object p1, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -223,19 +224,19 @@
 
 
 # virtual methods
-.method public final IX()Lokio/c;
+.method public final IW()Lokio/c;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final IY()Lokio/BufferedSink;
+.method public final IX()Lokio/BufferedSink;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final IZ()Z
+.method public final IY()Z
     .locals 5
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -256,7 +257,17 @@
     return v0
 .end method
 
-.method public final Ik()Lokio/ByteString;
+.method public final IZ()Ljava/io/InputStream;
+    .locals 1
+
+    new-instance v0, Lokio/c$2;
+
+    invoke-direct {v0, p0}, Lokio/c$2;-><init>(Lokio/c;)V
+
+    return-object v0
+.end method
+
+.method public final Ij()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
@@ -270,17 +281,7 @@
     return-object v0
 .end method
 
-.method public final Ja()Ljava/io/InputStream;
-    .locals 1
-
-    new-instance v0, Lokio/c$2;
-
-    invoke-direct {v0, p0}, Lokio/c$2;-><init>(Lokio/c;)V
-
-    return-object v0
-.end method
-
-.method public final Jb()J
+.method public final Ja()J
     .locals 5
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -294,9 +295,9 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, p0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v2, v2, Lokio/m;->chg:Lokio/m;
+    iget-object v2, v2, Lokio/m;->cgA:Lokio/m;
 
     iget v3, v2, Lokio/m;->limit:I
 
@@ -322,7 +323,7 @@
     return-wide v0
 .end method
 
-.method public final Jc()S
+.method public final Jb()S
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readShort()S
@@ -336,7 +337,7 @@
     return v0
 .end method
 
-.method public final Jd()I
+.method public final Jc()I
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readInt()I
@@ -350,7 +351,7 @@
     return v0
 .end method
 
-.method public final Je()J
+.method public final Jd()J
     .locals 15
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -368,7 +369,7 @@
     const/4 v1, 0x0
 
     :cond_0
-    iget-object v6, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v6, p0, Lokio/c;->cgg:Lokio/m;
 
     iget-object v7, v6, Lokio/m;->data:[B
 
@@ -391,7 +392,7 @@
 
     add-int/lit8 v11, v10, -0x30
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const/16 v11, 0x61
@@ -404,10 +405,9 @@
 
     add-int/lit8 v11, v10, -0x61
 
-    :goto_1
     add-int/lit8 v11, v11, 0xa
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/16 v11, 0x41
@@ -420,9 +420,9 @@
 
     add-int/lit8 v11, v10, -0x41
 
-    goto :goto_1
+    add-int/lit8 v11, v11, 0xa
 
-    :goto_2
+    :goto_1
     const-wide/high16 v12, -0x1000000000000000L    # -3.105036184601418E231
 
     and-long/2addr v12, v4
@@ -441,7 +441,7 @@
 
     add-int/lit8 v8, v8, 0x1
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
@@ -466,7 +466,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lokio/c;->Jf()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Je()Ljava/lang/String;
 
     move-result-object v0
 
@@ -481,11 +481,11 @@
     throw v1
 
     :cond_4
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     new-instance v0, Ljava/lang/NumberFormatException;
@@ -511,37 +511,37 @@
     throw v0
 
     :cond_6
-    :goto_3
+    :goto_2
     if-ne v8, v9, :cond_7
 
-    invoke-virtual {v6}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v6}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v7
 
-    iput-object v7, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v7, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v6}, Lokio/n;->b(Lokio/m;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     iput v8, v6, Lokio/m;->pos:I
 
-    :goto_4
-    if-nez v1, :cond_8
+    :goto_3
+    if-nez v0, :cond_8
 
-    iget-object v6, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v6, p0, Lokio/c;->cgg:Lokio/m;
 
     if-nez v6, :cond_0
 
     :cond_8
-    iget-wide v1, p0, Lokio/c;->size:J
+    iget-wide v2, p0, Lokio/c;->size:J
 
-    int-to-long v6, v0
+    int-to-long v0, v1
 
-    sub-long/2addr v1, v6
+    sub-long/2addr v2, v0
 
-    iput-wide v1, p0, Lokio/c;->size:J
+    iput-wide v2, p0, Lokio/c;->size:J
 
     return-wide v4
 
@@ -553,9 +553,11 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
-.method public final Jf()Ljava/lang/String;
+.method public final Je()Ljava/lang/String;
     .locals 3
 
     :try_start_0
@@ -581,7 +583,7 @@
     throw v1
 .end method
 
-.method public final Jg()Ljava/lang/String;
+.method public final Jf()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -598,7 +600,7 @@
     return-object v0
 .end method
 
-.method public final Jh()J
+.method public final Jg()J
     .locals 6
 
     const/4 v1, 0x0
@@ -616,7 +618,7 @@
     return-wide v0
 .end method
 
-.method public final Ji()Lokio/c;
+.method public final Jh()Lokio/c;
     .locals 6
 
     new-instance v0, Lokio/c;
@@ -634,38 +636,34 @@
     return-object v0
 
     :cond_0
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
-    invoke-virtual {v1}, Lokio/m;->Jx()Lokio/m;
+    invoke-virtual {v1}, Lokio/m;->Jw()Lokio/m;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokio/c;->cgM:Lokio/m;
+    iput-object v1, v0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v1, v0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, v0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v2, v0, Lokio/c;->cgM:Lokio/m;
+    iput-object v1, v1, Lokio/m;->cgA:Lokio/m;
 
-    iget-object v3, v0, Lokio/c;->cgM:Lokio/m;
+    iput-object v1, v1, Lokio/m;->cgz:Lokio/m;
 
-    iput-object v3, v2, Lokio/m;->chg:Lokio/m;
-
-    iput-object v3, v1, Lokio/m;->chf:Lokio/m;
-
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     :goto_0
-    iget-object v1, v1, Lokio/m;->chf:Lokio/m;
+    iget-object v1, v1, Lokio/m;->cgz:Lokio/m;
 
-    iget-object v2, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, p0, Lokio/c;->cgg:Lokio/m;
 
     if-eq v1, v2, :cond_1
 
-    iget-object v2, v0, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, v0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v2, v2, Lokio/m;->chg:Lokio/m;
+    iget-object v2, v2, Lokio/m;->cgA:Lokio/m;
 
-    invoke-virtual {v1}, Lokio/m;->Jx()Lokio/m;
+    invoke-virtual {v1}, Lokio/m;->Jw()Lokio/m;
 
     move-result-object v3
 
@@ -681,7 +679,7 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic Jj()Lokio/BufferedSink;
+.method public final bridge synthetic Ji()Lokio/BufferedSink;
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -733,214 +731,232 @@
 .end method
 
 .method public final a(BJJ)J
-    .locals 10
+    .locals 15
 
-    const-wide/16 v0, 0x0
+    move-object v0, p0
 
-    cmp-long v2, p2, v0
+    const-wide/16 v1, 0x0
 
-    if-ltz v2, :cond_8
+    cmp-long v3, p2, v1
 
-    cmp-long v2, p4, p2
+    if-ltz v3, :cond_9
 
-    if-ltz v2, :cond_8
+    cmp-long v3, p4, p2
 
-    iget-wide v2, p0, Lokio/c;->size:J
+    if-ltz v3, :cond_9
 
-    cmp-long v4, p4, v2
+    iget-wide v3, v0, Lokio/c;->size:J
 
-    if-lez v4, :cond_0
+    cmp-long v5, p4, v3
 
-    iget-wide p4, p0, Lokio/c;->size:J
-
-    :cond_0
-    const-wide/16 v2, -0x1
-
-    cmp-long v4, p2, p4
-
-    if-nez v4, :cond_1
-
-    return-wide v2
-
-    :cond_1
-    iget-object v4, p0, Lokio/c;->cgM:Lokio/m;
-
-    if-nez v4, :cond_2
-
-    return-wide v2
-
-    :cond_2
-    iget-wide v5, p0, Lokio/c;->size:J
-
-    sub-long/2addr v5, p2
-
-    cmp-long v7, v5, p2
-
-    if-gez v7, :cond_3
-
-    iget-wide v0, p0, Lokio/c;->size:J
-
-    :goto_0
-    cmp-long v5, v0, p2
-
-    if-lez v5, :cond_4
-
-    iget-object v4, v4, Lokio/m;->chg:Lokio/m;
-
-    iget v5, v4, Lokio/m;->limit:I
-
-    iget v6, v4, Lokio/m;->pos:I
-
-    sub-int/2addr v5, v6
-
-    int-to-long v5, v5
-
-    sub-long/2addr v0, v5
+    if-lez v5, :cond_0
 
     goto :goto_0
 
-    :cond_3
+    :cond_0
+    move-wide/from16 v3, p4
+
+    :goto_0
+    const-wide/16 v5, -0x1
+
+    cmp-long v7, p2, v3
+
+    if-nez v7, :cond_1
+
+    return-wide v5
+
+    :cond_1
+    iget-object v7, v0, Lokio/c;->cgg:Lokio/m;
+
+    if-nez v7, :cond_2
+
+    return-wide v5
+
+    :cond_2
+    iget-wide v8, v0, Lokio/c;->size:J
+
+    sub-long v10, v8, p2
+
+    cmp-long v12, v10, p2
+
+    if-gez v12, :cond_4
+
     :goto_1
-    iget v5, v4, Lokio/m;->limit:I
+    cmp-long v1, v8, p2
 
-    iget v6, v4, Lokio/m;->pos:I
+    if-lez v1, :cond_3
 
-    sub-int/2addr v5, v6
+    iget-object v7, v7, Lokio/m;->cgA:Lokio/m;
 
-    int-to-long v5, v5
+    iget v1, v7, Lokio/m;->limit:I
 
-    add-long/2addr v5, v0
+    iget v2, v7, Lokio/m;->pos:I
 
-    cmp-long v7, v5, p2
+    sub-int/2addr v1, v2
 
-    if-gez v7, :cond_4
+    int-to-long v1, v1
 
-    iget-object v4, v4, Lokio/m;->chf:Lokio/m;
-
-    move-wide v0, v5
+    sub-long/2addr v8, v1
 
     goto :goto_1
 
-    :cond_4
-    :goto_2
-    cmp-long v5, v0, p4
-
-    if-gez v5, :cond_7
-
-    iget-object v5, v4, Lokio/m;->data:[B
-
-    iget v6, v4, Lokio/m;->limit:I
-
-    int-to-long v6, v6
-
-    iget v8, v4, Lokio/m;->pos:I
-
-    int-to-long v8, v8
-
-    add-long/2addr v8, p4
-
-    sub-long/2addr v8, v0
-
-    invoke-static {v6, v7, v8, v9}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v6
-
-    long-to-int v6, v6
-
-    iget v7, v4, Lokio/m;->pos:I
-
-    int-to-long v7, v7
-
-    add-long/2addr v7, p2
-
-    sub-long/2addr v7, v0
-
-    long-to-int p2, v7
-
-    :goto_3
-    if-ge p2, v6, :cond_6
-
-    aget-byte p3, v5, p2
-
-    if-ne p3, p1, :cond_5
-
-    iget p1, v4, Lokio/m;->pos:I
-
-    sub-int/2addr p2, p1
-
-    int-to-long p1, p2
-
-    add-long/2addr p1, v0
-
-    return-wide p1
-
-    :cond_5
-    add-int/lit8 p2, p2, 0x1
+    :cond_3
+    move-wide/from16 v1, p2
 
     goto :goto_3
 
-    :cond_6
-    iget p2, v4, Lokio/m;->limit:I
+    :cond_4
+    move-wide v8, v1
 
-    iget p3, v4, Lokio/m;->pos:I
+    :goto_2
+    iget v1, v7, Lokio/m;->limit:I
 
-    sub-int/2addr p2, p3
+    iget v2, v7, Lokio/m;->pos:I
 
-    int-to-long p2, p2
+    sub-int/2addr v1, v2
 
-    add-long/2addr p2, v0
+    int-to-long v1, v1
 
-    iget-object v4, v4, Lokio/m;->chf:Lokio/m;
+    add-long/2addr v1, v8
 
-    move-wide v0, p2
+    cmp-long v10, v1, p2
+
+    if-gez v10, :cond_5
+
+    iget-object v7, v7, Lokio/m;->cgz:Lokio/m;
+
+    move-wide v8, v1
 
     goto :goto_2
 
+    :cond_5
+    move-wide/from16 v1, p2
+
+    :goto_3
+    cmp-long v10, v8, v3
+
+    if-gez v10, :cond_8
+
+    iget-object v10, v7, Lokio/m;->data:[B
+
+    iget v11, v7, Lokio/m;->limit:I
+
+    int-to-long v11, v11
+
+    iget v13, v7, Lokio/m;->pos:I
+
+    int-to-long v13, v13
+
+    add-long/2addr v13, v3
+
+    sub-long/2addr v13, v8
+
+    invoke-static {v11, v12, v13, v14}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v11
+
+    long-to-int v11, v11
+
+    iget v12, v7, Lokio/m;->pos:I
+
+    int-to-long v12, v12
+
+    add-long/2addr v12, v1
+
+    sub-long/2addr v12, v8
+
+    long-to-int v1, v12
+
+    :goto_4
+    if-ge v1, v11, :cond_7
+
+    aget-byte v2, v10, v1
+
+    move/from16 v12, p1
+
+    if-ne v2, v12, :cond_6
+
+    iget v2, v7, Lokio/m;->pos:I
+
+    sub-int/2addr v1, v2
+
+    int-to-long v1, v1
+
+    add-long/2addr v1, v8
+
+    return-wide v1
+
+    :cond_6
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_4
+
     :cond_7
-    return-wide v2
+    move/from16 v12, p1
+
+    iget v1, v7, Lokio/m;->limit:I
+
+    iget v2, v7, Lokio/m;->pos:I
+
+    sub-int/2addr v1, v2
+
+    int-to-long v1, v1
+
+    add-long/2addr v1, v8
+
+    iget-object v7, v7, Lokio/m;->cgz:Lokio/m;
+
+    move-wide v8, v1
+
+    goto :goto_3
 
     :cond_8
-    new-instance p1, Ljava/lang/IllegalArgumentException;
+    return-wide v5
 
-    const/4 v0, 0x3
+    :cond_9
+    new-instance v1, Ljava/lang/IllegalArgumentException;
 
-    new-array v0, v0, [Ljava/lang/Object;
+    const/4 v2, 0x3
 
-    const/4 v1, 0x0
+    new-array v2, v2, [Ljava/lang/Object;
 
-    iget-wide v2, p0, Lokio/c;->size:J
+    const/4 v3, 0x0
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    iget-wide v4, v0, Lokio/c;->size:J
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    aput-object v4, v2, v3
+
+    invoke-static/range {p2 .. p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    const/4 v4, 0x1
+
+    aput-object v3, v2, v4
+
+    const/4 v3, 0x2
+
+    invoke-static/range {p4 .. p5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    aput-object v4, v2, v3
+
+    const-string v3, "size=%s fromIndex=%s toIndex=%s"
+
+    invoke-static {v3, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
-    aput-object v2, v0, v1
+    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
-    invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    throw v1
 
-    move-result-object p2
-
-    const/4 p3, 0x1
-
-    aput-object p2, v0, p3
-
-    const/4 p2, 0x2
-
-    invoke-static {p4, p5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p3
-
-    aput-object p3, v0, p2
-
-    const-string p2, "size=%s fromIndex=%s toIndex=%s"
-
-    invoke-static {p2, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
+    return-void
 .end method
 
 .method public final a(Lokio/c;J)J
@@ -965,13 +981,11 @@
     return-wide p1
 
     :cond_0
-    iget-wide v0, p0, Lokio/c;->size:J
+    cmp-long v0, p2, v2
 
-    cmp-long v2, p2, v0
+    if-lez v0, :cond_1
 
-    if-lez v2, :cond_1
-
-    iget-wide p2, p0, Lokio/c;->size:J
+    move-wide p2, v2
 
     :cond_1
     invoke-virtual {p1, p0, p2, p3}, Lokio/c;->write(Lokio/c;J)V
@@ -1067,20 +1081,22 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(Lokio/c$a;)Lokio/c$a;
     .locals 1
 
-    iget-object v0, p1, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v0, p1, Lokio/c$a;->cfG:Lokio/c;
 
     if-nez v0, :cond_0
 
-    iput-object p0, p1, Lokio/c$a;->cgm:Lokio/c;
+    iput-object p0, p1, Lokio/c$a;->cfG:Lokio/c;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokio/c$a;->cgO:Z
+    iput-boolean v0, p1, Lokio/c$a;->cgi:Z
 
     return-object p1
 
@@ -1122,7 +1138,7 @@
 
     iput-wide v2, p1, Lokio/c;->size:J
 
-    iget-object v2, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, p0, Lokio/c;->cgg:Lokio/m;
 
     :goto_0
     iget v3, v2, Lokio/m;->limit:I
@@ -1147,7 +1163,7 @@
 
     sub-long/2addr p2, v3
 
-    iget-object v2, v2, Lokio/m;->chf:Lokio/m;
+    iget-object v2, v2, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_0
 
@@ -1157,7 +1173,7 @@
 
     if-lez v3, :cond_3
 
-    invoke-virtual {v2}, Lokio/m;->Jx()Lokio/m;
+    invoke-virtual {v2}, Lokio/m;->Jw()Lokio/m;
 
     move-result-object v3
 
@@ -1185,22 +1201,20 @@
 
     iput p2, v3, Lokio/m;->limit:I
 
-    iget-object p2, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object p2, p1, Lokio/c;->cgg:Lokio/m;
 
     if-nez p2, :cond_2
 
-    iput-object v3, v3, Lokio/m;->chg:Lokio/m;
+    iput-object v3, v3, Lokio/m;->cgA:Lokio/m;
 
-    iput-object v3, v3, Lokio/m;->chf:Lokio/m;
+    iput-object v3, v3, Lokio/m;->cgz:Lokio/m;
 
-    iput-object v3, p1, Lokio/c;->cgM:Lokio/m;
+    iput-object v3, p1, Lokio/c;->cgg:Lokio/m;
 
     goto :goto_2
 
     :cond_2
-    iget-object p2, p1, Lokio/c;->cgM:Lokio/m;
-
-    iget-object p2, p2, Lokio/m;->chg:Lokio/m;
+    iget-object p2, p2, Lokio/m;->cgA:Lokio/m;
 
     invoke-virtual {p2, v3}, Lokio/m;->a(Lokio/m;)Lokio/m;
 
@@ -1215,7 +1229,7 @@
 
     sub-long/2addr p4, p2
 
-    iget-object v2, v2, Lokio/m;->chf:Lokio/m;
+    iget-object v2, v2, Lokio/m;->cgz:Lokio/m;
 
     move-wide p2, v0
 
@@ -1232,6 +1246,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final aV(J)V
@@ -1271,13 +1287,13 @@
 
     iget-wide v0, p0, Lokio/c;->size:J
 
-    sub-long/2addr v0, p1
+    sub-long v2, v0, p1
 
-    cmp-long v2, v0, p1
+    cmp-long v4, v2, p1
 
-    if-lez v2, :cond_1
+    if-lez v4, :cond_1
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     :goto_0
     iget v1, v0, Lokio/m;->limit:I
@@ -1305,23 +1321,19 @@
     return p1
 
     :cond_0
-    const/4 v3, 0x0
-
     sub-long/2addr p1, v1
 
-    iget-object v0, v0, Lokio/m;->chf:Lokio/m;
+    iget-object v0, v0, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_0
 
     :cond_1
-    iget-wide v0, p0, Lokio/c;->size:J
-
     sub-long/2addr p1, v0
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     :cond_2
-    iget-object v0, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v0, v0, Lokio/m;->cgA:Lokio/m;
 
     iget v1, v0, Lokio/m;->limit:I
 
@@ -1396,8 +1408,6 @@
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
-
     add-long v2, p1, v0
 
     :goto_0
@@ -1497,11 +1507,11 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Ij()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Jo()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Jn()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1556,9 +1566,7 @@
     return-void
 
     :cond_0
-    iget-wide p2, p0, Lokio/c;->size:J
-
-    invoke-virtual {p1, p0, p2, p3}, Lokio/c;->write(Lokio/c;J)V
+    invoke-virtual {p1, p0, v0, v1}, Lokio/c;->write(Lokio/c;J)V
 
     new-instance p1, Ljava/io/EOFException;
 
@@ -1599,7 +1607,6 @@
 
     const-wide/16 v0, 0x2
 
-    :goto_0
     invoke-virtual {p0, v0, v1}, Lokio/c;->bc(J)V
 
     return-object p1
@@ -1609,7 +1616,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p0, v0, v1}, Lokio/c;->bc(J)V
+
+    return-object p1
 .end method
 
 .method public final bb(J)[B
@@ -1676,15 +1685,13 @@
 
     if-lez v2, :cond_2
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
-
     iget v0, v0, Lokio/m;->limit:I
 
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v1, Lokio/m;->pos:I
 
@@ -1708,7 +1715,7 @@
 
     sub-long/2addr p1, v3
 
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v2, v1, Lokio/m;->pos:I
 
@@ -1716,23 +1723,23 @@
 
     iput v2, v1, Lokio/m;->pos:I
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v0, v0, Lokio/m;->pos:I
 
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v1, Lokio/m;->limit:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -2018,7 +2025,7 @@
 
     add-int/lit8 v8, v8, -0x1
 
-    sget-object v10, Lokio/c;->cgL:[B
+    sget-object v10, Lokio/c;->cgf:[B
 
     aget-byte v9, v10, v9
 
@@ -2104,7 +2111,7 @@
     :goto_0
     if-lt v4, v5, :cond_1
 
-    sget-object v6, Lokio/c;->cgL:[B
+    sget-object v6, Lokio/c;->cgf:[B
 
     const-wide/16 v7, 0xf
 
@@ -2224,7 +2231,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/c;->Ji()Lokio/c;
+    invoke-virtual {p0}, Lokio/c;->Jh()Lokio/c;
 
     move-result-object v0
 
@@ -2300,8 +2307,6 @@
     return v2
 
     :cond_2
-    iget-wide v3, p0, Lokio/c;->size:J
-
     const-wide/16 v5, 0x0
 
     cmp-long v1, v3, v5
@@ -2311,9 +2316,9 @@
     return v0
 
     :cond_3
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object p1, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object p1, p1, Lokio/c;->cgg:Lokio/m;
 
     iget v3, v1, Lokio/m;->pos:I
 
@@ -2383,7 +2388,7 @@
 
     if-ne v4, v3, :cond_6
 
-    iget-object v1, v1, Lokio/m;->chf:Lokio/m;
+    iget-object v1, v1, Lokio/m;->cgz:Lokio/m;
 
     iget v3, v1, Lokio/m;->pos:I
 
@@ -2397,7 +2402,7 @@
 
     if-ne v9, v4, :cond_7
 
-    iget-object p1, p1, Lokio/m;->chf:Lokio/m;
+    iget-object p1, p1, Lokio/m;->cgz:Lokio/m;
 
     iget v4, p1, Lokio/m;->pos:I
 
@@ -2407,8 +2412,6 @@
     move v4, v9
 
     :goto_3
-    const/4 v9, 0x0
-
     add-long/2addr v5, v7
 
     goto :goto_0
@@ -2430,10 +2433,9 @@
 
     if-ge p1, v0, :cond_0
 
-    :goto_0
     invoke-virtual {p0, p1}, Lokio/c;->fs(I)Lokio/c;
 
-    goto :goto_3
+    goto :goto_0
 
     :cond_0
     const/16 v1, 0x800
@@ -2446,13 +2448,14 @@
 
     or-int/lit16 v1, v1, 0xc0
 
-    :goto_1
     invoke-virtual {p0, v1}, Lokio/c;->fs(I)Lokio/c;
 
     and-int/2addr p1, v2
 
     or-int/2addr p1, v0
 
+    invoke-virtual {p0, p1}, Lokio/c;->fs(I)Lokio/c;
+
     goto :goto_0
 
     :cond_1
@@ -2470,14 +2473,13 @@
 
     invoke-virtual {p0, v2}, Lokio/c;->fs(I)Lokio/c;
 
-    goto :goto_3
+    goto :goto_0
 
     :cond_2
     shr-int/lit8 v1, p1, 0xc
 
     or-int/lit16 v1, v1, 0xe0
 
-    :goto_2
     invoke-virtual {p0, v1}, Lokio/c;->fs(I)Lokio/c;
 
     shr-int/lit8 v1, p1, 0x6
@@ -2486,7 +2488,15 @@
 
     or-int/2addr v1, v0
 
-    goto :goto_1
+    invoke-virtual {p0, v1}, Lokio/c;->fs(I)Lokio/c;
+
+    and-int/2addr p1, v2
+
+    or-int/2addr p1, v0
+
+    invoke-virtual {p0, p1}, Lokio/c;->fs(I)Lokio/c;
+
+    goto :goto_0
 
     :cond_3
     const v1, 0x10ffff
@@ -2505,9 +2515,23 @@
 
     or-int/2addr v1, v0
 
-    goto :goto_2
+    invoke-virtual {p0, v1}, Lokio/c;->fs(I)Lokio/c;
 
-    :goto_3
+    shr-int/lit8 v1, p1, 0x6
+
+    and-int/2addr v1, v2
+
+    or-int/2addr v1, v0
+
+    invoke-virtual {p0, v1}, Lokio/c;->fs(I)Lokio/c;
+
+    and-int/2addr p1, v2
+
+    or-int/2addr p1, v0
+
+    invoke-virtual {p0, p1}, Lokio/c;->fs(I)Lokio/c;
+
+    :goto_0
     return-object p0
 
     :cond_4
@@ -2683,32 +2707,26 @@
 
     if-gt p1, v0, :cond_3
 
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lokio/n;->JA()Lokio/m;
+    invoke-static {}, Lokio/n;->Jz()Lokio/m;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object p1, p0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object p1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object p1, p0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object p1, p1, Lokio/m;->cgA:Lokio/m;
 
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object p1, p1, Lokio/m;->cgz:Lokio/m;
 
-    iput-object v1, v0, Lokio/m;->chg:Lokio/m;
-
-    iput-object v1, p1, Lokio/m;->chf:Lokio/m;
-
-    return-object v1
+    return-object p1
 
     :cond_0
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
-
-    iget-object v1, v1, Lokio/m;->chg:Lokio/m;
+    iget-object v1, v1, Lokio/m;->cgA:Lokio/m;
 
     iget v2, v1, Lokio/m;->limit:I
 
@@ -2721,7 +2739,7 @@
     if-nez p1, :cond_2
 
     :cond_1
-    invoke-static {}, Lokio/n;->JA()Lokio/m;
+    invoke-static {}, Lokio/n;->Jz()Lokio/m;
 
     move-result-object p1
 
@@ -2879,7 +2897,7 @@
 .method public final hashCode()I
     .locals 5
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     if-nez v0, :cond_0
 
@@ -2911,9 +2929,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, v0, Lokio/m;->chf:Lokio/m;
+    iget-object v0, v0, Lokio/m;->cgz:Lokio/m;
 
-    iget-object v2, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, p0, Lokio/c;->cgg:Lokio/m;
 
     if-ne v0, v2, :cond_1
 
@@ -2995,9 +3013,9 @@
 
     aput-byte v0, v3, p2
 
-    :goto_1
     move p2, v6
 
+    :goto_1
     if-ge p2, v5, :cond_0
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
@@ -3014,6 +3032,8 @@
 
     aput-byte v0, v3, p2
 
+    move p2, v6
+
     goto :goto_1
 
     :cond_0
@@ -3048,7 +3068,6 @@
 
     or-int/lit16 v2, v2, 0xc0
 
-    :goto_2
     invoke-virtual {p0, v2}, Lokio/c;->fs(I)Lokio/c;
 
     and-int/lit8 v0, v0, 0x3f
@@ -3072,7 +3091,7 @@
 
     if-le v0, v2, :cond_3
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_3
     add-int/lit8 v4, p2, 0x1
@@ -3083,12 +3102,12 @@
 
     move-result v5
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/4 v5, 0x0
 
-    :goto_3
+    :goto_2
     const v6, 0xdbff
 
     if-gt v0, v6, :cond_6
@@ -3099,7 +3118,7 @@
 
     if-le v5, v2, :cond_5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const/high16 v2, 0x10000
@@ -3151,7 +3170,7 @@
     goto/16 :goto_0
 
     :cond_6
-    :goto_4
+    :goto_3
     invoke-virtual {p0, v3}, Lokio/c;->fs(I)Lokio/c;
 
     move p2, v4
@@ -3159,7 +3178,7 @@
     goto/16 :goto_0
 
     :cond_7
-    :goto_5
+    :goto_4
     shr-int/lit8 v2, v0, 0xc
 
     or-int/lit16 v2, v2, 0xe0
@@ -3172,7 +3191,17 @@
 
     or-int/2addr v2, v1
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Lokio/c;->fs(I)Lokio/c;
+
+    and-int/lit8 v0, v0, 0x3f
+
+    or-int/2addr v0, v1
+
+    invoke-virtual {p0, v0}, Lokio/c;->fs(I)Lokio/c;
+
+    add-int/lit8 p2, p2, 0x1
+
+    goto/16 :goto_0
 
     :cond_8
     return-object p0
@@ -3256,6 +3285,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final q([BII)Lokio/c;
@@ -3329,6 +3360,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final synthetic r([BII)Lokio/BufferedSink;
@@ -3354,7 +3387,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     if-nez v0, :cond_0
 
@@ -3403,11 +3436,11 @@
 
     if-ne p1, v2, :cond_1
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object p1, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -3428,7 +3461,7 @@
 
     invoke-static/range {v1 .. v6}, Lokio/s;->c(JJJ)V
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     if-nez v0, :cond_0
 
@@ -3473,11 +3506,11 @@
 
     if-ne p1, p2, :cond_1
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object p1, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -3496,7 +3529,7 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v0, Lokio/m;->pos:I
 
@@ -3518,11 +3551,11 @@
 
     if-ne v4, v2, :cond_0
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v2, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -3621,7 +3654,7 @@
 
     if-ltz v4, :cond_2
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v0, Lokio/m;->pos:I
 
@@ -3718,11 +3751,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v2, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -3767,7 +3800,7 @@
 
     if-ltz v4, :cond_2
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v0, Lokio/m;->pos:I
 
@@ -3920,11 +3953,11 @@
 
     if-ne v1, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -3969,7 +4002,7 @@
 
     if-ltz v4, :cond_2
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v0, Lokio/m;->pos:I
 
@@ -4028,11 +4061,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v2, p0, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -4090,7 +4123,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    sget-object v0, Lokio/r;->chk:Lokio/r;
+    sget-object v0, Lokio/r;->cgE:Lokio/r;
 
     return-object v0
 .end method
@@ -4106,13 +4139,11 @@
 
     if-gtz v4, :cond_1
 
-    iget-wide v0, p0, Lokio/c;->size:J
-
     long-to-int v0, v0
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lokio/ByteString;->cgQ:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->cgk:Lokio/ByteString;
 
     goto :goto_0
 
@@ -4220,6 +4251,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final write(Lokio/c;J)V
@@ -4244,11 +4277,11 @@
 
     if-lez v2, :cond_a
 
-    iget-object v0, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p1, Lokio/c;->cgg:Lokio/m;
 
     iget v0, v0, Lokio/m;->limit:I
 
-    iget-object v1, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p1, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v1, Lokio/m;->pos:I
 
@@ -4262,13 +4295,11 @@
 
     if-gez v3, :cond_5
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
-
-    iget-object v0, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v0, v0, Lokio/m;->cgA:Lokio/m;
 
     goto :goto_1
 
@@ -4288,7 +4319,7 @@
 
     add-long/2addr v3, p2
 
-    iget-boolean v1, v0, Lokio/m;->che:Z
+    iget-boolean v1, v0, Lokio/m;->cgy:Z
 
     if-eqz v1, :cond_1
 
@@ -4310,7 +4341,7 @@
 
     if-gtz v1, :cond_2
 
-    iget-object v1, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p1, Lokio/c;->cgg:Lokio/m;
 
     long-to-int v2, p2
 
@@ -4331,7 +4362,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p1, Lokio/c;->cgg:Lokio/m;
 
     long-to-int v1, p2
 
@@ -4349,14 +4380,14 @@
 
     if-lt v1, v3, :cond_3
 
-    invoke-virtual {v0}, Lokio/m;->Jx()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jw()Lokio/m;
 
     move-result-object v3
 
     goto :goto_3
 
     :cond_3
-    invoke-static {}, Lokio/n;->JA()Lokio/m;
+    invoke-static {}, Lokio/n;->Jz()Lokio/m;
 
     move-result-object v3
 
@@ -4381,11 +4412,11 @@
 
     iput v4, v0, Lokio/m;->pos:I
 
-    iget-object v0, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v0, v0, Lokio/m;->cgA:Lokio/m;
 
     invoke-virtual {v0, v3}, Lokio/m;->a(Lokio/m;)Lokio/m;
 
-    iput-object v3, p1, Lokio/c;->cgM:Lokio/m;
+    iput-object v3, p1, Lokio/c;->cgg:Lokio/m;
 
     goto :goto_4
 
@@ -4398,7 +4429,7 @@
 
     :cond_5
     :goto_4
-    iget-object v0, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p1, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v0, Lokio/m;->limit:I
 
@@ -4408,44 +4439,38 @@
 
     int-to-long v3, v1
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->cgM:Lokio/m;
+    iput-object v1, p1, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v1, p0, Lokio/c;->cgg:Lokio/m;
 
     if-nez v1, :cond_6
 
-    iput-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v0, p0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p0, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
+    iput-object v0, v0, Lokio/m;->cgA:Lokio/m;
 
-    iget-object v2, p0, Lokio/c;->cgM:Lokio/m;
-
-    iput-object v2, v1, Lokio/m;->chg:Lokio/m;
-
-    iput-object v2, v0, Lokio/m;->chf:Lokio/m;
+    iput-object v0, v0, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_6
 
     :cond_6
-    iget-object v1, p0, Lokio/c;->cgM:Lokio/m;
-
-    iget-object v1, v1, Lokio/m;->chg:Lokio/m;
+    iget-object v1, v1, Lokio/m;->cgA:Lokio/m;
 
     invoke-virtual {v1, v0}, Lokio/m;->a(Lokio/m;)Lokio/m;
 
     move-result-object v0
 
-    iget-object v1, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v1, v0, Lokio/m;->cgA:Lokio/m;
 
     if-eq v1, v0, :cond_9
 
-    iget-object v1, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v1, v0, Lokio/m;->cgA:Lokio/m;
 
     iget-boolean v1, v1, Lokio/m;->owner:Z
 
@@ -4457,22 +4482,22 @@
 
     sub-int/2addr v1, v5
 
-    iget-object v5, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v5, v0, Lokio/m;->cgA:Lokio/m;
 
     iget v5, v5, Lokio/m;->limit:I
 
     rsub-int v5, v5, 0x2000
 
-    iget-object v6, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v6, v0, Lokio/m;->cgA:Lokio/m;
 
-    iget-boolean v6, v6, Lokio/m;->che:Z
+    iget-boolean v6, v6, Lokio/m;->cgy:Z
 
     if-eqz v6, :cond_7
 
     goto :goto_5
 
     :cond_7
-    iget-object v2, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v2, v0, Lokio/m;->cgA:Lokio/m;
 
     iget v2, v2, Lokio/m;->pos:I
 
@@ -4481,11 +4506,11 @@
 
     if-gt v1, v5, :cond_8
 
-    iget-object v2, v0, Lokio/m;->chg:Lokio/m;
+    iget-object v2, v0, Lokio/m;->cgA:Lokio/m;
 
     invoke-virtual {v0, v2, v1}, Lokio/m;->a(Lokio/m;I)V
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
@@ -4534,4 +4559,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali/okio/d.smali b/com.discord/smali/okio/d.smali
index 2955e7aba5..edd80a4b64 100644
--- a/com.discord/smali/okio/d.smali
+++ b/com.discord/smali/okio/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokio/d;
 .super Ljava/lang/Object;
+.source "BufferedSource.java"
 
 # interfaces
 .implements Ljava/nio/channels/ReadableByteChannel;
@@ -7,10 +8,10 @@
 
 
 # virtual methods
-.method public abstract IX()Lokio/c;
+.method public abstract IW()Lokio/c;
 .end method
 
-.method public abstract IZ()Z
+.method public abstract IY()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -18,10 +19,10 @@
     .end annotation
 .end method
 
-.method public abstract Ja()Ljava/io/InputStream;
+.method public abstract IZ()Ljava/io/InputStream;
 .end method
 
-.method public abstract Jc()S
+.method public abstract Jb()S
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -29,7 +30,7 @@
     .end annotation
 .end method
 
-.method public abstract Jd()I
+.method public abstract Jc()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -37,7 +38,7 @@
     .end annotation
 .end method
 
-.method public abstract Je()J
+.method public abstract Jd()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -45,7 +46,7 @@
     .end annotation
 .end method
 
-.method public abstract Jg()Ljava/lang/String;
+.method public abstract Jf()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -53,7 +54,7 @@
     .end annotation
 .end method
 
-.method public abstract Jh()J
+.method public abstract Jg()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 670b55cbfb..1ccda7e732 100644
--- a/com.discord/smali/okio/j$3.smali
+++ b/com.discord/smali/okio/j$3.smali
@@ -1,5 +1,6 @@
 .class final Lokio/j$3;
 .super Lokio/a;
+.source "Okio.java"
 
 
 # annotations
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic cha:Ljava/net/Socket;
+.field final synthetic cgu:Ljava/net/Socket;
 
 
 # direct methods
 .method constructor <init>(Ljava/net/Socket;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$3;->cha:Ljava/net/Socket;
+    iput-object p1, p0, Lokio/j$3;->cgu:Ljava/net/Socket;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -30,11 +31,11 @@
 
 
 # virtual methods
-.method protected final Iz()V
+.method protected final Iy()V
     .locals 5
 
     :try_start_0
-    iget-object v0, p0, Lokio/j$3;->cha:Ljava/net/Socket;
+    iget-object v0, p0, Lokio/j$3;->cgu:Ljava/net/Socket;
 
     invoke-virtual {v0}, Ljava/net/Socket;->close()V
     :try_end_0
@@ -62,8 +63,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    :goto_0
-    iget-object v4, p0, Lokio/j$3;->cha:Ljava/net/Socket;
+    iget-object v4, p0, Lokio/j$3;->cgu:Ljava/net/Socket;
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -91,7 +91,17 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_0
+    iget-object v4, p0, Lokio/j$3;->cgu:Ljava/net/Socket;
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v2, v3, v0}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return-void
 .end method
 
 .method protected final c(Ljava/io/IOException;)Ljava/io/IOException;
diff --git a/com.discord/smali/okio/m.smali b/com.discord/smali/okio/m.smali
index fb2467fc36..7f76206e8f 100644
--- a/com.discord/smali/okio/m.smali
+++ b/com.discord/smali/okio/m.smali
@@ -1,13 +1,14 @@
 .class public final Lokio/m;
 .super Ljava/lang/Object;
+.source "Segment.java"
 
 
 # instance fields
-.field che:Z
+.field cgA:Lokio/m;
 
-.field chf:Lokio/m;
+.field cgy:Z
 
-.field chg:Lokio/m;
+.field cgz:Lokio/m;
 
 .field public final data:[B
 
@@ -36,7 +37,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/m;->che:Z
+    iput-boolean v0, p0, Lokio/m;->cgy:Z
 
     return-void
 .end method
@@ -52,7 +53,7 @@
 
     iput p3, p0, Lokio/m;->limit:I
 
-    iput-boolean p4, p0, Lokio/m;->che:Z
+    iput-boolean p4, p0, Lokio/m;->cgy:Z
 
     iput-boolean p5, p0, Lokio/m;->owner:Z
 
@@ -61,12 +62,12 @@
 
 
 # virtual methods
-.method final Jx()Lokio/m;
+.method final Jw()Lokio/m;
     .locals 7
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/m;->che:Z
+    iput-boolean v0, p0, Lokio/m;->cgy:Z
 
     new-instance v0, Lokio/m;
 
@@ -87,7 +88,7 @@
     return-object v0
 .end method
 
-.method final Jy()Lokio/m;
+.method final Jx()Lokio/m;
     .locals 7
 
     new-instance v6, Lokio/m;
@@ -117,40 +118,36 @@
     return-object v6
 .end method
 
-.method public final Jz()Lokio/m;
+.method public final Jy()Lokio/m;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokio/m;->chf:Lokio/m;
+    iget-object v0, p0, Lokio/m;->cgz:Lokio/m;
 
     const/4 v1, 0x0
 
     if-eq v0, p0, :cond_0
 
-    iget-object v0, p0, Lokio/m;->chf:Lokio/m;
-
     goto :goto_0
 
     :cond_0
     move-object v0, v1
 
     :goto_0
-    iget-object v2, p0, Lokio/m;->chg:Lokio/m;
+    iget-object v2, p0, Lokio/m;->cgA:Lokio/m;
 
-    iget-object v3, p0, Lokio/m;->chf:Lokio/m;
+    iget-object v3, p0, Lokio/m;->cgz:Lokio/m;
 
-    iput-object v3, v2, Lokio/m;->chf:Lokio/m;
+    iput-object v3, v2, Lokio/m;->cgz:Lokio/m;
 
-    iget-object v2, p0, Lokio/m;->chf:Lokio/m;
+    iget-object v3, p0, Lokio/m;->cgz:Lokio/m;
 
-    iget-object v3, p0, Lokio/m;->chg:Lokio/m;
+    iput-object v2, v3, Lokio/m;->cgA:Lokio/m;
 
-    iput-object v3, v2, Lokio/m;->chg:Lokio/m;
+    iput-object v1, p0, Lokio/m;->cgz:Lokio/m;
 
-    iput-object v1, p0, Lokio/m;->chf:Lokio/m;
-
-    iput-object v1, p0, Lokio/m;->chg:Lokio/m;
+    iput-object v1, p0, Lokio/m;->cgA:Lokio/m;
 
     return-object v0
 .end method
@@ -158,23 +155,23 @@
 .method public final a(Lokio/m;)Lokio/m;
     .locals 1
 
-    iput-object p0, p1, Lokio/m;->chg:Lokio/m;
+    iput-object p0, p1, Lokio/m;->cgA:Lokio/m;
 
-    iget-object v0, p0, Lokio/m;->chf:Lokio/m;
+    iget-object v0, p0, Lokio/m;->cgz:Lokio/m;
 
-    iput-object v0, p1, Lokio/m;->chf:Lokio/m;
+    iput-object v0, p1, Lokio/m;->cgz:Lokio/m;
 
-    iget-object v0, p0, Lokio/m;->chf:Lokio/m;
+    iget-object v0, p0, Lokio/m;->cgz:Lokio/m;
 
-    iput-object p1, v0, Lokio/m;->chg:Lokio/m;
+    iput-object p1, v0, Lokio/m;->cgA:Lokio/m;
 
-    iput-object p1, p0, Lokio/m;->chf:Lokio/m;
+    iput-object p1, p0, Lokio/m;->cgz:Lokio/m;
 
     return-object p1
 .end method
 
 .method public final a(Lokio/m;I)V
-    .locals 5
+    .locals 4
 
     iget-boolean v0, p1, Lokio/m;->owner:Z
 
@@ -182,41 +179,31 @@
 
     iget v0, p1, Lokio/m;->limit:I
 
-    add-int/2addr v0, p2
+    add-int v1, v0, p2
 
-    const/16 v1, 0x2000
+    const/16 v2, 0x2000
 
-    if-le v0, v1, :cond_2
+    if-le v1, v2, :cond_2
 
-    iget-boolean v0, p1, Lokio/m;->che:Z
+    iget-boolean v1, p1, Lokio/m;->cgy:Z
 
-    if-nez v0, :cond_1
+    if-nez v1, :cond_1
 
-    iget v0, p1, Lokio/m;->limit:I
+    add-int v1, v0, p2
 
-    add-int/2addr v0, p2
+    iget v3, p1, Lokio/m;->pos:I
 
-    iget v2, p1, Lokio/m;->pos:I
+    sub-int/2addr v1, v3
 
-    sub-int/2addr v0, v2
+    if-gt v1, v2, :cond_0
 
-    if-gt v0, v1, :cond_0
+    iget-object v1, p1, Lokio/m;->data:[B
 
-    iget-object v0, p1, Lokio/m;->data:[B
+    sub-int/2addr v0, v3
 
-    iget v1, p1, Lokio/m;->pos:I
+    const/4 v2, 0x0
 
-    iget-object v2, p1, Lokio/m;->data:[B
-
-    iget v3, p1, Lokio/m;->limit:I
-
-    iget v4, p1, Lokio/m;->pos:I
-
-    sub-int/2addr v3, v4
-
-    const/4 v4, 0x0
-
-    invoke-static {v0, v1, v2, v4, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v3, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget v0, p1, Lokio/m;->limit:I
 
@@ -226,7 +213,7 @@
 
     iput v0, p1, Lokio/m;->limit:I
 
-    iput v4, p1, Lokio/m;->pos:I
+    iput v2, p1, Lokio/m;->pos:I
 
     goto :goto_0
 
diff --git a/com.discord/smali/okio/n.smali b/com.discord/smali/okio/n.smali
index 0cebb0fd6a..dbdd45d44a 100644
--- a/com.discord/smali/okio/n.smali
+++ b/com.discord/smali/okio/n.smali
@@ -1,15 +1,16 @@
 .class final Lokio/n;
 .super Ljava/lang/Object;
+.source "SegmentPool.java"
 
 
 # static fields
-.field static chf:Lokio/m;
+.field static cgB:J
+
+.field static cgz:Lokio/m;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field static chh:J
-
 
 # direct methods
 .method private constructor <init>()V
@@ -20,7 +21,7 @@
     return-void
 .end method
 
-.method static JA()Lokio/m;
+.method static Jz()Lokio/m;
     .locals 6
 
     const-class v0, Lokio/n;
@@ -28,27 +29,27 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/n;->chf:Lokio/m;
+    sget-object v1, Lokio/n;->cgz:Lokio/m;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lokio/n;->chf:Lokio/m;
+    sget-object v1, Lokio/n;->cgz:Lokio/m;
 
-    iget-object v2, v1, Lokio/m;->chf:Lokio/m;
+    iget-object v2, v1, Lokio/m;->cgz:Lokio/m;
 
-    sput-object v2, Lokio/n;->chf:Lokio/m;
+    sput-object v2, Lokio/n;->cgz:Lokio/m;
 
     const/4 v2, 0x0
 
-    iput-object v2, v1, Lokio/m;->chf:Lokio/m;
+    iput-object v2, v1, Lokio/m;->cgz:Lokio/m;
 
-    sget-wide v2, Lokio/n;->chh:J
+    sget-wide v2, Lokio/n;->cgB:J
 
     const-wide/16 v4, 0x2000
 
     sub-long/2addr v2, v4
 
-    sput-wide v2, Lokio/n;->chh:J
+    sput-wide v2, Lokio/n;->cgB:J
 
     monitor-exit v0
 
@@ -79,15 +80,15 @@
 .method static b(Lokio/m;)V
     .locals 8
 
-    iget-object v0, p0, Lokio/m;->chf:Lokio/m;
+    iget-object v0, p0, Lokio/m;->cgz:Lokio/m;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokio/m;->chg:Lokio/m;
+    iget-object v0, p0, Lokio/m;->cgA:Lokio/m;
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/m;->che:Z
+    iget-boolean v0, p0, Lokio/m;->cgy:Z
 
     if-eqz v0, :cond_0
 
@@ -99,7 +100,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-wide v1, Lokio/n;->chh:J
+    sget-wide v1, Lokio/n;->cgB:J
 
     const-wide/16 v3, 0x2000
 
@@ -116,17 +117,15 @@
     return-void
 
     :cond_1
-    sget-wide v1, Lokio/n;->chh:J
-
-    const/4 v5, 0x0
+    sget-wide v1, Lokio/n;->cgB:J
 
     add-long/2addr v1, v3
 
-    sput-wide v1, Lokio/n;->chh:J
+    sput-wide v1, Lokio/n;->cgB:J
 
-    sget-object v1, Lokio/n;->chf:Lokio/m;
+    sget-object v1, Lokio/n;->cgz:Lokio/m;
 
-    iput-object v1, p0, Lokio/m;->chf:Lokio/m;
+    iput-object v1, p0, Lokio/m;->cgz:Lokio/m;
 
     const/4 v1, 0x0
 
@@ -134,7 +133,7 @@
 
     iput v1, p0, Lokio/m;->pos:I
 
-    sput-object p0, Lokio/n;->chf:Lokio/m;
+    sput-object p0, Lokio/n;->cgz:Lokio/m;
 
     monitor-exit v0
 
diff --git a/com.discord/smali/okio/p.smali b/com.discord/smali/okio/p.smali
index de112ddea3..c281cf0dc2 100644
--- a/com.discord/smali/okio/p.smali
+++ b/com.discord/smali/okio/p.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokio/p;
 .super Ljava/lang/Object;
+.source "Sink.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/okio/q.smali b/com.discord/smali/okio/q.smali
index 689baa6391..2763a16949 100644
--- a/com.discord/smali/okio/q.smali
+++ b/com.discord/smali/okio/q.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokio/q;
 .super Ljava/lang/Object;
+.source "Source.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
diff --git a/com.discord/smali/okio/r.smali b/com.discord/smali/okio/r.smali
index e9734fbba2..38f010f27e 100644
--- a/com.discord/smali/okio/r.smali
+++ b/com.discord/smali/okio/r.smali
@@ -1,17 +1,18 @@
 .class public Lokio/r;
 .super Ljava/lang/Object;
+.source "Timeout.java"
 
 
 # static fields
-.field public static final chk:Lokio/r;
+.field public static final cgE:Lokio/r;
 
 
 # instance fields
-.field private chl:Z
+.field private cgF:Z
 
-.field private chm:J
+.field private cgG:J
 
-.field private chn:J
+.field private cgH:J
 
 
 # direct methods
@@ -22,7 +23,7 @@
 
     invoke-direct {v0}, Lokio/r$1;-><init>()V
 
-    sput-object v0, Lokio/r;->chk:Lokio/r;
+    sput-object v0, Lokio/r;->cgE:Lokio/r;
 
     return-void
 .end method
@@ -37,30 +38,30 @@
 
 
 # virtual methods
-.method public Jq()J
+.method public Jp()J
     .locals 2
 
-    iget-wide v0, p0, Lokio/r;->chn:J
+    iget-wide v0, p0, Lokio/r;->cgH:J
 
     return-wide v0
 .end method
 
-.method public Jr()Z
+.method public Jq()Z
     .locals 1
 
-    iget-boolean v0, p0, Lokio/r;->chl:Z
+    iget-boolean v0, p0, Lokio/r;->cgF:Z
 
     return v0
 .end method
 
-.method public Js()J
+.method public Jr()J
     .locals 2
 
-    iget-boolean v0, p0, Lokio/r;->chl:Z
+    iget-boolean v0, p0, Lokio/r;->cgF:Z
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lokio/r;->chm:J
+    iget-wide v0, p0, Lokio/r;->cgG:J
 
     return-wide v0
 
@@ -74,27 +75,27 @@
     throw v0
 .end method
 
-.method public Jt()Lokio/r;
+.method public Js()Lokio/r;
     .locals 2
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokio/r;->chn:J
+    iput-wide v0, p0, Lokio/r;->cgH:J
 
     return-object p0
 .end method
 
-.method public Ju()Lokio/r;
+.method public Jt()Lokio/r;
     .locals 1
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/r;->chl:Z
+    iput-boolean v0, p0, Lokio/r;->cgF:Z
 
     return-object p0
 .end method
 
-.method public Jv()V
+.method public Ju()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -108,11 +109,11 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/r;->chl:Z
+    iget-boolean v0, p0, Lokio/r;->cgF:Z
 
     if-eqz v0, :cond_1
 
-    iget-wide v0, p0, Lokio/r;->chm:J
+    iget-wide v0, p0, Lokio/r;->cgG:J
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -156,9 +157,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/r;->chl:Z
+    iput-boolean v0, p0, Lokio/r;->cgF:Z
 
-    iput-wide p1, p0, Lokio/r;->chm:J
+    iput-wide p1, p0, Lokio/r;->cgG:J
 
     return-object p0
 .end method
@@ -178,7 +179,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/r;->chn:J
+    iput-wide p1, p0, Lokio/r;->cgH:J
 
     return-object p0
 
diff --git a/com.discord/smali/org/webrtc/CalledByNative.smali b/com.discord/smali/org/webrtc/CalledByNative.smali
index c85cd31898..1454c48cb9 100644
--- a/com.discord/smali/org/webrtc/CalledByNative.smali
+++ b/com.discord/smali/org/webrtc/CalledByNative.smali
@@ -1,5 +1,6 @@
 .class interface abstract annotation Lorg/webrtc/CalledByNative;
 .super Ljava/lang/Object;
+.source "CalledByNative.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/org/webrtc/CalledByNativeUnchecked.smali b/com.discord/smali/org/webrtc/CalledByNativeUnchecked.smali
index de6ad3daa9..39004468f7 100644
--- a/com.discord/smali/org/webrtc/CalledByNativeUnchecked.smali
+++ b/com.discord/smali/org/webrtc/CalledByNativeUnchecked.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lorg/webrtc/CalledByNativeUnchecked;
 .super Ljava/lang/Object;
+.source "CalledByNativeUnchecked.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/org/webrtc/JNINamespace.smali b/com.discord/smali/org/webrtc/JNINamespace.smali
index 3259470a36..8d2fb35c84 100644
--- a/com.discord/smali/org/webrtc/JNINamespace.smali
+++ b/com.discord/smali/org/webrtc/JNINamespace.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lorg/webrtc/JNINamespace;
 .super Ljava/lang/Object;
+.source "JNINamespace.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/org/webrtc/NativeClassQualifiedName.smali b/com.discord/smali/org/webrtc/NativeClassQualifiedName.smali
index 4545490813..902ed3a236 100644
--- a/com.discord/smali/org/webrtc/NativeClassQualifiedName.smali
+++ b/com.discord/smali/org/webrtc/NativeClassQualifiedName.smali
@@ -1,5 +1,6 @@
 .class public interface abstract annotation Lorg/webrtc/NativeClassQualifiedName;
 .super Ljava/lang/Object;
+.source "NativeClassQualifiedName.java"
 
 # interfaces
 .implements Ljava/lang/annotation/Annotation;
diff --git a/com.discord/smali/rx/Observable$Transformer.smali b/com.discord/smali/rx/Observable$Transformer.smali
index ff1839cb58..cc284c3dc9 100644
--- a/com.discord/smali/rx/Observable$Transformer.smali
+++ b/com.discord/smali/rx/Observable$Transformer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/Observable$Transformer;
 .super Ljava/lang/Object;
+.source "Observable.java"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali/rx/Observable.smali b/com.discord/smali/rx/Observable.smali
index 7e98eab4e9..f05a2c046f 100644
--- a/com.discord/smali/rx/Observable.smali
+++ b/com.discord/smali/rx/Observable.smali
@@ -1,5 +1,6 @@
 .class public Lrx/Observable;
 .super Ljava/lang/Object;
+.source "Observable.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
 
 
 # instance fields
-.field final cmW:Lrx/Observable$a;
+.field final cmq:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -45,7 +46,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/Observable;->cmW:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/Observable;->cmq:Lrx/Observable$a;
 
     return-void
 .end method
@@ -75,6 +76,25 @@
     return-object p0
 .end method
 
+.method public static KA()Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">()",
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+
+    invoke-static {}, Lrx/internal/a/e;->KS()Lrx/Observable;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public static KB()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -87,33 +107,14 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/e;->KT()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/f;->KS()Lrx/Observable;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static KC()Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">()",
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-
-    invoke-static {}, Lrx/internal/a/f;->KT()Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method private KK()Lrx/Observable;
+.method private KJ()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -326,7 +327,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object p1, Lrx/internal/util/l$b;->ctq:Lrx/internal/util/l$b;
 
     invoke-direct {p0, p1}, Lrx/Observable;->a(Lrx/functions/b;)Lrx/Observable;
 
@@ -1140,7 +1141,7 @@
 
     if-eqz p0, :cond_3
 
-    iget-object v0, p1, Lrx/Observable;->cmW:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->cmq:Lrx/Observable$a;
 
     if-eqz v0, :cond_2
 
@@ -1158,7 +1159,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p1, Lrx/Observable;->cmW:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->cmq:Lrx/Observable$a;
 
     invoke-static {p1, v0}, Lrx/c/c;->a(Lrx/Observable;Lrx/Observable$a;)Lrx/Observable$a;
 
@@ -1168,11 +1169,11 @@
 
     invoke-static {p0}, Lrx/c/c;->c(Lrx/Subscription;)Lrx/Subscription;
 
-    move-result-object p1
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p1
+    return-object p0
 
     :catch_0
     move-exception p1
@@ -1204,7 +1205,7 @@
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1
 
     :goto_0
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p0
 
@@ -1337,7 +1338,7 @@
 
     check-cast p0, Lrx/internal/util/k;
 
-    sget-object v0, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->ctq:Lrx/internal/util/l$b;
 
     invoke-virtual {p0, v0}, Lrx/internal/util/k;->n(Lrx/functions/b;)Lrx/Observable;
 
@@ -1346,7 +1347,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lrx/internal/a/ah;->Lc()Lrx/internal/a/ah;
+    invoke-static {}, Lrx/internal/a/ah;->Lb()Lrx/internal/a/ah;
 
     move-result-object v0
 
@@ -1526,7 +1527,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1556,7 +1557,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1586,7 +1587,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -1613,7 +1614,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/e;->KT()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/e;->KS()Lrx/Observable;
 
     move-result-object p0
 
@@ -1666,7 +1667,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->ctq:Lrx/internal/util/l$b;
 
     invoke-direct {p0, v0}, Lrx/Observable;->a(Lrx/functions/b;)Lrx/Observable;
 
@@ -1729,23 +1730,23 @@
 
 
 # virtual methods
-.method public final KA()Lrx/f;
-    .locals 2
+.method public final KC()Lrx/Observable;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
-            "Lrx/f<",
+            "Lrx/Observable<",
             "TT;>;"
         }
     .end annotation
 
-    new-instance v0, Lrx/f;
+    invoke-static {}, Lrx/internal/a/ae;->La()Lrx/internal/a/ae;
 
-    invoke-static {p0}, Lrx/internal/a/u;->e(Lrx/Observable;)Lrx/internal/a/u;
+    move-result-object v0
 
-    move-result-object v1
+    invoke-virtual {p0, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
-    invoke-direct {v0, v1}, Lrx/f;-><init>(Lrx/f$a;)V
+    move-result-object v0
 
     return-object v0
 .end method
@@ -1760,7 +1761,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/ae;->Lb()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/aj;->Lj()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -1781,7 +1782,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/aj;->Lk()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/ak;->Ll()Lrx/internal/a/ak;
 
     move-result-object v0
 
@@ -1802,7 +1803,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/ak;->Lm()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/aq;->Ls()Lrx/internal/a/aq;
 
     move-result-object v0
 
@@ -1814,27 +1815,6 @@
 .end method
 
 .method public final KG()Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-
-    invoke-static {}, Lrx/internal/a/aq;->Lt()Lrx/internal/a/aq;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final KH()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1857,7 +1837,7 @@
     return-object v0
 .end method
 
-.method public final KI()Lrx/Observable;
+.method public final KH()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1880,7 +1860,7 @@
     return-object v0
 .end method
 
-.method public final KJ()Lrx/Observable;
+.method public final KI()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1891,7 +1871,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/ba;->Lv()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->Lu()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -1902,7 +1882,7 @@
     return-object v0
 .end method
 
-.method public final KL()Lrx/Observable;
+.method public final KK()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1912,11 +1892,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lrx/Observable;->KK()Lrx/Observable;
+    invoke-direct {p0}, Lrx/Observable;->KJ()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->ctq:Lrx/internal/util/l$b;
 
     invoke-direct {v0, v1}, Lrx/Observable;->d(Lrx/functions/b;)Lrx/Observable;
 
@@ -1925,6 +1905,27 @@
     return-object v0
 .end method
 
+.method public final Kz()Lrx/f;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/f<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lrx/f;
+
+    invoke-static {p0}, Lrx/internal/a/u;->e(Lrx/Observable;)Lrx/internal/a/u;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lrx/f;-><init>(Lrx/f$a;)V
+
+    return-object v0
+.end method
+
 .method public final a(JLjava/util/concurrent/TimeUnit;ILrx/Scheduler;)Lrx/Observable;
     .locals 9
     .annotation system Ldalvik/annotation/Signature;
@@ -2001,7 +2002,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -2059,7 +2060,7 @@
 
     new-instance v0, Lrx/internal/a/q;
 
-    iget-object v1, p0, Lrx/Observable;->cmW:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/Observable;->cmq:Lrx/Observable$a;
 
     invoke-direct {v0, v1, p1}, Lrx/internal/a/q;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
@@ -2126,11 +2127,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -2218,7 +2219,7 @@
     :try_start_0
     invoke-virtual {p1}, Lrx/Subscriber;->onStart()V
 
-    iget-object v0, p0, Lrx/Observable;->cmW:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->cmq:Lrx/Observable$a;
 
     invoke-static {p0, v0}, Lrx/c/c;->a(Lrx/Observable;Lrx/Observable$a;)Lrx/Observable$a;
 
@@ -2228,11 +2229,11 @@
 
     invoke-static {p1}, Lrx/c/c;->c(Lrx/Subscription;)Lrx/Subscription;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     move-exception v0
@@ -2248,7 +2249,7 @@
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -2306,7 +2307,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -2351,7 +2352,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/Observable;->cmW:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->cmq:Lrx/Observable$a;
 
     instance-of v0, v0, Lrx/internal/a/j;
 
@@ -2436,9 +2437,9 @@
 
     if-eqz p1, :cond_0
 
-    sget-object v0, Lrx/internal/util/f;->ctC:Lrx/functions/Action1;
+    sget-object v0, Lrx/internal/util/f;->csW:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -2529,7 +2530,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->ctq:Lrx/internal/util/l$b;
 
     invoke-direct {p1, v0}, Lrx/Observable;->d(Lrx/functions/b;)Lrx/Observable;
 
@@ -2654,7 +2655,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/au;->Lu()Lrx/internal/a/au;
+    invoke-static {}, Lrx/internal/a/au;->Lt()Lrx/internal/a/au;
 
     move-result-object v0
 
@@ -2678,7 +2679,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -2734,7 +2735,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2762,7 +2763,7 @@
 
     new-instance v0, Lrx/internal/a/z;
 
-    sget-object v1, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->ctq: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
 
@@ -2785,7 +2786,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2808,7 +2809,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2831,7 +2832,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Mh()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
 
     move-result-object v5
 
diff --git a/com.discord/smali/rx/Subscription.smali b/com.discord/smali/rx/Subscription.smali
index 7188f2cc3a..1c1d8df51e 100644
--- a/com.discord/smali/rx/Subscription.smali
+++ b/com.discord/smali/rx/Subscription.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/Subscription;
 .super Ljava/lang/Object;
+.source "Subscription.java"
 
 
 # virtual methods
diff --git a/com.discord/smali/rx/functions/Action1.smali b/com.discord/smali/rx/functions/Action1.smali
index b52debbbd7..fb634895f8 100644
--- a/com.discord/smali/rx/functions/Action1.smali
+++ b/com.discord/smali/rx/functions/Action1.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Action1;
 .super Ljava/lang/Object;
+.source "Action1.java"
 
 
 # annotations
diff --git a/com.discord/smali/rx/functions/Action4.smali b/com.discord/smali/rx/functions/Action4.smali
index c6737e450f..187bf37681 100644
--- a/com.discord/smali/rx/functions/Action4.smali
+++ b/com.discord/smali/rx/functions/Action4.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Action4;
 .super Ljava/lang/Object;
+.source "Action4.java"
 
 
 # annotations
diff --git a/com.discord/smali/rx/functions/b.smali b/com.discord/smali/rx/functions/b.smali
index a8ed89d450..f44bbafc99 100644
--- a/com.discord/smali/rx/functions/b.smali
+++ b/com.discord/smali/rx/functions/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/b;
 .super Ljava/lang/Object;
+.source "Func1.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/a.smali
index b1bce6b4f5..9d2158b4a8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/a.smali
@@ -462,6 +462,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p0
+
+    return-void
 .end method
 
 .method private static varargs a(Landroid/content/ContentResolver;[Ljava/lang/String;)Ljava/util/Map;
@@ -542,6 +544,8 @@
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static a(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V
@@ -575,7 +579,7 @@
     throw p0
 .end method
 
-.method static synthetic pU()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic pT()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/a;->aKi:Ljava/util/concurrent/atomic/AtomicBoolean;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aa.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aa.smali
index 19dd4a8db2..48e1480451 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aa.smali
@@ -50,7 +50,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/ig;->ty()Lcom/google/android/gms/internal/firebase-perf/if;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/ig;->tx()Lcom/google/android/gms/internal/firebase-perf/if;
 
     move-result-object v0
 
@@ -84,7 +84,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/ig;->ty()Lcom/google/android/gms/internal/firebase-perf/if;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/ig;->tx()Lcom/google/android/gms/internal/firebase-perf/if;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ab.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ab.smali
index 979c019920..3396fa8757 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ab.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ab.smali
@@ -18,7 +18,7 @@
 .method public final onChange(Z)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/a;->pU()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/a;->pT()Ljava/util/concurrent/atomic/AtomicBoolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/al.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/al.smali
index d6634c5bfb..aaa71b2a4a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/al.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/al.smali
@@ -24,9 +24,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/firebase-perf/al;->aLG:Ljava/lang/Boolean;
-
-    invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result p0
 
@@ -169,6 +167,8 @@
 
     move-result-object p0
 
+    return-object p0
+
     :catch_0
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am$a.smali
index 3dcbcbfac6..3a954e5da4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/am;->qh()Lcom/google/android/gms/internal/firebase-perf/am;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/am;->qg()Lcom/google/android/gms/internal/firebase-perf/am;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 .method public final S(J)Lcom/google/android/gms/internal/firebase-perf/am$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/am$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -66,7 +66,7 @@
 .method public final cw(I)Lcom/google/android/gms/internal/firebase-perf/am$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/am$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am.smali
index 9284f24c53..6f90337b3b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/am.smali
@@ -100,7 +100,7 @@
     return-void
 .end method
 
-.method public static qg()Lcom/google/android/gms/internal/firebase-perf/am$a;
+.method public static qf()Lcom/google/android/gms/internal/firebase-perf/am$a;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/am;->zzje:Lcom/google/android/gms/internal/firebase-perf/am;
@@ -118,7 +118,7 @@
     return-object v0
 .end method
 
-.method static synthetic qh()Lcom/google/android/gms/internal/firebase-perf/am;
+.method static synthetic qg()Lcom/google/android/gms/internal/firebase-perf/am;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/am;->zzje:Lcom/google/android/gms/internal/firebase-perf/am;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/an.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/an.smali
index 39dd814f89..f5369fa334 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/an.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ao.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ao.smali
index aa45720abc..fc7f615537 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ao.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ao.smali
@@ -188,7 +188,7 @@
 
 
 # virtual methods
-.method public final qi()I
+.method public final qh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ao;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq$a.smali
index eddd5f6e55..ad8345a0bb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aq;->qk()Lcom/google/android/gms/internal/firebase-perf/aq;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aq;->qj()Lcom/google/android/gms/internal/firebase-perf/aq;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 .method public final T(J)Lcom/google/android/gms/internal/firebase-perf/aq$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/aq$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -66,7 +66,7 @@
 .method public final U(J)Lcom/google/android/gms/internal/firebase-perf/aq$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/aq$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -80,7 +80,7 @@
 .method public final V(J)Lcom/google/android/gms/internal/firebase-perf/aq$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/aq$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq.smali
index 5b67f25a80..60d328ad34 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aq.smali
@@ -116,7 +116,7 @@
     return-void
 .end method
 
-.method public static qj()Lcom/google/android/gms/internal/firebase-perf/aq$a;
+.method public static qi()Lcom/google/android/gms/internal/firebase-perf/aq$a;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/aq;->zzjp:Lcom/google/android/gms/internal/firebase-perf/aq;
@@ -134,7 +134,7 @@
     return-object v0
 .end method
 
-.method static synthetic qk()Lcom/google/android/gms/internal/firebase-perf/aq;
+.method static synthetic qj()Lcom/google/android/gms/internal/firebase-perf/aq;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/aq;->zzjp:Lcom/google/android/gms/internal/firebase-perf/aq;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ar.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ar.smali
index 5b4e5ec402..78d3781151 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ar.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ar.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as$a.smali
index 5ca13f4562..7e6c2647ca 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/as;->qn()Lcom/google/android/gms/internal/firebase-perf/as;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/as;->qm()Lcom/google/android/gms/internal/firebase-perf/as;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 .method public final bv(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/as$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/as$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -66,7 +66,7 @@
 .method public final cA(I)Lcom/google/android/gms/internal/firebase-perf/as$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/as$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -80,7 +80,7 @@
 .method public final cy(I)Lcom/google/android/gms/internal/firebase-perf/as$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/as$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -94,7 +94,7 @@
 .method public final cz(I)Lcom/google/android/gms/internal/firebase-perf/as$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/as$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as.smali
index e96160d1c6..cf6c7bfe48 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/as.smali
@@ -149,7 +149,7 @@
     return-void
 .end method
 
-.method public static ql()Lcom/google/android/gms/internal/firebase-perf/as$a;
+.method public static qk()Lcom/google/android/gms/internal/firebase-perf/as$a;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/as;->zzjw:Lcom/google/android/gms/internal/firebase-perf/as;
@@ -167,7 +167,7 @@
     return-object v0
 .end method
 
-.method public static qm()Lcom/google/android/gms/internal/firebase-perf/as;
+.method public static ql()Lcom/google/android/gms/internal/firebase-perf/as;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/as;->zzjw:Lcom/google/android/gms/internal/firebase-perf/as;
@@ -175,7 +175,7 @@
     return-object v0
 .end method
 
-.method static synthetic qn()Lcom/google/android/gms/internal/firebase-perf/as;
+.method static synthetic qm()Lcom/google/android/gms/internal/firebase-perf/as;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/as;->zzjw:Lcom/google/android/gms/internal/firebase-perf/as;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/at.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/at.smali
index bc9003437d..5a972a2ecc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/at.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/at.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au$a.smali
index 26d8560b66..7b1bffa95c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qs()Lcom/google/android/gms/internal/firebase-perf/au;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qr()Lcom/google/android/gms/internal/firebase-perf/au;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 .method public final a(Lcom/google/android/gms/internal/firebase-perf/am;)Lcom/google/android/gms/internal/firebase-perf/au$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -66,7 +66,7 @@
 .method public final a(Lcom/google/android/gms/internal/firebase-perf/aq;)Lcom/google/android/gms/internal/firebase-perf/au$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -80,7 +80,7 @@
 .method public final a(Lcom/google/android/gms/internal/firebase-perf/as;)Lcom/google/android/gms/internal/firebase-perf/au$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -94,7 +94,7 @@
 .method public final bw(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/au$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au.smali
index 863647ef64..86ed09774d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/au.smali
@@ -103,19 +103,19 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzjx:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sI()Lcom/google/android/gms/internal/firebase-perf/fl;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sH()Lcom/google/android/gms/internal/firebase-perf/fl;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzjz:Lcom/google/android/gms/internal/firebase-perf/dx;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sI()Lcom/google/android/gms/internal/firebase-perf/fl;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sH()Lcom/google/android/gms/internal/firebase-perf/fl;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzka:Lcom/google/android/gms/internal/firebase-perf/dx;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sI()Lcom/google/android/gms/internal/firebase-perf/fl;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sH()Lcom/google/android/gms/internal/firebase-perf/fl;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzka:Lcom/google/android/gms/internal/firebase-perf/dx;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qH()Z
 
     move-result v0
 
@@ -181,7 +181,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzjz:Lcom/google/android/gms/internal/firebase-perf/dx;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qH()Z
 
     move-result v0
 
@@ -270,7 +270,7 @@
     throw p0
 .end method
 
-.method public static qq()Lcom/google/android/gms/internal/firebase-perf/au$a;
+.method public static qp()Lcom/google/android/gms/internal/firebase-perf/au$a;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/au;->zzkc:Lcom/google/android/gms/internal/firebase-perf/au;
@@ -288,7 +288,7 @@
     return-object v0
 .end method
 
-.method public static qr()Lcom/google/android/gms/internal/firebase-perf/fi;
+.method public static qq()Lcom/google/android/gms/internal/firebase-perf/fi;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -312,7 +312,7 @@
     return-object v0
 .end method
 
-.method static synthetic qs()Lcom/google/android/gms/internal/firebase-perf/au;
+.method static synthetic qr()Lcom/google/android/gms/internal/firebase-perf/au;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/au;->zzkc:Lcom/google/android/gms/internal/firebase-perf/au;
@@ -493,7 +493,7 @@
     .end packed-switch
 .end method
 
-.method public final oh()I
+.method public final og()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzka:Lcom/google/android/gms/internal/firebase-perf/dx;
@@ -505,7 +505,7 @@
     return v0
 .end method
 
-.method public final qo()Z
+.method public final qn()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzjb:I
@@ -526,7 +526,7 @@
     return v0
 .end method
 
-.method public final qp()I
+.method public final qo()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/au;->zzjz:Lcom/google/android/gms/internal/firebase-perf/dx;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/av.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/av.smali
index ea967a95cc..1e463667ff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/av.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/av.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw$a.smali
index 5da5459220..6f26202e62 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aw;->qt()Lcom/google/android/gms/internal/firebase-perf/aw;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aw;->qs()Lcom/google/android/gms/internal/firebase-perf/aw;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw.smali
index da7930289b..bf58579fa0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/aw.smali
@@ -88,7 +88,7 @@
     return-void
 .end method
 
-.method public static qr()Lcom/google/android/gms/internal/firebase-perf/fi;
+.method public static qq()Lcom/google/android/gms/internal/firebase-perf/fi;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -112,7 +112,7 @@
     return-object v0
 .end method
 
-.method static synthetic qt()Lcom/google/android/gms/internal/firebase-perf/aw;
+.method static synthetic qs()Lcom/google/android/gms/internal/firebase-perf/aw;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/aw;->zzkh:Lcom/google/android/gms/internal/firebase-perf/aw;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ax.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ax.smali
index e48523b9a7..ffab6152ff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ax.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ax.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay$a.smali
index 8b176e575e..4bca2951fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ay;->qu()Lcom/google/android/gms/internal/firebase-perf/ay;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ay;->qt()Lcom/google/android/gms/internal/firebase-perf/ay;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay.smali
index db3ce3a354..7032112a2c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ay.smali
@@ -74,7 +74,7 @@
     return-void
 .end method
 
-.method static synthetic qu()Lcom/google/android/gms/internal/firebase-perf/ay;
+.method static synthetic qt()Lcom/google/android/gms/internal/firebase-perf/ay;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/ay;->zzkk:Lcom/google/android/gms/internal/firebase-perf/ay;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/az.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/az.smali
index a70f714d88..0675bf7453 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/az.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/az.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$a.smali
index 691e77ee19..a2c763d35f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ba;->qv()Lcom/google/android/gms/internal/firebase-perf/ba;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ba;->qu()Lcom/google/android/gms/internal/firebase-perf/ba;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$c.smali
index 93933e9fe8..5bf525a0ce 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$c.smali
@@ -313,7 +313,7 @@
     .end packed-switch
 .end method
 
-.method public static qw()Lcom/google/android/gms/internal/firebase-perf/du;
+.method public static qv()Lcom/google/android/gms/internal/firebase-perf/du;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/be;->aMd:Lcom/google/android/gms/internal/firebase-perf/du;
@@ -337,7 +337,7 @@
 
 
 # virtual methods
-.method public final qi()I
+.method public final qh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ba$c;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$d.smali
index c0fc1a2617..0cee4c831b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba$d.smali
@@ -137,7 +137,7 @@
     .end packed-switch
 .end method
 
-.method public static qw()Lcom/google/android/gms/internal/firebase-perf/du;
+.method public static qv()Lcom/google/android/gms/internal/firebase-perf/du;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bg;->aMd:Lcom/google/android/gms/internal/firebase-perf/du;
@@ -161,7 +161,7 @@
 
 
 # virtual methods
-.method public final qi()I
+.method public final qh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ba$d;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba.smali
index 23fed9d736..bd955c63ab 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ba.smali
@@ -111,7 +111,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/er;->st()Lcom/google/android/gms/internal/firebase-perf/er;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/er;->ss()Lcom/google/android/gms/internal/firebase-perf/er;
 
     move-result-object v0
 
@@ -125,7 +125,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ba;->zzkr:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sI()Lcom/google/android/gms/internal/firebase-perf/fl;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fl;->sH()Lcom/google/android/gms/internal/firebase-perf/fl;
 
     move-result-object v0
 
@@ -134,7 +134,7 @@
     return-void
 .end method
 
-.method static synthetic qv()Lcom/google/android/gms/internal/firebase-perf/ba;
+.method static synthetic qu()Lcom/google/android/gms/internal/firebase-perf/ba;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/ba;->zzky:Lcom/google/android/gms/internal/firebase-perf/ba;
@@ -243,7 +243,7 @@
 
     const/4 v0, 0x3
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ba$c;->qw()Lcom/google/android/gms/internal/firebase-perf/du;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ba$c;->qv()Lcom/google/android/gms/internal/firebase-perf/du;
 
     move-result-object v1
 
@@ -305,7 +305,7 @@
 
     const/16 v0, 0xd
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ba$d;->qw()Lcom/google/android/gms/internal/firebase-perf/du;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ba$d;->qv()Lcom/google/android/gms/internal/firebase-perf/du;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bc.smali
index 892a201fdb..5b1c668726 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bc.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh$a.smali
index ea8dfa6b4f..8ed28811c2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bh;->qx()Lcom/google/android/gms/internal/firebase-perf/bh;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bh;->qw()Lcom/google/android/gms/internal/firebase-perf/bh;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh.smali
index d319faa7ad..da7b304a09 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bh.smali
@@ -90,7 +90,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bh;->zzjx:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dq;->sd()Lcom/google/android/gms/internal/firebase-perf/dq;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dq;->sc()Lcom/google/android/gms/internal/firebase-perf/dq;
 
     move-result-object v0
 
@@ -99,7 +99,7 @@
     return-void
 .end method
 
-.method static synthetic qx()Lcom/google/android/gms/internal/firebase-perf/bh;
+.method static synthetic qw()Lcom/google/android/gms/internal/firebase-perf/bh;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bh;->zzlr:Lcom/google/android/gms/internal/firebase-perf/bh;
@@ -208,7 +208,7 @@
 
     const/4 v0, 0x3
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bk;->qw()Lcom/google/android/gms/internal/firebase-perf/du;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bk;->qv()Lcom/google/android/gms/internal/firebase-perf/du;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bj.smali
index 62c660fbae..243d65dd3c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bj.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bk.smali
index 3410b112f3..90c06cb18b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bk.smali
@@ -128,7 +128,7 @@
     .end packed-switch
 .end method
 
-.method public static qw()Lcom/google/android/gms/internal/firebase-perf/du;
+.method public static qv()Lcom/google/android/gms/internal/firebase-perf/du;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bm;->aMd:Lcom/google/android/gms/internal/firebase-perf/du;
@@ -152,7 +152,7 @@
 
 
 # virtual methods
-.method public final qi()I
+.method public final qh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/bk;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bn.smali
index 07d5f9d988..0e739b4bc4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bn.smali
@@ -55,7 +55,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -124,33 +124,27 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->packageName:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->aMh:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->aMh:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->versionName:Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->versionName:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_2
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/he;->a(Lcom/google/android/gms/internal/firebase-perf/hc;)V
@@ -190,8 +184,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->packageName:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bn;->packageName:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -214,8 +206,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->aMh:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bn;->aMh:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -238,8 +228,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->versionName:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bn;->versionName:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -330,8 +318,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->packageName:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -350,8 +336,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->aMh:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -370,8 +354,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->versionName:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -409,10 +391,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -420,11 +402,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->packageName:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -435,11 +415,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->aMh:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -450,11 +428,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bn;->versionName:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bo.smali
index a7a082f8d3..ae0526649b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bo.smali
@@ -44,7 +44,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMm:Ljava/lang/Integer;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bp;->qz()[Lcom/google/android/gms/internal/firebase-perf/bp;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bp;->qy()[Lcom/google/android/gms/internal/firebase-perf/bp;
 
     move-result-object v1
 
@@ -69,7 +69,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -123,8 +123,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
-
     array-length v1, v1
 
     :goto_1
@@ -156,7 +154,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -183,7 +181,7 @@
     move-result v1
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v2
 
@@ -209,7 +207,7 @@
     goto :goto_0
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aw;->qr()Lcom/google/android/gms/internal/firebase-perf/fi;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aw;->qq()Lcom/google/android/gms/internal/firebase-perf/fi;
 
     move-result-object v0
 
@@ -226,9 +224,7 @@
     goto :goto_3
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMl:Lcom/google/android/gms/internal/firebase-perf/aw;
-
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dp;->rT()Lcom/google/android/gms/internal/firebase-perf/dp$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dp;->rS()Lcom/google/android/gms/internal/firebase-perf/dp$a;
 
     move-result-object v1
 
@@ -242,7 +238,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/aw$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
@@ -324,8 +320,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMi:Ljava/lang/String;
-
     const/4 v1, 0x1
 
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
@@ -335,30 +329,24 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMj:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMk:Lcom/google/android/gms/internal/firebase-perf/bn;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMk:Lcom/google/android/gms/internal/firebase-perf/bn;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMl:Lcom/google/android/gms/internal/firebase-perf/aw;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMl:Lcom/google/android/gms/internal/firebase-perf/aw;
-
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->g(Lcom/google/android/gms/internal/firebase-perf/ex;)V
 
     :cond_3
@@ -366,23 +354,19 @@
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMm:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
-
     array-length v0, v0
 
     if-lez v0, :cond_6
@@ -392,11 +376,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_6
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
+    if-ge v0, v2, :cond_6
 
     aget-object v1, v1, v0
 
@@ -449,8 +431,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMi:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bo;->aMi:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -473,8 +453,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMj:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bo;->aMj:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -497,8 +475,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMk:Lcom/google/android/gms/internal/firebase-perf/bn;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bo;->aMk:Lcom/google/android/gms/internal/firebase-perf/bn;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/bn;->equals(Ljava/lang/Object;)Z
@@ -521,8 +497,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMl:Lcom/google/android/gms/internal/firebase-perf/aw;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bo;->aMl:Lcom/google/android/gms/internal/firebase-perf/aw;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/dp;->equals(Ljava/lang/Object;)Z
@@ -545,8 +519,6 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMm:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bo;->aMm:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -650,8 +622,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMi:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -670,8 +640,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMj:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -726,8 +694,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMm:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -775,10 +741,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 4
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -786,8 +752,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMi:Ljava/lang/String;
-
     const/4 v2, 0x1
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
@@ -801,11 +765,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMj:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -816,11 +778,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMk:Lcom/google/android/gms/internal/firebase-perf/bn;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
 
     move-result v1
 
@@ -831,11 +791,9 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMl:Lcom/google/android/gms/internal/firebase-perf/aw;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;)I
 
     move-result v1
 
@@ -846,15 +804,13 @@
 
     if-eqz v1, :cond_4
 
-    const/4 v1, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMm:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
 
     move-result v1
 
@@ -865,8 +821,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
-
     array-length v1, v1
 
     if-lez v1, :cond_6
@@ -876,11 +830,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_6
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMn:[Lcom/google/android/gms/internal/firebase-perf/bp;
+    if-ge v1, v3, :cond_6
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bp.smali
index 3ea874278b..63d31c9f6a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bp.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method public static qz()[Lcom/google/android/gms/internal/firebase-perf/bp;
+.method public static qy()[Lcom/google/android/gms/internal/firebase-perf/bp;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bp;->aMo:[Lcom/google/android/gms/internal/firebase-perf/bp;
@@ -98,7 +98,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -154,22 +154,18 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->key:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->value:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->value:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_1
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/he;->a(Lcom/google/android/gms/internal/firebase-perf/hc;)V
@@ -209,8 +205,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->key:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bp;->key:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -233,8 +227,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->value:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bp;->value:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -325,8 +317,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->key:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -345,8 +335,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->value:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -384,10 +372,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -395,11 +383,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->key:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -410,11 +396,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bp;->value:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/br.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/br.smali
index 524c804ed0..c8d81add8d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/br.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/br.smali
@@ -70,13 +70,13 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKY:Ljava/lang/Long;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bs;->qA()[Lcom/google/android/gms/internal/firebase-perf/bs;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bs;->qz()[Lcom/google/android/gms/internal/firebase-perf/bs;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bu;->qB()[Lcom/google/android/gms/internal/firebase-perf/bu;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bu;->qA()[Lcom/google/android/gms/internal/firebase-perf/bu;
 
     move-result-object v1
 
@@ -103,7 +103,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -135,8 +135,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
-
     array-length v2, v2
 
     :goto_1
@@ -168,7 +166,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     add-int/lit8 v2, v2, 0x1
 
@@ -205,8 +203,6 @@
     goto :goto_3
 
     :cond_4
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
-
     array-length v2, v2
 
     :goto_3
@@ -238,7 +234,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     add-int/lit8 v2, v2, 0x1
 
@@ -264,13 +260,17 @@
 
     move-result v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v2
 
     packed-switch v2, :pswitch_data_0
 
-    goto :goto_5
+    invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/firebase-perf/hb;->dv(I)V
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/he;->a(Lcom/google/android/gms/internal/firebase-perf/hb;I)Z
+
+    goto/16 :goto_0
 
     :pswitch_0
     invoke-static {v2}, Lcom/google/android/gms/internal/firebase-perf/ba$d;->cC(I)Lcom/google/android/gms/internal/firebase-perf/ba$d;
@@ -282,7 +282,7 @@
     goto/16 :goto_0
 
     :sswitch_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -295,7 +295,7 @@
     goto/16 :goto_0
 
     :sswitch_4
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -308,7 +308,7 @@
     goto/16 :goto_0
 
     :sswitch_5
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -321,7 +321,7 @@
     goto/16 :goto_0
 
     :sswitch_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -343,7 +343,7 @@
     goto/16 :goto_0
 
     :sswitch_8
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v0
 
@@ -356,7 +356,7 @@
     goto/16 :goto_0
 
     :sswitch_9
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -369,7 +369,7 @@
     goto/16 :goto_0
 
     :sswitch_a
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -386,13 +386,12 @@
 
     move-result v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v2
 
     packed-switch v2, :pswitch_data_1
 
-    :goto_5
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/firebase-perf/hb;->dv(I)V
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/he;->a(Lcom/google/android/gms/internal/firebase-perf/hb;I)Z
@@ -420,6 +419,8 @@
     :sswitch_d
     return-object p0
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         0x0 -> :sswitch_d
@@ -471,8 +472,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->url:Ljava/lang/String;
-
     const/4 v1, 0x1
 
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
@@ -482,150 +481,126 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
-
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+    iget v0, v0, Lcom/google/android/gms/internal/firebase-perf/ba$c;->value:I
 
-    iget v1, v1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->value:I
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKZ:Ljava/lang/Long;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKZ:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aLa:Ljava/lang/Long;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aLa:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKU:Ljava/lang/Integer;
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKU:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aJh:Ljava/lang/String;
 
     if-eqz v0, :cond_5
 
-    const/4 v0, 0x6
+    const/4 v1, 0x6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aJh:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKV:Ljava/lang/Long;
 
     if-eqz v0, :cond_6
 
-    const/4 v0, 0x7
+    const/4 v1, 0x7
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKV:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKW:Ljava/lang/Long;
 
     if-eqz v0, :cond_7
 
-    const/16 v0, 0x8
+    const/16 v1, 0x8
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKW:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKX:Ljava/lang/Long;
 
     if-eqz v0, :cond_8
 
-    const/16 v0, 0x9
+    const/16 v1, 0x9
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKX:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKY:Ljava/lang/Long;
 
     if-eqz v0, :cond_9
 
-    const/16 v0, 0xa
+    const/16 v1, 0xa
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKY:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
-
     if-eqz v0, :cond_a
 
-    const/16 v0, 0xb
+    const/16 v1, 0xb
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
+    iget v0, v0, Lcom/google/android/gms/internal/firebase-perf/ba$d;->value:I
 
-    iget v1, v1, Lcom/google/android/gms/internal/firebase-perf/ba$d;->value:I
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
 
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
@@ -634,8 +609,6 @@
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
-
     array-length v0, v0
 
     if-lez v0, :cond_c
@@ -645,11 +618,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_c
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
+    if-ge v0, v3, :cond_c
 
     aget-object v2, v2, v0
 
@@ -669,8 +640,6 @@
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
-
     array-length v0, v0
 
     if-lez v0, :cond_e
@@ -678,11 +647,9 @@
     :goto_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_e
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
+    if-ge v1, v2, :cond_e
 
     aget-object v0, v0, v1
 
@@ -735,8 +702,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->url:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->url:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -759,8 +724,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/ba$c;->equals(Ljava/lang/Object;)Z
@@ -783,8 +746,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKZ:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKZ:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -807,8 +768,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aLa:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aLa:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -831,8 +790,6 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/ba$d;->equals(Ljava/lang/Object;)Z
@@ -855,8 +812,6 @@
     return v2
 
     :cond_c
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKU:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKU:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -879,8 +834,6 @@
     return v2
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aJh:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aJh:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -903,8 +856,6 @@
     return v2
 
     :cond_10
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKV:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKV:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -927,8 +878,6 @@
     return v2
 
     :cond_12
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKW:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKW:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -951,8 +900,6 @@
     return v2
 
     :cond_14
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKX:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKX:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -975,8 +922,6 @@
     return v2
 
     :cond_16
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKY:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/br;->aKY:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -1093,8 +1038,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->url:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -1113,8 +1056,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
-
     invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/ba$c;->hashCode()I
 
     move-result v1
@@ -1133,8 +1074,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKZ:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1153,8 +1092,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aLa:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1173,8 +1110,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
-
     invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/ba$d;->hashCode()I
 
     move-result v1
@@ -1193,8 +1128,6 @@
     goto :goto_5
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKU:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -1213,8 +1146,6 @@
     goto :goto_6
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aJh:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -1233,8 +1164,6 @@
     goto :goto_7
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKV:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1253,8 +1182,6 @@
     goto :goto_8
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKW:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1273,8 +1200,6 @@
     goto :goto_9
 
     :cond_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKX:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1293,8 +1218,6 @@
     goto :goto_a
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKY:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1352,10 +1275,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -1363,8 +1286,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->url:Ljava/lang/String;
-
     const/4 v2, 0x1
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
@@ -1378,17 +1299,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
-
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+    iget v1, v1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->value:I
 
-    iget v2, v2, Lcom/google/android/gms/internal/firebase-perf/ba$c;->value:I
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
 
     move-result v1
 
@@ -1399,15 +1316,13 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKZ:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1418,15 +1333,13 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aLa:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1437,15 +1350,13 @@
 
     if-eqz v1, :cond_4
 
-    const/4 v1, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKU:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
 
     move-result v1
 
@@ -1456,11 +1367,9 @@
 
     if-eqz v1, :cond_5
 
-    const/4 v1, 0x6
+    const/4 v2, 0x6
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aJh:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -1471,15 +1380,13 @@
 
     if-eqz v1, :cond_6
 
-    const/4 v1, 0x7
+    const/4 v2, 0x7
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKV:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1490,15 +1397,13 @@
 
     if-eqz v1, :cond_7
 
-    const/16 v1, 0x8
+    const/16 v2, 0x8
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKW:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1509,15 +1414,13 @@
 
     if-eqz v1, :cond_8
 
-    const/16 v1, 0x9
+    const/16 v2, 0x9
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKX:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1528,15 +1431,13 @@
 
     if-eqz v1, :cond_9
 
-    const/16 v1, 0xa
+    const/16 v2, 0xa
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKY:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1547,17 +1448,13 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
-
     if-eqz v1, :cond_a
 
-    const/16 v1, 0xb
+    const/16 v2, 0xb
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKS:Lcom/google/android/gms/internal/firebase-perf/ba$d;
+    iget v1, v1, Lcom/google/android/gms/internal/firebase-perf/ba$d;->value:I
 
-    iget v2, v2, Lcom/google/android/gms/internal/firebase-perf/ba$d;->value:I
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->R(II)I
 
     move-result v1
 
@@ -1570,8 +1467,6 @@
 
     if-eqz v1, :cond_d
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
-
     array-length v1, v1
 
     if-lez v1, :cond_d
@@ -1583,11 +1478,9 @@
     :goto_0
     iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_c
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aKT:[Lcom/google/android/gms/internal/firebase-perf/bs;
+    if-ge v0, v4, :cond_c
 
     aget-object v3, v3, v0
 
@@ -1614,8 +1507,6 @@
 
     if-eqz v1, :cond_f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
-
     array-length v1, v1
 
     if-lez v1, :cond_f
@@ -1623,11 +1514,9 @@
     :goto_1
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
 
-    array-length v1, v1
+    array-length v3, v1
 
-    if-ge v2, v1, :cond_f
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/br;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
+    if-ge v2, v3, :cond_f
 
     aget-object v1, v1, v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bs.smali
index facd8e5492..6b62930a08 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bs.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method public static qA()[Lcom/google/android/gms/internal/firebase-perf/bs;
+.method public static qz()[Lcom/google/android/gms/internal/firebase-perf/bs;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bs;->aMq:[Lcom/google/android/gms/internal/firebase-perf/bs;
@@ -98,7 +98,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -154,22 +154,18 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->key:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->value:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->value:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_1
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/he;->a(Lcom/google/android/gms/internal/firebase-perf/hc;)V
@@ -209,8 +205,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->key:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bs;->key:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -233,8 +227,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->value:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bs;->value:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -325,8 +317,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->key:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -345,8 +335,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->value:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -384,10 +372,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -395,11 +383,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->key:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -410,11 +396,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bs;->value:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bt.smali
index 4f47c0034c..946d33ed85 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bt.smali
@@ -59,7 +59,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -90,7 +90,7 @@
     return-object p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qr()Lcom/google/android/gms/internal/firebase-perf/fi;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qq()Lcom/google/android/gms/internal/firebase-perf/fi;
 
     move-result-object v0
 
@@ -107,9 +107,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
-
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dp;->rT()Lcom/google/android/gms/internal/firebase-perf/dp$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dp;->rS()Lcom/google/android/gms/internal/firebase-perf/dp$a;
 
     move-result-object v1
 
@@ -123,7 +121,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/au$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
@@ -150,7 +148,9 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
 
-    goto :goto_2
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
+
+    goto :goto_0
 
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -166,7 +166,9 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
 
-    goto :goto_2
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
+
+    goto :goto_0
 
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
@@ -182,7 +184,6 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
 
-    :goto_2
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
     goto :goto_0
@@ -203,41 +204,33 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->a(ILcom/google/android/gms/internal/firebase-perf/hk;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
-
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->g(Lcom/google/android/gms/internal/firebase-perf/ex;)V
 
     :cond_3
@@ -278,8 +271,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/bo;->equals(Ljava/lang/Object;)Z
@@ -302,8 +293,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/bv;->equals(Ljava/lang/Object;)Z
@@ -326,8 +315,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/br;->equals(Ljava/lang/Object;)Z
@@ -350,8 +337,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/firebase-perf/dp;->equals(Ljava/lang/Object;)Z
@@ -533,10 +518,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -544,11 +529,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
 
     move-result v1
 
@@ -559,11 +542,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
 
     move-result v1
 
@@ -574,11 +555,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->b(ILcom/google/android/gms/internal/firebase-perf/hk;)I
 
     move-result v1
 
@@ -589,11 +568,9 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bt;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bu.smali
index 12dfc7ebaf..53287055a6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bu.smali
@@ -47,7 +47,7 @@
     return-void
 .end method
 
-.method public static qB()[Lcom/google/android/gms/internal/firebase-perf/bu;
+.method public static qA()[Lcom/google/android/gms/internal/firebase-perf/bu;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMv:[Lcom/google/android/gms/internal/firebase-perf/bu;
@@ -102,7 +102,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -131,7 +131,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v0
 
@@ -146,13 +146,13 @@
     const/4 v4, 0x0
 
     :goto_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->th()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->tg()I
 
     move-result v5
 
     if-lez v5, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v5
 
@@ -179,8 +179,6 @@
     goto :goto_2
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
-
     array-length v3, v3
 
     :goto_2
@@ -196,7 +194,7 @@
 
     :cond_4
     :goto_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->th()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->tg()I
 
     move-result v2
 
@@ -206,7 +204,7 @@
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v5
 
@@ -255,14 +253,14 @@
 
     if-eqz v4, :cond_8
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     :cond_8
     invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->getPosition()I
 
     move-result v6
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v7
 
@@ -302,8 +300,6 @@
     goto :goto_6
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
-
     array-length v0, v0
 
     :goto_6
@@ -378,8 +374,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->zzec:Ljava/lang/String;
-
     const/4 v1, 0x1
 
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
@@ -389,8 +383,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
-
     array-length v0, v0
 
     if-lez v0, :cond_2
@@ -400,25 +392,21 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_2
+    if-ge v0, v2, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
+    aget-object v2, v1, v0
+
+    if-eqz v2, :cond_1
+
+    const/4 v2, 0x2
 
     aget-object v1, v1, v0
 
-    if-eqz v1, :cond_1
+    iget v1, v1, Lcom/google/android/gms/internal/firebase-perf/bk;->value:I
 
-    const/4 v1, 0x2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
-
-    aget-object v2, v2, v0
-
-    iget v2, v2, Lcom/google/android/gms/internal/firebase-perf/bk;->value:I
-
-    invoke-virtual {p1, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
+    invoke-virtual {p1, v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->N(II)V
 
     :cond_1
     add-int/lit8 v0, v0, 0x1
@@ -463,8 +451,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->zzec:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bu;->zzec:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -568,8 +554,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->zzec:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -617,10 +601,10 @@
     return v0
 .end method
 
-.method protected final qy()I
-    .locals 5
+.method protected final qx()I
+    .locals 6
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -628,8 +612,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->zzec:Ljava/lang/String;
-
     const/4 v2, 0x1
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
@@ -643,8 +625,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
-
     array-length v1, v1
 
     if-lez v1, :cond_4
@@ -658,11 +638,9 @@
     :goto_0
     iget-object v4, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v2, v4, :cond_2
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
+    if-ge v2, v5, :cond_2
 
     aget-object v4, v4, v2
 
@@ -687,11 +665,9 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_4
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bu;->aMw:[Lcom/google/android/gms/internal/firebase-perf/bk;
+    if-ge v1, v3, :cond_4
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bv.smali
index d3daf23cdb..2d4e5a8898 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bv.smali
@@ -50,25 +50,25 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMz:Ljava/lang/Long;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bw;->qD()[Lcom/google/android/gms/internal/firebase-perf/bw;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bw;->qC()[Lcom/google/android/gms/internal/firebase-perf/bw;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bv;->qC()[Lcom/google/android/gms/internal/firebase-perf/bv;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bv;->qB()[Lcom/google/android/gms/internal/firebase-perf/bv;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bx;->qE()[Lcom/google/android/gms/internal/firebase-perf/bx;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bx;->qD()[Lcom/google/android/gms/internal/firebase-perf/bx;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bu;->qB()[Lcom/google/android/gms/internal/firebase-perf/bu;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/bu;->qA()[Lcom/google/android/gms/internal/firebase-perf/bu;
 
     move-result-object v1
 
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method private static qC()[Lcom/google/android/gms/internal/firebase-perf/bv;
+.method private static qB()[Lcom/google/android/gms/internal/firebase-perf/bv;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMx:[Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -138,7 +138,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -202,8 +202,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
-
     array-length v1, v1
 
     :goto_1
@@ -235,7 +233,7 @@
 
     invoke-virtual {p1, v3}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -270,8 +268,6 @@
     goto :goto_3
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
-
     array-length v1, v1
 
     :goto_3
@@ -303,7 +299,7 @@
 
     invoke-virtual {p1, v3}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -338,8 +334,6 @@
     goto :goto_5
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
-
     array-length v1, v1
 
     :goto_5
@@ -371,7 +365,7 @@
 
     invoke-virtual {p1, v3}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -406,8 +400,6 @@
     goto :goto_7
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
-
     array-length v1, v1
 
     :goto_7
@@ -439,7 +431,7 @@
 
     invoke-virtual {p1, v3}, Lcom/google/android/gms/internal/firebase-perf/hb;->a(Lcom/google/android/gms/internal/firebase-perf/hk;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -461,7 +453,7 @@
     goto/16 :goto_0
 
     :cond_11
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -474,7 +466,7 @@
     goto/16 :goto_0
 
     :cond_12
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -487,7 +479,7 @@
     goto/16 :goto_0
 
     :cond_13
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v0
 
@@ -521,7 +513,7 @@
 .end method
 
 .method public final a(Lcom/google/android/gms/internal/firebase-perf/hc;)V
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -532,8 +524,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->name:Ljava/lang/String;
-
     const/4 v1, 0x1
 
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
@@ -545,8 +535,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMy:Ljava/lang/Boolean;
-
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v0
@@ -596,38 +584,32 @@
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aKV:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMz:Ljava/lang/Long;
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMz:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
-
     array-length v0, v0
 
     if-lez v0, :cond_6
@@ -637,11 +619,9 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_6
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
+    if-ge v0, v3, :cond_6
 
     aget-object v2, v2, v0
 
@@ -661,8 +641,6 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
-
     array-length v0, v0
 
     if-lez v0, :cond_8
@@ -672,11 +650,9 @@
     :goto_2
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_8
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
+    if-ge v0, v3, :cond_8
 
     aget-object v2, v2, v0
 
@@ -696,8 +672,6 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
-
     array-length v0, v0
 
     if-lez v0, :cond_a
@@ -707,11 +681,9 @@
     :goto_3
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_a
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
+    if-ge v0, v3, :cond_a
 
     aget-object v2, v2, v0
 
@@ -731,8 +703,6 @@
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
-
     array-length v0, v0
 
     if-lez v0, :cond_c
@@ -740,11 +710,9 @@
     :goto_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_c
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
+    if-ge v1, v2, :cond_c
 
     aget-object v0, v0, v1
 
@@ -797,8 +765,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->name:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bv;->name:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -821,8 +787,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMy:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bv;->aMy:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -845,8 +809,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aKV:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bv;->aKV:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -869,8 +831,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMz:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bv;->aMz:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -1013,8 +973,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->name:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -1033,8 +991,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMy:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -1053,8 +1009,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aKV:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1073,8 +1027,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMz:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -1152,10 +1104,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -1165,8 +1117,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->name:Ljava/lang/String;
-
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
@@ -1178,8 +1128,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMy:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x10
@@ -1197,15 +1145,13 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aKV:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1216,15 +1162,13 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMz:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
@@ -1237,8 +1181,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
-
     array-length v1, v1
 
     if-lez v1, :cond_6
@@ -1250,11 +1192,9 @@
     :goto_0
     iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_5
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMA:[Lcom/google/android/gms/internal/firebase-perf/bw;
+    if-ge v0, v4, :cond_5
 
     aget-object v3, v3, v0
 
@@ -1281,8 +1221,6 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
-
     array-length v1, v1
 
     if-lez v1, :cond_9
@@ -1294,11 +1232,9 @@
     :goto_1
     iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_8
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
+    if-ge v0, v4, :cond_8
 
     aget-object v3, v3, v0
 
@@ -1325,8 +1261,6 @@
 
     if-eqz v1, :cond_c
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
-
     array-length v1, v1
 
     if-lez v1, :cond_c
@@ -1338,11 +1272,9 @@
     :goto_2
     iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_b
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMC:[Lcom/google/android/gms/internal/firebase-perf/bx;
+    if-ge v0, v4, :cond_b
 
     aget-object v3, v3, v0
 
@@ -1369,8 +1301,6 @@
 
     if-eqz v1, :cond_e
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
-
     array-length v1, v1
 
     if-lez v1, :cond_e
@@ -1378,11 +1308,9 @@
     :goto_3
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
 
-    array-length v1, v1
+    array-length v3, v1
 
-    if-ge v2, v1, :cond_e
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMp:[Lcom/google/android/gms/internal/firebase-perf/bu;
+    if-ge v2, v3, :cond_e
 
     aget-object v1, v1, v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bw.smali
index 28ea6c14b2..d790290f37 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bw.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method public static qD()[Lcom/google/android/gms/internal/firebase-perf/bw;
+.method public static qC()[Lcom/google/android/gms/internal/firebase-perf/bw;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bw;->aMD:[Lcom/google/android/gms/internal/firebase-perf/bw;
@@ -98,7 +98,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -121,7 +121,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()J
 
     move-result-wide v0
 
@@ -147,7 +147,7 @@
 .end method
 
 .method public final a(Lcom/google/android/gms/internal/firebase-perf/hc;)V
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -158,26 +158,22 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->key:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->aME:Ljava/lang/Long;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->aME:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->i(IJ)V
 
     :cond_1
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/he;->a(Lcom/google/android/gms/internal/firebase-perf/hc;)V
@@ -217,8 +213,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->key:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bw;->key:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -241,8 +235,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->aME:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bw;->aME:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -333,8 +325,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->key:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -353,8 +343,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->aME:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -392,10 +380,10 @@
     return v0
 .end method
 
-.method protected final qy()I
-    .locals 4
+.method protected final qx()I
+    .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -403,11 +391,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->key:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -418,15 +404,13 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bw;->aME:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(IJ)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bx.smali
index e5f2fdb21f..3848750b91 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bx.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method public static qE()[Lcom/google/android/gms/internal/firebase-perf/bx;
+.method public static qD()[Lcom/google/android/gms/internal/firebase-perf/bx;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/bx;->aMF:[Lcom/google/android/gms/internal/firebase-perf/bx;
@@ -98,7 +98,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -154,22 +154,18 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->key:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->value:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->value:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/firebase-perf/hc;->e(ILjava/lang/String;)V
 
     :cond_1
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/he;->a(Lcom/google/android/gms/internal/firebase-perf/hc;)V
@@ -209,8 +205,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->key:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bx;->key:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -233,8 +227,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->value:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bx;->value:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -325,8 +317,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->key:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -345,8 +335,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->value:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -384,10 +372,10 @@
     return v0
 .end method
 
-.method protected final qy()I
+.method protected final qx()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qy()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/he;->qx()I
 
     move-result v0
 
@@ -395,11 +383,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->key:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -410,11 +396,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/bx;->value:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/hc;->f(ILjava/lang/String;)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/by.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/by.smali
index cc81097ff6..ccff9b3620 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/by.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/by.smali
@@ -58,11 +58,11 @@
     throw p1
 .end method
 
-.method public final qF()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public final qE()Lcom/google/android/gms/internal/firebase-perf/cg;
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/by;->rU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/by;->rT()I
 
     move-result v0
 
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/firebase-perf/by;->a(Lcom/google/android/gms/internal/firebase-perf/cw;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/co;->qQ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/co;->qP()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v0
     :try_end_0
@@ -146,7 +146,7 @@
     throw v1
 .end method
 
-.method qG()I
+.method qF()I
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bz.smali
index 68de01a176..bd5142f342 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/bz.smali
@@ -41,7 +41,7 @@
 .method public final synthetic a(Lcom/google/android/gms/internal/firebase-perf/ex;)Lcom/google/android/gms/internal/firebase-perf/ey;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/bz;->rX()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/bz;->rW()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
@@ -81,14 +81,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/bz;->qH()Lcom/google/android/gms/internal/firebase-perf/bz;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/bz;->qG()Lcom/google/android/gms/internal/firebase-perf/bz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public abstract qH()Lcom/google/android/gms/internal/firebase-perf/bz;
+.method public abstract qG()Lcom/google/android/gms/internal/firebase-perf/bz;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TBuilderType;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ca.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ca.smali
index 4ea50ac841..8321b6527a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ca.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ca.smali
@@ -26,7 +26,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rC()Lcom/google/android/gms/internal/firebase-perf/dc;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rB()Lcom/google/android/gms/internal/firebase-perf/dc;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cb.smali
index 61dd390555..c8555b979c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cb.smali
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->add(ILjava/lang/Object;)V
 
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->add(Ljava/lang/Object;)Z
 
@@ -80,7 +80,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->addAll(ILjava/util/Collection;)Z
 
@@ -99,7 +99,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->addAll(Ljava/util/Collection;)Z
 
@@ -111,7 +111,7 @@
 .method public clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0}, Ljava/util/AbstractList;->clear()V
 
@@ -227,7 +227,7 @@
     return v1
 .end method
 
-.method public qI()Z
+.method public qH()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/cb;->zzmv:Z
@@ -235,7 +235,7 @@
     return v0
 .end method
 
-.method public final qJ()V
+.method public final qI()V
     .locals 1
 
     const/4 v0, 0x0
@@ -245,7 +245,7 @@
     return-void
 .end method
 
-.method protected final qK()V
+.method protected final qJ()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/cb;->zzmv:Z
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(I)Ljava/lang/Object;
 
@@ -282,7 +282,7 @@
 .method public remove(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
 
@@ -301,7 +301,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->removeAll(Ljava/util/Collection;)Z
 
@@ -320,7 +320,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->retainAll(Ljava/util/Collection;)Z
 
@@ -337,7 +337,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()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/firebase-perf/cd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cd.smali
index 31635e0f14..3732875e89 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cd.smali
@@ -77,7 +77,7 @@
     return-object p0
 .end method
 
-.method static qL()Z
+.method static qK()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/cd;->aMH:Ljava/lang/Class;
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method static qM()Ljava/lang/Class;
+.method static qL()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ce.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ce.smali
index d2aa5d9422..527993e680 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ce.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ce.smali
@@ -78,7 +78,7 @@
 .method private final c(IZ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/firebase-perf/dr;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([ZI)[Z
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([ZI)[Z
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
 
     iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->modCount:I
 
@@ -469,7 +451,7 @@
 
     aget-boolean v2, v2, v1
 
-    invoke-static {v2}, Lcom/google/android/gms/internal/firebase-perf/dr;->N(Z)I
+    invoke-static {v2}, Lcom/google/android/gms/internal/firebase-perf/dr;->M(Z)I
 
     move-result v2
 
@@ -484,33 +466,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/ce;->cG(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
 
-    aget-boolean v0, v0, p1
+    aget-boolean v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
-
-    iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
@@ -525,7 +501,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -533,9 +509,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     const/4 v0, 0x0
 
@@ -564,13 +540,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->size:I
 
@@ -600,7 +574,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -647,19 +621,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/ce;->cG(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
 
-    aget-boolean v0, v0, p1
+    aget-boolean v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ce;->aMK:[Z
+    aput-boolean p2, v0, p1
 
-    aput-boolean p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cg.smali
index ba23709fd2..b24025127c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cg.smali
@@ -50,7 +50,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/firebase-perf/cg;->aML:Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qK()Z
 
     move-result v0
 
@@ -332,7 +332,7 @@
     return-object v0
 .end method
 
-.method public final qN()Ljava/lang/String;
+.method public final qM()Ljava/lang/String;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/dr;->UTF_8:Ljava/nio/charset/Charset;
@@ -355,7 +355,7 @@
     return-object v0
 .end method
 
-.method public abstract qO()Z
+.method public abstract qN()Z
 .end method
 
 .method public abstract size()I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cl.smali
index fc4c65e252..6dbf280ac6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cl.smali
@@ -123,7 +123,7 @@
     return p1
 .end method
 
-.method protected final qP()I
+.method protected final qO()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cl;->zzne:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/co.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/co.smali
index 35b16aaa63..67e947d0fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/co.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/co.smali
@@ -39,12 +39,12 @@
 
 
 # virtual methods
-.method public final qQ()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public final qP()Lcom/google/android/gms/internal/firebase-perf/cg;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/co;->aMP:Lcom/google/android/gms/internal/firebase-perf/cw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rw()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rv()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cq.smali
index 868da9b7e8..4b711d3de2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cq.smali
@@ -33,7 +33,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cq;->zznh:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result v1
 
@@ -51,7 +51,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cq;->zznh:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result v2
 
@@ -74,7 +74,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cq;->zznh:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result v1
 
@@ -112,17 +112,17 @@
 
     iget-object v1, p1, Lcom/google/android/gms/internal/firebase-perf/cq;->zznh:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result v2
 
     add-int/2addr v2, p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result p1
 
@@ -227,6 +227,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public cJ(I)B
@@ -273,7 +275,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cq;->zznh:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result v2
 
@@ -364,10 +366,10 @@
     return p1
 .end method
 
-.method public final qO()Z
+.method public final qN()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cq;->qO()I
 
     move-result v0
 
@@ -386,7 +388,7 @@
     return v0
 .end method
 
-.method protected qP()I
+.method protected qO()I
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cs.smali
index b1ef722c88..72db6ffdb2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cs.smali
@@ -124,7 +124,15 @@
     .end annotation
 .end method
 
-.method public abstract qR()I
+.method public abstract qQ()I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract qR()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -140,7 +148,7 @@
     .end annotation
 .end method
 
-.method public abstract qT()J
+.method public abstract qT()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -148,7 +156,7 @@
     .end annotation
 .end method
 
-.method public abstract qU()I
+.method public abstract qU()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -156,7 +164,7 @@
     .end annotation
 .end method
 
-.method public abstract qV()J
+.method public abstract qV()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -164,7 +172,7 @@
     .end annotation
 .end method
 
-.method public abstract qW()I
+.method public abstract qW()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -172,7 +180,7 @@
     .end annotation
 .end method
 
-.method public abstract qX()Z
+.method public abstract qX()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -180,7 +188,7 @@
     .end annotation
 .end method
 
-.method public abstract qY()Ljava/lang/String;
+.method public abstract qY()Lcom/google/android/gms/internal/firebase-perf/cg;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -188,7 +196,7 @@
     .end annotation
 .end method
 
-.method public abstract qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public abstract qZ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -212,7 +220,7 @@
     .end annotation
 .end method
 
-.method public abstract rc()I
+.method public abstract rc()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -220,7 +228,7 @@
     .end annotation
 .end method
 
-.method public abstract rd()J
+.method public abstract rd()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -228,7 +236,7 @@
     .end annotation
 .end method
 
-.method public abstract re()I
+.method public abstract re()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -260,7 +268,7 @@
     .end annotation
 .end method
 
-.method public abstract rf()J
+.method abstract rf()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -268,7 +276,7 @@
     .end annotation
 .end method
 
-.method abstract rg()J
+.method public abstract rg()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -276,13 +284,5 @@
     .end annotation
 .end method
 
-.method public abstract rh()Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract ri()I
+.method public abstract rh()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ct.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ct.smali
index 4cebc1dcc1..61a73768ba 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ct.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ct.smali
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method private final rj()I
+.method private final ri()I
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -73,34 +73,32 @@
 
     if-eq v1, v0, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
 
-    add-int/lit8 v2, v0, 0x1
+    add-int/lit8 v3, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     if-ltz v0, :cond_0
 
-    iput v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
     return v0
 
     :cond_0
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->limit:I
-
-    sub-int/2addr v3, v2
+    sub-int/2addr v1, v3
 
     const/16 v4, 0x9
 
-    if-lt v3, v4, :cond_6
+    if-lt v1, v4, :cond_6
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    shl-int/lit8 v2, v2, 0x7
+    shl-int/lit8 v3, v3, 0x7
 
-    xor-int/2addr v0, v2
+    xor-int/2addr v0, v3
 
     if-gez v0, :cond_1
 
@@ -109,46 +107,45 @@
     goto :goto_0
 
     :cond_1
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    shl-int/lit8 v3, v3, 0xe
+    shl-int/lit8 v1, v1, 0xe
 
-    xor-int/2addr v0, v3
+    xor-int/2addr v0, v1
 
-    if-ltz v0, :cond_3
+    if-ltz v0, :cond_2
 
     xor-int/lit16 v0, v0, 0x3f80
 
+    move v1, v3
+
+    goto :goto_0
+
     :cond_2
-    move v3, v2
+    add-int/lit8 v1, v3, 0x1
+
+    aget-byte v3, v2, v3
+
+    shl-int/lit8 v3, v3, 0x15
+
+    xor-int/2addr v0, v3
+
+    if-gez v0, :cond_3
+
+    const v2, -0x1fc080
+
+    xor-int/2addr v0, v2
 
     goto :goto_0
 
     :cond_3
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v1, v2, v1
 
-    shl-int/lit8 v2, v2, 0x15
-
-    xor-int/2addr v0, v2
-
-    if-gez v0, :cond_4
-
-    const v1, -0x1fc080
-
-    xor-int/2addr v0, v1
-
-    goto :goto_0
-
-    :cond_4
-    add-int/lit8 v2, v3, 0x1
-
-    aget-byte v3, v1, v3
-
-    shl-int/lit8 v4, v3, 0x1c
+    shl-int/lit8 v4, v1, 0x1c
 
     xor-int/2addr v0, v4
 
@@ -156,46 +153,51 @@
 
     xor-int/2addr v0, v4
 
-    if-gez v3, :cond_2
+    if-gez v1, :cond_4
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    if-gez v2, :cond_5
+    if-gez v3, :cond_5
 
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    if-gez v3, :cond_2
+    if-gez v1, :cond_4
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    if-gez v2, :cond_5
+    if-gez v3, :cond_5
 
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    if-gez v3, :cond_2
+    if-gez v1, :cond_4
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v1, v1, v2
+    aget-byte v2, v2, v3
 
-    if-ltz v1, :cond_6
+    if-ltz v2, :cond_6
+
+    goto :goto_0
+
+    :cond_4
+    move v1, v3
 
     :cond_5
     :goto_0
-    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
     return v0
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rf()J
 
     move-result-wide v0
 
@@ -204,7 +206,7 @@
     return v0
 .end method
 
-.method private final rk()J
+.method private final rj()J
     .locals 11
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -218,61 +220,53 @@
 
     if-eq v1, v0, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
 
-    add-int/lit8 v2, v0, 0x1
+    add-int/lit8 v3, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     if-ltz v0, :cond_0
 
-    iput v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
     int-to-long v0, v0
 
     return-wide v0
 
     :cond_0
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->limit:I
-
-    sub-int/2addr v3, v2
+    sub-int/2addr v1, v3
 
     const/16 v4, 0x9
 
-    if-lt v3, v4, :cond_9
+    if-lt v1, v4, :cond_9
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    shl-int/lit8 v2, v2, 0x7
+    shl-int/lit8 v3, v3, 0x7
 
-    xor-int/2addr v0, v2
+    xor-int/2addr v0, v3
 
     if-gez v0, :cond_1
 
     xor-int/lit8 v0, v0, -0x80
 
-    :goto_0
-    int-to-long v0, v0
+    int-to-long v2, v0
 
-    move-wide v9, v0
+    move-wide v3, v2
 
-    move v0, v3
-
-    :goto_1
-    move-wide v2, v9
-
-    goto/16 :goto_5
+    goto/16 :goto_0
 
     :cond_1
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    shl-int/lit8 v3, v3, 0xe
+    shl-int/lit8 v1, v1, 0xe
 
-    xor-int/2addr v0, v3
+    xor-int/2addr v0, v1
 
     if-ltz v0, :cond_2
 
@@ -282,59 +276,68 @@
 
     move-wide v9, v0
 
-    move v0, v2
+    move v1, v3
 
-    goto :goto_1
+    move-wide v3, v9
+
+    goto/16 :goto_0
 
     :cond_2
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    shl-int/lit8 v2, v2, 0x15
+    shl-int/lit8 v3, v3, 0x15
 
-    xor-int/2addr v0, v2
+    xor-int/2addr v0, v3
 
     if-gez v0, :cond_3
 
-    const v1, -0x1fc080
+    const v2, -0x1fc080
 
-    xor-int/2addr v0, v1
+    xor-int/2addr v0, v2
+
+    int-to-long v2, v0
+
+    move-wide v3, v2
+
+    goto/16 :goto_0
+
+    :cond_3
+    int-to-long v3, v0
+
+    add-int/lit8 v0, v1, 0x1
+
+    aget-byte v1, v2, v1
+
+    int-to-long v5, v1
+
+    const/16 v1, 0x1c
+
+    shl-long/2addr v5, v1
+
+    xor-long/2addr v3, v5
+
+    const-wide/16 v5, 0x0
+
+    cmp-long v1, v3, v5
+
+    if-ltz v1, :cond_4
+
+    const-wide/32 v1, 0xfe03f80
+
+    xor-long/2addr v1, v3
+
+    move-wide v3, v1
+
+    move v1, v0
 
     goto :goto_0
 
-    :cond_3
-    int-to-long v4, v0
-
-    add-int/lit8 v0, v3, 0x1
-
-    aget-byte v2, v1, v3
-
-    int-to-long v2, v2
-
-    const/16 v6, 0x1c
-
-    shl-long/2addr v2, v6
-
-    xor-long/2addr v2, v4
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v2, v4
-
-    if-ltz v6, :cond_4
-
-    const-wide/32 v4, 0xfe03f80
-
-    :goto_2
-    xor-long/2addr v2, v4
-
-    goto :goto_5
-
     :cond_4
-    add-int/lit8 v6, v0, 0x1
+    add-int/lit8 v1, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     int-to-long v7, v0
 
@@ -342,49 +345,49 @@
 
     shl-long/2addr v7, v0
 
-    xor-long/2addr v2, v7
+    xor-long/2addr v3, v7
 
-    cmp-long v0, v2, v4
+    cmp-long v0, v3, v5
 
     if-gez v0, :cond_5
 
-    const-wide v0, -0x7f01fc080L
+    const-wide v5, -0x7f01fc080L
 
-    :goto_3
-    xor-long/2addr v0, v2
+    xor-long/2addr v3, v5
 
-    move-wide v2, v0
-
-    :goto_4
-    move v0, v6
-
-    goto :goto_5
+    goto :goto_0
 
     :cond_5
-    add-int/lit8 v0, v6, 0x1
+    add-int/lit8 v0, v1, 0x1
 
-    aget-byte v6, v1, v6
+    aget-byte v1, v2, v1
 
-    int-to-long v6, v6
+    int-to-long v7, v1
 
-    const/16 v8, 0x2a
+    const/16 v1, 0x2a
 
-    shl-long/2addr v6, v8
+    shl-long/2addr v7, v1
 
-    xor-long/2addr v2, v6
+    xor-long/2addr v3, v7
 
-    cmp-long v6, v2, v4
+    cmp-long v1, v3, v5
 
-    if-ltz v6, :cond_6
+    if-ltz v1, :cond_6
 
-    const-wide v4, 0x3f80fe03f80L
+    const-wide v1, 0x3f80fe03f80L
 
-    goto :goto_2
+    xor-long/2addr v1, v3
+
+    move-wide v3, v1
+
+    move v1, v0
+
+    goto :goto_0
 
     :cond_6
-    add-int/lit8 v6, v0, 0x1
+    add-int/lit8 v1, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     int-to-long v7, v0
 
@@ -392,64 +395,68 @@
 
     shl-long/2addr v7, v0
 
-    xor-long/2addr v2, v7
+    xor-long/2addr v3, v7
 
-    cmp-long v0, v2, v4
+    cmp-long v0, v3, v5
 
     if-gez v0, :cond_7
 
-    const-wide v0, -0x1fc07f01fc080L
+    const-wide v5, -0x1fc07f01fc080L
 
-    goto :goto_3
+    xor-long/2addr v3, v5
+
+    goto :goto_0
 
     :cond_7
-    add-int/lit8 v0, v6, 0x1
+    add-int/lit8 v0, v1, 0x1
 
-    aget-byte v6, v1, v6
+    aget-byte v1, v2, v1
 
-    int-to-long v6, v6
+    int-to-long v7, v1
 
-    const/16 v8, 0x38
+    const/16 v1, 0x38
 
-    shl-long/2addr v6, v8
+    shl-long/2addr v7, v1
 
-    xor-long/2addr v2, v6
+    xor-long/2addr v3, v7
 
-    const-wide v6, 0xfe03f80fe03f80L
+    const-wide v7, 0xfe03f80fe03f80L
 
-    xor-long/2addr v2, v6
+    xor-long/2addr v3, v7
 
-    cmp-long v6, v2, v4
+    cmp-long v1, v3, v5
 
-    if-gez v6, :cond_8
+    if-gez v1, :cond_8
 
-    add-int/lit8 v6, v0, 0x1
+    add-int/lit8 v1, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
-    int-to-long v0, v0
+    int-to-long v7, v0
 
-    cmp-long v7, v0, v4
+    cmp-long v0, v7, v5
 
-    if-ltz v7, :cond_9
+    if-ltz v0, :cond_9
 
-    goto :goto_4
+    goto :goto_0
 
     :cond_8
-    :goto_5
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    move v1, v0
 
-    return-wide v2
+    :goto_0
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+
+    return-wide v3
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rf()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method private final rl()I
+.method private final rk()I
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -510,14 +517,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final rm()J
+.method private final rl()J
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -648,15 +655,15 @@
     return-wide v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final rn()V
-    .locals 2
+.method private final rm()V
+    .locals 3
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->limit:I
 
@@ -670,19 +677,15 @@
 
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amz:I
 
-    sub-int/2addr v0, v1
+    sub-int v1, v0, v1
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amB:I
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amB:I
 
-    if-le v0, v1, :cond_0
+    if-le v1, v2, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amB:I
+    sub-int/2addr v1, v2
 
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amy:I
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->limit:I
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amy:I
 
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amy:I
 
@@ -700,7 +703,7 @@
     return-void
 .end method
 
-.method private final ro()B
+.method private final rn()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -714,20 +717,18 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
     iput v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
-    aget-byte v0, v0, v1
+    aget-byte v0, v1, v0
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
@@ -756,7 +757,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
@@ -797,7 +798,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sk()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -819,7 +820,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sh()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -844,7 +845,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -860,7 +861,7 @@
 
     :cond_0
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -884,7 +885,7 @@
     return v3
 
     :pswitch_3
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result p1
 
@@ -930,7 +931,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sh()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -940,7 +941,7 @@
     :goto_1
     if-ge v2, v0, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rn()B
 
     move-result p1
 
@@ -954,13 +955,13 @@
     return v3
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sh()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -983,7 +984,7 @@
 
     if-ltz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -995,19 +996,19 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amB:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rm()V
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -1019,7 +1020,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amB:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rm()V
 
     return-void
 .end method
@@ -1042,32 +1043,30 @@
 
     if-gt p1, v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    add-int/2addr v1, p1
 
-    add-int/2addr v0, p1
-
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
     return-void
 
     :cond_0
     if-gez p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
     throw p1
 .end method
 
-.method public final qR()I
+.method public final qQ()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1075,7 +1074,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1088,7 +1087,7 @@
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
@@ -1096,11 +1095,9 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amA:I
 
-    ushr-int/lit8 v0, v0, 0x3
+    ushr-int/lit8 v1, v0, 0x3
 
-    if-eqz v0, :cond_1
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->amA:I
+    if-eqz v1, :cond_1
 
     return v0
 
@@ -1114,6 +1111,21 @@
     throw v0
 .end method
 
+.method public final qR()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final qS()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -1122,29 +1134,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rk()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final qT()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rk()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final qU()I
+.method public final qT()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1152,14 +1149,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qV()J
+.method public final qU()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1167,14 +1164,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rm()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rl()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final qW()I
+.method public final qV()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1182,14 +1179,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rl()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rk()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qX()Z
+.method public final qW()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1197,7 +1194,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rk()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()J
 
     move-result-wide v0
 
@@ -1217,7 +1214,7 @@
     return v0
 .end method
 
-.method public final qY()Ljava/lang/String;
+.method public final qX()Ljava/lang/String;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1225,7 +1222,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
@@ -1241,8 +1238,6 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
-
     invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/firebase-perf/gn;->k([BII)Ljava/lang/String;
 
     move-result-object v1
@@ -1265,21 +1260,21 @@
     :cond_1
     if-gtz v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public final qY()Lcom/google/android/gms/internal/firebase-perf/cg;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1287,7 +1282,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
@@ -1303,8 +1298,6 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
-
     invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/firebase-perf/cg;->h([BII)Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v1
@@ -1335,19 +1328,15 @@
 
     if-gt v0, v1, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    add-int/2addr v0, v2
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
-
-    add-int/2addr v2, v0
-
-    iput v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
-    invoke-static {v0, v1, v2}, Ljava/util/Arrays;->copyOfRange([BII)[B
+    invoke-static {v0, v2, v1}, Ljava/util/Arrays;->copyOfRange([BII)[B
 
     move-result-object v0
 
@@ -1368,20 +1357,35 @@
     return-object v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 .end method
 
+.method public final qZ()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final ra()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -1390,7 +1394,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
@@ -1405,29 +1409,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rk()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final rc()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rl()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rd()J
+.method public final rc()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1435,14 +1424,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rm()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rl()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final re()I
+.method public final rd()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1450,7 +1439,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
@@ -1465,6 +1454,33 @@
     return v0
 .end method
 
+.method public final re()J
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()J
+
+    move-result-wide v0
+
+    const/4 v2, 0x1
+
+    ushr-long v2, v0, v2
+
+    const-wide/16 v4, 0x1
+
+    and-long/2addr v0, v4
+
+    neg-long v0, v0
+
+    xor-long/2addr v0, v2
+
+    return-wide v0
+.end method
+
 .method public final readDouble()D
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -1473,7 +1489,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rm()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rl()J
 
     move-result-wide v0
 
@@ -1492,7 +1508,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rl()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rk()I
 
     move-result v0
 
@@ -1511,7 +1527,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ri()I
 
     move-result v0
 
@@ -1527,13 +1543,11 @@
 
     new-instance v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
-
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
+    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->buffer:[B
 
     sget-object v4, Lcom/google/android/gms/internal/firebase-perf/dr;->UTF_8:Ljava/nio/charset/Charset;
 
-    invoke-direct {v1, v2, v3, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
+    invoke-direct {v1, v3, v2, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
     iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
 
@@ -1553,48 +1567,21 @@
     :cond_1
     if-gez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final rf()J
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rk()J
-
-    move-result-wide v0
-
-    const/4 v2, 0x1
-
-    ushr-long v2, v0, v2
-
-    const-wide/16 v4, 0x1
-
-    and-long/2addr v0, v4
-
-    neg-long v0, v0
-
-    xor-long/2addr v0, v2
-
-    return-wide v0
-.end method
-
-.method final rg()J
+.method final rf()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1611,7 +1598,7 @@
 
     if-ge v2, v3, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ct;->rn()B
 
     move-result v3
 
@@ -1635,14 +1622,16 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sh()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sg()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object v0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final rh()Z
+.method public final rg()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1666,7 +1655,7 @@
     return v0
 .end method
 
-.method public final ri()I
+.method public final rh()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ct;->pos:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cu.smali
index a18c639324..0d5b495268 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cu.smali
@@ -81,7 +81,7 @@
     throw p1
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qS()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qR()J
 
     move-result-wide p1
 
@@ -92,7 +92,7 @@
     return-object p1
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->ra()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qZ()I
 
     move-result p1
 
@@ -103,14 +103,14 @@
     return-object p1
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qY()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qX()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rf()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->re()J
 
     move-result-wide p1
 
@@ -121,7 +121,7 @@
     return-object p1
 
     :pswitch_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->re()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rd()I
 
     move-result p1
 
@@ -132,7 +132,7 @@
     return-object p1
 
     :pswitch_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rd()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rc()J
 
     move-result-wide p1
 
@@ -143,7 +143,7 @@
     return-object p1
 
     :pswitch_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rc()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rb()I
 
     move-result p1
 
@@ -158,7 +158,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/cu;->cR(I)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object p1
 
@@ -173,7 +173,7 @@
     return-object p1
 
     :pswitch_8
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qT()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qS()J
 
     move-result-wide p1
 
@@ -184,7 +184,7 @@
     return-object p1
 
     :pswitch_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qT()I
 
     move-result p1
 
@@ -206,7 +206,7 @@
     return-object p1
 
     :pswitch_b
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qV()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qU()J
 
     move-result-wide p1
 
@@ -217,7 +217,7 @@
     return-object p1
 
     :pswitch_c
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qV()I
 
     move-result p1
 
@@ -228,7 +228,7 @@
     return-object p1
 
     :pswitch_d
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rb()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->ra()I
 
     move-result p1
 
@@ -250,14 +250,14 @@
     return-object p1
 
     :pswitch_f
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_10
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qX()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qW()Z
 
     move-result p1
 
@@ -325,7 +325,7 @@
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/eh;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object p1
 
@@ -333,7 +333,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -344,7 +344,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -359,7 +359,7 @@
     :cond_2
     if-eqz p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qY()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qX()Ljava/lang/String;
 
     move-result-object v0
 
@@ -375,7 +375,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -386,7 +386,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -399,11 +399,13 @@
     return-void
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method private final c(Lcom/google/android/gms/internal/firebase-perf/fo;Lcom/google/android/gms/internal/firebase-perf/dc;)Ljava/lang/Object;
@@ -428,7 +430,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -485,7 +487,7 @@
     return-object v1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sk()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -509,7 +511,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -531,7 +533,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sk()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p0
 
@@ -553,7 +555,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sk()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p0
 
@@ -570,7 +572,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -579,7 +581,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->se()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -641,7 +643,7 @@
 
     :cond_0
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sk()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -696,13 +698,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -711,7 +713,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()J
 
     move-result-wide v2
 
@@ -719,7 +721,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -730,7 +732,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -739,7 +741,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()J
 
     move-result-wide v1
 
@@ -747,7 +749,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -758,7 +760,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -781,13 +783,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -796,7 +798,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()J
 
     move-result-wide v2
 
@@ -808,7 +810,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -819,7 +821,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -828,7 +830,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()J
 
     move-result-wide v0
 
@@ -840,7 +842,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -851,7 +853,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -901,13 +903,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -916,7 +918,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
 
     move-result-wide v2
 
@@ -924,7 +926,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -935,7 +937,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -944,7 +946,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
 
     move-result-wide v1
 
@@ -952,7 +954,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -963,7 +965,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -986,13 +988,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1001,7 +1003,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
 
     move-result-wide v2
 
@@ -1013,7 +1015,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -1024,7 +1026,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1033,7 +1035,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qS()J
 
     move-result-wide v0
 
@@ -1045,7 +1047,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1056,7 +1058,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -1106,13 +1108,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1121,7 +1123,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()I
 
     move-result p1
 
@@ -1129,7 +1131,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -1140,7 +1142,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1149,7 +1151,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()I
 
     move-result p1
 
@@ -1157,7 +1159,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -1168,7 +1170,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -1191,13 +1193,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1206,7 +1208,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()I
 
     move-result v0
 
@@ -1218,7 +1220,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -1229,7 +1231,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1238,7 +1240,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()I
 
     move-result v0
 
@@ -1250,7 +1252,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1261,7 +1263,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -1303,7 +1305,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1312,7 +1314,7 @@
     :pswitch_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -1320,7 +1322,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1329,7 +1331,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()J
 
     move-result-wide v2
 
@@ -1337,7 +1339,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -1349,7 +1351,7 @@
     :pswitch_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()J
 
     move-result-wide v0
 
@@ -1357,7 +1359,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1368,7 +1370,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -1387,7 +1389,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1396,7 +1398,7 @@
     :pswitch_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -1404,7 +1406,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1413,7 +1415,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()J
 
     move-result-wide v2
 
@@ -1425,7 +1427,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -1437,7 +1439,7 @@
     :pswitch_3
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()J
 
     move-result-wide v0
 
@@ -1449,7 +1451,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1460,7 +1462,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -1525,7 +1527,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()I
 
     move-result p1
 
@@ -1533,7 +1535,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -1544,7 +1546,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -1557,7 +1559,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1566,7 +1568,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
@@ -1574,7 +1576,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1583,7 +1585,7 @@
     :cond_4
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()I
 
     move-result p1
 
@@ -1591,7 +1593,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -1611,7 +1613,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()I
 
     move-result v0
 
@@ -1623,7 +1625,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1634,7 +1636,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -1647,7 +1649,7 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1656,7 +1658,7 @@
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -1664,7 +1666,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1673,7 +1675,7 @@
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()I
 
     move-result v0
 
@@ -1685,7 +1687,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -1731,13 +1733,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1746,7 +1748,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()Z
 
     move-result p1
 
@@ -1754,7 +1756,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -1765,7 +1767,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1774,7 +1776,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()Z
 
     move-result p1
 
@@ -1782,7 +1784,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -1793,7 +1795,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -1816,13 +1818,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -1831,7 +1833,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()Z
 
     move-result v0
 
@@ -1843,7 +1845,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -1854,7 +1856,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -1863,7 +1865,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()Z
 
     move-result v0
 
@@ -1875,7 +1877,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1886,7 +1888,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -1949,7 +1951,7 @@
     if-ne v0, v1, :cond_2
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v0
 
@@ -1957,7 +1959,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -1968,7 +1970,7 @@
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -1981,11 +1983,13 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final I(Ljava/util/List;)V
@@ -2025,13 +2029,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2040,7 +2044,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
@@ -2048,7 +2052,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -2059,7 +2063,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2068,7 +2072,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
@@ -2076,7 +2080,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -2087,7 +2091,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -2110,13 +2114,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2125,7 +2129,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -2137,7 +2141,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -2148,7 +2152,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2157,7 +2161,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -2169,7 +2173,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -2180,7 +2184,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -2230,13 +2234,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2245,7 +2249,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
 
     move-result p1
 
@@ -2253,7 +2257,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -2264,7 +2268,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2273,7 +2277,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
 
     move-result p1
 
@@ -2281,7 +2285,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -2292,7 +2296,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -2315,13 +2319,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2330,7 +2334,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
 
     move-result v0
 
@@ -2342,7 +2346,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -2353,7 +2357,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2362,7 +2366,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
 
     move-result v0
 
@@ -2374,7 +2378,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -2385,7 +2389,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -2438,7 +2442,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
 
     move-result p1
 
@@ -2446,7 +2450,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -2457,7 +2461,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -2470,7 +2474,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2479,7 +2483,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
@@ -2487,7 +2491,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2496,7 +2500,7 @@
     :cond_4
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
 
     move-result p1
 
@@ -2504,7 +2508,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -2524,7 +2528,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
 
     move-result v0
 
@@ -2536,7 +2540,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -2547,7 +2551,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -2560,7 +2564,7 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2569,7 +2573,7 @@
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -2577,7 +2581,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2586,7 +2590,7 @@
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rb()I
 
     move-result v0
 
@@ -2598,7 +2602,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -2636,7 +2640,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2645,7 +2649,7 @@
     :pswitch_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -2653,7 +2657,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2662,7 +2666,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()J
 
     move-result-wide v2
 
@@ -2670,7 +2674,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -2682,7 +2686,7 @@
     :pswitch_1
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()J
 
     move-result-wide v0
 
@@ -2690,7 +2694,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -2701,7 +2705,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -2720,7 +2724,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2729,7 +2733,7 @@
     :pswitch_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -2737,7 +2741,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2746,7 +2750,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()J
 
     move-result-wide v2
 
@@ -2758,7 +2762,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -2770,7 +2774,7 @@
     :pswitch_3
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()J
 
     move-result-wide v0
 
@@ -2782,7 +2786,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -2793,7 +2797,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -2855,13 +2859,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2870,7 +2874,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()I
 
     move-result p1
 
@@ -2878,7 +2882,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -2889,7 +2893,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2898,7 +2902,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()I
 
     move-result p1
 
@@ -2906,7 +2910,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -2917,7 +2921,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -2940,13 +2944,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -2955,7 +2959,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()I
 
     move-result v0
 
@@ -2967,7 +2971,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -2978,7 +2982,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -2987,7 +2991,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()I
 
     move-result v0
 
@@ -2999,7 +3003,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -3010,7 +3014,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -3060,13 +3064,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -3075,7 +3079,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rf()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()J
 
     move-result-wide v2
 
@@ -3083,7 +3087,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -3094,7 +3098,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -3103,7 +3107,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rf()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()J
 
     move-result-wide v1
 
@@ -3111,7 +3115,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -3122,7 +3126,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -3145,13 +3149,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -3160,7 +3164,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()J
 
     move-result-wide v2
 
@@ -3172,7 +3176,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -3183,7 +3187,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -3192,7 +3196,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()J
 
     move-result-wide v0
 
@@ -3204,7 +3208,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -3215,7 +3219,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -3260,7 +3264,7 @@
 .end method
 
 .method public final a(Ljava/util/List;Lcom/google/android/gms/internal/firebase-perf/fo;Lcom/google/android/gms/internal/firebase-perf/dc;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -3283,13 +3287,11 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
 
-    and-int/lit8 v0, v0, 0x7
+    and-int/lit8 v1, v0, 0x7
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    if-ne v0, v1, :cond_3
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
+    if-ne v1, v2, :cond_3
 
     :cond_0
     invoke-direct {p0, p2, p3}, Lcom/google/android/gms/internal/firebase-perf/cu;->c(Lcom/google/android/gms/internal/firebase-perf/fo;Lcom/google/android/gms/internal/firebase-perf/dc;)Ljava/lang/Object;
@@ -3300,7 +3302,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v1
 
@@ -3315,7 +3317,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v1
 
@@ -3323,16 +3325,20 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->amD:I
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(Ljava/util/Map;Lcom/google/android/gms/internal/firebase-perf/eq;Lcom/google/android/gms/internal/firebase-perf/dc;)V
@@ -3365,7 +3371,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -3381,7 +3387,7 @@
 
     :goto_0
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rp()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->ro()I
 
     move-result v3
 
@@ -3391,7 +3397,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v4
     :try_end_0
@@ -3402,7 +3408,7 @@
     packed-switch v3, :pswitch_data_0
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rq()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rp()Z
 
     move-result v3
 
@@ -3419,9 +3425,7 @@
 
     invoke-direct {p0, v3, v4, p3}, Lcom/google/android/gms/internal/firebase-perf/cu;->a(Lcom/google/android/gms/internal/firebase-perf/gt;Ljava/lang/Class;Lcom/google/android/gms/internal/firebase-perf/dc;)Ljava/lang/Object;
 
-    move-result-object v3
-
-    move-object v2, v3
+    move-result-object v2
 
     goto :goto_0
 
@@ -3432,9 +3436,7 @@
 
     invoke-direct {p0, v3, v4, v4}, Lcom/google/android/gms/internal/firebase-perf/cu;->a(Lcom/google/android/gms/internal/firebase-perf/gt;Ljava/lang/Class;Lcom/google/android/gms/internal/firebase-perf/dc;)Ljava/lang/Object;
 
-    move-result-object v3
-
-    move-object v1, v3
+    move-result-object v1
 
     goto :goto_0
 
@@ -3457,7 +3459,7 @@
 
     :catch_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rq()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cu;->rp()Z
 
     move-result v3
 
@@ -3494,6 +3496,10 @@
 
     throw p1
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -3533,7 +3539,7 @@
 .end method
 
 .method public final b(Ljava/util/List;Lcom/google/android/gms/internal/firebase-perf/fo;Lcom/google/android/gms/internal/firebase-perf/dc;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -3556,13 +3562,11 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
 
-    and-int/lit8 v0, v0, 0x7
+    and-int/lit8 v1, v0, 0x7
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    if-ne v0, v1, :cond_3
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
+    if-ne v1, v2, :cond_3
 
     :cond_0
     invoke-direct {p0, p2, p3}, Lcom/google/android/gms/internal/firebase-perf/cu;->d(Lcom/google/android/gms/internal/firebase-perf/fo;Lcom/google/android/gms/internal/firebase-perf/dc;)Ljava/lang/Object;
@@ -3573,7 +3577,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v1
 
@@ -3588,7 +3592,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v1
 
@@ -3596,16 +3600,20 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->amD:I
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final getTag()I
@@ -3616,6 +3624,27 @@
     return v0
 .end method
 
+.method public final qR()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/firebase-perf/cu;->cR(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final qS()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -3637,28 +3666,7 @@
     return-wide v0
 .end method
 
-.method public final qT()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/firebase-perf/cu;->cR(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final qU()I
+.method public final qT()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3672,14 +3680,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qT()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qV()J
+.method public final qU()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3693,14 +3701,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qU()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final qW()I
+.method public final qV()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3714,14 +3722,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qV()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qX()Z
+.method public final qW()Z
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3735,14 +3743,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qW()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qY()Ljava/lang/String;
+.method public final qX()Ljava/lang/String;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3756,14 +3764,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qY()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qX()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public final qY()Lcom/google/android/gms/internal/firebase-perf/cg;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3777,13 +3785,34 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
+.method public final qZ()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/firebase-perf/cu;->cR(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final ra()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -3813,7 +3842,7 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x5
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/firebase-perf/cu;->cR(I)V
 
@@ -3826,28 +3855,7 @@
     return v0
 .end method
 
-.method public final rc()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/firebase-perf/cu;->cR(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rd()J
+.method public final rc()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3861,14 +3869,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rc()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final re()I
+.method public final rd()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3882,13 +3890,34 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rd()I
 
     move-result v0
 
     return v0
 .end method
 
+.method public final re()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/firebase-perf/cu;->cR(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->re()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final readDouble()D
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -3976,28 +4005,7 @@
     return-void
 .end method
 
-.method public final rf()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/firebase-perf/cu;->cR(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rf()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final rp()I
+.method public final ro()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4009,8 +4017,6 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->amD:I
-
     iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
 
     const/4 v0, 0x0
@@ -4022,7 +4028,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -4033,8 +4039,6 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
-
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->amC:I
 
     if-ne v0, v1, :cond_1
@@ -4042,8 +4046,6 @@
     goto :goto_1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
-
     ushr-int/lit8 v0, v0, 0x3
 
     return v0
@@ -4055,7 +4057,7 @@
     return v0
 .end method
 
-.method public final rq()Z
+.method public final rp()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4065,7 +4067,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -4080,11 +4082,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
+    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->tag:I
-
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->cN(I)Z
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->cN(I)Z
 
     move-result v0
 
@@ -4126,7 +4126,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -4135,7 +4135,7 @@
     :pswitch_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -4143,7 +4143,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -4160,7 +4160,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -4180,7 +4180,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -4191,7 +4191,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -4210,7 +4210,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -4219,7 +4219,7 @@
     :pswitch_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -4227,7 +4227,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -4248,7 +4248,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -4272,7 +4272,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -4283,7 +4283,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -4356,7 +4356,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result p1
 
@@ -4367,7 +4367,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result p1
 
@@ -4380,7 +4380,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -4389,7 +4389,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result p1
 
@@ -4397,7 +4397,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -4414,7 +4414,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result p1
 
@@ -4446,7 +4446,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rg()Z
 
     move-result v0
 
@@ -4457,7 +4457,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qQ()I
 
     move-result v0
 
@@ -4470,7 +4470,7 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -4479,7 +4479,7 @@
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ra()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->qZ()I
 
     move-result v0
 
@@ -4487,7 +4487,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v1
 
@@ -4508,7 +4508,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cu;->aMT:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$a.smali
index 43e1b744c4..0950223a34 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$a.smali
@@ -194,7 +194,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rw()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rv()I
 
     move-result v0
 
@@ -277,11 +277,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$a;->buffer:[B
 
@@ -307,7 +302,9 @@
 
     goto :goto_1
 
-    :goto_2
+    :catch_0
+    move-exception p1
+
     new-instance p2, Lcom/google/android/gms/internal/firebase-perf/cw$c;
 
     const/4 v0, 0x3
@@ -351,6 +348,8 @@
     invoke-direct {p2, v0, p1}, Lcom/google/android/gms/internal/firebase-perf/cw$c;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final Y(J)V
@@ -604,7 +603,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/firebase-perf/by;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/by;->qG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/by;->qF()I
 
     move-result v0
 
@@ -659,7 +658,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/by;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/by;->qG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/by;->qF()I
 
     move-result v1
 
@@ -745,7 +744,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rT()I
 
     move-result v0
 
@@ -921,7 +920,7 @@
 
     iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/cw$a;->position:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rw()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rv()I
 
     move-result v4
 
@@ -952,7 +951,7 @@
 
     iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$a;->position:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rw()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rv()I
 
     move-result v3
 
@@ -1037,7 +1036,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rw()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->rv()I
 
     move-result v0
 
@@ -1110,11 +1109,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$a;->buffer:[B
 
@@ -1138,7 +1132,9 @@
 
     goto :goto_1
 
-    :goto_2
+    :catch_0
+    move-exception p1
+
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/cw$c;
 
     const/4 v1, 0x3
@@ -1182,6 +1178,8 @@
     invoke-direct {v0, v1, p1}, Lcom/google/android/gms/internal/firebase-perf/cw$c;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final d(B)V
@@ -1331,7 +1329,7 @@
     return-void
 .end method
 
-.method public final rw()I
+.method public final rv()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$a;->limit:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$d.smali
index b7406573a6..4758ea42d8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$d.smali
@@ -179,11 +179,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$d;->aMZ:Ljava/nio/ByteBuffer;
 
@@ -205,12 +200,16 @@
 
     goto :goto_0
 
-    :goto_1
+    :catch_0
+    move-exception p1
+
     new-instance p2, Lcom/google/android/gms/internal/firebase-perf/cw$c;
 
     invoke-direct {p2, p1}, Lcom/google/android/gms/internal/firebase-perf/cw$c;-><init>(Ljava/lang/Throwable;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final Y(J)V
@@ -322,7 +321,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/by;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/by;->qG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/by;->qF()I
 
     move-result v1
 
@@ -408,7 +407,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rT()I
 
     move-result v0
 
@@ -624,11 +623,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$d;->aMZ:Ljava/nio/ByteBuffer;
 
@@ -646,12 +640,16 @@
 
     goto :goto_0
 
-    :goto_1
+    :catch_0
+    move-exception p1
+
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/cw$c;
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/internal/firebase-perf/cw$c;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final d(B)V
@@ -767,7 +765,7 @@
     return-void
 .end method
 
-.method public final rw()I
+.method public final rv()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$d;->aMZ:Ljava/nio/ByteBuffer;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$e.smali
index 08d09f8d25..6c6fa4d537 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw$e.smali
@@ -213,7 +213,6 @@
 
     if-nez v2, :cond_0
 
-    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
 
     add-long/2addr v9, v0
@@ -250,7 +249,7 @@
     goto :goto_0
 
     :cond_1
-    :goto_2
+    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
 
     iget-wide v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
@@ -259,17 +258,25 @@
 
     if-gez v11, :cond_3
 
-    and-long v0, p1, v7
+    and-long v2, p1, v7
 
-    cmp-long v2, v0, v5
+    cmp-long v11, v2, v5
 
-    if-nez v2, :cond_2
+    if-nez v11, :cond_2
 
-    goto :goto_1
+    add-long/2addr v9, v0
+
+    iput-wide v9, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
+
+    long-to-int p1, p1
+
+    int-to-byte p1, p1
+
+    invoke-static {v0, v1, p1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(JB)V
+
+    return-void
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
-
     add-long v2, v0, v9
 
     iput-wide v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
@@ -286,7 +293,7 @@
 
     ushr-long/2addr p1, v4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance p1, Lcom/google/android/gms/internal/firebase-perf/cw$c;
@@ -295,15 +302,13 @@
 
     new-array p2, p2, [Ljava/lang/Object;
 
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v1
-
-    aput-object v1, p2, v0
+    aput-object v0, p2, v2
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
 
@@ -332,6 +337,8 @@
     invoke-direct {p1, p2}, Lcom/google/android/gms/internal/firebase-perf/cw$c;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final Y(J)V
@@ -447,7 +454,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/by;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/by;->qG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/by;->qF()I
 
     move-result v1
 
@@ -533,7 +540,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rT()I
 
     move-result v0
 
@@ -623,8 +630,6 @@
 
     iget-wide v6, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNa:J
 
-    const/4 v2, 0x0
-
     sub-long/2addr v4, v6
 
     long-to-int v2, v4
@@ -782,7 +787,6 @@
 
     if-nez v0, :cond_0
 
-    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
 
     add-long/2addr v4, v0
@@ -815,7 +819,7 @@
     goto :goto_0
 
     :cond_1
-    :goto_2
+    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
 
     iget-wide v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
@@ -824,15 +828,21 @@
 
     if-gez v6, :cond_3
 
-    and-int/lit8 v0, p1, -0x80
+    and-int/lit8 v2, p1, -0x80
 
-    if-nez v0, :cond_2
+    if-nez v2, :cond_2
 
-    goto :goto_1
+    add-long/2addr v4, v0
+
+    iput-wide v4, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
+
+    int-to-byte p1, p1
+
+    invoke-static {v0, v1, p1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(JB)V
+
+    return-void
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
-
     add-long v2, v0, v4
 
     iput-wide v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
@@ -847,52 +857,52 @@
 
     ushr-int/lit8 p1, p1, 0x7
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance p1, Lcom/google/android/gms/internal/firebase-perf/cw$c;
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v2
+    aput-object v0, v2, v3
 
-    aput-object v2, v0, v1
+    iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    aput-object v0, v2, v1
+
+    const/4 v0, 0x2
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    aput-object v1, v2, v0
 
-    aput-object v1, v0, v2
+    const-string v0, "Pos: %d, limit: %d, len: %d"
 
-    const/4 v1, 0x2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    aput-object v2, v0, v1
-
-    const-string v1, "Pos: %d, limit: %d, len: %d"
-
-    invoke-static {v1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/internal/firebase-perf/cw$c;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final d(B)V
@@ -911,8 +921,6 @@
 
     if-gez v4, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
-
     const-wide/16 v2, 0x1
 
     add-long/2addr v2, v0
@@ -926,41 +934,39 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/internal/firebase-perf/cw$c;
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v2
+    aput-object v0, v2, v3
 
-    aput-object v2, v0, v1
+    iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    aput-object v0, v2, v1
+
+    const/4 v0, 0x2
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    aput-object v1, v2, v0
 
-    aput-object v1, v0, v2
+    const-string v0, "Pos: %d, limit: %d, len: %d"
 
-    const/4 v1, 0x2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    aput-object v2, v0, v1
-
-    const-string v1, "Pos: %d, limit: %d, len: %d"
-
-    invoke-static {v1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -1057,7 +1063,7 @@
     return-void
 .end method
 
-.method public final rw()I
+.method public final rv()I
     .locals 4
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNc:J
@@ -1097,19 +1103,17 @@
 
     sub-long/2addr v0, v9
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
+    iget-wide v5, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
 
-    cmp-long v4, v0, v2
+    cmp-long v2, v0, v5
 
-    if-gez v4, :cond_0
+    if-gez v2, :cond_0
 
     goto :goto_0
 
     :cond_0
     int-to-long v3, p2
 
-    iget-wide v5, p0, Lcom/google/android/gms/internal/firebase-perf/cw$e;->aNe:J
-
     move-object v2, p1
 
     move-wide v7, v9
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw.smali
index 8ff80b1c4b..5d5efe540d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cw.smali
@@ -40,7 +40,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/firebase-perf/cw;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->sZ()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->sY()Z
 
     move-result v0
 
@@ -160,7 +160,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/ef;->rU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/ef;->rT()I
 
     move-result p1
 
@@ -178,7 +178,7 @@
 .method public static a(Lcom/google/android/gms/internal/firebase-perf/ef;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/ef;->rU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/ef;->rT()I
 
     move-result p0
 
@@ -366,7 +366,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/by;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/by;->qG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/by;->qF()I
 
     move-result v0
 
@@ -396,7 +396,7 @@
     :try_start_0
     invoke-static {p0}, Lcom/google/android/gms/internal/firebase-perf/gn;->b(Ljava/lang/CharSequence;)I
 
-    move-result v0
+    move-result p0
     :try_end_0
     .catch Lcom/google/android/gms/internal/firebase-perf/gr; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -409,16 +409,16 @@
 
     move-result-object p0
 
-    array-length v0, p0
+    array-length p0, p0
 
     :goto_0
-    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+    invoke-static {p0}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
 
-    move-result p0
+    move-result v0
 
-    add-int/2addr p0, v0
+    add-int/2addr v0, p0
 
-    return p0
+    return v0
 .end method
 
 .method public static br(I)I
@@ -548,7 +548,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/firebase-perf/by;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/by;->qG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/by;->qF()I
 
     move-result v0
 
@@ -571,7 +571,7 @@
 .method public static c(Lcom/google/android/gms/internal/firebase-perf/ex;)I
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rT()I
 
     move-result p0
 
@@ -689,7 +689,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rT()I
 
     move-result p0
 
@@ -724,7 +724,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->ta()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->sZ()Z
 
     move-result v0
 
@@ -968,7 +968,7 @@
     return v0
 .end method
 
-.method public static mT()I
+.method public static mS()I
     .locals 1
 
     const/4 v0, 0x4
@@ -976,7 +976,7 @@
     return v0
 .end method
 
-.method public static mU()I
+.method public static mT()I
     .locals 1
 
     const/16 v0, 0x8
@@ -984,6 +984,14 @@
     return v0
 .end method
 
+.method public static rq()I
+    .locals 1
+
+    const/4 v0, 0x4
+
+    return v0
+.end method
+
 .method public static rr()I
     .locals 1
 
@@ -995,7 +1003,7 @@
 .method public static rs()I
     .locals 1
 
-    const/4 v0, 0x4
+    const/16 v0, 0x8
 
     return v0
 .end method
@@ -1011,14 +1019,6 @@
 .method public static ru()I
     .locals 1
 
-    const/16 v0, 0x8
-
-    return v0
-.end method
-
-.method public static rv()I
-    .locals 1
-
     const/4 v0, 0x1
 
     return v0
@@ -1048,7 +1048,7 @@
     .end annotation
 .end method
 
-.method public final M(Z)V
+.method public final L(Z)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1450,7 +1450,7 @@
     return-void
 .end method
 
-.method public abstract rw()I
+.method public abstract rv()I
 .end method
 
 .method public abstract write([BII)V
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cx.smali
index 40f9b48a1f..046691931d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cx.smali
@@ -680,7 +680,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rr()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rq()I
 
     move-result v1
 
@@ -1180,7 +1180,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rt()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rs()I
 
     move-result v1
 
@@ -1299,7 +1299,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mT()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mS()I
 
     move-result v1
 
@@ -1418,7 +1418,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mU()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mT()I
 
     move-result v1
 
@@ -1673,7 +1673,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rv()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->ru()I
 
     move-result v1
 
@@ -1707,7 +1707,7 @@
 
     move-result p3
 
-    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/firebase-perf/cw;->M(Z)V
+    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/firebase-perf/cw;->L(Z)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -1928,7 +1928,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rs()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rr()I
 
     move-result v1
 
@@ -2047,7 +2047,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->ru()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rt()I
 
     move-result v1
 
@@ -2362,7 +2362,7 @@
     return-void
 .end method
 
-.method public final rx()I
+.method public final rw()I
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOR:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cy.smali
index 99db7e3776..545b9c4b07 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/cy.smali
@@ -78,7 +78,7 @@
 .method private final b(ID)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [D
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/firebase-perf/dr;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([DI)[D
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([DI)[D
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
+    iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
+    iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
 
     iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->modCount:I
 
@@ -498,9 +480,9 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 6
+    .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/cy;->cG(I)V
 
@@ -508,23 +490,17 @@
 
     aget-wide v1, v0, p1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v4, v3, -0x1
 
-    if-ge p1, v0, :cond_0
+    if-ge p1, v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
+    add-int/lit8 v4, p1, 0x1
 
-    add-int/lit8 v3, p1, 0x1
+    sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
-
-    iget v5, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
-
-    sub-int/2addr v5, p1
-
-    invoke-static {v0, v3, v4, p1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
@@ -549,7 +525,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     const/4 v0, 0x0
 
@@ -578,13 +554,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->size:I
 
@@ -614,7 +588,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -661,7 +635,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/cy;->cG(I)V
 
@@ -669,8 +643,6 @@
 
     aget-wide v2, p2, p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/firebase-perf/cy;->aNg:[D
-
     aput-wide v0, p2, p1
 
     invoke-static {v2, v3}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/da.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/da.smali
index 3028ff2867..e68b7f4267 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/da.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/da.smali
@@ -17,7 +17,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->ry()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->rx()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -57,47 +57,7 @@
     return-object p0
 .end method
 
-.method static rA()Lcom/google/android/gms/internal/firebase-perf/dc;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/firebase-perf/da;->aNh:Ljava/lang/Class;
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    const-string v0, "loadGeneratedRegistry"
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/da;->bC(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/dc;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-nez v0, :cond_1
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rA()Lcom/google/android/gms/internal/firebase-perf/dc;
-
-    move-result-object v0
-
-    :cond_1
-    if-nez v0, :cond_2
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->rz()Lcom/google/android/gms/internal/firebase-perf/dc;
-
-    move-result-object v0
-
-    :cond_2
-    return-object v0
-.end method
-
-.method private static ry()Ljava/lang/Class;
+.method private static rx()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -124,7 +84,7 @@
     return-object v0
 .end method
 
-.method public static rz()Lcom/google/android/gms/internal/firebase-perf/dc;
+.method public static ry()Lcom/google/android/gms/internal/firebase-perf/dc;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/da;->aNh:Ljava/lang/Class;
@@ -148,3 +108,43 @@
 
     return-object v0
 .end method
+
+.method static rz()Lcom/google/android/gms/internal/firebase-perf/dc;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/firebase-perf/da;->aNh:Ljava/lang/Class;
+
+    if-eqz v0, :cond_0
+
+    :try_start_0
+    const-string v0, "loadGeneratedRegistry"
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/da;->bC(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/dc;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-nez v0, :cond_1
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rz()Lcom/google/android/gms/internal/firebase-perf/dc;
+
+    move-result-object v0
+
+    :cond_1
+    if-nez v0, :cond_2
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->ry()Lcom/google/android/gms/internal/firebase-perf/dc;
+
+    move-result-object v0
+
+    :cond_2
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dc.smali
index b29de0bea8..f77e0737ad 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dc.smali
@@ -44,7 +44,7 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rB()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rA()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -89,19 +89,7 @@
     return-void
 .end method
 
-.method static rA()Lcom/google/android/gms/internal/firebase-perf/dc;
-    .locals 1
-
-    const-class v0, Lcom/google/android/gms/internal/firebase-perf/dc;
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/dn;->x(Ljava/lang/Class;)Lcom/google/android/gms/internal/firebase-perf/dc;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method private static rB()Ljava/lang/Class;
+.method private static rA()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -128,17 +116,17 @@
     return-object v0
 .end method
 
-.method public static rC()Lcom/google/android/gms/internal/firebase-perf/dc;
+.method public static rB()Lcom/google/android/gms/internal/firebase-perf/dc;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->rz()Lcom/google/android/gms/internal/firebase-perf/dc;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->ry()Lcom/google/android/gms/internal/firebase-perf/dc;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static rD()Lcom/google/android/gms/internal/firebase-perf/dc;
+.method public static rC()Lcom/google/android/gms/internal/firebase-perf/dc;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/dc;->aNk:Lcom/google/android/gms/internal/firebase-perf/dc;
@@ -154,7 +142,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->rA()Lcom/google/android/gms/internal/firebase-perf/dc;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/da;->rz()Lcom/google/android/gms/internal/firebase-perf/dc;
 
     move-result-object v0
 
@@ -178,3 +166,15 @@
     :goto_0
     return-object v0
 .end method
+
+.method static rz()Lcom/google/android/gms/internal/firebase-perf/dc;
+    .locals 1
+
+    const-class v0, Lcom/google/android/gms/internal/firebase-perf/dc;
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/dn;->x(Ljava/lang/Class;)Lcom/google/android/gms/internal/firebase-perf/dc;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dd.smali
index 7bd7a56d6c..4864a0378f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dd.smali
@@ -94,7 +94,7 @@
 .method abstract e(Lcom/google/android/gms/internal/firebase-perf/ex;)Z
 .end method
 
-.method abstract rE()Ljava/lang/Object;
+.method abstract rD()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<UT:",
@@ -112,6 +112,20 @@
     .end annotation
 .end method
 
+.method abstract rE()V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method abstract rF()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -125,17 +139,3 @@
         }
     .end annotation
 .end method
-
-.method abstract rG()V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/de.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/de.smali
index 2b968f4fcd..ba09369103 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/de.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/de.smali
@@ -139,7 +139,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/dg;->qJ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/dg;->qI()V
 
     return-void
 .end method
@@ -177,7 +177,7 @@
     return p1
 .end method
 
-.method final rE()Ljava/lang/Object;
+.method final rD()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -202,6 +202,27 @@
     throw v0
 .end method
 
+.method final rE()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/NoSuchMethodError;
+
+    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
+
+    throw v0
+.end method
+
 .method final rF()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -222,24 +243,3 @@
 
     throw v0
 .end method
-
-.method final rG()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/NoSuchMethodError;
-
-    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/df.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/df.smali
index b4a200f870..b78b2a2acd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/df.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/df.smali
@@ -32,7 +32,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/firebase-perf/df;->aNm:Lcom/google/android/gms/internal/firebase-perf/dd;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rH()Lcom/google/android/gms/internal/firebase-perf/dd;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rG()Lcom/google/android/gms/internal/firebase-perf/dd;
 
     move-result-object v0
 
@@ -41,7 +41,7 @@
     return-void
 .end method
 
-.method private static rH()Lcom/google/android/gms/internal/firebase-perf/dd;
+.method private static rG()Lcom/google/android/gms/internal/firebase-perf/dd;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -84,7 +84,7 @@
     return-object v0
 .end method
 
-.method static rI()Lcom/google/android/gms/internal/firebase-perf/dd;
+.method static rH()Lcom/google/android/gms/internal/firebase-perf/dd;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -99,7 +99,7 @@
     return-object v0
 .end method
 
-.method static rJ()Lcom/google/android/gms/internal/firebase-perf/dd;
+.method static rI()Lcom/google/android/gms/internal/firebase-perf/dd;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -113,8 +113,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/firebase-perf/df;->aNn:Lcom/google/android/gms/internal/firebase-perf/dd;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dg.smali
index 27e2fd46b2..73d07cd808 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dg.smali
@@ -84,7 +84,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dg;->qJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dg;->qI()V
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 
     if-ne p0, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dr;->se()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dr;->sd()Z
 
     shl-int/lit8 p1, p1, 0x1
 
@@ -133,10 +133,12 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eb;->sn()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eb;->sm()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object p1
 
+    return-object p1
+
     :cond_0
     return-object p1
 .end method
@@ -153,7 +155,7 @@
 
     if-ne p1, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dr;->se()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dr;->sd()Z
 
     check-cast p3, Lcom/google/android/gms/internal/firebase-perf/ex;
 
@@ -193,7 +195,7 @@
 
     check-cast p3, Lcom/google/android/gms/internal/firebase-perf/ds;
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/firebase-perf/ds;->qi()I
+    invoke-interface {p3}, Lcom/google/android/gms/internal/firebase-perf/ds;->qh()I
 
     move-result p1
 
@@ -326,7 +328,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/cw;->M(Z)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/cw;->L(Z)V
 
     return-void
 
@@ -405,10 +407,10 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/firebase-perf/cw;->b(D)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -443,7 +445,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v0
 
@@ -480,7 +482,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/di;->rL()Lcom/google/android/gms/internal/firebase-perf/gt;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/di;->rK()Lcom/google/android/gms/internal/firebase-perf/gt;
 
     move-result-object v4
 
@@ -503,7 +505,7 @@
     throw p1
 
     :cond_2
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/di;->rL()Lcom/google/android/gms/internal/firebase-perf/gt;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/di;->rK()Lcom/google/android/gms/internal/firebase-perf/gt;
 
     move-result-object v0
 
@@ -547,7 +549,7 @@
 
     packed-switch p0, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_0
     instance-of p0, p1, Lcom/google/android/gms/internal/firebase-perf/ex;
@@ -556,74 +558,88 @@
 
     instance-of p0, p1, Lcom/google/android/gms/internal/firebase-perf/eb;
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_3
+
+    :cond_0
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :pswitch_1
     instance-of p0, p1, Ljava/lang/Integer;
 
-    if-nez p0, :cond_0
+    if-nez p0, :cond_1
 
     instance-of p0, p1, Lcom/google/android/gms/internal/firebase-perf/ds;
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_3
 
-    :cond_0
-    :goto_0
+    :cond_1
     const/4 v1, 0x1
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_2
     instance-of p0, p1, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    if-nez p0, :cond_0
+    if-nez p0, :cond_2
 
     instance-of p0, p1, [B
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_3
+
+    :cond_2
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :pswitch_3
     instance-of v0, p1, Ljava/lang/String;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_4
     instance-of v0, p1, Ljava/lang/Boolean;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_5
     instance-of v0, p1, Ljava/lang/Double;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_6
     instance-of v0, p1, Ljava/lang/Float;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_7
     instance-of v0, p1, Ljava/lang/Long;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_8
     instance-of v0, p1, Ljava/lang/Integer;
 
-    :goto_1
     move v1, v0
 
-    :cond_1
-    :goto_2
-    if-eqz v1, :cond_2
+    :cond_3
+    :goto_0
+    if-eqz v1, :cond_4
 
     return-void
 
-    :cond_2
+    :cond_4
     new-instance p0, Ljava/lang/IllegalArgumentException;
 
     const-string p1, "Wrong object type used with protocol message reflection."
@@ -632,6 +648,8 @@
 
     throw p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_8
@@ -655,7 +673,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/fe;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/fe;->sD()Lcom/google/android/gms/internal/firebase-perf/fe;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/fe;->sC()Lcom/google/android/gms/internal/firebase-perf/fe;
 
     move-result-object p0
 
@@ -696,21 +714,21 @@
         }
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->rL()Lcom/google/android/gms/internal/firebase-perf/gt;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->rK()Lcom/google/android/gms/internal/firebase-perf/gt;
 
     move-result-object v0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->qi()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->qh()I
 
     move-result v1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v2
 
     if-eqz v2, :cond_3
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->rO()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
 
     move-result p0
 
@@ -823,7 +841,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/firebase-perf/ds;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ds;->qi()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ds;->qh()I
 
     move-result p0
 
@@ -877,7 +895,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->ru()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rt()I
 
     move-result p0
 
@@ -888,7 +906,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rs()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rr()I
 
     move-result p0
 
@@ -987,7 +1005,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rv()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->ru()I
 
     move-result p0
 
@@ -998,7 +1016,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rr()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rq()I
 
     move-result p0
 
@@ -1009,7 +1027,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rt()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->rs()I
 
     move-result p0
 
@@ -1059,7 +1077,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mT()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mS()I
 
     move-result p0
 
@@ -1070,7 +1088,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mU()I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cw;->mT()I
 
     move-result p0
 
@@ -1117,7 +1135,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/di;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Lcom/google/android/gms/internal/firebase-perf/gy;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rL()Lcom/google/android/gms/internal/firebase-perf/gy;
 
     move-result-object v1
 
@@ -1127,7 +1145,7 @@
 
     if-ne v1, v2, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v0
 
@@ -1227,7 +1245,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Lcom/google/android/gms/internal/firebase-perf/gy;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rL()Lcom/google/android/gms/internal/firebase-perf/gy;
 
     move-result-object v2
 
@@ -1235,13 +1253,13 @@
 
     if-ne v2, v3, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
 
     move-result v2
 
@@ -1257,7 +1275,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/di;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->qi()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->qh()I
 
     move-result p0
 
@@ -1276,7 +1294,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/di;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->qi()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/di;->qh()I
 
     move-result p0
 
@@ -1296,7 +1314,7 @@
     return p0
 .end method
 
-.method public static rK()Lcom/google/android/gms/internal/firebase-perf/dg;
+.method public static rJ()Lcom/google/android/gms/internal/firebase-perf/dg;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1341,12 +1359,12 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eb;->sn()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eb;->sm()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object p1
 
     :cond_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v1
 
@@ -1400,7 +1418,7 @@
     return-void
 
     :cond_3
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Lcom/google/android/gms/internal/firebase-perf/gy;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rL()Lcom/google/android/gms/internal/firebase-perf/gy;
 
     move-result-object v1
 
@@ -1429,7 +1447,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rQ()Lcom/google/android/gms/internal/firebase-perf/fe;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rP()Lcom/google/android/gms/internal/firebase-perf/fe;
 
     move-result-object p1
 
@@ -1438,13 +1456,13 @@
     :cond_5
     check-cast v1, Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rV()Lcom/google/android/gms/internal/firebase-perf/ey;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()Lcom/google/android/gms/internal/firebase-perf/ey;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rP()Lcom/google/android/gms/internal/firebase-perf/ey;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/di;->rO()Lcom/google/android/gms/internal/firebase-perf/ey;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ey;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/ey;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object p1
 
@@ -1484,7 +1502,7 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v2
 
@@ -1515,7 +1533,7 @@
     :cond_0
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1612,7 +1630,7 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v2
 
@@ -1640,7 +1658,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1722,7 +1740,7 @@
     return-object v0
 .end method
 
-.method public final qJ()V
+.method public final qI()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNp:Z
@@ -1734,7 +1752,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->qJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->qI()V
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/di.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/di.smali
index 09751b2d62..f177a267f3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/di.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/di.smali
@@ -19,23 +19,23 @@
 
 
 # virtual methods
-.method public abstract qi()I
+.method public abstract qh()I
 .end method
 
-.method public abstract rL()Lcom/google/android/gms/internal/firebase-perf/gt;
+.method public abstract rK()Lcom/google/android/gms/internal/firebase-perf/gt;
 .end method
 
-.method public abstract rM()Lcom/google/android/gms/internal/firebase-perf/gy;
+.method public abstract rL()Lcom/google/android/gms/internal/firebase-perf/gy;
+.end method
+
+.method public abstract rM()Z
 .end method
 
 .method public abstract rN()Z
 .end method
 
-.method public abstract rO()Z
+.method public abstract rO()Lcom/google/android/gms/internal/firebase-perf/ey;
 .end method
 
-.method public abstract rP()Lcom/google/android/gms/internal/firebase-perf/ey;
-.end method
-
-.method public abstract rQ()Lcom/google/android/gms/internal/firebase-perf/fe;
+.method public abstract rP()Lcom/google/android/gms/internal/firebase-perf/fe;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dj.smali
index 20974054df..ce09e2dd4b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dj.smali
@@ -1441,17 +1441,23 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/dj;->zzqw:Ljava/lang/Class;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     iget-object p1, p5, Lcom/google/android/gms/internal/firebase-perf/ea;->zzsy:Ljava/lang/Class;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/dj;->zzqw:Ljava/lang/Class;
+
     goto :goto_0
 
-    :goto_1
+    :pswitch_1
+    iget-object p1, p5, Lcom/google/android/gms/internal/firebase-perf/ea;->zzsy:Ljava/lang/Class;
+
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/dj;->zzqw:Ljava/lang/Class;
+
+    :goto_0
     const/4 p1, 0x0
 
     sget-object p2, Lcom/google/android/gms/internal/firebase-perf/dl;->aOx:Lcom/google/android/gms/internal/firebase-perf/dl;
@@ -1471,7 +1477,7 @@
     const/4 p1, 0x1
 
     :cond_0
-    :pswitch_1
+    :pswitch_2
     iput-boolean p1, p0, Lcom/google/android/gms/internal/firebase-perf/dj;->zzqx:Z
 
     return-void
@@ -1480,15 +1486,15 @@
 
     :pswitch_data_0
     .packed-switch 0x1
-        :pswitch_0
+        :pswitch_1
         :pswitch_0
     .end packed-switch
 
     :pswitch_data_1
     .packed-switch 0x1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
     .end packed-switch
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dm.smali
index 46001a4798..7bb6e6ae55 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dm.smali
@@ -78,7 +78,7 @@
 .method private final c(IF)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [F
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/firebase-perf/dr;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([FI)[F
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([FI)[F
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
 
     iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->modCount:I
 
@@ -492,33 +474,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/dm;->cG(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
-
-    iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
@@ -533,7 +509,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
@@ -541,9 +517,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     const/4 v0, 0x0
 
@@ -572,13 +548,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->size:I
 
@@ -608,7 +582,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -655,19 +629,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/dm;->cG(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dm;->aOD:[F
+    aput p2, v0, p1
 
-    aput p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dn.smali
index e6a9102e77..ac2935d633 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dn.smali
@@ -157,7 +157,7 @@
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_4
 
     :try_start_2
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dn;->rR()Lcom/google/android/gms/internal/firebase-perf/dc;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dn;->rQ()Lcom/google/android/gms/internal/firebase-perf/dc;
 
     move-result-object v1
 
@@ -236,7 +236,7 @@
 
     check-cast v4, Lcom/google/android/gms/internal/firebase-perf/dn;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/firebase-perf/dn;->rR()Lcom/google/android/gms/internal/firebase-perf/dc;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/firebase-perf/dn;->rQ()Lcom/google/android/gms/internal/firebase-perf/dc;
 
     move-result-object v4
 
@@ -392,11 +392,13 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 
 # virtual methods
-.method protected abstract rR()Lcom/google/android/gms/internal/firebase-perf/dc;
+.method protected abstract rQ()Lcom/google/android/gms/internal/firebase-perf/dc;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/do.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/do.smali
index 881a2798f8..22e4af87fc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/do.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/do.smali
@@ -30,7 +30,7 @@
     return-void
 .end method
 
-.method public static rS()Lcom/google/android/gms/internal/firebase-perf/do;
+.method public static rR()Lcom/google/android/gms/internal/firebase-perf/do;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/do;->aOF:Lcom/google/android/gms/internal/firebase-perf/do;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$a.smali
index 65816ce325..5f79b47c95 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$a.smali
@@ -83,7 +83,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
     return-void
 .end method
 
-.method private rZ()Lcom/google/android/gms/internal/firebase-perf/dp;
+.method private rY()Lcom/google/android/gms/internal/firebase-perf/dp;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -115,7 +115,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v1
 
@@ -134,7 +134,7 @@
     return-object v0
 .end method
 
-.method private sa()Lcom/google/android/gms/internal/firebase-perf/dp;
+.method private rZ()Lcom/google/android/gms/internal/firebase-perf/dp;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -142,7 +142,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rZ()Lcom/google/android/gms/internal/firebase-perf/dp;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()Lcom/google/android/gms/internal/firebase-perf/dp;
 
     move-result-object v0
 
@@ -174,7 +174,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v1
 
@@ -225,7 +225,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rX()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp$a;->aOH:Lcom/google/android/gms/internal/firebase-perf/dp;
 
@@ -254,7 +254,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/dp$a;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rZ()Lcom/google/android/gms/internal/firebase-perf/dp;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()Lcom/google/android/gms/internal/firebase-perf/dp;
 
     move-result-object v1
 
@@ -277,7 +277,7 @@
     return v0
 .end method
 
-.method public final synthetic qH()Lcom/google/android/gms/internal/firebase-perf/bz;
+.method public final synthetic qG()Lcom/google/android/gms/internal/firebase-perf/bz;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/bz;->clone()Ljava/lang/Object;
@@ -289,7 +289,7 @@
     return-object v0
 .end method
 
-.method public final synthetic rX()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public final synthetic rW()Lcom/google/android/gms/internal/firebase-perf/ex;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp$a;->aOG:Lcom/google/android/gms/internal/firebase-perf/dp;
@@ -297,7 +297,7 @@
     return-object v0
 .end method
 
-.method protected final rY()V
+.method protected final rX()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp$a;->aOI:Z
@@ -328,6 +328,16 @@
     return-void
 .end method
 
+.method public final synthetic sa()Lcom/google/android/gms/internal/firebase-perf/ex;
+    .locals 1
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->rY()Lcom/google/android/gms/internal/firebase-perf/dp;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final synthetic sb()Lcom/google/android/gms/internal/firebase-perf/ex;
     .locals 1
 
@@ -337,13 +347,3 @@
 
     return-object v0
 .end method
-
-.method public final synthetic sc()Lcom/google/android/gms/internal/firebase-perf/ex;
-    .locals 1
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sa()Lcom/google/android/gms/internal/firebase-perf/dp;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$c.smali
index 97b3091b29..24bec25bd5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$c.smali
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/dp;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dg;->rK()Lcom/google/android/gms/internal/firebase-perf/dg;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dg;->rJ()Lcom/google/android/gms/internal/firebase-perf/dg;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$e.smali
index 2715c806c5..f63031db8a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp$e.smali
@@ -136,7 +136,7 @@
     return-void
 .end method
 
-.method public static ns()[I
+.method public static nr()[I
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aON:[I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp.smali
index 219886ccb5..2c75feba83 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dp.smali
@@ -63,7 +63,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/by;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sX()Lcom/google/android/gms/internal/firebase-perf/gg;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sW()Lcom/google/android/gms/internal/firebase-perf/gg;
 
     move-result-object v0
 
@@ -200,7 +200,7 @@
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/dp;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -226,7 +226,7 @@
     :goto_0
     invoke-interface {v0, p0, p1, p2}, Lcom/google/android/gms/internal/firebase-perf/fo;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fn;Lcom/google/android/gms/internal/firebase-perf/dc;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object p1
 
@@ -419,7 +419,7 @@
     return p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -444,7 +444,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -521,7 +521,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -550,7 +550,7 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -598,7 +598,7 @@
     return v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -617,7 +617,7 @@
     return v0
 .end method
 
-.method final qG()I
+.method final qF()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp;->zzro:I
@@ -625,7 +625,7 @@
     return v0
 .end method
 
-.method public final rT()Lcom/google/android/gms/internal/firebase-perf/dp$a;
+.method public final rS()Lcom/google/android/gms/internal/firebase-perf/dp$a;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -646,7 +646,7 @@
     return-object v0
 .end method
 
-.method public final rU()I
+.method public final rT()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp;->zzro:I
@@ -655,7 +655,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -675,7 +675,7 @@
     return v0
 .end method
 
-.method public final synthetic rV()Lcom/google/android/gms/internal/firebase-perf/ey;
+.method public final synthetic rU()Lcom/google/android/gms/internal/firebase-perf/ey;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOK:I
@@ -691,7 +691,7 @@
     return-object v0
 .end method
 
-.method public final synthetic rW()Lcom/google/android/gms/internal/firebase-perf/ey;
+.method public final synthetic rV()Lcom/google/android/gms/internal/firebase-perf/ey;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOK:I
@@ -705,7 +705,7 @@
     return-object v0
 .end method
 
-.method public final synthetic rX()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public final synthetic rW()Lcom/google/android/gms/internal/firebase-perf/ex;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOL:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dq.smali
index 596be21a37..5c7f70af0b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dq.smali
@@ -78,7 +78,7 @@
 .method private final X(II)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -219,7 +209,7 @@
     return-object p1
 .end method
 
-.method public static sd()Lcom/google/android/gms/internal/firebase-perf/dq;
+.method public static sc()Lcom/google/android/gms/internal/firebase-perf/dq;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOU:Lcom/google/android/gms/internal/firebase-perf/dq;
@@ -255,7 +245,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/firebase-perf/dr;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -281,48 +271,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([II)[I
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([II)[I
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
 
     iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->modCount:I
 
@@ -498,33 +480,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/dq;->cG(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
@@ -539,7 +515,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
@@ -547,9 +523,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     const/4 v0, 0x0
 
@@ -578,13 +554,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->size:I
 
@@ -614,7 +588,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -661,19 +635,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/dq;->cG(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/dq;->aOV:[I
+    aput p2, v0, p1
 
-    aput p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dr.smali
index 88333063cc..464ec010d0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dr.smali
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method public static N(Z)I
+.method public static M(Z)I
     .locals 0
 
     if-eqz p0, :cond_0
@@ -175,6 +175,8 @@
 
     const/4 p0, 0x1
 
+    return p0
+
     :cond_0
     return p0
 .end method
@@ -184,7 +186,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rV()Lcom/google/android/gms/internal/firebase-perf/ey;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()Lcom/google/android/gms/internal/firebase-perf/ey;
 
     move-result-object p0
 
@@ -194,7 +196,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ey;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ey;->sa()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object p0
 
@@ -223,7 +225,7 @@
     return-object v0
 .end method
 
-.method static se()Z
+.method static sd()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ds.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ds.smali
index e0939578ef..4b94dbda51 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ds.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ds.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract qi()I
+.method public abstract qh()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dx.smali
index 5051a2baed..a566e38587 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dx.smali
@@ -31,8 +31,8 @@
     .end annotation
 .end method
 
-.method public abstract qI()Z
+.method public abstract qH()Z
 .end method
 
-.method public abstract qJ()V
+.method public abstract qI()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dy.smali
index 64de56f7ca..e620cf142c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/dy.smali
@@ -19,7 +19,7 @@
     return-void
 .end method
 
-.method static sf()Lcom/google/android/gms/internal/firebase-perf/dy;
+.method static se()Lcom/google/android/gms/internal/firebase-perf/dy;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dy;
@@ -31,7 +31,7 @@
     return-object v0
 .end method
 
-.method static sg()Lcom/google/android/gms/internal/firebase-perf/dy;
+.method static sf()Lcom/google/android/gms/internal/firebase-perf/dy;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dy;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method static sh()Lcom/google/android/gms/internal/firebase-perf/dy;
+.method static sg()Lcom/google/android/gms/internal/firebase-perf/dy;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dy;
@@ -55,7 +55,7 @@
     return-object v0
 .end method
 
-.method static si()Lcom/google/android/gms/internal/firebase-perf/dy;
+.method static sh()Lcom/google/android/gms/internal/firebase-perf/dy;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dy;
@@ -67,7 +67,7 @@
     return-object v0
 .end method
 
-.method static sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+.method static si()Lcom/google/android/gms/internal/firebase-perf/dz;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dz;
@@ -79,7 +79,7 @@
     return-object v0
 .end method
 
-.method static sk()Lcom/google/android/gms/internal/firebase-perf/dy;
+.method static sj()Lcom/google/android/gms/internal/firebase-perf/dy;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dy;
@@ -91,7 +91,7 @@
     return-object v0
 .end method
 
-.method static sl()Lcom/google/android/gms/internal/firebase-perf/dy;
+.method static sk()Lcom/google/android/gms/internal/firebase-perf/dy;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dy;
@@ -103,7 +103,7 @@
     return-object v0
 .end method
 
-.method static sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+.method static sl()Lcom/google/android/gms/internal/firebase-perf/dy;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/dy;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eb.smali
index c2c6e9489a..19e80604bb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eb.smali
@@ -3,7 +3,7 @@
 
 
 # direct methods
-.method public static sn()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public static sm()Lcom/google/android/gms/internal/firebase-perf/ex;
     .locals 1
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ed.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ed.smali
index 47a70cde29..b347317d5a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ed.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ed.smali
@@ -98,7 +98,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eb;->sn()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eb;->sm()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ef.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ef.smali
index 9f2d6bdfac..579a39b679 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ef.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ef.smali
@@ -18,7 +18,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rC()Lcom/google/android/gms/internal/firebase-perf/dc;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rB()Lcom/google/android/gms/internal/firebase-perf/dc;
 
     move-result-object v0
 
@@ -49,7 +49,6 @@
 
     if-eqz v0, :cond_0
 
-    :goto_0
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -77,7 +76,10 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPo:Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    goto :goto_0
+    :goto_0
+    monitor-exit p0
+
+    goto :goto_1
 
     :catchall_0
     move-exception p1
@@ -126,11 +128,11 @@
 
     if-nez v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/ef;->qF()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/ef;->qE()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/ef;->qF()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/ef;->qE()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object p1
 
@@ -154,7 +156,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rX()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rW()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v1
 
@@ -169,7 +171,7 @@
     return p1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rX()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ex;->rW()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object p1
 
@@ -192,7 +194,7 @@
     return v0
 .end method
 
-.method public final qF()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public final qE()Lcom/google/android/gms/internal/firebase-perf/cg;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPo:Lcom/google/android/gms/internal/firebase-perf/cg;
@@ -224,21 +226,20 @@
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/cg;->aML:Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPo:Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPn:Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->qF()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->qE()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v0
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPo:Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPo:Lcom/google/android/gms/internal/firebase-perf/cg;
 
     monitor-exit p0
@@ -255,7 +256,7 @@
     throw v0
 .end method
 
-.method public final rU()I
+.method public final rT()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPo:Lcom/google/android/gms/internal/firebase-perf/cg;
@@ -277,7 +278,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ef;->aPn:Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rU()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rT()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eg.smali
index dcc2295feb..a17accdc44 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eg.smali
@@ -115,7 +115,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cg;->qN()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cg;->qM()Ljava/lang/String;
 
     move-result-object p0
 
@@ -138,7 +138,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/eg;->aPr:Ljava/util/List;
 
@@ -165,7 +165,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     instance-of v0, p2, Lcom/google/android/gms/internal/firebase-perf/eh;
 
@@ -173,7 +173,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/firebase-perf/eh;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/eh;->so()Ljava/util/List;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/eh;->sn()Ljava/util/List;
 
     move-result-object p2
 
@@ -231,7 +231,7 @@
 .method public final c(Lcom/google/android/gms/internal/firebase-perf/cg;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/eg;->aPr:Ljava/util/List;
 
@@ -280,7 +280,7 @@
 .method public final clear()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/eg;->aPr:Ljava/util/List;
 
@@ -329,11 +329,11 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cg;->qN()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cg;->qM()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cg;->qO()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cg;->qN()Z
 
     move-result v0
 
@@ -377,10 +377,10 @@
     return v0
 .end method
 
-.method public final bridge synthetic qI()Z
+.method public final bridge synthetic qH()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qI()Z
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qH()Z
 
     move-result v0
 
@@ -390,7 +390,7 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/eg;->aPr:Ljava/util/List;
 
@@ -446,7 +446,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/eg;->aPr:Ljava/util/List;
 
@@ -473,7 +473,7 @@
     return v0
 .end method
 
-.method public final so()Ljava/util/List;
+.method public final sn()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -492,10 +492,10 @@
     return-object v0
 .end method
 
-.method public final sp()Lcom/google/android/gms/internal/firebase-perf/eh;
+.method public final so()Lcom/google/android/gms/internal/firebase-perf/eh;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qI()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qH()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eh.smali
index b013153235..d85b61daf5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eh.smali
@@ -12,7 +12,7 @@
 .method public abstract c(Lcom/google/android/gms/internal/firebase-perf/cg;)V
 .end method
 
-.method public abstract so()Ljava/util/List;
+.method public abstract sn()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -22,5 +22,5 @@
     .end annotation
 .end method
 
-.method public abstract sp()Lcom/google/android/gms/internal/firebase-perf/eh;
+.method public abstract so()Lcom/google/android/gms/internal/firebase-perf/eh;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ei.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ei.smali
index 414ca08874..3655c150d5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ei.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ei.smali
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method static sq()Lcom/google/android/gms/internal/firebase-perf/ei;
+.method static sp()Lcom/google/android/gms/internal/firebase-perf/ei;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/ei;->aPs:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -53,7 +53,7 @@
     return-object v0
 .end method
 
-.method static sr()Lcom/google/android/gms/internal/firebase-perf/ei;
+.method static sq()Lcom/google/android/gms/internal/firebase-perf/ei;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/ei;->aPt:Lcom/google/android/gms/internal/firebase-perf/ei;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ej.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ej.smali
index 7094ecd916..87cc1f963b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ej.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ej.smali
@@ -115,7 +115,7 @@
     :goto_0
     invoke-static {p0, p1, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     sget-object v1, Lcom/google/android/gms/internal/firebase-perf/ej;->aPu:Ljava/lang/Class;
@@ -142,12 +142,11 @@
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    :goto_1
     invoke-static {p0, p1, p2, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     move-object v0, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     instance-of v1, v0, Lcom/google/android/gms/internal/firebase-perf/gi;
@@ -168,6 +167,10 @@
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/firebase-perf/cb;->addAll(Ljava/util/Collection;)Z
 
+    invoke-static {p0, p1, p2, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    move-object v0, v1
+
     goto :goto_1
 
     :cond_4
@@ -183,7 +186,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/firebase-perf/dx;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/dx;->qH()Z
 
     move-result v2
 
@@ -199,10 +202,10 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-static {p0, p1, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     :cond_5
-    :goto_2
+    :goto_1
     return-object v0
 .end method
 
@@ -321,7 +324,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/eh;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/eh;->sp()Lcom/google/android/gms/internal/firebase-perf/eh;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/eh;->so()Lcom/google/android/gms/internal/firebase-perf/eh;
 
     move-result-object v0
 
@@ -353,13 +356,13 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/dx;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qH()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qJ()V
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()V
 
     :cond_2
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ek.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ek.smali
index 380bac4a22..5a53d9266b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ek.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ek.smali
@@ -79,7 +79,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qH()Z
 
     move-result v3
 
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/dx;->qH()Z
 
     move-result v1
 
@@ -162,7 +162,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/dx;->qJ()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/dx;->qI()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/el.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/el.smali
index f5e6e10fd7..12fb7f7102 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/el.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/el.smali
@@ -131,7 +131,7 @@
 .method private final k(IJ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-ltz p1, :cond_1
 
@@ -139,29 +139,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -170,8 +162,6 @@
 
     new-array v0, v0, [J
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/firebase-perf/dr;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
 
-    iget v2, p1, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([JI)[J
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([JI)[J
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
+    iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
+    iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
 
     iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/el;->modCount:I
 
@@ -496,9 +478,9 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 6
+    .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/el;->cG(I)V
 
@@ -506,23 +488,17 @@
 
     aget-wide v1, v0, p1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v4, v3, -0x1
 
-    if-ge p1, v0, :cond_0
+    if-ge p1, v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
+    add-int/lit8 v4, p1, 0x1
 
-    add-int/lit8 v3, p1, 0x1
+    sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
-
-    iget v5, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
-
-    sub-int/2addr v5, p1
-
-    invoke-static {v0, v3, v4, p1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
@@ -547,7 +523,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     const/4 v0, 0x0
 
@@ -576,13 +552,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/el;->size:I
 
@@ -612,7 +586,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -659,7 +633,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/el;->cG(I)V
 
@@ -667,8 +641,6 @@
 
     aget-wide v2, p2, p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/firebase-perf/el;->aPw:[J
-
     aput-wide v0, p2, p1
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/em.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/em.smali
index 1ab1fffe93..1a63f11cd3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/em.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/em.smali
@@ -35,7 +35,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/firebase-perf/ew;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/do;->rS()Lcom/google/android/gms/internal/firebase-perf/do;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/do;->rR()Lcom/google/android/gms/internal/firebase-perf/do;
 
     move-result-object v2
 
@@ -43,7 +43,7 @@
 
     aput-object v2, v1, v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/em;->ss()Lcom/google/android/gms/internal/firebase-perf/ew;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/em;->sr()Lcom/google/android/gms/internal/firebase-perf/ew;
 
     move-result-object v2
 
@@ -79,7 +79,7 @@
 .method private static a(Lcom/google/android/gms/internal/firebase-perf/ev;)Z
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ev;->sA()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/firebase-perf/ev;->sz()I
 
     move-result p0
 
@@ -97,7 +97,7 @@
     return p0
 .end method
 
-.method private static ss()Lcom/google/android/gms/internal/firebase-perf/ew;
+.method private static sr()Lcom/google/android/gms/internal/firebase-perf/ew;
     .locals 4
 
     :try_start_0
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ev;->sB()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ev;->sA()Z
 
     move-result v0
 
@@ -175,15 +175,15 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sL()Lcom/google/android/gms/internal/firebase-perf/gf;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sK()Lcom/google/android/gms/internal/firebase-perf/gf;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rI()Lcom/google/android/gms/internal/firebase-perf/dd;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rH()Lcom/google/android/gms/internal/firebase-perf/dd;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ev;->sC()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ev;->sB()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v1
 
@@ -194,15 +194,15 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sJ()Lcom/google/android/gms/internal/firebase-perf/gf;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sI()Lcom/google/android/gms/internal/firebase-perf/gf;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rJ()Lcom/google/android/gms/internal/firebase-perf/dd;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rI()Lcom/google/android/gms/internal/firebase-perf/dd;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ev;->sC()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/firebase-perf/ev;->sB()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v1
 
@@ -227,64 +227,6 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sF()Lcom/google/android/gms/internal/firebase-perf/ff;
-
-    move-result-object v2
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ei;->sr()Lcom/google/android/gms/internal/firebase-perf/ei;
-
-    move-result-object v3
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sL()Lcom/google/android/gms/internal/firebase-perf/gf;
-
-    move-result-object v4
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rI()Lcom/google/android/gms/internal/firebase-perf/dd;
-
-    move-result-object v5
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eu;->sy()Lcom/google/android/gms/internal/firebase-perf/es;
-
-    move-result-object v6
-
-    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/ev;Lcom/google/android/gms/internal/firebase-perf/ff;Lcom/google/android/gms/internal/firebase-perf/ei;Lcom/google/android/gms/internal/firebase-perf/gf;Lcom/google/android/gms/internal/firebase-perf/dd;Lcom/google/android/gms/internal/firebase-perf/es;)Lcom/google/android/gms/internal/firebase-perf/fc;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sF()Lcom/google/android/gms/internal/firebase-perf/ff;
-
-    move-result-object v2
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ei;->sr()Lcom/google/android/gms/internal/firebase-perf/ei;
-
-    move-result-object v3
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sL()Lcom/google/android/gms/internal/firebase-perf/gf;
-
-    move-result-object v4
-
-    const/4 v5, 0x0
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eu;->sy()Lcom/google/android/gms/internal/firebase-perf/es;
-
-    move-result-object v6
-
-    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/ev;Lcom/google/android/gms/internal/firebase-perf/ff;Lcom/google/android/gms/internal/firebase-perf/ei;Lcom/google/android/gms/internal/firebase-perf/gf;Lcom/google/android/gms/internal/firebase-perf/dd;Lcom/google/android/gms/internal/firebase-perf/es;)Lcom/google/android/gms/internal/firebase-perf/fc;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    invoke-static {v1}, Lcom/google/android/gms/internal/firebase-perf/em;->a(Lcom/google/android/gms/internal/firebase-perf/ev;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
     invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sE()Lcom/google/android/gms/internal/firebase-perf/ff;
 
     move-result-object v2
@@ -293,11 +235,11 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sJ()Lcom/google/android/gms/internal/firebase-perf/gf;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sK()Lcom/google/android/gms/internal/firebase-perf/gf;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rJ()Lcom/google/android/gms/internal/firebase-perf/dd;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rH()Lcom/google/android/gms/internal/firebase-perf/dd;
 
     move-result-object v5
 
@@ -311,7 +253,7 @@
 
     return-object p1
 
-    :cond_4
+    :cond_2
     invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sE()Lcom/google/android/gms/internal/firebase-perf/ff;
 
     move-result-object v2
@@ -335,4 +277,62 @@
     move-result-object p1
 
     return-object p1
+
+    :cond_3
+    invoke-static {v1}, Lcom/google/android/gms/internal/firebase-perf/em;->a(Lcom/google/android/gms/internal/firebase-perf/ev;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sD()Lcom/google/android/gms/internal/firebase-perf/ff;
+
+    move-result-object v2
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ei;->sp()Lcom/google/android/gms/internal/firebase-perf/ei;
+
+    move-result-object v3
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sI()Lcom/google/android/gms/internal/firebase-perf/gf;
+
+    move-result-object v4
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/df;->rI()Lcom/google/android/gms/internal/firebase-perf/dd;
+
+    move-result-object v5
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eu;->sw()Lcom/google/android/gms/internal/firebase-perf/es;
+
+    move-result-object v6
+
+    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/ev;Lcom/google/android/gms/internal/firebase-perf/ff;Lcom/google/android/gms/internal/firebase-perf/ei;Lcom/google/android/gms/internal/firebase-perf/gf;Lcom/google/android/gms/internal/firebase-perf/dd;Lcom/google/android/gms/internal/firebase-perf/es;)Lcom/google/android/gms/internal/firebase-perf/fc;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_4
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sD()Lcom/google/android/gms/internal/firebase-perf/ff;
+
+    move-result-object v2
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ei;->sp()Lcom/google/android/gms/internal/firebase-perf/ei;
+
+    move-result-object v3
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sJ()Lcom/google/android/gms/internal/firebase-perf/gf;
+
+    move-result-object v4
+
+    const/4 v5, 0x0
+
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eu;->sw()Lcom/google/android/gms/internal/firebase-perf/es;
+
+    move-result-object v6
+
+    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/ev;Lcom/google/android/gms/internal/firebase-perf/ff;Lcom/google/android/gms/internal/firebase-perf/ei;Lcom/google/android/gms/internal/firebase-perf/gf;Lcom/google/android/gms/internal/firebase-perf/dd;Lcom/google/android/gms/internal/firebase-perf/es;)Lcom/google/android/gms/internal/firebase-perf/fc;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eo.smali
index db7fb94bf8..b3b89e65d1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eo.smali
@@ -137,4 +137,6 @@
     invoke-direct {v0, p1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/er.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/er.smali
index 699d6ac2e3..d2867f3c11 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/er.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/er.smali
@@ -106,7 +106,7 @@
     throw p0
 .end method
 
-.method public static st()Lcom/google/android/gms/internal/firebase-perf/er;
+.method public static ss()Lcom/google/android/gms/internal/firebase-perf/er;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -130,7 +130,7 @@
 .method public final clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->sv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->su()V
 
     invoke-super {p0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -193,10 +193,9 @@
 
     if-eq v2, v3, :cond_0
 
-    :goto_0
     const/4 p1, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     invoke-interface {p0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
@@ -230,7 +229,9 @@
 
     if-nez v4, :cond_2
 
-    goto :goto_0
+    const/4 p1, 0x0
+
+    goto :goto_1
 
     :cond_2
     invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
@@ -261,22 +262,24 @@
 
     move-result v3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-virtual {v4, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v3
 
-    :goto_1
+    :goto_0
     if-nez v3, :cond_1
 
-    goto :goto_0
+    const/4 p1, 0x0
+
+    goto :goto_1
 
     :cond_4
     const/4 p1, 0x1
 
-    :goto_2
+    :goto_1
     if-eqz p1, :cond_5
 
     return v0
@@ -345,7 +348,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->sv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->su()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/firebase-perf/dr;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -368,7 +371,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->sv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->su()V
 
     invoke-interface {p1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -415,7 +418,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->sv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/er;->su()V
 
     invoke-super {p0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -424,7 +427,7 @@
     return-object p1
 .end method
 
-.method public final su()Lcom/google/android/gms/internal/firebase-perf/er;
+.method public final st()Lcom/google/android/gms/internal/firebase-perf/er;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -454,7 +457,7 @@
     return-object v0
 .end method
 
-.method final sv()V
+.method final su()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/er;->zzmv:Z
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/es.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/es.smali
index e25cf78aa8..6f450ea751 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/es.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/es.smali
@@ -51,5 +51,5 @@
 .method public abstract m(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 .end method
 
-.method public abstract sw()Ljava/lang/Object;
+.method public abstract sv()Ljava/lang/Object;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/et.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/et.smali
index ad4faf34dc..303c3b8fcc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/et.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/et.smali
@@ -190,12 +190,12 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/er;->su()Lcom/google/android/gms/internal/firebase-perf/er;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/er;->st()Lcom/google/android/gms/internal/firebase-perf/er;
 
     move-result-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/er;->sv()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/er;->su()V
 
     invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/er;->isEmpty()Z
 
@@ -209,14 +209,14 @@
     return-object p1
 .end method
 
-.method public final sw()Ljava/lang/Object;
+.method public final sv()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/er;->st()Lcom/google/android/gms/internal/firebase-perf/er;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/er;->ss()Lcom/google/android/gms/internal/firebase-perf/er;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/er;->su()Lcom/google/android/gms/internal/firebase-perf/er;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/er;->st()Lcom/google/android/gms/internal/firebase-perf/er;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eu.smali
index 3950d1e175..e1b6cfa4f2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/eu.smali
@@ -12,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eu;->sz()Lcom/google/android/gms/internal/firebase-perf/es;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/eu;->sy()Lcom/google/android/gms/internal/firebase-perf/es;
 
     move-result-object v0
 
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method static sx()Lcom/google/android/gms/internal/firebase-perf/es;
+.method static sw()Lcom/google/android/gms/internal/firebase-perf/es;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/eu;->aPH:Lcom/google/android/gms/internal/firebase-perf/es;
@@ -35,7 +35,7 @@
     return-object v0
 .end method
 
-.method static sy()Lcom/google/android/gms/internal/firebase-perf/es;
+.method static sx()Lcom/google/android/gms/internal/firebase-perf/es;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/eu;->aPI:Lcom/google/android/gms/internal/firebase-perf/es;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method private static sz()Lcom/google/android/gms/internal/firebase-perf/es;
+.method private static sy()Lcom/google/android/gms/internal/firebase-perf/es;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ev.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ev.smali
index 5b1045bab9..cc633cb25c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ev.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ev.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
-.method public abstract sA()I
+.method public abstract sA()Z
 .end method
 
-.method public abstract sB()Z
+.method public abstract sB()Lcom/google/android/gms/internal/firebase-perf/ex;
 .end method
 
-.method public abstract sC()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public abstract sz()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ex.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ex.smali
index 49a1455e7a..1c72d7dc9e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ex.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ex.smali
@@ -14,14 +14,14 @@
     .end annotation
 .end method
 
-.method public abstract qF()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public abstract qE()Lcom/google/android/gms/internal/firebase-perf/cg;
 .end method
 
-.method public abstract rU()I
+.method public abstract rT()I
+.end method
+
+.method public abstract rU()Lcom/google/android/gms/internal/firebase-perf/ey;
 .end method
 
 .method public abstract rV()Lcom/google/android/gms/internal/firebase-perf/ey;
 .end method
-
-.method public abstract rW()Lcom/google/android/gms/internal/firebase-perf/ey;
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ey.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ey.smali
index 0107107c1b..0b0cb66ce4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ey.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ey.smali
@@ -10,8 +10,8 @@
 .method public abstract a(Lcom/google/android/gms/internal/firebase-perf/ex;)Lcom/google/android/gms/internal/firebase-perf/ey;
 .end method
 
-.method public abstract sb()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public abstract sa()Lcom/google/android/gms/internal/firebase-perf/ex;
 .end method
 
-.method public abstract sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public abstract sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ez.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ez.smali
index d9d5aa73a7..efe1c5ed95 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ez.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ez.smali
@@ -6,5 +6,5 @@
 .method public abstract isInitialized()Z
 .end method
 
-.method public abstract rX()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public abstract rW()Lcom/google/android/gms/internal/firebase-perf/ex;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fa.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fa.smali
index 02d5434fb8..9412a796ac 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fa.smali
@@ -91,7 +91,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_17
+    if-eqz v3, :cond_1d
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -524,7 +524,7 @@
 
     move-result-object v6
 
-    if-nez v4, :cond_16
+    if-nez v4, :cond_1c
 
     instance-of v4, v6, Ljava/lang/Boolean;
 
@@ -540,20 +540,19 @@
 
     if-nez v4, :cond_d
 
-    :goto_9
     const/4 v4, 0x1
 
-    goto/16 :goto_b
+    goto/16 :goto_9
 
     :cond_d
     const/4 v4, 0x0
 
-    goto :goto_b
+    goto/16 :goto_9
 
     :cond_e
     instance-of v4, v6, Ljava/lang/Integer;
 
-    if-eqz v4, :cond_f
+    if-eqz v4, :cond_10
 
     move-object v4, v6
 
@@ -563,14 +562,21 @@
 
     move-result v4
 
-    if-nez v4, :cond_d
+    if-nez v4, :cond_f
 
-    goto :goto_9
+    const/4 v4, 0x1
+
+    goto/16 :goto_9
 
     :cond_f
+    const/4 v4, 0x0
+
+    goto/16 :goto_9
+
+    :cond_10
     instance-of v4, v6, Ljava/lang/Float;
 
-    if-eqz v4, :cond_10
+    if-eqz v4, :cond_12
 
     move-object v4, v6
 
@@ -584,14 +590,21 @@
 
     cmpl-float v4, v4, v8
 
-    if-nez v4, :cond_d
+    if-nez v4, :cond_11
+
+    const/4 v4, 0x1
 
     goto :goto_9
 
-    :cond_10
+    :cond_11
+    const/4 v4, 0x0
+
+    goto :goto_9
+
+    :cond_12
     instance-of v4, v6, Ljava/lang/Double;
 
-    if-eqz v4, :cond_11
+    if-eqz v4, :cond_14
 
     move-object v4, v6
 
@@ -605,54 +618,71 @@
 
     cmpl-double v4, v8, v10
 
-    if-nez v4, :cond_d
+    if-nez v4, :cond_13
+
+    const/4 v4, 0x1
 
     goto :goto_9
 
-    :cond_11
+    :cond_13
+    const/4 v4, 0x0
+
+    goto :goto_9
+
+    :cond_14
     instance-of v4, v6, Ljava/lang/String;
 
-    if-eqz v4, :cond_12
+    if-eqz v4, :cond_15
 
     const-string v4, ""
 
-    :goto_a
     invoke-virtual {v6, v4}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v4
 
-    goto :goto_b
+    goto :goto_9
 
-    :cond_12
+    :cond_15
     instance-of v4, v6, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    if-eqz v4, :cond_13
+    if-eqz v4, :cond_16
 
     sget-object v4, Lcom/google/android/gms/internal/firebase-perf/cg;->aML:Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    goto :goto_a
+    invoke-virtual {v6, v4}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    :cond_13
+    move-result v4
+
+    goto :goto_9
+
+    :cond_16
     instance-of v4, v6, Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    if-eqz v4, :cond_14
+    if-eqz v4, :cond_18
 
     move-object v4, v6
 
     check-cast v4, Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    invoke-interface {v4}, Lcom/google/android/gms/internal/firebase-perf/ex;->rX()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {v4}, Lcom/google/android/gms/internal/firebase-perf/ex;->rW()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v4
 
-    if-ne v6, v4, :cond_d
+    if-ne v6, v4, :cond_17
+
+    const/4 v4, 0x1
 
     goto :goto_9
 
-    :cond_14
+    :cond_17
+    const/4 v4, 0x0
+
+    goto :goto_9
+
+    :cond_18
     instance-of v4, v6, Ljava/lang/Enum;
 
-    if-eqz v4, :cond_d
+    if-eqz v4, :cond_1a
 
     move-object v4, v6
 
@@ -662,23 +692,33 @@
 
     move-result v4
 
-    if-nez v4, :cond_d
-
-    goto :goto_9
-
-    :goto_b
-    if-nez v4, :cond_15
+    if-nez v4, :cond_19
 
     const/4 v4, 0x1
 
-    goto :goto_c
+    goto :goto_9
 
-    :cond_15
+    :cond_19
     const/4 v4, 0x0
 
-    goto :goto_c
+    goto :goto_9
 
-    :cond_16
+    :cond_1a
+    const/4 v4, 0x0
+
+    :goto_9
+    if-nez v4, :cond_1b
+
+    const/4 v4, 0x1
+
+    goto :goto_a
+
+    :cond_1b
+    const/4 v4, 0x0
+
+    goto :goto_a
+
+    :cond_1c
     new-array v7, v5, [Ljava/lang/Object;
 
     invoke-static {v4, p0, v7}, Lcom/google/android/gms/internal/firebase-perf/dp;->a(Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -691,7 +731,7 @@
 
     move-result v4
 
-    :goto_c
+    :goto_a
     if-eqz v4, :cond_2
 
     invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fa;->bD(Ljava/lang/String;)Ljava/lang/String;
@@ -702,10 +742,10 @@
 
     goto/16 :goto_1
 
-    :cond_17
+    :cond_1d
     instance-of v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp$c;
 
-    if-eqz v0, :cond_19
+    if-eqz v0, :cond_1f
 
     move-object v0, p0
 
@@ -721,11 +761,11 @@
 
     move-result v1
 
-    if-nez v1, :cond_18
+    if-nez v1, :cond_1e
 
-    goto :goto_d
+    goto :goto_b
 
-    :cond_18
+    :cond_1e
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object p0
@@ -740,19 +780,19 @@
 
     throw p0
 
-    :cond_19
-    :goto_d
+    :cond_1f
+    :goto_b
     check-cast p0, Lcom/google/android/gms/internal/firebase-perf/dp;
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/dp;->zzrn:Lcom/google/android/gms/internal/firebase-perf/gg;
 
-    if-eqz v0, :cond_1a
+    if-eqz v0, :cond_20
 
     iget-object p0, p0, Lcom/google/android/gms/internal/firebase-perf/dp;->zzrn:Lcom/google/android/gms/internal/firebase-perf/gg;
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/firebase-perf/gg;->a(Ljava/lang/StringBuilder;I)V
 
-    :cond_1a
+    :cond_20
     return-void
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fc.smali
index 0b46f4c6cf..2167ddfb3a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fc.smali
@@ -84,7 +84,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPJ:[I
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tb()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->ta()Lsun/misc/Unsafe;
 
     move-result-object v0
 
@@ -336,7 +336,7 @@
 .end method
 
 .method static a(Lcom/google/android/gms/internal/firebase-perf/ev;Lcom/google/android/gms/internal/firebase-perf/ff;Lcom/google/android/gms/internal/firebase-perf/ei;Lcom/google/android/gms/internal/firebase-perf/gf;Lcom/google/android/gms/internal/firebase-perf/dd;Lcom/google/android/gms/internal/firebase-perf/es;)Lcom/google/android/gms/internal/firebase-perf/fc;
-    .locals 41
+    .locals 36
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -364,7 +364,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/firebase-perf/fm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fm;->sA()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fm;->sz()I
 
     move-result v1
 
@@ -484,7 +484,7 @@
 
     sget-object v8, Lcom/google/android/gms/internal/firebase-perf/fc;->aPJ:[I
 
-    move-object/from16 v16, v8
+    move-object v15, v8
 
     const/4 v8, 0x0
 
@@ -496,7 +496,7 @@
 
     const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v16, 0x0
 
     goto/16 :goto_12
 
@@ -779,11 +779,11 @@
 
     const/16 v17, 0xd
 
-    move/from16 v40, v16
+    move/from16 v34, v16
 
     move/from16 v16, v15
 
-    move/from16 v15, v40
+    move/from16 v15, v34
 
     :goto_f
     add-int/lit8 v18, v15, 0x1
@@ -831,11 +831,11 @@
 
     const/16 v17, 0xd
 
-    move/from16 v40, v16
+    move/from16 v34, v16
 
     move/from16 v16, v3
 
-    move/from16 v3, v40
+    move/from16 v3, v34
 
     :goto_11
     add-int/lit8 v18, v3, 0x1
@@ -876,21 +876,21 @@
 
     add-int v10, v17, v10
 
-    move/from16 v40, v13
+    move/from16 v34, v13
 
     move v13, v3
 
     move v3, v9
 
-    move v9, v12
+    move/from16 v9, v34
 
-    move/from16 v12, v16
+    move/from16 v35, v16
 
-    move-object/from16 v16, v15
+    move/from16 v16, v8
 
-    move v15, v10
+    move v8, v12
 
-    move/from16 v10, v40
+    move/from16 v12, v35
 
     :goto_12
     sget-object v6, Lcom/google/android/gms/internal/firebase-perf/fc;->aPK:Lsun/misc/Unsafe;
@@ -903,13 +903,13 @@
 
     move-result-object v4
 
-    move/from16 v22, v12
+    move/from16 v20, v10
 
-    mul-int/lit8 v12, v14, 0x3
+    mul-int/lit8 v10, v14, 0x3
 
-    new-array v12, v12, [I
+    new-array v10, v10, [I
 
-    const/16 v17, 0x1
+    const/16 v19, 0x1
 
     shl-int/lit8 v14, v14, 0x1
 
@@ -917,86 +917,84 @@
 
     add-int/2addr v3, v13
 
-    move/from16 v23, v3
+    move/from16 v24, v3
 
-    move/from16 v19, v15
+    move/from16 v23, v13
 
-    move/from16 v15, v22
+    move/from16 v22, v20
 
-    const/16 v17, 0x0
+    const/16 v20, 0x0
 
-    const/16 v18, 0x0
-
-    move/from16 v22, v13
+    const/16 v21, 0x0
 
     :goto_13
-    if-ge v15, v2, :cond_33
+    if-ge v12, v2, :cond_33
 
-    add-int/lit8 v24, v15, 0x1
+    add-int/lit8 v25, v12, 0x1
 
-    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v1, v12}, Ljava/lang/String;->charAt(I)C
 
-    move-result v15
+    move-result v12
 
-    move/from16 v25, v2
+    move/from16 v26, v2
 
     const v2, 0xd800
 
-    if-lt v15, v2, :cond_17
+    if-lt v12, v2, :cond_17
 
-    and-int/lit16 v15, v15, 0x1fff
+    and-int/lit16 v12, v12, 0x1fff
 
-    const/16 v26, 0xd
+    const/16 v27, 0xd
 
-    move/from16 v40, v24
+    move/from16 v34, v25
 
-    move/from16 v24, v15
+    move/from16 v25, v12
 
-    move/from16 v15, v40
+    move/from16 v12, v34
 
     :goto_14
-    add-int/lit8 v27, v15, 0x1
+    add-int/lit8 v28, v12, 0x1
 
-    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v1, v12}, Ljava/lang/String;->charAt(I)C
 
-    move-result v15
+    move-result v12
 
-    if-lt v15, v2, :cond_16
+    if-lt v12, v2, :cond_16
 
-    and-int/lit16 v2, v15, 0x1fff
+    and-int/lit16 v2, v12, 0x1fff
 
-    shl-int v2, v2, v26
+    shl-int v2, v2, v27
 
-    or-int v24, v24, v2
+    or-int v25, v25, v2
 
-    add-int/lit8 v26, v26, 0xd
+    add-int/lit8 v27, v27, 0xd
 
-    move/from16 v15, v27
+    move/from16 v12, v28
 
     const v2, 0xd800
 
     goto :goto_14
 
     :cond_16
-    shl-int v2, v15, v26
+    shl-int v2, v12, v27
 
-    or-int v15, v24, v2
+    or-int v12, v25, v2
 
-    move/from16 v2, v27
+    move/from16 v2, v28
 
     goto :goto_15
 
     :cond_17
-    move/from16 v2, v24
+    move/from16 v2, v25
 
     :goto_15
-    add-int/lit8 v24, v2, 0x1
+    add-int/lit8 v25, v2, 0x1
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
 
     move-result v2
 
-    move/from16 v28, v3
+    move/from16 v27, v3
 
     const v3, 0xd800
 
@@ -1004,16 +1002,16 @@
 
     and-int/lit16 v2, v2, 0x1fff
 
-    const/16 v26, 0xd
+    const/16 v28, 0xd
 
-    move/from16 v40, v24
+    move/from16 v34, v25
 
-    move/from16 v24, v2
+    move/from16 v25, v2
 
-    move/from16 v2, v40
+    move/from16 v2, v34
 
     :goto_16
-    add-int/lit8 v27, v2, 0x1
+    add-int/lit8 v29, v2, 0x1
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
 
@@ -1023,51 +1021,51 @@
 
     and-int/lit16 v2, v2, 0x1fff
 
-    shl-int v2, v2, v26
+    shl-int v2, v2, v28
 
-    or-int v24, v24, v2
+    or-int v25, v25, v2
 
-    add-int/lit8 v26, v26, 0xd
+    add-int/lit8 v28, v28, 0xd
 
-    move/from16 v2, v27
+    move/from16 v2, v29
 
     const v3, 0xd800
 
     goto :goto_16
 
     :cond_18
-    shl-int v2, v2, v26
+    shl-int v2, v2, v28
 
-    or-int v2, v24, v2
+    or-int v2, v25, v2
 
-    move/from16 v3, v27
+    move/from16 v3, v29
 
     goto :goto_17
 
     :cond_19
-    move/from16 v3, v24
+    move/from16 v3, v25
 
     :goto_17
-    move/from16 v29, v13
+    move/from16 v25, v13
 
     and-int/lit16 v13, v2, 0xff
 
-    move/from16 v30, v11
+    move/from16 v28, v11
 
     and-int/lit16 v11, v2, 0x400
 
     if-eqz v11, :cond_1a
 
-    add-int/lit8 v11, v17, 0x1
+    add-int/lit8 v11, v20, 0x1
 
-    aput v18, v16, v17
+    aput v21, v15, v20
 
-    move/from16 v17, v11
+    move/from16 v20, v11
 
     :cond_1a
     const/16 v11, 0x33
 
-    move/from16 v31, v10
+    move/from16 v31, v9
 
     if-lt v13, v11, :cond_22
 
@@ -1077,83 +1075,87 @@
 
     move-result v3
 
-    const v10, 0xd800
+    const v9, 0xd800
 
-    if-lt v3, v10, :cond_1c
+    if-lt v3, v9, :cond_1c
 
     and-int/lit16 v3, v3, 0x1fff
 
-    const/16 v24, 0xd
+    const/16 v32, 0xd
 
     :goto_18
-    add-int/lit8 v26, v11, 0x1
+    add-int/lit8 v33, v11, 0x1
 
     invoke-virtual {v1, v11}, Ljava/lang/String;->charAt(I)C
 
     move-result v11
 
-    if-lt v11, v10, :cond_1b
+    if-lt v11, v9, :cond_1b
 
-    and-int/lit16 v10, v11, 0x1fff
+    and-int/lit16 v9, v11, 0x1fff
 
-    shl-int v10, v10, v24
+    shl-int v9, v9, v32
 
-    or-int/2addr v3, v10
+    or-int/2addr v3, v9
 
-    add-int/lit8 v24, v24, 0xd
+    add-int/lit8 v32, v32, 0xd
 
-    move/from16 v11, v26
+    move/from16 v11, v33
 
-    const v10, 0xd800
+    const v9, 0xd800
 
     goto :goto_18
 
     :cond_1b
-    shl-int v10, v11, v24
+    shl-int v9, v11, v32
 
-    or-int/2addr v3, v10
+    or-int/2addr v3, v9
 
-    move/from16 v11, v26
+    move/from16 v11, v33
 
     :cond_1c
-    add-int/lit8 v10, v13, -0x33
+    add-int/lit8 v9, v13, -0x33
 
     move/from16 v32, v11
 
     const/16 v11, 0x9
 
-    if-eq v10, v11, :cond_1f
+    if-eq v9, v11, :cond_1f
 
     const/16 v11, 0x11
 
-    if-ne v10, v11, :cond_1d
+    if-ne v9, v11, :cond_1d
 
     goto :goto_19
 
     :cond_1d
     const/16 v11, 0xc
 
-    if-ne v10, v11, :cond_1e
+    if-ne v9, v11, :cond_1e
 
-    and-int/lit8 v10, v5, 0x1
+    and-int/lit8 v9, v5, 0x1
 
     const/4 v11, 0x1
 
-    if-ne v10, v11, :cond_1e
+    if-ne v9, v11, :cond_1e
 
-    div-int/lit8 v10, v18, 0x3
+    div-int/lit8 v9, v21, 0x3
 
-    shl-int/2addr v10, v11
+    shl-int/2addr v9, v11
 
-    add-int/2addr v10, v11
+    add-int/2addr v9, v11
 
-    add-int/lit8 v11, v19, 0x1
+    add-int/lit8 v11, v22, 0x1
 
-    aget-object v19, v7, v19
+    aget-object v22, v7, v22
 
-    aput-object v19, v14, v10
+    aput-object v22, v14, v9
 
-    move/from16 v19, v11
+    move/from16 v22, v11
+
+    const/4 v11, 0x1
+
+    goto :goto_1a
 
     :cond_1e
     const/4 v11, 0x1
@@ -1162,285 +1164,295 @@
 
     :cond_1f
     :goto_19
-    div-int/lit8 v10, v18, 0x3
+    div-int/lit8 v9, v21, 0x3
 
     const/4 v11, 0x1
 
-    shl-int/2addr v10, v11
+    shl-int/2addr v9, v11
 
-    add-int/2addr v10, v11
+    add-int/2addr v9, v11
 
-    add-int/lit8 v21, v19, 0x1
+    add-int/lit8 v19, v22, 0x1
 
-    aget-object v19, v7, v19
+    aget-object v22, v7, v22
 
-    aput-object v19, v14, v10
+    aput-object v22, v14, v9
 
-    move/from16 v19, v21
+    move/from16 v22, v19
 
     :goto_1a
     shl-int/2addr v3, v11
 
-    aget-object v10, v7, v3
+    aget-object v9, v7, v3
 
-    instance-of v11, v10, Ljava/lang/reflect/Field;
+    instance-of v11, v9, Ljava/lang/reflect/Field;
 
     if-eqz v11, :cond_20
 
-    check-cast v10, Ljava/lang/reflect/Field;
+    check-cast v9, Ljava/lang/reflect/Field;
+
+    move v11, v8
 
     goto :goto_1b
 
     :cond_20
-    check-cast v10, Ljava/lang/String;
+    check-cast v9, Ljava/lang/String;
 
-    invoke-static {v4, v10}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    invoke-static {v4, v9}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v10
+    move-result-object v9
 
-    aput-object v10, v7, v3
+    aput-object v9, v7, v3
+
+    move v11, v8
 
     :goto_1b
-    invoke-virtual {v6, v10}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    invoke-virtual {v6, v9}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
-    move-result-wide v10
+    move-result-wide v8
 
-    long-to-int v10, v10
+    long-to-int v8, v8
 
     add-int/lit8 v3, v3, 0x1
 
-    aget-object v11, v7, v3
+    aget-object v9, v7, v3
 
-    move/from16 v33, v10
+    move/from16 v29, v8
 
-    instance-of v10, v11, Ljava/lang/reflect/Field;
+    instance-of v8, v9, Ljava/lang/reflect/Field;
 
-    if-eqz v10, :cond_21
+    if-eqz v8, :cond_21
 
-    check-cast v11, Ljava/lang/reflect/Field;
+    check-cast v9, Ljava/lang/reflect/Field;
 
     goto :goto_1c
 
     :cond_21
-    check-cast v11, Ljava/lang/String;
+    check-cast v9, Ljava/lang/String;
 
-    invoke-static {v4, v11}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    invoke-static {v4, v9}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v11
+    move-result-object v9
 
-    aput-object v11, v7, v3
+    aput-object v9, v7, v3
 
     :goto_1c
-    invoke-virtual {v6, v11}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    invoke-virtual {v6, v9}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
-    move-result-wide v10
+    move-result-wide v8
 
-    long-to-int v3, v10
-
-    move-object/from16 v35, v0
-
-    move-object/from16 v39, v4
-
-    move/from16 v38, v5
-
-    move/from16 v34, v9
-
-    move/from16 v10, v19
-
-    move/from16 v37, v32
-
-    move/from16 v0, v33
-
-    const/16 v19, 0x1
+    long-to-int v3, v8
 
     move-object v9, v1
 
     move v1, v3
 
+    move-object/from16 v18, v4
+
+    move/from16 v8, v22
+
+    move/from16 v30, v32
+
     const/4 v3, 0x0
 
-    goto/16 :goto_28
+    move/from16 v22, v11
+
+    move v11, v5
+
+    move/from16 v34, v29
+
+    move-object/from16 v29, v0
+
+    move/from16 v0, v34
+
+    goto/16 :goto_26
 
     :cond_22
-    add-int/lit8 v10, v19, 0x1
+    move v11, v8
 
-    aget-object v11, v7, v19
+    add-int/lit8 v8, v22, 0x1
 
-    check-cast v11, Ljava/lang/String;
+    aget-object v9, v7, v22
 
-    invoke-static {v4, v11}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    check-cast v9, Ljava/lang/String;
 
-    move-result-object v11
+    invoke-static {v4, v9}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move/from16 v34, v9
+    move-result-object v9
 
-    const/16 v9, 0x9
+    move/from16 v22, v11
 
-    if-eq v13, v9, :cond_2a
+    const/16 v11, 0x9
 
-    const/16 v9, 0x11
+    if-eq v13, v11, :cond_2a
 
-    if-ne v13, v9, :cond_23
+    const/16 v11, 0x11
 
-    goto/16 :goto_21
+    if-ne v13, v11, :cond_23
+
+    goto/16 :goto_1f
 
     :cond_23
-    const/16 v9, 0x1b
+    const/16 v11, 0x1b
 
-    if-eq v13, v9, :cond_29
+    if-eq v13, v11, :cond_29
 
-    const/16 v9, 0x31
+    const/16 v11, 0x31
 
-    if-ne v13, v9, :cond_24
-
-    goto :goto_1f
-
-    :cond_24
-    const/16 v9, 0xc
-
-    if-eq v13, v9, :cond_28
-
-    const/16 v9, 0x1e
-
-    if-eq v13, v9, :cond_28
-
-    const/16 v9, 0x2c
-
-    if-ne v13, v9, :cond_25
+    if-ne v13, v11, :cond_24
 
     goto :goto_1e
 
-    :cond_25
-    const/16 v9, 0x32
+    :cond_24
+    const/16 v11, 0xc
 
-    if-ne v13, v9, :cond_27
+    if-eq v13, v11, :cond_28
 
-    add-int/lit8 v9, v22, 0x1
+    const/16 v11, 0x1e
 
-    aput v18, v16, v22
+    if-eq v13, v11, :cond_28
 
-    div-int/lit8 v19, v18, 0x3
+    const/16 v11, 0x2c
 
-    const/16 v21, 0x1
-
-    shl-int/lit8 v19, v19, 0x1
-
-    add-int/lit8 v22, v10, 0x1
-
-    aget-object v10, v7, v10
-
-    aput-object v10, v14, v19
-
-    and-int/lit16 v10, v2, 0x800
-
-    if-eqz v10, :cond_26
-
-    add-int/lit8 v19, v19, 0x1
-
-    add-int/lit8 v10, v22, 0x1
-
-    aget-object v22, v7, v22
-
-    aput-object v22, v14, v19
-
-    move-object/from16 v35, v0
-
-    move-object/from16 v36, v1
+    if-ne v13, v11, :cond_25
 
     goto :goto_1d
 
+    :cond_25
+    const/16 v11, 0x32
+
+    if-ne v13, v11, :cond_27
+
+    add-int/lit8 v11, v23, 0x1
+
+    aput v21, v15, v23
+
+    div-int/lit8 v23, v21, 0x3
+
+    const/16 v19, 0x1
+
+    shl-int/lit8 v23, v23, 0x1
+
+    add-int/lit8 v29, v8, 0x1
+
+    aget-object v8, v7, v8
+
+    aput-object v8, v14, v23
+
+    and-int/lit16 v8, v2, 0x800
+
+    if-eqz v8, :cond_26
+
+    add-int/lit8 v23, v23, 0x1
+
+    add-int/lit8 v8, v29, 0x1
+
+    aget-object v29, v7, v29
+
+    aput-object v29, v14, v23
+
+    move-object/from16 v29, v0
+
+    move/from16 v23, v11
+
+    move-object v11, v1
+
+    goto :goto_21
+
     :cond_26
-    move-object/from16 v35, v0
+    move/from16 v23, v11
 
-    move-object/from16 v36, v1
+    move/from16 v8, v29
 
-    move/from16 v10, v22
+    move-object/from16 v29, v0
 
-    :goto_1d
-    move/from16 v22, v9
+    move-object v11, v1
 
-    goto :goto_23
+    goto :goto_21
 
     :cond_27
-    move-object/from16 v35, v0
+    move-object/from16 v29, v0
 
     const/4 v0, 0x1
 
-    goto :goto_22
-
-    :cond_28
-    :goto_1e
-    and-int/lit8 v9, v5, 0x1
-
-    move-object/from16 v35, v0
-
-    const/4 v0, 0x1
-
-    if-ne v9, v0, :cond_2b
-
-    div-int/lit8 v9, v18, 0x3
-
-    shl-int/2addr v9, v0
-
-    add-int/2addr v9, v0
-
-    add-int/lit8 v19, v10, 0x1
-
-    aget-object v10, v7, v10
-
-    aput-object v10, v14, v9
-
     goto :goto_20
 
-    :cond_29
-    :goto_1f
-    move-object/from16 v35, v0
+    :cond_28
+    :goto_1d
+    and-int/lit8 v11, v5, 0x1
+
+    move-object/from16 v29, v0
 
     const/4 v0, 0x1
 
-    div-int/lit8 v9, v18, 0x3
+    if-ne v11, v0, :cond_2b
 
-    shl-int/2addr v9, v0
+    div-int/lit8 v11, v21, 0x3
 
-    add-int/2addr v9, v0
+    shl-int/2addr v11, v0
 
-    add-int/lit8 v19, v10, 0x1
+    add-int/2addr v11, v0
 
-    aget-object v10, v7, v10
+    add-int/lit8 v19, v8, 0x1
 
-    aput-object v10, v14, v9
+    aget-object v8, v7, v8
 
-    :goto_20
-    move-object/from16 v36, v1
+    aput-object v8, v14, v11
 
-    move/from16 v10, v19
+    move-object v11, v1
 
-    goto :goto_23
+    move/from16 v8, v19
+
+    goto :goto_21
+
+    :cond_29
+    :goto_1e
+    move-object/from16 v29, v0
+
+    const/4 v0, 0x1
+
+    div-int/lit8 v11, v21, 0x3
+
+    shl-int/2addr v11, v0
+
+    add-int/2addr v11, v0
+
+    add-int/lit8 v19, v8, 0x1
+
+    aget-object v8, v7, v8
+
+    aput-object v8, v14, v11
+
+    move-object v11, v1
+
+    move/from16 v8, v19
+
+    goto :goto_21
 
     :cond_2a
-    :goto_21
-    move-object/from16 v35, v0
+    :goto_1f
+    move-object/from16 v29, v0
 
     const/4 v0, 0x1
 
-    div-int/lit8 v9, v18, 0x3
+    div-int/lit8 v11, v21, 0x3
 
-    shl-int/2addr v9, v0
+    shl-int/2addr v11, v0
 
-    add-int/2addr v9, v0
+    add-int/2addr v11, v0
 
-    invoke-virtual {v11}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
+    invoke-virtual {v9}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
 
     move-result-object v19
 
-    aput-object v19, v14, v9
+    aput-object v19, v14, v11
 
     :cond_2b
-    :goto_22
-    move-object/from16 v36, v1
+    :goto_20
+    move-object v11, v1
 
-    :goto_23
-    invoke-virtual {v6, v11}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    :goto_21
+    invoke-virtual {v6, v9}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
     move-result-wide v0
 
@@ -1458,7 +1470,7 @@
 
     add-int/lit8 v1, v3, 0x1
 
-    move-object/from16 v9, v36
+    move-object v9, v11
 
     invoke-virtual {v9, v3}, Ljava/lang/String;->charAt(I)C
 
@@ -1470,10 +1482,10 @@
 
     and-int/lit16 v3, v3, 0x1fff
 
-    const/16 v19, 0xd
+    const/16 v18, 0xd
 
-    :goto_24
-    add-int/lit8 v20, v1, 0x1
+    :goto_22
+    add-int/lit8 v30, v1, 0x1
 
     invoke-virtual {v9, v1}, Ljava/lang/String;->charAt(I)C
 
@@ -1483,62 +1495,66 @@
 
     and-int/lit16 v1, v1, 0x1fff
 
-    shl-int v1, v1, v19
+    shl-int v1, v1, v18
 
     or-int/2addr v3, v1
 
-    add-int/lit8 v19, v19, 0xd
+    add-int/lit8 v18, v18, 0xd
 
-    move/from16 v1, v20
+    move/from16 v1, v30
+
+    goto :goto_22
+
+    :cond_2c
+    shl-int v1, v1, v18
+
+    or-int/2addr v3, v1
+
+    const/4 v1, 0x1
+
+    goto :goto_23
+
+    :cond_2d
+    move/from16 v30, v1
+
+    const/4 v1, 0x1
+
+    :goto_23
+    shl-int/lit8 v18, v16, 0x1
+
+    div-int/lit8 v19, v3, 0x20
+
+    add-int v18, v18, v19
+
+    aget-object v1, v7, v18
+
+    instance-of v11, v1, Ljava/lang/reflect/Field;
+
+    if-eqz v11, :cond_2e
+
+    check-cast v1, Ljava/lang/reflect/Field;
+
+    move-object/from16 v18, v4
+
+    move v11, v5
 
     goto :goto_24
 
-    :cond_2c
-    shl-int v1, v1, v19
-
-    or-int/2addr v3, v1
-
-    move/from16 v1, v20
-
-    :cond_2d
-    const/16 v19, 0x1
-
-    shl-int/lit8 v20, v8, 0x1
-
-    div-int/lit8 v21, v3, 0x20
-
-    add-int v20, v20, v21
-
-    aget-object v11, v7, v20
-
-    move/from16 v37, v1
-
-    instance-of v1, v11, Ljava/lang/reflect/Field;
-
-    if-eqz v1, :cond_2e
-
-    check-cast v11, Ljava/lang/reflect/Field;
-
-    :goto_25
-    move-object/from16 v39, v4
-
-    move/from16 v38, v5
-
-    goto :goto_26
-
     :cond_2e
-    check-cast v11, Ljava/lang/String;
+    check-cast v1, Ljava/lang/String;
 
-    invoke-static {v4, v11}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v11
+    move-result-object v1
 
-    aput-object v11, v7, v20
+    aput-object v1, v7, v18
 
-    goto :goto_25
+    move-object/from16 v18, v4
 
-    :goto_26
-    invoke-virtual {v6, v11}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    move v11, v5
+
+    :goto_24
+    invoke-virtual {v6, v1}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
     move-result-wide v4
 
@@ -1546,24 +1562,22 @@
 
     rem-int/lit8 v3, v3, 0x20
 
-    goto :goto_27
+    goto :goto_25
 
     :cond_2f
-    move-object/from16 v39, v4
+    move-object/from16 v18, v4
 
-    move/from16 v38, v5
+    move-object v9, v11
 
-    move-object/from16 v9, v36
+    move v11, v5
 
-    const/16 v19, 0x1
-
-    move/from16 v37, v3
+    move/from16 v30, v3
 
     const/4 v1, 0x0
 
     const/4 v3, 0x0
 
-    :goto_27
+    :goto_25
     const/16 v4, 0x12
 
     if-lt v13, v4, :cond_30
@@ -1572,120 +1586,120 @@
 
     if-gt v13, v4, :cond_30
 
-    add-int/lit8 v4, v23, 0x1
+    add-int/lit8 v4, v24, 0x1
 
-    aput v0, v16, v23
+    aput v0, v15, v24
 
-    move/from16 v23, v4
+    move/from16 v24, v4
 
     :cond_30
-    :goto_28
-    add-int/lit8 v4, v18, 0x1
+    :goto_26
+    add-int/lit8 v4, v21, 0x1
 
-    aput v15, v12, v18
+    aput v12, v10, v21
 
     add-int/lit8 v5, v4, 0x1
 
-    and-int/lit16 v11, v2, 0x200
+    and-int/lit16 v12, v2, 0x200
 
-    if-eqz v11, :cond_31
+    if-eqz v12, :cond_31
 
-    const/high16 v11, 0x20000000
+    const/high16 v12, 0x20000000
 
-    goto :goto_29
+    goto :goto_27
 
     :cond_31
-    const/4 v11, 0x0
+    const/4 v12, 0x0
 
-    :goto_29
+    :goto_27
     and-int/lit16 v2, v2, 0x100
 
     if-eqz v2, :cond_32
 
     const/high16 v2, 0x10000000
 
-    goto :goto_2a
+    goto :goto_28
 
     :cond_32
     const/4 v2, 0x0
 
-    :goto_2a
-    or-int/2addr v2, v11
+    :goto_28
+    or-int/2addr v2, v12
 
-    shl-int/lit8 v11, v13, 0x14
+    shl-int/lit8 v12, v13, 0x14
 
-    or-int/2addr v2, v11
+    or-int/2addr v2, v12
 
     or-int/2addr v0, v2
 
-    aput v0, v12, v4
+    aput v0, v10, v4
 
-    add-int/lit8 v18, v5, 0x1
+    add-int/lit8 v21, v5, 0x1
 
     shl-int/lit8 v0, v3, 0x14
 
     or-int/2addr v0, v1
 
-    aput v0, v12, v5
+    aput v0, v10, v5
 
     move-object v1, v9
 
-    move/from16 v19, v10
+    move v5, v11
 
-    move/from16 v2, v25
+    move-object/from16 v4, v18
 
-    move/from16 v3, v28
+    move/from16 v13, v25
 
-    move/from16 v13, v29
+    move/from16 v2, v26
 
-    move/from16 v11, v30
+    move/from16 v3, v27
 
-    move/from16 v10, v31
+    move/from16 v11, v28
 
-    move/from16 v9, v34
+    move-object/from16 v0, v29
 
-    move-object/from16 v0, v35
+    move/from16 v12, v30
 
-    move/from16 v15, v37
+    move/from16 v9, v31
 
-    move/from16 v5, v38
+    move/from16 v34, v22
 
-    move-object/from16 v4, v39
+    move/from16 v22, v8
+
+    move/from16 v8, v34
 
     goto/16 :goto_13
 
     :cond_33
-    move-object/from16 v35, v0
+    move-object/from16 v29, v0
 
-    move/from16 v28, v3
+    move/from16 v27, v3
 
-    move/from16 v34, v9
+    move/from16 v22, v8
 
-    move/from16 v31, v10
+    move/from16 v31, v9
 
-    move/from16 v30, v11
+    move/from16 v28, v11
 
-    move/from16 v29, v13
+    move/from16 v25, v13
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/fc;
 
-    move-object/from16 v1, v35
+    move-object/from16 v1, v29
 
-    iget-object v10, v1, Lcom/google/android/gms/internal/firebase-perf/fm;->aPP:Lcom/google/android/gms/internal/firebase-perf/ex;
+    iget-object v1, v1, Lcom/google/android/gms/internal/firebase-perf/fm;->aPP:Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-object v5, v0
 
-    move-object v6, v12
+    move-object v6, v10
 
     move-object v7, v14
 
-    move/from16 v8, v34
+    move-object v10, v1
 
-    move/from16 v9, v31
+    move-object v12, v15
 
-    move-object/from16 v12, v16
-
-    move/from16 v14, v28
+    move/from16 v14, v27
 
     move-object/from16 v15, p1
 
@@ -1707,6 +1721,8 @@
     invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
 
     throw v0
+
+    return-void
 .end method
 
 .method private final a(IILjava/util/Map;Lcom/google/android/gms/internal/firebase-perf/du;Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gf;)Ljava/lang/Object;
@@ -1781,7 +1797,7 @@
 
     if-nez p5, :cond_1
 
-    invoke-virtual {p6}, Lcom/google/android/gms/internal/firebase-perf/gf;->sW()Ljava/lang/Object;
+    invoke-virtual {p6}, Lcom/google/android/gms/internal/firebase-perf/gf;->sV()Ljava/lang/Object;
 
     move-result-object p5
 
@@ -1817,7 +1833,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/co;->qQ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/co;->qP()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v0
 
@@ -2032,11 +2048,10 @@
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/firebase-perf/fn;->qY()Ljava/lang/String;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/firebase-perf/fn;->qX()Ljava/lang/String;
 
     move-result-object p2
 
-    :goto_0
     invoke-static {p1, v0, v1, p2}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     return-void
@@ -2054,18 +2069,22 @@
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-static {p1, v0, v1, p2}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-void
 
     :cond_1
     and-int/2addr p2, v1
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/firebase-perf/fn;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-static {p1, v0, v1, p2}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-void
 .end method
 
 .method private final a(Ljava/lang/Object;Ljava/lang/Object;I)V
@@ -2239,7 +2258,7 @@
 .end method
 
 .method private final b(Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
-    .locals 19
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;",
@@ -2311,7 +2330,7 @@
     const/4 v11, 0x0
 
     :goto_1
-    if-ge v5, v7, :cond_7
+    if-ge v5, v7, :cond_18
 
     invoke-direct {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->dn(I)I
 
@@ -2319,60 +2338,64 @@
 
     iget-object v13, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    aget v13, v13, v5
+    aget v14, v13, v5
 
-    const/high16 v14, 0xff00000
+    const/high16 v15, 0xff00000
 
-    and-int/2addr v14, v12
+    and-int/2addr v15, v12
 
-    ushr-int/lit8 v14, v14, 0x14
+    ushr-int/lit8 v15, v15, 0x14
 
-    iget-boolean v15, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPS:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPS:Z
 
     const v16, 0xfffff
 
-    if-nez v15, :cond_2
+    if-nez v4, :cond_2
 
-    const/16 v15, 0x11
+    const/16 v4, 0x11
 
-    if-gt v14, v15, :cond_2
+    if-gt v15, v4, :cond_2
 
-    iget-object v15, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    add-int/lit8 v4, v5, 0x2
 
-    add-int/lit8 v17, v5, 0x2
+    aget v4, v13, v4
 
-    aget v15, v15, v17
+    and-int v13, v4, v16
 
-    and-int v9, v15, v16
+    if-eq v13, v6, :cond_1
 
-    if-eq v9, v6, :cond_1
+    move-object/from16 v17, v10
 
-    move/from16 v18, v5
+    int-to-long v9, v13
 
-    int-to-long v4, v9
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v9, v10}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v11
 
-    move v6, v9
-
     goto :goto_2
 
     :cond_1
-    move/from16 v18, v5
+    move-object/from16 v17, v10
+
+    move v13, v6
 
     :goto_2
-    ushr-int/lit8 v4, v15, 0x14
+    ushr-int/lit8 v4, v4, 0x14
 
-    const/4 v5, 0x1
+    const/4 v6, 0x1
 
-    shl-int v9, v5, v4
+    shl-int v9, v6, v4
+
+    move v6, v13
+
+    move-object/from16 v10, v17
 
     goto :goto_3
 
     :cond_2
-    move/from16 v18, v5
+    move-object/from16 v17, v10
+
+    move-object/from16 v10, v17
 
     const/4 v9, 0x0
 
@@ -2385,7 +2408,7 @@
 
     move-result v4
 
-    if-gt v4, v13, :cond_4
+    if-gt v4, v14, :cond_4
 
     iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
 
@@ -2415,1250 +2438,1324 @@
     :cond_4
     and-int v4, v12, v16
 
-    int-to-long v4, v4
+    int-to-long v12, v4
 
-    packed-switch v14, :pswitch_data_0
+    packed-switch v15, :pswitch_data_0
 
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    :cond_5
-    :goto_4
-    const/4 v14, 0x0
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_0
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto :goto_4
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_5
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_1
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
+    const/4 v15, 0x0
 
-    goto :goto_4
+    goto/16 :goto_4
+
+    :cond_6
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_2
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
+    if-eqz v4, :cond_7
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_7
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_3
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_8
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
+    const/4 v15, 0x0
 
-    goto :goto_4
+    goto/16 :goto_4
+
+    :cond_8
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_4
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
+    if-eqz v4, :cond_9
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_9
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_5
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
+    if-eqz v4, :cond_a
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_a
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_6
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
+    if-eqz v4, :cond_b
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_b
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_7
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_c
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
     check-cast v4, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_c
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_8
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_d
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_d
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_9
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_e
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-static {v13, v4, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
+    invoke-static {v14, v4, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_e
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_a
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->F(Ljava/lang/Object;J)Z
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
+    if-eqz v4, :cond_f
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->F(Ljava/lang/Object;J)Z
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_f
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_b
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
+    if-eqz v4, :cond_10
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_10
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_c
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_11
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_11
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_d
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
+    if-eqz v4, :cond_12
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_12
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_e
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_13
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_13
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_f
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_14
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_14
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_10
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->C(Ljava/lang/Object;J)F
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
+    if-eqz v4, :cond_15
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->C(Ljava/lang/Object;J)F
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_15
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_11
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_16
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/fc;->B(Ljava/lang/Object;J)D
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->B(Ljava/lang/Object;J)D
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_16
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_12
-    move/from16 v12, v18
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v2, v13, v4, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/gz;ILjava/lang/Object;I)V
+    invoke-direct {v0, v2, v14, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/gz;ILjava/lang/Object;I)V
+
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_13
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+    move-result-object v12
 
-    move-result-object v5
+    invoke-static {v4, v9, v2, v12}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    invoke-static {v9, v4, v2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_14
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_5
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_15
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_6
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_16
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_7
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_17
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_8
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_18
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_9
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_19
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_a
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_1a
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1b
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1c
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1d
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1e
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1f
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_20
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_21
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_22
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    :goto_5
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_23
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_6
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_24
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_7
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_25
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_8
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_26
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_9
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_27
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_a
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_28
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    invoke-static {v9, v4, v2}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_29
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+    move-result-object v12
 
-    move-result-object v5
+    invoke-static {v4, v9, v2, v12}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    invoke-static {v9, v4, v2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_2a
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    invoke-static {v9, v4, v2}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_2b
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2c
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2d
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2e
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2f
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_30
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_31
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_32
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_33
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_34
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_35
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_36
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_37
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_38
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_39
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3a
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
     check-cast v4, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3b
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3c
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-static {v13, v4, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
+    invoke-static {v14, v4, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3d
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->I(Ljava/lang/Object;J)Z
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gl;->I(Ljava/lang/Object;J)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_3e
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_3f
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
-
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_40
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_41
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
-
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_42
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
-
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_43
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->J(Ljava/lang/Object;J)F
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gl;->J(Ljava/lang/Object;J)F
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_44
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gl;->K(Ljava/lang/Object;J)D
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->K(Ljava/lang/Object;J)D
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
-
-    :cond_6
-    :goto_b
-    add-int/lit8 v5, v12, 0x3
+    :cond_17
+    :goto_4
+    add-int/lit8 v5, v5, 0x3
 
     goto/16 :goto_1
 
-    :cond_7
-    :goto_c
-    if-eqz v10, :cond_9
+    :cond_18
+    move-object/from16 v17, v10
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
+    move-object/from16 v4, v17
 
-    invoke-virtual {v4, v10}, Lcom/google/android/gms/internal/firebase-perf/dd;->e(Ljava/util/Map$Entry;)V
+    :goto_5
+    if-eqz v4, :cond_1a
+
+    iget-object v5, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
+
+    invoke-virtual {v5, v4}, Lcom/google/android/gms/internal/firebase-perf/dd;->e(Ljava/util/Map$Entry;)V
 
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_19
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -3666,16 +3763,14 @@
 
     check-cast v4, Ljava/util/Map$Entry;
 
-    move-object v10, v4
+    goto :goto_5
 
-    goto :goto_c
+    :cond_19
+    const/4 v4, 0x0
 
-    :cond_8
-    const/4 v10, 0x0
+    goto :goto_5
 
-    goto :goto_c
-
-    :cond_9
+    :cond_1a
     iget-object v3, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPZ:Lcom/google/android/gms/internal/firebase-perf/gf;
 
     invoke-static {v3, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/gf;Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
@@ -3864,11 +3959,11 @@
     :try_start_0
     invoke-virtual {p0, p1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
     invoke-virtual {p0}, Ljava/lang/Class;->getDeclaredFields()[Ljava/lang/reflect/Field;
@@ -3971,6 +4066,8 @@
     invoke-direct {v1, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method private final d(Ljava/lang/Object;I)Z
@@ -4354,7 +4451,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v0
 
@@ -4513,7 +4610,7 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_1f
+    if-eqz p3, :cond_20
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPZ:Lcom/google/android/gms/internal/firebase-perf/gf;
 
@@ -4528,7 +4625,7 @@
     :cond_0
     :goto_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ro()I
 
     move-result v5
 
@@ -4647,12 +4744,9 @@
     move-result-object v4
 
     :cond_8
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rE()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rD()Ljava/lang/Object;
 
-    move-result-object v5
-
-    :goto_5
-    move-object v3, v5
+    move-result-object v3
 
     goto :goto_0
 
@@ -4661,9 +4755,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/firebase-perf/gf;->aG(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
-
-    move-object v3, v5
+    move-result-object v3
 
     :cond_a
     invoke-virtual {v0, v3, p2}, Lcom/google/android/gms/internal/firebase-perf/gf;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fn;)Z
@@ -4676,7 +4768,7 @@
 
     iget p2, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPV:I
 
-    :goto_6
+    :goto_5
     iget p3, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPW:I
 
     if-ge p2, p3, :cond_b
@@ -4691,7 +4783,7 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_b
     if-eqz v3, :cond_c
@@ -4719,14 +4811,14 @@
 
     packed-switch v8, :pswitch_data_0
 
-    if-nez v3, :cond_17
+    if-nez v3, :cond_18
 
     :try_start_3
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/gf;->sW()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/gf;->sV()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    goto/16 :goto_1a
+    goto/16 :goto_a
 
     :pswitch_0
     and-int/2addr v6, v9
@@ -4743,7 +4835,6 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :goto_7
     invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
 
     goto/16 :goto_0
@@ -4753,7 +4844,7 @@
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rf()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->re()J
 
     move-result-wide v10
 
@@ -4763,14 +4854,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_2
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->re()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rd()I
 
     move-result v6
 
@@ -4780,14 +4873,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_3
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rd()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rc()J
 
     move-result-wide v10
 
@@ -4797,14 +4892,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_4
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rc()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rb()I
 
     move-result v6
 
@@ -4814,10 +4911,12 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_5
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rb()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ra()I
 
     move-result v8
 
@@ -4833,17 +4932,17 @@
 
     if-eqz v10, :cond_e
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_e
     invoke-static {v5, v8, v3, v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(IILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gf;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    goto/16 :goto_5
+    goto/16 :goto_0
 
     :cond_f
-    :goto_8
+    :goto_6
     and-int/2addr v6, v9
 
     int-to-long v9, v6
@@ -4854,14 +4953,16 @@
 
     invoke-static {p1, v9, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_6
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ra()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()I
 
     move-result v6
 
@@ -4871,20 +4972,24 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_7
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v6
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_8
     invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -4915,7 +5020,7 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    goto :goto_7
 
     :cond_10
     and-int/2addr v6, v9
@@ -4934,19 +5039,24 @@
 
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
-    goto/16 :goto_7
+    :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_9
     invoke-direct {p0, p1, v6, p2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/firebase-perf/fn;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_a
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qX()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qW()Z
 
     move-result v6
 
@@ -4956,14 +5066,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_b
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qW()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qV()I
 
     move-result v6
 
@@ -4973,14 +5085,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_c
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qU()J
 
     move-result-wide v10
 
@@ -4990,14 +5104,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_d
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qU()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qT()I
 
     move-result v6
 
@@ -5007,13 +5123,34 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_e
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qR()J
+
+    move-result-wide v10
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v6
+
+    invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
+
+    :pswitch_f
+    and-int/2addr v6, v9
+
+    int-to-long v8, v6
+
     invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qS()J
 
     move-result-wide v10
@@ -5024,24 +5161,9 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
 
-    :pswitch_f
-    and-int/2addr v6, v9
-
-    int-to-long v8, v6
-
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qT()J
-
-    move-result-wide v10
-
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v6
-
-    invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
-
-    goto/16 :goto_7
+    goto/16 :goto_0
 
     :pswitch_10
     and-int/2addr v6, v9
@@ -5058,7 +5180,9 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_11
     and-int/2addr v6, v9
@@ -5075,7 +5199,9 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_12
     invoke-direct {p0, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->dl(I)Ljava/lang/Object;
@@ -5098,13 +5224,13 @@
 
     iget-object v8, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQb:Lcom/google/android/gms/internal/firebase-perf/es;
 
-    invoke-interface {v8}, Lcom/google/android/gms/internal/firebase-perf/es;->sw()Ljava/lang/Object;
+    invoke-interface {v8}, Lcom/google/android/gms/internal/firebase-perf/es;->sv()Ljava/lang/Object;
 
     move-result-object v8
 
     invoke-static {p1, v6, v7, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_11
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQb:Lcom/google/android/gms/internal/firebase-perf/es;
@@ -5117,7 +5243,7 @@
 
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQb:Lcom/google/android/gms/internal/firebase-perf/es;
 
-    invoke-interface {v9}, Lcom/google/android/gms/internal/firebase-perf/es;->sw()Ljava/lang/Object;
+    invoke-interface {v9}, Lcom/google/android/gms/internal/firebase-perf/es;->sv()Ljava/lang/Object;
 
     move-result-object v9
 
@@ -5130,7 +5256,7 @@
     move-object v8, v9
 
     :cond_12
-    :goto_9
+    :goto_8
     iget-object v6, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQb:Lcom/google/android/gms/internal/firebase-perf/es;
 
     invoke-interface {v6, v8}, Lcom/google/android/gms/internal/firebase-perf/es;->ax(Ljava/lang/Object;)Ljava/util/Map;
@@ -5177,7 +5303,6 @@
 
     move-result-object v5
 
-    :goto_a
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->N(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5193,7 +5318,6 @@
 
     move-result-object v5
 
-    :goto_b
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->M(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5209,7 +5333,6 @@
 
     move-result-object v5
 
-    :goto_c
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->L(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5225,7 +5348,6 @@
 
     move-result-object v5
 
-    :goto_d
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->K(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5247,12 +5369,11 @@
 
     move-result-object v7
 
-    :goto_e
     invoke-static {v5, v6, v7, v3, v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/du;Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gf;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    goto/16 :goto_5
+    goto/16 :goto_0
 
     :pswitch_19
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5265,7 +5386,6 @@
 
     move-result-object v5
 
-    :goto_f
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->I(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5281,7 +5401,6 @@
 
     move-result-object v5
 
-    :goto_10
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->F(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5297,7 +5416,6 @@
 
     move-result-object v5
 
-    :goto_11
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->E(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5313,7 +5431,6 @@
 
     move-result-object v5
 
-    :goto_12
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->D(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5329,7 +5446,6 @@
 
     move-result-object v5
 
-    :goto_13
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->C(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5345,7 +5461,6 @@
 
     move-result-object v5
 
-    :goto_14
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->A(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5361,7 +5476,6 @@
 
     move-result-object v5
 
-    :goto_15
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->B(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5377,7 +5491,6 @@
 
     move-result-object v5
 
-    :goto_16
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->z(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5393,7 +5506,6 @@
 
     move-result-object v5
 
-    :goto_17
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->y(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5409,7 +5521,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_a
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->N(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_23
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5422,7 +5536,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_b
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->M(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_24
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5435,7 +5551,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_c
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->L(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_25
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5448,7 +5566,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_d
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->K(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_26
     iget-object v8, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5467,7 +5587,11 @@
 
     move-result-object v7
 
-    goto/16 :goto_e
+    invoke-static {v5, v6, v7, v3, v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/du;Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gf;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    goto/16 :goto_0
 
     :pswitch_27
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5480,7 +5604,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_f
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->I(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_28
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5563,7 +5689,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_10
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->F(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2c
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5576,7 +5704,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_11
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->E(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2d
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5589,7 +5719,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_12
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->D(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2e
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5602,7 +5734,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_13
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->C(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2f
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5615,7 +5749,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_14
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->A(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_30
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5628,7 +5764,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_15
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->B(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_31
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5641,7 +5779,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_16
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->z(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_32
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
@@ -5654,7 +5794,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_17
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fn;->y(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_33
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -5683,7 +5825,6 @@
 
     move-result-object v7
 
-    :goto_18
     invoke-static {p1, v5, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     goto/16 :goto_0
@@ -5703,7 +5844,6 @@
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :goto_19
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
     goto/16 :goto_0
@@ -5713,55 +5853,63 @@
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rf()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->re()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_35
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->re()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rd()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_36
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rd()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rc()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_37
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rc()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rb()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_38
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rb()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ra()I
 
     move-result v8
 
@@ -5769,55 +5917,71 @@
 
     move-result-object v10
 
-    if-eqz v10, :cond_15
+    if-eqz v10, :cond_16
 
     invoke-interface {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/du;->cD(I)Z
 
     move-result v10
 
-    if-eqz v10, :cond_e
+    if-eqz v10, :cond_15
+
+    goto :goto_9
 
     :cond_15
+    invoke-static {v5, v8, v3, v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(IILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gf;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    goto/16 :goto_0
+
+    :cond_16
+    :goto_9
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_39
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ra()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3a
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3b
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v5
 
-    if-eqz v5, :cond_16
+    if-eqz v5, :cond_17
 
     and-int v5, v6, v9
 
@@ -5839,9 +6003,11 @@
 
     move-result-object v7
 
-    goto/16 :goto_18
+    invoke-static {p1, v5, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :cond_16
+    goto/16 :goto_0
+
+    :cond_17
     and-int v5, v6, v9
 
     int-to-long v5, v5
@@ -5856,90 +6022,106 @@
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3c
     invoke-direct {p0, p1, v6, p2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/firebase-perf/fn;)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3d
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qX()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qW()Z
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JZ)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3e
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qW()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qV()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3f
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qU()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_40
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qU()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qT()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_41
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qR()J
+
+    move-result-wide v8
+
+    invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
+
+    :pswitch_42
+    and-int v5, v6, v9
+
+    int-to-long v5, v5
+
     invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qS()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
-    :pswitch_42
-    and-int v5, v6, v9
-
-    int-to-long v5, v5
-
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qT()J
-
-    move-result-wide v8
-
-    invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
-
-    goto/16 :goto_19
+    goto/16 :goto_0
 
     :pswitch_43
     and-int v5, v6, v9
@@ -5952,7 +6134,9 @@
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JF)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_44
     and-int v5, v6, v9
@@ -5965,12 +6149,12 @@
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JD)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
-    :goto_1a
-    move-object v3, v5
+    goto/16 :goto_0
 
-    :cond_17
+    :cond_18
+    :goto_a
     invoke-virtual {v0, v3, p2}, Lcom/google/android/gms/internal/firebase-perf/gf;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fn;)Z
 
     move-result v5
@@ -5982,10 +6166,10 @@
 
     iget p2, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPV:I
 
-    :goto_1b
+    :goto_b
     iget p3, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPW:I
 
-    if-ge p2, p3, :cond_18
+    if-ge p2, p3, :cond_19
 
     iget-object p3, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPU:[I
 
@@ -5997,27 +6181,25 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    goto :goto_1b
+    goto :goto_b
 
-    :cond_18
-    if-eqz v3, :cond_19
+    :cond_19
+    if-eqz v3, :cond_1a
 
     invoke-virtual {v0, p1, v3}, Lcom/google/android/gms/internal/firebase-perf/gf;->p(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_19
+    :cond_1a
     return-void
 
     :catch_0
-    if-nez v3, :cond_1a
+    if-nez v3, :cond_1b
 
     :try_start_4
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/firebase-perf/gf;->aG(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    move-object v3, v5
-
-    :cond_1a
+    :cond_1b
     invoke-virtual {v0, v3, p2}, Lcom/google/android/gms/internal/firebase-perf/gf;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fn;)Z
 
     move-result v5
@@ -6028,10 +6210,10 @@
 
     iget p2, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPV:I
 
-    :goto_1c
+    :goto_c
     iget p3, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPW:I
 
-    if-ge p2, p3, :cond_1b
+    if-ge p2, p3, :cond_1c
 
     iget-object p3, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPU:[I
 
@@ -6043,14 +6225,14 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    goto :goto_1c
+    goto :goto_c
 
-    :cond_1b
-    if-eqz v3, :cond_1c
+    :cond_1c
+    if-eqz v3, :cond_1d
 
     invoke-virtual {v0, p1, v3}, Lcom/google/android/gms/internal/firebase-perf/gf;->p(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_1c
+    :cond_1d
     return-void
 
     :catchall_0
@@ -6058,10 +6240,10 @@
 
     iget p3, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPV:I
 
-    :goto_1d
+    :goto_d
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPW:I
 
-    if-ge p3, v1, :cond_1d
+    if-ge p3, v1, :cond_1e
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPU:[I
 
@@ -6073,24 +6255,24 @@
 
     add-int/lit8 p3, p3, 0x1
 
-    goto :goto_1d
+    goto :goto_d
 
-    :cond_1d
-    if-eqz v3, :cond_1e
+    :cond_1e
+    if-eqz v3, :cond_1f
 
     invoke-virtual {v0, p1, v3}, Lcom/google/android/gms/internal/firebase-perf/gf;->p(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_1e
+    :cond_1f
     throw p2
 
-    :cond_1f
+    :cond_20
     new-instance p1, Ljava/lang/NullPointerException;
 
     invoke-direct {p1}, Ljava/lang/NullPointerException;-><init>()V
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -6182,7 +6364,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/gz;->rx()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/gz;->rw()I
 
     move-result v0
 
@@ -6230,7 +6412,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/util/Set;
 
     move-result-object v0
 
@@ -6247,7 +6429,7 @@
     :cond_0
     iget-object v0, v0, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/util/Set;
 
     move-result-object v0
 
@@ -6328,7 +6510,7 @@
 
     packed-switch v10, :pswitch_data_0
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_0
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6337,6 +6519,20 @@
 
     if-eqz v10, :cond_4
 
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-direct {p0, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v10
+
+    invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+
     goto/16 :goto_4
 
     :pswitch_1
@@ -6354,7 +6550,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_5
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_2
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6371,7 +6569,9 @@
 
     move-result v8
 
-    goto/16 :goto_6
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
+
+    goto/16 :goto_4
 
     :pswitch_3
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6388,7 +6588,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_7
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_4
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6405,7 +6607,9 @@
 
     move-result v8
 
-    goto/16 :goto_8
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
+
+    goto/16 :goto_4
 
     :pswitch_5
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6422,7 +6626,9 @@
 
     move-result v8
 
-    goto/16 :goto_9
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
+
+    goto/16 :goto_4
 
     :pswitch_6
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6439,7 +6645,9 @@
 
     move-result v8
 
-    goto/16 :goto_a
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
+
+    goto/16 :goto_4
 
     :pswitch_7
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6448,7 +6656,19 @@
 
     if-eqz v10, :cond_4
 
-    goto/16 :goto_b
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lcom/google/android/gms/internal/firebase-perf/cg;
+
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
+
+    goto/16 :goto_4
 
     :pswitch_8
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6457,7 +6677,21 @@
 
     if-eqz v10, :cond_4
 
-    goto/16 :goto_c
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-direct {p0, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v10
+
+    invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+
+    goto/16 :goto_4
 
     :pswitch_9
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6466,7 +6700,17 @@
 
     if-eqz v10, :cond_4
 
-    goto/16 :goto_d
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
+
+    goto/16 :goto_4
 
     :pswitch_a
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6483,7 +6727,9 @@
 
     move-result v8
 
-    goto/16 :goto_e
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
+
+    goto/16 :goto_4
 
     :pswitch_b
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6500,7 +6746,9 @@
 
     move-result v8
 
-    goto/16 :goto_f
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
+
+    goto/16 :goto_4
 
     :pswitch_c
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6517,7 +6765,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_10
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_d
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6534,7 +6784,9 @@
 
     move-result v8
 
-    goto/16 :goto_11
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
+
+    goto/16 :goto_4
 
     :pswitch_e
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6551,7 +6803,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_12
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_f
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6568,7 +6822,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_13
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_10
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6585,7 +6841,9 @@
 
     move-result v8
 
-    goto/16 :goto_14
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
+
+    goto/16 :goto_4
 
     :pswitch_11
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -6602,7 +6860,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_15
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
+
+    goto/16 :goto_4
 
     :pswitch_12
     and-int/2addr v8, v6
@@ -6615,7 +6875,7 @@
 
     invoke-direct {p0, p2, v9, v8, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/gz;ILjava/lang/Object;I)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_13
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6638,7 +6898,7 @@
 
     invoke-static {v9, v8, p2, v10}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_14
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6657,7 +6917,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_15
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6676,7 +6936,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_16
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6695,7 +6955,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_17
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6714,7 +6974,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_18
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6733,7 +6993,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_19
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6752,7 +7012,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1a
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6771,7 +7031,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1b
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6790,7 +7050,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1c
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6809,7 +7069,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1d
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6828,7 +7088,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1e
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6847,7 +7107,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1f
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6866,7 +7126,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_20
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6885,7 +7145,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_21
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6904,7 +7164,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_22
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6923,7 +7183,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_23
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6942,7 +7202,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_24
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6961,7 +7221,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_25
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6980,7 +7240,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_26
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -6999,7 +7259,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_27
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7018,7 +7278,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_28
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7037,7 +7297,7 @@
 
     invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_29
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7060,7 +7320,7 @@
 
     invoke-static {v9, v8, p2, v10}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2a
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7079,7 +7339,7 @@
 
     invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2b
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7098,7 +7358,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2c
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7117,7 +7377,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2d
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7136,7 +7396,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2e
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7155,7 +7415,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2f
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7174,7 +7434,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_30
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7193,7 +7453,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_31
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7212,7 +7472,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_32
     iget-object v9, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -7231,7 +7491,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_33
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7240,7 +7500,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_4
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7255,7 +7514,7 @@
 
     invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_34
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7272,10 +7531,9 @@
 
     move-result-wide v10
 
-    :goto_5
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_35
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7292,10 +7550,9 @@
 
     move-result v8
 
-    :goto_6
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_36
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7312,10 +7569,9 @@
 
     move-result-wide v10
 
-    :goto_7
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_37
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7332,10 +7588,9 @@
 
     move-result v8
 
-    :goto_8
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_38
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7352,10 +7607,9 @@
 
     move-result v8
 
-    :goto_9
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_39
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7372,10 +7626,9 @@
 
     move-result v8
 
-    :goto_a
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3a
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7384,7 +7637,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_b
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7397,7 +7649,7 @@
 
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3b
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7406,7 +7658,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_c
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7421,7 +7672,7 @@
 
     invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3c
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7430,7 +7681,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_d
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7441,7 +7691,7 @@
 
     invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3d
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7458,10 +7708,9 @@
 
     move-result v8
 
-    :goto_e
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3e
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7478,10 +7727,9 @@
 
     move-result v8
 
-    :goto_f
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_3f
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7498,10 +7746,9 @@
 
     move-result-wide v10
 
-    :goto_10
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_40
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7518,10 +7765,9 @@
 
     move-result v8
 
-    :goto_11
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_41
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7538,10 +7784,9 @@
 
     move-result-wide v10
 
-    :goto_12
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_42
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7558,10 +7803,9 @@
 
     move-result-wide v10
 
-    :goto_13
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_43
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7578,10 +7822,9 @@
 
     move-result v8
 
-    :goto_14
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_44
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -7598,17 +7841,16 @@
 
     move-result-wide v10
 
-    :goto_15
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
 
     :cond_4
-    :goto_16
+    :goto_4
     add-int/lit8 v7, v7, -0x3
 
     goto/16 :goto_2
 
     :cond_5
-    :goto_17
+    :goto_5
     if-eqz v1, :cond_7
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
@@ -7629,12 +7871,12 @@
 
     move-object v1, p1
 
-    goto :goto_17
+    goto :goto_5
 
     :cond_6
     move-object v1, v3
 
-    goto :goto_17
+    goto :goto_5
 
     :cond_7
     return-void
@@ -7672,14 +7914,14 @@
 
     check-cast v1, Ljava/util/Map$Entry;
 
-    goto :goto_18
+    goto :goto_6
 
     :cond_9
     move-object v0, v3
 
     move-object v1, v0
 
-    :goto_18
+    :goto_6
     iget-object v7, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
     array-length v7, v7
@@ -7688,7 +7930,7 @@
 
     const/4 v1, 0x0
 
-    :goto_19
+    :goto_7
     if-ge v1, v7, :cond_d
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->dn(I)I
@@ -7699,7 +7941,7 @@
 
     aget v10, v10, v1
 
-    :goto_1a
+    :goto_8
     if-eqz v8, :cond_b
 
     iget-object v11, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
@@ -7726,12 +7968,12 @@
 
     check-cast v8, Ljava/util/Map$Entry;
 
-    goto :goto_1a
+    goto :goto_8
 
     :cond_a
     move-object v8, v3
 
-    goto :goto_1a
+    goto :goto_8
 
     :cond_b
     and-int v11, v9, v2
@@ -7740,7 +7982,7 @@
 
     packed-switch v11, :pswitch_data_1
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_45
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7749,7 +7991,21 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_1b
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-direct {p0, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v11
+
+    invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+
+    goto/16 :goto_9
 
     :pswitch_46
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7766,7 +8022,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_1c
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_47
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7783,7 +8041,9 @@
 
     move-result v9
 
-    goto/16 :goto_1d
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
+
+    goto/16 :goto_9
 
     :pswitch_48
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7800,7 +8060,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_1e
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_49
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7817,7 +8079,9 @@
 
     move-result v9
 
-    goto/16 :goto_1f
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
+
+    goto/16 :goto_9
 
     :pswitch_4a
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7834,7 +8098,9 @@
 
     move-result v9
 
-    goto/16 :goto_20
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
+
+    goto/16 :goto_9
 
     :pswitch_4b
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7851,7 +8117,9 @@
 
     move-result v9
 
-    goto/16 :goto_21
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
+
+    goto/16 :goto_9
 
     :pswitch_4c
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7860,7 +8128,19 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_22
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Lcom/google/android/gms/internal/firebase-perf/cg;
+
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
+
+    goto/16 :goto_9
 
     :pswitch_4d
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7869,7 +8149,21 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_23
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-direct {p0, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v11
+
+    invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
+
+    goto/16 :goto_9
 
     :pswitch_4e
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7878,7 +8172,17 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_24
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
+
+    goto/16 :goto_9
 
     :pswitch_4f
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7895,7 +8199,9 @@
 
     move-result v9
 
-    goto/16 :goto_25
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
+
+    goto/16 :goto_9
 
     :pswitch_50
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7912,7 +8218,9 @@
 
     move-result v9
 
-    goto/16 :goto_26
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
+
+    goto/16 :goto_9
 
     :pswitch_51
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7929,7 +8237,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_27
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_52
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7946,7 +8256,9 @@
 
     move-result v9
 
-    goto/16 :goto_28
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
+
+    goto/16 :goto_9
 
     :pswitch_53
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7963,7 +8275,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_29
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_54
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7980,7 +8294,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_2a
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_55
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -7997,7 +8313,9 @@
 
     move-result v9
 
-    goto/16 :goto_2b
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
+
+    goto/16 :goto_9
 
     :pswitch_56
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
@@ -8014,7 +8332,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_2c
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
+
+    goto/16 :goto_9
 
     :pswitch_57
     and-int/2addr v9, v6
@@ -8027,7 +8347,7 @@
 
     invoke-direct {p0, p2, v10, v9, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/gz;ILjava/lang/Object;I)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_58
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8050,7 +8370,7 @@
 
     invoke-static {v10, v9, p2, v11}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_59
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8069,7 +8389,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5a
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8088,7 +8408,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5b
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8107,7 +8427,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5c
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8126,7 +8446,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5d
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8145,7 +8465,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5e
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8164,7 +8484,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5f
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8183,7 +8503,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_60
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8202,7 +8522,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_61
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8221,7 +8541,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_62
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8240,7 +8560,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_63
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8259,7 +8579,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_64
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8278,7 +8598,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_65
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8297,7 +8617,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_66
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8316,7 +8636,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_67
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8335,7 +8655,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_68
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8354,7 +8674,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_69
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8373,7 +8693,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6a
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8392,7 +8712,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6b
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8411,7 +8731,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6c
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8430,7 +8750,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6d
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8449,7 +8769,7 @@
 
     invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6e
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8472,7 +8792,7 @@
 
     invoke-static {v10, v9, p2, v11}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6f
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8491,7 +8811,7 @@
 
     invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_70
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8510,7 +8830,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_71
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8529,7 +8849,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_72
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8548,7 +8868,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_73
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8567,7 +8887,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_74
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8586,7 +8906,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_75
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8605,7 +8925,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_76
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8624,7 +8944,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->b(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_77
     iget-object v10, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
@@ -8643,7 +8963,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/gz;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_78
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8652,7 +8972,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_1b
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8667,7 +8986,7 @@
 
     invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_79
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8684,10 +9003,9 @@
 
     move-result-wide v11
 
-    :goto_1c
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IJ)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7a
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8704,10 +9022,9 @@
 
     move-result v9
 
-    :goto_1d
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->P(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7b
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8724,10 +9041,9 @@
 
     move-result-wide v11
 
-    :goto_1e
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->j(IJ)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7c
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8744,10 +9060,9 @@
 
     move-result v9
 
-    :goto_1f
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->T(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7d
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8764,10 +9079,9 @@
 
     move-result v9
 
-    :goto_20
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->U(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7e
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8784,10 +9098,9 @@
 
     move-result v9
 
-    :goto_21
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->O(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7f
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8796,7 +9109,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_22
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8809,7 +9121,7 @@
 
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILcom/google/android/gms/internal/firebase-perf/cg;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_80
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8818,7 +9130,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_23
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8833,7 +9144,7 @@
 
     invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_81
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8842,7 +9153,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_24
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8853,7 +9163,7 @@
 
     invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_82
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8870,10 +9180,9 @@
 
     move-result v9
 
-    :goto_25
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(IZ)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_83
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8890,10 +9199,9 @@
 
     move-result v9
 
-    :goto_26
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->Q(II)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_84
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8910,10 +9218,9 @@
 
     move-result-wide v11
 
-    :goto_27
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->e(IJ)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_85
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8930,10 +9237,9 @@
 
     move-result v9
 
-    :goto_28
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->N(II)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_86
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8950,10 +9256,9 @@
 
     move-result-wide v11
 
-    :goto_29
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->c(IJ)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_87
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8970,10 +9275,9 @@
 
     move-result-wide v11
 
-    :goto_2a
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->i(IJ)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_88
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -8990,10 +9294,9 @@
 
     move-result v9
 
-    :goto_2b
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/firebase-perf/gz;->b(IF)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_89
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -9010,17 +9313,16 @@
 
     move-result-wide v11
 
-    :goto_2c
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gz;->a(ID)V
 
     :cond_c
-    :goto_2d
+    :goto_9
     add-int/lit8 v1, v1, 0x3
 
-    goto/16 :goto_19
+    goto/16 :goto_7
 
     :cond_d
-    :goto_2e
+    :goto_a
     if-eqz v8, :cond_f
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
@@ -9041,12 +9343,12 @@
 
     move-object v8, v1
 
-    goto :goto_2e
+    goto :goto_a
 
     :cond_e
     move-object v8, v3
 
-    goto :goto_2e
+    goto :goto_a
 
     :cond_f
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPZ:Lcom/google/android/gms/internal/firebase-perf/gf;
@@ -9229,7 +9531,7 @@
 
     const/4 v5, 0x0
 
-    if-eqz v2, :cond_5
+    if-eqz v2, :cond_13
 
     sget-object v2, Lcom/google/android/gms/internal/firebase-perf/fc;->aPK:Lsun/misc/Unsafe;
 
@@ -9242,7 +9544,7 @@
 
     array-length v8, v8
 
-    if-ge v6, v8, :cond_4
+    if-ge v6, v8, :cond_12
 
     invoke-direct {v0, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->dn(I)I
 
@@ -9288,111 +9590,189 @@
     :goto_1
     packed-switch v9, :pswitch_data_0
 
-    goto/16 :goto_17
+    goto/16 :goto_2
 
     :pswitch_0
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_4
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lcom/google/android/gms/internal/firebase-perf/ex;
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v9
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_1
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
     move-result-wide v8
 
-    goto/16 :goto_5
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->h(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_2
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v8
 
-    goto/16 :goto_6
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->S(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_3
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_7
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bs(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_4
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_8
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cY(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_5
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v8
 
-    goto/16 :goto_9
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->K(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_6
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v8
 
-    goto/16 :goto_a
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->G(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_7
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_b
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lcom/google/android/gms/internal/firebase-perf/cg;
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_8
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_d
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v9
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_9
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -9400,93 +9780,160 @@
 
     instance-of v9, v8, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    if-eqz v9, :cond_2
+    if-eqz v9, :cond_1
 
-    goto/16 :goto_e
+    check-cast v8, Lcom/google/android/gms/internal/firebase-perf/cg;
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :cond_1
+    check-cast v8, Ljava/lang/String;
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(ILjava/lang/String;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_a
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_f
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bv(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_b
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_10
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cX(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_c
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_11
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->br(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_d
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v8
 
-    goto/16 :goto_12
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->R(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_e
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
     move-result-wide v8
 
-    goto/16 :goto_13
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->g(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_f
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
     move-result-wide v8
 
-    goto/16 :goto_14
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_10
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_15
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bt(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_11
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_16
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bu(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_12
     iget-object v8, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQb:Lcom/google/android/gms/internal/firebase-perf/es;
@@ -9503,7 +9950,9 @@
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_13
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
@@ -9518,7 +9967,9 @@
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_14
     invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -9531,11 +9982,30 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_2
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_2
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
 
     goto/16 :goto_2
 
@@ -9550,11 +10020,30 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_3
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_3
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
 
     goto/16 :goto_2
 
@@ -9569,11 +10058,30 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_4
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_4
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
 
     goto/16 :goto_2
 
@@ -9588,11 +10096,30 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_5
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_5
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
 
     goto/16 :goto_2
 
@@ -9607,11 +10134,30 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_6
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_6
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
 
     goto/16 :goto_2
 
@@ -9626,11 +10172,30 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_7
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_7
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
 
     goto/16 :goto_2
 
@@ -9645,11 +10210,30 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_8
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_8
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
 
     goto/16 :goto_2
 
@@ -9664,132 +10248,17 @@
 
     move-result v9
 
-    if-lez v9, :cond_3
+    if-lez v9, :cond_11
 
     iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v11, :cond_1
+    if-eqz v11, :cond_9
 
-    goto :goto_2
-
-    :pswitch_1c
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_1d
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->S(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_1e
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->P(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_1f
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->O(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_20
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_21
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v11, :cond_1
-
-    :goto_2
     int-to-long v11, v8
 
     invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    :cond_1
+    :cond_9
     invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
 
     move-result v8
@@ -9802,7 +10271,237 @@
 
     add-int/2addr v8, v9
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1c
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v11, :cond_a
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_a
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1d
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->S(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v11, :cond_b
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_b
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1e
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->P(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v11, :cond_c
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_c
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1f
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->O(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v11, :cond_d
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_d
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_20
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v11, :cond_e
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_e
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_21
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v11, :cond_f
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_f
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_22
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
@@ -9813,7 +10512,9 @@
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_23
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
@@ -9824,20 +10525,50 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_24
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
 
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_25
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_26
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_25
+    goto/16 :goto_2
+
+    :pswitch_27
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
@@ -9846,9 +10577,11 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_26
+    goto/16 :goto_2
+
+    :pswitch_28
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
@@ -9857,9 +10590,11 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_27
+    goto/16 :goto_2
+
+    :pswitch_29
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
@@ -9872,9 +10607,11 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_28
+    goto/16 :goto_2
+
+    :pswitch_2a
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
@@ -9883,9 +10620,11 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_29
+    goto/16 :goto_2
+
+    :pswitch_2b
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
@@ -9894,53 +10633,24 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_2a
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_2b
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
+    goto/16 :goto_2
 
     :pswitch_2c
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_2d
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_2e
+    goto/16 :goto_2
+
+    :pswitch_2d
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
 
     move-result-object v8
@@ -9949,19 +10659,82 @@
 
     move-result v8
 
-    :goto_3
     add-int/2addr v7, v8
 
-    goto/16 :goto_17
+    goto/16 :goto_2
+
+    :pswitch_2e
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_2f
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_30
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_31
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_32
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/fc;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_33
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_4
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v8
@@ -9976,137 +10749,144 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_30
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    :goto_5
-    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->h(IJ)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_31
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
-
-    move-result v8
-
-    :goto_6
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->S(II)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_32
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    :goto_7
-    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bs(I)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_33
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    :goto_8
-    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cY(I)I
-
-    move-result v8
-
-    goto :goto_3
+    goto/16 :goto_2
 
     :pswitch_34
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->h(IJ)I
 
     move-result v8
 
-    :goto_9
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->K(II)I
+    add-int/2addr v7, v8
 
-    move-result v8
-
-    goto :goto_3
+    goto/16 :goto_2
 
     :pswitch_35
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
     move-result v8
 
-    :goto_a
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->G(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->S(II)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_36
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_b
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v8
-
-    :goto_c
-    check-cast v8, Lcom/google/android/gms/internal/firebase-perf/cg;
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bs(I)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_37
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cY(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_38
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->K(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_39
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->G(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_3a
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lcom/google/android/gms/internal/firebase-perf/cg;
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_3b
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
 
-    :goto_d
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v8
@@ -10119,14 +10899,16 @@
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_38
+    goto/16 :goto_2
+
+    :pswitch_3c
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -10134,151 +10916,166 @@
 
     instance-of v9, v8, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    if-eqz v9, :cond_2
+    if-eqz v9, :cond_10
 
-    :goto_e
-    goto :goto_c
+    check-cast v8, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    :cond_2
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :cond_10
     check-cast v8, Ljava/lang/String;
 
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(ILjava/lang/String;)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_39
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    :goto_f
-    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bv(I)I
-
-    move-result v8
-
-    goto/16 :goto_3
-
-    :pswitch_3a
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    :goto_10
-    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cX(I)I
-
-    move-result v8
-
-    goto/16 :goto_3
-
-    :pswitch_3b
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    :goto_11
-    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->br(I)I
-
-    move-result v8
-
-    goto/16 :goto_3
-
-    :pswitch_3c
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
-
-    move-result v8
-
-    :goto_12
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->R(II)I
-
-    move-result v8
-
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :pswitch_3d
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    :goto_13
-    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->g(IJ)I
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bv(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto :goto_2
 
     :pswitch_3e
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    :goto_14
-    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(IJ)I
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->cX(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto :goto_2
 
     :pswitch_3f
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_15
-    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bt(I)I
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->br(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto :goto_2
 
     :pswitch_40
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/firebase-perf/cw;->R(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_41
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->g(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_42
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_43
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bt(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_44
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
 
-    :goto_16
     invoke-static {v10}, Lcom/google/android/gms/internal/firebase-perf/cw;->bu(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
 
-    :cond_3
-    :goto_17
+    :cond_11
+    :goto_2
     add-int/lit8 v6, v6, 0x3
 
     goto/16 :goto_0
 
-    :cond_4
+    :cond_12
     iget-object v2, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPZ:Lcom/google/android/gms/internal/firebase-perf/gf;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/gf;Ljava/lang/Object;)I
@@ -10289,7 +11086,7 @@
 
     return v7
 
-    :cond_5
+    :cond_13
     sget-object v2, Lcom/google/android/gms/internal/firebase-perf/fc;->aPK:Lsun/misc/Unsafe;
 
     const/4 v6, -0x1
@@ -10302,12 +11099,12 @@
 
     const/4 v9, 0x0
 
-    :goto_18
+    :goto_3
     iget-object v10, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
     array-length v10, v10
 
-    if-ge v6, v10, :cond_c
+    if-ge v6, v10, :cond_28
 
     invoke-direct {v0, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->dn(I)I
 
@@ -10315,31 +11112,29 @@
 
     iget-object v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
-    aget v11, v11, v6
+    aget v12, v11, v6
 
-    and-int v12, v10, v3
+    and-int v13, v10, v3
 
-    ushr-int/lit8 v12, v12, 0x14
+    ushr-int/lit8 v13, v13, 0x14
 
-    const/16 v13, 0x11
+    const/16 v14, 0x11
 
-    if-gt v12, v13, :cond_7
-
-    iget-object v13, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    if-gt v13, v14, :cond_15
 
     add-int/lit8 v14, v6, 0x2
 
-    aget v13, v13, v14
+    aget v11, v11, v14
 
-    and-int v14, v13, v4
+    and-int v14, v11, v4
 
-    ushr-int/lit8 v15, v13, 0x14
+    ushr-int/lit8 v15, v11, 0x14
 
     const/16 v16, 0x1
 
     shl-int v15, v16, v15
 
-    if-eq v14, v8, :cond_6
+    if-eq v14, v8, :cond_14
 
     int-to-long v8, v14
 
@@ -10347,161 +11142,240 @@
 
     move-result v9
 
-    goto :goto_19
+    goto :goto_4
 
-    :cond_6
+    :cond_14
     move v14, v8
 
-    :goto_19
+    :goto_4
     move v8, v14
 
-    goto :goto_1b
+    goto :goto_5
 
-    :cond_7
-    iget-boolean v13, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+    :cond_15
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v13, :cond_8
+    if-eqz v11, :cond_16
 
-    sget-object v13, Lcom/google/android/gms/internal/firebase-perf/dj;->aOc:Lcom/google/android/gms/internal/firebase-perf/dj;
+    sget-object v11, Lcom/google/android/gms/internal/firebase-perf/dj;->aOc:Lcom/google/android/gms/internal/firebase-perf/dj;
 
-    iget v13, v13, Lcom/google/android/gms/internal/firebase-perf/dj;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/firebase-perf/dj;->id:I
 
-    if-lt v12, v13, :cond_8
+    if-lt v13, v11, :cond_16
 
-    sget-object v13, Lcom/google/android/gms/internal/firebase-perf/dj;->aOp:Lcom/google/android/gms/internal/firebase-perf/dj;
+    sget-object v11, Lcom/google/android/gms/internal/firebase-perf/dj;->aOp:Lcom/google/android/gms/internal/firebase-perf/dj;
 
-    iget v13, v13, Lcom/google/android/gms/internal/firebase-perf/dj;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/firebase-perf/dj;->id:I
 
-    if-gt v12, v13, :cond_8
+    if-gt v13, v11, :cond_16
 
-    iget-object v13, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPL:[I
 
     add-int/lit8 v14, v6, 0x2
 
-    aget v13, v13, v14
+    aget v11, v11, v14
 
-    and-int/2addr v13, v4
+    and-int/2addr v11, v4
 
-    goto :goto_1a
-
-    :cond_8
-    const/4 v13, 0x0
-
-    :goto_1a
     const/4 v15, 0x0
 
-    :goto_1b
+    goto :goto_5
+
+    :cond_16
+    const/4 v11, 0x0
+
+    const/4 v15, 0x0
+
+    :goto_5
     and-int/2addr v10, v4
 
     int-to-long v3, v10
 
-    packed-switch v12, :pswitch_data_1
+    packed-switch v13, :pswitch_data_1
 
-    goto/16 :goto_31
+    goto/16 :goto_6
 
-    :pswitch_41
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    :pswitch_45
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    goto/16 :goto_1e
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :pswitch_42
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result-object v3
+
+    check-cast v3, Lcom/google/android/gms/internal/firebase-perf/ex;
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v4
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_46
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto/16 :goto_1f
-
-    :pswitch_43
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->h(IJ)I
 
     move-result v3
 
-    goto/16 :goto_20
+    add-int/2addr v7, v3
 
-    :pswitch_44
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    goto/16 :goto_21
-
-    :pswitch_45
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    goto/16 :goto_22
-
-    :pswitch_46
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
-
-    move-result v3
-
-    goto/16 :goto_23
+    goto/16 :goto_6
 
     :pswitch_47
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto/16 :goto_24
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->S(II)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_48
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    move-result v10
+    move-result v3
 
-    if-eqz v10, :cond_b
+    if-eqz v3, :cond_27
 
-    goto/16 :goto_25
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bs(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_49
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
-    move-result v10
+    move-result v3
 
-    if-eqz v10, :cond_b
+    if-eqz v3, :cond_27
 
-    goto/16 :goto_27
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cY(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_4a
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->K(II)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4b
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->G(II)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4c
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/google/android/gms/internal/firebase-perf/cg;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4d
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
+
+    move-result-object v4
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4e
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -10509,95 +11383,162 @@
 
     instance-of v4, v3, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    if-eqz v4, :cond_a
+    if-eqz v4, :cond_17
 
-    goto/16 :goto_28
+    check-cast v3, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    :pswitch_4b
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    add-int/2addr v7, v3
 
-    goto/16 :goto_29
+    goto/16 :goto_6
 
-    :pswitch_4c
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    :cond_17
+    check-cast v3, Ljava/lang/String;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(ILjava/lang/String;)I
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    add-int/2addr v7, v3
 
-    goto/16 :goto_2a
+    goto/16 :goto_6
 
-    :pswitch_4d
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    :pswitch_4f
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    goto/16 :goto_2b
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bv(I)I
 
-    :pswitch_4e
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_50
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cX(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_51
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->br(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_52
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto/16 :goto_2c
-
-    :pswitch_4f
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
-
-    move-result-wide v3
-
-    goto/16 :goto_2d
-
-    :pswitch_50
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
-
-    move-result-wide v3
-
-    goto/16 :goto_2e
-
-    :pswitch_51
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->R(II)I
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    add-int/2addr v7, v3
 
-    goto/16 :goto_2f
-
-    :pswitch_52
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    goto/16 :goto_30
+    goto/16 :goto_6
 
     :pswitch_53
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->g(IJ)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_54
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(IJ)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_55
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bt(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_56
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bu(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_57
     iget-object v10, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQb:Lcom/google/android/gms/internal/firebase-perf/es;
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10608,13 +11549,15 @@
 
     move-result-object v4
 
-    invoke-interface {v10, v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/es;->a(ILjava/lang/Object;Ljava/lang/Object;)I
+    invoke-interface {v10, v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/es;->a(ILjava/lang/Object;Ljava/lang/Object;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_54
+    goto/16 :goto_6
+
+    :pswitch_58
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -10625,13 +11568,15 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/fo;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_55
+    goto/16 :goto_6
+
+    :pswitch_59
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -10642,266 +11587,18 @@
 
     move-result v3
 
-    if-lez v3, :cond_b
+    if-lez v3, :cond_27
 
     iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
 
-    if-eqz v4, :cond_9
+    if-eqz v4, :cond_18
 
-    goto/16 :goto_1c
+    int-to-long v10, v11
 
-    :pswitch_56
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->U(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_57
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_58
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_59
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->R(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_5a
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->T(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_5b
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->X(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_5c
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_5d
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_5e
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->S(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_5f
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->P(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_60
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->O(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_61
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_62
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
-
-    if-eqz v4, :cond_9
-
-    :goto_1c
-    int-to-long v12, v13
-
-    invoke-virtual {v2, v1, v12, v13, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
-
-    :cond_9
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+    :cond_18
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
 
     move-result v4
 
@@ -10915,7 +11612,349 @@
 
     add-int/2addr v7, v4
 
-    goto/16 :goto_31
+    goto/16 :goto_6
+
+    :pswitch_5a
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->U(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_19
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_19
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5b
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_1a
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1a
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5c
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_1b
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1b
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5d
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->R(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_1c
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1c
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5e
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->T(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_1d
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1d
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5f
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->X(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_1e
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1e
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_60
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_1f
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1f
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_61
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_20
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_20
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_62
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->S(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_21
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_21
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_63
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10924,11 +11963,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->P(Ljava/util/List;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_22
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_22
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_64
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10937,11 +12001,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->O(Ljava/util/List;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_23
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_23
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_65
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10950,11 +12039,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->V(Ljava/util/List;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_24
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_24
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_66
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10963,11 +12077,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->W(Ljava/util/List;)I
 
     move-result v3
 
-    goto :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPT:Z
+
+    if-eqz v4, :cond_25
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_25
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cZ(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->db(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_67
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10976,11 +12115,13 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->e(ILjava/util/List;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_68
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10989,93 +12130,107 @@
 
     check-cast v3, Ljava/util/List;
 
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->i(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_69
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6a
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6b
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->f(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6c
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->h(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6d
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6e
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
     invoke-direct {v0, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->dk(I)Lcom/google/android/gms/internal/firebase-perf/fo;
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;Lcom/google/android/gms/internal/firebase-perf/fo;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_69
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6a
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6b
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6c
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6d
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6e
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
+    goto/16 :goto_6
 
     :pswitch_6f
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11084,21 +12239,139 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->m(ILjava/util/List;)I
 
     move-result v3
 
-    :goto_1d
     add-int/2addr v7, v3
 
-    goto/16 :goto_31
+    goto/16 :goto_6
 
     :pswitch_70
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->l(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_71
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_72
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_73
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->g(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_74
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->d(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_75
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_76
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->j(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_77
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->k(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_78
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    :goto_1e
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -11109,125 +12382,132 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/ex;Lcom/google/android/gms/internal/firebase-perf/fo;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_71
+    goto/16 :goto_6
+
+    :pswitch_79
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    :goto_1f
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->h(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->h(IJ)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_72
+    goto/16 :goto_6
+
+    :pswitch_7a
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_20
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->S(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->S(II)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_73
+    goto/16 :goto_6
+
+    :pswitch_7b
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_21
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->bs(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bs(I)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_74
+    goto/16 :goto_6
+
+    :pswitch_7c
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_22
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->cY(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cY(I)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_75
+    goto/16 :goto_6
+
+    :pswitch_7d
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_23
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->K(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->K(II)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_76
+    goto/16 :goto_6
+
+    :pswitch_7e
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_24
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->G(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->G(II)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_77
+    goto/16 :goto_6
+
+    :pswitch_7f
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    :goto_25
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
 
-    :goto_26
     check-cast v3, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_78
+    goto/16 :goto_6
+
+    :pswitch_80
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    :goto_27
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -11236,16 +12516,18 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/fo;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_79
+    goto/16 :goto_6
+
+    :pswitch_81
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -11253,139 +12535,154 @@
 
     instance-of v4, v3, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    if-eqz v4, :cond_a
+    if-eqz v4, :cond_26
 
-    :goto_28
-    goto :goto_26
+    check-cast v3, Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    :cond_a
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->c(ILcom/google/android/gms/internal/firebase-perf/cg;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto :goto_6
+
+    :cond_26
     check-cast v3, Ljava/lang/String;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(ILjava/lang/String;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(ILjava/lang/String;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7a
+    goto :goto_6
+
+    :pswitch_82
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_29
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->bv(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bv(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7b
+    goto :goto_6
+
+    :pswitch_83
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_2a
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->cX(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->cX(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7c
+    goto :goto_6
+
+    :pswitch_84
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_2b
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->br(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->br(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7d
+    goto :goto_6
+
+    :pswitch_85
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_2c
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->R(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->R(II)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7e
+    goto :goto_6
+
+    :pswitch_86
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    :goto_2d
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->g(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->g(IJ)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7f
+    goto :goto_6
+
+    :pswitch_87
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    :goto_2e
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/cw;->f(IJ)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_80
+    goto :goto_6
+
+    :pswitch_88
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_2f
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->bt(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bt(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_81
+    goto :goto_6
+
+    :pswitch_89
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_30
-    invoke-static {v11}, Lcom/google/android/gms/internal/firebase-perf/cw;->bu(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/firebase-perf/cw;->bu(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :cond_b
-    :goto_31
+    :cond_27
+    :goto_6
     add-int/lit8 v6, v6, 0x3
 
     const/high16 v3, 0xff00000
 
     const v4, 0xfffff
 
-    goto/16 :goto_18
+    goto/16 :goto_3
 
-    :cond_c
+    :cond_28
     iget-object v2, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPZ:Lcom/google/android/gms/internal/firebase-perf/gf;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Lcom/google/android/gms/internal/firebase-perf/gf;Ljava/lang/Object;)I
@@ -11396,7 +12693,7 @@
 
     iget-boolean v2, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPQ:Z
 
-    if-eqz v2, :cond_f
+    if-eqz v2, :cond_2b
 
     iget-object v2, v0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
 
@@ -11406,14 +12703,14 @@
 
     const/4 v2, 0x0
 
-    :goto_32
+    :goto_7
     iget-object v3, v1, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v3
 
-    if-ge v5, v3, :cond_d
+    if-ge v5, v3, :cond_29
 
     iget-object v3, v1, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
@@ -11439,12 +12736,12 @@
 
     add-int/lit8 v5, v5, 0x1
 
-    goto :goto_32
+    goto :goto_7
 
-    :cond_d
+    :cond_29
     iget-object v1, v1, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -11452,12 +12749,12 @@
 
     move-result-object v1
 
-    :goto_33
+    :goto_8
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
 
-    if-eqz v3, :cond_e
+    if-eqz v3, :cond_2a
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -11481,16 +12778,22 @@
 
     add-int/2addr v2, v3
 
-    goto :goto_33
+    goto :goto_8
 
-    :cond_e
+    :cond_2a
     add-int/2addr v7, v2
 
-    :cond_f
+    :cond_2b
     return v7
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_44
+        :pswitch_43
+        :pswitch_42
+        :pswitch_41
         :pswitch_40
         :pswitch_3f
         :pswitch_3e
@@ -11514,16 +12817,12 @@
         :pswitch_2c
         :pswitch_2b
         :pswitch_2a
-        :pswitch_2e
-        :pswitch_2d
         :pswitch_29
         :pswitch_28
         :pswitch_27
         :pswitch_26
         :pswitch_25
         :pswitch_24
-        :pswitch_2d
-        :pswitch_2e
         :pswitch_23
         :pswitch_22
         :pswitch_21
@@ -11564,6 +12863,14 @@
 
     :pswitch_data_1
     .packed-switch 0x0
+        :pswitch_89
+        :pswitch_88
+        :pswitch_87
+        :pswitch_86
+        :pswitch_85
+        :pswitch_84
+        :pswitch_83
+        :pswitch_82
         :pswitch_81
         :pswitch_80
         :pswitch_7f
@@ -11587,16 +12894,12 @@
         :pswitch_6d
         :pswitch_6c
         :pswitch_6b
-        :pswitch_6f
-        :pswitch_6e
         :pswitch_6a
         :pswitch_69
         :pswitch_68
         :pswitch_67
         :pswitch_66
         :pswitch_65
-        :pswitch_6e
-        :pswitch_6f
         :pswitch_64
         :pswitch_63
         :pswitch_62
@@ -11629,10 +12932,6 @@
         :pswitch_47
         :pswitch_46
         :pswitch_45
-        :pswitch_44
-        :pswitch_43
-        :pswitch_42
-        :pswitch_41
     .end packed-switch
 .end method
 
@@ -11829,7 +13128,7 @@
 
     if-nez v4, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fk;->sG()Lcom/google/android/gms/internal/firebase-perf/fk;
 
     move-result-object v4
 
@@ -12037,8 +13336,6 @@
 
     array-length v0, v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPW:I
-
     :goto_1
     if-ge v1, v0, :cond_2
 
@@ -12092,7 +13389,7 @@
     :goto_0
     const/4 v3, 0x1
 
-    if-ge v2, v0, :cond_3
+    if-ge v2, v0, :cond_15
 
     invoke-direct {p0, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->dn(I)I
 
@@ -12112,7 +13409,7 @@
 
     packed-switch v4, :pswitch_data_0
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_0
     invoke-direct {p0, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->do(I)I
@@ -12145,7 +13442,10 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
+
+    :cond_0
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12162,14 +13462,29 @@
 
     move-result v3
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_2
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    goto/16 :goto_1
+
+    :pswitch_3
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_1
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -12183,28 +13498,10 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
 
-    goto/16 :goto_2
-
-    :pswitch_3
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v6
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_1
+    :cond_1
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12213,26 +13510,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
-
-    move-result v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
-
-    move-result v5
-
-    if-eq v4, v5, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_5
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_2
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
 
@@ -12244,7 +13522,32 @@
 
     cmp-long v8, v4, v6
 
-    if-eqz v8, :cond_1
+    if-eqz v8, :cond_13
+
+    :cond_2
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
+
+    :pswitch_5
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_3
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v5
+
+    if-eq v4, v5, :cond_13
+
+    :cond_3
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12253,26 +13556,31 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_4
 
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
 
-    move-result v4
+    move-result-wide v4
 
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
 
-    move-result v5
+    move-result-wide v6
 
-    if-eq v4, v5, :cond_1
+    cmp-long v8, v4, v6
 
-    goto/16 :goto_2
+    if-eqz v8, :cond_13
+
+    :cond_4
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
 
     :pswitch_7
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_5
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
@@ -12282,7 +13590,10 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
+
+    :cond_5
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12291,7 +13602,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_6
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
@@ -12301,30 +13612,32 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    goto/16 :goto_2
+    :cond_6
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
 
     :pswitch_9
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_7
 
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v5
-
-    invoke-static {v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
     move-result v4
 
-    if-nez v4, :cond_1
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v5
+
+    if-eq v4, v5, :cond_13
+
+    :cond_7
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12333,7 +13646,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_8
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -12347,16 +13660,19 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
 
-    goto/16 :goto_2
+    :cond_8
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
 
     :pswitch_b
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_9
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -12370,7 +13686,10 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
+
+    :cond_9
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12379,7 +13698,33 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_a
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v5
+
+    invoke-static {v4, v5}, Lcom/google/android/gms/internal/firebase-perf/fq;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_13
+
+    :cond_a
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
+
+    :pswitch_d
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_b
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->I(Ljava/lang/Object;J)Z
 
@@ -12389,56 +13734,19 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    goto/16 :goto_2
+    :cond_b
+    const/4 v3, 0x0
 
-    :pswitch_d
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
-
-    move-result v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
-
-    move-result v5
-
-    if-eq v4, v5, :cond_1
-
-    goto :goto_1
+    goto/16 :goto_1
 
     :pswitch_e
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v6
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_1
-
-    goto :goto_2
-
-    :pswitch_f
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_c
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
@@ -12448,37 +13756,65 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    goto :goto_1
+    :cond_c
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
+
+    :pswitch_f
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_d
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v6
+
+    cmp-long v8, v4, v6
+
+    if-eqz v8, :cond_13
+
+    :cond_d
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
 
     :pswitch_10
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_e
 
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
-    move-result-wide v4
+    move-result v4
 
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
-    move-result-wide v6
+    move-result v5
 
-    cmp-long v8, v4, v6
+    if-eq v4, v5, :cond_13
 
-    if-eqz v8, :cond_1
+    :cond_e
+    const/4 v3, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_11
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_f
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
 
@@ -12490,7 +13826,10 @@
 
     cmp-long v8, v4, v6
 
-    if-eqz v8, :cond_1
+    if-eqz v8, :cond_13
+
+    :cond_f
+    const/4 v3, 0x0
 
     goto :goto_1
 
@@ -12499,7 +13838,31 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_10
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v6
+
+    cmp-long v8, v4, v6
+
+    if-eqz v8, :cond_13
+
+    :cond_10
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :pswitch_13
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_11
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->J(Ljava/lang/Object;J)F
 
@@ -12517,17 +13880,19 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    :goto_1
-    goto :goto_2
+    :cond_11
+    const/4 v3, 0x0
 
-    :pswitch_13
+    goto :goto_1
+
+    :pswitch_14
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/firebase-perf/fc;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_12
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/firebase-perf/gl;->K(Ljava/lang/Object;J)D
 
@@ -12547,24 +13912,23 @@
 
     cmp-long v8, v4, v6
 
-    if-eqz v8, :cond_1
+    if-eqz v8, :cond_13
 
-    :cond_0
-    :goto_2
+    :cond_12
     const/4 v3, 0x0
 
-    :cond_1
-    :goto_3
-    if-nez v3, :cond_2
+    :cond_13
+    :goto_1
+    if-nez v3, :cond_14
 
     return v1
 
-    :cond_2
+    :cond_14
     add-int/lit8 v2, v2, 0x3
 
     goto/16 :goto_0
 
-    :cond_3
+    :cond_15
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPZ:Lcom/google/android/gms/internal/firebase-perf/gf;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/firebase-perf/gf;->aF(Ljava/lang/Object;)Ljava/lang/Object;
@@ -12581,14 +13945,14 @@
 
     move-result v0
 
-    if-nez v0, :cond_4
+    if-nez v0, :cond_16
 
     return v1
 
-    :cond_4
+    :cond_16
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPQ:Z
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_17
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQa:Lcom/google/android/gms/internal/firebase-perf/dd;
 
@@ -12608,13 +13972,14 @@
 
     return p1
 
-    :cond_5
+    :cond_17
     return v3
 
     nop
 
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_14
         :pswitch_13
         :pswitch_12
         :pswitch_11
@@ -12633,38 +13998,37 @@
         :pswitch_4
         :pswitch_3
         :pswitch_2
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
         :pswitch_1
         :pswitch_0
         :pswitch_0
@@ -12704,7 +14068,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    if-ge v1, v0, :cond_2
+    if-ge v1, v0, :cond_3
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->dn(I)I
 
@@ -12730,255 +14094,188 @@
 
     packed-switch v3, :pswitch_data_0
 
-    goto/16 :goto_e
+    goto/16 :goto_1
 
     :pswitch_0
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
-    goto :goto_2
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
 
     :pswitch_1
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
-    goto/16 :goto_4
-
-    :pswitch_2
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_1
-
-    :pswitch_3
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto/16 :goto_4
-
-    :pswitch_4
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_1
-
-    :pswitch_5
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_1
-    goto :goto_3
-
-    :pswitch_6
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_3
-
-    :pswitch_7
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto/16 :goto_5
-
-    :pswitch_8
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_2
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    mul-int/lit8 v2, v2, 0x35
-
-    goto/16 :goto_6
-
-    :pswitch_9
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto/16 :goto_8
-
-    :pswitch_a
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    mul-int/lit8 v2, v2, 0x35
-
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->F(Ljava/lang/Object;J)Z
-
-    move-result v3
-
-    goto/16 :goto_9
-
-    :pswitch_b
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_3
-
-    :pswitch_c
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_4
-
-    :pswitch_d
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_3
-    mul-int/lit8 v2, v2, 0x35
-
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
-
-    move-result v3
-
-    goto/16 :goto_d
-
-    :pswitch_e
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_4
-
-    :pswitch_f
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_4
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto/16 :goto_c
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
 
-    :pswitch_10
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_2
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->C(Ljava/lang/Object;J)F
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto :goto_a
+    add-int/2addr v2, v3
 
-    :pswitch_11
+    goto/16 :goto_1
+
+    :pswitch_3
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->B(Ljava/lang/Object;J)D
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto :goto_b
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
 
-    :pswitch_12
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result v3
 
-    move-result-object v3
+    add-int/2addr v2, v3
 
-    if-eqz v3, :cond_0
+    goto/16 :goto_1
 
-    goto :goto_7
+    :pswitch_4
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_5
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_6
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_7
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :goto_5
-    :pswitch_13
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
 
-    :goto_6
     invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_8
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :pswitch_14
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
 
-    if-eqz v3, :cond_0
-
-    :goto_7
-    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
-
-    move-result v7
-
-    :cond_0
     mul-int/lit8 v2, v2, 0x35
 
-    add-int/2addr v2, v7
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
-    goto :goto_e
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_9
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :goto_8
-    :pswitch_15
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -12991,81 +14288,467 @@
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_a
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :pswitch_16
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->I(Ljava/lang/Object;J)Z
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->F(Ljava/lang/Object;J)Z
 
     move-result v3
 
-    :goto_9
-    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/dr;->N(Z)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/dr;->M(Z)I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_b
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :pswitch_17
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
 
-    :pswitch_18
+    goto/16 :goto_1
+
+    :pswitch_c
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_d
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_e
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_f
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_10
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->C(Ljava/lang/Object;J)F
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_11
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/fc;->B(Ljava/lang/Object;J)D
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Double;->doubleToLongBits(D)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_12
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_13
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_14
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v7
+
+    :cond_0
+    mul-int/lit8 v2, v2, 0x35
+
+    add-int/2addr v2, v7
+
+    goto/16 :goto_1
+
+    :pswitch_15
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto :goto_c
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_16
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_17
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_18
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
 
     :pswitch_19
     mul-int/lit8 v2, v2, 0x35
 
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_1a
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_1b
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_1c
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_1
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v7
+
+    :cond_1
+    mul-int/lit8 v2, v2, 0x35
+
+    add-int/2addr v2, v7
+
+    goto :goto_1
+
+    :pswitch_1d
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_1e
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->I(Ljava/lang/Object;J)Z
+
+    move-result v3
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/firebase-perf/dr;->M(Z)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_1f
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_20
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_21
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_22
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_23
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_24
+    mul-int/lit8 v2, v2, 0x35
+
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->J(Ljava/lang/Object;J)F
 
     move-result v3
 
-    :goto_a
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
 
-    :pswitch_1a
+    goto :goto_1
+
+    :pswitch_25
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/gl;->K(Ljava/lang/Object;J)D
 
     move-result-wide v3
 
-    :goto_b
     invoke-static {v3, v4}, Ljava/lang/Double;->doubleToLongBits(D)J
 
     move-result-wide v3
 
-    :goto_c
     invoke-static {v3, v4}, Lcom/google/android/gms/internal/firebase-perf/dr;->ae(J)I
 
     move-result v3
 
-    :goto_d
     add-int/2addr v2, v3
 
-    :cond_1
-    :goto_e
+    :cond_2
+    :goto_1
     add-int/lit8 v1, v1, 0x3
 
     goto/16 :goto_0
 
-    :cond_2
+    :cond_3
     mul-int/lit8 v2, v2, 0x35
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPZ:Lcom/google/android/gms/internal/firebase-perf/gf;
@@ -13082,7 +14765,7 @@
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPQ:Z
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     mul-int/lit8 v2, v2, 0x35
 
@@ -13098,64 +14781,62 @@
 
     add-int/2addr v2, p1
 
-    :cond_3
+    :cond_4
     return v2
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_25
+        :pswitch_24
+        :pswitch_23
+        :pswitch_22
+        :pswitch_21
+        :pswitch_20
+        :pswitch_1f
+        :pswitch_1e
+        :pswitch_1d
+        :pswitch_1c
+        :pswitch_1b
         :pswitch_1a
         :pswitch_19
         :pswitch_18
-        :pswitch_18
-        :pswitch_17
-        :pswitch_18
         :pswitch_17
         :pswitch_16
         :pswitch_15
         :pswitch_14
         :pswitch_13
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_18
-        :pswitch_17
-        :pswitch_18
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
         :pswitch_12
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
         :pswitch_11
         :pswitch_10
         :pswitch_f
@@ -13218,30 +14899,20 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto/16 :goto_7
+    goto/16 :goto_1
 
     :pswitch_0
-    invoke-direct {p0, p2, v4, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_1
-
-    :pswitch_1
     invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;Ljava/lang/Object;I)V
 
-    goto/16 :goto_7
+    goto/16 :goto_1
 
-    :pswitch_2
+    :pswitch_1
     invoke-direct {p0, p2, v4, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    :goto_1
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v1
@@ -13250,39 +14921,48 @@
 
     invoke-direct {p0, p1, v4, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
 
-    goto/16 :goto_7
+    goto/16 :goto_1
+
+    :pswitch_2
+    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_3
+    invoke-direct {p0, p2, v4, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;II)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    invoke-direct {p0, p1, v4, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_1
+
+    :pswitch_4
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aQb:Lcom/google/android/gms/internal/firebase-perf/es;
 
     invoke-static {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/fq;->a(Lcom/google/android/gms/internal/firebase-perf/es;Ljava/lang/Object;Ljava/lang/Object;J)V
 
-    goto/16 :goto_7
+    goto/16 :goto_1
 
-    :pswitch_4
+    :pswitch_5
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/fc;->aPY:Lcom/google/android/gms/internal/firebase-perf/ei;
 
     invoke-virtual {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/ei;->a(Ljava/lang/Object;Ljava/lang/Object;J)V
 
-    goto/16 :goto_7
-
-    :pswitch_5
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto/16 :goto_5
+    goto/16 :goto_1
 
     :pswitch_6
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;Ljava/lang/Object;I)V
 
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_2
+    goto/16 :goto_1
 
     :pswitch_7
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13291,7 +14971,15 @@
 
     if-eqz v1, :cond_0
 
-    goto/16 :goto_5
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_8
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13300,7 +14988,15 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_2
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_9
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13309,8 +15005,15 @@
 
     if-eqz v1, :cond_0
 
-    :goto_2
-    goto :goto_4
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_a
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13319,7 +15022,15 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_4
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_b
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13328,12 +15039,32 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_3
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_c
-    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;Ljava/lang/Object;I)V
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
-    goto/16 :goto_7
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_d
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13342,16 +15073,39 @@
 
     if-eqz v1, :cond_0
 
-    :goto_3
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v1
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_e
+    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->a(Ljava/lang/Object;Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
+
+    :pswitch_f
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
+
+    :pswitch_10
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v1
@@ -13364,25 +15118,9 @@
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JZ)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
-    :pswitch_f
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_4
-
-    :pswitch_10
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_5
+    goto/16 :goto_1
 
     :pswitch_11
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13391,14 +15129,15 @@
 
     if-eqz v1, :cond_0
 
-    :goto_4
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
 
     move-result v1
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto :goto_1
 
     :pswitch_12
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13407,7 +15146,15 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_5
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto :goto_1
 
     :pswitch_13
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
@@ -13416,16 +15163,51 @@
 
     if-eqz v1, :cond_0
 
-    :goto_5
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto :goto_1
+
+    :pswitch_14
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
 
     move-result-wide v4
 
     invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
-    :pswitch_14
+    goto :goto_1
+
+    :pswitch_15
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/gl;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
+
+    goto :goto_1
+
+    :pswitch_16
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v1
@@ -13438,9 +15220,11 @@
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JF)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
-    :pswitch_15
+    goto :goto_1
+
+    :pswitch_17
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->d(Ljava/lang/Object;I)Z
 
     move-result v1
@@ -13453,11 +15237,10 @@
 
     invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(Ljava/lang/Object;JD)V
 
-    :goto_6
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/firebase-perf/fc;->e(Ljava/lang/Object;I)V
 
     :cond_0
-    :goto_7
+    :goto_1
     add-int/lit8 v0, v0, 0x3
 
     goto/16 :goto_0
@@ -13489,10 +15272,14 @@
 
     throw p1
 
+    return-void
+
     nop
 
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_17
+        :pswitch_16
         :pswitch_15
         :pswitch_14
         :pswitch_13
@@ -13510,58 +15297,56 @@
         :pswitch_7
         :pswitch_6
         :pswitch_5
-        :pswitch_c
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
         :pswitch_4
         :pswitch_3
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
         :pswitch_2
         :pswitch_1
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
         :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_0
     .end packed-switch
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fd.smali
index 2c5bdf3621..0f6bf3bafb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fd.smali
@@ -130,7 +130,7 @@
 
     :cond_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ro()I
 
     move-result v3
     :try_end_0
@@ -170,7 +170,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rE()V
 
     goto :goto_1
 
@@ -182,7 +182,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rq()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rp()Z
 
     move-result v3
 
@@ -193,13 +193,11 @@
 
     const/4 v5, 0x0
 
-    move-object v3, v5
-
-    const/4 v6, 0x0
+    move-object v6, v5
 
     :cond_5
     :goto_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ro()I
 
     move-result v7
 
@@ -213,13 +211,13 @@
 
     if-ne v7, v8, :cond_6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ra()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()I
 
-    move-result v6
+    move-result v3
 
     iget-object v5, p0, Lcom/google/android/gms/internal/firebase-perf/fd;->aPP:Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    invoke-virtual {v1, p3, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/dd;->a(Lcom/google/android/gms/internal/firebase-perf/dc;Lcom/google/android/gms/internal/firebase-perf/ex;I)Ljava/lang/Object;
+    invoke-virtual {v1, p3, v5, v3}, Lcom/google/android/gms/internal/firebase-perf/dd;->a(Lcom/google/android/gms/internal/firebase-perf/dc;Lcom/google/android/gms/internal/firebase-perf/ex;I)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -232,19 +230,19 @@
 
     if-eqz v5, :cond_7
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rE()V
 
     goto :goto_0
 
     :cond_7
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
-    move-result-object v3
+    move-result-object v6
 
     goto :goto_0
 
     :cond_8
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rq()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rp()Z
 
     move-result v7
 
@@ -259,16 +257,16 @@
 
     if-ne v4, v7, :cond_c
 
-    if-eqz v3, :cond_b
+    if-eqz v6, :cond_b
 
     if-eqz v5, :cond_a
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/dd;->rF()V
 
     goto :goto_1
 
     :cond_a
-    invoke-virtual {v0, v2, v6, v3}, Lcom/google/android/gms/internal/firebase-perf/gf;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/firebase-perf/cg;)V
+    invoke-virtual {v0, v2, v3, v6}, Lcom/google/android/gms/internal/firebase-perf/gf;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/firebase-perf/cg;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -285,7 +283,7 @@
 
     :cond_c
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sh()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p2
 
@@ -299,6 +297,8 @@
     invoke-virtual {v0, p1, v2}, Lcom/google/android/gms/internal/firebase-perf/gf;->p(Ljava/lang/Object;Ljava/lang/Object;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final a(Ljava/lang/Object;Lcom/google/android/gms/internal/firebase-perf/gz;)V
@@ -346,7 +346,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/firebase-perf/di;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Lcom/google/android/gms/internal/firebase-perf/gy;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rL()Lcom/google/android/gms/internal/firebase-perf/gy;
 
     move-result-object v3
 
@@ -354,13 +354,13 @@
 
     if-ne v3, v4, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rO()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
 
     move-result v3
 
@@ -370,7 +370,7 @@
 
     if-eqz v3, :cond_0
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->qi()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->qh()I
 
     move-result v2
 
@@ -384,17 +384,16 @@
 
     check-cast v1, Lcom/google/android/gms/internal/firebase-perf/eb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/ef;->qF()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/ef;->qE()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object v1
 
-    :goto_1
     invoke-interface {p2, v2, v1}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(ILjava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->qi()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->qh()I
 
     move-result v2
 
@@ -402,7 +401,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    invoke-interface {p2, v2, v1}, Lcom/google/android/gms/internal/firebase-perf/gz;->d(ILjava/lang/Object;)V
+
+    goto :goto_0
 
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -462,7 +463,7 @@
     :goto_0
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v3
 
@@ -487,7 +488,7 @@
     :cond_0
     iget-object p1, p1, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -696,11 +697,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fd;->aPP:Lcom/google/android/gms/internal/firebase-perf/ex;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rW()Lcom/google/android/gms/internal/firebase-perf/ey;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ex;->rV()Lcom/google/android/gms/internal/firebase-perf/ey;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ey;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/ey;->sa()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fe.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fe.smali
index bbd031d586..53f46b63fe 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fe.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fe.smali
@@ -7,5 +7,5 @@
 
 
 # virtual methods
-.method public abstract sD()Lcom/google/android/gms/internal/firebase-perf/fe;
+.method public abstract sC()Lcom/google/android/gms/internal/firebase-perf/fe;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fh.smali
index 945ede7147..3a5087b81f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fh.smali
@@ -12,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sG()Lcom/google/android/gms/internal/firebase-perf/ff;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fh;->sF()Lcom/google/android/gms/internal/firebase-perf/ff;
 
     move-result-object v0
 
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method static sE()Lcom/google/android/gms/internal/firebase-perf/ff;
+.method static sD()Lcom/google/android/gms/internal/firebase-perf/ff;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/fh;->aQc:Lcom/google/android/gms/internal/firebase-perf/ff;
@@ -35,7 +35,7 @@
     return-object v0
 .end method
 
-.method static sF()Lcom/google/android/gms/internal/firebase-perf/ff;
+.method static sE()Lcom/google/android/gms/internal/firebase-perf/ff;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/fh;->aQd:Lcom/google/android/gms/internal/firebase-perf/ff;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method private static sG()Lcom/google/android/gms/internal/firebase-perf/ff;
+.method private static sF()Lcom/google/android/gms/internal/firebase-perf/ff;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fk.smali
index 2db01500a4..1587e503a2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fk.smali
@@ -124,7 +124,7 @@
     return-object p0
 .end method
 
-.method public static sH()Lcom/google/android/gms/internal/firebase-perf/fk;
+.method public static sG()Lcom/google/android/gms/internal/firebase-perf/fk;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/fk;->aQe:Lcom/google/android/gms/internal/firebase-perf/fk;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fl.smali
index 13f0879bb8..a2dd693816 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fl.smali
@@ -85,7 +85,7 @@
     return-void
 .end method
 
-.method public static sI()Lcom/google/android/gms/internal/firebase-perf/fl;
+.method public static sH()Lcom/google/android/gms/internal/firebase-perf/fl;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fl;->aPr:Ljava/util/List;
 
@@ -183,7 +183,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fl;->aPr:Ljava/util/List;
 
@@ -208,7 +208,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/cb;->qJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fl;->aPr:Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fm.smali
index 63f3496cc1..02cc4d420b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fm.smali
@@ -81,28 +81,7 @@
 
 
 # virtual methods
-.method public final sA()I
-    .locals 2
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/fm;->flags:I
-
-    const/4 v1, 0x1
-
-    and-int/2addr v0, v1
-
-    if-ne v0, v1, :cond_0
-
-    sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOO:I
-
-    return v0
-
-    :cond_0
-    sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOP:I
-
-    return v0
-.end method
-
-.method public final sB()Z
+.method public final sA()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/fm;->flags:I
@@ -123,10 +102,31 @@
     return v0
 .end method
 
-.method public final sC()Lcom/google/android/gms/internal/firebase-perf/ex;
+.method public final sB()Lcom/google/android/gms/internal/firebase-perf/ex;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fm;->aPP:Lcom/google/android/gms/internal/firebase-perf/ex;
 
     return-object v0
 .end method
+
+.method public final sz()I
+    .locals 2
+
+    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/fm;->flags:I
+
+    const/4 v1, 0x1
+
+    and-int/2addr v0, v1
+
+    if-ne v0, v1, :cond_0
+
+    sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOO:I
+
+    return v0
+
+    :cond_0
+    sget v0, Lcom/google/android/gms/internal/firebase-perf/dp$e;->aOP:I
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fn.smali
index c87fa81764..e45d89ed75 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fn.smali
@@ -358,6 +358,14 @@
 .method public abstract getTag()I
 .end method
 
+.method public abstract qR()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method public abstract qS()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -366,7 +374,7 @@
     .end annotation
 .end method
 
-.method public abstract qT()J
+.method public abstract qT()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -374,7 +382,7 @@
     .end annotation
 .end method
 
-.method public abstract qU()I
+.method public abstract qU()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -382,7 +390,7 @@
     .end annotation
 .end method
 
-.method public abstract qV()J
+.method public abstract qV()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -390,7 +398,7 @@
     .end annotation
 .end method
 
-.method public abstract qW()I
+.method public abstract qW()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -398,7 +406,7 @@
     .end annotation
 .end method
 
-.method public abstract qX()Z
+.method public abstract qX()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -406,7 +414,7 @@
     .end annotation
 .end method
 
-.method public abstract qY()Ljava/lang/String;
+.method public abstract qY()Lcom/google/android/gms/internal/firebase-perf/cg;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -414,7 +422,7 @@
     .end annotation
 .end method
 
-.method public abstract qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+.method public abstract qZ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -438,7 +446,7 @@
     .end annotation
 .end method
 
-.method public abstract rc()I
+.method public abstract rc()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -446,7 +454,7 @@
     .end annotation
 .end method
 
-.method public abstract rd()J
+.method public abstract rd()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -454,7 +462,7 @@
     .end annotation
 .end method
 
-.method public abstract re()I
+.method public abstract re()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -503,7 +511,7 @@
     .end annotation
 .end method
 
-.method public abstract rf()J
+.method public abstract ro()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -511,15 +519,7 @@
     .end annotation
 .end method
 
-.method public abstract rp()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rq()Z
+.method public abstract rp()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fq.smali
index 769f634ad1..9a6256c775 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fq.smali
@@ -44,7 +44,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sM()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sL()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->O(Z)Lcom/google/android/gms/internal/firebase-perf/gf;
+    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->N(Z)Lcom/google/android/gms/internal/firebase-perf/gf;
 
     move-result-object v0
 
@@ -60,7 +60,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->O(Z)Lcom/google/android/gms/internal/firebase-perf/gf;
+    invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/fq;->N(Z)Lcom/google/android/gms/internal/firebase-perf/gf;
 
     move-result-object v0
 
@@ -97,8 +97,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/firebase-perf/fq;->aQi:Ljava/lang/Class;
-
     invoke-virtual {v0, p0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result p0
@@ -121,6 +119,64 @@
     return-void
 .end method
 
+.method private static N(Z)Lcom/google/android/gms/internal/firebase-perf/gf;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(Z)",
+            "Lcom/google/android/gms/internal/firebase-perf/gf<",
+            "**>;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sM()Ljava/lang/Class;
+
+    move-result-object v1
+
+    if-nez v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    const/4 v2, 0x1
+
+    new-array v3, v2, [Ljava/lang/Class;
+
+    sget-object v4, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    const/4 v5, 0x0
+
+    aput-object v4, v3, v5
+
+    invoke-virtual {v1, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object v1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p0
+
+    aput-object p0, v2, v5
+
+    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/google/android/gms/internal/firebase-perf/gf;
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    return-object v0
+.end method
+
 .method static O(Ljava/util/List;)I
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
@@ -198,64 +254,6 @@
     return v2
 .end method
 
-.method private static O(Z)Lcom/google/android/gms/internal/firebase-perf/gf;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(Z)",
-            "Lcom/google/android/gms/internal/firebase-perf/gf<",
-            "**>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fq;->sN()Ljava/lang/Class;
-
-    move-result-object v1
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    const/4 v2, 0x1
-
-    new-array v3, v2, [Ljava/lang/Class;
-
-    sget-object v4, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    const/4 v5, 0x0
-
-    aput-object v4, v3, v5
-
-    invoke-virtual {v1, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object v1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p0
-
-    aput-object p0, v2, v5
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Lcom/google/android/gms/internal/firebase-perf/gf;
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    return-object v0
-.end method
-
 .method static P(Ljava/util/List;)I
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
@@ -789,7 +787,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/gf;->sW()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/gf;->sV()Ljava/lang/Object;
 
     move-result-object p2
 
@@ -897,10 +895,10 @@
 
     move-result-object p1
 
-    :goto_2
     move-object v2, p3
 
     :cond_5
+    :goto_2
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p3
@@ -929,6 +927,8 @@
 
     invoke-interface {p1}, Ljava/util/Iterator;->remove()V
 
+    move-object v2, p3
+
     goto :goto_2
 
     :cond_6
@@ -1070,7 +1070,7 @@
     :goto_0
     iget-object v0, p2, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v0
 
@@ -1091,7 +1091,7 @@
     :cond_0
     iget-object p1, p2, Lcom/google/android/gms/internal/firebase-perf/dg;->aNo:Lcom/google/android/gms/internal/firebase-perf/fr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -1393,10 +1393,9 @@
 
     move-result v2
 
-    :goto_1
     add-int/2addr p0, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     check-cast v2, Lcom/google/android/gms/internal/firebase-perf/ex;
@@ -1405,9 +1404,9 @@
 
     move-result v2
 
-    goto :goto_1
+    add-int/2addr p0, v2
 
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
@@ -2157,10 +2156,9 @@
 
     move-result v2
 
-    :goto_1
     add-int/2addr p0, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     check-cast v2, Ljava/lang/String;
@@ -2169,15 +2167,15 @@
 
     move-result v2
 
-    goto :goto_1
+    add-int/2addr p0, v2
 
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_2
-    :goto_3
+    :goto_2
     if-ge v1, v0, :cond_4
 
     invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -2194,10 +2192,9 @@
 
     move-result v2
 
-    :goto_4
     add-int/2addr p0, v2
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_3
     check-cast v2, Ljava/lang/String;
@@ -2206,12 +2203,12 @@
 
     move-result v2
 
-    goto :goto_4
+    add-int/2addr p0, v2
 
-    :goto_5
+    :goto_3
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     return p0
@@ -2365,7 +2362,7 @@
     return p0
 .end method
 
-.method public static sJ()Lcom/google/android/gms/internal/firebase-perf/gf;
+.method public static sI()Lcom/google/android/gms/internal/firebase-perf/gf;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2380,7 +2377,7 @@
     return-object v0
 .end method
 
-.method public static sK()Lcom/google/android/gms/internal/firebase-perf/gf;
+.method public static sJ()Lcom/google/android/gms/internal/firebase-perf/gf;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2395,7 +2392,7 @@
     return-object v0
 .end method
 
-.method public static sL()Lcom/google/android/gms/internal/firebase-perf/gf;
+.method public static sK()Lcom/google/android/gms/internal/firebase-perf/gf;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2410,7 +2407,7 @@
     return-object v0
 .end method
 
-.method private static sM()Ljava/lang/Class;
+.method private static sL()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2437,7 +2434,7 @@
     return-object v0
 .end method
 
-.method private static sN()Ljava/lang/Class;
+.method private static sM()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fr.smali
index bd049b349a..d76dfc2016 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fr.smali
@@ -217,7 +217,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/firebase-perf/fr;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()V
 
     return-void
 .end method
@@ -275,7 +275,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aQn:Ljava/util/List;
 
@@ -297,7 +297,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sS()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -329,7 +329,7 @@
     return-object p1
 .end method
 
-.method private final sR()V
+.method private final sQ()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aNp:Z
@@ -346,7 +346,7 @@
     throw v0
 .end method
 
-.method private final sS()Ljava/util/SortedMap;
+.method private final sR()Ljava/util/SortedMap;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -356,7 +356,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aQo:Ljava/util/Map;
 
@@ -406,7 +406,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/fr;->a(Ljava/lang/Comparable;)I
 
@@ -429,7 +429,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()V
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aQn:Ljava/util/List;
 
@@ -462,7 +462,7 @@
 
     if-lt v0, v1, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sS()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -485,8 +485,6 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aQn:Ljava/util/List;
 
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aQm:I
-
     add-int/lit8 v2, v2, -0x1
 
     invoke-interface {v1, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
@@ -495,7 +493,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/firebase-perf/fy;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sS()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()Ljava/util/SortedMap;
 
     move-result-object v2
 
@@ -528,7 +526,7 @@
 .method public clear()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aQn:Ljava/util/List;
 
@@ -680,11 +678,11 @@
     return v3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v4
 
@@ -793,7 +791,7 @@
 .method public hashCode()I
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v0
 
@@ -855,7 +853,7 @@
     return-object p1
 .end method
 
-.method public qJ()V
+.method public qI()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aNp:Z
@@ -928,7 +926,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sQ()V
 
     check-cast p1, Ljava/lang/Comparable;
 
@@ -967,7 +965,7 @@
     return-object p1
 .end method
 
-.method public final sO()I
+.method public final sN()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aQn:Ljava/util/List;
@@ -979,7 +977,7 @@
     return v0
 .end method
 
-.method public final sP()Ljava/lang/Iterable;
+.method public final sO()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -998,7 +996,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fv;->sU()Ljava/lang/Iterable;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fv;->sT()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -1014,7 +1012,7 @@
     return-object v0
 .end method
 
-.method final sQ()Ljava/util/Set;
+.method final sP()Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fs.smali
index 3a54df206a..808e90b3f8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fs.smali
@@ -26,7 +26,7 @@
 
 
 # virtual methods
-.method public final qJ()V
+.method public final qI()V
     .locals 3
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/fr;->aNp:Z
@@ -36,7 +36,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sN()I
 
     move-result v1
 
@@ -52,7 +52,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/firebase-perf/di;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v2
 
@@ -76,7 +76,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sP()Ljava/lang/Iterable;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->sO()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -104,7 +104,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/firebase-perf/di;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rN()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/firebase-perf/di;->rM()Z
 
     move-result v2
 
@@ -125,7 +125,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->qJ()V
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/fr;->qI()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ft.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ft.smali
index 48fbad2e37..f4dd88f1fe 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ft.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ft.smali
@@ -63,7 +63,7 @@
     return-void
 .end method
 
-.method private final sT()Ljava/util/Iterator;
+.method private final sS()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,8 +109,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ft;->pos:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ft;->aQt:Lcom/google/android/gms/internal/firebase-perf/fr;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/firebase-perf/fr;->b(Lcom/google/android/gms/internal/firebase-perf/fr;)Ljava/util/List;
@@ -124,7 +122,7 @@
     if-le v0, v1, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ft;->sT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ft;->sS()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -148,7 +146,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ft;->sT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ft;->sS()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -158,7 +156,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ft;->sT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/ft;->sS()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -166,7 +164,6 @@
 
     move-result-object v0
 
-    :goto_0
     check-cast v0, Ljava/util/Map$Entry;
 
     return-object v0
@@ -188,7 +185,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    check-cast v0, Ljava/util/Map$Entry;
+
+    return-object v0
 .end method
 
 .method public final remove()V
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fv.smali
index 9be098c750..49513718c6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fv.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method static sU()Ljava/lang/Iterable;
+.method static sT()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,7 +60,7 @@
     return-object v0
 .end method
 
-.method static synthetic sV()Ljava/util/Iterator;
+.method static synthetic sU()Ljava/util/Iterator;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/fv;->aQu:Ljava/util/Iterator;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fx.smali
index 0c3c894419..3e62b1947c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fx.smali
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fv;->sV()Ljava/util/Iterator;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/fv;->sU()Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fy.smali
index 38070b226e..42176393fb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fy.smali
@@ -220,8 +220,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/fy;->aQw:Ljava/lang/Comparable;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -234,9 +232,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/fy;->value:Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fz.smali
index d1062e83d7..7a8eb3863d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/fz.smali
@@ -57,7 +57,7 @@
     return-void
 .end method
 
-.method private final sT()Ljava/util/Iterator;
+.method private final sS()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -129,7 +129,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fz;->sT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fz;->sS()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -188,13 +188,12 @@
 
     move-result-object v0
 
-    :goto_0
     check-cast v0, Ljava/util/Map$Entry;
 
     return-object v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fz;->sT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fz;->sS()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -202,7 +201,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    check-cast v0, Ljava/util/Map$Entry;
+
+    return-object v0
 .end method
 
 .method public final remove()V
@@ -247,7 +248,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fz;->sT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/fz;->sS()Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gb.smali
index df97b2aebf..12e3e1065b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gb.smali
@@ -53,6 +53,10 @@
 
     if-gt v2, v4, :cond_0
 
+    int-to-char v2, v2
+
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_0
@@ -82,70 +86,84 @@
 
     add-int/lit8 v2, v2, 0x30
 
-    :goto_1
     int-to-char v2, v2
 
     invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_0
     const-string v2, "\\r"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_1
     const-string v2, "\\f"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_2
     const-string v2, "\\v"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_3
     const-string v2, "\\n"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_4
     const-string v2, "\\t"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_5
     const-string v2, "\\b"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_6
     const-string v2, "\\a"
 
-    :goto_2
     invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     const-string v2, "\\\\"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :cond_2
     const-string v2, "\\\'"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :cond_3
     const-string v2, "\\\""
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_3
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :cond_4
     invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -154,6 +172,8 @@
 
     return-object p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x7
         :pswitch_6
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gf.smali
index b3da757b25..d0749386d9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gf.smali
@@ -96,14 +96,14 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
     throw p1
 
     :pswitch_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qW()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qV()I
 
     move-result p2
 
@@ -117,7 +117,7 @@
     return p1
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/gf;->sW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/gf;->sV()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
     or-int/lit8 v3, v3, 0x4
 
     :cond_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->rp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->ro()I
 
     move-result v4
 
@@ -156,14 +156,14 @@
     return v2
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sh()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
     throw p1
 
     :pswitch_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qZ()Lcom/google/android/gms/internal/firebase-perf/cg;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qY()Lcom/google/android/gms/internal/firebase-perf/cg;
 
     move-result-object p2
 
@@ -172,7 +172,7 @@
     return v2
 
     :pswitch_4
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qU()J
 
     move-result-wide v3
 
@@ -181,7 +181,7 @@
     return v2
 
     :pswitch_5
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qT()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/fn;->qS()J
 
     move-result-wide v3
 
@@ -309,7 +309,7 @@
     .end annotation
 .end method
 
-.method abstract sW()Ljava/lang/Object;
+.method abstract sV()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TB;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gg.smali
index c3642a5b62..3883ba119b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gg.smali
@@ -143,7 +143,7 @@
 
     new-instance p0, Ljava/lang/RuntimeException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object p1
 
@@ -152,7 +152,7 @@
     throw p0
 
     :pswitch_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/gz;->rx()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/gz;->rw()I
 
     move-result p0
 
@@ -230,7 +230,7 @@
     .end packed-switch
 .end method
 
-.method public static sX()Lcom/google/android/gms/internal/firebase-perf/gg;
+.method public static sW()Lcom/google/android/gms/internal/firebase-perf/gg;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/gg;->aQz:Lcom/google/android/gms/internal/firebase-perf/gg;
@@ -238,7 +238,7 @@
     return-object v0
 .end method
 
-.method static sY()Lcom/google/android/gms/internal/firebase-perf/gg;
+.method static sX()Lcom/google/android/gms/internal/firebase-perf/gg;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/gg;
@@ -265,7 +265,7 @@
     return-void
 
     :cond_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/gz;->rx()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/firebase-perf/gz;->rw()I
 
     move-result v0
 
@@ -372,8 +372,6 @@
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
-
     const/4 v1, 0x4
 
     if-ge v0, v1, :cond_0
@@ -383,8 +381,6 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
-
     shr-int/lit8 v0, v0, 0x1
 
     :goto_0
@@ -417,15 +413,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aPM:[Ljava/lang/Object;
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
+    aput-object p2, p1, v1
 
-    aput-object p2, p1, v0
+    add-int/lit8 v1, v1, 0x1
 
-    iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
 
     return-void
 
@@ -469,20 +461,18 @@
 
     if-ne v2, v3, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aQA:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aQA:[I
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/gg;->aQA:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
+    iget-object v4, p1, Lcom/google/android/gms/internal/firebase-perf/gg;->aQA:[I
 
     const/4 v5, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_4
+    if-ge v5, v2, :cond_4
 
-    aget v6, v2, v5
+    aget v6, v3, v5
 
-    aget v7, v3, v5
+    aget v7, v4, v5
 
     if-eq v6, v7, :cond_3
 
@@ -552,13 +542,11 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
 
-    add-int/lit16 v0, v0, 0x20f
+    add-int/lit16 v1, v0, 0x20f
 
-    mul-int/lit8 v0, v0, 0x1f
+    mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aQA:[I
-
-    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
+    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aQA:[I
 
     const/4 v3, 0x0
 
@@ -569,11 +557,11 @@
     const/16 v6, 0x11
 
     :goto_0
-    if-ge v5, v2, :cond_0
+    if-ge v5, v0, :cond_0
 
     mul-int/lit8 v6, v6, 0x1f
 
-    aget v7, v1, v5
+    aget v7, v2, v5
 
     add-int/2addr v6, v7
 
@@ -582,11 +570,11 @@
     goto :goto_0
 
     :cond_0
-    add-int/2addr v0, v6
+    add-int/2addr v1, v6
 
-    mul-int/lit8 v0, v0, 0x1f
+    mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aPM:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aPM:[Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->count:I
 
@@ -595,7 +583,7 @@
 
     mul-int/lit8 v4, v4, 0x1f
 
-    aget-object v5, v1, v3
+    aget-object v5, v0, v3
 
     invoke-virtual {v5}, Ljava/lang/Object;->hashCode()I
 
@@ -608,12 +596,12 @@
     goto :goto_1
 
     :cond_1
-    add-int/2addr v0, v4
+    add-int/2addr v1, v4
 
-    return v0
+    return v1
 .end method
 
-.method public final rU()I
+.method public final rT()I
     .locals 6
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->zzro:I
@@ -650,7 +638,7 @@
 
     new-instance v0, Ljava/lang/IllegalStateException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sj()Lcom/google/android/gms/internal/firebase-perf/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->si()Lcom/google/android/gms/internal/firebase-perf/dz;
 
     move-result-object v1
 
@@ -671,12 +659,14 @@
 
     check-cast v3, Lcom/google/android/gms/internal/firebase-perf/gg;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/firebase-perf/gg;->rU()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/firebase-perf/gg;->rT()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
+    add-int/2addr v1, v2
+
     goto :goto_1
 
     :pswitch_1
@@ -690,6 +680,8 @@
 
     move-result v2
 
+    add-int/2addr v1, v2
+
     goto :goto_1
 
     :pswitch_2
@@ -705,6 +697,8 @@
 
     move-result v2
 
+    add-int/2addr v1, v2
+
     goto :goto_1
 
     :pswitch_3
@@ -722,10 +716,9 @@
 
     move-result v2
 
-    :goto_1
     add-int/2addr v1, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/gg;->aPM:[Ljava/lang/Object;
@@ -740,9 +733,9 @@
 
     move-result v2
 
-    goto :goto_1
+    add-int/2addr v1, v2
 
-    :goto_2
+    :goto_1
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
@@ -752,8 +745,6 @@
 
     return v1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gh.smali
index ce684d369e..43c20528ec 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gh.smali
@@ -112,7 +112,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/firebase-perf/gg;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/gg;->rU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/gg;->rT()I
 
     move-result p1
 
@@ -138,13 +138,13 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/firebase-perf/dp;->zzrn:Lcom/google/android/gms/internal/firebase-perf/gg;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sX()Lcom/google/android/gms/internal/firebase-perf/gg;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sW()Lcom/google/android/gms/internal/firebase-perf/gg;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sY()Lcom/google/android/gms/internal/firebase-perf/gg;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sX()Lcom/google/android/gms/internal/firebase-perf/gg;
 
     move-result-object v0
 
@@ -265,7 +265,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/firebase-perf/gg;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/gz;->rx()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/firebase-perf/gz;->rw()I
 
     move-result v0
 
@@ -354,7 +354,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/firebase-perf/gg;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sX()Lcom/google/android/gms/internal/firebase-perf/gg;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sW()Lcom/google/android/gms/internal/firebase-perf/gg;
 
     move-result-object v0
 
@@ -374,10 +374,10 @@
     return-object p1
 .end method
 
-.method final synthetic sW()Ljava/lang/Object;
+.method final synthetic sV()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sY()Lcom/google/android/gms/internal/firebase-perf/gg;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gg;->sX()Lcom/google/android/gms/internal/firebase-perf/gg;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gi.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gi.smali
index d2c6ab3859..3de4cee95a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gi.smali
@@ -127,7 +127,7 @@
     return v0
 .end method
 
-.method public final so()Ljava/util/List;
+.method public final sn()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -139,14 +139,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/gi;->aQB:Lcom/google/android/gms/internal/firebase-perf/eh;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/eh;->so()Ljava/util/List;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/firebase-perf/eh;->sn()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final sp()Lcom/google/android/gms/internal/firebase-perf/eh;
+.method public final so()Lcom/google/android/gms/internal/firebase-perf/eh;
     .locals 0
 
     return-object p0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$a.smali
index 6e9b26b4db..645cbd9550 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$a.smali
@@ -27,7 +27,7 @@
 .method public final I(Ljava/lang/Object;J)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
@@ -78,7 +78,7 @@
 .method public final P(Ljava/lang/Object;J)B
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
@@ -145,7 +145,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
@@ -182,7 +182,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$b.smali
index a33b3828cf..e557f0e5dd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$b.smali
@@ -27,7 +27,7 @@
 .method public final I(Ljava/lang/Object;J)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
@@ -78,7 +78,7 @@
 .method public final P(Ljava/lang/Object;J)B
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
@@ -139,7 +139,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
@@ -170,7 +170,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$c.smali
index 506c2c3685..31dc27ef71 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl$c.smali
@@ -125,7 +125,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/gl$c;->aQZ:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tf()J
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->te()J
 
     move-result-wide v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl.smali
index 48d4343e8b..41ee31e12e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gl.smali
@@ -84,13 +84,13 @@
 
     sput-object v0, Lcom/google/android/gms/internal/firebase-perf/gl;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tb()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->ta()Lsun/misc/Unsafe;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aPK:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qM()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qL()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -121,7 +121,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qK()Z
 
     move-result v0
 
@@ -163,13 +163,13 @@
     :goto_0
     sput-object v1, Lcom/google/android/gms/internal/firebase-perf/gl;->aQI:Lcom/google/android/gms/internal/firebase-perf/gl$d;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->td()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tc()Z
 
     move-result v0
 
     sput-boolean v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aQJ:Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tc()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->tb()Z
 
     move-result v0
 
@@ -305,7 +305,7 @@
 
     sput-wide v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aQW:J
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->te()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->td()Ljava/lang/reflect/Field;
 
     move-result-object v0
 
@@ -318,8 +318,6 @@
     goto :goto_1
 
     :cond_4
-    sget-object v1, Lcom/google/android/gms/internal/firebase-perf/gl;->aQI:Lcom/google/android/gms/internal/firebase-perf/gl$d;
-
     iget-object v1, v1, Lcom/google/android/gms/internal/firebase-perf/gl$d;->aQZ:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
@@ -491,7 +489,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qK()Z
 
     move-result v0
 
@@ -1075,7 +1073,7 @@
     return p0
 .end method
 
-.method static sZ()Z
+.method static sY()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aMV:Z
@@ -1083,7 +1081,7 @@
     return v0
 .end method
 
-.method static ta()Z
+.method static sZ()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aQJ:Z
@@ -1091,7 +1089,7 @@
     return v0
 .end method
 
-.method static tb()Lsun/misc/Unsafe;
+.method static ta()Lsun/misc/Unsafe;
     .locals 1
 
     :try_start_0
@@ -1116,7 +1114,7 @@
     return-object v0
 .end method
 
-.method private static tc()Z
+.method private static tb()Z
     .locals 8
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aPK:Lsun/misc/Unsafe;
@@ -1129,8 +1127,6 @@
 
     :cond_0
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aPK:Lsun/misc/Unsafe;
-
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v0
@@ -1267,7 +1263,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/firebase-perf/cd;->qL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qK()Z
 
     move-result v2
 
@@ -1452,7 +1448,7 @@
     return v1
 .end method
 
-.method private static td()Z
+.method private static tc()Z
     .locals 8
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aPK:Lsun/misc/Unsafe;
@@ -1465,8 +1461,6 @@
 
     :cond_0
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aPK:Lsun/misc/Unsafe;
-
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v0
@@ -1499,7 +1493,7 @@
 
     invoke-virtual {v0, v2, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->te()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->td()Ljava/lang/reflect/Field;
 
     move-result-object v2
 
@@ -1508,7 +1502,7 @@
     return v1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qK()Z
 
     move-result v2
 
@@ -1687,10 +1681,10 @@
     return v1
 .end method
 
-.method private static te()Ljava/lang/reflect/Field;
+.method private static td()Ljava/lang/reflect/Field;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qK()Z
 
     move-result v0
 
@@ -1735,7 +1729,7 @@
     return-object v0
 .end method
 
-.method static synthetic tf()J
+.method static synthetic te()J
     .locals 2
 
     sget-wide v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aQK:J
@@ -1743,7 +1737,7 @@
     return-wide v0
 .end method
 
-.method static synthetic tg()Z
+.method static synthetic tf()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/firebase-perf/gl;->aQY:Z
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gn.smali
index af2e2cb734..1780d6a7d6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gn.smali
@@ -10,13 +10,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->sZ()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->sY()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->ta()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/gl;->sZ()Z
 
     move-result v0
 
@@ -32,7 +32,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/cd;->qK()Z
 
     move-result v0
 
@@ -304,6 +304,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static dt(I)I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/go.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/go.smali
index b13284bece..6ccb117e1d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/go.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/go.smali
@@ -84,7 +84,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p0
 
@@ -148,7 +148,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p0
 
@@ -188,7 +188,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gp.smali
index 20ccd71ac4..bc9c9d3098 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gp.smali
@@ -71,7 +71,7 @@
 
     invoke-virtual {p1, v1, v4}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_0
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_6
 
     goto/16 :goto_5
 
@@ -141,7 +141,7 @@
 
     move-result v2
     :try_end_2
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_2 .. :try_end_2} :catch_2
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_2 .. :try_end_2} :catch_4
 
     add-int/lit8 v4, v1, 0x1
 
@@ -154,7 +154,7 @@
     :try_start_3
     invoke-virtual {p1, v1, v6}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_3
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_3 .. :try_end_3} :catch_1
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_3 .. :try_end_3} :catch_2
 
     add-int/lit8 v1, v4, 0x1
 
@@ -169,7 +169,7 @@
     :try_start_4
     invoke-virtual {p1, v4, v6}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_4
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_4 .. :try_end_4} :catch_2
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_4 .. :try_end_4} :catch_3
 
     add-int/lit8 v4, v1, 0x1
 
@@ -205,12 +205,20 @@
 
     goto :goto_2
 
+    :catch_2
+    move v1, v4
+
+    :catch_3
+    move v2, v5
+
+    goto :goto_6
+
     :cond_5
     move v2, v5
 
     goto :goto_3
 
-    :catch_2
+    :catch_4
     :goto_2
     move v2, v5
 
@@ -225,7 +233,7 @@
 
     throw v3
     :try_end_6
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_6 .. :try_end_6} :catch_3
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_6 .. :try_end_6} :catch_6
 
     :cond_7
     :goto_4
@@ -240,7 +248,7 @@
     :try_start_7
     invoke-virtual {p1, v1, v6}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_7
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_7 .. :try_end_7} :catch_0
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_7 .. :try_end_7} :catch_5
 
     add-int/lit8 v1, v5, 0x1
 
@@ -270,14 +278,19 @@
 
     goto/16 :goto_1
 
+    :catch_5
+    move v1, v5
+
+    goto :goto_6
+
     :cond_8
     invoke-virtual {p1, v1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
     :try_end_8
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_8 .. :try_end_8} :catch_3
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_8 .. :try_end_8} :catch_6
 
     return-void
 
-    :catch_3
+    :catch_6
     :goto_6
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->position()I
 
@@ -328,6 +341,8 @@
     invoke-direct {p1, p0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gq.smali
index 53a132c58f..1a9a6ea8de 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gq.smali
@@ -74,10 +74,9 @@
 
     aput-byte v3, p2, p3
 
-    :goto_2
     move p3, v4
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     const/16 v4, 0x800
@@ -108,7 +107,7 @@
 
     aput-byte v3, p2, v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const v4, 0xdfff
@@ -156,6 +155,8 @@
 
     aput-byte v3, p2, p3
 
+    move p3, v4
+
     goto :goto_2
 
     :cond_5
@@ -231,7 +232,7 @@
 
     move v1, v4
 
-    :goto_3
+    :goto_2
     add-int/lit8 v1, v1, 0x1
 
     goto/16 :goto_1
@@ -351,7 +352,7 @@
 
     aget-byte p2, p1, p2
 
-    if-gez p2, :cond_d
+    if-gez p2, :cond_e
 
     const/16 v2, -0x20
 
@@ -440,7 +441,7 @@
 
     aget-byte v1, p1, v1
 
-    if-gt v1, v4, :cond_c
+    if-gt v1, v4, :cond_d
 
     shl-int/lit8 p2, p2, 0x1c
 
@@ -450,24 +451,32 @@
 
     shr-int/lit8 p2, p2, 0x1e
 
-    if-nez p2, :cond_c
+    if-nez p2, :cond_d
 
     add-int/lit8 p2, v2, 0x1
 
     aget-byte v1, p1, v2
 
-    if-gt v1, v4, :cond_c
+    if-gt v1, v4, :cond_d
 
     add-int/lit8 v1, p2, 0x1
 
     aget-byte p2, p1, p2
 
-    if-le p2, v4, :cond_d
+    if-le p2, v4, :cond_c
+
+    goto :goto_2
 
     :cond_c
-    return v3
+    move p2, v1
+
+    goto :goto_1
 
     :cond_d
+    :goto_2
+    return v3
+
+    :cond_e
     move p2, v1
 
     goto :goto_1
@@ -614,7 +623,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -650,7 +659,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -696,7 +705,7 @@
     goto :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -747,4 +756,6 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gs.smali
index 2de9cbfb94..4b749b145c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gs.smali
@@ -150,14 +150,13 @@
 
     add-long v12, v4, v9
 
-    :goto_2
     int-to-byte v11, v11
 
     invoke-static {v1, v4, v5, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->a([BJB)V
 
     move-wide v4, v12
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     const/16 v12, 0x800
@@ -192,7 +191,7 @@
 
     invoke-static {v1, v12, v13, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->a([BJB)V
 
-    goto :goto_3
+    goto/16 :goto_2
 
     :cond_3
     const v12, 0xdfff
@@ -240,6 +239,12 @@
 
     or-int/2addr v11, v3
 
+    int-to-byte v11, v11
+
+    invoke-static {v1, v4, v5, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->a([BJB)V
+
+    move-wide v4, v12
+
     goto :goto_2
 
     :cond_5
@@ -315,7 +320,7 @@
 
     move v2, v12
 
-    :goto_3
+    :goto_2
     add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_1
@@ -428,10 +433,12 @@
     invoke-direct {v1, v0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method final b(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
-    .locals 20
+    .locals 21
 
     move-object/from16 v0, p1
 
@@ -499,7 +506,6 @@
     :cond_0
     if-ne v9, v8, :cond_1
 
-    :goto_1
     sub-long/2addr v4, v2
 
     long-to-int v0, v4
@@ -509,7 +515,7 @@
     return-void
 
     :cond_1
-    :goto_2
+    :goto_1
     if-ge v9, v8, :cond_b
 
     invoke-interface {v0, v9}, Ljava/lang/CharSequence;->charAt(I)C
@@ -528,13 +534,11 @@
 
     invoke-static {v4, v5, v13}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(JB)V
 
-    :goto_3
     move-wide v4, v11
 
-    :goto_4
     const/16 v11, 0x80
 
-    goto/16 :goto_5
+    goto/16 :goto_2
 
     :cond_2
     const/16 v14, 0x800
@@ -573,7 +577,11 @@
 
     move-wide v14, v4
 
-    goto :goto_3
+    move-wide v4, v11
+
+    const/16 v11, 0x80
+
+    goto/16 :goto_2
 
     :cond_3
     const v10, 0xdfff
@@ -585,13 +593,13 @@
     if-ge v10, v13, :cond_5
 
     :cond_4
-    const-wide/16 v15, 0x3
+    const-wide/16 v17, 0x3
 
-    sub-long v15, v6, v15
+    sub-long v17, v6, v17
 
-    cmp-long v17, v4, v15
+    cmp-long v15, v4, v17
 
-    if-gtz v17, :cond_5
+    if-gtz v15, :cond_5
 
     add-long v14, v4, v11
 
@@ -619,7 +627,7 @@
 
     const-wide/16 v14, 0x1
 
-    add-long v18, v4, v14
+    add-long v19, v4, v14
 
     and-int/lit8 v10, v13, 0x3f
 
@@ -629,11 +637,13 @@
 
     invoke-static {v4, v5, v10}, Lcom/google/android/gms/internal/firebase-perf/gl;->a(JB)V
 
-    move-wide/from16 v14, v18
+    move-wide/from16 v14, v19
 
     const-wide/16 v4, 0x1
 
-    goto :goto_4
+    const/16 v11, 0x80
+
+    goto :goto_2
 
     :cond_5
     const-wide/16 v11, 0x4
@@ -718,7 +728,7 @@
 
     move-wide v14, v12
 
-    :goto_5
+    :goto_2
     add-int/lit8 v9, v9, 0x1
 
     move-wide v11, v4
@@ -727,7 +737,7 @@
 
     const/16 v10, 0x80
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_6
     move v9, v10
@@ -797,9 +807,13 @@
     throw v0
 
     :cond_b
-    const/4 v0, 0x0
+    sub-long/2addr v4, v2
 
-    goto/16 :goto_1
+    long-to-int v0, v4
+
+    invoke-virtual {v1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    return-void
 
     :cond_c
     new-instance v2, Ljava/lang/ArrayIndexOutOfBoundsException;
@@ -839,6 +853,8 @@
     invoke-direct {v2, v0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v2
+
+    return-void
 .end method
 
 .method final g([BII)I
@@ -858,7 +874,7 @@
 
     const/4 v3, 0x0
 
-    if-ltz v0, :cond_12
+    if-ltz v0, :cond_13
 
     int-to-long v4, p2
 
@@ -1021,8 +1037,6 @@
     if-ge v4, v5, :cond_e
 
     :cond_d
-    const/4 p3, 0x0
-
     add-long v4, v10, v6
 
     invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/firebase-perf/gl;->a([BJ)B
@@ -1052,7 +1066,7 @@
 
     move-result v0
 
-    if-gt v0, v8, :cond_11
+    if-gt v0, v8, :cond_12
 
     shl-int/lit8 p3, p3, 0x1c
 
@@ -1062,7 +1076,7 @@
 
     shr-int/lit8 p3, p3, 0x1e
 
-    if-nez p3, :cond_11
+    if-nez p3, :cond_12
 
     add-long v4, v10, v6
 
@@ -1070,7 +1084,7 @@
 
     move-result p3
 
-    if-gt p3, v8, :cond_11
+    if-gt p3, v8, :cond_12
 
     add-long v10, v4, v6
 
@@ -1078,12 +1092,20 @@
 
     move-result p3
 
-    if-le p3, v8, :cond_8
+    if-le p3, v8, :cond_11
+
+    goto :goto_5
 
     :cond_11
-    return v9
+    move-wide v4, v10
+
+    goto/16 :goto_2
 
     :cond_12
+    :goto_5
+    return v9
+
+    :cond_13
     new-instance v0, Ljava/lang/ArrayIndexOutOfBoundsException;
 
     new-array v2, v2, [Ljava/lang/Object;
@@ -1119,6 +1141,8 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method final k([BII)Ljava/lang/String;
@@ -1278,7 +1302,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -1322,7 +1346,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -1380,7 +1404,7 @@
     goto/16 :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sm()Lcom/google/android/gms/internal/firebase-perf/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dy;->sl()Lcom/google/android/gms/internal/firebase-perf/dy;
 
     move-result-object p1
 
@@ -1431,4 +1455,6 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gz.smali
index 045466b6e0..e43fe26724 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/gz.smali
@@ -513,5 +513,5 @@
     .end annotation
 .end method
 
-.method public abstract rx()I
+.method public abstract rw()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hb.smali
index 08b86ac786..f49df51777 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hb.smali
@@ -64,7 +64,7 @@
 .end method
 
 .method private final cQ(I)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -75,21 +75,17 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
 
-    add-int/2addr v0, p1
+    add-int v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
+    iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
 
-    if-gt v0, v1, :cond_1
+    if-gt v1, v2, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->zzya:I
+    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->zzya:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
+    sub-int/2addr v1, v0
 
-    sub-int/2addr v0, v1
-
-    if-gt p1, v0, :cond_0
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
+    if-gt p1, v1, :cond_0
 
     add-int/2addr v0, p1
 
@@ -98,29 +94,25 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tj()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
+    sub-int/2addr v2, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
+    invoke-direct {p0, v2}, Lcom/google/android/gms/internal/firebase-perf/hb;->cQ(I)V
 
-    sub-int/2addr p1, v0
-
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/firebase-perf/hb;->cQ(I)V
-
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tj()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tl()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object p1
 
@@ -137,7 +129,7 @@
     return-object v0
 .end method
 
-.method private final rn()V
+.method private final rm()V
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->zzya:I
@@ -154,13 +146,9 @@
 
     if-le v0, v1, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
+    sub-int v1, v0, v1
 
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amy:I
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->zzya:I
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amy:I
 
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amy:I
 
@@ -178,7 +166,7 @@
     return-void
 .end method
 
-.method private final ro()B
+.method private final rn()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -192,20 +180,18 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->buffer:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->buffer:[B
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
     iput v2, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
 
-    aget-byte v0, v0, v1
+    aget-byte v0, v1, v0
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tj()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object v0
 
@@ -252,7 +238,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRH:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/cs;->rh()I
 
     move-result v0
 
@@ -284,7 +270,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRH:Lcom/google/android/gms/internal/firebase-perf/cs;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rD()Lcom/google/android/gms/internal/firebase-perf/dc;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dc;->rC()Lcom/google/android/gms/internal/firebase-perf/dc;
 
     move-result-object v1
 
@@ -378,7 +364,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v0
 
@@ -431,17 +417,15 @@
 
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRE:I
 
-    sub-int/2addr v0, v1
+    sub-int v2, v0, v1
 
-    if-gt p1, v0, :cond_1
+    if-gt p1, v2, :cond_1
 
     if-ltz p1, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRE:I
+    add-int/2addr v1, p1
 
-    add-int/2addr v0, p1
-
-    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
 
     iput p2, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amA:I
 
@@ -473,10 +457,6 @@
     :cond_1
     new-instance p2, Ljava/lang/IllegalArgumentException;
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
-
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRE:I
-
     sub-int/2addr v0, v1
 
     const/16 v1, 0x32
@@ -553,13 +533,13 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     return v1
 
@@ -570,7 +550,7 @@
 
     :cond_0
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v0
 
@@ -594,7 +574,7 @@
     return v1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result p1
 
@@ -603,26 +583,26 @@
     return v1
 
     :pswitch_4
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     return v1
 
     :pswitch_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     return v1
 
@@ -657,19 +637,19 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rm()V
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tj()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tl()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object p1
 
@@ -681,7 +661,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rm()V
 
     return-void
 .end method
@@ -708,7 +688,7 @@
     return v0
 .end method
 
-.method public final qR()I
+.method public final qQ()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -729,7 +709,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v0
 
@@ -739,8 +719,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amA:I
-
     return v0
 
     :cond_1
@@ -761,7 +739,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v0
 
@@ -777,13 +755,11 @@
 
     new-instance v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->buffer:[B
-
-    iget v3, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
+    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->buffer:[B
 
     sget-object v4, Lcom/google/android/gms/internal/firebase-perf/hi;->UTF_8:Ljava/nio/charset/Charset;
 
-    invoke-direct {v1, v2, v3, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
+    invoke-direct {v1, v3, v2, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
     iget v2, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
 
@@ -794,21 +770,21 @@
     return-object v1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tj()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object v0
 
     throw v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tl()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final rj()I
+.method public final ri()I
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -816,7 +792,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     move-result v0
 
@@ -827,7 +803,7 @@
     :cond_0
     and-int/lit8 v0, v0, 0x7f
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     move-result v1
 
@@ -835,10 +811,9 @@
 
     shl-int/lit8 v1, v1, 0x7
 
-    :goto_0
     or-int/2addr v0, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     and-int/lit8 v1, v1, 0x7f
@@ -847,7 +822,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     move-result v1
 
@@ -855,7 +830,9 @@
 
     shl-int/lit8 v1, v1, 0xe
 
-    goto :goto_0
+    or-int/2addr v0, v1
+
+    goto :goto_1
 
     :cond_2
     and-int/lit8 v1, v1, 0x7f
@@ -864,7 +841,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     move-result v1
 
@@ -872,7 +849,9 @@
 
     shl-int/lit8 v1, v1, 0x15
 
-    goto :goto_0
+    or-int/2addr v0, v1
+
+    goto :goto_1
 
     :cond_3
     and-int/lit8 v1, v1, 0x7f
@@ -881,7 +860,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     move-result v1
 
@@ -893,12 +872,12 @@
 
     const/4 v1, 0x0
 
-    :goto_1
+    :goto_0
     const/4 v2, 0x5
 
     if-ge v1, v2, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     move-result v2
 
@@ -909,21 +888,21 @@
     :cond_4
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tm()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tl()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object v0
 
     throw v0
 
     :cond_6
-    :goto_2
+    :goto_1
     return v0
 .end method
 
-.method public final rk()J
+.method public final rj()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -940,7 +919,7 @@
 
     if-ge v0, v3, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->ro()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->rn()B
 
     move-result v3
 
@@ -964,14 +943,16 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tm()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tl()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object v0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final th()I
+.method public final tg()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
@@ -985,11 +966,9 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
+    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->aRG:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hb;->amB:I
+    sub-int/2addr v0, v1
 
-    sub-int/2addr v1, v0
-
-    return v1
+    return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hc.smali
index 103de8dfb3..fea4db5b62 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hc.smali
@@ -109,7 +109,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hk;->rU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/hk;->rT()I
 
     move-result p1
 
@@ -284,6 +284,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static d(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
@@ -364,7 +366,7 @@
 
     add-int/2addr v7, v9
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_1
     add-int/2addr v7, v5
@@ -386,10 +388,9 @@
 
     aput-byte v10, v0, v7
 
-    :goto_2
     move v7, v11
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     if-ge v10, v4, :cond_3
@@ -418,7 +419,7 @@
 
     aput-byte v10, v0, v11
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     if-lt v10, v3, :cond_4
@@ -462,6 +463,8 @@
 
     aput-byte v10, v0, v7
 
+    move v7, v11
+
     goto :goto_2
 
     :cond_5
@@ -537,7 +540,7 @@
 
     move v5, v11
 
-    :goto_3
+    :goto_2
     add-int/lit8 v5, v5, 0x1
 
     goto/16 :goto_1
@@ -598,7 +601,7 @@
     throw p0
 
     :cond_9
-    :goto_4
+    :goto_3
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->arrayOffset()I
 
     move-result p0
@@ -627,7 +630,7 @@
 
     move-result v0
 
-    :goto_5
+    :goto_4
     if-ge v5, v0, :cond_11
 
     invoke-interface {p0, v5}, Ljava/lang/CharSequence;->charAt(I)C
@@ -636,12 +639,11 @@
 
     if-ge v7, v6, :cond_b
 
-    :goto_6
     int-to-byte v7, v7
 
     invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    goto/16 :goto_9
+    goto/16 :goto_6
 
     :cond_b
     if-ge v7, v4, :cond_c
@@ -650,7 +652,6 @@
 
     or-int/lit16 v8, v8, 0x3c0
 
-    :goto_7
     int-to-byte v8, v8
 
     invoke-virtual {p1, v8}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
@@ -659,6 +660,10 @@
 
     or-int/2addr v7, v6
 
+    int-to-byte v7, v7
+
+    invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
     goto :goto_6
 
     :cond_c
@@ -666,7 +671,7 @@
 
     if-ge v2, v7, :cond_d
 
-    goto :goto_8
+    goto :goto_5
 
     :cond_d
     add-int/lit8 v8, v5, 0x1
@@ -729,7 +734,7 @@
 
     move v5, v8
 
-    goto :goto_9
+    goto :goto_6
 
     :cond_e
     move v5, v8
@@ -758,7 +763,7 @@
     throw p0
 
     :cond_10
-    :goto_8
+    :goto_5
     ushr-int/lit8 v8, v7, 0xc
 
     or-int/lit16 v8, v8, 0x1e0
@@ -773,12 +778,22 @@
 
     or-int/2addr v8, v6
 
-    goto :goto_7
+    int-to-byte v8, v8
 
-    :goto_9
+    invoke-virtual {p1, v8}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    and-int/lit8 v7, v7, 0x3f
+
+    or-int/2addr v7, v6
+
+    int-to-byte v7, v7
+
+    invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    :goto_6
     add-int/lit8 v5, v5, 0x1
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_11
     return-void
@@ -789,6 +804,8 @@
     invoke-direct {p0}, Ljava/nio/ReadOnlyBufferException;-><init>()V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static da(I)I
@@ -1131,7 +1148,7 @@
 
     if-gez p1, :cond_0
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/hk;->rU()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/hk;->rT()I
 
     :cond_0
     iget p1, p2, Lcom/google/android/gms/internal/firebase-perf/hk;->aRT:I
@@ -1325,7 +1342,6 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hc;->aRI:Lcom/google/android/gms/internal/firebase-perf/cw;
 
-    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hc;->aMZ:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
@@ -1334,7 +1350,7 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/hc;->aRJ:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/hc;->aRJ:I
@@ -1369,10 +1385,16 @@
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/internal/firebase-perf/cw;->write([BII)V
 
-    goto :goto_0
+    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hc;->aMZ:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
+
+    move-result v0
+
+    iput v0, p0, Lcom/google/android/gms/internal/firebase-perf/hc;->aRJ:I
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hc;->aRI:Lcom/google/android/gms/internal/firebase-perf/cw;
 
     const/4 v1, 0x4
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/he.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/he.smali
index 24bc268d3f..0203385043 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/he.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/he.smali
@@ -127,7 +127,7 @@
 
     const/4 p2, 0x0
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_2
 
     new-instance p1, Lcom/google/android/gms/internal/firebase-perf/hg;
 
@@ -135,20 +135,16 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/he;->aRK:Lcom/google/android/gms/internal/firebase-perf/hg;
 
-    :cond_2
-    :goto_1
     move-object p1, p2
 
     goto :goto_2
 
-    :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/he;->aRK:Lcom/google/android/gms/internal/firebase-perf/hg;
-
+    :cond_2
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/firebase-perf/hg;->dy(I)I
 
     move-result v3
 
-    if-ltz v3, :cond_2
+    if-ltz v3, :cond_4
 
     iget-object v4, p1, Lcom/google/android/gms/internal/firebase-perf/hg;->aRP:[Lcom/google/android/gms/internal/firebase-perf/hh;
 
@@ -156,15 +152,21 @@
 
     sget-object v5, Lcom/google/android/gms/internal/firebase-perf/hg;->aRM:Lcom/google/android/gms/internal/firebase-perf/hh;
 
-    if-ne v4, v5, :cond_4
+    if-ne v4, v5, :cond_3
 
     goto :goto_1
 
-    :cond_4
+    :cond_3
     iget-object p1, p1, Lcom/google/android/gms/internal/firebase-perf/hg;->aRP:[Lcom/google/android/gms/internal/firebase-perf/hh;
 
     aget-object p1, p1, v3
 
+    goto :goto_2
+
+    :cond_4
+    :goto_1
+    move-object p1, p2
+
     :goto_2
     const/4 v3, 0x1
 
@@ -321,7 +323,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/hb;->rj()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/hb;->ri()I
 
     move-result v2
 
@@ -355,7 +357,7 @@
     return v3
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tk()Lcom/google/android/gms/internal/firebase-perf/hj;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/hj;->tj()Lcom/google/android/gms/internal/firebase-perf/hj;
 
     move-result-object p1
 
@@ -424,7 +426,7 @@
         }
     .end annotation
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->ti()Lcom/google/android/gms/internal/firebase-perf/hk;
+    invoke-super {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->th()Lcom/google/android/gms/internal/firebase-perf/hk;
 
     move-result-object v0
 
@@ -435,7 +437,7 @@
     return-object v0
 .end method
 
-.method protected qy()I
+.method protected qx()I
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/he;->aRK:Lcom/google/android/gms/internal/firebase-perf/hg;
@@ -459,7 +461,7 @@
 
     aget-object v2, v2, v1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/hh;->qy()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/hh;->qx()I
 
     move-result v2
 
@@ -476,7 +478,7 @@
     return v0
 .end method
 
-.method public final synthetic ti()Lcom/google/android/gms/internal/firebase-perf/hk;
+.method public final synthetic th()Lcom/google/android/gms/internal/firebase-perf/hk;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hg.smali
index 9fb72cccf8..3b2e63f663 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hg.smali
@@ -135,23 +135,21 @@
 
     iget-object v2, p0, Lcom/google/android/gms/internal/firebase-perf/hg;->aRP:[Lcom/google/android/gms/internal/firebase-perf/hh;
 
+    aget-object v3, v2, v4
+
+    if-eqz v3, :cond_0
+
+    iget-object v3, v1, Lcom/google/android/gms/internal/firebase-perf/hg;->aRP:[Lcom/google/android/gms/internal/firebase-perf/hh;
+
     aget-object v2, v2, v4
 
-    if-eqz v2, :cond_0
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/hh;->clone()Ljava/lang/Object;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/firebase-perf/hg;->aRP:[Lcom/google/android/gms/internal/firebase-perf/hh;
+    move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/hg;->aRP:[Lcom/google/android/gms/internal/firebase-perf/hh;
+    check-cast v2, Lcom/google/android/gms/internal/firebase-perf/hh;
 
-    aget-object v3, v3, v4
-
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/firebase-perf/hh;->clone()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/google/android/gms/internal/firebase-perf/hh;
-
-    aput-object v3, v2, v4
+    aput-object v2, v3, v4
 
     :cond_0
     add-int/lit8 v4, v4, 0x1
@@ -236,20 +234,18 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hg;->aRO:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/hg;->aRO:[I
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/hg;->aRO:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/firebase-perf/hg;->mSize:I
+    iget-object v4, p1, Lcom/google/android/gms/internal/firebase-perf/hg;->aRO:[I
 
     const/4 v5, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_4
+    if-ge v5, v1, :cond_4
 
-    aget v6, v1, v5
+    aget v6, v3, v5
 
-    aget v7, v3, v5
+    aget v7, v4, v5
 
     if-eq v6, v7, :cond_3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hh.smali
index bcf59e548c..edf4d3ff4a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hh.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method private final tj()Lcom/google/android/gms/internal/firebase-perf/hh;
+.method private final ti()Lcom/google/android/gms/internal/firebase-perf/hh;
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/hh;
@@ -93,10 +93,9 @@
 
     check-cast v1, Lcom/google/android/gms/internal/firebase-perf/hk;
 
-    :goto_1
     iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -113,7 +112,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+
+    goto/16 :goto_3
 
     :cond_2
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -134,7 +135,7 @@
 
     iput-object v3, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
 
-    :goto_2
+    :goto_1
     array-length v4, v1
 
     if-ge v2, v4, :cond_9
@@ -151,7 +152,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -168,7 +169,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_4
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -185,7 +188,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_5
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -202,7 +207,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_6
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -219,7 +226,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_7
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -236,7 +245,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_8
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -255,7 +266,7 @@
 
     iput-object v3, v0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
 
-    :goto_3
+    :goto_2
     array-length v4, v1
 
     if-ge v2, v4, :cond_9
@@ -274,10 +285,10 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_9
-    :goto_4
+    :goto_3
     return-object v0
 
     :catch_0
@@ -288,6 +299,8 @@
     invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method private final toByteArray()[B
@@ -298,7 +311,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hh;->qy()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hh;->qx()I
 
     move-result v0
 
@@ -367,6 +380,8 @@
     invoke-direct {p1}, Ljava/lang/NoSuchMethodError;-><init>()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final synthetic clone()Ljava/lang/Object;
@@ -377,7 +392,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hh;->tj()Lcom/google/android/gms/internal/firebase-perf/hh;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/firebase-perf/hh;->ti()Lcom/google/android/gms/internal/firebase-perf/hh;
 
     move-result-object v0
 
@@ -422,8 +437,6 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->aRQ:Lcom/google/android/gms/internal/firebase-perf/hf;
-
     iget-object v0, v0, Lcom/google/android/gms/internal/firebase-perf/hf;->aRL:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Class;->isArray()Z
@@ -445,11 +458,9 @@
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, [B
+    instance-of v1, v0, [B
 
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_4
 
     check-cast v0, [B
 
@@ -464,13 +475,9 @@
     return p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    instance-of v1, v0, [I
 
-    instance-of v0, v0, [I
-
-    if-eqz v0, :cond_5
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_5
 
     check-cast v0, [I
 
@@ -485,13 +492,9 @@
     return p1
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    instance-of v1, v0, [J
 
-    instance-of v0, v0, [J
-
-    if-eqz v0, :cond_6
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_6
 
     check-cast v0, [J
 
@@ -506,13 +509,9 @@
     return p1
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    instance-of v1, v0, [F
 
-    instance-of v0, v0, [F
-
-    if-eqz v0, :cond_7
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_7
 
     check-cast v0, [F
 
@@ -527,13 +526,9 @@
     return p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    instance-of v1, v0, [D
 
-    instance-of v0, v0, [D
-
-    if-eqz v0, :cond_8
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_8
 
     check-cast v0, [D
 
@@ -548,13 +543,9 @@
     return p1
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    instance-of v1, v0, [Z
 
-    instance-of v0, v0, [Z
-
-    if-eqz v0, :cond_9
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_9
 
     check-cast v0, [Z
 
@@ -569,8 +560,6 @@
     return p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
-
     check-cast v0, [Ljava/lang/Object;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -588,15 +577,11 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/hh;->aRR:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/internal/firebase-perf/hh;->aRR:Ljava/util/List;
 
-    if-eqz v0, :cond_b
+    if-eqz v1, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->aRR:Ljava/util/List;
-
-    iget-object p1, p1, Lcom/google/android/gms/internal/firebase-perf/hh;->aRR:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
+    invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -658,7 +643,7 @@
     throw v1
 .end method
 
-.method final qy()I
+.method final qx()I
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hh;->value:Ljava/lang/Object;
@@ -715,4 +700,6 @@
     invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hj.smali
index 6a81fab8b7..edbe38a16c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hj.smali
@@ -19,7 +19,7 @@
     return-void
 .end method
 
-.method static tk()Lcom/google/android/gms/internal/firebase-perf/hj;
+.method static tj()Lcom/google/android/gms/internal/firebase-perf/hj;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/hj;
@@ -31,7 +31,7 @@
     return-object v0
 .end method
 
-.method static tl()Lcom/google/android/gms/internal/firebase-perf/hj;
+.method static tk()Lcom/google/android/gms/internal/firebase-perf/hj;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/hj;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method static tm()Lcom/google/android/gms/internal/firebase-perf/hj;
+.method static tl()Lcom/google/android/gms/internal/firebase-perf/hj;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/hj;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hk.smali
index 6d3b97b0f5..889b395318 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hk.smali
@@ -71,7 +71,7 @@
 .method public static final b(Lcom/google/android/gms/internal/firebase-perf/hk;)[B
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->rU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->rT()I
 
     move-result v0
 
@@ -170,14 +170,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->ti()Lcom/google/android/gms/internal/firebase-perf/hk;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->th()Lcom/google/android/gms/internal/firebase-perf/hk;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected qy()I
+.method protected qx()I
     .locals 1
 
     const/4 v0, 0x0
@@ -185,10 +185,10 @@
     return v0
 .end method
 
-.method public final rU()I
+.method public final rT()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->qy()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hk;->qx()I
 
     move-result v0
 
@@ -197,7 +197,7 @@
     return v0
 .end method
 
-.method public ti()Lcom/google/android/gms/internal/firebase-perf/hk;
+.method public th()Lcom/google/android/gms/internal/firebase-perf/hk;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hl.smali
index 46cb817e1b..a6a13a68c7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hl.smali
@@ -427,7 +427,9 @@
 
     const-string p0, "\""
 
-    goto :goto_8
+    invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
+
+    goto :goto_b
 
     :cond_e
     instance-of p0, p1, [B
@@ -440,17 +442,16 @@
 
     const-string p0, "\"\""
 
-    :goto_8
     invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_f
     invoke-virtual {p3, v0}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
     const/4 p0, 0x0
 
-    :goto_9
+    :goto_8
     array-length v3, p1
 
     if-ge p0, v3, :cond_13
@@ -465,7 +466,7 @@
 
     if-ne v3, v0, :cond_10
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_10
     if-lt v3, p2, :cond_11
@@ -474,7 +475,11 @@
 
     if-ge v3, v4, :cond_11
 
-    goto :goto_b
+    int-to-char v3, v3
+
+    invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
+    goto :goto_a
 
     :cond_11
     const-string v4, "\\%03o"
@@ -493,31 +498,30 @@
 
     invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_12
-    :goto_a
+    :goto_9
     invoke-virtual {p3, v4}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    :goto_b
     int-to-char v3, v3
 
     invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    :goto_c
+    :goto_a
     add-int/lit8 p0, p0, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_13
     invoke-virtual {p3, v0}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_14
     invoke-virtual {p3, p1}, Ljava/lang/StringBuffer;->append(Ljava/lang/Object;)Ljava/lang/StringBuffer;
 
-    :goto_d
+    :goto_b
     const-string p0, "\n"
 
     invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
@@ -546,32 +550,39 @@
 
     move-result v2
 
-    if-nez v1, :cond_1
+    if-nez v1, :cond_0
 
-    :goto_1
     invoke-static {v2}, Ljava/lang/Character;->toLowerCase(C)C
 
     move-result v2
 
-    :cond_0
     invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_1
+    :cond_0
     invoke-static {v2}, Ljava/lang/Character;->isUpperCase(C)Z
 
     move-result v3
 
-    if-eqz v3, :cond_0
+    if-eqz v3, :cond_1
 
     const/16 v3, 0x5f
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
+    invoke-static {v2}, Ljava/lang/Character;->toLowerCase(C)C
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
     goto :goto_1
 
-    :goto_2
+    :cond_1
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hn.smali
index 79a80639e9..6cf5c589e9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hn.smali
@@ -86,7 +86,7 @@
     const/4 v1, 0x1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->qR()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hb;->qQ()I
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$a.smali
index 810ed01fd5..125e717231 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ho$a;->tn()Lcom/google/android/gms/internal/firebase-perf/ho$a;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ho$a;->tm()Lcom/google/android/gms/internal/firebase-perf/ho$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$b.smali
index af5f65d313..00ada0bfe2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$b.smali
@@ -586,7 +586,7 @@
     .end packed-switch
 .end method
 
-.method public static qw()Lcom/google/android/gms/internal/firebase-perf/du;
+.method public static qv()Lcom/google/android/gms/internal/firebase-perf/du;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/hr;->aMd:Lcom/google/android/gms/internal/firebase-perf/du;
@@ -610,7 +610,7 @@
 
 
 # virtual methods
-.method public final qi()I
+.method public final qh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ho$a$b;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$c.smali
index 128b18a77d..39db18f676 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a$c.smali
@@ -529,7 +529,7 @@
     .end packed-switch
 .end method
 
-.method public static qw()Lcom/google/android/gms/internal/firebase-perf/du;
+.method public static qv()Lcom/google/android/gms/internal/firebase-perf/du;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/ht;->aMd:Lcom/google/android/gms/internal/firebase-perf/du;
@@ -553,7 +553,7 @@
 
 
 # virtual methods
-.method public final qi()I
+.method public final qh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ho$a$c;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a.smali
index 6313595be9..8879ee25a3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ho$a.smali
@@ -87,7 +87,7 @@
     return-void
 .end method
 
-.method static synthetic tn()Lcom/google/android/gms/internal/firebase-perf/ho$a;
+.method static synthetic tm()Lcom/google/android/gms/internal/firebase-perf/ho$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/ho$a;->zzzb:Lcom/google/android/gms/internal/firebase-perf/ho$a;
@@ -190,7 +190,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ho$a$c;->qw()Lcom/google/android/gms/internal/firebase-perf/du;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ho$a$c;->qv()Lcom/google/android/gms/internal/firebase-perf/du;
 
     move-result-object v1
 
@@ -204,7 +204,7 @@
 
     const/4 v0, 0x4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ho$a$b;->qw()Lcom/google/android/gms/internal/firebase-perf/du;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ho$a$b;->qv()Lcom/google/android/gms/internal/firebase-perf/du;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hp.smali
index feecb8e39f..37679e37c1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hp.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/dp$e;->nr()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hz.smali
index ab7dbfb186..6eec50ff56 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/hz.smali
@@ -65,19 +65,15 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->aSU:[Ljava/lang/Object;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    if-ge v1, v0, :cond_0
+    if-ge v2, v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->aSU:[Ljava/lang/Object;
+    array-length v2, v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->aSU:[Ljava/lang/Object;
-
-    array-length v3, v3
-
-    invoke-static {v3, v0}, Lcom/google/android/gms/internal/firebase-perf/hz;->ab(II)I
+    invoke-static {v2, v0}, Lcom/google/android/gms/internal/firebase-perf/hz;->ab(II)I
 
     move-result v0
 
@@ -85,30 +81,29 @@
 
     move-result-object v0
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->aSU:[Ljava/lang/Object;
 
-    iput-boolean v2, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->XU:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->XU:Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-boolean v0, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->XU:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->aSU:[Ljava/lang/Object;
-
-    invoke-virtual {v0}, [Ljava/lang/Object;->clone()Ljava/lang/Object;
+    invoke-virtual {v1}, [Ljava/lang/Object;->clone()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, [Ljava/lang/Object;
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->aSU:[Ljava/lang/Object;
+
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->XU:Z
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->aSU:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/hz;->size:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/i.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/i.smali
index 7ab2fa097e..78299dfc71 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/i.smali
@@ -23,7 +23,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/i;->pX()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/i;->pW()Ljava/lang/Integer;
 
     move-result-object v1
     :try_end_0
@@ -46,11 +46,6 @@
 
     goto :goto_1
 
-    :catch_0
-    move-exception v2
-
-    goto :goto_0
-
     :cond_0
     const-string v2, "com.google.devtools.build.android.desugar.runtime.twr_disable_mimic"
 
@@ -77,6 +72,11 @@
 
     goto :goto_1
 
+    :catch_0
+    move-exception v2
+
+    goto :goto_0
+
     :catch_1
     move-exception v2
 
@@ -157,7 +157,7 @@
     return-void
 .end method
 
-.method private static pX()Ljava/lang/Integer;
+.method private static pW()Ljava/lang/Integer;
     .locals 4
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ie.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ie.smali
index 9aee216c28..ed6004f8e0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ie.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ie.smali
@@ -56,8 +56,6 @@
 
     add-int/2addr p1, v1
 
-    iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ie;->offset:I
-
     add-int/2addr p2, v1
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/firebase-perf/ib;->subList(II)Ljava/util/List;
@@ -112,24 +110,24 @@
     return-object p1
 .end method
 
-.method final tp()[Ljava/lang/Object;
+.method final tn()[Ljava/lang/Object;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ie;->zzs:Lcom/google/android/gms/internal/firebase-perf/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tp()[Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tn()[Ljava/lang/Object;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final tq()I
+.method final tp()I
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ie;->zzs:Lcom/google/android/gms/internal/firebase-perf/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tq()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tp()I
 
     move-result v0
 
@@ -140,12 +138,12 @@
     return v0
 .end method
 
-.method final tr()I
+.method final tq()I
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ie;->zzs:Lcom/google/android/gms/internal/firebase-perf/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tq()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/hy;->tp()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ig.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ig.smali
index 0cfd50ffe4..c6f9650419 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ig.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ig.smali
@@ -63,15 +63,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->aKt:[Ljava/lang/Object;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-le p1, v0, :cond_0
+    if-le p1, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->aKt:[Ljava/lang/Object;
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->aKt:[Ljava/lang/Object;
-
-    array-length v1, v1
+    array-length v1, v0
 
     invoke-static {v1, p1}, Lcom/google/android/gms/internal/firebase-perf/ia;->ab(II)I
 
@@ -92,7 +88,7 @@
 .end method
 
 .method public final s(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/android/gms/internal/firebase-perf/ig;
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TK;TV;)",
@@ -113,30 +109,24 @@
 
     iget v1, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->size:I
 
-    mul-int/lit8 v1, v1, 0x2
+    mul-int/lit8 v2, v1, 0x2
 
-    aput-object p1, v0, v1
+    aput-object p1, v0, v2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->aKt:[Ljava/lang/Object;
-
-    iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->size:I
-
-    mul-int/lit8 v0, v0, 0x2
-
-    add-int/lit8 v0, v0, 0x1
-
-    aput-object p2, p1, v0
-
-    iget p1, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->size:I
+    mul-int/lit8 p1, v1, 0x2
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->size:I
+    aput-object p2, v0, p1
+
+    add-int/lit8 v1, v1, 0x1
+
+    iput v1, p0, Lcom/google/android/gms/internal/firebase-perf/ig;->size:I
 
     return-object p0
 .end method
 
-.method public final ty()Lcom/google/android/gms/internal/firebase-perf/if;
+.method public final tx()Lcom/google/android/gms/internal/firebase-perf/if;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ii.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ii.smali
index 8126c637a8..2748c420ae 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ii.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ii.smali
@@ -108,7 +108,7 @@
     return v0
 .end method
 
-.method final tp()[Ljava/lang/Object;
+.method final tn()[Ljava/lang/Object;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/ii;->aTd:[Ljava/lang/Object;
@@ -116,7 +116,7 @@
     return-object v0
 .end method
 
-.method final tq()I
+.method final tp()I
     .locals 1
 
     const/4 v0, 0x0
@@ -124,7 +124,7 @@
     return v0
 .end method
 
-.method final tr()I
+.method final tq()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/firebase-perf/ii;->size:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ik.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ik.smali
index ac8927d708..8398b5529a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ik.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/ik.smali
@@ -83,7 +83,7 @@
 .method final a([Ljava/lang/Object;I)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/ib;
 
     move-result-object v0
 
@@ -101,7 +101,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     check-cast p1, Ljava/util/Map$Entry;
 
@@ -133,19 +133,22 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method public final synthetic iterator()Ljava/util/Iterator;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/f;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pU()Lcom/google/android/gms/internal/firebase-perf/f;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final pV()Lcom/google/android/gms/internal/firebase-perf/f;
+.method public final pU()Lcom/google/android/gms/internal/firebase-perf/f;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -156,7 +159,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pW()Lcom/google/android/gms/internal/firebase-perf/ib;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/hy;->pV()Lcom/google/android/gms/internal/firebase-perf/ib;
 
     move-result-object v0
 
@@ -177,7 +180,7 @@
     return v0
 .end method
 
-.method final tz()Lcom/google/android/gms/internal/firebase-perf/ib;
+.method final ty()Lcom/google/android/gms/internal/firebase-perf/ib;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/k.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/k.smali
index e153f4a6c9..340c00f218 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/k.smali
@@ -68,19 +68,25 @@
         }
     .end annotation
 
-    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/k;->aKy:Ljava/lang/ref/ReferenceQueue;
 
     invoke-virtual {v0}, Ljava/lang/ref/ReferenceQueue;->poll()Ljava/lang/ref/Reference;
 
     move-result-object v0
 
+    :goto_0
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/k;->aKx: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/firebase-perf/k;->aKy:Ljava/lang/ref/ReferenceQueue;
+
+    invoke-virtual {v0}, Ljava/lang/ref/ReferenceQueue;->poll()Ljava/lang/ref/Reference;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/l.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/l.smali
index e3c5b35c88..caf1053c69 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/l.smali
@@ -58,7 +58,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -101,6 +101,9 @@
     return v1
 
     :cond_2
+    return v0
+
+    :cond_3
     :goto_0
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/o.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/o.smali
index bcecdb14b9..393d4a670b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/o.smali
@@ -173,7 +173,7 @@
     return-wide p1
 .end method
 
-.method public static pY()Lcom/google/android/gms/internal/firebase-perf/o;
+.method public static pX()Lcom/google/android/gms/internal/firebase-perf/o;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/o;->aKB:Lcom/google/android/gms/internal/firebase-perf/o;
@@ -194,7 +194,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized kw()V
+.method public final declared-synchronized kv()V
     .locals 5
 
     monitor-enter p0
@@ -272,7 +272,7 @@
     throw v0
 .end method
 
-.method public final pZ()V
+.method public final pY()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/o;->aKC:Ljava/util/concurrent/ScheduledFuture;
@@ -282,8 +282,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/o;->aKC:Ljava/util/concurrent/ScheduledFuture;
-
     const/4 v1, 0x0
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
@@ -299,7 +297,7 @@
     return-void
 .end method
 
-.method final qa()Lcom/google/android/gms/internal/firebase-perf/aq;
+.method final pZ()Lcom/google/android/gms/internal/firebase-perf/aq;
     .locals 14
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -375,7 +373,7 @@
 
     move-result-wide v11
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aq;->qj()Lcom/google/android/gms/internal/firebase-perf/aq$a;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/aq;->qi()Lcom/google/android/gms/internal/firebase-perf/aq$a;
 
     move-result-object v4
 
@@ -383,8 +381,6 @@
 
     move-result-object v2
 
-    const/4 v3, 0x0
-
     add-long/2addr v9, v11
 
     invoke-direct {p0, v9, v10}, Lcom/google/android/gms/internal/firebase-perf/o;->K(J)J
@@ -395,8 +391,6 @@
 
     move-result-object v2
 
-    const/4 v3, 0x0
-
     add-long/2addr v5, v7
 
     invoke-direct {p0, v5, v6}, Lcom/google/android/gms/internal/firebase-perf/o;->K(J)J
@@ -407,7 +401,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v2
 
@@ -506,6 +500,10 @@
 
     if-eqz v4, :cond_1
 
+    invoke-virtual {v3, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     goto :goto_2
 
     :cond_1
@@ -513,7 +511,10 @@
 
     invoke-direct {v1, v3}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    goto :goto_3
+    :goto_2
+    invoke-static {v2, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto :goto_4
 
     :catch_3
     move-exception v1
@@ -536,7 +537,6 @@
 
     if-eqz v4, :cond_2
 
-    :goto_2
     invoke-virtual {v3, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
@@ -551,6 +551,7 @@
     :goto_3
     invoke-static {v2, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
+    :goto_4
     return-object v0
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/p.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/p.smali
index 6cffa9cf50..869cb5f3a2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/p.smali
@@ -27,7 +27,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/p;->aKH:Lcom/google/android/gms/internal/firebase-perf/o;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/o;->qa()Lcom/google/android/gms/internal/firebase-perf/aq;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/o;->pZ()Lcom/google/android/gms/internal/firebase-perf/aq;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/q.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/q.smali
index c108ec8e91..04fc87f063 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/q.smali
@@ -27,7 +27,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/q;->aKH:Lcom/google/android/gms/internal/firebase-perf/o;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/o;->qa()Lcom/google/android/gms/internal/firebase-perf/aq;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/o;->pZ()Lcom/google/android/gms/internal/firebase-perf/aq;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/r.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/r.smali
index cc541a74bc..4412fd9012 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/r.smali
@@ -97,7 +97,7 @@
     return-void
 .end method
 
-.method public static qb()Lcom/google/android/gms/internal/firebase-perf/r;
+.method public static qa()Lcom/google/android/gms/internal/firebase-perf/r;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/r;->aKI:Lcom/google/android/gms/internal/firebase-perf/r;
@@ -193,7 +193,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized pL()V
+.method public final declared-synchronized pK()V
     .locals 5
 
     monitor-enter p0
@@ -271,7 +271,7 @@
     throw v0
 .end method
 
-.method public final pZ()V
+.method public final pY()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/r;->aKM:Ljava/util/concurrent/ScheduledFuture;
@@ -281,8 +281,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/firebase-perf/r;->aKM:Ljava/util/concurrent/ScheduledFuture;
-
     const/4 v1, 0x0
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
@@ -298,7 +296,7 @@
     return-void
 .end method
 
-.method final qc()Lcom/google/android/gms/internal/firebase-perf/am;
+.method final qb()Lcom/google/android/gms/internal/firebase-perf/am;
     .locals 6
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
@@ -311,7 +309,7 @@
 
     move-result-wide v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/am;->qg()Lcom/google/android/gms/internal/firebase-perf/am$a;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/am;->qf()Lcom/google/android/gms/internal/firebase-perf/am$a;
 
     move-result-object v2
 
@@ -347,7 +345,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/s.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/s.smali
index 3ee9b211f5..28a92aa545 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/s.smali
@@ -29,7 +29,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/r;->aKK:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/r;->qc()Lcom/google/android/gms/internal/firebase-perf/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/r;->qb()Lcom/google/android/gms/internal/firebase-perf/am;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/t.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/t.smali
index 2302afe33e..c8409b83b1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/t.smali
@@ -29,7 +29,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/r;->aKK:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/r;->qc()Lcom/google/android/gms/internal/firebase-perf/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/r;->qb()Lcom/google/android/gms/internal/firebase-perf/am;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/u.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/u.smali
index e0526bad7e..8f000e7da3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/u.smali
@@ -58,7 +58,7 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cs()Lcom/google/firebase/perf/internal/a;
+    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cr()Lcom/google/firebase/perf/internal/a;
 
     move-result-object v0
 
@@ -406,62 +406,75 @@
 
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLP:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
-    :goto_1
     iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLY:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_1
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLX:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_2
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLW:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_3
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLV:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_4
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLU:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_5
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLT:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_6
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLS:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_7
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
+
     goto :goto_1
 
     :pswitch_8
     sget-object p1, Lcom/google/android/gms/internal/firebase-perf/ba$c;->aLQ:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
-    goto :goto_1
+    iput-object p1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKR:Lcom/google/android/gms/internal/firebase-perf/ba$c;
 
     :cond_1
-    :goto_2
+    :goto_1
     return-object p0
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x1faded82 -> :sswitch_8
@@ -516,7 +529,7 @@
     return-object p0
 .end method
 
-.method public final qd()Lcom/google/android/gms/internal/firebase-perf/u;
+.method public final qc()Lcom/google/android/gms/internal/firebase-perf/u;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/firebase-perf/ba$d;->aMb:Lcom/google/android/gms/internal/firebase-perf/ba$d;
@@ -526,7 +539,7 @@
     return-object p0
 .end method
 
-.method public final qe()Lcom/google/android/gms/internal/firebase-perf/br;
+.method public final qd()Lcom/google/android/gms/internal/firebase-perf/br;
     .locals 6
 
     invoke-static {}, Lcom/google/firebase/perf/internal/SessionManager;->zzcn()Lcom/google/firebase/perf/internal/SessionManager;
@@ -616,8 +629,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/firebase-perf/u;->aKQ:Lcom/google/firebase/perf/internal/g;
-
     invoke-virtual {p0}, Lcom/google/firebase/perf/internal/e;->zzam()I
 
     move-result v2
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/v.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/v.smali
index 2c89888d16..379e2e16a6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/v.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/v.smali
@@ -26,9 +26,9 @@
 
     iget-object p1, p1, Lcom/google/android/gms/internal/firebase-perf/u;->aKV:Ljava/lang/Long;
 
-    const/4 p2, 0x0
+    const/4 p2, 0x1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
     if-eqz p1, :cond_0
 
@@ -48,9 +48,12 @@
 
     if-eqz p1, :cond_1
 
-    const/4 p2, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 p2, 0x0
+
+    :goto_1
     if-nez p2, :cond_2
 
     invoke-static {}, Lcom/google/firebase/perf/internal/SessionManager;->zzcn()Lcom/google/firebase/perf/internal/SessionManager;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/zzbg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/zzbg.smali
index d2e29ddc26..d79a337853 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/zzbg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/firebase-perf/zzbg.smali
@@ -122,7 +122,7 @@
     return v0
 .end method
 
-.method public final qf()J
+.method public final qe()J
     .locals 5
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali
index 9d08f5c758..7ede55813a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali
@@ -99,7 +99,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/bw;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -109,7 +109,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/bw;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -142,38 +142,34 @@
     :try_start_0
     invoke-virtual {v0, p1, p2}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p2
+    move-result-object v1
+
+    invoke-interface {v1}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_1
+
+    const/4 p2, 0x0
+
+    invoke-interface {v1, p2}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide p1
     :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {p2}, Landroid/database/Cursor;->moveToFirst()Z
+    if-eqz v1, :cond_0
 
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x0
-
-    invoke-interface {p2, v0}, 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 p2, :cond_0
-
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return-wide v0
+    return-wide p1
 
     :cond_1
-    if-eqz p2, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_2
     const-wide/16 p1, 0x0
@@ -183,36 +179,21 @@
     :catchall_0
     move-exception p1
 
-    move-object v1, p2
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    move-object v1, p2
-
     goto :goto_0
 
-    :catchall_1
-    move-exception p1
+    :catch_0
+    move-exception p2
 
-    goto :goto_1
+    :try_start_1
+    const-string v0, "Database error"
 
-    :catch_1
-    move-exception v0
+    invoke-virtual {p0, v0, p1, p2}, Lcom/google/android/gms/internal/measurement/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    throw p2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    :try_start_2
-    const-string p2, "Database error"
-
-    invoke-virtual {p0, p2, p1, v0}, Lcom/google/android/gms/internal/measurement/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
-
-    throw v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :goto_1
     if-eqz v1, :cond_3
 
     invoke-interface {v1}, Landroid/database/Cursor;->close()V
@@ -240,9 +221,9 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     const-wide/16 v0, 0x0
 
@@ -320,90 +301,73 @@
 
     invoke-virtual/range {v0 .. v8}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p1
-    :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v10
 
-    :try_start_1
-    invoke-interface {p1}, Landroid/database/Cursor;->moveToFirst()Z
+    invoke-interface {v10}, Landroid/database/Cursor;->moveToFirst()Z
 
-    move-result p2
+    move-result p1
 
-    if-eqz p2, :cond_2
+    if-eqz p1, :cond_2
 
     :cond_1
-    invoke-interface {p1, v11}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v10, v11}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v0
+    move-result-wide p1
 
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-interface {v9, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v9, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-interface {p1}, Landroid/database/Cursor;->moveToNext()Z
+    invoke-interface {v10}, Landroid/database/Cursor;->moveToNext()Z
 
-    move-result p2
-    :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
+    move-result p1
+    :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 p2, :cond_1
+    if-nez p1, :cond_1
 
     :cond_2
-    if-eqz p1, :cond_3
+    if-eqz v10, :cond_3
 
-    invoke-interface {p1}, Landroid/database/Cursor;->close()V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p2
-
-    move-object v10, p1
-
-    goto :goto_2
-
-    :catch_0
-    move-exception p2
-
-    move-object v10, p1
+    invoke-interface {v10}, Landroid/database/Cursor;->close()V
 
     goto :goto_0
 
-    :catchall_1
-    move-exception p2
+    :catchall_0
+    move-exception p1
 
-    goto :goto_2
+    goto :goto_1
 
-    :catch_1
-    move-exception p2
+    :catch_0
+    move-exception p1
 
-    :goto_0
-    :try_start_2
-    const-string p1, "Error selecting hit ids"
+    :try_start_1
+    const-string p2, "Error selecting hit ids"
 
-    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/q;->l(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/q;->l(Ljava/lang/String;Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     if-eqz v10, :cond_3
 
     invoke-interface {v10}, Landroid/database/Cursor;->close()V
 
     :cond_3
-    :goto_1
+    :goto_0
     return-object v9
 
-    :goto_2
+    :goto_1
     if-eqz v10, :cond_4
 
     invoke-interface {v10}, Landroid/database/Cursor;->close()V
 
     :cond_4
-    throw p2
+    throw p1
+
+    return-void
 .end method
 
 .method private final bM(Ljava/lang/String;)J
@@ -418,87 +382,64 @@
     :try_start_0
     invoke-virtual {v0, p1, v1}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object v0
+    move-result-object v1
+
+    invoke-interface {v1}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x0
+
+    invoke-interface {v1, v0}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide v2
     :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    if-eqz v1, :cond_0
+
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
+
+    :cond_0
+    return-wide v2
+
+    :cond_1
     :try_start_1
-    invoke-interface {v0}, Landroid/database/Cursor;->moveToFirst()Z
+    new-instance v0, Landroid/database/sqlite/SQLiteException;
 
-    move-result v1
+    const-string v2, "Database returned empty set"
 
-    if-eqz v1, :cond_1
+    invoke-direct {v0, v2}, Landroid/database/sqlite/SQLiteException;-><init>(Ljava/lang/String;)V
 
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Landroid/database/Cursor;->getLong(I)J
-
-    move-result-wide v1
+    throw 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 v0, :cond_0
-
-    invoke-interface {v0}, Landroid/database/Cursor;->close()V
-
-    :cond_0
-    return-wide v1
-
-    :cond_1
-    :try_start_2
-    new-instance v1, Landroid/database/sqlite/SQLiteException;
-
-    const-string v2, "Database returned empty set"
-
-    invoke-direct {v1, v2}, Landroid/database/sqlite/SQLiteException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-    :try_end_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
     :catchall_0
     move-exception p1
 
-    goto :goto_1
-
-    :catch_0
-    move-exception v1
-
     goto :goto_0
 
-    :catchall_1
-    move-exception p1
-
-    move-object v0, v1
-
-    goto :goto_1
-
-    :catch_1
+    :catch_0
     move-exception v0
 
-    move-object v3, v1
-
-    move-object v1, v0
-
-    move-object v0, v3
-
-    :goto_0
-    :try_start_3
+    :try_start_2
     const-string v2, "Database error"
 
-    invoke-virtual {p0, v2, p1, v1}, Lcom/google/android/gms/internal/measurement/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-virtual {p0, v2, p1, v0}, Lcom/google/android/gms/internal/measurement/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    throw v1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    throw v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    :goto_1
-    if-eqz v0, :cond_2
+    :goto_0
+    if-eqz v1, :cond_2
 
-    invoke-interface {v0}, Landroid/database/Cursor;->close()V
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_2
     throw p1
@@ -679,12 +620,12 @@
     return-object p1
 .end method
 
-.method private final tZ()J
+.method private final tY()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     const-string v0, "SELECT COUNT(*) FROM hits2"
 
@@ -695,7 +636,7 @@
     return-wide v0
 .end method
 
-.method static synthetic uc()Ljava/lang/String;
+.method static synthetic ub()Ljava/lang/String;
     .locals 1
 
     const-string v0, "google_analytics_v4.db"
@@ -703,7 +644,7 @@
     return-object v0
 .end method
 
-.method static synthetic ud()Ljava/lang/String;
+.method static synthetic uc()Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->aUN:Ljava/lang/String;
@@ -716,9 +657,9 @@
 .method public final L(J)V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -758,9 +699,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -899,6 +840,8 @@
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(JLjava/lang/String;Ljava/lang/String;)J
@@ -908,9 +851,9 @@
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     const-string v0, "SELECT hits_count FROM properties WHERE app_uid=? AND cid=? AND tid=?"
 
@@ -954,15 +897,15 @@
 
     move-object/from16 v10, p0
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v11, 0x1
+    const/4 v11, 0x0
 
     const-wide/16 v1, 0x0
 
-    cmp-long v5, p1, v1
+    cmp-long v3, p1, v1
 
-    if-ltz v5, :cond_0
+    if-ltz v3, :cond_0
 
     const/4 v1, 0x1
 
@@ -974,9 +917,9 @@
     :goto_0
     invoke-static {v1}, Lcom/google/android/gms/common/internal/q;->checkArgument(Z)V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -993,11 +936,11 @@
 
     const-string v2, "hit_id"
 
-    aput-object v2, v14, v0
+    aput-object v2, v14, v11
 
     const-string v2, "hit_time"
 
-    aput-object v2, v14, v11
+    aput-object v2, v14, v0
 
     const-string v2, "hit_string"
 
@@ -1027,13 +970,13 @@
 
     const-string v2, "%s ASC"
 
-    new-array v5, v11, [Ljava/lang/Object;
+    new-array v3, v0, [Ljava/lang/Object;
 
-    const-string v6, "hit_id"
+    const-string v4, "hit_id"
 
-    aput-object v6, v5, v0
+    aput-object v4, v3, v11
 
-    invoke-static {v2, v5}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v2, v3}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v19
 
@@ -1060,11 +1003,11 @@
     if-eqz v1, :cond_2
 
     :goto_1
-    invoke-interface {v12, v0}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v12, v11}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v14
 
-    invoke-interface {v12, v11}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v12, v0}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v4
 
@@ -1096,9 +1039,9 @@
 
     move-object/from16 v2, p0
 
-    const/16 v17, 0x3
+    const/16 v18, 0x3
 
-    const/16 v18, 0x4
+    const/16 v19, 0x4
 
     move-wide v7, v14
 
@@ -1122,7 +1065,7 @@
     goto :goto_2
 
     :cond_1
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
     const/4 v7, 0x3
 
@@ -1180,12 +1123,14 @@
 
     :cond_4
     throw v0
+
+    return-void
 .end method
 
 .method public final beginTransaction()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1201,9 +1146,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1299,7 +1244,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -1320,7 +1265,7 @@
 
     move-result v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ac;->tZ()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ac;->tY()J
 
     move-result-wide v2
 
@@ -1397,14 +1342,14 @@
 
     if-eqz v3, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uz()Ljava/lang/String;
 
     move-result-object v3
 
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
 
     move-result-object v3
 
@@ -1473,7 +1418,6 @@
 
     const-string v1, "Error closing database"
 
-    :goto_0
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
     return-void
@@ -1483,13 +1427,15 @@
 
     const-string v1, "Sql error closing database"
 
-    goto :goto_0
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
+
+    return-void
 .end method
 
 .method public final endTransaction()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1527,7 +1473,7 @@
 .method final isEmpty()Z
     .locals 5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ac;->tZ()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ac;->tY()J
 
     move-result-wide v0
 
@@ -1547,12 +1493,12 @@
     return v0
 .end method
 
-.method public final qf()J
+.method public final qe()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->aUO:Ljava/lang/String;
 
@@ -1568,7 +1514,7 @@
 .method public final setTransactionSuccessful()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1579,18 +1525,18 @@
     return-void
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 0
 
     return-void
 .end method
 
-.method public final ua()I
+.method public final tZ()I
     .locals 7
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac;->aUQ:Lcom/google/android/gms/internal/measurement/bw;
 
@@ -1619,7 +1565,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v2
 
@@ -1660,7 +1606,7 @@
     return v0
 .end method
 
-.method public final ub()Ljava/util/List;
+.method public final ua()Ljava/util/List;
     .locals 23
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1673,9 +1619,9 @@
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1919,4 +1865,6 @@
 
     :cond_7
     throw v0
+
+    return-void
 .end method
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 48731f5685..5b680eb721 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
@@ -22,7 +22,7 @@
 .end method
 
 .method private final a(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
-    .locals 11
+    .locals 10
 
     const/4 v0, 0x0
 
@@ -55,61 +55,38 @@
 
     invoke-virtual/range {v2 .. v9}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p1
+    move-result-object v1
+
+    invoke-interface {v1}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result p1
     :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {p1}, Landroid/database/Cursor;->moveToFirst()Z
+    if-eqz v1, :cond_0
 
-    move-result v1
-    :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 p1, :cond_0
-
-    invoke-interface {p1}, Landroid/database/Cursor;->close()V
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return v1
+    return p1
 
     :catchall_0
-    move-exception p2
-
-    move-object v1, p1
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v1
-
-    move-object v10, v1
-
-    move-object v1, p1
-
-    move-object p1, v10
+    move-exception p1
 
     goto :goto_0
 
-    :catchall_1
-    move-exception p2
-
-    goto :goto_1
-
-    :catch_1
+    :catch_0
     move-exception p1
 
-    :goto_0
-    :try_start_2
+    :try_start_1
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ad;->aUS:Lcom/google/android/gms/internal/measurement/ac;
 
     const-string v3, "Error querying for table"
 
     invoke-virtual {v2, v3, p2, p1}, Lcom/google/android/gms/internal/measurement/q;->c(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     if-eqz v1, :cond_1
 
@@ -118,13 +95,13 @@
     :cond_1
     return v0
 
-    :goto_1
+    :goto_0
     if-eqz v1, :cond_2
 
     invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_2
-    throw p2
+    throw p1
 .end method
 
 .method private static b(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Ljava/util/Set;
@@ -212,6 +189,8 @@
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -257,7 +236,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/q;->bL(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac;->uc()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac;->ub()Ljava/lang/String;
 
     move-result-object v0
 
@@ -401,14 +380,13 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac;->ud()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac;->uc()Ljava/lang/String;
 
     move-result-object v0
 
-    :goto_1
     invoke-virtual {p1, v0}, Landroid/database/sqlite/SQLiteDatabase;->execSQL(Ljava/lang/String;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_1
     const-string v0, "hits2"
@@ -437,7 +415,7 @@
 
     const/4 v7, 0x0
 
-    :goto_2
+    :goto_1
     if-ge v7, v3, :cond_4
 
     aget-object v8, v6, v7
@@ -466,7 +444,7 @@
 
     move-result-object v0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     new-instance v1, Ljava/lang/String;
@@ -475,7 +453,7 @@
 
     move-object v0, v1
 
-    :goto_3
+    :goto_2
     invoke-direct {p1, v0}, Landroid/database/sqlite/SQLiteException;-><init>(Ljava/lang/String;)V
 
     throw p1
@@ -483,7 +461,7 @@
     :cond_3
     add-int/lit8 v7, v7, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const-string v6, "hit_app_id"
@@ -504,10 +482,10 @@
 
     const-string v0, "ALTER TABLE hits2 ADD COLUMN hit_app_id INTEGER"
 
-    goto :goto_1
+    invoke-virtual {p1, v0}, Landroid/database/sqlite/SQLiteDatabase;->execSQL(Ljava/lang/String;)V
 
     :cond_5
-    :goto_4
+    :goto_3
     const-string v0, "properties"
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/ad;->a(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
@@ -559,7 +537,7 @@
 
     aput-object v2, v6, v1
 
-    :goto_5
+    :goto_4
     if-ge v4, v0, :cond_9
 
     aget-object v1, v6, v4
@@ -588,7 +566,7 @@
 
     move-result-object v0
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     new-instance v1, Ljava/lang/String;
@@ -597,7 +575,7 @@
 
     move-object v0, v1
 
-    :goto_6
+    :goto_5
     invoke-direct {p1, v0}, Landroid/database/sqlite/SQLiteException;-><init>(Ljava/lang/String;)V
 
     throw p1
@@ -605,7 +583,7 @@
     :cond_8
     add-int/lit8 v4, v4, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
     invoke-interface {p1}, Ljava/util/Set;->isEmpty()Z
@@ -633,6 +611,8 @@
     invoke-direct {p1, v0}, Landroid/database/sqlite/SQLiteException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final onUpgrade(Landroid/database/sqlite/SQLiteDatabase;II)V
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 6e5c34fefa..b5e4d2c299 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
@@ -23,16 +23,16 @@
 
 
 # virtual methods
-.method protected final tB()V
+.method protected final tA()V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->ky()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->kx()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v0
 
@@ -42,11 +42,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tV()Lcom/google/android/gms/internal/measurement/by;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tU()Lcom/google/android/gms/internal/measurement/by;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/by;->va()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/by;->uZ()Ljava/lang/String;
 
     move-result-object v1
 
@@ -57,7 +57,7 @@
     iput-object v1, v2, Lcom/google/android/gms/internal/measurement/hh;->bek:Ljava/lang/String;
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/by;->uZ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/by;->uY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -71,10 +71,10 @@
     return-void
 .end method
 
-.method public final ue()Lcom/google/android/gms/internal/measurement/hh;
+.method public final ud()Lcom/google/android/gms/internal/measurement/hh;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ae;->YG:Lcom/google/android/gms/internal/measurement/hh;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali
index 5e9f27577a..e8d3b9e619 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali
@@ -64,7 +64,7 @@
 
     new-instance p2, Lcom/google/android/gms/internal/measurement/bw;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -120,7 +120,7 @@
 
     iput-boolean v1, v0, Lcom/google/android/gms/analytics/d;->Yh:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->kt()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->ks()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
@@ -269,17 +269,17 @@
 
     invoke-virtual {p0, v1, p1, p2}, Lcom/google/android/gms/internal/measurement/q;->b(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bo;->uP()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bo;->uO()J
 
     move-result-wide p1
 
     iput-wide p1, v0, Lcom/google/android/gms/analytics/j;->Yr:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kw()V
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kv()V
 
     return-void
 .end method
@@ -290,9 +290,9 @@
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ac;->ua()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ac;->tZ()I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -342,17 +342,17 @@
     return p1
 .end method
 
-.method private final qf()J
+.method private final qe()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ac;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ac;->qe()J
 
     move-result-wide v0
     :try_end_0
@@ -372,7 +372,7 @@
     return-wide v0
 .end method
 
-.method private final ug()V
+.method private final uf()V
     .locals 3
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/af;->aVc:Z
@@ -382,7 +382,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uu()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ut()Z
 
     move-result v0
 
@@ -452,12 +452,12 @@
     return-void
 .end method
 
-.method private final uh()Z
+.method private final ug()Z
     .locals 11
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     const-string v0, "Dispatching a batch of local hits"
 
@@ -473,7 +473,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/af;->aUU:Lcom/google/android/gms/internal/measurement/bm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/bm;->qX()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/bm;->qW()Z
 
     move-result v1
 
@@ -492,11 +492,11 @@
     return v2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uy()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ux()I
 
     move-result v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uz()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uy()I
 
     move-result v1
 
@@ -539,7 +539,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/q;->bI(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()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
@@ -564,7 +564,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 
@@ -625,7 +625,7 @@
 
     invoke-virtual {p0, v0, v1, v3}, Lcom/google/android/gms/internal/measurement/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
@@ -649,7 +649,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 
@@ -730,7 +730,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
@@ -754,7 +754,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 
@@ -762,7 +762,7 @@
     :try_start_a
     iget-object v7, p0, Lcom/google/android/gms/internal/measurement/af;->aUU:Lcom/google/android/gms/internal/measurement/bm;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/bm;->qX()Z
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/bm;->qW()Z
 
     move-result v7
 
@@ -824,7 +824,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
     :try_end_c
     .catchall {:try_start_c .. :try_end_c} :catchall_0
 
@@ -848,7 +848,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 
@@ -883,7 +883,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 
@@ -908,7 +908,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 
@@ -920,7 +920,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
     :try_end_11
     .catchall {:try_start_11 .. :try_end_11} :catchall_0
 
@@ -944,7 +944,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 
@@ -971,15 +971,15 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return v2
 .end method
 
-.method private final uj()V
+.method private final ui()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/ay;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tL()Lcom/google/android/gms/internal/measurement/ay;
 
     move-result-object v0
 
@@ -994,7 +994,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->qf()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->qe()J
 
     move-result-wide v1
 
@@ -1004,7 +1004,7 @@
 
     if-eqz v5, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v3
 
@@ -1032,7 +1032,7 @@
 
     if-gtz v5, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ux()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uw()J
 
     move-result-wide v1
 
@@ -1044,18 +1044,18 @@
 
     invoke-virtual {p0, v3, v1}, Lcom/google/android/gms/internal/measurement/q;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ay;->uI()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ay;->uH()V
 
     :cond_1
     return-void
 .end method
 
-.method private final uk()V
+.method private final uj()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUY:Lcom/google/android/gms/internal/measurement/av;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/av;->uG()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/av;->uF()Z
 
     move-result v0
 
@@ -1070,7 +1070,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/av;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/ay;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tL()Lcom/google/android/gms/internal/measurement/ay;
 
     move-result-object v0
 
@@ -1084,7 +1084,7 @@
     return-void
 .end method
 
-.method private final ul()J
+.method private final uk()J
     .locals 5
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUX:J
@@ -1095,8 +1095,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUX:J
-
     return-wide v0
 
     :cond_0
@@ -1112,11 +1110,11 @@
 
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/t;->tV()Lcom/google/android/gms/internal/measurement/by;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/t;->tU()Lcom/google/android/gms/internal/measurement/by;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-boolean v2, v2, Lcom/google/android/gms/internal/measurement/by;->aXm:Z
 
@@ -1124,11 +1122,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tV()Lcom/google/android/gms/internal/measurement/by;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tU()Lcom/google/android/gms/internal/measurement/by;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget v0, v0, Lcom/google/android/gms/internal/measurement/by;->aWB:I
 
@@ -1142,12 +1140,12 @@
     return-wide v0
 .end method
 
-.method private final um()V
+.method private final ul()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     const/4 v0, 0x1
 
@@ -1157,7 +1155,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/x;->disconnect()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
 
     return-void
 .end method
@@ -1169,9 +1167,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/af;->aVc:Z
 
@@ -1206,13 +1204,13 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v0
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bo;->aWX:Lcom/google/android/gms/internal/measurement/bp;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bp;->uU()Landroid/util/Pair;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bp;->uT()Landroid/util/Pair;
 
     move-result-object v0
 
@@ -1300,7 +1298,7 @@
     move-object p1, v0
 
     :goto_1
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ug()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uf()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUW:Lcom/google/android/gms/internal/measurement/x;
 
@@ -1322,7 +1320,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ac;->c(Lcom/google/android/gms/internal/measurement/bg;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1337,7 +1335,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -1353,15 +1351,15 @@
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/af;->aVb:J
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/bo;->rd()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/bo;->rc()J
 
     move-result-wide v2
 
@@ -1371,7 +1369,7 @@
 
     if-eqz v6, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v4
 
@@ -1399,22 +1397,22 @@
 
     invoke-virtual {p0, v4, v2}, Lcom/google/android/gms/internal/measurement/q;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ug()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uf()V
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ug()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/bo;->uR()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/bo;->uQ()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
 
     if-eqz p1, :cond_1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/az;->un()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/az;->um()V
 
     :cond_1
     iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/af;->aVb:J
@@ -1463,17 +1461,17 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uR()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uQ()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
 
     if-eqz p1, :cond_3
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/az;->un()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/az;->um()V
 
     :cond_3
     return-void
@@ -1482,7 +1480,7 @@
 .method protected final b(Lcom/google/android/gms/internal/measurement/w;)V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     const-string v0, "Sending first hit to property"
 
@@ -1490,15 +1488,15 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/measurement/q;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uQ()Lcom/google/android/gms/internal/measurement/bw;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uP()Lcom/google/android/gms/internal/measurement/bw;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uE()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uD()J
 
     move-result-wide v1
 
@@ -1511,11 +1509,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uS()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uR()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1530,7 +1528,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v1
 
@@ -1552,11 +1550,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -1573,11 +1571,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/bo;->uS()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/bo;->uR()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1607,21 +1605,21 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v1
 
     invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/measurement/bo;->bT(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bo;->uQ()Lcom/google/android/gms/internal/measurement/bw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bo;->uP()Lcom/google/android/gms/internal/measurement/bw;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uE()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uD()J
 
     move-result-wide v1
 
@@ -1644,7 +1642,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac;->ub()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac;->ua()Ljava/util/List;
 
     move-result-object p1
 
@@ -1674,13 +1672,13 @@
 .end method
 
 .method public final c(Lcom/google/android/gms/internal/measurement/w;)J
-    .locals 11
+    .locals 13
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     const-wide/16 v0, -0x1
 
@@ -1697,9 +1695,9 @@
 
     invoke-static {v5}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1713,13 +1711,13 @@
 
     new-array v9, v9, [Ljava/lang/String;
 
-    const/4 v10, 0x0
-
     invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
     move-result-object v3
 
-    aput-object v3, v9, v10
+    const/4 v4, 0x0
+
+    aput-object v3, v9, v4
 
     const/4 v3, 0x1
 
@@ -1727,157 +1725,165 @@
 
     invoke-virtual {v6, v7, v8, v9}, Landroid/database/sqlite/SQLiteDatabase;->delete(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)I
 
-    move-result v3
+    move-result v5
 
-    if-lez v3, :cond_0
+    if-lez v5, :cond_0
 
-    const-string v4, "Deleted property records"
+    const-string v6, "Deleted property records"
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v5
 
-    invoke-virtual {v2, v4, v3}, Lcom/google/android/gms/internal/measurement/q;->j(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {v2, v6, v5}, Lcom/google/android/gms/internal/measurement/q;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
-    iget-wide v3, p1, Lcom/google/android/gms/internal/measurement/w;->aUA:J
+    iget-wide v5, p1, Lcom/google/android/gms/internal/measurement/w;->aUA:J
 
-    iget-object v5, p1, Lcom/google/android/gms/internal/measurement/w;->aTC:Ljava/lang/String;
+    iget-object v7, p1, Lcom/google/android/gms/internal/measurement/w;->aTC:Ljava/lang/String;
 
-    iget-object v6, p1, Lcom/google/android/gms/internal/measurement/w;->aUB:Ljava/lang/String;
+    iget-object v8, p1, Lcom/google/android/gms/internal/measurement/w;->aUB:Ljava/lang/String;
 
-    invoke-virtual {v2, v3, v4, v5, v6}, Lcom/google/android/gms/internal/measurement/ac;->a(JLjava/lang/String;Ljava/lang/String;)J
+    invoke-virtual {v2, v5, v6, v7, v8}, Lcom/google/android/gms/internal/measurement/ac;->a(JLjava/lang/String;Ljava/lang/String;)J
 
-    move-result-wide v2
+    move-result-wide v5
 
-    const-wide/16 v4, 0x1
+    const-wide/16 v7, 0x1
 
-    add-long/2addr v4, v2
+    add-long/2addr v7, v5
 
-    iput-wide v4, p1, Lcom/google/android/gms/internal/measurement/w;->aUD:J
+    iput-wide v7, p1, Lcom/google/android/gms/internal/measurement/w;->aUD:J
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ac;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
-    move-result-object v5
+    move-result-object v7
 
-    iget-object v6, p1, Lcom/google/android/gms/internal/measurement/w;->aTo:Ljava/util/Map;
+    iget-object v8, p1, Lcom/google/android/gms/internal/measurement/w;->aTo:Ljava/util/Map;
 
-    invoke-static {v6}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v8}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    new-instance v7, Landroid/net/Uri$Builder;
+    new-instance v9, Landroid/net/Uri$Builder;
 
-    invoke-direct {v7}, Landroid/net/Uri$Builder;-><init>()V
+    invoke-direct {v9}, Landroid/net/Uri$Builder;-><init>()V
 
-    invoke-interface {v6}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+    invoke-interface {v8}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    move-result-object v6
+    move-result-object v8
 
-    invoke-interface {v6}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    invoke-interface {v8}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    move-result-object v6
+    move-result-object v8
 
     :goto_0
-    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v8}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v8
+    move-result v10
 
-    if-eqz v8, :cond_1
+    if-eqz v10, :cond_1
 
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v8}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v10
 
-    check-cast v8, Ljava/util/Map$Entry;
+    check-cast v10, Ljava/util/Map$Entry;
 
-    invoke-interface {v8}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+    invoke-interface {v10}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object v11
 
-    check-cast v9, Ljava/lang/String;
+    check-cast v11, Ljava/lang/String;
 
-    invoke-interface {v8}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v10}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v10
 
-    check-cast v8, Ljava/lang/String;
+    check-cast v10, Ljava/lang/String;
 
-    invoke-virtual {v7, v9, v8}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+    invoke-virtual {v9, v11, v10}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v7}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
+    invoke-virtual {v9}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
 
-    move-result-object v6
+    move-result-object v8
 
-    invoke-virtual {v6}, Landroid/net/Uri;->getEncodedQuery()Ljava/lang/String;
+    invoke-virtual {v8}, Landroid/net/Uri;->getEncodedQuery()Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v8
 
-    if-nez v6, :cond_2
+    if-nez v8, :cond_2
 
-    const-string v6, ""
+    const-string v8, ""
 
     :cond_2
-    new-instance v7, Landroid/content/ContentValues;
+    new-instance v9, Landroid/content/ContentValues;
 
-    invoke-direct {v7}, Landroid/content/ContentValues;-><init>()V
+    invoke-direct {v9}, Landroid/content/ContentValues;-><init>()V
 
-    const-string v8, "app_uid"
+    const-string v10, "app_uid"
 
-    iget-wide v9, p1, Lcom/google/android/gms/internal/measurement/w;->aUA:J
+    iget-wide v11, p1, Lcom/google/android/gms/internal/measurement/w;->aUA:J
 
-    invoke-static {v9, v10}, 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 v11
 
-    invoke-virtual {v7, v8, v9}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v9, v10, v11}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    const-string v8, "cid"
+    const-string v10, "cid"
 
-    iget-object v9, p1, Lcom/google/android/gms/internal/measurement/w;->aTC:Ljava/lang/String;
+    iget-object v11, p1, Lcom/google/android/gms/internal/measurement/w;->aTC:Ljava/lang/String;
 
-    invoke-virtual {v7, v8, v9}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v9, v10, v11}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    const-string v8, "tid"
+    const-string v10, "tid"
 
-    iget-object v9, p1, Lcom/google/android/gms/internal/measurement/w;->aUB:Ljava/lang/String;
+    iget-object v11, p1, Lcom/google/android/gms/internal/measurement/w;->aUB:Ljava/lang/String;
 
-    invoke-virtual {v7, v8, v9}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v9, v10, v11}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    const-string v8, "adid"
+    const-string v10, "adid"
 
-    iget-boolean v9, p1, Lcom/google/android/gms/internal/measurement/w;->aUC:Z
+    iget-boolean v11, p1, Lcom/google/android/gms/internal/measurement/w;->aUC:Z
 
-    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    if-eqz v11, :cond_3
 
-    move-result-object v9
+    goto :goto_1
 
-    invoke-virtual {v7, v8, v9}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
+    :cond_3
+    const/4 v3, 0x0
 
-    const-string v8, "hits_count"
+    :goto_1
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    iget-wide v9, p1, Lcom/google/android/gms/internal/measurement/w;->aUD:J
+    move-result-object v3
 
-    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {v9, v10, v3}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
+
+    const-string v3, "hits_count"
+
+    iget-wide v10, p1, Lcom/google/android/gms/internal/measurement/w;->aUD:J
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
-    invoke-virtual {v7, v8, p1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v9, v3, p1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
     const-string p1, "params"
 
-    invoke-virtual {v7, p1, v6}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v9, p1, v8}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_2
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -1885,37 +1891,37 @@
     :try_start_1
     const-string p1, "properties"
 
-    const/4 v6, 0x0
+    const/4 v3, 0x0
 
-    const/4 v8, 0x5
+    const/4 v4, 0x5
 
-    invoke-virtual {v5, p1, v6, v7, v8}, Landroid/database/sqlite/SQLiteDatabase;->insertWithOnConflict(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)J
+    invoke-virtual {v7, p1, v3, v9, v4}, Landroid/database/sqlite/SQLiteDatabase;->insertWithOnConflict(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)J
 
-    move-result-wide v5
+    move-result-wide v3
 
-    cmp-long p1, v5, v0
+    cmp-long p1, v3, v0
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_4
 
     const-string p1, "Failed to insert/update a property (got -1)"
 
-    invoke-virtual {v4, p1}, Lcom/google/android/gms/internal/measurement/q;->bL(Ljava/lang/String;)V
+    invoke-virtual {v2, p1}, Lcom/google/android/gms/internal/measurement/q;->bL(Ljava/lang/String;)V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_1
+    goto :goto_2
 
     :catch_0
     move-exception p1
 
     :try_start_2
-    const-string v5, "Error storing a property"
+    const-string v3, "Error storing a property"
 
-    invoke-virtual {v4, v5, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {v2, v3, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :cond_3
-    :goto_1
+    :cond_4
+    :goto_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac;->setTransactionSuccessful()V
@@ -1930,7 +1936,7 @@
     :try_end_3
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_1
 
-    goto :goto_2
+    goto :goto_3
 
     :catch_1
     move-exception p1
@@ -1939,13 +1945,13 @@
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_2
-    return-wide v2
+    :goto_3
+    return-wide v5
 
     :catchall_0
     move-exception p1
 
-    goto :goto_4
+    goto :goto_5
 
     :catch_2
     move-exception p1
@@ -1964,7 +1970,7 @@
     :try_end_5
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_3
 
-    goto :goto_3
+    goto :goto_4
 
     :catch_3
     move-exception p1
@@ -1973,10 +1979,10 @@
 
     invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_3
+    :goto_4
     return-wide v0
 
-    :goto_4
+    :goto_5
     :try_start_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
@@ -1984,7 +1990,7 @@
     :try_end_6
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_6 .. :try_end_6} :catch_4
 
-    goto :goto_5
+    goto :goto_6
 
     :catch_4
     move-exception v0
@@ -1993,20 +1999,22 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_5
+    :goto_6
     throw p1
+
+    return-void
 .end method
 
 .method protected final onServiceConnected()V
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uu()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ut()Z
 
     move-result v0
 
@@ -2048,7 +2056,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uy()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ux()I
 
     move-result v1
 
@@ -2064,7 +2072,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -2094,7 +2102,7 @@
 
     if-nez v2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
 
     return-void
 
@@ -2119,7 +2127,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return-void
 
@@ -2130,7 +2138,9 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
+
+    return-void
 
     :cond_5
     return-void
@@ -2139,7 +2149,7 @@
 .method final start()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/af;->started:Z
 
@@ -2155,7 +2165,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -2168,30 +2178,30 @@
     return-void
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUT:Lcom/google/android/gms/internal/measurement/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUU:Lcom/google/android/gms/internal/measurement/bm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUW:Lcom/google/android/gms/internal/measurement/x;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     return-void
 .end method
 
-.method final tJ()V
+.method final tI()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -2204,12 +2214,12 @@
     return-void
 .end method
 
-.method protected final uf()V
+.method protected final ue()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
@@ -2251,11 +2261,11 @@
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/q;->bz(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uP()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bo;->uO()J
 
     const-string v0, "android.permission.ACCESS_NETWORK_STATE"
 
@@ -2269,7 +2279,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/q;->bL(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->um()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ul()V
 
     :cond_3
     const-string v0, "android.permission.INTERNET"
@@ -2284,7 +2294,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/q;->bL(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->um()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ul()V
 
     :cond_4
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->getContext()Landroid/content/Context;
@@ -2321,20 +2331,20 @@
 
     if-nez v0, :cond_6
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ug()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uf()V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
 
     return-void
 .end method
 
-.method public final ui()V
+.method public final uh()V
     .locals 8
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/af;->aVc:Z
 
@@ -2344,7 +2354,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ul()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()J
 
     move-result-wide v4
 
@@ -2366,7 +2376,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bl;->unregister()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return-void
 
@@ -2383,7 +2393,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bl;->unregister()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
     return-void
 
@@ -2402,7 +2412,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUV:Lcom/google/android/gms/internal/measurement/bl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bl;->uL()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bl;->uK()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUV:Lcom/google/android/gms/internal/measurement/bl;
 
@@ -2411,27 +2421,27 @@
     move-result v1
 
     :cond_3
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_7
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ul()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tN()Lcom/google/android/gms/internal/measurement/bo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tM()Lcom/google/android/gms/internal/measurement/bo;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/bo;->rd()J
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/bo;->rc()J
 
     move-result-wide v4
 
     cmp-long v6, v4, v2
 
-    if-eqz v6, :cond_4
+    if-eqz v6, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v6
 
@@ -2454,7 +2464,18 @@
     goto :goto_1
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uw()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uv()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/measurement/at;->uv()J
 
     move-result-wide v2
 
@@ -2473,17 +2494,17 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUY:Lcom/google/android/gms/internal/measurement/av;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/av;->uG()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/av;->uF()Z
 
     move-result v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     const-wide/16 v0, 0x1
 
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/af;->aUY:Lcom/google/android/gms/internal/measurement/av;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/av;->uF()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/av;->uE()J
 
     move-result-wide v2
 
@@ -2499,17 +2520,17 @@
 
     return-void
 
-    :cond_5
+    :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/af;->aUY:Lcom/google/android/gms/internal/measurement/av;
 
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/internal/measurement/av;->aj(J)V
 
     return-void
 
-    :cond_6
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uk()V
-
+    :cond_7
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->uj()V
 
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ai.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ai.smali
index f526a0b2c2..624ad09370 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
@@ -27,7 +27,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ai;->aVd:Lcom/google/android/gms/internal/measurement/af;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->uf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->ue()V
 
     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 550ede1209..8008ae8549 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
@@ -22,12 +22,12 @@
 
 
 # virtual methods
-.method public final un()V
+.method public final um()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aj;->aVd:Lcom/google/android/gms/internal/measurement/af;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
 
     return-void
 .end method
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 d01c8151d0..3d4e6b4869 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
@@ -292,29 +292,24 @@
 
     invoke-virtual {p1, v2, v0}, Landroid/content/Context;->openFileOutput(Ljava/lang/String;I)Ljava/io/FileOutputStream;
 
-    move-result-object p1
-    :try_end_0
-    .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_5
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_3
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v1
 
-    :try_start_1
     invoke-virtual {p2}, Ljava/lang/String;->getBytes()[B
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-virtual {p1, p2}, Ljava/io/FileOutputStream;->write([B)V
+    invoke-virtual {v1, p1}, Ljava/io/FileOutputStream;->write([B)V
+    :try_end_0
+    .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v1, :cond_0
+
+    :try_start_1
+    invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
     :try_end_1
-    .catch Ljava/io/FileNotFoundException; {:try_start_1 .. :try_end_1} :catch_2
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz p1, :cond_0
-
-    :try_start_2
-    invoke-virtual {p1}, Ljava/io/FileOutputStream;->close()V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
     goto :goto_0
 
@@ -332,48 +327,56 @@
     return p1
 
     :catchall_0
-    move-exception p2
+    move-exception p1
 
-    move-object v1, p1
-
-    goto :goto_5
+    goto :goto_3
 
     :catch_1
-    move-exception p2
+    move-exception p1
 
-    move-object v1, p1
+    :try_start_2
+    const-string p2, "Error writing to clientId file"
+
+    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    if-eqz v1, :cond_1
+
+    :try_start_3
+    invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
 
     goto :goto_1
 
     :catch_2
-    move-exception p2
+    move-exception p1
 
-    move-object v1, p1
+    const-string p2, "Failed to close clientId writing stream"
 
-    goto :goto_3
+    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :catchall_1
-    move-exception p2
-
-    goto :goto_5
+    :cond_1
+    :goto_1
+    return v0
 
     :catch_3
-    move-exception p2
-
-    :goto_1
-    :try_start_3
-    const-string p1, "Error writing to clientId file"
-
-    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    if-eqz v1, :cond_1
+    move-exception p1
 
     :try_start_4
-    invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
+    const-string p2, "Error creating clientId file"
+
+    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
     :try_end_4
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+
+    if-eqz v1, :cond_2
+
+    :try_start_5
+    invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
+    :try_end_5
+    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_4
 
     goto :goto_2
 
@@ -384,75 +387,44 @@
 
     invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :cond_1
+    :cond_2
     :goto_2
     return v0
 
-    :catch_5
-    move-exception p2
-
     :goto_3
-    :try_start_5
-    const-string p1, "Error creating clientId file"
-
-    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     :try_start_6
     invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
     :try_end_6
-    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_6
+    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_5
 
     goto :goto_4
 
-    :catch_6
-    move-exception p1
-
-    const-string p2, "Failed to close clientId writing stream"
-
-    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
-
-    :cond_2
-    :goto_4
-    return v0
-
-    :goto_5
-    if-eqz v1, :cond_3
-
-    :try_start_7
-    invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
-    :try_end_7
-    .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_7
-
-    goto :goto_6
-
-    :catch_7
-    move-exception p1
+    :catch_5
+    move-exception p2
 
     const-string v0, "Failed to close clientId writing stream"
 
-    invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_3
-    :goto_6
-    throw p2
+    :goto_4
+    throw p1
 .end method
 
 
 # virtual methods
-.method protected final tB()V
+.method protected final tA()V
     .locals 0
 
     return-void
 .end method
 
-.method public final uo()Ljava/lang/String;
+.method public final un()Ljava/lang/String;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     monitor-enter p0
 
@@ -463,7 +435,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -499,7 +471,7 @@
     .catch Ljava/util/concurrent/ExecutionException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception v0
@@ -511,10 +483,9 @@
 
     const-string v0, "0"
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al;->aTC:Ljava/lang/String;
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_1
     move-exception v0
@@ -525,9 +496,9 @@
 
     const-string v0, "0"
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al;->aTC:Ljava/lang/String;
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al;->aTC:Ljava/lang/String;
 
     if-nez v0, :cond_1
@@ -564,7 +535,7 @@
     throw v0
 .end method
 
-.method final up()Ljava/lang/String;
+.method final uo()Ljava/lang/String;
     .locals 2
 
     monitor-enter p0
@@ -576,7 +547,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -594,7 +565,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al;->uo()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al;->un()Ljava/lang/String;
 
     move-result-object v0
 
@@ -611,12 +582,12 @@
     throw v0
 .end method
 
-.method final uq()Ljava/lang/String;
+.method final up()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -628,7 +599,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al;->ur()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al;->uq()Ljava/lang/String;
 
     move-result-object v0
 
@@ -636,7 +607,7 @@
     return-object v0
 .end method
 
-.method final ur()Ljava/lang/String;
+.method final uq()Ljava/lang/String;
     .locals 2
 
     invoke-static {}, Ljava/util/UUID;->randomUUID()Ljava/util/UUID;
@@ -656,7 +627,7 @@
     :try_start_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v1
 
@@ -672,6 +643,8 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-object v0
+
     :cond_0
     return-object 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 25b79943bc..0412c2653c 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
@@ -43,7 +43,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/am;->aVm:Lcom/google/android/gms/internal/measurement/al;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al;->uq()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al;->up()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali
index 5fece2e251..1fb2c5cb52 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali
@@ -43,7 +43,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/an;->aVm:Lcom/google/android/gms/internal/measurement/al;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al;->ur()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al;->uq()Ljava/lang/String;
 
     move-result-object v0
 
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 14995ca94f..6f9cad0ee0 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
@@ -115,7 +115,7 @@
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     const-string v1, "string"
@@ -152,7 +152,7 @@
 
     invoke-interface {v2, v0, v1}, Lcom/google/android/gms/internal/measurement/as;->A(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const-string v1, "bool"
@@ -205,7 +205,7 @@
     .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_1 .. :try_end_1} :catch_2
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_2
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception v0
@@ -213,10 +213,9 @@
     :try_start_2
     const-string v2, "Error parsing bool configuration value"
 
-    :goto_1
     invoke-virtual {p0, v2, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->c(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const-string v1, "integer"
@@ -269,7 +268,7 @@
     .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_3 .. :try_end_3} :catch_2
     .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_1
     move-exception v0
@@ -277,10 +276,10 @@
     :try_start_4
     const-string v2, "Error parsing int configuration value"
 
-    goto :goto_1
+    invoke-virtual {p0, v2, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->c(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_3
-    :goto_2
+    :goto_1
     invoke-interface {p1}, Landroid/content/res/XmlResourceParser;->next()I
 
     move-result v0
@@ -300,7 +299,7 @@
     :cond_4
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ar;->aVs:Lcom/google/android/gms/internal/measurement/as;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/as;->us()Lcom/google/android/gms/internal/measurement/aq;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/as;->ur()Lcom/google/android/gms/internal/measurement/aq;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali
index f147753afa..76ba3fe308 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
@@ -23,7 +23,7 @@
 .method public abstract i(Ljava/lang/String;I)V
 .end method
 
-.method public abstract us()Lcom/google/android/gms/internal/measurement/aq;
+.method public abstract ur()Lcom/google/android/gms/internal/measurement/aq;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TU;"
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 d7e8ecc2d3..6960d08e52 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
@@ -36,7 +36,7 @@
 .method public static uA()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVU:Lcom/google/android/gms/internal/measurement/bc;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVT:Lcom/google/android/gms/internal/measurement/bc;
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bc;->aWv:Ljava/lang/Object;
 
@@ -48,18 +48,6 @@
 .method public static uB()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVT:Lcom/google/android/gms/internal/measurement/bc;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bc;->aWv:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public static uC()Ljava/lang/String;
-    .locals 1
-
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVV:Lcom/google/android/gms/internal/measurement/bc;
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bc;->aWv:Ljava/lang/Object;
@@ -69,7 +57,7 @@
     return-object v0
 .end method
 
-.method public static uE()J
+.method public static uD()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aWj:Lcom/google/android/gms/internal/measurement/bc;
@@ -85,7 +73,7 @@
     return-wide v0
 .end method
 
-.method public static uu()Z
+.method public static ut()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVE:Lcom/google/android/gms/internal/measurement/bc;
@@ -101,7 +89,7 @@
     return v0
 .end method
 
-.method public static uv()I
+.method public static uu()I
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aWb:Lcom/google/android/gms/internal/measurement/bc;
@@ -117,7 +105,7 @@
     return v0
 .end method
 
-.method public static uw()J
+.method public static uv()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVM:Lcom/google/android/gms/internal/measurement/bc;
@@ -133,7 +121,7 @@
     return-wide v0
 .end method
 
-.method public static ux()J
+.method public static uw()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVP:Lcom/google/android/gms/internal/measurement/bc;
@@ -149,7 +137,7 @@
     return-wide v0
 .end method
 
-.method public static uy()I
+.method public static ux()I
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVR:Lcom/google/android/gms/internal/measurement/bc;
@@ -165,7 +153,7 @@
     return v0
 .end method
 
-.method public static uz()I
+.method public static uy()I
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVS:Lcom/google/android/gms/internal/measurement/bc;
@@ -181,9 +169,21 @@
     return v0
 .end method
 
+.method public static uz()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVU:Lcom/google/android/gms/internal/measurement/bc;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bc;->aWv:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
 
 # virtual methods
-.method public final uD()Ljava/util/Set;
+.method public final uC()Ljava/util/Set;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -208,8 +208,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/at;->zzyl:Ljava/lang/String;
-
     invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1
@@ -265,7 +263,7 @@
     return-object v0
 .end method
 
-.method public final ut()Z
+.method public final us()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/at;->aVt:Ljava/lang/Boolean;
@@ -287,7 +285,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->md()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mc()Ljava/lang/String;
 
     move-result-object v1
 
@@ -354,7 +352,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/at;->Yg:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali
index b1c113a099..06ac7c1224 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali
@@ -140,7 +140,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/av;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -159,7 +159,7 @@
 .method public final ak(J)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/av;->uG()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/av;->uF()Z
 
     move-result v0
 
@@ -226,7 +226,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/av;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -263,7 +263,7 @@
 .method public abstract run()V
 .end method
 
-.method public final uF()J
+.method public final uE()J
     .locals 5
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/av;->aVx:J
@@ -296,7 +296,7 @@
     return-wide v0
 .end method
 
-.method public final uG()Z
+.method public final uF()Z
     .locals 5
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/av;->aVx:J
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 23ffb166ba..21055e838b 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
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aw;->aVy:Lcom/google/android/gms/internal/measurement/av;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/av;->uG()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/av;->uF()Z
 
     move-result v0
 
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 5aad85b9a6..27c319217d 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
@@ -13,20 +13,20 @@
 
 
 # virtual methods
-.method protected final tB()V
+.method protected final tA()V
     .locals 0
 
     return-void
 .end method
 
-.method public final uH()Lcom/google/android/gms/internal/measurement/c;
+.method public final uG()Lcom/google/android/gms/internal/measurement/c;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ay.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ay.smali
index 4b53c37b94..d2b4b816ee 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
@@ -96,7 +96,7 @@
     return v0
 .end method
 
-.method private final uJ()Landroid/app/PendingIntent;
+.method private final uI()Landroid/app/PendingIntent;
     .locals 4
 
     new-instance v0, Landroid/content/Intent;
@@ -141,7 +141,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ay;->aVB:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ay;->uJ()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ay;->uI()Landroid/app/PendingIntent;
 
     move-result-object v1
 
@@ -187,13 +187,13 @@
     return-void
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 5
 
     :try_start_0
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ay;->cancel()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ux()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uw()J
 
     move-result-wide v0
 
@@ -243,15 +243,17 @@
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    :catch_0
     :cond_0
     return-void
+
+    :catch_0
+    return-void
 .end method
 
-.method public final uI()V
+.method public final uH()V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ay;->aVz:Z
 
@@ -259,7 +261,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ux()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uw()J
 
     move-result-wide v6
 
@@ -271,7 +273,7 @@
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ay;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -380,7 +382,7 @@
 
     const/4 v3, 0x2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ay;->uJ()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ay;->uI()Landroid/app/PendingIntent;
 
     move-result-object v8
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali
index bd7dff0d1c..a91a318a79 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract un()V
+.method public abstract um()V
 .end method
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 52c85ff119..3ec5c72c8e 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
@@ -91,7 +91,7 @@
     :cond_2
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/be;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object p2
 
@@ -122,7 +122,7 @@
     :cond_0
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/be;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object p2
 
@@ -153,7 +153,7 @@
     :cond_0
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/be;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object p2
 
@@ -164,7 +164,7 @@
     return-void
 .end method
 
-.method public final synthetic us()Lcom/google/android/gms/internal/measurement/aq;
+.method public final synthetic ur()Lcom/google/android/gms/internal/measurement/aq;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/be;->aWx:Lcom/google/android/gms/internal/measurement/bf;
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 0e351d4923..d6cc66849b 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
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     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 c1229d1011..eced53b2c5 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
@@ -32,7 +32,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bk;->uK()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bk;->uJ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali
index 4f8c3dc19f..257d14eb24 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali
@@ -195,7 +195,7 @@
     return-object p0
 .end method
 
-.method public static uK()Lcom/google/android/gms/internal/measurement/bk;
+.method public static uJ()Lcom/google/android/gms/internal/measurement/bk;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bk;->aWK:Lcom/google/android/gms/internal/measurement/bk;
@@ -271,11 +271,11 @@
     const/16 p1, 0x8
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tL()Lcom/google/android/gms/internal/measurement/at;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/internal/measurement/at;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/at;->ut()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/at;->us()Z
 
     move-result v1
 
@@ -400,7 +400,7 @@
 
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/bo;->aWX:Lcom/google/android/gms/internal/measurement/bp;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uV()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uU()J
 
     move-result-wide p3
 
@@ -410,7 +410,7 @@
 
     if-nez p5, :cond_6
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uT()V
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uS()V
 
     :cond_6
     if-nez p1, :cond_7
@@ -427,7 +427,7 @@
 
     iget-object p3, p3, Lcom/google/android/gms/internal/measurement/bo;->aWU:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uX()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uW()Ljava/lang/String;
 
     move-result-object p4
 
@@ -449,13 +449,13 @@
 
     move-result-object p3
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uY()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uX()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/measurement/bp;->uX()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uW()Ljava/lang/String;
 
     move-result-object p1
 
@@ -506,14 +506,14 @@
 
     if-eqz v0, :cond_a
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uY()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uX()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/measurement/bp;->uX()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/bp;->uW()Ljava/lang/String;
 
     move-result-object p1
 
@@ -669,7 +669,7 @@
     return-void
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 2
 
     const-class v0, Lcom/google/android/gms/internal/measurement/bk;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali
index 66e9985877..1475dbff72 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali
@@ -33,7 +33,7 @@
     return-void
 .end method
 
-.method private final qX()Z
+.method private final qW()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
@@ -69,21 +69,23 @@
 
     return v0
 
-    :catch_0
     :cond_0
     return v1
+
+    :catch_0
+    return v1
 .end method
 
-.method private final uM()V
+.method private final uL()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     return-void
 .end method
@@ -99,7 +101,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -116,7 +118,7 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->uM()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->uL()V
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
@@ -124,7 +126,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -140,7 +142,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->qX()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->qW()Z
 
     move-result p1
 
@@ -152,7 +154,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object p2
 
@@ -166,7 +168,7 @@
 
     iget-object v0, p2, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -198,7 +200,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object p1
 
@@ -206,7 +208,7 @@
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/measurement/q;->bI(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/l;->tH()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/l;->tG()V
 
     :cond_2
     return-void
@@ -214,7 +216,7 @@
     :cond_3
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object p2
 
@@ -225,10 +227,10 @@
     return-void
 .end method
 
-.method public final uL()V
+.method public final uK()V
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->uM()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->uL()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aWM:Z
 
@@ -263,7 +265,7 @@
 
     invoke-virtual {v0, p0, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->qX()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bl;->qW()Z
 
     move-result v0
 
@@ -271,7 +273,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -304,7 +306,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -334,7 +336,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bl;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v1
 
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 b77e005a49..c4b7584adf 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
@@ -114,7 +114,7 @@
 
     invoke-virtual {p0, v0, v1, p1}, Lcom/google/android/gms/internal/measurement/q;->b(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bm;->tO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bm;->tN()Z
 
     move-result v0
 
@@ -142,8 +142,8 @@
 
     move-result-object p1
     :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_3
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     const/4 v1, 0x1
 
@@ -158,13 +158,9 @@
 
     invoke-virtual {p1}, Ljava/net/HttpURLConnection;->getOutputStream()Ljava/io/OutputStream;
 
-    move-result-object v1
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_2
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+    move-result-object v0
 
-    :try_start_2
-    invoke-virtual {v1, p2}, Ljava/io/OutputStream;->write([B)V
+    invoke-virtual {v0, p2}, Ljava/io/OutputStream;->write([B)V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/bm;->a(Ljava/net/HttpURLConnection;)V
 
@@ -172,36 +168,36 @@
 
     move-result p2
 
-    const/16 v0, 0xc8
+    const/16 v1, 0xc8
 
-    if-ne p2, v0, :cond_1
+    if-ne p2, v1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/l;->tJ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/l;->tI()V
 
     :cond_1
-    const-string v0, "POST status"
+    const-string v1, "POST status"
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    invoke-virtual {p0, v0, v2}, Lcom/google/android/gms/internal/measurement/q;->k(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {p0, v1, v2}, Lcom/google/android/gms/internal/measurement/q;->k(Ljava/lang/String;Ljava/lang/Object;)V
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    if-eqz v0, :cond_2
+
+    :try_start_2
+    invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
     :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    if-eqz v1, :cond_2
-
-    :try_start_3
-    invoke-virtual {v1}, Ljava/io/OutputStream;->close()V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
 
     goto :goto_0
 
@@ -221,55 +217,41 @@
     :cond_3
     return p2
 
-    :catchall_0
-    move-exception p2
-
-    move-object v0, v1
-
-    goto :goto_3
-
     :catch_1
     move-exception p2
 
-    move-object v0, v1
-
     goto :goto_1
 
-    :catch_2
-    move-exception p2
-
-    goto :goto_1
-
-    :catchall_1
+    :catchall_0
     move-exception p2
 
     move-object p1, v0
 
     goto :goto_3
 
-    :catch_3
+    :catch_2
     move-exception p2
 
     move-object p1, v0
 
     :goto_1
-    :try_start_4
+    :try_start_3
     const-string v1, "Network POST connection error"
 
     invoke-virtual {p0, v1, p2}, Lcom/google/android/gms/internal/measurement/q;->l(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     if-eqz v0, :cond_4
 
-    :try_start_5
+    :try_start_4
     invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
-    :try_end_5
-    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_4
+    :try_end_4
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_3
 
     goto :goto_2
 
-    :catch_4
+    :catch_3
     move-exception p2
 
     const-string v0, "Error closing http post connection output stream"
@@ -287,20 +269,20 @@
 
     return p1
 
-    :catchall_2
+    :catchall_1
     move-exception p2
 
     :goto_3
     if-eqz v0, :cond_6
 
-    :try_start_6
+    :try_start_5
     invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
-    :try_end_6
-    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_5
+    :try_end_5
+    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_4
 
     goto :goto_4
 
-    :catch_5
+    :catch_4
     move-exception v0
 
     const-string v1, "Error closing http post connection output stream"
@@ -404,6 +386,8 @@
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/measurement/q;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
+    return-void
+
     :cond_1
     return-void
 
@@ -437,10 +421,12 @@
     :cond_2
     :goto_1
     throw v0
+
+    return-void
 .end method
 
 .method private final b(Ljava/net/URL;)I
-    .locals 4
+    .locals 3
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -453,105 +439,78 @@
     :try_start_0
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/bm;->c(Ljava/net/URL;)Ljava/net/HttpURLConnection;
 
-    move-result-object p1
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v0
 
-    :try_start_1
-    invoke-virtual {p1}, Ljava/net/HttpURLConnection;->connect()V
+    invoke-virtual {v0}, Ljava/net/HttpURLConnection;->connect()V
 
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/bm;->a(Ljava/net/HttpURLConnection;)V
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/bm;->a(Ljava/net/HttpURLConnection;)V
 
-    invoke-virtual {p1}, Ljava/net/HttpURLConnection;->getResponseCode()I
+    invoke-virtual {v0}, Ljava/net/HttpURLConnection;->getResponseCode()I
 
-    move-result v0
+    move-result p1
 
     const/16 v1, 0xc8
 
-    if-ne v0, v1, :cond_0
+    if-ne p1, v1, :cond_0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/l;->tJ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/l;->tI()V
 
     :cond_0
     const-string v1, "GET status"
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
     invoke-virtual {p0, v1, v2}, Lcom/google/android/gms/internal/measurement/q;->k(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz p1, :cond_1
+    if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Ljava/net/HttpURLConnection;->disconnect()V
+    invoke-virtual {v0}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_1
-    return v0
+    return p1
 
     :catchall_0
-    move-exception v0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
+    move-exception p1
 
     goto :goto_0
 
-    :catchall_1
+    :catch_0
     move-exception p1
 
-    move-object v3, v0
-
-    move-object v0, p1
-
-    move-object p1, v3
-
-    goto :goto_1
-
-    :catch_1
-    move-exception p1
-
-    move-object v3, v0
-
-    move-object v0, p1
-
-    move-object p1, v3
-
-    :goto_0
-    :try_start_2
+    :try_start_1
     const-string v1, "Network GET connection error"
 
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/q;->l(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/q;->l(Ljava/lang/String;Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {p1}, Ljava/net/HttpURLConnection;->disconnect()V
+    invoke-virtual {v0}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_2
     const/4 p1, 0x0
 
     return p1
 
-    :goto_1
-    if-eqz p1, :cond_3
+    :goto_0
+    if-eqz v0, :cond_3
 
-    invoke-virtual {p1}, Ljava/net/HttpURLConnection;->disconnect()V
+    invoke-virtual {v0}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_3
-    throw v0
+    throw p1
 .end method
 
 .method private final b(Ljava/net/URL;[B)I
@@ -639,7 +598,7 @@
     invoke-virtual {p0, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/q;->c(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bm;->tO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bm;->tN()Z
 
     move-result v2
 
@@ -730,11 +689,11 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/l;->tJ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/l;->tI()V
 
     :cond_3
     const-string v1, "POST status"
@@ -887,11 +846,11 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uz()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uC()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -929,7 +888,6 @@
 
     invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    :goto_0
     invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -944,14 +902,14 @@
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uC()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -989,9 +947,21 @@
 
     invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    goto :goto_0
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_1
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "?"
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    :goto_0
     :try_start_0
     new-instance p2, Ljava/net/URL;
 
@@ -1090,7 +1060,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uz()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1098,7 +1068,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uC()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1112,25 +1082,23 @@
 
     if-eqz v1, :cond_0
 
-    :goto_0
     invoke-virtual {p1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_0
     new-instance v0, Ljava/lang/String;
 
     invoke-direct {v0, p1}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_1
     move-object p1, v0
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1138,7 +1106,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uC()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1152,6 +1120,10 @@
 
     if-eqz v1, :cond_2
 
+    invoke-virtual {p1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
     goto :goto_0
 
     :cond_2
@@ -1159,9 +1131,9 @@
 
     invoke-direct {v0, p1}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    goto :goto_1
+    move-object p1, v0
 
-    :goto_2
+    :goto_0
     :try_start_0
     new-instance v0, Ljava/net/URL;
 
@@ -1183,10 +1155,10 @@
     return-object p1
 .end method
 
-.method private final uN()Ljava/net/URL;
+.method private final uM()Ljava/net/URL;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uz()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1245,7 +1217,7 @@
     return-object v0
 .end method
 
-.method static synthetic uO()[B
+.method static synthetic uN()[B
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bm;->aWQ:[B
@@ -1269,17 +1241,17 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tL()Lcom/google/android/gms/internal/measurement/at;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/internal/measurement/at;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/at;->uD()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/at;->uC()Ljava/util/Set;
 
     move-result-object v0
 
@@ -1449,7 +1421,7 @@
     return-object v2
 
     :cond_5
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bm;->uN()Ljava/net/URL;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bm;->uM()Ljava/net/URL;
 
     move-result-object p1
 
@@ -1511,11 +1483,11 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/measurement/q;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tL()Lcom/google/android/gms/internal/measurement/at;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/internal/measurement/at;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/at;->uD()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/at;->uC()Ljava/util/Set;
 
     move-result-object v0
 
@@ -1563,7 +1535,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_13
+    if-eqz v3, :cond_14
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -1585,19 +1557,17 @@
 
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v5
 
     const-string v6, "Error formatting hit for upload"
 
-    :goto_6
     invoke-virtual {v5, v3, v6}, Lcom/google/android/gms/internal/measurement/bk;->a(Lcom/google/android/gms/internal/measurement/bg;Ljava/lang/String;)V
 
-    :goto_7
     const/4 v5, 0x1
 
-    goto :goto_b
+    goto/16 :goto_7
 
     :cond_c
     invoke-virtual {v5}, Ljava/lang/String;->length()I
@@ -1614,7 +1584,7 @@
 
     move-result v7
 
-    if-gt v6, v7, :cond_e
+    if-gt v6, v7, :cond_f
 
     invoke-direct {p0, v3, v5}, Lcom/google/android/gms/internal/measurement/bm;->b(Lcom/google/android/gms/internal/measurement/bg;Ljava/lang/String;)Ljava/net/URL;
 
@@ -1624,39 +1594,48 @@
 
     const-string v5, "Failed to build collect GET endpoint url"
 
-    :goto_8
     invoke-virtual {p0, v5}, Lcom/google/android/gms/internal/measurement/q;->bL(Ljava/lang/String;)V
 
-    goto :goto_a
+    goto :goto_6
 
     :cond_d
     invoke-direct {p0, v5}, Lcom/google/android/gms/internal/measurement/bm;->b(Ljava/net/URL;)I
 
     move-result v5
 
-    if-ne v5, v4, :cond_12
+    if-ne v5, v4, :cond_e
+
+    const/4 v5, 0x1
 
-    :goto_9
     goto :goto_7
 
     :cond_e
+    const/4 v5, 0x0
+
+    goto :goto_7
+
+    :cond_f
     invoke-virtual {p0, v3, v1}, Lcom/google/android/gms/internal/measurement/bm;->a(Lcom/google/android/gms/internal/measurement/bg;Z)Ljava/lang/String;
 
     move-result-object v5
 
-    if-nez v5, :cond_f
+    if-nez v5, :cond_10
 
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v5
 
     const-string v6, "Error formatting hit for POST upload"
 
-    goto :goto_6
+    invoke-virtual {v5, v3, v6}, Lcom/google/android/gms/internal/measurement/bk;->a(Lcom/google/android/gms/internal/measurement/bg;Ljava/lang/String;)V
 
-    :cond_f
+    const/4 v5, 0x1
+
+    goto :goto_7
+
+    :cond_10
     invoke-virtual {v5}, Ljava/lang/String;->getBytes()[B
 
     move-result-object v5
@@ -1673,44 +1652,52 @@
 
     move-result v7
 
-    if-le v6, v7, :cond_10
+    if-le v6, v7, :cond_11
 
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v5
 
     const-string v6, "Hit payload exceeds size limit"
 
-    goto :goto_6
+    invoke-virtual {v5, v3, v6}, Lcom/google/android/gms/internal/measurement/bk;->a(Lcom/google/android/gms/internal/measurement/bg;Ljava/lang/String;)V
 
-    :cond_10
+    const/4 v5, 0x1
+
+    goto :goto_7
+
+    :cond_11
     invoke-direct {p0, v3}, Lcom/google/android/gms/internal/measurement/bm;->d(Lcom/google/android/gms/internal/measurement/bg;)Ljava/net/URL;
 
     move-result-object v6
 
-    if-nez v6, :cond_11
+    if-nez v6, :cond_12
 
     const-string v5, "Failed to build collect POST endpoint url"
 
-    goto :goto_8
+    invoke-virtual {p0, v5}, Lcom/google/android/gms/internal/measurement/q;->bL(Ljava/lang/String;)V
 
-    :cond_11
+    goto :goto_6
+
+    :cond_12
     invoke-direct {p0, v6, v5}, Lcom/google/android/gms/internal/measurement/bm;->a(Ljava/net/URL;[B)I
 
     move-result v5
 
-    if-ne v5, v4, :cond_12
+    if-ne v5, v4, :cond_13
 
-    goto :goto_9
+    const/4 v5, 0x1
 
-    :cond_12
-    :goto_a
+    goto :goto_7
+
+    :cond_13
+    :goto_6
     const/4 v5, 0x0
 
-    :goto_b
-    if-eqz v5, :cond_13
+    :goto_7
+    if-eqz v5, :cond_14
 
     iget-wide v5, v3, Lcom/google/android/gms/internal/measurement/bg;->aWE:J
 
@@ -1724,18 +1711,18 @@
 
     move-result v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uy()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->ux()I
 
     move-result v5
 
     if-lt v3, v5, :cond_b
 
-    :cond_13
+    :cond_14
     return-object v0
 .end method
 
 .method final a(Lcom/google/android/gms/internal/measurement/bg;Z)Ljava/lang/String;
-    .locals 6
+    .locals 5
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1835,7 +1822,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/bm;->a(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -1845,8 +1832,6 @@
 
     iget-wide v3, p1, Lcom/google/android/gms/internal/measurement/bg;->aWF:J
 
-    const/4 v5, 0x0
-
     sub-long/2addr v1, v3
 
     const-string v3, "qt"
@@ -1916,12 +1901,12 @@
     return-object p1
 .end method
 
-.method public final qX()Z
+.method public final qW()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->getContext()Landroid/content/Context;
 
@@ -1974,7 +1959,7 @@
     return v0
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 2
 
     const-string v0, "Network initialized. User agent"
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 e6002d571c..878e029a4c 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
@@ -40,7 +40,7 @@
 
     add-int/2addr v0, v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uz()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uy()I
 
     move-result v2
 
@@ -63,7 +63,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -80,7 +80,7 @@
 
     array-length v2, v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uu()I
 
     move-result v4
 
@@ -90,7 +90,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -146,7 +146,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bn;->aWS:Ljava/io/ByteArrayOutputStream;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bm;->uO()[B
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bm;->uN()[B
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali
index 6b0a0f2f8f..ba29476b61 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali
@@ -54,9 +54,9 @@
 .method public final bT(Ljava/lang/String;)V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bo;->aWU:Landroid/content/SharedPreferences;
 
@@ -96,12 +96,12 @@
     return-void
 .end method
 
-.method public final rd()J
+.method public final rc()J
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/bo;->aWW:J
 
@@ -129,7 +129,7 @@
     return-wide v0
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 3
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->getContext()Landroid/content/Context;
@@ -149,12 +149,12 @@
     return-void
 .end method
 
-.method public final uP()J
+.method public final uO()J
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/bo;->aWV:J
 
@@ -174,16 +174,14 @@
 
     cmp-long v4, v0, v2
 
-    if-eqz v4, :cond_1
+    if-eqz v4, :cond_0
 
-    :cond_0
-    :goto_0
     iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/bo;->aWV:J
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    :cond_0
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -205,31 +203,32 @@
 
     move-result v2
 
-    if-nez v2, :cond_0
+    if-nez v2, :cond_1
 
     const-string v2, "Failed to commit first run time"
 
     invoke-virtual {p0, v2}, Lcom/google/android/gms/internal/measurement/q;->bz(Ljava/lang/String;)V
 
-    goto :goto_0
+    :cond_1
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/bo;->aWV:J
 
     :cond_2
-    :goto_1
+    :goto_0
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/bo;->aWV:J
 
     return-wide v0
 .end method
 
-.method public final uQ()Lcom/google/android/gms/internal/measurement/bw;
+.method public final uP()Lcom/google/android/gms/internal/measurement/bw;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/bw;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bo;->uP()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bo;->uO()J
 
     move-result-wide v2
 
@@ -238,14 +237,14 @@
     return-object v0
 .end method
 
-.method public final uR()V
+.method public final uQ()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -270,12 +269,12 @@
     return-void
 .end method
 
-.method public final uS()Ljava/lang/String;
+.method public final uR()Ljava/lang/String;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bo;->aWU:Landroid/content/SharedPreferences;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bp.smali
index 5ba3cffc4e..6dd220f3d8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bp.smali
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method private final uW()Ljava/lang/String;
+.method private final uV()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bp;->name:Ljava/lang/String;
@@ -71,12 +71,12 @@
 
 
 # virtual methods
-.method final uT()V
+.method final uS()V
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bp;->aWZ:Lcom/google/android/gms/internal/measurement/bo;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -92,19 +92,19 @@
 
     move-result-object v2
 
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uW()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/measurement/bp;->uX()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/measurement/bp;->uY()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/measurement/bp;->uW()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bp;->uV()Ljava/lang/String;
 
     move-result-object v3
 
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method public final uU()Landroid/util/Pair;
+.method public final uT()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/measurement/bp;->uV()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uU()J
 
     move-result-wide v0
 
@@ -144,7 +144,7 @@
     :cond_0
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/bp;->aWZ:Lcom/google/android/gms/internal/measurement/bo;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/q;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/q;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v4
 
@@ -170,8 +170,6 @@
     return-object v6
 
     :cond_1
-    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/bp;->aWY:J
-
     const/4 v7, 0x1
 
     shl-long/2addr v4, v7
@@ -180,7 +178,7 @@
 
     if-lez v7, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uS()V
 
     return-object v6
 
@@ -189,7 +187,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bo;->aWU:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uY()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uX()Ljava/lang/String;
 
     move-result-object v1
 
@@ -201,7 +199,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/internal/measurement/bo;->aWU:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uX()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uW()Ljava/lang/String;
 
     move-result-object v4
 
@@ -209,7 +207,7 @@
 
     move-result-wide v4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->uS()V
 
     if-eqz v0, :cond_4
 
@@ -235,14 +233,14 @@
     return-object v6
 .end method
 
-.method final uV()J
+.method final uU()J
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bp;->aWZ:Lcom/google/android/gms/internal/measurement/bo;
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bo;->aWU:Landroid/content/SharedPreferences;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bp;->uW()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bp;->uV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -255,7 +253,7 @@
     return-wide v0
 .end method
 
-.method final uX()Ljava/lang/String;
+.method final uW()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bp;->name:Ljava/lang/String;
@@ -273,7 +271,7 @@
     return-object v0
 .end method
 
-.method final uY()Ljava/lang/String;
+.method final uX()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bp;->name:Ljava/lang/String;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bq.smali
index 9eb44100b9..592c8d2102 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bq.smali
@@ -40,9 +40,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bq;->XZ:Ljava/lang/Boolean;
-
-    invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result p0
 
@@ -79,7 +77,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -174,7 +172,7 @@
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->AP()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->AO()Ljava/lang/String;
 
     move-result-object v7
 
@@ -274,7 +272,7 @@
     if-nez v1, :cond_8
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->lY()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->lX()Lcom/google/android/gms/common/stats/d;
 
     iget-object v3, p0, Lcom/google/android/gms/stats/a;->Zj:Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/br.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/br.smali
index 47c80e3052..3259d78f30 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/br.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/br.smali
@@ -64,9 +64,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/br;->aXc:Ljava/lang/Boolean;
-
-    invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result p0
 
@@ -144,7 +142,7 @@
     invoke-static {v2, v3}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    invoke-virtual {v1}, Lcom/google/android/gms/stats/a;->AP()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/stats/a;->AO()Ljava/lang/String;
 
     move-result-object v5
 
@@ -220,7 +218,7 @@
     if-ne v2, v9, :cond_5
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->lY()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->lX()Lcom/google/android/gms/common/stats/d;
 
     iget-object v2, v1, Lcom/google/android/gms/stats/a;->Zj:Landroid/content/Context;
 
@@ -254,7 +252,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-virtual {v1}, Lcom/google/android/gms/stats/a;->AO()V
+    invoke-virtual {v1}, Lcom/google/android/gms/stats/a;->AN()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
@@ -297,7 +295,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -351,7 +349,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object v0
 
@@ -379,7 +377,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
@@ -405,7 +403,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bu.smali
index 69039065fb..14bdb4f71d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bu.smali
@@ -26,7 +26,7 @@
 
 
 # virtual methods
-.method public final un()V
+.method public final um()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bu;->aXj:Lcom/google/android/gms/internal/measurement/br;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali
index fb6b4d8e64..e19b62566d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali
@@ -94,115 +94,115 @@
 
     invoke-static {v0, p1}, Lcom/google/android/gms/common/util/i;->a(Ljava/net/URI;Ljava/lang/String;)Ljava/util/Map;
 
-    move-result-object p1
+    move-result-object p0
     :try_end_0
     .catch Ljava/net/URISyntaxException; {:try_start_0 .. :try_end_0} :catch_0
 
-    new-instance p0, Lcom/google/android/gms/internal/measurement/ih;
+    new-instance p1, Lcom/google/android/gms/internal/measurement/ih;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ih;-><init>()V
+    invoke-direct {p1}, Lcom/google/android/gms/internal/measurement/ih;-><init>()V
 
     const-string v0, "utm_content"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->beK:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->beK:Ljava/lang/String;
 
     const-string v0, "utm_medium"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->zztw:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->zztw:Ljava/lang/String;
 
     const-string v0, "utm_campaign"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->name:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->name:Ljava/lang/String;
 
     const-string v0, "utm_source"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->zztv:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->zztv:Ljava/lang/String;
 
     const-string v0, "utm_term"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->beJ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->beJ:Ljava/lang/String;
 
     const-string v0, "utm_id"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->aVn:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->aVn:Ljava/lang/String;
 
     const-string v0, "anid"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->zztz:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->zztz:Ljava/lang/String;
 
     const-string v0, "gclid"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->zzua:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->zzua:Ljava/lang/String;
 
     const-string v0, "dclid"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->beL:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/ih;->beL:Ljava/lang/String;
 
     const-string v0, "aclid"
 
-    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object p1
+    move-result-object p0
 
-    check-cast p1, Ljava/lang/String;
+    check-cast p0, Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ih;->beM:Ljava/lang/String;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/ih;->beM:Ljava/lang/String;
 
-    return-object p0
+    return-object p1
 
     :catch_0
     move-exception p1
@@ -288,7 +288,7 @@
 
     cmpg-double v3, p0, v1
 
-    if-lez v3, :cond_4
+    if-lez v3, :cond_5
 
     const-wide/high16 v1, 0x4059000000000000L    # 100.0
 
@@ -366,12 +366,15 @@
     return v4
 
     :cond_4
+    return v0
+
+    :cond_5
     :goto_1
     return v0
 .end method
 
 .method public static bU(Ljava/lang/String;)J
-    .locals 4
+    .locals 2
 
     const-wide/16 v0, 0x0
 
@@ -383,11 +386,11 @@
     :try_start_0
     invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
-    move-result-wide v2
+    move-result-wide v0
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v2
+    return-wide v0
 
     :catch_0
     return-wide v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/by.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/by.smali
index 3431160d8e..77341cb1dd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/by.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/by.smali
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method protected final tB()V
+.method protected final tA()V
     .locals 6
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->getContext()Landroid/content/Context;
@@ -302,32 +302,42 @@
     return-void
 .end method
 
-.method public final uZ()Ljava/lang/String;
+.method public final uY()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/by;->aWz:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final va()Ljava/lang/String;
+.method public final uZ()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/by;->aWy:Ljava/lang/String;
 
     return-object v0
 .end method
 
+.method public final va()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
 .method public final vb()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    const/4 v0, 0x0
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->aXn:Z
 
     return v0
 .end method
@@ -335,17 +345,7 @@
 .method public final vc()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->aXn:Z
-
-    return v0
-.end method
-
-.method public final vd()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->aXo:Z
 
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 636766ed85..f376830191 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
@@ -46,8 +46,6 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/c;->aTq:I
-
     iput v0, p1, Lcom/google/android/gms/internal/measurement/c;->aTq:I
 
     :cond_0
@@ -55,8 +53,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/c;->aTr:I
-
     iput v0, p1, Lcom/google/android/gms/internal/measurement/c;->aTr:I
 
     :cond_1
@@ -64,8 +60,6 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/c;->aTs:I
-
     iput v0, p1, Lcom/google/android/gms/internal/measurement/c;->aTs:I
 
     :cond_2
@@ -73,8 +67,6 @@
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/c;->aTt:I
-
     iput v0, p1, Lcom/google/android/gms/internal/measurement/c;->aTt:I
 
     :cond_3
@@ -82,8 +74,6 @@
 
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/c;->aTu:I
-
     iput v0, p1, Lcom/google/android/gms/internal/measurement/c;->aTu:I
 
     :cond_4
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a$a.smali
index f382dd78ab..5b50c4b486 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$a;->ve()Lcom/google/android/gms/internal/measurement/cb$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$a;->vd()Lcom/google/android/gms/internal/measurement/cb$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a.smali
index 11fe1e28c6..1713cc7fff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$a.smali
@@ -85,7 +85,7 @@
     return-void
 .end method
 
-.method static synthetic ve()Lcom/google/android/gms/internal/measurement/cb$a;
+.method static synthetic vd()Lcom/google/android/gms/internal/measurement/cb$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cb$a;->zzauq:Lcom/google/android/gms/internal/measurement/cb$a;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$a.smali
index 085cb6fddf..b923dcdae4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$b;->vg()Lcom/google/android/gms/internal/measurement/cb$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$b;->vf()Lcom/google/android/gms/internal/measurement/cb$b;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$b.smali
index 39bbfbb650..b94960173b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b$b.smali
@@ -151,7 +151,7 @@
     return-object v0
 .end method
 
-.method public static vh()Lcom/google/android/gms/internal/measurement/fz;
+.method public static vg()Lcom/google/android/gms/internal/measurement/fz;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ce;->aXv:Lcom/google/android/gms/internal/measurement/fz;
@@ -161,7 +161,7 @@
 
 
 # virtual methods
-.method public final lT()I
+.method public final lS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cb$b$b;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b.smali
index a0d005057f..6992e46061 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb$b.smali
@@ -91,7 +91,7 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/measurement/cb$b;->zzaur:I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ho;->xG()Lcom/google/android/gms/internal/measurement/ho;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ho;->xF()Lcom/google/android/gms/internal/measurement/ho;
 
     move-result-object v0
 
@@ -100,7 +100,7 @@
     return-void
 .end method
 
-.method public static vf()Lcom/google/android/gms/internal/measurement/hl;
+.method public static ve()Lcom/google/android/gms/internal/measurement/hl;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -124,7 +124,7 @@
     return-object v0
 .end method
 
-.method static synthetic vg()Lcom/google/android/gms/internal/measurement/cb$b;
+.method static synthetic vf()Lcom/google/android/gms/internal/measurement/cb$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cb$b;->zzaut:Lcom/google/android/gms/internal/measurement/cb$b;
@@ -227,7 +227,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$b$b;->vh()Lcom/google/android/gms/internal/measurement/fz;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$b$b;->vg()Lcom/google/android/gms/internal/measurement/fz;
 
     move-result-object v1
 
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 428c941fe5..3c2550c5a2 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
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fu$e;->ns()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fu$e;->nr()[I
 
     move-result-object v0
 
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 1561b0a434..6e7c02dd58 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
@@ -38,13 +38,13 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cj;->vm()[Lcom/google/android/gms/internal/measurement/cj;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cj;->vl()[Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cg;->vk()[Lcom/google/android/gms/internal/measurement/cg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cg;->vj()[Lcom/google/android/gms/internal/measurement/cg;
 
     move-result-object v1
 
@@ -63,7 +63,7 @@
     return-void
 .end method
 
-.method public static vi()[Lcom/google/android/gms/internal/measurement/cf;
+.method public static vh()[Lcom/google/android/gms/internal/measurement/cf;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cf;->aXw:[Lcom/google/android/gms/internal/measurement/cf;
@@ -118,7 +118,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -155,7 +155,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -168,7 +168,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -194,8 +194,6 @@
     goto :goto_1
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
-
     array-length v1, v1
 
     :goto_1
@@ -227,7 +225,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -262,8 +260,6 @@
     goto :goto_3
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
-
     array-length v1, v1
 
     :goto_3
@@ -295,7 +291,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -317,7 +313,7 @@
     goto/16 :goto_0
 
     :cond_b
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -345,8 +341,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -362,8 +356,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
-
     array-length v0, v0
 
     if-lez v0, :cond_2
@@ -373,11 +365,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
+    if-ge v0, v3, :cond_2
 
     aget-object v2, v2, v0
 
@@ -397,8 +387,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
-
     array-length v0, v0
 
     if-lez v0, :cond_4
@@ -406,11 +394,9 @@
     :goto_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_4
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
+    if-ge v1, v2, :cond_4
 
     aget-object v0, v0, v1
 
@@ -430,30 +416,26 @@
 
     if-eqz v0, :cond_5
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXA:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cf;->aXB:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_6
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXB:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_6
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -493,8 +475,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -543,8 +523,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXA:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cf;->aXA:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -567,8 +545,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXB:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cf;->aXB:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -659,8 +635,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -699,8 +673,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXA:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -719,8 +691,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXB:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -758,10 +728,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 6
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -771,8 +741,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -790,8 +758,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
-
     array-length v1, v1
 
     if-lez v1, :cond_3
@@ -803,11 +769,9 @@
     :goto_0
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v0, v4, :cond_2
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
+    if-ge v0, v5, :cond_2
 
     aget-object v4, v4, v0
 
@@ -834,8 +798,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
-
     array-length v1, v1
 
     if-lez v1, :cond_5
@@ -843,11 +805,9 @@
     :goto_1
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
 
-    array-length v1, v1
+    array-length v4, v1
 
-    if-ge v3, v1, :cond_5
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
+    if-ge v3, v4, :cond_5
 
     aget-object v1, v1, v3
 
@@ -871,8 +831,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXA:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x20
@@ -890,8 +848,6 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cf;->aXB:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x28
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 6ad40747b0..da11b4a483 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
@@ -44,7 +44,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cg;->aXE:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ch;->vl()[Lcom/google/android/gms/internal/measurement/ch;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ch;->vk()[Lcom/google/android/gms/internal/measurement/ch;
 
     move-result-object v1
 
@@ -67,7 +67,7 @@
     return-void
 .end method
 
-.method public static vk()[Lcom/google/android/gms/internal/measurement/cg;
+.method public static vj()[Lcom/google/android/gms/internal/measurement/cg;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cg;->aXC:[Lcom/google/android/gms/internal/measurement/cg;
@@ -122,7 +122,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -165,7 +165,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -178,7 +178,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -209,7 +209,7 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -237,8 +237,6 @@
     goto :goto_1
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
-
     array-length v1, v1
 
     :goto_1
@@ -270,7 +268,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -301,7 +299,7 @@
     goto/16 :goto_0
 
     :cond_b
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -329,8 +327,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -344,19 +340,15 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXE:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
-
     array-length v0, v0
 
     if-lez v0, :cond_3
@@ -366,11 +358,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_3
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
+    if-ge v0, v2, :cond_3
 
     aget-object v1, v1, v0
 
@@ -390,56 +380,48 @@
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXG:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cg;->aXH:Lcom/google/android/gms/internal/measurement/ci;
 
     if-eqz v0, :cond_5
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXH:Lcom/google/android/gms/internal/measurement/ci;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
 
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_6
 
-    const/4 v0, 0x6
+    const/4 v1, 0x6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_7
 
-    const/4 v0, 0x7
+    const/4 v1, 0x7
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_7
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -479,8 +461,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -503,8 +483,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXE:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cg;->aXE:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -540,8 +518,6 @@
     return v2
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXG:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cg;->aXG:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -564,8 +540,6 @@
     return v2
 
     :cond_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXH:Lcom/google/android/gms/internal/measurement/ci;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cg;->aXH:Lcom/google/android/gms/internal/measurement/ci;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/ci;->equals(Ljava/lang/Object;)Z
@@ -588,8 +562,6 @@
     return v2
 
     :cond_b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -612,8 +584,6 @@
     return v2
 
     :cond_d
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -704,8 +674,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -724,8 +692,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXE:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -754,8 +720,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXG:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -792,8 +756,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -812,8 +774,6 @@
     goto :goto_5
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -851,10 +811,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -864,8 +824,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -881,11 +839,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v3, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cg;->aXE:Ljava/lang/String;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -896,8 +852,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
-
     array-length v1, v1
 
     if-lez v1, :cond_3
@@ -907,11 +861,9 @@
     :goto_0
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v1, v3, :cond_3
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cg;->aXF:[Lcom/google/android/gms/internal/measurement/ch;
+    if-ge v1, v4, :cond_3
 
     aget-object v3, v3, v1
 
@@ -935,8 +887,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXG:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x20
@@ -954,11 +904,9 @@
 
     if-eqz v1, :cond_5
 
-    const/4 v1, 0x5
+    const/4 v3, 0x5
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cg;->aXH:Lcom/google/android/gms/internal/measurement/ci;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
 
     move-result v1
 
@@ -969,8 +917,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x30
@@ -988,8 +934,6 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x38
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 582857ad11..2b6db52fe0 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
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method public static vl()[Lcom/google/android/gms/internal/measurement/ch;
+.method public static vk()[Lcom/google/android/gms/internal/measurement/ch;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ch;->aXI:[Lcom/google/android/gms/internal/measurement/ch;
@@ -106,7 +106,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -146,7 +146,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -172,7 +172,9 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->aXK:Lcom/google/android/gms/internal/measurement/ci;
 
-    goto :goto_1
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
+
+    goto :goto_0
 
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->aXJ:Lcom/google/android/gms/internal/measurement/ck;
@@ -188,7 +190,6 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->aXJ:Lcom/google/android/gms/internal/measurement/ck;
 
-    :goto_1
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
     goto :goto_0
@@ -209,48 +210,40 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXJ:Lcom/google/android/gms/internal/measurement/ck;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->aXK:Lcom/google/android/gms/internal/measurement/ci;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXK:Lcom/google/android/gms/internal/measurement/ci;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->aXL:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXL:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->aXM:Ljava/lang/String;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXM:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_3
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -290,8 +283,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXJ:Lcom/google/android/gms/internal/measurement/ck;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ch;->aXJ:Lcom/google/android/gms/internal/measurement/ck;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/ck;->equals(Ljava/lang/Object;)Z
@@ -314,8 +305,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXK:Lcom/google/android/gms/internal/measurement/ci;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ch;->aXK:Lcom/google/android/gms/internal/measurement/ci;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/ci;->equals(Ljava/lang/Object;)Z
@@ -338,8 +327,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXL:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ch;->aXL:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -362,8 +349,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXM:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ch;->aXM:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -490,8 +475,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXL:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -510,8 +493,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXM:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -549,10 +530,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 4
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -562,8 +543,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXJ:Lcom/google/android/gms/internal/measurement/ck;
-
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
 
     move-result v1
@@ -575,11 +554,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v3, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ch;->aXK:Lcom/google/android/gms/internal/measurement/ci;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
 
     move-result v1
 
@@ -590,8 +567,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->aXL:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x18
@@ -609,11 +584,9 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->aXM:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
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 cd94876855..a78b8d32a2 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
@@ -61,7 +61,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -123,7 +123,7 @@
     goto :goto_0
 
     :cond_4
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -141,7 +141,7 @@
     move-result v1
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v2
 
@@ -224,63 +224,53 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXN:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ci;->aXO:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXO:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ci;->aXP:Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXP:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ci;->aXQ:Ljava/lang/String;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXQ:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ci;->aXR:Ljava/lang/String;
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXR:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_4
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -320,8 +310,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXN:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ci;->aXN:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -344,8 +332,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXO:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ci;->aXO:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -368,8 +354,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXP:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ci;->aXP:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -392,8 +376,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXQ:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ci;->aXQ:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -416,8 +398,6 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXR:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ci;->aXR:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -508,8 +488,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXN:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -528,8 +506,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXO:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -548,8 +524,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXP:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -568,8 +542,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXQ:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -588,8 +560,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXR:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -627,10 +597,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -640,8 +610,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXN:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -657,8 +625,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->aXO:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x10
@@ -676,11 +642,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ci;->aXP:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -691,11 +655,9 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ci;->aXQ:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -706,11 +668,9 @@
 
     if-eqz v1, :cond_4
 
-    const/4 v1, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ci;->aXR:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
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 a4bdb37ca7..22c1da6b27 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
@@ -55,7 +55,7 @@
     return-void
 .end method
 
-.method public static vm()[Lcom/google/android/gms/internal/measurement/cj;
+.method public static vl()[Lcom/google/android/gms/internal/measurement/cj;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cj;->aXS:[Lcom/google/android/gms/internal/measurement/cj;
@@ -110,7 +110,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -145,7 +145,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -158,7 +158,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -198,7 +198,7 @@
     goto :goto_0
 
     :cond_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -226,67 +226,57 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cj;->aXT:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXT:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cj;->aXU:Lcom/google/android/gms/internal/measurement/ch;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXU:Lcom/google/android/gms/internal/measurement/ch;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_4
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -326,8 +316,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -350,8 +338,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXT:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cj;->aXT:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -374,8 +360,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXU:Lcom/google/android/gms/internal/measurement/ch;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cj;->aXU:Lcom/google/android/gms/internal/measurement/ch;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/ch;->equals(Ljava/lang/Object;)Z
@@ -398,8 +382,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -422,8 +404,6 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -514,8 +494,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -534,8 +512,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXT:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -572,8 +548,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -592,8 +566,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -631,10 +603,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 4
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -644,8 +616,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -661,11 +631,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v3, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cj;->aXT:Ljava/lang/String;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -676,11 +644,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v3, 0x3
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cj;->aXU:Lcom/google/android/gms/internal/measurement/ch;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
 
     move-result v1
 
@@ -691,8 +657,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x20
@@ -710,8 +674,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x28
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 7b9d2dc6d9..606fbfae51 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
@@ -59,7 +59,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -105,8 +105,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
-
     array-length v1, v1
 
     :goto_1
@@ -134,7 +132,7 @@
 
     aput-object v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -152,7 +150,7 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -179,7 +177,7 @@
     move-result v1
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v2
 
@@ -262,8 +260,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ck;->aXV:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -277,34 +273,28 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXW:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ck;->aXX:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXX:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
-
     array-length v0, v0
 
     if-lez v0, :cond_4
@@ -314,11 +304,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_4
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
+    if-ge v0, v2, :cond_4
 
     aget-object v1, v1, v0
 
@@ -371,8 +359,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXV:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ck;->aXV:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -395,8 +381,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXW:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ck;->aXW:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -419,8 +403,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXX:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ck;->aXX:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -524,8 +506,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXV:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -544,8 +524,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXW:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -564,8 +542,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXX:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -613,10 +589,10 @@
     return v0
 .end method
 
-.method protected final vj()I
-    .locals 6
+.method protected final vi()I
+    .locals 7
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -626,8 +602,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXV:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -643,11 +617,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v3, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ck;->aXW:Ljava/lang/String;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -658,8 +630,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXX:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x18
@@ -677,8 +647,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
-
     array-length v1, v1
 
     if-lez v1, :cond_5
@@ -692,11 +660,9 @@
     :goto_0
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
 
-    array-length v5, v5
+    array-length v6, v5
 
-    if-ge v1, v5, :cond_4
-
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
+    if-ge v1, v6, :cond_4
 
     aget-object v5, v5, v1
 
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 2e66ad8722..d7bd534a2f 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
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method public static vn()[Lcom/google/android/gms/internal/measurement/cl;
+.method public static vm()[Lcom/google/android/gms/internal/measurement/cl;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cl;->aXZ:[Lcom/google/android/gms/internal/measurement/cl;
@@ -106,7 +106,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -137,7 +137,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -150,7 +150,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -163,7 +163,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -200,56 +200,48 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->name:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aYa:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYa:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aYb:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYb:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aYc:Ljava/lang/Integer;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYc:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_3
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -289,8 +281,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->name:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cl;->name:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -313,8 +303,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYa:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cl;->aYa:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -337,8 +325,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYb:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cl;->aYb:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -361,8 +347,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYc:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cl;->aYc:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -453,8 +437,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->name:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -473,8 +455,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYa:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -493,8 +473,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYb:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -513,8 +491,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYc:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -552,10 +528,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -565,8 +541,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->name:Ljava/lang/String;
-
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
@@ -578,8 +552,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYa:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x10
@@ -597,8 +569,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aYb:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x18
@@ -616,15 +586,13 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->aYc:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
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 8d9afa51ca..ada15264bc 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
@@ -42,19 +42,19 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYf:Ljava/lang/Integer;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cn;->vo()[Lcom/google/android/gms/internal/measurement/cn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cn;->vn()[Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cl;->vn()[Lcom/google/android/gms/internal/measurement/cl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cl;->vm()[Lcom/google/android/gms/internal/measurement/cl;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cf;->vi()[Lcom/google/android/gms/internal/measurement/cf;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cf;->vh()[Lcom/google/android/gms/internal/measurement/cf;
 
     move-result-object v1
 
@@ -83,7 +83,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -150,8 +150,6 @@
     goto :goto_1
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
-
     array-length v1, v1
 
     :goto_1
@@ -183,7 +181,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -218,8 +216,6 @@
     goto :goto_3
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
-
     array-length v1, v1
 
     :goto_3
@@ -251,7 +247,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -286,8 +282,6 @@
     goto :goto_5
 
     :cond_b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
-
     array-length v1, v1
 
     :goto_5
@@ -319,7 +313,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -341,7 +335,7 @@
     goto/16 :goto_0
 
     :cond_e
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -363,7 +357,7 @@
     goto/16 :goto_0
 
     :cond_10
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -391,8 +385,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
-
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
@@ -406,26 +398,22 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYe:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYf:Ljava/lang/Integer;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYf:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
@@ -434,8 +422,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
-
     array-length v0, v0
 
     if-lez v0, :cond_4
@@ -445,11 +431,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_4
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
+    if-ge v0, v3, :cond_4
 
     aget-object v2, v2, v0
 
@@ -469,8 +453,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
-
     array-length v0, v0
 
     if-lez v0, :cond_6
@@ -480,11 +462,9 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_6
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
+    if-ge v0, v3, :cond_6
 
     aget-object v2, v2, v0
 
@@ -504,8 +484,6 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
-
     array-length v0, v0
 
     if-lez v0, :cond_8
@@ -513,11 +491,9 @@
     :goto_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_8
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
+    if-ge v1, v2, :cond_8
 
     aget-object v0, v0, v1
 
@@ -537,11 +513,9 @@
 
     if-eqz v0, :cond_9
 
-    const/4 v0, 0x7
+    const/4 v1, 0x7
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYj:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_9
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -581,8 +555,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -605,8 +577,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYe:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cm;->aYe:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -629,8 +599,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYf:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cm;->aYf:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -692,8 +660,6 @@
     return v2
 
     :cond_b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYj:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cm;->aYj:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -784,8 +750,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -804,8 +768,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYe:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -824,8 +786,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYf:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -874,8 +834,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYj:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -913,10 +871,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -924,8 +882,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v1
@@ -943,11 +899,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cm;->aYe:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -958,15 +912,13 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cm;->aYf:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -979,8 +931,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
-
     array-length v1, v1
 
     if-lez v1, :cond_5
@@ -992,11 +942,9 @@
     :goto_0
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_4
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cm;->aYg:[Lcom/google/android/gms/internal/measurement/cn;
+    if-ge v0, v4, :cond_4
 
     aget-object v3, v3, v0
 
@@ -1023,8 +971,6 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
-
     array-length v1, v1
 
     if-lez v1, :cond_8
@@ -1036,11 +982,9 @@
     :goto_1
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_7
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cm;->aYh:[Lcom/google/android/gms/internal/measurement/cl;
+    if-ge v0, v4, :cond_7
 
     aget-object v3, v3, v0
 
@@ -1067,8 +1011,6 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
-
     array-length v1, v1
 
     if-lez v1, :cond_a
@@ -1076,11 +1018,9 @@
     :goto_2
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
 
-    array-length v1, v1
+    array-length v3, v1
 
-    if-ge v2, v1, :cond_a
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
+    if-ge v2, v3, :cond_a
 
     aget-object v1, v1, v2
 
@@ -1104,11 +1044,9 @@
 
     if-eqz v1, :cond_b
 
-    const/4 v1, 0x7
+    const/4 v2, 0x7
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cm;->aYj:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
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 d5384eea26..173d6278ce 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
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method public static vo()[Lcom/google/android/gms/internal/measurement/cn;
+.method public static vn()[Lcom/google/android/gms/internal/measurement/cn;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->aYk:[Lcom/google/android/gms/internal/measurement/cn;
@@ -98,7 +98,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -154,22 +154,18 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cn;->aYl:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cn;->value:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cn;->value:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -209,8 +205,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cn;->aYl:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cn;->aYl:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -233,8 +227,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cn;->value:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cn;->value:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -325,8 +317,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cn;->aYl:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -345,8 +335,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cn;->value:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -384,10 +372,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -395,11 +383,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cn;->aYl:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -410,11 +396,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cn;->value:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/co.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/co.smali
index ce4b1b9993..cd5237e7e0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/co.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/co.smali
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method public static vp()[Lcom/google/android/gms/internal/measurement/co;
+.method public static vo()[Lcom/google/android/gms/internal/measurement/co;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/co;->aYm:[Lcom/google/android/gms/internal/measurement/co;
@@ -106,7 +106,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -137,7 +137,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -163,7 +163,9 @@
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/co;->aYo:Lcom/google/android/gms/internal/measurement/cu;
 
-    goto :goto_1
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
+
+    goto :goto_0
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
@@ -179,13 +181,12 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
 
-    :goto_1
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
     goto :goto_0
 
     :cond_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -213,52 +214,44 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aXx:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/co;->aYo:Lcom/google/android/gms/internal/measurement/cu;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYo:Lcom/google/android/gms/internal/measurement/cu;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->a(ILcom/google/android/gms/internal/measurement/jo;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/co;->aYp:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYp:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_3
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -298,8 +291,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aXx:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/co;->aXx:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -322,8 +313,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/cu;->equals(Ljava/lang/Object;)Z
@@ -346,8 +335,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYo:Lcom/google/android/gms/internal/measurement/cu;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/co;->aYo:Lcom/google/android/gms/internal/measurement/cu;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/cu;->equals(Ljava/lang/Object;)Z
@@ -370,8 +357,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYp:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/co;->aYp:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -462,8 +447,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aXx:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -518,8 +501,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYp:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -557,10 +538,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 4
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -570,8 +551,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aXx:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -587,11 +566,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v3, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
 
     move-result v1
 
@@ -602,11 +579,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v3, 0x3
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/co;->aYo:Lcom/google/android/gms/internal/measurement/cu;
-
-    invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
+    invoke-static {v3, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(ILcom/google/android/gms/internal/measurement/jo;)I
 
     move-result v1
 
@@ -617,8 +592,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/co;->aYp:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0x20
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 aa5a12d481..11cb6b2c2c 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
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method public static vq()[Lcom/google/android/gms/internal/measurement/cp;
+.method public static vp()[Lcom/google/android/gms/internal/measurement/cp;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cp;->aYq:[Lcom/google/android/gms/internal/measurement/cp;
@@ -98,7 +98,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -121,7 +121,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -134,7 +134,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -151,7 +151,7 @@
 .end method
 
 .method public final a(Lcom/google/android/gms/internal/measurement/jf;)V
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -162,30 +162,26 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cp;->aYr:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cp;->aYs:Ljava/lang/Long;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cp;->aYs:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_1
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -225,8 +221,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cp;->aYr:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cp;->aYr:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -249,8 +243,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cp;->aYs:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cp;->aYs:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -341,8 +333,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cp;->aYr:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -361,8 +351,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cp;->aYs:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -400,10 +388,10 @@
     return v0
 .end method
 
-.method protected final vj()I
-    .locals 4
+.method protected final vi()I
+    .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -411,15 +399,13 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cp;->aYr:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -430,15 +416,13 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cp;->aYs:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
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 f7d4174927..9055446d52 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
@@ -34,7 +34,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ji;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cr;->vs()[Lcom/google/android/gms/internal/measurement/cr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cr;->vr()[Lcom/google/android/gms/internal/measurement/cr;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method public static vr()[Lcom/google/android/gms/internal/measurement/cq;
+.method public static vq()[Lcom/google/android/gms/internal/measurement/cq;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cq;->aYt:[Lcom/google/android/gms/internal/measurement/cq;
@@ -114,7 +114,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -149,7 +149,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -162,7 +162,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -175,7 +175,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -212,8 +212,6 @@
     goto :goto_1
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
-
     array-length v1, v1
 
     :goto_1
@@ -245,7 +243,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -271,7 +269,7 @@
 .end method
 
 .method public final a(Lcom/google/android/gms/internal/measurement/jf;)V
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -282,8 +280,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
-
     array-length v0, v0
 
     if-lez v0, :cond_1
@@ -293,11 +289,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -317,56 +311,48 @@
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cq;->aYw:Ljava/lang/Long;
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYw:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cq;->count:Ljava/lang/Integer;
 
     if-eqz v0, :cond_5
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->count:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_5
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -419,8 +405,6 @@
     return v2
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -443,8 +427,6 @@
     return v2
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -467,8 +449,6 @@
     return v2
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYw:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cq;->aYw:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -491,8 +471,6 @@
     return v2
 
     :cond_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->count:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cq;->count:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -593,8 +571,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -613,8 +589,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -633,8 +607,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYw:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -653,8 +625,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->count:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -692,10 +662,10 @@
     return v0
 .end method
 
-.method protected final vj()I
-    .locals 4
+.method protected final vi()I
+    .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -703,8 +673,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
-
     array-length v1, v1
 
     if-lez v1, :cond_1
@@ -714,11 +682,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
+    if-ge v1, v3, :cond_1
 
     aget-object v2, v2, v1
 
@@ -742,11 +708,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -757,15 +721,13 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -776,15 +738,13 @@
 
     if-eqz v1, :cond_4
 
-    const/4 v1, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cq;->aYw:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -795,15 +755,13 @@
 
     if-eqz v1, :cond_5
 
-    const/4 v1, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cq;->count:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali
index bedefa90bf..b9fae45546 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali
@@ -55,7 +55,7 @@
     return-void
 .end method
 
-.method public static vs()[Lcom/google/android/gms/internal/measurement/cr;
+.method public static vr()[Lcom/google/android/gms/internal/measurement/cr;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cr;->aYx:[Lcom/google/android/gms/internal/measurement/cr;
@@ -110,7 +110,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -145,7 +145,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wm()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wl()J
 
     move-result-wide v0
 
@@ -162,7 +162,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wl()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()I
 
     move-result v0
 
@@ -179,7 +179,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -214,7 +214,7 @@
 .end method
 
 .method public final a(Lcom/google/android/gms/internal/measurement/jf;)V
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -225,67 +225,57 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cr;->aYA:Ljava/lang/Float;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYA:Ljava/lang/Float;
+    invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
-    invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(IF)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->b(IF)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
+    invoke-virtual {v0}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->a(ID)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->a(ID)V
 
     :cond_4
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -325,8 +315,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -349,8 +337,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -373,8 +359,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -397,8 +381,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYA:Ljava/lang/Float;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cr;->aYA:Ljava/lang/Float;
 
     invoke-virtual {v1, v3}, Ljava/lang/Float;->equals(Ljava/lang/Object;)Z
@@ -421,8 +403,6 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
 
     invoke-virtual {v1, v3}, Ljava/lang/Double;->equals(Ljava/lang/Object;)Z
@@ -513,8 +493,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -533,8 +511,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -553,8 +529,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -573,8 +547,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYA:Ljava/lang/Float;
-
     invoke-virtual {v1}, Ljava/lang/Float;->hashCode()I
 
     move-result v1
@@ -593,8 +565,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
-
     invoke-virtual {v1}, Ljava/lang/Double;->hashCode()I
 
     move-result v1
@@ -632,10 +602,10 @@
     return v0
 .end method
 
-.method protected final vj()I
-    .locals 4
+.method protected final vi()I
+    .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -643,11 +613,9 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -658,11 +626,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -673,15 +639,13 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -692,8 +656,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYA:Ljava/lang/Float;
-
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
     const/16 v1, 0x20
@@ -711,8 +673,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
-
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
     const/16 v1, 0x28
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 280419bc12..76677e34c8 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
@@ -22,7 +22,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ji;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ct;->vt()[Lcom/google/android/gms/internal/measurement/ct;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ct;->vs()[Lcom/google/android/gms/internal/measurement/ct;
 
     move-result-object v0
 
@@ -51,7 +51,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -85,8 +85,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
-
     array-length v1, v1
 
     :goto_1
@@ -118,7 +116,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -155,8 +153,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
-
     array-length v0, v0
 
     if-lez v0, :cond_1
@@ -166,11 +162,9 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
+    if-ge v0, v2, :cond_1
 
     aget-object v1, v1, v0
 
@@ -336,10 +330,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 4
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -347,8 +341,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
-
     array-length v1, v1
 
     if-lez v1, :cond_1
@@ -358,11 +350,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
+    if-ge v1, v3, :cond_1
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali
index 71141d2c98..08f3914555 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali
@@ -106,13 +106,13 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYE:Ljava/lang/Integer;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cq;->vr()[Lcom/google/android/gms/internal/measurement/cq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cq;->vq()[Lcom/google/android/gms/internal/measurement/cq;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cw;->vv()[Lcom/google/android/gms/internal/measurement/cw;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cw;->vu()[Lcom/google/android/gms/internal/measurement/cw;
 
     move-result-object v1
 
@@ -164,7 +164,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/co;->vp()[Lcom/google/android/gms/internal/measurement/co;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/co;->vo()[Lcom/google/android/gms/internal/measurement/co;
 
     move-result-object v1
 
@@ -203,7 +203,7 @@
     return-void
 .end method
 
-.method public static vt()[Lcom/google/android/gms/internal/measurement/ct;
+.method public static vs()[Lcom/google/android/gms/internal/measurement/ct;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ct;->aYD:[Lcom/google/android/gms/internal/measurement/ct;
@@ -258,7 +258,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -275,7 +275,7 @@
     return-object p0
 
     :sswitch_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$b;->vf()Lcom/google/android/gms/internal/measurement/hl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cb$b;->ve()Lcom/google/android/gms/internal/measurement/hl;
 
     move-result-object v0
 
@@ -299,7 +299,7 @@
     goto :goto_0
 
     :sswitch_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -330,7 +330,7 @@
     goto :goto_0
 
     :sswitch_5
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -343,7 +343,7 @@
     goto :goto_0
 
     :sswitch_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -365,7 +365,7 @@
     goto :goto_0
 
     :sswitch_8
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -378,7 +378,7 @@
     goto :goto_0
 
     :sswitch_9
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -391,7 +391,7 @@
     goto :goto_0
 
     :sswitch_a
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -428,8 +428,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
-
     array-length v2, v2
 
     :goto_1
@@ -461,7 +459,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v2, v2, 0x1
 
@@ -483,7 +481,7 @@
     goto/16 :goto_0
 
     :sswitch_d
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -496,7 +494,7 @@
     goto/16 :goto_0
 
     :sswitch_e
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -527,7 +525,7 @@
     goto/16 :goto_0
 
     :sswitch_11
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -540,7 +538,7 @@
     goto/16 :goto_0
 
     :sswitch_12
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -562,7 +560,7 @@
     goto/16 :goto_0
 
     :sswitch_14
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vW()Z
 
     move-result v0
 
@@ -584,7 +582,7 @@
     goto/16 :goto_0
 
     :sswitch_16
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -597,7 +595,7 @@
     goto/16 :goto_0
 
     :sswitch_17
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -637,7 +635,7 @@
     goto/16 :goto_0
 
     :sswitch_1b
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -686,7 +684,7 @@
     goto/16 :goto_0
 
     :sswitch_20
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -699,7 +697,7 @@
     goto/16 :goto_0
 
     :sswitch_21
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -712,7 +710,7 @@
     goto/16 :goto_0
 
     :sswitch_22
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -725,7 +723,7 @@
     goto/16 :goto_0
 
     :sswitch_23
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -753,8 +751,6 @@
     goto :goto_3
 
     :cond_4
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
-
     array-length v2, v2
 
     :goto_3
@@ -786,7 +782,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v2, v2, 0x1
 
@@ -823,8 +819,6 @@
     goto :goto_5
 
     :cond_7
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
-
     array-length v2, v2
 
     :goto_5
@@ -856,7 +850,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v2, v2, 0x1
 
@@ -878,7 +872,7 @@
     goto/16 :goto_0
 
     :sswitch_26
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -952,8 +946,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYE:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -969,8 +961,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
-
     array-length v0, v0
 
     if-lez v0, :cond_2
@@ -980,11 +970,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
+    if-ge v0, v3, :cond_2
 
     aget-object v2, v2, v0
 
@@ -1004,8 +992,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
-
     array-length v0, v0
 
     if-lez v0, :cond_4
@@ -1015,11 +1001,9 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_4
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
+    if-ge v0, v3, :cond_4
 
     aget-object v2, v2, v0
 
@@ -1039,309 +1023,261 @@
 
     if-eqz v0, :cond_5
 
-    const/4 v0, 0x4
+    const/4 v2, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYH:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
 
     if-eqz v0, :cond_6
 
-    const/4 v0, 0x5
+    const/4 v2, 0x5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
 
     if-eqz v0, :cond_7
 
-    const/4 v0, 0x6
+    const/4 v2, 0x6
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
 
     if-eqz v0, :cond_8
 
-    const/4 v0, 0x7
+    const/4 v2, 0x7
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYM:Ljava/lang/String;
 
     if-eqz v0, :cond_9
 
-    const/16 v0, 0x8
+    const/16 v2, 0x8
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYM:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYN:Ljava/lang/String;
 
     if-eqz v0, :cond_a
 
-    const/16 v0, 0x9
+    const/16 v2, 0x9
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYN:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYO:Ljava/lang/String;
 
     if-eqz v0, :cond_b
 
-    const/16 v0, 0xa
+    const/16 v2, 0xa
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYO:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_b
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYP:Ljava/lang/String;
 
     if-eqz v0, :cond_c
 
-    const/16 v0, 0xb
+    const/16 v2, 0xb
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYP:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_c
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYQ:Ljava/lang/Integer;
 
     if-eqz v0, :cond_d
 
-    const/16 v0, 0xc
+    const/16 v2, 0xc
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYQ:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v2
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_d
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYR:Ljava/lang/String;
 
     if-eqz v0, :cond_e
 
-    const/16 v0, 0xd
+    const/16 v2, 0xd
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYR:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_e
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
 
     if-eqz v0, :cond_f
 
-    const/16 v0, 0xe
+    const/16 v2, 0xe
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_f
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYT:Ljava/lang/String;
 
     if-eqz v0, :cond_10
 
-    const/16 v0, 0x10
+    const/16 v2, 0x10
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYT:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_10
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYU:Ljava/lang/Long;
 
     if-eqz v0, :cond_11
 
-    const/16 v0, 0x11
+    const/16 v2, 0x11
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYU:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_11
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYV:Ljava/lang/Long;
 
     if-eqz v0, :cond_12
 
-    const/16 v0, 0x12
+    const/16 v2, 0x12
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYV:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_12
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
 
     if-eqz v0, :cond_13
 
-    const/16 v0, 0x13
+    const/16 v2, 0x13
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_13
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYX:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_14
 
-    const/16 v0, 0x14
+    const/16 v2, 0x14
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYX:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v2
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_14
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYY:Ljava/lang/String;
 
     if-eqz v0, :cond_15
 
-    const/16 v0, 0x15
+    const/16 v2, 0x15
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYY:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_15
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYZ:Ljava/lang/Long;
 
     if-eqz v0, :cond_16
 
-    const/16 v0, 0x16
+    const/16 v2, 0x16
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYZ:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_16
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
 
     if-eqz v0, :cond_17
 
-    const/16 v0, 0x17
+    const/16 v2, 0x17
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v2
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_17
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
 
     if-eqz v0, :cond_18
 
-    const/16 v0, 0x18
+    const/16 v2, 0x18
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_18
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
 
     if-eqz v0, :cond_19
 
-    const/16 v0, 0x19
+    const/16 v2, 0x19
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_19
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
 
     if-eqz v0, :cond_1a
 
-    const/16 v0, 0x1a
+    const/16 v2, 0x1a
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_1a
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_1b
 
-    const/16 v0, 0x1c
+    const/16 v2, 0x1c
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result v0
 
-    move-result v2
-
-    invoke-virtual {p1, v0, v2}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/jf;->d(IZ)V
 
     :cond_1b
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
 
     if-eqz v0, :cond_1d
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
-
     array-length v0, v0
 
     if-lez v0, :cond_1d
@@ -1349,11 +1285,9 @@
     :goto_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_1d
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
+    if-ge v1, v2, :cond_1d
 
     aget-object v0, v0, v1
 
@@ -1373,153 +1307,129 @@
 
     if-eqz v0, :cond_1e
 
-    const/16 v0, 0x1e
+    const/16 v1, 0x1e
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZe:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1e
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZf:Ljava/lang/Integer;
 
     if-eqz v0, :cond_1f
 
-    const/16 v0, 0x1f
+    const/16 v1, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZf:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_1f
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZg:Ljava/lang/Integer;
 
     if-eqz v0, :cond_20
 
-    const/16 v0, 0x20
+    const/16 v1, 0x20
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZg:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_20
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZh:Ljava/lang/Integer;
 
     if-eqz v0, :cond_21
 
-    const/16 v0, 0x21
+    const/16 v1, 0x21
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZh:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_21
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZi:Ljava/lang/String;
 
     if-eqz v0, :cond_22
 
-    const/16 v0, 0x22
+    const/16 v1, 0x22
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZi:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_22
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
 
     if-eqz v0, :cond_23
 
-    const/16 v0, 0x23
+    const/16 v1, 0x23
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_23
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZk:Ljava/lang/Long;
 
     if-eqz v0, :cond_24
 
-    const/16 v0, 0x24
+    const/16 v1, 0x24
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZk:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_24
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
 
     if-eqz v0, :cond_25
 
-    const/16 v0, 0x25
+    const/16 v1, 0x25
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_25
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZm:Ljava/lang/String;
 
     if-eqz v0, :cond_26
 
-    const/16 v0, 0x26
+    const/16 v1, 0x26
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZm:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_26
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZn:Ljava/lang/Integer;
 
     if-eqz v0, :cond_27
 
-    const/16 v0, 0x27
+    const/16 v1, 0x27
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZn:Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->A(II)V
 
     :cond_27
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aYj:Ljava/lang/String;
 
     if-eqz v0, :cond_28
 
-    const/16 v0, 0x29
+    const/16 v1, 0x29
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYj:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_28
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZo:Lcom/google/android/gms/internal/measurement/cb$b;
 
     if-eqz v0, :cond_2b
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->aZo:Lcom/google/android/gms/internal/measurement/cb$b;
-
     iget-object v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bfY:Lcom/google/android/gms/internal/measurement/fb;
 
     if-nez v1, :cond_29
@@ -1532,7 +1442,6 @@
 
     iput-object v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bfY:Lcom/google/android/gms/internal/measurement/fb;
 
-    :goto_3
     iget-object v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bbg:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->position()I
@@ -1541,7 +1450,7 @@
 
     iput v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bfZ:I
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_29
     iget v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bfZ:I
@@ -1576,10 +1485,16 @@
 
     invoke-virtual {v1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->write([BII)V
 
-    goto :goto_3
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bbg:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v1}, Ljava/nio/ByteBuffer;->position()I
+
+    move-result v1
+
+    iput v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bfZ:I
 
     :cond_2a
-    :goto_4
+    :goto_3
     iget-object v1, p1, Lcom/google/android/gms/internal/measurement/jf;->bfY:Lcom/google/android/gms/internal/measurement/fb;
 
     const/16 v2, 0x2c
@@ -1634,8 +1549,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYE:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYE:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -1684,8 +1597,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYH:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYH:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -1708,8 +1619,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -1732,8 +1641,6 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -1756,8 +1663,6 @@
     return v2
 
     :cond_c
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -1780,8 +1685,6 @@
     return v2
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -1804,8 +1707,6 @@
     return v2
 
     :cond_10
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYM:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYM:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1828,8 +1729,6 @@
     return v2
 
     :cond_12
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYN:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYN:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1852,8 +1751,6 @@
     return v2
 
     :cond_14
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYO:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYO:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1876,8 +1773,6 @@
     return v2
 
     :cond_16
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYP:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYP:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1900,8 +1795,6 @@
     return v2
 
     :cond_18
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYQ:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYQ:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -1924,8 +1817,6 @@
     return v2
 
     :cond_1a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYR:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYR:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1948,8 +1839,6 @@
     return v2
 
     :cond_1c
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1972,8 +1861,6 @@
     return v2
 
     :cond_1e
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYT:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYT:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1996,8 +1883,6 @@
     return v2
 
     :cond_20
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYU:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYU:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -2020,8 +1905,6 @@
     return v2
 
     :cond_22
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYV:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYV:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -2044,8 +1927,6 @@
     return v2
 
     :cond_24
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2068,8 +1949,6 @@
     return v2
 
     :cond_26
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYX:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYX:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -2092,8 +1971,6 @@
     return v2
 
     :cond_28
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYY:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYY:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2116,8 +1993,6 @@
     return v2
 
     :cond_2a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYZ:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYZ:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -2140,8 +2015,6 @@
     return v2
 
     :cond_2c
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -2164,8 +2037,6 @@
     return v2
 
     :cond_2e
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2188,8 +2059,6 @@
     return v2
 
     :cond_30
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2212,8 +2081,6 @@
     return v2
 
     :cond_32
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
@@ -2249,8 +2116,6 @@
     return v2
 
     :cond_35
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZe:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZe:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2273,8 +2138,6 @@
     return v2
 
     :cond_37
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZf:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZf:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -2297,8 +2160,6 @@
     return v2
 
     :cond_39
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZg:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZg:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -2321,8 +2182,6 @@
     return v2
 
     :cond_3b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZh:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZh:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -2345,8 +2204,6 @@
     return v2
 
     :cond_3d
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZi:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZi:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2369,8 +2226,6 @@
     return v2
 
     :cond_3f
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -2393,8 +2248,6 @@
     return v2
 
     :cond_41
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZk:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZk:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -2417,8 +2270,6 @@
     return v2
 
     :cond_43
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2441,8 +2292,6 @@
     return v2
 
     :cond_45
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZm:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZm:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2465,8 +2314,6 @@
     return v2
 
     :cond_47
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZn:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZn:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -2489,8 +2336,6 @@
     return v2
 
     :cond_49
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYj:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aYj:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2513,8 +2358,6 @@
     return v2
 
     :cond_4b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZo:Lcom/google/android/gms/internal/measurement/cb$b;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ct;->aZo:Lcom/google/android/gms/internal/measurement/cb$b;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/fu;->equals(Ljava/lang/Object;)Z
@@ -2605,8 +2448,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYE:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -2645,8 +2486,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYH:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -2665,8 +2504,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -2685,8 +2522,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -2705,8 +2540,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -2725,8 +2558,6 @@
     goto :goto_5
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -2745,8 +2576,6 @@
     goto :goto_6
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYM:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2765,8 +2594,6 @@
     goto :goto_7
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYN:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2785,8 +2612,6 @@
     goto :goto_8
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYO:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2805,8 +2630,6 @@
     goto :goto_9
 
     :cond_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYP:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2825,8 +2648,6 @@
     goto :goto_a
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYQ:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -2845,8 +2666,6 @@
     goto :goto_b
 
     :cond_b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYR:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2865,8 +2684,6 @@
     goto :goto_c
 
     :cond_c
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2885,8 +2702,6 @@
     goto :goto_d
 
     :cond_d
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYT:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2905,8 +2720,6 @@
     goto :goto_e
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYU:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -2925,8 +2738,6 @@
     goto :goto_f
 
     :cond_f
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYV:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -2945,8 +2756,6 @@
     goto :goto_10
 
     :cond_10
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -2965,8 +2774,6 @@
     goto :goto_11
 
     :cond_11
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYX:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -2985,8 +2792,6 @@
     goto :goto_12
 
     :cond_12
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYY:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3005,8 +2810,6 @@
     goto :goto_13
 
     :cond_13
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYZ:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -3025,8 +2828,6 @@
     goto :goto_14
 
     :cond_14
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -3045,8 +2846,6 @@
     goto :goto_15
 
     :cond_15
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3065,8 +2864,6 @@
     goto :goto_16
 
     :cond_16
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3085,8 +2882,6 @@
     goto :goto_17
 
     :cond_17
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->hashCode()I
 
     move-result v1
@@ -3115,8 +2910,6 @@
     goto :goto_18
 
     :cond_18
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZe:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3135,8 +2928,6 @@
     goto :goto_19
 
     :cond_19
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZf:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -3155,8 +2946,6 @@
     goto :goto_1a
 
     :cond_1a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZg:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -3175,8 +2964,6 @@
     goto :goto_1b
 
     :cond_1b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZh:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -3195,8 +2982,6 @@
     goto :goto_1c
 
     :cond_1c
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZi:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3215,8 +3000,6 @@
     goto :goto_1d
 
     :cond_1d
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -3235,8 +3018,6 @@
     goto :goto_1e
 
     :cond_1e
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZk:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -3255,8 +3036,6 @@
     goto :goto_1f
 
     :cond_1f
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3275,8 +3054,6 @@
     goto :goto_20
 
     :cond_20
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZm:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3295,8 +3072,6 @@
     goto :goto_21
 
     :cond_21
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZn:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -3315,8 +3090,6 @@
     goto :goto_22
 
     :cond_22
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYj:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -3372,10 +3145,10 @@
     return v0
 .end method
 
-.method protected final vj()I
-    .locals 6
+.method protected final vi()I
+    .locals 7
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -3385,8 +3158,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYE:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -3404,8 +3175,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
-
     array-length v1, v1
 
     if-lez v1, :cond_3
@@ -3417,11 +3186,9 @@
     :goto_0
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v0, v4, :cond_2
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
+    if-ge v0, v5, :cond_2
 
     aget-object v4, v4, v0
 
@@ -3448,8 +3215,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
-
     array-length v1, v1
 
     if-lez v1, :cond_6
@@ -3461,11 +3226,9 @@
     :goto_1
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v0, v4, :cond_5
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
+    if-ge v0, v5, :cond_5
 
     aget-object v4, v4, v0
 
@@ -3492,15 +3255,13 @@
 
     if-eqz v1, :cond_7
 
-    const/4 v1, 0x4
+    const/4 v4, 0x4
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYH:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3511,15 +3272,13 @@
 
     if-eqz v1, :cond_8
 
-    const/4 v1, 0x5
+    const/4 v4, 0x5
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3530,15 +3289,13 @@
 
     if-eqz v1, :cond_9
 
-    const/4 v1, 0x6
+    const/4 v4, 0x6
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3549,15 +3306,13 @@
 
     if-eqz v1, :cond_a
 
-    const/4 v1, 0x7
+    const/4 v4, 0x7
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3568,11 +3323,9 @@
 
     if-eqz v1, :cond_b
 
-    const/16 v1, 0x8
+    const/16 v4, 0x8
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYM:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3583,11 +3336,9 @@
 
     if-eqz v1, :cond_c
 
-    const/16 v1, 0x9
+    const/16 v4, 0x9
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYN:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3598,11 +3349,9 @@
 
     if-eqz v1, :cond_d
 
-    const/16 v1, 0xa
+    const/16 v4, 0xa
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYO:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3613,11 +3362,9 @@
 
     if-eqz v1, :cond_e
 
-    const/16 v1, 0xb
+    const/16 v4, 0xb
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYP:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3628,15 +3375,13 @@
 
     if-eqz v1, :cond_f
 
-    const/16 v1, 0xc
+    const/16 v4, 0xc
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYQ:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v4
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -3647,11 +3392,9 @@
 
     if-eqz v1, :cond_10
 
-    const/16 v1, 0xd
+    const/16 v4, 0xd
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYR:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3662,11 +3405,9 @@
 
     if-eqz v1, :cond_11
 
-    const/16 v1, 0xe
+    const/16 v4, 0xe
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3677,11 +3418,9 @@
 
     if-eqz v1, :cond_12
 
-    const/16 v1, 0x10
+    const/16 v4, 0x10
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYT:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3692,15 +3431,13 @@
 
     if-eqz v1, :cond_13
 
-    const/16 v1, 0x11
+    const/16 v4, 0x11
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYU:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3711,15 +3448,13 @@
 
     if-eqz v1, :cond_14
 
-    const/16 v1, 0x12
+    const/16 v4, 0x12
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYV:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3730,11 +3465,9 @@
 
     if-eqz v1, :cond_15
 
-    const/16 v1, 0x13
+    const/16 v4, 0x13
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3745,8 +3478,6 @@
 
     if-eqz v1, :cond_16
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aYX:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0xa0
@@ -3764,11 +3495,9 @@
 
     if-eqz v1, :cond_17
 
-    const/16 v1, 0x15
+    const/16 v4, 0x15
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYY:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3779,15 +3508,13 @@
 
     if-eqz v1, :cond_18
 
-    const/16 v1, 0x16
+    const/16 v4, 0x16
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYZ:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3798,15 +3525,13 @@
 
     if-eqz v1, :cond_19
 
-    const/16 v1, 0x17
+    const/16 v4, 0x17
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v4
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -3817,11 +3542,9 @@
 
     if-eqz v1, :cond_1a
 
-    const/16 v1, 0x18
+    const/16 v4, 0x18
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3832,11 +3555,9 @@
 
     if-eqz v1, :cond_1b
 
-    const/16 v1, 0x19
+    const/16 v4, 0x19
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
-
-    invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3847,15 +3568,13 @@
 
     if-eqz v1, :cond_1c
 
-    const/16 v1, 0x1a
+    const/16 v4, 0x1a
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    move-result-wide v5
 
-    move-result-wide v4
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -3866,8 +3585,6 @@
 
     if-eqz v1, :cond_1d
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
-
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
     const/16 v1, 0xe0
@@ -3885,8 +3602,6 @@
 
     if-eqz v1, :cond_1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
-
     array-length v1, v1
 
     if-lez v1, :cond_1f
@@ -3894,11 +3609,9 @@
     :goto_2
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v3, v1, :cond_1f
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->aZd:[Lcom/google/android/gms/internal/measurement/co;
+    if-ge v3, v2, :cond_1f
 
     aget-object v1, v1, v3
 
@@ -3922,11 +3635,9 @@
 
     if-eqz v1, :cond_20
 
-    const/16 v1, 0x1e
+    const/16 v2, 0x1e
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZe:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -3937,15 +3648,13 @@
 
     if-eqz v1, :cond_21
 
-    const/16 v1, 0x1f
+    const/16 v2, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZf:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -3956,15 +3665,13 @@
 
     if-eqz v1, :cond_22
 
-    const/16 v1, 0x20
+    const/16 v2, 0x20
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZg:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -3975,15 +3682,13 @@
 
     if-eqz v1, :cond_23
 
-    const/16 v1, 0x21
+    const/16 v2, 0x21
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZh:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -3994,11 +3699,9 @@
 
     if-eqz v1, :cond_24
 
-    const/16 v1, 0x22
+    const/16 v2, 0x22
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZi:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -4009,15 +3712,13 @@
 
     if-eqz v1, :cond_25
 
-    const/16 v1, 0x23
+    const/16 v2, 0x23
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -4028,15 +3729,13 @@
 
     if-eqz v1, :cond_26
 
-    const/16 v1, 0x24
+    const/16 v2, 0x24
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZk:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -4047,11 +3746,9 @@
 
     if-eqz v1, :cond_27
 
-    const/16 v1, 0x25
+    const/16 v2, 0x25
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -4062,11 +3759,9 @@
 
     if-eqz v1, :cond_28
 
-    const/16 v1, 0x26
+    const/16 v2, 0x26
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZm:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -4077,15 +3772,13 @@
 
     if-eqz v1, :cond_29
 
-    const/16 v1, 0x27
+    const/16 v2, 0x27
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZn:Ljava/lang/Integer;
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    move-result v1
 
-    move-result v2
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->E(II)I
 
     move-result v1
 
@@ -4096,11 +3789,9 @@
 
     if-eqz v1, :cond_2a
 
-    const/16 v1, 0x29
+    const/16 v2, 0x29
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aYj:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -4111,11 +3802,9 @@
 
     if-eqz v1, :cond_2b
 
-    const/16 v1, 0x2c
+    const/16 v2, 0x2c
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ct;->aZo:Lcom/google/android/gms/internal/measurement/cb$b;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/ha;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/ha;)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cu.smali
index c6414392f0..b75bd8153f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cu.smali
@@ -36,13 +36,13 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cp;->vq()[Lcom/google/android/gms/internal/measurement/cp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cp;->vp()[Lcom/google/android/gms/internal/measurement/cp;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cv;->vu()[Lcom/google/android/gms/internal/measurement/cv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cv;->vt()[Lcom/google/android/gms/internal/measurement/cv;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -125,8 +125,6 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
-
     array-length v1, v1
 
     :goto_1
@@ -158,7 +156,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -193,8 +191,6 @@
     goto :goto_3
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
-
     array-length v1, v1
 
     :goto_3
@@ -226,7 +222,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/je;->a(Lcom/google/android/gms/internal/measurement/jo;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -248,7 +244,7 @@
     goto/16 :goto_0
 
     :cond_9
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -263,13 +259,13 @@
     const/4 v3, 0x0
 
     :goto_5
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->yf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->ye()I
 
     move-result v4
 
     if-lez v4, :cond_a
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     add-int/lit8 v3, v3, 0x1
 
@@ -287,8 +283,6 @@
     goto :goto_6
 
     :cond_b
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
-
     array-length v1, v1
 
     :goto_6
@@ -308,7 +302,7 @@
 
     if-ge v1, v2, :cond_d
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v4
 
@@ -321,7 +315,9 @@
     :cond_d
     iput-object v3, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
 
-    goto/16 :goto_d
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/je;->dL(I)V
+
+    goto/16 :goto_0
 
     :cond_e
     invoke-static {p1, v1}, Lcom/google/android/gms/internal/measurement/jr;->b(Lcom/google/android/gms/internal/measurement/je;I)I
@@ -337,8 +333,6 @@
     goto :goto_8
 
     :cond_f
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
-
     array-length v1, v1
 
     :goto_8
@@ -360,20 +354,20 @@
 
     if-ge v1, v2, :cond_11
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v2
 
     aput-wide v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_9
 
     :cond_11
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v2
 
@@ -384,7 +378,7 @@
     goto/16 :goto_0
 
     :cond_12
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -399,13 +393,13 @@
     const/4 v3, 0x0
 
     :goto_a
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->yf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->ye()I
 
     move-result v4
 
     if-lez v4, :cond_13
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     add-int/lit8 v3, v3, 0x1
 
@@ -423,8 +417,6 @@
     goto :goto_b
 
     :cond_14
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
-
     array-length v1, v1
 
     :goto_b
@@ -444,7 +436,7 @@
 
     if-ge v1, v2, :cond_16
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v4
 
@@ -457,7 +449,6 @@
     :cond_16
     iput-object v3, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
 
-    :goto_d
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/je;->dL(I)V
 
     goto/16 :goto_0
@@ -473,14 +464,12 @@
 
     const/4 v1, 0x0
 
-    goto :goto_e
+    goto :goto_d
 
     :cond_18
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
-
     array-length v1, v1
 
-    :goto_e
+    :goto_d
     add-int/2addr v0, v1
 
     new-array v0, v0, [J
@@ -492,27 +481,27 @@
     invoke-static {v3, v2, v0, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_19
-    :goto_f
+    :goto_e
     array-length v2, v0
 
     add-int/lit8 v2, v2, -0x1
 
     if-ge v1, v2, :cond_1a
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v2
 
     aput-wide v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_f
+    goto :goto_e
 
     :cond_1a
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v2
 
@@ -540,8 +529,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
-
     array-length v0, v0
 
     if-lez v0, :cond_0
@@ -551,11 +538,9 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_0
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
+    if-ge v0, v3, :cond_0
 
     aget-wide v3, v2, v0
 
@@ -572,8 +557,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
-
     array-length v0, v0
 
     if-lez v0, :cond_1
@@ -583,17 +566,15 @@
     :goto_1
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_1
+    if-ge v0, v3, :cond_1
 
-    const/4 v2, 0x2
+    const/4 v3, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
+    aget-wide v4, v2, v0
 
-    aget-wide v4, v3, v0
-
-    invoke-virtual {p1, v2, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->c(IJ)V
+    invoke-virtual {p1, v3, v4, v5}, Lcom/google/android/gms/internal/measurement/jf;->c(IJ)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -604,8 +585,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
-
     array-length v0, v0
 
     if-lez v0, :cond_3
@@ -615,11 +594,9 @@
     :goto_2
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_3
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
+    if-ge v0, v3, :cond_3
 
     aget-object v2, v2, v0
 
@@ -639,8 +616,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
-
     array-length v0, v0
 
     if-lez v0, :cond_5
@@ -648,11 +623,9 @@
     :goto_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
 
-    array-length v0, v0
+    array-length v2, v0
 
-    if-ge v1, v0, :cond_5
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
+    if-ge v1, v2, :cond_5
 
     aget-object v0, v0, v1
 
@@ -887,10 +860,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 7
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -900,8 +873,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
-
     array-length v1, v1
 
     if-lez v1, :cond_1
@@ -913,11 +884,9 @@
     :goto_0
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v1, v4, :cond_0
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
+    if-ge v1, v5, :cond_0
 
     aget-wide v5, v4, v1
 
@@ -934,9 +903,7 @@
     :cond_0
     add-int/2addr v0, v3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
-
-    array-length v1, v1
+    array-length v1, v4
 
     mul-int/lit8 v1, v1, 0x1
 
@@ -947,8 +914,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
-
     array-length v1, v1
 
     if-lez v1, :cond_3
@@ -960,11 +925,9 @@
     :goto_1
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v1, v4, :cond_2
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
+    if-ge v1, v5, :cond_2
 
     aget-wide v5, v4, v1
 
@@ -981,9 +944,7 @@
     :cond_2
     add-int/2addr v0, v3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZq:[J
-
-    array-length v1, v1
+    array-length v1, v4
 
     mul-int/lit8 v1, v1, 0x1
 
@@ -994,8 +955,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
-
     array-length v1, v1
 
     if-lez v1, :cond_6
@@ -1007,11 +966,9 @@
     :goto_2
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ge v0, v3, :cond_5
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
+    if-ge v0, v4, :cond_5
 
     aget-object v3, v3, v0
 
@@ -1038,8 +995,6 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
-
     array-length v1, v1
 
     if-lez v1, :cond_8
@@ -1047,11 +1002,9 @@
     :goto_3
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
 
-    array-length v1, v1
+    array-length v3, v1
 
-    if-ge v2, v1, :cond_8
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
+    if-ge v2, v3, :cond_8
 
     aget-object v1, v1, v2
 
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 eb4c07e14a..8551fd6478 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
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method public static vu()[Lcom/google/android/gms/internal/measurement/cv;
+.method public static vt()[Lcom/google/android/gms/internal/measurement/cv;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cv;->aZt:[Lcom/google/android/gms/internal/measurement/cv;
@@ -100,7 +100,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -129,7 +129,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -144,13 +144,13 @@
     const/4 v3, 0x0
 
     :goto_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->yf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->ye()I
 
     move-result v4
 
     if-lez v4, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     add-int/lit8 v3, v3, 0x1
 
@@ -168,8 +168,6 @@
     goto :goto_2
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
-
     array-length v1, v1
 
     :goto_2
@@ -189,7 +187,7 @@
 
     if-ge v1, v2, :cond_5
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v4
 
@@ -220,8 +218,6 @@
     goto :goto_4
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
-
     array-length v1, v1
 
     :goto_4
@@ -243,20 +239,20 @@
 
     if-ge v1, v2, :cond_9
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v2
 
     aput-wide v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_5
 
     :cond_9
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v2
 
@@ -267,7 +263,7 @@
     goto/16 :goto_0
 
     :cond_a
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -295,8 +291,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cv;->aYr:Ljava/lang/Integer;
-
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -310,8 +304,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
-
     array-length v0, v0
 
     if-lez v0, :cond_1
@@ -321,17 +313,15 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
+    if-ge v0, v2, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
+    aget-wide v3, v1, v0
 
-    aget-wide v3, v2, v0
-
-    invoke-virtual {p1, v1, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -375,8 +365,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aYr:Ljava/lang/Integer;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cv;->aYr:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
@@ -480,8 +468,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aYr:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->hashCode()I
 
     move-result v1
@@ -529,10 +515,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 7
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -542,8 +528,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aYr:Ljava/lang/Integer;
-
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v1
@@ -559,8 +543,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
-
     array-length v1, v1
 
     if-lez v1, :cond_2
@@ -572,11 +554,9 @@
     :goto_0
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge v1, v4, :cond_1
-
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
+    if-ge v1, v5, :cond_1
 
     aget-wide v5, v4, v1
 
@@ -593,9 +573,7 @@
     :cond_1
     add-int/2addr v0, v3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
-
-    array-length v1, v1
+    array-length v1, v4
 
     mul-int/lit8 v1, v1, 0x1
 
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 d94b484b8c..6dba705c9f 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
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method public static vv()[Lcom/google/android/gms/internal/measurement/cw;
+.method public static vu()[Lcom/google/android/gms/internal/measurement/cw;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/cw;->aZv:[Lcom/google/android/gms/internal/measurement/cw;
@@ -114,7 +114,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -153,7 +153,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wm()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wl()J
 
     move-result-wide v0
 
@@ -170,7 +170,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wl()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()I
 
     move-result v0
 
@@ -187,7 +187,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -218,7 +218,7 @@
     goto :goto_0
 
     :cond_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/je;->wj()J
 
     move-result-wide v0
 
@@ -235,7 +235,7 @@
 .end method
 
 .method public final a(Lcom/google/android/gms/internal/measurement/jf;)V
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -246,82 +246,70 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x2
+    const/4 v1, 0x2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->e(ILjava/lang/String;)V
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->aYz:Ljava/lang/Long;
 
     if-eqz v0, :cond_3
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYz:Ljava/lang/Long;
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->i(IJ)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->aYA:Ljava/lang/Float;
 
     if-eqz v0, :cond_4
 
-    const/4 v0, 0x5
+    const/4 v1, 0x5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYA:Ljava/lang/Float;
+    invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
-    invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
+    move-result v0
 
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/jf;->b(IF)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/jf;->b(IF)V
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->aYB:Ljava/lang/Double;
 
     if-eqz v0, :cond_5
 
-    const/4 v0, 0x6
+    const/4 v1, 0x6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYB:Ljava/lang/Double;
+    invoke-virtual {v0}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
+    move-result-wide v2
 
-    move-result-wide v1
-
-    invoke-virtual {p1, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->a(ID)V
+    invoke-virtual {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->a(ID)V
 
     :cond_5
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/ji;->a(Lcom/google/android/gms/internal/measurement/jf;)V
@@ -361,8 +349,6 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -385,8 +371,6 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -409,8 +393,6 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -433,8 +415,6 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYz:Ljava/lang/Long;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cw;->aYz:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
@@ -457,8 +437,6 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYA:Ljava/lang/Float;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cw;->aYA:Ljava/lang/Float;
 
     invoke-virtual {v1, v3}, Ljava/lang/Float;->equals(Ljava/lang/Object;)Z
@@ -481,8 +459,6 @@
     return v2
 
     :cond_c
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYB:Ljava/lang/Double;
-
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/cw;->aYB:Ljava/lang/Double;
 
     invoke-virtual {v1, v3}, Ljava/lang/Double;->equals(Ljava/lang/Object;)Z
@@ -573,8 +549,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -593,8 +567,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -613,8 +585,6 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
-
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
@@ -633,8 +603,6 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYz:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->hashCode()I
 
     move-result v1
@@ -653,8 +621,6 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYA:Ljava/lang/Float;
-
     invoke-virtual {v1}, Ljava/lang/Float;->hashCode()I
 
     move-result v1
@@ -673,8 +639,6 @@
     goto :goto_5
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYB:Ljava/lang/Double;
-
     invoke-virtual {v1}, Ljava/lang/Double;->hashCode()I
 
     move-result v1
@@ -712,10 +676,10 @@
     return v0
 .end method
 
-.method protected final vj()I
+.method protected final vi()I
     .locals 5
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vj()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ji;->vi()I
 
     move-result v0
 
@@ -723,15 +687,13 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    move-result-wide v3
 
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
+    invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/jf;->f(IJ)I
 
     move-result v1
 
@@ -742,11 +704,9 @@
 
     if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -757,11 +717,9 @@
 
     if-eqz v1, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
-
-    invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/jf;->f(ILjava/lang/String;)I
 
     move-result v1
 
@@ -774,8 +732,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYz:Ljava/lang/Long;
-
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v3
@@ -791,8 +747,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYA:Ljava/lang/Float;
-
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
     const/16 v1, 0x28
@@ -810,8 +764,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->aYB:Ljava/lang/Double;
-
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
     const/16 v1, 0x30
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 cf3c182f23..966b385e3b 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
@@ -122,7 +122,7 @@
     throw p1
 .end method
 
-.method protected final mr()Landroid/os/Parcel;
+.method protected final mq()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali
index 8b8a584b5c..a683effc50 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali
@@ -69,7 +69,6 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
 
     return-void
@@ -79,7 +78,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    return-void
 .end method
 
 .method public static b(Landroid/os/Parcel;Landroid/os/Parcelable;)V
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 8a6605c255..1dbbd2a559 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
@@ -193,8 +193,6 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->aTy:Lcom/google/android/gms/analytics/a/b;
-
     iput-object v0, p1, Lcom/google/android/gms/internal/measurement/d;->aTy:Lcom/google/android/gms/analytics/a/b;
 
     :cond_5
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 406760bde0..0b58708788 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
@@ -452,6 +452,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p0
+
+    return-void
 .end method
 
 .method private static varargs a(Landroid/content/ContentResolver;[Ljava/lang/String;)Ljava/util/Map;
@@ -532,6 +534,8 @@
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static a(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V
@@ -814,7 +818,7 @@
     throw p0
 .end method
 
-.method static synthetic vw()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic vv()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/da;->aZE:Ljava/util/concurrent/atomic/AtomicBoolean;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali
index a357c8150d..812747dbd8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali
@@ -18,7 +18,7 @@
 .method public final onChange(Z)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/da;->vw()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/da;->vv()Ljava/util/concurrent/atomic/AtomicBoolean;
 
     move-result-object p1
 
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 e10928d9ab..606b83904a 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
@@ -173,6 +173,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p0
+
+    return-void
 .end method
 
 .method public static c(Landroid/content/ContentResolver;Landroid/net/Uri;)Lcom/google/android/gms/internal/measurement/dc;
@@ -216,7 +218,7 @@
     throw p0
 .end method
 
-.method private final vy()Ljava/util/Map;
+.method private final vx()Ljava/util/Map;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -314,7 +316,7 @@
 
 
 # virtual methods
-.method public final vx()Ljava/util/Map;
+.method public final vw()Ljava/util/Map;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -334,7 +336,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->vy()Ljava/util/Map;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->vx()Ljava/util/Map;
 
     move-result-object v0
 
@@ -355,7 +357,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->vy()Ljava/util/Map;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->vx()Ljava/util/Map;
 
     move-result-object v0
 
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 9465f3ac14..4968e6a8c7 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
@@ -26,14 +26,14 @@
 
 
 # virtual methods
-.method public final vC()Ljava/lang/Object;
+.method public final vB()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/df;->bag:Lcom/google/android/gms/internal/measurement/de;
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/df;->bah:Lcom/google/android/gms/internal/measurement/dc;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dc;->vx()Ljava/util/Map;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dc;->vw()Ljava/util/Map;
 
     move-result-object v1
 
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 d2ceb40a4e..5d784a32b6 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
@@ -22,7 +22,7 @@
 
 
 # virtual methods
-.method public final vC()Ljava/lang/Object;
+.method public final vB()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->bag:Lcom/google/android/gms/internal/measurement/de;
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 528524b4f3..7e444f9d5a 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
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public final vC()Ljava/lang/Object;
+.method public final vB()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->bai:Ljava/lang/String;
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 b65b250f2d..19128a2d28 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
@@ -33,11 +33,11 @@
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     const-string v0, "PhenotypeFlag"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali
index 416427a3a2..31a1fc8d05 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali
@@ -33,11 +33,11 @@
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     const-string v0, "PhenotypeFlag"
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 56cd984828..d64ce71f2e 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
@@ -33,11 +33,11 @@
 
     invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     const-string v0, "PhenotypeFlag"
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 a2b50b3daf..3f6e593b57 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
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method public abstract vC()Ljava/lang/Object;
+.method public abstract vB()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TV;"
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 d30836d725..54e55e137b 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
@@ -71,7 +71,7 @@
     return-object v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -79,7 +79,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
@@ -89,7 +89,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
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 de5791e2f1..123e5c4fe9 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
@@ -95,9 +95,7 @@
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/dx;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->bax:Lcom/google/android/gms/common/api/e;
-
-    iget-object v2, v2, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
+    iget-object v2, v0, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
 
     invoke-virtual {p1}, Landroid/content/Intent;->getDataString()Ljava/lang/String;
 
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 db0e8c6db6..bc0effbcec 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
@@ -23,7 +23,7 @@
     throw p1
 .end method
 
-.method public final vE()V
+.method public final vD()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
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 f7b65f128c..d0063fcd31 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
@@ -57,7 +57,7 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw;->bay:Lcom/google/android/gms/tasks/h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v2
 
@@ -80,7 +80,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/zztd;->vD()Landroid/os/Bundle;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/zztd;->vC()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -90,7 +90,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_5
 
     invoke-virtual {p1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
 
@@ -141,8 +141,13 @@
 
     goto :goto_2
 
-    :catch_0
     :cond_4
+    return-void
+
+    :catch_0
+    return-void
+
+    :cond_5
     :goto_3
     return-void
 .end method
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 2f3feff95a..4742416aa8 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
@@ -53,7 +53,7 @@
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dx;->bar:Ljava/lang/String;
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dt;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dt;->lG()Landroid/os/IInterface;
 
     move-result-object p1
 
@@ -63,6 +63,8 @@
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .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 2d11a03ee3..80d506c463 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
@@ -14,7 +14,7 @@
     .end annotation
 .end method
 
-.method public abstract vE()V
+.method public abstract vD()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
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 9c7d80b379..144e3e8be3 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
@@ -41,7 +41,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/measurement/cz;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dz;->vE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dz;->vD()V
 
     goto :goto_0
 
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 3d459d9bca..b08fd1b9eb 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
@@ -85,8 +85,6 @@
 
     if-eqz v4, :cond_3
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/e;->value:J
-
     iput-wide v0, p1, Lcom/google/android/gms/internal/measurement/e;->value:J
 
     :cond_3
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 d4f779d468..ed88f5922d 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
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
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 d600aec6fc..193bbee26c 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
@@ -58,11 +58,11 @@
     throw p1
 .end method
 
-.method public final vF()Lcom/google/android/gms/internal/measurement/em;
+.method public final vE()Lcom/google/android/gms/internal/measurement/em;
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ee;->wU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ee;->wT()I
 
     move-result v0
 
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/ee;->a(Lcom/google/android/gms/internal/measurement/fb;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/et;->vQ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/et;->vP()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v0
     :try_end_0
@@ -146,7 +146,7 @@
     throw v1
 .end method
 
-.method vG()I
+.method vF()I
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali
index 7339ad619f..7574604b33 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali
@@ -41,7 +41,7 @@
 .method public final synthetic a(Lcom/google/android/gms/internal/measurement/ha;)Lcom/google/android/gms/internal/measurement/hb;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ef;->wX()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ef;->wW()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object v0
 
@@ -81,14 +81,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ef;->vH()Lcom/google/android/gms/internal/measurement/ef;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ef;->vG()Lcom/google/android/gms/internal/measurement/ef;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public abstract vH()Lcom/google/android/gms/internal/measurement/ef;
+.method public abstract vG()Lcom/google/android/gms/internal/measurement/ef;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TBuilderType;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali
index 16a0e5a5af..94061e030f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali
@@ -26,7 +26,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wD()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wC()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eh.smali
index 79b5a109b1..5c4da2ac7e 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
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->add(ILjava/lang/Object;)V
 
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->add(Ljava/lang/Object;)Z
 
@@ -80,7 +80,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->addAll(ILjava/util/Collection;)Z
 
@@ -99,7 +99,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->addAll(Ljava/util/Collection;)Z
 
@@ -111,7 +111,7 @@
 .method public clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0}, Ljava/util/AbstractList;->clear()V
 
@@ -235,7 +235,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(I)Ljava/lang/Object;
 
@@ -247,7 +247,7 @@
 .method public remove(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
 
@@ -266,7 +266,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->removeAll(Ljava/util/Collection;)Z
 
@@ -285,7 +285,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->retainAll(Ljava/util/Collection;)Z
 
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -311,7 +311,7 @@
     return-object p1
 .end method
 
-.method public vI()Z
+.method public vH()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/eh;->zzbtu:Z
@@ -319,7 +319,7 @@
     return v0
 .end method
 
-.method public final vJ()V
+.method public final vI()V
     .locals 1
 
     const/4 v0, 0x0
@@ -329,7 +329,7 @@
     return-void
 .end method
 
-.method protected final vK()V
+.method protected final vJ()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/eh;->zzbtu:Z
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 575a2f2033..e59393cfc4 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
@@ -77,7 +77,7 @@
     return-object p0
 .end method
 
-.method static vL()Z
+.method static vK()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ej;->baE:Ljava/lang/Class;
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method static vM()Ljava/lang/Class;
+.method static vL()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 dc08abf213..292375f8af 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
@@ -78,7 +78,7 @@
 .method private final c(IZ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/ek;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/ek;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([ZI)[Z
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([ZI)[Z
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/measurement/ek;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/ek;->modCount:I
 
@@ -469,7 +451,7 @@
 
     aget-boolean v2, v2, v1
 
-    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/fw;->Q(Z)I
+    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/fw;->P(Z)I
 
     move-result v2
 
@@ -484,33 +466,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/ek;->cR(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
 
-    aget-boolean v0, v0, p1
+    aget-boolean v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
-
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
@@ -525,7 +501,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/ek;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -533,9 +509,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     const/4 v0, 0x0
 
@@ -564,13 +540,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/ek;->size:I
 
@@ -600,7 +574,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -647,19 +621,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/ek;->cR(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
 
-    aget-boolean v0, v0, p1
+    aget-boolean v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ek;->baH:[Z
+    aput-boolean p2, v0, p1
 
-    aput-boolean p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
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 f633b208bc..dd3099b356 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
@@ -50,7 +50,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/measurement/em;->baI:Lcom/google/android/gms/internal/measurement/em;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vK()Z
 
     move-result v0
 
@@ -369,7 +369,7 @@
     return-object v0
 .end method
 
-.method public final vN()Ljava/lang/String;
+.method public final vM()Ljava/lang/String;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/fw;->UTF_8:Ljava/nio/charset/Charset;
@@ -392,7 +392,7 @@
     return-object v0
 .end method
 
-.method public abstract vO()Z
+.method public abstract vN()Z
 .end method
 
 .method protected abstract x(II)I
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 4816ad4da0..6f352e37af 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
@@ -117,7 +117,7 @@
     return v0
 .end method
 
-.method protected final vP()I
+.method protected final vO()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/eq;->zzbud:I
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 5c06a121b3..d396d7e3ff 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
@@ -39,12 +39,12 @@
 
 
 # virtual methods
-.method public final vQ()Lcom/google/android/gms/internal/measurement/em;
+.method public final vP()Lcom/google/android/gms/internal/measurement/em;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/et;->baM:Lcom/google/android/gms/internal/measurement/fb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fb;->wx()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fb;->ww()I
 
     move-result v0
 
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 1925e374d9..aa57b379b0 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
@@ -35,7 +35,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ev;->zzbug:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result v2
 
@@ -58,7 +58,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->zzbug:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result v1
 
@@ -96,17 +96,17 @@
 
     iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ev;->zzbug:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result v2
 
     add-int/2addr v2, p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result p1
 
@@ -211,6 +211,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public dH(I)B
@@ -247,7 +249,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ev;->zzbug:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result v2
 
@@ -348,10 +350,10 @@
     return v0
 .end method
 
-.method public final vO()Z
+.method public final vN()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result v0
 
@@ -370,7 +372,7 @@
     return v0
 .end method
 
-.method protected vP()I
+.method protected vO()I
     .locals 1
 
     const/4 v0, 0x0
@@ -383,7 +385,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->zzbug:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vP()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->vO()I
 
     move-result v1
 
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 8bbd403f49..ea53764d85 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
@@ -148,7 +148,15 @@
     .end annotation
 .end method
 
-.method public abstract vR()I
+.method public abstract vQ()I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract vR()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -164,7 +172,7 @@
     .end annotation
 .end method
 
-.method public abstract vT()J
+.method public abstract vT()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -172,7 +180,7 @@
     .end annotation
 .end method
 
-.method public abstract vU()I
+.method public abstract vU()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -180,7 +188,7 @@
     .end annotation
 .end method
 
-.method public abstract vV()J
+.method public abstract vV()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -188,7 +196,7 @@
     .end annotation
 .end method
 
-.method public abstract vW()I
+.method public abstract vW()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -196,7 +204,7 @@
     .end annotation
 .end method
 
-.method public abstract vX()Z
+.method public abstract vX()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -204,7 +212,7 @@
     .end annotation
 .end method
 
-.method public abstract vY()Ljava/lang/String;
+.method public abstract vY()Lcom/google/android/gms/internal/measurement/em;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -212,7 +220,7 @@
     .end annotation
 .end method
 
-.method public abstract vZ()Lcom/google/android/gms/internal/measurement/em;
+.method public abstract vZ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -236,7 +244,7 @@
     .end annotation
 .end method
 
-.method public abstract wc()I
+.method public abstract wc()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -244,7 +252,7 @@
     .end annotation
 .end method
 
-.method public abstract wd()J
+.method public abstract wd()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -252,7 +260,7 @@
     .end annotation
 .end method
 
-.method public abstract we()I
+.method public abstract we()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -260,7 +268,7 @@
     .end annotation
 .end method
 
-.method public abstract wf()J
+.method abstract wf()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -268,7 +276,7 @@
     .end annotation
 .end method
 
-.method abstract wg()J
+.method public abstract wg()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -276,13 +284,5 @@
     .end annotation
 .end method
 
-.method public abstract wh()Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract wi()I
+.method public abstract wh()I
 .end method
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 9985eb05b4..f258acd585 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
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method private final wj()I
+.method private final wi()I
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -73,34 +73,32 @@
 
     if-eq v1, v0, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
 
-    add-int/lit8 v2, v0, 0x1
+    add-int/lit8 v3, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     if-ltz v0, :cond_0
 
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    iput v3, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
     return v0
 
     :cond_0
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/ey;->limit:I
-
-    sub-int/2addr v3, v2
+    sub-int/2addr v1, v3
 
     const/16 v4, 0x9
 
-    if-lt v3, v4, :cond_6
+    if-lt v1, v4, :cond_6
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    shl-int/lit8 v2, v2, 0x7
+    shl-int/lit8 v3, v3, 0x7
 
-    xor-int/2addr v0, v2
+    xor-int/2addr v0, v3
 
     if-gez v0, :cond_1
 
@@ -109,46 +107,45 @@
     goto :goto_0
 
     :cond_1
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    shl-int/lit8 v3, v3, 0xe
+    shl-int/lit8 v1, v1, 0xe
 
-    xor-int/2addr v0, v3
+    xor-int/2addr v0, v1
 
-    if-ltz v0, :cond_3
+    if-ltz v0, :cond_2
 
     xor-int/lit16 v0, v0, 0x3f80
 
+    move v1, v3
+
+    goto :goto_0
+
     :cond_2
-    move v3, v2
+    add-int/lit8 v1, v3, 0x1
+
+    aget-byte v3, v2, v3
+
+    shl-int/lit8 v3, v3, 0x15
+
+    xor-int/2addr v0, v3
+
+    if-gez v0, :cond_3
+
+    const v2, -0x1fc080
+
+    xor-int/2addr v0, v2
 
     goto :goto_0
 
     :cond_3
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v1, v2, v1
 
-    shl-int/lit8 v2, v2, 0x15
-
-    xor-int/2addr v0, v2
-
-    if-gez v0, :cond_4
-
-    const v1, -0x1fc080
-
-    xor-int/2addr v0, v1
-
-    goto :goto_0
-
-    :cond_4
-    add-int/lit8 v2, v3, 0x1
-
-    aget-byte v3, v1, v3
-
-    shl-int/lit8 v4, v3, 0x1c
+    shl-int/lit8 v4, v1, 0x1c
 
     xor-int/2addr v0, v4
 
@@ -156,46 +153,51 @@
 
     xor-int/2addr v0, v4
 
-    if-gez v3, :cond_2
+    if-gez v1, :cond_4
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    if-gez v2, :cond_5
+    if-gez v3, :cond_5
 
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    if-gez v3, :cond_2
+    if-gez v1, :cond_4
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    if-gez v2, :cond_5
+    if-gez v3, :cond_5
 
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    if-gez v3, :cond_2
+    if-gez v1, :cond_4
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v1, v1, v2
+    aget-byte v2, v2, v3
 
-    if-ltz v1, :cond_6
+    if-ltz v2, :cond_6
+
+    goto :goto_0
+
+    :cond_4
+    move v1, v3
 
     :cond_5
     :goto_0
-    iput v3, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
     return v0
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wg()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wf()J
 
     move-result-wide v0
 
@@ -204,7 +206,7 @@
     return v0
 .end method
 
-.method private final wk()J
+.method private final wj()J
     .locals 11
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -218,61 +220,53 @@
 
     if-eq v1, v0, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
 
-    add-int/lit8 v2, v0, 0x1
+    add-int/lit8 v3, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     if-ltz v0, :cond_0
 
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    iput v3, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
     int-to-long v0, v0
 
     return-wide v0
 
     :cond_0
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/ey;->limit:I
-
-    sub-int/2addr v3, v2
+    sub-int/2addr v1, v3
 
     const/16 v4, 0x9
 
-    if-lt v3, v4, :cond_9
+    if-lt v1, v4, :cond_9
 
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    shl-int/lit8 v2, v2, 0x7
+    shl-int/lit8 v3, v3, 0x7
 
-    xor-int/2addr v0, v2
+    xor-int/2addr v0, v3
 
     if-gez v0, :cond_1
 
     xor-int/lit8 v0, v0, -0x80
 
-    :goto_0
-    int-to-long v0, v0
+    int-to-long v2, v0
 
-    move-wide v9, v0
+    move-wide v3, v2
 
-    move v0, v3
-
-    :goto_1
-    move-wide v2, v9
-
-    goto/16 :goto_5
+    goto/16 :goto_0
 
     :cond_1
-    add-int/lit8 v2, v3, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    aget-byte v3, v1, v3
+    aget-byte v1, v2, v1
 
-    shl-int/lit8 v3, v3, 0xe
+    shl-int/lit8 v1, v1, 0xe
 
-    xor-int/2addr v0, v3
+    xor-int/2addr v0, v1
 
     if-ltz v0, :cond_2
 
@@ -282,59 +276,68 @@
 
     move-wide v9, v0
 
-    move v0, v2
+    move v1, v3
 
-    goto :goto_1
+    move-wide v3, v9
+
+    goto/16 :goto_0
 
     :cond_2
-    add-int/lit8 v3, v2, 0x1
+    add-int/lit8 v1, v3, 0x1
 
-    aget-byte v2, v1, v2
+    aget-byte v3, v2, v3
 
-    shl-int/lit8 v2, v2, 0x15
+    shl-int/lit8 v3, v3, 0x15
 
-    xor-int/2addr v0, v2
+    xor-int/2addr v0, v3
 
     if-gez v0, :cond_3
 
-    const v1, -0x1fc080
+    const v2, -0x1fc080
 
-    xor-int/2addr v0, v1
+    xor-int/2addr v0, v2
+
+    int-to-long v2, v0
+
+    move-wide v3, v2
+
+    goto/16 :goto_0
+
+    :cond_3
+    int-to-long v3, v0
+
+    add-int/lit8 v0, v1, 0x1
+
+    aget-byte v1, v2, v1
+
+    int-to-long v5, v1
+
+    const/16 v1, 0x1c
+
+    shl-long/2addr v5, v1
+
+    xor-long/2addr v3, v5
+
+    const-wide/16 v5, 0x0
+
+    cmp-long v1, v3, v5
+
+    if-ltz v1, :cond_4
+
+    const-wide/32 v1, 0xfe03f80
+
+    xor-long/2addr v1, v3
+
+    move-wide v3, v1
+
+    move v1, v0
 
     goto :goto_0
 
-    :cond_3
-    int-to-long v4, v0
-
-    add-int/lit8 v0, v3, 0x1
-
-    aget-byte v2, v1, v3
-
-    int-to-long v2, v2
-
-    const/16 v6, 0x1c
-
-    shl-long/2addr v2, v6
-
-    xor-long/2addr v2, v4
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v2, v4
-
-    if-ltz v6, :cond_4
-
-    const-wide/32 v4, 0xfe03f80
-
-    :goto_2
-    xor-long/2addr v2, v4
-
-    goto :goto_5
-
     :cond_4
-    add-int/lit8 v6, v0, 0x1
+    add-int/lit8 v1, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     int-to-long v7, v0
 
@@ -342,49 +345,49 @@
 
     shl-long/2addr v7, v0
 
-    xor-long/2addr v2, v7
+    xor-long/2addr v3, v7
 
-    cmp-long v0, v2, v4
+    cmp-long v0, v3, v5
 
     if-gez v0, :cond_5
 
-    const-wide v0, -0x7f01fc080L
+    const-wide v5, -0x7f01fc080L
 
-    :goto_3
-    xor-long/2addr v0, v2
+    xor-long/2addr v3, v5
 
-    move-wide v2, v0
-
-    :goto_4
-    move v0, v6
-
-    goto :goto_5
+    goto :goto_0
 
     :cond_5
-    add-int/lit8 v0, v6, 0x1
+    add-int/lit8 v0, v1, 0x1
 
-    aget-byte v6, v1, v6
+    aget-byte v1, v2, v1
 
-    int-to-long v6, v6
+    int-to-long v7, v1
 
-    const/16 v8, 0x2a
+    const/16 v1, 0x2a
 
-    shl-long/2addr v6, v8
+    shl-long/2addr v7, v1
 
-    xor-long/2addr v2, v6
+    xor-long/2addr v3, v7
 
-    cmp-long v6, v2, v4
+    cmp-long v1, v3, v5
 
-    if-ltz v6, :cond_6
+    if-ltz v1, :cond_6
 
-    const-wide v4, 0x3f80fe03f80L
+    const-wide v1, 0x3f80fe03f80L
 
-    goto :goto_2
+    xor-long/2addr v1, v3
+
+    move-wide v3, v1
+
+    move v1, v0
+
+    goto :goto_0
 
     :cond_6
-    add-int/lit8 v6, v0, 0x1
+    add-int/lit8 v1, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
     int-to-long v7, v0
 
@@ -392,64 +395,68 @@
 
     shl-long/2addr v7, v0
 
-    xor-long/2addr v2, v7
+    xor-long/2addr v3, v7
 
-    cmp-long v0, v2, v4
+    cmp-long v0, v3, v5
 
     if-gez v0, :cond_7
 
-    const-wide v0, -0x1fc07f01fc080L
+    const-wide v5, -0x1fc07f01fc080L
 
-    goto :goto_3
+    xor-long/2addr v3, v5
+
+    goto :goto_0
 
     :cond_7
-    add-int/lit8 v0, v6, 0x1
+    add-int/lit8 v0, v1, 0x1
 
-    aget-byte v6, v1, v6
+    aget-byte v1, v2, v1
 
-    int-to-long v6, v6
+    int-to-long v7, v1
 
-    const/16 v8, 0x38
+    const/16 v1, 0x38
 
-    shl-long/2addr v6, v8
+    shl-long/2addr v7, v1
 
-    xor-long/2addr v2, v6
+    xor-long/2addr v3, v7
 
-    const-wide v6, 0xfe03f80fe03f80L
+    const-wide v7, 0xfe03f80fe03f80L
 
-    xor-long/2addr v2, v6
+    xor-long/2addr v3, v7
 
-    cmp-long v6, v2, v4
+    cmp-long v1, v3, v5
 
-    if-gez v6, :cond_8
+    if-gez v1, :cond_8
 
-    add-int/lit8 v6, v0, 0x1
+    add-int/lit8 v1, v0, 0x1
 
-    aget-byte v0, v1, v0
+    aget-byte v0, v2, v0
 
-    int-to-long v0, v0
+    int-to-long v7, v0
 
-    cmp-long v7, v0, v4
+    cmp-long v0, v7, v5
 
-    if-ltz v7, :cond_9
+    if-ltz v0, :cond_9
 
-    goto :goto_4
+    goto :goto_0
 
     :cond_8
-    :goto_5
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    move v1, v0
 
-    return-wide v2
+    :goto_0
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+
+    return-wide v3
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wg()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wf()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method private final wl()I
+.method private final wk()I
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -510,14 +517,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final wm()J
+.method private final wl()J
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -648,15 +655,15 @@
     return-wide v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final wn()V
-    .locals 2
+.method private final wm()V
+    .locals 3
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ey;->limit:I
 
@@ -670,19 +677,15 @@
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/ey;->baU:I
 
-    sub-int/2addr v0, v1
+    sub-int v1, v0, v1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ey;->baW:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/ey;->baW:I
 
-    if-le v0, v1, :cond_0
+    if-le v1, v2, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ey;->baW:I
+    sub-int/2addr v1, v2
 
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/ey;->baT:I
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ey;->limit:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/ey;->baT:I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/ey;->baT:I
 
@@ -700,7 +703,7 @@
     return-void
 .end method
 
-.method private final wo()B
+.method private final wn()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -714,20 +717,18 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
     iput v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
-    aget-byte v0, v0, v1
+    aget-byte v0, v1, v0
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
@@ -756,7 +757,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
@@ -797,7 +798,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xh()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -819,7 +820,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xe()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -836,7 +837,7 @@
 
     if-ltz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -848,19 +849,19 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/ey;->baW:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wm()V
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -885,7 +886,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -901,7 +902,7 @@
 
     :cond_0
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -925,7 +926,7 @@
     return v3
 
     :pswitch_3
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result p1
 
@@ -971,7 +972,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xe()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -981,7 +982,7 @@
     :goto_1
     if-ge v2, v0, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wn()B
 
     move-result p1
 
@@ -995,13 +996,13 @@
     return v3
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xe()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -1019,7 +1020,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/ey;->baW:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wm()V
 
     return-void
 .end method
@@ -1042,25 +1043,23 @@
 
     if-gt p1, v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    add-int/2addr v1, p1
 
-    add-int/2addr v0, p1
-
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
     return-void
 
     :cond_0
     if-gez p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -1075,7 +1074,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wm()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wl()J
 
     move-result-wide v0
 
@@ -1094,7 +1093,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wl()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wk()I
 
     move-result v0
 
@@ -1113,7 +1112,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
@@ -1129,13 +1128,11 @@
 
     new-instance v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
-
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
 
     sget-object v4, Lcom/google/android/gms/internal/measurement/fw;->UTF_8:Ljava/nio/charset/Charset;
 
-    invoke-direct {v1, v2, v3, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
+    invoke-direct {v1, v3, v2, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
     iget v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
@@ -1155,21 +1152,21 @@
     :cond_1
     if-gez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final vR()I
+.method public final vQ()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1177,7 +1174,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -1190,7 +1187,7 @@
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
@@ -1198,11 +1195,9 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ey;->baV:I
 
-    ushr-int/lit8 v0, v0, 0x3
+    ushr-int/lit8 v1, v0, 0x3
 
-    if-eqz v0, :cond_1
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ey;->baV:I
+    if-eqz v1, :cond_1
 
     return v0
 
@@ -1216,6 +1211,21 @@
     throw v0
 .end method
 
+.method public final vR()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final vS()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -1224,29 +1234,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wk()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final vT()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wk()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final vU()I
+.method public final vT()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1254,14 +1249,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final vV()J
+.method public final vU()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1269,14 +1264,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wm()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wl()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final vW()I
+.method public final vV()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1284,14 +1279,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wl()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wk()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final vX()Z
+.method public final vW()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1299,7 +1294,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wk()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()J
 
     move-result-wide v0
 
@@ -1319,7 +1314,7 @@
     return v0
 .end method
 
-.method public final vY()Ljava/lang/String;
+.method public final vX()Ljava/lang/String;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1327,7 +1322,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
@@ -1343,8 +1338,6 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
-
     invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/ir;->k([BII)Ljava/lang/String;
 
     move-result-object v1
@@ -1367,21 +1360,21 @@
     :cond_1
     if-gtz v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final vZ()Lcom/google/android/gms/internal/measurement/em;
+.method public final vY()Lcom/google/android/gms/internal/measurement/em;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1389,7 +1382,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
@@ -1405,8 +1398,6 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
-
     invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/em;->m([BII)Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v1
@@ -1437,19 +1428,15 @@
 
     if-gt v0, v1, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    add-int/2addr v0, v2
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
-
-    add-int/2addr v2, v0
-
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ey;->buffer:[B
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
 
-    invoke-static {v0, v1, v2}, Ljava/util/Arrays;->copyOfRange([BII)[B
+    invoke-static {v0, v2, v1}, Ljava/util/Arrays;->copyOfRange([BII)[B
 
     move-result-object v0
 
@@ -1470,20 +1457,35 @@
     return-object v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
 .end method
 
+.method public final vZ()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final wa()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -1492,7 +1494,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
@@ -1507,29 +1509,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wk()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final wc()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wl()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final wd()J
+.method public final wc()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1537,14 +1524,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wm()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wl()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final we()I
+.method public final wd()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1552,7 +1539,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wi()I
 
     move-result v0
 
@@ -1567,7 +1554,7 @@
     return v0
 .end method
 
-.method public final wf()J
+.method public final we()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1575,7 +1562,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wk()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wj()J
 
     move-result-wide v0
 
@@ -1594,7 +1581,7 @@
     return-wide v0
 .end method
 
-.method final wg()J
+.method final wf()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1611,7 +1598,7 @@
 
     if-ge v2, v3, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ey;->wn()B
 
     move-result v3
 
@@ -1635,14 +1622,16 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xe()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xd()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object v0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final wh()Z
+.method public final wg()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1666,7 +1655,7 @@
     return v0
 .end method
 
-.method public final wi()I
+.method public final wh()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ey;->pos:I
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 f3d46ea675..1a6745bfb6 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
@@ -81,7 +81,7 @@
     throw p1
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vS()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vR()J
 
     move-result-wide p1
 
@@ -92,7 +92,7 @@
     return-object p1
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wa()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vZ()I
 
     move-result p1
 
@@ -103,14 +103,14 @@
     return-object p1
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vY()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vX()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wf()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->we()J
 
     move-result-wide p1
 
@@ -121,7 +121,7 @@
     return-object p1
 
     :pswitch_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->we()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wd()I
 
     move-result p1
 
@@ -132,7 +132,7 @@
     return-object p1
 
     :pswitch_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wd()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wc()J
 
     move-result-wide p1
 
@@ -143,7 +143,7 @@
     return-object p1
 
     :pswitch_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wc()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wb()I
 
     move-result p1
 
@@ -158,7 +158,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/ez;->dN(I)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object p1
 
@@ -173,7 +173,7 @@
     return-object p1
 
     :pswitch_8
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vT()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vS()J
 
     move-result-wide p1
 
@@ -184,7 +184,7 @@
     return-object p1
 
     :pswitch_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vT()I
 
     move-result p1
 
@@ -206,7 +206,7 @@
     return-object p1
 
     :pswitch_b
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vV()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vU()J
 
     move-result-wide p1
 
@@ -217,7 +217,7 @@
     return-object p1
 
     :pswitch_c
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vV()I
 
     move-result p1
 
@@ -228,7 +228,7 @@
     return-object p1
 
     :pswitch_d
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wb()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wa()I
 
     move-result p1
 
@@ -250,14 +250,14 @@
     return-object p1
 
     :pswitch_f
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_10
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vX()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vW()Z
 
     move-result p1
 
@@ -325,7 +325,7 @@
     check-cast v0, Lcom/google/android/gms/internal/measurement/gk;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object p1
 
@@ -333,7 +333,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -344,7 +344,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -359,7 +359,7 @@
     :cond_2
     if-eqz p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vY()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vX()Ljava/lang/String;
 
     move-result-object v0
 
@@ -375,7 +375,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -386,7 +386,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -399,11 +399,13 @@
     return-void
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method private final c(Lcom/google/android/gms/internal/measurement/hr;Lcom/google/android/gms/internal/measurement/fg;)Ljava/lang/Object;
@@ -428,7 +430,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -485,7 +487,7 @@
     return-object v1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xh()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -547,7 +549,7 @@
 
     :cond_0
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xh()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -580,7 +582,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -602,7 +604,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xh()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p0
 
@@ -624,7 +626,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xh()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p0
 
@@ -641,7 +643,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -650,7 +652,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xc()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xb()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -688,7 +690,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -697,7 +699,7 @@
     :pswitch_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -705,7 +707,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -722,7 +724,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -742,7 +744,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -753,7 +755,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -772,7 +774,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -781,7 +783,7 @@
     :pswitch_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -789,7 +791,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -810,7 +812,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -834,7 +836,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -845,7 +847,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -918,7 +920,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -929,7 +931,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -942,7 +944,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -951,7 +953,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
@@ -959,7 +961,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -976,7 +978,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -1008,7 +1010,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -1019,7 +1021,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -1032,7 +1034,7 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1041,7 +1043,7 @@
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -1049,7 +1051,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1070,7 +1072,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -1116,13 +1118,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1131,7 +1133,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()J
 
     move-result-wide v2
 
@@ -1139,7 +1141,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -1150,7 +1152,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1159,7 +1161,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()J
 
     move-result-wide v1
 
@@ -1167,7 +1169,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -1178,7 +1180,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -1201,13 +1203,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1216,7 +1218,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()J
 
     move-result-wide v2
 
@@ -1228,7 +1230,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -1239,7 +1241,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1248,7 +1250,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()J
 
     move-result-wide v0
 
@@ -1260,7 +1262,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -1271,7 +1273,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -1321,13 +1323,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1336,7 +1338,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vT()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
 
     move-result-wide v2
 
@@ -1344,7 +1346,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -1355,7 +1357,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1364,7 +1366,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vT()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
 
     move-result-wide v1
 
@@ -1372,7 +1374,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -1383,7 +1385,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -1406,13 +1408,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1421,7 +1423,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vT()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
 
     move-result-wide v2
 
@@ -1433,7 +1435,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -1444,7 +1446,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1453,7 +1455,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vT()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vS()J
 
     move-result-wide v0
 
@@ -1465,7 +1467,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -1476,7 +1478,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -1526,13 +1528,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1541,7 +1543,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vT()I
 
     move-result p1
 
@@ -1549,7 +1551,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -1560,7 +1562,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1569,7 +1571,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vT()I
 
     move-result p1
 
@@ -1577,7 +1579,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -1588,7 +1590,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -1611,13 +1613,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1626,7 +1628,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vT()I
 
     move-result v0
 
@@ -1638,7 +1640,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -1649,7 +1651,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1658,7 +1660,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vT()I
 
     move-result v0
 
@@ -1670,7 +1672,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -1681,7 +1683,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -1723,7 +1725,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1732,7 +1734,7 @@
     :pswitch_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -1740,7 +1742,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1749,7 +1751,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()J
 
     move-result-wide v2
 
@@ -1757,7 +1759,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -1769,7 +1771,7 @@
     :pswitch_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()J
 
     move-result-wide v0
 
@@ -1777,7 +1779,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -1788,7 +1790,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -1807,7 +1809,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1816,7 +1818,7 @@
     :pswitch_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -1824,7 +1826,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -1833,7 +1835,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()J
 
     move-result-wide v2
 
@@ -1845,7 +1847,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -1857,7 +1859,7 @@
     :pswitch_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()J
 
     move-result-wide v0
 
@@ -1869,7 +1871,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -1880,7 +1882,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -1945,7 +1947,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vV()I
 
     move-result p1
 
@@ -1953,7 +1955,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -1964,7 +1966,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -1977,7 +1979,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -1986,7 +1988,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
@@ -1994,7 +1996,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -2003,7 +2005,7 @@
     :cond_4
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vV()I
 
     move-result p1
 
@@ -2011,7 +2013,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -2031,7 +2033,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()I
 
     move-result v0
 
@@ -2043,7 +2045,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -2054,7 +2056,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -2067,7 +2069,7 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -2076,7 +2078,7 @@
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -2084,7 +2086,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -2093,7 +2095,7 @@
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()I
 
     move-result v0
 
@@ -2105,7 +2107,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -2151,13 +2153,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -2166,7 +2168,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vW()Z
 
     move-result p1
 
@@ -2174,7 +2176,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -2185,7 +2187,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -2194,7 +2196,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vW()Z
 
     move-result p1
 
@@ -2202,7 +2204,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -2213,7 +2215,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -2236,13 +2238,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -2251,7 +2253,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vW()Z
 
     move-result v0
 
@@ -2263,7 +2265,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -2274,7 +2276,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -2283,7 +2285,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vW()Z
 
     move-result v0
 
@@ -2295,7 +2297,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -2306,7 +2308,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -2369,7 +2371,7 @@
     if-ne v0, v1, :cond_2
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v0
 
@@ -2377,7 +2379,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -2388,7 +2390,7 @@
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -2401,11 +2403,13 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final N(Ljava/util/List;)V
@@ -2445,13 +2449,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -2460,7 +2464,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
@@ -2468,7 +2472,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -2479,7 +2483,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -2488,7 +2492,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
@@ -2496,7 +2500,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -2507,7 +2511,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -2530,13 +2534,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -2545,7 +2549,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -2557,7 +2561,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -2568,7 +2572,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -2577,7 +2581,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -2589,7 +2593,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -2600,7 +2604,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -2645,7 +2649,7 @@
 .end method
 
 .method public final a(Ljava/util/List;Lcom/google/android/gms/internal/measurement/hr;Lcom/google/android/gms/internal/measurement/fg;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -2668,13 +2672,11 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
 
-    and-int/lit8 v0, v0, 0x7
+    and-int/lit8 v1, v0, 0x7
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    if-ne v0, v1, :cond_3
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
+    if-ne v1, v2, :cond_3
 
     :cond_0
     invoke-direct {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/ez;->c(Lcom/google/android/gms/internal/measurement/hr;Lcom/google/android/gms/internal/measurement/fg;)Ljava/lang/Object;
@@ -2685,7 +2687,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v1
 
@@ -2700,7 +2702,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v1
 
@@ -2708,16 +2710,20 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baZ:I
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(Ljava/util/Map;Lcom/google/android/gms/internal/measurement/gt;Lcom/google/android/gms/internal/measurement/fg;)V
@@ -2750,7 +2756,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -2766,7 +2772,7 @@
 
     :goto_0
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wp()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wo()I
 
     move-result v3
 
@@ -2776,7 +2782,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v4
     :try_end_0
@@ -2787,7 +2793,7 @@
     packed-switch v3, :pswitch_data_0
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wq()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wp()Z
 
     move-result v3
 
@@ -2804,9 +2810,7 @@
 
     invoke-direct {p0, v3, v4, p3}, Lcom/google/android/gms/internal/measurement/ez;->a(Lcom/google/android/gms/internal/measurement/ix;Ljava/lang/Class;Lcom/google/android/gms/internal/measurement/fg;)Ljava/lang/Object;
 
-    move-result-object v3
-
-    move-object v2, v3
+    move-result-object v2
 
     goto :goto_0
 
@@ -2817,9 +2821,7 @@
 
     invoke-direct {p0, v3, v4, v4}, Lcom/google/android/gms/internal/measurement/ez;->a(Lcom/google/android/gms/internal/measurement/ix;Ljava/lang/Class;Lcom/google/android/gms/internal/measurement/fg;)Ljava/lang/Object;
 
-    move-result-object v3
-
-    move-object v1, v3
+    move-result-object v1
 
     goto :goto_0
 
@@ -2842,7 +2844,7 @@
 
     :catch_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wq()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ez;->wp()Z
 
     move-result v3
 
@@ -2879,6 +2881,10 @@
 
     throw p1
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -2923,13 +2929,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -2938,7 +2944,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
 
     move-result p1
 
@@ -2946,7 +2952,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -2957,7 +2963,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -2966,7 +2972,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
 
     move-result p1
 
@@ -2974,7 +2980,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -2985,7 +2991,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -3008,13 +3014,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3023,7 +3029,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
 
     move-result v0
 
@@ -3035,7 +3041,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -3046,7 +3052,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3055,7 +3061,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
 
     move-result v0
 
@@ -3067,7 +3073,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -3078,7 +3084,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -3131,7 +3137,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
 
     move-result p1
 
@@ -3139,7 +3145,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -3150,7 +3156,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -3163,7 +3169,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3172,7 +3178,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
@@ -3180,7 +3186,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3189,7 +3195,7 @@
     :cond_4
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
 
     move-result p1
 
@@ -3197,7 +3203,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -3217,7 +3223,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
 
     move-result v0
 
@@ -3229,7 +3235,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -3240,7 +3246,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -3253,7 +3259,7 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3262,7 +3268,7 @@
     :cond_9
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -3270,7 +3276,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3279,7 +3285,7 @@
     :cond_a
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wb()I
 
     move-result v0
 
@@ -3291,7 +3297,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -3329,7 +3335,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3338,7 +3344,7 @@
     :pswitch_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -3346,7 +3352,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3355,7 +3361,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()J
 
     move-result-wide v2
 
@@ -3363,7 +3369,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -3375,7 +3381,7 @@
     :pswitch_1
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()J
 
     move-result-wide v0
 
@@ -3383,7 +3389,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -3394,7 +3400,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -3413,7 +3419,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3422,7 +3428,7 @@
     :pswitch_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
@@ -3430,7 +3436,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3439,7 +3445,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()J
 
     move-result-wide v2
 
@@ -3451,7 +3457,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -3463,7 +3469,7 @@
     :pswitch_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()J
 
     move-result-wide v0
 
@@ -3475,7 +3481,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -3486,7 +3492,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -3548,13 +3554,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3563,7 +3569,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->we()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wd()I
 
     move-result p1
 
@@ -3571,7 +3577,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -3582,7 +3588,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3591,7 +3597,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->we()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wd()I
 
     move-result p1
 
@@ -3599,7 +3605,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -3610,7 +3616,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -3633,13 +3639,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3648,7 +3654,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->we()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()I
 
     move-result v0
 
@@ -3660,7 +3666,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -3671,7 +3677,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3680,7 +3686,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->we()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()I
 
     move-result v0
 
@@ -3692,7 +3698,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -3703,7 +3709,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -3753,13 +3759,13 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result p1
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3768,7 +3774,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wf()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->we()J
 
     move-result-wide v2
 
@@ -3776,7 +3782,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result p1
 
@@ -3787,7 +3793,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3796,7 +3802,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wf()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->we()J
 
     move-result-wide v1
 
@@ -3804,7 +3810,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result p1
 
@@ -3815,7 +3821,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result p1
 
@@ -3838,13 +3844,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v1
 
@@ -3853,7 +3859,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->we()J
 
     move-result-wide v2
 
@@ -3865,7 +3871,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -3876,7 +3882,7 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -3885,7 +3891,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->we()J
 
     move-result-wide v0
 
@@ -3897,7 +3903,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -3908,7 +3914,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -3953,7 +3959,7 @@
 .end method
 
 .method public final b(Ljava/util/List;Lcom/google/android/gms/internal/measurement/hr;Lcom/google/android/gms/internal/measurement/fg;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -3976,13 +3982,11 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
 
-    and-int/lit8 v0, v0, 0x7
+    and-int/lit8 v1, v0, 0x7
 
-    const/4 v1, 0x3
+    const/4 v2, 0x3
 
-    if-ne v0, v1, :cond_3
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
+    if-ne v1, v2, :cond_3
 
     :cond_0
     invoke-direct {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/ez;->d(Lcom/google/android/gms/internal/measurement/hr;Lcom/google/android/gms/internal/measurement/fg;)Ljava/lang/Object;
@@ -3993,7 +3997,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v1
 
@@ -4008,7 +4012,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v1
 
@@ -4016,16 +4020,20 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baZ:I
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final getTag()I
@@ -4123,6 +4131,27 @@
     return-void
 .end method
 
+.method public final vR()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/ez;->dN(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final vS()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -4144,28 +4173,7 @@
     return-wide v0
 .end method
 
-.method public final vT()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/ez;->dN(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vT()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final vU()I
+.method public final vT()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4179,14 +4187,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vT()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final vV()J
+.method public final vU()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4200,14 +4208,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vU()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final vW()I
+.method public final vV()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4221,14 +4229,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vV()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final vX()Z
+.method public final vW()Z
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4242,14 +4250,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vW()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final vY()Ljava/lang/String;
+.method public final vX()Ljava/lang/String;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4263,14 +4271,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vY()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vX()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vZ()Lcom/google/android/gms/internal/measurement/em;
+.method public final vY()Lcom/google/android/gms/internal/measurement/em;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4284,13 +4292,34 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v0
 
     return-object v0
 .end method
 
+.method public final vZ()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/ez;->dN(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vZ()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final wa()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -4320,7 +4349,7 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x5
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/ez;->dN(I)V
 
@@ -4333,28 +4362,7 @@
     return v0
 .end method
 
-.method public final wc()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/ez;->dN(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final wd()J
+.method public final wc()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4368,14 +4376,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wc()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final we()I
+.method public final wd()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4389,14 +4397,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->we()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wd()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final wf()J
+.method public final we()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4410,14 +4418,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->we()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final wp()I
+.method public final wo()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4429,8 +4437,6 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baZ:I
-
     iput v0, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
 
     const/4 v0, 0x0
@@ -4442,7 +4448,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->vQ()I
 
     move-result v0
 
@@ -4453,8 +4459,6 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
-
     iget v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baY:I
 
     if-ne v0, v1, :cond_1
@@ -4462,8 +4466,6 @@
     goto :goto_1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
-
     ushr-int/lit8 v0, v0, 0x3
 
     return v0
@@ -4475,7 +4477,7 @@
     return v0
 .end method
 
-.method public final wq()Z
+.method public final wp()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -4485,7 +4487,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wg()Z
 
     move-result v0
 
@@ -4500,11 +4502,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ez;->baX:Lcom/google/android/gms/internal/measurement/ex;
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ez;->tag:I
-
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/ex;->dK(I)Z
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/ex;->dK(I)Z
 
     move-result v0
 
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 f7acd2ce48..1af2aff2bf 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
@@ -51,8 +51,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/f;->aTA:Z
-
     iput-boolean v0, p1, Lcom/google/android/gms/internal/measurement/f;->aTA:Z
 
     :cond_1
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$a.smali
index a13995eff0..21259f934d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$a.smali
@@ -209,7 +209,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ee;->vG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ee;->vF()I
 
     move-result v0
 
@@ -264,7 +264,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ee;->vG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ee;->vF()I
 
     move-result v1
 
@@ -306,7 +306,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->wx()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->ww()I
 
     move-result v0
 
@@ -389,11 +389,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fb$a;->buffer:[B
 
@@ -419,7 +414,9 @@
 
     goto :goto_1
 
-    :goto_2
+    :catch_0
+    move-exception p1
+
     new-instance p2, Lcom/google/android/gms/internal/measurement/fb$c;
 
     const/4 v0, 0x3
@@ -463,6 +460,8 @@
     invoke-direct {p2, v0, p1}, Lcom/google/android/gms/internal/measurement/fb$c;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final ao(J)V
@@ -728,7 +727,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ha;->wU()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ha;->wT()I
 
     move-result v0
 
@@ -808,7 +807,7 @@
 
     iget v3, p0, Lcom/google/android/gms/internal/measurement/fb$a;->position:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->wx()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->ww()I
 
     move-result v4
 
@@ -839,7 +838,7 @@
 
     iget v2, p0, Lcom/google/android/gms/internal/measurement/fb$a;->position:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->wx()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->ww()I
 
     move-result v3
 
@@ -997,7 +996,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->wx()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fb;->ww()I
 
     move-result v0
 
@@ -1070,11 +1069,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fb$a;->buffer:[B
 
@@ -1098,7 +1092,9 @@
 
     goto :goto_1
 
-    :goto_2
+    :catch_0
+    move-exception p1
+
     new-instance v0, Lcom/google/android/gms/internal/measurement/fb$c;
 
     const/4 v1, 0x3
@@ -1142,6 +1138,8 @@
     invoke-direct {v0, v1, p1}, Lcom/google/android/gms/internal/measurement/fb$c;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final dh(I)V
@@ -1387,7 +1385,7 @@
     throw p2
 .end method
 
-.method public final wx()I
+.method public final ww()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fb$a;->limit:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$d.smali
index 4493bd5802..4d203ac247 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$d.smali
@@ -214,7 +214,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ee;->vG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ee;->vF()I
 
     move-result v1
 
@@ -268,11 +268,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fb$d;->bbg:Ljava/nio/ByteBuffer;
 
@@ -294,12 +289,16 @@
 
     goto :goto_0
 
-    :goto_1
+    :catch_0
+    move-exception p1
+
     new-instance p2, Lcom/google/android/gms/internal/measurement/fb$c;
 
     invoke-direct {p2, p1}, Lcom/google/android/gms/internal/measurement/fb$c;-><init>(Ljava/lang/Throwable;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final ao(J)V
@@ -391,7 +390,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ha;->wU()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ha;->wT()I
 
     move-result v0
 
@@ -626,11 +625,6 @@
 
     return-void
 
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fb$d;->bbg:Ljava/nio/ByteBuffer;
 
@@ -648,12 +642,16 @@
 
     goto :goto_0
 
-    :goto_1
+    :catch_0
+    move-exception p1
+
     new-instance v0, Lcom/google/android/gms/internal/measurement/fb$c;
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/fb$c;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final dh(I)V
@@ -787,7 +785,7 @@
     throw p2
 .end method
 
-.method public final wx()I
+.method public final ww()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fb$d;->bbg:Ljava/nio/ByteBuffer;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$e.smali
index 8af0a3bef4..d70065f5bf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb$e.smali
@@ -247,7 +247,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ee;->vG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ee;->vF()I
 
     move-result v1
 
@@ -302,7 +302,6 @@
 
     if-nez v2, :cond_0
 
-    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
 
     add-long/2addr v9, v0
@@ -339,7 +338,7 @@
     goto :goto_0
 
     :cond_1
-    :goto_2
+    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
 
     iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
@@ -348,17 +347,25 @@
 
     if-gez v11, :cond_3
 
-    and-long v0, p1, v7
+    and-long v2, p1, v7
 
-    cmp-long v2, v0, v5
+    cmp-long v11, v2, v5
 
-    if-nez v2, :cond_2
+    if-nez v11, :cond_2
 
-    goto :goto_1
+    add-long/2addr v9, v0
+
+    iput-wide v9, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
+
+    long-to-int p1, p1
+
+    int-to-byte p1, p1
+
+    invoke-static {v0, v1, p1}, Lcom/google/android/gms/internal/measurement/ip;->a(JB)V
+
+    return-void
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
-
     add-long v2, v0, v9
 
     iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
@@ -375,7 +382,7 @@
 
     ushr-long/2addr p1, v4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance p1, Lcom/google/android/gms/internal/measurement/fb$c;
@@ -384,15 +391,13 @@
 
     new-array p2, p2, [Ljava/lang/Object;
 
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v1
-
-    aput-object v1, p2, v0
+    aput-object v0, p2, v2
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
 
@@ -421,6 +426,8 @@
     invoke-direct {p1, p2}, Lcom/google/android/gms/internal/measurement/fb$c;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final ao(J)V
@@ -516,7 +523,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ha;->wU()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ha;->wT()I
 
     move-result v0
 
@@ -592,8 +599,6 @@
 
     iget-wide v6, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbh:J
 
-    const/4 v2, 0x0
-
     sub-long/2addr v4, v6
 
     long-to-int v2, v4
@@ -705,8 +710,6 @@
 
     if-gez v4, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
-
     const-wide/16 v2, 0x1
 
     add-long/2addr v2, v0
@@ -720,41 +723,39 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/internal/measurement/fb$c;
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v2
+    aput-object v0, v2, v3
 
-    aput-object v2, v0, v1
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    aput-object v0, v2, v1
+
+    const/4 v0, 0x2
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    aput-object v1, v2, v0
 
-    aput-object v1, v0, v2
+    const-string v0, "Pos: %d, limit: %d, len: %d"
 
-    const/4 v1, 0x2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    aput-object v2, v0, v1
-
-    const-string v1, "Pos: %d, limit: %d, len: %d"
-
-    invoke-static {v1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -827,7 +828,6 @@
 
     if-nez v0, :cond_0
 
-    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
 
     add-long/2addr v4, v0
@@ -860,7 +860,7 @@
     goto :goto_0
 
     :cond_1
-    :goto_2
+    :goto_1
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
 
     iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
@@ -869,15 +869,21 @@
 
     if-gez v6, :cond_3
 
-    and-int/lit8 v0, p1, -0x80
+    and-int/lit8 v2, p1, -0x80
 
-    if-nez v0, :cond_2
+    if-nez v2, :cond_2
 
-    goto :goto_1
+    add-long/2addr v4, v0
+
+    iput-wide v4, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
+
+    int-to-byte p1, p1
+
+    invoke-static {v0, v1, p1}, Lcom/google/android/gms/internal/measurement/ip;->a(JB)V
+
+    return-void
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
-
     add-long v2, v0, v4
 
     iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
@@ -892,52 +898,52 @@
 
     ushr-int/lit8 p1, p1, 0x7
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance p1, Lcom/google/android/gms/internal/measurement/fb$c;
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v2
+    aput-object v0, v2, v3
 
-    aput-object v2, v0, v1
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    aput-object v0, v2, v1
+
+    const/4 v0, 0x2
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    aput-object v1, v2, v0
 
-    aput-object v1, v0, v2
+    const-string v0, "Pos: %d, limit: %d, len: %d"
 
-    const/4 v1, 0x2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    aput-object v2, v0, v1
-
-    const-string v1, "Pos: %d, limit: %d, len: %d"
-
-    invoke-static {v1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/internal/measurement/fb$c;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final dh(I)V
@@ -1066,19 +1072,17 @@
 
     sub-long/2addr v0, v9
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
+    iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
 
-    cmp-long v4, v0, v2
+    cmp-long v2, v0, v5
 
-    if-gez v4, :cond_0
+    if-gez v2, :cond_0
 
     goto :goto_0
 
     :cond_0
     int-to-long v3, p2
 
-    iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbl:J
-
     move-object v2, p1
 
     move-wide v7, v9
@@ -1151,7 +1155,7 @@
     throw p1
 .end method
 
-.method public final wx()I
+.method public final ww()I
     .locals 4
 
     iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/fb$e;->bbj:J
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 a3585210da..06b69ec325 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
@@ -40,7 +40,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xX()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xW()Z
 
     move-result v0
 
@@ -142,7 +142,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gi;->wU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gi;->wT()I
 
     move-result p1
 
@@ -160,7 +160,7 @@
 .method public static a(Lcom/google/android/gms/internal/measurement/gi;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gi;->wU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gi;->wT()I
 
     move-result p0
 
@@ -380,7 +380,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ee;->vG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ee;->vF()I
 
     move-result v0
 
@@ -545,7 +545,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ee;->vG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ee;->vF()I
 
     move-result v0
 
@@ -568,7 +568,7 @@
 .method public static c(Lcom/google/android/gms/internal/measurement/ha;)I
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ha;->wU()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ha;->wT()I
 
     move-result p0
 
@@ -587,7 +587,7 @@
     :try_start_0
     invoke-static {p0}, Lcom/google/android/gms/internal/measurement/ir;->b(Ljava/lang/CharSequence;)I
 
-    move-result v0
+    move-result p0
     :try_end_0
     .catch Lcom/google/android/gms/internal/measurement/iv; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -600,16 +600,16 @@
 
     move-result-object p0
 
-    array-length v0, p0
+    array-length p0, p0
 
     :goto_0
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
 
-    move-result p0
+    move-result v0
 
-    add-int/2addr p0, v0
+    add-int/2addr v0, p0
 
-    return p0
+    return v0
 .end method
 
 .method public static d(ILcom/google/android/gms/internal/measurement/em;)I
@@ -677,7 +677,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ha;->wU()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ha;->wT()I
 
     move-result p0
 
@@ -839,7 +839,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xY()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xX()Z
 
     move-result v0
 
@@ -956,7 +956,15 @@
     return p0
 .end method
 
-.method public static mT()I
+.method public static mS()I
+    .locals 1
+
+    const/4 v0, 0x4
+
+    return v0
+.end method
+
+.method public static wq()I
     .locals 1
 
     const/4 v0, 0x4
@@ -975,7 +983,7 @@
 .method public static ws()I
     .locals 1
 
-    const/4 v0, 0x4
+    const/16 v0, 0x8
 
     return v0
 .end method
@@ -999,14 +1007,6 @@
 .method public static wv()I
     .locals 1
 
-    const/16 v0, 0x8
-
-    return v0
-.end method
-
-.method public static ww()I
-    .locals 1
-
     const/4 v0, 0x1
 
     return v0
@@ -1069,7 +1069,7 @@
     .end annotation
 .end method
 
-.method public final P(Z)V
+.method public final O(Z)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1438,7 +1438,7 @@
     .end annotation
 .end method
 
-.method public abstract wx()I
+.method public abstract ww()I
 .end method
 
 .method public abstract z(II)V
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 3ef9f16f6d..d1bc8dbf4e 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
@@ -680,7 +680,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wr()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wq()I
 
     move-result v1
 
@@ -1146,7 +1146,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wt()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ws()I
 
     move-result v1
 
@@ -1299,7 +1299,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->mT()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->mS()I
 
     move-result v1
 
@@ -1418,7 +1418,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wu()I
 
     move-result v1
 
@@ -1673,7 +1673,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ww()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wv()I
 
     move-result v1
 
@@ -1707,7 +1707,7 @@
 
     move-result p3
 
-    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/fb;->P(Z)V
+    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/fb;->O(Z)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -1928,7 +1928,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ws()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wr()I
 
     move-result v1
 
@@ -2047,7 +2047,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wu()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wt()I
 
     move-result v1
 
@@ -2362,7 +2362,7 @@
     return-void
 .end method
 
-.method public final wy()I
+.method public final wx()I
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/measurement/fu$e;->bdc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali
index 4837bb07ee..85a2afc857 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali
@@ -78,7 +78,7 @@
 .method private final b(ID)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [D
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/fd;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/fd;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([DI)[D
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([DI)[D
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/measurement/fd;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fd;->modCount:I
 
@@ -490,9 +472,9 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 6
+    .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fd;->cR(I)V
 
@@ -500,23 +482,17 @@
 
     aget-wide v1, v0, p1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v4, v3, -0x1
 
-    if-ge p1, v0, :cond_0
+    if-ge p1, v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
+    add-int/lit8 v4, p1, 0x1
 
-    add-int/lit8 v3, p1, 0x1
+    sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
-
-    iget v5, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
-
-    sub-int/2addr v5, p1
-
-    invoke-static {v0, v3, v4, p1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
@@ -541,7 +517,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     const/4 v0, 0x0
 
@@ -570,13 +546,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fd;->size:I
 
@@ -606,7 +580,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -653,7 +627,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fd;->cR(I)V
 
@@ -661,8 +635,6 @@
 
     aget-wide v2, p2, p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/fd;->bbn:[D
-
     aput-wide v0, p2, p1
 
     invoke-static {v2, v3}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
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 8057741a9a..0610d9ae07 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
@@ -17,7 +17,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wz()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wy()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -57,32 +57,7 @@
     return-object p0
 .end method
 
-.method public static wA()Lcom/google/android/gms/internal/measurement/fg;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ff;->bbo:Ljava/lang/Class;
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    const-string v0, "getEmptyRegistry"
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ff;->ch(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/fg;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fg;->bbs:Lcom/google/android/gms/internal/measurement/fg;
-
-    return-object v0
-.end method
-
-.method static wB()Lcom/google/android/gms/internal/measurement/fg;
+.method static wA()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ff;->bbo:Ljava/lang/Class;
@@ -107,14 +82,14 @@
     :goto_0
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wB()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wA()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
     :cond_1
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wA()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wz()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -122,7 +97,7 @@
     return-object v0
 .end method
 
-.method private static wz()Ljava/lang/Class;
+.method private static wy()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -148,3 +123,28 @@
 
     return-object v0
 .end method
+
+.method public static wz()Lcom/google/android/gms/internal/measurement/fg;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ff;->bbo:Ljava/lang/Class;
+
+    if-eqz v0, :cond_0
+
+    :try_start_0
+    const-string v0, "getEmptyRegistry"
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ff;->ch(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/fg;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    :cond_0
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fg;->bbs:Lcom/google/android/gms/internal/measurement/fg;
+
+    return-object v0
+.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 19a00fe9e7..b5ddb1666a 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
@@ -44,7 +44,7 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wC()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wB()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -89,7 +89,7 @@
     return-void
 .end method
 
-.method static wB()Lcom/google/android/gms/internal/measurement/fg;
+.method static wA()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
     const-class v0, Lcom/google/android/gms/internal/measurement/fg;
@@ -101,7 +101,7 @@
     return-object v0
 .end method
 
-.method private static wC()Ljava/lang/Class;
+.method private static wB()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -128,17 +128,17 @@
     return-object v0
 .end method
 
-.method public static wD()Lcom/google/android/gms/internal/measurement/fg;
+.method public static wC()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wA()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wz()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static wE()Lcom/google/android/gms/internal/measurement/fg;
+.method public static wD()Lcom/google/android/gms/internal/measurement/fg;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/fg;->bbr:Lcom/google/android/gms/internal/measurement/fg;
@@ -154,7 +154,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wB()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ff;->wA()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fi.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fi.smali
index c4e46e7019..f713fc5f09 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
@@ -94,7 +94,7 @@
     .end annotation
 .end method
 
-.method abstract wF()Ljava/lang/Object;
+.method abstract wE()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<UT:",
@@ -112,6 +112,20 @@
     .end annotation
 .end method
 
+.method abstract wF()V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method abstract wG()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -125,17 +139,3 @@
         }
     .end annotation
 .end method
-
-.method abstract wH()V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.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 150c194340..1a0e5cd5f7 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
@@ -120,7 +120,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fl;->vJ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fl;->vI()V
 
     return-void
 .end method
@@ -177,7 +177,7 @@
     throw p1
 .end method
 
-.method final wF()Ljava/lang/Object;
+.method final wE()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -202,6 +202,27 @@
     throw v0
 .end method
 
+.method final wF()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/NoSuchMethodError;
+
+    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
+
+    throw v0
+.end method
+
 .method final wG()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -222,24 +243,3 @@
 
     throw v0
 .end method
-
-.method final wH()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/NoSuchMethodError;
-
-    invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
-
-    throw v0
-.end method
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 b4fdcb5b37..157636f4af 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
@@ -32,7 +32,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->bbu:Lcom/google/android/gms/internal/measurement/fi;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wI()Lcom/google/android/gms/internal/measurement/fi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wH()Lcom/google/android/gms/internal/measurement/fi;
 
     move-result-object v0
 
@@ -41,7 +41,7 @@
     return-void
 .end method
 
-.method private static wI()Lcom/google/android/gms/internal/measurement/fi;
+.method private static wH()Lcom/google/android/gms/internal/measurement/fi;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -84,7 +84,7 @@
     return-object v0
 .end method
 
-.method static wJ()Lcom/google/android/gms/internal/measurement/fi;
+.method static wI()Lcom/google/android/gms/internal/measurement/fi;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -99,7 +99,7 @@
     return-object v0
 .end method
 
-.method static wK()Lcom/google/android/gms/internal/measurement/fi;
+.method static wJ()Lcom/google/android/gms/internal/measurement/fi;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -113,8 +113,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fk;->bbv:Lcom/google/android/gms/internal/measurement/fi;
-
     return-object v0
 
     :cond_0
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 d775b0c964..4fa6b1fdf3 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
@@ -84,7 +84,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fl;->vJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fl;->vI()V
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 
     if-ne p0, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fw;->xb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fw;->xa()Z
 
     shl-int/lit8 p1, p1, 0x1
 
@@ -133,10 +133,12 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ge;->xk()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ge;->xj()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object p1
 
+    return-object p1
+
     :cond_0
     return-object p1
 .end method
@@ -153,7 +155,7 @@
 
     if-ne p1, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fw;->xb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fw;->xa()Z
 
     check-cast p3, Lcom/google/android/gms/internal/measurement/ha;
 
@@ -193,7 +195,7 @@
 
     check-cast p3, Lcom/google/android/gms/internal/measurement/fx;
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->lT()I
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->lS()I
 
     move-result p1
 
@@ -326,7 +328,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/fb;->P(Z)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/fb;->O(Z)V
 
     return-void
 
@@ -405,10 +407,10 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/fb;->d(D)V
 
-    :goto_0
     return-void
 
-    nop
+    :goto_0
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
@@ -443,7 +445,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v0
 
@@ -480,7 +482,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fn;->wM()Lcom/google/android/gms/internal/measurement/ix;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fn;->wL()Lcom/google/android/gms/internal/measurement/ix;
 
     move-result-object v4
 
@@ -503,7 +505,7 @@
     throw p1
 
     :cond_2
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fn;->wM()Lcom/google/android/gms/internal/measurement/ix;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fn;->wL()Lcom/google/android/gms/internal/measurement/ix;
 
     move-result-object v0
 
@@ -547,7 +549,7 @@
 
     packed-switch p0, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_0
     instance-of p0, p1, Lcom/google/android/gms/internal/measurement/ha;
@@ -556,74 +558,88 @@
 
     instance-of p0, p1, Lcom/google/android/gms/internal/measurement/ge;
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_3
+
+    :cond_0
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :pswitch_1
     instance-of p0, p1, Ljava/lang/Integer;
 
-    if-nez p0, :cond_0
+    if-nez p0, :cond_1
 
     instance-of p0, p1, Lcom/google/android/gms/internal/measurement/fx;
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_3
 
-    :cond_0
-    :goto_0
+    :cond_1
     const/4 v1, 0x1
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_2
     instance-of p0, p1, Lcom/google/android/gms/internal/measurement/em;
 
-    if-nez p0, :cond_0
+    if-nez p0, :cond_2
 
     instance-of p0, p1, [B
 
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_3
+
+    :cond_2
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :pswitch_3
     instance-of v0, p1, Ljava/lang/String;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_4
     instance-of v0, p1, Ljava/lang/Boolean;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_5
     instance-of v0, p1, Ljava/lang/Double;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_6
     instance-of v0, p1, Ljava/lang/Float;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_7
     instance-of v0, p1, Ljava/lang/Long;
 
-    goto :goto_1
+    move v1, v0
+
+    goto :goto_0
 
     :pswitch_8
     instance-of v0, p1, Ljava/lang/Integer;
 
-    :goto_1
     move v1, v0
 
-    :cond_1
-    :goto_2
-    if-eqz v1, :cond_2
+    :cond_3
+    :goto_0
+    if-eqz v1, :cond_4
 
     return-void
 
-    :cond_2
+    :cond_4
     new-instance p0, Ljava/lang/IllegalArgumentException;
 
     const-string p1, "Wrong object type used with protocol message reflection."
@@ -632,6 +648,8 @@
 
     throw p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_8
@@ -655,7 +673,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/hg;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/hg;->xB()Lcom/google/android/gms/internal/measurement/hg;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/hg;->xA()Lcom/google/android/gms/internal/measurement/hg;
 
     move-result-object p0
 
@@ -696,21 +714,21 @@
         }
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->wM()Lcom/google/android/gms/internal/measurement/ix;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->wL()Lcom/google/android/gms/internal/measurement/ix;
 
     move-result-object v0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->lT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->lS()I
 
     move-result v1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v2
 
     if-eqz v2, :cond_3
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->wP()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
 
     move-result p0
 
@@ -823,7 +841,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/fx;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fx;->lT()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fx;->lS()I
 
     move-result p0
 
@@ -877,7 +895,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wu()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wt()I
 
     move-result p0
 
@@ -888,7 +906,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ws()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wr()I
 
     move-result p0
 
@@ -987,7 +1005,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ww()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wv()I
 
     move-result p0
 
@@ -998,7 +1016,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wr()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wq()I
 
     move-result p0
 
@@ -1009,7 +1027,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wt()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ws()I
 
     move-result p0
 
@@ -1059,7 +1077,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->mT()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->mS()I
 
     move-result p0
 
@@ -1070,7 +1088,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->wu()I
 
     move-result p0
 
@@ -1117,7 +1135,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/fn;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wN()Lcom/google/android/gms/internal/measurement/jc;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wM()Lcom/google/android/gms/internal/measurement/jc;
 
     move-result-object v1
 
@@ -1127,7 +1145,7 @@
 
     if-ne v1, v2, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v0
 
@@ -1227,7 +1245,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wN()Lcom/google/android/gms/internal/measurement/jc;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wM()Lcom/google/android/gms/internal/measurement/jc;
 
     move-result-object v2
 
@@ -1235,13 +1253,13 @@
 
     if-ne v2, v3, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wP()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
 
     move-result v2
 
@@ -1257,7 +1275,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fn;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->lT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->lS()I
 
     move-result p0
 
@@ -1276,7 +1294,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fn;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->lT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fn;->lS()I
 
     move-result p0
 
@@ -1296,7 +1314,7 @@
     return p0
 .end method
 
-.method public static wL()Lcom/google/android/gms/internal/measurement/fl;
+.method public static wK()Lcom/google/android/gms/internal/measurement/fl;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1332,7 +1350,7 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v2
 
@@ -1363,7 +1381,7 @@
     :cond_0
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hu;->xM()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1476,12 +1494,12 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ge;->xk()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ge;->xj()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object p1
 
     :cond_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v1
 
@@ -1535,7 +1553,7 @@
     return-void
 
     :cond_3
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wN()Lcom/google/android/gms/internal/measurement/jc;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wM()Lcom/google/android/gms/internal/measurement/jc;
 
     move-result-object v1
 
@@ -1564,7 +1582,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wR()Lcom/google/android/gms/internal/measurement/hg;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wQ()Lcom/google/android/gms/internal/measurement/hg;
 
     move-result-object p1
 
@@ -1573,13 +1591,13 @@
     :cond_5
     check-cast v1, Lcom/google/android/gms/internal/measurement/ha;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ha;->wV()Lcom/google/android/gms/internal/measurement/hb;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ha;->wU()Lcom/google/android/gms/internal/measurement/hb;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wQ()Lcom/google/android/gms/internal/measurement/hb;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fn;->wP()Lcom/google/android/gms/internal/measurement/hb;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hb;->xa()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hb;->wZ()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object p1
 
@@ -1612,7 +1630,7 @@
     :goto_0
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v2
 
@@ -1640,7 +1658,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hu;->xM()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1722,7 +1740,7 @@
     return-object v0
 .end method
 
-.method public final vJ()V
+.method public final vI()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fl;->bbx:Z
@@ -1734,7 +1752,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->vJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->vI()V
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fn.smali
index 6a5c9098c5..b023a7f10a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fn.smali
@@ -19,23 +19,23 @@
 
 
 # virtual methods
-.method public abstract lT()I
+.method public abstract lS()I
 .end method
 
-.method public abstract wM()Lcom/google/android/gms/internal/measurement/ix;
+.method public abstract wL()Lcom/google/android/gms/internal/measurement/ix;
 .end method
 
-.method public abstract wN()Lcom/google/android/gms/internal/measurement/jc;
+.method public abstract wM()Lcom/google/android/gms/internal/measurement/jc;
+.end method
+
+.method public abstract wN()Z
 .end method
 
 .method public abstract wO()Z
 .end method
 
-.method public abstract wP()Z
+.method public abstract wP()Lcom/google/android/gms/internal/measurement/hb;
 .end method
 
-.method public abstract wQ()Lcom/google/android/gms/internal/measurement/hb;
-.end method
-
-.method public abstract wR()Lcom/google/android/gms/internal/measurement/hg;
+.method public abstract wQ()Lcom/google/android/gms/internal/measurement/hg;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali
index 57612e73ba..9b5c760de3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali
@@ -1441,17 +1441,23 @@
 
     const/4 p1, 0x0
 
-    :goto_0
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fo;->zzbxv:Ljava/lang/Class;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     iget-object p1, p5, Lcom/google/android/gms/internal/measurement/gd;->zzbzy:Ljava/lang/Class;
 
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fo;->zzbxv:Ljava/lang/Class;
+
     goto :goto_0
 
-    :goto_1
+    :pswitch_1
+    iget-object p1, p5, Lcom/google/android/gms/internal/measurement/gd;->zzbzy:Ljava/lang/Class;
+
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fo;->zzbxv:Ljava/lang/Class;
+
+    :goto_0
     const/4 p1, 0x0
 
     sget-object p2, Lcom/google/android/gms/internal/measurement/fq;->bcF:Lcom/google/android/gms/internal/measurement/fq;
@@ -1471,7 +1477,7 @@
     const/4 p1, 0x1
 
     :cond_0
-    :pswitch_1
+    :pswitch_2
     iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/fo;->zzbxw:Z
 
     return-void
@@ -1480,15 +1486,15 @@
 
     :pswitch_data_0
     .packed-switch 0x1
-        :pswitch_0
+        :pswitch_1
         :pswitch_0
     .end packed-switch
 
     :pswitch_data_1
     .packed-switch 0x1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
     .end packed-switch
 .end method
 
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 4f469a6270..b0dc6b7c8c 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
@@ -78,7 +78,7 @@
 .method private final c(IF)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [F
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/fr;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/fr;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([FI)[F
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([FI)[F
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/measurement/fr;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fr;->modCount:I
 
@@ -486,33 +468,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fr;->cR(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
-
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
@@ -527,7 +503,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/fr;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
@@ -535,9 +511,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     const/4 v0, 0x0
 
@@ -566,13 +542,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fr;->size:I
 
@@ -602,7 +576,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -649,19 +623,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fr;->cR(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->bcL:[F
+    aput p2, v0, p1
 
-    aput p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
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 2e9f195e69..315f7e73a2 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
@@ -157,7 +157,7 @@
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_4
 
     :try_start_2
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fs;->wS()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fs;->wR()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -236,7 +236,7 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/fs;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/fs;->wS()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/fs;->wR()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v4
 
@@ -392,11 +392,13 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 
 # virtual methods
-.method protected abstract wS()Lcom/google/android/gms/internal/measurement/fg;
+.method protected abstract wR()Lcom/google/android/gms/internal/measurement/fg;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali
index f672c308ae..5bea333799 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali
@@ -30,7 +30,7 @@
     return-void
 .end method
 
-.method public static wT()Lcom/google/android/gms/internal/measurement/ft;
+.method public static wS()Lcom/google/android/gms/internal/measurement/ft;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ft;->bcN:Lcom/google/android/gms/internal/measurement/ft;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$a.smali
index 8919d3efab..2a8f8ca33e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$a.smali
@@ -83,7 +83,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
     return-void
 .end method
 
-.method private wY()Lcom/google/android/gms/internal/measurement/fu;
+.method private wX()Lcom/google/android/gms/internal/measurement/fu;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -115,7 +115,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fu$a;->bcP:Lcom/google/android/gms/internal/measurement/fu;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v1
 
@@ -208,7 +208,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/fu$a;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fu$a;->wY()Lcom/google/android/gms/internal/measurement/fu;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fu$a;->wX()Lcom/google/android/gms/internal/measurement/fu;
 
     move-result-object v1
 
@@ -231,7 +231,7 @@
     return v0
 .end method
 
-.method public final synthetic vH()Lcom/google/android/gms/internal/measurement/ef;
+.method public final synthetic vG()Lcom/google/android/gms/internal/measurement/ef;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ef;->clone()Ljava/lang/Object;
@@ -243,7 +243,7 @@
     return-object v0
 .end method
 
-.method public final synthetic wX()Lcom/google/android/gms/internal/measurement/ha;
+.method public final synthetic wW()Lcom/google/android/gms/internal/measurement/ha;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fu$a;->bcO:Lcom/google/android/gms/internal/measurement/fu;
@@ -251,20 +251,20 @@
     return-object v0
 .end method
 
-.method public final synthetic wZ()Lcom/google/android/gms/internal/measurement/ha;
+.method public final synthetic wY()Lcom/google/android/gms/internal/measurement/ha;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fu$a;->wY()Lcom/google/android/gms/internal/measurement/fu;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fu$a;->wX()Lcom/google/android/gms/internal/measurement/fu;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final synthetic xa()Lcom/google/android/gms/internal/measurement/ha;
+.method public final synthetic wZ()Lcom/google/android/gms/internal/measurement/ha;
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fu$a;->wY()Lcom/google/android/gms/internal/measurement/fu;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fu$a;->wX()Lcom/google/android/gms/internal/measurement/fu;
 
     move-result-object v0
 
@@ -296,7 +296,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$c.smali
index 99b3093ac5..61bcc12b6b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$c.smali
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fu;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->wL()Lcom/google/android/gms/internal/measurement/fl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->wK()Lcom/google/android/gms/internal/measurement/fl;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$e.smali
index 754094942d..786d85a147 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu$e.smali
@@ -136,7 +136,7 @@
     return-void
 .end method
 
-.method public static ns()[I
+.method public static nr()[I
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/fu$e;->bcY:[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 3f9cb2f6cd..1b56ae6616 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
@@ -63,7 +63,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ee;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xV()Lcom/google/android/gms/internal/measurement/ik;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xU()Lcom/google/android/gms/internal/measurement/ik;
 
     move-result-object v0
 
@@ -204,7 +204,7 @@
     check-cast p0, Lcom/google/android/gms/internal/measurement/fu;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -230,7 +230,7 @@
     :goto_0
     invoke-interface {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/hr;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hq;Lcom/google/android/gms/internal/measurement/fg;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object p1
 
@@ -423,7 +423,7 @@
     return p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -448,7 +448,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -525,7 +525,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -554,7 +554,7 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -602,7 +602,7 @@
     return v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -649,7 +649,7 @@
     return-object v0
 .end method
 
-.method final vG()I
+.method final vF()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fu;->zzbyn:I
@@ -657,7 +657,7 @@
     return v0
 .end method
 
-.method public final wU()I
+.method public final wT()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fu;->zzbyn:I
@@ -666,7 +666,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -686,7 +686,7 @@
     return v0
 .end method
 
-.method public final synthetic wV()Lcom/google/android/gms/internal/measurement/hb;
+.method public final synthetic wU()Lcom/google/android/gms/internal/measurement/hb;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/measurement/fu$e;->bcV:I
@@ -702,7 +702,7 @@
     return-object v0
 .end method
 
-.method public final synthetic wW()Lcom/google/android/gms/internal/measurement/hb;
+.method public final synthetic wV()Lcom/google/android/gms/internal/measurement/hb;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/measurement/fu$e;->bcV:I
@@ -716,7 +716,7 @@
     return-object v0
 .end method
 
-.method public final synthetic wX()Lcom/google/android/gms/internal/measurement/ha;
+.method public final synthetic wW()Lcom/google/android/gms/internal/measurement/ha;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/measurement/fu$e;->bcW:I
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 21f95eceed..5252fcc4d1 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
@@ -78,7 +78,7 @@
 .method private final ae(II)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-ltz p1, :cond_1
 
@@ -86,29 +86,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -117,8 +109,6 @@
 
     new-array v0, v0, [I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/fv;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/fv;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([II)[I
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([II)[I
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/measurement/fv;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fv;->modCount:I
 
@@ -490,33 +472,27 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fv;->cR(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    if-ge p1, v1, :cond_0
+    if-ge p1, v3, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    add-int/lit8 v3, p1, 0x1
 
-    add-int/lit8 v2, p1, 0x1
+    sub-int/2addr v2, p1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
-
-    sub-int/2addr v4, p1
-
-    invoke-static {v1, v2, v3, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
@@ -531,7 +507,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/fv;->modCount:I
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
@@ -539,9 +515,9 @@
 .end method
 
 .method public final remove(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     const/4 v0, 0x0
 
@@ -570,13 +546,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/fv;->size:I
 
@@ -606,7 +580,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -653,19 +627,17 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fv;->cR(I)V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
 
-    aget v0, v0, p1
+    aget v1, v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->bdg:[I
+    aput p2, v0, p1
 
-    aput p2, v1, p1
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object 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 15aaef1c57..b1fb638731 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
@@ -81,7 +81,7 @@
     return-object v0
 .end method
 
-.method public static Q(Z)I
+.method public static P(Z)I
     .locals 0
 
     if-eqz p0, :cond_0
@@ -187,7 +187,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/ha;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ha;->wV()Lcom/google/android/gms/internal/measurement/hb;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ha;->wU()Lcom/google/android/gms/internal/measurement/hb;
 
     move-result-object p0
 
@@ -197,7 +197,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/hb;->wZ()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/hb;->wY()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object p0
 
@@ -219,11 +219,13 @@
 
     const/4 p0, 0x1
 
+    return p0
+
     :cond_0
     return p0
 .end method
 
-.method static xb()Z
+.method static xa()Z
     .locals 1
 
     const/4 v0, 0x0
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 00116c2dc3..7b40e741d3 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
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract lT()I
+.method public abstract lS()I
 .end method
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 aeaaf2ab42..5840d7b652 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
@@ -124,8 +124,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/g;->aTH:Z
-
     iput-boolean v0, p1, Lcom/google/android/gms/internal/measurement/g;->aTH:Z
 
     :cond_6
@@ -137,8 +135,6 @@
 
     if-eqz v0, :cond_8
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/g;->aTI:D
-
     cmpl-double v0, v2, v4
 
     if-ltz v0, :cond_7
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 b73cdac5ab..4e9631134e 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
@@ -31,8 +31,8 @@
     .end annotation
 .end method
 
-.method public abstract vI()Z
+.method public abstract vH()Z
 .end method
 
-.method public abstract vJ()V
+.method public abstract vI()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gb.smali
index 2271d7dd8d..afc22d9b98 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
@@ -19,7 +19,7 @@
     return-void
 .end method
 
-.method static xc()Lcom/google/android/gms/internal/measurement/gb;
+.method static xb()Lcom/google/android/gms/internal/measurement/gb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gb;
@@ -31,7 +31,7 @@
     return-object v0
 .end method
 
-.method static xd()Lcom/google/android/gms/internal/measurement/gb;
+.method static xc()Lcom/google/android/gms/internal/measurement/gb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gb;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method static xe()Lcom/google/android/gms/internal/measurement/gb;
+.method static xd()Lcom/google/android/gms/internal/measurement/gb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gb;
@@ -55,7 +55,7 @@
     return-object v0
 .end method
 
-.method static xf()Lcom/google/android/gms/internal/measurement/gb;
+.method static xe()Lcom/google/android/gms/internal/measurement/gb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gb;
@@ -67,7 +67,7 @@
     return-object v0
 .end method
 
-.method static xg()Lcom/google/android/gms/internal/measurement/gc;
+.method static xf()Lcom/google/android/gms/internal/measurement/gc;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gc;
@@ -79,7 +79,7 @@
     return-object v0
 .end method
 
-.method static xh()Lcom/google/android/gms/internal/measurement/gb;
+.method static xg()Lcom/google/android/gms/internal/measurement/gb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gb;
@@ -91,7 +91,7 @@
     return-object v0
 .end method
 
-.method static xi()Lcom/google/android/gms/internal/measurement/gb;
+.method static xh()Lcom/google/android/gms/internal/measurement/gb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gb;
@@ -103,7 +103,7 @@
     return-object v0
 .end method
 
-.method static xj()Lcom/google/android/gms/internal/measurement/gb;
+.method static xi()Lcom/google/android/gms/internal/measurement/gb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gb;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali
index 146681ba30..c59fbfedf3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali
@@ -3,7 +3,7 @@
 
 
 # direct methods
-.method public static xk()Lcom/google/android/gms/internal/measurement/ha;
+.method public static xj()Lcom/google/android/gms/internal/measurement/ha;
     .locals 1
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
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 99290ca2aa..0b319367d1 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
@@ -98,7 +98,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ge;->xk()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ge;->xj()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gh.smali
index 532e86d5e1..776b4fa1c6 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
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     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 f03fc191da..d0bb11b356 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
@@ -18,7 +18,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wD()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wC()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -49,7 +49,6 @@
 
     if-eqz v0, :cond_0
 
-    :goto_0
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -77,7 +76,10 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gi;->bdz:Lcom/google/android/gms/internal/measurement/em;
 
-    goto :goto_0
+    :goto_0
+    monitor-exit p0
+
+    goto :goto_1
 
     :catchall_0
     move-exception p1
@@ -126,11 +128,11 @@
 
     if-nez v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gi;->vF()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gi;->vE()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gi;->vF()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gi;->vE()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object p1
 
@@ -154,7 +156,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->wX()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->wW()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object v1
 
@@ -169,7 +171,7 @@
     return p1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ha;->wX()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ha;->wW()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object p1
 
@@ -192,7 +194,7 @@
     return v0
 .end method
 
-.method public final vF()Lcom/google/android/gms/internal/measurement/em;
+.method public final vE()Lcom/google/android/gms/internal/measurement/em;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->bdz:Lcom/google/android/gms/internal/measurement/em;
@@ -224,21 +226,20 @@
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/em;->baI:Lcom/google/android/gms/internal/measurement/em;
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->bdz:Lcom/google/android/gms/internal/measurement/em;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->bdy:Lcom/google/android/gms/internal/measurement/ha;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->vF()Lcom/google/android/gms/internal/measurement/em;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->vE()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v0
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->bdz:Lcom/google/android/gms/internal/measurement/em;
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->bdz:Lcom/google/android/gms/internal/measurement/em;
 
     monitor-exit p0
@@ -255,7 +256,7 @@
     throw v0
 .end method
 
-.method public final wU()I
+.method public final wT()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->bdz:Lcom/google/android/gms/internal/measurement/em;
@@ -277,7 +278,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->bdy:Lcom/google/android/gms/internal/measurement/ha;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->wU()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->wT()I
 
     move-result v0
 
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 7a25e117c9..0d29000c97 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
@@ -115,7 +115,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/em;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/em;->vN()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/em;->vM()Ljava/lang/String;
 
     move-result-object p0
 
@@ -138,7 +138,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->bdC:Ljava/util/List;
 
@@ -165,7 +165,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     instance-of v0, p2, Lcom/google/android/gms/internal/measurement/gk;
 
@@ -173,7 +173,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/gk;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/gk;->xl()Ljava/util/List;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/gk;->xk()Ljava/util/List;
 
     move-result-object p2
 
@@ -231,7 +231,7 @@
 .method public final c(Lcom/google/android/gms/internal/measurement/em;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->bdC:Ljava/util/List;
 
@@ -249,7 +249,7 @@
 .method public final clear()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->bdC:Ljava/util/List;
 
@@ -329,11 +329,11 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/em;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/em;->vN()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/em;->vM()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/em;->vO()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/em;->vN()Z
 
     move-result v0
 
@@ -380,7 +380,7 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->bdC:Ljava/util/List;
 
@@ -436,7 +436,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->bdC:Ljava/util/List;
 
@@ -463,17 +463,17 @@
     return v0
 .end method
 
-.method public final bridge synthetic vI()Z
+.method public final bridge synthetic vH()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/eh;->vI()Z
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/eh;->vH()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final xl()Ljava/util/List;
+.method public final xk()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -492,10 +492,10 @@
     return-object v0
 .end method
 
-.method public final xm()Lcom/google/android/gms/internal/measurement/gk;
+.method public final xl()Lcom/google/android/gms/internal/measurement/gk;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vI()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vH()Z
 
     move-result 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 32a3136aff..3b7ebef6b1 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
@@ -12,7 +12,7 @@
 .method public abstract c(Lcom/google/android/gms/internal/measurement/em;)V
 .end method
 
-.method public abstract xl()Ljava/util/List;
+.method public abstract xk()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -22,5 +22,5 @@
     .end annotation
 .end method
 
-.method public abstract xm()Lcom/google/android/gms/internal/measurement/gk;
+.method public abstract xl()Lcom/google/android/gms/internal/measurement/gk;
 .end method
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 c400f4f332..9966a3aca7 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
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method static xn()Lcom/google/android/gms/internal/measurement/gl;
+.method static xm()Lcom/google/android/gms/internal/measurement/gl;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/gl;->bdD:Lcom/google/android/gms/internal/measurement/gl;
@@ -53,7 +53,7 @@
     return-object v0
 .end method
 
-.method static xo()Lcom/google/android/gms/internal/measurement/gl;
+.method static xn()Lcom/google/android/gms/internal/measurement/gl;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/gl;->bdE:Lcom/google/android/gms/internal/measurement/gl;
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 1a20c743c9..d89e8ff0fe 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
@@ -115,7 +115,7 @@
     :goto_0
     invoke-static {p0, p1, p2, v0}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     sget-object v1, Lcom/google/android/gms/internal/measurement/gm;->bdF:Ljava/lang/Class;
@@ -142,12 +142,11 @@
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    :goto_1
     invoke-static {p0, p1, p2, v1}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     move-object v0, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     instance-of v1, v0, Lcom/google/android/gms/internal/measurement/im;
@@ -168,6 +167,10 @@
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/eh;->addAll(Ljava/util/Collection;)Z
 
+    invoke-static {p0, p1, p2, v1}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    move-object v0, v1
+
     goto :goto_1
 
     :cond_4
@@ -183,7 +186,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ga;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ga;->vI()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ga;->vH()Z
 
     move-result v2
 
@@ -199,10 +202,10 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-static {p0, p1, p2, v0}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     :cond_5
-    :goto_2
+    :goto_1
     return-object v0
 .end method
 
@@ -321,7 +324,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/gk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gk;->xm()Lcom/google/android/gms/internal/measurement/gk;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gk;->xl()Lcom/google/android/gms/internal/measurement/gk;
 
     move-result-object v0
 
@@ -353,13 +356,13 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ga;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vH()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vJ()V
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vI()V
 
     :cond_2
     return-void
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 3a00295ae1..5d0e049e98 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
@@ -79,7 +79,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vH()Z
 
     move-result v3
 
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ga;->vH()Z
 
     move-result v1
 
@@ -162,7 +162,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ga;->vJ()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ga;->vI()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali
index 69ae20bd66..1c62fe1eef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali
@@ -131,7 +131,7 @@
 .method private final k(IJ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-ltz p1, :cond_1
 
@@ -139,29 +139,21 @@
 
     if-gt p1, v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
+    add-int/lit8 v2, p1, 0x1
 
-    add-int/lit8 v1, p1, 0x1
+    sub-int/2addr v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v0, p1, v0, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, p1, v1, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
-
     mul-int/lit8 v0, v0, 0x3
 
     div-int/lit8 v0, v0, 0x2
@@ -170,8 +162,6 @@
 
     new-array v0, v0, [J
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
-
     const/4 v2, 0x0
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
@@ -247,7 +237,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -273,48 +263,40 @@
     return v1
 
     :cond_1
-    const v0, 0x7fffffff
+    const v2, 0x7fffffff
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v3
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/go;->size:I
+    if-lt v2, v0, :cond_3
 
-    if-lt v0, v2, :cond_3
+    add-int/2addr v3, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
 
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/go;->size:I
+    array-length v2, v0
 
-    add-int/2addr v0, v2
+    if-le v3, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([JI)[J
 
-    array-length v2, v2
+    move-result-object v0
 
-    if-le v0, v2, :cond_2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
-
-    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([JI)[J
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
 
     iget p1, p1, Lcom/google/android/gms/internal/measurement/go;->size:I
 
-    invoke-static {v2, v1, v3, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v1, v2, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
+    iput v3, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/go;->modCount:I
 
@@ -496,9 +478,9 @@
 .end method
 
 .method public final synthetic remove(I)Ljava/lang/Object;
-    .locals 6
+    .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/go;->cR(I)V
 
@@ -506,23 +488,17 @@
 
     aget-wide v1, v0, p1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
 
-    add-int/lit8 v0, v0, -0x1
+    add-int/lit8 v4, v3, -0x1
 
-    if-ge p1, v0, :cond_0
+    if-ge p1, v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
+    add-int/lit8 v4, p1, 0x1
 
-    add-int/lit8 v3, p1, 0x1
+    sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
-
-    iget v5, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
-
-    sub-int/2addr v5, p1
-
-    invoke-static {v0, v3, v4, p1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_0
     iget p1, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
@@ -547,7 +523,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     const/4 v0, 0x0
 
@@ -576,13 +552,11 @@
 
     add-int/lit8 v0, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v3, v1
-
-    invoke-static {p1, v0, v2, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {p1, v0, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/go;->size:I
 
@@ -612,7 +586,7 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     if-lt p2, p1, :cond_0
 
@@ -659,7 +633,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/go;->cR(I)V
 
@@ -667,8 +641,6 @@
 
     aget-wide v2, p2, p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/go;->bdH:[J
-
     aput-wide v0, p2, p1
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
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 5535015fe2..836df97c9b 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
@@ -35,7 +35,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/gz;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ft;->wT()Lcom/google/android/gms/internal/measurement/ft;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ft;->wS()Lcom/google/android/gms/internal/measurement/ft;
 
     move-result-object v2
 
@@ -43,7 +43,7 @@
 
     aput-object v2, v1, v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gp;->xp()Lcom/google/android/gms/internal/measurement/gz;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gp;->xo()Lcom/google/android/gms/internal/measurement/gz;
 
     move-result-object v2
 
@@ -79,7 +79,7 @@
 .method private static a(Lcom/google/android/gms/internal/measurement/gy;)Z
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/gy;->xy()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/gy;->xx()I
 
     move-result p0
 
@@ -97,7 +97,7 @@
     return p0
 .end method
 
-.method private static xp()Lcom/google/android/gms/internal/measurement/gz;
+.method private static xo()Lcom/google/android/gms/internal/measurement/gz;
     .locals 4
 
     :try_start_0
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/gy;->xz()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/gy;->xy()Z
 
     move-result v0
 
@@ -175,15 +175,15 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xJ()Lcom/google/android/gms/internal/measurement/ij;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xI()Lcom/google/android/gms/internal/measurement/ij;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wJ()Lcom/google/android/gms/internal/measurement/fi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wI()Lcom/google/android/gms/internal/measurement/fi;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/gy;->xA()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/gy;->xz()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object v1
 
@@ -194,15 +194,15 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xH()Lcom/google/android/gms/internal/measurement/ij;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xG()Lcom/google/android/gms/internal/measurement/ij;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wK()Lcom/google/android/gms/internal/measurement/fi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wJ()Lcom/google/android/gms/internal/measurement/fi;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/gy;->xA()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/gy;->xz()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object v1
 
@@ -227,64 +227,6 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xD()Lcom/google/android/gms/internal/measurement/hi;
-
-    move-result-object v2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->xo()Lcom/google/android/gms/internal/measurement/gl;
-
-    move-result-object v3
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xJ()Lcom/google/android/gms/internal/measurement/ij;
-
-    move-result-object v4
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wJ()Lcom/google/android/gms/internal/measurement/fi;
-
-    move-result-object v5
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gx;->xw()Lcom/google/android/gms/internal/measurement/gv;
-
-    move-result-object v6
-
-    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/gy;Lcom/google/android/gms/internal/measurement/hi;Lcom/google/android/gms/internal/measurement/gl;Lcom/google/android/gms/internal/measurement/ij;Lcom/google/android/gms/internal/measurement/fi;Lcom/google/android/gms/internal/measurement/gv;)Lcom/google/android/gms/internal/measurement/he;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xD()Lcom/google/android/gms/internal/measurement/hi;
-
-    move-result-object v2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->xo()Lcom/google/android/gms/internal/measurement/gl;
-
-    move-result-object v3
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xJ()Lcom/google/android/gms/internal/measurement/ij;
-
-    move-result-object v4
-
-    const/4 v5, 0x0
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gx;->xw()Lcom/google/android/gms/internal/measurement/gv;
-
-    move-result-object v6
-
-    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/gy;Lcom/google/android/gms/internal/measurement/hi;Lcom/google/android/gms/internal/measurement/gl;Lcom/google/android/gms/internal/measurement/ij;Lcom/google/android/gms/internal/measurement/fi;Lcom/google/android/gms/internal/measurement/gv;)Lcom/google/android/gms/internal/measurement/he;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/gp;->a(Lcom/google/android/gms/internal/measurement/gy;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
     invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xC()Lcom/google/android/gms/internal/measurement/hi;
 
     move-result-object v2
@@ -293,11 +235,11 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xH()Lcom/google/android/gms/internal/measurement/ij;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xI()Lcom/google/android/gms/internal/measurement/ij;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wK()Lcom/google/android/gms/internal/measurement/fi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wI()Lcom/google/android/gms/internal/measurement/fi;
 
     move-result-object v5
 
@@ -311,7 +253,7 @@
 
     return-object p1
 
-    :cond_4
+    :cond_2
     invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xC()Lcom/google/android/gms/internal/measurement/hi;
 
     move-result-object v2
@@ -335,4 +277,62 @@
     move-result-object p1
 
     return-object p1
+
+    :cond_3
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/gp;->a(Lcom/google/android/gms/internal/measurement/gy;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xB()Lcom/google/android/gms/internal/measurement/hi;
+
+    move-result-object v2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->xm()Lcom/google/android/gms/internal/measurement/gl;
+
+    move-result-object v3
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xG()Lcom/google/android/gms/internal/measurement/ij;
+
+    move-result-object v4
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fk;->wJ()Lcom/google/android/gms/internal/measurement/fi;
+
+    move-result-object v5
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gx;->xu()Lcom/google/android/gms/internal/measurement/gv;
+
+    move-result-object v6
+
+    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/gy;Lcom/google/android/gms/internal/measurement/hi;Lcom/google/android/gms/internal/measurement/gl;Lcom/google/android/gms/internal/measurement/ij;Lcom/google/android/gms/internal/measurement/fi;Lcom/google/android/gms/internal/measurement/gv;)Lcom/google/android/gms/internal/measurement/he;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_4
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xB()Lcom/google/android/gms/internal/measurement/hi;
+
+    move-result-object v2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->xm()Lcom/google/android/gms/internal/measurement/gl;
+
+    move-result-object v3
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xH()Lcom/google/android/gms/internal/measurement/ij;
+
+    move-result-object v4
+
+    const/4 v5, 0x0
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gx;->xu()Lcom/google/android/gms/internal/measurement/gv;
+
+    move-result-object v6
+
+    invoke-static/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/gy;Lcom/google/android/gms/internal/measurement/hi;Lcom/google/android/gms/internal/measurement/gl;Lcom/google/android/gms/internal/measurement/ij;Lcom/google/android/gms/internal/measurement/fi;Lcom/google/android/gms/internal/measurement/gv;)Lcom/google/android/gms/internal/measurement/he;
+
+    move-result-object p1
+
+    return-object p1
 .end method
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 5765eabb85..c0ba4a2676 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
@@ -137,4 +137,6 @@
     invoke-direct {v0, p1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
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 7491027534..9869b8b2a9 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
@@ -106,7 +106,7 @@
     throw p0
 .end method
 
-.method public static xq()Lcom/google/android/gms/internal/measurement/gu;
+.method public static xp()Lcom/google/android/gms/internal/measurement/gu;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -130,7 +130,7 @@
 .method public final clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xs()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xr()V
 
     invoke-super {p0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -193,10 +193,9 @@
 
     if-eq v2, v3, :cond_0
 
-    :goto_0
     const/4 p1, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     invoke-interface {p0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
@@ -230,7 +229,9 @@
 
     if-nez v4, :cond_2
 
-    goto :goto_0
+    const/4 p1, 0x0
+
+    goto :goto_1
 
     :cond_2
     invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
@@ -261,22 +262,24 @@
 
     move-result v3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-virtual {v4, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v3
 
-    :goto_1
+    :goto_0
     if-nez v3, :cond_1
 
-    goto :goto_0
+    const/4 p1, 0x0
+
+    goto :goto_1
 
     :cond_4
     const/4 p1, 0x1
 
-    :goto_2
+    :goto_1
     if-eqz p1, :cond_5
 
     return v0
@@ -345,7 +348,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xs()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xr()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -368,7 +371,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xs()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xr()V
 
     invoke-interface {p1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -415,7 +418,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xs()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gu;->xr()V
 
     invoke-super {p0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -424,7 +427,7 @@
     return-object p1
 .end method
 
-.method public final xr()Lcom/google/android/gms/internal/measurement/gu;
+.method public final xq()Lcom/google/android/gms/internal/measurement/gu;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -454,7 +457,7 @@
     return-object v0
 .end method
 
-.method final xs()V
+.method final xr()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gu;->zzbtu:Z
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 7eb3b23b2a..366639e57f 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
@@ -39,10 +39,10 @@
 .method public abstract l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 .end method
 
-.method public abstract xt()Ljava/lang/Object;
+.method public abstract xs()Ljava/lang/Object;
 .end method
 
-.method public abstract xu()Lcom/google/android/gms/internal/measurement/gt;
+.method public abstract xt()Lcom/google/android/gms/internal/measurement/gt;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali
index 6c4c20a9ea..e82d5799ea 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali
@@ -150,12 +150,12 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gu;->xr()Lcom/google/android/gms/internal/measurement/gu;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gu;->xq()Lcom/google/android/gms/internal/measurement/gu;
 
     move-result-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gu;->xs()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gu;->xr()V
 
     invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/gu;->isEmpty()Z
 
@@ -169,21 +169,21 @@
     return-object p1
 .end method
 
-.method public final xt()Ljava/lang/Object;
+.method public final xs()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->xq()Lcom/google/android/gms/internal/measurement/gu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->xp()Lcom/google/android/gms/internal/measurement/gu;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gu;->xr()Lcom/google/android/gms/internal/measurement/gu;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gu;->xq()Lcom/google/android/gms/internal/measurement/gu;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final xu()Lcom/google/android/gms/internal/measurement/gt;
+.method public final xt()Lcom/google/android/gms/internal/measurement/gt;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 f8e81e4bf5..6e9217b21d 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
@@ -12,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gx;->xx()Lcom/google/android/gms/internal/measurement/gv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gx;->xw()Lcom/google/android/gms/internal/measurement/gv;
 
     move-result-object v0
 
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method static xv()Lcom/google/android/gms/internal/measurement/gv;
+.method static xu()Lcom/google/android/gms/internal/measurement/gv;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->bdP:Lcom/google/android/gms/internal/measurement/gv;
@@ -35,7 +35,7 @@
     return-object v0
 .end method
 
-.method static xw()Lcom/google/android/gms/internal/measurement/gv;
+.method static xv()Lcom/google/android/gms/internal/measurement/gv;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->bdQ:Lcom/google/android/gms/internal/measurement/gv;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method private static xx()Lcom/google/android/gms/internal/measurement/gv;
+.method private static xw()Lcom/google/android/gms/internal/measurement/gv;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gy.smali
index 06471305c7..99e5fbb798 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gy.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
-.method public abstract xA()Lcom/google/android/gms/internal/measurement/ha;
+.method public abstract xx()I
 .end method
 
-.method public abstract xy()I
+.method public abstract xy()Z
 .end method
 
-.method public abstract xz()Z
+.method public abstract xz()Lcom/google/android/gms/internal/measurement/ha;
 .end method
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 e5ffa92e3e..8ec736adae 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
@@ -128,8 +128,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/h;->aTK:I
-
     iput v0, p1, Lcom/google/android/gms/internal/measurement/h;->aTK:I
 
     :cond_1
@@ -137,8 +135,6 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/h;->aTL:I
-
     iput v0, p1, Lcom/google/android/gms/internal/measurement/h;->aTL:I
 
     :cond_2
@@ -173,16 +169,19 @@
 
     const/4 v0, 0x0
 
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/h;->aTN:Ljava/lang/String;
+
+    goto :goto_0
+
     :cond_4
     iput-object v0, p1, Lcom/google/android/gms/internal/measurement/h;->aTN:Ljava/lang/String;
 
     :cond_5
+    :goto_0
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/h;->aTO:Z
 
     if-eqz v0, :cond_6
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/h;->aTO:Z
-
     iput-boolean v0, p1, Lcom/google/android/gms/internal/measurement/h;->aTO:Z
 
     :cond_6
@@ -190,8 +189,6 @@
 
     if-eqz v0, :cond_7
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/h;->aTP:Z
-
     iput-boolean v0, p1, Lcom/google/android/gms/internal/measurement/h;->aTP:Z
 
     :cond_7
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ha.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ha.smali
index 8571189ea1..96557f1d19 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ha.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ha.smali
@@ -14,14 +14,14 @@
     .end annotation
 .end method
 
-.method public abstract vF()Lcom/google/android/gms/internal/measurement/em;
+.method public abstract vE()Lcom/google/android/gms/internal/measurement/em;
 .end method
 
-.method public abstract wU()I
+.method public abstract wT()I
+.end method
+
+.method public abstract wU()Lcom/google/android/gms/internal/measurement/hb;
 .end method
 
 .method public abstract wV()Lcom/google/android/gms/internal/measurement/hb;
 .end method
-
-.method public abstract wW()Lcom/google/android/gms/internal/measurement/hb;
-.end method
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 2070878665..f4aabe588e 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
@@ -10,8 +10,8 @@
 .method public abstract a(Lcom/google/android/gms/internal/measurement/ha;)Lcom/google/android/gms/internal/measurement/hb;
 .end method
 
-.method public abstract wZ()Lcom/google/android/gms/internal/measurement/ha;
+.method public abstract wY()Lcom/google/android/gms/internal/measurement/ha;
 .end method
 
-.method public abstract xa()Lcom/google/android/gms/internal/measurement/ha;
+.method public abstract wZ()Lcom/google/android/gms/internal/measurement/ha;
 .end method
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 e41730c0cd..b302bc8ae0 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
@@ -6,5 +6,5 @@
 .method public abstract isInitialized()Z
 .end method
 
-.method public abstract wX()Lcom/google/android/gms/internal/measurement/ha;
+.method public abstract wW()Lcom/google/android/gms/internal/measurement/ha;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hd.smali
index cab2e4f9aa..1c29e26771 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hd.smali
@@ -91,7 +91,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_17
+    if-eqz v3, :cond_1d
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -524,7 +524,7 @@
 
     move-result-object v6
 
-    if-nez v4, :cond_16
+    if-nez v4, :cond_1c
 
     instance-of v4, v6, Ljava/lang/Boolean;
 
@@ -540,20 +540,19 @@
 
     if-nez v4, :cond_d
 
-    :goto_9
     const/4 v4, 0x1
 
-    goto/16 :goto_b
+    goto/16 :goto_9
 
     :cond_d
     const/4 v4, 0x0
 
-    goto :goto_b
+    goto/16 :goto_9
 
     :cond_e
     instance-of v4, v6, Ljava/lang/Integer;
 
-    if-eqz v4, :cond_f
+    if-eqz v4, :cond_10
 
     move-object v4, v6
 
@@ -563,14 +562,21 @@
 
     move-result v4
 
-    if-nez v4, :cond_d
+    if-nez v4, :cond_f
 
-    goto :goto_9
+    const/4 v4, 0x1
+
+    goto/16 :goto_9
 
     :cond_f
+    const/4 v4, 0x0
+
+    goto/16 :goto_9
+
+    :cond_10
     instance-of v4, v6, Ljava/lang/Float;
 
-    if-eqz v4, :cond_10
+    if-eqz v4, :cond_12
 
     move-object v4, v6
 
@@ -584,14 +590,21 @@
 
     cmpl-float v4, v4, v8
 
-    if-nez v4, :cond_d
+    if-nez v4, :cond_11
+
+    const/4 v4, 0x1
 
     goto :goto_9
 
-    :cond_10
+    :cond_11
+    const/4 v4, 0x0
+
+    goto :goto_9
+
+    :cond_12
     instance-of v4, v6, Ljava/lang/Double;
 
-    if-eqz v4, :cond_11
+    if-eqz v4, :cond_14
 
     move-object v4, v6
 
@@ -605,54 +618,71 @@
 
     cmpl-double v4, v8, v10
 
-    if-nez v4, :cond_d
+    if-nez v4, :cond_13
+
+    const/4 v4, 0x1
 
     goto :goto_9
 
-    :cond_11
+    :cond_13
+    const/4 v4, 0x0
+
+    goto :goto_9
+
+    :cond_14
     instance-of v4, v6, Ljava/lang/String;
 
-    if-eqz v4, :cond_12
+    if-eqz v4, :cond_15
 
     const-string v4, ""
 
-    :goto_a
     invoke-virtual {v6, v4}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v4
 
-    goto :goto_b
+    goto :goto_9
 
-    :cond_12
+    :cond_15
     instance-of v4, v6, Lcom/google/android/gms/internal/measurement/em;
 
-    if-eqz v4, :cond_13
+    if-eqz v4, :cond_16
 
     sget-object v4, Lcom/google/android/gms/internal/measurement/em;->baI:Lcom/google/android/gms/internal/measurement/em;
 
-    goto :goto_a
+    invoke-virtual {v6, v4}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    :cond_13
+    move-result v4
+
+    goto :goto_9
+
+    :cond_16
     instance-of v4, v6, Lcom/google/android/gms/internal/measurement/ha;
 
-    if-eqz v4, :cond_14
+    if-eqz v4, :cond_18
 
     move-object v4, v6
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/ha;
 
-    invoke-interface {v4}, Lcom/google/android/gms/internal/measurement/ha;->wX()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {v4}, Lcom/google/android/gms/internal/measurement/ha;->wW()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object v4
 
-    if-ne v6, v4, :cond_d
+    if-ne v6, v4, :cond_17
+
+    const/4 v4, 0x1
 
     goto :goto_9
 
-    :cond_14
+    :cond_17
+    const/4 v4, 0x0
+
+    goto :goto_9
+
+    :cond_18
     instance-of v4, v6, Ljava/lang/Enum;
 
-    if-eqz v4, :cond_d
+    if-eqz v4, :cond_1a
 
     move-object v4, v6
 
@@ -662,23 +692,33 @@
 
     move-result v4
 
-    if-nez v4, :cond_d
-
-    goto :goto_9
-
-    :goto_b
-    if-nez v4, :cond_15
+    if-nez v4, :cond_19
 
     const/4 v4, 0x1
 
-    goto :goto_c
+    goto :goto_9
 
-    :cond_15
+    :cond_19
     const/4 v4, 0x0
 
-    goto :goto_c
+    goto :goto_9
 
-    :cond_16
+    :cond_1a
+    const/4 v4, 0x0
+
+    :goto_9
+    if-nez v4, :cond_1b
+
+    const/4 v4, 0x1
+
+    goto :goto_a
+
+    :cond_1b
+    const/4 v4, 0x0
+
+    goto :goto_a
+
+    :cond_1c
     new-array v7, v5, [Ljava/lang/Object;
 
     invoke-static {v4, p0, v7}, Lcom/google/android/gms/internal/measurement/fu;->a(Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
@@ -691,7 +731,7 @@
 
     move-result v4
 
-    :goto_c
+    :goto_a
     if-eqz v4, :cond_2
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/hd;->ci(Ljava/lang/String;)Ljava/lang/String;
@@ -702,10 +742,10 @@
 
     goto/16 :goto_1
 
-    :cond_17
+    :cond_1d
     instance-of v0, p0, Lcom/google/android/gms/internal/measurement/fu$c;
 
-    if-eqz v0, :cond_19
+    if-eqz v0, :cond_1f
 
     move-object v0, p0
 
@@ -721,11 +761,11 @@
 
     move-result v1
 
-    if-nez v1, :cond_18
+    if-nez v1, :cond_1e
 
-    goto :goto_d
+    goto :goto_b
 
-    :cond_18
+    :cond_1e
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object p0
@@ -740,19 +780,19 @@
 
     throw p0
 
-    :cond_19
-    :goto_d
+    :cond_1f
+    :goto_b
     check-cast p0, Lcom/google/android/gms/internal/measurement/fu;
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fu;->zzbym:Lcom/google/android/gms/internal/measurement/ik;
 
-    if-eqz v0, :cond_1a
+    if-eqz v0, :cond_20
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/fu;->zzbym:Lcom/google/android/gms/internal/measurement/ik;
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/ik;->b(Ljava/lang/StringBuilder;I)V
 
-    :cond_1a
+    :cond_20
     return-void
 .end method
 
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 421cf8d6d3..a5809fb6ef 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
@@ -84,7 +84,7 @@
 
     sput-object v0, Lcom/google/android/gms/internal/measurement/he;->bdR:[I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xZ()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xY()Lsun/misc/Unsafe;
 
     move-result-object v0
 
@@ -336,7 +336,7 @@
 .end method
 
 .method static a(Lcom/google/android/gms/internal/measurement/gy;Lcom/google/android/gms/internal/measurement/hi;Lcom/google/android/gms/internal/measurement/gl;Lcom/google/android/gms/internal/measurement/ij;Lcom/google/android/gms/internal/measurement/fi;Lcom/google/android/gms/internal/measurement/gv;)Lcom/google/android/gms/internal/measurement/he;
-    .locals 41
+    .locals 34
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -364,7 +364,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hp;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->xy()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->xx()I
 
     move-result v1
 
@@ -484,7 +484,7 @@
 
     sget-object v8, Lcom/google/android/gms/internal/measurement/he;->bdR:[I
 
-    move-object/from16 v16, v8
+    move-object v15, v8
 
     const/4 v8, 0x0
 
@@ -496,7 +496,7 @@
 
     const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v16, 0x0
 
     goto/16 :goto_12
 
@@ -779,11 +779,11 @@
 
     const/16 v17, 0xd
 
-    move/from16 v40, v16
+    move/from16 v32, v16
 
     move/from16 v16, v15
 
-    move/from16 v15, v40
+    move/from16 v15, v32
 
     :goto_f
     add-int/lit8 v18, v15, 0x1
@@ -831,11 +831,11 @@
 
     const/16 v17, 0xd
 
-    move/from16 v40, v16
+    move/from16 v32, v16
 
     move/from16 v16, v3
 
-    move/from16 v3, v40
+    move/from16 v3, v32
 
     :goto_11
     add-int/lit8 v18, v3, 0x1
@@ -876,21 +876,21 @@
 
     add-int v10, v17, v10
 
-    move/from16 v40, v13
+    move/from16 v32, v13
 
     move v13, v3
 
     move v3, v9
 
-    move v9, v12
+    move/from16 v9, v32
 
-    move/from16 v12, v16
+    move/from16 v33, v16
 
-    move-object/from16 v16, v15
+    move/from16 v16, v8
 
-    move v15, v10
+    move v8, v12
 
-    move/from16 v10, v40
+    move/from16 v12, v33
 
     :goto_12
     sget-object v6, Lcom/google/android/gms/internal/measurement/he;->bdS:Lsun/misc/Unsafe;
@@ -903,13 +903,13 @@
 
     move-result-object v4
 
-    move/from16 v22, v12
+    move/from16 v20, v10
 
-    mul-int/lit8 v12, v14, 0x3
+    mul-int/lit8 v10, v14, 0x3
 
-    new-array v12, v12, [I
+    new-array v10, v10, [I
 
-    const/16 v17, 0x1
+    const/16 v19, 0x1
 
     shl-int/lit8 v14, v14, 0x1
 
@@ -917,86 +917,84 @@
 
     add-int/2addr v3, v13
 
-    move/from16 v23, v13
+    move/from16 v23, v3
 
-    move/from16 v19, v15
+    move/from16 v24, v13
 
-    move/from16 v15, v22
+    move/from16 v22, v20
 
-    const/16 v17, 0x0
+    const/16 v20, 0x0
 
-    const/16 v18, 0x0
-
-    move/from16 v22, v3
+    const/16 v21, 0x0
 
     :goto_13
-    if-ge v15, v2, :cond_34
+    if-ge v12, v2, :cond_34
 
-    add-int/lit8 v24, v15, 0x1
+    add-int/lit8 v25, v12, 0x1
 
-    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v1, v12}, Ljava/lang/String;->charAt(I)C
 
-    move-result v15
+    move-result v12
 
-    move/from16 v25, v2
+    move/from16 v26, v2
 
     const v2, 0xd800
 
-    if-lt v15, v2, :cond_17
+    if-lt v12, v2, :cond_17
 
-    and-int/lit16 v15, v15, 0x1fff
+    and-int/lit16 v12, v12, 0x1fff
 
-    const/16 v26, 0xd
+    const/16 v27, 0xd
 
-    move/from16 v40, v24
+    move/from16 v32, v25
 
-    move/from16 v24, v15
+    move/from16 v25, v12
 
-    move/from16 v15, v40
+    move/from16 v12, v32
 
     :goto_14
-    add-int/lit8 v27, v15, 0x1
+    add-int/lit8 v28, v12, 0x1
 
-    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v1, v12}, Ljava/lang/String;->charAt(I)C
 
-    move-result v15
+    move-result v12
 
-    if-lt v15, v2, :cond_16
+    if-lt v12, v2, :cond_16
 
-    and-int/lit16 v2, v15, 0x1fff
+    and-int/lit16 v2, v12, 0x1fff
 
-    shl-int v2, v2, v26
+    shl-int v2, v2, v27
 
-    or-int v24, v24, v2
+    or-int v25, v25, v2
 
-    add-int/lit8 v26, v26, 0xd
+    add-int/lit8 v27, v27, 0xd
 
-    move/from16 v15, v27
+    move/from16 v12, v28
 
     const v2, 0xd800
 
     goto :goto_14
 
     :cond_16
-    shl-int v2, v15, v26
+    shl-int v2, v12, v27
 
-    or-int v15, v24, v2
+    or-int v12, v25, v2
 
-    move/from16 v2, v27
+    move/from16 v2, v28
 
     goto :goto_15
 
     :cond_17
-    move/from16 v2, v24
+    move/from16 v2, v25
 
     :goto_15
-    add-int/lit8 v24, v2, 0x1
+    add-int/lit8 v25, v2, 0x1
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
 
     move-result v2
 
-    move/from16 v28, v3
+    move/from16 v27, v3
 
     const v3, 0xd800
 
@@ -1004,16 +1002,16 @@
 
     and-int/lit16 v2, v2, 0x1fff
 
-    const/16 v26, 0xd
+    const/16 v28, 0xd
 
-    move/from16 v40, v24
+    move/from16 v32, v25
 
-    move/from16 v24, v2
+    move/from16 v25, v2
 
-    move/from16 v2, v40
+    move/from16 v2, v32
 
     :goto_16
-    add-int/lit8 v27, v2, 0x1
+    add-int/lit8 v29, v2, 0x1
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
 
@@ -1023,46 +1021,46 @@
 
     and-int/lit16 v2, v2, 0x1fff
 
-    shl-int v2, v2, v26
+    shl-int v2, v2, v28
 
-    or-int v24, v24, v2
+    or-int v25, v25, v2
 
-    add-int/lit8 v26, v26, 0xd
+    add-int/lit8 v28, v28, 0xd
 
-    move/from16 v2, v27
+    move/from16 v2, v29
 
     const v3, 0xd800
 
     goto :goto_16
 
     :cond_18
-    shl-int v2, v2, v26
+    shl-int v2, v2, v28
 
-    or-int v2, v24, v2
+    or-int v2, v25, v2
 
-    move/from16 v3, v27
+    move/from16 v3, v29
 
     goto :goto_17
 
     :cond_19
-    move/from16 v3, v24
+    move/from16 v3, v25
 
     :goto_17
-    move/from16 v29, v13
+    move/from16 v25, v13
 
     and-int/lit16 v13, v2, 0xff
 
-    move/from16 v30, v11
+    move/from16 v28, v11
 
     and-int/lit16 v11, v2, 0x400
 
     if-eqz v11, :cond_1a
 
-    add-int/lit8 v11, v17, 0x1
+    add-int/lit8 v11, v20, 0x1
 
-    aput v18, v16, v17
+    aput v21, v15, v20
 
-    move/from16 v17, v11
+    move/from16 v20, v11
 
     :cond_1a
     sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bcz:Lcom/google/android/gms/internal/measurement/fo;
@@ -1077,7 +1075,7 @@
 
     move-result v3
 
-    move/from16 v31, v11
+    move/from16 v29, v11
 
     const v11, 0xd800
 
@@ -1085,14 +1083,16 @@
 
     and-int/lit16 v3, v3, 0x1fff
 
-    move/from16 v24, v3
+    const/16 v30, 0xd
 
-    move/from16 v3, v31
+    move/from16 v32, v29
 
-    const/16 v26, 0xd
+    move/from16 v29, v3
+
+    move/from16 v3, v32
 
     :goto_18
-    add-int/lit8 v27, v3, 0x1
+    add-int/lit8 v31, v3, 0x1
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->charAt(I)C
 
@@ -1102,29 +1102,26 @@
 
     and-int/lit16 v3, v3, 0x1fff
 
-    shl-int v3, v3, v26
+    shl-int v3, v3, v30
 
-    or-int v24, v24, v3
+    or-int v29, v29, v3
 
-    add-int/lit8 v26, v26, 0xd
+    add-int/lit8 v30, v30, 0xd
 
-    move/from16 v3, v27
+    move/from16 v3, v31
 
     const v11, 0xd800
 
     goto :goto_18
 
     :cond_1b
-    shl-int v3, v3, v26
+    shl-int v3, v3, v30
 
-    or-int v3, v24, v3
+    or-int v3, v29, v3
 
-    goto :goto_19
+    move/from16 v29, v31
 
     :cond_1c
-    move/from16 v27, v31
-
-    :goto_19
     sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bbK:Lcom/google/android/gms/internal/measurement/fo;
 
     iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
@@ -1141,7 +1138,9 @@
 
     if-ne v13, v11, :cond_1d
 
-    goto :goto_1b
+    move/from16 v30, v9
+
+    goto :goto_19
 
     :cond_1d
     sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bbN:Lcom/google/android/gms/internal/measurement/fo;
@@ -1154,336 +1153,347 @@
 
     and-int/lit8 v11, v5, 0x1
 
-    move/from16 v32, v10
+    move/from16 v30, v9
 
-    const/4 v10, 0x1
+    const/4 v9, 0x1
 
-    if-ne v11, v10, :cond_1f
+    if-ne v11, v9, :cond_1f
 
-    div-int/lit8 v11, v18, 0x3
+    div-int/lit8 v11, v21, 0x3
 
-    shl-int/2addr v11, v10
+    shl-int/2addr v11, v9
 
-    add-int/2addr v11, v10
+    add-int/2addr v11, v9
 
-    add-int/lit8 v10, v19, 0x1
+    add-int/lit8 v9, v22, 0x1
 
-    aget-object v19, v7, v19
+    aget-object v22, v7, v22
 
-    aput-object v19, v14, v11
+    aput-object v22, v14, v11
+
+    move/from16 v22, v9
+
+    const/4 v11, 0x1
 
     goto :goto_1a
 
     :cond_1e
-    move/from16 v32, v10
+    move/from16 v30, v9
 
     :cond_1f
-    move/from16 v10, v19
-
-    :goto_1a
     const/4 v11, 0x1
 
-    goto :goto_1c
+    goto :goto_1a
 
     :cond_20
-    :goto_1b
-    move/from16 v32, v10
+    move/from16 v30, v9
 
-    div-int/lit8 v10, v18, 0x3
+    :goto_19
+    div-int/lit8 v9, v21, 0x3
 
     const/4 v11, 0x1
 
-    shl-int/2addr v10, v11
+    shl-int/2addr v9, v11
 
-    add-int/2addr v10, v11
+    add-int/2addr v9, v11
 
-    add-int/lit8 v21, v19, 0x1
+    add-int/lit8 v19, v22, 0x1
 
-    aget-object v19, v7, v19
+    aget-object v22, v7, v22
 
-    aput-object v19, v14, v10
+    aput-object v22, v14, v9
 
-    move/from16 v10, v21
+    move/from16 v22, v19
 
-    :goto_1c
+    :goto_1a
     shl-int/2addr v3, v11
 
-    aget-object v11, v7, v3
+    aget-object v9, v7, v3
 
-    move/from16 v33, v10
+    instance-of v11, v9, Ljava/lang/reflect/Field;
 
-    instance-of v10, v11, Ljava/lang/reflect/Field;
+    if-eqz v11, :cond_21
 
-    if-eqz v10, :cond_21
+    check-cast v9, Ljava/lang/reflect/Field;
 
-    check-cast v11, Ljava/lang/reflect/Field;
+    move v11, v8
 
-    goto :goto_1d
+    goto :goto_1b
 
     :cond_21
-    check-cast v11, Ljava/lang/String;
+    check-cast v9, Ljava/lang/String;
 
-    invoke-static {v4, v11}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    invoke-static {v4, v9}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v11
+    move-result-object v9
 
-    aput-object v11, v7, v3
+    aput-object v9, v7, v3
 
-    :goto_1d
-    invoke-virtual {v6, v11}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    move v11, v8
 
-    move-result-wide v10
+    :goto_1b
+    invoke-virtual {v6, v9}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
-    long-to-int v10, v10
+    move-result-wide v8
+
+    long-to-int v8, v8
 
     add-int/lit8 v3, v3, 0x1
 
-    aget-object v11, v7, v3
+    aget-object v9, v7, v3
 
-    move/from16 v34, v10
+    move/from16 v31, v8
 
-    instance-of v10, v11, Ljava/lang/reflect/Field;
+    instance-of v8, v9, Ljava/lang/reflect/Field;
 
-    if-eqz v10, :cond_22
+    if-eqz v8, :cond_22
 
-    check-cast v11, Ljava/lang/reflect/Field;
+    check-cast v9, Ljava/lang/reflect/Field;
 
-    goto :goto_1e
+    goto :goto_1c
 
     :cond_22
-    check-cast v11, Ljava/lang/String;
+    check-cast v9, Ljava/lang/String;
 
-    invoke-static {v4, v11}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    invoke-static {v4, v9}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v11
+    move-result-object v9
 
-    aput-object v11, v7, v3
+    aput-object v9, v7, v3
 
-    :goto_1e
-    invoke-virtual {v6, v11}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    :goto_1c
+    invoke-virtual {v6, v9}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
-    move-result-wide v10
+    move-result-wide v8
 
-    long-to-int v3, v10
-
-    move-object/from16 v36, v0
-
-    move v0, v3
-
-    move/from16 v35, v9
-
-    move/from16 v39, v27
-
-    move/from16 v10, v33
-
-    move/from16 v38, v34
-
-    const/4 v3, 0x0
-
-    const/16 v19, 0x1
+    long-to-int v3, v8
 
     move-object v9, v1
 
-    goto/16 :goto_29
+    move/from16 v8, v22
+
+    move/from16 v22, v11
+
+    move/from16 v11, v31
+
+    move/from16 v31, v29
+
+    move-object/from16 v29, v0
+
+    move v0, v3
+
+    const/4 v3, 0x0
+
+    goto/16 :goto_25
 
     :cond_23
-    move/from16 v32, v10
+    move v11, v8
 
-    add-int/lit8 v10, v19, 0x1
+    move/from16 v30, v9
 
-    aget-object v11, v7, v19
+    add-int/lit8 v8, v22, 0x1
 
-    check-cast v11, Ljava/lang/String;
+    aget-object v9, v7, v22
 
-    invoke-static {v4, v11}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    check-cast v9, Ljava/lang/String;
 
-    move-result-object v11
+    invoke-static {v4, v9}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move/from16 v35, v9
+    move-result-object v9
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bbK:Lcom/google/android/gms/internal/measurement/fo;
+    move/from16 v22, v11
 
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bbK:Lcom/google/android/gms/internal/measurement/fo;
 
-    if-eq v13, v9, :cond_2b
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bbS:Lcom/google/android/gms/internal/measurement/fo;
+    if-eq v13, v11, :cond_2b
 
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bbS:Lcom/google/android/gms/internal/measurement/fo;
 
-    if-ne v13, v9, :cond_24
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
 
-    goto/16 :goto_23
+    if-ne v13, v11, :cond_24
+
+    goto/16 :goto_1f
 
     :cond_24
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bcc:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bcc:Lcom/google/android/gms/internal/measurement/fo;
 
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
 
-    if-eq v13, v9, :cond_2a
+    if-eq v13, v11, :cond_2a
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bcy:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bcy:Lcom/google/android/gms/internal/measurement/fo;
 
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
 
-    if-ne v13, v9, :cond_25
+    if-ne v13, v11, :cond_25
+
+    move-object/from16 v29, v0
+
+    const/4 v0, 0x1
+
+    goto/16 :goto_1e
+
+    :cond_25
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bbN:Lcom/google/android/gms/internal/measurement/fo;
+
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
+
+    if-eq v13, v11, :cond_29
+
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bcf:Lcom/google/android/gms/internal/measurement/fo;
+
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
+
+    if-eq v13, v11, :cond_29
+
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bct:Lcom/google/android/gms/internal/measurement/fo;
+
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
+
+    if-ne v13, v11, :cond_26
+
+    goto :goto_1d
+
+    :cond_26
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bcz:Lcom/google/android/gms/internal/measurement/fo;
+
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
+
+    if-ne v13, v11, :cond_28
+
+    add-int/lit8 v11, v24, 0x1
+
+    aput v21, v15, v24
+
+    div-int/lit8 v24, v21, 0x3
+
+    const/16 v19, 0x1
+
+    shl-int/lit8 v24, v24, 0x1
+
+    add-int/lit8 v29, v8, 0x1
+
+    aget-object v8, v7, v8
+
+    aput-object v8, v14, v24
+
+    and-int/lit16 v8, v2, 0x800
+
+    if-eqz v8, :cond_27
+
+    add-int/lit8 v24, v24, 0x1
+
+    add-int/lit8 v8, v29, 0x1
+
+    aget-object v29, v7, v29
+
+    aput-object v29, v14, v24
+
+    move-object/from16 v29, v0
+
+    move/from16 v24, v11
+
+    move-object v11, v1
 
     goto :goto_21
 
-    :cond_25
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bbN:Lcom/google/android/gms/internal/measurement/fo;
+    :cond_27
+    move/from16 v24, v11
 
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    move/from16 v8, v29
 
-    if-eq v13, v9, :cond_29
+    move-object/from16 v29, v0
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bcf:Lcom/google/android/gms/internal/measurement/fo;
+    move-object v11, v1
 
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    goto :goto_21
 
-    if-eq v13, v9, :cond_29
+    :cond_28
+    move-object/from16 v29, v0
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bct:Lcom/google/android/gms/internal/measurement/fo;
-
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
-
-    if-ne v13, v9, :cond_26
+    const/4 v0, 0x1
 
     goto :goto_20
 
-    :cond_26
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fo;->bcz:Lcom/google/android/gms/internal/measurement/fo;
-
-    iget v9, v9, Lcom/google/android/gms/internal/measurement/fo;->id:I
-
-    if-ne v13, v9, :cond_28
-
-    add-int/lit8 v9, v23, 0x1
-
-    aput v18, v16, v23
-
-    div-int/lit8 v19, v18, 0x3
-
-    const/16 v21, 0x1
-
-    shl-int/lit8 v19, v19, 0x1
-
-    add-int/lit8 v23, v10, 0x1
-
-    aget-object v10, v7, v10
-
-    aput-object v10, v14, v19
-
-    and-int/lit16 v10, v2, 0x800
-
-    if-eqz v10, :cond_27
-
-    add-int/lit8 v19, v19, 0x1
-
-    add-int/lit8 v10, v23, 0x1
-
-    aget-object v23, v7, v23
-
-    aput-object v23, v14, v19
-
-    move-object/from16 v36, v0
-
-    move-object/from16 v37, v1
-
-    goto :goto_1f
-
-    :cond_27
-    move-object/from16 v36, v0
-
-    move-object/from16 v37, v1
-
-    move/from16 v10, v23
-
-    :goto_1f
-    move/from16 v23, v9
-
-    goto :goto_25
-
-    :cond_28
-    move-object/from16 v36, v0
-
-    const/4 v0, 0x1
-
-    goto :goto_24
-
     :cond_29
-    :goto_20
-    and-int/lit8 v9, v5, 0x1
+    :goto_1d
+    and-int/lit8 v11, v5, 0x1
 
-    move-object/from16 v36, v0
+    move-object/from16 v29, v0
 
     const/4 v0, 0x1
 
-    if-ne v9, v0, :cond_2c
+    if-ne v11, v0, :cond_2c
 
-    div-int/lit8 v9, v18, 0x3
+    div-int/lit8 v11, v21, 0x3
 
-    shl-int/2addr v9, v0
+    shl-int/2addr v11, v0
 
-    add-int/2addr v9, v0
+    add-int/2addr v11, v0
 
-    add-int/lit8 v19, v10, 0x1
+    add-int/lit8 v19, v8, 0x1
 
-    aget-object v10, v7, v10
+    aget-object v8, v7, v8
 
-    aput-object v10, v14, v9
+    aput-object v8, v14, v11
 
-    goto :goto_22
+    move-object v11, v1
+
+    move/from16 v8, v19
+
+    goto :goto_21
 
     :cond_2a
-    :goto_21
-    move-object/from16 v36, v0
+    move-object/from16 v29, v0
 
     const/4 v0, 0x1
 
-    div-int/lit8 v9, v18, 0x3
+    :goto_1e
+    div-int/lit8 v11, v21, 0x3
 
-    shl-int/2addr v9, v0
+    shl-int/2addr v11, v0
 
-    add-int/2addr v9, v0
+    add-int/2addr v11, v0
 
-    add-int/lit8 v19, v10, 0x1
+    add-int/lit8 v19, v8, 0x1
 
-    aget-object v10, v7, v10
+    aget-object v8, v7, v8
 
-    aput-object v10, v14, v9
+    aput-object v8, v14, v11
 
-    :goto_22
-    move-object/from16 v37, v1
+    move-object v11, v1
 
-    move/from16 v10, v19
+    move/from16 v8, v19
 
-    goto :goto_25
+    goto :goto_21
 
     :cond_2b
-    :goto_23
-    move-object/from16 v36, v0
+    :goto_1f
+    move-object/from16 v29, v0
 
     const/4 v0, 0x1
 
-    div-int/lit8 v9, v18, 0x3
+    div-int/lit8 v11, v21, 0x3
 
-    shl-int/2addr v9, v0
+    shl-int/2addr v11, v0
 
-    add-int/2addr v9, v0
+    add-int/2addr v11, v0
 
-    invoke-virtual {v11}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
+    invoke-virtual {v9}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
 
     move-result-object v19
 
-    aput-object v19, v14, v9
+    aput-object v19, v14, v11
 
     :cond_2c
-    :goto_24
-    move-object/from16 v37, v1
+    :goto_20
+    move-object v11, v1
 
-    :goto_25
-    invoke-virtual {v6, v11}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    :goto_21
+    invoke-virtual {v6, v9}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
     move-result-wide v0
 
@@ -1503,7 +1513,7 @@
 
     add-int/lit8 v1, v3, 0x1
 
-    move-object/from16 v9, v37
+    move-object v9, v11
 
     invoke-virtual {v9, v3}, Ljava/lang/String;->charAt(I)C
 
@@ -1515,10 +1525,10 @@
 
     and-int/lit16 v3, v3, 0x1fff
 
-    const/16 v19, 0xd
+    const/16 v18, 0xd
 
-    :goto_26
-    add-int/lit8 v20, v1, 0x1
+    :goto_22
+    add-int/lit8 v31, v1, 0x1
 
     invoke-virtual {v9, v1}, Ljava/lang/String;->charAt(I)C
 
@@ -1528,60 +1538,62 @@
 
     and-int/lit16 v1, v1, 0x1fff
 
-    shl-int v1, v1, v19
+    shl-int v1, v1, v18
 
     or-int/2addr v3, v1
 
-    add-int/lit8 v19, v19, 0xd
+    add-int/lit8 v18, v18, 0xd
 
-    move/from16 v1, v20
+    move/from16 v1, v31
 
-    goto :goto_26
+    goto :goto_22
 
     :cond_2d
-    shl-int v1, v1, v19
+    shl-int v1, v1, v18
 
     or-int/2addr v3, v1
 
-    move/from16 v1, v20
+    const/4 v1, 0x1
+
+    goto :goto_23
 
     :cond_2e
-    const/16 v19, 0x1
+    move/from16 v31, v1
 
-    shl-int/lit8 v20, v8, 0x1
+    const/4 v1, 0x1
 
-    div-int/lit8 v21, v3, 0x20
+    :goto_23
+    shl-int/lit8 v18, v16, 0x1
 
-    add-int v20, v20, v21
+    div-int/lit8 v19, v3, 0x20
 
-    aget-object v11, v7, v20
+    add-int v18, v18, v19
 
-    move/from16 v38, v0
+    aget-object v1, v7, v18
 
-    instance-of v0, v11, Ljava/lang/reflect/Field;
+    instance-of v11, v1, Ljava/lang/reflect/Field;
 
-    if-eqz v0, :cond_2f
+    if-eqz v11, :cond_2f
 
-    check-cast v11, Ljava/lang/reflect/Field;
+    check-cast v1, Ljava/lang/reflect/Field;
 
-    :goto_27
-    move/from16 v39, v1
+    move v11, v0
 
-    goto :goto_28
+    goto :goto_24
 
     :cond_2f
-    check-cast v11, Ljava/lang/String;
+    check-cast v1, Ljava/lang/String;
 
-    invoke-static {v4, v11}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+    invoke-static {v4, v1}, Lcom/google/android/gms/internal/measurement/he;->d(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v11
+    move-result-object v1
 
-    aput-object v11, v7, v20
+    aput-object v1, v7, v18
 
-    goto :goto_27
+    move v11, v0
 
-    :goto_28
-    invoke-virtual {v6, v11}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+    :goto_24
+    invoke-virtual {v6, v1}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
     move-result-wide v0
 
@@ -1589,22 +1601,20 @@
 
     rem-int/lit8 v3, v3, 0x20
 
-    goto :goto_29
+    goto :goto_25
 
     :cond_30
-    move/from16 v38, v0
+    move-object v9, v11
 
-    move-object/from16 v9, v37
+    move v11, v0
 
-    const/16 v19, 0x1
-
-    move/from16 v39, v3
+    move/from16 v31, v3
 
     const/4 v0, 0x0
 
     const/4 v3, 0x0
 
-    :goto_29
+    :goto_25
     const/16 v1, 0x12
 
     if-lt v13, v1, :cond_31
@@ -1613,115 +1623,119 @@
 
     if-gt v13, v1, :cond_31
 
-    add-int/lit8 v1, v22, 0x1
+    add-int/lit8 v1, v23, 0x1
 
-    aput v38, v16, v22
+    aput v11, v15, v23
 
-    move/from16 v22, v1
+    move/from16 v23, v1
 
     :cond_31
-    add-int/lit8 v1, v18, 0x1
+    add-int/lit8 v1, v21, 0x1
 
-    aput v15, v12, v18
+    aput v12, v10, v21
 
-    add-int/lit8 v11, v1, 0x1
+    add-int/lit8 v12, v1, 0x1
 
-    and-int/lit16 v15, v2, 0x200
+    move-object/from16 v18, v4
 
-    if-eqz v15, :cond_32
+    and-int/lit16 v4, v2, 0x200
 
-    const/high16 v15, 0x20000000
+    if-eqz v4, :cond_32
 
-    goto :goto_2a
+    const/high16 v4, 0x20000000
+
+    goto :goto_26
 
     :cond_32
-    const/4 v15, 0x0
+    const/4 v4, 0x0
 
-    :goto_2a
+    :goto_26
     and-int/lit16 v2, v2, 0x100
 
     if-eqz v2, :cond_33
 
     const/high16 v2, 0x10000000
 
-    goto :goto_2b
+    goto :goto_27
 
     :cond_33
     const/4 v2, 0x0
 
-    :goto_2b
-    or-int/2addr v2, v15
+    :goto_27
+    or-int/2addr v2, v4
 
-    shl-int/lit8 v13, v13, 0x14
+    shl-int/lit8 v4, v13, 0x14
 
-    or-int/2addr v2, v13
+    or-int/2addr v2, v4
 
-    or-int v2, v2, v38
+    or-int/2addr v2, v11
 
-    aput v2, v12, v1
+    aput v2, v10, v1
 
-    add-int/lit8 v18, v11, 0x1
+    add-int/lit8 v21, v12, 0x1
 
     shl-int/lit8 v1, v3, 0x14
 
     or-int/2addr v0, v1
 
-    aput v0, v12, v11
+    aput v0, v10, v12
 
     move-object v1, v9
 
-    move/from16 v19, v10
+    move-object/from16 v4, v18
 
-    move/from16 v2, v25
+    move/from16 v13, v25
 
-    move/from16 v3, v28
+    move/from16 v2, v26
 
-    move/from16 v13, v29
+    move/from16 v3, v27
 
-    move/from16 v11, v30
+    move/from16 v11, v28
 
-    move/from16 v10, v32
+    move-object/from16 v0, v29
 
-    move/from16 v9, v35
+    move/from16 v9, v30
 
-    move-object/from16 v0, v36
+    move/from16 v12, v31
 
-    move/from16 v15, v39
+    move/from16 v32, v22
+
+    move/from16 v22, v8
+
+    move/from16 v8, v32
 
     goto/16 :goto_13
 
     :cond_34
-    move-object/from16 v36, v0
+    move-object/from16 v29, v0
 
-    move/from16 v28, v3
+    move/from16 v27, v3
 
-    move/from16 v35, v9
+    move/from16 v22, v8
 
-    move/from16 v32, v10
+    move/from16 v30, v9
 
-    move/from16 v30, v11
+    move/from16 v28, v11
 
-    move/from16 v29, v13
+    move/from16 v25, v13
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    move-object/from16 v1, v36
+    move-object/from16 v1, v29
 
-    iget-object v10, v1, Lcom/google/android/gms/internal/measurement/hp;->bdX:Lcom/google/android/gms/internal/measurement/ha;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/hp;->bdX:Lcom/google/android/gms/internal/measurement/ha;
 
     move-object v5, v0
 
-    move-object v6, v12
+    move-object v6, v10
 
     move-object v7, v14
 
-    move/from16 v8, v35
+    move-object v10, v1
 
-    move/from16 v9, v32
+    move-object v12, v15
 
-    move-object/from16 v12, v16
-
-    move/from16 v14, v28
+    move/from16 v14, v27
 
     move-object/from16 v15, p1
 
@@ -1743,6 +1757,8 @@
     invoke-direct {v0}, Ljava/lang/NoSuchMethodError;-><init>()V
 
     throw v0
+
+    return-void
 .end method
 
 .method private final a(ILjava/util/Map;Lcom/google/android/gms/internal/measurement/fz;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/ij;)Ljava/lang/Object;
@@ -1769,7 +1785,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gv;->xu()Lcom/google/android/gms/internal/measurement/gt;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gv;->xt()Lcom/google/android/gms/internal/measurement/gt;
 
     move-result-object v0
 
@@ -1813,7 +1829,7 @@
 
     if-nez p4, :cond_1
 
-    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/ij;->xU()Ljava/lang/Object;
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/ij;->xT()Ljava/lang/Object;
 
     move-result-object p4
 
@@ -1849,7 +1865,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/et;->vQ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/et;->vP()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v1
 
@@ -2022,7 +2038,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gv;->xu()Lcom/google/android/gms/internal/measurement/gt;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gv;->xt()Lcom/google/android/gms/internal/measurement/gt;
 
     move-result-object v0
 
@@ -2058,11 +2074,10 @@
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/hq;->vY()Ljava/lang/String;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/hq;->vX()Ljava/lang/String;
 
     move-result-object p2
 
-    :goto_0
     invoke-static {p1, v0, v1, p2}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     return-void
@@ -2080,18 +2095,22 @@
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-static {p1, v0, v1, p2}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-void
 
     :cond_1
     and-int/2addr p2, v1
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/hq;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/hq;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-static {p1, v0, v1, p2}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-void
 .end method
 
 .method private final a(Ljava/lang/Object;Ljava/lang/Object;I)V
@@ -2265,7 +2284,7 @@
 .end method
 
 .method private final b(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
-    .locals 19
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;",
@@ -2337,7 +2356,7 @@
     const/4 v11, 0x0
 
     :goto_1
-    if-ge v5, v7, :cond_7
+    if-ge v5, v7, :cond_18
 
     invoke-direct {v0, v5}, Lcom/google/android/gms/internal/measurement/he;->eg(I)I
 
@@ -2345,60 +2364,64 @@
 
     iget-object v13, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    aget v13, v13, v5
+    aget v14, v13, v5
 
-    const/high16 v14, 0xff00000
+    const/high16 v15, 0xff00000
 
-    and-int/2addr v14, v12
+    and-int/2addr v15, v12
 
-    ushr-int/lit8 v14, v14, 0x14
+    ushr-int/lit8 v15, v15, 0x14
 
-    iget-boolean v15, v0, Lcom/google/android/gms/internal/measurement/he;->bea:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->bea:Z
 
     const v16, 0xfffff
 
-    if-nez v15, :cond_2
+    if-nez v4, :cond_2
 
-    const/16 v15, 0x11
+    const/16 v4, 0x11
 
-    if-gt v14, v15, :cond_2
+    if-gt v15, v4, :cond_2
 
-    iget-object v15, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    add-int/lit8 v4, v5, 0x2
 
-    add-int/lit8 v17, v5, 0x2
+    aget v4, v13, v4
 
-    aget v15, v15, v17
+    and-int v13, v4, v16
 
-    and-int v9, v15, v16
+    if-eq v13, v6, :cond_1
 
-    if-eq v9, v6, :cond_1
+    move-object/from16 v17, v10
 
-    move/from16 v18, v5
+    int-to-long v9, v13
 
-    int-to-long v4, v9
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v9, v10}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v11
 
-    move v6, v9
-
     goto :goto_2
 
     :cond_1
-    move/from16 v18, v5
+    move-object/from16 v17, v10
+
+    move v13, v6
 
     :goto_2
-    ushr-int/lit8 v4, v15, 0x14
+    ushr-int/lit8 v4, v4, 0x14
 
-    const/4 v5, 0x1
+    const/4 v6, 0x1
 
-    shl-int v9, v5, v4
+    shl-int v9, v6, v4
+
+    move v6, v13
+
+    move-object/from16 v10, v17
 
     goto :goto_3
 
     :cond_2
-    move/from16 v18, v5
+    move-object/from16 v17, v10
+
+    move-object/from16 v10, v17
 
     const/4 v9, 0x0
 
@@ -2411,7 +2434,7 @@
 
     move-result v4
 
-    if-gt v4, v13, :cond_4
+    if-gt v4, v14, :cond_4
 
     iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
 
@@ -2441,1250 +2464,1324 @@
     :cond_4
     and-int v4, v12, v16
 
-    int-to-long v4, v4
+    int-to-long v12, v4
 
-    packed-switch v14, :pswitch_data_0
+    packed-switch v15, :pswitch_data_0
 
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    :cond_5
-    :goto_4
-    const/4 v14, 0x0
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_0
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_5
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto :goto_4
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_5
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_1
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_6
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
+    const/4 v15, 0x0
 
-    goto :goto_4
+    goto/16 :goto_4
+
+    :cond_6
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_2
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
+    if-eqz v4, :cond_7
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_7
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_3
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_8
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
+    const/4 v15, 0x0
 
-    goto :goto_4
+    goto/16 :goto_4
+
+    :cond_8
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_4
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
+    if-eqz v4, :cond_9
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_9
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_5
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
+    if-eqz v4, :cond_a
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_a
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_6
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
+    if-eqz v4, :cond_b
 
-    goto :goto_4
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_b
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_7
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_c
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/em;
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_c
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_8
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_d
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_d
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_9
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_e
 
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-static {v13, v4, v2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
+    invoke-static {v14, v4, v2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_e
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_a
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->F(Ljava/lang/Object;J)Z
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
+    if-eqz v4, :cond_f
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->F(Ljava/lang/Object;J)Z
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_f
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_b
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
+    if-eqz v4, :cond_10
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_10
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_c
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_11
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_11
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_d
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
+    if-eqz v4, :cond_12
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_12
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_e
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_13
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_13
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_f
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_14
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_14
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_10
-    move/from16 v12, v18
-
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->C(Ljava/lang/Object;J)F
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
+    if-eqz v4, :cond_15
+
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->C(Ljava/lang/Object;J)F
+
+    move-result v4
+
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_15
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_11
-    move/from16 v12, v18
+    invoke-direct {v0, v1, v14, v5}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    invoke-direct {v0, v1, v13, v12}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v4
 
-    move-result v9
+    if-eqz v4, :cond_16
 
-    if-eqz v9, :cond_5
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/he;->B(Ljava/lang/Object;J)D
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/he;->B(Ljava/lang/Object;J)D
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
+
+    :cond_16
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_12
-    move/from16 v12, v18
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v2, v13, v4}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/jd;ILjava/lang/Object;)V
+    invoke-direct {v0, v2, v14, v4}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/jd;ILjava/lang/Object;)V
+
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_13
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+    move-result-object v12
 
-    move-result-object v5
+    invoke-static {v4, v9, v2, v12}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    invoke-static {v9, v4, v2, v5}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_14
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_5
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_15
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_6
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_16
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_7
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_17
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_8
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_18
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_9
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_19
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    goto/16 :goto_a
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_4
 
     :pswitch_1a
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1b
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1c
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1d
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1e
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_1f
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_20
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_21
-    move/from16 v12, v18
+    const/4 v14, 0x1
 
-    const/4 v13, 0x1
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_22
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    :goto_5
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_23
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_6
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_24
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_7
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_25
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_8
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_26
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_9
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_27
-    move/from16 v12, v18
+    const/4 v14, 0x0
 
-    const/4 v13, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :goto_a
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v13}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_28
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    invoke-static {v9, v4, v2}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_29
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+    move-result-object v12
 
-    move-result-object v5
+    invoke-static {v4, v9, v2, v12}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    invoke-static {v9, v4, v2, v5}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_2a
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    invoke-static {v9, v4, v2}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
+    const/4 v15, 0x0
 
     goto/16 :goto_4
 
     :pswitch_2b
-    move/from16 v12, v18
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2c
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2d
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2e
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_2f
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_30
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_31
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_32
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    aget v4, v4, v5
 
-    aget v9, v9, v12
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result-object v9
 
-    move-result-object v4
+    check-cast v9, Ljava/util/List;
 
-    check-cast v4, Ljava/util/List;
+    invoke-static {v4, v9, v2, v15}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    invoke-static {v9, v4, v2, v14}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_33
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_34
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_35
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_36
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
-
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_37
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_38
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_39
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3a
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/em;
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3b
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-direct {v0, v12}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+    invoke-direct {v0, v5}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
 
-    move-result-object v5
+    move-result-object v9
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+    invoke-interface {v2, v14, v4, v9}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3c
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-static {v13, v4, v2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
+    invoke-static {v14, v4, v2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    goto/16 :goto_b
+    goto/16 :goto_4
 
     :pswitch_3d
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->I(Ljava/lang/Object;J)Z
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/ip;->I(Ljava/lang/Object;J)Z
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_3e
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_3f
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
-
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_40
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_41
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
-
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_42
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-virtual {v8, v1, v12, v13}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
-    invoke-virtual {v8, v1, v4, v5}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
-
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_43
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
-
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->J(Ljava/lang/Object;J)F
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/ip;->J(Ljava/lang/Object;J)F
 
     move-result v4
 
-    invoke-interface {v2, v13, v4}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
 
-    goto :goto_b
+    goto :goto_4
 
     :pswitch_44
-    move/from16 v12, v18
+    const/4 v15, 0x0
 
-    const/4 v14, 0x0
+    and-int v4, v11, v9
 
-    and-int/2addr v9, v11
+    if-eqz v4, :cond_17
 
-    if-eqz v9, :cond_6
+    invoke-static {v1, v12, v13}, Lcom/google/android/gms/internal/measurement/ip;->K(Ljava/lang/Object;J)D
 
-    invoke-static {v1, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->K(Ljava/lang/Object;J)D
+    move-result-wide v12
 
-    move-result-wide v4
+    invoke-interface {v2, v14, v12, v13}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
 
-    invoke-interface {v2, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
-
-    :cond_6
-    :goto_b
-    add-int/lit8 v5, v12, 0x3
+    :cond_17
+    :goto_4
+    add-int/lit8 v5, v5, 0x3
 
     goto/16 :goto_1
 
-    :cond_7
-    :goto_c
-    if-eqz v10, :cond_9
+    :cond_18
+    move-object/from16 v17, v10
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
+    move-object/from16 v4, v17
 
-    invoke-virtual {v4, v10}, Lcom/google/android/gms/internal/measurement/fi;->g(Ljava/util/Map$Entry;)V
+    :goto_5
+    if-eqz v4, :cond_1a
+
+    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
+
+    invoke-virtual {v5, v4}, Lcom/google/android/gms/internal/measurement/fi;->g(Ljava/util/Map$Entry;)V
 
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
-    if-eqz v4, :cond_8
+    if-eqz v4, :cond_19
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -3692,16 +3789,14 @@
 
     check-cast v4, Ljava/util/Map$Entry;
 
-    move-object v10, v4
+    goto :goto_5
 
-    goto :goto_c
+    :cond_19
+    const/4 v4, 0x0
 
-    :cond_8
-    const/4 v10, 0x0
+    goto :goto_5
 
-    goto :goto_c
-
-    :cond_9
+    :cond_1a
     iget-object v3, v0, Lcom/google/android/gms/internal/measurement/he;->beh:Lcom/google/android/gms/internal/measurement/ij;
 
     invoke-static {v3, v1, v2}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/ij;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
@@ -3890,11 +3985,11 @@
     :try_start_0
     invoke-virtual {p0, p1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p0
 
     :catch_0
     invoke-virtual {p0}, Ljava/lang/Class;->getDeclaredFields()[Ljava/lang/reflect/Field;
@@ -3997,6 +4092,8 @@
     invoke-direct {v1, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method private final ee(I)Lcom/google/android/gms/internal/measurement/hr;
@@ -4017,7 +4114,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v0
 
@@ -4525,7 +4622,7 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_1f
+    if-eqz p3, :cond_20
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->beh:Lcom/google/android/gms/internal/measurement/ij;
 
@@ -4540,7 +4637,7 @@
     :cond_0
     :goto_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wo()I
 
     move-result v5
 
@@ -4659,12 +4756,9 @@
     move-result-object v4
 
     :cond_8
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wF()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wE()Ljava/lang/Object;
 
-    move-result-object v5
-
-    :goto_5
-    move-object v3, v5
+    move-result-object v3
 
     goto :goto_0
 
@@ -4673,9 +4767,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ij;->ba(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
-
-    move-object v3, v5
+    move-result-object v3
 
     :cond_a
     invoke-virtual {v0, v3, p2}, Lcom/google/android/gms/internal/measurement/ij;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hq;)Z
@@ -4688,7 +4780,7 @@
 
     iget p2, p0, Lcom/google/android/gms/internal/measurement/he;->bed:I
 
-    :goto_6
+    :goto_5
     iget p3, p0, Lcom/google/android/gms/internal/measurement/he;->bee:I
 
     if-ge p2, p3, :cond_b
@@ -4703,7 +4795,7 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_b
     if-eqz v3, :cond_c
@@ -4731,14 +4823,14 @@
 
     packed-switch v8, :pswitch_data_0
 
-    if-nez v3, :cond_17
+    if-nez v3, :cond_18
 
     :try_start_3
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ij;->xU()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ij;->xT()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    goto/16 :goto_1a
+    goto/16 :goto_a
 
     :pswitch_0
     and-int/2addr v6, v9
@@ -4755,7 +4847,6 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :goto_7
     invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
 
     goto/16 :goto_0
@@ -4765,7 +4856,7 @@
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wf()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->we()J
 
     move-result-wide v10
 
@@ -4775,14 +4866,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_2
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->we()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wd()I
 
     move-result v6
 
@@ -4792,14 +4885,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_3
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wd()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wc()J
 
     move-result-wide v10
 
@@ -4809,14 +4904,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_4
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wc()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wb()I
 
     move-result v6
 
@@ -4826,10 +4923,12 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_5
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wb()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wa()I
 
     move-result v8
 
@@ -4845,17 +4944,17 @@
 
     if-eqz v10, :cond_e
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_e
     invoke-static {v5, v8, v3, v0}, Lcom/google/android/gms/internal/measurement/ht;->a(IILjava/lang/Object;Lcom/google/android/gms/internal/measurement/ij;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    goto/16 :goto_5
+    goto/16 :goto_0
 
     :cond_f
-    :goto_8
+    :goto_6
     and-int/2addr v6, v9
 
     int-to-long v9, v6
@@ -4866,14 +4965,16 @@
 
     invoke-static {p1, v9, v10, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_6
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wa()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vZ()I
 
     move-result v6
 
@@ -4883,20 +4984,24 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_7
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v6
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_8
     invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -4927,7 +5032,7 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    goto :goto_7
 
     :cond_10
     and-int/2addr v6, v9
@@ -4946,19 +5051,24 @@
 
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
-    goto/16 :goto_7
+    :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_9
     invoke-direct {p0, p1, v6, p2}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/measurement/hq;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_a
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vX()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vW()Z
 
     move-result v6
 
@@ -4968,14 +5078,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_b
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vW()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vV()I
 
     move-result v6
 
@@ -4985,14 +5097,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_c
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vU()J
 
     move-result-wide v10
 
@@ -5002,14 +5116,16 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_d
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vU()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vT()I
 
     move-result v6
 
@@ -5019,13 +5135,34 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_e
     and-int/2addr v6, v9
 
     int-to-long v8, v6
 
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vR()J
+
+    move-result-wide v10
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v6
+
+    invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
+
+    :pswitch_f
+    and-int/2addr v6, v9
+
+    int-to-long v8, v6
+
     invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vS()J
 
     move-result-wide v10
@@ -5036,24 +5173,9 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
 
-    :pswitch_f
-    and-int/2addr v6, v9
-
-    int-to-long v8, v6
-
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vT()J
-
-    move-result-wide v10
-
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v6
-
-    invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
-
-    goto/16 :goto_7
+    goto/16 :goto_0
 
     :pswitch_10
     and-int/2addr v6, v9
@@ -5070,7 +5192,9 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_11
     and-int/2addr v6, v9
@@ -5087,7 +5211,9 @@
 
     invoke-static {p1, v8, v9, v6}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_7
+    invoke-direct {p0, p1, v5, v7}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_0
 
     :pswitch_12
     invoke-direct {p0, v7}, Lcom/google/android/gms/internal/measurement/he;->eg(I)I
@@ -5106,13 +5232,13 @@
 
     iget-object v7, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
-    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/gv;->xt()Ljava/lang/Object;
+    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/gv;->xs()Ljava/lang/Object;
 
     move-result-object v7
 
     invoke-static {p1, v5, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_11
     iget-object v8, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
@@ -5125,7 +5251,7 @@
 
     iget-object v8, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
-    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/gv;->xt()Ljava/lang/Object;
+    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/gv;->xs()Ljava/lang/Object;
 
     move-result-object v8
 
@@ -5138,7 +5264,7 @@
     move-object v7, v8
 
     :cond_12
-    :goto_9
+    :goto_8
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
     invoke-interface {v5, v7}, Lcom/google/android/gms/internal/measurement/gv;->aS(Ljava/lang/Object;)Ljava/util/Map;
@@ -5147,7 +5273,7 @@
 
     iget-object v6, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
-    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/gv;->xu()Lcom/google/android/gms/internal/measurement/gt;
+    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/gv;->xt()Lcom/google/android/gms/internal/measurement/gt;
 
     move-result-object v6
 
@@ -5185,7 +5311,6 @@
 
     move-result-object v5
 
-    :goto_a
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ae(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5201,7 +5326,6 @@
 
     move-result-object v5
 
-    :goto_b
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ad(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5217,7 +5341,6 @@
 
     move-result-object v5
 
-    :goto_c
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ac(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5233,7 +5356,6 @@
 
     move-result-object v5
 
-    :goto_d
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ab(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5255,12 +5377,11 @@
 
     move-result-object v7
 
-    :goto_e
     invoke-static {v5, v6, v7, v3, v0}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/fz;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/ij;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    goto/16 :goto_5
+    goto/16 :goto_0
 
     :pswitch_19
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5273,7 +5394,6 @@
 
     move-result-object v5
 
-    :goto_f
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->N(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5289,7 +5409,6 @@
 
     move-result-object v5
 
-    :goto_10
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->K(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5305,7 +5424,6 @@
 
     move-result-object v5
 
-    :goto_11
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->J(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5321,7 +5439,6 @@
 
     move-result-object v5
 
-    :goto_12
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->I(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5337,7 +5454,6 @@
 
     move-result-object v5
 
-    :goto_13
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->H(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5353,7 +5469,6 @@
 
     move-result-object v5
 
-    :goto_14
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->F(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5369,7 +5484,6 @@
 
     move-result-object v5
 
-    :goto_15
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->G(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5385,7 +5499,6 @@
 
     move-result-object v5
 
-    :goto_16
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->E(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5401,7 +5514,6 @@
 
     move-result-object v5
 
-    :goto_17
     invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->D(Ljava/util/List;)V
 
     goto/16 :goto_0
@@ -5417,7 +5529,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_a
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ae(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_23
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5430,7 +5544,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_b
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ad(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_24
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5443,7 +5559,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_c
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ac(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_25
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5456,7 +5574,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_d
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->ab(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_26
     iget-object v8, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5475,7 +5595,11 @@
 
     move-result-object v7
 
-    goto/16 :goto_e
+    invoke-static {v5, v6, v7, v3, v0}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/fz;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/ij;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    goto/16 :goto_0
 
     :pswitch_27
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5488,7 +5612,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_f
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->N(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_28
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5571,7 +5697,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_10
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->K(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2c
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5584,7 +5712,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_11
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->J(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2d
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5597,7 +5727,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_12
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->I(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2e
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5610,7 +5742,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_13
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->H(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_2f
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5623,7 +5757,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_14
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->F(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_30
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5636,7 +5772,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_15
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->G(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_31
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5649,7 +5787,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_16
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->E(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_32
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
@@ -5662,7 +5802,9 @@
 
     move-result-object v5
 
-    goto/16 :goto_17
+    invoke-interface {p2, v5}, Lcom/google/android/gms/internal/measurement/hq;->D(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_33
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -5691,7 +5833,6 @@
 
     move-result-object v7
 
-    :goto_18
     invoke-static {p1, v5, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
     goto/16 :goto_0
@@ -5711,7 +5852,6 @@
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :goto_19
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
     goto/16 :goto_0
@@ -5721,55 +5861,63 @@
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wf()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->we()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_35
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->we()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wd()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_36
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wd()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wc()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_37
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wc()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wb()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_38
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wb()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wa()I
 
     move-result v8
 
@@ -5777,55 +5925,71 @@
 
     move-result-object v10
 
-    if-eqz v10, :cond_15
+    if-eqz v10, :cond_16
 
     invoke-interface {v10, v8}, Lcom/google/android/gms/internal/measurement/fz;->dE(I)Z
 
     move-result v10
 
-    if-eqz v10, :cond_e
+    if-eqz v10, :cond_15
+
+    goto :goto_9
 
     :cond_15
+    invoke-static {v5, v8, v3, v0}, Lcom/google/android/gms/internal/measurement/ht;->a(IILjava/lang/Object;Lcom/google/android/gms/internal/measurement/ij;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    goto/16 :goto_0
+
+    :cond_16
+    :goto_9
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_39
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wa()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vZ()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3a
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3b
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v5
 
-    if-eqz v5, :cond_16
+    if-eqz v5, :cond_17
 
     and-int v5, v6, v9
 
@@ -5847,9 +6011,11 @@
 
     move-result-object v7
 
-    goto/16 :goto_18
+    invoke-static {p1, v5, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    :cond_16
+    goto/16 :goto_0
+
+    :cond_17
     and-int v5, v6, v9
 
     int-to-long v5, v5
@@ -5864,90 +6030,106 @@
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3c
     invoke-direct {p0, p1, v6, p2}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/measurement/hq;)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3d
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vX()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vW()Z
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JZ)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3e
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vW()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vV()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_3f
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vU()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_40
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vU()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vT()I
 
     move-result v8
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_41
     and-int v5, v6, v9
 
     int-to-long v5, v5
 
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vR()J
+
+    move-result-wide v8
+
+    invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
+
+    :pswitch_42
+    and-int v5, v6, v9
+
+    int-to-long v5, v5
+
     invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vS()J
 
     move-result-wide v8
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
-    :pswitch_42
-    and-int v5, v6, v9
-
-    int-to-long v5, v5
-
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vT()J
-
-    move-result-wide v8
-
-    invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
-
-    goto/16 :goto_19
+    goto/16 :goto_0
 
     :pswitch_43
     and-int v5, v6, v9
@@ -5960,7 +6142,9 @@
 
     invoke-static {p1, v5, v6, v8}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JF)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_0
 
     :pswitch_44
     and-int v5, v6, v9
@@ -5973,12 +6157,12 @@
 
     invoke-static {p1, v5, v6, v8, v9}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JD)V
 
-    goto/16 :goto_19
+    invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
-    :goto_1a
-    move-object v3, v5
+    goto/16 :goto_0
 
-    :cond_17
+    :cond_18
+    :goto_a
     invoke-virtual {v0, v3, p2}, Lcom/google/android/gms/internal/measurement/ij;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hq;)Z
 
     move-result v5
@@ -5990,10 +6174,10 @@
 
     iget p2, p0, Lcom/google/android/gms/internal/measurement/he;->bed:I
 
-    :goto_1b
+    :goto_b
     iget p3, p0, Lcom/google/android/gms/internal/measurement/he;->bee:I
 
-    if-ge p2, p3, :cond_18
+    if-ge p2, p3, :cond_19
 
     iget-object p3, p0, Lcom/google/android/gms/internal/measurement/he;->bec:[I
 
@@ -6005,27 +6189,25 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    goto :goto_1b
+    goto :goto_b
 
-    :cond_18
-    if-eqz v3, :cond_19
+    :cond_19
+    if-eqz v3, :cond_1a
 
     invoke-virtual {v0, p1, v3}, Lcom/google/android/gms/internal/measurement/ij;->o(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_19
+    :cond_1a
     return-void
 
     :catch_0
-    if-nez v3, :cond_1a
+    if-nez v3, :cond_1b
 
     :try_start_4
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ij;->ba(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    move-object v3, v5
-
-    :cond_1a
+    :cond_1b
     invoke-virtual {v0, v3, p2}, Lcom/google/android/gms/internal/measurement/ij;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hq;)Z
 
     move-result v5
@@ -6036,10 +6218,10 @@
 
     iget p2, p0, Lcom/google/android/gms/internal/measurement/he;->bed:I
 
-    :goto_1c
+    :goto_c
     iget p3, p0, Lcom/google/android/gms/internal/measurement/he;->bee:I
 
-    if-ge p2, p3, :cond_1b
+    if-ge p2, p3, :cond_1c
 
     iget-object p3, p0, Lcom/google/android/gms/internal/measurement/he;->bec:[I
 
@@ -6051,14 +6233,14 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    goto :goto_1c
+    goto :goto_c
 
-    :cond_1b
-    if-eqz v3, :cond_1c
+    :cond_1c
+    if-eqz v3, :cond_1d
 
     invoke-virtual {v0, p1, v3}, Lcom/google/android/gms/internal/measurement/ij;->o(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_1c
+    :cond_1d
     return-void
 
     :catchall_0
@@ -6066,10 +6248,10 @@
 
     iget p3, p0, Lcom/google/android/gms/internal/measurement/he;->bed:I
 
-    :goto_1d
+    :goto_d
     iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->bee:I
 
-    if-ge p3, v1, :cond_1d
+    if-ge p3, v1, :cond_1e
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/he;->bec:[I
 
@@ -6081,24 +6263,24 @@
 
     add-int/lit8 p3, p3, 0x1
 
-    goto :goto_1d
+    goto :goto_d
 
-    :cond_1d
-    if-eqz v3, :cond_1e
+    :cond_1e
+    if-eqz v3, :cond_1f
 
     invoke-virtual {v0, p1, v3}, Lcom/google/android/gms/internal/measurement/ij;->o(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_1e
+    :cond_1f
     throw p2
 
-    :cond_1f
+    :cond_20
     new-instance p1, Ljava/lang/NullPointerException;
 
     invoke-direct {p1}, Ljava/lang/NullPointerException;-><init>()V
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -6190,7 +6372,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/jd;->wy()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/jd;->wx()I
 
     move-result v0
 
@@ -6238,7 +6420,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->xO()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/util/Set;
 
     move-result-object v0
 
@@ -6255,7 +6437,7 @@
     :cond_0
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->xO()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/util/Set;
 
     move-result-object v0
 
@@ -6336,7 +6518,7 @@
 
     packed-switch v10, :pswitch_data_0
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_0
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6345,6 +6527,20 @@
 
     if-eqz v10, :cond_4
 
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-direct {p0, v7}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v10
+
+    invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+
     goto/16 :goto_4
 
     :pswitch_1
@@ -6362,7 +6558,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_5
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_2
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6379,7 +6577,9 @@
 
     move-result v8
 
-    goto/16 :goto_6
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
+
+    goto/16 :goto_4
 
     :pswitch_3
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6396,7 +6596,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_7
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_4
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6413,7 +6615,9 @@
 
     move-result v8
 
-    goto/16 :goto_8
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
+
+    goto/16 :goto_4
 
     :pswitch_5
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6430,7 +6634,9 @@
 
     move-result v8
 
-    goto/16 :goto_9
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
+
+    goto/16 :goto_4
 
     :pswitch_6
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6447,7 +6653,9 @@
 
     move-result v8
 
-    goto/16 :goto_a
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
+
+    goto/16 :goto_4
 
     :pswitch_7
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6456,7 +6664,19 @@
 
     if-eqz v10, :cond_4
 
-    goto/16 :goto_b
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lcom/google/android/gms/internal/measurement/em;
+
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
+
+    goto/16 :goto_4
 
     :pswitch_8
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6465,7 +6685,21 @@
 
     if-eqz v10, :cond_4
 
-    goto/16 :goto_c
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-direct {p0, v7}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v10
+
+    invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+
+    goto/16 :goto_4
 
     :pswitch_9
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6474,7 +6708,17 @@
 
     if-eqz v10, :cond_4
 
-    goto/16 :goto_d
+    and-int/2addr v8, v6
+
+    int-to-long v10, v8
+
+    invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
+
+    goto/16 :goto_4
 
     :pswitch_a
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6491,7 +6735,9 @@
 
     move-result v8
 
-    goto/16 :goto_e
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
+
+    goto/16 :goto_4
 
     :pswitch_b
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6508,7 +6754,9 @@
 
     move-result v8
 
-    goto/16 :goto_f
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
+
+    goto/16 :goto_4
 
     :pswitch_c
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6525,7 +6773,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_10
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_d
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6542,7 +6792,9 @@
 
     move-result v8
 
-    goto/16 :goto_11
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
+
+    goto/16 :goto_4
 
     :pswitch_e
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6559,7 +6811,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_12
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_f
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6576,7 +6830,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_13
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
+
+    goto/16 :goto_4
 
     :pswitch_10
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6593,7 +6849,9 @@
 
     move-result v8
 
-    goto/16 :goto_14
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
+
+    goto/16 :goto_4
 
     :pswitch_11
     invoke-direct {p0, p1, v9, v7}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -6610,7 +6868,9 @@
 
     move-result-wide v10
 
-    goto/16 :goto_15
+    invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
+
+    goto/16 :goto_4
 
     :pswitch_12
     and-int/2addr v8, v6
@@ -6623,7 +6883,7 @@
 
     invoke-direct {p0, p2, v9, v8}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/jd;ILjava/lang/Object;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_13
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6646,7 +6906,7 @@
 
     invoke-static {v9, v8, p2, v10}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_14
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6665,7 +6925,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_15
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6684,7 +6944,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_16
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6703,7 +6963,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_17
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6722,7 +6982,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_18
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6741,7 +7001,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_19
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6760,7 +7020,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1a
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6779,7 +7039,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1b
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6798,7 +7058,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1c
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6817,7 +7077,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1d
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6836,7 +7096,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1e
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6855,7 +7115,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_1f
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6874,7 +7134,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_20
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6893,7 +7153,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_21
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6912,7 +7172,7 @@
 
     invoke-static {v9, v8, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_22
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6931,7 +7191,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_23
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6950,7 +7210,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_24
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6969,7 +7229,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_25
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -6988,7 +7248,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_26
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7007,7 +7267,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_27
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7026,7 +7286,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_28
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7045,7 +7305,7 @@
 
     invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_29
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7068,7 +7328,7 @@
 
     invoke-static {v9, v8, p2, v10}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2a
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7087,7 +7347,7 @@
 
     invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2b
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7106,7 +7366,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2c
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7125,7 +7385,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2d
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7144,7 +7404,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2e
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7163,7 +7423,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_2f
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7182,7 +7442,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_30
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7201,7 +7461,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_31
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7220,7 +7480,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_32
     iget-object v9, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -7239,7 +7499,7 @@
 
     invoke-static {v9, v8, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_33
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7248,7 +7508,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_4
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7263,7 +7522,7 @@
 
     invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_34
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7280,10 +7539,9 @@
 
     move-result-wide v10
 
-    :goto_5
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_35
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7300,10 +7558,9 @@
 
     move-result v8
 
-    :goto_6
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_36
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7320,10 +7577,9 @@
 
     move-result-wide v10
 
-    :goto_7
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_37
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7340,10 +7596,9 @@
 
     move-result v8
 
-    :goto_8
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_38
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7360,10 +7615,9 @@
 
     move-result v8
 
-    :goto_9
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_39
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7380,10 +7634,9 @@
 
     move-result v8
 
-    :goto_a
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3a
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7392,7 +7645,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_b
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7405,7 +7657,7 @@
 
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3b
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7414,7 +7666,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_c
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7429,7 +7680,7 @@
 
     invoke-interface {p2, v9, v8, v10}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3c
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7438,7 +7689,6 @@
 
     if-eqz v10, :cond_4
 
-    :goto_d
     and-int/2addr v8, v6
 
     int-to-long v10, v8
@@ -7449,7 +7699,7 @@
 
     invoke-static {v9, v8, p2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3d
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7466,10 +7716,9 @@
 
     move-result v8
 
-    :goto_e
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
 
-    goto/16 :goto_16
+    goto/16 :goto_4
 
     :pswitch_3e
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7486,10 +7735,9 @@
 
     move-result v8
 
-    :goto_f
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_3f
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7506,10 +7754,9 @@
 
     move-result-wide v10
 
-    :goto_10
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_40
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7526,10 +7773,9 @@
 
     move-result v8
 
-    :goto_11
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_41
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7546,10 +7792,9 @@
 
     move-result-wide v10
 
-    :goto_12
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_42
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7566,10 +7811,9 @@
 
     move-result-wide v10
 
-    :goto_13
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_43
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7586,10 +7830,9 @@
 
     move-result v8
 
-    :goto_14
     invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
 
-    goto :goto_16
+    goto :goto_4
 
     :pswitch_44
     invoke-direct {p0, p1, v7}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -7606,17 +7849,16 @@
 
     move-result-wide v10
 
-    :goto_15
     invoke-interface {p2, v9, v10, v11}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
 
     :cond_4
-    :goto_16
+    :goto_4
     add-int/lit8 v7, v7, -0x3
 
     goto/16 :goto_2
 
     :cond_5
-    :goto_17
+    :goto_5
     if-eqz v1, :cond_7
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
@@ -7637,12 +7879,12 @@
 
     move-object v1, p1
 
-    goto :goto_17
+    goto :goto_5
 
     :cond_6
     move-object v1, v3
 
-    goto :goto_17
+    goto :goto_5
 
     :cond_7
     return-void
@@ -7680,14 +7922,14 @@
 
     check-cast v1, Ljava/util/Map$Entry;
 
-    goto :goto_18
+    goto :goto_6
 
     :cond_9
     move-object v0, v3
 
     move-object v1, v0
 
-    :goto_18
+    :goto_6
     iget-object v7, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
     array-length v7, v7
@@ -7696,7 +7938,7 @@
 
     const/4 v1, 0x0
 
-    :goto_19
+    :goto_7
     if-ge v1, v7, :cond_d
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/internal/measurement/he;->eg(I)I
@@ -7707,7 +7949,7 @@
 
     aget v10, v10, v1
 
-    :goto_1a
+    :goto_8
     if-eqz v8, :cond_b
 
     iget-object v11, p0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
@@ -7734,12 +7976,12 @@
 
     check-cast v8, Ljava/util/Map$Entry;
 
-    goto :goto_1a
+    goto :goto_8
 
     :cond_a
     move-object v8, v3
 
-    goto :goto_1a
+    goto :goto_8
 
     :cond_b
     and-int v11, v9, v2
@@ -7748,7 +7990,7 @@
 
     packed-switch v11, :pswitch_data_1
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_45
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7757,7 +7999,21 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_1b
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-direct {p0, v1}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v11
+
+    invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+
+    goto/16 :goto_9
 
     :pswitch_46
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7774,7 +8030,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_1c
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_47
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7791,7 +8049,9 @@
 
     move-result v9
 
-    goto/16 :goto_1d
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
+
+    goto/16 :goto_9
 
     :pswitch_48
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7808,7 +8068,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_1e
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_49
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7825,7 +8087,9 @@
 
     move-result v9
 
-    goto/16 :goto_1f
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
+
+    goto/16 :goto_9
 
     :pswitch_4a
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7842,7 +8106,9 @@
 
     move-result v9
 
-    goto/16 :goto_20
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
+
+    goto/16 :goto_9
 
     :pswitch_4b
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7859,7 +8125,9 @@
 
     move-result v9
 
-    goto/16 :goto_21
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
+
+    goto/16 :goto_9
 
     :pswitch_4c
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7868,7 +8136,19 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_22
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Lcom/google/android/gms/internal/measurement/em;
+
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
+
+    goto/16 :goto_9
 
     :pswitch_4d
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7877,7 +8157,21 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_23
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-direct {p0, v1}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v11
+
+    invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
+
+    goto/16 :goto_9
 
     :pswitch_4e
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7886,7 +8180,17 @@
 
     if-eqz v11, :cond_c
 
-    goto/16 :goto_24
+    and-int/2addr v9, v6
+
+    int-to-long v11, v9
+
+    invoke-static {p1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
+
+    goto/16 :goto_9
 
     :pswitch_4f
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7903,7 +8207,9 @@
 
     move-result v9
 
-    goto/16 :goto_25
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
+
+    goto/16 :goto_9
 
     :pswitch_50
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7920,7 +8226,9 @@
 
     move-result v9
 
-    goto/16 :goto_26
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
+
+    goto/16 :goto_9
 
     :pswitch_51
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7937,7 +8245,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_27
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_52
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7954,7 +8264,9 @@
 
     move-result v9
 
-    goto/16 :goto_28
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
+
+    goto/16 :goto_9
 
     :pswitch_53
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7971,7 +8283,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_29
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_54
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -7988,7 +8302,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_2a
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
+
+    goto/16 :goto_9
 
     :pswitch_55
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -8005,7 +8321,9 @@
 
     move-result v9
 
-    goto/16 :goto_2b
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
+
+    goto/16 :goto_9
 
     :pswitch_56
     invoke-direct {p0, p1, v10, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
@@ -8022,7 +8340,9 @@
 
     move-result-wide v11
 
-    goto/16 :goto_2c
+    invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
+
+    goto/16 :goto_9
 
     :pswitch_57
     and-int/2addr v9, v6
@@ -8035,7 +8355,7 @@
 
     invoke-direct {p0, p2, v10, v9}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/jd;ILjava/lang/Object;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_58
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8058,7 +8378,7 @@
 
     invoke-static {v10, v9, p2, v11}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_59
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8077,7 +8397,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5a
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8096,7 +8416,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5b
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8115,7 +8435,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5c
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8134,7 +8454,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5d
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8153,7 +8473,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5e
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8172,7 +8492,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_5f
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8191,7 +8511,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_60
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8210,7 +8530,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_61
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8229,7 +8549,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_62
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8248,7 +8568,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_63
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8267,7 +8587,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_64
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8286,7 +8606,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_65
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8305,7 +8625,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_66
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8324,7 +8644,7 @@
 
     invoke-static {v10, v9, p2, v4}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_67
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8343,7 +8663,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_68
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8362,7 +8682,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_69
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8381,7 +8701,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6a
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8400,7 +8720,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6b
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8419,7 +8739,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6c
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8438,7 +8758,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6d
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8457,7 +8777,7 @@
 
     invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6e
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8480,7 +8800,7 @@
 
     invoke-static {v10, v9, p2, v11}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_6f
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8499,7 +8819,7 @@
 
     invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_70
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8518,7 +8838,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_71
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8537,7 +8857,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_72
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8556,7 +8876,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_73
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8575,7 +8895,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_74
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8594,7 +8914,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_75
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8613,7 +8933,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_76
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8632,7 +8952,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->b(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_77
     iget-object v10, p0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
@@ -8651,7 +8971,7 @@
 
     invoke-static {v10, v9, p2, v5}, Lcom/google/android/gms/internal/measurement/ht;->a(ILjava/util/List;Lcom/google/android/gms/internal/measurement/jd;Z)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_78
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8660,7 +8980,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_1b
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8675,7 +8994,7 @@
 
     invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/measurement/jd;->b(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_79
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8692,10 +9011,9 @@
 
     move-result-wide v11
 
-    :goto_1c
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->d(IJ)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7a
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8712,10 +9030,9 @@
 
     move-result v9
 
-    :goto_1d
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->C(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7b
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8732,10 +9049,9 @@
 
     move-result-wide v11
 
-    :goto_1e
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->j(IJ)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7c
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8752,10 +9068,9 @@
 
     move-result v9
 
-    :goto_1f
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->I(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7d
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8772,10 +9087,9 @@
 
     move-result v9
 
-    :goto_20
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->J(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7e
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8792,10 +9106,9 @@
 
     move-result v9
 
-    :goto_21
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->B(II)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_7f
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8804,7 +9117,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_22
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8817,7 +9129,7 @@
 
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->a(ILcom/google/android/gms/internal/measurement/em;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_80
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8826,7 +9138,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_23
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8841,7 +9152,7 @@
 
     invoke-interface {p2, v10, v9, v11}, Lcom/google/android/gms/internal/measurement/jd;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_81
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8850,7 +9161,6 @@
 
     if-eqz v11, :cond_c
 
-    :goto_24
     and-int/2addr v9, v6
 
     int-to-long v11, v9
@@ -8861,7 +9171,7 @@
 
     invoke-static {v10, v9, p2}, Lcom/google/android/gms/internal/measurement/he;->a(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_82
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8878,10 +9188,9 @@
 
     move-result v9
 
-    :goto_25
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->d(IZ)V
 
-    goto/16 :goto_2d
+    goto/16 :goto_9
 
     :pswitch_83
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8898,10 +9207,9 @@
 
     move-result v9
 
-    :goto_26
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->N(II)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_84
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8918,10 +9226,9 @@
 
     move-result-wide v11
 
-    :goto_27
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->e(IJ)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_85
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8938,10 +9245,9 @@
 
     move-result v9
 
-    :goto_28
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->A(II)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_86
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8958,10 +9264,9 @@
 
     move-result-wide v11
 
-    :goto_29
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->c(IJ)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_87
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8978,10 +9283,9 @@
 
     move-result-wide v11
 
-    :goto_2a
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->i(IJ)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_88
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -8998,10 +9302,9 @@
 
     move-result v9
 
-    :goto_2b
     invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/jd;->b(IF)V
 
-    goto :goto_2d
+    goto :goto_9
 
     :pswitch_89
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -9018,17 +9321,16 @@
 
     move-result-wide v11
 
-    :goto_2c
     invoke-interface {p2, v10, v11, v12}, Lcom/google/android/gms/internal/measurement/jd;->a(ID)V
 
     :cond_c
-    :goto_2d
+    :goto_9
     add-int/lit8 v1, v1, 0x3
 
-    goto/16 :goto_19
+    goto/16 :goto_7
 
     :cond_d
-    :goto_2e
+    :goto_a
     if-eqz v8, :cond_f
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
@@ -9049,12 +9351,12 @@
 
     move-object v8, v1
 
-    goto :goto_2e
+    goto :goto_a
 
     :cond_e
     move-object v8, v3
 
-    goto :goto_2e
+    goto :goto_a
 
     :cond_f
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->beh:Lcom/google/android/gms/internal/measurement/ij;
@@ -9270,8 +9572,6 @@
 
     array-length v0, v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->bee:I
-
     :goto_1
     if-ge v1, v0, :cond_2
 
@@ -9326,7 +9626,7 @@
 
     const/4 v5, 0x0
 
-    if-eqz v2, :cond_5
+    if-eqz v2, :cond_13
 
     sget-object v2, Lcom/google/android/gms/internal/measurement/he;->bdS:Lsun/misc/Unsafe;
 
@@ -9339,7 +9639,7 @@
 
     array-length v8, v8
 
-    if-ge v6, v8, :cond_4
+    if-ge v6, v8, :cond_12
 
     invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->eg(I)I
 
@@ -9385,676 +9685,15 @@
     :goto_1
     packed-switch v9, :pswitch_data_0
 
-    goto/16 :goto_17
+    goto/16 :goto_2
 
     :pswitch_0
     invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    goto/16 :goto_4
-
-    :pswitch_1
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    goto/16 :goto_5
-
-    :pswitch_2
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
-
-    move-result v8
-
-    goto/16 :goto_6
-
-    :pswitch_3
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_7
-
-    :pswitch_4
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_8
-
-    :pswitch_5
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
-
-    move-result v8
-
-    goto/16 :goto_9
-
-    :pswitch_6
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
-
-    move-result v8
-
-    goto/16 :goto_a
-
-    :pswitch_7
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_b
-
-    :pswitch_8
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_d
-
-    :pswitch_9
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v8
-
-    instance-of v9, v8, Lcom/google/android/gms/internal/measurement/em;
-
-    if-eqz v9, :cond_2
-
-    goto/16 :goto_e
-
-    :pswitch_a
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_f
-
-    :pswitch_b
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_10
-
-    :pswitch_c
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_11
-
-    :pswitch_d
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
-
-    move-result v8
-
-    goto/16 :goto_12
-
-    :pswitch_e
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    goto/16 :goto_13
-
-    :pswitch_f
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    goto/16 :goto_14
-
-    :pswitch_10
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_15
-
-    :pswitch_11
-    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    goto/16 :goto_16
-
-    :pswitch_12
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
-
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    invoke-interface {v8, v9}, Lcom/google/android/gms/internal/measurement/gv;->ak(Ljava/lang/Object;)I
-
-    move-result v8
-
-    goto/16 :goto_3
-
-    :pswitch_13
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
-
-    move-result-object v9
-
-    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
-
-    move-result v8
-
-    goto/16 :goto_3
-
-    :pswitch_14
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->V(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_15
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ag(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_16
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_17
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_18
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->W(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_19
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->af(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_1a
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->aj(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_1b
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_1c
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_1d
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->X(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_1e
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->U(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_1f
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->T(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_20
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    goto :goto_2
-
-    :pswitch_21
-    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/util/List;
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
-
-    move-result v9
-
-    if-lez v9, :cond_3
-
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v11, :cond_1
-
-    :goto_2
-    int-to-long v11, v8
-
-    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
-
-    :cond_1
-    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
-
-    move-result v8
-
-    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
-
-    move-result v10
-
-    add-int/2addr v8, v10
-
-    add-int/2addr v8, v9
-
-    goto/16 :goto_3
-
-    :pswitch_22
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;)I
-
-    move-result v8
-
-    goto/16 :goto_3
-
-    :pswitch_23
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_24
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_25
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_26
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_27
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
-
-    move-result-object v9
-
-    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_28
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_29
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_2a
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_2b
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_2c
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_2d
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
-
-    move-result v8
-
-    goto :goto_3
-
-    :pswitch_2e
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
-
-    move-result-object v8
-
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
-
-    move-result v8
-
-    :goto_3
-    add-int/2addr v7, v8
-
-    goto/16 :goto_17
-
-    :pswitch_2f
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    :goto_4
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v8
@@ -10069,137 +9708,144 @@
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_30
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_1
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
     move-result-wide v8
 
-    :goto_5
     invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->h(IJ)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_31
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_2
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
 
     move-result v8
 
-    :goto_6
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->ad(II)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_32
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_3
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_7
     invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bs(I)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_33
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_4
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_8
     invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dU(I)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_34
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_5
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
 
     move-result v8
 
-    :goto_9
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->S(II)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_35
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_6
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
 
     move-result v8
 
-    :goto_a
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->F(II)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_36
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_7
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_b
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v8
 
-    :goto_c
     check-cast v8, Lcom/google/android/gms/internal/measurement/em;
 
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
 
     move-result v8
 
-    goto :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_37
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_8
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_d
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v8
@@ -10212,14 +9858,16 @@
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
 
-    :pswitch_38
-    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    goto/16 :goto_2
+
+    :pswitch_9
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -10227,151 +9875,1298 @@
 
     instance-of v9, v8, Lcom/google/android/gms/internal/measurement/em;
 
-    if-eqz v9, :cond_2
+    if-eqz v9, :cond_1
 
-    :goto_e
-    goto :goto_c
+    check-cast v8, Lcom/google/android/gms/internal/measurement/em;
 
-    :cond_2
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :cond_1
     check-cast v8, Ljava/lang/String;
 
     invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->f(ILjava/lang/String;)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_a
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bv(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_b
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bq(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_c
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->br(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_d
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->E(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_e
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->g(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_f
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->f(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_10
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bt(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_11
+    invoke-direct {v0, v1, v10, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bu(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_12
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-interface {v8, v9}, Lcom/google/android/gms/internal/measurement/gv;->ak(Ljava/lang/Object;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_13
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v9
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_14
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->V(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_2
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_2
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_15
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ag(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_3
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_3
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_16
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_4
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_4
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_17
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_5
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_5
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_18
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->W(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_6
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_6
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_19
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->af(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_7
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_7
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1a
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->aj(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_8
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_8
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1b
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_9
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_9
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1c
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_a
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_a
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1d
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->X(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_b
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_b
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1e
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->U(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_c
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_c
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_1f
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->T(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_d
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_d
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_20
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_e
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_e
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_21
+    invoke-virtual {v2, v1, v11, v12}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/List;
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
+
+    move-result v9
+
+    if-lez v9, :cond_11
+
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v11, :cond_f
+
+    int-to-long v11, v8
+
+    invoke-virtual {v2, v1, v11, v12, v9}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_f
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v8
+
+    invoke-static {v9}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v8, v10
+
+    add-int/2addr v8, v9
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_22
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_23
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_24
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_25
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_26
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_27
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_28
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_29
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v9
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_2a
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_2b
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_2c
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_2d
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_2e
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_2f
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_30
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_31
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_32
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/he;->A(Ljava/lang/Object;J)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_33
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lcom/google/android/gms/internal/measurement/ha;
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v9
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/ha;Lcom/google/android/gms/internal/measurement/hr;)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_34
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->h(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_35
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->ad(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_36
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bs(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_37
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->dU(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :pswitch_38
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->S(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_39
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_f
-    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bv(I)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
 
     move-result v8
 
-    goto/16 :goto_3
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->F(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_3a
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_10
-    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bq(I)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lcom/google/android/gms/internal/measurement/em;
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_3b
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_11
-    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->br(I)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v9
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_3c
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v8
+
+    instance-of v9, v8, Lcom/google/android/gms/internal/measurement/em;
+
+    if-eqz v9, :cond_10
+
+    check-cast v8, Lcom/google/android/gms/internal/measurement/em;
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
 
     move-result v8
 
-    :goto_12
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->E(II)I
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
+
+    :cond_10
+    check-cast v8, Ljava/lang/String;
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->f(ILjava/lang/String;)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto/16 :goto_2
 
     :pswitch_3d
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    :goto_13
-    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->g(IJ)I
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bv(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto :goto_2
 
     :pswitch_3e
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v8
-
-    :goto_14
-    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->f(IJ)I
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bq(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto :goto_2
 
     :pswitch_3f
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
 
-    :goto_15
-    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bt(I)I
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->br(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
+
+    goto :goto_2
 
     :pswitch_40
     invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v8
+
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/fb;->E(II)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_41
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->g(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_42
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v8
+
+    invoke-static {v10, v8, v9}, Lcom/google/android/gms/internal/measurement/fb;->f(IJ)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_43
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bt(I)I
+
+    move-result v8
+
+    add-int/2addr v7, v8
+
+    goto :goto_2
+
+    :pswitch_44
+    invoke-direct {v0, v1, v6}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
 
-    :goto_16
     invoke-static {v10}, Lcom/google/android/gms/internal/measurement/fb;->bu(I)I
 
     move-result v8
 
-    goto/16 :goto_3
+    add-int/2addr v7, v8
 
-    :cond_3
-    :goto_17
+    :cond_11
+    :goto_2
     add-int/lit8 v6, v6, 0x3
 
     goto/16 :goto_0
 
-    :cond_4
+    :cond_12
     iget-object v2, v0, Lcom/google/android/gms/internal/measurement/he;->beh:Lcom/google/android/gms/internal/measurement/ij;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/ij;Ljava/lang/Object;)I
@@ -10382,7 +11177,7 @@
 
     return v7
 
-    :cond_5
+    :cond_13
     sget-object v2, Lcom/google/android/gms/internal/measurement/he;->bdS:Lsun/misc/Unsafe;
 
     const/4 v6, -0x1
@@ -10395,12 +11190,12 @@
 
     const/4 v9, 0x0
 
-    :goto_18
+    :goto_3
     iget-object v10, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
     array-length v10, v10
 
-    if-ge v6, v10, :cond_c
+    if-ge v6, v10, :cond_28
 
     invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->eg(I)I
 
@@ -10408,31 +11203,29 @@
 
     iget-object v11, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
-    aget v11, v11, v6
+    aget v12, v11, v6
 
-    and-int v12, v10, v3
+    and-int v13, v10, v3
 
-    ushr-int/lit8 v12, v12, 0x14
+    ushr-int/lit8 v13, v13, 0x14
 
-    const/16 v13, 0x11
+    const/16 v14, 0x11
 
-    if-gt v12, v13, :cond_7
-
-    iget-object v13, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    if-gt v13, v14, :cond_15
 
     add-int/lit8 v14, v6, 0x2
 
-    aget v13, v13, v14
+    aget v11, v11, v14
 
-    and-int v14, v13, v4
+    and-int v14, v11, v4
 
-    ushr-int/lit8 v15, v13, 0x14
+    ushr-int/lit8 v15, v11, 0x14
 
     const/16 v16, 0x1
 
     shl-int v15, v16, v15
 
-    if-eq v14, v8, :cond_6
+    if-eq v14, v8, :cond_14
 
     int-to-long v8, v14
 
@@ -10440,161 +11233,240 @@
 
     move-result v9
 
-    goto :goto_19
+    goto :goto_4
 
-    :cond_6
+    :cond_14
     move v14, v8
 
-    :goto_19
+    :goto_4
     move v8, v14
 
-    goto :goto_1b
+    goto :goto_5
 
-    :cond_7
-    iget-boolean v13, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+    :cond_15
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
 
-    if-eqz v13, :cond_8
+    if-eqz v11, :cond_16
 
-    sget-object v13, Lcom/google/android/gms/internal/measurement/fo;->bck:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bck:Lcom/google/android/gms/internal/measurement/fo;
 
-    iget v13, v13, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
 
-    if-lt v12, v13, :cond_8
+    if-lt v13, v11, :cond_16
 
-    sget-object v13, Lcom/google/android/gms/internal/measurement/fo;->bcx:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fo;->bcx:Lcom/google/android/gms/internal/measurement/fo;
 
-    iget v13, v13, Lcom/google/android/gms/internal/measurement/fo;->id:I
+    iget v11, v11, Lcom/google/android/gms/internal/measurement/fo;->id:I
 
-    if-gt v12, v13, :cond_8
+    if-gt v13, v11, :cond_16
 
-    iget-object v13, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/he;->bdT:[I
 
     add-int/lit8 v14, v6, 0x2
 
-    aget v13, v13, v14
+    aget v11, v11, v14
 
-    and-int/2addr v13, v4
+    and-int/2addr v11, v4
 
-    goto :goto_1a
-
-    :cond_8
-    const/4 v13, 0x0
-
-    :goto_1a
     const/4 v15, 0x0
 
-    :goto_1b
+    goto :goto_5
+
+    :cond_16
+    const/4 v11, 0x0
+
+    const/4 v15, 0x0
+
+    :goto_5
     and-int/2addr v10, v4
 
     int-to-long v3, v10
 
-    packed-switch v12, :pswitch_data_1
+    packed-switch v13, :pswitch_data_1
 
-    goto/16 :goto_31
+    goto/16 :goto_6
 
-    :pswitch_41
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    :pswitch_45
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    goto/16 :goto_1e
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
-    :pswitch_42
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result-object v3
+
+    check-cast v3, Lcom/google/android/gms/internal/measurement/ha;
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v4
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/ha;Lcom/google/android/gms/internal/measurement/hr;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_46
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto/16 :goto_1f
-
-    :pswitch_43
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->h(IJ)I
 
     move-result v3
 
-    goto/16 :goto_20
+    add-int/2addr v7, v3
 
-    :pswitch_44
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    goto/16 :goto_21
-
-    :pswitch_45
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    goto/16 :goto_22
-
-    :pswitch_46
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
-
-    move-result v3
-
-    goto/16 :goto_23
+    goto/16 :goto_6
 
     :pswitch_47
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto/16 :goto_24
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->ad(II)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_48
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    move-result v10
+    move-result v3
 
-    if-eqz v10, :cond_b
+    if-eqz v3, :cond_27
 
-    goto/16 :goto_25
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bs(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_49
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
-    move-result v10
+    move-result v3
 
-    if-eqz v10, :cond_b
+    if-eqz v3, :cond_27
 
-    goto/16 :goto_27
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dU(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_4a
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->S(II)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4b
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->F(II)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4c
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/google/android/gms/internal/measurement/em;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4d
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
+
+    move-result-object v4
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_4e
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -10602,95 +11474,162 @@
 
     instance-of v4, v3, Lcom/google/android/gms/internal/measurement/em;
 
-    if-eqz v4, :cond_a
+    if-eqz v4, :cond_17
 
-    goto/16 :goto_28
+    check-cast v3, Lcom/google/android/gms/internal/measurement/em;
 
-    :pswitch_4b
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    add-int/2addr v7, v3
 
-    goto/16 :goto_29
+    goto/16 :goto_6
 
-    :pswitch_4c
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    :cond_17
+    check-cast v3, Ljava/lang/String;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->f(ILjava/lang/String;)I
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    add-int/2addr v7, v3
 
-    goto/16 :goto_2a
+    goto/16 :goto_6
 
-    :pswitch_4d
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    :pswitch_4f
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    goto/16 :goto_2b
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bv(I)I
 
-    :pswitch_4e
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_50
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bq(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_51
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->br(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_52
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v10
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto/16 :goto_2c
-
-    :pswitch_4f
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
-
-    move-result-wide v3
-
-    goto/16 :goto_2d
-
-    :pswitch_50
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
-
-    move-result-wide v3
-
-    goto/16 :goto_2e
-
-    :pswitch_51
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->E(II)I
 
     move-result v3
 
-    if-eqz v3, :cond_b
+    add-int/2addr v7, v3
 
-    goto/16 :goto_2f
-
-    :pswitch_52
-    invoke-direct {v0, v1, v11, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    goto/16 :goto_30
+    goto/16 :goto_6
 
     :pswitch_53
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->g(IJ)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_54
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_27
+
+    invoke-static {v1, v3, v4}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->f(IJ)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_55
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bt(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_56
+    invoke-direct {v0, v1, v12, v6}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_27
+
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bu(I)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_57
     iget-object v10, v0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -10701,9 +11640,11 @@
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_54
+    goto/16 :goto_6
+
+    :pswitch_58
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -10714,13 +11655,15 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_55
+    goto/16 :goto_6
+
+    :pswitch_59
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -10731,266 +11674,18 @@
 
     move-result v3
 
-    if-lez v3, :cond_b
+    if-lez v3, :cond_27
 
     iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
 
-    if-eqz v4, :cond_9
+    if-eqz v4, :cond_18
 
-    goto/16 :goto_1c
+    int-to-long v10, v11
 
-    :pswitch_56
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ag(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_57
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_58
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_59
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->W(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_5a
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->af(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_5b
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->aj(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto/16 :goto_1c
-
-    :pswitch_5c
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_5d
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_5e
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->X(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_5f
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->U(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_60
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->T(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_61
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    goto :goto_1c
-
-    :pswitch_62
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
-
-    move-result v3
-
-    if-lez v3, :cond_b
-
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
-
-    if-eqz v4, :cond_9
-
-    :goto_1c
-    int-to-long v12, v13
-
-    invoke-virtual {v2, v1, v12, v13, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
-
-    :cond_9
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+    :cond_18
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
 
     move-result v4
 
@@ -11004,7 +11699,349 @@
 
     add-int/2addr v7, v4
 
-    goto/16 :goto_31
+    goto/16 :goto_6
+
+    :pswitch_5a
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ag(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_19
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_19
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5b
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_1a
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1a
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5c
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_1b
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1b
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5d
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->W(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_1c
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1c
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5e
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->af(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_1d
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1d
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_5f
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->aj(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_1e
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1e
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_60
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_1f
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_1f
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_61
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_20
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_20
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
+
+    :pswitch_62
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->X(Ljava/util/List;)I
+
+    move-result v3
+
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_21
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_21
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_63
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11013,11 +12050,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->U(Ljava/util/List;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_22
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_22
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_64
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11026,11 +12088,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->T(Ljava/util/List;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_23
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_23
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_65
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11039,11 +12126,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ah(Ljava/util/List;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_24
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_24
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_66
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11052,11 +12164,36 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ht;->ai(Ljava/util/List;)I
 
     move-result v3
 
-    goto :goto_1d
+    if-lez v3, :cond_27
+
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/he;->beb:Z
+
+    if-eqz v4, :cond_25
+
+    int-to-long v10, v11
+
+    invoke-virtual {v2, v1, v10, v11, v3}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
+
+    :cond_25
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dV(I)I
+
+    move-result v4
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fb;->dX(I)I
+
+    move-result v10
+
+    add-int/2addr v4, v10
+
+    add-int/2addr v4, v3
+
+    add-int/2addr v7, v4
+
+    goto/16 :goto_6
 
     :pswitch_67
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11065,11 +12202,13 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->e(ILjava/util/List;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
 
     :pswitch_68
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11078,93 +12217,107 @@
 
     check-cast v3, Ljava/util/List;
 
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->i(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_69
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6a
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6b
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->f(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6c
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->h(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6d
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->n(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_6e
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
     invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/he;->ee(I)Lcom/google/android/gms/internal/measurement/hr;
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;Lcom/google/android/gms/internal/measurement/hr;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_69
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6a
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6b
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6c
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6d
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
-
-    :pswitch_6e
-    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
-
-    move-result v3
-
-    goto :goto_1d
+    goto/16 :goto_6
 
     :pswitch_6f
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -11173,21 +12326,139 @@
 
     check-cast v3, Ljava/util/List;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->m(ILjava/util/List;)I
 
     move-result v3
 
-    :goto_1d
     add-int/2addr v7, v3
 
-    goto/16 :goto_31
+    goto/16 :goto_6
 
     :pswitch_70
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->l(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_71
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_72
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_73
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->g(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_74
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->d(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_75
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_76
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->j(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_77
+    invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/ht;->k(ILjava/util/List;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto/16 :goto_6
+
+    :pswitch_78
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    :goto_1e
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -11198,125 +12469,132 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/ha;Lcom/google/android/gms/internal/measurement/hr;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/ha;Lcom/google/android/gms/internal/measurement/hr;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_71
+    goto/16 :goto_6
+
+    :pswitch_79
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    :goto_1f
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->h(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->h(IJ)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_72
+    goto/16 :goto_6
+
+    :pswitch_7a
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_20
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/fb;->ad(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->ad(II)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_73
+    goto/16 :goto_6
+
+    :pswitch_7b
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_21
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->bs(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bs(I)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_74
+    goto/16 :goto_6
+
+    :pswitch_7c
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_22
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->dU(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->dU(I)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_75
+    goto/16 :goto_6
+
+    :pswitch_7d
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_23
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/fb;->S(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->S(II)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_76
+    goto/16 :goto_6
+
+    :pswitch_7e
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_24
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/fb;->F(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->F(II)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_77
+    goto/16 :goto_6
+
+    :pswitch_7f
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    :goto_25
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
 
-    :goto_26
     check-cast v3, Lcom/google/android/gms/internal/measurement/em;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_78
+    goto/16 :goto_6
+
+    :pswitch_80
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
-    :goto_27
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
@@ -11325,16 +12603,18 @@
 
     move-result-object v4
 
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->c(ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/hr;)I
 
     move-result v3
 
-    goto :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_79
+    goto/16 :goto_6
+
+    :pswitch_81
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -11342,139 +12622,154 @@
 
     instance-of v4, v3, Lcom/google/android/gms/internal/measurement/em;
 
-    if-eqz v4, :cond_a
+    if-eqz v4, :cond_26
 
-    :goto_28
-    goto :goto_26
+    check-cast v3, Lcom/google/android/gms/internal/measurement/em;
 
-    :cond_a
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->c(ILcom/google/android/gms/internal/measurement/em;)I
+
+    move-result v3
+
+    add-int/2addr v7, v3
+
+    goto :goto_6
+
+    :cond_26
     check-cast v3, Ljava/lang/String;
 
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/fb;->f(ILjava/lang/String;)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->f(ILjava/lang/String;)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7a
+    goto :goto_6
+
+    :pswitch_82
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_29
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->bv(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bv(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7b
+    goto :goto_6
+
+    :pswitch_83
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_2a
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->bq(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bq(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7c
+    goto :goto_6
+
+    :pswitch_84
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_2b
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->br(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->br(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7d
+    goto :goto_6
+
+    :pswitch_85
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
     move-result v3
 
-    :goto_2c
-    invoke-static {v11, v3}, Lcom/google/android/gms/internal/measurement/fb;->E(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/fb;->E(II)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7e
+    goto :goto_6
+
+    :pswitch_86
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    :goto_2d
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->g(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->g(IJ)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_7f
+    goto :goto_6
+
+    :pswitch_87
     and-int v10, v9, v15
 
-    if-eqz v10, :cond_b
+    if-eqz v10, :cond_27
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    :goto_2e
-    invoke-static {v11, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->f(IJ)I
+    invoke-static {v12, v3, v4}, Lcom/google/android/gms/internal/measurement/fb;->f(IJ)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_80
+    goto :goto_6
+
+    :pswitch_88
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_2f
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->bt(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bt(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :pswitch_81
+    goto :goto_6
+
+    :pswitch_89
     and-int v3, v9, v15
 
-    if-eqz v3, :cond_b
+    if-eqz v3, :cond_27
 
-    :goto_30
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fb;->bu(I)I
+    invoke-static {v12}, Lcom/google/android/gms/internal/measurement/fb;->bu(I)I
 
     move-result v3
 
-    goto/16 :goto_1d
+    add-int/2addr v7, v3
 
-    :cond_b
-    :goto_31
+    :cond_27
+    :goto_6
     add-int/lit8 v6, v6, 0x3
 
     const/high16 v3, 0xff00000
 
     const v4, 0xfffff
 
-    goto/16 :goto_18
+    goto/16 :goto_3
 
-    :cond_c
+    :cond_28
     iget-object v2, v0, Lcom/google/android/gms/internal/measurement/he;->beh:Lcom/google/android/gms/internal/measurement/ij;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/ij;Ljava/lang/Object;)I
@@ -11485,7 +12780,7 @@
 
     iget-boolean v2, v0, Lcom/google/android/gms/internal/measurement/he;->bdY:Z
 
-    if-eqz v2, :cond_f
+    if-eqz v2, :cond_2b
 
     iget-object v2, v0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
 
@@ -11495,14 +12790,14 @@
 
     const/4 v2, 0x0
 
-    :goto_32
+    :goto_7
     iget-object v3, v1, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v3
 
-    if-ge v5, v3, :cond_d
+    if-ge v5, v3, :cond_29
 
     iget-object v3, v1, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
@@ -11528,12 +12823,12 @@
 
     add-int/lit8 v5, v5, 0x1
 
-    goto :goto_32
+    goto :goto_7
 
-    :cond_d
+    :cond_29
     iget-object v1, v1, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hu;->xM()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -11541,12 +12836,12 @@
 
     move-result-object v1
 
-    :goto_33
+    :goto_8
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
 
-    if-eqz v3, :cond_e
+    if-eqz v3, :cond_2a
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -11570,16 +12865,22 @@
 
     add-int/2addr v2, v3
 
-    goto :goto_33
+    goto :goto_8
 
-    :cond_e
+    :cond_2a
     add-int/2addr v7, v2
 
-    :cond_f
+    :cond_2b
     return v7
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_44
+        :pswitch_43
+        :pswitch_42
+        :pswitch_41
         :pswitch_40
         :pswitch_3f
         :pswitch_3e
@@ -11603,16 +12904,12 @@
         :pswitch_2c
         :pswitch_2b
         :pswitch_2a
-        :pswitch_2e
-        :pswitch_2d
         :pswitch_29
         :pswitch_28
         :pswitch_27
         :pswitch_26
         :pswitch_25
         :pswitch_24
-        :pswitch_2d
-        :pswitch_2e
         :pswitch_23
         :pswitch_22
         :pswitch_21
@@ -11653,6 +12950,14 @@
 
     :pswitch_data_1
     .packed-switch 0x0
+        :pswitch_89
+        :pswitch_88
+        :pswitch_87
+        :pswitch_86
+        :pswitch_85
+        :pswitch_84
+        :pswitch_83
+        :pswitch_82
         :pswitch_81
         :pswitch_80
         :pswitch_7f
@@ -11676,16 +12981,12 @@
         :pswitch_6d
         :pswitch_6c
         :pswitch_6b
-        :pswitch_6f
-        :pswitch_6e
         :pswitch_6a
         :pswitch_69
         :pswitch_68
         :pswitch_67
         :pswitch_66
         :pswitch_65
-        :pswitch_6e
-        :pswitch_6f
         :pswitch_64
         :pswitch_63
         :pswitch_62
@@ -11718,10 +13019,6 @@
         :pswitch_47
         :pswitch_46
         :pswitch_45
-        :pswitch_44
-        :pswitch_43
-        :pswitch_42
-        :pswitch_41
     .end packed-switch
 .end method
 
@@ -11879,7 +13176,7 @@
 
     iget-object v6, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
-    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/gv;->xu()Lcom/google/android/gms/internal/measurement/gt;
+    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/gv;->xt()Lcom/google/android/gms/internal/measurement/gt;
 
     move-result-object v6
 
@@ -11914,7 +13211,7 @@
 
     if-nez v6, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xF()Lcom/google/android/gms/internal/measurement/hn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hn;->xE()Lcom/google/android/gms/internal/measurement/hn;
 
     move-result-object v6
 
@@ -12090,7 +13387,7 @@
     :goto_0
     const/4 v3, 0x1
 
-    if-ge v2, v0, :cond_3
+    if-ge v2, v0, :cond_15
 
     invoke-direct {p0, v2}, Lcom/google/android/gms/internal/measurement/he;->eg(I)I
 
@@ -12110,7 +13407,7 @@
 
     packed-switch v4, :pswitch_data_0
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_0
     invoke-direct {p0, v2}, Lcom/google/android/gms/internal/measurement/he;->eh(I)I
@@ -12143,7 +13440,10 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
+
+    :cond_0
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12160,14 +13460,29 @@
 
     move-result v3
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_2
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/ht;->u(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    goto/16 :goto_1
+
+    :pswitch_3
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_1
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -12181,28 +13496,10 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
 
-    goto/16 :goto_2
-
-    :pswitch_3
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v6
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_1
+    :cond_1
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12211,26 +13508,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
-
-    move-result v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
-
-    move-result v5
-
-    if-eq v4, v5, :cond_1
-
-    goto/16 :goto_2
-
-    :pswitch_5
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_2
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
 
@@ -12242,7 +13520,32 @@
 
     cmp-long v8, v4, v6
 
-    if-eqz v8, :cond_1
+    if-eqz v8, :cond_13
+
+    :cond_2
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
+
+    :pswitch_5
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_3
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v5
+
+    if-eq v4, v5, :cond_13
+
+    :cond_3
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12251,26 +13554,31 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_4
 
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
 
-    move-result v4
+    move-result-wide v4
 
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
 
-    move-result v5
+    move-result-wide v6
 
-    if-eq v4, v5, :cond_1
+    cmp-long v8, v4, v6
 
-    goto/16 :goto_2
+    if-eqz v8, :cond_13
+
+    :cond_4
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
 
     :pswitch_7
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_5
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
 
@@ -12280,7 +13588,10 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
+
+    :cond_5
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12289,7 +13600,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_6
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
 
@@ -12299,30 +13610,32 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    goto/16 :goto_2
+    :cond_6
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
 
     :pswitch_9
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_7
 
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v5
-
-    invoke-static {v4, v5}, Lcom/google/android/gms/internal/measurement/ht;->u(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
 
     move-result v4
 
-    if-nez v4, :cond_1
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v5
+
+    if-eq v4, v5, :cond_13
+
+    :cond_7
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12331,7 +13644,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_8
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -12345,16 +13658,19 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
 
-    goto/16 :goto_2
+    :cond_8
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
 
     :pswitch_b
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_9
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -12368,7 +13684,10 @@
 
     move-result v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_13
+
+    :cond_9
+    const/4 v3, 0x0
 
     goto/16 :goto_1
 
@@ -12377,7 +13696,33 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_a
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v5
+
+    invoke-static {v4, v5}, Lcom/google/android/gms/internal/measurement/ht;->u(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_13
+
+    :cond_a
+    const/4 v3, 0x0
+
+    goto/16 :goto_1
+
+    :pswitch_d
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_b
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->I(Ljava/lang/Object;J)Z
 
@@ -12387,16 +13732,19 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    goto/16 :goto_2
+    :cond_b
+    const/4 v3, 0x0
 
-    :pswitch_d
+    goto/16 :goto_1
+
+    :pswitch_e
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_c
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
 
@@ -12406,16 +13754,19 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    goto :goto_1
+    :cond_c
+    const/4 v3, 0x0
 
-    :pswitch_e
+    goto/16 :goto_1
+
+    :pswitch_f
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_d
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
 
@@ -12427,26 +13778,10 @@
 
     cmp-long v8, v4, v6
 
-    if-eqz v8, :cond_1
+    if-eqz v8, :cond_13
 
-    goto :goto_2
-
-    :pswitch_f
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
-
-    move-result v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
-
-    move-result v5
-
-    if-eq v4, v5, :cond_1
+    :cond_d
+    const/4 v3, 0x0
 
     goto :goto_1
 
@@ -12455,49 +13790,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v6
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_1
-
-    goto :goto_2
-
-    :pswitch_11
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v4
-
-    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
-
-    move-result-wide v6
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_1
-
-    goto :goto_1
-
-    :pswitch_12
-    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_e
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
 
@@ -12507,17 +13800,19 @@
 
     move-result v5
 
-    if-eq v4, v5, :cond_1
+    if-eq v4, v5, :cond_13
 
-    :goto_1
-    goto :goto_2
+    :cond_e
+    const/4 v3, 0x0
 
-    :pswitch_13
+    goto :goto_1
+
+    :pswitch_11
     invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_f
 
     invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
 
@@ -12529,24 +13824,93 @@
 
     cmp-long v8, v4, v6
 
-    if-eqz v8, :cond_1
+    if-eqz v8, :cond_13
 
-    :cond_0
-    :goto_2
+    :cond_f
     const/4 v3, 0x0
 
-    :cond_1
-    :goto_3
-    if-nez v3, :cond_2
+    goto :goto_1
+
+    :pswitch_12
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_10
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v6
+
+    cmp-long v8, v4, v6
+
+    if-eqz v8, :cond_13
+
+    :cond_10
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :pswitch_13
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_11
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v5
+
+    if-eq v4, v5, :cond_13
+
+    :cond_11
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :pswitch_14
+    invoke-direct {p0, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/he;->c(Ljava/lang/Object;Ljava/lang/Object;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_12
+
+    invoke-static {p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p2, v6, v7}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v6
+
+    cmp-long v8, v4, v6
+
+    if-eqz v8, :cond_13
+
+    :cond_12
+    const/4 v3, 0x0
+
+    :cond_13
+    :goto_1
+    if-nez v3, :cond_14
 
     return v1
 
-    :cond_2
+    :cond_14
     add-int/lit8 v2, v2, 0x3
 
     goto/16 :goto_0
 
-    :cond_3
+    :cond_15
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->beh:Lcom/google/android/gms/internal/measurement/ij;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ij;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
@@ -12563,14 +13927,14 @@
 
     move-result v0
 
-    if-nez v0, :cond_4
+    if-nez v0, :cond_16
 
     return v1
 
-    :cond_4
+    :cond_16
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/he;->bdY:Z
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_17
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->bei:Lcom/google/android/gms/internal/measurement/fi;
 
@@ -12590,13 +13954,12 @@
 
     return p1
 
-    :cond_5
+    :cond_17
     return v3
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_14
         :pswitch_13
         :pswitch_12
         :pswitch_11
@@ -12615,38 +13978,37 @@
         :pswitch_4
         :pswitch_3
         :pswitch_2
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
         :pswitch_1
         :pswitch_0
         :pswitch_0
@@ -12686,7 +14048,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    if-ge v1, v0, :cond_2
+    if-ge v1, v0, :cond_3
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/internal/measurement/he;->eg(I)I
 
@@ -12712,255 +14074,188 @@
 
     packed-switch v3, :pswitch_data_0
 
-    goto/16 :goto_e
+    goto/16 :goto_1
 
     :pswitch_0
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
-    goto :goto_2
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
 
     :pswitch_1
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
-    goto/16 :goto_4
-
-    :pswitch_2
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_1
-
-    :pswitch_3
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto/16 :goto_4
-
-    :pswitch_4
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_1
-
-    :pswitch_5
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_1
-    goto :goto_3
-
-    :pswitch_6
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_3
-
-    :pswitch_7
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto/16 :goto_5
-
-    :pswitch_8
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_2
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    mul-int/lit8 v2, v2, 0x35
-
-    goto/16 :goto_6
-
-    :pswitch_9
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto/16 :goto_8
-
-    :pswitch_a
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    mul-int/lit8 v2, v2, 0x35
-
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->F(Ljava/lang/Object;J)Z
-
-    move-result v3
-
-    goto/16 :goto_9
-
-    :pswitch_b
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_3
-
-    :pswitch_c
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_4
-
-    :pswitch_d
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_3
-    mul-int/lit8 v2, v2, 0x35
-
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
-
-    move-result v3
-
-    goto/16 :goto_d
-
-    :pswitch_e
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_4
-
-    :pswitch_f
-    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :goto_4
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto/16 :goto_c
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
 
-    :pswitch_10
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_2
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->C(Ljava/lang/Object;J)F
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto :goto_a
+    add-int/2addr v2, v3
 
-    :pswitch_11
+    goto/16 :goto_1
+
+    :pswitch_3
     invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->B(Ljava/lang/Object;J)D
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto :goto_b
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
 
-    :pswitch_12
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+    move-result v3
 
-    move-result-object v3
+    add-int/2addr v2, v3
 
-    if-eqz v3, :cond_0
+    goto/16 :goto_1
 
-    goto :goto_7
+    :pswitch_4
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_5
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_6
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_7
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :goto_5
-    :pswitch_13
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
 
-    :goto_6
     invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_8
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :pswitch_14
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v3
 
-    if-eqz v3, :cond_0
-
-    :goto_7
-    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
-
-    move-result v7
-
-    :cond_0
     mul-int/lit8 v2, v2, 0x35
 
-    add-int/2addr v2, v7
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
-    goto :goto_e
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_9
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :goto_8
-    :pswitch_15
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
@@ -12973,81 +14268,467 @@
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_a
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :pswitch_16
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->I(Ljava/lang/Object;J)Z
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->F(Ljava/lang/Object;J)Z
 
     move-result v3
 
-    :goto_9
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fw;->Q(Z)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fw;->P(Z)I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_b
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
 
-    :pswitch_17
     mul-int/lit8 v2, v2, 0x35
 
-    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
 
-    :pswitch_18
+    goto/16 :goto_1
+
+    :pswitch_c
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_d
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->D(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_e
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_f
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->E(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_10
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->C(Ljava/lang/Object;J)F
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_11
+    invoke-direct {p0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/he;->B(Ljava/lang/Object;J)D
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Double;->doubleToLongBits(D)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_12
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_13
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_14
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v7
+
+    :cond_0
+    mul-int/lit8 v2, v2, 0x35
+
+    add-int/2addr v2, v7
+
+    goto/16 :goto_1
+
+    :pswitch_15
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
 
     move-result-wide v3
 
-    goto :goto_c
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_16
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_17
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_18
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
 
     :pswitch_19
     mul-int/lit8 v2, v2, 0x35
 
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_1a
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_1b
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto/16 :goto_1
+
+    :pswitch_1c
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_1
+
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v7
+
+    :cond_1
+    mul-int/lit8 v2, v2, 0x35
+
+    add-int/2addr v2, v7
+
+    goto :goto_1
+
+    :pswitch_1d
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_1e
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->I(Ljava/lang/Object;J)Z
+
+    move-result v3
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/fw;->P(Z)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_1f
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_20
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_21
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_22
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_23
+    mul-int/lit8 v2, v2, 0x35
+
+    invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    goto :goto_1
+
+    :pswitch_24
+    mul-int/lit8 v2, v2, 0x35
+
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->J(Ljava/lang/Object;J)F
 
     move-result v3
 
-    :goto_a
     invoke-static {v3}, Ljava/lang/Float;->floatToIntBits(F)I
 
     move-result v3
 
-    goto :goto_d
+    add-int/2addr v2, v3
 
-    :pswitch_1a
+    goto :goto_1
+
+    :pswitch_25
     mul-int/lit8 v2, v2, 0x35
 
     invoke-static {p1, v5, v6}, Lcom/google/android/gms/internal/measurement/ip;->K(Ljava/lang/Object;J)D
 
     move-result-wide v3
 
-    :goto_b
     invoke-static {v3, v4}, Ljava/lang/Double;->doubleToLongBits(D)J
 
     move-result-wide v3
 
-    :goto_c
     invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/fw;->au(J)I
 
     move-result v3
 
-    :goto_d
     add-int/2addr v2, v3
 
-    :cond_1
-    :goto_e
+    :cond_2
+    :goto_1
     add-int/lit8 v1, v1, 0x3
 
     goto/16 :goto_0
 
-    :cond_2
+    :cond_3
     mul-int/lit8 v2, v2, 0x35
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->beh:Lcom/google/android/gms/internal/measurement/ij;
@@ -13064,7 +14745,7 @@
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/he;->bdY:Z
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     mul-int/lit8 v2, v2, 0x35
 
@@ -13080,64 +14761,62 @@
 
     add-int/2addr v2, p1
 
-    :cond_3
+    :cond_4
     return v2
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_25
+        :pswitch_24
+        :pswitch_23
+        :pswitch_22
+        :pswitch_21
+        :pswitch_20
+        :pswitch_1f
+        :pswitch_1e
+        :pswitch_1d
+        :pswitch_1c
+        :pswitch_1b
         :pswitch_1a
         :pswitch_19
         :pswitch_18
-        :pswitch_18
-        :pswitch_17
-        :pswitch_18
         :pswitch_17
         :pswitch_16
         :pswitch_15
         :pswitch_14
         :pswitch_13
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_18
-        :pswitch_17
-        :pswitch_18
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
+        :pswitch_13
         :pswitch_12
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
-        :pswitch_13
         :pswitch_11
         :pswitch_10
         :pswitch_f
@@ -13219,30 +14898,20 @@
 
     packed-switch v1, :pswitch_data_0
 
-    goto/16 :goto_7
+    goto/16 :goto_1
 
     :pswitch_0
-    invoke-direct {p0, p2, v4, v0}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_1
-
-    :pswitch_1
     invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;Ljava/lang/Object;I)V
 
-    goto/16 :goto_7
+    goto/16 :goto_1
 
-    :pswitch_2
+    :pswitch_1
     invoke-direct {p0, p2, v4, v0}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    :goto_1
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v1
@@ -13251,39 +14920,48 @@
 
     invoke-direct {p0, p1, v4, v0}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
 
-    goto/16 :goto_7
+    goto/16 :goto_1
+
+    :pswitch_2
+    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_3
+    invoke-direct {p0, p2, v4, v0}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;II)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    invoke-direct {p0, p1, v4, v0}, Lcom/google/android/gms/internal/measurement/he;->b(Ljava/lang/Object;II)V
+
+    goto/16 :goto_1
+
+    :pswitch_4
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/he;->bej:Lcom/google/android/gms/internal/measurement/gv;
 
     invoke-static {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ht;->a(Lcom/google/android/gms/internal/measurement/gv;Ljava/lang/Object;Ljava/lang/Object;J)V
 
-    goto/16 :goto_7
+    goto/16 :goto_1
 
-    :pswitch_4
+    :pswitch_5
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/he;->beg:Lcom/google/android/gms/internal/measurement/gl;
 
     invoke-virtual {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/measurement/gl;->a(Ljava/lang/Object;Ljava/lang/Object;J)V
 
-    goto/16 :goto_7
-
-    :pswitch_5
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto/16 :goto_5
+    goto/16 :goto_1
 
     :pswitch_6
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;Ljava/lang/Object;I)V
 
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_2
+    goto/16 :goto_1
 
     :pswitch_7
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13292,7 +14970,15 @@
 
     if-eqz v1, :cond_0
 
-    goto/16 :goto_5
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_8
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13301,7 +14987,15 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_2
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_9
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13310,8 +15004,15 @@
 
     if-eqz v1, :cond_0
 
-    :goto_2
-    goto :goto_4
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_a
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13320,7 +15021,15 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_4
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_b
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13329,12 +15038,32 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_3
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_c
-    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;Ljava/lang/Object;I)V
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
-    goto/16 :goto_7
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_d
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13343,16 +15072,39 @@
 
     if-eqz v1, :cond_0
 
-    :goto_3
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v1
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
 
     :pswitch_e
+    invoke-direct {p0, p1, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->a(Ljava/lang/Object;Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
+
+    :pswitch_f
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->L(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto/16 :goto_1
+
+    :pswitch_10
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v1
@@ -13365,25 +15117,9 @@
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JZ)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
-    :pswitch_f
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_4
-
-    :pswitch_10
-    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_5
+    goto/16 :goto_1
 
     :pswitch_11
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13392,14 +15128,15 @@
 
     if-eqz v1, :cond_0
 
-    :goto_4
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
 
     move-result v1
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto :goto_1
 
     :pswitch_12
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13408,7 +15145,15 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_5
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto :goto_1
 
     :pswitch_13
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
@@ -13417,16 +15162,51 @@
 
     if-eqz v1, :cond_0
 
-    :goto_5
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->G(Ljava/lang/Object;J)I
+
+    move-result v1
+
+    invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->c(Ljava/lang/Object;JI)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto :goto_1
+
+    :pswitch_14
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
 
     move-result-wide v4
 
     invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
-    :pswitch_14
+    goto :goto_1
+
+    :pswitch_15
+    invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ip;->H(Ljava/lang/Object;J)J
+
+    move-result-wide v4
+
+    invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JJ)V
+
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
+
+    goto :goto_1
+
+    :pswitch_16
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v1
@@ -13439,9 +15219,11 @@
 
     invoke-static {p1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JF)V
 
-    goto :goto_6
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
-    :pswitch_15
+    goto :goto_1
+
+    :pswitch_17
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/he;->f(Ljava/lang/Object;I)Z
 
     move-result v1
@@ -13454,11 +15236,10 @@
 
     invoke-static {p1, v2, v3, v4, v5}, Lcom/google/android/gms/internal/measurement/ip;->a(Ljava/lang/Object;JD)V
 
-    :goto_6
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/he;->g(Ljava/lang/Object;I)V
 
     :cond_0
-    :goto_7
+    :goto_1
     add-int/lit8 v0, v0, 0x3
 
     goto/16 :goto_0
@@ -13490,10 +15271,14 @@
 
     throw p1
 
+    return-void
+
     nop
 
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_17
+        :pswitch_16
         :pswitch_15
         :pswitch_14
         :pswitch_13
@@ -13511,57 +15296,55 @@
         :pswitch_7
         :pswitch_6
         :pswitch_5
-        :pswitch_c
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
-        :pswitch_4
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
         :pswitch_4
         :pswitch_3
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
         :pswitch_2
         :pswitch_1
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
         :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_0
     .end packed-switch
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali
index e88f9f567e..c492182356 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali
@@ -130,7 +130,7 @@
 
     :cond_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wo()I
 
     move-result v3
     :try_end_0
@@ -170,7 +170,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wF()V
 
     goto :goto_1
 
@@ -182,7 +182,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wq()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wp()Z
 
     move-result v3
 
@@ -193,13 +193,11 @@
 
     const/4 v5, 0x0
 
-    move-object v3, v5
-
-    const/4 v6, 0x0
+    move-object v6, v5
 
     :cond_5
     :goto_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wo()I
 
     move-result v7
 
@@ -213,13 +211,13 @@
 
     if-ne v7, v8, :cond_6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wa()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vZ()I
 
-    move-result v6
+    move-result v3
 
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/hf;->bdX:Lcom/google/android/gms/internal/measurement/ha;
 
-    invoke-virtual {v1, p3, v5, v6}, Lcom/google/android/gms/internal/measurement/fi;->a(Lcom/google/android/gms/internal/measurement/fg;Lcom/google/android/gms/internal/measurement/ha;I)Ljava/lang/Object;
+    invoke-virtual {v1, p3, v5, v3}, Lcom/google/android/gms/internal/measurement/fi;->a(Lcom/google/android/gms/internal/measurement/fg;Lcom/google/android/gms/internal/measurement/ha;I)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -232,19 +230,19 @@
 
     if-eqz v5, :cond_7
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wF()V
 
     goto :goto_0
 
     :cond_7
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vY()Lcom/google/android/gms/internal/measurement/em;
 
-    move-result-object v3
+    move-result-object v6
 
     goto :goto_0
 
     :cond_8
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wq()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wp()Z
 
     move-result v7
 
@@ -259,16 +257,16 @@
 
     if-ne v4, v7, :cond_c
 
-    if-eqz v3, :cond_b
+    if-eqz v6, :cond_b
 
     if-eqz v5, :cond_a
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wH()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fi;->wG()V
 
     goto :goto_1
 
     :cond_a
-    invoke-virtual {v0, v2, v6, v3}, Lcom/google/android/gms/internal/measurement/ij;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/measurement/em;)V
+    invoke-virtual {v0, v2, v3, v6}, Lcom/google/android/gms/internal/measurement/ij;->a(Ljava/lang/Object;ILcom/google/android/gms/internal/measurement/em;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -285,7 +283,7 @@
 
     :cond_c
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xe()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p2
 
@@ -299,6 +297,8 @@
     invoke-virtual {v0, p1, v2}, Lcom/google/android/gms/internal/measurement/ij;->o(Ljava/lang/Object;Ljava/lang/Object;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/jd;)V
@@ -346,7 +346,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/fn;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wN()Lcom/google/android/gms/internal/measurement/jc;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wM()Lcom/google/android/gms/internal/measurement/jc;
 
     move-result-object v3
 
@@ -354,13 +354,13 @@
 
     if-ne v3, v4, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wP()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
 
     move-result v3
 
@@ -370,7 +370,7 @@
 
     if-eqz v3, :cond_0
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->lT()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->lS()I
 
     move-result v2
 
@@ -384,17 +384,16 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ge;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gi;->vF()Lcom/google/android/gms/internal/measurement/em;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gi;->vE()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object v1
 
-    :goto_1
     invoke-interface {p2, v2, v1}, Lcom/google/android/gms/internal/measurement/jd;->d(ILjava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->lT()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->lS()I
 
     move-result v2
 
@@ -402,7 +401,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    invoke-interface {p2, v2, v1}, Lcom/google/android/gms/internal/measurement/jd;->d(ILjava/lang/Object;)V
+
+    goto :goto_0
 
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -481,7 +482,7 @@
     :goto_0
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v3
 
@@ -506,7 +507,7 @@
     :cond_0
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hu;->xM()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -672,11 +673,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hf;->bdX:Lcom/google/android/gms/internal/measurement/ha;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->wW()Lcom/google/android/gms/internal/measurement/hb;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ha;->wV()Lcom/google/android/gms/internal/measurement/hb;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hb;->wZ()Lcom/google/android/gms/internal/measurement/ha;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hb;->wY()Lcom/google/android/gms/internal/measurement/ha;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hg.smali
index 324dcab36f..60e6ad0514 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hg.smali
@@ -7,5 +7,5 @@
 
 
 # virtual methods
-.method public abstract xB()Lcom/google/android/gms/internal/measurement/hg;
+.method public abstract xA()Lcom/google/android/gms/internal/measurement/hg;
 .end method
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 d02114a7dc..2c1b184b17 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
@@ -12,7 +12,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xE()Lcom/google/android/gms/internal/measurement/hi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hk;->xD()Lcom/google/android/gms/internal/measurement/hi;
 
     move-result-object v0
 
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method static xC()Lcom/google/android/gms/internal/measurement/hi;
+.method static xB()Lcom/google/android/gms/internal/measurement/hi;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/hk;->bem:Lcom/google/android/gms/internal/measurement/hi;
@@ -35,7 +35,7 @@
     return-object v0
 .end method
 
-.method static xD()Lcom/google/android/gms/internal/measurement/hi;
+.method static xC()Lcom/google/android/gms/internal/measurement/hi;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/hk;->ben:Lcom/google/android/gms/internal/measurement/hi;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method private static xE()Lcom/google/android/gms/internal/measurement/hi;
+.method private static xD()Lcom/google/android/gms/internal/measurement/hi;
     .locals 3
 
     :try_start_0
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 fb52adf4d5..f15c87b7e3 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
@@ -124,7 +124,7 @@
     return-object p0
 .end method
 
-.method public static xF()Lcom/google/android/gms/internal/measurement/hn;
+.method public static xE()Lcom/google/android/gms/internal/measurement/hn;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/hn;->beo:Lcom/google/android/gms/internal/measurement/hn;
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 f3392dc165..e78838f122 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
@@ -85,7 +85,7 @@
     return-void
 .end method
 
-.method public static xG()Lcom/google/android/gms/internal/measurement/ho;
+.method public static xF()Lcom/google/android/gms/internal/measurement/ho;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ho;->bdC:Ljava/util/List;
 
@@ -183,7 +183,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ho;->bdC:Ljava/util/List;
 
@@ -208,7 +208,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eh;->vJ()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ho;->bdC:Ljava/util/List;
 
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 1858d74776..e78dee25fa 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
@@ -81,15 +81,7 @@
 
 
 # virtual methods
-.method public final xA()Lcom/google/android/gms/internal/measurement/ha;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hp;->bdX:Lcom/google/android/gms/internal/measurement/ha;
-
-    return-object v0
-.end method
-
-.method public final xy()I
+.method public final xx()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/hp;->flags:I
@@ -110,7 +102,7 @@
     return v0
 .end method
 
-.method public final xz()Z
+.method public final xy()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/hp;->flags:I
@@ -130,3 +122,11 @@
 
     return v0
 .end method
+
+.method public final xz()Lcom/google/android/gms/internal/measurement/ha;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hp;->bdX:Lcom/google/android/gms/internal/measurement/ha;
+
+    return-object v0
+.end method
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 9010bf21d1..9bbac0f07a 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
@@ -433,6 +433,14 @@
     .end annotation
 .end method
 
+.method public abstract vR()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method public abstract vS()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -441,7 +449,7 @@
     .end annotation
 .end method
 
-.method public abstract vT()J
+.method public abstract vT()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -449,7 +457,7 @@
     .end annotation
 .end method
 
-.method public abstract vU()I
+.method public abstract vU()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -457,7 +465,7 @@
     .end annotation
 .end method
 
-.method public abstract vV()J
+.method public abstract vV()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -465,7 +473,7 @@
     .end annotation
 .end method
 
-.method public abstract vW()I
+.method public abstract vW()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -473,7 +481,7 @@
     .end annotation
 .end method
 
-.method public abstract vX()Z
+.method public abstract vX()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -481,7 +489,7 @@
     .end annotation
 .end method
 
-.method public abstract vY()Ljava/lang/String;
+.method public abstract vY()Lcom/google/android/gms/internal/measurement/em;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -489,7 +497,7 @@
     .end annotation
 .end method
 
-.method public abstract vZ()Lcom/google/android/gms/internal/measurement/em;
+.method public abstract vZ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -513,7 +521,7 @@
     .end annotation
 .end method
 
-.method public abstract wc()I
+.method public abstract wc()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -521,7 +529,7 @@
     .end annotation
 .end method
 
-.method public abstract wd()J
+.method public abstract wd()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -529,7 +537,7 @@
     .end annotation
 .end method
 
-.method public abstract we()I
+.method public abstract we()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -537,7 +545,7 @@
     .end annotation
 .end method
 
-.method public abstract wf()J
+.method public abstract wo()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -545,15 +553,7 @@
     .end annotation
 .end method
 
-.method public abstract wp()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract wq()Z
+.method public abstract wp()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
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 dce939b6ee..55e3eff034 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
@@ -44,7 +44,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xK()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xJ()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ht;->R(Z)Lcom/google/android/gms/internal/measurement/ij;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ht;->Q(Z)Lcom/google/android/gms/internal/measurement/ij;
 
     move-result-object v0
 
@@ -60,7 +60,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ht;->R(Z)Lcom/google/android/gms/internal/measurement/ij;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ht;->Q(Z)Lcom/google/android/gms/internal/measurement/ij;
 
     move-result-object v0
 
@@ -97,8 +97,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ht;->bes:Ljava/lang/Class;
-
     invoke-virtual {v0, p0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result p0
@@ -121,7 +119,7 @@
     return-void
 .end method
 
-.method private static R(Z)Lcom/google/android/gms/internal/measurement/ij;
+.method private static Q(Z)Lcom/google/android/gms/internal/measurement/ij;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -134,7 +132,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xL()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ht;->xK()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -580,7 +578,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ij;->xU()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ij;->xT()Ljava/lang/Object;
 
     move-result-object p2
 
@@ -688,10 +686,10 @@
 
     move-result-object p1
 
-    :goto_2
     move-object v2, p3
 
     :cond_5
+    :goto_2
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p3
@@ -720,6 +718,8 @@
 
     invoke-interface {p1}, Ljava/util/Iterator;->remove()V
 
+    move-object v2, p3
+
     goto :goto_2
 
     :cond_6
@@ -861,7 +861,7 @@
     :goto_0
     iget-object v0, p2, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v0
 
@@ -882,7 +882,7 @@
     :cond_0
     iget-object p1, p2, Lcom/google/android/gms/internal/measurement/fl;->bbw:Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hu;->xM()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -1393,10 +1393,9 @@
 
     move-result v2
 
-    :goto_1
     add-int/2addr p0, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     check-cast v2, Lcom/google/android/gms/internal/measurement/ha;
@@ -1405,9 +1404,9 @@
 
     move-result v2
 
-    goto :goto_1
+    add-int/2addr p0, v2
 
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
@@ -2157,10 +2156,9 @@
 
     move-result v2
 
-    :goto_1
     add-int/2addr p0, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     check-cast v2, Ljava/lang/String;
@@ -2169,15 +2167,15 @@
 
     move-result v2
 
-    goto :goto_1
+    add-int/2addr p0, v2
 
-    :goto_2
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_2
-    :goto_3
+    :goto_2
     if-ge v1, v0, :cond_4
 
     invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -2194,10 +2192,9 @@
 
     move-result v2
 
-    :goto_4
     add-int/2addr p0, v2
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_3
     check-cast v2, Ljava/lang/String;
@@ -2206,12 +2203,12 @@
 
     move-result v2
 
-    goto :goto_4
+    add-int/2addr p0, v2
 
-    :goto_5
+    :goto_3
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     return p0
@@ -2365,7 +2362,7 @@
     return p0
 .end method
 
-.method public static xH()Lcom/google/android/gms/internal/measurement/ij;
+.method public static xG()Lcom/google/android/gms/internal/measurement/ij;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2380,7 +2377,7 @@
     return-object v0
 .end method
 
-.method public static xI()Lcom/google/android/gms/internal/measurement/ij;
+.method public static xH()Lcom/google/android/gms/internal/measurement/ij;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2395,7 +2392,7 @@
     return-object v0
 .end method
 
-.method public static xJ()Lcom/google/android/gms/internal/measurement/ij;
+.method public static xI()Lcom/google/android/gms/internal/measurement/ij;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2410,7 +2407,7 @@
     return-object v0
 .end method
 
-.method private static xK()Ljava/lang/Class;
+.method private static xJ()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2437,7 +2434,7 @@
     return-object v0
 .end method
 
-.method private static xL()Ljava/lang/Class;
+.method private static xK()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 522dcd7f91..02c640df2e 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
@@ -217,7 +217,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/hu;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xO()V
 
     return-void
 .end method
@@ -275,7 +275,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hu;->bex:Ljava/util/List;
 
@@ -297,7 +297,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xQ()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -329,7 +329,7 @@
     return-object p1
 .end method
 
-.method private final xP()V
+.method private final xO()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/hu;->bbx:Z
@@ -346,7 +346,7 @@
     throw v0
 .end method
 
-.method private final xQ()Ljava/util/SortedMap;
+.method private final xP()Ljava/util/SortedMap;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -356,7 +356,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hu;->bey:Ljava/util/Map;
 
@@ -406,7 +406,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xO()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/hu;->a(Ljava/lang/Comparable;)I
 
@@ -429,7 +429,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xO()V
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hu;->bex:Ljava/util/List;
 
@@ -462,7 +462,7 @@
 
     if-lt v0, v1, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xQ()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -485,8 +485,6 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hu;->bex:Ljava/util/List;
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/hu;->bew:I
-
     add-int/lit8 v2, v2, -0x1
 
     invoke-interface {v1, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
@@ -495,7 +493,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xQ()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()Ljava/util/SortedMap;
 
     move-result-object v2
 
@@ -528,7 +526,7 @@
 .method public clear()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hu;->bex:Ljava/util/List;
 
@@ -680,11 +678,11 @@
     return v3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v4
 
@@ -793,7 +791,7 @@
 .method public hashCode()I
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v0
 
@@ -865,7 +863,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xP()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hu;->xO()V
 
     check-cast p1, Ljava/lang/Comparable;
 
@@ -924,7 +922,7 @@
     return v0
 .end method
 
-.method public vJ()V
+.method public vI()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/hu;->bbx:Z
@@ -987,7 +985,7 @@
     return-void
 .end method
 
-.method public final xM()I
+.method public final xL()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hu;->bex:Ljava/util/List;
@@ -999,7 +997,7 @@
     return v0
 .end method
 
-.method public final xN()Ljava/lang/Iterable;
+.method public final xM()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1018,7 +1016,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hy;->xS()Ljava/lang/Iterable;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hy;->xR()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -1034,7 +1032,7 @@
     return-object v0
 .end method
 
-.method final xO()Ljava/util/Set;
+.method final xN()Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 d594011781..83bfe8c8ab 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
@@ -26,7 +26,7 @@
 
 
 # virtual methods
-.method public final vJ()V
+.method public final vI()V
     .locals 3
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/hu;->bbx:Z
@@ -36,7 +36,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xM()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xL()I
 
     move-result v1
 
@@ -52,7 +52,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/fn;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v2
 
@@ -76,7 +76,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xN()Ljava/lang/Iterable;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hu;->xM()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -104,7 +104,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/fn;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wO()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/fn;->wN()Z
 
     move-result v2
 
@@ -125,7 +125,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hu;->vJ()V
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hu;->vI()V
 
     return-void
 .end method
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 159a5cddc2..f5400c2fa2 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
@@ -63,7 +63,7 @@
     return-void
 .end method
 
-.method private final xR()Ljava/util/Iterator;
+.method private final xQ()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,8 +109,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/hw;->pos:I
-
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hw;->beD:Lcom/google/android/gms/internal/measurement/hu;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/hu;->b(Lcom/google/android/gms/internal/measurement/hu;)Ljava/util/List;
@@ -124,7 +122,7 @@
     if-le v0, v1, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hw;->xR()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hw;->xQ()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -148,7 +146,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hw;->xR()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hw;->xQ()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -158,7 +156,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hw;->xR()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hw;->xQ()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -166,7 +164,6 @@
 
     move-result-object v0
 
-    :goto_0
     check-cast v0, Ljava/util/Map$Entry;
 
     return-object v0
@@ -188,7 +185,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    check-cast v0, Ljava/util/Map$Entry;
+
+    return-object v0
 .end method
 
 .method public final remove()V
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 54196d1496..1333dcfd29 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
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method static xS()Ljava/lang/Iterable;
+.method static xR()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,7 +60,7 @@
     return-object v0
 .end method
 
-.method static synthetic xT()Ljava/util/Iterator;
+.method static synthetic xS()Ljava/util/Iterator;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/hy;->beE:Ljava/util/Iterator;
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 4fd08848a9..04d254b93d 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
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hy;->xT()Ljava/util/Iterator;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hy;->xS()Ljava/util/Iterator;
 
     move-result-object v0
 
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 65aaa8ab9f..5df09da24c 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
@@ -220,8 +220,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ib;->beG:Ljava/lang/Comparable;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -234,9 +232,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ib;->value:Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
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 1a611b7d08..47308b8977 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
@@ -57,7 +57,7 @@
     return-void
 .end method
 
-.method private final xR()Ljava/util/Iterator;
+.method private final xQ()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -129,7 +129,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ic;->xR()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ic;->xQ()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -188,13 +188,12 @@
 
     move-result-object v0
 
-    :goto_0
     check-cast v0, Ljava/util/Map$Entry;
 
     return-object v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ic;->xR()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ic;->xQ()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -202,7 +201,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    check-cast v0, Ljava/util/Map$Entry;
+
+    return-object v0
 .end method
 
 .method public final remove()V
@@ -247,7 +248,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ic;->xR()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ic;->xQ()Ljava/util/Iterator;
 
     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 3730409e59..7ce0caee84 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
@@ -53,6 +53,10 @@
 
     if-gt v2, v4, :cond_0
 
+    int-to-char v2, v2
+
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_0
@@ -82,70 +86,84 @@
 
     add-int/lit8 v2, v2, 0x30
 
-    :goto_1
     int-to-char v2, v2
 
     invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_0
     const-string v2, "\\r"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_1
     const-string v2, "\\f"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_2
     const-string v2, "\\v"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_3
     const-string v2, "\\n"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_4
     const-string v2, "\\t"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_5
     const-string v2, "\\b"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :pswitch_6
     const-string v2, "\\a"
 
-    :goto_2
     invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_1
     const-string v2, "\\\\"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :cond_2
     const-string v2, "\\\'"
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
 
     :cond_3
     const-string v2, "\\\""
 
-    goto :goto_2
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_3
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :cond_4
     invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -154,6 +172,8 @@
 
     return-object p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x7
         :pswitch_6
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 b9741ed768..e11301f24b 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
@@ -96,14 +96,14 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
     throw p1
 
     :pswitch_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vW()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vV()I
 
     move-result p2
 
@@ -117,7 +117,7 @@
     return p1
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ij;->xU()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ij;->xT()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
     or-int/lit8 v3, v3, 0x4
 
     :cond_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->wo()I
 
     move-result v4
 
@@ -156,14 +156,14 @@
     return v2
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xe()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
     throw p1
 
     :pswitch_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vZ()Lcom/google/android/gms/internal/measurement/em;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vY()Lcom/google/android/gms/internal/measurement/em;
 
     move-result-object p2
 
@@ -172,7 +172,7 @@
     return v2
 
     :pswitch_4
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vU()J
 
     move-result-wide v3
 
@@ -181,7 +181,7 @@
     return v2
 
     :pswitch_5
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vT()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hq;->vS()J
 
     move-result-wide v3
 
@@ -309,7 +309,7 @@
     .end annotation
 .end method
 
-.method abstract xU()Ljava/lang/Object;
+.method abstract xT()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TB;"
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 dc519114c6..7f3a148958 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
@@ -143,7 +143,7 @@
 
     new-instance p0, Ljava/lang/RuntimeException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object p1
 
@@ -152,7 +152,7 @@
     throw p0
 
     :pswitch_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/jd;->wy()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/jd;->wx()I
 
     move-result p0
 
@@ -230,7 +230,7 @@
     .end packed-switch
 .end method
 
-.method public static xV()Lcom/google/android/gms/internal/measurement/ik;
+.method public static xU()Lcom/google/android/gms/internal/measurement/ik;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ik;->beN:Lcom/google/android/gms/internal/measurement/ik;
@@ -238,7 +238,7 @@
     return-object v0
 .end method
 
-.method static xW()Lcom/google/android/gms/internal/measurement/ik;
+.method static xV()Lcom/google/android/gms/internal/measurement/ik;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ik;
@@ -265,7 +265,7 @@
     return-void
 
     :cond_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/jd;->wy()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/jd;->wx()I
 
     move-result v0
 
@@ -372,8 +372,6 @@
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
-
     const/4 v1, 0x4
 
     if-ge v0, v1, :cond_0
@@ -383,8 +381,6 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
-
     shr-int/lit8 v0, v0, 0x1
 
     :goto_0
@@ -417,15 +413,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ik;->bdU:[Ljava/lang/Object;
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
+    aput-object p2, p1, v1
 
-    aput-object p2, p1, v0
+    add-int/lit8 v1, v1, 0x1
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
 
     return-void
 
@@ -469,20 +461,18 @@
 
     if-ne v2, v3, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ik;->beO:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ik;->beO:[I
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ik;->beO:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/ik;->beO:[I
 
     const/4 v5, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_4
+    if-ge v5, v2, :cond_4
 
-    aget v6, v2, v5
+    aget v6, v3, v5
 
-    aget v7, v3, v5
+    aget v7, v4, v5
 
     if-eq v6, v7, :cond_3
 
@@ -552,13 +542,11 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
 
-    add-int/lit16 v0, v0, 0x20f
+    add-int/lit16 v1, v0, 0x20f
 
-    mul-int/lit8 v0, v0, 0x1f
+    mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ik;->beO:[I
-
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ik;->beO:[I
 
     const/4 v3, 0x0
 
@@ -569,11 +557,11 @@
     const/16 v6, 0x11
 
     :goto_0
-    if-ge v5, v2, :cond_0
+    if-ge v5, v0, :cond_0
 
     mul-int/lit8 v6, v6, 0x1f
 
-    aget v7, v1, v5
+    aget v7, v2, v5
 
     add-int/2addr v6, v7
 
@@ -582,11 +570,11 @@
     goto :goto_0
 
     :cond_0
-    add-int/2addr v0, v6
+    add-int/2addr v1, v6
 
-    mul-int/lit8 v0, v0, 0x1f
+    mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ik;->bdU:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ik;->bdU:[Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/android/gms/internal/measurement/ik;->count:I
 
@@ -595,7 +583,7 @@
 
     mul-int/lit8 v4, v4, 0x1f
 
-    aget-object v5, v1, v3
+    aget-object v5, v0, v3
 
     invoke-virtual {v5}, Ljava/lang/Object;->hashCode()I
 
@@ -608,12 +596,12 @@
     goto :goto_1
 
     :cond_1
-    add-int/2addr v0, v4
+    add-int/2addr v1, v4
 
-    return v0
+    return v1
 .end method
 
-.method public final wU()I
+.method public final wT()I
     .locals 6
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ik;->zzbyn:I
@@ -650,7 +638,7 @@
 
     new-instance v0, Ljava/lang/IllegalStateException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xg()Lcom/google/android/gms/internal/measurement/gc;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xf()Lcom/google/android/gms/internal/measurement/gc;
 
     move-result-object v1
 
@@ -671,12 +659,14 @@
 
     check-cast v3, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ik;->wU()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ik;->wT()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
+    add-int/2addr v1, v2
+
     goto :goto_1
 
     :pswitch_1
@@ -690,6 +680,8 @@
 
     move-result v2
 
+    add-int/2addr v1, v2
+
     goto :goto_1
 
     :pswitch_2
@@ -705,6 +697,8 @@
 
     move-result v2
 
+    add-int/2addr v1, v2
+
     goto :goto_1
 
     :pswitch_3
@@ -722,10 +716,9 @@
 
     move-result v2
 
-    :goto_1
     add-int/2addr v1, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ik;->bdU:[Ljava/lang/Object;
@@ -740,9 +733,9 @@
 
     move-result v2
 
-    goto :goto_1
+    add-int/2addr v1, v2
 
-    :goto_2
+    :goto_1
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
@@ -752,8 +745,6 @@
 
     return v1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
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 dddf6f0e91..698c9852d5 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
@@ -126,7 +126,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ik;->wU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ik;->wT()I
 
     move-result p1
 
@@ -170,13 +170,13 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/fu;->zzbym:Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xV()Lcom/google/android/gms/internal/measurement/ik;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xU()Lcom/google/android/gms/internal/measurement/ik;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xW()Lcom/google/android/gms/internal/measurement/ik;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xV()Lcom/google/android/gms/internal/measurement/ik;
 
     move-result-object v0
 
@@ -265,7 +265,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/jd;->wy()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/jd;->wx()I
 
     move-result v0
 
@@ -354,7 +354,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xV()Lcom/google/android/gms/internal/measurement/ik;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xU()Lcom/google/android/gms/internal/measurement/ik;
 
     move-result-object v0
 
@@ -374,10 +374,10 @@
     return-object p1
 .end method
 
-.method final synthetic xU()Ljava/lang/Object;
+.method final synthetic xT()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xW()Lcom/google/android/gms/internal/measurement/ik;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ik;->xV()Lcom/google/android/gms/internal/measurement/ik;
 
     move-result-object v0
 
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 d76dae788c..68e71ef710 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
@@ -127,7 +127,7 @@
     return v0
 .end method
 
-.method public final xl()Ljava/util/List;
+.method public final xk()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -139,14 +139,14 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/im;->beP:Lcom/google/android/gms/internal/measurement/gk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gk;->xl()Ljava/util/List;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gk;->xk()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final xm()Lcom/google/android/gms/internal/measurement/gk;
+.method public final xl()Lcom/google/android/gms/internal/measurement/gk;
     .locals 0
 
     return-object p0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$a.smali
index 9d69ef370e..5333d934db 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$a.smali
@@ -27,7 +27,7 @@
 .method public final I(Ljava/lang/Object;J)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
@@ -78,7 +78,7 @@
 .method public final P(Ljava/lang/Object;J)B
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
@@ -145,7 +145,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
@@ -182,7 +182,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$b.smali
index 7488ca04de..1c0cef6f4f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$b.smali
@@ -27,7 +27,7 @@
 .method public final I(Ljava/lang/Object;J)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
@@ -78,7 +78,7 @@
 .method public final P(Ljava/lang/Object;J)B
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
@@ -139,7 +139,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
@@ -170,7 +170,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ye()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$c.smali
index 9477b842ce..91e188abf1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip$c.smali
@@ -125,7 +125,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/internal/measurement/ip$c;->bfn:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yd()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yc()J
 
     move-result-wide v2
 
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 a0566d48d9..2da8d56dd3 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
@@ -84,13 +84,13 @@
 
     sput-object v0, Lcom/google/android/gms/internal/measurement/ip;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xZ()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xY()Lsun/misc/Unsafe;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/internal/measurement/ip;->bdS:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vM()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vL()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -121,7 +121,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vK()Z
 
     move-result v0
 
@@ -163,13 +163,13 @@
     :goto_0
     sput-object v1, Lcom/google/android/gms/internal/measurement/ip;->beW:Lcom/google/android/gms/internal/measurement/ip$d;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ya()Z
 
     move-result v0
 
     sput-boolean v0, Lcom/google/android/gms/internal/measurement/ip;->beX:Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->ya()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xZ()Z
 
     move-result v0
 
@@ -305,7 +305,7 @@
 
     sput-wide v0, Lcom/google/android/gms/internal/measurement/ip;->bfk:J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yc()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yb()Ljava/lang/reflect/Field;
 
     move-result-object v0
 
@@ -318,8 +318,6 @@
     goto :goto_1
 
     :cond_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ip;->beW:Lcom/google/android/gms/internal/measurement/ip$d;
-
     iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ip$d;->bfn:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
@@ -565,7 +563,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vK()Z
 
     move-result v0
 
@@ -1061,7 +1059,7 @@
     return p0
 .end method
 
-.method static xX()Z
+.method static xW()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/measurement/ip;->bbb:Z
@@ -1069,7 +1067,7 @@
     return v0
 .end method
 
-.method static xY()Z
+.method static xX()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/measurement/ip;->beX:Z
@@ -1077,7 +1075,7 @@
     return v0
 .end method
 
-.method static xZ()Lsun/misc/Unsafe;
+.method static xY()Lsun/misc/Unsafe;
     .locals 1
 
     :try_start_0
@@ -1102,7 +1100,7 @@
     return-object v0
 .end method
 
-.method private static ya()Z
+.method private static xZ()Z
     .locals 8
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->bdS:Lsun/misc/Unsafe;
@@ -1115,8 +1113,6 @@
 
     :cond_0
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->bdS:Lsun/misc/Unsafe;
-
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v0
@@ -1253,7 +1249,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/ej;->vL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vK()Z
 
     move-result v2
 
@@ -1438,7 +1434,7 @@
     return v1
 .end method
 
-.method private static yb()Z
+.method private static ya()Z
     .locals 8
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->bdS:Lsun/misc/Unsafe;
@@ -1451,8 +1447,6 @@
 
     :cond_0
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->bdS:Lsun/misc/Unsafe;
-
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v0
@@ -1485,7 +1479,7 @@
 
     invoke-virtual {v0, v2, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yc()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->yb()Ljava/lang/reflect/Field;
 
     move-result-object v2
 
@@ -1494,7 +1488,7 @@
     return v1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vK()Z
 
     move-result v2
 
@@ -1673,10 +1667,10 @@
     return v1
 .end method
 
-.method private static yc()Ljava/lang/reflect/Field;
+.method private static yb()Ljava/lang/reflect/Field;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vK()Z
 
     move-result v0
 
@@ -1721,7 +1715,7 @@
     return-object v0
 .end method
 
-.method static synthetic yd()J
+.method static synthetic yc()J
     .locals 2
 
     sget-wide v0, Lcom/google/android/gms/internal/measurement/ip;->beY:J
@@ -1729,7 +1723,7 @@
     return-wide v0
 .end method
 
-.method static synthetic ye()Z
+.method static synthetic yd()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/measurement/ip;->bfm:Z
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 19734fb807..2c614145b5 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
@@ -10,13 +10,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xX()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xW()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xY()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ip;->xX()Z
 
     move-result v0
 
@@ -32,7 +32,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ej;->vK()Z
 
     move-result v0
 
@@ -320,6 +320,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static em(I)I
@@ -331,6 +333,8 @@
 
     const/4 p0, -0x1
 
+    return p0
+
     :cond_0
     return p0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/is.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/is.smali
index d54a08e31a..54d8c27e86 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
@@ -84,7 +84,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p0
 
@@ -148,7 +148,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p0
 
@@ -188,7 +188,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p0
 
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 2ff41564f2..f1adbb5f64 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
@@ -71,7 +71,7 @@
 
     invoke-virtual {p1, v1, v4}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_0
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_6
 
     goto/16 :goto_5
 
@@ -141,7 +141,7 @@
 
     move-result v2
     :try_end_2
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_2 .. :try_end_2} :catch_2
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_2 .. :try_end_2} :catch_4
 
     add-int/lit8 v4, v1, 0x1
 
@@ -154,7 +154,7 @@
     :try_start_3
     invoke-virtual {p1, v1, v6}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_3
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_3 .. :try_end_3} :catch_1
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_3 .. :try_end_3} :catch_2
 
     add-int/lit8 v1, v4, 0x1
 
@@ -169,7 +169,7 @@
     :try_start_4
     invoke-virtual {p1, v4, v6}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_4
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_4 .. :try_end_4} :catch_2
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_4 .. :try_end_4} :catch_3
 
     add-int/lit8 v4, v1, 0x1
 
@@ -205,12 +205,20 @@
 
     goto :goto_2
 
+    :catch_2
+    move v1, v4
+
+    :catch_3
+    move v2, v5
+
+    goto :goto_6
+
     :cond_5
     move v2, v5
 
     goto :goto_3
 
-    :catch_2
+    :catch_4
     :goto_2
     move v2, v5
 
@@ -225,7 +233,7 @@
 
     throw v3
     :try_end_6
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_6 .. :try_end_6} :catch_3
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_6 .. :try_end_6} :catch_6
 
     :cond_7
     :goto_4
@@ -240,7 +248,7 @@
     :try_start_7
     invoke-virtual {p1, v1, v6}, Ljava/nio/ByteBuffer;->put(IB)Ljava/nio/ByteBuffer;
     :try_end_7
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_7 .. :try_end_7} :catch_0
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_7 .. :try_end_7} :catch_5
 
     add-int/lit8 v1, v5, 0x1
 
@@ -270,14 +278,19 @@
 
     goto/16 :goto_1
 
+    :catch_5
+    move v1, v5
+
+    goto :goto_6
+
     :cond_8
     invoke-virtual {p1, v1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
     :try_end_8
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_8 .. :try_end_8} :catch_3
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_8 .. :try_end_8} :catch_6
 
     return-void
 
-    :catch_3
+    :catch_6
     :goto_6
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->position()I
 
@@ -328,6 +341,8 @@
     invoke-direct {p1, p0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
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 1a862f08bb..8f7e5dead1 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
@@ -74,10 +74,9 @@
 
     aput-byte v3, p2, p3
 
-    :goto_2
     move p3, v4
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     const/16 v4, 0x800
@@ -108,7 +107,7 @@
 
     aput-byte v3, p2, v4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const v4, 0xdfff
@@ -156,6 +155,8 @@
 
     aput-byte v3, p2, p3
 
+    move p3, v4
+
     goto :goto_2
 
     :cond_5
@@ -231,7 +232,7 @@
 
     move v1, v4
 
-    :goto_3
+    :goto_2
     add-int/lit8 v1, v1, 0x1
 
     goto/16 :goto_1
@@ -351,7 +352,7 @@
 
     aget-byte p2, p1, p2
 
-    if-gez p2, :cond_d
+    if-gez p2, :cond_e
 
     const/16 v2, -0x20
 
@@ -440,7 +441,7 @@
 
     aget-byte v1, p1, v1
 
-    if-gt v1, v4, :cond_c
+    if-gt v1, v4, :cond_d
 
     shl-int/lit8 p2, p2, 0x1c
 
@@ -450,24 +451,32 @@
 
     shr-int/lit8 p2, p2, 0x1e
 
-    if-nez p2, :cond_c
+    if-nez p2, :cond_d
 
     add-int/lit8 p2, v2, 0x1
 
     aget-byte v1, p1, v2
 
-    if-gt v1, v4, :cond_c
+    if-gt v1, v4, :cond_d
 
     add-int/lit8 v1, p2, 0x1
 
     aget-byte p2, p1, p2
 
-    if-le p2, v4, :cond_d
+    if-le p2, v4, :cond_c
+
+    goto :goto_2
 
     :cond_c
-    return v3
+    move p2, v1
+
+    goto :goto_1
 
     :cond_d
+    :goto_2
+    return v3
+
+    :cond_e
     move p2, v1
 
     goto :goto_1
@@ -614,7 +623,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -650,7 +659,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -696,7 +705,7 @@
     goto :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -747,4 +756,6 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
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 6f25dbd534..71ec2e1a5e 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
@@ -150,14 +150,13 @@
 
     add-long v12, v4, v9
 
-    :goto_2
     int-to-byte v11, v11
 
     invoke-static {v1, v4, v5, v11}, Lcom/google/android/gms/internal/measurement/ip;->a([BJB)V
 
     move-wide v4, v12
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     const/16 v12, 0x800
@@ -192,7 +191,7 @@
 
     invoke-static {v1, v12, v13, v11}, Lcom/google/android/gms/internal/measurement/ip;->a([BJB)V
 
-    goto :goto_3
+    goto/16 :goto_2
 
     :cond_3
     const v12, 0xdfff
@@ -240,6 +239,12 @@
 
     or-int/2addr v11, v3
 
+    int-to-byte v11, v11
+
+    invoke-static {v1, v4, v5, v11}, Lcom/google/android/gms/internal/measurement/ip;->a([BJB)V
+
+    move-wide v4, v12
+
     goto :goto_2
 
     :cond_5
@@ -315,7 +320,7 @@
 
     move v2, v12
 
-    :goto_3
+    :goto_2
     add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_1
@@ -428,10 +433,12 @@
     invoke-direct {v1, v0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method final b(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
-    .locals 20
+    .locals 21
 
     move-object/from16 v0, p1
 
@@ -499,7 +506,6 @@
     :cond_0
     if-ne v9, v8, :cond_1
 
-    :goto_1
     sub-long/2addr v4, v2
 
     long-to-int v0, v4
@@ -509,7 +515,7 @@
     return-void
 
     :cond_1
-    :goto_2
+    :goto_1
     if-ge v9, v8, :cond_b
 
     invoke-interface {v0, v9}, Ljava/lang/CharSequence;->charAt(I)C
@@ -528,13 +534,11 @@
 
     invoke-static {v4, v5, v13}, Lcom/google/android/gms/internal/measurement/ip;->a(JB)V
 
-    :goto_3
     move-wide v4, v11
 
-    :goto_4
     const/16 v11, 0x80
 
-    goto/16 :goto_5
+    goto/16 :goto_2
 
     :cond_2
     const/16 v14, 0x800
@@ -573,7 +577,11 @@
 
     move-wide v14, v4
 
-    goto :goto_3
+    move-wide v4, v11
+
+    const/16 v11, 0x80
+
+    goto/16 :goto_2
 
     :cond_3
     const v10, 0xdfff
@@ -585,13 +593,13 @@
     if-ge v10, v13, :cond_5
 
     :cond_4
-    const-wide/16 v15, 0x3
+    const-wide/16 v17, 0x3
 
-    sub-long v15, v6, v15
+    sub-long v17, v6, v17
 
-    cmp-long v17, v4, v15
+    cmp-long v15, v4, v17
 
-    if-gtz v17, :cond_5
+    if-gtz v15, :cond_5
 
     add-long v14, v4, v11
 
@@ -619,7 +627,7 @@
 
     const-wide/16 v14, 0x1
 
-    add-long v18, v4, v14
+    add-long v19, v4, v14
 
     and-int/lit8 v10, v13, 0x3f
 
@@ -629,11 +637,13 @@
 
     invoke-static {v4, v5, v10}, Lcom/google/android/gms/internal/measurement/ip;->a(JB)V
 
-    move-wide/from16 v14, v18
+    move-wide/from16 v14, v19
 
     const-wide/16 v4, 0x1
 
-    goto :goto_4
+    const/16 v11, 0x80
+
+    goto :goto_2
 
     :cond_5
     const-wide/16 v11, 0x4
@@ -718,7 +728,7 @@
 
     move-wide v14, v12
 
-    :goto_5
+    :goto_2
     add-int/lit8 v9, v9, 0x1
 
     move-wide v11, v4
@@ -727,7 +737,7 @@
 
     const/16 v10, 0x80
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_6
     move v9, v10
@@ -797,9 +807,13 @@
     throw v0
 
     :cond_b
-    const/4 v0, 0x0
+    sub-long/2addr v4, v2
 
-    goto/16 :goto_1
+    long-to-int v0, v4
+
+    invoke-virtual {v1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    return-void
 
     :cond_c
     new-instance v2, Ljava/lang/ArrayIndexOutOfBoundsException;
@@ -839,6 +853,8 @@
     invoke-direct {v2, v0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v2
+
+    return-void
 .end method
 
 .method final g([BII)I
@@ -858,7 +874,7 @@
 
     const/4 v3, 0x0
 
-    if-ltz v0, :cond_12
+    if-ltz v0, :cond_13
 
     int-to-long v4, p2
 
@@ -1021,8 +1037,6 @@
     if-ge v4, v5, :cond_e
 
     :cond_d
-    const/4 p3, 0x0
-
     add-long v4, v10, v6
 
     invoke-static {p1, v10, v11}, Lcom/google/android/gms/internal/measurement/ip;->a([BJ)B
@@ -1052,7 +1066,7 @@
 
     move-result v0
 
-    if-gt v0, v8, :cond_11
+    if-gt v0, v8, :cond_12
 
     shl-int/lit8 p3, p3, 0x1c
 
@@ -1062,7 +1076,7 @@
 
     shr-int/lit8 p3, p3, 0x1e
 
-    if-nez p3, :cond_11
+    if-nez p3, :cond_12
 
     add-long v4, v10, v6
 
@@ -1070,7 +1084,7 @@
 
     move-result p3
 
-    if-gt p3, v8, :cond_11
+    if-gt p3, v8, :cond_12
 
     add-long v10, v4, v6
 
@@ -1078,12 +1092,20 @@
 
     move-result p3
 
-    if-le p3, v8, :cond_8
+    if-le p3, v8, :cond_11
+
+    goto :goto_5
 
     :cond_11
-    return v9
+    move-wide v4, v10
+
+    goto/16 :goto_2
 
     :cond_12
+    :goto_5
+    return v9
+
+    :cond_13
     new-instance v0, Ljava/lang/ArrayIndexOutOfBoundsException;
 
     new-array v2, v2, [Ljava/lang/Object;
@@ -1119,6 +1141,8 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method final k([BII)Ljava/lang/String;
@@ -1278,7 +1302,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -1322,7 +1346,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -1380,7 +1404,7 @@
     goto/16 :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xj()Lcom/google/android/gms/internal/measurement/gb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gb;->xi()Lcom/google/android/gms/internal/measurement/gb;
 
     move-result-object p1
 
@@ -1431,4 +1455,6 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .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 ef47f4ed23..bf456aa9a2 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
@@ -59,8 +59,6 @@
 
     if-eqz v4, :cond_1
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/j;->aTU:J
-
     iput-wide v0, p1, Lcom/google/android/gms/internal/measurement/j;->aTU:J
 
     :cond_1
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 df07a9d5aa..dfddca3fd6 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
@@ -513,5 +513,5 @@
     .end annotation
 .end method
 
-.method public abstract wy()I
+.method public abstract wx()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali
index 39b4111ebf..66cf0f48c2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali
@@ -64,7 +64,7 @@
 .end method
 
 .method private final dM(I)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -75,21 +75,17 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
 
-    add-int/2addr v0, p1
+    add-int v1, v0, p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
 
-    if-gt v0, v1, :cond_1
+    if-gt v1, v2, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfV:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->bfV:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
+    sub-int/2addr v1, v0
 
-    sub-int/2addr v0, v1
-
-    if-gt p1, v0, :cond_0
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
+    if-gt p1, v1, :cond_0
 
     add-int/2addr v0, p1
 
@@ -98,29 +94,25 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yi()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
+    sub-int/2addr v2, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
+    invoke-direct {p0, v2}, Lcom/google/android/gms/internal/measurement/je;->dM(I)V
 
-    sub-int/2addr p1, v0
-
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/je;->dM(I)V
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yi()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yk()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
@@ -137,7 +129,7 @@
     return-object v0
 .end method
 
-.method private final wn()V
+.method private final wm()V
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfV:I
@@ -154,13 +146,9 @@
 
     if-le v0, v1, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
+    sub-int v1, v0, v1
 
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/je;->baT:I
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfV:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/je;->baT:I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->baT:I
 
@@ -178,7 +166,7 @@
     return-void
 .end method
 
-.method private final wo()B
+.method private final wn()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -192,20 +180,18 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/je;->buffer:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/je;->buffer:[B
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
-
-    add-int/lit8 v2, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
     iput v2, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
 
-    aget-byte v0, v0, v1
+    aget-byte v0, v1, v0
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yi()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object v0
 
@@ -252,7 +238,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wi()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ex;->wh()I
 
     move-result v0
 
@@ -284,7 +270,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfX:Lcom/google/android/gms/internal/measurement/ex;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wE()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fg;->wD()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -378,7 +364,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -415,7 +401,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->ym()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yl()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
@@ -429,17 +415,15 @@
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->bfT:I
 
-    sub-int/2addr v0, v1
+    sub-int v2, v0, v1
 
-    if-gt p1, v0, :cond_1
+    if-gt p1, v2, :cond_1
 
     if-ltz p1, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfT:I
+    add-int/2addr v1, p1
 
-    add-int/2addr v0, p1
-
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/je;->baV:I
 
@@ -471,10 +455,6 @@
     :cond_1
     new-instance p2, Ljava/lang/IllegalArgumentException;
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
-
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->bfT:I
-
     sub-int/2addr v0, v1
 
     const/16 v1, 0x32
@@ -548,19 +528,19 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wm()V
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yi()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yk()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
@@ -590,7 +570,7 @@
     throw p1
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wl()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wk()I
 
     return v1
 
@@ -601,7 +581,7 @@
 
     :cond_0
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v0
 
@@ -625,7 +605,7 @@
     return v1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result p1
 
@@ -634,12 +614,12 @@
     return v1
 
     :pswitch_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wm()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wl()J
 
     return v1
 
     :pswitch_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     return v1
 
@@ -659,7 +639,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wm()V
 
     return-void
 .end method
@@ -694,7 +674,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -710,13 +690,11 @@
 
     new-instance v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/je;->buffer:[B
-
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/je;->buffer:[B
 
     sget-object v4, Lcom/google/android/gms/internal/measurement/jm;->UTF_8:Ljava/nio/charset/Charset;
 
-    invoke-direct {v1, v2, v3, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
+    invoke-direct {v1, v3, v2, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
     iget v2, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
 
@@ -727,21 +705,21 @@
     return-object v1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yi()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object v0
 
     throw v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yk()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final vR()I
+.method public final vQ()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -762,7 +740,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -772,8 +750,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->baV:I
-
     return v0
 
     :cond_1
@@ -786,7 +762,7 @@
     throw v0
 .end method
 
-.method public final vX()Z
+.method public final vW()Z
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -794,7 +770,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v0
 
@@ -810,7 +786,7 @@
     return v0
 .end method
 
-.method public final wj()I
+.method public final wi()I
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -818,7 +794,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v0
 
@@ -829,7 +805,7 @@
     :cond_0
     and-int/lit8 v0, v0, 0x7f
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v1
 
@@ -837,10 +813,9 @@
 
     shl-int/lit8 v1, v1, 0x7
 
-    :goto_0
     or-int/2addr v0, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     and-int/lit8 v1, v1, 0x7f
@@ -849,7 +824,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v1
 
@@ -857,7 +832,9 @@
 
     shl-int/lit8 v1, v1, 0xe
 
-    goto :goto_0
+    or-int/2addr v0, v1
+
+    goto :goto_1
 
     :cond_2
     and-int/lit8 v1, v1, 0x7f
@@ -866,7 +843,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v1
 
@@ -874,7 +851,9 @@
 
     shl-int/lit8 v1, v1, 0x15
 
-    goto :goto_0
+    or-int/2addr v0, v1
+
+    goto :goto_1
 
     :cond_3
     and-int/lit8 v1, v1, 0x7f
@@ -883,7 +862,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v1
 
@@ -895,12 +874,12 @@
 
     const/4 v1, 0x0
 
-    :goto_1
+    :goto_0
     const/4 v2, 0x5
 
     if-ge v1, v2, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v2
 
@@ -911,21 +890,21 @@
     :cond_4
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yl()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yk()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object v0
 
     throw v0
 
     :cond_6
-    :goto_2
+    :goto_1
     return v0
 .end method
 
-.method public final wk()J
+.method public final wj()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -942,7 +921,7 @@
 
     if-ge v0, v3, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v3
 
@@ -966,14 +945,16 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yl()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yk()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object v0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final wl()I
+.method public final wk()I
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -981,19 +962,19 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v3
 
@@ -1020,7 +1001,7 @@
     return v0
 .end method
 
-.method public final wm()J
+.method public final wl()J
     .locals 13
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1028,35 +1009,35 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v3
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v4
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v6
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wo()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/je;->wn()B
 
     move-result v7
 
@@ -1139,7 +1120,7 @@
     return-wide v0
 .end method
 
-.method public final yf()I
+.method public final ye()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
@@ -1153,11 +1134,9 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->bfW:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/je;->baW:I
+    sub-int/2addr v0, v1
 
-    sub-int/2addr v1, v0
-
-    return v1
+    return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali
index 52bf493753..8c2883bbef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali
@@ -236,7 +236,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result p1
 
@@ -411,6 +411,8 @@
     invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static cf(Ljava/lang/String;)I
@@ -507,7 +509,7 @@
 
     add-int/2addr v7, v9
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_1
     add-int/2addr v7, v5
@@ -529,10 +531,9 @@
 
     aput-byte v10, v0, v7
 
-    :goto_2
     move v7, v11
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_2
     if-ge v10, v4, :cond_3
@@ -561,7 +562,7 @@
 
     aput-byte v10, v0, v11
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     if-lt v10, v3, :cond_4
@@ -605,6 +606,8 @@
 
     aput-byte v10, v0, v7
 
+    move v7, v11
+
     goto :goto_2
 
     :cond_5
@@ -680,7 +683,7 @@
 
     move v5, v11
 
-    :goto_3
+    :goto_2
     add-int/lit8 v5, v5, 0x1
 
     goto/16 :goto_1
@@ -741,7 +744,7 @@
     throw p0
 
     :cond_9
-    :goto_4
+    :goto_3
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->arrayOffset()I
 
     move-result p0
@@ -770,7 +773,7 @@
 
     move-result v0
 
-    :goto_5
+    :goto_4
     if-ge v5, v0, :cond_11
 
     invoke-interface {p0, v5}, Ljava/lang/CharSequence;->charAt(I)C
@@ -779,12 +782,11 @@
 
     if-ge v7, v6, :cond_b
 
-    :goto_6
     int-to-byte v7, v7
 
     invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
-    goto/16 :goto_9
+    goto/16 :goto_6
 
     :cond_b
     if-ge v7, v4, :cond_c
@@ -793,7 +795,6 @@
 
     or-int/lit16 v8, v8, 0x3c0
 
-    :goto_7
     int-to-byte v8, v8
 
     invoke-virtual {p1, v8}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
@@ -802,6 +803,10 @@
 
     or-int/2addr v7, v6
 
+    int-to-byte v7, v7
+
+    invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
     goto :goto_6
 
     :cond_c
@@ -809,7 +814,7 @@
 
     if-ge v2, v7, :cond_d
 
-    goto :goto_8
+    goto :goto_5
 
     :cond_d
     add-int/lit8 v8, v5, 0x1
@@ -872,7 +877,7 @@
 
     move v5, v8
 
-    goto :goto_9
+    goto :goto_6
 
     :cond_e
     move v5, v8
@@ -901,7 +906,7 @@
     throw p0
 
     :cond_10
-    :goto_8
+    :goto_5
     ushr-int/lit8 v8, v7, 0xc
 
     or-int/lit16 v8, v8, 0x1e0
@@ -916,12 +921,22 @@
 
     or-int/2addr v8, v6
 
-    goto :goto_7
+    int-to-byte v8, v8
 
-    :goto_9
+    invoke-virtual {p1, v8}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    and-int/lit8 v7, v7, 0x3f
+
+    or-int/2addr v7, v6
+
+    int-to-byte v7, v7
+
+    invoke-virtual {p1, v7}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
+
+    :goto_6
     add-int/lit8 v5, v5, 0x1
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_11
     return-void
@@ -932,6 +947,8 @@
     invoke-direct {p0}, Ljava/nio/ReadOnlyBufferException;-><init>()V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static dW(I)I
@@ -1246,7 +1263,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->yn()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->ym()I
 
     move-result v0
 
@@ -1501,7 +1518,7 @@
     return-void
 .end method
 
-.method public final yg()V
+.method public final yf()V
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jf;->bbg:Ljava/nio/ByteBuffer;
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 55313f5560..1512e749b1 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
@@ -127,7 +127,7 @@
 
     const/4 p2, 0x0
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_2
 
     new-instance p1, Lcom/google/android/gms/internal/measurement/jk;
 
@@ -135,20 +135,16 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ji;->bgb:Lcom/google/android/gms/internal/measurement/jk;
 
-    :cond_2
-    :goto_1
     move-object p1, p2
 
     goto :goto_2
 
-    :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ji;->bgb:Lcom/google/android/gms/internal/measurement/jk;
-
+    :cond_2
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/jk;->er(I)I
 
     move-result v3
 
-    if-ltz v3, :cond_2
+    if-ltz v3, :cond_4
 
     iget-object v4, p1, Lcom/google/android/gms/internal/measurement/jk;->bgh:[Lcom/google/android/gms/internal/measurement/jl;
 
@@ -156,15 +152,21 @@
 
     sget-object v5, Lcom/google/android/gms/internal/measurement/jk;->bge:Lcom/google/android/gms/internal/measurement/jl;
 
-    if-ne v4, v5, :cond_4
+    if-ne v4, v5, :cond_3
 
     goto :goto_1
 
-    :cond_4
+    :cond_3
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/jk;->bgh:[Lcom/google/android/gms/internal/measurement/jl;
 
     aget-object p1, p1, v3
 
+    goto :goto_2
+
+    :cond_4
+    :goto_1
+    move-object p1, p2
+
     :goto_2
     const/4 v3, 0x1
 
@@ -321,7 +323,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/je;->wj()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/je;->wi()I
 
     move-result v2
 
@@ -346,7 +348,7 @@
     goto :goto_4
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yj()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yi()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
@@ -429,7 +431,7 @@
         }
     .end annotation
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/jo;->yh()Lcom/google/android/gms/internal/measurement/jo;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/jo;->yg()Lcom/google/android/gms/internal/measurement/jo;
 
     move-result-object v0
 
@@ -440,7 +442,7 @@
     return-object v0
 .end method
 
-.method protected vj()I
+.method protected vi()I
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ji;->bgb:Lcom/google/android/gms/internal/measurement/jk;
@@ -464,7 +466,7 @@
 
     aget-object v2, v2, v1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jl;->vj()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jl;->vi()I
 
     move-result v2
 
@@ -481,7 +483,7 @@
     return v0
 .end method
 
-.method public final synthetic yh()Lcom/google/android/gms/internal/measurement/jo;
+.method public final synthetic yg()Lcom/google/android/gms/internal/measurement/jo;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
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 608888c299..1197e4db56 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
@@ -112,7 +112,7 @@
     return-object v1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->ym()Lcom/google/android/gms/internal/measurement/jn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->yl()Lcom/google/android/gms/internal/measurement/jn;
 
     move-result-object p1
 
@@ -402,9 +402,7 @@
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jj;->bgc:Ljava/lang/Class;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/jj;->bgc:Ljava/lang/Class;
-
-    invoke-virtual {v3}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+    invoke-virtual {v0}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
 
     move-result-object v3
 
@@ -488,19 +486,17 @@
 
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/jj;->type:I
-
-    const/16 v1, 0x18
+    const/16 v0, 0x18
 
     new-instance v2, Ljava/lang/StringBuilder;
 
-    invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(I)V
+    invoke-direct {v2, v0}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    const-string v1, "Unknown type "
+    const-string v0, "Unknown type "
 
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -530,7 +526,7 @@
 
     shl-int/lit8 v0, v0, 0x1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result p1
 
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 21463ec2ae..5dfcb1a41c 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
@@ -135,23 +135,21 @@
 
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/jk;->bgh:[Lcom/google/android/gms/internal/measurement/jl;
 
+    aget-object v3, v2, v4
+
+    if-eqz v3, :cond_0
+
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/jk;->bgh:[Lcom/google/android/gms/internal/measurement/jl;
+
     aget-object v2, v2, v4
 
-    if-eqz v2, :cond_0
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jl;->clone()Ljava/lang/Object;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/jk;->bgh:[Lcom/google/android/gms/internal/measurement/jl;
+    move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/jk;->bgh:[Lcom/google/android/gms/internal/measurement/jl;
+    check-cast v2, Lcom/google/android/gms/internal/measurement/jl;
 
-    aget-object v3, v3, v4
-
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/jl;->clone()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/google/android/gms/internal/measurement/jl;
-
-    aput-object v3, v2, v4
+    aput-object v2, v3, v4
 
     :cond_0
     add-int/lit8 v4, v4, 0x1
@@ -194,20 +192,18 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jk;->bgg:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/jk;->bgg:[I
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/jk;->bgg:[I
-
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/jk;->mSize:I
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/jk;->bgg:[I
 
     const/4 v5, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_4
+    if-ge v5, v1, :cond_4
 
-    aget v6, v1, v5
+    aget v6, v3, v5
 
-    aget v7, v3, v5
+    aget v7, v4, v5
 
     if-eq v6, v7, :cond_3
 
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 3da81236bd..28c428959e 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
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jl;->vj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jl;->vi()I
 
     move-result v0
 
@@ -68,7 +68,7 @@
     return-object v0
 .end method
 
-.method private final yi()Lcom/google/android/gms/internal/measurement/jl;
+.method private final yh()Lcom/google/android/gms/internal/measurement/jl;
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/jl;
@@ -118,10 +118,9 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/jo;
 
-    :goto_1
     iput-object v1, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -138,7 +137,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+
+    goto/16 :goto_3
 
     :cond_2
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -159,7 +160,7 @@
 
     iput-object v3, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
 
-    :goto_2
+    :goto_1
     array-length v4, v1
 
     if-ge v2, v4, :cond_9
@@ -176,7 +177,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -193,7 +194,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_4
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -210,7 +213,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_5
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -227,7 +232,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_6
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -244,7 +251,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_7
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -261,7 +270,9 @@
 
     move-result-object v1
 
-    goto :goto_1
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+
+    goto :goto_3
 
     :cond_8
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -280,7 +291,7 @@
 
     iput-object v3, v0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
 
-    :goto_3
+    :goto_2
     array-length v4, v1
 
     if-ge v2, v4, :cond_9
@@ -299,10 +310,10 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_9
-    :goto_4
+    :goto_3
     return-object v0
 
     :catch_0
@@ -313,6 +324,8 @@
     invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw v1
+
+    return-void
 .end method
 
 
@@ -331,28 +344,26 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->bgi:Lcom/google/android/gms/internal/measurement/jj;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/jl;->bgi:Lcom/google/android/gms/internal/measurement/jj;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
-
-    iget-boolean v3, v0, Lcom/google/android/gms/internal/measurement/jj;->bgd:Z
+    iget-boolean v3, v2, Lcom/google/android/gms/internal/measurement/jj;->bgd:Z
 
     if-eqz v3, :cond_2
 
-    invoke-static {v2}, Ljava/lang/reflect/Array;->getLength(Ljava/lang/Object;)I
+    invoke-static {v0}, Ljava/lang/reflect/Array;->getLength(Ljava/lang/Object;)I
 
     move-result v3
 
     :goto_0
     if-ge v1, v3, :cond_1
 
-    invoke-static {v2, v1}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
+    invoke-static {v0, v1}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
 
     move-result-object v4
 
     if-eqz v4, :cond_0
 
-    invoke-virtual {v0, v4, p1}, Lcom/google/android/gms/internal/measurement/jj;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/jf;)V
+    invoke-virtual {v2, v4, p1}, Lcom/google/android/gms/internal/measurement/jj;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/jf;)V
 
     :cond_0
     add-int/lit8 v1, v1, 0x1
@@ -363,7 +374,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {v0, v2, p1}, Lcom/google/android/gms/internal/measurement/jj;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/jf;)V
+    invoke-virtual {v2, v0, p1}, Lcom/google/android/gms/internal/measurement/jj;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/jf;)V
 
     return-void
 
@@ -440,7 +451,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/jl;->yi()Lcom/google/android/gms/internal/measurement/jl;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/jl;->yh()Lcom/google/android/gms/internal/measurement/jl;
 
     move-result-object v0
 
@@ -485,8 +496,6 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->bgi:Lcom/google/android/gms/internal/measurement/jj;
-
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/jj;->bgc:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Class;->isArray()Z
@@ -508,11 +517,9 @@
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, [B
+    instance-of v1, v0, [B
 
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_4
 
     check-cast v0, [B
 
@@ -527,13 +534,9 @@
     return p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    instance-of v1, v0, [I
 
-    instance-of v0, v0, [I
-
-    if-eqz v0, :cond_5
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_5
 
     check-cast v0, [I
 
@@ -548,13 +551,9 @@
     return p1
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    instance-of v1, v0, [J
 
-    instance-of v0, v0, [J
-
-    if-eqz v0, :cond_6
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_6
 
     check-cast v0, [J
 
@@ -569,13 +568,9 @@
     return p1
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    instance-of v1, v0, [F
 
-    instance-of v0, v0, [F
-
-    if-eqz v0, :cond_7
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_7
 
     check-cast v0, [F
 
@@ -590,13 +585,9 @@
     return p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    instance-of v1, v0, [D
 
-    instance-of v0, v0, [D
-
-    if-eqz v0, :cond_8
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_8
 
     check-cast v0, [D
 
@@ -611,13 +602,9 @@
     return p1
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    instance-of v1, v0, [Z
 
-    instance-of v0, v0, [Z
-
-    if-eqz v0, :cond_9
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_9
 
     check-cast v0, [Z
 
@@ -632,8 +619,6 @@
     return p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
-
     check-cast v0, [Ljava/lang/Object;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -651,15 +636,11 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/jl;->bgj:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/jl;->bgj:Ljava/util/List;
 
-    if-eqz v0, :cond_b
+    if-eqz v1, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->bgj:Ljava/util/List;
-
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/jl;->bgj:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
+    invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -721,7 +702,7 @@
     throw v1
 .end method
 
-.method final vj()I
+.method final vi()I
     .locals 6
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
@@ -730,15 +711,13 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->bgi:Lcom/google/android/gms/internal/measurement/jj;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/jl;->bgi:Lcom/google/android/gms/internal/measurement/jj;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/jl;->value:Ljava/lang/Object;
-
-    iget-boolean v3, v0, Lcom/google/android/gms/internal/measurement/jj;->bgd:Z
+    iget-boolean v3, v2, Lcom/google/android/gms/internal/measurement/jj;->bgd:Z
 
     if-eqz v3, :cond_1
 
-    invoke-static {v2}, Ljava/lang/reflect/Array;->getLength(Ljava/lang/Object;)I
+    invoke-static {v0}, Ljava/lang/reflect/Array;->getLength(Ljava/lang/Object;)I
 
     move-result v3
 
@@ -747,17 +726,17 @@
     :goto_0
     if-ge v1, v3, :cond_3
 
-    invoke-static {v2, v1}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
+    invoke-static {v0, v1}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
 
     move-result-object v5
 
     if-eqz v5, :cond_0
 
-    invoke-static {v2, v1}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
+    invoke-static {v0, v1}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
 
     move-result-object v5
 
-    invoke-virtual {v0, v5}, Lcom/google/android/gms/internal/measurement/jj;->bc(Ljava/lang/Object;)I
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/jj;->bc(Ljava/lang/Object;)I
 
     move-result v5
 
@@ -769,7 +748,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/internal/measurement/jj;->bc(Ljava/lang/Object;)I
+    invoke-virtual {v2, v0}, Lcom/google/android/gms/internal/measurement/jj;->bc(Ljava/lang/Object;)I
 
     move-result v4
 
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 5ce19aecc6..fe206ac623 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
@@ -19,7 +19,7 @@
     return-void
 .end method
 
-.method static yj()Lcom/google/android/gms/internal/measurement/jn;
+.method static yi()Lcom/google/android/gms/internal/measurement/jn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/jn;
@@ -31,7 +31,7 @@
     return-object v0
 .end method
 
-.method static yk()Lcom/google/android/gms/internal/measurement/jn;
+.method static yj()Lcom/google/android/gms/internal/measurement/jn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/jn;
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method static yl()Lcom/google/android/gms/internal/measurement/jn;
+.method static yk()Lcom/google/android/gms/internal/measurement/jn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/jn;
@@ -55,7 +55,7 @@
     return-object v0
 .end method
 
-.method static ym()Lcom/google/android/gms/internal/measurement/jn;
+.method static yl()Lcom/google/android/gms/internal/measurement/jn;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/jn;
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 1cf5a439c6..7f14e22905 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
@@ -48,7 +48,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jo;->yh()Lcom/google/android/gms/internal/measurement/jo;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jo;->yg()Lcom/google/android/gms/internal/measurement/jo;
 
     move-result-object v0
 
@@ -65,7 +65,7 @@
     return-object v0
 .end method
 
-.method protected vj()I
+.method protected vi()I
     .locals 1
 
     const/4 v0, 0x0
@@ -73,10 +73,10 @@
     return v0
 .end method
 
-.method public final wU()I
+.method public final wT()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jo;->vj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jo;->vi()I
 
     move-result v0
 
@@ -85,7 +85,7 @@
     return v0
 .end method
 
-.method public yh()Lcom/google/android/gms/internal/measurement/jo;
+.method public yg()Lcom/google/android/gms/internal/measurement/jo;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -102,14 +102,14 @@
     return-object v0
 .end method
 
-.method public final yn()I
+.method public final ym()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/jo;->bgl:I
 
     if-gez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     :cond_0
     iget v0, p0, Lcom/google/android/gms/internal/measurement/jo;->bgl:I
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 8aacb34319..f177309901 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
@@ -427,7 +427,9 @@
 
     const-string p0, "\""
 
-    goto :goto_8
+    invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
+
+    goto :goto_b
 
     :cond_e
     instance-of p0, p1, [B
@@ -440,17 +442,16 @@
 
     const-string p0, "\"\""
 
-    :goto_8
     invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_f
     invoke-virtual {p3, v0}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
     const/4 p0, 0x0
 
-    :goto_9
+    :goto_8
     array-length v3, p1
 
     if-ge p0, v3, :cond_13
@@ -465,7 +466,7 @@
 
     if-ne v3, v0, :cond_10
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_10
     if-lt v3, p2, :cond_11
@@ -474,7 +475,11 @@
 
     if-ge v3, v4, :cond_11
 
-    goto :goto_b
+    int-to-char v3, v3
+
+    invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
+    goto :goto_a
 
     :cond_11
     const-string v4, "\\%03o"
@@ -493,31 +498,30 @@
 
     invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_12
-    :goto_a
+    :goto_9
     invoke-virtual {p3, v4}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    :goto_b
     int-to-char v3, v3
 
     invoke-virtual {p3, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    :goto_c
+    :goto_a
     add-int/lit8 p0, p0, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_13
     invoke-virtual {p3, v0}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_14
     invoke-virtual {p3, p1}, Ljava/lang/StringBuffer;->append(Ljava/lang/Object;)Ljava/lang/StringBuffer;
 
-    :goto_d
+    :goto_b
     const-string p0, "\n"
 
     invoke-virtual {p3, p0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
@@ -644,32 +648,39 @@
 
     move-result v2
 
-    if-nez v1, :cond_1
+    if-nez v1, :cond_0
 
-    :goto_1
     invoke-static {v2}, Ljava/lang/Character;->toLowerCase(C)C
 
     move-result v2
 
-    :cond_0
     invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_1
+    :cond_0
     invoke-static {v2}, Ljava/lang/Character;->isUpperCase(C)Z
 
     move-result v3
 
-    if-eqz v3, :cond_0
+    if-eqz v3, :cond_1
 
     const/16 v3, 0x5f
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
+    invoke-static {v2}, Ljava/lang/Character;->toLowerCase(C)C
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
     goto :goto_1
 
-    :goto_2
+    :cond_1
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
+    :goto_1
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali
index e919698930..a8128f5fb4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali
@@ -86,7 +86,7 @@
     const/4 v1, 0x1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->vR()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/je;->vQ()I
 
     move-result v2
 
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 8e2152e273..dc56298ee1 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
@@ -75,11 +75,11 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tW()Lcom/google/android/gms/internal/measurement/al;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/t;->tV()Lcom/google/android/gms/internal/measurement/al;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/al;->uo()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/al;->un()Ljava/lang/String;
 
     move-result-object v1
 
@@ -92,7 +92,7 @@
 
     if-nez v4, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tG()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tF()Ljava/lang/String;
 
     move-result-object p1
 
@@ -268,11 +268,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tW()Lcom/google/android/gms/internal/measurement/al;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tV()Lcom/google/android/gms/internal/measurement/al;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al;->up()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al;->uo()Ljava/lang/String;
 
     move-result-object v1
 
@@ -424,7 +424,7 @@
     return v0
 .end method
 
-.method private final declared-synchronized tE()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final declared-synchronized tD()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     .locals 3
 
     monitor-enter p0
@@ -444,7 +444,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bw;->start()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tF()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tE()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
@@ -456,10 +456,9 @@
 
     if-eqz v1, :cond_0
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->aTX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v0, "Failed to reset client id on adid change. Not using adid"
@@ -474,10 +473,10 @@
 
     invoke-direct {v0, v1, v2}, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;-><init>(Ljava/lang/String;Z)V
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->aTX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->aTX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -494,7 +493,7 @@
     throw v0
 .end method
 
-.method private final tF()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final tE()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     .locals 2
 
     :try_start_0
@@ -541,7 +540,7 @@
     return-object v0
 .end method
 
-.method private final tG()Ljava/lang/String;
+.method private final tF()Ljava/lang/String;
     .locals 6
 
     const/4 v0, 0x0
@@ -611,21 +610,25 @@
     :try_start_1
     invoke-virtual {v1}, Ljava/io/FileInputStream;->close()V
     :try_end_1
-    .catch Ljava/io/FileNotFoundException; {:try_start_1 .. :try_end_1} :catch_0
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/io/FileNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
-    :catch_0
     move-object v0, v5
 
     goto :goto_1
 
-    :catch_1
+    :catch_0
     move-exception v1
 
     move-object v0, v5
 
     goto :goto_0
 
+    :catch_1
+    move-object v0, v5
+
+    goto :goto_1
+
     :catch_2
     move-exception v1
 
@@ -649,24 +652,24 @@
 
 
 # virtual methods
-.method protected final tB()V
+.method protected final tA()V
     .locals 0
 
     return-void
 .end method
 
-.method public final tC()Z
+.method public final tB()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tE()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tD()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;->isLimitAdTrackingEnabled()Z
 
@@ -680,14 +683,17 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
-.method public final tD()Ljava/lang/String;
+.method public final tC()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tE()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/k;->tD()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     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 4de33433fc..b367c1479f 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
@@ -28,11 +28,11 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/w;)J
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aUb:Lcom/google/android/gms/internal/measurement/af;
 
@@ -57,11 +57,11 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/az;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -79,7 +79,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     const-string v0, "Hit delivery requested"
 
@@ -87,7 +87,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -109,7 +109,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -125,7 +125,7 @@
 .method final onServiceConnected()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aUb:Lcom/google/android/gms/internal/measurement/af;
 
@@ -134,20 +134,20 @@
     return-void
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aUb:Lcom/google/android/gms/internal/measurement/af;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     return-void
 .end method
 
-.method public final tH()V
+.method public final tG()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
@@ -191,18 +191,18 @@
     return-void
 .end method
 
-.method public final tI()V
+.method public final tH()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aUb:Lcom/google/android/gms/internal/measurement/af;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     const-string v1, "Service disconnected"
 
@@ -211,14 +211,14 @@
     return-void
 .end method
 
-.method final tJ()V
+.method final tI()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aUb:Lcom/google/android/gms/internal/measurement/af;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->tJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->tI()V
 
     return-void
 .end method
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 9bd20adaa0..1aaa633f2e 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
@@ -33,7 +33,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/l;->aUb:Lcom/google/android/gms/internal/measurement/af;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->ui()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/af;->uh()V
 
     return-void
 .end method
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 e4d701d3db..05b6f895b1 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
@@ -45,8 +45,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->aUf:Ljava/lang/Runnable;
-
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
     :cond_0
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 010dabab4e..f8a7f34258 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
@@ -157,7 +157,7 @@
     return-object p0
 .end method
 
-.method public static tO()Z
+.method public static tN()Z
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVF:Lcom/google/android/gms/internal/measurement/bc;
@@ -184,18 +184,18 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
-
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/t;->aUm:Lcom/google/android/gms/internal/measurement/bk;
 
+    move-object v1, v0
+
     goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    :goto_0
     move-object v1, v0
 
+    :goto_0
     if-eqz v1, :cond_3
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/bb;->aVF:Lcom/google/android/gms/internal/measurement/bc;
@@ -569,7 +569,7 @@
     return-void
 .end method
 
-.method protected final tK()Lcom/google/android/gms/common/util/d;
+.method protected final tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
@@ -579,7 +579,7 @@
     return-object v0
 .end method
 
-.method protected final tL()Lcom/google/android/gms/internal/measurement/at;
+.method protected final tK()Lcom/google/android/gms/internal/measurement/at;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
@@ -589,7 +589,7 @@
     return-object v0
 .end method
 
-.method protected final tM()Lcom/google/android/gms/internal/measurement/ay;
+.method protected final tL()Lcom/google/android/gms/internal/measurement/ay;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
@@ -603,7 +603,7 @@
     return-object v0
 .end method
 
-.method protected final tN()Lcom/google/android/gms/internal/measurement/bo;
+.method protected final tM()Lcom/google/android/gms/internal/measurement/bo;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
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 3b1c83b3df..64d68c4c29 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
@@ -34,10 +34,10 @@
     return v0
 .end method
 
-.method protected abstract tB()V
+.method protected abstract tA()V
 .end method
 
-.method protected final tP()V
+.method protected final tO()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->isInitialized()Z
@@ -58,10 +58,10 @@
     throw v0
 .end method
 
-.method public final tQ()V
+.method public final tP()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tA()V
 
     const/4 v0, 0x1
 
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 0d77054e05..40646e6d4d 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
@@ -66,7 +66,7 @@
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/t;->aUk:Landroid/content/Context;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/f;->lZ()Lcom/google/android/gms/common/util/d;
+    invoke-static {}, Lcom/google/android/gms/common/util/f;->lY()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -82,11 +82,11 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/internal/measurement/bk;-><init>(Lcom/google/android/gms/internal/measurement/t;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/t;->aUm:Lcom/google/android/gms/internal/measurement/bk;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object v1
 
@@ -126,7 +126,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/internal/measurement/bo;-><init>(Lcom/google/android/gms/internal/measurement/t;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/t;->aUr:Lcom/google/android/gms/internal/measurement/bo;
 
@@ -134,7 +134,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/internal/measurement/by;-><init>(Lcom/google/android/gms/internal/measurement/t;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/t;->aUq:Lcom/google/android/gms/internal/measurement/by;
 
@@ -174,19 +174,19 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/analytics/b;-><init>(Lcom/google/android/gms/internal/measurement/t;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/t;->aUt:Lcom/google/android/gms/internal/measurement/al;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object v2, p0, Lcom/google/android/gms/internal/measurement/t;->aUu:Lcom/google/android/gms/internal/measurement/k;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object v3, p0, Lcom/google/android/gms/internal/measurement/t;->aUv:Lcom/google/android/gms/internal/measurement/ae;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object v4, p0, Lcom/google/android/gms/internal/measurement/t;->aUw:Lcom/google/android/gms/internal/measurement/ax;
 
@@ -194,36 +194,36 @@
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/internal/measurement/ay;-><init>(Lcom/google/android/gms/internal/measurement/t;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/t;->aUp:Lcom/google/android/gms/internal/measurement/ay;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/r;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/t;->aUo:Lcom/google/android/gms/internal/measurement/l;
 
     iget-object p1, v0, Lcom/google/android/gms/analytics/d;->Yg:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tV()Lcom/google/android/gms/internal/measurement/by;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/t;->tU()Lcom/google/android/gms/internal/measurement/by;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->vb()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->va()Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->vc()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->vb()Z
 
     move-result v2
 
     if-eqz v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->vd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->vc()Z
 
     move-result v2
 
     iput-boolean v2, v0, Lcom/google/android/gms/analytics/b;->Yd:Z
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->vb()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/by;->va()Z
 
     const/4 p1, 0x1
 
@@ -274,7 +274,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/f;->lZ()Lcom/google/android/gms/common/util/d;
+    invoke-static {}, Lcom/google/android/gms/common/util/f;->lY()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -292,14 +292,12 @@
 
     sput-object p0, Lcom/google/android/gms/internal/measurement/t;->aUj:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/b;->kr()V
+    invoke-static {}, Lcom/google/android/gms/analytics/b;->kq()V
 
     invoke-interface {v1}, Lcom/google/android/gms/common/util/d;->elapsedRealtime()J
 
     move-result-wide v4
 
-    const/4 v1, 0x0
-
     sub-long/2addr v4, v2
 
     sget-object v1, Lcom/google/android/gms/internal/measurement/bb;->aWt:Lcom/google/android/gms/internal/measurement/bc;
@@ -316,7 +314,7 @@
 
     if-lez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/internal/measurement/bk;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tQ()Lcom/google/android/gms/internal/measurement/bk;
 
     move-result-object p0
 
@@ -355,7 +353,7 @@
 
 
 # virtual methods
-.method public final tR()Lcom/google/android/gms/internal/measurement/bk;
+.method public final tQ()Lcom/google/android/gms/internal/measurement/bk;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aUm:Lcom/google/android/gms/internal/measurement/bk;
@@ -367,7 +365,7 @@
     return-object v0
 .end method
 
-.method public final tS()Lcom/google/android/gms/analytics/m;
+.method public final tR()Lcom/google/android/gms/analytics/m;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aUn:Lcom/google/android/gms/analytics/m;
@@ -379,7 +377,7 @@
     return-object v0
 .end method
 
-.method public final tT()Lcom/google/android/gms/internal/measurement/l;
+.method public final tS()Lcom/google/android/gms/internal/measurement/l;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aUo:Lcom/google/android/gms/internal/measurement/l;
@@ -391,7 +389,7 @@
     return-object v0
 .end method
 
-.method public final tU()Lcom/google/android/gms/analytics/b;
+.method public final tT()Lcom/google/android/gms/analytics/b;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aUs:Lcom/google/android/gms/analytics/b;
@@ -413,7 +411,7 @@
     return-object v0
 .end method
 
-.method public final tV()Lcom/google/android/gms/internal/measurement/by;
+.method public final tU()Lcom/google/android/gms/internal/measurement/by;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aUq:Lcom/google/android/gms/internal/measurement/by;
@@ -425,7 +423,7 @@
     return-object v0
 .end method
 
-.method public final tW()Lcom/google/android/gms/internal/measurement/al;
+.method public final tV()Lcom/google/android/gms/internal/measurement/al;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aUt:Lcom/google/android/gms/internal/measurement/al;
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 ba0cf183fb..871a69bd73 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
@@ -65,7 +65,6 @@
 
     invoke-direct {p1, p6}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    :goto_0
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/w;->aTo:Ljava/util/Map;
 
     return-void
@@ -75,5 +74,7 @@
 
     move-result-object p1
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/w;->aTo:Ljava/util/Map;
+
+    return-void
 .end method
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 38cd785fa7..740fed22c6 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
@@ -44,7 +44,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/x;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/x;->isConnected()Z
 
@@ -65,7 +65,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/x;Landroid/content/ComponentName;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUF:Lcom/google/android/gms/internal/measurement/bh;
 
@@ -81,11 +81,11 @@
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/l;->tI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/l;->tH()V
 
     :cond_0
     return-void
@@ -94,15 +94,15 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/x;Lcom/google/android/gms/internal/measurement/bh;)V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/x;->aUF:Lcom/google/android/gms/internal/measurement/bh;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/x;->tX()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/x;->tW()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object p0
 
@@ -111,7 +111,7 @@
     return-void
 .end method
 
-.method private final tX()V
+.method private final tW()V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUH:Lcom/google/android/gms/internal/measurement/bw;
@@ -142,9 +142,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUF:Lcom/google/android/gms/internal/measurement/bh;
 
@@ -159,23 +159,22 @@
 
     if-eqz v1, :cond_1
 
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uz()Ljava/lang/String;
+
+    move-result-object v1
+
+    move-object v4, v1
+
+    goto :goto_0
+
+    :cond_1
     invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uA()Ljava/lang/String;
 
     move-result-object v1
 
-    :goto_0
     move-object v4, v1
 
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/at;->uB()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :goto_1
+    :goto_0
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v5
@@ -187,7 +186,7 @@
 
     invoke-interface/range {v0 .. v5}, Lcom/google/android/gms/internal/measurement/bh;->a(Ljava/util/Map;JLjava/lang/String;Ljava/util/List;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/x;->tX()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/x;->tW()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -206,9 +205,9 @@
 .method public final connect()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUF:Lcom/google/android/gms/internal/measurement/bh;
 
@@ -221,7 +220,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUE:Lcom/google/android/gms/internal/measurement/z;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/z;->tY()Lcom/google/android/gms/internal/measurement/bh;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/z;->tX()Lcom/google/android/gms/internal/measurement/bh;
 
     move-result-object v0
 
@@ -229,7 +228,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUF:Lcom/google/android/gms/internal/measurement/bh;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/x;->tX()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/x;->tW()V
 
     return v1
 
@@ -242,12 +241,12 @@
 .method public final disconnect()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/q;->getContext()Landroid/content/Context;
 
@@ -257,7 +256,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_0
-    .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_0
@@ -265,6 +264,11 @@
     :catch_0
     nop
 
+    goto :goto_0
+
+    :catch_1
+    nop
+
     :goto_0
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUF:Lcom/google/android/gms/internal/measurement/bh;
 
@@ -276,11 +280,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tT()Lcom/google/android/gms/internal/measurement/l;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/internal/measurement/l;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/l;->tI()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/l;->tH()V
 
     :cond_0
     return-void
@@ -289,9 +293,9 @@
 .method public final isConnected()Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/r;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aUF:Lcom/google/android/gms/internal/measurement/bh;
 
@@ -307,7 +311,7 @@
     return v0
 .end method
 
-.method protected final tB()V
+.method protected final tA()V
     .locals 0
 
     return-void
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 601b1e2b8e..b6a67a83f3 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
@@ -58,7 +58,7 @@
     :catchall_0
     move-exception p1
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_0
     const/4 p1, 0x0
@@ -78,7 +78,7 @@
 
     if-nez p2, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string v0, "com.google.android.gms.analytics.internal.IAnalyticsService"
@@ -93,26 +93,25 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/bh;
 
-    :goto_0
     move-object p1, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     new-instance v0, Lcom/google/android/gms/internal/measurement/bi;
 
     invoke-direct {v0, p2}, Lcom/google/android/gms/internal/measurement/bi;-><init>(Landroid/os/IBinder;)V
 
-    goto :goto_0
+    move-object p1, v0
 
-    :goto_1
+    :goto_0
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/z;->aUI:Lcom/google/android/gms/internal/measurement/x;
 
     const-string v0, "Bound to IAnalyticsService interface"
 
     invoke-virtual {p2, v0}, Lcom/google/android/gms/internal/measurement/q;->bI(Ljava/lang/String;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object p2, p0, Lcom/google/android/gms/internal/measurement/z;->aUI:Lcom/google/android/gms/internal/measurement/x;
@@ -124,7 +123,7 @@
     .catch Landroid/os/RemoteException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     :try_start_3
@@ -136,11 +135,11 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :goto_2
+    :goto_1
     if-nez p1, :cond_4
 
     :try_start_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object p1, p0, Lcom/google/android/gms/internal/measurement/z;->aUI:Lcom/google/android/gms/internal/measurement/x;
 
@@ -157,7 +156,7 @@
     .catch Ljava/lang/IllegalArgumentException; {:try_start_4 .. :try_end_4} :catch_1
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     :try_start_5
@@ -175,7 +174,7 @@
 
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object p2
 
@@ -185,7 +184,7 @@
 
     invoke-virtual {p2, v0}, Lcom/google/android/gms/analytics/m;->f(Ljava/lang/Runnable;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/z;->aUJ:Lcom/google/android/gms/internal/measurement/bh;
@@ -193,7 +192,7 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :catch_1
-    :goto_3
+    :goto_2
     :try_start_6
     invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
 
@@ -201,7 +200,7 @@
 
     return-void
 
-    :goto_4
+    :goto_3
     invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
 
     throw p1
@@ -227,7 +226,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/q;->aUi:Lcom/google/android/gms/internal/measurement/t;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tS()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/t;->tR()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -240,10 +239,10 @@
     return-void
 .end method
 
-.method public final tY()Lcom/google/android/gms/internal/measurement/bh;
+.method public final tX()Lcom/google/android/gms/internal/measurement/bh;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kz()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->ky()V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -275,7 +274,7 @@
 
     invoke-virtual {v0, v2, v3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     monitor-enter p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zztd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zztd.smali
index c7b1461c99..f7d36d85f4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zztd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zztd.smali
@@ -71,7 +71,7 @@
 
 
 # virtual methods
-.method public final vD()Landroid/os/Bundle;
+.method public final vC()Landroid/os/Bundle;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zztd;->bav:Landroid/os/Bundle;
@@ -82,11 +82,7 @@
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    return-object v0
-
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zztd;->bav:Landroid/os/Bundle;
-
     return-object v0
 .end method
 
@@ -123,7 +119,7 @@
 
     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/android/gms/internal/measurement/zztd;->vD()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/zztd;->vC()Landroid/os/Bundle;
 
     move-result-object v1
 
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 5e67fd830b..1801d5e39f 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
@@ -65,7 +65,7 @@
     throw p1
 .end method
 
-.method protected final mr()Landroid/os/Parcel;
+.method protected final mq()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
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 a6d20c0c01..5d53073985 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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()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 c7017e628e..015c828b89 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 kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()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 kR()Ljava/lang/String;
+.method public final kQ()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/ar.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ar.smali
index 6e8ea9f9ae..874bbce579 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
@@ -107,11 +107,11 @@
 
     invoke-static {v7, v1, v2}, Lcom/google/android/gms/nearby/connection/e;->a(Lcom/google/android/gms/nearby/connection/e$a;J)Lcom/google/android/gms/nearby/connection/e;
 
-    move-result-object v4
+    move-result-object p0
     :try_end_0
     .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v4
+    return-object p0
 
     :catch_0
     move-exception v4
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 b306d6e4c1..ed3f3b62ce 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
@@ -37,7 +37,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->bgz:Lcom/google/android/gms/common/api/Status;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v0
 
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 14bba063e6..45cacadf6b 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
@@ -415,11 +415,6 @@
     :cond_a
     return-object v0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_5
-
     :cond_b
     :goto_4
     :try_start_2
@@ -434,7 +429,9 @@
     :cond_c
     return-object v3
 
-    :goto_5
+    :catchall_0
+    move-exception p1
+
     if-eqz p0, :cond_d
 
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
@@ -451,6 +448,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p0
+
+    return-void
 .end method
 
 .method private static varargs a(Landroid/content/ContentResolver;[Ljava/lang/String;)Ljava/util/Map;
@@ -531,6 +530,8 @@
     invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static a(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V
@@ -811,7 +812,7 @@
     throw p0
 .end method
 
-.method static synthetic yo()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic yn()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->bhJ:Ljava/util/concurrent/atomic/AtomicBoolean;
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 e441d88eda..82c898be50 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;->yo()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/nearby/bg;->yn()Ljava/util/concurrent/atomic/AtomicBoolean;
 
     move-result-object p1
 
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 0c89a47a60..6e306ff024 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
@@ -361,8 +361,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->bhW:Lcom/google/android/gms/internal/nearby/ap;
-
     invoke-virtual {v0}, Lcom/google/android/gms/internal/nearby/ap;->shutdown()V
 
     const/4 v0, 0x0
@@ -452,7 +450,7 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->lH()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->lG()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -488,7 +486,7 @@
     return-void
 .end method
 
-.method public final kM()Z
+.method public final kL()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->mContext:Landroid/content/Context;
@@ -500,7 +498,7 @@
     return v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -508,7 +506,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.connection.service.START"
@@ -516,7 +514,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.internal.connection.INearbyConnectionService"
@@ -524,7 +522,7 @@
     return-object v0
 .end method
 
-.method public final lG()Landroid/os/Bundle;
+.method public final lF()Landroid/os/Bundle;
     .locals 4
 
     new-instance v0, Landroid/os/Bundle;
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 b4af29a598..842895db28 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
@@ -84,7 +84,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty.smali
index c720083b74..7d5b93537f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty.smali
@@ -131,8 +131,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mValue:Ljava/lang/Object;
-
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ea;->au(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
@@ -168,13 +166,11 @@
 
     if-eqz v0, :cond_1
 
-    new-instance v0, Landroid/os/Bundle;
+    new-instance v1, Landroid/os/Bundle;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTimedOutEventParams:Landroid/os/Bundle;
+    invoke-direct {v1, v0}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
-
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTimedOutEventParams:Landroid/os/Bundle;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTimedOutEventParams:Landroid/os/Bundle;
 
     :cond_1
     iget-object v0, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTriggeredEventName:Ljava/lang/String;
@@ -185,13 +181,11 @@
 
     if-eqz v0, :cond_2
 
-    new-instance v0, Landroid/os/Bundle;
+    new-instance v1, Landroid/os/Bundle;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTriggeredEventParams:Landroid/os/Bundle;
+    invoke-direct {v1, v0}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
-
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTriggeredEventParams:Landroid/os/Bundle;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTriggeredEventParams:Landroid/os/Bundle;
 
     :cond_2
     iget-wide v0, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTriggeredTimestamp:J
@@ -206,14 +200,12 @@
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mExpiredEventName:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mExpiredEventParams:Landroid/os/Bundle;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mExpiredEventParams:Landroid/os/Bundle;
 
-    if-eqz v0, :cond_3
+    if-eqz p1, :cond_3
 
     new-instance v0, Landroid/os/Bundle;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mExpiredEventParams:Landroid/os/Bundle;
-
     invoke-direct {v0, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mExpiredEventParams:Landroid/os/Bundle;
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 0fb4ceb76b..bd9eefe656 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
@@ -70,7 +70,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -94,13 +94,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -119,7 +119,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v3
 
@@ -133,7 +133,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -170,7 +170,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -213,13 +213,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yy()V
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/google/android/gms/measurement/internal/br;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
@@ -241,13 +241,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -266,7 +266,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v3
 
@@ -280,7 +280,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -300,11 +300,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->zO()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->zN()J
 
     move-result-wide v0
 
@@ -321,7 +321,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -371,7 +371,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -428,13 +428,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yy()V
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/br;->f(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
@@ -453,7 +453,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -474,7 +474,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -495,7 +495,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -524,7 +524,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -569,7 +569,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -627,13 +627,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yy()V
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/google/android/gms/measurement/internal/br;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/Map;
 
@@ -649,7 +649,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -669,7 +669,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -687,7 +687,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -718,7 +718,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -728,7 +728,7 @@
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yy()V
 
     new-instance v1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;
 
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 67880d902a..b86fe3c030 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
@@ -49,7 +49,7 @@
     return-void
 .end method
 
-.method public final yx()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final yw()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 2bd621b066..35a742083b 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
@@ -32,7 +32,7 @@
     return-void
 .end method
 
-.method private final yy()Lcom/google/android/gms/measurement/internal/db;
+.method private final yx()Lcom/google/android/gms/measurement/internal/db;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -97,7 +97,7 @@
 
     invoke-super {p0}, Landroid/app/job/JobService;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -111,7 +111,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -127,7 +127,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -139,7 +139,7 @@
 .method public final onStartJob(Landroid/app/job/JobParameters;)Z
     .locals 5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -151,7 +151,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -204,7 +204,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     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 d9a1d5acca..419eb3c95b 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
@@ -53,7 +53,7 @@
     return-void
 .end method
 
-.method public final yx()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final yw()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 512eead3f4..2c8036f50f 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
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method private final yy()Lcom/google/android/gms/measurement/internal/db;
+.method private final yx()Lcom/google/android/gms/measurement/internal/db;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,7 +88,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/db;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/db;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -134,7 +134,7 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/db;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/db;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -154,7 +154,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -168,7 +168,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -184,7 +184,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
@@ -198,7 +198,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object p2
 
@@ -210,7 +210,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -265,7 +265,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yy()Lcom/google/android/gms/measurement/internal/db;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->yx()Lcom/google/android/gms/measurement/internal/db;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/api/R.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/api/R.smali
index 17cd3cc573..5d85d1d484 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/api/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/api/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/measurement/api/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 d648abc12b..2aa54a9b9a 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
@@ -58,7 +58,7 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -77,7 +77,7 @@
 
     if-gez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -106,7 +106,7 @@
 
     invoke-static {p3, v0, p1}, Lcom/google/android/gms/measurement/internal/ce;->a(Lcom/google/android/gms/measurement/internal/cd;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object p1
 
@@ -126,7 +126,7 @@
 
     if-nez p4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -145,7 +145,7 @@
 
     if-gez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -178,7 +178,7 @@
 
     invoke-static {p4, v0, p1}, Lcom/google/android/gms/measurement/internal/ce;->a(Lcom/google/android/gms/measurement/internal/cd;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object p1
 
@@ -196,11 +196,11 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ce;->zw()Lcom/google/android/gms/measurement/internal/cd;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ce;->zv()Lcom/google/android/gms/measurement/internal/cd;
 
     move-result-object v0
 
@@ -329,172 +329,172 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
+.method public final bridge synthetic yA()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yA()Lcom/google/android/gms/measurement/internal/a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/br;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/i;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/ch;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ce;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/k;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/k;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/dg;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/dg;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yH()Lcom/google/android/gms/measurement/internal/es;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yI()Lcom/google/android/gms/measurement/internal/m;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yJ()Lcom/google/android/gms/measurement/internal/ea;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yL()Lcom/google/android/gms/measurement/internal/o;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yM()Lcom/google/android/gms/measurement/internal/z;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yN()Lcom/google/android/gms/measurement/internal/ei;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yy()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yy()V
 
     return-void
 .end method
 
-.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/a;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/a;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/br;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/i;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ch;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/ce;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/k;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/k;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/dg;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yH()Lcom/google/android/gms/measurement/internal/dg;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yI()Lcom/google/android/gms/measurement/internal/es;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yJ()Lcom/google/android/gms/measurement/internal/m;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yK()Lcom/google/android/gms/measurement/internal/ea;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yM()Lcom/google/android/gms/measurement/internal/o;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yN()Lcom/google/android/gms/measurement/internal/z;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cp;->yO()Lcom/google/android/gms/measurement/internal/ei;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method public final bridge synthetic yz()V
     .locals 0
 
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 d1ddea8833..4403653137 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
@@ -91,18 +91,18 @@
 
 
 # virtual methods
-.method final uT()V
+.method final uS()V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -137,7 +137,7 @@
     return-void
 .end method
 
-.method final uV()J
+.method final uU()J
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
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 9aa116d786..62e313dd91 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
@@ -72,7 +72,7 @@
     return-void
 .end method
 
-.method public final zm()Ljava/lang/String;
+.method public final zl()Ljava/lang/String;
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
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 a30f57ce4f..8e2ea6a9f4 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
@@ -17,7 +17,7 @@
     return-void
 .end method
 
-.method private final zn()Z
+.method private final zm()Z
     .locals 4
 
     const/4 v0, 0x0
@@ -37,7 +37,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -76,7 +76,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -101,11 +101,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     const/4 v0, 0x0
 
@@ -113,7 +113,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -143,7 +143,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -165,7 +165,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -200,13 +200,13 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ae;->zn()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ae;->zm()Z
 
     move-result v0
 
@@ -214,7 +214,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -229,7 +229,7 @@
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -245,11 +245,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     new-instance p1, Landroid/content/Intent;
 
@@ -281,7 +281,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -336,7 +336,7 @@
 
     if-eqz v1, :cond_4
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ae;->zn()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ae;->zm()Z
 
     move-result v1
 
@@ -347,7 +347,7 @@
     invoke-direct {v1, p1}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
@@ -363,7 +363,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -392,7 +392,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -411,7 +411,7 @@
     :cond_4
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -427,7 +427,7 @@
     :cond_6
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -443,7 +443,7 @@
     :goto_1
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
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 acb70d38aa..ea06b1f8cb 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
@@ -45,7 +45,7 @@
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -69,7 +69,7 @@
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -86,7 +86,7 @@
 
     iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -100,7 +100,7 @@
 
     iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p2
 
@@ -121,7 +121,7 @@
 
     iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -143,7 +143,7 @@
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
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 d6d8b4159a..383113651a 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
@@ -53,11 +53,11 @@
 
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     if-eqz v1, :cond_9
 
@@ -79,7 +79,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -87,10 +87,9 @@
 
     const-string v2, "Service response is missing Install Referrer install timestamp"
 
-    :goto_0
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_0
     const-string v2, "install_referrer"
@@ -107,12 +106,12 @@
 
     if-eqz v10, :cond_1
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_1
     iget-object v10, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v10
 
@@ -124,7 +123,7 @@
 
     iget-object v10, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v10
 
@@ -144,14 +143,14 @@
 
     move-result-object v2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     new-instance v2, Ljava/lang/String;
 
     invoke-direct {v2, v11}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_1
+    :goto_0
     invoke-static {v2}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v2
@@ -164,7 +163,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -172,7 +171,9 @@
 
     const-string v2, "No campaign params defined in install referrer result"
 
-    goto :goto_0
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    goto/16 :goto_3
 
     :cond_3
     const-string v10, "medium"
@@ -201,12 +202,12 @@
 
     const/4 v10, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const/4 v10, 0x0
 
-    :goto_2
+    :goto_1
     if-eqz v10, :cond_6
 
     const-string v10, "referrer_click_timestamp_seconds"
@@ -223,7 +224,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -231,7 +232,9 @@
 
     const-string v2, "Install Referrer is missing click timestamp for ad campaign"
 
-    goto/16 :goto_0
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    goto :goto_3
 
     :cond_5
     const-string v1, "click_timestamp"
@@ -241,7 +244,7 @@
     :cond_6
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -257,7 +260,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -265,12 +268,14 @@
 
     const-string v2, "Campaign has already been logged"
 
-    goto/16 :goto_0
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    goto :goto_3
 
     :cond_7
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -280,7 +285,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -300,7 +305,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v1
 
@@ -310,13 +315,13 @@
 
     invoke-virtual {v1, v4, v5, v2}, Lcom/google/android/gms/measurement/internal/br;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
-    :goto_3
+    :goto_2
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -324,13 +329,13 @@
 
     const-string v2, "No referrer defined in install referrer response"
 
-    goto/16 :goto_0
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     :cond_9
-    :goto_4
+    :goto_3
     if-eqz v3, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ae;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
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 5d4ee51d1c..d5a43069f1 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
@@ -76,7 +76,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -145,7 +145,7 @@
     if-eqz v0, :cond_8
 
     :try_start_0
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -171,7 +171,7 @@
     :goto_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ah;->blC:Lcom/google/android/gms/measurement/internal/ak;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/ak;->yx()Landroid/content/BroadcastReceiver$PendingResult;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/ak;->yw()Landroid/content/BroadcastReceiver$PendingResult;
 
     move-result-object v8
 
@@ -240,7 +240,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v1
 
@@ -286,7 +286,7 @@
     invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     :cond_7
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p2
 
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 ae4e00c7ba..5fe606912a 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
@@ -47,7 +47,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aj;->blD:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -124,8 +124,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aj;->Yl:Landroid/content/BroadcastReceiver$PendingResult;
-
     invoke-virtual {v0}, Landroid/content/BroadcastReceiver$PendingResult;->finish()V
 
     :cond_3
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 47227249ca..558a3431ef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ak.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ak.smali
@@ -6,5 +6,5 @@
 .method public abstract a(Landroid/content/Context;Landroid/content/Intent;)V
 .end method
 
-.method public abstract yx()Landroid/content/BroadcastReceiver$PendingResult;
+.method public abstract yw()Landroid/content/BroadcastReceiver$PendingResult;
 .end method
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 692c794ce5..8b66c70f7f 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
@@ -230,7 +230,7 @@
 
     if-eqz v6, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -307,7 +307,7 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -370,7 +370,7 @@
     :try_start_0
     invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/je;)Lcom/google/android/gms/internal/measurement/jo;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -391,7 +391,7 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -417,9 +417,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -431,7 +431,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -503,7 +503,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/al;->cA(Ljava/lang/String;)V
 
@@ -536,7 +536,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/al;->cA(Ljava/lang/String;)V
 
@@ -610,7 +610,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/al;->cA(Ljava/lang/String;)V
 
@@ -665,7 +665,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/al;->cA(Ljava/lang/String;)V
 
@@ -711,9 +711,9 @@
 
     move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -741,7 +741,7 @@
 
     invoke-interface {v3, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/ef;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/ef;
 
     move-result-object v3
 
@@ -844,7 +844,7 @@
     goto :goto_0
 
     :cond_6
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v3
 
@@ -855,7 +855,7 @@
     :try_start_0
     iput-object v3, v0, Lcom/google/android/gms/internal/measurement/cm;->aYi:[Lcom/google/android/gms/internal/measurement/cf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v3
 
@@ -876,7 +876,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -893,15 +893,15 @@
     move-object/from16 v3, p2
 
     :goto_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     new-instance v0, Landroid/content/ContentValues;
 
@@ -940,7 +940,7 @@
 
     if-nez v0, :cond_7
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -961,7 +961,7 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -985,9 +985,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -1009,7 +1009,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/al;->blO:Ljava/util/Map;
 
@@ -1027,7 +1027,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/al;->blO:Ljava/util/Map;
 
@@ -1043,7 +1043,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/al;->blM:Ljava/util/Map;
 
@@ -1081,7 +1081,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1147,103 +1147,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1251,6 +1243,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -1259,30 +1259,30 @@
     return-void
 .end method
 
-.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/dx;
+.method public final bridge synthetic zc()Lcom/google/android/gms/measurement/internal/dx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/ef;
+.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/ef;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/ef;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/ef;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic zf()Lcom/google/android/gms/measurement/internal/el;
+.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/el;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     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 1b73e8b1c0..2e753602b1 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
@@ -163,7 +163,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/am;->blP:Lcom/google/android/gms/measurement/internal/aq;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/aq;->zq()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/aq;->zp()V
 
     :goto_0
     monitor-exit v0
@@ -232,7 +232,7 @@
     return-object v0
 .end method
 
-.method static synthetic zp()Ljava/util/concurrent/atomic/AtomicLong;
+.method static synthetic zo()Ljava/util/concurrent/atomic/AtomicLong;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/am;->blY:Ljava/util/concurrent/atomic/AtomicLong;
@@ -262,7 +262,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -290,7 +290,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -332,7 +332,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -381,7 +381,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -404,7 +404,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -452,7 +452,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/am;->blQ:Lcom/google/android/gms/measurement/internal/aq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/aq;->zq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/aq;->zp()V
 
     :goto_0
     monitor-exit p1
@@ -469,7 +469,7 @@
     throw v0
 .end method
 
-.method public final kz()V
+.method public final ky()V
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
@@ -492,17 +492,103 @@
     throw v0
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final yA()V
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yH()Lcom/google/android/gms/measurement/internal/es;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/m;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/ea;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/o;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/z;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/ei;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final yS()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yy()V
+
+    return-void
+.end method
+
+.method public final yz()V
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
@@ -525,93 +611,7 @@
     throw v0
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/es;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/m;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/ea;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/o;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/z;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yO()Lcom/google/android/gms/measurement/internal/ei;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final yT()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final bridge synthetic yz()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yz()V
-
-    return-void
-.end method
-
-.method public final zo()Z
+.method public final zn()Z
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
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 b363c66bf4..abfb4e30c6 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
@@ -36,7 +36,7 @@
     :try_start_0
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ao;->bma:Lcom/google/android/gms/measurement/internal/am;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
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 29fddbf8a2..9da3be0e46 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
@@ -42,7 +42,7 @@
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/am;->zp()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/am;->zo()Ljava/util/concurrent/atomic/AtomicLong;
 
     move-result-object p2
 
@@ -66,7 +66,7 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -98,7 +98,7 @@
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/am;->zp()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/am;->zo()Ljava/util/concurrent/atomic/AtomicLong;
 
     move-result-object p2
 
@@ -120,7 +120,7 @@
 
     if-nez p4, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -137,7 +137,7 @@
 
 # virtual methods
 .method public final synthetic compareTo(Ljava/lang/Object;)I
-    .locals 7
+    .locals 6
     .param p1    # Ljava/lang/Object;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -155,9 +155,7 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ap;->bmc:Z
-
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
 
     return v3
 
@@ -169,18 +167,14 @@
 
     iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/ap;->bmb:J
 
-    cmp-long v6, v0, v4
+    cmp-long p1, v0, v4
 
-    if-gez v6, :cond_2
+    if-gez p1, :cond_2
 
     return v3
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ap;->bmb:J
-
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/ap;->bmb:J
-
-    cmp-long p1, v0, v3
+    cmp-long p1, v0, v4
 
     if-lez p1, :cond_3
 
@@ -189,7 +183,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ap;->bma:Lcom/google/android/gms/measurement/internal/am;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -215,7 +209,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ap;->bma:Lcom/google/android/gms/measurement/internal/am;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     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 240025f6c5..fb7a570108 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
@@ -57,7 +57,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aq;->bma:Lcom/google/android/gms/measurement/internal/am;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -284,7 +284,7 @@
     :cond_5
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/aq;->bma:Lcom/google/android/gms/measurement/internal/am;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -392,7 +392,7 @@
     :cond_7
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/aq;->bma:Lcom/google/android/gms/measurement/internal/am;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -425,9 +425,11 @@
     .catchall {:try_start_d .. :try_end_d} :catchall_4
 
     throw v0
+
+    return-void
 .end method
 
-.method public final zq()V
+.method public final zp()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aq;->bmd:Ljava/lang/Object;
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 25cd542fe7..d14a9486df 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
@@ -121,7 +121,7 @@
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/de;->init(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/util/f;->lZ()Lcom/google/android/gms/common/util/d;
+    invoke-static {}, Lcom/google/android/gms/common/util/f;->lY()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -145,7 +145,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/z;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmj:Lcom/google/android/gms/measurement/internal/z;
 
@@ -153,7 +153,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/o;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmk:Lcom/google/android/gms/measurement/internal/o;
 
@@ -161,7 +161,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/ea;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmo:Lcom/google/android/gms/measurement/internal/ea;
 
@@ -169,7 +169,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/m;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmp:Lcom/google/android/gms/measurement/internal/m;
 
@@ -183,7 +183,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/ce;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmq:Lcom/google/android/gms/measurement/internal/ce;
 
@@ -191,7 +191,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/br;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmr:Lcom/google/android/gms/measurement/internal/br;
 
@@ -205,7 +205,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/dg;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmm:Lcom/google/android/gms/measurement/internal/dg;
 
@@ -213,7 +213,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/am;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bml:Lcom/google/android/gms/measurement/internal/am;
 
@@ -227,7 +227,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v1
 
@@ -272,7 +272,7 @@
 
     invoke-virtual {v2, v0}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -280,10 +280,12 @@
 
     const-string v1, "Registered activity lifecycle callback"
 
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -291,10 +293,10 @@
 
     const-string v1, "Application context is not an Application"
 
-    :goto_0
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     :cond_2
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bml:Lcom/google/android/gms/measurement/internal/am;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/as;
@@ -411,7 +413,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ar;->M(Z)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ar;->L(Z)V
 
     :cond_4
     :goto_0
@@ -564,19 +566,19 @@
 .method static synthetic b(Lcom/google/android/gms/measurement/internal/ar;)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ah()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ag()Ljava/lang/String;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/es;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/es;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bo;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmv:Lcom/google/android/gms/measurement/internal/es;
 
@@ -584,7 +586,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/i;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dq;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmw:Lcom/google/android/gms/measurement/internal/i;
 
@@ -592,7 +594,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/k;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmt:Lcom/google/android/gms/measurement/internal/k;
 
@@ -600,17 +602,17 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/ch;-><init>(Lcom/google/android/gms/measurement/internal/ar;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmu:Lcom/google/android/gms/measurement/internal/ch;
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmo:Lcom/google/android/gms/measurement/internal/ea;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->zu()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->zt()V
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmj:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->zu()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->zt()V
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/ae;
 
@@ -620,9 +622,9 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmw:Lcom/google/android/gms/measurement/internal/i;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->zu()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dq;->zt()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -638,7 +640,7 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -648,7 +650,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v0
 
@@ -660,7 +662,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v1
 
@@ -670,7 +672,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -687,7 +689,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -720,7 +722,7 @@
     invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -736,7 +738,7 @@
 
     if-eq v0, v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -766,7 +768,7 @@
     return-void
 .end method
 
-.method private final tP()V
+.method private final tO()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ar;->aQH:Z
@@ -785,7 +787,7 @@
     throw v0
 .end method
 
-.method static yz()V
+.method static yy()V
     .locals 2
 
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -799,7 +801,7 @@
 
 
 # virtual methods
-.method final M(Z)V
+.method final L(Z)V
     .locals 0
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -813,22 +815,22 @@
     return-void
 .end method
 
-.method final V(Z)V
+.method final U(Z)V
     .locals 12
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->blm:Lcom/google/android/gms/measurement/internal/ad;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ad;->zm()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ad;->zl()Ljava/lang/String;
 
     move-result-object v4
 
@@ -844,7 +846,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v5
 
@@ -865,7 +867,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v1
 
@@ -902,7 +904,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -939,7 +941,7 @@
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v6
 
@@ -974,17 +976,17 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ar;->tP()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ar;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->Ai()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->Ah()Z
 
     move-result v0
 
@@ -1005,15 +1007,14 @@
 
     if-eqz v0, :cond_1
 
-    :goto_0
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lq()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lp()Z
 
     move-result v0
 
@@ -1041,15 +1042,17 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmA:Ljava/lang/Boolean;
 
-    goto :goto_0
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
 
     :cond_2
-    :goto_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    :goto_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
-    invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/z;->T(Z)Z
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/z;->S(Z)Z
 
     move-result v0
 
@@ -1061,13 +1064,13 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1083,7 +1086,7 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1098,7 +1101,7 @@
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1112,7 +1115,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1128,7 +1131,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1139,7 +1142,7 @@
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->zt()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->zs()Z
 
     move-result v0
 
@@ -1151,7 +1154,7 @@
 
     if-eqz v0, :cond_10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -1163,7 +1166,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1174,7 +1177,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -1186,7 +1189,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1203,7 +1206,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->ml()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->mk()Z
 
     move-result v0
 
@@ -1211,7 +1214,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->sB()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->sA()Z
 
     move-result v0
 
@@ -1225,7 +1228,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1244,7 +1247,7 @@
 
     if-nez v0, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1255,7 +1258,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1268,7 +1271,7 @@
     return-void
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
@@ -1284,11 +1287,11 @@
 
     if-eqz v0, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yX()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1299,9 +1302,9 @@
     if-nez v0, :cond_a
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
@@ -1309,27 +1312,27 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/z;->zh()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/z;->zg()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/i;->yX()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/z;->zi()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/z;->zh()Ljava/lang/String;
 
     move-result-object v4
 
@@ -1339,7 +1342,7 @@
 
     if-eqz v0, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1349,11 +1352,11 @@
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zk()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zj()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
@@ -1367,11 +1370,11 @@
 
     if-eqz v0, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     :try_start_0
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/k;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -1388,7 +1391,7 @@
 
     if-lez v2, :cond_8
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -1409,7 +1412,7 @@
     :catch_0
     move-exception v2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1427,9 +1430,9 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmu:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->ug()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->uf()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1439,7 +1442,7 @@
 
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1448,11 +1451,11 @@
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/ad;->cy(Ljava/lang/String;)V
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v2
 
@@ -1462,15 +1465,15 @@
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/z;->cw(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yX()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1478,11 +1481,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1499,23 +1502,23 @@
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/dg;->aA(J)V
 
     :cond_a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/z;->blf:Lcom/google/android/gms/measurement/internal/ad;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ad;->zm()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ad;->zl()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/br;->cI(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
@@ -1529,11 +1532,11 @@
 
     if-eqz v0, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yX()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1548,7 +1551,7 @@
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
@@ -1564,28 +1567,28 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ei;->Ai()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ei;->Ah()Z
 
     move-result v2
 
     if-nez v2, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
     xor-int/lit8 v3, v0, 0x1
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/z;->U(Z)V
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/z;->T(Z)V
 
     :cond_c
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v3
 
@@ -1597,16 +1600,16 @@
 
     if-eqz v2, :cond_d
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/ar;->V(Z)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/ar;->U(Z)V
 
     :cond_d
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1619,14 +1622,14 @@
     if-eqz v0, :cond_f
 
     :cond_e
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/br;->zv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/br;->zu()V
 
     :cond_f
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
@@ -1640,7 +1643,7 @@
     return-void
 .end method
 
-.method public final tK()Lcom/google/android/gms/common/util/d;
+.method public final tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->Yo:Lcom/google/android/gms/common/util/d;
@@ -1648,15 +1651,13 @@
     return-object v0
 .end method
 
-.method public final yB()Lcom/google/android/gms/measurement/internal/a;
+.method public final yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bms:Lcom/google/android/gms/measurement/internal/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bms:Lcom/google/android/gms/measurement/internal/a;
-
     return-object v0
 
     :cond_0
@@ -1669,7 +1670,7 @@
     throw v0
 .end method
 
-.method public final yC()Lcom/google/android/gms/measurement/internal/br;
+.method public final yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmr:Lcom/google/android/gms/measurement/internal/br;
@@ -1681,7 +1682,7 @@
     return-object v0
 .end method
 
-.method public final yD()Lcom/google/android/gms/measurement/internal/i;
+.method public final yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmw:Lcom/google/android/gms/measurement/internal/i;
@@ -1693,7 +1694,7 @@
     return-object v0
 .end method
 
-.method public final yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public final yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmu:Lcom/google/android/gms/measurement/internal/ch;
@@ -1705,7 +1706,7 @@
     return-object v0
 .end method
 
-.method public final yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public final yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmq:Lcom/google/android/gms/measurement/internal/ce;
@@ -1717,7 +1718,7 @@
     return-object v0
 .end method
 
-.method public final yG()Lcom/google/android/gms/measurement/internal/k;
+.method public final yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmt:Lcom/google/android/gms/measurement/internal/k;
@@ -1729,7 +1730,7 @@
     return-object v0
 .end method
 
-.method public final yI()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/ar;->bmv:Lcom/google/android/gms/measurement/internal/es;
@@ -1741,7 +1742,7 @@
     return-object v0
 .end method
 
-.method public final yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmp:Lcom/google/android/gms/measurement/internal/m;
@@ -1753,7 +1754,7 @@
     return-object v0
 .end method
 
-.method public final yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmo:Lcom/google/android/gms/measurement/internal/ea;
@@ -1765,7 +1766,7 @@
     return-object v0
 .end method
 
-.method public final yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bml:Lcom/google/android/gms/measurement/internal/am;
@@ -1777,7 +1778,7 @@
     return-object v0
 .end method
 
-.method public final yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmk:Lcom/google/android/gms/measurement/internal/o;
@@ -1789,7 +1790,7 @@
     return-object v0
 .end method
 
-.method public final yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmj:Lcom/google/android/gms/measurement/internal/z;
@@ -1801,7 +1802,7 @@
     return-object v0
 .end method
 
-.method public final zr()Z
+.method public final zq()Z
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1828,7 +1829,7 @@
     return v0
 .end method
 
-.method final zs()V
+.method final zr()V
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmC:I
@@ -1840,37 +1841,33 @@
     return-void
 .end method
 
-.method protected final zt()Z
-    .locals 5
+.method protected final zs()Z
+    .locals 6
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ar;->tP()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ar;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmy:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmz:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ar;->bmz:J
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v3, 0x0
 
-    cmp-long v4, v0, v2
+    cmp-long v5, v1, v3
 
-    if-eqz v4, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmy:Ljava/lang/Boolean;
+    if-eqz v5, :cond_0
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmy:Ljava/lang/Boolean;
-
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v0
@@ -1906,7 +1903,7 @@
 
     iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmz:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -1922,7 +1919,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -1940,7 +1937,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->ml()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->mk()Z
 
     move-result v0
 
@@ -1948,7 +1945,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->sB()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->sA()Z
 
     move-result v0
 
@@ -1993,11 +1990,11 @@
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v3
 
@@ -2005,11 +2002,11 @@
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/i;->yX()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
 
     move-result-object v4
 
@@ -2019,11 +2016,11 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yX()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/at.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/at.smali
index 84a0ead25a..20aaa7e203 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
@@ -65,7 +65,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -173,15 +173,7 @@
 
     if-nez p2, :cond_5
 
-    goto :goto_2
-
-    :catch_0
-    move-exception p2
-
-    goto :goto_3
-
     :cond_3
-    :goto_2
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/at;->bmH:Ljava/lang/String;
 
     if-nez p2, :cond_4
@@ -235,10 +227,12 @@
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
-    :goto_3
+    :catch_0
+    move-exception p2
+
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -257,7 +251,7 @@
     :cond_7
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -297,11 +291,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/am;->zo()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/am;->zn()Z
 
     move-result v0
 
@@ -314,7 +308,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -345,7 +339,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -420,7 +414,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -463,7 +457,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -492,7 +486,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -533,7 +527,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -608,7 +602,7 @@
 
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -652,7 +646,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -727,7 +721,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -835,7 +829,6 @@
 
     invoke-direct {v0, p0, p1, p2}, Lcom/google/android/gms/measurement/internal/bi;-><init>(Lcom/google/android/gms/measurement/internal/at;Lcom/google/android/gms/measurement/internal/zzfh;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    :goto_0
     invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/at;->j(Ljava/lang/Runnable;)V
 
     return-void
@@ -845,7 +838,9 @@
 
     invoke-direct {v0, p0, p1, p2}, Lcom/google/android/gms/measurement/internal/bj;-><init>(Lcom/google/android/gms/measurement/internal/at;Lcom/google/android/gms/measurement/internal/zzfh;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/at;->j(Ljava/lang/Runnable;)V
+
+    return-void
 .end method
 
 .method public final a(Lcom/google/android/gms/measurement/internal/zzh;)V
@@ -897,7 +892,6 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/ax;-><init>(Lcom/google/android/gms/measurement/internal/at;Lcom/google/android/gms/measurement/internal/zzl;)V
 
-    :goto_0
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/at;->j(Ljava/lang/Runnable;)V
 
     return-void
@@ -907,7 +901,9 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/az;-><init>(Lcom/google/android/gms/measurement/internal/at;Lcom/google/android/gms/measurement/internal/zzl;)V
 
-    goto :goto_0
+    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/at;->j(Ljava/lang/Runnable;)V
+
+    return-void
 .end method
 
 .method public final a(Lcom/google/android/gms/measurement/internal/zzl;Lcom/google/android/gms/measurement/internal/zzh;)V
@@ -943,7 +939,6 @@
 
     invoke-direct {p1, p0, v0, p2}, Lcom/google/android/gms/measurement/internal/av;-><init>(Lcom/google/android/gms/measurement/internal/at;Lcom/google/android/gms/measurement/internal/zzl;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    :goto_0
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/at;->j(Ljava/lang/Runnable;)V
 
     return-void
@@ -953,11 +948,13 @@
 
     invoke-direct {p1, p0, v0, p2}, Lcom/google/android/gms/measurement/internal/aw;-><init>(Lcom/google/android/gms/measurement/internal/at;Lcom/google/android/gms/measurement/internal/zzl;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_0
+    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/at;->j(Ljava/lang/Runnable;)V
+
+    return-void
 .end method
 
 .method public final a(Lcom/google/android/gms/measurement/internal/zzad;Ljava/lang/String;)[B
-    .locals 10
+    .locals 9
     .annotation build Landroidx/annotation/BinderThread;
     .end annotation
 
@@ -971,7 +968,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -983,7 +980,7 @@
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -997,7 +994,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -1011,7 +1008,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v4
 
@@ -1034,7 +1031,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -1055,7 +1052,7 @@
     :cond_0
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/dr;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/dr;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v5
 
@@ -1067,7 +1064,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -1079,7 +1076,7 @@
 
     iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v7
 
@@ -1095,8 +1092,6 @@
 
     move-result-object v8
 
-    const/4 v9, 0x0
-
     sub-long/2addr v5, v0
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -1115,7 +1110,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1131,7 +1126,7 @@
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v3
 
@@ -1224,7 +1219,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -1253,7 +1248,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
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 1654e13dd5..23337fff3d 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
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/au;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
@@ -45,9 +45,9 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/au;->bmI:Lcom/google/android/gms/measurement/internal/zzh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzh;->packageName:Ljava/lang/String;
 
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 0a9f1a96ec..c067323a95 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
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/av;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 06cf62e66a..9b608c16e6 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
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aw;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 488e934209..1507dad463 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
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ax;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 d7622a8b17..ee6ab8d2d5 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
@@ -39,7 +39,7 @@
 
     iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ay;->bkU:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -53,11 +53,11 @@
 
     if-eqz v4, :cond_4
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ce;->zw()Lcom/google/android/gms/measurement/internal/cd;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ce;->zv()Lcom/google/android/gms/measurement/internal/cd;
 
     move-result-object v5
 
@@ -83,7 +83,7 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -125,7 +125,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -161,7 +161,7 @@
     return-void
 
     :cond_4
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     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 8547c79908..49be95a3af 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
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/az;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 0a711ff126..e0e3ba2053 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
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ba;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
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 905ee12766..beb65db778 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
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bb;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     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 075dcc5654..8171697106 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
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bc;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     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 fa561e4423..d42ea814e2 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
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bd;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     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 42a3a95f38..dff15de8ab 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
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/be;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 525bcc4d20..d7d8dd71a6 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
@@ -121,7 +121,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/at;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/bf;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 87c38e0efd..00e7e3327b 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
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bg;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 68c81e0e8e..d5a6da8541 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
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bh;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 b7a76f01ca..3119bd45ff 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
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bi;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 153f9a7a5e..cb76118845 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
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bj;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 55bcea2af5..e192868515 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
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bk;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     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 6124cc8e01..cd5a8a823b 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
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bl;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
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 50dbf9b997..d134f2cec8 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
@@ -53,7 +53,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -66,31 +66,29 @@
     return-void
 
     :cond_0
-    new-instance v0, Lcom/google/android/gms/measurement/internal/cd;
+    new-instance v1, Lcom/google/android/gms/measurement/internal/cd;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/bm;->bmR:Ljava/lang/String;
-
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/bm;->bmQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/bm;->bmR:Ljava/lang/String;
 
     iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/bm;->bmS:J
 
-    invoke-direct {v0, v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/cd;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-direct {v1, v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/cd;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/bm;->bmJ:Lcom/google/android/gms/measurement/internal/at;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bm;->bmJ:Lcom/google/android/gms/measurement/internal/at;
 
-    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/at;->a(Lcom/google/android/gms/measurement/internal/at;)Lcom/google/android/gms/measurement/internal/dr;
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/at;->a(Lcom/google/android/gms/measurement/internal/at;)Lcom/google/android/gms/measurement/internal/dr;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
-    move-result-object v1
+    move-result-object v0
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/bm;->bmN:Ljava/lang/String;
 
-    invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/ce;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cd;)V
+    invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/ce;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cd;)V
 
     return-void
 .end method
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 5610b6192c..80e495159a 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
@@ -36,119 +36,105 @@
     return-object v0
 .end method
 
-.method public kz()V
+.method public ky()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     return-void
 .end method
 
-.method public tK()Lcom/google/android/gms/common/util/d;
+.method public tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yA()V
+.method public yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yA()V
-
-    return-void
-.end method
-
-.method public yI()Lcom/google/android/gms/measurement/internal/es;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yL()Lcom/google/android/gms/measurement/internal/am;
+.method public yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yM()Lcom/google/android/gms/measurement/internal/o;
+.method public yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yN()Lcom/google/android/gms/measurement/internal/z;
+.method public yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
@@ -158,10 +144,24 @@
     return-object v0
 .end method
 
-.method public yz()V
+.method public yy()V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ar;->yz()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ar;->yy()V
+
+    return-void
+.end method
+
+.method public yz()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bn;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yz()V
 
     return-void
 .end method
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 2e82776ab7..3211a56617 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
@@ -42,7 +42,7 @@
     return v0
 .end method
 
-.method protected final tP()V
+.method protected final tO()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->isInitialized()Z
@@ -63,14 +63,14 @@
     throw v0
 .end method
 
-.method public final tQ()V
+.method public final tP()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/bo;->aQH:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->yT()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->yS()Z
 
     move-result v0
 
@@ -78,7 +78,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bo;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zs()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zr()V
 
     const/4 v0, 0x1
 
@@ -97,27 +97,27 @@
     throw v0
 .end method
 
-.method protected abstract yT()Z
+.method protected abstract yS()Z
 .end method
 
-.method protected yU()V
+.method protected yT()V
     .locals 0
 
     return-void
 .end method
 
-.method public final zu()V
+.method public final zt()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/bo;->aQH:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->yU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->yT()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bo;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zs()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zr()V
 
     const/4 v0, 0x1
 
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 f661b0f6cb..5c10bdeaf7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bp.smali
@@ -6,11 +6,11 @@
 .method public abstract getContext()Landroid/content/Context;
 .end method
 
-.method public abstract tK()Lcom/google/android/gms/common/util/d;
+.method public abstract tJ()Lcom/google/android/gms/common/util/d;
 .end method
 
-.method public abstract yL()Lcom/google/android/gms/measurement/internal/am;
+.method public abstract yK()Lcom/google/android/gms/measurement/internal/am;
 .end method
 
-.method public abstract yM()Lcom/google/android/gms/measurement/internal/o;
+.method public abstract yL()Lcom/google/android/gms/measurement/internal/o;
 .end method
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 3abd7f2372..30d3806f70 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
@@ -60,15 +60,15 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/br;)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -84,18 +84,18 @@
 
     const/4 v1, 0x0
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ar;->V(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ar;->U(Z)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -117,7 +117,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -127,12 +127,12 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/br;->zv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/br;->zu()V
 
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -142,23 +142,23 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->zx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->zw()V
 
     return-void
 .end method
 
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/br;Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;)V
-    .locals 23
+    .locals 22
 
     move-object/from16 v0, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -184,7 +184,7 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -212,7 +212,7 @@
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/measurement/internal/zzfh;-><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/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v9
 
@@ -230,7 +230,7 @@
 
     move-result-object v13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v14
 
@@ -254,7 +254,7 @@
 
     move-result-object v10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v14
 
@@ -290,7 +290,7 @@
 
     iget-object v11, v0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTriggerEventName:Ljava/lang/String;
 
-    move-object/from16 v21, v10
+    move-object v12, v10
 
     iget-wide v9, v0, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mTriggerTimeout:J
 
@@ -306,24 +306,26 @@
 
     move-object v9, v11
 
-    move-object/from16 v10, v21
+    move-object v10, v12
 
     move-wide/from16 v11, v17
 
-    move-object/from16 v22, v14
+    move-object/from16 v21, v14
 
     move-wide v14, v0
 
     invoke-direct/range {v2 .. v16}, Lcom/google/android/gms/measurement/internal/zzl;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzfh;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
-    move-object/from16 v1, v22
+    move-object/from16 v1, v21
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ch;->b(Lcom/google/android/gms/measurement/internal/zzl;)V
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -343,7 +345,7 @@
 
     move-result-object v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v11
 
@@ -375,7 +377,7 @@
 .end method
 
 .method private final a(Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;ZZZLjava/lang/String;)V
-    .locals 28
+    .locals 24
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
@@ -393,9 +395,9 @@
 
     invoke-static/range {p5 .. p5}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
@@ -405,7 +407,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -420,7 +422,7 @@
     :cond_0
     iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/br;->bmW:Z
 
-    const/4 v5, 0x0
+    const/4 v3, 0x0
 
     const/16 v16, 0x0
 
@@ -440,27 +442,27 @@
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
 
     :try_start_1
-    const-string v9, "initialize"
+    const-string v4, "initialize"
 
-    new-array v10, v7, [Ljava/lang/Class;
+    new-array v5, v7, [Ljava/lang/Class;
 
-    const-class v11, Landroid/content/Context;
+    const-class v9, Landroid/content/Context;
 
-    aput-object v11, v10, v16
+    aput-object v9, v5, v16
 
-    invoke-virtual {v0, v9, v10}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+    invoke-virtual {v0, v4, v5}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    new-array v9, v7, [Ljava/lang/Object;
+    new-array v4, v7, [Ljava/lang/Object;
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->getContext()Landroid/content/Context;
 
-    move-result-object v10
+    move-result-object v5
 
-    aput-object v10, v9, v16
+    aput-object v5, v4, v16
 
-    invoke-virtual {v0, v5, v9}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v3, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
@@ -471,99 +473,100 @@
     move-exception v0
 
     :try_start_2
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
-    move-result-object v9
+    move-result-object v4
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/o;->bkt:Lcom/google/android/gms/measurement/internal/q;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/o;->bkt:Lcom/google/android/gms/measurement/internal/q;
 
-    const-string v10, "Failed to invoke Tag Manager\'s initialize() method"
+    const-string v5, "Failed to invoke Tag Manager\'s initialize() method"
 
-    invoke-virtual {v9, v10, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {v4, v5, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
     :try_end_2
     .catch Ljava/lang/ClassNotFoundException; {:try_start_2 .. :try_end_2} :catch_1
 
     goto :goto_0
 
     :catch_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/o;->bkw:Lcom/google/android/gms/measurement/internal/q;
 
-    const-string v9, "Tag Manager is not found and thus will not be used"
+    const-string v4, "Tag Manager is not found and thus will not be used"
 
-    invoke-virtual {v0, v9}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+    invoke-virtual {v0, v4}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     :cond_1
     :goto_0
     const/16 v0, 0x28
 
-    const/4 v9, 0x2
+    const/4 v4, 0x2
 
     if-eqz p8, :cond_6
 
-    const-string v10, "_iap"
+    const-string v5, "_iap"
 
-    invoke-virtual {v10, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v10
+    move-result v5
 
-    if-nez v10, :cond_6
+    if-nez v5, :cond_6
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
-    move-result-object v10
+    move-result-object v5
 
-    const-string v11, "event"
+    const-string v9, "event"
 
-    invoke-virtual {v10, v11, v6}, Lcom/google/android/gms/measurement/internal/ea;->G(Ljava/lang/String;Ljava/lang/String;)Z
+    invoke-virtual {v5, v9, v6}, Lcom/google/android/gms/measurement/internal/ea;->G(Ljava/lang/String;Ljava/lang/String;)Z
 
-    move-result v11
+    move-result v9
 
-    if-nez v11, :cond_2
+    if-nez v9, :cond_2
 
-    :goto_1
-    const/4 v10, 0x2
+    const/4 v5, 0x2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
-    const-string v11, "event"
+    const-string v9, "event"
 
-    sget-object v12, Lcom/google/android/gms/measurement/AppMeasurement$a;->bii:[Ljava/lang/String;
+    sget-object v10, Lcom/google/android/gms/measurement/AppMeasurement$a;->bii:[Ljava/lang/String;
 
-    invoke-virtual {v10, v11, v12, v6}, Lcom/google/android/gms/measurement/internal/ea;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
+    invoke-virtual {v5, v9, v10, v6}, Lcom/google/android/gms/measurement/internal/ea;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
-    move-result v11
+    move-result v9
 
-    if-nez v11, :cond_3
+    if-nez v9, :cond_3
 
-    const/16 v10, 0xd
+    const/16 v5, 0xd
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
-    const-string v11, "event"
+    const-string v9, "event"
 
-    invoke-virtual {v10, v11, v0, v6}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;ILjava/lang/String;)Z
+    invoke-virtual {v5, v9, v0, v6}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;ILjava/lang/String;)Z
 
-    move-result v10
+    move-result v5
 
-    if-nez v10, :cond_4
+    if-nez v5, :cond_4
+
+    const/4 v5, 0x2
 
     goto :goto_1
 
     :cond_4
-    const/4 v10, 0x0
+    const/4 v5, 0x0
 
-    :goto_2
-    if-eqz v10, :cond_6
+    :goto_1
+    if-eqz v5, :cond_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -571,7 +574,7 @@
 
     const-string v3, "Invalid public event name. Event will not be logged (FE)"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -583,7 +586,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {v6, v0, v7}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -597,81 +600,81 @@
 
     move/from16 v2, v16
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     const/4 v2, 0x0
 
-    :goto_3
+    :goto_2
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v3
 
     const-string v4, "_ev"
 
-    invoke-virtual {v3, v10, v4, v0, v2}, Lcom/google/android/gms/measurement/internal/ea;->a(ILjava/lang/String;Ljava/lang/String;I)V
+    invoke-virtual {v3, v5, v4, v0, v2}, Lcom/google/android/gms/measurement/internal/ea;->a(ILjava/lang/String;Ljava/lang/String;I)V
 
     return-void
 
     :cond_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
-    move-result-object v10
+    move-result-object v5
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ce;->zw()Lcom/google/android/gms/measurement/internal/cd;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ce;->zv()Lcom/google/android/gms/measurement/internal/cd;
 
-    move-result-object v15
+    move-result-object v5
 
-    if-eqz v15, :cond_7
+    if-eqz v5, :cond_7
 
-    const-string v10, "_sc"
+    const-string v9, "_sc"
 
-    invoke-virtual {v2, v10}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+    invoke-virtual {v2, v9}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
-    move-result v10
+    move-result v9
 
-    if-nez v10, :cond_7
+    if-nez v9, :cond_7
 
-    iput-boolean v7, v15, Lcom/google/android/gms/measurement/internal/cd;->bnn:Z
+    iput-boolean v7, v5, Lcom/google/android/gms/measurement/internal/cd;->bnn:Z
 
     :cond_7
     if-eqz p6, :cond_8
 
     if-eqz p8, :cond_8
 
-    const/4 v10, 0x1
+    const/4 v9, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
-    :goto_4
-    invoke-static {v15, v2, v10}, Lcom/google/android/gms/measurement/internal/ce;->a(Lcom/google/android/gms/measurement/internal/cd;Landroid/os/Bundle;Z)V
+    :goto_3
+    invoke-static {v5, v2, v9}, Lcom/google/android/gms/measurement/internal/ce;->a(Lcom/google/android/gms/measurement/internal/cd;Landroid/os/Bundle;Z)V
 
-    const-string v10, "am"
+    const-string v9, "am"
 
-    invoke-virtual {v10, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v9, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v17
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/ea;->cR(Ljava/lang/String;)Z
 
-    move-result v10
+    move-result v9
 
     if-eqz p6, :cond_9
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/br;->bmU:Lcom/google/android/gms/measurement/AppMeasurement$b;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/br;->bmU:Lcom/google/android/gms/measurement/AppMeasurement$b;
 
-    if-eqz v3, :cond_9
+    if-eqz v10, :cond_9
 
-    if-nez v10, :cond_9
+    if-nez v9, :cond_9
 
     if-nez v17, :cond_9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -679,7 +682,7 @@
 
     const-string v3, "Passing event to registered event handler (FE)"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -687,7 +690,7 @@
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v5
 
@@ -700,46 +703,46 @@
     return-void
 
     :cond_9
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->zt()Z
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ar;->zs()Z
 
-    move-result v3
+    move-result v9
 
-    if-nez v3, :cond_a
+    if-nez v9, :cond_a
 
     return-void
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
-    move-result-object v3
+    move-result-object v9
 
-    invoke-virtual {v3, v6}, Lcom/google/android/gms/measurement/internal/ea;->cN(Ljava/lang/String;)I
+    invoke-virtual {v9, v6}, Lcom/google/android/gms/measurement/internal/ea;->cN(Ljava/lang/String;)I
 
-    move-result v3
+    move-result v9
 
-    if-eqz v3, :cond_c
+    if-eqz v9, :cond_c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/o;->bks:Lcom/google/android/gms/measurement/internal/q;
 
-    const-string v4, "Invalid event name. Event will not be logged (FE)"
+    const-string v3, "Invalid event name. Event will not be logged (FE)"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/m;->co(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/m;->co(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v2, v4, v5}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {v6, v0, v7}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -753,21 +756,21 @@
 
     move/from16 v2, v16
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_b
     const/4 v2, 0x0
 
-    :goto_5
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
+    :goto_4
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
-    move-result-object v4
+    move-result-object v3
 
-    const-string v5, "_ev"
+    const-string v4, "_ev"
 
-    invoke-virtual {v4, v3, v5, v0, v2}, Lcom/google/android/gms/measurement/internal/ea;->b(ILjava/lang/String;Ljava/lang/String;I)V
+    invoke-virtual {v3, v9, v4, v0, v2}, Lcom/google/android/gms/measurement/internal/ea;->b(ILjava/lang/String;Ljava/lang/String;I)V
 
     return-void
 
@@ -776,23 +779,23 @@
 
     new-array v0, v0, [Ljava/lang/String;
 
-    const-string v3, "_o"
+    const-string v9, "_o"
 
-    aput-object v3, v0, v16
+    aput-object v9, v0, v16
 
-    const-string v3, "_sn"
+    const-string v9, "_sn"
 
-    aput-object v3, v0, v7
+    aput-object v9, v0, v7
 
-    const-string v3, "_sc"
+    const-string v9, "_sc"
 
-    aput-object v3, v0, v9
+    aput-object v9, v0, v4
 
-    const/4 v3, 0x3
+    const/4 v4, 0x3
 
     const-string v9, "_si"
 
-    aput-object v9, v0, v3
+    aput-object v9, v0, v4
 
     invoke-static {v0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
 
@@ -802,11 +805,11 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v9
 
-    const/4 v3, 0x1
+    const/4 v15, 0x1
 
     move-object/from16 v10, p9
 
@@ -818,19 +821,15 @@
 
     move/from16 v14, p8
 
-    move-object/from16 v18, v15
-
-    move v15, v3
-
     invoke-virtual/range {v9 .. v15}, Lcom/google/android/gms/measurement/internal/ea;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;Ljava/util/List;ZZ)Landroid/os/Bundle;
 
-    move-result-object v3
+    move-result-object v4
 
-    if-eqz v3, :cond_e
+    if-eqz v4, :cond_e
 
     const-string v9, "_sc"
 
-    invoke-virtual {v3, v9}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+    invoke-virtual {v4, v9}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
     move-result v9
 
@@ -838,30 +837,30 @@
 
     const-string v9, "_si"
 
-    invoke-virtual {v3, v9}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+    invoke-virtual {v4, v9}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
     move-result v9
 
     if-nez v9, :cond_d
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_d
-    const-string v5, "_sn"
+    const-string v3, "_sn"
 
-    invoke-virtual {v3, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v3
 
     const-string v9, "_sc"
 
-    invoke-virtual {v3, v9}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v9}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v9
 
     const-string v10, "_si"
 
-    invoke-virtual {v3, v10}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    invoke-virtual {v4, v10}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
     move-result-wide v10
 
@@ -875,46 +874,42 @@
 
     move-result-wide v12
 
-    invoke-direct {v11, v5, v9, v12, v13}, Lcom/google/android/gms/measurement/internal/cd;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-direct {v11, v3, v9, v12, v13}, Lcom/google/android/gms/measurement/internal/cd;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
-    move-object v15, v11
+    goto :goto_6
+
+    :cond_e
+    :goto_5
+    move-object v11, v3
+
+    :goto_6
+    if-nez v11, :cond_f
 
     goto :goto_7
 
-    :cond_e
-    :goto_6
-    move-object v15, v5
+    :cond_f
+    move-object v5, v11
 
     :goto_7
-    if-nez v15, :cond_f
+    new-instance v3, Ljava/util/ArrayList;
 
-    move-object/from16 v5, v18
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    goto :goto_8
+    invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :cond_f
-    move-object v5, v15
-
-    :goto_8
-    new-instance v15, Ljava/util/ArrayList;
-
-    invoke-direct {v15}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {v15, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v9
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/security/SecureRandom;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ea;->zO()Ljava/security/SecureRandom;
 
     move-result-object v9
 
     invoke-virtual {v9}, Ljava/security/SecureRandom;->nextLong()J
 
-    move-result-wide v13
+    move-result-wide v14
 
-    invoke-virtual {v3}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
+    invoke-virtual {v4}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
 
     move-result-object v9
 
@@ -932,93 +927,91 @@
 
     invoke-static {v2}, Ljava/util/Arrays;->sort([Ljava/lang/Object;)V
 
-    array-length v12, v2
-
-    const/4 v10, 0x0
+    array-length v13, v2
 
     const/4 v11, 0x0
 
-    :goto_9
-    if-ge v11, v12, :cond_12
+    const/4 v12, 0x0
 
-    aget-object v9, v2, v11
+    :goto_8
+    if-ge v12, v13, :cond_12
 
-    invoke-virtual {v3, v9}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
+    aget-object v10, v2, v12
 
-    move-result-object v18
+    invoke-virtual {v4, v10}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    move-result-object v9
 
-    move-object/from16 v19, v15
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
-    invoke-static/range {v18 .. v18}, Lcom/google/android/gms/measurement/internal/ea;->bd(Ljava/lang/Object;)[Landroid/os/Bundle;
+    invoke-static {v9}, Lcom/google/android/gms/measurement/internal/ea;->bd(Ljava/lang/Object;)[Landroid/os/Bundle;
 
-    move-result-object v15
+    move-result-object v9
 
-    if-eqz v15, :cond_11
+    if-eqz v9, :cond_11
 
-    array-length v7, v15
+    array-length v7, v9
 
-    invoke-virtual {v3, v9, v7}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v4, v10, v7}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    move-object/from16 v21, v2
+    move-object/from16 p5, v2
 
     const/4 v7, 0x0
 
-    :goto_a
-    array-length v2, v15
+    :goto_9
+    array-length v2, v9
 
     if-ge v7, v2, :cond_10
 
-    aget-object v2, v15, v7
+    aget-object v2, v9, v7
 
-    move-object/from16 v22, v15
+    move-wide/from16 v19, v14
 
     const/4 v15, 0x1
 
     invoke-static {v5, v2, v15}, Lcom/google/android/gms/measurement/internal/ce;->a(Lcom/google/android/gms/measurement/internal/cd;Landroid/os/Bundle;Z)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
-    move-result-object v18
+    move-result-object v14
 
-    const-string v20, "_ep"
+    const-string v18, "_ep"
 
-    const/16 v23, 0x0
+    const/16 v21, 0x0
 
-    move-object/from16 v24, v9
+    move-object/from16 v22, v9
 
-    move-object/from16 v9, v18
+    move-object v9, v14
 
-    move/from16 v25, v10
+    move-object v14, v10
 
     move-object/from16 v10, p9
 
-    move/from16 v18, v11
+    move/from16 v23, v11
 
-    move-object/from16 v11, v20
+    move-object/from16 v11, v18
 
-    move/from16 v20, v12
+    move/from16 v18, v12
 
     move-object v12, v2
 
-    move-object/from16 v26, v5
-
-    move-wide v4, v13
+    move v2, v13
 
     move-object v13, v0
 
+    move-object/from16 p6, v0
+
+    move-wide/from16 v0, v19
+
+    move/from16 v19, v2
+
+    move-object v2, v14
+
     move/from16 v14, p8
 
-    move-object/from16 v27, v0
+    const/16 v20, 0x1
 
-    move-object/from16 v2, v19
-
-    move-object/from16 v0, v22
-
-    const/16 v19, 0x1
-
-    move/from16 v15, v23
+    move/from16 v15, v21
 
     invoke-virtual/range {v9 .. v15}, Lcom/google/android/gms/measurement/internal/ea;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;Ljava/util/List;ZZ)Landroid/os/Bundle;
 
@@ -1030,17 +1023,17 @@
 
     const-string v10, "_eid"
 
-    invoke-virtual {v9, v10, v4, v5}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v9, v10, v0, v1}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     const-string v10, "_gn"
 
-    move-object/from16 v11, v24
-
-    invoke-virtual {v9, v10, v11}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v9, v10, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v10, "_ll"
 
-    array-length v12, v0
+    move-object/from16 v11, v22
+
+    array-length v12, v11
 
     invoke-virtual {v9, v10, v12}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
@@ -1048,176 +1041,162 @@
 
     invoke-virtual {v9, v10, v7}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    invoke-interface {v2, v9}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v3, v9}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     add-int/lit8 v7, v7, 0x1
 
-    move-object v15, v0
+    move-wide v14, v0
 
-    move-object/from16 v19, v2
-
-    move-wide v13, v4
+    move-object v10, v2
 
     move-object v9, v11
 
-    move/from16 v11, v18
+    move/from16 v12, v18
 
-    move/from16 v12, v20
+    move/from16 v13, v19
 
-    move/from16 v10, v25
+    move/from16 v11, v23
 
-    move-object/from16 v5, v26
+    move-object/from16 v1, p0
 
-    move-object/from16 v0, v27
+    move-object/from16 v0, p6
+
+    goto :goto_9
+
+    :cond_10
+    move-object/from16 p6, v0
+
+    move/from16 v23, v11
+
+    move/from16 v18, v12
+
+    move/from16 v19, v13
+
+    move-wide v0, v14
+
+    const/16 v20, 0x1
+
+    move-object v11, v9
+
+    array-length v2, v11
+
+    move/from16 v7, v23
+
+    add-int v11, v7, v2
 
     goto :goto_a
 
-    :cond_10
-    move-object/from16 v27, v0
-
-    move-object/from16 v26, v5
-
-    move/from16 v25, v10
-
-    move/from16 v18, v11
-
-    move/from16 v20, v12
-
-    move-wide v4, v13
-
-    move-object v0, v15
-
-    move-object/from16 v2, v19
-
-    const/16 v19, 0x1
-
-    array-length v0, v0
-
-    move/from16 v7, v25
-
-    add-int v10, v7, v0
-
-    goto :goto_b
-
     :cond_11
-    move-object/from16 v27, v0
+    move-object/from16 p6, v0
 
-    move-object/from16 v21, v2
+    move-object/from16 p5, v2
 
-    move-object/from16 v26, v5
+    move v7, v11
 
-    move v7, v10
+    move/from16 v18, v12
 
-    move/from16 v18, v11
+    move/from16 v19, v13
 
-    move/from16 v20, v12
+    move-wide v0, v14
 
-    move-wide v4, v13
+    const/16 v20, 0x1
 
-    move-object/from16 v2, v19
+    :goto_a
+    add-int/lit8 v12, v18, 0x1
 
-    const/16 v19, 0x1
+    move-object/from16 v2, p5
 
-    :goto_b
-    add-int/lit8 v11, v18, 0x1
+    move-wide v14, v0
 
-    move-object v15, v2
+    move/from16 v13, v19
 
-    move-wide v13, v4
-
-    move/from16 v12, v20
-
-    move-object/from16 v2, v21
-
-    move-object/from16 v5, v26
-
-    move-object/from16 v0, v27
+    move-object/from16 v1, p0
 
     const/4 v7, 0x1
 
-    goto/16 :goto_9
+    move-object/from16 v0, p6
+
+    goto/16 :goto_8
 
     :cond_12
-    move v7, v10
+    move v7, v11
 
-    move-wide v4, v13
+    move-wide v0, v14
 
-    move-object v2, v15
-
-    const/16 v19, 0x1
+    const/16 v20, 0x1
 
     if-eqz v7, :cond_13
 
-    const-string v0, "_eid"
+    const-string v2, "_eid"
 
-    invoke-virtual {v3, v0, v4, v5}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v4, v2, v0, v1}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     const-string v0, "_epc"
 
-    invoke-virtual {v3, v0, v7}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v4, v0, v7}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_13
     const/4 v0, 0x0
 
-    :goto_c
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    :goto_b
+    invoke-interface {v3}, Ljava/util/List;->size()I
 
-    move-result v3
+    move-result v1
 
-    if-ge v0, v3, :cond_18
+    if-ge v0, v1, :cond_19
 
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v1
 
-    check-cast v3, Landroid/os/Bundle;
+    check-cast v1, Landroid/os/Bundle;
 
     if-eqz v0, :cond_14
 
-    const/4 v4, 0x1
+    const/4 v2, 0x1
 
-    goto :goto_d
+    goto :goto_c
 
     :cond_14
-    const/4 v4, 0x0
+    const/4 v2, 0x0
 
-    :goto_d
-    if-eqz v4, :cond_15
+    :goto_c
+    if-eqz v2, :cond_15
 
-    const-string v4, "_ep"
+    const-string v2, "_ep"
 
-    goto :goto_e
+    move-object v4, v2
+
+    goto :goto_d
 
     :cond_15
     move-object v4, v6
 
-    :goto_e
-    const-string v5, "_o"
+    :goto_d
+    const-string v2, "_o"
 
-    invoke-virtual {v3, v5, v8}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v1, v2, v8}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     if-eqz p7, :cond_16
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
-    move-result-object v5
+    move-result-object v2
 
-    invoke-virtual {v5, v3}, Lcom/google/android/gms/measurement/internal/ea;->e(Landroid/os/Bundle;)Landroid/os/Bundle;
+    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/ea;->e(Landroid/os/Bundle;)Landroid/os/Bundle;
 
-    move-result-object v3
+    move-result-object v1
 
     :cond_16
-    move-object v10, v3
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    move-result-object v2
 
-    move-result-object v3
-
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/o;->bkx:Lcom/google/android/gms/measurement/internal/q;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/o;->bkx:Lcom/google/android/gms/measurement/internal/q;
 
     const-string v5, "Logging event (FE)"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v7
 
@@ -1225,25 +1204,25 @@
 
     move-result-object v7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
-    move-result-object v11
+    move-result-object v9
 
-    invoke-virtual {v11, v10}, Lcom/google/android/gms/measurement/internal/m;->d(Landroid/os/Bundle;)Ljava/lang/String;
+    invoke-virtual {v9, v1}, Lcom/google/android/gms/measurement/internal/m;->d(Landroid/os/Bundle;)Ljava/lang/String;
 
-    move-result-object v11
+    move-result-object v9
 
-    invoke-virtual {v3, v5, v7, v11}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-virtual {v2, v5, v7, v9}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    new-instance v11, Lcom/google/android/gms/measurement/internal/zzad;
+    new-instance v9, Lcom/google/android/gms/measurement/internal/zzad;
 
     new-instance v5, Lcom/google/android/gms/measurement/internal/zzaa;
 
-    invoke-direct {v5, v10}, Lcom/google/android/gms/measurement/internal/zzaa;-><init>(Landroid/os/Bundle;)V
+    invoke-direct {v5, v1}, Lcom/google/android/gms/measurement/internal/zzaa;-><init>(Landroid/os/Bundle;)V
 
-    move-object v12, v2
+    move-object v2, v9
 
-    move-object v2, v11
+    move-object v10, v3
 
     move-object v3, v4
 
@@ -1251,93 +1230,100 @@
 
     move-object/from16 v5, p1
 
-    move-object v13, v6
+    move-object v11, v6
 
-    const/4 v14, 0x1
+    const/4 v12, 0x1
 
     move-wide/from16 v6, p3
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/measurement/internal/zzad;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzaa;Ljava/lang/String;J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v2
 
     move-object/from16 v3, p9
 
-    invoke-virtual {v2, v11, v3}, Lcom/google/android/gms/measurement/internal/ch;->b(Lcom/google/android/gms/measurement/internal/zzad;Ljava/lang/String;)V
+    invoke-virtual {v2, v9, v3}, Lcom/google/android/gms/measurement/internal/ch;->b(Lcom/google/android/gms/measurement/internal/zzad;Ljava/lang/String;)V
 
     if-nez v17, :cond_17
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/br;->bmV:Ljava/util/Set;
+    move-object/from16 v2, p0
 
-    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/br;->bmV:Ljava/util/Set;
 
-    move-result-object v2
+    invoke-interface {v4}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    :goto_f
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    move-result-object v4
 
-    move-result v4
+    :goto_e
+    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
 
-    if-eqz v4, :cond_17
+    move-result v5
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    if-eqz v5, :cond_18
 
-    new-instance v4, Landroid/os/Bundle;
+    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    invoke-direct {v4, v10}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
+    new-instance v5, Landroid/os/Bundle;
 
-    goto :goto_f
+    invoke-direct {v5, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
+
+    goto :goto_e
 
     :cond_17
-    add-int/lit8 v0, v0, 0x1
-
-    move-object v2, v12
-
-    move-object v6, v13
-
-    const/16 v19, 0x1
-
-    goto :goto_c
+    move-object/from16 v2, p0
 
     :cond_18
-    move-object v13, v6
+    add-int/lit8 v0, v0, 0x1
 
-    const/4 v14, 0x1
+    move-object v3, v10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    move-object v6, v11
+
+    const/16 v20, 0x1
+
+    goto/16 :goto_b
+
+    :cond_19
+    move-object v11, v6
+
+    move-object/from16 v2, p0
+
+    const/4 v12, 0x1
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ce;->zw()Lcom/google/android/gms/measurement/internal/cd;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ce;->zv()Lcom/google/android/gms/measurement/internal/cd;
 
     move-result-object v0
 
-    if-eqz v0, :cond_19
+    if-eqz v0, :cond_1a
 
     const-string v0, "_ae"
 
-    invoke-virtual {v0, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_19
+    if-eqz v0, :cond_1a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object v0
 
-    invoke-virtual {v0, v14}, Lcom/google/android/gms/measurement/internal/dg;->Y(Z)Z
+    invoke-virtual {v0, v12}, Lcom/google/android/gms/measurement/internal/dg;->X(Z)Z
 
-    :cond_19
+    :cond_1a
     return-void
 .end method
 
 .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/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -1369,10 +1355,15 @@
 
     const-string p1, "app"
 
+    move-object v1, p1
+
+    goto :goto_0
+
     :cond_0
     move-object v1, p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    :goto_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p1
 
@@ -1388,7 +1379,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {p2, v2, v0}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -1403,7 +1394,7 @@
     :cond_1
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p2
 
@@ -1416,7 +1407,7 @@
     :cond_2
     if-eqz p3, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p1
 
@@ -1426,7 +1417,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {p2, v2, v0}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -1452,7 +1443,7 @@
     :cond_4
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p3
 
@@ -1463,7 +1454,7 @@
     return-void
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {p2, p3}, Lcom/google/android/gms/measurement/internal/ea;->r(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1501,9 +1492,9 @@
 
     move-object/from16 v0, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1521,7 +1512,7 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1549,7 +1540,7 @@
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/measurement/internal/zzfh;-><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/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v9
 
@@ -1613,24 +1604,26 @@
 
     invoke-direct/range {v2 .. v16}, Lcom/google/android/gms/measurement/internal/zzl;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzfh;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v1
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/ch;->b(Lcom/google/android/gms/measurement/internal/zzl;)V
 
+    return-void
+
     :catch_0
     return-void
 .end method
 
 
 # virtual methods
-.method public final M(Z)V
+.method public final L(Z)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -1643,7 +1636,7 @@
     return-void
 .end method
 
-.method public final W(Z)Ljava/util/List;
+.method public final V(Z)Ljava/util/List;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1654,9 +1647,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1666,17 +1659,17 @@
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/am;->zo()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/am;->zn()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1684,7 +1677,6 @@
 
     const-string v0, "Cannot get all user properties from analytics worker thread"
 
-    :goto_0
     invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
@@ -1700,7 +1692,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1708,7 +1700,13 @@
 
     const-string v0, "Cannot get all user properties from main thread"
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_1
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
@@ -1720,7 +1718,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -1742,13 +1740,13 @@
     .catch Ljava/lang/InterruptedException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception v0
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1758,7 +1756,7 @@
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     monitor-exit p1
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
@@ -1771,7 +1769,7 @@
 
     if-nez p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1779,7 +1777,13 @@
 
     const-string v0, "Timed out waiting for get user properties"
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_2
     return-object p1
@@ -1798,7 +1802,7 @@
 .method public final a(Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;)V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -1826,7 +1830,7 @@
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mValue:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -1836,7 +1840,7 @@
 
     if-eqz v2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1844,7 +1848,7 @@
 
     const-string v1, "Invalid conditional user property name"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -1857,7 +1861,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -1867,7 +1871,7 @@
 
     if-eqz v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1875,7 +1879,7 @@
 
     const-string v2, "Invalid conditional user property value"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v3
 
@@ -1888,7 +1892,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->r(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1896,7 +1900,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1904,7 +1908,7 @@
 
     const-string v2, "Unable to normalize conditional user property value"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v3
 
@@ -1942,7 +1946,7 @@
     if-gez v3, :cond_4
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1950,7 +1954,7 @@
 
     const-string v3, "Invalid conditional user property timeout"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -1980,7 +1984,7 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -1994,7 +1998,7 @@
 
     :cond_6
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -2002,7 +2006,7 @@
 
     const-string v3, "Invalid conditional user property time to live"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -2024,7 +2028,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     move-object v10, p0
 
@@ -2078,7 +2082,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -2108,18 +2112,28 @@
 
     const-string p1, "app"
 
+    move-object v1, p1
+
+    goto :goto_0
+
     :cond_0
     move-object v1, p1
 
+    :goto_0
     if-nez p3, :cond_1
 
     new-instance p3, Landroid/os/Bundle;
 
     invoke-direct {p3}, Landroid/os/Bundle;-><init>()V
 
+    move-object v5, p3
+
+    goto :goto_1
+
     :cond_1
     move-object v5, p3
 
+    :goto_1
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/br;->bmU:Lcom/google/android/gms/measurement/AppMeasurement$b;
 
     const/4 p3, 0x1
@@ -2132,20 +2146,20 @@
 
     if-eqz p1, :cond_2
 
-    goto :goto_0
+    goto :goto_2
 
     :cond_2
     const/4 p1, 0x0
 
     const/4 v7, 0x0
 
-    goto :goto_1
+    goto :goto_3
 
     :cond_3
-    :goto_0
+    :goto_2
     const/4 v7, 0x1
 
-    :goto_1
+    :goto_3
     const/4 v6, 0x1
 
     xor-int/lit8 v8, p4, 0x1
@@ -2170,19 +2184,19 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -2264,7 +2278,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -2292,12 +2306,14 @@
     :goto_2
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ad;->cy(Ljava/lang/String;)V
 
-    goto :goto_3
+    move-object v5, p3
+
+    goto :goto_4
 
     :cond_3
     if-nez p3, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -2307,7 +2323,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ad;->cy(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -2334,6 +2350,7 @@
     :goto_3
     move-object v5, p3
 
+    :goto_4
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
     invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->isEnabled()Z
@@ -2342,7 +2359,7 @@
 
     if-nez p3, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -2357,7 +2374,7 @@
     :cond_6
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->zt()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->zs()Z
 
     move-result p3
 
@@ -2366,7 +2383,7 @@
     return-void
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -2374,7 +2391,7 @@
 
     const-string v0, "Setting user property (FE)"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v1
 
@@ -2396,7 +2413,7 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/zzfh;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object p1
 
@@ -2408,7 +2425,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -2435,7 +2452,7 @@
     iput-object p4, v2, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->mExpiredEventParams:Landroid/os/Bundle;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p1
 
@@ -2464,17 +2481,17 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/am;->zo()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/am;->zn()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -2482,7 +2499,6 @@
 
     const-string p2, "Cannot get user properties from analytics worker thread"
 
-    :goto_0
     invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
@@ -2498,7 +2514,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -2506,7 +2522,13 @@
 
     const-string p2, "Cannot get user properties from main thread"
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_1
     new-instance v7, Ljava/util/concurrent/atomic/AtomicReference;
@@ -2518,7 +2540,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v8
 
@@ -2552,13 +2574,13 @@
     .catch Ljava/lang/InterruptedException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception p1
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -2568,7 +2590,7 @@
 
     invoke-virtual {p2, p3, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     monitor-exit v7
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
@@ -2581,7 +2603,7 @@
 
     if-nez p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -2589,7 +2611,13 @@
 
     const-string p2, "Timed out waiting for get user properties"
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_2
     new-instance p2, Landroidx/collection/ArrayMap;
@@ -2604,7 +2632,7 @@
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p3
@@ -2625,7 +2653,7 @@
 
     invoke-interface {p2, p4, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     return-object p2
@@ -2639,12 +2667,14 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -2696,17 +2726,17 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/am;->zo()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/am;->zn()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -2714,10 +2744,8 @@
 
     const-string p2, "Cannot get conditional user properties from analytics worker thread"
 
-    :goto_0
     invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    :goto_1
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object p1
@@ -2731,7 +2759,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -2739,7 +2767,13 @@
 
     const-string p2, "Cannot get conditional user properties from main thread"
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_1
     new-instance v6, Ljava/util/concurrent/atomic/AtomicReference;
@@ -2751,7 +2785,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v7
 
@@ -2783,13 +2817,13 @@
     .catch Ljava/lang/InterruptedException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_2
+    goto :goto_0
 
     :catch_0
     move-exception p2
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -2799,7 +2833,7 @@
 
     invoke-virtual {p3, v0, p1, p2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_2
+    :goto_0
     monitor-exit v6
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
@@ -2812,7 +2846,7 @@
 
     if-nez p2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -2822,7 +2856,11 @@
 
     invoke-virtual {p2, p3, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_1
+    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_2
     new-instance p1, Ljava/util/ArrayList;
@@ -2837,7 +2875,7 @@
 
     move-result-object p2
 
-    :goto_3
+    :goto_1
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p3
@@ -2908,7 +2946,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -2939,7 +2977,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -2976,7 +3014,7 @@
 
     iget-object p3, p3, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object p3
 
@@ -2985,7 +3023,7 @@
     :cond_5
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :cond_6
     return-object p1
@@ -2999,6 +3037,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final bridge synthetic getContext()Landroid/content/Context;
@@ -3018,7 +3058,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -3043,7 +3083,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -3080,7 +3120,7 @@
 
     :cond_0
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lp()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lo()Ljava/lang/String;
 
     move-result-object v0
     :try_end_0
@@ -3093,7 +3133,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3108,173 +3148,165 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/br;
+.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/k;
+.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/dg;
+.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/dg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -3282,6 +3314,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -3290,18 +3330,18 @@
     return-void
 .end method
 
-.method public final zv()V
+.method public final zu()V
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zt()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zs()Z
 
     move-result v0
 
@@ -3310,21 +3350,21 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->zv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->zu()V
 
     const/4 v0, 0x0
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/br;->bmY:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zl()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zk()Ljava/lang/String;
 
     move-result-object v0
 
@@ -3334,11 +3374,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     sget-object v1, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
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 09beba36f4..4eb410cea5 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
@@ -31,7 +31,7 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ar;->V(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ar;->U(Z)V
 
     return-void
 .end method
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 4c62cbc363..f345028c89 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
@@ -35,7 +35,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/bv;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     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 52440beb8e..83cd17874b 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
@@ -45,7 +45,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
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 d3a64ae7d6..3178ae22fe 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
@@ -49,7 +49,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v1
 
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 ebaafc2138..12f391dc08 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
@@ -41,7 +41,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->zr()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->zq()Z
 
     move-result v1
 
@@ -51,7 +51,7 @@
 
     iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/cb;->bnk:Z
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/ar;->M(Z)V
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/ar;->L(Z)V
 
     iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/cb;->bnk:Z
 
@@ -61,7 +61,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -100,7 +100,7 @@
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->zr()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->zq()Z
 
     move-result v2
 
@@ -111,7 +111,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/br;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 c91ea9f0e1..d4550eafcf 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
@@ -45,7 +45,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -87,7 +87,7 @@
 
     iget-object v3, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ea;->d(Landroid/content/Intent;)Z
 
@@ -188,7 +188,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -203,7 +203,7 @@
     :cond_5
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -236,7 +236,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -250,7 +250,7 @@
     :goto_2
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -299,7 +299,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -317,7 +317,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -333,7 +333,7 @@
 
     iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ce;->bnp:Lcom/google/android/gms/measurement/internal/cd;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v1
 
@@ -345,11 +345,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cp;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -357,7 +357,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
@@ -377,7 +377,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -389,11 +389,11 @@
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/google/android/gms/measurement/internal/ce;->a(Landroid/app/Activity;Lcom/google/android/gms/measurement/internal/cd;Z)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -401,7 +401,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
@@ -413,11 +413,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cp;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -425,7 +425,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
@@ -443,7 +443,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cc;->bne:Lcom/google/android/gms/measurement/internal/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     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 b524b61fb1..62f10d1923 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
@@ -116,11 +116,11 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ce;Lcom/google/android/gms/measurement/internal/cd;)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -130,13 +130,13 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/a;->ay(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object p0
 
     iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/cd;->bnn:Z
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/dg;->Y(Z)Z
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/dg;->X(Z)Z
 
     move-result p0
 
@@ -189,6 +189,8 @@
 
     move-result-object p0
 
+    return-object p0
+
     :cond_1
     return-object p0
 .end method
@@ -245,7 +247,7 @@
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ce;->bnp:Lcom/google/android/gms/measurement/internal/cd;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p1
 
@@ -263,7 +265,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     monitor-enter p0
 
@@ -339,11 +341,11 @@
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->zO()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->zN()J
 
     move-result-wide v3
 
@@ -369,173 +371,165 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/br;
+.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/k;
+.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/dg;
+.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/dg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -543,6 +537,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -551,14 +553,14 @@
     return-void
 .end method
 
-.method public final zw()Lcom/google/android/gms/measurement/internal/cd;
+.method public final zv()Lcom/google/android/gms/measurement/internal/cd;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ce;->bno:Lcom/google/android/gms/measurement/internal/cd;
 
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 7945edcca9..2a05005983 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
@@ -49,9 +49,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cf;->bnx:Lcom/google/android/gms/measurement/internal/ce;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cf;->bnx:Lcom/google/android/gms/measurement/internal/ce;
-
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ce;->bno:Lcom/google/android/gms/measurement/internal/cd;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ce;->bno:Lcom/google/android/gms/measurement/internal/cd;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/ce;->a(Lcom/google/android/gms/measurement/internal/ce;Lcom/google/android/gms/measurement/internal/cd;)V
 
@@ -62,8 +60,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cf;->bnv:Lcom/google/android/gms/measurement/internal/cd;
-
     iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/cd;->bnm:J
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cf;->bnw:Lcom/google/android/gms/measurement/internal/cd;
@@ -128,8 +124,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cf;->bnv:Lcom/google/android/gms/measurement/internal/cd;
-
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/cd;->aTJ:Ljava/lang/String;
 
     if-eqz v0, :cond_3
@@ -162,7 +156,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cf;->bnx:Lcom/google/android/gms/measurement/internal/ce;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v2
 
@@ -170,9 +164,9 @@
 
     const-string v4, "_vs"
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -189,9 +183,7 @@
 
     iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ce;->bno:Lcom/google/android/gms/measurement/internal/cd;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cf;->bnx:Lcom/google/android/gms/measurement/internal/ce;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     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 32f62071b6..2f613b3e26 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
@@ -41,9 +41,7 @@
 
     iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ce;->bno:Lcom/google/android/gms/measurement/internal/cd;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cg;->bnx:Lcom/google/android/gms/measurement/internal/ce;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     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 f173481c3a..88517d227a 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
@@ -40,7 +40,7 @@
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dl;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -69,7 +69,7 @@
     return-void
 .end method
 
-.method private final X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+.method private final W(Z)Lcom/google/android/gms/measurement/internal/zzh;
     .locals 1
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -77,17 +77,17 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/o;->zc()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/o;->zb()Ljava/lang/String;
 
     move-result-object p1
 
@@ -107,7 +107,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ch;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->isConnected()Z
 
@@ -115,7 +115,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -134,7 +134,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ch;Landroid/content/ComponentName;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ch;->bnA:Lcom/google/android/gms/measurement/internal/f;
 
@@ -144,7 +144,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ch;->bnA:Lcom/google/android/gms/measurement/internal/f;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -154,9 +154,9 @@
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->ug()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->uf()V
 
     :cond_0
     return-void
@@ -173,7 +173,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->isConnected()Z
 
@@ -200,7 +200,7 @@
 
     if-ltz v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -223,7 +223,7 @@
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/measurement/internal/eq;->aj(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->ug()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->uf()V
 
     return-void
 .end method
@@ -235,9 +235,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/cl;
 
@@ -253,15 +253,15 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ch;->bnA:Lcom/google/android/gms/measurement/internal/f;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->tW()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->zy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->zx()V
 
     return-void
 .end method
@@ -271,9 +271,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     const/4 v0, 0x0
 
@@ -294,11 +294,11 @@
 
     invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/k;->za()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/k;->yZ()Ljava/util/List;
 
     move-result-object v4
 
@@ -358,7 +358,7 @@
     :catch_0
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v8
 
@@ -366,7 +366,6 @@
 
     const-string v9, "Failed to send event to the service"
 
-    :goto_3
     invoke-virtual {v8, v9, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     goto :goto_2
@@ -388,7 +387,7 @@
     :catch_1
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v8
 
@@ -396,7 +395,9 @@
 
     const-string v9, "Failed to send attribute to the service"
 
-    goto :goto_3
+    invoke-virtual {v8, v9, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto :goto_2
 
     :cond_3
     instance-of v8, v7, Lcom/google/android/gms/measurement/internal/zzl;
@@ -415,7 +416,7 @@
     :catch_2
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v8
 
@@ -423,10 +424,12 @@
 
     const-string v9, "Failed to send conditional property to the service"
 
-    goto :goto_3
+    invoke-virtual {v8, v9, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto :goto_2
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -454,11 +457,11 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
@@ -484,7 +487,7 @@
 
     if-le v1, v5, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -509,7 +512,7 @@
     const/4 v2, 0x1
 
     :cond_1
-    invoke-direct {p0, v4}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v4}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v0
 
@@ -536,13 +539,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v0
 
@@ -574,13 +577,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v7
 
@@ -624,13 +627,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v8
 
@@ -672,13 +675,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v0
 
@@ -698,11 +701,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
@@ -726,7 +729,7 @@
 
     if-le v1, v4, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -758,7 +761,7 @@
     const/4 v6, 0x0
 
     :goto_1
-    invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v8
 
@@ -788,15 +791,15 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Parcelable;)[B
 
@@ -810,7 +813,7 @@
 
     if-le v2, v4, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -848,7 +851,7 @@
 
     invoke-direct {v7, p1}, Lcom/google/android/gms/measurement/internal/zzl;-><init>(Lcom/google/android/gms/measurement/internal/zzl;)V
 
-    invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v8
 
@@ -872,11 +875,11 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->An()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Am()Z
 
     move-result v0
 
@@ -916,7 +919,7 @@
 
     :cond_2
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->getContext()Landroid/content/Context;
 
@@ -950,9 +953,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ch;->bnA:Lcom/google/android/gms/measurement/internal/f;
 
@@ -968,30 +971,30 @@
     return v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final tX()V
+.method final tW()V
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ch;->bnD:Lcom/google/android/gms/measurement/internal/dl;
 
@@ -1016,14 +1019,14 @@
     return-void
 .end method
 
-.method final ug()V
+.method final uf()V
     .locals 6
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ch;->isConnected()Z
 
@@ -1042,15 +1045,15 @@
 
     if-nez v0, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zj()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zi()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1064,29 +1067,27 @@
 
     const/4 v0, 0x1
 
-    goto/16 :goto_8
+    goto/16 :goto_3
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yZ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/i;->yY()I
 
     move-result v0
 
     if-ne v0, v2, :cond_2
 
-    :goto_0
     const/4 v0, 0x1
 
-    :goto_1
     const/4 v3, 0x1
 
-    goto/16 :goto_7
+    goto/16 :goto_2
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1096,11 +1097,11 @@
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v3
 
@@ -1124,7 +1125,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -1138,17 +1139,14 @@
 
     invoke-virtual {v3, v4, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :cond_3
-    :goto_2
     const/4 v0, 0x0
 
-    :goto_3
     const/4 v3, 0x0
 
-    goto/16 :goto_7
+    goto/16 :goto_2
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1156,13 +1154,16 @@
 
     const-string v3, "Service disabled"
 
-    :goto_4
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto :goto_2
+    const/4 v0, 0x0
+
+    const/4 v3, 0x0
+
+    goto/16 :goto_2
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1172,15 +1173,15 @@
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ea;->boL:Ljava/lang/Integer;
 
-    if-nez v3, :cond_4
+    if-nez v3, :cond_3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->getContext()Landroid/content/Context;
 
@@ -1198,7 +1199,7 @@
 
     iput-object v3, v0, Lcom/google/android/gms/measurement/internal/ea;->boL:Ljava/lang/Integer;
 
-    :cond_4
+    :cond_3
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ea;->boL:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -1207,16 +1208,20 @@
 
     const/16 v3, 0x32c8
 
-    if-ge v0, v3, :cond_5
+    if-ge v0, v3, :cond_4
 
-    goto :goto_5
+    const/4 v0, 0x0
 
-    :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    const/4 v3, 0x1
+
+    goto :goto_2
+
+    :cond_4
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zj()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zi()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1226,15 +1231,26 @@
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    const/4 v0, 0x0
+
+    goto :goto_1
 
     :cond_6
+    :goto_0
     const/4 v0, 0x1
 
-    goto :goto_3
+    :goto_1
+    const/4 v3, 0x0
+
+    goto :goto_2
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1244,13 +1260,14 @@
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    :goto_5
     const/4 v0, 0x0
 
-    goto/16 :goto_1
+    const/4 v3, 0x1
+
+    goto :goto_2
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1258,13 +1275,16 @@
 
     const-string v3, "Service available"
 
-    :goto_6
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto/16 :goto_0
+    const/4 v0, 0x1
+
+    const/4 v3, 0x1
+
+    goto :goto_2
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1272,10 +1292,16 @@
 
     const-string v3, "Service updating"
 
-    goto :goto_6
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    const/4 v3, 0x1
+
+    goto :goto_2
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1283,22 +1309,26 @@
 
     const-string v3, "Service invalid"
 
-    goto :goto_4
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    :goto_7
+    const/4 v0, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_2
     if-nez v0, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ei;->sB()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ei;->sA()Z
 
     move-result v4
 
     if-eqz v4, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -1313,14 +1343,14 @@
     :cond_9
     if-eqz v3, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v3
 
-    invoke-virtual {v3, v0}, Lcom/google/android/gms/measurement/internal/z;->S(Z)V
+    invoke-virtual {v3, v0}, Lcom/google/android/gms/measurement/internal/z;->R(Z)V
 
     :cond_a
-    :goto_8
+    :goto_3
     invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v0
@@ -1340,7 +1370,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
@@ -1357,7 +1387,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1376,7 +1406,7 @@
 
     if-eqz v3, :cond_e
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->An()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Am()Z
 
     move-result v3
 
@@ -1401,7 +1431,7 @@
     :cond_d
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1428,7 +1458,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1442,7 +1472,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cv;->bnN:Lcom/google/android/gms/measurement/internal/n;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/n;->lE()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/n;->lD()V
 
     monitor-exit v0
 
@@ -1458,11 +1488,11 @@
     throw v1
 
     :cond_f
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->sB()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->sA()Z
 
     move-result v0
 
@@ -1531,7 +1561,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
@@ -1539,7 +1569,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     monitor-enter v1
 
@@ -1550,7 +1580,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1567,7 +1597,7 @@
     :cond_11
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -1601,7 +1631,7 @@
     throw v0
 
     :cond_12
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1614,8 +1644,6 @@
     :cond_13
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
@@ -1625,155 +1653,147 @@
     .end packed-switch
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/br;
+.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/k;
+.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/dg;
+.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/dg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1781,6 +1801,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -1789,18 +1817,18 @@
     return-void
 .end method
 
-.method protected final zv()V
+.method protected final zu()V
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v0
 
@@ -1813,18 +1841,18 @@
     return-void
 .end method
 
-.method protected final zx()V
+.method protected final zw()V
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->X(Z)Lcom/google/android/gms/measurement/internal/zzh;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ch;->W(Z)Lcom/google/android/gms/measurement/internal/zzh;
 
     move-result-object v0
 
@@ -1837,14 +1865,14 @@
     return-void
 .end method
 
-.method final zy()V
+.method final zx()V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1893,7 +1921,7 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
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 d76f127677..42c5e66503 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
@@ -46,7 +46,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cj;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -94,7 +94,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cj;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v2
 
@@ -102,7 +102,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cj;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
@@ -113,7 +113,7 @@
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cj;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tW()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
@@ -121,17 +121,16 @@
     :try_start_3
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cj;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    :goto_0
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    goto :goto_1
+    goto :goto_0
 
     :catchall_0
     move-exception v1
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception v1
@@ -139,7 +138,7 @@
     :try_start_4
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cj;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -154,14 +153,14 @@
     :try_start_5
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cj;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    goto :goto_0
+    invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
-    :goto_1
+    :goto_0
     monitor-exit v0
 
     return-void
 
-    :goto_2
+    :goto_1
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cj;->bnH: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/ck.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ck.smali
index 5a619a3893..818de30a8b 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
@@ -37,7 +37,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ck;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -65,7 +65,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ck;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tW()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -76,7 +76,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ck;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 a185db716f..6d1beb4251 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
@@ -37,7 +37,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cl;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -71,10 +71,9 @@
 
     move-result-object v6
 
-    :goto_0
     invoke-interface/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/f;->a(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cl;->bny:Lcom/google/android/gms/measurement/internal/cd;
@@ -99,12 +98,12 @@
 
     move-result-object v6
 
-    goto :goto_0
+    invoke-interface/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/f;->a(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cl;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tW()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -115,7 +114,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cl;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 be60158a8d..888ea23a38 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
@@ -24,7 +24,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cm;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     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 3cbadc1d94..bf7d3dad1a 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
@@ -37,7 +37,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cn;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -57,7 +57,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cn;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tW()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -68,7 +68,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cn;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 3c74c8b613..b5e9adc7fc 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
@@ -55,7 +55,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/co;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -117,11 +117,11 @@
 
     iget-object v3, p0, Lcom/google/android/gms/measurement/internal/co;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/o;->zc()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/o;->zb()Ljava/lang/String;
 
     move-result-object v3
 
@@ -136,7 +136,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/co;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -149,7 +149,7 @@
     :goto_1
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/co;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tW()V
 
     return-void
 .end method
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 62399dbdd9..607b8d54c8 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
@@ -18,107 +18,93 @@
 
 
 # virtual methods
-.method public kz()V
+.method public ky()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     return-void
 .end method
 
-.method public yA()V
+.method public yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yA()V
-
-    return-void
-.end method
-
-.method public yB()Lcom/google/android/gms/measurement/internal/a;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yC()Lcom/google/android/gms/measurement/internal/br;
+.method public yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yD()Lcom/google/android/gms/measurement/internal/i;
+.method public yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yG()Lcom/google/android/gms/measurement/internal/k;
+.method public yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public yH()Lcom/google/android/gms/measurement/internal/dg;
+.method public yG()Lcom/google/android/gms/measurement/internal/dg;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
@@ -132,10 +118,24 @@
     return-object v0
 .end method
 
-.method public yz()V
+.method public yy()V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ar;->yz()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ar;->yy()V
+
+    return-void
+.end method
+
+.method public yz()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cp;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yz()V
 
     return-void
 .end method
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 c8c4ad4e35..6da12a3794 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
@@ -55,7 +55,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cq;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cq;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -139,7 +139,7 @@
     :goto_1
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cq;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tW()V
 
     return-void
 .end method
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 fa12bebc79..5d2450e089 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
@@ -58,7 +58,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cr;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -122,10 +122,9 @@
 
     move-result-object v1
 
-    :goto_0
     invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cr;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
@@ -140,12 +139,12 @@
 
     move-result-object v1
 
-    goto :goto_0
+    invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cr;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tW()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
@@ -153,17 +152,16 @@
     :try_start_3
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cr;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    :goto_2
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    goto :goto_3
+    goto :goto_1
 
     :catchall_0
     move-exception v1
 
-    goto :goto_4
+    goto :goto_2
 
     :catch_0
     move-exception v1
@@ -171,7 +169,7 @@
     :try_start_4
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cr;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -202,14 +200,14 @@
     :try_start_5
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cr;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    goto :goto_2
+    invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
-    :goto_3
+    :goto_1
     monitor-exit v0
 
     return-void
 
-    :goto_4
+    :goto_2
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cr;->bnH: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/cs.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cs.smali
index 3f1801c48f..634671360f 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
@@ -62,7 +62,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cs;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -128,10 +128,9 @@
 
     move-result-object v1
 
-    :goto_0
     invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cs;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
@@ -148,12 +147,12 @@
 
     move-result-object v1
 
-    goto :goto_0
+    invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cs;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tW()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
@@ -161,17 +160,16 @@
     :try_start_3
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cs;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    :goto_2
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    goto :goto_3
+    goto :goto_1
 
     :catchall_0
     move-exception v1
 
-    goto :goto_4
+    goto :goto_2
 
     :catch_0
     move-exception v1
@@ -179,7 +177,7 @@
     :try_start_4
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cs;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -210,14 +208,14 @@
     :try_start_5
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cs;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    goto :goto_2
+    invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
-    :goto_3
+    :goto_1
     monitor-exit v0
 
     return-void
 
-    :goto_4
+    :goto_2
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cs;->bnH: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/ct.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ct.smali
index d74e7d498d..c9a40e146a 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
@@ -45,7 +45,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ct;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -78,7 +78,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ct;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->tW()V
 
     return-void
 .end method
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 aae859708e..c5406e435e 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
@@ -50,7 +50,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cu;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -90,7 +90,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cu;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tX()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ch;->tW()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
@@ -98,17 +98,16 @@
     :try_start_3
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cu;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    :goto_0
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    goto :goto_1
+    goto :goto_0
 
     :catchall_0
     move-exception v1
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception v1
@@ -116,7 +115,7 @@
     :try_start_4
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cu;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -131,14 +130,14 @@
     :try_start_5
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cu;->bnH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    goto :goto_0
+    invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
-    :goto_1
+    :goto_0
     monitor-exit v0
 
     return-void
 
-    :goto_2
+    :goto_1
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cu;->bnH: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/cv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cv.smali
index 4d294ce417..6efad413fa 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
@@ -101,7 +101,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p1
 
@@ -124,7 +124,7 @@
     throw p1
 .end method
 
-.method public final kX()V
+.method public final kW()V
     .locals 4
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
@@ -140,13 +140,13 @@
     :try_start_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cv;->bnN:Lcom/google/android/gms/measurement/internal/n;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/n;->lH()Landroid/os/IInterface;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/n;->lG()Landroid/os/IInterface;
 
     move-result-object v1
 
     check-cast v1, Lcom/google/android/gms/measurement/internal/f;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->An()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Am()Z
 
     move-result v2
 
@@ -157,7 +157,7 @@
     :cond_0
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
@@ -199,7 +199,7 @@
     throw v0
 .end method
 
-.method public final kY()V
+.method public final kX()V
     .locals 2
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
@@ -210,7 +210,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -222,7 +222,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -255,7 +255,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -274,7 +274,7 @@
     :catchall_0
     move-exception p1
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_0
     const/4 v0, 0x0
@@ -294,7 +294,7 @@
 
     if-nez p2, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string v1, "com.google.android.gms.measurement.internal.IMeasurementService"
@@ -309,22 +309,21 @@
 
     check-cast v1, Lcom/google/android/gms/measurement/internal/f;
 
-    :goto_0
     move-object v0, v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     new-instance v1, Lcom/google/android/gms/measurement/internal/h;
 
     invoke-direct {v1, p2}, Lcom/google/android/gms/measurement/internal/h;-><init>(Landroid/os/IBinder;)V
 
-    goto :goto_0
+    move-object v0, v1
 
-    :goto_1
+    :goto_0
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -334,12 +333,12 @@
 
     invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -352,13 +351,13 @@
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     :try_start_2
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -368,7 +367,7 @@
 
     invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    :goto_2
+    :goto_1
     if-nez v0, :cond_4
 
     iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/cv;->bnM:Z
@@ -376,7 +375,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
@@ -393,13 +392,13 @@
     .catch Ljava/lang/IllegalArgumentException; {:try_start_3 .. :try_end_3} :catch_1
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     :try_start_4
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p1
 
@@ -410,12 +409,12 @@
     invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/am;->h(Ljava/lang/Runnable;)V
 
     :catch_1
-    :goto_3
+    :goto_2
     monitor-exit p0
 
     return-void
 
-    :goto_4
+    :goto_3
     monitor-exit p0
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
@@ -434,7 +433,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -446,7 +445,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     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 fd9580911f..5d028e7662 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
@@ -52,7 +52,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 ae3f995d8b..5486f266b2 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
@@ -52,7 +52,7 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 a1d13f098a..4897168d09 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/da.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/da.smali
@@ -37,7 +37,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/cv;->bnG:Lcom/google/android/gms/measurement/internal/ch;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->zy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ch;->zx()V
 
     return-void
 .end method
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 edf5d03b4b..7731907056 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
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v1
 
@@ -80,7 +80,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -106,7 +106,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -143,7 +143,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -165,7 +165,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -182,7 +182,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/db;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -195,7 +195,7 @@
     return v0
 .end method
 
-.method public final yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/db;->aXb:Landroid/content/Context;
@@ -206,7 +206,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     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 d39dfa1597..f7c951cbdc 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
@@ -65,7 +65,7 @@
 
     invoke-virtual {v2, v4, v1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/db;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/db;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 abf3436c33..2926c0358d 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
@@ -31,13 +31,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/de;->bnV:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zL()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/de;->bnV:Lcom/google/android/gms/measurement/internal/dr;
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/de;->aXi:Ljava/lang/Runnable;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/dr;->bom:Ljava/util/List;
 
@@ -56,7 +56,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/de;->bnV:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zH()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zG()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dg.smali
index 9fa09ce3fb..a745f46c6b 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
@@ -34,7 +34,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dg;->bnY:Lcom/google/android/gms/measurement/internal/eq;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p1
 
@@ -50,17 +50,17 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/dg;)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/dg;->Y(Z)Z
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/dg;->X(Z)Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p0
 
@@ -75,16 +75,16 @@
 
 
 # virtual methods
-.method public final Y(Z)Z
+.method public final X(Z)Z
     .locals 8
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -92,13 +92,13 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/z;->bln:Lcom/google/android/gms/measurement/internal/ab;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v3
 
@@ -120,7 +120,7 @@
 
     if-gez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -139,7 +139,7 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p1
 
@@ -147,7 +147,7 @@
 
     invoke-virtual {p1, v2, v3}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -169,11 +169,11 @@
 
     invoke-virtual {p1, v4, v2, v3}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ce;->zw()Lcom/google/android/gms/measurement/internal/cd;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ce;->zv()Lcom/google/android/gms/measurement/internal/cd;
 
     move-result-object v2
 
@@ -181,7 +181,7 @@
 
     invoke-static {v2, p1, v3}, Lcom/google/android/gms/measurement/internal/ce;->a(Lcom/google/android/gms/measurement/internal/cd;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v2
 
@@ -203,7 +203,7 @@
 
     const-wide/32 v4, 0x36ee80
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
@@ -229,9 +229,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dg;->zz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dg;->zy()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dg;->bnX:Lcom/google/android/gms/measurement/internal/eq;
 
@@ -241,7 +241,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eq;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -253,7 +253,7 @@
 
     sub-long v0, p1, v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
@@ -269,7 +269,7 @@
 
     if-lez v6, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -279,7 +279,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/aa;->set(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -288,7 +288,7 @@
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -309,7 +309,7 @@
 
     const-wide/32 v0, 0x36ee80
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p2
 
@@ -335,9 +335,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -345,7 +345,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -359,15 +359,15 @@
 
     invoke-virtual {v2, v3, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -381,7 +381,7 @@
 
     div-long v0, p1, v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v2
 
@@ -401,15 +401,14 @@
 
     move-object v3, v5
 
-    :goto_0
     move-wide v4, p1
 
     invoke-virtual/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/br;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -419,10 +418,12 @@
 
     const/4 v3, 0x0
 
-    goto :goto_0
+    move-wide v4, p1
 
-    :goto_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/br;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
+
+    :goto_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -436,15 +437,15 @@
 
     invoke-direct {v5}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -461,7 +462,7 @@
     invoke-virtual {v5, v2, v0, v1}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cp;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
@@ -473,7 +474,7 @@
 
     invoke-virtual/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/br;->a(Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -494,173 +495,165 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/br;
+.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/k;
+.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/dg;
+.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/dg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -668,6 +661,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -676,7 +677,7 @@
     return-void
 .end method
 
-.method final zz()V
+.method final zy()V
     .locals 2
 
     monitor-enter p0
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 8eaf43ead7..1c6e1790d0 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
@@ -26,9 +26,9 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->bnZ:Lcom/google/android/gms/measurement/internal/dg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
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 96d937d1d3..f52e730dbb 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
@@ -33,11 +33,11 @@
 
     iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/dj;->bni:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dg;->zz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dg;->zy()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -53,15 +53,15 @@
 
     iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/dg;->bnW:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cp;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -71,7 +71,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -92,7 +92,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eq;->cancel()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -100,7 +100,7 @@
 
     move-result-wide v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v3
 
@@ -112,7 +112,7 @@
 
     sub-long/2addr v1, v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v3
 
@@ -128,7 +128,7 @@
 
     if-lez v7, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -138,7 +138,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/aa;->set(Z)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -147,7 +147,7 @@
     invoke-virtual {v1, v5, v6}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -161,7 +161,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dg;->bnX:Lcom/google/android/gms/measurement/internal/eq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
@@ -171,7 +171,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -196,7 +196,7 @@
 
     const-wide/32 v2, 0x36ee80
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     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 0109de1b97..b4dd3712c1 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
@@ -33,9 +33,9 @@
 
     iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/dk;->bni:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dg;->zz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dg;->zy()V
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/dg;->bnX:Lcom/google/android/gms/measurement/internal/eq;
 
@@ -45,7 +45,7 @@
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/eq;->cancel()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -67,13 +67,13 @@
 
     if-eqz v7, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v3
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/z;->blo:Lcom/google/android/gms/measurement/internal/ab;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v4
 
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 18ee160d2c..561b50aa3c 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
@@ -102,7 +102,7 @@
     return v0
 .end method
 
-.method private final uJ()Landroid/app/PendingIntent;
+.method private final uI()Landroid/app/PendingIntent;
     .locals 3
 
     new-instance v0, Landroid/content/Intent;
@@ -136,7 +136,7 @@
     return-object v0
 .end method
 
-.method private final zA()V
+.method private final zz()V
     .locals 4
     .annotation build Landroid/annotation/TargetApi;
         value = 0x18
@@ -154,7 +154,7 @@
 
     check-cast v0, Landroid/app/job/JobScheduler;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -186,7 +186,7 @@
 .method public final aj(J)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->getContext()Landroid/content/Context;
 
@@ -198,7 +198,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -219,7 +219,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -232,7 +232,7 @@
     :cond_1
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dm;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -266,13 +266,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dm;->boa:Lcom/google/android/gms/measurement/internal/eq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eq;->uG()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eq;->uF()Z
 
     move-result v0
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -293,7 +293,7 @@
 
     if-lt v0, v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -357,7 +357,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -380,7 +380,7 @@
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -410,7 +410,7 @@
 
     move-result-wide v6
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->uJ()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->uI()Landroid/app/PendingIntent;
 
     move-result-object v8
 
@@ -422,11 +422,11 @@
 .method public final cancel()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dm;->aVB:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->uJ()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->uI()Landroid/app/PendingIntent;
 
     move-result-object v1
 
@@ -442,7 +442,7 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->zA()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->zz()V
 
     :cond_0
     return-void
@@ -458,108 +458,100 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dm;->aVB:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->uJ()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->uI()Landroid/app/PendingIntent;
 
     move-result-object v1
 
@@ -571,7 +563,7 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->zA()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dm;->zz()V
 
     :cond_0
     const/4 v0, 0x0
@@ -579,6 +571,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -587,30 +587,30 @@
     return-void
 .end method
 
-.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/dx;
+.method public final bridge synthetic zc()Lcom/google/android/gms/measurement/internal/dx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/ef;
+.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/ef;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/ef;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/ef;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic zf()Lcom/google/android/gms/measurement/internal/el;
+.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/el;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali
index 02f86d14f3..846feadc28 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali
@@ -32,7 +32,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->bob:Lcom/google/android/gms/measurement/internal/dm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -44,7 +44,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->bnV:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zH()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zG()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/do.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/do.smali
index 007d3fa994..be5f8ca754 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
@@ -26,36 +26,36 @@
 
 
 # virtual methods
-.method public zd()Lcom/google/android/gms/measurement/internal/dx;
+.method public zc()Lcom/google/android/gms/measurement/internal/dx;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public ze()Lcom/google/android/gms/measurement/internal/ef;
+.method public zd()Lcom/google/android/gms/measurement/internal/ef;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/ef;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/ef;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public zf()Lcom/google/android/gms/measurement/internal/el;
+.method public ze()Lcom/google/android/gms/measurement/internal/el;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
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 45905935c1..aab8b1fb94 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
@@ -42,7 +42,7 @@
     return v0
 .end method
 
-.method protected final tP()V
+.method protected final tO()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->isInitialized()Z
@@ -63,14 +63,14 @@
     throw v0
 .end method
 
-.method public final tQ()V
+.method public final tP()V
     .locals 3
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aQH:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->yT()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->yS()Z
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
@@ -96,5 +96,5 @@
     throw v0
 .end method
 
-.method protected abstract yT()Z
+.method protected abstract yS()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali
index ec3d08c7a9..7fd0f45c84 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali
@@ -42,7 +42,7 @@
     return v0
 .end method
 
-.method protected final tP()V
+.method protected final tO()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->isInitialized()Z
@@ -63,14 +63,14 @@
     throw v0
 .end method
 
-.method public final tQ()V
+.method public final tP()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dq;->aQH:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->yT()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->yS()Z
 
     move-result v0
 
@@ -78,7 +78,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dq;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zs()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zr()V
 
     const/4 v0, 0x1
 
@@ -97,27 +97,27 @@
     throw v0
 .end method
 
-.method protected abstract yT()Z
+.method protected abstract yS()Z
 .end method
 
-.method protected yU()V
+.method protected yT()V
     .locals 0
 
     return-void
 .end method
 
-.method public final zu()V
+.method public final zt()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dq;->aQH:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->yU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->yT()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dq;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zs()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->zr()V
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr$a.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr$a.smali
index fa5133c279..2102023a40 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr$a.smali
@@ -159,7 +159,7 @@
     :cond_2
     iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/dr$a;->boB:J
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result 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 cd4fe68702..a7db68e7cb 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
@@ -127,7 +127,7 @@
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dr;)V
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dp;->tQ()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->boj:Lcom/google/android/gms/measurement/internal/dx;
 
@@ -135,7 +135,7 @@
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/measurement/internal/s;-><init>(Lcom/google/android/gms/measurement/internal/dr;)V
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dp;->tQ()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->boe:Lcom/google/android/gms/measurement/internal/s;
 
@@ -143,13 +143,13 @@
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/measurement/internal/al;-><init>(Lcom/google/android/gms/measurement/internal/dr;)V
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dp;->tQ()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bod:Lcom/google/android/gms/measurement/internal/al;
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p2
 
@@ -195,7 +195,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -211,18 +211,16 @@
     :try_start_0
     invoke-virtual {v5, v2}, Landroid/content/pm/PackageManager;->getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v1
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object v1, v5
-
     goto :goto_0
 
     :catch_0
     iget-object v5, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -237,30 +235,33 @@
     invoke-virtual {v5, v7, v8}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_0
-    if-nez v1, :cond_2
+    if-nez v1, :cond_1
 
     const-string v1, "manual_install"
 
-    :cond_1
-    :goto_1
     move-object v7, v1
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_2
+    :cond_1
     const-string v5, "com.android.vending"
 
     invoke-virtual {v5, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v5
 
-    if-eqz v5, :cond_1
+    if-eqz v5, :cond_2
 
     const-string v1, ""
 
+    move-object v7, v1
+
     goto :goto_1
 
-    :goto_2
+    :cond_2
+    move-object v7, v1
+
+    :goto_1
     :try_start_1
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/c/c;->aa(Landroid/content/Context;)Lcom/google/android/gms/common/c/b;
 
@@ -290,9 +291,7 @@
 
     invoke-interface {v3}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
-    move-result-object v3
-
-    move-object v4, v3
+    move-result-object v4
 
     :cond_3
     iget-object v3, v1, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
@@ -305,7 +304,7 @@
 
     move v3, v1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     const/high16 v1, -0x80000000
@@ -314,7 +313,7 @@
 
     const/high16 v3, -0x80000000
 
-    :goto_3
+    :goto_2
     const-wide/16 v5, 0x0
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
@@ -331,12 +330,12 @@
 
     move-wide/from16 v18, p7
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     move-wide/from16 v18, v5
 
-    :goto_4
+    :goto_3
     new-instance v25, Lcom/google/android/gms/measurement/internal/zzh;
 
     move-object/from16 v1, v25
@@ -347,7 +346,7 @@
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v3
 
@@ -388,7 +387,7 @@
     :catch_1
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -472,17 +471,17 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/el;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/el;-><init>(Lcom/google/android/gms/measurement/internal/dr;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bof:Lcom/google/android/gms/measurement/internal/el;
 
@@ -498,7 +497,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/ef;-><init>(Lcom/google/android/gms/measurement/internal/dr;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boi:Lcom/google/android/gms/measurement/internal/ef;
 
@@ -506,7 +505,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/dm;-><init>(Lcom/google/android/gms/measurement/internal/dr;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boh:Lcom/google/android/gms/measurement/internal/dm;
 
@@ -524,7 +523,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -559,7 +558,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->getGmpAppId()Ljava/lang/String;
 
@@ -571,13 +570,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ao()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->An()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v0
 
@@ -588,7 +587,7 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -621,13 +620,13 @@
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ao()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->An()Z
 
     move-result v2
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v1
 
@@ -723,7 +722,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -731,17 +730,17 @@
 
     const-string v2, "Fetching remote configuration"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -751,11 +750,11 @@
 
     const/4 v2, 0x0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v3
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v5
 
@@ -791,11 +790,11 @@
 
     iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bop:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v3
 
@@ -803,15 +802,15 @@
 
     invoke-direct {v7, p0}, Lcom/google/android/gms/measurement/internal/du;-><init>(Lcom/google/android/gms/measurement/internal/dr;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-static {v4}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-static {v7}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v8
 
@@ -832,7 +831,7 @@
     :catch_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -840,7 +839,7 @@
 
     const-string v2, "Failed to parse config URL. Not fetching. appId"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object p1
 
@@ -858,7 +857,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     const/4 v0, 0x0
 
@@ -906,7 +905,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -934,7 +933,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -950,7 +949,7 @@
     :goto_0
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1052,7 +1051,7 @@
     :cond_1
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1128,20 +1127,17 @@
 
     move-result-object v0
 
-    :goto_1
-    move-object v5, v0
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance v0, Ljava/lang/String;
 
     invoke-direct {v0, v5}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    goto :goto_1
+    :goto_1
+    move-object v5, v0
 
-    :goto_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -1157,7 +1153,7 @@
 
     if-nez v6, :cond_4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dz;->value:Ljava/lang/Object;
@@ -1174,7 +1170,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v2
 
@@ -1200,11 +1196,11 @@
 
     invoke-direct/range {v2 .. v8}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
-    :goto_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_2
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v6
 
@@ -1222,9 +1218,9 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     :try_start_0
     invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -1253,12 +1249,12 @@
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_0
     move-exception v0
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -1272,14 +1268,14 @@
 
     invoke-virtual {v6, v7, v8, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_4
+    :goto_3
     new-instance v0, Lcom/google/android/gms/measurement/internal/dz;
 
     iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzad;->bix:Ljava/lang/String;
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v2
 
@@ -1303,8 +1299,8 @@
 
     invoke-direct/range {v2 .. v8}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    :goto_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_4
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -1316,7 +1312,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -1330,7 +1326,7 @@
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v5
 
@@ -1346,7 +1342,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -1365,7 +1361,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/ef;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/ef;
 
     move-result-object v0
 
@@ -1539,13 +1535,13 @@
 .end method
 
 .method private final aC(J)Z
-    .locals 63
+    .locals 43
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -1558,7 +1554,7 @@
 
     invoke-direct {v2, v1, v3}, Lcom/google/android/gms/measurement/internal/dr$a;-><init>(Lcom/google/android/gms/measurement/internal/dr;B)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
@@ -1566,9 +1562,9 @@
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_8
 
@@ -1621,11 +1617,11 @@
     :catchall_0
     move-exception v0
 
-    move-object v5, v1
+    move-object v4, v1
 
     move-object v8, v11
 
-    goto/16 :goto_a
+    goto/16 :goto_7
 
     :catch_0
     move-exception v0
@@ -1634,7 +1630,7 @@
 
     move-object v8, v11
 
-    goto/16 :goto_c
+    goto/16 :goto_9
 
     :cond_0
     :try_start_3
@@ -1714,13 +1710,12 @@
 
     if-eqz v11, :cond_c
 
-    :goto_2
     :try_start_7
     invoke-interface {v11}, Landroid/database/Cursor;->close()V
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_8
 
-    goto/16 :goto_d
+    goto/16 :goto_a
 
     :cond_2
     :try_start_8
@@ -1741,13 +1736,13 @@
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_9 .. :try_end_9} :catch_1
     .catchall {:try_start_9 .. :try_end_9} :catchall_0
 
-    move-object/from16 v22, v11
+    move-object/from16 v23, v11
 
     move-object v11, v7
 
     move-object v7, v13
 
-    goto :goto_5
+    goto :goto_4
 
     :catch_1
     move-exception v0
@@ -1758,7 +1753,7 @@
 
     move-object v11, v7
 
-    goto/16 :goto_c
+    goto/16 :goto_9
 
     :cond_3
     cmp-long v7, v5, v8
@@ -1778,7 +1773,7 @@
 
     aput-object v11, v7, v12
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     new-array v7, v12, [Ljava/lang/String;
@@ -1787,19 +1782,19 @@
 
     aput-object v11, v7, v3
 
-    :goto_3
+    :goto_2
     cmp-long v11, v5, v8
 
     if-eqz v11, :cond_5
 
     const-string v11, " and rowid <= ?"
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     const-string v11, ""
 
-    :goto_4
+    :goto_3
     invoke-static {v11}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v13
@@ -1839,31 +1834,40 @@
     invoke-interface {v11}, Landroid/database/Cursor;->moveToFirst()Z
 
     move-result v7
+    :try_end_b
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_b .. :try_end_b} :catch_7
+    .catchall {:try_start_b .. :try_end_b} :catchall_0
 
     if-nez v7, :cond_6
 
     if-eqz v11, :cond_c
 
-    goto :goto_2
+    :try_start_c
+    invoke-interface {v11}, Landroid/database/Cursor;->close()V
+    :try_end_c
+    .catchall {:try_start_c .. :try_end_c} :catchall_8
+
+    goto/16 :goto_a
 
     :cond_6
+    :try_start_d
     invoke-interface {v11, v3}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v13
 
     invoke-interface {v11}, Landroid/database/Cursor;->close()V
-    :try_end_b
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_b .. :try_end_b} :catch_7
-    .catchall {:try_start_b .. :try_end_b} :catchall_0
+    :try_end_d
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_d .. :try_end_d} :catch_7
+    .catchall {:try_start_d .. :try_end_d} :catchall_0
 
-    move-object/from16 v22, v11
+    move-object/from16 v23, v11
 
     move-object v7, v13
 
     const/4 v11, 0x0
 
-    :goto_5
-    :try_start_c
+    :goto_4
+    :try_start_e
     const-string v14, "raw_events_metadata"
 
     new-array v13, v12, [Ljava/lang/String;
@@ -1892,7 +1896,7 @@
 
     move-object v13, v15
 
-    move-object/from16 v23, v15
+    move-object/from16 v24, v15
 
     move-object v15, v9
 
@@ -1901,18 +1905,18 @@
     invoke-virtual/range {v13 .. v21}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
     move-result-object v8
-    :try_end_c
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_c .. :try_end_c} :catch_6
-    .catchall {:try_start_c .. :try_end_c} :catchall_2
+    :try_end_e
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_e .. :try_end_e} :catch_6
+    .catchall {:try_start_e .. :try_end_e} :catchall_2
 
-    :try_start_d
+    :try_start_f
     invoke-interface {v8}, Landroid/database/Cursor;->moveToFirst()Z
 
     move-result v9
 
     if-nez v9, :cond_7
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -1925,22 +1929,21 @@
     move-result-object v7
 
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_d
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_d .. :try_end_d} :catch_5
-    .catchall {:try_start_d .. :try_end_d} :catchall_6
+    :try_end_f
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_f .. :try_end_f} :catch_5
+    .catchall {:try_start_f .. :try_end_f} :catchall_6
 
     if-eqz v8, :cond_c
 
-    :goto_6
-    :try_start_e
+    :try_start_10
     invoke-interface {v8}, Landroid/database/Cursor;->close()V
-    :try_end_e
-    .catchall {:try_start_e .. :try_end_e} :catchall_8
+    :try_end_10
+    .catchall {:try_start_10 .. :try_end_10} :catchall_8
 
-    goto/16 :goto_d
+    goto/16 :goto_a
 
     :cond_7
-    :try_start_f
+    :try_start_11
     invoke-interface {v8, v3}, Landroid/database/Cursor;->getBlob(I)[B
 
     move-result-object v9
@@ -1954,25 +1957,25 @@
     new-instance v13, Lcom/google/android/gms/internal/measurement/ct;
 
     invoke-direct {v13}, Lcom/google/android/gms/internal/measurement/ct;-><init>()V
-    :try_end_f
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_f .. :try_end_f} :catch_5
-    .catchall {:try_start_f .. :try_end_f} :catchall_6
+    :try_end_11
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_11 .. :try_end_11} :catch_5
+    .catchall {:try_start_11 .. :try_end_11} :catchall_6
 
-    :try_start_10
+    :try_start_12
     invoke-virtual {v13, v9}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/je;)Lcom/google/android/gms/internal/measurement/jo;
-    :try_end_10
-    .catch Ljava/io/IOException; {:try_start_10 .. :try_end_10} :catch_4
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_10 .. :try_end_10} :catch_5
-    .catchall {:try_start_10 .. :try_end_10} :catchall_6
+    :try_end_12
+    .catch Ljava/io/IOException; {:try_start_12 .. :try_end_12} :catch_4
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_12 .. :try_end_12} :catch_5
+    .catchall {:try_start_12 .. :try_end_12} :catchall_6
 
-    :try_start_11
+    :try_start_13
     invoke-interface {v8}, Landroid/database/Cursor;->moveToNext()Z
 
     move-result v9
 
     if-eqz v9, :cond_8
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v9
 
@@ -2017,7 +2020,7 @@
 
     move-object/from16 v17, v14
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_9
     const-string v5, "app_id = ? and metadata_fingerprint = ?"
@@ -2032,7 +2035,7 @@
 
     move-object/from16 v17, v6
 
-    :goto_7
+    :goto_5
     const-string v14, "raw_events"
 
     const/4 v5, 0x4
@@ -2065,23 +2068,23 @@
 
     const/16 v21, 0x0
 
-    move-object/from16 v13, v23
+    move-object/from16 v13, v24
 
     invoke-virtual/range {v13 .. v21}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
     move-result-object v5
-    :try_end_11
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_11 .. :try_end_11} :catch_5
-    .catchall {:try_start_11 .. :try_end_11} :catchall_6
+    :try_end_13
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_13 .. :try_end_13} :catch_5
+    .catchall {:try_start_13 .. :try_end_13} :catchall_6
 
-    :try_start_12
+    :try_start_14
     invoke-interface {v5}, Landroid/database/Cursor;->moveToFirst()Z
 
     move-result v6
 
     if-nez v6, :cond_a
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -2094,22 +2097,21 @@
     move-result-object v8
 
     invoke-virtual {v6, v7, v8}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_12
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_12 .. :try_end_12} :catch_3
-    .catchall {:try_start_12 .. :try_end_12} :catchall_1
+    :try_end_14
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_14 .. :try_end_14} :catch_3
+    .catchall {:try_start_14 .. :try_end_14} :catchall_1
 
     if-eqz v5, :cond_c
 
-    :goto_8
-    :try_start_13
+    :try_start_15
     invoke-interface {v5}, Landroid/database/Cursor;->close()V
-    :try_end_13
-    .catchall {:try_start_13 .. :try_end_13} :catchall_8
+    :try_end_15
+    .catchall {:try_start_15 .. :try_end_15} :catchall_8
 
-    goto/16 :goto_d
+    goto/16 :goto_a
 
     :cond_a
-    :try_start_14
+    :try_start_16
     invoke-interface {v5, v3}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v6
@@ -2129,18 +2131,18 @@
     new-instance v9, Lcom/google/android/gms/internal/measurement/cq;
 
     invoke-direct {v9}, Lcom/google/android/gms/internal/measurement/cq;-><init>()V
-    :try_end_14
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_14 .. :try_end_14} :catch_3
-    .catchall {:try_start_14 .. :try_end_14} :catchall_1
+    :try_end_16
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_16 .. :try_end_16} :catch_3
+    .catchall {:try_start_16 .. :try_end_16} :catchall_1
 
-    :try_start_15
+    :try_start_17
     invoke-virtual {v9, v8}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/je;)Lcom/google/android/gms/internal/measurement/jo;
-    :try_end_15
-    .catch Ljava/io/IOException; {:try_start_15 .. :try_end_15} :catch_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_15 .. :try_end_15} :catch_3
-    .catchall {:try_start_15 .. :try_end_15} :catchall_1
+    :try_end_17
+    .catch Ljava/io/IOException; {:try_start_17 .. :try_end_17} :catch_2
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_17 .. :try_end_17} :catch_3
+    .catchall {:try_start_17 .. :try_end_17} :catchall_1
 
-    :try_start_16
+    :try_start_18
     invoke-interface {v5, v12}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v8
@@ -2160,19 +2162,28 @@
     invoke-interface {v2, v6, v7, v9}, Lcom/google/android/gms/measurement/internal/en;->a(JLcom/google/android/gms/internal/measurement/cq;)Z
 
     move-result v6
+    :try_end_18
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_18 .. :try_end_18} :catch_3
+    .catchall {:try_start_18 .. :try_end_18} :catchall_1
 
     if-nez v6, :cond_b
 
     if-eqz v5, :cond_c
 
-    goto :goto_8
+    :try_start_19
+    invoke-interface {v5}, Landroid/database/Cursor;->close()V
+    :try_end_19
+    .catchall {:try_start_19 .. :try_end_19} :catchall_8
+
+    goto/16 :goto_a
 
     :catch_2
     move-exception v0
 
     move-object v6, v0
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    :try_start_1a
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -2190,37 +2201,44 @@
     invoke-interface {v5}, Landroid/database/Cursor;->moveToNext()Z
 
     move-result v6
-    :try_end_16
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_16 .. :try_end_16} :catch_3
-    .catchall {:try_start_16 .. :try_end_16} :catchall_1
+    :try_end_1a
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1a .. :try_end_1a} :catch_3
+    .catchall {:try_start_1a .. :try_end_1a} :catchall_1
 
     if-nez v6, :cond_a
 
     if-eqz v5, :cond_c
 
-    goto :goto_8
+    :try_start_1b
+    invoke-interface {v5}, Landroid/database/Cursor;->close()V
+    :try_end_1b
+    .catchall {:try_start_1b .. :try_end_1b} :catchall_8
+
+    goto :goto_a
 
     :catchall_1
     move-exception v0
 
+    move-object v4, v1
+
     move-object v8, v5
 
-    goto/16 :goto_45
+    goto :goto_7
 
     :catch_3
     move-exception v0
 
     move-object v8, v5
 
-    goto :goto_9
+    goto :goto_6
 
     :catch_4
     move-exception v0
 
     move-object v5, v0
 
-    :try_start_17
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    :try_start_1c
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -2233,39 +2251,44 @@
     move-result-object v9
 
     invoke-virtual {v6, v7, v9, v5}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
-    :try_end_17
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_17 .. :try_end_17} :catch_5
-    .catchall {:try_start_17 .. :try_end_17} :catchall_6
+    :try_end_1c
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1c .. :try_end_1c} :catch_5
+    .catchall {:try_start_1c .. :try_end_1c} :catchall_6
 
     if-eqz v8, :cond_c
 
-    goto/16 :goto_6
+    :try_start_1d
+    invoke-interface {v8}, Landroid/database/Cursor;->close()V
+    :try_end_1d
+    .catchall {:try_start_1d .. :try_end_1d} :catchall_8
+
+    goto :goto_a
 
     :catch_5
     move-exception v0
 
-    :goto_9
+    :goto_6
     move-object v5, v0
 
-    goto :goto_c
+    goto :goto_9
 
     :catchall_2
     move-exception v0
 
-    move-object v5, v1
+    move-object v4, v1
 
-    move-object/from16 v8, v22
+    move-object/from16 v8, v23
 
-    goto :goto_a
+    goto :goto_7
 
     :catch_6
     move-exception v0
 
     move-object v5, v0
 
-    move-object/from16 v8, v22
+    move-object/from16 v8, v23
 
-    goto :goto_c
+    goto :goto_9
 
     :catch_7
     move-exception v0
@@ -2274,19 +2297,19 @@
 
     move-object v8, v11
 
-    goto :goto_b
+    goto :goto_8
 
     :catchall_3
     move-exception v0
 
-    move-object v5, v1
+    move-object v4, v1
 
     const/4 v8, 0x0
 
-    :goto_a
+    :goto_7
     move-object v1, v0
 
-    goto/16 :goto_46
+    goto/16 :goto_40
 
     :catch_8
     move-exception v0
@@ -2295,12 +2318,12 @@
 
     const/4 v8, 0x0
 
-    :goto_b
+    :goto_8
     const/4 v11, 0x0
 
-    :goto_c
-    :try_start_18
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    :goto_9
+    :try_start_1e
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -2313,16 +2336,16 @@
     move-result-object v7
 
     invoke-virtual {v4, v6, v7, v5}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
-    :try_end_18
-    .catchall {:try_start_18 .. :try_end_18} :catchall_6
+    :try_end_1e
+    .catchall {:try_start_1e .. :try_end_1e} :catchall_6
 
     if-eqz v8, :cond_c
 
-    goto/16 :goto_6
+    :try_start_1f
+    invoke-interface {v8}, Landroid/database/Cursor;->close()V
 
     :cond_c
-    :goto_d
-    :try_start_19
+    :goto_a
     iget-object v4, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boA:Ljava/util/List;
 
     if-eqz v4, :cond_e
@@ -2335,19 +2358,19 @@
 
     if-eqz v4, :cond_d
 
-    goto :goto_e
+    goto :goto_b
 
     :cond_d
     const/4 v4, 0x0
 
-    goto :goto_f
+    goto :goto_c
 
     :cond_e
-    :goto_e
+    :goto_b
     const/4 v4, 0x1
 
-    :goto_f
-    if-nez v4, :cond_6f
+    :goto_c
+    if-nez v4, :cond_71
 
     iget-object v4, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
 
@@ -2379,7 +2402,7 @@
 
     const-wide/16 v13, 0x0
 
-    :goto_10
+    :goto_d
     iget-object v15, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boA:Ljava/util/List;
 
     invoke-interface {v15}, Ljava/util/List;->size()I
@@ -2398,7 +2421,7 @@
 
     check-cast v15, Lcom/google/android/gms/internal/measurement/cq;
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v10
 
@@ -2416,7 +2439,7 @@
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -2434,7 +2457,7 @@
 
     iget-object v12, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v12
 
@@ -2446,7 +2469,7 @@
 
     invoke-virtual {v6, v7, v10, v3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v3
 
@@ -2460,7 +2483,7 @@
 
     if-nez v3, :cond_10
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v3
 
@@ -2474,18 +2497,18 @@
 
     if-eqz v3, :cond_f
 
-    goto :goto_11
+    goto :goto_e
 
     :cond_f
     const/4 v3, 0x0
 
-    goto :goto_12
+    goto :goto_f
 
     :cond_10
-    :goto_11
+    :goto_e
     const/4 v3, 0x1
 
-    :goto_12
+    :goto_f
     if-nez v3, :cond_11
 
     const-string v3, "_err"
@@ -2500,7 +2523,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v3
 
@@ -2515,14 +2538,14 @@
     invoke-virtual {v3, v6, v7, v10, v12}, Lcom/google/android/gms/measurement/internal/ea;->b(ILjava/lang/String;Ljava/lang/String;I)V
 
     :cond_11
-    move/from16 v38, v8
+    move/from16 v23, v8
 
     const/4 v10, 0x3
 
-    goto/16 :goto_2a
+    goto/16 :goto_26
 
     :cond_12
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v3
 
@@ -2538,7 +2561,7 @@
 
     if-nez v3, :cond_18
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v7, v15, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
@@ -2560,7 +2583,7 @@
 
     if-eq v10, v12, :cond_13
 
-    goto :goto_13
+    goto :goto_10
 
     :cond_13
     const-string v10, "_ui"
@@ -2573,7 +2596,7 @@
 
     const/4 v7, 0x1
 
-    goto :goto_14
+    goto :goto_11
 
     :cond_14
     const-string v10, "_ug"
@@ -2586,7 +2609,7 @@
 
     const/4 v7, 0x2
 
-    goto :goto_14
+    goto :goto_11
 
     :cond_15
     const-string v10, "_in"
@@ -2599,34 +2622,36 @@
 
     const/4 v7, 0x0
 
-    goto :goto_14
+    goto :goto_11
 
     :cond_16
-    :goto_13
+    :goto_10
     const/4 v7, -0x1
 
-    :goto_14
+    :goto_11
     packed-switch v7, :pswitch_data_0
 
     const/4 v7, 0x0
 
-    goto :goto_15
+    goto :goto_12
 
     :pswitch_0
     const/4 v7, 0x1
 
-    :goto_15
+    :goto_12
     if-eqz v7, :cond_17
 
-    goto :goto_16
+    goto :goto_13
 
     :cond_17
-    move/from16 v38, v8
+    move/from16 v23, v8
 
-    goto/16 :goto_1f
+    move/from16 v16, v11
+
+    goto/16 :goto_1c
 
     :cond_18
-    :goto_16
+    :goto_13
     iget-object v7, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
     if-nez v7, :cond_19
@@ -2644,11 +2669,11 @@
 
     const/4 v12, 0x0
 
-    const/16 v18, 0x0
+    const/16 v21, 0x0
 
-    const/16 v19, 0x0
+    const/16 v23, 0x0
 
-    :goto_17
+    :goto_14
     if-ge v12, v10, :cond_1c
 
     aget-object v6, v7, v12
@@ -2673,9 +2698,9 @@
 
     iput-object v7, v6, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
-    const/16 v18, 0x1
+    const/16 v21, 0x1
 
-    goto :goto_18
+    goto :goto_15
 
     :cond_1a
     const-string v7, "_r"
@@ -2694,26 +2719,26 @@
 
     iput-object v7, v6, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
-    const/16 v19, 0x1
+    const/16 v23, 0x1
 
     :cond_1b
-    :goto_18
+    :goto_15
     add-int/lit8 v12, v12, 0x1
 
     move-object/from16 v7, v25
 
     move/from16 v10, v26
 
-    goto :goto_17
+    goto :goto_14
 
     :cond_1c
-    if-nez v18, :cond_1d
+    if-nez v21, :cond_1d
 
     if-eqz v3, :cond_1d
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -2723,7 +2748,7 @@
 
     iget-object v10, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v10
 
@@ -2776,11 +2801,11 @@
     iput-object v6, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
     :cond_1d
-    if-nez v19, :cond_1e
+    if-nez v23, :cond_1e
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -2790,7 +2815,7 @@
 
     iget-object v10, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v10
 
@@ -2843,11 +2868,11 @@
     iput-object v6, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
     :cond_1e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v25
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zG()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()J
 
     move-result-wide v26
 
@@ -2885,17 +2910,17 @@
 
     move-result v10
 
-    move/from16 v34, v9
+    move v12, v11
 
-    int-to-long v9, v10
+    int-to-long v10, v10
 
-    cmp-long v12, v6, v9
+    cmp-long v16, v6, v10
 
-    if-lez v12, :cond_23
+    if-lez v16, :cond_23
 
     const/4 v6, 0x0
 
-    :goto_19
+    :goto_16
     iget-object v7, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
     array-length v7, v7
@@ -2904,13 +2929,13 @@
 
     const-string v7, "_r"
 
-    iget-object v9, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
+    iget-object v10, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    aget-object v9, v9, v6
+    aget-object v10, v10, v6
 
-    iget-object v9, v9, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
-    invoke-virtual {v7, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -2920,55 +2945,66 @@
 
     array-length v7, v7
 
-    const/4 v9, 0x1
+    const/4 v10, 0x1
 
-    sub-int/2addr v7, v9
+    sub-int/2addr v7, v10
 
     new-array v7, v7, [Lcom/google/android/gms/internal/measurement/cr;
 
     if-lez v6, :cond_1f
 
-    iget-object v9, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
+    iget-object v10, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    const/4 v10, 0x0
+    const/4 v11, 0x0
 
-    invoke-static {v9, v10, v7, v10, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v10, v11, v7, v11, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_1f
-    array-length v9, v7
+    array-length v10, v7
 
-    if-ge v6, v9, :cond_20
+    if-ge v6, v10, :cond_20
 
-    iget-object v9, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
+    iget-object v10, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    add-int/lit8 v10, v6, 0x1
+    add-int/lit8 v11, v6, 0x1
+
+    move/from16 v21, v12
 
     array-length v12, v7
 
     sub-int/2addr v12, v6
 
-    invoke-static {v9, v10, v7, v6, v12}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v10, v11, v7, v6, v12}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    goto :goto_17
 
     :cond_20
+    move/from16 v21, v12
+
+    :goto_17
     iput-object v7, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    goto :goto_1a
+    goto :goto_18
 
     :cond_21
+    move/from16 v21, v12
+
     add-int/lit8 v6, v6, 0x1
 
+    goto :goto_16
+
+    :cond_22
+    move/from16 v21, v12
+
+    :goto_18
+    move/from16 v11, v21
+
     goto :goto_19
 
-    :cond_22
-    :goto_1a
-    move/from16 v9, v34
-
-    goto :goto_1b
-
     :cond_23
-    const/4 v9, 0x1
+    const/4 v11, 0x1
 
-    :goto_1b
+    :goto_19
     iget-object v6, v15, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
     invoke-static {v6}, Lcom/google/android/gms/measurement/internal/ea;->cM(Ljava/lang/String;)Z
@@ -2979,11 +3015,11 @@
 
     if-eqz v3, :cond_2a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v25
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zG()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()J
 
     move-result-wide v26
 
@@ -3017,23 +3053,23 @@
 
     iget-object v12, v12, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
 
-    move/from16 v35, v9
+    move/from16 v16, v11
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/e;->biZ:Lcom/google/android/gms/measurement/internal/e$a;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/e;->biZ:Lcom/google/android/gms/measurement/internal/e$a;
 
-    invoke-virtual {v10, v12, v9}, Lcom/google/android/gms/measurement/internal/ei;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/e$a;)I
+    invoke-virtual {v10, v12, v11}, Lcom/google/android/gms/measurement/internal/ei;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/e$a;)I
 
-    move-result v9
+    move-result v10
 
-    int-to-long v9, v9
+    int-to-long v10, v10
 
-    cmp-long v12, v6, v9
+    cmp-long v12, v6, v10
 
     if-lez v12, :cond_29
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -3041,38 +3077,38 @@
 
     const-string v7, "Too many conversions. Not logging as conversion. appId"
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
 
-    iget-object v9, v9, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
 
-    invoke-static {v9}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v10}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object v10
 
-    invoke-virtual {v6, v7, v9}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {v6, v7, v10}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     iget-object v6, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
     array-length v7, v6
 
-    const/4 v9, 0x0
-
     const/4 v10, 0x0
 
+    const/4 v11, 0x0
+
     const/4 v12, 0x0
 
-    :goto_1c
-    if-ge v9, v7, :cond_26
+    :goto_1a
+    if-ge v10, v7, :cond_26
 
-    move/from16 v36, v7
+    move/from16 v17, v7
 
-    aget-object v7, v6, v9
+    aget-object v7, v6, v10
 
-    move-object/from16 v37, v6
+    move-object/from16 v21, v6
 
     const-string v6, "_c"
 
-    move/from16 v38, v8
+    move/from16 v23, v8
 
     iget-object v8, v7, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
@@ -3084,7 +3120,7 @@
 
     move-object v12, v7
 
-    goto :goto_1d
+    goto :goto_1b
 
     :cond_24
     const-string v6, "_err"
@@ -3097,24 +3133,24 @@
 
     if-eqz v6, :cond_25
 
-    const/4 v10, 0x1
+    const/4 v11, 0x1
 
     :cond_25
-    :goto_1d
-    add-int/lit8 v9, v9, 0x1
+    :goto_1b
+    add-int/lit8 v10, v10, 0x1
 
-    move/from16 v7, v36
+    move/from16 v7, v17
 
-    move-object/from16 v6, v37
+    move-object/from16 v6, v21
 
-    move/from16 v8, v38
+    move/from16 v8, v23
 
-    goto :goto_1c
+    goto :goto_1a
 
     :cond_26
-    move/from16 v38, v8
+    move/from16 v23, v8
 
-    if-eqz v10, :cond_27
+    if-eqz v11, :cond_27
 
     if-eqz v12, :cond_27
 
@@ -3136,7 +3172,7 @@
 
     iput-object v6, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    goto :goto_1e
+    goto :goto_1c
 
     :cond_27
     if-eqz v12, :cond_28
@@ -3153,12 +3189,12 @@
 
     iput-object v6, v12, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
-    goto :goto_1e
+    goto :goto_1c
 
     :cond_28
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -3176,22 +3212,19 @@
 
     invoke-virtual {v6, v7, v8}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_1e
+    goto :goto_1c
 
     :cond_29
-    move/from16 v38, v8
+    move/from16 v23, v8
 
-    goto :goto_1e
+    goto :goto_1c
 
     :cond_2a
-    move/from16 v38, v8
+    move/from16 v23, v8
 
-    move/from16 v35, v9
+    move/from16 v16, v11
 
-    :goto_1e
-    move/from16 v9, v35
-
-    :goto_1f
+    :goto_1c
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
     iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
@@ -3218,18 +3251,18 @@
 
     const/4 v8, -0x1
 
-    :goto_20
+    :goto_1d
     array-length v10, v3
 
     if-ge v6, v10, :cond_2d
 
     const-string v10, "value"
 
-    aget-object v12, v3, v6
+    aget-object v11, v3, v6
 
-    iget-object v12, v12, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
+    iget-object v11, v11, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
-    invoke-virtual {v10, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -3237,16 +3270,16 @@
 
     move v7, v6
 
-    goto :goto_21
+    goto :goto_1e
 
     :cond_2b
     const-string v10, "currency"
 
-    aget-object v12, v3, v6
+    aget-object v11, v3, v6
 
-    iget-object v12, v12, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
+    iget-object v11, v11, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
-    invoke-virtual {v10, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -3255,31 +3288,31 @@
     move v8, v6
 
     :cond_2c
-    :goto_21
+    :goto_1e
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_20
+    goto :goto_1d
 
     :cond_2d
     const/4 v6, -0x1
 
-    if-eq v7, v6, :cond_2e
+    if-eq v7, v6, :cond_34
 
     aget-object v6, v3, v7
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
-    if-nez v6, :cond_2f
+    if-nez v6, :cond_2e
 
     aget-object v6, v3, v7
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
 
-    if-nez v6, :cond_2f
+    if-nez v6, :cond_2e
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -3307,28 +3340,27 @@
 
     move-result-object v3
 
-    :cond_2e
     const/4 v10, 0x3
 
-    goto :goto_25
+    goto :goto_22
 
-    :cond_2f
+    :cond_2e
     const/4 v6, -0x1
 
-    if-ne v8, v6, :cond_30
+    if-ne v8, v6, :cond_2f
 
     const/4 v6, 0x1
 
     const/4 v10, 0x3
 
-    goto :goto_24
+    goto :goto_21
 
-    :cond_30
+    :cond_2f
     aget-object v6, v3, v8
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
 
-    if-eqz v6, :cond_34
+    if-eqz v6, :cond_33
 
     invoke-virtual {v6}, Ljava/lang/String;->length()I
 
@@ -3336,58 +3368,60 @@
 
     const/4 v10, 0x3
 
-    if-eq v8, v10, :cond_31
+    if-eq v8, v10, :cond_30
 
-    goto :goto_23
+    goto :goto_20
 
-    :cond_31
+    :cond_30
     const/4 v8, 0x0
 
-    :goto_22
+    :goto_1f
     invoke-virtual {v6}, Ljava/lang/String;->length()I
 
-    move-result v12
+    move-result v11
 
-    if-ge v8, v12, :cond_33
+    if-ge v8, v11, :cond_32
 
     invoke-virtual {v6, v8}, Ljava/lang/String;->codePointAt(I)I
 
-    move-result v12
+    move-result v11
 
-    invoke-static {v12}, Ljava/lang/Character;->isLetter(I)Z
-
-    move-result v16
-
-    if-nez v16, :cond_32
-
-    goto :goto_23
-
-    :cond_32
-    invoke-static {v12}, Ljava/lang/Character;->charCount(I)I
+    invoke-static {v11}, Ljava/lang/Character;->isLetter(I)Z
 
     move-result v12
 
-    add-int/2addr v8, v12
+    if-nez v12, :cond_31
 
-    goto :goto_22
-
-    :cond_33
-    const/4 v6, 0x0
-
-    goto :goto_24
-
-    :cond_34
-    const/4 v10, 0x3
-
-    :goto_23
     const/4 v6, 0x1
 
-    :goto_24
+    goto :goto_21
+
+    :cond_31
+    invoke-static {v11}, Ljava/lang/Character;->charCount(I)I
+
+    move-result v11
+
+    add-int/2addr v8, v11
+
+    goto :goto_1f
+
+    :cond_32
+    const/4 v6, 0x0
+
+    goto :goto_21
+
+    :cond_33
+    const/4 v10, 0x3
+
+    :goto_20
+    const/4 v6, 0x1
+
+    :goto_21
     if-eqz v6, :cond_35
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -3415,16 +3449,21 @@
 
     move-result-object v3
 
+    goto :goto_22
+
+    :cond_34
+    const/4 v10, 0x3
+
     :cond_35
-    :goto_25
+    :goto_22
     iput-object v3, v15, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    goto :goto_26
+    goto :goto_23
 
     :cond_36
     const/4 v10, 0x3
 
-    :goto_26
+    :goto_23
     if-eqz v5, :cond_3a
 
     const-string v3, "_e"
@@ -3447,10 +3486,10 @@
 
     if-nez v3, :cond_37
 
-    goto :goto_28
+    goto :goto_24
 
     :cond_37
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "_et"
 
@@ -3464,7 +3503,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -3480,27 +3519,24 @@
 
     move-result-object v7
 
-    :goto_27
     invoke-virtual {v3, v6, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_29
+    goto :goto_25
 
     :cond_38
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v6
 
-    const/4 v3, 0x0
-
     add-long/2addr v13, v6
 
-    goto :goto_29
+    goto :goto_25
 
     :cond_39
-    :goto_28
+    :goto_24
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -3516,20 +3552,22 @@
 
     move-result-object v7
 
-    goto :goto_27
+    invoke-virtual {v3, v6, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_3a
-    :goto_29
+    :goto_25
     iget-object v3, v4, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    add-int/lit8 v6, v11, 0x1
+    add-int/lit8 v6, v9, 0x1
 
-    aput-object v15, v3, v11
+    aput-object v15, v3, v9
 
-    move v11, v6
+    move v9, v6
 
-    :goto_2a
-    add-int/lit8 v8, v38, 0x1
+    move/from16 v11, v16
+
+    :goto_26
+    add-int/lit8 v8, v23, 0x1
 
     const/4 v3, 0x0
 
@@ -3537,10 +3575,10 @@
 
     const/4 v12, 0x1
 
-    goto/16 :goto_10
+    goto/16 :goto_d
 
     :cond_3b
-    move/from16 v34, v9
+    move/from16 v21, v11
 
     iget-object v3, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boA:Ljava/util/List;
 
@@ -3548,11 +3586,11 @@
 
     move-result v3
 
-    if-ge v11, v3, :cond_3c
+    if-ge v9, v3, :cond_3c
 
     iget-object v3, v4, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    invoke-static {v3, v11}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v3, v9}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v3
 
@@ -3563,7 +3601,7 @@
     :cond_3c
     if-eqz v5, :cond_42
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v3
 
@@ -3581,7 +3619,7 @@
 
     if-nez v5, :cond_3d
 
-    goto :goto_2b
+    goto :goto_27
 
     :cond_3d
     new-instance v5, Lcom/google/android/gms/measurement/internal/dz;
@@ -3594,7 +3632,7 @@
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v6
 
@@ -3608,13 +3646,11 @@
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v18
+    move-result-wide v24
 
-    const/4 v3, 0x0
+    add-long v24, v24, v13
 
-    add-long v18, v18, v13
-
-    invoke-static/range {v18 .. v19}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {v24 .. v25}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v12
 
@@ -3624,10 +3660,10 @@
 
     move-object v3, v5
 
-    goto :goto_2c
+    goto :goto_28
 
     :cond_3e
-    :goto_2b
+    :goto_27
     new-instance v3, Lcom/google/android/gms/measurement/internal/dz;
 
     iget-object v5, v4, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
@@ -3638,7 +3674,7 @@
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v6
 
@@ -3656,7 +3692,7 @@
 
     invoke-direct/range {v24 .. v30}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    :goto_2c
+    :goto_28
     new-instance v5, Lcom/google/android/gms/internal/measurement/cw;
 
     invoke-direct {v5}, Lcom/google/android/gms/internal/measurement/cw;-><init>()V
@@ -3667,7 +3703,7 @@
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v6
 
@@ -3689,7 +3725,7 @@
 
     const/4 v6, 0x0
 
-    :goto_2d
+    :goto_29
     iget-object v7, v4, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
 
     array-length v7, v7
@@ -3716,17 +3752,17 @@
 
     const/4 v6, 0x1
 
-    goto :goto_2e
+    goto :goto_2a
 
     :cond_3f
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_2d
+    goto :goto_29
 
     :cond_40
     const/4 v6, 0x0
 
-    :goto_2e
+    :goto_2a
     if-nez v6, :cond_41
 
     iget-object v6, v4, Lcom/google/android/gms/internal/measurement/ct;->aYG:[Lcom/google/android/gms/internal/measurement/cw;
@@ -3761,14 +3797,19 @@
 
     aput-object v5, v6, v7
 
+    const-wide/16 v5, 0x0
+
+    goto :goto_2b
+
     :cond_41
     const-wide/16 v5, 0x0
 
+    :goto_2b
     cmp-long v7, v13, v5
 
     if-lez v7, :cond_42
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -3776,7 +3817,7 @@
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -3822,12 +3863,12 @@
     invoke-virtual {v6, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v3
-    :try_end_19
-    .catchall {:try_start_19 .. :try_end_19} :catchall_8
+    :try_end_1f
+    .catchall {:try_start_1f .. :try_end_1f} :catchall_8
 
-    if-eqz v3, :cond_5e
+    if-eqz v3, :cond_60
 
-    :try_start_1a
+    :try_start_20
     new-instance v3, Ljava/util/HashMap;
 
     invoke-direct {v3}, Ljava/util/HashMap;-><init>()V
@@ -3840,11 +3881,11 @@
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/security/SecureRandom;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ea;->zO()Ljava/security/SecureRandom;
 
     move-result-object v6
 
@@ -3856,8 +3897,8 @@
 
     const/4 v10, 0x0
 
-    :goto_2f
-    if-ge v9, v8, :cond_5c
+    :goto_2c
+    if-ge v9, v8, :cond_5e
 
     aget-object v11, v7, v9
 
@@ -3868,13 +3909,13 @@
     invoke-virtual {v12, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v12
-    :try_end_1a
-    .catchall {:try_start_1a .. :try_end_1a} :catchall_4
+    :try_end_20
+    .catchall {:try_start_20 .. :try_end_20} :catchall_4
 
     if-eqz v12, :cond_47
 
-    :try_start_1b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    :try_start_21
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v12, "_en"
 
@@ -3892,7 +3933,7 @@
 
     if-nez v13, :cond_43
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v13
 
@@ -3921,7 +3962,7 @@
 
     if-lez v12, :cond_44
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v12, v11, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
@@ -3948,7 +3989,7 @@
 
     if-eqz v12, :cond_45
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v12, v11, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
@@ -3968,43 +4009,43 @@
     add-int/lit8 v12, v10, 0x1
 
     aput-object v11, v5, v10
-    :try_end_1b
-    .catchall {:try_start_1b .. :try_end_1b} :catchall_8
+    :try_end_21
+    .catchall {:try_start_21 .. :try_end_21} :catchall_8
 
-    move-object/from16 v61, v2
+    move-object/from16 v24, v4
 
-    move-object/from16 v41, v4
+    move-object/from16 v28, v6
 
-    move-object/from16 v60, v6
+    move-object/from16 v22, v7
 
-    move-object/from16 v39, v7
+    move/from16 v23, v8
 
-    move/from16 v40, v8
-
-    move/from16 v42, v9
+    move/from16 v25, v9
 
     move v10, v12
 
-    goto/16 :goto_39
+    move-object v9, v2
+
+    goto/16 :goto_35
 
     :cond_46
-    move-object/from16 v61, v2
+    move-object/from16 v24, v4
 
-    move-object/from16 v41, v4
+    move-object/from16 v28, v6
 
-    move-object/from16 v60, v6
+    move-object/from16 v22, v7
 
-    move-object/from16 v39, v7
+    move/from16 v23, v8
 
-    move/from16 v40, v8
+    move/from16 v25, v9
 
-    move/from16 v42, v9
+    move-object v9, v2
 
-    goto/16 :goto_39
+    goto/16 :goto_35
 
     :cond_47
-    :try_start_1c
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    :try_start_22
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v12
 
@@ -4018,7 +4059,7 @@
 
     iget-object v14, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object v14, v11, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
@@ -4030,11 +4071,11 @@
 
     move-result-wide v14
 
-    move-object/from16 v39, v7
+    move-object/from16 v22, v7
 
     const-string v7, "_dbg"
 
-    move/from16 v40, v8
+    move/from16 v23, v8
 
     invoke-static/range {v16 .. v17}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4042,36 +4083,36 @@
 
     invoke-static {v7}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    move-result v18
-    :try_end_1c
-    .catchall {:try_start_1c .. :try_end_1c} :catchall_4
+    move-result v24
+    :try_end_22
+    .catchall {:try_start_22 .. :try_end_22} :catchall_4
 
-    if-nez v18, :cond_4b
+    if-nez v24, :cond_4d
 
     if-nez v8, :cond_48
 
-    goto :goto_31
+    goto :goto_2f
 
     :cond_48
-    move-object/from16 v41, v4
+    move-object/from16 v24, v4
 
-    :try_start_1d
+    :try_start_23
     iget-object v4, v11, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    move/from16 v42, v9
+    move/from16 v25, v9
 
     array-length v9, v4
 
-    move-wide/from16 v43, v12
+    move-wide/from16 v26, v12
 
     const/4 v12, 0x0
 
-    :goto_30
+    :goto_2d
     if-ge v12, v9, :cond_4c
 
     aget-object v13, v4, v12
 
-    move-object/from16 v45, v4
+    move-object/from16 v28, v4
 
     iget-object v4, v13, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
@@ -4079,11 +4120,11 @@
 
     move-result v4
 
-    if-eqz v4, :cond_4a
+    if-eqz v4, :cond_4b
 
     instance-of v4, v8, Ljava/lang/Long;
 
-    if-eqz v4, :cond_4c
+    if-eqz v4, :cond_4a
 
     iget-object v4, v13, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
@@ -4093,36 +4134,45 @@
 
     if-nez v4, :cond_49
 
-    goto :goto_32
+    goto :goto_2e
 
     :cond_49
     const/4 v4, 0x1
 
-    goto :goto_33
+    goto :goto_30
 
     :cond_4a
-    add-int/lit8 v12, v12, 0x1
-
-    move-object/from16 v4, v45
+    :goto_2e
+    const/4 v4, 0x0
 
     goto :goto_30
 
     :cond_4b
-    :goto_31
-    move-object/from16 v41, v4
+    add-int/lit8 v12, v12, 0x1
 
-    move/from16 v42, v9
+    move-object/from16 v4, v28
 
-    move-wide/from16 v43, v12
+    goto :goto_2d
 
     :cond_4c
-    :goto_32
     const/4 v4, 0x0
 
-    :goto_33
-    if-nez v4, :cond_4d
+    goto :goto_30
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    :cond_4d
+    :goto_2f
+    move-object/from16 v24, v4
+
+    move/from16 v25, v9
+
+    move-wide/from16 v26, v12
+
+    const/4 v4, 0x0
+
+    :goto_30
+    if-nez v4, :cond_4e
+
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v4
 
@@ -4136,17 +4186,17 @@
 
     move-result v12
 
-    goto :goto_34
+    goto :goto_31
 
-    :cond_4d
+    :cond_4e
     const/4 v12, 0x1
 
-    :goto_34
-    if-gtz v12, :cond_4e
+    :goto_31
+    if-gtz v12, :cond_4f
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -4165,19 +4215,19 @@
     add-int/lit8 v4, v10, 0x1
 
     aput-object v11, v5, v10
-    :try_end_1d
-    .catchall {:try_start_1d .. :try_end_1d} :catchall_8
+    :try_end_23
+    .catchall {:try_start_23 .. :try_end_23} :catchall_8
 
-    move-object/from16 v61, v2
+    move-object v9, v2
 
     move v10, v4
 
-    move-object/from16 v60, v6
+    move-object/from16 v28, v6
 
-    goto/16 :goto_39
+    goto/16 :goto_35
 
-    :cond_4e
-    :try_start_1e
+    :cond_4f
+    :try_start_24
     iget-object v4, v11, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
     invoke-interface {v3, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
@@ -4185,13 +4235,13 @@
     move-result-object v4
 
     check-cast v4, Lcom/google/android/gms/measurement/internal/eu;
-    :try_end_1e
-    .catchall {:try_start_1e .. :try_end_1e} :catchall_4
+    :try_end_24
+    .catchall {:try_start_24 .. :try_end_24} :catchall_4
 
-    if-nez v4, :cond_4f
+    if-nez v4, :cond_50
 
-    :try_start_1f
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :try_start_25
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
@@ -4205,11 +4255,11 @@
 
     move-result-object v4
 
-    if-nez v4, :cond_4f
+    if-nez v4, :cond_50
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -4233,39 +4283,39 @@
 
     iget-object v8, v11, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
-    const-wide/16 v48, 0x1
+    const-wide/16 v31, 0x1
 
-    const-wide/16 v50, 0x1
+    const-wide/16 v33, 0x1
 
     iget-object v9, v11, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
     invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v52
+    move-result-wide v35
 
-    const-wide/16 v54, 0x0
+    const-wide/16 v37, 0x0
 
-    const/16 v56, 0x0
+    const/16 v39, 0x0
 
-    const/16 v57, 0x0
+    const/16 v40, 0x0
 
-    const/16 v58, 0x0
+    const/16 v41, 0x0
 
-    const/16 v59, 0x0
+    const/16 v42, 0x0
 
-    move-object/from16 v45, v4
+    move-object/from16 v28, v4
 
-    move-object/from16 v46, v7
+    move-object/from16 v29, v7
 
-    move-object/from16 v47, v8
+    move-object/from16 v30, v8
 
-    invoke-direct/range {v45 .. v59}, Lcom/google/android/gms/measurement/internal/eu;-><init>(Ljava/lang/String;Ljava/lang/String;JJJJLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Boolean;)V
-    :try_end_1f
-    .catchall {:try_start_1f .. :try_end_1f} :catchall_8
+    invoke-direct/range {v28 .. v42}, Lcom/google/android/gms/measurement/internal/eu;-><init>(Ljava/lang/String;Ljava/lang/String;JJJJLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Boolean;)V
+    :try_end_25
+    .catchall {:try_start_25 .. :try_end_25} :catchall_8
 
-    :cond_4f
-    :try_start_20
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    :cond_50
+    :try_start_26
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "_eid"
 
@@ -4275,50 +4325,50 @@
 
     check-cast v7, Ljava/lang/Long;
 
-    if-eqz v7, :cond_50
+    if-eqz v7, :cond_51
 
     const/4 v8, 0x1
 
-    goto :goto_35
+    goto :goto_32
 
-    :cond_50
+    :cond_51
     const/4 v8, 0x0
 
-    :goto_35
+    :goto_32
     invoke-static {v8}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v8
-    :try_end_20
-    .catchall {:try_start_20 .. :try_end_20} :catchall_4
+    :try_end_26
+    .catchall {:try_start_26 .. :try_end_26} :catchall_4
 
     const/4 v9, 0x1
 
-    if-ne v12, v9, :cond_53
+    if-ne v12, v9, :cond_54
 
     add-int/lit8 v7, v10, 0x1
 
-    :try_start_21
+    :try_start_27
     aput-object v11, v5, v10
 
     invoke-virtual {v8}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v8
 
-    if-eqz v8, :cond_52
+    if-eqz v8, :cond_53
 
     iget-object v8, v4, Lcom/google/android/gms/measurement/internal/eu;->bpU:Ljava/lang/Long;
 
-    if-nez v8, :cond_51
+    if-nez v8, :cond_52
 
     iget-object v8, v4, Lcom/google/android/gms/measurement/internal/eu;->bpV:Ljava/lang/Long;
 
-    if-nez v8, :cond_51
+    if-nez v8, :cond_52
 
     iget-object v8, v4, Lcom/google/android/gms/measurement/internal/eu;->bpW:Ljava/lang/Boolean;
 
-    if-eqz v8, :cond_52
+    if-eqz v8, :cond_53
 
-    :cond_51
+    :cond_52
     const/4 v8, 0x0
 
     invoke-virtual {v4, v8, v8, v8}, Lcom/google/android/gms/measurement/internal/eu;->a(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Boolean;)Lcom/google/android/gms/measurement/internal/eu;
@@ -4328,30 +4378,30 @@
     iget-object v8, v11, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
     invoke-interface {v3, v8, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_21
-    .catchall {:try_start_21 .. :try_end_21} :catchall_8
+    :try_end_27
+    .catchall {:try_start_27 .. :try_end_27} :catchall_8
 
-    :cond_52
-    move-object/from16 v61, v2
+    :cond_53
+    move-object v9, v2
 
-    move-object/from16 v60, v6
+    move-object/from16 v28, v6
 
     move v10, v7
 
-    goto/16 :goto_39
+    goto/16 :goto_35
 
-    :cond_53
-    :try_start_22
+    :cond_54
+    :try_start_28
     invoke-virtual {v6, v12}, Ljava/security/SecureRandom;->nextInt(I)I
 
     move-result v9
-    :try_end_22
-    .catchall {:try_start_22 .. :try_end_22} :catchall_4
+    :try_end_28
+    .catchall {:try_start_28 .. :try_end_28} :catchall_4
 
-    if-nez v9, :cond_55
+    if-nez v9, :cond_56
 
-    :try_start_23
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    :try_start_29
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v7, v11, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
@@ -4359,7 +4409,7 @@
 
     int-to-long v12, v12
 
-    move-object/from16 v60, v6
+    move-object/from16 v28, v6
 
     invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4379,7 +4429,7 @@
 
     move-result v7
 
-    if-eqz v7, :cond_54
+    if-eqz v7, :cond_55
 
     invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4391,7 +4441,7 @@
 
     move-result-object v4
 
-    :cond_54
+    :cond_55
     iget-object v7, v11, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
     iget-object v8, v11, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
@@ -4405,19 +4455,19 @@
     move-result-object v4
 
     invoke-interface {v3, v7, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_23
-    .catchall {:try_start_23 .. :try_end_23} :catchall_8
+    :try_end_29
+    .catchall {:try_start_29 .. :try_end_29} :catchall_8
 
-    move-object/from16 v61, v2
+    move-object v9, v2
 
     move v10, v6
 
-    goto/16 :goto_39
+    goto/16 :goto_35
 
-    :cond_55
-    move-object/from16 v60, v6
+    :cond_56
+    move-object/from16 v28, v6
 
-    :try_start_24
+    :try_start_2a
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
     iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
@@ -4432,70 +4482,69 @@
 
     move-result v6
 
-    if-eqz v6, :cond_58
+    if-eqz v6, :cond_59
 
     iget-object v6, v4, Lcom/google/android/gms/measurement/internal/eu;->bpT:Ljava/lang/Long;
-    :try_end_24
-    .catchall {:try_start_24 .. :try_end_24} :catchall_4
+    :try_end_2a
+    .catchall {:try_start_2a .. :try_end_2a} :catchall_4
 
-    if-eqz v6, :cond_56
+    if-eqz v6, :cond_57
 
-    :try_start_25
+    :try_start_2b
     iget-object v6, v4, Lcom/google/android/gms/measurement/internal/eu;->bpT:Ljava/lang/Long;
 
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v18
-    :try_end_25
-    .catchall {:try_start_25 .. :try_end_25} :catchall_8
+    move-result-wide v26
+    :try_end_2b
+    .catchall {:try_start_2b .. :try_end_2b} :catchall_8
 
-    move-object/from16 v61, v2
+    move-object v9, v2
 
-    move-object/from16 v62, v7
+    move-object v13, v7
 
-    goto :goto_36
+    goto :goto_33
 
-    :cond_56
-    :try_start_26
+    :cond_57
+    :try_start_2c
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object v6, v11, Lcom/google/android/gms/internal/measurement/cq;->aYw:Ljava/lang/Long;
 
-    move-object/from16 v61, v2
+    move-object v9, v2
 
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v1
 
-    move-object/from16 v62, v7
+    move-object v13, v7
 
-    move-wide/from16 v6, v43
+    move-wide/from16 v6, v26
 
     invoke-static {v1, v2, v6, v7}, Lcom/google/android/gms/measurement/internal/ea;->d(JJ)J
 
-    move-result-wide v18
+    move-result-wide v26
 
-    :goto_36
-    cmp-long v1, v18, v14
+    :goto_33
+    cmp-long v1, v26, v14
 
-    if-eqz v1, :cond_57
+    if-eqz v1, :cond_58
 
-    :goto_37
     const/4 v1, 0x1
 
-    goto :goto_38
-
-    :cond_57
-    const/4 v1, 0x0
-
-    goto :goto_38
+    goto :goto_34
 
     :cond_58
-    move-object/from16 v61, v2
+    const/4 v1, 0x0
 
-    move-object/from16 v62, v7
+    goto :goto_34
+
+    :cond_59
+    move-object v9, v2
+
+    move-object v13, v7
 
     iget-wide v1, v4, Lcom/google/android/gms/measurement/internal/eu;->bpS:J
 
@@ -4505,8 +4554,6 @@
 
     move-result-wide v6
 
-    const/4 v9, 0x0
-
     sub-long/2addr v6, v1
 
     invoke-static {v6, v7}, Ljava/lang/Math;->abs(J)J
@@ -4515,16 +4562,21 @@
 
     const-wide/32 v6, 0x5265c00
 
-    cmp-long v9, v1, v6
+    cmp-long v26, v1, v6
 
-    if-ltz v9, :cond_57
+    if-ltz v26, :cond_5a
 
-    goto :goto_37
+    const/4 v1, 0x1
 
-    :goto_38
-    if-eqz v1, :cond_5a
+    goto :goto_34
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    :cond_5a
+    const/4 v1, 0x0
+
+    :goto_34
+    if-eqz v1, :cond_5c
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v1, v11, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
@@ -4540,7 +4592,7 @@
 
     iput-object v1, v11, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v1, v11, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
@@ -4550,9 +4602,9 @@
 
     invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v9
+    move-result-object v12
 
-    invoke-static {v1, v2, v9}, Lcom/google/android/gms/measurement/internal/dx;->a([Lcom/google/android/gms/internal/measurement/cr;Ljava/lang/String;Ljava/lang/Object;)[Lcom/google/android/gms/internal/measurement/cr;
+    invoke-static {v1, v2, v12}, Lcom/google/android/gms/measurement/internal/dx;->a([Lcom/google/android/gms/internal/measurement/cr;Ljava/lang/String;Ljava/lang/Object;)[Lcom/google/android/gms/internal/measurement/cr;
 
     move-result-object v1
 
@@ -4566,7 +4618,7 @@
 
     move-result v2
 
-    if-eqz v2, :cond_59
+    if-eqz v2, :cond_5b
 
     invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4580,7 +4632,7 @@
 
     move-result-object v4
 
-    :cond_59
+    :cond_5b
     iget-object v2, v11, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
     iget-object v6, v11, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
@@ -4597,18 +4649,18 @@
 
     move v10, v1
 
-    goto :goto_39
+    goto :goto_35
 
-    :cond_5a
+    :cond_5c
     invoke-virtual {v8}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v1
 
-    if-eqz v1, :cond_5b
+    if-eqz v1, :cond_5d
 
     iget-object v1, v11, Lcom/google/android/gms/internal/measurement/cq;->name:Ljava/lang/String;
 
-    move-object/from16 v7, v62
+    move-object v7, v13
 
     const/4 v2, 0x0
 
@@ -4618,26 +4670,28 @@
 
     invoke-interface {v3, v1, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_5b
-    :goto_39
-    add-int/lit8 v9, v42, 0x1
+    :cond_5d
+    :goto_35
+    add-int/lit8 v1, v25, 0x1
 
-    move-object/from16 v7, v39
+    move-object v2, v9
 
-    move/from16 v8, v40
+    move-object/from16 v7, v22
 
-    move-object/from16 v4, v41
+    move/from16 v8, v23
 
-    move-object/from16 v6, v60
+    move-object/from16 v4, v24
 
-    move-object/from16 v2, v61
+    move-object/from16 v6, v28
+
+    move v9, v1
 
     move-object/from16 v1, p0
 
-    goto/16 :goto_2f
+    goto/16 :goto_2c
 
-    :cond_5c
-    move-object/from16 v61, v2
+    :cond_5e
+    move-object v9, v2
 
     move-object v1, v4
 
@@ -4645,7 +4699,7 @@
 
     array-length v2, v2
 
-    if-ge v10, v2, :cond_5d
+    if-ge v10, v2, :cond_5f
 
     invoke-static {v5, v10}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
@@ -4655,7 +4709,7 @@
 
     iput-object v2, v1, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    :cond_5d
+    :cond_5f
     invoke-interface {v3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
     move-result-object v2
@@ -4664,12 +4718,12 @@
 
     move-result-object v2
 
-    :goto_3a
+    :goto_36
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
 
-    if-eqz v3, :cond_5f
+    if-eqz v3, :cond_61
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -4677,7 +4731,7 @@
 
     check-cast v3, Ljava/util/Map$Entry;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
@@ -4688,29 +4742,29 @@
     check-cast v3, Lcom/google/android/gms/measurement/internal/eu;
 
     invoke-virtual {v4, v3}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/eu;)V
-    :try_end_26
-    .catchall {:try_start_26 .. :try_end_26} :catchall_4
+    :try_end_2c
+    .catchall {:try_start_2c .. :try_end_2c} :catchall_4
 
-    goto :goto_3a
+    goto :goto_36
 
     :catchall_4
     move-exception v0
 
     move-object v1, v0
 
-    move-object/from16 v5, p0
+    move-object/from16 v4, p0
 
-    goto/16 :goto_49
+    goto/16 :goto_42
 
-    :cond_5e
-    move-object/from16 v61, v2
+    :cond_60
+    move-object v9, v2
 
     move-object v1, v4
 
-    :cond_5f
+    :cond_61
     const-wide v2, 0x7fffffffffffffffL
 
-    :try_start_27
+    :try_start_2d
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v2
@@ -4727,16 +4781,16 @@
 
     const/4 v2, 0x0
 
-    :goto_3b
+    :goto_37
     iget-object v3, v1, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
     array-length v3, v3
-    :try_end_27
-    .catchall {:try_start_27 .. :try_end_27} :catchall_5
+    :try_end_2d
+    .catchall {:try_start_2d .. :try_end_2d} :catchall_5
 
-    if-ge v2, v3, :cond_62
+    if-ge v2, v3, :cond_64
 
-    :try_start_28
+    :try_start_2e
     iget-object v3, v1, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
     aget-object v3, v3, v2
@@ -4755,13 +4809,13 @@
 
     cmp-long v8, v4, v6
 
-    if-gez v8, :cond_60
+    if-gez v8, :cond_62
 
     iget-object v4, v3, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
     iput-object v4, v1, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
 
-    :cond_60
+    :cond_62
     iget-object v4, v3, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
     invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
@@ -4776,301 +4830,300 @@
 
     cmp-long v8, v4, v6
 
-    if-lez v8, :cond_61
+    if-lez v8, :cond_63
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
     iput-object v3, v1, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
-    :try_end_28
-    .catchall {:try_start_28 .. :try_end_28} :catchall_4
+    :try_end_2e
+    .catchall {:try_start_2e .. :try_end_2e} :catchall_4
 
-    :cond_61
+    :cond_63
     add-int/lit8 v2, v2, 0x1
 
+    goto :goto_37
+
+    :cond_64
+    :try_start_2f
+    iget-object v2, v9, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
+
+    move-result-object v3
+
+    invoke-virtual {v3, v2}, Lcom/google/android/gms/measurement/internal/el;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v3
+    :try_end_2f
+    .catchall {:try_start_2f .. :try_end_2f} :catchall_5
+
+    if-nez v3, :cond_65
+
+    move-object/from16 v4, p0
+
+    :try_start_30
+    iget-object v3, v4, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
+
+    move-result-object v3
+
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
+
+    const-string v5, "Bundling raw events w/o app info. appId"
+
+    iget-object v6, v9, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+
+    iget-object v6, v6, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
+
+    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
     goto :goto_3b
 
-    :cond_62
-    move-object/from16 v2, v61
-
-    :try_start_29
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
-
-    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
-
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
-
-    move-result-object v4
-
-    invoke-virtual {v4, v3}, Lcom/google/android/gms/measurement/internal/el;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v4
-    :try_end_29
-    .catchall {:try_start_29 .. :try_end_29} :catchall_5
-
-    if-nez v4, :cond_63
-
-    move-object/from16 v5, p0
-
-    :try_start_2a
-    iget-object v4, v5, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
-
-    move-result-object v4
-
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
-
-    const-string v6, "Bundling raw events w/o app info. appId"
-
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
-
-    iget-object v7, v7, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
-
-    invoke-static {v7}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    invoke-virtual {v4, v6, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto :goto_3f
-
-    :cond_63
-    move-object/from16 v5, p0
-
-    iget-object v6, v1, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
-
-    array-length v6, v6
-
-    if-lez v6, :cond_67
-
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
-
-    move-result-wide v6
-
-    const-wide/16 v8, 0x0
-
-    cmp-long v10, v6, v8
-
-    if-eqz v10, :cond_64
-
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v11
-
-    goto :goto_3c
-
-    :cond_64
-    const/4 v11, 0x0
-
-    :goto_3c
-    iput-object v11, v1, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
-
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ed;->zS()J
-
-    move-result-wide v8
-
-    const-wide/16 v10, 0x0
-
-    cmp-long v12, v8, v10
-
-    if-nez v12, :cond_65
-
-    goto :goto_3d
-
     :cond_65
-    move-wide v6, v8
+    move-object/from16 v4, p0
 
-    :goto_3d
-    cmp-long v8, v6, v10
+    iget-object v5, v1, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    if-eqz v8, :cond_66
+    array-length v5, v5
 
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    if-lez v5, :cond_69
+
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ed;->zS()J
+
+    move-result-wide v5
+
+    const-wide/16 v7, 0x0
+
+    cmp-long v10, v5, v7
+
+    if-eqz v10, :cond_66
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v11
 
-    goto :goto_3e
+    goto :goto_38
 
     :cond_66
     const/4 v11, 0x0
 
-    :goto_3e
-    iput-object v11, v1, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
+    :goto_38
+    iput-object v11, v1, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ed;->Ac()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ed;->zR()J
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ed;->zZ()J
+    move-result-wide v7
 
-    move-result-wide v6
+    const-wide/16 v10, 0x0
 
-    long-to-int v6, v6
+    cmp-long v12, v7, v10
 
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    if-nez v12, :cond_67
 
-    move-result-object v6
-
-    iput-object v6, v1, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
-
-    iget-object v6, v1, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
-
-    invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v6
-
-    invoke-virtual {v4, v6, v7}, Lcom/google/android/gms/measurement/internal/ed;->aD(J)V
-
-    iget-object v6, v1, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
-
-    invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v6
-
-    invoke-virtual {v4, v6, v7}, Lcom/google/android/gms/measurement/internal/ed;->aE(J)V
-
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v6
-
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/ed;->bpd:Ljava/lang/String;
-
-    const/4 v7, 0x0
-
-    invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/ed;->da(Ljava/lang/String;)V
-
-    iput-object v6, v1, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
-
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
-
-    move-result-object v6
-
-    invoke-virtual {v6, v4}, Lcom/google/android/gms/measurement/internal/el;->c(Lcom/google/android/gms/measurement/internal/ed;)V
+    goto :goto_39
 
     :cond_67
-    :goto_3f
-    iget-object v4, v1, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
+    move-wide v5, v7
 
-    array-length v4, v4
+    :goto_39
+    cmp-long v7, v5, v10
 
-    if-lez v4, :cond_6b
+    if-eqz v7, :cond_68
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v11
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
-
-    iget-object v6, v6, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
-
-    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/al;->cB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/cm;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_69
-
-    iget-object v6, v4, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
-
-    if-nez v6, :cond_68
-
-    goto :goto_41
+    goto :goto_3a
 
     :cond_68
-    iget-object v4, v4, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
+    const/4 v11, 0x0
 
-    :goto_40
-    iput-object v4, v1, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
+    :goto_3a
+    iput-object v11, v1, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
 
-    goto :goto_42
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ed;->Ab()V
 
-    :cond_69
-    :goto_41
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ed;->zY()J
 
-    iget-object v4, v4, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
+    move-result-wide v5
 
-    invoke-static {v4}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+    long-to-int v5, v5
 
-    move-result v4
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    if-eqz v4, :cond_6a
+    move-result-object v5
 
-    const-wide/16 v6, -0x1
+    iput-object v5, v1, Lcom/google/android/gms/internal/measurement/ct;->aZa:Ljava/lang/Integer;
 
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    iget-object v5, v1, Lcom/google/android/gms/internal/measurement/ct;->aYI:Ljava/lang/Long;
 
-    move-result-object v4
+    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
-    goto :goto_40
+    move-result-wide v5
 
-    :cond_6a
-    iget-object v4, v5, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
+    invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/ed;->aD(J)V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    iget-object v5, v1, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
 
-    move-result-object v4
+    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/o;->bkt:Lcom/google/android/gms/measurement/internal/q;
+    move-result-wide v5
 
-    const-string v6, "Did not find measurement config or missing version info. appId"
+    invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/ed;->aE(J)V
 
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    iget-object v7, v7, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
-    invoke-static {v7}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+    move-result-object v5
 
-    move-result-object v7
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v4, v6, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
-
-    :goto_42
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
-
-    move-result-object v4
-
-    move/from16 v9, v34
-
-    invoke-virtual {v4, v1, v9}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/internal/measurement/ct;Z)Z
-
-    :cond_6b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
-
-    move-result-object v1
-
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dr$a;->boz:Ljava/util/List;
-
-    invoke-static {v2}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
-
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    const-string v6, "rowid in ("
-
-    invoke-direct {v4, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/ed;->bpd:Ljava/lang/String;
 
     const/4 v6, 0x0
 
-    :goto_43
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-virtual {v3, v6}, Lcom/google/android/gms/measurement/internal/ed;->da(Ljava/lang/String;)V
+
+    iput-object v5, v1, Lcom/google/android/gms/internal/measurement/ct;->aZb:Ljava/lang/String;
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v3}, Lcom/google/android/gms/measurement/internal/el;->c(Lcom/google/android/gms/measurement/internal/ed;)V
+
+    :cond_69
+    :goto_3b
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
+
+    array-length v3, v3
+
+    if-lez v3, :cond_6d
+
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
+
+    move-result-object v3
+
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+
+    iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
+
+    invoke-virtual {v3, v5}, Lcom/google/android/gms/measurement/internal/al;->cB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/cm;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_6b
+
+    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
+
+    if-nez v5, :cond_6a
+
+    goto :goto_3c
+
+    :cond_6a
+    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/cm;->aYd:Ljava/lang/Long;
+
+    iput-object v3, v1, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
+
+    goto :goto_3d
+
+    :cond_6b
+    :goto_3c
+    iget-object v3, v9, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+
+    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/ct;->aYe:Ljava/lang/String;
+
+    invoke-static {v3}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_6c
+
+    const-wide/16 v5, -0x1
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    iput-object v3, v1, Lcom/google/android/gms/internal/measurement/ct;->aZj:Ljava/lang/Long;
+
+    goto :goto_3d
+
+    :cond_6c
+    iget-object v3, v4, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
+
+    move-result-object v3
+
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/o;->bkt:Lcom/google/android/gms/measurement/internal/q;
+
+    const-string v5, "Did not find measurement config or missing version info. appId"
+
+    iget-object v6, v9, Lcom/google/android/gms/measurement/internal/dr$a;->boy:Lcom/google/android/gms/internal/measurement/ct;
+
+    iget-object v6, v6, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
+
+    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    :goto_3d
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
+
+    move-result-object v3
+
+    move/from16 v11, v21
+
+    invoke-virtual {v3, v1, v11}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/internal/measurement/ct;Z)Z
+
+    :cond_6d
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
+
+    move-result-object v1
+
+    iget-object v3, v9, Lcom/google/android/gms/measurement/internal/dr$a;->boz:Ljava/util/List;
+
+    invoke-static {v3}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
+
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    const-string v6, "rowid in ("
+
+    invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    const/4 v6, 0x0
+
+    :goto_3e
+    invoke-interface {v3}, Ljava/util/List;->size()I
 
     move-result v7
 
-    if-ge v6, v7, :cond_6d
+    if-ge v6, v7, :cond_6f
 
-    if-eqz v6, :cond_6c
+    if-eqz v6, :cond_6e
 
     const-string v7, ","
 
-    invoke-virtual {v4, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :cond_6c
-    invoke-interface {v2, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    :cond_6e
+    invoke-interface {v3, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -5080,16 +5133,16 @@
 
     move-result-wide v7
 
-    invoke-virtual {v4, v7, v8}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v7, v8}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_43
+    goto :goto_3e
 
-    :cond_6d
+    :cond_6f
     const-string v6, ")"
 
-    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -5097,23 +5150,23 @@
 
     const-string v7, "raw_events"
 
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v5
 
     const/4 v8, 0x0
 
-    invoke-virtual {v6, v7, v4, v8}, Landroid/database/sqlite/SQLiteDatabase;->delete(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)I
+    invoke-virtual {v6, v7, v5, v8}, Landroid/database/sqlite/SQLiteDatabase;->delete(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)I
 
-    move-result v4
+    move-result v5
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-interface {v3}, Ljava/util/List;->size()I
 
     move-result v6
 
-    if-eq v4, v6, :cond_6e
+    if-eq v5, v6, :cond_70
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -5121,33 +5174,33 @@
 
     const-string v6, "Deleted fewer rows from raw events table than expected"
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v5
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-interface {v3}, Ljava/util/List;->size()I
 
-    move-result v2
+    move-result v3
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v1, v6, v4, v2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-virtual {v1, v6, v5, v3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_6e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :cond_70
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
-    move-result-object v2
-    :try_end_2a
-    .catchall {:try_start_2a .. :try_end_2a} :catchall_7
+    move-result-object v3
+    :try_end_30
+    .catchall {:try_start_30 .. :try_end_30} :catchall_7
 
-    :try_start_2b
-    const-string v4, "delete from raw_events_metadata where app_id=? and metadata_fingerprint not in (select distinct metadata_fingerprint from raw_events where app_id=?)"
+    :try_start_31
+    const-string v5, "delete from raw_events_metadata where app_id=? and metadata_fingerprint not in (select distinct metadata_fingerprint from raw_events where app_id=?)"
 
     const/4 v6, 0x2
 
@@ -5155,49 +5208,49 @@
 
     const/4 v7, 0x0
 
-    aput-object v3, v6, v7
+    aput-object v2, v6, v7
 
     const/4 v7, 0x1
 
-    aput-object v3, v6, v7
+    aput-object v2, v6, v7
 
-    invoke-virtual {v2, v4, v6}, Landroid/database/sqlite/SQLiteDatabase;->execSQL(Ljava/lang/String;[Ljava/lang/Object;)V
-    :try_end_2b
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2b .. :try_end_2b} :catch_9
-    .catchall {:try_start_2b .. :try_end_2b} :catchall_7
+    invoke-virtual {v3, v5, v6}, Landroid/database/sqlite/SQLiteDatabase;->execSQL(Ljava/lang/String;[Ljava/lang/Object;)V
+    :try_end_31
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_31 .. :try_end_31} :catch_9
+    .catchall {:try_start_31 .. :try_end_31} :catchall_7
 
-    goto :goto_44
+    goto :goto_3f
 
     :catch_9
     move-exception v0
 
-    move-object v2, v0
+    move-object v3, v0
 
-    :try_start_2c
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    :try_start_32
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
 
-    const-string v4, "Failed to remove unused event metadata. appId"
+    const-string v5, "Failed to remove unused event metadata. appId"
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v1, v4, v3, v2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-virtual {v1, v5, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_44
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_3f
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/el;->setTransactionSuccessful()V
-    :try_end_2c
-    .catchall {:try_start_2c .. :try_end_2c} :catchall_7
+    :try_end_32
+    .catchall {:try_start_32 .. :try_end_32} :catchall_7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -5210,23 +5263,23 @@
     :catchall_5
     move-exception v0
 
-    move-object/from16 v5, p0
+    move-object/from16 v4, p0
 
-    goto :goto_48
+    goto :goto_41
 
-    :cond_6f
-    move-object v5, v1
+    :cond_71
+    move-object v4, v1
 
-    :try_start_2d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :try_start_33
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/el;->setTransactionSuccessful()V
-    :try_end_2d
-    .catchall {:try_start_2d .. :try_end_2d} :catchall_7
+    :try_end_33
+    .catchall {:try_start_33 .. :try_end_33} :catchall_7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -5239,40 +5292,36 @@
     :catchall_6
     move-exception v0
 
-    :goto_45
-    move-object v5, v1
+    move-object v4, v1
 
-    goto/16 :goto_a
+    goto/16 :goto_7
 
-    :goto_46
-    if-eqz v8, :cond_70
+    :goto_40
+    if-eqz v8, :cond_72
 
-    :try_start_2e
+    :try_start_34
     invoke-interface {v8}, Landroid/database/Cursor;->close()V
 
-    goto :goto_47
+    :cond_72
+    throw v1
+    :try_end_34
+    .catchall {:try_start_34 .. :try_end_34} :catchall_7
 
     :catchall_7
     move-exception v0
 
-    goto :goto_48
-
-    :cond_70
-    :goto_47
-    throw v1
-    :try_end_2e
-    .catchall {:try_start_2e .. :try_end_2e} :catchall_7
+    goto :goto_41
 
     :catchall_8
     move-exception v0
 
-    move-object v5, v1
+    move-object v4, v1
 
-    :goto_48
+    :goto_41
     move-object v1, v0
 
-    :goto_49
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_42
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -5280,6 +5329,10 @@
 
     throw v1
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_0
@@ -5348,7 +5401,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     const/4 v0, 0x0
 
@@ -5386,7 +5439,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -5408,7 +5461,7 @@
 
     invoke-virtual {v2}, Ljava/nio/ByteBuffer;->getInt()I
 
-    move-result p1
+    move-result v0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -5419,7 +5472,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -5429,16 +5482,14 @@
 
     invoke-virtual {v1, v2, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    const/4 p1, 0x0
-
     :goto_0
-    return p1
+    return v0
 
     :cond_3
     :goto_1
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -5457,7 +5508,7 @@
     .end annotation
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v0
 
@@ -5479,7 +5530,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -5489,7 +5540,7 @@
 
     iget v0, v0, Landroid/content/pm/PackageInfo;->versionCode:I
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v1
 
@@ -5514,7 +5565,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -5524,13 +5575,13 @@
 
     iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v1
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object p1
 
@@ -5578,13 +5629,13 @@
 
     move-result-wide v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v15, v2, Lcom/google/android/gms/measurement/internal/zzh;->packageName:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p1 .. p2}, Lcom/google/android/gms/measurement/internal/dx;->d(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)Z
 
@@ -5604,7 +5655,7 @@
     return-void
 
     :cond_1
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v5
 
@@ -5622,7 +5673,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -5636,7 +5687,7 @@
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v5
 
@@ -5648,7 +5699,7 @@
 
     invoke-virtual {v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v2
 
@@ -5658,7 +5709,7 @@
 
     if-nez v2, :cond_3
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v2
 
@@ -5689,7 +5740,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -5704,7 +5755,7 @@
     :cond_4
     if-eqz v20, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -5714,11 +5765,11 @@
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Ab()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Aa()J
 
     move-result-wide v2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Aa()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zZ()J
 
     move-result-wide v4
 
@@ -5728,7 +5779,7 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v4
 
@@ -5760,7 +5811,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -5778,7 +5829,7 @@
     :cond_6
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -5792,7 +5843,7 @@
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -5802,7 +5853,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v7
 
@@ -5813,7 +5864,7 @@
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -5849,7 +5900,7 @@
 
     if-nez v5, :cond_9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -5857,7 +5908,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -5881,11 +5932,11 @@
 
     move-result v17
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zG()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()J
 
     move-result-wide v6
 
@@ -5943,7 +5994,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -5964,7 +6015,7 @@
     invoke-virtual {v0, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -5972,7 +6023,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6016,7 +6067,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -6039,7 +6090,7 @@
     :cond_c
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -6053,7 +6104,7 @@
 
     invoke-virtual {v2, v3, v4, v0, v5}, Lcom/google/android/gms/measurement/internal/ea;->b(ILjava/lang/String;Ljava/lang/String;I)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6061,7 +6112,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6115,7 +6166,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -6136,7 +6187,7 @@
     invoke-virtual {v0, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6144,7 +6195,7 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6159,13 +6210,13 @@
     :try_start_4
     iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object v10
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v5
 
@@ -6177,7 +6228,7 @@
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v5
 
@@ -6189,7 +6240,7 @@
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v5
 
@@ -6205,7 +6256,7 @@
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v5
 
@@ -6218,7 +6269,7 @@
     invoke-virtual {v5, v10, v6, v7}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_11
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -6232,7 +6283,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -6261,7 +6312,7 @@
 
     iget-wide v12, v0, Lcom/google/android/gms/measurement/internal/zzad;->biy:J
 
-    const-wide/16 v17, 0x0
+    const-wide/16 v21, 0x0
 
     move-object v5, v11
 
@@ -6275,7 +6326,7 @@
 
     move-wide v10, v12
 
-    move-wide/from16 v12, v17
+    move-wide/from16 v12, v21
 
     const/4 v4, 0x0
 
@@ -6283,7 +6334,7 @@
 
     invoke-direct/range {v5 .. v14}, Lcom/google/android/gms/measurement/internal/et;-><init>(Lcom/google/android/gms/measurement/internal/ar;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJLandroid/os/Bundle;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6297,7 +6348,7 @@
 
     if-nez v0, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6315,7 +6366,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -6329,7 +6380,7 @@
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v6
 
@@ -6349,7 +6400,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -6359,7 +6410,7 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6429,15 +6480,15 @@
     move-object v3, v11
 
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
     invoke-virtual {v5, v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/eu;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -6547,7 +6598,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -6588,7 +6639,7 @@
     :cond_17
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
@@ -6628,7 +6679,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -6657,7 +6708,7 @@
 
     iget-object v6, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -6681,11 +6732,11 @@
     :goto_5
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     sget-object v0, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
@@ -6693,11 +6744,11 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     sget-object v0, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -6705,11 +6756,11 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/es;->AE()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/es;->AD()J
 
     move-result-wide v6
 
@@ -6723,11 +6774,11 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/es;->AF()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/es;->AE()Ljava/lang/String;
 
     move-result-object v0
 
@@ -6757,7 +6808,7 @@
 
     if-eqz v0, :cond_1b
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Am()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Al()Z
 
     move-result v0
 
@@ -6766,7 +6817,7 @@
     iput-object v4, v5, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
 
     :cond_1b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6788,11 +6839,11 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ea;->zQ()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/lang/String;
 
     move-result-object v4
 
@@ -6808,7 +6859,7 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v4
 
@@ -6848,13 +6899,13 @@
 
     iget-boolean v4, v2, Lcom/google/android/gms/measurement/internal/zzh;->boU:Z
 
-    invoke-virtual {v0, v4}, Lcom/google/android/gms/measurement/internal/ed;->Z(Z)V
+    invoke-virtual {v0, v4}, Lcom/google/android/gms/measurement/internal/ed;->Y(Z)V
 
     iget-wide v6, v2, Lcom/google/android/gms/measurement/internal/zzh;->bjZ:J
 
     invoke-virtual {v0, v6, v7}, Lcom/google/android/gms/measurement/internal/ed;->ad(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
@@ -6873,7 +6924,7 @@
 
     iput-object v0, v5, Lcom/google/android/gms/internal/measurement/ct;->aZe:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6932,7 +6983,7 @@
 
     iput-object v6, v4, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v6
 
@@ -6954,19 +7005,19 @@
 
     :cond_1d
     :try_start_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
     invoke-virtual {v0, v5}, Lcom/google/android/gms/measurement/internal/el;->b(Lcom/google/android/gms/internal/measurement/ct;)J
 
-    move-result-wide v6
+    move-result-wide v4
     :try_end_6
     .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_0
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -6983,47 +7034,46 @@
     :cond_1e
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v6
 
-    if-eqz v4, :cond_1f
+    if-eqz v6, :cond_1f
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v6
 
-    check-cast v4, Ljava/lang/String;
+    check-cast v6, Ljava/lang/String;
 
-    const-string v5, "_r"
+    const-string v7, "_r"
 
-    invoke-virtual {v5, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v4
+    move-result v6
 
-    if-eqz v4, :cond_1e
+    if-eqz v6, :cond_1e
 
-    :goto_7
     const/4 v2, 0x1
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_1f
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v2
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/et;->aYS:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/et;->aYS:Ljava/lang/String;
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/et;->name:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/et;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, v4, v5}, Lcom/google/android/gms/measurement/internal/al;->E(Ljava/lang/String;Ljava/lang/String;)Z
+    invoke-virtual {v2, v6, v7}, Lcom/google/android/gms/measurement/internal/al;->E(Ljava/lang/String;Ljava/lang/String;)Z
 
     move-result v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v10
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zG()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()J
 
     move-result-wide v11
 
@@ -7041,11 +7091,11 @@
 
     invoke-virtual/range {v10 .. v18}, Lcom/google/android/gms/measurement/internal/el;->a(JLjava/lang/String;ZZZZZ)Lcom/google/android/gms/measurement/internal/em;
 
-    move-result-object v4
+    move-result-object v6
 
     if-eqz v2, :cond_20
 
-    iget-wide v4, v4, Lcom/google/android/gms/measurement/internal/em;->bpH:J
+    iget-wide v6, v6, Lcom/google/android/gms/measurement/internal/em;->bpH:J
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
@@ -7059,17 +7109,19 @@
 
     int-to-long v10, v2
 
-    cmp-long v2, v4, v10
+    cmp-long v2, v6, v10
 
     if-gez v2, :cond_20
 
+    const/4 v2, 0x1
+
     goto :goto_7
 
     :cond_20
     const/4 v2, 0x0
 
-    :goto_8
-    invoke-virtual {v0, v3, v6, v7, v2}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/et;JZ)Z
+    :goto_7
+    invoke-virtual {v0, v3, v4, v5, v2}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/et;JZ)Z
 
     move-result v0
 
@@ -7077,14 +7129,14 @@
 
     iput-wide v8, v1, Lcom/google/android/gms/measurement/internal/dr;->bol:J
 
-    goto :goto_9
+    goto :goto_8
 
     :catch_0
     move-exception v0
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -7101,8 +7153,8 @@
     invoke-virtual {v2, v4, v5, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_21
-    :goto_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_8
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -7110,7 +7162,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7124,7 +7176,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7134,7 +7186,7 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -7147,17 +7199,17 @@
     .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
     :cond_22
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->endTransaction()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7190,16 +7242,18 @@
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/el;->endTransaction()V
 
     throw v0
+
+    return-void
 .end method
 
-.method private final zB()Lcom/google/android/gms/measurement/internal/al;
+.method private final zA()Lcom/google/android/gms/measurement/internal/al;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bod:Lcom/google/android/gms/measurement/internal/al;
@@ -7211,15 +7265,13 @@
     return-object v0
 .end method
 
-.method private final zD()Lcom/google/android/gms/measurement/internal/w;
+.method private final zC()Lcom/google/android/gms/measurement/internal/w;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bog:Lcom/google/android/gms/measurement/internal/w;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bog:Lcom/google/android/gms/measurement/internal/w;
-
     return-object v0
 
     :cond_0
@@ -7232,7 +7284,7 @@
     throw v0
 .end method
 
-.method private final zE()Lcom/google/android/gms/measurement/internal/dm;
+.method private final zD()Lcom/google/android/gms/measurement/internal/dm;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boh:Lcom/google/android/gms/measurement/internal/dm;
@@ -7244,12 +7296,12 @@
     return-object v0
 .end method
 
-.method private final zG()J
+.method private final zF()J
     .locals 8
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -7259,13 +7311,13 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v3, v2, Lcom/google/android/gms/measurement/internal/z;->blc:Lcom/google/android/gms/measurement/internal/ab;
 
@@ -7281,11 +7333,11 @@
 
     const-wide/16 v3, 0x1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/security/SecureRandom;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ea;->zO()Ljava/security/SecureRandom;
 
     move-result-object v5
 
@@ -7304,8 +7356,6 @@
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
     :cond_0
-    const/4 v2, 0x0
-
     add-long/2addr v0, v3
 
     const-wide/16 v2, 0x3e8
@@ -7325,28 +7375,28 @@
     return-wide v0
 .end method
 
-.method private final zI()Z
+.method private final zH()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->Au()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->At()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->Ap()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->Ao()Ljava/lang/String;
 
     move-result-object v0
 
@@ -7370,12 +7420,12 @@
     return v0
 .end method
 
-.method private final zK()V
+.method private final zJ()V
     .locals 5
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bop:Z
 
@@ -7394,7 +7444,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7411,8 +7461,6 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bom:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
@@ -7445,7 +7493,7 @@
     :goto_1
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7476,12 +7524,12 @@
     return-void
 .end method
 
-.method private final zL()Z
+.method private final zK()Z
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     const-string v0, "google_app_measurement.db"
 
@@ -7526,7 +7574,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7543,7 +7591,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7556,14 +7604,14 @@
     .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_0
     move-exception v0
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -7571,6 +7619,8 @@
 
     const-string v2, "Failed to access storage lock file"
 
+    invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :catch_1
@@ -7578,7 +7628,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -7586,23 +7636,22 @@
 
     const-string v2, "Failed to acquire storage lock"
 
-    :goto_0
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method private final zN()Z
+.method private final zM()Z
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bok:Z
 
@@ -7625,9 +7674,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     const/4 v0, 0x0
 
@@ -7636,22 +7685,14 @@
     :try_start_0
     new-array p3, v0, [B
 
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    goto/16 :goto_5
-
     :cond_0
-    :goto_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bov:Ljava/util/List;
 
     const/4 v2, 0x0
 
     iput-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bov:Ljava/util/List;
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     const/16 v3, 0xc8
 
@@ -7669,7 +7710,7 @@
     :try_start_1
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p2
 
@@ -7677,7 +7718,7 @@
 
     iget-object p4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p4
 
@@ -7689,7 +7730,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p2
 
@@ -7699,11 +7740,11 @@
 
     invoke-virtual {p2, v5, v6}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -7723,21 +7764,21 @@
 
     invoke-virtual {p2, p4, p1, p3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/el;->beginTransaction()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_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
-    :goto_1
+    :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
@@ -7750,10 +7791,10 @@
 
     check-cast p2, Ljava/lang/Long;
     :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p3
 
@@ -7761,9 +7802,9 @@
 
     move-result-wide v7
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -7778,7 +7819,7 @@
     aput-object v3, v1, v0
     :try_end_3
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_1
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :try_start_4
     const-string v3, "queue"
@@ -7791,7 +7832,7 @@
 
     if-ne p4, v4, :cond_2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     new-instance p4, Landroid/database/sqlite/SQLiteException;
@@ -7803,13 +7844,13 @@
     throw p4
     :try_end_4
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_4 .. :try_end_4} :catch_0
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :catch_0
     move-exception p4
 
     :try_start_5
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -7822,7 +7863,7 @@
     throw p4
     :try_end_5
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_1
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :catch_1
     move-exception p3
@@ -7840,22 +7881,22 @@
 
     if-eqz p2, :cond_3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     throw p3
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/el;->setTransactionSuccessful()V
     :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_1
+    .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -7863,42 +7904,42 @@
 
     iput-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bow:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/s;->qX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/s;->qW()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zH()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zH()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zG()V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     const-wide/16 p1, -0x1
 
     iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/dr;->box:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
 
-    :goto_2
+    :goto_1
     iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/dr;->bol:J
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
-    :catchall_1
+    :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -7907,7 +7948,7 @@
     throw p1
     :try_end_7
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_7 .. :try_end_7} :catch_2
-    .catchall {:try_start_7 .. :try_end_7} :catchall_0
+    .catchall {:try_start_7 .. :try_end_7} :catchall_1
 
     :catch_2
     move-exception p1
@@ -7915,7 +7956,7 @@
     :try_start_8
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -7927,7 +7968,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p1
 
@@ -7939,7 +7980,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -7955,12 +7996,12 @@
 
     invoke-virtual {p1, p2, p3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -7976,7 +8017,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p2
 
@@ -7984,7 +8025,7 @@
 
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p3
 
@@ -8002,18 +8043,18 @@
 
     if-ne p1, p2, :cond_7
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
     const/4 v4, 0x0
 
     :cond_8
-    :goto_3
+    :goto_2
     if-eqz v4, :cond_9
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p1
 
@@ -8021,7 +8062,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p2
 
@@ -8044,34 +8085,38 @@
 
     if-eqz p1, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/el;->y(Ljava/util/List;)V
 
     :cond_a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
     :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_0
+    .catchall {:try_start_8 .. :try_end_8} :catchall_1
 
-    :goto_4
+    :goto_3
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
 
     return-void
 
-    :goto_5
+    :catchall_1
+    move-exception p1
+
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(Lcom/google/android/gms/measurement/internal/zzad;Ljava/lang/String;)[B
-    .locals 33
+    .locals 31
     .param p1    # Lcom/google/android/gms/measurement/internal/zzad;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -8090,11 +8135,11 @@
 
     move-object/from16 v15, p2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ar;->yz()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ar;->yy()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -8104,14 +8149,14 @@
 
     invoke-direct {v14}, Lcom/google/android/gms/internal/measurement/cs;-><init>()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/el;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -8125,7 +8170,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -8135,12 +8180,11 @@
 
     invoke-virtual {v0, v2, v15}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_0
     new-array v0, v11, [B
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -8150,7 +8194,7 @@
 
     :cond_0
     :try_start_1
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zY()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zX()Z
 
     move-result v2
 
@@ -8158,7 +8202,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -8168,9 +8212,20 @@
 
     invoke-virtual {v0, v2, v15}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_0
+    new-array v0, v11, [B
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/el;->endTransaction()V
+
+    return-object v0
 
     :cond_1
+    :try_start_2
     const-string v2, "_iap"
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzad;->name:Ljava/lang/String;
@@ -8200,7 +8255,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -8255,7 +8310,7 @@
 
     if-nez v4, :cond_4
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_4
     iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
@@ -8270,7 +8325,7 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -8282,10 +8337,9 @@
 
     move-result-object v6
 
-    :goto_1
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_5
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
@@ -8296,13 +8350,13 @@
 
     move-result-object v3
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_6
-    :goto_2
+    :goto_0
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -8314,10 +8368,10 @@
 
     move-result-object v6
 
-    goto :goto_1
+    invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_7
-    :goto_3
+    :goto_1
     new-instance v12, Lcom/google/android/gms/internal/measurement/ct;
 
     invoke-direct {v12}, Lcom/google/android/gms/internal/measurement/ct;-><init>()V
@@ -8340,25 +8394,25 @@
 
     iput-object v4, v12, Lcom/google/android/gms/internal/measurement/ct;->aYM:Ljava/lang/String;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v4
 
     iput-object v4, v12, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zV()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zU()Ljava/lang/String;
 
     move-result-object v4
 
     iput-object v4, v12, Lcom/google/android/gms/internal/measurement/ct;->aYR:Ljava/lang/String;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v4
 
     iput-object v4, v12, Lcom/google/android/gms/internal/measurement/ct;->aYT:Ljava/lang/String;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v4
 
@@ -8372,7 +8426,7 @@
 
     move-object v4, v10
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_8
     long-to-int v4, v4
@@ -8381,10 +8435,10 @@
 
     move-result-object v4
 
-    :goto_4
+    :goto_2
     iput-object v4, v12, Lcom/google/android/gms/internal/measurement/ct;->aZf:Ljava/lang/Integer;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zV()J
 
     move-result-wide v4
 
@@ -8408,14 +8462,14 @@
 
     if-eqz v4, :cond_9
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v4
 
     iput-object v4, v12, Lcom/google/android/gms/internal/measurement/ct;->aYj:Ljava/lang/String;
 
     :cond_9
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zX()J
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
 
     move-result-wide v4
 
@@ -8433,7 +8487,7 @@
 
     if-eqz v4, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Am()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Al()Z
 
     move-result v4
 
@@ -8456,11 +8510,11 @@
     :cond_a
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v4
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v5
 
@@ -8468,7 +8522,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->Ae()Z
 
     move-result v5
 
@@ -8499,11 +8553,11 @@
     :cond_b
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     sget-object v4, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
@@ -8511,11 +8565,11 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     sget-object v4, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -8523,11 +8577,11 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/es;->AE()J
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/es;->AD()J
 
     move-result-wide v4
 
@@ -8541,11 +8595,11 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/es;->AF()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/es;->AE()Ljava/lang/String;
 
     move-result-object v4
 
@@ -8563,11 +8617,11 @@
 
     iput-object v4, v12, Lcom/google/android/gms/internal/measurement/ct;->aZe:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v5
 
@@ -8585,7 +8639,7 @@
 
     if-eqz v2, :cond_e
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -8603,7 +8657,7 @@
 
     if-nez v6, :cond_c
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_c
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
@@ -8624,7 +8678,7 @@
 
     iget-object v8, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v8
 
@@ -8644,8 +8698,6 @@
 
     move-result-wide v25
 
-    const/4 v5, 0x0
-
     add-long v19, v19, v25
 
     invoke-static/range {v19 .. v20}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -8660,10 +8712,10 @@
 
     move-object v5, v6
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_d
-    :goto_5
+    :goto_3
     new-instance v5, Lcom/google/android/gms/measurement/internal/dz;
 
     iget-object v6, v12, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
@@ -8674,7 +8726,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v7
 
@@ -8690,18 +8742,18 @@
 
     invoke-direct/range {v19 .. v25}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    goto :goto_6
+    goto :goto_4
 
     :cond_e
     move-object v5, v10
 
     :cond_f
-    :goto_6
+    :goto_4
     move-object v7, v10
 
     const/4 v6, 0x0
 
-    :goto_7
+    :goto_5
     invoke-interface {v4}, Ljava/util/List;->size()I
 
     move-result v8
@@ -8740,7 +8792,7 @@
 
     iput-object v9, v8, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v9
 
@@ -8774,7 +8826,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v7
 
@@ -8797,7 +8849,7 @@
 
     const/4 v10, 0x0
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_11
     if-eqz v2, :cond_12
@@ -8814,7 +8866,7 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v4
 
@@ -8864,12 +8916,12 @@
 
     aput-object v2, v4, v6
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_12
     const/4 v9, 0x1
 
-    :goto_8
+    :goto_6
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v2
@@ -8878,7 +8930,7 @@
 
     if-lez v4, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -8887,7 +8939,7 @@
     :cond_13
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object v10
 
@@ -8909,7 +8961,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -8932,7 +8984,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -8946,7 +8998,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -8960,7 +9012,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
@@ -8973,7 +9025,7 @@
     invoke-virtual {v2, v10, v5, v3}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_15
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -8997,14 +9049,14 @@
 
     const-wide/16 v21, 0x0
 
-    const/16 v16, 0x0
-
     const/16 v23, 0x0
 
     const/16 v24, 0x0
 
     const/16 v25, 0x0
 
+    const/16 v26, 0x0
+
     move-wide/from16 v27, v2
 
     move-object v2, v7
@@ -9023,25 +9075,25 @@
 
     move-object/from16 v30, v12
 
-    const/16 v26, 0x0
+    const/16 v27, 0x0
 
     move-wide/from16 v11, v21
 
-    move-object/from16 v31, v13
+    move-object/from16 v21, v13
 
-    move-object/from16 v13, v16
+    move-object/from16 v13, v23
 
-    move-object/from16 v32, v14
+    move-object/from16 v22, v14
 
-    move-object/from16 v14, v23
+    move-object/from16 v14, v24
 
-    move-object/from16 v15, v24
+    move-object/from16 v15, v25
 
-    move-object/from16 v16, v25
+    move-object/from16 v16, v26
 
     invoke-direct/range {v2 .. v16}, Lcom/google/android/gms/measurement/internal/eu;-><init>(Ljava/lang/String;Ljava/lang/String;JJJJLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Boolean;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -9051,20 +9103,20 @@
 
     move-wide/from16 v9, v17
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_16
     move-object/from16 v19, v10
 
     move-object/from16 v30, v12
 
-    move-object/from16 v31, v13
+    move-object/from16 v21, v13
 
-    move-object/from16 v32, v14
+    move-object/from16 v22, v14
 
     const/16 v20, 0x0
 
-    const/16 v26, 0x0
+    const/16 v27, 0x0
 
     iget-wide v3, v2, Lcom/google/android/gms/measurement/internal/eu;->bpR:J
 
@@ -9074,11 +9126,11 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/eu;->AG()Lcom/google/android/gms/measurement/internal/eu;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/eu;->AF()Lcom/google/android/gms/measurement/internal/eu;
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -9086,7 +9138,7 @@
 
     move-wide v9, v3
 
-    :goto_9
+    :goto_7
     new-instance v12, Lcom/google/android/gms/measurement/internal/et;
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
@@ -9113,7 +9165,7 @@
 
     new-array v2, v2, [Lcom/google/android/gms/internal/measurement/cq;
 
-    aput-object v0, v2, v26
+    aput-object v0, v2, v27
 
     move-object/from16 v3, v30
 
@@ -9157,7 +9209,7 @@
 
     move-result-object v2
 
-    :goto_a
+    :goto_8
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
@@ -9176,9 +9228,9 @@
 
     iget-object v6, v0, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    add-int/lit8 v7, v26, 0x1
+    add-int/lit8 v7, v27, 0x1
 
-    aput-object v5, v6, v26
+    aput-object v5, v6, v27
 
     iput-object v4, v5, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
@@ -9188,18 +9240,18 @@
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v6
 
     invoke-virtual {v6, v5, v4}, Lcom/google/android/gms/measurement/internal/dx;->a(Lcom/google/android/gms/internal/measurement/cr;Ljava/lang/Object;)V
 
-    move/from16 v26, v7
+    move/from16 v27, v7
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_17
-    invoke-virtual/range {v31 .. v31}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual/range {v21 .. v21}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -9221,7 +9273,7 @@
 
     iput-object v0, v3, Lcom/google/android/gms/internal/measurement/ct;->aYJ:Ljava/lang/Long;
 
-    invoke-virtual/range {v31 .. v31}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
+    invoke-virtual/range {v21 .. v21}, Lcom/google/android/gms/measurement/internal/ed;->zS()J
 
     move-result-wide v4
 
@@ -9233,15 +9285,15 @@
 
     move-result-object v10
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_18
     move-object/from16 v10, v20
 
-    :goto_b
+    :goto_9
     iput-object v10, v3, Lcom/google/android/gms/internal/measurement/ct;->aYL:Ljava/lang/Long;
 
-    invoke-virtual/range {v31 .. v31}, Lcom/google/android/gms/measurement/internal/ed;->zS()J
+    invoke-virtual/range {v21 .. v21}, Lcom/google/android/gms/measurement/internal/ed;->zR()J
 
     move-result-wide v6
 
@@ -9249,12 +9301,12 @@
 
     if-nez v0, :cond_19
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_19
     move-wide v4, v6
 
-    :goto_c
+    :goto_a
     cmp-long v0, v4, v17
 
     if-eqz v0, :cond_1a
@@ -9263,17 +9315,17 @@
 
     move-result-object v10
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_1a
     move-object/from16 v10, v20
 
-    :goto_d
+    :goto_b
     iput-object v10, v3, Lcom/google/android/gms/internal/measurement/ct;->aYK:Ljava/lang/Long;
 
-    invoke-virtual/range {v31 .. v31}, Lcom/google/android/gms/measurement/internal/ed;->Ac()V
+    invoke-virtual/range {v21 .. v21}, Lcom/google/android/gms/measurement/internal/ed;->Ab()V
 
-    invoke-virtual/range {v31 .. v31}, Lcom/google/android/gms/measurement/internal/ed;->zZ()J
+    invoke-virtual/range {v21 .. v21}, Lcom/google/android/gms/measurement/internal/ed;->zY()J
 
     move-result-wide v4
 
@@ -9295,7 +9347,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -9319,7 +9371,7 @@
 
     move-result-wide v4
 
-    move-object/from16 v0, v31
+    move-object/from16 v0, v21
 
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/ed;->aD(J)V
 
@@ -9331,28 +9383,28 @@
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/ed;->aE(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
     invoke-virtual {v2, v0}, Lcom/google/android/gms/measurement/internal/el;->c(Lcom/google/android/gms/measurement/internal/ed;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->setTransactionSuccessful()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->endTransaction()V
 
-    :try_start_2
-    invoke-virtual/range {v32 .. v32}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    :try_start_3
+    invoke-virtual/range {v22 .. v22}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v0
 
@@ -9364,21 +9416,21 @@
 
     move-result-object v2
 
-    move-object/from16 v3, v32
+    move-object/from16 v3, v22
 
     invoke-virtual {v3, v2}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v2
 
     invoke-virtual {v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->G([B)[B
 
     move-result-object v0
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
 
     return-object v0
 
@@ -9387,7 +9439,7 @@
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -9406,13 +9458,15 @@
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/el;->endTransaction()V
 
     throw v0
+
+    return-void
 .end method
 
 .method final b(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
@@ -9432,15 +9486,15 @@
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzh;->packageName:Ljava/lang/String;
 
     iget-wide v11, v0, Lcom/google/android/gms/measurement/internal/zzad;->biy:J
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p1 .. p2}, Lcom/google/android/gms/measurement/internal/dx;->d(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)Z
 
@@ -9460,22 +9514,22 @@
     return-void
 
     :cond_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
     invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/el;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v5, 0x2
 
@@ -9489,7 +9543,7 @@
 
     if-gez v8, :cond_2
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -9553,7 +9607,7 @@
 
     iget-object v9, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v9
 
@@ -9565,7 +9619,7 @@
 
     iget-object v14, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v14
 
@@ -9598,7 +9652,7 @@
     invoke-direct {v1, v9, v2}, Lcom/google/android/gms/measurement/internal/dr;->c(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
     :cond_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v9
 
@@ -9615,21 +9669,21 @@
     goto :goto_1
 
     :cond_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_6
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -9705,7 +9759,7 @@
 
     iget-object v10, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v10
 
@@ -9717,7 +9771,7 @@
 
     iget-object v15, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v15
 
@@ -9737,7 +9791,7 @@
 
     invoke-virtual {v10, v13, v14, v5, v15}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -9756,7 +9810,7 @@
     invoke-interface {v8, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_8
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -9799,7 +9853,7 @@
     goto :goto_4
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
@@ -9809,15 +9863,15 @@
 
     invoke-static {v5}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_b
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v6
 
@@ -9829,7 +9883,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -9933,7 +9987,7 @@
 
     invoke-direct/range {v4 .. v10}, Lcom/google/android/gms/measurement/internal/dz;-><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/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
@@ -9945,7 +9999,7 @@
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -9957,7 +10011,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v7
 
@@ -9969,15 +10023,14 @@
 
     iget-object v8, v13, Lcom/google/android/gms/measurement/internal/dz;->value:Ljava/lang/Object;
 
-    :goto_7
     invoke-virtual {v4, v5, v6, v7, v8}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_d
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -9993,7 +10046,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v7
 
@@ -10005,9 +10058,9 @@
 
     iget-object v8, v13, Lcom/google/android/gms/measurement/internal/dz;->value:Ljava/lang/Object;
 
-    goto :goto_7
+    invoke-virtual {v4, v5, v6, v7, v8}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_8
+    :goto_7
     iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzl;->bpp:Lcom/google/android/gms/measurement/internal/zzad;
 
     if-eqz v4, :cond_e
@@ -10027,7 +10080,7 @@
 
     iput-boolean v4, v15, Lcom/google/android/gms/measurement/internal/zzl;->active:Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -10048,7 +10101,7 @@
 
     const/4 v3, 0x0
 
-    :goto_9
+    :goto_8
     if-ge v3, v0, :cond_10
 
     invoke-virtual {v14, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
@@ -10065,10 +10118,10 @@
 
     invoke-direct {v1, v5, v2}, Lcom/google/android/gms/measurement/internal/dr;->c(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_10
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -10076,7 +10129,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -10087,13 +10140,15 @@
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/el;->endTransaction()V
 
     throw v0
+
+    return-void
 .end method
 
 .method final b(Lcom/google/android/gms/measurement/internal/zzfh;Lcom/google/android/gms/measurement/internal/zzh;)V
@@ -10101,9 +10156,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzh;->aYe:Ljava/lang/String;
 
@@ -10157,7 +10212,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -10193,7 +10248,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -10208,7 +10263,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -10228,7 +10283,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzfh;->name:Ljava/lang/String;
 
@@ -10249,7 +10304,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p1
 
@@ -10262,7 +10317,7 @@
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -10280,7 +10335,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzfh;->name:Ljava/lang/String;
 
@@ -10314,7 +10369,7 @@
     :cond_6
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p1
 
@@ -10327,7 +10382,7 @@
     :cond_7
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzfh;->name:Ljava/lang/String;
 
@@ -10362,7 +10417,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -10372,7 +10427,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -10384,7 +10439,7 @@
 
     invoke-virtual {p1, v2, v4, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -10393,7 +10448,7 @@
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/dr;->g(Lcom/google/android/gms/measurement/internal/zzh;)Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -10401,7 +10456,7 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -10411,7 +10466,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -10421,7 +10476,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
@@ -10440,7 +10495,7 @@
     :cond_9
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -10450,7 +10505,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
@@ -10466,7 +10521,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p1
 
@@ -10479,7 +10534,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -10490,7 +10545,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -10524,9 +10579,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzh;->aYe:Ljava/lang/String;
 
@@ -10564,14 +10619,14 @@
 
     iput-boolean p1, v0, Lcom/google/android/gms/measurement/internal/zzl;->active:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/el;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -10599,7 +10654,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -10609,7 +10664,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -10751,7 +10806,7 @@
 
     invoke-direct/range {v2 .. v8}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -10763,7 +10818,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -10775,7 +10830,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -10787,15 +10842,14 @@
 
     iget-object v5, v9, Lcom/google/android/gms/measurement/internal/dz;->value:Ljava/lang/Object;
 
-    :goto_1
     invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -10811,7 +10865,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -10823,9 +10877,9 @@
 
     iget-object v5, v9, Lcom/google/android/gms/measurement/internal/dz;->value:Ljava/lang/Object;
 
-    goto :goto_1
+    invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_2
+    :goto_1
     if-eqz p1, :cond_6
 
     iget-object p1, v0, Lcom/google/android/gms/measurement/internal/zzl;->bpp:Lcom/google/android/gms/measurement/internal/zzad;
@@ -10843,7 +10897,7 @@
     invoke-direct {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/dr;->c(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -10855,7 +10909,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -10867,7 +10921,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -10885,15 +10939,14 @@
 
     move-result-object v0
 
-    :goto_3
     invoke-virtual {p1, p2, v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_7
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -10909,7 +10962,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -10927,10 +10980,10 @@
 
     move-result-object v0
 
-    goto :goto_3
+    invoke-virtual {p1, p2, v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_2
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -10938,7 +10991,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -10949,7 +11002,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -10978,9 +11031,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -10991,18 +11044,10 @@
     :try_start_0
     new-array p4, v0, [B
 
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    goto/16 :goto_a
-
     :cond_0
-    :goto_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -11018,16 +11063,16 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/el;->beginTransaction()V
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -11037,9 +11082,9 @@
 
     const/16 v2, 0xc8
 
-    const/4 v3, 0x1
+    const/16 v3, 0x130
 
-    const/16 v4, 0x130
+    const/4 v4, 0x1
 
     if-eq p2, v2, :cond_1
 
@@ -11047,24 +11092,24 @@
 
     if-eq p2, v2, :cond_1
 
-    if-ne p2, v4, :cond_2
+    if-ne p2, v3, :cond_2
 
     :cond_1
     if-nez p3, :cond_2
 
     const/4 v2, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_0
     if-nez v1, :cond_3
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -11078,7 +11123,7 @@
 
     invoke-virtual {p2, p3, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :cond_3
     const/16 v5, 0x194
@@ -11087,12 +11132,12 @@
 
     if-ne p2, v5, :cond_4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object p4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p4
 
@@ -11102,7 +11147,7 @@
 
     invoke-virtual {v1, p4, p5}, Lcom/google/android/gms/measurement/internal/ed;->Y(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p4
 
@@ -11110,7 +11155,7 @@
 
     iget-object p4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p4
 
@@ -11124,7 +11169,7 @@
 
     invoke-virtual {p4, p5, v1, p3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object p3
 
@@ -11132,7 +11177,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p1
 
@@ -11140,7 +11185,7 @@
 
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p3
 
@@ -11158,18 +11203,18 @@
 
     if-ne p2, p1, :cond_5
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     :cond_6
-    :goto_2
-    if-eqz v3, :cond_7
+    :goto_1
+    if-eqz v4, :cond_7
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p1
 
@@ -11177,7 +11222,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p2
 
@@ -11188,12 +11233,12 @@
     invoke-virtual {p1, p2, p3}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
 
-    goto/16 :goto_9
+    goto/16 :goto_8
 
     :cond_8
-    :goto_3
+    :goto_2
     const/4 p3, 0x0
 
     if-eqz p5, :cond_9
@@ -11206,12 +11251,12 @@
 
     check-cast p5, Ljava/util/List;
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_9
     move-object p5, p3
 
-    :goto_4
+    :goto_3
     if-eqz p5, :cond_a
 
     invoke-interface {p5}, Ljava/util/List;->size()I
@@ -11226,30 +11271,30 @@
 
     check-cast p5, Ljava/lang/String;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_a
     move-object p5, p3
 
-    :goto_5
+    :goto_4
     if-eq p2, v5, :cond_c
 
-    if-ne p2, v4, :cond_b
+    if-ne p2, v3, :cond_b
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_b
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object p3
 
     invoke-virtual {p3, p1, p4, p5}, Lcom/google/android/gms/measurement/internal/al;->a(Ljava/lang/String;[BLjava/lang/String;)Z
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_c
-    :goto_6
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    :goto_5
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object p5
 
@@ -11259,17 +11304,17 @@
 
     if-nez p5, :cond_d
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object p5
 
     invoke-virtual {p5, p1, p3, p3}, Lcom/google/android/gms/measurement/internal/al;->a(Ljava/lang/String;[BLjava/lang/String;)Z
 
     :cond_d
-    :goto_7
+    :goto_6
     iget-object p3, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object p3
 
@@ -11279,7 +11324,7 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ed;->X(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p3
 
@@ -11289,7 +11334,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -11299,12 +11344,12 @@
 
     invoke-virtual {p2, p3, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_e
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -11324,54 +11369,59 @@
 
     invoke-virtual {p1, p3, p2, p4}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    :goto_7
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/s;->qX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/s;->qW()Z
 
     move-result p1
 
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_f
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zH()Z
 
     move-result p1
 
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zH()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zG()V
 
-    :goto_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    goto :goto_8
+
+    :cond_f
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
+
+    :goto_8
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/el;->setTransactionSuccessful()V
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/el;->endTransaction()V
     :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bop:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
 
     return-void
 
-    :catchall_1
+    :catchall_0
     move-exception p1
 
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -11379,12 +11429,14 @@
 
     throw p1
     :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catchall_1
+    move-exception p1
 
-    :goto_a
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bop:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
 
     throw p1
 .end method
@@ -11400,7 +11452,7 @@
 
     move-object/from16 v3, p2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -11410,7 +11462,7 @@
 
     if-eqz v15, :cond_3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v2
 
@@ -11441,7 +11493,7 @@
 
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -11466,7 +11518,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -11492,29 +11544,29 @@
 
     move-result-object v4
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v6
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zV()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zU()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zV()J
 
     move-result-wide v9
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zX()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
 
     move-result-wide v11
 
     const/4 v13, 0x0
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zY()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zX()Z
 
     move-result v16
 
@@ -11532,7 +11584,7 @@
 
     move-result-object v16
 
-    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->Ae()J
+    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->Ad()J
 
     move-result-wide v17
 
@@ -11540,17 +11592,17 @@
 
     const/16 v21, 0x0
 
-    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
+    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->Ae()Z
 
     move-result v22
 
-    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->Ag()Z
+    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
 
     move-result v23
 
     const/16 v24, 0x0
 
-    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual/range {v25 .. v25}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v25
 
@@ -11568,7 +11620,7 @@
     :goto_1
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -11586,9 +11638,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzh;->aYe:Ljava/lang/String;
 
@@ -11642,7 +11694,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -11678,7 +11730,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -11693,7 +11745,7 @@
     :cond_2
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -11703,7 +11755,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -11715,7 +11767,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -11724,7 +11776,7 @@
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/dr;->g(Lcom/google/android/gms/measurement/internal/zzh;)Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -11734,7 +11786,7 @@
 
     invoke-virtual {v0, p2, v1}, Lcom/google/android/gms/measurement/internal/el;->L(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -11742,7 +11794,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -11752,7 +11804,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v1
 
@@ -11766,7 +11818,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -11777,7 +11829,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -11807,9 +11859,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzh;->aYe:Ljava/lang/String;
 
@@ -11839,7 +11891,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -11848,7 +11900,7 @@
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/dr;->g(Lcom/google/android/gms/measurement/internal/zzh;)Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -11866,7 +11918,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -11878,7 +11930,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -11892,7 +11944,7 @@
 
     invoke-virtual {v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -11908,7 +11960,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -11937,16 +11989,21 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzad;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object v1
 
+    move-object v3, v1
+
+    goto :goto_0
+
     :cond_3
     move-object v3, v1
 
+    :goto_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v1
 
@@ -11978,12 +12035,12 @@
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/dr;->c(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_4
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -11999,7 +12056,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -12014,8 +12071,8 @@
     invoke-virtual {p2, v0, v1, p1}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_5
-    :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_1
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -12023,7 +12080,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -12034,7 +12091,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p2
 
@@ -12052,7 +12109,7 @@
 
     move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -12064,7 +12121,7 @@
 
     if-eqz v15, :cond_2
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v3
 
@@ -12074,7 +12131,7 @@
 
     if-eqz v3, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-direct {v0, v15}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/ed;)Ljava/lang/Boolean;
@@ -12091,7 +12148,7 @@
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -12103,7 +12160,6 @@
 
     move-result-object v2
 
-    :goto_0
     invoke-virtual {v3, v4, v2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     return-object v1
@@ -12117,29 +12173,29 @@
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v5
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zV()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zU()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zV()J
 
     move-result-wide v8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zX()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
 
     move-result-wide v10
 
     const/4 v12, 0x0
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zY()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ed;->zX()Z
 
     move-result v13
 
@@ -12153,7 +12209,7 @@
 
     move-object/from16 v15, v16
 
-    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->Ae()J
+    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->Ad()J
 
     move-result-wide v16
 
@@ -12161,17 +12217,17 @@
 
     const/16 v20, 0x0
 
-    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
+    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->Ae()Z
 
     move-result v21
 
-    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->Ag()Z
+    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
 
     move-result v22
 
     const/16 v23, 0x0
 
-    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual/range {v24 .. v24}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v24
 
@@ -12182,10 +12238,10 @@
     return-object v25
 
     :cond_2
-    :goto_1
+    :goto_0
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -12193,7 +12249,9 @@
 
     const-string v4, "No app data available; dropping"
 
-    goto :goto_0
+    invoke-virtual {v3, v4, v2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    return-object v1
 .end method
 
 .method final d(Lcom/google/android/gms/measurement/internal/zzh;)V
@@ -12218,7 +12276,7 @@
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -12226,9 +12284,9 @@
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     :try_start_0
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -12335,7 +12393,7 @@
 
     if-lez v5, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -12356,7 +12414,7 @@
     :catch_0
     move-exception v2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -12430,9 +12488,9 @@
 
     move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -12459,7 +12517,7 @@
     return-void
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -12493,13 +12551,13 @@
 
     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ed;->X(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
     invoke-virtual {v5, v0}, Lcom/google/android/gms/measurement/internal/el;->c(Lcom/google/android/gms/measurement/internal/ed;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/al;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zA()Lcom/google/android/gms/measurement/internal/al;
 
     move-result-object v0
 
@@ -12525,7 +12583,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -12546,7 +12604,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -12574,14 +12632,14 @@
     move v15, v0
 
     :goto_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -12597,7 +12655,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzh;->aYe:Ljava/lang/String;
 
@@ -12607,7 +12665,7 @@
 
     iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzh;->bkb:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v10
 
@@ -12619,7 +12677,7 @@
 
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -12627,7 +12685,7 @@
 
     const-string v8, "New GMP App Id passed in. Removing cached database data. appId"
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v9
 
@@ -12637,17 +12695,17 @@
 
     invoke-virtual {v7, v8, v9}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v7
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {v8}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
     :try_end_0
@@ -12754,7 +12812,7 @@
 
     if-lez v10, :cond_5
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -12777,7 +12835,7 @@
     move-exception v0
 
     :try_start_2
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -12798,7 +12856,7 @@
     :cond_6
     if-eqz v0, :cond_8
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v7
 
@@ -12808,7 +12866,7 @@
 
     if-eqz v11, :cond_7
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v7
 
@@ -12824,7 +12882,7 @@
 
     const-string v8, "_pv"
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -12846,19 +12904,18 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/measurement/internal/zzad;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzaa;Ljava/lang/String;J)V
 
-    :goto_2
     invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v7
 
     if-eqz v7, :cond_8
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v7
 
@@ -12876,7 +12933,7 @@
 
     const-string v8, "_pv"
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -12898,15 +12955,15 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/measurement/internal/zzad;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzaa;Ljava/lang/String;J)V
 
-    goto :goto_2
+    invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
     :cond_8
-    :goto_3
+    :goto_2
     invoke-virtual/range {p0 .. p1}, Lcom/google/android/gms/measurement/internal/dr;->g(Lcom/google/android/gms/measurement/internal/zzh;)Lcom/google/android/gms/measurement/internal/ed;
 
     if-nez v15, :cond_9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -12914,17 +12971,16 @@
 
     const-string v8, "_f"
 
-    :goto_4
     invoke-virtual {v0, v7, v8}, Lcom/google/android/gms/measurement/internal/el;->K(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/eu;
 
     move-result-object v0
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_9
     if-ne v15, v14, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -12932,12 +12988,16 @@
 
     const-string v8, "_v"
 
-    goto :goto_4
+    invoke-virtual {v0, v7, v8}, Lcom/google/android/gms/measurement/internal/el;->K(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/eu;
+
+    move-result-object v0
+
+    goto :goto_3
 
     :cond_a
     move-object/from16 v0, v16
 
-    :goto_5
+    :goto_3
     if-nez v0, :cond_17
 
     const-wide/32 v7, 0x36ee80
@@ -12988,7 +13048,7 @@
 
     if-eqz v0, :cond_b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
@@ -12999,9 +13059,9 @@
     invoke-virtual {v0, v7}, Lcom/google/android/gms/measurement/internal/ae;->cz(Ljava/lang/String;)V
 
     :cond_b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     new-instance v15, Landroid/os/Bundle;
 
@@ -13066,7 +13126,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -13084,7 +13144,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
     :cond_d
     :try_start_3
@@ -13109,7 +13169,7 @@
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_3 .. :try_end_3} :catch_1
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    goto :goto_6
+    goto :goto_4
 
     :catch_1
     move-exception v0
@@ -13117,7 +13177,7 @@
     :try_start_4
     iget-object v7, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -13135,7 +13195,7 @@
 
     move-object/from16 v0, v16
 
-    :goto_6
+    :goto_4
     if-eqz v0, :cond_10
 
     iget-wide v7, v0, Landroid/content/pm/PackageInfo;->firstInstallTime:J
@@ -13158,12 +13218,12 @@
 
     const/4 v0, 0x0
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_e
     const/4 v0, 0x1
 
-    :goto_7
+    :goto_5
     new-instance v12, Lcom/google/android/gms/measurement/internal/zzfh;
 
     const-string v8, "_fi"
@@ -13172,12 +13232,12 @@
 
     move-wide v9, v13
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_f
     move-wide v9, v3
 
-    :goto_8
+    :goto_6
     invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v11
@@ -13216,12 +13276,14 @@
 
     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/common/c/b;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
 
-    move-result-object v0
+    move-result-object v16
     :try_end_5
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_5 .. :try_end_5} :catch_2
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    goto :goto_9
+    move-object/from16 v0, v16
+
+    goto :goto_7
 
     :catch_2
     move-exception v0
@@ -13229,7 +13291,7 @@
     :try_start_6
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -13247,7 +13309,7 @@
 
     move-object/from16 v0, v16
 
-    :goto_9
+    :goto_7
     if-eqz v0, :cond_12
 
     iget v3, v0, Landroid/content/pm/ApplicationInfo;->flags:I
@@ -13274,8 +13336,8 @@
     invoke-virtual {v15, v0, v13, v14}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_12
-    :goto_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_8
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -13283,9 +13345,9 @@
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const-string v4, "first_open_count"
 
@@ -13322,7 +13384,7 @@
 
     invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_14
     move-wide v13, v11
@@ -13349,9 +13411,9 @@
 
     invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/zzfh;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     new-instance v0, Landroid/os/Bundle;
 
@@ -13405,7 +13467,7 @@
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
     :cond_16
-    :goto_b
+    :goto_9
     new-instance v0, Landroid/os/Bundle;
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
@@ -13430,10 +13492,9 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/measurement/internal/zzad;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzaa;Ljava/lang/String;J)V
 
-    :goto_c
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_d
+    goto :goto_a
 
     :cond_17
     iget-boolean v0, v2, Lcom/google/android/gms/measurement/internal/zzh;->bph:Z
@@ -13460,11 +13521,11 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/measurement/internal/zzad;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzaa;Ljava/lang/String;J)V
 
-    goto :goto_c
+    invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dr;->b(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
     :cond_18
-    :goto_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_a
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -13472,7 +13533,7 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -13483,7 +13544,7 @@
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -13497,9 +13558,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -13507,7 +13568,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -13519,7 +13580,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -13543,11 +13604,11 @@
 
     iget-object v3, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->zQ()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/lang/String;
 
     move-result-object v3
 
@@ -13555,13 +13616,12 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ed;->cW(Ljava/lang/String;)V
 
-    :goto_0
     const/4 v1, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zR()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zQ()Ljava/lang/String;
 
     move-result-object v3
 
@@ -13575,22 +13635,24 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ea;->zQ()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/lang/String;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ed;->cT(Ljava/lang/String;)V
 
+    const/4 v1, 0x1
+
     goto :goto_0
 
     :cond_1
     const/4 v1, 0x0
 
-    :goto_1
+    :goto_0
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->aYe:Ljava/lang/String;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->getGmpAppId()Ljava/lang/String;
@@ -13612,7 +13674,7 @@
     :cond_2
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->bkb:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v4
 
@@ -13666,7 +13728,7 @@
 
     iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->bkc:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zV()J
 
     move-result-wide v5
 
@@ -13691,7 +13753,7 @@
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->aYT:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v4
 
@@ -13710,7 +13772,7 @@
     :cond_6
     iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->boS:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v5
 
@@ -13731,7 +13793,7 @@
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->aYR:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zV()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zU()Ljava/lang/String;
 
     move-result-object v4
 
@@ -13750,7 +13812,7 @@
     :cond_8
     iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->boT:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zX()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
 
     move-result-wide v5
 
@@ -13767,7 +13829,7 @@
     :cond_9
     iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->boU:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zY()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->zX()Z
 
     move-result v4
 
@@ -13775,7 +13837,7 @@
 
     iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzh;->boU:Z
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ed;->Z(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ed;->Y(Z)V
 
     const/4 v1, 0x1
 
@@ -13790,7 +13852,7 @@
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->aZb:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Ad()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Ac()Ljava/lang/String;
 
     move-result-object v4
 
@@ -13809,7 +13871,7 @@
     :cond_b
     iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->bjZ:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Ae()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Ad()J
 
     move-result-wide v5
 
@@ -13826,7 +13888,7 @@
     :cond_c
     iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->boV:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Ae()Z
 
     move-result v4
 
@@ -13834,14 +13896,14 @@
 
     iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzh;->boV:Z
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ed;->aa(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ed;->Z(Z)V
 
     const/4 v1, 0x1
 
     :cond_d
     iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzh;->boW:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Ag()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
 
     move-result v4
 
@@ -13849,14 +13911,14 @@
 
     iget-boolean p1, p1, Lcom/google/android/gms/measurement/internal/zzh;->boW:Z
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/ed;->ab(Z)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/ed;->aa(Z)V
 
     const/4 v1, 0x1
 
     :cond_e
     if-eqz v1, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object p1
 
@@ -13883,7 +13945,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -13917,7 +13979,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -13938,18 +14000,18 @@
     return-object p1
 .end method
 
-.method final kz()V
+.method final ky()V
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     return-void
 .end method
@@ -13961,21 +14023,21 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->Ar()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->Aq()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -13993,7 +14055,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -14001,7 +14063,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -14012,48 +14074,48 @@
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
 
     return-void
 .end method
 
-.method public final tK()Lcom/google/android/gms/common/util/d;
+.method public final tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final zC()Lcom/google/android/gms/measurement/internal/s;
+.method public final zB()Lcom/google/android/gms/measurement/internal/s;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boe:Lcom/google/android/gms/measurement/internal/s;
@@ -14065,7 +14127,7 @@
     return-object v0
 .end method
 
-.method final zF()V
+.method final zE()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aQH:Z
@@ -14084,14 +14146,14 @@
     throw v0
 .end method
 
-.method final zH()V
+.method final zG()V
     .locals 14
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     const/4 v0, 0x1
 
@@ -14102,17 +14164,17 @@
     :try_start_0
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v2
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ch;->bnB:Ljava/lang/Boolean;
 
-    if-nez v2, :cond_1
+    if-nez v2, :cond_0
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -14120,30 +14182,27 @@
 
     const-string v2, "Upload data called on the client side before use of service was decided"
 
-    :goto_0
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :cond_0
-    :goto_1
     iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bor:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
 
     return-void
 
-    :cond_1
+    :cond_0
     :try_start_1
     invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v2
 
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -14151,42 +14210,57 @@
 
     const-string v2, "Upload called in the client side when service should be used"
 
-    goto :goto_0
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :cond_2
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bor:Z
+
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+
+    return-void
+
+    :cond_1
+    :try_start_2
     iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bol:J
 
     const-wide/16 v4, 0x0
 
     cmp-long v6, v2, v4
 
-    if-lez v6, :cond_3
+    if-lez v6, :cond_2
 
-    :goto_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto :goto_1
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bor:Z
 
-    :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+
+    return-void
+
+    :cond_2
+    :try_start_3
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bov:Ljava/util/List;
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_3
 
     const/4 v2, 0x1
 
-    goto :goto_3
+    goto :goto_0
 
-    :cond_4
+    :cond_3
     const/4 v2, 0x0
 
-    :goto_3
-    if-eqz v2, :cond_5
+    :goto_0
+    if-eqz v2, :cond_4
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -14194,22 +14268,31 @@
 
     const-string v2, "Uploading requested multiple times"
 
-    goto :goto_0
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bor:Z
+
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+
+    return-void
+
+    :cond_4
+    :try_start_4
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/s;->qX()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/s;->qW()Z
 
     move-result v2
 
-    if-nez v2, :cond_6
+    if-nez v2, :cond_5
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -14219,12 +14302,21 @@
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto :goto_2
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    :cond_6
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bor:Z
+
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+
+    return-void
+
+    :cond_5
+    :try_start_5
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v2
 
@@ -14232,19 +14324,17 @@
 
     move-result-wide v2
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ak()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Aj()J
 
     move-result-wide v6
 
-    const/4 v8, 0x0
-
     sub-long v6, v2, v6
 
     invoke-direct {p0, v6, v7}, Lcom/google/android/gms/measurement/internal/dr;->aC(J)Z
 
     iget-object v6, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v6
 
@@ -14256,11 +14346,11 @@
 
     cmp-long v8, v6, v4
 
-    if-eqz v8, :cond_7
+    if-eqz v8, :cond_6
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -14268,8 +14358,6 @@
 
     const-string v5, "Uploading events. Elapsed time since last upload attempt (ms)"
 
-    const/4 v8, 0x0
-
     sub-long v6, v2, v6
 
     invoke-static {v6, v7}, Ljava/lang/Math;->abs(J)J
@@ -14282,12 +14370,12 @@
 
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :cond_6
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/el;->Ap()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/el;->Ao()Ljava/lang/String;
 
     move-result-object v4
 
@@ -14303,19 +14391,19 @@
 
     cmp-long v5, v8, v6
 
-    if-nez v5, :cond_8
+    if-nez v5, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/el;->Aw()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/el;->Av()J
 
     move-result-wide v5
 
     iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/dr;->box:J
 
-    :cond_8
+    :cond_7
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
     iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
@@ -14340,7 +14428,7 @@
 
     move-result v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v7
 
@@ -14352,20 +14440,20 @@
 
     move-result v6
 
-    if-nez v6, :cond_0
+    if-nez v6, :cond_14
 
     invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v6
 
-    :cond_9
+    :cond_8
     invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v7
 
     const/4 v8, 0x0
 
-    if-eqz v7, :cond_a
+    if-eqz v7, :cond_9
 
     invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -14383,26 +14471,26 @@
 
     move-result v9
 
-    if-nez v9, :cond_9
+    if-nez v9, :cond_8
 
     iget-object v6, v7, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
 
-    goto :goto_4
+    goto :goto_1
 
-    :cond_a
+    :cond_9
     move-object v6, v8
 
-    :goto_4
-    if-eqz v6, :cond_c
+    :goto_1
+    if-eqz v6, :cond_b
 
     const/4 v7, 0x0
 
-    :goto_5
+    :goto_2
     invoke-interface {v5}, Ljava/util/List;->size()I
 
     move-result v9
 
-    if-ge v7, v9, :cond_c
+    if-ge v7, v9, :cond_b
 
     invoke-interface {v5, v7}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -14420,7 +14508,7 @@
 
     move-result v10
 
-    if-nez v10, :cond_b
+    if-nez v10, :cond_a
 
     iget-object v9, v9, Lcom/google/android/gms/internal/measurement/ct;->aYW:Ljava/lang/String;
 
@@ -14428,21 +14516,21 @@
 
     move-result v9
 
-    if-nez v9, :cond_b
+    if-nez v9, :cond_a
 
     invoke-interface {v5, v1, v7}, Ljava/util/List;->subList(II)Ljava/util/List;
 
     move-result-object v5
 
-    goto :goto_6
+    goto :goto_3
 
-    :cond_b
+    :cond_a
     add-int/lit8 v7, v7, 0x1
 
-    goto :goto_5
+    goto :goto_2
 
-    :cond_c
-    :goto_6
+    :cond_b
+    :goto_3
     new-instance v6, Lcom/google/android/gms/internal/measurement/cs;
 
     invoke-direct {v6}, Lcom/google/android/gms/internal/measurement/cs;-><init>()V
@@ -14463,11 +14551,11 @@
 
     invoke-direct {v7, v9}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Am()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Al()Z
 
     move-result v9
 
-    if-eqz v9, :cond_d
+    if-eqz v9, :cond_c
 
     iget-object v9, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
@@ -14477,24 +14565,24 @@
 
     move-result v9
 
-    if-eqz v9, :cond_d
+    if-eqz v9, :cond_c
 
     const/4 v9, 0x1
 
-    goto :goto_7
+    goto :goto_4
 
-    :cond_d
+    :cond_c
     const/4 v9, 0x0
 
-    :goto_7
+    :goto_4
     const/4 v10, 0x0
 
-    :goto_8
+    :goto_5
     iget-object v11, v6, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
 
     array-length v11, v11
 
-    if-ge v10, v11, :cond_f
+    if-ge v10, v11, :cond_e
 
     iget-object v11, v6, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
 
@@ -14552,7 +14640,7 @@
 
     iput-object v12, v11, Lcom/google/android/gms/internal/measurement/ct;->aZc:Ljava/lang/Boolean;
 
-    if-nez v9, :cond_e
+    if-nez v9, :cond_d
 
     iget-object v11, v6, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
 
@@ -14560,15 +14648,15 @@
 
     iput-object v8, v11, Lcom/google/android/gms/internal/measurement/ct;->aZl:Ljava/lang/String;
 
-    :cond_e
+    :cond_d
     add-int/lit8 v10, v10, 0x1
 
-    goto :goto_8
+    goto :goto_5
 
-    :cond_f
+    :cond_e
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -14578,9 +14666,9 @@
 
     move-result v5
 
-    if-eqz v5, :cond_10
+    if-eqz v5, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v5
 
@@ -14588,8 +14676,8 @@
 
     move-result-object v8
 
-    :cond_10
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    :cond_f
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v5
 
@@ -14606,10 +14694,10 @@
     move-object v12, v5
 
     check-cast v12, Ljava/lang/String;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    :try_start_2
+    :try_start_6
     new-instance v10, Ljava/net/URL;
 
     invoke-direct {v10, v12}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
@@ -14618,8 +14706,16 @@
 
     move-result v5
 
-    xor-int/2addr v5, v0
+    if-nez v5, :cond_10
 
+    const/4 v5, 0x1
+
+    goto :goto_6
+
+    :cond_10
+    const/4 v5, 0x0
+
+    :goto_6
     invoke-static {v5}, Lcom/google/android/gms/common/internal/q;->checkArgument(Z)V
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dr;->bov:Ljava/util/List;
@@ -14628,7 +14724,7 @@
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -14638,7 +14734,7 @@
 
     invoke-virtual {v5, v7}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto :goto_9
+    goto :goto_7
 
     :cond_11
     new-instance v5, Ljava/util/ArrayList;
@@ -14647,10 +14743,10 @@
 
     iput-object v5, p0, Lcom/google/android/gms/measurement/internal/dr;->bov:Ljava/util/List;
 
-    :goto_9
+    :goto_7
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v5
 
@@ -14675,7 +14771,7 @@
     :cond_12
     iget-object v3, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -14693,7 +14789,7 @@
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boq:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object v6
 
@@ -14701,9 +14797,9 @@
 
     invoke-direct {v11, p0, v4}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dr;Ljava/lang/String;)V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-static {v10}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -14711,7 +14807,7 @@
 
     invoke-static {v11}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -14730,17 +14826,17 @@
     invoke-direct/range {v5 .. v11}, Lcom/google/android/gms/measurement/internal/v;-><init>(Lcom/google/android/gms/measurement/internal/s;Ljava/lang/String;Ljava/net/URL;[BLjava/util/Map;Lcom/google/android/gms/measurement/internal/t;)V
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/am;->i(Ljava/lang/Runnable;)V
-    :try_end_2
-    .catch Ljava/net/MalformedURLException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    :try_end_6
+    .catch Ljava/net/MalformedURLException; {:try_start_6 .. :try_end_6} :catch_0
+    .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    goto/16 :goto_1
+    goto :goto_8
 
     :catch_0
-    :try_start_3
+    :try_start_7
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -14754,21 +14850,19 @@
 
     invoke-virtual {v0, v2, v3, v12}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto/16 :goto_1
+    goto :goto_8
 
     :cond_13
     iput-wide v6, p0, Lcom/google/android/gms/measurement/internal/dr;->box:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ak()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Aj()J
 
     move-result-wide v4
 
-    const/4 v6, 0x0
-
     sub-long/2addr v2, v4
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/el;->aI(J)Ljava/lang/String;
@@ -14779,9 +14873,9 @@
 
     move-result v2
 
-    if-nez v2, :cond_0
+    if-nez v2, :cond_14
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -14789,36 +14883,44 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_14
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/dr;->a(Lcom/google/android/gms/measurement/internal/ed;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
-    goto/16 :goto_1
+    :cond_14
+    :goto_8
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bor:Z
+
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+
+    return-void
 
     :catchall_0
     move-exception v0
 
     iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bor:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
 
     throw v0
+
+    return-void
 .end method
 
-.method final zJ()V
+.method final zI()V
     .locals 20
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zN()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zM()Z
 
     move-result v1
 
@@ -14837,7 +14939,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -14863,7 +14965,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -14877,13 +14979,13 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/w;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/w;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/w;->unregister()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()Lcom/google/android/gms/measurement/internal/dm;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/dm;
 
     move-result-object v1
 
@@ -14897,13 +14999,13 @@
     :cond_2
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->zt()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->zs()Z
 
     move-result v1
 
     if-eqz v1, :cond_12
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zH()Z
 
     move-result v1
 
@@ -14914,7 +15016,7 @@
     :cond_3
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -14938,21 +15040,21 @@
 
     move-result-wide v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/el;->Av()Z
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/el;->Au()Z
 
     move-result v7
 
     if-nez v7, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/el;->Aq()Z
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/el;->Ap()Z
 
     move-result v7
 
@@ -14976,7 +15078,7 @@
 
     iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ar;->bmi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ei;->Al()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ei;->Ak()Ljava/lang/String;
 
     move-result-object v9
 
@@ -14996,17 +15098,6 @@
 
     sget-object v9, Lcom/google/android/gms/measurement/internal/e;->bjh:Lcom/google/android/gms/measurement/internal/e$a;
 
-    goto :goto_2
-
-    :cond_6
-    sget-object v9, Lcom/google/android/gms/measurement/internal/e;->bjg:Lcom/google/android/gms/measurement/internal/e$a;
-
-    goto :goto_2
-
-    :cond_7
-    sget-object v9, Lcom/google/android/gms/measurement/internal/e;->bjf:Lcom/google/android/gms/measurement/internal/e$a;
-
-    :goto_2
     invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
 
     move-result-object v9
@@ -15021,9 +15112,48 @@
 
     move-result-wide v9
 
+    goto :goto_2
+
+    :cond_6
+    sget-object v9, Lcom/google/android/gms/measurement/internal/e;->bjg:Lcom/google/android/gms/measurement/internal/e$a;
+
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/lang/Long;
+
+    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v9
+
+    invoke-static {v3, v4, v9, v10}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v9
+
+    goto :goto_2
+
+    :cond_7
+    sget-object v9, Lcom/google/android/gms/measurement/internal/e;->bjf:Lcom/google/android/gms/measurement/internal/e$a;
+
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/lang/Long;
+
+    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v9
+
+    invoke-static {v3, v4, v9, v10}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v9
+
+    :goto_2
     iget-object v11, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v11
 
@@ -15035,7 +15165,7 @@
 
     iget-object v13, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v13
 
@@ -15045,23 +15175,23 @@
 
     move-result-wide v13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v15
 
     move-wide/from16 v16, v9
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/el;->As()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/el;->Ar()J
 
     move-result-wide v8
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v10
 
     move-wide/from16 v18, v5
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/el;->At()J
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/el;->As()J
 
     move-result-wide v5
 
@@ -15071,16 +15201,13 @@
 
     cmp-long v8, v5, v3
 
-    if-nez v8, :cond_9
+    if-nez v8, :cond_8
 
-    :cond_8
     move-wide v8, v3
 
     goto/16 :goto_5
 
-    :cond_9
-    const/4 v8, 0x0
-
+    :cond_8
     sub-long/2addr v5, v1
 
     invoke-static {v5, v6}, Ljava/lang/Math;->abs(J)J
@@ -15111,11 +15238,11 @@
 
     add-long v10, v5, v18
 
-    if-eqz v7, :cond_a
+    if-eqz v7, :cond_9
 
     cmp-long v7, v8, v3
 
-    if-lez v7, :cond_a
+    if-lez v7, :cond_9
 
     invoke-static {v5, v6, v8, v9}, Ljava/lang/Math;->min(JJ)J
 
@@ -15123,8 +15250,8 @@
 
     add-long v10, v10, v16
 
-    :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    :cond_9
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v7
 
@@ -15134,13 +15261,13 @@
 
     move-result v7
 
-    if-nez v7, :cond_b
+    if-nez v7, :cond_a
 
     add-long/2addr v8, v12
 
     goto :goto_3
 
-    :cond_b
+    :cond_a
     move-wide v8, v10
 
     :goto_3
@@ -15179,7 +15306,7 @@
 
     move-result v6
 
-    if-ge v5, v6, :cond_8
+    if-ge v5, v6, :cond_c
 
     const-wide/16 v6, 0x1
 
@@ -15207,15 +15334,18 @@
 
     cmp-long v6, v8, v1
 
-    if-lez v6, :cond_c
+    if-lez v6, :cond_b
 
     goto :goto_5
 
-    :cond_c
+    :cond_b
     add-int/lit8 v5, v5, 0x1
 
     goto :goto_4
 
+    :cond_c
+    move-wide v8, v3
+
     :cond_d
     :goto_5
     cmp-long v1, v8, v3
@@ -15224,7 +15354,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -15234,13 +15364,13 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/w;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/w;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/w;->unregister()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()Lcom/google/android/gms/measurement/internal/dm;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/dm;
 
     move-result-object v1
 
@@ -15249,11 +15379,11 @@
     return-void
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/s;->qX()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/s;->qW()Z
 
     move-result v1
 
@@ -15261,7 +15391,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -15271,13 +15401,13 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/w;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/w;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/w;->uL()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/w;->uK()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()Lcom/google/android/gms/measurement/internal/dm;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/dm;
 
     move-result-object v1
 
@@ -15288,7 +15418,7 @@
     :cond_f
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -15314,7 +15444,7 @@
 
     move-result-wide v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v7
 
@@ -15331,7 +15461,7 @@
     move-result-wide v8
 
     :cond_10
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/w;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/w;
 
     move-result-object v1
 
@@ -15339,7 +15469,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -15371,7 +15501,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -15379,7 +15509,7 @@
 
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v2
 
@@ -15392,7 +15522,7 @@
     :cond_11
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -15406,7 +15536,7 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()Lcom/google/android/gms/measurement/internal/dm;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/dm;
 
     move-result-object v1
 
@@ -15418,7 +15548,7 @@
     :goto_6
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -15428,13 +15558,13 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/w;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/w;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/w;->unregister()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()Lcom/google/android/gms/measurement/internal/dm;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->zD()Lcom/google/android/gms/measurement/internal/dm;
 
     move-result-object v1
 
@@ -15443,14 +15573,14 @@
     return-void
 .end method
 
-.method final zM()V
+.method final zL()V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bok:Z
 
@@ -15458,7 +15588,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -15468,17 +15598,17 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zN()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zM()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zL()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->zK()Z
 
     move-result v0
 
@@ -15492,21 +15622,21 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yY()I
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/i;->yX()I
 
     move-result v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->ky()V
 
     if-le v0, v1, :cond_0
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -15514,7 +15644,6 @@
 
     const-string v3, "Panic: can\'t downgrade version. Previous, current version"
 
-    :goto_0
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
@@ -15525,7 +15654,7 @@
 
     invoke-virtual {v2, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     if-ge v0, v1, :cond_2
@@ -15540,7 +15669,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -15548,12 +15677,22 @@
 
     const-string v3, "Storage version upgraded. Previous, current version"
 
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-virtual {v2, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :cond_1
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dr;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -15561,21 +15700,29 @@
 
     const-string v3, "Storage version upgrade failed. Previous, current version"
 
-    goto :goto_0
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-virtual {v2, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_2
-    :goto_1
+    :goto_0
     const/4 v0, 0x1
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bok:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
 
     :cond_3
     return-void
 .end method
 
-.method public final zd()Lcom/google/android/gms/measurement/internal/dx;
+.method public final zc()Lcom/google/android/gms/measurement/internal/dx;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boj:Lcom/google/android/gms/measurement/internal/dx;
@@ -15587,7 +15734,7 @@
     return-object v0
 .end method
 
-.method public final ze()Lcom/google/android/gms/measurement/internal/ef;
+.method public final zd()Lcom/google/android/gms/measurement/internal/ef;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->boi:Lcom/google/android/gms/measurement/internal/ef;
@@ -15599,7 +15746,7 @@
     return-object v0
 .end method
 
-.method public final zf()Lcom/google/android/gms/measurement/internal/el;
+.method public final ze()Lcom/google/android/gms/measurement/internal/el;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->bof:Lcom/google/android/gms/measurement/internal/el;
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 f4d436acc8..08389d3207 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
@@ -74,7 +74,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->boC:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -91,7 +91,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->boC:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
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 5800412db1..712af2bdc5 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
@@ -88,7 +88,7 @@
 
     const-string v0, "param_name"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v1
 
@@ -861,7 +861,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -872,6 +872,8 @@
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method final G([B)[B
@@ -908,7 +910,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -973,7 +975,7 @@
 
     :catch_0
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1023,7 +1025,7 @@
 
     const-string v1, "event_name"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -1106,7 +1108,7 @@
 
     const-string v1, "property_name"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -1181,7 +1183,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1240,7 +1242,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1257,7 +1259,7 @@
     .locals 2
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v0
 
@@ -1271,7 +1273,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1280,7 +1282,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1310,7 +1312,7 @@
 
     iget-object v2, v0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
 
-    if-eqz v2, :cond_b
+    if-eqz v2, :cond_c
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/cs;->aYC:[Lcom/google/android/gms/internal/measurement/ct;
 
@@ -1319,13 +1321,13 @@
     const/4 v4, 0x0
 
     :goto_0
-    if-ge v4, v2, :cond_b
+    if-ge v4, v2, :cond_c
 
     aget-object v5, v0, v4
 
-    if-eqz v5, :cond_a
+    if-eqz v5, :cond_b
 
-    if-eqz v5, :cond_a
+    if-eqz v5, :cond_b
 
     const/4 v6, 0x1
 
@@ -1580,7 +1582,7 @@
 
     const-string v12, "name"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v13
 
@@ -1681,7 +1683,7 @@
     :cond_5
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ct;->aYF:[Lcom/google/android/gms/internal/measurement/cq;
 
-    if-eqz v5, :cond_9
+    if-eqz v5, :cond_a
 
     array-length v7, v5
 
@@ -1702,7 +1704,7 @@
 
     const-string v11, "name"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v12
 
@@ -1757,7 +1759,7 @@
 
     const-string v15, "name"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v3
 
@@ -1817,18 +1819,24 @@
     :cond_9
     const/4 v3, 0x1
 
+    goto :goto_5
+
+    :cond_a
+    const/4 v3, 0x1
+
+    :goto_5
     invoke-static {v1, v3}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/StringBuilder;I)V
 
     const-string v3, "}\n"
 
     invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :cond_a
+    :cond_b
     add-int/lit8 v4, v4, 0x1
 
     goto/16 :goto_0
 
-    :cond_b
+    :cond_c
     const-string v0, "}\n"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -1858,7 +1866,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v1
 
@@ -1898,103 +1906,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -2002,6 +2002,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -2010,30 +2018,30 @@
     return-void
 .end method
 
-.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/dx;
+.method public final bridge synthetic zc()Lcom/google/android/gms/measurement/internal/dx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/ef;
+.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/ef;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/ef;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/ef;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic zf()Lcom/google/android/gms/measurement/internal/el;
+.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/el;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e$a.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e$a.smali
index b3522dc9e8..b0f9a994ee 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e$a.smali
@@ -237,7 +237,7 @@
     return-object v0
 .end method
 
-.method private static yR()V
+.method private static yQ()V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -438,9 +438,11 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
-.method static synthetic yS()V
+.method static synthetic yR()V
     .locals 7
 
     const-class v0, Lcom/google/android/gms/measurement/internal/e$a;
@@ -467,7 +469,7 @@
 
     check-cast v2, Lcom/google/android/gms/measurement/internal/e$a;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yQ()Lcom/google/android/gms/internal/measurement/do;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yP()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v3
 
@@ -511,7 +513,7 @@
 
     check-cast v2, Lcom/google/android/gms/measurement/internal/e$a;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yQ()Lcom/google/android/gms/internal/measurement/do;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yP()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v3
 
@@ -551,7 +553,7 @@
 
     check-cast v2, Lcom/google/android/gms/measurement/internal/e$a;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yQ()Lcom/google/android/gms/internal/measurement/do;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yP()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v3
 
@@ -595,7 +597,7 @@
 
     check-cast v2, Lcom/google/android/gms/measurement/internal/e$a;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yQ()Lcom/google/android/gms/internal/measurement/do;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yP()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v3
 
@@ -639,7 +641,7 @@
 
     check-cast v2, Lcom/google/android/gms/measurement/internal/e$a;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yQ()Lcom/google/android/gms/internal/measurement/do;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e;->yP()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v3
 
@@ -676,6 +678,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 
@@ -719,7 +723,7 @@
     return-object v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e$a;->yR()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e$a;->yQ()V
 
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e$a;->bjU:Lcom/google/android/gms/internal/measurement/de;
@@ -788,7 +792,7 @@
     return-object p1
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e$a;->yR()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e$a;->yQ()V
 
     :try_start_0
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/e$a;->bjU:Lcom/google/android/gms/internal/measurement/de;
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 b8752ad09f..4aab4fb874 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
@@ -1421,12 +1421,12 @@
 
     sput-object p0, Lcom/google/android/gms/measurement/internal/e;->biz:Lcom/google/android/gms/measurement/internal/eg;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/e$a;->yS()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/e$a;->yR()V
 
     return-void
 .end method
 
-.method static synthetic yQ()Lcom/google/android/gms/internal/measurement/do;
+.method static synthetic yP()Lcom/google/android/gms/internal/measurement/do;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/e;->biF:Lcom/google/android/gms/internal/measurement/do;
@@ -1454,7 +1454,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->kI()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kH()Lcom/google/android/gms/common/c;
 
     move-result-object v1
 
@@ -1491,7 +1491,7 @@
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/e;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
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 e05003f588..a9470c4b8c 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
@@ -74,9 +74,9 @@
 
     array-length v0, p0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-lez v0, :cond_0
 
@@ -94,30 +94,30 @@
 
     array-length v0, p0
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v0, v1
 
     :goto_1
     if-ltz v0, :cond_1
 
-    array-length v2, p0
+    array-length v1, p0
 
-    add-int/lit8 v2, v2, -0x8
+    add-int/lit8 v1, v1, -0x8
 
-    if-lt v0, v2, :cond_1
+    if-lt v0, v1, :cond_1
 
-    aget-byte v2, p0, v0
+    aget-byte v1, p0, v0
 
-    int-to-long v5, v2
+    int-to-long v5, v1
 
     const-wide/16 v7, 0xff
 
     and-long/2addr v5, v7
 
-    shl-long/2addr v5, v1
+    shl-long/2addr v5, v2
 
     add-long/2addr v3, v5
 
-    add-int/lit8 v1, v1, 0x8
+    add-int/lit8 v2, v2, 0x8
 
     add-int/lit8 v0, v0, -0x1
 
@@ -134,7 +134,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -153,7 +153,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -180,7 +180,7 @@
 
     if-eq v1, v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -216,7 +216,7 @@
 
     if-nez v5, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -547,27 +547,27 @@
     :cond_0
     instance-of v1, p4, Ljava/lang/Long;
 
-    if-nez v1, :cond_b
+    if-nez v1, :cond_c
 
     instance-of v1, p4, Ljava/lang/Float;
 
-    if-nez v1, :cond_b
+    if-nez v1, :cond_c
 
     instance-of v1, p4, Ljava/lang/Integer;
 
-    if-nez v1, :cond_b
+    if-nez v1, :cond_c
 
     instance-of v1, p4, Ljava/lang/Byte;
 
-    if-nez v1, :cond_b
+    if-nez v1, :cond_c
 
     instance-of v1, p4, Ljava/lang/Short;
 
-    if-nez v1, :cond_b
+    if-nez v1, :cond_c
 
     instance-of v1, p4, Ljava/lang/Boolean;
 
-    if-nez v1, :cond_b
+    if-nez v1, :cond_c
 
     instance-of v1, p4, Ljava/lang/Double;
 
@@ -623,7 +623,7 @@
 
     if-nez v1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -675,7 +675,7 @@
 
     if-nez v1, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -713,7 +713,7 @@
 
     if-le p5, p3, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -734,6 +734,9 @@
     return v2
 
     :cond_b
+    return v0
+
+    :cond_c
     :goto_2
     return v0
 .end method
@@ -916,7 +919,6 @@
 
     const-string v0, "com.google.android.gms.measurement.AppMeasurementJobService"
 
-    :goto_0
     invoke-static {p0, v0}, Lcom/google/android/gms/measurement/internal/ea;->i(Landroid/content/Context;Ljava/lang/String;)Z
 
     move-result p0
@@ -926,7 +928,11 @@
     :cond_0
     const-string v0, "com.google.android.gms.measurement.AppMeasurementService"
 
-    goto :goto_0
+    invoke-static {p0, v0}, Lcom/google/android/gms/measurement/internal/ea;->i(Landroid/content/Context;Ljava/lang/String;)Z
+
+    move-result p0
+
+    return p0
 .end method
 
 .method public static au(Ljava/lang/Object;)Ljava/lang/Object;
@@ -1062,6 +1068,8 @@
     :cond_0
     const/4 p0, 0x0
 
+    return-object p0
+
     :cond_1
     return-object p0
 .end method
@@ -1100,7 +1108,6 @@
 
     move-result-object p0
 
-    :goto_0
     check-cast p0, [Landroid/os/Bundle;
 
     return-object p0
@@ -1122,7 +1129,9 @@
 
     move-result-object p0
 
-    goto :goto_0
+    check-cast p0, [Landroid/os/Bundle;
+
+    return-object p0
 
     :cond_2
     const/4 p0, 0x0
@@ -1582,7 +1591,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -1590,12 +1599,14 @@
 
     const-string v0, "Package name not found"
 
+    invoke-virtual {p2, v0, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :catch_1
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -1603,10 +1614,10 @@
 
     const-string v0, "Error obtaining certificate"
 
-    :goto_0
     invoke-virtual {p2, v0, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
+    :goto_0
     const/4 p1, 0x1
 
     return p1
@@ -1627,7 +1638,6 @@
 
     const/4 p0, 0x1
 
-    :goto_0
     invoke-static {v1, p1, p0}, Lcom/google/android/gms/measurement/internal/ea;->a(ILjava/lang/Object;Z)Ljava/lang/Object;
 
     move-result-object p0
@@ -1641,15 +1651,19 @@
 
     if-eqz p0, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/16 v1, 0x64
 
-    :goto_1
+    :goto_0
     const/4 p0, 0x0
 
-    goto :goto_0
+    invoke-static {v1, p1, p0}, Lcom/google/android/gms/measurement/internal/ea;->a(ILjava/lang/Object;Z)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
 .end method
 
 .method static r(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1669,7 +1683,6 @@
 
     const/4 v0, 0x1
 
-    :goto_0
     invoke-static {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ea;->a(ILjava/lang/Object;Z)Ljava/lang/Object;
 
     move-result-object p0
@@ -1683,7 +1696,11 @@
 
     const/4 v0, 0x0
 
-    goto :goto_0
+    invoke-static {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ea;->a(ILjava/lang/Object;Z)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
 .end method
 
 
@@ -1695,7 +1712,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -1714,7 +1731,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -1737,7 +1754,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1775,7 +1792,7 @@
 
     if-nez v4, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1829,7 +1846,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -1859,7 +1876,7 @@
 
     if-nez p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1891,7 +1908,7 @@
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1932,7 +1949,7 @@
 
     const/4 v9, 0x0
 
-    if-eqz v7, :cond_13
+    if-eqz v7, :cond_18
 
     new-instance v10, Landroid/os/Bundle;
 
@@ -1955,7 +1972,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_14
+    if-eqz v0, :cond_19
 
     invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -1982,13 +1999,13 @@
     :cond_0
     const/4 v1, 0x0
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_1
     :goto_1
     const/16 v1, 0xe
 
-    if-eqz p5, :cond_4
+    if-eqz p5, :cond_5
 
     const-string v2, "event param"
 
@@ -1998,10 +2015,9 @@
 
     if-nez v2, :cond_2
 
-    :goto_2
     const/4 v2, 0x3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const-string v2, "event param"
@@ -2014,7 +2030,7 @@
 
     const/16 v2, 0xe
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     const-string v2, "event param"
@@ -2025,13 +2041,20 @@
 
     if-nez v2, :cond_4
 
+    const/4 v2, 0x3
+
     goto :goto_2
 
     :cond_4
     const/4 v2, 0x0
 
-    :goto_3
-    if-nez v2, :cond_7
+    goto :goto_2
+
+    :cond_5
+    const/4 v2, 0x0
+
+    :goto_2
+    if-nez v2, :cond_9
 
     const-string v2, "event param"
 
@@ -2039,48 +2062,54 @@
 
     move-result v2
 
-    if-nez v2, :cond_5
+    if-nez v2, :cond_6
 
-    :goto_4
     const/4 v1, 0x3
 
-    goto :goto_5
+    goto :goto_3
 
-    :cond_5
+    :cond_6
     const-string v2, "event param"
 
     invoke-virtual {v6, v2, v9, v14}, Lcom/google/android/gms/measurement/internal/ea;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
     move-result v2
 
-    if-nez v2, :cond_6
+    if-nez v2, :cond_7
 
-    goto :goto_5
+    goto :goto_3
 
-    :cond_6
+    :cond_7
     const-string v1, "event param"
 
     invoke-virtual {v6, v1, v15, v14}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;ILjava/lang/String;)Z
 
     move-result v1
 
-    if-nez v1, :cond_0
+    if-nez v1, :cond_8
 
-    goto :goto_4
+    const/4 v1, 0x3
 
-    :cond_7
+    goto :goto_3
+
+    :cond_8
+    const/4 v1, 0x0
+
+    goto :goto_3
+
+    :cond_9
     move v1, v2
 
-    :goto_5
+    :goto_3
     const/4 v5, 0x1
 
-    if-eqz v1, :cond_8
+    if-eqz v1, :cond_b
 
     invoke-static {v10, v1}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Bundle;I)Z
 
     move-result v2
 
-    if-eqz v2, :cond_11
+    if-eqz v2, :cond_a
 
     invoke-static {v14, v15, v5}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -2090,26 +2119,29 @@
 
     invoke-virtual {v10, v3, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    if-ne v1, v0, :cond_11
+    if-ne v1, v0, :cond_a
 
     invoke-static {v10, v14}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Bundle;Ljava/lang/Object;)V
 
-    goto/16 :goto_c
+    :cond_a
+    invoke-virtual {v10, v14}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
 
-    :cond_8
+    goto/16 :goto_8
+
+    :cond_b
     invoke-virtual {v7, v14}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    if-eqz p6, :cond_b
+    if-eqz p6, :cond_f
 
     const-string v0, "param"
 
     instance-of v1, v4, [Landroid/os/Parcelable;
 
-    if-eqz v1, :cond_9
+    if-eqz v1, :cond_c
 
     move-object v1, v4
 
@@ -2117,12 +2149,12 @@
 
     array-length v1, v1
 
-    goto :goto_6
+    goto :goto_4
 
-    :cond_9
+    :cond_c
     instance-of v1, v4, Ljava/util/ArrayList;
 
-    if-eqz v1, :cond_a
+    if-eqz v1, :cond_e
 
     move-object v1, v4
 
@@ -2132,12 +2164,12 @@
 
     move-result v1
 
-    :goto_6
+    :goto_4
     const/16 v2, 0x3e8
 
-    if-le v1, v2, :cond_a
+    if-le v1, v2, :cond_d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -2153,22 +2185,27 @@
 
     const/4 v0, 0x0
 
-    goto :goto_7
+    goto :goto_5
 
-    :cond_a
+    :cond_d
     const/4 v0, 0x1
 
-    :goto_7
-    if-nez v0, :cond_b
+    goto :goto_5
+
+    :cond_e
+    const/4 v0, 0x1
+
+    :goto_5
+    if-nez v0, :cond_f
 
     const/16 v0, 0x11
 
     const/4 v9, 0x1
 
-    goto :goto_a
+    goto :goto_7
 
-    :cond_b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    :cond_f
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
@@ -2180,22 +2217,22 @@
 
     move-result v0
 
-    if-eqz v0, :cond_c
+    if-eqz v0, :cond_10
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/ea;->cR(Ljava/lang/String;)Z
 
     move-result v0
 
-    if-nez v0, :cond_d
+    if-nez v0, :cond_11
 
-    :cond_c
+    :cond_10
     invoke-static {v14}, Lcom/google/android/gms/measurement/internal/ea;->cR(Ljava/lang/String;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_e
+    if-eqz v0, :cond_12
 
-    :cond_d
+    :cond_11
     const-string v1, "param"
 
     const/16 v16, 0x100
@@ -2208,16 +2245,15 @@
 
     const/4 v9, 0x1
 
-    :goto_8
     move/from16 v5, p6
 
     invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/ea;->a(Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;Z)Z
 
     move-result v0
 
-    goto :goto_9
+    goto :goto_6
 
-    :cond_e
+    :cond_12
     const/4 v9, 0x1
 
     const-string v1, "param"
@@ -2228,20 +2264,24 @@
 
     move-object v2, v14
 
-    goto :goto_8
+    move/from16 v5, p6
 
-    :goto_9
-    if-eqz v0, :cond_f
+    invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/ea;->a(Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;Z)Z
+
+    move-result v0
+
+    :goto_6
+    if-eqz v0, :cond_13
 
     const/4 v0, 0x0
 
-    goto :goto_a
+    goto :goto_7
 
-    :cond_f
+    :cond_13
     const/4 v0, 0x4
 
-    :goto_a
-    if-eqz v0, :cond_10
+    :goto_7
+    if-eqz v0, :cond_15
 
     const-string v1, "_ev"
 
@@ -2249,13 +2289,13 @@
 
     move-result v1
 
-    if-nez v1, :cond_10
+    if-nez v1, :cond_15
 
     invoke-static {v10, v0}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Bundle;I)Z
 
     move-result v0
 
-    if-eqz v0, :cond_11
+    if-eqz v0, :cond_14
 
     invoke-static {v14, v15, v9}, Lcom/google/android/gms/measurement/internal/ea;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -2271,25 +2311,26 @@
 
     invoke-static {v10, v0}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Bundle;Ljava/lang/Object;)V
 
-    goto :goto_c
+    :cond_14
+    invoke-virtual {v10, v14}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
 
-    :goto_b
+    :goto_8
     const/4 v9, 0x0
 
     goto/16 :goto_0
 
-    :cond_10
+    :cond_15
     invoke-static {v14}, Lcom/google/android/gms/measurement/internal/ea;->cM(Ljava/lang/String;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_12
+    if-eqz v0, :cond_17
 
     add-int/lit8 v13, v13, 0x1
 
     const/16 v0, 0x19
 
-    if-le v13, v0, :cond_12
+    if-le v13, v0, :cond_16
 
     const/16 v0, 0x30
 
@@ -2305,13 +2346,13 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -2321,7 +2362,7 @@
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -2335,21 +2376,29 @@
 
     invoke-static {v10, v0}, Lcom/google/android/gms/measurement/internal/ea;->a(Landroid/os/Bundle;I)Z
 
-    :cond_11
-    :goto_c
     invoke-virtual {v10, v14}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
 
-    goto :goto_b
+    const/4 v9, 0x0
 
-    :cond_12
+    goto/16 :goto_0
+
+    :cond_16
     move-object/from16 v3, p2
 
-    goto :goto_b
+    goto :goto_9
 
-    :cond_13
+    :cond_17
+    move-object/from16 v3, p2
+
+    :goto_9
+    const/4 v9, 0x0
+
+    goto/16 :goto_0
+
+    :cond_18
     const/4 v10, 0x0
 
-    :cond_14
+    :cond_19
     return-object v10
 .end method
 
@@ -2379,19 +2428,16 @@
 
     invoke-direct {v0, p3}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    :goto_0
-    move-object v4, v0
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     new-instance v0, Landroid/os/Bundle;
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    goto :goto_0
+    :goto_0
+    move-object v4, v0
 
-    :goto_1
     const-string p3, "_o"
 
     invoke-virtual {v4, p3, p4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
@@ -2439,13 +2485,13 @@
     return-object p3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p3
 
@@ -2541,7 +2587,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -2549,7 +2595,7 @@
 
     const-string v0, "Not putting event parameter. Invalid value type. name, type"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v1
 
@@ -2570,7 +2616,7 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -2619,7 +2665,7 @@
     :goto_1
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -2666,7 +2712,7 @@
     :goto_3
     if-eqz p2, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -2722,7 +2768,7 @@
     :cond_2
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object p1
 
@@ -2742,7 +2788,7 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -2765,7 +2811,7 @@
 
     if-le v1, p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2792,7 +2838,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->getContext()Landroid/content/Context;
 
@@ -2813,7 +2859,7 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -2940,11 +2986,11 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->Al()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->Ak()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2995,7 +3041,7 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -3003,7 +3049,7 @@
 
     const-string v4, "Param value can\'t be null"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v5
 
@@ -3034,10 +3080,10 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->ky()V
 
     return-void
 .end method
@@ -3047,7 +3093,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3067,7 +3113,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -3080,7 +3126,7 @@
     goto :goto_0
 
     :cond_0
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     :try_start_0
     invoke-direct {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/ea;->o(Landroid/content/Context;Ljava/lang/String;)Z
@@ -3138,7 +3184,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -3152,10 +3198,15 @@
 
     goto :goto_0
 
+    :cond_2
+    move-wide v2, v4
+
+    goto :goto_0
+
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -3165,7 +3216,7 @@
 
     invoke-virtual {p2, v0, p1}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :cond_2
+    :cond_3
     move-wide v2, v4
 
     :goto_0
@@ -3463,7 +3514,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3476,95 +3527,87 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -3572,12 +3615,12 @@
     return v0
 .end method
 
-.method protected final yU()V
+.method protected final yT()V
     .locals 6
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     new-instance v0, Ljava/security/SecureRandom;
 
@@ -3601,7 +3644,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -3619,6 +3662,14 @@
     return-void
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -3627,7 +3678,7 @@
     return-void
 .end method
 
-.method public final zO()J
+.method public final zN()J
     .locals 6
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->boJ:Ljava/util/concurrent/atomic/AtomicLong;
@@ -3653,7 +3704,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v4
 
@@ -3726,12 +3777,12 @@
     throw v1
 .end method
 
-.method final zP()Ljava/security/SecureRandom;
+.method final zO()Ljava/security/SecureRandom;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->boI:Ljava/security/SecureRandom;
 
@@ -3749,7 +3800,7 @@
     return-object v0
 .end method
 
-.method final zQ()Ljava/lang/String;
+.method final zP()Ljava/lang/String;
     .locals 6
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -3758,7 +3809,7 @@
 
     new-array v0, v0, [B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/security/SecureRandom;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ea;->zO()Ljava/security/SecureRandom;
 
     move-result-object v1
 
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 d39264df41..9099890ee5 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
@@ -80,11 +80,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     return-void
 .end method
@@ -98,47 +98,29 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpf:J
-
-    return-wide v0
-.end method
-
-.method public final Ab()J
-    .locals 2
-    .annotation build Landroidx/annotation/WorkerThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpg:J
 
     return-wide v0
 .end method
 
-.method public final Ac()V
+.method public final Ab()V
     .locals 5
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boP:J
 
@@ -154,7 +136,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -182,42 +164,60 @@
     return-void
 .end method
 
-.method public final Ad()Ljava/lang/String;
+.method public final Ac()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpd:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final Ae()J
+.method public final Ad()J
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bjZ:J
 
     return-wide v0
 .end method
 
+.method public final Ae()Z
+    .locals 1
+    .annotation build Landroidx/annotation/WorkerThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boV:Z
+
+    return v0
+.end method
+
 .method public final Af()Z
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
@@ -225,29 +225,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boV:Z
-
-    return v0
-.end method
-
-.method public final Ag()Z
-    .locals 1
-    .annotation build Landroidx/annotation/WorkerThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boW:Z
 
@@ -259,9 +241,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     const-wide/16 v2, 0x0
 
@@ -281,11 +263,11 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -295,9 +277,12 @@
 
     if-eqz v5, :cond_1
 
-    const/4 v0, 0x1
+    goto :goto_1
 
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     or-int/2addr v0, v2
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
@@ -314,11 +299,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -352,11 +337,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -383,18 +368,18 @@
     return-void
 .end method
 
-.method public final Z(Z)V
+.method public final Y(Z)V
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -419,6 +404,38 @@
     return-void
 .end method
 
+.method public final Z(Z)V
+    .locals 1
+    .annotation build Landroidx/annotation/WorkerThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boV:Z
+
+    if-eq v0, p1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
+
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ed;->boV:Z
+
+    return-void
+.end method
+
 .method public final aD(J)V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
@@ -426,11 +443,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -464,11 +481,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -502,11 +519,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -540,11 +557,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -578,11 +595,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -616,43 +633,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boV:Z
-
-    if-eq v0, p1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
-
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ed;->boV:Z
-
-    return-void
-.end method
-
-.method public final ab(Z)V
-    .locals 1
-    .annotation build Landroidx/annotation/WorkerThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boW:Z
 
@@ -680,11 +665,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -718,11 +703,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -750,11 +735,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -791,11 +776,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -832,11 +817,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -864,11 +849,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -896,11 +881,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -928,11 +913,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -960,11 +945,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -992,11 +977,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aYY:Ljava/lang/String;
 
@@ -1010,11 +995,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aZe:Ljava/lang/String;
 
@@ -1028,35 +1013,53 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aYe:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final uZ()Ljava/lang/String;
+.method public final uY()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aYT:Ljava/lang/String;
 
     return-object v0
 .end method
 
+.method public final yV()Ljava/lang/String;
+    .locals 1
+    .annotation build Landroidx/annotation/WorkerThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aYS:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public final yW()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
@@ -1064,53 +1067,53 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aYS:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final yX()Ljava/lang/String;
-    .locals 1
-    .annotation build Landroidx/annotation/WorkerThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bkb:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final zR()Ljava/lang/String;
+.method public final zQ()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boO:Ljava/lang/String;
 
     return-object v0
 .end method
 
+.method public final zR()J
+    .locals 2
+    .annotation build Landroidx/annotation/WorkerThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boQ:J
+
+    return-wide v0
+.end method
+
 .method public final zS()J
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
@@ -1118,13 +1121,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boQ:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boR:J
 
     return-wide v0
 .end method
@@ -1136,53 +1139,53 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boR:J
-
-    return-wide v0
-.end method
-
-.method public final zU()J
-    .locals 2
-    .annotation build Landroidx/annotation/WorkerThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boS:J
 
     return-wide v0
 .end method
 
-.method public final zV()Ljava/lang/String;
+.method public final zU()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aYR:Ljava/lang/String;
 
     return-object v0
 .end method
 
+.method public final zV()J
+    .locals 2
+    .annotation build Landroidx/annotation/WorkerThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bkc:J
+
+    return-wide v0
+.end method
+
 .method public final zW()J
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
@@ -1190,53 +1193,53 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bkc:J
-
-    return-wide v0
-.end method
-
-.method public final zX()J
-    .locals 2
-    .annotation build Landroidx/annotation/WorkerThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boT:J
 
     return-wide v0
 .end method
 
-.method public final zY()Z
+.method public final zX()Z
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boU:Z
 
     return v0
 .end method
 
+.method public final zY()J
+    .locals 2
+    .annotation build Landroidx/annotation/WorkerThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boP:J
+
+    return-wide v0
+.end method
+
 .method public final zZ()J
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
@@ -1244,13 +1247,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->boP:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ed;->bpf:J
 
     return-wide v0
 .end method
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 a5f4c9dc8b..5f049d65d3 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
@@ -117,7 +117,7 @@
 
     if-eqz v5, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -125,7 +125,7 @@
 
     const-string p3, "null or empty param name in filter. event"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -176,10 +176,9 @@
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/cr;->aYz:Ljava/lang/Long;
 
-    :goto_2
     invoke-interface {p5, v5, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object v5, v4, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
@@ -190,6 +189,8 @@
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/cr;->aYB:Ljava/lang/Double;
 
+    invoke-interface {p5, v5, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     goto :goto_2
 
     :cond_5
@@ -201,10 +202,12 @@
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/cr;->aYy:Ljava/lang/String;
 
+    invoke-interface {p5, v5, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     goto :goto_2
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -212,7 +215,7 @@
 
     const-string p3, "Unknown value for param. event, param"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -220,7 +223,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -235,7 +238,7 @@
     return-object v1
 
     :cond_7
-    :goto_3
+    :goto_2
     add-int/lit8 v3, v3, 0x1
 
     goto :goto_1
@@ -245,7 +248,7 @@
 
     array-length p3, p1
 
-    :goto_4
+    :goto_3
     if-ge v2, p3, :cond_17
 
     aget-object p4, p1, v2
@@ -266,7 +269,7 @@
 
     if-eqz v4, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -274,7 +277,7 @@
 
     const-string p3, "Event has empty param name. event"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -299,7 +302,7 @@
 
     if-nez v5, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -307,7 +310,7 @@
 
     const-string p3, "No number filter for long param. event, param"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -315,7 +318,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -368,7 +371,7 @@
 
     if-nez v5, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -376,7 +379,7 @@
 
     const-string p3, "No number filter for double param. event, param"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -384,7 +387,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -445,7 +448,7 @@
 
     move-result-object p4
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_10
     iget-object v5, p4, Lcom/google/android/gms/internal/measurement/ch;->aXK:Lcom/google/android/gms/internal/measurement/ci;
@@ -466,7 +469,7 @@
 
     move-result-object p4
 
-    :goto_5
+    :goto_4
     if-nez p4, :cond_11
 
     return-object v1
@@ -489,10 +492,10 @@
     :cond_12
     add-int/lit8 v2, v2, 0x1
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_13
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -500,7 +503,7 @@
 
     const-string p3, "Invalid param value for number filter. event, param"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -508,7 +511,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -521,7 +524,7 @@
     return-object v1
 
     :cond_14
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -529,7 +532,7 @@
 
     const-string p3, "No filter for String param. event, param"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -537,7 +540,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -552,7 +555,7 @@
     :cond_15
     if-nez v4, :cond_16
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -560,7 +563,7 @@
 
     const-string p3, "Missing param for filter. event, param"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -568,7 +571,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -583,7 +586,7 @@
     return-object p1
 
     :cond_16
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -591,7 +594,7 @@
 
     const-string p3, "Unknown param type. event, param"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -599,7 +602,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p4
 
@@ -626,7 +629,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -634,8 +637,7 @@
 
     const-string v1, "Missing property filter. property"
 
-    :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -666,7 +668,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -674,7 +676,19 @@
 
     const-string v1, "No number filter for long property. property"
 
-    goto :goto_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
+
+    move-result-object v2
+
+    iget-object p2, p2, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
+
+    invoke-virtual {v2, p2}, Lcom/google/android/gms/measurement/internal/m;->cq(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p1, v1, p2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    return-object v0
 
     :cond_1
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/cw;->aYz:Ljava/lang/Long;
@@ -689,7 +703,6 @@
 
     move-result-object p1
 
-    :goto_1
     invoke-static {p1, v1}, Lcom/google/android/gms/measurement/internal/ef;->a(Ljava/lang/Boolean;Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -705,7 +718,7 @@
 
     if-nez v2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -713,7 +726,19 @@
 
     const-string v1, "No number filter for double property. property"
 
-    goto :goto_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
+
+    move-result-object v2
+
+    iget-object p2, p2, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
+
+    invoke-virtual {v2, p2}, Lcom/google/android/gms/measurement/internal/m;->cq(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p1, v1, p2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    return-object v0
 
     :cond_3
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/cw;->aYB:Ljava/lang/Double;
@@ -728,7 +753,11 @@
 
     move-result-object p1
 
-    goto :goto_1
+    invoke-static {p1, v1}, Lcom/google/android/gms/measurement/internal/ef;->a(Ljava/lang/Boolean;Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_4
     iget-object v2, p2, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
@@ -743,7 +772,7 @@
 
     if-nez v2, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -751,7 +780,7 @@
 
     const-string v1, "No string or number filter defined. property"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -763,7 +792,7 @@
 
     invoke-virtual {p1, v1, p2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_5
     iget-object v2, p2, Lcom/google/android/gms/internal/measurement/cw;->aYy:Ljava/lang/String;
@@ -782,10 +811,14 @@
 
     move-result-object p1
 
-    goto :goto_1
+    invoke-static {p1, v1}, Lcom/google/android/gms/measurement/internal/ef;->a(Ljava/lang/Boolean;Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -793,7 +826,7 @@
 
     const-string v1, "Invalid user property value for Numeric number filter. property, value"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v2
 
@@ -807,7 +840,7 @@
 
     invoke-virtual {p1, v1, v2, p2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_2
+    :goto_0
     return-object v0
 
     :cond_7
@@ -819,10 +852,14 @@
 
     move-result-object p1
 
-    goto :goto_1
+    invoke-static {p1, v1}, Lcom/google/android/gms/measurement/internal/ef;->a(Ljava/lang/Boolean;Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -830,7 +867,19 @@
 
     const-string v1, "User property has no value, property"
 
-    goto/16 :goto_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
+
+    move-result-object v2
+
+    iget-object p2, p2, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
+
+    invoke-virtual {v2, p2}, Lcom/google/android/gms/measurement/internal/m;->cq(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p1, v1, p2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    return-object v0
 .end method
 
 .method private static a(Ljava/lang/Boolean;Z)Ljava/lang/Boolean;
@@ -927,7 +976,6 @@
 
     move-result p1
 
-    :goto_1
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -939,40 +987,56 @@
 
     move-result p1
 
-    goto :goto_1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_2
     invoke-virtual {p1, p4}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
-    goto :goto_1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_3
     invoke-virtual {p1, p4}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
 
     move-result p1
 
-    goto :goto_1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_4
     invoke-virtual {p1, p4}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
     move-result p1
 
-    goto :goto_1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 
     :pswitch_5
     if-eqz p3, :cond_6
 
     const/4 p2, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
     const/16 p2, 0x42
 
-    :goto_2
+    :goto_1
     :try_start_0
     invoke-static {p6, p2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
@@ -995,7 +1059,7 @@
     return-object p1
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -1158,15 +1222,17 @@
 
     move-result-object v1
 
+    move-object v7, v1
+
     goto :goto_2
 
     :cond_7
     :goto_1
     iget-object v1, p2, Lcom/google/android/gms/internal/measurement/ck;->aXW:Ljava/lang/String;
 
-    :goto_2
     move-object v7, v1
 
+    :goto_2
     iget-object v1, p2, Lcom/google/android/gms/internal/measurement/ck;->aXY:[Ljava/lang/String;
 
     if-nez v1, :cond_8
@@ -1250,7 +1316,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_10
+    if-eqz v0, :cond_11
 
     iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ci;->aXN:Ljava/lang/Integer;
 
@@ -1260,7 +1326,7 @@
 
     if-nez v0, :cond_0
 
-    goto/16 :goto_2
+    goto/16 :goto_3
 
     :cond_0
     iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ci;->aXN:Ljava/lang/Integer;
@@ -1347,6 +1413,8 @@
     goto :goto_1
 
     :catch_0
+    return-object v1
+
     :cond_5
     :goto_0
     return-object v1
@@ -1529,11 +1597,19 @@
 
     return-object p0
 
-    :catch_1
     :cond_10
     :goto_2
     return-object v1
 
+    :catch_1
+    return-object v1
+
+    :cond_11
+    :goto_3
+    return-object v1
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_3
@@ -1721,7 +1797,7 @@
 
 # virtual methods
 .method final a(Ljava/lang/String;[Lcom/google/android/gms/internal/measurement/cq;[Lcom/google/android/gms/internal/measurement/cw;)[Lcom/google/android/gms/internal/measurement/co;
-    .locals 83
+    .locals 50
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
@@ -1759,7 +1835,7 @@
 
     invoke-direct {v6}, Landroidx/collection/ArrayMap;-><init>()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
@@ -1769,7 +1845,7 @@
 
     move-result v23
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v0
 
@@ -1777,7 +1853,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_c
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -1836,7 +1912,7 @@
 
     if-eqz v23, :cond_4
 
-    move-object/from16 v27, v0
+    move-object/from16 v19, v0
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
@@ -1844,7 +1920,7 @@
 
     if-eqz v4, :cond_2
 
-    move-object/from16 v28, v1
+    move-object/from16 v20, v1
 
     iget-object v1, v4, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
 
@@ -1855,22 +1931,22 @@
     :cond_0
     iget-object v1, v4, Lcom/google/android/gms/internal/measurement/cu;->aZr:[Lcom/google/android/gms/internal/measurement/cp;
 
-    move-object/from16 v29, v5
+    move-object/from16 v21, v5
 
     array-length v5, v1
 
-    move-object/from16 v30, v11
+    move-object/from16 v22, v11
 
     const/4 v11, 0x0
 
     :goto_1
     if-ge v11, v5, :cond_3
 
-    move/from16 v31, v5
+    move/from16 v24, v5
 
     aget-object v5, v1, v11
 
-    move-object/from16 v32, v1
+    move-object/from16 v25, v1
 
     iget-object v1, v5, Lcom/google/android/gms/internal/measurement/cp;->aYr:Ljava/lang/Integer;
 
@@ -1885,19 +1961,19 @@
     :cond_1
     add-int/lit8 v11, v11, 0x1
 
-    move/from16 v5, v31
+    move/from16 v5, v24
 
-    move-object/from16 v1, v32
+    move-object/from16 v1, v25
 
     goto :goto_1
 
     :cond_2
-    move-object/from16 v28, v1
+    move-object/from16 v20, v1
 
     :goto_2
-    move-object/from16 v29, v5
+    move-object/from16 v21, v5
 
-    move-object/from16 v30, v11
+    move-object/from16 v22, v11
 
     :cond_3
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1909,13 +1985,13 @@
     goto :goto_3
 
     :cond_4
-    move-object/from16 v27, v0
+    move-object/from16 v19, v0
 
-    move-object/from16 v28, v1
+    move-object/from16 v20, v1
 
-    move-object/from16 v29, v5
+    move-object/from16 v21, v5
 
-    move-object/from16 v30, v11
+    move-object/from16 v22, v11
 
     const/4 v0, 0x0
 
@@ -1945,7 +2021,7 @@
     goto :goto_4
 
     :cond_5
-    move-object/from16 v5, v29
+    move-object/from16 v5, v21
 
     :goto_4
     const/4 v1, 0x0
@@ -1967,23 +2043,23 @@
 
     if-eqz v11, :cond_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v11
 
     iget-object v11, v11, Lcom/google/android/gms/measurement/internal/o;->bky:Lcom/google/android/gms/measurement/internal/q;
 
-    move-object/from16 v33, v8
+    move-object/from16 v21, v8
 
     const-string v8, "Filter already evaluated. audience ID, filter ID"
 
-    move-object/from16 v34, v9
+    move-object/from16 v24, v9
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v9
 
-    move-object/from16 v35, v10
+    move-object/from16 v25, v10
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2008,11 +2084,11 @@
     goto :goto_6
 
     :cond_6
-    move-object/from16 v33, v8
+    move-object/from16 v21, v8
 
-    move-object/from16 v34, v9
+    move-object/from16 v24, v9
 
-    move-object/from16 v35, v10
+    move-object/from16 v25, v10
 
     :cond_7
     const/4 v8, 0x0
@@ -2031,20 +2107,20 @@
     :cond_8
     add-int/lit8 v1, v1, 0x1
 
-    move-object/from16 v8, v33
+    move-object/from16 v8, v21
 
-    move-object/from16 v9, v34
+    move-object/from16 v9, v24
 
-    move-object/from16 v10, v35
+    move-object/from16 v10, v25
 
     goto :goto_5
 
     :cond_9
-    move-object/from16 v33, v8
+    move-object/from16 v21, v8
 
-    move-object/from16 v34, v9
+    move-object/from16 v24, v9
 
-    move-object/from16 v35, v10
+    move-object/from16 v25, v10
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/co;
 
@@ -2105,30 +2181,42 @@
     invoke-interface {v6, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_a
-    move-object/from16 v0, v27
+    move-object/from16 v0, v19
 
-    move-object/from16 v1, v28
+    move-object/from16 v1, v20
 
-    move-object/from16 v11, v30
+    move-object/from16 v8, v21
 
-    move-object/from16 v8, v33
+    move-object/from16 v11, v22
 
-    move-object/from16 v9, v34
+    move-object/from16 v9, v24
 
-    move-object/from16 v10, v35
+    move-object/from16 v10, v25
 
     goto/16 :goto_0
 
     :cond_b
-    move-object/from16 v33, v8
+    move-object/from16 v21, v8
 
-    move-object/from16 v34, v9
+    move-object/from16 v24, v9
 
-    move-object/from16 v35, v10
+    move-object/from16 v25, v10
 
-    move-object/from16 v30, v11
+    move-object/from16 v22, v11
 
-    if-eqz v13, :cond_38
+    goto :goto_7
+
+    :cond_c
+    move-object/from16 v21, v8
+
+    move-object/from16 v24, v9
+
+    move-object/from16 v25, v10
+
+    move-object/from16 v22, v11
+
+    :goto_7
+    if-eqz v13, :cond_3b
 
     new-instance v9, Landroidx/collection/ArrayMap;
 
@@ -2136,9 +2224,9 @@
 
     array-length v8, v13
 
-    const-wide/16 v27, 0x0
+    const-wide/16 v26, 0x0
 
-    move-wide/from16 v2, v27
+    move-wide/from16 v2, v26
 
     const/4 v0, 0x0
 
@@ -2146,8 +2234,8 @@
 
     const/4 v4, 0x0
 
-    :goto_7
-    if-ge v4, v8, :cond_38
+    :goto_8
+    if-ge v4, v8, :cond_3a
 
     aget-object v5, v13, v4
 
@@ -2155,9 +2243,9 @@
 
     iget-object v11, v5, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
 
-    move-wide/from16 v36, v2
+    move-wide/from16 v28, v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v2
 
@@ -2167,9 +2255,9 @@
 
     move-result v2
 
-    if-eqz v2, :cond_1d
+    if-eqz v2, :cond_1e
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "_eid"
 
@@ -2181,19 +2269,19 @@
 
     check-cast v3, Ljava/lang/Long;
 
-    if-eqz v3, :cond_c
+    if-eqz v3, :cond_d
 
     const/4 v2, 0x1
 
-    goto :goto_8
+    goto :goto_9
 
-    :cond_c
+    :cond_d
     const/4 v2, 0x0
 
-    :goto_8
-    if-eqz v2, :cond_d
+    :goto_9
+    if-eqz v2, :cond_e
 
-    move/from16 v38, v4
+    move/from16 v30, v4
 
     const-string v4, "_ep"
 
@@ -2201,22 +2289,22 @@
 
     move-result v4
 
-    if-eqz v4, :cond_e
+    if-eqz v4, :cond_f
 
     const/4 v4, 0x1
 
-    goto :goto_9
-
-    :cond_d
-    move/from16 v38, v4
+    goto :goto_a
 
     :cond_e
+    move/from16 v30, v4
+
+    :cond_f
     const/4 v4, 0x0
 
-    :goto_9
-    if-eqz v4, :cond_1a
+    :goto_a
+    if-eqz v4, :cond_1b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "_en"
 
@@ -2232,9 +2320,9 @@
 
     move-result v2
 
-    if-eqz v2, :cond_f
+    if-eqz v2, :cond_10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -2244,45 +2332,41 @@
 
     invoke-virtual {v2, v4, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    move-object/from16 v41, v6
+    move-object/from16 v35, v6
 
-    move/from16 v25, v38
+    const/16 v32, 0x1
 
-    const/16 v24, 0x1
+    goto/16 :goto_14
 
-    goto/16 :goto_15
+    :cond_10
+    if-eqz v0, :cond_12
 
-    :cond_f
-    if-eqz v0, :cond_11
-
-    if-eqz v1, :cond_11
+    if-eqz v1, :cond_12
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v16
+    move-result-wide v31
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v18
+    move-result-wide v33
 
-    cmp-long v2, v16, v18
+    cmp-long v2, v31, v33
 
-    if-eqz v2, :cond_10
-
-    goto :goto_a
-
-    :cond_10
-    move-object v4, v0
-
-    move-object/from16 v16, v1
-
-    move-wide/from16 v1, v36
+    if-eqz v2, :cond_11
 
     goto :goto_b
 
     :cond_11
-    :goto_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    move-object v4, v0
+
+    move-object/from16 v31, v1
+
+    goto :goto_c
+
+    :cond_12
+    :goto_b
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
@@ -2290,15 +2374,15 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_19
+    if-eqz v2, :cond_1a
 
     iget-object v4, v2, Landroid/util/Pair;->first:Ljava/lang/Object;
 
-    if-nez v4, :cond_12
+    if-nez v4, :cond_13
 
-    goto/16 :goto_14
+    goto/16 :goto_13
 
-    :cond_12
+    :cond_13
     iget-object v0, v2, Landroid/util/Pair;->first:Ljava/lang/Object;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/cq;
@@ -2311,7 +2395,7 @@
 
     move-result-wide v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "_eid"
 
@@ -2321,26 +2405,28 @@
 
     check-cast v4, Ljava/lang/Long;
 
-    move-object/from16 v16, v4
+    move-wide/from16 v28, v1
+
+    move-object/from16 v31, v4
 
     move-object v4, v0
 
-    :goto_b
-    const-wide/16 v17, 0x1
+    :goto_c
+    const-wide/16 v0, 0x1
 
-    sub-long v17, v1, v17
+    sub-long v28, v28, v0
 
-    cmp-long v0, v17, v27
+    cmp-long v0, v28, v26
 
-    if-gtz v0, :cond_13
+    if-gtz v0, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -2359,7 +2445,7 @@
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_2
 
-    move-object/from16 v39, v4
+    move-object/from16 v18, v4
 
     const/4 v3, 0x1
 
@@ -2368,39 +2454,47 @@
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_1
 
-    const/16 v19, 0x0
+    const/16 v17, 0x0
 
     :try_start_2
-    aput-object v15, v4, v19
+    aput-object v15, v4, v17
 
     invoke-virtual {v0, v2, v4}, Landroid/database/sqlite/SQLiteDatabase;->execSQL(Ljava/lang/String;[Ljava/lang/Object;)V
     :try_end_2
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
 
-    goto :goto_e
+    move-object v13, v5
+
+    move-object/from16 v35, v6
+
+    move-object/from16 v1, v18
+
+    const/16 v32, 0x1
+
+    goto :goto_f
 
     :catch_0
     move-exception v0
 
-    goto :goto_d
+    goto :goto_e
 
     :catch_1
     move-exception v0
 
-    goto :goto_c
+    goto :goto_d
 
     :catch_2
     move-exception v0
 
-    move-object/from16 v39, v4
+    move-object/from16 v18, v4
 
     const/4 v3, 0x1
 
-    :goto_c
-    const/16 v19, 0x0
-
     :goto_d
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    const/16 v17, 0x0
+
+    :goto_e
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2410,27 +2504,24 @@
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    :goto_e
     move-object v13, v5
 
-    move-object/from16 v41, v6
+    move-object/from16 v35, v6
 
-    move/from16 v25, v38
+    move-object/from16 v1, v18
 
-    move-object/from16 v1, v39
-
-    const/16 v24, 0x1
+    const/16 v32, 0x1
 
     goto :goto_f
 
-    :cond_13
-    move-object/from16 v39, v4
+    :cond_14
+    move-object/from16 v18, v4
 
     const/4 v4, 0x1
 
-    const/16 v19, 0x0
+    const/16 v17, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -2438,21 +2529,17 @@
 
     move-object v13, v5
 
-    move/from16 v25, v38
+    const/16 v32, 0x1
 
-    move-object/from16 v40, v39
+    move-wide/from16 v4, v28
 
-    const/16 v24, 0x1
+    move-object/from16 v35, v6
 
-    move-wide/from16 v4, v17
-
-    move-object/from16 v41, v6
-
-    move-object/from16 v6, v40
+    move-object/from16 v6, v18
 
     invoke-virtual/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/el;->a(Ljava/lang/String;Ljava/lang/Long;JLcom/google/android/gms/internal/measurement/cq;)Z
 
-    move-object/from16 v1, v40
+    move-object/from16 v1, v18
 
     :goto_f
     iget-object v0, v1, Lcom/google/android/gms/internal/measurement/cq;->aYu:[Lcom/google/android/gms/internal/measurement/cr;
@@ -2474,13 +2561,13 @@
     const/4 v5, 0x0
 
     :goto_10
-    if-ge v4, v3, :cond_15
+    if-ge v4, v3, :cond_16
 
     aget-object v6, v2, v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
-    move-object/from16 v42, v1
+    move-object/from16 v18, v1
 
     iget-object v1, v6, Lcom/google/android/gms/internal/measurement/cr;->name:Ljava/lang/String;
 
@@ -2488,7 +2575,7 @@
 
     move-result-object v1
 
-    if-nez v1, :cond_14
+    if-nez v1, :cond_15
 
     add-int/lit8 v1, v5, 0x1
 
@@ -2496,24 +2583,24 @@
 
     move v5, v1
 
-    :cond_14
+    :cond_15
     add-int/lit8 v4, v4, 0x1
 
-    move-object/from16 v1, v42
+    move-object/from16 v1, v18
 
     goto :goto_10
 
-    :cond_15
-    move-object/from16 v42, v1
+    :cond_16
+    move-object/from16 v18, v1
 
-    if-lez v5, :cond_18
+    if-lez v5, :cond_19
 
     array-length v1, v11
 
     const/4 v2, 0x0
 
     :goto_11
-    if-ge v2, v1, :cond_16
+    if-ge v2, v1, :cond_17
 
     aget-object v3, v11, v2
 
@@ -2527,14 +2614,14 @@
 
     goto :goto_11
 
-    :cond_16
+    :cond_17
     array-length v1, v0
 
-    if-ne v5, v1, :cond_17
+    if-ne v5, v1, :cond_18
 
     goto :goto_12
 
-    :cond_17
+    :cond_18
     invoke-static {v0, v5}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
@@ -2542,14 +2629,18 @@
     check-cast v0, [Lcom/google/android/gms/internal/measurement/cr;
 
     :goto_12
+    move-wide/from16 v33, v28
+
     move-object/from16 v29, v0
 
     move-object v0, v10
 
-    goto :goto_13
+    move-object/from16 v28, v18
 
-    :cond_18
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    goto/16 :goto_16
+
+    :cond_19
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -2561,24 +2652,21 @@
 
     move-object v0, v10
 
+    move-wide/from16 v33, v28
+
     move-object/from16 v29, v11
 
+    move-object/from16 v28, v18
+
+    goto/16 :goto_16
+
+    :cond_1a
     :goto_13
-    move-object/from16 v26, v16
+    move-object/from16 v35, v6
 
-    move-wide/from16 v36, v17
+    const/16 v32, 0x1
 
-    goto/16 :goto_17
-
-    :cond_19
-    :goto_14
-    move-object/from16 v41, v6
-
-    move/from16 v25, v38
-
-    const/16 v24, 0x1
-
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -2588,43 +2676,39 @@
 
     invoke-virtual {v2, v4, v10, v3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :goto_15
-    move/from16 v31, v8
+    :goto_14
+    move/from16 v41, v8
 
-    move-object/from16 v50, v9
+    move-object/from16 v43, v9
 
-    move-object/from16 v64, v12
+    move-object/from16 v46, v12
 
-    move-object/from16 v14, v30
+    move-object/from16 v47, v21
 
-    move-object/from16 v62, v33
+    move-object/from16 v14, v22
 
-    move-object/from16 v63, v34
+    move-object/from16 v42, v24
 
-    move-object/from16 v65, v35
+    move-object/from16 v48, v25
 
-    move-wide/from16 v2, v36
+    move-wide/from16 v2, v28
 
-    move-object/from16 v57, v41
+    goto/16 :goto_23
 
-    goto/16 :goto_27
-
-    :cond_1a
+    :cond_1b
     move-object v13, v5
 
-    move-object/from16 v41, v6
+    move-object/from16 v35, v6
 
-    move/from16 v25, v38
+    const/16 v32, 0x1
 
-    const/16 v24, 0x1
+    if-eqz v2, :cond_1f
 
-    if-eqz v2, :cond_1e
-
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "_epc"
 
-    invoke-static/range {v27 .. v28}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {v26 .. v27}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -2632,22 +2716,22 @@
 
     move-result-object v0
 
-    if-nez v0, :cond_1b
+    if-nez v0, :cond_1c
 
     move-object v0, v1
 
-    :cond_1b
+    :cond_1c
     check-cast v0, Ljava/lang/Long;
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v16
 
-    cmp-long v0, v16, v27
+    cmp-long v0, v16, v26
 
-    if-gtz v0, :cond_1c
+    if-gtz v0, :cond_1d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -2659,10 +2743,10 @@
 
     move-object v0, v3
 
-    goto :goto_16
+    goto :goto_15
 
-    :cond_1c
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :cond_1d
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -2676,39 +2760,41 @@
 
     invoke-virtual/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/el;->a(Ljava/lang/String;Ljava/lang/Long;JLcom/google/android/gms/internal/measurement/cq;)Z
 
-    :goto_16
-    move-object/from16 v26, v0
+    :goto_15
+    move-object/from16 v31, v0
 
     move-object v0, v10
 
     move-object/from16 v29, v11
 
-    move-object/from16 v42, v13
+    move-object/from16 v28, v13
 
-    move-wide/from16 v36, v16
+    move-wide/from16 v33, v16
 
-    goto :goto_17
+    goto :goto_16
 
-    :cond_1d
-    move/from16 v25, v4
+    :cond_1e
+    move/from16 v30, v4
 
     move-object v13, v5
 
-    move-object/from16 v41, v6
+    move-object/from16 v35, v6
 
-    const/16 v24, 0x1
+    const/16 v32, 0x1
 
-    :cond_1e
-    move-object/from16 v42, v0
+    :cond_1f
+    move-object/from16 v31, v1
 
-    move-object/from16 v26, v1
+    move-wide/from16 v33, v28
+
+    move-object/from16 v28, v0
 
     move-object v0, v10
 
     move-object/from16 v29, v11
 
-    :goto_17
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_16
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -2718,9 +2804,9 @@
 
     move-result-object v1
 
-    if-nez v1, :cond_1f
+    if-nez v1, :cond_20
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2732,7 +2818,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -2756,35 +2842,35 @@
 
     move-result-wide v16
 
-    const-wide/16 v18, 0x0
+    const-wide/16 v36, 0x0
 
     const/4 v6, 0x0
 
-    const/16 v20, 0x0
+    const/16 v38, 0x0
 
-    const/16 v21, 0x0
+    const/16 v39, 0x0
 
-    const/16 v22, 0x0
+    const/16 v40, 0x0
 
-    move/from16 v31, v8
+    move/from16 v41, v8
 
-    move-object/from16 v11, v33
+    move-object/from16 v11, v21
 
     move-object v8, v1
 
-    move-object/from16 v44, v9
+    move-object/from16 v43, v9
 
-    move-object/from16 v43, v34
+    move-object/from16 v42, v24
 
     move-object/from16 v9, p1
 
-    move-object/from16 v45, v35
+    move-object/from16 v44, v25
 
-    move-object/from16 v48, v11
+    move-object/from16 v47, v11
 
-    move-object/from16 v47, v12
+    move-object/from16 v46, v12
 
-    move-object/from16 v46, v30
+    move-object/from16 v45, v22
 
     move-wide v11, v2
 
@@ -2798,20 +2884,26 @@
 
     move-wide/from16 v15, v16
 
-    move-wide/from16 v17, v18
+    move-wide/from16 v17, v36
 
     move-object/from16 v19, v6
 
+    move-object/from16 v20, v38
+
+    move-object/from16 v21, v39
+
+    move-object/from16 v22, v40
+
     invoke-direct/range {v8 .. v22}, Lcom/google/android/gms/measurement/internal/eu;-><init>(Ljava/lang/String;Ljava/lang/String;JJJJLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Boolean;)V
 
-    goto :goto_18
+    goto :goto_17
 
-    :cond_1f
-    move/from16 v31, v8
+    :cond_20
+    move/from16 v41, v8
 
-    move-object/from16 v44, v9
+    move-object/from16 v43, v9
 
-    move-object/from16 v47, v12
+    move-object/from16 v46, v12
 
     move-object v2, v13
 
@@ -2819,20 +2911,20 @@
 
     move-object v5, v15
 
-    move-object/from16 v46, v30
+    move-object/from16 v47, v21
 
-    move-object/from16 v48, v33
+    move-object/from16 v45, v22
 
-    move-object/from16 v43, v34
+    move-object/from16 v42, v24
 
-    move-object/from16 v45, v35
+    move-object/from16 v44, v25
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eu;->AG()Lcom/google/android/gms/measurement/internal/eu;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eu;->AF()Lcom/google/android/gms/measurement/internal/eu;
 
     move-result-object v1
 
-    :goto_18
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_17
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v4
 
@@ -2840,7 +2932,7 @@
 
     iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/eu;->bpP:J
 
-    move-object/from16 v10, v44
+    move-object/from16 v10, v43
 
     invoke-interface {v10, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2848,9 +2940,9 @@
 
     check-cast v1, Ljava/util/Map;
 
-    if-nez v1, :cond_21
+    if-nez v1, :cond_22
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v1
 
@@ -2858,18 +2950,23 @@
 
     move-result-object v1
 
-    if-nez v1, :cond_20
+    if-nez v1, :cond_21
 
     new-instance v1, Landroidx/collection/ArrayMap;
 
     invoke-direct {v1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    :cond_20
+    :cond_21
     invoke-interface {v10, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_21
     move-object v11, v1
 
+    goto :goto_18
+
+    :cond_22
+    move-object v11, v1
+
+    :goto_18
     invoke-interface {v11}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v1
@@ -2883,7 +2980,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_37
+    if-eqz v1, :cond_39
 
     invoke-interface {v12}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -2899,15 +2996,15 @@
 
     move-result-object v1
 
-    move-object/from16 v14, v46
+    move-object/from16 v14, v45
 
     invoke-interface {v14, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_22
+    if-eqz v1, :cond_23
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2921,16 +3018,16 @@
 
     invoke-virtual {v1, v4, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    move-object/from16 v46, v14
+    move-object/from16 v45, v14
 
     goto :goto_19
 
-    :cond_22
+    :cond_23
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    move-object/from16 v15, v47
+    move-object/from16 v15, v46
 
     invoke-interface {v15, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2942,7 +3039,7 @@
 
     move-result-object v4
 
-    move-object/from16 v6, v45
+    move-object/from16 v6, v44
 
     invoke-interface {v6, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2950,15 +3047,15 @@
 
     check-cast v4, Ljava/util/BitSet;
 
-    move-object/from16 v49, v2
+    move-object/from16 v16, v2
 
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    move-object/from16 v50, v10
+    move-object/from16 v43, v10
 
-    move-object/from16 v10, v43
+    move-object/from16 v10, v42
 
     invoke-interface {v10, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2966,17 +3063,17 @@
 
     check-cast v2, Ljava/util/BitSet;
 
-    if-eqz v23, :cond_23
+    if-eqz v23, :cond_24
 
-    move-object/from16 v51, v2
+    move-object/from16 v17, v2
 
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    move-object/from16 v52, v12
+    move-object/from16 v18, v12
 
-    move-object/from16 v12, v48
+    move-object/from16 v12, v47
 
     invoke-interface {v12, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2984,13 +3081,13 @@
 
     check-cast v2, Ljava/util/Map;
 
-    move-object/from16 v53, v2
+    move-object/from16 v19, v2
 
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    move-object/from16 v7, v41
+    move-object/from16 v7, v35
 
     invoke-interface {v7, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3000,21 +3097,21 @@
 
     goto :goto_1a
 
-    :cond_23
-    move-object/from16 v51, v2
+    :cond_24
+    move-object/from16 v17, v2
 
-    move-object/from16 v52, v12
+    move-object/from16 v18, v12
 
-    move-object/from16 v7, v41
+    move-object/from16 v7, v35
 
-    move-object/from16 v12, v48
+    move-object/from16 v12, v47
 
     const/4 v2, 0x0
 
-    const/16 v53, 0x0
+    const/16 v19, 0x0
 
     :goto_1a
-    if-nez v1, :cond_25
+    if-nez v1, :cond_26
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/co;
 
@@ -3044,7 +3141,7 @@
 
     invoke-direct {v1}, Ljava/util/BitSet;-><init>()V
 
-    move-object/from16 v54, v2
+    move-object/from16 v20, v2
 
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3052,13 +3149,13 @@
 
     invoke-interface {v10, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v23, :cond_24
+    if-eqz v23, :cond_25
 
     new-instance v2, Landroidx/collection/ArrayMap;
 
     invoke-direct {v2}, Landroidx/collection/ArrayMap;-><init>()V
 
-    move-object/from16 v55, v1
+    move-object/from16 v17, v1
 
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3070,7 +3167,7 @@
 
     invoke-direct {v1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    move-object/from16 v56, v2
+    move-object/from16 v19, v2
 
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3078,39 +3175,39 @@
 
     invoke-interface {v7, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-object/from16 v57, v7
+    move-object/from16 v35, v7
 
-    move-object/from16 v2, v55
+    move-object/from16 v2, v17
 
-    move-object/from16 v58, v56
+    move-object/from16 v17, v19
 
     move-object v7, v1
 
     goto :goto_1b
 
-    :cond_24
-    move-object/from16 v55, v1
+    :cond_25
+    move-object/from16 v17, v1
 
-    move-object/from16 v57, v7
+    move-object/from16 v35, v7
 
-    move-object/from16 v58, v53
+    move-object/from16 v2, v17
 
-    move-object/from16 v7, v54
+    move-object/from16 v17, v19
 
-    move-object/from16 v2, v55
+    move-object/from16 v7, v20
 
     goto :goto_1b
 
-    :cond_25
-    move-object/from16 v54, v2
+    :cond_26
+    move-object/from16 v20, v2
 
-    move-object/from16 v57, v7
+    move-object/from16 v35, v7
 
-    move-object/from16 v2, v51
+    move-object/from16 v2, v17
 
-    move-object/from16 v58, v53
+    move-object/from16 v17, v19
 
-    move-object/from16 v7, v54
+    move-object/from16 v7, v20
 
     :goto_1b
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -3125,28 +3222,28 @@
 
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v16
+    move-result-object v19
 
     :goto_1c
-    invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface/range {v19 .. v19}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
 
-    if-eqz v1, :cond_36
+    if-eqz v1, :cond_38
 
-    invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface/range {v19 .. v19}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/cg;
 
-    move-object/from16 v59, v2
+    move-object/from16 v20, v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
-    move-object/from16 v60, v11
+    move-object/from16 v21, v11
 
     const/4 v11, 0x2
 
@@ -3154,9 +3251,9 @@
 
     move-result v2
 
-    if-eqz v2, :cond_26
+    if-eqz v2, :cond_27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3170,13 +3267,13 @@
 
     iget-object v5, v1, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
-    move-object/from16 v61, v6
+    move-object/from16 v44, v6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v6
 
-    move-object/from16 v62, v12
+    move-object/from16 v47, v12
 
     iget-object v12, v1, Lcom/google/android/gms/internal/measurement/cg;->aXE:Ljava/lang/String;
 
@@ -3186,7 +3283,7 @@
 
     invoke-virtual {v2, v11, v3, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3194,7 +3291,7 @@
 
     const-string v3, "Filter definition"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v5
 
@@ -3206,15 +3303,15 @@
 
     goto :goto_1d
 
-    :cond_26
-    move-object/from16 v61, v6
+    :cond_27
+    move-object/from16 v44, v6
 
-    move-object/from16 v62, v12
+    move-object/from16 v47, v12
 
     :goto_1d
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
-    if-eqz v2, :cond_34
+    if-eqz v2, :cond_37
 
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
@@ -3224,18 +3321,18 @@
 
     const/16 v11, 0x100
 
-    if-le v2, v11, :cond_27
+    if-le v2, v11, :cond_28
 
-    goto/16 :goto_23
+    goto/16 :goto_22
 
-    :cond_27
-    if-eqz v23, :cond_30
+    :cond_28
+    if-eqz v23, :cond_32
 
-    if-eqz v1, :cond_28
+    if-eqz v1, :cond_29
 
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
 
-    if-eqz v2, :cond_28
+    if-eqz v2, :cond_29
 
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cg;->aXA:Ljava/lang/Boolean;
 
@@ -3243,21 +3340,21 @@
 
     move-result v2
 
-    if-eqz v2, :cond_28
+    if-eqz v2, :cond_29
 
     const/4 v12, 0x1
 
     goto :goto_1e
 
-    :cond_28
+    :cond_29
     const/4 v12, 0x0
 
     :goto_1e
-    if-eqz v1, :cond_29
+    if-eqz v1, :cond_2a
 
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
 
-    if-eqz v2, :cond_29
+    if-eqz v2, :cond_2a
 
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cg;->aXB:Ljava/lang/Boolean;
 
@@ -3265,14 +3362,14 @@
 
     move-result v2
 
-    if-eqz v2, :cond_29
+    if-eqz v2, :cond_2a
 
-    const/16 v17, 0x1
+    const/16 v22, 0x1
 
     goto :goto_1f
 
-    :cond_29
-    const/16 v17, 0x0
+    :cond_2a
+    const/16 v22, 0x0
 
     :goto_1f
     iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
@@ -3285,13 +3382,13 @@
 
     move-result v2
 
-    if-eqz v2, :cond_2a
+    if-eqz v2, :cond_2b
 
-    if-nez v12, :cond_2a
+    if-nez v12, :cond_2b
 
-    if-nez v17, :cond_2a
+    if-nez v22, :cond_2b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3307,32 +3404,36 @@
 
     invoke-virtual {v2, v3, v5, v1}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    move-object/from16 v2, v59
+    move-object/from16 v2, v20
 
-    move-object/from16 v11, v60
+    move-object/from16 v11, v21
 
-    move-object/from16 v6, v61
+    move-object/from16 v6, v44
 
-    move-object/from16 v12, v62
+    move-object/from16 v12, v47
 
-    goto/16 :goto_26
+    move-object/from16 v3, p3
 
-    :cond_2a
+    move-object/from16 v5, p1
+
+    goto/16 :goto_1c
+
+    :cond_2b
     move-object v5, v1
 
-    move-object/from16 v6, v58
+    move-object/from16 v6, v17
 
     move-object/from16 v1, p0
 
-    move-object/from16 v3, v49
+    move-object/from16 v3, v16
 
-    move-object/from16 v11, v59
+    move-object/from16 v11, v20
 
     move-object v2, v5
 
-    move-object/from16 v63, v10
+    move-object/from16 v42, v10
 
-    move-object/from16 v64, v15
+    move-object/from16 v46, v15
 
     move-object/from16 v10, p3
 
@@ -3344,13 +3445,13 @@
 
     move-object/from16 v4, v29
 
-    move-object/from16 v66, v0
+    move-object/from16 v16, v0
 
     move-object v0, v5
 
-    move-object/from16 v67, v6
+    move-object/from16 v49, v6
 
-    move-object/from16 v65, v61
+    move-object/from16 v48, v44
 
     move-wide v5, v8
 
@@ -3358,7 +3459,7 @@
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3366,13 +3467,13 @@
 
     const-string v3, "Event filter result"
 
-    if-nez v1, :cond_2b
+    if-nez v1, :cond_2c
 
     const-string v4, "null"
 
     goto :goto_20
 
-    :cond_2b
+    :cond_2c
     move-object v4, v1
 
     :goto_20
@@ -3386,29 +3487,31 @@
 
     invoke-interface {v14, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    :cond_2c
-    :goto_21
     move-object v4, v10
 
     move-object v2, v11
 
-    move-object/from16 v49, v15
+    move-object/from16 v0, v16
 
-    move-object/from16 v11, v60
+    move-object/from16 v11, v21
 
-    move-object/from16 v12, v62
+    move-object/from16 v10, v42
 
-    move-object/from16 v10, v63
+    move-object/from16 v12, v47
 
-    move-object/from16 v15, v64
+    move-object/from16 v6, v48
 
-    move-object/from16 v6, v65
+    move-object/from16 v17, v49
 
-    move-object/from16 v0, v66
+    move-object/from16 v3, p3
 
-    move-object/from16 v58, v67
+    move-object/from16 v5, p1
 
-    goto/16 :goto_26
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
 
     :cond_2d
     iget-object v2, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
@@ -3423,7 +3526,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2c
+    if-eqz v1, :cond_31
 
     iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
@@ -3435,14 +3538,14 @@
 
     if-nez v12, :cond_2e
 
-    if-eqz v17, :cond_2c
+    if-eqz v22, :cond_30
 
     :cond_2e
     iget-object v1, v15, Lcom/google/android/gms/internal/measurement/cq;->aYv:Ljava/lang/Long;
 
-    if-eqz v1, :cond_2c
+    if-eqz v1, :cond_30
 
-    if-eqz v17, :cond_2f
+    if-eqz v22, :cond_2f
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
@@ -3458,7 +3561,31 @@
 
     invoke-static {v7, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ef;->b(Ljava/util/Map;IJ)V
 
-    goto :goto_21
+    move-object v4, v10
+
+    move-object v2, v11
+
+    move-object/from16 v0, v16
+
+    move-object/from16 v11, v21
+
+    move-object/from16 v10, v42
+
+    move-object/from16 v12, v47
+
+    move-object/from16 v6, v48
+
+    move-object/from16 v17, v49
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v5, p1
+
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
 
     :cond_2f
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
@@ -3473,29 +3600,107 @@
 
     move-result-wide v1
 
-    move-object/from16 v12, v67
+    move-object/from16 v12, v49
 
     invoke-static {v12, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ef;->a(Ljava/util/Map;IJ)V
 
-    goto/16 :goto_25
+    move-object v4, v10
+
+    move-object v2, v11
+
+    move-object/from16 v17, v12
+
+    move-object/from16 v0, v16
+
+    move-object/from16 v11, v21
+
+    move-object/from16 v10, v42
+
+    move-object/from16 v12, v47
+
+    move-object/from16 v6, v48
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v5, p1
+
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
 
     :cond_30
-    move-object/from16 v66, v0
+    move-object v4, v10
+
+    move-object v2, v11
+
+    move-object/from16 v0, v16
+
+    move-object/from16 v11, v21
+
+    move-object/from16 v10, v42
+
+    move-object/from16 v12, v47
+
+    move-object/from16 v6, v48
+
+    move-object/from16 v17, v49
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v5, p1
+
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
+
+    :cond_31
+    move-object v4, v10
+
+    move-object v2, v11
+
+    move-object/from16 v0, v16
+
+    move-object/from16 v11, v21
+
+    move-object/from16 v10, v42
+
+    move-object/from16 v12, v47
+
+    move-object/from16 v6, v48
+
+    move-object/from16 v17, v49
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v5, p1
+
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
+
+    :cond_32
+    move-object/from16 v42, v10
+
+    move-object/from16 v46, v15
+
+    move-object/from16 v15, v16
+
+    move-object/from16 v12, v17
+
+    move-object/from16 v11, v20
+
+    move-object/from16 v48, v44
+
+    move-object/from16 v16, v0
 
     move-object v0, v1
 
-    move-object/from16 v63, v10
-
-    move-object/from16 v64, v15
-
-    move-object/from16 v15, v49
-
-    move-object/from16 v12, v58
-
-    move-object/from16 v11, v59
-
-    move-object/from16 v65, v61
-
     move-object v10, v4
 
     iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
@@ -3508,9 +3713,9 @@
 
     move-result v1
 
-    if-eqz v1, :cond_31
+    if-eqz v1, :cond_33
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3524,14 +3729,40 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
-    goto/16 :goto_24
+    invoke-virtual {v1, v2, v3, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_31
+    move-object v4, v10
+
+    move-object v2, v11
+
+    move-object/from16 v17, v12
+
+    move-object/from16 v0, v16
+
+    move-object/from16 v11, v21
+
+    move-object/from16 v10, v42
+
+    move-object/from16 v12, v47
+
+    move-object/from16 v6, v48
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v5, p1
+
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
+
+    :cond_33
     move-object/from16 v1, p0
 
     move-object v2, v0
 
-    move-object/from16 v3, v66
+    move-object/from16 v3, v16
 
     move-object/from16 v4, v29
 
@@ -3541,7 +3772,7 @@
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3549,19 +3780,19 @@
 
     const-string v3, "Event filter result"
 
-    if-nez v1, :cond_32
+    if-nez v1, :cond_34
 
     const-string v4, "null"
 
-    goto :goto_22
+    goto :goto_21
 
-    :cond_32
+    :cond_34
     move-object v4, v1
 
-    :goto_22
+    :goto_21
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    if-nez v1, :cond_33
+    if-nez v1, :cond_35
 
     invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3569,9 +3800,33 @@
 
     invoke-interface {v14, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    goto :goto_25
+    move-object v4, v10
 
-    :cond_33
+    move-object v2, v11
+
+    move-object/from16 v17, v12
+
+    move-object/from16 v0, v16
+
+    move-object/from16 v11, v21
+
+    move-object/from16 v10, v42
+
+    move-object/from16 v12, v47
+
+    move-object/from16 v6, v48
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v5, p1
+
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
+
+    :cond_35
     iget-object v2, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
     invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
@@ -3584,7 +3839,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_35
+    if-eqz v1, :cond_36
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/cg;->aXD:Ljava/lang/Integer;
 
@@ -3594,29 +3849,54 @@
 
     invoke-virtual {v10, v0}, Ljava/util/BitSet;->set(I)V
 
-    goto :goto_25
+    :cond_36
+    move-object v4, v10
 
-    :cond_34
-    :goto_23
-    move-object/from16 v66, v0
+    move-object v2, v11
+
+    move-object/from16 v17, v12
+
+    move-object/from16 v0, v16
+
+    move-object/from16 v11, v21
+
+    move-object/from16 v10, v42
+
+    move-object/from16 v12, v47
+
+    move-object/from16 v6, v48
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v5, p1
+
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
+    goto/16 :goto_1c
+
+    :cond_37
+    :goto_22
+    move-object/from16 v42, v10
+
+    move-object/from16 v46, v15
+
+    move-object/from16 v15, v16
+
+    move-object/from16 v12, v17
+
+    move-object/from16 v11, v20
+
+    move-object/from16 v48, v44
+
+    move-object/from16 v16, v0
 
     move-object v0, v1
 
-    move-object/from16 v63, v10
-
-    move-object/from16 v64, v15
-
-    move-object/from16 v15, v49
-
-    move-object/from16 v12, v58
-
-    move-object/from16 v11, v59
-
-    move-object/from16 v65, v61
-
     move-object v10, v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3634,58 +3914,52 @@
 
     move-result-object v0
 
-    :goto_24
     invoke-virtual {v1, v2, v3, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_35
-    :goto_25
     move-object v4, v10
 
     move-object v2, v11
 
-    move-object/from16 v58, v12
+    move-object/from16 v17, v12
 
-    move-object/from16 v49, v15
+    move-object/from16 v0, v16
 
-    move-object/from16 v11, v60
+    move-object/from16 v11, v21
 
-    move-object/from16 v12, v62
+    move-object/from16 v10, v42
 
-    move-object/from16 v10, v63
+    move-object/from16 v12, v47
 
-    move-object/from16 v15, v64
+    move-object/from16 v6, v48
 
-    move-object/from16 v6, v65
-
-    move-object/from16 v0, v66
-
-    :goto_26
     move-object/from16 v3, p3
 
     move-object/from16 v5, p1
 
+    move-object/from16 v16, v15
+
+    move-object/from16 v15, v46
+
     goto/16 :goto_1c
 
-    :cond_36
-    move-object/from16 v64, v15
+    :cond_38
+    move-object/from16 v46, v15
 
-    move-object/from16 v45, v6
+    move-object/from16 v15, v16
 
-    move-object/from16 v43, v10
+    move-object/from16 v44, v6
 
-    move-object/from16 v48, v12
+    move-object/from16 v42, v10
 
-    move-object/from16 v46, v14
+    move-object/from16 v47, v12
 
-    move-object/from16 v2, v49
+    move-object/from16 v45, v14
 
-    move-object/from16 v10, v50
+    move-object v2, v15
 
-    move-object/from16 v12, v52
+    move-object/from16 v12, v18
 
-    move-object/from16 v41, v57
-
-    move-object/from16 v47, v64
+    move-object/from16 v10, v43
 
     move-object/from16 v3, p3
 
@@ -3695,47 +3969,39 @@
 
     goto/16 :goto_19
 
-    :cond_37
-    move-object/from16 v50, v10
+    :cond_39
+    move-object/from16 v43, v10
 
-    move-object/from16 v57, v41
+    move-object/from16 v48, v44
 
-    move-object/from16 v63, v43
+    move-object/from16 v14, v45
 
-    move-object/from16 v65, v45
+    move-object/from16 v0, v28
 
-    move-object/from16 v14, v46
+    move-object/from16 v1, v31
 
-    move-object/from16 v64, v47
+    move-wide/from16 v2, v33
 
-    move-object/from16 v62, v48
-
-    move-object/from16 v1, v26
-
-    move-wide/from16 v2, v36
-
-    move-object/from16 v0, v42
-
-    :goto_27
-    add-int/lit8 v4, v25, 0x1
+    :goto_23
+    add-int/lit8 v4, v30, 0x1
 
     move-object/from16 v13, p2
 
-    move-object/from16 v30, v14
+    move-object/from16 v22, v14
 
-    move/from16 v8, v31
+    move-object/from16 v6, v35
 
-    move-object/from16 v9, v50
+    move/from16 v8, v41
 
-    move-object/from16 v6, v57
+    move-object/from16 v24, v42
 
-    move-object/from16 v33, v62
+    move-object/from16 v9, v43
 
-    move-object/from16 v34, v63
+    move-object/from16 v12, v46
 
-    move-object/from16 v12, v64
+    move-object/from16 v21, v47
 
-    move-object/from16 v35, v65
+    move-object/from16 v25, v48
 
     move-object/from16 v7, p0
 
@@ -3743,26 +4009,46 @@
 
     move-object/from16 v15, p1
 
-    goto/16 :goto_7
+    goto/16 :goto_8
 
-    :cond_38
-    move-object/from16 v57, v6
+    :cond_3a
+    move-object/from16 v35, v6
 
-    move-object/from16 v64, v12
+    move-object/from16 v46, v12
 
-    move-object/from16 v14, v30
+    move-object/from16 v47, v21
 
-    move-object/from16 v62, v33
+    move-object/from16 v14, v22
 
-    move-object/from16 v63, v34
+    move-object/from16 v42, v24
 
-    move-object/from16 v65, v35
+    move-object/from16 v48, v25
 
-    const/16 v24, 0x1
+    const/16 v32, 0x1
 
     move-object/from16 v1, p3
 
-    if-eqz v1, :cond_4f
+    goto :goto_24
+
+    :cond_3b
+    move-object/from16 v35, v6
+
+    move-object/from16 v46, v12
+
+    move-object/from16 v47, v21
+
+    move-object/from16 v14, v22
+
+    move-object/from16 v42, v24
+
+    move-object/from16 v48, v25
+
+    const/16 v32, 0x1
+
+    move-object/from16 v1, p3
+
+    :goto_24
+    if-eqz v1, :cond_55
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
@@ -3772,8 +4058,8 @@
 
     const/4 v3, 0x0
 
-    :goto_28
-    if-ge v3, v2, :cond_4f
+    :goto_25
+    if-ge v3, v2, :cond_54
 
     aget-object v4, v1, v3
 
@@ -3785,9 +4071,9 @@
 
     check-cast v5, Ljava/util/Map;
 
-    if-nez v5, :cond_3a
+    if-nez v5, :cond_3d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v5
 
@@ -3799,23 +4085,23 @@
 
     move-result-object v5
 
-    if-nez v5, :cond_39
+    if-nez v5, :cond_3c
 
     new-instance v5, Landroidx/collection/ArrayMap;
 
     invoke-direct {v5}, Landroidx/collection/ArrayMap;-><init>()V
 
-    :cond_39
+    :cond_3c
     iget-object v6, v4, Lcom/google/android/gms/internal/measurement/cw;->name:Ljava/lang/String;
 
     invoke-interface {v0, v6, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_29
+    goto :goto_26
 
-    :cond_3a
+    :cond_3d
     move-object/from16 v7, p1
 
-    :goto_29
+    :goto_26
     invoke-interface {v5}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v6
@@ -3824,12 +4110,12 @@
 
     move-result-object v6
 
-    :goto_2a
+    :goto_27
     invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v8
 
-    if-eqz v8, :cond_4e
+    if-eqz v8, :cond_53
 
     invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -3849,9 +4135,9 @@
 
     move-result v9
 
-    if-eqz v9, :cond_3b
+    if-eqz v9, :cond_3e
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v9
 
@@ -3865,14 +4151,14 @@
 
     invoke-virtual {v9, v10, v8}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_2a
+    goto :goto_27
 
-    :cond_3b
+    :cond_3e
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v9
 
-    move-object/from16 v10, v64
+    move-object/from16 v10, v46
 
     invoke-interface {v10, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3884,7 +4170,7 @@
 
     move-result-object v11
 
-    move-object/from16 v12, v65
+    move-object/from16 v12, v48
 
     invoke-interface {v12, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3896,7 +4182,7 @@
 
     move-result-object v13
 
-    move-object/from16 v15, v63
+    move-object/from16 v15, v42
 
     invoke-interface {v15, v13}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3904,15 +4190,15 @@
 
     check-cast v13, Ljava/util/BitSet;
 
-    if-eqz v23, :cond_3c
+    if-eqz v23, :cond_3f
 
-    move-object/from16 v68, v0
+    move-object/from16 p2, v0
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    move-object/from16 v1, v62
+    move-object/from16 v1, v47
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3920,15 +4206,15 @@
 
     check-cast v0, Ljava/util/Map;
 
-    move-object/from16 v69, v0
+    move-object/from16 v16, v0
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    move/from16 v70, v2
+    move/from16 v17, v2
 
-    move-object/from16 v2, v57
+    move-object/from16 v2, v35
 
     invoke-interface {v2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3936,23 +4222,23 @@
 
     check-cast v0, Ljava/util/Map;
 
-    goto :goto_2b
+    goto :goto_28
 
-    :cond_3c
-    move-object/from16 v68, v0
+    :cond_3f
+    move-object/from16 p2, v0
 
-    move/from16 v70, v2
+    move/from16 v17, v2
 
-    move-object/from16 v2, v57
+    move-object/from16 v2, v35
 
-    move-object/from16 v1, v62
+    move-object/from16 v1, v47
 
     const/4 v0, 0x0
 
-    const/16 v69, 0x0
+    const/16 v16, 0x0
 
-    :goto_2b
-    if-nez v9, :cond_3d
+    :goto_28
+    if-nez v9, :cond_41
 
     new-instance v9, Lcom/google/android/gms/internal/measurement/co;
 
@@ -3988,7 +4274,7 @@
 
     invoke-interface {v15, v9, v13}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v23, :cond_3d
+    if-eqz v23, :cond_40
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
@@ -4004,7 +4290,7 @@
 
     invoke-direct {v9}, Landroidx/collection/ArrayMap;-><init>()V
 
-    move-object/from16 v71, v0
+    move-object/from16 v16, v0
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -4012,20 +4298,29 @@
 
     invoke-interface {v2, v0, v9}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-object/from16 v72, v2
+    move-object/from16 v35, v2
 
-    move-object/from16 v0, v71
+    move-object/from16 v0, v16
 
-    goto :goto_2c
+    goto :goto_29
 
-    :cond_3d
+    :cond_40
     move-object v9, v0
 
-    move-object/from16 v72, v2
+    move-object/from16 v35, v2
 
-    move-object/from16 v0, v69
+    move-object/from16 v0, v16
 
-    :goto_2c
+    goto :goto_29
+
+    :cond_41
+    move-object v9, v0
+
+    move-object/from16 v35, v2
+
+    move-object/from16 v0, v16
+
+    :goto_29
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
@@ -4040,30 +4335,30 @@
 
     move-result-object v2
 
-    :goto_2d
+    :goto_2a
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v16
 
-    if-eqz v16, :cond_4d
+    if-eqz v16, :cond_52
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v16
 
-    move-object/from16 v73, v2
+    move-object/from16 v18, v2
 
     move-object/from16 v2, v16
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/cj;
 
-    move-object/from16 v74, v5
+    move-object/from16 v16, v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
-    move-object/from16 v75, v6
+    move-object/from16 v19, v6
 
     const/4 v6, 0x2
 
@@ -4071,9 +4366,9 @@
 
     move-result v5
 
-    if-eqz v5, :cond_3e
+    if-eqz v5, :cond_42
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -4085,17 +4380,17 @@
 
     move-result-object v7
 
-    move-object/from16 v76, v1
+    move-object/from16 v21, v1
 
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
-    move-object/from16 v77, v15
+    move-object/from16 v42, v15
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v15
 
-    move-object/from16 v78, v10
+    move-object/from16 v46, v10
 
     iget-object v10, v2, Lcom/google/android/gms/internal/measurement/cj;->aXT:Ljava/lang/String;
 
@@ -4105,7 +4400,7 @@
 
     invoke-virtual {v5, v6, v7, v1, v10}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -4113,7 +4408,7 @@
 
     const-string v5, "Filter definition"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v6
 
@@ -4123,19 +4418,19 @@
 
     invoke-virtual {v1, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_2e
+    goto :goto_2b
 
-    :cond_3e
-    move-object/from16 v76, v1
+    :cond_42
+    move-object/from16 v21, v1
 
-    move-object/from16 v78, v10
+    move-object/from16 v46, v10
 
-    move-object/from16 v77, v15
+    move-object/from16 v42, v15
 
-    :goto_2e
+    :goto_2b
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
-    if-eqz v1, :cond_4c
+    if-eqz v1, :cond_51
 
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
@@ -4145,18 +4440,18 @@
 
     const/16 v5, 0x100
 
-    if-le v1, v5, :cond_3f
+    if-le v1, v5, :cond_43
 
-    goto/16 :goto_36
+    goto/16 :goto_30
 
-    :cond_3f
-    if-eqz v23, :cond_47
+    :cond_43
+    if-eqz v23, :cond_4c
 
-    if-eqz v2, :cond_40
+    if-eqz v2, :cond_44
 
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
 
-    if-eqz v1, :cond_40
+    if-eqz v1, :cond_44
 
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXA:Ljava/lang/Boolean;
 
@@ -4164,21 +4459,21 @@
 
     move-result v1
 
-    if-eqz v1, :cond_40
+    if-eqz v1, :cond_44
 
     const/4 v1, 0x1
 
-    goto :goto_2f
+    goto :goto_2c
 
-    :cond_40
+    :cond_44
     const/4 v1, 0x0
 
-    :goto_2f
-    if-eqz v2, :cond_41
+    :goto_2c
+    if-eqz v2, :cond_45
 
     iget-object v6, v2, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
 
-    if-eqz v6, :cond_41
+    if-eqz v6, :cond_45
 
     iget-object v6, v2, Lcom/google/android/gms/internal/measurement/cj;->aXB:Ljava/lang/Boolean;
 
@@ -4186,16 +4481,16 @@
 
     move-result v6
 
-    if-eqz v6, :cond_41
+    if-eqz v6, :cond_45
 
     const/4 v6, 0x1
 
-    goto :goto_30
+    goto :goto_2d
 
-    :cond_41
+    :cond_45
     const/4 v6, 0x0
 
-    :goto_30
+    :goto_2d
     iget-object v7, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
     invoke-virtual {v7}, Ljava/lang/Integer;->intValue()I
@@ -4206,13 +4501,13 @@
 
     move-result v7
 
-    if-eqz v7, :cond_42
+    if-eqz v7, :cond_46
 
-    if-nez v1, :cond_42
+    if-nez v1, :cond_46
 
-    if-nez v6, :cond_42
+    if-nez v6, :cond_46
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -4228,22 +4523,24 @@
 
     invoke-virtual {v1, v6, v7, v2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    move-object/from16 v2, v73
+    move-object/from16 v5, v16
 
-    move-object/from16 v5, v74
+    move-object/from16 v2, v18
 
-    move-object/from16 v6, v75
+    move-object/from16 v6, v19
 
-    move-object/from16 v1, v76
+    move-object/from16 v1, v21
 
-    move-object/from16 v15, v77
+    move-object/from16 v15, v42
 
-    move-object/from16 v10, v78
+    move-object/from16 v10, v46
 
-    goto/16 :goto_33
+    move-object/from16 v7, p1
 
-    :cond_42
-    move-object/from16 v10, v72
+    goto/16 :goto_2a
+
+    :cond_46
+    move-object/from16 v10, v35
 
     move-object/from16 v7, p0
 
@@ -4251,39 +4548,61 @@
 
     move-result-object v15
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
     iget-object v5, v5, Lcom/google/android/gms/measurement/internal/o;->bky:Lcom/google/android/gms/measurement/internal/q;
 
-    move-object/from16 v79, v10
+    move-object/from16 v35, v10
 
     const-string v10, "Property filter result"
 
-    if-nez v15, :cond_43
+    if-nez v15, :cond_47
 
-    const-string v16, "null"
+    const-string v20, "null"
 
-    move-object/from16 v80, v12
+    move-object/from16 v44, v12
 
-    move-object/from16 v12, v16
+    move-object/from16 v12, v20
 
-    goto :goto_31
+    goto :goto_2e
 
-    :cond_43
-    move-object/from16 v80, v12
+    :cond_47
+    move-object/from16 v44, v12
 
     move-object v12, v15
 
-    :goto_31
+    :goto_2e
     invoke-virtual {v5, v10, v12}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    if-nez v15, :cond_44
+    if-nez v15, :cond_48
 
-    goto/16 :goto_35
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    :cond_44
+    move-result-object v1
+
+    invoke-interface {v14, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+    move-object/from16 v5, v16
+
+    move-object/from16 v2, v18
+
+    move-object/from16 v6, v19
+
+    move-object/from16 v1, v21
+
+    move-object/from16 v15, v42
+
+    move-object/from16 v12, v44
+
+    move-object/from16 v10, v46
+
+    move-object/from16 v7, p1
+
+    goto/16 :goto_2a
+
+    :cond_48
     iget-object v5, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
     invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
@@ -4308,18 +4627,18 @@
 
     move-result v5
 
-    if-eqz v5, :cond_48
+    if-eqz v5, :cond_4b
 
-    if-nez v1, :cond_45
+    if-nez v1, :cond_49
 
-    if-eqz v6, :cond_48
+    if-eqz v6, :cond_4b
 
-    :cond_45
+    :cond_49
     iget-object v1, v4, Lcom/google/android/gms/internal/measurement/cw;->aZw:Ljava/lang/Long;
 
-    if-eqz v1, :cond_48
+    if-eqz v1, :cond_4b
 
-    if-eqz v6, :cond_46
+    if-eqz v6, :cond_4a
 
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
@@ -4335,9 +4654,25 @@
 
     invoke-static {v9, v1, v5, v6}, Lcom/google/android/gms/measurement/internal/ef;->b(Ljava/util/Map;IJ)V
 
-    goto :goto_32
+    move-object/from16 v5, v16
 
-    :cond_46
+    move-object/from16 v2, v18
+
+    move-object/from16 v6, v19
+
+    move-object/from16 v1, v21
+
+    move-object/from16 v15, v42
+
+    move-object/from16 v12, v44
+
+    move-object/from16 v10, v46
+
+    move-object/from16 v7, p1
+
+    goto/16 :goto_2a
+
+    :cond_4a
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
@@ -4352,12 +4687,45 @@
 
     invoke-static {v0, v1, v5, v6}, Lcom/google/android/gms/measurement/internal/ef;->a(Ljava/util/Map;IJ)V
 
-    goto :goto_32
+    move-object/from16 v5, v16
 
-    :cond_47
-    move-object/from16 v80, v12
+    move-object/from16 v2, v18
 
-    move-object/from16 v79, v72
+    move-object/from16 v6, v19
+
+    move-object/from16 v1, v21
+
+    move-object/from16 v15, v42
+
+    move-object/from16 v12, v44
+
+    move-object/from16 v10, v46
+
+    move-object/from16 v7, p1
+
+    goto/16 :goto_2a
+
+    :cond_4b
+    move-object/from16 v5, v16
+
+    move-object/from16 v2, v18
+
+    move-object/from16 v6, v19
+
+    move-object/from16 v1, v21
+
+    move-object/from16 v15, v42
+
+    move-object/from16 v12, v44
+
+    move-object/from16 v10, v46
+
+    move-object/from16 v7, p1
+
+    goto/16 :goto_2a
+
+    :cond_4c
+    move-object/from16 v44, v12
 
     move-object/from16 v7, p0
 
@@ -4371,9 +4739,9 @@
 
     move-result v1
 
-    if-eqz v1, :cond_49
+    if-eqz v1, :cond_4d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -4389,35 +4757,30 @@
 
     invoke-virtual {v1, v5, v6, v2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_48
-    :goto_32
-    move-object/from16 v2, v73
+    move-object/from16 v5, v16
 
-    move-object/from16 v5, v74
+    move-object/from16 v2, v18
 
-    move-object/from16 v6, v75
+    move-object/from16 v6, v19
 
-    move-object/from16 v1, v76
+    move-object/from16 v1, v21
 
-    move-object/from16 v15, v77
+    move-object/from16 v15, v42
 
-    move-object/from16 v10, v78
+    move-object/from16 v12, v44
 
-    move-object/from16 v72, v79
+    move-object/from16 v10, v46
 
-    move-object/from16 v12, v80
-
-    :goto_33
     move-object/from16 v7, p1
 
-    goto/16 :goto_2d
+    goto/16 :goto_2a
 
-    :cond_49
+    :cond_4d
     invoke-direct {v7, v2, v4}, Lcom/google/android/gms/measurement/internal/ef;->a(Lcom/google/android/gms/internal/measurement/cj;Lcom/google/android/gms/internal/measurement/cw;)Ljava/lang/Boolean;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -4425,30 +4788,45 @@
 
     const-string v6, "Property filter result"
 
-    if-nez v1, :cond_4a
+    if-nez v1, :cond_4e
 
     const-string v10, "null"
 
-    goto :goto_34
+    goto :goto_2f
 
-    :cond_4a
+    :cond_4e
     move-object v10, v1
 
-    :goto_34
+    :goto_2f
     invoke-virtual {v5, v6, v10}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    if-nez v1, :cond_4b
+    if-nez v1, :cond_4f
 
-    :goto_35
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
     invoke-interface {v14, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    goto :goto_32
+    move-object/from16 v5, v16
 
-    :cond_4b
+    move-object/from16 v2, v18
+
+    move-object/from16 v6, v19
+
+    move-object/from16 v1, v21
+
+    move-object/from16 v15, v42
+
+    move-object/from16 v12, v44
+
+    move-object/from16 v10, v46
+
+    move-object/from16 v7, p1
+
+    goto/16 :goto_2a
+
+    :cond_4f
     iget-object v5, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
     invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
@@ -4461,7 +4839,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_48
+    if-eqz v1, :cond_50
 
     iget-object v1, v2, Lcom/google/android/gms/internal/measurement/cj;->aXD:Ljava/lang/Integer;
 
@@ -4471,17 +4849,32 @@
 
     invoke-virtual {v11, v1}, Ljava/util/BitSet;->set(I)V
 
-    goto :goto_32
+    :cond_50
+    move-object/from16 v5, v16
 
-    :cond_4c
-    :goto_36
-    move-object/from16 v80, v12
+    move-object/from16 v2, v18
 
-    move-object/from16 v79, v72
+    move-object/from16 v6, v19
+
+    move-object/from16 v1, v21
+
+    move-object/from16 v15, v42
+
+    move-object/from16 v12, v44
+
+    move-object/from16 v10, v46
+
+    move-object/from16 v7, p1
+
+    goto/16 :goto_2a
+
+    :cond_51
+    :goto_30
+    move-object/from16 v44, v12
 
     move-object/from16 v7, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -4507,64 +4900,53 @@
 
     invoke-interface {v14, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    move-object/from16 v0, v68
+    move-object/from16 v0, p2
 
-    move/from16 v2, v70
+    move-object/from16 v5, v16
 
-    move-object/from16 v5, v74
+    move/from16 v2, v17
 
-    move-object/from16 v6, v75
+    move-object/from16 v6, v19
 
-    move-object/from16 v62, v76
+    move-object/from16 v47, v21
 
-    move-object/from16 v63, v77
+    move-object/from16 v48, v44
 
-    move-object/from16 v64, v78
-
-    move-object/from16 v57, v79
-
-    move-object/from16 v65, v80
-
-    goto :goto_37
-
-    :cond_4d
-    move-object/from16 v7, p0
-
-    move-object/from16 v62, v1
-
-    move-object/from16 v64, v10
-
-    move-object/from16 v65, v12
-
-    move-object/from16 v63, v15
-
-    move-object/from16 v0, v68
-
-    move/from16 v2, v70
-
-    move-object/from16 v57, v72
-
-    :goto_37
     move-object/from16 v1, p3
 
     move-object/from16 v7, p1
 
-    goto/16 :goto_2a
+    goto/16 :goto_27
 
-    :cond_4e
-    move-object/from16 v68, v0
+    :cond_52
+    move-object/from16 v7, p0
 
-    move/from16 v70, v2
+    move-object/from16 v0, p2
 
-    move-object/from16 v79, v57
+    move-object/from16 v47, v1
 
-    move-object/from16 v76, v62
+    move-object/from16 v46, v10
 
-    move-object/from16 v77, v63
+    move-object/from16 v48, v12
 
-    move-object/from16 v78, v64
+    move-object/from16 v42, v15
 
-    move-object/from16 v80, v65
+    move/from16 v2, v17
+
+    move-object/from16 v1, p3
+
+    move-object/from16 v7, p1
+
+    goto/16 :goto_27
+
+    :cond_53
+    move-object/from16 p2, v0
+
+    move/from16 v17, v2
+
+    move-object/from16 v21, v47
+
+    move-object/from16 v44, v48
 
     move-object/from16 v7, p0
 
@@ -4572,28 +4954,32 @@
 
     move-object/from16 v1, p3
 
-    goto/16 :goto_28
+    goto/16 :goto_25
 
-    :cond_4f
-    move-object/from16 v79, v57
+    :cond_54
+    move-object/from16 v21, v47
 
-    move-object/from16 v76, v62
-
-    move-object/from16 v77, v63
-
-    move-object/from16 v78, v64
-
-    move-object/from16 v80, v65
+    move-object/from16 v44, v48
 
     move-object/from16 v7, p0
 
-    invoke-interface/range {v80 .. v80}, Ljava/util/Map;->size()I
+    goto :goto_31
+
+    :cond_55
+    move-object/from16 v21, v47
+
+    move-object/from16 v44, v48
+
+    move-object/from16 v7, p0
+
+    :goto_31
+    invoke-interface/range {v44 .. v44}, Ljava/util/Map;->size()I
 
     move-result v0
 
     new-array v1, v0, [Lcom/google/android/gms/internal/measurement/co;
 
-    invoke-interface/range {v80 .. v80}, Ljava/util/Map;->keySet()Ljava/util/Set;
+    invoke-interface/range {v44 .. v44}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v0
 
@@ -4603,12 +4989,12 @@
 
     const/4 v3, 0x0
 
-    :goto_38
+    :goto_32
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
 
-    if-eqz v0, :cond_58
+    if-eqz v0, :cond_5e
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -4628,13 +5014,13 @@
 
     move-result v4
 
-    if-nez v4, :cond_57
+    if-nez v4, :cond_5d
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    move-object/from16 v5, v78
+    move-object/from16 v5, v46
 
     invoke-interface {v5, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -4642,13 +5028,13 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/co;
 
-    if-nez v4, :cond_50
+    if-nez v4, :cond_56
 
     new-instance v4, Lcom/google/android/gms/internal/measurement/co;
 
     invoke-direct {v4}, Lcom/google/android/gms/internal/measurement/co;-><init>()V
 
-    :cond_50
+    :cond_56
     add-int/lit8 v6, v3, 0x1
 
     aput-object v4, v1, v3
@@ -4671,7 +5057,7 @@
 
     move-result-object v8
 
-    move-object/from16 v9, v80
+    move-object/from16 v9, v44
 
     invoke-interface {v9, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -4691,7 +5077,7 @@
 
     move-result-object v8
 
-    move-object/from16 v10, v77
+    move-object/from16 v10, v42
 
     invoke-interface {v10, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -4705,7 +5091,7 @@
 
     iput-object v8, v3, Lcom/google/android/gms/internal/measurement/cu;->aZp:[J
 
-    if-eqz v23, :cond_55
+    if-eqz v23, :cond_5b
 
     iget-object v3, v4, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
 
@@ -4713,7 +5099,7 @@
 
     move-result-object v8
 
-    move-object/from16 v11, v76
+    move-object/from16 v11, v21
 
     invoke-interface {v11, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -4733,7 +5119,7 @@
 
     move-result-object v8
 
-    move-object/from16 v12, v79
+    move-object/from16 v12, v35
 
     invoke-interface {v12, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -4741,21 +5127,21 @@
 
     check-cast v8, Ljava/util/Map;
 
-    if-nez v8, :cond_51
+    if-nez v8, :cond_57
 
     const/4 v13, 0x0
 
     new-array v8, v13, [Lcom/google/android/gms/internal/measurement/cv;
 
-    move-object/from16 v81, v2
+    move-object/from16 p2, v2
 
-    move-object/from16 v82, v5
+    move-object/from16 v46, v5
 
     move-object v15, v8
 
-    goto/16 :goto_3c
+    goto/16 :goto_36
 
-    :cond_51
+    :cond_57
     const/4 v13, 0x0
 
     invoke-interface {v8}, Ljava/util/Map;->size()I
@@ -4774,12 +5160,12 @@
 
     const/16 v17, 0x0
 
-    :goto_39
+    :goto_33
     invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v18
 
-    if-eqz v18, :cond_54
+    if-eqz v18, :cond_5a
 
     invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -4789,7 +5175,7 @@
 
     check-cast v13, Ljava/lang/Integer;
 
-    move-object/from16 v81, v2
+    move-object/from16 p2, v2
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/cv;
 
@@ -4803,11 +5189,11 @@
 
     check-cast v13, Ljava/util/List;
 
-    if-eqz v13, :cond_53
+    if-eqz v13, :cond_59
 
     invoke-static {v13}, Ljava/util/Collections;->sort(Ljava/util/List;)V
 
-    move-object/from16 v82, v5
+    move-object/from16 v46, v5
 
     invoke-interface {v13}, Ljava/util/List;->size()I
 
@@ -4821,12 +5207,12 @@
 
     const/16 v18, 0x0
 
-    :goto_3a
+    :goto_34
     invoke-interface {v13}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v19
 
-    if-eqz v19, :cond_52
+    if-eqz v19, :cond_58
 
     invoke-interface {v13}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -4844,67 +5230,67 @@
 
     move/from16 v18, v20
 
-    goto :goto_3a
+    goto :goto_34
 
-    :cond_52
+    :cond_58
     iput-object v5, v2, Lcom/google/android/gms/internal/measurement/cv;->aZu:[J
 
-    goto :goto_3b
+    goto :goto_35
 
-    :cond_53
-    move-object/from16 v82, v5
+    :cond_59
+    move-object/from16 v46, v5
 
-    :goto_3b
+    :goto_35
     add-int/lit8 v5, v17, 0x1
 
     aput-object v2, v15, v17
 
+    move-object/from16 v2, p2
+
     move/from16 v17, v5
 
-    move-object/from16 v2, v81
-
-    move-object/from16 v5, v82
+    move-object/from16 v5, v46
 
     const/4 v13, 0x0
 
-    goto :goto_39
+    goto :goto_33
 
-    :cond_54
-    move-object/from16 v81, v2
+    :cond_5a
+    move-object/from16 p2, v2
 
-    move-object/from16 v82, v5
+    move-object/from16 v46, v5
 
-    :goto_3c
+    :goto_36
     iput-object v15, v3, Lcom/google/android/gms/internal/measurement/cu;->aZs:[Lcom/google/android/gms/internal/measurement/cv;
 
-    goto :goto_3d
+    goto :goto_37
 
-    :cond_55
-    move-object/from16 v81, v2
+    :cond_5b
+    move-object/from16 p2, v2
 
-    move-object/from16 v82, v5
+    move-object/from16 v46, v5
 
-    move-object/from16 v11, v76
+    move-object/from16 v11, v21
 
-    move-object/from16 v12, v79
+    move-object/from16 v12, v35
 
-    :goto_3d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zf()Lcom/google/android/gms/measurement/internal/el;
+    :goto_37
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     move-result-object v2
 
     iget-object v3, v4, Lcom/google/android/gms/internal/measurement/co;->aYn:Lcom/google/android/gms/internal/measurement/cu;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     :try_start_3
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v4
 
@@ -4918,7 +5304,7 @@
 
     invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
     :try_end_3
     .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_5
 
@@ -4966,9 +5352,9 @@
 
     cmp-long v0, v3, v15
 
-    if-nez v0, :cond_56
+    if-nez v0, :cond_5c
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -4984,20 +5370,20 @@
     :try_end_5
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_3
 
-    goto :goto_40
+    goto :goto_39
 
     :catch_3
     move-exception v0
 
-    goto :goto_3e
+    goto :goto_38
 
     :catch_4
     move-exception v0
 
     const/4 v13, 0x0
 
-    :goto_3e
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    :goto_38
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -5005,7 +5391,13 @@
 
     const-string v3, "Error storing filter results. appId"
 
-    goto :goto_3f
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-virtual {v2, v3, v4, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    goto :goto_39
 
     :catch_5
     move-exception v0
@@ -5014,7 +5406,7 @@
 
     const/4 v13, 0x0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -5022,37 +5414,34 @@
 
     const-string v3, "Configuration loss. Failed to serialize filter results. appId"
 
-    :goto_3f
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
     invoke-virtual {v2, v3, v4, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    :cond_56
-    :goto_40
+    :cond_5c
+    :goto_39
+    move-object/from16 v2, p2
+
     move v3, v6
 
-    move-object/from16 v80, v9
+    move-object/from16 v44, v9
 
-    move-object/from16 v77, v10
+    move-object/from16 v42, v10
 
-    move-object/from16 v76, v11
+    move-object/from16 v21, v11
 
-    move-object/from16 v79, v12
+    move-object/from16 v35, v12
 
-    move-object/from16 v2, v81
+    goto/16 :goto_32
 
-    move-object/from16 v78, v82
-
-    goto/16 :goto_38
-
-    :cond_57
+    :cond_5d
     move-object/from16 v8, p1
 
-    goto/16 :goto_38
+    goto/16 :goto_32
 
-    :cond_58
+    :cond_5e
     invoke-static {v1, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
@@ -5062,7 +5451,7 @@
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
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 dbe86d8cda..0ac1968a88 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
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method static Ah()Ljava/lang/String;
+.method static Ag()Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/e;->biM:Lcom/google/android/gms/measurement/internal/e$a;
@@ -42,7 +42,7 @@
     return-object v0
 .end method
 
-.method public static Aj()J
+.method public static Ai()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/e;->bjp:Lcom/google/android/gms/measurement/internal/e$a;
@@ -60,7 +60,7 @@
     return-wide v0
 .end method
 
-.method public static Ak()J
+.method public static Aj()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/e;->biP:Lcom/google/android/gms/measurement/internal/e$a;
@@ -78,7 +78,7 @@
     return-wide v0
 .end method
 
-.method public static Am()Z
+.method public static Al()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/e;->biL:Lcom/google/android/gms/measurement/internal/e$a;
@@ -96,7 +96,7 @@
     return v0
 .end method
 
-.method static An()Z
+.method static Am()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/e;->bjK:Lcom/google/android/gms/measurement/internal/e$a;
@@ -114,7 +114,7 @@
     return v0
 .end method
 
-.method static Ao()Z
+.method static An()Z
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -136,7 +136,7 @@
 
 
 # virtual methods
-.method public final Ai()Z
+.method public final Ah()Z
     .locals 1
 
     const-string v0, "firebase_analytics_collection_deactivated"
@@ -163,7 +163,7 @@
     return v0
 .end method
 
-.method public final Al()Ljava/lang/String;
+.method public final Ak()Ljava/lang/String;
     .locals 7
 
     :try_start_0
@@ -223,7 +223,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -231,12 +231,14 @@
 
     const-string v2, "SystemProperties.get() threw an exception"
 
+    invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :catch_1
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -244,12 +246,14 @@
 
     const-string v2, "Could not access SystemProperties.get()"
 
+    invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :catch_2
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -257,12 +261,14 @@
 
     const-string v2, "Could not find SystemProperties.get() method"
 
+    invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
     goto :goto_0
 
     :catch_3
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -270,9 +276,9 @@
 
     const-string v2, "Could not find SystemProperties class"
 
-    :goto_0
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
+    :goto_0
     const-string v0, ""
 
     return-object v0
@@ -299,8 +305,6 @@
 
     if-nez p1, :cond_0
 
-    :catch_0
-    :goto_0
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
 
     move-result-object p1
@@ -328,7 +332,17 @@
 
     if-eqz v0, :cond_1
 
-    goto :goto_0
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide p1
+
+    return-wide p1
 
     :cond_1
     :try_start_0
@@ -348,11 +362,24 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v0
+    move-result-wide p1
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v0
+    return-wide p1
+
+    :catch_0
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide p1
+
+    return-wide p1
 .end method
 
 .method public final b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/e$a;)I
@@ -376,8 +403,6 @@
 
     if-nez p1, :cond_0
 
-    :catch_0
-    :goto_0
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
 
     move-result-object p1
@@ -405,7 +430,17 @@
 
     if-eqz v0, :cond_1
 
-    goto :goto_0
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    return p1
 
     :cond_1
     :try_start_0
@@ -430,6 +465,19 @@
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
     return p1
+
+    :catch_0
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    return p1
 .end method
 
 .method public final c(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/e$a;)Z
@@ -453,12 +501,10 @@
 
     if-nez p1, :cond_0
 
-    :goto_0
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
 
     move-result-object p1
 
-    :goto_1
     check-cast p1, Ljava/lang/Boolean;
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
@@ -482,7 +528,17 @@
 
     if-eqz v0, :cond_1
 
-    goto :goto_0
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/e$a;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    return p1
 
     :cond_1
     invoke-static {p1}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
@@ -497,7 +553,13 @@
 
     move-result-object p1
 
-    goto :goto_1
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    return p1
 .end method
 
 .method public final db(Ljava/lang/String;)I
@@ -544,7 +606,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -581,7 +643,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -598,7 +660,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -639,7 +701,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -752,15 +814,15 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     return-void
 .end method
 
-.method final sB()Z
+.method final sA()Z
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -814,17 +876,17 @@
     return v0
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final ut()Z
+.method public final us()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aVt:Ljava/lang/Boolean;
@@ -846,7 +908,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->md()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mc()Ljava/lang/String;
 
     move-result-object v1
 
@@ -885,7 +947,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aVt:Ljava/lang/Boolean;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -920,84 +982,84 @@
     return v0
 .end method
 
-.method public final bridge synthetic yA()V
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yH()Lcom/google/android/gms/measurement/internal/es;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic yy()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yy()V
 
     return-void
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/es;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method public final bridge synthetic yz()V
     .locals 0
 
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 d49c40630d..bed9dfd648 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
@@ -418,7 +418,7 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dl;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -444,7 +444,7 @@
 .method static synthetic AA()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpx:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpz:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -452,7 +452,7 @@
 .method static synthetic AB()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpz:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpy:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -460,20 +460,12 @@
 .method static synthetic AC()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpy:[Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method static synthetic AD()[Ljava/lang/String;
-    .locals 1
-
     sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpA:[Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method private final Ax()Z
+.method private final Aw()Z
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->getContext()Landroid/content/Context;
@@ -493,7 +485,7 @@
     return v0
 .end method
 
-.method static synthetic Ay()[Ljava/lang/String;
+.method static synthetic Ax()[Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpv:[Ljava/lang/String;
@@ -501,7 +493,7 @@
     return-object v0
 .end method
 
-.method static synthetic Az()[Ljava/lang/String;
+.method static synthetic Ay()[Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpw:[Ljava/lang/String;
@@ -509,6 +501,14 @@
     return-object v0
 .end method
 
+.method static synthetic Az()[Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/el;->bpx:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method private final a(Ljava/lang/String;[Ljava/lang/String;J)J
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
@@ -523,38 +523,34 @@
     :try_start_0
     invoke-virtual {v0, p1, p2}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p2
+    move-result-object v1
+
+    invoke-interface {v1}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_1
+
+    const/4 p2, 0x0
+
+    invoke-interface {v1, p2}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide p1
     :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {p2}, Landroid/database/Cursor;->moveToFirst()Z
+    if-eqz v1, :cond_0
 
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const/4 p3, 0x0
-
-    invoke-interface {p2, p3}, Landroid/database/Cursor;->getLong(I)J
-
-    move-result-wide p3
-    :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 p2, :cond_0
-
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return-wide p3
+    return-wide p1
 
     :cond_1
-    if-eqz p2, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_2
     return-wide p3
@@ -562,42 +558,27 @@
     :catchall_0
     move-exception p1
 
-    move-object v1, p2
-
-    goto :goto_1
-
-    :catch_0
-    move-exception p3
-
-    move-object v1, p2
-
     goto :goto_0
 
-    :catchall_1
-    move-exception p1
+    :catch_0
+    move-exception p2
 
-    goto :goto_1
+    :try_start_1
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
-    :catch_1
-    move-exception p3
+    move-result-object p3
 
-    :goto_0
-    :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
-
-    move-result-object p2
-
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
 
     const-string p4, "Database error"
 
-    invoke-virtual {p2, p4, p1, p3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-virtual {p3, p4, p1, p2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    throw p3
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    throw p2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :goto_1
+    :goto_0
     if-eqz v1, :cond_3
 
     invoke-interface {v1}, Landroid/database/Cursor;->close()V
@@ -627,7 +608,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -644,7 +625,7 @@
     return-object v1
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -686,7 +667,7 @@
     return-object p1
 
     :pswitch_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -766,9 +747,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -784,7 +765,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -812,7 +793,7 @@
 
     :cond_0
     :try_start_0
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v0
 
@@ -826,7 +807,7 @@
 
     invoke-virtual {p3, v2}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -883,7 +864,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -907,7 +888,7 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -926,7 +907,7 @@
     :catch_1
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -948,9 +929,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -966,7 +947,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -994,7 +975,7 @@
 
     :cond_0
     :try_start_0
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v0
 
@@ -1008,7 +989,7 @@
 
     invoke-virtual {p3, v2}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -1065,7 +1046,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -1091,7 +1072,7 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -1110,7 +1091,7 @@
     :catch_1
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -1141,89 +1122,70 @@
     :try_start_0
     invoke-virtual {v0, p1, p2}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p2
+    move-result-object v1
+
+    invoke-interface {v1}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_1
+
+    const/4 p2, 0x0
+
+    invoke-interface {v1, p2}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide p1
     :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    if-eqz v1, :cond_0
+
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
+
+    :cond_0
+    return-wide p1
+
+    :cond_1
     :try_start_1
-    invoke-interface {p2}, Landroid/database/Cursor;->moveToFirst()Z
+    new-instance p2, Landroid/database/sqlite/SQLiteException;
 
-    move-result v0
+    const-string v0, "Database returned empty set"
 
-    if-eqz v0, :cond_1
+    invoke-direct {p2, v0}, Landroid/database/sqlite/SQLiteException;-><init>(Ljava/lang/String;)V
 
-    const/4 v0, 0x0
-
-    invoke-interface {p2, v0}, Landroid/database/Cursor;->getLong(I)J
-
-    move-result-wide v0
+    throw p2
     :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 p2, :cond_0
-
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
-
-    :cond_0
-    return-wide v0
-
-    :cond_1
-    :try_start_2
-    new-instance v0, Landroid/database/sqlite/SQLiteException;
-
-    const-string v1, "Database returned empty set"
-
-    invoke-direct {v0, v1}, Landroid/database/sqlite/SQLiteException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-    :try_end_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
     :catchall_0
     move-exception p1
 
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    move-object v1, p2
-
     goto :goto_0
 
-    :catchall_1
-    move-exception p1
+    :catch_0
+    move-exception p2
 
-    move-object p2, v1
+    :try_start_2
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
-    goto :goto_1
+    move-result-object v0
 
-    :catch_1
-    move-exception v0
-
-    :goto_0
-    :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
-
-    move-result-object p2
-
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
 
     const-string v2, "Database error"
 
-    invoke-virtual {p2, v2, p1, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-virtual {v0, v2, p1, p2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    throw v0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+    throw p2
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    :goto_1
-    if-eqz p2, :cond_2
+    :goto_0
+    if-eqz v1, :cond_2
 
-    invoke-interface {p2}, Landroid/database/Cursor;->close()V
+    invoke-interface {v1}, Landroid/database/Cursor;->close()V
 
     :cond_2
     throw p1
@@ -1243,9 +1205,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1268,7 +1230,7 @@
     :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/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v2
 
@@ -1434,7 +1396,7 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1453,7 +1415,7 @@
 
 
 # virtual methods
-.method public final Ap()Ljava/lang/String;
+.method public final Ao()Ljava/lang/String;
     .locals 6
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1485,7 +1447,7 @@
 
     invoke-interface {v0, v2}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
@@ -1495,7 +1457,7 @@
     invoke-interface {v0}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return-object v2
+    return-object v1
 
     :cond_1
     if-eqz v0, :cond_2
@@ -1528,7 +1490,7 @@
 
     :goto_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -1559,7 +1521,7 @@
     throw v1
 .end method
 
-.method public final Aq()Z
+.method public final Ap()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from queue where has_realtime = 1"
@@ -1586,16 +1548,16 @@
     return v0
 .end method
 
-.method final Ar()V
+.method final Aq()V
     .locals 7
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/el;->Ax()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/el;->Aw()Z
 
     move-result v0
 
@@ -1604,7 +1566,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1614,7 +1576,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v2
 
@@ -1644,7 +1606,7 @@
 
     if-lez v6, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -1652,11 +1614,11 @@
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/ab;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/el;->Ax()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/el;->Aw()Z
 
     move-result v0
 
@@ -1672,7 +1634,7 @@
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v3
 
@@ -1688,7 +1650,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Aj()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ai()J
 
     move-result-wide v3
 
@@ -1708,7 +1670,7 @@
 
     if-lez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1726,7 +1688,7 @@
     return-void
 .end method
 
-.method public final As()J
+.method public final Ar()J
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1744,7 +1706,7 @@
     return-wide v0
 .end method
 
-.method public final At()J
+.method public final As()J
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -1762,7 +1724,7 @@
     return-wide v0
 .end method
 
-.method public final Au()Z
+.method public final At()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from raw_events"
@@ -1789,7 +1751,7 @@
     return v0
 .end method
 
-.method public final Av()Z
+.method public final Au()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from raw_events where realtime = 1"
@@ -1816,8 +1778,8 @@
     return v0
 .end method
 
-.method public final Aw()J
-    .locals 7
+.method public final Av()J
+    .locals 6
 
     const-wide/16 v0, -0x1
 
@@ -1832,75 +1794,52 @@
 
     invoke-virtual {v3, v4, v2}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object v3
+    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_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {v3}, Landroid/database/Cursor;->moveToFirst()Z
+    if-nez v3, :cond_1
 
-    move-result v2
-    :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_0
 
-    if-nez v2, :cond_1
-
-    if-eqz v3, :cond_0
-
-    invoke-interface {v3}, Landroid/database/Cursor;->close()V
+    invoke-interface {v2}, Landroid/database/Cursor;->close()V
 
     :cond_0
     return-wide v0
 
     :cond_1
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    :try_start_2
-    invoke-interface {v3, v2}, Landroid/database/Cursor;->getLong(I)J
+    :try_start_1
+    invoke-interface {v2, v3}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v4
-    :try_end_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    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 v3, :cond_2
+    if-eqz v2, :cond_2
 
-    invoke-interface {v3}, Landroid/database/Cursor;->close()V
+    invoke-interface {v2}, Landroid/database/Cursor;->close()V
 
     :cond_2
-    return-wide v4
+    return-wide v0
 
     :catchall_0
     move-exception v0
 
-    move-object v2, v3
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v2
-
-    move-object v6, v3
-
-    move-object v3, v2
-
-    move-object v2, v6
-
     goto :goto_0
 
-    :catchall_1
-    move-exception v0
-
-    goto :goto_1
-
-    :catch_1
+    :catch_0
     move-exception v3
 
-    :goto_0
-    :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    :try_start_2
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -1909,8 +1848,8 @@
     const-string v5, "Error querying raw events"
 
     invoke-virtual {v4, v5, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     if-eqz v2, :cond_3
 
@@ -1919,7 +1858,7 @@
     :cond_3
     return-wide v0
 
-    :goto_1
+    :goto_0
     if-eqz v2, :cond_4
 
     invoke-interface {v2}, Landroid/database/Cursor;->close()V
@@ -1939,9 +1878,9 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/16 v16, 0x0
 
@@ -2070,19 +2009,16 @@
 
     const-wide/16 v1, 0x0
 
-    :goto_0
-    move-wide v11, v1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     invoke-interface {v8, v12}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v1
 
-    goto :goto_0
+    :goto_0
+    move-wide v11, v1
 
-    :goto_1
     invoke-interface {v8, v13}, Landroid/database/Cursor;->isNull(I)Z
 
     move-result v1
@@ -2091,7 +2027,7 @@
 
     move-object/from16 v13, v16
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-interface {v8, v13}, Landroid/database/Cursor;->getLong(I)J
@@ -2104,7 +2040,7 @@
 
     move-object v13, v1
 
-    :goto_2
+    :goto_1
     invoke-interface {v8, v14}, Landroid/database/Cursor;->isNull(I)Z
 
     move-result v1
@@ -2113,7 +2049,7 @@
 
     move-object/from16 v14, v16
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     invoke-interface {v8, v14}, Landroid/database/Cursor;->getLong(I)J
@@ -2126,7 +2062,7 @@
 
     move-object v14, v1
 
-    :goto_3
+    :goto_2
     invoke-interface {v8, v0}, Landroid/database/Cursor;->isNull(I)Z
 
     move-result v1
@@ -2135,10 +2071,10 @@
 
     move-object/from16 v0, v16
 
-    :goto_4
+    :goto_3
     const/4 v1, 0x7
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     invoke-interface {v8, v0}, Landroid/database/Cursor;->getLong(I)J
@@ -2149,9 +2085,9 @@
 
     move-result-object v0
 
-    goto :goto_4
+    goto :goto_3
 
-    :goto_5
+    :goto_4
     invoke-interface {v8, v1}, Landroid/database/Cursor;->isNull(I)Z
 
     move-result v2
@@ -2177,12 +2113,12 @@
 
     move-object/from16 v17, v1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     move-object/from16 v17, v16
 
-    :goto_6
+    :goto_5
     new-instance v18, Lcom/google/android/gms/measurement/internal/eu;
     :try_end_2
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_1
@@ -2217,7 +2153,7 @@
 
     if-eqz v0, :cond_8
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -2245,37 +2181,37 @@
     :catch_0
     move-exception v0
 
-    goto :goto_7
+    goto :goto_6
 
     :catchall_0
     move-exception v0
 
     move-object/from16 v21, v8
 
-    goto :goto_8
+    goto :goto_7
 
     :catch_1
     move-exception v0
 
     move-object/from16 v21, v8
 
-    goto :goto_7
+    goto :goto_6
 
     :catchall_1
     move-exception v0
 
     move-object/from16 v21, v16
 
-    goto :goto_8
+    goto :goto_7
 
     :catch_2
     move-exception v0
 
     move-object/from16 v21, v16
 
-    :goto_7
+    :goto_6
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2287,7 +2223,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -2311,13 +2247,15 @@
     :catchall_2
     move-exception v0
 
-    :goto_8
+    :goto_7
     if-eqz v21, :cond_b
 
     invoke-interface/range {v21 .. v21}, Landroid/database/Cursor;->close()V
 
     :cond_b
     throw v0
+
+    return-void
 .end method
 
 .method public final L(Ljava/lang/String;Ljava/lang/String;)V
@@ -2329,9 +2267,9 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     :try_start_0
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -2358,7 +2296,7 @@
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2379,7 +2317,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2391,7 +2329,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v3
 
@@ -2415,9 +2353,9 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v9, 0x0
 
@@ -2524,7 +2462,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2586,7 +2524,7 @@
 
     :goto_0
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2598,7 +2536,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -2640,9 +2578,9 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v8, 0x0
 
@@ -2731,12 +2669,12 @@
 
     aput-object v7, v13, v2
 
-    const/16 v16, 0x0
-
     const/16 v17, 0x0
 
     const/16 v18, 0x0
 
+    const/16 v19, 0x0
+
     const/16 v6, 0x9
 
     move-object v12, v0
@@ -2745,13 +2683,13 @@
 
     const/4 v6, 0x7
 
-    move-object/from16 v14, v16
+    move-object/from16 v14, v17
 
     const/4 v0, 0x6
 
-    move-object/from16 v15, v17
+    move-object/from16 v15, v18
 
-    move-object/from16 v16, v18
+    move-object/from16 v16, v19
 
     invoke-virtual/range {v9 .. v16}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
@@ -2815,7 +2753,7 @@
 
     move-result-wide v26
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v1
 
@@ -2837,9 +2775,9 @@
 
     invoke-interface {v9, v0}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v21
+    move-result-wide v12
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v0
 
@@ -2869,7 +2807,7 @@
 
     move-result-wide v29
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v0
 
@@ -2907,6 +2845,8 @@
 
     move-object/from16 v18, p1
 
+    move-wide/from16 v21, v12
+
     invoke-direct/range {v17 .. v31}, Lcom/google/android/gms/measurement/internal/zzl;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzfh;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;)V
 
     invoke-interface {v9}, Landroid/database/Cursor;->moveToNext()Z
@@ -2915,7 +2855,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2927,7 +2867,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -2985,7 +2925,7 @@
 
     :goto_1
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -2997,7 +2937,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -3037,9 +2977,9 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v0, 0x0
 
@@ -3064,16 +3004,16 @@
 
     invoke-virtual {v1, v2, v3, v4}, Landroid/database/sqlite/SQLiteDatabase;->delete(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)I
 
-    move-result v1
+    move-result p1
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v1
+    return p1
 
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3085,7 +3025,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -3114,9 +3054,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -3189,7 +3129,7 @@
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
@@ -3199,7 +3139,7 @@
     invoke-interface {p2}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return-object v0
+    return-object p1
 
     :cond_1
     :try_start_2
@@ -3262,7 +3202,7 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3312,7 +3252,7 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3345,6 +3285,8 @@
 
     :cond_5
     throw p1
+
+    return-void
 .end method
 
 .method final Q(Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;
@@ -3363,9 +3305,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -3438,7 +3380,7 @@
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
@@ -3448,7 +3390,7 @@
     invoke-interface {p2}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return-object v0
+    return-object p1
 
     :cond_1
     :try_start_2
@@ -3511,7 +3453,7 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -3561,7 +3503,7 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3594,6 +3536,8 @@
 
     :cond_5
     throw p1
+
+    return-void
 .end method
 
 .method protected final R(Ljava/lang/String;Ljava/lang/String;)J
@@ -3605,9 +3549,9 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -3702,7 +3646,7 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -3764,7 +3708,7 @@
 
     if-nez v5, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3792,6 +3736,8 @@
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
+    invoke-virtual {v0}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
+
     goto :goto_1
 
     :catch_0
@@ -3811,7 +3757,7 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -3827,9 +3773,9 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :goto_1
     invoke-virtual {v0}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
+    :goto_1
     return-wide v9
 
     :goto_2
@@ -3839,314 +3785,298 @@
 .end method
 
 .method public final a(JLjava/lang/String;ZZZZZ)Lcom/google/android/gms/measurement/internal/em;
-    .locals 19
+    .locals 18
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     invoke-static/range {p3 .. p3}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v0, 0x1
 
-    new-array v2, v0, [Ljava/lang/String;
+    new-array v1, v0, [Ljava/lang/String;
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    aput-object p3, v2, v3
+    aput-object p3, v1, v2
 
-    new-instance v4, Lcom/google/android/gms/measurement/internal/em;
+    new-instance v3, Lcom/google/android/gms/measurement/internal/em;
 
-    invoke-direct {v4}, Lcom/google/android/gms/measurement/internal/em;-><init>()V
+    invoke-direct {v3}, Lcom/google/android/gms/measurement/internal/em;-><init>()V
 
     :try_start_0
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
-    move-result-object v14
+    move-result-object v13
 
-    const-string v7, "apps"
+    const-string v6, "apps"
 
-    const/4 v6, 0x6
+    const/4 v5, 0x6
 
-    new-array v8, v6, [Ljava/lang/String;
+    new-array v7, v5, [Ljava/lang/String;
 
-    const-string v6, "day"
+    const-string v5, "day"
 
-    aput-object v6, v8, v3
+    aput-object v5, v7, v2
 
-    const-string v6, "daily_events_count"
+    const-string v5, "daily_events_count"
 
-    aput-object v6, v8, v0
+    aput-object v5, v7, v0
 
-    const-string v6, "daily_public_events_count"
+    const-string v5, "daily_public_events_count"
 
-    const/4 v15, 0x2
+    const/4 v14, 0x2
 
-    aput-object v6, v8, v15
+    aput-object v5, v7, v14
 
-    const-string v6, "daily_conversions_count"
+    const-string v5, "daily_conversions_count"
 
-    const/4 v13, 0x3
+    const/4 v15, 0x3
 
-    aput-object v6, v8, v13
+    aput-object v5, v7, v15
 
-    const-string v6, "daily_error_events_count"
+    const-string v5, "daily_error_events_count"
 
     const/4 v12, 0x4
 
-    aput-object v6, v8, v12
+    aput-object v5, v7, v12
 
-    const-string v6, "daily_realtime_events_count"
+    const-string v5, "daily_realtime_events_count"
 
     const/4 v11, 0x5
 
-    aput-object v6, v8, v11
+    aput-object v5, v7, v11
 
-    const-string v9, "app_id=?"
+    const-string v8, "app_id=?"
 
-    new-array v10, v0, [Ljava/lang/String;
+    new-array v9, v0, [Ljava/lang/String;
 
-    aput-object p3, v10, v3
+    aput-object p3, v9, v2
+
+    const/4 v10, 0x0
 
     const/16 v16, 0x0
 
     const/16 v17, 0x0
 
-    const/16 v18, 0x0
+    move-object v5, v13
 
-    move-object v6, v14
-
-    const/4 v5, 0x5
+    const/4 v4, 0x5
 
     move-object/from16 v11, v16
 
-    const/4 v5, 0x4
+    const/4 v4, 0x4
 
     move-object/from16 v12, v17
 
-    const/4 v5, 0x3
+    invoke-virtual/range {v5 .. v12}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-object/from16 v13, v18
-
-    invoke-virtual/range {v6 .. v13}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-
-    move-result-object v6
+    move-result-object v5
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-interface {v6}, Landroid/database/Cursor;->moveToFirst()Z
+    invoke-interface {v5}, Landroid/database/Cursor;->moveToFirst()Z
 
-    move-result v7
+    move-result v6
 
-    if-nez v7, :cond_1
+    if-nez v6, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/o;->bkt:Lcom/google/android/gms/measurement/internal/q;
 
-    const-string v2, "Not updating daily counts, app is not known. appId"
+    const-string v1, "Not updating daily counts, app is not known. appId"
 
     invoke-static/range {p3 .. p3}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz v6, :cond_0
+    if-eqz v5, :cond_0
 
-    invoke-interface {v6}, Landroid/database/Cursor;->close()V
+    invoke-interface {v5}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return-object v4
+    return-object v3
 
     :cond_1
     :try_start_2
-    invoke-interface {v6, v3}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v5, v2}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    cmp-long v3, v7, p1
+    cmp-long v2, v6, p1
 
-    if-nez v3, :cond_2
+    if-nez v2, :cond_2
 
-    invoke-interface {v6, v0}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v5, v0}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    iput-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpE:J
+    iput-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpE:J
 
-    invoke-interface {v6, v15}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v5, v14}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    iput-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpD:J
+    iput-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpD:J
 
-    invoke-interface {v6, v5}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v5, v15}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    iput-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpF:J
+    iput-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpF:J
 
-    const/4 v0, 0x4
+    invoke-interface {v5, v4}, Landroid/database/Cursor;->getLong(I)J
 
-    invoke-interface {v6, v0}, Landroid/database/Cursor;->getLong(I)J
+    move-result-wide v6
 
-    move-result-wide v7
-
-    iput-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpG:J
+    iput-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpG:J
 
     const/4 v0, 0x5
 
-    invoke-interface {v6, v0}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v5, v0}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    iput-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpH:J
+    iput-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpH:J
 
     :cond_2
-    const-wide/16 v7, 0x1
+    const-wide/16 v6, 0x1
 
     if-eqz p4, :cond_3
 
-    iget-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpE:J
+    iget-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpE:J
 
-    const/4 v0, 0x0
+    add-long/2addr v8, v6
 
-    add-long/2addr v11, v7
-
-    iput-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpE:J
+    iput-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpE:J
 
     :cond_3
     if-eqz p5, :cond_4
 
-    iget-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpD:J
+    iget-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpD:J
 
-    const/4 v0, 0x0
+    add-long/2addr v8, v6
 
-    add-long/2addr v11, v7
-
-    iput-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpD:J
+    iput-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpD:J
 
     :cond_4
     if-eqz p6, :cond_5
 
-    iget-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpF:J
+    iget-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpF:J
 
-    const/4 v0, 0x0
+    add-long/2addr v8, v6
 
-    add-long/2addr v11, v7
-
-    iput-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpF:J
+    iput-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpF:J
 
     :cond_5
     if-eqz p7, :cond_6
 
-    iget-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpG:J
+    iget-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpG:J
 
-    const/4 v0, 0x0
+    add-long/2addr v8, v6
 
-    add-long/2addr v11, v7
-
-    iput-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpG:J
+    iput-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpG:J
 
     :cond_6
     if-eqz p8, :cond_7
 
-    iget-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpH:J
+    iget-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpH:J
 
-    const/4 v0, 0x0
+    add-long/2addr v8, v6
 
-    add-long/2addr v11, v7
-
-    iput-wide v11, v4, Lcom/google/android/gms/measurement/internal/em;->bpH:J
+    iput-wide v8, v3, Lcom/google/android/gms/measurement/internal/em;->bpH:J
 
     :cond_7
     new-instance v0, Landroid/content/ContentValues;
 
     invoke-direct {v0}, Landroid/content/ContentValues;-><init>()V
 
-    const-string v3, "day"
+    const-string v2, "day"
 
     invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v0, v3, v5}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v0, v2, v4}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    const-string v3, "daily_public_events_count"
+    const-string v2, "daily_public_events_count"
 
-    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpD:J
+    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpD:J
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v0, v3, v5}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v0, v2, v4}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    const-string v3, "daily_events_count"
+    const-string v2, "daily_events_count"
 
-    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpE:J
+    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpE:J
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v0, v3, v5}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v0, v2, v4}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    const-string v3, "daily_conversions_count"
+    const-string v2, "daily_conversions_count"
 
-    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpF:J
+    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpF:J
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v0, v3, v5}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v0, v2, v4}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    const-string v3, "daily_error_events_count"
+    const-string v2, "daily_error_events_count"
 
-    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpG:J
+    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpG:J
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v0, v3, v5}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v0, v2, v4}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    const-string v3, "daily_realtime_events_count"
+    const-string v2, "daily_realtime_events_count"
 
-    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/em;->bpH:J
+    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/em;->bpH:J
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v0, v3, v5}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
+    invoke-virtual {v0, v2, v4}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    const-string v3, "apps"
+    const-string v2, "apps"
 
-    const-string v5, "app_id=?"
+    const-string v4, "app_id=?"
 
-    invoke-virtual {v14, v3, v0, v5, v2}, Landroid/database/sqlite/SQLiteDatabase;->update(Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I
+    invoke-virtual {v13, v2, v0, v4, v1}, Landroid/database/sqlite/SQLiteDatabase;->update(Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I
     :try_end_2
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    if-eqz v6, :cond_8
+    if-eqz v5, :cond_8
 
-    invoke-interface {v6}, Landroid/database/Cursor;->close()V
+    invoke-interface {v5}, Landroid/database/Cursor;->close()V
 
     :cond_8
-    return-object v4
+    return-object v3
 
     :catchall_0
     move-exception v0
@@ -4156,56 +4086,56 @@
     :catch_0
     move-exception v0
 
-    move-object v5, v6
+    move-object v4, v5
 
     goto :goto_0
 
     :catchall_1
     move-exception v0
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     goto :goto_1
 
     :catch_1
     move-exception v0
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_0
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
-
-    move-result-object v2
-
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
-
-    const-string v3, "Error updating daily counts. appId"
-
-    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
-    invoke-virtual {v2, v3, v1, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
+
+    const-string v2, "Error updating daily counts. appId"
+
+    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    invoke-virtual {v1, v2, v5, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
-    if-eqz v5, :cond_9
+    if-eqz v4, :cond_9
 
-    invoke-interface {v5}, Landroid/database/Cursor;->close()V
+    invoke-interface {v4}, Landroid/database/Cursor;->close()V
 
     :cond_9
-    return-object v4
+    return-object v3
 
     :catchall_2
     move-exception v0
 
-    move-object v6, v5
+    move-object v5, v4
 
     :goto_1
-    if-eqz v6, :cond_a
+    if-eqz v5, :cond_a
 
-    invoke-interface {v6}, Landroid/database/Cursor;->close()V
+    invoke-interface {v5}, Landroid/database/Cursor;->close()V
 
     :cond_a
     throw v0
@@ -4218,9 +4148,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     new-instance v0, Landroid/content/ContentValues;
 
@@ -4345,7 +4275,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -4369,7 +4299,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -4393,9 +4323,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -4408,9 +4338,9 @@
     invoke-virtual {v0}, Landroid/database/sqlite/SQLiteDatabase;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -4451,9 +4381,9 @@
 
     aget-object v3, p2, v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -4471,7 +4401,7 @@
 
     if-nez v5, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -4485,7 +4415,7 @@
 
     invoke-virtual {v3, v5, v7}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto/16 :goto_8
+    goto/16 :goto_7
 
     :cond_0
     iget-object v5, v3, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
@@ -4509,7 +4439,7 @@
 
     if-nez v10, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -4523,10 +4453,9 @@
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
 
-    :goto_2
     invoke-virtual {v5, v7, v8, v3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto/16 :goto_8
+    goto/16 :goto_7
 
     :cond_1
     add-int/lit8 v9, v9, 0x1
@@ -4540,7 +4469,7 @@
 
     const/4 v9, 0x0
 
-    :goto_3
+    :goto_2
     if-ge v9, v8, :cond_4
 
     aget-object v10, v7, v9
@@ -4549,7 +4478,7 @@
 
     if-nez v10, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -4563,12 +4492,14 @@
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/cf;->aXx:Ljava/lang/Integer;
 
-    goto :goto_2
+    invoke-virtual {v5, v7, v8, v3}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    goto :goto_7
 
     :cond_3
     add-int/lit8 v9, v9, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     iget-object v7, v3, Lcom/google/android/gms/internal/measurement/cf;->aXz:[Lcom/google/android/gms/internal/measurement/cg;
@@ -4577,7 +4508,7 @@
 
     const/4 v9, 0x0
 
-    :goto_4
+    :goto_3
     if-ge v9, v8, :cond_6
 
     aget-object v10, v7, v9
@@ -4590,17 +4521,17 @@
 
     const/4 v7, 0x0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_5
     add-int/lit8 v9, v9, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const/4 v7, 0x1
 
-    :goto_5
+    :goto_4
     if-eqz v7, :cond_8
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/cf;->aXy:[Lcom/google/android/gms/internal/measurement/cj;
@@ -4609,7 +4540,7 @@
 
     const/4 v9, 0x0
 
-    :goto_6
+    :goto_5
     if-ge v9, v8, :cond_8
 
     aget-object v10, v3, v9
@@ -4622,20 +4553,20 @@
 
     const/4 v7, 0x0
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_7
     add-int/lit8 v9, v9, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_8
-    :goto_7
+    :goto_6
     if-nez v7, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -4678,7 +4609,7 @@
     invoke-virtual {v3, v7, v8, v9}, Landroid/database/sqlite/SQLiteDatabase;->delete(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)I
 
     :cond_9
-    :goto_8
+    :goto_7
     add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_0
@@ -4690,7 +4621,7 @@
 
     array-length v2, p2
 
-    :goto_9
+    :goto_8
     if-ge v6, v2, :cond_b
 
     aget-object v3, p2, v6
@@ -4701,7 +4632,7 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_b
     invoke-direct {p0, p1, v1}, Lcom/google/android/gms/measurement/internal/el;->c(Ljava/lang/String;Ljava/util/List;)Z
@@ -4720,6 +4651,8 @@
     invoke-virtual {v0}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(Lcom/google/android/gms/internal/measurement/ct;Z)Z
@@ -4727,9 +4660,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -4741,9 +4674,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->Ar()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->Aq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -4757,7 +4690,7 @@
 
     move-result-wide v2
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Aj()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ai()J
 
     move-result-wide v4
 
@@ -4773,7 +4706,7 @@
 
     move-result-wide v2
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Aj()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ai()J
 
     move-result-wide v4
 
@@ -4784,7 +4717,7 @@
     if-lez v6, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -4810,7 +4743,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v1
 
@@ -4824,9 +4757,9 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v2
 
@@ -4836,7 +4769,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -4910,7 +4843,7 @@
 
     if-nez p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -4938,7 +4871,7 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -4946,7 +4879,6 @@
 
     const-string v2, "Error storing bundle. appId"
 
-    :goto_0
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
@@ -4960,7 +4892,7 @@
     :catch_1
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -4968,7 +4900,15 @@
 
     const-string v2, "Data loss. Failed to serialize bundle. appId"
 
-    goto :goto_0
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ct;->aYS:Ljava/lang/String;
+
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-virtual {v1, v2, p1, p2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return v0
 .end method
 
 .method public final a(Lcom/google/android/gms/measurement/internal/dz;)Z
@@ -4978,9 +4918,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/dz;->aYS:Ljava/lang/String;
 
@@ -5043,7 +4983,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
@@ -5140,7 +5080,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -5163,7 +5103,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -5187,9 +5127,9 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/et;JZ)Z
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -5262,7 +5202,7 @@
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v4
 
@@ -5274,7 +5214,7 @@
 
     :cond_0
     :try_start_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v1
 
@@ -5288,11 +5228,11 @@
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -5300,7 +5240,7 @@
 
     const-string v3, "Saving event, name, data size"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v4
 
@@ -5383,7 +5323,7 @@
 
     if-nez p4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -5411,7 +5351,7 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -5419,7 +5359,6 @@
 
     const-string p4, "Error storing raw event. appId"
 
-    :goto_1
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/et;->aYS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
@@ -5433,7 +5372,7 @@
     :catch_1
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -5441,15 +5380,23 @@
 
     const-string p4, "Data loss. Failed to serialize event params/data. appId"
 
-    goto :goto_1
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/et;->aYS:Ljava/lang/String;
+
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/o;->cr(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-virtual {p3, p4, p1, p2}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return v2
 .end method
 
 .method public final a(Ljava/lang/String;Ljava/lang/Long;JLcom/google/android/gms/internal/measurement/cq;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-static {p5}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -5460,7 +5407,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v1
 
@@ -5474,11 +5421,11 @@
 
     invoke-virtual {p5, v2}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p5
 
@@ -5486,7 +5433,7 @@
 
     const-string v2, "Saving complex main event, appId, data size"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v3
 
@@ -5547,7 +5494,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -5573,7 +5520,7 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p3
 
@@ -5592,7 +5539,7 @@
     :catch_1
     move-exception p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p4
 
@@ -5612,9 +5559,9 @@
 .method public final aI(J)Ljava/lang/String;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v0, 0x0
 
@@ -5651,7 +5598,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -5706,7 +5653,7 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -5745,9 +5692,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -5756,7 +5703,7 @@
     invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/jo;->wT()I
 
     move-result v0
 
@@ -5770,21 +5717,21 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/jf;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/jf;->yg()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/jf;->yf()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v1
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {}, Lcom/google/android/gms/measurement/internal/ea;->getMessageDigest()Ljava/security/MessageDigest;
 
@@ -5792,7 +5739,7 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -5858,7 +5805,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -5879,7 +5826,7 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -5913,9 +5860,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v0, 0x0
 
@@ -5956,7 +5903,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -6029,7 +5976,7 @@
     move-exception v2
 
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -6072,7 +6019,7 @@
 
     :goto_0
     :try_start_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -6108,7 +6055,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -6139,9 +6086,9 @@
 
     move/from16 v1, p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v2, 0x1
 
@@ -6149,27 +6096,27 @@
 
     if-lez p2, :cond_0
 
-    const/4 v4, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v4, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v4}, Lcom/google/android/gms/common/internal/q;->checkArgument(Z)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->checkArgument(Z)V
 
     if-lez v1, :cond_1
 
-    const/4 v4, 0x1
+    const/4 v0, 0x1
 
     goto :goto_1
 
     :cond_1
-    const/4 v4, 0x0
+    const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v4}, Lcom/google/android/gms/common/internal/q;->checkArgument(Z)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->checkArgument(Z)V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -6182,23 +6129,23 @@
 
     const-string v6, "queue"
 
-    const/4 v7, 0x3
+    const/4 v0, 0x3
 
-    new-array v7, v7, [Ljava/lang/String;
+    new-array v7, v0, [Ljava/lang/String;
 
-    const-string v8, "rowid"
+    const-string v0, "rowid"
 
-    aput-object v8, v7, v3
+    aput-object v0, v7, v3
 
-    const-string v8, "data"
+    const-string v0, "data"
 
-    aput-object v8, v7, v2
+    aput-object v0, v7, v2
 
-    const-string v8, "retry_count"
+    const-string v0, "retry_count"
 
     const/4 v14, 0x2
 
-    aput-object v8, v7, v14
+    aput-object v0, v7, v14
 
     const-string v8, "app_id=?"
 
@@ -6218,13 +6165,9 @@
 
     invoke-virtual/range {v5 .. v13}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object v5
-    :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_3
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v4
 
-    :try_start_1
-    invoke-interface {v5}, Landroid/database/Cursor;->moveToFirst()Z
+    invoke-interface {v4}, Landroid/database/Cursor;->moveToFirst()Z
 
     move-result v0
 
@@ -6233,52 +6176,52 @@
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
-    :try_end_1
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_2
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
-    invoke-interface {v5}, Landroid/database/Cursor;->close()V
+    invoke-interface {v4}, Landroid/database/Cursor;->close()V
 
     :cond_2
     return-object v0
 
     :cond_3
-    :try_start_2
-    new-instance v4, Ljava/util/ArrayList;
+    :try_start_1
+    new-instance v5, Ljava/util/ArrayList;
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v5}, Ljava/util/ArrayList;-><init>()V
 
     const/4 v6, 0x0
 
     :cond_4
-    invoke-interface {v5, v3}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v4, v3}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v7
-    :try_end_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    :try_end_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_2
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :try_start_3
-    invoke-interface {v5, v2}, Landroid/database/Cursor;->getBlob(I)[B
+    :try_start_2
+    invoke-interface {v4, v2}, Landroid/database/Cursor;->getBlob(I)[B
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v9
 
     invoke-virtual {v9, v0}, Lcom/google/android/gms/measurement/internal/dx;->F([B)[B
 
     move-result-object v0
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_1
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_2
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    :try_start_4
-    invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
+    :try_start_3
+    invoke-interface {v5}, Ljava/util/List;->isEmpty()Z
 
     move-result v9
 
@@ -6300,25 +6243,25 @@
     new-instance v10, Lcom/google/android/gms/internal/measurement/ct;
 
     invoke-direct {v10}, Lcom/google/android/gms/internal/measurement/ct;-><init>()V
+    :try_end_3
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_2
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :try_start_4
+    invoke-virtual {v10, v9}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/je;)Lcom/google/android/gms/internal/measurement/jo;
     :try_end_4
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_4 .. :try_end_4} :catch_2
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    invoke-virtual {v10, v9}, Lcom/google/android/gms/internal/measurement/jo;->a(Lcom/google/android/gms/internal/measurement/je;)Lcom/google/android/gms/internal/measurement/jo;
-    :try_end_5
-    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_2
-    .catchall {:try_start_5 .. :try_end_5} :catchall_0
-
-    :try_start_6
-    invoke-interface {v5, v14}, Landroid/database/Cursor;->isNull(I)Z
+    invoke-interface {v4, v14}, Landroid/database/Cursor;->isNull(I)Z
 
     move-result v9
 
     if-nez v9, :cond_6
 
-    invoke-interface {v5, v14}, Landroid/database/Cursor;->getInt(I)I
+    invoke-interface {v4, v14}, Landroid/database/Cursor;->getInt(I)I
 
     move-result v9
 
@@ -6341,7 +6284,7 @@
 
     move-result-object v0
 
-    invoke-interface {v4, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v5, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
@@ -6350,7 +6293,7 @@
 
     move-object v7, v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -6369,7 +6312,7 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -6384,50 +6327,35 @@
     invoke-virtual {v7, v8, v9, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_2
-    invoke-interface {v5}, Landroid/database/Cursor;->moveToNext()Z
+    invoke-interface {v4}, Landroid/database/Cursor;->moveToNext()Z
 
     move-result v0
-    :try_end_6
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_6 .. :try_end_6} :catch_2
-    .catchall {:try_start_6 .. :try_end_6} :catchall_0
+    :try_end_5
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_2
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     if-eqz v0, :cond_7
 
     if-le v6, v1, :cond_4
 
     :cond_7
-    if-eqz v5, :cond_8
+    if-eqz v4, :cond_8
 
-    invoke-interface {v5}, Landroid/database/Cursor;->close()V
+    invoke-interface {v4}, Landroid/database/Cursor;->close()V
 
     :cond_8
-    return-object v4
+    return-object v5
 
     :catchall_0
     move-exception v0
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_2
     move-exception v0
 
-    move-object v4, v5
-
-    goto :goto_3
-
-    :catchall_1
-    move-exception v0
-
-    move-object v5, v4
-
-    goto :goto_4
-
-    :catch_3
-    move-exception v0
-
-    :goto_3
-    :try_start_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    :try_start_6
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -6444,8 +6372,8 @@
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_1
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     if-eqz v4, :cond_9
 
@@ -6454,13 +6382,15 @@
     :cond_9
     return-object v0
 
-    :goto_4
-    if-eqz v5, :cond_a
+    :goto_3
+    if-eqz v4, :cond_a
 
-    invoke-interface {v5}, Landroid/database/Cursor;->close()V
+    invoke-interface {v4}, Landroid/database/Cursor;->close()V
 
     :cond_a
     throw v0
+
+    return-void
 .end method
 
 .method public final c(Ljava/lang/String;[Ljava/lang/String;)Ljava/util/List;
@@ -6478,9 +6408,9 @@
         }
     .end annotation
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -6640,7 +6570,7 @@
 
     if-lt v3, v4, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -6691,15 +6621,15 @@
     :goto_1
     invoke-interface {v2, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
-    move-result-object v28
+    move-result-object v24
 
     const/4 v6, 0x6
 
     invoke-interface {v2, v6}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v29
+    move-result-wide v25
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v4
 
@@ -6721,9 +6651,9 @@
 
     invoke-interface {v2, v6}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v20
+    move-result-wide v27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v4
 
@@ -6739,9 +6669,9 @@
 
     move-result-object v4
 
-    move-object/from16 v27, v4
+    move-object/from16 v29, v4
 
-    check-cast v27, Lcom/google/android/gms/measurement/internal/zzad;
+    check-cast v29, Lcom/google/android/gms/measurement/internal/zzad;
 
     const/16 v6, 0xa
 
@@ -6753,9 +6683,9 @@
 
     invoke-interface {v2, v7}, Landroid/database/Cursor;->getLong(I)J
 
-    move-result-wide v34
+    move-result-wide v31
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v4
 
@@ -6771,23 +6701,23 @@
 
     move-result-object v4
 
-    move-object/from16 v38, v4
+    move-object/from16 v30, v4
 
-    check-cast v38, Lcom/google/android/gms/measurement/internal/zzad;
+    check-cast v30, Lcom/google/android/gms/measurement/internal/zzad;
 
-    new-instance v19, Lcom/google/android/gms/measurement/internal/zzfh;
+    new-instance v33, Lcom/google/android/gms/measurement/internal/zzfh;
 
-    move-object/from16 v4, v19
+    move-object/from16 v4, v33
 
-    const/16 v31, 0x6
+    const/16 v34, 0x6
 
-    const/16 v32, 0x7
+    const/16 v35, 0x7
 
-    const/16 v33, 0x8
+    const/16 v36, 0x8
 
-    const/16 v36, 0xa
+    const/16 v37, 0xa
 
-    const/16 v37, 0xb
+    const/16 v38, 0xb
 
     move-wide/from16 v6, v16
 
@@ -6803,15 +6733,17 @@
 
     move-object/from16 v18, v10
 
-    move-object/from16 v23, v28
+    move-object/from16 v19, v33
+
+    move-wide/from16 v20, v27
+
+    move-object/from16 v23, v24
 
     move-object/from16 v24, v1
 
-    move-wide/from16 v25, v29
+    move-object/from16 v27, v29
 
-    move-wide/from16 v28, v34
-
-    move-object/from16 v30, v38
+    move-wide/from16 v28, v31
 
     invoke-direct/range {v16 .. v30}, Lcom/google/android/gms/measurement/internal/zzl;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzfh;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;JLcom/google/android/gms/measurement/internal/zzad;)V
 
@@ -6867,7 +6799,7 @@
 
     :goto_3
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -6902,6 +6834,8 @@
 
     :cond_7
     throw v0
+
+    return-void
 .end method
 
 .method public final c(Lcom/google/android/gms/measurement/internal/ed;)V
@@ -6911,9 +6845,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     new-instance v0, Landroid/content/ContentValues;
 
@@ -6921,7 +6855,7 @@
 
     const-string v1, "app_id"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6945,7 +6879,7 @@
 
     const-string v1, "resettable_device_id_hash"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zR()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zQ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6953,7 +6887,7 @@
 
     const-string v1, "last_bundle_index"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zZ()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zY()J
 
     move-result-wide v2
 
@@ -6965,7 +6899,7 @@
 
     const-string v1, "last_bundle_start_timestamp"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zR()J
 
     move-result-wide v2
 
@@ -6977,7 +6911,7 @@
 
     const-string v1, "last_bundle_end_timestamp"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zS()J
 
     move-result-wide v2
 
@@ -6989,7 +6923,7 @@
 
     const-string v1, "app_version"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->uZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->uY()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6997,7 +6931,7 @@
 
     const-string v1, "app_store"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zV()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zU()Ljava/lang/String;
 
     move-result-object v2
 
@@ -7005,7 +6939,7 @@
 
     const-string v1, "gmp_version"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zV()J
 
     move-result-wide v2
 
@@ -7017,7 +6951,7 @@
 
     const-string v1, "dev_cert_hash"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zX()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zW()J
 
     move-result-wide v2
 
@@ -7029,7 +6963,7 @@
 
     const-string v1, "measurement_enabled"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zY()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zX()Z
 
     move-result v2
 
@@ -7043,11 +6977,11 @@
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ed;->boX:J
 
@@ -7061,11 +6995,11 @@
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ed;->boY:J
 
@@ -7079,11 +7013,11 @@
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ed;->boZ:J
 
@@ -7097,11 +7031,11 @@
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bpa:J
 
@@ -7113,7 +7047,7 @@
 
     const-string v1, "config_fetched_time"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Aa()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zZ()J
 
     move-result-wide v2
 
@@ -7125,7 +7059,7 @@
 
     const-string v1, "failed_config_fetch_time"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Ab()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Aa()J
 
     move-result-wide v2
 
@@ -7137,7 +7071,7 @@
 
     const-string v1, "app_version_int"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zU()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->zT()J
 
     move-result-wide v2
 
@@ -7159,11 +7093,11 @@
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bpb:J
 
@@ -7177,11 +7111,11 @@
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ed;->bpc:J
 
@@ -7193,7 +7127,7 @@
 
     const-string v1, "health_monitor_sample"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Ad()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Ac()Ljava/lang/String;
 
     move-result-object v2
 
@@ -7201,7 +7135,7 @@
 
     const-string v1, "android_id"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Ae()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Ad()J
 
     move-result-wide v2
 
@@ -7213,7 +7147,7 @@
 
     const-string v1, "adid_reporting_enabled"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Ae()Z
 
     move-result v2
 
@@ -7225,7 +7159,7 @@
 
     const-string v1, "ssaid_reporting_enabled"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Ag()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->Af()Z
 
     move-result v2
 
@@ -7237,7 +7171,7 @@
 
     const-string v1, "admob_app_id"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yX()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
 
     move-result-object v2
 
@@ -7258,7 +7192,7 @@
 
     const/4 v5, 0x0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v6
 
@@ -7292,7 +7226,7 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7300,7 +7234,7 @@
 
     const-string v1, "Failed to insert/update app (got -1). appId"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -7318,7 +7252,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -7326,7 +7260,7 @@
 
     const-string v2, "Error storing app. appId"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ed;->yV()Ljava/lang/String;
 
     move-result-object p1
 
@@ -7346,9 +7280,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzl;->packageName:Ljava/lang/String;
 
@@ -7449,7 +7383,7 @@
 
     const-string v2, "timed_out_event"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzl;->bpn:Lcom/google/android/gms/measurement/internal/zzad;
 
@@ -7471,7 +7405,7 @@
 
     const-string v2, "triggered_event"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzl;->bpp:Lcom/google/android/gms/measurement/internal/zzad;
 
@@ -7505,7 +7439,7 @@
 
     const-string v2, "expired_event"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzl;->bpr:Lcom/google/android/gms/measurement/internal/zzad;
 
@@ -7536,7 +7470,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -7559,7 +7493,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -7598,9 +7532,9 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -7695,9 +7629,14 @@
 
     const-string v3, ""
 
+    move-object/from16 v17, v3
+
+    goto :goto_0
+
     :cond_2
     move-object/from16 v17, v3
 
+    :goto_0
     invoke-interface {v2, v13}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v19
@@ -7714,7 +7653,7 @@
 
     if-nez v21, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -7728,7 +7667,7 @@
 
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_3
     new-instance v4, Lcom/google/android/gms/measurement/internal/dz;
@@ -7741,7 +7680,7 @@
 
     invoke-interface {v0, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :goto_0
+    :goto_1
     invoke-interface {v2}, Landroid/database/Cursor;->moveToNext()Z
 
     move-result v4
@@ -7761,21 +7700,21 @@
     :catch_0
     move-exception v0
 
-    goto :goto_1
+    goto :goto_2
 
     :catchall_0
     move-exception v0
 
     move-object/from16 v3, p0
 
-    goto :goto_2
+    goto :goto_3
 
     :catch_1
     move-exception v0
 
     move-object/from16 v3, p0
 
-    goto :goto_1
+    goto :goto_2
 
     :catchall_1
     move-exception v0
@@ -7784,7 +7723,7 @@
 
     move-object v2, v1
 
-    goto :goto_2
+    goto :goto_3
 
     :catch_2
     move-exception v0
@@ -7793,9 +7732,9 @@
 
     move-object v2, v1
 
-    :goto_1
+    :goto_2
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -7821,17 +7760,19 @@
     :catchall_2
     move-exception v0
 
-    :goto_2
+    :goto_3
     if-eqz v2, :cond_6
 
     invoke-interface {v2}, Landroid/database/Cursor;->close()V
 
     :cond_6
     throw v0
+
+    return-void
 .end method
 
 .method public final dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ed;
-    .locals 19
+    .locals 22
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
@@ -7839,9 +7780,9 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v2, 0x0
 
@@ -7966,27 +7907,27 @@
 
     const/16 v0, 0x12
 
-    const-string v16, "firebase_instance_id"
+    const-string v17, "firebase_instance_id"
 
-    aput-object v16, v5, v0
+    aput-object v17, v5, v0
 
     const/16 v0, 0x13
 
-    const-string v16, "daily_error_events_count"
+    const-string v17, "daily_error_events_count"
 
-    aput-object v16, v5, v0
+    aput-object v17, v5, v0
 
     const/16 v0, 0x14
 
-    const-string v16, "daily_realtime_events_count"
+    const-string v17, "daily_realtime_events_count"
 
-    aput-object v16, v5, v0
+    aput-object v17, v5, v0
 
     const/16 v0, 0x15
 
-    const-string v16, "health_monitor_sample"
+    const-string v17, "health_monitor_sample"
 
-    aput-object v16, v5, v0
+    aput-object v17, v5, v0
 
     const-string v0, "android_id"
 
@@ -8008,9 +7949,9 @@
 
     const/16 v0, 0x19
 
-    const-string v16, "admob_app_id"
+    const-string v18, "admob_app_id"
 
-    aput-object v16, v5, v0
+    aput-object v18, v5, v0
 
     const-string v0, "app_id=?"
 
@@ -8018,11 +7959,11 @@
 
     aput-object v1, v7, v11
 
-    const/16 v16, 0x0
+    const/16 v19, 0x0
 
-    const/16 v17, 0x0
+    const/16 v20, 0x0
 
-    const/16 v18, 0x0
+    const/16 v21, 0x0
 
     const/16 v15, 0xa
 
@@ -8032,15 +7973,15 @@
 
     const/4 v15, 0x7
 
-    move-object/from16 v8, v16
+    move-object/from16 v8, v19
 
     const/4 v0, 0x6
 
-    move-object/from16 v9, v17
+    move-object/from16 v9, v20
 
     const/4 v15, 0x5
 
-    move-object/from16 v10, v18
+    move-object/from16 v10, v21
 
     invoke-virtual/range {v3 .. v10}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
@@ -8176,7 +8117,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ed;->Z(Z)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ed;->Y(Z)V
 
     const/16 v0, 0xb
 
@@ -8186,11 +8127,11 @@
 
     iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -8222,11 +8163,11 @@
 
     iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -8258,11 +8199,11 @@
 
     iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -8294,11 +8235,11 @@
 
     iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -8376,11 +8317,11 @@
 
     iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -8412,11 +8353,11 @@
 
     iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -8494,7 +8435,7 @@
     const/4 v0, 0x1
 
     :goto_b
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ed;->aa(Z)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ed;->Z(Z)V
 
     const/16 v0, 0x18
 
@@ -8517,7 +8458,7 @@
 
     :cond_f
     :goto_c
-    invoke-virtual {v4, v12}, Lcom/google/android/gms/measurement/internal/ed;->ab(Z)V
+    invoke-virtual {v4, v12}, Lcom/google/android/gms/measurement/internal/ed;->aa(Z)V
 
     const/16 v0, 0x19
 
@@ -8529,11 +8470,11 @@
 
     iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ed;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iput-boolean v11, v4, Lcom/google/android/gms/measurement/internal/ed;->bpe:Z
 
@@ -8543,7 +8484,7 @@
 
     if-eqz v0, :cond_10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -8605,7 +8546,7 @@
 
     :goto_d
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -8645,16 +8586,16 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     :try_start_0
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v1
 
@@ -8696,18 +8637,18 @@
 
     invoke-virtual {v0, v3, v4, v5}, Landroid/database/sqlite/SQLiteDatabase;->delete(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)I
 
-    move-result v0
+    move-result p1
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
-    int-to-long v0, v0
+    int-to-long v0, p1
 
     return-wide v0
 
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -8733,9 +8674,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     const/4 v0, 0x0
 
@@ -8816,7 +8757,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -8860,7 +8801,7 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -8909,9 +8850,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -9023,7 +8964,7 @@
     :catch_0
     move-exception v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -9077,7 +9018,7 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -9110,6 +9051,8 @@
 
     :cond_5
     throw p1
+
+    return-void
 .end method
 
 .method public final do(Ljava/lang/String;)J
@@ -9141,7 +9084,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -9172,9 +9115,9 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -9223,13 +9166,6 @@
 
     goto :goto_0
 
-    :catch_0
-    move-exception v0
-
-    move-object/from16 v14, p0
-
-    goto/16 :goto_6
-
     :cond_0
     move-object/from16 v5, p2
 
@@ -9319,7 +9255,7 @@
 
     move-result-object v2
     :try_end_2
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_5
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
@@ -9327,7 +9263,7 @@
 
     move-result v4
     :try_end_3
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_5
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_4
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     if-nez v4, :cond_3
@@ -9350,7 +9286,7 @@
 
     if-lt v4, v6, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -9377,7 +9313,7 @@
 
     move-result-wide v12
     :try_end_4
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_4 .. :try_end_4} :catch_5
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_4 .. :try_end_4} :catch_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     move-object/from16 v14, p0
@@ -9391,13 +9327,13 @@
 
     move-result-object v6
     :try_end_5
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_4
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_5 .. :try_end_5} :catch_3
     .catchall {:try_start_5 .. :try_end_5} :catchall_2
 
     if-nez v15, :cond_5
 
     :try_start_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -9413,20 +9349,20 @@
 
     invoke-virtual {v4, v5, v7, v6, v12}, Lcom/google/android/gms/measurement/internal/q;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_6
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_6 .. :try_end_6} :catch_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_6 .. :try_end_6} :catch_0
     .catchall {:try_start_6 .. :try_end_6} :catchall_2
 
-    move-object/from16 v16, v6
+    move-object/from16 v17, v6
 
     const/4 v12, 0x0
 
-    const/16 v17, 0x1
+    const/16 v18, 0x1
 
-    const/16 v18, 0x2
+    const/16 v19, 0x2
 
     goto :goto_2
 
-    :catch_1
+    :catch_0
     move-exception v0
 
     move-object v5, v6
@@ -9437,7 +9373,7 @@
     :try_start_7
     new-instance v5, Lcom/google/android/gms/measurement/internal/dz;
     :try_end_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_7 .. :try_end_7} :catch_3
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_7 .. :try_end_7} :catch_2
     .catchall {:try_start_7 .. :try_end_7} :catchall_2
 
     move-object v4, v5
@@ -9446,11 +9382,11 @@
 
     move-object/from16 v5, p1
 
-    move-object/from16 v16, v6
+    move-object/from16 v17, v6
 
-    const/16 v17, 0x1
+    const/16 v18, 0x1
 
-    const/16 v18, 0x2
+    const/16 v19, 0x2
 
     move-wide v8, v12
 
@@ -9468,7 +9404,7 @@
 
     move-result v3
     :try_end_8
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_8 .. :try_end_8} :catch_2
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_8 .. :try_end_8} :catch_1
     .catchall {:try_start_8 .. :try_end_8} :catchall_2
 
     if-nez v3, :cond_7
@@ -9482,7 +9418,7 @@
     return-object v0
 
     :cond_7
-    move-object/from16 v5, v16
+    move-object/from16 v5, v17
 
     const/4 v3, 0x3
 
@@ -9494,22 +9430,22 @@
 
     goto :goto_1
 
-    :catch_2
+    :catch_1
     move-exception v0
 
     goto :goto_4
 
-    :catch_3
+    :catch_2
     move-exception v0
 
-    move-object/from16 v16, v6
+    move-object/from16 v17, v6
 
     :goto_4
-    move-object/from16 v5, v16
+    move-object/from16 v5, v17
 
     goto :goto_7
 
-    :catch_4
+    :catch_3
     move-exception v0
 
     goto :goto_7
@@ -9521,13 +9457,20 @@
 
     goto :goto_8
 
-    :catch_5
+    :catch_4
     move-exception v0
 
     move-object/from16 v14, p0
 
     goto :goto_7
 
+    :catch_5
+    move-exception v0
+
+    move-object/from16 v14, p0
+
+    goto :goto_6
+
     :catch_6
     move-exception v0
 
@@ -9557,7 +9500,7 @@
 
     :goto_7
     :try_start_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v3
 
@@ -9593,6 +9536,8 @@
 
     :cond_9
     throw v0
+
+    return-void
 .end method
 
 .method final getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -9600,7 +9545,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     :try_start_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->bpB:Lcom/google/android/gms/measurement/internal/eo;
@@ -9616,7 +9561,7 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -9649,9 +9594,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -9731,7 +9676,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/el;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -9756,9 +9701,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/q;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -9768,7 +9713,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/q;->aZ(I)I
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/el;->Ax()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/el;->Aw()Z
 
     move-result v0
 
@@ -9851,7 +9796,7 @@
 
     if-lez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -9904,7 +9849,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -9917,7 +9862,7 @@
     return-void
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
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 e97ad5ea1a..dd998247c6 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
@@ -91,7 +91,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -121,7 +121,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -154,7 +154,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -183,7 +183,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -207,7 +207,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -217,7 +217,7 @@
 
     const-string v5, "app_id,name,lifetime_count,current_bundle_count,last_fire_timestamp"
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->Ay()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->Ax()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -227,7 +227,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -243,7 +243,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -253,7 +253,7 @@
 
     const-string v5, "app_id,name,set_timestamp,value"
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->Az()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->Ay()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -261,7 +261,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -271,7 +271,7 @@
 
     const-string v5, "app_id,app_instance_id,gmp_app_id,resettable_device_id_hash,last_bundle_index,last_bundle_end_timestamp"
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->AA()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->Az()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -279,7 +279,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -289,7 +289,7 @@
 
     const-string v5, "app_id,bundle_end_timestamp,data"
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->AB()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->AA()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -297,7 +297,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -313,7 +313,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -323,7 +323,7 @@
 
     const-string v5, "app_id,name,timestamp,metadata_fingerprint,data"
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->AC()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->AB()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -331,7 +331,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -347,7 +347,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -361,7 +361,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -375,7 +375,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -385,7 +385,7 @@
 
     const-string v5, "app_id,first_open_count"
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->AD()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/el;->AC()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -393,7 +393,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->bpI:Lcom/google/android/gms/measurement/internal/el;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 25a94776b7..6a317a8cf4 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
@@ -236,6 +236,11 @@
     :cond_5
     return-void
 
+    :catch_0
+    move-exception p1
+
+    goto :goto_2
+
     :cond_6
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
@@ -247,9 +252,7 @@
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
-    :catch_0
-    move-exception p1
-
+    :goto_2
     iget-object p0, p0, Lcom/google/android/gms/measurement/internal/o;->bkq:Lcom/google/android/gms/measurement/internal/q;
 
     const-string p3, "Failed to verify columns on table that was just created"
@@ -266,10 +269,12 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method private static a(Lcom/google/android/gms/measurement/internal/o;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
-    .locals 11
+    .locals 10
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
@@ -306,61 +311,38 @@
 
     invoke-virtual/range {v2 .. v9}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object p1
+    move-result-object v0
+
+    invoke-interface {v0}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result p0
     :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {p1}, Landroid/database/Cursor;->moveToFirst()Z
+    if-eqz v0, :cond_0
 
-    move-result 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 p1, :cond_0
-
-    invoke-interface {p1}, Landroid/database/Cursor;->close()V
+    invoke-interface {v0}, Landroid/database/Cursor;->close()V
 
     :cond_0
-    return v0
+    return p0
 
     :catchall_0
     move-exception p0
 
-    move-object v0, p1
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    move-object v10, v0
-
-    move-object v0, p1
-
-    move-object p1, v10
-
     goto :goto_0
 
-    :catchall_1
-    move-exception p0
-
-    goto :goto_1
-
-    :catch_1
+    :catch_0
     move-exception p1
 
-    :goto_0
-    :try_start_2
+    :try_start_1
     iget-object p0, p0, Lcom/google/android/gms/measurement/internal/o;->bkt:Lcom/google/android/gms/measurement/internal/q;
 
     const-string v2, "Error querying for table"
 
     invoke-virtual {p0, v2, p2, p1}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     if-eqz v0, :cond_1
 
@@ -369,7 +351,7 @@
     :cond_1
     return v1
 
-    :goto_1
+    :goto_0
     if-eqz v0, :cond_2
 
     invoke-interface {v0}, Landroid/database/Cursor;->close()V
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 a5780ece45..12491727b1 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
@@ -112,7 +112,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->bpJ:Lcom/google/android/gms/measurement/internal/bp;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/bp;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/bp;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -136,7 +136,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->bpJ:Lcom/google/android/gms/measurement/internal/bp;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/bp;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/bp;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -175,7 +175,7 @@
 .method public abstract run()V
 .end method
 
-.method public final uG()Z
+.method public final uF()Z
     .locals 5
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aVx:J
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 e35c3cd9a0..eae47a4224 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
@@ -37,7 +37,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->bpK:Lcom/google/android/gms/measurement/internal/bp;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/bp;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/bp;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -48,7 +48,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->bpL:Lcom/google/android/gms/measurement/internal/eq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eq;->uG()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eq;->uF()Z
 
     move-result v0
 
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 55f40241fc..753dfe8a96 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
@@ -21,20 +21,20 @@
 
 
 # virtual methods
-.method public final AE()J
+.method public final AD()J
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/es;->bpM:J
 
     return-wide v0
 .end method
 
-.method public final AF()Ljava/lang/String;
+.method public final AE()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aYP:Ljava/lang/String;
 
@@ -92,103 +92,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 4
 
     invoke-static {}, Ljava/util/Calendar;->getInstance()Ljava/util/Calendar;
@@ -288,6 +280,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
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 a5b04398d2..327c6d374c 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
@@ -53,15 +53,13 @@
 
     if-eqz p2, :cond_1
 
-    iget-wide p4, p0, Lcom/google/android/gms/measurement/internal/et;->bpO:J
-
     iget-wide p6, p0, Lcom/google/android/gms/measurement/internal/et;->timestamp:J
 
     cmp-long p2, p4, p6
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -111,7 +109,7 @@
 
     if-nez p4, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p4
 
@@ -121,13 +119,12 @@
 
     invoke-virtual {p4, p5}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    :goto_1
     invoke-interface {p3}, Ljava/util/Iterator;->remove()V
 
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     invoke-virtual {p2, p4}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -139,7 +136,7 @@
 
     if-nez p5, :cond_3
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p5
 
@@ -147,7 +144,7 @@
 
     const-string p6, "Param value can\'t be null"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object p7
 
@@ -157,10 +154,12 @@
 
     invoke-virtual {p5, p6, p4}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    goto :goto_1
+    invoke-interface {p3}, Ljava/util/Iterator;->remove()V
+
+    goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object p6
 
@@ -173,7 +172,7 @@
 
     invoke-direct {p1, p2}, Lcom/google/android/gms/measurement/internal/zzaa;-><init>(Landroid/os/Bundle;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     new-instance p1, Lcom/google/android/gms/measurement/internal/zzaa;
@@ -184,7 +183,7 @@
 
     invoke-direct {p1, p2}, Lcom/google/android/gms/measurement/internal/zzaa;-><init>(Landroid/os/Bundle;)V
 
-    :goto_2
+    :goto_1
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/et;->biw:Lcom/google/android/gms/measurement/internal/zzaa;
 
     return-void
@@ -228,15 +227,13 @@
 
     if-eqz p2, :cond_1
 
-    iget-wide p5, p0, Lcom/google/android/gms/measurement/internal/et;->bpO:J
-
     iget-wide p7, p0, Lcom/google/android/gms/measurement/internal/et;->timestamp:J
 
     cmp-long p2, p5, p7
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali
index 3db4473d41..b181f6decb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali
@@ -42,9 +42,9 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
-    const/4 v7, 0x0
+    const/4 v7, 0x1
 
-    const/4 v8, 0x1
+    const/4 v8, 0x0
 
     const-wide/16 v9, 0x0
 
@@ -80,9 +80,12 @@
 
     if-ltz v11, :cond_2
 
-    const/4 v7, 0x1
+    goto :goto_2
 
     :cond_2
+    const/4 v7, 0x0
+
+    :goto_2
     invoke-static {v7}, Lcom/google/android/gms/common/internal/q;->checkArgument(Z)V
 
     move-object v7, p1
@@ -124,7 +127,7 @@
 
 
 # virtual methods
-.method final AG()Lcom/google/android/gms/measurement/internal/eu;
+.method final AF()Lcom/google/android/gms/measurement/internal/eu;
     .locals 17
 
     move-object/from16 v0, p0
@@ -173,9 +176,9 @@
 
     invoke-virtual/range {p3 .. p3}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_0
+    if-nez v1, :cond_0
 
     const/4 v1, 0x0
 
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 1d33e4435a..d52b437dd3 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
@@ -44,7 +44,9 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/g;->d(Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto/16 :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto/16 :goto_0
 
     :pswitch_2
     invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
@@ -63,6 +65,10 @@
 
     move-result-object p1
 
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeTypedList(Ljava/util/List;)V
+
     goto/16 :goto_0
 
     :pswitch_3
@@ -86,6 +92,10 @@
 
     move-result-object p1
 
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeTypedList(Ljava/util/List;)V
+
     goto/16 :goto_0
 
     :pswitch_4
@@ -109,6 +119,10 @@
 
     move-result-object p1
 
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeTypedList(Ljava/util/List;)V
+
     goto/16 :goto_0
 
     :pswitch_5
@@ -136,7 +150,11 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeTypedList(Ljava/util/List;)V
+
+    goto/16 :goto_0
 
     :pswitch_6
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzl;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -149,7 +167,9 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/zzl;)V
 
-    goto/16 :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto/16 :goto_0
 
     :pswitch_7
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzl;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -170,7 +190,9 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/zzl;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto/16 :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto/16 :goto_0
 
     :pswitch_8
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzh;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -189,7 +211,7 @@
 
     invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    goto/16 :goto_2
+    goto/16 :goto_0
 
     :pswitch_9
     invoke-virtual {p2}, Landroid/os/Parcel;->readLong()J
@@ -212,7 +234,9 @@
 
     invoke-virtual/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/g;->a(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto/16 :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto/16 :goto_0
 
     :pswitch_a
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzad;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -235,7 +259,7 @@
 
     invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeByteArray([B)V
 
-    goto :goto_2
+    goto/16 :goto_0
 
     :pswitch_b
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzh;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -254,12 +278,11 @@
 
     move-result-object p1
 
-    :goto_0
     invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
 
     invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeTypedList(Ljava/util/List;)V
 
-    goto :goto_2
+    goto :goto_0
 
     :pswitch_c
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzh;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -272,7 +295,9 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/g;->b(Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto :goto_0
 
     :pswitch_d
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzad;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -293,7 +318,9 @@
 
     invoke-virtual {p0, p1, v0, p2}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/zzad;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto :goto_0
 
     :pswitch_e
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzh;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -306,7 +333,9 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto :goto_0
 
     :pswitch_f
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzfh;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -327,7 +356,9 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/zzfh;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    goto :goto_1
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    goto :goto_0
 
     :pswitch_10
     sget-object p1, Lcom/google/android/gms/measurement/internal/zzad;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -348,10 +379,9 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/zzad;Lcom/google/android/gms/measurement/internal/zzh;)V
 
-    :goto_1
     invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
 
-    :goto_2
+    :goto_0
     const/4 p1, 0x1
 
     return p1
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 245cf2084e..df97143fb6 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
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -83,7 +83,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -182,7 +182,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -219,7 +219,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -246,7 +246,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -269,7 +269,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -294,7 +294,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -317,7 +317,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -338,7 +338,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -359,7 +359,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -382,7 +382,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -413,7 +413,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -434,7 +434,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -463,7 +463,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -497,7 +497,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cx;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
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 75415cddb3..e18c6ae93d 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
@@ -33,7 +33,7 @@
     return-void
 .end method
 
-.method private final yV()Ljava/lang/String;
+.method private final yU()Ljava/lang/String;
     .locals 7
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -120,7 +120,7 @@
     return-object v1
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -128,13 +128,12 @@
 
     const-string v2, "Failed to retrieve Firebase Instance Id"
 
-    :goto_0
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
     return-object v0
 
     :catch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -142,7 +141,9 @@
 
     const-string v2, "Failed to obtain Firebase Analytics instance"
 
-    goto :goto_0
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
+    return-object v0
 
     :catch_2
     return-object v0
@@ -157,11 +158,11 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     new-instance v25, Lcom/google/android/gms/measurement/internal/zzh;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -169,23 +170,23 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v4, v0, Lcom/google/android/gms/measurement/internal/i;->aYT:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yY()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yX()I
 
     move-result v1
 
     int-to-long v5, v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v7, v0, Lcom/google/android/gms/measurement/internal/i;->aYR:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/i;->bjY:J
 
@@ -197,7 +198,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/i;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v1
 
@@ -228,7 +229,7 @@
 
     move-result v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v1
 
@@ -238,9 +239,9 @@
 
     xor-int/lit8 v15, v1, 0x1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v1
 
@@ -264,23 +265,25 @@
 
     const/4 v1, 0x0
 
+    move-object/from16 v17, v1
+
     goto :goto_0
 
     :cond_1
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yV()Ljava/lang/String;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yU()Ljava/lang/String;
 
     move-result-object v1
 
-    :goto_0
-    move-object/from16 v16, v1
+    move-object/from16 v17, v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    :goto_0
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/i;->bjZ:J
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/i;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v10
 
@@ -296,11 +299,11 @@
 
     invoke-virtual {v10}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v17
+    move-result-wide v20
 
-    const-wide/16 v19, 0x0
+    const-wide/16 v18, 0x0
 
-    cmp-long v11, v17, v19
+    cmp-long v11, v20, v18
 
     if-nez v11, :cond_2
 
@@ -324,11 +327,11 @@
     move-wide/from16 v18, v0
 
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yZ()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yY()I
 
     move-result v20
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
@@ -360,7 +363,7 @@
     const/16 v21, 0x1
 
     :goto_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
@@ -390,13 +393,13 @@
     const/16 v22, 0x1
 
     :goto_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -406,7 +409,7 @@
 
     move-result v23
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yX()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/i;->yW()Ljava/lang/String;
 
     move-result-object v24
 
@@ -426,7 +429,7 @@
 
     move v14, v15
 
-    move-object/from16 v15, v16
+    move-object/from16 v15, v17
 
     move-wide/from16 v16, v26
 
@@ -448,180 +451,172 @@
 .method final getGmpAppId()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aYe:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/br;
+.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/k;
+.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/dg;
+.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/dg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -629,7 +624,7 @@
     return v0
 .end method
 
-.method protected final yU()V
+.method protected final yT()V
     .locals 10
 
     const-string v0, "unknown"
@@ -660,7 +655,7 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -680,16 +675,14 @@
     :try_start_0
     invoke-virtual {v4, v3}, Landroid/content/pm/PackageManager;->getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object v0, v7
-
     goto :goto_0
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -752,31 +745,21 @@
 
     invoke-interface {v4}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
-    move-result-object v4
-
-    move-object v2, v4
+    move-result-object v2
 
     :cond_3
-    iget-object v4, v7, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
+    iget-object v1, v7, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
+
+    iget v4, v7, Landroid/content/pm/PackageInfo;->versionCode:I
     :try_end_1
-    .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_1 .. :try_end_1} :catch_2
+    .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
 
-    :try_start_2
-    iget v1, v7, Landroid/content/pm/PackageInfo;->versionCode:I
-    :try_end_2
-    .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_2 .. :try_end_2} :catch_1
-
-    move v6, v1
-
-    move-object v1, v4
+    move v6, v4
 
     goto :goto_2
 
     :catch_1
-    move-object v1, v4
-
-    :catch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -818,7 +801,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v6
 
@@ -868,7 +851,7 @@
 
     if-nez v2, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -881,7 +864,7 @@
     goto :goto_5
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v7
 
@@ -903,7 +886,7 @@
     :goto_5
     if-eqz v6, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v2
 
@@ -913,11 +896,11 @@
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ei;->Ai()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ei;->Ah()Z
 
     move-result v6
 
@@ -933,7 +916,7 @@
 
     if-eqz v2, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -941,10 +924,9 @@
 
     const-string v4, "Collection disabled with firebase_analytics_collection_deactivated=1"
 
-    :goto_6
     invoke-virtual {v2, v4}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_9
     if-eqz v2, :cond_a
@@ -965,7 +947,7 @@
 
     if-eqz v2, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -973,18 +955,20 @@
 
     const-string v4, "Collection disabled with firebase_analytics_collection_enabled=0"
 
+    invoke-virtual {v2, v4}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
     goto :goto_6
 
     :cond_a
     if-nez v2, :cond_b
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lq()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lp()Z
 
     move-result v2
 
     if-eqz v2, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -992,10 +976,12 @@
 
     const-string v4, "Collection disabled with google_app_measurement_enable=0"
 
+    invoke-virtual {v2, v4}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
+
     goto :goto_6
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -1005,13 +991,13 @@
 
     invoke-virtual {v2, v6}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
-    :goto_7
+    :goto_6
     const/4 v4, 0x0
 
-    :goto_8
+    :goto_7
     const-string v2, ""
 
     iput-object v2, p0, Lcom/google/android/gms/measurement/internal/i;->aYe:Ljava/lang/String;
@@ -1051,8 +1037,8 @@
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->bkb:Ljava/lang/String;
 
     :cond_d
-    :try_start_3
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lp()Ljava/lang/String;
+    :try_start_2
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lo()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1064,12 +1050,12 @@
 
     const-string v1, ""
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_e
     move-object v1, v0
 
-    :goto_9
+    :goto_8
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/i;->aYe:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -1097,7 +1083,7 @@
     :cond_f
     if-eqz v4, :cond_10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1110,15 +1096,15 @@
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/i;->aYe:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v4}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
-    :try_end_3
-    .catch Ljava/lang/IllegalStateException; {:try_start_3 .. :try_end_3} :catch_3
+    :try_end_2
+    .catch Ljava/lang/IllegalStateException; {:try_start_2 .. :try_end_2} :catch_2
 
-    goto :goto_a
+    goto :goto_9
 
-    :catch_3
+    :catch_2
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -1133,7 +1119,7 @@
     invoke-virtual {v1, v2, v3, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_10
-    :goto_a
+    :goto_9
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v1, 0x10
@@ -1158,46 +1144,54 @@
     return-void
 .end method
 
-.method final yW()Ljava/lang/String;
+.method final yV()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aYS:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final yX()Ljava/lang/String;
+.method final yW()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->bkb:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final yY()I
+.method final yX()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget v0, p0, Lcom/google/android/gms/measurement/internal/i;->bjX:I
 
     return v0
 .end method
 
-.method final yZ()I
+.method final yY()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dq;->tO()V
 
     iget v0, p0, Lcom/google/android/gms/measurement/internal/i;->bka:I
 
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
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 3b3eac1003..3a2c3123c2 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
@@ -32,13 +32,13 @@
 
 # virtual methods
 .method final c(I[B)Z
-    .locals 17
+    .locals 16
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/k;->bkj:Z
 
@@ -95,9 +95,9 @@
     :try_start_1
     iput-boolean v8, v1, Lcom/google/android/gms/measurement/internal/k;->bkj:Z
     :try_end_1
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_1 .. :try_end_1} :catch_4
     .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_1 .. :try_end_1} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_3
     .catchall {:try_start_1 .. :try_end_1} :catchall_3
 
     if-eqz v9, :cond_1
@@ -107,21 +107,6 @@
     :cond_1
     return v2
 
-    :catch_0
-    move-exception v0
-
-    move-object v12, v7
-
-    :goto_1
-    move-object v7, v9
-
-    goto/16 :goto_3
-
-    :catch_1
-    move-exception v0
-
-    goto/16 :goto_7
-
     :cond_2
     :try_start_2
     invoke-virtual {v9}, Landroid/database/sqlite/SQLiteDatabase;->beginTransaction()V
@@ -134,9 +119,9 @@
 
     move-result-object v12
     :try_end_2
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_2 .. :try_end_2} :catch_4
     .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_2 .. :try_end_2} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_3
     .catchall {:try_start_2 .. :try_end_2} :catchall_3
 
     if-eqz v12, :cond_3
@@ -152,34 +137,34 @@
 
     move-result-wide v10
 
-    goto :goto_2
+    goto :goto_1
 
     :catchall_0
     move-exception v0
 
-    goto/16 :goto_9
+    goto/16 :goto_7
 
-    :catch_2
+    :catch_0
     move-exception v0
 
-    goto :goto_1
+    goto :goto_2
 
-    :catch_3
+    :catch_1
     move-exception v0
 
     move-object v7, v12
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :cond_3
-    :goto_2
+    :goto_1
     const-wide/32 v13, 0x186a0
 
     cmp-long v0, v10, v13
 
     if-ltz v0, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -189,8 +174,6 @@
 
     invoke-virtual {v0, v15}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    const/4 v0, 0x0
-
     sub-long/2addr v13, v10
 
     const-wide/16 v10, 0x1
@@ -219,7 +202,7 @@
 
     if-eqz v0, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -235,8 +218,6 @@
 
     move-result-object v2
 
-    const/16 v16, 0x0
-
     sub-long/2addr v13, v10
 
     invoke-static {v13, v14}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -254,9 +235,9 @@
 
     invoke-virtual {v9}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
     :try_end_3
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_3 .. :try_end_3} :catch_3
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_3 .. :try_end_3} :catch_4
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_2
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_3 .. :try_end_3} :catch_1
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_3 .. :try_end_3} :catch_2
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_0
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     if-eqz v12, :cond_5
@@ -271,9 +252,24 @@
     :cond_6
     return v8
 
-    :catch_4
+    :catch_2
     move-object v7, v12
 
+    goto :goto_4
+
+    :catch_3
+    move-exception v0
+
+    move-object v12, v7
+
+    :goto_2
+    move-object v7, v9
+
+    goto :goto_3
+
+    :catch_4
+    move-exception v0
+
     goto :goto_5
 
     :catchall_1
@@ -283,7 +279,7 @@
 
     move-object v12, v9
 
-    goto :goto_9
+    goto :goto_7
 
     :catch_5
     move-exception v0
@@ -302,18 +298,8 @@
 
     invoke-virtual {v7}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
-    goto :goto_4
-
-    :catchall_2
-    move-exception v0
-
-    move-object v9, v7
-
-    goto :goto_9
-
     :cond_7
-    :goto_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -336,13 +322,20 @@
 
     invoke-virtual {v7}, Landroid/database/sqlite/SQLiteDatabase;->close()V
 
-    goto :goto_8
+    goto :goto_6
+
+    :catchall_2
+    move-exception v0
+
+    move-object v9, v7
+
+    goto :goto_7
 
     :catch_6
     move-object v9, v7
 
     :catch_7
-    :goto_5
+    :goto_4
     int-to-long v10, v6
 
     :try_start_5
@@ -359,19 +352,18 @@
     :cond_9
     if-eqz v9, :cond_b
 
-    :goto_6
     invoke-virtual {v9}, Landroid/database/sqlite/SQLiteDatabase;->close()V
 
-    goto :goto_8
+    goto :goto_6
 
     :catch_8
     move-exception v0
 
     move-object v9, v7
 
-    :goto_7
+    :goto_5
     :try_start_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v2
 
@@ -392,10 +384,10 @@
     :cond_a
     if-eqz v9, :cond_b
 
-    goto :goto_6
+    invoke-virtual {v9}, Landroid/database/sqlite/SQLiteDatabase;->close()V
 
     :cond_b
-    :goto_8
+    :goto_6
     add-int/lit8 v5, v5, 0x1
 
     const/4 v2, 0x0
@@ -409,7 +401,7 @@
 
     move-object v12, v7
 
-    :goto_9
+    :goto_7
     if-eqz v12, :cond_c
 
     invoke-interface {v12}, Landroid/database/Cursor;->close()V
@@ -423,7 +415,7 @@
     throw v0
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -486,173 +478,165 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic yA()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yA()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/br;
+.method public final bridge synthetic yB()Lcom/google/android/gms/measurement/internal/br;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic yC()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yC()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ch;
+.method public final bridge synthetic yD()Lcom/google/android/gms/measurement/internal/ch;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ch;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yD()Lcom/google/android/gms/measurement/internal/ch;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/ce;
+.method public final bridge synthetic yE()Lcom/google/android/gms/measurement/internal/ce;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/k;
+.method public final bridge synthetic yF()Lcom/google/android/gms/measurement/internal/k;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/k;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yF()Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/dg;
+.method public final bridge synthetic yG()Lcom/google/android/gms/measurement/internal/dg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/dg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yG()Lcom/google/android/gms/measurement/internal/dg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -660,15 +644,7 @@
     return v0
 .end method
 
-.method public final bridge synthetic yz()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yz()V
-
-    return-void
-.end method
-
-.method public final za()Ljava/util/List;
+.method public final yZ()Ljava/util/List;
     .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -681,7 +657,7 @@
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/k;->bkj:Z
 
@@ -743,8 +719,8 @@
     :try_start_1
     iput-boolean v8, v1, Lcom/google/android/gms/measurement/internal/k;->bkj:Z
     :try_end_1
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_1 .. :try_end_1} :catch_2
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_1 .. :try_end_1} :catch_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_b
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_8
 
@@ -762,17 +738,12 @@
 
     move-object v2, v15
 
-    goto/16 :goto_c
+    goto/16 :goto_a
 
     :catch_1
-    move-object v2, v15
-
-    goto/16 :goto_8
-
-    :catch_2
     move-exception v0
 
-    goto/16 :goto_f
+    goto/16 :goto_c
 
     :cond_3
     :try_start_2
@@ -815,8 +786,8 @@
     move-result-object v18
     :try_end_2
     .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_2 .. :try_end_2} :catch_d
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_2 .. :try_end_2} :catch_1
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_b
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_2 .. :try_end_2} :catch_b
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_2 .. :try_end_2} :catch_a
     .catchall {:try_start_2 .. :try_end_2} :catchall_4
 
     move-object v9, v15
@@ -838,9 +809,9 @@
 
     move-result-object v9
     :try_end_3
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_3 .. :try_end_3} :catch_a
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_3 .. :try_end_3} :catch_9
     .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_3 .. :try_end_3} :catch_c
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_9
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_3 .. :try_end_3} :catch_8
     .catchall {:try_start_3 .. :try_end_3} :catchall_3
 
     const-wide/16 v10, -0x1
@@ -872,9 +843,9 @@
 
     move-result-object v13
     :try_end_4
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_4 .. :try_end_4} :catch_8
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_4 .. :try_end_4} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_4 .. :try_end_4} :catch_6
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_4 .. :try_end_4} :catch_7
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_4 .. :try_end_4} :catch_6
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_4 .. :try_end_4} :catch_5
     .catchall {:try_start_4 .. :try_end_4} :catchall_6
 
     :try_start_5
@@ -892,7 +863,7 @@
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/zzad;
     :try_end_5
-    .catch Lcom/google/android/gms/common/internal/safeparcel/a$a; {:try_start_5 .. :try_end_5} :catch_3
+    .catch Lcom/google/android/gms/common/internal/safeparcel/a$a; {:try_start_5 .. :try_end_5} :catch_2
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :try_start_6
@@ -900,12 +871,11 @@
 
     if-eqz v0, :cond_4
 
-    :goto_2
     invoke-interface {v3, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
     :try_end_6
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_6 .. :try_end_6} :catch_8
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_6 .. :try_end_6} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_6 .. :try_end_6} :catch_6
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_6 .. :try_end_6} :catch_7
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_6 .. :try_end_6} :catch_6
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_6 .. :try_end_6} :catch_5
     .catchall {:try_start_6 .. :try_end_6} :catchall_6
 
     goto :goto_1
@@ -913,11 +883,11 @@
     :catchall_0
     move-exception v0
 
-    goto :goto_3
+    goto :goto_2
 
-    :catch_3
+    :catch_2
     :try_start_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -934,7 +904,7 @@
 
     goto :goto_1
 
-    :goto_3
+    :goto_2
     invoke-virtual {v13}, Landroid/os/Parcel;->recycle()V
 
     throw v0
@@ -946,9 +916,9 @@
 
     move-result-object v13
     :try_end_8
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_8 .. :try_end_8} :catch_8
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_8 .. :try_end_8} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_8 .. :try_end_8} :catch_6
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_8 .. :try_end_8} :catch_7
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_8 .. :try_end_8} :catch_6
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_8 .. :try_end_8} :catch_5
     .catchall {:try_start_8 .. :try_end_8} :catchall_6
 
     :try_start_9
@@ -966,27 +936,27 @@
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/zzfh;
     :try_end_9
-    .catch Lcom/google/android/gms/common/internal/safeparcel/a$a; {:try_start_9 .. :try_end_9} :catch_4
+    .catch Lcom/google/android/gms/common/internal/safeparcel/a$a; {:try_start_9 .. :try_end_9} :catch_3
     .catchall {:try_start_9 .. :try_end_9} :catchall_1
 
     :try_start_a
     invoke-virtual {v13}, Landroid/os/Parcel;->recycle()V
     :try_end_a
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_a .. :try_end_a} :catch_8
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_a .. :try_end_a} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_a .. :try_end_a} :catch_6
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_a .. :try_end_a} :catch_7
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_a .. :try_end_a} :catch_6
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_a .. :try_end_a} :catch_5
     .catchall {:try_start_a .. :try_end_a} :catchall_6
 
-    goto :goto_4
+    goto :goto_3
 
     :catchall_1
     move-exception v0
 
-    goto :goto_5
+    goto :goto_4
 
-    :catch_4
+    :catch_3
     :try_start_b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1003,12 +973,14 @@
 
     const/4 v0, 0x0
 
-    :goto_4
+    :goto_3
     if-eqz v0, :cond_4
 
-    goto :goto_2
+    invoke-interface {v3, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :goto_5
+    goto :goto_1
+
+    :goto_4
     invoke-virtual {v13}, Landroid/os/Parcel;->recycle()V
 
     throw v0
@@ -1020,9 +992,9 @@
 
     move-result-object v13
     :try_end_c
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_c .. :try_end_c} :catch_8
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_c .. :try_end_c} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_c .. :try_end_c} :catch_6
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_c .. :try_end_c} :catch_7
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_c .. :try_end_c} :catch_6
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_c .. :try_end_c} :catch_5
     .catchall {:try_start_c .. :try_end_c} :catchall_6
 
     :try_start_d
@@ -1040,27 +1012,27 @@
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/zzl;
     :try_end_d
-    .catch Lcom/google/android/gms/common/internal/safeparcel/a$a; {:try_start_d .. :try_end_d} :catch_5
+    .catch Lcom/google/android/gms/common/internal/safeparcel/a$a; {:try_start_d .. :try_end_d} :catch_4
     .catchall {:try_start_d .. :try_end_d} :catchall_2
 
     :try_start_e
     invoke-virtual {v13}, Landroid/os/Parcel;->recycle()V
     :try_end_e
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_e .. :try_end_e} :catch_8
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_e .. :try_end_e} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_e .. :try_end_e} :catch_6
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_e .. :try_end_e} :catch_7
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_e .. :try_end_e} :catch_6
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_e .. :try_end_e} :catch_5
     .catchall {:try_start_e .. :try_end_e} :catchall_6
 
-    goto :goto_6
+    goto :goto_5
 
     :catchall_2
     move-exception v0
 
-    goto :goto_7
+    goto :goto_6
 
-    :catch_5
+    :catch_4
     :try_start_f
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1077,18 +1049,20 @@
 
     const/4 v0, 0x0
 
-    :goto_6
+    :goto_5
     if-eqz v0, :cond_4
 
-    goto :goto_2
+    invoke-interface {v3, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :goto_7
+    goto/16 :goto_1
+
+    :goto_6
     invoke-virtual {v13}, Landroid/os/Parcel;->recycle()V
 
     throw v0
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1123,7 +1097,7 @@
 
     if-ge v0, v4, :cond_9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1138,9 +1112,9 @@
 
     invoke-virtual {v2}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
     :try_end_10
-    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_10 .. :try_end_10} :catch_8
-    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_10 .. :try_end_10} :catch_7
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_10 .. :try_end_10} :catch_6
+    .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_10 .. :try_end_10} :catch_7
+    .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_10 .. :try_end_10} :catch_6
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_10 .. :try_end_10} :catch_5
     .catchall {:try_start_10 .. :try_end_10} :catchall_6
 
     if-eqz v9, :cond_a
@@ -1155,95 +1129,97 @@
     :cond_b
     return-object v3
 
-    :catch_6
-    move-exception v0
-
-    goto :goto_c
-
-    :catch_7
-    move-object v4, v2
-
-    move-object v2, v9
-
-    goto :goto_e
-
-    :catch_8
-    move-exception v0
-
-    move-object v15, v2
-
-    move-object v2, v9
-
-    goto/16 :goto_f
-
-    :catchall_3
+    :catch_5
     move-exception v0
 
     goto :goto_a
 
-    :catch_9
-    move-exception v0
+    :catch_6
+    move-object v4, v2
+
+    move-object v2, v9
 
     goto :goto_b
 
-    :catch_a
+    :catch_7
     move-exception v0
 
     move-object v15, v2
 
+    move-object v2, v9
+
+    goto/16 :goto_c
+
+    :catchall_3
+    move-exception v0
+
+    goto :goto_8
+
+    :catch_8
+    move-exception v0
+
     goto :goto_9
 
+    :catch_9
+    move-exception v0
+
+    move-object v15, v2
+
+    goto :goto_7
+
     :catchall_4
     move-exception v0
 
     move-object v2, v15
 
-    goto :goto_a
+    goto :goto_8
 
-    :catch_b
+    :catch_a
     move-exception v0
 
     move-object v2, v15
 
-    goto :goto_b
+    goto :goto_9
+
+    :catch_b
+    move-object v2, v15
 
     :catch_c
-    :goto_8
     move-object v4, v2
 
     const/4 v2, 0x0
 
-    goto :goto_e
+    goto :goto_b
 
     :catch_d
     move-exception v0
 
     move-object v2, v15
 
-    :goto_9
+    :goto_7
     const/4 v2, 0x0
 
-    goto :goto_f
+    goto :goto_c
 
     :catchall_5
     move-exception v0
 
     const/4 v2, 0x0
 
-    :goto_a
+    :goto_8
     const/4 v9, 0x0
 
-    goto/16 :goto_11
+    goto :goto_e
 
     :catch_e
     move-exception v0
 
     const/4 v2, 0x0
 
-    :goto_b
+    :goto_9
     const/4 v9, 0x0
 
-    :goto_c
+    :goto_a
     if-eqz v2, :cond_c
 
     :try_start_11
@@ -1255,16 +1231,8 @@
 
     invoke-virtual {v2}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
-    goto :goto_d
-
-    :catchall_6
-    move-exception v0
-
-    goto :goto_11
-
     :cond_c
-    :goto_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -1287,14 +1255,19 @@
 
     invoke-virtual {v2}, Landroid/database/sqlite/SQLiteDatabase;->close()V
 
-    goto :goto_10
+    goto :goto_d
+
+    :catchall_6
+    move-exception v0
+
+    goto :goto_e
 
     :catch_f
     const/4 v2, 0x0
 
     const/4 v4, 0x0
 
-    :goto_e
+    :goto_b
     int-to-long v8, v7
 
     :try_start_12
@@ -1313,7 +1286,7 @@
 
     invoke-virtual {v4}, Landroid/database/sqlite/SQLiteDatabase;->close()V
 
-    goto :goto_10
+    goto :goto_d
 
     :catchall_7
     move-exception v0
@@ -1322,7 +1295,7 @@
 
     move-object v2, v4
 
-    goto :goto_11
+    goto :goto_e
 
     :catch_10
     move-exception v0
@@ -1331,9 +1304,9 @@
 
     const/4 v15, 0x0
 
-    :goto_f
+    :goto_c
     :try_start_13
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v4
 
@@ -1357,7 +1330,7 @@
     invoke-virtual {v15}, Landroid/database/sqlite/SQLiteDatabase;->close()V
 
     :cond_10
-    :goto_10
+    :goto_d
     add-int/lit8 v6, v6, 0x1
 
     const/4 v2, 0x0
@@ -1373,7 +1346,7 @@
 
     move-object v2, v15
 
-    :goto_11
+    :goto_e
     if-eqz v9, :cond_11
 
     invoke-interface {v9}, Landroid/database/Cursor;->close()V
@@ -1387,7 +1360,7 @@
     throw v0
 
     :cond_13
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -1401,3 +1374,19 @@
 
     return-object v2
 .end method
+
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic yz()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dq;->yz()V
+
+    return-void
+.end method
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 c116eebfb9..0bdb6660c4 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
@@ -47,7 +47,7 @@
     :catch_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/l;->bkk:Lcom/google/android/gms/measurement/internal/k;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/l;->bkk:Lcom/google/android/gms/measurement/internal/k;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -102,7 +102,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/l;->bkk:Lcom/google/android/gms/measurement/internal/k;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -129,7 +129,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/l;->bkk:Lcom/google/android/gms/measurement/internal/k;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -164,32 +164,21 @@
 
     invoke-virtual {p1, v1, v0}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object v1
+    move-result-object v0
+
+    invoke-interface {v0}, Landroid/database/Cursor;->moveToFirst()Z
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-interface {v1}, Landroid/database/Cursor;->moveToFirst()Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    if-eqz v0, :cond_1
 
-    if-eqz v1, :cond_1
+    invoke-interface {v0}, Landroid/database/Cursor;->close()V
 
-    invoke-interface {v1}, Landroid/database/Cursor;->close()V
-
-    goto :goto_1
+    goto :goto_0
 
     :catchall_0
     move-exception p1
 
-    move-object v0, v1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p1
-
-    :goto_0
     if-eqz v0, :cond_0
 
     invoke-interface {v0}, Landroid/database/Cursor;->close()V
@@ -198,10 +187,10 @@
     throw p1
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/l;->bkk:Lcom/google/android/gms/measurement/internal/k;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 265a0ebe9c..2ae3a09064 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
@@ -213,7 +213,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sY()Z
 
     move-result v0
 
@@ -226,7 +226,7 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -237,7 +237,7 @@
     return-object p1
 .end method
 
-.method private final sZ()Z
+.method private final sY()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->bih:Lcom/google/android/gms/measurement/internal/ar;
@@ -252,7 +252,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -288,7 +288,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sY()Z
 
     move-result v0
 
@@ -360,7 +360,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sY()Z
 
     move-result v0
 
@@ -428,7 +428,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sY()Z
 
     move-result v0
 
@@ -462,7 +462,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sY()Z
 
     move-result v0
 
@@ -496,7 +496,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sY()Z
 
     move-result v0
 
@@ -563,7 +563,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/m;->sY()Z
 
     move-result v0
 
@@ -609,17 +609,16 @@
 
     const-string v3, ", "
 
-    :goto_1
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const-string v3, "Bundle[{"
 
-    goto :goto_1
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, v2}, Lcom/google/android/gms/measurement/internal/m;->cp(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
@@ -660,103 +659,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -764,6 +755,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali
index a585e87006..971cf30942 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali
@@ -55,7 +55,7 @@
     return-object v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -63,7 +63,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
@@ -73,7 +73,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
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 79738879d7..0a4e8a4993 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
@@ -573,7 +573,7 @@
     return-object p0
 .end method
 
-.method private final zb()Ljava/lang/String;
+.method private final za()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
@@ -593,20 +593,19 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ar;->bmh:Ljava/lang/String;
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/o;->bkp:Ljava/lang/String;
 
-    goto :goto_1
-
-    :cond_0
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ah()Ljava/lang/String;
-
-    move-result-object v0
-
     goto :goto_0
 
+    :cond_0
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ei;->Ag()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/o;->bkp:Ljava/lang/String;
+
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/o;->bkp:Ljava/lang/String;
 
     monitor-exit p0
@@ -628,7 +627,7 @@
 .method protected final E(I)Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/o;->zb()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/o;->za()Ljava/lang/String;
 
     move-result-object v0
 
@@ -677,7 +676,6 @@
 
     const-string p1, "Scheduler not set. Not logging error/warn"
 
-    :goto_0
     invoke-virtual {p0, p3, p1}, Lcom/google/android/gms/measurement/internal/o;->c(ILjava/lang/String;)V
 
     return-void
@@ -691,7 +689,9 @@
 
     const-string p1, "Scheduler not initialized. Not logging error/warn"
 
-    goto :goto_0
+    invoke-virtual {p0, p3, p1}, Lcom/google/android/gms/measurement/internal/o;->c(ILjava/lang/String;)V
+
+    return-void
 
     :cond_2
     if-gez p1, :cond_3
@@ -707,12 +707,12 @@
 
     const/16 v2, 0x8
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
     move v2, p1
 
-    :goto_1
+    :goto_0
     new-instance p1, Lcom/google/android/gms/measurement/internal/p;
 
     move-object v0, p1
@@ -738,7 +738,7 @@
 .method protected final c(ILjava/lang/String;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/o;->zb()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/o;->za()Ljava/lang/String;
 
     move-result-object v0
 
@@ -757,103 +757,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->ky()V
 
     return-void
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -861,6 +853,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/bo;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -869,10 +869,10 @@
     return-void
 .end method
 
-.method public final zc()Ljava/lang/String;
+.method public final zb()Ljava/lang/String;
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -880,13 +880,13 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uU()J
 
     move-result-wide v1
 
@@ -896,7 +896,7 @@
 
     if-nez v5, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uT()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uS()V
 
     move-wide v1, v3
 
@@ -905,7 +905,7 @@
     :cond_0
     iget-object v5, v0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v5
 
@@ -930,10 +930,9 @@
 
     if-gez v9, :cond_1
 
-    :goto_1
     move-object v0, v8
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/ac;->aWY:J
@@ -944,9 +943,11 @@
 
     if-lez v9, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uT()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uS()V
 
-    goto :goto_1
+    move-object v0, v8
+
+    goto :goto_2
 
     :cond_2
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
@@ -973,7 +974,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uT()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uS()V
 
     if-eqz v1, :cond_4
 
@@ -981,7 +982,7 @@
 
     if-gtz v0, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance v0, Landroid/util/Pair;
@@ -992,20 +993,20 @@
 
     invoke-direct {v0, v1, v2}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
-    :goto_2
+    :goto_1
     sget-object v0, Lcom/google/android/gms/measurement/internal/z;->bkW:Landroid/util/Pair;
 
-    :goto_3
+    :goto_2
     if-eqz v0, :cond_6
 
     sget-object v1, Lcom/google/android/gms/measurement/internal/z;->bkW:Landroid/util/Pair;
 
     if-ne v0, v1, :cond_5
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     iget-object v1, v0, Landroid/util/Pair;->second:Ljava/lang/Object;
@@ -1057,6 +1058,6 @@
     return-object v0
 
     :cond_6
-    :goto_4
+    :goto_3
     return-object v8
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali
index c525d3ad50..d7c6a92dc9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali
@@ -49,7 +49,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/o;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -78,11 +78,11 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/p;->bkE:Lcom/google/android/gms/measurement/internal/o;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ut()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->us()Z
 
     move-result v1
 
@@ -92,20 +92,19 @@
 
     const/16 v2, 0x43
 
-    :goto_0
     iput-char v2, v1, Lcom/google/android/gms/measurement/internal/o;->bko:C
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/p;->bkE:Lcom/google/android/gms/measurement/internal/o;
 
     const/16 v2, 0x63
 
-    goto :goto_0
+    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/o;->bko:C
 
     :cond_2
-    :goto_1
+    :goto_0
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/p;->bkE:Lcom/google/android/gms/measurement/internal/o;
 
     iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/o;->bkc:J
@@ -208,9 +207,9 @@
 
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uU()J
 
     move-result-wide v6
 
@@ -218,7 +217,7 @@
 
     if-nez v2, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uT()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ac;->uS()V
 
     :cond_5
     if-nez v1, :cond_6
@@ -269,11 +268,11 @@
     :cond_7
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ac;->bls:Lcom/google/android/gms/measurement/internal/z;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->zP()Ljava/security/SecureRandom;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->zO()Ljava/security/SecureRandom;
 
     move-result-object v2
 
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 75363aed82..c7e4e04838 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
@@ -34,7 +34,7 @@
 .end method
 
 .method static b(Ljava/net/HttpURLConnection;)[B
-    .locals 5
+    .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
@@ -53,17 +53,14 @@
 
     invoke-virtual {p0}, Ljava/net/HttpURLConnection;->getInputStream()Ljava/io/InputStream;
 
-    move-result-object p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    move-result-object v0
 
-    const/16 v0, 0x400
+    const/16 p0, 0x400
 
-    :try_start_1
-    new-array v0, v0, [B
+    new-array p0, p0, [B
 
     :goto_0
-    invoke-virtual {p0, v0}, Ljava/io/InputStream;->read([B)I
+    invoke-virtual {v0, p0}, Ljava/io/InputStream;->read([B)I
 
     move-result v2
 
@@ -71,45 +68,35 @@
 
     const/4 v3, 0x0
 
-    invoke-virtual {v1, v0, v3, v2}, Ljava/io/ByteArrayOutputStream;->write([BII)V
+    invoke-virtual {v1, p0, v3, v2}, Ljava/io/ByteArrayOutputStream;->write([BII)V
 
     goto :goto_0
 
     :cond_0
     invoke-virtual {v1}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
 
-    move-result-object v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    move-result-object p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz p0, :cond_1
+    if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Ljava/io/InputStream;->close()V
+    invoke-virtual {v0}, Ljava/io/InputStream;->close()V
 
     :cond_1
-    return-object v0
+    return-object p0
 
     :catchall_0
-    move-exception v0
-
-    goto :goto_1
-
-    :catchall_1
     move-exception p0
 
-    move-object v4, v0
+    if-eqz v0, :cond_2
 
-    move-object v0, p0
-
-    move-object p0, v4
-
-    :goto_1
-    if-eqz p0, :cond_2
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->close()V
+    invoke-virtual {v0}, Ljava/io/InputStream;->close()V
 
     :cond_2
-    throw v0
+    throw p0
+
+    return-void
 .end method
 
 
@@ -124,18 +111,18 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic kz()V
+.method public final bridge synthetic ky()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->kz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ky()V
 
     return-void
 .end method
 
-.method public final qX()Z
+.method public final qW()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->tO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->getContext()Landroid/content/Context;
 
@@ -180,95 +167,87 @@
     return v0
 .end method
 
-.method public final bridge synthetic tK()Lcom/google/android/gms/common/util/d;
+.method public final bridge synthetic tJ()Lcom/google/android/gms/common/util/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/m;
+.method public final bridge synthetic yI()Lcom/google/android/gms/measurement/internal/m;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/m;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yI()Lcom/google/android/gms/measurement/internal/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/ea;
+.method public final bridge synthetic yJ()Lcom/google/android/gms/measurement/internal/ea;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/am;
+.method public final bridge synthetic yK()Lcom/google/android/gms/measurement/internal/am;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/o;
+.method public final bridge synthetic yL()Lcom/google/android/gms/measurement/internal/o;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic yM()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yM()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic yO()Lcom/google/android/gms/measurement/internal/ei;
+.method public final bridge synthetic yN()Lcom/google/android/gms/measurement/internal/ei;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -276,6 +255,14 @@
     return v0
 .end method
 
+.method public final bridge synthetic yy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->yy()V
+
+    return-void
+.end method
+
 .method public final bridge synthetic yz()V
     .locals 0
 
@@ -284,30 +271,30 @@
     return-void
 .end method
 
-.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/dx;
+.method public final bridge synthetic zc()Lcom/google/android/gms/measurement/internal/dx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/ef;
+.method public final bridge synthetic zd()Lcom/google/android/gms/measurement/internal/ef;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/ef;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zd()Lcom/google/android/gms/measurement/internal/ef;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic zf()Lcom/google/android/gms/measurement/internal/el;
+.method public final bridge synthetic ze()Lcom/google/android/gms/measurement/internal/el;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->zf()Lcom/google/android/gms/measurement/internal/el;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dp;->ze()Lcom/google/android/gms/measurement/internal/el;
 
     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 6f6c7bca57..71f86e4fad 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
@@ -81,7 +81,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yz()V
 
     const/4 v0, 0x0
 
@@ -191,7 +191,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/do;->zd()Lcom/google/android/gms/measurement/internal/dx;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/do;->zc()Lcom/google/android/gms/measurement/internal/dx;
 
     move-result-object v4
 
@@ -203,7 +203,7 @@
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v5
 
@@ -259,7 +259,7 @@
 
     move-object v3, v4
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_0
     move-exception v4
@@ -270,7 +270,7 @@
 
     move-object v7, v4
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_2
     :goto_1
@@ -305,7 +305,7 @@
     :cond_3
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -323,7 +323,6 @@
 
     invoke-direct/range {v4 .. v11}, Lcom/google/android/gms/measurement/internal/u;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/t;ILjava/lang/Throwable;[BLjava/util/Map;B)V
 
-    :goto_2
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/am;->h(Ljava/lang/Runnable;)V
 
     return-void
@@ -333,7 +332,7 @@
 
     move-object v3, v0
 
-    goto :goto_6
+    goto :goto_5
 
     :catch_1
     move-exception v0
@@ -342,7 +341,7 @@
 
     move-object v9, v10
 
-    goto :goto_3
+    goto :goto_2
 
     :catchall_2
     move-exception v0
@@ -351,7 +350,7 @@
 
     move-object v10, v1
 
-    goto :goto_6
+    goto :goto_5
 
     :catch_2
     move-exception v0
@@ -360,20 +359,20 @@
 
     move v6, v7
 
-    :goto_3
+    :goto_2
     move-object v7, v0
 
-    goto :goto_8
+    goto :goto_7
 
     :catchall_3
     move-exception v3
 
     move-object v10, v1
 
-    :goto_4
+    :goto_3
     const/4 v7, 0x0
 
-    goto :goto_6
+    goto :goto_5
 
     :catch_3
     move-exception v3
@@ -382,10 +381,10 @@
 
     move-object v7, v3
 
-    :goto_5
+    :goto_4
     const/4 v6, 0x0
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_4
     :try_start_6
@@ -411,7 +410,7 @@
 
     move-object v2, v10
 
-    :goto_6
+    :goto_5
     if-eqz v1, :cond_5
 
     :try_start_7
@@ -419,14 +418,14 @@
     :try_end_7
     .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_4
 
-    goto :goto_7
+    goto :goto_6
 
     :catch_4
     move-exception v0
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -443,7 +442,7 @@
     invoke-virtual {v1, v4, v5, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_5
-    :goto_7
+    :goto_6
     if-eqz v2, :cond_6
 
     invoke-virtual {v2}, Ljava/net/HttpURLConnection;->disconnect()V
@@ -451,7 +450,7 @@
     :cond_6
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -486,7 +485,7 @@
 
     move-object v2, v9
 
-    :goto_8
+    :goto_7
     if-eqz v1, :cond_7
 
     :try_start_8
@@ -494,14 +493,14 @@
     :try_end_8
     .catch Ljava/io/IOException; {:try_start_8 .. :try_end_8} :catch_6
 
-    goto :goto_9
+    goto :goto_8
 
     :catch_6
     move-exception v0
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -518,7 +517,7 @@
     invoke-virtual {v1, v3, v4, v0}, Lcom/google/android/gms/measurement/internal/q;->e(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_7
-    :goto_9
+    :goto_8
     if-eqz v2, :cond_8
 
     invoke-virtual {v2}, Ljava/net/HttpURLConnection;->disconnect()V
@@ -526,7 +525,7 @@
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/v;->bkP:Lcom/google/android/gms/measurement/internal/s;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
@@ -544,5 +543,7 @@
 
     invoke-direct/range {v3 .. v10}, Lcom/google/android/gms/measurement/internal/u;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/t;ILjava/lang/Throwable;[BLjava/util/Map;B)V
 
-    goto/16 :goto_2
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/am;->h(Ljava/lang/Runnable;)V
+
+    return-void
 .end method
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 7136bd5f09..2c9cb48800 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
@@ -50,7 +50,7 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
@@ -58,7 +58,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -78,11 +78,11 @@
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/s;->qX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/s;->qW()Z
 
     move-result p1
 
@@ -94,7 +94,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object p2
 
@@ -110,7 +110,7 @@
     :cond_1
     iget-object p2, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p2
 
@@ -123,22 +123,22 @@
     return-void
 .end method
 
-.method public final uL()V
+.method public final uK()V
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/w;->aWM:Z
 
@@ -163,11 +163,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zC()Lcom/google/android/gms/measurement/internal/s;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zB()Lcom/google/android/gms/measurement/internal/s;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/s;->qX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/s;->qW()Z
 
     move-result v0
 
@@ -175,7 +175,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -205,23 +205,23 @@
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zE()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/am;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yK()Lcom/google/android/gms/measurement/internal/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/w;->aWM:Z
 
@@ -232,7 +232,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -266,7 +266,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/w;->bkQ:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
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 c356d3501f..0f0c7fe882 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
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->zI()V
 
     return-void
 .end method
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 e05b1f5fbf..6da2fd6e7d 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
@@ -39,7 +39,7 @@
 
     iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/y;->bkU:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/q;->aO(Ljava/lang/String;)Ljava/lang/String;
 
@@ -93,7 +93,7 @@
 
     if-lt v4, v6, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     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 415da6ebc4..3535b171f8 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
@@ -207,7 +207,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/z;)Landroid/content/SharedPreferences;
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object p0
 
@@ -216,14 +216,14 @@
 
 
 # virtual methods
-.method final S(Z)V
+.method final R(Z)V
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -237,7 +237,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -254,14 +254,14 @@
     return-void
 .end method
 
-.method final T(Z)Z
+.method final S(Z)Z
     .locals 2
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -274,14 +274,14 @@
     return p1
 .end method
 
-.method final U(Z)V
+.method final T(Z)V
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -295,7 +295,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -313,7 +313,7 @@
 .end method
 
 .method final cu(Ljava/lang/String;)Landroid/util/Pair;
-    .locals 5
+    .locals 6
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
@@ -332,9 +332,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -346,28 +346,26 @@
 
     if-eqz v2, :cond_0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/z;->bli:J
+    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/z;->bli:J
 
-    cmp-long v4, v0, v2
+    cmp-long v5, v0, v3
 
-    if-gez v4, :cond_0
+    if-gez v5, :cond_0
 
     new-instance p1, Landroid/util/Pair;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->blg:Ljava/lang/String;
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/z;->blh:Z
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/z;->blh:Z
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    move-result-object v0
 
-    move-result-object v1
-
-    invoke-direct {p1, v0, v1}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {p1, v2, v0}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     return-object p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yO()Lcom/google/android/gms/measurement/internal/ei;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yN()Lcom/google/android/gms/measurement/internal/ei;
 
     move-result-object v2
 
@@ -424,7 +422,7 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -464,7 +462,7 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/z;->cu(Ljava/lang/String;)Landroid/util/Pair;
 
@@ -521,9 +519,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -545,9 +543,9 @@
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -564,7 +562,7 @@
     return-void
 .end method
 
-.method protected final yT()Z
+.method protected final yS()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -572,7 +570,7 @@
     return v0
 .end method
 
-.method protected final yU()V
+.method protected final yT()V
     .locals 9
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
@@ -655,28 +653,28 @@
     return-void
 .end method
 
-.method final zg()Landroid/content/SharedPreferences;
+.method final zf()Landroid/content/SharedPreferences;
     .locals 1
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->aWU:Landroid/content/SharedPreferences;
 
     return-object v0
 .end method
 
-.method final zh()Ljava/lang/String;
+.method final zg()Ljava/lang/String;
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -691,14 +689,14 @@
     return-object v0
 .end method
 
-.method final zi()Ljava/lang/String;
+.method final zh()Ljava/lang/String;
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -713,14 +711,14 @@
     return-object v0
 .end method
 
-.method final zj()Ljava/lang/Boolean;
+.method final zi()Ljava/lang/Boolean;
     .locals 3
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -737,7 +735,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -756,14 +754,14 @@
     return-object v0
 .end method
 
-.method final zk()V
+.method final zj()V
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -773,7 +771,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/q;->ct(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -787,12 +785,12 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/z;->T(Z)Z
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/z;->S(Z)Z
 
     move-result v1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -806,9 +804,9 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v0
 
@@ -822,7 +820,7 @@
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/q;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -840,14 +838,14 @@
     return-void
 .end method
 
-.method protected final zl()Ljava/lang/String;
+.method protected final zk()Ljava/lang/String;
     .locals 4
     .annotation build Landroidx/annotation/WorkerThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->kz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->ky()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -859,11 +857,11 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yI()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/bn;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tP()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bo;->tO()V
 
     sget-object v1, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -879,7 +877,7 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zg()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/z;->zf()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzaa.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzaa.smali
index 5ff9726639..772e3b668c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzaa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzaa.smali
@@ -144,7 +144,7 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/zzaa;->yP()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/zzaa;->yO()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -157,7 +157,7 @@
     return-void
 .end method
 
-.method public final yP()Landroid/os/Bundle;
+.method public final yO()Landroid/os/Bundle;
     .locals 2
 
     new-instance v0, Landroid/os/Bundle;
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzfh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzfh.smali
index 9356be9548..300a6628e0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzfh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzfh.smali
@@ -211,8 +211,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzfh;->boG:Ljava/lang/Long;
-
     return-object v0
 
     :cond_0
@@ -220,8 +218,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzfh;->aYB:Ljava/lang/Double;
-
     return-object v0
 
     :cond_1
@@ -229,8 +225,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzfh;->aYy:Ljava/lang/String;
-
     return-object v0
 
     :cond_2
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement_base/R.smali b/com.discord/smali_classes2/com/google/android/gms/measurement_base/R.smali
index 33dc6e6d61..cee86f7431 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement_base/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement_base/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/measurement_base/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/R.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/R.smali
index 7ce966506d..aab16675ea 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/nearby/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 5473dc8546..088a8a904c 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
@@ -35,5 +35,5 @@
 
 
 # virtual methods
-.method public abstract AH()D
+.method public abstract AG()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 2e06b62bde..8d18b859d3 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
@@ -103,9 +103,9 @@
 
     const p3, 0x19000
 
-    const/4 p6, 0x0
+    const/4 p6, 0x1
 
-    const/4 p7, 0x1
+    const/4 p7, 0x0
 
     if-gt p1, p3, :cond_1
 
@@ -129,13 +129,13 @@
 
     move-result-object v3
 
-    aput-object v3, v2, p6
+    aput-object v3, v2, p7
 
     invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p3
 
-    aput-object p3, v2, p7
+    aput-object p3, v2, p6
 
     invoke-static {p1, v0, v2}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/String;[Ljava/lang/Object;)V
 
@@ -181,13 +181,13 @@
 
     move-result-object p4
 
-    aput-object p4, p5, p6
+    aput-object p4, p5, p7
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    aput-object p2, p5, p7
+    aput-object p2, p5, p6
 
     invoke-static {p1, p3, p5}, Lcom/google/android/gms/common/internal/q;->a(ZLjava/lang/String;[Ljava/lang/Object;)V
 
@@ -260,7 +260,7 @@
 
 
 # virtual methods
-.method public final AI()[B
+.method public final AH()[B
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/nearby/messages/Message;->content:[B
@@ -399,8 +399,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/Message;->content:[B
-
     array-length v2, v2
 
     :goto_0
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 345cac9617..d14fd8702c 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
@@ -37,7 +37,7 @@
 
 
 # virtual methods
-.method public final AK()Lcom/google/android/gms/nearby/messages/PublishOptions;
+.method public final AJ()Lcom/google/android/gms/nearby/messages/PublishOptions;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/PublishOptions;
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 9513b3451c..b9c4f68cf3 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
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->AK()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->AJ()Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     move-result-object v0
 
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 5e78f18e97..2480dc1145 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
@@ -54,7 +54,7 @@
 
 
 # virtual methods
-.method public final AL()Lcom/google/android/gms/nearby/messages/Strategy;
+.method public final AK()Lcom/google/android/gms/nearby/messages/Strategy;
     .locals 11
 
     iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->agg:I
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 338464d587..a9d11e24bd 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
@@ -72,7 +72,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->AL()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->AK()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
@@ -114,7 +114,7 @@
 
     iput v3, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aiX:I
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->AL()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->AK()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
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 53ea335be8..828b8fdace 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
@@ -43,7 +43,7 @@
 
 
 # virtual methods
-.method public final AM()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.method public final AL()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;
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 4dd005c53f..c8db53cb20 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
@@ -37,7 +37,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->AM()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->AL()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     move-result-object v0
 
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 9d9739c209..ec38027fb6 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
@@ -32,7 +32,7 @@
 
 
 # virtual methods
-.method public final AJ()Lcom/google/android/gms/nearby/messages/b;
+.method public final AI()Lcom/google/android/gms/nearby/messages/b;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/b;
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 0a4cff7864..8531313f2f 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
@@ -432,8 +432,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->brb:[B
-
     array-length v6, v6
 
     const/16 v7, 0x13
@@ -706,8 +704,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->bqW:Lcom/google/android/gms/nearby/messages/internal/aq;
-
     invoke-interface {v1}, Lcom/google/android/gms/nearby/messages/internal/aq;->asBinder()Landroid/os/IBinder;
 
     move-result-object v1
@@ -734,8 +730,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->bqY:Lcom/google/android/gms/nearby/messages/internal/at;
-
     invoke-interface {v3}, Lcom/google/android/gms/nearby/messages/internal/at;->asBinder()Landroid/os/IBinder;
 
     move-result-object v3
@@ -794,9 +788,7 @@
     goto :goto_2
 
     :cond_2
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->brd:Lcom/google/android/gms/nearby/messages/internal/a;
-
-    invoke-interface {v2}, Lcom/google/android/gms/nearby/messages/internal/a;->asBinder()Landroid/os/IBinder;
+    invoke-interface {v3}, Lcom/google/android/gms/nearby/messages/internal/a;->asBinder()Landroid/os/IBinder;
 
     move-result-object v2
 
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 bad4191dfd..0c1b1cd14f 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
@@ -73,8 +73,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->brK:Lcom/google/android/gms/common/api/internal/h;
-
     sget-object v1, Lcom/google/android/gms/nearby/messages/internal/aa;->brJ: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 f044e4b0e1..96808214a3 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
@@ -73,8 +73,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->brK:Lcom/google/android/gms/common/api/internal/h;
-
     sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ac;->brJ: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/as.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/as.smali
index 25ba86b0ad..ef750652fc 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
@@ -35,7 +35,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -56,7 +56,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()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 306a3c9ec5..701ac71650 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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()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 bdeb94eff0..67fcc896f7 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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()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 c3719beaf2..27e6e16817 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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()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 5b78100714..5cf1758188 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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()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 5e1e4654b1..dac9223106 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;->mr()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mq()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 a9ad9943ab..44308111fa 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
@@ -108,10 +108,7 @@
 
     iget p2, p6, Lcom/google/android/gms/nearby/messages/b;->zzfh:I
 
-    :goto_1
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->zzfh:I
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     new-instance p6, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
@@ -122,9 +119,9 @@
 
     const/4 p2, -0x1
 
-    goto :goto_1
+    :goto_1
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->zzfh:I
 
-    :goto_2
     if-ne p3, p5, :cond_5
 
     check-cast p1, Landroid/app/Activity;
@@ -258,7 +255,7 @@
     return-void
 .end method
 
-.method public final kM()Z
+.method public final kL()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/d;->mContext:Landroid/content/Context;
@@ -270,7 +267,7 @@
     return v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -278,7 +275,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
@@ -288,7 +285,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
@@ -298,12 +295,12 @@
     return-object v0
 .end method
 
-.method public final lG()Landroid/os/Bundle;
+.method public final lF()Landroid/os/Bundle;
     .locals 3
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/h;->lG()Landroid/os/Bundle;
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/h;->lF()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -410,7 +407,7 @@
     invoke-static {p1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->lH()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->lG()Landroid/os/IInterface;
 
     move-result-object p1
 
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 e454d6d890..159fa8d8c8 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
@@ -219,7 +219,7 @@
 
     iput-boolean v1, p2, Lcom/google/android/gms/nearby/messages/internal/zzcb;->brP:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lG()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -256,7 +256,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;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lG()Landroid/os/IInterface;
 
     move-result-object p0
 
@@ -334,7 +334,7 @@
 
     iput-boolean p0, v0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->brP:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lG()Landroid/os/IInterface;
 
     move-result-object p0
 
@@ -470,7 +470,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;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lG()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -679,10 +679,10 @@
     return-object p1
 .end method
 
-.method public final kT()Lcom/google/android/gms/common/internal/e$a;
+.method public final kS()Lcom/google/android/gms/common/internal/e$a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->kT()Lcom/google/android/gms/common/internal/e$a;
+    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->kS()Lcom/google/android/gms/common/internal/e$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/i.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/i.smali
index c352a7b010..187103e80e 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
@@ -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;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lG()Landroid/os/IInterface;
 
     move-result-object p1
 
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 b27cfc3be1..9701088f68 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
@@ -96,7 +96,7 @@
 
     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;->lH()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lG()Landroid/os/IInterface;
 
     move-result-object p1
 
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 61c6d82f40..c570c4c244 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
@@ -48,7 +48,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AP()Z
 
     move-result v0
 
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 e7a9dd5fe1..297991d788 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
@@ -286,8 +286,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->brN:Lcom/google/android/gms/nearby/messages/internal/ay;
-
     invoke-interface {v1}, Lcom/google/android/gms/nearby/messages/internal/ay;->asBinder()Landroid/os/IBinder;
 
     move-result-object v1
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 282d0a615c..f6ed6eaf4d 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
@@ -243,8 +243,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->bqW:Lcom/google/android/gms/nearby/messages/internal/aq;
-
     invoke-interface {v1}, Lcom/google/android/gms/nearby/messages/internal/aq;->asBinder()Landroid/os/IBinder;
 
     move-result-object v1
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 04bc742eea..8d663fb4f5 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
@@ -79,7 +79,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->AH()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->AG()D
 
     move-result-wide v0
 
@@ -96,7 +96,7 @@
     :cond_0
     iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->brQ:D
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->AH()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->AG()D
 
     move-result-wide v2
 
@@ -109,7 +109,7 @@
 
 
 # virtual methods
-.method public final AH()D
+.method public final AG()D
     .locals 2
 
     iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->brQ:D
diff --git a/com.discord/smali_classes2/com/google/android/gms/phenotype/ExperimentTokens.smali b/com.discord/smali_classes2/com/google/android/gms/phenotype/ExperimentTokens.smali
index 97c7988c69..d26eaf3d39 100644
--- a/com.discord/smali_classes2/com/google/android/gms/phenotype/ExperimentTokens.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/phenotype/ExperimentTokens.smali
@@ -72,8 +72,6 @@
 
     const-string v2, ""
 
-    sget-object v5, Lcom/google/android/gms/phenotype/ExperimentTokens;->brS:[[B
-
     sget-object v7, Lcom/google/android/gms/phenotype/ExperimentTokens;->brS:[[B
 
     const/4 v3, 0x0
@@ -84,7 +82,9 @@
 
     move-object v1, v0
 
-    move-object v4, v5
+    move-object v4, v7
+
+    move-object v5, v7
 
     move-object v6, v7
 
@@ -491,8 +491,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/phenotype/ExperimentTokens;->brU:Ljava/lang/String;
-
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
@@ -542,10 +540,7 @@
 
     const-string v1, "null"
 
-    :goto_1
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const-string v1, "\'"
@@ -562,9 +557,9 @@
 
     const-string v1, "\'"
 
-    goto :goto_1
+    :goto_1
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    :goto_2
     const-string v1, ", "
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -623,10 +618,10 @@
 
     const-string v1, "null"
 
-    :goto_3
+    :goto_2
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_2
     const-string v1, "("
@@ -643,7 +638,7 @@
 
     const/4 v5, 0x1
 
-    :goto_4
+    :goto_3
     if-ge v4, v1, :cond_4
 
     aget v6, v2, v4
@@ -661,14 +656,14 @@
 
     const/4 v5, 0x0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     const-string v1, ")"
 
-    goto :goto_3
+    goto :goto_2
 
-    :goto_5
+    :goto_4
     const-string v1, ", "
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali_classes2/com/google/android/gms/phenotype/R.smali b/com.discord/smali_classes2/com/google/android/gms/phenotype/R.smali
index a036e572b8..85c4ed3172 100644
--- a/com.discord/smali_classes2/com/google/android/gms/phenotype/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/phenotype/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/phenotype/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/R.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/R.smali
index b2ac6a8429..38fca7d1fe 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/safetynet/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 2ab85d1a8e..7c425c0afc 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
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method private final AN()Ljava/io/FileOutputStream;
+.method private final AM()Ljava/io/FileOutputStream;
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->bso:Ljava/io/File;
@@ -96,13 +96,11 @@
 
     :cond_0
     :try_start_0
-    const-string v0, "xlb"
+    const-string v2, "xlb"
 
-    const-string v2, ".tmp"
+    const-string v3, ".tmp"
 
-    iget-object v3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->bso:Ljava/io/File;
-
-    invoke-static {v0, v2, v3}, Ljava/io/File;->createTempFile(Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Ljava/io/File;
+    invoke-static {v2, v3, v0}, Ljava/io/File;->createTempFile(Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Ljava/io/File;
 
     move-result-object v0
     :try_end_0
@@ -135,24 +133,24 @@
     :catchall_0
     move-exception v1
 
+    goto :goto_0
+
+    :catchall_1
+    move-exception v0
+
     move-object v4, v1
 
     move-object v1, v0
 
     move-object v0, v4
 
-    goto :goto_0
-
-    :catchall_1
-    move-exception v0
-
     :goto_0
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Ljava/io/File;->delete()Z
+    invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
     :cond_2
-    throw v0
+    throw v1
 
     :catch_0
     move-object v0, v1
@@ -193,7 +191,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->AN()Ljava/io/FileOutputStream;
+    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->AM()Ljava/io/FileOutputStream;
 
     move-result-object v0
 
@@ -243,17 +241,14 @@
     :goto_0
     if-nez v0, :cond_1
 
-    :goto_1
-    invoke-static {p0, p1, p2}, Lcom/google/android/gms/safetynet/g;->a(Lcom/google/android/gms/safetynet/SafeBrowsingData;Landroid/os/Parcel;I)V
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     or-int/2addr p2, v1
 
-    goto :goto_1
+    :goto_1
+    invoke-static {p0, p1, p2}, Lcom/google/android/gms/safetynet/g;->a(Lcom/google/android/gms/safetynet/SafeBrowsingData;Landroid/os/Parcel;I)V
 
-    :goto_2
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->bsl:Landroid/os/ParcelFileDescriptor;
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 5b435d86cd..42a5ebc7a7 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 yw()Ljava/lang/String;
+.method public final yv()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/j;->aat:Lcom/google/android/gms/common/api/k;
 
     check-cast v0, Lcom/google/android/gms/safetynet/SafetyNetApi$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$a;->yw()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$a;->yv()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 06da7da4c5..846067460a 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 yw()Ljava/lang/String;
+.method public abstract yv()Ljava/lang/String;
 .end method
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 c71cf8a0c2..984887b367 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
@@ -249,7 +249,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;->lH()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/signin/internal/a;->lG()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -339,7 +339,7 @@
     return-object v0
 .end method
 
-.method public final kL()Z
+.method public final kK()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/signin/internal/a;->bsH:Z
@@ -347,7 +347,7 @@
     return v0
 .end method
 
-.method public final kO()I
+.method public final kN()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -355,7 +355,7 @@
     return v0
 .end method
 
-.method public final kQ()Ljava/lang/String;
+.method public final kP()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.signin.service.START"
@@ -363,7 +363,7 @@
     return-object v0
 .end method
 
-.method public final kR()Ljava/lang/String;
+.method public final kQ()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.signin.internal.ISignInService"
@@ -371,7 +371,7 @@
     return-object v0
 .end method
 
-.method public final lG()Landroid/os/Bundle;
+.method public final lF()Landroid/os/Bundle;
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->acu:Lcom/google/android/gms/common/internal/e;
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/internal/e.smali b/com.discord/smali_classes2/com/google/android/gms/signin/internal/e.smali
index 97841f38f1..62e2b8fac1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/internal/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/internal/e.smali
@@ -44,7 +44,7 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/signin/internal/e;->a(Lcom/google/android/gms/signin/internal/zaj;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_2
     sget-object p1, Lcom/google/android/gms/common/api/Status;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -53,24 +53,34 @@
 
     sget-object p1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->CREATOR:Landroid/os/Parcelable$Creator;
 
+    invoke-static {p2, p1}, Lcom/google/android/gms/internal/b/c;->a(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
+
     goto :goto_0
 
     :pswitch_3
     sget-object p1, Lcom/google/android/gms/common/api/Status;->CREATOR:Landroid/os/Parcelable$Creator;
 
+    invoke-static {p2, p1}, Lcom/google/android/gms/internal/b/c;->a(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
+
     goto :goto_0
 
     :pswitch_4
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-static {p2, p1}, Lcom/google/android/gms/internal/b/c;->a(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
+
+    goto :goto_0
+
+    :pswitch_5
     sget-object p1, Lcom/google/android/gms/common/ConnectionResult;->CREATOR:Landroid/os/Parcelable$Creator;
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/b/c;->a(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
     sget-object p1, Lcom/google/android/gms/signin/internal/zaa;->CREATOR:Landroid/os/Parcelable$Creator;
 
-    :goto_0
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/b/c;->a(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    :goto_1
+    :goto_0
     invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
 
     const/4 p1, 0x1
@@ -81,8 +91,8 @@
 
     :pswitch_data_0
     .packed-switch 0x3
+        :pswitch_5
         :pswitch_4
-        :pswitch_3
         :pswitch_0
         :pswitch_3
         :pswitch_2
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 afc8c08139..9d2c78af18 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
@@ -78,7 +78,7 @@
 
 
 # virtual methods
-.method public final kZ()Lcom/google/android/gms/common/api/Status;
+.method public final kY()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/signin/internal/zaa;->bsJ:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/stats/R.smali b/com.discord/smali_classes2/com/google/android/gms/stats/R.smali
index 1ddd29c0ad..a19e4673ea 100644
--- a/com.discord/smali_classes2/com/google/android/gms/stats/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/stats/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/stats/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 a251e7fd3e..9f92eeeb49 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
@@ -287,8 +287,6 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->bsV:Landroid/os/WorkSource;
-
     invoke-virtual {p2, p1}, Landroid/os/WorkSource;->add(Landroid/os/WorkSource;)Z
 
     goto :goto_2
@@ -326,7 +324,7 @@
 
     if-nez p1, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/common/b/a;->lU()Lcom/google/android/gms/common/b/a$a;
+    invoke-static {}, Lcom/google/android/gms/common/b/a;->lT()Lcom/google/android/gms/common/b/a$a;
 
     move-result-object p1
 
@@ -373,14 +371,14 @@
 .method static synthetic a(Lcom/google/android/gms/stats/a;)V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->AO()V
+    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->AN()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final AO()V
+.method public final AN()V
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/gms/stats/a;->bsU:Landroid/os/PowerManager$WakeLock;
@@ -446,7 +444,7 @@
     return-void
 .end method
 
-.method public final AP()Ljava/lang/String;
+.method public final AO()Ljava/lang/String;
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/stats/a;->bsu:Z
diff --git a/com.discord/smali_classes2/com/google/android/gms/tagmanager_legacy/R.smali b/com.discord/smali_classes2/com/google/android/gms/tagmanager_legacy/R.smali
index 99c0fa2cca..41f6244c1d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tagmanager_legacy/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tagmanager_legacy/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/tagmanager_legacy/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/R.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/R.smali
index 79edb3fed0..badd572819 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/R.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/gms/tasks/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 7f21c5ec9e..41069c8c5f 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
@@ -74,7 +74,7 @@
     return-void
 .end method
 
-.method private final AS()V
+.method private final AR()V
     .locals 2
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "mLock"
@@ -89,7 +89,7 @@
     return-void
 .end method
 
-.method private final AT()V
+.method private final AS()V
     .locals 2
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "mLock"
@@ -106,7 +106,7 @@
     return-void
 .end method
 
-.method private final AU()V
+.method private final AT()V
     .locals 2
     .annotation build Ljavax/annotation/concurrent/GuardedBy;
         value = "mLock"
@@ -128,7 +128,7 @@
     throw v0
 .end method
 
-.method private final AV()V
+.method private final AU()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/aa;->mLock:Ljava/lang/Object;
@@ -168,7 +168,7 @@
 
 
 # virtual methods
-.method public final AQ()Z
+.method public final AP()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/aa;->mLock:Ljava/lang/Object;
@@ -210,7 +210,7 @@
     throw v1
 .end method
 
-.method public final AR()Z
+.method public final AQ()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/aa;->mLock:Ljava/lang/Object;
@@ -283,9 +283,9 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AS()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AR()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AT()V
 
     iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->btB:Ljava/lang/Exception;
 
@@ -485,7 +485,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/y;->a(Lcom/google/android/gms/tasks/x;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AV()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
 
     return-object v0
 .end method
@@ -522,7 +522,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/y;->a(Lcom/google/android/gms/tasks/x;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AV()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
 
     return-object p0
 .end method
@@ -559,7 +559,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/y;->a(Lcom/google/android/gms/tasks/x;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AV()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
 
     return-object p0
 .end method
@@ -596,7 +596,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/y;->a(Lcom/google/android/gms/tasks/x;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AV()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
 
     return-object p0
 .end method
@@ -633,7 +633,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/y;->a(Lcom/google/android/gms/tasks/x;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AV()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
 
     return-object p0
 .end method
@@ -678,7 +678,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/y;->a(Lcom/google/android/gms/tasks/x;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AV()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
 
     return-object v0
 .end method
@@ -699,7 +699,7 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AT()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AS()V
 
     const/4 v1, 0x1
 
@@ -821,9 +821,9 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AS()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AR()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AU()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AT()V
 
     iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->btB:Ljava/lang/Exception;
 
@@ -950,7 +950,7 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AT()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/aa;->AS()V
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/g.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/g.smali
index 76a417a7b1..9615694ba3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/g.smali
@@ -24,7 +24,7 @@
 
 
 # virtual methods
-.method public abstract AQ()Z
+.method public abstract AP()Z
 .end method
 
 .method public abstract S(Ljava/lang/Class;)Ljava/lang/Object;
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 0ace8f460a..2bab1d163a 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
@@ -165,7 +165,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/tasks/g;->AQ()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/tasks/g;->AP()Z
 
     move-result v0
 
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 9074133a86..09963fad37 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
@@ -41,7 +41,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/tasks/k;->btl:Lcom/google/android/gms/tasks/aa;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/aa;->AR()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/aa;->AQ()Z
 
     return-void
 
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 c7d0761b45..ca10577e7c 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
@@ -122,7 +122,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/m;->btl:Lcom/google/android/gms/tasks/aa;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/aa;->AR()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/aa;->AQ()Z
 
     return-void
 .end method
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 a21db9b98a..a7f79f2d0e 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
@@ -73,7 +73,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AP()Z
 
     move-result v0
 
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 5d3942d122..54aaf50e85 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
@@ -88,7 +88,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AP()Z
 
     move-result v0
 
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 481eb2c817..3e8671aef6 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
@@ -198,4 +198,6 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/R$anim.smali b/com.discord/smali_classes2/com/google/android/material/R$anim.smali
index 83f8e61df1..ded6031b46 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$anim.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$anim.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$anim;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/R$animator.smali b/com.discord/smali_classes2/com/google/android/material/R$animator.smali
index b871796915..8984a9a3d6 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$animator.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$animator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$animator;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 d393369a21..2c99417285 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/R$bool.smali b/com.discord/smali_classes2/com/google/android/material/R$bool.smali
index fd9eb408f2..2d2383ca2a 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$bool.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$bool.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$bool;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 4d5ca448ee..5554e53bb8 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/R$dimen.smali b/com.discord/smali_classes2/com/google/android/material/R$dimen.smali
index 9c77604096..0cd5e59812 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$dimen.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 2e310b8418..37947f4f5f 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 2881660af6..ace75003e6 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/R$integer.smali b/com.discord/smali_classes2/com/google/android/material/R$integer.smali
index 6ddb6d4f33..894c7add01 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$integer.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/R$interpolator.smali b/com.discord/smali_classes2/com/google/android/material/R$interpolator.smali
index c6ac0eb8bd..5988d7dd84 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$interpolator.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$interpolator.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$interpolator;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 481a4a626e..6a8b25511c 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 7fe3ed9413..3155d6d172 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/R$style.smali b/com.discord/smali_classes2/com/google/android/material/R$style.smali
index ae792f4d0b..84b779f30f 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$style.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 c5c8546976..8943647794 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/R.smali b/com.discord/smali_classes2/com/google/android/material/R.smali
index cf7580af30..f3f664afbd 100644
--- a/com.discord/smali_classes2/com/google/android/material/R.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/AnimationUtils.smali b/com.discord/smali_classes2/com/google/android/material/animation/AnimationUtils.smali
index 54d9f56358..bbc5e0cdb0 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/AnimationUtils.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/AnimationUtils.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/AnimationUtils;
 .super Ljava/lang/Object;
+.source "AnimationUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/AnimatorSetCompat.smali b/com.discord/smali_classes2/com/google/android/material/animation/AnimatorSetCompat.smali
index 00f91999bd..6338cf1392 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/AnimatorSetCompat.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/AnimatorSetCompat.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/AnimatorSetCompat;
 .super Ljava/lang/Object;
+.source "AnimatorSetCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/ArgbEvaluatorCompat.smali b/com.discord/smali_classes2/com/google/android/material/animation/ArgbEvaluatorCompat.smali
index 0ce576cb02..3ba2bdffc7 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/ArgbEvaluatorCompat.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/ArgbEvaluatorCompat.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/ArgbEvaluatorCompat;
 .super Ljava/lang/Object;
+.source "ArgbEvaluatorCompat.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/ChildrenAlphaProperty.smali b/com.discord/smali_classes2/com/google/android/material/animation/ChildrenAlphaProperty.smali
index fda686f996..6cde685258 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/ChildrenAlphaProperty.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/ChildrenAlphaProperty.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/ChildrenAlphaProperty;
 .super Landroid/util/Property;
+.source "ChildrenAlphaProperty.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/DrawableAlphaProperty.smali b/com.discord/smali_classes2/com/google/android/material/animation/DrawableAlphaProperty.smali
index 5d2df627e8..c5f0481a2f 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/DrawableAlphaProperty.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/DrawableAlphaProperty.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/DrawableAlphaProperty;
 .super Landroid/util/Property;
+.source "DrawableAlphaProperty.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/ImageMatrixProperty.smali b/com.discord/smali_classes2/com/google/android/material/animation/ImageMatrixProperty.smali
index fa352dbef5..f7fbb522fd 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/ImageMatrixProperty.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/ImageMatrixProperty.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/ImageMatrixProperty;
 .super Landroid/util/Property;
+.source "ImageMatrixProperty.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/MatrixEvaluator.smali b/com.discord/smali_classes2/com/google/android/material/animation/MatrixEvaluator.smali
index a4326f4197..30b3fc4e50 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/MatrixEvaluator.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/MatrixEvaluator.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/MatrixEvaluator;
 .super Ljava/lang/Object;
+.source "MatrixEvaluator.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
@@ -52,7 +53,7 @@
 
 # virtual methods
 .method public evaluate(FLandroid/graphics/Matrix;Landroid/graphics/Matrix;)Landroid/graphics/Matrix;
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/google/android/material/animation/MatrixEvaluator;->tempStartValues:[F
 
@@ -71,25 +72,21 @@
 
     iget-object p3, p0, Lcom/google/android/material/animation/MatrixEvaluator;->tempEndValues:[F
 
-    aget p3, p3, p2
-
-    iget-object v0, p0, Lcom/google/android/material/animation/MatrixEvaluator;->tempStartValues:[F
-
-    aget v0, v0, p2
-
-    sub-float/2addr p3, v0
-
-    iget-object v0, p0, Lcom/google/android/material/animation/MatrixEvaluator;->tempEndValues:[F
+    aget v0, p3, p2
 
     iget-object v1, p0, Lcom/google/android/material/animation/MatrixEvaluator;->tempStartValues:[F
 
+    aget v2, v1, p2
+
+    sub-float/2addr v0, v2
+
     aget v1, v1, p2
 
-    mul-float p3, p3, p1
+    mul-float v0, v0, p1
 
-    add-float/2addr v1, p3
+    add-float/2addr v1, v0
 
-    aput v1, v0, p2
+    aput v1, p3, p2
 
     add-int/lit8 p2, p2, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/MotionSpec.smali b/com.discord/smali_classes2/com/google/android/material/animation/MotionSpec.smali
index d2434726d4..2ab265921d 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/MotionSpec.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/MotionSpec.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/MotionSpec;
 .super Ljava/lang/Object;
+.source "MotionSpec.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/MotionTiming.smali b/com.discord/smali_classes2/com/google/android/material/animation/MotionTiming.smali
index ff4d1e3bde..564d85014f 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/MotionTiming.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/MotionTiming.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/MotionTiming;
 .super Ljava/lang/Object;
+.source "MotionTiming.java"
 
 
 # instance fields
@@ -155,6 +156,8 @@
 
     sget-object p0, Lcom/google/android/material/animation/AnimationUtils;->LINEAR_OUT_SLOW_IN_INTERPOLATOR:Landroid/animation/TimeInterpolator;
 
+    return-object p0
+
     :cond_2
     return-object p0
 
@@ -345,8 +348,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/animation/MotionTiming;->interpolator:Landroid/animation/TimeInterpolator;
-
     return-object v0
 
     :cond_0
diff --git a/com.discord/smali_classes2/com/google/android/material/animation/Positioning.smali b/com.discord/smali_classes2/com/google/android/material/animation/Positioning.smali
index 0ce1206df1..328ff5183d 100644
--- a/com.discord/smali_classes2/com/google/android/material/animation/Positioning.smali
+++ b/com.discord/smali_classes2/com/google/android/material/animation/Positioning.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/animation/Positioning;
 .super Ljava/lang/Object;
+.source "Positioning.java"
 
 
 # instance fields
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 8c8976bf7c..e954cb1376 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/AppBarLayout$1;
 .super Ljava/lang/Object;
+.source "AppBarLayout.java"
 
 # interfaces
 .implements Landroidx/core/view/OnApplyWindowInsetsListener;
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 22dff6725a..26b4389243 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;
 .super Ljava/lang/Object;
+.source "AppBarLayout.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback.smali
index f011e7ae3d..74d1d6e444 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback;
 .super Ljava/lang/Object;
+.source "AppBarLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState$1.smali
index cf080f1076..5c9b376a7c 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState$1;
 .super Ljava/lang/Object;
+.source "AppBarLayout.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState.smali
index 06daad8289..b9fb5ffff4 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "AppBarLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior.smali
index 7011baf874..13f1d8a95b 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 .super Lcom/google/android/material/appbar/a;
+.source "AppBarLayout.java"
 
 
 # annotations
@@ -188,8 +189,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->offsetAnimator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result p1
@@ -231,9 +230,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->offsetAnimator:Landroid/animation/ValueAnimator;
-
-    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->cancel()V
+    invoke-virtual {v1}, Landroid/animation/ValueAnimator;->cancel()V
 
     :goto_0
     iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->offsetAnimator:Landroid/animation/ValueAnimator;
@@ -909,7 +906,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_7
 
     invoke-virtual {v0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -927,42 +924,16 @@
 
     const/4 v4, 0x0
 
-    if-eqz v2, :cond_1
+    if-eqz v2, :cond_3
 
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->getMinimumHeight(Landroid/view/View;)I
 
     move-result v2
 
-    if-lez p4, :cond_0
+    if-lez p4, :cond_1
 
     and-int/lit8 p4, v1, 0xc
 
-    if-eqz p4, :cond_0
-
-    neg-int p3, p3
-
-    invoke-virtual {v0}, Landroid/view/View;->getBottom()I
-
-    move-result p4
-
-    sub-int/2addr p4, v2
-
-    invoke-virtual {p2}, Lcom/google/android/material/appbar/AppBarLayout;->getTopInset()I
-
-    move-result v0
-
-    sub-int/2addr p4, v0
-
-    if-lt p3, p4, :cond_1
-
-    :goto_0
-    const/4 p3, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    and-int/lit8 p4, v1, 0x2
-
     if-eqz p4, :cond_1
 
     neg-int p3, p3
@@ -979,41 +950,78 @@
 
     sub-int/2addr p4, v0
 
-    if-lt p3, p4, :cond_1
+    if-lt p3, p4, :cond_0
+
+    const/4 p3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p3, 0x0
 
     goto :goto_0
 
     :cond_1
+    and-int/lit8 p4, v1, 0x2
+
+    if-eqz p4, :cond_3
+
+    neg-int p3, p3
+
+    invoke-virtual {v0}, Landroid/view/View;->getBottom()I
+
+    move-result p4
+
+    sub-int/2addr p4, v2
+
+    invoke-virtual {p2}, Lcom/google/android/material/appbar/AppBarLayout;->getTopInset()I
+
+    move-result v0
+
+    sub-int/2addr p4, v0
+
+    if-lt p3, p4, :cond_2
+
+    const/4 p3, 0x1
+
+    goto :goto_0
+
+    :cond_2
     const/4 p3, 0x0
 
-    :goto_1
+    goto :goto_0
+
+    :cond_3
+    const/4 p3, 0x0
+
+    :goto_0
     invoke-virtual {p2}, Lcom/google/android/material/appbar/AppBarLayout;->isLiftOnScroll()Z
 
     move-result p4
 
-    if-eqz p4, :cond_3
+    if-eqz p4, :cond_5
 
     invoke-direct {p0, p1}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->findFirstScrollingChild(Landroidx/coordinatorlayout/widget/CoordinatorLayout;)Landroid/view/View;
 
     move-result-object p4
 
-    if-eqz p4, :cond_3
+    if-eqz p4, :cond_5
 
     invoke-virtual {p4}, Landroid/view/View;->getScrollY()I
 
     move-result p3
 
-    if-lez p3, :cond_2
+    if-lez p3, :cond_4
 
     const/4 p3, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_2
+    :cond_4
     const/4 p3, 0x0
 
-    :cond_3
-    :goto_2
+    :cond_5
+    :goto_1
     invoke-virtual {p2, p3}, Lcom/google/android/material/appbar/AppBarLayout;->setLiftedState(Z)Z
 
     move-result p3
@@ -1022,22 +1030,22 @@
 
     const/16 v0, 0xb
 
-    if-lt p4, v0, :cond_5
+    if-lt p4, v0, :cond_7
 
-    if-nez p5, :cond_4
+    if-nez p5, :cond_6
 
-    if-eqz p3, :cond_5
+    if-eqz p3, :cond_7
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->shouldJumpElevationState(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/google/android/material/appbar/AppBarLayout;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_7
 
-    :cond_4
+    :cond_6
     invoke-virtual {p2}, Lcom/google/android/material/appbar/AppBarLayout;->jumpDrawablesToCurrentState()V
 
-    :cond_5
+    :cond_7
     return-void
 .end method
 
@@ -1067,8 +1075,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->onDragCallback:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback;->canDrag(Lcom/google/android/material/appbar/AppBarLayout;)Z
 
     move-result p1
@@ -1082,8 +1088,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->lastNestedScrollingChildRef:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object p1
@@ -1196,8 +1200,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->offsetAnimator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result v0
@@ -1275,13 +1277,11 @@
 
     if-ltz v1, :cond_1
 
-    and-int/lit8 v1, v0, 0x8
+    and-int/lit8 v3, v0, 0x8
 
-    if-nez v1, :cond_1
+    if-nez v3, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->offsetToChildIndexOnLayout:I
-
-    invoke-virtual {p2, v0}, Lcom/google/android/material/appbar/AppBarLayout;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {p2, v1}, Lcom/google/android/material/appbar/AppBarLayout;->getChildAt(I)Landroid/view/View;
 
     move-result-object v0
 
@@ -1305,10 +1305,9 @@
 
     add-int/2addr v0, v3
 
-    :goto_0
     add-int/2addr v1, v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0}, Landroid/view/View;->getHeight()I
@@ -1325,12 +1324,12 @@
 
     move-result v0
 
-    goto :goto_0
+    add-int/2addr v1, v0
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0, p1, p2, v1}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->setHeaderTopBottomOffset(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;I)I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     if-eqz v0, :cond_6
@@ -1343,12 +1342,12 @@
 
     const/4 v1, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v1, 0x0
 
-    :goto_2
+    :goto_1
     and-int/lit8 v4, v0, 0x2
 
     const/4 v5, 0x0
@@ -1365,12 +1364,12 @@
 
     invoke-direct {p0, p1, p2, v0, v5}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->animateOffsetTo(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/google/android/material/appbar/AppBarLayout;IF)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     invoke-virtual {p0, p1, p2, v0}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->setHeaderTopBottomOffset(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;I)I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     and-int/2addr v0, v3
@@ -1381,13 +1380,13 @@
 
     invoke-direct {p0, p1, p2, v2, v5}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->animateOffsetTo(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/google/android/material/appbar/AppBarLayout;IF)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     invoke-virtual {p0, p1, p2, v2}, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->setHeaderTopBottomOffset(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;I)I
 
     :cond_6
-    :goto_3
+    :goto_2
     invoke-virtual {p2}, Lcom/google/android/material/appbar/AppBarLayout;->resetPendingAction()V
 
     const/4 v0, -0x1
@@ -1874,8 +1873,6 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;->offsetAnimator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {p2}, Landroid/animation/ValueAnimator;->cancel()V
 
     :cond_2
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseOnOffsetChangedListener.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseOnOffsetChangedListener.smali
index a9d7ada9a5..cfc22d2a88 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseOnOffsetChangedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseOnOffsetChangedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/appbar/AppBarLayout$BaseOnOffsetChangedListener;
 .super Ljava/lang/Object;
+.source "AppBarLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior$DragCallback.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior$DragCallback.smali
index a6d1ee1dd3..9de3b16a56 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior$DragCallback.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior$DragCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/appbar/AppBarLayout$Behavior$DragCallback;
 .super Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$BaseDragCallback;
+.source "AppBarLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior.smali
index 39e3936996..ec31c52fb0 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$Behavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/AppBarLayout$Behavior;
 .super Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+.source "AppBarLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$LayoutParams.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$LayoutParams.smali
index f15ccbddab..8a632810ac 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$LayoutParams.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/AppBarLayout$LayoutParams;
 .super Landroid/widget/LinearLayout$LayoutParams;
+.source "AppBarLayout.java"
 
 
 # annotations
@@ -202,23 +203,21 @@
 .end method
 
 .method isCollapsible()Z
-    .locals 2
+    .locals 3
 
     iget v0, p0, Lcom/google/android/material/appbar/AppBarLayout$LayoutParams;->scrollFlags:I
 
-    const/4 v1, 0x1
+    and-int/lit8 v1, v0, 0x1
 
-    and-int/2addr v0, v1
+    const/4 v2, 0x1
 
-    if-ne v0, v1, :cond_0
-
-    iget v0, p0, Lcom/google/android/material/appbar/AppBarLayout$LayoutParams;->scrollFlags:I
+    if-ne v1, v2, :cond_0
 
     and-int/lit8 v0, v0, 0xa
 
     if-eqz v0, :cond_0
 
-    return v1
+    return v2
 
     :cond_0
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener.smali
index 18000c66bb..6308bd8498 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 .super Ljava/lang/Object;
+.source "AppBarLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/appbar/AppBarLayout$BaseOnOffsetChangedListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$ScrollingViewBehavior.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$ScrollingViewBehavior.smali
index 5cfdf97bdc..93649ae848 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$ScrollingViewBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$ScrollingViewBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/AppBarLayout$ScrollingViewBehavior;
 .super Lcom/google/android/material/appbar/b;
+.source "AppBarLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout.smali
index 71ecda312b..d62e13337a 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/AppBarLayout;
 .super Landroid/widget/LinearLayout;
+.source "AppBarLayout.java"
 
 
 # annotations
@@ -411,20 +412,18 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout;->listeners:Ljava/util/List;
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
+    move-result v0
 
     :goto_0
-    if-ge v0, v1, :cond_1
+    if-ge v1, v0, :cond_1
 
     iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout;->listeners:Ljava/util/List;
 
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -435,7 +434,7 @@
     invoke-interface {v2, p0, p1}, Lcom/google/android/material/appbar/AppBarLayout$BaseOnOffsetChangedListener;->onOffsetChanged(Lcom/google/android/material/appbar/AppBarLayout;I)V
 
     :cond_0
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
@@ -582,8 +581,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/appbar/AppBarLayout;->downPreScrollRange:I
-
     return v0
 
     :cond_0
@@ -640,7 +637,7 @@
 
     add-int/2addr v2, v3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     and-int/lit8 v4, v6, 0x2
@@ -651,24 +648,27 @@
 
     move-result v3
 
-    :goto_1
     sub-int/2addr v5, v3
 
     add-int/2addr v2, v5
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-virtual {p0}, Lcom/google/android/material/appbar/AppBarLayout;->getTopInset()I
 
     move-result v3
 
+    sub-int/2addr v5, v3
+
+    add-int/2addr v2, v5
+
     goto :goto_1
 
     :cond_3
     if-gtz v2, :cond_4
 
-    :goto_2
+    :goto_1
     add-int/lit8 v0, v0, -0x1
 
     goto :goto_0
@@ -692,8 +692,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/appbar/AppBarLayout;->downScrollRange:I
-
     return v0
 
     :cond_0
@@ -787,7 +785,6 @@
 
     if-eqz v1, :cond_0
 
-    :goto_0
     mul-int/lit8 v1, v1, 0x2
 
     add-int/2addr v1, v0
@@ -811,15 +808,19 @@
 
     move-result v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v1, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz v1, :cond_2
 
-    goto :goto_0
+    mul-int/lit8 v1, v1, 0x2
+
+    add-int/2addr v1, v0
+
+    return v1
 
     :cond_2
     invoke-virtual {p0}, Lcom/google/android/material/appbar/AppBarLayout;->getHeight()I
@@ -858,8 +859,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout;->lastInsets:Landroidx/core/view/WindowInsetsCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
     move-result v0
@@ -881,8 +880,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/appbar/AppBarLayout;->totalScrollRange:I
-
     return v0
 
     :cond_0
@@ -1244,8 +1241,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout;->listeners:Ljava/util/List;
-
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     :cond_0
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 da52a9c677..503a6d7111 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;
 .super Ljava/lang/Object;
+.source "CollapsingToolbarLayout.java"
 
 # interfaces
 .implements Landroidx/core/view/OnApplyWindowInsetsListener;
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 3c2ae9f6e9..274fe3a479 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;
 .super Ljava/lang/Object;
+.source "CollapsingToolbarLayout.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$LayoutParams.smali b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$LayoutParams.smali
index 22f254bd50..d753d3f503 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$LayoutParams.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/CollapsingToolbarLayout$LayoutParams;
 .super Landroid/widget/FrameLayout$LayoutParams;
+.source "CollapsingToolbarLayout.java"
 
 
 # annotations
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 82b7c935ab..153e676197 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;
 .super Ljava/lang/Object;
+.source "CollapsingToolbarLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
@@ -40,8 +41,6 @@
 
     iput p2, p1, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->currentOffset:I
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->btG:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
-
     iget-object p1, p1, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->lastInsets:Landroidx/core/view/WindowInsetsCompat;
 
     const/4 v0, 0x0
@@ -93,7 +92,7 @@
 
     packed-switch v6, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     neg-int v3, p2
@@ -108,6 +107,8 @@
 
     move-result v3
 
+    invoke-virtual {v5, v3}, Lcom/google/android/material/appbar/d;->setTopAndBottomOffset(I)Z
+
     goto :goto_2
 
     :pswitch_1
@@ -123,10 +124,9 @@
 
     move-result v3
 
-    :goto_2
     invoke-virtual {v5, v3}, Lcom/google/android/material/appbar/d;->setTopAndBottomOffset(I)Z
 
-    :goto_3
+    :goto_2
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
@@ -183,8 +183,6 @@
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
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 518640621a..e6183b91c0 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 .super Landroid/widget/FrameLayout;
+.source "CollapsingToolbarLayout.java"
 
 
 # annotations
@@ -410,8 +411,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->scrimAnimator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result v0
@@ -471,8 +470,6 @@
 
     if-eq v1, v2, :cond_1
 
-    iget v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbarId:I
-
     invoke-virtual {p0, v1}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
@@ -485,8 +482,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbar:Landroidx/appcompat/widget/Toolbar;
-
     invoke-direct {p0, v1}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->findDirectChild(Landroid/view/View;)Landroid/view/View;
 
     move-result-object v1
@@ -640,27 +635,23 @@
 
     iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbarDirectChild:Landroid/view/View;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbarDirectChild:Landroid/view/View;
-
     if-ne v0, p0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbarDirectChild:Landroid/view/View;
-
     if-ne p1, v0, :cond_1
 
-    return v2
+    return v1
 
     :cond_1
-    return v1
+    return v2
 
     :cond_2
     :goto_0
@@ -668,10 +659,10 @@
 
     if-ne p1, v0, :cond_3
 
-    return v2
+    return v1
 
     :cond_3
-    return v1
+    return v2
 .end method
 
 .method private updateContentDescriptionFromTitle()V
@@ -697,8 +688,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->dummyView:Landroid/view/View;
-
     invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
     move-result-object v0
@@ -782,11 +771,9 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->scrimAlpha:I
+    iget v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->scrimAlpha:I
 
-    if-lez v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->contentScrim:Landroid/graphics/drawable/Drawable;
+    if-lez v1, :cond_0
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
@@ -828,8 +815,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->lastInsets:Landroidx/core/view/WindowInsetsCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
     move-result v0
@@ -986,8 +971,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
-
     invoke-virtual {v1, v0}, Lcom/google/android/material/internal/CollapsingTextHelper;->setState([I)Z
 
     move-result v0
@@ -1230,8 +1213,6 @@
 
     if-ltz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->scrimVisibleHeightTrigger:I
-
     return v0
 
     :cond_0
@@ -1239,8 +1220,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->lastInsets:Landroidx/core/view/WindowInsetsCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
     move-result v0
@@ -1369,7 +1348,7 @@
 .end method
 
 .method protected onDetachedFromWindow()V
-    .locals 2
+    .locals 3
 
     invoke-virtual {p0}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getParent()Landroid/view/ViewParent;
 
@@ -1379,14 +1358,12 @@
 
     if-eqz v1, :cond_0
 
-    instance-of v1, v0, Lcom/google/android/material/appbar/AppBarLayout;
+    instance-of v2, v0, Lcom/google/android/material/appbar/AppBarLayout;
 
-    if-eqz v1, :cond_0
+    if-eqz v2, :cond_0
 
     check-cast v0, Lcom/google/android/material/appbar/AppBarLayout;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->onOffsetChangedListener:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
-
     invoke-virtual {v0, v1}, Lcom/google/android/material/appbar/AppBarLayout;->removeOnOffsetChangedListener(Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;)V
 
     :cond_0
@@ -1406,8 +1383,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->lastInsets:Landroidx/core/view/WindowInsetsCompat;
-
     invoke-virtual {p1}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
     move-result p1
@@ -1453,8 +1428,6 @@
 
     if-eqz p1, :cond_9
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->dummyView:Landroid/view/View;
-
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->isAttachedToWindow(Landroid/view/View;)Z
 
     move-result p1
@@ -1501,8 +1474,6 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbarDirectChild:Landroid/view/View;
-
     goto :goto_3
 
     :cond_4
@@ -1661,7 +1632,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->AW()V
+    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->AV()V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -1701,14 +1672,16 @@
 
     if-eqz p1, :cond_d
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbarDirectChild:Landroid/view/View;
-
     if-ne p1, p0, :cond_c
 
     goto :goto_9
 
     :cond_c
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbarDirectChild:Landroid/view/View;
+    invoke-static {p1}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getHeightWithMargins(Landroid/view/View;)I
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->setMinimumHeight(I)V
 
     goto :goto_a
 
@@ -1716,7 +1689,6 @@
     :goto_9
     iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbar:Landroidx/appcompat/widget/Toolbar;
 
-    :goto_a
     invoke-static {p1}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getHeightWithMargins(Landroid/view/View;)I
 
     move-result p1
@@ -1724,6 +1696,7 @@
     invoke-virtual {p0, p1}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->setMinimumHeight(I)V
 
     :cond_e
+    :goto_a
     invoke-virtual {p0}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->updateScrimVisibility()V
 
     return-void
@@ -1744,8 +1717,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->lastInsets:Landroidx/core/view/WindowInsetsCompat;
-
     invoke-virtual {v0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
     move-result v0
@@ -1787,8 +1758,6 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->contentScrim:Landroid/graphics/drawable/Drawable;
-
     const/4 p4, 0x0
 
     invoke-virtual {p3, p4, p4, p1, p2}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
@@ -1913,14 +1882,10 @@
 
     if-eq v0, p1, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->contentScrim:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->contentScrim:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
     :cond_0
@@ -1937,8 +1902,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->contentScrim:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p0}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getWidth()I
 
     move-result v0
@@ -2143,8 +2106,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->toolbar:Landroidx/appcompat/widget/Toolbar;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
     :cond_0
@@ -2224,30 +2185,36 @@
 
     if-eq v0, p1, :cond_3
 
-    const/4 v0, 0x0
+    const/16 v0, 0xff
 
-    const/16 v1, 0xff
+    const/4 v1, 0x0
 
     if-eqz p2, :cond_1
 
     if-eqz p1, :cond_0
 
-    const/16 v0, 0xff
+    goto :goto_0
 
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-direct {p0, v0}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->animateScrim(I)V
 
-    goto :goto_0
+    goto :goto_2
 
     :cond_1
     if-eqz p1, :cond_2
 
-    const/16 v0, 0xff
+    goto :goto_1
 
     :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
     invoke-virtual {p0, v0}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->setScrimAlpha(I)V
 
-    :goto_0
+    :goto_2
     iput-boolean p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->scrimsAreShown:Z
 
     :cond_3
@@ -2265,14 +2232,10 @@
 
     if-eq v0, p1, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->statusBarScrim:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->statusBarScrim:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
     :cond_0
@@ -2289,8 +2252,6 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->statusBarScrim:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result p1
@@ -2443,8 +2404,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->statusBarScrim:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->isVisible()Z
 
     move-result v1
@@ -2460,8 +2419,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->contentScrim:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->isVisible()Z
 
     move-result v1
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 33009a182f..6af7b18c5b 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/a$a;
 .super Ljava/lang/Object;
+.source "HeaderBehavior.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -83,9 +84,7 @@
 
     iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->btI:Landroid/view/View;
 
-    iget-object v3, p0, Lcom/google/android/material/appbar/a$a;->btJ:Lcom/google/android/material/appbar/a;
-
-    iget-object v3, v3, Lcom/google/android/material/appbar/a;->scroller:Landroid/widget/OverScroller;
+    iget-object v3, v0, Lcom/google/android/material/appbar/a;->scroller:Landroid/widget/OverScroller;
 
     invoke-virtual {v3}, Landroid/widget/OverScroller;->getCurrY()I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/a.smali b/com.discord/smali_classes2/com/google/android/material/appbar/a.smali
index 5553c081c3..a6a709cedd 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/a.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/material/appbar/a;
 .super Lcom/google/android/material/appbar/c;
+.source "HeaderBehavior.java"
 
 
 # annotations
@@ -119,8 +120,6 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lcom/google/android/material/appbar/a;->flingRunnable:Ljava/lang/Runnable;
-
     invoke-virtual {p2, v2}, Landroid/view/View;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     const/4 v2, 0x0
@@ -360,8 +359,6 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/a;->velocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {p1}, Landroid/view/VelocityTracker;->recycle()V
 
     const/4 p1, 0x0
@@ -413,8 +410,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/a;->velocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {p1, p3}, Landroid/view/VelocityTracker;->addMovement(Landroid/view/MotionEvent;)V
 
     :cond_3
@@ -516,21 +511,23 @@
 
     if-lez v2, :cond_2
 
-    iget v3, p0, Lcom/google/android/material/appbar/a;->touchSlop:I
+    sub-int/2addr v2, v4
 
-    sub-int/2addr v2, v3
+    move v6, v2
 
     goto :goto_0
 
     :cond_2
-    iget v3, p0, Lcom/google/android/material/appbar/a;->touchSlop:I
+    add-int/2addr v2, v4
 
-    add-int/2addr v2, v3
-
-    :cond_3
-    :goto_0
     move v6, v2
 
+    goto :goto_0
+
+    :cond_3
+    move v6, v2
+
+    :goto_0
     iget-boolean v2, p0, Lcom/google/android/material/appbar/a;->isBeingDragged:Z
 
     if-eqz v2, :cond_6
@@ -558,8 +555,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a;->velocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0, p3}, Landroid/view/VelocityTracker;->addMovement(Landroid/view/MotionEvent;)V
 
     iget-object v0, p0, Lcom/google/android/material/appbar/a;->velocityTracker:Landroid/view/VelocityTracker;
@@ -602,8 +597,6 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/a;->velocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {p1}, Landroid/view/VelocityTracker;->recycle()V
 
     const/4 p1, 0x0
@@ -658,15 +651,11 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/a;->velocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {p1, p3}, Landroid/view/VelocityTracker;->addMovement(Landroid/view/MotionEvent;)V
 
     :cond_7
     return v1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/b.smali b/com.discord/smali_classes2/com/google/android/material/appbar/b.smali
index ed6acdfa1d..feb1c6d83c 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/b.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/material/appbar/b;
 .super Lcom/google/android/material/appbar/c;
+.source "HeaderScrollingViewBehavior.java"
 
 
 # annotations
@@ -97,7 +98,7 @@
 .end method
 
 .method final getOverlapPixelsForOffset(Landroid/view/View;)I
-    .locals 2
+    .locals 3
 
     iget v0, p0, Lcom/google/android/material/appbar/b;->overlayTop:I
 
@@ -114,14 +115,12 @@
 
     iget v0, p0, Lcom/google/android/material/appbar/b;->overlayTop:I
 
-    int-to-float v0, v0
+    int-to-float v2, v0
 
-    mul-float p1, p1, v0
+    mul-float p1, p1, v2
 
     float-to-int p1, p1
 
-    iget v0, p0, Lcom/google/android/material/appbar/b;->overlayTop:I
-
     invoke-static {p1, v1, v0}, Landroidx/core/math/MathUtils;->clamp(III)I
 
     move-result p1
@@ -323,7 +322,6 @@
 
     sub-int/2addr p1, p2
 
-    :goto_0
     iput p1, p0, Lcom/google/android/material/appbar/b;->verticalLayoutGap:I
 
     return-void
@@ -333,7 +331,9 @@
 
     const/4 p1, 0x0
 
-    goto :goto_0
+    iput p1, p0, Lcom/google/android/material/appbar/b;->verticalLayoutGap:I
+
+    return-void
 .end method
 
 .method public onMeasureChild(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;IIII)Z
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 602e7fdbd6..bebd656f4e 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
@@ -1,5 +1,6 @@
 .class Lcom/google/android/material/appbar/c;
 .super Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+.source "ViewOffsetBehavior.java"
 
 
 # annotations
@@ -60,8 +61,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
-
     iget v0, v0, Lcom/google/android/material/appbar/d;->btN:I
 
     return v0
@@ -79,8 +78,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
-
     iget v0, v0, Lcom/google/android/material/appbar/d;->btM:I
 
     return v0
@@ -131,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;->AW()V
+    invoke-virtual {p1}, Lcom/google/android/material/appbar/d;->AV()V
 
     iget p1, p0, Lcom/google/android/material/appbar/c;->tempTopBottomOffset:I
 
@@ -139,11 +136,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
+    iget-object p3, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
 
-    iget p3, p0, Lcom/google/android/material/appbar/c;->tempTopBottomOffset:I
-
-    invoke-virtual {p1, p3}, Lcom/google/android/material/appbar/d;->setTopAndBottomOffset(I)Z
+    invoke-virtual {p3, p1}, Lcom/google/android/material/appbar/d;->setTopAndBottomOffset(I)Z
 
     iput p2, p0, Lcom/google/android/material/appbar/c;->tempTopBottomOffset:I
 
@@ -152,11 +147,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
+    iget-object p3, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
 
-    iget p3, p0, Lcom/google/android/material/appbar/c;->tempLeftRightOffset:I
-
-    invoke-virtual {p1, p3}, Lcom/google/android/material/appbar/d;->setLeftAndRightOffset(I)Z
+    invoke-virtual {p3, p1}, Lcom/google/android/material/appbar/d;->setLeftAndRightOffset(I)Z
 
     iput p2, p0, Lcom/google/android/material/appbar/c;->tempLeftRightOffset:I
 
@@ -173,8 +166,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/appbar/d;->setLeftAndRightOffset(I)Z
 
     move-result p1
@@ -196,8 +187,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/appbar/d;->setTopAndBottomOffset(I)Z
 
     move-result p1
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 72f367cd05..ccc2cbb539 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/d;
 .super Ljava/lang/Object;
+.source "ViewOffsetHelper.java"
 
 
 # instance fields
@@ -25,16 +26,14 @@
     return-void
 .end method
 
-.method private AX()V
+.method private AW()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;->btM:I
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
-
-    invoke-virtual {v2}, Landroid/view/View;->getTop()I
+    invoke-virtual {v0}, Landroid/view/View;->getTop()I
 
     move-result v2
 
@@ -50,9 +49,7 @@
 
     iget v1, p0, Lcom/google/android/material/appbar/d;->btN:I
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
-
-    invoke-virtual {v2}, Landroid/view/View;->getLeft()I
+    invoke-virtual {v0}, Landroid/view/View;->getLeft()I
 
     move-result v2
 
@@ -69,7 +66,7 @@
 
 
 # virtual methods
-.method public final AW()V
+.method public final AV()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
@@ -88,7 +85,7 @@
 
     iput v0, p0, Lcom/google/android/material/appbar/d;->btL:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->AX()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->AW()V
 
     return-void
 .end method
@@ -102,7 +99,7 @@
 
     iput p1, p0, Lcom/google/android/material/appbar/d;->btN:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->AX()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->AW()V
 
     const/4 p1, 0x1
 
@@ -123,7 +120,7 @@
 
     iput p1, p0, Lcom/google/android/material/appbar/d;->btM:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->AX()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->AW()V
 
     const/4 p1, 0x1
 
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 0117d98195..4e6c600e48 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/appbar/e;
 .super Ljava/lang/Object;
+.source "ViewUtilsLollipop.java"
 
 
 # annotations
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 1c41416b99..9d99cb0557 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "HideBottomViewOnScrollBehavior.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior.smali b/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior.smali
index 04f6c06aee..d1299af77c 100644
--- a/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
 .super Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+.source "HideBottomViewOnScrollBehavior.java"
 
 
 # annotations
@@ -217,8 +218,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;->currentAnimator:Landroid/view/ViewPropertyAnimator;
-
     invoke-virtual {v0}, Landroid/view/ViewPropertyAnimator;->cancel()V
 
     invoke-virtual {p1}, Landroid/view/View;->clearAnimation()V
@@ -255,8 +254,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;->currentAnimator:Landroid/view/ViewPropertyAnimator;
-
     invoke-virtual {v0}, Landroid/view/ViewPropertyAnimator;->cancel()V
 
     invoke-virtual {p1}, Landroid/view/View;->clearAnimation()V
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 a1801935ce..3dc3eec7f4 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/behavior/SwipeDismissBehavior$1;
 .super Landroidx/customview/widget/ViewDragHelper$Callback;
+.source "SwipeDismissBehavior.java"
 
 
 # annotations
@@ -61,11 +62,10 @@
 
     iget v1, v1, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
-    if-nez v1, :cond_3
+    if-nez v1, :cond_2
 
-    if-eqz p3, :cond_2
+    if-eqz p3, :cond_1
 
-    :cond_1
     iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
@@ -76,31 +76,48 @@
 
     iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
 
-    goto :goto_3
+    goto :goto_1
 
-    :cond_2
-    :goto_1
+    :cond_1
     iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
 
-    :goto_2
-    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
-
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
     move-result p1
 
-    add-int/2addr p1, v0
+    add-int/2addr p1, p3
 
-    goto :goto_3
+    goto :goto_1
 
-    :cond_3
+    :cond_2
     iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btR:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v1, v1, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
     if-ne v1, v0, :cond_4
 
-    if-eqz p3, :cond_1
+    if-eqz p3, :cond_3
+
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
+
+    invoke-virtual {p1}, Landroid/view/View;->getWidth()I
+
+    move-result p1
+
+    add-int/2addr p1, p3
+
+    goto :goto_1
+
+    :cond_3
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
+
+    invoke-virtual {p1}, Landroid/view/View;->getWidth()I
+
+    move-result p1
+
+    sub-int/2addr p3, p1
+
+    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
 
     goto :goto_1
 
@@ -113,9 +130,15 @@
 
     sub-int/2addr p3, v0
 
-    goto :goto_2
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
 
-    :goto_3
+    invoke-virtual {p1}, Landroid/view/View;->getWidth()I
+
+    move-result p1
+
+    add-int/2addr p1, v0
+
+    :goto_1
     invoke-static {p3, p2, p1}, Lcom/google/android/material/behavior/SwipeDismissBehavior;->clamp(III)I
 
     move-result p1
@@ -284,7 +307,7 @@
 
     cmpl-float v3, p2, v0
 
-    if-eqz v3, :cond_5
+    if-eqz v3, :cond_8
 
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I
 
@@ -308,53 +331,76 @@
 
     if-ne v4, v5, :cond_1
 
-    goto :goto_1
+    const/4 p2, 0x1
+
+    goto :goto_3
 
     :cond_1
     iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btR:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v4, v4, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
-    if-nez v4, :cond_3
+    if-nez v4, :cond_4
 
     if-eqz v3, :cond_2
 
     cmpg-float p2, p2, v0
 
-    if-gez p2, :cond_6
+    if-gez p2, :cond_3
 
     goto :goto_1
 
     :cond_2
     cmpl-float p2, p2, v0
 
-    if-lez p2, :cond_6
+    if-lez p2, :cond_3
 
-    goto :goto_1
+    :goto_1
+    const/4 p2, 0x1
+
+    goto :goto_3
 
     :cond_3
+    const/4 p2, 0x0
+
+    goto :goto_3
+
+    :cond_4
     iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btR:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v4, v4, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
-    if-ne v4, v2, :cond_6
+    if-ne v4, v2, :cond_7
 
-    if-eqz v3, :cond_4
+    if-eqz v3, :cond_5
 
     cmpl-float p2, p2, v0
 
     if-lez p2, :cond_6
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_4
+    :cond_5
     cmpg-float p2, p2, v0
 
     if-gez p2, :cond_6
 
-    goto :goto_1
+    :goto_2
+    const/4 p2, 0x1
 
-    :cond_5
+    goto :goto_3
+
+    :cond_6
+    const/4 p2, 0x0
+
+    goto :goto_3
+
+    :cond_7
+    const/4 p2, 0x0
+
+    goto :goto_3
+
+    :cond_8
     invoke-virtual {p1}, Landroid/view/View;->getLeft()I
 
     move-result p2
@@ -383,18 +429,17 @@
 
     move-result p2
 
-    if-lt p2, v0, :cond_6
+    if-lt p2, v0, :cond_9
 
-    :goto_1
     const/4 p2, 0x1
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_6
+    :cond_9
     const/4 p2, 0x0
 
-    :goto_2
-    if-eqz p2, :cond_8
+    :goto_3
+    if-eqz p2, :cond_b
 
     invoke-virtual {p1}, Landroid/view/View;->getLeft()I
 
@@ -402,41 +447,37 @@
 
     iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
 
-    if-ge p2, v0, :cond_7
+    if-ge p2, v0, :cond_a
 
-    iget p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
-
-    sub-int/2addr p2, p3
-
-    goto :goto_3
-
-    :cond_7
-    iget p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
-
-    add-int/2addr p2, p3
-
-    :goto_3
-    const/4 v1, 0x1
+    sub-int/2addr v0, p3
 
     goto :goto_4
 
-    :cond_8
-    iget p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
+    :cond_a
+    add-int/2addr v0, p3
 
     :goto_4
-    iget-object p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btR:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    const/4 v1, 0x1
 
-    iget-object p3, p3, Lcom/google/android/material/behavior/SwipeDismissBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
+    goto :goto_5
+
+    :cond_b
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btQ:I
+
+    :goto_5
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btR:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+
+    iget-object p2, p2, Lcom/google/android/material/behavior/SwipeDismissBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
     invoke-virtual {p1}, Landroid/view/View;->getTop()I
 
-    move-result v0
+    move-result p3
 
-    invoke-virtual {p3, p2, v0}, Landroidx/customview/widget/ViewDragHelper;->settleCapturedViewAt(II)Z
+    invoke-virtual {p2, v0, p3}, Landroidx/customview/widget/ViewDragHelper;->settleCapturedViewAt(II)Z
 
     move-result p2
 
-    if-eqz p2, :cond_9
+    if-eqz p2, :cond_c
 
     new-instance p2, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;
 
@@ -448,14 +489,14 @@
 
     return-void
 
-    :cond_9
-    if-eqz v1, :cond_a
+    :cond_c
+    if-eqz v1, :cond_d
 
     iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btR: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
+    if-eqz p2, :cond_d
 
     iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->btR:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
@@ -463,7 +504,7 @@
 
     invoke-interface {p2, p1}, Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;->onDismiss(Landroid/view/View;)V
 
-    :cond_a
+    :cond_d
     return-void
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener.smali b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener.smali
index 7cbd7f7bc2..5520eeefd7 100644
--- a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
 .super Ljava/lang/Object;
+.source "SwipeDismissBehavior.java"
 
 
 # annotations
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 ded42025e8..d3576d0db9 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/behavior/SwipeDismissBehavior$a;
 .super Ljava/lang/Object;
+.source "SwipeDismissBehavior.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior.smali b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior.smali
index e56a00b7cf..fde92c3d6c 100644
--- a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/behavior/SwipeDismissBehavior;
 .super Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+.source "SwipeDismissBehavior.java"
 
 
 # annotations
@@ -190,8 +191,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
-
     invoke-virtual {v0}, Landroidx/customview/widget/ViewDragHelper;->getViewDragState()I
 
     move-result v0
@@ -298,8 +297,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
-
     invoke-virtual {p1, p3}, Landroidx/customview/widget/ViewDragHelper;->processTouchEvent(Landroid/view/MotionEvent;)V
 
     const/4 p1, 0x1
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 e826c63f6d..923bff0fb7 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BottomAppBar.java"
 
 
 # annotations
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 474e4442c6..c18e819e08 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$2;
 .super Ljava/lang/Object;
+.source "BottomAppBar.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
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 da6f570d71..d8d0825ad8 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$3;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BottomAppBar.java"
 
 
 # annotations
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 ed3ea063d9..3bda44d44c 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$4;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BottomAppBar.java"
 
 
 # annotations
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 00779415ca..181c5e74ba 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$5;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BottomAppBar.java"
 
 
 # annotations
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 87f3df3a48..cbc1a9e0ac 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$6;
 .super Ljava/lang/Object;
+.source "BottomAppBar.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
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 a0e87e29ab..a3b4496af1 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$7;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BottomAppBar.java"
 
 
 # annotations
@@ -35,9 +36,7 @@
 
     iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->btT:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->btT:Lcom/google/android/material/bottomappbar/BottomAppBar;
-
-    invoke-static {v0}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$600(Lcom/google/android/material/bottomappbar/BottomAppBar;)Z
+    invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$600(Lcom/google/android/material/bottomappbar/BottomAppBar;)Z
 
     move-result v0
 
@@ -45,9 +44,7 @@
 
     iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->btT:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->btT:Lcom/google/android/material/bottomappbar/BottomAppBar;
-
-    invoke-static {v0}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$800(Lcom/google/android/material/bottomappbar/BottomAppBar;)I
+    invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$800(Lcom/google/android/material/bottomappbar/BottomAppBar;)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$Behavior.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$Behavior.smali
index 9cde329eda..2be34befe3 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$Behavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$Behavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomappbar/BottomAppBar$Behavior;
 .super Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+.source "BottomAppBar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState$1.smali
index 30067fa338..5b9cc3cd43 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomappbar/BottomAppBar$SavedState$1;
 .super Ljava/lang/Object;
+.source "BottomAppBar.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState.smali
index 31c7215430..e599ea7d84 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$SavedState.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/material/bottomappbar/BottomAppBar$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "BottomAppBar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar.smali
index a726e4129c..6e129672e0 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomappbar/BottomAppBar;
 .super Landroidx/appcompat/widget/Toolbar;
+.source "BottomAppBar.java"
 
 # interfaces
 .implements Landroidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior;
@@ -372,8 +373,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->attachAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
@@ -381,8 +380,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->menuAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
     :cond_1
@@ -390,8 +387,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->modeAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
     :cond_2
@@ -1005,8 +1000,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->attachAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->isRunning()Z
 
     move-result v0
@@ -1018,8 +1011,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->menuAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->isRunning()Z
 
     move-result v0
@@ -1031,8 +1022,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->modeAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->isRunning()Z
 
     move-result v0
@@ -1091,8 +1080,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->attachAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
     :cond_1
@@ -1159,8 +1146,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->menuAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
     :cond_1
@@ -1226,8 +1211,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar;->modeAnimator:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
     :cond_1
@@ -1259,6 +1242,8 @@
 
     invoke-virtual {p1}, Landroid/animation/Animator;->start()V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment.smali
index 51b8f4e9de..c286a2591b 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;
 .super Lcom/google/android/material/shape/EdgeTreatment;
+.source "BottomAppBarTopEdgeTreatment.java"
 
 
 # static fields
@@ -75,11 +76,11 @@
 
     move-object/from16 v9, p3
 
-    iget v3, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->fabDiameter:F
+    iget v2, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->fabDiameter:F
 
     const/4 v10, 0x0
 
-    cmpl-float v3, v3, v10
+    cmpl-float v3, v2, v10
 
     if-nez v3, :cond_0
 
@@ -94,37 +95,35 @@
 
     mul-float v3, v3, v11
 
-    iget v4, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->fabDiameter:F
-
-    add-float/2addr v3, v4
+    add-float/2addr v3, v2
 
     div-float v12, v3, v11
 
-    iget v3, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->roundedCornerRadius:F
+    iget v2, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->roundedCornerRadius:F
 
-    mul-float v13, p2, v3
+    mul-float v13, p2, v2
 
-    div-float v3, v1, v11
+    div-float v2, v1, v11
 
-    iget v4, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->horizontalOffset:F
+    iget v3, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->horizontalOffset:F
 
-    add-float v14, v3, v4
+    add-float v14, v2, v3
 
-    iget v3, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->cradleVerticalOffset:F
+    iget v2, v0, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->cradleVerticalOffset:F
 
-    mul-float v3, v3, p2
+    mul-float v2, v2, p2
 
-    const/high16 v4, 0x3f800000    # 1.0f
+    const/high16 v3, 0x3f800000    # 1.0f
 
-    sub-float v2, v4, p2
+    sub-float v4, v3, p2
 
-    mul-float v2, v2, v12
+    mul-float v4, v4, v12
 
-    add-float v15, v3, v2
+    add-float v15, v2, v4
 
     div-float v2, v15, v12
 
-    cmpl-float v2, v2, v4
+    cmpl-float v2, v2, v3
 
     if-ltz v2, :cond_1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationItemView.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationItemView.smali
index dc26dc726a..691d7c0af5 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationItemView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationItemView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
 .super Landroid/widget/FrameLayout;
+.source "BottomNavigationItemView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuView$ItemView;
@@ -362,8 +363,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->itemData:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->isCheckable()Z
 
     move-result v0
@@ -407,9 +406,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
-
-    invoke-virtual {v1}, Landroid/widget/TextView;->getWidth()I
+    invoke-virtual {v0}, Landroid/widget/TextView;->getWidth()I
 
     move-result v1
 
@@ -421,9 +418,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
-
-    invoke-virtual {v1}, Landroid/widget/TextView;->getBaseline()I
+    invoke-virtual {v0}, Landroid/widget/TextView;->getBaseline()I
 
     move-result v1
 
@@ -433,9 +428,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
-
-    invoke-virtual {v1}, Landroid/widget/TextView;->getWidth()I
+    invoke-virtual {v0}, Landroid/widget/TextView;->getWidth()I
 
     move-result v1
 
@@ -447,9 +440,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
-
-    invoke-virtual {v1}, Landroid/widget/TextView;->getBaseline()I
+    invoke-virtual {v0}, Landroid/widget/TextView;->getBaseline()I
 
     move-result v1
 
@@ -473,7 +464,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :pswitch_0
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
@@ -492,12 +483,11 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setVisibility(I)V
 
-    goto :goto_3
+    goto/16 :goto_2
 
     :pswitch_1
     if-eqz p1, :cond_0
 
-    :goto_0
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
 
     iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->defaultMargin:I
@@ -520,11 +510,9 @@
 
     iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->scaleUpFactor:F
 
-    iget v2, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->scaleUpFactor:F
+    invoke-direct {p0, v0, v1, v1, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
 
-    invoke-direct {p0, v0, v1, v2, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
-
-    goto :goto_3
+    goto/16 :goto_2
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
@@ -537,20 +525,17 @@
 
     iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->scaleDownFactor:F
 
-    iget v2, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->scaleDownFactor:F
-
-    invoke-direct {p0, v0, v1, v2, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
+    invoke-direct {p0, v0, v1, v1, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
 
     invoke-direct {p0, v0, v6, v6, v3}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
 
-    goto :goto_3
+    goto/16 :goto_2
 
     :pswitch_2
     if-eqz p1, :cond_1
 
-    :goto_1
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
 
     iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->defaultMargin:I
@@ -561,7 +546,7 @@
 
     invoke-direct {p0, v0, v6, v6, v3}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
@@ -574,28 +559,97 @@
 
     invoke-direct {p0, v0, v2, v2, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
 
-    :goto_2
+    :goto_0
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
 
     invoke-virtual {v0, v5}, Landroid/widget/TextView;->setVisibility(I)V
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_3
     iget-boolean v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->isShifting:Z
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_2
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
+
+    iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->defaultMargin:I
+
+    invoke-direct {p0, v0, v1, v4}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewLayoutParams(Landroid/view/View;II)V
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
+
+    invoke-direct {p0, v0, v6, v6, v3}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
 
     goto :goto_1
 
     :cond_2
-    if-eqz p1, :cond_0
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
 
-    goto :goto_0
+    iget v3, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->defaultMargin:I
 
-    :goto_3
+    invoke-direct {p0, v0, v3, v1}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewLayoutParams(Landroid/view/View;II)V
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
+
+    invoke-direct {p0, v0, v2, v2, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
+
+    :goto_1
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
+
+    invoke-virtual {v0, v5}, Landroid/widget/TextView;->setVisibility(I)V
+
+    goto :goto_2
+
+    :cond_3
+    if-eqz p1, :cond_4
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
+
+    iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->defaultMargin:I
+
+    int-to-float v1, v1
+
+    iget v2, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->shiftAmount:F
+
+    add-float/2addr v1, v2
+
+    float-to-int v1, v1
+
+    invoke-direct {p0, v0, v1, v4}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewLayoutParams(Landroid/view/View;II)V
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
+
+    invoke-direct {p0, v0, v6, v6, v3}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
+
+    iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->scaleUpFactor:F
+
+    invoke-direct {p0, v0, v1, v1, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
+
+    goto :goto_2
+
+    :cond_4
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->icon:Landroid/widget/ImageView;
+
+    iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->defaultMargin:I
+
+    invoke-direct {p0, v0, v1, v4}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewLayoutParams(Landroid/view/View;II)V
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->largeLabel:Landroid/widget/TextView;
+
+    iget v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->scaleDownFactor:F
+
+    invoke-direct {p0, v0, v1, v1, v5}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
+
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->smallLabel:Landroid/widget/TextView;
+
+    invoke-direct {p0, v0, v6, v6, v3}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setViewValues(Landroid/view/View;FFI)V
+
+    :goto_2
     invoke-virtual {p0}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->refreshDrawableState()V
 
     invoke-virtual {p0, p1}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setSelected(Z)V
@@ -640,7 +694,6 @@
 
     move-result-object p1
 
-    :goto_0
     invoke-static {p0, p1}, Landroidx/core/view/ViewCompat;->setPointerIcon(Landroid/view/View;Landroidx/core/view/PointerIconCompat;)V
 
     return-void
@@ -648,7 +701,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    invoke-static {p0, p1}, Landroidx/core/view/ViewCompat;->setPointerIcon(Landroid/view/View;Landroidx/core/view/PointerIconCompat;)V
+
+    return-void
 .end method
 
 .method public setIcon(Landroid/graphics/drawable/Drawable;)V
@@ -721,8 +776,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->itemData:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuItemImpl;->getIcon()Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
@@ -945,8 +998,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->itemData:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->getContentDescription()Ljava/lang/CharSequence;
 
     move-result-object v0
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenu.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenu.smali
index 6770845d48..76e44d22a9 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenu.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenu.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/bottomnavigation/BottomNavigationMenu;
 .super Landroidx/appcompat/view/menu/MenuBuilder;
+.source "BottomNavigationMenu.java"
 
 
 # annotations
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 2840b51d8e..b79b3a4deb 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;
 .super Ljava/lang/Object;
+.source "BottomNavigationMenuView.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView.smali
index 61273ef3f5..e7322cd012 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
 .super Landroid/view/ViewGroup;
+.source "BottomNavigationMenuView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuView;
@@ -285,9 +286,9 @@
 .method private isShifting(II)Z
     .locals 3
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     const/4 v2, -0x1
 
@@ -297,18 +298,18 @@
 
     if-le p2, p1, :cond_0
 
-    return v1
+    return v0
 
     :cond_0
-    return v0
+    return v1
 
     :cond_1
     if-nez p1, :cond_2
 
-    return v1
+    return v0
 
     :cond_2
-    return v0
+    return v1
 .end method
 
 
@@ -324,8 +325,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v2, v0
 
     const/4 v3, 0x0
@@ -457,8 +456,6 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->itemBackground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v3, v4}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setItemBackground(Landroid/graphics/drawable/Drawable;)V
 
     goto :goto_2
@@ -650,13 +647,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
+    array-length v1, v0
 
-    array-length v0, v0
-
-    if-lez v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
+    if-lez v1, :cond_0
 
     const/4 v1, 0x0
 
@@ -1079,8 +1072,6 @@
 
     if-lez p2, :cond_9
 
-    iget-object v7, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->tempChildWidths:[I
-
     aget v8, v7, p1
 
     add-int/2addr v8, v5
@@ -1180,8 +1171,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v1, v0
 
     const/4 v2, 0x0
@@ -1214,8 +1203,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v1, v0
 
     const/4 v2, 0x0
@@ -1244,8 +1231,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v1, v0
 
     const/4 v2, 0x0
@@ -1286,8 +1271,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v1, v0
 
     const/4 v2, 0x0
@@ -1320,8 +1303,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v1, v0
 
     const/4 v2, 0x0
@@ -1337,8 +1318,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->itemTextColorFromUser:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v3, v4}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -1363,8 +1342,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v1, v0
 
     const/4 v2, 0x0
@@ -1380,8 +1357,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->itemTextColorFromUser:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v3, v4}, Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -1402,8 +1377,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
-
     array-length v1, v0
 
     const/4 v2, 0x0
@@ -1489,17 +1462,15 @@
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
+    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->buttons:[Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
     goto/16 :goto_2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/MenuBuilder;->size()I
 
     move-result v0
@@ -1623,6 +1594,9 @@
     goto :goto_1
 
     :cond_5
+    return-void
+
+    :cond_6
     :goto_2
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState$1.smali
index c3e68a40bf..6f0078059e 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState$1;
 .super Ljava/lang/Object;
+.source "BottomNavigationPresenter.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState.smali
index db5ff0d3f5..607e58880b 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/android/material/bottomnavigation/BottomNavigationPresenter$SavedState;
 .super Ljava/lang/Object;
+.source "BottomNavigationPresenter.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter.smali
index 202f2efcb4..0f7f222a1d 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationPresenter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomnavigation/BottomNavigationPresenter;
 .super Ljava/lang/Object;
+.source "BottomNavigationPresenter.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter;
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 79442e0ce2..7bf33cc837 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;
 .super Ljava/lang/Object;
+.source "BottomNavigationView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$Callback;
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemReselectedListener.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemReselectedListener.smali
index 62d2732d8b..aadaad9792 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemReselectedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemReselectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemReselectedListener;
 .super Ljava/lang/Object;
+.source "BottomNavigationView.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener.smali
index c29ce8d64c..4fab2b0ea5 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener;
 .super Ljava/lang/Object;
+.source "BottomNavigationView.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState$1.smali
index fa3047fa47..2924d16659 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState$1;
 .super Ljava/lang/Object;
+.source "BottomNavigationView.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
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 1637879a1d..7cd9354781 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
@@ -1,5 +1,6 @@
 .class Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "BottomNavigationView.java"
 
 
 # annotations
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 17cfa7d346..173e5affb4 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 .super Landroid/widget/FrameLayout;
+.source "BottomNavigationView.java"
 
 
 # annotations
@@ -166,25 +167,22 @@
 
     move-result-object v1
 
-    :goto_0
     invoke-virtual {p3, v1}, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->setIconTintList(Landroid/content/res/ColorStateList;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object p3, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->menuView:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->menuView:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    const v1, 0x1010038
 
-    const v4, 0x1010038
-
-    invoke-virtual {v1, v4}, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->createDefaultColorStateList(I)Landroid/content/res/ColorStateList;
+    invoke-virtual {p3, v1}, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->createDefaultColorStateList(I)Landroid/content/res/ColorStateList;
 
     move-result-object v1
 
-    goto :goto_0
+    invoke-virtual {p3, v1}, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->setIconTintList(Landroid/content/res/ColorStateList;)V
 
-    :goto_1
+    :goto_0
     sget p3, Lcom/google/android/material/R$styleable;->BottomNavigationView_itemIconSize:I
 
     invoke-virtual {p0}, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->getResources()Landroid/content/res/Resources;
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 5e6b9cec50..18a0377d9d 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;
 .super Ljava/lang/Object;
+.source "BottomSheetBehavior.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 59f799cda3..ba87d17cc1 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;
 .super Landroidx/customview/widget/ViewDragHelper$Callback;
+.source "BottomSheetBehavior.java"
 
 
 # annotations
@@ -157,7 +158,7 @@
 
     cmpg-float v5, p3, v1
 
-    if-gez v5, :cond_3
+    if-gez v5, :cond_2
 
     iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
@@ -165,20 +166,17 @@
 
     move-result p2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
-    :goto_0
     iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
 
-    :cond_0
-    :goto_1
     const/4 v2, 0x3
 
-    goto/16 :goto_4
+    goto/16 :goto_1
 
-    :cond_1
+    :cond_0
     invoke-virtual {p1}, Landroid/view/View;->getTop()I
 
     move-result p2
@@ -187,24 +185,27 @@
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
-    if-le p2, p3, :cond_0
+    if-le p2, p3, :cond_1
 
-    :cond_2
-    :goto_2
     iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
     const/4 v2, 0x6
 
-    goto/16 :goto_4
+    goto/16 :goto_1
 
-    :cond_3
+    :cond_1
+    const/4 v2, 0x3
+
+    goto/16 :goto_1
+
+    :cond_2
     iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-boolean v5, v5, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
 
-    if-eqz v5, :cond_5
+    if-eqz v5, :cond_4
 
     iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
@@ -212,7 +213,7 @@
 
     move-result v5
 
-    if-eqz v5, :cond_5
+    if-eqz v5, :cond_4
 
     invoke-virtual {p1}, Landroid/view/View;->getTop()I
 
@@ -222,7 +223,7 @@
 
     iget v6, v6, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
-    if-gt v5, v6, :cond_4
+    if-gt v5, v6, :cond_3
 
     invoke-static {p2}, Ljava/lang/Math;->abs(F)F
 
@@ -234,21 +235,21 @@
 
     cmpg-float v5, v5, v6
 
-    if-gez v5, :cond_5
+    if-gez v5, :cond_4
 
-    :cond_4
+    :cond_3
     iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
 
     const/4 v2, 0x5
 
-    goto :goto_4
+    goto/16 :goto_1
 
-    :cond_5
+    :cond_4
     cmpl-float v1, p3, v1
 
-    if-eqz v1, :cond_7
+    if-eqz v1, :cond_6
 
     invoke-static {p2}, Ljava/lang/Math;->abs(F)F
 
@@ -260,19 +261,19 @@
 
     cmpl-float p2, p2, p3
 
-    if-lez p2, :cond_6
+    if-lez p2, :cond_5
 
-    goto :goto_3
+    goto :goto_0
 
-    :cond_6
+    :cond_5
     iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
-    goto :goto_4
+    goto :goto_1
 
-    :cond_7
-    :goto_3
+    :cond_6
+    :goto_0
     invoke-virtual {p1}, Landroid/view/View;->getTop()I
 
     move-result p2
@@ -305,16 +306,29 @@
 
     move-result p2
 
-    if-ge p3, p2, :cond_6
+    if-ge p3, p2, :cond_7
 
-    goto :goto_0
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
+
+    const/4 v2, 0x3
+
+    goto :goto_1
+
+    :cond_7
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
+
+    goto :goto_1
 
     :cond_8
     iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
-    if-ge p2, p3, :cond_9
+    if-ge p2, p3, :cond_a
 
     iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
@@ -326,11 +340,22 @@
 
     move-result p3
 
-    if-ge p2, p3, :cond_2
+    if-ge p2, p3, :cond_9
 
-    goto/16 :goto_1
+    const/4 v2, 0x3
+
+    goto :goto_1
 
     :cond_9
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
+
+    const/4 v2, 0x6
+
+    goto :goto_1
+
+    :cond_a
     iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
@@ -351,11 +376,22 @@
 
     move-result p2
 
-    if-ge p3, p2, :cond_6
+    if-ge p3, p2, :cond_b
 
-    goto/16 :goto_2
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    :goto_4
+    iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
+
+    const/4 v2, 0x6
+
+    goto :goto_1
+
+    :cond_b
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
+
+    :goto_1
     iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
@@ -368,7 +404,7 @@
 
     move-result p2
 
-    if-eqz p2, :cond_a
+    if-eqz p2, :cond_c
 
     iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
@@ -386,7 +422,7 @@
 
     return-void
 
-    :cond_a
+    :cond_c
     iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->buc:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-virtual {p1, v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback.smali
index ef912438a0..d1b104811a 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
 .super Ljava/lang/Object;
+.source "BottomSheetBehavior.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState$1.smali
index 941af64c6f..bb1f906185 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetBehavior$SavedState$1;
 .super Ljava/lang/Object;
+.source "BottomSheetBehavior.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState.smali
index fcb9c2ab2d..81edcdc2e0 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomsheet/BottomSheetBehavior$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "BottomSheetBehavior.java"
 
 
 # annotations
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 25ab2df1fa..93d9b5440c 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;
 .super Ljava/lang/Object;
+.source "BottomSheetBehavior.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior.smali
index e3d16e8bcc..f70a1a1465 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 .super Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+.source "BottomSheetBehavior.java"
 
 
 # annotations
@@ -185,6 +186,8 @@
 
     iget v1, v1, Landroid/util/TypedValue;->data:I
 
+    invoke-virtual {p0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setPeekHeight(I)V
+
     goto :goto_0
 
     :cond_0
@@ -194,9 +197,9 @@
 
     move-result v1
 
-    :goto_0
     invoke-virtual {p0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setPeekHeight(I)V
 
+    :goto_0
     sget v1, Lcom/google/android/material/R$styleable;->BottomSheetBehavior_Layout_behavior_hideable:I
 
     const/4 v2, 0x0
@@ -277,7 +280,6 @@
 
     move-result v0
 
-    :goto_0
     iput v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
     return-void
@@ -289,7 +291,9 @@
 
     sub-int/2addr v0, v1
 
-    goto :goto_0
+    iput v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
+
+    return-void
 .end method
 
 .method public static from(Landroid/view/View;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
@@ -374,8 +378,6 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->velocityTracker:Landroid/view/VelocityTracker;
-
     const/16 v1, 0x3e8
 
     iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->maximumVelocity:F
@@ -404,8 +406,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->velocityTracker:Landroid/view/VelocityTracker;
-
     invoke-virtual {v0}, Landroid/view/VelocityTracker;->recycle()V
 
     const/4 v0, 0x0
@@ -426,8 +426,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewRef:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
@@ -499,8 +497,6 @@
 
     if-eqz v5, :cond_6
 
-    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->importantForAccessibilityMap:Ljava/util/Map;
-
     invoke-interface {v5, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v5
@@ -519,6 +515,8 @@
 
     move-result v5
 
+    invoke-static {v4, v5}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
+
     goto :goto_2
 
     :cond_4
@@ -541,10 +539,10 @@
     :cond_5
     const/4 v5, 0x4
 
-    :goto_2
     invoke-static {v4, v5}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
 
     :cond_6
+    :goto_2
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
@@ -579,25 +577,19 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
-
-    if-le p1, v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->callback:Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
-
     iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
-    sub-int/2addr v2, p1
+    if-le p1, v2, :cond_0
 
-    int-to-float p1, v2
+    sub-int p1, v2, p1
 
-    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
+    int-to-float p1, p1
 
-    iget v3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
+    iget v3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
 
-    sub-int/2addr v2, v3
+    sub-int/2addr v3, v2
 
-    int-to-float v2, v2
+    int-to-float v2, v3
 
     div-float/2addr p1, v2
 
@@ -606,15 +598,9 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->callback:Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
+    sub-int p1, v2, p1
 
-    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
-
-    sub-int/2addr v2, p1
-
-    int-to-float p1, v2
-
-    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
+    int-to-float p1, p1
 
     invoke-direct {p0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->getExpandedOffset()I
 
@@ -825,8 +811,6 @@
 
     if-eqz v6, :cond_3
 
-    iget-object v6, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->nestedScrollingChildRef:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v6}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v6
@@ -910,8 +894,6 @@
 
     if-eqz p2, :cond_8
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
-
     invoke-virtual {p2, p3}, Landroidx/customview/widget/ViewDragHelper;->shouldInterceptTouchEvent(Landroid/view/MotionEvent;)Z
 
     move-result p2
@@ -925,8 +907,6 @@
 
     if-eqz p2, :cond_9
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->nestedScrollingChildRef:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {p2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object p2
@@ -1090,14 +1070,16 @@
 
     move-result p3
 
+    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->lastPeekHeight:I
+
     goto :goto_0
 
     :cond_2
     iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->peekHeight:I
 
-    :goto_0
     iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->lastPeekHeight:I
 
+    :goto_0
     const/4 p3, 0x0
 
     iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
@@ -1134,28 +1116,25 @@
 
     move-result p3
 
-    :goto_1
     invoke-static {p2, p3}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
-    iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
-
     const/4 v3, 0x6
 
     if-ne p3, v3, :cond_4
 
     iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
+    invoke-static {p2, p3}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
+
     goto :goto_1
 
     :cond_4
-    iget-boolean p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
+    iget-boolean v3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
 
-    if-eqz p3, :cond_5
-
-    iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
+    if-eqz v3, :cond_5
 
     const/4 v3, 0x5
 
@@ -1163,6 +1142,8 @@
 
     iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
 
+    invoke-static {p2, p3}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
+
     goto :goto_1
 
     :cond_5
@@ -1174,15 +1155,13 @@
 
     iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
+    invoke-static {p2, p3}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
+
     goto :goto_1
 
     :cond_6
-    iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
-
     if-eq p3, v1, :cond_7
 
-    iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
-
     if-ne p3, v2, :cond_8
 
     :cond_7
@@ -1195,7 +1174,7 @@
     invoke-static {p2, v0}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
 
     :cond_8
-    :goto_2
+    :goto_1
     iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
     if-nez p3, :cond_9
@@ -1361,22 +1340,20 @@
 
     const/4 p3, 0x3
 
-    :goto_0
     invoke-virtual {p0, p3}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_2
     aput p5, p6, p1
 
-    :goto_1
     neg-int p3, p5
 
     invoke-static {p2, p3}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
 
     invoke-virtual {p0, p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     if-gez p5, :cond_6
@@ -1393,15 +1370,13 @@
 
     if-le p7, p3, :cond_5
 
-    iget-boolean p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
+    iget-boolean p7, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
 
-    if-eqz p3, :cond_4
+    if-eqz p7, :cond_4
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_4
-    iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
-
     sub-int/2addr p4, p3
 
     aput p4, p6, p1
@@ -1414,16 +1389,22 @@
 
     const/4 p3, 0x4
 
-    goto :goto_0
-
-    :cond_5
-    :goto_2
-    aput p5, p6, p1
+    invoke-virtual {p0, p3}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
 
     goto :goto_1
 
+    :cond_5
+    :goto_0
+    aput p5, p6, p1
+
+    neg-int p3, p5
+
+    invoke-static {p2, p3}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
+
+    invoke-virtual {p0, p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
+
     :cond_6
-    :goto_3
+    :goto_1
     invoke-virtual {p2}, Landroid/view/View;->getTop()I
 
     move-result p2
@@ -1469,21 +1450,22 @@
 
     if-ne p1, p2, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$SavedState;->state:I
 
-    :goto_0
     iput p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
 
     return-void
 
     :cond_1
-    :goto_1
+    :goto_0
     const/4 p1, 0x4
 
-    goto :goto_0
+    iput p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
+
+    return-void
 .end method
 
 .method public onSaveInstanceState(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;)Landroid/os/Parcelable;
@@ -1602,13 +1584,13 @@
 
     move-result-object p1
 
-    if-ne p3, p1, :cond_9
+    if-ne p3, p1, :cond_b
 
     iget-boolean p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->nestedScrolled:Z
 
     if-nez p1, :cond_1
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :cond_1
     iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->lastNestedScrollDy:I
@@ -1625,7 +1607,7 @@
 
     move-result p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     iget-boolean p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
@@ -1646,12 +1628,12 @@
 
     const/4 v0, 0x5
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->lastNestedScrollDy:I
 
-    if-nez p1, :cond_7
+    if-nez p1, :cond_9
 
     invoke-virtual {p2}, Landroid/view/View;->getTop()I
 
@@ -1659,7 +1641,7 @@
 
     iget-boolean v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContents:Z
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_5
 
     iget p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
 
@@ -1677,16 +1659,23 @@
 
     move-result p1
 
-    if-ge p3, p1, :cond_7
+    if-ge p3, p1, :cond_4
 
     iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
+    iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
+
+    const/4 v0, 0x4
+
+    goto :goto_0
+
+    :cond_5
     iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
-    if-ge p1, v2, :cond_6
+    if-ge p1, v2, :cond_7
 
     iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -1696,24 +1685,21 @@
 
     move-result v1
 
-    if-ge p1, v1, :cond_5
+    if-ge p1, v1, :cond_6
 
     const/4 p1, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_5
-    :goto_0
+    :cond_6
     iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
     const/4 v0, 0x6
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_6
-    iget v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
-
-    sub-int v0, p1, v0
+    :cond_7
+    sub-int v0, p1, v2
 
     invoke-static {v0}, Ljava/lang/Math;->abs(I)I
 
@@ -1727,16 +1713,27 @@
 
     move-result p1
 
-    if-ge v0, p1, :cond_7
+    if-ge v0, p1, :cond_8
+
+    iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
+
+    const/4 v0, 0x6
 
     goto :goto_0
 
-    :cond_7
+    :cond_8
     iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
     const/4 v0, 0x4
 
-    :goto_1
+    goto :goto_0
+
+    :cond_9
+    iget p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
+
+    const/4 v0, 0x4
+
+    :goto_0
     iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
     invoke-virtual {p2}, Landroid/view/View;->getLeft()I
@@ -1747,7 +1744,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_a
 
     const/4 p1, 0x2
 
@@ -1759,16 +1756,18 @@
 
     invoke-static {p2, p1}, Landroidx/core/view/ViewCompat;->postOnAnimation(Landroid/view/View;Ljava/lang/Runnable;)V
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_8
+    :cond_a
     invoke-virtual {p0, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
 
-    :goto_2
+    :goto_1
     iput-boolean p4, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->nestedScrolled:Z
 
-    :cond_9
-    :goto_3
+    return-void
+
+    :cond_b
+    :goto_2
     return-void
 .end method
 
@@ -1814,8 +1813,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
-
     invoke-virtual {v1, p3}, Landroidx/customview/widget/ViewDragHelper;->processTouchEvent(Landroid/view/MotionEvent;)V
 
     :cond_2
@@ -2018,8 +2015,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewRef:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object p1
@@ -2083,8 +2078,6 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewRef:Ljava/lang/ref/WeakReference;
-
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
@@ -2162,16 +2155,18 @@
     :cond_2
     const/4 v0, 0x0
 
+    invoke-direct {p0, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->updateImportantForAccessibility(Z)V
+
     goto :goto_1
 
     :cond_3
     :goto_0
     const/4 v0, 0x1
 
-    :goto_1
     invoke-direct {p0, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->updateImportantForAccessibility(Z)V
 
     :cond_4
+    :goto_1
     iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewRef:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
@@ -2186,8 +2181,6 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->callback:Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
-
     invoke-virtual {v1, v0, p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;->onStateChanged(Landroid/view/View;I)V
 
     :cond_5
@@ -2287,9 +2280,7 @@
 
     if-gt v1, v2, :cond_1
 
-    iget p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
-
-    move v0, p2
+    move v0, v2
 
     const/4 p2, 0x3
 
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 831b1c4dd4..089b9a3441 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;
 .super Ljava/lang/Object;
+.source "BottomSheetDialog.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 1041bb64d4..d79ec30f06 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "BottomSheetDialog.java"
 
 
 # annotations
@@ -47,7 +48,6 @@
 
     const/4 p1, 0x1
 
-    :goto_0
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setDismissable(Z)V
 
     return-void
@@ -55,7 +55,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setDismissable(Z)V
+
+    return-void
 .end method
 
 .method public final performAccessibilityAction(Landroid/view/View;ILandroid/os/Bundle;)Z
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 b947438a98..b7ce1b54a0 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetDialog$3;
 .super Ljava/lang/Object;
+.source "BottomSheetDialog.java"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
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 67eeefd50a..0847eb53c5 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;
 .super Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
+.source "BottomSheetDialog.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog.smali
index 5e79735dc5..bd8ab78106 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 .super Landroidx/appcompat/app/AppCompatDialog;
+.source "BottomSheetDialog.java"
 
 
 # instance fields
@@ -282,8 +283,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->behavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
-
     invoke-virtual {v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->getState()I
 
     move-result v0
@@ -317,8 +316,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->behavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setHideable(Z)V
 
     :cond_0
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialogFragment.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialogFragment.smali
index 7555885500..65ebaf6d69 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialogFragment.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialogFragment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/bottomsheet/BottomSheetDialogFragment;
 .super Landroidx/appcompat/app/AppCompatDialogFragment;
+.source "BottomSheetDialogFragment.java"
 
 
 # direct methods
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 66f5f4ab14..82784aa6e1 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/button/MaterialButton;
 .super Landroidx/appcompat/widget/AppCompatButton;
+.source "MaterialButton.java"
 
 
 # annotations
@@ -340,7 +341,7 @@
 
     if-eqz v7, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/android/material/button/b;->AZ()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p2}, Lcom/google/android/material/button/b;->AY()Landroid/graphics/drawable/Drawable;
 
     move-result-object p3
 
@@ -508,8 +509,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->materialButtonHelper:Lcom/google/android/material/button/b;
-
     iget-boolean v0, v0, Lcom/google/android/material/button/b;->buq:Z
 
     if-nez v0, :cond_0
@@ -525,14 +524,12 @@
 .end method
 
 .method private updateIcon()V
-    .locals 6
+    .locals 5
 
     iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->icon:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->icon:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -549,19 +546,15 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->icon:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/button/MaterialButton;->icon:Landroid/graphics/drawable/Drawable;
 
-    iget-object v1, p0, Lcom/google/android/material/button/MaterialButton;->iconTintMode:Landroid/graphics/PorterDuff$Mode;
-
-    invoke-static {v0, v1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
+    invoke-static {v1, v0}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
     iget v0, p0, Lcom/google/android/material/button/MaterialButton;->iconSize:I
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/button/MaterialButton;->iconSize:I
-
     goto :goto_0
 
     :cond_1
@@ -576,8 +569,6 @@
 
     if-eqz v1, :cond_2
 
-    iget v1, p0, Lcom/google/android/material/button/MaterialButton;->iconSize:I
-
     goto :goto_1
 
     :cond_2
@@ -594,11 +585,9 @@
 
     const/4 v4, 0x0
 
-    iget v5, p0, Lcom/google/android/material/button/MaterialButton;->iconLeft:I
+    add-int/2addr v0, v3
 
-    add-int/2addr v5, v0
-
-    invoke-virtual {v2, v3, v4, v5, v1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v2, v3, v4, v0, v1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     :cond_3
     iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->icon:Landroid/graphics/drawable/Drawable;
@@ -1004,8 +993,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/button/MaterialButton;->materialButtonHelper:Lcom/google/android/material/button/b;
-
     sub-int/2addr p5, p3
 
     sub-int/2addr p4, p2
@@ -1041,7 +1028,7 @@
 
     iget-object p1, p0, Lcom/google/android/material/button/MaterialButton;->icon:Landroid/graphics/drawable/Drawable;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
     iget p1, p0, Lcom/google/android/material/button/MaterialButton;->iconGravity:I
 
@@ -1049,7 +1036,7 @@
 
     if-eq p1, p2, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Lcom/google/android/material/button/MaterialButton;->getPaint()Landroid/text/TextPaint;
@@ -1080,12 +1067,7 @@
 
     move-result v0
 
-    goto :goto_0
-
     :cond_1
-    iget v0, p0, Lcom/google/android/material/button/MaterialButton;->iconSize:I
-
-    :goto_0
     invoke-virtual {p0}, Lcom/google/android/material/button/MaterialButton;->getMeasuredWidth()I
 
     move-result v1
@@ -1130,7 +1112,10 @@
     invoke-direct {p0}, Lcom/google/android/material/button/MaterialButton;->updateIcon()V
 
     :cond_3
-    :goto_1
+    return-void
+
+    :cond_4
+    :goto_0
     return-void
 .end method
 
@@ -1822,7 +1807,7 @@
     :cond_0
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ba()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->AZ()V
 
     :cond_1
     return-void
@@ -1882,7 +1867,7 @@
 
     invoke-virtual {v1, p1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ba()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->AZ()V
 
     :cond_0
     return-void
@@ -1945,7 +1930,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->AY()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->AX()V
 
     return-void
 
@@ -2004,7 +1989,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->AY()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->AX()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/material/button/a.smali b/com.discord/smali_classes2/com/google/android/material/button/a.smali
index d31e01e937..ba75923751 100644
--- a/com.discord/smali_classes2/com/google/android/material/button/a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/button/a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/button/a;
 .super Landroid/graphics/drawable/RippleDrawable;
+.source "MaterialButtonBackgroundDrawable.java"
 
 
 # annotations
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 fba40257ef..bfb9a4c2b9 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/button/b;
 .super Ljava/lang/Object;
+.source "MaterialButtonHelper.java"
 
 
 # annotations
@@ -152,15 +153,13 @@
 
 
 # virtual methods
-.method final AY()V
+.method final AX()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/material/button/b;->bun:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->bun:Landroid/graphics/drawable/GradientDrawable;
-
     iget-object v1, p0, Lcom/google/android/material/button/b;->backgroundTint:Landroid/content/res/ColorStateList;
 
     invoke-static {v0, v1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
@@ -169,17 +168,15 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->bun:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, p0, Lcom/google/android/material/button/b;->bun:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v1, p0, Lcom/google/android/material/button/b;->backgroundTintMode:Landroid/graphics/PorterDuff$Mode;
-
-    invoke-static {v0, v1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
+    invoke-static {v1, v0}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
     return-void
 .end method
 
-.method final AZ()Landroid/graphics/drawable/Drawable;
+.method final AY()Landroid/graphics/drawable/Drawable;
     .locals 6
     .annotation build Landroid/annotation/TargetApi;
         value = 0x15
@@ -209,7 +206,7 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
-    invoke-virtual {p0}, Lcom/google/android/material/button/b;->AY()V
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->AX()V
 
     new-instance v0, Landroid/graphics/drawable/GradientDrawable;
 
@@ -298,7 +295,7 @@
     return-object v1
 .end method
 
-.method final Ba()V
+.method final AZ()V
     .locals 2
 
     sget-boolean v0, Lcom/google/android/material/button/b;->buf:Z
@@ -311,7 +308,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/button/b;->bug:Lcom/google/android/material/button/MaterialButton;
 
-    invoke-virtual {p0}, Lcom/google/android/material/button/b;->AZ()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->AY()Landroid/graphics/drawable/Drawable;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/canvas/CanvasCompat.smali b/com.discord/smali_classes2/com/google/android/material/canvas/CanvasCompat.smali
index 7e71158105..4945ffb259 100644
--- a/com.discord/smali_classes2/com/google/android/material/canvas/CanvasCompat.smali
+++ b/com.discord/smali_classes2/com/google/android/material/canvas/CanvasCompat.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/canvas/CanvasCompat;
 .super Ljava/lang/Object;
+.source "CanvasCompat.java"
 
 
 # annotations
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 1348e73489..96ebea28b6 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/card/MaterialCardView;
 .super Landroidx/cardview/widget/CardView;
+.source "MaterialCardView.java"
 
 
 # instance fields
@@ -76,9 +77,9 @@
 
     iput p3, p2, Lcom/google/android/material/card/a;->strokeWidth:I
 
-    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Bb()V
+    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Ba()V
 
-    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Bc()V
+    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Bb()V
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
@@ -118,7 +119,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;->Bb()V
+    invoke-virtual {p1}, Lcom/google/android/material/card/a;->Ba()V
 
     return-void
 .end method
@@ -134,7 +135,7 @@
 
     iput p1, v0, Lcom/google/android/material/card/a;->strokeColor:I
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Bb()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ba()V
 
     return-void
 .end method
@@ -150,9 +151,9 @@
 
     iput p1, v0, Lcom/google/android/material/card/a;->strokeWidth:I
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Bb()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ba()V
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Bc()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Bb()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 be4868fd3c..5201a54b2f 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/card/a;
 .super Ljava/lang/Object;
+.source "MaterialCardViewHelper.java"
 
 
 # annotations
@@ -50,11 +51,9 @@
 
     if-eq v1, v2, :cond_0
 
-    iget v1, p0, Lcom/google/android/material/card/a;->strokeWidth:I
+    iget v2, p0, Lcom/google/android/material/card/a;->strokeWidth:I
 
-    iget v2, p0, Lcom/google/android/material/card/a;->strokeColor:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/graphics/drawable/GradientDrawable;->setStroke(II)V
+    invoke-virtual {v0, v2, v1}, Landroid/graphics/drawable/GradientDrawable;->setStroke(II)V
 
     :cond_0
     return-object v0
@@ -62,7 +61,7 @@
 
 
 # virtual methods
-.method final Bb()V
+.method final Ba()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/material/card/a;->bur:Lcom/google/android/material/card/MaterialCardView;
@@ -76,7 +75,7 @@
     return-void
 .end method
 
-.method final Bc()V
+.method final Bb()V
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/material/card/a;->bur:Lcom/google/android/material/card/MaterialCardView;
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 f463fb18e5..a02dccee45 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/chip/Chip$1;
 .super Landroidx/core/content/res/ResourcesCompat$FontCallback;
+.source "Chip.java"
 
 
 # annotations
@@ -45,9 +46,7 @@
 
     iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->bus:Lcom/google/android/material/chip/Chip;
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip$1;->bus:Lcom/google/android/material/chip/Chip;
-
-    invoke-virtual {v0}, Lcom/google/android/material/chip/Chip;->getText()Ljava/lang/CharSequence;
+    invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->getText()Ljava/lang/CharSequence;
 
     move-result-object v0
 
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 4b88a31ab2..fab48365dd 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/chip/Chip$2;
 .super Landroid/view/ViewOutlineProvider;
+.source "Chip.java"
 
 
 # annotations
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 3d4fc04825..05c4ba700e 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/chip/Chip$a;
 .super Landroidx/customview/widget/ExploreByTouchHelper;
+.source "Chip.java"
 
 
 # annotations
@@ -199,10 +200,9 @@
 
     if-eqz p1, :cond_0
 
-    :goto_0
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->bus:Lcom/google/android/material/chip/Chip;
@@ -231,12 +231,12 @@
 
     if-nez v4, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string p1, ""
 
-    :goto_1
+    :goto_0
     aput-object p1, v2, v3
 
     invoke-virtual {v0, v1, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -247,9 +247,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    :goto_2
+    :goto_1
     iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->bus: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;
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/Chip.smali b/com.discord/smali_classes2/com/google/android/material/chip/Chip.smali
index d421c0400f..ef8e57b00d 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/Chip.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/Chip.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/chip/Chip;
 .super Landroidx/appcompat/widget/AppCompatCheckBox;
+.source "Chip.java"
 
 # interfaces
 .implements Lcom/google/android/material/chip/ChipDrawable$Delegate;
@@ -496,8 +497,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getTextAppearance()Lcom/google/android/material/resources/TextAppearance;
 
     move-result-object v0
@@ -585,9 +584,9 @@
 
     invoke-virtual {p1, v3, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
 
     return v1
@@ -601,7 +600,41 @@
 
     invoke-static {v1, v2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    goto :goto_0
+
+    :catch_1
+    move-exception p1
+
+    const-string v1, "Chip"
+
+    const-string v2, "Unable to send Accessibility Exit event"
+
+    invoke-static {v1, v2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    goto :goto_0
+
+    :catch_2
+    move-exception p1
+
+    const-string v1, "Chip"
+
+    const-string v2, "Unable to send Accessibility Exit event"
+
+    invoke-static {v1, v2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    goto :goto_0
+
+    :catch_3
+    move-exception p1
+
+    const-string v1, "Chip"
+
+    const-string v2, "Unable to send Accessibility Exit event"
+
+    invoke-static {v1, v2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
     :cond_0
+    :goto_0
     return v0
 .end method
 
@@ -612,8 +645,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCloseIcon()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -738,8 +769,6 @@
 
     if-eq v0, p1, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/chip/Chip;->focusedVirtualView:I
-
     if-nez v0, :cond_0
 
     const/4 v0, 0x0
@@ -787,7 +816,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_5
+    if-nez v0, :cond_6
 
     iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
 
@@ -796,8 +825,6 @@
     goto/16 :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipStartPadding()F
 
     move-result v0
@@ -959,6 +986,9 @@
     invoke-static {p0, v1, v2, v0, v3}, Landroidx/core/view/ViewCompat;->setPaddingRelative(Landroid/view/View;IIII)V
 
     :cond_5
+    return-void
+
+    :cond_6
     :goto_0
     return-void
 .end method
@@ -1248,8 +1278,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->isCloseIconStateful()Z
 
     move-result v0
@@ -1289,8 +1317,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCheckedIcon()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -1312,8 +1338,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipBackgroundColor()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -1333,8 +1357,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipCornerRadius()F
 
     move-result v0
@@ -1362,8 +1384,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipEndPadding()F
 
     move-result v0
@@ -1385,8 +1405,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipIcon()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -1406,8 +1424,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipIconSize()F
 
     move-result v0
@@ -1429,8 +1445,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipIconTint()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -1450,8 +1464,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipMinHeight()F
 
     move-result v0
@@ -1471,8 +1483,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipStartPadding()F
 
     move-result v0
@@ -1494,8 +1504,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipStrokeColor()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -1515,8 +1523,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getChipStrokeWidth()F
 
     move-result v0
@@ -1550,8 +1556,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCloseIcon()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -1573,8 +1577,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCloseIconContentDescription()Ljava/lang/CharSequence;
 
     move-result-object v0
@@ -1594,8 +1596,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCloseIconEndPadding()F
 
     move-result v0
@@ -1615,8 +1615,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCloseIconSize()F
 
     move-result v0
@@ -1636,8 +1634,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCloseIconStartPadding()F
 
     move-result v0
@@ -1659,8 +1655,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getCloseIconTint()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -1680,8 +1674,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getEllipsize()Landroid/text/TextUtils$TruncateAt;
 
     move-result-object v0
@@ -1724,8 +1716,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getHideMotionSpec()Lcom/google/android/material/animation/MotionSpec;
 
     move-result-object v0
@@ -1745,8 +1735,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getIconEndPadding()F
 
     move-result v0
@@ -1766,8 +1754,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getIconStartPadding()F
 
     move-result v0
@@ -1789,8 +1775,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getRippleColor()Landroid/content/res/ColorStateList;
 
     move-result-object v0
@@ -1812,8 +1796,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getShowMotionSpec()Lcom/google/android/material/animation/MotionSpec;
 
     move-result-object v0
@@ -1833,8 +1815,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getText()Ljava/lang/CharSequence;
 
     move-result-object v0
@@ -1854,8 +1834,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getTextEndPadding()F
 
     move-result v0
@@ -1875,8 +1853,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->getTextStartPadding()F
 
     move-result v0
@@ -1896,8 +1872,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->isCheckable()Z
 
     move-result v0
@@ -1933,8 +1907,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->isCheckedIconVisible()Z
 
     move-result v0
@@ -1970,8 +1942,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->isChipIconVisible()Z
 
     move-result v0
@@ -2007,8 +1977,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->isCloseIconVisible()Z
 
     move-result v0
@@ -2084,8 +2052,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->shouldDrawText()Z
 
     move-result v0
@@ -2129,17 +2095,16 @@
 
     const/4 v0, -0x1
 
-    :goto_0
     invoke-direct {p0, v0}, Lcom/google/android/material/chip/Chip;->setFocusedVirtualView(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/high16 v0, -0x80000000
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Lcom/google/android/material/chip/Chip;->setFocusedVirtualView(I)V
 
-    :goto_1
+    :goto_0
     invoke-virtual {p0}, Lcom/google/android/material/chip/Chip;->invalidate()V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/appcompat/widget/AppCompatCheckBox;->onFocusChanged(ZILandroid/graphics/Rect;)V
@@ -2166,11 +2131,13 @@
 
     if-eq v0, v1, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
+    invoke-direct {p0, v0}, Lcom/google/android/material/chip/Chip;->setCloseIconHovered(Z)V
+
     goto :goto_0
 
     :cond_1
@@ -2190,10 +2157,9 @@
 
     move-result v0
 
-    :goto_0
     invoke-direct {p0, v0}, Lcom/google/android/material/chip/Chip;->setCloseIconHovered(Z)V
 
-    :goto_1
+    :goto_0
     invoke-super {p0, p1}, Landroidx/appcompat/widget/AppCompatCheckBox;->onHoverEvent(Landroid/view/MotionEvent;)Z
 
     move-result p1
@@ -2222,7 +2188,7 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     invoke-virtual {p2}, Landroid/view/KeyEvent;->hasNoModifiers()Z
@@ -2237,7 +2203,11 @@
 
     xor-int/2addr v0, v3
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Lcom/google/android/material/chip/Chip;->moveFocus(Z)Z
+
+    move-result v2
+
+    goto :goto_1
 
     :pswitch_1
     invoke-virtual {p2}, Landroid/view/KeyEvent;->hasNoModifiers()Z
@@ -2250,12 +2220,11 @@
 
     move-result v0
 
-    :goto_0
     invoke-direct {p0, v0}, Lcom/google/android/material/chip/Chip;->moveFocus(Z)Z
 
     move-result v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     :pswitch_2
@@ -2263,7 +2232,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_3
     invoke-virtual {p0}, Lcom/google/android/material/chip/Chip;->performCloseIconClick()Z
@@ -2284,7 +2253,7 @@
 
     const/4 v0, 0x2
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     invoke-virtual {p2, v3}, Landroid/view/KeyEvent;->hasModifiers(I)Z
@@ -2295,12 +2264,12 @@
 
     const/4 v0, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     const/4 v0, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz v0, :cond_6
 
     invoke-virtual {p0}, Lcom/google/android/material/chip/Chip;->getParent()Landroid/view/ViewParent;
@@ -2332,7 +2301,7 @@
     return v3
 
     :cond_6
-    :goto_2
+    :goto_1
     if-eqz v2, :cond_7
 
     invoke-virtual {p0}, Lcom/google/android/material/chip/Chip;->invalidate()V
@@ -2437,23 +2406,26 @@
 
     packed-switch v0, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     iget-boolean v0, p0, Lcom/google/android/material/chip/Chip;->closeIconPressed:Z
 
     if-eqz v0, :cond_2
 
-    if-nez v1, :cond_1
+    if-nez v1, :cond_0
 
     invoke-direct {p0, v2}, Lcom/google/android/material/chip/Chip;->setCloseIconPressed(Z)V
 
-    goto :goto_1
+    :cond_0
+    const/4 v0, 0x1
+
+    goto :goto_2
 
     :pswitch_1
     iget-boolean v0, p0, Lcom/google/android/material/chip/Chip;->closeIconPressed:Z
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {p0}, Lcom/google/android/material/chip/Chip;->performCloseIconClick()Z
 
@@ -2461,31 +2433,29 @@
 
     goto :goto_0
 
-    :cond_0
+    :cond_1
     :pswitch_2
     const/4 v0, 0x0
 
     :goto_0
     invoke-direct {p0, v2}, Lcom/google/android/material/chip/Chip;->setCloseIconPressed(Z)V
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_3
     if-eqz v1, :cond_2
 
     invoke-direct {p0, v3}, Lcom/google/android/material/chip/Chip;->setCloseIconPressed(Z)V
 
-    :cond_1
-    :goto_1
     const/4 v0, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
-    :goto_2
+    :goto_1
     const/4 v0, 0x0
 
-    :goto_3
+    :goto_2
     if-nez v0, :cond_4
 
     invoke-super {p0, p1}, Landroidx/appcompat/widget/AppCompatCheckBox;->onTouchEvent(Landroid/view/MotionEvent;)Z
@@ -2494,17 +2464,15 @@
 
     if-eqz p1, :cond_3
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     return v2
 
     :cond_4
-    :goto_4
+    :goto_3
     return v3
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
@@ -2529,8 +2497,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/chip/Chip;->onCloseIconClickListener:Landroid/view/View$OnClickListener;
-
     invoke-interface {v1, p0}, Landroid/view/View$OnClickListener;->onClick(Landroid/view/View;)V
 
     const/4 v1, 0x1
@@ -2669,8 +2635,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCheckable(Z)V
 
     :cond_0
@@ -2688,8 +2652,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCheckableResource(I)V
 
     :cond_0
@@ -2708,8 +2670,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0}, Lcom/google/android/material/chip/ChipDrawable;->isCheckable()Z
 
     move-result v0
@@ -2728,8 +2688,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->onCheckedChangeListenerInternal:Landroid/widget/CompoundButton$OnCheckedChangeListener;
-
     invoke-interface {v0, p0, p1}, Landroid/widget/CompoundButton$OnCheckedChangeListener;->onCheckedChanged(Landroid/widget/CompoundButton;Z)V
 
     :cond_1
@@ -2747,8 +2705,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCheckedIcon(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -2790,8 +2746,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCheckedIconResource(I)V
 
     :cond_0
@@ -2809,8 +2763,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCheckedIconVisible(I)V
 
     :cond_0
@@ -2824,8 +2776,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCheckedIconVisible(Z)V
 
     :cond_0
@@ -2843,8 +2793,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipBackgroundColor(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -2862,8 +2810,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipBackgroundColorResource(I)V
 
     :cond_0
@@ -2877,8 +2823,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipCornerRadius(F)V
 
     :cond_0
@@ -2896,8 +2840,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipCornerRadiusResource(I)V
 
     :cond_0
@@ -2915,8 +2857,6 @@
 
     if-eq v0, p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-direct {p0, v0}, Lcom/google/android/material/chip/Chip;->unapplyChipDrawable(Lcom/google/android/material/chip/ChipDrawable;)V
 
     iput-object p1, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
@@ -2983,8 +2923,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipEndPadding(F)V
 
     :cond_0
@@ -3002,8 +2940,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipEndPaddingResource(I)V
 
     :cond_0
@@ -3021,8 +2957,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIcon(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -3064,8 +2998,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIconResource(I)V
 
     :cond_0
@@ -3079,8 +3011,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIconSize(F)V
 
     :cond_0
@@ -3098,8 +3028,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIconSizeResource(I)V
 
     :cond_0
@@ -3117,8 +3045,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIconTint(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -3136,8 +3062,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIconTintResource(I)V
 
     :cond_0
@@ -3155,8 +3079,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIconVisible(I)V
 
     :cond_0
@@ -3170,8 +3092,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipIconVisible(Z)V
 
     :cond_0
@@ -3185,8 +3105,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipMinHeight(F)V
 
     :cond_0
@@ -3204,8 +3122,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipMinHeightResource(I)V
 
     :cond_0
@@ -3219,8 +3135,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipStartPadding(F)V
 
     :cond_0
@@ -3238,8 +3152,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipStartPaddingResource(I)V
 
     :cond_0
@@ -3257,8 +3169,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipStrokeColor(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -3276,8 +3186,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipStrokeColorResource(I)V
 
     :cond_0
@@ -3291,8 +3199,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipStrokeWidth(F)V
 
     :cond_0
@@ -3310,8 +3216,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setChipStrokeWidthResource(I)V
 
     :cond_0
@@ -3365,8 +3269,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIcon(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -3384,8 +3286,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconContentDescription(Ljava/lang/CharSequence;)V
 
     :cond_0
@@ -3423,8 +3323,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconEndPadding(F)V
 
     :cond_0
@@ -3442,8 +3340,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconEndPaddingResource(I)V
 
     :cond_0
@@ -3461,8 +3357,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconResource(I)V
 
     :cond_0
@@ -3476,8 +3370,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconSize(F)V
 
     :cond_0
@@ -3495,8 +3387,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconSizeResource(I)V
 
     :cond_0
@@ -3510,8 +3400,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconStartPadding(F)V
 
     :cond_0
@@ -3529,8 +3417,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconStartPaddingResource(I)V
 
     :cond_0
@@ -3548,8 +3434,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconTint(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -3567,8 +3451,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconTintResource(I)V
 
     :cond_0
@@ -3586,8 +3468,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconVisible(I)V
 
     :cond_0
@@ -3601,8 +3481,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setCloseIconVisible(Z)V
 
     :cond_0
@@ -3873,8 +3751,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setEllipsize(Landroid/text/TextUtils$TruncateAt;)V
 
     :cond_1
@@ -3922,8 +3798,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setHideMotionSpec(Lcom/google/android/material/animation/MotionSpec;)V
 
     :cond_0
@@ -3941,8 +3815,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setHideMotionSpecResource(I)V
 
     :cond_0
@@ -3956,8 +3828,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setIconEndPadding(F)V
 
     :cond_0
@@ -3975,8 +3845,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setIconEndPaddingResource(I)V
 
     :cond_0
@@ -3990,8 +3858,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setIconStartPadding(F)V
 
     :cond_0
@@ -4009,8 +3875,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setIconStartPaddingResource(I)V
 
     :cond_0
@@ -4072,8 +3936,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setMaxWidth(I)V
 
     :cond_0
@@ -4128,8 +3990,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setRippleColor(Landroid/content/res/ColorStateList;)V
 
     :cond_0
@@ -4147,8 +4007,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setRippleColorResource(I)V
 
     :cond_0
@@ -4166,8 +4024,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setShowMotionSpec(Lcom/google/android/material/animation/MotionSpec;)V
 
     :cond_0
@@ -4185,8 +4041,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setShowMotionSpecResource(I)V
 
     :cond_0
@@ -4252,8 +4106,6 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {p2, p1}, Lcom/google/android/material/chip/ChipDrawable;->setText(Ljava/lang/CharSequence;)V
 
     :cond_3
@@ -4269,8 +4121,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setTextAppearanceResource(I)V
 
     :cond_0
@@ -4315,8 +4165,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p2}, Lcom/google/android/material/chip/ChipDrawable;->setTextAppearanceResource(I)V
 
     :cond_0
@@ -4359,8 +4207,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setTextAppearance(Lcom/google/android/material/resources/TextAppearance;)V
 
     :cond_0
@@ -4403,8 +4249,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setTextAppearanceResource(I)V
 
     :cond_0
@@ -4424,8 +4268,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setTextEndPadding(F)V
 
     :cond_0
@@ -4443,8 +4285,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setTextEndPaddingResource(I)V
 
     :cond_0
@@ -4458,8 +4298,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setTextStartPadding(F)V
 
     :cond_0
@@ -4477,8 +4315,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip;->chipDrawable:Lcom/google/android/material/chip/ChipDrawable;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/chip/ChipDrawable;->setTextStartPaddingResource(I)V
 
     :cond_0
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 3ff69dd228..90562c27c9 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/chip/ChipDrawable$1;
 .super Landroidx/core/content/res/ResourcesCompat$FontCallback;
+.source "ChipDrawable.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$Delegate.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$Delegate.smali
index 427581b0f9..9e2e2b66e2 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$Delegate.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$Delegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/chip/ChipDrawable$Delegate;
 .super Ljava/lang/Object;
+.source "ChipDrawable.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable.smali
index f51e10709e..021b6f3b9e 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/chip/ChipDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "ChipDrawable.java"
 
 # interfaces
 .implements Landroid/graphics/drawable/Drawable$Callback;
@@ -331,8 +332,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable;->debugPaint:Landroid/graphics/Paint;
-
     sget-object v0, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
@@ -1076,6 +1075,8 @@
     invoke-virtual {v0, p0}, Landroid/content/res/Resources$NotFoundException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     throw v0
+
+    return-void
 .end method
 
 .method private drawCheckedIcon(Landroid/graphics/Canvas;Landroid/graphics/Rect;)V
@@ -1142,7 +1143,7 @@
 .end method
 
 .method private drawChipBackground(Landroid/graphics/Canvas;Landroid/graphics/Rect;)V
-    .locals 3
+    .locals 2
     .param p1    # Landroid/graphics/Canvas;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -1176,11 +1177,9 @@
 
     iget v0, p0, Lcom/google/android/material/chip/ChipDrawable;->chipCornerRadius:F
 
-    iget v1, p0, Lcom/google/android/material/chip/ChipDrawable;->chipCornerRadius:F
+    iget-object v1, p0, Lcom/google/android/material/chip/ChipDrawable;->chipPaint:Landroid/graphics/Paint;
 
-    iget-object v2, p0, Lcom/google/android/material/chip/ChipDrawable;->chipPaint:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, p2, v0, v1, v2}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, p2, v0, v0, v1}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
     return-void
 .end method
@@ -1411,7 +1410,7 @@
 .end method
 
 .method private drawCompatRipple(Landroid/graphics/Canvas;Landroid/graphics/Rect;)V
-    .locals 3
+    .locals 2
     .param p1    # Landroid/graphics/Canvas;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -1437,11 +1436,9 @@
 
     iget v0, p0, Lcom/google/android/material/chip/ChipDrawable;->chipCornerRadius:F
 
-    iget v1, p0, Lcom/google/android/material/chip/ChipDrawable;->chipCornerRadius:F
+    iget-object v1, p0, Lcom/google/android/material/chip/ChipDrawable;->chipPaint:Landroid/graphics/Paint;
 
-    iget-object v2, p0, Lcom/google/android/material/chip/ChipDrawable;->chipPaint:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, p2, v0, v1, v2}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, p2, v0, v0, v1}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
     return-void
 .end method
@@ -1457,8 +1454,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipDrawable;->debugPaint:Landroid/graphics/Paint;
-
     const/high16 v1, -0x1000000
 
     const/16 v2, 0x7f
@@ -1682,8 +1677,6 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipDrawable;->unicodeWrappedText:Ljava/lang/CharSequence;
-
     iget-object v2, p0, Lcom/google/android/material/chip/ChipDrawable;->textPaint:Landroid/text/TextPaint;
 
     iget-object v3, p0, Lcom/google/android/material/chip/ChipDrawable;->rectF:Landroid/graphics/RectF;
@@ -1698,9 +1691,14 @@
 
     move-result-object v0
 
+    move-object v3, v0
+
+    goto :goto_1
+
     :cond_3
     move-object v3, v0
 
+    :goto_1
     const/4 v4, 0x0
 
     invoke-interface {v3}, Ljava/lang/CharSequence;->length()I
@@ -1767,8 +1765,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipDrawable;->colorFilter:Landroid/graphics/ColorFilter;
-
     return-object v0
 
     :cond_0
@@ -2011,25 +2007,28 @@
 
     packed-switch p3, :pswitch_data_0
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     sget-object p3, Landroid/text/TextUtils$TruncateAt;->END:Landroid/text/TextUtils$TruncateAt;
 
+    invoke-virtual {p0, p3}, Lcom/google/android/material/chip/ChipDrawable;->setEllipsize(Landroid/text/TextUtils$TruncateAt;)V
+
     goto :goto_0
 
     :pswitch_1
     sget-object p3, Landroid/text/TextUtils$TruncateAt;->MIDDLE:Landroid/text/TextUtils$TruncateAt;
 
+    invoke-virtual {p0, p3}, Lcom/google/android/material/chip/ChipDrawable;->setEllipsize(Landroid/text/TextUtils$TruncateAt;)V
+
     goto :goto_0
 
     :pswitch_2
     sget-object p3, Landroid/text/TextUtils$TruncateAt;->START:Landroid/text/TextUtils$TruncateAt;
 
-    :goto_0
     invoke-virtual {p0, p3}, Lcom/google/android/material/chip/ChipDrawable;->setEllipsize(Landroid/text/TextUtils$TruncateAt;)V
 
-    :goto_1
+    :goto_0
     sget p3, Lcom/google/android/material/R$styleable;->Chip_chipIconVisible:I
 
     invoke-virtual {p2, p3, v6}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
@@ -2340,8 +2339,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/chip/ChipDrawable;->chipBackgroundColor:Landroid/content/res/ColorStateList;
-
     iget v3, p0, Lcom/google/android/material/chip/ChipDrawable;->currentChipBackgroundColor:I
 
     invoke-virtual {v1, p1, v3}, Landroid/content/res/ColorStateList;->getColorForState([II)I
@@ -2369,8 +2366,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/material/chip/ChipDrawable;->chipStrokeColor:Landroid/content/res/ColorStateList;
-
     iget v3, p0, Lcom/google/android/material/chip/ChipDrawable;->currentChipStrokeColor:I
 
     invoke-virtual {v1, p1, v3}, Landroid/content/res/ColorStateList;->getColorForState([II)I
@@ -2396,8 +2391,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/material/chip/ChipDrawable;->compatRippleColor:Landroid/content/res/ColorStateList;
-
     iget v3, p0, Lcom/google/android/material/chip/ChipDrawable;->currentCompatRippleColor:I
 
     invoke-virtual {v1, p1, v3}, Landroid/content/res/ColorStateList;->getColorForState([II)I
@@ -2427,8 +2420,6 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/material/chip/ChipDrawable;->textAppearance:Lcom/google/android/material/resources/TextAppearance;
-
     iget-object v1, v1, Lcom/google/android/material/resources/TextAppearance;->textColor:Landroid/content/res/ColorStateList;
 
     if-eqz v1, :cond_6
@@ -2513,6 +2504,10 @@
     :cond_9
     const/4 v0, 0x1
 
+    const/4 v1, 0x0
+
+    goto :goto_5
+
     :cond_a
     const/4 v1, 0x0
 
@@ -2521,11 +2516,9 @@
 
     if-eqz v3, :cond_b
 
-    iget-object v2, p0, Lcom/google/android/material/chip/ChipDrawable;->tint:Landroid/content/res/ColorStateList;
+    iget v2, p0, Lcom/google/android/material/chip/ChipDrawable;->currentTint:I
 
-    iget v3, p0, Lcom/google/android/material/chip/ChipDrawable;->currentTint:I
-
-    invoke-virtual {v2, p1, v3}, Landroid/content/res/ColorStateList;->getColorForState([II)I
+    invoke-virtual {v3, p1, v2}, Landroid/content/res/ColorStateList;->getColorForState([II)I
 
     move-result v2
 
@@ -2848,7 +2841,7 @@
 
     move-result v1
 
-    if-nez v1, :cond_3
+    if-nez v1, :cond_4
 
     invoke-virtual {p0}, Lcom/google/android/material/chip/ChipDrawable;->getAlpha()I
 
@@ -2920,6 +2913,9 @@
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     :cond_3
+    return-void
+
+    :cond_4
     :goto_0
     return-void
 .end method
@@ -2977,8 +2973,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipDrawable;->chipIcon:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0}, Landroidx/core/graphics/drawable/DrawableCompat;->unwrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -3064,8 +3058,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipDrawable;->closeIcon:Landroid/graphics/drawable/Drawable;
-
     invoke-static {v0}, Landroidx/core/graphics/drawable/DrawableCompat;->unwrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$LayoutParams.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$LayoutParams.smali
index 0591dc1d33..32838eec9f 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$LayoutParams.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$LayoutParams.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/chip/ChipGroup$LayoutParams;
 .super Landroid/view/ViewGroup$MarginLayoutParams;
+.source "ChipGroup.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$OnCheckedChangeListener.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$OnCheckedChangeListener.smali
index fafbfdeb48..3f30ae9698 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$OnCheckedChangeListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$OnCheckedChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/chip/ChipGroup$OnCheckedChangeListener;
 .super Ljava/lang/Object;
+.source "ChipGroup.java"
 
 
 # annotations
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 d5221530b6..2b9e2c7880 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/chip/ChipGroup$a;
 .super Ljava/lang/Object;
+.source "ChipGroup.java"
 
 # interfaces
 .implements Landroid/widget/CompoundButton$OnCheckedChangeListener;
@@ -89,9 +90,7 @@
 
     iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->buu:Lcom/google/android/material/chip/ChipGroup;
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$a;->buu:Lcom/google/android/material/chip/ChipGroup;
-
-    invoke-static {v0}, Lcom/google/android/material/chip/ChipGroup;->access$400(Lcom/google/android/material/chip/ChipGroup;)I
+    invoke-static {p2}, Lcom/google/android/material/chip/ChipGroup;->access$400(Lcom/google/android/material/chip/ChipGroup;)I
 
     move-result v0
 
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 423e385407..2562e1a0ae 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/chip/ChipGroup$b;
 .super Ljava/lang/Object;
+.source "ChipGroup.java"
 
 # interfaces
 .implements Landroid/view/ViewGroup$OnHierarchyChangeListener;
@@ -108,8 +109,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->buv:Landroid/view/ViewGroup$OnHierarchyChangeListener;
-
     invoke-interface {v0, p1, p2}, Landroid/view/ViewGroup$OnHierarchyChangeListener;->onChildViewAdded(Landroid/view/View;Landroid/view/View;)V
 
     :cond_3
@@ -140,8 +139,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->buv:Landroid/view/ViewGroup$OnHierarchyChangeListener;
-
     invoke-interface {v0, p1, p2}, Landroid/view/ViewGroup$OnHierarchyChangeListener;->onChildViewRemoved(Landroid/view/View;Landroid/view/View;)V
 
     :cond_1
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup.smali
index c99d033a7c..c60867b11a 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/chip/ChipGroup;
 .super Lcom/google/android/material/internal/FlowLayout;
+.source "ChipGroup.java"
 
 
 # annotations
@@ -212,7 +213,7 @@
 .end method
 
 .method private setCheckedId(I)V
-    .locals 1
+    .locals 2
 
     iput p1, p0, Lcom/google/android/material/chip/ChipGroup;->checkedId:I
 
@@ -220,11 +221,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/google/android/material/chip/ChipGroup;->singleSelection:Z
+    iget-boolean v1, p0, Lcom/google/android/material/chip/ChipGroup;->singleSelection:Z
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup;->onCheckedChangeListener:Lcom/google/android/material/chip/ChipGroup$OnCheckedChangeListener;
+    if-eqz v1, :cond_0
 
     invoke-interface {v0, p0, p1}, Lcom/google/android/material/chip/ChipGroup$OnCheckedChangeListener;->onCheckedChanged(Lcom/google/android/material/chip/ChipGroup;I)V
 
@@ -288,11 +287,9 @@
 
     if-eq v1, v2, :cond_0
 
-    iget-boolean v1, p0, Lcom/google/android/material/chip/ChipGroup;->singleSelection:Z
+    iget-boolean v2, p0, Lcom/google/android/material/chip/ChipGroup;->singleSelection:Z
 
-    if-eqz v1, :cond_0
-
-    iget v1, p0, Lcom/google/android/material/chip/ChipGroup;->checkedId:I
+    if-eqz v2, :cond_0
 
     const/4 v2, 0x0
 
@@ -325,17 +322,13 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/material/chip/ChipGroup;->checkedId:I
-
     const/4 v1, -0x1
 
     if-eq v0, v1, :cond_1
 
-    iget-boolean v0, p0, Lcom/google/android/material/chip/ChipGroup;->singleSelection:Z
+    iget-boolean v2, p0, Lcom/google/android/material/chip/ChipGroup;->singleSelection:Z
 
-    if-eqz v0, :cond_1
-
-    iget v0, p0, Lcom/google/android/material/chip/ChipGroup;->checkedId:I
+    if-eqz v2, :cond_1
 
     const/4 v2, 0x0
 
@@ -516,8 +509,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/chip/ChipGroup;->checkedId:I
-
     const/4 v1, 0x1
 
     invoke-direct {p0, v0, v1}, Lcom/google/android/material/chip/ChipGroup;->setCheckedStateForView(IZ)V
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 eb183a6e61..ef852203ce 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/circularreveal/CircularRevealCompat$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "CircularRevealCompat.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat.smali
index ec78f4fbe2..4c55561088 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/circularreveal/CircularRevealCompat;
 .super Ljava/lang/Object;
+.source "CircularRevealCompat.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealFrameLayout.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealFrameLayout.smali
index 5385b7bf10..ad02bfc167 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealFrameLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealFrameLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealFrameLayout;
 .super Landroid/widget/FrameLayout;
+.source "CircularRevealFrameLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/circularreveal/CircularRevealWidget;
@@ -86,8 +87,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealFrameLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->draw(Landroid/graphics/Canvas;)V
 
     return-void
@@ -145,8 +144,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealFrameLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->isOpaque()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealGridLayout.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealGridLayout.smali
index 8fbb90ebe5..1977c2d1cb 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealGridLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealGridLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealGridLayout;
 .super Landroid/widget/GridLayout;
+.source "CircularRevealGridLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/circularreveal/CircularRevealWidget;
@@ -81,8 +82,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealGridLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->draw(Landroid/graphics/Canvas;)V
 
     return-void
@@ -140,8 +139,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealGridLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->isOpaque()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper$Delegate.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper$Delegate.smali
index e1acd36cde..e9cd1731e2 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper$Delegate.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper$Delegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/circularreveal/CircularRevealHelper$Delegate;
 .super Ljava/lang/Object;
+.source "CircularRevealHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper.smali
index ccef562070..e68d6648bc 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealHelper.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealHelper;
 .super Ljava/lang/Object;
+.source "CircularRevealHelper.java"
 
 
 # annotations
@@ -63,7 +64,6 @@
 
     const/4 v0, 0x2
 
-    :goto_0
     sput v0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->STRATEGY:I
 
     return-void
@@ -77,12 +77,16 @@
 
     const/4 v0, 0x1
 
-    goto :goto_0
+    sput v0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->STRATEGY:I
+
+    return-void
 
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    sput v0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->STRATEGY:I
+
+    return-void
 .end method
 
 .method public constructor <init>(Lcom/google/android/material/circularreveal/CircularRevealHelper$Delegate;)V
@@ -333,11 +337,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealPath:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealPath:Landroid/graphics/Path;
 
-    iget-object v1, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealInfo:Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
-
-    iget v1, v1, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->centerX:F
+    iget v0, v0, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->centerX:F
 
     iget-object v2, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealInfo:Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
 
@@ -349,7 +351,7 @@
 
     sget-object v4, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
-    invoke-virtual {v0, v1, v2, v3, v4}, Landroid/graphics/Path;->addCircle(FFFLandroid/graphics/Path$Direction;)V
+    invoke-virtual {v1, v0, v2, v3, v4}, Landroid/graphics/Path;->addCircle(FFFLandroid/graphics/Path$Direction;)V
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->view:Landroid/view/View;
@@ -370,8 +372,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealInfo:Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
-
     invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->isInvalid()Z
 
     move-result v0
@@ -634,7 +634,33 @@
 
     if-eqz v0, :cond_2
 
-    goto :goto_0
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->view:Landroid/view/View;
+
+    invoke-virtual {v0}, Landroid/view/View;->getWidth()I
+
+    move-result v0
+
+    int-to-float v4, v0
+
+    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->view:Landroid/view/View;
+
+    invoke-virtual {v0}, Landroid/view/View;->getHeight()I
+
+    move-result v0
+
+    int-to-float v5, v0
+
+    iget-object v6, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->scrimPaint:Landroid/graphics/Paint;
+
+    move-object v1, p1
+
+    invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    goto/16 :goto_0
 
     :pswitch_1
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
@@ -684,7 +710,7 @@
     :cond_0
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_2
     iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealInfo:Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
@@ -725,7 +751,7 @@
 
     invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->delegate:Lcom/google/android/material/circularreveal/CircularRevealHelper$Delegate;
@@ -738,7 +764,6 @@
 
     if-eqz v0, :cond_2
 
-    :goto_0
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -766,13 +791,11 @@
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
     :cond_2
-    :goto_1
+    :goto_0
     invoke-direct {p0, p1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->drawOverlayDrawable(Landroid/graphics/Canvas;)V
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_2
@@ -819,26 +842,24 @@
     return-object v0
 
     :cond_0
-    new-instance v0, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
+    new-instance v1, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
 
-    iget-object v1, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealInfo:Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
+    invoke-direct {v1, v0}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;-><init>(Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;)V
 
-    invoke-direct {v0, v1}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;-><init>(Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;)V
+    invoke-virtual {v1}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->isInvalid()Z
 
-    invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->isInvalid()Z
+    move-result v0
 
-    move-result v1
+    if-eqz v0, :cond_1
 
-    if-eqz v1, :cond_1
+    invoke-direct {p0, v1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->getDistanceToFurthestCorner(Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;)F
 
-    invoke-direct {p0, v0}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->getDistanceToFurthestCorner(Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;)F
+    move-result v0
 
-    move-result v1
-
-    iput v1, v0, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->radius:F
+    iput v0, v1, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->radius:F
 
     :cond_1
-    return-object v0
+    return-object v1
 .end method
 
 .method public isOpaque()Z
@@ -931,8 +952,6 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealHelper;->revealInfo:Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->set(Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;)V
 
     :goto_0
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealLinearLayout.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealLinearLayout.smali
index 4b0cd15330..0ccaca1ff6 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealLinearLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealLinearLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealLinearLayout;
 .super Landroid/widget/LinearLayout;
+.source "CircularRevealLinearLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/circularreveal/CircularRevealWidget;
@@ -81,8 +82,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealLinearLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->draw(Landroid/graphics/Canvas;)V
 
     return-void
@@ -140,8 +139,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealLinearLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->isOpaque()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealRelativeLayout.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealRelativeLayout.smali
index 279edaff0b..46f751b690 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealRelativeLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealRelativeLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealRelativeLayout;
 .super Landroid/widget/RelativeLayout;
+.source "CircularRevealRelativeLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/circularreveal/CircularRevealWidget;
@@ -81,8 +82,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealRelativeLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->draw(Landroid/graphics/Canvas;)V
 
     return-void
@@ -140,8 +139,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/CircularRevealRelativeLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->isOpaque()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$1.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$1.smali
index e468f4189f..7cfd4ee947 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/google/android/material/circularreveal/CircularRevealWidget$1;
 .super Ljava/lang/Object;
+.source "CircularRevealWidget.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealEvaluator.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealEvaluator.smali
index 01f69c4aa1..9e83b24224 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealEvaluator.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealEvaluator.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealWidget$CircularRevealEvaluator;
 .super Ljava/lang/Object;
+.source "CircularRevealWidget.java"
 
 # interfaces
 .implements Landroid/animation/TypeEvaluator;
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealProperty.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealProperty.smali
index 3451d1e9f8..7b8ccbe149 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealProperty.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealProperty.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealWidget$CircularRevealProperty;
 .super Landroid/util/Property;
+.source "CircularRevealWidget.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealScrimColorProperty.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealScrimColorProperty.smali
index 9551b0fa67..fbfc9032e3 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealScrimColorProperty.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$CircularRevealScrimColorProperty.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealWidget$CircularRevealScrimColorProperty;
 .super Landroid/util/Property;
+.source "CircularRevealWidget.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$RevealInfo.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$RevealInfo.smali
index 4cb24c5888..7ddb9970d5 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$RevealInfo.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget$RevealInfo.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
 .super Ljava/lang/Object;
+.source "CircularRevealWidget.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget.smali
index ec79dc005c..d1a7c0b1b1 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealWidget.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/circularreveal/CircularRevealWidget;
 .super Ljava/lang/Object;
+.source "CircularRevealWidget.java"
 
 # interfaces
 .implements Lcom/google/android/material/circularreveal/CircularRevealHelper$Delegate;
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/cardview/CircularRevealCardView.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/cardview/CircularRevealCardView.smali
index 37c96e617a..29b215d09f 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/cardview/CircularRevealCardView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/cardview/CircularRevealCardView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/cardview/CircularRevealCardView;
 .super Landroidx/cardview/widget/CardView;
+.source "CircularRevealCardView.java"
 
 # interfaces
 .implements Lcom/google/android/material/circularreveal/CircularRevealWidget;
@@ -81,8 +82,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/cardview/CircularRevealCardView;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->draw(Landroid/graphics/Canvas;)V
 
     return-void
@@ -140,8 +139,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/cardview/CircularRevealCardView;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->isOpaque()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout.smali
index 03a9a51621..dcc0dbd30b 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout;
 .super Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.source "CircularRevealCoordinatorLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/circularreveal/CircularRevealWidget;
@@ -81,8 +82,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->draw(Landroid/graphics/Canvas;)V
 
     return-void
@@ -140,8 +139,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout;->helper:Lcom/google/android/material/circularreveal/CircularRevealHelper;
-
     invoke-virtual {v0}, Lcom/google/android/material/circularreveal/CircularRevealHelper;->isOpaque()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/android/material/drawable/DrawableUtils.smali b/com.discord/smali_classes2/com/google/android/material/drawable/DrawableUtils.smali
index c912d1c2a1..473e8eb799 100644
--- a/com.discord/smali_classes2/com/google/android/material/drawable/DrawableUtils.smali
+++ b/com.discord/smali_classes2/com/google/android/material/drawable/DrawableUtils.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/drawable/DrawableUtils;
 .super Ljava/lang/Object;
+.source "DrawableUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableTransformationWidget.smali b/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableTransformationWidget.smali
index f2a6b5d303..510a9735e5 100644
--- a/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableTransformationWidget.smali
+++ b/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableTransformationWidget.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/expandable/ExpandableTransformationWidget;
 .super Ljava/lang/Object;
+.source "ExpandableTransformationWidget.java"
 
 # interfaces
 .implements Lcom/google/android/material/expandable/ExpandableWidget;
diff --git a/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidget.smali b/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidget.smali
index 1d9e89ea3d..f483e97aa9 100644
--- a/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidget.smali
+++ b/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidget.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/expandable/ExpandableWidget;
 .super Ljava/lang/Object;
+.source "ExpandableWidget.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidgetHelper.smali b/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidgetHelper.smali
index bb991cd393..e76a8d4208 100644
--- a/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidgetHelper.smali
+++ b/com.discord/smali_classes2/com/google/android/material/expandable/ExpandableWidgetHelper.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/expandable/ExpandableWidgetHelper;
 .super Ljava/lang/Object;
+.source "ExpandableWidgetHelper.java"
 
 
 # instance fields
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 650c1460b3..abcca1b65a 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;
 .super Ljava/lang/Object;
+.source "FloatingActionButton.java"
 
 # interfaces
 .implements Lcom/google/android/material/floatingactionbutton/a$d;
@@ -37,7 +38,7 @@
 
 
 # virtual methods
-.method public final Bd()V
+.method public final Bc()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->bux:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
@@ -49,7 +50,7 @@
     return-void
 .end method
 
-.method public final Be()V
+.method public final Bd()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->bux:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$BaseBehavior.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$BaseBehavior.smali
index 6774208c6e..231c0a2669 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$BaseBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$BaseBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/floatingactionbutton/FloatingActionButton$BaseBehavior;
 .super Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+.source "FloatingActionButton.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$Behavior.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$Behavior.smali
index 269326b746..a3fd3f150f 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$Behavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$Behavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/floatingactionbutton/FloatingActionButton$Behavior;
 .super Lcom/google/android/material/floatingactionbutton/FloatingActionButton$BaseBehavior;
+.source "FloatingActionButton.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener.smali
index 82e7599fea..dab292bfad 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 .super Ljava/lang/Object;
+.source "FloatingActionButton.java"
 
 
 # annotations
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 0cd65b0f54..fefa7ca0cc 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;
 .super Ljava/lang/Object;
+.source "FloatingActionButton.java"
 
 # interfaces
 .implements Lcom/google/android/material/shadow/ShadowViewDelegate;
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 a68a997061..e078cba818 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 .super Lcom/google/android/material/internal/VisibilityAwareImageButton;
+.source "FloatingActionButton.java"
 
 # interfaces
 .implements Landroidx/core/view/TintableBackgroundView;
@@ -301,7 +302,7 @@
 
     iput p3, p2, Lcom/google/android/material/floatingactionbutton/a;->maxImageSize:I
 
-    invoke-virtual {p2}, Lcom/google/android/material/floatingactionbutton/a;->Bf()V
+    invoke-virtual {p2}, Lcom/google/android/material/floatingactionbutton/a;->Be()V
 
     :cond_0
     invoke-direct {p0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getImpl()Lcom/google/android/material/floatingactionbutton/a;
@@ -399,9 +400,7 @@
 
     if-eqz v1, :cond_0
 
-    iget p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->customSize:I
-
-    return p1
+    return v1
 
     :cond_0
     invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getResources()Landroid/content/res/Resources;
@@ -416,7 +415,6 @@
 
     sget p1, Lcom/google/android/material/R$dimen;->design_fab_size_normal:I
 
-    :goto_1
     invoke-virtual {v1, p1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result p1
@@ -426,7 +424,11 @@
     :cond_1
     sget p1, Lcom/google/android/material/R$dimen;->design_fab_size_mini:I
 
-    goto :goto_1
+    invoke-virtual {v1, p1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+
+    move-result p1
+
+    return p1
 
     :cond_2
     invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
@@ -530,8 +532,6 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->imageTint:Landroid/content/res/ColorStateList;
-
     invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getDrawableState()[I
 
     move-result-object v2
@@ -894,8 +894,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->rippleColor:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->getDefaultColor()I
 
     move-result v0
@@ -1056,7 +1054,7 @@
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bn()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bm()Z
 
     move-result v1
 
@@ -1154,7 +1152,7 @@
 
     if-eqz p1, :cond_6
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Be()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Bd()V
 
     :cond_6
     return-void
@@ -1209,7 +1207,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bg()V
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bf()V
 
     return-void
 .end method
@@ -1223,7 +1221,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bj()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bi()Z
 
     move-result v1
 
@@ -1304,7 +1302,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/material/floatingactionbutton/a;->Bi()V
+    invoke-virtual {v1}, Lcom/google/android/material/floatingactionbutton/a;->Bh()V
 
     invoke-static {v0, p1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->resolveAdjustedSize(II)I
 
@@ -1798,7 +1796,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->Bf()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->Be()V
 
     return-void
 .end method
@@ -1984,7 +1982,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->Bh()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->Bg()V
 
     :cond_0
     return-void
@@ -2040,7 +2038,7 @@
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bn()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Bm()Z
 
     move-result v1
 
@@ -2169,7 +2167,7 @@
 
     if-eqz p1, :cond_6
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Bd()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Bc()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 e2a7d3998c..e9b60f459c 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/a$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -59,17 +60,13 @@
 
     iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->buA:I
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->buY:Lcom/google/android/material/floatingactionbutton/a;
-
     const/4 v0, 0x0
 
     iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->buB:Landroid/animation/Animator;
 
-    iget-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->cancelled:Z
+    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->cancelled:Z
 
-    if-nez p1, :cond_1
-
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->buY:Lcom/google/android/material/floatingactionbutton/a;
+    if-nez v0, :cond_1
 
     iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->buS:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
@@ -93,9 +90,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->buX:Lcom/google/android/material/floatingactionbutton/a$d;
-
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Be()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Bd()V
 
     :cond_1
     return-void
@@ -120,8 +115,6 @@
 
     iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->buA:I
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->buY:Lcom/google/android/material/floatingactionbutton/a;
-
     iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->buB: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 15be1af36f..a17f3fce58 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/a$2;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -47,8 +48,6 @@
 
     iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->buA:I
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->buY:Lcom/google/android/material/floatingactionbutton/a;
-
     const/4 v0, 0x0
 
     iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->buB:Landroid/animation/Animator;
@@ -57,9 +56,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->buX:Lcom/google/android/material/floatingactionbutton/a$d;
-
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Bd()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Bc()V
 
     :cond_0
     return-void
@@ -84,8 +81,6 @@
 
     iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->buA:I
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->buY:Lcom/google/android/material/floatingactionbutton/a;
-
     iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->buB:Landroid/animation/Animator;
 
     return-void
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 862b12af35..8698dfcb03 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/a$3;
 .super Ljava/lang/Object;
+.source "FloatingActionButtonImpl.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnPreDrawListener;
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 f7487e8809..023e75a83c 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/a$a;
 .super Lcom/google/android/material/floatingactionbutton/a$f;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
 
 
 # virtual methods
-.method protected final Bo()F
+.method protected final Bn()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 f8d580e03e..e66f768a80 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/a$b;
 .super Lcom/google/android/material/floatingactionbutton/a$f;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
 
 
 # virtual methods
-.method protected final Bo()F
+.method protected final Bn()F
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$b;->buY:Lcom/google/android/material/floatingactionbutton/a;
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 c6fc00e6ae..3b48250042 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/a$c;
 .super Lcom/google/android/material/floatingactionbutton/a$f;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
 
 
 # virtual methods
-.method protected final Bo()F
+.method protected final Bn()F
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$c;->buY:Lcom/google/android/material/floatingactionbutton/a;
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 00333d7399..d0269819b5 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
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/material/floatingactionbutton/a$d;
 .super Ljava/lang/Object;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -14,8 +15,8 @@
 
 
 # virtual methods
-.method public abstract Bd()V
+.method public abstract Bc()V
 .end method
 
-.method public abstract Be()V
+.method public abstract Bd()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 e9c7b9f6d0..39f2af90fc 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/a$e;
 .super Lcom/google/android/material/floatingactionbutton/a$f;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
 
 
 # virtual methods
-.method protected final Bo()F
+.method protected final Bn()F
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$e;->buY:Lcom/google/android/material/floatingactionbutton/a;
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 5923ed38b2..304fe1f9c7 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
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/material/floatingactionbutton/a$f;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FloatingActionButtonImpl.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
@@ -47,7 +48,7 @@
 
 
 # virtual methods
-.method protected abstract Bo()F
+.method protected abstract Bn()F
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
@@ -69,7 +70,7 @@
 .end method
 
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
-    .locals 4
+    .locals 3
 
     iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->buZ:Z
 
@@ -85,7 +86,7 @@
 
     iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->bva:F
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->Bo()F
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->Bn()F
 
     move-result v0
 
@@ -104,9 +105,7 @@
 
     iget v2, p0, Lcom/google/android/material/floatingactionbutton/a$f;->bvb:F
 
-    iget v3, p0, Lcom/google/android/material/floatingactionbutton/a$f;->bva:F
-
-    sub-float/2addr v2, v3
+    sub-float/2addr v2, v1
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedFraction()F
 
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 b9a24fa8fe..fc1c0c3ce4 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
@@ -1,5 +1,6 @@
 .class Lcom/google/android/material/floatingactionbutton/a;
 .super Ljava/lang/Object;
+.source "FloatingActionButtonImpl.java"
 
 
 # annotations
@@ -421,13 +422,11 @@
 
     iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->maxImageSize:I
 
+    int-to-float v3, v0
+
     int-to-float v0, v0
 
-    iget v3, p0, Lcom/google/android/material/floatingactionbutton/a;->maxImageSize:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v2, v4, v4, v0, v3}, Landroid/graphics/RectF;->set(FFFF)V
+    invoke-virtual {v2, v4, v4, v3, v0}, Landroid/graphics/RectF;->set(FFFF)V
 
     sget-object v0, Landroid/graphics/Matrix$ScaleToFit;->CENTER:Landroid/graphics/Matrix$ScaleToFit;
 
@@ -435,19 +434,17 @@
 
     iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->maxImageSize:I
 
+    int-to-float v1, v0
+
+    const/high16 v2, 0x40000000    # 2.0f
+
+    div-float/2addr v1, v2
+
     int-to-float v0, v0
 
-    const/high16 v1, 0x40000000    # 2.0f
+    div-float/2addr v0, v2
 
-    div-float/2addr v0, v1
-
-    iget v2, p0, Lcom/google/android/material/floatingactionbutton/a;->maxImageSize:I
-
-    int-to-float v2, v2
-
-    div-float/2addr v2, v1
-
-    invoke-virtual {p2, p1, p1, v0, v2}, Landroid/graphics/Matrix;->postScale(FFFF)Z
+    invoke-virtual {p2, p1, p1, v1, v0}, Landroid/graphics/Matrix;->postScale(FFFF)Z
 
     :cond_0
     return-void
@@ -455,7 +452,7 @@
 
 
 # virtual methods
-.method final Bf()V
+.method final Be()V
     .locals 1
 
     iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->buM:F
@@ -465,7 +462,7 @@
     return-void
 .end method
 
-.method Bg()V
+.method Bf()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->buE:Lcom/google/android/material/internal/StateListAnimator;
@@ -475,13 +472,13 @@
     return-void
 .end method
 
-.method Bh()V
+.method Bg()V
     .locals 0
 
     return-void
 .end method
 
-.method final Bi()V
+.method final Bh()V
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->tmpRect:Landroid/graphics/Rect;
@@ -505,7 +502,7 @@
     return-void
 .end method
 
-.method Bj()Z
+.method Bi()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -513,7 +510,7 @@
     return v0
 .end method
 
-.method Bk()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method Bj()Lcom/google/android/material/internal/CircularBorderDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/internal/CircularBorderDrawable;
@@ -523,10 +520,10 @@
     return-object v0
 .end method
 
-.method final Bl()Landroid/graphics/drawable/GradientDrawable;
+.method final Bk()Landroid/graphics/drawable/GradientDrawable;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Bm()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Bl()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -541,7 +538,7 @@
     return-object v0
 .end method
 
-.method Bm()Landroid/graphics/drawable/GradientDrawable;
+.method Bl()Landroid/graphics/drawable/GradientDrawable;
     .locals 1
 
     new-instance v0, Landroid/graphics/drawable/GradientDrawable;
@@ -551,7 +548,7 @@
     return-object v0
 .end method
 
-.method final Bn()Z
+.method final Bm()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->buS:Lcom/google/android/material/internal/VisibilityAwareImageButton;
@@ -719,7 +716,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Bk()Lcom/google/android/material/internal/CircularBorderDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Bj()Lcom/google/android/material/internal/CircularBorderDrawable;
 
     move-result-object v1
 
@@ -761,7 +758,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;->Bl()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Bk()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -782,7 +779,7 @@
     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;->Bl()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Bk()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object p2
 
@@ -800,9 +797,9 @@
 
     invoke-static {p2, p3}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
-    const/4 p2, 0x2
+    const/4 p2, 0x1
 
-    const/4 p3, 0x1
+    const/4 p3, 0x2
 
     const/4 v0, 0x0
 
@@ -824,11 +821,11 @@
 
     iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->buG:Landroid/graphics/drawable/Drawable;
 
-    aput-object p4, p1, p3
+    aput-object p4, p1, p2
 
-    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->buH:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->buH:Landroid/graphics/drawable/Drawable;
 
-    aput-object p3, p1, p2
+    aput-object p2, p1, p3
 
     goto :goto_0
 
@@ -837,15 +834,15 @@
 
     iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->buI:Lcom/google/android/material/internal/CircularBorderDrawable;
 
-    new-array p1, p2, [Landroid/graphics/drawable/Drawable;
+    new-array p1, p3, [Landroid/graphics/drawable/Drawable;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->buG:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->buG:Landroid/graphics/drawable/Drawable;
 
-    aput-object p2, p1, v0
+    aput-object p3, p1, v0
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->buH:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->buH:Landroid/graphics/drawable/Drawable;
 
-    aput-object p2, p1, p3
+    aput-object p3, p1, p2
 
     :goto_0
     new-instance p2, Landroid/graphics/drawable/LayerDrawable;
@@ -872,11 +869,9 @@
 
     iget v5, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget p2, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
+    iget p2, p0, Lcom/google/android/material/floatingactionbutton/a;->buL:F
 
-    iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->buL:F
-
-    add-float v6, p2, p3
+    add-float v6, v5, p2
 
     move-object v1, p1
 
@@ -904,15 +899,13 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->buF:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
-
     iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->buL: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;->Bi()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Bh()V
 
     :cond_0
     return-void
@@ -1102,8 +1095,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->buH:Landroid/graphics/drawable/Drawable;
-
     invoke-static {p1}, Lcom/google/android/material/ripple/RippleUtils;->convertToRippleDrawableColor(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
 
     move-result-object p1
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b$a.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b$a.smali
index f35f8d2d45..b681fead53 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/b$a;
 .super Landroid/graphics/drawable/GradientDrawable;
+.source "FloatingActionButtonImplLollipop.java"
 
 
 # annotations
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 2aa1ac2a29..de2fb7a98a 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/floatingactionbutton/b;
 .super Lcom/google/android/material/floatingactionbutton/a;
+.source "FloatingActionButtonImplLollipop.java"
 
 
 # annotations
@@ -91,21 +92,21 @@
 
 
 # virtual methods
+.method final Bf()V
+    .locals 0
+
+    return-void
+.end method
+
 .method final Bg()V
     .locals 0
 
-    return-void
-.end method
-
-.method final Bh()V
-    .locals 0
-
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Bi()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Bh()V
 
     return-void
 .end method
 
-.method final Bj()Z
+.method final Bi()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -113,7 +114,7 @@
     return v0
 .end method
 
-.method final Bk()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method final Bj()Lcom/google/android/material/internal/CircularBorderDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/internal/CircularBorderDrawableLollipop;
@@ -123,7 +124,7 @@
     return-object v0
 .end method
 
-.method final Bm()Landroid/graphics/drawable/GradientDrawable;
+.method final Bl()Landroid/graphics/drawable/GradientDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/b$a;
@@ -136,7 +137,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;->Bl()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Bk()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -400,7 +401,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Bi()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Bh()V
 
     :cond_2
     return-void
@@ -502,7 +503,6 @@
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->bvc:Landroid/graphics/drawable/InsetDrawable;
 
-    :goto_0
     invoke-interface {p1, v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     return-void
@@ -512,7 +512,9 @@
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->buH:Landroid/graphics/drawable/Drawable;
 
-    goto :goto_0
+    invoke-interface {p1, v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+
+    return-void
 .end method
 
 .method final g([I)V
@@ -552,7 +554,6 @@
 
     iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->buL:F
 
-    :goto_0
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
 
     return-void
@@ -574,20 +575,24 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->buS:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    goto :goto_0
+    invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
+
+    return-void
 
     :cond_2
-    :goto_1
+    :goto_0
     iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->buS:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->buK:F
 
-    goto :goto_0
+    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;->buS:Lcom/google/android/material/internal/VisibilityAwareImageButton;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/BaselineLayout.smali b/com.discord/smali_classes2/com/google/android/material/internal/BaselineLayout.smali
index 498b0bb7b6..fc62cf6d2b 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/BaselineLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/BaselineLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/BaselineLayout;
 .super Landroid/view/ViewGroup;
+.source "BaselineLayout.java"
 
 
 # instance fields
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 5be144ef16..1ed0438094 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/CheckableImageButton$1;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "CheckableImageButton.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton.smali b/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton.smali
index 5ba169d94e..c8859aa96d 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/CheckableImageButton;
 .super Landroidx/appcompat/widget/AppCompatImageButton;
+.source "CheckableImageButton.java"
 
 # interfaces
 .implements Landroid/widget/Checkable;
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 7e1e78866a..48340a1f4c 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/CircularBorderDrawable$a;
 .super Landroid/graphics/drawable/Drawable$ConstantState;
+.source "CircularBorderDrawable.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable.smali b/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable.smali
index 26f7972ad8..6a539045cc 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/CircularBorderDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "CircularBorderDrawable.java"
 
 
 # annotations
@@ -407,8 +408,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CircularBorderDrawable;->borderTint:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->isStateful()Z
 
     move-result v0
@@ -450,8 +449,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CircularBorderDrawable;->borderTint:Landroid/content/res/ColorStateList;
-
     iget v1, p0, Lcom/google/android/material/internal/CircularBorderDrawable;->currentBorderTintColor:I
 
     invoke-virtual {v0, p1, v1}, Landroid/content/res/ColorStateList;->getColorForState([II)I
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawableLollipop.smali b/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawableLollipop.smali
index ebc5f30a2a..79bb3c68bf 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawableLollipop.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawableLollipop.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/CircularBorderDrawableLollipop;
 .super Lcom/google/android/material/internal/CircularBorderDrawable;
+.source "CircularBorderDrawableLollipop.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/CollapsingTextHelper.smali b/com.discord/smali_classes2/com/google/android/material/internal/CollapsingTextHelper.smali
index 9bd74c2a02..4331e670d6 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/CollapsingTextHelper.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/CollapsingTextHelper.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/internal/CollapsingTextHelper;
 .super Ljava/lang/Object;
+.source "CollapsingTextHelper.java"
 
 
 # annotations
@@ -304,17 +305,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
+    iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
 
-    iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
-
-    iget-object v5, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
-
-    invoke-interface {v5}, Ljava/lang/CharSequence;->length()I
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
 
     move-result v5
 
-    invoke-virtual {v1, v4, v3, v5}, Landroid/text/TextPaint;->measureText(Ljava/lang/CharSequence;II)F
+    invoke-virtual {v4, v1, v2, v5}, Landroid/text/TextPaint;->measureText(Ljava/lang/CharSequence;II)F
 
     move-result v1
 
@@ -380,7 +377,7 @@
 
     iput v9, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedDrawY:F
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     iget-object v5, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedBounds:Landroid/graphics/Rect;
@@ -389,6 +386,8 @@
 
     int-to-float v5, v5
 
+    iput v5, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedDrawY:F
+
     goto :goto_1
 
     :cond_2
@@ -406,10 +405,9 @@
 
     sub-float/2addr v5, v9
 
-    :goto_1
     iput v5, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedDrawY:F
 
-    :goto_2
+    :goto_1
     const v5, 0x800007
 
     and-int/2addr v4, v5
@@ -430,7 +428,7 @@
 
     iput v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedDrawX:F
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_3
     iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedBounds:Landroid/graphics/Rect;
@@ -439,7 +437,11 @@
 
     int-to-float v4, v4
 
-    goto :goto_3
+    sub-float/2addr v4, v1
+
+    iput v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedDrawX:F
+
+    goto :goto_2
 
     :cond_4
     iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedBounds:Landroid/graphics/Rect;
@@ -452,12 +454,11 @@
 
     div-float/2addr v1, v8
 
-    :goto_3
     sub-float/2addr v4, v1
 
     iput v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedDrawX:F
 
-    :goto_4
+    :goto_2
     iget v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTextSize:F
 
     invoke-direct {p0, v1}, Lcom/google/android/material/internal/CollapsingTextHelper;->calculateUsingTextSize(F)V
@@ -466,40 +467,36 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
+    iget-object v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
 
-    iget-object v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
-
-    iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
-
-    invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
 
     move-result v4
 
-    invoke-virtual {v1, v2, v3, v4}, Landroid/text/TextPaint;->measureText(Ljava/lang/CharSequence;II)F
+    invoke-virtual {v3, v1, v2, v4}, Landroid/text/TextPaint;->measureText(Ljava/lang/CharSequence;II)F
 
-    move-result v2
+    move-result v3
 
     :cond_5
     iget v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTextGravity:I
 
-    iget-boolean v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->isRtl:Z
+    iget-boolean v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->isRtl:Z
 
-    invoke-static {v1, v3}, Landroidx/core/view/GravityCompat;->getAbsoluteGravity(II)I
+    invoke-static {v1, v2}, Landroidx/core/view/GravityCompat;->getAbsoluteGravity(II)I
 
     move-result v1
 
-    and-int/lit8 v3, v1, 0x70
+    and-int/lit8 v2, v1, 0x70
 
-    if-eq v3, v7, :cond_7
+    if-eq v2, v7, :cond_7
 
-    if-eq v3, v6, :cond_6
+    if-eq v2, v6, :cond_6
 
-    iget-object v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
+    iget-object v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
 
-    invoke-virtual {v3}, Landroid/text/TextPaint;->descent()F
+    invoke-virtual {v2}, Landroid/text/TextPaint;->descent()F
 
-    move-result v3
+    move-result v2
 
     iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
 
@@ -507,9 +504,9 @@
 
     move-result v4
 
-    sub-float/2addr v3, v4
+    sub-float/2addr v2, v4
 
-    div-float/2addr v3, v8
+    div-float/2addr v2, v8
 
     iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
 
@@ -517,7 +514,7 @@
 
     move-result v4
 
-    sub-float/2addr v3, v4
+    sub-float/2addr v2, v4
 
     iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
 
@@ -527,27 +524,29 @@
 
     int-to-float v4, v4
 
-    add-float/2addr v4, v3
+    add-float/2addr v4, v2
 
     iput v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedDrawY:F
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_6
-    iget-object v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
 
-    iget v3, v3, Landroid/graphics/Rect;->bottom:I
+    iget v2, v2, Landroid/graphics/Rect;->bottom:I
 
-    int-to-float v3, v3
+    int-to-float v2, v2
 
-    goto :goto_5
+    iput v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedDrawY:F
+
+    goto :goto_3
 
     :cond_7
-    iget-object v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
 
-    iget v3, v3, Landroid/graphics/Rect;->top:I
+    iget v2, v2, Landroid/graphics/Rect;->top:I
 
-    int-to-float v3, v3
+    int-to-float v2, v2
 
     iget-object v4, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
 
@@ -555,12 +554,11 @@
 
     move-result v4
 
-    sub-float/2addr v3, v4
+    sub-float/2addr v2, v4
 
-    :goto_5
-    iput v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedDrawY:F
+    iput v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedDrawY:F
 
-    :goto_6
+    :goto_3
     and-int/2addr v1, v5
 
     if-eq v1, v10, :cond_9
@@ -573,10 +571,9 @@
 
     int-to-float v1, v1
 
-    :goto_7
     iput v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedDrawX:F
 
-    goto :goto_9
+    goto :goto_4
 
     :cond_8
     iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
@@ -585,7 +582,11 @@
 
     int-to-float v1, v1
 
-    goto :goto_8
+    sub-float/2addr v1, v3
+
+    iput v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedDrawX:F
+
+    goto :goto_4
 
     :cond_9
     iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
@@ -596,14 +597,13 @@
 
     int-to-float v1, v1
 
-    div-float/2addr v2, v8
+    div-float/2addr v3, v8
 
-    :goto_8
-    sub-float/2addr v1, v2
+    sub-float/2addr v1, v3
 
-    goto :goto_7
+    iput v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedDrawX:F
 
-    :goto_9
+    :goto_4
     invoke-direct {p0}, Lcom/google/android/material/internal/CollapsingTextHelper;->clearTexture()V
 
     invoke-direct {p0, v0}, Lcom/google/android/material/internal/CollapsingTextHelper;->setInterpolatedTextSize(F)V
@@ -724,10 +724,9 @@
 
     move-result v1
 
-    :goto_0
     invoke-virtual {v0, v1}, Landroid/text/TextPaint;->setColor(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
@@ -736,9 +735,9 @@
 
     move-result v1
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Landroid/text/TextPaint;->setColor(I)V
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textPaint:Landroid/text/TextPaint;
 
     iget v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedShadowRadius:F
@@ -834,9 +833,7 @@
 
     if-eq v1, v2, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedTypeface:Landroid/graphics/Typeface;
-
-    iput-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->currentTypeface:Landroid/graphics/Typeface;
+    iput-object v2, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->currentTypeface:Landroid/graphics/Typeface;
 
     const/4 v1, 0x1
 
@@ -861,9 +858,7 @@
 
     if-eq v6, v7, :cond_3
 
-    iget-object v6, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTypeface:Landroid/graphics/Typeface;
-
-    iput-object v6, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->currentTypeface:Landroid/graphics/Typeface;
+    iput-object v7, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->currentTypeface:Landroid/graphics/Typeface;
 
     const/4 v6, 0x1
 
@@ -1026,8 +1021,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTitleTexture:Landroid/graphics/Bitmap;
-
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->recycle()V
 
     const/4 v0, 0x0
@@ -1043,7 +1036,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTitleTexture:Landroid/graphics/Bitmap;
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_4
 
     iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedBounds:Landroid/graphics/Rect;
 
@@ -1051,7 +1044,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_2
+    if-nez v0, :cond_4
 
     iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
 
@@ -1061,7 +1054,7 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_0
     const/4 v0, 0x0
@@ -1090,9 +1083,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
-
-    invoke-interface {v3}, Ljava/lang/CharSequence;->length()I
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
 
     move-result v3
 
@@ -1114,7 +1105,7 @@
 
     move-result v1
 
-    if-lez v0, :cond_2
+    if-lez v0, :cond_3
 
     if-gtz v1, :cond_1
 
@@ -1139,9 +1130,7 @@
 
     const/4 v4, 0x0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
-
-    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
+    invoke-interface {v3}, Ljava/lang/CharSequence;->length()I
 
     move-result v5
 
@@ -1174,8 +1163,15 @@
     iput-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->texturePaint:Landroid/graphics/Paint;
 
     :cond_2
+    return-void
+
+    :cond_3
     :goto_0
     return-void
+
+    :cond_4
+    :goto_1
+    return-void
 .end method
 
 .method private getCurrentExpandedTextColor()I
@@ -1187,13 +1183,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTextColor:Landroid/content/res/ColorStateList;
-
-    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->state:[I
+    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTextColor:Landroid/content/res/ColorStateList;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v0, v1, v2}, Landroid/content/res/ColorStateList;->getColorForState([II)I
+    invoke-virtual {v1, v0, v2}, Landroid/content/res/ColorStateList;->getColorForState([II)I
 
     move-result v0
 
@@ -1500,9 +1494,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->text:Ljava/lang/CharSequence;
-
-    invoke-interface {v3}, Ljava/lang/CharSequence;->length()I
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
 
     move-result v3
 
@@ -1574,22 +1566,23 @@
 
     add-float/2addr v1, v3
 
+    move v7, v1
+
+    goto :goto_2
+
     :cond_2
     move v7, v1
 
+    :goto_2
     iget v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->scale:F
 
     const/high16 v3, 0x3f800000    # 1.0f
 
-    cmpl-float v1, v1, v3
+    cmpl-float v3, v1, v3
 
-    if-eqz v1, :cond_3
+    if-eqz v3, :cond_3
 
-    iget v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->scale:F
-
-    iget v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->scale:F
-
-    invoke-virtual {p1, v1, v3, v6, v7}, Landroid/graphics/Canvas;->scale(FFFF)V
+    invoke-virtual {p1, v1, v1, v6, v7}, Landroid/graphics/Canvas;->scale(FFFF)V
 
     :cond_3
     if-eqz v2, :cond_4
@@ -1600,16 +1593,14 @@
 
     invoke-virtual {p1, v1, v6, v7, v2}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;FFLandroid/graphics/Paint;)V
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     iget-object v3, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
 
     const/4 v4, 0x0
 
-    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->textToDraw:Ljava/lang/CharSequence;
-
-    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
+    invoke-interface {v3}, Ljava/lang/CharSequence;->length()I
 
     move-result v5
 
@@ -1620,7 +1611,7 @@
     invoke-virtual/range {v2 .. v8}, Landroid/graphics/Canvas;->drawText(Ljava/lang/CharSequence;IIFFLandroid/graphics/Paint;)V
 
     :cond_5
-    :goto_2
+    :goto_3
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     return-void
@@ -1757,8 +1748,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedTypeface:Landroid/graphics/Typeface;
-
     return-object v0
 
     :cond_0
@@ -1779,13 +1768,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedTextColor:Landroid/content/res/ColorStateList;
-
-    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->state:[I
+    iget-object v1, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedTextColor:Landroid/content/res/ColorStateList;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v0, v1, v2}, Landroid/content/res/ColorStateList;->getColorForState([II)I
+    invoke-virtual {v1, v0, v2}, Landroid/content/res/ColorStateList;->getColorForState([II)I
 
     move-result v0
 
@@ -1832,8 +1819,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTypeface:Landroid/graphics/Typeface;
-
     return-object v0
 
     :cond_0
@@ -1865,8 +1850,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->collapsedTextColor:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->isStateful()Z
 
     move-result v0
@@ -1878,8 +1861,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CollapsingTextHelper;->expandedTextColor:Landroid/content/res/ColorStateList;
-
     invoke-virtual {v0}, Landroid/content/res/ColorStateList;->isStateful()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/DescendantOffsetUtils.smali b/com.discord/smali_classes2/com/google/android/material/internal/DescendantOffsetUtils.smali
index 4fbab9a5e1..4ec5e92035 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/DescendantOffsetUtils.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/DescendantOffsetUtils.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/DescendantOffsetUtils;
 .super Ljava/lang/Object;
+.source "DescendantOffsetUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/DrawableUtils.smali b/com.discord/smali_classes2/com/google/android/material/internal/DrawableUtils.smali
index 19ac4e17fc..3936517c46 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/DrawableUtils.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/DrawableUtils.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/DrawableUtils;
 .super Ljava/lang/Object;
+.source "DrawableUtils.java"
 
 
 # annotations
@@ -87,8 +88,6 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    sget-object v0, Lcom/google/android/material/internal/DrawableUtils;->setConstantStateMethod:Ljava/lang/reflect/Method;
-
     new-array v3, v2, [Ljava/lang/Object;
 
     aput-object p1, v3, v1
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/FlowLayout.smali b/com.discord/smali_classes2/com/google/android/material/internal/FlowLayout.smali
index b1cafa423f..478d3c3023 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/FlowLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/FlowLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/FlowLayout;
 .super Landroid/view/ViewGroup;
+.source "FlowLayout.java"
 
 
 # annotations
@@ -314,9 +315,14 @@
 
     sub-int/2addr v6, v5
 
+    invoke-virtual {v3, v1, v2, v6, v7}, Landroid/view/View;->layout(IIII)V
+
+    goto :goto_5
+
     :cond_6
     invoke-virtual {v3, v1, v2, v6, v7}, Landroid/view/View;->layout(IIII)V
 
+    :goto_5
     add-int/2addr v5, v4
 
     invoke-virtual {v3}, Landroid/view/View;->getMeasuredWidth()I
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/ForegroundLinearLayout.smali b/com.discord/smali_classes2/com/google/android/material/internal/ForegroundLinearLayout.smali
index 031d38958e..8cd8dfa3e5 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/ForegroundLinearLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/ForegroundLinearLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/ForegroundLinearLayout;
 .super Landroidx/appcompat/widget/LinearLayoutCompat;
+.source "ForegroundLinearLayout.java"
 
 
 # annotations
@@ -139,8 +140,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ForegroundLinearLayout;->foreground:Landroid/graphics/drawable/Drawable;
-
     iget-boolean v1, p0, Lcom/google/android/material/internal/ForegroundLinearLayout;->foregroundBoundsChanged:Z
 
     if-eqz v1, :cond_1
@@ -242,8 +241,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ForegroundLinearLayout;->foreground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p1, p2}, Landroid/graphics/drawable/Drawable;->setHotspot(FF)V
 
     :cond_0
@@ -259,8 +256,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ForegroundLinearLayout;->foreground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result v0
@@ -307,8 +302,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ForegroundLinearLayout;->foreground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->jumpToCurrentState()V
 
     :cond_0
@@ -348,12 +341,8 @@
 
     if-eq v0, p1, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ForegroundLinearLayout;->foreground:Landroid/graphics/drawable/Drawable;
-
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ForegroundLinearLayout;->foreground:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenu.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenu.smali
index 6f76047b2a..e5f2d381ed 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenu.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenu.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/NavigationMenu;
 .super Landroidx/appcompat/view/menu/MenuBuilder;
+.source "NavigationMenu.java"
 
 
 # annotations
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 67606e5d6d..ab10badc30 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuItemView$1;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "NavigationMenuItemView.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView.smali
index 13c6d7f49f..b67cfa1b46 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/NavigationMenuItemView;
 .super Lcom/google/android/material/internal/ForegroundLinearLayout;
+.source "NavigationMenuItemView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuView$ItemView;
@@ -157,8 +158,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->actionArea:Landroid/widget/FrameLayout;
-
     invoke-virtual {v0}, Landroid/widget/FrameLayout;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v0
@@ -186,8 +185,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->actionArea:Landroid/widget/FrameLayout;
-
     invoke-virtual {v0}, Landroid/widget/FrameLayout;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v0
@@ -448,8 +445,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->itemData:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->isCheckable()Z
 
     move-result v0
@@ -487,8 +482,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->actionArea:Landroid/widget/FrameLayout;
-
     invoke-virtual {v0}, Landroid/widget/FrameLayout;->removeAllViews()V
 
     :cond_0
@@ -586,9 +579,7 @@
     :cond_1
     iget v1, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->iconSize:I
 
-    iget v2, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->iconSize:I
-
-    invoke-virtual {p1, v0, v0, v1, v2}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {p1, v0, v0, v1, v1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     goto :goto_1
 
@@ -625,13 +616,9 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->emptyDrawable:Landroid/graphics/drawable/Drawable;
-
     iget v1, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->iconSize:I
 
-    iget v2, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->iconSize:I
-
-    invoke-virtual {p1, v0, v0, v1, v2}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {p1, v0, v0, v1, v1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     :cond_3
     iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->emptyDrawable:Landroid/graphics/drawable/Drawable;
@@ -680,8 +667,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView;->itemData:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuItemImpl;->getIcon()Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
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 7bb400f504..69d362cba8 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$1;
 .super Ljava/lang/Object;
+.source "NavigationMenuPresenter.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$a.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$a.smali
index b651a4f19b..d1a4e6f239 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$a;
 .super Lcom/google/android/material/internal/NavigationMenuPresenter$j;
+.source "NavigationMenuPresenter.java"
 
 
 # annotations
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 27a3f70f50..87dfc7d739 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$b;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "NavigationMenuPresenter.java"
 
 
 # annotations
@@ -53,7 +54,7 @@
 
     iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->bvh:Ljava/util/ArrayList;
 
-    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bp()V
+    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bo()V
 
     return-void
 .end method
@@ -86,7 +87,7 @@
 
 
 # virtual methods
-.method final Bp()V
+.method final Bo()V
     .locals 16
 
     move-object/from16 v0, p0
@@ -345,6 +346,10 @@
 
     invoke-virtual {v6, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
+    move v6, v5
+
+    goto :goto_3
+
     :cond_b
     move v6, v5
 
@@ -397,7 +402,7 @@
     return-void
 .end method
 
-.method public final Bq()Landroid/os/Bundle;
+.method public final Bp()Landroid/os/Bundle;
     .locals 7
 
     new-instance v0, Landroid/os/Bundle;
@@ -408,15 +413,13 @@
 
     if-eqz v1, :cond_0
 
-    const-string v1, "android:menu:checked"
+    const-string v2, "android:menu:checked"
 
-    iget-object v2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->bvi:Landroidx/appcompat/view/menu/MenuItemImpl;
+    invoke-virtual {v1}, Landroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
 
-    invoke-virtual {v2}, Landroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
+    move-result v1
 
-    move-result v2
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     :cond_0
     new-instance v1, Landroid/util/SparseArray;
@@ -719,10 +722,10 @@
 
     invoke-virtual {p1, p2, v1}, Lcom/google/android/material/internal/NavigationMenuItemView;->initialize(Landroidx/appcompat/view/menu/MenuItemImpl;I)V
 
-    :goto_1
     return-void
 
-    nop
+    :goto_1
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -839,8 +842,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->bvi:Landroidx/appcompat/view/menu/MenuItemImpl;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroidx/appcompat/view/menu/MenuItemImpl;->setChecked(Z)Landroid/view/MenuItem;
@@ -852,6 +853,8 @@
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/view/menu/MenuItemImpl;->setChecked(Z)Landroid/view/MenuItem;
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$c.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$c.smali
index 3d85d70b7b..d9982dbb78 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$c.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$c;
 .super Ljava/lang/Object;
+.source "NavigationMenuPresenter.java"
 
 # interfaces
 .implements Lcom/google/android/material/internal/NavigationMenuPresenter$d;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$d.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$d.smali
index 52aaa4f3cd..9e1a5cab09 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$d.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/material/internal/NavigationMenuPresenter$d;
 .super Ljava/lang/Object;
+.source "NavigationMenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$e.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$e.smali
index d21f40059b..8ae872b182 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$e.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$e;
 .super Ljava/lang/Object;
+.source "NavigationMenuPresenter.java"
 
 # interfaces
 .implements Lcom/google/android/material/internal/NavigationMenuPresenter$d;
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 d8704610e7..3b711bc8d6 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 .super Ljava/lang/Object;
+.source "NavigationMenuPresenter.java"
 
 # interfaces
 .implements Lcom/google/android/material/internal/NavigationMenuPresenter$d;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$g.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$g.smali
index bc0932f8d7..a046800710 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$g.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$g;
 .super Lcom/google/android/material/internal/NavigationMenuPresenter$j;
+.source "NavigationMenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$h.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$h.smali
index 7de3d79e56..bddf285190 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$h.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$h;
 .super Lcom/google/android/material/internal/NavigationMenuPresenter$j;
+.source "NavigationMenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$i.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$i.smali
index 275bcf3282..ed97ef7f98 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$i.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/NavigationMenuPresenter$i;
 .super Lcom/google/android/material/internal/NavigationMenuPresenter$j;
+.source "NavigationMenuPresenter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$j.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$j.smali
index 55dbffd64c..7c3971b036 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$j.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$j.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/android/material/internal/NavigationMenuPresenter$j;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "NavigationMenuPresenter.java"
 
 
 # annotations
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 2b92ded9c1..d7d396c7bb 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/NavigationMenuPresenter;
 .super Ljava/lang/Object;
+.source "NavigationMenuPresenter.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuPresenter;
@@ -102,9 +103,7 @@
 
     iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->menuView:Lcom/google/android/material/internal/NavigationMenuView;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->menuView:Lcom/google/android/material/internal/NavigationMenuView;
-
-    invoke-virtual {v0}, Lcom/google/android/material/internal/NavigationMenuView;->getPaddingBottom()I
+    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuView;->getPaddingBottom()I
 
     move-result v0
 
@@ -148,9 +147,7 @@
 
     iget v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingTopDefault:I
 
-    iget-object v2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->menuView:Lcom/google/android/material/internal/NavigationMenuView;
-
-    invoke-virtual {v2}, Lcom/google/android/material/internal/NavigationMenuView;->getPaddingBottom()I
+    invoke-virtual {v0}, Lcom/google/android/material/internal/NavigationMenuView;->getPaddingBottom()I
 
     move-result v2
 
@@ -385,8 +382,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->callback:Landroidx/appcompat/view/menu/MenuPresenter$Callback;
-
     invoke-interface {v0, p1, p2}, Landroidx/appcompat/view/menu/MenuPresenter$Callback;->onCloseMenu(Landroidx/appcompat/view/menu/MenuBuilder;Z)V
 
     :cond_0
@@ -487,7 +482,7 @@
     :goto_1
     iput-boolean v3, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->updateSuspended:Z
 
-    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bp()V
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bo()V
 
     :cond_3
     const-string v2, "android:menu:action_views"
@@ -595,15 +590,13 @@
 
     if-eqz v1, :cond_1
 
-    const-string v1, "android:menu:adapter"
+    const-string v2, "android:menu:adapter"
 
-    iget-object v2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->adapter:Lcom/google/android/material/internal/NavigationMenuPresenter$b;
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bp()Landroid/os/Bundle;
 
-    invoke-virtual {v2}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bq()Landroid/os/Bundle;
+    move-result-object v1
 
-    move-result-object v2
-
-    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_1
     iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->headerLayout:Landroid/widget/LinearLayout;
@@ -657,9 +650,7 @@
 
     iget v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingTopDefault:I
 
-    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->menuView:Lcom/google/android/material/internal/NavigationMenuView;
-
-    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuView;->getPaddingBottom()I
+    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuView;->getPaddingBottom()I
 
     move-result v1
 
@@ -800,8 +791,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->adapter:Lcom/google/android/material/internal/NavigationMenuPresenter$b;
-
     iput-boolean p1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->updateSuspended:Z
 
     :cond_0
@@ -815,9 +804,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->adapter:Lcom/google/android/material/internal/NavigationMenuPresenter$b;
-
-    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bp()V
+    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Bo()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/NavigationMenuView.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuView.smali
index 915184df6a..1a2f0c39c7 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/NavigationMenuView;
 .super Landroidx/recyclerview/widget/RecyclerView;
+.source "NavigationMenuView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuView;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationSubMenu.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationSubMenu.smali
index 73cd026af5..651460199c 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationSubMenu.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationSubMenu.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/NavigationSubMenu;
 .super Landroidx/appcompat/view/menu/SubMenuBuilder;
+.source "NavigationSubMenu.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray$1.smali b/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray$1.smali
index 86077532f4..0b880ceab2 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/ParcelableSparseArray$1;
 .super Ljava/lang/Object;
+.source "ParcelableSparseArray.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray.smali b/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray.smali
index b6bd5d9899..9d4302a30f 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/ParcelableSparseArray.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/ParcelableSparseArray;
 .super Landroid/util/SparseArray;
+.source "ParcelableSparseArray.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
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 70953735de..2505f39a7a 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;
 .super Ljava/lang/Object;
+.source "ScrimInsetsFrameLayout.java"
 
 # interfaces
 .implements Landroidx/core/view/OnApplyWindowInsetsListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout.smali b/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout.smali
index 88b4d3b026..573dfc4f71 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 .super Landroid/widget/FrameLayout;
+.source "ScrimInsetsFrameLayout.java"
 
 
 # annotations
@@ -249,8 +250,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->insetForeground:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, p0}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
     :cond_0
@@ -266,8 +265,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->insetForeground:Landroid/graphics/drawable/Drawable;
-
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)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 5bd8c9ac5f..d75ed69c79 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/StateListAnimator$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "StateListAnimator.java"
 
 
 # annotations
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 7d84e9ddc0..9b0cedd616 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/StateListAnimator$a;
 .super Ljava/lang/Object;
+.source "StateListAnimator.java"
 
 
 # annotations
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 cbaebea09f..ca45a69793 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
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/internal/StateListAnimator;
 .super Ljava/lang/Object;
+.source "StateListAnimator.java"
 
 
 # annotations
@@ -68,8 +69,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator;->runningAnimator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
 
     const/4 v0, 0x0
@@ -121,8 +120,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator;->runningAnimator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->end()V
 
     const/4 v0, 0x0
@@ -181,8 +178,6 @@
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/material/internal/StateListAnimator;->lastMatch:Lcom/google/android/material/internal/StateListAnimator$a;
-
     if-eqz p1, :cond_3
 
     invoke-direct {p0}, Lcom/google/android/material/internal/StateListAnimator;->cancel()V
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 bc7c208650..108a0b5b87 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/internal/TextScale$1;
 .super Ljava/lang/Object;
+.source "TextScale.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/TextScale.smali b/com.discord/smali_classes2/com/google/android/material/internal/TextScale.smali
index a3c8f762d9..60fd5ba026 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/TextScale.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/TextScale.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/TextScale;
 .super Landroidx/transition/Transition;
+.source "TextScale.java"
 
 
 # annotations
@@ -182,6 +183,8 @@
 
     invoke-virtual {p1, p2}, Landroid/animation/ValueAnimator;->addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
 
+    return-object p1
+
     :cond_4
     :goto_1
     return-object p1
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/ThemeEnforcement.smali b/com.discord/smali_classes2/com/google/android/material/internal/ThemeEnforcement.smali
index f02c36568a..c2b30b2c3a 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/ThemeEnforcement.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/ThemeEnforcement.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/internal/ThemeEnforcement;
 .super Ljava/lang/Object;
+.source "ThemeEnforcement.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/ViewUtils.smali b/com.discord/smali_classes2/com/google/android/material/internal/ViewUtils.smali
index 67a32d4a79..d9b7514314 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/ViewUtils.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/ViewUtils.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/ViewUtils;
 .super Ljava/lang/Object;
+.source "ViewUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/VisibilityAwareImageButton.smali b/com.discord/smali_classes2/com/google/android/material/internal/VisibilityAwareImageButton.smali
index b65c24f25f..1623fd7f43 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/VisibilityAwareImageButton.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/VisibilityAwareImageButton.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/internal/VisibilityAwareImageButton;
 .super Landroid/widget/ImageButton;
+.source "VisibilityAwareImageButton.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/math/MathUtils.smali b/com.discord/smali_classes2/com/google/android/material/math/MathUtils.smali
index c3fa43e8da..1514c62dee 100644
--- a/com.discord/smali_classes2/com/google/android/material/math/MathUtils.smali
+++ b/com.discord/smali_classes2/com/google/android/material/math/MathUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/math/MathUtils;
 .super Ljava/lang/Object;
+.source "MathUtils.java"
 
 
 # static fields
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 1570884c98..1aab21cfd6 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/navigation/NavigationView$1;
 .super Ljava/lang/Object;
+.source "NavigationView.java"
 
 # interfaces
 .implements Landroidx/appcompat/view/menu/MenuBuilder$Callback;
diff --git a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener.smali b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener.smali
index 0b6d7352e8..36c2fc93a3 100644
--- a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener;
 .super Ljava/lang/Object;
+.source "NavigationView.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState$1.smali
index d536057cca..9012455afa 100644
--- a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/navigation/NavigationView$SavedState$1;
 .super Ljava/lang/Object;
+.source "NavigationView.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState.smali b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState.smali
index b19202e169..9d64f4636c 100644
--- a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$SavedState.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/navigation/NavigationView$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "NavigationView.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView.smali b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView.smali
index 8987445df0..4e10786df4 100644
--- a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/navigation/NavigationView;
 .super Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+.source "NavigationView.java"
 
 
 # annotations
@@ -698,11 +699,15 @@
 
     if-eqz v0, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, p0, Lcom/google/android/material/navigation/NavigationView;->maxWidth:I
 
+    invoke-static {p1, v2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+
+    move-result p1
+
     goto :goto_0
 
     :cond_1
@@ -716,12 +721,11 @@
 
     move-result p1
 
-    :goto_0
     invoke-static {p1, v2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result p1
 
-    :goto_1
+    :goto_0
     invoke-super {p0, p1, p2}, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->onMeasure(II)V
 
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/material/resources/MaterialResources.smali b/com.discord/smali_classes2/com/google/android/material/resources/MaterialResources.smali
index 85d637954e..1f37cf0022 100644
--- a/com.discord/smali_classes2/com/google/android/material/resources/MaterialResources.smali
+++ b/com.discord/smali_classes2/com/google/android/material/resources/MaterialResources.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/resources/MaterialResources;
 .super Ljava/lang/Object;
+.source "MaterialResources.java"
 
 
 # annotations
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 e7ab14ffe8..69715c2d94 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/resources/TextAppearance$1;
 .super Landroidx/core/content/res/ResourcesCompat$FontCallback;
+.source "TextAppearance.java"
 
 
 # annotations
@@ -67,9 +68,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->bvs:Lcom/google/android/material/resources/TextAppearance;
 
-    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance$1;->bvs:Lcom/google/android/material/resources/TextAppearance;
-
-    iget v1, v1, Lcom/google/android/material/resources/TextAppearance;->textStyle:I
+    iget v1, v0, Lcom/google/android/material/resources/TextAppearance;->textStyle:I
 
     invoke-static {p1, v1}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance.smali b/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance.smali
index 93be2deefe..6f76fd45e8 100644
--- a/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance.smali
+++ b/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/resources/TextAppearance;
 .super Ljava/lang/Object;
+.source "TextAppearance.java"
 
 
 # annotations
@@ -262,33 +263,34 @@
 
     sget-object v0, Landroid/graphics/Typeface;->DEFAULT:Landroid/graphics/Typeface;
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/material/resources/TextAppearance;->font:Landroid/graphics/Typeface;
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_0
     sget-object v0, Landroid/graphics/Typeface;->MONOSPACE:Landroid/graphics/Typeface;
 
+    iput-object v0, p0, Lcom/google/android/material/resources/TextAppearance;->font:Landroid/graphics/Typeface;
+
     goto :goto_0
 
     :pswitch_1
     sget-object v0, Landroid/graphics/Typeface;->SERIF:Landroid/graphics/Typeface;
 
+    iput-object v0, p0, Lcom/google/android/material/resources/TextAppearance;->font:Landroid/graphics/Typeface;
+
     goto :goto_0
 
     :pswitch_2
     sget-object v0, Landroid/graphics/Typeface;->SANS_SERIF:Landroid/graphics/Typeface;
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/android/material/resources/TextAppearance;->font:Landroid/graphics/Typeface;
 
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance;->font:Landroid/graphics/Typeface;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance;->font:Landroid/graphics/Typeface;
-
     iget v1, p0, Lcom/google/android/material/resources/TextAppearance;->textStyle:I
 
     invoke-static {v0, v1}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;
@@ -300,6 +302,8 @@
     :cond_1
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_2
@@ -472,6 +476,8 @@
 
     invoke-static {p2, p3, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    return-void
+
     :catch_1
     return-void
 .end method
@@ -485,8 +491,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/resources/TextAppearance;->textColor:Landroid/content/res/ColorStateList;
-
     iget-object p3, p2, Landroid/text/TextPaint;->drawableState:[I
 
     iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance;->textColor:Landroid/content/res/ColorStateList;
@@ -517,8 +521,6 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance;->shadowColor:Landroid/content/res/ColorStateList;
-
     iget-object v2, p2, Landroid/text/TextPaint;->drawableState:[I
 
     iget-object v3, p0, Lcom/google/android/material/resources/TextAppearance;->shadowColor:Landroid/content/res/ColorStateList;
diff --git a/com.discord/smali_classes2/com/google/android/material/resources/TextAppearanceConfig.smali b/com.discord/smali_classes2/com/google/android/material/resources/TextAppearanceConfig.smali
index 34f409dafa..8299950cb4 100644
--- a/com.discord/smali_classes2/com/google/android/material/resources/TextAppearanceConfig.smali
+++ b/com.discord/smali_classes2/com/google/android/material/resources/TextAppearanceConfig.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/resources/TextAppearanceConfig;
 .super Ljava/lang/Object;
+.source "TextAppearanceConfig.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/android/material/ripple/RippleUtils.smali b/com.discord/smali_classes2/com/google/android/material/ripple/RippleUtils.smali
index 70497b2d81..f816bed137 100644
--- a/com.discord/smali_classes2/com/google/android/material/ripple/RippleUtils.smali
+++ b/com.discord/smali_classes2/com/google/android/material/ripple/RippleUtils.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/ripple/RippleUtils;
 .super Ljava/lang/Object;
+.source "RippleUtils.java"
 
 
 # annotations
@@ -38,9 +39,9 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     const/16 v3, 0x15
 
@@ -56,11 +57,11 @@
     :goto_0
     sput-boolean v0, Lcom/google/android/material/ripple/RippleUtils;->USE_FRAMEWORK_RIPPLE:Z
 
-    new-array v0, v2, [I
+    new-array v0, v1, [I
 
     const v3, 0x10100a7
 
-    aput v3, v0, v1
+    aput v3, v0, v2
 
     sput-object v0, Lcom/google/android/material/ripple/RippleUtils;->PRESSED_STATE_SET:[I
 
@@ -72,19 +73,19 @@
 
     sput-object v3, Lcom/google/android/material/ripple/RippleUtils;->HOVERED_FOCUSED_STATE_SET:[I
 
-    new-array v3, v2, [I
+    new-array v3, v1, [I
 
     const v4, 0x101009c
 
-    aput v4, v3, v1
+    aput v4, v3, v2
 
     sput-object v3, Lcom/google/android/material/ripple/RippleUtils;->FOCUSED_STATE_SET:[I
 
-    new-array v3, v2, [I
+    new-array v3, v1, [I
 
     const v4, 0x1010367
 
-    aput v4, v3, v1
+    aput v4, v3, v2
 
     sput-object v3, Lcom/google/android/material/ripple/RippleUtils;->HOVERED_STATE_SET:[I
 
@@ -114,11 +115,11 @@
 
     sput-object v0, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_HOVERED_STATE_SET:[I
 
-    new-array v0, v2, [I
+    new-array v0, v1, [I
 
-    const v2, 0x10100a1
+    const v1, 0x10100a1
 
-    aput v2, v0, v1
+    aput v1, v0, v2
 
     sput-object v0, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_STATE_SET:[I
 
@@ -177,17 +178,17 @@
 
     sget-boolean v0, Lcom/google/android/material/ripple/RippleUtils;->USE_FRAMEWORK_RIPPLE:Z
 
-    const/4 v1, 0x1
+    const/4 v1, 0x2
 
-    const/4 v2, 0x2
+    const/4 v2, 0x1
 
     const/4 v3, 0x0
 
     if-eqz v0, :cond_0
 
-    new-array v0, v2, [[I
+    new-array v0, v1, [[I
 
-    new-array v2, v2, [I
+    new-array v1, v1, [I
 
     sget-object v4, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_STATE_SET:[I
 
@@ -199,11 +200,11 @@
 
     move-result v4
 
-    aput v4, v2, v3
+    aput v4, v1, v3
 
     sget-object v3, Landroid/util/StateSet;->NOTHING:[I
 
-    aput-object v3, v0, v1
+    aput-object v3, v0, v2
 
     sget-object v3, Lcom/google/android/material/ripple/RippleUtils;->PRESSED_STATE_SET:[I
 
@@ -211,11 +212,11 @@
 
     move-result p0
 
-    aput p0, v2, v1
+    aput p0, v1, v2
 
     new-instance p0, Landroid/content/res/ColorStateList;
 
-    invoke-direct {p0, v0, v2}, Landroid/content/res/ColorStateList;-><init>([[I[I)V
+    invoke-direct {p0, v0, v1}, Landroid/content/res/ColorStateList;-><init>([[I[I)V
 
     return-object p0
 
@@ -230,8 +231,6 @@
 
     aput-object v5, v4, v3
 
-    sget-object v5, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_PRESSED_STATE_SET:[I
-
     invoke-static {p0, v5}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
     move-result v5
@@ -240,27 +239,23 @@
 
     sget-object v5, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_HOVERED_FOCUSED_STATE_SET:[I
 
-    aput-object v5, v4, v1
-
-    sget-object v5, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_HOVERED_FOCUSED_STATE_SET:[I
+    aput-object v5, v4, v2
 
     invoke-static {p0, v5}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
     move-result v5
 
-    aput v5, v0, v1
+    aput v5, v0, v2
 
-    sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_FOCUSED_STATE_SET:[I
+    sget-object v2, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_FOCUSED_STATE_SET:[I
 
-    aput-object v1, v4, v2
+    aput-object v2, v4, v1
 
-    sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_FOCUSED_STATE_SET:[I
+    invoke-static {p0, v2}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
-    invoke-static {p0, v1}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
+    move-result v2
 
-    move-result v1
-
-    aput v1, v0, v2
+    aput v2, v0, v1
 
     sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_HOVERED_STATE_SET:[I
 
@@ -268,8 +263,6 @@
 
     aput-object v1, v4, v2
 
-    sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->SELECTED_HOVERED_STATE_SET:[I
-
     invoke-static {p0, v1}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
     move-result v1
@@ -290,8 +283,6 @@
 
     aput-object v1, v4, v2
 
-    sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->PRESSED_STATE_SET:[I
-
     invoke-static {p0, v1}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
     move-result v1
@@ -304,8 +295,6 @@
 
     aput-object v1, v4, v2
 
-    sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->HOVERED_FOCUSED_STATE_SET:[I
-
     invoke-static {p0, v1}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
     move-result v1
@@ -318,8 +307,6 @@
 
     aput-object v1, v4, v2
 
-    sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->FOCUSED_STATE_SET:[I
-
     invoke-static {p0, v1}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
     move-result v1
@@ -332,8 +319,6 @@
 
     aput-object v1, v4, v2
 
-    sget-object v1, Lcom/google/android/material/ripple/RippleUtils;->HOVERED_STATE_SET:[I
-
     invoke-static {p0, v1}, Lcom/google/android/material/ripple/RippleUtils;->getColorForState(Landroid/content/res/ColorStateList;[I)I
 
     move-result p0
diff --git a/com.discord/smali_classes2/com/google/android/material/shadow/ShadowDrawableWrapper.smali b/com.discord/smali_classes2/com/google/android/material/shadow/ShadowDrawableWrapper.smali
index 50a970a195..29becafee5 100644
--- a/com.discord/smali_classes2/com/google/android/material/shadow/ShadowDrawableWrapper.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shadow/ShadowDrawableWrapper.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 .super Landroidx/appcompat/graphics/drawable/DrawableWrapper;
+.source "ShadowDrawableWrapper.java"
 
 
 # static fields
@@ -236,17 +237,11 @@
 
     iget v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
 
-    neg-float v2, v2
+    neg-float v3, v2
 
-    iget v3, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
+    neg-float v4, v2
 
-    neg-float v3, v3
-
-    iget v4, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
-
-    iget v5, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
-
-    invoke-direct {v1, v2, v3, v4, v5}, Landroid/graphics/RectF;-><init>(FFFF)V
+    invoke-direct {v1, v3, v4, v2, v2}, Landroid/graphics/RectF;-><init>(FFFF)V
 
     new-instance v2, Landroid/graphics/RectF;
 
@@ -254,13 +249,11 @@
 
     iget v3, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->shadowSize:F
 
+    neg-float v4, v3
+
     neg-float v3, v3
 
-    iget v4, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->shadowSize:F
-
-    neg-float v4, v4
-
-    invoke-virtual {v2, v3, v4}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v2, v4, v3}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v3, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerShadowPath:Landroid/graphics/Path;
 
@@ -275,8 +268,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerShadowPath:Landroid/graphics/Path;
-
     invoke-virtual {v3}, Landroid/graphics/Path;->reset()V
 
     :goto_0
@@ -484,6 +475,8 @@
 
     double-to-float p0, v0
 
+    return p0
+
     :cond_0
     return p0
 .end method
@@ -526,7 +519,7 @@
 .end method
 
 .method private drawShadow(Landroid/graphics/Canvas;)V
-    .locals 22
+    .locals 20
 
     move-object/from16 v0, p0
 
@@ -552,15 +545,13 @@
 
     invoke-virtual {v7, v1, v2, v3}, Landroid/graphics/Canvas;->rotate(FFF)V
 
-    iget v1, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
+    iget v9, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
 
-    neg-float v1, v1
+    neg-float v1, v9
 
     iget v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->shadowSize:F
 
-    sub-float v9, v1, v2
-
-    iget v10, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
+    sub-float v10, v1, v2
 
     iget-object v1, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->contentBounds:Landroid/graphics/RectF;
 
@@ -570,13 +561,13 @@
 
     const/high16 v2, 0x40000000    # 2.0f
 
-    mul-float v11, v10, v2
+    mul-float v11, v9, v2
 
     sub-float/2addr v1, v11
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
@@ -614,45 +605,35 @@
     :goto_1
     iget v1, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawShadowSize:F
 
-    iget v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawShadowSize:F
+    const/high16 v2, 0x3e800000    # 0.25f
 
-    const/high16 v3, 0x3e800000    # 0.25f
+    mul-float v2, v2, v1
 
-    mul-float v2, v2, v3
+    sub-float v2, v1, v2
 
-    sub-float/2addr v1, v2
+    const/high16 v3, 0x3f000000    # 0.5f
 
-    iget v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawShadowSize:F
+    mul-float v3, v3, v1
 
-    iget v3, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawShadowSize:F
-
-    const/high16 v4, 0x3f000000    # 0.5f
-
-    mul-float v3, v3, v4
-
-    sub-float/2addr v2, v3
-
-    iget v3, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawShadowSize:F
-
-    iget v4, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawShadowSize:F
+    sub-float v3, v1, v3
 
     const/high16 v14, 0x3f800000    # 1.0f
 
-    mul-float v4, v4, v14
+    mul-float v4, v1, v14
 
-    sub-float/2addr v3, v4
+    sub-float/2addr v1, v4
 
-    add-float/2addr v2, v10
+    add-float/2addr v3, v9
 
-    div-float v15, v10, v2
+    div-float v15, v9, v3
 
-    add-float/2addr v1, v10
+    add-float/2addr v2, v9
 
-    div-float v6, v10, v1
+    div-float v6, v9, v2
 
-    add-float/2addr v3, v10
+    add-float/2addr v1, v9
 
-    div-float v5, v10, v3
+    div-float v5, v9, v1
 
     invoke-virtual/range {p1 .. p1}, Landroid/graphics/Canvas;->save()I
 
@@ -662,13 +643,13 @@
 
     iget v1, v1, Landroid/graphics/RectF;->left:F
 
-    add-float/2addr v1, v10
+    add-float/2addr v1, v9
 
     iget-object v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->contentBounds:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->top:F
 
-    add-float/2addr v2, v10
+    add-float/2addr v2, v9
 
     invoke-virtual {v7, v1, v2}, Landroid/graphics/Canvas;->translate(FF)V
 
@@ -708,7 +689,7 @@
 
     move/from16 v18, v3
 
-    move v3, v9
+    move v3, v10
 
     move v14, v4
 
@@ -718,7 +699,7 @@
 
     move/from16 v5, v18
 
-    move/from16 v20, v8
+    move/from16 v16, v8
 
     move v8, v6
 
@@ -733,7 +714,7 @@
 
     move/from16 v19, v5
 
-    move/from16 v20, v8
+    move/from16 v16, v8
 
     move v8, v6
 
@@ -748,13 +729,13 @@
 
     iget v1, v1, Landroid/graphics/RectF;->right:F
 
-    sub-float/2addr v1, v10
+    sub-float/2addr v1, v9
 
     iget-object v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->contentBounds:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->bottom:F
 
-    sub-float/2addr v2, v10
+    sub-float/2addr v2, v9
 
     invoke-virtual {v7, v1, v2}, Landroid/graphics/Canvas;->translate(FF)V
 
@@ -802,9 +783,9 @@
 
     move-object/from16 v1, p1
 
-    move v3, v9
+    move v3, v10
 
-    move/from16 v21, v8
+    move/from16 v17, v8
 
     move v8, v6
 
@@ -815,7 +796,7 @@
     goto :goto_3
 
     :cond_3
-    move/from16 v21, v8
+    move/from16 v17, v8
 
     move v8, v6
 
@@ -830,13 +811,13 @@
 
     iget v1, v1, Landroid/graphics/RectF;->left:F
 
-    add-float/2addr v1, v10
+    add-float/2addr v1, v9
 
     iget-object v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->contentBounds:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->bottom:F
 
-    sub-float/2addr v2, v10
+    sub-float/2addr v2, v9
 
     invoke-virtual {v7, v1, v2}, Landroid/graphics/Canvas;->translate(FF)V
 
@@ -878,7 +859,7 @@
 
     move-object/from16 v1, p1
 
-    move v3, v9
+    move v3, v10
 
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
@@ -893,19 +874,19 @@
 
     iget v1, v1, Landroid/graphics/RectF;->right:F
 
-    sub-float/2addr v1, v10
+    sub-float/2addr v1, v9
 
     iget-object v2, v0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->contentBounds:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->top:F
 
-    add-float/2addr v2, v10
+    add-float/2addr v2, v9
 
     invoke-virtual {v7, v1, v2}, Landroid/graphics/Canvas;->translate(FF)V
 
-    move/from16 v10, v21
+    move/from16 v9, v17
 
-    invoke-virtual {v7, v15, v10}, Landroid/graphics/Canvas;->scale(FF)V
+    invoke-virtual {v7, v15, v9}, Landroid/graphics/Canvas;->scale(FF)V
 
     const/high16 v1, 0x42b40000    # 90.0f
 
@@ -921,7 +902,7 @@
 
     const/high16 v1, 0x3f800000    # 1.0f
 
-    div-float v14, v1, v10
+    div-float v14, v1, v9
 
     invoke-virtual {v7, v14, v1}, Landroid/graphics/Canvas;->scale(FF)V
 
@@ -943,14 +924,14 @@
 
     move-object/from16 v1, p1
 
-    move v3, v9
+    move v3, v10
 
     invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
     :cond_5
     invoke-virtual {v7, v8}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
-    move/from16 v1, v20
+    move/from16 v1, v16
 
     invoke-virtual {v7, v1}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
@@ -1026,17 +1007,15 @@
 
     iget v1, p0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
 
-    iget v2, p0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawMaxShadowSize:F
+    const/high16 v2, 0x3fc00000    # 1.5f
 
-    const/high16 v3, 0x3fc00000    # 1.5f
-
-    mul-float v2, v2, v3
+    mul-float v3, v0, v2
 
     const/high16 v4, 0x40000000    # 2.0f
 
-    div-float/2addr v2, v4
+    div-float/2addr v3, v4
 
-    add-float/2addr v1, v2
+    add-float/2addr v1, v3
 
     invoke-static {v0, v1}, Ljava/lang/Math;->max(FF)F
 
@@ -1046,7 +1025,7 @@
 
     iget v1, p0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawMaxShadowSize:F
 
-    mul-float v1, v1, v3
+    mul-float v1, v1, v2
 
     mul-float v1, v1, v4
 
@@ -1062,23 +1041,21 @@
 
     iget v1, p0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->cornerRadius:F
 
-    iget v2, p0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawMaxShadowSize:F
+    const/high16 v2, 0x40000000    # 2.0f
 
-    const/high16 v3, 0x40000000    # 2.0f
+    div-float v3, v0, v2
 
-    div-float/2addr v2, v3
-
-    add-float/2addr v1, v2
+    add-float/2addr v1, v3
 
     invoke-static {v0, v1}, Ljava/lang/Math;->max(FF)F
 
     move-result v0
 
-    mul-float v0, v0, v3
+    mul-float v0, v0, v2
 
     iget v1, p0, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->rawMaxShadowSize:F
 
-    mul-float v1, v1, v3
+    mul-float v1, v1, v2
 
     add-float/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/shadow/ShadowViewDelegate.smali b/com.discord/smali_classes2/com/google/android/material/shadow/ShadowViewDelegate.smali
index 351f9b8627..0663078957 100644
--- a/com.discord/smali_classes2/com/google/android/material/shadow/ShadowViewDelegate.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shadow/ShadowViewDelegate.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/shadow/ShadowViewDelegate;
 .super Ljava/lang/Object;
+.source "ShadowViewDelegate.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/CornerTreatment.smali b/com.discord/smali_classes2/com/google/android/material/shape/CornerTreatment.smali
index a0615565b0..45cf9133a9 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/CornerTreatment.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/CornerTreatment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/CornerTreatment;
 .super Ljava/lang/Object;
+.source "CornerTreatment.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/CutCornerTreatment.smali b/com.discord/smali_classes2/com/google/android/material/shape/CutCornerTreatment.smali
index 2bf844cd05..cef9d3ef3e 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/CutCornerTreatment.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/CutCornerTreatment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/CutCornerTreatment;
 .super Lcom/google/android/material/shape/CornerTreatment;
+.source "CutCornerTreatment.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/EdgeTreatment.smali b/com.discord/smali_classes2/com/google/android/material/shape/EdgeTreatment.smali
index abb60b5399..9e28408856 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/EdgeTreatment.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/EdgeTreatment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/EdgeTreatment;
 .super Ljava/lang/Object;
+.source "EdgeTreatment.java"
 
 
 # annotations
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 82f71ebe82..48b7596023 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;
 .super Ljava/lang/Object;
+.source "InterpolateOnScrollPositionChangeHelper.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnScrollChangedListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper.smali b/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper.smali
index d8a8fed968..41462479b3 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
 .super Ljava/lang/Object;
+.source "InterpolateOnScrollPositionChangeHelper.java"
 
 
 # annotations
@@ -101,8 +102,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;->containingScrollView:Landroid/widget/ScrollView;
-
     invoke-virtual {v0}, Landroid/widget/ScrollView;->getChildCount()I
 
     move-result v0
@@ -175,7 +174,6 @@
 
     add-float/2addr v0, v4
 
-    :goto_0
     invoke-static {v4, v0}, Ljava/lang/Math;->min(FF)F
 
     move-result v0
@@ -209,7 +207,21 @@
 
     sub-float v0, v4, v0
 
-    goto :goto_0
+    invoke-static {v4, v0}, Ljava/lang/Math;->min(FF)F
+
+    move-result v0
+
+    invoke-static {v3, v0}, Ljava/lang/Math;->max(FF)F
+
+    move-result v0
+
+    invoke-virtual {v2, v0}, Lcom/google/android/material/shape/MaterialShapeDrawable;->setInterpolation(F)V
+
+    iget-object v0, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;->shapedView:Landroid/view/View;
+
+    invoke-virtual {v0}, Landroid/view/View;->invalidate()V
+
+    return-void
 
     :cond_2
     iget-object v0, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;->materialShapeDrawable:Lcom/google/android/material/shape/MaterialShapeDrawable;
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/MaterialShapeDrawable.smali b/com.discord/smali_classes2/com/google/android/material/shape/MaterialShapeDrawable.smali
index 02758b1684..5f0737e9e7 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/MaterialShapeDrawable.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/MaterialShapeDrawable.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/MaterialShapeDrawable;
 .super Landroid/graphics/drawable/Drawable;
+.source "MaterialShapeDrawable.java"
 
 # interfaces
 .implements Landroidx/core/graphics/drawable/TintAwareDrawable;
@@ -426,26 +427,22 @@
 
     iget-object v0, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
 
-    aget v0, v0, v2
+    aget v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
+    aget v0, v0, v3
 
-    aget v1, v1, v3
-
-    invoke-virtual {p2, v0, v1}, Landroid/graphics/Path;->moveTo(FF)V
+    invoke-virtual {p2, v1, v0}, Landroid/graphics/Path;->moveTo(FF)V
 
     goto :goto_0
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
 
-    aget v0, v0, v2
+    aget v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
+    aget v0, v0, v3
 
-    aget v1, v1, v3
-
-    invoke-virtual {p2, v0, v1}, Landroid/graphics/Path;->lineTo(FF)V
+    invoke-virtual {p2, v1, v0}, Landroid/graphics/Path;->lineTo(FF)V
 
     :goto_0
     iget-object v0, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->cornerPaths:[Lcom/google/android/material/shape/ShapePath;
@@ -462,7 +459,7 @@
 .end method
 
 .method private appendEdgePath(ILandroid/graphics/Path;)V
-    .locals 5
+    .locals 7
 
     add-int/lit8 v0, p1, 0x1
 
@@ -530,29 +527,25 @@
 
     iget-object v0, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
 
-    aget v0, v0, v3
+    aget v1, v0, v3
 
-    iget-object v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch2:[F
+    iget-object v2, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch2:[F
 
-    aget v1, v1, v3
+    aget v3, v2, v3
+
+    sub-float/2addr v1, v3
+
+    float-to-double v5, v1
+
+    aget v0, v0, v4
+
+    aget v1, v2, v4
 
     sub-float/2addr v0, v1
 
     float-to-double v0, v0
 
-    iget-object v2, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
-
-    aget v2, v2, v4
-
-    iget-object v3, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch2:[F
-
-    aget v3, v3, v4
-
-    sub-float/2addr v2, v3
-
-    float-to-double v2, v2
-
-    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->hypot(DD)D
+    invoke-static {v5, v6, v0, v1}, Ljava/lang/Math;->hypot(DD)D
 
     move-result-wide v0
 
@@ -728,7 +721,7 @@
 .end method
 
 .method private getPath(IILandroid/graphics/Path;)V
-    .locals 3
+    .locals 2
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/google/android/material/shape/MaterialShapeDrawable;->getPathForSize(IILandroid/graphics/Path;)V
 
@@ -751,8 +744,6 @@
 
     iget v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scale:F
 
-    iget v2, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scale:F
-
     div-int/lit8 p1, p1, 0x2
 
     int-to-float p1, p1
@@ -761,7 +752,7 @@
 
     int-to-float p2, p2
 
-    invoke-virtual {v0, v1, v2, p1, p2}, Landroid/graphics/Matrix;->setScale(FFFF)V
+    invoke-virtual {v0, v1, v1, p1, p2}, Landroid/graphics/Matrix;->setScale(FFFF)V
 
     iget-object p1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->matrix:Landroid/graphics/Matrix;
 
@@ -909,13 +900,11 @@
 
     iget-object v0, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
 
-    aget v0, v0, v2
+    aget v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->scratch:[F
+    aget v0, v0, v3
 
-    aget v1, v1, v3
-
-    invoke-virtual {p3, v0, v1}, Landroid/graphics/Matrix;->setTranslate(FF)V
+    invoke-virtual {p3, v1, v0}, Landroid/graphics/Matrix;->setTranslate(FF)V
 
     iget-object p3, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->edgeTransforms:[Landroid/graphics/Matrix;
 
@@ -941,15 +930,13 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->tintMode:Landroid/graphics/PorterDuff$Mode;
+    iget-object v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->tintMode:Landroid/graphics/PorterDuff$Mode;
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->tintList:Landroid/content/res/ColorStateList;
-
     invoke-virtual {p0}, Lcom/google/android/material/shape/MaterialShapeDrawable;->getState()[I
 
     move-result-object v1
@@ -1029,25 +1016,23 @@
 
     if-lez v1, :cond_0
 
-    iget-boolean v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->shadowEnabled:Z
+    iget-boolean v2, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->shadowEnabled:Z
 
-    if-eqz v1, :cond_0
+    if-eqz v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->paint:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->paint:Landroid/graphics/Paint;
 
-    iget v2, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->shadowRadius:I
+    iget v3, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->shadowRadius:I
 
-    int-to-float v2, v2
+    int-to-float v3, v3
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    iget v4, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->shadowElevation:I
-
-    int-to-float v4, v4
+    int-to-float v1, v1
 
     iget v5, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->shadowColor:I
 
-    invoke-virtual {v1, v2, v3, v4, v5}, Landroid/graphics/Paint;->setShadowLayer(FFFI)V
+    invoke-virtual {v2, v3, v4, v1, v5}, Landroid/graphics/Paint;->setShadowLayer(FFFI)V
 
     :cond_0
     iget-object v1, p0, Lcom/google/android/material/shape/MaterialShapeDrawable;->shapedViewModel:Lcom/google/android/material/shape/ShapePathModel;
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/RoundedCornerTreatment.smali b/com.discord/smali_classes2/com/google/android/material/shape/RoundedCornerTreatment.smali
index d6f933e06b..4310e8d7a7 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/RoundedCornerTreatment.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/RoundedCornerTreatment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/RoundedCornerTreatment;
 .super Lcom/google/android/material/shape/CornerTreatment;
+.source "RoundedCornerTreatment.java"
 
 
 # annotations
@@ -26,7 +27,7 @@
 
 # virtual methods
 .method public getCornerPath(FFLcom/google/android/material/shape/ShapePath;)V
-    .locals 9
+    .locals 10
 
     iget v0, p0, Lcom/google/android/material/shape/RoundedCornerTreatment;->radius:F
 
@@ -40,29 +41,27 @@
 
     const/high16 v1, 0x40000000    # 2.0f
 
-    mul-float v0, v0, v1
+    mul-float v2, v0, v1
 
-    mul-float v5, v0, p2
-
-    iget v0, p0, Lcom/google/android/material/shape/RoundedCornerTreatment;->radius:F
+    mul-float v6, v2, p2
 
     mul-float v0, v0, v1
 
-    mul-float v6, v0, p2
+    mul-float v7, v0, p2
 
     const/high16 p2, 0x43340000    # 180.0f
 
-    add-float v7, p1, p2
-
-    const/4 v3, 0x0
+    add-float v8, p1, p2
 
     const/4 v4, 0x0
 
-    const/high16 v8, 0x42b40000    # 90.0f
+    const/4 v5, 0x0
 
-    move-object v2, p3
+    const/high16 v9, 0x42b40000    # 90.0f
 
-    invoke-virtual/range {v2 .. v8}, Lcom/google/android/material/shape/ShapePath;->addArc(FFFFFF)V
+    move-object v3, p3
+
+    invoke-virtual/range {v3 .. v9}, Lcom/google/android/material/shape/ShapePath;->addArc(FFFFFF)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathArcOperation.smali b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathArcOperation.smali
index e98254887d..7801981c46 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathArcOperation.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathArcOperation.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/ShapePath$PathArcOperation;
 .super Lcom/google/android/material/shape/ShapePath$PathOperation;
+.source "ShapePath.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathLineOperation.smali b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathLineOperation.smali
index 07bad0bca4..082325a31b 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathLineOperation.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathLineOperation.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/ShapePath$PathLineOperation;
 .super Lcom/google/android/material/shape/ShapePath$PathOperation;
+.source "ShapePath.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathOperation.smali b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathOperation.smali
index 6438b0371c..c0e32619cc 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathOperation.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathOperation.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/shape/ShapePath$PathOperation;
 .super Ljava/lang/Object;
+.source "ShapePath.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathQuadOperation.smali b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathQuadOperation.smali
index 89207c2974..b9b19cb9b9 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathQuadOperation.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath$PathQuadOperation.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/ShapePath$PathQuadOperation;
 .super Lcom/google/android/material/shape/ShapePath$PathOperation;
+.source "ShapePath.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath.smali b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath.smali
index cd966be978..0dd453f54a 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/ShapePath.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/ShapePath.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/ShapePath;
 .super Ljava/lang/Object;
+.source "ShapePath.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/ShapePathModel.smali b/com.discord/smali_classes2/com/google/android/material/shape/ShapePathModel.smali
index 3db3d803ac..0f634f995b 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/ShapePathModel.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/ShapePathModel.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/ShapePathModel;
 .super Ljava/lang/Object;
+.source "ShapePathModel.java"
 
 
 # annotations
@@ -60,32 +61,20 @@
 
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->topLeftCorner:Lcom/google/android/material/shape/CornerTreatment;
 
-    sget-object v0, Lcom/google/android/material/shape/ShapePathModel;->DEFAULT_CORNER_TREATMENT:Lcom/google/android/material/shape/CornerTreatment;
-
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->topRightCorner:Lcom/google/android/material/shape/CornerTreatment;
 
-    sget-object v0, Lcom/google/android/material/shape/ShapePathModel;->DEFAULT_CORNER_TREATMENT:Lcom/google/android/material/shape/CornerTreatment;
-
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->bottomRightCorner:Lcom/google/android/material/shape/CornerTreatment;
 
-    sget-object v0, Lcom/google/android/material/shape/ShapePathModel;->DEFAULT_CORNER_TREATMENT:Lcom/google/android/material/shape/CornerTreatment;
-
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->bottomLeftCorner:Lcom/google/android/material/shape/CornerTreatment;
 
     sget-object v0, Lcom/google/android/material/shape/ShapePathModel;->DEFAULT_EDGE_TREATMENT:Lcom/google/android/material/shape/EdgeTreatment;
 
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->topEdge:Lcom/google/android/material/shape/EdgeTreatment;
 
-    sget-object v0, Lcom/google/android/material/shape/ShapePathModel;->DEFAULT_EDGE_TREATMENT:Lcom/google/android/material/shape/EdgeTreatment;
-
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->rightEdge:Lcom/google/android/material/shape/EdgeTreatment;
 
-    sget-object v0, Lcom/google/android/material/shape/ShapePathModel;->DEFAULT_EDGE_TREATMENT:Lcom/google/android/material/shape/EdgeTreatment;
-
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->bottomEdge:Lcom/google/android/material/shape/EdgeTreatment;
 
-    sget-object v0, Lcom/google/android/material/shape/ShapePathModel;->DEFAULT_EDGE_TREATMENT:Lcom/google/android/material/shape/EdgeTreatment;
-
     iput-object v0, p0, Lcom/google/android/material/shape/ShapePathModel;->leftEdge:Lcom/google/android/material/shape/EdgeTreatment;
 
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/TriangleEdgeTreatment.smali b/com.discord/smali_classes2/com/google/android/material/shape/TriangleEdgeTreatment.smali
index 8a6acf9304..758a29ce08 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/TriangleEdgeTreatment.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/TriangleEdgeTreatment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/shape/TriangleEdgeTreatment;
 .super Lcom/google/android/material/shape/EdgeTreatment;
+.source "TriangleEdgeTreatment.java"
 
 
 # annotations
@@ -52,19 +53,16 @@
 
     iget v1, p0, Lcom/google/android/material/shape/TriangleEdgeTreatment;->size:F
 
-    :goto_0
-    mul-float v1, v1, p2
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget v1, p0, Lcom/google/android/material/shape/TriangleEdgeTreatment;->size:F
 
     neg-float v1, v1
 
-    goto :goto_0
+    :goto_0
+    mul-float v1, v1, p2
 
-    :goto_1
     invoke-virtual {p3, v0, v1}, Lcom/google/android/material/shape/ShapePath;->lineTo(FF)V
 
     iget v1, p0, Lcom/google/android/material/shape/TriangleEdgeTreatment;->size:F
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$1.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$1.smali
index c83acf79cd..74921a9be3 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$1;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Landroid/os/Handler$Callback;
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 8ee2ac2e61..2026387e4e 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
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 4aabae663b..74517c34a1 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
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 e4e4f5f151..c5f839d7a1 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
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 d6f4e8706b..dc9545dead 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
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 4b8cf48b43..0d3f540819 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$4;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Landroidx/core/view/OnApplyWindowInsetsListener;
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 7d698ae434..8f6cd2f939 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
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 acf62096a0..44856216f9 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Lcom/google/android/material/snackbar/a$a;
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 6161812187..cb12df58ca 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
@@ -57,7 +58,7 @@
     goto :goto_0
 
     :pswitch_0
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
@@ -70,7 +71,7 @@
     return-void
 
     :pswitch_1
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
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 1135d9f066..591aff189e 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 1c01aa3299..e7a3040b18 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener;
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 e6979d54be..f91d23b18c 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback.smali
index fe411e32c2..299e6aa22f 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$Behavior.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$Behavior.smali
index a30911bfa3..5cdf162f83 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$Behavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$Behavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/snackbar/BaseTransientBottomBar$Behavior;
 .super Lcom/google/android/material/behavior/SwipeDismissBehavior;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
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 7abcf1df10..36c30fac03 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/snackbar/BaseTransientBottomBar$BehaviorDelegate;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
@@ -95,7 +96,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
@@ -107,7 +108,7 @@
 
     :cond_0
     :pswitch_1
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$ContentViewCallback.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$ContentViewCallback.smali
index f147d3a3d4..853f78174a 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$ContentViewCallback.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$ContentViewCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/snackbar/BaseTransientBottomBar$ContentViewCallback;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Lcom/google/android/material/snackbar/ContentViewCallback;
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener.smali
index 2af96c7a20..9676a32ddc 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener.smali
index d18ae81031..d2fc2c5b3f 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
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 6e5bc36882..488f985bf5 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 # interfaces
 .implements Landroidx/core/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout.smali
index a09aa68dd8..6cd8e1b972 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 .super Landroid/widget/FrameLayout;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
@@ -138,8 +139,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->onAttachStateChangeListener:Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener;
-
     invoke-interface {v0, p0}, Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener;->onViewAttachedToWindow(Landroid/view/View;)V
 
     :cond_0
@@ -157,8 +156,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->onAttachStateChangeListener:Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener;
-
     invoke-interface {v0, p0}, Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnAttachStateChangeListener;->onViewDetachedFromWindow(Landroid/view/View;)V
 
     :cond_0
@@ -176,12 +173,10 @@
 
     invoke-super/range {p0 .. p5}, Landroid/widget/FrameLayout;->onLayout(ZIIII)V
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->onLayoutChangeListener:Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener;
-
-    if-eqz p1, :cond_0
-
     iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->onLayoutChangeListener:Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener;
 
+    if-eqz v0, :cond_0
+
     move-object v1, p0
 
     move v2, p2
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 01f4f5c649..f249940400 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
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 .super Ljava/lang/Object;
+.source "BaseTransientBottomBar.java"
 
 
 # annotations
@@ -490,7 +491,7 @@
 .method protected dispatchDismiss(I)V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -509,10 +510,9 @@
 
     iget-object v1, v0, Lcom/google/android/material/snackbar/a;->bvD:Lcom/google/android/material/snackbar/a$b;
 
-    :goto_0
     invoke-virtual {v0, v1, p1}, Lcom/google/android/material/snackbar/a;->a(Lcom/google/android/material/snackbar/a$b;I)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0, v1}, Lcom/google/android/material/snackbar/a;->f(Lcom/google/android/material/snackbar/a$a;)Z
@@ -523,10 +523,10 @@
 
     iget-object v1, v0, Lcom/google/android/material/snackbar/a;->bvE:Lcom/google/android/material/snackbar/a$b;
 
-    goto :goto_0
+    invoke-virtual {v0, v1, p1}, Lcom/google/android/material/snackbar/a;->a(Lcom/google/android/material/snackbar/a$b;I)Z
 
     :cond_1
-    :goto_1
+    :goto_0
     monitor-exit v2
 
     return-void
@@ -678,7 +678,7 @@
 .method public isShown()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -694,7 +694,7 @@
 .method public isShownOrQueued()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -710,7 +710,7 @@
 .method onViewHidden(I)V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -735,7 +735,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Bs()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Br()V
 
     :cond_0
     monitor-exit v2
@@ -746,8 +746,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->callbacks:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -800,12 +798,14 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method onViewShown()V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -835,8 +835,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->callbacks:Ljava/util/List;
-
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -872,6 +870,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 .method public removeCallback(Lcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback;)Lcom/google/android/material/snackbar/BaseTransientBottomBar;
@@ -903,8 +903,6 @@
     return-object p0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->callbacks:Ljava/util/List;
-
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     return-object p0
@@ -971,7 +969,7 @@
 .method public show()V
     .locals 5
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Br()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->Bq()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -1054,7 +1052,7 @@
 
     iput-object v1, v0, Lcom/google/android/material/snackbar/a;->bvD:Lcom/google/android/material/snackbar/a$b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Bs()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Br()V
 
     monitor-exit v3
 
@@ -1101,12 +1099,7 @@
 
     move-result-object v1
 
-    goto :goto_0
-
     :cond_0
-    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->behavior:Lcom/google/android/material/snackbar/BaseTransientBottomBar$Behavior;
-
-    :goto_0
     instance-of v2, v1, Lcom/google/android/material/snackbar/BaseTransientBottomBar$Behavior;
 
     if-eqz v2, :cond_1
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/ContentViewCallback.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/ContentViewCallback.smali
index 3876b66344..9c3343efe0 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/ContentViewCallback.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/ContentViewCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/snackbar/ContentViewCallback;
 .super Ljava/lang/Object;
+.source "ContentViewCallback.java"
 
 
 # virtual methods
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 eb50099639..ef1ab1f509 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/Snackbar$1;
 .super Ljava/lang/Object;
+.source "Snackbar.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$Callback.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$Callback.smali
index 01f4fee052..ef63f0ccef 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$Callback.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$Callback.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/snackbar/Snackbar$Callback;
 .super Lcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback;
+.source "Snackbar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$SnackbarLayout.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$SnackbarLayout.smali
index a2490f3337..6f6934d421 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$SnackbarLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$SnackbarLayout.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/snackbar/Snackbar$SnackbarLayout;
 .super Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+.source "Snackbar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar.smali
index 6da6d65590..11eff018cf 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/android/material/snackbar/Snackbar;
 .super Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.source "Snackbar.java"
 
 
 # annotations
@@ -480,8 +481,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/Snackbar;->callback:Lcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback;
-
     invoke-virtual {p0, v0}, Lcom/google/android/material/snackbar/Snackbar;->removeCallback(Lcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback;)Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     :cond_0
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/SnackbarContentLayout.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/SnackbarContentLayout.smali
index f23ded0757..0eea752271 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/SnackbarContentLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/SnackbarContentLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/snackbar/SnackbarContentLayout;
 .super Landroid/widget/LinearLayout;
+.source "SnackbarContentLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/snackbar/ContentViewCallback;
@@ -356,11 +357,9 @@
 
     if-le v0, v1, :cond_0
 
-    iget p1, p0, Lcom/google/android/material/snackbar/SnackbarContentLayout;->maxWidth:I
+    const/high16 p1, 0x40000000    # 2.0f
 
-    const/high16 v0, 0x40000000    # 2.0f
-
-    invoke-static {p1, v0}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
+    invoke-static {v1, p1}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
 
     move-result p1
 
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 f1c19d2113..1e867f73b5 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/a$1;
 .super Ljava/lang/Object;
+.source "SnackbarManager.java"
 
 # interfaces
 .implements Landroid/os/Handler$Callback;
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/a$a.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/a$a.smali
index 72dccc1928..4234f60da7 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/a$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/google/android/material/snackbar/a$a;
 .super Ljava/lang/Object;
+.source "SnackbarManager.java"
 
 
 # annotations
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 cbe6e310e0..df11ccbbd2 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/a$b;
 .super Ljava/lang/Object;
+.source "SnackbarManager.java"
 
 
 # annotations
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 acc554cbfd..3a4a7cb5cb 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/snackbar/a;
 .super Ljava/lang/Object;
+.source "SnackbarManager.java"
 
 
 # annotations
@@ -54,7 +55,7 @@
     return-void
 .end method
 
-.method static Br()Lcom/google/android/material/snackbar/a;
+.method static Bq()Lcom/google/android/material/snackbar/a;
     .locals 1
 
     sget-object v0, Lcom/google/android/material/snackbar/a;->bvC:Lcom/google/android/material/snackbar/a;
@@ -75,15 +76,13 @@
 
 
 # virtual methods
-.method final Bs()V
+.method final Br()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/material/snackbar/a;->bvE:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->bvE:Lcom/google/android/material/snackbar/a$b;
-
     iput-object v0, p0, Lcom/google/android/material/snackbar/a;->bvD:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v0, 0x0
@@ -199,11 +198,9 @@
 
     iget-object v1, p0, Lcom/google/android/material/snackbar/a;->handler:Landroid/os/Handler;
 
-    iget-object v2, p0, Lcom/google/android/material/snackbar/a;->handler:Landroid/os/Handler;
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
-
-    invoke-static {v2, v3, p1}, Landroid/os/Message;->obtain(Landroid/os/Handler;ILjava/lang/Object;)Landroid/os/Message;
+    invoke-static {v1, v2, p1}, Landroid/os/Message;->obtain(Landroid/os/Handler;ILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object p1
 
@@ -367,8 +364,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->bvD:Lcom/google/android/material/snackbar/a$b;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/snackbar/a$b;->g(Lcom/google/android/material/snackbar/a$a;)Z
 
     move-result p1
@@ -392,8 +387,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->bvE:Lcom/google/android/material/snackbar/a$b;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/snackbar/a$b;->g(Lcom/google/android/material/snackbar/a$a;)Z
 
     move-result p1
diff --git a/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState$1.smali
index 24e2d9541c..f319796735 100644
--- a/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/stateful/ExtendableSavedState$1;
 .super Ljava/lang/Object;
+.source "ExtendableSavedState.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
diff --git a/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState.smali b/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState.smali
index d887f8a7cd..2ec1cd3f69 100644
--- a/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/stateful/ExtendableSavedState.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/stateful/ExtendableSavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "ExtendableSavedState.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabItem.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabItem.smali
index a3dc0e71bd..ad4931c2df 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabItem.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabItem.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/tabs/TabItem;
 .super Landroid/view/View;
+.source "TabItem.java"
 
 
 # instance fields
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 71dad9038e..68a994fbe0 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/tabs/TabLayout$1;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener.smali
index 6fb39b6972..6fd8eb0703 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$OnTabSelectedListener.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$OnTabSelectedListener.smali
index ed3dc441fe..226163405a 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$OnTabSelectedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$OnTabSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/android/material/tabs/TabLayout$OnTabSelectedListener;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$Tab.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$Tab.smali
index 63d8aa5d35..5c88998174 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$Tab.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$Tab.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/tabs/TabLayout$Tab;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 
 # annotations
@@ -80,8 +81,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$Tab;->view:Lcom/google/android/material/tabs/TabLayout$d;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$d;->getContentDescription()Ljava/lang/CharSequence;
 
     move-result-object v0
@@ -144,8 +143,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$Tab;->parent:Lcom/google/android/material/tabs/TabLayout;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->getSelectedTabPosition()I
 
     move-result v0
@@ -206,8 +203,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$Tab;->parent:Lcom/google/android/material/tabs/TabLayout;
-
     invoke-virtual {v0, p0}, Lcom/google/android/material/tabs/TabLayout;->selectTab(Lcom/google/android/material/tabs/TabLayout$Tab;)V
 
     return-void
@@ -235,8 +230,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$Tab;->parent:Lcom/google/android/material/tabs/TabLayout;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
@@ -340,8 +333,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$Tab;->parent:Lcom/google/android/material/tabs/TabLayout;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->getContext()Landroid/content/Context;
 
     move-result-object v0
@@ -417,8 +408,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$Tab;->parent:Lcom/google/android/material/tabs/TabLayout;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
@@ -485,8 +474,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$Tab;->view:Lcom/google/android/material/tabs/TabLayout$d;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$d;->update()V
 
     :cond_0
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener.smali
index a453060a24..9b7694cf5e 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
@@ -147,8 +148,6 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener;->scrollState:I
-
     const/4 v2, 0x2
 
     if-ne v1, v2, :cond_0
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$ViewPagerOnTabSelectedListener.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$ViewPagerOnTabSelectedListener.smali
index ca0d33a48f..e5c29aa0a7 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$ViewPagerOnTabSelectedListener.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$ViewPagerOnTabSelectedListener.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/tabs/TabLayout$ViewPagerOnTabSelectedListener;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Lcom/google/android/material/tabs/TabLayout$OnTabSelectedListener;
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 0d461f5b34..28c2ae9c63 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/tabs/TabLayout$a;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;
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 7a04ce97e7..1f2110757c 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/tabs/TabLayout$b;
 .super Landroid/database/DataSetObserver;
+.source "TabLayout.java"
 
 
 # annotations
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 09aba28192..4174d84630 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/tabs/TabLayout$c$1;
 .super Ljava/lang/Object;
+.source "TabLayout.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
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 986fe5e484..1910c34e8b 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/tabs/TabLayout$c$2;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "TabLayout.java"
 
 
 # annotations
@@ -43,8 +44,6 @@
 
     iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->bvM:I
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->bvT:Lcom/google/android/material/tabs/TabLayout$c;
-
     const/4 v0, 0x0
 
     iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->bvN:F
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 9007c25db7..8242690dc1 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/tabs/TabLayout$c;
 .super Landroid/widget/LinearLayout;
+.source "TabLayout.java"
 
 
 # annotations
@@ -75,7 +76,7 @@
 .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;->Bu()I
+    invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout$d;->Bt()I
 
     move-result v0
 
@@ -127,8 +128,8 @@
 
 
 # virtual methods
-.method final Bt()V
-    .locals 6
+.method final Bs()V
+    .locals 7
 
     iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvM:I
 
@@ -272,39 +273,33 @@
 
     int-to-float v3, v3
 
-    mul-float v0, v0, v3
-
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvN:F
+    mul-float v3, v3, v0
 
     const/high16 v5, 0x3f800000    # 1.0f
 
-    sub-float v3, v5, v3
+    sub-float v6, v5, v0
 
     int-to-float v1, v1
 
-    mul-float v3, v3, v1
+    mul-float v6, v6, v1
 
-    add-float/2addr v0, v3
+    add-float/2addr v3, v6
 
-    float-to-int v1, v0
-
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvN:F
+    float-to-int v1, v3
 
     int-to-float v3, v4
 
-    mul-float v0, v0, v3
+    mul-float v3, v3, v0
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvN:F
+    sub-float/2addr v5, v0
 
-    sub-float/2addr v5, v3
+    int-to-float v0, v2
 
-    int-to-float v2, v2
+    mul-float v5, v5, v0
 
-    mul-float v5, v5, v2
+    add-float/2addr v3, v5
 
-    add-float/2addr v0, v5
-
-    float-to-int v2, v0
+    float-to-int v2, v3
 
     goto :goto_0
 
@@ -349,8 +344,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvO:Landroid/animation/ValueAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result v0
@@ -368,7 +361,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Bt()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Bs()V
 
     return-void
 
@@ -421,11 +414,18 @@
 
     float-to-int v2, v0
 
+    move v6, v1
+
+    move v8, v2
+
+    goto :goto_0
+
     :cond_2
     move v6, v1
 
     move v8, v2
 
+    :goto_0
     iget v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->indicatorLeft:I
 
     iget v7, p0, Lcom/google/android/material/tabs/TabLayout$c;->indicatorRight:I
@@ -478,8 +478,6 @@
     :cond_4
     return-void
 
-    nop
-
     :array_0
     .array-data 4
         0x0
@@ -516,7 +514,7 @@
 
     if-ltz v2, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvJ:I
+    move v0, v2
 
     :cond_1
     iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvH:Lcom/google/android/material/tabs/TabLayout;
@@ -532,6 +530,13 @@
     :pswitch_0
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->getHeight()I
 
+    move-result v0
+
+    goto :goto_1
+
+    :pswitch_1
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->getHeight()I
+
     move-result v1
 
     sub-int/2addr v1, v0
@@ -548,14 +553,13 @@
 
     goto :goto_1
 
-    :pswitch_1
+    :pswitch_2
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->getHeight()I
 
     move-result v1
 
     sub-int/2addr v1, v0
 
-    :pswitch_2
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->getHeight()I
 
     move-result v0
@@ -566,11 +570,9 @@
 
     if-ltz v2, :cond_5
 
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->indicatorRight:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->indicatorRight:I
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->indicatorLeft:I
-
-    if-le v2, v3, :cond_5
+    if-le v3, v2, :cond_5
 
     iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvH:Lcom/google/android/material/tabs/TabLayout;
 
@@ -640,10 +642,10 @@
 
     :pswitch_data_0
     .packed-switch 0x0
-        :pswitch_1
-        :pswitch_0
-        :pswitch_3
         :pswitch_2
+        :pswitch_1
+        :pswitch_3
+        :pswitch_0
     .end packed-switch
 .end method
 
@@ -692,8 +694,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvO:Landroid/animation/ValueAnimator;
-
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result p1
@@ -735,7 +735,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Bt()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Bs()V
 
     return-void
 .end method
@@ -881,8 +881,6 @@
 
     iput v2, v0, Lcom/google/android/material/tabs/TabLayout;->tabGravity:I
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->bvH:Lcom/google/android/material/tabs/TabLayout;
-
     invoke-virtual {v0, v2}, Lcom/google/android/material/tabs/TabLayout;->updateTabViews(Z)V
 
     :goto_2
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 4a36df2b30..61cd41959a 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/tabs/TabLayout$d;
 .super Landroid/widget/LinearLayout;
+.source "TabLayout.java"
 
 
 # annotations
@@ -104,8 +105,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvZ:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$d;->getLeft()I
 
     move-result v1
@@ -157,8 +156,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvZ:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result p1
@@ -286,7 +283,7 @@
 
 
 # virtual methods
-.method final Bu()I
+.method final Bt()I
     .locals 9
 
     const/4 v0, 0x3
@@ -396,8 +393,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvV:Lcom/google/android/material/tabs/TabLayout$Tab;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->getIcon()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -428,8 +423,6 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvV:Lcom/google/android/material/tabs/TabLayout$Tab;
-
     invoke-virtual {v2}, Lcom/google/android/material/tabs/TabLayout$Tab;->getText()Ljava/lang/CharSequence;
 
     move-result-object v2
@@ -532,12 +525,11 @@
 
     iput v4, p1, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
-    :goto_5
     invoke-virtual {p2, p1}, Landroid/widget/ImageView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
     invoke-virtual {p2}, Landroid/widget/ImageView;->requestLayout()V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     iget v3, p1, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
@@ -548,26 +540,26 @@
 
     invoke-static {p1, v4}, Landroidx/core/view/MarginLayoutParamsCompat;->setMarginEnd(Landroid/view/ViewGroup$MarginLayoutParams;I)V
 
-    goto :goto_5
+    invoke-virtual {p2, p1}, Landroid/widget/ImageView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    invoke-virtual {p2}, Landroid/widget/ImageView;->requestLayout()V
 
     :cond_8
-    :goto_6
+    :goto_5
     iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvV:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eqz p1, :cond_9
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvV:Lcom/google/android/material/tabs/TabLayout$Tab;
-
     invoke-static {p1}, Lcom/google/android/material/tabs/TabLayout$Tab;->access$100(Lcom/google/android/material/tabs/TabLayout$Tab;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_9
     move-object p1, v1
 
-    :goto_7
+    :goto_6
     if-eqz v0, :cond_a
 
     move-object p1, v1
@@ -612,8 +604,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvZ:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->isStateful()Z
 
     move-result v1
@@ -729,8 +719,6 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvW:Landroid/widget/ImageView;
-
     invoke-virtual {v2}, Landroid/widget/ImageView;->getVisibility()I
 
     move-result v2
@@ -746,8 +734,6 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->textView:Landroid/widget/TextView;
-
     invoke-virtual {v2}, Landroid/widget/TextView;->getLineCount()I
 
     move-result v2
@@ -891,6 +877,8 @@
 
     const/4 v0, 0x1
 
+    return v0
+
     :cond_1
     return v0
 .end method
@@ -933,8 +921,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->textView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setSelected(Z)V
 
     :cond_2
@@ -942,8 +928,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvW:Landroid/widget/ImageView;
-
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setSelected(Z)V
 
     :cond_3
@@ -951,8 +935,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->customView:Landroid/view/View;
-
     invoke-virtual {v0, p1}, Landroid/view/View;->setSelected(Z)V
 
     :cond_4
@@ -1004,8 +986,6 @@
 
     if-eqz v3, :cond_3
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->textView:Landroid/widget/TextView;
-
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setVisibility(I)V
 
     :cond_3
@@ -1013,8 +993,6 @@
 
     if-eqz v3, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvW:Landroid/widget/ImageView;
-
     invoke-virtual {v3, v4}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvW:Landroid/widget/ImageView;
@@ -1036,8 +1014,6 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvX:Landroid/widget/TextView;
-
     invoke-static {v3}, Landroidx/core/widget/TextViewCompat;->getMaxLines(Landroid/widget/TextView;)I
 
     move-result v3
@@ -1062,8 +1038,6 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->customView:Landroid/view/View;
-
     invoke-virtual {p0, v2}, Lcom/google/android/material/tabs/TabLayout$d;->removeView(Landroid/view/View;)V
 
     iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->customView:Landroid/view/View;
@@ -1207,6 +1181,8 @@
 
     iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvW: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
@@ -1223,10 +1199,10 @@
 
     iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->bvY:Landroid/widget/ImageView;
 
-    :goto_2
     invoke-virtual {p0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
 
     :cond_f
+    :goto_2
     if-eqz v0, :cond_10
 
     invoke-static {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->access$100(Lcom/google/android/material/tabs/TabLayout$Tab;)Ljava/lang/CharSequence;
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 ec0c2d021d..87824733c3 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/tabs/TabLayout;
 .super Landroid/widget/HorizontalScrollView;
+.source "TabLayout.java"
 
 
 # annotations
@@ -1121,8 +1122,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->tabViewPool:Landroidx/core/util/Pools$Pool;
-
     invoke-interface {v0}, Landroidx/core/util/Pools$Pool;->acquire()Ljava/lang/Object;
 
     move-result-object v0
@@ -1172,19 +1171,18 @@
 
     move-result-object p1
 
-    :goto_1
     invoke-virtual {v0, p1}, Lcom/google/android/material/tabs/TabLayout$d;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-static {p1}, Lcom/google/android/material/tabs/TabLayout$Tab;->access$100(Lcom/google/android/material/tabs/TabLayout$Tab;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
-    goto :goto_1
+    invoke-virtual {v0, p1}, Lcom/google/android/material/tabs/TabLayout$d;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    :goto_2
+    :goto_1
     return-object v0
 .end method
 
@@ -1416,8 +1414,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout;->requestedTabMinWidth:I
-
     return v0
 
     :cond_0
@@ -1573,14 +1569,10 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->pageChangeListener:Lcom/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->viewPager:Landroidx/viewpager/widget/ViewPager;
-
     iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout;->pageChangeListener:Lcom/google/android/material/tabs/TabLayout$TabLayoutOnPageChangeListener;
 
+    if-eqz v1, :cond_0
+
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->removeOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
 
     :cond_0
@@ -1588,11 +1580,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->viewPager:Landroidx/viewpager/widget/ViewPager;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout;->viewPager:Landroidx/viewpager/widget/ViewPager;
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout;->adapterChangeListener:Lcom/google/android/material/tabs/TabLayout$a;
-
-    invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->removeOnAdapterChangeListener(Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;)V
+    invoke-virtual {v1, v0}, Landroidx/viewpager/widget/ViewPager;->removeOnAdapterChangeListener(Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;)V
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->currentVpSelectedListener:Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;
@@ -1601,8 +1591,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->currentVpSelectedListener:Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;
-
     invoke-virtual {p0, v0}, Lcom/google/android/material/tabs/TabLayout;->removeOnTabSelectedListener(Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;)V
 
     iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout;->currentVpSelectedListener:Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;
@@ -1665,9 +1653,7 @@
 
     iput-boolean p2, v0, Lcom/google/android/material/tabs/TabLayout$a;->bvI:Z
 
-    iget-object p2, p0, Lcom/google/android/material/tabs/TabLayout;->adapterChangeListener:Lcom/google/android/material/tabs/TabLayout$a;
-
-    invoke-virtual {p1, p2}, Landroidx/viewpager/widget/ViewPager;->addOnAdapterChangeListener(Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;)V
+    invoke-virtual {p1, v0}, Landroidx/viewpager/widget/ViewPager;->addOnAdapterChangeListener(Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;)V
 
     invoke-virtual {p1}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
 
@@ -1745,7 +1731,6 @@
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    :goto_0
     iput v0, p1, Landroid/widget/LinearLayout$LayoutParams;->weight:F
 
     return-void
@@ -1757,7 +1742,9 @@
 
     const/4 v0, 0x0
 
-    goto :goto_0
+    iput v0, p1, Landroid/widget/LinearLayout$LayoutParams;->weight:F
+
+    return-void
 .end method
 
 
@@ -1993,8 +1980,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->selectedTab:Lcom/google/android/material/tabs/TabLayout$Tab;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->getPosition()I
 
     move-result v0
@@ -2327,8 +2312,6 @@
 
     if-lez v1, :cond_2
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout;->requestedTabMaxWidth:I
-
     goto :goto_1
 
     :cond_2
@@ -2338,10 +2321,10 @@
 
     move-result v1
 
-    sub-int/2addr v0, v1
+    sub-int v1, v0, v1
 
     :goto_1
-    iput v0, p0, Lcom/google/android/material/tabs/TabLayout;->tabMaxWidth:I
+    iput v1, p0, Lcom/google/android/material/tabs/TabLayout;->tabMaxWidth:I
 
     :cond_3
     invoke-super {p0, p1, p2}, Landroid/widget/HorizontalScrollView;->onMeasure(II)V
@@ -2364,7 +2347,7 @@
 
     packed-switch v2, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     invoke-virtual {v1}, Landroid/view/View;->getMeasuredWidth()I
@@ -2377,10 +2360,9 @@
 
     if-eq v2, v4, :cond_4
 
-    :goto_2
     const/4 p1, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_1
     invoke-virtual {v1}, Landroid/view/View;->getMeasuredWidth()I
@@ -2393,10 +2375,10 @@
 
     if-ge v2, v4, :cond_4
 
-    goto :goto_2
+    const/4 p1, 0x1
 
     :cond_4
-    :goto_3
+    :goto_2
     if-eqz p1, :cond_5
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout;->getPaddingTop()I
@@ -2432,8 +2414,6 @@
     :cond_5
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
@@ -2450,8 +2430,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->pagerAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     invoke-virtual {v0}, Landroidx/viewpager/widget/PagerAdapter;->getCount()I
 
     move-result v0
@@ -2490,9 +2468,7 @@
 
     if-lez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->viewPager:Landroidx/viewpager/widget/ViewPager;
-
-    invoke-virtual {v0}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
+    invoke-virtual {v1}, Landroidx/viewpager/widget/ViewPager;->getCurrentItem()I
 
     move-result v0
 
@@ -2634,8 +2610,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->selectedTab:Lcom/google/android/material/tabs/TabLayout$Tab;
-
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->getPosition()I
 
     move-result v0
@@ -2869,6 +2843,8 @@
 
     iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->bvW:Landroid/widget/ImageView;
 
+    invoke-virtual {v0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
+
     goto :goto_2
 
     :cond_1
@@ -2877,10 +2853,10 @@
 
     iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->bvY:Landroid/widget/ImageView;
 
-    :goto_2
     invoke-virtual {v0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
 
     :cond_2
+    :goto_2
     add-int/lit8 p1, p1, 0x1
 
     goto :goto_0
@@ -2925,8 +2901,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->selectedListener:Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;
-
     invoke-virtual {p0, v0}, Lcom/google/android/material/tabs/TabLayout;->removeOnTabSelectedListener(Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;)V
 
     :cond_0
@@ -2951,14 +2925,10 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->pagerAdapterObserver:Landroid/database/DataSetObserver;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->pagerAdapter:Landroidx/viewpager/widget/PagerAdapter;
-
     iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout;->pagerAdapterObserver:Landroid/database/DataSetObserver;
 
+    if-eqz v1, :cond_0
+
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/PagerAdapter;->unregisterDataSetObserver(Landroid/database/DataSetObserver;)V
 
     :cond_0
@@ -3022,7 +2992,7 @@
 
     move-result v0
 
-    if-ltz v0, :cond_4
+    if-ltz v0, :cond_5
 
     iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout;->slidingTabIndicator:Lcom/google/android/material/tabs/TabLayout$c;
 
@@ -3060,15 +3030,13 @@
 
     iput p2, p4, Lcom/google/android/material/tabs/TabLayout$c;->bvN:F
 
-    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->Bt()V
+    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->Bs()V
 
     :cond_2
     iget-object p4, p0, Lcom/google/android/material/tabs/TabLayout;->scrollAnimator:Landroid/animation/ValueAnimator;
 
     if-eqz p4, :cond_3
 
-    iget-object p4, p0, Lcom/google/android/material/tabs/TabLayout;->scrollAnimator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {p4}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result p4
@@ -3093,6 +3061,9 @@
     invoke-direct {p0, v0}, Lcom/google/android/material/tabs/TabLayout;->setSelectedTabView(I)V
 
     :cond_4
+    return-void
+
+    :cond_5
     :goto_0
     return-void
 .end method
@@ -3114,7 +3085,6 @@
 
     move-result-object p1
 
-    :goto_0
     invoke-virtual {p0, p1}, Lcom/google/android/material/tabs/TabLayout;->setSelectedTabIndicator(Landroid/graphics/drawable/Drawable;)V
 
     return-void
@@ -3122,7 +3092,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    goto :goto_0
+    invoke-virtual {p0, p1}, Lcom/google/android/material/tabs/TabLayout;->setSelectedTabIndicator(Landroid/graphics/drawable/Drawable;)V
+
+    return-void
 .end method
 
 .method public setSelectedTabIndicator(Landroid/graphics/drawable/Drawable;)V
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputEditText.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputEditText.smali
index 7eb2f86072..3823370863 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputEditText.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputEditText.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/textfield/TextInputEditText;
 .super Landroidx/appcompat/widget/AppCompatEditText;
+.source "TextInputEditText.java"
 
 
 # direct methods
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 5a65659977..90c152ec53 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/textfield/TextInputLayout$1;
 .super Ljava/lang/Object;
+.source "TextInputLayout.java"
 
 # interfaces
 .implements Landroid/text/TextWatcher;
@@ -38,9 +39,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->bwy:Lcom/google/android/material/textfield/TextInputLayout;
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->bwy:Lcom/google/android/material/textfield/TextInputLayout;
-
-    invoke-static {v1}, Lcom/google/android/material/textfield/TextInputLayout;->access$000(Lcom/google/android/material/textfield/TextInputLayout;)Z
+    invoke-static {v0}, Lcom/google/android/material/textfield/TextInputLayout;->access$000(Lcom/google/android/material/textfield/TextInputLayout;)Z
 
     move-result v1
 
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 18ea815487..12cb0076a5 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/textfield/TextInputLayout$2;
 .super Ljava/lang/Object;
+.source "TextInputLayout.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 eaf28d670a..8a8745cc09 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/textfield/TextInputLayout$3;
 .super Ljava/lang/Object;
+.source "TextInputLayout.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$AccessibilityDelegate.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$AccessibilityDelegate.smali
index 3c1363b5f1..76e76c884e 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$AccessibilityDelegate.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$AccessibilityDelegate.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/textfield/TextInputLayout$AccessibilityDelegate;
 .super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "TextInputLayout.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$SavedState$1.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$SavedState$1.smali
index b594c6f2db..a3e73e74a2 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$SavedState$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$SavedState$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/textfield/TextInputLayout$SavedState$1;
 .super Ljava/lang/Object;
+.source "TextInputLayout.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$ClassLoaderCreator;
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 531d1d2012..ed69a320b0 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
@@ -1,5 +1,6 @@
 .class Lcom/google/android/material/textfield/TextInputLayout$SavedState;
 .super Landroidx/customview/view/AbsSavedState;
+.source "TextInputLayout.java"
 
 
 # annotations
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 cc955574f4..a2f56cb0e9 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
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/textfield/TextInputLayout;
 .super Landroid/widget/LinearLayout;
+.source "TextInputLayout.java"
 
 
 # annotations
@@ -643,13 +644,11 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
+    iget v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    if-ne v0, v1, :cond_2
-
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
+    if-ne v1, v2, :cond_2
 
     invoke-virtual {v0}, Landroid/widget/EditText;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -677,20 +676,16 @@
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
+    iget v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    if-ne v0, v1, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editTextOriginalDrawable:Landroid/graphics/drawable/Drawable;
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
+    if-ne v1, v2, :cond_3
 
     iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->editTextOriginalDrawable:Landroid/graphics/drawable/Drawable;
 
+    if-eqz v1, :cond_3
+
     invoke-static {v0, v1}, Landroidx/core/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V
 
     :cond_3
@@ -698,17 +693,13 @@
 
     if-ltz v0, :cond_4
 
-    iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
+    iget v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
 
-    iget v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthPx:I
-
-    iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
-
-    invoke-virtual {v0, v1, v2}, Landroid/graphics/drawable/GradientDrawable;->setStroke(II)V
+    invoke-virtual {v2, v0, v1}, Landroid/graphics/drawable/GradientDrawable;->setStroke(II)V
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
@@ -830,8 +821,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggleView:Lcom/google/android/material/internal/CheckableImageButton;
-
     invoke-virtual {v0}, Lcom/google/android/material/internal/CheckableImageButton;->getDrawable()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -842,8 +831,6 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggleView:Lcom/google/android/material/internal/CheckableImageButton;
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggleDrawable:Landroid/graphics/drawable/Drawable;
-
     invoke-virtual {v0, v1}, Lcom/google/android/material/internal/CheckableImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_3
@@ -859,14 +846,11 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     iput-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
 
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
-
     const/4 v1, 0x2
 
     if-ne v0, v1, :cond_1
@@ -885,7 +869,9 @@
 
     invoke-direct {v0}, Lcom/google/android/material/textfield/a;-><init>()V
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
+
+    return-void
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
@@ -905,7 +891,7 @@
 .end method
 
 .method private calculateBoxBackgroundTop()I
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
@@ -916,15 +902,13 @@
     return v1
 
     :cond_0
-    iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
+    iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
 
-    packed-switch v0, :pswitch_data_0
+    packed-switch v2, :pswitch_data_0
 
     return v1
 
     :pswitch_0
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->getTop()I
 
     move-result v0
@@ -938,8 +922,6 @@
     return v0
 
     :pswitch_1
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->getTop()I
 
     move-result v0
@@ -1040,7 +1022,6 @@
 
     div-float/2addr v0, v1
 
-    :goto_0
     float-to-int v0, v0
 
     return v0
@@ -1052,7 +1033,11 @@
 
     move-result v0
 
-    goto :goto_0
+    float-to-int v0, v0
+
+    return v0
+
+    nop
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -1090,8 +1075,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->animator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result v0
@@ -1249,8 +1232,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->animator:Landroid/animation/ValueAnimator;
-
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->isRunning()Z
 
     move-result v0
@@ -1290,7 +1271,7 @@
 
     check-cast p1, Lcom/google/android/material/textfield/a;
 
-    invoke-virtual {p1}, Lcom/google/android/material/textfield/a;->Bv()Z
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/a;->Bu()Z
 
     move-result p1
 
@@ -1317,8 +1298,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
-
     const/4 v1, 0x2
 
     if-ne v0, v1, :cond_0
@@ -1372,33 +1351,25 @@
 
     aput v9, v0, v8
 
-    iget v8, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusTopStart:F
-
-    aput v8, v0, v7
+    aput v9, v0, v7
 
     iget v7, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusTopEnd:F
 
     aput v7, v0, v6
 
-    iget v6, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusTopEnd:F
-
-    aput v6, v0, v5
+    aput v7, v0, v5
 
     iget v5, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomEnd:F
 
     aput v5, v0, v4
 
-    iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomEnd:F
-
-    aput v4, v0, v3
+    aput v5, v0, v3
 
     iget v3, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomStart:F
 
     aput v3, v0, v2
 
-    iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomStart:F
-
-    aput v2, v0, v1
+    aput v3, v0, v1
 
     return-object v0
 
@@ -1409,33 +1380,25 @@
 
     aput v9, v0, v8
 
-    iget v8, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusTopEnd:F
-
-    aput v8, v0, v7
+    aput v9, v0, v7
 
     iget v7, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusTopStart:F
 
     aput v7, v0, v6
 
-    iget v6, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusTopStart:F
-
-    aput v6, v0, v5
+    aput v7, v0, v5
 
     iget v5, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomStart:F
 
     aput v5, v0, v4
 
-    iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomStart:F
-
-    aput v4, v0, v3
+    aput v5, v0, v3
 
     iget v3, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomEnd:F
 
     aput v3, v0, v2
 
-    iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxCornerRadiusBottomEnd:F
-
-    aput v2, v0, v1
+    aput v3, v0, v1
 
     return-object v0
 .end method
@@ -1447,8 +1410,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->getTransformationMethod()Landroid/text/method/TransformationMethod;
 
     move-result-object v0
@@ -1595,12 +1556,12 @@
 
     iput v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthPx:I
 
+    return-void
+
     :cond_0
     :goto_0
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -1757,7 +1718,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;->By()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->Bx()V
 
     invoke-direct {p0}, Lcom/google/android/material/textfield/TextInputLayout;->updatePasswordToggleView()V
 
@@ -1842,8 +1803,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->getBackground()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -1960,8 +1919,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v1}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
 
     move-result-object v1
@@ -1984,8 +1941,6 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v4}, Landroid/widget/EditText;->hasFocus()Z
 
     move-result v4
@@ -2000,7 +1955,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;->Bz()Z
+    invoke-virtual {v3}, Lcom/google/android/material/textfield/b;->By()Z
 
     move-result v3
 
@@ -2008,11 +1963,9 @@
 
     if-eqz v4, :cond_2
 
-    iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
+    iget-object v5, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
-    iget-object v5, p0, Lcom/google/android/material/textfield/TextInputLayout;->defaultHintTextColor:Landroid/content/res/ColorStateList;
-
-    invoke-virtual {v4, v5}, Lcom/google/android/material/internal/CollapsingTextHelper;->setCollapsedTextColor(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v5, v4}, Lcom/google/android/material/internal/CollapsingTextHelper;->setCollapsedTextColor(Landroid/content/res/ColorStateList;)V
 
     iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
@@ -2043,7 +1996,7 @@
 
     invoke-virtual {v0, v4}, Lcom/google/android/material/internal/CollapsingTextHelper;->setExpandedTextColor(Landroid/content/res/ColorStateList;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     if-eqz v3, :cond_5
@@ -2058,7 +2011,11 @@
 
     iget-object v4, v4, Lcom/google/android/material/textfield/b;->bwp:Landroid/widget/TextView;
 
-    goto :goto_3
+    invoke-virtual {v4}, Landroid/widget/TextView;->getTextColors()Landroid/content/res/ColorStateList;
+
+    move-result-object v4
+
+    goto :goto_2
 
     :cond_4
     const/4 v4, 0x0
@@ -2066,7 +2023,7 @@
     :goto_2
     invoke-virtual {v0, v4}, Lcom/google/android/material/internal/CollapsingTextHelper;->setCollapsedTextColor(Landroid/content/res/ColorStateList;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
     iget-boolean v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterOverflowed:Z
@@ -2077,16 +2034,15 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
+    iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
-    iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
+    invoke-virtual {v0}, Landroid/widget/TextView;->getTextColors()Landroid/content/res/ColorStateList;
 
-    :goto_3
-    invoke-virtual {v4}, Landroid/widget/TextView;->getTextColors()Landroid/content/res/ColorStateList;
+    move-result-object v0
 
-    move-result-object v4
+    invoke-virtual {v4, v0}, Lcom/google/android/material/internal/CollapsingTextHelper;->setCollapsedTextColor(Landroid/content/res/ColorStateList;)V
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_6
     if-eqz v2, :cond_7
@@ -2095,14 +2051,12 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
+    iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
-    iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->focusedTextColor:Landroid/content/res/ColorStateList;
-
-    goto :goto_2
+    invoke-virtual {v4, v0}, Lcom/google/android/material/internal/CollapsingTextHelper;->setCollapsedTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_7
-    :goto_4
+    :goto_3
     if-nez v1, :cond_a
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->isEnabled()Z
@@ -2115,7 +2069,7 @@
 
     if-eqz v3, :cond_8
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
     if-nez p2, :cond_9
@@ -2127,24 +2081,24 @@
     :cond_9
     invoke-direct {p0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->expandHint(Z)V
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_a
-    :goto_5
+    :goto_4
     if-nez p2, :cond_c
 
     iget-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout;->hintExpanded:Z
 
     if-eqz p2, :cond_b
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_b
-    :goto_6
+    :goto_5
     return-void
 
     :cond_c
-    :goto_7
+    :goto_6
     invoke-direct {p0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->collapseHint(Z)V
 
     return-void
@@ -2229,8 +2183,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->getMinimumHeight(Landroid/view/View;)I
 
     move-result v0
@@ -2343,8 +2295,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggleView:Lcom/google/android/material/internal/CheckableImageButton;
-
     invoke-virtual {v0}, Lcom/google/android/material/internal/CheckableImageButton;->getVisibility()I
 
     move-result v0
@@ -2395,7 +2345,7 @@
 .end method
 
 .method private updateTextInputBoxBounds()V
-    .locals 6
+    .locals 7
 
     iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
 
@@ -2452,23 +2402,17 @@
 
     iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthFocusedPx:I
 
-    div-int/2addr v4, v5
+    div-int/lit8 v6, v4, 0x2
 
-    add-int/2addr v0, v4
+    add-int/2addr v0, v6
 
-    iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthFocusedPx:I
+    div-int/lit8 v6, v4, 0x2
 
-    div-int/2addr v4, v5
+    sub-int/2addr v1, v6
 
-    sub-int/2addr v1, v4
+    div-int/lit8 v6, v4, 0x2
 
-    iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthFocusedPx:I
-
-    div-int/2addr v4, v5
-
-    sub-int/2addr v2, v4
-
-    iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthFocusedPx:I
+    sub-int/2addr v2, v6
 
     div-int/2addr v4, v5
 
@@ -2483,6 +2427,8 @@
 
     invoke-direct {p0}, Lcom/google/android/material/textfield/TextInputLayout;->updateEditTextBackgroundBounds()V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -2624,7 +2570,7 @@
 
     check-cast v0, Lcom/google/android/material/textfield/a;
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/a;->Bv()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/a;->Bu()Z
 
     move-result v0
 
@@ -2654,17 +2600,15 @@
     goto :goto_0
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
+    iget-boolean v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    iput-boolean v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
+    iput-boolean v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
+    invoke-virtual {v0}, Landroid/widget/EditText;->getHint()Ljava/lang/CharSequence;
 
-    invoke-virtual {v1}, Landroid/widget/EditText;->getHint()Ljava/lang/CharSequence;
-
-    move-result-object v1
+    move-result-object v0
 
     iget-object v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
@@ -2679,9 +2623,9 @@
 
     iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
-    invoke-virtual {p1, v1}, Landroid/widget/EditText;->setHint(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Landroid/widget/EditText;->setHint(Ljava/lang/CharSequence;)V
 
-    iput-boolean v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
+    iput-boolean v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
 
     return-void
 
@@ -2690,9 +2634,9 @@
 
     iget-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
-    invoke-virtual {p2, v1}, Landroid/widget/EditText;->setHint(Ljava/lang/CharSequence;)V
+    invoke-virtual {p2, v0}, Landroid/widget/EditText;->setHint(Ljava/lang/CharSequence;)V
 
-    iput-boolean v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
+    iput-boolean v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->isProvidingHint:Z
 
     throw p1
 
@@ -2734,8 +2678,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
-
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/GradientDrawable;->draw(Landroid/graphics/Canvas;)V
 
     :cond_0
@@ -2805,8 +2747,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
-
     invoke-virtual {v0, v1}, Lcom/google/android/material/internal/CollapsingTextHelper;->setState([I)Z
 
     move-result v0
@@ -2902,8 +2842,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
-
     invoke-virtual {v0}, Landroid/widget/TextView;->getContentDescription()Ljava/lang/CharSequence;
 
     move-result-object v0
@@ -2966,7 +2904,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;->BA()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bz()I
 
     move-result v0
 
@@ -2980,7 +2918,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;->BA()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bz()I
 
     move-result v0
 
@@ -3237,13 +3175,11 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->tmpRect:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout;->tmpRect:Landroid/graphics/Rect;
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
+    invoke-static {p0, p1, p2}, Lcom/google/android/material/internal/DescendantOffsetUtils;->getDescendantRect(Landroid/view/ViewGroup;Landroid/view/View;Landroid/graphics/Rect;)V
 
-    invoke-static {p0, p2, p1}, Lcom/google/android/material/internal/DescendantOffsetUtils;->getDescendantRect(Landroid/view/ViewGroup;Landroid/view/View;Landroid/graphics/Rect;)V
-
-    iget p2, p1, Landroid/graphics/Rect;->left:I
+    iget p1, p2, Landroid/graphics/Rect;->left:I
 
     iget-object p4, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
@@ -3251,9 +3187,9 @@
 
     move-result p4
 
-    add-int/2addr p2, p4
+    add-int/2addr p1, p4
 
-    iget p4, p1, Landroid/graphics/Rect;->right:I
+    iget p4, p2, Landroid/graphics/Rect;->right:I
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
@@ -3269,7 +3205,7 @@
 
     iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
-    iget v2, p1, Landroid/graphics/Rect;->top:I
+    iget v2, p2, Landroid/graphics/Rect;->top:I
 
     iget-object v3, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
@@ -3279,7 +3215,7 @@
 
     add-int/2addr v2, v3
 
-    iget p1, p1, Landroid/graphics/Rect;->bottom:I
+    iget p2, p2, Landroid/graphics/Rect;->bottom:I
 
     iget-object v3, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
 
@@ -3287,11 +3223,11 @@
 
     move-result v3
 
-    sub-int/2addr p1, v3
+    sub-int/2addr p2, v3
 
-    invoke-virtual {v1, p2, v2, p4, p1}, Lcom/google/android/material/internal/CollapsingTextHelper;->setExpandedBounds(IIII)V
+    invoke-virtual {v1, p1, v2, p4, p2}, Lcom/google/android/material/internal/CollapsingTextHelper;->setExpandedBounds(IIII)V
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
+    iget-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
     sub-int/2addr p5, p3
 
@@ -3301,7 +3237,7 @@
 
     sub-int/2addr p5, p3
 
-    invoke-virtual {p1, p2, v0, p4, p5}, Lcom/google/android/material/internal/CollapsingTextHelper;->setCollapsedBounds(IIII)V
+    invoke-virtual {p2, p1, v0, p4, p5}, Lcom/google/android/material/internal/CollapsingTextHelper;->setCollapsedBounds(IIII)V
 
     iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
@@ -3384,7 +3320,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;->Bz()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->By()Z
 
     move-result v0
 
@@ -3431,10 +3367,9 @@
 
     const/4 v1, 0x1
 
-    :goto_0
     iput-boolean v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggledVisible:Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
@@ -3447,9 +3382,9 @@
 
     const/4 v1, 0x0
 
-    goto :goto_0
+    iput-boolean v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggledVisible:Z
 
-    :goto_1
+    :goto_0
     iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggleView:Lcom/google/android/material/internal/CheckableImageButton;
 
     iget-boolean v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggledVisible:Z
@@ -3691,11 +3626,9 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
+    iget-object v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->typeface:Landroid/graphics/Typeface;
-
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;)V
+    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;)V
 
     :cond_0
     iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
@@ -3722,14 +3655,11 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     invoke-virtual {p0, v0}, Lcom/google/android/material/textfield/TextInputLayout;->updateCounter(I)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
 
     move-result-object v0
@@ -3738,6 +3668,8 @@
 
     move-result v0
 
+    invoke-virtual {p0, v0}, Lcom/google/android/material/textfield/TextInputLayout;->updateCounter(I)V
+
     goto :goto_0
 
     :cond_2
@@ -3751,7 +3683,7 @@
 
     iput-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
 
-    :goto_1
+    :goto_0
     iput-boolean p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterEnabled:Z
 
     :cond_3
@@ -3767,17 +3699,16 @@
 
     if-lez p1, :cond_0
 
-    :goto_0
     iput p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterMaxLength:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/4 p1, -0x1
 
-    goto :goto_0
+    iput p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterMaxLength:I
 
-    :goto_1
+    :goto_0
     iget-boolean p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterEnabled:Z
 
     if-eqz p1, :cond_2
@@ -3788,11 +3719,9 @@
 
     const/4 p1, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {p1}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
 
     move-result-object p1
@@ -3801,7 +3730,7 @@
 
     move-result p1
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->updateCounter(I)V
 
     :cond_2
@@ -3876,7 +3805,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;->Bx()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bw()V
 
     iput-object p1, v0, Lcom/google/android/material/textfield/b;->bwn:Ljava/lang/CharSequence;
 
@@ -3908,7 +3837,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;->Bw()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->Bv()V
 
     return-void
 .end method
@@ -3922,7 +3851,7 @@
 
     if-eq v1, p1, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bx()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bw()V
 
     const/4 v1, 0x0
 
@@ -3976,7 +3905,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bw()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bv()V
 
     iget-object v2, v0, Lcom/google/android/material/textfield/b;->bwp:Landroid/widget/TextView;
 
@@ -4075,7 +4004,7 @@
     :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;->Bx()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bw()V
 
     iput-object p1, v0, Lcom/google/android/material/textfield/b;->bwq:Ljava/lang/CharSequence;
 
@@ -4138,7 +4067,7 @@
 
     if-eq v1, p1, :cond_3
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bx()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bw()V
 
     const/4 v1, 0x1
 
@@ -4190,7 +4119,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bx()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Bw()V
 
     iget v2, v0, Lcom/google/android/material/textfield/b;->bwl:I
 
@@ -4449,8 +4378,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggleView:Lcom/google/android/material/internal/CheckableImageButton;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/internal/CheckableImageButton;->setContentDescription(Ljava/lang/CharSequence;)V
 
     :cond_0
@@ -4498,8 +4425,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggleView:Lcom/google/android/material/internal/CheckableImageButton;
-
     invoke-virtual {v0, p1}, Lcom/google/android/material/internal/CheckableImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
@@ -4525,8 +4450,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-static {}, Landroid/text/method/PasswordTransformationMethod;->getInstance()Landroid/text/method/PasswordTransformationMethod;
 
     move-result-object v0
@@ -4650,8 +4573,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-static {v0, p1}, Landroidx/core/view/ViewCompat;->setAccessibilityDelegate(Landroid/view/View;Landroidx/core/view/AccessibilityDelegateCompat;)V
 
     :cond_0
@@ -4696,8 +4617,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
-
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;)V
 
     :cond_1
@@ -4769,21 +4688,19 @@
 
     if-eq v0, v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
 
-    iget-boolean v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterOverflowed:Z
+    if-eqz v1, :cond_3
 
-    if-eqz v4, :cond_3
-
-    iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterOverflowTextAppearance:I
+    iget v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterOverflowTextAppearance:I
 
     goto :goto_1
 
     :cond_3
-    iget v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterTextAppearance:I
+    iget v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterTextAppearance:I
 
     :goto_1
-    invoke-virtual {p0, v1, v4}, Lcom/google/android/material/textfield/TextInputLayout;->setTextAppearanceCompatWithErrorFallback(Landroid/widget/TextView;I)V
+    invoke-virtual {p0, v4, v1}, Lcom/google/android/material/textfield/TextInputLayout;->setTextAppearanceCompatWithErrorFallback(Landroid/widget/TextView;I)V
 
     iget-boolean v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterOverflowed:Z
 
@@ -4885,8 +4802,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->getBackground()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
@@ -4911,7 +4826,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;->Bz()Z
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->By()Z
 
     move-result v1
 
@@ -4919,7 +4834,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;->BA()I
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->Bz()I
 
     move-result v1
 
@@ -4942,8 +4857,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
-
     invoke-virtual {v1}, Landroid/widget/TextView;->getCurrentTextColor()I
 
     move-result v1
@@ -4983,13 +4896,13 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackground:Landroid/graphics/drawable/GradientDrawable;
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_b
 
     iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxBackgroundMode:I
 
     if-nez v0, :cond_0
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_0
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
@@ -5000,8 +4913,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v0}, Landroid/widget/EditText;->hasFocus()Z
 
     move-result v0
@@ -5020,8 +4931,6 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/TextInputLayout;->editText:Landroid/widget/EditText;
-
     invoke-virtual {v3}, Landroid/widget/EditText;->isHovered()Z
 
     move-result v3
@@ -5048,15 +4957,14 @@
 
     iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->disabledColor:I
 
-    :goto_2
     iput v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
 
-    goto :goto_3
+    goto :goto_2
 
     :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;->Bz()Z
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->By()Z
 
     move-result v2
 
@@ -5064,10 +4972,12 @@
 
     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;->BA()I
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->Bz()I
 
     move-result v2
 
+    iput v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
+
     goto :goto_2
 
     :cond_4
@@ -5079,12 +4989,12 @@
 
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->counterView:Landroid/widget/TextView;
-
     invoke-virtual {v2}, Landroid/widget/TextView;->getCurrentTextColor()I
 
     move-result v2
 
+    iput v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
+
     goto :goto_2
 
     :cond_5
@@ -5092,6 +5002,8 @@
 
     iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->focusedStrokeColor:I
 
+    iput v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
+
     goto :goto_2
 
     :cond_6
@@ -5099,14 +5011,16 @@
 
     iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->hoveredStrokeColor:I
 
+    iput v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
+
     goto :goto_2
 
     :cond_7
     iget v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->defaultStrokeColor:I
 
-    goto :goto_2
+    iput v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeColor:I
 
-    :goto_3
+    :goto_2
     if-nez v1, :cond_8
 
     if-eqz v0, :cond_9
@@ -5120,17 +5034,22 @@
 
     iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthFocusedPx:I
 
-    goto :goto_4
+    iput v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthPx:I
+
+    goto :goto_3
 
     :cond_9
     iget v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthDefaultPx:I
 
-    :goto_4
     iput v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->boxStrokeWidthPx:I
 
+    :goto_3
     invoke-direct {p0}, Lcom/google/android/material/textfield/TextInputLayout;->applyBoxAttributes()V
 
     :cond_a
-    :goto_5
+    return-void
+
+    :cond_b
+    :goto_4
     return-void
 .end method
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 f7a1c69197..065a162099 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/textfield/a;
 .super Landroid/graphics/drawable/GradientDrawable;
+.source "CutoutDrawable.java"
 
 
 # instance fields
@@ -57,7 +58,7 @@
 
 
 # virtual methods
-.method final Bv()Z
+.method final Bu()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/material/textfield/a;->bwc:Landroid/graphics/RectF;
@@ -147,7 +148,7 @@
 
     invoke-virtual {v0, v1, v2}, Landroid/view/View;->setLayerType(ILandroid/graphics/Paint;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -180,10 +181,9 @@
 
     move-result v0
 
-    :goto_0
     iput v0, p0, Lcom/google/android/material/textfield/a;->bwd:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v2, 0x0
@@ -212,9 +212,9 @@
 
     move-result v0
 
-    goto :goto_0
+    iput v0, p0, Lcom/google/android/material/textfield/a;->bwd:I
 
-    :goto_1
+    :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;->bwc:Landroid/graphics/RectF;
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 7665a1f0f0..86b7189625 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/textfield/b$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "IndicatorViewController.java"
 
 
 # annotations
@@ -55,8 +56,6 @@
 
     iput v0, p1, Lcom/google/android/material/textfield/b;->bwl:I
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->bwx:Lcom/google/android/material/textfield/b;
-
     const/4 v0, 0x0
 
     iput-object v0, p1, Lcom/google/android/material/textfield/b;->bwj:Landroid/animation/Animator;
@@ -65,8 +64,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->bwu:Landroid/widget/TextView;
-
     const/4 v1, 0x4
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setVisibility(I)V
@@ -100,8 +97,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->bww:Landroid/widget/TextView;
-
     const/4 v0, 0x0
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setVisibility(I)V
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 940d25ceef..13a1139e09 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/textfield/b;
 .super Ljava/lang/Object;
+.source "IndicatorViewController.java"
 
 
 # instance fields
@@ -195,7 +196,7 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_3
+    if-eqz p3, :cond_4
 
     if-nez p2, :cond_0
 
@@ -232,6 +233,9 @@
     invoke-interface {p1, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_3
+    return-void
+
+    :cond_4
     :goto_1
     return-void
 .end method
@@ -340,37 +344,14 @@
 
 
 # virtual methods
-.method final BA()I
-    .locals 1
-    .annotation build Landroidx/annotation/ColorInt;
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->bwp:Landroid/widget/TextView;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->bwp:Landroid/widget/TextView;
-
-    invoke-virtual {v0}, Landroid/widget/TextView;->getCurrentTextColor()I
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    const/4 v0, -0x1
-
-    return v0
-.end method
-
-.method final Bw()V
+.method final Bv()V
     .locals 4
 
     const/4 v0, 0x0
 
     iput-object v0, p0, Lcom/google/android/material/textfield/b;->bwn:Ljava/lang/CharSequence;
 
-    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->Bx()V
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->Bw()V
 
     iget v1, p0, Lcom/google/android/material/textfield/b;->bwl:I
 
@@ -392,15 +373,17 @@
 
     const/4 v1, 0x2
 
+    iput v1, p0, Lcom/google/android/material/textfield/b;->bwm:I
+
     goto :goto_0
 
     :cond_0
     const/4 v1, 0x0
 
-    :goto_0
     iput v1, p0, Lcom/google/android/material/textfield/b;->bwm:I
 
     :cond_1
+    :goto_0
     iget v1, p0, Lcom/google/android/material/textfield/b;->bwl:I
 
     iget v2, p0, Lcom/google/android/material/textfield/b;->bwm:I
@@ -416,22 +399,20 @@
     return-void
 .end method
 
-.method final Bx()V
+.method final Bw()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/material/textfield/b;->bwj:Landroid/animation/Animator;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->bwj:Landroid/animation/Animator;
-
     invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
     return-void
 .end method
 
-.method final By()V
+.method final Bx()V
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/material/textfield/b;->bwf:Landroid/widget/LinearLayout;
@@ -486,7 +467,7 @@
     return-void
 .end method
 
-.method final Bz()Z
+.method final By()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/material/textfield/b;->bwm:I
@@ -515,6 +496,27 @@
     return v0
 .end method
 
+.method final Bz()I
+    .locals 1
+    .annotation build Landroidx/annotation/ColorInt;
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->bwp:Landroid/widget/TextView;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Landroid/widget/TextView;->getCurrentTextColor()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, -0x1
+
+    return v0
+.end method
+
 .method final a(IIZ)V
     .locals 9
 
@@ -678,7 +680,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->By()V
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->Bx()V
 
     :cond_0
     invoke-static {p2}, Lcom/google/android/material/textfield/b;->ex(I)Z
@@ -794,13 +796,11 @@
 
     if-eqz p2, :cond_1
 
-    iget p2, p0, Lcom/google/android/material/textfield/b;->bwi:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->bwi:I
 
-    add-int/lit8 p2, p2, -0x1
+    add-int/lit8 v0, v0, -0x1
 
-    iput p2, p0, Lcom/google/android/material/textfield/b;->bwi:I
-
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->bwh:Landroid/widget/FrameLayout;
+    iput v0, p0, Lcom/google/android/material/textfield/b;->bwi:I
 
     iget v0, p0, Lcom/google/android/material/textfield/b;->bwi:I
 
@@ -846,8 +846,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->bws:Landroid/widget/TextView;
-
     invoke-static {v0, p1}, Landroidx/core/widget/TextViewCompat;->setTextAppearance(Landroid/widget/TextView;I)V
 
     :cond_0
@@ -867,11 +865,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->bwe:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, p0, Lcom/google/android/material/textfield/b;->bwe:Lcom/google/android/material/textfield/TextInputLayout;
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/b;->bwp:Landroid/widget/TextView;
-
-    invoke-virtual {v0, v1, p1}, Lcom/google/android/material/textfield/TextInputLayout;->setTextAppearanceCompatWithErrorFallback(Landroid/widget/TextView;I)V
+    invoke-virtual {v1, v0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->setTextAppearanceCompatWithErrorFallback(Landroid/widget/TextView;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/material/theme/MaterialComponentsViewInflater.smali b/com.discord/smali_classes2/com/google/android/material/theme/MaterialComponentsViewInflater.smali
index 36ed911b12..f881c1d269 100644
--- a/com.discord/smali_classes2/com/google/android/material/theme/MaterialComponentsViewInflater.smali
+++ b/com.discord/smali_classes2/com/google/android/material/theme/MaterialComponentsViewInflater.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/theme/MaterialComponentsViewInflater;
 .super Landroidx/appcompat/app/AppCompatViewInflater;
+.source "MaterialComponentsViewInflater.java"
 
 
 # annotations
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 2ee1d5396d..d80815e24e 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/transformation/ExpandableBehavior$1;
 .super Ljava/lang/Object;
+.source "ExpandableBehavior.java"
 
 # interfaces
 .implements Landroid/view/ViewTreeObserver$OnPreDrawListener;
@@ -72,17 +73,17 @@
 
     iget-object v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->bwC:Lcom/google/android/material/expandable/ExpandableWidget;
 
-    check-cast v1, Landroid/view/View;
+    move-object v3, v1
 
-    iget-object v3, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->bua:Landroid/view/View;
+    check-cast v3, Landroid/view/View;
 
-    iget-object v4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->bwC:Lcom/google/android/material/expandable/ExpandableWidget;
+    iget-object v4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->bua:Landroid/view/View;
 
-    invoke-interface {v4}, Lcom/google/android/material/expandable/ExpandableWidget;->isExpanded()Z
+    invoke-interface {v1}, Lcom/google/android/material/expandable/ExpandableWidget;->isExpanded()Z
 
-    move-result v4
+    move-result v1
 
-    invoke-virtual {v0, v1, v3, v4, v2}, Lcom/google/android/material/transformation/ExpandableBehavior;->onExpandedStateChange(Landroid/view/View;Landroid/view/View;ZZ)Z
+    invoke-virtual {v0, v3, v4, v1, v2}, Lcom/google/android/material/transformation/ExpandableBehavior;->onExpandedStateChange(Landroid/view/View;Landroid/view/View;ZZ)Z
 
     :cond_0
     return v2
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior.smali b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior.smali
index 23a709a549..08844785ba 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/transformation/ExpandableBehavior;
 .super Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+.source "ExpandableBehavior.java"
 
 
 # annotations
@@ -70,8 +71,6 @@
 
     if-eqz p1, :cond_1
 
-    iget p1, p0, Lcom/google/android/material/transformation/ExpandableBehavior;->currentState:I
-
     const/4 v2, 0x2
 
     if-ne p1, v2, :cond_0
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 76db7bb851..11313dd41f 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "ExpandableTransformationBehavior.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior.smali b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior.smali
index c92945f3d7..8a63504f0d 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
 .super Lcom/google/android/material/transformation/ExpandableBehavior;
+.source "ExpandableTransformationBehavior.java"
 
 
 # instance fields
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 35cb7799f3..de80c74a86 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/transformation/FabTransformationBehavior$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FabTransformationBehavior.java"
 
 
 # annotations
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 11176b2524..2b36ad5dbc 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/transformation/FabTransformationBehavior$2;
 .super Ljava/lang/Object;
+.source "FabTransformationBehavior.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
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 54e31becf3..6571c53fc4 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/transformation/FabTransformationBehavior$3;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FabTransformationBehavior.java"
 
 
 # annotations
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 de11a01e66..76ab1c726b 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/transformation/FabTransformationBehavior$4;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FabTransformationBehavior.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec.smali
index 423fcd5381..1cddc0e531 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;
 .super Ljava/lang/Object;
+.source "FabTransformationBehavior.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior.smali
index bdc661f81b..9b74f2c3ae 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/android/material/transformation/FabTransformationBehavior;
 .super Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+.source "FabTransformationBehavior.java"
 
 
 # annotations
@@ -264,13 +265,15 @@
 
     const/4 p1, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, v1, Landroid/graphics/RectF;->right:F
 
     iget p2, v0, Landroid/graphics/RectF;->right:F
 
+    sub-float/2addr p1, p2
+
     goto :goto_0
 
     :cond_1
@@ -278,6 +281,8 @@
 
     iget p2, v0, Landroid/graphics/RectF;->left:F
 
+    sub-float/2addr p1, p2
+
     goto :goto_0
 
     :cond_2
@@ -289,10 +294,9 @@
 
     move-result p2
 
-    :goto_0
     sub-float/2addr p1, p2
 
-    :goto_1
+    :goto_0
     iget p2, p3, Lcom/google/android/material/animation/Positioning;->xAdjustment:F
 
     add-float/2addr p1, p2
@@ -329,13 +333,15 @@
 
     const/4 p1, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget p1, v1, Landroid/graphics/RectF;->bottom:F
 
     iget p2, v0, Landroid/graphics/RectF;->bottom:F
 
+    sub-float/2addr p1, p2
+
     goto :goto_0
 
     :cond_1
@@ -343,6 +349,8 @@
 
     iget p2, v0, Landroid/graphics/RectF;->top:F
 
+    sub-float/2addr p1, p2
+
     goto :goto_0
 
     :cond_2
@@ -354,10 +362,9 @@
 
     move-result p2
 
-    :goto_0
     sub-float/2addr p1, p2
 
-    :goto_1
+    :goto_0
     iget p2, p3, Lcom/google/android/material/animation/Positioning;->yAdjustment:F
 
     add-float/2addr p1, p2
@@ -732,6 +739,10 @@
 
     aput p7, p4, p1
 
+    invoke-static {p2, p3, p4}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
+
+    move-result-object p1
+
     goto :goto_0
 
     :cond_1
@@ -743,11 +754,11 @@
 
     aput p7, p4, p1
 
-    :goto_0
     invoke-static {p2, p3, p4}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
 
     move-result-object p1
 
+    :goto_0
     iget-object p2, p5, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
 
     const-string p3, "elevation"
@@ -764,7 +775,7 @@
 .end method
 
 .method private createExpansionAnimation(Landroid/view/View;Landroid/view/View;ZZLcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;FFLjava/util/List;Ljava/util/List;)V
-    .locals 20
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -790,9 +801,9 @@
 
     move-object/from16 v9, p5
 
-    instance-of v2, v8, Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    instance-of v1, v8, Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    if-nez v2, :cond_0
+    if-nez v1, :cond_0
 
     return-void
 
@@ -801,23 +812,23 @@
 
     check-cast v13, Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
+    iget-object v1, v9, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->positioning:Lcom/google/android/material/animation/Positioning;
+
+    invoke-direct {v12, v0, v8, v1}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateRevealCenterX(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
+
+    move-result v1
+
     iget-object v2, v9, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->positioning:Lcom/google/android/material/animation/Positioning;
 
-    invoke-direct {v12, v0, v8, v2}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateRevealCenterX(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
+    invoke-direct {v12, v0, v8, v2}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateRevealCenterY(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
 
-    move-result v2
-
-    iget-object v3, v9, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->positioning:Lcom/google/android/material/animation/Positioning;
-
-    invoke-direct {v12, v0, v8, v3}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateRevealCenterY(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
-
-    move-result v3
+    move-result v10
 
     check-cast v0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iget-object v4, v12, Lcom/google/android/material/transformation/FabTransformationBehavior;->tmpRect:Landroid/graphics/Rect;
+    iget-object v2, v12, Lcom/google/android/material/transformation/FabTransformationBehavior;->tmpRect:Landroid/graphics/Rect;
 
-    invoke-virtual {v0, v4}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getContentRect(Landroid/graphics/Rect;)Z
+    invoke-virtual {v0, v2}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getContentRect(Landroid/graphics/Rect;)Z
 
     iget-object v0, v12, Lcom/google/android/material/transformation/FabTransformationBehavior;->tmpRect:Landroid/graphics/Rect;
 
@@ -827,17 +838,17 @@
 
     int-to-float v0, v0
 
-    const/high16 v4, 0x40000000    # 2.0f
+    const/high16 v2, 0x40000000    # 2.0f
 
-    div-float v10, v0, v4
+    div-float v11, v0, v2
 
     iget-object v0, v9, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
 
-    const-string v4, "expansion"
+    const-string v2, "expansion"
 
-    invoke-virtual {v0, v4}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
+    invoke-virtual {v0, v2}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
 
-    move-result-object v11
+    move-result-object v14
 
     if-eqz p3, :cond_3
 
@@ -845,7 +856,7 @@
 
     new-instance v0, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
 
-    invoke-direct {v0, v2, v3, v10}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;-><init>(FFF)V
+    invoke-direct {v0, v1, v10, v11}, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;-><init>(FFF)V
 
     invoke-interface {v13, v0}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->setRevealInfo(Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;)V
 
@@ -858,31 +869,26 @@
 
     iget v0, v0, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->radius:F
 
-    move v6, v0
-
-    goto :goto_0
+    move v11, v0
 
     :cond_2
-    move v6, v10
+    const/4 v4, 0x0
 
-    :goto_0
-    const/16 v16, 0x0
+    const/4 v5, 0x0
 
-    const/16 v17, 0x0
+    move v2, v1
 
-    move v14, v2
+    move v3, v10
 
-    move v15, v3
+    move/from16 v6, p6
 
-    move/from16 v18, p6
+    move/from16 v7, p7
 
-    move/from16 v19, p7
-
-    invoke-static/range {v14 .. v19}, Lcom/google/android/material/math/MathUtils;->distanceToFurthestCorner(FFFFFF)F
+    invoke-static/range {v2 .. v7}, Lcom/google/android/material/math/MathUtils;->distanceToFurthestCorner(FFFFFF)F
 
     move-result v0
 
-    invoke-static {v13, v2, v3, v0}, Lcom/google/android/material/circularreveal/CircularRevealCompat;->createCircularReveal(Lcom/google/android/material/circularreveal/CircularRevealWidget;FFF)Landroid/animation/Animator;
+    invoke-static {v13, v1, v10, v0}, Lcom/google/android/material/circularreveal/CircularRevealCompat;->createCircularReveal(Lcom/google/android/material/circularreveal/CircularRevealWidget;FFF)Landroid/animation/Animator;
 
     move-result-object v9
 
@@ -892,31 +898,25 @@
 
     invoke-virtual {v9, v0}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
-    invoke-virtual {v11}, Lcom/google/android/material/animation/MotionTiming;->getDelay()J
+    invoke-virtual {v14}, Lcom/google/android/material/animation/MotionTiming;->getDelay()J
 
-    move-result-wide v4
+    move-result-wide v2
 
-    float-to-int v7, v2
+    float-to-int v4, v1
 
-    float-to-int v10, v3
+    float-to-int v5, v10
 
     move-object/from16 v0, p0
 
     move-object/from16 v1, p2
 
-    move-wide v2, v4
-
-    move v4, v7
-
-    move v5, v10
+    move v6, v11
 
     move-object/from16 v7, p8
 
     invoke-direct/range {v0 .. v7}, Lcom/google/android/material/transformation/FabTransformationBehavior;->createPreFillRadialExpansion(Landroid/view/View;JIIFLjava/util/List;)V
 
-    move-object v15, v11
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-interface {v13}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->getRevealInfo()Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
@@ -925,27 +925,25 @@
 
     iget v6, v0, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->radius:F
 
-    invoke-static {v13, v2, v3, v10}, Lcom/google/android/material/circularreveal/CircularRevealCompat;->createCircularReveal(Lcom/google/android/material/circularreveal/CircularRevealWidget;FFF)Landroid/animation/Animator;
+    invoke-static {v13, v1, v10, v11}, Lcom/google/android/material/circularreveal/CircularRevealCompat;->createCircularReveal(Lcom/google/android/material/circularreveal/CircularRevealWidget;FFF)Landroid/animation/Animator;
 
-    move-result-object v14
+    move-result-object v15
 
-    invoke-virtual {v11}, Lcom/google/android/material/animation/MotionTiming;->getDelay()J
+    invoke-virtual {v14}, Lcom/google/android/material/animation/MotionTiming;->getDelay()J
 
-    move-result-wide v4
+    move-result-wide v2
 
-    float-to-int v15, v2
+    float-to-int v7, v1
 
-    float-to-int v7, v3
+    float-to-int v10, v10
 
     move-object/from16 v0, p0
 
     move-object/from16 v1, p2
 
-    move-wide v2, v4
+    move v4, v7
 
-    move v4, v15
-
-    move v5, v7
+    move v5, v10
 
     move/from16 v16, v7
 
@@ -953,11 +951,11 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/google/android/material/transformation/FabTransformationBehavior;->createPreFillRadialExpansion(Landroid/view/View;JIIFLjava/util/List;)V
 
-    invoke-virtual {v11}, Lcom/google/android/material/animation/MotionTiming;->getDelay()J
+    invoke-virtual {v14}, Lcom/google/android/material/animation/MotionTiming;->getDelay()J
 
     move-result-wide v2
 
-    invoke-virtual {v11}, Lcom/google/android/material/animation/MotionTiming;->getDuration()J
+    invoke-virtual {v14}, Lcom/google/android/material/animation/MotionTiming;->getDuration()J
 
     move-result-wide v4
 
@@ -969,20 +967,20 @@
 
     move-object/from16 v0, p0
 
-    move v8, v15
+    move/from16 v8, v16
 
-    move/from16 v9, v16
+    move v9, v10
 
-    move-object v15, v11
+    move v10, v11
 
     move-object/from16 v11, p8
 
     invoke-direct/range {v0 .. v11}, Lcom/google/android/material/transformation/FabTransformationBehavior;->createPostFillRadialExpansion(Landroid/view/View;JJJIIFLjava/util/List;)V
 
-    move-object v9, v14
+    move-object v9, v15
 
-    :goto_1
-    invoke-virtual {v15, v9}, Lcom/google/android/material/animation/MotionTiming;->apply(Landroid/animation/Animator;)V
+    :goto_0
+    invoke-virtual {v14, v9}, Lcom/google/android/material/animation/MotionTiming;->apply(Landroid/animation/Animator;)V
 
     move-object/from16 v0, p8
 
@@ -1064,6 +1062,10 @@
 
     aput v3, p4, v3
 
+    invoke-static {p1, p3, p4}, Landroid/animation/ObjectAnimator;->ofInt(Ljava/lang/Object;Landroid/util/Property;[I)Landroid/animation/ObjectAnimator;
+
+    move-result-object p3
+
     goto :goto_0
 
     :cond_3
@@ -1073,11 +1075,11 @@
 
     aput v1, p4, v3
 
-    :goto_0
     invoke-static {p1, p3, p4}, Landroid/animation/ObjectAnimator;->ofInt(Ljava/lang/Object;Landroid/util/Property;[I)Landroid/animation/ObjectAnimator;
 
     move-result-object p3
 
+    :goto_0
     new-instance p4, Lcom/google/android/material/transformation/FabTransformationBehavior$2;
 
     invoke-direct {p4, p0, p2}, Lcom/google/android/material/transformation/FabTransformationBehavior$2;-><init>(Lcom/google/android/material/transformation/FabTransformationBehavior;Landroid/view/View;)V
@@ -1102,6 +1104,8 @@
 
     invoke-interface {p7, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
+    return-void
+
     :cond_4
     :goto_1
     return-void
@@ -1213,139 +1217,155 @@
 
     move-object/from16 v1, p2
 
-    move-object/from16 v3, p5
+    move-object/from16 v2, p5
 
     move-object/from16 v11, p6
 
-    iget-object v4, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->positioning:Lcom/google/android/material/animation/Positioning;
+    iget-object v3, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->positioning:Lcom/google/android/material/animation/Positioning;
 
-    invoke-direct {v10, v0, v1, v4}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateTranslationX(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
+    invoke-direct {v10, v0, v1, v3}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateTranslationX(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
 
-    move-result v4
+    move-result v3
 
-    iget-object v5, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->positioning:Lcom/google/android/material/animation/Positioning;
+    iget-object v4, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->positioning:Lcom/google/android/material/animation/Positioning;
 
-    invoke-direct {v10, v0, v1, v5}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateTranslationY(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
+    invoke-direct {v10, v0, v1, v4}, Lcom/google/android/material/transformation/FabTransformationBehavior;->calculateTranslationY(Landroid/view/View;Landroid/view/View;Lcom/google/android/material/animation/Positioning;)F
 
     move-result v0
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    cmpl-float v6, v4, v5
+    cmpl-float v5, v3, v4
 
-    if-eqz v6, :cond_4
+    if-eqz v5, :cond_4
 
-    cmpl-float v6, v0, v5
+    cmpl-float v5, v0, v4
 
-    if-nez v6, :cond_0
+    if-nez v5, :cond_0
 
     goto :goto_0
 
     :cond_0
     if-eqz p3, :cond_1
 
-    cmpg-float v6, v0, v5
+    cmpg-float v5, v0, v4
 
-    if-ltz v6, :cond_2
+    if-ltz v5, :cond_2
 
     :cond_1
     if-nez p3, :cond_3
 
-    cmpl-float v6, v0, v5
+    cmpl-float v5, v0, v4
 
-    if-lez v6, :cond_3
+    if-lez v5, :cond_3
 
     :cond_2
-    iget-object v6, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v5, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
 
-    const-string v7, "translationXCurveUpwards"
+    const-string v6, "translationXCurveUpwards"
+
+    invoke-virtual {v5, v6}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
+
+    move-result-object v5
+
+    iget-object v6, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+
+    const-string v7, "translationYCurveUpwards"
 
     invoke-virtual {v6, v7}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+    move-object v12, v5
 
-    const-string v8, "translationYCurveUpwards"
+    move-object v13, v6
 
     goto :goto_1
 
     :cond_3
-    iget-object v6, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v5, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
 
-    const-string v7, "translationXCurveDownwards"
+    const-string v6, "translationXCurveDownwards"
+
+    invoke-virtual {v5, v6}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
+
+    move-result-object v5
+
+    iget-object v6, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+
+    const-string v7, "translationYCurveDownwards"
 
     invoke-virtual {v6, v7}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+    move-object v12, v5
 
-    const-string v8, "translationYCurveDownwards"
+    move-object v13, v6
 
     goto :goto_1
 
     :cond_4
     :goto_0
-    iget-object v6, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v5, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
 
-    const-string v7, "translationXLinear"
+    const-string v6, "translationXLinear"
+
+    invoke-virtual {v5, v6}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
+
+    move-result-object v5
+
+    iget-object v6, v2, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+
+    const-string v7, "translationYLinear"
 
     invoke-virtual {v6, v7}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/android/material/transformation/FabTransformationBehavior$FabTransformationSpec;->timings:Lcom/google/android/material/animation/MotionSpec;
+    move-object v12, v5
 
-    const-string v8, "translationYLinear"
+    move-object v13, v6
 
     :goto_1
-    invoke-virtual {v7, v8}, Lcom/google/android/material/animation/MotionSpec;->getTiming(Ljava/lang/String;)Lcom/google/android/material/animation/MotionTiming;
+    const/4 v5, 0x0
 
-    move-result-object v7
-
-    move-object v12, v6
-
-    move-object v13, v7
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     if-eqz p3, :cond_6
 
     if-nez p4, :cond_5
 
-    neg-float v2, v4
+    neg-float v7, v3
 
-    invoke-virtual {v1, v2}, Landroid/view/View;->setTranslationX(F)V
+    invoke-virtual {v1, v7}, Landroid/view/View;->setTranslationX(F)V
 
-    neg-float v2, v0
+    neg-float v7, v0
 
-    invoke-virtual {v1, v2}, Landroid/view/View;->setTranslationY(F)V
+    invoke-virtual {v1, v7}, Landroid/view/View;->setTranslationY(F)V
 
     :cond_5
-    sget-object v2, Landroid/view/View;->TRANSLATION_X:Landroid/util/Property;
+    sget-object v7, Landroid/view/View;->TRANSLATION_X:Landroid/util/Property;
 
-    new-array v8, v7, [F
+    new-array v8, v6, [F
 
-    aput v5, v8, v6
+    aput v4, v8, v5
 
-    invoke-static {v1, v2, v8}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
+    invoke-static {v1, v7, v8}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
 
     move-result-object v14
 
-    sget-object v2, Landroid/view/View;->TRANSLATION_Y:Landroid/util/Property;
+    sget-object v7, Landroid/view/View;->TRANSLATION_Y:Landroid/util/Property;
 
-    new-array v7, v7, [F
+    new-array v6, v6, [F
 
-    aput v5, v7, v6
+    aput v4, v6, v5
 
-    invoke-static {v1, v2, v7}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
+    invoke-static {v1, v7, v6}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
 
     move-result-object v15
 
-    neg-float v5, v4
+    neg-float v5, v3
 
     neg-float v6, v0
 
@@ -1372,23 +1392,23 @@
     :cond_6
     sget-object v2, Landroid/view/View;->TRANSLATION_X:Landroid/util/Property;
 
-    new-array v3, v7, [F
+    new-array v4, v6, [F
 
-    neg-float v4, v4
+    neg-float v3, v3
 
-    aput v4, v3, v6
+    aput v3, v4, v5
 
-    invoke-static {v1, v2, v3}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
+    invoke-static {v1, v2, v4}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
 
     move-result-object v14
 
     sget-object v2, Landroid/view/View;->TRANSLATION_Y:Landroid/util/Property;
 
-    new-array v3, v7, [F
+    new-array v3, v6, [F
 
     neg-float v0, v0
 
-    aput v0, v3, v6
+    aput v0, v3, v5
 
     invoke-static {v1, v2, v3}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
 
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 8665d1c9d9..bdc28260dc 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;
 .super Landroid/animation/AnimatorListenerAdapter;
+.source "FabTransformationScrimBehavior.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior.smali
index f9bac6f18e..0489d1f260 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
 .super Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+.source "FabTransformationScrimBehavior.java"
 
 
 # static fields
@@ -118,6 +119,10 @@
 
     aput v0, p3, v1
 
+    invoke-static {p1, p2, p3}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
+
+    move-result-object p1
+
     goto :goto_1
 
     :cond_2
@@ -127,11 +132,11 @@
 
     aput v0, p3, v1
 
-    :goto_1
     invoke-static {p1, p2, p3}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;
 
     move-result-object p1
 
+    :goto_1
     invoke-virtual {p5, p1}, Lcom/google/android/material/animation/MotionTiming;->apply(Landroid/animation/Animator;)V
 
     invoke-interface {p4, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationSheetBehavior.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationSheetBehavior.smali
index 22da46442f..f6685e0151 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationSheetBehavior.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationSheetBehavior.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/transformation/FabTransformationSheetBehavior;
 .super Lcom/google/android/material/transformation/FabTransformationBehavior;
+.source "FabTransformationSheetBehavior.java"
 
 
 # instance fields
@@ -118,8 +119,6 @@
 
     if-eqz v6, :cond_5
 
-    iget-object v6, p0, Lcom/google/android/material/transformation/FabTransformationSheetBehavior;->importantForAccessibilityMap:Ljava/util/Map;
-
     invoke-interface {v6, v5}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v6
@@ -138,6 +137,8 @@
 
     move-result v6
 
+    invoke-static {v5, v6}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
+
     goto :goto_2
 
     :cond_3
@@ -160,10 +161,10 @@
     :cond_4
     const/4 v6, 0x4
 
-    :goto_2
     invoke-static {v5, v6}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
 
     :cond_5
+    :goto_2
     add-int/lit8 v4, v4, 0x1
 
     goto :goto_0
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildCard.smali b/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildCard.smali
index 7986ba5c66..4742f99fbb 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildCard.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildCard.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/transformation/TransformationChildCard;
 .super Lcom/google/android/material/circularreveal/cardview/CircularRevealCardView;
+.source "TransformationChildCard.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildLayout.smali b/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildLayout.smali
index e4edaa661d..0b4b0adad8 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/TransformationChildLayout.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/android/material/transformation/TransformationChildLayout;
 .super Lcom/google/android/material/circularreveal/CircularRevealFrameLayout;
+.source "TransformationChildLayout.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/R.smali b/com.discord/smali_classes2/com/google/firebase/R.smali
index 52c2b6187d..6b76356250 100644
--- a/com.discord/smali_classes2/com/google/firebase/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/a.smali b/com.discord/smali_classes2/com/google/firebase/a.smali
index 4da630260f..b234e15e29 100644
--- a/com.discord/smali_classes2/com/google/firebase/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/com/google/firebase/a/a.smali b/com.discord/smali_classes2/com/google/firebase/a/a.smali
index 15f2c129df..dd20d814f0 100644
--- a/com.discord/smali_classes2/com/google/firebase/a/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/a/a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/firebase/a/b.smali b/com.discord/smali_classes2/com/google/firebase/a/b.smali
index 6a86f7485a..a2d039d418 100644
--- a/com.discord/smali_classes2/com/google/firebase/a/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/a/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/a/b;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/firebase/a/c.smali b/com.discord/smali_classes2/com/google/firebase/a/c.smali
index 8bb2cd5cb5..c4fe4ca243 100644
--- a/com.discord/smali_classes2/com/google/firebase/a/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/a/c.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/google/firebase/a/c;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
diff --git a/com.discord/smali_classes2/com/google/firebase/a/d.smali b/com.discord/smali_classes2/com/google/firebase/a/d.smali
index 41d9bbc8b3..4d4dfe6b48 100644
--- a/com.discord/smali_classes2/com/google/firebase/a/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/a/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/a/d;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/google/firebase/abt/R.smali b/com.discord/smali_classes2/com/google/firebase/abt/R.smali
index 7fa5d68fa3..045f89451c 100644
--- a/com.discord/smali_classes2/com/google/firebase/abt/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/abt/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/abt/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 1569e7756e..cc890a6d44 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali
@@ -121,13 +121,13 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v1
 
     const-string v2, "app"
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->tK()Lcom/google/android/gms/common/util/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/bn;->tJ()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -171,13 +171,13 @@
     .annotation build Landroidx/annotation/Keep;
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()Ljava/lang/String;
 
     move-result-object v0
 
@@ -222,7 +222,7 @@
 
     iget-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ar;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -237,7 +237,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yF()Lcom/google/android/gms/measurement/internal/ce;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ar;->yE()Lcom/google/android/gms/measurement/internal/ce;
 
     move-result-object v0
 
@@ -245,7 +245,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -266,7 +266,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -314,7 +314,7 @@
 
     if-eqz v2, :cond_4
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -344,7 +344,7 @@
     if-le v2, v1, :cond_6
 
     :cond_5
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -380,7 +380,7 @@
     if-le v2, v1, :cond_8
 
     :cond_7
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object p1
 
@@ -401,7 +401,7 @@
     return-void
 
     :cond_8
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yM()Lcom/google/android/gms/measurement/internal/o;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yL()Lcom/google/android/gms/measurement/internal/o;
 
     move-result-object v1
 
@@ -423,11 +423,11 @@
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/cd;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yK()Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/bn;->yJ()Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->zO()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->zN()J
 
     move-result-wide v2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/R.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/R.smali
index 82d952eef9..63443d9b85 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/analytics/connector/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 eeba3fe88a..ad365ae0d8 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
@@ -84,7 +84,7 @@
 
     invoke-direct {v9, v1}, Landroid/os/Bundle;-><init>(I)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/b;->BE()Z
+    invoke-virtual {p0}, Lcom/google/firebase/b;->BD()Z
 
     move-result v1
 
@@ -100,7 +100,7 @@
 
     const-string p2, "dataCollectionDefaultEnabled"
 
-    invoke-virtual {p0}, Lcom/google/firebase/b;->BD()Z
+    invoke-virtual {p0}, Lcom/google/firebase/b;->BC()Z
 
     move-result p0
 
@@ -176,11 +176,11 @@
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->bih:Lcom/google/android/gms/measurement/internal/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yC()Lcom/google/android/gms/measurement/internal/br;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ar;->yB()Lcom/google/android/gms/measurement/internal/br;
 
     move-result-object v1
 
-    invoke-virtual {v1, p0}, Lcom/google/android/gms/measurement/internal/br;->M(Z)V
+    invoke-virtual {v1, p0}, Lcom/google/android/gms/measurement/internal/br;->L(Z)V
 
     monitor-exit v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/impl/R.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/impl/R.smali
index bc9b8c71fa..0a8d015170 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/impl/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/impl/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/analytics/connector/impl/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 c0a7231f6f..61bc280352 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
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/components/a$a;->BG()Lcom/google/firebase/components/a;
+    invoke-virtual {v0}, Lcom/google/firebase/components/a$a;->BF()Lcom/google/firebase/components/a;
 
     move-result-object v0
 
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 cd9e33d2d5..c7961284ac 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
@@ -571,7 +571,6 @@
 
     const-string p1, "fiam_integration"
 
-    :goto_2
     invoke-virtual {p2, p0, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     return v0
@@ -581,14 +580,18 @@
 
     const-string p1, "fdl_integration"
 
-    goto :goto_2
+    invoke-virtual {p2, p0, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    return v0
 
     :pswitch_2
     const-string p0, "_cis"
 
     const-string p1, "fcm_integration"
 
-    goto :goto_2
+    invoke-virtual {p2, p0, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    return v0
 
     :pswitch_data_0
     .packed-switch 0x0
diff --git a/com.discord/smali_classes2/com/google/firebase/b$a.smali b/com.discord/smali_classes2/com/google/firebase/b$a.smali
index af0aabcc5b..8204b86235 100644
--- a/com.discord/smali_classes2/com/google/firebase/b$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/b$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/b$a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/firebase/b$b.smali b/com.discord/smali_classes2/com/google/firebase/b$b.smali
index 372af333ca..465e672fc7 100644
--- a/com.discord/smali_classes2/com/google/firebase/b$b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/firebase/b$b;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/android/gms/common/api/internal/b$a;
@@ -97,7 +98,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;->lb()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->la()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p0
 
@@ -109,10 +110,10 @@
 
 
 # virtual methods
-.method public final I(Z)V
+.method public final H(Z)V
     .locals 4
 
-    invoke-static {}, Lcom/google/firebase/b;->BF()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/b;->BE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -174,4 +175,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/b$c.smali b/com.discord/smali_classes2/com/google/firebase/b$c.smali
index 9f62bf1b25..90a787da41 100644
--- a/com.discord/smali_classes2/com/google/firebase/b$c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/b$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/firebase/b$c;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
diff --git a/com.discord/smali_classes2/com/google/firebase/b$d.smali b/com.discord/smali_classes2/com/google/firebase/b$d.smali
index 7946207ca5..a0c38cae6d 100644
--- a/com.discord/smali_classes2/com/google/firebase/b$d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/b$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/firebase/b$d;
 .super Landroid/content/BroadcastReceiver;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
@@ -98,7 +99,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/b;->BF()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/b;->BE()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -152,4 +153,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p2
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/b.smali b/com.discord/smali_classes2/com/google/firebase/b.smali
index afa0ecd3be..59fea6715e 100644
--- a/com.discord/smali_classes2/com/google/firebase/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/firebase/b;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
@@ -381,7 +382,7 @@
     return-void
 .end method
 
-.method private AT()V
+.method private AS()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/b;->bwZ:Ljava/util/concurrent/atomic/AtomicBoolean;
@@ -399,7 +400,7 @@
     return-void
 .end method
 
-.method private AV()V
+.method private AU()V
     .locals 4
 
     iget-object v0, p0, Lcom/google/firebase/b;->bwT:Landroid/content/Context;
@@ -419,7 +420,7 @@
     :cond_0
     iget-object v1, p0, Lcom/google/firebase/b;->bwV:Lcom/google/firebase/components/m;
 
-    invoke-virtual {p0}, Lcom/google/firebase/b;->BE()Z
+    invoke-virtual {p0}, Lcom/google/firebase/b;->BD()Z
 
     move-result v2
 
@@ -432,7 +433,7 @@
 
     invoke-static {v1, p0, v2, v0}, Lcom/google/firebase/b;->a(Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/Iterable;Z)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/b;->BE()Z
+    invoke-virtual {p0}, Lcom/google/firebase/b;->BD()Z
 
     move-result v1
 
@@ -456,7 +457,7 @@
     return-void
 .end method
 
-.method public static BC()Lcom/google/firebase/b;
+.method public static BB()Lcom/google/firebase/b;
     .locals 4
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -491,7 +492,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->md()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mc()Ljava/lang/String;
 
     move-result-object v3
 
@@ -519,7 +520,7 @@
     throw v1
 .end method
 
-.method static synthetic BF()Ljava/lang/Object;
+.method static synthetic BE()Ljava/lang/Object;
     .locals 1
 
     sget-object v0, Lcom/google/firebase/b;->bwQ:Ljava/lang/Object;
@@ -558,8 +559,16 @@
 
     move-result v1
 
-    xor-int/lit8 v1, v1, 0x1
+    if-nez v1, :cond_1
 
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
     new-instance v2, Ljava/lang/StringBuilder;
 
     const-string v3, "FirebaseApp name "
@@ -594,7 +603,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-direct {v1}, Lcom/google/firebase/b;->AV()V
+    invoke-direct {v1}, Lcom/google/firebase/b;->AU()V
 
     return-object v1
 
@@ -612,7 +621,7 @@
 .method static synthetic a(Lcom/google/firebase/b;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/firebase/b;->AV()V
+    invoke-direct {p0}, Lcom/google/firebase/b;->AU()V
 
     return-void
 .end method
@@ -691,25 +700,7 @@
 
     if-eqz v1, :cond_0
 
-    goto :goto_1
-
-    :catch_0
-    move-exception v1
-
-    goto :goto_2
-
-    :catch_1
-    move-exception v0
-
-    goto :goto_3
-
-    :catch_2
-    nop
-
-    goto :goto_4
-
     :cond_1
-    :goto_1
     invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
 
     move-result-object v1
@@ -752,14 +743,16 @@
 
     invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_2
     .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
 
     goto :goto_0
 
-    :goto_2
+    :catch_0
+    move-exception v1
+
     const-string v2, "FirebaseApp"
 
     const-string v3, "Failed to initialize "
@@ -776,7 +769,9 @@
 
     goto :goto_0
 
-    :goto_3
+    :catch_1
+    move-exception v0
+
     const-string v1, "FirebaseApp"
 
     const-string v2, "Firebase API initialization failure."
@@ -785,7 +780,7 @@
 
     goto :goto_0
 
-    :catch_3
+    :catch_2
     new-instance p0, Ljava/lang/IllegalStateException;
 
     new-instance p1, Ljava/lang/StringBuilder;
@@ -806,7 +801,9 @@
 
     throw p0
 
-    :goto_4
+    :catch_3
+    nop
+
     sget-object v1, Lcom/google/firebase/b;->bwP:Ljava/util/Set;
 
     invoke-interface {v1, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
@@ -880,7 +877,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object p0
 
@@ -941,7 +938,7 @@
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/b;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/b;->AS()V
 
     iget-object v0, p0, Lcom/google/firebase/b;->Zl:Ljava/lang/String;
 
@@ -1030,22 +1027,22 @@
 
 
 # virtual methods
-.method public final BB()Lcom/google/firebase/d;
+.method public final BA()Lcom/google/firebase/d;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/b;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/b;->AS()V
 
     iget-object v0, p0, Lcom/google/firebase/b;->bwU:Lcom/google/firebase/d;
 
     return-object v0
 .end method
 
-.method public final BD()Z
+.method public final BC()Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/b;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/b;->AS()V
 
     iget-object v0, p0, Lcom/google/firebase/b;->bxa:Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -1056,7 +1053,7 @@
     return v0
 .end method
 
-.method public final BE()Z
+.method public final BD()Z
     .locals 2
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
@@ -1086,7 +1083,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/b;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/b;->AS()V
 
     iget-object v0, p0, Lcom/google/firebase/b;->bwV:Lcom/google/firebase/components/m;
 
@@ -1129,7 +1126,7 @@
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/b;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/b;->AS()V
 
     iget-object v0, p0, Lcom/google/firebase/b;->bwT:Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/b/a.smali b/com.discord/smali_classes2/com/google/firebase/b/a.smali
index 337058c848..8e773946dd 100644
--- a/com.discord/smali_classes2/com/google/firebase/b/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/b/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/b/a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
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 6034869661..7abe340f33 100644
--- a/com.discord/smali_classes2/com/google/firebase/c/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/c/a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/b$a;
diff --git a/com.discord/smali_classes2/com/google/firebase/components/ComponentDiscoveryService.smali b/com.discord/smali_classes2/com/google/firebase/components/ComponentDiscoveryService.smali
index 379f2f62b5..419e0b0042 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/ComponentDiscoveryService.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/ComponentDiscoveryService.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/firebase/components/ComponentDiscoveryService;
 .super Landroid/app/Service;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/components/a$1.smali b/com.discord/smali_classes2/com/google/firebase/components/a$1.smali
index a25f552765..df0324b69e 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/a$1.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/a$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/a$1;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
@@ -174,7 +175,13 @@
 
     aput-object v1, v2, v3
 
-    goto :goto_1
+    invoke-static {v6, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v5, v1, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    goto :goto_0
 
     :catch_1
     move-exception v4
@@ -187,7 +194,13 @@
 
     aput-object v1, v2, v3
 
-    goto :goto_1
+    invoke-static {v6, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v5, v1, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    goto :goto_0
 
     :catch_2
     move-exception v4
@@ -200,7 +213,13 @@
 
     aput-object v1, v2, v3
 
-    goto :goto_1
+    invoke-static {v6, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v5, v1, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    goto :goto_0
 
     :catch_3
     move-exception v4
@@ -213,7 +232,13 @@
 
     aput-object v1, v2, v3
 
-    goto :goto_1
+    invoke-static {v6, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v5, v1, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    goto/16 :goto_0
 
     :catch_4
     move-exception v4
@@ -226,14 +251,13 @@
 
     aput-object v1, v2, v3
 
-    :goto_1
     invoke-static {v6, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
     invoke-static {v5, v1, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :cond_1
     return-object v0
@@ -374,7 +398,7 @@
 
     check-cast v4, Lcom/google/firebase/components/e;
 
-    invoke-virtual {v4}, Lcom/google/firebase/components/e;->mt()Z
+    invoke-virtual {v4}, Lcom/google/firebase/components/e;->ms()Z
 
     move-result v5
 
@@ -464,7 +488,7 @@
 
     invoke-interface {v6, v3}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    invoke-virtual {v5}, Lcom/google/firebase/components/n;->mt()Z
+    invoke-virtual {v5}, Lcom/google/firebase/components/n;->ms()Z
 
     move-result v6
 
@@ -512,7 +536,7 @@
 
     check-cast v1, Lcom/google/firebase/components/n;
 
-    invoke-virtual {v1}, Lcom/google/firebase/components/n;->mt()Z
+    invoke-virtual {v1}, Lcom/google/firebase/components/n;->ms()Z
 
     move-result v2
 
@@ -538,6 +562,8 @@
     invoke-direct {v0, p0}, Lcom/google/firebase/components/f;-><init>(Ljava/util/List;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static c(Ljava/util/Set;)Ljava/util/Set;
@@ -576,7 +602,7 @@
 
     check-cast v1, Lcom/google/firebase/components/n;
 
-    invoke-virtual {v1}, Lcom/google/firebase/components/n;->mt()Z
+    invoke-virtual {v1}, Lcom/google/firebase/components/n;->ms()Z
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/a$a.smali b/com.discord/smali_classes2/com/google/firebase/components/a$a.smali
index 2362a5dff3..bf57496bc4 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/a$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/a$a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
@@ -143,7 +144,7 @@
 
 
 # virtual methods
-.method public final BG()Lcom/google/firebase/components/a;
+.method public final BF()Lcom/google/firebase/components/a;
     .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/firebase/components/a.smali b/com.discord/smali_classes2/com/google/firebase/components/a.smali
index 5fed591716..8da1b674f2 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
@@ -198,7 +199,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/firebase/components/a$a;->BG()Lcom/google/firebase/components/a;
+    invoke-virtual {p0}, Lcom/google/firebase/components/a$a;->BF()Lcom/google/firebase/components/a;
 
     move-result-object p0
 
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 13c3f50bf8..549b2a97e7 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/components/b;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # virtual methods
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 fd04559177..9bc9cf22f6 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/components/c;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
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 c520bb4753..ed27a200e9 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/components/d;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/google/firebase/components/e.smali b/com.discord/smali_classes2/com/google/firebase/components/e.smali
index 68cca1626a..77a2ad30de 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/e;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # instance fields
@@ -78,7 +79,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     check-cast p1, Lcom/google/firebase/components/e;
 
@@ -106,6 +107,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method public final hashCode()I
@@ -136,7 +140,7 @@
     return v0
 .end method
 
-.method public final mt()Z
+.method public final ms()Z
     .locals 1
 
     iget v0, p0, Lcom/google/firebase/components/e;->aTi:I
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 9105863f59..3cebb50c05 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/f;
 .super Lcom/google/firebase/components/g;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/com/google/firebase/components/g.smali b/com.discord/smali_classes2/com/google/firebase/components/g.smali
index 9af676abd8..4033d8d394 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/g.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/firebase/components/g;
 .super Ljava/lang/RuntimeException;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/components/h.smali b/com.discord/smali_classes2/com/google/firebase/components/h.smali
index b55d3070ac..45531d65d6 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/h.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/h;
 .super Lcom/google/firebase/components/g;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # direct methods
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 1bc835cf68..16b2dc7ae0 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/i.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/i.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/firebase/components/i;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/components/b;
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 5a2e305181..77726edec9 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/j.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/j.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/google/firebase/components/j;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/components/c;
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 18ccfdb78c..a22fed910e 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/k.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/k;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/components/l;
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 9a8341c279..5a1038a46c 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/l.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/firebase/components/l;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
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 458dcce0b3..69a7a50cf2 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/components/m;
 .super Lcom/google/firebase/components/i;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # instance fields
@@ -477,4 +478,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v0
+
+    return-void
 .end method
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 480fe33b9a..2220b73f00 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/n.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/n.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/firebase/components/n;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # instance fields
@@ -65,7 +66,7 @@
 
 
 # virtual methods
-.method final mt()Z
+.method final ms()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/firebase/components/n;->bxM:Ljava/util/Set;
diff --git a/com.discord/smali_classes2/com/google/firebase/components/o.smali b/com.discord/smali_classes2/com/google/firebase/components/o.smali
index a13bcd178a..8ceb4c65c8 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/o.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/o.smali
@@ -1,5 +1,6 @@
 .class Lcom/google/firebase/components/o;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/a/c;
@@ -310,4 +311,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/p.smali b/com.discord/smali_classes2/com/google/firebase/components/p.smali
index 6da91ac345..9f2cd23ebd 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/p.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/p.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/google/firebase/components/p;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 86b158d295..9a11ec4e20 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/q.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/q.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/firebase/components/q;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/b/a;
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 0413b66413..160828103f 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/r.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/r.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/google/firebase/components/r;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/b/a;
diff --git a/com.discord/smali_classes2/com/google/firebase/components/s$a.smali b/com.discord/smali_classes2/com/google/firebase/components/s$a.smali
index 77315bd4da..32dc478bc5 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/s$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/s$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/firebase/components/s$a;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 # interfaces
 .implements Lcom/google/firebase/a/c;
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 0169986625..22beecd2b1 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/s.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/s.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/firebase/components/s;
 .super Lcom/google/firebase/components/i;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # annotations
@@ -86,7 +87,7 @@
 
     check-cast v3, Lcom/google/firebase/components/e;
 
-    invoke-virtual {v3}, Lcom/google/firebase/components/e;->mt()Z
+    invoke-virtual {v3}, Lcom/google/firebase/components/e;->ms()Z
 
     move-result v4
 
diff --git a/com.discord/smali_classes2/com/google/firebase/d.smali b/com.discord/smali_classes2/com/google/firebase/d.smali
index 1a53a6ad81..d0505c4a69 100644
--- a/com.discord/smali_classes2/com/google/firebase/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/d;
 .super Ljava/lang/Object;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # instance fields
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 4298e4dc1b..bfa807c72e 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/PendingDynamicLinkData.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/PendingDynamicLinkData.smali
@@ -29,7 +29,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/f;->lZ()Lcom/google/android/gms/common/util/d;
+    invoke-static {}, Lcom/google/android/gms/common/util/f;->lY()Lcom/google/android/gms/common/util/d;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method public final BI()Landroid/net/Uri;
+.method public final BH()Landroid/net/Uri;
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->bxY:Lcom/google/android/gms/internal/measurement/zztd;
@@ -59,8 +59,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->bxY:Lcom/google/android/gms/internal/measurement/zztd;
-
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/zztd;->bas:Ljava/lang/String;
 
     if-eqz v0, :cond_1
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/R.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/R.smali
index 6ff993baa3..72697c662d 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/dynamiclinks/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 74ef1e5501..e0ceaa0da4 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/a.smali
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized BH()Lcom/google/firebase/dynamiclinks/a;
+.method public static declared-synchronized BG()Lcom/google/firebase/dynamiclinks/a;
     .locals 3
 
     const-class v0, Lcom/google/firebase/dynamiclinks/a;
@@ -57,7 +57,7 @@
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/du;
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/firebase_core/R.smali b/com.discord/smali_classes2/com/google/firebase/firebase_core/R.smali
index 31807b2165..ba7f17bf90 100644
--- a/com.discord/smali_classes2/com/google/firebase/firebase_core/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/firebase_core/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/firebase_core/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/firebase_invites/R.smali b/com.discord/smali_classes2/com/google/firebase/firebase_invites/R.smali
index edfcaa2938..d40de73eb6 100644
--- a/com.discord/smali_classes2/com/google/firebase/firebase_invites/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/firebase_invites/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/firebase_invites/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 74df95d113..7fabd1dc57 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
@@ -57,13 +57,13 @@
 
     iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->byl:Lcom/google/firebase/a/d;
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->mG()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->mF()Z
 
     move-result p1
 
     iput-boolean p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->byk:Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->BP()Ljava/lang/Boolean;
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->BO()Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -93,7 +93,7 @@
     return-void
 .end method
 
-.method private final BP()Ljava/lang/Boolean;
+.method private final BO()Ljava/lang/Boolean;
     .locals 4
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -193,7 +193,7 @@
     return-object v0
 .end method
 
-.method private final mG()Z
+.method private final mF()Z
     .locals 4
 
     const/4 v0, 0x1
@@ -288,7 +288,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/b;->BD()Z
+    invoke-virtual {v0}, Lcom/google/firebase/b;->BC()Z
 
     move-result v0
     :try_end_1
@@ -298,7 +298,6 @@
 
     const/4 v0, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return v0
@@ -306,7 +305,9 @@
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return v0
 
     :catchall_0
     move-exception v0
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 eb5eaa94ec..e10c6bed8f 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId.smali
@@ -72,11 +72,11 @@
 
     invoke-direct {v2, v0}, Lcom/google/firebase/iid/o;-><init>(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/firebase/iid/aj;->Ci()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/aj;->Ch()Ljava/util/concurrent/Executor;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/firebase/iid/aj;->Ci()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/aj;->Ch()Ljava/util/concurrent/Executor;
 
     move-result-object v4
 
@@ -154,6 +154,8 @@
 
     if-eqz v1, :cond_1
 
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->byf:Lcom/google/firebase/iid/a;
+
     goto :goto_0
 
     :cond_1
@@ -161,10 +163,10 @@
 
     invoke-direct {v0, p1, p2, p3}, Lcom/google/firebase/iid/ar;-><init>(Lcom/google/firebase/b;Lcom/google/firebase/iid/o;Ljava/util/concurrent/Executor;)V
 
-    :goto_0
     iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->byf:Lcom/google/firebase/iid/a;
 
     :cond_2
+    :goto_0
     iget-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->byf:Lcom/google/firebase/iid/a;
 
     iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->byf:Lcom/google/firebase/iid/a;
@@ -199,7 +201,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()V
 
     :cond_3
     return-void
@@ -224,10 +226,10 @@
     throw p1
 .end method
 
-.method public static BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+.method public static BI()Lcom/google/firebase/iid/FirebaseInstanceId;
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v0
 
@@ -238,7 +240,7 @@
     return-object v0
 .end method
 
-.method public static BL()Ljava/lang/String;
+.method public static BK()Ljava/lang/String;
     .locals 2
 
     sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->bya:Lcom/google/firebase/iid/y;
@@ -332,7 +334,7 @@
 .method static synthetic b(Lcom/google/firebase/iid/FirebaseInstanceId;)V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()V
 
     return-void
 .end method
@@ -394,7 +396,7 @@
     return-object p0
 .end method
 
-.method static lJ()Z
+.method static lI()Z
     .locals 3
 
     const-string v0, "FirebaseInstanceId"
@@ -437,10 +439,10 @@
 
 
 # virtual methods
-.method public final BK()V
+.method public final BJ()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()Lcom/google/firebase/iid/z;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BM()Lcom/google/firebase/iid/z;
 
     move-result-object v0
 
@@ -448,7 +450,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -460,7 +462,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->byh:Lcom/google/firebase/iid/ac;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/ac;->Cf()Z
+    invoke-virtual {v0}, Lcom/google/firebase/iid/ac;->Ce()Z
 
     move-result v0
 
@@ -473,7 +475,7 @@
     return-void
 .end method
 
-.method public final BM()Lcom/google/android/gms/tasks/g;
+.method public final BL()Lcom/google/android/gms/tasks/g;
     .locals 2
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
@@ -502,7 +504,7 @@
     return-object v0
 .end method
 
-.method public final BN()Lcom/google/firebase/iid/z;
+.method public final BM()Lcom/google/firebase/iid/z;
     .locals 2
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -522,7 +524,7 @@
     return-object v0
 .end method
 
-.method final declared-synchronized BO()V
+.method final declared-synchronized BN()V
     .locals 1
 
     monitor-enter p0
@@ -530,7 +532,7 @@
     :try_start_0
     sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->bya:Lcom/google/firebase/iid/y;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/y;->Cb()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/y;->Ca()V
 
     iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->byj:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
@@ -719,7 +721,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BO()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()V
 
     :cond_0
     check-cast v0, Ljava/io/IOException;
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 dedf9da0ca..14a6a204b1 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdReceiver.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdReceiver.smali
@@ -96,7 +96,7 @@
     return p0
 
     :cond_2
-    invoke-static {}, Lcom/google/firebase/iid/x;->Ca()Lcom/google/firebase/iid/x;
+    invoke-static {}, Lcom/google/firebase/iid/x;->BZ()Lcom/google/firebase/iid/x;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdService.smali b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdService.smali
index ddf28df2bf..ac469c9fd0 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdService.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdService.smali
@@ -21,7 +21,7 @@
 .method protected final zzb(Landroid/content/Intent;)Landroid/content/Intent;
     .locals 0
 
-    invoke-static {}, Lcom/google/firebase/iid/x;->Ca()Lcom/google/firebase/iid/x;
+    invoke-static {}, Lcom/google/firebase/iid/x;->BZ()Lcom/google/firebase/iid/x;
 
     move-result-object p1
 
@@ -152,7 +152,7 @@
 
     if-eqz p1, :cond_4
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
@@ -168,11 +168,13 @@
 
     :cond_3
     :goto_0
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->BO()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()V
+
+    return-void
 
     :cond_4
     :goto_1
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/R.smali b/com.discord/smali_classes2/com/google/firebase/iid/R.smali
index 073edabe08..aff525b296 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/iid/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 b5813dee12..64eb2fdb21 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/Registrar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/Registrar.smali
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/components/a$a;->BG()Lcom/google/firebase/components/a;
+    invoke-virtual {v0}, Lcom/google/firebase/components/a$a;->BF()Lcom/google/firebase/components/a;
 
     move-result-object v0
 
@@ -105,7 +105,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/a$a;->BG()Lcom/google/firebase/components/a;
+    invoke-virtual {v2}, Lcom/google/firebase/components/a$a;->BF()Lcom/google/firebase/components/a;
 
     move-result-object v2
 
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 ea5a1613e5..ccf88502ab 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aa.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aa.smali
@@ -62,7 +62,7 @@
     return-void
 .end method
 
-.method private final Cc()Z
+.method private final Cb()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -70,12 +70,12 @@
     return v0
 .end method
 
-.method private final Cd()Z
+.method private final Cc()Z
     .locals 8
 
     iget-object v0, p0, Lcom/google/firebase/iid/aa;->bzj:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()Lcom/google/firebase/iid/z;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BM()Lcom/google/firebase/iid/z;
 
     move-result-object v0
 
@@ -85,7 +85,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/iid/aa;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object v2
 
@@ -267,7 +267,7 @@
 
 
 # virtual methods
-.method final Ce()Z
+.method final Cd()Z
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/firebase/iid/aa;->getContext()Landroid/content/Context;
@@ -354,12 +354,10 @@
 
     iget-object v0, p0, Lcom/google/firebase/iid/aa;->bzj:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    :goto_0
     invoke-virtual {v0, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->zza(Z)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :goto_1
     iget-object v0, p0, Lcom/google/firebase/iid/aa;->bzi:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
@@ -368,7 +366,7 @@
 
     :cond_0
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/firebase/iid/aa;->Ce()Z
+    invoke-virtual {p0}, Lcom/google/firebase/iid/aa;->Cd()Z
 
     move-result v0
 
@@ -378,7 +376,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/firebase/iid/ab;-><init>(Lcom/google/firebase/iid/aa;)V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lJ()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lI()Z
 
     move-result v1
 
@@ -404,17 +402,24 @@
     move-result-object v2
 
     invoke-virtual {v2, v0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_1
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->bzi:Landroid/os/PowerManager$WakeLock;
+
+    invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
+
+    return-void
 
     :cond_2
-    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->Cc()Z
+    :try_start_2
+    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->Cb()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->Cd()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->Cc()Z
 
     move-result v0
 
@@ -432,6 +437,8 @@
 
     iget-object v0, p0, Lcom/google/firebase/iid/aa;->bzj:Lcom/google/firebase/iid/FirebaseInstanceId;
 
+    invoke-virtual {v0, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->zza(Z)V
+
     goto :goto_0
 
     :cond_3
@@ -440,10 +447,15 @@
     iget-wide v1, p0, Lcom/google/firebase/iid/aa;->bzh:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/firebase/iid/FirebaseInstanceId;->aK(J)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto :goto_1
+    :goto_0
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->bzi:Landroid/os/PowerManager$WakeLock;
+
+    invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
+
+    return-void
 
     :catchall_0
     move-exception v0
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 d6b598a481..b457db0275 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ac.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ac.smali
@@ -53,7 +53,7 @@
     return-void
 .end method
 
-.method private final Cg()Ljava/lang/String;
+.method private final Cf()Ljava/lang/String;
     .locals 3
     .annotation build Landroidx/annotation/GuardedBy;
         value = "this"
@@ -69,7 +69,7 @@
     :try_start_0
     iget-object v1, p0, Lcom/google/firebase/iid/ac;->bya:Lcom/google/firebase/iid/y;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/y;->uZ()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/y;->uY()Ljava/lang/String;
 
     move-result-object v1
 
@@ -193,10 +193,10 @@
     :goto_0
     packed-switch v3, :pswitch_data_0
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()Lcom/google/firebase/iid/z;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BM()Lcom/google/firebase/iid/z;
 
     move-result-object v2
 
@@ -204,7 +204,7 @@
 
     iget-object v3, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v3}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object v3
 
@@ -214,7 +214,7 @@
 
     if-nez v3, :cond_3
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()Ljava/lang/String;
 
     move-result-object v3
 
@@ -228,7 +228,7 @@
 
     invoke-virtual {p0, p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->d(Lcom/google/android/gms/tasks/g;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lJ()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lI()Z
 
     move-result p0
 
@@ -238,10 +238,9 @@
 
     const-string p1, "unsubscribe operation succeeded"
 
-    :goto_1
     invoke-static {p0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     new-instance p0, Ljava/io/IOException;
@@ -253,7 +252,7 @@
     throw p0
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()Lcom/google/firebase/iid/z;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BM()Lcom/google/firebase/iid/z;
 
     move-result-object v2
 
@@ -261,7 +260,7 @@
 
     iget-object v3, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v3}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object v3
 
@@ -271,7 +270,7 @@
 
     if-nez v3, :cond_4
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()Ljava/lang/String;
 
     move-result-object v3
 
@@ -285,7 +284,7 @@
 
     invoke-virtual {p0, p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->d(Lcom/google/android/gms/tasks/g;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lJ()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lI()Z
 
     move-result p0
 
@@ -295,7 +294,9 @@
 
     const-string p1, "subscribe operation succeeded"
 
-    goto :goto_1
+    invoke-static {p0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto :goto_2
 
     :cond_4
     new-instance p0, Ljava/io/IOException;
@@ -333,24 +334,22 @@
 
     move-result-object p0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     new-instance p0, Ljava/lang/String;
 
     invoke-direct {p0, v1}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_2
+    :goto_1
     invoke-static {p1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
     return v0
 
     :cond_6
-    :goto_3
+    :goto_2
     return v1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
@@ -373,7 +372,7 @@
     :try_start_1
     iget-object v1, p0, Lcom/google/firebase/iid/ac;->bya:Lcom/google/firebase/iid/y;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/y;->uZ()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/y;->uY()Ljava/lang/String;
 
     move-result-object v1
 
@@ -498,13 +497,13 @@
 
 
 # virtual methods
-.method final declared-synchronized Cf()Z
+.method final declared-synchronized Ce()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/ac;->Cg()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/ac;->Cf()Ljava/lang/String;
 
     move-result-object v0
     :try_end_0
@@ -530,6 +529,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method final c(Lcom/google/firebase/iid/FirebaseInstanceId;)Z
@@ -542,7 +543,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/ac;->Cg()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/ac;->Cf()Ljava/lang/String;
 
     move-result-object v0
 
@@ -550,7 +551,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lJ()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lI()Z
 
     move-result p1
 
@@ -639,4 +640,6 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p1
+
+    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 b6fc4f0bba..4fc0beaa8d 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ai.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ai.smali
@@ -96,8 +96,8 @@
     return-void
 .end method
 
-.method private final declared-synchronized AT()V
-    .locals 5
+.method private final declared-synchronized AS()V
+    .locals 6
 
     monitor-enter p0
 
@@ -126,7 +126,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_b
+    if-nez v0, :cond_c
 
     const-string v0, "EnhancedIntentService"
 
@@ -263,103 +263,111 @@
 
     move-result v0
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
-    if-eqz v0, :cond_8
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_9
 
     const-string v0, "EnhancedIntentService"
 
-    iget-boolean v2, p0, Lcom/google/firebase/iid/ai;->aho:Z
+    iget-boolean v3, p0, Lcom/google/firebase/iid/ai;->aho:Z
 
-    xor-int/2addr v2, v1
+    if-nez v3, :cond_8
 
-    const/16 v3, 0x27
+    const/4 v3, 0x1
 
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4, v3}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const-string v3, "binder is dead. start connection? "
-
-    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v0, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+    goto :goto_1
 
     :cond_8
+    const/4 v3, 0x0
+
+    :goto_1
+    const/16 v4, 0x27
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    invoke-direct {v5, v4}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const-string v4, "binder is dead. start connection? "
+
+    invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5, v3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v0, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_9
     iget-boolean v0, p0, Lcom/google/firebase/iid/ai;->aho:Z
 
-    if-nez v0, :cond_a
+    if-nez v0, :cond_b
 
-    iput-boolean v1, p0, Lcom/google/firebase/iid/ai;->aho:Z
+    iput-boolean v2, p0, Lcom/google/firebase/iid/ai;->aho:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, p0, Lcom/google/firebase/iid/ai;->byu:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ai;->bzx:Landroid/content/Intent;
+    iget-object v2, p0, Lcom/google/firebase/iid/ai;->bzx:Landroid/content/Intent;
 
-    const/16 v2, 0x41
+    const/16 v3, 0x41
 
-    invoke-static {v0, v1, p0, v2}, Lcom/google/android/gms/common/stats/a;->b(Landroid/content/Context;Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
+    invoke-static {v0, v2, p0, v3}, Lcom/google/android/gms/common/stats/a;->b(Landroid/content/Context;Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
 
     move-result v0
     :try_end_1
     .catch Ljava/lang/SecurityException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_a
 
     monitor-exit p0
 
     return-void
 
-    :cond_9
+    :cond_a
     :try_start_2
     const-string v0, "EnhancedIntentService"
 
-    const-string v1, "binding to the service failed"
+    const-string v2, "binding to the service failed"
 
-    invoke-static {v0, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+    invoke-static {v0, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
     :try_end_2
     .catch Ljava/lang/SecurityException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto :goto_1
+    goto :goto_2
 
     :catch_0
     move-exception v0
 
     :try_start_3
-    const-string v1, "EnhancedIntentService"
+    const-string v2, "EnhancedIntentService"
 
-    const-string v2, "Exception while binding the service"
+    const-string v3, "Exception while binding the service"
 
-    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v2, v3, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    :goto_1
-    const/4 v0, 0x0
+    :goto_2
+    iput-boolean v1, p0, Lcom/google/firebase/iid/ai;->aho:Z
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/ai;->aho:Z
-
-    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AU()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AT()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :cond_a
+    :cond_b
     monitor-exit p0
 
     return-void
 
-    :cond_b
+    :cond_c
     monitor-exit p0
 
     return-void
@@ -370,9 +378,11 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method private final AU()V
+.method private final AT()V
     .locals 1
     .annotation build Landroidx/annotation/GuardedBy;
         value = "this"
@@ -438,7 +448,7 @@
 
     invoke-interface {v0, v1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AS()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -521,12 +531,12 @@
 
     invoke-static {p1, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AU()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AT()V
 
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AS()V
 
     :goto_0
     monitor-exit p0
@@ -589,7 +599,7 @@
     invoke-static {v0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AT()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ai;->AS()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/aj.smali b/com.discord/smali_classes2/com/google/firebase/iid/aj.smali
index b80067a5ca..9b4c4bbfb0 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aj.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aj.smali
@@ -17,7 +17,7 @@
     return-void
 .end method
 
-.method static Ch()Ljava/util/concurrent/Executor;
+.method static Cg()Ljava/util/concurrent/Executor;
     .locals 1
 
     sget-object v0, Lcom/google/firebase/iid/aj;->bzB:Ljava/util/concurrent/Executor;
@@ -25,7 +25,7 @@
     return-object v0
 .end method
 
-.method static Ci()Ljava/util/concurrent/Executor;
+.method static Ch()Ljava/util/concurrent/Executor;
     .locals 9
 
     new-instance v8, Ljava/util/concurrent/ThreadPoolExecutor;
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 6c35cfaab7..8f6c878489 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/an.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/an.smali
@@ -51,7 +51,7 @@
 
     iget-object v9, p0, Lcom/google/firebase/iid/an;->bzJ:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()Ljava/lang/String;
 
     move-result-object v10
 
@@ -63,7 +63,7 @@
 
     iget-object v1, v6, Lcom/google/firebase/iid/FirebaseInstanceId;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object v1
 
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 10f3afcb65..2b03b6d67c 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ao.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ao.smali
@@ -38,7 +38,7 @@
 
 
 # virtual methods
-.method public final BY()Lcom/google/android/gms/tasks/g;
+.method public final BX()Lcom/google/android/gms/tasks/g;
     .locals 4
 
     iget-object v0, p0, Lcom/google/firebase/iid/ao;->bzF:Lcom/google/firebase/iid/FirebaseInstanceId;
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 dd9954d138..695a174066 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
@@ -51,7 +51,7 @@
 
     iget-object v8, p0, Lcom/google/firebase/iid/ap;->bzJ:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AP()Z
 
     move-result v1
 
@@ -69,7 +69,7 @@
 
     iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object v6
 
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 c71d0da6e4..b36eabd316 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ar.smali
@@ -86,7 +86,7 @@
 
     iget-object p2, p0, Lcom/google/firebase/iid/ar;->byd:Lcom/google/firebase/b;
 
-    invoke-virtual {p2}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/d;
+    invoke-virtual {p2}, Lcom/google/firebase/b;->BA()Lcom/google/firebase/d;
 
     move-result-object p2
 
@@ -98,7 +98,7 @@
 
     iget-object p2, p0, Lcom/google/firebase/iid/ar;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {p2}, Lcom/google/firebase/iid/o;->mO()I
+    invoke-virtual {p2}, Lcom/google/firebase/iid/o;->mN()I
 
     move-result p2
 
@@ -122,7 +122,7 @@
 
     iget-object p2, p0, Lcom/google/firebase/iid/ar;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {p2}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/firebase/iid/o;->BV()Ljava/lang/String;
 
     move-result-object p2
 
@@ -132,7 +132,7 @@
 
     iget-object p2, p0, Lcom/google/firebase/iid/ar;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {p2}, Lcom/google/firebase/iid/o;->BX()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/firebase/iid/o;->BW()Ljava/lang/String;
 
     move-result-object p2
 
@@ -176,7 +176,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/aj;->Ch()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/aj;->Cg()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
@@ -373,7 +373,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/iid/ar;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/o;->mM()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/o;->mL()I
 
     move-result v0
 
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 34d4c48f61..20ead664e4 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ay.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ay.smali
@@ -143,7 +143,7 @@
 
     const-string v2, "pub"
 
-    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->lX()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->lW()Ljava/lang/String;
 
     move-result-object v3
 
@@ -151,7 +151,7 @@
 
     const-string v2, "pri"
 
-    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->Cj()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->Ci()Ljava/lang/String;
 
     move-result-object v3
 
@@ -215,7 +215,7 @@
 
     invoke-static {p0}, Lcom/google/firebase/iid/ay;->c(Ljava/nio/channels/FileChannel;)Lcom/google/firebase/iid/az;
 
-    move-result-object p3
+    move-result-object p2
     :try_end_3
     .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
     .catch Lcom/google/firebase/iid/c; {:try_start_3 .. :try_end_3} :catch_0
@@ -236,7 +236,7 @@
     :try_end_5
     .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
 
-    return-object p3
+    return-object p2
 
     :catch_0
     move-exception p3
@@ -468,6 +468,8 @@
 
     invoke-direct {v1, v0, p0, p1}, Lcom/google/firebase/iid/az;-><init>(Ljava/security/KeyPair;J)V
 
+    return-object v1
+
     :cond_1
     :goto_0
     return-object v1
@@ -528,7 +530,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->lX()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->lW()Ljava/lang/String;
 
     move-result-object v1
 
@@ -540,7 +542,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->Cj()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/firebase/iid/az;->Ci()Ljava/lang/String;
 
     move-result-object v1
 
@@ -788,7 +790,7 @@
 
     new-instance v0, Lcom/google/firebase/iid/az;
 
-    invoke-static {}, Lcom/google/firebase/iid/b;->BQ()Ljava/security/KeyPair;
+    invoke-static {}, Lcom/google/firebase/iid/b;->BP()Ljava/security/KeyPair;
 
     move-result-object v1
 
@@ -881,12 +883,12 @@
     :try_start_0
     invoke-static {p0}, Lcom/google/firebase/iid/ay;->u(Ljava/io/File;)Lcom/google/firebase/iid/az;
 
-    move-result-object p1
+    move-result-object p0
     :try_end_0
     .catch Lcom/google/firebase/iid/c; {:try_start_0 .. :try_end_0} :catch_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p1
+    return-object p0
 
     :catch_0
     move-exception p1
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 76ba964bc6..fae5ad1ed5 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/az.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/az.smali
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final Cj()Ljava/lang/String;
+.method final Ci()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/iid/az;->bzR:Ljava/security/KeyPair;
@@ -155,7 +155,7 @@
     return v0
 .end method
 
-.method final lX()Ljava/lang/String;
+.method final lW()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/iid/az;->bzR:Ljava/security/KeyPair;
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 2ec19bb798..c80df901de 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/b.smali
@@ -3,7 +3,7 @@
 
 
 # direct methods
-.method public static BQ()Ljava/security/KeyPair;
+.method public static BP()Ljava/security/KeyPair;
     .locals 2
 
     :try_start_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 76361715d4..6f30d81722 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/d.smali
@@ -106,7 +106,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized BR()I
+.method public final declared-synchronized BQ()I
     .locals 2
 
     monitor-enter p0
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 8cdce06245..1f280dbd71 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/e.smali
@@ -100,7 +100,7 @@
     return-void
 .end method
 
-.method private final BS()V
+.method private final BR()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/iid/e;->byB:Lcom/google/firebase/iid/d;
@@ -118,7 +118,7 @@
 
 
 # virtual methods
-.method final declared-synchronized BT()V
+.method final declared-synchronized BS()V
     .locals 2
 
     monitor-enter p0
@@ -165,7 +165,7 @@
 
     iput v0, p0, Lcom/google/firebase/iid/e;->state:I
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, p0, Lcom/google/firebase/iid/e;->byB:Lcom/google/firebase/iid/d;
 
@@ -188,7 +188,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized BU()V
+.method final declared-synchronized BT()V
     .locals 2
 
     monitor-enter p0
@@ -250,7 +250,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/e;->BS()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/e;->BR()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -319,7 +319,7 @@
 
     invoke-virtual {p1, v0}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, p0, Lcom/google/firebase/iid/e;->byB:Lcom/google/firebase/iid/d;
 
@@ -497,7 +497,7 @@
     :cond_2
     iput v1, p0, Lcom/google/firebase/iid/e;->state:I
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lV()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->lU()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, p0, Lcom/google/firebase/iid/e;->byB:Lcom/google/firebase/iid/d;
 
@@ -613,7 +613,7 @@
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -705,7 +705,7 @@
 
     invoke-virtual {v3, v0}, Landroid/util/SparseArray;->remove(I)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/e;->BT()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/e;->BS()V
 
     monitor-exit p0
     :try_end_0
@@ -804,7 +804,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/l;->a(Lcom/google/firebase/iid/m;)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/e;->BT()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/e;->BS()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -872,7 +872,7 @@
     :try_start_2
     iput v0, p0, Lcom/google/firebase/iid/e;->state:I
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/e;->BS()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/e;->BR()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
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 a682ac5fd2..a1730836d4 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/g.smali
@@ -27,7 +27,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/iid/g;->byC:Lcom/google/firebase/iid/e;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/e;->BU()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/e;->BT()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/h.smali b/com.discord/smali_classes2/com/google/firebase/iid/h.smali
index 8098269303..3c0d65cb30 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/h.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/h.smali
@@ -50,7 +50,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/e;->BT()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/e;->BS()V
 
     monitor-exit v0
 
@@ -158,7 +158,7 @@
 
     const-string v6, "oneWay"
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/l;->BV()Z
+    invoke-virtual {v1}, Lcom/google/firebase/iid/l;->BU()Z
 
     move-result v7
 
@@ -235,4 +235,6 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     throw v1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/internal/R.smali b/com.discord/smali_classes2/com/google/firebase/iid/internal/R.smali
index 243a0b663e..af446c0d6a 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/internal/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/internal/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/iid/internal/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 180e576f6f..445e718c80 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/k.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/k.smali
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method final BV()Z
+.method final BU()Z
     .locals 1
 
     const/4 v0, 0x1
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 c8dc8b68b9..e9927101f2 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/l.smali
@@ -53,7 +53,7 @@
 
 
 # virtual methods
-.method abstract BV()Z
+.method abstract BU()Z
 .end method
 
 .method final a(Lcom/google/firebase/iid/m;)V
@@ -217,7 +217,7 @@
 
     iget v1, p0, Lcom/google/firebase/iid/l;->aJw:I
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/l;->BV()Z
+    invoke-virtual {p0}, Lcom/google/firebase/iid/l;->BU()Z
 
     move-result v2
 
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 402e680675..aeca6503b9 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/n.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/n.smali
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method final BV()Z
+.method final BU()Z
     .locals 1
 
     const/4 v0, 0x0
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 22b816c60a..9bbcc92077 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/o.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/o.smali
@@ -106,7 +106,7 @@
 .method public static c(Lcom/google/firebase/b;)Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/d;
+    invoke-virtual {p0}, Lcom/google/firebase/b;->BA()Lcom/google/firebase/d;
 
     move-result-object v0
 
@@ -117,7 +117,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/d;
+    invoke-virtual {p0}, Lcom/google/firebase/b;->BA()Lcom/google/firebase/d;
 
     move-result-object p0
 
@@ -227,7 +227,7 @@
     return-object p1
 .end method
 
-.method private final declared-synchronized tB()V
+.method private final declared-synchronized tA()V
     .locals 2
 
     monitor-enter p0
@@ -274,46 +274,46 @@
 
 
 # virtual methods
+.method public final declared-synchronized BV()Ljava/lang/String;
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/google/firebase/iid/o;->byI:Ljava/lang/String;
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lcom/google/firebase/iid/o;->tA()V
+
+    :cond_0
+    iget-object v0, p0, Lcom/google/firebase/iid/o;->byI:Ljava/lang/String;
+    :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 BW()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
-    :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/o;->byI:Ljava/lang/String;
-
-    if-nez v0, :cond_0
-
-    invoke-direct {p0}, Lcom/google/firebase/iid/o;->tB()V
-
-    :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/o;->byI:Ljava/lang/String;
-    :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 BX()Ljava/lang/String;
-    .locals 1
-
-    monitor-enter p0
-
     :try_start_0
     iget-object v0, p0, Lcom/google/firebase/iid/o;->byJ:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/o;->tB()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/o;->tA()V
 
     :cond_0
     iget-object v0, p0, Lcom/google/firebase/iid/o;->byJ:Ljava/lang/String;
@@ -332,7 +332,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized mM()I
+.method public final declared-synchronized mL()I
     .locals 5
 
     monitor-enter p0
@@ -500,7 +500,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized mO()I
+.method public final declared-synchronized mN()I
     .locals 1
 
     monitor-enter p0
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 7d3fb89af9..7adf09f498 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/s.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/s.smali
@@ -197,7 +197,7 @@
     invoke-static {p1, p2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_2
-    invoke-interface {p3}, Lcom/google/firebase/iid/u;->BY()Lcom/google/android/gms/tasks/g;
+    invoke-interface {p3}, Lcom/google/firebase/iid/u;->BX()Lcom/google/android/gms/tasks/g;
 
     move-result-object p1
 
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 f6bc7f8a4a..24e8af860a 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/u.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/u.smali
@@ -3,7 +3,7 @@
 
 
 # virtual methods
-.method public abstract BY()Lcom/google/android/gms/tasks/g;
+.method public abstract BX()Lcom/google/android/gms/tasks/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
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 00e366af81..7a07357754 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/v.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/v.smali
@@ -75,7 +75,7 @@
     return-void
 .end method
 
-.method private static declared-synchronized BZ()Ljava/lang/String;
+.method private static declared-synchronized BY()Ljava/lang/String;
     .locals 3
 
     const-class v0, Lcom/google/firebase/iid/v;
@@ -620,7 +620,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/v;->BZ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/v;->BY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -643,7 +643,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/iid/v;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/o;->mM()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/o;->mL()I
 
     move-result v2
 
@@ -659,7 +659,7 @@
 
     iget-object v3, p0, Lcom/google/firebase/iid/v;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v3}, Lcom/google/firebase/iid/o;->mM()I
+    invoke-virtual {v3}, Lcom/google/firebase/iid/o;->mL()I
 
     move-result v3
 
@@ -669,17 +669,16 @@
 
     const-string v3, "com.google.iid.TOKEN_REQUEST"
 
-    :goto_0
     invoke-virtual {v2, v3}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v3, "com.google.android.c2dm.intent.REGISTER"
 
-    goto :goto_0
+    invoke-virtual {v2, v3}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
 
-    :goto_1
+    :goto_0
     invoke-virtual {v2, p1}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
 
     iget-object p1, p0, Lcom/google/firebase/iid/v;->byu:Landroid/content/Context;
@@ -795,7 +794,7 @@
 
     invoke-virtual {v5, p1}, Landroid/os/Messenger;->send(Landroid/os/Message;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-object v5, p0, Lcom/google/firebase/iid/v;->byU:Lcom/google/firebase/iid/zzl;
@@ -804,7 +803,7 @@
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     nop
@@ -826,7 +825,7 @@
     :cond_4
     iget-object p1, p0, Lcom/google/firebase/iid/v;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/o;->mM()I
+    invoke-virtual {p1}, Lcom/google/firebase/iid/o;->mL()I
 
     move-result p1
 
@@ -836,14 +835,14 @@
 
     invoke-virtual {p1, v2}, Landroid/content/Context;->sendBroadcast(Landroid/content/Intent;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     iget-object p1, p0, Lcom/google/firebase/iid/v;->byu:Landroid/content/Context;
 
     invoke-virtual {p1, v2}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName;
 
-    :goto_2
+    :goto_1
     :try_start_2
     iget-object p1, v1, Lcom/google/android/gms/tasks/h;->btf:Lcom/google/android/gms/tasks/aa;
 
@@ -887,7 +886,7 @@
     :catchall_1
     move-exception p1
 
-    goto :goto_3
+    goto :goto_2
 
     :catch_1
     move-exception p1
@@ -916,7 +915,7 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
-    :goto_3
+    :goto_2
     iget-object v1, p0, Lcom/google/firebase/iid/v;->byR:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v1
@@ -1083,7 +1082,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/iid/v;->bye:Lcom/google/firebase/iid/o;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/o;->mO()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/o;->mN()I
 
     move-result v0
 
@@ -1099,7 +1098,7 @@
 
     new-instance v1, Lcom/google/firebase/iid/n;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/d;->BR()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/d;->BQ()I
 
     move-result v2
 
@@ -1124,12 +1123,11 @@
 
     if-eqz v1, :cond_0
 
-    :goto_0
     invoke-static {v0}, Lcom/google/android/gms/tasks/j;->c(Lcom/google/android/gms/tasks/g;)Ljava/lang/Object;
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance v1, Lcom/google/android/gms/tasks/j$a;
@@ -1144,9 +1142,11 @@
 
     invoke-virtual {v1}, Ljava/util/concurrent/CountDownLatch;->await()V
 
-    goto :goto_0
+    invoke-static {v0}, Lcom/google/android/gms/tasks/j;->c(Lcom/google/android/gms/tasks/g;)Ljava/lang/Object;
 
-    :goto_1
+    move-result-object v0
+
+    :goto_0
     check-cast v0, Landroid/os/Bundle;
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
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 6e434151ce..65e6470683 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/x.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/x.smali
@@ -82,7 +82,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized Ca()Lcom/google/firebase/iid/x;
+.method public static declared-synchronized BZ()Lcom/google/firebase/iid/x;
     .locals 2
 
     const-class v0, Lcom/google/firebase/iid/x;
@@ -643,14 +643,16 @@
     :pswitch_0
     iget-object v0, p0, Lcom/google/firebase/iid/x;->bza:Ljava/util/Queue;
 
+    invoke-interface {v0, p3}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
     goto :goto_2
 
     :pswitch_1
     iget-object v0, p0, Lcom/google/firebase/iid/x;->byZ:Ljava/util/Queue;
 
-    :goto_2
     invoke-interface {v0, p3}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
 
+    :goto_2
     new-instance p3, Landroid/content/Intent;
 
     invoke-direct {p3, p2}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
@@ -679,6 +681,8 @@
 
     return p1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_1
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 b3cab97b5f..ff646bf077 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/y.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/y.smali
@@ -100,13 +100,13 @@
 
     invoke-static {p1, p2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/y;->Cb()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/y;->Ca()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->BO()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -294,7 +294,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized Cb()V
+.method public final declared-synchronized Ca()V
     .locals 6
 
     monitor-enter p0
@@ -367,6 +367,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -509,11 +511,11 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BO()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BN()V
 
     iget-object v0, p0, Lcom/google/firebase/iid/y;->byu:Landroid/content/Context;
 
@@ -615,6 +617,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized m(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/google/firebase/iid/z;
@@ -653,7 +657,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized uZ()Ljava/lang/String;
+.method public final declared-synchronized uY()Ljava/lang/String;
     .locals 3
 
     monitor-enter p0
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/zzl$a.smali b/com.discord/smali_classes2/com/google/firebase/iid/zzl$a.smali
index 27e5b6b511..72345cd967 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/zzl$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/zzl$a.smali
@@ -50,7 +50,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lJ()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->lI()Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/zzl.smali b/com.discord/smali_classes2/com/google/firebase/iid/zzl.smali
index 3d3a5d0ed7..29dc6ad7bd 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/zzl.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/zzl.smali
@@ -80,8 +80,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/zzl;->byE:Landroid/os/Messenger;
-
     invoke-virtual {v0}, Landroid/os/Messenger;->getBinder()Landroid/os/IBinder;
 
     move-result-object v0
@@ -167,8 +165,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/zzl;->byE:Landroid/os/Messenger;
-
     invoke-virtual {v0, p1}, Landroid/os/Messenger;->send(Landroid/os/Message;)V
 
     return-void
@@ -188,13 +184,10 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/google/firebase/iid/zzl;->byE:Landroid/os/Messenger;
-
     invoke-virtual {p2}, Landroid/os/Messenger;->getBinder()Landroid/os/IBinder;
 
     move-result-object p2
 
-    :goto_0
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
 
     return-void
@@ -206,5 +199,7 @@
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/measurement/R.smali b/com.discord/smali_classes2/com/google/firebase/measurement/R.smali
index b3fc12b3d2..5af3046ea2 100644
--- a/com.discord/smali_classes2/com/google/firebase/measurement/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/measurement/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/measurement/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/measurement_impl/R.smali b/com.discord/smali_classes2/com/google/firebase/measurement_impl/R.smali
index eb704d6c46..a93b2c569b 100644
--- a/com.discord/smali_classes2/com/google/firebase/measurement_impl/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/measurement_impl/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/measurement_impl/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 0b324253b1..38a3621028 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali
@@ -125,7 +125,7 @@
 .method public final zzb(Landroid/content/Intent;)Landroid/content/Intent;
     .locals 0
 
-    invoke-static {}, Lcom/google/firebase/iid/x;->Ca()Lcom/google/firebase/iid/x;
+    invoke-static {}, Lcom/google/firebase/iid/x;->BZ()Lcom/google/firebase/iid/x;
 
     move-result-object p1
 
@@ -205,7 +205,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v0
 
@@ -453,7 +453,7 @@
 
     new-instance v3, Lcom/google/firebase/iid/k;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/d;->BR()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/d;->BQ()I
 
     move-result v4
 
@@ -476,10 +476,9 @@
 
     if-eqz v2, :cond_7
 
-    :goto_3
     const/4 v0, 0x0
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_7
     sget-object v2, Lcom/google/firebase/messaging/FirebaseMessagingService;->zzdr:Ljava/util/Queue;
@@ -516,20 +515,20 @@
 
     move-result-object v0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     new-instance v0, Ljava/lang/String;
 
     invoke-direct {v0, v6}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_4
+    :goto_3
     invoke-static {v2, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_9
     const/4 v0, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_a
     sget-object v2, Lcom/google/firebase/messaging/FirebaseMessagingService;->zzdr:Ljava/util/Queue;
@@ -551,9 +550,9 @@
 
     invoke-interface {v2, v0}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
-    goto :goto_3
+    const/4 v0, 0x0
 
-    :goto_5
+    :goto_4
     if-nez v0, :cond_17
 
     const-string v0, "message_type"
@@ -589,7 +588,7 @@
 
     if-eq v6, v3, :cond_d
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_d
     const-string v3, "send_event"
@@ -602,7 +601,7 @@
 
     const/4 v3, 0x2
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_e
     const-string v3, "send_error"
@@ -615,7 +614,7 @@
 
     const/4 v3, 0x3
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_f
     const-string v3, "gcm"
@@ -628,7 +627,7 @@
 
     const/4 v3, 0x0
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_10
     const-string v4, "deleted_messages"
@@ -639,13 +638,13 @@
 
     if-eqz v4, :cond_11
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_11
-    :goto_6
+    :goto_5
     const/4 v3, -0x1
 
-    :goto_7
+    :goto_6
     packed-switch v3, :pswitch_data_0
 
     const-string p1, "FirebaseMessaging"
@@ -666,7 +665,7 @@
 
     move-result-object v0
 
-    goto/16 :goto_8
+    goto/16 :goto_7
 
     :pswitch_0
     const-string v0, "google.message_id"
@@ -696,7 +695,7 @@
 
     invoke-virtual {p0, v0, v2}, Lcom/google/firebase/messaging/FirebaseMessagingService;->onSendError(Ljava/lang/String;Ljava/lang/Exception;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :pswitch_1
     const-string v0, "google.message_id"
@@ -707,12 +706,12 @@
 
     invoke-virtual {p0, p1}, Lcom/google/firebase/messaging/FirebaseMessagingService;->onMessageSent(Ljava/lang/String;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :pswitch_2
     invoke-virtual {p0}, Lcom/google/firebase/messaging/FirebaseMessagingService;->onDeletedMessages()V
 
-    goto :goto_9
+    goto :goto_8
 
     :pswitch_3
     invoke-static {p1}, Lcom/google/firebase/messaging/b;->e(Landroid/content/Intent;)Z
@@ -774,18 +773,18 @@
 
     invoke-virtual {p0, p1}, Lcom/google/firebase/messaging/FirebaseMessagingService;->onMessageReceived(Lcom/google/firebase/messaging/RemoteMessage;)V
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_16
     new-instance v0, Ljava/lang/String;
 
     invoke-direct {v0, v2}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_8
+    :goto_7
     invoke-static {p1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_17
-    :goto_9
+    :goto_8
     const-wide/16 v2, 0x1
 
     :try_start_0
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali b/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali
index cd2f8937ec..359bc36cfe 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/messaging/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/R.smali b/com.discord/smali_classes2/com/google/firebase/messaging/R.smali
index ca6a3e2988..3e18ed0ef4 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/messaging/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 d7f53f8801..ea94b6357c 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/RemoteMessage.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/RemoteMessage.smali
@@ -54,7 +54,7 @@
 
 
 # virtual methods
-.method public final Ck()Ljava/lang/String;
+.method public final Cj()Ljava/lang/String;
     .locals 2
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -70,7 +70,7 @@
     return-object v0
 .end method
 
-.method public final Cl()Ljava/util/Map;
+.method public final Ck()Ljava/util/Map;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -177,7 +177,7 @@
     return-object v0
 .end method
 
-.method public final Cm()Ljava/lang/String;
+.method public final Cl()Ljava/lang/String;
     .locals 2
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -193,7 +193,7 @@
     return-object v0
 .end method
 
-.method public final Cn()Ljava/lang/String;
+.method public final Cm()Ljava/lang/String;
     .locals 2
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -220,7 +220,7 @@
     return-object v0
 .end method
 
-.method public final Co()Ljava/lang/String;
+.method public final Cn()Ljava/lang/String;
     .locals 2
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/b.smali b/com.discord/smali_classes2/com/google/firebase/messaging/b.smali
index 5a91a7fe8c..e4e43c4927 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/b.smali
@@ -234,7 +234,7 @@
     invoke-static {p1, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_8
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object p1
 
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 334dccf635..d3247fdd65 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/d.smali
@@ -45,15 +45,13 @@
     return-void
 .end method
 
-.method private final Cp()Landroid/os/Bundle;
+.method private final Co()Landroid/os/Bundle;
     .locals 4
 
     iget-object v0, p0, Lcom/google/firebase/messaging/d;->bzX:Landroid/os/Bundle;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->bzX:Landroid/os/Bundle;
-
     return-object v0
 
     :cond_0
@@ -76,12 +74,10 @@
 
     invoke-virtual {v1, v2, v3}, Landroid/content/pm/PackageManager;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object v0, v1
-
     :catch_0
     if-eqz v0, :cond_1
 
@@ -533,11 +529,11 @@
     :try_start_0
     invoke-virtual {v1, v3, p1}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object p2
+    move-result-object p1
     :try_end_0
     .catch Ljava/util/MissingFormatArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p2
+    return-object p1
 
     :catch_0
     move-exception p2
@@ -624,11 +620,11 @@
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     const-string v0, "FirebaseMessaging"
@@ -664,7 +660,7 @@
     invoke-static {v0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1
-    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->Cp()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->Co()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -854,9 +850,9 @@
 
     const/4 v4, 0x0
 
-    if-nez v2, :cond_3
+    if-nez v2, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/common/util/k;->mc()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/k;->mb()Z
 
     move-result v2
 
@@ -885,7 +881,7 @@
 
     move-result-object v5
 
-    if-eqz v5, :cond_3
+    if-eqz v5, :cond_4
 
     invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -896,7 +892,7 @@
 
     move-result v6
 
-    if-eqz v6, :cond_3
+    if-eqz v6, :cond_4
 
     invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -921,12 +917,17 @@
     :cond_3
     const/4 v2, 0x0
 
+    goto :goto_0
+
+    :cond_4
+    const/4 v2, 0x0
+
     :goto_0
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_5
 
     return v4
 
-    :cond_4
+    :cond_5
     const-string v2, "gcm.n.title"
 
     invoke-direct {v0, v1, v2}, Lcom/google/firebase/messaging/d;->c(Landroid/os/Bundle;Ljava/lang/String;)Ljava/lang/String;
@@ -937,7 +938,7 @@
 
     move-result v5
 
-    if-eqz v5, :cond_5
+    if-eqz v5, :cond_6
 
     iget-object v2, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
@@ -955,7 +956,7 @@
 
     move-result-object v2
 
-    :cond_5
+    :cond_6
     const-string v5, "gcm.n.body"
 
     invoke-direct {v0, v1, v5}, Lcom/google/firebase/messaging/d;->c(Landroid/os/Bundle;Ljava/lang/String;)Ljava/lang/String;
@@ -972,7 +973,7 @@
 
     move-result v7
 
-    if-nez v7, :cond_8
+    if-nez v7, :cond_9
 
     iget-object v7, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
@@ -992,17 +993,17 @@
 
     move-result v8
 
-    if-eqz v8, :cond_6
+    if-eqz v8, :cond_7
 
     invoke-direct {v0, v8}, Lcom/google/firebase/messaging/d;->dE(I)Z
 
     move-result v9
 
-    if-eqz v9, :cond_6
+    if-eqz v9, :cond_7
 
     goto :goto_2
 
-    :cond_6
+    :cond_7
     const-string v8, "mipmap"
 
     iget-object v9, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
@@ -1015,17 +1016,17 @@
 
     move-result v8
 
-    if-eqz v8, :cond_7
+    if-eqz v8, :cond_8
 
     invoke-direct {v0, v8}, Lcom/google/firebase/messaging/d;->dE(I)Z
 
     move-result v7
 
-    if-eqz v7, :cond_7
+    if-eqz v7, :cond_8
 
     goto :goto_2
 
-    :cond_7
+    :cond_8
     const-string v7, "FirebaseMessaging"
 
     invoke-static {v6}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -1058,8 +1059,8 @@
 
     invoke-static {v7, v6}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_8
-    invoke-direct/range {p0 .. p0}, Lcom/google/firebase/messaging/d;->Cp()Landroid/os/Bundle;
+    :cond_9
+    invoke-direct/range {p0 .. p0}, Lcom/google/firebase/messaging/d;->Co()Landroid/os/Bundle;
 
     move-result-object v6
 
@@ -1069,15 +1070,15 @@
 
     move-result v6
 
-    if-eqz v6, :cond_9
+    if-eqz v6, :cond_a
 
     invoke-direct {v0, v6}, Lcom/google/firebase/messaging/d;->dE(I)Z
 
     move-result v7
 
-    if-nez v7, :cond_a
+    if-nez v7, :cond_b
 
-    :cond_9
+    :cond_a
     iget-object v6, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
     invoke-virtual {v6}, Landroid/content/Context;->getApplicationInfo()Landroid/content/pm/ApplicationInfo;
@@ -1086,23 +1087,23 @@
 
     iget v6, v6, Landroid/content/pm/ApplicationInfo;->icon:I
 
-    :cond_a
-    if-eqz v6, :cond_c
+    :cond_b
+    if-eqz v6, :cond_d
 
     invoke-direct {v0, v6}, Lcom/google/firebase/messaging/d;->dE(I)Z
 
     move-result v7
 
-    if-nez v7, :cond_b
+    if-nez v7, :cond_c
 
     goto :goto_1
 
-    :cond_b
+    :cond_c
     move v8, v6
 
     goto :goto_2
 
-    :cond_c
+    :cond_d
     :goto_1
     const v6, 0x1080093
 
@@ -1129,7 +1130,7 @@
 
     move-result v9
 
-    if-eqz v9, :cond_d
+    if-eqz v9, :cond_e
 
     const-string v7, "gcm.n.sound"
 
@@ -1137,27 +1138,27 @@
 
     move-result-object v7
 
-    :cond_d
+    :cond_e
     invoke-static {v7}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
     move-result v9
 
     const/4 v10, 0x0
 
-    if-eqz v9, :cond_e
+    if-eqz v9, :cond_f
 
     move-object v7, v10
 
     goto :goto_3
 
-    :cond_e
+    :cond_f
     const-string v9, "default"
 
     invoke-virtual {v9, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v9
 
-    if-nez v9, :cond_f
+    if-nez v9, :cond_10
 
     iget-object v9, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
@@ -1177,7 +1178,7 @@
 
     move-result v9
 
-    if-eqz v9, :cond_f
+    if-eqz v9, :cond_10
 
     iget-object v9, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
@@ -1231,7 +1232,7 @@
 
     goto :goto_3
 
-    :cond_f
+    :cond_10
     const/4 v7, 0x2
 
     invoke-static {v7}, Landroid/media/RingtoneManager;->getDefaultUri(I)Landroid/net/Uri;
@@ -1249,7 +1250,7 @@
 
     move-result v11
 
-    if-nez v11, :cond_10
+    if-nez v11, :cond_11
 
     new-instance v11, Landroid/content/Intent;
 
@@ -1269,7 +1270,7 @@
 
     goto :goto_5
 
-    :cond_10
+    :cond_11
     const-string v9, "gcm.n.link_android"
 
     invoke-static {v1, v9}, Lcom/google/firebase/messaging/d;->a(Landroid/os/Bundle;Ljava/lang/String;)Ljava/lang/String;
@@ -1280,7 +1281,7 @@
 
     move-result v11
 
-    if-eqz v11, :cond_11
+    if-eqz v11, :cond_12
 
     const-string v9, "gcm.n.link"
 
@@ -1288,12 +1289,12 @@
 
     move-result-object v9
 
-    :cond_11
+    :cond_12
     invoke-static {v9}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
     move-result v11
 
-    if-nez v11, :cond_12
+    if-nez v11, :cond_13
 
     invoke-static {v9}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
@@ -1301,11 +1302,11 @@
 
     goto :goto_4
 
-    :cond_12
+    :cond_13
     move-object v9, v10
 
     :goto_4
-    if-eqz v9, :cond_13
+    if-eqz v9, :cond_14
 
     new-instance v11, Landroid/content/Intent;
 
@@ -1325,7 +1326,7 @@
 
     goto :goto_5
 
-    :cond_13
+    :cond_14
     iget-object v9, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
     invoke-virtual {v9}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
@@ -1342,7 +1343,7 @@
 
     move-result-object v11
 
-    if-nez v11, :cond_14
+    if-nez v11, :cond_15
 
     const-string v9, "FirebaseMessaging"
 
@@ -1350,15 +1351,15 @@
 
     invoke-static {v9, v12}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_14
+    :cond_15
     :goto_5
-    if-nez v11, :cond_15
+    if-nez v11, :cond_16
 
     move-object v9, v10
 
     goto :goto_7
 
-    :cond_15
+    :cond_16
     const/high16 v9, 0x4000000
 
     invoke-virtual {v11, v9}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
@@ -1379,13 +1380,13 @@
 
     move-result-object v9
 
-    :cond_16
+    :cond_17
     :goto_6
     invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v12
 
-    if-eqz v12, :cond_18
+    if-eqz v12, :cond_19
 
     invoke-interface {v9}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -1399,7 +1400,7 @@
 
     move-result v13
 
-    if-nez v13, :cond_17
+    if-nez v13, :cond_18
 
     const-string v13, "gcm.notification."
 
@@ -1407,14 +1408,14 @@
 
     move-result v13
 
-    if-eqz v13, :cond_16
+    if-eqz v13, :cond_17
 
-    :cond_17
+    :cond_18
     invoke-virtual {v11, v12}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
     goto :goto_6
 
-    :cond_18
+    :cond_19
     iget-object v9, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
     sget-object v12, Lcom/google/firebase/messaging/d;->bzW:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -1430,13 +1431,13 @@
     move-result-object v9
 
     :goto_7
-    if-nez v1, :cond_19
+    if-nez v1, :cond_1a
 
     const/4 v11, 0x0
 
     goto :goto_8
 
-    :cond_19
+    :cond_1a
     const-string v11, "1"
 
     const-string v12, "google.c.a.e"
@@ -1450,7 +1451,7 @@
     move-result v11
 
     :goto_8
-    if-eqz v11, :cond_1a
+    if-eqz v11, :cond_1b
 
     new-instance v11, Landroid/content/Intent;
 
@@ -1498,7 +1499,7 @@
 
     goto :goto_9
 
-    :cond_1a
+    :cond_1b
     move-object v11, v10
 
     :goto_9
@@ -1514,7 +1515,7 @@
 
     const/4 v14, 0x3
 
-    if-eqz v13, :cond_21
+    if-eqz v13, :cond_22
 
     iget-object v13, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
@@ -1526,11 +1527,11 @@
 
     const/16 v15, 0x1a
 
-    if-ge v13, v15, :cond_1b
+    if-ge v13, v15, :cond_1c
 
     goto/16 :goto_b
 
-    :cond_1b
+    :cond_1c
     iget-object v10, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
     const-class v13, Landroid/app/NotificationManager;
@@ -1545,19 +1546,19 @@
 
     move-result v13
 
-    if-nez v13, :cond_1d
+    if-nez v13, :cond_1e
 
     invoke-virtual {v10, v12}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
 
     move-result-object v13
 
-    if-eqz v13, :cond_1c
+    if-eqz v13, :cond_1d
 
     move-object v10, v12
 
     goto :goto_b
 
-    :cond_1c
+    :cond_1d
     const-string v13, "FirebaseMessaging"
 
     invoke-static {v12}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -1590,8 +1591,8 @@
 
     invoke-static {v13, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_1d
-    invoke-direct/range {p0 .. p0}, Lcom/google/firebase/messaging/d;->Cp()Landroid/os/Bundle;
+    :cond_1e
+    invoke-direct/range {p0 .. p0}, Lcom/google/firebase/messaging/d;->Co()Landroid/os/Bundle;
 
     move-result-object v4
 
@@ -1605,40 +1606,42 @@
 
     move-result v12
 
-    if-nez v12, :cond_1f
+    if-nez v12, :cond_20
 
     invoke-virtual {v10, v4}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
 
     move-result-object v12
 
-    if-eqz v12, :cond_1e
+    if-eqz v12, :cond_1f
 
     move-object v10, v4
 
     goto :goto_b
 
-    :cond_1e
+    :cond_1f
     const-string v4, "FirebaseMessaging"
 
     const-string v12, "Notification Channel set in AndroidManifest.xml has not been created by the app. Default value will be used."
 
+    invoke-static {v4, v12}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
     goto :goto_a
 
-    :cond_1f
+    :cond_20
     const-string v4, "FirebaseMessaging"
 
     const-string v12, "Missing Default Notification Channel metadata in AndroidManifest. Default value will be used."
 
-    :goto_a
     invoke-static {v4, v12}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
+    :goto_a
     const-string v4, "fcm_fallback_notification_channel"
 
     invoke-virtual {v10, v4}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
 
     move-result-object v4
 
-    if-nez v4, :cond_20
+    if-nez v4, :cond_21
 
     new-instance v4, Landroid/app/NotificationChannel;
 
@@ -1656,10 +1659,10 @@
 
     invoke-virtual {v10, v4}, Landroid/app/NotificationManager;->createNotificationChannel(Landroid/app/NotificationChannel;)V
 
-    :cond_20
+    :cond_21
     const-string v10, "fcm_fallback_notification_channel"
 
-    :cond_21
+    :cond_22
     :goto_b
     new-instance v4, Landroidx/core/app/NotificationCompat$Builder;
 
@@ -1679,16 +1682,16 @@
 
     move-result v8
 
-    if-nez v8, :cond_22
+    if-nez v8, :cond_23
 
     invoke-virtual {v4, v2}, Landroidx/core/app/NotificationCompat$Builder;->setContentTitle(Ljava/lang/CharSequence;)Landroidx/core/app/NotificationCompat$Builder;
 
-    :cond_22
+    :cond_23
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
-    if-nez v2, :cond_23
+    if-nez v2, :cond_24
 
     invoke-virtual {v4, v5}, Landroidx/core/app/NotificationCompat$Builder;->setContentText(Ljava/lang/CharSequence;)Landroidx/core/app/NotificationCompat$Builder;
 
@@ -1702,8 +1705,8 @@
 
     invoke-virtual {v4, v2}, Landroidx/core/app/NotificationCompat$Builder;->setStyle(Landroidx/core/app/NotificationCompat$Style;)Landroidx/core/app/NotificationCompat$Builder;
 
-    :cond_23
-    if-eqz v6, :cond_24
+    :cond_24
+    if-eqz v6, :cond_25
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
@@ -1711,27 +1714,27 @@
 
     invoke-virtual {v4, v2}, Landroidx/core/app/NotificationCompat$Builder;->setColor(I)Landroidx/core/app/NotificationCompat$Builder;
 
-    :cond_24
-    if-eqz v7, :cond_25
+    :cond_25
+    if-eqz v7, :cond_26
 
     invoke-virtual {v4, v7}, Landroidx/core/app/NotificationCompat$Builder;->setSound(Landroid/net/Uri;)Landroidx/core/app/NotificationCompat$Builder;
 
-    :cond_25
-    if-eqz v9, :cond_26
+    :cond_26
+    if-eqz v9, :cond_27
 
     invoke-virtual {v4, v9}, Landroidx/core/app/NotificationCompat$Builder;->setContentIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
 
-    :cond_26
-    if-eqz v11, :cond_27
+    :cond_27
+    if-eqz v11, :cond_28
 
     invoke-virtual {v4, v11}, Landroidx/core/app/NotificationCompat$Builder;->setDeleteIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
 
-    :cond_27
-    if-eqz v10, :cond_28
+    :cond_28
+    if-eqz v10, :cond_29
 
     invoke-virtual {v4, v10}, Landroidx/core/app/NotificationCompat$Builder;->setChannelId(Ljava/lang/String;)Landroidx/core/app/NotificationCompat$Builder;
 
-    :cond_28
+    :cond_29
     invoke-virtual {v4}, Landroidx/core/app/NotificationCompat$Builder;->build()Landroid/app/Notification;
 
     move-result-object v2
@@ -1748,7 +1751,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_29
+    if-eqz v4, :cond_2a
 
     const-string v4, "FirebaseMessaging"
 
@@ -1756,7 +1759,7 @@
 
     invoke-static {v4, v5}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_29
+    :cond_2a
     iget-object v4, v0, Lcom/google/firebase/messaging/d;->byu:Landroid/content/Context;
 
     const-string v5, "notification"
@@ -1771,7 +1774,7 @@
 
     move-result v5
 
-    if-eqz v5, :cond_2a
+    if-eqz v5, :cond_2b
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
@@ -1793,9 +1796,14 @@
 
     move-result-object v1
 
-    :cond_2a
     const/4 v5, 0x0
 
+    goto :goto_c
+
+    :cond_2b
+    const/4 v5, 0x0
+
+    :goto_c
     invoke-virtual {v4, v1, v5, v2}, Landroid/app/NotificationManager;->notify(Ljava/lang/String;ILandroid/app/Notification;)V
 
     return v3
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/R.smali b/com.discord/smali_classes2/com/google/firebase/perf/R.smali
index c2e5e9296d..50483d1e72 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/perf/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/a.smali b/com.discord/smali_classes2/com/google/firebase/perf/a.smali
index 9a457eb817..e063dd0195 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/a.smali
@@ -80,7 +80,7 @@
     return-void
 .end method
 
-.method public static Cq()Lcom/google/firebase/perf/a;
+.method public static Cp()Lcom/google/firebase/perf/a;
     .locals 3
 
     sget-object v0, Lcom/google/firebase/perf/a;->bzY:Lcom/google/firebase/perf/a;
@@ -96,7 +96,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v1
 
@@ -343,15 +343,13 @@
 
 
 # virtual methods
-.method public final Cr()Z
+.method public final Cq()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/firebase/perf/a;->bAb:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/perf/a;->bAb:Ljava/lang/Boolean;
-
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v0
@@ -359,11 +357,11 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/b;->BD()Z
+    invoke-virtual {v0}, Lcom/google/firebase/b;->BC()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/component/FirebasePerfRegistrar.smali b/com.discord/smali_classes2/com/google/firebase/perf/component/FirebasePerfRegistrar.smali
index 1f5b6e8592..d64100e9ab 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/component/FirebasePerfRegistrar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/component/FirebasePerfRegistrar.smali
@@ -61,7 +61,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/firebase/components/a$a;->BG()Lcom/google/firebase/components/a;
+    invoke-virtual {v1}, Lcom/google/firebase/components/a$a;->BF()Lcom/google/firebase/components/a;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali
index cc095d8791..b2a5d416c4 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali
@@ -54,7 +54,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v2
 
@@ -62,15 +62,15 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/s;->Cx()Lcom/google/firebase/perf/internal/s;
+    invoke-static {}, Lcom/google/firebase/perf/internal/s;->Cw()Lcom/google/firebase/perf/internal/s;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/o;->pY()Lcom/google/android/gms/internal/firebase-perf/o;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/o;->pX()Lcom/google/android/gms/internal/firebase-perf/o;
 
     move-result-object v5
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/r;->qb()Lcom/google/android/gms/internal/firebase-perf/r;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/r;->qa()Lcom/google/android/gms/internal/firebase-perf/r;
 
     move-result-object v6
 
@@ -118,7 +118,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/o;->kw()V
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/o;->kv()V
 
     goto :goto_0
 
@@ -132,7 +132,7 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/r;->pL()V
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/r;->pK()V
 
     return-void
 
@@ -149,7 +149,7 @@
 .method private final zzb(Ljava/lang/String;Lcom/google/android/gms/internal/firebase-perf/ao;)V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qq()Lcom/google/android/gms/internal/firebase-perf/au$a;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qp()Lcom/google/android/gms/internal/firebase-perf/au$a;
 
     move-result-object v0
 
@@ -209,7 +209,7 @@
 
     iget-object p1, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzdx:Lcom/google/firebase/perf/internal/g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
@@ -260,11 +260,11 @@
 .method public static zzbi()V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/o;->pY()Lcom/google/android/gms/internal/firebase-perf/o;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/o;->pX()Lcom/google/android/gms/internal/firebase-perf/o;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/r;->qb()Lcom/google/android/gms/internal/firebase-perf/r;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/r;->qa()Lcom/google/android/gms/internal/firebase-perf/r;
 
     move-result-object v1
 
@@ -350,12 +350,11 @@
 
     const-string v9, "Cpu Metrics collection is disabled. Did not collect Cpu Metrics."
 
-    :goto_1
     invoke-static {v0, v9}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     const/4 v0, 0x0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     cmp-long v0, v3, v1
@@ -366,7 +365,11 @@
 
     const-string v9, "Invalid Cpu Metrics collection frequency. Did not collect Cpu Metrics."
 
-    goto :goto_1
+    invoke-static {v0, v9}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    const/4 v0, 0x0
+
+    goto :goto_2
 
     :cond_4
     iget-object v0, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzdz:Lcom/google/android/gms/internal/firebase-perf/o;
@@ -383,7 +386,7 @@
 
     if-nez v11, :cond_5
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     cmp-long v9, v3, v5
@@ -400,24 +403,28 @@
 
     if-eqz v11, :cond_7
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/o;->pZ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/o;->pY()V
+
+    invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/o;->w(J)V
+
+    goto :goto_1
 
     :cond_6
     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/internal/firebase-perf/o;->w(J)V
 
     :cond_7
-    :goto_2
+    :goto_1
     const/4 v0, 0x1
 
-    :goto_3
+    :goto_2
     if-eqz v0, :cond_8
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     move-wide v3, v1
 
-    :goto_4
+    :goto_3
     sget-object v0, Lcom/google/firebase/perf/internal/r;->bAM:[I
 
     invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/ao;->ordinal()I
@@ -430,7 +437,7 @@
 
     move-wide v9, v1
 
-    goto :goto_5
+    goto :goto_4
 
     :pswitch_2
     iget-object v0, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzdj:Lcom/google/firebase/perf/internal/FeatureControl;
@@ -439,7 +446,7 @@
 
     move-result-wide v9
 
-    goto :goto_5
+    goto :goto_4
 
     :pswitch_3
     iget-object v0, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzdj:Lcom/google/firebase/perf/internal/FeatureControl;
@@ -448,7 +455,7 @@
 
     move-result-wide v9
 
-    :goto_5
+    :goto_4
     cmp-long v0, v9, v1
 
     if-eqz v0, :cond_9
@@ -473,10 +480,9 @@
 
     const-string v5, "Memory Metrics collection is disabled. Did not collect Memory Metrics."
 
-    :goto_6
     invoke-static {v0, v5}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_b
     cmp-long v0, v9, v1
@@ -487,6 +493,8 @@
 
     const-string v5, "Invalid Memory Metrics collection frequency. Did not collect Memory Metrics."
 
+    invoke-static {v0, v5}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
     goto :goto_6
 
     :cond_c
@@ -506,15 +514,20 @@
 
     if-eqz v8, :cond_e
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/r;->pZ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/r;->pY()V
+
+    invoke-virtual {v0, v9, v10}, Lcom/google/android/gms/internal/firebase-perf/r;->L(J)V
+
+    goto :goto_5
 
     :cond_d
     invoke-virtual {v0, v9, v10}, Lcom/google/android/gms/internal/firebase-perf/r;->L(J)V
 
     :cond_e
+    :goto_5
     const/4 v8, 0x1
 
-    :goto_7
+    :goto_6
     if-eqz v8, :cond_10
 
     cmp-long v0, v3, v1
@@ -523,7 +536,7 @@
 
     move-wide v3, v9
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_f
     invoke-static {v3, v4, v9, v10}, Ljava/lang/Math;->min(JJ)J
@@ -531,7 +544,7 @@
     move-result-wide v3
 
     :cond_10
-    :goto_8
+    :goto_7
     cmp-long v0, v3, v1
 
     if-nez v0, :cond_11
@@ -599,20 +612,18 @@
 
     move-result-object p1
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_12
     new-instance p1, Ljava/lang/String;
 
     invoke-direct {p1, v0}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_9
+    :goto_8
     invoke-static {p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -636,24 +647,20 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzec:Ljava/lang/String;
-
     iget-object v1, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzeb:Lcom/google/android/gms/internal/firebase-perf/ao;
 
     iget-object v2, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzdz:Lcom/google/android/gms/internal/firebase-perf/o;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/o;->pZ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/o;->pY()V
 
     iget-object v2, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzea:Lcom/google/android/gms/internal/firebase-perf/r;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/r;->pZ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/r;->pY()V
 
     iget-object v2, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzed:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzed:Ljava/util/concurrent/ScheduledFuture;
-
     const/4 v3, 0x0
 
     invoke-interface {v2, v3}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
@@ -709,13 +716,13 @@
 .method final zzc(Ljava/lang/String;Lcom/google/android/gms/internal/firebase-perf/ao;)V
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qq()Lcom/google/android/gms/internal/firebase-perf/au$a;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/au;->qp()Lcom/google/android/gms/internal/firebase-perf/au$a;
 
     move-result-object v0
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/firebase-perf/au$a;->bw(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/au$a;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/as;->ql()Lcom/google/android/gms/internal/firebase-perf/as$a;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/as;->qk()Lcom/google/android/gms/internal/firebase-perf/as$a;
 
     move-result-object p1
 
@@ -809,7 +816,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object p1
 
@@ -821,7 +828,7 @@
 
     iget-object p1, p0, Lcom/google/firebase/perf/internal/GaugeManager;->zzdx:Lcom/google/firebase/perf/internal/g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sc()Lcom/google/android/gms/internal/firebase-perf/ex;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/dp$a;->sb()Lcom/google/android/gms/internal/firebase-perf/ex;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/RemoteConfigManager.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/RemoteConfigManager.smali
index 8d0b554c68..809f1cffd6 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/RemoteConfigManager.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/RemoteConfigManager.smali
@@ -106,7 +106,7 @@
 
     invoke-direct/range {v0 .. v6}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;)V
 
-    invoke-static {}, Lcom/google/firebase/remoteconfig/a;->CH()Lcom/google/firebase/remoteconfig/a;
+    invoke-static {}, Lcom/google/firebase/remoteconfig/a;->CG()Lcom/google/firebase/remoteconfig/a;
 
     move-result-object v0
 
@@ -171,7 +171,7 @@
     :goto_1
     iput-object v1, p0, Lcom/google/firebase/perf/internal/RemoteConfigManager;->zzfy:Lcom/google/android/gms/internal/firebase-perf/fb;
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/if;->tu()Lcom/google/android/gms/internal/firebase-perf/if;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/if;->tt()Lcom/google/android/gms/internal/firebase-perf/if;
 
     move-result-object v0
 
@@ -200,7 +200,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ib;->tt()Lcom/google/android/gms/internal/firebase-perf/ic;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/ib;->ts()Lcom/google/android/gms/internal/firebase-perf/ic;
 
     move-result-object v0
 
@@ -326,7 +326,7 @@
 
     invoke-static {v6, p1}, Lcom/google/android/gms/internal/firebase-perf/a;->a(Landroid/content/ContentResolver;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object v5
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -367,12 +367,10 @@
     :goto_2
     invoke-static {v6, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    move-object p1, v5
-
     :goto_3
-    if-eqz p1, :cond_2
+    if-eqz v5, :cond_2
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/firebase-perf/ic;->aI(Ljava/lang/Object;)Lcom/google/android/gms/internal/firebase-perf/hz;
+    invoke-virtual {v0, v5}, Lcom/google/android/gms/internal/firebase-perf/ic;->aI(Ljava/lang/Object;)Lcom/google/android/gms/internal/firebase-perf/hz;
 
     :cond_2
     add-int/lit8 v4, v4, 0x1
@@ -410,7 +408,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/if;->tu()Lcom/google/android/gms/internal/firebase-perf/if;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/if;->tt()Lcom/google/android/gms/internal/firebase-perf/if;
 
     move-result-object p0
 
@@ -608,11 +606,11 @@
     :cond_0
     iget-object v0, p0, Lcom/google/firebase/perf/internal/RemoteConfigManager;->zzga:Lcom/google/firebase/remoteconfig/a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/remoteconfig/a;->CI()Lcom/google/firebase/remoteconfig/e;
+    invoke-virtual {v0}, Lcom/google/firebase/remoteconfig/a;->CH()Lcom/google/firebase/remoteconfig/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/firebase/remoteconfig/e;->pD()I
+    invoke-interface {v0}, Lcom/google/firebase/remoteconfig/e;->pC()I
 
     move-result v0
 
@@ -631,7 +629,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/RemoteConfigManager;->zzgc:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -836,17 +834,17 @@
 .method static final synthetic zzcl()Lcom/google/android/gms/internal/firebase-perf/if;
     .locals 2
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/d;
+    invoke-virtual {v0}, Lcom/google/firebase/b;->BA()Lcom/google/firebase/d;
 
     move-result-object v0
 
     iget-object v0, v0, Lcom/google/firebase/d;->ahM:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v1
 
@@ -1030,11 +1028,11 @@
     :try_start_0
     invoke-static {v1}, Ljava/lang/Float;->parseFloat(Ljava/lang/String;)F
 
-    move-result v2
+    move-result p1
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    mul-float p2, v2, v0
+    mul-float p2, p1, v0
 
     goto :goto_1
 
@@ -1101,7 +1099,7 @@
 .method final synthetic zza(Lcom/google/android/gms/tasks/g;)V
     .locals 0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/g;->AP()Z
 
     move-result p1
 
@@ -1173,13 +1171,13 @@
     :try_start_0
     invoke-static {v0}, Ljava/lang/Float;->parseFloat(Ljava/lang/String;)F
 
-    move-result v1
+    move-result p2
 
-    const/high16 p2, 0x42c80000    # 100.0f
+    const/high16 p3, 0x42c80000    # 100.0f
 
-    mul-float v1, v1, p2
+    mul-float p2, p2, p3
 
-    float-to-long p2, v1
+    float-to-long p2, p2
 
     const-string v1, "FirebasePerformance"
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali
index 0481b342e0..459aff2081 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali
@@ -47,11 +47,11 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/zzt;->Cz()Lcom/google/firebase/perf/internal/zzt;
+    invoke-static {}, Lcom/google/firebase/perf/internal/zzt;->Cy()Lcom/google/firebase/perf/internal/zzt;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cs()Lcom/google/firebase/perf/internal/a;
+    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cr()Lcom/google/firebase/perf/internal/a;
 
     move-result-object v2
 
@@ -71,7 +71,7 @@
 
     iput-object p3, p0, Lcom/google/firebase/perf/internal/SessionManager;->zzdi:Lcom/google/firebase/perf/internal/a;
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object p1
 
@@ -97,7 +97,7 @@
 .method public static zzcp()Landroid/content/Context;
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v0
 
@@ -158,7 +158,7 @@
 
     iget-object v0, v0, Lcom/google/firebase/perf/internal/zzt;->bAV:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -174,9 +174,9 @@
 
     move-result-wide v2
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
     cmp-long v6, v0, v2
 
@@ -198,10 +198,10 @@
 
     invoke-virtual {p0, v0}, Lcom/google/firebase/perf/internal/SessionManager;->zzf(I)V
 
-    return v5
+    return v4
 
     :cond_1
-    return v4
+    return v5
 .end method
 
 .method public final zze(I)V
@@ -242,7 +242,7 @@
 .method public final zzf(I)V
     .locals 3
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/zzt;->Cz()Lcom/google/firebase/perf/internal/zzt;
+    invoke-static {}, Lcom/google/firebase/perf/internal/zzt;->Cy()Lcom/google/firebase/perf/internal/zzt;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/a.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/a.smali
index 5429a2ab1f..912eef8b48 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/a.smali
@@ -139,7 +139,7 @@
 
     iput-object p1, p0, Lcom/google/firebase/perf/internal/a;->bAf:Lcom/google/android/gms/internal/firebase-perf/w;
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Ce()Z
+    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cd()Z
 
     move-result p1
 
@@ -159,7 +159,7 @@
     return-void
 .end method
 
-.method private static Ce()Z
+.method private static Cd()Z
     .locals 1
 
     :try_start_0
@@ -179,7 +179,7 @@
     return v0
 .end method
 
-.method public static Cs()Lcom/google/firebase/perf/internal/a;
+.method public static Cr()Lcom/google/firebase/perf/internal/a;
     .locals 1
 
     sget-object v0, Lcom/google/firebase/perf/internal/a;->bAd:Lcom/google/firebase/perf/internal/a;
@@ -202,14 +202,14 @@
     return-object v0
 .end method
 
-.method private final Ct()V
+.method private final Cs()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/a;->bAe:Lcom/google/firebase/perf/internal/g;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v0
 
@@ -265,7 +265,7 @@
 .method private final a(Ljava/lang/String;Lcom/google/android/gms/internal/firebase-perf/zzbg;Lcom/google/android/gms/internal/firebase-perf/zzbg;)V
     .locals 6
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/internal/a;->Ct()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/internal/a;->Cs()V
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/bv;
 
@@ -303,7 +303,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/firebase/perf/internal/zzt;->CA()Lcom/google/android/gms/internal/firebase-perf/bu;
+    invoke-virtual {p3}, Lcom/google/firebase/perf/internal/zzt;->Cz()Lcom/google/android/gms/internal/firebase-perf/bu;
 
     move-result-object p3
 
@@ -456,8 +456,6 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/firebase/perf/internal/a;->bAe:Lcom/google/firebase/perf/internal/g;
-
     const/4 p2, 0x3
 
     invoke-virtual {p1, v0, p2}, Lcom/google/firebase/perf/internal/g;->a(Lcom/google/android/gms/internal/firebase-perf/bv;I)V
@@ -474,6 +472,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method private final eC(I)V
@@ -537,6 +537,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 .method private static i(Landroid/app/Activity;)Ljava/lang/String;
@@ -583,15 +585,13 @@
 .method private final zza(Z)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/internal/a;->Ct()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/internal/a;->Cs()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/a;->bAe:Lcom/google/firebase/perf/internal/g;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/a;->bAe:Lcom/google/firebase/perf/internal/g;
-
-    invoke-virtual {v0, p1}, Lcom/google/firebase/perf/internal/g;->ac(Z)V
+    invoke-virtual {v0, p1}, Lcom/google/firebase/perf/internal/g;->ab(Z)V
 
     :cond_0
     return-void
@@ -689,8 +689,6 @@
 
     move-result-wide v5
 
-    const/4 v1, 0x0
-
     add-long/2addr v5, v2
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -844,7 +842,7 @@
 
     invoke-virtual {v0, p1}, Landroidx/core/app/FrameMetricsAggregator;->add(Landroid/app/Activity;)V
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/internal/a;->Ct()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/internal/a;->Cs()V
 
     new-instance v0, Lcom/google/firebase/perf/metrics/Trace;
 
@@ -1136,4 +1134,6 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/e.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/e.smali
index 36c4468622..d1425a6808 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/e.smali
@@ -27,7 +27,7 @@
 .method protected constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cs()Lcom/google/firebase/perf/internal/a;
+    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cr()Lcom/google/firebase/perf/internal/a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/f.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/f.smali
index 53486527ea..ca29b5cb84 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/f.smali
@@ -19,7 +19,7 @@
 
 
 # virtual methods
-.method public final Cu()Z
+.method public final Ct()Z
     .locals 4
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/f;->bAr:Lcom/google/android/gms/internal/firebase-perf/bo;
@@ -34,16 +34,13 @@
 
     const-string v3, "ApplicationInfo is null"
 
-    :goto_0
     invoke-static {v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     const/4 v0, 0x0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/f;->bAr:Lcom/google/android/gms/internal/firebase-perf/bo;
-
     iget-object v0, v0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMi:Ljava/lang/String;
 
     if-nez v0, :cond_1
@@ -52,6 +49,10 @@
 
     const-string v3, "GoogleAppId is null"
 
+    invoke-static {v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    const/4 v0, 0x0
+
     goto :goto_0
 
     :cond_1
@@ -65,6 +66,10 @@
 
     const-string v3, "AppInstanceId is null"
 
+    invoke-static {v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    const/4 v0, 0x0
+
     goto :goto_0
 
     :cond_2
@@ -78,6 +83,10 @@
 
     const-string v3, "ApplicationProcessState is null"
 
+    invoke-static {v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    const/4 v0, 0x0
+
     goto :goto_0
 
     :cond_3
@@ -99,6 +108,10 @@
 
     const-string v3, "AndroidAppInfo.packageName is null"
 
+    invoke-static {v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    const/4 v0, 0x0
+
     goto :goto_0
 
     :cond_4
@@ -114,12 +127,16 @@
 
     const-string v3, "AndroidAppInfo.sdkVersion is null"
 
+    invoke-static {v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    const/4 v0, 0x0
+
     goto :goto_0
 
     :cond_5
     const/4 v0, 0x1
 
-    :goto_1
+    :goto_0
     if-nez v0, :cond_6
 
     const-string v0, "FirebasePerformance"
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/g.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/g.smali
index 7a33e0de7c..3b37deddd9 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/g.smali
@@ -94,7 +94,7 @@
     return-void
 .end method
 
-.method public static Cv()Lcom/google/firebase/perf/internal/g;
+.method public static Cu()Lcom/google/firebase/perf/internal/g;
     .locals 2
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -115,7 +115,7 @@
     if-nez v1, :cond_0
 
     :try_start_1
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
     :try_end_1
     .catch Ljava/lang/IllegalStateException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -158,24 +158,24 @@
     return-object v0
 .end method
 
-.method private final Cw()Ljava/lang/String;
+.method private final Cv()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAv:Lcom/google/firebase/perf/a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cr()Z
+    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cq()Z
 
     move-result v0
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAw:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BI()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
@@ -186,11 +186,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAw:Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BJ()V
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()V
-
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->BK()Ljava/lang/String;
 
     move-result-object v0
 
@@ -198,6 +196,9 @@
 
     :cond_1
     return-object v1
+
+    :cond_2
+    return-object v1
 .end method
 
 .method private final a(Lcom/google/android/gms/internal/firebase-perf/bt;)V
@@ -218,7 +219,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAv:Lcom/google/firebase/perf/a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cr()Z
+    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cq()Z
 
     move-result v0
 
@@ -243,7 +244,7 @@
     :cond_1
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/internal/g;->Cw()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/perf/internal/g;->Cv()Ljava/lang/String;
 
     move-result-object v1
 
@@ -288,7 +289,6 @@
 
     const-string v0, "App Instance ID is null or empty, dropping the log"
 
-    :goto_2
     invoke-static {p1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
@@ -364,10 +364,9 @@
 
     invoke-static {v0, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    :goto_3
     const/4 v0, 0x0
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_a
     check-cast v3, Ljava/util/ArrayList;
@@ -389,25 +388,29 @@
 
     check-cast v5, Lcom/google/firebase/perf/internal/t;
 
-    invoke-virtual {v5}, Lcom/google/firebase/perf/internal/t;->Cu()Z
+    invoke-virtual {v5}, Lcom/google/firebase/perf/internal/t;->Ct()Z
 
     move-result v5
 
     if-nez v5, :cond_b
 
-    goto :goto_3
+    const/4 v0, 0x0
+
+    goto :goto_2
 
     :cond_c
     const/4 v0, 0x1
 
-    :goto_4
+    :goto_2
     if-nez v0, :cond_d
 
     const-string p1, "FirebasePerformance"
 
     const-string v0, "Unable to process the PerfMetric due to missing or invalid values. See earlier log statements for additional information on the specific missing/invalid values."
 
-    goto :goto_2
+    invoke-static {p1, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
 
     :cond_d
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAA:Lcom/google/firebase/perf/internal/x;
@@ -507,27 +510,28 @@
 
     if-lez v3, :cond_11
 
-    goto :goto_5
+    const/4 v3, 0x0
+
+    goto :goto_3
 
     :cond_11
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
 
     if-eqz v3, :cond_12
 
-    :goto_5
     const/4 v3, 0x0
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_12
     const/4 v3, 0x1
 
-    :goto_6
+    :goto_3
     if-nez v3, :cond_13
 
     const/4 v0, 0x1
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_13
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
@@ -536,12 +540,11 @@
 
     iget-object v0, v0, Lcom/google/firebase/perf/internal/x;->bBb:Lcom/google/firebase/perf/internal/z;
 
-    :goto_7
-    invoke-virtual {v0}, Lcom/google/firebase/perf/internal/z;->CC()Z
+    invoke-virtual {v0}, Lcom/google/firebase/perf/internal/z;->CB()Z
 
     move-result v0
 
-    goto :goto_8
+    goto :goto_4
 
     :cond_14
     iget-object v3, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -550,12 +553,16 @@
 
     iget-object v0, v0, Lcom/google/firebase/perf/internal/x;->bBa:Lcom/google/firebase/perf/internal/z;
 
-    goto :goto_7
+    invoke-virtual {v0}, Lcom/google/firebase/perf/internal/z;->CB()Z
+
+    move-result v0
+
+    goto :goto_4
 
     :cond_15
     const/4 v0, 0x0
 
-    :goto_8
+    :goto_4
     if-nez v0, :cond_1c
 
     iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMt:Lcom/google/android/gms/internal/firebase-perf/br;
@@ -566,14 +573,13 @@
 
     sget-object v1, Lcom/google/android/gms/internal/firebase-perf/x;->aLg:Lcom/google/android/gms/internal/firebase-perf/x;
 
-    :goto_9
     invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/x;->toString()Ljava/lang/String;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Lcom/google/firebase/perf/internal/a;->dC(Ljava/lang/String;)V
 
-    goto :goto_a
+    goto :goto_5
 
     :cond_16
     iget-object v0, p1, Lcom/google/android/gms/internal/firebase-perf/bt;->aMs:Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -584,10 +590,14 @@
 
     sget-object v1, Lcom/google/android/gms/internal/firebase-perf/x;->aLf:Lcom/google/android/gms/internal/firebase-perf/x;
 
-    goto :goto_9
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/x;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lcom/google/firebase/perf/internal/a;->dC(Ljava/lang/String;)V
 
     :cond_17
-    :goto_a
+    :goto_5
     iget-boolean v0, p0, Lcom/google/firebase/perf/internal/g;->bAB:Z
 
     if-eqz v0, :cond_1b
@@ -618,14 +628,14 @@
 
     move-result-object p1
 
-    goto :goto_b
+    goto :goto_6
 
     :cond_18
     new-instance p1, Ljava/lang/String;
 
     invoke-direct {p1, v1}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_b
+    :goto_6
     invoke-static {v0, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
@@ -657,14 +667,14 @@
 
     move-result-object p1
 
-    goto :goto_c
+    goto :goto_7
 
     :cond_1a
     new-instance p1, Ljava/lang/String;
 
     invoke-direct {p1, v1}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
-    :goto_c
+    :goto_7
     invoke-static {v0, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1b
@@ -726,11 +736,11 @@
 
     iget-object v6, v3, Lcom/google/android/gms/clearcut/a$a;->ZB:Lcom/google/android/gms/internal/clearcut/fz;
 
-    invoke-static {}, Lcom/google/android/gms/clearcut/a;->kB()[I
+    invoke-static {}, Lcom/google/android/gms/clearcut/a;->kA()[I
 
     move-result-object v7
 
-    invoke-static {}, Lcom/google/android/gms/clearcut/a;->kB()[I
+    invoke-static {}, Lcom/google/android/gms/clearcut/a;->kA()[I
 
     move-result-object v8
 
@@ -802,7 +812,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAv:Lcom/google/firebase/perf/a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cr()Z
+    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cq()Z
 
     move-result v0
 
@@ -812,11 +822,11 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/au;->qp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/au;->qo()I
 
     move-result v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/au;->oh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/au;->og()I
 
     move-result v1
 
@@ -846,7 +856,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/au;->qo()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/au;->qn()Z
 
     move-result v1
 
@@ -926,7 +936,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAv:Lcom/google/firebase/perf/a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cr()Z
+    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cq()Z
 
     move-result v0
 
@@ -1071,7 +1081,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAv:Lcom/google/firebase/perf/a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cr()Z
+    invoke-virtual {v0}, Lcom/google/firebase/perf/a;->Cq()Z
 
     move-result v0
 
@@ -1292,13 +1302,13 @@
 .method static synthetic b(Lcom/google/firebase/perf/internal/g;)V
     .locals 4
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAu:Lcom/google/firebase/b;
 
-    invoke-static {}, Lcom/google/firebase/perf/a;->Cq()Lcom/google/firebase/perf/a;
+    invoke-static {}, Lcom/google/firebase/perf/a;->Cp()Lcom/google/firebase/perf/a;
 
     move-result-object v0
 
@@ -1314,7 +1324,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAu:Lcom/google/firebase/b;
 
-    invoke-virtual {v0}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/d;
+    invoke-virtual {v0}, Lcom/google/firebase/b;->BA()Lcom/google/firebase/d;
 
     move-result-object v0
 
@@ -1334,9 +1344,7 @@
 
     iput-object v1, v0, Lcom/google/android/gms/internal/firebase-perf/bo;->aMi:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->aMr:Lcom/google/android/gms/internal/firebase-perf/bo;
-
-    invoke-direct {p0}, Lcom/google/firebase/perf/internal/g;->Cw()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/perf/internal/g;->Cv()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1458,28 +1466,18 @@
 
     invoke-direct {v0, v1}, Lcom/google/firebase/perf/internal/x;-><init>(Landroid/content/Context;)V
 
-    goto :goto_2
-
     :cond_2
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAA:Lcom/google/firebase/perf/internal/x;
-
-    :goto_2
     iput-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAA:Lcom/google/firebase/perf/internal/x;
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->zzdi:Lcom/google/firebase/perf/internal/a;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cs()Lcom/google/firebase/perf/internal/a;
+    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cr()Lcom/google/firebase/perf/internal/a;
 
     move-result-object v0
 
-    goto :goto_3
-
     :cond_3
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->zzdi:Lcom/google/firebase/perf/internal/a;
-
-    :goto_3
     iput-object v0, p0, Lcom/google/firebase/perf/internal/g;->zzdi:Lcom/google/firebase/perf/internal/a;
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->zzdj:Lcom/google/firebase/perf/internal/FeatureControl;
@@ -1490,12 +1488,7 @@
 
     move-result-object v0
 
-    goto :goto_4
-
     :cond_4
-    iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->zzdj:Lcom/google/firebase/perf/internal/FeatureControl;
-
-    :goto_4
     iput-object v0, p0, Lcom/google/firebase/perf/internal/g;->zzdj:Lcom/google/firebase/perf/internal/FeatureControl;
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAx:Landroid/content/Context;
@@ -1608,7 +1601,7 @@
     return-void
 .end method
 
-.method public final ac(Z)V
+.method public final ab(Z)V
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/g;->bAt:Ljava/util/concurrent/ThreadPoolExecutor;
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/l.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/l.smali
index c9dee4b10b..83b96cfed1 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/l.smali
@@ -37,11 +37,11 @@
 
     iget-object v2, v0, Lcom/google/firebase/perf/internal/x;->bBa:Lcom/google/firebase/perf/internal/z;
 
-    invoke-virtual {v2, v1}, Lcom/google/firebase/perf/internal/z;->ac(Z)V
+    invoke-virtual {v2, v1}, Lcom/google/firebase/perf/internal/z;->ab(Z)V
 
     iget-object v0, v0, Lcom/google/firebase/perf/internal/x;->bBb:Lcom/google/firebase/perf/internal/z;
 
-    invoke-virtual {v0, v1}, Lcom/google/firebase/perf/internal/z;->ac(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/firebase/perf/internal/z;->ab(Z)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/m.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/m.smali
index b5eb1693fe..9f57e6b290 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/m.smali
@@ -19,7 +19,7 @@
 
 
 # virtual methods
-.method public final Cu()Z
+.method public final Ct()Z
     .locals 4
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/m;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
@@ -46,7 +46,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/m;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/au;->qp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/au;->qo()I
 
     move-result v0
 
@@ -54,7 +54,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/m;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/au;->oh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/au;->og()I
 
     move-result v0
 
@@ -62,7 +62,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/m;->aMu:Lcom/google/android/gms/internal/firebase-perf/au;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/au;->qo()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/au;->qn()Z
 
     move-result v0
 
@@ -74,7 +74,7 @@
 
     if-nez v3, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/as;->qm()Lcom/google/android/gms/internal/firebase-perf/as;
+    invoke-static {}, Lcom/google/android/gms/internal/firebase-perf/as;->ql()Lcom/google/android/gms/internal/firebase-perf/as;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/n.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/n.smali
index a8f67340d2..a7a7edea2f 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/n.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/n.smali
@@ -128,7 +128,7 @@
 
 
 # virtual methods
-.method public final Cu()Z
+.method public final Ct()Z
     .locals 8
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/n;->bAI:Lcom/google/android/gms/internal/firebase-perf/br;
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/o.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/o.smali
index e1a1c17fa5..2e8dfe3079 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/o.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/o.smali
@@ -300,7 +300,6 @@
 
     const-string p2, "Exceed MAX_SUBTRACE_DEEP:1"
 
-    :goto_0
     invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return v0
@@ -312,7 +311,7 @@
 
     const/4 v4, 0x0
 
-    :goto_1
+    :goto_0
     if-ge v4, v3, :cond_9
 
     aget-object v5, v2, v4
@@ -321,10 +320,9 @@
 
     if-nez v6, :cond_2
 
-    :goto_2
     const/4 v6, 0x0
 
-    goto :goto_4
+    goto :goto_1
 
     :cond_2
     invoke-virtual {v6}, Ljava/lang/String;->trim()Ljava/lang/String;
@@ -341,10 +339,11 @@
 
     const-string v7, "counterId is empty"
 
-    :goto_3
     invoke-static {v6, v7}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_2
+    const/4 v6, 0x0
+
+    goto :goto_1
 
     :cond_3
     invoke-virtual {v6}, Ljava/lang/String;->length()I
@@ -359,12 +358,16 @@
 
     const-string v7, "counterId exceeded max length 100"
 
-    goto :goto_3
+    invoke-static {v6, v7}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    const/4 v6, 0x0
+
+    goto :goto_1
 
     :cond_4
     const/4 v6, 0x1
 
-    :goto_4
+    :goto_1
     if-nez v6, :cond_6
 
     const-string p1, "FirebasePerformance"
@@ -387,7 +390,7 @@
 
     move-result-object p2
 
-    goto :goto_5
+    goto :goto_2
 
     :cond_5
     new-instance v1, Ljava/lang/String;
@@ -396,7 +399,7 @@
 
     move-object p2, v1
 
-    :goto_5
+    :goto_2
     invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return v0
@@ -408,12 +411,12 @@
 
     const/4 v6, 0x1
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_7
     const/4 v6, 0x0
 
-    :goto_6
+    :goto_3
     if-nez v6, :cond_8
 
     const-string p1, "FirebasePerformance"
@@ -448,12 +451,14 @@
 
     move-result-object p2
 
-    goto :goto_0
+    invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    return v0
 
     :cond_8
     add-int/lit8 v4, v4, 0x1
 
-    goto :goto_1
+    goto/16 :goto_0
 
     :cond_9
     iget-object p1, p1, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -462,7 +467,7 @@
 
     const/4 v3, 0x0
 
-    :goto_7
+    :goto_4
     if-ge v3, v2, :cond_b
 
     aget-object v4, p1, v3
@@ -480,7 +485,7 @@
     :cond_a
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_7
+    goto :goto_4
 
     :cond_b
     return v1
@@ -488,7 +493,7 @@
 
 
 # virtual methods
-.method public final Cu()Z
+.method public final Ct()Z
     .locals 6
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/o;->bAJ:Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -558,10 +563,9 @@
     :goto_1
     if-eqz v2, :cond_3
 
-    :goto_2
     const/4 v0, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_3
     iget-object v0, v0, Lcom/google/android/gms/internal/firebase-perf/bv;->aMB:[Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -570,7 +574,7 @@
 
     const/4 v4, 0x0
 
-    :goto_3
+    :goto_2
     if-ge v4, v2, :cond_6
 
     aget-object v5, v0, v4
@@ -583,25 +587,27 @@
 
     const/4 v5, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     const/4 v5, 0x0
 
-    :goto_4
+    :goto_3
     if-eqz v5, :cond_5
 
-    goto :goto_2
+    const/4 v0, 0x1
+
+    goto :goto_4
 
     :cond_5
     add-int/lit8 v4, v4, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     const/4 v0, 0x0
 
-    :goto_5
+    :goto_4
     if-eqz v0, :cond_8
 
     iget-object v0, p0, Lcom/google/firebase/perf/internal/o;->bAJ:Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -634,7 +640,7 @@
 
     move-result-object v2
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     new-instance v3, Ljava/lang/String;
@@ -643,7 +649,7 @@
 
     move-object v2, v3
 
-    :goto_6
+    :goto_5
     invoke-static {v0, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     return v1
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/s.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/s.smali
index 678682d0ae..400dc8fc58 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/s.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/s.smali
@@ -42,7 +42,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v1
 
@@ -84,7 +84,7 @@
 
     invoke-virtual {p2, p1}, Landroid/app/ActivityManager;->getMemoryInfo(Landroid/app/ActivityManager$MemoryInfo;)V
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object p1
 
@@ -138,7 +138,7 @@
     return-void
 .end method
 
-.method public static Cx()Lcom/google/firebase/perf/internal/s;
+.method public static Cw()Lcom/google/firebase/perf/internal/s;
     .locals 1
 
     sget-object v0, Lcom/google/firebase/perf/internal/s;->bAN:Lcom/google/firebase/perf/internal/s;
@@ -167,12 +167,12 @@
 
     const/4 v2, 0x0
 
-    :cond_0
     :try_start_1
     invoke-virtual {v1}, Ljava/io/BufferedReader;->readLine()Ljava/lang/String;
 
     move-result-object v3
 
+    :goto_0
     if-eqz v3, :cond_2
 
     const-string v4, "MemTotal"
@@ -181,7 +181,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_1
 
     const-string v4, "\\d+"
 
@@ -197,7 +197,7 @@
 
     move-result v4
 
-    if-eqz v4, :cond_1
+    if-eqz v4, :cond_0
 
     invoke-virtual {v3}, Ljava/util/regex/Matcher;->group()Ljava/lang/String;
 
@@ -205,71 +205,86 @@
 
     invoke-static {v3}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
 
-    move-result v3
+    move-result v2
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_0
+    goto :goto_1
 
-    :cond_1
-    const/4 v3, 0x0
+    :cond_0
+    const/4 v2, 0x0
 
-    :goto_0
+    :goto_1
     :try_start_2
     invoke-virtual {v1}, Ljava/io/BufferedReader;->close()V
-
-    return v3
-
-    :cond_2
-    invoke-virtual {v1}, Ljava/io/BufferedReader;->close()V
     :try_end_2
     .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_3
     .catch Ljava/lang/NumberFormatException; {:try_start_2 .. :try_end_2} :catch_2
 
-    goto :goto_4
+    return v2
+
+    :cond_1
+    :try_start_3
+    invoke-virtual {v1}, Ljava/io/BufferedReader;->readLine()Ljava/lang/String;
+
+    move-result-object v3
+    :try_end_3
+    .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    goto :goto_0
+
+    :cond_2
+    :try_start_4
+    invoke-virtual {v1}, Ljava/io/BufferedReader;->close()V
+    :try_end_4
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_3
+    .catch Ljava/lang/NumberFormatException; {:try_start_4 .. :try_end_4} :catch_2
+
+    goto/16 :goto_4
 
     :catchall_0
     move-exception v3
 
-    goto :goto_1
+    goto :goto_2
 
     :catch_0
     move-exception v2
 
-    :try_start_3
+    :try_start_5
     throw v2
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    :goto_1
+    :goto_2
     if-eqz v2, :cond_3
 
-    :try_start_4
+    :try_start_6
     invoke-virtual {v1}, Ljava/io/BufferedReader;->close()V
-    :try_end_4
-    .catch Ljava/lang/Throwable; {:try_start_4 .. :try_end_4} :catch_1
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_3
-    .catch Ljava/lang/NumberFormatException; {:try_start_4 .. :try_end_4} :catch_2
+    :try_end_6
+    .catch Ljava/lang/Throwable; {:try_start_6 .. :try_end_6} :catch_1
+    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_3
+    .catch Ljava/lang/NumberFormatException; {:try_start_6 .. :try_end_6} :catch_2
 
-    goto :goto_2
+    goto :goto_3
 
     :catch_1
     move-exception v1
 
-    :try_start_5
+    :try_start_7
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/firebase-perf/i;->a(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     invoke-virtual {v1}, Ljava/io/BufferedReader;->close()V
 
-    :goto_2
+    :goto_3
     throw v3
-    :try_end_5
-    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
-    .catch Ljava/lang/NumberFormatException; {:try_start_5 .. :try_end_5} :catch_2
+    :try_end_7
+    .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_3
+    .catch Ljava/lang/NumberFormatException; {:try_start_7 .. :try_end_7} :catch_2
 
     :catch_2
     move-exception v1
@@ -306,7 +321,23 @@
 
     const-string v3, "Unable to parse \'"
 
-    goto :goto_3
+    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p0, "\' file: "
+
+    invoke-virtual {v4, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {v2, p0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto :goto_4
 
     :catch_3
     move-exception v1
@@ -343,7 +374,6 @@
 
     const-string v3, "Unable to read \'"
 
-    :goto_3
     invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v4, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/t.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/t.smali
index 3094b5e5a7..6bc9fe1943 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/t.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/t.smali
@@ -151,7 +151,7 @@
 
     packed-switch p0, :pswitch_data_0
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_0
     const-string p0, "Metric name must not be null"
@@ -182,7 +182,7 @@
 
     packed-switch p0, :pswitch_data_1
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_2
     sget-object p0, Ljava/util/Locale;->US:Ljava/util/Locale;
@@ -197,7 +197,6 @@
 
     aput-object v1, v0, v3
 
-    :goto_0
     invoke-static {p0, p1, v0}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
@@ -217,7 +216,11 @@
 
     aput-object v1, v0, v3
 
-    goto :goto_0
+    invoke-static {p0, p1, v0}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_1
     const-string v2, "_"
@@ -234,7 +237,7 @@
 
     array-length v4, v2
 
-    :goto_1
+    :goto_0
     if-ge v3, v4, :cond_3
 
     aget-object v5, v2, v3
@@ -254,7 +257,7 @@
     :cond_2
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     sget-object p0, Lcom/google/firebase/perf/internal/u;->bAR:[I
@@ -265,7 +268,7 @@
 
     packed-switch p0, :pswitch_data_2
 
-    goto :goto_2
+    goto :goto_1
 
     :pswitch_4
     const-string p0, "Metric name must not start with \'_\'"
@@ -278,7 +281,7 @@
     return-object p0
 
     :cond_4
-    :goto_2
+    :goto_1
     return-object v0
 
     :pswitch_data_0
@@ -302,5 +305,5 @@
 
 
 # virtual methods
-.method public abstract Cu()Z
+.method public abstract Ct()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/u.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/u.smali
index 7d4f2214d0..03ba096cb9 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/u.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/u.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/v;->Cy()[I
+    invoke-static {}, Lcom/google/firebase/perf/internal/v;->Cx()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/v.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/v.smali
index 3ae956171e..215dc3d90b 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/v.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/v.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method public static Cy()[I
+.method public static Cx()[I
     .locals 1
 
     sget-object v0, Lcom/google/firebase/perf/internal/v;->bAS:[I
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/x.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/x.smali
index a7d7806f14..c4e19cf456 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/x.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/x.smali
@@ -223,7 +223,7 @@
 
     const/4 v1, 0x0
 
-    if-lez v0, :cond_0
+    if-lez v0, :cond_1
 
     aget-object v0, p0, v1
 
@@ -231,7 +231,7 @@
 
     array-length v0, v0
 
-    if-lez v0, :cond_0
+    if-lez v0, :cond_1
 
     aget-object p0, p0, v1
 
@@ -249,6 +249,9 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method private static dG(Ljava/lang/String;)J
@@ -271,11 +274,11 @@
 
     invoke-static {v0}, Lcom/google/android/gms/internal/firebase-perf/al;->u([B)I
 
-    move-result v0
+    move-result p0
     :try_end_0
     .catch Ljava/security/NoSuchAlgorithmException; {:try_start_0 .. :try_end_0} :catch_0
 
-    int-to-long v0, v0
+    int-to-long v0, p0
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/z.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/z.smali
index 907e465322..b906df0d5b 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/z.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/z.smali
@@ -307,8 +307,8 @@
 
 
 # virtual methods
-.method final declared-synchronized CC()Z
-    .locals 8
+.method final declared-synchronized CB()Z
+    .locals 7
 
     monitor-enter p0
 
@@ -339,8 +339,6 @@
 
     iget-wide v5, p0, Lcom/google/firebase/perf/internal/z;->bBj:J
 
-    const/4 v7, 0x0
-
     add-long/2addr v5, v1
 
     iget-wide v1, p0, Lcom/google/firebase/perf/internal/z;->bBg:J
@@ -371,7 +369,6 @@
 
     const/4 v0, 0x1
 
-    :goto_0
     monitor-exit p0
 
     return v0
@@ -393,7 +390,9 @@
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    monitor-exit p0
+
+    return v0
 
     :catchall_0
     move-exception v0
@@ -403,7 +402,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized ac(Z)V
+.method final declared-synchronized ab(Z)V
     .locals 2
 
     monitor-enter p0
@@ -415,11 +414,6 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_2
-
     :cond_0
     iget-wide v0, p0, Lcom/google/firebase/perf/internal/z;->bBl:J
 
@@ -444,7 +438,9 @@
 
     return-void
 
-    :goto_2
+    :catchall_0
+    move-exception p1
+
     monitor-exit p0
 
     throw p1
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/zzt.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/zzt.smali
index a1b140d7ab..fc6eecb2fa 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/zzt.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/zzt.smali
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method public static CB()Z
+.method public static CA()Z
     .locals 3
 
     const/4 v0, 0x1
@@ -129,7 +129,7 @@
     return v0
 .end method
 
-.method public static Cz()Lcom/google/firebase/perf/internal/zzt;
+.method public static Cy()Lcom/google/firebase/perf/internal/zzt;
     .locals 7
 
     invoke-static {}, Ljava/util/UUID;->randomUUID()Ljava/util/UUID;
@@ -288,7 +288,7 @@
 
     check-cast v2, Lcom/google/firebase/perf/internal/zzt;
 
-    invoke-virtual {v2}, Lcom/google/firebase/perf/internal/zzt;->CA()Lcom/google/android/gms/internal/firebase-perf/bu;
+    invoke-virtual {v2}, Lcom/google/firebase/perf/internal/zzt;->Cz()Lcom/google/android/gms/internal/firebase-perf/bu;
 
     move-result-object v2
 
@@ -311,7 +311,7 @@
 
     check-cast v6, Lcom/google/firebase/perf/internal/zzt;
 
-    invoke-virtual {v6}, Lcom/google/firebase/perf/internal/zzt;->CA()Lcom/google/android/gms/internal/firebase-perf/bu;
+    invoke-virtual {v6}, Lcom/google/firebase/perf/internal/zzt;->Cz()Lcom/google/android/gms/internal/firebase-perf/bu;
 
     move-result-object v6
 
@@ -354,7 +354,7 @@
 
 
 # virtual methods
-.method public final CA()Lcom/google/android/gms/internal/firebase-perf/bu;
+.method public final Cz()Lcom/google/android/gms/internal/firebase-perf/bu;
     .locals 3
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/bu;
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/metrics/AppStartTrace.smali b/com.discord/smali_classes2/com/google/firebase/perf/metrics/AppStartTrace.smali
index 1875946d39..0ae0489fa7 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/metrics/AppStartTrace.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/metrics/AppStartTrace.smali
@@ -108,7 +108,7 @@
     return-void
 .end method
 
-.method public static CD()Lcom/google/firebase/perf/metrics/AppStartTrace;
+.method public static CC()Lcom/google/firebase/perf/metrics/AppStartTrace;
     .locals 1
 
     sget-object v0, Lcom/google/firebase/perf/metrics/AppStartTrace;->bBo:Lcom/google/firebase/perf/metrics/AppStartTrace;
@@ -131,7 +131,7 @@
     return-object v0
 .end method
 
-.method private final declared-synchronized CE()V
+.method private final declared-synchronized CD()V
     .locals 1
 
     monitor-enter p0
@@ -658,7 +658,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/firebase/perf/internal/zzt;->CA()Lcom/google/android/gms/internal/firebase-perf/bu;
+    invoke-virtual {v3}, Lcom/google/firebase/perf/internal/zzt;->Cz()Lcom/google/android/gms/internal/firebase-perf/bu;
 
     move-result-object v3
 
@@ -670,7 +670,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v0
 
@@ -690,7 +690,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/metrics/AppStartTrace;->CE()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/metrics/AppStartTrace;->CD()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/metrics/Trace.smali b/com.discord/smali_classes2/com/google/firebase/perf/metrics/Trace.smali
index 462e285790..f0f18e7786 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/metrics/Trace.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/metrics/Trace.smali
@@ -142,7 +142,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cs()Lcom/google/firebase/perf/internal/a;
+    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cr()Lcom/google/firebase/perf/internal/a;
 
     move-result-object v1
 
@@ -268,7 +268,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object p1
 
@@ -478,6 +478,8 @@
 
     invoke-static {p2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-void
+
     :goto_0
     return-void
 
@@ -538,6 +540,8 @@
 
     invoke-static {p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-void
+
     :goto_1
     return-void
 
@@ -598,6 +602,8 @@
 
     invoke-static {p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
+    return-void
+
     :goto_2
     return-void
 
@@ -614,6 +620,8 @@
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
@@ -928,7 +936,7 @@
 .end method
 
 .method public putAttribute(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 8
+    .locals 7
     .param p1    # Ljava/lang/String;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -947,46 +955,40 @@
     :try_start_0
     invoke-virtual {p1}, Ljava/lang/String;->trim()Ljava/lang/String;
 
-    move-result-object v2
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
+    move-result-object p1
 
-    :try_start_1
     invoke-virtual {p2}, Ljava/lang/String;->trim()Ljava/lang/String;
 
-    move-result-object p1
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+    move-result-object p2
 
-    :try_start_2
     invoke-virtual {p0}, Lcom/google/firebase/perf/metrics/Trace;->isStopped()Z
 
-    move-result p2
+    move-result v2
 
-    if-nez p2, :cond_3
+    if-nez v2, :cond_3
 
-    iget-object p2, p0, Lcom/google/firebase/perf/metrics/Trace;->bBD:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/firebase/perf/metrics/Trace;->bBD:Ljava/util/Map;
 
-    invoke-interface {p2, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v2, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    move-result p2
+    move-result v2
 
-    if-nez p2, :cond_1
+    if-nez v2, :cond_1
 
-    iget-object p2, p0, Lcom/google/firebase/perf/metrics/Trace;->bBD:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/firebase/perf/metrics/Trace;->bBD:Ljava/util/Map;
 
-    invoke-interface {p2}, Ljava/util/Map;->size()I
+    invoke-interface {v2}, Ljava/util/Map;->size()I
 
-    move-result p2
+    move-result v2
 
     const/4 v3, 0x5
 
-    if-ge p2, v3, :cond_0
+    if-ge v2, v3, :cond_0
 
     goto :goto_0
 
     :cond_0
-    new-instance p2, Ljava/lang/IllegalArgumentException;
+    new-instance v2, Ljava/lang/IllegalArgumentException;
 
     sget-object v4, Ljava/util/Locale;->US:Ljava/util/Locale;
 
@@ -1004,35 +1006,35 @@
 
     move-result-object v3
 
-    invoke-direct {p2, v3}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v2, v3}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
-    throw p2
+    throw v2
 
     :cond_1
     :goto_0
-    new-instance p2, Ljava/util/AbstractMap$SimpleEntry;
+    new-instance v2, Ljava/util/AbstractMap$SimpleEntry;
 
-    invoke-direct {p2, v2, p1}, Ljava/util/AbstractMap$SimpleEntry;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v2, p1, p2}, Ljava/util/AbstractMap$SimpleEntry;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-static {p2}, Lcom/google/firebase/perf/internal/t;->a(Ljava/util/AbstractMap$SimpleEntry;)Ljava/lang/String;
+    invoke-static {v2}, Lcom/google/firebase/perf/internal/t;->a(Ljava/util/AbstractMap$SimpleEntry;)Ljava/lang/String;
 
-    move-result-object p2
+    move-result-object v2
 
-    if-nez p2, :cond_2
+    if-nez v2, :cond_2
 
     const/4 v0, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     new-instance v3, Ljava/lang/IllegalArgumentException;
 
-    invoke-direct {v3, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v3, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v3
 
     :cond_3
-    new-instance p2, Ljava/lang/IllegalArgumentException;
+    new-instance v2, Ljava/lang/IllegalArgumentException;
 
     sget-object v3, Ljava/util/Locale;->US:Ljava/util/Locale;
 
@@ -1048,40 +1050,15 @@
 
     move-result-object v3
 
-    invoke-direct {p2, v3}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v2, v3}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
-    throw p2
-    :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
+    throw v2
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    move-exception p2
-
-    goto :goto_1
-
-    :catch_1
-    move-exception p1
-
-    move-object v7, p2
-
-    move-object p2, p1
-
-    move-object p1, v7
-
-    goto :goto_1
-
-    :catch_2
     move-exception v2
 
-    move-object v7, v2
-
-    move-object v2, p1
-
-    move-object p1, p2
-
-    move-object p2, v7
-
-    :goto_1
     const-string v3, "FirebasePerformance"
 
     const-string v4, "Can not set attribute %s with value %s (%s)"
@@ -1090,30 +1067,30 @@
 
     new-array v5, v5, [Ljava/lang/Object;
 
-    aput-object v2, v5, v0
-
-    aput-object p1, v5, v1
-
-    const/4 v1, 0x2
-
-    invoke-virtual {p2}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
-
-    move-result-object p2
+    aput-object p1, v5, v0
 
     aput-object p2, v5, v1
 
+    const/4 v1, 0x2
+
+    invoke-virtual {v2}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
+
+    move-result-object v2
+
+    aput-object v2, v5, v1
+
     invoke-static {v4, v5}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object p2
+    move-result-object v1
 
-    invoke-static {v3, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+    invoke-static {v3, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    :goto_2
+    :goto_1
     if-eqz v0, :cond_4
 
-    iget-object p2, p0, Lcom/google/firebase/perf/metrics/Trace;->bBD:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/perf/metrics/Trace;->bBD:Ljava/util/Map;
 
-    invoke-interface {p2, v2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_4
     return-void
@@ -1602,13 +1579,11 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/firebase/perf/metrics/Trace;->bAs:Lcom/google/firebase/perf/internal/g;
-
     new-instance v1, Lcom/google/firebase/perf/metrics/f;
 
     invoke-direct {v1, p0}, Lcom/google/firebase/perf/metrics/f;-><init>(Lcom/google/firebase/perf/metrics/Trace;)V
 
-    invoke-virtual {v1}, Lcom/google/firebase/perf/metrics/f;->CF()Lcom/google/android/gms/internal/firebase-perf/bv;
+    invoke-virtual {v1}, Lcom/google/firebase/perf/metrics/f;->CE()Lcom/google/android/gms/internal/firebase-perf/bv;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/metrics/e.smali b/com.discord/smali_classes2/com/google/firebase/perf/metrics/e.smali
index 11115d53a8..1c2120d401 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/metrics/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/metrics/e.smali
@@ -10,7 +10,7 @@
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/v;->Cy()[I
+    invoke-static {}, Lcom/google/firebase/perf/internal/v;->Cx()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/metrics/f.smali b/com.discord/smali_classes2/com/google/firebase/perf/metrics/f.smali
index 014d88da11..d3f7611b1e 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/metrics/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/metrics/f.smali
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final CF()Lcom/google/android/gms/internal/firebase-perf/bv;
+.method final CE()Lcom/google/android/gms/internal/firebase-perf/bv;
     .locals 8
 
     new-instance v0, Lcom/google/android/gms/internal/firebase-perf/bv;
@@ -189,7 +189,7 @@
 
     invoke-direct {v7, v4}, Lcom/google/firebase/perf/metrics/f;-><init>(Lcom/google/firebase/perf/metrics/Trace;)V
 
-    invoke-virtual {v7}, Lcom/google/firebase/perf/metrics/f;->CF()Lcom/google/android/gms/internal/firebase-perf/bv;
+    invoke-virtual {v7}, Lcom/google/firebase/perf/metrics/f;->CE()Lcom/google/android/gms/internal/firebase-perf/bv;
 
     move-result-object v4
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfHttpClient.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfHttpClient.smali
index 5180a738e9..716cb84125 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfHttpClient.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfHttpClient.smali
@@ -128,7 +128,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -257,7 +257,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p5}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -348,7 +348,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -440,7 +440,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -541,7 +541,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -579,7 +579,7 @@
     invoke-virtual {p4, p1}, Lcom/google/android/gms/internal/firebase-perf/u;->br(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/u;
 
     :cond_3
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -588,7 +588,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -689,7 +689,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -727,7 +727,7 @@
     invoke-virtual {p5, p1}, Lcom/google/android/gms/internal/firebase-perf/u;->br(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/u;
 
     :cond_3
-    invoke-virtual {p5}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -736,7 +736,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -801,7 +801,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -839,7 +839,7 @@
     invoke-virtual {p3, p1}, Lcom/google/android/gms/internal/firebase-perf/u;->br(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/u;
 
     :cond_2
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -848,7 +848,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -913,7 +913,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -951,7 +951,7 @@
     invoke-virtual {p4, p1}, Lcom/google/android/gms/internal/firebase-perf/u;->br(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/u;
 
     :cond_2
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -960,7 +960,7 @@
     :catch_0
     move-exception p0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p1
 
@@ -999,7 +999,7 @@
 
     invoke-direct {v4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v5
 
@@ -1048,7 +1048,7 @@
 
     invoke-direct {v5}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v6
 
@@ -1096,7 +1096,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v1
 
@@ -1136,7 +1136,7 @@
 
     invoke-direct {v4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v5
 
@@ -1170,7 +1170,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v1
 
@@ -1196,7 +1196,7 @@
 
     invoke-direct {v4}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v5
 
@@ -1230,7 +1230,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v1
 
@@ -1256,7 +1256,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali
index e79f71b239..8327be9fd9 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali
@@ -19,16 +19,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v1, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    invoke-virtual {v1}, Lokhttp3/s;->Hj()Ljava/net/URL;
+    invoke-virtual {v1}, Lokhttp3/s;->Hi()Ljava/net/URL;
 
     move-result-object v1
 
@@ -42,13 +42,13 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/firebase-perf/u;->bq(Ljava/lang/String;)Lcom/google/android/gms/internal/firebase-perf/u;
 
-    iget-object v1, v0, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v1, v0, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     const-wide/16 v2, -0x1
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v0, v0, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     invoke-virtual {v0}, Lokhttp3/RequestBody;->contentLength()J
 
@@ -61,7 +61,7 @@
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/u;->M(J)Lcom/google/android/gms/internal/firebase-perf/u;
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     if-eqz v0, :cond_3
 
@@ -97,7 +97,7 @@
 
     invoke-virtual {p1, p4, p5}, Lcom/google/android/gms/internal/firebase-perf/u;->P(J)Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     return-void
 .end method
@@ -115,7 +115,7 @@
 
     new-instance v6, Lcom/google/firebase/perf/network/g;
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v2
 
@@ -141,7 +141,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v0
 
@@ -156,11 +156,11 @@
     iget-wide v8, v7, Lcom/google/android/gms/internal/firebase-perf/zzbg;->aLC:J
 
     :try_start_0
-    invoke-interface {p0}, Lokhttp3/e;->GZ()Lokhttp3/Response;
+    invoke-interface {p0}, Lokhttp3/e;->GY()Lokhttp3/Response;
 
     move-result-object v10
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v5
 
@@ -179,17 +179,17 @@
     :catch_0
     move-exception v1
 
-    invoke-interface {p0}, Lokhttp3/e;->GY()Lokhttp3/w;
+    invoke-interface {p0}, Lokhttp3/e;->GX()Lokhttp3/w;
 
     move-result-object p0
 
     if-eqz p0, :cond_1
 
-    iget-object v2, p0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v2, p0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     if-eqz v2, :cond_0
 
-    invoke-virtual {v2}, Lokhttp3/s;->Hj()Ljava/net/URL;
+    invoke-virtual {v2}, Lokhttp3/s;->Hi()Ljava/net/URL;
 
     move-result-object v2
 
@@ -211,7 +211,7 @@
     :cond_1
     invoke-virtual {v0, v8, v9}, Lcom/google/android/gms/internal/firebase-perf/u;->N(J)Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfUrlConnection.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfUrlConnection.smali
index 370c539140..c6b5bd290c 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfUrlConnection.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfUrlConnection.smali
@@ -46,9 +46,9 @@
 
     invoke-virtual {v3}, Lcom/google/firebase/perf/network/d;->getInputStream()Ljava/io/InputStream;
 
-    move-result-object v2
+    move-result-object p0
 
-    return-object v2
+    return-object p0
 
     :cond_0
     instance-of v3, v2, Ljava/net/HttpURLConnection;
@@ -63,25 +63,25 @@
 
     invoke-virtual {v3}, Lcom/google/firebase/perf/network/c;->getInputStream()Ljava/io/InputStream;
 
-    move-result-object v2
+    move-result-object p0
 
-    return-object v2
+    return-object p0
 
     :cond_1
     invoke-virtual {v2}, Ljava/net/URLConnection;->getInputStream()Ljava/io/InputStream;
 
-    move-result-object v2
+    move-result-object p0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v2
+    return-object p0
 
     :catch_0
     move-exception v2
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/u;->N(J)Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -133,9 +133,9 @@
 
     invoke-virtual {v3, p1}, Lcom/google/firebase/perf/network/d;->getContent([Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object p1
+    move-result-object p0
 
-    return-object p1
+    return-object p0
 
     :cond_0
     instance-of v3, v2, Ljava/net/HttpURLConnection;
@@ -150,25 +150,25 @@
 
     invoke-virtual {v3, p1}, Lcom/google/firebase/perf/network/c;->getContent([Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object p1
+    move-result-object p0
 
-    return-object p1
+    return-object p0
 
     :cond_1
     invoke-virtual {v2, p1}, Ljava/net/URLConnection;->getContent([Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object p1
+    move-result-object p0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object p1
+    return-object p0
 
     :catch_0
     move-exception p1
 
     invoke-virtual {p2, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/u;->N(J)Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -220,9 +220,9 @@
 
     invoke-virtual {v3}, Lcom/google/firebase/perf/network/d;->getContent()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object p0
 
-    return-object v2
+    return-object p0
 
     :cond_0
     instance-of v3, v2, Ljava/net/HttpURLConnection;
@@ -237,25 +237,25 @@
 
     invoke-virtual {v3}, Lcom/google/firebase/perf/network/c;->getContent()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object p0
 
-    return-object v2
+    return-object p0
 
     :cond_1
     invoke-virtual {v2}, Ljava/net/URLConnection;->getContent()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object p0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v2
+    return-object p0
 
     :catch_0
     move-exception v2
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/u;->N(J)Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -287,7 +287,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/firebase-perf/ak;-><init>(Ljava/net/URL;)V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object p0
 
@@ -317,7 +317,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/firebase-perf/ak;-><init>(Ljava/net/URL;)V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object p0
 
@@ -355,7 +355,7 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v2
 
@@ -380,7 +380,7 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;-><init>()V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object v2
 
@@ -411,7 +411,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/firebase-perf/ak;-><init>(Ljava/net/URL;)V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cv()Lcom/google/firebase/perf/internal/g;
+    invoke-static {}, Lcom/google/firebase/perf/internal/g;->Cu()Lcom/google/firebase/perf/internal/g;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/a.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/a.smali
index 30905caa66..08aed9f07a 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/a.smali
@@ -71,7 +71,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -94,7 +94,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -148,7 +148,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/a;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -161,7 +161,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -213,7 +213,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -248,7 +248,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/a;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     goto :goto_0
 
@@ -279,7 +279,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -309,7 +309,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -344,7 +344,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/a;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     goto :goto_0
 
@@ -375,7 +375,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -405,7 +405,7 @@
 
     iget-object p2, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide p2
 
@@ -440,7 +440,7 @@
 
     iget-object p2, p0, Lcom/google/firebase/perf/network/a;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     goto :goto_0
 
@@ -471,7 +471,7 @@
 
     iget-object p3, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -508,7 +508,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -538,7 +538,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -576,8 +576,6 @@
     :cond_1
     iget-wide v0, p0, Lcom/google/firebase/perf/network/a;->bBN:J
 
-    const/4 v2, 0x0
-
     add-long/2addr v0, p1
 
     iput-wide v0, p0, Lcom/google/firebase/perf/network/a;->bBN:J
@@ -600,7 +598,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/a;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/b.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/b.smali
index 8954784d34..cde3f00872 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/b.smali
@@ -49,18 +49,16 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/perf/network/b;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
+    iget-object v2, p0, Lcom/google/firebase/perf/network/b;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    iget-wide v1, p0, Lcom/google/firebase/perf/network/b;->bBR:J
-
-    invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/firebase-perf/u;->M(J)Lcom/google/android/gms/internal/firebase-perf/u;
+    invoke-virtual {v2, v0, v1}, Lcom/google/android/gms/internal/firebase-perf/u;->M(J)Lcom/google/android/gms/internal/firebase-perf/u;
 
     :cond_0
     iget-object v0, p0, Lcom/google/firebase/perf/network/b;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/b;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -86,7 +84,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/b;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -123,7 +121,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/b;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -174,7 +172,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/b;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -227,7 +225,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/b;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -278,7 +276,7 @@
 
     iget-object p3, p0, Lcom/google/firebase/perf/network/b;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/e.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/e.smali
index 197f91ea70..cd51e4506d 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/e.smali
@@ -49,7 +49,7 @@
     return-void
 .end method
 
-.method private final CG()V
+.method private final CF()V
     .locals 5
 
     iget-wide v0, p0, Lcom/google/firebase/perf/network/e;->bBV:J
@@ -179,7 +179,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -199,7 +199,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -207,7 +207,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -236,7 +236,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
@@ -312,7 +312,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -320,7 +320,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/e;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     :goto_0
     return-object v0
@@ -332,7 +332,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -353,7 +353,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
@@ -429,7 +429,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -437,7 +437,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     :goto_0
     return-object p1
@@ -449,7 +449,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -465,7 +465,7 @@
 .method public final getContentEncoding()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -479,7 +479,7 @@
 .method public final getContentLength()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -493,7 +493,7 @@
 .method public final getContentLengthLong()J
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -507,7 +507,7 @@
 .method public final getContentType()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -521,7 +521,7 @@
 .method public final getDate()J
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -535,7 +535,7 @@
 .method public final getErrorStream()Ljava/io/InputStream;
     .locals 4
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     :try_start_0
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
@@ -585,7 +585,7 @@
 .method public final getExpiration()J
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -599,7 +599,7 @@
 .method public final getHeaderField(I)Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -613,7 +613,7 @@
 .method public final getHeaderField(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -627,7 +627,7 @@
 .method public final getHeaderFieldDate(Ljava/lang/String;J)J
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -641,7 +641,7 @@
 .method public final getHeaderFieldInt(Ljava/lang/String;I)I
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -655,7 +655,7 @@
 .method public final getHeaderFieldKey(I)Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -669,7 +669,7 @@
 .method public final getHeaderFieldLong(Ljava/lang/String;J)J
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -693,7 +693,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -712,7 +712,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
@@ -760,7 +760,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -776,7 +776,7 @@
 .method public final getLastModified()J
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBU:Ljava/net/HttpURLConnection;
 
@@ -821,7 +821,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -860,7 +860,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -893,7 +893,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-wide v0, p0, Lcom/google/firebase/perf/network/e;->bBO:J
 
@@ -905,7 +905,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -940,7 +940,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
@@ -961,7 +961,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CG()V
+    invoke-direct {p0}, Lcom/google/firebase/perf/network/e;->CF()V
 
     iget-wide v0, p0, Lcom/google/firebase/perf/network/e;->bBO:J
 
@@ -973,7 +973,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v0
 
@@ -1014,7 +1014,7 @@
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/e;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/f.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/f.smali
index 08e073b2f9..56b3eb9c7a 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/f.smali
@@ -80,7 +80,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/f;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -126,7 +126,7 @@
     :cond_1
     iget-object v0, p0, Lcom/google/firebase/perf/network/f;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/f;->bBW:Lorg/apache/http/client/ResponseHandler;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/g.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/g.smali
index ba13d83d00..e0fb368acd 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/g.smali
@@ -41,19 +41,19 @@
 .method public final a(Lokhttp3/e;Ljava/io/IOException;)V
     .locals 3
 
-    invoke-interface {p1}, Lokhttp3/e;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/e;->GX()Lokhttp3/w;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iget-object v1, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v1, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     if-eqz v1, :cond_0
 
     iget-object v2, p0, Lcom/google/firebase/perf/network/g;->bBL:Lcom/google/android/gms/internal/firebase-perf/u;
 
-    invoke-virtual {v1}, Lokhttp3/s;->Hj()Ljava/net/URL;
+    invoke-virtual {v1}, Lokhttp3/s;->Hi()Ljava/net/URL;
 
     move-result-object v1
 
@@ -85,7 +85,7 @@
 
     iget-object v1, p0, Lcom/google/firebase/perf/network/g;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v1
 
@@ -112,7 +112,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/perf/network/g;->bBM:Lcom/google/android/gms/internal/firebase-perf/zzbg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qf()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/firebase-perf/zzbg;->qe()J
 
     move-result-wide v5
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/h.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/h.smali
index 5ec2c6c8e9..dcaaa3654d 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/h.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/h.smali
@@ -84,10 +84,10 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/u;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/u;->qc()Lcom/google/android/gms/internal/firebase-perf/u;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/u;->qe()Lcom/google/android/gms/internal/firebase-perf/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/firebase-perf/u;->qd()Lcom/google/android/gms/internal/firebase-perf/br;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/provider/FirebasePerfProvider.smali b/com.discord/smali_classes2/com/google/firebase/perf/provider/FirebasePerfProvider.smali
index a51de8e3b8..d25fc92f6b 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/provider/FirebasePerfProvider.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/provider/FirebasePerfProvider.smali
@@ -79,7 +79,7 @@
 
     invoke-super {p0, p1, p2}, Landroid/content/ContentProvider;->attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cs()Lcom/google/firebase/perf/internal/a;
+    invoke-static {}, Lcom/google/firebase/perf/internal/a;->Cr()Lcom/google/firebase/perf/internal/a;
 
     move-result-object p1
 
@@ -89,7 +89,7 @@
 
     invoke-virtual {p1, p2}, Lcom/google/firebase/perf/internal/a;->ay(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/firebase/perf/metrics/AppStartTrace;->CD()Lcom/google/firebase/perf/metrics/AppStartTrace;
+    invoke-static {}, Lcom/google/firebase/perf/metrics/AppStartTrace;->CC()Lcom/google/firebase/perf/metrics/AppStartTrace;
 
     move-result-object p1
 
@@ -107,7 +107,7 @@
 
     invoke-virtual {p2, v0}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
-    invoke-static {}, Lcom/google/firebase/perf/internal/zzt;->CB()Z
+    invoke-static {}, Lcom/google/firebase/perf/internal/zzt;->CA()Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/provider/FirebaseInitProvider.smali b/com.discord/smali_classes2/com/google/firebase/provider/FirebaseInitProvider.smali
index 7df417d56f..7392502208 100644
--- a/com.discord/smali_classes2/com/google/firebase/provider/FirebaseInitProvider.smali
+++ b/com.discord/smali_classes2/com/google/firebase/provider/FirebaseInitProvider.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/firebase/provider/FirebaseInitProvider;
 .super Landroid/content/ContentProvider;
+.source "com.google.firebase:firebase-common@@16.0.2"
 
 
 # direct methods
@@ -89,19 +90,18 @@
 
     const-string v1, "FirebaseApp initialization unsuccessful"
 
-    :goto_0
     invoke-static {v0, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v0, "FirebaseInitProvider"
 
     const-string v1, "FirebaseApp initialization successful"
 
-    goto :goto_0
+    invoke-static {v0, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    :goto_1
+    :goto_0
     const/4 v0, 0x0
 
     return v0
diff --git a/com.discord/smali_classes2/com/google/firebase/remoteconfig/R.smali b/com.discord/smali_classes2/com/google/firebase/remoteconfig/R.smali
index dcf58a11f1..1c472827d0 100644
--- a/com.discord/smali_classes2/com/google/firebase/remoteconfig/R.smali
+++ b/com.discord/smali_classes2/com/google/firebase/remoteconfig/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/firebase/remoteconfig/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/firebase/remoteconfig/a.smali b/com.discord/smali_classes2/com/google/firebase/remoteconfig/a.smali
index 691c70acc9..e0d854b407 100644
--- a/com.discord/smali_classes2/com/google/firebase/remoteconfig/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/remoteconfig/a.smali
@@ -118,10 +118,10 @@
     return-void
 .end method
 
-.method public static CH()Lcom/google/firebase/remoteconfig/a;
+.method public static CG()Lcom/google/firebase/remoteconfig/a;
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/b;->BC()Lcom/google/firebase/b;
+    invoke-static {}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/b;
 
     move-result-object v0
 
@@ -446,6 +446,8 @@
     :cond_6
     :goto_7
     throw v0
+
+    return-void
 .end method
 
 .method private static aB(Landroid/content/Context;)Lcom/google/firebase/abt/a;
@@ -711,6 +713,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p0
+
+    return-void
 .end method
 
 .method private static f(Ljava/lang/Runnable;)V
@@ -725,7 +729,7 @@
 
 
 # virtual methods
-.method public final CI()Lcom/google/firebase/remoteconfig/e;
+.method public final CH()Lcom/google/firebase/remoteconfig/e;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/internal/config/m;
@@ -850,7 +854,7 @@
 
     iget-object v0, p0, Lcom/google/firebase/remoteconfig/a;->bCe:Lcom/google/firebase/b;
 
-    invoke-virtual {v0}, Lcom/google/firebase/b;->BB()Lcom/google/firebase/d;
+    invoke-virtual {v0}, Lcom/google/firebase/b;->BA()Lcom/google/firebase/d;
 
     move-result-object v0
 
@@ -915,8 +919,6 @@
 
     iget-wide v8, v0, Lcom/google/android/gms/internal/config/l;->aIO:J
 
-    const/4 v0, 0x0
-
     sub-long/2addr v6, v8
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
@@ -962,8 +964,6 @@
 
     iget-wide v6, v0, Lcom/google/android/gms/internal/config/l;->aIO:J
 
-    const/4 v0, 0x0
-
     sub-long/2addr v4, v6
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
@@ -1116,7 +1116,7 @@
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/tasks/h;->e(Ljava/lang/Exception;)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/remoteconfig/a;->lL()V
+    invoke-virtual {p0}, Lcom/google/firebase/remoteconfig/a;->lK()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1164,7 +1164,6 @@
 
     if-nez v0, :cond_0
 
-    :goto_0
     iget-object p1, p0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
 
     invoke-interface {p1}, Ljava/util/concurrent/locks/ReadWriteLock;->writeLock()Ljava/util/concurrent/locks/Lock;
@@ -1188,14 +1187,25 @@
     iget-object v0, p0, Lcom/google/firebase/remoteconfig/a;->bCc:Lcom/google/android/gms/internal/config/l;
 
     iget-wide v4, v0, Lcom/google/android/gms/internal/config/l;->aIO:J
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     cmp-long v0, v2, v4
 
     if-gtz v0, :cond_1
 
-    goto :goto_0
+    iget-object p1, p0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
+
+    invoke-interface {p1}, Ljava/util/concurrent/locks/ReadWriteLock;->writeLock()Ljava/util/concurrent/locks/Lock;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Ljava/util/concurrent/locks/Lock;->unlock()V
+
+    return v1
 
     :cond_1
+    :try_start_2
     iget-object v0, p0, Lcom/google/firebase/remoteconfig/a;->bCc:Lcom/google/android/gms/internal/config/l;
 
     const/4 v2, 0x0
@@ -1217,7 +1227,7 @@
 
     if-nez v3, :cond_3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     iget-object v0, v0, Lcom/google/android/gms/internal/config/l;->aIN:Ljava/util/Map;
@@ -1229,13 +1239,24 @@
     move-object v2, v0
 
     check-cast v2, Ljava/util/Map;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    :goto_1
+    :goto_0
     if-nez v2, :cond_4
 
-    goto :goto_0
+    iget-object p1, p0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
+
+    invoke-interface {p1}, Ljava/util/concurrent/locks/ReadWriteLock;->writeLock()Ljava/util/concurrent/locks/Lock;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Ljava/util/concurrent/locks/Lock;->unlock()V
+
+    return v1
 
     :cond_4
+    :try_start_3
     iget-object v0, p0, Lcom/google/firebase/remoteconfig/a;->bCc:Lcom/google/android/gms/internal/config/l;
 
     iget-object v1, v0, Lcom/google/android/gms/internal/config/l;->aIN:Ljava/util/Map;
@@ -1253,9 +1274,9 @@
 
     invoke-interface {v0, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/firebase/remoteconfig/a;->lL()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    invoke-virtual {p0}, Lcom/google/firebase/remoteconfig/a;->lK()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     iget-object p1, p0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
 
@@ -1321,7 +1342,6 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :goto_0
     iget-object p1, p0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
 
     invoke-interface {p1}, Ljava/util/concurrent/locks/ReadWriteLock;->readLock()Ljava/util/concurrent/locks/Lock;
@@ -1360,7 +1380,15 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_0
+    iget-object p1, p0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
+
+    invoke-interface {p1}, Ljava/util/concurrent/locks/ReadWriteLock;->readLock()Ljava/util/concurrent/locks/Lock;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Ljava/util/concurrent/locks/Lock;->unlock()V
+
+    return-object v0
 
     :cond_1
     const-string p1, ""
@@ -1389,7 +1417,7 @@
     throw p1
 .end method
 
-.method final lL()V
+.method final lK()V
     .locals 7
 
     iget-object v0, p0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
diff --git a/com.discord/smali_classes2/com/google/firebase/remoteconfig/e.smali b/com.discord/smali_classes2/com/google/firebase/remoteconfig/e.smali
index d6678a93be..21773a9c0f 100644
--- a/com.discord/smali_classes2/com/google/firebase/remoteconfig/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/remoteconfig/e.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract pD()I
+.method public abstract pC()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/remoteconfig/g.smali b/com.discord/smali_classes2/com/google/firebase/remoteconfig/g.smali
index b32e538093..2e8ec43ad4 100644
--- a/com.discord/smali_classes2/com/google/firebase/remoteconfig/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/remoteconfig/g.smali
@@ -54,16 +54,16 @@
 
     if-eqz p1, :cond_9
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v3
 
     if-nez v3, :cond_0
 
-    goto/16 :goto_8
+    goto/16 :goto_6
 
     :cond_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v3
 
@@ -92,11 +92,11 @@
     packed-switch v3, :pswitch_data_1
 
     :try_start_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->kE()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->kD()Z
 
     move-result v2
 
@@ -123,29 +123,30 @@
     invoke-static {v2, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object p1
 
-    :goto_0
     invoke-virtual {v0, v1, p1}, Lcom/google/firebase/remoteconfig/a;->a(Lcom/google/android/gms/tasks/h;Lcom/google/android/gms/common/api/Status;)V
 
-    goto/16 :goto_6
+    goto/16 :goto_4
 
     :catchall_0
     move-exception p1
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :pswitch_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kZ()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->kY()Lcom/google/android/gms/common/api/Status;
 
     move-result-object p1
 
-    goto :goto_0
+    invoke-virtual {v0, v1, p1}, Lcom/google/firebase/remoteconfig/a;->a(Lcom/google/android/gms/tasks/h;Lcom/google/android/gms/common/api/Status;)V
+
+    goto/16 :goto_4
 
     :pswitch_1
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->mw()Ljava/util/Map;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->mv()Ljava/util/Map;
 
     move-result-object v3
 
@@ -161,7 +162,7 @@
 
     move-result-object v6
 
-    :goto_1
+    :goto_0
     invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v7
@@ -188,7 +189,7 @@
 
     move-result-object v9
 
-    :goto_2
+    :goto_1
     invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v10
@@ -207,12 +208,12 @@
 
     invoke-interface {v8, v10, v11}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-interface {v4, v7, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     new-instance v3, Lcom/google/android/gms/internal/config/l;
@@ -221,7 +222,7 @@
 
     move-result-wide v6
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->pT()Ljava/util/List;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->pS()Ljava/util/List;
 
     move-result-object p1
 
@@ -235,10 +236,9 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/h;->k(Ljava/lang/Object;)V
 
-    :goto_3
-    invoke-virtual {v0}, Lcom/google/firebase/remoteconfig/a;->lL()V
+    invoke-virtual {v0}, Lcom/google/firebase/remoteconfig/a;->lK()V
 
-    goto/16 :goto_6
+    goto/16 :goto_4
 
     :cond_4
     :pswitch_2
@@ -250,7 +250,7 @@
 
     new-instance v2, Lcom/google/firebase/remoteconfig/d;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->pS()J
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->pR()J
 
     move-result-wide v3
 
@@ -258,7 +258,9 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/h;->e(Ljava/lang/Exception;)V
 
-    goto :goto_3
+    invoke-virtual {v0}, Lcom/google/firebase/remoteconfig/a;->lK()V
+
+    goto :goto_4
 
     :cond_5
     :pswitch_3
@@ -272,13 +274,13 @@
 
     iget-object v3, v0, Lcom/google/firebase/remoteconfig/a;->bCb:Lcom/google/android/gms/internal/config/l;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/config/l;->lQ()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/config/l;->lP()Z
 
     move-result v3
 
     if-nez v3, :cond_8
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->mw()Ljava/util/Map;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->mv()Ljava/util/Map;
 
     move-result-object v3
 
@@ -294,7 +296,7 @@
 
     move-result-object v5
 
-    :goto_4
+    :goto_2
     invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v6
@@ -321,7 +323,7 @@
 
     move-result-object v8
 
-    :goto_5
+    :goto_3
     invoke-interface {v8}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v9
@@ -340,12 +342,12 @@
 
     invoke-interface {v7, v9, v10}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_6
     invoke-interface {v4, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_7
     new-instance v3, Lcom/google/android/gms/internal/config/l;
@@ -354,7 +356,7 @@
 
     iget-wide v5, v5, Lcom/google/android/gms/internal/config/l;->aIO:J
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->pT()Ljava/util/List;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/config/aq;->pS()Ljava/util/List;
 
     move-result-object p1
 
@@ -364,12 +366,12 @@
 
     :cond_8
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/h;->k(Ljava/lang/Object;)V
+
+    invoke-virtual {v0}, Lcom/google/firebase/remoteconfig/a;->lK()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    goto :goto_3
-
-    :goto_6
+    :goto_4
     iget-object p1, v0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
 
     invoke-interface {p1}, Ljava/util/concurrent/locks/ReadWriteLock;->writeLock()Ljava/util/concurrent/locks/Lock;
@@ -380,7 +382,7 @@
 
     return-void
 
-    :goto_7
+    :goto_5
     iget-object v0, v0, Lcom/google/firebase/remoteconfig/a;->bCf:Ljava/util/concurrent/locks/ReadWriteLock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/ReadWriteLock;->writeLock()Ljava/util/concurrent/locks/Lock;
@@ -392,11 +394,13 @@
     throw p1
 
     :cond_9
-    :goto_8
+    :goto_6
     invoke-virtual {v0, v1, v2}, Lcom/google/firebase/remoteconfig/a;->a(Lcom/google/android/gms/tasks/h;Lcom/google/android/gms/common/api/Status;)V
 
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch -0x196a
         :pswitch_3
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 0615249bfb..2baf94af28 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/Gson$1;
 .super Lcom/google/gson/TypeAdapter;
+.source "Gson.java"
 
 
 # annotations
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 7a55fb7d58..6406b05e91 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/Gson$2;
 .super Lcom/google/gson/TypeAdapter;
+.source "Gson.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/Gson$3.smali b/com.discord/smali_classes2/com/google/gson/Gson$3.smali
index f37211bbaf..f467908d3e 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/Gson$3;
 .super Lcom/google/gson/TypeAdapter;
+.source "Gson.java"
 
 
 # annotations
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 c0ca530310..694ed03060 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/Gson$4;
 .super Lcom/google/gson/TypeAdapter;
+.source "Gson.java"
 
 
 # annotations
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 eb7c6e4a6a..6841fa9263 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$5.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/Gson$5;
 .super Lcom/google/gson/TypeAdapter;
+.source "Gson.java"
 
 
 # annotations
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 ff389cc343..626f6e4566 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/Gson$a;
 .super Lcom/google/gson/TypeAdapter;
+.source "Gson.java"
 
 
 # annotations
@@ -65,8 +66,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/Gson$a;->bCE:Lcom/google/gson/TypeAdapter;
-
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
     move-result-object p1
@@ -101,8 +100,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/Gson$a;->bCE:Lcom/google/gson/TypeAdapter;
-
     invoke-virtual {v0, p1, p2}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
     return-void
diff --git a/com.discord/smali_classes2/com/google/gson/Gson.smali b/com.discord/smali_classes2/com/google/gson/Gson.smali
index 6d3b316b5d..52bc2cb53f 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/Gson;
 .super Ljava/lang/Object;
+.source "Gson.java"
 
 
 # annotations
@@ -1136,6 +1137,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;
@@ -1304,6 +1307,8 @@
 
     :cond_8
     throw v2
+
+    return-void
 .end method
 
 .method public final a(Ljava/io/Reader;)Lcom/google/gson/stream/JsonReader;
diff --git a/com.discord/smali_classes2/com/google/gson/JsonElement.smali b/com.discord/smali_classes2/com/google/gson/JsonElement.smali
index 9091e4ff0c..a97109715c 100644
--- a/com.discord/smali_classes2/com/google/gson/JsonElement.smali
+++ b/com.discord/smali_classes2/com/google/gson/JsonElement.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/gson/JsonElement;
 .super Ljava/lang/Object;
+.source "JsonElement.java"
 
 
 # direct methods
@@ -13,7 +14,7 @@
 
 
 # virtual methods
-.method public CN()Ljava/lang/Number;
+.method public CM()Ljava/lang/Number;
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -31,7 +32,7 @@
     throw v0
 .end method
 
-.method public CO()Ljava/lang/String;
+.method public CN()Ljava/lang/String;
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -49,7 +50,7 @@
     throw v0
 .end method
 
-.method public final CQ()Lcom/google/gson/m;
+.method public final CP()Lcom/google/gson/m;
     .locals 3
 
     instance-of v0, p0, Lcom/google/gson/m;
diff --git a/com.discord/smali_classes2/com/google/gson/JsonObject.smali b/com.discord/smali_classes2/com/google/gson/JsonObject.smali
index 85469a612c..01d99c3a71 100644
--- a/com.discord/smali_classes2/com/google/gson/JsonObject.smali
+++ b/com.discord/smali_classes2/com/google/gson/JsonObject.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/JsonObject;
 .super Lcom/google/gson/JsonElement;
+.source "JsonObject.java"
 
 
 # instance fields
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 4361674dfd..b1c66ae67b 100644
--- a/com.discord/smali_classes2/com/google/gson/TypeAdapter$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/TypeAdapter$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/TypeAdapter$1;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali b/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali
index 2e4b288d9e..2c4db1ffd1 100644
--- a/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali
+++ b/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/gson/TypeAdapter;
 .super Ljava/lang/Object;
+.source "TypeAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/a.smali b/com.discord/smali_classes2/com/google/gson/a.smali
index 882b6108cc..d5d25ff7cd 100644
--- a/com.discord/smali_classes2/com/google/gson/a.smali
+++ b/com.discord/smali_classes2/com/google/gson/a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/a;
 .super Lcom/google/gson/TypeAdapter;
+.source "DefaultDateTypeAdapter.java"
 
 
 # annotations
@@ -183,7 +184,7 @@
 
     invoke-virtual {v1, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
-    move-result-object v1
+    move-result-object p1
     :try_end_0
     .catch Ljava/text/ParseException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -193,7 +194,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    return-object v1
+    return-object p1
 
     :catchall_0
     move-exception p1
@@ -206,7 +207,7 @@
 
     invoke-virtual {v1, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
-    move-result-object v1
+    move-result-object p1
     :try_end_2
     .catch Ljava/text/ParseException; {:try_start_2 .. :try_end_2} :catch_1
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
@@ -216,7 +217,7 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    return-object v1
+    return-object p1
 
     :catch_1
     :try_start_4
@@ -228,7 +229,7 @@
 
     invoke-static {p1, v1}, Lcom/google/gson/b/a/a/a;->parse(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
 
-    move-result-object v1
+    move-result-object p1
     :try_end_4
     .catch Ljava/text/ParseException; {:try_start_4 .. :try_end_4} :catch_2
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
@@ -236,7 +237,7 @@
     :try_start_5
     monitor-exit v0
 
-    return-object v1
+    return-object p1
 
     :catch_2
     move-exception v1
@@ -297,8 +298,6 @@
     return-object p1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/gson/a;->bCj:Ljava/lang/Class;
-
     const-class v1, Ljava/sql/Timestamp;
 
     if-ne v0, v1, :cond_2
@@ -314,8 +313,6 @@
     return-object v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/gson/a;->bCj:Ljava/lang/Class;
-
     const-class v1, Ljava/sql/Date;
 
     if-ne v0, v1, :cond_3
diff --git a/com.discord/smali_classes2/com/google/gson/b.smali b/com.discord/smali_classes2/com/google/gson/b.smali
index bb5c7c8079..e31468ef91 100644
--- a/com.discord/smali_classes2/com/google/gson/b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b.smali
@@ -1,12 +1,13 @@
 .class public interface abstract Lcom/google/gson/b;
 .super Ljava/lang/Object;
+.source "ExclusionStrategy.java"
 
 
 # virtual methods
-.method public abstract CJ()Z
+.method public abstract CI()Z
 .end method
 
-.method public abstract CK()Z
+.method public abstract CJ()Z
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()Z"
diff --git a/com.discord/smali_classes2/com/google/gson/b/a.smali b/com.discord/smali_classes2/com/google/gson/b/a.smali
index ebec28088c..7eefe6f8b6 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a;
 .super Ljava/lang/Object;
+.source "$Gson$Preconditions.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/a$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/a$1.smali
index 1bab986900..975e63b250 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/a$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/a$1;
 .super Ljava/lang/Object;
+.source "ArrayTypeAdapter.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/a.smali b/com.discord/smali_classes2/com/google/gson/b/a/a.smali
index 386226a439..826e729a17 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/a;
 .super Lcom/google/gson/TypeAdapter;
+.source "ArrayTypeAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/a/a.smali b/com.discord/smali_classes2/com/google/gson/b/a/a/a.smali
index 384f3e0026..58635c8f97 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/a/a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/a/a;
 .super Ljava/lang/Object;
+.source "ISO8601Utils.java"
 
 
 # static fields
@@ -171,6 +172,8 @@
     invoke-direct {p1, p0}, Ljava/lang/NumberFormatException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private static j(Ljava/lang/String;I)I
@@ -304,7 +307,7 @@
 
     const/16 v10, 0x5a
 
-    if-eqz v7, :cond_7
+    if-eqz v7, :cond_8
 
     add-int/lit8 v6, v6, 0x1
 
@@ -344,17 +347,17 @@
 
     move-result v12
 
-    if-le v12, v13, :cond_8
+    if-le v12, v13, :cond_7
 
     invoke-virtual {v1, v13}, Ljava/lang/String;->charAt(I)C
 
     move-result v12
 
-    if-eq v12, v10, :cond_8
+    if-eq v12, v10, :cond_7
 
-    if-eq v12, v9, :cond_8
+    if-eq v12, v9, :cond_7
 
-    if-eq v12, v4, :cond_8
+    if-eq v12, v4, :cond_7
 
     add-int/lit8 v12, v13, 0x2
 
@@ -429,13 +432,19 @@
     goto :goto_2
 
     :cond_7
+    const/4 v12, 0x0
+
+    const/4 v14, 0x0
+
+    goto :goto_2
+
+    :cond_8
     move v13, v6
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    :cond_8
     const/4 v12, 0x0
 
     const/4 v14, 0x0
@@ -679,18 +688,29 @@
 
     throw v0
     :try_end_0
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
     move-exception v0
 
+    goto :goto_8
+
+    :catch_1
+    move-exception v0
+
+    goto :goto_8
+
+    :catch_2
+    move-exception v0
+
+    :goto_8
     if-nez v1, :cond_12
 
     const/4 v1, 0x0
 
-    goto :goto_8
+    goto :goto_9
 
     :cond_12
     new-instance v3, Ljava/lang/StringBuilder;
@@ -709,7 +729,7 @@
 
     move-result-object v1
 
-    :goto_8
+    :goto_9
     invoke-virtual {v0}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
     move-result-object v3
@@ -778,6 +798,8 @@
 
     throw v4
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_1
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/b$a.smali b/com.discord/smali_classes2/com/google/gson/b/a/b$a.smali
index a618fed0cc..a2c3c3c953 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/b$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/b$a;
 .super Lcom/google/gson/TypeAdapter;
+.source "CollectionTypeAdapterFactory.java"
 
 
 # annotations
@@ -103,7 +104,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/gson/b/a/b$a;->bDL:Lcom/google/gson/b/h;
 
-    invoke-interface {v0}, Lcom/google/gson/b/h;->CW()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/b/h;->CV()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/b.smali b/com.discord/smali_classes2/com/google/gson/b/a/b.smali
index 76d38700e0..c90bef51ba 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/b;
 .super Ljava/lang/Object;
+.source "CollectionTypeAdapterFactory.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/c$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/c$1.smali
index b09625b8c9..b0e08800b8 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/c$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/c$1;
 .super Ljava/lang/Object;
+.source "DateTypeAdapter.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/c.smali b/com.discord/smali_classes2/com/google/gson/b/a/c.smali
index afcb2eb489..296bfafdce 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/c.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/c;
 .super Lcom/google/gson/TypeAdapter;
+.source "DateTypeAdapter.java"
 
 
 # annotations
@@ -80,11 +81,6 @@
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_0
     :try_start_1
     iget-object v0, p0, Lcom/google/gson/b/a/c;->bCk:Ljava/text/DateFormat;
@@ -101,7 +97,9 @@
 
     return-void
 
-    :goto_0
+    :catchall_0
+    move-exception p1
+
     monitor-exit p0
 
     throw p1
@@ -117,14 +115,14 @@
 
     invoke-virtual {v0, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/text/ParseException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     monitor-exit p0
 
-    return-object v0
+    return-object p1
 
     :catchall_0
     move-exception p1
@@ -137,14 +135,14 @@
 
     invoke-virtual {v0, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_1
     .catch Ljava/text/ParseException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     monitor-exit p0
 
-    return-object v0
+    return-object p1
 
     :catch_1
     :try_start_2
@@ -156,14 +154,14 @@
 
     invoke-static {p1, v0}, Lcom/google/gson/b/a/a/a;->parse(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_2
     .catch Ljava/text/ParseException; {:try_start_2 .. :try_end_2} :catch_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     monitor-exit p0
 
-    return-object v0
+    return-object p1
 
     :catch_2
     move-exception v0
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/d.smali b/com.discord/smali_classes2/com/google/gson/b/a/d.smali
index 1cef34c5a4..7c52f5879d 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/d;
 .super Ljava/lang/Object;
+.source "JsonAdapterAnnotationTypeAdapterFactory.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
@@ -48,7 +49,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/gson/b/h;->CW()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/gson/b/h;->CV()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -169,7 +170,7 @@
     :goto_2
     if-eqz p0, :cond_6
 
-    invoke-interface {p3}, Lcom/google/gson/a/b;->CT()Z
+    invoke-interface {p3}, Lcom/google/gson/a/b;->CS()Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/e$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/e$1.smali
index ebc598196f..d37911c00c 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/e$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/e$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/e$1;
 .super Ljava/io/Reader;
+.source "JsonTreeReader.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/e.smali b/com.discord/smali_classes2/com/google/gson/b/a/e.smali
index 73f676588d..3cae59f4f3 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/e.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/e;
 .super Lcom/google/gson/stream/JsonReader;
+.source "JsonTreeReader.java"
 
 
 # static fields
@@ -67,7 +68,7 @@
     return-void
 .end method
 
-.method private Dc()Ljava/lang/Object;
+.method private Db()Ljava/lang/Object;
     .locals 4
 
     iget-object v0, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
@@ -78,17 +79,15 @@
 
     iput v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
-    aget-object v0, v0, v1
-
-    iget-object v1, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
+    aget-object v1, v0, v1
 
     iget v2, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     const/4 v3, 0x0
 
-    aput-object v3, v1, v2
+    aput-object v3, v0, v2
 
-    return-object v0
+    return-object v1
 .end method
 
 .method private locationString()Ljava/lang/String;
@@ -115,7 +114,7 @@
 
 
 # virtual methods
-.method public final Db()Ljava/lang/Object;
+.method public final Da()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
@@ -193,7 +192,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -230,7 +229,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -288,25 +287,23 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
-
-    aget v2, v0, v1
+    aget v2, v1, v0
 
     add-int/lit8 v2, v2, 0x1
 
-    aput v2, v0, v1
+    aput v2, v1, v0
 
     :cond_0
     return-void
@@ -324,32 +321,30 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
-
-    aget v2, v0, v1
+    aget v2, v1, v0
 
     add-int/lit8 v2, v2, 0x1
 
-    aput v2, v0, v1
+    aput v2, v1, v0
 
     :cond_0
     return-void
 .end method
 
 .method public final getPath()Ljava/lang/String;
-    .locals 3
+    .locals 4
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -366,13 +361,11 @@
 
     iget-object v2, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    instance-of v2, v2, Lcom/google/gson/h;
+    instance-of v3, v3, Lcom/google/gson/h;
 
-    if-eqz v2, :cond_0
-
-    iget-object v2, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
+    if-eqz v3, :cond_0
 
     add-int/lit8 v1, v1, 0x1
 
@@ -399,15 +392,11 @@
     goto :goto_1
 
     :cond_0
-    iget-object v2, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
+    aget-object v3, v2, v1
 
-    aget-object v2, v2, v1
+    instance-of v3, v3, Lcom/google/gson/JsonObject;
 
-    instance-of v2, v2, Lcom/google/gson/JsonObject;
-
-    if-eqz v2, :cond_1
-
-    iget-object v2, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
+    if-eqz v3, :cond_1
 
     add-int/lit8 v1, v1, 0x1
 
@@ -423,11 +412,9 @@
 
     iget-object v2, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
 
-    aget-object v2, v2, v1
+    aget-object v3, v2, v1
 
-    if-eqz v2, :cond_1
-
-    iget-object v2, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
+    if-eqz v3, :cond_1
 
     aget-object v2, v2, v1
 
@@ -489,7 +476,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -503,17 +490,15 @@
 
     if-lez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v2, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v2, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v1, v1, -0x1
 
-    add-int/lit8 v2, v2, -0x1
-
-    aget v3, v1, v2
+    aget v3, v2, v1
 
     add-int/lit8 v3, v3, 0x1
 
-    aput v3, v1, v2
+    aput v3, v2, v1
 
     :cond_0
     return v0
@@ -576,7 +561,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -625,23 +610,21 @@
 
     :cond_3
     :goto_1
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     if-lez v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v3, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v3, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v2, v2, -0x1
 
-    add-int/lit8 v3, v3, -0x1
-
-    aget v4, v2, v3
+    aget v4, v3, v2
 
     add-int/lit8 v4, v4, 0x1
 
-    aput v4, v2, v3
+    aput v4, v3, v2
 
     :cond_4
     return-wide v0
@@ -704,7 +687,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -714,23 +697,21 @@
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     if-lez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v2, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v2, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v1, v1, -0x1
 
-    add-int/lit8 v2, v2, -0x1
-
-    aget v3, v1, v2
+    aget v3, v2, v1
 
     add-int/lit8 v3, v3, 0x1
 
-    aput v3, v1, v2
+    aput v3, v2, v1
 
     :cond_2
     return v0
@@ -793,7 +774,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -803,23 +784,21 @@
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     if-lez v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v3, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v3, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v2, v2, -0x1
 
-    add-int/lit8 v3, v3, -0x1
-
-    aget v4, v2, v3
+    aget v4, v3, v2
 
     add-int/lit8 v4, v4, 0x1
 
-    aput v4, v2, v3
+    aput v4, v3, v2
 
     :cond_2
     return-wide v0
@@ -837,7 +816,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -884,23 +863,21 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
-
-    aget v2, v0, v1
+    aget v2, v1, v0
 
     add-int/lit8 v2, v2, 0x1
 
-    aput v2, v0, v1
+    aput v2, v1, v0
 
     :cond_0
     return-void
@@ -963,13 +940,13 @@
 
     :cond_1
     :goto_0
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->CO()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/m;->CN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -977,17 +954,15 @@
 
     if-lez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v2, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v2, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v1, v1, -0x1
 
-    add-int/lit8 v2, v2, -0x1
-
-    aget v3, v1, v2
+    aget v3, v2, v1
 
     add-int/lit8 v3, v3, 0x1
 
-    aput v3, v1, v2
+    aput v3, v2, v1
 
     :cond_2
     return-object v0
@@ -1011,7 +986,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1156,6 +1131,8 @@
     invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final push(Ljava/lang/Object;)V
@@ -1165,53 +1142,43 @@
 
     iget-object v1, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ne v0, v1, :cond_0
+    if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    mul-int/lit8 v2, v0, 0x2
 
-    mul-int/lit8 v0, v0, 0x2
+    new-array v2, v2, [Ljava/lang/Object;
 
-    new-array v0, v0, [Ljava/lang/Object;
+    mul-int/lit8 v3, v0, 0x2
 
-    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    new-array v3, v3, [I
 
-    mul-int/lit8 v1, v1, 0x2
+    mul-int/lit8 v4, v0, 0x2
 
-    new-array v1, v1, [I
-
-    iget v2, p0, Lcom/google/gson/b/a/e;->stackSize:I
-
-    mul-int/lit8 v2, v2, 0x2
-
-    new-array v2, v2, [Ljava/lang/String;
-
-    iget-object v3, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
-
-    iget v4, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    new-array v4, v4, [Ljava/lang/String;
 
     const/4 v5, 0x0
 
-    invoke-static {v3, v5, v0, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v5, v2, v5, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v3, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v0, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v4, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
-    invoke-static {v3, v5, v1, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v5, v3, v5, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v3, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
 
-    iget v4, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
-    invoke-static {v3, v5, v2, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v5, v4, v5, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
+    iput-object v2, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
 
-    iput-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iput-object v3, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iput-object v2, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
+    iput-object v4, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
 
     :cond_0
     iget-object v0, p0, Lcom/google/gson/b/a/e;->bDO:[Ljava/lang/Object;
@@ -1258,21 +1225,19 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Dc()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/b/a/e;->stackSize:I
 
     if-lez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathNames:[Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
-
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v0, v0, -0x1
 
     const-string v2, "null"
 
-    aput-object v2, v0, v1
+    aput-object v2, v1, v0
 
     :cond_1
     :goto_0
@@ -1280,17 +1245,15 @@
 
     if-lez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
+    iget-object v1, p0, Lcom/google/gson/b/a/e;->pathIndices:[I
 
-    iget v1, p0, Lcom/google/gson/b/a/e;->stackSize:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
-
-    aget v2, v0, v1
+    aget v2, v1, v0
 
     add-int/lit8 v2, v2, 0x1
 
-    aput v2, v0, v1
+    aput v2, v1, v0
 
     :cond_2
     return-void
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/f$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/f$1.smali
index 1d96f284db..3a91129e0f 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/f$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/f$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/f$1;
 .super Ljava/io/Writer;
+.source "JsonTreeWriter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/f.smali b/com.discord/smali_classes2/com/google/gson/b/a/f.smali
index 8a1f80a99d..74a0f408ad 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/f.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/f;
 .super Lcom/google/gson/stream/JsonWriter;
+.source "JsonTreeWriter.java"
 
 
 # static fields
@@ -65,14 +66,12 @@
     return-void
 .end method
 
-.method private Dd()Lcom/google/gson/JsonElement;
+.method private Dc()Lcom/google/gson/JsonElement;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/b/a/f;->bDR:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/gson/b/a/f;->bDR:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -105,7 +104,7 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dd()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dc()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -136,7 +135,7 @@
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dd()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dc()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -256,7 +255,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dd()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dc()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -266,9 +265,7 @@
 
     iget-object v0, p0, Lcom/google/gson/b/a/f;->bDR:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/gson/b/a/f;->bDR:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -313,7 +310,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dd()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dc()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -323,9 +320,7 @@
 
     iget-object v0, p0, Lcom/google/gson/b/a/f;->bDR:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/gson/b/a/f;->bDR:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
+    invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v1
 
@@ -381,7 +376,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dd()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/b/a/f;->Dc()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/g$a.smali b/com.discord/smali_classes2/com/google/gson/b/a/g$a.smali
index d0f45e725b..804e80ef7d 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/g$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/g$a;
 .super Lcom/google/gson/TypeAdapter;
+.source "MapTypeAdapterFactory.java"
 
 
 # annotations
@@ -127,7 +128,7 @@
     :cond_0
     iget-object v1, p0, Lcom/google/gson/b/a/g$a;->bDL:Lcom/google/gson/b/h;
 
-    invoke-interface {v1}, Lcom/google/gson/b/h;->CW()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/gson/b/h;->CV()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -466,7 +467,7 @@
 
     if-eqz v4, :cond_b
 
-    invoke-virtual {v3}, Lcom/google/gson/JsonElement;->CQ()Lcom/google/gson/m;
+    invoke-virtual {v3}, Lcom/google/gson/JsonElement;->CP()Lcom/google/gson/m;
 
     move-result-object v3
 
@@ -476,7 +477,7 @@
 
     if-eqz v4, :cond_8
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {v3}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v3
 
@@ -510,7 +511,7 @@
 
     if-eqz v4, :cond_a
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->CO()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/gson/m;->CN()Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/g.smali b/com.discord/smali_classes2/com/google/gson/b/a/g.smali
index af0e1ac9b3..6a6d91ccb1 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/g.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/g;
 .super Ljava/lang/Object;
+.source "MapTypeAdapterFactory.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
@@ -97,15 +98,17 @@
 
     move-result-object v2
 
+    move-object v7, v2
+
     goto :goto_1
 
     :cond_2
     :goto_0
     sget-object v2, Lcom/google/gson/b/a/n;->bEy:Lcom/google/gson/TypeAdapter;
 
-    :goto_1
     move-object v7, v2
 
+    :goto_1
     const/4 v2, 0x1
 
     aget-object v3, v0, v2
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/h$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/h$1.smali
index 80dc9666fc..d3bc0823ab 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/h$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/h$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/h$1;
 .super Ljava/lang/Object;
+.source "ObjectTypeAdapter.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/h$2.smali b/com.discord/smali_classes2/com/google/gson/b/a/h$2.smali
index f7c2097f2e..39afbfce4c 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/h$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/h$2.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/google/gson/b/a/h$2;
 .super Ljava/lang/Object;
+.source "ObjectTypeAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/h.smali b/com.discord/smali_classes2/com/google/gson/b/a/h.smali
index 495aef000b..2f6fc27a2d 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/h.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/h;
 .super Lcom/google/gson/TypeAdapter;
+.source "ObjectTypeAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/i$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/i$1.smali
index 45944e153b..963b351722 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/i$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/i$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/i$1;
 .super Lcom/google/gson/b/a/i$b;
+.source "ReflectiveTypeAdapterFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/i$a.smali b/com.discord/smali_classes2/com/google/gson/b/a/i$a.smali
index d21df88372..019c23e603 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/i$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/i$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/i$a;
 .super Lcom/google/gson/TypeAdapter;
+.source "ReflectiveTypeAdapterFactory.java"
 
 
 # annotations
@@ -104,7 +105,7 @@
     :cond_0
     iget-object v0, p0, Lcom/google/gson/b/a/i$a;->bDL:Lcom/google/gson/b/h;
 
-    invoke-interface {v0}, Lcom/google/gson/b/h;->CW()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/b/h;->CV()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -174,6 +175,8 @@
     invoke-direct {v0, p1}, Lcom/google/gson/p;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
@@ -255,4 +258,6 @@
     invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw p2
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/i$b.smali b/com.discord/smali_classes2/com/google/gson/b/a/i$b.smali
index 2e6ac4f096..5739cb588e 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/i$b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/i$b.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/gson/b/a/i$b;
 .super Ljava/lang/Object;
+.source "ReflectiveTypeAdapterFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/i.smali b/com.discord/smali_classes2/com/google/gson/b/a/i.smali
index cd8ac2cd0b..61bbc6e033 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/i.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/i;
 .super Ljava/lang/Object;
+.source "ReflectiveTypeAdapterFactory.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
@@ -42,7 +43,7 @@
 .end method
 
 .method private a(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;Ljava/lang/Class;)Ljava/util/Map;
-    .locals 32
+    .locals 31
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -120,17 +121,17 @@
     goto :goto_2
 
     :cond_1
-    move/from16 v30, v6
+    move/from16 v28, v6
 
-    move/from16 v25, v8
+    move/from16 v23, v8
 
-    move-object/from16 v22, v9
+    move-object/from16 v29, v9
 
-    move-object/from16 v31, v10
+    move-object/from16 v30, v10
 
-    move-object/from16 v21, v15
+    move-object/from16 p2, v15
 
-    const/16 v24, 0x0
+    const/16 v22, 0x0
 
     goto/16 :goto_8
 
@@ -171,7 +172,7 @@
 
     move-result-object v20
 
-    move-object/from16 v21, v15
+    move-object/from16 p2, v15
 
     move-object/from16 v15, v20
 
@@ -179,14 +180,14 @@
 
     if-eqz v1, :cond_3
 
-    move-object/from16 v22, v9
+    move-object/from16 p3, v9
 
     const/16 v19, 0x0
 
     goto :goto_4
 
     :cond_3
-    move-object/from16 v22, v9
+    move-object/from16 p3, v9
 
     :goto_4
     invoke-static/range {v17 .. v17}, Lcom/google/gson/reflect/TypeToken;->h(Ljava/lang/reflect/Type;)Lcom/google/gson/reflect/TypeToken;
@@ -197,7 +198,7 @@
 
     invoke-static {v4}, Lcom/google/gson/b/i;->g(Ljava/lang/reflect/Type;)Z
 
-    move-result v20
+    move-result v21
 
     const-class v4, Lcom/google/gson/a/b;
 
@@ -238,7 +239,7 @@
     move-result-object v4
 
     :cond_6
-    move-object/from16 v25, v4
+    move-object/from16 v23, v4
 
     new-instance v4, Lcom/google/gson/b/a/i$1;
 
@@ -246,41 +247,43 @@
 
     move-object v0, v4
 
-    move/from16 v26, v1
+    move/from16 v24, v1
 
     move-object/from16 v1, p0
 
-    move/from16 v27, v2
+    move/from16 v25, v2
 
     move-object v2, v15
 
-    move-object/from16 v28, v3
+    move-object/from16 v26, v3
 
     move/from16 v3, v19
 
     move-object v12, v4
 
-    const/16 v23, 0x1
+    const/16 v20, 0x1
 
     move/from16 v4, v16
 
-    move-object/from16 v29, v5
+    move-object/from16 v27, v5
 
-    move/from16 v30, v6
+    move/from16 v28, v6
 
     move v6, v7
 
-    const/16 v24, 0x0
+    const/16 v22, 0x0
 
-    move-object/from16 v7, v25
+    move-object/from16 v7, v23
 
-    move/from16 v25, v8
+    move/from16 v23, v8
 
     move-object/from16 v8, p1
 
-    move-object/from16 v31, v10
+    move-object/from16 v29, p3
 
-    move/from16 v10, v20
+    move-object/from16 v30, v10
+
+    move/from16 v10, v21
 
     invoke-direct/range {v0 .. v10}, Lcom/google/gson/b/a/i$1;-><init>(Lcom/google/gson/b/a/i;Ljava/lang/String;ZZLjava/lang/reflect/Field;ZLcom/google/gson/TypeAdapter;Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;Z)V
 
@@ -298,23 +301,23 @@
     move-object v0, v11
 
     :goto_7
-    add-int/lit8 v1, v26, 0x1
+    add-int/lit8 v1, v24, 0x1
 
-    move-object/from16 v15, v21
+    move-object/from16 v15, p2
 
-    move-object/from16 v9, v22
+    move/from16 v8, v23
 
-    move/from16 v8, v25
+    move/from16 v2, v25
 
-    move/from16 v2, v27
+    move-object/from16 v3, v26
 
-    move-object/from16 v3, v28
+    move-object/from16 v5, v27
 
-    move-object/from16 v5, v29
+    move/from16 v6, v28
 
-    move/from16 v6, v30
+    move-object/from16 v9, v29
 
-    move-object/from16 v10, v31
+    move-object/from16 v10, v30
 
     const/4 v4, 0x1
 
@@ -329,30 +332,30 @@
     :cond_8
     move-object v11, v0
 
-    move/from16 v30, v6
+    move/from16 v28, v6
 
-    move/from16 v25, v8
+    move/from16 v23, v8
 
-    move-object/from16 v22, v9
+    move-object/from16 v29, v9
 
-    move-object/from16 v31, v10
+    move-object/from16 v30, v10
 
-    move-object/from16 v21, v15
+    move-object/from16 p2, v15
 
-    const/16 v24, 0x0
+    const/16 v22, 0x0
 
     if-nez v11, :cond_9
 
     :goto_8
-    add-int/lit8 v6, v30, 0x1
+    add-int/lit8 v6, v28, 0x1
 
-    move-object/from16 v15, v21
+    move-object/from16 v15, p2
 
-    move-object/from16 v9, v22
+    move/from16 v8, v23
 
-    move/from16 v8, v25
+    move-object/from16 v9, v29
 
-    move-object/from16 v10, v31
+    move-object/from16 v10, v30
 
     const/4 v7, 0x0
 
@@ -390,15 +393,15 @@
     :cond_a
     move-object v0, v10
 
-    move-object/from16 v21, v15
+    move-object/from16 p2, v15
 
     iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->bEs:Ljava/lang/reflect/Type;
 
-    invoke-virtual/range {v21 .. v21}, Ljava/lang/Class;->getGenericSuperclass()Ljava/lang/reflect/Type;
+    invoke-virtual/range {p2 .. p2}, Ljava/lang/Class;->getGenericSuperclass()Ljava/lang/reflect/Type;
 
     move-result-object v1
 
-    move-object/from16 v2, v21
+    move-object/from16 v2, p2
 
     invoke-static {v0, v2, v1}, Lcom/google/gson/b/b;->a(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
 
@@ -447,22 +450,20 @@
 
     const/4 v3, 0x1
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_0
 
-    :cond_0
-    :goto_0
     const/4 p1, 0x1
 
-    goto/16 :goto_3
+    goto/16 :goto_2
 
-    :cond_1
+    :cond_0
     iget-wide v4, v0, Lcom/google/gson/b/d;->bDf:D
 
     const-wide/high16 v6, -0x4010000000000000L    # -1.0
 
     cmpl-double v1, v4, v6
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
 
     const-class v1, Lcom/google/gson/a/d;
 
@@ -484,20 +485,24 @@
 
     move-result v1
 
-    if-nez v1, :cond_2
+    if-nez v1, :cond_1
 
-    goto :goto_0
+    const/4 p1, 0x1
 
-    :cond_2
+    goto/16 :goto_2
+
+    :cond_1
     invoke-virtual {p1}, Ljava/lang/reflect/Field;->isSynthetic()Z
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
-    goto :goto_0
+    const/4 p1, 0x1
 
-    :cond_3
+    goto/16 :goto_2
+
+    :cond_2
     iget-boolean v1, v0, Lcom/google/gson/b/d;->bDi:Z
 
     if-eqz v1, :cond_5
@@ -510,27 +515,30 @@
 
     check-cast v1, Lcom/google/gson/a/a;
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_4
 
-    if-eqz p2, :cond_4
+    if-eqz p2, :cond_3
 
+    invoke-interface {v1}, Lcom/google/gson/a/a;->CQ()Z
+
+    move-result v1
+
+    if-nez v1, :cond_5
+
+    goto :goto_0
+
+    :cond_3
     invoke-interface {v1}, Lcom/google/gson/a/a;->CR()Z
 
     move-result v1
 
     if-nez v1, :cond_5
 
-    goto :goto_1
-
     :cond_4
-    invoke-interface {v1}, Lcom/google/gson/a/a;->CS()Z
+    :goto_0
+    const/4 p1, 0x1
 
-    move-result v1
-
-    if-nez v1, :cond_5
-
-    :goto_1
-    goto :goto_0
+    goto :goto_2
 
     :cond_5
     iget-boolean v1, v0, Lcom/google/gson/b/d;->bDh:Z
@@ -547,7 +555,9 @@
 
     if-eqz v1, :cond_6
 
-    goto :goto_0
+    const/4 p1, 0x1
+
+    goto :goto_2
 
     :cond_6
     invoke-virtual {p1}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
@@ -560,19 +570,21 @@
 
     if-eqz v1, :cond_7
 
-    goto :goto_0
+    const/4 p1, 0x1
+
+    goto :goto_2
 
     :cond_7
     if-eqz p2, :cond_8
 
     iget-object p2, v0, Lcom/google/gson/b/d;->bDj:Ljava/util/List;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_8
     iget-object p2, v0, Lcom/google/gson/b/d;->bDk:Ljava/util/List;
 
-    :goto_2
+    :goto_1
     invoke-interface {p2}, Ljava/util/List;->isEmpty()Z
 
     move-result v0
@@ -600,18 +612,20 @@
 
     check-cast p2, Lcom/google/gson/b;
 
-    invoke-interface {p2}, Lcom/google/gson/b;->CJ()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->CI()Z
 
     move-result p2
 
     if-eqz p2, :cond_9
 
-    goto/16 :goto_0
+    const/4 p1, 0x1
+
+    goto :goto_2
 
     :cond_a
     const/4 p1, 0x0
 
-    :goto_3
+    :goto_2
     if-nez p1, :cond_b
 
     return v3
@@ -660,7 +674,7 @@
 
     move-result-object p1
 
-    invoke-interface {v0}, Lcom/google/gson/a/c;->CU()[Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/gson/a/c;->CT()[Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/j$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/j$1.smali
index bf5e2cd8ee..80f62e82ba 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/j$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/j$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/j$1;
 .super Ljava/lang/Object;
+.source "SqlDateTypeAdapter.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/j.smali b/com.discord/smali_classes2/com/google/gson/b/a/j.smali
index a3a657819f..1f9da0da00 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/j.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/j;
 .super Lcom/google/gson/TypeAdapter;
+.source "SqlDateTypeAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/k$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/k$1.smali
index 4644ca0298..1a2a72f51a 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/k$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/k$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/k$1;
 .super Ljava/lang/Object;
+.source "TimeTypeAdapter.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/k.smali b/com.discord/smali_classes2/com/google/gson/b/a/k.smali
index 05c1088b08..81aad75983 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/k.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/k;
 .super Lcom/google/gson/TypeAdapter;
+.source "TimeTypeAdapter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/l$a.smali b/com.discord/smali_classes2/com/google/gson/b/a/l$a.smali
index e6f3e57e86..0b0fc76019 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/l$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/l$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/l$a;
 .super Ljava/lang/Object;
+.source "TreeTypeAdapter.java"
 
 # interfaces
 .implements Lcom/google/gson/n;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/l$b.smali b/com.discord/smali_classes2/com/google/gson/b/a/l$b.smali
index a8286aaa98..2d350a3cf2 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/l$b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/l$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/l$b;
 .super Ljava/lang/Object;
+.source "TreeTypeAdapter.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
@@ -154,8 +155,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/gson/b/a/l$b;->bEo:Lcom/google/gson/reflect/TypeToken;
-
     invoke-virtual {v0, p2}, Lcom/google/gson/reflect/TypeToken;->equals(Ljava/lang/Object;)Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/l.smali b/com.discord/smali_classes2/com/google/gson/b/a/l.smali
index 5965540716..2a204313b6 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/l.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/l.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/l;
 .super Lcom/google/gson/TypeAdapter;
+.source "TreeTypeAdapter.java"
 
 
 # annotations
@@ -113,7 +114,7 @@
     return-void
 .end method
 
-.method private CY()Lcom/google/gson/TypeAdapter;
+.method private CX()Lcom/google/gson/TypeAdapter;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -201,7 +202,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/l;->CY()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/b/a/l;->CX()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -227,7 +228,7 @@
     :cond_1
     iget-object p1, p0, Lcom/google/gson/b/a/l;->bEj:Lcom/google/gson/i;
 
-    invoke-interface {p1}, Lcom/google/gson/i;->CP()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/gson/i;->CO()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -254,7 +255,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/b/a/l;->CY()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/b/a/l;->CX()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -270,8 +271,6 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/gson/b/a/l;->bEi:Lcom/google/gson/o;
-
     iget-object v1, p0, Lcom/google/gson/b/a/l;->bEk:Lcom/google/gson/reflect/TypeToken;
 
     iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->bEs:Ljava/lang/reflect/Type;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/m.smali b/com.discord/smali_classes2/com/google/gson/b/a/m.smali
index 5db0eb6dcc..2514f5d7b3 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/m.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/m.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/m;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapterRuntimeTypeWrapper.java"
 
 
 # annotations
@@ -141,11 +142,11 @@
 
     iget-object v1, p0, Lcom/google/gson/b/a/m;->bCE:Lcom/google/gson/TypeAdapter;
 
-    instance-of v1, v1, Lcom/google/gson/b/a/i$a;
+    instance-of v2, v1, Lcom/google/gson/b/a/i$a;
 
-    if-nez v1, :cond_2
+    if-nez v2, :cond_2
 
-    iget-object v0, p0, Lcom/google/gson/b/a/m;->bCE:Lcom/google/gson/TypeAdapter;
+    move-object v0, v1
 
     :cond_2
     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/b/a/n$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$1.smali
index c346705294..4ec7ee80b9 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$1;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$10.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$10.smali
index eca3cbfe70..efc4856e38 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$10.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$10;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$11.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$11.smali
index 567340b38b..2a6f592a57 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$11.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$11.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$11;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$12.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$12.smali
index 8eb9361643..e202cd360b 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$12.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$12.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$12;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
@@ -55,7 +56,7 @@
     :goto_0
     sget-object v4, Lcom/google/gson/stream/JsonToken;->END_ARRAY:Lcom/google/gson/stream/JsonToken;
 
-    if-eq v1, v4, :cond_2
+    if-eq v1, v4, :cond_3
 
     sget-object v4, Lcom/google/gson/b/a/n$29;->$SwitchMap$com$google$gson$stream$JsonToken:[I
 
@@ -93,11 +94,11 @@
     :try_start_0
     invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
 
-    move-result v4
+    move-result v1
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    if-eqz v4, :cond_0
+    if-eqz v1, :cond_0
 
     goto :goto_1
 
@@ -135,14 +136,19 @@
 
     move-result v1
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v5, 0x0
 
     :goto_1
-    if-eqz v5, :cond_1
+    if-eqz v5, :cond_2
 
     invoke-virtual {v0, v3}, Ljava/util/BitSet;->set(I)V
 
-    :cond_1
+    :cond_2
     add-int/lit8 v3, v3, 0x1
 
     invoke-virtual {p0}, Lcom/google/gson/stream/JsonReader;->peek()Lcom/google/gson/stream/JsonToken;
@@ -151,7 +157,7 @@
 
     goto :goto_0
 
-    :cond_2
+    :cond_3
     invoke-virtual {p0}, Lcom/google/gson/stream/JsonReader;->endArray()V
 
     return-object v0
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$13.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$13.smali
index 36ad62f573..ee1069708e 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$13.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$13.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$13;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$14.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$14.smali
index 8ab735ab82..4bed0c7024 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$14.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$14.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$14;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$15.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$15.smali
index 2aafd5b98e..40f5286db6 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$15.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$15.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$15;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$16.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$16.smali
index 01cb5380dc..d1bab4f1d7 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$16.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$16.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$16;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$17.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$17.smali
index 8af14746f7..4730c710f1 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$17.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$17.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$17;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$18.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$18.smali
index 1e76db456d..9000002b75 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$18.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$18.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$18;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$19$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$19$1.smali
index c5a94796cd..8260196dde 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$19$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$19$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$19$1;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$19.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$19.smali
index e5f505f057..6d3bcbd6a0 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$19.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$19.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$19;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$2.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$2.smali
index f0e605d3bd..72004f98dc 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$2;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$20.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$20.smali
index 6f35bd44e2..3f6e251956 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$20.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$20.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$20;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$21.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$21.smali
index 5f0d0d3d68..0b90314d8b 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$21.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$21.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$21;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$22.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$22.smali
index c5d8373c55..246e6e8f87 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$22.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$22.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$22;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
@@ -51,7 +52,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p2}, Lcom/google/gson/JsonElement;->CQ()Lcom/google/gson/m;
+    invoke-virtual {p2}, Lcom/google/gson/JsonElement;->CP()Lcom/google/gson/m;
 
     move-result-object p2
 
@@ -61,7 +62,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p2}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object p2
 
@@ -85,7 +86,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/gson/m;->CO()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/gson/m;->CN()Ljava/lang/String;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$23.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$23.smali
index 032ce8cbac..ef99767007 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$23.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$23.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$23;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$24.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$24.smali
index 4f9ede1b11..a5d92fc312 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$24.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$24.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$24;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$25.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$25.smali
index c8dfb82552..359c46916d 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$25.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$25.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$25;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$26.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$26.smali
index 4a9579e130..2b3313beaf 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$26.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$26.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$26;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$27.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$27.smali
index 0ca0f8b644..b8912bde6d 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$27.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$27.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$27;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$28$1.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$28$1.smali
index 6540a31749..141e9e8ede 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$28$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$28$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$28$1;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$28.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$28.smali
index 6a49ecf4e7..91b3e479e0 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$28.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$28.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$28;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$29.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$29.smali
index d62522d199..2e6e5d53a3 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$29.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$29.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lcom/google/gson/b/a/n$29;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$3.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$3.smali
index 0443e54fc3..d7b265c08e 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$3;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$30.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$30.smali
index fbc396fb29..398aae1ae0 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$30.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$30.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$30;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$31.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$31.smali
index a820b68f33..dc8aa9ed1c 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$31.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$31.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$31;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$32.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$32.smali
index 678edb7eca..d4f68217b0 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$32.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$32.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$32;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$33.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$33.smali
index 280a637da0..82a76d5cb3 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$33.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$33.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$33;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$34.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$34.smali
index ad60f07364..a6cf9f88e2 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$34.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$34.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$34;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$35.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$35.smali
index f4a3aea792..34dccec47c 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$35.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$35.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$35;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$4.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$4.smali
index 577f1998ab..242d0a4b84 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$4;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$5.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$5.smali
index 9519e705a0..2db049d92e 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$5.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$5;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$6.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$6.smali
index 84c32919be..5262581e7d 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$6.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$6;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$7.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$7.smali
index 61b5b5f2b6..eb5fe18348 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$7.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$7;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$8.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$8.smali
index 7e7cc4c3bd..07fd5bf4c6 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$8.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$8;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$9.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$9.smali
index 0eebed921c..41d81fa4d6 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$9.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$9;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n$a.smali b/com.discord/smali_classes2/com/google/gson/b/a/n$a.smali
index 0ef0a3dfc2..9be1edafbf 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/a/n$a;
 .super Lcom/google/gson/TypeAdapter;
+.source "TypeAdapters.java"
 
 
 # annotations
@@ -111,7 +112,7 @@
 
     move-result-object v5
 
-    invoke-interface {v6}, Lcom/google/gson/a/c;->CU()[Ljava/lang/String;
+    invoke-interface {v6}, Lcom/google/gson/a/c;->CT()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -158,6 +159,8 @@
     invoke-direct {v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw v0
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/a/n.smali b/com.discord/smali_classes2/com/google/gson/b/a/n.smali
index b7d1991dee..7e7a10beba 100644
--- a/com.discord/smali_classes2/com/google/gson/b/a/n.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/a/n.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/a/n;
 .super Ljava/lang/Object;
+.source "TypeAdapters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/b$a.smali b/com.discord/smali_classes2/com/google/gson/b/b$a.smali
index 26f35e930e..bf33c9fae8 100644
--- a/com.discord/smali_classes2/com/google/gson/b/b$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/b$a;
 .super Ljava/lang/Object;
+.source "$Gson$Types.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/com/google/gson/b/b$b.smali b/com.discord/smali_classes2/com/google/gson/b/b$b.smali
index bf01782582..c7e7c208ba 100644
--- a/com.discord/smali_classes2/com/google/gson/b/b$b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/b$b;
 .super Ljava/lang/Object;
+.source "$Gson$Types.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/com/google/gson/b/b$c.smali b/com.discord/smali_classes2/com/google/gson/b/b$c.smali
index c53310c6e4..225464dde7 100644
--- a/com.discord/smali_classes2/com/google/gson/b/b$c.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/b$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/b$c;
 .super Ljava/lang/Object;
+.source "$Gson$Types.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -101,7 +102,6 @@
 
     const-class p1, Ljava/lang/Object;
 
-    :goto_3
     iput-object p1, p0, Lcom/google/gson/b/b$c;->upperBound:Ljava/lang/reflect/Type;
 
     return-void
@@ -125,7 +125,9 @@
 
     move-result-object p1
 
-    goto :goto_3
+    iput-object p1, p0, Lcom/google/gson/b/b$c;->upperBound:Ljava/lang/reflect/Type;
+
+    return-void
 .end method
 
 
@@ -162,17 +164,15 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    new-array v0, v0, [Ljava/lang/reflect/Type;
+    new-array v1, v1, [Ljava/lang/reflect/Type;
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    iget-object v2, p0, Lcom/google/gson/b/b$c;->lowerBound:Ljava/lang/reflect/Type;
+    aput-object v0, v1, v2
 
-    aput-object v2, v0, v1
-
-    return-object v0
+    return-object v1
 
     :cond_0
     sget-object v0, Lcom/google/gson/b/b;->bCX:[Ljava/lang/reflect/Type;
@@ -203,8 +203,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/b/b$c;->lowerBound:Ljava/lang/reflect/Type;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -245,7 +243,6 @@
 
     iget-object v1, p0, Lcom/google/gson/b/b$c;->lowerBound:Ljava/lang/reflect/Type;
 
-    :goto_0
     invoke-static {v1}, Lcom/google/gson/b/b;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v1
@@ -278,5 +275,15 @@
 
     iget-object v1, p0, Lcom/google/gson/b/b$c;->upperBound:Ljava/lang/reflect/Type;
 
-    goto :goto_0
+    invoke-static {v1}, Lcom/google/gson/b/b;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/b/b.smali b/com.discord/smali_classes2/com/google/gson/b/b.smali
index 4f5fec20b3..cfdd1522b4 100644
--- a/com.discord/smali_classes2/com/google/gson/b/b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/b;
 .super Ljava/lang/Object;
+.source "$Gson$Types.java"
 
 
 # annotations
@@ -158,7 +159,6 @@
 
     aget-object p0, p0, v0
 
-    :goto_2
     move-object v3, p1
 
     move-object p1, p0
@@ -179,7 +179,7 @@
 
     if-nez p0, :cond_6
 
-    :goto_3
+    :goto_2
     const-class p0, Ljava/lang/Object;
 
     if-eq p1, p0, :cond_6
@@ -207,12 +207,18 @@
 
     move-result-object p1
 
-    goto :goto_2
+    move-object v3, p1
+
+    move-object p1, p0
+
+    move-object p0, v3
+
+    goto :goto_0
 
     :cond_5
     move-object p1, p0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     return-object p2
@@ -499,7 +505,7 @@
     :cond_10
     instance-of v0, p2, Ljava/lang/reflect/WildcardType;
 
-    if-eqz v0, :cond_14
+    if-eqz v0, :cond_15
 
     check-cast p2, Ljava/lang/reflect/WildcardType;
 
@@ -606,10 +612,15 @@
     :cond_14
     return-object p2
 
+    :cond_15
+    return-object p2
+
     :catch_0
     move-exception p0
 
     throw p0
+
+    return-void
 .end method
 
 .method public static a(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
@@ -794,7 +805,7 @@
     :cond_b
     instance-of v1, p0, Ljava/lang/reflect/TypeVariable;
 
-    if-eqz v1, :cond_d
+    if-eqz v1, :cond_e
 
     instance-of v1, p1, Ljava/lang/reflect/TypeVariable;
 
@@ -835,6 +846,9 @@
 
     :cond_d
     return v2
+
+    :cond_e
+    return v2
 .end method
 
 .method public static b(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
@@ -1184,6 +1198,8 @@
     invoke-direct {v1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v1
+
+    return-void
 .end method
 
 .method public static d(Ljava/lang/reflect/Type;)Ljava/lang/String;
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$1.smali b/com.discord/smali_classes2/com/google/gson/b/c$1.smali
index f0c37f3633..83214abc6a 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$1;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -49,7 +50,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -59,7 +60,7 @@
 
     iget-object v0, p0, Lcom/google/gson/b/c$1;->bCY:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->CM()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->CL()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$10.smali b/com.discord/smali_classes2/com/google/gson/b/c$10.smali
index 0078b43433..4915b8baa9 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$10.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$10.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$10;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -45,7 +46,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,11 +56,9 @@
 
     iget-object v0, p0, Lcom/google/gson/b/c$10;->bCZ:Ljava/lang/reflect/Type;
 
-    instance-of v0, v0, Ljava/lang/reflect/ParameterizedType;
+    instance-of v1, v0, Ljava/lang/reflect/ParameterizedType;
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/gson/b/c$10;->bCZ:Ljava/lang/reflect/Type;
+    if-eqz v1, :cond_1
 
     check-cast v0, Ljava/lang/reflect/ParameterizedType;
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$11.smali b/com.discord/smali_classes2/com/google/gson/b/c$11.smali
index 673b1205e4..b38bbcab24 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$11.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$11.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$11;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$12.smali b/com.discord/smali_classes2/com/google/gson/b/c$12.smali
index eb7d53271e..9cdaefae5c 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$12.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$12.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$12;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$13.smali b/com.discord/smali_classes2/com/google/gson/b/c$13.smali
index 3fd4a9cc07..c87de2ab4a 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$13.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$13.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$13;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$14.smali b/com.discord/smali_classes2/com/google/gson/b/c$14.smali
index 820a01583f..4538f2920d 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$14.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$14.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$14;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$2.smali b/com.discord/smali_classes2/com/google/gson/b/c$2.smali
index 2238358d4d..68d809badb 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$2;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$3.smali b/com.discord/smali_classes2/com/google/gson/b/c$3.smali
index 845dc3e2f9..8b768dff3c 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$3;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$4.smali b/com.discord/smali_classes2/com/google/gson/b/c$4.smali
index 93e9ad2d9b..d979c06a67 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$4;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$5.smali b/com.discord/smali_classes2/com/google/gson/b/c$5.smali
index 5e6d52f459..eb612cd38c 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$5.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$5;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$6.smali b/com.discord/smali_classes2/com/google/gson/b/c$6.smali
index bc1d0a9fbf..c0555b4caa 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$6.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$6;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -46,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/google/gson/b/k;->Da()Lcom/google/gson/b/k;
+    invoke-static {}, Lcom/google/gson/b/k;->CZ()Lcom/google/gson/b/k;
 
     move-result-object p1
 
@@ -57,7 +58,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$7.smali b/com.discord/smali_classes2/com/google/gson/b/c$7.smali
index caf1efc86f..bb926ae2d9 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$7.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$7;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -49,7 +50,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -59,7 +60,7 @@
 
     iget-object v0, p0, Lcom/google/gson/b/c$7;->bDd:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->CM()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->CL()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$8.smali b/com.discord/smali_classes2/com/google/gson/b/c$8.smali
index addace611b..32d2bf303a 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$8.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$8;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -45,7 +46,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c$9.smali b/com.discord/smali_classes2/com/google/gson/b/c$9.smali
index 65a3bf170c..1e91f111fe 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c$9.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c$9.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/c$9;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 # interfaces
 .implements Lcom/google/gson/b/h;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final CW()Ljava/lang/Object;
+.method public final CV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/b/c.smali b/com.discord/smali_classes2/com/google/gson/b/c.smali
index 04b89666e0..0e18371d61 100644
--- a/com.discord/smali_classes2/com/google/gson/b/c.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/c;
 .super Ljava/lang/Object;
+.source "ConstructorConstructor.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/com/google/gson/b/d$1.smali b/com.discord/smali_classes2/com/google/gson/b/d$1.smali
index 530ccb13f8..31b328f1c6 100644
--- a/com.discord/smali_classes2/com/google/gson/b/d$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/d$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/d$1;
 .super Lcom/google/gson/TypeAdapter;
+.source "Excluder.java"
 
 
 # annotations
@@ -60,7 +61,7 @@
     return-void
 .end method
 
-.method private CY()Lcom/google/gson/TypeAdapter;
+.method private CX()Lcom/google/gson/TypeAdapter;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -121,7 +122,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/b/d$1;->CY()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/b/d$1;->CX()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -157,7 +158,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/b/d$1;->CY()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/b/d$1;->CX()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/d.smali b/com.discord/smali_classes2/com/google/gson/b/d.smali
index 8b2e47609d..2d1994398a 100644
--- a/com.discord/smali_classes2/com/google/gson/b/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/d;
 .super Ljava/lang/Object;
+.source "Excluder.java"
 
 # interfaces
 .implements Lcom/google/gson/r;
@@ -85,7 +86,7 @@
     return-void
 .end method
 
-.method private CX()Lcom/google/gson/b/d;
+.method private CW()Lcom/google/gson/b/d;
     .locals 2
 
     :try_start_0
@@ -155,7 +156,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/gson/a/d;->CV()D
+    invoke-interface {p1}, Lcom/google/gson/a/d;->CU()D
 
     move-result-wide v0
 
@@ -180,7 +181,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/gson/a/e;->CV()D
+    invoke-interface {p1}, Lcom/google/gson/a/e;->CU()D
 
     move-result-wide v0
 
@@ -381,7 +382,7 @@
 
     check-cast p2, Lcom/google/gson/b;
 
-    invoke-interface {p2}, Lcom/google/gson/b;->CK()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->CJ()Z
 
     move-result p2
 
@@ -403,7 +404,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/gson/b/d;->CX()Lcom/google/gson/b/d;
+    invoke-direct {p0}, Lcom/google/gson/b/d;->CW()Lcom/google/gson/b/d;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/e.smali b/com.discord/smali_classes2/com/google/gson/b/e.smali
index dc83037be5..e117c11d4a 100644
--- a/com.discord/smali_classes2/com/google/gson/b/e.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/e.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/gson/b/e;
 .super Ljava/lang/Object;
+.source "JsonReaderInternalAccess.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/gson/b/f.smali b/com.discord/smali_classes2/com/google/gson/b/f.smali
index 2e07ba605f..b4e046a5fd 100644
--- a/com.discord/smali_classes2/com/google/gson/b/f.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/f;
 .super Ljava/lang/Number;
+.source "LazilyParsedNumber.java"
 
 
 # instance fields
@@ -49,7 +50,7 @@
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 3
 
     const/4 v0, 0x1
 
@@ -68,14 +69,10 @@
 
     iget-object v1, p0, Lcom/google/gson/b/f;->value:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/gson/b/f;->value:Ljava/lang/String;
-
-    if-eq v1, v3, :cond_2
-
-    iget-object v1, p0, Lcom/google/gson/b/f;->value:Ljava/lang/String;
-
     iget-object p1, p1, Lcom/google/gson/b/f;->value:Ljava/lang/String;
 
+    if-eq v1, p1, :cond_2
+
     invoke-virtual {v1, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
diff --git a/com.discord/smali_classes2/com/google/gson/b/g$1.smali b/com.discord/smali_classes2/com/google/gson/b/g$1.smali
index 8404bd310f..55d37ac5d5 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/g$1;
 .super Ljava/lang/Object;
+.source "LinkedTreeMap.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali_classes2/com/google/gson/b/g$a$1.smali b/com.discord/smali_classes2/com/google/gson/b/g$a$1.smali
index 7a8a7a59fc..499c422e88 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g$a$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g$a$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/g$a$1;
 .super Lcom/google/gson/b/g$c;
+.source "LinkedTreeMap.java"
 
 
 # annotations
@@ -44,7 +45,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/gson/b/g$a$1;->CZ()Lcom/google/gson/b/g$d;
+    invoke-virtual {p0}, Lcom/google/gson/b/g$a$1;->CY()Lcom/google/gson/b/g$d;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/g$a.smali b/com.discord/smali_classes2/com/google/gson/b/g$a.smali
index 2f6e23dc27..6adc4c44d0 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/g$a;
 .super Ljava/util/AbstractSet;
+.source "LinkedTreeMap.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/g$b$1.smali b/com.discord/smali_classes2/com/google/gson/b/g$b$1.smali
index 2b485b6bd9..08273d8160 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g$b$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g$b$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/g$b$1;
 .super Lcom/google/gson/b/g$c;
+.source "LinkedTreeMap.java"
 
 
 # annotations
@@ -47,7 +48,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/gson/b/g$b$1;->CZ()Lcom/google/gson/b/g$d;
+    invoke-virtual {p0}, Lcom/google/gson/b/g$b$1;->CY()Lcom/google/gson/b/g$d;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/g$b.smali b/com.discord/smali_classes2/com/google/gson/b/g$b.smali
index 0a5fc84a70..e27b92856f 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g$b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/g$b;
 .super Ljava/util/AbstractSet;
+.source "LinkedTreeMap.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/g$c.smali b/com.discord/smali_classes2/com/google/gson/b/g$c.smali
index 3a3468a54b..1b14f59ea9 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g$c.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g$c.smali
@@ -1,5 +1,6 @@
 .class abstract Lcom/google/gson/b/g$c;
 .super Ljava/lang/Object;
+.source "LinkedTreeMap.java"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -82,7 +83,7 @@
 
 
 # virtual methods
-.method final CZ()Lcom/google/gson/b/g$d;
+.method final CY()Lcom/google/gson/b/g$d;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -159,13 +160,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/b/g$c;->bDq:Lcom/google/gson/b/g;
-
-    iget-object v1, p0, Lcom/google/gson/b/g$c;->bDu:Lcom/google/gson/b/g$d;
+    iget-object v1, p0, Lcom/google/gson/b/g$c;->bDq:Lcom/google/gson/b/g;
 
     const/4 v2, 0x1
 
-    invoke-virtual {v0, v1, v2}, Lcom/google/gson/b/g;->a(Lcom/google/gson/b/g$d;Z)V
+    invoke-virtual {v1, v0, v2}, Lcom/google/gson/b/g;->a(Lcom/google/gson/b/g$d;Z)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/g$d.smali b/com.discord/smali_classes2/com/google/gson/b/g$d.smali
index c6f4d763b9..4d2a116065 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g$d.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g$d.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/g$d;
 .super Ljava/lang/Object;
+.source "LinkedTreeMap.java"
 
 # interfaces
 .implements Ljava/util/Map$Entry;
@@ -155,7 +156,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     check-cast p1, Ljava/util/Map$Entry;
 
@@ -172,8 +173,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/b/g$d;->key:Ljava/lang/Object;
-
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
     move-result-object v2
@@ -198,8 +197,6 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/gson/b/g$d;->value:Ljava/lang/Object;
-
     invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object p1
@@ -217,6 +214,9 @@
 
     :cond_2
     return v1
+
+    :cond_3
+    return v1
 .end method
 
 .method public final getKey()Ljava/lang/Object;
@@ -259,8 +259,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/b/g$d;->key:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
@@ -273,9 +271,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/gson/b/g$d;->value:Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/gson/b/g.smali b/com.discord/smali_classes2/com/google/gson/b/g.smali
index d4cd6634d9..f748392940 100644
--- a/com.discord/smali_classes2/com/google/gson/b/g.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/g;
 .super Ljava/util/AbstractMap;
+.source "LinkedTreeMap.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -435,13 +436,18 @@
     :cond_4
     invoke-direct {p0, v1}, Lcom/google/gson/b/g;->b(Lcom/google/gson/b/g$d;)V
 
+    invoke-direct {p0, p1}, Lcom/google/gson/b/g;->a(Lcom/google/gson/b/g$d;)V
+
+    goto :goto_5
+
     :cond_5
     :goto_4
     invoke-direct {p0, p1}, Lcom/google/gson/b/g;->a(Lcom/google/gson/b/g$d;)V
 
+    :goto_5
     if-nez p2, :cond_e
 
-    goto :goto_7
+    goto :goto_9
 
     :cond_6
     const/4 v1, 0x2
@@ -458,12 +464,12 @@
 
     iget v3, v3, Lcom/google/gson/b/g$d;->height:I
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_7
     const/4 v3, 0x0
 
-    :goto_5
+    :goto_6
     if-eqz v1, :cond_8
 
     iget v2, v1, Lcom/google/gson/b/g$d;->height:I
@@ -477,18 +483,23 @@
 
     if-nez p2, :cond_9
 
-    goto :goto_6
+    goto :goto_7
 
     :cond_9
     invoke-direct {p0, v0}, Lcom/google/gson/b/g;->a(Lcom/google/gson/b/g$d;)V
 
-    :cond_a
-    :goto_6
     invoke-direct {p0, p1}, Lcom/google/gson/b/g;->b(Lcom/google/gson/b/g$d;)V
 
+    goto :goto_8
+
+    :cond_a
+    :goto_7
+    invoke-direct {p0, p1}, Lcom/google/gson/b/g;->b(Lcom/google/gson/b/g$d;)V
+
+    :goto_8
     if-nez p2, :cond_e
 
-    goto :goto_7
+    goto :goto_9
 
     :cond_b
     if-nez v5, :cond_c
@@ -513,7 +524,7 @@
     if-eqz p2, :cond_e
 
     :cond_d
-    :goto_7
+    :goto_9
     iget-object p1, p1, Lcom/google/gson/b/g$d;->bDw:Lcom/google/gson/b/g$d;
 
     goto :goto_0
@@ -550,6 +561,8 @@
     return-object p1
 
     :catch_0
+    return-object v0
+
     :cond_0
     return-object v0
 .end method
@@ -788,7 +801,6 @@
 
     if-le v1, v4, :cond_2
 
-    :goto_0
     iget-object v0, p2, Lcom/google/gson/b/g$d;->bDy:Lcom/google/gson/b/g$d;
 
     move-object v5, v0
@@ -797,8 +809,17 @@
 
     move-object p2, v5
 
+    :goto_0
     if-eqz p2, :cond_1
 
+    iget-object v0, p2, Lcom/google/gson/b/g$d;->bDy:Lcom/google/gson/b/g$d;
+
+    move-object v5, v0
+
+    move-object v0, p2
+
+    move-object p2, v5
+
     goto :goto_0
 
     :cond_1
@@ -807,7 +828,6 @@
     goto :goto_2
 
     :cond_2
-    :goto_1
     iget-object p2, v0, Lcom/google/gson/b/g$d;->bDx:Lcom/google/gson/b/g$d;
 
     move-object v5, v0
@@ -816,8 +836,17 @@
 
     move-object p2, v5
 
+    :goto_1
     if-eqz v0, :cond_3
 
+    iget-object p2, v0, Lcom/google/gson/b/g$d;->bDx:Lcom/google/gson/b/g$d;
+
+    move-object v5, v0
+
+    move-object v0, p2
+
+    move-object p2, v5
+
     goto :goto_1
 
     :cond_3
diff --git a/com.discord/smali_classes2/com/google/gson/b/h.smali b/com.discord/smali_classes2/com/google/gson/b/h.smali
index 3ff7b78aa5..62c4eee695 100644
--- a/com.discord/smali_classes2/com/google/gson/b/h.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/gson/b/h;
 .super Ljava/lang/Object;
+.source "ObjectConstructor.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract CW()Ljava/lang/Object;
+.method public abstract CV()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/gson/b/i.smali b/com.discord/smali_classes2/com/google/gson/b/i.smali
index f2b7d81434..6dda22cddb 100644
--- a/com.discord/smali_classes2/com/google/gson/b/i.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/i;
 .super Ljava/lang/Object;
+.source "Primitives.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/gson/b/j$a$a.smali b/com.discord/smali_classes2/com/google/gson/b/j$a$a.smali
index 00fe2b0009..27ad9b3222 100644
--- a/com.discord/smali_classes2/com/google/gson/b/j$a$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/j$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/j$a$a;
 .super Ljava/lang/Object;
+.source "Streams.java"
 
 # interfaces
 .implements Ljava/lang/CharSequence;
diff --git a/com.discord/smali_classes2/com/google/gson/b/j$a.smali b/com.discord/smali_classes2/com/google/gson/b/j$a.smali
index a46b8fcbae..164a0ec689 100644
--- a/com.discord/smali_classes2/com/google/gson/b/j$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/j$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/b/j$a;
 .super Ljava/io/Writer;
+.source "Streams.java"
 
 
 # annotations
@@ -87,8 +88,6 @@
 
     iget-object p1, p0, Lcom/google/gson/b/j$a;->bDC:Ljava/lang/Appendable;
 
-    iget-object v0, p0, Lcom/google/gson/b/j$a;->bDD:Lcom/google/gson/b/j$a$a;
-
     add-int/2addr p3, p2
 
     invoke-interface {p1, v0, p2, p3}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;II)Ljava/lang/Appendable;
diff --git a/com.discord/smali_classes2/com/google/gson/b/j.smali b/com.discord/smali_classes2/com/google/gson/b/j.smali
index 5905b5f573..2be6fd4ceb 100644
--- a/com.discord/smali_classes2/com/google/gson/b/j.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/b/j;
 .super Ljava/lang/Object;
+.source "Streams.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/b/k$1.smali b/com.discord/smali_classes2/com/google/gson/b/k$1.smali
index 7903b281df..7c0e2ded31 100644
--- a/com.discord/smali_classes2/com/google/gson/b/k$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/k$1.smali
@@ -1,10 +1,11 @@
 .class final Lcom/google/gson/b/k$1;
 .super Lcom/google/gson/b/k;
+.source "UnsafeAllocator.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/b/k;->Da()Lcom/google/gson/b/k;
+    value = Lcom/google/gson/b/k;->CZ()Lcom/google/gson/b/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/google/gson/b/k$2.smali b/com.discord/smali_classes2/com/google/gson/b/k$2.smali
index 76043816b6..0a11d6c21e 100644
--- a/com.discord/smali_classes2/com/google/gson/b/k$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/k$2.smali
@@ -1,10 +1,11 @@
 .class final Lcom/google/gson/b/k$2;
 .super Lcom/google/gson/b/k;
+.source "UnsafeAllocator.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/b/k;->Da()Lcom/google/gson/b/k;
+    value = Lcom/google/gson/b/k;->CZ()Lcom/google/gson/b/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/google/gson/b/k$3.smali b/com.discord/smali_classes2/com/google/gson/b/k$3.smali
index 63d7a8feeb..0e7c5f3b87 100644
--- a/com.discord/smali_classes2/com/google/gson/b/k$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/k$3.smali
@@ -1,10 +1,11 @@
 .class final Lcom/google/gson/b/k$3;
 .super Lcom/google/gson/b/k;
+.source "UnsafeAllocator.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/b/k;->Da()Lcom/google/gson/b/k;
+    value = Lcom/google/gson/b/k;->CZ()Lcom/google/gson/b/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/google/gson/b/k$4.smali b/com.discord/smali_classes2/com/google/gson/b/k$4.smali
index d88156b685..9fe630e142 100644
--- a/com.discord/smali_classes2/com/google/gson/b/k$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/k$4.smali
@@ -1,10 +1,11 @@
 .class final Lcom/google/gson/b/k$4;
 .super Lcom/google/gson/b/k;
+.source "UnsafeAllocator.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/b/k;->Da()Lcom/google/gson/b/k;
+    value = Lcom/google/gson/b/k;->CZ()Lcom/google/gson/b/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/google/gson/b/k.smali b/com.discord/smali_classes2/com/google/gson/b/k.smali
index 3b73725f42..cb35625419 100644
--- a/com.discord/smali_classes2/com/google/gson/b/k.smali
+++ b/com.discord/smali_classes2/com/google/gson/b/k.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/google/gson/b/k;
 .super Ljava/lang/Object;
+.source "UnsafeAllocator.java"
 
 
 # direct methods
@@ -11,7 +12,7 @@
     return-void
 .end method
 
-.method public static Da()Lcom/google/gson/b/k;
+.method public static CZ()Lcom/google/gson/b/k;
     .locals 8
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/gson/c.smali b/com.discord/smali_classes2/com/google/gson/c.smali
index ee19702520..56b8ac12e4 100644
--- a/com.discord/smali_classes2/com/google/gson/c.smali
+++ b/com.discord/smali_classes2/com/google/gson/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/c;
 .super Ljava/lang/Object;
+.source "FieldAttributes.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/com/google/gson/d$1.smali b/com.discord/smali_classes2/com/google/gson/d$1.smali
index 2f8b50f43f..24d457e1ad 100644
--- a/com.discord/smali_classes2/com/google/gson/d$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/d$1.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/google/gson/d$1;
 .super Lcom/google/gson/d;
+.source "FieldNamingPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/d$2.smali b/com.discord/smali_classes2/com/google/gson/d$2.smali
index d82a3f74a6..c4f6d383ac 100644
--- a/com.discord/smali_classes2/com/google/gson/d$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/d$2.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/google/gson/d$2;
 .super Lcom/google/gson/d;
+.source "FieldNamingPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/d$3.smali b/com.discord/smali_classes2/com/google/gson/d$3.smali
index 0161be78ac..5dd84c925c 100644
--- a/com.discord/smali_classes2/com/google/gson/d$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/d$3.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/google/gson/d$3;
 .super Lcom/google/gson/d;
+.source "FieldNamingPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/d$4.smali b/com.discord/smali_classes2/com/google/gson/d$4.smali
index 74c820f55a..c0af3d69f3 100644
--- a/com.discord/smali_classes2/com/google/gson/d$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/d$4.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/google/gson/d$4;
 .super Lcom/google/gson/d;
+.source "FieldNamingPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/d$5.smali b/com.discord/smali_classes2/com/google/gson/d$5.smali
index 980b621812..2e5e982284 100644
--- a/com.discord/smali_classes2/com/google/gson/d$5.smali
+++ b/com.discord/smali_classes2/com/google/gson/d$5.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/google/gson/d$5;
 .super Lcom/google/gson/d;
+.source "FieldNamingPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/d.smali b/com.discord/smali_classes2/com/google/gson/d.smali
index 7c10a75288..7f1d1fee1b 100644
--- a/com.discord/smali_classes2/com/google/gson/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/d.smali
@@ -1,5 +1,6 @@
 .class public abstract enum Lcom/google/gson/d;
 .super Ljava/lang/Enum;
+.source "FieldNamingPolicy.java"
 
 # interfaces
 .implements Lcom/google/gson/e;
@@ -270,6 +271,8 @@
 
     move-result-object p0
 
+    return-object p0
+
     :cond_2
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/e.smali b/com.discord/smali_classes2/com/google/gson/e.smali
index 2867252cc3..2dc213014f 100644
--- a/com.discord/smali_classes2/com/google/gson/e.smali
+++ b/com.discord/smali_classes2/com/google/gson/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/gson/e;
 .super Ljava/lang/Object;
+.source "FieldNamingStrategy.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/google/gson/f.smali b/com.discord/smali_classes2/com/google/gson/f.smali
index fc839a286e..f8a9c2b365 100644
--- a/com.discord/smali_classes2/com/google/gson/f.smali
+++ b/com.discord/smali_classes2/com/google/gson/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/f;
 .super Ljava/lang/Object;
+.source "GsonBuilder.java"
 
 
 # instance fields
@@ -227,13 +228,15 @@
 
     invoke-interface {p3, p0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
+    return-void
+
     :cond_1
     return-void
 .end method
 
 
 # virtual methods
-.method public final CL()Lcom/google/gson/Gson;
+.method public final CK()Lcom/google/gson/Gson;
     .locals 14
 
     new-instance v12, Ljava/util/ArrayList;
diff --git a/com.discord/smali_classes2/com/google/gson/g.smali b/com.discord/smali_classes2/com/google/gson/g.smali
index db60503a12..6e4fb6101c 100644
--- a/com.discord/smali_classes2/com/google/gson/g.smali
+++ b/com.discord/smali_classes2/com/google/gson/g.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/gson/g;
 .super Ljava/lang/Object;
+.source "InstanceCreator.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract CM()Ljava/lang/Object;
+.method public abstract CL()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 8ca3adcf50..5bf807e3f6 100644
--- a/com.discord/smali_classes2/com/google/gson/h.smali
+++ b/com.discord/smali_classes2/com/google/gson/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/h;
 .super Lcom/google/gson/JsonElement;
+.source "JsonArray.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
@@ -45,7 +46,7 @@
 
 
 # virtual methods
-.method public final CN()Ljava/lang/Number;
+.method public final CM()Ljava/lang/Number;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/h;->bCP:Ljava/util/List;
@@ -68,7 +69,7 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->CN()Ljava/lang/Number;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->CM()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -82,7 +83,7 @@
     throw v0
 .end method
 
-.method public final CO()Ljava/lang/String;
+.method public final CN()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/h;->bCP:Ljava/util/List;
@@ -105,7 +106,7 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->CO()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->CN()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/i.smali b/com.discord/smali_classes2/com/google/gson/i.smali
index 5c65951804..2b49a8fc1e 100644
--- a/com.discord/smali_classes2/com/google/gson/i.smali
+++ b/com.discord/smali_classes2/com/google/gson/i.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/gson/i;
 .super Ljava/lang/Object;
+.source "JsonDeserializer.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract CP()Ljava/lang/Object;
+.method public abstract CO()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/gson/j.smali b/com.discord/smali_classes2/com/google/gson/j.smali
index 5cc449cc80..ea6fd75890 100644
--- a/com.discord/smali_classes2/com/google/gson/j.smali
+++ b/com.discord/smali_classes2/com/google/gson/j.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/j;
 .super Lcom/google/gson/l;
+.source "JsonIOException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/gson/k.smali b/com.discord/smali_classes2/com/google/gson/k.smali
index edbd6986c0..b2189161a4 100644
--- a/com.discord/smali_classes2/com/google/gson/k.smali
+++ b/com.discord/smali_classes2/com/google/gson/k.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/k;
 .super Lcom/google/gson/JsonElement;
+.source "JsonNull.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/gson/l.smali b/com.discord/smali_classes2/com/google/gson/l.smali
index 01148fec2d..af58af5d17 100644
--- a/com.discord/smali_classes2/com/google/gson/l.smali
+++ b/com.discord/smali_classes2/com/google/gson/l.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/gson/l;
 .super Ljava/lang/RuntimeException;
+.source "JsonParseException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/gson/m.smali b/com.discord/smali_classes2/com/google/gson/m.smali
index 2fcde63bd7..7fe3f950f7 100644
--- a/com.discord/smali_classes2/com/google/gson/m.smali
+++ b/com.discord/smali_classes2/com/google/gson/m.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/m;
 .super Lcom/google/gson/JsonElement;
+.source "JsonPrimitive.java"
 
 
 # static fields
@@ -170,16 +171,14 @@
 .method private static a(Lcom/google/gson/m;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, Ljava/lang/Number;
+    instance-of v0, p0, Ljava/lang/Number;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_2
 
-    iget-object p0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
     check-cast p0, Ljava/lang/Number;
 
     instance-of v0, p0, Ljava/math/BigInteger;
@@ -280,7 +279,6 @@
 
     move-result-object p1
 
-    :goto_0
     iput-object p1, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
 
     return-void
@@ -296,62 +294,60 @@
 
     if-eqz v0, :cond_1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
-    :goto_1
+    :goto_0
     const/4 v0, 0x1
 
-    :goto_2
+    :goto_1
     invoke-static {v0}, Lcom/google/gson/b/a;->checkArgument(Z)V
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public final CN()Ljava/lang/Number;
+.method public final CM()Ljava/lang/Number;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, Ljava/lang/String;
+    instance-of v1, v0, Ljava/lang/String;
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    new-instance v0, Lcom/google/gson/b/f;
+    new-instance v1, Lcom/google/gson/b/f;
 
-    iget-object v1, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+    check-cast v0, Ljava/lang/String;
 
-    check-cast v1, Ljava/lang/String;
+    invoke-direct {v1, v0}, Lcom/google/gson/b/f;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {v0, v1}, Lcom/google/gson/b/f;-><init>(Ljava/lang/String;)V
-
-    return-object v0
+    return-object v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
     check-cast v0, Ljava/lang/Number;
 
     return-object v0
 .end method
 
-.method public final CO()Ljava/lang/String;
-    .locals 1
+.method public final CN()Ljava/lang/String;
+    .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, Ljava/lang/Number;
+    instance-of v1, v0, Ljava/lang/Number;
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -362,13 +358,9 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+    instance-of v1, v0, Ljava/lang/Boolean;
 
-    instance-of v0, v0, Ljava/lang/Boolean;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_1
 
     check-cast v0, Ljava/lang/Boolean;
 
@@ -379,8 +371,6 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
     check-cast v0, Ljava/lang/String;
 
     return-object v0
@@ -441,7 +431,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -449,7 +439,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -479,7 +469,7 @@
 
     if-eqz v2, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -487,7 +477,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -537,15 +527,13 @@
 .end method
 
 .method public final getAsBoolean()Z
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, Ljava/lang/Boolean;
+    instance-of v1, v0, Ljava/lang/Boolean;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+    if-eqz v1, :cond_0
 
     check-cast v0, Ljava/lang/Boolean;
 
@@ -556,7 +544,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->CO()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -576,7 +564,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -587,7 +575,7 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->CO()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -607,7 +595,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -618,7 +606,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->CO()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -638,7 +626,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -649,7 +637,7 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->CO()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -680,7 +668,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -699,11 +687,11 @@
     :cond_1
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
 
-    instance-of v0, v0, Ljava/lang/Number;
+    instance-of v2, v0, Ljava/lang/Number;
 
-    if-eqz v0, :cond_2
+    if-eqz v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->CN()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->CM()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -724,8 +712,6 @@
     return v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/google/gson/n.smali b/com.discord/smali_classes2/com/google/gson/n.smali
index c7c4aef649..f84c52bb89 100644
--- a/com.discord/smali_classes2/com/google/gson/n.smali
+++ b/com.discord/smali_classes2/com/google/gson/n.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lcom/google/gson/n;
 .super Ljava/lang/Object;
+.source "JsonSerializationContext.java"
diff --git a/com.discord/smali_classes2/com/google/gson/o.smali b/com.discord/smali_classes2/com/google/gson/o.smali
index 82de05cecf..b1c785fe65 100644
--- a/com.discord/smali_classes2/com/google/gson/o.smali
+++ b/com.discord/smali_classes2/com/google/gson/o.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/gson/o;
 .super Ljava/lang/Object;
+.source "JsonSerializer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/p.smali b/com.discord/smali_classes2/com/google/gson/p.smali
index 08614ac5ee..5988036ccf 100644
--- a/com.discord/smali_classes2/com/google/gson/p.smali
+++ b/com.discord/smali_classes2/com/google/gson/p.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/p;
 .super Lcom/google/gson/l;
+.source "JsonSyntaxException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/gson/q$1.smali b/com.discord/smali_classes2/com/google/gson/q$1.smali
index 5fb8e56a55..4af2a91e9f 100644
--- a/com.discord/smali_classes2/com/google/gson/q$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/q$1.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/google/gson/q$1;
 .super Lcom/google/gson/q;
+.source "LongSerializationPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/q$2.smali b/com.discord/smali_classes2/com/google/gson/q$2.smali
index 1ab473e7b3..45760aa778 100644
--- a/com.discord/smali_classes2/com/google/gson/q$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/q$2.smali
@@ -1,5 +1,6 @@
 .class final enum Lcom/google/gson/q$2;
 .super Lcom/google/gson/q;
+.source "LongSerializationPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/q.smali b/com.discord/smali_classes2/com/google/gson/q.smali
index 30764920fa..d5db2bbb7c 100644
--- a/com.discord/smali_classes2/com/google/gson/q.smali
+++ b/com.discord/smali_classes2/com/google/gson/q.smali
@@ -1,5 +1,6 @@
 .class public abstract enum Lcom/google/gson/q;
 .super Ljava/lang/Enum;
+.source "LongSerializationPolicy.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/r.smali b/com.discord/smali_classes2/com/google/gson/r.smali
index 5d137062e5..6ea9cee0c3 100644
--- a/com.discord/smali_classes2/com/google/gson/r.smali
+++ b/com.discord/smali_classes2/com/google/gson/r.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/google/gson/r;
 .super Ljava/lang/Object;
+.source "TypeAdapterFactory.java"
 
 
 # virtual methods
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 2720fed87a..dcadfacf57 100644
--- a/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali
+++ b/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/gson/reflect/TypeToken;
 .super Ljava/lang/Object;
+.source "TypeToken.java"
 
 
 # annotations
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 4f1efec6e3..6fc5a0e4b7 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
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/stream/JsonReader$1;
 .super Lcom/google/gson/b/e;
+.source "JsonReader.java"
 
 
 # annotations
@@ -42,7 +43,7 @@
 
     invoke-virtual {p1, v0}, Lcom/google/gson/b/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p1}, Lcom/google/gson/b/a/e;->Db()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/gson/b/a/e;->Da()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/stream/JsonReader.smali b/com.discord/smali_classes2/com/google/gson/stream/JsonReader.smali
index 7e0006efb6..ec694eb6f5 100644
--- a/com.discord/smali_classes2/com/google/gson/stream/JsonReader.smali
+++ b/com.discord/smali_classes2/com/google/gson/stream/JsonReader.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/gson/stream/JsonReader;
 .super Ljava/lang/Object;
+.source "JsonReader.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -210,7 +211,7 @@
 .end method
 
 .method private consumeNonExecutePrefix()V
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -231,17 +232,15 @@
 
     sget-object v1, Lcom/google/gson/stream/JsonReader;->NON_EXECUTE_PREFIX:[C
 
-    array-length v1, v1
+    array-length v2, v1
 
-    add-int/2addr v0, v1
+    add-int/2addr v0, v2
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->limit:I
+    iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    if-le v0, v1, :cond_0
+    if-le v0, v2, :cond_0
 
-    sget-object v0, Lcom/google/gson/stream/JsonReader;->NON_EXECUTE_PREFIX:[C
-
-    array-length v0, v0
+    array-length v0, v1
 
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->fillBuffer(I)Z
 
@@ -257,23 +256,21 @@
     :goto_0
     sget-object v1, Lcom/google/gson/stream/JsonReader;->NON_EXECUTE_PREFIX:[C
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_2
+    if-ge v0, v2, :cond_2
 
-    iget-object v1, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
+    iget-object v2, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
 
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iget v3, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    add-int/2addr v2, v0
+    add-int/2addr v3, v0
 
-    aget-char v1, v1, v2
+    aget-char v2, v2, v3
 
-    sget-object v2, Lcom/google/gson/stream/JsonReader;->NON_EXECUTE_PREFIX:[C
+    aget-char v1, v1, v0
 
-    aget-char v2, v2, v0
-
-    if-eq v1, v2, :cond_1
+    if-eq v2, v1, :cond_1
 
     return-void
 
@@ -285,8 +282,6 @@
     :cond_2
     iget v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    sget-object v1, Lcom/google/gson/stream/JsonReader;->NON_EXECUTE_PREFIX:[C
-
     array-length v1, v1
 
     add-int/2addr v0, v1
@@ -316,25 +311,17 @@
 
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
-
     const/4 v3, 0x0
 
     if-eq v1, v2, :cond_0
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->limit:I
-
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
-
     sub-int/2addr v1, v2
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
-
-    invoke-static {v0, v1, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v2, v0, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     goto :goto_0
 
@@ -351,9 +338,7 @@
 
     array-length v4, v0
 
-    iget v5, p0, Lcom/google/gson/stream/JsonReader;->limit:I
-
-    sub-int/2addr v4, v5
+    sub-int/2addr v4, v2
 
     invoke-virtual {v1, v0, v2, v4}, Ljava/io/Reader;->read([CII)I
 
@@ -379,25 +364,23 @@
 
     if-nez v1, :cond_2
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->limit:I
+    iget v4, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    if-lez v1, :cond_2
+    if-lez v4, :cond_2
 
-    aget-char v1, v0, v3
+    aget-char v4, v0, v3
 
-    const v4, 0xfeff
+    const v5, 0xfeff
 
-    if-ne v1, v4, :cond_2
+    if-ne v4, v5, :cond_2
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iget v4, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    add-int/2addr v1, v2
+    add-int/2addr v4, v2
 
-    iput v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iput v4, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->lineStart:I
-
-    add-int/2addr v1, v2
+    add-int/lit8 v1, v1, 0x1
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->lineStart:I
 
@@ -467,13 +450,11 @@
 
     iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
 
-    :goto_0
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    :goto_1
     iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    :goto_2
+    :goto_0
     const/4 v3, 0x1
 
     if-ne v1, v2, :cond_2
@@ -490,7 +471,7 @@
 
     iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_0
     if-nez p1, :cond_1
@@ -523,7 +504,7 @@
     throw p1
 
     :cond_2
-    :goto_3
+    :goto_1
     add-int/lit8 v4, v1, 0x1
 
     aget-char v1, v0, v1
@@ -540,7 +521,7 @@
 
     iput v4, p0, Lcom/google/gson/stream/JsonReader;->lineStart:I
 
-    goto :goto_5
+    goto/16 :goto_2
 
     :cond_3
     const/16 v5, 0x20
@@ -590,31 +571,33 @@
 
     iget v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    aget-char v2, v0, v2
+    aget-char v3, v0, v2
 
     const/16 v4, 0x2a
 
-    if-eq v2, v4, :cond_6
+    if-eq v3, v4, :cond_6
 
-    if-eq v2, v5, :cond_5
+    if-eq v3, v5, :cond_5
 
     return v1
 
     :cond_5
+    add-int/lit8 v2, v2, 0x1
+
+    iput v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+
+    invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->skipToEndOfLine()V
+
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    add-int/2addr v1, v3
+    iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    iput v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
-
-    goto :goto_4
+    goto :goto_0
 
     :cond_6
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    add-int/lit8 v2, v2, 0x1
 
-    add-int/2addr v1, v3
-
-    iput v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iput v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
     const-string v1, "*/"
 
@@ -628,7 +611,9 @@
 
     add-int/2addr v1, v6
 
-    goto/16 :goto_1
+    iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
+
+    goto/16 :goto_0
 
     :cond_7
     const-string p1, "Unterminated comment"
@@ -648,9 +633,12 @@
 
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
-    :goto_4
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->skipToEndOfLine()V
 
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+
+    iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
+
     goto/16 :goto_0
 
     :cond_9
@@ -659,10 +647,10 @@
     return v1
 
     :cond_a
-    :goto_5
+    :goto_2
     move v1, v4
 
-    goto/16 :goto_2
+    goto/16 :goto_0
 .end method
 
 .method private nextQuotedValue(C)Ljava/lang/String;
@@ -816,10 +804,12 @@
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method private nextUnquotedValue()Ljava/lang/String;
-    .locals 5
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -832,25 +822,22 @@
 
     move-object v2, v1
 
-    :cond_0
     const/4 v1, 0x0
 
     :goto_0
     iget v3, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
+    add-int v4, v3, v1
+
+    iget v5, p0, Lcom/google/gson/stream/JsonReader;->limit:I
+
+    if-ge v4, v5, :cond_0
+
+    iget-object v4, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
+
     add-int/2addr v3, v1
 
-    iget v4, p0, Lcom/google/gson/stream/JsonReader;->limit:I
-
-    if-ge v3, v4, :cond_1
-
-    iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
-
-    iget v4, p0, Lcom/google/gson/stream/JsonReader;->pos:I
-
-    add-int/2addr v4, v1
-
-    aget-char v3, v3, v4
+    aget-char v3, v4, v3
 
     sparse-switch v3, :sswitch_data_0
 
@@ -863,12 +850,12 @@
 
     goto :goto_1
 
-    :cond_1
+    :cond_0
     iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
 
     array-length v3, v3
 
-    if-ge v1, v3, :cond_3
+    if-ge v1, v3, :cond_2
 
     add-int/lit8 v3, v1, 0x1
 
@@ -876,19 +863,19 @@
 
     move-result v3
 
-    if-eqz v3, :cond_2
+    if-eqz v3, :cond_1
 
     goto :goto_0
 
-    :cond_2
+    :cond_1
     :goto_1
     :sswitch_1
     move v0, v1
 
     goto :goto_2
 
-    :cond_3
-    if-nez v2, :cond_4
+    :cond_2
+    if-nez v2, :cond_3
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -900,7 +887,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    :cond_4
+    :cond_3
     iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
 
     iget v4, p0, Lcom/google/gson/stream/JsonReader;->pos:I
@@ -919,10 +906,10 @@
 
     move-result v1
 
-    if-nez v1, :cond_0
+    if-nez v1, :cond_5
 
     :goto_2
-    if-nez v2, :cond_5
+    if-nez v2, :cond_4
 
     new-instance v1, Ljava/lang/String;
 
@@ -934,7 +921,7 @@
 
     goto :goto_3
 
-    :cond_5
+    :cond_4
     iget-object v1, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
 
     iget v3, p0, Lcom/google/gson/stream/JsonReader;->pos:I
@@ -954,7 +941,10 @@
 
     return-object v1
 
-    nop
+    :cond_5
+    const/4 v1, 0x0
+
+    goto :goto_0
 
     :sswitch_data_0
     .sparse-switch
@@ -1247,14 +1237,14 @@
 
     if-le v14, v7, :cond_2
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_2
     if-eq v9, v6, :cond_b
 
     if-nez v9, :cond_3
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_3
     if-ne v9, v15, :cond_7
@@ -1312,7 +1302,11 @@
 
     move v10, v7
 
-    goto :goto_3
+    const/4 v7, 0x0
+
+    const-wide/16 v16, 0x0
+
+    goto/16 :goto_9
 
     :cond_7
     if-ne v9, v4, :cond_8
@@ -1321,7 +1315,9 @@
 
     const/4 v9, 0x4
 
-    goto :goto_6
+    const-wide/16 v16, 0x0
+
+    goto/16 :goto_9
 
     :cond_8
     if-eq v9, v5, :cond_a
@@ -1330,24 +1326,27 @@
 
     if-ne v9, v4, :cond_9
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_9
-    :goto_3
     const/4 v7, 0x0
 
-    goto :goto_6
+    const-wide/16 v16, 0x0
+
+    goto/16 :goto_9
 
     :cond_a
-    :goto_4
+    :goto_3
     const/4 v7, 0x0
 
     const/4 v9, 0x7
 
-    goto :goto_6
+    const-wide/16 v16, 0x0
+
+    goto/16 :goto_9
 
     :cond_b
-    :goto_5
+    :goto_4
     add-int/lit8 v14, v14, -0x30
 
     neg-int v4, v14
@@ -1360,13 +1359,12 @@
 
     const/4 v9, 0x2
 
-    :goto_6
     const-wide/16 v16, 0x0
 
-    goto/16 :goto_d
+    goto/16 :goto_9
 
     :cond_c
-    :goto_7
+    :goto_5
     invoke-direct {v0, v14}, Lcom/google/gson/stream/JsonReader;->isLiteral(C)Z
 
     move-result v1
@@ -1402,12 +1400,12 @@
     :cond_f
     if-eqz v13, :cond_10
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_10
     neg-long v11, v11
 
-    :goto_8
+    :goto_6
     iput-wide v11, v0, Lcom/google/gson/stream/JsonReader;->peekedLong:J
 
     iget v1, v0, Lcom/google/gson/stream/JsonReader;->pos:I
@@ -1418,7 +1416,6 @@
 
     const/16 v1, 0xf
 
-    :goto_9
     iput v1, v0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
     return v1
@@ -1434,7 +1431,7 @@
 
     if-ne v9, v1, :cond_12
 
-    goto :goto_a
+    goto :goto_7
 
     :cond_12
     const/4 v7, 0x0
@@ -1442,12 +1439,14 @@
     return v7
 
     :cond_13
-    :goto_a
+    :goto_7
     iput v3, v0, Lcom/google/gson/stream/JsonReader;->peekedNumberLength:I
 
     const/16 v1, 0x10
 
-    goto :goto_9
+    iput v1, v0, Lcom/google/gson/stream/JsonReader;->peeked:I
+
+    return v1
 
     :pswitch_0
     const/4 v7, 0x0
@@ -1458,7 +1457,7 @@
 
     const/4 v9, 0x3
 
-    goto :goto_d
+    goto :goto_9
 
     :cond_14
     return v7
@@ -1476,12 +1475,14 @@
 
     const/4 v13, 0x1
 
-    goto :goto_d
+    goto :goto_9
 
     :cond_15
     if-ne v9, v5, :cond_16
 
-    goto :goto_c
+    const/4 v9, 0x6
+
+    goto :goto_9
 
     :cond_16
     return v7
@@ -1497,16 +1498,16 @@
 
     if-ne v9, v4, :cond_18
 
-    goto :goto_b
+    goto :goto_8
 
     :cond_18
     return v7
 
     :cond_19
-    :goto_b
+    :goto_8
     const/4 v9, 0x5
 
-    goto :goto_d
+    goto :goto_9
 
     :cond_1a
     const/4 v4, 0x6
@@ -1517,10 +1518,9 @@
 
     if-ne v9, v5, :cond_1b
 
-    :goto_c
     const/4 v9, 0x6
 
-    :goto_d
+    :goto_9
     add-int/lit8 v3, v3, 0x1
 
     goto/16 :goto_0
@@ -1542,53 +1542,43 @@
 
     iget-object v1, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ne v0, v1, :cond_0
+    if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    mul-int/lit8 v2, v0, 0x2
 
-    mul-int/lit8 v0, v0, 0x2
+    new-array v2, v2, [I
 
-    new-array v0, v0, [I
+    mul-int/lit8 v3, v0, 0x2
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    new-array v3, v3, [I
 
-    mul-int/lit8 v1, v1, 0x2
+    mul-int/lit8 v4, v0, 0x2
 
-    new-array v1, v1, [I
-
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
-
-    mul-int/lit8 v2, v2, 0x2
-
-    new-array v2, v2, [Ljava/lang/String;
-
-    iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
-
-    iget v4, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    new-array v4, v4, [Ljava/lang/String;
 
     const/4 v5, 0x0
 
-    invoke-static {v3, v5, v0, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v5, v2, v5, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->pathIndices:[I
+    iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->pathIndices:[I
 
-    iget v4, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
-    invoke-static {v3, v5, v1, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v5, v3, v5, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->pathNames:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->pathNames:[Ljava/lang/String;
 
-    iget v4, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
-    invoke-static {v3, v5, v2, v5, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v5, v4, v5, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
+    iput-object v2, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
 
-    iput-object v1, p0, Lcom/google/gson/stream/JsonReader;->pathIndices:[I
+    iput-object v3, p0, Lcom/google/gson/stream/JsonReader;->pathIndices:[I
 
-    iput-object v2, p0, Lcom/google/gson/stream/JsonReader;->pathNames:[Ljava/lang/String;
+    iput-object v4, p0, Lcom/google/gson/stream/JsonReader;->pathNames:[Ljava/lang/String;
 
     :cond_0
     iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
@@ -1752,12 +1742,11 @@
 
     add-int/lit8 v6, v6, -0x30
 
-    :goto_3
     add-int/2addr v0, v6
 
     int-to-char v0, v0
 
-    goto :goto_5
+    goto :goto_3
 
     :cond_4
     const/16 v7, 0x61
@@ -1768,9 +1757,12 @@
 
     add-int/lit8 v6, v6, -0x61
 
-    :goto_4
     add-int/2addr v6, v1
 
+    add-int/2addr v0, v6
+
+    int-to-char v0, v0
+
     goto :goto_3
 
     :cond_5
@@ -1784,9 +1776,13 @@
 
     add-int/lit8 v6, v6, -0x41
 
-    goto :goto_4
+    add-int/2addr v6, v1
 
-    :goto_5
+    add-int/2addr v0, v6
+
+    int-to-char v0, v0
+
+    :goto_3
     add-int/lit8 v4, v4, 0x1
 
     goto :goto_2
@@ -1949,10 +1945,12 @@
     move-result-object p1
 
     throw p1
+
+    return-void
 .end method
 
 .method private skipTo(Ljava/lang/String;)Z
-    .locals 5
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -1993,23 +1991,21 @@
 
     aget-char v1, v1, v2
 
-    const/16 v2, 0xa
+    const/16 v4, 0xa
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    if-ne v1, v2, :cond_2
+    if-ne v1, v4, :cond_2
 
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->lineNumber:I
 
-    add-int/2addr v1, v4
+    add-int/2addr v1, v5
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->lineNumber:I
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    add-int/lit8 v2, v2, 0x1
 
-    add-int/2addr v1, v4
-
-    iput v1, p0, Lcom/google/gson/stream/JsonReader;->lineStart:I
+    iput v2, p0, Lcom/google/gson/stream/JsonReader;->lineStart:I
 
     goto :goto_3
 
@@ -2039,14 +2035,14 @@
     :goto_3
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    add-int/2addr v1, v4
+    add-int/2addr v1, v5
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
     goto :goto_0
 
     :cond_4
-    return v4
+    return v5
 .end method
 
 .method private skipToEndOfLine()V
@@ -2109,7 +2105,7 @@
 .end method
 
 .method private skipUnquotedValue()V
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -2122,19 +2118,17 @@
     :goto_0
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
+    add-int v2, v1, v0
+
+    iget v3, p0, Lcom/google/gson/stream/JsonReader;->limit:I
+
+    if-ge v2, v3, :cond_1
+
+    iget-object v2, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
+
     add-int/2addr v1, v0
 
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->limit:I
-
-    if-ge v1, v2, :cond_1
-
-    iget-object v1, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
-
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
-
-    add-int/2addr v2, v0
-
-    aget-char v1, v1, v2
+    aget-char v1, v2, v1
 
     sparse-switch v1, :sswitch_data_0
 
@@ -2155,8 +2149,6 @@
     return-void
 
     :cond_1
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
-
     add-int/2addr v1, v0
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
@@ -2171,8 +2163,6 @@
 
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         0x9 -> :sswitch_1
@@ -2398,60 +2388,56 @@
 
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
-    const/4 v2, 0x1
+    add-int/lit8 v2, v1, -0x1
 
-    sub-int/2addr v1, v2
+    aget v2, v0, v2
 
-    aget v0, v0, v1
+    const/16 v3, 0x8
 
-    const/16 v1, 0x8
+    const/16 v4, 0x27
 
-    const/4 v3, 0x3
+    const/16 v5, 0x22
 
-    const/16 v4, 0x5d
+    const/16 v6, 0x5d
 
-    const/16 v5, 0x27
+    const/4 v7, 0x3
 
-    const/16 v6, 0x22
+    const/4 v8, 0x7
 
-    const/4 v7, 0x7
+    const/16 v9, 0x3b
 
-    const/16 v8, 0x3b
+    const/16 v10, 0x2c
 
-    const/16 v9, 0x2c
+    const/4 v11, 0x4
 
-    const/4 v10, 0x4
+    const/4 v12, 0x2
 
-    const/4 v11, 0x2
+    const/4 v13, 0x1
 
-    if-ne v0, v2, :cond_0
+    if-ne v2, v13, :cond_0
 
-    iget-object v12, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
+    sub-int/2addr v1, v13
 
-    iget v13, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    aput v12, v0, v1
 
-    sub-int/2addr v13, v2
-
-    aput v11, v12, v13
-
-    goto/16 :goto_2
+    goto/16 :goto_0
 
     :cond_0
-    if-ne v0, v11, :cond_3
+    if-ne v2, v12, :cond_3
 
-    invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
+    invoke-direct {p0, v13}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
 
-    move-result v12
+    move-result v0
 
-    if-eq v12, v9, :cond_c
+    if-eq v0, v10, :cond_c
 
-    if-eq v12, v8, :cond_2
+    if-eq v0, v9, :cond_2
 
-    if-ne v12, v4, :cond_1
+    if-ne v0, v6, :cond_1
 
-    iput v10, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v11, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v10
+    return v11
 
     :cond_1
     const-string v0, "Unterminated array"
@@ -2465,73 +2451,66 @@
     :cond_2
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
-    goto/16 :goto_2
+    goto :goto_0
 
     :cond_3
-    const/4 v12, 0x5
+    const/4 v14, 0x5
 
-    if-eq v0, v3, :cond_19
+    if-eq v2, v7, :cond_19
 
-    if-ne v0, v12, :cond_4
+    if-ne v2, v14, :cond_4
 
-    goto/16 :goto_4
+    goto/16 :goto_2
 
     :cond_4
-    if-ne v0, v10, :cond_7
+    if-ne v2, v11, :cond_7
 
-    iget-object v13, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
+    sub-int/2addr v1, v13
 
-    iget v14, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    aput v14, v0, v1
 
-    sub-int/2addr v14, v2
+    invoke-direct {p0, v13}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
 
-    aput v12, v13, v14
+    move-result v0
 
-    invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
+    const/16 v1, 0x3a
 
-    move-result v12
+    if-eq v0, v1, :cond_c
 
-    const/16 v13, 0x3a
+    const/16 v1, 0x3d
 
-    if-eq v12, v13, :cond_c
-
-    const/16 v13, 0x3d
-
-    if-ne v12, v13, :cond_6
+    if-ne v0, v1, :cond_6
 
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
-    iget v12, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iget v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    iget v13, p0, Lcom/google/gson/stream/JsonReader;->limit:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->limit:I
 
-    if-lt v12, v13, :cond_5
+    if-lt v0, v1, :cond_5
 
-    invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->fillBuffer(I)Z
+    invoke-direct {p0, v13}, Lcom/google/gson/stream/JsonReader;->fillBuffer(I)Z
 
-    move-result v12
+    move-result v0
 
-    if-eqz v12, :cond_c
+    if-eqz v0, :cond_c
 
     :cond_5
-    iget-object v12, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
+    iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->buffer:[C
 
-    iget v13, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    aget-char v12, v12, v13
+    aget-char v0, v0, v1
 
-    const/16 v13, 0x3e
+    const/16 v14, 0x3e
 
-    if-ne v12, v13, :cond_c
+    if-ne v0, v14, :cond_c
 
-    iget v12, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    add-int/2addr v1, v13
 
-    add-int/2addr v12, v2
+    iput v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    :goto_0
-    iput v12, p0, Lcom/google/gson/stream/JsonReader;->pos:I
-
-    goto :goto_2
+    goto :goto_0
 
     :cond_6
     const-string v0, "Expected \':\'"
@@ -2543,43 +2522,42 @@
     throw v0
 
     :cond_7
-    const/4 v12, 0x6
+    const/4 v0, 0x6
 
-    if-ne v0, v12, :cond_9
+    if-ne v2, v0, :cond_9
 
-    iget-boolean v12, p0, Lcom/google/gson/stream/JsonReader;->lenient:Z
+    iget-boolean v0, p0, Lcom/google/gson/stream/JsonReader;->lenient:Z
 
-    if-eqz v12, :cond_8
+    if-eqz v0, :cond_8
 
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->consumeNonExecutePrefix()V
 
     :cond_8
-    iget-object v12, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
+    iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
 
-    iget v13, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
-    sub-int/2addr v13, v2
+    sub-int/2addr v1, v13
 
-    aput v7, v12, v13
+    aput v8, v0, v1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_9
-    if-ne v0, v7, :cond_b
+    if-ne v2, v8, :cond_b
 
-    const/4 v12, 0x0
+    const/4 v0, 0x0
 
-    invoke-direct {p0, v12}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
+    invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
 
-    move-result v12
+    move-result v0
 
-    const/4 v13, -0x1
+    const/4 v1, -0x1
 
-    if-ne v12, v13, :cond_a
+    if-ne v0, v1, :cond_a
 
     const/16 v0, 0x11
 
-    :goto_1
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
     return v0
@@ -2587,42 +2565,44 @@
     :cond_a
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
-    iget v12, p0, Lcom/google/gson/stream/JsonReader;->pos:I
+    iget v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    sub-int/2addr v12, v2
+    sub-int/2addr v0, v13
+
+    iput v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
     goto :goto_0
 
     :cond_b
-    if-eq v0, v1, :cond_18
+    if-eq v2, v3, :cond_18
 
     :cond_c
-    :goto_2
-    invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
+    :goto_0
+    invoke-direct {p0, v13}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
 
-    move-result v12
+    move-result v0
 
-    if-eq v12, v6, :cond_17
+    if-eq v0, v5, :cond_17
 
-    if-eq v12, v5, :cond_16
+    if-eq v0, v4, :cond_16
 
-    if-eq v12, v9, :cond_13
+    if-eq v0, v10, :cond_13
 
-    if-eq v12, v8, :cond_13
+    if-eq v0, v9, :cond_13
 
     const/16 v1, 0x5b
 
-    if-eq v12, v1, :cond_12
+    if-eq v0, v1, :cond_12
 
-    if-eq v12, v4, :cond_11
+    if-eq v0, v6, :cond_11
 
-    const/16 v0, 0x7b
+    const/16 v1, 0x7b
 
-    if-eq v12, v0, :cond_10
+    if-eq v0, v1, :cond_10
 
     iget v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v0, v13
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
@@ -2660,7 +2640,9 @@
 
     const/16 v0, 0xa
 
-    goto :goto_1
+    iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+
+    return v0
 
     :cond_f
     const-string v0, "Expected value"
@@ -2672,28 +2654,28 @@
     throw v0
 
     :cond_10
-    iput v2, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v13, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v2
+    return v13
 
     :cond_11
-    if-ne v0, v2, :cond_13
+    if-ne v2, v13, :cond_13
 
-    iput v10, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v11, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v10
+    return v11
 
     :cond_12
-    iput v3, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v7, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v3
+    return v7
 
     :cond_13
-    if-eq v0, v2, :cond_15
+    if-eq v2, v13, :cond_15
 
-    if-ne v0, v11, :cond_14
+    if-ne v2, v12, :cond_14
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_14
     const-string v0, "Unexpected value"
@@ -2705,30 +2687,32 @@
     throw v0
 
     :cond_15
-    :goto_3
+    :goto_1
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
     iget v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v0, v13
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    iput v7, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v8, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v7
+    return v8
 
     :cond_16
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
-    iput v1, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v3, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v1
+    return v3
 
     :cond_17
     const/16 v0, 0x9
 
-    goto :goto_1
+    iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+
+    return v0
 
     :cond_18
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -2740,32 +2724,32 @@
     throw v0
 
     :cond_19
-    :goto_4
-    iget-object v1, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
+    :goto_2
+    iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->stack:[I
 
-    iget v3, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
-    sub-int/2addr v3, v2
+    sub-int/2addr v1, v13
 
-    aput v10, v1, v3
+    aput v11, v0, v1
 
-    const/16 v1, 0x7d
+    const/16 v0, 0x7d
 
-    if-ne v0, v12, :cond_1c
+    if-ne v2, v14, :cond_1c
 
-    invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
+    invoke-direct {p0, v13}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
 
-    move-result v3
+    move-result v1
 
-    if-eq v3, v9, :cond_1c
+    if-eq v1, v10, :cond_1c
 
-    if-eq v3, v8, :cond_1b
+    if-eq v1, v9, :cond_1b
 
-    if-ne v3, v1, :cond_1a
+    if-ne v1, v0, :cond_1a
 
-    iput v11, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v12, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v11
+    return v12
 
     :cond_1a
     const-string v0, "Unterminated object"
@@ -2780,25 +2764,25 @@
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
     :cond_1c
-    invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
+    invoke-direct {p0, v13}, Lcom/google/gson/stream/JsonReader;->nextNonWhitespace(Z)I
 
-    move-result v3
+    move-result v1
 
-    if-eq v3, v6, :cond_21
+    if-eq v1, v5, :cond_21
 
-    if-eq v3, v5, :cond_20
+    if-eq v1, v4, :cond_20
 
-    if-eq v3, v1, :cond_1e
+    if-eq v1, v0, :cond_1e
 
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->checkLenient()V
 
     iget v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v0, v13
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    int-to-char v0, v3
+    int-to-char v0, v1
 
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->isLiteral(C)Z
 
@@ -2808,7 +2792,9 @@
 
     const/16 v0, 0xe
 
-    goto/16 :goto_1
+    iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+
+    return v0
 
     :cond_1d
     const-string v0, "Expected name"
@@ -2820,11 +2806,11 @@
     throw v0
 
     :cond_1e
-    if-eq v0, v12, :cond_1f
+    if-eq v2, v14, :cond_1f
 
-    iput v11, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+    iput v12, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    return v11
+    return v12
 
     :cond_1f
     const-string v0, "Expected name"
@@ -2840,12 +2826,16 @@
 
     const/16 v0, 0xc
 
-    goto/16 :goto_1
+    iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+
+    return v0
 
     :cond_21
     const/16 v0, 0xd
 
-    goto/16 :goto_1
+    iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
+
+    return v0
 .end method
 
 .method public endArray()V
@@ -2960,8 +2950,6 @@
 
     iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->pathIndices:[I
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
-
     add-int/lit8 v1, v1, -0x1
 
     aget v2, v0, v1
@@ -3007,7 +2995,7 @@
 .end method
 
 .method public getPath()Ljava/lang/String;
-    .locals 4
+    .locals 5
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -3037,11 +3025,9 @@
 
     iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->pathNames:[Ljava/lang/String;
 
-    aget-object v3, v3, v2
+    aget-object v4, v3, v2
 
-    if-eqz v3, :cond_0
-
-    iget-object v3, p0, Lcom/google/gson/stream/JsonReader;->pathNames:[Ljava/lang/String;
+    if-eqz v4, :cond_0
 
     aget-object v3, v3, v2
 
@@ -3338,7 +3324,7 @@
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     const/16 v1, 0x8
@@ -3349,7 +3335,7 @@
 
     if-ne v0, v4, :cond_3
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     const/16 v1, 0xa
@@ -3360,15 +3346,14 @@
 
     move-result-object v0
 
-    :goto_0
     iput-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     if-ne v0, v3, :cond_5
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -3400,24 +3385,24 @@
     throw v0
 
     :cond_6
-    :goto_1
+    :goto_0
     if-ne v0, v1, :cond_7
 
     const/16 v0, 0x27
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_7
     const/16 v0, 0x22
 
-    :goto_2
+    :goto_1
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextQuotedValue(C)Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_0
+    iput-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
-    :goto_3
+    :goto_2
     iput v3, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
     iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
@@ -3442,7 +3427,7 @@
 
     if-nez v3, :cond_8
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     new-instance v2, Lcom/google/gson/stream/MalformedJsonException;
@@ -3470,7 +3455,7 @@
     throw v2
 
     :cond_9
-    :goto_4
+    :goto_3
     const/4 v3, 0x0
 
     iput-object v3, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
@@ -3517,31 +3502,29 @@
 
     iget-wide v0, p0, Lcom/google/gson/stream/JsonReader;->peekedLong:J
 
-    long-to-int v0, v0
+    long-to-int v3, v0
 
-    iget-wide v3, p0, Lcom/google/gson/stream/JsonReader;->peekedLong:J
+    int-to-long v4, v3
 
-    int-to-long v5, v0
+    cmp-long v6, v0, v4
 
-    cmp-long v1, v3, v5
-
-    if-nez v1, :cond_1
+    if-nez v6, :cond_1
 
     iput v2, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
-    iget-object v1, p0, Lcom/google/gson/stream/JsonReader;->pathIndices:[I
+    iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->pathIndices:[I
 
-    iget v2, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
-    add-int/lit8 v2, v2, -0x1
+    add-int/lit8 v1, v1, -0x1
 
-    aget v3, v1, v2
+    aget v2, v0, v1
 
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
-    aput v3, v1, v2
+    aput v2, v0, v1
 
-    return v0
+    return v3
 
     :cond_1
     new-instance v0, Ljava/lang/NumberFormatException;
@@ -3595,7 +3578,7 @@
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/16 v1, 0xa
@@ -3649,29 +3632,28 @@
 
     move-result-object v0
 
-    :goto_1
     iput-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
     if-ne v0, v3, :cond_7
 
     const/16 v0, 0x27
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_7
     const/16 v0, 0x22
 
-    :goto_2
+    :goto_1
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextQuotedValue(C)Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_1
+    iput-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
-    :goto_3
+    :goto_2
     :try_start_0
     iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
@@ -3698,7 +3680,7 @@
     return v0
 
     :catch_0
-    :goto_4
+    :goto_3
     const/16 v0, 0xb
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
@@ -3831,7 +3813,7 @@
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_2
     const/16 v1, 0xa
@@ -3885,29 +3867,28 @@
 
     move-result-object v0
 
-    :goto_1
     iput-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     if-ne v0, v3, :cond_6
 
     const/16 v0, 0x27
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
     const/16 v0, 0x22
 
-    :goto_2
+    :goto_1
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextQuotedValue(C)Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_1
+    iput-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
-    :goto_3
+    :goto_2
     :try_start_0
     iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
@@ -3934,7 +3915,7 @@
     return-wide v0
 
     :catch_0
-    :goto_4
+    :goto_3
     const/16 v0, 0xb
 
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
@@ -4026,7 +4007,7 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/16 v1, 0xc
@@ -4035,12 +4016,11 @@
 
     const/16 v0, 0x27
 
-    :goto_0
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextQuotedValue(C)Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/16 v1, 0xd
@@ -4049,9 +4029,11 @@
 
     const/16 v0, 0x22
 
-    goto :goto_0
+    invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextQuotedValue(C)Ljava/lang/String;
 
-    :goto_1
+    move-result-object v0
+
+    :goto_0
     const/4 v1, 0x0
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
@@ -4190,7 +4172,7 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/16 v1, 0x8
@@ -4199,12 +4181,11 @@
 
     const/16 v0, 0x27
 
-    :goto_0
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextQuotedValue(C)Ljava/lang/String;
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const/16 v1, 0x9
@@ -4213,6 +4194,10 @@
 
     const/16 v0, 0x22
 
+    invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;->nextQuotedValue(C)Ljava/lang/String;
+
+    move-result-object v0
+
     goto :goto_0
 
     :cond_3
@@ -4226,7 +4211,7 @@
 
     iput-object v1, p0, Lcom/google/gson/stream/JsonReader;->peekedString:Ljava/lang/String;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
     const/16 v1, 0xf
@@ -4239,7 +4224,7 @@
 
     move-result-object v0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_5
     const/16 v1, 0x10
@@ -4264,7 +4249,7 @@
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    :goto_1
+    :goto_0
     const/4 v1, 0x0
 
     iput v1, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
@@ -4450,24 +4435,24 @@
 
     invoke-direct {p0, v4}, Lcom/google/gson/stream/JsonReader;->push(I)V
 
-    :goto_0
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_2
     if-ne v2, v4, :cond_3
 
     invoke-direct {p0, v3}, Lcom/google/gson/stream/JsonReader;->push(I)V
 
-    goto :goto_0
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_3
 
     :cond_3
     const/4 v3, 0x4
 
     if-ne v2, v3, :cond_4
 
-    :goto_1
     iget v2, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
     sub-int/2addr v2, v4
@@ -4476,14 +4461,22 @@
 
     add-int/lit8 v1, v1, -0x1
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_4
     const/4 v3, 0x2
 
     if-ne v2, v3, :cond_5
 
-    goto :goto_1
+    iget v2, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+
+    sub-int/2addr v2, v4
+
+    iput v2, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
+
+    add-int/lit8 v1, v1, -0x1
+
+    goto :goto_3
 
     :cond_5
     const/16 v3, 0xe
@@ -4494,7 +4487,7 @@
 
     if-ne v2, v3, :cond_6
 
-    goto :goto_5
+    goto :goto_2
 
     :cond_6
     const/16 v3, 0x8
@@ -4505,7 +4498,7 @@
 
     if-ne v2, v3, :cond_7
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_7
     const/16 v3, 0x9
@@ -4516,7 +4509,7 @@
 
     if-ne v2, v3, :cond_8
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_8
     const/16 v3, 0x10
@@ -4531,29 +4524,30 @@
 
     iput v2, p0, Lcom/google/gson/stream/JsonReader;->pos:I
 
-    goto :goto_6
+    goto :goto_3
 
     :cond_9
-    :goto_2
+    :goto_0
     const/16 v2, 0x22
 
-    goto :goto_4
-
-    :cond_a
-    :goto_3
-    const/16 v2, 0x27
-
-    :goto_4
     invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->skipQuotedValue(C)V
 
-    goto :goto_6
+    goto :goto_3
+
+    :cond_a
+    :goto_1
+    const/16 v2, 0x27
+
+    invoke-direct {p0, v2}, Lcom/google/gson/stream/JsonReader;->skipQuotedValue(C)V
+
+    goto :goto_3
 
     :cond_b
-    :goto_5
+    :goto_2
     invoke-direct {p0}, Lcom/google/gson/stream/JsonReader;->skipUnquotedValue()V
 
     :cond_c
-    :goto_6
+    :goto_3
     iput v0, p0, Lcom/google/gson/stream/JsonReader;->peeked:I
 
     if-nez v1, :cond_0
@@ -4562,18 +4556,16 @@
 
     iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
 
-    sub-int/2addr v1, v4
+    add-int/lit8 v2, v1, -0x1
 
-    aget v2, v0, v1
+    aget v3, v0, v2
 
-    add-int/2addr v2, v4
+    add-int/2addr v3, v4
 
-    aput v2, v0, v1
+    aput v3, v0, v2
 
     iget-object v0, p0, Lcom/google/gson/stream/JsonReader;->pathNames:[Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/gson/stream/JsonReader;->stackSize:I
-
     sub-int/2addr v1, v4
 
     const-string v2, "null"
diff --git a/com.discord/smali_classes2/com/google/gson/stream/JsonScope.smali b/com.discord/smali_classes2/com/google/gson/stream/JsonScope.smali
index 1ceef8709f..8ba0aa1751 100644
--- a/com.discord/smali_classes2/com/google/gson/stream/JsonScope.smali
+++ b/com.discord/smali_classes2/com/google/gson/stream/JsonScope.smali
@@ -1,5 +1,6 @@
 .class final Lcom/google/gson/stream/JsonScope;
 .super Ljava/lang/Object;
+.source "JsonScope.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/google/gson/stream/JsonToken.smali b/com.discord/smali_classes2/com/google/gson/stream/JsonToken.smali
index 7e21a3fb25..3a10fb5404 100644
--- a/com.discord/smali_classes2/com/google/gson/stream/JsonToken.smali
+++ b/com.discord/smali_classes2/com/google/gson/stream/JsonToken.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/google/gson/stream/JsonToken;
 .super Ljava/lang/Enum;
+.source "JsonToken.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/google/gson/stream/JsonWriter.smali b/com.discord/smali_classes2/com/google/gson/stream/JsonWriter.smali
index 6f4b2f2d32..f95b82fb98 100644
--- a/com.discord/smali_classes2/com/google/gson/stream/JsonWriter.smali
+++ b/com.discord/smali_classes2/com/google/gson/stream/JsonWriter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/google/gson/stream/JsonWriter;
 .super Ljava/lang/Object;
+.source "JsonWriter.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -84,56 +85,42 @@
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0x5c
 
     const-string v2, "\\\\"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0x9
 
     const-string v2, "\\t"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0x8
 
     const-string v2, "\\b"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0xa
 
     const-string v2, "\\n"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0xd
 
     const-string v2, "\\r"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0xc
 
     const-string v2, "\\f"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->REPLACEMENT_CHARS:[Ljava/lang/String;
-
     invoke-virtual {v0}, [Ljava/lang/String;->clone()Ljava/lang/Object;
 
     move-result-object v0
@@ -156,24 +143,18 @@
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->HTML_SAFE_REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0x26
 
     const-string v2, "\\u0026"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->HTML_SAFE_REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0x3d
 
     const-string v2, "\\u003d"
 
     aput-object v2, v0, v1
 
-    sget-object v0, Lcom/google/gson/stream/JsonWriter;->HTML_SAFE_REPLACEMENT_CHARS:[Ljava/lang/String;
-
     const/16 v1, 0x27
 
     const-string v2, "\\u0027"
@@ -506,13 +487,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/stream/JsonWriter;->stack:[I
+    iget-object v1, p0, Lcom/google/gson/stream/JsonWriter;->stack:[I
 
-    iget v1, p0, Lcom/google/gson/stream/JsonWriter;->stackSize:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
-
-    aget v0, v0, v1
+    aget v0, v1, v0
 
     return v0
 
@@ -533,25 +512,19 @@
 
     iget-object v1, p0, Lcom/google/gson/stream/JsonWriter;->stack:[I
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ne v0, v1, :cond_0
+    if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/google/gson/stream/JsonWriter;->stackSize:I
+    mul-int/lit8 v2, v0, 0x2
 
-    mul-int/lit8 v0, v0, 0x2
-
-    new-array v0, v0, [I
-
-    iget-object v1, p0, Lcom/google/gson/stream/JsonWriter;->stack:[I
-
-    iget v2, p0, Lcom/google/gson/stream/JsonWriter;->stackSize:I
+    new-array v2, v2, [I
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/gson/stream/JsonWriter;->stack:[I
+    iput-object v2, p0, Lcom/google/gson/stream/JsonWriter;->stack:[I
 
     :cond_0
     iget-object v0, p0, Lcom/google/gson/stream/JsonWriter;->stack:[I
@@ -1040,7 +1013,6 @@
 
     const-string p1, ":"
 
-    :goto_0
     iput-object p1, p0, Lcom/google/gson/stream/JsonWriter;->separator:Ljava/lang/String;
 
     return-void
@@ -1050,7 +1022,9 @@
 
     const-string p1, ": "
 
-    goto :goto_0
+    iput-object p1, p0, Lcom/google/gson/stream/JsonWriter;->separator:Ljava/lang/String;
+
+    return-void
 .end method
 
 .method public final setLenient(Z)V
diff --git a/com.discord/smali_classes2/com/google/gson/stream/MalformedJsonException.smali b/com.discord/smali_classes2/com/google/gson/stream/MalformedJsonException.smali
index 96299c2090..c099412dca 100644
--- a/com.discord/smali_classes2/com/google/gson/stream/MalformedJsonException.smali
+++ b/com.discord/smali_classes2/com/google/gson/stream/MalformedJsonException.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/google/gson/stream/MalformedJsonException;
 .super Ljava/io/IOException;
+.source "MalformedJsonException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
index c283c04849..917a40f43d 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/hammerandchisel/libdiscord/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectToServerCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectToServerCallback.smali
index 353d34590c..b6b01923f2 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectToServerCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectToServerCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectionInfo.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectionInfo.smali
index 35b4a314fa..b4578b0676 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectionInfo.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$ConnectionInfo.smali
@@ -1,5 +1,6 @@
 .class public Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionModesCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionModesCallback.smali
index 0d6c824445..cdde39d35e 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionModesCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionModesCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$EncryptionModesCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionSettings.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionSettings.smali
index 50b23b47ae..a7edb6a221 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionSettings.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$EncryptionSettings.smali
@@ -1,5 +1,6 @@
 .class public Lcom/hammerandchisel/libdiscord/Discord$EncryptionSettings;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioInputDevicesCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioInputDevicesCallback.smali
index ff20e15856..4322185672 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioInputDevicesCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioInputDevicesCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$GetAudioInputDevicesCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioOutputDevicesCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioOutputDevicesCallback.smali
index 2b202df3b2..459225084b 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioOutputDevicesCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioOutputDevicesCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$GetAudioOutputDevicesCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioSubsystemCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioSubsystemCallback.smali
index a432850d42..d9aa824982 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioSubsystemCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetAudioSubsystemCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$GetAudioSubsystemCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallback.smali
index 89fca81746..7162b9cd3a 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$GetStatsCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallbackNative.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallbackNative.smali
index 50146c9d1a..29f66491ce 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallbackNative.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetStatsCallbackNative.smali
@@ -1,5 +1,6 @@
 .class Lcom/hammerandchisel/libdiscord/Discord$GetStatsCallbackNative;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback.smali
index d74ce4c6d8..890a4db61b 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback.smali
index d6f72e986f..da68689167 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$OnVideoCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$OnVideoCallback.smali
index c8c8ba465d..566226c2c9 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$OnVideoCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$OnVideoCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$OnVideoCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$StatsFilter.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$StatsFilter.smali
index bb4f4a3710..9f3993d845 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$StatsFilter.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$StatsFilter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/hammerandchisel/libdiscord/Discord$StatsFilter;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$UserSpeakingStatusChangedCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$UserSpeakingStatusChangedCallback.smali
index 57ddab79aa..db52dad16d 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$UserSpeakingStatusChangedCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$UserSpeakingStatusChangedCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$UserSpeakingStatusChangedCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$VideoFrameCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$VideoFrameCallback.smali
index 2ac166b17d..096c4180e5 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$VideoFrameCallback.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$VideoFrameCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$VideoFrameCallback;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
index 018220764f..3913570a19 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
@@ -1,5 +1,6 @@
 .class public Lcom/hammerandchisel/libdiscord/Discord;
 .super Ljava/lang/Object;
+.source "Discord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R.smali
index 875a010e1b..0613504517 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/hammerandchisel/libdiscord/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali b/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali
index ae410cd238..54e6ed6938 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/lytefast/flexinput/FlexInputCoordinator;
 .super Ljava/lang/Object;
+.source "FlexInputCoordinator.kt"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract De()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public abstract Dd()Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/InputListener.smali b/com.discord/smali_classes2/com/lytefast/flexinput/InputListener.smali
index 553e47b912..318e889ea4 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/InputListener.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/InputListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/lytefast/flexinput/InputListener;
 .super Ljava/lang/Object;
+.source "InputListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$a.smali
index e59e9dcb09..f41d06f7b3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 b7a2bc15ee..21f4d82d03 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$b;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 b5fabe7e89..3918bc4a75 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$c;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 6f7be7b46f..7a0c548b1f 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$d;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 077dfef48f..50fa6a6e3a 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$e;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 5050881aa0..b5843c72dc 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$f;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 8fc197780f..c5a9815bf7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$g;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
index e596c92ebe..c6b24a41f0 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$h;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 ec2a35812a..d7434b4658 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R$i;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R.smali
index 6d3f499c65..cc5c57ed28 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 41a3560a36..6b74ec7ef2 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;
 .super Ljava/lang/Object;
+.source "AttachmentPreviewAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 e2291049c1..51fb33b9ea 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "AttachmentPreviewAdapter.kt"
 
 
 # annotations
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 25edb469cc..ede38e481e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "AttachmentPreviewAdapter.kt"
 
 
 # annotations
@@ -203,7 +204,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hr()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hq()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v2
 
@@ -219,7 +220,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fN()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v1
 
@@ -237,13 +238,13 @@
 
     const/4 v2, 0x1
 
-    invoke-virtual {v1, v2}, Lcom/facebook/drawee/backends/pipeline/e;->x(Z)Lcom/facebook/drawee/controller/a;
+    invoke-virtual {v1, v2}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
 
     move-result-object v1
 
     check-cast v1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jx()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jw()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -253,7 +254,7 @@
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->gl()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 4d2abe7252..cc9f94a57b 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "EmptyListAdapter.kt"
 
 
 # annotations
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 32fa9a1883..e9896d5441 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "EmptyListAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$a.smali
index cf578f7c0b..eb3c7e3266 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/FileListAdapter$a$a;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
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 cf4ff20c16..cefb3d17dc 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/FileListAdapter$a$b;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
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 abff5de049..33f62edaa0 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
 .super Lkotlin/jvm/internal/k;
+.source "FileListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 b03865e4ce..5840063e97 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
 .super Landroid/os/AsyncTask;
+.source "FileListAdapter.kt"
 
 
 # annotations
@@ -98,7 +99,6 @@
 
     check-cast v2, Ljava/util/Collection;
 
-    :goto_0
     invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->v(Ljava/io/File;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
@@ -106,7 +106,7 @@
     invoke-static {v2, p1}, Lkotlin/a/l;->a(Ljava/util/Collection;Lkotlin/sequences/Sequence;)Z
 
     :cond_0
-    :goto_1
+    :goto_0
     invoke-virtual {v1}, Ljava/util/LinkedList;->isEmpty()Z
 
     move-result p1
@@ -135,6 +135,12 @@
 
     if-eqz v3, :cond_1
 
+    invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->v(Ljava/io/File;)Lkotlin/sequences/Sequence;
+
+    move-result-object p1
+
+    invoke-static {v2, p1}, Lkotlin/a/l;->a(Ljava/util/Collection;Lkotlin/sequences/Sequence;)Z
+
     goto :goto_0
 
     :cond_1
@@ -144,7 +150,7 @@
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     check-cast v0, Ljava/util/List;
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 71c46a3ccc..02e9de3d2e 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;
 .super Ljava/lang/Object;
+.source "FileListAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -38,9 +39,7 @@
 
     iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bFZ:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bFZ:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
-
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bFY:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bFY:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/adapters/FileListAdapter;->a(Lcom/lytefast/flexinput/adapters/FileListAdapter;)Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
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 f6636c6364..fc7a3406cb 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/adapters/FileListAdapter$b$a;
 .super Lkotlin/jvm/internal/k;
+.source "FileListAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
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 f3aedabedf..e92d015ed5 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "FileListAdapter.kt"
 
 
 # annotations
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 8c1f04cd42..f0237cf144 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/FileListAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "FileListAdapter.kt"
 
 
 # annotations
@@ -218,7 +219,7 @@
 
     const/4 v2, 0x1
 
-    if-eqz p2, :cond_2
+    if-eqz p2, :cond_3
 
     invoke-virtual {p2}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -240,7 +241,7 @@
 
     add-int/2addr v4, v2
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_2
 
     invoke-virtual {v3, v4}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
@@ -258,7 +259,7 @@
 
     move-result v4
 
-    if-nez v4, :cond_2
+    if-nez v4, :cond_1
 
     invoke-static {}, Landroid/webkit/MimeTypeMap;->getSingleton()Landroid/webkit/MimeTypeMap;
 
@@ -271,6 +272,11 @@
     goto :goto_1
 
     :cond_1
+    move-object v3, v0
+
+    goto :goto_1
+
+    :cond_2
     new-instance p1, Lkotlin/r;
 
     const-string p2, "null cannot be cast to non-null type java.lang.String"
@@ -279,7 +285,7 @@
 
     throw p1
 
-    :cond_2
+    :cond_3
     move-object v3, v0
 
     :goto_1
@@ -287,40 +293,40 @@
 
     check-cast v4, Ljava/lang/CharSequence;
 
-    if-eqz v4, :cond_4
+    if-eqz v4, :cond_5
 
     invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
 
     move-result v4
 
-    if-nez v4, :cond_3
+    if-nez v4, :cond_4
 
     goto :goto_2
 
-    :cond_3
+    :cond_4
     const/4 v4, 0x0
 
     goto :goto_3
 
-    :cond_4
+    :cond_5
     :goto_2
     const/4 v4, 0x1
 
     :goto_3
-    if-nez v4, :cond_c
+    if-nez v4, :cond_d
 
-    if-nez v3, :cond_5
+    if-nez v3, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
-    :cond_5
+    :cond_6
     const-string v4, "image"
 
     invoke-static {v3, v4, v1}, Lkotlin/text/l;->b(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v4
 
-    if-eqz v4, :cond_b
+    if-eqz v4, :cond_c
 
     iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bFU:Landroid/widget/ImageView;
 
@@ -366,7 +372,7 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_a
+    if-eqz p2, :cond_b
 
     check-cast p2, Ljava/io/Closeable;
 
@@ -382,13 +388,13 @@
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_1
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
-    if-nez v4, :cond_6
+    if-nez v4, :cond_7
 
     invoke-static {p2, v0}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
     return-void
 
-    :cond_6
+    :cond_7
     :try_start_1
     invoke-interface {v3, v1}, Landroid/database/Cursor;->getLong(I)J
 
@@ -402,7 +408,7 @@
 
     cmp-long v3, v6, v8
 
-    if-nez v3, :cond_7
+    if-nez v3, :cond_8
 
     iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bFY:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
@@ -412,11 +418,11 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_7
+    if-eqz v3, :cond_8
 
     invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
-    :cond_7
+    :cond_8
     iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bFY:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     iget-object v6, v3, Lcom/lytefast/flexinput/adapters/FileListAdapter;->contentResolver:Landroid/content/ContentResolver;
@@ -445,7 +451,7 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_9
+    if-eqz v2, :cond_a
 
     check-cast v2, Ljava/io/Closeable;
     :try_end_1
@@ -464,7 +470,7 @@
     .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    if-nez v4, :cond_8
+    if-nez v4, :cond_9
 
     :try_start_3
     invoke-static {v2, v0}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V
@@ -476,7 +482,7 @@
 
     return-void
 
-    :cond_8
+    :cond_9
     :try_start_4
     invoke-interface {v3, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -484,7 +490,7 @@
 
     iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bFT:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fO()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->fN()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v4
 
@@ -510,13 +516,13 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gl()Lcom/facebook/drawee/controller/a;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gk()Lcom/facebook/drawee/controller/a;
 
     move-result-object p1
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gm()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gl()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -570,7 +576,7 @@
     .catch Ljava/lang/Throwable; {:try_start_7 .. :try_end_7} :catch_1
     .catchall {:try_start_7 .. :try_end_7} :catchall_2
 
-    :cond_9
+    :cond_a
     :goto_5
     invoke-static {p2, v0}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
@@ -596,17 +602,17 @@
 
     throw p1
 
-    :cond_a
+    :cond_b
     return-void
 
-    :cond_b
+    :cond_c
     const-string v0, "video"
 
     invoke-static {v3, v0, v1}, Lkotlin/text/l;->b(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
-    if-eqz v0, :cond_c
+    if-eqz v0, :cond_d
 
     iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bFU:Landroid/widget/ImageView;
 
@@ -626,7 +632,7 @@
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;)V
 
-    :cond_c
+    :cond_d
     return-void
 .end method
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali
index 9aa7b27560..6a50338c76 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a;
 .super Lkotlin/jvm/internal/k;
+.source "PhotoCursorAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali
index ae05d52ec9..e4d4fa5eba 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 .super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "PhotoCursorAdapter.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 b537eae193..f2a24c1798 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
@@ -1,10 +1,11 @@
 .class public final Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 .super Landroid/content/AsyncQueryHandler;
+.source "PhotoCursorAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->Df()V
+    value = Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->De()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 166395e856..766ad96ba6 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 .super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "PhotoCursorAdapter.kt"
 
 
 # annotations
@@ -204,7 +205,7 @@
 
 
 # virtual methods
-.method public final Df()V
+.method public final De()V
     .locals 8
 
     new-instance v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
@@ -299,7 +300,7 @@
 
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->Df()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->De()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$a.smali
index f266dc2e0f..aeead8e3b2 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/a$a$a;
 .super Lcom/lytefast/flexinput/adapters/a$b;
+.source "AddContentPagerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$b.smali
index 0f8a576424..701bd2a489 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/a$a$b;
 .super Lcom/lytefast/flexinput/adapters/a$b;
+.source "AddContentPagerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$c.smali
index 29d1399a1f..42e46f6dc3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/a$a$c;
 .super Lcom/lytefast/flexinput/adapters/a$b;
+.source "AddContentPagerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a.smali
index 9501029165..7322dfca50 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/a$a;
 .super Ljava/lang/Object;
+.source "AddContentPagerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$b.smali
index b51a65ee13..f90f544bf4 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a$b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lcom/lytefast/flexinput/adapters/a$b;
 .super Ljava/lang/Object;
+.source "AddContentPagerAdapter.kt"
 
 
 # annotations
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 6c225b8198..ff887d8579 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/adapters/a;
 .super Landroidx/fragment/app/FragmentPagerAdapter;
+.source "AddContentPagerAdapter.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$Companion.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$Companion.smali
index 172d803369..3612ea3888 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$Companion.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/CameraFragment$Companion;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 
 # annotations
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 eae3d1a973..7ebb34ce7a 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$a;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali
index 61f774eb2b..239feb0bc7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$b;
 .super Lkotlin/jvm/internal/k;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -55,7 +56,7 @@
 
     if-gez v0, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/16 v3, 0x14
@@ -68,13 +69,12 @@
 
     if-ne v0, v2, :cond_3
 
-    :goto_0
     const/4 v1, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    :goto_1
+    :goto_0
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$b;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment;->getContext()Landroid/content/Context;
@@ -83,7 +83,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     const-string v3, "camera"
@@ -104,10 +104,10 @@
 
     if-ne v0, v2, :cond_3
 
-    goto :goto_0
+    const/4 v1, 0x1
 
     :cond_3
-    :goto_2
+    :goto_1
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v0
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali
index af34225ebd..1ecb83e734 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$c;
 .super Lkotlin/jvm/internal/k;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali
index 4d4a796063..b6a0ff69cb 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -79,6 +80,8 @@
 
     invoke-interface {v0, v1}, Lcom/lytefast/flexinput/FlexInputCoordinator;->a(Lcom/lytefast/flexinput/model/Attachment;)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali
index 8d0f158cef..bcd55949e5 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -56,7 +57,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Dr()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Dq()Ljava/io/File;
 
     move-result-object v0
 
@@ -150,6 +151,8 @@
 
     invoke-static {v2, v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
+    return-void
+
     :cond_0
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1.smali
index 97cbc2b7fc..6aa49f15f3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
 .super Lcom/google/android/cameraview/CameraView$Callback;
+.source "CameraFragment.kt"
 
 
 # annotations
@@ -70,9 +71,7 @@
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
-
-    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/CameraFragment;->getCameraFacingBtn()Landroid/widget/ImageView;
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment;->getCameraFacingBtn()Landroid/widget/ImageView;
 
     move-result-object v1
 
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 9cb59d004a..017a1926d7 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$d;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -60,9 +61,7 @@
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
-
-    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/CameraFragment;->getCameraView()Lcom/google/android/cameraview/CameraView;
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment;->getCameraView()Lcom/google/android/cameraview/CameraView;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e.smali
index 577f1c130a..4520e430af 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$e;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$f.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$f.smali
index 6063bf4b9d..8da47f6006 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$f.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$f.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$f;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$g.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$g.smali
index 6195e1f300..eb45ac6bbf 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$g.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$g;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$h.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$h.smali
index 4c3ee884bf..236e352706 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$h.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$h.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$h;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali
index 57a8705a2a..73300a8835 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$i;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
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 54145bc37a..38c7e052da 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/fragment/CameraFragment$j;->Dj()V
+    value = Lcom/lytefast/flexinput/fragment/CameraFragment$j;->Di()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 97d11aa6c8..9235022977 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/CameraFragment$j;
 .super Ljava/lang/Object;
+.source "CameraFragment.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;
@@ -38,7 +39,7 @@
 
 
 # virtual methods
-.method public final Dj()V
+.method public final Di()V
     .locals 2
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
@@ -56,7 +57,7 @@
     return-void
 .end method
 
-.method public final Dk()V
+.method public final Dj()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 7f009be029..65c5ef8a41 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/fragment/CameraFragment;
 .super Lcom/lytefast/flexinput/fragment/PermissionsFragment;
+.source "CameraFragment.kt"
 
 
 # annotations
@@ -370,9 +371,9 @@
 
     move-result v2
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
     if-eqz v2, :cond_3
 
@@ -416,20 +417,18 @@
 
     invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
-    move-result v3
+    move-result v4
 
     :cond_4
-    add-int/2addr v3, v4
+    add-int/2addr v4, v3
 
     sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment;->FACING_STATE_CYCLE_LIST:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    rem-int/2addr v3, v0
+    rem-int/2addr v4, v1
 
-    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment;->FACING_STATE_CYCLE_LIST:[I
-
-    aget v0, v0, v3
+    aget v0, v0, v4
 
     invoke-direct {p0, p1, v0}, Lcom/lytefast/flexinput/fragment/CameraFragment;->setFacing(Landroid/widget/ImageView;I)V
 
@@ -437,7 +436,7 @@
 .end method
 
 .method private final onCameraFlashClick(Landroid/widget/ImageView;)V
-    .locals 10
+    .locals 11
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment;->cameraView:Lcom/google/android/cameraview/CameraView;
 
@@ -469,9 +468,9 @@
 
     move-result v2
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
     if-eqz v2, :cond_3
 
@@ -515,32 +514,30 @@
 
     invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
-    move-result v3
+    move-result v4
 
     :cond_4
-    add-int/2addr v3, v4
+    add-int/2addr v4, v3
 
     sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment;->FLASH_STATE_CYCLE_LIST:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    rem-int/2addr v3, v0
+    rem-int/2addr v4, v1
 
-    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment;->FLASH_STATE_CYCLE_LIST:[I
+    aget v7, v0, v4
 
-    aget v6, v0, v3
+    const/4 v8, 0x0
 
-    const/4 v7, 0x0
+    const/4 v9, 0x4
 
-    const/4 v8, 0x4
+    const/4 v10, 0x0
 
-    const/4 v9, 0x0
+    move-object v5, p0
 
-    move-object v4, p0
+    move-object v6, p1
 
-    move-object v5, p1
-
-    invoke-static/range {v4 .. v9}, Lcom/lytefast/flexinput/fragment/CameraFragment;->setFlash$default(Lcom/lytefast/flexinput/fragment/CameraFragment;Landroid/widget/ImageView;IZILjava/lang/Object;)V
+    invoke-static/range {v5 .. v10}, Lcom/lytefast/flexinput/fragment/CameraFragment;->setFlash$default(Lcom/lytefast/flexinput/fragment/CameraFragment;Landroid/widget/ImageView;IZILjava/lang/Object;)V
 
     return-void
 .end method
@@ -574,7 +571,7 @@
 
     iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment;->flexInputCoordinator:Lcom/lytefast/flexinput/FlexInputCoordinator;
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_4
 
     invoke-interface {v1}, Lcom/lytefast/flexinput/FlexInputCoordinator;->getFileManager()Lcom/lytefast/flexinput/managers/FileManager;
 
@@ -585,7 +582,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-interface {v1}, Lcom/lytefast/flexinput/managers/FileManager;->Dr()Ljava/io/File;
+    invoke-interface {v1}, Lcom/lytefast/flexinput/managers/FileManager;->Dq()Ljava/io/File;
 
     move-result-object v2
 
@@ -638,6 +635,9 @@
     invoke-virtual {p0, v3, v0}, Lcom/lytefast/flexinput/fragment/CameraFragment;->startActivityForResult(Landroid/content/Intent;I)V
 
     :cond_3
+    return-void
+
+    :cond_4
     :goto_0
     return-void
 .end method
@@ -1139,6 +1139,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1177,6 +1179,8 @@
 
     invoke-virtual {p1}, Ljava/io/File;->delete()Z
 
+    return-void
+
     :pswitch_0
     return-void
 
@@ -1212,6 +1216,8 @@
     :cond_3
     invoke-virtual {p1}, Lcom/google/android/cameraview/CameraView;->stop()V
 
+    return-void
+
     :cond_4
     return-void
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$Companion.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$Companion.smali
index 026f523a5d..a675a7bb49 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$Companion.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/FilesFragment$Companion;
 .super Ljava/lang/Object;
+.source "FilesFragment.kt"
 
 
 # annotations
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 56d83eb6ee..4a6909875a 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FilesFragment$a;
 .super Ljava/lang/Object;
+.source "FilesFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 dee47af82a..d8e5ffd3eb 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$b.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FilesFragment$b;
 .super Lkotlin/jvm/internal/i;
+.source "FilesFragment.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
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 3139af5f97..2b397375a4 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/FilesFragment$c;
 .super Ljava/lang/Object;
+.source "FilesFragment.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;
@@ -38,7 +39,7 @@
 
 
 # virtual methods
-.method public final Dj()V
+.method public final Di()V
     .locals 4
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->bGz:Lcom/lytefast/flexinput/fragment/FilesFragment;
@@ -59,15 +60,13 @@
 
     new-instance v2, Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->bGz:Lcom/lytefast/flexinput/fragment/FilesFragment;
-
-    invoke-static {v3}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$getSelectionCoordinator$p(Lcom/lytefast/flexinput/fragment/FilesFragment;)Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    invoke-static {v1}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$getSelectionCoordinator$p(Lcom/lytefast/flexinput/fragment/FilesFragment;)Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     move-result-object v3
 
     if-nez v3, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-direct {v2, v0, v3}, Lcom/lytefast/flexinput/adapters/FileListAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -97,11 +96,13 @@
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$loadDownloadFolder(Lcom/lytefast/flexinput/fragment/FilesFragment;)V
 
+    return-void
+
     :cond_2
     return-void
 .end method
 
-.method public final Dk()V
+.method public final Dj()V
     .locals 3
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->bGz:Lcom/lytefast/flexinput/fragment/FilesFragment;
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 ce3bafb5b2..1bf502e49e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/fragment/FilesFragment;
 .super Lcom/lytefast/flexinput/fragment/PermissionsFragment;
+.source "FilesFragment.kt"
 
 
 # annotations
@@ -122,7 +123,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-virtual {v0, v1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setRefreshing(Z)V
@@ -140,7 +141,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     const-string v3, "downloadFolder"
@@ -167,7 +168,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_3
     invoke-virtual {v0, v1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setRefreshing(Z)V
@@ -277,7 +278,7 @@
 
     if-eqz p3, :cond_3
 
-    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->De()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->Dd()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p3
 
@@ -285,7 +286,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-virtual {p3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -347,7 +348,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_4
     invoke-direct {p2, p3, v0}, Lcom/lytefast/flexinput/adapters/FileListAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -360,6 +361,10 @@
 
     iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->adapter:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
+    check-cast p3, Landroidx/recyclerview/widget/RecyclerView$Adapter;
+
+    invoke-virtual {p2, p3}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+
     goto :goto_1
 
     :cond_5
@@ -377,12 +382,12 @@
 
     move-result-object p3
 
-    :goto_1
     check-cast p3, Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     invoke-virtual {p2, p3}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     :cond_6
+    :goto_1
     sget p2, Lcom/lytefast/flexinput/R$e;->swipeRefreshLayout:I
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
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 6206664d3b..80bd577b68 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 1d94c1b0ce..7c0c6a0771 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -38,7 +39,7 @@
 
     iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->bGP:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dm()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dl()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 21d0f769d4..dc6620806b 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -38,7 +39,7 @@
 
     iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->bGP:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dn()Z
 
     iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bGK:Lcom/lytefast/flexinput/managers/a;
 
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 d79892af4f..b285aa9583 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/view/View$OnLongClickListener;
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 66fdf28ca8..d1b6bb4857 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/text/TextWatcher;
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 ca45d51e25..6b131cd800 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
@@ -49,7 +50,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dn()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 1b47ed92bc..d3e0f2b21b 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -50,9 +51,7 @@
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->bGP:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->bGP:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-
-    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
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 2ab9e95f95..16eeaf9302 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$3.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -51,7 +52,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dp()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Ljava/lang/String;
 
     move-result-object v0
 
@@ -85,7 +86,7 @@
 
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dp()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Ljava/lang/String;
 
     move-result-object v0
 
@@ -180,7 +181,7 @@
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->requestLayout()V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dp()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Ljava/lang/String;
 
     move-result-object v0
 
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 4aa27172c6..d9a6db95c1 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 74ddd2e40f..706a5da6f9 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/content/DialogInterface$OnDismissListener;
@@ -107,6 +108,8 @@
 
     invoke-static {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->c(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
 
+    return-void
+
     :cond_3
     :goto_0
     return-void
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 9ff34502d0..fffada49d1 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -44,8 +45,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->bGS:Landroidx/fragment/app/DialogFragment;
-
     invoke-virtual {v0}, Landroidx/fragment/app/DialogFragment;->isAdded()Z
 
     move-result v0
@@ -80,7 +79,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dp()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()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 b084a3a4cc..61f214ee9b 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Dq()V
+    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Dp()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 99f949fb7e..e828af0c8f 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
@@ -41,7 +42,7 @@
     return-void
 .end method
 
-.method private Dq()V
+.method private Dp()V
     .locals 2
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bGP:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
@@ -69,7 +70,7 @@
 .method public final synthetic onItemSelected(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Dq()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Dp()V
 
     return-void
 .end method
@@ -77,7 +78,7 @@
 .method public final synthetic onItemUnselected(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Dq()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Dp()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 24155ec04d..3b975e1a10 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -38,7 +39,7 @@
 
     iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->bGP:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dn()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dm()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 c28c0f7d0f..c0f3f47b1e 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;
 .super Ljava/lang/Object;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -46,7 +47,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dn()Z
 
     iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bGK:Lcom/lytefast/flexinput/managers/a;
 
@@ -75,7 +76,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->ae(Z)V
+    invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->ad(Z)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
index 92f8caa822..cdbaaf5ccb 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 .super Landroidx/fragment/app/Fragment;
+.source "FlexInputFragment.java"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/FlexInputCoordinator;
@@ -82,7 +83,7 @@
     return-void
 .end method
 
-.method static synthetic Dp()Ljava/lang/String;
+.method static synthetic Do()Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->TAG:Ljava/lang/String;
@@ -266,7 +267,7 @@
 
 
 # virtual methods
-.method public final De()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public final Dd()Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .locals 1
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
@@ -288,24 +289,20 @@
     return-object v0
 .end method
 
-.method public final Dl()[Lcom/lytefast/flexinput/adapters/a$b;
+.method public final Dk()[Lcom/lytefast/flexinput/adapters/a$b;
     .locals 5
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bFG:[Lcom/lytefast/flexinput/adapters/a$b;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bFG:[Lcom/lytefast/flexinput/adapters/a$b;
+    array-length v1, v0
 
-    array-length v0, v0
-
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bFG:[Lcom/lytefast/flexinput/adapters/a$b;
-
     return-object v0
 
     :cond_1
@@ -361,7 +358,7 @@
     return-object v0
 .end method
 
-.method public final Dm()V
+.method public final Dl()V
     .locals 3
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bGL:Lcom/lytefast/flexinput/InputListener;
@@ -392,13 +389,13 @@
 
     invoke-virtual {v0, v1}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dn()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dm()V
 
     :cond_0
     return-void
 .end method
 
-.method public final Dn()V
+.method public final Dm()V
     .locals 2
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bGN:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
@@ -422,7 +419,7 @@
     return-void
 .end method
 
-.method public final Do()Z
+.method public final Dn()Z
     .locals 3
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bGD:Landroid/view/View;
@@ -450,7 +447,7 @@
 
     invoke-virtual {v0, v2}, Landroidx/appcompat/widget/AppCompatImageButton;->setImageResource(I)V
 
-    invoke-virtual {p0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->ae(Z)V
+    invoke-virtual {p0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->ad(Z)V
 
     const/4 v0, 0x1
 
@@ -647,7 +644,7 @@
     return-void
 .end method
 
-.method public final ad(Z)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.method public final ac(Z)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
     .locals 2
 
     iput-boolean p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled:Z
@@ -690,7 +687,7 @@
     return-object p0
 .end method
 
-.method ae(Z)V
+.method ad(Z)V
     .locals 2
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
@@ -1037,7 +1034,7 @@
 .method public onPause()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Do()Z
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dn()Z
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bGK:Lcom/lytefast/flexinput/managers/a;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$Companion.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$Companion.smali
index e3a3ef07c3..cef1637ef7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$Companion.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/PermissionsFragment$Companion;
 .super Ljava/lang/Object;
+.source "PermissionsFragment.kt"
 
 
 # annotations
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 109d82836b..96528f4269 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
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;
 .super Ljava/lang/Object;
+.source "PermissionsFragment.kt"
 
 
 # annotations
@@ -14,8 +15,8 @@
 
 
 # virtual methods
-.method public abstract Dj()V
+.method public abstract Di()V
 .end method
 
-.method public abstract Dk()V
+.method public abstract Dj()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 adc0e266e2..e8c3632fb7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/fragment/PermissionsFragment;
 .super Landroidx/fragment/app/Fragment;
+.source "PermissionsFragment.kt"
 
 
 # annotations
@@ -203,12 +204,12 @@
 
     if-eqz p2, :cond_1
 
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Dj()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Di()V
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Dk()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Dj()V
 
     :cond_2
     :goto_0
@@ -253,7 +254,7 @@
     return p1
 
     :cond_0
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Dj()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Di()V
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$Companion.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$Companion.smali
index c3eddb2b96..5bc47c2fb3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$Companion.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/PhotosFragment$Companion;
 .super Ljava/lang/Object;
+.source "PhotosFragment.kt"
 
 
 # annotations
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 97f1235233..5f9a394296 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/PhotosFragment$a;
 .super Ljava/lang/Object;
+.source "PhotosFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 64319285a1..43c3504de6 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/PhotosFragment$b;
 .super Ljava/lang/Object;
+.source "PhotosFragment.kt"
 
 # interfaces
 .implements Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;
@@ -62,7 +63,7 @@
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->bGU:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->Df()V
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->De()V
 
     :cond_0
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->bGV:Lcom/lytefast/flexinput/fragment/PhotosFragment;
@@ -75,6 +76,8 @@
 
     invoke-virtual {v0, v3}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setRefreshing(Z)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
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 1ac47da01e..243f5cc961 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/PhotosFragment$c;
 .super Ljava/lang/Object;
+.source "PhotosFragment.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;
@@ -44,7 +45,7 @@
 
 
 # virtual methods
-.method public final Dj()V
+.method public final Di()V
     .locals 4
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bGV:Lcom/lytefast/flexinput/fragment/PhotosFragment;
@@ -55,7 +56,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     new-instance v1, Landroidx/recyclerview/widget/GridLayoutManager;
@@ -82,7 +83,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     iget-object v1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bGU:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
@@ -99,7 +100,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->invalidateItemDecorations()V
@@ -107,7 +108,7 @@
     return-void
 .end method
 
-.method public final Dk()V
+.method public final Dj()V
     .locals 3
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bGV:Lcom/lytefast/flexinput/fragment/PhotosFragment;
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 4d56c7a30a..7b75b5b32d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/fragment/PhotosFragment;
 .super Lcom/lytefast/flexinput/fragment/PermissionsFragment;
+.source "PhotosFragment.kt"
 
 
 # annotations
@@ -181,7 +182,7 @@
 
     if-eqz p3, :cond_3
 
-    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->De()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->Dd()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p3
 
@@ -189,7 +190,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-virtual {p3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -237,7 +238,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_4
     invoke-direct {p2, p3, v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -283,6 +284,8 @@
 
     check-cast v0, Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
+    invoke-virtual {p3, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+
     goto :goto_1
 
     :cond_6
@@ -302,10 +305,10 @@
 
     check-cast v0, Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
-    :goto_1
     invoke-virtual {p3, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     :cond_7
+    :goto_1
     sget p3, Lcom/lytefast/flexinput/R$e;->swipeRefreshLayout:I
 
     invoke-virtual {p1, p3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -342,7 +345,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-virtual {v0}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->close()V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$a.smali
index d6b6b43edd..a475e1d7ce 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/a$a;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 
 # annotations
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 3dbfce995e..374a840ca4 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/a$b;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Landroid/view/animation/Animation$AnimationListener;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/fragment/a;->Di()V
+    value = Lcom/lytefast/flexinput/fragment/a;->Dh()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 0102476e57..c15071220e 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/a$c;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
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 784fa1baf4..500f4b411c 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/a$d;
 .super Landroidx/appcompat/app/AppCompatDialog;
+.source "AddContentDialogFragment.kt"
 
 
 # annotations
@@ -52,6 +53,8 @@
 
     invoke-virtual {v0, v1, v1}, Landroid/view/Window;->setLayout(II)V
 
+    return-void
+
     :cond_0
     return-void
 .end method
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 f381c82de3..53383c9137 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/a$e;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -44,7 +45,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Di()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Dh()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 1fd35f44b9..0e82585e7e 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/a$f;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -137,7 +138,7 @@
     :cond_4
     if-nez v4, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_5
     :goto_2
@@ -147,7 +148,7 @@
 
     const-string v2, "android.intent.extra.INITIAL_INTENTS"
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Dg()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Df()Ljava/util/List;
 
     move-result-object v3
 
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 7a3ca37e7e..d497cec3fc 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/a$g;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -42,13 +43,13 @@
 
     iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->bGq:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Di()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Dh()V
 
     iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->bGr:Landroidx/fragment/app/Fragment;
 
     check-cast p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dm()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dl()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 51f41347f1..65aefe19f2 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/a$h;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 3ad9c24bdf..0ac253f747 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/a$i;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Lcom/google/android/material/tabs/TabLayout$OnTabSelectedListener;
@@ -63,7 +64,7 @@
 
     iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->bGq:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Di()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Dh()V
 
     return-void
 
@@ -80,6 +81,8 @@
 
     invoke-virtual {v0, p1}, Landroidx/viewpager/widget/ViewPager;->setCurrentItem(I)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
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 544042239c..aac964fdef 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/a$j;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
@@ -71,6 +72,8 @@
 
     invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout$Tab;->select()V
 
+    return-void
+
     :cond_0
     return-void
 .end method
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 6cd23c9b83..c8b202db90 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/fragment/a$k;
 .super Ljava/lang/Object;
+.source "AddContentDialogFragment.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -80,6 +81,8 @@
 
     invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->hide()V
 
+    return-void
+
     :cond_3
     return-void
 .end method
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 09f852a483..914b9a54d2 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/a;
 .super Landroidx/appcompat/app/AppCompatDialogFragment;
+.source "AddContentDialogFragment.kt"
 
 
 # annotations
@@ -80,7 +81,7 @@
     return-void
 .end method
 
-.method private final Dh()Landroid/content/Intent;
+.method private final Dg()Landroid/content/Intent;
     .locals 7
     .annotation build Landroidx/annotation/RequiresApi;
         api = 0x12
@@ -219,6 +220,8 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->post(Ljava/lang/Runnable;)Z
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -257,7 +260,7 @@
 
 
 # virtual methods
-.method Dg()Ljava/util/List;
+.method Df()Ljava/util/List;
     .locals 8
     .annotation build Landroid/annotation/TargetApi;
         value = 0x13
@@ -493,7 +496,7 @@
     :cond_3
     if-nez v3, :cond_4
 
-    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/a;->Dh()Landroid/content/Intent;
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/a;->Dg()Landroid/content/Intent;
 
     move-result-object v0
 
@@ -515,7 +518,7 @@
     return-object v0
 .end method
 
-.method public final Di()V
+.method public final Dh()V
     .locals 4
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/a;->getContext()Landroid/content/Context;
@@ -797,6 +800,8 @@
 
     invoke-virtual {p1}, Landroid/widget/Toast;->show()V
 
+    return-void
+
     :cond_a
     :goto_4
     return-void
@@ -944,7 +949,7 @@
 
     check-cast v2, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dl()[Lcom/lytefast/flexinput/adapters/a$b;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dk()[Lcom/lytefast/flexinput/adapters/a$b;
 
     move-result-object v3
 
@@ -1166,7 +1171,7 @@
     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;->De()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Dd()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p2
 
@@ -1220,6 +1225,8 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->post(Ljava/lang/Runnable;)Z
 
+    return-void
+
     :cond_0
     return-void
 .end method
@@ -1233,7 +1240,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     const-string v1, "it"
 
@@ -1289,6 +1296,9 @@
 
     :cond_2
     return-void
+
+    :cond_3
+    return-void
 .end method
 
 .method public final show(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;)I
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/b.smali
index 110b20c09c..2c539decd2 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/fragment/b;
 .super Ljava/lang/Object;
+.source "FilesFragment.kt"
 
 # interfaces
 .implements Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;
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 c03ebc43d0..5d6d64ef61 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/managers/FileManager.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/managers/FileManager.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lcom/lytefast/flexinput/managers/FileManager;
 .super Ljava/lang/Object;
+.source "FileManager.kt"
 
 
 # virtual methods
-.method public abstract Dr()Ljava/io/File;
+.method public abstract Dq()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/a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/managers/a.smali
index d605035bdb..2d6110b31f 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/managers/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/managers/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/lytefast/flexinput/managers/a;
 .super Ljava/lang/Object;
+.source "KeyboardManager.kt"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/managers/b$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/managers/b$a.smali
index c75f1b9f0d..e5c9f8bfb4 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/managers/b$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/managers/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/managers/b$a;
 .super Ljava/lang/Object;
+.source "SimpleFileManager.kt"
 
 
 # annotations
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 d503f47d42..bce57c010e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/managers/b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/managers/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/managers/b;
 .super Ljava/lang/Object;
+.source "SimpleFileManager.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/managers/FileManager;
@@ -88,7 +89,7 @@
 
 
 # virtual methods
-.method public final Dr()Ljava/io/File;
+.method public final Dq()Ljava/io/File;
     .locals 5
 
     new-instance v0, Ljava/text/SimpleDateFormat;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali
index 7c650fefdc..baa6618fa0 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/model/Attachment$Companion;
 .super Ljava/lang/Object;
+.source "Attachment.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali
index fdbc9df733..e4686aa00c 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/model/Attachment$a;
 .super Ljava/lang/Object;
+.source "Attachment.kt"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali
index abcdc6fbb3..792c709bfd 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/model/Attachment;
 .super Ljava/lang/Object;
+.source "Attachment.kt"
 
 # interfaces
 .implements Landroid/os/Parcelable;
@@ -117,9 +118,14 @@
 
     const/4 p5, 0x0
 
+    move-object v5, p5
+
+    goto :goto_0
+
     :cond_0
     move-object v5, p5
 
+    :goto_0
     move-object v0, p0
 
     move-wide v1, p1
@@ -246,11 +252,11 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     instance-of v1, p1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
 
     iget-wide v1, p0, Lcom/lytefast/flexinput/model/Attachment;->id:J
 
@@ -278,6 +284,9 @@
 
     :cond_0
     return v0
+
+    :cond_1
+    return v0
 .end method
 
 .method public final getData()Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali
index c9c28db328..14f8e0a0e9 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/model/Photo$a;
 .super Ljava/lang/Object;
+.source "Photo.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$b.smali
index 830ed30250..2660e0b4b8 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/model/Photo$b;
 .super Ljava/lang/Object;
+.source "Photo.kt"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
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 bb1d3ca58d..d473ebcf5f 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/model/Photo$c;
 .super Ljava/lang/Object;
+.source "Photo.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 1e77b05070..e9972f7ac5 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/model/Photo;
 .super Lcom/lytefast/flexinput/model/Attachment;
+.source "Photo.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$Companion.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$Companion.smali
index 0c70219184..2fc177b78a 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$Companion.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$Companion.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/utils/SelectionAggregator$Companion;
 .super Ljava/lang/Object;
+.source "SelectionAggregator.kt"
 
 
 # annotations
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 3306e19b92..11b32e03a1 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/utils/SelectionAggregator$a;
 .super Ljava/lang/Object;
+.source "SelectionAggregator.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
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 554b06eb47..744a5c5b58 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/utils/SelectionAggregator;
 .super Ljava/lang/Object;
+.source "SelectionAggregator.kt"
 
 
 # annotations
@@ -87,7 +88,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     sput-object v0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->TAG:Ljava/lang/String;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$1.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$1.smali
index f7ca18b871..6f375b98a3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$1.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$1.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/utils/SelectionCoordinator$1;
 .super Ljava/lang/Object;
+.source "SelectionCoordinator.kt"
 
 # interfaces
 .implements Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener.smali
index fcfef92e63..cc46c76c25 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 .super Ljava/lang/Object;
+.source "SelectionCoordinator.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali
index dd85eed7bf..1833d38f64 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
 .super Ljava/lang/Exception;
+.source "SelectionCoordinator.kt"
 
 
 # annotations
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 f049fb41ab..d4676bf8b9 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
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;
 .super Ljava/lang/Object;
+.source "SelectionCoordinator.kt"
 
 
 # annotations
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 bdf5962288..5d03cdda5e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 .super Ljava/lang/Object;
+.source "SelectionCoordinator.kt"
 
 
 # annotations
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 e87e599fc6..6cb5cc03ea 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/lytefast/flexinput/utils/a;
 .super Ljava/lang/Object;
+.source "FileUtils.kt"
 
 
 # static fields
@@ -49,7 +50,7 @@
 
     if-nez v0, :cond_0
 
-    goto :goto_1
+    goto/16 :goto_2
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
@@ -64,7 +65,7 @@
 
     if-eq v1, v2, :cond_1
 
-    goto :goto_1
+    goto/16 :goto_2
 
     :cond_1
     const-string v1, "content"
@@ -73,7 +74,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_6
 
     const/4 v3, 0x0
 
@@ -177,7 +178,6 @@
 
     const-string p1, "this.lastPathSegment"
 
-    :goto_2
     invoke-static {p0, p1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
@@ -189,7 +189,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_6
 
     new-instance p1, Ljava/io/File;
 
@@ -205,7 +205,21 @@
 
     const-string p1, "file.name"
 
-    goto :goto_2
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+
+    :cond_6
+    :goto_2
+    invoke-virtual {p0}, Landroid/net/Uri;->getLastPathSegment()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "this.lastPathSegment"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
 .end method
 
 .method public static final w(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
@@ -285,7 +299,6 @@
 
     const-string v0, " KB"
 
-    :goto_0
     invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -309,7 +322,13 @@
 
     const-string v0, " MB"
 
-    goto :goto_0
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 
     :cond_1
     div-long/2addr v0, v2
@@ -322,5 +341,11 @@
 
     const-string v0, " GB"
 
-    goto :goto_0
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali
index d3e58aa66a..7b0c61a898 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/lytefast/flexinput/utils/b;
 .super Ljava/lang/Object;
+.source "FlexInputEmojiStateChangeListener.kt"
 
 
 # virtual methods
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 f5ec9fa770..b2b031780b 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
@@ -1,5 +1,6 @@
 .class final Lcom/lytefast/flexinput/widget/FlexEditText$a;
 .super Ljava/lang/Object;
+.source "FlexEditText.kt"
 
 # interfaces
 .implements Landroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali b/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali
index f19fb60dd3..097b34b6c0 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali
@@ -1,5 +1,6 @@
 .class public Lcom/lytefast/flexinput/widget/FlexEditText;
 .super Landroidx/appcompat/widget/AppCompatEditText;
+.source "FlexEditText.kt"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali
index ede38a34ee..b661e58df0 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1;
 .super Ljava/lang/Object;
+.source "Backgrounded.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$2.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$2.smali
index 89eb4ed46f..a928089c58 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$2.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$2.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/backgrounded/Backgrounded$Lifecycle$2;
 .super Ljava/lang/Object;
+.source "Backgrounded.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$Constants.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$Constants.smali
index 8ab07343f6..669722ab14 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$Constants.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$Constants.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/backgrounded/Backgrounded$Lifecycle$Constants;
 .super Ljava/lang/Object;
+.source "Backgrounded.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali
index d313c627e3..4a734b99c2 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/backgrounded/Backgrounded$Lifecycle;
 .super Lcom/miguelgaeta/backgrounded/BackgroundedActivityLifecycleCallbacks;
+.source "Backgrounded.java"
 
 
 # annotations
@@ -83,8 +84,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/miguelgaeta/backgrounded/Backgrounded$Lifecycle;->subscription:Lrx/Subscription;
-
     invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BackgroundedActivityLifecycleCallbacks.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BackgroundedActivityLifecycleCallbacks.smali
index 555307e073..bd957a86aa 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BackgroundedActivityLifecycleCallbacks.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BackgroundedActivityLifecycleCallbacks.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/backgrounded/BackgroundedActivityLifecycleCallbacks;
 .super Ljava/lang/Object;
+.source "BackgroundedActivityLifecycleCallbacks.java"
 
 # interfaces
 .implements Landroid/app/Application$ActivityLifecycleCallbacks;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BuildConfig.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BuildConfig.smali
index d4d5314bde..5193861df8 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BuildConfig.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/backgrounded/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/R.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/R.smali
index 5e07aca0ed..0ec5872d04 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/R.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/backgrounded/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/BuildConfig.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/BuildConfig.smali
index 201f7c2586..17c5bb423c 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/BuildConfig.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/Encoder.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/Encoder.smali
index a8d2ee87cb..6c1b7e10fa 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/Encoder.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/Encoder.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/media_picker/Encoder;
 .super Ljava/lang/Object;
+.source "Encoder.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$1.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$1.smali
index b49cc451fe..e5456f17f3 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$1.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/miguelgaeta/media_picker/MediaPicker$1;
 .super Ljava/lang/Object;
+.source "MediaPicker.java"
 
 # interfaces
 .implements Lcom/miguelgaeta/media_picker/MediaPicker$OnError;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$2.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$2.smali
index 19fc56049c..2a27e8d57c 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$2.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$2.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/miguelgaeta/media_picker/MediaPicker$2;
 .super Ljava/lang/Object;
+.source "MediaPicker.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnError.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnError.smali
index 1ee795d5c5..f5ce642641 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnError.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnError.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/miguelgaeta/media_picker/MediaPicker$OnError;
 .super Ljava/lang/Object;
+.source "MediaPicker.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnResult.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnResult.smali
index e42565fd90..b97bc754f9 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnResult.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$OnResult.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/miguelgaeta/media_picker/MediaPicker$OnResult;
 .super Ljava/lang/Object;
+.source "MediaPicker.java"
 
 # interfaces
 .implements Lcom/miguelgaeta/media_picker/MediaPicker$OnError;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$Provider.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$Provider.smali
index 55d4851fa4..42f3596168 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$Provider.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker$Provider.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 .super Ljava/lang/Object;
+.source "MediaPicker.java"
 
 
 # annotations
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 c35f9bc137..dc8052983d 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/media_picker/MediaPicker;
 .super Ljava/lang/Object;
+.source "MediaPicker.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$1.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$1.smali
index 5a4c3b67fc..65a042f0e9 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$1.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/miguelgaeta/media_picker/MediaPickerChooser$1;
 .super Ljava/lang/Object;
+.source "MediaPickerChooser.java"
 
 # interfaces
 .implements Lcom/miguelgaeta/media_picker/MediaPickerChooser$IntentModifier;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$IntentModifier.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$IntentModifier.smali
index 17f9ea798e..972e8bae43 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$IntentModifier.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser$IntentModifier.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/miguelgaeta/media_picker/MediaPickerChooser$IntentModifier;
 .super Ljava/lang/Object;
+.source "MediaPickerChooser.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser.smali
index b300af5ecd..a946df7516 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerChooser.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/media_picker/MediaPickerChooser;
 .super Ljava/lang/Object;
+.source "MediaPickerChooser.java"
 
 
 # annotations
@@ -302,4 +303,6 @@
     invoke-direct {p0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerUri.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerUri.smali
index d582f71e2d..219b16d431 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerUri.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPickerUri.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/media_picker/MediaPickerUri;
 .super Ljava/lang/Object;
+.source "MediaPickerUri.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$anim.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$anim.smali
index 5422799067..66879bc223 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$anim.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$anim.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$anim;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 89056988f5..2004785b90 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$bool.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$bool.smali
index 5613587b10..dbc5490dcb 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$bool.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$bool.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$bool;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 51cfec666c..05f2cc5ed8 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$color;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali
index 8733735537..911538bbbc 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$dimen;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 e7f5955eb2..a62a31c6c8 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$drawable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 6f4b1123ba..463a1f23f5 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$id;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$integer.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$integer.smali
index 41255cc69c..910ca3b792 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$integer.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$integer.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$integer;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 c0a7e312d1..775a526fc0 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$layout;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 c27b6664c1..a79e4350c7 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$menu;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 cb5ac1107b..fece0453b3 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$string;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali
index 2e5ce89efa..1a19fce0e8 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$style;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 6a9e0e54b1..8997865ba1 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R.smali
index 95f0659006..2e3e0aeadd 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/media_picker/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType$1.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType$1.smali
index 9ea650719d..bd8139e533 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType$1.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lcom/miguelgaeta/media_picker/RequestType$1;
 .super Ljava/lang/Object;
+.source "RequestType.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType.smali
index 50ba2a3238..77140d7935 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/RequestType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lcom/miguelgaeta/media_picker/RequestType;
 .super Ljava/lang/Enum;
+.source "RequestType.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default$1.smali b/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default$1.smali
index 92f9b2a397..57da06c9db 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default$1.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/miguelgaeta/simple_time/SimpleTime$Default$1;
 .super Ljava/lang/ThreadLocal;
+.source "SimpleTime.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default.smali b/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default.smali
index 6abf86afdb..bd8d780504 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime$Default.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/simple_time/SimpleTime$Default;
 .super Ljava/lang/Object;
+.source "SimpleTime.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali b/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
index 11b39ac5d4..70d2fca637 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/simple_time/SimpleTime;
 .super Ljava/lang/Object;
+.source "SimpleTime.java"
 
 
 # annotations
@@ -154,7 +155,7 @@
 .end method
 
 .method public parseUTCDate(Ljava/lang/String;)J
-    .locals 4
+    .locals 3
 
     const-wide/16 v0, 0x0
 
@@ -172,16 +173,22 @@
 
     invoke-virtual {p1}, Ljava/util/Date;->getTime()J
 
-    move-result-wide v2
+    move-result-wide v0
     :try_end_0
-    .catch Ljava/text/ParseException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/ArrayIndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/text/ParseException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/ArrayIndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v2
+    return-wide v0
 
     :catch_0
     return-wide v0
+
+    :catch_1
+    return-wide v0
+
+    :catch_2
+    return-wide v0
 .end method
 
 .method public toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/BuildConfig.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/BuildConfig.smali
index ecc77f270a..8eef7c33ef 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/BuildConfig.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/BuildConfig.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/super_bar/BuildConfig;
 .super Ljava/lang/Object;
+.source "BuildConfig.java"
 
 
 # static fields
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 6ff2bb66ab..5051e2295b 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/super_bar/R$attr;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 9fdbda32d0..868563ddd4 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
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/super_bar/R$styleable;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/R.smali
index 963186e2db..07b1ff378f 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/miguelgaeta/super_bar/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$1.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$1.smali
index 41d1f11c73..85c55167a7 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$1.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$1.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/super_bar/SuperBar$1;
 .super Ljava/lang/Object;
+.source "SuperBar.java"
 
 # interfaces
 .implements Landroid/view/View$OnTouchListener;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid.smali
index dc1d6966f6..65b99df282 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;
 .super Ljava/lang/Object;
+.source "SuperBar.java"
 
 # interfaces
 .implements Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter.smali
index 1633d64d28..d1012af6cc 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
 .super Ljava/lang/Object;
+.source "SuperBar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionChanged.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionChanged.smali
index 2afccdf5e9..a5e0e48a58 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionChanged.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionChanged.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
 .super Ljava/lang/Object;
+.source "SuperBar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionMoved.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionMoved.smali
index 34872952f3..15adbda915 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionMoved.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionMoved.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
 .super Ljava/lang/Object;
+.source "SuperBar.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar.smali
index 30daeed3cd..733f6d947a 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/super_bar/SuperBar;
 .super Landroid/view/View;
+.source "SuperBar.java"
 
 # interfaces
 .implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarAttributes.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarAttributes.smali
index 8a398357dc..6c3afe558c 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarAttributes.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarAttributes.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/super_bar/SuperBarAttributes;
 .super Ljava/lang/Object;
+.source "SuperBarAttributes.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarConfig.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarConfig.smali
index 27f4111473..bd34801f74 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarConfig.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarConfig.smali
@@ -1,5 +1,6 @@
 .class public Lcom/miguelgaeta/super_bar/SuperBarConfig;
 .super Ljava/lang/Object;
+.source "SuperBarConfig.java"
 
 
 # instance fields
@@ -142,11 +143,9 @@
 
     const/4 v1, 0x0
 
-    cmpl-float v0, v0, v1
+    cmpl-float v1, v0, v1
 
-    if-lez v0, :cond_0
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barHeight:F
+    if-lez v1, :cond_0
 
     iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
 
@@ -215,8 +214,6 @@
 
     if-lez v0, :cond_0
 
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlRadius:I
-
     iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
 
     invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBar;->getHeight()I
@@ -369,38 +366,38 @@
 
     iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
 
-    cmpg-float v0, p3, v0
+    cmpg-float v1, p3, v0
 
-    if-gez v0, :cond_0
+    if-gez v1, :cond_0
 
-    iget p3, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
+    move p3, v0
 
     :cond_0
     iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
 
-    cmpl-float v0, p3, v0
+    cmpl-float v1, p3, v0
 
-    if-lez v0, :cond_1
+    if-lez v1, :cond_1
 
-    iget p3, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
+    move p3, v0
 
     :cond_1
     iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
 
-    cmpg-float v0, p2, v0
+    cmpg-float v1, p2, v0
 
-    if-gez v0, :cond_2
+    if-gez v1, :cond_2
 
-    iget p2, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
+    move p2, v0
 
     :cond_2
     iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
 
-    cmpl-float v0, p2, v0
+    cmpl-float v1, p2, v0
 
-    if-lez v0, :cond_3
+    if-lez v1, :cond_3
 
-    iget p2, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
+    move p2, v0
 
     :cond_3
     if-nez p1, :cond_4
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarDrawer.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarDrawer.smali
index 7028af576e..6d996292f2 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarDrawer.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarDrawer.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/super_bar/SuperBarDrawer;
 .super Ljava/lang/Object;
+.source "SuperBarDrawer.java"
 
 
 # instance fields
@@ -76,9 +77,7 @@
 
     iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
 
-    iget-object p3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {p3}, Landroid/graphics/RectF;->height()F
+    invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
 
     move-result p3
 
@@ -228,9 +227,7 @@
 
     iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
 
-    iget-object p3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {p3}, Landroid/graphics/RectF;->height()F
+    invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
 
     move-result p3
 
@@ -542,9 +539,7 @@
 
     iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
 
-    iget-object p3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {p3}, Landroid/graphics/RectF;->height()F
+    invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
 
     move-result p3
 
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarPainter.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarPainter.smali
index 34a5b741f3..bbc3c5af37 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarPainter.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarPainter.smali
@@ -1,5 +1,6 @@
 .class Lcom/miguelgaeta/super_bar/SuperBarPainter;
 .super Landroid/graphics/Paint;
+.source "SuperBarPainter.java"
 
 
 # instance fields
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 7c7c7a9387..46a54dea7f 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$a;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali
index 79ac4f1091..774c8f854e 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$b;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 5fd47366f7..919aff6361 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$c;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 e924cda9fc..ced22c76cd 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$d;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 4fca40694d..fb16679aa0 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$e;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 9ef46b7517..0340ed18bd 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$f.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$f;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 90fead61b6..fc5d85cc09 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$g;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 efaa2bb089..1bec721ee5 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R$h;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R.smali
index fe5433df64..ef26bf42f3 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # annotations
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 85313452d3..0087b49ab5 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$1.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$1;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/view/b$a;
@@ -33,7 +34,7 @@
 
 
 # virtual methods
-.method public final Ds()V
+.method public final Dr()V
     .locals 3
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bHP:Lcom/yalantis/ucrop/UCropActivity;
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 7cecdea540..622f842370 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$2.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$2.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$2;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -85,7 +86,7 @@
     iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
 
     :cond_0
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->DF()V
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->DE()V
 
     :cond_1
     iget v1, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
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 b83b297f34..6d9cb5d534 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$3.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$3.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$3;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
@@ -33,7 +34,7 @@
 
 
 # virtual methods
-.method public final Dt()V
+.method public final Ds()V
     .locals 2
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bHP:Lcom/yalantis/ucrop/UCropActivity;
@@ -49,7 +50,7 @@
     return-void
 .end method
 
-.method public final Du()V
+.method public final Dt()V
     .locals 1
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bHP:Lcom/yalantis/ucrop/UCropActivity;
@@ -58,7 +59,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DB()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DA()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 9ceedd81a1..2d3472ddc9 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$4.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$4.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$4;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 128258844e..c9e11afdb5 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$5.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$5.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$5;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 2bb01261af..56a5d1c9f5 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$6.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$6.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$6;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
@@ -33,7 +34,7 @@
 
 
 # virtual methods
-.method public final Dt()V
+.method public final Ds()V
     .locals 2
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bHP:Lcom/yalantis/ucrop/UCropActivity;
@@ -49,7 +50,7 @@
     return-void
 .end method
 
-.method public final Du()V
+.method public final Dt()V
     .locals 1
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bHP:Lcom/yalantis/ucrop/UCropActivity;
@@ -58,7 +59,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DB()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DA()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 e57e7be078..9523bc5304 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$7.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$7.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$7;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
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 c12ad43f02..039baa49ea 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$8.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$8.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/UCropActivity$8;
 .super Ljava/lang/Object;
+.source "UCropActivity.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/a/a;
@@ -42,9 +43,7 @@
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bHP:Lcom/yalantis/ucrop/UCropActivity;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bHP:Lcom/yalantis/ucrop/UCropActivity;
-
-    invoke-static {v1}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
+    invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
index 5bfb31aee6..34fd475e7b 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/UCropActivity;
 .super Landroidx/appcompat/app/AppCompatActivity;
+.source "UCropActivity.java"
 
 
 # static fields
@@ -143,12 +144,10 @@
 .method static synthetic a(Lcom/yalantis/ucrop/UCropActivity;F)V
     .locals 4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bHH:Landroid/widget/TextView;
-
-    if-eqz v0, :cond_0
-
     iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bHH:Landroid/widget/TextView;
 
+    if-eqz p0, :cond_0
+
     invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
 
     move-result-object v0
@@ -196,12 +195,10 @@
 .method static synthetic b(Lcom/yalantis/ucrop/UCropActivity;F)V
     .locals 5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bHI:Landroid/widget/TextView;
-
-    if-eqz v0, :cond_0
-
     iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bHI:Landroid/widget/TextView;
 
+    if-eqz p0, :cond_0
+
     invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
 
     move-result-object v0
@@ -399,27 +396,25 @@
 .end method
 
 .method private eI(I)V
-    .locals 5
+    .locals 6
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bHy:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bHM:[I
 
-    aget v1, v1, p1
+    aget v2, v1, p1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    const/4 v3, 0x3
+    const/4 v4, 0x3
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    if-eq v1, v3, :cond_1
-
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bHM:[I
+    if-eq v2, v4, :cond_1
 
     aget v1, v1, p1
 
-    if-ne v1, v4, :cond_0
+    if-ne v1, v5, :cond_0
 
     goto :goto_0
 
@@ -439,11 +434,9 @@
 
     iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bHM:[I
 
-    aget v1, v1, p1
+    aget v2, v1, p1
 
-    if-eq v1, v3, :cond_2
-
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bHM:[I
+    if-eq v2, v4, :cond_2
 
     aget p1, v1, p1
 
@@ -452,10 +445,10 @@
     if-ne p1, v1, :cond_3
 
     :cond_2
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
     :cond_3
-    invoke-virtual {v0, v2}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setRotateEnabled(Z)V
+    invoke-virtual {v0, v3}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setRotateEnabled(Z)V
 
     return-void
 .end method
@@ -465,9 +458,7 @@
 
     iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bHy:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bHy:Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->getCurrentAngle()F
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->getCurrentAngle()F
 
     move-result v1
 
@@ -1529,8 +1520,6 @@
 
     if-eqz v6, :cond_b
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/UCropActivity;->bHA:Landroid/view/ViewGroup;
-
     const/16 v7, 0x8
 
     invoke-virtual {v6, v7}, Landroid/view/ViewGroup;->setVisibility(I)V
@@ -1641,11 +1630,15 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_5
+    goto :goto_4
 
     :catch_0
     move-exception p1
 
+    invoke-virtual {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->k(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/UCropActivity;->finish()V
+
     goto :goto_4
 
     :cond_f
@@ -1659,12 +1652,11 @@
 
     invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
-    :goto_4
     invoke-virtual {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->k(Ljava/lang/Throwable;)V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/UCropActivity;->finish()V
 
-    :goto_5
+    :goto_4
     iget-boolean p1, p0, Lcom/yalantis/ucrop/UCropActivity;->bHv:Z
 
     if-eqz p1, :cond_11
@@ -1679,20 +1671,21 @@
 
     sget p1, Lcom/yalantis/ucrop/R$d;->state_aspect_ratio:I
 
-    :goto_6
     invoke-direct {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->eH(I)V
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_10
     sget p1, Lcom/yalantis/ucrop/R$d;->state_scale:I
 
-    goto :goto_6
+    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->eH(I)V
+
+    goto :goto_5
 
     :cond_11
     invoke-direct {p0, v1}, Lcom/yalantis/ucrop/UCropActivity;->eI(I)V
 
-    :goto_7
+    :goto_5
     iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity;->bHJ:Landroid/view/View;
 
     if-nez p1, :cond_12
@@ -1940,9 +1933,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bHy:Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DB()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DA()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 9a585f879a..9818b8e4a7 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/a$a;
 .super Ljava/lang/Object;
+.source "UCrop.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/a.smali
index 2be79f5379..dde1430eef 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/a;
 .super Ljava/lang/Object;
+.source "UCrop.java"
 
 
 # annotations
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 28281fa17d..ecded2f09d 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/yalantis/ucrop/a/a;
 .super Ljava/lang/Object;
+.source "BitmapCropCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/a/b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/a/b.smali
index b09bd3ef8e..e8bb2c634a 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/yalantis/ucrop/a/b;
 .super Ljava/lang/Object;
+.source "BitmapLoadCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali
index b8315c2d0b..5f94874c75 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/yalantis/ucrop/a/c;
 .super Ljava/lang/Object;
+.source "CropBoundsChangeListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/a/d.smali b/com.discord/smali_classes2/com/yalantis/ucrop/a/d.smali
index ade043e22b..e2f71d7dd2 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a/d.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/yalantis/ucrop/a/d;
 .super Ljava/lang/Object;
+.source "OverlayViewChangeListener.java"
 
 
 # virtual methods
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 096c17de0b..88c0d2b05d 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/b/a;
 .super Landroid/os/AsyncTask;
+.source "BitmapCropTask.java"
 
 
 # annotations
@@ -143,7 +144,7 @@
     return-void
 .end method
 
-.method private varargs Dv()Ljava/lang/Throwable;
+.method private varargs Du()Ljava/lang/Throwable;
     .locals 12
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
@@ -161,8 +162,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bIf:Landroid/graphics/Bitmap;
-
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->isRecycled()Z
 
     move-result v0
@@ -825,7 +824,7 @@
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/yalantis/ucrop/b/a;->Dv()Ljava/lang/Throwable;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/a;->Du()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -872,8 +871,6 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bIg:Lcom/yalantis/ucrop/a/a;
-
     invoke-interface {v0, p1}, Lcom/yalantis/ucrop/a/a;->l(Ljava/lang/Throwable;)V
 
     :cond_1
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 cc4f8bf813..927ab22a86 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
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/b/b$a;
 .super Ljava/lang/Object;
+.source "BitmapLoadTask.java"
 
 
 # annotations
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 e4982ce292..33a9db65bc 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/b/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/b/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/b/b;
 .super Landroid/os/AsyncTask;
+.source "BitmapLoadTask.java"
 
 
 # annotations
@@ -67,7 +68,7 @@
     return-void
 .end method
 
-.method private varargs Dw()Lcom/yalantis/ucrop/b/b$a;
+.method private varargs Dv()Lcom/yalantis/ucrop/b/b$a;
     .locals 13
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
@@ -90,8 +91,6 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->bIl:Landroid/net/Uri;
-
     invoke-virtual {v0}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
     move-result-object v0
@@ -116,9 +115,9 @@
 
     move-result v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
@@ -161,13 +160,13 @@
     const/4 v5, 0x0
 
     :goto_0
-    if-eqz v5, :cond_9
+    if-eqz v5, :cond_8
 
     invoke-static {v0, v1}, Landroid/provider/DocumentsContract;->isDocumentUri(Landroid/content/Context;Landroid/net/Uri;)Z
 
     move-result v5
 
-    if-eqz v5, :cond_9
+    if-eqz v5, :cond_8
 
     const-string v5, "com.android.externalstorage.documents"
 
@@ -191,7 +190,7 @@
 
     move-result-object v0
 
-    aget-object v1, v0, v2
+    aget-object v1, v0, v3
 
     const-string v5, "primary"
 
@@ -215,7 +214,7 @@
 
     invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    aget-object v0, v0, v3
+    aget-object v0, v0, v2
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -236,7 +235,7 @@
 
     move-result v5
 
-    if-eqz v5, :cond_5
+    if-eqz v5, :cond_4
 
     invoke-static {v1}, Landroid/provider/DocumentsContract;->getDocumentId(Landroid/net/Uri;)Ljava/lang/String;
 
@@ -260,14 +259,13 @@
 
     move-result-object v1
 
-    :cond_4
     invoke-static {v0, v1, v4, v4}, Lcom/yalantis/ucrop/c/e;->getDataColumn(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
     goto/16 :goto_2
 
-    :cond_5
+    :cond_4
     const-string v5, "com.android.providers.media.documents"
 
     invoke-virtual {v1}, Landroid/net/Uri;->getAuthority()Ljava/lang/String;
@@ -290,7 +288,7 @@
 
     move-result-object v1
 
-    aget-object v5, v1, v2
+    aget-object v5, v1, v3
 
     const-string v6, "image"
 
@@ -298,47 +296,47 @@
 
     move-result v6
 
-    if-eqz v6, :cond_6
+    if-eqz v6, :cond_5
 
     sget-object v5, Landroid/provider/MediaStore$Images$Media;->EXTERNAL_CONTENT_URI:Landroid/net/Uri;
 
     goto :goto_1
 
-    :cond_6
+    :cond_5
     const-string v6, "video"
 
     invoke-virtual {v6, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v6
 
-    if-eqz v6, :cond_7
+    if-eqz v6, :cond_6
 
     sget-object v5, Landroid/provider/MediaStore$Video$Media;->EXTERNAL_CONTENT_URI:Landroid/net/Uri;
 
     goto :goto_1
 
-    :cond_7
+    :cond_6
     const-string v6, "audio"
 
     invoke-virtual {v6, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v5
 
-    if-eqz v5, :cond_8
+    if-eqz v5, :cond_7
 
     sget-object v5, Landroid/provider/MediaStore$Audio$Media;->EXTERNAL_CONTENT_URI:Landroid/net/Uri;
 
     goto :goto_1
 
-    :cond_8
+    :cond_7
     move-object v5, v4
 
     :goto_1
-    new-array v6, v3, [Ljava/lang/String;
+    new-array v6, v2, [Ljava/lang/String;
 
-    aget-object v1, v1, v3
+    aget-object v1, v1, v2
 
-    aput-object v1, v6, v2
+    aput-object v1, v6, v3
 
     const-string v1, "_id=?"
 
@@ -348,7 +346,7 @@
 
     goto :goto_2
 
-    :cond_9
+    :cond_8
     const-string v5, "content"
 
     invoke-virtual {v1}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
@@ -371,7 +369,7 @@
 
     move-result v5
 
-    if-eqz v5, :cond_4
+    if-eqz v5, :cond_9
 
     invoke-virtual {v1}, Landroid/net/Uri;->getLastPathSegment()Ljava/lang/String;
 
@@ -379,6 +377,13 @@
 
     goto :goto_2
 
+    :cond_9
+    invoke-static {v0, v1, v4, v4}, Lcom/yalantis/ucrop/c/e;->getDataColumn(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_2
+
     :cond_a
     const-string v0, "file"
 
@@ -538,11 +543,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-static {v5, v0, v2}, Lokhttp3/v;->a(Lokhttp3/t;Lokhttp3/w;Z)Lokhttp3/v;
+    invoke-static {v5, v0, v3}, Lokhttp3/v;->a(Lokhttp3/t;Lokhttp3/w;Z)Lokhttp3/v;
 
     move-result-object v0
 
@@ -553,9 +558,9 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_3
 
     :try_start_5
-    iget-object v6, v0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v6, v0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
-    invoke-virtual {v6}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {v6}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v6
     :try_end_5
@@ -592,12 +597,12 @@
 
     if-eqz v0, :cond_10
 
-    iget-object v0, v0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, v0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_10
-    iget-object v0, v5, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v0, v5, Lokhttp3/t;->bZa:Lokhttp3/n;
 
     invoke-virtual {v0}, Lokhttp3/n;->cancelAll()V
 
@@ -636,7 +641,7 @@
 
     invoke-direct {v5}, Landroid/graphics/BitmapFactory$Options;-><init>()V
 
-    iput-boolean v3, v5, Landroid/graphics/BitmapFactory$Options;->inJustDecodeBounds:Z
+    iput-boolean v2, v5, Landroid/graphics/BitmapFactory$Options;->inJustDecodeBounds:Z
 
     invoke-static {v1, v4, v5}, Landroid/graphics/BitmapFactory;->decodeFileDescriptor(Ljava/io/FileDescriptor;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
@@ -663,7 +668,7 @@
 
     iput v6, v5, Landroid/graphics/BitmapFactory$Options;->inSampleSize:I
 
-    iput-boolean v2, v5, Landroid/graphics/BitmapFactory$Options;->inJustDecodeBounds:Z
+    iput-boolean v3, v5, Landroid/graphics/BitmapFactory$Options;->inJustDecodeBounds:Z
 
     move-object v8, v4
 
@@ -677,12 +682,10 @@
     :try_start_a
     invoke-static {v1, v4, v5}, Landroid/graphics/BitmapFactory;->decodeFileDescriptor(Ljava/io/FileDescriptor;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
-    move-result-object v10
+    move-result-object v8
     :try_end_a
     .catch Ljava/lang/OutOfMemoryError; {:try_start_a .. :try_end_a} :catch_1
 
-    move-object v8, v10
-
     const/4 v6, 0x1
 
     goto :goto_5
@@ -758,17 +761,17 @@
     goto :goto_6
 
     :pswitch_0
-    const/16 v2, 0x10e
+    const/16 v3, 0x10e
 
     goto :goto_6
 
     :pswitch_1
-    const/16 v2, 0x5a
+    const/16 v3, 0x5a
 
     goto :goto_6
 
     :pswitch_2
-    const/16 v2, 0xb4
+    const/16 v3, 0xb4
 
     :goto_6
     if-eq v0, v9, :cond_15
@@ -785,20 +788,20 @@
     :pswitch_3
     new-instance v1, Lcom/yalantis/ucrop/model/b;
 
-    invoke-direct {v1, v0, v2, v7}, Lcom/yalantis/ucrop/model/b;-><init>(III)V
+    invoke-direct {v1, v0, v3, v7}, Lcom/yalantis/ucrop/model/b;-><init>(III)V
 
     new-instance v0, Landroid/graphics/Matrix;
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    if-eqz v2, :cond_16
+    if-eqz v3, :cond_16
 
-    int-to-float v2, v2
+    int-to-float v3, v3
 
-    invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->preRotate(F)Z
+    invoke-virtual {v0, v3}, Landroid/graphics/Matrix;->preRotate(F)Z
 
     :cond_16
-    if-eq v7, v3, :cond_17
+    if-eq v7, v2, :cond_17
 
     int-to-float v2, v7
 
@@ -947,12 +950,12 @@
 
     if-eqz v0, :cond_1c
 
-    iget-object v0, v0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, v0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_1c
-    iget-object v0, v5, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v0, v5, Lokhttp3/t;->bZa:Lokhttp3/n;
 
     invoke-virtual {v0}, Lokhttp3/n;->cancelAll()V
 
@@ -1103,6 +1106,13 @@
 
     return-void
 
+    :catchall_0
+    move-exception p2
+
+    move-object v0, v1
+
+    goto :goto_1
+
     :cond_1
     :try_start_3
     new-instance p2, Ljava/lang/NullPointerException;
@@ -1115,13 +1125,6 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :catchall_0
-    move-exception p2
-
-    move-object v0, v1
-
-    goto :goto_1
-
     :catchall_1
     move-exception p2
 
@@ -1151,6 +1154,8 @@
     invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -1160,7 +1165,7 @@
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    invoke-direct {p0}, Lcom/yalantis/ucrop/b/b;->Dw()Lcom/yalantis/ucrop/b/b$a;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/b;->Dv()Lcom/yalantis/ucrop/b/b$a;
 
     move-result-object p1
 
@@ -1201,8 +1206,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/b;->bIm:Landroid/net/Uri;
-
     invoke-virtual {v3}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
     move-result-object v3
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 d3f16e07fa..4ffc0662d8 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/a;
 .super Ljava/lang/Object;
+.source "BitmapLoadUtils.java"
 
 
 # direct methods
@@ -36,7 +37,7 @@
 
     iget-object v2, v1, Lcom/yalantis/ucrop/c/f;->bIu:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Dz()I
+    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Dy()I
 
     move-result v2
 
@@ -70,21 +71,19 @@
 
     move-result-object v2
 
-    :goto_0
     invoke-static {v1, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1
-    :goto_1
     const/4 v0, -0x1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_2
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Dy()I
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Dx()I
 
     move-result v2
 
-    if-ne v2, v5, :cond_3
+    if-ne v2, v5, :cond_4
 
     const-string v1, "ImageHeaderParser"
 
@@ -92,15 +91,20 @@
 
     move-result v1
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_3
 
     const-string v1, "ImageHeaderParser"
 
     const-string v2, "Failed to parse exif segment length, or exif segment not found"
 
-    goto :goto_0
+    invoke-static {v1, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_3
+    const/4 v0, -0x1
+
+    goto :goto_0
+
+    :cond_4
     new-array v3, v2, [B
 
     iget-object v1, v1, Lcom/yalantis/ucrop/c/f;->bIu:Lcom/yalantis/ucrop/c/f$b;
@@ -109,7 +113,7 @@
 
     move-result v1
 
-    if-eq v1, v2, :cond_4
+    if-eq v1, v2, :cond_6
 
     const-string v3, "ImageHeaderParser"
 
@@ -117,7 +121,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_5
 
     const-string v3, "ImageHeaderParser"
 
@@ -141,14 +145,17 @@
 
     invoke-static {v3, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_1
+    :cond_5
+    const/4 v0, -0x1
 
-    :cond_4
+    goto :goto_0
+
+    :cond_6
     invoke-static {v3, v2}, Lcom/yalantis/ucrop/c/f;->t([BI)Z
 
     move-result v1
 
-    if-eqz v1, :cond_5
+    if-eqz v1, :cond_7
 
     new-instance v1, Lcom/yalantis/ucrop/c/f$a;
 
@@ -156,33 +163,34 @@
 
     invoke-static {v1}, Lcom/yalantis/ucrop/c/f;->a(Lcom/yalantis/ucrop/c/f$a;)I
 
-    move-result v1
+    move-result v0
 
-    move v0, v1
+    goto :goto_0
 
-    goto :goto_2
-
-    :cond_5
+    :cond_7
     const-string v1, "ImageHeaderParser"
 
     invoke-static {v1, v4}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
 
     move-result v1
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_8
 
     const-string v1, "ImageHeaderParser"
 
     const-string v2, "Missing jpeg exif preamble"
 
-    goto :goto_0
+    invoke-static {v1, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    :goto_2
+    :cond_8
+    const/4 v0, -0x1
+
+    :goto_0
     invoke-static {p0}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_3
+    goto :goto_1
 
     :catch_0
     move-exception p0
@@ -207,7 +215,7 @@
 
     invoke-static {v1, p1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    :goto_3
+    :goto_1
     return v0
 .end method
 
@@ -328,6 +336,8 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/b.smali
index 0b6c240093..9b979b1606 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/b;
 .super Ljava/lang/Object;
+.source "CubicEasing.java"
 
 
 # direct methods
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 aa8833caa5..f99728f62c 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/c.smali
@@ -1,9 +1,10 @@
 .class public final Lcom/yalantis/ucrop/c/c;
 .super Ljava/lang/Object;
+.source "EglUtils.java"
 
 
 # direct methods
-.method public static Dx()I
+.method public static Dw()I
     .locals 16
 
     const/4 v0, 0x0
@@ -104,9 +105,9 @@
 
     invoke-static {v1}, Landroid/opengl/EGL14;->eglTerminate(Landroid/opengl/EGLDisplay;)Z
 
-    aget v1, v4, v0
+    aget v0, v4, v0
 
-    return v1
+    return v0
 
     :cond_1
     invoke-static {}, Ljavax/microedition/khronos/egl/EGLContext;->getEGL()Ljavax/microedition/khronos/egl/EGL;
@@ -192,11 +193,11 @@
 
     invoke-interface {v1, v2}, Ljavax/microedition/khronos/egl/EGL10;->eglTerminate(Ljavax/microedition/khronos/egl/EGLDisplay;)Z
 
-    aget v1, v6, v0
+    aget v0, v6, v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v1
+    return v0
 
     :catch_0
     move-exception v1
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/d.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/d.smali
index 2b82163ced..b7e0db088f 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/d.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/d.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/d;
 .super Landroid/graphics/drawable/Drawable;
+.source "FastBitmapDrawable.java"
 
 
 # instance fields
@@ -73,8 +74,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/d;->mBitmap:Landroid/graphics/Bitmap;
-
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->isRecycled()Z
 
     move-result v0
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/e.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/e.smali
index eb802c788d..067aa15b04 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/e.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/e.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/e;
 .super Ljava/lang/Object;
+.source "FileUtils.java"
 
 
 # direct methods
@@ -136,4 +137,6 @@
 
     :cond_3
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali
index 87aa574924..4c02c1a65f 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/c/f$a;
 .super Ljava/lang/Object;
+.source "ImageHeaderParser.java"
 
 
 # annotations
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 6fd7d931f2..540b63d633 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
@@ -1,5 +1,6 @@
 .class interface abstract Lcom/yalantis/ucrop/c/f$b;
 .super Ljava/lang/Object;
+.source "ImageHeaderParser.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract DA()S
+.method public abstract Dy()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -22,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract Dz()I
+.method public abstract Dz()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 4580540f18..7da1078256 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/c/f$c;
 .super Ljava/lang/Object;
+.source "ImageHeaderParser.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/c/f$b;
@@ -33,28 +34,7 @@
 
 
 # virtual methods
-.method public final DA()S
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->bIv:Ljava/io/InputStream;
-
-    invoke-virtual {v0}, Ljava/io/InputStream;->read()I
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    int-to-short v0, v0
-
-    return v0
-.end method
-
-.method public final Dz()I
+.method public final Dy()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -87,6 +67,27 @@
     return v0
 .end method
 
+.method public final Dz()S
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->bIv:Ljava/io/InputStream;
+
+    invoke-virtual {v0}, Ljava/io/InputStream;->read()I
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    int-to-short v0, v0
+
+    return v0
+.end method
+
 .method public final skip(J)J
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
@@ -121,7 +122,6 @@
 
     if-lez v6, :cond_1
 
-    :goto_1
     sub-long/2addr v2, v4
 
     goto :goto_0
@@ -139,11 +139,11 @@
 
     const-wide/16 v4, 0x1
 
-    goto :goto_1
+    sub-long/2addr v2, v4
+
+    goto :goto_0
 
     :cond_2
-    const/4 v0, 0x0
-
     sub-long/2addr p1, v2
 
     return-wide p1
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 f62c45f736..558ee6dbf9 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/f.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/f.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/f;
 .super Ljava/lang/Object;
+.source "ImageHeaderParser.java"
 
 
 # annotations
@@ -202,7 +203,9 @@
 
     const-string v5, "Negative tiff component count"
 
-    goto/16 :goto_6
+    invoke-static {v4, v5}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto/16 :goto_5
 
     :cond_3
     const-string v8, "ImageHeaderParser"
@@ -270,7 +273,17 @@
 
     const-string v5, "Got byte count > 4, not orientation, continuing, formatCode="
 
-    goto :goto_5
+    invoke-static {v6}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-virtual {v5, v6}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-static {v4, v5}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto/16 :goto_5
 
     :cond_5
     add-int/lit8 v4, v4, 0x8
@@ -331,7 +344,9 @@
 
     move-result-object v5
 
-    goto :goto_6
+    invoke-static {v4, v5}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto :goto_5
 
     :cond_9
     :goto_3
@@ -365,7 +380,7 @@
 
     invoke-static {v6, v4}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_a
     :goto_4
@@ -381,7 +396,6 @@
 
     const-string v5, "Got invalid format code = "
 
-    :goto_5
     invoke-static {v6}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
     move-result-object v6
@@ -390,11 +404,10 @@
 
     move-result-object v5
 
-    :goto_6
     invoke-static {v4, v5}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_b
-    :goto_7
+    :goto_5
     add-int/lit8 v3, v3, 0x1
 
     goto/16 :goto_1
@@ -671,17 +684,15 @@
     :goto_1
     sget-object v2, Lcom/yalantis/ucrop/c/f;->bIs:[B
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v0, v2, :cond_2
+    if-ge v0, v3, :cond_2
 
-    aget-byte v2, p0, v0
+    aget-byte v3, p0, v0
 
-    sget-object v3, Lcom/yalantis/ucrop/c/f;->bIs:[B
+    aget-byte v2, v2, v0
 
-    aget-byte v3, v3, v0
-
-    if-eq v2, v3, :cond_1
+    if-eq v3, v2, :cond_1
 
     const/4 p1, 0x0
 
@@ -699,7 +710,7 @@
 
 
 # virtual methods
-.method final Dy()I
+.method final Dx()I
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -710,7 +721,7 @@
     :cond_0
     iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->bIu:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->DA()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Dz()S
 
     move-result v0
 
@@ -750,7 +761,7 @@
     :cond_2
     iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->bIu:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->DA()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Dz()S
 
     move-result v0
 
@@ -785,7 +796,7 @@
     :cond_5
     iget-object v1, p0, Lcom/yalantis/ucrop/c/f;->bIu:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Dz()I
+    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Dy()I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/g.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/g.smali
index c485454237..f0e89ef08c 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/g.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/g.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/g;
 .super Ljava/lang/Object;
+.source "RectUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/h$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/h$a.smali
index 95c64df52d..3c8c876561 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/h$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/h$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/yalantis/ucrop/c/h$a;
 .super Ljava/lang/Object;
+.source "RotationGestureDetector.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/h$b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/h$b.smali
index 15178bf4e1..a0883a754f 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/h$b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/h$b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/c/h$b;
 .super Ljava/lang/Object;
+.source "RotationGestureDetector.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/c/h$a;
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 dc38c3ce23..d48470de4d 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/h.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/h.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/h;
 .super Ljava/lang/Object;
+.source "RotationGestureDetector.java"
 
 
 # annotations
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 6a593b6fb2..69561a3f6e 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/i.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/i.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/c/i;
 .super Landroid/graphics/drawable/StateListDrawable;
+.source "SelectedStateListDrawable.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio$1.smali b/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio$1.smali
index a0c7f71c6a..a439c99a35 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio$1.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio$1.smali
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/model/AspectRatio$1;
 .super Ljava/lang/Object;
+.source "AspectRatio.java"
 
 # interfaces
 .implements Landroid/os/Parcelable$Creator;
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 29dc427c56..f4d8bc4594 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/model/AspectRatio;
 .super Ljava/lang/Object;
+.source "AspectRatio.java"
 
 # interfaces
 .implements Landroid/os/Parcelable;
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 707f0b28e4..90118caf98 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/a.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/model/a;
 .super Ljava/lang/Object;
+.source "CropParameters.java"
 
 
 # instance fields
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 73d15dfc35..cc99e4b931 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/b.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/model/b;
 .super Ljava/lang/Object;
+.source "ExifInfo.java"
 
 
 # instance fields
@@ -39,7 +40,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_5
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -83,6 +84,9 @@
     return v0
 
     :cond_4
+    return v1
+
+    :cond_5
     :goto_0
     return v1
 .end method
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 07e22c549a..c15554bc18 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/c.smali
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/model/c;
 .super Ljava/lang/Object;
+.source "ImageState.java"
 
 
 # instance fields
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 49bee8537a..4ce033a479 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/view/GestureCropImageView$a;
 .super Landroid/view/GestureDetector$SimpleOnGestureListener;
+.source "GestureCropImageView.java"
 
 
 # annotations
@@ -43,9 +44,7 @@
 
     iget-object v8, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bJg:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bJg:Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->getDoubleTapTargetScale()F
+    invoke-virtual {v8}, Lcom/yalantis/ucrop/view/GestureCropImageView;->getDoubleTapTargetScale()F
 
     move-result v0
 
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 eaf5a51f40..5071b15779 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/view/GestureCropImageView$b;
 .super Lcom/yalantis/ucrop/c/h$b;
+.source "GestureCropImageView.java"
 
 
 # annotations
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 3e2abdb50f..c7ffd683a9 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/view/GestureCropImageView$c;
 .super Landroid/view/ScaleGestureDetector$SimpleOnScaleGestureListener;
+.source "GestureCropImageView.java"
 
 
 # annotations
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 b31c8bad16..6371c289d0 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/view/GestureCropImageView;
 .super Lcom/yalantis/ucrop/view/a;
+.source "GestureCropImageView.java"
 
 
 # annotations
@@ -31,37 +32,21 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/view/a;-><init>(Landroid/content/Context;)V
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bJe:Z
-
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->Vj:Z
-
-    const/4 p1, 0x5
-
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bJf:I
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
     .locals 0
 
+    const/4 p3, 0x0
+
     invoke-direct {p0, p1, p2, p3}, Lcom/yalantis/ucrop/view/a;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     const/4 p1, 0x1
@@ -206,7 +191,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DB()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->DA()V
 
     :cond_0
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getPointerCount()I
@@ -280,12 +265,12 @@
     packed-switch v3, :pswitch_data_0
 
     :pswitch_0
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_1
     iput v5, v0, Lcom/yalantis/ucrop/c/h;->bIB:I
 
-    goto/16 :goto_3
+    goto/16 :goto_1
 
     :pswitch_2
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
@@ -314,7 +299,11 @@
 
     iput v1, v0, Lcom/yalantis/ucrop/c/h;->bIB:I
 
-    goto/16 :goto_2
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bIC:F
+
+    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->bID:Z
+
+    goto/16 :goto_1
 
     :pswitch_3
     iget v3, v0, Lcom/yalantis/ucrop/c/h;->bIA:I
@@ -365,7 +354,7 @@
 
     iput-boolean v1, v0, Lcom/yalantis/ucrop/c/h;->bID:Z
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     iget v1, v0, Lcom/yalantis/ucrop/c/h;->bIw:F
@@ -442,10 +431,9 @@
 
     add-float/2addr v1, v8
 
-    :goto_0
     iput v1, v0, Lcom/yalantis/ucrop/c/h;->bIC:F
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
     iget v1, v0, Lcom/yalantis/ucrop/c/h;->bIC:F
@@ -460,10 +448,10 @@
 
     sub-float/2addr v1, v8
 
-    goto :goto_0
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bIC:F
 
     :cond_5
-    :goto_1
+    :goto_0
     iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->bIE:Lcom/yalantis/ucrop/c/h$a;
 
     if-eqz v1, :cond_6
@@ -481,12 +469,12 @@
 
     iput v5, v0, Lcom/yalantis/ucrop/c/h;->bIz:F
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_4
     iput v5, v0, Lcom/yalantis/ucrop/c/h;->bIA:I
 
-    goto :goto_3
+    goto :goto_1
 
     :pswitch_5
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
@@ -511,13 +499,12 @@
 
     iput v1, v0, Lcom/yalantis/ucrop/c/h;->bIA:I
 
-    :goto_2
     iput v4, v0, Lcom/yalantis/ucrop/c/h;->bIC:F
 
     iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->bID:Z
 
     :cond_7
-    :goto_3
+    :goto_1
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
     move-result p1
@@ -531,8 +518,6 @@
     :cond_8
     return v2
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_5
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 871e7dcf25..0c1792dee8 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/view/OverlayView;
 .super Landroid/view/View;
+.source "OverlayView.java"
 
 
 # instance fields
@@ -61,29 +62,21 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/yalantis/ucrop/view/OverlayView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/OverlayView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/OverlayView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
     .locals 1
 
+    const/4 p3, 0x0
+
     invoke-direct {p0, p1, p2, p3}, Landroid/view/View;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     new-instance p1, Landroid/graphics/RectF;
@@ -110,33 +103,31 @@
 
     new-instance p2, Landroid/graphics/Paint;
 
-    const/4 p3, 0x1
+    const/4 v0, 0x1
 
-    invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
+    invoke-direct {p2, v0}, Landroid/graphics/Paint;-><init>(I)V
 
     iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJq:Landroid/graphics/Paint;
 
     new-instance p2, Landroid/graphics/Paint;
 
-    invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
+    invoke-direct {p2, v0}, Landroid/graphics/Paint;-><init>(I)V
 
     iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJr:Landroid/graphics/Paint;
 
     new-instance p2, Landroid/graphics/Paint;
 
-    invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
+    invoke-direct {p2, v0}, Landroid/graphics/Paint;-><init>(I)V
 
     iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJs:Landroid/graphics/Paint;
 
     new-instance p2, Landroid/graphics/Paint;
 
-    invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
+    invoke-direct {p2, v0}, Landroid/graphics/Paint;-><init>(I)V
 
     iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJt:Landroid/graphics/Paint;
 
-    const/4 p2, 0x0
-
-    iput-boolean p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJw:Z
+    iput-boolean p3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJw:Z
 
     const/high16 p2, -0x40800000    # -1.0f
 
@@ -152,9 +143,9 @@
 
     move-result-object p2
 
-    sget v0, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_rect_corner_touch_threshold:I
+    sget p3, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_rect_corner_touch_threshold:I
 
-    invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result p2
 
@@ -164,9 +155,9 @@
 
     move-result-object p2
 
-    sget v0, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_rect_min_size:I
+    sget p3, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_rect_min_size:I
 
-    invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result p2
 
@@ -176,9 +167,9 @@
 
     move-result-object p2
 
-    sget v0, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_rect_corner_touch_area_line_length:I
+    sget p3, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_rect_corner_touch_area_line_length:I
 
-    invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result p2
 
@@ -186,23 +177,23 @@
 
     sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v0, 0x12
+    const/16 p3, 0x12
 
-    if-ge p2, v0, :cond_0
+    if-ge p2, p3, :cond_0
 
     sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v0, 0xb
+    const/16 p3, 0xb
 
-    if-lt p2, v0, :cond_0
+    if-lt p2, p3, :cond_0
 
-    invoke-virtual {p0, p3, p1}, Lcom/yalantis/ucrop/view/OverlayView;->setLayerType(ILandroid/graphics/Paint;)V
+    invoke-virtual {p0, v0, p1}, Lcom/yalantis/ucrop/view/OverlayView;->setLayerType(ILandroid/graphics/Paint;)V
 
     :cond_0
     return-void
 .end method
 
-.method private DE()V
+.method private DD()V
     .locals 5
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
@@ -588,8 +579,6 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJk:[F
-
     iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJr:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->drawLines([FLandroid/graphics/Paint;)V
@@ -622,15 +611,13 @@
 
     iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJE:I
 
+    int-to-float v2, v1
+
+    neg-int v1, v1
+
     int-to-float v1, v1
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJE:I
-
-    neg-int v2, v2
-
-    int-to-float v2, v2
-
-    invoke-virtual {v0, v1, v2}, Landroid/graphics/RectF;->inset(FF)V
+    invoke-virtual {v0, v2, v1}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Ic:Landroid/graphics/RectF;
 
@@ -648,15 +635,13 @@
 
     iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJE:I
 
-    neg-int v1, v1
-
-    int-to-float v1, v1
-
-    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJE:I
+    neg-int v2, v1
 
     int-to-float v2, v2
 
-    invoke-virtual {v0, v1, v2}, Landroid/graphics/RectF;->inset(FF)V
+    int-to-float v1, v1
+
+    invoke-virtual {v0, v2, v1}, Landroid/graphics/RectF;->inset(FF)V
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Ic:Landroid/graphics/RectF;
 
@@ -746,13 +731,13 @@
 
     const/4 v1, 0x0
 
-    if-nez v0, :cond_10
+    if-nez v0, :cond_11
 
     iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJw:Z
 
     if-nez v0, :cond_0
 
-    goto/16 :goto_c
+    goto/16 :goto_8
 
     :cond_0
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
@@ -1033,7 +1018,11 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    goto/16 :goto_b
+    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->DD()V
+
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->postInvalidate()V
+
+    goto/16 :goto_7
 
     :pswitch_1
     iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->Ic:Landroid/graphics/RectF;
@@ -1139,62 +1128,50 @@
 
     iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->Ic:Landroid/graphics/RectF;
 
-    :goto_3
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
-    goto :goto_4
-
-    :cond_9
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
-
     goto :goto_3
 
-    :goto_4
+    :cond_9
+    iget v4, v3, Landroid/graphics/RectF;->left:F
+
+    :goto_3
     if-eqz v2, :cond_a
 
     iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->Ic:Landroid/graphics/RectF;
 
-    :goto_5
-    iget v6, v6, Landroid/graphics/RectF;->top:F
-
-    goto :goto_6
+    goto :goto_4
 
     :cond_a
     iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
 
-    goto :goto_5
+    :goto_4
+    iget v6, v6, Landroid/graphics/RectF;->top:F
 
-    :goto_6
     if-eqz v1, :cond_b
 
     iget-object v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->Ic:Landroid/graphics/RectF;
 
-    :goto_7
-    iget v7, v7, Landroid/graphics/RectF;->right:F
-
-    goto :goto_8
+    goto :goto_5
 
     :cond_b
     iget-object v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
 
-    goto :goto_7
+    :goto_5
+    iget v7, v7, Landroid/graphics/RectF;->right:F
 
-    :goto_8
     if-eqz v2, :cond_c
 
     iget-object v8, p0, Lcom/yalantis/ucrop/view/OverlayView;->Ic:Landroid/graphics/RectF;
 
-    :goto_9
-    iget v8, v8, Landroid/graphics/RectF;->bottom:F
-
-    goto :goto_a
+    goto :goto_6
 
     :cond_c
     iget-object v8, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
 
-    goto :goto_9
+    :goto_6
+    iget v8, v8, Landroid/graphics/RectF;->bottom:F
 
-    :goto_a
     invoke-virtual {v3, v4, v6, v7, v8}, Landroid/graphics/RectF;->set(FFFF)V
 
     if-nez v2, :cond_d
@@ -1202,12 +1179,12 @@
     if-eqz v1, :cond_e
 
     :cond_d
-    :goto_b
-    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->DE()V
+    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->DD()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->postInvalidate()V
 
     :cond_e
+    :goto_7
     iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJz:F
 
     iput v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJA:F
@@ -1235,17 +1212,16 @@
 
     if-eqz p1, :cond_10
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJF:Lcom/yalantis/ucrop/a/d;
-
     iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
 
     invoke-interface {p1, v0}, Lcom/yalantis/ucrop/a/d;->g(Landroid/graphics/RectF;)V
 
     :cond_10
-    :goto_c
     return v1
 
-    nop
+    :cond_11
+    :goto_8
+    return v1
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -1414,35 +1390,27 @@
 
     if-lez p1, :cond_2
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJu:I
+    int-to-float v0, p1
 
-    int-to-float p1, p1
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bIG:F
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bIG:F
+    div-float/2addr v0, v1
 
-    div-float/2addr p1, v0
+    float-to-int v0, v0
 
-    float-to-int p1, p1
+    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJv:I
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJv:I
+    if-le v0, v2, :cond_0
 
-    if-le p1, v0, :cond_0
+    int-to-float v0, v2
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJv:I
+    mul-float v0, v0, v1
 
-    int-to-float p1, p1
+    float-to-int v0, v0
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bIG:F
+    sub-int/2addr p1, v0
 
-    mul-float p1, p1, v0
-
-    float-to-int p1, p1
-
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJu:I
-
-    sub-int/2addr v0, p1
-
-    div-int/lit8 v0, v0, 0x2
+    div-int/lit8 p1, p1, 0x2
 
     iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
 
@@ -1450,7 +1418,7 @@
 
     move-result v2
 
-    add-int/2addr v2, v0
+    add-int/2addr v2, p1
 
     int-to-float v2, v2
 
@@ -1464,10 +1432,10 @@
 
     move-result v4
 
-    add-int/2addr v4, p1
-
     add-int/2addr v4, v0
 
+    add-int/2addr v4, p1
+
     int-to-float p1, v4
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getPaddingTop()I
@@ -1485,25 +1453,23 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJv:I
+    sub-int/2addr v2, v0
 
-    sub-int/2addr v0, p1
+    div-int/lit8 v2, v2, 0x2
 
-    div-int/lit8 v0, v0, 0x2
-
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getPaddingLeft()I
 
-    move-result v2
+    move-result v1
 
-    int-to-float v2, v2
+    int-to-float v1, v1
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getPaddingTop()I
 
     move-result v3
 
-    add-int/2addr v3, v0
+    add-int/2addr v3, v2
 
     int-to-float v3, v3
 
@@ -1521,27 +1487,25 @@
 
     move-result v5
 
-    add-int/2addr v5, p1
-
     add-int/2addr v5, v0
 
-    int-to-float p1, v5
+    add-int/2addr v5, v2
 
-    invoke-virtual {v1, v2, v3, v4, p1}, Landroid/graphics/RectF;->set(FFFF)V
+    int-to-float v0, v5
+
+    invoke-virtual {p1, v1, v3, v4, v0}, Landroid/graphics/RectF;->set(FFFF)V
 
     :goto_0
     iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJF:Lcom/yalantis/ucrop/a/d;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJF:Lcom/yalantis/ucrop/a/d;
-
     iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bJh: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;->DE()V
+    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->DD()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->postInvalidate()V
 
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 9d8ef0cf7a..428ef31e4e 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/view/UCropView$1;
 .super Ljava/lang/Object;
+.source "UCropView.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/a/c;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/yalantis/ucrop/view/UCropView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    value = Lcom/yalantis/ucrop/view/UCropView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 472ae56d98..cc645f9fb9 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/view/UCropView$2;
 .super Ljava/lang/Object;
+.source "UCropView.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/a/d;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/yalantis/ucrop/view/UCropView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    value = Lcom/yalantis/ucrop/view/UCropView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 ab56340f31..3dba6b5354 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/view/UCropView;
 .super Landroid/widget/FrameLayout;
+.source "UCropView.java"
 
 
 # instance fields
@@ -14,59 +15,59 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/UCropView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/UCropView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
     .locals 4
 
+    const/4 p3, 0x0
+
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater;
 
-    move-result-object p3
+    move-result-object v0
 
-    sget v0, Lcom/yalantis/ucrop/R$e;->ucrop_view:I
+    sget v1, Lcom/yalantis/ucrop/R$e;->ucrop_view:I
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    invoke-virtual {p3, v0, p0, v1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {v0, v1, p0, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
-    sget p3, Lcom/yalantis/ucrop/R$d;->image_view_crop:I
+    sget v0, Lcom/yalantis/ucrop/R$d;->image_view_crop:I
 
-    invoke-virtual {p0, p3}, Lcom/yalantis/ucrop/view/UCropView;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/UCropView;->findViewById(I)Landroid/view/View;
 
-    move-result-object p3
+    move-result-object v0
 
-    check-cast p3, Lcom/yalantis/ucrop/view/GestureCropImageView;
+    check-cast v0, Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->bHy:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->bHy:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    sget p3, Lcom/yalantis/ucrop/R$d;->view_overlay:I
+    sget v0, Lcom/yalantis/ucrop/R$d;->view_overlay:I
 
-    invoke-virtual {p0, p3}, Lcom/yalantis/ucrop/view/UCropView;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/UCropView;->findViewById(I)Landroid/view/View;
 
-    move-result-object p3
+    move-result-object v0
 
-    check-cast p3, Lcom/yalantis/ucrop/view/OverlayView;
+    check-cast v0, Lcom/yalantis/ucrop/view/OverlayView;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->bJQ:Lcom/yalantis/ucrop/view/OverlayView;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->bJQ:Lcom/yalantis/ucrop/view/OverlayView;
 
-    sget-object p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView:[I
+    sget-object v0, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView:[I
 
-    invoke-virtual {p1, p2, p3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p2, v0}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
 
     move-result-object p1
 
     iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->bJQ:Lcom/yalantis/ucrop/view/OverlayView;
 
-    sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_circle_dimmed_layer:I
+    sget v0, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_circle_dimmed_layer:I
 
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, p3, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {p1, v0, p3}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result p3
 
@@ -78,9 +79,9 @@
 
     move-result-object v0
 
-    sget v2, Lcom/yalantis/ucrop/R$a;->ucrop_color_default_dimmed:I
+    sget v1, Lcom/yalantis/ucrop/R$a;->ucrop_color_default_dimmed:I
 
-    invoke-virtual {v0, v2}, Landroid/content/res/Resources;->getColor(I)I
+    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColor(I)I
 
     move-result v0
 
@@ -114,9 +115,9 @@
 
     move-result-object v0
 
-    sget v2, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_frame_stoke_width:I
+    sget v1, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_frame_stoke_width:I
 
-    invoke-virtual {v0, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result v0
 
@@ -128,41 +129,41 @@
 
     invoke-virtual {p2}, Lcom/yalantis/ucrop/view/OverlayView;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
     sget v3, Lcom/yalantis/ucrop/R$a;->ucrop_color_default_crop_frame:I
 
-    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getColor(I)I
+    invoke-virtual {v1, v3}, Landroid/content/res/Resources;->getColor(I)I
 
-    move-result v2
+    move-result v1
 
-    invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getColor(II)I
+    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I
 
     move-result v0
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJs:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJs:Landroid/graphics/Paint;
 
     int-to-float v3, p3
 
-    invoke-virtual {v2, v3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
+    invoke-virtual {v1, v3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJs:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJs:Landroid/graphics/Paint;
 
-    invoke-virtual {v2, v0}, Landroid/graphics/Paint;->setColor(I)V
+    invoke-virtual {v1, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJs:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJs: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
+    invoke-virtual {v1, v3}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJt:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJt:Landroid/graphics/Paint;
 
     mul-int/lit8 p3, p3, 0x3
 
     int-to-float p3, p3
 
-    invoke-virtual {v2, p3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
+    invoke-virtual {v1, p3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
     iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJt:Landroid/graphics/Paint;
 
@@ -176,7 +177,7 @@
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_show_frame:I
 
-    invoke-virtual {p1, p3, v1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {p1, p3, v2}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result p3
 
@@ -188,9 +189,9 @@
 
     move-result-object v0
 
-    sget v2, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_grid_stoke_width:I
+    sget v1, Lcom/yalantis/ucrop/R$b;->ucrop_default_crop_grid_stoke_width:I
 
-    invoke-virtual {v0, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result v0
 
@@ -202,23 +203,23 @@
 
     invoke-virtual {p2}, Lcom/yalantis/ucrop/view/OverlayView;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
     sget v3, Lcom/yalantis/ucrop/R$a;->ucrop_color_default_crop_grid:I
 
-    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getColor(I)I
+    invoke-virtual {v1, v3}, Landroid/content/res/Resources;->getColor(I)I
 
-    move-result v2
+    move-result v1
 
-    invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getColor(II)I
+    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I
 
     move-result v0
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJr:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJr:Landroid/graphics/Paint;
 
     int-to-float p3, p3
 
-    invoke-virtual {v2, p3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
+    invoke-virtual {v1, p3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
     iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bJr:Landroid/graphics/Paint;
 
@@ -244,7 +245,7 @@
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_show_grid:I
 
-    invoke-virtual {p1, p3, v1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    invoke-virtual {p1, p3, v2}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
     move-result p3
 
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 47ddd827ae..c559ee93a1 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/view/a$a;
 .super Ljava/lang/Object;
+.source "CropImageView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -208,7 +209,7 @@
     invoke-virtual {v0, v1, v2, v3}, Lcom/yalantis/ucrop/view/a;->e(FFF)V
 
     :cond_1
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/a;->DD()Z
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/a;->DC()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 35a3f8e248..7bc8336737 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
@@ -1,5 +1,6 @@
 .class final Lcom/yalantis/ucrop/view/a$b;
 .super Ljava/lang/Object;
+.source "CropImageView.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
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 d5c867d1d8..1648d19859 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/a.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/view/a;
 .super Lcom/yalantis/ucrop/view/b;
+.source "CropImageView.java"
 
 
 # annotations
@@ -38,16 +39,6 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/yalantis/ucrop/view/a;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
@@ -61,6 +52,8 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
     .locals 0
 
+    const/4 p3, 0x0
+
     invoke-direct {p0, p1, p2, p3}, Lcom/yalantis/ucrop/view/b;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     new-instance p1, Landroid/graphics/RectF;
@@ -83,11 +76,9 @@
 
     iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->bIK:Ljava/lang/Runnable;
 
-    const/4 p1, 0x0
+    iput p3, p0, Lcom/yalantis/ucrop/view/a;->bHT:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bHT:I
-
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bHU:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/a;->bHU:I
 
     const-wide/16 p1, 0x1f4
 
@@ -238,7 +229,7 @@
     return-void
 .end method
 
-.method public final DB()V
+.method public final DA()V
     .locals 1
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bIJ:Ljava/lang/Runnable;
@@ -252,10 +243,10 @@
     return-void
 .end method
 
-.method protected final DC()V
+.method protected final DB()V
     .locals 8
 
-    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->DC()V
+    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->DB()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -439,8 +430,6 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bII:Lcom/yalantis/ucrop/a/c;
-
     iget v1, p0, Lcom/yalantis/ucrop/view/a;->bIG:F
 
     invoke-interface {v0, v1}, Lcom/yalantis/ucrop/a/c;->A(F)V
@@ -470,7 +459,7 @@
     return-void
 .end method
 
-.method protected final DD()Z
+.method protected final DC()Z
     .locals 1
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bJH:[F
@@ -495,7 +484,7 @@
 
     move-object v0, p0
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->DB()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->DA()V
 
     const/4 v1, 0x0
 
@@ -779,7 +768,7 @@
 .end method
 
 .method public setImageToWrapCropBounds(Z)V
-    .locals 21
+    .locals 20
 
     move-object/from16 v11, p0
 
@@ -787,7 +776,7 @@
 
     if-eqz v0, :cond_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->DD()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->DC()Z
 
     move-result v0
 
@@ -971,17 +960,14 @@
 
     if-gez v6, :cond_3
 
-    :goto_3
-    const/4 v6, 0x3
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_3
     const/4 v0, 0x0
 
-    goto :goto_3
+    :goto_3
+    const/4 v6, 0x3
 
-    :goto_4
     aput v0, v3, v6
 
     iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->mTempMatrix:Landroid/graphics/Matrix;
@@ -1022,11 +1008,11 @@
 
     move v7, v1
 
-    move/from16 v20, v10
+    move/from16 v18, v10
 
     const/4 v9, 0x0
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_4
     new-instance v7, Landroid/graphics/RectF;
@@ -1079,7 +1065,7 @@
 
     sub-float v2, v18, v19
 
-    move/from16 v20, v10
+    move/from16 v18, v10
 
     float-to-double v9, v2
 
@@ -1171,7 +1157,7 @@
 
     move v7, v3
 
-    :goto_5
+    :goto_4
     if-eqz p1, :cond_5
 
     new-instance v12, Lcom/yalantis/ucrop/view/a$a;
@@ -1182,7 +1168,7 @@
 
     move-object/from16 v1, p0
 
-    move/from16 v10, v20
+    move/from16 v10, v18
 
     invoke-direct/range {v0 .. v10}, Lcom/yalantis/ucrop/view/a$a;-><init>(Lcom/yalantis/ucrop/view/a;JFFFFFFZ)V
 
@@ -1195,7 +1181,7 @@
     :cond_5
     invoke-virtual {v11, v6, v7}, Lcom/yalantis/ucrop/view/a;->d(FF)V
 
-    if-nez v20, :cond_6
+    if-nez v18, :cond_6
 
     add-float/2addr v8, v9
 
@@ -1313,15 +1299,18 @@
 
     div-float/2addr p1, v0
 
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bIG:F
+
+    goto :goto_0
+
     :cond_1
     iput p1, p0, Lcom/yalantis/ucrop/view/a;->bIG:F
 
+    :goto_0
     iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->bII:Lcom/yalantis/ucrop/a/c;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->bII:Lcom/yalantis/ucrop/a/c;
-
     iget v0, p0, Lcom/yalantis/ucrop/view/a;->bIG:F
 
     invoke-interface {p1, v0}, Lcom/yalantis/ucrop/a/c;->A(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 9d05670ea7..a508bc5b52 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
@@ -1,5 +1,6 @@
 .class public final Lcom/yalantis/ucrop/view/b$1;
 .super Ljava/lang/Object;
+.source "TransformImageView.java"
 
 # interfaces
 .implements Lcom/yalantis/ucrop/a/b;
@@ -70,8 +71,6 @@
 
     iput-boolean p3, p2, Lcom/yalantis/ucrop/view/b;->bJN:Z
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b$1;->bJP:Lcom/yalantis/ucrop/view/b;
-
     invoke-virtual {p2, p1}, Lcom/yalantis/ucrop/view/b;->setImageBitmap(Landroid/graphics/Bitmap;)V
 
     return-void
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 73f8b74fcb..cba95ddb96 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
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/yalantis/ucrop/view/b$a;
 .super Ljava/lang/Object;
+.source "TransformImageView.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Ds()V
+.method public abstract Dr()V
 .end method
 
 .method public abstract g(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 2c6ad2094f..c168e2a1a3 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/b.smali
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/view/b;
 .super Landroid/widget/ImageView;
+.source "TransformImageView.java"
 
 
 # annotations
@@ -43,16 +44,6 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/yalantis/ucrop/view/b;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
@@ -237,7 +228,7 @@
 
 
 # virtual methods
-.method protected DC()V
+.method protected DB()V
     .locals 7
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->getDrawable()Landroid/graphics/drawable/Drawable;
@@ -319,9 +310,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bJK:Lcom/yalantis/ucrop/view/b$a;
-
-    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Ds()V
+    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Dr()V
 
     :cond_1
     return-void
@@ -374,8 +363,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bJK:Lcom/yalantis/ucrop/view/b$a;
-
     iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bJJ:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p2}, Lcom/yalantis/ucrop/view/b;->getMatrixScale(Landroid/graphics/Matrix;)F
@@ -409,8 +396,6 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bJK:Lcom/yalantis/ucrop/view/b$a;
-
     iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bJJ:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p2}, Lcom/yalantis/ucrop/view/b;->g(Landroid/graphics/Matrix;)F
@@ -573,7 +558,7 @@
     move-result v0
 
     :cond_1
-    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Dx()I
+    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Dw()I
 
     move-result v1
 
@@ -707,7 +692,7 @@
 
     iput p4, p0, Lcom/yalantis/ucrop/view/b;->bJv:I
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->DC()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->DB()V
 
     :cond_1
     return-void
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 9d3b5920e2..8bf61b34a6 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
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;
 .super Landroid/widget/TextView;
+.source "AspectRatioTextView.java"
 
 
 # instance fields
@@ -19,28 +20,20 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
+    .locals 3
+
+    const/4 p3, 0x0
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/TextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -56,144 +49,103 @@
 
     move-result-object p1
 
-    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->a(Landroid/content/res/TypedArray;)V
+    const/4 p2, 0x1
 
-    return-void
-.end method
+    invoke-virtual {p0, p2}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->setGravity(I)V
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 0
-    .annotation build Landroid/annotation/TargetApi;
-        value = 0x15
-    .end annotation
+    sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_title:I
 
-    invoke-direct {p0, p1, p2, p3, p4}, Landroid/widget/TextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+    invoke-virtual {p1, p3}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
 
-    new-instance p3, Landroid/graphics/Rect;
+    move-result-object p3
 
-    invoke-direct {p3}, Landroid/graphics/Rect;-><init>()V
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHQ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJS:Landroid/graphics/Rect;
+    sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_x:I
 
-    sget-object p3, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView:[I
+    const/4 v0, 0x0
 
-    invoke-virtual {p1, p2, p3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p3, v0}, Landroid/content/res/TypedArray;->getFloat(IF)F
 
-    move-result-object p1
+    move-result p3
 
-    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->a(Landroid/content/res/TypedArray;)V
+    iput p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHR:F
 
-    return-void
-.end method
+    sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_y:I
 
-.method private a(Landroid/content/res/TypedArray;)V
-    .locals 3
-    .param p1    # Landroid/content/res/TypedArray;
-        .annotation build Landroidx/annotation/NonNull;
-        .end annotation
-    .end param
+    invoke-virtual {p1, p3, v0}, Landroid/content/res/TypedArray;->getFloat(IF)F
 
-    const/4 v0, 0x1
+    move-result p3
 
-    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->setGravity(I)V
+    iput p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHS:F
 
-    sget v1, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_title:I
+    iget p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHR:F
 
-    invoke-virtual {p1, v1}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHQ:Ljava/lang/String;
-
-    sget v1, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_x:I
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p1, v1, v2}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v1
-
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHR:F
-
-    sget v1, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_y:I
-
-    invoke-virtual {p1, v1, v2}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v1
-
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHS:F
-
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHR:F
-
-    cmpl-float v1, v1, v2
+    cmpl-float v1, p3, v0
 
     if-eqz v1, :cond_1
 
     iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHS:F
 
-    cmpl-float v1, v1, v2
+    cmpl-float v2, v1, v0
 
-    if-nez v1, :cond_0
+    if-nez v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHR:F
+    div-float/2addr p3, v1
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHS:F
-
-    div-float/2addr v1, v2
-
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
+    iput p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
 
     :goto_1
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object p3
 
-    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {p3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v1
+    move-result-object p3
 
-    sget v2, Lcom/yalantis/ucrop/R$b;->ucrop_size_dot_scale_text_view:I
+    sget v0, Lcom/yalantis/ucrop/R$b;->ucrop_size_dot_scale_text_view:I
 
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {p3, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
-    move-result v1
+    move-result p3
 
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJU:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJU:I
 
-    new-instance v1, Landroid/graphics/Paint;
+    new-instance p3, Landroid/graphics/Paint;
 
-    invoke-direct {v1, v0}, Landroid/graphics/Paint;-><init>(I)V
+    invoke-direct {p3, p2}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJT:Landroid/graphics/Paint;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJT:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJT:Landroid/graphics/Paint;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJT:Landroid/graphics/Paint;
 
-    sget-object v1, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
+    sget-object p3, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
 
-    invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
+    invoke-virtual {p2, p3}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->DF()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->DE()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v0
+    move-result-object p2
 
-    sget v1, Lcom/yalantis/ucrop/R$a;->ucrop_color_widget_active:I
+    sget p3, Lcom/yalantis/ucrop/R$a;->ucrop_color_widget_active:I
 
-    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColor(I)I
+    invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getColor(I)I
 
-    move-result v0
+    move-result p2
 
-    invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->eM(I)V
+    invoke-direct {p0, p2}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->eM(I)V
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
@@ -211,8 +163,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJT:Landroid/graphics/Paint;
-
     invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
 
     :cond_0
@@ -265,7 +215,7 @@
 
 
 # virtual methods
-.method public final DF()V
+.method public final DE()V
     .locals 5
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHQ:Ljava/lang/String;
@@ -278,7 +228,6 @@
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHQ:Ljava/lang/String;
 
-    :goto_0
     invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
@@ -320,7 +269,9 @@
 
     move-result-object v0
 
-    goto :goto_0
+    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
 .end method
 
 .method protected onDraw(Landroid/graphics/Canvas;)V
@@ -364,8 +315,6 @@
 
     int-to-float v1, v1
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bJU:I
-
     div-int/lit8 v2, v2, 0x2
 
     int-to-float v2, v2
@@ -393,7 +342,7 @@
 .end method
 
 .method public setAspectRatio(Lcom/yalantis/ucrop/model/AspectRatio;)V
-    .locals 1
+    .locals 3
     .param p1    # Lcom/yalantis/ucrop/model/AspectRatio;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -415,24 +364,20 @@
 
     const/4 v0, 0x0
 
-    cmpl-float p1, p1, v0
+    cmpl-float v1, p1, v0
 
-    if-eqz p1, :cond_1
+    if-eqz v1, :cond_1
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHS:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHS:F
 
-    cmpl-float p1, p1, v0
+    cmpl-float v2, v1, v0
 
-    if-nez p1, :cond_0
+    if-nez v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHR:F
-
-    iget v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bHS:F
-
-    div-float/2addr p1, v0
+    div-float/2addr p1, v1
 
     iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
 
@@ -443,7 +388,7 @@
     iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->JS:F
 
     :goto_1
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->DF()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->DE()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 d250eb4695..1919d8829f 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
@@ -1,5 +1,6 @@
 .class public interface abstract Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 .super Ljava/lang/Object;
+.source "HorizontalProgressWheelView.java"
 
 
 # annotations
@@ -14,10 +15,10 @@
 
 
 # virtual methods
-.method public abstract Dt()V
+.method public abstract Ds()V
 .end method
 
-.method public abstract Du()V
+.method public abstract Dt()V
 .end method
 
 .method public abstract w(F)V
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 6b812a0b37..7612fb2a16 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
@@ -1,5 +1,6 @@
 .class public Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;
 .super Landroid/view/View;
+.source "HorizontalProgressWheelView.java"
 
 
 # annotations
@@ -33,29 +34,21 @@
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
 
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.method private constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;B)V
     .locals 0
 
+    const/4 p3, 0x0
+
     invoke-direct {p0, p1, p2, p3}, Landroid/view/View;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     new-instance p1, Landroid/graphics/Rect;
@@ -149,23 +142,6 @@
     return-void
 .end method
 
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 0
-    .annotation build Landroid/annotation/TargetApi;
-        value = 0x15
-    .end annotation
-
-    invoke-direct {p0, p1, p2, p3, p4}, Landroid/view/View;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-
-    new-instance p1, Landroid/graphics/Rect;
-
-    invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
-
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJS:Landroid/graphics/Rect;
-
-    return-void
-.end method
-
 
 # virtual methods
 .method protected onDraw(Landroid/graphics/Canvas;)V
@@ -187,88 +163,93 @@
 
     iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bKa:I
 
-    add-int/2addr v1, v2
+    add-int v3, v1, v2
 
-    div-int/2addr v0, v1
+    div-int/2addr v0, v3
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bKc:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bKc:F
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bKa:I
+    add-int/2addr v2, v1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJY:I
+    int-to-float v1, v2
 
-    add-int/2addr v2, v3
+    rem-float/2addr v3, v1
 
-    int-to-float v2, v2
-
-    rem-float/2addr v1, v2
-
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJX:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJX:Landroid/graphics/Paint;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v3
+    move-result-object v2
 
     sget v4, Lcom/yalantis/ucrop/R$a;->ucrop_color_progress_wheel_line:I
 
-    invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getColor(I)I
+    invoke-virtual {v2, v4}, Landroid/content/res/Resources;->getColor(I)I
 
-    move-result v3
+    move-result v2
 
-    invoke-virtual {v2, v3}, Landroid/graphics/Paint;->setColor(I)V
+    invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v2, v0, :cond_2
+    if-ge v1, v0, :cond_2
 
-    div-int/lit8 v3, v0, 0x4
+    div-int/lit8 v2, v0, 0x4
 
     const/high16 v4, 0x437f0000    # 255.0f
 
-    if-ge v2, v3, :cond_0
+    if-ge v1, v2, :cond_0
 
     iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJX:Landroid/graphics/Paint;
 
-    int-to-float v6, v2
+    int-to-float v6, v1
 
-    :goto_1
-    int-to-float v3, v3
+    int-to-float v2, v2
 
-    div-float/2addr v6, v3
+    div-float/2addr v6, v2
 
     mul-float v6, v6, v4
 
-    float-to-int v3, v6
+    float-to-int v2, v6
 
-    invoke-virtual {v5, v3}, Landroid/graphics/Paint;->setAlpha(I)V
+    invoke-virtual {v5, v2}, Landroid/graphics/Paint;->setAlpha(I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     mul-int/lit8 v5, v0, 0x3
 
     div-int/lit8 v5, v5, 0x4
 
-    if-le v2, v5, :cond_1
+    if-le v1, v5, :cond_1
 
     iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJX:Landroid/graphics/Paint;
 
-    sub-int v6, v0, v2
+    sub-int v6, v0, v1
 
     int-to-float v6, v6
 
+    int-to-float v2, v2
+
+    div-float/2addr v6, v2
+
+    mul-float v6, v6, v4
+
+    float-to-int v2, v6
+
+    invoke-virtual {v5, v2}, Landroid/graphics/Paint;->setAlpha(I)V
+
     goto :goto_1
 
     :cond_1
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJX:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJX:Landroid/graphics/Paint;
 
     const/16 v4, 0xff
 
-    invoke-virtual {v3, v4}, Landroid/graphics/Paint;->setAlpha(I)V
+    invoke-virtual {v2, v4}, Landroid/graphics/Paint;->setAlpha(I)V
 
-    :goto_2
-    neg-float v3, v1
+    :goto_1
+    neg-float v2, v3
 
     iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJS:Landroid/graphics/Rect;
 
@@ -276,7 +257,7 @@
 
     int-to-float v4, v4
 
-    add-float/2addr v4, v3
+    add-float/2addr v4, v2
 
     iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJY:I
 
@@ -284,7 +265,7 @@
 
     add-int/2addr v5, v6
 
-    mul-int v5, v5, v2
+    mul-int v5, v5, v1
 
     int-to-float v5, v5
 
@@ -314,7 +295,7 @@
 
     int-to-float v4, v4
 
-    add-float/2addr v3, v4
+    add-float/2addr v2, v4
 
     iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJY:I
 
@@ -322,19 +303,19 @@
 
     add-int/2addr v4, v5
 
-    mul-int v4, v4, v2
+    mul-int v4, v4, v1
 
     int-to-float v4, v4
 
-    add-float v9, v3, v4
+    add-float v9, v2, v4
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJS:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJS:Landroid/graphics/Rect;
 
-    invoke-virtual {v3}, Landroid/graphics/Rect;->centerY()I
+    invoke-virtual {v2}, Landroid/graphics/Rect;->centerY()I
 
-    move-result v3
+    move-result v2
 
-    int-to-float v3, v3
+    int-to-float v2, v2
 
     iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJZ:I
 
@@ -342,7 +323,7 @@
 
     div-float/2addr v4, v6
 
-    add-float v10, v3, v4
+    add-float v10, v2, v4
 
     iget-object v11, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJX:Landroid/graphics/Paint;
 
@@ -350,7 +331,7 @@
 
     invoke-virtual/range {v6 .. v11}, Landroid/graphics/Canvas;->drawLine(FFFFLandroid/graphics/Paint;)V
 
-    add-int/lit8 v2, v2, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
@@ -460,9 +441,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJV:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
-
-    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Du()V
+    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Dt()V
 
     :cond_0
     iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bKc:F
@@ -483,8 +462,6 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJV:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
-
     neg-float v0, v0
 
     invoke-interface {p1, v0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->w(F)V
@@ -496,13 +473,11 @@
 
     if-eqz p1, :cond_1
 
-    const/4 p1, 0x0
+    const/4 v0, 0x0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bKb:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bKb:Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bJV:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
-
-    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Dt()V
+    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Ds()V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/R.smali b/com.discord/smali_classes2/io/fabric/sdk/android/R.smali
index 8dc6626ec5..8e075531f7 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/R.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/R.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
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 7d664dc511..dfa1151409 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a$a$1;
 .super Ljava/lang/Object;
+.source "ActivityLifecycleManager.java"
 
 # interfaces
 .implements Landroid/app/Application$ActivityLifecycleCallbacks;
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 a8f41f4803..858edf9e8e 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a$a;
 .super Ljava/lang/Object;
+.source "ActivityLifecycleManager.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a$b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a$b.smali
index 52ea52cd88..d4e783b9aa 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a$b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a$b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a$b;
 .super Ljava/lang/Object;
+.source "ActivityLifecycleManager.java"
 
 
 # annotations
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 0d68b6d1e9..002e7dbf55 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a;
 .super Ljava/lang/Object;
+.source "ActivityLifecycleManager.java"
 
 
 # annotations
@@ -58,8 +59,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a;->bKf:Lio/fabric/sdk/android/a$a;
-
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/a$a;->b(Lio/fabric/sdk/android/a$b;)Z
 
     move-result p1
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 2f5e6a03a1..ae136098ec 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
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/a/a;
 .super Ljava/lang/Object;
+.source "AbstractValueCache.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/a/c;
@@ -51,7 +52,7 @@
 
 
 # virtual methods
-.method protected abstract DR()Ljava/lang/Object;
+.method protected abstract DQ()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
@@ -79,7 +80,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/a/a;->DR()Ljava/lang/Object;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/a/a;->DQ()Ljava/lang/Object;
 
     move-result-object v0
 
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 dee69ed896..3090236c03 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/a/b;
 .super Lio/fabric/sdk/android/a/a/a;
+.source "MemoryValueCache.java"
 
 
 # annotations
@@ -52,7 +53,7 @@
 
 
 # virtual methods
-.method protected final DR()Ljava/lang/Object;
+.method protected final DQ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/c.smali
index 3815e54519..6e9206da60 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/a/c;
 .super Ljava/lang/Object;
+.source "ValueCache.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/d.smali
index 307d9504de..e531630efe 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/a/d;
 .super Ljava/lang/Object;
+.source "ValueLoader.java"
 
 
 # annotations
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 2f704ec3fe..e34ce13090 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
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/b/a;
 .super Ljava/lang/Object;
+.source "AbstractSpiCall.java"
 
 
 # static fields
@@ -98,7 +99,7 @@
 
 
 # virtual methods
-.method protected final DS()Lio/fabric/sdk/android/a/e/d;
+.method protected final DR()Lio/fabric/sdk/android/a/e/d;
     .locals 1
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
@@ -135,11 +136,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EK()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EJ()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EI()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EH()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
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 35844961c0..2e89a0d214 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/b;
 .super Ljava/lang/Object;
+.source "AdvertisingInfo.java"
 
 
 # instance fields
@@ -65,8 +66,6 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/b;->bKT:Ljava/lang/String;
-
     iget-object p1, p1, Lio/fabric/sdk/android/a/b/b;->bKT:Ljava/lang/String;
 
     invoke-virtual {v2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -100,8 +99,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/b;->bKT:Ljava/lang/String;
-
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
     move-result v0
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 d3beb3e46f..00bbebccfd 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/c$1;
 .super Lio/fabric/sdk/android/a/b/h;
+.source "AdvertisingInfoProvider.java"
 
 
 # annotations
@@ -39,7 +40,7 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/b/c$1;->bKW:Lio/fabric/sdk/android/a/b/c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->DV()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->DU()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
@@ -51,7 +52,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
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 a3624ab387..bd23206d0b 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/c;
 .super Ljava/lang/Object;
+.source "AdvertisingInfoProvider.java"
 
 
 # instance fields
@@ -31,7 +32,7 @@
     return-void
 .end method
 
-.method private DT()Lio/fabric/sdk/android/a/b/f;
+.method private DS()Lio/fabric/sdk/android/a/b/f;
     .locals 2
 
     new-instance v0, Lio/fabric/sdk/android/a/b/d;
@@ -43,7 +44,7 @@
     return-object v0
 .end method
 
-.method private DU()Lio/fabric/sdk/android/a/b/f;
+.method private DT()Lio/fabric/sdk/android/a/b/f;
     .locals 2
 
     new-instance v0, Lio/fabric/sdk/android/a/b/e;
@@ -80,14 +81,14 @@
 
 
 # virtual methods
-.method final DV()Lio/fabric/sdk/android/a/b/b;
+.method final DU()Lio/fabric/sdk/android/a/b/b;
     .locals 4
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->DT()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->DS()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->DW()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->DV()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
@@ -97,11 +98,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->DU()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->DT()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->DW()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->DV()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
@@ -111,7 +112,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -119,10 +120,12 @@
 
     const-string v3, "AdvertisingInfo not present"
 
+    invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -130,10 +133,12 @@
 
     const-string v3, "Using AdvertisingInfo from Service Provider"
 
+    invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -141,9 +146,9 @@
 
     const-string v3, "Using AdvertisingInfo from Reflection Provider"
 
-    :goto_0
     invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
+    :goto_0
     return-object v0
 .end method
 
@@ -163,9 +168,7 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/b/c;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c;->pq:Lio/fabric/sdk/android/a/f/c;
-
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v1
 
@@ -192,9 +195,7 @@
     :cond_0
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/c;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c;->pq:Lio/fabric/sdk/android/a/f/c;
-
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->edit()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 a72becd7a6..9f414b60c0 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/d;
 .super Ljava/lang/Object;
+.source "AdvertisingInfoReflectionStrategy.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/b/f;
@@ -24,7 +25,7 @@
     return-void
 .end method
 
-.method private DX()Ljava/lang/String;
+.method private DW()Ljava/lang/String;
     .locals 4
 
     :try_start_0
@@ -61,7 +62,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -124,9 +125,11 @@
 
     return v3
 
-    :catch_0
     :cond_0
     return v0
+
+    :catch_0
+    return v0
 .end method
 
 .method private getInfo()Ljava/lang/Object;
@@ -165,14 +168,14 @@
 
     invoke-virtual {v1, v0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v1
+    return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -219,14 +222,14 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v1
+    move-result v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    return v1
+    return v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -241,7 +244,7 @@
 
 
 # virtual methods
-.method public final DW()Lio/fabric/sdk/android/a/b/b;
+.method public final DV()Lio/fabric/sdk/android/a/b/b;
     .locals 3
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/b/d;->context:Landroid/content/Context;
@@ -254,7 +257,7 @@
 
     new-instance v0, Lio/fabric/sdk/android/a/b/b;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/d;->DX()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/d;->DW()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 c792478df2..2b779aa72c 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/e$a;
 .super Ljava/lang/Object;
+.source "AdvertisingInfoServiceStrategy.java"
 
 # interfaces
 .implements Landroid/content/ServiceConnection;
@@ -68,7 +69,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -116,6 +117,8 @@
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
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 b230bea890..2e7958577e 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/e$b;
 .super Ljava/lang/Object;
+.source "AdvertisingInfoServiceStrategy.java"
 
 # interfaces
 .implements Landroid/os/IInterface;
@@ -92,7 +93,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -176,7 +177,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 cacdc86810..8753d5c9ba 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/e;
 .super Ljava/lang/Object;
+.source "AdvertisingInfoServiceStrategy.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/b/f;
@@ -35,7 +36,7 @@
 
 
 # virtual methods
-.method public final DW()Lio/fabric/sdk/android/a/b/b;
+.method public final DV()Lio/fabric/sdk/android/a/b/b;
     .locals 6
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
@@ -50,7 +51,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -148,7 +149,7 @@
     move-exception v1
 
     :try_start_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -175,7 +176,7 @@
     throw v1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -192,7 +193,7 @@
     :catch_1
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -208,7 +209,7 @@
     :catch_2
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -221,7 +222,7 @@
     return-object v2
 
     :catch_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 136a303a29..fe3f191a78 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
@@ -1,7 +1,8 @@
 .class public interface abstract Lio/fabric/sdk/android/a/b/f;
 .super Ljava/lang/Object;
+.source "AdvertisingInfoStrategy.java"
 
 
 # virtual methods
-.method public abstract DW()Lio/fabric/sdk/android/a/b/b;
+.method public abstract DV()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 a46bf82080..2c77b4b12b 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/g;
 .super Ljava/lang/Object;
+.source "ApiKey.java"
 
 
 # direct methods
@@ -52,7 +53,7 @@
 
     if-eqz v2, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -73,7 +74,7 @@
     if-nez v0, :cond_1
 
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -87,12 +88,10 @@
 
     invoke-virtual {p0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object p0
+    move-result-object v0
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
 
-    move-object v0, p0
-
     goto :goto_2
 
     :catch_0
@@ -106,7 +105,7 @@
     move-exception p0
 
     :goto_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -142,7 +141,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -220,7 +219,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -263,7 +262,7 @@
 
     if-eqz v1, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DH()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Z
 
     move-result v1
 
@@ -275,7 +274,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali
index a3c7d71af2..65f171cba1 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/b/h;
 .super Ljava/lang/Object;
+.source "BackgroundPriorityRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$1.smali
index a2e1f0e0b0..dc24c2259b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$1.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/i$1;
 .super Ljava/lang/Object;
+.source "CommonUtils.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
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 bce96b4865..3ddeb66cac 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
@@ -1,5 +1,6 @@
 .class final enum Lio/fabric/sdk/android/a/b/i$a;
 .super Ljava/lang/Enum;
+.source "CommonUtils.java"
 
 
 # annotations
@@ -258,7 +259,7 @@
     return-void
 .end method
 
-.method static Ea()Lio/fabric/sdk/android/a/b/i$a;
+.method static DZ()Lio/fabric/sdk/android/a/b/i$a;
     .locals 3
 
     sget-object v0, Landroid/os/Build;->CPU_ABI:Ljava/lang/String;
@@ -269,7 +270,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
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 5d47466de4..37308c687f 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/i;
 .super Ljava/lang/Object;
+.source "CommonUtils.java"
 
 
 # annotations
@@ -75,10 +76,10 @@
     .end array-data
 .end method
 
-.method public static DY()I
+.method public static DX()I
     .locals 1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->Ea()Lio/fabric/sdk/android/a/b/i$a;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->DZ()Lio/fabric/sdk/android/a/b/i$a;
 
     move-result-object v0
 
@@ -89,7 +90,7 @@
     return v0
 .end method
 
-.method public static declared-synchronized DZ()J
+.method public static declared-synchronized DY()J
     .locals 8
 
     const-class v0, Lio/fabric/sdk/android/a/b/i;
@@ -148,9 +149,9 @@
 
     invoke-static {v3, v4, v5}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/lang/String;Ljava/lang/String;I)J
 
-    move-result-wide v4
+    move-result-wide v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string v4, "MB"
@@ -167,9 +168,9 @@
 
     invoke-static {v3, v4, v5}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/lang/String;Ljava/lang/String;I)J
 
-    move-result-wide v4
+    move-result-wide v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string v4, "GB"
@@ -186,12 +187,12 @@
 
     invoke-static {v3, v4, v5}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/lang/String;Ljava/lang/String;I)J
 
-    move-result-wide v4
+    move-result-wide v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -218,7 +219,7 @@
     move-exception v4
 
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -238,10 +239,7 @@
 
     :cond_3
     :goto_0
-    move-wide v4, v1
-
-    :goto_1
-    sput-wide v4, Lio/fabric/sdk/android/a/b/i;->bLc:J
+    sput-wide v1, Lio/fabric/sdk/android/a/b/i;->bLc:J
 
     :cond_4
     sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bLc:J
@@ -286,14 +284,12 @@
 
     ushr-int/lit8 v5, v2, 0x4
 
-    aget-char v4, v4, v5
+    aget-char v5, v4, v5
 
-    aput-char v4, v0, v3
+    aput-char v5, v0, v3
 
     add-int/lit8 v3, v3, 0x1
 
-    sget-object v4, Lio/fabric/sdk/android/a/b/i;->bLb:[C
-
     and-int/lit8 v2, v2, 0xf
 
     aget-char v2, v4, v2
@@ -486,7 +482,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -513,7 +509,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -992,7 +988,7 @@
 
     :goto_1
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1069,7 +1065,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1234,12 +1230,12 @@
 
     if-eqz v3, :cond_0
 
-    aget-object p1, v2, v4
+    aget-object p0, v2, v4
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    move-object v1, p1
+    move-object v1, p0
 
     :cond_1
     :goto_0
@@ -1268,7 +1264,7 @@
 
     :goto_1
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1348,7 +1344,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -1369,13 +1365,13 @@
     :try_start_0
     invoke-static {p1}, Ljava/security/MessageDigest;->getInstance(Ljava/lang/String;)Ljava/security/MessageDigest;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/security/NoSuchAlgorithmException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v0, p0}, Ljava/security/MessageDigest;->update([B)V
+    invoke-virtual {p1, p0}, Ljava/security/MessageDigest;->update([B)V
 
-    invoke-virtual {v0}, Ljava/security/MessageDigest;->digest()[B
+    invoke-virtual {p1}, Ljava/security/MessageDigest;->digest()[B
 
     move-result-object p0
 
@@ -1388,7 +1384,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1804,7 +1800,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1825,7 +1821,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1846,7 +1842,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$a.smali
index 0b1ce59686..7143fa5937 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$a.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/j$a;
 .super Lio/fabric/sdk/android/a/b/j;
+.source "Crash.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$b.smali
index 88e7d9f78b..ad3e98795c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j$b.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/j$b;
 .super Lio/fabric/sdk/android/a/b/j;
+.source "Crash.java"
 
 
 # annotations
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 90da74f5db..b59977c5bd 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
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/b/j;
 .super Ljava/lang/Object;
+.source "Crash.java"
 
 
 # annotations
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 0c317f86cd..ba9e6f8619 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
@@ -1,7 +1,8 @@
 .class public interface abstract Lio/fabric/sdk/android/a/b/k;
 .super Ljava/lang/Object;
+.source "CurrentTimeProvider.java"
 
 
 # virtual methods
-.method public abstract Eb()J
+.method public abstract Ea()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 c6e8632660..d334391660 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
@@ -1,5 +1,6 @@
 .class public final enum Lio/fabric/sdk/android/a/b/l;
 .super Ljava/lang/Enum;
+.source "DeliveryMechanism.java"
 
 
 # annotations
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 884b737f0b..3bb3ed8b41 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
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/b/m;
 .super Ljava/lang/Object;
+.source "DeviceIdentifierProvider.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1$1.smali
index b6c3976582..982bd1f32b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1$1.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/n$1$1;
 .super Lio/fabric/sdk/android/a/b/h;
+.source "ExecutorUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1.smali
index 287982b4eb..f4beadb7a0 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$1.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/n$1;
 .super Ljava/lang/Object;
+.source "ExecutorUtils.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$2.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$2.smali
index ab41633663..c661050107 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$2.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n$2.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/n$2;
 .super Lio/fabric/sdk/android/a/b/h;
+.source "ExecutorUtils.java"
 
 
 # annotations
@@ -48,7 +49,7 @@
     .locals 7
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -86,7 +87,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -120,7 +121,7 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n.smali
index a6af0ec205..fbd90dcde4 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/n.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/n;
 .super Ljava/lang/Object;
+.source "ExecutorUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali
index 4528dfe1e5..77297b7e98 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/o;
 .super Ljava/lang/Object;
+.source "FirebaseInfo.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p$a.smali
index 6954c9de2c..75939fbefe 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p$a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lio/fabric/sdk/android/a/b/p$a;
 .super Ljava/lang/Enum;
+.source "IdManager.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p.smali
index 9bba11b8ca..258026ee8e 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/p.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/p;
 .super Ljava/lang/Object;
+.source "IdManager.java"
 
 
 # annotations
@@ -141,7 +142,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -178,7 +179,7 @@
 
     if-nez p2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -233,7 +234,7 @@
     throw p1
 .end method
 
-.method public static Ed()Ljava/lang/String;
+.method public static Ec()Ljava/lang/String;
     .locals 5
 
     sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
@@ -313,17 +314,15 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
-    :cond_0
-    :goto_0
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/p;->bLF:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
     return-void
 
-    :cond_1
+    :cond_0
     :try_start_1
     const-string v0, "crashlytics.advertising.id"
 
@@ -337,7 +336,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
 
     invoke-interface {p1}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -349,17 +348,16 @@
 
     move-result-object p1
 
-    :goto_1
     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->commit()Z
 
     goto :goto_0
 
-    :cond_2
+    :cond_1
     invoke-virtual {v0, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
-    if-nez v0, :cond_0
+    if-nez v0, :cond_2
 
     invoke-interface {p1}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -376,10 +374,18 @@
     invoke-interface {p1, v0, p2}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     move-result-object p1
+
+    invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->commit()Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    goto :goto_1
+    :cond_2
+    :goto_0
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/p;->bLF:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    return-void
 
     :catchall_0
     move-exception p1
@@ -480,6 +486,8 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public static dP(Ljava/lang/String;)Ljava/lang/String;
@@ -499,7 +507,7 @@
 .method private e(Landroid/content/SharedPreferences;)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/p;->DW()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/p;->DV()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
@@ -515,7 +523,7 @@
 
 
 # virtual methods
-.method public declared-synchronized DW()Lio/fabric/sdk/android/a/b/b;
+.method public declared-synchronized DV()Lio/fabric/sdk/android/a/b/b;
     .locals 5
 
     monitor-enter p0
@@ -529,7 +537,7 @@
 
     iget-object v1, v0, Lio/fabric/sdk/android/a/b/c;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -543,7 +551,7 @@
 
     iget-object v2, v0, Lio/fabric/sdk/android/a/b/c;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -565,7 +573,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -588,7 +596,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->DV()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->DU()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v3
 
@@ -618,7 +626,7 @@
     throw v0
 .end method
 
-.method public final Ec()Ljava/lang/String;
+.method public final Eb()Ljava/lang/String;
     .locals 3
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/b/p;->bKz:Ljava/lang/String;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q$1.smali
index 8b0edeea4e..39d53aa3f4 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q$1.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/q$1;
 .super Ljava/lang/Object;
+.source "InstallerPackageNameProvider.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/a/d;
@@ -66,6 +67,8 @@
 
     const-string p1, ""
 
+    return-object p1
+
     :cond_0
     return-object p1
 .end method
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 f958d9ed4e..1c8c9f8e04 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/q;
 .super Ljava/lang/Object;
+.source "InstallerPackageNameProvider.java"
 
 
 # instance fields
@@ -81,7 +82,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$1.smali
index 1257ecb543..b0d9e1c1e8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$1.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/r$1;
 .super Ljava/lang/Object;
+.source "QueueFile.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/b/r$c;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$a.smali
index e919ed3736..6ea3092f21 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$a.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/r$a;
 .super Ljava/lang/Object;
+.source "QueueFile.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$b.smali
index c4d22e5398..8747d3a785 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$b.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/b/r$b;
 .super Ljava/io/InputStream;
+.source "QueueFile.java"
 
 
 # annotations
@@ -142,11 +143,9 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/r$b;->bMh:I
-
     if-le p3, v0, :cond_0
 
-    iget p3, p0, Lio/fabric/sdk/android/a/b/r$b;->bMh:I
+    move p3, v0
 
     :cond_0
     iget-object v0, p0, Lio/fabric/sdk/android/a/b/r$b;->bMf:Lio/fabric/sdk/android/a/b/r;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$c.smali
index 66c91d6fd2..bac4e26712 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/b/r$c;
 .super Ljava/lang/Object;
+.source "QueueFile.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r.smali
index 4c250550c4..5086280c28 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/r.smali
@@ -1,5 +1,6 @@
 .class public Lio/fabric/sdk/android/a/b/r;
 .super Ljava/lang/Object;
+.source "QueueFile.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -460,33 +461,31 @@
     return-void
 
     :cond_0
-    iget p3, p0, Lio/fabric/sdk/android/a/b/r;->bMa:I
+    sub-int/2addr v0, p1
 
-    sub-int/2addr p3, p1
-
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
     int-to-long v2, p1
 
-    invoke-virtual {v0, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
+    invoke-virtual {p3, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
-    invoke-virtual {p1, p2, v1, p3}, Ljava/io/RandomAccessFile;->write([BII)V
+    invoke-virtual {p1, p2, v1, v0}, Ljava/io/RandomAccessFile;->write([BII)V
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
-    const-wide/16 v0, 0x10
+    const-wide/16 v1, 0x10
 
-    invoke-virtual {p1, v0, v1}, Ljava/io/RandomAccessFile;->seek(J)V
+    invoke-virtual {p1, v1, v2}, Ljava/io/RandomAccessFile;->seek(J)V
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
-    add-int/lit8 v0, p3, 0x0
+    add-int/lit8 p3, v0, 0x0
 
-    sub-int/2addr p4, p3
+    sub-int/2addr p4, v0
 
-    invoke-virtual {p1, p2, v0, p4}, Ljava/io/RandomAccessFile;->write([BII)V
+    invoke-virtual {p1, p2, p3, p4}, Ljava/io/RandomAccessFile;->write([BII)V
 
     return-void
 .end method
@@ -541,39 +540,38 @@
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
-    :goto_0
     invoke-virtual {p1, p2, p3, p4}, Ljava/io/RandomAccessFile;->readFully([BII)V
 
     return-void
 
     :cond_0
-    iget v0, p0, Lio/fabric/sdk/android/a/b/r;->bMa:I
+    sub-int/2addr v1, p1
 
-    sub-int/2addr v0, p1
-
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
     int-to-long v2, p1
 
-    invoke-virtual {v1, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
+    invoke-virtual {v0, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
-    invoke-virtual {p1, p2, p3, v0}, Ljava/io/RandomAccessFile;->readFully([BII)V
+    invoke-virtual {p1, p2, p3, v1}, Ljava/io/RandomAccessFile;->readFully([BII)V
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
-    const-wide/16 v1, 0x10
+    const-wide/16 v2, 0x10
 
-    invoke-virtual {p1, v1, v2}, Ljava/io/RandomAccessFile;->seek(J)V
+    invoke-virtual {p1, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/r;->bLZ:Ljava/io/RandomAccessFile;
 
-    add-int/2addr p3, v0
+    add-int/2addr p3, v1
 
-    sub-int/2addr p4, v0
+    sub-int/2addr p4, v1
 
-    goto :goto_0
+    invoke-virtual {p1, p2, p3, p4}, Ljava/io/RandomAccessFile;->readFully([BII)V
+
+    return-void
 .end method
 
 .method private eQ(I)Lio/fabric/sdk/android/a/b/r$a;
@@ -622,8 +620,6 @@
     :cond_0
     add-int/lit8 p1, p1, 0x10
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/r;->bMa:I
-
     sub-int/2addr p1, v0
 
     return p1
@@ -641,7 +637,7 @@
 
     iget v0, p0, Lio/fabric/sdk/android/a/b/r;->bMa:I
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/r;->Ee()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/r;->Ed()I
 
     move-result v1
 
@@ -917,7 +913,7 @@
 
 
 # virtual methods
-.method public final Ee()I
+.method public final Ed()I
     .locals 3
 
     iget v0, p0, Lio/fabric/sdk/android/a/b/r;->elementCount:I
@@ -1054,6 +1050,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public declared-synchronized close()V
@@ -1115,6 +1113,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized remove()V
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 2ccc0edbc7..3e20c89a82 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/s;
 .super Ljava/lang/Object;
+.source "ResponseParser.java"
 
 
 # direct methods
@@ -47,6 +48,8 @@
 
     if-lt p0, v0, :cond_3
 
+    return v2
+
     :cond_3
     return v2
 .end method
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 279c85002b..d346632477 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/t;
 .super Ljava/lang/Object;
+.source "SystemCurrentTimeProvider.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/b/k;
@@ -16,7 +17,7 @@
 
 
 # virtual methods
-.method public final Eb()J
+.method public final Ea()J
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
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 881df3082c..0460276ded 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/b/u;
 .super Ljava/lang/Object;
+.source "TimingMetric.java"
 
 
 # instance fields
@@ -39,7 +40,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized Ef()V
+.method public final declared-synchronized Ee()V
     .locals 2
 
     monitor-enter p0
@@ -81,7 +82,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized Eg()V
+.method public final declared-synchronized Ef()V
     .locals 5
 
     monitor-enter p0
@@ -121,8 +122,6 @@
 
     iget-wide v2, p0, Lio/fabric/sdk/android/a/b/u;->start:J
 
-    const/4 v4, 0x0
-
     sub-long/2addr v0, v2
 
     iput-wide v0, p0, Lio/fabric/sdk/android/a/b/u;->duration:J
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 97a827bc42..ac284c5500 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/a$1;
 .super Ljava/lang/Object;
+.source "AsyncTask.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
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 e16bbf3cad..ffa3b128d9 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/a$2;
 .super Lio/fabric/sdk/android/a/c/a$e;
+.source "AsyncTask.java"
 
 
 # annotations
@@ -69,9 +70,7 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bMs:Lio/fabric/sdk/android/a/c/a;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$2;->bMs:Lio/fabric/sdk/android/a/c/a;
-
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/c/a;->DN()Ljava/lang/Object;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a;->DM()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 1ed33ae2d1..f9b1da1598 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/a$3;
 .super Ljava/util/concurrent/FutureTask;
+.source "AsyncTask.java"
 
 
 # annotations
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 675684487e..48707e0ad6 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
@@ -1,5 +1,6 @@
 .class final synthetic Lio/fabric/sdk/android/a/c/a$4;
 .super Ljava/lang/Object;
+.source "AsyncTask.java"
 
 
 # annotations
@@ -21,7 +22,7 @@
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->Ej()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->Ei()[I
 
     move-result-object 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 724cdae08f..223952c27a 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/a$a;
 .super Ljava/lang/Object;
+.source "AsyncTask.java"
 
 
 # annotations
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 09485f4935..df9b9865eb 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/a$b;
 .super Landroid/os/Handler;
+.source "AsyncTask.java"
 
 
 # annotations
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 05191ce802..c76bf227dc 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/a$c$1;
 .super Ljava/lang/Object;
+.source "AsyncTask.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -49,7 +50,7 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bMz:Lio/fabric/sdk/android/a/c/a$c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a$c;->Ei()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a$c;->Eh()V
 
     return-void
 
@@ -58,7 +59,7 @@
 
     iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bMz:Lio/fabric/sdk/android/a/c/a$c;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/c/a$c;->Ei()V
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/c/a$c;->Eh()V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c.smali
index e34bd76c45..e33d6fafa5 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/a$c;
 .super Ljava/lang/Object;
+.source "AsyncTask.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
@@ -55,7 +56,7 @@
 
 
 # virtual methods
-.method protected final declared-synchronized Ei()V
+.method protected final declared-synchronized Eh()V
     .locals 2
 
     monitor-enter p0
@@ -112,7 +113,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a$c;->Ei()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a$c;->Eh()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$d.smali
index 17e39997e5..faa9c171ee 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/a$d;
 .super Ljava/lang/Enum;
+.source "AsyncTask.java"
 
 
 # annotations
@@ -62,7 +63,7 @@
     return-void
 .end method
 
-.method public static Ej()[I
+.method public static Ei()[I
     .locals 1
 
     sget-object v0, Lio/fabric/sdk/android/a/c/a$d;->bMD:[I
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 70349f423d..7a5743fe08 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
@@ -1,5 +1,6 @@
 .class abstract Lio/fabric/sdk/android/a/c/a$e;
 .super Ljava/lang/Object;
+.source "AsyncTask.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
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 bd35e529cc..5c4bf5919a 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
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/c/a;
 .super Ljava/lang/Object;
+.source "AsyncTask.java"
 
 
 # annotations
@@ -246,12 +247,12 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->DM()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->DL()V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->DL()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->DK()V
 
     :goto_0
     sget p1, Lio/fabric/sdk/android/a/c/a$d;->bMC:I
@@ -294,6 +295,17 @@
 
 
 # virtual methods
+.method protected DK()V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    return-void
+.end method
+
 .method protected DL()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
@@ -305,18 +317,7 @@
     return-void
 .end method
 
-.method protected DM()V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    return-void
-.end method
-
-.method protected varargs abstract DN()Ljava/lang/Object;
+.method protected varargs abstract DM()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TResult;"
@@ -324,7 +325,7 @@
     .end annotation
 .end method
 
-.method public final Eh()Z
+.method public final Eg()Z
     .locals 2
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bMp:Ljava/util/concurrent/atomic/AtomicBoolean;
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 abe5aee2e1..9ed55e0f7b 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
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/c/a/a;
 .super Ljava/lang/Object;
+.source "Backoff.java"
 
 
 # virtual methods
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 d830481899..dcdedd785a 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/a/b;
 .super Ljava/lang/Object;
+.source "DefaultRetryPolicy.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/c/a/d;
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 ace46e963e..8866e9e030 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/a/c;
 .super Ljava/lang/Object;
+.source "ExponentialBackoff.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/c/a/a;
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 bcc0457f1a..c751a58966 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
@@ -1,2 +1,3 @@
 .class public interface abstract Lio/fabric/sdk/android/a/c/a/d;
 .super Ljava/lang/Object;
+.source "RetryPolicy.java"
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 f5fe7328df..e97d6460ee 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/a/e;
 .super Ljava/lang/Object;
+.source "RetryState.java"
 
 
 # instance fields
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 2495ee04a6..9d9427266d 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
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/c/b;
 .super Ljava/lang/Object;
+.source "Dependency.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Ek()Ljava/util/Collection;
+.method public abstract Ej()Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -24,7 +25,7 @@
     .end annotation
 .end method
 
-.method public abstract El()Z
+.method public abstract Ek()Z
 .end method
 
 .method public abstract br(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 4e7d5e58ff..6eaa40fed2 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/c;
 .super Ljava/util/concurrent/PriorityBlockingQueue;
+.source "DependencyPriorityBlockingQueue.java"
 
 
 # annotations
@@ -52,7 +53,7 @@
     return-void
 .end method
 
-.method private Em()Lio/fabric/sdk/android/a/c/b;
+.method private El()Lio/fabric/sdk/android/a/c/b;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -77,7 +78,7 @@
     return-object v1
 .end method
 
-.method private En()Lio/fabric/sdk/android/a/c/b;
+.method private Em()Lio/fabric/sdk/android/a/c/b;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -134,6 +135,8 @@
 
     move-result-object p1
 
+    check-cast p1, Lio/fabric/sdk/android/a/c/b;
+
     goto :goto_0
 
     :pswitch_1
@@ -141,6 +144,8 @@
 
     move-result-object p1
 
+    check-cast p1, Lio/fabric/sdk/android/a/c/b;
+
     goto :goto_0
 
     :pswitch_2
@@ -148,6 +153,8 @@
 
     move-result-object p1
 
+    check-cast p1, Lio/fabric/sdk/android/a/c/b;
+
     goto :goto_0
 
     :pswitch_3
@@ -155,9 +162,9 @@
 
     move-result-object p1
 
-    :goto_0
     check-cast p1, Lio/fabric/sdk/android/a/c/b;
 
+    :goto_0
     return-object p1
 
     nop
@@ -239,7 +246,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->El()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ek()Z
 
     move-result v1
 
@@ -294,7 +301,7 @@
 
 
 # virtual methods
-.method public final Eo()V
+.method public final En()V
     .locals 3
 
     :try_start_0
@@ -322,7 +329,7 @@
 
     check-cast v1, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/c/b;->El()Z
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/c/b;->Ek()Z
 
     move-result v2
 
@@ -351,6 +358,8 @@
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final clear()V
@@ -500,6 +509,8 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final drainTo(Ljava/util/Collection;I)I
@@ -561,12 +572,14 @@
     invoke-virtual {p2}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final synthetic peek()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Em()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->El()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -576,7 +589,7 @@
 .method public final synthetic poll()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->En()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Em()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 a360781271..b6e58a4e94 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/e;
 .super Ljava/lang/Enum;
+.source "Priority.java"
 
 
 # annotations
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 09b50ee3ee..234cacbaf5 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/f$a$1;
 .super Lio/fabric/sdk/android/a/c/h;
+.source "PriorityAsyncTask.java"
 
 
 # annotations
@@ -39,7 +40,7 @@
 
 
 # virtual methods
-.method public final Ep()Lio/fabric/sdk/android/a/c/b;
+.method public final Eo()Lio/fabric/sdk/android/a/c/b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 4f1e6f9fb3..34b1d0aee8 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/c/f$a;
 .super Ljava/lang/Object;
+.source "PriorityAsyncTask.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
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 f72756a758..d4061c51ef 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
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/c/f;
 .super Lio/fabric/sdk/android/a/c/a;
+.source "PriorityAsyncTask.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/c/b;
@@ -55,7 +56,7 @@
 
 
 # virtual methods
-.method public final Ek()Ljava/util/Collection;
+.method public final Ej()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -72,14 +73,14 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ek()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ej()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final El()Z
+.method public final Ek()Z
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bMK:Lio/fabric/sdk/android/a/c/j;
@@ -88,7 +89,7 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->El()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ek()Z
 
     move-result v0
 
@@ -143,7 +144,7 @@
     return-void
 .end method
 
-.method public final af(Z)V
+.method public final ae(Z)V
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bMK:Lio/fabric/sdk/android/a/c/j;
@@ -152,7 +153,7 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/l;
 
-    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->af(Z)V
+    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->ae(Z)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/g.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/g.smali
index 368d1185f5..25b42932fd 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/g.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/g.smali
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/c/g;
 .super Lio/fabric/sdk/android/a/c/j;
+.source "PriorityCallable.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
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 f449644e69..3f23812144 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
@@ -1,5 +1,6 @@
 .class public Lio/fabric/sdk/android/a/c/h;
 .super Ljava/util/concurrent/FutureTask;
+.source "PriorityFutureTask.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/c/b;
@@ -108,7 +109,7 @@
 
 
 # virtual methods
-.method public final Ek()Ljava/util/Collection;
+.method public final Ej()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -119,7 +120,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -127,17 +128,17 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ek()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ej()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final El()Z
+.method public final Ek()Z
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -145,14 +146,14 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->El()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ek()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public Ep()Lio/fabric/sdk/android/a/c/b;
+.method public Eo()Lio/fabric/sdk/android/a/c/b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -174,10 +175,10 @@
     return-object v0
 .end method
 
-.method public final af(Z)V
+.method public final ae(Z)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -185,7 +186,7 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/l;
 
-    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->af(Z)V
+    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->ae(Z)V
 
     return-void
 .end method
@@ -195,7 +196,7 @@
 
     check-cast p1, Lio/fabric/sdk/android/a/c/l;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -211,7 +212,7 @@
 .method public final cE()I
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -227,7 +228,7 @@
 .method public compareTo(Ljava/lang/Object;)I
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -243,7 +244,7 @@
 .method public final isFinished()Z
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -261,7 +262,7 @@
 .method public final m(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Ep()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Eo()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/i.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/i.smali
index 1421e0e894..2babc5de00 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/i.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/c/i;
 .super Ljava/lang/Object;
+.source "PriorityProvider.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
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 e9c90f8aca..a510e50bc2 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
@@ -1,5 +1,6 @@
 .class public Lio/fabric/sdk/android/a/c/j;
 .super Ljava/lang/Object;
+.source "PriorityTask.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/c/b;
@@ -103,14 +104,16 @@
 
     return p0
 
-    :catch_0
     :cond_0
     return v0
+
+    :catch_0
+    return v0
 .end method
 
 
 # virtual methods
-.method public final declared-synchronized Ek()Ljava/util/Collection;
+.method public final declared-synchronized Ej()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -144,10 +147,10 @@
     throw v0
 .end method
 
-.method public final El()Z
+.method public final Ek()Z
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Ek()Ljava/util/Collection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Ej()Ljava/util/Collection;
 
     move-result-object v0
 
@@ -208,7 +211,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized af(Z)V
+.method public final declared-synchronized ae(Z)V
     .locals 1
 
     monitor-enter p0
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 cfb0638e6a..f48f6210ae 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/k$a;
 .super Ljava/lang/Object;
+.source "PriorityThreadPoolExecutor.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
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 7dc75c69d4..15d02e984d 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/k;
 .super Ljava/util/concurrent/ThreadPoolExecutor;
+.source "PriorityThreadPoolExecutor.java"
 
 
 # annotations
@@ -89,7 +90,7 @@
     return-void
 .end method
 
-.method public static Eq()Lio/fabric/sdk/android/a/c/k;
+.method public static Ep()Lio/fabric/sdk/android/a/c/k;
     .locals 7
 
     sget v1, Lio/fabric/sdk/android/a/c/k;->CORE_POOL_SIZE:I
@@ -126,7 +127,7 @@
 
     const/4 v1, 0x1
 
-    invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/c/l;->af(Z)V
+    invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/c/l;->ae(Z)V
 
     invoke-interface {v0, p2}, Lio/fabric/sdk/android/a/c/l;->m(Ljava/lang/Throwable;)V
 
@@ -136,7 +137,7 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/c;->Eo()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/c;->En()V
 
     invoke-super {p0, p1, p2}, Ljava/util/concurrent/ThreadPoolExecutor;->afterExecute(Ljava/lang/Runnable;Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali
index b0f14c6fd9..0978707d7a 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lio/fabric/sdk/android/a/c/l;
 .super Ljava/lang/Object;
+.source "Task.java"
 
 
 # virtual methods
-.method public abstract af(Z)V
+.method public abstract ae(Z)V
 .end method
 
 .method public abstract isFinished()Z
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/m.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/m.smali
index 4da8e41169..36b665c001 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/m.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/m.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/c/m;
 .super Ljava/lang/RuntimeException;
+.source "UnmetDependencyException.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/a.smali
index 8e5420ad58..a96c5c23ab 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/d/a;
 .super Ljava/lang/Object;
+.source "EventTransform.java"
 
 
 # annotations
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 ee2d9c002e..f1f77446db 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/d/b$1;
 .super Ljava/lang/Object;
+.source "EventsFilesManager.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lio/fabric/sdk/android/a/d/b;->Eu()V
+    value = Lio/fabric/sdk/android/a/d/b;->Et()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 f731e53b89..e4ac53d1b1 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/d/b$a;
 .super Ljava/lang/Object;
+.source "EventsFilesManager.java"
 
 
 # annotations
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 e6f6122390..c4d9d7ff7c 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
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/d/b;
 .super Ljava/lang/Object;
+.source "EventsFilesManager.java"
 
 
 # annotations
@@ -93,7 +94,7 @@
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/d/b;->pr:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->Eb()J
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->Ea()J
 
     move-result-wide p1
 
@@ -106,7 +107,7 @@
     return-void
 .end method
 
-.method private Er()V
+.method private Eq()V
     .locals 3
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bNa:Ljava/util/List;
@@ -149,7 +150,7 @@
 .end method
 
 .method private static dQ(Ljava/lang/String;)J
-    .locals 5
+    .locals 4
 
     const-string v0, "_"
 
@@ -179,11 +180,11 @@
 
     invoke-virtual {p0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v0
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v3
+    return-wide v0
 
     :catch_0
     return-wide v1
@@ -191,7 +192,7 @@
 
 
 # virtual methods
-.method public final Es()Ljava/util/List;
+.method public final Er()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -204,21 +205,19 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bMX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ex()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ew()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Et()V
+.method public final Es()V
     .locals 2
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bMX:Lio/fabric/sdk/android/a/d/c;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bMX:Lio/fabric/sdk/android/a/d/c;
-
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/d/c;->Ey()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ex()Ljava/util/List;
 
     move-result-object v1
 
@@ -226,17 +225,17 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bMX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ez()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ey()V
 
     return-void
 .end method
 
-.method public final Eu()V
+.method public final Et()V
     .locals 9
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bMX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ey()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ex()Ljava/util/List;
 
     move-result-object v0
 
@@ -425,7 +424,7 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bMX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ew()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ev()Z
 
     move-result v0
 
@@ -461,7 +460,7 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->pr:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Eb()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Ea()J
 
     move-result-wide v2
 
@@ -473,7 +472,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Er()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Eq()V
 
     return v1
 .end method
@@ -543,7 +542,7 @@
 
     iget-object v5, p0, Lio/fabric/sdk/android/a/d/b;->bMX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v5}, Lio/fabric/sdk/android/a/d/c;->Ev()I
+    invoke-interface {v5}, Lio/fabric/sdk/android/a/d/c;->Eu()I
 
     move-result v5
 
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 91ebaa89ac..bb37de3d92 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
@@ -1,12 +1,24 @@
 .class public interface abstract Lio/fabric/sdk/android/a/d/c;
 .super Ljava/lang/Object;
+.source "EventsStorage.java"
 
 
 # virtual methods
-.method public abstract Ev()I
+.method public abstract Eu()I
 .end method
 
-.method public abstract Ew()Z
+.method public abstract Ev()Z
+.end method
+
+.method public abstract Ew()Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/io/File;",
+            ">;"
+        }
+    .end annotation
 .end method
 
 .method public abstract Ex()Ljava/util/List;
@@ -20,18 +32,7 @@
     .end annotation
 .end method
 
-.method public abstract Ey()Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/io/File;",
-            ">;"
-        }
-    .end annotation
-.end method
-
-.method public abstract Ez()V
+.method public abstract Ey()V
 .end method
 
 .method public abstract J([B)V
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/d.smali
index 8de0e862ca..7c20646534 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/d/d;
 .super Ljava/lang/Object;
+.source "EventsStorageListener.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/e.smali
index 1dc3da9146..43a22e8d37 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/d/e;
 .super Ljava/lang/Object;
+.source "FileRollOverManager.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/f.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/f.smali
index e3020d38ac..6fff6bffce 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/f.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/d/f;
 .super Ljava/lang/Object;
+.source "FilesSender.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali
index 75e0170153..1fdab7af53 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/d/g;
 .super Lio/fabric/sdk/android/a/d/h;
+.source "GZIPQueueFileEventStorage.java"
 
 
 # direct methods
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 9fd90e133e..a38086c22b 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
@@ -1,5 +1,6 @@
 .class public Lio/fabric/sdk/android/a/d/h;
 .super Ljava/lang/Object;
+.source "QueueFileEventStorage.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/d/c;
@@ -80,19 +81,19 @@
 
 
 # virtual methods
-.method public final Ev()I
+.method public final Eu()I
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bNe:Lio/fabric/sdk/android/a/b/r;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/r;->Ee()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/r;->Ed()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Ew()Z
+.method public final Ev()Z
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bNe:Lio/fabric/sdk/android/a/b/r;
@@ -104,7 +105,7 @@
     return v0
 .end method
 
-.method public final Ex()Ljava/util/List;
+.method public final Ew()Ljava/util/List;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -150,7 +151,7 @@
     return-object v0
 .end method
 
-.method public final Ey()Ljava/util/List;
+.method public final Ex()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -174,7 +175,7 @@
     return-object v0
 .end method
 
-.method public final Ez()V
+.method public final Ey()V
     .locals 1
 
     :try_start_0
@@ -214,7 +215,7 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bNe:Lio/fabric/sdk/android/a/b/r;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/r;->Ee()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/r;->Ed()I
 
     move-result v0
 
@@ -293,7 +294,7 @@
 .end method
 
 .method public final dR(Ljava/lang/String;)V
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -319,31 +320,28 @@
 
     invoke-direct {v2, v0}, Ljava/io/FileInputStream;-><init>(Ljava/io/File;)V
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
     invoke-virtual {p0, v1}, Lio/fabric/sdk/android/a/d/h;->z(Ljava/io/File;)Ljava/io/OutputStream;
 
-    move-result-object v1
+    move-result-object p1
+
+    const/16 v1, 0x400
+
+    new-array v1, v1, [B
+
+    invoke-static {v2, p1, v1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/InputStream;Ljava/io/OutputStream;[B)V
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    const/16 p1, 0x400
+    const-string v1, "Failed to close file input stream"
 
-    :try_start_2
-    new-array p1, p1, [B
+    invoke-static {v2, v1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
 
-    invoke-static {v2, v1, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/InputStream;Ljava/io/OutputStream;[B)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+    const-string v1, "Failed to close output stream"
 
-    const-string p1, "Failed to close file input stream"
-
-    invoke-static {v2, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
-
-    const-string p1, "Failed to close output stream"
-
-    invoke-static {v1, p1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
@@ -358,22 +356,11 @@
     return-void
 
     :catchall_0
-    move-exception p1
-
-    move-object v4, v1
-
-    move-object v1, p1
-
-    move-object p1, v4
-
-    goto :goto_0
-
-    :catchall_1
     move-exception v1
 
     goto :goto_0
 
-    :catchall_2
+    :catchall_1
     move-exception v1
 
     move-object v2, 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 731d4b4b13..881fa2cc24 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/d/i;
 .super Ljava/lang/Object;
+.source "TimeBasedFileRollOverRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/a.smali
index ec0b9576ae..1b9d4514e7 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/a.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/e/a;
 .super Ljava/lang/Object;
+.source "CertificateChainCleaner.java"
 
 
 # direct methods
@@ -151,4 +152,6 @@
     invoke-direct {p0, p1}, Ljava/security/cert/CertificateException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
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 e6193c8153..d67bf251cd 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
@@ -1,5 +1,6 @@
 .class final synthetic Lio/fabric/sdk/android/a/e/b$1;
 .super Ljava/lang/Object;
+.source "DefaultHttpRequestFactory.java"
 
 
 # annotations
@@ -21,7 +22,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->EC()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->EB()[I
 
     move-result-object 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 0d39bdaebd..36f7c45e34 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/e/b;
 .super Ljava/lang/Object;
+.source "DefaultHttpRequestFactory.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/e/e;
@@ -40,35 +41,7 @@
     return-void
 .end method
 
-.method private declared-synchronized EA()V
-    .locals 1
-
-    monitor-enter p0
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bNi: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 EB()Ljavax/net/ssl/SSLSocketFactory;
+.method private declared-synchronized EA()Ljavax/net/ssl/SSLSocketFactory;
     .locals 7
 
     monitor-enter p0
@@ -160,6 +133,34 @@
     throw v0
 .end method
 
+.method private declared-synchronized Ez()V
+    .locals 1
+
+    monitor-enter p0
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bNi: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 getSSLSocketFactory()Ljavax/net/ssl/SSLSocketFactory;
     .locals 1
 
@@ -174,7 +175,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->EB()Ljavax/net/ssl/SSLSocketFactory;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->EA()Ljavax/net/ssl/SSLSocketFactory;
 
     move-result-object v0
 
@@ -292,7 +293,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object p3
 
@@ -321,7 +322,7 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bNh:Lio/fabric/sdk/android/a/e/f;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->EA()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Ez()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 dc784a6aec..222ba62921 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/e/c;
 .super Ljava/lang/Enum;
+.source "HttpMethod.java"
 
 
 # annotations
@@ -61,7 +62,7 @@
     return-void
 .end method
 
-.method public static EC()[I
+.method public static EB()[I
     .locals 1
 
     sget-object v0, Lio/fabric/sdk/android/a/e/c;->bNo:[I
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 ae379dd315..659a7c4499 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/e/d$1;
 .super Lio/fabric/sdk/android/a/e/d$a;
+.source "HttpRequest.java"
 
 
 # annotations
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 94a056727d..314aa35d25 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
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/e/d$a;
 .super Lio/fabric/sdk/android/a/e/d$d;
+.source "HttpRequest.java"
 
 
 # annotations
@@ -45,7 +46,7 @@
 
 # virtual methods
 .method protected final done()V
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -54,11 +55,9 @@
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bNC:Ljava/io/Closeable;
 
-    instance-of v0, v0, Ljava/io/Flushable;
+    instance-of v1, v0, Ljava/io/Flushable;
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bNC:Ljava/io/Closeable;
+    if-eqz v1, :cond_0
 
     check-cast v0, Ljava/io/Flushable;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b$1.smali
index f9700d55df..3046a61859 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b$1.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/e/d$b$1;
 .super Ljava/lang/Object;
+.source "HttpRequest.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/e/d$b;
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 37f3936c73..a1fd42705d 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
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/e/d$b;
 .super Ljava/lang/Object;
+.source "HttpRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$c.smali
index 09459e46e0..bfec08b6f0 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$c.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/e/d$c;
 .super Ljava/lang/RuntimeException;
+.source "HttpRequest.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$d.smali
index 72a096d152..cd8dd9811b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$d.smali
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/a/e/d$d;
 .super Ljava/lang/Object;
+.source "HttpRequest.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -57,7 +58,7 @@
     :try_start_0
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d$d;->run()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catch Lio/fabric/sdk/android/a/e/d$c; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
@@ -68,7 +69,7 @@
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
-    return-object v1
+    return-object v0
 
     :catch_0
     move-exception v0
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 b2f7965d47..9b62e99cfd 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/e/d$e;
 .super Ljava/io/BufferedOutputStream;
+.source "HttpRequest.java"
 
 
 # annotations
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 d5083ba6c0..de2899ac7f 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/e/d;
 .super Ljava/lang/Object;
+.source "HttpRequest.java"
 
 
 # annotations
@@ -112,7 +113,7 @@
     throw p2
 .end method
 
-.method private ED()Ljava/net/HttpURLConnection;
+.method private EC()Ljava/net/HttpURLConnection;
     .locals 7
 
     :try_start_0
@@ -172,7 +173,7 @@
     throw v1
 .end method
 
-.method private EH()Ljava/io/InputStream;
+.method private EG()Ljava/io/InputStream;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -180,7 +181,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EF()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result v0
 
@@ -189,7 +190,7 @@
     if-ge v0, v1, :cond_0
 
     :try_start_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -211,7 +212,7 @@
     throw v1
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -222,7 +223,7 @@
     if-nez v0, :cond_1
 
     :try_start_1
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -289,7 +290,7 @@
     return-object v0
 .end method
 
-.method private EJ()Ljava/lang/String;
+.method private EI()Ljava/lang/String;
     .locals 2
 
     const-string v0, "Content-Type"
@@ -303,7 +304,7 @@
     return-object v0
 .end method
 
-.method private EL()Lio/fabric/sdk/android/a/e/d;
+.method private EK()Lio/fabric/sdk/android/a/e/d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -318,11 +319,9 @@
     return-object p0
 
     :cond_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bNu:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bNu:Z
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bNt:Lio/fabric/sdk/android/a/e/d$e;
+    if-eqz v1, :cond_1
 
     const-string v1, "\r\n--00content0boundary00--\r\n"
 
@@ -356,7 +355,7 @@
     return-object p0
 .end method
 
-.method private EM()Lio/fabric/sdk/android/a/e/d;
+.method private EL()Lio/fabric/sdk/android/a/e/d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -365,7 +364,7 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EK()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
     :try_end_0
@@ -383,7 +382,7 @@
     throw v1
 .end method
 
-.method private EN()Lio/fabric/sdk/android/a/e/d;
+.method private EM()Lio/fabric/sdk/android/a/e/d;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -398,7 +397,7 @@
     return-object p0
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -406,7 +405,7 @@
 
     invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->setDoOutput(Z)V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -424,7 +423,7 @@
 
     new-instance v1, Lio/fabric/sdk/android/a/e/d$e;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v2
 
@@ -441,7 +440,7 @@
     return-object p0
 .end method
 
-.method private EO()Lio/fabric/sdk/android/a/e/d;
+.method private EN()Lio/fabric/sdk/android/a/e/d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -465,25 +464,24 @@
 
     move-result-object v0
 
-    invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d;->EN()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d;->EM()Lio/fabric/sdk/android/a/e/d;
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bNt:Lio/fabric/sdk/android/a/e/d$e;
 
     const-string v1, "--00content0boundary00\r\n"
 
-    :goto_0
     invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dW(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bNt:Lio/fabric/sdk/android/a/e/d$e;
 
     const-string v1, "\r\n--00content0boundary00\r\n"
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dW(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
 
-    :goto_1
+    :goto_0
     return-object p0
 .end method
 
@@ -614,10 +612,10 @@
 
     if-eqz p1, :cond_4
 
-    :goto_1
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     :cond_4
+    :goto_1
     invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p1
@@ -650,6 +648,8 @@
 
     if-eqz p1, :cond_4
 
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
     goto :goto_1
 
     :cond_5
@@ -657,6 +657,8 @@
 
     move-result-object p0
 
+    return-object p0
+
     :cond_6
     :goto_2
     return-object p0
@@ -681,7 +683,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_5
+    if-eqz p0, :cond_7
 
     invoke-virtual {p0}, Ljava/lang/String;->length()I
 
@@ -689,7 +691,7 @@
 
     if-nez v1, :cond_0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_0
     invoke-virtual {p0}, Ljava/lang/String;->length()I
@@ -706,7 +708,7 @@
 
     add-int/2addr v3, v4
 
-    if-eqz v3, :cond_5
+    if-eqz v3, :cond_6
 
     if-ne v3, v1, :cond_1
 
@@ -721,10 +723,10 @@
 
     if-ne v5, v6, :cond_2
 
-    :goto_0
     move v5, v1
 
     :cond_2
+    :goto_0
     if-ge v3, v5, :cond_5
 
     const/16 v7, 0x3d
@@ -807,11 +809,20 @@
 
     if-ne v5, v6, :cond_2
 
+    move v5, v1
+
     goto :goto_0
 
     :cond_5
+    return-object v0
+
+    :cond_6
     :goto_1
     return-object v0
+
+    :cond_7
+    :goto_2
+    return-object v0
 .end method
 
 .method private ac(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
@@ -954,9 +965,14 @@
 
     move-result-object p0
 
+    move-object v3, p0
+
+    goto :goto_0
+
     :cond_0
     move-object v3, p0
 
+    :goto_0
     :try_start_1
     new-instance p0, Ljava/net/URI;
 
@@ -1139,9 +1155,9 @@
 
     const-string v0, "Content-Length"
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EM()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EL()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
@@ -1168,7 +1184,7 @@
     :try_start_0
     new-instance v0, Ljava/io/BufferedInputStream;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EH()Ljava/io/InputStream;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EG()Ljava/io/InputStream;
 
     move-result-object v2
 
@@ -1236,7 +1252,7 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EN()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EM()Lio/fabric/sdk/android/a/e/d;
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bNt:Lio/fabric/sdk/android/a/e/d$e;
 
@@ -1317,14 +1333,14 @@
 
 
 # virtual methods
-.method public final EE()Ljava/net/HttpURLConnection;
+.method public final ED()Ljava/net/HttpURLConnection;
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bNr:Ljava/net/HttpURLConnection;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EC()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1336,7 +1352,7 @@
     return-object v0
 .end method
 
-.method public final EF()I
+.method public final EE()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1345,9 +1361,9 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EK()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1369,7 +1385,7 @@
     throw v1
 .end method
 
-.method public final EG()Ljava/lang/String;
+.method public final EF()Ljava/lang/String;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1377,7 +1393,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EJ()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EI()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1388,10 +1404,10 @@
     return-object v0
 .end method
 
-.method public final EI()Lio/fabric/sdk/android/a/e/d;
+.method public final EH()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1402,10 +1418,10 @@
     return-object p0
 .end method
 
-.method public final EK()Lio/fabric/sdk/android/a/e/d;
+.method public final EJ()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1419,7 +1435,7 @@
 .method public final Z(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;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1520,7 +1536,7 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EO()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EN()Lio/fabric/sdk/android/a/e/d;
 
     invoke-direct {p0, p1, p2, p3}, Lio/fabric/sdk/android/a/e/d;->n(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
@@ -1579,9 +1595,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EM()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EL()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1601,7 +1617,7 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EO()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->EN()Lio/fabric/sdk/android/a/e/d;
 
     const/4 v0, 0x0
 
@@ -1632,7 +1648,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
@@ -1646,7 +1662,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/e.smali
index 5f04ba6a77..b14f66aff8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/e/e;
 .super Ljava/lang/Object;
+.source "HttpRequestFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/f.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/f.smali
index dd1f683de4..37b9eca1b5 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/f.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/e/f;
 .super Ljava/lang/Object;
+.source "PinningInfoProvider.java"
 
 
 # virtual methods
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 7ea8afae6f..77b2b39bf7 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/e/g;
 .super Ljava/lang/Object;
+.source "PinningTrustManager.java"
 
 # interfaces
 .implements Ljavax/net/ssl/X509TrustManager;
@@ -182,6 +183,8 @@
     invoke-direct {v0, p1}, Ljava/security/cert/CertificateException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static a(Lio/fabric/sdk/android/a/e/h;)[Ljavax/net/ssl/TrustManager;
@@ -364,7 +367,7 @@
 
     if-lez p2, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -442,6 +445,8 @@
     invoke-direct {p1, p2}, Ljava/security/cert/CertificateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final getAcceptedIssuers()[Ljava/security/cert/X509Certificate;
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 9ee2f3c978..a88fc45ba5 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/e/h;
 .super Ljava/lang/Object;
+.source "SystemKeyStore.java"
 
 
 # instance fields
@@ -104,6 +105,8 @@
     invoke-direct {v0, p0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static c(Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/KeyStore;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/a.smali
index 622b0f805c..bac96dda39 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/f/a;
 .super Ljava/lang/Object;
+.source "FileStore.java"
 
 
 # virtual methods
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 a13b5ee221..5edc8c8b0e 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/f/b;
 .super Ljava/lang/Object;
+.source "FileStoreImpl.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/f/a;
@@ -93,7 +94,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -110,7 +111,7 @@
     return-object v0
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 294ff471a3..13d72857b4 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
@@ -1,9 +1,10 @@
 .class public interface abstract Lio/fabric/sdk/android/a/f/c;
 .super Ljava/lang/Object;
+.source "PreferenceStore.java"
 
 
 # virtual methods
-.method public abstract EP()Landroid/content/SharedPreferences;
+.method public abstract EO()Landroid/content/SharedPreferences;
 .end method
 
 .method public abstract a(Landroid/content/SharedPreferences$Editor;)Z
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/d.smali
index 2ab7d73c7d..d14cd3eeda 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/f/d;
 .super Ljava/lang/Object;
+.source "PreferenceStoreImpl.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/f/c;
@@ -71,7 +72,7 @@
 
 
 # virtual methods
-.method public final EP()Landroid/content/SharedPreferences;
+.method public final EO()Landroid/content/SharedPreferences;
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/f/d;->sharedPreferences:Landroid/content/SharedPreferences;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/a.smali
index ee7af2a5ac..2150fe1367 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
@@ -1,5 +1,6 @@
 .class abstract Lio/fabric/sdk/android/a/g/a;
 .super Lio/fabric/sdk/android/a/b/a;
+.source "AbstractAppSpiCall.java"
 
 
 # direct methods
@@ -186,7 +187,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -305,7 +306,7 @@
 .method public a(Lio/fabric/sdk/android/a/g/d;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->DS()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->DR()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
@@ -341,7 +342,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -367,7 +368,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -391,7 +392,7 @@
 
     invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -426,13 +427,13 @@
     invoke-interface {v1, v2, 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;->EF()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result p1
 
     const-string v1, "POST"
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->EE()Ljava/net/HttpURLConnection;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->ED()Ljava/net/HttpURLConnection;
 
     move-result-object v2
 
@@ -454,7 +455,7 @@
     const-string v1, "Update"
 
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -484,7 +485,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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 c6aa8ca09f..9b24893c2a 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/b;
 .super Ljava/lang/Object;
+.source "AnalyticsSettingsData.java"
 
 
 # instance fields
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 d4d107476d..287763ff93 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/g/c;
 .super Ljava/lang/Object;
+.source "AppIconSettingsData.java"
 
 
 # instance fields
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 83840aa014..a59894d250 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/d;
 .super Ljava/lang/Object;
+.source "AppRequestData.java"
 
 
 # instance fields
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 f0fc1abdb4..a3d5389baa 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/e;
 .super Ljava/lang/Object;
+.source "AppSettingsData.java"
 
 
 # instance fields
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 9cf1e876ef..c4f6c3192e 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/f;
 .super Ljava/lang/Object;
+.source "BetaSettingsData.java"
 
 
 # instance fields
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 b2b7c39304..1201438454 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
@@ -1,9 +1,10 @@
 .class public interface abstract Lio/fabric/sdk/android/a/g/g;
 .super Ljava/lang/Object;
+.source "CachedSettingsIo.java"
 
 
 # virtual methods
-.method public abstract EQ()Lorg/json/JSONObject;
+.method public abstract EP()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 5d25f29135..2bce5be2cd 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/h;
 .super Lio/fabric/sdk/android/a/g/a;
+.source "CreateAppSpiCall.java"
 
 
 # direct methods
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 40e7e0ed42..bd371b81bc 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/g/i;
 .super Ljava/lang/Object;
+.source "DefaultCachedSettingsIo.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/g/g;
@@ -22,10 +23,10 @@
 
 
 # virtual methods
-.method public final EQ()Lorg/json/JSONObject;
+.method public final EP()Lorg/json/JSONObject;
     .locals 6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -90,7 +91,7 @@
 
     :cond_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -126,7 +127,7 @@
 
     :goto_1
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -163,7 +164,7 @@
 .method public final a(JLorg/json/JSONObject;)V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -247,7 +248,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 2b5b9d59f5..37f72f4ebe 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/g/j;
 .super Ljava/lang/Object;
+.source "DefaultSettingsController.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/g/s;
@@ -50,7 +51,7 @@
     return-void
 .end method
 
-.method private ES()Ljava/lang/String;
+.method private ER()Ljava/lang/String;
     .locals 3
 
     const/4 v0, 0x1
@@ -92,7 +93,7 @@
 
     iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->bOn:Lio/fabric/sdk/android/a/g/g;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/g/g;->EQ()Lorg/json/JSONObject;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/g/g;->EP()Lorg/json/JSONObject;
 
     move-result-object v1
 
@@ -112,7 +113,7 @@
 
     iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->pr:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/b/k;->Eb()J
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/b/k;->Ea()J
 
     move-result-wide v3
 
@@ -140,10 +141,10 @@
     :goto_0
     if-nez p1, :cond_1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -151,17 +152,16 @@
 
     const-string v2, "Cached settings have expired."
 
-    :goto_1
     invoke-interface {p1, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_2
-    :goto_2
+    :goto_1
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -175,34 +175,36 @@
 
     move-object v0, v2
 
-    goto :goto_4
+    goto :goto_3
 
     :catch_0
     move-exception p1
 
     move-object v0, v2
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
     const-string v1, "Fabric"
 
     const-string v2, "No cached settings data found."
+
+    invoke-interface {p1, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
 
-    goto :goto_1
+    goto :goto_3
 
     :catch_1
     move-exception p1
 
-    :goto_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    :goto_2
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -213,7 +215,7 @@
     invoke-interface {v1, v2, v3, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_4
-    :goto_4
+    :goto_3
     return-object v0
 .end method
 
@@ -225,7 +227,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -254,7 +256,7 @@
 
 
 # virtual methods
-.method public final ER()Lio/fabric/sdk/android/a/g/t;
+.method public final EQ()Lio/fabric/sdk/android/a/g/t;
     .locals 1
 
     sget-object v0, Lio/fabric/sdk/android/a/g/r;->bOL:Lio/fabric/sdk/android/a/g/r;
@@ -272,7 +274,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DH()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Z
 
     move-result v1
 
@@ -280,7 +282,7 @@
 
     iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->EO()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -292,7 +294,7 @@
 
     move-result-object v1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->ES()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->ER()Ljava/lang/String;
 
     move-result-object v2
 
@@ -306,9 +308,7 @@
 
     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;
 
-    move-result-object p1
-
-    move-object v0, p1
+    move-result-object v0
 
     :cond_0
     if-nez v0, :cond_1
@@ -329,72 +329,53 @@
 
     invoke-interface {v1, v2, 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 v1
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+    move-result-object v0
 
-    :try_start_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bOn:Lio/fabric/sdk/android/a/g/g;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->bOn:Lio/fabric/sdk/android/a/g/g;
 
-    iget-wide v2, v1, Lio/fabric/sdk/android/a/g/t;->bOT:J
+    iget-wide v2, v0, Lio/fabric/sdk/android/a/g/t;->bOT:J
 
-    invoke-interface {v0, v2, v3, p1}, Lio/fabric/sdk/android/a/g/g;->a(JLorg/json/JSONObject;)V
+    invoke-interface {v1, v2, v3, p1}, Lio/fabric/sdk/android/a/g/g;->a(JLorg/json/JSONObject;)V
 
-    const-string v0, "Loaded settings: "
+    const-string v1, "Loaded settings: "
 
-    invoke-static {p1, v0}, Lio/fabric/sdk/android/a/g/j;->c(Lorg/json/JSONObject;Ljava/lang/String;)V
+    invoke-static {p1, v1}, 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;->ES()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->ER()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->pq:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "existing_instance_identifier"
 
-    invoke-interface {v0, v2, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v1, v2, 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;->pq:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {p1, v0}, Lio/fabric/sdk/android/a/f/c;->a(Landroid/content/SharedPreferences$Editor;)Z
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    invoke-interface {p1, v1}, Lio/fabric/sdk/android/a/f/c;->a(Landroid/content/SharedPreferences$Editor;)Z
 
-    move-object v0, v1
+    :cond_1
+    if-nez v0, :cond_2
+
+    sget-object p1, Lio/fabric/sdk/android/a/g/r;->bON: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;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_0
 
     :catch_0
     move-exception p1
 
-    move-object v0, v1
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    if-nez v0, :cond_2
-
-    :try_start_2
-    sget-object p1, Lio/fabric/sdk/android/a/g/r;->bON: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;
-
-    move-result-object p1
-    :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
-
-    goto :goto_2
-
-    :catch_1
-    move-exception p1
-
-    :goto_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -405,8 +386,6 @@
     invoke-interface {v1, v2, v3, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_2
-    move-object p1, v0
-
-    :goto_2
-    return-object p1
+    :goto_0
+    return-object v0
 .end method
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 af4294239f..3b68bc0cff 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/g/k;
 .super Ljava/lang/Object;
+.source "DefaultSettingsJsonTransform.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/g/v;
@@ -453,7 +454,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-interface/range {p1 .. p1}, Lio/fabric/sdk/android/a/b/k;->Eb()J
+    invoke-interface/range {p1 .. p1}, Lio/fabric/sdk/android/a/b/k;->Ea()J
 
     move-result-wide v5
 
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 83ec5a359f..a5d22f5616 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/a/g/l;
 .super Lio/fabric/sdk/android/a/b/a;
+.source "DefaultSettingsSpiCall.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/a/g/x;
@@ -60,7 +61,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -82,7 +83,7 @@
 
     invoke-interface {v1, v2, v3, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -223,7 +224,7 @@
 
     invoke-static {v2, v3, 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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -245,7 +246,7 @@
 
     invoke-interface {p1, v3, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -263,11 +264,11 @@
 
     invoke-interface {p1, v3, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->EF()I
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->EE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -315,7 +316,7 @@
     :goto_1
     if-eqz p1, :cond_4
 
-    invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->EG()Ljava/lang/String;
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->EF()Ljava/lang/String;
 
     move-result-object p1
 
@@ -328,7 +329,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -356,7 +357,7 @@
     :goto_2
     if-eqz v2, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -404,7 +405,7 @@
 
     :goto_4
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -418,7 +419,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -442,7 +443,7 @@
     :goto_6
     if-eqz v2, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -470,4 +471,6 @@
 
     :cond_6
     throw p1
+
+    return-void
 .end method
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 935a4f97cb..2548f8b51a 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/m;
 .super Ljava/lang/Object;
+.source "FeaturesSettingsData.java"
 
 
 # instance fields
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 d12f7175b1..4a0ae20730 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/n;
 .super Ljava/lang/Object;
+.source "IconRequest.java"
 
 
 # instance fields
@@ -39,7 +40,7 @@
 
     move-result v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -86,7 +87,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 82dad0f16a..d2294f2288 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/o;
 .super Ljava/lang/Object;
+.source "PromptSettingsData.java"
 
 
 # instance fields
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 7b2f8c6315..f976ea72c0 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/p;
 .super Ljava/lang/Object;
+.source "SessionSettingsData.java"
 
 
 # instance fields
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 3bf63e4e74..446487bb8a 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/q$a;
 .super Ljava/lang/Object;
+.source "Settings.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
     return-void
 .end method
 
-.method public static synthetic EW()Lio/fabric/sdk/android/a/g/q;
+.method public static synthetic EV()Lio/fabric/sdk/android/a/g/q;
     .locals 1
 
     sget-object v0, Lio/fabric/sdk/android/a/g/q$a;->bOK:Lio/fabric/sdk/android/a/g/q;
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 e94a0b9092..62816e0f98 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/q;
 .super Ljava/lang/Object;
+.source "Settings.java"
 
 
 # annotations
@@ -79,7 +80,7 @@
 
 
 # virtual methods
-.method public final ET()Lio/fabric/sdk/android/a/g/t;
+.method public final ES()Lio/fabric/sdk/android/a/g/t;
     .locals 3
 
     :try_start_0
@@ -100,7 +101,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -115,7 +116,7 @@
     return-object v0
 .end method
 
-.method public final declared-synchronized EU()Z
+.method public final declared-synchronized ET()Z
     .locals 1
 
     monitor-enter p0
@@ -123,7 +124,7 @@
     :try_start_0
     iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bOJ:Lio/fabric/sdk/android/a/g/s;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->ER()Lio/fabric/sdk/android/a/g/t;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->EQ()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
 
@@ -151,9 +152,11 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final declared-synchronized EV()Z
+.method public final declared-synchronized EU()Z
     .locals 5
 
     monitor-enter p0
@@ -171,7 +174,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -206,6 +209,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized a(Lio/fabric/sdk/android/i;Lio/fabric/sdk/android/a/b/p;Lio/fabric/sdk/android/a/e/e;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/g/q;
@@ -292,7 +297,7 @@
 
     invoke-direct {v15, v0, v12, v4, v10}, 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/p;->Ed()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/p;->Ec()Ljava/lang/String;
 
     move-result-object v12
 
@@ -308,7 +313,7 @@
 
     move-result-object v4
 
-    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/p;->Ec()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/p;->Eb()Ljava/lang/String;
 
     move-result-object v3
 
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 7392b12186..908ec4bda6 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
@@ -1,5 +1,6 @@
 .class public final enum Lio/fabric/sdk/android/a/g/r;
 .super Ljava/lang/Enum;
+.source "SettingsCacheBehavior.java"
 
 
 # annotations
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 b413214ae9..c213523c83 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
@@ -1,9 +1,10 @@
 .class public interface abstract Lio/fabric/sdk/android/a/g/s;
 .super Ljava/lang/Object;
+.source "SettingsController.java"
 
 
 # virtual methods
-.method public abstract ER()Lio/fabric/sdk/android/a/g/t;
+.method public abstract EQ()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 cc8546de13..05b55ceaf9 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/t;
 .super Ljava/lang/Object;
+.source "SettingsData.java"
 
 
 # instance fields
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 e5f09ebbe7..67024b1c22 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/u;
 .super Ljava/lang/Object;
+.source "SettingsJsonConstants.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/v.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/v.smali
index b03da15c63..6d6ae3ee49 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/v.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/v.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/g/v;
 .super Ljava/lang/Object;
+.source "SettingsJsonTransform.java"
 
 
 # virtual 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 a3243f5973..3fbfa3f633 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/w;
 .super Ljava/lang/Object;
+.source "SettingsRequest.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/x.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/x.smali
index 6e35290560..93d6291aa4 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/x.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/x.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/a/g/x;
 .super Ljava/lang/Object;
+.source "SettingsSpiCall.java"
 
 
 # virtual methods
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 21bb8ba2eb..10a57c7434 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/a/g/y;
 .super Lio/fabric/sdk/android/a/g/a;
+.source "UpdateAppSpiCall.java"
 
 
 # direct methods
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 5ce7c7421d..a5350319fc 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/b.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/b;
 .super Ljava/lang/Object;
+.source "DefaultLogger.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/l;
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 15014b884b..afd7fa3ada 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/c$1;
 .super Lio/fabric/sdk/android/a$b;
+.source "Fabric.java"
 
 
 # annotations
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 f30dfd170e..6f5fb2e1b9 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
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/c$2;
 .super Ljava/lang/Object;
+.source "Fabric.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/f;
@@ -47,7 +48,7 @@
 
 
 # virtual methods
-.method public final DI()V
+.method public final DH()V
     .locals 5
 
     iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bKv:Ljava/util/concurrent/CountDownLatch;
@@ -82,7 +83,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/f;->DI()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->DH()V
 
     :cond_0
     return-void
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 aec2018e1c..02bac91044 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/c$a;
 .super Ljava/lang/Object;
+.source "Fabric.java"
 
 
 # annotations
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 96ba805bbf..2005cf0549 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/c.smali
@@ -1,5 +1,6 @@
 .class public Lio/fabric/sdk/android/c;
 .super Ljava/lang/Object;
+.source "Fabric.java"
 
 
 # annotations
@@ -157,7 +158,7 @@
     return-void
 .end method
 
-.method public static DG()Lio/fabric/sdk/android/l;
+.method public static DF()Lio/fabric/sdk/android/l;
     .locals 1
 
     sget-object v0, Lio/fabric/sdk/android/c;->bKk:Lio/fabric/sdk/android/c;
@@ -176,7 +177,7 @@
     return-object v0
 .end method
 
-.method public static DH()Z
+.method public static DG()Z
     .locals 1
 
     sget-object v0, Lio/fabric/sdk/android/c;->bKk:Lio/fabric/sdk/android/c;
@@ -225,7 +226,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Eq()Lio/fabric/sdk/android/a/c/k;
+    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Ep()Lio/fabric/sdk/android/a/c/k;
 
     move-result-object p0
 
@@ -259,10 +260,9 @@
 
     invoke-direct {p0}, Lio/fabric/sdk/android/b;-><init>()V
 
-    :goto_0
     iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bKs:Lio/fabric/sdk/android/l;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     new-instance p0, Lio/fabric/sdk/android/b;
@@ -271,10 +271,10 @@
 
     invoke-direct {p0, p1}, Lio/fabric/sdk/android/b;-><init>(B)V
 
-    goto :goto_0
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bKs:Lio/fabric/sdk/android/l;
 
     :cond_3
-    :goto_1
+    :goto_0
     iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bKA:Ljava/lang/String;
 
     if-nez p0, :cond_4
@@ -307,7 +307,7 @@
 
     move-object v5, p0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
     iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bKx:[Lio/fabric/sdk/android/i;
@@ -328,7 +328,7 @@
 
     move-object v5, p1
 
-    :goto_2
+    :goto_1
     iget-object p0, v1, Lio/fabric/sdk/android/c$a;->context:Landroid/content/Context;
 
     invoke-virtual {p0}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
@@ -367,14 +367,16 @@
 
     check-cast p1, Landroid/app/Activity;
 
-    goto :goto_3
+    move-object v12, p1
+
+    goto :goto_2
 
     :cond_7
     const/4 p1, 0x0
 
-    :goto_3
     move-object v12, p1
 
+    :goto_2
     move-object v3, p0
 
     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/p;Landroid/app/Activity;)V
@@ -401,7 +403,7 @@
 
     invoke-direct {p0, p1}, Lio/fabric/sdk/android/c;->aC(Landroid/content/Context;)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     new-instance p0, Ljava/lang/IllegalStateException;
@@ -413,10 +415,10 @@
     throw p0
 
     :cond_9
-    :goto_4
+    :goto_3
     monitor-exit v0
 
-    goto :goto_5
+    goto :goto_4
 
     :catchall_0
     move-exception p0
@@ -428,7 +430,7 @@
     throw p0
 
     :cond_a
-    :goto_5
+    :goto_4
     sget-object p0, Lio/fabric/sdk/android/c;->bKk:Lio/fabric/sdk/android/c;
 
     return-object p0
@@ -687,9 +689,9 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v2}, Lio/fabric/sdk/android/m;->DO()V
+    invoke-virtual {v2}, Lio/fabric/sdk/android/m;->DN()V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -745,7 +747,7 @@
 
     invoke-static {v3, v1}, Lio/fabric/sdk/android/c;->a(Ljava/util/Map;Lio/fabric/sdk/android/i;)V
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/i;->DO()V
+    invoke-virtual {v1}, Lio/fabric/sdk/android/i;->DN()V
 
     if-eqz p1, :cond_2
 
@@ -774,7 +776,7 @@
     :cond_3
     if-eqz p1, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
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 c29234d5ff..e7f976b86c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/d.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/d;
 .super Landroid/content/ContextWrapper;
+.source "FabricContext.java"
 
 
 # instance fields
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 6da9d4e21e..95fc4f7cf8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/e.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/e;
 .super Ljava/lang/Object;
+.source "FabricKitsFinder.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
@@ -33,7 +34,7 @@
     return-void
 .end method
 
-.method private static DJ()Ljava/util/Map;
+.method private static DI()Ljava/util/Map;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,7 +69,7 @@
 
     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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -84,7 +85,7 @@
     return-object v0
 .end method
 
-.method private DK()Ljava/util/Map;
+.method private DJ()Ljava/util/Map;
     .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -164,7 +165,7 @@
 
     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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -318,7 +319,7 @@
 
     :goto_0
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -372,19 +373,19 @@
 
     move-result-wide v1
 
-    invoke-static {}, Lio/fabric/sdk/android/e;->DJ()Ljava/util/Map;
+    invoke-static {}, Lio/fabric/sdk/android/e;->DI()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;->DK()Ljava/util/Map;
+    invoke-direct {p0}, Lio/fabric/sdk/android/e;->DJ()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;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 3dad84a590..cde10334c6 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
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/f$a;
 .super Ljava/lang/Object;
+.source "InitializationCallback.java"
 
 # interfaces
 .implements Lio/fabric/sdk/android/f;
@@ -44,7 +45,7 @@
 
 
 # virtual methods
-.method public final DI()V
+.method public final DH()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 c7488cfeef..f34fbe9629 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/f.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/f;
 .super Ljava/lang/Object;
+.source "InitializationCallback.java"
 
 
 # annotations
@@ -40,7 +41,7 @@
 
 
 # virtual methods
-.method public abstract DI()V
+.method public abstract DH()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/g.smali b/com.discord/smali_classes2/io/fabric/sdk/android/g.smali
index 99801ae6ec..e1995aeae8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/g.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/g.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/g;
 .super Ljava/lang/RuntimeException;
+.source "InitializationException.java"
 
 
 # direct methods
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 a1946d30d8..bf9b51faca 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/h.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/h;
 .super Lio/fabric/sdk/android/a/c/f;
+.source "InitializationTask.java"
 
 
 # annotations
@@ -76,14 +77,14 @@
 
     invoke-direct {v0, p1, v1}, Lio/fabric/sdk/android/a/b/u;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ef()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ee()V
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final DL()V
+.method public final DK()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,12 +96,12 @@
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->bKo:Lio/fabric/sdk/android/f;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/f;->DI()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->DH()V
 
     return-void
 .end method
 
-.method public final DM()V
+.method public final DL()V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -141,7 +142,7 @@
     return-void
 .end method
 
-.method public final synthetic DN()Ljava/lang/Object;
+.method public final synthetic DM()Ljava/lang/Object;
     .locals 2
 
     const-string v0, "doInBackground"
@@ -170,7 +171,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Eg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ef()V
 
     return-object v1
 .end method
@@ -205,11 +206,13 @@
     .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/u;->Eg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ef()V
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Eh()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Eg()Z
+
+    return-void
 
     :cond_0
     return-void
@@ -223,7 +226,7 @@
     move-exception v1
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -235,9 +238,9 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Eg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ef()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Eh()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Eg()Z
 
     return-void
 
@@ -250,9 +253,9 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :goto_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Eg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ef()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Eh()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Eg()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 489e403f3c..c9e20bf080 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
@@ -1,5 +1,6 @@
 .class public abstract Lio/fabric/sdk/android/i;
 .super Ljava/lang/Object;
+.source "Kit.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
@@ -76,7 +77,7 @@
     return-void
 .end method
 
-.method private DP()Z
+.method private DO()Z
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/i;->bKH:Lio/fabric/sdk/android/a/c/d;
@@ -96,7 +97,7 @@
 .method private a(Lio/fabric/sdk/android/i;)Z
     .locals 6
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->DP()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->DO()Z
 
     move-result v0
 
@@ -144,7 +145,7 @@
 
 
 # virtual methods
-.method final DO()V
+.method final DN()V
     .locals 5
 
     iget-object v0, p0, Lio/fabric/sdk/android/i;->bKG:Lio/fabric/sdk/android/h;
@@ -248,13 +249,13 @@
     return v2
 
     :cond_1
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->DP()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->DO()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->DP()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->DO()Z
 
     move-result v0
 
@@ -263,13 +264,13 @@
     return v1
 
     :cond_2
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->DP()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->DO()Z
 
     move-result v0
 
     if-nez v0, :cond_3
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->DP()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->DO()Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/j.smali b/com.discord/smali_classes2/io/fabric/sdk/android/j.smali
index 6798ed664d..62723762cd 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/j.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/j.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/j;
 .super Ljava/lang/Object;
+.source "KitGroup.java"
 
 
 # virtual methods
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 1f0c8efb65..6b89a7e756 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/k.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/k.smali
@@ -1,5 +1,6 @@
 .class public final Lio/fabric/sdk/android/k;
 .super Ljava/lang/Object;
+.source "KitInfo.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/l.smali b/com.discord/smali_classes2/io/fabric/sdk/android/l.smali
index 5a09c30724..429718c9fd 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/l.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/l.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lio/fabric/sdk/android/l;
 .super Ljava/lang/Object;
+.source "Logger.java"
 
 
 # virtual methods
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 c0583cd6b3..0a639ae80b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
@@ -1,5 +1,6 @@
 .class final Lio/fabric/sdk/android/m;
 .super Lio/fabric/sdk/android/i;
+.source "Onboarding.java"
 
 
 # annotations
@@ -86,11 +87,11 @@
     return-void
 .end method
 
-.method private DQ()Lio/fabric/sdk/android/a/g/t;
+.method private DP()Lio/fabric/sdk/android/a/g/t;
     .locals 7
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
@@ -112,13 +113,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->EU()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ET()Z
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ET()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->ES()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
     :try_end_0
@@ -129,7 +130,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -302,7 +303,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->DQ()Lio/fabric/sdk/android/a/g/t;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->DP()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v1
 
@@ -383,14 +384,20 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->EU()Z
+
+    move-result v0
+
+    move v2, v0
+
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -402,7 +409,7 @@
 
     invoke-interface {v0, v1, v3, v4}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const-string v5, "configured"
@@ -415,25 +422,24 @@
 
     if-eqz v5, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EW()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->EV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    :goto_1
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->EV()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->EU()Z
 
     move-result v0
 
     move v2, v0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     iget-boolean v5, v1, Lio/fabric/sdk/android/a/g/e;->bOh:Z
 
     if-eqz v5, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -472,12 +478,12 @@
     :cond_4
     const/4 v2, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -488,7 +494,7 @@
     invoke-interface {v1, v3, v4, v0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_5
-    :goto_2
+    :goto_1
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v0
@@ -631,7 +637,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->DG()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->DF()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 1000e3431a..d31d34d819 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Ljp/wasabeef/fresco/a/a;
 .super Lcom/facebook/imagepipeline/request/a;
+.source "BlurPostprocessor.java"
 
 
 # static fields
@@ -118,8 +119,6 @@
 
     div-int/2addr v0, v2
 
-    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bPc:I
-
     div-int/2addr v1, v2
 
     sget-object v2, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
@@ -134,19 +133,17 @@
 
     iget v2, p0, Ljp/wasabeef/fresco/a/a;->bPc:I
 
+    int-to-float v3, v2
+
+    const/high16 v4, 0x3f800000    # 1.0f
+
+    div-float v3, v4, v3
+
     int-to-float v2, v2
 
-    const/high16 v3, 0x3f800000    # 1.0f
+    div-float/2addr v4, v2
 
-    div-float v2, v3, v2
-
-    iget v4, p0, Ljp/wasabeef/fresco/a/a;->bPc:I
-
-    int-to-float v4, v4
-
-    div-float/2addr v3, v4
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Canvas;->scale(FF)V
+    invoke-virtual {v1, v3, v4}, Landroid/graphics/Canvas;->scale(FF)V
 
     new-instance v2, Landroid/graphics/Paint;
 
diff --git a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/a.smali b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/a.smali
index 9b4a374829..22a12b135a 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/a.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/a.smali
@@ -1,10 +1,11 @@
 .class public final Ljp/wasabeef/fresco/a/a/a;
 .super Ljava/lang/Object;
+.source "FastBlur.java"
 
 
 # direct methods
 .method public static a(Landroid/graphics/Bitmap;I)Landroid/graphics/Bitmap;
-    .locals 37
+    .locals 36
 
     move/from16 v0, p1
 
@@ -213,21 +214,6 @@
 
     aget v2, v34, v10
 
-    add-int v24, v24, v2
-
-    aget v2, v34, v16
-
-    add-int v25, v25, v2
-
-    aget v2, v34, v19
-
-    add-int v26, v26, v2
-
-    goto :goto_3
-
-    :cond_2
-    aget v2, v34, v10
-
     add-int v27, v27, v2
 
     aget v2, v34, v16
@@ -238,6 +224,21 @@
 
     add-int v29, v29, v2
 
+    goto :goto_3
+
+    :cond_2
+    aget v2, v34, v10
+
+    add-int v24, v24, v2
+
+    aget v2, v34, v16
+
+    add-int v25, v25, v2
+
+    aget v2, v34, v19
+
+    add-int v26, v26, v2
+
     :goto_3
     add-int/lit8 v15, v15, 0x1
 
@@ -271,11 +272,11 @@
 
     aput v15, v7, v17
 
-    sub-int v21, v21, v27
+    sub-int v21, v21, v24
 
-    sub-int v22, v22, v28
+    sub-int v22, v22, v25
 
-    sub-int v23, v23, v29
+    sub-int v23, v23, v26
 
     sub-int v15, v10, v0
 
@@ -289,17 +290,17 @@
 
     aget v34, v15, v20
 
-    sub-int v27, v27, v34
+    sub-int v24, v24, v34
 
     const/16 v16, 0x1
 
     aget v34, v15, v16
 
-    sub-int v28, v28, v34
+    sub-int v25, v25, v34
 
     aget v34, v15, v19
 
-    sub-int v29, v29, v34
+    sub-int v26, v26, v34
 
     if-nez v13, :cond_4
 
@@ -349,21 +350,21 @@
 
     aget v14, v15, v20
 
-    add-int v24, v24, v14
+    add-int v27, v27, v14
 
     aget v14, v15, v16
 
-    add-int v25, v25, v14
+    add-int v28, v28, v14
 
     aget v14, v15, v19
 
-    add-int v26, v26, v14
+    add-int v29, v29, v14
 
-    add-int v21, v21, v24
+    add-int v21, v21, v27
 
-    add-int v22, v22, v25
+    add-int v22, v22, v28
 
-    add-int v23, v23, v26
+    add-int v23, v23, v29
 
     add-int/lit8 v10, v10, 0x1
 
@@ -377,29 +378,29 @@
 
     aget v20, v14, v15
 
-    add-int v27, v27, v20
+    add-int v24, v24, v20
 
     const/16 v16, 0x1
 
     aget v20, v14, v16
 
-    add-int v28, v28, v20
+    add-int v25, v25, v20
 
     aget v20, v14, v19
 
-    add-int v29, v29, v20
+    add-int v26, v26, v20
 
     aget v34, v14, v15
 
-    sub-int v24, v24, v34
+    sub-int v27, v27, v34
 
     aget v15, v14, v16
 
-    sub-int v25, v25, v15
+    sub-int v28, v28, v15
 
     aget v14, v14, v19
 
-    sub-int v26, v26, v14
+    sub-int v29, v29, v14
 
     add-int/lit8 v17, v17, 0x1
 
@@ -459,7 +460,7 @@
     :goto_7
     if-gt v2, v0, :cond_9
 
-    move-object/from16 v36, v8
+    move-object/from16 v25, v8
 
     const/4 v8, 0x0
 
@@ -467,25 +468,25 @@
 
     move-result v20
 
-    add-int v25, v20, v1
+    add-int v26, v20, v1
 
     add-int v20, v2, v0
 
-    aget-object v26, v4, v20
+    aget-object v27, v4, v20
 
-    aget v20, v5, v25
+    aget v20, v5, v26
 
-    aput v20, v26, v8
+    aput v20, v27, v8
 
-    aget v8, v6, v25
+    aget v8, v6, v26
 
     const/16 v16, 0x1
 
-    aput v8, v26, v16
+    aput v8, v27, v16
 
-    aget v8, v7, v25
+    aget v8, v7, v26
 
-    aput v8, v26, v19
+    aput v8, v27, v19
 
     invoke-static {v2}, Ljava/lang/Math;->abs(I)I
 
@@ -493,67 +494,66 @@
 
     sub-int v8, v11, v8
 
-    aget v27, v5, v25
+    aget v28, v5, v26
 
-    mul-int v27, v27, v8
+    mul-int v28, v28, v8
 
-    add-int v13, v13, v27
+    add-int v13, v13, v28
 
-    aget v27, v6, v25
+    aget v28, v6, v26
 
-    mul-int v27, v27, v8
+    mul-int v28, v28, v8
 
-    add-int v14, v14, v27
+    add-int v14, v14, v28
 
-    aget v25, v7, v25
+    aget v26, v7, v26
 
-    mul-int v25, v25, v8
+    mul-int v26, v26, v8
 
-    add-int v15, v15, v25
+    add-int v15, v15, v26
 
     if-lez v2, :cond_7
 
     const/4 v8, 0x0
 
-    aget v20, v26, v8
+    aget v20, v27, v8
 
-    add-int v17, v17, v20
+    add-int v22, v22, v20
 
     const/16 v16, 0x1
 
-    aget v20, v26, v16
+    aget v20, v27, v16
 
-    add-int v18, v18, v20
+    add-int v23, v23, v20
 
-    aget v20, v26, v19
+    aget v20, v27, v19
 
-    add-int v21, v21, v20
+    add-int v24, v24, v20
 
-    :goto_8
     move/from16 v8, v33
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_7
     const/4 v8, 0x0
 
     const/16 v16, 0x1
 
-    aget v25, v26, v8
+    aget v26, v27, v8
 
-    add-int v22, v22, v25
+    add-int v17, v17, v26
 
-    aget v8, v26, v16
+    aget v8, v27, v16
 
-    add-int v23, v23, v8
+    add-int v18, v18, v8
 
-    aget v8, v26, v19
+    aget v8, v27, v19
 
-    add-int v24, v24, v8
+    add-int v21, v21, v8
 
-    goto :goto_8
+    move/from16 v8, v33
 
-    :goto_9
+    :goto_8
     if-ge v2, v8, :cond_8
 
     add-int/2addr v10, v9
@@ -563,26 +563,30 @@
 
     move/from16 v33, v8
 
-    move-object/from16 v8, v36
+    move-object/from16 v8, v25
 
     goto :goto_7
 
     :cond_9
-    move-object/from16 v36, v8
+    move-object/from16 v25, v8
 
     move/from16 v8, v33
 
-    move/from16 v25, v18
+    move/from16 v27, v22
 
-    move/from16 v26, v21
+    move/from16 v26, v23
 
     move/from16 v10, v32
 
     const/4 v2, 0x0
 
-    move/from16 v18, v0
+    move/from16 v23, v0
 
-    move/from16 v21, v17
+    move/from16 v22, v21
+
+    move/from16 v21, v18
+
+    move/from16 v18, v17
 
     move/from16 v17, v15
 
@@ -592,62 +596,62 @@
 
     move v13, v1
 
-    :goto_a
+    :goto_9
     if-ge v2, v10, :cond_b
 
-    const/high16 v27, -0x1000000
+    const/high16 v28, -0x1000000
 
-    aget v28, v12, v13
+    aget v29, v12, v13
 
-    and-int v27, v28, v27
+    and-int v28, v29, v28
 
-    aget v28, v35, v14
+    aget v29, v35, v14
 
-    shl-int/lit8 v28, v28, 0x10
+    shl-int/lit8 v29, v29, 0x10
 
-    or-int v27, v27, v28
+    or-int v28, v28, v29
 
-    aget v28, v35, v15
+    aget v29, v35, v15
 
-    shl-int/lit8 v28, v28, 0x8
+    shl-int/lit8 v29, v29, 0x8
 
-    or-int v27, v27, v28
+    or-int v28, v28, v29
 
-    aget v28, v35, v17
+    aget v29, v35, v17
 
-    or-int v27, v27, v28
+    or-int v28, v28, v29
 
-    aput v27, v12, v13
+    aput v28, v12, v13
 
-    sub-int v14, v14, v22
+    sub-int v14, v14, v18
 
-    sub-int v15, v15, v23
+    sub-int v15, v15, v21
 
-    sub-int v17, v17, v24
+    sub-int v17, v17, v22
 
-    sub-int v27, v18, v0
+    sub-int v28, v23, v0
 
-    add-int v27, v27, v3
+    add-int v28, v28, v3
 
-    rem-int v27, v27, v3
+    rem-int v28, v28, v3
 
-    aget-object v27, v4, v27
+    aget-object v28, v4, v28
 
     const/16 v20, 0x0
 
-    aget v28, v27, v20
+    aget v29, v28, v20
 
-    sub-int v22, v22, v28
+    sub-int v18, v18, v29
 
     const/16 v16, 0x1
 
-    aget v28, v27, v16
+    aget v29, v28, v16
 
-    sub-int v23, v23, v28
+    sub-int v21, v21, v29
 
-    aget v28, v27, v19
+    aget v29, v28, v19
 
-    sub-int v24, v24, v28
+    sub-int v22, v22, v29
 
     if-nez v1, :cond_a
 
@@ -659,80 +663,80 @@
 
     mul-int v0, v0, v9
 
-    aput v0, v36, v2
+    aput v0, v25, v2
 
     :cond_a
-    aget v0, v36, v2
+    aget v0, v25, v2
 
     add-int/2addr v0, v1
 
-    aget v28, v5, v0
+    aget v29, v5, v0
 
     const/16 v20, 0x0
 
-    aput v28, v27, v20
+    aput v29, v28, v20
 
-    aget v28, v6, v0
+    aget v29, v6, v0
 
     const/16 v16, 0x1
 
-    aput v28, v27, v16
+    aput v29, v28, v16
 
     aget v0, v7, v0
 
-    aput v0, v27, v19
+    aput v0, v28, v19
 
-    aget v0, v27, v20
+    aget v0, v28, v20
 
-    add-int v21, v21, v0
+    add-int v27, v27, v0
 
-    aget v0, v27, v16
-
-    add-int v25, v25, v0
-
-    aget v0, v27, v19
+    aget v0, v28, v16
 
     add-int v26, v26, v0
 
-    add-int v14, v14, v21
+    aget v0, v28, v19
 
-    add-int v15, v15, v25
+    add-int v24, v24, v0
 
-    add-int v17, v17, v26
+    add-int v14, v14, v27
 
-    add-int/lit8 v18, v18, 0x1
+    add-int v15, v15, v26
 
-    rem-int v18, v18, v3
+    add-int v17, v17, v24
 
-    aget-object v0, v4, v18
+    add-int/lit8 v23, v23, 0x1
+
+    rem-int v23, v23, v3
+
+    aget-object v0, v4, v23
 
     const/16 v20, 0x0
 
-    aget v27, v0, v20
+    aget v28, v0, v20
 
-    add-int v22, v22, v27
+    add-int v18, v18, v28
 
     const/16 v16, 0x1
 
-    aget v27, v0, v16
+    aget v28, v0, v16
 
-    add-int v23, v23, v27
+    add-int v21, v21, v28
 
-    aget v27, v0, v19
+    aget v28, v0, v19
 
-    add-int v24, v24, v27
+    add-int v22, v22, v28
 
-    aget v27, v0, v20
+    aget v28, v0, v20
 
-    sub-int v21, v21, v27
+    sub-int v27, v27, v28
 
-    aget v27, v0, v16
+    aget v28, v0, v16
 
-    sub-int v25, v25, v27
+    sub-int v26, v26, v28
 
     aget v0, v0, v19
 
-    sub-int v26, v26, v0
+    sub-int v24, v24, v0
 
     add-int/2addr v13, v9
 
@@ -740,7 +744,7 @@
 
     move/from16 v0, p1
 
-    goto/16 :goto_a
+    goto/16 :goto_9
 
     :cond_b
     const/16 v16, 0x1
@@ -753,7 +757,7 @@
 
     move/from16 v32, v10
 
-    move-object/from16 v8, v36
+    move-object/from16 v8, v25
 
     move/from16 v0, p1
 
diff --git a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/b.smali b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/b.smali
index 088080a07d..d4fdbb7bd6 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/b.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Ljp/wasabeef/fresco/a/a/b;
 .super Ljava/lang/Object;
+.source "RSBlur.java"
 
 
 # direct methods
@@ -22,7 +23,7 @@
 
     move-result-object p0
     :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_4
+    .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     :try_start_1
     new-instance v1, Landroid/renderscript/RenderScript$RSMessageHandler;
@@ -39,7 +40,7 @@
 
     move-result-object v1
     :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_3
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
     invoke-virtual {v1}, Landroid/renderscript/Allocation;->getType()Landroid/renderscript/Type;
@@ -50,7 +51,7 @@
 
     move-result-object v2
     :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
     invoke-static {p0}, Landroid/renderscript/Element;->U8_4(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;
@@ -59,22 +60,19 @@
 
     invoke-static {p0, v3}, Landroid/renderscript/ScriptIntrinsicBlur;->create(Landroid/renderscript/RenderScript;Landroid/renderscript/Element;)Landroid/renderscript/ScriptIntrinsicBlur;
 
-    move-result-object v3
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+    move-result-object v0
 
-    :try_start_4
-    invoke-virtual {v3, v1}, Landroid/renderscript/ScriptIntrinsicBlur;->setInput(Landroid/renderscript/Allocation;)V
+    invoke-virtual {v0, v1}, Landroid/renderscript/ScriptIntrinsicBlur;->setInput(Landroid/renderscript/Allocation;)V
 
     int-to-float p2, p2
 
-    invoke-virtual {v3, p2}, Landroid/renderscript/ScriptIntrinsicBlur;->setRadius(F)V
+    invoke-virtual {v0, p2}, Landroid/renderscript/ScriptIntrinsicBlur;->setRadius(F)V
 
-    invoke-virtual {v3, v2}, Landroid/renderscript/ScriptIntrinsicBlur;->forEach(Landroid/renderscript/Allocation;)V
+    invoke-virtual {v0, v2}, Landroid/renderscript/ScriptIntrinsicBlur;->forEach(Landroid/renderscript/Allocation;)V
 
     invoke-virtual {v2, p1}, Landroid/renderscript/Allocation;->copyTo(Landroid/graphics/Bitmap;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     if-eqz p0, :cond_0
 
@@ -91,9 +89,9 @@
     invoke-virtual {v2}, Landroid/renderscript/Allocation;->destroy()V
 
     :cond_2
-    if-eqz v3, :cond_3
+    if-eqz v0, :cond_3
 
-    invoke-virtual {v3}, Landroid/renderscript/ScriptIntrinsicBlur;->destroy()V
+    invoke-virtual {v0}, Landroid/renderscript/ScriptIntrinsicBlur;->destroy()V
 
     :cond_3
     return-object p1
@@ -101,43 +99,37 @@
     :catchall_0
     move-exception p1
 
-    goto :goto_0
+    move-object p2, v0
+
+    move-object v0, v2
+
+    goto :goto_1
 
     :catchall_1
     move-exception p1
 
-    move-object v3, v0
+    move-object p2, v0
 
-    :goto_0
-    move-object v0, v2
-
-    goto :goto_2
+    goto :goto_1
 
     :catchall_2
     move-exception p1
 
-    move-object v3, v0
+    move-object p2, v0
 
-    goto :goto_2
+    goto :goto_0
 
     :catchall_3
     move-exception p1
 
-    move-object v1, v0
-
-    goto :goto_1
-
-    :catchall_4
-    move-exception p1
-
     move-object p0, v0
 
-    move-object v1, p0
+    move-object p2, p0
+
+    :goto_0
+    move-object v1, p2
 
     :goto_1
-    move-object v3, v1
-
-    :goto_2
     if-eqz p0, :cond_4
 
     invoke-virtual {p0}, Landroid/renderscript/RenderScript;->destroy()V
@@ -153,9 +145,9 @@
     invoke-virtual {v0}, Landroid/renderscript/Allocation;->destroy()V
 
     :cond_6
-    if-eqz v3, :cond_7
+    if-eqz p2, :cond_7
 
-    invoke-virtual {v3}, Landroid/renderscript/ScriptIntrinsicBlur;->destroy()V
+    invoke-virtual {p2}, Landroid/renderscript/ScriptIntrinsicBlur;->destroy()V
 
     :cond_7
     throw p1
diff --git a/com.discord/smali_classes2/jp/wasabeef/fresco/a/b.smali b/com.discord/smali_classes2/jp/wasabeef/fresco/a/b.smali
index a851a27f1f..17c866dd56 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/b.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Ljp/wasabeef/fresco/a/b;
 .super Lcom/facebook/imagepipeline/request/a;
+.source "ColorFilterPostprocessor.java"
 
 
 # instance fields
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 1fd11c65db..e81d1cc910 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
@@ -1,5 +1,6 @@
 .class public final Ljp/wasabeef/fresco/a/c$a;
 .super Ljava/lang/Object;
+.source "CombinePostProcessors.java"
 
 
 # annotations
@@ -42,7 +43,7 @@
 
 
 # virtual methods
-.method public final EX()Ljp/wasabeef/fresco/a/c;
+.method public final EW()Ljp/wasabeef/fresco/a/c;
     .locals 3
 
     new-instance v0, Ljp/wasabeef/fresco/a/c;
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 a42b57bd37..62243f8e53 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/c.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Ljp/wasabeef/fresco/a/c;
 .super Lcom/facebook/imagepipeline/request/a;
+.source "CombinePostProcessors.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/jp/wasabeef/fresco/prosessors/R.smali b/com.discord/smali_classes2/jp/wasabeef/fresco/prosessors/R.smali
index 286f2c1e03..0efc335c4f 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/prosessors/R.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/prosessors/R.smali
@@ -1,5 +1,6 @@
 .class public final Ljp/wasabeef/fresco/prosessors/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/Lazy.smali b/com.discord/smali_classes2/kotlin/Lazy.smali
index 86efff6c18..7401705407 100644
--- a/com.discord/smali_classes2/kotlin/Lazy.smali
+++ b/com.discord/smali_classes2/kotlin/Lazy.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/Lazy;
 .super Ljava/lang/Object;
+.source "Lazy.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/Pair.smali b/com.discord/smali_classes2/kotlin/Pair.smali
index c886a5c144..04694da83b 100644
--- a/com.discord/smali_classes2/kotlin/Pair.smali
+++ b/com.discord/smali_classes2/kotlin/Pair.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/Pair;
 .super Ljava/lang/Object;
+.source "Tuples.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/a.smali b/com.discord/smali_classes2/kotlin/a.smali
index b308e0cc1d..353f845074 100644
--- a/com.discord/smali_classes2/kotlin/a.smali
+++ b/com.discord/smali_classes2/kotlin/a.smali
@@ -1,2 +1,3 @@
 .class public final Lkotlin/a;
 .super Lkotlin/b;
+.source "Exceptions.kt"
diff --git a/com.discord/smali_classes2/kotlin/a/a$a.smali b/com.discord/smali_classes2/kotlin/a/a$a.smali
index 37ef4cfe88..a9837e7c4c 100644
--- a/com.discord/smali_classes2/kotlin/a/a$a.smali
+++ b/com.discord/smali_classes2/kotlin/a/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/a/a$a;
 .super Lkotlin/jvm/internal/k;
+.source "AbstractCollection.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -54,7 +55,6 @@
 
     const-string p1, "(this Collection)"
 
-    :goto_0
     check-cast p1, Ljava/lang/CharSequence;
 
     return-object p1
@@ -64,5 +64,7 @@
 
     move-result-object p1
 
-    goto :goto_0
+    check-cast p1, Ljava/lang/CharSequence;
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/kotlin/a/a.smali b/com.discord/smali_classes2/kotlin/a/a.smali
index 6c6016bdc7..d7c7e5c5d4 100644
--- a/com.discord/smali_classes2/kotlin/a/a.smali
+++ b/com.discord/smali_classes2/kotlin/a/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/a/a;
 .super Ljava/lang/Object;
+.source "AbstractCollection.kt"
 
 # interfaces
 .implements Ljava/util/Collection;
diff --git a/com.discord/smali_classes2/kotlin/a/ac.smali b/com.discord/smali_classes2/kotlin/a/ac.smali
index edb358d425..b34725a3fb 100644
--- a/com.discord/smali_classes2/kotlin/a/ac.smali
+++ b/com.discord/smali_classes2/kotlin/a/ac.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/a/ac;
 .super Ljava/lang/Object;
+.source "MapWithDefault.kt"
diff --git a/com.discord/smali_classes2/kotlin/a/ad.smali b/com.discord/smali_classes2/kotlin/a/ad.smali
index 8d9f0598ec..6805984fe3 100644
--- a/com.discord/smali_classes2/kotlin/a/ad.smali
+++ b/com.discord/smali_classes2/kotlin/a/ad.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/ad;
 .super Lkotlin/a/ac;
+.source "MapsJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/a/ae.smali b/com.discord/smali_classes2/kotlin/a/ae.smali
index df707978fb..5c0b05a08f 100644
--- a/com.discord/smali_classes2/kotlin/a/ae.smali
+++ b/com.discord/smali_classes2/kotlin/a/ae.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/ae;
 .super Lkotlin/a/ad;
+.source "Maps.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/a/af.smali b/com.discord/smali_classes2/kotlin/a/af.smali
index 93e5e88d28..6946350546 100644
--- a/com.discord/smali_classes2/kotlin/a/af.smali
+++ b/com.discord/smali_classes2/kotlin/a/af.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/af;
 .super Lkotlin/a/ae;
+.source "_Maps.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/a/ag.smali b/com.discord/smali_classes2/kotlin/a/ag.smali
index 0e10d95c8b..64aa0c8d9c 100644
--- a/com.discord/smali_classes2/kotlin/a/ag.smali
+++ b/com.discord/smali_classes2/kotlin/a/ag.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/ag;
 .super Lkotlin/a/e;
+.source "ReversedViews.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/a/ah.smali b/com.discord/smali_classes2/kotlin/a/ah.smali
index ae9a460a2f..f2286a5e3c 100644
--- a/com.discord/smali_classes2/kotlin/a/ah.smali
+++ b/com.discord/smali_classes2/kotlin/a/ah.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/a/ah;
 .super Lkotlin/a/d;
+.source "ReversedViews.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/a/aj.smali b/com.discord/smali_classes2/kotlin/a/aj.smali
index ad10e6a5a2..daf8da1769 100644
--- a/com.discord/smali_classes2/kotlin/a/aj.smali
+++ b/com.discord/smali_classes2/kotlin/a/aj.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/aj;
 .super Ljava/lang/Object;
+.source "SetsJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/a/ak.smali b/com.discord/smali_classes2/kotlin/a/ak.smali
index 9fa1654be6..2bd1dd4146 100644
--- a/com.discord/smali_classes2/kotlin/a/ak.smali
+++ b/com.discord/smali_classes2/kotlin/a/ak.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/ak;
 .super Lkotlin/a/aj;
+.source "Sets.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/a/al.smali b/com.discord/smali_classes2/kotlin/a/al.smali
index 1d3e958413..f182e63d20 100644
--- a/com.discord/smali_classes2/kotlin/a/al.smali
+++ b/com.discord/smali_classes2/kotlin/a/al.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/a/al;
 .super Lkotlin/a/ak;
+.source "_Sets.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/a/an.smali b/com.discord/smali_classes2/kotlin/a/an.smali
index 29deef2eea..fe70de2bbb 100644
--- a/com.discord/smali_classes2/kotlin/a/an.smali
+++ b/com.discord/smali_classes2/kotlin/a/an.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/an;
 .super Ljava/lang/Enum;
+.source "AbstractIterator.kt"
 
 
 # annotations
@@ -61,7 +62,7 @@
     .end array-data
 .end method
 
-.method public static Fb()[I
+.method public static Fa()[I
     .locals 1
 
     sget-object v0, Lkotlin/a/an;->bPJ:[I
diff --git a/com.discord/smali_classes2/kotlin/a/b.smali b/com.discord/smali_classes2/kotlin/a/b.smali
index c7a1b66fe5..9c386bad95 100644
--- a/com.discord/smali_classes2/kotlin/a/b.smali
+++ b/com.discord/smali_classes2/kotlin/a/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/a/b;
 .super Ljava/lang/Object;
+.source "AbstractIterator.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -47,7 +48,7 @@
 
 
 # virtual methods
-.method protected abstract EY()V
+.method protected abstract EX()V
 .end method
 
 .method public hasNext()Z
@@ -87,7 +88,7 @@
 
     iput v0, p0, Lkotlin/a/b;->bPp:I
 
-    invoke-virtual {p0}, Lkotlin/a/b;->EY()V
+    invoke-virtual {p0}, Lkotlin/a/b;->EX()V
 
     iget v0, p0, Lkotlin/a/b;->bPp:I
 
@@ -95,13 +96,17 @@
 
     if-ne v0, v1, :cond_1
 
+    return v3
+
     :pswitch_0
     return v3
 
-    :cond_1
     :pswitch_1
     return v2
 
+    :cond_1
+    return v2
+
     :cond_2
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
diff --git a/com.discord/smali_classes2/kotlin/a/c.smali b/com.discord/smali_classes2/kotlin/a/c.smali
index f47987779b..27975da5b8 100644
--- a/com.discord/smali_classes2/kotlin/a/c.smali
+++ b/com.discord/smali_classes2/kotlin/a/c.smali
@@ -10,7 +10,7 @@
 .method static synthetic constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lkotlin/a/an;->Fb()[I
+    invoke-static {}, Lkotlin/a/an;->Fa()[I
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/a/d$a.smali b/com.discord/smali_classes2/kotlin/a/d$a.smali
index 4d2c8265d8..f88e8aa372 100644
--- a/com.discord/smali_classes2/kotlin/a/d$a.smali
+++ b/com.discord/smali_classes2/kotlin/a/d$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/d$a;
 .super Ljava/lang/Object;
+.source "AbstractList.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/a/d$b.smali b/com.discord/smali_classes2/kotlin/a/d$b.smali
index 3f9278351d..654843cb23 100644
--- a/com.discord/smali_classes2/kotlin/a/d$b.smali
+++ b/com.discord/smali_classes2/kotlin/a/d$b.smali
@@ -1,5 +1,6 @@
 .class Lkotlin/a/d$b;
 .super Ljava/lang/Object;
+.source "AbstractList.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali_classes2/kotlin/a/d$c.smali b/com.discord/smali_classes2/kotlin/a/d$c.smali
index 3ecad21afc..f26db15835 100644
--- a/com.discord/smali_classes2/kotlin/a/d$c.smali
+++ b/com.discord/smali_classes2/kotlin/a/d$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/a/d$c;
 .super Lkotlin/a/d$b;
+.source "AbstractList.kt"
 
 # interfaces
 .implements Ljava/util/ListIterator;
diff --git a/com.discord/smali_classes2/kotlin/a/d$d.smali b/com.discord/smali_classes2/kotlin/a/d$d.smali
index 6203a91ca8..64155b1141 100644
--- a/com.discord/smali_classes2/kotlin/a/d$d.smali
+++ b/com.discord/smali_classes2/kotlin/a/d$d.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/a/d$d;
 .super Lkotlin/a/d;
+.source "AbstractList.kt"
 
 # interfaces
 .implements Ljava/util/RandomAccess;
diff --git a/com.discord/smali_classes2/kotlin/a/d.smali b/com.discord/smali_classes2/kotlin/a/d.smali
index 92b89b26af..cdc347b0bd 100644
--- a/com.discord/smali_classes2/kotlin/a/d.smali
+++ b/com.discord/smali_classes2/kotlin/a/d.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/a/d;
 .super Lkotlin/a/a;
+.source "AbstractList.kt"
 
 # interfaces
 .implements Ljava/util/List;
diff --git a/com.discord/smali_classes2/kotlin/a/e.smali b/com.discord/smali_classes2/kotlin/a/e.smali
index 63b4c92177..85164a6221 100644
--- a/com.discord/smali_classes2/kotlin/a/e.smali
+++ b/com.discord/smali_classes2/kotlin/a/e.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/a/e;
 .super Ljava/util/AbstractList;
+.source "AbstractMutableList.kt"
 
 # interfaces
 .implements Ljava/util/List;
diff --git a/com.discord/smali_classes2/kotlin/a/f.smali b/com.discord/smali_classes2/kotlin/a/f.smali
index 42b325a2bb..43464f873c 100644
--- a/com.discord/smali_classes2/kotlin/a/f.smali
+++ b/com.discord/smali_classes2/kotlin/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/f;
 .super Ljava/lang/Object;
+.source "Collections.kt"
 
 # interfaces
 .implements Ljava/util/Collection;
diff --git a/com.discord/smali_classes2/kotlin/a/k$a.smali b/com.discord/smali_classes2/kotlin/a/k$a.smali
index 3555ea4ef8..e32e669ec2 100644
--- a/com.discord/smali_classes2/kotlin/a/k$a.smali
+++ b/com.discord/smali_classes2/kotlin/a/k$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/k$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/a/v$a.smali b/com.discord/smali_classes2/kotlin/a/v$a.smali
index b910c9d1cd..567fccc505 100644
--- a/com.discord/smali_classes2/kotlin/a/v$a.smali
+++ b/com.discord/smali_classes2/kotlin/a/v$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/v$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/a/w.smali b/com.discord/smali_classes2/kotlin/a/w.smali
index 5c92efe24d..3d4cdddd1a 100644
--- a/com.discord/smali_classes2/kotlin/a/w.smali
+++ b/com.discord/smali_classes2/kotlin/a/w.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/w;
 .super Ljava/lang/Object;
+.source "Collections.kt"
 
 # interfaces
 .implements Ljava/util/ListIterator;
diff --git a/com.discord/smali_classes2/kotlin/a/x.smali b/com.discord/smali_classes2/kotlin/a/x.smali
index 89c355ca2e..0233324795 100644
--- a/com.discord/smali_classes2/kotlin/a/x.smali
+++ b/com.discord/smali_classes2/kotlin/a/x.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/x;
 .super Ljava/lang/Object;
+.source "Collections.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/a/y.smali b/com.discord/smali_classes2/kotlin/a/y.smali
index 50984fe2c2..ab353e192f 100644
--- a/com.discord/smali_classes2/kotlin/a/y.smali
+++ b/com.discord/smali_classes2/kotlin/a/y.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/a/y;
 .super Ljava/lang/Object;
+.source "Maps.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/a/z.smali b/com.discord/smali_classes2/kotlin/a/z.smali
index ea00242b56..9c67c9969d 100644
--- a/com.discord/smali_classes2/kotlin/a/z.smali
+++ b/com.discord/smali_classes2/kotlin/a/z.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/a/z;
 .super Ljava/lang/Object;
+.source "Sets.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/b.smali b/com.discord/smali_classes2/kotlin/b.smali
index fb1ebbe3ba..dc57f7e405 100644
--- a/com.discord/smali_classes2/kotlin/b.smali
+++ b/com.discord/smali_classes2/kotlin/b.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/b;
 .super Ljava/lang/Object;
+.source "Exceptions.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/b/b$a.smali b/com.discord/smali_classes2/kotlin/b/b$a.smali
index c26aa34eb6..8719bd0adb 100644
--- a/com.discord/smali_classes2/kotlin/b/b$a.smali
+++ b/com.discord/smali_classes2/kotlin/b/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/b/b$a;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali_classes2/kotlin/b/b$b.smali b/com.discord/smali_classes2/kotlin/b/b$b.smali
index 2bd2ed989b..bd105d63b5 100644
--- a/com.discord/smali_classes2/kotlin/b/b$b.smali
+++ b/com.discord/smali_classes2/kotlin/b/b$b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/b/b$b;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali_classes2/kotlin/b/b.smali b/com.discord/smali_classes2/kotlin/b/b.smali
index 0cadca4782..d92d61138a 100644
--- a/com.discord/smali_classes2/kotlin/b/b.smali
+++ b/com.discord/smali_classes2/kotlin/b/b.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/b/b;
 .super Ljava/lang/Object;
+.source "Comparisons.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/b/c.smali b/com.discord/smali_classes2/kotlin/b/c.smali
index 5220324b7a..aed186a234 100644
--- a/com.discord/smali_classes2/kotlin/b/c.smali
+++ b/com.discord/smali_classes2/kotlin/b/c.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/b/c;
 .super Lkotlin/b/b;
+.source "_ComparisonsJvm.kt"
diff --git a/com.discord/smali_classes2/kotlin/b/d.smali b/com.discord/smali_classes2/kotlin/b/d.smali
index 5e10f33915..e4229e9c0d 100644
--- a/com.discord/smali_classes2/kotlin/b/d.smali
+++ b/com.discord/smali_classes2/kotlin/b/d.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/b/d;
 .super Lkotlin/b/c;
+.source "_Comparisons.kt"
diff --git a/com.discord/smali_classes2/kotlin/c/a.smali b/com.discord/smali_classes2/kotlin/c/a.smali
index c24e388d63..7a84e53cf0 100644
--- a/com.discord/smali_classes2/kotlin/c/a.smali
+++ b/com.discord/smali_classes2/kotlin/c/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/c/a;
 .super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
 
 # interfaces
 .implements Lkotlin/c/e$b;
diff --git a/com.discord/smali_classes2/kotlin/c/a/a.smali b/com.discord/smali_classes2/kotlin/c/a/a.smali
index 3d806c0b99..0df0b54d3b 100644
--- a/com.discord/smali_classes2/kotlin/c/a/a.smali
+++ b/com.discord/smali_classes2/kotlin/c/a/a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lkotlin/c/a/a;
 .super Ljava/lang/Enum;
+.source "Intrinsics.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/a/c$a.smali b/com.discord/smali_classes2/kotlin/c/a/c$a.smali
index 785bc80840..e131f19b8a 100644
--- a/com.discord/smali_classes2/kotlin/c/a/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/a/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/a/c$a;
 .super Lkotlin/c/b/a/g;
+.source "IntrinsicsJvm.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/a/c$b.smali b/com.discord/smali_classes2/kotlin/c/a/c$b.smali
index 45245a60d2..fc8e4d2533 100644
--- a/com.discord/smali_classes2/kotlin/c/a/c$b.smali
+++ b/com.discord/smali_classes2/kotlin/c/a/c$b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/a/c$b;
 .super Lkotlin/c/b/a/c;
+.source "IntrinsicsJvm.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/a/c.smali b/com.discord/smali_classes2/kotlin/c/a/c.smali
index 33559b4253..349f4a87c4 100644
--- a/com.discord/smali_classes2/kotlin/c/a/c.smali
+++ b/com.discord/smali_classes2/kotlin/c/a/c.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/c/a/c;
 .super Ljava/lang/Object;
+.source "IntrinsicsJvm.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/c/a/d.smali b/com.discord/smali_classes2/kotlin/c/a/d.smali
index 0312cae5a2..b7e122c8ff 100644
--- a/com.discord/smali_classes2/kotlin/c/a/d.smali
+++ b/com.discord/smali_classes2/kotlin/c/a/d.smali
@@ -1,2 +1,3 @@
 .class public Lkotlin/c/a/d;
 .super Lkotlin/c/a/c;
+.source "Intrinsics.kt"
diff --git a/com.discord/smali_classes2/kotlin/c/b$a$a.smali b/com.discord/smali_classes2/kotlin/c/b$a$a.smali
index bc32a9c8e9..4dd966a921 100644
--- a/com.discord/smali_classes2/kotlin/c/b$a$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/b$a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/b$a$a;
 .super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/b$a.smali b/com.discord/smali_classes2/kotlin/c/b$a.smali
index acea4511f4..87f40ae824 100644
--- a/com.discord/smali_classes2/kotlin/c/b$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/c/b$a;
 .super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/c/b$b.smali b/com.discord/smali_classes2/kotlin/c/b$b.smali
index 65dde595cc..f94731a74e 100644
--- a/com.discord/smali_classes2/kotlin/c/b$b.smali
+++ b/com.discord/smali_classes2/kotlin/c/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/c/b$b;
 .super Lkotlin/jvm/internal/k;
+.source "CoroutineContextImpl.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali_classes2/kotlin/c/b$c.smali b/com.discord/smali_classes2/kotlin/c/b$c.smali
index 26daced139..231d3d089e 100644
--- a/com.discord/smali_classes2/kotlin/c/b$c.smali
+++ b/com.discord/smali_classes2/kotlin/c/b$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/c/b$c;
 .super Lkotlin/jvm/internal/k;
+.source "CoroutineContextImpl.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali_classes2/kotlin/c/b.smali b/com.discord/smali_classes2/kotlin/c/b.smali
index 9184a9bfd6..dd22c3cabe 100644
--- a/com.discord/smali_classes2/kotlin/c/b.smali
+++ b/com.discord/smali_classes2/kotlin/c/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/b;
 .super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/c/b/a/a.smali b/com.discord/smali_classes2/kotlin/c/b/a/a.smali
index bd13c55e96..f39996b82e 100644
--- a/com.discord/smali_classes2/kotlin/c/b/a/a.smali
+++ b/com.discord/smali_classes2/kotlin/c/b/a/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/c/b/a/a;
 .super Ljava/lang/Object;
+.source "ContinuationImpl.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -169,7 +170,7 @@
     return-object v0
 
     :cond_0
-    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fc()I
+    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fb()I
 
     move-result v1
 
@@ -188,7 +189,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fe()[I
+    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fd()[I
 
     move-result-object v2
 
@@ -197,15 +198,15 @@
     :goto_0
     new-instance v2, Ljava/lang/StackTraceElement;
 
-    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fg()Ljava/lang/String;
+    invoke-interface {v0}, Lkotlin/c/b/a/e;->Ff()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-interface {v0}, Lkotlin/c/b/a/e;->Ff()Ljava/lang/String;
+    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fe()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fd()Ljava/lang/String;
+    invoke-interface {v0}, Lkotlin/c/b/a/e;->Fc()Ljava/lang/String;
 
     move-result-object v0
 
@@ -276,7 +277,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     :try_start_0
@@ -348,10 +349,7 @@
 
     if-eqz v1, :cond_0
 
-    :goto_0
-    check-cast v1, Ljava/io/Serializable;
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
@@ -362,9 +360,9 @@
 
     move-result-object v1
 
-    goto :goto_0
+    :goto_0
+    check-cast v1, Ljava/io/Serializable;
 
-    :goto_1
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
diff --git a/com.discord/smali_classes2/kotlin/c/b/a/b.smali b/com.discord/smali_classes2/kotlin/c/b/a/b.smali
index e0bebdd3e7..ea58076c83 100644
--- a/com.discord/smali_classes2/kotlin/c/b/a/b.smali
+++ b/com.discord/smali_classes2/kotlin/c/b/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/b/a/b;
 .super Ljava/lang/Object;
+.source "ContinuationImpl.kt"
 
 # interfaces
 .implements Lkotlin/c/c;
diff --git a/com.discord/smali_classes2/kotlin/c/b/a/c.smali b/com.discord/smali_classes2/kotlin/c/b/a/c.smali
index 8a1ef698ac..529c1afe40 100644
--- a/com.discord/smali_classes2/kotlin/c/b/a/c.smali
+++ b/com.discord/smali_classes2/kotlin/c/b/a/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/c/b/a/c;
 .super Lkotlin/c/b/a/a;
+.source "ContinuationImpl.kt"
 
 
 # instance fields
@@ -74,7 +75,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     return-object v0
@@ -160,7 +161,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     check-cast v1, Lkotlin/c/d;
diff --git a/com.discord/smali_classes2/kotlin/c/b/a/d.smali b/com.discord/smali_classes2/kotlin/c/b/a/d.smali
index f50401f448..b562cbc11e 100644
--- a/com.discord/smali_classes2/kotlin/c/b/a/d.smali
+++ b/com.discord/smali_classes2/kotlin/c/b/a/d.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lkotlin/c/b/a/d;
 .super Ljava/lang/Object;
+.source "CoroutineStackFrame.kt"
diff --git a/com.discord/smali_classes2/kotlin/c/b/a/f.smali b/com.discord/smali_classes2/kotlin/c/b/a/f.smali
index 851f9008fd..75e4015800 100644
--- a/com.discord/smali_classes2/kotlin/c/b/a/f.smali
+++ b/com.discord/smali_classes2/kotlin/c/b/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/b/a/f;
 .super Ljava/lang/Object;
+.source "DebugMetadata.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/c/b/a/g.smali b/com.discord/smali_classes2/kotlin/c/b/a/g.smali
index 331aa07d37..14960cb7a7 100644
--- a/com.discord/smali_classes2/kotlin/c/b/a/g.smali
+++ b/com.discord/smali_classes2/kotlin/c/b/a/g.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/c/b/a/g;
 .super Lkotlin/c/b/a/a;
+.source "ContinuationImpl.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/c/b/a/h.smali b/com.discord/smali_classes2/kotlin/c/b/a/h.smali
index 92575ce599..ffd5ed38d4 100644
--- a/com.discord/smali_classes2/kotlin/c/b/a/h.smali
+++ b/com.discord/smali_classes2/kotlin/c/b/a/h.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/c/b/a/h;
 .super Lkotlin/c/b/a/c;
+.source "ContinuationImpl.kt"
 
 # interfaces
 .implements Lkotlin/jvm/internal/h;
diff --git a/com.discord/smali_classes2/kotlin/c/c.smali b/com.discord/smali_classes2/kotlin/c/c.smali
index c34d4a61f6..679b8032f6 100644
--- a/com.discord/smali_classes2/kotlin/c/c.smali
+++ b/com.discord/smali_classes2/kotlin/c/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/c/c;
 .super Ljava/lang/Object;
+.source "Continuation.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/d$a.smali b/com.discord/smali_classes2/kotlin/c/d$a.smali
index 0325ea5e11..17cfe5d01b 100644
--- a/com.discord/smali_classes2/kotlin/c/d$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/d$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/d$a;
 .super Ljava/lang/Object;
+.source "ContinuationInterceptor.kt"
 
 # interfaces
 .implements Lkotlin/c/e$c;
diff --git a/com.discord/smali_classes2/kotlin/c/d.smali b/com.discord/smali_classes2/kotlin/c/d.smali
index 2aee89b801..2cc60e88f0 100644
--- a/com.discord/smali_classes2/kotlin/c/d.smali
+++ b/com.discord/smali_classes2/kotlin/c/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/c/d;
 .super Ljava/lang/Object;
+.source "ContinuationInterceptor.kt"
 
 # interfaces
 .implements Lkotlin/c/e$b;
diff --git a/com.discord/smali_classes2/kotlin/c/e$a$a.smali b/com.discord/smali_classes2/kotlin/c/e$a$a.smali
index 2ac0198c7a..033363f863 100644
--- a/com.discord/smali_classes2/kotlin/c/e$a$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/e$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/c/e$a$a;
 .super Lkotlin/jvm/internal/k;
+.source "CoroutineContext.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali_classes2/kotlin/c/e$a.smali b/com.discord/smali_classes2/kotlin/c/e$a.smali
index fd7633a624..f624ef10f9 100644
--- a/com.discord/smali_classes2/kotlin/c/e$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/e$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/e$a;
 .super Ljava/lang/Object;
+.source "CoroutineContext.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/e$b$a.smali b/com.discord/smali_classes2/kotlin/c/e$b$a.smali
index b96f3eebf3..9770e60d5f 100644
--- a/com.discord/smali_classes2/kotlin/c/e$b$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/e$b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/e$b$a;
 .super Ljava/lang/Object;
+.source "CoroutineContext.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/e$b.smali b/com.discord/smali_classes2/kotlin/c/e$b.smali
index 5ebea7c03f..e69c10612c 100644
--- a/com.discord/smali_classes2/kotlin/c/e$b.smali
+++ b/com.discord/smali_classes2/kotlin/c/e$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/c/e$b;
 .super Ljava/lang/Object;
+.source "CoroutineContext.kt"
 
 # interfaces
 .implements Lkotlin/c/e;
diff --git a/com.discord/smali_classes2/kotlin/c/e$c.smali b/com.discord/smali_classes2/kotlin/c/e$c.smali
index ea7caeb502..64b4c5c66c 100644
--- a/com.discord/smali_classes2/kotlin/c/e$c.smali
+++ b/com.discord/smali_classes2/kotlin/c/e$c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/c/e$c;
 .super Ljava/lang/Object;
+.source "CoroutineContext.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/e.smali b/com.discord/smali_classes2/kotlin/c/e.smali
index c10328415a..77169b2353 100644
--- a/com.discord/smali_classes2/kotlin/c/e.smali
+++ b/com.discord/smali_classes2/kotlin/c/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/c/e;
 .super Ljava/lang/Object;
+.source "CoroutineContext.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/c/f.smali b/com.discord/smali_classes2/kotlin/c/f.smali
index 17cb3f1e38..892fd96167 100644
--- a/com.discord/smali_classes2/kotlin/c/f.smali
+++ b/com.discord/smali_classes2/kotlin/c/f.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/c/f;
 .super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/d.smali b/com.discord/smali_classes2/kotlin/d.smali
index b71c98bd74..83d5f0ab49 100644
--- a/com.discord/smali_classes2/kotlin/d.smali
+++ b/com.discord/smali_classes2/kotlin/d.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/d;
 .super Ljava/lang/Object;
+.source "Lazy.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/d/a.smali b/com.discord/smali_classes2/kotlin/d/a.smali
index 1343da58e6..9b71322652 100644
--- a/com.discord/smali_classes2/kotlin/d/a.smali
+++ b/com.discord/smali_classes2/kotlin/d/a.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/d/a;
 .super Ljava/lang/Object;
+.source "PlatformImplementations.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/d/a/a.smali b/com.discord/smali_classes2/kotlin/d/a/a.smali
index 48962eff63..7f51dfd4c8 100644
--- a/com.discord/smali_classes2/kotlin/d/a/a.smali
+++ b/com.discord/smali_classes2/kotlin/d/a/a.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/d/a/a;
 .super Lkotlin/d/a;
+.source "JDK7PlatformImplementations.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/d/b.smali b/com.discord/smali_classes2/kotlin/d/b.smali
index eb487455db..2fd8690dd0 100644
--- a/com.discord/smali_classes2/kotlin/d/b.smali
+++ b/com.discord/smali_classes2/kotlin/d/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/d/b;
 .super Ljava/lang/Object;
+.source "PlatformImplementations.kt"
 
 
 # static fields
@@ -10,7 +11,7 @@
 .method static constructor <clinit>()V
     .locals 7
 
-    invoke-static {}, Lkotlin/d/b;->Fh()I
+    invoke-static {}, Lkotlin/d/b;->Fg()I
 
     move-result v0
 
@@ -38,11 +39,14 @@
     if-eqz v1, :cond_0
 
     :try_start_1
-    move-object v2, v1
+    check-cast v1, Lkotlin/d/a;
 
-    check-cast v2, Lkotlin/d/a;
+    goto/16 :goto_4
 
-    goto/16 :goto_0
+    :catch_0
+    move-exception v2
+
+    goto :goto_0
 
     :cond_0
     new-instance v2, Lkotlin/r;
@@ -56,9 +60,7 @@
     .catch Ljava/lang/ClassCastException; {:try_start_1 .. :try_end_1} :catch_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
 
-    :catch_0
-    move-exception v2
-
+    :goto_0
     :try_start_2
     invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -131,11 +133,14 @@
     if-eqz v1, :cond_1
 
     :try_start_4
-    move-object v2, v1
+    check-cast v1, Lkotlin/d/a;
 
-    check-cast v2, Lkotlin/d/a;
+    goto/16 :goto_4
 
-    goto/16 :goto_0
+    :catch_2
+    move-exception v2
+
+    goto :goto_1
 
     :cond_1
     new-instance v2, Lkotlin/r;
@@ -149,9 +154,7 @@
     .catch Ljava/lang/ClassCastException; {:try_start_4 .. :try_end_4} :catch_2
     .catch Ljava/lang/ClassNotFoundException; {:try_start_4 .. :try_end_4} :catch_3
 
-    :catch_2
-    move-exception v2
-
+    :goto_1
     :try_start_5
     invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -229,11 +232,16 @@
     if-eqz v0, :cond_3
 
     :try_start_7
-    move-object v2, v0
+    move-object v1, v0
 
-    check-cast v2, Lkotlin/d/a;
+    check-cast v1, Lkotlin/d/a;
 
-    goto/16 :goto_0
+    goto/16 :goto_4
+
+    :catch_4
+    move-exception v1
+
+    goto :goto_2
 
     :cond_3
     new-instance v1, Lkotlin/r;
@@ -247,9 +255,7 @@
     .catch Ljava/lang/ClassCastException; {:try_start_7 .. :try_end_7} :catch_4
     .catch Ljava/lang/ClassNotFoundException; {:try_start_7 .. :try_end_7} :catch_5
 
-    :catch_4
-    move-exception v1
-
+    :goto_2
     :try_start_8
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -322,11 +328,16 @@
     if-eqz v0, :cond_4
 
     :try_start_a
-    move-object v2, v0
+    move-object v1, v0
 
-    check-cast v2, Lkotlin/d/a;
+    check-cast v1, Lkotlin/d/a;
 
-    goto :goto_0
+    goto :goto_4
+
+    :catch_6
+    move-exception v1
+
+    goto :goto_3
 
     :cond_4
     new-instance v1, Lkotlin/r;
@@ -340,9 +351,7 @@
     .catch Ljava/lang/ClassCastException; {:try_start_a .. :try_end_a} :catch_6
     .catch Ljava/lang/ClassNotFoundException; {:try_start_a .. :try_end_a} :catch_7
 
-    :catch_6
-    move-exception v1
-
+    :goto_3
     :try_start_b
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -396,17 +405,17 @@
 
     :catch_7
     :cond_5
-    new-instance v2, Lkotlin/d/a;
+    new-instance v1, Lkotlin/d/a;
 
-    invoke-direct {v2}, Lkotlin/d/a;-><init>()V
+    invoke-direct {v1}, Lkotlin/d/a;-><init>()V
 
-    :goto_0
-    sput-object v2, Lkotlin/d/b;->bPX:Lkotlin/d/a;
+    :goto_4
+    sput-object v1, Lkotlin/d/b;->bPX:Lkotlin/d/a;
 
     return-void
 .end method
 
-.method private static final Fh()I
+.method private static final Fg()I
     .locals 9
 
     const-string v0, "java.specification.version"
diff --git a/com.discord/smali_classes2/kotlin/e/a.smali b/com.discord/smali_classes2/kotlin/e/a.smali
index 3a58ab51e0..780c0b2ba7 100644
--- a/com.discord/smali_classes2/kotlin/e/a.smali
+++ b/com.discord/smali_classes2/kotlin/e/a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/e/a;
 .super Ljava/lang/Object;
+.source "Closeable.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/h.smali b/com.discord/smali_classes2/kotlin/h.smali
index fb07802b0c..409ced14cc 100644
--- a/com.discord/smali_classes2/kotlin/h.smali
+++ b/com.discord/smali_classes2/kotlin/h.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/h;
 .super Ljava/lang/Object;
+.source "LazyJVM.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/i.smali b/com.discord/smali_classes2/kotlin/i.smali
index ba4447f524..a4601b292b 100644
--- a/com.discord/smali_classes2/kotlin/i.smali
+++ b/com.discord/smali_classes2/kotlin/i.smali
@@ -1,2 +1,3 @@
 .class Lkotlin/i;
 .super Lkotlin/h;
+.source "Lazy.kt"
diff --git a/com.discord/smali_classes2/kotlin/j.smali b/com.discord/smali_classes2/kotlin/j.smali
index 0b5c95a2a7..43bec0e673 100644
--- a/com.discord/smali_classes2/kotlin/j.smali
+++ b/com.discord/smali_classes2/kotlin/j.smali
@@ -1,5 +1,6 @@
 .class public final enum Lkotlin/j;
 .super Ljava/lang/Enum;
+.source "Lazy.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/jvm/a.smali b/com.discord/smali_classes2/kotlin/jvm/a.smali
index 38e8e602d0..fc956109aa 100644
--- a/com.discord/smali_classes2/kotlin/jvm/a.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/a;
 .super Ljava/lang/Object;
+.source "JvmClassMapping.kt"
 
 
 # direct methods
@@ -23,7 +24,7 @@
 
     check-cast p0, Lkotlin/jvm/internal/d;
 
-    invoke-interface {p0}, Lkotlin/jvm/internal/d;->Fj()Ljava/lang/Class;
+    invoke-interface {p0}, Lkotlin/jvm/internal/d;->Fi()Ljava/lang/Class;
 
     move-result-object p0
 
@@ -61,7 +62,7 @@
 
     check-cast p0, Lkotlin/jvm/internal/d;
 
-    invoke-interface {p0}, Lkotlin/jvm/internal/d;->Fj()Ljava/lang/Class;
+    invoke-interface {p0}, Lkotlin/jvm/internal/d;->Fi()Ljava/lang/Class;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/b.smali b/com.discord/smali_classes2/kotlin/jvm/b.smali
index fa799d7870..7896d5f7f2 100644
--- a/com.discord/smali_classes2/kotlin/jvm/b.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/b;
 .super Ljava/lang/Error;
+.source "KotlinReflectionNotSupportedError.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/Function0.smali b/com.discord/smali_classes2/kotlin/jvm/functions/Function0.smali
index 066794dec4..676fcd9a96 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/Function0.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/Function0.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function0;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/Function3.smali b/com.discord/smali_classes2/kotlin/jvm/functions/Function3.smali
index 94b6d69975..178d7b433d 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/Function3.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/Function3.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function3;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/Function5.smali b/com.discord/smali_classes2/kotlin/jvm/functions/Function5.smali
index 58f96684c7..26017290bf 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/Function5.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/Function5.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function5;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/Function6.smali b/com.discord/smali_classes2/kotlin/jvm/functions/Function6.smali
index 58cc4ede0a..fc2ecfd2fd 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/Function6.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/Function6.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function6;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/Function7.smali b/com.discord/smali_classes2/kotlin/jvm/functions/Function7.smali
index 2053baa56c..816d9e0b18 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/Function7.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/Function7.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function7;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/Function9.smali b/com.discord/smali_classes2/kotlin/jvm/functions/Function9.smali
index 26e606ad6f..3cd84f57ea 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/Function9.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/Function9.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/Function9;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/a.smali b/com.discord/smali_classes2/kotlin/jvm/functions/a.smali
index 1c0c1f2ced..b0a1cbfb73 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/a.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/a;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/b.smali b/com.discord/smali_classes2/kotlin/jvm/functions/b.smali
index c6209e9932..7ffdef81ee 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/b.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/b;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/c.smali b/com.discord/smali_classes2/kotlin/jvm/functions/c.smali
index 2f29ec397e..e8b0639b4a 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/c.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/c.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/c;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/d.smali b/com.discord/smali_classes2/kotlin/jvm/functions/d.smali
index 86ce95e104..d16d737ff7 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/d.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/d;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/e.smali b/com.discord/smali_classes2/kotlin/jvm/functions/e.smali
index 630da6c3ba..41b51b8f48 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/e.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/e;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/f.smali b/com.discord/smali_classes2/kotlin/jvm/functions/f.smali
index 50d744a5df..3f0faf22e3 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/f.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/f;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/g.smali b/com.discord/smali_classes2/kotlin/jvm/functions/g.smali
index 416438b3dc..1d7c2ee8bd 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/g.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/g.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/g;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/h.smali b/com.discord/smali_classes2/kotlin/jvm/functions/h.smali
index 2b0412a166..d5f0bf6acf 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/h.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/h.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/h;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/i.smali b/com.discord/smali_classes2/kotlin/jvm/functions/i.smali
index 95ed4ecbc9..ecc4386102 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/i.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/i.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/i;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/j.smali b/com.discord/smali_classes2/kotlin/jvm/functions/j.smali
index 97e41c1ffe..51932027a1 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/j.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/j.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/j;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/k.smali b/com.discord/smali_classes2/kotlin/jvm/functions/k.smali
index fd91b85d19..fa89f50bb8 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/k.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/k.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/k;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/l.smali b/com.discord/smali_classes2/kotlin/jvm/functions/l.smali
index 2d622a763c..d4c23cccf2 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/l.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/l.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/l;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/m.smali b/com.discord/smali_classes2/kotlin/jvm/functions/m.smali
index 8f7d848765..1b08f9e075 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/m.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/m.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/m;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/n.smali b/com.discord/smali_classes2/kotlin/jvm/functions/n.smali
index a89e6c152f..5b7067577b 100644
--- a/com.discord/smali_classes2/kotlin/jvm/functions/n.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/functions/n.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/functions/n;
 .super Ljava/lang/Object;
+.source "Functions.kt"
 
 # interfaces
 .implements Lkotlin/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/DefaultConstructorMarker.smali b/com.discord/smali_classes2/kotlin/jvm/internal/DefaultConstructorMarker.smali
index 6595184dfc..6c0392d640 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/DefaultConstructorMarker.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/DefaultConstructorMarker.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/DefaultConstructorMarker;
 .super Ljava/lang/Object;
+.source "DefaultConstructorMarker.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$IntRef.smali b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$IntRef.smali
index 7633846ea8..6ab22b0829 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$IntRef.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$IntRef.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/Ref$IntRef;
 .super Ljava/lang/Object;
+.source "Ref.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$LongRef.smali b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$LongRef.smali
index 3a4a360c53..725bf19270 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$LongRef.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$LongRef.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/Ref$LongRef;
 .super Ljava/lang/Object;
+.source "Ref.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$ObjectRef.smali b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$ObjectRef.smali
index b8348ac6e8..7cce0fc08d 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$ObjectRef.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$ObjectRef.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/Ref$ObjectRef;
 .super Ljava/lang/Object;
+.source "Ref.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali b/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
index 4b1b88c807..189ec7329f 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/Ref;
 .super Ljava/lang/Object;
+.source "Ref.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/a.smali b/com.discord/smali_classes2/kotlin/jvm/internal/a.smali
index 5a793ce085..39da508845 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/a.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/jvm/internal/a;
 .super Ljava/lang/Object;
+.source "ArrayIterator.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/a/b.smali b/com.discord/smali_classes2/kotlin/jvm/internal/a/b.smali
index cf78785126..63c2aee650 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/a/b.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/a/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/internal/a/b;
 .super Ljava/lang/Object;
+.source "KMarkers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/internal/a/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/a/g.smali b/com.discord/smali_classes2/kotlin/jvm/internal/a/g.smali
index e96f226757..62416fa506 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/a/g.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/a/g.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/jvm/internal/a/g;
 .super Ljava/lang/Object;
+.source "KMarkers.kt"
 
 # interfaces
 .implements Lkotlin/jvm/internal/a/a;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/b.smali b/com.discord/smali_classes2/kotlin/jvm/internal/b.smali
index 8b6f1a65b2..626f9fab40 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/b.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/b;
 .super Ljava/lang/Object;
+.source "ArrayIterator.kt"
 
 
 # direct methods
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 c9894bf2d0..339972b1fe 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/jvm/internal/c$a;
 .super Ljava/lang/Object;
+.source "CallableReference.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -41,7 +42,7 @@
     return-void
 .end method
 
-.method static synthetic Fi()Lkotlin/jvm/internal/c$a;
+.method static synthetic Fh()Lkotlin/jvm/internal/c$a;
     .locals 1
 
     sget-object v0, Lkotlin/jvm/internal/c$a;->bPY:Lkotlin/jvm/internal/c$a;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/d.smali b/com.discord/smali_classes2/kotlin/jvm/internal/d.smali
index ef0f4fa5f0..19114976e3 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/d.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/d.smali
@@ -1,12 +1,13 @@
 .class public interface abstract Lkotlin/jvm/internal/d;
 .super Ljava/lang/Object;
+.source "ClassBasedDeclarationContainer.kt"
 
 # interfaces
 .implements Lkotlin/reflect/KDeclarationContainer;
 
 
 # virtual methods
-.method public abstract Fj()Ljava/lang/Class;
+.method public abstract Fi()Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/e.smali b/com.discord/smali_classes2/kotlin/jvm/internal/e.smali
index e838b5f9d4..b49222b418 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/e.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/e.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/e;
 .super Ljava/lang/Object;
+.source "ClassReference.kt"
 
 # interfaces
 .implements Lkotlin/jvm/internal/d;
@@ -53,7 +54,7 @@
 
 
 # virtual methods
-.method public final Fj()Ljava/lang/Class;
+.method public final Fi()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/f.smali b/com.discord/smali_classes2/kotlin/jvm/internal/f.smali
index c00f939367..cdc00397a5 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/f.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/f.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/f;
 .super Ljava/lang/Object;
+.source "CollectionToArray.kt"
 
 
 # static fields
@@ -160,7 +161,9 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_2
+    move v2, v3
+
+    goto :goto_0
 
     :cond_8
     invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
@@ -187,7 +190,6 @@
     return-object p0
 
     :cond_a
-    :goto_2
     move v2, v3
 
     goto :goto_0
@@ -209,6 +211,8 @@
     check-cast p0, Ljava/lang/Throwable;
 
     throw p0
+
+    return-void
 .end method
 
 .method public static final l(Ljava/util/Collection;)[Ljava/lang/Object;
@@ -313,7 +317,9 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_2
+    move v1, v2
+
+    goto :goto_0
 
     :cond_5
     invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
@@ -333,7 +339,6 @@
     return-object p0
 
     :cond_6
-    :goto_2
     move v1, v2
 
     goto :goto_0
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/g.smali b/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
index 87800abb74..ae90db361b 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/g;
 .super Ljava/lang/Object;
+.source "PrimitiveCompanionObjects.kt"
 
 
 # static fields
@@ -62,7 +63,7 @@
     return-void
 .end method
 
-.method public static Fk()D
+.method public static Fj()D
     .locals 2
 
     sget-wide v0, Lkotlin/jvm/internal/g;->NaN:D
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/l.smali b/com.discord/smali_classes2/kotlin/jvm/internal/l.smali
index efdad19f2d..284ad07d82 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/l.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/l.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/jvm/internal/l;
 .super Lkotlin/jvm/internal/p;
+.source "MutablePropertyReference.java"
 
 # interfaces
 .implements Lkotlin/reflect/c;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/m.smali b/com.discord/smali_classes2/kotlin/jvm/internal/m.smali
index 02f1b322e5..474a28d84a 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/m.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/m.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/jvm/internal/m;
 .super Lkotlin/jvm/internal/l;
+.source "MutablePropertyReference1.java"
 
 # interfaces
 .implements Lkotlin/reflect/d;
@@ -16,16 +17,16 @@
 
 
 # virtual methods
-.method public final Fp()Lkotlin/reflect/f$a;
+.method public final Fo()Lkotlin/reflect/f$a;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/m;->Fq()Lkotlin/reflect/KProperty;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/m;->Fp()Lkotlin/reflect/KProperty;
 
     move-result-object v0
 
     check-cast v0, Lkotlin/reflect/d;
 
-    invoke-interface {v0}, Lkotlin/reflect/d;->Fp()Lkotlin/reflect/f$a;
+    invoke-interface {v0}, Lkotlin/reflect/d;->Fo()Lkotlin/reflect/f$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/n.smali b/com.discord/smali_classes2/kotlin/jvm/internal/n.smali
index 30c5752cf6..7b4aee0d40 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/n.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/n.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/n;
 .super Lkotlin/jvm/internal/m;
+.source "MutablePropertyReference1Impl.java"
 
 
 # instance fields
@@ -30,7 +31,7 @@
 .method public final get(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/n;->Fp()Lkotlin/reflect/f$a;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/n;->Fo()Lkotlin/reflect/f$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/o.smali b/com.discord/smali_classes2/kotlin/jvm/internal/o.smali
index 44c524152d..220ce24f1e 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/o.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/o.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/o;
 .super Ljava/lang/Object;
+.source "PackageReference.kt"
 
 # interfaces
 .implements Lkotlin/jvm/internal/d;
@@ -50,7 +51,7 @@
 
 
 # virtual methods
-.method public final Fj()Ljava/lang/Class;
+.method public final Fi()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/p.smali b/com.discord/smali_classes2/kotlin/jvm/internal/p.smali
index 44e5764345..5ef6842357 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/p.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/p.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/jvm/internal/p;
 .super Lkotlin/jvm/internal/c;
+.source "PropertyReference.java"
 
 # interfaces
 .implements Lkotlin/reflect/KProperty;
@@ -16,7 +17,7 @@
 
 
 # virtual methods
-.method protected final Fq()Lkotlin/reflect/KProperty;
+.method protected final Fp()Lkotlin/reflect/KProperty;
     .locals 1
 
     invoke-super {p0}, Lkotlin/jvm/internal/c;->getReflected()Lkotlin/reflect/KCallable;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/q.smali b/com.discord/smali_classes2/kotlin/jvm/internal/q.smali
index ba4a9b328b..b14b880137 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/q.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/q.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/jvm/internal/q;
 .super Lkotlin/jvm/internal/p;
+.source "PropertyReference0.java"
 
 # interfaces
 .implements Lkotlin/reflect/e;
@@ -16,16 +17,16 @@
 
 
 # virtual methods
-.method public final Fr()Lkotlin/reflect/e$a;
+.method public final Fq()Lkotlin/reflect/e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/q;->Fq()Lkotlin/reflect/KProperty;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/q;->Fp()Lkotlin/reflect/KProperty;
 
     move-result-object v0
 
     check-cast v0, Lkotlin/reflect/e;
 
-    invoke-interface {v0}, Lkotlin/reflect/e;->Fr()Lkotlin/reflect/e$a;
+    invoke-interface {v0}, Lkotlin/reflect/e;->Fq()Lkotlin/reflect/e$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/r.smali b/com.discord/smali_classes2/kotlin/jvm/internal/r.smali
index 435c32073b..f66b5b8b15 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/r.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/r.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/r;
 .super Lkotlin/jvm/internal/q;
+.source "PropertyReference0Impl.java"
 
 
 # instance fields
@@ -30,7 +31,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 2
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/r;->Fr()Lkotlin/reflect/e$a;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/r;->Fq()Lkotlin/reflect/e$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/s.smali b/com.discord/smali_classes2/kotlin/jvm/internal/s.smali
index 9fa0213db5..d5250836b1 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/s.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/s.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/jvm/internal/s;
 .super Lkotlin/jvm/internal/p;
+.source "PropertyReference1.java"
 
 # interfaces
 .implements Lkotlin/reflect/f;
@@ -16,16 +17,16 @@
 
 
 # virtual methods
-.method public final Fp()Lkotlin/reflect/f$a;
+.method public final Fo()Lkotlin/reflect/f$a;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/s;->Fq()Lkotlin/reflect/KProperty;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/s;->Fp()Lkotlin/reflect/KProperty;
 
     move-result-object v0
 
     check-cast v0, Lkotlin/reflect/f;
 
-    invoke-interface {v0}, Lkotlin/reflect/f;->Fp()Lkotlin/reflect/f$a;
+    invoke-interface {v0}, Lkotlin/reflect/f;->Fo()Lkotlin/reflect/f$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/t.smali b/com.discord/smali_classes2/kotlin/jvm/internal/t.smali
index 0c51e52eff..a20a1f4910 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/t.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/t.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/t;
 .super Lkotlin/jvm/internal/s;
+.source "PropertyReference1Impl.java"
 
 
 # instance fields
@@ -30,7 +31,7 @@
 .method public final get(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/t;->Fp()Lkotlin/reflect/f$a;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/t;->Fo()Lkotlin/reflect/f$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/u.smali b/com.discord/smali_classes2/kotlin/jvm/internal/u.smali
index d3a858a965..1c64ae5496 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/u.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/u.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/u;
 .super Ljava/lang/Object;
+.source "Reflection.java"
 
 
 # static fields
@@ -27,9 +28,9 @@
 
     check-cast v1, Lkotlin/jvm/internal/v;
     :try_end_0
-    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
 
     move-object v0, v1
@@ -39,6 +40,21 @@
     :catch_0
     nop
 
+    goto :goto_0
+
+    :catch_1
+    nop
+
+    goto :goto_0
+
+    :catch_2
+    nop
+
+    goto :goto_0
+
+    :catch_3
+    nop
+
     :goto_0
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/v.smali b/com.discord/smali_classes2/kotlin/jvm/internal/v.smali
index 11c8eddb8e..9a1aff9f2e 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/v.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/v.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/v;
 .super Ljava/lang/Object;
+.source "ReflectionFactory.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/w.smali b/com.discord/smali_classes2/kotlin/jvm/internal/w.smali
index 85dc6907b7..1118644b03 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/w.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/w.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/w;
 .super Ljava/lang/Object;
+.source "SpreadBuilder.java"
 
 
 # instance fields
@@ -61,9 +62,7 @@
 
     iget-object v0, p0, Lkotlin/jvm/internal/w;->bQf:Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lkotlin/jvm/internal/w;->bQf:Ljava/util/ArrayList;
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
@@ -115,6 +114,8 @@
     invoke-direct {v0, p1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final toArray([Ljava/lang/Object;)[Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/x.smali b/com.discord/smali_classes2/kotlin/jvm/internal/x.smali
index 2be16b9aa7..9e3dcde98a 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/x.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/x.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/jvm/internal/x;
 .super Ljava/lang/Object;
+.source "PrimitiveCompanionObjects.kt"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/y.smali b/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
index eacb1e9557..e6b894af20 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
@@ -1,5 +1,6 @@
 .class public Lkotlin/jvm/internal/y;
 .super Ljava/lang/Object;
+.source "TypeIntrinsics.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/k.smali b/com.discord/smali_classes2/kotlin/k.smali
index 7d027d1616..b300c08323 100644
--- a/com.discord/smali_classes2/kotlin/k.smali
+++ b/com.discord/smali_classes2/kotlin/k.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/k;
 .super Ljava/lang/RuntimeException;
+.source "NoWhenBranchMatchedException.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/l.smali b/com.discord/smali_classes2/kotlin/l.smali
index 00645317f0..6c1ec645eb 100644
--- a/com.discord/smali_classes2/kotlin/l.smali
+++ b/com.discord/smali_classes2/kotlin/l.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/l;
 .super Ljava/lang/Error;
+.source "Standard.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/m$a.smali b/com.discord/smali_classes2/kotlin/m$a.smali
index f7b749f6a9..e2f22992c1 100644
--- a/com.discord/smali_classes2/kotlin/m$a.smali
+++ b/com.discord/smali_classes2/kotlin/m$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/m$a;
 .super Ljava/lang/Object;
+.source "Result.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/m$b.smali b/com.discord/smali_classes2/kotlin/m$b.smali
index 442fe95992..53ab132541 100644
--- a/com.discord/smali_classes2/kotlin/m$b.smali
+++ b/com.discord/smali_classes2/kotlin/m$b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/m$b;
 .super Ljava/lang/Object;
+.source "Result.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/m.smali b/com.discord/smali_classes2/kotlin/m.smali
index e38891fdaf..471ba784c5 100644
--- a/com.discord/smali_classes2/kotlin/m.smali
+++ b/com.discord/smali_classes2/kotlin/m.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/m;
 .super Ljava/lang/Object;
+.source "Result.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/n.smali b/com.discord/smali_classes2/kotlin/n.smali
index 58ef5af2d7..3190d6e520 100644
--- a/com.discord/smali_classes2/kotlin/n.smali
+++ b/com.discord/smali_classes2/kotlin/n.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/n;
 .super Ljava/lang/Object;
+.source "Result.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/o$a.smali b/com.discord/smali_classes2/kotlin/o$a.smali
index 7dacc989e3..1b9657768e 100644
--- a/com.discord/smali_classes2/kotlin/o$a.smali
+++ b/com.discord/smali_classes2/kotlin/o$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/o$a;
 .super Ljava/lang/Object;
+.source "LazyJVM.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/o.smali b/com.discord/smali_classes2/kotlin/o.smali
index 41e7a4b52e..1413719245 100644
--- a/com.discord/smali_classes2/kotlin/o.smali
+++ b/com.discord/smali_classes2/kotlin/o.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/o;
 .super Ljava/lang/Object;
+.source "LazyJVM.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/p.smali b/com.discord/smali_classes2/kotlin/p.smali
index 363bd717a0..c26be8d7c1 100644
--- a/com.discord/smali_classes2/kotlin/p.smali
+++ b/com.discord/smali_classes2/kotlin/p.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/p;
 .super Ljava/lang/Object;
+.source "LazyJVM.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -126,7 +127,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-interface {v1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali b/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali
index 9c4f28f76d..224f6c0c18 100644
--- a/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali
+++ b/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/properties/ReadOnlyProperty;
 .super Ljava/lang/Object;
+.source "Interfaces.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali b/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali
index 31a72374a6..d158785593 100644
--- a/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali
+++ b/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/properties/ReadWriteProperty;
 .super Ljava/lang/Object;
+.source "Interfaces.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/properties/a.smali b/com.discord/smali_classes2/kotlin/properties/a.smali
index 72cc7e9039..9c96b8337a 100644
--- a/com.discord/smali_classes2/kotlin/properties/a.smali
+++ b/com.discord/smali_classes2/kotlin/properties/a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/properties/a;
 .super Ljava/lang/Object;
+.source "Delegates.kt"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/kotlin/properties/b.smali b/com.discord/smali_classes2/kotlin/properties/b.smali
index 895045cf68..818b693e06 100644
--- a/com.discord/smali_classes2/kotlin/properties/b.smali
+++ b/com.discord/smali_classes2/kotlin/properties/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlin/properties/b;
 .super Ljava/lang/Object;
+.source "ObservableProperty.kt"
 
 # interfaces
 .implements Lkotlin/properties/ReadWriteProperty;
diff --git a/com.discord/smali_classes2/kotlin/q.smali b/com.discord/smali_classes2/kotlin/q.smali
index 70f997c70f..fedb750425 100644
--- a/com.discord/smali_classes2/kotlin/q.smali
+++ b/com.discord/smali_classes2/kotlin/q.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/q;
 .super Ljava/lang/Object;
+.source "Tuples.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/r.smali b/com.discord/smali_classes2/kotlin/r.smali
index bdb76ebddc..d69211db17 100644
--- a/com.discord/smali_classes2/kotlin/r.smali
+++ b/com.discord/smali_classes2/kotlin/r.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/r;
 .super Ljava/lang/ClassCastException;
+.source "TypeCastException.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/reflect/KDeclarationContainer.smali b/com.discord/smali_classes2/kotlin/reflect/KDeclarationContainer.smali
index 0346e4fc21..e307f46097 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KDeclarationContainer.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KDeclarationContainer.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lkotlin/reflect/KDeclarationContainer;
 .super Ljava/lang/Object;
+.source "KDeclarationContainer.kt"
diff --git a/com.discord/smali_classes2/kotlin/reflect/KProperty.smali b/com.discord/smali_classes2/kotlin/reflect/KProperty.smali
index 408f42de6b..2c174790f4 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KProperty.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KProperty.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/KProperty;
 .super Ljava/lang/Object;
+.source "KProperty.kt"
 
 # interfaces
 .implements Lkotlin/reflect/KCallable;
diff --git a/com.discord/smali_classes2/kotlin/reflect/KType.smali b/com.discord/smali_classes2/kotlin/reflect/KType.smali
index fe1217ba33..9efad1723f 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KType.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KType.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/KType;
 .super Ljava/lang/Object;
+.source "KType.kt"
 
 # interfaces
 .implements Lkotlin/reflect/a;
diff --git a/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali b/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali
index d7ff3a18b1..89c6af80a7 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali
@@ -1,5 +1,6 @@
 .class public final enum Lkotlin/reflect/KVisibility;
 .super Ljava/lang/Enum;
+.source "KVisibility.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/reflect/b.smali b/com.discord/smali_classes2/kotlin/reflect/b.smali
index 83538e5843..039eebb9be 100644
--- a/com.discord/smali_classes2/kotlin/reflect/b.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/b;
 .super Ljava/lang/Object;
+.source "KClass.kt"
 
 # interfaces
 .implements Lkotlin/reflect/KDeclarationContainer;
diff --git a/com.discord/smali_classes2/kotlin/reflect/d.smali b/com.discord/smali_classes2/kotlin/reflect/d.smali
index 4a4cfa18bf..5483548dde 100644
--- a/com.discord/smali_classes2/kotlin/reflect/d.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/d;
 .super Ljava/lang/Object;
+.source "KProperty.kt"
 
 # interfaces
 .implements Lkotlin/reflect/c;
diff --git a/com.discord/smali_classes2/kotlin/reflect/e$a.smali b/com.discord/smali_classes2/kotlin/reflect/e$a.smali
index 6ae1b4dd45..e5aa7941c4 100644
--- a/com.discord/smali_classes2/kotlin/reflect/e$a.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/e$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/e$a;
 .super Ljava/lang/Object;
+.source "KProperty.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali_classes2/kotlin/reflect/e.smali b/com.discord/smali_classes2/kotlin/reflect/e.smali
index 16105c7b2d..ba007b5a7d 100644
--- a/com.discord/smali_classes2/kotlin/reflect/e.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/e;
 .super Ljava/lang/Object;
+.source "KProperty.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -28,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract Fr()Lkotlin/reflect/e$a;
+.method public abstract Fq()Lkotlin/reflect/e$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/kotlin/reflect/f$a.smali b/com.discord/smali_classes2/kotlin/reflect/f$a.smali
index 744d9651ec..4a6650ec5a 100644
--- a/com.discord/smali_classes2/kotlin/reflect/f$a.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/f$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/f$a;
 .super Ljava/lang/Object;
+.source "KProperty.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlin/reflect/f.smali b/com.discord/smali_classes2/kotlin/reflect/f.smali
index 54fcce7cc1..270c4346fc 100644
--- a/com.discord/smali_classes2/kotlin/reflect/f.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/reflect/f;
 .super Ljava/lang/Object;
+.source "KProperty.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -30,7 +31,7 @@
 
 
 # virtual methods
-.method public abstract Fp()Lkotlin/reflect/f$a;
+.method public abstract Fo()Lkotlin/reflect/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/kotlin/s.smali b/com.discord/smali_classes2/kotlin/s.smali
index 80e77553f6..296d338309 100644
--- a/com.discord/smali_classes2/kotlin/s.smali
+++ b/com.discord/smali_classes2/kotlin/s.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/s;
 .super Ljava/lang/Object;
+.source "Lazy.kt"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/kotlin/sequences/a.smali b/com.discord/smali_classes2/kotlin/sequences/a.smali
index eaa772f425..4d2d24ff76 100644
--- a/com.discord/smali_classes2/kotlin/sequences/a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/sequences/a;
 .super Lkotlin/a/b;
+.source "Sequences.kt"
 
 
 # annotations
@@ -83,7 +84,7 @@
 
 
 # virtual methods
-.method public final EY()V
+.method public final EX()V
     .locals 3
 
     :cond_0
@@ -119,7 +120,6 @@
 
     sget v0, Lkotlin/a/an;->bPF:I
 
-    :goto_0
     iput v0, p0, Lkotlin/a/b;->bPp:I
 
     return-void
@@ -127,5 +127,7 @@
     :cond_1
     sget v0, Lkotlin/a/an;->bPH:I
 
-    goto :goto_0
+    iput v0, p0, Lkotlin/a/b;->bPp:I
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/b.smali b/com.discord/smali_classes2/kotlin/sequences/b.smali
index 1ef41fa3f7..03ed065924 100644
--- a/com.discord/smali_classes2/kotlin/sequences/b.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/b;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/c$a.smali b/com.discord/smali_classes2/kotlin/sequences/c$a.smali
index de5e1fbc9f..e4e34a2047 100644
--- a/com.discord/smali_classes2/kotlin/sequences/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/c$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali_classes2/kotlin/sequences/c.smali b/com.discord/smali_classes2/kotlin/sequences/c.smali
index 38b9c3376e..a350ea9ef0 100644
--- a/com.discord/smali_classes2/kotlin/sequences/c.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/c.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/c;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
@@ -175,9 +176,9 @@
 
     iget v0, p0, Lkotlin/sequences/c;->count:I
 
-    add-int/2addr v0, p1
+    add-int v1, v0, p1
 
-    if-gez v0, :cond_0
+    if-gez v1, :cond_0
 
     new-instance v0, Lkotlin/sequences/p;
 
@@ -194,11 +195,9 @@
     :cond_0
     new-instance p1, Lkotlin/sequences/o;
 
-    iget-object v1, p0, Lkotlin/sequences/c;->bQz:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/c;->bQz:Lkotlin/sequences/Sequence;
 
-    iget v2, p0, Lkotlin/sequences/c;->count:I
-
-    invoke-direct {p1, v1, v2, v0}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
+    invoke-direct {p1, v2, v0, v1}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
     check-cast p1, Lkotlin/sequences/Sequence;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/d.smali b/com.discord/smali_classes2/kotlin/sequences/d.smali
index b6d146b86d..a788b8f898 100644
--- a/com.discord/smali_classes2/kotlin/sequences/d.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/sequences/d;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/e.smali b/com.discord/smali_classes2/kotlin/sequences/e.smali
index 9d069d6122..aa35c5bd4d 100644
--- a/com.discord/smali_classes2/kotlin/sequences/e.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/e.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/e;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/f$a.smali b/com.discord/smali_classes2/kotlin/sequences/f$a.smali
index 58b9b94edb..1dc0f115a6 100644
--- a/com.discord/smali_classes2/kotlin/sequences/f$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/f$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/f$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -79,7 +80,7 @@
     return-void
 .end method
 
-.method private final Ft()V
+.method private final Fs()V
     .locals 3
 
     :cond_0
@@ -125,7 +126,6 @@
 
     const/4 v0, 0x1
 
-    :goto_0
     iput v0, p0, Lkotlin/sequences/f$a;->bQE:I
 
     return-void
@@ -133,7 +133,9 @@
     :cond_1
     const/4 v0, 0x0
 
-    goto :goto_0
+    iput v0, p0, Lkotlin/sequences/f$a;->bQE:I
+
+    return-void
 .end method
 
 
@@ -147,7 +149,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->Ft()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->Fs()V
 
     :cond_0
     iget v0, p0, Lkotlin/sequences/f$a;->bQE:I
@@ -178,7 +180,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->Ft()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->Fs()V
 
     :cond_0
     iget v0, p0, Lkotlin/sequences/f$a;->bQE:I
diff --git a/com.discord/smali_classes2/kotlin/sequences/f.smali b/com.discord/smali_classes2/kotlin/sequences/f.smali
index 250001653f..358c2a1d4a 100644
--- a/com.discord/smali_classes2/kotlin/sequences/f.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/f.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/f;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/g$a.smali b/com.discord/smali_classes2/kotlin/sequences/g$a.smali
index 7b68deece8..549389129e 100644
--- a/com.discord/smali_classes2/kotlin/sequences/g$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/g$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/g$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -74,7 +75,7 @@
     return-void
 .end method
 
-.method private final Fu()Z
+.method private final Ft()Z
     .locals 4
 
     iget-object v0, p0, Lkotlin/sequences/g$a;->bQJ:Ljava/util/Iterator;
@@ -147,6 +148,8 @@
 
     iput-object v0, p0, Lkotlin/sequences/g$a;->bQJ:Ljava/util/Iterator;
 
+    return v1
+
     :cond_2
     return v1
 .end method
@@ -156,7 +159,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    invoke-direct {p0}, Lkotlin/sequences/g$a;->Fu()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Ft()Z
 
     move-result v0
 
@@ -171,7 +174,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/g$a;->Fu()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Ft()Z
 
     move-result v0
 
@@ -181,7 +184,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/kotlin/sequences/g.smali b/com.discord/smali_classes2/kotlin/sequences/g.smali
index 5ecc49381c..95ddfcc0e5 100644
--- a/com.discord/smali_classes2/kotlin/sequences/g.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/g.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/g;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/h$a.smali b/com.discord/smali_classes2/kotlin/sequences/h$a.smali
index 21de276082..d7109891b4 100644
--- a/com.discord/smali_classes2/kotlin/sequences/h$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/h$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/h$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -60,7 +61,7 @@
     return-void
 .end method
 
-.method private final Ft()V
+.method private final Fs()V
     .locals 2
 
     iget v0, p0, Lkotlin/sequences/h$a;->bQE:I
@@ -92,7 +93,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -128,7 +129,7 @@
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->Ft()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->Fs()V
 
     :cond_0
     iget v0, p0, Lkotlin/sequences/h$a;->bQE:I
@@ -157,7 +158,7 @@
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->Ft()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->Fs()V
 
     :cond_0
     iget v0, p0, Lkotlin/sequences/h$a;->bQE:I
diff --git a/com.discord/smali_classes2/kotlin/sequences/h.smali b/com.discord/smali_classes2/kotlin/sequences/h.smali
index f2c8f6c397..290e39f7f9 100644
--- a/com.discord/smali_classes2/kotlin/sequences/h.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/h.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/sequences/h;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/l$a.smali b/com.discord/smali_classes2/kotlin/sequences/l$a.smali
index 060c0ee377..58a7bbccdd 100644
--- a/com.discord/smali_classes2/kotlin/sequences/l$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/l$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/sequences/l$a;
 .super Lkotlin/jvm/internal/k;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlin/sequences/l$b.smali b/com.discord/smali_classes2/kotlin/sequences/l$b.smali
index 671f01d28e..7efa74b266 100644
--- a/com.discord/smali_classes2/kotlin/sequences/l$b.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/l$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/sequences/l$b;
 .super Lkotlin/jvm/internal/k;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlin/sequences/l$c.smali b/com.discord/smali_classes2/kotlin/sequences/l$c.smali
index 948d115922..c2810f9bc4 100644
--- a/com.discord/smali_classes2/kotlin/sequences/l$c.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/l$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/sequences/l$c;
 .super Lkotlin/jvm/internal/k;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$a.smali b/com.discord/smali_classes2/kotlin/sequences/n$a.smali
index 08b51ee85e..7f0f25d949 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/n$a;
 .super Ljava/lang/Object;
+.source "Iterables.kt"
 
 # interfaces
 .implements Ljava/lang/Iterable;
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$b.smali b/com.discord/smali_classes2/kotlin/sequences/n$b.smali
index ad028be1f8..8b972284f6 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$b.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/sequences/n$b;
 .super Lkotlin/jvm/internal/k;
+.source "_Sequences.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$c.smali b/com.discord/smali_classes2/kotlin/sequences/n$c.smali
index 404a934ece..08ec659564 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$c.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/sequences/n$c;
 .super Lkotlin/jvm/internal/k;
+.source "_Sequences.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$d.smali b/com.discord/smali_classes2/kotlin/sequences/n$d.smali
index f38d8d65db..a2fa67829e 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$d.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$d.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/n$d;
 .super Ljava/lang/Object;
+.source "_Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$e.smali b/com.discord/smali_classes2/kotlin/sequences/n$e.smali
index da7147b05b..7ea700ec33 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$e.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$e.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/n$e;
 .super Ljava/lang/Object;
+.source "_Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/o$a.smali b/com.discord/smali_classes2/kotlin/sequences/o$a.smali
index 603d6c8348..3f83de9f55 100644
--- a/com.discord/smali_classes2/kotlin/sequences/o$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/o$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/o$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali_classes2/kotlin/sequences/o.smali b/com.discord/smali_classes2/kotlin/sequences/o.smali
index 3848dd74b5..735cedd4f7 100644
--- a/com.discord/smali_classes2/kotlin/sequences/o.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/o.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/o;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
@@ -61,9 +62,9 @@
 
     iget p1, p0, Lkotlin/sequences/o;->startIndex:I
 
-    const/4 p2, 0x0
+    const/4 p2, 0x1
 
-    const/4 p3, 0x1
+    const/4 p3, 0x0
 
     if-ltz p1, :cond_0
 
@@ -97,9 +98,12 @@
 
     if-lt p1, v0, :cond_2
 
-    const/4 p2, 0x1
+    goto :goto_2
 
     :cond_2
+    const/4 p2, 0x0
+
+    :goto_2
     if-eqz p2, :cond_3
 
     return-void
@@ -252,7 +256,6 @@
 
     sget-object p1, Lkotlin/sequences/e;->bQB:Lkotlin/sequences/e;
 
-    :goto_0
     check-cast p1, Lkotlin/sequences/Sequence;
 
     return-object p1
@@ -270,11 +273,13 @@
 
     invoke-direct {p1, v1, v2, v0}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
-    goto :goto_0
+    check-cast p1, Lkotlin/sequences/Sequence;
+
+    return-object p1
 .end method
 
 .method public final eW(I)Lkotlin/sequences/Sequence;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I)",
@@ -302,11 +307,9 @@
 
     iget v2, p0, Lkotlin/sequences/o;->startIndex:I
 
-    iget v3, p0, Lkotlin/sequences/o;->startIndex:I
+    add-int/2addr p1, v2
 
-    add-int/2addr v3, p1
-
-    invoke-direct {v0, v1, v2, v3}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
+    invoke-direct {v0, v1, v2, p1}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
     check-cast v0, Lkotlin/sequences/Sequence;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/p$a.smali b/com.discord/smali_classes2/kotlin/sequences/p$a.smali
index c9c1f50201..9f8eb8717a 100644
--- a/com.discord/smali_classes2/kotlin/sequences/p$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/p$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/p$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -112,8 +113,6 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lkotlin/sequences/p$a;->left:I
-
     add-int/lit8 v0, v0, -0x1
 
     iput v0, p0, Lkotlin/sequences/p$a;->left:I
diff --git a/com.discord/smali_classes2/kotlin/sequences/p.smali b/com.discord/smali_classes2/kotlin/sequences/p.smali
index ea1382b702..a9fb1fee4e 100644
--- a/com.discord/smali_classes2/kotlin/sequences/p.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/p.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/p;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
@@ -139,21 +140,20 @@
 
     sget-object p1, Lkotlin/sequences/e;->bQB:Lkotlin/sequences/e;
 
-    :goto_0
     check-cast p1, Lkotlin/sequences/Sequence;
 
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/sequences/o;
+    new-instance v1, Lkotlin/sequences/o;
 
-    iget-object v1, p0, Lkotlin/sequences/p;->bQz:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/p;->bQz:Lkotlin/sequences/Sequence;
 
-    iget v2, p0, Lkotlin/sequences/p;->count:I
+    invoke-direct {v1, v2, v0, p1}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
-    invoke-direct {p1, v1, v0, v2}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
+    check-cast v1, Lkotlin/sequences/Sequence;
 
-    goto :goto_0
+    return-object v1
 .end method
 
 .method public final eW(I)Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/sequences/q$a.smali b/com.discord/smali_classes2/kotlin/sequences/q$a.smali
index cc31f51b21..01838dfc98 100644
--- a/com.discord/smali_classes2/kotlin/sequences/q$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/q$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/q$a;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
diff --git a/com.discord/smali_classes2/kotlin/sequences/q.smali b/com.discord/smali_classes2/kotlin/sequences/q.smali
index ce060b0e4c..271fc40b10 100644
--- a/com.discord/smali_classes2/kotlin/sequences/q.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/q.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/sequences/q;
 .super Ljava/lang/Object;
+.source "Sequences.kt"
 
 # interfaces
 .implements Lkotlin/sequences/Sequence;
diff --git a/com.discord/smali_classes2/kotlin/text/MatchResult.smali b/com.discord/smali_classes2/kotlin/text/MatchResult.smali
index e7a2d19f3a..d235962970 100644
--- a/com.discord/smali_classes2/kotlin/text/MatchResult.smali
+++ b/com.discord/smali_classes2/kotlin/text/MatchResult.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lkotlin/text/MatchResult;
 .super Ljava/lang/Object;
+.source "MatchResult.kt"
 
 
 # virtual methods
-.method public abstract Fv()Ljava/util/List;
+.method public abstract Fu()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -14,7 +15,7 @@
     .end annotation
 .end method
 
-.method public abstract Fw()Lkotlin/text/MatchResult;
+.method public abstract Fv()Lkotlin/text/MatchResult;
 .end method
 
 .method public abstract getRange()Lkotlin/ranges/IntRange;
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$a.smali b/com.discord/smali_classes2/kotlin/text/Regex$a.smali
index c4612297a3..42a59758d5 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/Regex$a;
 .super Ljava/lang/Object;
+.source "Regex.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$b$a.smali b/com.discord/smali_classes2/kotlin/text/Regex$b$a.smali
index da5cbe2816..7bad21567a 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$b$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/Regex$b$a;
 .super Ljava/lang/Object;
+.source "Regex.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$b.smali b/com.discord/smali_classes2/kotlin/text/Regex$b.smali
index c4f780c00f..0e1d1cb9f3 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$b.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/Regex$b;
 .super Ljava/lang/Object;
+.source "Regex.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$c.smali b/com.discord/smali_classes2/kotlin/text/Regex$c.smali
index c6dd2c3eac..e97de7429b 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$c.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/Regex$c;
 .super Lkotlin/jvm/internal/k;
+.source "Regex.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$d.smali b/com.discord/smali_classes2/kotlin/text/Regex$d.smali
index 9edc3350ad..fc96eab236 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$d.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$d.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/Regex$d;
 .super Lkotlin/jvm/internal/i;
+.source "Regex.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -92,7 +93,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lkotlin/text/MatchResult;->Fw()Lkotlin/text/MatchResult;
+    invoke-interface {p1}, Lkotlin/text/MatchResult;->Fv()Lkotlin/text/MatchResult;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/kotlin/text/Regex.smali b/com.discord/smali_classes2/kotlin/text/Regex.smali
index 49c3351814..aefbf64d79 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/Regex;
 .super Ljava/lang/Object;
+.source "Regex.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/kotlin/text/d.smali b/com.discord/smali_classes2/kotlin/text/d.smali
index ef88f46c1f..275240a708 100644
--- a/com.discord/smali_classes2/kotlin/text/d.smali
+++ b/com.discord/smali_classes2/kotlin/text/d.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/d;
 .super Ljava/lang/Object;
+.source "Charsets.kt"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/kotlin/text/e$a.smali b/com.discord/smali_classes2/kotlin/text/e$a.smali
index 25725ff54d..f0a6a1015f 100644
--- a/com.discord/smali_classes2/kotlin/text/e$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/e$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/e$a;
 .super Ljava/lang/Object;
+.source "Strings.kt"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -85,7 +86,7 @@
     return-void
 .end method
 
-.method private final Ft()V
+.method private final Fs()V
     .locals 6
 
     iget v0, p0, Lkotlin/text/e$a;->bRd:I
@@ -163,13 +164,11 @@
 
     invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
 
-    :goto_0
     iput-object v1, p0, Lkotlin/text/e$a;->bRe:Lkotlin/ranges/IntRange;
 
-    :goto_1
     iput v2, p0, Lkotlin/text/e$a;->bRd:I
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_3
     iget-object v0, p0, Lkotlin/text/e$a;->bRg:Lkotlin/text/e;
@@ -214,6 +213,10 @@
 
     invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
 
+    iput-object v1, p0, Lkotlin/text/e$a;->bRe:Lkotlin/ranges/IntRange;
+
+    iput v2, p0, Lkotlin/text/e$a;->bRd:I
+
     goto :goto_0
 
     :cond_4
@@ -254,9 +257,9 @@
     :cond_5
     add-int/2addr v2, v1
 
-    goto :goto_1
+    iput v2, p0, Lkotlin/text/e$a;->bRd:I
 
-    :goto_2
+    :goto_0
     iput v3, p0, Lkotlin/text/e$a;->bQE:I
 
     return-void
@@ -273,7 +276,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->Ft()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->Fs()V
 
     :cond_0
     iget v0, p0, Lkotlin/text/e$a;->bQE:I
@@ -299,7 +302,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->Ft()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->Fs()V
 
     :cond_0
     iget v0, p0, Lkotlin/text/e$a;->bQE:I
diff --git a/com.discord/smali_classes2/kotlin/text/f.smali b/com.discord/smali_classes2/kotlin/text/f.smali
index 2188749b04..775afd10ce 100644
--- a/com.discord/smali_classes2/kotlin/text/f.smali
+++ b/com.discord/smali_classes2/kotlin/text/f.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/f;
 .super Ljava/lang/Object;
+.source "Regex.kt"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/kotlin/text/g.smali b/com.discord/smali_classes2/kotlin/text/g.smali
index 102e5ff394..b7410b9175 100644
--- a/com.discord/smali_classes2/kotlin/text/g.smali
+++ b/com.discord/smali_classes2/kotlin/text/g.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lkotlin/text/g;
 .super Ljava/lang/Object;
+.source "MatchResult.kt"
 
 # interfaces
 .implements Ljava/util/Collection;
diff --git a/com.discord/smali_classes2/kotlin/text/i$a.smali b/com.discord/smali_classes2/kotlin/text/i$a.smali
index b7ce2ecdac..7d05dd298e 100644
--- a/com.discord/smali_classes2/kotlin/text/i$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/i$a.smali
@@ -1,10 +1,11 @@
 .class public final Lkotlin/text/i$a;
 .super Lkotlin/a/d;
+.source "Regex.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lkotlin/text/i;->Fv()Ljava/util/List;
+    value = Lkotlin/text/i;->Fu()Ljava/util/List;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/kotlin/text/i$b$a.smali b/com.discord/smali_classes2/kotlin/text/i$b$a.smali
index 601f9dc6a2..2723717cf4 100644
--- a/com.discord/smali_classes2/kotlin/text/i$b$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/i$b$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/i$b$a;
 .super Lkotlin/jvm/internal/k;
+.source "Regex.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlin/text/i$b.smali b/com.discord/smali_classes2/kotlin/text/i$b.smali
index 97c482fb83..f32c0a4f49 100644
--- a/com.discord/smali_classes2/kotlin/text/i$b.smali
+++ b/com.discord/smali_classes2/kotlin/text/i$b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/i$b;
 .super Lkotlin/a/a;
+.source "Regex.kt"
 
 # interfaces
 .implements Lkotlin/text/h;
diff --git a/com.discord/smali_classes2/kotlin/text/i.smali b/com.discord/smali_classes2/kotlin/text/i.smali
index 4446801e29..335a0bbcd3 100644
--- a/com.discord/smali_classes2/kotlin/text/i.smali
+++ b/com.discord/smali_classes2/kotlin/text/i.smali
@@ -1,5 +1,6 @@
 .class final Lkotlin/text/i;
 .super Ljava/lang/Object;
+.source "Regex.kt"
 
 # interfaces
 .implements Lkotlin/text/MatchResult;
@@ -72,7 +73,7 @@
 
 
 # virtual methods
-.method public final Fv()Ljava/util/List;
+.method public final Fu()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -100,13 +101,13 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     return-object v0
 .end method
 
-.method public final Fw()Lkotlin/text/MatchResult;
+.method public final Fv()Lkotlin/text/MatchResult;
     .locals 3
 
     iget-object v0, p0, Lkotlin/text/i;->bRh:Ljava/util/regex/MatchResult;
diff --git a/com.discord/smali_classes2/kotlin/text/j.smali b/com.discord/smali_classes2/kotlin/text/j.smali
index d51c275d19..576ef1fbe9 100644
--- a/com.discord/smali_classes2/kotlin/text/j.smali
+++ b/com.discord/smali_classes2/kotlin/text/j.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/text/j;
 .super Ljava/lang/Object;
+.source "Regex.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlin/text/k.smali b/com.discord/smali_classes2/kotlin/text/k.smali
index dd6edc73fa..b34c53dc4d 100644
--- a/com.discord/smali_classes2/kotlin/text/k.smali
+++ b/com.discord/smali_classes2/kotlin/text/k.smali
@@ -1,5 +1,6 @@
 .class public final enum Lkotlin/text/k;
 .super Ljava/lang/Enum;
+.source "Regex.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlin/u.smali b/com.discord/smali_classes2/kotlin/u.smali
index 318c701ed0..f5e6e89dc3 100644
--- a/com.discord/smali_classes2/kotlin/u.smali
+++ b/com.discord/smali_classes2/kotlin/u.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/u;
 .super Ljava/lang/Object;
+.source "Lazy.kt"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -93,7 +94,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/kotlin/v.smali b/com.discord/smali_classes2/kotlin/v.smali
index d5b5b8dbbf..c5c677e250 100644
--- a/com.discord/smali_classes2/kotlin/v.smali
+++ b/com.discord/smali_classes2/kotlin/v.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlin/v;
 .super Ljava/lang/Object;
+.source "AssertionsJVM.kt"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/l$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler$a.smali
similarity index 53%
rename from com.discord/smali_classes2/kotlinx/coroutines/l$a.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler$a.smali
index 666ef86b6a..e1d84496d0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/l$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler$a.smali
@@ -1,5 +1,6 @@
-.class public final Lkotlinx/coroutines/l$a;
+.class public final Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 .super Ljava/lang/Object;
+.source "CoroutineExceptionHandler.kt"
 
 # interfaces
 .implements Lkotlin/c/e$c;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/l;
+    value = Lkotlinx/coroutines/CoroutineExceptionHandler;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -19,25 +20,25 @@
     value = {
         "Ljava/lang/Object;",
         "Lkotlin/c/e$c<",
-        "Lkotlinx/coroutines/l;",
+        "Lkotlinx/coroutines/CoroutineExceptionHandler;",
         ">;"
     }
 .end annotation
 
 
 # static fields
-.field static final synthetic bRJ:Lkotlinx/coroutines/l$a;
+.field static final synthetic bRI:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lkotlinx/coroutines/l$a;
+    new-instance v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
-    invoke-direct {v0}, Lkotlinx/coroutines/l$a;-><init>()V
+    invoke-direct {v0}, Lkotlinx/coroutines/CoroutineExceptionHandler$a;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/l$a;->bRJ:Lkotlinx/coroutines/l$a;
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bRI: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
new file mode 100644
index 0000000000..f55a5e9792
--- /dev/null
+++ b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler.smali
@@ -0,0 +1,35 @@
+.class public interface abstract Lkotlinx/coroutines/CoroutineExceptionHandler;
+.super Ljava/lang/Object;
+.source "CoroutineExceptionHandler.kt"
+
+# interfaces
+.implements Lkotlin/c/e$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final bRH:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bRI:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bRH:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract handleException(Lkotlin/c/e;Ljava/lang/Throwable;)V
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a.smali
index 851c2fff00..bd8690d543 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a.smali
@@ -1,10 +1,11 @@
 .class public abstract Lkotlinx/coroutines/a;
-.super Lkotlinx/coroutines/ar;
+.super Lkotlinx/coroutines/aq;
+.source "AbstractCoroutine.kt"
 
 # interfaces
 .implements Lkotlin/c/c;
-.implements Lkotlinx/coroutines/al;
-.implements Lkotlinx/coroutines/q;
+.implements Lkotlinx/coroutines/ak;
+.implements Lkotlinx/coroutines/p;
 
 
 # annotations
@@ -13,11 +14,11 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lkotlinx/coroutines/ar;",
+        "Lkotlinx/coroutines/aq;",
         "Lkotlin/c/c<",
         "TT;>;",
-        "Lkotlinx/coroutines/al;",
-        "Lkotlinx/coroutines/q;"
+        "Lkotlinx/coroutines/ak;",
+        "Lkotlinx/coroutines/p;"
     }
 .end annotation
 
@@ -36,7 +37,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p2}, Lkotlinx/coroutines/ar;-><init>(Z)V
+    invoke-direct {p0, p2}, Lkotlinx/coroutines/aq;-><init>(Z)V
 
     iput-object p1, p0, Lkotlinx/coroutines/a;->bRy:Lkotlin/c/e;
 
@@ -57,7 +58,43 @@
 
 
 # virtual methods
-.method public final FA()Ljava/lang/String;
+.method public final Fw()Lkotlin/c/e;
+    .locals 1
+
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bRx:Lkotlin/c/e;
+
+    return-object v0
+.end method
+
+.method public final Fx()V
+    .locals 2
+
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bRy:Lkotlin/c/e;
+
+    sget-object v1, Lkotlinx/coroutines/ak;->bSl:Lkotlinx/coroutines/ak$b;
+
+    check-cast v1, Lkotlin/c/e$c;
+
+    invoke-interface {v0, v1}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlinx/coroutines/ak;
+
+    invoke-virtual {p0, v0}, Lkotlinx/coroutines/a;->b(Lkotlinx/coroutines/ak;)V
+
+    return-void
+.end method
+
+.method public final Fy()V
+    .locals 0
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->onStart()V
+
+    return-void
+.end method
+
+.method public final Fz()Ljava/lang/String;
     .locals 3
 
     iget-object v0, p0, Lkotlinx/coroutines/a;->bRx:Lkotlin/c/e;
@@ -68,7 +105,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-super {p0}, Lkotlinx/coroutines/ar;->FA()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/aq;->Fz()Ljava/lang/String;
 
     move-result-object v0
 
@@ -87,7 +124,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-super {p0}, Lkotlinx/coroutines/ar;->FA()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/aq;->Fz()Ljava/lang/String;
 
     move-result-object v0
 
@@ -100,42 +137,6 @@
     return-object v0
 .end method
 
-.method public final Fx()Lkotlin/c/e;
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bRx:Lkotlin/c/e;
-
-    return-object v0
-.end method
-
-.method public final Fy()V
-    .locals 2
-
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bRy:Lkotlin/c/e;
-
-    sget-object v1, Lkotlinx/coroutines/al;->bSs:Lkotlinx/coroutines/al$b;
-
-    check-cast v1, Lkotlin/c/e$c;
-
-    invoke-interface {v0, v1}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlinx/coroutines/al;
-
-    invoke-virtual {p0, v0}, Lkotlinx/coroutines/a;->b(Lkotlinx/coroutines/al;)V
-
-    return-void
-.end method
-
-.method public final Fz()V
-    .locals 0
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->onStart()V
-
-    return-void
-.end method
-
 .method public final bG(Ljava/lang/Object;)V
     .locals 1
 
@@ -166,7 +167,7 @@
 .method public final isActive()Z
     .locals 1
 
-    invoke-super {p0}, Lkotlinx/coroutines/ar;->isActive()Z
+    invoke-super {p0}, Lkotlinx/coroutines/aq;->isActive()Z
 
     move-result v0
 
@@ -190,7 +191,7 @@
 
     move-object v1, p0
 
-    check-cast v1, Lkotlinx/coroutines/al;
+    check-cast v1, Lkotlinx/coroutines/ak;
 
     const-string v2, "context"
 
@@ -200,7 +201,7 @@
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lkotlinx/coroutines/al;->bSs:Lkotlinx/coroutines/al$b;
+    sget-object v2, Lkotlinx/coroutines/ak;->bSl:Lkotlinx/coroutines/ak$b;
 
     check-cast v2, Lkotlin/c/e$c;
 
@@ -208,20 +209,20 @@
 
     move-result-object v2
 
-    check-cast v2, Lkotlinx/coroutines/al;
+    check-cast v2, Lkotlinx/coroutines/ak;
 
     if-eqz v2, :cond_0
 
     if-eq v2, v1, :cond_0
 
-    invoke-interface {v2, p1}, Lkotlinx/coroutines/al;->r(Ljava/lang/Throwable;)Z
+    invoke-interface {v2, p1}, Lkotlinx/coroutines/ak;->r(Ljava/lang/Throwable;)Z
 
     move-result v1
 
     if-nez v1, :cond_1
 
     :cond_0
-    invoke-static {v0, p1}, Lkotlinx/coroutines/n;->b(Lkotlin/c/e;Ljava/lang/Throwable;)V
+    invoke-static {v0, p1}, Lkotlinx/coroutines/m;->b(Lkotlin/c/e;Ljava/lang/Throwable;)V
 
     :cond_1
     return-void
@@ -235,13 +236,13 @@
     move-result-object p1
 
     :pswitch_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-super {p0, v0, p1, v1}, Lkotlinx/coroutines/ar;->d(Ljava/lang/Object;Ljava/lang/Object;I)I
+    invoke-super {p0, v0, p1, v1}, Lkotlinx/coroutines/aq;->d(Ljava/lang/Object;Ljava/lang/Object;I)I
 
     move-result v0
 
@@ -265,6 +266,9 @@
     return-void
 
     :pswitch_2
+    return-void
+
+    :pswitch_3
     new-instance v0, Ljava/lang/IllegalStateException;
 
     new-instance v1, Ljava/lang/StringBuilder;
@@ -307,13 +311,11 @@
 
     throw v0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_3
         :pswitch_2
         :pswitch_1
-        :pswitch_1
         :pswitch_0
     .end packed-switch
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali
index e3f6afa5e4..cbd71aaf3e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/a/a;
 .super Ljava/lang/Object;
+.source "ArrayCopy.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali
index 87bbc49cc1..b0216625c3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/a/b;
 .super Ljava/lang/Object;
+.source "ArrayQueue.kt"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # instance fields
-.field private bSX:[Ljava/lang/Object;
+.field private bSL:[Ljava/lang/Object;
 
-.field private bSY:I
+.field private bSM:I
 
-.field private bSZ:I
+.field private bSN:I
 
 
 # direct methods
@@ -31,56 +32,50 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iput-object v0, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final Gk()V
+.method private final Gj()V
     .locals 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    shl-int/lit8 v1, v0, 0x1
+    shl-int/lit8 v2, v1, 0x1
 
-    new-array v1, v1, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    array-length v3, v0
 
-    array-length v2, v2
+    iget v4, p0, Lkotlinx/coroutines/a/b;->bSM:I
 
-    iget v3, p0, Lkotlinx/coroutines/a/b;->bSY:I
-
-    sub-int/2addr v2, v3
-
-    iget-object v3, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
-
-    iget v4, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    sub-int/2addr v3, v4
 
     const/4 v5, 0x0
 
-    invoke-static {v3, v4, v1, v5, v2}, Lkotlinx/coroutines/a/a;->a([Ljava/lang/Object;I[Ljava/lang/Object;II)V
+    invoke-static {v0, v4, v2, v5, v3}, Lkotlinx/coroutines/a/a;->a([Ljava/lang/Object;I[Ljava/lang/Object;II)V
 
-    iget-object v3, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
-    iget v4, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    iget v4, p0, Lkotlinx/coroutines/a/b;->bSM:I
 
-    invoke-static {v3, v5, v1, v2, v4}, Lkotlinx/coroutines/a/a;->a([Ljava/lang/Object;I[Ljava/lang/Object;II)V
+    invoke-static {v0, v5, v2, v3, v4}, Lkotlinx/coroutines/a/a;->a([Ljava/lang/Object;I[Ljava/lang/Object;II)V
 
-    iput-object v1, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iput-object v2, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
-    iput v5, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    iput v5, p0, Lkotlinx/coroutines/a/b;->bSM:I
 
-    iput v0, p0, Lkotlinx/coroutines/a/b;->bSZ:I
+    iput v1, p0, Lkotlinx/coroutines/a/b;->bSN:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gj()Ljava/lang/Object;
+.method public final Gi()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,9 +83,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    iget v0, p0, Lkotlinx/coroutines/a/b;->bSM:I
 
-    iget v1, p0, Lkotlinx/coroutines/a/b;->bSZ:I
+    iget v1, p0, Lkotlinx/coroutines/a/b;->bSN:I
 
     const/4 v2, 0x0
 
@@ -99,35 +94,25 @@
     return-object v2
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
-    iget v1, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    aget-object v3, v1, v0
 
-    aget-object v0, v0, v1
+    aput-object v2, v1, v0
 
-    iget-object v1, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    add-int/lit8 v0, v0, 0x1
 
-    iget v3, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    array-length v1, v1
 
-    aput-object v2, v1, v3
+    add-int/lit8 v1, v1, -0x1
 
-    iget v1, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    and-int/2addr v0, v1
 
-    add-int/lit8 v1, v1, 0x1
+    iput v0, p0, Lkotlinx/coroutines/a/b;->bSM:I
 
-    iget-object v2, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    if-eqz v3, :cond_1
 
-    array-length v2, v2
-
-    add-int/lit8 v2, v2, -0x1
-
-    and-int/2addr v1, v2
-
-    iput v1, p0, Lkotlinx/coroutines/a/b;->bSY:I
-
-    if-eqz v0, :cond_1
-
-    return-object v0
+    return-object v3
 
     :cond_1
     new-instance v0, Lkotlin/r;
@@ -151,33 +136,29 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
-    iget v1, p0, Lkotlinx/coroutines/a/b;->bSZ:I
+    iget v1, p0, Lkotlinx/coroutines/a/b;->bSN:I
 
     aput-object p1, v0, v1
 
-    iget p1, p0, Lkotlinx/coroutines/a/b;->bSZ:I
+    add-int/lit8 v1, v1, 0x1
 
-    add-int/lit8 p1, p1, 0x1
+    array-length p1, v0
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    add-int/lit8 p1, p1, -0x1
 
-    array-length v0, v0
+    and-int/2addr p1, v1
 
-    add-int/lit8 v0, v0, -0x1
+    iput p1, p0, Lkotlinx/coroutines/a/b;->bSN:I
 
-    and-int/2addr p1, v0
+    iget p1, p0, Lkotlinx/coroutines/a/b;->bSN:I
 
-    iput p1, p0, Lkotlinx/coroutines/a/b;->bSZ:I
-
-    iget p1, p0, Lkotlinx/coroutines/a/b;->bSZ:I
-
-    iget v0, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    iget v0, p0, Lkotlinx/coroutines/a/b;->bSM:I
 
     if-ne p1, v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/a/b;->Gk()V
+    invoke-direct {p0}, Lkotlinx/coroutines/a/b;->Gj()V
 
     :cond_0
     return-void
@@ -188,17 +169,17 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lkotlinx/coroutines/a/b;->bSY:I
+    iput v0, p0, Lkotlinx/coroutines/a/b;->bSM:I
 
-    iput v0, p0, Lkotlinx/coroutines/a/b;->bSZ:I
+    iput v0, p0, Lkotlinx/coroutines/a/b;->bSN:I
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
     array-length v0, v0
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iput-object v0, p0, Lkotlinx/coroutines/a/b;->bSX:[Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/a/b;->bSL:[Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/c.smali
index e3383bb27d..41119ceaf4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/c.smali
@@ -1,9 +1,10 @@
 .class public final Lkotlinx/coroutines/a/c;
 .super Ljava/lang/Object;
+.source "Atomic.kt"
 
 
 # static fields
-.field private static final bTa:Ljava/lang/Object;
+.field private static final bSO:Ljava/lang/Object;
 
 
 # direct methods
@@ -16,15 +17,15 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/a/c;->bTa:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/a/c;->bSO:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final synthetic Gl()Ljava/lang/Object;
+.method public static final synthetic Gk()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/a/c;->bTa:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/a/c;->bSO:Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/d.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/d.smali
index 111a150016..5fd461e83a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/d.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlinx/coroutines/a/d;
 .super Lkotlinx/coroutines/a/m;
+.source "Atomic.kt"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # static fields
-.field private static final bTc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bSP:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
-.field private volatile bTb:Ljava/lang/Object;
+.field private volatile _consensus:Ljava/lang/Object;
 
 
 # direct methods
@@ -29,13 +30,13 @@
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTb"
+    const-string v2, "_consensus"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/d;->bTc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/d;->bSP:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -45,11 +46,11 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/a/m;-><init>()V
 
-    invoke-static {}, Lkotlinx/coroutines/a/c;->Gl()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/a/c;->Gk()Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lkotlinx/coroutines/a/d;->bTb:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/a/d;->_consensus:Ljava/lang/Object;
 
     return-void
 .end method
@@ -68,9 +69,9 @@
 .method public final bS(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/d;->bTb:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/d;->_consensus:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/a/c;->Gl()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/a/c;->Gk()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -80,7 +81,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lkotlinx/coroutines/a/c;->Gl()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/a/c;->Gk()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -96,9 +97,9 @@
     :goto_0
     if-eqz v1, :cond_2
 
-    sget-object v1, Lkotlinx/coroutines/a/d;->bTc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/a/d;->bSP:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/a/c;->Gl()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/a/c;->Gk()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -111,7 +112,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/a/d;->bTb:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/d;->_consensus:Ljava/lang/Object;
 
     goto :goto_1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/e.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/e.smali
index 836431012f..4b8a66ad2b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/e.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/e.smali
@@ -1,9 +1,10 @@
 .class public final Lkotlinx/coroutines/a/e;
 .super Ljava/lang/Object;
+.source "Concurrent.kt"
 
 
 # static fields
-.field private static final bTd:Ljava/lang/reflect/Method;
+.field private static final bSQ:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -37,7 +38,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-object v0, Lkotlinx/coroutines/a/e;->bTd:Ljava/lang/reflect/Method;
+    sput-object v0, Lkotlinx/coroutines/a/e;->bSQ:Ljava/lang/reflect/Method;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/f.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/f.smali
index ec7e12769e..c3070a2642 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/f.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/f.smali
@@ -1,12 +1,13 @@
 .class public final Lkotlinx/coroutines/a/f;
 .super Ljava/lang/Object;
+.source "Scopes.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/q;
+.implements Lkotlinx/coroutines/p;
 
 
 # instance fields
-.field private final bTe:Lkotlin/c/e;
+.field private final bSR:Lkotlin/c/e;
 
 
 # direct methods
@@ -19,17 +20,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/a/f;->bTe:Lkotlin/c/e;
+    iput-object p1, p0, Lkotlinx/coroutines/a/f;->bSR:Lkotlin/c/e;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Fx()Lkotlin/c/e;
+.method public final Fw()Lkotlin/c/e;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/f;->bTe:Lkotlin/c/e;
+    iget-object v0, p0, Lkotlinx/coroutines/a/f;->bSR:Lkotlin/c/e;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/g.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/g.smali
index 9081be2c8a..7f965eefec 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/g.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/g.smali
@@ -1,5 +1,6 @@
 .class public Lkotlinx/coroutines/a/g;
 .super Lkotlinx/coroutines/a/i;
+.source "LockFreeLinkedList.kt"
 
 
 # direct methods
@@ -13,7 +14,7 @@
 
 
 # virtual methods
-.method public final Gm()Z
+.method public final Gl()Z
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/h.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/h.smali
index 342d89719c..63c99821d9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/h.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/h.smali
@@ -1,15 +1,16 @@
 .class public final Lkotlinx/coroutines/a/h;
 .super Ljava/lang/Object;
+.source "LockFreeLinkedList.kt"
 
 
 # static fields
-.field private static final bTf:Ljava/lang/Object;
+.field private static final bSS:Ljava/lang/Object;
 
-.field private static final bTg:Ljava/lang/Object;
+.field private static final bST:Ljava/lang/Object;
 
-.field private static final bTh:Ljava/lang/Object;
+.field private static final bSU:Ljava/lang/Object;
 
-.field private static final bTi:Ljava/lang/Object;
+.field private static final bSV:Ljava/lang/Object;
 
 
 # direct methods
@@ -22,7 +23,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/a/h;->bTf:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/a/h;->bSS:Ljava/lang/Object;
 
     new-instance v0, Lkotlinx/coroutines/a/o;
 
@@ -30,7 +31,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/a/h;->bTg:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/a/h;->bST:Ljava/lang/Object;
 
     new-instance v0, Lkotlinx/coroutines/a/o;
 
@@ -38,7 +39,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/a/h;->bTh:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/a/h;->bSU:Ljava/lang/Object;
 
     new-instance v0, Lkotlinx/coroutines/a/o;
 
@@ -46,15 +47,15 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/a/h;->bTi:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/a/h;->bSV:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final Gn()Ljava/lang/Object;
+.method public static final Gm()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/a/h;->bTf:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/a/h;->bSS:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -82,7 +83,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v0, Lkotlinx/coroutines/a/n;->bTC:Lkotlinx/coroutines/a/i;
+    iget-object v0, v0, Lkotlinx/coroutines/a/n;->bTi:Lkotlinx/coroutines/a/i;
 
     if-nez v0, :cond_2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/i$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/i$a.smali
index 505e774914..0bf4bdff09 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/i$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/i$a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlinx/coroutines/a/i$a;
 .super Lkotlinx/coroutines/a/d;
+.source "LockFreeLinkedList.kt"
 
 
 # annotations
@@ -22,9 +23,9 @@
 
 
 # instance fields
-.field public bTp:Lkotlinx/coroutines/a/i;
+.field public bSZ:Lkotlinx/coroutines/a/i;
 
-.field public final bTq:Lkotlinx/coroutines/a/i;
+.field public final bTa:Lkotlinx/coroutines/a/i;
 
 
 # direct methods
@@ -37,7 +38,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/a/d;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/a/i$a;->bTq:Lkotlinx/coroutines/a/i;
+    iput-object p1, p0, Lkotlinx/coroutines/a/i$a;->bTa:Lkotlinx/coroutines/a/i;
 
     return-void
 .end method
@@ -65,17 +66,17 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/i$a;->bTq:Lkotlinx/coroutines/a/i;
+    iget-object v0, p0, Lkotlinx/coroutines/a/i$a;->bTa:Lkotlinx/coroutines/a/i;
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/a/i$a;->bTp:Lkotlinx/coroutines/a/i;
+    iget-object v0, p0, Lkotlinx/coroutines/a/i$a;->bSZ:Lkotlinx/coroutines/a/i;
 
     :goto_1
     if-eqz v0, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/a/i;->bSW: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
 
@@ -85,13 +86,13 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p1, p0, Lkotlinx/coroutines/a/i$a;->bTq:Lkotlinx/coroutines/a/i;
+    iget-object p1, p0, Lkotlinx/coroutines/a/i$a;->bTa:Lkotlinx/coroutines/a/i;
 
-    iget-object p2, p0, Lkotlinx/coroutines/a/i$a;->bTp:Lkotlinx/coroutines/a/i;
+    iget-object p2, p0, Lkotlinx/coroutines/a/i$a;->bSZ:Lkotlinx/coroutines/a/i;
 
     if-nez p2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     invoke-static {p1, p2}, Lkotlinx/coroutines/a/i;->a(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;)V
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/i.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/i.smali
index a86cf121fb..8a747c6d3c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/i.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/i.smali
@@ -1,5 +1,6 @@
 .class public Lkotlinx/coroutines/a/i;
 .super Ljava/lang/Object;
+.source "LockFreeLinkedList.kt"
 
 
 # annotations
@@ -11,19 +12,19 @@
 
 
 # static fields
-.field static final bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final bTm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final bSX:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final bTo:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bSY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
-.field volatile bTj:Ljava/lang/Object;
+.field volatile _next:Ljava/lang/Object;
 
-.field volatile bTl:Ljava/lang/Object;
+.field volatile _prev:Ljava/lang/Object;
 
-.field private volatile bTn:Ljava/lang/Object;
+.field private volatile _removedRef:Ljava/lang/Object;
 
 
 # direct methods
@@ -34,37 +35,37 @@
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTj"
+    const-string v2, "_next"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/i;->bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/a/i;
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTl"
+    const-string v2, "_prev"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/i;->bTm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/i;->bSX:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/a/i;
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTn"
+    const-string v2, "_removedRef"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/i;->bTo:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/i;->bSY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -74,21 +75,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p0, p0, Lkotlinx/coroutines/a/i;->bTj:Ljava/lang/Object;
+    iput-object p0, p0, Lkotlinx/coroutines/a/i;->_next:Ljava/lang/Object;
 
-    iput-object p0, p0, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iput-object p0, p0, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlinx/coroutines/a/i;->bTn:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/a/i;->_removedRef:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final Go()Lkotlinx/coroutines/a/n;
+.method private final Gn()Lkotlinx/coroutines/a/n;
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/i;->bTn:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/i;->_removedRef:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/a/n;
 
@@ -98,7 +99,7 @@
 
     invoke-direct {v0, p0}, Lkotlinx/coroutines/a/n;-><init>(Lkotlinx/coroutines/a/i;)V
 
-    sget-object v1, Lkotlinx/coroutines/a/i;->bTo:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/a/i;->bSY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v1, p0, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -106,11 +107,11 @@
     return-object v0
 .end method
 
-.method private final Gs()Lkotlinx/coroutines/a/i;
+.method private final Gr()Lkotlinx/coroutines/a/i;
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     instance-of v1, v0, Lkotlinx/coroutines/a/n;
 
@@ -118,7 +119,7 @@
 
     check-cast v0, Lkotlinx/coroutines/a/n;
 
-    iget-object v0, v0, Lkotlinx/coroutines/a/n;->bTC:Lkotlinx/coroutines/a/i;
+    iget-object v0, v0, Lkotlinx/coroutines/a/n;->bTi:Lkotlinx/coroutines/a/i;
 
     return-object v0
 
@@ -129,7 +130,7 @@
 
     if-ne v0, v1, :cond_2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/a/i;->Gt()Lkotlinx/coroutines/a/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/a/i;->Gs()Lkotlinx/coroutines/a/i;
 
     move-result-object v1
 
@@ -143,11 +144,11 @@
     check-cast v1, Lkotlinx/coroutines/a/i;
 
     :goto_0
-    invoke-direct {v1}, Lkotlinx/coroutines/a/i;->Go()Lkotlinx/coroutines/a/n;
+    invoke-direct {v1}, Lkotlinx/coroutines/a/i;->Gn()Lkotlinx/coroutines/a/n;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/a/i;->bTm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/a/i;->bSX: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
 
@@ -167,9 +168,11 @@
     invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
-.method private final Gt()Lkotlinx/coroutines/a/i;
+.method private final Gs()Lkotlinx/coroutines/a/i;
     .locals 3
 
     move-object v0, p0
@@ -186,7 +189,7 @@
     return-object v1
 
     :cond_0
-    invoke-virtual {v1}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -222,6 +225,8 @@
     check-cast v0, Ljava/lang/Throwable;
 
     throw v0
+
+    return-void
 .end method
 
 .method public static final synthetic a(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;)V
@@ -236,22 +241,22 @@
     .locals 2
 
     :cond_0
-    iget-object v0, p1, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object v0, p1, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     instance-of v1, v0, Lkotlinx/coroutines/a/n;
 
-    if-nez v1, :cond_3
+    if-nez v1, :cond_4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v1
 
     if-eq v1, p1, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/a/i;->bTm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/a/i;->bSX: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
 
@@ -259,7 +264,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -287,6 +292,10 @@
     :cond_3
     :goto_0
     return-void
+
+    :cond_4
+    :goto_1
+    return-void
 .end method
 
 .method private final d(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/a/i;
@@ -294,12 +303,11 @@
 
     const/4 v0, 0x0
 
-    :goto_0
     move-object v1, v0
 
     :cond_0
-    :goto_1
-    iget-object v2, p1, Lkotlinx/coroutines/a/i;->bTj:Ljava/lang/Object;
+    :goto_0
+    iget-object v2, p1, Lkotlinx/coroutines/a/i;->_next:Ljava/lang/Object;
 
     if-nez v2, :cond_1
 
@@ -314,7 +322,7 @@
 
     invoke-virtual {v2, p1}, Lkotlinx/coroutines/a/m;->bS(Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     instance-of v3, v2, Lkotlinx/coroutines/a/n;
@@ -323,31 +331,33 @@
 
     if-eqz v1, :cond_3
 
-    invoke-direct {p1}, Lkotlinx/coroutines/a/i;->Gs()Lkotlinx/coroutines/a/i;
+    invoke-direct {p1}, Lkotlinx/coroutines/a/i;->Gr()Lkotlinx/coroutines/a/i;
 
-    sget-object v3, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/a/i;->bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v2, Lkotlinx/coroutines/a/n;
 
-    iget-object v2, v2, Lkotlinx/coroutines/a/n;->bTC:Lkotlinx/coroutines/a/i;
+    iget-object v2, v2, Lkotlinx/coroutines/a/n;->bTi:Lkotlinx/coroutines/a/i;
 
     invoke-virtual {v3, v1, p1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-object p1, v1
 
+    move-object v1, v0
+
     goto :goto_0
 
     :cond_3
-    iget-object p1, p1, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object p1, p1, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     invoke-static {p1}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
-    iget-object v3, p0, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object v3, p0, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     instance-of v4, v3, Lkotlinx/coroutines/a/n;
 
@@ -374,7 +384,7 @@
 
     move-object p1, v5
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_6
     new-instance p1, Lkotlin/r;
@@ -391,7 +401,7 @@
     return-object v0
 
     :cond_8
-    sget-object v2, Lkotlinx/coroutines/a/i;->bTm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/a/i;->bSX: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
 
@@ -399,7 +409,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p1, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object v2, p1, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     instance-of v2, v2, Lkotlinx/coroutines/a/n;
 
@@ -410,11 +420,11 @@
 
 
 # virtual methods
-.method public Gm()Z
+.method public Gl()Z
     .locals 9
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -442,11 +452,11 @@
 
     check-cast v2, Lkotlinx/coroutines/a/i;
 
-    invoke-direct {v2}, Lkotlinx/coroutines/a/i;->Go()Lkotlinx/coroutines/a/n;
+    invoke-direct {v2}, Lkotlinx/coroutines/a/i;->Gn()Lkotlinx/coroutines/a/n;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/a/i;->bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v4, p0, v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -454,11 +464,11 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/a/i;->Gs()Lkotlinx/coroutines/a/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/a/i;->Gr()Lkotlinx/coroutines/a/i;
 
     move-result-object v0
 
-    iget-object v3, p0, Lkotlinx/coroutines/a/i;->bTj:Ljava/lang/Object;
+    iget-object v3, p0, Lkotlinx/coroutines/a/i;->_next:Ljava/lang/Object;
 
     if-eqz v3, :cond_a
 
@@ -471,11 +481,11 @@
     :goto_0
     check-cast v3, Lkotlinx/coroutines/a/n;
 
-    iget-object v3, v3, Lkotlinx/coroutines/a/n;->bTC:Lkotlinx/coroutines/a/i;
+    iget-object v3, v3, Lkotlinx/coroutines/a/n;->bTi:Lkotlinx/coroutines/a/i;
 
     :cond_3
     :goto_1
-    invoke-virtual {v3}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {v3}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -483,14 +493,14 @@
 
     if-eqz v7, :cond_4
 
-    invoke-direct {v3}, Lkotlinx/coroutines/a/i;->Gs()Lkotlinx/coroutines/a/i;
+    invoke-direct {v3}, Lkotlinx/coroutines/a/i;->Gr()Lkotlinx/coroutines/a/i;
 
     move-object v3, v6
 
     goto :goto_0
 
     :cond_4
-    invoke-virtual {v5}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {v5}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -500,13 +510,13 @@
 
     if-eqz v0, :cond_5
 
-    invoke-direct {v5}, Lkotlinx/coroutines/a/i;->Gs()Lkotlinx/coroutines/a/i;
+    invoke-direct {v5}, Lkotlinx/coroutines/a/i;->Gr()Lkotlinx/coroutines/a/i;
 
-    sget-object v7, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v7, Lkotlinx/coroutines/a/i;->bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v6, Lkotlinx/coroutines/a/n;
 
-    iget-object v6, v6, Lkotlinx/coroutines/a/n;->bTC:Lkotlinx/coroutines/a/i;
+    iget-object v6, v6, Lkotlinx/coroutines/a/n;->bTi:Lkotlinx/coroutines/a/i;
 
     invoke-virtual {v7, v0, v5, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -517,7 +527,7 @@
     goto :goto_1
 
     :cond_5
-    iget-object v5, v5, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object v5, v5, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     invoke-static {v5}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
 
@@ -554,7 +564,7 @@
     throw v0
 
     :cond_8
-    sget-object v6, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v6, Lkotlinx/coroutines/a/i;->bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v6, v5, p0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -563,7 +573,7 @@
     if-eqz v6, :cond_3
 
     :cond_9
-    iget-object v0, p0, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     invoke-static {v0}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
 
@@ -592,13 +602,15 @@
     invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
-.method public final Gp()Ljava/lang/Object;
+.method public final Go()Ljava/lang/Object;
     .locals 2
 
     :goto_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/i;->bTj:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/i;->_next:Ljava/lang/Object;
 
     instance-of v1, v0, Lkotlinx/coroutines/a/m;
 
@@ -614,10 +626,10 @@
     goto :goto_0
 .end method
 
-.method public final Gq()Lkotlinx/coroutines/a/i;
+.method public final Gp()Lkotlinx/coroutines/a/i;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -628,11 +640,11 @@
     return-object v0
 .end method
 
-.method public final Gr()Ljava/lang/Object;
+.method public final Gq()Ljava/lang/Object;
     .locals 4
 
     :goto_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/i;->bTl:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/i;->_prev:Ljava/lang/Object;
 
     instance-of v1, v0, Lkotlinx/coroutines/a/n;
 
@@ -647,7 +659,7 @@
 
     check-cast v1, Lkotlinx/coroutines/a/i;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -672,6 +684,8 @@
     invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final a(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i$a;)I
@@ -689,17 +703,17 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/a/i;->bTm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/i;->bSX: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/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/i;->bSW: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/a/i$a;->bTp:Lkotlinx/coroutines/a/i;
+    iput-object p2, p3, Lkotlinx/coroutines/a/i$a;->bSZ:Lkotlinx/coroutines/a/i;
 
-    sget-object p1, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/a/i;->bSW: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
 
@@ -735,16 +749,16 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/a/i;->bTm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/i;->bSX: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/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/i;->bSW: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/a/i;->Gp()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -759,7 +773,7 @@
     return p1
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/a/i;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/i;->bSW: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/a/j.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/j.smali
index 522f4e52d9..3277da54a3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/j.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/j.smali
@@ -1,5 +1,6 @@
 .class public Lkotlinx/coroutines/a/j;
 .super Ljava/lang/Object;
+.source "LockFreeMPMCQueue.kt"
 
 
 # annotations
@@ -14,15 +15,15 @@
 
 
 # static fields
-.field private static final bTs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bTb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final bTu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bTc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
-.field protected volatile bTr:Ljava/lang/Object;
+.field protected volatile head:Ljava/lang/Object;
 
-.field protected volatile bTt:Ljava/lang/Object;
+.field protected volatile tail:Ljava/lang/Object;
 
 
 # direct methods
@@ -33,25 +34,25 @@
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTr"
+    const-string v2, "head"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/j;->bTs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/j;->bTb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/a/j;
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTt"
+    const-string v2, "tail"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/j;->bTu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/j;->bTc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -65,11 +66,11 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/a/k;-><init>()V
 
-    iput-object v0, p0, Lkotlinx/coroutines/a/j;->bTr:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/a/j;->head:Ljava/lang/Object;
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/j;->bTr:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/j;->head:Ljava/lang/Object;
 
-    iput-object v0, p0, Lkotlinx/coroutines/a/j;->bTt:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/a/j;->tail:Ljava/lang/Object;
 
     return-void
 .end method
@@ -92,7 +93,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/a/j;->bTs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/j;->bTb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v0, p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -117,7 +118,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/a/j;->bTu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/j;->bTc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v0, p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -129,14 +130,14 @@
 .method public final getSize()I
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/j;->bTr:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/j;->head:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/a/k;
 
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v0, v0, Lkotlinx/coroutines/a/k;->bTv:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlinx/coroutines/a/k;->next:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/a/k;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/k.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/k.smali
index adc92b3cd8..83c3205bca 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/k.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/k.smali
@@ -1,5 +1,6 @@
 .class public Lkotlinx/coroutines/a/k;
 .super Ljava/lang/Object;
+.source "LockFreeMPMCQueue.kt"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # static fields
-.field public static final bTw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final bTd:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
-.field public volatile bTv:Ljava/lang/Object;
+.field public volatile next:Ljava/lang/Object;
 
 
 # direct methods
@@ -29,13 +30,13 @@
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTv"
+    const-string v2, "next"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/k;->bTw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/k;->bTd:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -47,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlinx/coroutines/a/k;->bTv:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/a/k;->next:Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/l$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/l$a.smali
index cc0089c432..27be6e0b56 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/l$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/l$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/a/l$a;
 .super Ljava/lang/Object;
+.source "LockFreeMPSCQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/l$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/l$b.smali
index 5462041347..58d5017f99 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/l$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/l$b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/a/l$b;
 .super Ljava/lang/Object;
+.source "LockFreeMPSCQueue.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/l.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/l.smali
index 900bda760f..9773cd5eb9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/l.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/l.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/a/l;
 .super Ljava/lang/Object;
+.source "LockFreeMPSCQueue.kt"
 
 
 # annotations
@@ -21,21 +22,21 @@
 
 
 # static fields
-.field public static final bTA:Lkotlinx/coroutines/a/o;
+.field private static final bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field public static final bTB:Lkotlinx/coroutines/a/l$a;
+.field public static final bTe:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field private static final bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final bTg:Lkotlinx/coroutines/a/o;
 
-.field public static final bTy:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field public static final bTh:Lkotlinx/coroutines/a/l$a;
 
 
 # instance fields
-.field private volatile bTj:Ljava/lang/Object;
+.field private volatile _next:Ljava/lang/Object;
 
-.field public volatile bTx:J
+.field public volatile _state:J
 
-.field public final bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field public final bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -60,7 +61,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/l$a;-><init>(B)V
 
-    sput-object v0, Lkotlinx/coroutines/a/l;->bTB:Lkotlinx/coroutines/a/l$a;
+    sput-object v0, Lkotlinx/coroutines/a/l;->bTh:Lkotlinx/coroutines/a/l$a;
 
     new-instance v0, Lkotlinx/coroutines/a/o;
 
@@ -68,29 +69,29 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/a/l;->bTA:Lkotlinx/coroutines/a/o;
+    sput-object v0, Lkotlinx/coroutines/a/l;->bTg:Lkotlinx/coroutines/a/o;
 
     const-class v0, Lkotlinx/coroutines/a/l;
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bTj"
+    const-string v2, "_next"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/l;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/l;->bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/a/l;
 
-    const-string v1, "bTx"
+    const-string v1, "_state"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/a/l;->bTy:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/a/l;->bTe:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     return-void
 .end method
@@ -104,31 +105,29 @@
 
     iget p1, p0, Lkotlinx/coroutines/a/l;->capacity:I
 
-    const/4 v0, 0x1
+    add-int/lit8 v0, p1, -0x1
 
-    sub-int/2addr p1, v0
+    iput v0, p0, Lkotlinx/coroutines/a/l;->mask:I
 
-    iput p1, p0, Lkotlinx/coroutines/a/l;->mask:I
+    const/4 v0, 0x0
 
-    const/4 p1, 0x0
+    iput-object v0, p0, Lkotlinx/coroutines/a/l;->_next:Ljava/lang/Object;
 
-    iput-object p1, p0, Lkotlinx/coroutines/a/l;->bTj:Ljava/lang/Object;
+    const-wide/16 v0, 0x0
 
-    const-wide/16 v1, 0x0
+    iput-wide v0, p0, Lkotlinx/coroutines/a/l;->_state:J
 
-    iput-wide v1, p0, Lkotlinx/coroutines/a/l;->bTx:J
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iget v1, p0, Lkotlinx/coroutines/a/l;->capacity:I
-
-    invoke-direct {p1, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object p1, p0, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget p1, p0, Lkotlinx/coroutines/a/l;->mask:I
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
 
     const v2, 0x3fffffff    # 1.9999999f
 
@@ -152,12 +151,9 @@
 
     if-nez p1, :cond_1
 
-    goto :goto_1
+    const/4 v0, 0x1
 
     :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
     if-eqz v0, :cond_2
 
     return-void
@@ -193,11 +189,11 @@
     throw p1
 .end method
 
-.method private final Gv()J
+.method private final Gu()J
     .locals 9
 
     :cond_0
-    iget-wide v2, p0, Lkotlinx/coroutines/a/l;->bTx:J
+    iget-wide v2, p0, Lkotlinx/coroutines/a/l;->_state:J
 
     const-wide/high16 v0, 0x1000000000000000L
 
@@ -214,7 +210,7 @@
     :cond_1
     or-long v6, v2, v0
 
-    sget-object v0, Lkotlinx/coroutines/a/l;->bTy:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/l;->bTe:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     move-object v1, p0
 
@@ -240,7 +236,7 @@
     .end annotation
 
     :goto_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/l;->bTj:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/l;->_next:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/a/l;
 
@@ -249,7 +245,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/a/l;->bTk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/a/l;->bSW:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -303,38 +299,34 @@
     :goto_0
     iget v3, p0, Lkotlinx/coroutines/a/l;->mask:I
 
+    and-int v4, v1, v3
+
+    and-int v5, v2, v3
+
+    if-eq v4, v5, :cond_1
+
+    iget-object v4, v0, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v5, v0, Lkotlinx/coroutines/a/l;->mask:I
+
+    and-int/2addr v5, v1
+
+    iget-object v6, p0, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
     and-int/2addr v3, v1
 
-    iget v4, p0, Lkotlinx/coroutines/a/l;->mask:I
+    invoke-virtual {v6, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
-    and-int/2addr v4, v2
+    move-result-object v3
 
-    if-eq v3, v4, :cond_1
+    if-nez v3, :cond_0
 
-    iget-object v3, v0, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    new-instance v3, Lkotlinx/coroutines/a/l$b;
 
-    iget v4, v0, Lkotlinx/coroutines/a/l;->mask:I
-
-    and-int/2addr v4, v1
-
-    iget-object v5, p0, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v6, p0, Lkotlinx/coroutines/a/l;->mask:I
-
-    and-int/2addr v6, v1
-
-    invoke-virtual {v5, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-nez v5, :cond_0
-
-    new-instance v5, Lkotlinx/coroutines/a/l$b;
-
-    invoke-direct {v5, v1}, Lkotlinx/coroutines/a/l$b;-><init>(I)V
+    invoke-direct {v3, v1}, Lkotlinx/coroutines/a/l$b;-><init>(I)V
 
     :cond_0
-    invoke-virtual {v3, v4, v5}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+    invoke-virtual {v4, v5, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
 
     add-int/lit8 v1, v1, 0x1
 
@@ -345,7 +337,7 @@
 
     and-long/2addr p1, v1
 
-    iput-wide p1, v0, Lkotlinx/coroutines/a/l;->bTx:J
+    iput-wide p1, v0, Lkotlinx/coroutines/a/l;->_state:J
 
     return-object v0
 .end method
@@ -360,7 +352,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lkotlinx/coroutines/a/l;->mask:I
 
@@ -380,7 +372,7 @@
 
     if-ne v0, p1, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lkotlinx/coroutines/a/l;->mask:I
 
@@ -398,7 +390,7 @@
 
 
 # virtual methods
-.method public final Gu()Lkotlinx/coroutines/a/l;
+.method public final Gt()Lkotlinx/coroutines/a/l;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -408,7 +400,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlinx/coroutines/a/l;->Gv()J
+    invoke-direct {p0}, Lkotlinx/coroutines/a/l;->Gu()J
 
     move-result-wide v0
 
@@ -432,7 +424,7 @@
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
-    iget-wide v3, p0, Lkotlinx/coroutines/a/l;->bTx:J
+    iget-wide v3, p0, Lkotlinx/coroutines/a/l;->_state:J
 
     const-wide/high16 v0, 0x3000000000000000L    # 1.727233711018889E-77
 
@@ -477,8 +469,6 @@
 
     and-int/2addr v1, v2
 
-    iget v2, p0, Lkotlinx/coroutines/a/l;->mask:I
-
     and-int/2addr v0, v2
 
     if-ne v1, v0, :cond_2
@@ -494,7 +484,7 @@
 
     and-int/2addr v0, v1
 
-    sget-object v1, Lkotlinx/coroutines/a/l;->bTy:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/a/l;->bTe:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     invoke-static {v3, v4, v0}, Lkotlinx/coroutines/a/l$a;->d(JI)J
 
@@ -508,7 +498,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lkotlinx/coroutines/a/l;->mask:I
 
@@ -521,7 +511,7 @@
     check-cast v0, Lkotlinx/coroutines/a/l;
 
     :cond_3
-    iget-wide v1, v0, Lkotlinx/coroutines/a/l;->bTx:J
+    iget-wide v1, v0, Lkotlinx/coroutines/a/l;->_state:J
 
     const-wide/high16 v3, 0x1000000000000000L
 
@@ -531,7 +521,7 @@
 
     if-eqz v3, :cond_4
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/l;->Gu()Lkotlinx/coroutines/a/l;
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/l;->Gt()Lkotlinx/coroutines/a/l;
 
     move-result-object v0
 
@@ -548,7 +538,7 @@
 .method public final isEmpty()Z
     .locals 7
 
-    iget-wide v0, p0, Lkotlinx/coroutines/a/l;->bTx:J
+    iget-wide v0, p0, Lkotlinx/coroutines/a/l;->_state:J
 
     const-wide/32 v2, 0x3fffffff
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/m.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/m.smali
index 0809d2a0aa..60eec78af5 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/m.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlinx/coroutines/a/m;
 .super Ljava/lang/Object;
+.source "Atomic.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/n.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/n.smali
index 5f530d748b..5c76011930 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/n.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/n.smali
@@ -1,9 +1,10 @@
 .class public final Lkotlinx/coroutines/a/n;
 .super Ljava/lang/Object;
+.source "LockFreeLinkedList.kt"
 
 
 # instance fields
-.field public final bTC:Lkotlinx/coroutines/a/i;
+.field public final bTi:Lkotlinx/coroutines/a/i;
 
 
 # direct methods
@@ -16,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/a/n;->bTC:Lkotlinx/coroutines/a/i;
+    iput-object p1, p0, Lkotlinx/coroutines/a/n;->bTi:Lkotlinx/coroutines/a/i;
 
     return-void
 .end method
@@ -32,7 +33,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/a/n;->bTC:Lkotlinx/coroutines/a/i;
+    iget-object v1, p0, Lkotlinx/coroutines/a/n;->bTi:Lkotlinx/coroutines/a/i;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/o.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/o.smali
index 392f8151b1..e45008b047 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/o.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/o.smali
@@ -1,9 +1,10 @@
 .class public final Lkotlinx/coroutines/a/o;
 .super Ljava/lang/Object;
+.source "Symbol.kt"
 
 
 # instance fields
-.field private final bTD:Ljava/lang/String;
+.field private final bTj:Ljava/lang/String;
 
 
 # direct methods
@@ -16,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/a/o;->bTD:Ljava/lang/String;
+    iput-object p1, p0, Lkotlinx/coroutines/a/o;->bTj:Ljava/lang/String;
 
     return-void
 .end method
@@ -26,7 +27,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/o;->bTD:Ljava/lang/String;
+    iget-object v0, p0, Lkotlinx/coroutines/a/o;->bTj:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/p.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/p.smali
index c5ebc5bbc8..79f851b018 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/p.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/p.smali
@@ -1,9 +1,10 @@
 .class public final Lkotlinx/coroutines/a/p;
 .super Ljava/lang/Object;
+.source "SystemProps.kt"
 
 
 # static fields
-.field private static final bTE:I
+.field private static final bTk:I
 
 
 # direct methods
@@ -18,15 +19,15 @@
 
     move-result v0
 
-    sput v0, Lkotlinx/coroutines/a/p;->bTE:I
+    sput v0, Lkotlinx/coroutines/a/p;->bTk:I
 
     return-void
 .end method
 
-.method public static final Gw()I
+.method public static final Gv()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/a/p;->bTE:I
+    sget v0, Lkotlinx/coroutines/a/p;->bTk:I
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/q$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/q$a.smali
index a5933c52c9..78848b2f58 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/q$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/q$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlinx/coroutines/a/q$a;
 .super Lkotlin/jvm/internal/k;
+.source "ThreadContext.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field public static final bTK:Lkotlinx/coroutines/a/q$a;
+.field public static final bTq:Lkotlinx/coroutines/a/q$a;
 
 
 # direct methods
@@ -39,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/a/q$a;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/a/q$a;->bTK:Lkotlinx/coroutines/a/q$a;
+    sput-object v0, Lkotlinx/coroutines/a/q$a;->bTq:Lkotlinx/coroutines/a/q$a;
 
     return-void
 .end method
@@ -65,7 +66,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v0, p2, Lkotlinx/coroutines/az;
+    instance-of v0, p2, Lkotlinx/coroutines/ay;
 
     if-eqz v0, :cond_3
 
@@ -103,6 +104,8 @@
 
     move-result-object p1
 
+    return-object p1
+
     :cond_3
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/q$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/q$b.smali
index 743279b94e..dc5d885b85 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/q$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/q$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotlinx/coroutines/a/q$b;
 .super Lkotlin/jvm/internal/k;
+.source "ThreadContext.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -19,17 +20,17 @@
     value = {
         "Lkotlin/jvm/internal/k;",
         "Lkotlin/jvm/functions/Function2<",
-        "Lkotlinx/coroutines/az<",
+        "Lkotlinx/coroutines/ay<",
         "*>;",
         "Lkotlin/c/e$b;",
-        "Lkotlinx/coroutines/az<",
+        "Lkotlinx/coroutines/ay<",
         "*>;>;"
     }
 .end annotation
 
 
 # static fields
-.field public static final bTL:Lkotlinx/coroutines/a/q$b;
+.field public static final bTr:Lkotlinx/coroutines/a/q$b;
 
 
 # direct methods
@@ -40,7 +41,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/a/q$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/a/q$b;->bTL:Lkotlinx/coroutines/a/q$b;
+    sput-object v0, Lkotlinx/coroutines/a/q$b;->bTr:Lkotlinx/coroutines/a/q$b;
 
     return-void
 .end method
@@ -60,7 +61,7 @@
 .method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    check-cast p1, Lkotlinx/coroutines/az;
+    check-cast p1, Lkotlinx/coroutines/ay;
 
     check-cast p2, Lkotlin/c/e$b;
 
@@ -73,14 +74,14 @@
     return-object p1
 
     :cond_0
-    instance-of p1, p2, Lkotlinx/coroutines/az;
+    instance-of p1, p2, Lkotlinx/coroutines/ay;
 
     if-nez p1, :cond_1
 
     const/4 p2, 0x0
 
     :cond_1
-    check-cast p2, Lkotlinx/coroutines/az;
+    check-cast p2, Lkotlinx/coroutines/ay;
 
     return-object p2
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/q$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/q$c.smali
index ec238c1cab..8f45c1d9f7 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/q$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/q$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotlinx/coroutines/a/q$c;
 .super Lkotlin/jvm/internal/k;
+.source "ThreadContext.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field public static final bTM:Lkotlinx/coroutines/a/q$c;
+.field public static final bTs:Lkotlinx/coroutines/a/q$c;
 
 
 # direct methods
@@ -39,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/a/q$c;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/a/q$c;->bTM:Lkotlinx/coroutines/a/q$c;
+    sput-object v0, Lkotlinx/coroutines/a/q$c;->bTs:Lkotlinx/coroutines/a/q$c;
 
     return-void
 .end method
@@ -71,25 +72,25 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v0, p2, Lkotlinx/coroutines/az;
+    instance-of v0, p2, Lkotlinx/coroutines/ay;
 
     if-eqz v0, :cond_0
 
-    check-cast p2, Lkotlinx/coroutines/az;
+    check-cast p2, Lkotlinx/coroutines/ay;
 
     iget-object v0, p1, Lkotlinx/coroutines/a/u;->bRx:Lkotlin/c/e;
 
-    iget-object v1, p1, Lkotlinx/coroutines/a/u;->bTQ:[Ljava/lang/Object;
+    iget-object v1, p1, Lkotlinx/coroutines/a/u;->bTw:[Ljava/lang/Object;
 
-    iget v2, p1, Lkotlinx/coroutines/a/u;->bTR:I
+    iget v2, p1, Lkotlinx/coroutines/a/u;->bTx:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p1, Lkotlinx/coroutines/a/u;->bTR:I
+    iput v3, p1, Lkotlinx/coroutines/a/u;->bTx:I
 
     aget-object v1, v1, v2
 
-    invoke-interface {p2, v0, v1}, Lkotlinx/coroutines/az;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+    invoke-interface {p2, v0, v1}, Lkotlinx/coroutines/ay;->a(Lkotlin/c/e;Ljava/lang/Object;)V
 
     :cond_0
     return-object p1
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/q$d.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/q$d.smali
index ad2e6c778e..e8644ba5c7 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/q$d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/q$d.smali
@@ -1,5 +1,6 @@
 .class final Lkotlinx/coroutines/a/q$d;
 .super Lkotlin/jvm/internal/k;
+.source "ThreadContext.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field public static final bTN:Lkotlinx/coroutines/a/q$d;
+.field public static final bTt:Lkotlinx/coroutines/a/q$d;
 
 
 # direct methods
@@ -39,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/a/q$d;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/a/q$d;->bTN:Lkotlinx/coroutines/a/q$d;
+    sput-object v0, Lkotlinx/coroutines/a/q$d;->bTt:Lkotlinx/coroutines/a/q$d;
 
     return-void
 .end method
@@ -71,25 +72,25 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v0, p2, Lkotlinx/coroutines/az;
+    instance-of v0, p2, Lkotlinx/coroutines/ay;
 
     if-eqz v0, :cond_0
 
-    check-cast p2, Lkotlinx/coroutines/az;
+    check-cast p2, Lkotlinx/coroutines/ay;
 
     iget-object v0, p1, Lkotlinx/coroutines/a/u;->bRx:Lkotlin/c/e;
 
-    invoke-interface {p2, v0}, Lkotlinx/coroutines/az;->c(Lkotlin/c/e;)Ljava/lang/Object;
+    invoke-interface {p2, v0}, Lkotlinx/coroutines/ay;->c(Lkotlin/c/e;)Ljava/lang/Object;
 
     move-result-object p2
 
-    iget-object v0, p1, Lkotlinx/coroutines/a/u;->bTQ:[Ljava/lang/Object;
+    iget-object v0, p1, Lkotlinx/coroutines/a/u;->bTw:[Ljava/lang/Object;
 
-    iget v1, p1, Lkotlinx/coroutines/a/u;->bTR:I
+    iget v1, p1, Lkotlinx/coroutines/a/u;->bTx:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p1, Lkotlinx/coroutines/a/u;->bTR:I
+    iput v2, p1, Lkotlinx/coroutines/a/u;->bTx:I
 
     aput-object p2, v0, v1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/q.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/q.smali
index c91e152c3e..78d793cecb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/q.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/q.smali
@@ -1,11 +1,12 @@
 .class public final Lkotlinx/coroutines/a/q;
 .super Ljava/lang/Object;
+.source "ThreadContext.kt"
 
 
 # static fields
-.field private static final bTF:Lkotlinx/coroutines/a/o;
+.field private static final bTl:Lkotlinx/coroutines/a/o;
 
-.field private static final bTG:Lkotlin/jvm/functions/Function2;
+.field private static final bTm:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -17,20 +18,20 @@
     .end annotation
 .end field
 
-.field private static final bTH:Lkotlin/jvm/functions/Function2;
+.field private static final bTn:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
-            "Lkotlinx/coroutines/az<",
+            "Lkotlinx/coroutines/ay<",
             "*>;",
             "Lkotlin/c/e$b;",
-            "Lkotlinx/coroutines/az<",
+            "Lkotlinx/coroutines/ay<",
             "*>;>;"
         }
     .end annotation
 .end field
 
-.field private static final bTI:Lkotlin/jvm/functions/Function2;
+.field private static final bTo:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -42,7 +43,7 @@
     .end annotation
 .end field
 
-.field private static final bTJ:Lkotlin/jvm/functions/Function2;
+.field private static final bTp:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -65,31 +66,31 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/a/q;->bTF:Lkotlinx/coroutines/a/o;
+    sput-object v0, Lkotlinx/coroutines/a/q;->bTl:Lkotlinx/coroutines/a/o;
 
-    sget-object v0, Lkotlinx/coroutines/a/q$a;->bTK:Lkotlinx/coroutines/a/q$a;
+    sget-object v0, Lkotlinx/coroutines/a/q$a;->bTq:Lkotlinx/coroutines/a/q$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/a/q;->bTG:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/a/q;->bTm:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/a/q$b;->bTL:Lkotlinx/coroutines/a/q$b;
+    sget-object v0, Lkotlinx/coroutines/a/q$b;->bTr:Lkotlinx/coroutines/a/q$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/a/q;->bTH:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/a/q;->bTn:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/a/q$d;->bTN:Lkotlinx/coroutines/a/q$d;
+    sget-object v0, Lkotlinx/coroutines/a/q$d;->bTt:Lkotlinx/coroutines/a/q$d;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/a/q;->bTI:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/a/q;->bTo:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/a/q$c;->bTM:Lkotlinx/coroutines/a/q$c;
+    sget-object v0, Lkotlinx/coroutines/a/q$c;->bTs:Lkotlinx/coroutines/a/q$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/a/q;->bTJ:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/a/q;->bTp:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
@@ -101,7 +102,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/a/q;->bTF:Lkotlinx/coroutines/a/o;
+    sget-object v0, Lkotlinx/coroutines/a/q;->bTl:Lkotlinx/coroutines/a/o;
 
     if-ne p1, v0, :cond_0
 
@@ -118,9 +119,9 @@
 
     const/4 v1, 0x0
 
-    iput v1, v0, Lkotlinx/coroutines/a/u;->bTR:I
+    iput v1, v0, Lkotlinx/coroutines/a/u;->bTx:I
 
-    sget-object v0, Lkotlinx/coroutines/a/q;->bTJ:Lkotlin/jvm/functions/Function2;
+    sget-object v0, Lkotlinx/coroutines/a/q;->bTp:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, p1, v0}, Lkotlin/c/e;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -129,7 +130,7 @@
     :cond_1
     const/4 v0, 0x0
 
-    sget-object v1, Lkotlinx/coroutines/a/q;->bTH:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/a/q;->bTn:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, v0, v1}, Lkotlin/c/e;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -137,9 +138,9 @@
 
     if-eqz v0, :cond_2
 
-    check-cast v0, Lkotlinx/coroutines/az;
+    check-cast v0, Lkotlinx/coroutines/ay;
 
-    invoke-interface {v0, p0, p1}, Lkotlinx/coroutines/az;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+    invoke-interface {v0, p0, p1}, Lkotlinx/coroutines/ay;->a(Lkotlin/c/e;Ljava/lang/Object;)V
 
     return-void
 
@@ -175,7 +176,7 @@
 
     if-ne p1, v0, :cond_1
 
-    sget-object p0, Lkotlinx/coroutines/a/q;->bTF:Lkotlinx/coroutines/a/o;
+    sget-object p0, Lkotlinx/coroutines/a/q;->bTl:Lkotlinx/coroutines/a/o;
 
     return-object p0
 
@@ -194,7 +195,7 @@
 
     invoke-direct {v0, p0, p1}, Lkotlinx/coroutines/a/u;-><init>(Lkotlin/c/e;I)V
 
-    sget-object p1, Lkotlinx/coroutines/a/q;->bTI:Lkotlin/jvm/functions/Function2;
+    sget-object p1, Lkotlinx/coroutines/a/q;->bTo:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, v0, p1}, Lkotlin/c/e;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -205,9 +206,9 @@
     :cond_2
     if-eqz p1, :cond_3
 
-    check-cast p1, Lkotlinx/coroutines/az;
+    check-cast p1, Lkotlinx/coroutines/ay;
 
-    invoke-interface {p1, p0}, Lkotlinx/coroutines/az;->c(Lkotlin/c/e;)Ljava/lang/Object;
+    invoke-interface {p1, p0}, Lkotlinx/coroutines/ay;->c(Lkotlin/c/e;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -236,7 +237,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/a/q;->bTG:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/a/q;->bTm:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, v0, v1}, Lkotlin/c/e;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -244,7 +245,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     return-object p0
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/r.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/r.smali
index f68d61bba1..f0466c9d9a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/r.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/r.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/a/r;
 .super Ljava/lang/ThreadLocal;
+.source "ThreadLocal.kt"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # instance fields
-.field private final bTO:Lkotlin/jvm/functions/Function0;
+.field private final bTu:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -42,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/ThreadLocal;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/a/r;->bTO:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lkotlinx/coroutines/a/r;->bTu:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -57,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/r;->bTO:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lkotlinx/coroutines/a/r;->bTu:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/s.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/s.smali
index 51c3b41dc2..062d7f896b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/s.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/s.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/a/s;
 .super Ljava/lang/Object;
+.source "ThreadSafeHeap.kt"
 
 
 # annotations
@@ -16,7 +17,7 @@
 
 
 # instance fields
-.field public bTP:[Lkotlinx/coroutines/a/t;
+.field public bTv:[Lkotlinx/coroutines/a/t;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -38,7 +39,7 @@
 
 
 # virtual methods
-.method public final Gx()Lkotlinx/coroutines/a/t;
+.method public final Gw()Lkotlinx/coroutines/a/t;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -46,7 +47,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/s;->bTP:[Lkotlinx/coroutines/a/t;
+    iget-object v0, p0, Lkotlinx/coroutines/a/s;->bTv:[Lkotlinx/coroutines/a/t;
 
     if-eqz v0, :cond_0
 
@@ -77,11 +78,11 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lkotlinx/coroutines/a/s;->bTP:[Lkotlinx/coroutines/a/t;
+    iget-object v1, p0, Lkotlinx/coroutines/a/s;->bTv:[Lkotlinx/coroutines/a/t;
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     add-int/lit8 v2, v0, 0x1
@@ -94,7 +95,7 @@
 
     if-nez v3, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     check-cast v3, Ljava/lang/Comparable;
@@ -103,7 +104,7 @@
 
     if-nez v4, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_3
     invoke-interface {v3, v4}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
@@ -119,7 +120,7 @@
 
     if-nez v2, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_5
     check-cast v2, Ljava/lang/Comparable;
@@ -128,7 +129,7 @@
 
     if-nez v1, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_6
     invoke-interface {v2, v1}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
@@ -167,25 +168,25 @@
 .method public final swap(II)V
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/a/s;->bTP:[Lkotlinx/coroutines/a/t;
+    iget-object v0, p0, Lkotlinx/coroutines/a/s;->bTv:[Lkotlinx/coroutines/a/t;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_0
     aget-object v1, v0, p2
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     aget-object v2, v0, p1
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_2
     aput-object v1, v0, p1
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/t.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/t.smali
index 21a8c7c91d..9a0c433185 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/t.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/t.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lkotlinx/coroutines/a/t;
 .super Ljava/lang/Object;
+.source "ThreadSafeHeap.kt"
 
 
 # virtual methods
-.method public abstract Gy()Lkotlinx/coroutines/a/s;
+.method public abstract Gx()Lkotlinx/coroutines/a/s;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/u.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/u.smali
index 9ec05e0607..9bc25be8c1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/u.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/u.smali
@@ -1,13 +1,14 @@
 .class final Lkotlinx/coroutines/a/u;
 .super Ljava/lang/Object;
+.source "ThreadContext.kt"
 
 
 # instance fields
 .field final bRx:Lkotlin/c/e;
 
-.field bTQ:[Ljava/lang/Object;
+.field bTw:[Ljava/lang/Object;
 
-.field bTR:I
+.field bTx:I
 
 
 # direct methods
@@ -24,7 +25,7 @@
 
     new-array p1, p2, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lkotlinx/coroutines/a/u;->bTQ:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/a/u;->bTw:[Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aa.smali b/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
index ddea4a08f5..d5ce4269a0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
@@ -1,62 +1,8 @@
-.class public final Lkotlinx/coroutines/aa;
+.class public interface abstract Lkotlinx/coroutines/aa;
 .super Ljava/lang/Object;
+.source "Job.kt"
 
 
-# static fields
-.field private static final bSd:Lkotlinx/coroutines/k;
-
-.field private static final bSe:Lkotlinx/coroutines/k;
-
-.field private static final bSf:Lkotlinx/coroutines/k;
-
-.field public static final bSg:Lkotlinx/coroutines/aa;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lkotlinx/coroutines/aa;
-
-    invoke-direct {v0}, Lkotlinx/coroutines/aa;-><init>()V
-
-    sput-object v0, Lkotlinx/coroutines/aa;->bSg:Lkotlinx/coroutines/aa;
-
-    invoke-static {}, Lkotlinx/coroutines/j;->FE()Lkotlinx/coroutines/k;
-
-    move-result-object v0
-
-    sput-object v0, Lkotlinx/coroutines/aa;->bSd:Lkotlinx/coroutines/k;
-
-    sget-object v0, Lkotlinx/coroutines/bc;->bSM:Lkotlinx/coroutines/bc;
-
-    check-cast v0, Lkotlinx/coroutines/k;
-
-    sput-object v0, Lkotlinx/coroutines/aa;->bSe:Lkotlinx/coroutines/k;
-
-    sget-object v0, Lkotlinx/coroutines/c/c;->bUC:Lkotlinx/coroutines/c/c;
-
-    invoke-static {}, Lkotlinx/coroutines/c/c;->GO()Lkotlinx/coroutines/k;
-
-    move-result-object v0
-
-    sput-object v0, Lkotlinx/coroutines/aa;->bSf:Lkotlinx/coroutines/k;
-
-    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 FP()Lkotlinx/coroutines/k;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/aa;->bSd:Lkotlinx/coroutines/k;
-
-    return-object v0
+# virtual methods
+.method public abstract dispose()V
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ab.smali b/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
index 16c6067e55..a773747181 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
@@ -1,7 +1,74 @@
-.class public interface abstract Lkotlinx/coroutines/ab;
+.class final Lkotlinx/coroutines/ab;
 .super Ljava/lang/Object;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/ah;
+
+
+# instance fields
+.field final bSd:Z
+
+
+# direct methods
+.method public constructor <init>(Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Lkotlinx/coroutines/ab;->bSd:Z
+
+    return-void
+.end method
 
 
 # virtual methods
-.method public abstract dispose()V
+.method public final FP()Lkotlinx/coroutines/au;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public final isActive()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lkotlinx/coroutines/ab;->bSd:Z
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Empty{"
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-boolean v1, p0, Lkotlinx/coroutines/ab;->bSd:Z
+
+    if-eqz v1, :cond_0
+
+    const-string v1, "Active"
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "New"
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x7d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ac.smali b/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
index a3352cbd6d..cf04bd1059 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
@@ -1,73 +1,5 @@
-.class final Lkotlinx/coroutines/ac;
+.class public interface abstract Lkotlinx/coroutines/ac;
 .super Ljava/lang/Object;
 
 # interfaces
-.implements Lkotlinx/coroutines/ai;
-
-
-# instance fields
-.field final bSh:Z
-
-
-# direct methods
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Lkotlinx/coroutines/ac;->bSh:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final FQ()Lkotlinx/coroutines/av;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final isActive()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lkotlinx/coroutines/ac;->bSh:Z
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "Empty{"
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-boolean v1, p0, Lkotlinx/coroutines/ac;->bSh:Z
-
-    if-eqz v1, :cond_0
-
-    const-string v1, "Active"
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "New"
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x7d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
+.implements Lkotlin/c/d;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ae$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/ad$a.smali
similarity index 81%
rename from com.discord/smali_classes2/kotlinx/coroutines/ae$a.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/ad$a.smali
index ce3afaab5b..45fccd4695 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ae$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ad$a.smali
@@ -1,16 +1,17 @@
-.class public abstract Lkotlinx/coroutines/ae$a;
+.class public abstract Lkotlinx/coroutines/ad$a;
 .super Ljava/lang/Object;
+.source "EventLoop.kt"
 
 # interfaces
 .implements Ljava/lang/Comparable;
 .implements Ljava/lang/Runnable;
 .implements Lkotlinx/coroutines/a/t;
-.implements Lkotlinx/coroutines/ab;
+.implements Lkotlinx/coroutines/aa;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/ae;
+    value = Lkotlinx/coroutines/ad;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,11 +23,11 @@
     value = {
         "Ljava/lang/Object;",
         "Ljava/lang/Comparable<",
-        "Lkotlinx/coroutines/ae$a;",
+        "Lkotlinx/coroutines/ad$a;",
         ">;",
         "Ljava/lang/Runnable;",
         "Lkotlinx/coroutines/a/t;",
-        "Lkotlinx/coroutines/ab;"
+        "Lkotlinx/coroutines/aa;"
     }
 .end annotation
 
@@ -45,7 +46,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lkotlinx/coroutines/ae$a;->nanoTime:J
+    iget-wide v1, p0, Lkotlinx/coroutines/ad$a;->nanoTime:J
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ad.smali b/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
index c90927b34b..15aed53200 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
@@ -1,5 +1,926 @@
-.class public interface abstract Lkotlinx/coroutines/ad;
-.super Ljava/lang/Object;
+.class public abstract Lkotlinx/coroutines/ad;
+.super Lkotlinx/coroutines/k;
+.source "EventLoop.kt"
 
 # interfaces
-.implements Lkotlin/c/d;
+.implements Lkotlinx/coroutines/ac;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lkotlinx/coroutines/ad$a;
+    }
+.end annotation
+
+
+# static fields
+.field private static final bSe:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+.field private static final bSf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
+# instance fields
+.field volatile _delayed:Ljava/lang/Object;
+
+.field volatile _queue:Ljava/lang/Object;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Lkotlinx/coroutines/ad;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "_queue"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Lkotlinx/coroutines/ad;->bSe:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const-class v0, Lkotlinx/coroutines/ad;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "_delayed"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Lkotlinx/coroutines/ad;->bSf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lkotlinx/coroutines/ad;->_queue:Ljava/lang/Object;
+
+    iput-object v0, p0, Lkotlinx/coroutines/ad;->_delayed:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method private final FQ()Z
+    .locals 3
+
+    iget-object v0, p0, Lkotlinx/coroutines/ad;->_queue:Ljava/lang/Object;
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    instance-of v2, v0, Lkotlinx/coroutines/a/l;
+
+    if-eqz v2, :cond_1
+
+    check-cast v0, Lkotlinx/coroutines/a/l;
+
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/l;->isEmpty()Z
+
+    move-result v0
+
+    return v0
+
+    :cond_1
+    invoke-static {}, Lkotlinx/coroutines/ae;->FT()Lkotlinx/coroutines/a/o;
+
+    move-result-object v2
+
+    if-ne v0, v2, :cond_2
+
+    return v1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method private final FR()Z
+    .locals 1
+
+    iget-object v0, p0, Lkotlinx/coroutines/ad;->_delayed:Ljava/lang/Object;
+
+    check-cast v0, Lkotlinx/coroutines/a/s;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/s;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_1
+    :goto_0
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method private final o(Ljava/lang/Runnable;)Z
+    .locals 5
+
+    :cond_0
+    :goto_0
+    iget-object v0, p0, Lkotlinx/coroutines/ad;->_queue:Ljava/lang/Object;
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_1
+
+    sget-object v0, Lkotlinx/coroutines/ad;->bSe:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_1
+    instance-of v2, v0, Lkotlinx/coroutines/a/l;
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_3
+
+    if-eqz v0, :cond_2
+
+    move-object v2, v0
+
+    check-cast v2, Lkotlinx/coroutines/a/l;
+
+    invoke-virtual {v2, p1}, Lkotlinx/coroutines/a/l;->bU(Ljava/lang/Object;)I
+
+    move-result v4
+
+    packed-switch v4, :pswitch_data_0
+
+    goto :goto_0
+
+    :pswitch_0
+    return v3
+
+    :pswitch_1
+    sget-object v1, Lkotlinx/coroutines/ad;->bSe:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v2}, Lkotlinx/coroutines/a/l;->Gt()Lkotlinx/coroutines/a/l;
+
+    move-result-object v2
+
+    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :pswitch_2
+    return v1
+
+    :cond_2
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.Queue<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> /* = kotlinx.coroutines.internal.LockFreeMPSCQueueCore<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> */"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    invoke-static {}, Lkotlinx/coroutines/ae;->FT()Lkotlinx/coroutines/a/o;
+
+    move-result-object v2
+
+    if-ne v0, v2, :cond_4
+
+    return v3
+
+    :cond_4
+    new-instance v2, Lkotlinx/coroutines/a/l;
+
+    const/16 v3, 0x8
+
+    invoke-direct {v2, v3}, Lkotlinx/coroutines/a/l;-><init>(I)V
+
+    if-eqz v0, :cond_5
+
+    move-object v3, v0
+
+    check-cast v3, Ljava/lang/Runnable;
+
+    invoke-virtual {v2, v3}, Lkotlinx/coroutines/a/l;->bU(Ljava/lang/Object;)I
+
+    invoke-virtual {v2, p1}, Lkotlinx/coroutines/a/l;->bU(Ljava/lang/Object;)I
+
+    sget-object v3, Lkotlinx/coroutines/ad;->bSe:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_5
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.Runnable /* = java.lang.Runnable */"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    return-void
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+
+# virtual methods
+.method public final FS()J
+    .locals 26
+
+    move-object/from16 v1, p0
+
+    iget-object v0, v1, Lkotlinx/coroutines/ad;->_delayed:Ljava/lang/Object;
+
+    move-object v2, v0
+
+    check-cast v2, Lkotlinx/coroutines/a/s;
+
+    const-wide/16 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    if-eqz v2, :cond_b
+
+    invoke-virtual {v2}, Lkotlinx/coroutines/a/s;->isEmpty()Z
+
+    move-result v7
+
+    if-nez v7, :cond_b
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    move-result-object v7
+
+    invoke-interface {v7}, Lkotlinx/coroutines/az;->nanoTime()J
+
+    move-result-wide v7
+
+    :goto_0
+    monitor-enter v2
+
+    :try_start_0
+    invoke-virtual {v2}, Lkotlinx/coroutines/a/s;->Gw()Lkotlinx/coroutines/a/t;
+
+    move-result-object v9
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v9, :cond_0
+
+    monitor-exit v2
+
+    move-object v10, v6
+
+    goto/16 :goto_6
+
+    :cond_0
+    :try_start_1
+    check-cast v9, Lkotlinx/coroutines/ad$a;
+
+    iget-wide v10, v9, Lkotlinx/coroutines/ad$a;->nanoTime:J
+
+    sub-long v10, v7, v10
+
+    cmp-long v12, v10, v3
+
+    if-ltz v12, :cond_1
+
+    const/4 v10, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v10, 0x0
+
+    :goto_1
+    if-eqz v10, :cond_2
+
+    check-cast v9, Ljava/lang/Runnable;
+
+    invoke-direct {v1, v9}, Lkotlinx/coroutines/ad;->o(Ljava/lang/Runnable;)Z
+
+    move-result v9
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v9, 0x0
+
+    :goto_2
+    if-eqz v9, :cond_a
+
+    iget v9, v2, Lkotlinx/coroutines/a/s;->size:I
+
+    if-lez v9, :cond_3
+
+    const/4 v9, 0x1
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v9, 0x0
+
+    :goto_3
+    if-eqz v9, :cond_9
+
+    iget-object v9, v2, Lkotlinx/coroutines/a/s;->bTv:[Lkotlinx/coroutines/a/t;
+
+    if-nez v9, :cond_4
+
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
+
+    :cond_4
+    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
+
+    add-int/lit8 v10, v10, -0x1
+
+    iput v10, v2, Lkotlinx/coroutines/a/s;->size:I
+
+    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
+
+    if-lez v10, :cond_5
+
+    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
+
+    invoke-virtual {v2, v5, v10}, Lkotlinx/coroutines/a/s;->swap(II)V
+
+    invoke-virtual {v2, v5}, Lkotlinx/coroutines/a/s;->eY(I)V
+
+    :cond_5
+    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
+
+    aget-object v10, v9, v10
+
+    if-nez v10, :cond_6
+
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
+
+    :cond_6
+    invoke-interface {v10}, Lkotlinx/coroutines/a/t;->Gx()Lkotlinx/coroutines/a/s;
+
+    move-result-object v11
+
+    move-object v12, v2
+
+    check-cast v12, Lkotlinx/coroutines/a/s;
+
+    if-ne v11, v12, :cond_7
+
+    const/4 v11, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    const/4 v11, 0x0
+
+    :goto_4
+    if-eqz v11, :cond_8
+
+    iget v11, v2, Lkotlinx/coroutines/a/s;->size:I
+
+    aput-object v6, v9, v11
+
+    goto :goto_5
+
+    :cond_8
+    const-string v0, "Check failed."
+
+    new-instance v3, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v3, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v3, Ljava/lang/Throwable;
+
+    throw v3
+
+    :cond_9
+    const-string v0, "Check failed."
+
+    new-instance v3, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v3, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v3, Ljava/lang/Throwable;
+
+    throw v3
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :cond_a
+    move-object v10, v6
+
+    :goto_5
+    monitor-exit v2
+
+    :goto_6
+    check-cast v10, Lkotlinx/coroutines/ad$a;
+
+    if-eqz v10, :cond_b
+
+    goto/16 :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v2
+
+    throw v0
+
+    :cond_b
+    :goto_7
+    iget-object v2, v1, Lkotlinx/coroutines/ad;->_queue:Ljava/lang/Object;
+
+    if-nez v2, :cond_c
+
+    goto/16 :goto_b
+
+    :cond_c
+    instance-of v7, v2, Lkotlinx/coroutines/a/l;
+
+    if-eqz v7, :cond_18
+
+    if-eqz v2, :cond_17
+
+    move-object v7, v2
+
+    check-cast v7, Lkotlinx/coroutines/a/l;
+
+    iget-wide v10, v7, Lkotlinx/coroutines/a/l;->_state:J
+
+    const-wide/high16 v14, 0x1000000000000000L
+
+    and-long v8, v10, v14
+
+    cmp-long v12, v8, v3
+
+    if-eqz v12, :cond_d
+
+    sget-object v8, Lkotlinx/coroutines/a/l;->bTg:Lkotlinx/coroutines/a/o;
+
+    move-object v4, v8
+
+    goto/16 :goto_a
+
+    :cond_d
+    const-wide/32 v16, 0x3fffffff
+
+    and-long v8, v10, v16
+
+    shr-long/2addr v8, v5
+
+    long-to-int v12, v8
+
+    const-wide v8, 0xfffffffc0000000L
+
+    and-long/2addr v8, v10
+
+    const/16 v13, 0x1e
+
+    shr-long/2addr v8, v13
+
+    long-to-int v8, v8
+
+    iget v9, v7, Lkotlinx/coroutines/a/l;->mask:I
+
+    and-int/2addr v8, v9
+
+    iget v9, v7, Lkotlinx/coroutines/a/l;->mask:I
+
+    and-int/2addr v9, v12
+
+    if-ne v8, v9, :cond_e
+
+    move-object v4, v6
+
+    goto/16 :goto_a
+
+    :cond_e
+    iget-object v8, v7, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v9, v7, Lkotlinx/coroutines/a/l;->mask:I
+
+    and-int/2addr v9, v12
+
+    invoke-virtual {v8, v9}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v13
+
+    if-nez v13, :cond_f
+
+    move-object v4, v6
+
+    goto/16 :goto_a
+
+    :cond_f
+    instance-of v8, v13, Lkotlinx/coroutines/a/l$b;
+
+    if-eqz v8, :cond_10
+
+    move-object v4, v6
+
+    goto :goto_a
+
+    :cond_10
+    add-int/lit8 v8, v12, 0x1
+
+    const v9, 0x3fffffff    # 1.9999999f
+
+    and-int/2addr v9, v8
+
+    sget-object v8, Lkotlinx/coroutines/a/l;->bTe:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    sget-object v18, Lkotlinx/coroutines/a/l;->bTh:Lkotlinx/coroutines/a/l$a;
+
+    invoke-static {v10, v11, v9}, Lkotlinx/coroutines/a/l$a;->c(JI)J
+
+    move-result-wide v18
+
+    move v0, v9
+
+    move-object v9, v7
+
+    move v3, v12
+
+    move-object v4, v13
+
+    move-wide/from16 v12, v18
+
+    invoke-virtual/range {v8 .. v13}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_11
+
+    iget-object v0, v7, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v8, v7, Lkotlinx/coroutines/a/l;->mask:I
+
+    and-int/2addr v3, v8
+
+    invoke-virtual {v0, v3, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    goto :goto_a
+
+    :cond_11
+    move-object v8, v7
+
+    check-cast v8, Lkotlinx/coroutines/a/l;
+
+    :cond_12
+    iget-wide v9, v8, Lkotlinx/coroutines/a/l;->_state:J
+
+    and-long v11, v9, v16
+
+    shr-long/2addr v11, v5
+
+    long-to-int v11, v11
+
+    if-ne v11, v3, :cond_13
+
+    const/4 v12, 0x1
+
+    goto :goto_8
+
+    :cond_13
+    const/4 v12, 0x0
+
+    :goto_8
+    if-eqz v12, :cond_16
+
+    and-long v12, v9, v14
+
+    const-wide/16 v18, 0x0
+
+    cmp-long v20, v12, v18
+
+    if-eqz v20, :cond_14
+
+    invoke-virtual {v8}, Lkotlinx/coroutines/a/l;->Gt()Lkotlinx/coroutines/a/l;
+
+    move-result-object v8
+
+    goto :goto_9
+
+    :cond_14
+    sget-object v20, Lkotlinx/coroutines/a/l;->bTe:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    sget-object v12, Lkotlinx/coroutines/a/l;->bTh:Lkotlinx/coroutines/a/l$a;
+
+    invoke-static {v9, v10, v0}, Lkotlinx/coroutines/a/l$a;->c(JI)J
+
+    move-result-wide v24
+
+    move-object/from16 v21, v8
+
+    move-wide/from16 v22, v9
+
+    invoke-virtual/range {v20 .. v25}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_12
+
+    iget-object v9, v8, Lkotlinx/coroutines/a/l;->bTf:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v8, v8, Lkotlinx/coroutines/a/l;->mask:I
+
+    and-int/2addr v8, v11
+
+    invoke-virtual {v9, v8, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    move-object v8, v6
+
+    :goto_9
+    if-nez v8, :cond_12
+
+    :goto_a
+    sget-object v0, Lkotlinx/coroutines/a/l;->bTg:Lkotlinx/coroutines/a/o;
+
+    if-eq v4, v0, :cond_15
+
+    move-object v6, v4
+
+    check-cast v6, Ljava/lang/Runnable;
+
+    goto :goto_b
+
+    :cond_15
+    sget-object v0, Lkotlinx/coroutines/ad;->bSe:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v7}, Lkotlinx/coroutines/a/l;->Gt()Lkotlinx/coroutines/a/l;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v1, v2, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    const-wide/16 v3, 0x0
+
+    goto/16 :goto_7
+
+    :cond_16
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v2, "This queue can have only one consumer"
+
+    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    throw v0
+
+    :cond_17
+    new-instance v0, Lkotlin/r;
+
+    const-string v2, "null cannot be cast to non-null type kotlinx.coroutines.Queue<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> /* = kotlinx.coroutines.internal.LockFreeMPSCQueueCore<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> */"
+
+    invoke-direct {v0, v2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_18
+    invoke-static {}, Lkotlinx/coroutines/ae;->FT()Lkotlinx/coroutines/a/o;
+
+    move-result-object v0
+
+    if-ne v2, v0, :cond_19
+
+    goto :goto_b
+
+    :cond_19
+    sget-object v0, Lkotlinx/coroutines/ad;->bSe:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v0, v1, v2, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_21
+
+    if-eqz v2, :cond_20
+
+    move-object v6, v2
+
+    check-cast v6, Ljava/lang/Runnable;
+
+    :goto_b
+    if-eqz v6, :cond_1a
+
+    invoke-interface {v6}, Ljava/lang/Runnable;->run()V
+
+    :cond_1a
+    iget-object v0, v1, Lkotlinx/coroutines/ad;->_queue:Ljava/lang/Object;
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    if-eqz v0, :cond_1d
+
+    instance-of v4, v0, Lkotlinx/coroutines/a/l;
+
+    if-eqz v4, :cond_1b
+
+    check-cast v0, Lkotlinx/coroutines/a/l;
+
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/l;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1d
+
+    const-wide/16 v4, 0x0
+
+    return-wide v4
+
+    :cond_1b
+    const-wide/16 v4, 0x0
+
+    invoke-static {}, Lkotlinx/coroutines/ae;->FT()Lkotlinx/coroutines/a/o;
+
+    move-result-object v6
+
+    if-ne v0, v6, :cond_1c
+
+    return-wide v2
+
+    :cond_1c
+    return-wide v4
+
+    :cond_1d
+    iget-object v0, v1, Lkotlinx/coroutines/ad;->_delayed:Ljava/lang/Object;
+
+    check-cast v0, Lkotlinx/coroutines/a/s;
+
+    if-nez v0, :cond_1e
+
+    return-wide v2
+
+    :cond_1e
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/s;->Gw()Lkotlinx/coroutines/a/t;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlinx/coroutines/ad$a;
+
+    if-nez v0, :cond_1f
+
+    return-wide v2
+
+    :cond_1f
+    iget-wide v2, v0, Lkotlinx/coroutines/ad$a;->nanoTime:J
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlinx/coroutines/az;->nanoTime()J
+
+    move-result-wide v4
+
+    sub-long/2addr v2, v4
+
+    const-wide/16 v7, 0x0
+
+    invoke-static {v2, v3, v7, v8}, Lkotlin/ranges/b;->f(JJ)J
+
+    move-result-wide v2
+
+    return-wide v2
+
+    :cond_20
+    new-instance v0, Lkotlin/r;
+
+    const-string v2, "null cannot be cast to non-null type kotlinx.coroutines.Runnable /* = java.lang.Runnable */"
+
+    invoke-direct {v0, v2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_21
+    const-wide/16 v3, 0x0
+
+    goto/16 :goto_7
+.end method
+
+.method public final a(Lkotlin/c/e;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p2}, Lkotlinx/coroutines/ad;->n(Ljava/lang/Runnable;)V
+
+    return-void
+.end method
+
+.method protected final isEmpty()Z
+    .locals 1
+
+    invoke-direct {p0}, Lkotlinx/coroutines/ad;->FQ()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/ad;->FR()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final n(Ljava/lang/Runnable;)V
+    .locals 2
+
+    move-object v0, p0
+
+    :goto_0
+    const-string v1, "task"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, p1}, Lkotlinx/coroutines/ad;->o(Ljava/lang/Runnable;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0}, Lkotlinx/coroutines/ad;->unpark()V
+
+    return-void
+
+    :cond_0
+    sget-object v0, Lkotlinx/coroutines/t;->bRS:Lkotlinx/coroutines/t;
+
+    goto :goto_0
+.end method
+
+.method protected abstract unpark()V
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ae.smali b/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
index e95d9bb65e..96c93e1822 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
@@ -1,923 +1,41 @@
-.class public abstract Lkotlinx/coroutines/ae;
-.super Lkotlinx/coroutines/k;
-
-# interfaces
-.implements Lkotlinx/coroutines/ad;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lkotlinx/coroutines/ae$a;
-    }
-.end annotation
+.class public final Lkotlinx/coroutines/ae;
+.super Ljava/lang/Object;
+.source "EventLoop.kt"
 
 
 # static fields
-.field private static final bSj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bSg:Lkotlinx/coroutines/a/o;
 
-.field private static final bSl:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-
-# instance fields
-.field volatile bSi:Ljava/lang/Object;
-
-.field volatile bSk:Ljava/lang/Object;
+.field private static final bSh:Lkotlinx/coroutines/a/o;
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Lkotlinx/coroutines/ae;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "bSi"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lkotlinx/coroutines/ae;->bSj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const-class v0, Lkotlinx/coroutines/ae;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "bSk"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lkotlinx/coroutines/ae;->bSl:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lkotlinx/coroutines/ae;->bSi:Ljava/lang/Object;
-
-    iput-object v0, p0, Lkotlinx/coroutines/ae;->bSk:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method private final FR()Z
-    .locals 3
-
-    iget-object v0, p0, Lkotlinx/coroutines/ae;->bSi:Ljava/lang/Object;
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    instance-of v2, v0, Lkotlinx/coroutines/a/l;
-
-    if-eqz v2, :cond_1
-
-    check-cast v0, Lkotlinx/coroutines/a/l;
-
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/l;->isEmpty()Z
-
-    move-result v0
-
-    return v0
-
-    :cond_1
-    invoke-static {}, Lkotlinx/coroutines/af;->FU()Lkotlinx/coroutines/a/o;
-
-    move-result-object v2
-
-    if-ne v0, v2, :cond_2
-
-    return v1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method private final FS()Z
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/ae;->bSk:Ljava/lang/Object;
-
-    check-cast v0, Lkotlinx/coroutines/a/s;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/s;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_1
-    :goto_0
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method private final o(Ljava/lang/Runnable;)Z
-    .locals 5
-
-    :cond_0
-    :goto_0
-    iget-object v0, p0, Lkotlinx/coroutines/ae;->bSi:Ljava/lang/Object;
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_1
-
-    sget-object v0, Lkotlinx/coroutines/ae;->bSj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_1
-    instance-of v2, v0, Lkotlinx/coroutines/a/l;
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_3
-
-    if-eqz v0, :cond_2
-
-    move-object v2, v0
-
-    check-cast v2, Lkotlinx/coroutines/a/l;
-
-    invoke-virtual {v2, p1}, Lkotlinx/coroutines/a/l;->bU(Ljava/lang/Object;)I
-
-    move-result v4
-
-    packed-switch v4, :pswitch_data_0
-
-    goto :goto_0
-
-    :pswitch_0
-    return v3
-
-    :pswitch_1
-    sget-object v1, Lkotlinx/coroutines/ae;->bSj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v2}, Lkotlinx/coroutines/a/l;->Gu()Lkotlinx/coroutines/a/l;
-
-    move-result-object v2
-
-    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :pswitch_2
-    return v1
-
-    :cond_2
-    new-instance p1, Lkotlin/r;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.Queue<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> /* = kotlinx.coroutines.internal.LockFreeMPSCQueueCore<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> */"
-
-    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    invoke-static {}, Lkotlinx/coroutines/af;->FU()Lkotlinx/coroutines/a/o;
-
-    move-result-object v2
-
-    if-ne v0, v2, :cond_4
-
-    return v3
-
-    :cond_4
-    new-instance v2, Lkotlinx/coroutines/a/l;
-
-    const/16 v3, 0x8
-
-    invoke-direct {v2, v3}, Lkotlinx/coroutines/a/l;-><init>(I)V
-
-    if-eqz v0, :cond_5
-
-    move-object v3, v0
-
-    check-cast v3, Ljava/lang/Runnable;
-
-    invoke-virtual {v2, v3}, Lkotlinx/coroutines/a/l;->bU(Ljava/lang/Object;)I
-
-    invoke-virtual {v2, p1}, Lkotlinx/coroutines/a/l;->bU(Ljava/lang/Object;)I
-
-    sget-object v3, Lkotlinx/coroutines/ae;->bSj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_5
-    new-instance p1, Lkotlin/r;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.Runnable /* = java.lang.Runnable */"
-
-    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-
-# virtual methods
-.method public final FT()J
-    .locals 26
-
-    move-object/from16 v1, p0
-
-    iget-object v0, v1, Lkotlinx/coroutines/ae;->bSk:Ljava/lang/Object;
-
-    move-object v2, v0
-
-    check-cast v2, Lkotlinx/coroutines/a/s;
-
-    const-wide/16 v3, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    if-eqz v2, :cond_b
-
-    invoke-virtual {v2}, Lkotlinx/coroutines/a/s;->isEmpty()Z
-
-    move-result v7
-
-    if-nez v7, :cond_b
-
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    move-result-object v7
-
-    invoke-interface {v7}, Lkotlinx/coroutines/ba;->nanoTime()J
-
-    move-result-wide v7
-
-    :goto_0
-    monitor-enter v2
-
-    :try_start_0
-    invoke-virtual {v2}, Lkotlinx/coroutines/a/s;->Gx()Lkotlinx/coroutines/a/t;
-
-    move-result-object v9
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v9, :cond_0
-
-    monitor-exit v2
-
-    move-object v10, v6
-
-    goto/16 :goto_6
-
-    :cond_0
-    :try_start_1
-    check-cast v9, Lkotlinx/coroutines/ae$a;
-
-    iget-wide v10, v9, Lkotlinx/coroutines/ae$a;->nanoTime:J
-
-    const/4 v12, 0x0
-
-    sub-long v10, v7, v10
-
-    cmp-long v12, v10, v3
-
-    if-ltz v12, :cond_1
-
-    const/4 v10, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v10, 0x0
-
-    :goto_1
-    if-eqz v10, :cond_2
-
-    check-cast v9, Ljava/lang/Runnable;
-
-    invoke-direct {v1, v9}, Lkotlinx/coroutines/ae;->o(Ljava/lang/Runnable;)Z
-
-    move-result v9
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v9, 0x0
-
-    :goto_2
-    if-eqz v9, :cond_a
-
-    iget v9, v2, Lkotlinx/coroutines/a/s;->size:I
-
-    if-lez v9, :cond_3
-
-    const/4 v9, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v9, 0x0
-
-    :goto_3
-    if-eqz v9, :cond_9
-
-    iget-object v9, v2, Lkotlinx/coroutines/a/s;->bTP:[Lkotlinx/coroutines/a/t;
-
-    if-nez v9, :cond_4
-
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
-
-    :cond_4
-    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
-
-    add-int/lit8 v10, v10, -0x1
-
-    iput v10, v2, Lkotlinx/coroutines/a/s;->size:I
-
-    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
-
-    if-lez v10, :cond_5
-
-    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
-
-    invoke-virtual {v2, v5, v10}, Lkotlinx/coroutines/a/s;->swap(II)V
-
-    invoke-virtual {v2, v5}, Lkotlinx/coroutines/a/s;->eY(I)V
-
-    :cond_5
-    iget v10, v2, Lkotlinx/coroutines/a/s;->size:I
-
-    aget-object v10, v9, v10
-
-    if-nez v10, :cond_6
-
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
-
-    :cond_6
-    invoke-interface {v10}, Lkotlinx/coroutines/a/t;->Gy()Lkotlinx/coroutines/a/s;
-
-    move-result-object v11
-
-    move-object v12, v2
-
-    check-cast v12, Lkotlinx/coroutines/a/s;
-
-    if-ne v11, v12, :cond_7
-
-    const/4 v11, 0x1
-
-    goto :goto_4
-
-    :cond_7
-    const/4 v11, 0x0
-
-    :goto_4
-    if-eqz v11, :cond_8
-
-    iget v11, v2, Lkotlinx/coroutines/a/s;->size:I
-
-    aput-object v6, v9, v11
-
-    goto :goto_5
-
-    :cond_8
-    const-string v0, "Check failed."
-
-    new-instance v3, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v3, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v3, Ljava/lang/Throwable;
-
-    throw v3
-
-    :cond_9
-    const-string v0, "Check failed."
-
-    new-instance v3, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v3, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v3, Ljava/lang/Throwable;
-
-    throw v3
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :cond_a
-    move-object v10, v6
-
-    :goto_5
-    monitor-exit v2
-
-    :goto_6
-    check-cast v10, Lkotlinx/coroutines/ae$a;
-
-    if-eqz v10, :cond_b
-
-    goto/16 :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v2
-
-    throw v0
-
-    :cond_b
-    :goto_7
-    iget-object v2, v1, Lkotlinx/coroutines/ae;->bSi:Ljava/lang/Object;
-
-    if-nez v2, :cond_c
-
-    goto/16 :goto_c
-
-    :cond_c
-    instance-of v7, v2, Lkotlinx/coroutines/a/l;
-
-    if-eqz v7, :cond_18
-
-    if-eqz v2, :cond_17
-
-    move-object v7, v2
-
-    check-cast v7, Lkotlinx/coroutines/a/l;
-
-    iget-wide v10, v7, Lkotlinx/coroutines/a/l;->bTx:J
-
-    const-wide/high16 v14, 0x1000000000000000L
-
-    and-long v8, v10, v14
-
-    cmp-long v12, v8, v3
-
-    if-eqz v12, :cond_d
-
-    sget-object v8, Lkotlinx/coroutines/a/l;->bTA:Lkotlinx/coroutines/a/o;
-
-    move-object v4, v8
-
-    goto/16 :goto_b
-
-    :cond_d
-    const-wide/32 v16, 0x3fffffff
-
-    and-long v8, v10, v16
-
-    shr-long/2addr v8, v5
-
-    long-to-int v12, v8
-
-    const-wide v8, 0xfffffffc0000000L
-
-    and-long/2addr v8, v10
-
-    const/16 v13, 0x1e
-
-    shr-long/2addr v8, v13
-
-    long-to-int v8, v8
-
-    iget v9, v7, Lkotlinx/coroutines/a/l;->mask:I
-
-    and-int/2addr v8, v9
-
-    iget v9, v7, Lkotlinx/coroutines/a/l;->mask:I
-
-    and-int/2addr v9, v12
-
-    if-ne v8, v9, :cond_e
-
-    :goto_8
-    move-object v4, v6
-
-    goto/16 :goto_b
-
-    :cond_e
-    iget-object v8, v7, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v9, v7, Lkotlinx/coroutines/a/l;->mask:I
-
-    and-int/2addr v9, v12
-
-    invoke-virtual {v8, v9}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v13
-
-    if-nez v13, :cond_f
-
-    goto :goto_8
-
-    :cond_f
-    instance-of v8, v13, Lkotlinx/coroutines/a/l$b;
-
-    if-eqz v8, :cond_10
-
-    goto :goto_8
-
-    :cond_10
-    add-int/lit8 v8, v12, 0x1
-
-    const v9, 0x3fffffff    # 1.9999999f
-
-    and-int/2addr v9, v8
-
-    sget-object v8, Lkotlinx/coroutines/a/l;->bTy:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    sget-object v18, Lkotlinx/coroutines/a/l;->bTB:Lkotlinx/coroutines/a/l$a;
-
-    invoke-static {v10, v11, v9}, Lkotlinx/coroutines/a/l$a;->c(JI)J
-
-    move-result-wide v18
-
-    move v0, v9
-
-    move-object v9, v7
-
-    move v3, v12
-
-    move-object v4, v13
-
-    move-wide/from16 v12, v18
-
-    invoke-virtual/range {v8 .. v13}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_11
-
-    iget-object v0, v7, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v8, v7, Lkotlinx/coroutines/a/l;->mask:I
-
-    and-int/2addr v3, v8
-
-    invoke-virtual {v0, v3, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    goto :goto_b
-
-    :cond_11
-    move-object v8, v7
-
-    check-cast v8, Lkotlinx/coroutines/a/l;
-
-    :cond_12
-    iget-wide v9, v8, Lkotlinx/coroutines/a/l;->bTx:J
-
-    and-long v11, v9, v16
-
-    shr-long/2addr v11, v5
-
-    long-to-int v11, v11
-
-    if-ne v11, v3, :cond_13
-
-    const/4 v12, 0x1
-
-    goto :goto_9
-
-    :cond_13
-    const/4 v12, 0x0
-
-    :goto_9
-    if-eqz v12, :cond_16
-
-    and-long v12, v9, v14
-
-    const-wide/16 v18, 0x0
-
-    cmp-long v20, v12, v18
-
-    if-eqz v20, :cond_14
-
-    invoke-virtual {v8}, Lkotlinx/coroutines/a/l;->Gu()Lkotlinx/coroutines/a/l;
-
-    move-result-object v8
-
-    goto :goto_a
-
-    :cond_14
-    sget-object v20, Lkotlinx/coroutines/a/l;->bTy:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    sget-object v12, Lkotlinx/coroutines/a/l;->bTB:Lkotlinx/coroutines/a/l$a;
-
-    invoke-static {v9, v10, v0}, Lkotlinx/coroutines/a/l$a;->c(JI)J
-
-    move-result-wide v24
-
-    move-object/from16 v21, v8
-
-    move-wide/from16 v22, v9
-
-    invoke-virtual/range {v20 .. v25}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_12
-
-    iget-object v9, v8, Lkotlinx/coroutines/a/l;->bTz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v8, v8, Lkotlinx/coroutines/a/l;->mask:I
-
-    and-int/2addr v8, v11
-
-    invoke-virtual {v9, v8, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    move-object v8, v6
-
-    :goto_a
-    if-nez v8, :cond_12
-
-    :goto_b
-    sget-object v0, Lkotlinx/coroutines/a/l;->bTA:Lkotlinx/coroutines/a/o;
-
-    if-eq v4, v0, :cond_15
-
-    move-object v6, v4
-
-    check-cast v6, Ljava/lang/Runnable;
-
-    goto :goto_c
-
-    :cond_15
-    sget-object v0, Lkotlinx/coroutines/ae;->bSj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v7}, Lkotlinx/coroutines/a/l;->Gu()Lkotlinx/coroutines/a/l;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v1, v2, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto/16 :goto_d
-
-    :cond_16
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v2, "This queue can have only one consumer"
-
-    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    throw v0
-
-    :cond_17
-    new-instance v0, Lkotlin/r;
-
-    const-string v2, "null cannot be cast to non-null type kotlinx.coroutines.Queue<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> /* = kotlinx.coroutines.internal.LockFreeMPSCQueueCore<kotlinx.coroutines.Runnable /* = java.lang.Runnable */> */"
-
-    invoke-direct {v0, v2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_18
-    invoke-static {}, Lkotlinx/coroutines/af;->FU()Lkotlinx/coroutines/a/o;
-
-    move-result-object v0
-
-    if-ne v2, v0, :cond_19
-
-    goto :goto_c
-
-    :cond_19
-    sget-object v0, Lkotlinx/coroutines/ae;->bSj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v0, v1, v2, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_21
-
-    if-eqz v2, :cond_20
-
-    move-object v6, v2
-
-    check-cast v6, Ljava/lang/Runnable;
-
-    :goto_c
-    if-eqz v6, :cond_1a
-
-    invoke-interface {v6}, Ljava/lang/Runnable;->run()V
-
-    :cond_1a
-    iget-object v0, v1, Lkotlinx/coroutines/ae;->bSi:Ljava/lang/Object;
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    if-eqz v0, :cond_1d
-
-    instance-of v4, v0, Lkotlinx/coroutines/a/l;
-
-    if-eqz v4, :cond_1b
-
-    check-cast v0, Lkotlinx/coroutines/a/l;
-
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/l;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1d
-
-    const-wide/16 v4, 0x0
-
-    return-wide v4
-
-    :cond_1b
-    const-wide/16 v4, 0x0
-
-    invoke-static {}, Lkotlinx/coroutines/af;->FU()Lkotlinx/coroutines/a/o;
-
-    move-result-object v6
-
-    if-ne v0, v6, :cond_1c
-
-    return-wide v2
-
-    :cond_1c
-    return-wide v4
-
-    :cond_1d
-    iget-object v0, v1, Lkotlinx/coroutines/ae;->bSk:Ljava/lang/Object;
-
-    check-cast v0, Lkotlinx/coroutines/a/s;
-
-    if-nez v0, :cond_1e
-
-    return-wide v2
-
-    :cond_1e
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/s;->Gx()Lkotlinx/coroutines/a/t;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlinx/coroutines/ae$a;
-
-    if-nez v0, :cond_1f
-
-    return-wide v2
-
-    :cond_1f
-    iget-wide v2, v0, Lkotlinx/coroutines/ae$a;->nanoTime:J
-
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlinx/coroutines/ba;->nanoTime()J
-
-    move-result-wide v4
-
-    sub-long/2addr v2, v4
-
-    const-wide/16 v7, 0x0
-
-    invoke-static {v2, v3, v7, v8}, Lkotlin/ranges/b;->f(JJ)J
-
-    move-result-wide v2
-
-    return-wide v2
-
-    :cond_20
-    new-instance v0, Lkotlin/r;
-
-    const-string v2, "null cannot be cast to non-null type kotlinx.coroutines.Runnable /* = java.lang.Runnable */"
-
-    invoke-direct {v0, v2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_21
-    :goto_d
-    const-wide/16 v3, 0x0
-
-    goto/16 :goto_7
-.end method
-
-.method public final a(Lkotlin/c/e;Ljava/lang/Runnable;)V
-    .locals 1
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string p1, "block"
-
-    invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0, p2}, Lkotlinx/coroutines/ae;->n(Ljava/lang/Runnable;)V
-
-    return-void
-.end method
-
-.method protected final isEmpty()Z
-    .locals 1
-
-    invoke-direct {p0}, Lkotlinx/coroutines/ae;->FR()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-direct {p0}, Lkotlinx/coroutines/ae;->FS()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final n(Ljava/lang/Runnable;)V
     .locals 2
 
-    move-object v0, p0
+    new-instance v0, Lkotlinx/coroutines/a/o;
 
-    :goto_0
-    const-string v1, "task"
+    const-string v1, "REMOVED_TASK"
 
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {v0, p1}, Lkotlinx/coroutines/ae;->o(Ljava/lang/Runnable;)Z
+    sput-object v0, Lkotlinx/coroutines/ae;->bSg:Lkotlinx/coroutines/a/o;
 
-    move-result v1
+    new-instance v0, Lkotlinx/coroutines/a/o;
 
-    if-eqz v1, :cond_0
+    const-string v1, "CLOSED_EMPTY"
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/ae;->unpark()V
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Lkotlinx/coroutines/ae;->bSh:Lkotlinx/coroutines/a/o;
 
     return-void
-
-    :cond_0
-    sget-object v0, Lkotlinx/coroutines/u;->bRV:Lkotlinx/coroutines/u;
-
-    goto :goto_0
 .end method
 
-.method protected abstract unpark()V
+.method public static final synthetic FT()Lkotlinx/coroutines/a/o;
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/ae;->bSh:Lkotlinx/coroutines/a/o;
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/af.smali b/com.discord/smali_classes2/kotlinx/coroutines/af.smali
index f274e74e70..0caf8c86f0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/af.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/af.smali
@@ -1,40 +1,16 @@
-.class public final Lkotlinx/coroutines/af;
-.super Ljava/lang/Object;
+.class public abstract Lkotlinx/coroutines/af;
+.super Lkotlinx/coroutines/k;
+.source "Executors.kt"
 
-
-# static fields
-.field private static final bSm:Lkotlinx/coroutines/a/o;
-
-.field private static final bSn:Lkotlinx/coroutines/a/o;
+# interfaces
+.implements Ljava/io/Closeable;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 2
+.method public constructor <init>()V
+    .locals 0
 
-    new-instance v0, Lkotlinx/coroutines/a/o;
-
-    const-string v1, "REMOVED_TASK"
-
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lkotlinx/coroutines/af;->bSm:Lkotlinx/coroutines/a/o;
-
-    new-instance v0, Lkotlinx/coroutines/a/o;
-
-    const-string v1, "CLOSED_EMPTY"
-
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lkotlinx/coroutines/af;->bSn:Lkotlinx/coroutines/a/o;
+    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
 
     return-void
 .end method
-
-.method public static final synthetic FU()Lkotlinx/coroutines/a/o;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/af;->bSn:Lkotlinx/coroutines/a/o;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ag.smali b/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
index acb6f925d5..300baf7ebb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
@@ -1,15 +1,58 @@
-.class public abstract Lkotlinx/coroutines/ag;
-.super Lkotlinx/coroutines/k;
+.class public final Lkotlinx/coroutines/ag;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
 
 # interfaces
-.implements Ljava/io/Closeable;
+.implements Lkotlinx/coroutines/ah;
+
+
+# instance fields
+.field final bSi:Lkotlinx/coroutines/au;
 
 
 # direct methods
-.method public constructor <init>()V
-    .locals 0
+.method public constructor <init>(Lkotlinx/coroutines/au;)V
+    .locals 1
 
-    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
+    const-string v0, "list"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lkotlinx/coroutines/ag;->bSi:Lkotlinx/coroutines/au;
 
     return-void
 .end method
+
+
+# virtual methods
+.method public final FP()Lkotlinx/coroutines/au;
+    .locals 1
+
+    iget-object v0, p0, Lkotlinx/coroutines/ag;->bSi:Lkotlinx/coroutines/au;
+
+    return-object v0
+.end method
+
+.method public final isActive()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lkotlinx/coroutines/ag;->bSi:Lkotlinx/coroutines/au;
+
+    const-string v1, "New"
+
+    invoke-virtual {v0, v1}, Lkotlinx/coroutines/au;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ah.smali b/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
index 88e687859e..225b86c32f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
@@ -1,57 +1,11 @@
-.class public final Lkotlinx/coroutines/ah;
+.class public interface abstract Lkotlinx/coroutines/ah;
 .super Ljava/lang/Object;
-
-# interfaces
-.implements Lkotlinx/coroutines/ai;
-
-
-# instance fields
-.field final bSo:Lkotlinx/coroutines/av;
-
-
-# direct methods
-.method public constructor <init>(Lkotlinx/coroutines/av;)V
-    .locals 1
-
-    const-string v0, "list"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lkotlinx/coroutines/ah;->bSo:Lkotlinx/coroutines/av;
-
-    return-void
-.end method
+.source "JobSupport.kt"
 
 
 # virtual methods
-.method public final FQ()Lkotlinx/coroutines/av;
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/ah;->bSo:Lkotlinx/coroutines/av;
-
-    return-object v0
+.method public abstract FP()Lkotlinx/coroutines/au;
 .end method
 
-.method public final isActive()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lkotlinx/coroutines/ah;->bSo:Lkotlinx/coroutines/av;
-
-    const-string v1, "New"
-
-    invoke-virtual {v0, v1}, Lkotlinx/coroutines/av;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
+.method public abstract isActive()Z
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ai.smali b/com.discord/smali_classes2/kotlinx/coroutines/ai.smali
index 95b2ae075a..9cc56a50b9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ai.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ai.smali
@@ -1,10 +1,156 @@
-.class public interface abstract Lkotlinx/coroutines/ai;
-.super Ljava/lang/Object;
+.class final Lkotlinx/coroutines/ai;
+.super Lkotlinx/coroutines/am;
+.source "JobSupport.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlinx/coroutines/am<",
+        "Lkotlinx/coroutines/ak;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final bSj:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field private volatile _invoked:I
+
+.field private final bSk:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Lkotlinx/coroutines/ai;
+
+    const-string v1, "_invoked"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Lkotlinx/coroutines/ai;->bSj:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlinx/coroutines/ak;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlinx/coroutines/ak;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "job"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "handler"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/am;-><init>(Lkotlinx/coroutines/ak;)V
+
+    iput-object p2, p0, Lkotlinx/coroutines/ai;->bSk:Lkotlin/jvm/functions/Function1;
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Lkotlinx/coroutines/ai;->_invoked:I
+
+    return-void
+.end method
 
 
 # virtual methods
-.method public abstract FQ()Lkotlinx/coroutines/av;
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Lkotlinx/coroutines/ai;->invoke(Ljava/lang/Throwable;)V
+
+    sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+
+    return-object p1
 .end method
 
-.method public abstract isActive()Z
+.method public final invoke(Ljava/lang/Throwable;)V
+    .locals 3
+
+    sget-object v0, Lkotlinx/coroutines/ai;->bSj:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lkotlinx/coroutines/ai;->bSk:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    return-void
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "InvokeOnCancelling["
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bJ(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bI(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aj.smali b/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
index 8ac5211c0d..5f600c951b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
@@ -1,25 +1,20 @@
 .class final Lkotlinx/coroutines/aj;
-.super Lkotlinx/coroutines/an;
+.super Lkotlinx/coroutines/ap;
+.source "JobSupport.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlinx/coroutines/an<",
-        "Lkotlinx/coroutines/al;",
+        "Lkotlinx/coroutines/ap<",
+        "Lkotlinx/coroutines/ak;",
         ">;"
     }
 .end annotation
 
 
-# static fields
-.field private static final bSq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
 # instance fields
-.field private volatile bSp:I
-
-.field private final bSr:Lkotlin/jvm/functions/Function1;
+.field private final bSk:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -32,28 +27,12 @@
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lkotlinx/coroutines/aj;
-
-    const-string v1, "bSp"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lkotlinx/coroutines/aj;->bSq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlinx/coroutines/al;Lkotlin/jvm/functions/Function1;)V
+.method public constructor <init>(Lkotlinx/coroutines/ak;Lkotlin/jvm/functions/Function1;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lkotlinx/coroutines/al;",
+            "Lkotlinx/coroutines/ak;",
             "Lkotlin/jvm/functions/Function1<",
             "-",
             "Ljava/lang/Throwable;",
@@ -70,13 +49,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/an;-><init>(Lkotlinx/coroutines/al;)V
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/ap;-><init>(Lkotlinx/coroutines/ak;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/aj;->bSr:Lkotlin/jvm/functions/Function1;
-
-    const/4 p1, 0x0
-
-    iput p1, p0, Lkotlinx/coroutines/aj;->bSp:I
+    iput-object p2, p0, Lkotlinx/coroutines/aj;->bSk:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -96,25 +71,12 @@
 .end method
 
 .method public final invoke(Ljava/lang/Throwable;)V
-    .locals 3
+    .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/aj;->bSq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lkotlinx/coroutines/aj;->bSr:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/aj;->bSk:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_0
     return-void
 .end method
 
@@ -123,11 +85,11 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "InvokeOnCancelling["
+    const-string v1, "InvokeOnCompletion["
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bJ(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bJ(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -137,7 +99,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bI(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bI(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/al$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/ak$a.smali
similarity index 58%
rename from com.discord/smali_classes2/kotlinx/coroutines/al$a.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/ak$a.smali
index 9e21a67780..cfefab224c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/al$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ak$a.smali
@@ -1,10 +1,11 @@
-.class public final Lkotlinx/coroutines/al$a;
+.class public final Lkotlinx/coroutines/ak$a;
 .super Ljava/lang/Object;
+.source "Job.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/al;
+    value = Lkotlinx/coroutines/ak;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,7 +15,7 @@
 
 
 # direct methods
-.method public static synthetic a(Lkotlinx/coroutines/al;ZZLkotlin/jvm/functions/Function1;I)Lkotlinx/coroutines/ab;
+.method public static synthetic a(Lkotlinx/coroutines/ak;ZZLkotlin/jvm/functions/Function1;I)Lkotlinx/coroutines/aa;
     .locals 1
 
     and-int/lit8 v0, p4, 0x1
@@ -31,7 +32,7 @@
     const/4 p2, 0x1
 
     :cond_1
-    invoke-interface {p0, p1, p2, p3}, Lkotlinx/coroutines/al;->a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/ab;
+    invoke-interface {p0, p1, p2, p3}, Lkotlinx/coroutines/ak;->a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/aa;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/al$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/ak$b.smali
similarity index 57%
rename from com.discord/smali_classes2/kotlinx/coroutines/al$b.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/ak$b.smali
index 218e385d42..4a3ba7e219 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/al$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ak$b.smali
@@ -1,5 +1,6 @@
-.class public final Lkotlinx/coroutines/al$b;
+.class public final Lkotlinx/coroutines/ak$b;
 .super Ljava/lang/Object;
+.source "Job.kt"
 
 # interfaces
 .implements Lkotlin/c/e$c;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/al;
+    value = Lkotlinx/coroutines/ak;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -19,27 +20,27 @@
     value = {
         "Ljava/lang/Object;",
         "Lkotlin/c/e$c<",
-        "Lkotlinx/coroutines/al;",
+        "Lkotlinx/coroutines/ak;",
         ">;"
     }
 .end annotation
 
 
 # static fields
-.field static final synthetic bSt:Lkotlinx/coroutines/al$b;
+.field static final synthetic bSm:Lkotlinx/coroutines/ak$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lkotlinx/coroutines/al$b;
+    new-instance v0, Lkotlinx/coroutines/ak$b;
 
-    invoke-direct {v0}, Lkotlinx/coroutines/al$b;-><init>()V
+    invoke-direct {v0}, Lkotlinx/coroutines/ak$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/al$b;->bSt:Lkotlinx/coroutines/al$b;
+    sput-object v0, Lkotlinx/coroutines/ak$b;->bSm:Lkotlinx/coroutines/ak$b;
 
-    sget-object v0, Lkotlinx/coroutines/l;->bRI:Lkotlinx/coroutines/l$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bRH:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ak.smali b/com.discord/smali_classes2/kotlinx/coroutines/ak.smali
index f30fec77fa..a447f78270 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ak.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ak.smali
@@ -1,116 +1,65 @@
-.class final Lkotlinx/coroutines/ak;
-.super Lkotlinx/coroutines/aq;
+.class public interface abstract Lkotlinx/coroutines/ak;
+.super Ljava/lang/Object;
+.source "Job.kt"
+
+# interfaces
+.implements Lkotlin/c/e$b;
 
 
 # annotations
-.annotation system Ldalvik/annotation/Signature;
+.annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        "Lkotlinx/coroutines/aq<",
-        "Lkotlinx/coroutines/al;",
-        ">;"
+        Lkotlinx/coroutines/ak$a;,
+        Lkotlinx/coroutines/ak$b;
     }
 .end annotation
 
 
-# instance fields
-.field private final bSr:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
+# static fields
+.field public static final bSl:Lkotlinx/coroutines/ak$b;
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/al;Lkotlin/jvm/functions/Function1;)V
+.method static constructor <clinit>()V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlinx/coroutines/al;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
 
-    const-string v0, "job"
+    sget-object v0, Lkotlinx/coroutines/ak$b;->bSm:Lkotlinx/coroutines/ak$b;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "handler"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;-><init>(Lkotlinx/coroutines/al;)V
-
-    iput-object p2, p0, Lkotlinx/coroutines/ak;->bSr:Lkotlin/jvm/functions/Function1;
+    sput-object v0, Lkotlinx/coroutines/ak;->bSl:Lkotlinx/coroutines/ak$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lkotlinx/coroutines/ak;->invoke(Ljava/lang/Throwable;)V
-
-    sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-
-    return-object p1
+.method public abstract FU()Ljava/util/concurrent/CancellationException;
 .end method
 
-.method public final invoke(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/ak;->bSr:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
+.method public abstract a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/aa;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Lkotlinx/coroutines/aa;"
+        }
+    .end annotation
 .end method
 
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "InvokeOnCompletion["
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bJ(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bI(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
+.method public abstract a(Lkotlinx/coroutines/d;)Lkotlinx/coroutines/b;
+.end method
+
+.method public abstract cancel()V
+.end method
+
+.method public abstract isActive()Z
+.end method
+
+.method public abstract r(Ljava/lang/Throwable;)Z
+.end method
+
+.method public abstract start()Z
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/al.smali b/com.discord/smali_classes2/kotlinx/coroutines/al.smali
index 1fad00f145..2f069a8379 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/al.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/al.smali
@@ -1,64 +1,205 @@
-.class public interface abstract Lkotlinx/coroutines/al;
-.super Ljava/lang/Object;
-
-# interfaces
-.implements Lkotlin/c/e$b;
+.class public final Lkotlinx/coroutines/al;
+.super Ljava/util/concurrent/CancellationException;
+.source "Exceptions.kt"
 
 
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lkotlinx/coroutines/al$a;,
-        Lkotlinx/coroutines/al$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final bSs:Lkotlinx/coroutines/al$b;
+# instance fields
+.field public final job:Lkotlinx/coroutines/ak;
 
 
 # direct methods
-.method static constructor <clinit>()V
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/ak;)V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/al$b;->bSt:Lkotlinx/coroutines/al$b;
+    const-string v0, "message"
 
-    sput-object v0, Lkotlinx/coroutines/al;->bSs:Lkotlinx/coroutines/al$b;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "job"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
+
+    iput-object p3, p0, Lkotlinx/coroutines/al;->job:Lkotlinx/coroutines/ak;
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p0, p2}, Lkotlinx/coroutines/al;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    :cond_0
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract FV()Ljava/util/concurrent/CancellationException;
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlinx/coroutines/al;
+
+    if-eq p1, v0, :cond_1
+
+    instance-of v0, p1, Lkotlinx/coroutines/al;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lkotlinx/coroutines/al;
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/al;->getMessage()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/al;->getMessage()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p1, Lkotlinx/coroutines/al;->job:Lkotlinx/coroutines/ak;
+
+    iget-object v1, p0, Lkotlinx/coroutines/al;->job:Lkotlinx/coroutines/ak;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/al;->getCause()Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/al;->getCause()Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
 .end method
 
-.method public abstract a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/ab;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)",
-            "Lkotlinx/coroutines/ab;"
-        }
-    .end annotation
+.method public final fillInStackTrace()Ljava/lang/Throwable;
+    .locals 2
+
+    invoke-static {}, Lkotlinx/coroutines/s;->FE()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-super {p0}, Ljava/util/concurrent/CancellationException;->fillInStackTrace()Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    const-string v1, "super.fillInStackTrace()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_0
+    move-object v0, p0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    return-object v0
 .end method
 
-.method public abstract a(Lkotlinx/coroutines/d;)Lkotlinx/coroutines/b;
+.method public final hashCode()I
+    .locals 2
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/al;->getMessage()Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lkotlinx/coroutines/al;->job:Lkotlinx/coroutines/ak;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/al;->getCause()Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v1}, Ljava/lang/Throwable;->hashCode()I
+
+    move-result v1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    add-int/2addr v0, v1
+
+    return v0
 .end method
 
-.method public abstract cancel()V
-.end method
+.method public final toString()Ljava/lang/String;
+    .locals 2
 
-.method public abstract isActive()Z
-.end method
+    new-instance v0, Ljava/lang/StringBuilder;
 
-.method public abstract r(Ljava/lang/Throwable;)Z
-.end method
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-.method public abstract start()Z
+    invoke-super {p0}, Ljava/util/concurrent/CancellationException;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "; job="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lkotlinx/coroutines/al;->job:Lkotlinx/coroutines/ak;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/am.smali b/com.discord/smali_classes2/kotlinx/coroutines/am.smali
index 52b5f48919..6c08cfb949 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/am.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/am.smali
@@ -1,204 +1,34 @@
-.class public final Lkotlinx/coroutines/am;
-.super Ljava/util/concurrent/CancellationException;
+.class public abstract Lkotlinx/coroutines/am;
+.super Lkotlinx/coroutines/ap;
+.source "JobSupport.kt"
 
 
-# instance fields
-.field public final job:Lkotlinx/coroutines/al;
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<J::",
+        "Lkotlinx/coroutines/ak;",
+        ">",
+        "Lkotlinx/coroutines/ap<",
+        "TJ;>;"
+    }
+.end annotation
 
 
 # direct methods
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/al;)V
+.method public constructor <init>(Lkotlinx/coroutines/ak;)V
     .locals 1
-
-    const-string v0, "message"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TJ;)V"
+        }
+    .end annotation
 
     const-string v0, "job"
 
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p1}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/ap;-><init>(Lkotlinx/coroutines/ak;)V
 
-    iput-object p3, p0, Lkotlinx/coroutines/am;->job:Lkotlinx/coroutines/al;
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p0, p2}, Lkotlinx/coroutines/am;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    :cond_0
     return-void
 .end method
-
-
-# virtual methods
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlinx/coroutines/am;
-
-    if-eq p1, v0, :cond_1
-
-    instance-of v0, p1, Lkotlinx/coroutines/am;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lkotlinx/coroutines/am;
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/am;->getMessage()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/am;->getMessage()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p1, Lkotlinx/coroutines/am;->job:Lkotlinx/coroutines/al;
-
-    iget-object v1, p0, Lkotlinx/coroutines/am;->job:Lkotlinx/coroutines/al;
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/am;->getCause()Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/am;->getCause()Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public final fillInStackTrace()Ljava/lang/Throwable;
-    .locals 2
-
-    invoke-static {}, Lkotlinx/coroutines/t;->FF()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-super {p0}, Ljava/util/concurrent/CancellationException;->fillInStackTrace()Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    const-string v1, "super.fillInStackTrace()"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_0
-    move-object v0, p0
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 2
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/am;->getMessage()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Lkotlinx/coroutines/am;->job:Lkotlinx/coroutines/al;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/am;->getCause()Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1}, Ljava/lang/Throwable;->hashCode()I
-
-    move-result v1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-super {p0}, Ljava/util/concurrent/CancellationException;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "; job="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lkotlinx/coroutines/am;->job:Lkotlinx/coroutines/al;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/an.smali b/com.discord/smali_classes2/kotlinx/coroutines/an.smali
index 89e5d1797a..1bdce830e6 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/an.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/an.smali
@@ -1,33 +1,53 @@
-.class public abstract Lkotlinx/coroutines/an;
+.class public final Lkotlinx/coroutines/an;
 .super Lkotlinx/coroutines/aq;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<J::",
-        "Lkotlinx/coroutines/al;",
-        ">",
-        "Lkotlinx/coroutines/aq<",
-        "TJ;>;"
-    }
-.end annotation
+.source "JobSupport.kt"
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/al;)V
+.method private synthetic constructor <init>()V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TJ;)V"
-        }
-    .end annotation
 
-    const-string v0, "job"
+    const/4 v0, 0x0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;-><init>(Lkotlinx/coroutines/al;)V
+    invoke-direct {p0, v0}, Lkotlinx/coroutines/an;-><init>(Lkotlinx/coroutines/ak;)V
 
     return-void
 .end method
+
+.method public constructor <init>(Lkotlinx/coroutines/ak;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlinx/coroutines/aq;-><init>(Z)V
+
+    invoke-virtual {p0, p1}, Lkotlinx/coroutines/an;->b(Lkotlinx/coroutines/ak;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method protected final FV()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public final FW()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method protected final FX()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory$a.smali
index 627b5acf8e..e4923f5fd3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/android/AndroidDispatcherFactory$a;
 .super Ljava/lang/Object;
+.source "HandlerDispatcher.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali
index b7a237231d..e81054625d 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/android/AndroidDispatcherFactory;
 .super Ljava/lang/Object;
+.source "HandlerDispatcher.kt"
 
 
 # annotations
@@ -40,24 +41,24 @@
     return-void
 .end method
 
-.method public static final getDispatcher()Lkotlinx/coroutines/au;
+.method public static final getDispatcher()Lkotlinx/coroutines/at;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/android/d;->bSV:Lkotlinx/coroutines/android/c;
+    sget-object v0, Lkotlinx/coroutines/android/d;->bSJ:Lkotlinx/coroutines/android/c;
 
-    check-cast v0, Lkotlinx/coroutines/au;
+    check-cast v0, Lkotlinx/coroutines/at;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final createDispatcher()Lkotlinx/coroutines/au;
+.method public final createDispatcher()Lkotlinx/coroutines/at;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/android/d;->bSV:Lkotlinx/coroutines/android/c;
+    sget-object v0, Lkotlinx/coroutines/android/d;->bSJ:Lkotlinx/coroutines/android/c;
 
-    check-cast v0, Lkotlinx/coroutines/au;
+    check-cast v0, Lkotlinx/coroutines/at;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
index 1016556c56..5ef57ea839 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
@@ -1,8 +1,9 @@
 .class public final Lkotlinx/coroutines/android/AndroidExceptionPreHandler;
 .super Lkotlin/c/a;
+.source "AndroidExceptionPreHandler.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/l;
+.implements Lkotlinx/coroutines/CoroutineExceptionHandler;
 
 
 # annotations
@@ -14,7 +15,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/l;->bRI:Lkotlinx/coroutines/l$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bRH:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     check-cast v0, Lkotlin/c/e$c;
 
@@ -36,7 +37,7 @@
 
     invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lkotlinx/coroutines/android/a;->Gi()Ljava/lang/reflect/Method;
+    invoke-static {}, Lkotlinx/coroutines/android/a;->Gh()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
@@ -75,6 +76,8 @@
 
     invoke-interface {p1, v0, p2}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
 
+    return-void
+
     :cond_2
     return-void
 .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 bbaa0a06bb..7dd2bc52c7 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/a.smali
@@ -1,9 +1,10 @@
 .class public final Lkotlinx/coroutines/android/a;
 .super Ljava/lang/Object;
+.source "AndroidExceptionPreHandler.kt"
 
 
 # static fields
-.field private static final bSR:Ljava/lang/reflect/Method;
+.field private static final bSG:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -60,15 +61,15 @@
 
     :catch_0
     :cond_1
-    sput-object v0, Lkotlinx/coroutines/android/a;->bSR:Ljava/lang/reflect/Method;
+    sput-object v0, Lkotlinx/coroutines/android/a;->bSG:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method public static final synthetic Gi()Ljava/lang/reflect/Method;
+.method public static final synthetic Gh()Ljava/lang/reflect/Method;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/android/a;->bSR:Ljava/lang/reflect/Method;
+    sget-object v0, Lkotlinx/coroutines/android/a;->bSG:Ljava/lang/reflect/Method;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/b.smali
index 99383ec1fe..27212a390a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/b.smali
@@ -1,13 +1,14 @@
 .class public final Lkotlinx/coroutines/android/b;
 .super Lkotlinx/coroutines/android/c;
+.source "HandlerDispatcher.kt"
 
 
 # instance fields
-.field private volatile bSS:Lkotlinx/coroutines/android/b;
+.field private volatile _immediate:Lkotlinx/coroutines/android/b;
 
-.field private final bST:Lkotlinx/coroutines/android/b;
+.field private final bSH:Lkotlinx/coroutines/android/b;
 
-.field private final bSU:Z
+.field private final bSI:Z
 
 .field private final handler:Landroid/os/Handler;
 
@@ -40,9 +41,9 @@
 
     iput-object p2, p0, Lkotlinx/coroutines/android/b;->name:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lkotlinx/coroutines/android/b;->bSU:Z
+    iput-boolean p3, p0, Lkotlinx/coroutines/android/b;->bSI:Z
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/android/b;->bSU:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/b;->bSI:Z
 
     if-eqz p1, :cond_0
 
@@ -54,9 +55,9 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lkotlinx/coroutines/android/b;->bSS:Lkotlinx/coroutines/android/b;
+    iput-object p1, p0, Lkotlinx/coroutines/android/b;->_immediate:Lkotlinx/coroutines/android/b;
 
-    iget-object p1, p0, Lkotlinx/coroutines/android/b;->bSS:Lkotlinx/coroutines/android/b;
+    iget-object p1, p0, Lkotlinx/coroutines/android/b;->_immediate:Lkotlinx/coroutines/android/b;
 
     if-nez p1, :cond_1
 
@@ -70,10 +71,10 @@
 
     invoke-direct {p1, p2, p3, v0}, Lkotlinx/coroutines/android/b;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/android/b;->bSS:Lkotlinx/coroutines/android/b;
+    iput-object p1, p0, Lkotlinx/coroutines/android/b;->_immediate:Lkotlinx/coroutines/android/b;
 
     :cond_1
-    iput-object p1, p0, Lkotlinx/coroutines/android/b;->bST:Lkotlinx/coroutines/android/b;
+    iput-object p1, p0, Lkotlinx/coroutines/android/b;->bSH:Lkotlinx/coroutines/android/b;
 
     return-void
 .end method
@@ -105,7 +106,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/android/b;->bSU:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/b;->bSI:Z
 
     const/4 v0, 0x1
 
@@ -185,9 +186,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lkotlinx/coroutines/android/b;->bSU:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/android/b;->bSI:Z
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -205,11 +206,7 @@
 
     move-result-object v0
 
-    return-object v0
-
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/android/b;->name:Ljava/lang/String;
-
     return-object v0
 
     :cond_1
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali
index 59e048fa25..44736ae0dc 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali
@@ -1,12 +1,13 @@
 .class public abstract Lkotlinx/coroutines/android/c;
-.super Lkotlinx/coroutines/au;
+.super Lkotlinx/coroutines/at;
+.source "HandlerDispatcher.kt"
 
 
 # direct methods
 .method private constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/au;-><init>()V
+    invoke-direct {p0}, Lkotlinx/coroutines/at;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/d.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/d.smali
index ade83c315f..fd43e87b6f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/d.smali
@@ -1,13 +1,14 @@
 .class public final Lkotlinx/coroutines/android/d;
 .super Ljava/lang/Object;
+.source "HandlerDispatcher.kt"
 
 
 # static fields
 .field private static final bKn:Landroid/os/Handler;
 
-.field public static final bSV:Lkotlinx/coroutines/android/c;
+.field public static final bSJ:Lkotlinx/coroutines/android/c;
 
-.field private static final bSW:Lkotlinx/coroutines/android/c;
+.field private static final bSK:Lkotlinx/coroutines/android/c;
 
 
 # direct methods
@@ -38,9 +39,9 @@
 
     check-cast v0, Lkotlinx/coroutines/android/c;
 
-    sput-object v0, Lkotlinx/coroutines/android/d;->bSV:Lkotlinx/coroutines/android/c;
+    sput-object v0, Lkotlinx/coroutines/android/d;->bSJ:Lkotlinx/coroutines/android/c;
 
-    sput-object v0, Lkotlinx/coroutines/android/d;->bSW:Lkotlinx/coroutines/android/c;
+    sput-object v0, Lkotlinx/coroutines/android/d;->bSK:Lkotlinx/coroutines/android/c;
 
     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 3accc8be60..b9f672acda 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ao.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ao.smali
@@ -1,52 +1,16 @@
 .class public final Lkotlinx/coroutines/ao;
-.super Lkotlinx/coroutines/ar;
+.super Ljava/lang/Object;
 
 
 # direct methods
-.method private synthetic constructor <init>()V
+.method public static final a(Lkotlinx/coroutines/ak;)Lkotlinx/coroutines/ak;
     .locals 1
 
-    const/4 v0, 0x0
+    new-instance v0, Lkotlinx/coroutines/an;
 
-    invoke-direct {p0, v0}, Lkotlinx/coroutines/ao;-><init>(Lkotlinx/coroutines/al;)V
+    invoke-direct {v0, p0}, Lkotlinx/coroutines/an;-><init>(Lkotlinx/coroutines/ak;)V
 
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlinx/coroutines/al;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lkotlinx/coroutines/ar;-><init>(Z)V
-
-    invoke-virtual {p0, p1}, Lkotlinx/coroutines/ao;->b(Lkotlinx/coroutines/al;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method protected final FW()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public final FX()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method protected final FY()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
+    check-cast v0, Lkotlinx/coroutines/ak;
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ap.smali b/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
index 3c1226f6c6..4987b75e08 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
@@ -1,16 +1,143 @@
-.class public final Lkotlinx/coroutines/ap;
-.super Ljava/lang/Object;
+.class public abstract Lkotlinx/coroutines/ap;
+.super Lkotlinx/coroutines/h;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/aa;
+.implements Lkotlinx/coroutines/ah;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<J::",
+        "Lkotlinx/coroutines/ak;",
+        ">",
+        "Lkotlinx/coroutines/h;",
+        "Lkotlinx/coroutines/aa;",
+        "Lkotlinx/coroutines/ah;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final job:Lkotlinx/coroutines/ak;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TJ;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method public static final a(Lkotlinx/coroutines/al;)Lkotlinx/coroutines/al;
+.method public constructor <init>(Lkotlinx/coroutines/ak;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TJ;)V"
+        }
+    .end annotation
+
+    const-string v0, "job"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lkotlinx/coroutines/h;-><init>()V
+
+    iput-object p1, p0, Lkotlinx/coroutines/ap;->job:Lkotlinx/coroutines/ak;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final FP()Lkotlinx/coroutines/au;
     .locals 1
 
-    new-instance v0, Lkotlinx/coroutines/ao;
-
-    invoke-direct {v0, p0}, Lkotlinx/coroutines/ao;-><init>(Lkotlinx/coroutines/al;)V
-
-    check-cast v0, Lkotlinx/coroutines/al;
+    const/4 v0, 0x0
 
     return-object v0
 .end method
+
+.method public final dispose()V
+    .locals 4
+
+    iget-object v0, p0, Lkotlinx/coroutines/ap;->job:Lkotlinx/coroutines/ak;
+
+    if-eqz v0, :cond_5
+
+    check-cast v0, Lkotlinx/coroutines/aq;
+
+    const-string v1, "node"
+
+    invoke-static {p0, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {v0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v1
+
+    instance-of v2, v1, Lkotlinx/coroutines/ap;
+
+    if-eqz v2, :cond_2
+
+    if-ne v1, p0, :cond_1
+
+    sget-object v2, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-static {}, Lkotlinx/coroutines/ar;->Ge()Lkotlinx/coroutines/ab;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v0, v1, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    return-void
+
+    :cond_1
+    return-void
+
+    :cond_2
+    instance-of v0, v1, Lkotlinx/coroutines/ah;
+
+    if-eqz v0, :cond_4
+
+    check-cast v1, Lkotlinx/coroutines/ah;
+
+    invoke-interface {v1}, Lkotlinx/coroutines/ah;->FP()Lkotlinx/coroutines/au;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/ap;->Gl()Z
+
+    :cond_3
+    return-void
+
+    :cond_4
+    return-void
+
+    :cond_5
+    new-instance v0, Lkotlin/r;
+
+    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.JobSupport"
+
+    invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    return-void
+.end method
+
+.method public final isActive()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ar$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/aq$a.smali
similarity index 58%
rename from com.discord/smali_classes2/kotlinx/coroutines/ar$a.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/aq$a.smali
index d90908a4d6..e869d74457 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ar$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aq$a.smali
@@ -1,10 +1,11 @@
-.class final Lkotlinx/coroutines/ar$a;
-.super Lkotlinx/coroutines/aq;
+.class final Lkotlinx/coroutines/aq$a;
+.super Lkotlinx/coroutines/ap;
+.source "JobSupport.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/ar;
+    value = Lkotlinx/coroutines/aq;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,25 +15,25 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlinx/coroutines/aq<",
-        "Lkotlinx/coroutines/al;",
+        "Lkotlinx/coroutines/ap<",
+        "Lkotlinx/coroutines/ak;",
         ">;"
     }
 .end annotation
 
 
 # instance fields
-.field private final bSw:Lkotlinx/coroutines/ar;
+.field private final bSo:Lkotlinx/coroutines/aq;
 
-.field private final bSx:Lkotlinx/coroutines/ar$b;
+.field private final bSp:Lkotlinx/coroutines/aq$b;
 
-.field private final bSy:Lkotlinx/coroutines/c;
+.field private final bSq:Lkotlinx/coroutines/c;
 
-.field private final bSz:Ljava/lang/Object;
+.field private final bSr:Ljava/lang/Object;
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/ar;Lkotlinx/coroutines/ar$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
+.method public constructor <init>(Lkotlinx/coroutines/aq;Lkotlinx/coroutines/aq$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
     .locals 1
 
     const-string v0, "parent"
@@ -49,17 +50,17 @@
 
     iget-object v0, p3, Lkotlinx/coroutines/c;->bRz:Lkotlinx/coroutines/d;
 
-    check-cast v0, Lkotlinx/coroutines/al;
+    check-cast v0, Lkotlinx/coroutines/ak;
 
-    invoke-direct {p0, v0}, Lkotlinx/coroutines/aq;-><init>(Lkotlinx/coroutines/al;)V
+    invoke-direct {p0, v0}, Lkotlinx/coroutines/ap;-><init>(Lkotlinx/coroutines/ak;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/ar$a;->bSw:Lkotlinx/coroutines/ar;
+    iput-object p1, p0, Lkotlinx/coroutines/aq$a;->bSo:Lkotlinx/coroutines/aq;
 
-    iput-object p2, p0, Lkotlinx/coroutines/ar$a;->bSx:Lkotlinx/coroutines/ar$b;
+    iput-object p2, p0, Lkotlinx/coroutines/aq$a;->bSp:Lkotlinx/coroutines/aq$b;
 
-    iput-object p3, p0, Lkotlinx/coroutines/ar$a;->bSy:Lkotlinx/coroutines/c;
+    iput-object p3, p0, Lkotlinx/coroutines/aq$a;->bSq:Lkotlinx/coroutines/c;
 
-    iput-object p4, p0, Lkotlinx/coroutines/ar$a;->bSz:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/aq$a;->bSr:Ljava/lang/Object;
 
     return-void
 .end method
@@ -71,7 +72,7 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-virtual {p0, p1}, Lkotlinx/coroutines/ar$a;->invoke(Ljava/lang/Throwable;)V
+    invoke-virtual {p0, p1}, Lkotlinx/coroutines/aq$a;->invoke(Ljava/lang/Throwable;)V
 
     sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
@@ -81,15 +82,15 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 3
 
-    iget-object p1, p0, Lkotlinx/coroutines/ar$a;->bSw:Lkotlinx/coroutines/ar;
+    iget-object p1, p0, Lkotlinx/coroutines/aq$a;->bSo:Lkotlinx/coroutines/aq;
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar$a;->bSx:Lkotlinx/coroutines/ar$b;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$a;->bSp:Lkotlinx/coroutines/aq$b;
 
-    iget-object v1, p0, Lkotlinx/coroutines/ar$a;->bSy:Lkotlinx/coroutines/c;
+    iget-object v1, p0, Lkotlinx/coroutines/aq$a;->bSq:Lkotlinx/coroutines/c;
 
-    iget-object v2, p0, Lkotlinx/coroutines/ar$a;->bSz:Ljava/lang/Object;
+    iget-object v2, p0, Lkotlinx/coroutines/aq$a;->bSr:Ljava/lang/Object;
 
-    invoke-static {p1, v0, v1, v2}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ar;Lkotlinx/coroutines/ar$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
+    invoke-static {p1, v0, v1, v2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/aq;Lkotlinx/coroutines/aq$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -103,7 +104,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/ar$a;->bSy:Lkotlinx/coroutines/c;
+    iget-object v1, p0, Lkotlinx/coroutines/aq$a;->bSq:Lkotlinx/coroutines/c;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -111,7 +112,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/ar$a;->bSz:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/aq$a;->bSr: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/ar$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/aq$b.smali
similarity index 71%
rename from com.discord/smali_classes2/kotlinx/coroutines/ar$b.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/aq$b.smali
index 6e8bf74061..5b092f5094 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ar$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aq$b.smali
@@ -1,13 +1,14 @@
-.class final Lkotlinx/coroutines/ar$b;
+.class final Lkotlinx/coroutines/aq$b;
 .super Ljava/lang/Object;
+.source "JobSupport.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/ai;
+.implements Lkotlinx/coroutines/ah;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/ar;
+    value = Lkotlinx/coroutines/aq;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -17,17 +18,17 @@
 
 
 # instance fields
-.field volatile bSA:Ljava/lang/Object;
+.field volatile _exceptionsHolder:Ljava/lang/Object;
 
-.field public volatile bSB:Z
+.field final bSi:Lkotlinx/coroutines/au;
 
-.field public volatile bSC:Ljava/lang/Throwable;
+.field public volatile isCompleting:Z
 
-.field final bSo:Lkotlinx/coroutines/av;
+.field public volatile rootCause:Ljava/lang/Throwable;
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
+.method public constructor <init>(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
     .locals 1
 
     const-string v0, "list"
@@ -36,18 +37,18 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/ar$b;->bSo:Lkotlinx/coroutines/av;
+    iput-object p1, p0, Lkotlinx/coroutines/aq$b;->bSi:Lkotlinx/coroutines/au;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lkotlinx/coroutines/ar$b;->bSB:Z
+    iput-boolean p1, p0, Lkotlinx/coroutines/aq$b;->isCompleting:Z
 
-    iput-object p2, p0, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
+    iput-object p2, p0, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
 
     return-void
 .end method
 
-.method static Gd()Ljava/util/ArrayList;
+.method static Gc()Ljava/util/ArrayList;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -69,18 +70,18 @@
 
 
 # virtual methods
-.method public final FQ()Lkotlinx/coroutines/av;
+.method public final FP()Lkotlinx/coroutines/au;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar$b;->bSo:Lkotlinx/coroutines/av;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$b;->bSi:Lkotlinx/coroutines/au;
 
     return-object v0
 .end method
 
-.method public final Gc()Z
+.method public final Gb()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_0
 
@@ -97,7 +98,7 @@
 .method public final isActive()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
 
     if-nez v0, :cond_0
 
@@ -114,9 +115,9 @@
 .method public final isSealed()Z
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar$b;->bSA:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$b;->_exceptionsHolder:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/as;->Ge()Lkotlinx/coroutines/a/o;
+    invoke-static {}, Lkotlinx/coroutines/ar;->Gd()Lkotlinx/coroutines/a/o;
 
     move-result-object v1
 
@@ -141,7 +142,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar$b;->Gc()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq$b;->Gb()Z
 
     move-result v1
 
@@ -151,7 +152,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lkotlinx/coroutines/ar$b;->bSB:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/aq$b;->isCompleting:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -159,7 +160,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
+    iget-object v1, p0, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -167,7 +168,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/ar$b;->bSA:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/aq$b;->_exceptionsHolder:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -175,7 +176,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/ar$b;->bSo:Lkotlinx/coroutines/av;
+    iget-object v1, p0, Lkotlinx/coroutines/aq$b;->bSi:Lkotlinx/coroutines/au;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -197,11 +198,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
+    iput-object p1, p0, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
 
     return-void
 
@@ -211,11 +212,11 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/ar$b;->bSA:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$b;->_exceptionsHolder:Ljava/lang/Object;
 
     if-nez v0, :cond_2
 
-    iput-object p1, p0, Lkotlinx/coroutines/ar$b;->bSA:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/aq$b;->_exceptionsHolder:Ljava/lang/Object;
 
     return-void
 
@@ -229,7 +230,7 @@
     return-void
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/ar$b;->Gd()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/aq$b;->Gc()Ljava/util/ArrayList;
 
     move-result-object v1
 
@@ -237,7 +238,7 @@
 
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    iput-object v1, p0, Lkotlinx/coroutines/ar$b;->bSA:Ljava/lang/Object;
+    iput-object v1, p0, Lkotlinx/coroutines/aq$b;->_exceptionsHolder:Ljava/lang/Object;
 
     return-void
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ar$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/aq$c.smali
similarity index 55%
rename from com.discord/smali_classes2/kotlinx/coroutines/ar$c.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/aq$c.smali
index 4f1d25366e..bb4a087243 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ar$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aq$c.smali
@@ -1,10 +1,11 @@
-.class public final Lkotlinx/coroutines/ar$c;
+.class public final Lkotlinx/coroutines/aq$c;
 .super Lkotlinx/coroutines/a/i$a;
+.source "LockFreeLinkedList.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lkotlinx/coroutines/ar;->a(Ljava/lang/Object;Lkotlinx/coroutines/av;Lkotlinx/coroutines/aq;)Z
+    value = Lkotlinx/coroutines/aq;->a(Ljava/lang/Object;Lkotlinx/coroutines/au;Lkotlinx/coroutines/ap;)Z
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic bSD:Lkotlinx/coroutines/a/i;
+.field final synthetic bSs:Lkotlinx/coroutines/a/i;
 
-.field final synthetic bSE:Lkotlinx/coroutines/ar;
+.field final synthetic bSt:Lkotlinx/coroutines/aq;
 
-.field final synthetic bSF:Ljava/lang/Object;
+.field final synthetic bSu:Ljava/lang/Object;
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/ar;Ljava/lang/Object;)V
+.method public constructor <init>(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/aq;Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/ar$c;->bSD:Lkotlinx/coroutines/a/i;
+    iput-object p1, p0, Lkotlinx/coroutines/aq$c;->bSs:Lkotlinx/coroutines/a/i;
 
-    iput-object p3, p0, Lkotlinx/coroutines/ar$c;->bSE:Lkotlinx/coroutines/ar;
+    iput-object p3, p0, Lkotlinx/coroutines/aq$c;->bSt:Lkotlinx/coroutines/aq;
 
-    iput-object p4, p0, Lkotlinx/coroutines/ar$c;->bSF:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/aq$c;->bSu:Ljava/lang/Object;
 
     invoke-direct {p0, p2}, Lkotlinx/coroutines/a/i$a;-><init>(Lkotlinx/coroutines/a/i;)V
 
@@ -47,13 +48,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lkotlinx/coroutines/ar$c;->bSE:Lkotlinx/coroutines/ar;
+    iget-object p1, p0, Lkotlinx/coroutines/aq$c;->bSt:Lkotlinx/coroutines/aq;
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar$c;->bSF:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/aq$c;->bSu:Ljava/lang/Object;
 
     if-ne p1, v0, :cond_0
 
@@ -72,7 +73,7 @@
     return-object p1
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/a/h;->Gn()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/a/h;->Gm()Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aq.smali b/com.discord/smali_classes2/kotlinx/coroutines/aq.smali
index 65f2ebafcd..b4f0dba233 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aq.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aq.smali
@@ -1,135 +1,3403 @@
-.class public abstract Lkotlinx/coroutines/aq;
-.super Lkotlinx/coroutines/h;
+.class public Lkotlinx/coroutines/aq;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/ab;
-.implements Lkotlinx/coroutines/ai;
+.implements Lkotlinx/coroutines/ak;
+.implements Lkotlinx/coroutines/aw;
+.implements Lkotlinx/coroutines/d;
 
 
 # annotations
-.annotation system Ldalvik/annotation/Signature;
+.annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        "<J::",
-        "Lkotlinx/coroutines/al;",
-        ">",
-        "Lkotlinx/coroutines/h;",
-        "Lkotlinx/coroutines/ab;",
-        "Lkotlinx/coroutines/ai;"
+        Lkotlinx/coroutines/aq$b;,
+        Lkotlinx/coroutines/aq$a;
     }
 .end annotation
 
 
+# static fields
+.field static final bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
 # instance fields
-.field public final job:Lkotlinx/coroutines/al;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TJ;"
-        }
-    .end annotation
-.end field
+.field private volatile _state:Ljava/lang/Object;
+
+.field private volatile parentHandle:Lkotlinx/coroutines/b;
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/al;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TJ;)V"
-        }
-    .end annotation
+.method static constructor <clinit>()V
+    .locals 3
 
-    const-string v0, "job"
+    const-class v0, Lkotlinx/coroutines/aq;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-class v1, Ljava/lang/Object;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/h;-><init>()V
+    const-string v2, "_state"
 
-    iput-object p1, p0, Lkotlinx/coroutines/aq;->job:Lkotlinx/coroutines/al;
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
 
+.method public constructor <init>(Z)V
+    .locals 0
 
-# virtual methods
-.method public final FQ()Lkotlinx/coroutines/av;
-    .locals 1
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const/4 v0, 0x0
+    if-eqz p1, :cond_0
+
+    invoke-static {}, Lkotlinx/coroutines/ar;->Ge()Lkotlinx/coroutines/ab;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lkotlinx/coroutines/ar;->Gf()Lkotlinx/coroutines/ab;
+
+    move-result-object p1
+
+    :goto_0
+    iput-object p1, p0, Lkotlinx/coroutines/aq;->_state:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method private final FZ()Lkotlinx/coroutines/al;
+    .locals 4
+
+    new-instance v0, Lkotlinx/coroutines/al;
+
+    const-string v1, "Job was cancelled"
+
+    move-object v2, p0
+
+    check-cast v2, Lkotlinx/coroutines/ak;
+
+    const/4 v3, 0x0
+
+    invoke-direct {v0, v1, v3, v2}, Lkotlinx/coroutines/al;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/ak;)V
 
     return-object v0
 .end method
 
-.method public final dispose()V
+.method private final a(Lkotlinx/coroutines/aq$b;Ljava/util/List;)Ljava/lang/Throwable;
     .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlinx/coroutines/aq$b;",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/lang/Throwable;",
+            ">;)",
+            "Ljava/lang/Throwable;"
+        }
+    .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/aq;->job:Lkotlinx/coroutines/al;
+    invoke-interface {p2}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/aq$b;->Gb()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/aq;->FZ()Lkotlinx/coroutines/al;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    return-object p1
+
+    :cond_0
+    return-object v1
+
+    :cond_1
+    move-object p1, p2
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_2
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_4
 
-    check-cast v0, Lkotlinx/coroutines/ar;
-
-    const-string v1, "node"
-
-    invoke-static {p0, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lkotlinx/coroutines/aq;
-
-    if-eqz v2, :cond_2
-
-    if-ne v1, p0, :cond_1
-
-    sget-object v2, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-static {}, Lkotlinx/coroutines/as;->Gf()Lkotlinx/coroutines/ac;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v0, v1, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    :cond_1
-    return-void
-
-    :cond_2
-    instance-of v0, v1, Lkotlinx/coroutines/ai;
-
-    if-eqz v0, :cond_3
-
-    check-cast v1, Lkotlinx/coroutines/ai;
-
-    invoke-interface {v1}, Lkotlinx/coroutines/ai;->FQ()Lkotlinx/coroutines/av;
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v0
 
+    move-object v3, v0
+
+    check-cast v3, Ljava/lang/Throwable;
+
+    instance-of v3, v3, Ljava/util/concurrent/CancellationException;
+
+    if-nez v3, :cond_3
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v3, 0x0
+
+    :goto_0
+    if-eqz v3, :cond_2
+
+    goto :goto_1
+
+    :cond_4
+    move-object v0, v1
+
+    :goto_1
+    check-cast v0, Ljava/lang/Throwable;
+
+    if-nez v0, :cond_5
+
+    invoke-interface {p2, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    :cond_5
+    return-object v0
+.end method
+
+.method private final a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/ap;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;Z)",
+            "Lkotlinx/coroutines/ap<",
+            "*>;"
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    if-eqz p2, :cond_4
+
+    instance-of p2, p1, Lkotlinx/coroutines/am;
+
+    if-nez p2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v2, p1
+
+    :goto_0
+    check-cast v2, Lkotlinx/coroutines/am;
+
+    if-eqz v2, :cond_3
+
+    iget-object p2, v2, Lkotlinx/coroutines/am;->job:Lkotlinx/coroutines/ak;
+
+    move-object v3, p0
+
+    check-cast v3, Lkotlinx/coroutines/aq;
+
+    if-ne p2, v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_2
+
+    if-eqz v2, :cond_3
+
+    check-cast v2, Lkotlinx/coroutines/ap;
+
+    return-object v2
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Failed requirement."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_3
+    new-instance p2, Lkotlinx/coroutines/ai;
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlinx/coroutines/ak;
+
+    invoke-direct {p2, v0, p1}, Lkotlinx/coroutines/ai;-><init>(Lkotlinx/coroutines/ak;Lkotlin/jvm/functions/Function1;)V
+
+    check-cast p2, Lkotlinx/coroutines/ap;
+
+    return-object p2
+
+    :cond_4
+    instance-of p2, p1, Lkotlinx/coroutines/ap;
+
+    if-nez p2, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    move-object v2, p1
+
+    :goto_2
+    check-cast v2, Lkotlinx/coroutines/ap;
+
+    if-eqz v2, :cond_8
+
+    iget-object p2, v2, Lkotlinx/coroutines/ap;->job:Lkotlinx/coroutines/ak;
+
+    move-object v3, p0
+
+    check-cast v3, Lkotlinx/coroutines/aq;
+
+    if-ne p2, v3, :cond_6
+
+    instance-of p2, v2, Lkotlinx/coroutines/am;
+
+    if-nez p2, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    const/4 v0, 0x0
+
+    :goto_3
+    if-eqz v0, :cond_7
+
+    if-nez v2, :cond_9
+
+    goto :goto_4
+
+    :cond_7
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Failed requirement."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_8
+    :goto_4
+    new-instance p2, Lkotlinx/coroutines/aj;
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlinx/coroutines/ak;
+
+    invoke-direct {p2, v0, p1}, Lkotlinx/coroutines/aj;-><init>(Lkotlinx/coroutines/ak;Lkotlin/jvm/functions/Function1;)V
+
+    move-object v2, p2
+
+    check-cast v2, Lkotlinx/coroutines/ap;
+
+    :cond_9
+    return-object v2
+.end method
+
+.method private final a(Lkotlinx/coroutines/ah;)Lkotlinx/coroutines/au;
+    .locals 1
+
+    invoke-interface {p1}, Lkotlinx/coroutines/ah;->FP()Lkotlinx/coroutines/au;
+
+    move-result-object v0
+
+    if-nez v0, :cond_2
+
+    instance-of v0, p1, Lkotlinx/coroutines/ab;
+
+    if-eqz v0, :cond_0
+
+    new-instance p1, Lkotlinx/coroutines/au;
+
+    invoke-direct {p1}, Lkotlinx/coroutines/au;-><init>()V
+
+    return-object p1
+
+    :cond_0
+    instance-of v0, p1, Lkotlinx/coroutines/ap;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lkotlinx/coroutines/ap;
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ap;)V
+
+    const/4 p1, 0x0
+
+    return-object p1
+
+    :cond_1
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "State should have list: "
+
+    invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    throw v0
+
+    :cond_2
+    return-object v0
+.end method
+
+.method private static a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
+    .locals 1
+
+    :goto_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lkotlinx/coroutines/a/n;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gq()Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lkotlinx/coroutines/a/n;
+
+    if-nez v0, :cond_0
+
+    instance-of v0, p0, Lkotlinx/coroutines/c;
+
+    if-eqz v0, :cond_1
+
+    check-cast p0, Lkotlinx/coroutines/c;
+
+    return-object p0
+
+    :cond_1
+    instance-of v0, p0, Lkotlinx/coroutines/au;
+
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method private final a(Lkotlinx/coroutines/ah;Ljava/lang/Object;)V
+    .locals 4
+
+    iget-object v0, p0, Lkotlinx/coroutines/aq;->parentHandle:Lkotlinx/coroutines/b;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lkotlinx/coroutines/b;->dispose()V
+
+    sget-object v0, Lkotlinx/coroutines/av;->bSz:Lkotlinx/coroutines/av;
+
+    check-cast v0, Lkotlinx/coroutines/b;
+
+    iput-object v0, p0, Lkotlinx/coroutines/aq;->parentHandle:Lkotlinx/coroutines/b;
+
+    :cond_0
+    instance-of v0, p2, Lkotlinx/coroutines/f;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_1
+
+    move-object v0, v1
+
+    goto :goto_0
+
+    :cond_1
+    move-object v0, p2
+
+    :goto_0
+    check-cast v0, Lkotlinx/coroutines/f;
+
+    if-eqz v0, :cond_2
+
+    iget-object v1, v0, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
+
+    :cond_2
+    instance-of v0, p1, Lkotlinx/coroutines/ap;
+
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->Gm()Z
+    :try_start_0
+    move-object v0, p1
+
+    check-cast v0, Lkotlinx/coroutines/ap;
+
+    invoke-virtual {v0, v1}, Lkotlinx/coroutines/ap;->invoke(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lkotlinx/coroutines/i;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    const-string v3, "Exception in completion handler "
+
+    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, " for "
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v1, p1, v0}, Lkotlinx/coroutines/i;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, v1}, Lkotlinx/coroutines/aq;->p(Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :cond_3
+    invoke-interface {p1}, Lkotlinx/coroutines/ah;->FP()Lkotlinx/coroutines/au;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    invoke-direct {p0, p1, v1}, Lkotlinx/coroutines/aq;->b(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+
+    :cond_4
+    :goto_1
+    invoke-virtual {p0, p2}, Lkotlinx/coroutines/aq;->bG(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final a(Lkotlinx/coroutines/ap;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlinx/coroutines/ap<",
+            "*>;)V"
+        }
+    .end annotation
+
+    new-instance v0, Lkotlinx/coroutines/au;
+
+    invoke-direct {v0}, Lkotlinx/coroutines/au;-><init>()V
+
+    check-cast v0, Lkotlinx/coroutines/a/i;
+
+    invoke-virtual {p1, v0}, Lkotlinx/coroutines/ap;->b(Lkotlinx/coroutines/a/i;)Z
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/a/i;->Go()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
+
+    move-result-object v0
+
+    sget-object v1, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p0, p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public static final synthetic a(Lkotlinx/coroutines/aq;Lkotlinx/coroutines/aq$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
+    .locals 2
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-ne v0, p1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_3
+
+    check-cast p2, Lkotlinx/coroutines/a/i;
+
+    invoke-static {p2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_1
+
+    invoke-direct {p0, p1, p2, p3}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/aq$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-nez p2, :cond_2
+
+    :cond_1
+    invoke-direct {p0, p1, p3, v1}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/aq$b;Ljava/lang/Object;I)Z
+
+    :cond_2
+    return-void
+
+    :cond_3
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string p1, "Failed requirement."
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p0, Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method private final a(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+    .locals 7
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/a/g;->Go()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    check-cast v0, Lkotlinx/coroutines/a/i;
+
+    const/4 v1, 0x0
+
+    :goto_0
+    move-object v2, p1
+
+    check-cast v2, Lkotlinx/coroutines/a/g;
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_2
+
+    instance-of v2, v0, Lkotlinx/coroutines/am;
+
+    if-eqz v2, :cond_1
+
+    move-object v2, v0
+
+    check-cast v2, Lkotlinx/coroutines/ap;
+
+    :try_start_0
+    invoke-virtual {v2, p2}, Lkotlinx/coroutines/ap;->invoke(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v3
+
+    if-eqz v1, :cond_0
+
+    invoke-static {v1, v3}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    if-nez v1, :cond_1
+
+    :cond_0
+    move-object v1, p0
+
+    check-cast v1, Lkotlinx/coroutines/aq;
+
+    new-instance v4, Lkotlinx/coroutines/i;
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    const-string v6, "Exception in completion handler "
+
+    invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v2, " for "
+
+    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v4, v1, v3}, Lkotlinx/coroutines/i;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    move-object v1, v4
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    sget-object v2, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+
+    :cond_1
+    :goto_1
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/i;->Gp()Lkotlinx/coroutines/a/i;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_2
+    if-eqz v1, :cond_3
+
+    invoke-virtual {p0, v1}, Lkotlinx/coroutines/aq;->p(Ljava/lang/Throwable;)V
+
+    :cond_3
+    invoke-direct {p0, p2}, Lkotlinx/coroutines/aq;->t(Ljava/lang/Throwable;)Z
+
+    return-void
+
+    :cond_4
+    new-instance p1, Lkotlin/r;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    return-void
+.end method
+
+.method private final a(Ljava/lang/Object;Lkotlinx/coroutines/au;Lkotlinx/coroutines/ap;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            "Lkotlinx/coroutines/au;",
+            "Lkotlinx/coroutines/ap<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance v0, Lkotlinx/coroutines/aq$c;
+
+    check-cast p3, Lkotlinx/coroutines/a/i;
+
+    invoke-direct {v0, p3, p3, p0, p1}, Lkotlinx/coroutines/aq$c;-><init>(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/aq;Ljava/lang/Object;)V
+
+    check-cast v0, Lkotlinx/coroutines/a/i$a;
+
+    :goto_0
+    invoke-virtual {p2}, Lkotlinx/coroutines/a/i;->Gq()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Lkotlinx/coroutines/a/i;
+
+    invoke-virtual {p1, p3, p2, v0}, Lkotlinx/coroutines/a/i;->a(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i$a;)I
+
+    move-result p1
+
+    packed-switch p1, :pswitch_data_0
+
+    goto :goto_0
+
+    :pswitch_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :pswitch_1
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    return-void
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method private static a(Ljava/lang/Throwable;Ljava/util/List;)Z
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Throwable;",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/lang/Throwable;",
+            ">;)Z"
+        }
+    .end annotation
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-gt v0, v2, :cond_0
+
+    return v1
+
+    :cond_0
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Lkotlinx/coroutines/a/e;->eX(I)Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_1
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Throwable;
+
+    if-eq v3, p0, :cond_1
+
+    instance-of v4, v3, Ljava/util/concurrent/CancellationException;
+
+    if-nez v4, :cond_1
+
+    invoke-interface {v0, v3}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {p0, v3}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    return v1
+.end method
+
+.method private final a(Lkotlinx/coroutines/ah;Ljava/lang/Object;I)Z
+    .locals 2
+
+    instance-of p3, p1, Lkotlinx/coroutines/ab;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    if-nez p3, :cond_1
+
+    instance-of p3, p1, Lkotlinx/coroutines/ap;
+
+    if-eqz p3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p3, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 p3, 0x1
+
+    :goto_1
+    if-eqz p3, :cond_5
+
+    instance-of p3, p2, Lkotlinx/coroutines/f;
+
+    if-nez p3, :cond_2
+
+    const/4 p3, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 p3, 0x0
+
+    :goto_2
+    if-eqz p3, :cond_4
+
+    sget-object p3, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {p3, p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p3
+
+    if-nez p3, :cond_3
+
+    return v0
+
+    :cond_3
+    invoke-direct {p0, p1, p2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ah;Ljava/lang/Object;)V
+
+    return v1
+
+    :cond_4
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "Check failed."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_5
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "Check failed."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+.end method
+
+.method private final a(Lkotlinx/coroutines/aq$b;Ljava/lang/Object;I)Z
+    .locals 4
+
+    instance-of p3, p2, Lkotlinx/coroutines/ah;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    if-nez p3, :cond_0
+
+    const/4 p3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p3, 0x0
+
+    :goto_0
+    if-eqz p3, :cond_12
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object p3
+
+    if-ne p3, p1, :cond_1
+
+    const/4 p3, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p3, 0x0
+
+    :goto_1
+    if-eqz p3, :cond_11
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/aq$b;->isSealed()Z
+
+    move-result p3
+
+    xor-int/2addr p3, v1
+
+    if-eqz p3, :cond_10
+
+    iget-boolean p3, p1, Lkotlinx/coroutines/aq$b;->isCompleting:Z
+
+    if-eqz p3, :cond_f
+
+    instance-of p3, p2, Lkotlinx/coroutines/f;
+
+    const/4 v2, 0x0
+
+    if-nez p3, :cond_2
+
+    move-object p3, v2
+
+    goto :goto_2
+
+    :cond_2
+    move-object p3, p2
+
+    :goto_2
+    check-cast p3, Lkotlinx/coroutines/f;
+
+    if-eqz p3, :cond_3
+
+    iget-object v2, p3, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
+
+    :cond_3
+    monitor-enter p1
+
+    :try_start_0
+    iget-object p3, p1, Lkotlinx/coroutines/aq$b;->_exceptionsHolder:Ljava/lang/Object;
+
+    if-nez p3, :cond_4
+
+    invoke-static {}, Lkotlinx/coroutines/aq$b;->Gc()Ljava/util/ArrayList;
+
+    move-result-object p3
+
+    goto :goto_3
+
+    :cond_4
+    instance-of v3, p3, Ljava/lang/Throwable;
+
+    if-eqz v3, :cond_5
+
+    invoke-static {}, Lkotlinx/coroutines/aq$b;->Gc()Ljava/util/ArrayList;
+
+    move-result-object v3
+
+    invoke-virtual {v3, p3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    move-object p3, v3
+
+    goto :goto_3
+
+    :cond_5
+    instance-of v3, p3, Ljava/util/ArrayList;
+
+    if-eqz v3, :cond_e
+
+    if-eqz p3, :cond_d
+
+    check-cast p3, Ljava/util/ArrayList;
+
+    :goto_3
+    iget-object v3, p1, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
+
+    if-eqz v3, :cond_6
+
+    invoke-virtual {p3, v0, v3}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V
+
+    :cond_6
+    if-eqz v2, :cond_7
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_7
+
+    invoke-virtual {p3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_7
+    invoke-static {}, Lkotlinx/coroutines/ar;->Gd()Lkotlinx/coroutines/a/o;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlinx/coroutines/aq$b;->_exceptionsHolder:Ljava/lang/Object;
+
+    check-cast p3, Ljava/util/List;
+
+    invoke-direct {p0, p1, p3}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/aq$b;Ljava/util/List;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_8
+
+    invoke-static {v0, p3}, Lkotlinx/coroutines/aq;->a(Ljava/lang/Throwable;Ljava/util/List;)Z
+
+    move-result p3
+
+    if-nez p3, :cond_8
+
+    iget-object p3, p1, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_8
+    monitor-exit p1
+
+    if-nez v0, :cond_9
+
+    goto :goto_4
+
+    :cond_9
+    if-ne v0, v2, :cond_a
+
+    goto :goto_4
+
+    :cond_a
+    new-instance p2, Lkotlinx/coroutines/f;
+
+    invoke-direct {p2, v0}, Lkotlinx/coroutines/f;-><init>(Ljava/lang/Throwable;)V
+
+    :goto_4
+    if-eqz v0, :cond_b
+
+    invoke-direct {p0, v0}, Lkotlinx/coroutines/aq;->t(Ljava/lang/Throwable;)Z
+
+    move-result p3
+
+    if-nez p3, :cond_b
+
+    invoke-virtual {p0, v0}, Lkotlinx/coroutines/aq;->s(Ljava/lang/Throwable;)V
+
+    :cond_b
+    sget-object p3, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {p3, p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p3
+
+    if-eqz p3, :cond_c
+
+    check-cast p1, Lkotlinx/coroutines/ah;
+
+    invoke-direct {p0, p1, p2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ah;Ljava/lang/Object;)V
+
+    return v1
+
+    :cond_c
+    new-instance p3, Ljava/lang/StringBuilder;
+
+    const-string v0, "Unexpected state: "
+
+    invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v0, p0, Lkotlinx/coroutines/aq;->_state:Ljava/lang/Object;
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v0, ", expected: "
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ", update: "
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p2, Ljava/lang/Throwable;
+
+    throw p2
+
+    :cond_d
+    :try_start_1
+    new-instance p2, Lkotlin/r;
+
+    const-string p3, "null cannot be cast to non-null type kotlin.collections.ArrayList<kotlin.Throwable> /* = java.util.ArrayList<kotlin.Throwable> */"
+
+    invoke-direct {p2, p3}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_e
+    const-string p2, "State is "
+
+    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    new-instance p3, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p3, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p3, Ljava/lang/Throwable;
+
+    throw p3
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p2
+
+    monitor-exit p1
+
+    throw p2
+
+    :cond_f
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Failed requirement."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_10
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Failed requirement."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_11
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Failed requirement."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_12
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Failed requirement."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+.end method
+
+.method private final a(Lkotlinx/coroutines/aq$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)Z
+    .locals 4
+
+    :cond_0
+    iget-object v0, p2, Lkotlinx/coroutines/c;->bRz:Lkotlinx/coroutines/d;
+
+    new-instance v1, Lkotlinx/coroutines/aq$a;
+
+    invoke-direct {v1, p0, p1, p2, p3}, Lkotlinx/coroutines/aq$a;-><init>(Lkotlinx/coroutines/aq;Lkotlinx/coroutines/aq$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
+
+    check-cast v1, Lkotlinx/coroutines/h;
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v3, v3, v1, v2}, Lkotlinx/coroutines/ak$a;->a(Lkotlinx/coroutines/ak;ZZLkotlin/jvm/functions/Function1;I)Lkotlinx/coroutines/aa;
+
+    move-result-object v0
+
+    sget-object v1, Lkotlinx/coroutines/av;->bSz:Lkotlinx/coroutines/av;
+
+    if-eq v0, v1, :cond_1
+
+    return v2
+
+    :cond_1
+    check-cast p2, Lkotlinx/coroutines/a/i;
+
+    invoke-static {p2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
+
+    move-result-object p2
+
+    if-nez p2, :cond_0
+
+    return v3
+.end method
+
+.method private final b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
+    .locals 2
+
+    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, p1
+
+    :goto_0
+    check-cast v0, Ljava/util/concurrent/CancellationException;
+
+    if-nez v0, :cond_1
+
+    new-instance v0, Lkotlinx/coroutines/al;
+
+    move-object v1, p0
+
+    check-cast v1, Lkotlinx/coroutines/ak;
+
+    invoke-direct {v0, p2, p1, v1}, Lkotlinx/coroutines/al;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/ak;)V
+
+    check-cast v0, Ljava/util/concurrent/CancellationException;
+
+    :cond_1
+    return-object v0
+.end method
+
+.method private final b(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+    .locals 7
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/a/g;->Go()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    check-cast v0, Lkotlinx/coroutines/a/i;
+
+    const/4 v1, 0x0
+
+    :goto_0
+    move-object v2, p1
+
+    check-cast v2, Lkotlinx/coroutines/a/g;
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_2
+
+    instance-of v2, v0, Lkotlinx/coroutines/ap;
+
+    if-eqz v2, :cond_1
+
+    move-object v2, v0
+
+    check-cast v2, Lkotlinx/coroutines/ap;
+
+    :try_start_0
+    invoke-virtual {v2, p2}, Lkotlinx/coroutines/ap;->invoke(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v3
+
+    if-eqz v1, :cond_0
+
+    invoke-static {v1, v3}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    if-nez v1, :cond_1
+
+    :cond_0
+    move-object v1, p0
+
+    check-cast v1, Lkotlinx/coroutines/aq;
+
+    new-instance v4, Lkotlinx/coroutines/i;
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    const-string v6, "Exception in completion handler "
+
+    invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v2, " for "
+
+    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v4, v1, v3}, Lkotlinx/coroutines/i;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    move-object v1, v4
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    sget-object v2, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+
+    :cond_1
+    :goto_1
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/i;->Gp()Lkotlinx/coroutines/a/i;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_2
+    if-eqz v1, :cond_3
+
+    invoke-virtual {p0, v1}, Lkotlinx/coroutines/aq;->p(Ljava/lang/Throwable;)V
+
+    return-void
 
     :cond_3
     return-void
 
     :cond_4
-    new-instance v0, Lkotlin/r;
+    new-instance p1, Lkotlin/r;
 
-    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.JobSupport"
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
 
-    invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
-    throw v0
+    throw p1
+
+    return-void
 .end method
 
-.method public final isActive()Z
+.method private final bM(Ljava/lang/Object;)Z
+    .locals 1
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FW()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bN(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bP(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method private final bN(Ljava/lang/Object;)Z
+    .locals 4
+
+    :pswitch_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lkotlinx/coroutines/ah;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    instance-of v1, v0, Lkotlinx/coroutines/aq$b;
+
+    if-eqz v1, :cond_0
+
+    move-object v1, v0
+
+    check-cast v1, Lkotlinx/coroutines/aq$b;
+
+    iget-boolean v1, v1, Lkotlinx/coroutines/aq$b;->isCompleting:Z
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Lkotlinx/coroutines/f;
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bO(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v3
+
+    invoke-direct {v1, v3}, Lkotlinx/coroutines/f;-><init>(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v0, v1, v2}, Lkotlinx/coroutines/aq;->d(Ljava/lang/Object;Ljava/lang/Object;I)I
+
+    move-result v0
+
+    packed-switch v0, :pswitch_data_0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "unexpected result"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :pswitch_1
+    const/4 p1, 0x1
+
+    return p1
+
+    :pswitch_2
+    return v2
+
+    :cond_1
+    :goto_0
+    return v2
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_2
+        :pswitch_1
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method private final bO(Ljava/lang/Object;)Ljava/lang/Throwable;
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    instance-of v0, p1, Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    return-object p1
+
+    :cond_1
+    invoke-direct {p0}, Lkotlinx/coroutines/aq;->FZ()Lkotlinx/coroutines/al;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    return-object p1
+
+    :cond_2
+    if-eqz p1, :cond_3
+
+    check-cast p1, Lkotlinx/coroutines/aw;
+
+    invoke-interface {p1}, Lkotlinx/coroutines/aw;->Ga()Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_3
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ParentJob"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method private final bP(Ljava/lang/Object;)Z
+    .locals 8
+
+    const/4 v0, 0x0
+
+    move-object v1, v0
+
+    :cond_0
+    :pswitch_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v2
+
+    instance-of v3, v2, Lkotlinx/coroutines/aq$b;
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    if-eqz v3, :cond_7
+
+    monitor-enter v2
+
+    :try_start_0
+    move-object v3, v2
+
+    check-cast v3, Lkotlinx/coroutines/aq$b;
+
+    invoke-virtual {v3}, Lkotlinx/coroutines/aq$b;->isSealed()Z
+
+    move-result v3
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v3, :cond_1
+
+    monitor-exit v2
+
+    return v5
+
+    :cond_1
+    :try_start_1
+    move-object v3, v2
+
+    check-cast v3, Lkotlinx/coroutines/aq$b;
+
+    invoke-virtual {v3}, Lkotlinx/coroutines/aq$b;->Gb()Z
+
+    move-result v3
+
+    if-nez p1, :cond_2
+
+    if-nez v3, :cond_4
+
+    :cond_2
+    if-nez v1, :cond_3
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bO(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    :cond_3
+    move-object p1, v2
+
+    check-cast p1, Lkotlinx/coroutines/aq$b;
+
+    invoke-virtual {p1, v1}, Lkotlinx/coroutines/aq$b;->u(Ljava/lang/Throwable;)V
+
+    :cond_4
+    move-object p1, v2
+
+    check-cast p1, Lkotlinx/coroutines/aq$b;
+
+    iget-object p1, p1, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    xor-int/lit8 v1, v3, 0x1
+
+    if-eqz v1, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    move-object p1, v0
+
+    :goto_0
+    monitor-exit v2
+
+    if-eqz p1, :cond_6
+
+    check-cast v2, Lkotlinx/coroutines/aq$b;
+
+    iget-object v0, v2, Lkotlinx/coroutines/aq$b;->bSi:Lkotlinx/coroutines/au;
+
+    invoke-direct {p0, v0, p1}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+
+    :cond_6
+    return v4
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v2
+
+    throw p1
+
+    :cond_7
+    instance-of v3, v2, Lkotlinx/coroutines/ah;
+
+    if-eqz v3, :cond_f
+
+    if-nez v1, :cond_8
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bO(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    :cond_8
+    move-object v3, v2
+
+    check-cast v3, Lkotlinx/coroutines/ah;
+
+    invoke-interface {v3}, Lkotlinx/coroutines/ah;->isActive()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_e
+
+    instance-of v2, v3, Lkotlinx/coroutines/aq$b;
+
+    if-nez v2, :cond_9
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_9
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_d
+
+    invoke-interface {v3}, Lkotlinx/coroutines/ah;->isActive()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_c
+
+    invoke-direct {p0, v3}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ah;)Lkotlinx/coroutines/au;
+
+    move-result-object v2
+
+    if-nez v2, :cond_a
+
+    goto :goto_2
+
+    :cond_a
+    new-instance v6, Lkotlinx/coroutines/aq$b;
+
+    invoke-direct {v6, v2, v1}, Lkotlinx/coroutines/aq$b;-><init>(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+
+    sget-object v7, Lkotlinx/coroutines/aq;->bSn: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
+
+    move-result v3
+
+    if-nez v3, :cond_b
+
+    goto :goto_2
+
+    :cond_b
+    invoke-direct {p0, v2, v1}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+
+    const/4 v5, 0x1
+
+    :goto_2
+    if-eqz v5, :cond_0
+
+    return v4
+
+    :cond_c
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Check failed."
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_d
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Check failed."
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_e
+    new-instance v3, Lkotlinx/coroutines/f;
+
+    invoke-direct {v3, v1}, Lkotlinx/coroutines/f;-><init>(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v2, v3, v5}, Lkotlinx/coroutines/aq;->d(Ljava/lang/Object;Ljava/lang/Object;I)I
+
+    move-result v3
+
+    packed-switch v3, :pswitch_data_0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "unexpected result"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :pswitch_1
+    return v4
+
+    :pswitch_2
+    invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "Cannot happen in "
+
+    invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    throw v0
+
+    :cond_f
+    return v5
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_2
+        :pswitch_1
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method private static bQ(Ljava/lang/Object;)Ljava/lang/String;
+    .locals 1
+
+    instance-of v0, p0, Lkotlinx/coroutines/aq$b;
+
+    if-eqz v0, :cond_2
+
+    check-cast p0, Lkotlinx/coroutines/aq$b;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq$b;->Gb()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const-string p0, "Cancelling"
+
+    return-object p0
+
+    :cond_0
+    iget-boolean p0, p0, Lkotlinx/coroutines/aq$b;->isCompleting:Z
+
+    if-eqz p0, :cond_1
+
+    const-string p0, "Completing"
+
+    return-object p0
+
+    :cond_1
+    const-string p0, "Active"
+
+    return-object p0
+
+    :cond_2
+    instance-of v0, p0, Lkotlinx/coroutines/ah;
+
+    if-eqz v0, :cond_4
+
+    check-cast p0, Lkotlinx/coroutines/ah;
+
+    invoke-interface {p0}, Lkotlinx/coroutines/ah;->isActive()Z
+
+    move-result p0
+
+    if-eqz p0, :cond_3
+
+    const-string p0, "Active"
+
+    return-object p0
+
+    :cond_3
+    const-string p0, "New"
+
+    return-object p0
+
+    :cond_4
+    instance-of p0, p0, Lkotlinx/coroutines/f;
+
+    if-eqz p0, :cond_5
+
+    const-string p0, "Cancelled"
+
+    return-object p0
+
+    :cond_5
+    const-string p0, "Completed"
+
+    return-object p0
+.end method
+
+.method private isCompleted()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lkotlinx/coroutines/ah;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method private final t(Ljava/lang/Throwable;)Z
+    .locals 3
+
+    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FV()Z
+
+    move-result v0
+
+    const/4 v2, 0x0
+
+    if-nez v0, :cond_1
+
+    return v2
+
+    :cond_1
+    iget-object v0, p0, Lkotlinx/coroutines/aq;->parentHandle:Lkotlinx/coroutines/b;
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {v0, p1}, Lkotlinx/coroutines/b;->q(Ljava/lang/Throwable;)Z
+
+    move-result p1
+
+    if-ne p1, v1, :cond_2
+
+    return v1
+
+    :cond_2
+    return v2
+.end method
+
+
+# virtual methods
+.method public final FU()Ljava/util/concurrent/CancellationException;
+    .locals 4
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lkotlinx/coroutines/aq$b;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Lkotlinx/coroutines/aq$b;
+
+    iget-object v0, v0, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "Job is cancelling"
+
+    invoke-direct {p0, v0, v1}, Lkotlinx/coroutines/aq;->b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "Job is still new or active: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    throw v1
+
+    :cond_1
+    instance-of v1, v0, Lkotlinx/coroutines/ah;
+
+    if-nez v1, :cond_3
+
+    instance-of v1, v0, Lkotlinx/coroutines/f;
+
+    if-eqz v1, :cond_2
+
+    check-cast v0, Lkotlinx/coroutines/f;
+
+    iget-object v0, v0, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
+
+    const-string v1, "Job was cancelled"
+
+    invoke-direct {p0, v0, v1}, Lkotlinx/coroutines/aq;->b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_2
+    new-instance v0, Lkotlinx/coroutines/al;
+
+    const-string v1, "Job has completed normally"
+
+    const/4 v2, 0x0
+
+    move-object v3, p0
+
+    check-cast v3, Lkotlinx/coroutines/ak;
+
+    invoke-direct {v0, v1, v2, v3}, Lkotlinx/coroutines/al;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/ak;)V
+
+    check-cast v0, Ljava/util/concurrent/CancellationException;
+
+    :goto_0
+    return-object v0
+
+    :cond_3
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "Job is still new or active: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    throw v1
+.end method
+
+.method protected FV()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public FW()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method protected FX()Z
     .locals 1
 
     const/4 v0, 0x1
 
     return v0
 .end method
+
+.method public final FY()Ljava/lang/Object;
+    .locals 2
+
+    :goto_0
+    iget-object v0, p0, Lkotlinx/coroutines/aq;->_state:Ljava/lang/Object;
+
+    instance-of v1, v0, Lkotlinx/coroutines/a/m;
+
+    if-nez v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    check-cast v0, Lkotlinx/coroutines/a/m;
+
+    invoke-virtual {v0, p0}, Lkotlinx/coroutines/a/m;->bS(Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
+.end method
+
+.method public Fy()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public Fz()Ljava/lang/String;
+    .locals 1
+
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bJ(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final Ga()Ljava/lang/Throwable;
+    .locals 5
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lkotlinx/coroutines/aq$b;
+
+    if-eqz v1, :cond_0
+
+    move-object v1, v0
+
+    check-cast v1, Lkotlinx/coroutines/aq$b;
+
+    iget-object v1, v1, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v1, v0, Lkotlinx/coroutines/ah;
+
+    if-nez v1, :cond_4
+
+    instance-of v1, v0, Lkotlinx/coroutines/f;
+
+    if-eqz v1, :cond_1
+
+    move-object v1, v0
+
+    check-cast v1, Lkotlinx/coroutines/f;
+
+    iget-object v1, v1, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_3
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FX()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    instance-of v2, v1, Ljava/util/concurrent/CancellationException;
+
+    if-nez v2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    return-object v1
+
+    :cond_3
+    :goto_1
+    new-instance v2, Lkotlinx/coroutines/al;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    const-string v4, "Parent job is "
+
+    invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-static {v0}, Lkotlinx/coroutines/aq;->bQ(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    move-object v3, p0
+
+    check-cast v3, Lkotlinx/coroutines/ak;
+
+    invoke-direct {v2, v0, v1, v3}, Lkotlinx/coroutines/al;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/ak;)V
+
+    check-cast v2, Ljava/lang/Throwable;
+
+    return-object v2
+
+    :cond_4
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "Cannot be cancelling child in this state: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    throw v1
+.end method
+
+.method public final a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/aa;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Lkotlinx/coroutines/aa;"
+        }
+    .end annotation
+
+    const-string v0, "handler"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    move-object v1, v0
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v2
+
+    instance-of v3, v2, Lkotlinx/coroutines/ab;
+
+    if-eqz v3, :cond_4
+
+    move-object v3, v2
+
+    check-cast v3, Lkotlinx/coroutines/ab;
+
+    iget-boolean v4, v3, Lkotlinx/coroutines/ab;->bSd:Z
+
+    if-eqz v4, :cond_2
+
+    if-nez v1, :cond_1
+
+    invoke-direct {p0, p3, p1}, Lkotlinx/coroutines/aq;->a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/ap;
+
+    move-result-object v1
+
+    :cond_1
+    sget-object v3, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    check-cast v1, Lkotlinx/coroutines/aa;
+
+    return-object v1
+
+    :cond_2
+    new-instance v2, Lkotlinx/coroutines/au;
+
+    invoke-direct {v2}, Lkotlinx/coroutines/au;-><init>()V
+
+    iget-boolean v4, v3, Lkotlinx/coroutines/ab;->bSd:Z
+
+    if-eqz v4, :cond_3
+
+    check-cast v2, Lkotlinx/coroutines/ah;
+
+    goto :goto_1
+
+    :cond_3
+    new-instance v4, Lkotlinx/coroutines/ag;
+
+    invoke-direct {v4, v2}, Lkotlinx/coroutines/ag;-><init>(Lkotlinx/coroutines/au;)V
+
+    move-object v2, v4
+
+    check-cast v2, Lkotlinx/coroutines/ah;
+
+    :goto_1
+    sget-object v4, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v4, p0, v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_4
+    instance-of v3, v2, Lkotlinx/coroutines/ah;
+
+    if-eqz v3, :cond_10
+
+    move-object v3, v2
+
+    check-cast v3, Lkotlinx/coroutines/ah;
+
+    invoke-interface {v3}, Lkotlinx/coroutines/ah;->FP()Lkotlinx/coroutines/au;
+
+    move-result-object v3
+
+    if-nez v3, :cond_6
+
+    if-eqz v2, :cond_5
+
+    check-cast v2, Lkotlinx/coroutines/ap;
+
+    invoke-direct {p0, v2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ap;)V
+
+    goto :goto_0
+
+    :cond_5
+    new-instance p1, Lkotlin/r;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.JobNode<*>"
+
+    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    sget-object v4, Lkotlinx/coroutines/av;->bSz:Lkotlinx/coroutines/av;
+
+    check-cast v4, Lkotlinx/coroutines/aa;
+
+    if-eqz p1, :cond_c
+
+    instance-of v5, v2, Lkotlinx/coroutines/aq$b;
+
+    if-eqz v5, :cond_c
+
+    monitor-enter v2
+
+    :try_start_0
+    move-object v5, v2
+
+    check-cast v5, Lkotlinx/coroutines/aq$b;
+
+    iget-object v5, v5, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
+
+    if-eqz v5, :cond_7
+
+    instance-of v6, p3, Lkotlinx/coroutines/c;
+
+    if-eqz v6, :cond_b
+
+    move-object v6, v2
+
+    check-cast v6, Lkotlinx/coroutines/aq$b;
+
+    iget-boolean v6, v6, Lkotlinx/coroutines/aq$b;->isCompleting:Z
+
+    if-nez v6, :cond_b
+
+    :cond_7
+    if-nez v1, :cond_8
+
+    invoke-direct {p0, p3, p1}, Lkotlinx/coroutines/aq;->a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/ap;
+
+    move-result-object v1
+
+    :cond_8
+    invoke-direct {p0, v2, v3, v1}, Lkotlinx/coroutines/aq;->a(Ljava/lang/Object;Lkotlinx/coroutines/au;Lkotlinx/coroutines/ap;)Z
+
+    move-result v4
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v4, :cond_9
+
+    monitor-exit v2
+
+    goto/16 :goto_0
+
+    :cond_9
+    if-nez v5, :cond_a
+
+    :try_start_1
+    check-cast v1, Lkotlinx/coroutines/aa;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit v2
+
+    return-object v1
+
+    :cond_a
+    :try_start_2
+    move-object v4, v1
+
+    check-cast v4, Lkotlinx/coroutines/aa;
+
+    :cond_b
+    sget-object v6, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    monitor-exit v2
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v2
+
+    throw p1
+
+    :cond_c
+    move-object v5, v0
+
+    :goto_2
+    if-eqz v5, :cond_e
+
+    if-eqz p2, :cond_d
+
+    invoke-interface {p3, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_d
+    return-object v4
+
+    :cond_e
+    if-nez v1, :cond_f
+
+    invoke-direct {p0, p3, p1}, Lkotlinx/coroutines/aq;->a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/ap;
+
+    move-result-object v1
+
+    :cond_f
+    invoke-direct {p0, v2, v3, v1}, Lkotlinx/coroutines/aq;->a(Ljava/lang/Object;Lkotlinx/coroutines/au;Lkotlinx/coroutines/ap;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    check-cast v1, Lkotlinx/coroutines/aa;
+
+    return-object v1
+
+    :cond_10
+    if-eqz p2, :cond_13
+
+    instance-of p1, v2, Lkotlinx/coroutines/f;
+
+    if-nez p1, :cond_11
+
+    move-object v2, v0
+
+    :cond_11
+    check-cast v2, Lkotlinx/coroutines/f;
+
+    if-eqz v2, :cond_12
+
+    iget-object v0, v2, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
+
+    :cond_12
+    invoke-interface {p3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_13
+    sget-object p1, Lkotlinx/coroutines/av;->bSz:Lkotlinx/coroutines/av;
+
+    check-cast p1, Lkotlinx/coroutines/aa;
+
+    return-object p1
+.end method
+
+.method public final a(Lkotlinx/coroutines/d;)Lkotlinx/coroutines/b;
+    .locals 3
+
+    const-string v0, "child"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lkotlinx/coroutines/c;
+
+    invoke-direct {v0, p0, p1}, Lkotlinx/coroutines/c;-><init>(Lkotlinx/coroutines/aq;Lkotlinx/coroutines/d;)V
+
+    check-cast v0, Lkotlinx/coroutines/h;
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    const/4 p1, 0x1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p0, p1, v1, v0, v2}, Lkotlinx/coroutines/ak$a;->a(Lkotlinx/coroutines/ak;ZZLkotlin/jvm/functions/Function1;I)Lkotlinx/coroutines/aa;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Lkotlinx/coroutines/b;
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ChildHandle"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final a(Lkotlinx/coroutines/aw;)V
+    .locals 1
+
+    const-string v0, "parentJob"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bM(Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public final b(Lkotlinx/coroutines/ak;)V
+    .locals 1
+
+    iget-object v0, p0, Lkotlinx/coroutines/aq;->parentHandle:Lkotlinx/coroutines/b;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_3
+
+    if-nez p1, :cond_1
+
+    sget-object p1, Lkotlinx/coroutines/av;->bSz:Lkotlinx/coroutines/av;
+
+    check-cast p1, Lkotlinx/coroutines/b;
+
+    iput-object p1, p0, Lkotlinx/coroutines/aq;->parentHandle:Lkotlinx/coroutines/b;
+
+    return-void
+
+    :cond_1
+    invoke-interface {p1}, Lkotlinx/coroutines/ak;->start()Z
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlinx/coroutines/d;
+
+    invoke-interface {p1, v0}, Lkotlinx/coroutines/ak;->a(Lkotlinx/coroutines/d;)Lkotlinx/coroutines/b;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lkotlinx/coroutines/aq;->parentHandle:Lkotlinx/coroutines/b;
+
+    invoke-direct {p0}, Lkotlinx/coroutines/aq;->isCompleted()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p1}, Lkotlinx/coroutines/b;->dispose()V
+
+    sget-object p1, Lkotlinx/coroutines/av;->bSz:Lkotlinx/coroutines/av;
+
+    check-cast p1, Lkotlinx/coroutines/b;
+
+    iput-object p1, p0, Lkotlinx/coroutines/aq;->parentHandle:Lkotlinx/coroutines/b;
+
+    :cond_2
+    return-void
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Check failed."
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+.end method
+
+.method public bG(Ljava/lang/Object;)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final cancel()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lkotlinx/coroutines/aq;->r(Ljava/lang/Throwable;)Z
+
+    return-void
+.end method
+
+.method final d(Ljava/lang/Object;Ljava/lang/Object;I)I
+    .locals 7
+
+    instance-of p3, p1, Lkotlinx/coroutines/ah;
+
+    const/4 v0, 0x0
+
+    if-nez p3, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of p3, p1, Lkotlinx/coroutines/ab;
+
+    const/4 v1, 0x3
+
+    const/4 v2, 0x1
+
+    if-nez p3, :cond_1
+
+    instance-of p3, p1, Lkotlinx/coroutines/ap;
+
+    if-eqz p3, :cond_3
+
+    :cond_1
+    instance-of p3, p1, Lkotlinx/coroutines/c;
+
+    if-nez p3, :cond_3
+
+    instance-of p3, p2, Lkotlinx/coroutines/f;
+
+    if-nez p3, :cond_3
+
+    check-cast p1, Lkotlinx/coroutines/ah;
+
+    invoke-direct {p0, p1, p2, v0}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ah;Ljava/lang/Object;I)Z
+
+    move-result p1
+
+    if-nez p1, :cond_2
+
+    return v1
+
+    :cond_2
+    return v2
+
+    :cond_3
+    move-object p3, p1
+
+    check-cast p3, Lkotlinx/coroutines/ah;
+
+    invoke-direct {p0, p3}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ah;)Lkotlinx/coroutines/au;
+
+    move-result-object v3
+
+    if-nez v3, :cond_4
+
+    return v1
+
+    :cond_4
+    instance-of v4, p1, Lkotlinx/coroutines/aq$b;
+
+    const/4 v5, 0x0
+
+    if-nez v4, :cond_5
+
+    move-object v4, v5
+
+    goto :goto_0
+
+    :cond_5
+    move-object v4, p1
+
+    :goto_0
+    check-cast v4, Lkotlinx/coroutines/aq$b;
+
+    if-nez v4, :cond_6
+
+    new-instance v4, Lkotlinx/coroutines/aq$b;
+
+    invoke-direct {v4, v3, v5}, Lkotlinx/coroutines/aq$b;-><init>(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+
+    :cond_6
+    monitor-enter v4
+
+    :try_start_0
+    iget-boolean v6, v4, Lkotlinx/coroutines/aq$b;->isCompleting:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v6, :cond_7
+
+    monitor-exit v4
+
+    return v0
+
+    :cond_7
+    :try_start_1
+    iput-boolean v2, v4, Lkotlinx/coroutines/aq$b;->isCompleting:Z
+
+    if-eq v4, p1, :cond_8
+
+    sget-object v6, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v6, p0, p1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-nez p1, :cond_8
+
+    monitor-exit v4
+
+    return v1
+
+    :cond_8
+    :try_start_2
+    invoke-virtual {v4}, Lkotlinx/coroutines/aq$b;->isSealed()Z
+
+    move-result p1
+
+    xor-int/2addr p1, v2
+
+    if-eqz p1, :cond_11
+
+    invoke-virtual {v4}, Lkotlinx/coroutines/aq$b;->Gb()Z
+
+    move-result p1
+
+    instance-of v1, p2, Lkotlinx/coroutines/f;
+
+    if-nez v1, :cond_9
+
+    move-object v1, v5
+
+    goto :goto_1
+
+    :cond_9
+    move-object v1, p2
+
+    :goto_1
+    check-cast v1, Lkotlinx/coroutines/f;
+
+    if-eqz v1, :cond_a
+
+    iget-object v1, v1, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
+
+    invoke-virtual {v4, v1}, Lkotlinx/coroutines/aq$b;->u(Ljava/lang/Throwable;)V
+
+    :cond_a
+    iget-object v1, v4, Lkotlinx/coroutines/aq$b;->rootCause:Ljava/lang/Throwable;
+
+    xor-int/2addr p1, v2
+
+    if-eqz p1, :cond_b
+
+    goto :goto_2
+
+    :cond_b
+    move-object v1, v5
+
+    :goto_2
+    sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    monitor-exit v4
+
+    if-eqz v1, :cond_c
+
+    invoke-direct {p0, v3, v1}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/au;Ljava/lang/Throwable;)V
+
+    :cond_c
+    instance-of p1, p3, Lkotlinx/coroutines/c;
+
+    if-nez p1, :cond_d
+
+    move-object p1, v5
+
+    goto :goto_3
+
+    :cond_d
+    move-object p1, p3
+
+    :goto_3
+    check-cast p1, Lkotlinx/coroutines/c;
+
+    if-nez p1, :cond_e
+
+    invoke-interface {p3}, Lkotlinx/coroutines/ah;->FP()Lkotlinx/coroutines/au;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_f
+
+    check-cast p1, Lkotlinx/coroutines/a/i;
+
+    invoke-static {p1}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
+
+    move-result-object v5
+
+    goto :goto_4
+
+    :cond_e
+    move-object v5, p1
+
+    :cond_f
+    :goto_4
+    if-eqz v5, :cond_10
+
+    invoke-direct {p0, v4, v5, p2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/aq$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_10
+
+    const/4 p1, 0x2
+
+    return p1
+
+    :cond_10
+    invoke-direct {p0, v4, p2, v0}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/aq$b;Ljava/lang/Object;I)Z
+
+    return v2
+
+    :cond_11
+    :try_start_3
+    const-string p1, "Failed requirement."
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p2, Ljava/lang/Throwable;
+
+    throw p2
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v4
+
+    throw p1
+.end method
+
+.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(TR;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TR;-",
+            "Lkotlin/c/e$b;",
+            "+TR;>;)TR;"
+        }
+    .end annotation
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/e$b;
+
+    invoke-static {v0, p1, p2}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/c/e$b;",
+            ">(",
+            "Lkotlin/c/e$c<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/e$b;
+
+    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e$b;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final getKey()Lkotlin/c/e$c;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/c/e$c<",
+            "*>;"
+        }
+    .end annotation
+
+    sget-object v0, Lkotlinx/coroutines/ak;->bSl:Lkotlinx/coroutines/ak$b;
+
+    check-cast v0, Lkotlin/c/e$c;
+
+    return-object v0
+.end method
+
+.method public isActive()Z
+    .locals 2
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lkotlinx/coroutines/ah;
+
+    if-eqz v1, :cond_0
+
+    check-cast v0, Lkotlinx/coroutines/ah;
+
+    invoke-interface {v0}, Lkotlinx/coroutines/ah;->isActive()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public minusKey(Lkotlin/c/e$c;)Lkotlin/c/e;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/c/e$c<",
+            "*>;)",
+            "Lkotlin/c/e;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/e$b;
+
+    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->b(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public p(Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public plus(Lkotlin/c/e;)Lkotlin/c/e;
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/e$b;
+
+    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e;)Lkotlin/c/e;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final q(Ljava/lang/Throwable;)Z
+    .locals 1
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bM(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FX()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public final r(Ljava/lang/Throwable;)Z
+    .locals 0
+
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/aq;->bM(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FX()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method protected s(Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final start()Z
+    .locals 6
+
+    :goto_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lkotlinx/coroutines/ab;
+
+    const/4 v2, -0x1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-eqz v1, :cond_1
+
+    move-object v1, v0
+
+    check-cast v1, Lkotlinx/coroutines/ab;
+
+    iget-boolean v1, v1, Lkotlinx/coroutines/ab;->bSd:Z
+
+    if-nez v1, :cond_3
+
+    sget-object v1, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-static {}, Lkotlinx/coroutines/ar;->Ge()Lkotlinx/coroutines/ab;
+
+    move-result-object v5
+
+    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->Fy()V
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    instance-of v1, v0, Lkotlinx/coroutines/ag;
+
+    if-eqz v1, :cond_3
+
+    sget-object v1, Lkotlinx/coroutines/aq;->bSn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-object v5, v0
+
+    check-cast v5, Lkotlinx/coroutines/ag;
+
+    iget-object v5, v5, Lkotlinx/coroutines/ag;->bSi:Lkotlinx/coroutines/au;
+
+    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->Fy()V
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_1
+    packed-switch v2, :pswitch_data_0
+
+    goto :goto_0
+
+    :pswitch_0
+    return v4
+
+    :pswitch_1
+    return v3
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->Fz()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x7b
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/aq;->FY()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lkotlinx/coroutines/aq;->bQ(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "}@"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bI(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ar.smali b/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
index c9ab874447..4ed8ed0c10 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
@@ -1,3381 +1,67 @@
-.class public Lkotlinx/coroutines/ar;
+.class public final Lkotlinx/coroutines/ar;
 .super Ljava/lang/Object;
-
-# interfaces
-.implements Lkotlinx/coroutines/al;
-.implements Lkotlinx/coroutines/ax;
-.implements Lkotlinx/coroutines/d;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lkotlinx/coroutines/ar$b;,
-        Lkotlinx/coroutines/ar$a;
-    }
-.end annotation
+.source "JobSupport.kt"
 
 
 # static fields
-.field static final bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bSv:Lkotlinx/coroutines/a/o;
 
+.field private static final bSw:Lkotlinx/coroutines/ab;
 
-# instance fields
-.field private volatile bRX:Ljava/lang/Object;
-
-.field private volatile bSv:Lkotlinx/coroutines/b;
+.field private static final bSx:Lkotlinx/coroutines/ab;
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 3
+    .locals 2
 
-    const-class v0, Lkotlinx/coroutines/ar;
+    new-instance v0, Lkotlinx/coroutines/a/o;
 
-    const-class v1, Ljava/lang/Object;
+    const-string v1, "SEALED"
 
-    const-string v2, "bRX"
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/a/o;
 
-    move-result-object v0
-
-    sput-object v0, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    if-eqz p1, :cond_0
-
-    invoke-static {}, Lkotlinx/coroutines/as;->Gf()Lkotlinx/coroutines/ac;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lkotlinx/coroutines/as;->Gg()Lkotlinx/coroutines/ac;
-
-    move-result-object p1
-
-    :goto_0
-    iput-object p1, p0, Lkotlinx/coroutines/ar;->bRX:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method private final Ga()Lkotlinx/coroutines/am;
-    .locals 4
-
-    new-instance v0, Lkotlinx/coroutines/am;
-
-    const-string v1, "Job was cancelled"
-
-    move-object v2, p0
-
-    check-cast v2, Lkotlinx/coroutines/al;
-
-    const/4 v3, 0x0
-
-    invoke-direct {v0, v1, v3, v2}, Lkotlinx/coroutines/am;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/al;)V
-
-    return-object v0
-.end method
-
-.method private final a(Lkotlinx/coroutines/ar$b;Ljava/util/List;)Ljava/lang/Throwable;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlinx/coroutines/ar$b;",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/lang/Throwable;",
-            ">;)",
-            "Ljava/lang/Throwable;"
-        }
-    .end annotation
-
-    invoke-interface {p2}, Ljava/util/List;->isEmpty()Z
-
-    move-result v0
+    new-instance v0, Lkotlinx/coroutines/ab;
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_1
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/ab;-><init>(Z)V
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/ar$b;->Gc()Z
+    sput-object v0, Lkotlinx/coroutines/ar;->bSw:Lkotlinx/coroutines/ab;
 
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Lkotlinx/coroutines/ar;->Ga()Lkotlinx/coroutines/am;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    return-object p1
-
-    :cond_0
-    return-object v1
-
-    :cond_1
-    move-object p1, p2
-
-    check-cast p1, Ljava/lang/Iterable;
-
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_2
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_4
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v3, v0
-
-    check-cast v3, Ljava/lang/Throwable;
-
-    instance-of v3, v3, Ljava/util/concurrent/CancellationException;
-
-    if-nez v3, :cond_3
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_2
-
-    goto :goto_1
-
-    :cond_4
-    move-object v0, v1
-
-    :goto_1
-    check-cast v0, Ljava/lang/Throwable;
-
-    if-nez v0, :cond_5
-
-    invoke-interface {p2, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    :cond_5
-    return-object v0
-.end method
-
-.method private final a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/aq;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;Z)",
-            "Lkotlinx/coroutines/aq<",
-            "*>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
+    new-instance v0, Lkotlinx/coroutines/ab;
 
     const/4 v1, 0x1
 
-    const/4 v2, 0x0
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/ab;-><init>(Z)V
 
-    if-eqz p2, :cond_4
-
-    instance-of p2, p1, Lkotlinx/coroutines/an;
-
-    if-nez p2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v2, p1
-
-    :goto_0
-    check-cast v2, Lkotlinx/coroutines/an;
-
-    if-eqz v2, :cond_3
-
-    iget-object p2, v2, Lkotlinx/coroutines/an;->job:Lkotlinx/coroutines/al;
-
-    move-object v3, p0
-
-    check-cast v3, Lkotlinx/coroutines/ar;
-
-    if-ne p2, v3, :cond_1
-
-    const/4 v0, 0x1
-
-    :cond_1
-    if-eqz v0, :cond_2
-
-    if-eqz v2, :cond_3
-
-    check-cast v2, Lkotlinx/coroutines/aq;
-
-    return-object v2
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Failed requirement."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_3
-    new-instance p2, Lkotlinx/coroutines/aj;
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlinx/coroutines/al;
-
-    invoke-direct {p2, v0, p1}, Lkotlinx/coroutines/aj;-><init>(Lkotlinx/coroutines/al;Lkotlin/jvm/functions/Function1;)V
-
-    check-cast p2, Lkotlinx/coroutines/aq;
-
-    return-object p2
-
-    :cond_4
-    instance-of p2, p1, Lkotlinx/coroutines/aq;
-
-    if-nez p2, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    move-object v2, p1
-
-    :goto_1
-    check-cast v2, Lkotlinx/coroutines/aq;
-
-    if-eqz v2, :cond_8
-
-    iget-object p2, v2, Lkotlinx/coroutines/aq;->job:Lkotlinx/coroutines/al;
-
-    move-object v3, p0
-
-    check-cast v3, Lkotlinx/coroutines/ar;
-
-    if-ne p2, v3, :cond_6
-
-    instance-of p2, v2, Lkotlinx/coroutines/an;
-
-    if-nez p2, :cond_6
-
-    const/4 v0, 0x1
-
-    :cond_6
-    if-eqz v0, :cond_7
-
-    if-nez v2, :cond_9
-
-    goto :goto_2
-
-    :cond_7
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Failed requirement."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_8
-    :goto_2
-    new-instance p2, Lkotlinx/coroutines/ak;
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlinx/coroutines/al;
-
-    invoke-direct {p2, v0, p1}, Lkotlinx/coroutines/ak;-><init>(Lkotlinx/coroutines/al;Lkotlin/jvm/functions/Function1;)V
-
-    move-object v2, p2
-
-    check-cast v2, Lkotlinx/coroutines/aq;
-
-    :cond_9
-    return-object v2
-.end method
-
-.method private final a(Lkotlinx/coroutines/ai;)Lkotlinx/coroutines/av;
-    .locals 1
-
-    invoke-interface {p1}, Lkotlinx/coroutines/ai;->FQ()Lkotlinx/coroutines/av;
-
-    move-result-object v0
-
-    if-nez v0, :cond_2
-
-    instance-of v0, p1, Lkotlinx/coroutines/ac;
-
-    if-eqz v0, :cond_0
-
-    new-instance p1, Lkotlinx/coroutines/av;
-
-    invoke-direct {p1}, Lkotlinx/coroutines/av;-><init>()V
-
-    return-object p1
-
-    :cond_0
-    instance-of v0, p1, Lkotlinx/coroutines/aq;
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lkotlinx/coroutines/aq;
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/aq;)V
-
-    const/4 p1, 0x0
-
-    return-object p1
-
-    :cond_1
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "State should have list: "
-
-    invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    throw v0
-
-    :cond_2
-    return-object v0
-.end method
-
-.method private static a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
-    .locals 1
-
-    :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lkotlinx/coroutines/a/n;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gr()Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lkotlinx/coroutines/a/n;
-
-    if-nez v0, :cond_0
-
-    instance-of v0, p0, Lkotlinx/coroutines/c;
-
-    if-eqz v0, :cond_1
-
-    check-cast p0, Lkotlinx/coroutines/c;
-
-    return-object p0
-
-    :cond_1
-    instance-of v0, p0, Lkotlinx/coroutines/av;
-
-    if-eqz v0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
-.method private final a(Lkotlinx/coroutines/ai;Ljava/lang/Object;)V
-    .locals 4
-
-    iget-object v0, p0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/b;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lkotlinx/coroutines/b;->dispose()V
-
-    sget-object v0, Lkotlinx/coroutines/aw;->bSK:Lkotlinx/coroutines/aw;
-
-    check-cast v0, Lkotlinx/coroutines/b;
-
-    iput-object v0, p0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/b;
-
-    :cond_0
-    instance-of v0, p2, Lkotlinx/coroutines/f;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_1
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v0, p2
-
-    :goto_0
-    check-cast v0, Lkotlinx/coroutines/f;
-
-    if-eqz v0, :cond_2
-
-    iget-object v1, v0, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
-
-    :cond_2
-    instance-of v0, p1, Lkotlinx/coroutines/aq;
-
-    if-eqz v0, :cond_3
-
-    :try_start_0
-    move-object v0, p1
-
-    check-cast v0, Lkotlinx/coroutines/aq;
-
-    invoke-virtual {v0, v1}, Lkotlinx/coroutines/aq;->invoke(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lkotlinx/coroutines/i;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    const-string v3, "Exception in completion handler "
-
-    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, " for "
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v1, p1, v0}, Lkotlinx/coroutines/i;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, v1}, Lkotlinx/coroutines/ar;->p(Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :cond_3
-    invoke-interface {p1}, Lkotlinx/coroutines/ai;->FQ()Lkotlinx/coroutines/av;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_4
-
-    invoke-direct {p0, p1, v1}, Lkotlinx/coroutines/ar;->b(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-
-    :cond_4
-    :goto_1
-    invoke-virtual {p0, p2}, Lkotlinx/coroutines/ar;->bG(Ljava/lang/Object;)V
+    sput-object v0, Lkotlinx/coroutines/ar;->bSx:Lkotlinx/coroutines/ab;
 
     return-void
 .end method
 
-.method private final a(Lkotlinx/coroutines/aq;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlinx/coroutines/aq<",
-            "*>;)V"
-        }
-    .end annotation
-
-    new-instance v0, Lkotlinx/coroutines/av;
-
-    invoke-direct {v0}, Lkotlinx/coroutines/av;-><init>()V
-
-    check-cast v0, Lkotlinx/coroutines/a/i;
-
-    invoke-virtual {p1, v0}, Lkotlinx/coroutines/aq;->b(Lkotlinx/coroutines/a/i;)Z
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/a/i;->Gp()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lkotlinx/coroutines/a/h;->bT(Ljava/lang/Object;)Lkotlinx/coroutines/a/i;
-
-    move-result-object v0
-
-    sget-object v1, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p0, p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    return-void
-.end method
-
-.method public static final synthetic a(Lkotlinx/coroutines/ar;Lkotlinx/coroutines/ar$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
-    .locals 2
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-ne v0, p1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_3
-
-    check-cast p2, Lkotlinx/coroutines/a/i;
-
-    invoke-static {p2}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_1
-
-    invoke-direct {p0, p1, p2, p3}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ar$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-nez p2, :cond_2
-
-    :cond_1
-    invoke-direct {p0, p1, p3, v1}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ar$b;Ljava/lang/Object;I)Z
-
-    :cond_2
-    return-void
-
-    :cond_3
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string p1, "Failed requirement."
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p0, Ljava/lang/Throwable;
-
-    throw p0
-.end method
-
-.method private final a(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-    .locals 7
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/a/g;->Gp()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_4
-
-    check-cast v0, Lkotlinx/coroutines/a/i;
-
-    const/4 v1, 0x0
-
-    :goto_0
-    move-object v2, p1
-
-    check-cast v2, Lkotlinx/coroutines/a/g;
-
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_2
-
-    instance-of v2, v0, Lkotlinx/coroutines/an;
-
-    if-eqz v2, :cond_1
-
-    move-object v2, v0
-
-    check-cast v2, Lkotlinx/coroutines/aq;
-
-    :try_start_0
-    invoke-virtual {v2, p2}, Lkotlinx/coroutines/aq;->invoke(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v3
-
-    if-eqz v1, :cond_0
-
-    invoke-static {v1, v3}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    if-nez v1, :cond_1
-
-    :cond_0
-    move-object v1, p0
-
-    check-cast v1, Lkotlinx/coroutines/ar;
-
-    new-instance v4, Lkotlinx/coroutines/i;
-
-    new-instance v5, Ljava/lang/StringBuilder;
-
-    const-string v6, "Exception in completion handler "
-
-    invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v2, " for "
-
-    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v4, v1, v3}, Lkotlinx/coroutines/i;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    move-object v1, v4
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    sget-object v2, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-
-    :cond_1
-    :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/i;->Gq()Lkotlinx/coroutines/a/i;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_2
-    if-eqz v1, :cond_3
-
-    invoke-virtual {p0, v1}, Lkotlinx/coroutines/ar;->p(Ljava/lang/Throwable;)V
-
-    :cond_3
-    invoke-direct {p0, p2}, Lkotlinx/coroutines/ar;->t(Ljava/lang/Throwable;)Z
-
-    return-void
-
-    :cond_4
-    new-instance p1, Lkotlin/r;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method private final a(Ljava/lang/Object;Lkotlinx/coroutines/av;Lkotlinx/coroutines/aq;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            "Lkotlinx/coroutines/av;",
-            "Lkotlinx/coroutines/aq<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance v0, Lkotlinx/coroutines/ar$c;
-
-    check-cast p3, Lkotlinx/coroutines/a/i;
-
-    invoke-direct {v0, p3, p3, p0, p1}, Lkotlinx/coroutines/ar$c;-><init>(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/ar;Ljava/lang/Object;)V
-
-    check-cast v0, Lkotlinx/coroutines/a/i$a;
-
-    :goto_0
-    invoke-virtual {p2}, Lkotlinx/coroutines/a/i;->Gr()Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p1, Lkotlinx/coroutines/a/i;
-
-    invoke-virtual {p1, p3, p2, v0}, Lkotlinx/coroutines/a/i;->a(Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i;Lkotlinx/coroutines/a/i$a;)I
-
-    move-result p1
-
-    packed-switch p1, :pswitch_data_0
-
-    goto :goto_0
-
-    :pswitch_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :pswitch_1
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    new-instance p1, Lkotlin/r;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x1
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method private static a(Ljava/lang/Throwable;Ljava/util/List;)Z
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Throwable;",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/lang/Throwable;",
-            ">;)Z"
-        }
-    .end annotation
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-gt v0, v2, :cond_0
-
-    return v1
-
-    :cond_0
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    invoke-static {v0}, Lkotlinx/coroutines/a/e;->eX(I)Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_1
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Throwable;
-
-    if-eq v3, p0, :cond_1
-
-    instance-of v4, v3, Ljava/util/concurrent/CancellationException;
-
-    if-nez v4, :cond_1
-
-    invoke-interface {v0, v3}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    invoke-static {p0, v3}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    return v1
-.end method
-
-.method private final a(Lkotlinx/coroutines/ai;Ljava/lang/Object;I)Z
-    .locals 2
-
-    instance-of p3, p1, Lkotlinx/coroutines/ac;
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-nez p3, :cond_1
-
-    instance-of p3, p1, Lkotlinx/coroutines/aq;
-
-    if-eqz p3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p3, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 p3, 0x1
-
-    :goto_1
-    if-eqz p3, :cond_5
-
-    instance-of p3, p2, Lkotlinx/coroutines/f;
-
-    if-nez p3, :cond_2
-
-    const/4 p3, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 p3, 0x0
-
-    :goto_2
-    if-eqz p3, :cond_4
-
-    sget-object p3, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {p3, p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p3
-
-    if-nez p3, :cond_3
-
-    return v0
-
-    :cond_3
-    invoke-direct {p0, p1, p2}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ai;Ljava/lang/Object;)V
-
-    return v1
-
-    :cond_4
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "Check failed."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "Check failed."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-.end method
-
-.method private final a(Lkotlinx/coroutines/ar$b;Ljava/lang/Object;I)Z
-    .locals 4
-
-    instance-of p3, p2, Lkotlinx/coroutines/ai;
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-nez p3, :cond_0
-
-    const/4 p3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p3, 0x0
-
-    :goto_0
-    if-eqz p3, :cond_12
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object p3
-
-    if-ne p3, p1, :cond_1
-
-    const/4 p3, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p3, 0x0
-
-    :goto_1
-    if-eqz p3, :cond_11
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/ar$b;->isSealed()Z
-
-    move-result p3
-
-    xor-int/2addr p3, v1
-
-    if-eqz p3, :cond_10
-
-    iget-boolean p3, p1, Lkotlinx/coroutines/ar$b;->bSB:Z
-
-    if-eqz p3, :cond_f
-
-    instance-of p3, p2, Lkotlinx/coroutines/f;
-
-    const/4 v2, 0x0
-
-    if-nez p3, :cond_2
-
-    move-object p3, v2
-
-    goto :goto_2
-
-    :cond_2
-    move-object p3, p2
-
-    :goto_2
-    check-cast p3, Lkotlinx/coroutines/f;
-
-    if-eqz p3, :cond_3
-
-    iget-object v2, p3, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
-
-    :cond_3
-    monitor-enter p1
-
-    :try_start_0
-    iget-object p3, p1, Lkotlinx/coroutines/ar$b;->bSA:Ljava/lang/Object;
-
-    if-nez p3, :cond_4
-
-    invoke-static {}, Lkotlinx/coroutines/ar$b;->Gd()Ljava/util/ArrayList;
-
-    move-result-object p3
-
-    goto :goto_3
-
-    :cond_4
-    instance-of v3, p3, Ljava/lang/Throwable;
-
-    if-eqz v3, :cond_5
-
-    invoke-static {}, Lkotlinx/coroutines/ar$b;->Gd()Ljava/util/ArrayList;
-
-    move-result-object v3
-
-    invoke-virtual {v3, p3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    move-object p3, v3
-
-    goto :goto_3
-
-    :cond_5
-    instance-of v3, p3, Ljava/util/ArrayList;
-
-    if-eqz v3, :cond_e
-
-    if-eqz p3, :cond_d
-
-    check-cast p3, Ljava/util/ArrayList;
-
-    :goto_3
-    iget-object v3, p1, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
-
-    if-eqz v3, :cond_6
-
-    invoke-virtual {p3, v0, v3}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V
-
-    :cond_6
-    if-eqz v2, :cond_7
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_7
-
-    invoke-virtual {p3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_7
-    invoke-static {}, Lkotlinx/coroutines/as;->Ge()Lkotlinx/coroutines/a/o;
-
-    move-result-object v0
-
-    iput-object v0, p1, Lkotlinx/coroutines/ar$b;->bSA:Ljava/lang/Object;
-
-    check-cast p3, Ljava/util/List;
-
-    invoke-direct {p0, p1, p3}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ar$b;Ljava/util/List;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_8
-
-    invoke-static {v0, p3}, Lkotlinx/coroutines/ar;->a(Ljava/lang/Throwable;Ljava/util/List;)Z
-
-    move-result p3
-
-    if-nez p3, :cond_8
-
-    iget-object p3, p1, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_8
-    monitor-exit p1
-
-    if-nez v0, :cond_9
-
-    goto :goto_4
-
-    :cond_9
-    if-ne v0, v2, :cond_a
-
-    goto :goto_4
-
-    :cond_a
-    new-instance p2, Lkotlinx/coroutines/f;
-
-    invoke-direct {p2, v0}, Lkotlinx/coroutines/f;-><init>(Ljava/lang/Throwable;)V
-
-    :goto_4
-    if-eqz v0, :cond_b
-
-    invoke-direct {p0, v0}, Lkotlinx/coroutines/ar;->t(Ljava/lang/Throwable;)Z
-
-    move-result p3
-
-    if-nez p3, :cond_b
-
-    invoke-virtual {p0, v0}, Lkotlinx/coroutines/ar;->s(Ljava/lang/Throwable;)V
-
-    :cond_b
-    sget-object p3, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {p3, p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p3
-
-    if-eqz p3, :cond_c
-
-    check-cast p1, Lkotlinx/coroutines/ai;
-
-    invoke-direct {p0, p1, p2}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ai;Ljava/lang/Object;)V
-
-    return v1
-
-    :cond_c
-    new-instance p3, Ljava/lang/StringBuilder;
-
-    const-string v0, "Unexpected state: "
-
-    invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v0, p0, Lkotlinx/coroutines/ar;->bRX:Ljava/lang/Object;
-
-    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v0, ", expected: "
-
-    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ", update: "
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p2, Ljava/lang/Throwable;
-
-    throw p2
-
-    :cond_d
-    :try_start_1
-    new-instance p2, Lkotlin/r;
-
-    const-string p3, "null cannot be cast to non-null type kotlin.collections.ArrayList<kotlin.Throwable> /* = java.util.ArrayList<kotlin.Throwable> */"
-
-    invoke-direct {p2, p3}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_e
-    const-string p2, "State is "
-
-    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p2
-
-    new-instance p3, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p3, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p3, Ljava/lang/Throwable;
-
-    throw p3
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p2
-
-    monitor-exit p1
-
-    throw p2
-
-    :cond_f
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Failed requirement."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_10
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Failed requirement."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_11
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Failed requirement."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_12
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Failed requirement."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-.end method
-
-.method private final a(Lkotlinx/coroutines/ar$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)Z
-    .locals 4
-
-    :cond_0
-    iget-object v0, p2, Lkotlinx/coroutines/c;->bRz:Lkotlinx/coroutines/d;
-
-    new-instance v1, Lkotlinx/coroutines/ar$a;
-
-    invoke-direct {v1, p0, p1, p2, p3}, Lkotlinx/coroutines/ar$a;-><init>(Lkotlinx/coroutines/ar;Lkotlinx/coroutines/ar$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)V
-
-    check-cast v1, Lkotlinx/coroutines/h;
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    invoke-static {v0, v3, v3, v1, v2}, Lkotlinx/coroutines/al$a;->a(Lkotlinx/coroutines/al;ZZLkotlin/jvm/functions/Function1;I)Lkotlinx/coroutines/ab;
-
-    move-result-object v0
-
-    sget-object v1, Lkotlinx/coroutines/aw;->bSK:Lkotlinx/coroutines/aw;
-
-    if-eq v0, v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p2, Lkotlinx/coroutines/a/i;
-
-    invoke-static {p2}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
-
-    move-result-object p2
-
-    if-nez p2, :cond_0
-
-    return v3
-.end method
-
-.method private final b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
-    .locals 2
-
-    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, p1
-
-    :goto_0
-    check-cast v0, Ljava/util/concurrent/CancellationException;
-
-    if-nez v0, :cond_1
-
-    new-instance v0, Lkotlinx/coroutines/am;
-
-    move-object v1, p0
-
-    check-cast v1, Lkotlinx/coroutines/al;
-
-    invoke-direct {v0, p2, p1, v1}, Lkotlinx/coroutines/am;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/al;)V
-
-    check-cast v0, Ljava/util/concurrent/CancellationException;
-
-    :cond_1
-    return-object v0
-.end method
-
-.method private final b(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-    .locals 7
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/a/g;->Gp()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_4
-
-    check-cast v0, Lkotlinx/coroutines/a/i;
-
-    const/4 v1, 0x0
-
-    :goto_0
-    move-object v2, p1
-
-    check-cast v2, Lkotlinx/coroutines/a/g;
-
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_2
-
-    instance-of v2, v0, Lkotlinx/coroutines/aq;
-
-    if-eqz v2, :cond_1
-
-    move-object v2, v0
-
-    check-cast v2, Lkotlinx/coroutines/aq;
-
-    :try_start_0
-    invoke-virtual {v2, p2}, Lkotlinx/coroutines/aq;->invoke(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v3
-
-    if-eqz v1, :cond_0
-
-    invoke-static {v1, v3}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    if-nez v1, :cond_1
-
-    :cond_0
-    move-object v1, p0
-
-    check-cast v1, Lkotlinx/coroutines/ar;
-
-    new-instance v4, Lkotlinx/coroutines/i;
-
-    new-instance v5, Ljava/lang/StringBuilder;
-
-    const-string v6, "Exception in completion handler "
-
-    invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v2, " for "
-
-    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v4, v1, v3}, Lkotlinx/coroutines/i;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    move-object v1, v4
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    sget-object v2, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-
-    :cond_1
-    :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/i;->Gq()Lkotlinx/coroutines/a/i;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_2
-    if-eqz v1, :cond_3
-
-    invoke-virtual {p0, v1}, Lkotlinx/coroutines/ar;->p(Ljava/lang/Throwable;)V
-
-    :cond_3
-    return-void
-
-    :cond_4
-    new-instance p1, Lkotlin/r;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method private final bM(Ljava/lang/Object;)Z
+.method public static final synthetic Gd()Lkotlinx/coroutines/a/o;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FX()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bN(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bP(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method private final bN(Ljava/lang/Object;)Z
-    .locals 4
-
-    :pswitch_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lkotlinx/coroutines/ai;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    instance-of v1, v0, Lkotlinx/coroutines/ar$b;
-
-    if-eqz v1, :cond_0
-
-    move-object v1, v0
-
-    check-cast v1, Lkotlinx/coroutines/ar$b;
-
-    iget-boolean v1, v1, Lkotlinx/coroutines/ar$b;->bSB:Z
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lkotlinx/coroutines/f;
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bO(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v3
-
-    invoke-direct {v1, v3}, Lkotlinx/coroutines/f;-><init>(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v0, v1, v2}, Lkotlinx/coroutines/ar;->d(Ljava/lang/Object;Ljava/lang/Object;I)I
-
-    move-result v0
-
-    packed-switch v0, :pswitch_data_0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "unexpected result"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :pswitch_1
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_1
-    :goto_0
-    :pswitch_2
-    return v2
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_2
-        :pswitch_1
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method private final bO(Ljava/lang/Object;)Ljava/lang/Throwable;
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    instance-of v0, p1, Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    return-object p1
-
-    :cond_1
-    invoke-direct {p0}, Lkotlinx/coroutines/ar;->Ga()Lkotlinx/coroutines/am;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    return-object p1
-
-    :cond_2
-    if-eqz p1, :cond_3
-
-    check-cast p1, Lkotlinx/coroutines/ax;
-
-    invoke-interface {p1}, Lkotlinx/coroutines/ax;->Gb()Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    new-instance p1, Lkotlin/r;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ParentJob"
-
-    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method private final bP(Ljava/lang/Object;)Z
-    .locals 8
-
-    const/4 v0, 0x0
-
-    move-object v1, v0
-
-    :cond_0
-    :pswitch_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v2
-
-    instance-of v3, v2, Lkotlinx/coroutines/ar$b;
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    if-eqz v3, :cond_7
-
-    monitor-enter v2
-
-    :try_start_0
-    move-object v3, v2
-
-    check-cast v3, Lkotlinx/coroutines/ar$b;
-
-    invoke-virtual {v3}, Lkotlinx/coroutines/ar$b;->isSealed()Z
-
-    move-result v3
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v3, :cond_1
-
-    monitor-exit v2
-
-    return v5
-
-    :cond_1
-    :try_start_1
-    move-object v3, v2
-
-    check-cast v3, Lkotlinx/coroutines/ar$b;
-
-    invoke-virtual {v3}, Lkotlinx/coroutines/ar$b;->Gc()Z
-
-    move-result v3
-
-    if-nez p1, :cond_2
-
-    if-nez v3, :cond_4
-
-    :cond_2
-    if-nez v1, :cond_3
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bO(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    :cond_3
-    move-object p1, v2
-
-    check-cast p1, Lkotlinx/coroutines/ar$b;
-
-    invoke-virtual {p1, v1}, Lkotlinx/coroutines/ar$b;->u(Ljava/lang/Throwable;)V
-
-    :cond_4
-    move-object p1, v2
-
-    check-cast p1, Lkotlinx/coroutines/ar$b;
-
-    iget-object p1, p1, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    xor-int/lit8 v1, v3, 0x1
-
-    if-eqz v1, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    move-object p1, v0
-
-    :goto_0
-    monitor-exit v2
-
-    if-eqz p1, :cond_6
-
-    check-cast v2, Lkotlinx/coroutines/ar$b;
-
-    iget-object v0, v2, Lkotlinx/coroutines/ar$b;->bSo:Lkotlinx/coroutines/av;
-
-    invoke-direct {p0, v0, p1}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-
-    :cond_6
-    return v4
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v2
-
-    throw p1
-
-    :cond_7
-    instance-of v3, v2, Lkotlinx/coroutines/ai;
-
-    if-eqz v3, :cond_f
-
-    if-nez v1, :cond_8
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bO(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    :cond_8
-    move-object v3, v2
-
-    check-cast v3, Lkotlinx/coroutines/ai;
-
-    invoke-interface {v3}, Lkotlinx/coroutines/ai;->isActive()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_e
-
-    instance-of v2, v3, Lkotlinx/coroutines/ar$b;
-
-    if-nez v2, :cond_9
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_9
-    const/4 v2, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_d
-
-    invoke-interface {v3}, Lkotlinx/coroutines/ai;->isActive()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_c
-
-    invoke-direct {p0, v3}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ai;)Lkotlinx/coroutines/av;
-
-    move-result-object v2
-
-    if-nez v2, :cond_a
-
-    goto :goto_2
-
-    :cond_a
-    new-instance v6, Lkotlinx/coroutines/ar$b;
-
-    invoke-direct {v6, v2, v1}, Lkotlinx/coroutines/ar$b;-><init>(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-
-    sget-object v7, Lkotlinx/coroutines/ar;->bSu: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
-
-    move-result v3
-
-    if-nez v3, :cond_b
-
-    goto :goto_2
-
-    :cond_b
-    invoke-direct {p0, v2, v1}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-
-    const/4 v5, 0x1
-
-    :goto_2
-    if-eqz v5, :cond_0
-
-    return v4
-
-    :cond_c
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Check failed."
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_d
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Check failed."
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_e
-    new-instance v3, Lkotlinx/coroutines/f;
-
-    invoke-direct {v3, v1}, Lkotlinx/coroutines/f;-><init>(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v2, v3, v5}, Lkotlinx/coroutines/ar;->d(Ljava/lang/Object;Ljava/lang/Object;I)I
-
-    move-result v3
-
-    packed-switch v3, :pswitch_data_0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "unexpected result"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :pswitch_1
-    return v4
-
-    :pswitch_2
-    invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "Cannot happen in "
-
-    invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    throw v0
-
-    :cond_f
-    return v5
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_2
-        :pswitch_1
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method private static bQ(Ljava/lang/Object;)Ljava/lang/String;
-    .locals 1
-
-    instance-of v0, p0, Lkotlinx/coroutines/ar$b;
-
-    if-eqz v0, :cond_2
-
-    check-cast p0, Lkotlinx/coroutines/ar$b;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar$b;->Gc()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const-string p0, "Cancelling"
-
-    return-object p0
-
-    :cond_0
-    iget-boolean p0, p0, Lkotlinx/coroutines/ar$b;->bSB:Z
-
-    if-eqz p0, :cond_1
-
-    const-string p0, "Completing"
-
-    return-object p0
-
-    :cond_1
-    const-string p0, "Active"
-
-    return-object p0
-
-    :cond_2
-    instance-of v0, p0, Lkotlinx/coroutines/ai;
-
-    if-eqz v0, :cond_4
-
-    check-cast p0, Lkotlinx/coroutines/ai;
-
-    invoke-interface {p0}, Lkotlinx/coroutines/ai;->isActive()Z
-
-    move-result p0
-
-    if-eqz p0, :cond_3
-
-    const-string p0, "Active"
-
-    return-object p0
-
-    :cond_3
-    const-string p0, "New"
-
-    return-object p0
-
-    :cond_4
-    instance-of p0, p0, Lkotlinx/coroutines/f;
-
-    if-eqz p0, :cond_5
-
-    const-string p0, "Cancelled"
-
-    return-object p0
-
-    :cond_5
-    const-string p0, "Completed"
-
-    return-object p0
-.end method
-
-.method private isCompleted()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lkotlinx/coroutines/ai;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method private final t(Ljava/lang/Throwable;)Z
-    .locals 3
-
-    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FW()Z
-
-    move-result v0
-
-    const/4 v2, 0x0
-
-    if-nez v0, :cond_1
-
-    return v2
-
-    :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/b;
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {v0, p1}, Lkotlinx/coroutines/b;->q(Ljava/lang/Throwable;)Z
-
-    move-result p1
-
-    if-ne p1, v1, :cond_2
-
-    return v1
-
-    :cond_2
-    return v2
-.end method
-
-
-# virtual methods
-.method public FA()Ljava/lang/String;
-    .locals 1
-
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bJ(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
+    sget-object v0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/a/o;
 
     return-object v0
 .end method
 
-.method public final FV()Ljava/util/concurrent/CancellationException;
-    .locals 4
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lkotlinx/coroutines/ar$b;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Lkotlinx/coroutines/ar$b;
-
-    iget-object v0, v0, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
-
-    if-eqz v0, :cond_0
-
-    const-string v1, "Job is cancelling"
-
-    invoke-direct {p0, v0, v1}, Lkotlinx/coroutines/ar;->b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "Job is still new or active: "
-
-    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    throw v1
-
-    :cond_1
-    instance-of v1, v0, Lkotlinx/coroutines/ai;
-
-    if-nez v1, :cond_3
-
-    instance-of v1, v0, Lkotlinx/coroutines/f;
-
-    if-eqz v1, :cond_2
-
-    check-cast v0, Lkotlinx/coroutines/f;
-
-    iget-object v0, v0, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
-
-    const-string v1, "Job was cancelled"
-
-    invoke-direct {p0, v0, v1}, Lkotlinx/coroutines/ar;->b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_2
-    new-instance v0, Lkotlinx/coroutines/am;
-
-    const-string v1, "Job has completed normally"
-
-    const/4 v2, 0x0
-
-    move-object v3, p0
-
-    check-cast v3, Lkotlinx/coroutines/al;
-
-    invoke-direct {v0, v1, v2, v3}, Lkotlinx/coroutines/am;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/al;)V
-
-    check-cast v0, Ljava/util/concurrent/CancellationException;
-
-    :goto_0
-    return-object v0
-
-    :cond_3
-    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "Job is still new or active: "
-
-    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    throw v1
-.end method
-
-.method protected FW()Z
+.method public static final synthetic Ge()Lkotlinx/coroutines/ab;
     .locals 1
 
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public FX()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method protected FY()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public final FZ()Ljava/lang/Object;
-    .locals 2
-
-    :goto_0
-    iget-object v0, p0, Lkotlinx/coroutines/ar;->bRX:Ljava/lang/Object;
-
-    instance-of v1, v0, Lkotlinx/coroutines/a/m;
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    check-cast v0, Lkotlinx/coroutines/a/m;
-
-    invoke-virtual {v0, p0}, Lkotlinx/coroutines/a/m;->bS(Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-.end method
-
-.method public Fz()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final Gb()Ljava/lang/Throwable;
-    .locals 5
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lkotlinx/coroutines/ar$b;
-
-    if-eqz v1, :cond_0
-
-    move-object v1, v0
-
-    check-cast v1, Lkotlinx/coroutines/ar$b;
-
-    iget-object v1, v1, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v1, v0, Lkotlinx/coroutines/ai;
-
-    if-nez v1, :cond_4
-
-    instance-of v1, v0, Lkotlinx/coroutines/f;
-
-    if-eqz v1, :cond_1
-
-    move-object v1, v0
-
-    check-cast v1, Lkotlinx/coroutines/f;
-
-    iget-object v1, v1, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_3
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FY()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    instance-of v2, v1, Ljava/util/concurrent/CancellationException;
-
-    if-nez v2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    return-object v1
-
-    :cond_3
-    :goto_1
-    new-instance v2, Lkotlinx/coroutines/am;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    const-string v4, "Parent job is "
-
-    invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-static {v0}, Lkotlinx/coroutines/ar;->bQ(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    move-object v3, p0
-
-    check-cast v3, Lkotlinx/coroutines/al;
-
-    invoke-direct {v2, v0, v1, v3}, Lkotlinx/coroutines/am;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/al;)V
-
-    check-cast v2, Ljava/lang/Throwable;
-
-    return-object v2
-
-    :cond_4
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "Cannot be cancelling child in this state: "
-
-    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    throw v1
-.end method
-
-.method public final a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/ab;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)",
-            "Lkotlinx/coroutines/ab;"
-        }
-    .end annotation
-
-    const-string v0, "handler"
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    move-object v1, v0
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v2
-
-    instance-of v3, v2, Lkotlinx/coroutines/ac;
-
-    if-eqz v3, :cond_4
-
-    move-object v3, v2
-
-    check-cast v3, Lkotlinx/coroutines/ac;
-
-    iget-boolean v4, v3, Lkotlinx/coroutines/ac;->bSh:Z
-
-    if-eqz v4, :cond_2
-
-    if-nez v1, :cond_1
-
-    invoke-direct {p0, p3, p1}, Lkotlinx/coroutines/ar;->a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/aq;
-
-    move-result-object v1
-
-    :cond_1
-    sget-object v3, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    check-cast v1, Lkotlinx/coroutines/ab;
-
-    return-object v1
-
-    :cond_2
-    new-instance v2, Lkotlinx/coroutines/av;
-
-    invoke-direct {v2}, Lkotlinx/coroutines/av;-><init>()V
-
-    iget-boolean v4, v3, Lkotlinx/coroutines/ac;->bSh:Z
-
-    if-eqz v4, :cond_3
-
-    check-cast v2, Lkotlinx/coroutines/ai;
-
-    goto :goto_1
-
-    :cond_3
-    new-instance v4, Lkotlinx/coroutines/ah;
-
-    invoke-direct {v4, v2}, Lkotlinx/coroutines/ah;-><init>(Lkotlinx/coroutines/av;)V
-
-    move-object v2, v4
-
-    check-cast v2, Lkotlinx/coroutines/ai;
-
-    :goto_1
-    sget-object v4, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v4, p0, v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_4
-    instance-of v3, v2, Lkotlinx/coroutines/ai;
-
-    if-eqz v3, :cond_10
-
-    move-object v3, v2
-
-    check-cast v3, Lkotlinx/coroutines/ai;
-
-    invoke-interface {v3}, Lkotlinx/coroutines/ai;->FQ()Lkotlinx/coroutines/av;
-
-    move-result-object v3
-
-    if-nez v3, :cond_6
-
-    if-eqz v2, :cond_5
-
-    check-cast v2, Lkotlinx/coroutines/aq;
-
-    invoke-direct {p0, v2}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/aq;)V
-
-    goto :goto_0
-
-    :cond_5
-    new-instance p1, Lkotlin/r;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.JobNode<*>"
-
-    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    sget-object v4, Lkotlinx/coroutines/aw;->bSK:Lkotlinx/coroutines/aw;
-
-    check-cast v4, Lkotlinx/coroutines/ab;
-
-    if-eqz p1, :cond_c
-
-    instance-of v5, v2, Lkotlinx/coroutines/ar$b;
-
-    if-eqz v5, :cond_c
-
-    monitor-enter v2
-
-    :try_start_0
-    move-object v5, v2
-
-    check-cast v5, Lkotlinx/coroutines/ar$b;
-
-    iget-object v5, v5, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
-
-    if-eqz v5, :cond_7
-
-    instance-of v6, p3, Lkotlinx/coroutines/c;
-
-    if-eqz v6, :cond_b
-
-    move-object v6, v2
-
-    check-cast v6, Lkotlinx/coroutines/ar$b;
-
-    iget-boolean v6, v6, Lkotlinx/coroutines/ar$b;->bSB:Z
-
-    if-nez v6, :cond_b
-
-    :cond_7
-    if-nez v1, :cond_8
-
-    invoke-direct {p0, p3, p1}, Lkotlinx/coroutines/ar;->a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/aq;
-
-    move-result-object v1
-
-    :cond_8
-    invoke-direct {p0, v2, v3, v1}, Lkotlinx/coroutines/ar;->a(Ljava/lang/Object;Lkotlinx/coroutines/av;Lkotlinx/coroutines/aq;)Z
-
-    move-result v4
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v4, :cond_9
-
-    monitor-exit v2
-
-    goto/16 :goto_0
-
-    :cond_9
-    if-nez v5, :cond_a
-
-    :try_start_1
-    check-cast v1, Lkotlinx/coroutines/ab;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit v2
-
-    return-object v1
-
-    :cond_a
-    :try_start_2
-    move-object v4, v1
-
-    check-cast v4, Lkotlinx/coroutines/ab;
-
-    :cond_b
-    sget-object v6, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    monitor-exit v2
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v2
-
-    throw p1
-
-    :cond_c
-    move-object v5, v0
-
-    :goto_2
-    if-eqz v5, :cond_e
-
-    if-eqz p2, :cond_d
-
-    invoke-interface {p3, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_d
-    return-object v4
-
-    :cond_e
-    if-nez v1, :cond_f
-
-    invoke-direct {p0, p3, p1}, Lkotlinx/coroutines/ar;->a(Lkotlin/jvm/functions/Function1;Z)Lkotlinx/coroutines/aq;
-
-    move-result-object v1
-
-    :cond_f
-    invoke-direct {p0, v2, v3, v1}, Lkotlinx/coroutines/ar;->a(Ljava/lang/Object;Lkotlinx/coroutines/av;Lkotlinx/coroutines/aq;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    check-cast v1, Lkotlinx/coroutines/ab;
-
-    return-object v1
-
-    :cond_10
-    if-eqz p2, :cond_13
-
-    instance-of p1, v2, Lkotlinx/coroutines/f;
-
-    if-nez p1, :cond_11
-
-    move-object v2, v0
-
-    :cond_11
-    check-cast v2, Lkotlinx/coroutines/f;
-
-    if-eqz v2, :cond_12
-
-    iget-object v0, v2, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
-
-    :cond_12
-    invoke-interface {p3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_13
-    sget-object p1, Lkotlinx/coroutines/aw;->bSK:Lkotlinx/coroutines/aw;
-
-    check-cast p1, Lkotlinx/coroutines/ab;
-
-    return-object p1
-.end method
-
-.method public final a(Lkotlinx/coroutines/d;)Lkotlinx/coroutines/b;
-    .locals 3
-
-    const-string v0, "child"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lkotlinx/coroutines/c;
-
-    invoke-direct {v0, p0, p1}, Lkotlinx/coroutines/c;-><init>(Lkotlinx/coroutines/ar;Lkotlinx/coroutines/d;)V
-
-    check-cast v0, Lkotlinx/coroutines/h;
-
-    check-cast v0, Lkotlin/jvm/functions/Function1;
-
-    const/4 p1, 0x1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p0, p1, v1, v0, v2}, Lkotlinx/coroutines/al$a;->a(Lkotlinx/coroutines/al;ZZLkotlin/jvm/functions/Function1;I)Lkotlinx/coroutines/ab;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p1, Lkotlinx/coroutines/b;
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Lkotlin/r;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ChildHandle"
-
-    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final a(Lkotlinx/coroutines/ax;)V
-    .locals 1
-
-    const-string v0, "parentJob"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bM(Ljava/lang/Object;)Z
-
-    return-void
-.end method
-
-.method public final b(Lkotlinx/coroutines/al;)V
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/b;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_3
-
-    if-nez p1, :cond_1
-
-    sget-object p1, Lkotlinx/coroutines/aw;->bSK:Lkotlinx/coroutines/aw;
-
-    check-cast p1, Lkotlinx/coroutines/b;
-
-    iput-object p1, p0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/b;
-
-    return-void
-
-    :cond_1
-    invoke-interface {p1}, Lkotlinx/coroutines/al;->start()Z
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlinx/coroutines/d;
-
-    invoke-interface {p1, v0}, Lkotlinx/coroutines/al;->a(Lkotlinx/coroutines/d;)Lkotlinx/coroutines/b;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/b;
-
-    invoke-direct {p0}, Lkotlinx/coroutines/ar;->isCompleted()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {p1}, Lkotlinx/coroutines/b;->dispose()V
-
-    sget-object p1, Lkotlinx/coroutines/aw;->bSK:Lkotlinx/coroutines/aw;
-
-    check-cast p1, Lkotlinx/coroutines/b;
-
-    iput-object p1, p0, Lkotlinx/coroutines/ar;->bSv:Lkotlinx/coroutines/b;
-
-    :cond_2
-    return-void
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Check failed."
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-.end method
-
-.method public bG(Ljava/lang/Object;)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final cancel()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0}, Lkotlinx/coroutines/ar;->r(Ljava/lang/Throwable;)Z
-
-    return-void
-.end method
-
-.method final d(Ljava/lang/Object;Ljava/lang/Object;I)I
-    .locals 7
-
-    instance-of p3, p1, Lkotlinx/coroutines/ai;
-
-    const/4 v0, 0x0
-
-    if-nez p3, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of p3, p1, Lkotlinx/coroutines/ac;
-
-    const/4 v1, 0x3
-
-    const/4 v2, 0x1
-
-    if-nez p3, :cond_1
-
-    instance-of p3, p1, Lkotlinx/coroutines/aq;
-
-    if-eqz p3, :cond_3
-
-    :cond_1
-    instance-of p3, p1, Lkotlinx/coroutines/c;
-
-    if-nez p3, :cond_3
-
-    instance-of p3, p2, Lkotlinx/coroutines/f;
-
-    if-nez p3, :cond_3
-
-    check-cast p1, Lkotlinx/coroutines/ai;
-
-    invoke-direct {p0, p1, p2, v0}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ai;Ljava/lang/Object;I)Z
-
-    move-result p1
-
-    if-nez p1, :cond_2
-
-    return v1
-
-    :cond_2
-    return v2
-
-    :cond_3
-    move-object p3, p1
-
-    check-cast p3, Lkotlinx/coroutines/ai;
-
-    invoke-direct {p0, p3}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ai;)Lkotlinx/coroutines/av;
-
-    move-result-object v3
-
-    if-nez v3, :cond_4
-
-    return v1
-
-    :cond_4
-    instance-of v4, p1, Lkotlinx/coroutines/ar$b;
-
-    const/4 v5, 0x0
-
-    if-nez v4, :cond_5
-
-    move-object v4, v5
-
-    goto :goto_0
-
-    :cond_5
-    move-object v4, p1
-
-    :goto_0
-    check-cast v4, Lkotlinx/coroutines/ar$b;
-
-    if-nez v4, :cond_6
-
-    new-instance v4, Lkotlinx/coroutines/ar$b;
-
-    invoke-direct {v4, v3, v5}, Lkotlinx/coroutines/ar$b;-><init>(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-
-    :cond_6
-    monitor-enter v4
-
-    :try_start_0
-    iget-boolean v6, v4, Lkotlinx/coroutines/ar$b;->bSB:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v6, :cond_7
-
-    monitor-exit v4
-
-    return v0
-
-    :cond_7
-    :try_start_1
-    iput-boolean v2, v4, Lkotlinx/coroutines/ar$b;->bSB:Z
-
-    if-eq v4, p1, :cond_8
-
-    sget-object v6, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v6, p0, p1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-nez p1, :cond_8
-
-    monitor-exit v4
-
-    return v1
-
-    :cond_8
-    :try_start_2
-    invoke-virtual {v4}, Lkotlinx/coroutines/ar$b;->isSealed()Z
-
-    move-result p1
-
-    xor-int/2addr p1, v2
-
-    if-eqz p1, :cond_11
-
-    invoke-virtual {v4}, Lkotlinx/coroutines/ar$b;->Gc()Z
-
-    move-result p1
-
-    instance-of v1, p2, Lkotlinx/coroutines/f;
-
-    if-nez v1, :cond_9
-
-    move-object v1, v5
-
-    goto :goto_1
-
-    :cond_9
-    move-object v1, p2
-
-    :goto_1
-    check-cast v1, Lkotlinx/coroutines/f;
-
-    if-eqz v1, :cond_a
-
-    iget-object v1, v1, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
-
-    invoke-virtual {v4, v1}, Lkotlinx/coroutines/ar$b;->u(Ljava/lang/Throwable;)V
-
-    :cond_a
-    iget-object v1, v4, Lkotlinx/coroutines/ar$b;->bSC:Ljava/lang/Throwable;
-
-    xor-int/2addr p1, v2
-
-    if-eqz p1, :cond_b
-
-    goto :goto_2
-
-    :cond_b
-    move-object v1, v5
-
-    :goto_2
-    sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    monitor-exit v4
-
-    if-eqz v1, :cond_c
-
-    invoke-direct {p0, v3, v1}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/av;Ljava/lang/Throwable;)V
-
-    :cond_c
-    instance-of p1, p3, Lkotlinx/coroutines/c;
-
-    if-nez p1, :cond_d
-
-    move-object p1, v5
-
-    goto :goto_3
-
-    :cond_d
-    move-object p1, p3
-
-    :goto_3
-    check-cast p1, Lkotlinx/coroutines/c;
-
-    if-nez p1, :cond_e
-
-    invoke-interface {p3}, Lkotlinx/coroutines/ai;->FQ()Lkotlinx/coroutines/av;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_f
-
-    check-cast p1, Lkotlinx/coroutines/a/i;
-
-    invoke-static {p1}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/a/i;)Lkotlinx/coroutines/c;
-
-    move-result-object v5
-
-    goto :goto_4
-
-    :cond_e
-    move-object v5, p1
-
-    :cond_f
-    :goto_4
-    if-eqz v5, :cond_10
-
-    invoke-direct {p0, v4, v5, p2}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ar$b;Lkotlinx/coroutines/c;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_10
-
-    const/4 p1, 0x2
-
-    return p1
-
-    :cond_10
-    invoke-direct {p0, v4, p2, v0}, Lkotlinx/coroutines/ar;->a(Lkotlinx/coroutines/ar$b;Ljava/lang/Object;I)Z
-
-    return v2
-
-    :cond_11
-    :try_start_3
-    const-string p1, "Failed requirement."
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p2, Ljava/lang/Throwable;
-
-    throw p2
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v4
-
-    throw p1
-.end method
-
-.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(TR;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TR;-",
-            "Lkotlin/c/e$b;",
-            "+TR;>;)TR;"
-        }
-    .end annotation
-
-    const-string v0, "operation"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "operation"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1, p2}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/c/e$b;",
-            ">(",
-            "Lkotlin/c/e$c<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e$b;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final getKey()Lkotlin/c/e$c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/c/e$c<",
-            "*>;"
-        }
-    .end annotation
-
-    sget-object v0, Lkotlinx/coroutines/al;->bSs:Lkotlinx/coroutines/al$b;
-
-    check-cast v0, Lkotlin/c/e$c;
+    sget-object v0, Lkotlinx/coroutines/ar;->bSx:Lkotlinx/coroutines/ab;
 
     return-object v0
 .end method
 
-.method public isActive()Z
-    .locals 2
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lkotlinx/coroutines/ai;
-
-    if-eqz v1, :cond_0
-
-    check-cast v0, Lkotlinx/coroutines/ai;
-
-    invoke-interface {v0}, Lkotlinx/coroutines/ai;->isActive()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public minusKey(Lkotlin/c/e$c;)Lkotlin/c/e;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/c/e$c<",
-            "*>;)",
-            "Lkotlin/c/e;"
-        }
-    .end annotation
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->b(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public p(Ljava/lang/Throwable;)V
+.method public static final synthetic Gf()Lkotlinx/coroutines/ab;
     .locals 1
 
-    const-string v0, "exception"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public plus(Lkotlin/c/e;)Lkotlin/c/e;
-    .locals 1
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e;)Lkotlin/c/e;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final q(Ljava/lang/Throwable;)Z
-    .locals 1
-
-    const-string v0, "cause"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bM(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FY()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public final r(Ljava/lang/Throwable;)Z
-    .locals 0
-
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/ar;->bM(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FY()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method protected s(Ljava/lang/Throwable;)V
-    .locals 1
-
-    const-string v0, "exception"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public final start()Z
-    .locals 6
-
-    :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lkotlinx/coroutines/ac;
-
-    const/4 v2, -0x1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-eqz v1, :cond_1
-
-    move-object v1, v0
-
-    check-cast v1, Lkotlinx/coroutines/ac;
-
-    iget-boolean v1, v1, Lkotlinx/coroutines/ac;->bSh:Z
-
-    if-nez v1, :cond_2
-
-    sget-object v1, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-static {}, Lkotlinx/coroutines/as;->Gf()Lkotlinx/coroutines/ac;
-
-    move-result-object v5
-
-    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Fz()V
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    instance-of v1, v0, Lkotlinx/coroutines/ah;
-
-    if-eqz v1, :cond_2
-
-    sget-object v1, Lkotlinx/coroutines/ar;->bSu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-object v5, v0
-
-    check-cast v5, Lkotlinx/coroutines/ah;
-
-    iget-object v5, v5, Lkotlinx/coroutines/ah;->bSo:Lkotlinx/coroutines/av;
-
-    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v2, 0x0
-
-    :goto_1
-    packed-switch v2, :pswitch_data_0
-
-    goto :goto_0
-
-    :pswitch_0
-    return v4
-
-    :pswitch_1
-    return v3
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FA()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x7b
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->FZ()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-static {v1}, Lkotlinx/coroutines/ar;->bQ(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "}@"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bI(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
+    sget-object v0, Lkotlinx/coroutines/ar;->bSw:Lkotlinx/coroutines/ab;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/as.smali b/com.discord/smali_classes2/kotlinx/coroutines/as.smali
index 8312877647..ed80bf18d4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/as.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/as.smali
@@ -1,66 +1,74 @@
 .class public final Lkotlinx/coroutines/as;
-.super Ljava/lang/Object;
+.super Lkotlinx/coroutines/ax;
+.source "Builders.common.kt"
 
 
-# static fields
-.field private static final bSG:Lkotlinx/coroutines/a/o;
-
-.field private static final bSH:Lkotlinx/coroutines/ac;
-
-.field private static final bSI:Lkotlinx/coroutines/ac;
+# instance fields
+.field private final bSy:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "Lkotlinx/coroutines/p;",
+            "Lkotlin/c/c<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 2
+.method public constructor <init>(Lkotlin/c/e;Lkotlin/jvm/functions/Function2;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/c/e;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Lkotlinx/coroutines/p;",
+            "-",
+            "Lkotlin/c/c<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;+",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
 
-    new-instance v0, Lkotlinx/coroutines/a/o;
+    const-string v0, "parentContext"
 
-    const-string v1, "SEALED"
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
+    const-string v0, "block"
 
-    sput-object v0, Lkotlinx/coroutines/as;->bSG:Lkotlinx/coroutines/a/o;
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lkotlinx/coroutines/ac;
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    invoke-direct {p0, p1, v0}, Lkotlinx/coroutines/ax;-><init>(Lkotlin/c/e;Z)V
 
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/ac;-><init>(Z)V
-
-    sput-object v0, Lkotlinx/coroutines/as;->bSH:Lkotlinx/coroutines/ac;
-
-    new-instance v0, Lkotlinx/coroutines/ac;
-
-    const/4 v1, 0x1
-
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/ac;-><init>(Z)V
-
-    sput-object v0, Lkotlinx/coroutines/as;->bSI:Lkotlinx/coroutines/ac;
+    iput-object p2, p0, Lkotlinx/coroutines/as;->bSy:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
 
-.method public static final synthetic Ge()Lkotlinx/coroutines/a/o;
-    .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/as;->bSG:Lkotlinx/coroutines/a/o;
+# virtual methods
+.method protected final onStart()V
+    .locals 2
 
-    return-object v0
-.end method
-
-.method public static final synthetic Gf()Lkotlinx/coroutines/ac;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/as;->bSI:Lkotlinx/coroutines/ac;
-
-    return-object v0
-.end method
-
-.method public static final synthetic Gg()Lkotlinx/coroutines/ac;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/as;->bSH:Lkotlinx/coroutines/ac;
-
-    return-object v0
+    iget-object v0, p0, Lkotlinx/coroutines/as;->bSy:Lkotlin/jvm/functions/Function2;
+
+    move-object v1, p0
+
+    check-cast v1, Lkotlin/c/c;
+
+    invoke-static {v0, p0, v1}, Lkotlinx/coroutines/b/a;->b(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/c/c;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/at.smali b/com.discord/smali_classes2/kotlinx/coroutines/at.smali
index ba7118d1d6..f90828edb5 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/at.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/at.smali
@@ -1,73 +1,13 @@
-.class public final Lkotlinx/coroutines/at;
-.super Lkotlinx/coroutines/ay;
-
-
-# instance fields
-.field private final bSJ:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "Lkotlinx/coroutines/q;",
-            "Lkotlin/c/c<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
+.class public abstract Lkotlinx/coroutines/at;
+.super Lkotlinx/coroutines/k;
+.source "MainCoroutineDispatcher.kt"
 
 
 # direct methods
-.method public constructor <init>(Lkotlin/c/e;Lkotlin/jvm/functions/Function2;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/c/e;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Lkotlinx/coroutines/q;",
-            "-",
-            "Lkotlin/c/c<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;+",
-            "Ljava/lang/Object;",
-            ">;)V"
-        }
-    .end annotation
+.method public constructor <init>()V
+    .locals 0
 
-    const-string v0, "parentContext"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "block"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lkotlinx/coroutines/ay;-><init>(Lkotlin/c/e;Z)V
-
-    iput-object p2, p0, Lkotlinx/coroutines/at;->bSJ:Lkotlin/jvm/functions/Function2;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method protected final onStart()V
-    .locals 2
-
-    iget-object v0, p0, Lkotlinx/coroutines/at;->bSJ:Lkotlin/jvm/functions/Function2;
-
-    move-object v1, p0
-
-    check-cast v1, Lkotlin/c/c;
-
-    invoke-static {v0, p0, v1}, Lkotlinx/coroutines/b/a;->b(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/c/c;)V
+    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/au.smali b/com.discord/smali_classes2/kotlinx/coroutines/au.smali
index 4709a8f628..2aece1e70c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/au.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/au.smali
@@ -1,12 +1,146 @@
-.class public abstract Lkotlinx/coroutines/au;
-.super Lkotlinx/coroutines/k;
+.class public final Lkotlinx/coroutines/au;
+.super Lkotlinx/coroutines/a/g;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/ah;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
+    invoke-direct {p0}, Lkotlinx/coroutines/a/g;-><init>()V
 
     return-void
 .end method
+
+
+# virtual methods
+.method public final FP()Lkotlinx/coroutines/au;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public final getString(Ljava/lang/String;)Ljava/lang/String;
+    .locals 5
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "List{"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "}["
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/g;->Go()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_3
+
+    check-cast p1, Lkotlinx/coroutines/a/i;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x1
+
+    :goto_0
+    move-object v3, p0
+
+    check-cast v3, Lkotlinx/coroutines/a/g;
+
+    invoke-static {p1, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    xor-int/2addr v3, v1
+
+    if-eqz v3, :cond_2
+
+    instance-of v3, p1, Lkotlinx/coroutines/ap;
+
+    if-eqz v3, :cond_1
+
+    move-object v3, p1
+
+    check-cast v3, Lkotlinx/coroutines/ap;
+
+    if-eqz v2, :cond_0
+
+    const/4 v2, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    const-string v4, ", "
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :goto_1
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    :cond_1
+    invoke-virtual {p1}, Lkotlinx/coroutines/a/i;->Gp()Lkotlinx/coroutines/a/i;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_2
+    const-string p1, "]"
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    :cond_3
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    return-void
+.end method
+
+.method public final isActive()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "Active"
+
+    invoke-virtual {p0, v0}, Lkotlinx/coroutines/au;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/av.smali b/com.discord/smali_classes2/kotlinx/coroutines/av.smali
index 920c04399b..9ddf24c549 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/av.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/av.smali
@@ -1,143 +1,61 @@
 .class public final Lkotlinx/coroutines/av;
-.super Lkotlinx/coroutines/a/g;
+.super Ljava/lang/Object;
+.source "Job.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/ai;
+.implements Lkotlinx/coroutines/aa;
+.implements Lkotlinx/coroutines/b;
+
+
+# static fields
+.field public static final bSz:Lkotlinx/coroutines/av;
 
 
 # direct methods
-.method public constructor <init>()V
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lkotlinx/coroutines/av;
+
+    invoke-direct {v0}, Lkotlinx/coroutines/av;-><init>()V
+
+    sput-object v0, Lkotlinx/coroutines/av;->bSz:Lkotlinx/coroutines/av;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/a/g;-><init>()V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FQ()Lkotlinx/coroutines/av;
+.method public final dispose()V
     .locals 0
 
-    return-object p0
+    return-void
 .end method
 
-.method public final getString(Ljava/lang/String;)Ljava/lang/String;
-    .locals 5
+.method public final q(Ljava/lang/Throwable;)Z
+    .locals 1
 
-    const-string v0, "state"
+    const-string v0, "cause"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    const/4 p1, 0x0
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "List{"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, "}["
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/g;->Gp()Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_3
-
-    check-cast p1, Lkotlinx/coroutines/a/i;
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x1
-
-    :goto_0
-    move-object v3, p0
-
-    check-cast v3, Lkotlinx/coroutines/a/g;
-
-    invoke-static {p1, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    xor-int/2addr v3, v1
-
-    if-eqz v3, :cond_2
-
-    instance-of v3, p1, Lkotlinx/coroutines/aq;
-
-    if-eqz v3, :cond_1
-
-    move-object v3, p1
-
-    check-cast v3, Lkotlinx/coroutines/aq;
-
-    if-eqz v2, :cond_0
-
-    const/4 v2, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    const-string v4, ", "
-
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :goto_1
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    :cond_1
-    invoke-virtual {p1}, Lkotlinx/coroutines/a/i;->Gq()Lkotlinx/coroutines/a/i;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_2
-    const-string p1, "]"
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-
-    :cond_3
-    new-instance p1, Lkotlin/r;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final isActive()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
+    return p1
 .end method
 
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "Active"
-
-    invoke-virtual {p0, v0}, Lkotlinx/coroutines/av;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
+    const-string v0, "NonDisposableHandle"
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aw.smali b/com.discord/smali_classes2/kotlinx/coroutines/aw.smali
index 1229449e16..4ba26b4436 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aw.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aw.smali
@@ -1,60 +1,11 @@
-.class public final Lkotlinx/coroutines/aw;
+.class public interface abstract Lkotlinx/coroutines/aw;
 .super Ljava/lang/Object;
+.source "Job.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/ab;
-.implements Lkotlinx/coroutines/b;
-
-
-# static fields
-.field public static final bSK:Lkotlinx/coroutines/aw;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lkotlinx/coroutines/aw;
-
-    invoke-direct {v0}, Lkotlinx/coroutines/aw;-><init>()V
-
-    sput-object v0, Lkotlinx/coroutines/aw;->bSK:Lkotlinx/coroutines/aw;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
+.implements Lkotlinx/coroutines/ak;
 
 
 # virtual methods
-.method public final dispose()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final q(Ljava/lang/Throwable;)Z
-    .locals 1
-
-    const-string v0, "cause"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "NonDisposableHandle"
-
-    return-object v0
+.method public abstract Ga()Ljava/lang/Throwable;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ax.smali b/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
index fe176fd059..537cb4bd21 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
@@ -1,10 +1,51 @@
-.class public interface abstract Lkotlinx/coroutines/ax;
-.super Ljava/lang/Object;
+.class public Lkotlinx/coroutines/ax;
+.super Lkotlinx/coroutines/a;
+.source "Builders.common.kt"
 
-# interfaces
-.implements Lkotlinx/coroutines/al;
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlinx/coroutines/a<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/c/e;Z)V
+    .locals 1
+
+    const-string v0, "parentContext"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Lkotlinx/coroutines/a;-><init>(Lkotlin/c/e;Z)V
+
+    return-void
+.end method
 
 
 # virtual methods
-.method public abstract Gb()Ljava/lang/Throwable;
+.method protected final FV()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method protected final s(Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lkotlinx/coroutines/ax;->bRy:Lkotlin/c/e;
+
+    invoke-static {v0, p1}, Lkotlinx/coroutines/m;->b(Lkotlin/c/e;Ljava/lang/Throwable;)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 f3b5ba16c3..bf9c184786 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
@@ -1,50 +1,40 @@
-.class public Lkotlinx/coroutines/ay;
-.super Lkotlinx/coroutines/a;
+.class public interface abstract Lkotlinx/coroutines/ay;
+.super Ljava/lang/Object;
+.source "ThreadContextElement.kt"
+
+# interfaces
+.implements Lkotlin/c/e$b;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlinx/coroutines/a<",
-        "Lkotlin/Unit;",
-        ">;"
+        "<S:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/c/e$b;"
     }
 .end annotation
 
 
-# direct methods
-.method public constructor <init>(Lkotlin/c/e;Z)V
-    .locals 1
-
-    const-string v0, "parentContext"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1, p2}, Lkotlinx/coroutines/a;-><init>(Lkotlin/c/e;Z)V
-
-    return-void
-.end method
-
-
 # virtual methods
-.method protected final FW()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
+.method public abstract a(Lkotlin/c/e;Ljava/lang/Object;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/c/e;",
+            "TS;)V"
+        }
+    .end annotation
 .end method
 
-.method protected final s(Ljava/lang/Throwable;)V
-    .locals 1
-
-    const-string v0, "exception"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lkotlinx/coroutines/ay;->bRy:Lkotlin/c/e;
-
-    invoke-static {v0, p1}, Lkotlinx/coroutines/n;->b(Lkotlin/c/e;Ljava/lang/Throwable;)V
-
-    return-void
+.method public abstract c(Lkotlin/c/e;)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/c/e;",
+            ")TS;"
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/az.smali b/com.discord/smali_classes2/kotlinx/coroutines/az.smali
index b6ab57bd8b..60a1fefd57 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/az.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/az.smali
@@ -1,39 +1,17 @@
 .class public interface abstract Lkotlinx/coroutines/az;
 .super Ljava/lang/Object;
-
-# interfaces
-.implements Lkotlin/c/e$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<S:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/c/e$b;"
-    }
-.end annotation
+.source "TimeSource.kt"
 
 
 # virtual methods
-.method public abstract a(Lkotlin/c/e;Ljava/lang/Object;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/c/e;",
-            "TS;)V"
-        }
-    .end annotation
+.method public abstract m(Ljava/lang/Runnable;)Ljava/lang/Runnable;
 .end method
 
-.method public abstract c(Lkotlin/c/e;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/c/e;",
-            ")TS;"
-        }
-    .end annotation
+.method public abstract nanoTime()J
+.end method
+
+.method public abstract parkNanos(Ljava/lang/Object;J)V
+.end method
+
+.method public abstract unpark(Ljava/lang/Thread;)V
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/b.smali
index 4a61dc9dc8..e61f52138a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b.smali
@@ -1,8 +1,9 @@
 .class public interface abstract Lkotlinx/coroutines/b;
 .super Ljava/lang/Object;
+.source "Job.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/ab;
+.implements Lkotlinx/coroutines/aa;
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali
index fa4259087c..b233bffd36 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/b/a;
 .super Ljava/lang/Object;
+.source "Cancellable.kt"
 
 
 # direct methods
@@ -41,7 +42,7 @@
 
     sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
 
-    invoke-static {p0, p1}, Lkotlinx/coroutines/y;->a(Lkotlin/c/c;Ljava/lang/Object;)V
+    invoke-static {p0, p1}, Lkotlinx/coroutines/x;->a(Lkotlin/c/c;Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ba.smali b/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
index 5f5f9897a7..de95043ae6 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
@@ -1,16 +1,29 @@
-.class public interface abstract Lkotlinx/coroutines/ba;
+.class public final Lkotlinx/coroutines/ba;
 .super Ljava/lang/Object;
+.source "TimeSource.kt"
 
 
-# virtual methods
-.method public abstract m(Ljava/lang/Runnable;)Ljava/lang/Runnable;
+# static fields
+.field private static bSA:Lkotlinx/coroutines/az;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/u;->bRT:Lkotlinx/coroutines/u;
+
+    check-cast v0, Lkotlinx/coroutines/az;
+
+    sput-object v0, Lkotlinx/coroutines/ba;->bSA:Lkotlinx/coroutines/az;
+
+    return-void
 .end method
 
-.method public abstract nanoTime()J
-.end method
+.method public static final Gg()Lkotlinx/coroutines/az;
+    .locals 1
 
-.method public abstract parkNanos(Ljava/lang/Object;J)V
-.end method
+    sget-object v0, Lkotlinx/coroutines/ba;->bSA:Lkotlinx/coroutines/az;
 
-.method public abstract unpark(Ljava/lang/Thread;)V
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bb.smali b/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
index 3630ecf852..63eb228e6b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
@@ -1,28 +1,71 @@
 .class public final Lkotlinx/coroutines/bb;
-.super Ljava/lang/Object;
+.super Lkotlinx/coroutines/k;
+.source "Unconfined.kt"
 
 
 # static fields
-.field private static bSL:Lkotlinx/coroutines/ba;
+.field public static final bSB:Lkotlinx/coroutines/bb;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/v;->bRW:Lkotlinx/coroutines/v;
+    new-instance v0, Lkotlinx/coroutines/bb;
 
-    check-cast v0, Lkotlinx/coroutines/ba;
+    invoke-direct {v0}, Lkotlinx/coroutines/bb;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bb;->bSL:Lkotlinx/coroutines/ba;
+    sput-object v0, Lkotlinx/coroutines/bb;->bSB:Lkotlinx/coroutines/bb;
 
     return-void
 .end method
 
-.method public static final Gh()Lkotlinx/coroutines/ba;
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lkotlin/c/e;Ljava/lang/Runnable;)V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bb;->bSL:Lkotlinx/coroutines/ba;
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+.end method
+
+.method public final b(Lkotlin/c/e;)Z
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "Unconfined"
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bd$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/bc$a.smali
similarity index 76%
rename from com.discord/smali_classes2/kotlinx/coroutines/bd$a.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/bc$a.smali
index 5de95d6e0b..fe595ae46c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bd$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bc$a.smali
@@ -1,10 +1,11 @@
-.class public final Lkotlinx/coroutines/bd$a;
+.class public final Lkotlinx/coroutines/bc$a;
 .super Ljava/lang/Object;
+.source "Dispatched.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/bd;
+    value = Lkotlinx/coroutines/bc;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field public final bSP:Lkotlinx/coroutines/a/b;
+.field public final bSE:Lkotlinx/coroutines/a/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/a/b<",
@@ -24,7 +25,7 @@
     .end annotation
 .end field
 
-.field public bSh:Z
+.field public bSd:Z
 
 
 # direct methods
@@ -37,7 +38,7 @@
 
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1, v0}, Lkotlinx/coroutines/bd$a;-><init>(ZLkotlinx/coroutines/a/b;)V
+    invoke-direct {p0, v1, v0}, Lkotlinx/coroutines/bc$a;-><init>(ZLkotlinx/coroutines/a/b;)V
 
     return-void
 .end method
@@ -61,9 +62,9 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lkotlinx/coroutines/bd$a;->bSh:Z
+    iput-boolean p1, p0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
-    iput-object p2, p0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
+    iput-object p2, p0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
 
     return-void
 .end method
@@ -77,17 +78,17 @@
 
     if-eq p0, p1, :cond_2
 
-    instance-of v1, p1, Lkotlinx/coroutines/bd$a;
+    instance-of v1, p1, Lkotlinx/coroutines/bc$a;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_1
 
-    check-cast p1, Lkotlinx/coroutines/bd$a;
+    check-cast p1, Lkotlinx/coroutines/bc$a;
 
-    iget-boolean v1, p0, Lkotlinx/coroutines/bd$a;->bSh:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
-    iget-boolean v3, p1, Lkotlinx/coroutines/bd$a;->bSh:Z
+    iget-boolean v3, p1, Lkotlinx/coroutines/bc$a;->bSd:Z
 
     if-ne v1, v3, :cond_0
 
@@ -101,9 +102,9 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
+    iget-object v1, p0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
 
-    iget-object p1, p1, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
+    iget-object p1, p1, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -124,7 +125,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-boolean v0, p0, Lkotlinx/coroutines/bd$a;->bSh:Z
+    iget-boolean v0, p0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
     if-eqz v0, :cond_0
 
@@ -133,7 +134,7 @@
     :cond_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
+    iget-object v1, p0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
 
     if-eqz v1, :cond_1
 
@@ -161,7 +162,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lkotlinx/coroutines/bd$a;->bSh:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -169,7 +170,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
+    iget-object v1, p0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bd$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/bc$b.smali
similarity index 64%
rename from com.discord/smali_classes2/kotlinx/coroutines/bd$b.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/bc$b.smali
index 05acef57ff..16659262ab 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bd$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bc$b.smali
@@ -1,5 +1,6 @@
-.class final Lkotlinx/coroutines/bd$b;
+.class final Lkotlinx/coroutines/bc$b;
 .super Lkotlin/jvm/internal/k;
+.source "Dispatched.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/bd;
+    value = Lkotlinx/coroutines/bc;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -19,25 +20,25 @@
     value = {
         "Lkotlin/jvm/internal/k;",
         "Lkotlin/jvm/functions/Function0<",
-        "Lkotlinx/coroutines/bd$a;",
+        "Lkotlinx/coroutines/bc$a;",
         ">;"
     }
 .end annotation
 
 
 # static fields
-.field public static final bSQ:Lkotlinx/coroutines/bd$b;
+.field public static final bSF:Lkotlinx/coroutines/bc$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lkotlinx/coroutines/bd$b;
+    new-instance v0, Lkotlinx/coroutines/bc$b;
 
-    invoke-direct {v0}, Lkotlinx/coroutines/bd$b;-><init>()V
+    invoke-direct {v0}, Lkotlinx/coroutines/bc$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bd$b;->bSQ:Lkotlinx/coroutines/bd$b;
+    sput-object v0, Lkotlinx/coroutines/bc$b;->bSF:Lkotlinx/coroutines/bc$b;
 
     return-void
 .end method
@@ -57,9 +58,9 @@
 .method public final synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    new-instance v0, Lkotlinx/coroutines/bd$a;
+    new-instance v0, Lkotlinx/coroutines/bc$a;
 
-    invoke-direct {v0}, Lkotlinx/coroutines/bd$a;-><init>()V
+    invoke-direct {v0}, Lkotlinx/coroutines/bc$a;-><init>()V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bc.smali b/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
index 4a8feb5dc6..22ae2834c9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
@@ -1,20 +1,49 @@
 .class public final Lkotlinx/coroutines/bc;
-.super Lkotlinx/coroutines/k;
+.super Ljava/lang/Object;
+.source "Dispatched.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lkotlinx/coroutines/bc$a;
+    }
+.end annotation
 
 
 # static fields
-.field public static final bSM:Lkotlinx/coroutines/bc;
+.field public static final bSC:Lkotlinx/coroutines/a/r;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlinx/coroutines/a/r<",
+            "Lkotlinx/coroutines/bc$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final bSD:Lkotlinx/coroutines/bc;
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 1
+    .locals 2
 
     new-instance v0, Lkotlinx/coroutines/bc;
 
     invoke-direct {v0}, Lkotlinx/coroutines/bc;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bc;->bSM:Lkotlinx/coroutines/bc;
+    sput-object v0, Lkotlinx/coroutines/bc;->bSD:Lkotlinx/coroutines/bc;
+
+    new-instance v0, Lkotlinx/coroutines/a/r;
+
+    sget-object v1, Lkotlinx/coroutines/bc$b;->bSF:Lkotlinx/coroutines/bc$b;
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/r;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    sput-object v0, Lkotlinx/coroutines/bc;->bSC:Lkotlinx/coroutines/a/r;
 
     return-void
 .end method
@@ -22,49 +51,7 @@
 .method private constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/k;-><init>()V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
-
-
-# virtual methods
-.method public final a(Lkotlin/c/e;Ljava/lang/Runnable;)V
-    .locals 1
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string p1, "block"
-
-    invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-.end method
-
-.method public final b(Lkotlin/c/e;)Z
-    .locals 1
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "Unconfined"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bd.smali b/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
deleted file mode 100644
index f41da08956..0000000000
--- a/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public final Lkotlinx/coroutines/bd;
-.super Ljava/lang/Object;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lkotlinx/coroutines/bd$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final bSN:Lkotlinx/coroutines/a/r;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlinx/coroutines/a/r<",
-            "Lkotlinx/coroutines/bd$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final bSO:Lkotlinx/coroutines/bd;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lkotlinx/coroutines/bd;
-
-    invoke-direct {v0}, Lkotlinx/coroutines/bd;-><init>()V
-
-    sput-object v0, Lkotlinx/coroutines/bd;->bSO:Lkotlinx/coroutines/bd;
-
-    new-instance v0, Lkotlinx/coroutines/a/r;
-
-    sget-object v1, Lkotlinx/coroutines/bd$b;->bSQ:Lkotlinx/coroutines/bd$b;
-
-    check-cast v1, Lkotlin/jvm/functions/Function0;
-
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/r;-><init>(Lkotlin/jvm/functions/Function0;)V
-
-    sput-object v0, Lkotlinx/coroutines/bd;->bSN:Lkotlinx/coroutines/a/r;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/c.smali
index 19ea450dd6..289e5d7842 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/c;
-.super Lkotlinx/coroutines/an;
+.super Lkotlinx/coroutines/am;
+.source "JobSupport.kt"
 
 # interfaces
 .implements Lkotlinx/coroutines/b;
@@ -8,8 +9,8 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlinx/coroutines/an<",
-        "Lkotlinx/coroutines/ar;",
+        "Lkotlinx/coroutines/am<",
+        "Lkotlinx/coroutines/aq;",
         ">;",
         "Lkotlinx/coroutines/b;"
     }
@@ -21,7 +22,7 @@
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/ar;Lkotlinx/coroutines/d;)V
+.method public constructor <init>(Lkotlinx/coroutines/aq;Lkotlinx/coroutines/d;)V
     .locals 1
 
     const-string v0, "parent"
@@ -32,9 +33,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p1, Lkotlinx/coroutines/al;
+    check-cast p1, Lkotlinx/coroutines/ak;
 
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/an;-><init>(Lkotlinx/coroutines/al;)V
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/am;-><init>(Lkotlinx/coroutines/ak;)V
 
     iput-object p2, p0, Lkotlinx/coroutines/c;->bRz:Lkotlinx/coroutines/d;
 
@@ -60,11 +61,11 @@
 
     iget-object p1, p0, Lkotlinx/coroutines/c;->bRz:Lkotlinx/coroutines/d;
 
-    iget-object v0, p0, Lkotlinx/coroutines/c;->job:Lkotlinx/coroutines/al;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->job:Lkotlinx/coroutines/ak;
 
-    check-cast v0, Lkotlinx/coroutines/ax;
+    check-cast v0, Lkotlinx/coroutines/aw;
 
-    invoke-interface {p1, v0}, Lkotlinx/coroutines/d;->a(Lkotlinx/coroutines/ax;)V
+    invoke-interface {p1, v0}, Lkotlinx/coroutines/d;->a(Lkotlinx/coroutines/aw;)V
 
     return-void
 .end method
@@ -76,11 +77,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/c;->job:Lkotlinx/coroutines/al;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->job:Lkotlinx/coroutines/ak;
 
-    check-cast v0, Lkotlinx/coroutines/ar;
+    check-cast v0, Lkotlinx/coroutines/aq;
 
-    invoke-virtual {v0, p1}, Lkotlinx/coroutines/ar;->q(Ljava/lang/Throwable;)Z
+    invoke-virtual {v0, p1}, Lkotlinx/coroutines/aq;->q(Ljava/lang/Throwable;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/a$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/a$a.smali
index e9e5d8d625..b85eb82a85 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/a$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/c/a$a;
 .super Ljava/lang/Object;
+.source "CoroutineScheduler.kt"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/a$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/a$b.smali
index c4279b6509..5ad95aec92 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/a$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/a$b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/c/a$b;
 .super Ljava/lang/Thread;
+.source "CoroutineScheduler.kt"
 
 
 # annotations
@@ -14,33 +15,33 @@
 
 
 # static fields
-.field private static final bUn:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bTN:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field volatile bUj:I
+.field final bTM:Lkotlinx/coroutines/c/n;
 
-.field final bUk:Lkotlinx/coroutines/c/n;
+.field private bTO:J
 
-.field volatile bUl:Lkotlinx/coroutines/c/a$c;
+.field private bTP:J
 
-.field private volatile bUm:I
+.field private bTQ:I
 
-.field private bUo:J
+.field private bTR:I
 
-.field volatile bUp:Ljava/lang/Object;
+.field private bTS:I
 
-.field private bUq:J
+.field final synthetic bTT:Lkotlinx/coroutines/c/a;
 
-.field private volatile bUr:I
+.field volatile indexInArray:I
 
-.field private bUs:I
+.field volatile nextParkedWorker:Ljava/lang/Object;
 
-.field private bUt:I
+.field private volatile spins:I
 
-.field private bUu:I
+.field volatile state:Lkotlinx/coroutines/c/a$c;
 
-.field final synthetic bUv:Lkotlinx/coroutines/c/a;
+.field private volatile terminationState:I
 
 
 # direct methods
@@ -49,13 +50,13 @@
 
     const-class v0, Lkotlinx/coroutines/c/a$b;
 
-    const-string v1, "bUm"
+    const-string v1, "terminationState"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/a$b;->bUn:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/a$b;->bTN:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -68,7 +69,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iput-object p1, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-direct {p0}, Ljava/lang/Thread;-><init>()V
 
@@ -80,27 +81,27 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/c/n;-><init>()V
 
-    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    sget-object v0, Lkotlinx/coroutines/c/a$c;->bUz:Lkotlinx/coroutines/c/a$c;
+    sget-object v0, Lkotlinx/coroutines/c/a$c;->bTX:Lkotlinx/coroutines/c/a$c;
 
-    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bUm:I
+    iput v0, p0, Lkotlinx/coroutines/c/a$b;->terminationState:I
 
-    invoke-static {}, Lkotlinx/coroutines/c/a;->GF()Lkotlinx/coroutines/a/o;
+    invoke-static {}, Lkotlinx/coroutines/c/a;->GE()Lkotlinx/coroutines/a/o;
 
     move-result-object v0
 
-    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUp:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->nextParkedWorker:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/c/a;->GE()I
+    invoke-static {}, Lkotlinx/coroutines/c/a;->GD()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bUs:I
+    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bTQ:I
 
     invoke-static {p1}, Lkotlinx/coroutines/c/a;->j(Lkotlinx/coroutines/c/a;)Ljava/util/Random;
 
@@ -110,7 +111,7 @@
 
     move-result p1
 
-    iput p1, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iput p1, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
     return-void
 .end method
@@ -130,24 +131,24 @@
     return-void
 .end method
 
-.method private final GJ()Z
+.method private final GI()Z
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/c/a;->i(Lkotlinx/coroutines/c/a;)Lkotlinx/coroutines/c/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/e;->GQ()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/e;->GP()Lkotlinx/coroutines/c/i;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/c/a;->i(Lkotlinx/coroutines/c/a;)Lkotlinx/coroutines/c/e;
 
@@ -165,10 +166,10 @@
     return v0
 .end method
 
-.method private final GM()Lkotlinx/coroutines/c/i;
+.method private final GL()Lkotlinx/coroutines/c/i;
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/c/a;->h(Lkotlinx/coroutines/c/a;)I
 
@@ -192,13 +193,13 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v1}, Lkotlinx/coroutines/c/a;->i(Lkotlinx/coroutines/c/a;)Lkotlinx/coroutines/c/e;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/c/e;->GP()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v1}, Lkotlinx/coroutines/c/e;->GO()Lkotlinx/coroutines/c/i;
 
     move-result-object v1
 
@@ -207,9 +208,9 @@
     return-object v1
 
     :cond_1
-    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/c/n;->GW()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v1}, Lkotlinx/coroutines/c/n;->GV()Lkotlinx/coroutines/c/i;
 
     move-result-object v1
 
@@ -220,13 +221,13 @@
     :cond_2
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/c/a;->i(Lkotlinx/coroutines/c/a;)Lkotlinx/coroutines/c/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/e;->GP()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/e;->GO()Lkotlinx/coroutines/c/i;
 
     move-result-object v0
 
@@ -235,17 +236,17 @@
     return-object v0
 
     :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GN()Lkotlinx/coroutines/c/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GM()Lkotlinx/coroutines/c/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private final GN()Lkotlinx/coroutines/c/i;
+.method private final GM()Lkotlinx/coroutines/c/i;
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/c/a;->g(Lkotlinx/coroutines/c/a;)I
 
@@ -260,7 +261,7 @@
     return-object v1
 
     :cond_0
-    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bUu:I
+    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bTS:I
 
     if-nez v2, :cond_1
 
@@ -278,9 +279,9 @@
     const/4 v2, 0x1
 
     :cond_2
-    iput v2, p0, Lkotlinx/coroutines/c/a$b;->bUu:I
+    iput v2, p0, Lkotlinx/coroutines/c/a$b;->bTS:I
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/c/a;->f(Lkotlinx/coroutines/c/a;)[Lkotlinx/coroutines/c/a$b;
 
@@ -296,11 +297,11 @@
 
     if-eq v0, v2, :cond_3
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    iget-object v0, v0, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v0, v0, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/c/a;->i(Lkotlinx/coroutines/c/a;)Lkotlinx/coroutines/c/e;
 
@@ -312,9 +313,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/n;->GW()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/n;->GV()Lkotlinx/coroutines/c/i;
 
     move-result-object v0
 
@@ -327,7 +328,7 @@
 .method private final aQ(J)V
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0, p0}, Lkotlinx/coroutines/c/a;->a(Lkotlinx/coroutines/c/a;Lkotlinx/coroutines/c/a$b;)V
 
@@ -343,7 +344,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v1, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v1}, Lkotlinx/coroutines/c/a;->a(Lkotlinx/coroutines/c/a;)Ljava/lang/String;
 
@@ -375,7 +376,7 @@
 
     invoke-virtual {p0, v0}, Lkotlinx/coroutines/c/a$b;->setName(Ljava/lang/String;)V
 
-    iput p1, p0, Lkotlinx/coroutines/c/a$b;->bUj:I
+    iput p1, p0, Lkotlinx/coroutines/c/a$b;->indexInArray:I
 
     return-void
 .end method
@@ -383,35 +384,29 @@
 .method private fa(I)I
     .locals 2
 
-    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
-    iget v1, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
-
-    shl-int/lit8 v1, v1, 0xd
+    shl-int/lit8 v1, v0, 0xd
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
-    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
-    iget v1, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
-
-    shr-int/lit8 v1, v1, 0x11
+    shr-int/lit8 v1, v0, 0x11
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
-    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
-    iget v1, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
-
-    shl-int/lit8 v1, v1, 0x5
+    shl-int/lit8 v1, v0, 0x5
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
     add-int/lit8 v0, p1, -0x1
 
@@ -419,14 +414,14 @@
 
     if-nez v1, :cond_0
 
-    iget p1, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iget p1, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
     and-int/2addr p1, v0
 
     return p1
 
     :cond_0
-    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bUt:I
+    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bTR:I
 
     const v1, 0x7fffffff
 
@@ -439,12 +434,12 @@
 
 
 # virtual methods
-.method public final GG()Z
+.method public final GF()Z
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUy:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTW:Lkotlinx/coroutines/c/a$c;
 
     if-ne v0, v1, :cond_0
 
@@ -458,10 +453,10 @@
     return v0
 .end method
 
-.method public final GH()Z
+.method public final GG()Z
     .locals 3
 
-    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bUm:I
+    iget v0, p0, Lkotlinx/coroutines/c/a$b;->terminationState:I
 
     const/4 v1, 0x0
 
@@ -493,7 +488,7 @@
     return v1
 
     :pswitch_1
-    sget-object v0, Lkotlinx/coroutines/c/a$b;->bUn:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/a$b;->bTN:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v2, -0x1
 
@@ -514,12 +509,12 @@
     .end packed-switch
 .end method
 
-.method public final GI()Z
+.method public final GH()Z
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUw:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTU:Lkotlinx/coroutines/c/a$c;
 
     const/4 v2, 0x1
 
@@ -528,7 +523,7 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/c/a;->b(Lkotlinx/coroutines/c/a;)Ljava/util/concurrent/Semaphore;
 
@@ -540,9 +535,9 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lkotlinx/coroutines/c/a$c;->bUw:Lkotlinx/coroutines/c/a$c;
+    sget-object v0, Lkotlinx/coroutines/c/a$c;->bTU:Lkotlinx/coroutines/c/a$c;
 
-    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iput-object v0, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
     return v2
 
@@ -552,53 +547,53 @@
     return v0
 .end method
 
-.method public final GK()V
+.method public final GJ()V
     .locals 1
 
-    invoke-static {}, Lkotlinx/coroutines/c/a;->GE()I
+    invoke-static {}, Lkotlinx/coroutines/c/a;->GD()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bUs:I
+    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bTQ:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lkotlinx/coroutines/c/a$b;->bUr:I
+    iput v0, p0, Lkotlinx/coroutines/c/a$b;->spins:I
 
     return-void
 .end method
 
-.method public final GL()Lkotlinx/coroutines/c/i;
+.method public final GK()Lkotlinx/coroutines/c/i;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/c/a$b;->GI()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/c/a$b;->GH()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GM()Lkotlinx/coroutines/c/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GL()Lkotlinx/coroutines/c/i;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/n;->GW()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/n;->GV()Lkotlinx/coroutines/c/i;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/c/a;->i(Lkotlinx/coroutines/c/a;)Lkotlinx/coroutines/c/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/e;->GQ()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/e;->GP()Lkotlinx/coroutines/c/i;
 
     move-result-object v0
 
@@ -613,9 +608,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUw:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTU:Lkotlinx/coroutines/c/a$c;
 
     if-ne v0, v1, :cond_0
 
@@ -629,7 +624,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/c/a;->b(Lkotlinx/coroutines/c/a;)Ljava/util/concurrent/Semaphore;
 
@@ -640,7 +635,7 @@
     :cond_1
     if-eq v0, p1, :cond_2
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iput-object p1, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
     :cond_2
     return v1
@@ -657,7 +652,7 @@
 
     :cond_0
     :goto_0
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/c/a;->c(Lkotlinx/coroutines/c/a;)Z
 
@@ -665,13 +660,13 @@
 
     if-nez v3, :cond_17
 
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v4, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     if-eq v3, v4, :cond_17
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/c/a$b;->GL()Lkotlinx/coroutines/c/i;
+    invoke-virtual {p0}, Lkotlinx/coroutines/c/a$b;->GK()Lkotlinx/coroutines/c/i;
 
     move-result-object v3
 
@@ -679,13 +674,13 @@
 
     if-nez v3, :cond_c
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v3, Lkotlinx/coroutines/c/a$c;->bUw:Lkotlinx/coroutines/c/a$c;
+    sget-object v3, Lkotlinx/coroutines/c/a$c;->bTU:Lkotlinx/coroutines/c/a$c;
 
     if-ne v2, v3, :cond_3
 
-    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bUr:I
+    iget v2, p0, Lkotlinx/coroutines/c/a$b;->spins:I
 
     const/16 v3, 0x5dc
 
@@ -693,7 +688,7 @@
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lkotlinx/coroutines/c/a$b;->bUr:I
+    iput v3, p0, Lkotlinx/coroutines/c/a$b;->spins:I
 
     const/16 v3, 0x3e8
 
@@ -701,24 +696,24 @@
 
     invoke-static {}, Ljava/lang/Thread;->yield()V
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_1
-    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bUs:I
+    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bTQ:I
 
-    invoke-static {}, Lkotlinx/coroutines/c/a;->GD()I
+    invoke-static {}, Lkotlinx/coroutines/c/a;->GC()I
 
     move-result v3
 
     if-ge v2, v3, :cond_2
 
-    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bUs:I
+    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bTQ:I
 
     mul-int/lit8 v2, v2, 0x3
 
     ushr-int/2addr v2, v0
 
-    invoke-static {}, Lkotlinx/coroutines/c/a;->GD()I
+    invoke-static {}, Lkotlinx/coroutines/c/a;->GC()I
 
     move-result v3
 
@@ -726,35 +721,35 @@
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/c/a$b;->bUs:I
+    iput v2, p0, Lkotlinx/coroutines/c/a$b;->bTQ:I
 
     :cond_2
-    sget-object v2, Lkotlinx/coroutines/c/a$c;->bUy:Lkotlinx/coroutines/c/a$c;
+    sget-object v2, Lkotlinx/coroutines/c/a$c;->bTW:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {p0, v2}, Lkotlinx/coroutines/c/a$b;->a(Lkotlinx/coroutines/c/a$c;)Z
 
-    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bUs:I
+    iget v2, p0, Lkotlinx/coroutines/c/a$b;->bTQ:I
 
     int-to-long v2, v2
 
     invoke-direct {p0, v2, v3}, Lkotlinx/coroutines/c/a$b;->aQ(J)V
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_3
-    sget-object v2, Lkotlinx/coroutines/c/a$c;->bUy:Lkotlinx/coroutines/c/a$c;
+    sget-object v2, Lkotlinx/coroutines/c/a$c;->bTW:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {p0, v2}, Lkotlinx/coroutines/c/a$b;->a(Lkotlinx/coroutines/c/a$c;)Z
 
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GJ()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GI()Z
 
     move-result v2
 
     if-eqz v2, :cond_b
 
-    iput v1, p0, Lkotlinx/coroutines/c/a$b;->bUm:I
+    iput v1, p0, Lkotlinx/coroutines/c/a$b;->terminationState:I
 
-    iget-wide v2, p0, Lkotlinx/coroutines/c/a$b;->bUo:J
+    iget-wide v2, p0, Lkotlinx/coroutines/c/a$b;->bTO:J
 
     cmp-long v6, v2, v4
 
@@ -764,7 +759,7 @@
 
     move-result-wide v2
 
-    iget-object v6, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v6, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v6}, Lkotlinx/coroutines/c/a;->e(Lkotlinx/coroutines/c/a;)J
 
@@ -772,10 +767,10 @@
 
     add-long/2addr v2, v6
 
-    iput-wide v2, p0, Lkotlinx/coroutines/c/a$b;->bUo:J
+    iput-wide v2, p0, Lkotlinx/coroutines/c/a$b;->bTO:J
 
     :cond_4
-    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/c/a;->e(Lkotlinx/coroutines/c/a;)J
 
@@ -787,7 +782,7 @@
 
     move-result-wide v2
 
-    iget-wide v6, p0, Lkotlinx/coroutines/c/a$b;->bUo:J
+    iget-wide v6, p0, Lkotlinx/coroutines/c/a$b;->bTO:J
 
     sub-long/2addr v2, v6
 
@@ -795,9 +790,9 @@
 
     if-ltz v6, :cond_b
 
-    iput-wide v4, p0, Lkotlinx/coroutines/c/a$b;->bUo:J
+    iput-wide v4, p0, Lkotlinx/coroutines/c/a$b;->bTO:J
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v2, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/c/a;->f(Lkotlinx/coroutines/c/a;)[Lkotlinx/coroutines/c/a$b;
 
@@ -806,7 +801,7 @@
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/c/a;->c(Lkotlinx/coroutines/c/a;)Z
 
@@ -816,61 +811,75 @@
 
     if-eqz v3, :cond_5
 
-    :goto_1
     monitor-exit v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     :try_start_1
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/c/a;->g(Lkotlinx/coroutines/c/a;)I
 
     move-result v3
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/c/a;->h(Lkotlinx/coroutines/c/a;)I
 
     move-result v4
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     if-gt v3, v4, :cond_6
 
+    monitor-exit v2
+
     goto :goto_1
 
     :cond_6
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GJ()Z
+    :try_start_2
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a$b;->GI()Z
 
     move-result v3
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     if-nez v3, :cond_7
 
+    monitor-exit v2
+
     goto :goto_1
 
     :cond_7
-    sget-object v3, Lkotlinx/coroutines/c/a$b;->bUn:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    :try_start_3
+    sget-object v3, Lkotlinx/coroutines/c/a$b;->bTN:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {v3, p0, v1, v0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
 
     move-result v3
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     if-nez v3, :cond_8
 
+    monitor-exit v2
+
     goto :goto_1
 
     :cond_8
-    iget v3, p0, Lkotlinx/coroutines/c/a$b;->bUj:I
+    :try_start_4
+    iget v3, p0, Lkotlinx/coroutines/c/a$b;->indexInArray:I
 
     invoke-direct {p0, v1}, Lkotlinx/coroutines/c/a$b;->eZ(I)V
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v4, p0, v3, v1}, Lkotlinx/coroutines/c/a;->a(Lkotlinx/coroutines/c/a;Lkotlinx/coroutines/c/a$b;II)V
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
-    sget-object v5, Lkotlinx/coroutines/c/a;->bTY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/c/a;->bTC:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     invoke-virtual {v5, v4}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->getAndDecrement(Ljava/lang/Object;)J
 
@@ -884,7 +893,7 @@
 
     if-eq v4, v3, :cond_a
 
-    iget-object v5, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v5, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v5}, Lkotlinx/coroutines/c/a;->f(Lkotlinx/coroutines/c/a;)[Lkotlinx/coroutines/c/a$b;
 
@@ -894,10 +903,10 @@
 
     if-nez v5, :cond_9
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_9
-    iget-object v6, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v6, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v6}, Lkotlinx/coroutines/c/a;->f(Lkotlinx/coroutines/c/a;)[Lkotlinx/coroutines/c/a$b;
 
@@ -907,12 +916,12 @@
 
     invoke-direct {v5, v3}, Lkotlinx/coroutines/c/a$b;->eZ(I)V
 
-    iget-object v6, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v6, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v6, v5, v4, v3}, Lkotlinx/coroutines/c/a;->a(Lkotlinx/coroutines/c/a;Lkotlinx/coroutines/c/a$b;II)V
 
     :cond_a
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/c/a;->f(Lkotlinx/coroutines/c/a;)[Lkotlinx/coroutines/c/a$b;
 
@@ -923,16 +932,16 @@
     aput-object v5, v3, v4
 
     sget-object v3, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     monitor-exit v2
 
-    sget-object v2, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v2, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
-    iput-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iput-object v2, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    goto :goto_2
+    goto :goto_1
 
     :catchall_0
     move-exception v0
@@ -942,7 +951,7 @@
     throw v0
 
     :cond_b
-    :goto_2
+    :goto_1
     const/4 v2, 0x1
 
     goto/16 :goto_0
@@ -950,39 +959,39 @@
     :cond_c
     if-eqz v2, :cond_11
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GT()Lkotlinx/coroutines/c/k;
+    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GS()Lkotlinx/coroutines/c/k;
 
     move-result-object v2
 
-    iput-wide v4, p0, Lkotlinx/coroutines/c/a$b;->bUo:J
+    iput-wide v4, p0, Lkotlinx/coroutines/c/a$b;->bTO:J
 
-    iput v1, p0, Lkotlinx/coroutines/c/a$b;->bUu:I
+    iput v1, p0, Lkotlinx/coroutines/c/a$b;->bTS:I
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v5, Lkotlinx/coroutines/c/a$c;->bUy:Lkotlinx/coroutines/c/a$c;
+    sget-object v5, Lkotlinx/coroutines/c/a$c;->bTW:Lkotlinx/coroutines/c/a$c;
 
     if-ne v4, v5, :cond_10
 
-    sget-object v4, Lkotlinx/coroutines/c/k;->bUQ:Lkotlinx/coroutines/c/k;
+    sget-object v4, Lkotlinx/coroutines/c/k;->bUn:Lkotlinx/coroutines/c/k;
 
     if-ne v2, v4, :cond_d
 
     const/4 v2, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_d
     const/4 v2, 0x0
 
-    :goto_3
+    :goto_2
     sget-boolean v4, Lkotlin/v;->bPn:Z
 
     if-eqz v4, :cond_f
 
     if-eqz v2, :cond_e
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_e
     new-instance v0, Ljava/lang/AssertionError;
@@ -996,40 +1005,40 @@
     throw v0
 
     :cond_f
-    :goto_4
-    sget-object v2, Lkotlinx/coroutines/c/a$c;->bUx:Lkotlinx/coroutines/c/a$c;
+    :goto_3
+    sget-object v2, Lkotlinx/coroutines/c/a$c;->bTV:Lkotlinx/coroutines/c/a$c;
 
-    iput-object v2, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iput-object v2, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    invoke-static {}, Lkotlinx/coroutines/c/a;->GE()I
+    invoke-static {}, Lkotlinx/coroutines/c/a;->GD()I
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/c/a$b;->bUs:I
+    iput v2, p0, Lkotlinx/coroutines/c/a$b;->bTQ:I
 
     :cond_10
-    iput v1, p0, Lkotlinx/coroutines/c/a$b;->bUr:I
+    iput v1, p0, Lkotlinx/coroutines/c/a$b;->spins:I
 
     const/4 v2, 0x0
 
     :cond_11
-    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GT()Lkotlinx/coroutines/c/k;
+    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GS()Lkotlinx/coroutines/c/k;
 
     move-result-object v4
 
-    sget-object v5, Lkotlinx/coroutines/c/k;->bUP:Lkotlinx/coroutines/c/k;
+    sget-object v5, Lkotlinx/coroutines/c/k;->bUm:Lkotlinx/coroutines/c/k;
 
     if-eq v4, v5, :cond_12
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
-    sget-object v5, Lkotlinx/coroutines/c/a;->bTY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/c/a;->bTC:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-wide/32 v6, 0x200000
 
     invoke-virtual {v5, v4, v6, v7}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->addAndGet(Ljava/lang/Object;J)J
 
-    sget-object v4, Lkotlinx/coroutines/c/a$c;->bUx:Lkotlinx/coroutines/c/a$c;
+    sget-object v4, Lkotlinx/coroutines/c/a$c;->bTV:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {p0, v4}, Lkotlinx/coroutines/c/a$b;->a(Lkotlinx/coroutines/c/a$c;)Z
 
@@ -1037,10 +1046,14 @@
 
     if-eqz v4, :cond_13
 
-    goto :goto_5
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
+
+    invoke-static {v4}, Lkotlinx/coroutines/c/a;->d(Lkotlinx/coroutines/c/a;)V
+
+    goto :goto_4
 
     :cond_12
-    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/c/a;->b(Lkotlinx/coroutines/c/a;)Ljava/util/concurrent/Semaphore;
 
@@ -1052,27 +1065,27 @@
 
     if-eqz v4, :cond_13
 
-    sget-object v4, Lkotlinx/coroutines/c/l;->bUW:Lkotlinx/coroutines/c/m;
+    sget-object v4, Lkotlinx/coroutines/c/l;->bUt:Lkotlinx/coroutines/c/m;
 
     invoke-virtual {v4}, Lkotlinx/coroutines/c/m;->nanoTime()J
 
     move-result-wide v4
 
-    iget-wide v6, v3, Lkotlinx/coroutines/c/i;->bUN:J
+    iget-wide v6, v3, Lkotlinx/coroutines/c/i;->bUk:J
 
     sub-long v6, v4, v6
 
-    sget-wide v8, Lkotlinx/coroutines/c/l;->bUS:J
+    sget-wide v8, Lkotlinx/coroutines/c/l;->bUp:J
 
     cmp-long v10, v6, v8
 
     if-ltz v10, :cond_13
 
-    iget-wide v6, p0, Lkotlinx/coroutines/c/a$b;->bUq:J
+    iget-wide v6, p0, Lkotlinx/coroutines/c/a$b;->bTP:J
 
     sub-long v6, v4, v6
 
-    sget-wide v8, Lkotlinx/coroutines/c/l;->bUS:J
+    sget-wide v8, Lkotlinx/coroutines/c/l;->bUp:J
 
     const-wide/16 v10, 0x5
 
@@ -1082,57 +1095,57 @@
 
     if-ltz v10, :cond_13
 
-    iput-wide v4, p0, Lkotlinx/coroutines/c/a$b;->bUq:J
+    iput-wide v4, p0, Lkotlinx/coroutines/c/a$b;->bTP:J
 
-    :goto_5
-    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/c/a;->d(Lkotlinx/coroutines/c/a;)V
 
     :cond_13
+    :goto_4
     invoke-static {v3}, Lkotlinx/coroutines/c/a;->b(Lkotlinx/coroutines/c/i;)V
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GT()Lkotlinx/coroutines/c/k;
+    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GS()Lkotlinx/coroutines/c/k;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/c/k;->bUP:Lkotlinx/coroutines/c/k;
+    sget-object v4, Lkotlinx/coroutines/c/k;->bUm:Lkotlinx/coroutines/c/k;
 
     if-eq v3, v4, :cond_0
 
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
-    sget-object v4, Lkotlinx/coroutines/c/a;->bTY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/c/a;->bTC:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-wide/32 v5, -0x200000
 
     invoke-virtual {v4, v3, v5, v6}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->addAndGet(Ljava/lang/Object;J)J
 
-    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v4, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     if-eq v3, v4, :cond_0
 
-    sget-object v4, Lkotlinx/coroutines/c/a$c;->bUx:Lkotlinx/coroutines/c/a$c;
+    sget-object v4, Lkotlinx/coroutines/c/a$c;->bTV:Lkotlinx/coroutines/c/a$c;
 
     if-ne v3, v4, :cond_14
 
     const/4 v4, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_14
     const/4 v4, 0x0
 
-    :goto_6
+    :goto_5
     sget-boolean v5, Lkotlin/v;->bPn:Z
 
     if-eqz v5, :cond_16
 
     if-eqz v4, :cond_15
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_15
     invoke-static {v3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -1154,15 +1167,15 @@
     throw v1
 
     :cond_16
-    :goto_7
-    sget-object v3, Lkotlinx/coroutines/c/a$c;->bUz:Lkotlinx/coroutines/c/a$c;
+    :goto_6
+    sget-object v3, Lkotlinx/coroutines/c/a$c;->bTX:Lkotlinx/coroutines/c/a$c;
 
-    iput-object v3, p0, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iput-object v3, p0, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
     goto/16 :goto_0
 
     :cond_17
-    sget-object v0, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v0, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {p0, v0}, Lkotlinx/coroutines/c/a$b;->a(Lkotlinx/coroutines/c/a$c;)Z
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/a$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/a$c.smali
index 8cbefd6125..d6f66486fb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/a$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/a$c.smali
@@ -1,5 +1,6 @@
 .class public final enum Lkotlinx/coroutines/c/a$c;
 .super Ljava/lang/Enum;
+.source "CoroutineScheduler.kt"
 
 
 # annotations
@@ -22,17 +23,17 @@
 
 
 # static fields
-.field public static final enum bUA:Lkotlinx/coroutines/c/a$c;
+.field public static final enum bTU:Lkotlinx/coroutines/c/a$c;
 
-.field private static final synthetic bUB:[Lkotlinx/coroutines/c/a$c;
+.field public static final enum bTV:Lkotlinx/coroutines/c/a$c;
 
-.field public static final enum bUw:Lkotlinx/coroutines/c/a$c;
+.field public static final enum bTW:Lkotlinx/coroutines/c/a$c;
 
-.field public static final enum bUx:Lkotlinx/coroutines/c/a$c;
+.field public static final enum bTX:Lkotlinx/coroutines/c/a$c;
 
-.field public static final enum bUy:Lkotlinx/coroutines/c/a$c;
+.field public static final enum bTY:Lkotlinx/coroutines/c/a$c;
 
-.field public static final enum bUz:Lkotlinx/coroutines/c/a$c;
+.field private static final synthetic bTZ:[Lkotlinx/coroutines/c/a$c;
 
 
 # direct methods
@@ -51,7 +52,7 @@
 
     invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/c/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/c/a$c;->bUw:Lkotlinx/coroutines/c/a$c;
+    sput-object v1, Lkotlinx/coroutines/c/a$c;->bTU:Lkotlinx/coroutines/c/a$c;
 
     aput-object v1, v0, v3
 
@@ -63,7 +64,7 @@
 
     invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/c/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/c/a$c;->bUx:Lkotlinx/coroutines/c/a$c;
+    sput-object v1, Lkotlinx/coroutines/c/a$c;->bTV:Lkotlinx/coroutines/c/a$c;
 
     aput-object v1, v0, v3
 
@@ -75,7 +76,7 @@
 
     invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/c/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/c/a$c;->bUy:Lkotlinx/coroutines/c/a$c;
+    sput-object v1, Lkotlinx/coroutines/c/a$c;->bTW:Lkotlinx/coroutines/c/a$c;
 
     aput-object v1, v0, v3
 
@@ -87,7 +88,7 @@
 
     invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/c/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/c/a$c;->bUz:Lkotlinx/coroutines/c/a$c;
+    sput-object v1, Lkotlinx/coroutines/c/a$c;->bTX:Lkotlinx/coroutines/c/a$c;
 
     aput-object v1, v0, v3
 
@@ -99,11 +100,11 @@
 
     invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/c/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sput-object v1, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lkotlinx/coroutines/c/a$c;->bUB:[Lkotlinx/coroutines/c/a$c;
+    sput-object v0, Lkotlinx/coroutines/c/a$c;->bTZ:[Lkotlinx/coroutines/c/a$c;
 
     return-void
 .end method
@@ -138,7 +139,7 @@
 .method public static values()[Lkotlinx/coroutines/c/a$c;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/c/a$c;->bUB:[Lkotlinx/coroutines/c/a$c;
+    sget-object v0, Lkotlinx/coroutines/c/a$c;->bTZ:[Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {v0}, [Lkotlinx/coroutines/c/a$c;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/a.smali
index 8fc7d727de..1f16e8d55d 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/c/a;
 .super Ljava/lang/Object;
+.source "CoroutineScheduler.kt"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -17,41 +18,41 @@
 
 
 # static fields
-.field private static final bTV:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field private static final bTA:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field static final bTY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field static final bTC:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field private static final bUa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bTD:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field private static final bUf:I
+.field private static final bTI:I
 
-.field private static final bUg:I
+.field private static final bTJ:I
 
-.field private static final bUh:Lkotlinx/coroutines/a/o;
+.field private static final bTK:Lkotlinx/coroutines/a/o;
 
-.field public static final bUi:Lkotlinx/coroutines/c/a$a;
+.field public static final bTL:Lkotlinx/coroutines/c/a$a;
 
 
 # instance fields
-.field private final bTS:Lkotlinx/coroutines/c/e;
+.field private volatile _isTerminated:I
 
-.field private final bTT:Ljava/util/concurrent/Semaphore;
+.field private final bTB:[Lkotlinx/coroutines/c/a$b;
 
-.field private volatile bTU:J
+.field private final bTE:I
 
-.field private final bTW:[Lkotlinx/coroutines/c/a$b;
+.field private final bTF:I
 
-.field volatile bTX:J
+.field private final bTG:J
 
-.field private volatile bTZ:I
+.field private final bTH:Ljava/lang/String;
 
-.field private final bUb:I
+.field private final bTy:Lkotlinx/coroutines/c/e;
 
-.field private final bUc:I
+.field private final bTz:Ljava/util/concurrent/Semaphore;
 
-.field private final bUd:J
+.field volatile controlState:J
 
-.field private final bUe:Ljava/lang/String;
+.field private volatile parkedWorkersStack:J
 
 .field private final random:Ljava/util/Random;
 
@@ -66,7 +67,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/c/a$a;-><init>(B)V
 
-    sput-object v0, Lkotlinx/coroutines/c/a;->bUi:Lkotlinx/coroutines/c/a$a;
+    sput-object v0, Lkotlinx/coroutines/c/a;->bTL:Lkotlinx/coroutines/c/a$a;
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -78,9 +79,9 @@
 
     long-to-int v0, v0
 
-    sput v0, Lkotlinx/coroutines/c/a;->bUf:I
+    sput v0, Lkotlinx/coroutines/c/a;->bTI:I
 
-    sget-wide v0, Lkotlinx/coroutines/c/l;->bUS:J
+    sget-wide v0, Lkotlinx/coroutines/c/l;->bUp:J
 
     const-wide/16 v2, 0x4
 
@@ -92,7 +93,7 @@
 
     move-result-wide v0
 
-    sget v2, Lkotlinx/coroutines/c/a;->bUf:I
+    sget v2, Lkotlinx/coroutines/c/a;->bTI:I
 
     int-to-long v2, v2
 
@@ -102,7 +103,7 @@
 
     long-to-int v0, v0
 
-    sput v0, Lkotlinx/coroutines/c/a;->bUg:I
+    sput v0, Lkotlinx/coroutines/c/a;->bTJ:I
 
     new-instance v0, Lkotlinx/coroutines/a/o;
 
@@ -110,37 +111,37 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/c/a;->bUh:Lkotlinx/coroutines/a/o;
+    sput-object v0, Lkotlinx/coroutines/c/a;->bTK:Lkotlinx/coroutines/a/o;
 
     const-class v0, Lkotlinx/coroutines/c/a;
 
-    const-string v1, "bTU"
+    const-string v1, "parkedWorkersStack"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/a;->bTV:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/a;->bTA:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/c/a;
 
-    const-string v1, "bTX"
+    const-string v1, "controlState"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/a;->bTY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/a;->bTC:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/c/a;
 
-    const-string v1, "bTZ"
+    const-string v1, "_isTerminated"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/a;->bUa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/a;->bTD:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -172,15 +173,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iput p1, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
-    iput p2, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iput p2, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/c/a;->bUd:J
+    iput-wide p3, p0, Lkotlinx/coroutines/c/a;->bTG:J
 
-    iput-object p5, p0, Lkotlinx/coroutines/c/a;->bUe:Ljava/lang/String;
+    iput-object p5, p0, Lkotlinx/coroutines/c/a;->bTH:Ljava/lang/String;
 
-    iget p1, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget p1, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     const/4 p2, 0x1
 
@@ -198,9 +199,9 @@
     :goto_0
     if-eqz p1, :cond_7
 
-    iget p1, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iget p1, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
-    iget p4, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget p4, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     if-lt p1, p4, :cond_1
 
@@ -214,7 +215,7 @@
     :goto_1
     if-eqz p1, :cond_6
 
-    iget p1, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iget p1, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
     const p4, 0x1ffffe
 
@@ -230,7 +231,7 @@
     :goto_2
     if-eqz p1, :cond_5
 
-    iget-wide p4, p0, Lkotlinx/coroutines/c/a;->bUd:J
+    iget-wide p4, p0, Lkotlinx/coroutines/c/a;->bTG:J
 
     const-wide/16 v0, 0x0
 
@@ -252,27 +253,27 @@
 
     invoke-direct {p1}, Lkotlinx/coroutines/c/e;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iput-object p1, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
     new-instance p1, Ljava/util/concurrent/Semaphore;
 
-    iget p4, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget p4, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     invoke-direct {p1, p4, p3}, Ljava/util/concurrent/Semaphore;-><init>(IZ)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/a;->bTT:Ljava/util/concurrent/Semaphore;
+    iput-object p1, p0, Lkotlinx/coroutines/c/a;->bTz:Ljava/util/concurrent/Semaphore;
 
-    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->bTU:J
+    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->parkedWorkersStack:J
 
-    iget p1, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iget p1, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
     add-int/2addr p1, p2
 
     new-array p1, p1, [Lkotlinx/coroutines/c/a$b;
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iput-object p1, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
-    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->bTX:J
+    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->controlState:J
 
     new-instance p1, Ljava/util/Random;
 
@@ -280,7 +281,7 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/c/a;->random:Ljava/util/Random;
 
-    iput p3, p0, Lkotlinx/coroutines/c/a;->bTZ:I
+    iput p3, p0, Lkotlinx/coroutines/c/a;->_isTerminated:I
 
     return-void
 
@@ -291,7 +292,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide p2, p0, Lkotlinx/coroutines/c/a;->bUd:J
+    iget-wide p2, p0, Lkotlinx/coroutines/c/a;->bTG:J
 
     invoke-virtual {p1, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -322,7 +323,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iget p2, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -353,7 +354,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iget p2, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -361,7 +362,7 @@
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget p2, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget p2, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -388,7 +389,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget p2, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -413,85 +414,11 @@
     throw p2
 .end method
 
-.method private final GA()V
-    .locals 5
-
-    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTT:Ljava/util/concurrent/Semaphore;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GB()Z
-
-    return-void
-
-    :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GB()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-wide v0, p0, Lkotlinx/coroutines/c/a;->bTX:J
-
-    const-wide/32 v2, 0x1fffff
-
-    and-long/2addr v2, v0
-
-    long-to-int v2, v2
-
-    const-wide v3, 0x3ffffe00000L
-
-    and-long/2addr v0, v3
-
-    const/16 v3, 0x15
-
-    shr-long/2addr v0, v3
-
-    long-to-int v0, v0
-
-    sub-int/2addr v2, v0
-
-    iget v0, p0, Lkotlinx/coroutines/c/a;->bUb:I
-
-    if-ge v2, v0, :cond_3
-
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GC()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_2
-
-    iget v2, p0, Lkotlinx/coroutines/c/a;->bUb:I
-
-    if-le v2, v1, :cond_2
-
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GC()I
-
-    :cond_2
-    if-lez v0, :cond_3
-
-    return-void
-
-    :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GB()Z
-
-    return-void
-.end method
-
-.method private final GB()Z
+.method private final GA()Z
     .locals 3
 
     :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->Gz()Lkotlinx/coroutines/c/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->Gy()Lkotlinx/coroutines/c/a$b;
 
     move-result-object v0
 
@@ -502,9 +429,9 @@
     return v0
 
     :cond_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GK()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GJ()V
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GG()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GF()Z
 
     move-result v1
 
@@ -516,7 +443,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GH()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GG()Z
 
     move-result v0
 
@@ -527,10 +454,10 @@
     return v0
 .end method
 
-.method private final GC()I
+.method private final GB()I
     .locals 9
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     monitor-enter v0
 
@@ -551,7 +478,7 @@
 
     :cond_0
     :try_start_1
-    iget-wide v1, p0, Lkotlinx/coroutines/c/a;->bTX:J
+    iget-wide v1, p0, Lkotlinx/coroutines/c/a;->controlState:J
 
     const-wide/32 v3, 0x1fffff
 
@@ -571,7 +498,7 @@
 
     sub-int v1, v5, v1
 
-    iget v2, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget v2, p0, Lkotlinx/coroutines/c/a;->bTE:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -585,11 +512,11 @@
 
     :cond_1
     :try_start_2
-    iget v2, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iget v2, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
     if-ge v5, v2, :cond_5
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/a;->bTT:Ljava/util/concurrent/Semaphore;
+    iget-object v2, p0, Lkotlinx/coroutines/c/a;->bTz:Ljava/util/concurrent/Semaphore;
 
     invoke-virtual {v2}, Ljava/util/concurrent/Semaphore;->availablePermits()I
 
@@ -600,7 +527,7 @@
     goto :goto_0
 
     :cond_2
-    sget-object v2, Lkotlinx/coroutines/c/a;->bTY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/c/a;->bTC:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     invoke-virtual {v2, p0}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->incrementAndGet(Ljava/lang/Object;)J
 
@@ -614,7 +541,7 @@
 
     if-lez v2, :cond_3
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     aget-object v4, v4, v2
 
@@ -631,7 +558,7 @@
 
     invoke-virtual {v4}, Lkotlinx/coroutines/c/a$b;->start()V
 
-    iget-object v5, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v5, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     aput-object v4, v5, v2
     :try_end_2
@@ -675,35 +602,35 @@
     throw v1
 .end method
 
+.method public static final synthetic GC()I
+    .locals 1
+
+    sget v0, Lkotlinx/coroutines/c/a;->bTI:I
+
+    return v0
+.end method
+
 .method public static final synthetic GD()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/c/a;->bUf:I
+    sget v0, Lkotlinx/coroutines/c/a;->bTJ:I
 
     return v0
 .end method
 
-.method public static final synthetic GE()I
+.method public static final synthetic GE()Lkotlinx/coroutines/a/o;
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/c/a;->bUg:I
-
-    return v0
-.end method
-
-.method public static final synthetic GF()Lkotlinx/coroutines/a/o;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/c/a;->bUh:Lkotlinx/coroutines/a/o;
+    sget-object v0, Lkotlinx/coroutines/c/a;->bTK:Lkotlinx/coroutines/a/o;
 
     return-object v0
 .end method
 
-.method private final Gz()Lkotlinx/coroutines/c/a$b;
+.method private final Gy()Lkotlinx/coroutines/c/a$b;
     .locals 9
 
     :cond_0
-    iget-wide v2, p0, Lkotlinx/coroutines/c/a;->bTU:J
+    iget-wide v2, p0, Lkotlinx/coroutines/c/a;->parkedWorkersStack:J
 
     const-wide/32 v0, 0x1fffff
 
@@ -711,7 +638,7 @@
 
     long-to-int v0, v0
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v1, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     aget-object v6, v1, v0
 
@@ -736,7 +663,7 @@
 
     if-ltz v4, :cond_0
 
-    sget-object v5, Lkotlinx/coroutines/c/a;->bTV:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/c/a;->bTA:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     int-to-long v7, v4
 
@@ -754,48 +681,127 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlinx/coroutines/c/a;->bUh:Lkotlinx/coroutines/a/o;
+    sget-object v0, Lkotlinx/coroutines/c/a;->bTK:Lkotlinx/coroutines/a/o;
 
-    iput-object v0, v6, Lkotlinx/coroutines/c/a$b;->bUp:Ljava/lang/Object;
+    iput-object v0, v6, Lkotlinx/coroutines/c/a$b;->nextParkedWorker:Ljava/lang/Object;
 
     return-object v6
 .end method
 
+.method private final Gz()V
+    .locals 5
+
+    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTz:Ljava/util/concurrent/Semaphore;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GA()Z
+
+    return-void
+
+    :cond_0
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GA()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-wide v0, p0, Lkotlinx/coroutines/c/a;->controlState:J
+
+    const-wide/32 v2, 0x1fffff
+
+    and-long/2addr v2, v0
+
+    long-to-int v2, v2
+
+    const-wide v3, 0x3ffffe00000L
+
+    and-long/2addr v0, v3
+
+    const/16 v3, 0x15
+
+    shr-long/2addr v0, v3
+
+    long-to-int v0, v0
+
+    sub-int/2addr v2, v0
+
+    iget v0, p0, Lkotlinx/coroutines/c/a;->bTE:I
+
+    if-ge v2, v0, :cond_3
+
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GB()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_2
+
+    iget v2, p0, Lkotlinx/coroutines/c/a;->bTE:I
+
+    if-le v2, v1, :cond_2
+
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GB()I
+
+    :cond_2
+    if-lez v0, :cond_3
+
+    return-void
+
+    :cond_3
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GA()Z
+
+    return-void
+.end method
+
 .method private static a(Lkotlinx/coroutines/c/a$b;)I
     .locals 1
 
-    :cond_0
-    iget-object p0, p0, Lkotlinx/coroutines/c/a$b;->bUp:Ljava/lang/Object;
+    iget-object p0, p0, Lkotlinx/coroutines/c/a$b;->nextParkedWorker:Ljava/lang/Object;
 
-    sget-object v0, Lkotlinx/coroutines/c/a;->bUh:Lkotlinx/coroutines/a/o;
+    :goto_0
+    sget-object v0, Lkotlinx/coroutines/c/a;->bTK:Lkotlinx/coroutines/a/o;
 
-    if-ne p0, v0, :cond_1
+    if-ne p0, v0, :cond_0
 
     const/4 p0, -0x1
 
     return p0
 
-    :cond_1
-    if-nez p0, :cond_2
+    :cond_0
+    if-nez p0, :cond_1
 
     const/4 p0, 0x0
 
     return p0
 
-    :cond_2
+    :cond_1
     check-cast p0, Lkotlinx/coroutines/c/a$b;
 
-    iget v0, p0, Lkotlinx/coroutines/c/a$b;->bUj:I
+    iget v0, p0, Lkotlinx/coroutines/c/a$b;->indexInArray:I
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_2
 
     return v0
+
+    :cond_2
+    iget-object p0, p0, Lkotlinx/coroutines/c/a$b;->nextParkedWorker:Ljava/lang/Object;
+
+    goto :goto_0
 .end method
 
 .method public static final synthetic a(Lkotlinx/coroutines/c/a;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bUe:Ljava/lang/String;
+    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bTH:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -813,7 +819,7 @@
 
     new-instance v0, Lkotlinx/coroutines/c/i;
 
-    sget-object v1, Lkotlinx/coroutines/c/l;->bUW:Lkotlinx/coroutines/c/m;
+    sget-object v1, Lkotlinx/coroutines/c/l;->bUt:Lkotlinx/coroutines/c/m;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/c/m;->nanoTime()J
 
@@ -827,7 +833,7 @@
 .method public static synthetic a(Lkotlinx/coroutines/c/a;Ljava/lang/Runnable;)V
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/c/h;->bUL:Lkotlinx/coroutines/c/h;
+    sget-object v0, Lkotlinx/coroutines/c/h;->bUi:Lkotlinx/coroutines/c/h;
 
     check-cast v0, Lkotlinx/coroutines/c/j;
 
@@ -841,14 +847,14 @@
 .method public static final synthetic a(Lkotlinx/coroutines/c/a;Lkotlinx/coroutines/c/a$b;)V
     .locals 8
 
-    iget-object v0, p1, Lkotlinx/coroutines/c/a$b;->bUp:Ljava/lang/Object;
+    iget-object v0, p1, Lkotlinx/coroutines/c/a$b;->nextParkedWorker:Ljava/lang/Object;
 
-    sget-object v1, Lkotlinx/coroutines/c/a;->bUh:Lkotlinx/coroutines/a/o;
+    sget-object v1, Lkotlinx/coroutines/c/a;->bTK:Lkotlinx/coroutines/a/o;
 
     if-ne v0, v1, :cond_4
 
     :cond_0
-    iget-wide v4, p0, Lkotlinx/coroutines/c/a;->bTU:J
+    iget-wide v4, p0, Lkotlinx/coroutines/c/a;->parkedWorkersStack:J
 
     const-wide/32 v0, 0x1fffff
 
@@ -864,7 +870,7 @@
 
     and-long/2addr v1, v6
 
-    iget v3, p1, Lkotlinx/coroutines/c/a$b;->bUj:I
+    iget v3, p1, Lkotlinx/coroutines/c/a$b;->indexInArray:I
 
     if-eqz v3, :cond_1
 
@@ -897,13 +903,13 @@
 
     :cond_3
     :goto_1
-    iget-object v6, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v6, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     aget-object v0, v6, v0
 
-    iput-object v0, p1, Lkotlinx/coroutines/c/a$b;->bUp:Ljava/lang/Object;
+    iput-object v0, p1, Lkotlinx/coroutines/c/a$b;->nextParkedWorker:Ljava/lang/Object;
 
-    sget-object v0, Lkotlinx/coroutines/c/a;->bTV:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/a;->bTA:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     int-to-long v6, v3
 
@@ -928,7 +934,7 @@
 
     :cond_0
     :goto_0
-    iget-wide v2, p0, Lkotlinx/coroutines/c/a;->bTU:J
+    iget-wide v2, p0, Lkotlinx/coroutines/c/a;->parkedWorkersStack:J
 
     const-wide/32 v0, 0x1fffff
 
@@ -961,7 +967,7 @@
     :goto_1
     if-ltz v0, :cond_0
 
-    sget-object v1, Lkotlinx/coroutines/c/a;->bTV:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/c/a;->bTA:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     int-to-long v6, v0
 
@@ -992,7 +998,7 @@
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
 
     return-void
 
@@ -1021,12 +1027,12 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
 
     return-void
 
     :goto_0
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
 
     throw p0
 .end method
@@ -1034,7 +1040,7 @@
 .method public static final synthetic b(Lkotlinx/coroutines/c/a;)Ljava/util/concurrent/Semaphore;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bTT:Ljava/util/concurrent/Semaphore;
+    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bTz:Ljava/util/concurrent/Semaphore;
 
     return-object p0
 .end method
@@ -1060,7 +1066,7 @@
 .method public static final synthetic d(Lkotlinx/coroutines/c/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GA()V
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->Gz()V
 
     return-void
 .end method
@@ -1068,7 +1074,7 @@
 .method public static final synthetic e(Lkotlinx/coroutines/c/a;)J
     .locals 2
 
-    iget-wide v0, p0, Lkotlinx/coroutines/c/a;->bUd:J
+    iget-wide v0, p0, Lkotlinx/coroutines/c/a;->bTG:J
 
     return-wide v0
 .end method
@@ -1076,7 +1082,7 @@
 .method public static final synthetic f(Lkotlinx/coroutines/c/a;)[Lkotlinx/coroutines/c/a$b;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     return-object p0
 .end method
@@ -1084,7 +1090,7 @@
 .method public static final synthetic g(Lkotlinx/coroutines/c/a;)I
     .locals 4
 
-    iget-wide v0, p0, Lkotlinx/coroutines/c/a;->bTX:J
+    iget-wide v0, p0, Lkotlinx/coroutines/c/a;->controlState:J
 
     const-wide/32 v2, 0x1fffff
 
@@ -1098,7 +1104,7 @@
 .method public static final synthetic h(Lkotlinx/coroutines/c/a;)I
     .locals 0
 
-    iget p0, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget p0, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     return p0
 .end method
@@ -1106,7 +1112,7 @@
 .method public static final synthetic i(Lkotlinx/coroutines/c/a;)Lkotlinx/coroutines/c/e;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object p0, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
     return-object p0
 .end method
@@ -1114,7 +1120,7 @@
 .method private final isTerminated()Z
     .locals 1
 
-    iget v0, p0, Lkotlinx/coroutines/c/a;->bTZ:I
+    iget v0, p0, Lkotlinx/coroutines/c/a;->_isTerminated:I
 
     if-eqz v0, :cond_0
 
@@ -1149,7 +1155,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
 
     invoke-static {p1, p2}, Lkotlinx/coroutines/c/a;->a(Ljava/lang/Runnable;Lkotlinx/coroutines/c/j;)Lkotlinx/coroutines/c/i;
 
@@ -1176,13 +1182,12 @@
 
     if-nez p2, :cond_1
 
-    :goto_0
     const/4 v1, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_1
-    iget-object v3, p2, Lkotlinx/coroutines/c/a$b;->bUv:Lkotlinx/coroutines/c/a;
+    iget-object v3, p2, Lkotlinx/coroutines/c/a$b;->bTT:Lkotlinx/coroutines/c/a;
 
     move-object v4, p0
 
@@ -1190,107 +1195,113 @@
 
     if-eq v3, v4, :cond_2
 
-    goto :goto_0
+    const/4 v1, 0x1
+
+    goto :goto_3
 
     :cond_2
-    iget-object v3, p2, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v3, p2, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v4, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     if-ne v3, v4, :cond_3
 
-    goto :goto_0
+    const/4 v1, 0x1
+
+    goto :goto_3
 
     :cond_3
-    invoke-virtual {p1}, Lkotlinx/coroutines/c/i;->GT()Lkotlinx/coroutines/c/k;
+    invoke-virtual {p1}, Lkotlinx/coroutines/c/i;->GS()Lkotlinx/coroutines/c/k;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/c/k;->bUP:Lkotlinx/coroutines/c/k;
+    sget-object v4, Lkotlinx/coroutines/c/k;->bUm:Lkotlinx/coroutines/c/k;
 
     if-ne v3, v4, :cond_6
 
-    iget-object v3, p2, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v3, p2, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/c/a$c;->bUx:Lkotlinx/coroutines/c/a$c;
+    sget-object v4, Lkotlinx/coroutines/c/a$c;->bTV:Lkotlinx/coroutines/c/a$c;
 
     if-ne v3, v4, :cond_4
 
     const/4 v3, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_4
     const/4 v3, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz v3, :cond_5
 
     const/4 v3, 0x0
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
-    invoke-virtual {p2}, Lkotlinx/coroutines/c/a$b;->GI()Z
+    invoke-virtual {p2}, Lkotlinx/coroutines/c/a$b;->GH()Z
 
     move-result v3
 
     if-nez v3, :cond_6
 
-    goto :goto_0
+    const/4 v1, 0x1
+
+    goto :goto_3
 
     :cond_6
     const/4 v3, -0x1
 
-    :goto_2
+    :goto_1
     if-eqz p3, :cond_7
 
-    iget-object p3, p2, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object p3, p2, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
     invoke-virtual {p3, p1, v4}, Lkotlinx/coroutines/c/n;->b(Lkotlinx/coroutines/c/i;Lkotlinx/coroutines/c/e;)Z
 
     move-result p3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
-    iget-object p3, p2, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object p3, p2, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    iget-object v4, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object v4, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
     invoke-virtual {p3, p1, v4}, Lkotlinx/coroutines/c/n;->a(Lkotlinx/coroutines/c/i;Lkotlinx/coroutines/c/e;)Z
 
     move-result p3
 
-    :goto_3
+    :goto_2
     if-eqz p3, :cond_8
 
-    iget-object p2, p2, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object p2, p2, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    invoke-virtual {p2}, Lkotlinx/coroutines/c/n;->GV()I
+    invoke-virtual {p2}, Lkotlinx/coroutines/c/n;->GU()I
 
     move-result p2
 
-    sget p3, Lkotlinx/coroutines/c/l;->bUT:I
+    sget p3, Lkotlinx/coroutines/c/l;->bUq:I
 
     if-gt p2, p3, :cond_8
 
     move v1, v3
 
     :cond_8
-    :goto_4
+    :goto_3
     if-eq v1, v0, :cond_b
 
     if-eq v1, v2, :cond_9
 
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GA()V
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->Gz()V
 
     return-void
 
     :cond_9
-    iget-object p2, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object p2, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
     invoke-virtual {p2, p1}, Lkotlinx/coroutines/c/e;->c(Lkotlinx/coroutines/c/i;)Z
 
@@ -1298,7 +1309,7 @@
 
     if-eqz p1, :cond_a
 
-    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->GA()V
+    invoke-direct {p0}, Lkotlinx/coroutines/c/a;->Gz()V
 
     return-void
 
@@ -1309,7 +1320,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object p3, p0, Lkotlinx/coroutines/c/a;->bUe:Ljava/lang/String;
+    iget-object p3, p0, Lkotlinx/coroutines/c/a;->bTH:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1334,7 +1345,7 @@
 .method public final close()V
     .locals 8
 
-    sget-object v0, Lkotlinx/coroutines/c/a;->bUa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/a;->bTD:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -1359,12 +1370,12 @@
     :cond_0
     check-cast v0, Lkotlinx/coroutines/c/a$b;
 
-    iget-object v3, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     monitor-enter v3
 
     :try_start_0
-    iget-wide v4, p0, Lkotlinx/coroutines/c/a;->bTX:J
+    iget-wide v4, p0, Lkotlinx/coroutines/c/a;->controlState:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1381,13 +1392,13 @@
     const/4 v3, 0x1
 
     :goto_0
-    iget-object v5, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v5, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     aget-object v5, v5, v3
 
     if-nez v5, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     if-eq v5, v0, :cond_5
@@ -1412,9 +1423,9 @@
     goto :goto_1
 
     :cond_2
-    iget-object v6, v5, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v6, v5, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
-    sget-object v7, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v7, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     if-ne v6, v7, :cond_3
 
@@ -1428,9 +1439,9 @@
     :goto_2
     if-eqz v7, :cond_4
 
-    iget-object v5, v5, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v5, v5, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    iget-object v6, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object v6, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
     invoke-virtual {v5, v6}, Lkotlinx/coroutines/c/n;->b(Lkotlinx/coroutines/c/e;)V
 
@@ -1468,9 +1479,9 @@
     goto :goto_0
 
     :cond_6
-    iget-object v3, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
-    invoke-static {}, Lkotlinx/coroutines/c/l;->GU()Lkotlinx/coroutines/c/i;
+    invoke-static {}, Lkotlinx/coroutines/c/l;->GT()Lkotlinx/coroutines/c/i;
 
     move-result-object v4
 
@@ -1483,16 +1494,16 @@
     :goto_4
     if-eqz v0, :cond_7
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GL()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/c/a$b;->GK()Lkotlinx/coroutines/c/i;
 
     move-result-object v3
 
     if-nez v3, :cond_8
 
     :cond_7
-    iget-object v3, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object v3, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/c/e;->GP()Lkotlinx/coroutines/c/i;
+    invoke-virtual {v3}, Lkotlinx/coroutines/c/e;->GO()Lkotlinx/coroutines/c/i;
 
     move-result-object v3
 
@@ -1501,18 +1512,18 @@
 
     if-eqz v0, :cond_9
 
-    sget-object v3, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v3, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {v0, v3}, Lkotlinx/coroutines/c/a$b;->a(Lkotlinx/coroutines/c/a$c;)Z
 
     :cond_9
-    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTT:Ljava/util/concurrent/Semaphore;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTz:Ljava/util/concurrent/Semaphore;
 
     invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
 
     move-result v0
 
-    iget v3, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget v3, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     if-ne v0, v3, :cond_a
 
@@ -1542,9 +1553,9 @@
     :goto_5
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->bTU:J
+    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->parkedWorkersStack:J
 
-    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->bTX:J
+    iput-wide v0, p0, Lkotlinx/coroutines/c/a;->controlState:J
 
     goto :goto_6
 
@@ -1599,7 +1610,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/a;->bTW:[Lkotlinx/coroutines/c/a$b;
+    iget-object v1, p0, Lkotlinx/coroutines/c/a;->bTB:[Lkotlinx/coroutines/c/a$b;
 
     array-length v2, v1
 
@@ -1622,13 +1633,13 @@
 
     if-eqz v9, :cond_1
 
-    iget-object v10, v9, Lkotlinx/coroutines/c/a$b;->bUk:Lkotlinx/coroutines/c/n;
+    iget-object v10, v9, Lkotlinx/coroutines/c/a$b;->bTM:Lkotlinx/coroutines/c/n;
 
-    iget-object v11, v10, Lkotlinx/coroutines/c/n;->bVa:Ljava/lang/Object;
+    iget-object v11, v10, Lkotlinx/coroutines/c/n;->lastScheduledTask:Ljava/lang/Object;
 
     if-eqz v11, :cond_0
 
-    invoke-virtual {v10}, Lkotlinx/coroutines/c/n;->GV()I
+    invoke-virtual {v10}, Lkotlinx/coroutines/c/n;->GU()I
 
     move-result v10
 
@@ -1637,12 +1648,12 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v10}, Lkotlinx/coroutines/c/n;->GV()I
+    invoke-virtual {v10}, Lkotlinx/coroutines/c/n;->GU()I
 
     move-result v10
 
     :goto_1
-    iget-object v9, v9, Lkotlinx/coroutines/c/a$b;->bUl:Lkotlinx/coroutines/c/a$c;
+    iget-object v9, v9, Lkotlinx/coroutines/c/a$b;->state:Lkotlinx/coroutines/c/a$c;
 
     sget-object v11, Lkotlinx/coroutines/c/b;->$EnumSwitchMapping$0:[I
 
@@ -1654,12 +1665,12 @@
 
     packed-switch v9, :pswitch_data_0
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_0
     add-int/lit8 v8, v8, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_1
     add-int/lit8 v7, v7, 0x1
@@ -1682,6 +1693,14 @@
 
     const-string v10, "r"
 
+    invoke-virtual {v11, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-interface {v9, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
     goto :goto_2
 
     :pswitch_2
@@ -1703,6 +1722,14 @@
 
     const-string v10, "c"
 
+    invoke-virtual {v11, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-interface {v9, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
     goto :goto_2
 
     :pswitch_3
@@ -1724,7 +1751,6 @@
 
     const-string v10, "b"
 
-    :goto_2
     invoke-virtual {v11, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -1733,25 +1759,25 @@
 
     invoke-interface {v9, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_4
     add-int/lit8 v6, v6, 0x1
 
     :cond_1
-    :goto_3
+    :goto_2
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :cond_2
-    iget-wide v1, p0, Lkotlinx/coroutines/c/a;->bTX:J
+    iget-wide v1, p0, Lkotlinx/coroutines/c/a;->controlState:J
 
     new-instance v3, Ljava/lang/StringBuilder;
 
     invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v9, p0, Lkotlinx/coroutines/c/a;->bUe:Ljava/lang/String;
+    iget-object v9, p0, Lkotlinx/coroutines/c/a;->bTH:Ljava/lang/String;
 
     invoke-virtual {v3, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1759,7 +1785,7 @@
 
     invoke-virtual {v3, v9}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bI(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bI(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v9
 
@@ -1773,7 +1799,7 @@
 
     invoke-virtual {v3, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v9, p0, Lkotlinx/coroutines/c/a;->bUb:I
+    iget v9, p0, Lkotlinx/coroutines/c/a;->bTE:I
 
     invoke-virtual {v3, v9}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1781,7 +1807,7 @@
 
     invoke-virtual {v3, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v9, p0, Lkotlinx/coroutines/c/a;->bUc:I
+    iget v9, p0, Lkotlinx/coroutines/c/a;->bTF:I
 
     invoke-virtual {v3, v9}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1825,7 +1851,7 @@
 
     invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTS:Lkotlinx/coroutines/c/e;
+    iget-object v0, p0, Lkotlinx/coroutines/c/a;->bTy:Lkotlinx/coroutines/c/e;
 
     invoke-virtual {v0}, Lkotlinx/coroutines/c/e;->getSize()I
 
@@ -1875,8 +1901,6 @@
 
     return-object v0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_4
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/b.smali
index 527334e061..21bb66e5bc 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/b.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lkotlinx/coroutines/c/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUy:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTW:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/c/a$c;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lkotlinx/coroutines/c/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUx:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTV:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/c/a$c;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lkotlinx/coroutines/c/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUw:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTU:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/c/a$c;->ordinal()I
 
@@ -56,7 +56,7 @@
 
     sget-object v0, Lkotlinx/coroutines/c/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUz:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTX:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/c/a$c;->ordinal()I
 
@@ -68,7 +68,7 @@
 
     sget-object v0, Lkotlinx/coroutines/c/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/c/a$c;->bUA:Lkotlinx/coroutines/c/a$c;
+    sget-object v1, Lkotlinx/coroutines/c/a$c;->bTY:Lkotlinx/coroutines/c/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/c/a$c;->ordinal()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/c.smali
index c5eddba491..1685469b04 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/c.smali
@@ -1,11 +1,12 @@
 .class public final Lkotlinx/coroutines/c/c;
 .super Lkotlinx/coroutines/c/d;
+.source "Dispatcher.kt"
 
 
 # static fields
-.field private static final bSf:Lkotlinx/coroutines/k;
+.field private static final bSb:Lkotlinx/coroutines/k;
 
-.field public static final bUC:Lkotlinx/coroutines/c/c;
+.field public static final bUa:Lkotlinx/coroutines/c/c;
 
 
 # direct methods
@@ -16,11 +17,11 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/c/c;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/c/c;->bUC:Lkotlinx/coroutines/c/c;
+    sput-object v0, Lkotlinx/coroutines/c/c;->bUa:Lkotlinx/coroutines/c/c;
 
     const-string v1, "kotlinx.coroutines.io.parallelism"
 
-    invoke-static {}, Lkotlinx/coroutines/a/p;->Gw()I
+    invoke-static {}, Lkotlinx/coroutines/a/p;->Gv()I
 
     move-result v2
 
@@ -47,13 +48,13 @@
 
     new-instance v2, Lkotlinx/coroutines/c/f;
 
-    sget-object v3, Lkotlinx/coroutines/c/k;->bUQ:Lkotlinx/coroutines/c/k;
+    sget-object v3, Lkotlinx/coroutines/c/k;->bUn:Lkotlinx/coroutines/c/k;
 
     invoke-direct {v2, v0, v1, v3}, Lkotlinx/coroutines/c/f;-><init>(Lkotlinx/coroutines/c/d;ILkotlinx/coroutines/c/k;)V
 
     check-cast v2, Lkotlinx/coroutines/k;
 
-    sput-object v2, Lkotlinx/coroutines/c/c;->bSf:Lkotlinx/coroutines/k;
+    sput-object v2, Lkotlinx/coroutines/c/c;->bSb:Lkotlinx/coroutines/k;
 
     return-void
 
@@ -89,10 +90,10 @@
     return-void
 .end method
 
-.method public static GO()Lkotlinx/coroutines/k;
+.method public static GN()Lkotlinx/coroutines/k;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/c/c;->bSf:Lkotlinx/coroutines/k;
+    sget-object v0, Lkotlinx/coroutines/c/c;->bSb:Lkotlinx/coroutines/k;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/d.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/d.smali
index 4d4a8baf08..eb0f4fc602 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/d.smali
@@ -1,15 +1,16 @@
 .class public Lkotlinx/coroutines/c/d;
-.super Lkotlinx/coroutines/ag;
+.super Lkotlinx/coroutines/af;
+.source "Dispatcher.kt"
 
 
 # instance fields
-.field private bUD:Lkotlinx/coroutines/c/a;
+.field private final bTE:I
 
-.field private final bUb:I
+.field private final bTF:I
 
-.field private final bUc:I
+.field private final bTG:J
 
-.field private final bUd:J
+.field private bUb:Lkotlinx/coroutines/c/a;
 
 
 # direct methods
@@ -28,7 +29,7 @@
 .method private constructor <init>(II)V
     .locals 2
 
-    sget-wide v0, Lkotlinx/coroutines/c/l;->bUV:J
+    sget-wide v0, Lkotlinx/coroutines/c/l;->bUs:J
 
     invoke-direct {p0, p1, p2, v0, v1}, Lkotlinx/coroutines/c/d;-><init>(IIJ)V
 
@@ -38,25 +39,25 @@
 .method private constructor <init>(IIJ)V
     .locals 2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ag;-><init>()V
+    invoke-direct {p0}, Lkotlinx/coroutines/af;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/c/d;->bUb:I
+    iput p1, p0, Lkotlinx/coroutines/c/d;->bTE:I
 
-    iput p2, p0, Lkotlinx/coroutines/c/d;->bUc:I
+    iput p2, p0, Lkotlinx/coroutines/c/d;->bTF:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/c/d;->bUd:J
+    iput-wide p3, p0, Lkotlinx/coroutines/c/d;->bTG:J
 
     new-instance p1, Lkotlinx/coroutines/c/a;
 
-    iget p2, p0, Lkotlinx/coroutines/c/d;->bUb:I
+    iget p2, p0, Lkotlinx/coroutines/c/d;->bTE:I
 
-    iget p3, p0, Lkotlinx/coroutines/c/d;->bUc:I
+    iget p3, p0, Lkotlinx/coroutines/c/d;->bTF:I
 
-    iget-wide v0, p0, Lkotlinx/coroutines/c/d;->bUd:J
+    iget-wide v0, p0, Lkotlinx/coroutines/c/d;->bTG:J
 
     invoke-direct {p1, p2, p3, v0, v1}, Lkotlinx/coroutines/c/a;-><init>(IIJ)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/d;->bUD:Lkotlinx/coroutines/c/a;
+    iput-object p1, p0, Lkotlinx/coroutines/c/d;->bUb:Lkotlinx/coroutines/c/a;
 
     return-void
 .end method
@@ -75,7 +76,7 @@
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/c/d;->bUD:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/d;->bUb:Lkotlinx/coroutines/c/a;
 
     invoke-static {v0, p2}, Lkotlinx/coroutines/c/a;->a(Lkotlinx/coroutines/c/a;Ljava/lang/Runnable;)V
     :try_end_0
@@ -84,9 +85,9 @@
     return-void
 
     :catch_0
-    sget-object v0, Lkotlinx/coroutines/u;->bRV:Lkotlinx/coroutines/u;
+    sget-object v0, Lkotlinx/coroutines/t;->bRS:Lkotlinx/coroutines/t;
 
-    invoke-virtual {v0, p1, p2}, Lkotlinx/coroutines/u;->a(Lkotlin/c/e;Ljava/lang/Runnable;)V
+    invoke-virtual {v0, p1, p2}, Lkotlinx/coroutines/t;->a(Lkotlin/c/e;Ljava/lang/Runnable;)V
 
     return-void
 .end method
@@ -103,7 +104,7 @@
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/c/d;->bUD:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/d;->bUb:Lkotlinx/coroutines/c/a;
 
     invoke-virtual {v0, p1, p2, p3}, Lkotlinx/coroutines/c/a;->a(Ljava/lang/Runnable;Lkotlinx/coroutines/c/j;Z)V
     :try_end_0
@@ -112,7 +113,7 @@
     return-void
 
     :catch_0
-    sget-object p3, Lkotlinx/coroutines/u;->bRV:Lkotlinx/coroutines/u;
+    sget-object p3, Lkotlinx/coroutines/t;->bRS:Lkotlinx/coroutines/t;
 
     invoke-static {p1, p2}, Lkotlinx/coroutines/c/a;->a(Ljava/lang/Runnable;Lkotlinx/coroutines/c/j;)Lkotlinx/coroutines/c/i;
 
@@ -120,7 +121,7 @@
 
     check-cast p1, Ljava/lang/Runnable;
 
-    invoke-virtual {p3, p1}, Lkotlinx/coroutines/u;->n(Ljava/lang/Runnable;)V
+    invoke-virtual {p3, p1}, Lkotlinx/coroutines/t;->n(Ljava/lang/Runnable;)V
 
     return-void
 .end method
@@ -128,7 +129,7 @@
 .method public close()V
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/d;->bUD:Lkotlinx/coroutines/c/a;
+    iget-object v0, p0, Lkotlinx/coroutines/c/d;->bUb:Lkotlinx/coroutines/c/a;
 
     invoke-virtual {v0}, Lkotlinx/coroutines/c/a;->close()V
 
@@ -142,7 +143,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-super {p0}, Lkotlinx/coroutines/ag;->toString()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/af;->toString()Ljava/lang/String;
 
     move-result-object v1
 
@@ -152,7 +153,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/d;->bUD:Lkotlinx/coroutines/c/a;
+    iget-object v1, p0, Lkotlinx/coroutines/c/d;->bUb:Lkotlinx/coroutines/c/a;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/e.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/e.smali
index 620bbadd0e..acb2b47bf6 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/e.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/e.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/c/e;
 .super Lkotlinx/coroutines/a/j;
+.source "Tasks.kt"
 
 
 # annotations
@@ -23,15 +24,15 @@
 
 
 # virtual methods
-.method public final GP()Lkotlinx/coroutines/c/i;
+.method public final GO()Lkotlinx/coroutines/c/i;
     .locals 5
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/j;->bTr:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/j;->head:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/a/k;
 
-    iget-object v1, v0, Lkotlinx/coroutines/a/k;->bTv:Ljava/lang/Object;
+    iget-object v1, v0, Lkotlinx/coroutines/a/k;->next:Ljava/lang/Object;
 
     check-cast v1, Lkotlinx/coroutines/a/k;
 
@@ -46,7 +47,7 @@
 
     check-cast v3, Lkotlinx/coroutines/c/i;
 
-    invoke-static {}, Lkotlinx/coroutines/c/l;->GU()Lkotlinx/coroutines/c/i;
+    invoke-static {}, Lkotlinx/coroutines/c/l;->GT()Lkotlinx/coroutines/c/i;
 
     move-result-object v4
 
@@ -79,15 +80,15 @@
     return-object v2
 .end method
 
-.method public final GQ()Lkotlinx/coroutines/c/i;
+.method public final GP()Lkotlinx/coroutines/c/i;
     .locals 5
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/j;->bTr:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/j;->head:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/a/k;
 
-    iget-object v1, v0, Lkotlinx/coroutines/a/k;->bTv:Ljava/lang/Object;
+    iget-object v1, v0, Lkotlinx/coroutines/a/k;->next:Ljava/lang/Object;
 
     check-cast v1, Lkotlinx/coroutines/a/k;
 
@@ -102,11 +103,11 @@
 
     check-cast v3, Lkotlinx/coroutines/c/i;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GT()Lkotlinx/coroutines/c/k;
+    invoke-virtual {v3}, Lkotlinx/coroutines/c/i;->GS()Lkotlinx/coroutines/c/k;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/c/k;->bUQ:Lkotlinx/coroutines/c/k;
+    sget-object v4, Lkotlinx/coroutines/c/k;->bUn:Lkotlinx/coroutines/c/k;
 
     if-ne v3, v4, :cond_2
 
@@ -146,11 +147,11 @@
 
     :cond_0
     :goto_0
-    iget-object v0, p0, Lkotlinx/coroutines/a/j;->bTt:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/a/j;->tail:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/a/k;
 
-    iget-object v1, v0, Lkotlinx/coroutines/a/k;->bTv:Ljava/lang/Object;
+    iget-object v1, v0, Lkotlinx/coroutines/a/k;->next:Ljava/lang/Object;
 
     check-cast v1, Lkotlinx/coroutines/a/k;
 
@@ -161,13 +162,13 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/c/l;->GU()Lkotlinx/coroutines/c/i;
+    invoke-static {}, Lkotlinx/coroutines/c/l;->GT()Lkotlinx/coroutines/c/i;
 
     move-result-object v1
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eq v0, v1, :cond_2
 
@@ -181,24 +182,24 @@
     :goto_1
     if-nez v1, :cond_3
 
-    return v2
+    return v3
 
     :cond_3
     move-object v1, p1
 
     check-cast v1, Lkotlinx/coroutines/a/k;
 
-    sget-object v2, Lkotlinx/coroutines/a/k;->bTw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/a/k;->bTd:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v4, 0x0
 
-    invoke-virtual {v2, v0, v4, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {v3, v0, v4, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_0
+    if-eqz v3, :cond_0
 
     invoke-virtual {p0, v0, v1}, Lkotlinx/coroutines/a/j;->b(Lkotlinx/coroutines/a/k;Lkotlinx/coroutines/a/k;)Z
 
-    return v3
+    return v2
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/f.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/f.smali
index bcf5a1d696..b8caee64cb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/f.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/f.smali
@@ -1,5 +1,6 @@
 .class final Lkotlinx/coroutines/c/f;
-.super Lkotlinx/coroutines/ag;
+.super Lkotlinx/coroutines/af;
+.source "Dispatcher.kt"
 
 # interfaces
 .implements Ljava/util/concurrent/Executor;
@@ -7,11 +8,11 @@
 
 
 # static fields
-.field private static final bUG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bUd:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -21,13 +22,13 @@
     .end annotation
 .end field
 
-.field private volatile bUF:I
+.field private final bUe:Lkotlinx/coroutines/c/d;
 
-.field private final bUH:Lkotlinx/coroutines/c/d;
+.field private final bUf:I
 
-.field private final bUI:I
+.field private final bUg:Lkotlinx/coroutines/c/k;
 
-.field private final bUJ:Lkotlinx/coroutines/c/k;
+.field private volatile inFlightTasks:I
 
 
 # direct methods
@@ -36,13 +37,13 @@
 
     const-class v0, Lkotlinx/coroutines/c/f;
 
-    const-string v1, "bUF"
+    const-string v1, "inFlightTasks"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/f;->bUG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/f;->bUd:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -58,23 +59,23 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ag;-><init>()V
+    invoke-direct {p0}, Lkotlinx/coroutines/af;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/f;->bUH:Lkotlinx/coroutines/c/d;
+    iput-object p1, p0, Lkotlinx/coroutines/c/f;->bUe:Lkotlinx/coroutines/c/d;
 
-    iput p2, p0, Lkotlinx/coroutines/c/f;->bUI:I
+    iput p2, p0, Lkotlinx/coroutines/c/f;->bUf:I
 
-    iput-object p3, p0, Lkotlinx/coroutines/c/f;->bUJ:Lkotlinx/coroutines/c/k;
+    iput-object p3, p0, Lkotlinx/coroutines/c/f;->bUg:Lkotlinx/coroutines/c/k;
 
     new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/f;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lkotlinx/coroutines/c/f;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lkotlinx/coroutines/c/f;->bUF:I
+    iput p1, p0, Lkotlinx/coroutines/c/f;->inFlightTasks:I
 
     return-void
 .end method
@@ -83,17 +84,17 @@
     .locals 2
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/c/f;->bUG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/f;->bUd: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/c/f;->bUI:I
+    iget v1, p0, Lkotlinx/coroutines/c/f;->bUf:I
 
     if-gt v0, v1, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUH:Lkotlinx/coroutines/c/d;
+    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUe:Lkotlinx/coroutines/c/d;
 
     move-object v1, p0
 
@@ -104,24 +105,24 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
 
-    sget-object p1, Lkotlinx/coroutines/c/f;->bUG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/c/f;->bUd: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/c/f;->bUI:I
+    iget v0, p0, Lkotlinx/coroutines/c/f;->bUf:I
 
     if-lt p1, v0, :cond_2
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lkotlinx/coroutines/c/f;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lkotlinx/coroutines/c/f;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -136,10 +137,10 @@
 
 
 # virtual methods
-.method public final GR()V
+.method public final GQ()V
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -151,7 +152,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/f;->bUH:Lkotlinx/coroutines/c/d;
+    iget-object v2, p0, Lkotlinx/coroutines/c/f;->bUe:Lkotlinx/coroutines/c/d;
 
     move-object v3, p0
 
@@ -162,11 +163,11 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/c/f;->bUG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/f;->bUd: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/c/f;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -184,10 +185,10 @@
     return-void
 .end method
 
-.method public final GS()Lkotlinx/coroutines/c/k;
+.method public final GR()Lkotlinx/coroutines/c/k;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUJ:Lkotlinx/coroutines/c/k;
+    iget-object v0, p0, Lkotlinx/coroutines/c/f;->bUg:Lkotlinx/coroutines/c/k;
 
     return-object v0
 .end method
@@ -249,7 +250,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-super {p0}, Lkotlinx/coroutines/ag;->toString()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/af;->toString()Ljava/lang/String;
 
     move-result-object v1
 
@@ -259,7 +260,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/f;->bUH:Lkotlinx/coroutines/c/d;
+    iget-object v1, p0, Lkotlinx/coroutines/c/f;->bUe:Lkotlinx/coroutines/c/d;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/g.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/g.smali
index f6f5b8c8d1..11492c14cb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/g.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/g.smali
@@ -1,9 +1,10 @@
 .class public final Lkotlinx/coroutines/c/g;
 .super Lkotlinx/coroutines/c/m;
+.source "Tasks.kt"
 
 
 # static fields
-.field public static final bUK:Lkotlinx/coroutines/c/g;
+.field public static final bUh:Lkotlinx/coroutines/c/g;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/c/g;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/c/g;->bUK:Lkotlinx/coroutines/c/g;
+    sput-object v0, Lkotlinx/coroutines/c/g;->bUh:Lkotlinx/coroutines/c/g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/h.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/h.smali
index 37283a822e..51d1cf9658 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/h.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/h.smali
@@ -1,14 +1,15 @@
 .class public final Lkotlinx/coroutines/c/h;
 .super Ljava/lang/Object;
+.source "Tasks.kt"
 
 # interfaces
 .implements Lkotlinx/coroutines/c/j;
 
 
 # static fields
-.field private static final bUJ:Lkotlinx/coroutines/c/k;
+.field private static final bUg:Lkotlinx/coroutines/c/k;
 
-.field public static final bUL:Lkotlinx/coroutines/c/h;
+.field public static final bUi:Lkotlinx/coroutines/c/h;
 
 
 # direct methods
@@ -19,11 +20,11 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/c/h;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/c/h;->bUL:Lkotlinx/coroutines/c/h;
+    sput-object v0, Lkotlinx/coroutines/c/h;->bUi:Lkotlinx/coroutines/c/h;
 
-    sget-object v0, Lkotlinx/coroutines/c/k;->bUP:Lkotlinx/coroutines/c/k;
+    sget-object v0, Lkotlinx/coroutines/c/k;->bUm:Lkotlinx/coroutines/c/k;
 
-    sput-object v0, Lkotlinx/coroutines/c/h;->bUJ:Lkotlinx/coroutines/c/k;
+    sput-object v0, Lkotlinx/coroutines/c/h;->bUg:Lkotlinx/coroutines/c/k;
 
     return-void
 .end method
@@ -38,16 +39,16 @@
 
 
 # virtual methods
-.method public final GR()V
+.method public final GQ()V
     .locals 0
 
     return-void
 .end method
 
-.method public final GS()Lkotlinx/coroutines/c/k;
+.method public final GR()Lkotlinx/coroutines/c/k;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/c/h;->bUJ:Lkotlinx/coroutines/c/k;
+    sget-object v0, Lkotlinx/coroutines/c/h;->bUg:Lkotlinx/coroutines/c/k;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/i.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/i.smali
index 24563ae2f4..e998fe91da 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/i.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/i.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/c/i;
 .super Lkotlinx/coroutines/a/k;
+.source "Tasks.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,11 +18,11 @@
 
 
 # instance fields
-.field public final bUM:Ljava/lang/Runnable;
+.field public final bUj:Ljava/lang/Runnable;
 
-.field public final bUN:J
+.field public final bUk:J
 
-.field public final bUO:Lkotlinx/coroutines/c/j;
+.field public final bUl:Lkotlinx/coroutines/c/j;
 
 
 # direct methods
@@ -38,23 +39,23 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/a/k;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/c/i;->bUM:Ljava/lang/Runnable;
+    iput-object p1, p0, Lkotlinx/coroutines/c/i;->bUj:Ljava/lang/Runnable;
 
-    iput-wide p2, p0, Lkotlinx/coroutines/c/i;->bUN:J
+    iput-wide p2, p0, Lkotlinx/coroutines/c/i;->bUk:J
 
-    iput-object p4, p0, Lkotlinx/coroutines/c/i;->bUO:Lkotlinx/coroutines/c/j;
+    iput-object p4, p0, Lkotlinx/coroutines/c/i;->bUl:Lkotlinx/coroutines/c/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GT()Lkotlinx/coroutines/c/k;
+.method public final GS()Lkotlinx/coroutines/c/k;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/i;->bUO:Lkotlinx/coroutines/c/j;
+    iget-object v0, p0, Lkotlinx/coroutines/c/i;->bUl:Lkotlinx/coroutines/c/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/c/j;->GS()Lkotlinx/coroutines/c/k;
+    invoke-interface {v0}, Lkotlinx/coroutines/c/j;->GR()Lkotlinx/coroutines/c/k;
 
     move-result-object v0
 
@@ -65,24 +66,24 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/c/i;->bUM:Ljava/lang/Runnable;
+    iget-object v0, p0, Lkotlinx/coroutines/c/i;->bUj: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/c/i;->bUO:Lkotlinx/coroutines/c/j;
+    iget-object v0, p0, Lkotlinx/coroutines/c/i;->bUl:Lkotlinx/coroutines/c/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/c/j;->GR()V
+    invoke-interface {v0}, Lkotlinx/coroutines/c/j;->GQ()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUO:Lkotlinx/coroutines/c/j;
+    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUl:Lkotlinx/coroutines/c/j;
 
-    invoke-interface {v1}, Lkotlinx/coroutines/c/j;->GR()V
+    invoke-interface {v1}, Lkotlinx/coroutines/c/j;->GQ()V
 
     throw v0
 .end method
@@ -96,9 +97,9 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUM:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUj:Ljava/lang/Runnable;
 
-    invoke-static {v1}, Lkotlinx/coroutines/t;->bJ(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1}, Lkotlinx/coroutines/s;->bJ(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -108,9 +109,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUM:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUj:Ljava/lang/Runnable;
 
-    invoke-static {v1}, Lkotlinx/coroutines/t;->bI(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1}, Lkotlinx/coroutines/s;->bI(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -120,7 +121,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-wide v1, p0, Lkotlinx/coroutines/c/i;->bUN:J
+    iget-wide v1, p0, Lkotlinx/coroutines/c/i;->bUk:J
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -128,7 +129,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUO:Lkotlinx/coroutines/c/j;
+    iget-object v1, p0, Lkotlinx/coroutines/c/i;->bUl:Lkotlinx/coroutines/c/j;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/j.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/j.smali
index a55b7e86ec..e607e186c9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/j.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/j.smali
@@ -1,10 +1,11 @@
 .class public interface abstract Lkotlinx/coroutines/c/j;
 .super Ljava/lang/Object;
+.source "Tasks.kt"
 
 
 # virtual methods
-.method public abstract GR()V
+.method public abstract GQ()V
 .end method
 
-.method public abstract GS()Lkotlinx/coroutines/c/k;
+.method public abstract GR()Lkotlinx/coroutines/c/k;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/k.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/k.smali
index 9376ef95a3..e146febe9f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/k.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/k.smali
@@ -1,5 +1,6 @@
 .class public final enum Lkotlinx/coroutines/c/k;
 .super Ljava/lang/Enum;
+.source "Tasks.kt"
 
 
 # annotations
@@ -13,11 +14,11 @@
 
 
 # static fields
-.field public static final enum bUP:Lkotlinx/coroutines/c/k;
+.field public static final enum bUm:Lkotlinx/coroutines/c/k;
 
-.field public static final enum bUQ:Lkotlinx/coroutines/c/k;
+.field public static final enum bUn:Lkotlinx/coroutines/c/k;
 
-.field private static final synthetic bUR:[Lkotlinx/coroutines/c/k;
+.field private static final synthetic bUo:[Lkotlinx/coroutines/c/k;
 
 
 # direct methods
@@ -36,7 +37,7 @@
 
     invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/c/k;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/c/k;->bUP:Lkotlinx/coroutines/c/k;
+    sput-object v1, Lkotlinx/coroutines/c/k;->bUm:Lkotlinx/coroutines/c/k;
 
     aput-object v1, v0, v3
 
@@ -48,11 +49,11 @@
 
     invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/c/k;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/c/k;->bUQ:Lkotlinx/coroutines/c/k;
+    sput-object v1, Lkotlinx/coroutines/c/k;->bUn:Lkotlinx/coroutines/c/k;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lkotlinx/coroutines/c/k;->bUR:[Lkotlinx/coroutines/c/k;
+    sput-object v0, Lkotlinx/coroutines/c/k;->bUo:[Lkotlinx/coroutines/c/k;
 
     return-void
 .end method
@@ -87,7 +88,7 @@
 .method public static values()[Lkotlinx/coroutines/c/k;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/c/k;->bUR:[Lkotlinx/coroutines/c/k;
+    sget-object v0, Lkotlinx/coroutines/c/k;->bUo:[Lkotlinx/coroutines/c/k;
 
     invoke-virtual {v0}, [Lkotlinx/coroutines/c/k;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/l$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/l$a.smali
index bc30e864e6..05908782b0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/l$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/l$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/c/l$a;
 .super Ljava/lang/Object;
+.source "Runnable.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/l.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/l.smali
index fc31b520a6..af85291b5d 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/l.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/l.smali
@@ -1,23 +1,24 @@
 .class public final Lkotlinx/coroutines/c/l;
 .super Ljava/lang/Object;
+.source "Tasks.kt"
 
 
 # static fields
 .field public static final CORE_POOL_SIZE:I
 
-.field public static final bUS:J
+.field public static final bUp:J
 
-.field public static final bUT:I
+.field public static final bUq:I
 
-.field public static final bUU:I
+.field public static final bUr:I
 
-.field public static final bUV:J
+.field public static final bUs:J
 
-.field public static bUW:Lkotlinx/coroutines/c/m;
+.field public static bUt:Lkotlinx/coroutines/c/m;
 
-.field private static final bUX:Ljava/lang/Runnable;
+.field private static final bUu:Ljava/lang/Runnable;
 
-.field private static final bUY:Lkotlinx/coroutines/c/i;
+.field private static final bUv:Lkotlinx/coroutines/c/i;
 
 .field public static final bg:I
 
@@ -34,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/c/l;->bUS:J
+    sput-wide v0, Lkotlinx/coroutines/c/l;->bUp:J
 
     const-string v0, "kotlinx.coroutines.scheduler.offload.threshold"
 
@@ -50,7 +51,7 @@
 
     move-result v0
 
-    sput v0, Lkotlinx/coroutines/c/l;->bUT:I
+    sput v0, Lkotlinx/coroutines/c/l;->bUq:I
 
     const-string v0, "kotlinx.coroutines.scheduler.blocking.parallelism"
 
@@ -62,11 +63,11 @@
 
     move-result v0
 
-    sput v0, Lkotlinx/coroutines/c/l;->bUU:I
+    sput v0, Lkotlinx/coroutines/c/l;->bUr:I
 
     const-string v0, "kotlinx.coroutines.scheduler.core.pool.size"
 
-    invoke-static {}, Lkotlinx/coroutines/a/p;->Gw()I
+    invoke-static {}, Lkotlinx/coroutines/a/p;->Gv()I
 
     move-result v4
 
@@ -88,7 +89,7 @@
 
     const-string v0, "kotlinx.coroutines.scheduler.max.pool.size"
 
-    invoke-static {}, Lkotlinx/coroutines/a/p;->Gw()I
+    invoke-static {}, Lkotlinx/coroutines/a/p;->Gv()I
 
     move-result v4
 
@@ -122,13 +123,13 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/c/l;->bUV:J
+    sput-wide v0, Lkotlinx/coroutines/c/l;->bUs:J
 
-    sget-object v0, Lkotlinx/coroutines/c/g;->bUK:Lkotlinx/coroutines/c/g;
+    sget-object v0, Lkotlinx/coroutines/c/g;->bUh:Lkotlinx/coroutines/c/g;
 
     check-cast v0, Lkotlinx/coroutines/c/m;
 
-    sput-object v0, Lkotlinx/coroutines/c/l;->bUW:Lkotlinx/coroutines/c/m;
+    sput-object v0, Lkotlinx/coroutines/c/l;->bUt:Lkotlinx/coroutines/c/m;
 
     new-instance v0, Lkotlinx/coroutines/c/l$a;
 
@@ -136,13 +137,13 @@
 
     check-cast v0, Ljava/lang/Runnable;
 
-    sput-object v0, Lkotlinx/coroutines/c/l;->bUX:Ljava/lang/Runnable;
+    sput-object v0, Lkotlinx/coroutines/c/l;->bUu:Ljava/lang/Runnable;
 
     new-instance v0, Lkotlinx/coroutines/c/i;
 
-    sget-object v1, Lkotlinx/coroutines/c/l;->bUX:Ljava/lang/Runnable;
+    sget-object v1, Lkotlinx/coroutines/c/l;->bUu:Ljava/lang/Runnable;
 
-    sget-object v2, Lkotlinx/coroutines/c/h;->bUL:Lkotlinx/coroutines/c/h;
+    sget-object v2, Lkotlinx/coroutines/c/h;->bUi:Lkotlinx/coroutines/c/h;
 
     check-cast v2, Lkotlinx/coroutines/c/j;
 
@@ -150,15 +151,15 @@
 
     invoke-direct {v0, v1, v3, v4, v2}, Lkotlinx/coroutines/c/i;-><init>(Ljava/lang/Runnable;JLkotlinx/coroutines/c/j;)V
 
-    sput-object v0, Lkotlinx/coroutines/c/l;->bUY:Lkotlinx/coroutines/c/i;
+    sput-object v0, Lkotlinx/coroutines/c/l;->bUv:Lkotlinx/coroutines/c/i;
 
     return-void
 .end method
 
-.method public static final GU()Lkotlinx/coroutines/c/i;
+.method public static final GT()Lkotlinx/coroutines/c/i;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/c/l;->bUY:Lkotlinx/coroutines/c/i;
+    sget-object v0, Lkotlinx/coroutines/c/l;->bUv:Lkotlinx/coroutines/c/i;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/m.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/m.smali
index 6acf31f3e6..11b162ac1a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/m.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlinx/coroutines/c/m;
 .super Ljava/lang/Object;
+.source "Tasks.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c/n.smali b/com.discord/smali_classes2/kotlinx/coroutines/c/n.smali
index 52f41d755c..705b10b449 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c/n.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c/n.smali
@@ -1,17 +1,18 @@
 .class public final Lkotlinx/coroutines/c/n;
 .super Ljava/lang/Object;
+.source "WorkQueue.kt"
 
 
 # static fields
-.field private static final bVb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bUx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final bVd:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bUy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field static final bVf:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bUz:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field private final bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -21,11 +22,11 @@
     .end annotation
 .end field
 
-.field volatile bVa:Ljava/lang/Object;
+.field volatile consumerIndex:I
 
-.field volatile bVc:I
+.field volatile lastScheduledTask:Ljava/lang/Object;
 
-.field volatile bVe:I
+.field volatile producerIndex:I
 
 
 # direct methods
@@ -36,33 +37,33 @@
 
     const-class v1, Ljava/lang/Object;
 
-    const-string v2, "bVa"
+    const-string v2, "lastScheduledTask"
 
     invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/n;->bVb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/n;->bUx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/c/n;
 
-    const-string v1, "bVc"
+    const-string v1, "producerIndex"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/n;->bVd:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/n;->bUy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const-class v0, Lkotlinx/coroutines/c/n;
 
-    const-string v1, "bVe"
+    const-string v1, "consumerIndex"
 
     invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/c/n;->bVf:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/c/n;->bUz:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -78,17 +79,17 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v0, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlinx/coroutines/c/n;->bVa:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/c/n;->lastScheduledTask:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lkotlinx/coroutines/c/n;->bVc:I
+    iput v0, p0, Lkotlinx/coroutines/c/n;->producerIndex:I
 
-    iput v0, p0, Lkotlinx/coroutines/c/n;->bVe:I
+    iput v0, p0, Lkotlinx/coroutines/c/n;->consumerIndex:I
 
     return-void
 .end method
@@ -96,7 +97,7 @@
 .method private final a(Lkotlinx/coroutines/c/e;)V
     .locals 7
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/c/n;->GV()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/c/n;->GU()I
 
     move-result v0
 
@@ -114,9 +115,9 @@
     if-ge v1, v0, :cond_3
 
     :cond_0
-    iget v2, p0, Lkotlinx/coroutines/c/n;->bVe:I
+    iget v2, p0, Lkotlinx/coroutines/c/n;->consumerIndex:I
 
-    iget v3, p0, Lkotlinx/coroutines/c/n;->bVc:I
+    iget v3, p0, Lkotlinx/coroutines/c/n;->producerIndex:I
 
     sub-int v3, v2, v3
 
@@ -129,7 +130,7 @@
     :cond_1
     and-int/lit8 v3, v2, 0x7f
 
-    iget-object v5, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v5, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v5, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -139,7 +140,7 @@
 
     if-eqz v5, :cond_0
 
-    sget-object v5, Lkotlinx/coroutines/c/n;->bVf:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/c/n;->bUz:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v6, v2, 0x1
 
@@ -149,7 +150,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v2, v3, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -205,7 +206,7 @@
 .method private final a(JLkotlinx/coroutines/c/n;Lkotlinx/coroutines/c/e;)Z
     .locals 5
 
-    iget-object v0, p3, Lkotlinx/coroutines/c/n;->bVa:Ljava/lang/Object;
+    iget-object v0, p3, Lkotlinx/coroutines/c/n;->lastScheduledTask:Ljava/lang/Object;
 
     check-cast v0, Lkotlinx/coroutines/c/i;
 
@@ -216,11 +217,11 @@
     return v1
 
     :cond_0
-    iget-wide v2, v0, Lkotlinx/coroutines/c/i;->bUN:J
+    iget-wide v2, v0, Lkotlinx/coroutines/c/i;->bUk:J
 
     sub-long/2addr p1, v2
 
-    sget-wide v2, Lkotlinx/coroutines/c/l;->bUS:J
+    sget-wide v2, Lkotlinx/coroutines/c/l;->bUp:J
 
     cmp-long v4, p1, v2
 
@@ -229,7 +230,7 @@
     return v1
 
     :cond_1
-    sget-object p1, Lkotlinx/coroutines/c/n;->bVb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/c/n;->bUx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 p2, 0x0
 
@@ -252,7 +253,7 @@
 .method private final d(Lkotlinx/coroutines/c/i;)Z
     .locals 3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/c/n;->GV()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/c/n;->GU()I
 
     move-result v0
 
@@ -265,11 +266,11 @@
     return v1
 
     :cond_0
-    iget v0, p0, Lkotlinx/coroutines/c/n;->bVc:I
+    iget v0, p0, Lkotlinx/coroutines/c/n;->producerIndex:I
 
     and-int/2addr v0, v2
 
-    iget-object v2, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -280,11 +281,11 @@
     return v1
 
     :cond_1
-    iget-object v1, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lkotlinx/coroutines/c/n;->bUw: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/c/n;->bVd:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/c/n;->bUy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {p1, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->incrementAndGet(Ljava/lang/Object;)I
 
@@ -295,22 +296,22 @@
 
 
 # virtual methods
-.method public final GV()I
+.method public final GU()I
     .locals 2
 
-    iget v0, p0, Lkotlinx/coroutines/c/n;->bVc:I
+    iget v0, p0, Lkotlinx/coroutines/c/n;->producerIndex:I
 
-    iget v1, p0, Lkotlinx/coroutines/c/n;->bVe:I
+    iget v1, p0, Lkotlinx/coroutines/c/n;->consumerIndex:I
 
     sub-int/2addr v0, v1
 
     return v0
 .end method
 
-.method public final GW()Lkotlinx/coroutines/c/i;
+.method public final GV()Lkotlinx/coroutines/c/i;
     .locals 5
 
-    sget-object v0, Lkotlinx/coroutines/c/n;->bVb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/n;->bUx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -323,9 +324,9 @@
     if-nez v0, :cond_2
 
     :cond_0
-    iget v0, p0, Lkotlinx/coroutines/c/n;->bVe:I
+    iget v0, p0, Lkotlinx/coroutines/c/n;->consumerIndex:I
 
-    iget v2, p0, Lkotlinx/coroutines/c/n;->bVc:I
+    iget v2, p0, Lkotlinx/coroutines/c/n;->producerIndex:I
 
     sub-int v2, v0, v2
 
@@ -336,7 +337,7 @@
     :cond_1
     and-int/lit8 v2, v0, 0x7f
 
-    iget-object v3, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -346,7 +347,7 @@
 
     if-eqz v3, :cond_0
 
-    sget-object v3, Lkotlinx/coroutines/c/n;->bVf:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/c/n;->bUz:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v4, v0, 0x1
 
@@ -356,7 +357,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -364,6 +365,8 @@
 
     check-cast v0, Lkotlinx/coroutines/c/i;
 
+    return-object v0
+
     :cond_2
     return-object v0
 .end method
@@ -379,7 +382,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/c/n;->bVb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/n;->bUx: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;
 
@@ -418,13 +421,13 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v3, Lkotlinx/coroutines/c/l;->bUW:Lkotlinx/coroutines/c/m;
+    sget-object v3, Lkotlinx/coroutines/c/l;->bUt:Lkotlinx/coroutines/c/m;
 
     invoke-virtual {v3}, Lkotlinx/coroutines/c/m;->nanoTime()J
 
     move-result-wide v3
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/c/n;->GV()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/c/n;->GU()I
 
     move-result v5
 
@@ -456,9 +459,9 @@
 
     :cond_1
     :goto_1
-    iget v10, v1, Lkotlinx/coroutines/c/n;->bVe:I
+    iget v10, v1, Lkotlinx/coroutines/c/n;->consumerIndex:I
 
-    iget v11, v1, Lkotlinx/coroutines/c/n;->bVc:I
+    iget v11, v1, Lkotlinx/coroutines/c/n;->producerIndex:I
 
     sub-int v11, v10, v11
 
@@ -471,7 +474,7 @@
     :cond_2
     and-int/lit8 v11, v10, 0x7f
 
-    iget-object v13, v1, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v13, v1, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v13, v11}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -484,21 +487,21 @@
     goto :goto_1
 
     :cond_3
-    iget-wide v13, v13, Lkotlinx/coroutines/c/i;->bUN:J
+    iget-wide v13, v13, Lkotlinx/coroutines/c/i;->bUk:J
 
     sub-long v13, v3, v13
 
-    sget-wide v15, Lkotlinx/coroutines/c/l;->bUS:J
+    sget-wide v15, Lkotlinx/coroutines/c/l;->bUp:J
 
     cmp-long v17, v13, v15
 
     if-gez v17, :cond_5
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/c/n;->GV()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/c/n;->GU()I
 
     move-result v13
 
-    sget v14, Lkotlinx/coroutines/c/l;->bUT:I
+    sget v14, Lkotlinx/coroutines/c/l;->bUq:I
 
     if-le v13, v14, :cond_4
 
@@ -519,7 +522,7 @@
     goto :goto_4
 
     :cond_6
-    sget-object v13, Lkotlinx/coroutines/c/n;->bVf:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v13, Lkotlinx/coroutines/c/n;->bUz:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v14, v10, 0x1
 
@@ -529,7 +532,7 @@
 
     if-eqz v10, :cond_1
 
-    iget-object v10, v1, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v10, v1, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v10, v11, v12}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -564,7 +567,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/c/n;->bVb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/c/n;->bUx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -574,28 +577,28 @@
 
     check-cast v0, Lkotlinx/coroutines/c/i;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
-    :cond_0
     invoke-static {p1, v0}, Lkotlinx/coroutines/c/n;->a(Lkotlinx/coroutines/c/e;Lkotlinx/coroutines/c/i;)V
 
-    :cond_1
-    iget v0, p0, Lkotlinx/coroutines/c/n;->bVe:I
+    :cond_0
+    :goto_0
+    iget v0, p0, Lkotlinx/coroutines/c/n;->consumerIndex:I
 
-    iget v2, p0, Lkotlinx/coroutines/c/n;->bVc:I
+    iget v2, p0, Lkotlinx/coroutines/c/n;->producerIndex:I
 
     sub-int v2, v0, v2
 
-    if-nez v2, :cond_2
+    if-nez v2, :cond_1
 
     move-object v0, v1
 
-    goto :goto_0
+    goto :goto_1
 
-    :cond_2
+    :cond_1
     and-int/lit8 v2, v0, 0x7f
 
-    iget-object v3, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -603,9 +606,9 @@
 
     check-cast v3, Lkotlinx/coroutines/c/i;
 
-    if-eqz v3, :cond_1
+    if-eqz v3, :cond_0
 
-    sget-object v3, Lkotlinx/coroutines/c/n;->bVf:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/c/n;->bUz:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v4, v0, 0x1
 
@@ -613,9 +616,9 @@
 
     move-result v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/c/n;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/c/n;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -623,10 +626,15 @@
 
     check-cast v0, Lkotlinx/coroutines/c/i;
 
-    :goto_0
-    if-nez v0, :cond_0
+    :goto_1
+    if-nez v0, :cond_2
 
     return-void
+
+    :cond_2
+    invoke-static {p1, v0}, Lkotlinx/coroutines/c/n;->a(Lkotlinx/coroutines/c/e;Lkotlinx/coroutines/c/i;)V
+
+    goto :goto_0
 .end method
 
 .method public final b(Lkotlinx/coroutines/c/i;Lkotlinx/coroutines/c/e;)Z
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/d.smali b/com.discord/smali_classes2/kotlinx/coroutines/d.smali
index 1237e9cc85..a8135c40a4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/d.smali
@@ -1,10 +1,11 @@
 .class public interface abstract Lkotlinx/coroutines/d;
 .super Ljava/lang/Object;
+.source "Job.kt"
 
 # interfaces
-.implements Lkotlinx/coroutines/al;
+.implements Lkotlinx/coroutines/ak;
 
 
 # virtual methods
-.method public abstract a(Lkotlinx/coroutines/ax;)V
+.method public abstract a(Lkotlinx/coroutines/aw;)V
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/e$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/e$a.smali
index db4fb7333d..68c1fa53d4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/e$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/e$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotlinx/coroutines/e$a;
 .super Ljava/lang/Object;
+.source "CommonPool.kt"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lkotlinx/coroutines/e;->FC()Ljava/util/concurrent/ExecutorService;
+    value = Lkotlinx/coroutines/e;->FB()Ljava/util/concurrent/ExecutorService;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bRE:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final synthetic bRD:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/e$a;->bRE:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lkotlinx/coroutines/e$a;->bRD:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,7 +45,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lkotlinx/coroutines/e$a;->bRE:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lkotlinx/coroutines/e$a;->bRD:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/e$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/e$b.smali
index 3f417487af..b4f331b7d2 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/e$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/e$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotlinx/coroutines/e$b;
 .super Ljava/lang/Object;
+.source "CommonPool.kt"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,7 +18,7 @@
 
 
 # static fields
-.field public static final bRF:Lkotlinx/coroutines/e$b;
+.field public static final bRE:Lkotlinx/coroutines/e$b;
 
 
 # direct methods
@@ -28,7 +29,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/e$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/e$b;->bRF:Lkotlinx/coroutines/e$b;
+    sput-object v0, Lkotlinx/coroutines/e$b;->bRE:Lkotlinx/coroutines/e$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/e.smali b/com.discord/smali_classes2/kotlinx/coroutines/e.smali
index 287c02fa3a..62df6e3981 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/e.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/e.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/e;
-.super Lkotlinx/coroutines/ag;
+.super Lkotlinx/coroutines/af;
+.source "CommonPool.kt"
 
 
 # static fields
@@ -7,9 +8,9 @@
 
 .field private static bRB:Z
 
-.field private static volatile bRC:Ljava/util/concurrent/Executor;
+.field public static final bRC:Lkotlinx/coroutines/e;
 
-.field public static final bRD:Lkotlinx/coroutines/e;
+.field private static volatile pool:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -20,7 +21,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/e;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/e;->bRD:Lkotlinx/coroutines/e;
+    sput-object v0, Lkotlinx/coroutines/e;->bRC:Lkotlinx/coroutines/e;
 
     :try_start_0
     const-string v0, "kotlinx.coroutines.default.parallelism"
@@ -92,12 +93,12 @@
 .method private constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ag;-><init>()V
+    invoke-direct {p0}, Lkotlinx/coroutines/af;-><init>()V
 
     return-void
 .end method
 
-.method private final FB()Ljava/util/concurrent/ExecutorService;
+.method private final FA()Ljava/util/concurrent/ExecutorService;
     .locals 6
 
     invoke-static {}, Ljava/lang/System;->getSecurityManager()Ljava/lang/SecurityManager;
@@ -106,7 +107,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/e;->FC()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/e;->FB()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -132,7 +133,7 @@
     :goto_0
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/e;->FC()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/e;->FB()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -256,14 +257,14 @@
     return-object v0
 
     :cond_7
-    invoke-static {}, Lkotlinx/coroutines/e;->FC()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/e;->FB()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private static FC()Ljava/util/concurrent/ExecutorService;
+.method private static FB()Ljava/util/concurrent/ExecutorService;
     .locals 3
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
@@ -291,17 +292,17 @@
     return-object v0
 .end method
 
-.method private final declared-synchronized FD()Ljava/util/concurrent/Executor;
+.method private final declared-synchronized FC()Ljava/util/concurrent/Executor;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lkotlinx/coroutines/e;->bRC:Ljava/util/concurrent/Executor;
+    sget-object v0, Lkotlinx/coroutines/e;->pool:Ljava/util/concurrent/Executor;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/e;->FB()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lkotlinx/coroutines/e;->FA()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -309,7 +310,7 @@
 
     check-cast v1, Ljava/util/concurrent/Executor;
 
-    sput-object v1, Lkotlinx/coroutines/e;->bRC:Ljava/util/concurrent/Executor;
+    sput-object v1, Lkotlinx/coroutines/e;->pool:Ljava/util/concurrent/Executor;
 
     check-cast v0, Ljava/util/concurrent/Executor;
     :try_end_0
@@ -348,7 +349,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/e$b;->bRF:Lkotlinx/coroutines/e$b;
+    sget-object v0, Lkotlinx/coroutines/e$b;->bRE:Lkotlinx/coroutines/e$b;
 
     check-cast v0, Ljava/lang/Runnable;
 
@@ -390,7 +391,7 @@
     move-object p0, v0
 
     :goto_0
-    if-eqz p0, :cond_1
+    if-eqz p0, :cond_2
 
     invoke-virtual {p0}, Ljava/lang/Integer;->intValue()I
 
@@ -404,6 +405,9 @@
 
     :cond_1
     return v1
+
+    :cond_2
+    return v1
 .end method
 
 .method private static getParallelism()I
@@ -483,20 +487,20 @@
     invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object p1, Lkotlinx/coroutines/e;->bRC:Ljava/util/concurrent/Executor;
+    sget-object p1, Lkotlinx/coroutines/e;->pool:Ljava/util/concurrent/Executor;
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/e;->FD()Ljava/util/concurrent/Executor;
+    invoke-direct {p0}, Lkotlinx/coroutines/e;->FC()Ljava/util/concurrent/Executor;
 
     move-result-object p1
 
     :cond_0
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
 
     move-result-object v0
 
-    invoke-interface {v0, p2}, Lkotlinx/coroutines/ba;->m(Ljava/lang/Runnable;)Ljava/lang/Runnable;
+    invoke-interface {v0, p2}, Lkotlinx/coroutines/az;->m(Ljava/lang/Runnable;)Ljava/lang/Runnable;
 
     move-result-object v0
 
@@ -507,11 +511,11 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
 
-    sget-object p1, Lkotlinx/coroutines/u;->bRV:Lkotlinx/coroutines/u;
+    sget-object p1, Lkotlinx/coroutines/t;->bRS:Lkotlinx/coroutines/t;
 
-    invoke-virtual {p1, p2}, Lkotlinx/coroutines/u;->n(Ljava/lang/Runnable;)V
+    invoke-virtual {p1, p2}, Lkotlinx/coroutines/t;->n(Ljava/lang/Runnable;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/f.smali b/com.discord/smali_classes2/kotlinx/coroutines/f.smali
index ba1ab00127..e2b0f6f1dc 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/f.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/f.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/f;
 .super Ljava/lang/Object;
+.source "CompletedExceptionally.kt"
 
 
 # instance fields
@@ -30,7 +31,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bJ(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bJ(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/g.smali b/com.discord/smali_classes2/kotlinx/coroutines/g.smali
index 1665570934..625fe4b5b9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/g.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/g.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/g;
 .super Ljava/lang/Object;
+.source "CompletedExceptionally.kt"
 
 
 # direct methods
@@ -33,7 +34,7 @@
 
     if-nez p0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/j;->Fl()V
+    invoke-static {}, Lkotlin/jvm/internal/j;->Fk()V
 
     :cond_1
     invoke-direct {v0, p0}, Lkotlinx/coroutines/f;-><init>(Ljava/lang/Throwable;)V
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/h.smali b/com.discord/smali_classes2/kotlinx/coroutines/h.smali
index b59024edc6..65216bcbc3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/h.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/h.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlinx/coroutines/h;
 .super Lkotlinx/coroutines/a/i;
+.source "CompletionHandler.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/i.smali b/com.discord/smali_classes2/kotlinx/coroutines/i.smali
index f0257d59e8..ed4da51122 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/i.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/i.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/i;
 .super Ljava/lang/RuntimeException;
+.source "Exceptions.kt"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/j.smali b/com.discord/smali_classes2/kotlinx/coroutines/j.smali
index a9b57cce36..1634a447af 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/j.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/j.smali
@@ -1,11 +1,12 @@
 .class public final Lkotlinx/coroutines/j;
 .super Ljava/lang/Object;
+.source "CoroutineContext.kt"
 
 
 # static fields
-.field private static final bRG:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final bRF:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private static final bRH:Z
+.field private static final bRG:Z
 
 
 # direct methods
@@ -16,7 +17,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/j;->bRG:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lkotlinx/coroutines/j;->bRF:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-string v0, "kotlinx.coroutines.scheduler"
 
@@ -79,7 +80,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    sput-boolean v0, Lkotlinx/coroutines/j;->bRH:Z
+    sput-boolean v0, Lkotlinx/coroutines/j;->bRG:Z
 
     return-void
 
@@ -113,14 +114,14 @@
     throw v1
 .end method
 
-.method public static final FE()Lkotlinx/coroutines/k;
+.method public static final FD()Lkotlinx/coroutines/k;
     .locals 1
 
-    sget-boolean v0, Lkotlinx/coroutines/j;->bRH:Z
+    sget-boolean v0, Lkotlinx/coroutines/j;->bRG:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlinx/coroutines/c/c;->bUC:Lkotlinx/coroutines/c/c;
+    sget-object v0, Lkotlinx/coroutines/c/c;->bUa:Lkotlinx/coroutines/c/c;
 
     :goto_0
     check-cast v0, Lkotlinx/coroutines/k;
@@ -128,7 +129,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/e;->bRD:Lkotlinx/coroutines/e;
+    sget-object v0, Lkotlinx/coroutines/e;->bRC:Lkotlinx/coroutines/e;
 
     goto :goto_0
 .end method
@@ -140,7 +141,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lkotlinx/coroutines/t;->FF()Z
+    invoke-static {}, Lkotlinx/coroutines/s;->FE()Z
 
     move-result v0
 
@@ -151,7 +152,7 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/o;->bRL:Lkotlinx/coroutines/o$a;
+    sget-object v0, Lkotlinx/coroutines/n;->bRK:Lkotlinx/coroutines/n$a;
 
     check-cast v0, Lkotlin/c/e$c;
 
@@ -159,14 +160,14 @@
 
     move-result-object v0
 
-    check-cast v0, Lkotlinx/coroutines/o;
+    check-cast v0, Lkotlinx/coroutines/n;
 
     if-nez v0, :cond_1
 
     return-object v1
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/p;->bRM:Lkotlinx/coroutines/p$a;
+    sget-object v1, Lkotlinx/coroutines/o;->bRL:Lkotlinx/coroutines/o$a;
 
     check-cast v1, Lkotlin/c/e$c;
 
@@ -174,11 +175,11 @@
 
     move-result-object p0
 
-    check-cast p0, Lkotlinx/coroutines/p;
+    check-cast p0, Lkotlinx/coroutines/o;
 
     if-eqz p0, :cond_2
 
-    iget-object p0, p0, Lkotlinx/coroutines/p;->name:Ljava/lang/String;
+    iget-object p0, p0, Lkotlinx/coroutines/o;->name:Ljava/lang/String;
 
     if-nez p0, :cond_3
 
@@ -196,7 +197,7 @@
 
     invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-wide v2, v0, Lkotlinx/coroutines/o;->id:J
+    iget-wide v2, v0, Lkotlinx/coroutines/n;->id:J
 
     invoke-virtual {v1, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -207,7 +208,7 @@
     return-object p0
 .end method
 
-.method public static final a(Lkotlinx/coroutines/q;Lkotlin/c/e;)Lkotlin/c/e;
+.method public static final a(Lkotlinx/coroutines/p;Lkotlin/c/e;)Lkotlin/c/e;
     .locals 2
 
     const-string v0, "receiver$0"
@@ -218,7 +219,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p0}, Lkotlinx/coroutines/q;->Fx()Lkotlin/c/e;
+    invoke-interface {p0}, Lkotlinx/coroutines/p;->Fw()Lkotlin/c/e;
 
     move-result-object p0
 
@@ -226,21 +227,21 @@
 
     move-result-object p0
 
-    invoke-static {}, Lkotlinx/coroutines/t;->FF()Z
+    invoke-static {}, Lkotlinx/coroutines/s;->FE()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    new-instance p1, Lkotlinx/coroutines/o;
+    new-instance p1, Lkotlinx/coroutines/n;
 
-    sget-object v0, Lkotlinx/coroutines/j;->bRG:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lkotlinx/coroutines/j;->bRF:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
 
     move-result-wide v0
 
-    invoke-direct {p1, v0, v1}, Lkotlinx/coroutines/o;-><init>(J)V
+    invoke-direct {p1, v0, v1}, Lkotlinx/coroutines/n;-><init>(J)V
 
     check-cast p1, Lkotlin/c/e;
 
@@ -254,7 +255,7 @@
     move-object p1, p0
 
     :goto_0
-    invoke-static {}, Lkotlinx/coroutines/aa;->FP()Lkotlinx/coroutines/k;
+    invoke-static {}, Lkotlinx/coroutines/z;->FO()Lkotlinx/coroutines/k;
 
     move-result-object v0
 
@@ -270,7 +271,7 @@
 
     if-nez p0, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/aa;->FP()Lkotlinx/coroutines/k;
+    invoke-static {}, Lkotlinx/coroutines/z;->FO()Lkotlinx/coroutines/k;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/k.smali b/com.discord/smali_classes2/kotlinx/coroutines/k.smali
index db88334c0a..c16b0b1131 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/k.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/k.smali
@@ -1,5 +1,6 @@
 .class public abstract Lkotlinx/coroutines/k;
 .super Lkotlin/c/a;
+.source "CoroutineDispatcher.kt"
 
 # interfaces
 .implements Lkotlin/c/d;
@@ -38,9 +39,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lkotlinx/coroutines/x;
+    new-instance v0, Lkotlinx/coroutines/w;
 
-    invoke-direct {v0, p0, p1}, Lkotlinx/coroutines/x;-><init>(Lkotlinx/coroutines/k;Lkotlin/c/c;)V
+    invoke-direct {v0, p0, p1}, Lkotlinx/coroutines/w;-><init>(Lkotlinx/coroutines/k;Lkotlin/c/c;)V
 
     check-cast v0, Lkotlin/c/c;
 
@@ -163,7 +164,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bJ(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bJ(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -173,7 +174,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bI(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bI(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/l.smali b/com.discord/smali_classes2/kotlinx/coroutines/l.smali
index c4021038d2..432c7ca8f9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/l.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/l.smali
@@ -1,34 +1,123 @@
-.class public interface abstract Lkotlinx/coroutines/l;
+.class public final Lkotlinx/coroutines/l;
 .super Ljava/lang/Object;
-
-# interfaces
-.implements Lkotlin/c/e$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lkotlinx/coroutines/l$a;
-    }
-.end annotation
+.source "CoroutineExceptionHandlerImpl.kt"
 
 
 # static fields
-.field public static final bRI:Lkotlinx/coroutines/l$a;
+.field private static final bRJ:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lkotlinx/coroutines/CoroutineExceptionHandler;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 1
+    .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/l$a;->bRJ:Lkotlinx/coroutines/l$a;
+    const-class v0, Lkotlinx/coroutines/CoroutineExceptionHandler;
 
-    sput-object v0, Lkotlinx/coroutines/l;->bRI:Lkotlinx/coroutines/l$a;
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Ljava/util/ServiceLoader;->load(Ljava/lang/Class;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader;
+
+    move-result-object v0
+
+    const-string v1, "ServiceLoader.load(servi\u2026serviceClass.classLoader)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    invoke-static {v0}, Lkotlin/a/l;->h(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lkotlinx/coroutines/l;->bRJ:Ljava/util/List;
 
     return-void
 .end method
 
+.method public static final a(Lkotlin/c/e;Ljava/lang/Throwable;)V
+    .locals 4
 
-# virtual methods
-.method public abstract handleException(Lkotlin/c/e;Ljava/lang/Throwable;)V
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lkotlinx/coroutines/l;->bRJ:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlinx/coroutines/CoroutineExceptionHandler;
+
+    :try_start_0
+    invoke-interface {v1, p0, p1}, Lkotlinx/coroutines/CoroutineExceptionHandler;->handleException(Lkotlin/c/e;Ljava/lang/Throwable;)V
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v1
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v2
+
+    const-string v3, "currentThread"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v3
+
+    invoke-static {p1, v1}, Lkotlinx/coroutines/m;->c(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    invoke-interface {v3, v2, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object p0
+
+    const-string v0, "currentThread"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v0
+
+    invoke-interface {v0, p0, p1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/m.smali b/com.discord/smali_classes2/kotlinx/coroutines/m.smali
index d405c9ee03..7c98143434 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/m.smali
@@ -1,50 +1,11 @@
 .class public final Lkotlinx/coroutines/m;
 .super Ljava/lang/Object;
-
-
-# static fields
-.field private static final bRK:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lkotlinx/coroutines/l;",
-            ">;"
-        }
-    .end annotation
-.end field
+.source "CoroutineExceptionHandler.kt"
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lkotlinx/coroutines/l;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Ljava/util/ServiceLoader;->load(Ljava/lang/Class;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader;
-
-    move-result-object v0
-
-    const-string v1, "ServiceLoader.load(servi\u2026serviceClass.classLoader)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Ljava/lang/Iterable;
-
-    invoke-static {v0}, Lkotlin/a/l;->h(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Lkotlinx/coroutines/m;->bRK:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public static final a(Lkotlin/c/e;Ljava/lang/Throwable;)V
-    .locals 4
+.method public static final b(Lkotlin/c/e;Ljava/lang/Throwable;)V
+    .locals 1
 
     const-string v0, "context"
 
@@ -54,69 +15,67 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/m;->bRK:Ljava/util/List;
+    :try_start_0
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bRH:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+    check-cast v0, Lkotlin/c/e$c;
+
+    invoke-interface {p0, v0}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
 
     move-result-object v0
 
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    check-cast v0, Lkotlinx/coroutines/CoroutineExceptionHandler;
 
-    move-result v1
+    if-eqz v0, :cond_0
 
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lkotlinx/coroutines/l;
-
-    :try_start_0
-    invoke-interface {v1, p0, p1}, Lkotlinx/coroutines/l;->handleException(Lkotlin/c/e;Ljava/lang/Throwable;)V
+    invoke-interface {v0, p0, p1}, Lkotlinx/coroutines/CoroutineExceptionHandler;->handleException(Lkotlin/c/e;Ljava/lang/Throwable;)V
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_0
-
-    :catch_0
-    move-exception v1
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v2
-
-    const-string v3, "currentThread"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v2}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v3
-
-    invoke-static {p1, v1}, Lkotlinx/coroutines/n;->c(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    invoke-interface {v3, v2, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-
-    goto :goto_0
+    return-void
 
     :cond_0
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+    invoke-static {p0, p1}, Lkotlinx/coroutines/l;->a(Lkotlin/c/e;Ljava/lang/Throwable;)V
 
-    move-result-object p0
+    return-void
 
-    const-string v0, "currentThread"
+    :catch_0
+    move-exception v0
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlinx/coroutines/m;->c(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
-    invoke-virtual {p0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+    move-result-object p1
 
-    move-result-object v0
-
-    invoke-interface {v0, p0, p1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+    invoke-static {p0, p1}, Lkotlinx/coroutines/l;->a(Lkotlin/c/e;Ljava/lang/Throwable;)V
 
     return-void
 .end method
+
+.method public static final c(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    .locals 2
+
+    const-string v0, "originalException"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "thrownException"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-ne p0, p1, :cond_0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Ljava/lang/RuntimeException;
+
+    const-string v1, "Exception while trying to handle coroutine exception"
+
+    invoke-direct {v0, v1, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    invoke-static {v0, p0}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/p$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/n$a.smali
similarity index 76%
rename from com.discord/smali_classes2/kotlinx/coroutines/p$a.smali
rename to com.discord/smali_classes2/kotlinx/coroutines/n$a.smali
index 82754a5852..026e2b34af 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/p$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/n$a.smali
@@ -1,5 +1,6 @@
-.class public final Lkotlinx/coroutines/p$a;
+.class public final Lkotlinx/coroutines/n$a;
 .super Ljava/lang/Object;
+.source "CoroutineContext.kt"
 
 # interfaces
 .implements Lkotlin/c/e$c;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lkotlinx/coroutines/p;
+    value = Lkotlinx/coroutines/n;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -19,7 +20,7 @@
     value = {
         "Ljava/lang/Object;",
         "Lkotlin/c/e$c<",
-        "Lkotlinx/coroutines/p;",
+        "Lkotlinx/coroutines/n;",
         ">;"
     }
 .end annotation
@@ -37,7 +38,7 @@
 .method public synthetic constructor <init>(B)V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/p$a;-><init>()V
+    invoke-direct {p0}, Lkotlinx/coroutines/n$a;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/n.smali b/com.discord/smali_classes2/kotlinx/coroutines/n.smali
index e6fe8f9445..de2c6415bd 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/n.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/n.smali
@@ -1,80 +1,435 @@
 .class public final Lkotlinx/coroutines/n;
-.super Ljava/lang/Object;
+.super Lkotlin/c/a;
+.source "CoroutineContext.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/ay;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lkotlinx/coroutines/n$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/c/a;",
+        "Lkotlinx/coroutines/ay<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final bRK:Lkotlinx/coroutines/n$a;
+
+
+# instance fields
+.field final id:J
 
 
 # direct methods
-.method public static final b(Lkotlin/c/e;Ljava/lang/Throwable;)V
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lkotlinx/coroutines/n$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/n$a;-><init>(B)V
+
+    sput-object v0, Lkotlinx/coroutines/n;->bRK:Lkotlinx/coroutines/n$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(J)V
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/n;->bRK:Lkotlinx/coroutines/n$a;
+
+    check-cast v0, Lkotlin/c/e$c;
+
+    invoke-direct {p0, v0}, Lkotlin/c/a;-><init>(Lkotlin/c/e$c;)V
+
+    iput-wide p1, p0, Lkotlinx/coroutines/n;->id:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic a(Lkotlin/c/e;Ljava/lang/Object;)V
+    .locals 1
+
+    check-cast p2, Ljava/lang/String;
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "oldState"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object p1
+
+    const-string v0, "Thread.currentThread()"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, p2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final synthetic c(Lkotlin/c/e;)Ljava/lang/Object;
+    .locals 9
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lkotlinx/coroutines/o;->bRL:Lkotlinx/coroutines/o$a;
+
+    check-cast v0, Lkotlin/c/e$c;
+
+    invoke-interface {p1, v0}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
+
+    move-result-object p1
+
+    check-cast p1, Lkotlinx/coroutines/o;
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p1, Lkotlinx/coroutines/o;->name:Ljava/lang/String;
+
+    if-nez p1, :cond_1
+
+    :cond_0
+    const-string p1, "coroutine"
+
+    :cond_1
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    const-string v1, "currentThread"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "oldName"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v3, v1
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    const-string v2, " @"
+
+    invoke-static {v3}, Lkotlin/text/l;->l(Ljava/lang/CharSequence;)I
+
+    move-result v5
+
+    const-string v4, "receiver$0"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "string"
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v4, v3, Ljava/lang/String;
+
+    if-nez v4, :cond_2
+
+    move-object v4, v2
+
+    check-cast v4, Ljava/lang/CharSequence;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x1
+
+    invoke-static/range {v3 .. v8}, Lkotlin/text/u;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
+
+    move-result v2
+
+    goto :goto_0
+
+    :cond_2
+    check-cast v3, Ljava/lang/String;
+
+    invoke-virtual {v3, v2, v5}, Ljava/lang/String;->lastIndexOf(Ljava/lang/String;I)I
+
+    move-result v2
+
+    :goto_0
+    if-gez v2, :cond_3
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    :cond_3
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    add-int/2addr v3, v2
+
+    add-int/lit8 v3, v3, 0xa
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4, v3}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v1, v3, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " @"
+
+    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x23
+
+    invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-wide v2, p0, Lkotlinx/coroutines/n;->id:J
+
+    invoke-virtual {v4, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v2, "StringBuilder(capacity).\u2026builderAction).toString()"
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-object v1
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 7
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lkotlinx/coroutines/n;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lkotlinx/coroutines/n;
+
+    iget-wide v3, p0, Lkotlinx/coroutines/n;->id:J
+
+    iget-wide v5, p1, Lkotlinx/coroutines/n;->id:J
+
+    cmp-long p1, v3, v5
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public final fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(TR;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TR;-",
+            "Lkotlin/c/e$b;",
+            "+TR;>;)TR;"
+        }
+    .end annotation
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/e$b;
+
+    invoke-static {v0, p1, p2}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/c/e$b;",
+            ">(",
+            "Lkotlin/c/e$c<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/e$b;
+
+    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e$b;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final hashCode()I
+    .locals 4
+
+    iget-wide v0, p0, Lkotlinx/coroutines/n;->id:J
+
+    const/16 v2, 0x20
+
+    ushr-long v2, v0, v2
+
+    xor-long/2addr v0, v2
+
+    long-to-int v0, v0
+
+    return v0
+.end method
+
+.method public final minusKey(Lkotlin/c/e$c;)Lkotlin/c/e;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/c/e$c<",
+            "*>;)",
+            "Lkotlin/c/e;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/e$b;
+
+    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->b(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final plus(Lkotlin/c/e;)Lkotlin/c/e;
     .locals 1
 
     const-string v0, "context"
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "exception"
+    const-string v0, "context"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :try_start_0
-    sget-object v0, Lkotlinx/coroutines/l;->bRI:Lkotlinx/coroutines/l$a;
+    move-object v0, p0
 
-    check-cast v0, Lkotlin/c/e$c;
+    check-cast v0, Lkotlin/c/e$b;
 
-    invoke-interface {p0, v0}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlinx/coroutines/l;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0, p0, p1}, Lkotlinx/coroutines/l;->handleException(Lkotlin/c/e;Ljava/lang/Throwable;)V
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :cond_0
-    invoke-static {p0, p1}, Lkotlinx/coroutines/m;->a(Lkotlin/c/e;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :catch_0
-    move-exception v0
-
-    invoke-static {p1, v0}, Lkotlinx/coroutines/n;->c(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e;)Lkotlin/c/e;
 
     move-result-object p1
 
-    invoke-static {p0, p1}, Lkotlinx/coroutines/m;->a(Lkotlin/c/e;Ljava/lang/Throwable;)V
-
-    return-void
+    return-object p1
 .end method
 
-.method public static final c(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
-    .locals 2
+.method public final toString()Ljava/lang/String;
+    .locals 3
 
-    const-string v0, "originalException"
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "CoroutineId("
 
-    const-string v0, "thrownException"
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-wide v1, p0, Lkotlinx/coroutines/n;->id:J
 
-    if-ne p0, p1, :cond_0
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    return-object p0
+    const/16 v1, 0x29
 
-    :cond_0
-    new-instance v0, Ljava/lang/RuntimeException;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    const-string v1, "Exception while trying to handle coroutine exception"
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-direct {v0, v1, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    invoke-static {v0, p0}, Lkotlin/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    move-result-object v0
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali
index a85be14c46..e05ddf1f77 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali
@@ -1,5 +1,6 @@
 .class public final Lkotlinx/coroutines/o$a;
 .super Ljava/lang/Object;
+.source "CoroutineName.kt"
 
 # interfaces
 .implements Lkotlin/c/e$c;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/o.smali b/com.discord/smali_classes2/kotlinx/coroutines/o.smali
index d30863218a..4cbf5ad5da 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/o.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/o.smali
@@ -1,8 +1,6 @@
 .class public final Lkotlinx/coroutines/o;
 .super Lkotlin/c/a;
-
-# interfaces
-.implements Lkotlinx/coroutines/az;
+.source "CoroutineName.kt"
 
 
 # annotations
@@ -12,22 +10,13 @@
     }
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/c/a;",
-        "Lkotlinx/coroutines/az<",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
 
 # static fields
 .field public static final bRL:Lkotlinx/coroutines/o$a;
 
 
 # instance fields
-.field final id:J
+.field final name:Ljava/lang/String;
 
 
 # direct methods
@@ -45,382 +34,74 @@
     return-void
 .end method
 
-.method public constructor <init>(J)V
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/o;->bRL:Lkotlinx/coroutines/o$a;
-
-    check-cast v0, Lkotlin/c/e$c;
-
-    invoke-direct {p0, v0}, Lkotlin/c/a;-><init>(Lkotlin/c/e$c;)V
-
-    iput-wide p1, p0, Lkotlinx/coroutines/o;->id:J
-
-    return-void
-.end method
-
 
 # virtual methods
-.method public final synthetic a(Lkotlin/c/e;Ljava/lang/Object;)V
+.method public final equals(Ljava/lang/Object;)Z
     .locals 1
 
-    check-cast p2, Ljava/lang/String;
+    if-eq p0, p1, :cond_1
 
-    const-string v0, "context"
+    instance-of v0, p1, Lkotlinx/coroutines/o;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string p1, "oldState"
-
-    invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object p1
-
-    const-string v0, "Thread.currentThread()"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, p2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public final synthetic c(Lkotlin/c/e;)Ljava/lang/Object;
-    .locals 9
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v0, Lkotlinx/coroutines/p;->bRM:Lkotlinx/coroutines/p$a;
-
-    check-cast v0, Lkotlin/c/e$c;
-
-    invoke-interface {p1, v0}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
-
-    move-result-object p1
-
-    check-cast p1, Lkotlinx/coroutines/p;
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p1, Lkotlinx/coroutines/p;->name:Ljava/lang/String;
-
-    if-nez p1, :cond_1
-
-    :cond_0
-    const-string p1, "coroutine"
-
-    :cond_1
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    const-string v1, "currentThread"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v2, "oldName"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v3, v1
-
-    check-cast v3, Ljava/lang/CharSequence;
-
-    const-string v2, " @"
-
-    invoke-static {v3}, Lkotlin/text/l;->l(Ljava/lang/CharSequence;)I
-
-    move-result v5
-
-    const-string v4, "receiver$0"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v4, "string"
-
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    instance-of v4, v3, Ljava/lang/String;
-
-    if-nez v4, :cond_2
-
-    move-object v4, v2
-
-    check-cast v4, Ljava/lang/CharSequence;
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    invoke-static/range {v3 .. v8}, Lkotlin/text/u;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
-
-    move-result v2
-
-    goto :goto_0
-
-    :cond_2
-    check-cast v3, Ljava/lang/String;
-
-    invoke-virtual {v3, v2, v5}, Ljava/lang/String;->lastIndexOf(Ljava/lang/String;I)I
-
-    move-result v2
-
-    :goto_0
-    if-gez v2, :cond_3
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    :cond_3
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    add-int/2addr v3, v2
-
-    add-int/lit8 v3, v3, 0xa
-
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4, v3}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v3, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v3, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " @"
-
-    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x23
-
-    invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-wide v2, p0, Lkotlinx/coroutines/o;->id:J
-
-    invoke-virtual {v4, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v2, "StringBuilder(capacity).\u2026builderAction).toString()"
-
-    invoke-static {p1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-object v1
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 7
-
-    const/4 v0, 0x1
-
-    if-eq p0, p1, :cond_2
-
-    instance-of v1, p1, Lkotlinx/coroutines/o;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
     check-cast p1, Lkotlinx/coroutines/o;
 
-    iget-wide v3, p0, Lkotlinx/coroutines/o;->id:J
+    iget-object v0, p0, Lkotlinx/coroutines/o;->name:Ljava/lang/String;
 
-    iget-wide v5, p1, Lkotlinx/coroutines/o;->id:J
+    iget-object p1, p1, Lkotlinx/coroutines/o;->name:Ljava/lang/String;
 
-    cmp-long p1, v3, v5
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    if-nez p1, :cond_0
+    move-result p1
 
-    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 fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(TR;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TR;-",
-            "Lkotlin/c/e$b;",
-            "+TR;>;)TR;"
-        }
-    .end annotation
-
-    const-string v0, "operation"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "operation"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1, p2}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/c/e$b;",
-            ">(",
-            "Lkotlin/c/e$c<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e$b;
-
-    move-result-object p1
-
-    return-object p1
+    return p1
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 1
 
-    iget-wide v0, p0, Lkotlinx/coroutines/o;->id:J
+    iget-object v0, p0, Lkotlinx/coroutines/o;->name:Ljava/lang/String;
 
-    const/16 v2, 0x20
+    if-eqz v0, :cond_0
 
-    ushr-long v2, v0, v2
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
-    xor-long/2addr v0, v2
+    move-result v0
 
-    long-to-int v0, v0
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
 
     return v0
 .end method
 
-.method public final minusKey(Lkotlin/c/e$c;)Lkotlin/c/e;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/c/e$c<",
-            "*>;)",
-            "Lkotlin/c/e;"
-        }
-    .end annotation
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "key"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->b(Lkotlin/c/e$b;Lkotlin/c/e$c;)Lkotlin/c/e;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final plus(Lkotlin/c/e;)Lkotlin/c/e;
-    .locals 1
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/e$b;
-
-    invoke-static {v0, p1}, Lkotlin/c/e$b$a;->a(Lkotlin/c/e$b;Lkotlin/c/e;)Lkotlin/c/e;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
 .method public final toString()Ljava/lang/String;
-    .locals 3
+    .locals 2
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "CoroutineId("
+    const-string v1, "CoroutineName("
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lkotlinx/coroutines/o;->id:J
+    iget-object v1, p0, Lkotlinx/coroutines/o;->name:Ljava/lang/String;
 
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const/16 v1, 0x29
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/p.smali b/com.discord/smali_classes2/kotlinx/coroutines/p.smali
index 1077a26ca0..37b083d780 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/p.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/p.smali
@@ -1,114 +1,8 @@
-.class public final Lkotlinx/coroutines/p;
-.super Lkotlin/c/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lkotlinx/coroutines/p$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final bRM:Lkotlinx/coroutines/p$a;
-
-
-# instance fields
-.field final name:Ljava/lang/String;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lkotlinx/coroutines/p$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/p$a;-><init>(B)V
-
-    sput-object v0, Lkotlinx/coroutines/p;->bRM:Lkotlinx/coroutines/p$a;
-
-    return-void
-.end method
+.class public interface abstract Lkotlinx/coroutines/p;
+.super Ljava/lang/Object;
+.source "CoroutineScope.kt"
 
 
 # virtual methods
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lkotlinx/coroutines/p;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lkotlinx/coroutines/p;
-
-    iget-object v0, p0, Lkotlinx/coroutines/p;->name:Ljava/lang/String;
-
-    iget-object p1, p1, Lkotlinx/coroutines/p;->name:Ljava/lang/String;
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public final hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/p;->name:Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "CoroutineName("
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lkotlinx/coroutines/p;->name:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
+.method public abstract Fw()Lkotlin/c/e;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/q.smali b/com.discord/smali_classes2/kotlinx/coroutines/q.smali
index 1faa4949aa..c73f3592eb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/q.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/q.smali
@@ -1,7 +1,128 @@
-.class public interface abstract Lkotlinx/coroutines/q;
-.super Ljava/lang/Object;
+.class public final enum Lkotlinx/coroutines/q;
+.super Ljava/lang/Enum;
+.source "CoroutineStart.kt"
 
 
-# virtual methods
-.method public abstract Fx()Lkotlin/c/e;
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lkotlinx/coroutines/q;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum bRM:Lkotlinx/coroutines/q;
+
+.field public static final enum bRN:Lkotlinx/coroutines/q;
+
+.field public static final enum bRO:Lkotlinx/coroutines/q;
+
+.field public static final enum bRP:Lkotlinx/coroutines/q;
+
+.field private static final synthetic bRQ:[Lkotlinx/coroutines/q;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Lkotlinx/coroutines/q;
+
+    new-instance v1, Lkotlinx/coroutines/q;
+
+    const-string v2, "DEFAULT"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/q;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lkotlinx/coroutines/q;->bRM:Lkotlinx/coroutines/q;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lkotlinx/coroutines/q;
+
+    const-string v2, "LAZY"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/q;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lkotlinx/coroutines/q;->bRN:Lkotlinx/coroutines/q;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lkotlinx/coroutines/q;
+
+    const-string v2, "ATOMIC"
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/q;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lkotlinx/coroutines/q;->bRO:Lkotlinx/coroutines/q;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lkotlinx/coroutines/q;
+
+    const-string v2, "UNDISPATCHED"
+
+    const/4 v3, 0x3
+
+    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/q;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lkotlinx/coroutines/q;->bRP:Lkotlinx/coroutines/q;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lkotlinx/coroutines/q;->bRQ:[Lkotlinx/coroutines/q;
+
+    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;)Lkotlinx/coroutines/q;
+    .locals 1
+
+    const-class v0, Lkotlinx/coroutines/q;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lkotlinx/coroutines/q;
+
+    return-object p0
+.end method
+
+.method public static values()[Lkotlinx/coroutines/q;
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/q;->bRQ:[Lkotlinx/coroutines/q;
+
+    invoke-virtual {v0}, [Lkotlinx/coroutines/q;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lkotlinx/coroutines/q;
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/r.smali b/com.discord/smali_classes2/kotlinx/coroutines/r.smali
index b721474153..de027a56e1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/r.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/r.smali
@@ -1,127 +1,120 @@
-.class public final enum Lkotlinx/coroutines/r;
-.super Ljava/lang/Enum;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lkotlinx/coroutines/r;",
-        ">;"
-    }
-.end annotation
+.class public final synthetic Lkotlinx/coroutines/r;
+.super Ljava/lang/Object;
 
 
 # static fields
-.field public static final enum bRN:Lkotlinx/coroutines/r;
+.field public static final synthetic $EnumSwitchMapping$0:[I
 
-.field public static final enum bRO:Lkotlinx/coroutines/r;
-
-.field public static final enum bRP:Lkotlinx/coroutines/r;
-
-.field public static final enum bRQ:Lkotlinx/coroutines/r;
-
-.field private static final synthetic bRR:[Lkotlinx/coroutines/r;
+.field public static final synthetic $EnumSwitchMapping$1:[I
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 4
+.method static synthetic constructor <clinit>()V
+    .locals 6
 
-    const/4 v0, 0x4
-
-    new-array v0, v0, [Lkotlinx/coroutines/r;
-
-    new-instance v1, Lkotlinx/coroutines/r;
-
-    const-string v2, "DEFAULT"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/r;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lkotlinx/coroutines/r;->bRN:Lkotlinx/coroutines/r;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lkotlinx/coroutines/r;
-
-    const-string v2, "LAZY"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/r;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lkotlinx/coroutines/r;->bRO:Lkotlinx/coroutines/r;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lkotlinx/coroutines/r;
-
-    const-string v2, "ATOMIC"
-
-    const/4 v3, 0x2
-
-    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/r;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lkotlinx/coroutines/r;->bRP:Lkotlinx/coroutines/r;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lkotlinx/coroutines/r;
-
-    const-string v2, "UNDISPATCHED"
-
-    const/4 v3, 0x3
-
-    invoke-direct {v1, v2, v3}, Lkotlinx/coroutines/r;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lkotlinx/coroutines/r;->bRQ:Lkotlinx/coroutines/r;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lkotlinx/coroutines/r;->bRR:[Lkotlinx/coroutines/r;
-
-    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;)Lkotlinx/coroutines/r;
-    .locals 1
-
-    const-class v0, Lkotlinx/coroutines/r;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lkotlinx/coroutines/r;
-
-    return-object p0
-.end method
-
-.method public static values()[Lkotlinx/coroutines/r;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/r;->bRR:[Lkotlinx/coroutines/r;
-
-    invoke-virtual {v0}, [Lkotlinx/coroutines/r;->clone()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/q;->values()[Lkotlinx/coroutines/q;
 
     move-result-object v0
 
-    check-cast v0, [Lkotlinx/coroutines/r;
+    array-length v0, v0
 
-    return-object v0
+    new-array v0, v0, [I
+
+    sput-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRM:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRO:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    const/4 v3, 0x2
+
+    aput v3, v0, v1
+
+    sget-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRP:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    const/4 v4, 0x3
+
+    aput v4, v0, v1
+
+    sget-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRN:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    const/4 v5, 0x4
+
+    aput v5, v0, v1
+
+    invoke-static {}, Lkotlinx/coroutines/q;->values()[Lkotlinx/coroutines/q;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRM:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRO:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    aput v3, v0, v1
+
+    sget-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRP:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    aput v4, v0, v1
+
+    sget-object v0, Lkotlinx/coroutines/r;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lkotlinx/coroutines/q;->bRN:Lkotlinx/coroutines/q;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/q;->ordinal()I
+
+    move-result v1
+
+    aput v5, v0, v1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/s.smali b/com.discord/smali_classes2/kotlinx/coroutines/s.smali
index bf16ba8a69..6283ac6068 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/s.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/s.smali
@@ -1,120 +1,230 @@
-.class public final synthetic Lkotlinx/coroutines/s;
+.class public final Lkotlinx/coroutines/s;
 .super Ljava/lang/Object;
+.source "Debug.kt"
 
 
 # static fields
-.field public static final synthetic $EnumSwitchMapping$0:[I
-
-.field public static final synthetic $EnumSwitchMapping$1:[I
+.field private static final DEBUG:Z
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 6
+.method static constructor <clinit>()V
+    .locals 3
 
-    invoke-static {}, Lkotlinx/coroutines/r;->values()[Lkotlinx/coroutines/r;
+    const-string v0, "kotlinx.coroutines.debug"
+
+    invoke-static {v0}, Lkotlinx/coroutines/a/p;->ee(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    array-length v0, v0
+    if-nez v0, :cond_0
 
-    new-array v0, v0, [I
+    goto :goto_0
 
-    sput-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lkotlinx/coroutines/r;->bRN:Lkotlinx/coroutines/r;
-
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
     move-result v1
 
-    const/4 v2, 0x1
+    if-eqz v1, :cond_3
 
-    aput v2, v0, v1
+    const/16 v2, 0xddf
 
-    sget-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$0:[I
+    if-eq v1, v2, :cond_2
 
-    sget-object v1, Lkotlinx/coroutines/r;->bRP:Lkotlinx/coroutines/r;
+    const v2, 0x1ad6f
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
+    if-eq v1, v2, :cond_1
+
+    const v2, 0x2dddaf
+
+    if-ne v1, v2, :cond_4
+
+    const-string v1, "auto"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    const/4 v3, 0x2
+    if-eqz v1, :cond_4
 
-    aput v3, v0, v1
+    :goto_0
+    const-class v0, Lkotlinx/coroutines/n;
 
-    sget-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$0:[I
+    invoke-virtual {v0}, Ljava/lang/Class;->desiredAssertionStatus()Z
 
-    sget-object v1, Lkotlinx/coroutines/r;->bRQ:Lkotlinx/coroutines/r;
+    move-result v0
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
+    goto :goto_2
+
+    :cond_1
+    const-string v1, "off"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    const/4 v4, 0x3
+    if-eqz v1, :cond_4
 
-    aput v4, v0, v1
+    const/4 v0, 0x0
 
-    sget-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$0:[I
+    goto :goto_2
 
-    sget-object v1, Lkotlinx/coroutines/r;->bRO:Lkotlinx/coroutines/r;
+    :cond_2
+    const-string v1, "on"
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    const/4 v5, 0x4
+    if-eqz v1, :cond_4
 
-    aput v5, v0, v1
+    goto :goto_1
 
-    invoke-static {}, Lkotlinx/coroutines/r;->values()[Lkotlinx/coroutines/r;
+    :cond_3
+    const-string v1, ""
 
-    move-result-object v0
-
-    array-length v0, v0
-
-    new-array v0, v0, [I
-
-    sput-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$1:[I
-
-    sget-object v1, Lkotlinx/coroutines/r;->bRN:Lkotlinx/coroutines/r;
-
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    aput v2, v0, v1
+    if-eqz v1, :cond_4
 
-    sget-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$1:[I
+    :goto_1
+    const/4 v0, 0x1
 
-    sget-object v1, Lkotlinx/coroutines/r;->bRP:Lkotlinx/coroutines/r;
-
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
-
-    move-result v1
-
-    aput v3, v0, v1
-
-    sget-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$1:[I
-
-    sget-object v1, Lkotlinx/coroutines/r;->bRQ:Lkotlinx/coroutines/r;
-
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
-
-    move-result v1
-
-    aput v4, v0, v1
-
-    sget-object v0, Lkotlinx/coroutines/s;->$EnumSwitchMapping$1:[I
-
-    sget-object v1, Lkotlinx/coroutines/r;->bRO:Lkotlinx/coroutines/r;
-
-    invoke-virtual {v1}, Lkotlinx/coroutines/r;->ordinal()I
-
-    move-result v1
-
-    aput v5, v0, v1
+    :goto_2
+    sput-boolean v0, Lkotlinx/coroutines/s;->DEBUG:Z
 
     return-void
+
+    :cond_4
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    const-string v2, "System property \'kotlinx.coroutines.debug\' has unrecognized value \'"
+
+    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v0, 0x27
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    throw v1
+.end method
+
+.method public static final FE()Z
+    .locals 1
+
+    sget-boolean v0, Lkotlinx/coroutines/s;->DEBUG:Z
+
+    return v0
+.end method
+
+.method public static final bI(Ljava/lang/Object;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
+
+    move-result p0
+
+    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "Integer.toHexString(System.identityHashCode(this))"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final bJ(Ljava/lang/Object;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "this::class.java.simpleName"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final d(Lkotlin/c/c;)Ljava/lang/String;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/c/c<",
+            "*>;)",
+            "Ljava/lang/String;"
+        }
+    .end annotation
+
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Lkotlinx/coroutines/w;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lkotlinx/coroutines/s;->bI(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/t.smali b/com.discord/smali_classes2/kotlinx/coroutines/t.smali
index 1173f2fbe6..1fa74ea84a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/t.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/t.smali
@@ -1,229 +1,452 @@
 .class public final Lkotlinx/coroutines/t;
-.super Ljava/lang/Object;
+.super Lkotlinx/coroutines/ad;
+.source "DefaultExecutor.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
 
 
 # static fields
-.field private static final DEBUG:Z
+.field private static volatile _thread:Ljava/lang/Thread;
+
+.field private static final bRR:J
+
+.field public static final bRS:Lkotlinx/coroutines/t;
+
+.field private static volatile debugStatus:I
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 3
+    .locals 4
 
-    const-string v0, "kotlinx.coroutines.debug"
+    new-instance v0, Lkotlinx/coroutines/t;
 
-    invoke-static {v0}, Lkotlinx/coroutines/a/p;->ee(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {v0}, Lkotlinx/coroutines/t;-><init>()V
 
-    move-result-object v0
+    sput-object v0, Lkotlinx/coroutines/t;->bRS:Lkotlinx/coroutines/t;
 
-    if-nez v0, :cond_0
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v1, 0x3e8
+
+    :try_start_0
+    const-string v3, "kotlinx.coroutines.DefaultExecutor.keepAlive"
+
+    invoke-static {v3, v1, v2}, Ljava/lang/Long;->getLong(Ljava/lang/String;J)Ljava/lang/Long;
+
+    move-result-object v1
+    :try_end_0
+    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    :goto_0
+    const-string v2, "try {\n            java.l\u2026AULT_KEEP_ALIVE\n        }"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    sput-wide v0, Lkotlinx/coroutines/t;->bRR:J
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/ad;-><init>()V
+
+    return-void
+.end method
+
+.method private static FF()Z
+    .locals 2
+
+    sget v0, Lkotlinx/coroutines/t;->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
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    const/16 v2, 0xddf
-
-    if-eq v1, v2, :cond_2
-
-    const v2, 0x1ad6f
-
-    if-eq v1, v2, :cond_1
-
-    const v2, 0x2dddaf
-
-    if-ne v1, v2, :cond_4
-
-    const-string v1, "auto"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    :goto_0
-    const-class v0, Lkotlinx/coroutines/o;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->desiredAssertionStatus()Z
-
-    move-result v0
-
-    goto :goto_2
-
-    :cond_1
-    const-string v1, "off"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
     const/4 v0, 0x0
 
-    goto :goto_2
+    return v0
 
-    :cond_2
-    const-string v1, "on"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    goto :goto_1
-
-    :cond_3
-    const-string v1, ""
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    :goto_1
+    :cond_1
+    :goto_0
     const/4 v0, 0x1
 
-    :goto_2
-    sput-boolean v0, Lkotlinx/coroutines/t;->DEBUG:Z
-
-    return-void
-
-    :cond_4
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    const-string v2, "System property \'kotlinx.coroutines.debug\' has unrecognized value \'"
-
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x27
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    throw v1
-.end method
-
-.method public static final FF()Z
-    .locals 1
-
-    sget-boolean v0, Lkotlinx/coroutines/t;->DEBUG:Z
-
     return v0
 .end method
 
-.method public static final bI(Ljava/lang/Object;)Ljava/lang/String;
+.method private final FG()Ljava/lang/Thread;
     .locals 1
 
-    const-string v0, "receiver$0"
+    sget-object v0, Lkotlinx/coroutines/t;->_thread:Ljava/lang/Thread;
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    if-nez v0, :cond_0
 
-    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FH()Ljava/lang/Thread;
 
-    move-result p0
+    move-result-object v0
 
-    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v0, "Integer.toHexString(System.identityHashCode(this))"
-
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
+    :cond_0
+    return-object v0
 .end method
 
-.method public static final bJ(Ljava/lang/Object;)Ljava/lang/String;
-    .locals 1
+.method private final declared-synchronized FH()Ljava/lang/Thread;
+    .locals 3
 
-    const-string v0, "receiver$0"
+    monitor-enter p0
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_start_0
+    sget-object v0, Lkotlinx/coroutines/t;->_thread:Ljava/lang/Thread;
 
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    if-nez v0, :cond_0
 
-    move-result-object p0
+    new-instance v0, Ljava/lang/Thread;
 
-    invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    move-object v1, p0
 
-    move-result-object p0
+    check-cast v1, Ljava/lang/Runnable;
 
-    const-string v0, "this::class.java.simpleName"
+    const-string v2, "kotlinx.coroutines.DefaultExecutor"
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v0, v1, v2}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
 
-    return-object p0
+    sput-object v0, Lkotlinx/coroutines/t;->_thread:Ljava/lang/Thread;
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Thread;->setDaemon(Z)V
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->start()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_0
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
 .end method
 
-.method public static final d(Lkotlin/c/c;)Ljava/lang/String;
+.method private final declared-synchronized FI()Z
     .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/c/c<",
-            "*>;)",
-            "Ljava/lang/String;"
-        }
-    .end annotation
 
-    const-string v0, "receiver$0"
+    monitor-enter p0
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_start_0
+    invoke-static {}, Lkotlinx/coroutines/t;->FF()Z
 
-    instance-of v0, p0, Lkotlinx/coroutines/x;
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    const/4 v0, 0x0
 
-    move-result-object p0
+    monitor-exit p0
 
-    return-object p0
+    return v0
 
     :cond_0
-    new-instance v0, Ljava/lang/StringBuilder;
+    const/4 v0, 0x1
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    :try_start_1
+    sput v0, Lkotlinx/coroutines/t;->debugStatus:I
 
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    move-object v1, p0
 
-    const/16 v1, 0x40
+    check-cast v1, Ljava/lang/Object;
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v1}, Ljava/lang/Object;->notifyAll()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {p0}, Lkotlinx/coroutines/t;->bI(Ljava/lang/Object;)Ljava/lang/String;
+    monitor-exit p0
 
-    move-result-object p0
+    return v0
 
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    :catchall_0
+    move-exception v0
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    monitor-exit p0
 
-    move-result-object p0
-
-    return-object p0
+    throw v0
+.end method
+
+.method private final declared-synchronized FJ()V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-static {}, Lkotlinx/coroutines/t;->FF()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/t;->debugStatus:I
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lkotlinx/coroutines/ad;->_queue:Ljava/lang/Object;
+
+    iput-object v0, p0, Lkotlinx/coroutines/ad;->_delayed:Ljava/lang/Object;
+
+    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
+
+
+# virtual methods
+.method public final run()V
+    .locals 12
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FI()Z
+
+    move-result v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v1, :cond_1
+
+    sput-object v0, Lkotlinx/coroutines/t;->_thread:Ljava/lang/Thread;
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FJ()V
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/t;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FG()Ljava/lang/Thread;
+
+    :cond_0
+    return-void
+
+    :cond_1
+    const-wide v1, 0x7fffffffffffffffL
+
+    move-wide v3, v1
+
+    :cond_2
+    :goto_0
+    :try_start_1
+    invoke-static {}, Ljava/lang/Thread;->interrupted()Z
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/t;->FS()J
+
+    move-result-wide v5
+
+    const-wide/16 v7, 0x0
+
+    cmp-long v9, v5, v1
+
+    if-nez v9, :cond_7
+
+    cmp-long v9, v3, v1
+
+    if-nez v9, :cond_6
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    move-result-object v9
+
+    invoke-interface {v9}, Lkotlinx/coroutines/az;->nanoTime()J
+
+    move-result-wide v9
+
+    cmp-long v11, v3, v1
+
+    if-nez v11, :cond_3
+
+    sget-wide v3, Lkotlinx/coroutines/t;->bRR:J
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    add-long/2addr v3, v9
+
+    :cond_3
+    sub-long v9, v3, v9
+
+    cmp-long v11, v9, v7
+
+    if-gtz v11, :cond_5
+
+    sput-object v0, Lkotlinx/coroutines/t;->_thread:Ljava/lang/Thread;
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FJ()V
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/t;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_4
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FG()Ljava/lang/Thread;
+
+    :cond_4
+    return-void
+
+    :cond_5
+    :try_start_2
+    invoke-static {v5, v6, v9, v10}, Lkotlin/ranges/b;->g(JJ)J
+
+    move-result-wide v5
+
+    goto :goto_1
+
+    :cond_6
+    sget-wide v9, Lkotlinx/coroutines/t;->bRR:J
+
+    invoke-static {v5, v6, v9, v10}, Lkotlin/ranges/b;->g(JJ)J
+
+    move-result-wide v5
+
+    :cond_7
+    :goto_1
+    cmp-long v9, v5, v7
+
+    if-lez v9, :cond_2
+
+    invoke-static {}, Lkotlinx/coroutines/t;->FF()Z
+
+    move-result v7
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    if-eqz v7, :cond_9
+
+    sput-object v0, Lkotlinx/coroutines/t;->_thread:Ljava/lang/Thread;
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FJ()V
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/t;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_8
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FG()Ljava/lang/Thread;
+
+    :cond_8
+    return-void
+
+    :cond_9
+    :try_start_3
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    move-result-object v7
+
+    invoke-interface {v7, p0, v5, v6}, Lkotlinx/coroutines/az;->parkNanos(Ljava/lang/Object;J)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    sput-object v0, Lkotlinx/coroutines/t;->_thread:Ljava/lang/Thread;
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FJ()V
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/t;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_a
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FG()Ljava/lang/Thread;
+
+    :cond_a
+    throw v1
+
+    return-void
+.end method
+
+.method protected final unpark()V
+    .locals 2
+
+    invoke-static {}, Lkotlinx/coroutines/ba;->Gg()Lkotlinx/coroutines/az;
+
+    move-result-object v0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/t;->FG()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Lkotlinx/coroutines/az;->unpark(Ljava/lang/Thread;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/u.smali b/com.discord/smali_classes2/kotlinx/coroutines/u.smali
index 92a4ac619d..fd4385ff04 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/u.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/u.smali
@@ -1,64 +1,24 @@
 .class public final Lkotlinx/coroutines/u;
-.super Lkotlinx/coroutines/ae;
+.super Ljava/lang/Object;
+.source "TimeSource.kt"
 
 # interfaces
-.implements Ljava/lang/Runnable;
+.implements Lkotlinx/coroutines/az;
 
 
 # static fields
-.field private static final bRS:J
-
-.field private static volatile bRT:Ljava/lang/Thread;
-
-.field private static volatile bRU:I
-
-.field public static final bRV:Lkotlinx/coroutines/u;
+.field public static final bRT:Lkotlinx/coroutines/u;
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 4
+    .locals 1
 
     new-instance v0, Lkotlinx/coroutines/u;
 
     invoke-direct {v0}, Lkotlinx/coroutines/u;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/u;->bRV:Lkotlinx/coroutines/u;
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v1, 0x3e8
-
-    :try_start_0
-    const-string v3, "kotlinx.coroutines.DefaultExecutor.keepAlive"
-
-    invoke-static {v3, v1, v2}, Ljava/lang/Long;->getLong(Ljava/lang/String;J)Ljava/lang/Long;
-
-    move-result-object v3
-    :try_end_0
-    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v3
-
-    :goto_0
-    const-string v1, "try {\n            java.l\u2026AULT_KEEP_ALIVE\n        }"
-
-    invoke-static {v3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lkotlinx/coroutines/u;->bRS:J
+    sput-object v0, Lkotlinx/coroutines/u;->bRT:Lkotlinx/coroutines/u;
 
     return-void
 .end method
@@ -66,387 +26,53 @@
 .method private constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ae;-><init>()V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private static FG()Z
-    .locals 2
-
-    sget v0, Lkotlinx/coroutines/u;->bRU: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 FH()Ljava/lang/Thread;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/u;->bRT:Ljava/lang/Thread;
-
-    if-nez v0, :cond_0
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FI()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    :cond_0
-    return-object v0
-.end method
-
-.method private final declared-synchronized FI()Ljava/lang/Thread;
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    sget-object v0, Lkotlinx/coroutines/u;->bRT:Ljava/lang/Thread;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Ljava/lang/Thread;
-
-    move-object v1, p0
-
-    check-cast v1, Ljava/lang/Runnable;
-
-    const-string v2, "kotlinx.coroutines.DefaultExecutor"
-
-    invoke-direct {v0, v1, v2}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
-
-    sput-object v0, Lkotlinx/coroutines/u;->bRT:Ljava/lang/Thread;
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Ljava/lang/Thread;->setDaemon(Z)V
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->start()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_0
-    monitor-exit p0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method private final declared-synchronized FJ()Z
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/u;->FG()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x0
-
-    monitor-exit p0
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    :try_start_1
-    sput v0, Lkotlinx/coroutines/u;->bRU:I
-
-    move-object v1, p0
-
-    check-cast v1, Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->notifyAll()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    return v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method private final declared-synchronized FK()V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/u;->FG()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/u;->bRU:I
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lkotlinx/coroutines/ae;->bSi:Ljava/lang/Object;
-
-    iput-object v0, p0, Lkotlinx/coroutines/ae;->bSk:Ljava/lang/Object;
-
-    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
-
 
 # virtual methods
-.method public final run()V
-    .locals 12
+.method public final m(Ljava/lang/Runnable;)Ljava/lang/Runnable;
+    .locals 1
 
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    const-string v0, "block"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :try_start_0
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FJ()Z
-
-    move-result v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v1, :cond_1
-
-    sput-object v0, Lkotlinx/coroutines/u;->bRT:Ljava/lang/Thread;
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FK()V
-
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/u;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FH()Ljava/lang/Thread;
-
-    :cond_0
-    return-void
-
-    :cond_1
-    const-wide v1, 0x7fffffffffffffffL
-
-    move-wide v3, v1
-
-    :cond_2
-    :goto_0
-    :try_start_1
-    invoke-static {}, Ljava/lang/Thread;->interrupted()Z
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/u;->FT()J
-
-    move-result-wide v5
-
-    const-wide/16 v7, 0x0
-
-    cmp-long v9, v5, v1
-
-    if-nez v9, :cond_7
-
-    cmp-long v9, v3, v1
-
-    if-nez v9, :cond_6
-
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    move-result-object v9
-
-    invoke-interface {v9}, Lkotlinx/coroutines/ba;->nanoTime()J
-
-    move-result-wide v9
-
-    cmp-long v11, v3, v1
-
-    if-nez v11, :cond_3
-
-    sget-wide v3, Lkotlinx/coroutines/u;->bRS:J
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 v11, 0x0
-
-    add-long/2addr v3, v9
-
-    :cond_3
-    const/4 v11, 0x0
-
-    sub-long v9, v3, v9
-
-    cmp-long v11, v9, v7
-
-    if-gtz v11, :cond_5
-
-    sput-object v0, Lkotlinx/coroutines/u;->bRT:Ljava/lang/Thread;
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FK()V
-
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/u;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_4
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FH()Ljava/lang/Thread;
-
-    :cond_4
-    return-void
-
-    :cond_5
-    :goto_1
-    :try_start_2
-    invoke-static {v5, v6, v9, v10}, Lkotlin/ranges/b;->g(JJ)J
-
-    move-result-wide v5
-
-    goto :goto_2
-
-    :cond_6
-    sget-wide v9, Lkotlinx/coroutines/u;->bRS:J
-
-    goto :goto_1
-
-    :cond_7
-    :goto_2
-    cmp-long v9, v5, v7
-
-    if-lez v9, :cond_2
-
-    invoke-static {}, Lkotlinx/coroutines/u;->FG()Z
-
-    move-result v7
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    if-eqz v7, :cond_9
-
-    sput-object v0, Lkotlinx/coroutines/u;->bRT:Ljava/lang/Thread;
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FK()V
-
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/u;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_8
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FH()Ljava/lang/Thread;
-
-    :cond_8
-    return-void
-
-    :cond_9
-    :try_start_3
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    move-result-object v7
-
-    invoke-interface {v7, p0, v5, v6}, Lkotlinx/coroutines/ba;->parkNanos(Ljava/lang/Object;J)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    sput-object v0, Lkotlinx/coroutines/u;->bRT:Ljava/lang/Thread;
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FK()V
-
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/u;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_a
-
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FH()Ljava/lang/Thread;
-
-    :cond_a
-    throw v1
+    return-object p1
 .end method
 
-.method protected final unpark()V
+.method public final nanoTime()J
     .locals 2
 
-    invoke-static {}, Lkotlinx/coroutines/bb;->Gh()Lkotlinx/coroutines/ba;
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
 
-    move-result-object v0
+    move-result-wide v0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/u;->FH()Ljava/lang/Thread;
+    return-wide v0
+.end method
 
-    move-result-object v1
+.method public final parkNanos(Ljava/lang/Object;J)V
+    .locals 1
 
-    invoke-interface {v0, v1}, Lkotlinx/coroutines/ba;->unpark(Ljava/lang/Thread;)V
+    const-string v0, "blocker"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p2, p3}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(Ljava/lang/Object;J)V
+
+    return-void
+.end method
+
+.method public final unpark(Ljava/lang/Thread;)V
+    .locals 1
+
+    const-string v0, "thread"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/v.smali b/com.discord/smali_classes2/kotlinx/coroutines/v.smali
index 7061829d8b..3f62a6114b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/v.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/v.smali
@@ -1,77 +1,21 @@
 .class public final Lkotlinx/coroutines/v;
-.super Ljava/lang/Object;
-
-# interfaces
-.implements Lkotlinx/coroutines/ba;
-
-
-# static fields
-.field public static final bRW:Lkotlinx/coroutines/v;
+.super Ljava/lang/RuntimeException;
+.source "Exceptions.kt"
 
 
 # direct methods
-.method static constructor <clinit>()V
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    new-instance v0, Lkotlinx/coroutines/v;
-
-    invoke-direct {v0}, Lkotlinx/coroutines/v;-><init>()V
-
-    sput-object v0, Lkotlinx/coroutines/v;->bRW:Lkotlinx/coroutines/v;
-
-    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 m(Ljava/lang/Runnable;)Ljava/lang/Runnable;
-    .locals 1
-
-    const-string v0, "block"
+    const-string v0, "message"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object p1
-.end method
+    const-string v0, "cause"
 
-.method public final nanoTime()J
-    .locals 2
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final parkNanos(Ljava/lang/Object;J)V
-    .locals 1
-
-    const-string v0, "blocker"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1, p2, p3}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(Ljava/lang/Object;J)V
-
-    return-void
-.end method
-
-.method public final unpark(Ljava/lang/Thread;)V
-    .locals 1
-
-    const-string v0, "thread"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
+    invoke-direct {p0, p1, p2}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/w.smali b/com.discord/smali_classes2/kotlinx/coroutines/w.smali
index 01d42bc379..7d48966180 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/w.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/w.smali
@@ -1,20 +1,574 @@
 .class public final Lkotlinx/coroutines/w;
-.super Ljava/lang/RuntimeException;
+.super Ljava/lang/Object;
+.source "Dispatched.kt"
+
+# interfaces
+.implements Lkotlin/c/c;
+.implements Lkotlinx/coroutines/y;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/c/c<",
+        "TT;>;",
+        "Lkotlinx/coroutines/y<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public _state:Ljava/lang/Object;
+
+.field bRU:I
+
+.field public final bRV:Ljava/lang/Object;
+
+.field public final bRW:Lkotlinx/coroutines/k;
+
+.field public final bRX:Lkotlin/c/c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/c/c<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+.method public constructor <init>(Lkotlinx/coroutines/k;Lkotlin/c/c;)V
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlinx/coroutines/k;",
+            "Lkotlin/c/c<",
+            "-TT;>;)V"
+        }
+    .end annotation
 
-    const-string v0, "message"
+    const-string v0, "dispatcher"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "cause"
+    const-string v0, "continuation"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p1, p2}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lkotlinx/coroutines/w;->bRW:Lkotlinx/coroutines/k;
+
+    iput-object p2, p0, Lkotlinx/coroutines/w;->bRX:Lkotlin/c/c;
+
+    invoke-static {}, Lkotlinx/coroutines/x;->FN()Lkotlinx/coroutines/a/o;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lkotlinx/coroutines/w;->_state:Ljava/lang/Object;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/w;->getContext()Lkotlin/c/e;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lkotlinx/coroutines/a/q;->d(Lkotlin/c/e;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lkotlinx/coroutines/w;->bRV:Ljava/lang/Object;
 
     return-void
 .end method
+
+
+# virtual methods
+.method public final FK()I
+    .locals 1
+
+    iget v0, p0, Lkotlinx/coroutines/w;->bRU:I
+
+    return v0
+.end method
+
+.method public final FL()Ljava/lang/Object;
+    .locals 2
+
+    iget-object v0, p0, Lkotlinx/coroutines/w;->_state:Ljava/lang/Object;
+
+    invoke-static {}, Lkotlinx/coroutines/x;->FN()Lkotlinx/coroutines/a/o;
+
+    move-result-object v1
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    invoke-static {}, Lkotlinx/coroutines/x;->FN()Lkotlinx/coroutines/a/o;
+
+    move-result-object v1
+
+    iput-object v1, p0, Lkotlinx/coroutines/w;->_state:Ljava/lang/Object;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Check failed."
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    throw v0
+.end method
+
+.method public final FM()Lkotlin/c/c;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/c/c<",
+            "TT;>;"
+        }
+    .end annotation
+
+    move-object v0, p0
+
+    check-cast v0, Lkotlin/c/c;
+
+    return-object v0
+.end method
+
+.method public final bK(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Object;",
+            ")TT;"
+        }
+    .end annotation
+
+    return-object p1
+.end method
+
+.method public final bL(Ljava/lang/Object;)Ljava/lang/Throwable;
+    .locals 2
+
+    instance-of v0, p1, Lkotlinx/coroutines/f;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    move-object p1, v1
+
+    :cond_0
+    check-cast p1, Lkotlinx/coroutines/f;
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p1, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
+
+    return-object p1
+
+    :cond_1
+    return-object v1
+.end method
+
+.method public final getContext()Lkotlin/c/e;
+    .locals 1
+
+    iget-object v0, p0, Lkotlinx/coroutines/w;->bRX:Lkotlin/c/c;
+
+    invoke-interface {v0}, Lkotlin/c/c;->getContext()Lkotlin/c/e;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final resumeWith(Ljava/lang/Object;)V
+    .locals 5
+
+    iget-object v0, p0, Lkotlinx/coroutines/w;->bRX:Lkotlin/c/c;
+
+    invoke-interface {v0}, Lkotlin/c/c;->getContext()Lkotlin/c/e;
+
+    move-result-object v0
+
+    invoke-static {p1}, Lkotlinx/coroutines/g;->bH(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lkotlinx/coroutines/w;->bRW:Lkotlinx/coroutines/k;
+
+    invoke-virtual {v2, v0}, Lkotlinx/coroutines/k;->b(Lkotlin/c/e;)Z
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_0
+
+    iput-object v1, p0, Lkotlinx/coroutines/w;->_state:Ljava/lang/Object;
+
+    iput v3, p0, Lkotlinx/coroutines/w;->bRU:I
+
+    iget-object p1, p0, Lkotlinx/coroutines/w;->bRW:Lkotlinx/coroutines/k;
+
+    move-object v1, p0
+
+    check-cast v1, Ljava/lang/Runnable;
+
+    invoke-virtual {p1, v0, v1}, Lkotlinx/coroutines/k;->a(Lkotlin/c/e;Ljava/lang/Runnable;)V
+
+    return-void
+
+    :cond_0
+    sget-object v0, Lkotlinx/coroutines/bc;->bSD:Lkotlinx/coroutines/bc;
+
+    sget-object v0, Lkotlinx/coroutines/bc;->bSC:Lkotlinx/coroutines/a/r;
+
+    invoke-virtual {v0}, Lkotlinx/coroutines/a/r;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlinx/coroutines/bc$a;
+
+    iget-boolean v2, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
+
+    if-eqz v2, :cond_1
+
+    iput-object v1, p0, Lkotlinx/coroutines/w;->_state:Ljava/lang/Object;
+
+    iput v3, p0, Lkotlinx/coroutines/w;->bRU:I
+
+    iget-object p1, v0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
+
+    invoke-virtual {p1, p0}, Lkotlinx/coroutines/a/b;->addLast(Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_1
+    const-string v1, "eventLoop"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x1
+
+    :try_start_0
+    iput-boolean v1, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/w;->getContext()Lkotlin/c/e;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lkotlinx/coroutines/w;->bRV:Ljava/lang/Object;
+
+    invoke-static {v1, v2}, Lkotlinx/coroutines/a/q;->b(Lkotlin/c/e;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v4, p0, Lkotlinx/coroutines/w;->bRX:Lkotlin/c/c;
+
+    invoke-interface {v4, p1}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    invoke-static {v1, v2}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+
+    :goto_0
+    iget-object p1, v0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
+
+    invoke-virtual {p1}, Lkotlinx/coroutines/a/b;->Gi()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Runnable;
+    :try_end_2
+    .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-nez p1, :cond_2
+
+    iput-boolean v3, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
+
+    return-void
+
+    :cond_2
+    :try_start_3
+    invoke-interface {p1}, Ljava/lang/Runnable;->run()V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {v1, v2}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+
+    throw p1
+    :try_end_3
+    .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    goto :goto_1
+
+    :catch_0
+    move-exception p1
+
+    :try_start_4
+    iget-object v1, v0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
+
+    invoke-virtual {v1}, Lkotlinx/coroutines/a/b;->clear()V
+
+    new-instance v1, Lkotlinx/coroutines/v;
+
+    const-string v2, "Unexpected exception in undispatched event loop, clearing pending tasks"
+
+    invoke-direct {v1, v2, p1}, Lkotlinx/coroutines/v;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    throw v1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :goto_1
+    iput-boolean v3, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
+
+    throw p1
+
+    return-void
+.end method
+
+.method public final run()V
+    .locals 6
+
+    :try_start_0
+    invoke-interface {p0}, Lkotlinx/coroutines/y;->FM()Lkotlin/c/c;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlinx/coroutines/w;
+
+    iget-object v1, v0, Lkotlinx/coroutines/w;->bRX:Lkotlin/c/c;
+
+    invoke-interface {v1}, Lkotlin/c/c;->getContext()Lkotlin/c/e;
+
+    move-result-object v2
+
+    invoke-interface {p0}, Lkotlinx/coroutines/y;->FK()I
+
+    move-result v3
+
+    const/4 v4, 0x1
+
+    if-ne v3, v4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :goto_0
+    if-eqz v4, :cond_1
+
+    sget-object v3, Lkotlinx/coroutines/ak;->bSl:Lkotlinx/coroutines/ak$b;
+
+    check-cast v3, Lkotlin/c/e$c;
+
+    invoke-interface {v2, v3}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
+
+    move-result-object v3
+
+    check-cast v3, Lkotlinx/coroutines/ak;
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :goto_1
+    invoke-interface {p0}, Lkotlinx/coroutines/y;->FL()Ljava/lang/Object;
+
+    move-result-object v4
+
+    iget-object v0, v0, Lkotlinx/coroutines/w;->bRV:Ljava/lang/Object;
+
+    invoke-static {v2, v0}, Lkotlinx/coroutines/a/q;->b(Lkotlin/c/e;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eqz v3, :cond_2
+
+    :try_start_1
+    invoke-interface {v3}, Lkotlinx/coroutines/ak;->isActive()Z
+
+    move-result v5
+
+    if-nez v5, :cond_2
+
+    invoke-interface {v3}, Lkotlinx/coroutines/ak;->FU()Ljava/util/concurrent/CancellationException;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Throwable;
+
+    sget-object v4, Lkotlin/m;->bPj:Lkotlin/m$a;
+
+    invoke-static {v3}, Lkotlin/n;->n(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-static {v3}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-interface {v1, v3}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :cond_2
+    invoke-interface {p0, v4}, Lkotlinx/coroutines/y;->bL(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_3
+
+    sget-object v4, Lkotlin/m;->bPj:Lkotlin/m$a;
+
+    invoke-static {v3}, Lkotlin/n;->n(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-static {v3}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-interface {v1, v3}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :cond_3
+    invoke-interface {p0, v4}, Lkotlinx/coroutines/y;->bK(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    sget-object v4, Lkotlin/m;->bPj:Lkotlin/m$a;
+
+    invoke-static {v3}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-interface {v1, v3}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
+
+    :goto_2
+    sget-object v1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    invoke-static {v2, v0}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {v2, v0}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+
+    throw v1
+    :try_end_2
+    .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lkotlinx/coroutines/v;
+
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "Unexpected exception running "
+
+    invoke-virtual {v3, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2, v0}, Lkotlinx/coroutines/v;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    throw v1
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "DispatchedContinuation["
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lkotlinx/coroutines/w;->bRW:Lkotlinx/coroutines/k;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lkotlinx/coroutines/w;->bRX:Lkotlin/c/c;
+
+    invoke-static {v1}, Lkotlinx/coroutines/s;->d(Lkotlin/c/c;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/x.smali b/com.discord/smali_classes2/kotlinx/coroutines/x.smali
index 42e2201410..0523310fa0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/x.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/x.smali
@@ -1,445 +1,145 @@
 .class public final Lkotlinx/coroutines/x;
 .super Ljava/lang/Object;
-
-# interfaces
-.implements Lkotlin/c/c;
-.implements Lkotlinx/coroutines/z;
+.source "Dispatched.kt"
 
 
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/c/c<",
-        "TT;>;",
-        "Lkotlinx/coroutines/z<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public bRX:Ljava/lang/Object;
-
-.field bRY:I
-
-.field public final bRZ:Ljava/lang/Object;
-
-.field public final bSa:Lkotlinx/coroutines/k;
-
-.field public final bSb:Lkotlin/c/c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/c/c<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
+# static fields
+.field private static final bRY:Lkotlinx/coroutines/a/o;
 
 
 # direct methods
-.method public constructor <init>(Lkotlinx/coroutines/k;Lkotlin/c/c;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlinx/coroutines/k;",
-            "Lkotlin/c/c<",
-            "-TT;>;)V"
-        }
-    .end annotation
+.method static constructor <clinit>()V
+    .locals 2
 
-    const-string v0, "dispatcher"
+    new-instance v0, Lkotlinx/coroutines/a/o;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "UNDEFINED"
 
-    const-string v0, "continuation"
+    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lkotlinx/coroutines/x;->bSa:Lkotlinx/coroutines/k;
-
-    iput-object p2, p0, Lkotlinx/coroutines/x;->bSb:Lkotlin/c/c;
-
-    invoke-static {}, Lkotlinx/coroutines/y;->FO()Lkotlinx/coroutines/a/o;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lkotlinx/coroutines/x;->bRX:Ljava/lang/Object;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/x;->getContext()Lkotlin/c/e;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lkotlinx/coroutines/a/q;->d(Lkotlin/c/e;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lkotlinx/coroutines/x;->bRZ:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/x;->bRY:Lkotlinx/coroutines/a/o;
 
     return-void
 .end method
 
-
-# virtual methods
-.method public final FL()I
+.method public static final synthetic FN()Lkotlinx/coroutines/a/o;
     .locals 1
 
-    iget v0, p0, Lkotlinx/coroutines/x;->bRY:I
-
-    return v0
-.end method
-
-.method public final FM()Ljava/lang/Object;
-    .locals 2
-
-    iget-object v0, p0, Lkotlinx/coroutines/x;->bRX:Ljava/lang/Object;
-
-    invoke-static {}, Lkotlinx/coroutines/y;->FO()Lkotlinx/coroutines/a/o;
-
-    move-result-object v1
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    invoke-static {}, Lkotlinx/coroutines/y;->FO()Lkotlinx/coroutines/a/o;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lkotlinx/coroutines/x;->bRX:Ljava/lang/Object;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Check failed."
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    throw v0
-.end method
-
-.method public final FN()Lkotlin/c/c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/c/c<",
-            "TT;>;"
-        }
-    .end annotation
-
-    move-object v0, p0
-
-    check-cast v0, Lkotlin/c/c;
+    sget-object v0, Lkotlinx/coroutines/x;->bRY:Lkotlinx/coroutines/a/o;
 
     return-object v0
 .end method
 
-.method public final bK(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public static final a(Lkotlin/c/c;Ljava/lang/Object;)V
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
             "Ljava/lang/Object;",
             ">(",
-            "Ljava/lang/Object;",
-            ")TT;"
+            "Lkotlin/c/c<",
+            "-TT;>;TT;)V"
         }
     .end annotation
 
-    return-object p1
-.end method
+    const-string v0, "receiver$0"
 
-.method public final bL(Ljava/lang/Object;)Ljava/lang/Throwable;
-    .locals 2
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v0, p1, Lkotlinx/coroutines/f;
+    instance-of v0, p0, Lkotlinx/coroutines/w;
 
-    const/4 v1, 0x0
+    if-eqz v0, :cond_5
 
-    if-nez v0, :cond_0
+    check-cast p0, Lkotlinx/coroutines/w;
 
-    move-object p1, v1
+    iget-object v0, p0, Lkotlinx/coroutines/w;->bRW:Lkotlinx/coroutines/k;
 
-    :cond_0
-    check-cast p1, Lkotlinx/coroutines/f;
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p1, Lkotlinx/coroutines/f;->cause:Ljava/lang/Throwable;
-
-    return-object p1
-
-    :cond_1
-    return-object v1
-.end method
-
-.method public final getContext()Lkotlin/c/e;
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/x;->bSb:Lkotlin/c/c;
-
-    invoke-interface {v0}, Lkotlin/c/c;->getContext()Lkotlin/c/e;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final resumeWith(Ljava/lang/Object;)V
-    .locals 5
-
-    iget-object v0, p0, Lkotlinx/coroutines/x;->bSb:Lkotlin/c/c;
-
-    invoke-interface {v0}, Lkotlin/c/c;->getContext()Lkotlin/c/e;
-
-    move-result-object v0
-
-    invoke-static {p1}, Lkotlinx/coroutines/g;->bH(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/w;->getContext()Lkotlin/c/e;
 
     move-result-object v1
 
-    iget-object v2, p0, Lkotlinx/coroutines/x;->bSa:Lkotlinx/coroutines/k;
+    invoke-virtual {v0, v1}, Lkotlinx/coroutines/k;->b(Lkotlin/c/e;)Z
 
-    invoke-virtual {v2, v0}, Lkotlinx/coroutines/k;->b(Lkotlin/c/e;)Z
+    move-result v0
 
-    move-result v2
+    const/4 v1, 0x1
 
-    const/4 v3, 0x0
+    if-eqz v0, :cond_0
 
-    if-eqz v2, :cond_0
+    iput-object p1, p0, Lkotlinx/coroutines/w;->_state:Ljava/lang/Object;
 
-    iput-object v1, p0, Lkotlinx/coroutines/x;->bRX:Ljava/lang/Object;
+    iput v1, p0, Lkotlinx/coroutines/w;->bRU:I
 
-    iput v3, p0, Lkotlinx/coroutines/x;->bRY:I
+    iget-object p1, p0, Lkotlinx/coroutines/w;->bRW:Lkotlinx/coroutines/k;
 
-    iget-object p1, p0, Lkotlinx/coroutines/x;->bSa:Lkotlinx/coroutines/k;
+    invoke-virtual {p0}, Lkotlinx/coroutines/w;->getContext()Lkotlin/c/e;
 
-    move-object v1, p0
+    move-result-object v0
 
-    check-cast v1, Ljava/lang/Runnable;
+    check-cast p0, Ljava/lang/Runnable;
 
-    invoke-virtual {p1, v0, v1}, Lkotlinx/coroutines/k;->a(Lkotlin/c/e;Ljava/lang/Runnable;)V
+    invoke-virtual {p1, v0, p0}, Lkotlinx/coroutines/k;->a(Lkotlin/c/e;Ljava/lang/Runnable;)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/bd;->bSO:Lkotlinx/coroutines/bd;
+    sget-object v0, Lkotlinx/coroutines/bc;->bSD:Lkotlinx/coroutines/bc;
 
-    sget-object v0, Lkotlinx/coroutines/bd;->bSN:Lkotlinx/coroutines/a/r;
+    sget-object v0, Lkotlinx/coroutines/bc;->bSC:Lkotlinx/coroutines/a/r;
 
     invoke-virtual {v0}, Lkotlinx/coroutines/a/r;->get()Ljava/lang/Object;
 
     move-result-object v0
 
-    check-cast v0, Lkotlinx/coroutines/bd$a;
+    check-cast v0, Lkotlinx/coroutines/bc$a;
 
-    iget-boolean v2, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
+    iget-boolean v2, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
     if-eqz v2, :cond_1
 
-    iput-object v1, p0, Lkotlinx/coroutines/x;->bRX:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/w;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/x;->bRY:I
+    iput v1, p0, Lkotlinx/coroutines/w;->bRU:I
 
-    iget-object p1, v0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
+    iget-object p1, v0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
 
     invoke-virtual {p1, p0}, Lkotlinx/coroutines/a/b;->addLast(Ljava/lang/Object;)V
 
     return-void
 
     :cond_1
-    const-string v1, "eventLoop"
+    const-string v2, "eventLoop"
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x1
+    const/4 v2, 0x0
 
     :try_start_0
-    iput-boolean v1, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
+    iput-boolean v1, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/x;->getContext()Lkotlin/c/e;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lkotlinx/coroutines/x;->bRZ:Ljava/lang/Object;
-
-    invoke-static {v1, v2}, Lkotlinx/coroutines/a/q;->b(Lkotlin/c/e;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v4, p0, Lkotlinx/coroutines/x;->bSb:Lkotlin/c/c;
-
-    invoke-interface {v4, p1}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
-
-    sget-object p1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    invoke-static {v1, v2}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
-
-    :goto_0
-    iget-object p1, v0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/a/b;->Gj()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Runnable;
-    :try_end_2
-    .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-nez p1, :cond_2
-
-    iput-boolean v3, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
-
-    return-void
-
-    :cond_2
-    :try_start_3
-    invoke-interface {p1}, Ljava/lang/Runnable;->run()V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {v1, v2}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
-
-    throw p1
-    :try_end_3
-    .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_0
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    goto :goto_1
-
-    :catch_0
-    move-exception p1
-
-    :try_start_4
-    iget-object v1, v0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
-
-    invoke-virtual {v1}, Lkotlinx/coroutines/a/b;->clear()V
-
-    new-instance v1, Lkotlinx/coroutines/w;
-
-    const-string v2, "Unexpected exception in undispatched event loop, clearing pending tasks"
-
-    invoke-direct {v1, v2, p1}, Lkotlinx/coroutines/w;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    throw v1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :goto_1
-    iput-boolean v3, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
-
-    throw p1
-.end method
-
-.method public final run()V
-    .locals 6
-
-    :try_start_0
-    invoke-interface {p0}, Lkotlinx/coroutines/z;->FN()Lkotlin/c/c;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlinx/coroutines/x;
-
-    iget-object v1, v0, Lkotlinx/coroutines/x;->bSb:Lkotlin/c/c;
-
-    invoke-interface {v1}, Lkotlin/c/c;->getContext()Lkotlin/c/e;
-
-    move-result-object v2
-
-    invoke-interface {p0}, Lkotlinx/coroutines/z;->FL()I
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    if-ne v3, v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v4, 0x0
-
-    :goto_0
-    if-eqz v4, :cond_1
-
-    sget-object v3, Lkotlinx/coroutines/al;->bSs:Lkotlinx/coroutines/al$b;
-
-    check-cast v3, Lkotlin/c/e$c;
-
-    invoke-interface {v2, v3}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
+    invoke-virtual {p0}, Lkotlinx/coroutines/w;->getContext()Lkotlin/c/e;
 
     move-result-object v3
 
-    check-cast v3, Lkotlinx/coroutines/al;
+    sget-object v4, Lkotlinx/coroutines/ak;->bSl:Lkotlinx/coroutines/ak$b;
 
-    goto :goto_1
+    check-cast v4, Lkotlin/c/e$c;
 
-    :cond_1
-    const/4 v3, 0x0
+    invoke-interface {v3, v4}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
 
-    :goto_1
-    invoke-interface {p0}, Lkotlinx/coroutines/z;->FM()Ljava/lang/Object;
+    move-result-object v3
 
-    move-result-object v4
-
-    iget-object v0, v0, Lkotlinx/coroutines/x;->bRZ:Ljava/lang/Object;
-
-    invoke-static {v2, v0}, Lkotlinx/coroutines/a/q;->b(Lkotlin/c/e;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+    check-cast v3, Lkotlinx/coroutines/ak;
 
     if-eqz v3, :cond_2
 
-    :try_start_1
-    invoke-interface {v3}, Lkotlinx/coroutines/al;->isActive()Z
+    invoke-interface {v3}, Lkotlinx/coroutines/ak;->isActive()Z
 
-    move-result v5
+    move-result v4
 
-    if-nez v5, :cond_2
+    if-nez v4, :cond_2
 
-    invoke-interface {v3}, Lkotlinx/coroutines/al;->FV()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v3}, Lkotlinx/coroutines/ak;->FU()Ljava/util/concurrent/CancellationException;
 
     move-result-object v3
 
@@ -455,119 +155,122 @@
 
     move-result-object v3
 
-    :goto_2
-    invoke-interface {v1, v3}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
+    invoke-interface {p0, v3}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
 
-    goto :goto_3
-
-    :catchall_0
-    move-exception v1
-
-    goto :goto_4
+    goto :goto_0
 
     :cond_2
-    invoke-interface {p0, v4}, Lkotlinx/coroutines/z;->bL(Ljava/lang/Object;)Ljava/lang/Throwable;
+    const/4 v1, 0x0
+
+    :goto_0
+    if-nez v1, :cond_3
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/w;->getContext()Lkotlin/c/e;
+
+    move-result-object v1
+
+    iget-object v3, p0, Lkotlinx/coroutines/w;->bRV:Ljava/lang/Object;
+
+    invoke-static {v1, v3}, Lkotlinx/coroutines/a/q;->b(Lkotlin/c/e;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    if-eqz v3, :cond_3
+    :try_start_1
+    iget-object p0, p0, Lkotlinx/coroutines/w;->bRX:Lkotlin/c/c;
 
     sget-object v4, Lkotlin/m;->bPj:Lkotlin/m$a;
 
-    invoke-static {v3}, Lkotlin/n;->n(Ljava/lang/Throwable;)Ljava/lang/Object;
+    invoke-static {p1}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object p1
 
-    invoke-static {v3}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p0, p1}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
 
-    move-result-object v3
-
-    goto :goto_2
-
-    :cond_3
-    invoke-interface {p0, v4}, Lkotlinx/coroutines/z;->bK(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    sget-object v4, Lkotlin/m;->bPj:Lkotlin/m$a;
-
-    invoke-static {v3}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    goto :goto_2
-
-    :goto_3
-    sget-object v1, Lkotlin/Unit;->bPm:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bPm:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-static {v2, v0}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+    invoke-static {v1, v3}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p0
+
+    invoke-static {v1, v3}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+
+    throw p0
+
+    :cond_3
+    :goto_1
+    iget-object p0, v0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/a/b;->Gi()Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/lang/Runnable;
+    :try_end_2
+    .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-nez p0, :cond_4
+
+    iput-boolean v2, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
     return-void
 
-    :goto_4
-    invoke-static {v2, v0}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
+    :cond_4
+    :try_start_3
+    invoke-interface {p0}, Ljava/lang/Runnable;->run()V
+    :try_end_3
+    .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
-    throw v1
-    :try_end_2
-    .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0
+    goto :goto_1
+
+    :catchall_1
+    move-exception p0
+
+    goto :goto_2
 
     :catch_0
-    move-exception v0
+    move-exception p0
 
-    new-instance v1, Lkotlinx/coroutines/w;
+    :try_start_4
+    iget-object p1, v0, Lkotlinx/coroutines/bc$a;->bSE:Lkotlinx/coroutines/a/b;
 
-    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p1}, Lkotlinx/coroutines/a/b;->clear()V
 
-    move-result-object v2
+    new-instance p1, Lkotlinx/coroutines/v;
 
-    const-string v3, "Unexpected exception running "
+    const-string v1, "Unexpected exception in undispatched event loop, clearing pending tasks"
 
-    invoke-virtual {v3, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p1, v1, p0}, Lkotlinx/coroutines/v;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    move-result-object v2
+    check-cast p1, Ljava/lang/Throwable;
 
-    invoke-direct {v1, v2, v0}, Lkotlinx/coroutines/w;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+    throw p1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
-    check-cast v1, Ljava/lang/Throwable;
+    :goto_2
+    iput-boolean v2, v0, Lkotlinx/coroutines/bc$a;->bSd:Z
 
-    throw v1
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "DispatchedContinuation["
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lkotlinx/coroutines/x;->bSa:Lkotlinx/coroutines/k;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lkotlinx/coroutines/x;->bSb:Lkotlin/c/c;
-
-    invoke-static {v1}, Lkotlinx/coroutines/t;->d(Lkotlin/c/c;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
+    throw p0
+
+    :cond_5
+    sget-object v0, Lkotlin/m;->bPj:Lkotlin/m$a;
+
+    invoke-static {p1}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/y.smali b/com.discord/smali_classes2/kotlinx/coroutines/y.smali
index 63376dcddb..493cd0e382 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/y.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/y.smali
@@ -1,275 +1,51 @@
-.class public final Lkotlinx/coroutines/y;
+.class public interface abstract Lkotlinx/coroutines/y;
 .super Ljava/lang/Object;
+.source "Dispatched.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
 
 
-# static fields
-.field private static final bSc:Lkotlinx/coroutines/a/o;
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Runnable;"
+    }
+.end annotation
 
 
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lkotlinx/coroutines/a/o;
-
-    const-string v1, "UNDEFINED"
-
-    invoke-direct {v0, v1}, Lkotlinx/coroutines/a/o;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lkotlinx/coroutines/y;->bSc:Lkotlinx/coroutines/a/o;
-
-    return-void
+# virtual methods
+.method public abstract FK()I
 .end method
 
-.method public static final synthetic FO()Lkotlinx/coroutines/a/o;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/y;->bSc:Lkotlinx/coroutines/a/o;
-
-    return-object v0
+.method public abstract FL()Ljava/lang/Object;
 .end method
 
-.method public static final a(Lkotlin/c/c;Ljava/lang/Object;)V
-    .locals 5
+.method public abstract FM()Lkotlin/c/c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/c/c<",
+            "TT;>;"
+        }
+    .end annotation
+.end method
+
+.method public abstract bK(Ljava/lang/Object;)Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
             "Ljava/lang/Object;",
             ">(",
-            "Lkotlin/c/c<",
-            "-TT;>;TT;)V"
+            "Ljava/lang/Object;",
+            ")TT;"
         }
     .end annotation
-
-    const-string v0, "receiver$0"
-
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    instance-of v0, p0, Lkotlinx/coroutines/x;
-
-    if-eqz v0, :cond_5
-
-    check-cast p0, Lkotlinx/coroutines/x;
-
-    iget-object v0, p0, Lkotlinx/coroutines/x;->bSa:Lkotlinx/coroutines/k;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/x;->getContext()Lkotlin/c/e;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lkotlinx/coroutines/k;->b(Lkotlin/c/e;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-object p1, p0, Lkotlinx/coroutines/x;->bRX:Ljava/lang/Object;
-
-    iput v1, p0, Lkotlinx/coroutines/x;->bRY:I
-
-    iget-object p1, p0, Lkotlinx/coroutines/x;->bSa:Lkotlinx/coroutines/k;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/x;->getContext()Lkotlin/c/e;
-
-    move-result-object v0
-
-    check-cast p0, Ljava/lang/Runnable;
-
-    invoke-virtual {p1, v0, p0}, Lkotlinx/coroutines/k;->a(Lkotlin/c/e;Ljava/lang/Runnable;)V
-
-    return-void
-
-    :cond_0
-    sget-object v0, Lkotlinx/coroutines/bd;->bSO:Lkotlinx/coroutines/bd;
-
-    sget-object v0, Lkotlinx/coroutines/bd;->bSN:Lkotlinx/coroutines/a/r;
-
-    invoke-virtual {v0}, Lkotlinx/coroutines/a/r;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlinx/coroutines/bd$a;
-
-    iget-boolean v2, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
-
-    if-eqz v2, :cond_1
-
-    iput-object p1, p0, Lkotlinx/coroutines/x;->bRX:Ljava/lang/Object;
-
-    iput v1, p0, Lkotlinx/coroutines/x;->bRY:I
-
-    iget-object p1, v0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
-
-    invoke-virtual {p1, p0}, Lkotlinx/coroutines/a/b;->addLast(Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_1
-    const-string v2, "eventLoop"
-
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    :try_start_0
-    iput-boolean v1, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/x;->getContext()Lkotlin/c/e;
-
-    move-result-object v3
-
-    sget-object v4, Lkotlinx/coroutines/al;->bSs:Lkotlinx/coroutines/al$b;
-
-    check-cast v4, Lkotlin/c/e$c;
-
-    invoke-interface {v3, v4}, Lkotlin/c/e;->get(Lkotlin/c/e$c;)Lkotlin/c/e$b;
-
-    move-result-object v3
-
-    check-cast v3, Lkotlinx/coroutines/al;
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {v3}, Lkotlinx/coroutines/al;->isActive()Z
-
-    move-result v4
-
-    if-nez v4, :cond_2
-
-    invoke-interface {v3}, Lkotlinx/coroutines/al;->FV()Ljava/util/concurrent/CancellationException;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Throwable;
-
-    sget-object v4, Lkotlin/m;->bPj:Lkotlin/m$a;
-
-    invoke-static {v3}, Lkotlin/n;->n(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-static {v3}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-interface {p0, v3}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_0
-    if-nez v1, :cond_3
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/x;->getContext()Lkotlin/c/e;
-
-    move-result-object v1
-
-    iget-object v3, p0, Lkotlinx/coroutines/x;->bRZ:Ljava/lang/Object;
-
-    invoke-static {v1, v3}, Lkotlinx/coroutines/a/q;->b(Lkotlin/c/e;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-    :try_end_0
-    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object p0, p0, Lkotlinx/coroutines/x;->bSb:Lkotlin/c/c;
-
-    sget-object v4, Lkotlin/m;->bPj:Lkotlin/m$a;
-
-    invoke-static {p1}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
-
-    sget-object p0, Lkotlin/Unit;->bPm:Lkotlin/Unit;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    invoke-static {v1, v3}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p0
-
-    invoke-static {v1, v3}, Lkotlinx/coroutines/a/q;->a(Lkotlin/c/e;Ljava/lang/Object;)V
-
-    throw p0
-
-    :cond_3
-    :goto_1
-    iget-object p0, v0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/a/b;->Gj()Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Ljava/lang/Runnable;
-    :try_end_2
-    .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-nez p0, :cond_4
-
-    iput-boolean v2, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
-
-    return-void
-
-    :cond_4
-    :try_start_3
-    invoke-interface {p0}, Ljava/lang/Runnable;->run()V
-    :try_end_3
-    .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_0
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception p0
-
-    goto :goto_2
-
-    :catch_0
-    move-exception p0
-
-    :try_start_4
-    iget-object p1, v0, Lkotlinx/coroutines/bd$a;->bSP:Lkotlinx/coroutines/a/b;
-
-    invoke-virtual {p1}, Lkotlinx/coroutines/a/b;->clear()V
-
-    new-instance p1, Lkotlinx/coroutines/w;
-
-    const-string v1, "Unexpected exception in undispatched event loop, clearing pending tasks"
-
-    invoke-direct {p1, v1, p0}, Lkotlinx/coroutines/w;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :goto_2
-    iput-boolean v2, v0, Lkotlinx/coroutines/bd$a;->bSh:Z
-
-    throw p0
-
-    :cond_5
-    sget-object v0, Lkotlin/m;->bPj:Lkotlin/m$a;
-
-    invoke-static {p1}, Lkotlin/m;->bx(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Lkotlin/c/c;->resumeWith(Ljava/lang/Object;)V
-
-    return-void
+.end method
+
+.method public abstract bL(Ljava/lang/Object;)Ljava/lang/Throwable;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/z.smali b/com.discord/smali_classes2/kotlinx/coroutines/z.smali
index b11beddb6c..8c03f799b0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/z.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/z.smali
@@ -1,50 +1,63 @@
-.class public interface abstract Lkotlinx/coroutines/z;
+.class public final Lkotlinx/coroutines/z;
 .super Ljava/lang/Object;
-
-# interfaces
-.implements Ljava/lang/Runnable;
+.source "Dispatchers.kt"
 
 
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Runnable;"
-    }
-.end annotation
+# static fields
+.field private static final bRZ:Lkotlinx/coroutines/k;
+
+.field private static final bSa:Lkotlinx/coroutines/k;
+
+.field private static final bSb:Lkotlinx/coroutines/k;
+
+.field public static final bSc:Lkotlinx/coroutines/z;
 
 
-# virtual methods
-.method public abstract FL()I
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lkotlinx/coroutines/z;
+
+    invoke-direct {v0}, Lkotlinx/coroutines/z;-><init>()V
+
+    sput-object v0, Lkotlinx/coroutines/z;->bSc:Lkotlinx/coroutines/z;
+
+    invoke-static {}, Lkotlinx/coroutines/j;->FD()Lkotlinx/coroutines/k;
+
+    move-result-object v0
+
+    sput-object v0, Lkotlinx/coroutines/z;->bRZ:Lkotlinx/coroutines/k;
+
+    sget-object v0, Lkotlinx/coroutines/bb;->bSB:Lkotlinx/coroutines/bb;
+
+    check-cast v0, Lkotlinx/coroutines/k;
+
+    sput-object v0, Lkotlinx/coroutines/z;->bSa:Lkotlinx/coroutines/k;
+
+    sget-object v0, Lkotlinx/coroutines/c/c;->bUa:Lkotlinx/coroutines/c/c;
+
+    invoke-static {}, Lkotlinx/coroutines/c/c;->GN()Lkotlinx/coroutines/k;
+
+    move-result-object v0
+
+    sput-object v0, Lkotlinx/coroutines/z;->bSb:Lkotlinx/coroutines/k;
+
+    return-void
 .end method
 
-.method public abstract FM()Ljava/lang/Object;
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
 .end method
 
-.method public abstract FN()Lkotlin/c/c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/c/c<",
-            "TT;>;"
-        }
-    .end annotation
-.end method
+.method public static final FO()Lkotlinx/coroutines/k;
+    .locals 1
 
-.method public abstract bK(Ljava/lang/Object;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Object;",
-            ")TT;"
-        }
-    .end annotation
-.end method
+    sget-object v0, Lkotlinx/coroutines/z;->bRZ:Lkotlinx/coroutines/k;
 
-.method public abstract bL(Ljava/lang/Object;)Ljava/lang/Throwable;
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotterknife/R.smali b/com.discord/smali_classes2/kotterknife/R.smali
index 3d0c8775b6..cf9d933515 100644
--- a/com.discord/smali_classes2/kotterknife/R.smali
+++ b/com.discord/smali_classes2/kotterknife/R.smali
@@ -1,5 +1,6 @@
 .class public final Lkotterknife/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/kotterknife/a.smali b/com.discord/smali_classes2/kotterknife/a.smali
index d42a0597d4..7d682b7094 100644
--- a/com.discord/smali_classes2/kotterknife/a.smali
+++ b/com.discord/smali_classes2/kotterknife/a.smali
@@ -1,9 +1,10 @@
 .class public final Lkotterknife/a;
 .super Ljava/lang/Object;
+.source "Kotterknife.kt"
 
 
 # static fields
-.field public static final bVg:Lkotterknife/a;
+.field public static final bUA:Lkotterknife/a;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lkotterknife/a;-><init>()V
 
-    sput-object v0, Lkotterknife/a;->bVg:Lkotterknife/a;
+    sput-object v0, Lkotterknife/a;->bUA:Lkotterknife/a;
 
     return-void
 .end method
@@ -34,7 +35,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bVo:Lkotterknife/d;
+    sget-object v0, Lkotterknife/d;->bUI:Lkotterknife/d;
 
     invoke-static {p0}, Lkotterknife/d;->reset(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotterknife/b$a.smali b/com.discord/smali_classes2/kotterknife/b$a.smali
index 12afd6fd82..f28c656756 100644
--- a/com.discord/smali_classes2/kotterknife/b$a.smali
+++ b/com.discord/smali_classes2/kotterknife/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/b$a;
 .super Lkotlin/jvm/internal/k;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali_classes2/kotterknife/b$b.smali b/com.discord/smali_classes2/kotterknife/b$b.smali
index 40f0f866dc..135785962b 100644
--- a/com.discord/smali_classes2/kotterknife/b$b.smali
+++ b/com.discord/smali_classes2/kotterknife/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/b$b;
 .super Lkotlin/jvm/internal/k;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali_classes2/kotterknife/b$c.smali b/com.discord/smali_classes2/kotterknife/b$c.smali
index 85dcbc3055..7072e6f499 100644
--- a/com.discord/smali_classes2/kotterknife/b$c.smali
+++ b/com.discord/smali_classes2/kotterknife/b$c.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/b$c;
 .super Lkotlin/jvm/internal/k;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali_classes2/kotterknife/b$d.smali b/com.discord/smali_classes2/kotterknife/b$d.smali
index ae1c1b0e8a..6ccb77df69 100644
--- a/com.discord/smali_classes2/kotterknife/b$d.smali
+++ b/com.discord/smali_classes2/kotterknife/b$d.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/b$d;
 .super Lkotlin/jvm/internal/k;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field public static final bVh:Lkotterknife/b$d;
+.field public static final bUB:Lkotterknife/b$d;
 
 
 # direct methods
@@ -39,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$d;-><init>()V
 
-    sput-object v0, Lkotterknife/b$d;->bVh:Lkotterknife/b$d;
+    sput-object v0, Lkotterknife/b$d;->bUB: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 b33740c4fc..f95d7731d6 100644
--- a/com.discord/smali_classes2/kotterknife/b$e.smali
+++ b/com.discord/smali_classes2/kotterknife/b$e.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/b$e;
 .super Lkotlin/jvm/internal/k;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field public static final bVi:Lkotterknife/b$e;
+.field public static final bUC:Lkotterknife/b$e;
 
 
 # direct methods
@@ -39,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$e;-><init>()V
 
-    sput-object v0, Lkotterknife/b$e;->bVi:Lkotterknife/b$e;
+    sput-object v0, Lkotterknife/b$e;->bUC: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 5a14dae7f0..5aaf13fab8 100644
--- a/com.discord/smali_classes2/kotterknife/b$f.smali
+++ b/com.discord/smali_classes2/kotterknife/b$f.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/b$f;
 .super Lkotlin/jvm/internal/k;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field public static final bVj:Lkotterknife/b$f;
+.field public static final bUD:Lkotterknife/b$f;
 
 
 # direct methods
@@ -39,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$f;-><init>()V
 
-    sput-object v0, Lkotterknife/b$f;->bVj:Lkotterknife/b$f;
+    sput-object v0, Lkotterknife/b$f;->bUD: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 bf1db1d744..53f72572aa 100644
--- a/com.discord/smali_classes2/kotterknife/b$g.smali
+++ b/com.discord/smali_classes2/kotterknife/b$g.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/b$g;
 .super Lkotlin/jvm/internal/k;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field public static final bVk:Lkotterknife/b$g;
+.field public static final bUE:Lkotterknife/b$g;
 
 
 # direct methods
@@ -39,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$g;-><init>()V
 
-    sput-object v0, Lkotterknife/b$g;->bVk:Lkotterknife/b$g;
+    sput-object v0, Lkotterknife/b$g;->bUE: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 bb09fe5256..fa1f01338e 100644
--- a/com.discord/smali_classes2/kotterknife/b.smali
+++ b/com.discord/smali_classes2/kotterknife/b.smali
@@ -1,5 +1,6 @@
 .class public final Lkotterknife/b;
 .super Ljava/lang/Object;
+.source "Kotterknife.kt"
 
 
 # direct methods
@@ -60,7 +61,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$e;->bVi:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bUC:Lkotterknife/b$e;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -97,7 +98,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$e;->bVi:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bUC:Lkotterknife/b$e;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -134,7 +135,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bVj:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bUD:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -166,7 +167,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$g;->bVk:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bUE:Lkotterknife/b$g;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -203,7 +204,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$g;->bVk:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bUE:Lkotterknife/b$g;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -336,7 +337,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bVj:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bUD:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -368,7 +369,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bVj:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bUD:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -400,7 +401,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$d;->bVh:Lkotterknife/b$d;
+    sget-object p0, Lkotterknife/b$d;->bUB:Lkotterknife/b$d;
 
     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 c409553be1..bd2e606476 100644
--- a/com.discord/smali_classes2/kotterknife/c$a.smali
+++ b/com.discord/smali_classes2/kotterknife/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/c$a;
 .super Ljava/lang/Object;
+.source "Kotterknife.kt"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field public static final bVm:Lkotterknife/c$a;
+.field public static final bUG:Lkotterknife/c$a;
 
 
 # direct methods
@@ -25,7 +26,7 @@
 
     invoke-direct {v0}, Lkotterknife/c$a;-><init>()V
 
-    sput-object v0, Lkotterknife/c$a;->bVm:Lkotterknife/c$a;
+    sput-object v0, Lkotterknife/c$a;->bUG: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 5e3e984a52..acf9085621 100644
--- a/com.discord/smali_classes2/kotterknife/c.smali
+++ b/com.discord/smali_classes2/kotterknife/c.smali
@@ -1,5 +1,6 @@
 .class final Lkotterknife/c;
 .super Ljava/lang/Object;
+.source "Kotterknife.kt"
 
 # interfaces
 .implements Lkotlin/properties/ReadOnlyProperty;
@@ -27,7 +28,7 @@
 
 
 # instance fields
-.field private final bVl:Lkotlin/jvm/functions/Function2;
+.field private final bUF:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -60,9 +61,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotterknife/c;->bVl:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lkotterknife/c;->bUF:Lkotlin/jvm/functions/Function2;
 
-    sget-object p1, Lkotterknife/c$a;->bVm:Lkotterknife/c$a;
+    sget-object p1, Lkotterknife/c$a;->bUG:Lkotterknife/c$a;
 
     iput-object p1, p0, Lkotterknife/c;->value:Ljava/lang/Object;
 
@@ -87,7 +88,7 @@
 
     iget-object v0, p0, Lkotterknife/c;->value:Ljava/lang/Object;
 
-    sget-object v1, Lkotterknife/c$a;->bVm:Lkotterknife/c$a;
+    sget-object v1, Lkotterknife/c$a;->bUG:Lkotterknife/c$a;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -95,7 +96,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotterknife/c;->bVl:Lkotlin/jvm/functions/Function2;
+    iget-object v0, p0, Lkotterknife/c;->bUF:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -103,7 +104,7 @@
 
     iput-object p2, p0, Lkotterknife/c;->value:Ljava/lang/Object;
 
-    sget-object p2, Lkotterknife/d;->bVo:Lkotterknife/d;
+    sget-object p2, Lkotterknife/d;->bUI: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 17a49adbc8..736e96f805 100644
--- a/com.discord/smali_classes2/kotterknife/d.smali
+++ b/com.discord/smali_classes2/kotterknife/d.smali
@@ -1,9 +1,10 @@
 .class final Lkotterknife/d;
 .super Ljava/lang/Object;
+.source "Kotterknife.kt"
 
 
 # static fields
-.field private static final bVn:Ljava/util/WeakHashMap;
+.field private static final bUH:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -15,7 +16,7 @@
     .end annotation
 .end field
 
-.field public static final bVo:Lkotterknife/d;
+.field public static final bUI:Lkotterknife/d;
 
 
 # direct methods
@@ -26,13 +27,13 @@
 
     invoke-direct {v0}, Lkotterknife/d;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bVo:Lkotterknife/d;
+    sput-object v0, Lkotterknife/d;->bUI:Lkotterknife/d;
 
     new-instance v0, Ljava/util/WeakHashMap;
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bVn:Ljava/util/WeakHashMap;
+    sput-object v0, Lkotterknife/d;->bUH:Ljava/util/WeakHashMap;
 
     return-void
 .end method
@@ -61,7 +62,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bVn:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bUH:Ljava/util/WeakHashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -98,7 +99,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bVn:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bUH:Ljava/util/WeakHashMap;
 
     invoke-virtual {v0, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -127,14 +128,14 @@
 
     check-cast v1, Lkotterknife/c;
 
-    sget-object v2, Lkotterknife/c$a;->bVm:Lkotterknife/c$a;
+    sget-object v2, Lkotterknife/c$a;->bUG:Lkotterknife/c$a;
 
     iput-object v2, v1, Lkotterknife/c;->value:Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotterknife/d;->bVn:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bUH: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 5f37f63142..9db0ff2bd7 100644
--- a/com.discord/smali_classes2/okhttp3/Headers$a.smali
+++ b/com.discord/smali_classes2/okhttp3/Headers$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/Headers$a;
 .super Ljava/lang/Object;
+.source "Headers.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field final bZa:Ljava/util/List;
+.field final bYu:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +38,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     return-void
 .end method
@@ -62,11 +63,11 @@
     const/4 v2, 0x0
 
     :goto_0
-    const/4 v3, 0x2
+    const/16 v3, 0x7f
 
-    const/4 v4, 0x3
+    const/4 v4, 0x2
 
-    const/16 v5, 0x7f
+    const/4 v5, 0x3
 
     const/4 v6, 0x1
 
@@ -80,7 +81,7 @@
 
     if-le v7, v8, :cond_0
 
-    if-ge v7, v5, :cond_0
+    if-ge v7, v3, :cond_0
 
     add-int/lit8 v2, v2, 0x1
 
@@ -89,13 +90,13 @@
     :cond_0
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    new-array v0, v4, [Ljava/lang/Object;
+    new-array v0, v5, [Ljava/lang/Object;
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v3
 
-    aput-object v4, v0, v1
+    aput-object v3, v0, v1
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -103,7 +104,7 @@
 
     aput-object v1, v0, v6
 
-    aput-object p0, v0, v3
+    aput-object p0, v0, v4
 
     const-string p0, "Unexpected char %#04x at %d in header name: %s"
 
@@ -140,7 +141,7 @@
     if-ne v7, v8, :cond_3
 
     :cond_2
-    if-ge v7, v5, :cond_3
+    if-ge v7, v3, :cond_3
 
     add-int/lit8 v2, v2, 0x1
 
@@ -149,29 +150,29 @@
     :cond_3
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    const/4 v5, 0x4
+    const/4 v3, 0x4
 
-    new-array v5, v5, [Ljava/lang/Object;
+    new-array v3, v3, [Ljava/lang/Object;
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v7
 
-    aput-object v7, v5, v1
+    aput-object v7, v3, v1
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    aput-object v1, v5, v6
+    aput-object v1, v3, v6
 
-    aput-object p0, v5, v3
+    aput-object p0, v3, v4
 
-    aput-object p1, v5, v4
+    aput-object p1, v3, v5
 
     const-string p0, "Unexpected char %#04x at %d in %s value: %s"
 
-    invoke-static {p0, v5}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0, v3}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -222,11 +223,13 @@
     invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public final Hi()Lokhttp3/Headers;
+.method public final Hh()Lokhttp3/Headers;
     .locals 1
 
     new-instance v0, Lokhttp3/Headers;
@@ -251,11 +254,11 @@
 .method final ai(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     invoke-virtual {p2}, Ljava/lang/String;->trim()Ljava/lang/String;
 
@@ -284,7 +287,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -292,7 +295,7 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -306,11 +309,11 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->bZa:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bYu:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okhttp3/Interceptor.smali b/com.discord/smali_classes2/okhttp3/Interceptor.smali
index 1669f46f48..a7cd3b875b 100644
--- a/com.discord/smali_classes2/okhttp3/Interceptor.smali
+++ b/com.discord/smali_classes2/okhttp3/Interceptor.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/Interceptor;
 .super Ljava/lang/Object;
+.source "Interceptor.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/okhttp3/a/a$a.smali b/com.discord/smali_classes2/okhttp3/a/a$a.smali
index f0275df80b..71c8d926ff 100644
--- a/com.discord/smali_classes2/okhttp3/a/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/a/a$a;
 .super Ljava/lang/Enum;
+.source "HttpLoggingInterceptor.java"
 
 
 # annotations
@@ -22,15 +23,15 @@
 
 
 # static fields
-.field public static final cgu:I = 0x1
+.field public static final cfO:I = 0x1
 
-.field public static final cgv:I = 0x2
+.field public static final cfP:I = 0x2
 
-.field public static final cgw:I = 0x3
+.field public static final cfQ:I = 0x3
 
-.field public static final cgx:I = 0x4
+.field public static final cfR:I = 0x4
 
-.field private static final synthetic cgy:[I
+.field private static final synthetic cfS:[I
 
 
 # direct methods
@@ -41,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lokhttp3/a/a$a;->cgu:I
+    sget v1, Lokhttp3/a/a$a;->cfO:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->cgv:I
+    sget v1, Lokhttp3/a/a$a;->cfP:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->cgw:I
+    sget v1, Lokhttp3/a/a$a;->cfQ:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->cgx:I
+    sget v1, Lokhttp3/a/a$a;->cfR:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lokhttp3/a/a$a;->cgy:[I
+    sput-object v0, Lokhttp3/a/a$a;->cfS:[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 eab6670aa4..6a92e07698 100644
--- a/com.discord/smali_classes2/okhttp3/a/a$b$1.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a$b$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/a/a$b$1;
 .super Ljava/lang/Object;
+.source "HttpLoggingInterceptor.java"
 
 # interfaces
 .implements Lokhttp3/a/a$b;
@@ -30,7 +31,7 @@
 .method public final log(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()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 68ccdb7a2b..7b89ca336f 100644
--- a/com.discord/smali_classes2/okhttp3/a/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/a/a$b;
 .super Ljava/lang/Object;
+.source "HttpLoggingInterceptor.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field public static final cgz:Lokhttp3/a/a$b;
+.field public static final cfT:Lokhttp3/a/a$b;
 
 
 # direct methods
@@ -25,7 +26,7 @@
 
     invoke-direct {v0}, Lokhttp3/a/a$b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/a/a$b;->cgz:Lokhttp3/a/a$b;
+    sput-object v0, Lokhttp3/a/a$b;->cfT: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 9a277c379f..9f9107f05d 100644
--- a/com.discord/smali_classes2/okhttp3/a/a.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/a/a;
 .super Ljava/lang/Object;
+.source "HttpLoggingInterceptor.java"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -15,13 +16,13 @@
 
 
 # static fields
-.field private static final cgr:Ljava/nio/charset/Charset;
+.field private static final cfL:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final cgs:Lokhttp3/a/a$b;
+.field private final cfM:Lokhttp3/a/a$b;
 
-.field private volatile cgt:I
+.field private volatile cfN:I
 
 
 # direct methods
@@ -34,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/a/a;->cgr:Ljava/nio/charset/Charset;
+    sput-object v0, Lokhttp3/a/a;->cfL:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -42,7 +43,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lokhttp3/a/a$b;->cgz:Lokhttp3/a/a$b;
+    sget-object v0, Lokhttp3/a/a$b;->cfT:Lokhttp3/a/a$b;
 
     invoke-direct {p0, v0}, Lokhttp3/a/a;-><init>(Lokhttp3/a/a$b;)V
 
@@ -54,11 +55,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget v0, Lokhttp3/a/a$a;->cgu:I
+    sget v0, Lokhttp3/a/a$a;->cfO:I
 
-    iput v0, p0, Lokhttp3/a/a;->cgt:I
+    iput v0, p0, Lokhttp3/a/a;->cfN:I
 
-    iput-object p1, p0, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iput-object p1, p0, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     return-void
 .end method
@@ -108,7 +109,7 @@
 
     if-ge p0, v1, :cond_d
 
-    invoke-virtual {v7}, Lokio/c;->IZ()Z
+    invoke-virtual {v7}, Lokio/c;->IY()Z
 
     move-result v1
 
@@ -378,7 +379,7 @@
 
     if-eqz p1, :cond_0
 
-    iput p1, p0, Lokhttp3/a/a;->cgt:I
+    iput p1, p0, Lokhttp3/a/a;->cfN:I
 
     return-object p0
 
@@ -404,13 +405,13 @@
 
     move-object/from16 v0, p1
 
-    iget v2, v1, Lokhttp3/a/a;->cgt:I
+    iget v2, v1, Lokhttp3/a/a;->cfN:I
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v3
 
-    sget v4, Lokhttp3/a/a$a;->cgu:I
+    sget v4, Lokhttp3/a/a$a;->cfO:I
 
     if-ne v2, v4, :cond_0
 
@@ -421,9 +422,9 @@
     return-object v0
 
     :cond_0
-    sget v4, Lokhttp3/a/a$a;->cgx:I
+    sget v4, Lokhttp3/a/a$a;->cfR:I
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
     if-ne v2, v4, :cond_1
 
@@ -437,7 +438,7 @@
     :goto_0
     if-nez v4, :cond_3
 
-    sget v7, Lokhttp3/a/a$a;->cgw:I
+    sget v7, Lokhttp3/a/a$a;->cfQ:I
 
     if-ne v2, v7, :cond_2
 
@@ -453,17 +454,17 @@
     const/4 v2, 0x1
 
     :goto_2
-    iget-object v7, v3, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v7, v3, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     if-eqz v7, :cond_4
 
     goto :goto_3
 
     :cond_4
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     :goto_3
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Hu()Lokhttp3/i;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Ht()Lokhttp3/i;
 
     move-result-object v8
 
@@ -481,7 +482,7 @@
 
     invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v11, v3, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v11, v3, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v9, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -493,7 +494,7 @@
 
     invoke-direct {v11, v12}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {v8}, Lokhttp3/i;->Ha()Lokhttp3/u;
+    invoke-interface {v8}, Lokhttp3/i;->GZ()Lokhttp3/u;
 
     move-result-object v8
 
@@ -517,7 +518,7 @@
 
     if-nez v2, :cond_6
 
-    if-eqz v6, :cond_6
+    if-eqz v5, :cond_6
 
     new-instance v9, Ljava/lang/StringBuilder;
 
@@ -544,7 +545,7 @@
     move-result-object v8
 
     :cond_6
-    iget-object v9, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v9, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     invoke-interface {v9, v8}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
@@ -552,7 +553,7 @@
 
     if-eqz v2, :cond_10
 
-    if-eqz v6, :cond_8
+    if-eqz v5, :cond_8
 
     invoke-virtual {v7}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
 
@@ -560,7 +561,7 @@
 
     if-eqz v11, :cond_7
 
-    iget-object v11, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v12, Ljava/lang/StringBuilder;
 
@@ -589,7 +590,7 @@
 
     if-eqz v13, :cond_8
 
-    iget-object v11, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v12, Ljava/lang/StringBuilder;
 
@@ -610,9 +611,9 @@
     invoke-interface {v11, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
     :cond_8
-    iget-object v11, v3, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object v11, v3, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
-    iget-object v12, v11, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v12, v11, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v12, v12
 
@@ -643,29 +644,29 @@
 
     if-nez v15, :cond_9
 
-    iget-object v15, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v15, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
-    new-instance v5, Ljava/lang/StringBuilder;
+    new-instance v6, Ljava/lang/StringBuilder;
 
-    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v5, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v14, ": "
 
-    invoke-virtual {v5, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v11, v13}, Lokhttp3/Headers;->fc(I)Ljava/lang/String;
 
     move-result-object v14
 
-    invoke-virtual {v5, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v6
 
-    invoke-interface {v15, v5}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
+    invoke-interface {v15, v6}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
     :cond_9
     add-int/lit8 v13, v13, 0x1
@@ -675,12 +676,12 @@
     :cond_a
     if-eqz v4, :cond_f
 
-    if-nez v6, :cond_b
+    if-nez v5, :cond_b
 
     goto/16 :goto_6
 
     :cond_b
-    iget-object v5, v3, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object v5, v3, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
     invoke-static {v5}, Lokhttp3/a/a;->d(Lokhttp3/Headers;)Z
 
@@ -688,7 +689,7 @@
 
     if-eqz v5, :cond_c
 
-    iget-object v5, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -702,7 +703,15 @@
 
     const-string v7, " (encoded body omitted)"
 
-    goto :goto_7
+    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-interface {v5, v6}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
+
+    goto/16 :goto_7
 
     :cond_c
     new-instance v5, Lokio/c;
@@ -711,7 +720,7 @@
 
     invoke-virtual {v7, v5}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
-    sget-object v6, Lokhttp3/a/a;->cgr:Ljava/nio/charset/Charset;
+    sget-object v6, Lokhttp3/a/a;->cfL:Ljava/nio/charset/Charset;
 
     invoke-virtual {v7}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
 
@@ -719,14 +728,14 @@
 
     if-eqz v11, :cond_d
 
-    sget-object v6, Lokhttp3/a/a;->cgr:Ljava/nio/charset/Charset;
+    sget-object v6, Lokhttp3/a/a;->cfL:Ljava/nio/charset/Charset;
 
     invoke-virtual {v11, v6}, Lokhttp3/MediaType;->b(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
     move-result-object v6
 
     :cond_d
-    iget-object v11, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     const-string v12, ""
 
@@ -738,7 +747,7 @@
 
     if-eqz v11, :cond_e
 
-    iget-object v11, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     invoke-virtual {v5, v6}, Lokio/c;->c(Ljava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -746,7 +755,7 @@
 
     invoke-interface {v11, v5}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v5, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -770,10 +779,18 @@
 
     const-string v7, "-byte body)"
 
+    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-interface {v5, v6}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
+
     goto :goto_7
 
     :cond_e
-    iget-object v5, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -797,11 +814,19 @@
 
     const-string v7, "-byte body omitted)"
 
+    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-interface {v5, v6}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
+
     goto :goto_7
 
     :cond_f
     :goto_6
-    iget-object v5, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -811,7 +836,6 @@
 
     iget-object v7, v3, Lokhttp3/w;->method:Ljava/lang/String;
 
-    :goto_7
     invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -821,6 +845,7 @@
     invoke-interface {v5, v6}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
     :cond_10
+    :goto_7
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide v5
@@ -844,7 +869,7 @@
 
     move-result-wide v5
 
-    iget-object v3, v0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v3, v0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentLength()J
 
@@ -874,7 +899,7 @@
     const-string v7, "unknown-length"
 
     :goto_8
-    iget-object v8, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v8, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v9, Ljava/lang/StringBuilder;
 
@@ -918,9 +943,9 @@
 
     invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v10, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v10, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object v10, v10, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v10, v10, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -972,9 +997,9 @@
 
     if-eqz v2, :cond_1e
 
-    iget-object v2, v0, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v2, v0, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
-    iget-object v5, v2, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v5, v2, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v5, v5
 
@@ -985,7 +1010,7 @@
     :goto_b
     if-ge v6, v5, :cond_14
 
-    iget-object v7, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v7, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v8, Ljava/lang/StringBuilder;
 
@@ -1029,7 +1054,7 @@
     goto/16 :goto_e
 
     :cond_15
-    iget-object v4, v0, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v4, v0, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
     invoke-static {v4}, Lokhttp3/a/a;->d(Lokhttp3/Headers;)Z
 
@@ -1037,14 +1062,16 @@
 
     if-eqz v4, :cond_16
 
-    iget-object v2, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     const-string v3, "<-- END HTTP (encoded body omitted)"
 
+    invoke-interface {v2, v3}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
+
     goto/16 :goto_f
 
     :cond_16
-    invoke-virtual {v3}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {v3}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v4
 
@@ -1052,7 +1079,7 @@
 
     invoke-interface {v4, v5, v6}, Lokio/d;->request(J)Z
 
-    invoke-interface {v4}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v4}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v4
 
@@ -1081,7 +1108,7 @@
     :try_start_1
     new-instance v6, Lokio/h;
 
-    invoke-virtual {v4}, Lokio/c;->Ji()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Jh()Lokio/c;
 
     move-result-object v4
 
@@ -1124,7 +1151,7 @@
     move-object v2, v5
 
     :goto_d
-    sget-object v5, Lokhttp3/a/a;->cgr:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->cfL:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentType()Lokhttp3/MediaType;
 
@@ -1132,7 +1159,7 @@
 
     if-eqz v3, :cond_19
 
-    sget-object v5, Lokhttp3/a/a;->cgr:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->cfL:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3, v5}, Lokhttp3/MediaType;->b(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
@@ -1145,13 +1172,13 @@
 
     if-nez v3, :cond_1a
 
-    iget-object v2, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     const-string v3, ""
 
     invoke-interface {v2, v3}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v2, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1182,15 +1209,15 @@
 
     if-eqz v3, :cond_1b
 
-    iget-object v3, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     const-string v6, ""
 
     invoke-interface {v3, v6}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v3, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
-    invoke-virtual {v4}, Lokio/c;->Ji()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Jh()Lokio/c;
 
     move-result-object v6
 
@@ -1203,7 +1230,7 @@
     :cond_1b
     if-eqz v2, :cond_1c
 
-    iget-object v3, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v5, Ljava/lang/StringBuilder;
 
@@ -1231,10 +1258,10 @@
 
     invoke-interface {v3, v2}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    goto :goto_10
+    goto :goto_f
 
     :cond_1c
-    iget-object v2, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1254,19 +1281,20 @@
 
     move-result-object v3
 
+    invoke-interface {v2, v3}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
+
     goto :goto_f
 
     :cond_1d
     :goto_e
-    iget-object v2, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     const-string v3, "<-- END HTTP"
 
-    :goto_f
     invoke-interface {v2, v3}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
     :cond_1e
-    :goto_10
+    :goto_f
     return-object v0
 
     :catch_0
@@ -1274,7 +1302,7 @@
 
     move-object v2, v0
 
-    iget-object v0, v1, Lokhttp3/a/a;->cgs:Lokhttp3/a/a$b;
+    iget-object v0, v1, Lokhttp3/a/a;->cfM:Lokhttp3/a/a$b;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1289,4 +1317,6 @@
     invoke-interface {v0, v3}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
     throw v2
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/b$1.smali b/com.discord/smali_classes2/okhttp3/b$1.smali
index ef7daa321b..284addbdcb 100644
--- a/com.discord/smali_classes2/okhttp3/b$1.smali
+++ b/com.discord/smali_classes2/okhttp3/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/b$1;
 .super Ljava/lang/Object;
+.source "Authenticator.java"
 
 # interfaces
 .implements Lokhttp3/b;
diff --git a/com.discord/smali_classes2/okhttp3/b.smali b/com.discord/smali_classes2/okhttp3/b.smali
index 59a4931774..b4466156e4 100644
--- a/com.discord/smali_classes2/okhttp3/b.smali
+++ b/com.discord/smali_classes2/okhttp3/b.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/b;
 .super Ljava/lang/Object;
+.source "Authenticator.java"
 
 
 # static fields
-.field public static final bVx:Lokhttp3/b;
+.field public static final bUR:Lokhttp3/b;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/b;->bVx:Lokhttp3/b;
+    sput-object v0, Lokhttp3/b;->bUR: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 548749caca..cb9a7473e0 100644
--- a/com.discord/smali_classes2/okhttp3/c.smali
+++ b/com.discord/smali_classes2/okhttp3/c.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/c;
 .super Ljava/lang/Object;
+.source "Cache.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -7,9 +8,9 @@
 
 
 # instance fields
-.field final bVy:Lokhttp3/internal/a/e;
+.field final bUS:Lokhttp3/internal/a/e;
 
-.field final bVz:Lokhttp3/internal/a/d;
+.field final bUT:Lokhttp3/internal/a/d;
 
 
 # virtual methods
@@ -21,7 +22,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/c;->bVz:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bUT:Lokhttp3/internal/a/d;
 
     invoke-virtual {v0}, Lokhttp3/internal/a/d;->close()V
 
@@ -36,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/c;->bVz:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bUT: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 b53b307c4c..740ad94681 100644
--- a/com.discord/smali_classes2/okhttp3/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/d$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/d$a;
 .super Ljava/lang/Object;
+.source "CacheControl.java"
 
 
 # annotations
@@ -14,19 +15,19 @@
 
 
 # instance fields
-.field bVC:Z
+.field bUW:Z
 
-.field bVD:Z
+.field bUX:Z
 
-.field bVE:I
+.field bUY:I
 
-.field bVJ:I
+.field bVd:I
 
-.field bVK:I
+.field bVe:I
 
-.field bVL:Z
+.field bVf:Z
 
-.field bVM:Z
+.field bVg:Z
 
 .field immutable:Z
 
@@ -39,18 +40,18 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/d$a;->bVE:I
+    iput v0, p0, Lokhttp3/d$a;->bUY:I
 
-    iput v0, p0, Lokhttp3/d$a;->bVJ:I
+    iput v0, p0, Lokhttp3/d$a;->bVd:I
 
-    iput v0, p0, Lokhttp3/d$a;->bVK:I
+    iput v0, p0, Lokhttp3/d$a;->bVe:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GX()Lokhttp3/d;
+.method public final GW()Lokhttp3/d;
     .locals 1
 
     new-instance v0, Lokhttp3/d;
diff --git a/com.discord/smali_classes2/okhttp3/e.smali b/com.discord/smali_classes2/okhttp3/e.smali
index caae6ba1ad..090fa68123 100644
--- a/com.discord/smali_classes2/okhttp3/e.smali
+++ b/com.discord/smali_classes2/okhttp3/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/e;
 .super Ljava/lang/Object;
+.source "Call.java"
 
 # interfaces
 .implements Ljava/lang/Cloneable;
@@ -14,10 +15,10 @@
 
 
 # virtual methods
-.method public abstract GY()Lokhttp3/w;
+.method public abstract GX()Lokhttp3/w;
 .end method
 
-.method public abstract GZ()Lokhttp3/Response;
+.method public abstract GY()Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okhttp3/f.smali b/com.discord/smali_classes2/okhttp3/f.smali
index 8451b56176..e1177765e7 100644
--- a/com.discord/smali_classes2/okhttp3/f.smali
+++ b/com.discord/smali_classes2/okhttp3/f.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/f;
 .super Ljava/lang/Object;
+.source "Callback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/okhttp3/g$a.smali b/com.discord/smali_classes2/okhttp3/g$a.smali
index ff2586cc0f..f8af13c8ea 100644
--- a/com.discord/smali_classes2/okhttp3/g$a.smali
+++ b/com.discord/smali_classes2/okhttp3/g$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/g$a;
 .super Ljava/lang/Object;
+.source "CertificatePinner.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/okhttp3/g$b.smali b/com.discord/smali_classes2/okhttp3/g$b.smali
index 269c3e7d7c..cb25b20d91 100644
--- a/com.discord/smali_classes2/okhttp3/g$b.smali
+++ b/com.discord/smali_classes2/okhttp3/g$b.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/g$b;
 .super Ljava/lang/Object;
+.source "CertificatePinner.java"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # instance fields
-.field final bVR:Ljava/lang/String;
+.field final bVl:Ljava/lang/String;
 
-.field final bVS:Ljava/lang/String;
+.field final bVm:Ljava/lang/String;
 
-.field final bVT:Lokio/ByteString;
+.field final bVn:Lokio/ByteString;
 
 .field final pattern:Ljava/lang/String;
 
@@ -43,9 +44,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/g$b;->bVS:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/g$b;->bVm:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/g$b;->bVS:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/g$b;->bVm:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -53,9 +54,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/g$b;->bVT:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/g$b;->bVn:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/g$b;->bVT:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/g$b;->bVn:Lokio/ByteString;
 
     invoke-virtual {v0, p1}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -86,7 +87,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/g$b;->bVS:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bVm:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -96,7 +97,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/g$b;->bVT:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bVn:Lokio/ByteString;
 
     invoke-virtual {v1}, Lokio/ByteString;->hashCode()I
 
@@ -114,13 +115,13 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/g$b;->bVS:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bVm:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/g$b;->bVT:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bVn:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Jl()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Jk()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/okhttp3/h$1.smali b/com.discord/smali_classes2/okhttp3/h$1.smali
index 501908e83f..77d3cc7f76 100644
--- a/com.discord/smali_classes2/okhttp3/h$1.smali
+++ b/com.discord/smali_classes2/okhttp3/h$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/h$1;
 .super Ljava/lang/Object;
+.source "CipherSuite.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali_classes2/okhttp3/h.smali b/com.discord/smali_classes2/okhttp3/h.smali
index 3588ec92f9..a0e2b9b918 100644
--- a/com.discord/smali_classes2/okhttp3/h.smali
+++ b/com.discord/smali_classes2/okhttp3/h.smali
@@ -1,9 +1,62 @@
 .class public final Lokhttp3/h;
 .super Ljava/lang/Object;
+.source "CipherSuite.java"
 
 
 # static fields
-.field static final bVU:Ljava/util/Comparator;
+.field public static final bVA:Lokhttp3/h;
+
+.field public static final bVB:Lokhttp3/h;
+
+.field public static final bVC:Lokhttp3/h;
+
+.field public static final bVD:Lokhttp3/h;
+
+.field public static final bVE:Lokhttp3/h;
+
+.field public static final bVF:Lokhttp3/h;
+
+.field public static final bVG:Lokhttp3/h;
+
+.field public static final bVH:Lokhttp3/h;
+
+.field public static final bVI:Lokhttp3/h;
+
+.field public static final bVJ:Lokhttp3/h;
+
+.field public static final bVK:Lokhttp3/h;
+
+.field public static final bVL:Lokhttp3/h;
+
+.field public static final bVM:Lokhttp3/h;
+
+.field public static final bVN:Lokhttp3/h;
+
+.field public static final bVO:Lokhttp3/h;
+
+.field public static final bVP:Lokhttp3/h;
+
+.field public static final bVQ:Lokhttp3/h;
+
+.field public static final bVR:Lokhttp3/h;
+
+.field public static final bVS:Lokhttp3/h;
+
+.field public static final bVT:Lokhttp3/h;
+
+.field public static final bVU:Lokhttp3/h;
+
+.field public static final bVV:Lokhttp3/h;
+
+.field public static final bVW:Lokhttp3/h;
+
+.field public static final bVX:Lokhttp3/h;
+
+.field public static final bVY:Lokhttp3/h;
+
+.field public static final bVZ:Lokhttp3/h;
+
+.field static final bVo:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -13,7 +66,7 @@
     .end annotation
 .end field
 
-.field private static final bVV:Ljava/util/Map;
+.field private static final bVp:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -24,13 +77,25 @@
     .end annotation
 .end field
 
-.field public static final bVW:Lokhttp3/h;
+.field public static final bVq:Lokhttp3/h;
 
-.field public static final bVX:Lokhttp3/h;
+.field public static final bVr:Lokhttp3/h;
 
-.field public static final bVY:Lokhttp3/h;
+.field public static final bVs:Lokhttp3/h;
 
-.field public static final bVZ:Lokhttp3/h;
+.field public static final bVt:Lokhttp3/h;
+
+.field public static final bVu:Lokhttp3/h;
+
+.field public static final bVv:Lokhttp3/h;
+
+.field public static final bVw:Lokhttp3/h;
+
+.field public static final bVx:Lokhttp3/h;
+
+.field public static final bVy:Lokhttp3/h;
+
+.field public static final bVz:Lokhttp3/h;
 
 .field public static final bWA:Lokhttp3/h;
 
@@ -136,58 +201,6 @@
 
 .field public static final bWz:Lokhttp3/h;
 
-.field public static final bXA:Lokhttp3/h;
-
-.field public static final bXB:Lokhttp3/h;
-
-.field public static final bXC:Lokhttp3/h;
-
-.field public static final bXD:Lokhttp3/h;
-
-.field public static final bXE:Lokhttp3/h;
-
-.field public static final bXF:Lokhttp3/h;
-
-.field public static final bXG:Lokhttp3/h;
-
-.field public static final bXH:Lokhttp3/h;
-
-.field public static final bXI:Lokhttp3/h;
-
-.field public static final bXJ:Lokhttp3/h;
-
-.field public static final bXK:Lokhttp3/h;
-
-.field public static final bXL:Lokhttp3/h;
-
-.field public static final bXM:Lokhttp3/h;
-
-.field public static final bXN:Lokhttp3/h;
-
-.field public static final bXO:Lokhttp3/h;
-
-.field public static final bXP:Lokhttp3/h;
-
-.field public static final bXQ:Lokhttp3/h;
-
-.field public static final bXR:Lokhttp3/h;
-
-.field public static final bXS:Lokhttp3/h;
-
-.field public static final bXT:Lokhttp3/h;
-
-.field public static final bXU:Lokhttp3/h;
-
-.field public static final bXV:Lokhttp3/h;
-
-.field public static final bXW:Lokhttp3/h;
-
-.field public static final bXX:Lokhttp3/h;
-
-.field public static final bXY:Lokhttp3/h;
-
-.field public static final bXZ:Lokhttp3/h;
-
 .field public static final bXa:Lokhttp3/h;
 
 .field public static final bXb:Lokhttp3/h;
@@ -238,18 +251,6 @@
 
 .field public static final bXy:Lokhttp3/h;
 
-.field public static final bXz:Lokhttp3/h;
-
-.field public static final bYa:Lokhttp3/h;
-
-.field public static final bYb:Lokhttp3/h;
-
-.field public static final bYc:Lokhttp3/h;
-
-.field public static final bYd:Lokhttp3/h;
-
-.field public static final bYe:Lokhttp3/h;
-
 
 # instance fields
 .field final javaName:Ljava/lang/String;
@@ -263,15 +264,15 @@
 
     invoke-direct {v0}, Lokhttp3/h$1;-><init>()V
 
-    sput-object v0, Lokhttp3/h;->bVU:Ljava/util/Comparator;
+    sput-object v0, Lokhttp3/h;->bVo:Ljava/util/Comparator;
 
     new-instance v0, Ljava/util/TreeMap;
 
-    sget-object v1, Lokhttp3/h;->bVU:Ljava/util/Comparator;
+    sget-object v1, Lokhttp3/h;->bVo:Ljava/util/Comparator;
 
     invoke-direct {v0, v1}, Ljava/util/TreeMap;-><init>(Ljava/util/Comparator;)V
 
-    sput-object v0, Lokhttp3/h;->bVV:Ljava/util/Map;
+    sput-object v0, Lokhttp3/h;->bVp:Ljava/util/Map;
 
     const-string v0, "SSL_RSA_WITH_NULL_MD5"
 
@@ -279,7 +280,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bVW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVq:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_NULL_SHA"
 
@@ -287,7 +288,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bVX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVr:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_EXPORT_WITH_RC4_40_MD5"
 
@@ -295,7 +296,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bVY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVs:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_RC4_128_MD5"
 
@@ -303,7 +304,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bVZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVt:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_RC4_128_SHA"
 
@@ -311,7 +312,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVu:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -319,7 +320,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWb:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVv:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_DES_CBC_SHA"
 
@@ -327,7 +328,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVw:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -335,7 +336,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWd:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVx:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -343,7 +344,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVy:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_DSS_WITH_DES_CBC_SHA"
 
@@ -351,7 +352,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWf:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVz:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
 
@@ -359,7 +360,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWg:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVA:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -367,7 +368,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWh:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVB:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_RSA_WITH_DES_CBC_SHA"
 
@@ -375,7 +376,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWi:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVC:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -383,7 +384,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWj:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVD:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
 
@@ -391,7 +392,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWk:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVE:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_WITH_RC4_128_MD5"
 
@@ -399,7 +400,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWl:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVF:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -407,7 +408,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWm:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVG:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_WITH_DES_CBC_SHA"
 
@@ -415,7 +416,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWn:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVH:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
 
@@ -423,7 +424,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWo:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVI:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_DES_CBC_SHA"
 
@@ -431,7 +432,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWp:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVJ:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"
 
@@ -439,7 +440,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWq:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVK:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_RC4_128_SHA"
 
@@ -447,7 +448,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWr:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVL:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_DES_CBC_MD5"
 
@@ -455,7 +456,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWs:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVM:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"
 
@@ -463,7 +464,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWt:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVN:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_RC4_128_MD5"
 
@@ -471,7 +472,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWu:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVO:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"
 
@@ -479,7 +480,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWv:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVP:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"
 
@@ -487,7 +488,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWw:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVQ:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
 
@@ -495,7 +496,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWx:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVR:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
 
@@ -503,7 +504,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWy:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVS:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA"
 
@@ -511,7 +512,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWz:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVT:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
 
@@ -519,7 +520,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWA:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVU:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
 
@@ -527,7 +528,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWB:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVV:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA"
 
@@ -535,7 +536,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWC:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVW:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA"
 
@@ -543,7 +544,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWD:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVX:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
 
@@ -551,7 +552,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWE:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVY:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
 
@@ -559,7 +560,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWF:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bVZ:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA"
 
@@ -567,7 +568,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWG:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWa:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_NULL_SHA256"
 
@@ -575,7 +576,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWH:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWb:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -583,7 +584,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWI:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWc:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA256"
 
@@ -591,7 +592,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWJ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWd:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
 
@@ -599,7 +600,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWK:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWe:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
 
@@ -607,7 +608,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWL:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWf:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
 
@@ -615,7 +616,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWM:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWg:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
 
@@ -623,7 +624,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWN:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWh:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -631,7 +632,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWO:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWi:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
 
@@ -639,7 +640,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWP:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWj:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
 
@@ -647,7 +648,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWQ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWk:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
 
@@ -655,7 +656,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWR:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWl:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
 
@@ -663,7 +664,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWm:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
 
@@ -671,7 +672,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWn:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
 
@@ -679,7 +680,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWo:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
 
@@ -687,7 +688,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWp:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_RC4_128_SHA"
 
@@ -695,7 +696,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWq:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
 
@@ -703,7 +704,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWr:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_AES_128_CBC_SHA"
 
@@ -711,7 +712,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWs:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_AES_256_CBC_SHA"
 
@@ -719,7 +720,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bWZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWt:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_SEED_CBC_SHA"
 
@@ -727,7 +728,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWu:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -735,7 +736,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXb:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWv:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -743,7 +744,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWw:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -751,7 +752,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXd:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWx:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -759,7 +760,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWy:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
 
@@ -767,7 +768,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXf:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWz:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
 
@@ -775,7 +776,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXg:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWA:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
 
@@ -783,7 +784,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXh:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWB:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
 
@@ -791,7 +792,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXi:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWC:Lokhttp3/h;
 
     const-string v0, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
 
@@ -799,7 +800,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXj:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWD:Lokhttp3/h;
 
     const-string v0, "TLS_FALLBACK_SCSV"
 
@@ -807,7 +808,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXk:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWE:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_NULL_SHA"
 
@@ -815,7 +816,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXl:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWF:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"
 
@@ -823,7 +824,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXm:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWG:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -831,7 +832,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXn:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWH:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"
 
@@ -839,7 +840,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXo:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWI:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"
 
@@ -847,7 +848,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXp:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWJ:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
 
@@ -855,7 +856,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXq:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWK:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
 
@@ -863,7 +864,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXr:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWL:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -871,7 +872,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXs:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWM:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
 
@@ -879,7 +880,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXt:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWN:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
 
@@ -887,7 +888,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXu:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWO:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_NULL_SHA"
 
@@ -895,7 +896,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXv:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWP:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_RC4_128_SHA"
 
@@ -903,7 +904,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXw:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWQ:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -911,7 +912,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXx:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWR:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"
 
@@ -919,7 +920,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXy:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWS:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"
 
@@ -927,7 +928,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXz:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWT:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_NULL_SHA"
 
@@ -935,7 +936,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXA:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWU:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
 
@@ -943,7 +944,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXB:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWV:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -951,7 +952,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXC:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWW:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
 
@@ -959,7 +960,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXD:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWX:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
 
@@ -967,7 +968,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXE:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWY:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_NULL_SHA"
 
@@ -975,7 +976,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXF:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bWZ:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_RC4_128_SHA"
 
@@ -983,7 +984,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXG:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXa:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
 
@@ -991,7 +992,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXH:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXb:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
 
@@ -999,7 +1000,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXI:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXc:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
 
@@ -1007,7 +1008,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXJ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXd:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
 
@@ -1015,7 +1016,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXK:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXe:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
 
@@ -1023,7 +1024,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXL:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXf:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"
 
@@ -1031,7 +1032,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXM:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXg:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"
 
@@ -1039,7 +1040,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXN:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXh:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -1047,7 +1048,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXO:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXi:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
 
@@ -1055,7 +1056,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXP:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXj:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -1063,7 +1064,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXQ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXk:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"
 
@@ -1071,7 +1072,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXR:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXl:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
 
@@ -1079,7 +1080,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXm:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
 
@@ -1087,7 +1088,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXn:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"
 
@@ -1095,7 +1096,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXo:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"
 
@@ -1103,7 +1104,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXp:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -1111,7 +1112,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXq:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -1119,7 +1120,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXr:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -1127,7 +1128,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXs:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -1135,7 +1136,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bXZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXt:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
 
@@ -1143,7 +1144,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bYa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXu:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
 
@@ -1151,7 +1152,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bYb:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXv:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
 
@@ -1159,7 +1160,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bYc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXw:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
 
@@ -1167,7 +1168,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bYd:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXx:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
 
@@ -1175,7 +1176,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bYe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bXy:Lokhttp3/h;
 
     return-void
 .end method
@@ -1253,7 +1254,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokhttp3/h;->bVV:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->bVp:Ljava/util/Map;
 
     invoke-interface {v1, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1267,7 +1268,7 @@
 
     invoke-direct {v1, p0}, Lokhttp3/h;-><init>(Ljava/lang/String;)V
 
-    sget-object v2, Lokhttp3/h;->bVV:Ljava/util/Map;
+    sget-object v2, Lokhttp3/h;->bVp:Ljava/util/Map;
 
     invoke-interface {v2, p0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
diff --git a/com.discord/smali_classes2/okhttp3/internal/a.smali b/com.discord/smali_classes2/okhttp3/internal/a.smali
index 0964fb63c6..a8eae3a93a 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a.smali
@@ -1,9 +1,10 @@
 .class public abstract Lokhttp3/internal/a;
 .super Ljava/lang/Object;
+.source "Internal.java"
 
 
 # static fields
-.field public static caO:Lokhttp3/internal/a;
+.field public static cai:Lokhttp3/internal/a;
 
 
 # direct methods
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 066222f0f9..d82de60b63 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/a$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/a/a$1;
 .super Ljava/lang/Object;
+.source "CacheInterceptor.java"
 
 # interfaces
 .implements Lokio/q;
@@ -17,28 +18,28 @@
 
 
 # instance fields
-.field cbf:Z
+.field final synthetic caA:Lokio/d;
 
-.field final synthetic cbg:Lokio/d;
+.field final synthetic caB:Lokhttp3/internal/a/b;
 
-.field final synthetic cbh:Lokhttp3/internal/a/b;
+.field final synthetic caC:Lokio/BufferedSink;
 
-.field final synthetic cbi:Lokio/BufferedSink;
+.field final synthetic caD:Lokhttp3/internal/a/a;
 
-.field final synthetic cbj:Lokhttp3/internal/a/a;
+.field caz:Z
 
 
 # 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;->cbj:Lokhttp3/internal/a/a;
+    iput-object p1, p0, Lokhttp3/internal/a/a$1;->caD:Lokhttp3/internal/a/a;
 
-    iput-object p2, p0, Lokhttp3/internal/a/a$1;->cbg:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/a/a$1;->caA:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/a/a$1;->cbh:Lokhttp3/internal/a/b;
+    iput-object p3, p0, Lokhttp3/internal/a/a$1;->caB:Lokhttp3/internal/a/b;
 
-    iput-object p4, p0, Lokhttp3/internal/a/a$1;->cbi:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/a/a$1;->caC:Lokio/BufferedSink;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +59,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/a/a$1;->cbg:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/a/a$1;->caA:Lokio/d;
 
     invoke-interface {v1, p1, p2, p3}, Lokio/d;->a(Lokio/c;J)J
 
@@ -72,13 +73,13 @@
 
     if-nez v3, :cond_1
 
-    iget-boolean p1, p0, Lokhttp3/internal/a/a$1;->cbf:Z
+    iget-boolean p1, p0, Lokhttp3/internal/a/a$1;->caz:Z
 
     if-nez p1, :cond_0
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->cbf:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->caz:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/a$1;->cbi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->caC:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->close()V
 
@@ -86,9 +87,9 @@
     return-wide v1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->cbi:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->caC:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->IW()Lokio/c;
 
     move-result-object v3
 
@@ -102,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;->cbi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->caC:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->Jj()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->Ji()Lokio/BufferedSink;
 
     return-wide p2
 
     :catch_0
     move-exception p1
 
-    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->cbf:Z
+    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->caz:Z
 
     if-nez p2, :cond_2
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->cbf:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->caz:Z
 
     :cond_2
     throw p1
@@ -129,7 +130,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->cbf:Z
+    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->caz:Z
 
     if-nez v0, :cond_0
 
@@ -143,10 +144,10 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->cbf:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->caz:Z
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->cbg:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->caA:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
@@ -156,7 +157,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->cbg:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->caA:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/r;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/a.smali b/com.discord/smali_classes2/okhttp3/internal/a/a.smali
index 2ae1980107..35750ebecc 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/a.smali
@@ -1,12 +1,13 @@
 .class public final Lokhttp3/internal/a/a;
 .super Ljava/lang/Object;
+.source "CacheInterceptor.java"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
 
 
 # instance fields
-.field final cbe:Lokhttp3/internal/a/e;
+.field final cay:Lokhttp3/internal/a/e;
 
 
 # direct methods
@@ -15,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/a/a;->cbe:Lokhttp3/internal/a/e;
+    iput-object p1, p0, Lokhttp3/internal/a/a;->cay:Lokhttp3/internal/a/e;
 
     return-void
 .end method
@@ -27,7 +28,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -84,7 +85,7 @@
     if-nez v6, :cond_2
 
     :cond_1
-    sget-object v6, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v6, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
     invoke-virtual {v6, v0, v4, v5}, Lokhttp3/internal/a;->a(Lokhttp3/Headers$a;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -94,7 +95,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object p0, p1, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object p0, p1, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length p0, p0
 
@@ -119,7 +120,7 @@
 
     if-eqz v3, :cond_4
 
-    sget-object v3, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v3, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
     invoke-virtual {p1, v2}, Lokhttp3/Headers;->fc(I)Ljava/lang/String;
 
@@ -133,7 +134,7 @@
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object p0
 
@@ -145,22 +146,24 @@
 
     if-eqz p0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {p0}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object p0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
-    invoke-virtual {p0}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object p0
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -295,15 +298,13 @@
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->cbe:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->cay:Lokhttp3/internal/a/e;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->cbe:Lokhttp3/internal/a/e;
-
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->HR()Lokhttp3/Response;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->HQ()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -321,58 +322,61 @@
 
     new-instance v0, Lokhttp3/internal/a/c$a;
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GX()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;->cax:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
     if-nez v4, :cond_1
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
     invoke-direct {v4, v5, v2}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
-    :goto_1
     move-object/from16 v17, v3
 
     move-object v3, v2
 
-    goto/16 :goto_d
+    goto/16 :goto_c
 
     :cond_1
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
-    iget-object v4, v4, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v4, v4, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    invoke-virtual {v4}, Lokhttp3/s;->Hl()Z
+    invoke-virtual {v4}, Lokhttp3/s;->Hk()Z
 
     move-result v4
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->cau:Lokhttp3/r;
+    iget-object v4, v4, Lokhttp3/Response;->bZO:Lokhttp3/r;
 
     if-nez v4, :cond_2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
     invoke-direct {v4, v5, v2}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
-    goto :goto_1
+    move-object/from16 v17, v3
+
+    move-object v3, v2
+
+    goto/16 :goto_c
 
     :cond_2
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
     invoke-static {v4, v5}, Lokhttp3/internal/a/c;->a(Lokhttp3/Response;Lokhttp3/w;)Z
 
@@ -382,24 +386,28 @@
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
     invoke-direct {v4, v5, v2}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
-    goto :goto_1
+    move-object/from16 v17, v3
+
+    move-object v3, v2
+
+    goto/16 :goto_c
 
     :cond_3
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/w;->HG()Lokhttp3/d;
+    invoke-virtual {v4}, Lokhttp3/w;->HF()Lokhttp3/d;
 
     move-result-object v4
 
-    iget-boolean v5, v4, Lokhttp3/d;->bVC:Z
+    iget-boolean v5, v4, Lokhttp3/d;->bUW:Z
 
-    if-nez v5, :cond_1a
+    if-nez v5, :cond_1c
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
     const-string v6, "If-Modified-Since"
 
@@ -417,26 +425,26 @@
 
     if-eqz v5, :cond_4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const/4 v5, 0x0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
-    :goto_2
+    :goto_1
     const/4 v5, 0x1
 
-    :goto_3
+    :goto_2
     if-eqz v5, :cond_6
 
-    goto/16 :goto_c
+    goto/16 :goto_b
 
     :cond_6
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
-    invoke-virtual {v5}, Lokhttp3/Response;->HG()Lokhttp3/d;
+    invoke-virtual {v5}, Lokhttp3/Response;->HF()Lokhttp3/d;
 
     move-result-object v5
 
@@ -446,22 +454,26 @@
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
     invoke-direct {v4, v2, v5}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
-    goto :goto_1
+    move-object/from16 v17, v3
+
+    move-object v3, v2
+
+    goto/16 :goto_c
 
     :cond_7
-    iget-object v6, v0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iget-object v6, v0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
     const-wide/16 v9, 0x0
 
     if-eqz v6, :cond_8
 
-    iget-wide v11, v0, Lokhttp3/internal/a/c$a;->cbs:J
+    iget-wide v11, v0, Lokhttp3/internal/a/c$a;->caM:J
 
-    iget-object v6, v0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iget-object v6, v0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
     invoke-virtual {v6}, Ljava/util/Date;->getTime()J
 
@@ -473,13 +485,13 @@
 
     move-result-wide v11
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_8
     move-wide v11, v9
 
-    :goto_4
-    iget v6, v0, Lokhttp3/internal/a/c$a;->cbu:I
+    :goto_3
+    iget v6, v0, Lokhttp3/internal/a/c$a;->caO:I
 
     const/4 v13, -0x1
 
@@ -487,7 +499,7 @@
 
     sget-object v6, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v14, v0, Lokhttp3/internal/a/c$a;->cbu:I
+    iget v14, v0, Lokhttp3/internal/a/c$a;->caO:I
 
     int-to-long v14, v14
 
@@ -500,106 +512,111 @@
     move-result-wide v11
 
     :cond_9
-    iget-wide v14, v0, Lokhttp3/internal/a/c$a;->cbs:J
+    iget-wide v14, v0, Lokhttp3/internal/a/c$a;->caM:J
 
-    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->cbr:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->caL:J
 
     sub-long/2addr v14, v7
 
-    iget-wide v6, v0, Lokhttp3/internal/a/c$a;->cbl:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->caF:J
 
     move-object/from16 v17, v3
 
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->cbs:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->caM:J
 
-    sub-long/2addr v6, v2
+    sub-long/2addr v7, v2
 
     add-long/2addr v11, v14
 
-    add-long/2addr v11, v6
+    add-long/2addr v11, v7
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->HG()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->HF()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v3, v2, Lokhttp3/d;->bVE:I
+    iget v3, v2, Lokhttp3/d;->bUY:I
 
     if-eq v3, v13, :cond_a
 
     sget-object v3, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v2, v2, Lokhttp3/d;->bVE:I
+    iget v2, v2, Lokhttp3/d;->bUY:I
 
-    int-to-long v6, v2
+    int-to-long v7, v2
 
-    invoke-virtual {v3, v6, v7}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+    invoke-virtual {v3, v7, v8}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
 
     move-result-wide v2
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_a
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbq:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caK:Ljava/util/Date;
 
-    if-eqz v2, :cond_c
+    if-eqz v2, :cond_d
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
     if-eqz v2, :cond_b
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
     invoke-virtual {v2}, Ljava/util/Date;->getTime()J
 
     move-result-wide v2
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_b
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->cbs:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->caM:J
 
-    :goto_5
-    iget-object v6, v0, Lokhttp3/internal/a/c$a;->cbq:Ljava/util/Date;
+    :goto_4
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->caK:Ljava/util/Date;
 
-    invoke-virtual {v6}, Ljava/util/Date;->getTime()J
+    invoke-virtual {v7}, Ljava/util/Date;->getTime()J
 
-    move-result-wide v6
+    move-result-wide v7
 
-    sub-long v2, v6, v2
+    sub-long v2, v7, v2
 
-    cmp-long v6, v2, v9
+    cmp-long v7, v2, v9
 
-    if-lez v6, :cond_f
+    if-lez v7, :cond_c
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_c
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbo:Ljava/util/Date;
+    move-wide v2, v9
 
-    if-eqz v2, :cond_f
+    goto :goto_7
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    :cond_d
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caI:Ljava/util/Date;
 
-    iget-object v2, v2, Lokhttp3/Response;->cas:Lokhttp3/w;
+    if-eqz v2, :cond_11
 
-    iget-object v2, v2, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
-    iget-object v3, v2, Lokhttp3/s;->bZf:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    if-nez v3, :cond_d
+    iget-object v2, v2, Lokhttp3/w;->bUJ:Lokhttp3/s;
+
+    iget-object v3, v2, Lokhttp3/s;->bYz:Ljava/util/List;
+
+    if-nez v3, :cond_e
 
     const/4 v2, 0x0
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_d
+    :cond_e
     new-instance v3, Ljava/lang/StringBuilder;
 
     invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, v2, Lokhttp3/s;->bZf:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/s;->bYz:Ljava/util/List;
 
     invoke-static {v3, v2}, Lokhttp3/s;->b(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
@@ -607,126 +624,131 @@
 
     move-result-object v2
 
-    :goto_6
-    if-nez v2, :cond_f
+    :goto_5
+    if-nez v2, :cond_11
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
-    if-eqz v2, :cond_e
+    if-eqz v2, :cond_f
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
     invoke-virtual {v2}, Ljava/util/Date;->getTime()J
 
     move-result-wide v2
 
-    goto :goto_7
-
-    :cond_e
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->cbr:J
-
-    :goto_7
-    iget-object v6, v0, Lokhttp3/internal/a/c$a;->cbo:Ljava/util/Date;
-
-    invoke-virtual {v6}, Ljava/util/Date;->getTime()J
-
-    move-result-wide v6
-
-    sub-long/2addr v2, v6
-
-    cmp-long v6, v2, v9
-
-    if-lez v6, :cond_f
-
-    const-wide/16 v6, 0xa
-
-    div-long/2addr v2, v6
-
-    goto :goto_8
+    goto :goto_6
 
     :cond_f
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->caL:J
+
+    :goto_6
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->caI:Ljava/util/Date;
+
+    invoke-virtual {v7}, Ljava/util/Date;->getTime()J
+
+    move-result-wide v7
+
+    sub-long/2addr v2, v7
+
+    cmp-long v7, v2, v9
+
+    if-lez v7, :cond_10
+
+    const-wide/16 v7, 0xa
+
+    div-long/2addr v2, v7
+
+    goto :goto_7
+
+    :cond_10
     move-wide v2, v9
 
-    :goto_8
-    iget v6, v4, Lokhttp3/d;->bVE:I
+    goto :goto_7
 
-    if-eq v6, v13, :cond_10
+    :cond_11
+    move-wide v2, v9
 
-    sget-object v6, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    :goto_7
+    iget v7, v4, Lokhttp3/d;->bUY:I
 
-    iget v7, v4, Lokhttp3/d;->bVE:I
+    if-eq v7, v13, :cond_12
 
-    int-to-long v7, v7
+    sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-virtual {v6, v7, v8}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+    iget v8, v4, Lokhttp3/d;->bUY:I
 
-    move-result-wide v6
+    int-to-long v14, v8
 
-    invoke-static {v2, v3, v6, v7}, Ljava/lang/Math;->min(JJ)J
+    invoke-virtual {v7, v14, v15}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+
+    move-result-wide v7
+
+    invoke-static {v2, v3, v7, v8}, Ljava/lang/Math;->min(JJ)J
 
     move-result-wide v2
 
-    :cond_10
-    iget v6, v4, Lokhttp3/d;->bVK:I
+    :cond_12
+    iget v7, v4, Lokhttp3/d;->bVe:I
 
-    if-eq v6, v13, :cond_11
+    if-eq v7, v13, :cond_13
 
-    sget-object v6, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v7, v4, Lokhttp3/d;->bVK:I
+    iget v8, v4, Lokhttp3/d;->bVe:I
 
-    int-to-long v7, v7
+    int-to-long v14, v8
 
-    invoke-virtual {v6, v7, v8}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+    invoke-virtual {v7, v14, v15}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
 
-    move-result-wide v6
+    move-result-wide v7
 
-    goto :goto_9
+    goto :goto_8
 
-    :cond_11
-    move-wide v6, v9
+    :cond_13
+    move-wide v7, v9
 
-    :goto_9
-    iget-boolean v8, v5, Lokhttp3/d;->bVI:Z
+    :goto_8
+    iget-boolean v14, v5, Lokhttp3/d;->bVc:Z
 
-    if-nez v8, :cond_12
+    if-nez v14, :cond_14
 
-    iget v8, v4, Lokhttp3/d;->bVJ:I
+    iget v14, v4, Lokhttp3/d;->bVd:I
 
-    if-eq v8, v13, :cond_12
+    if-eq v14, v13, :cond_14
 
-    sget-object v8, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v9, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v4, v4, Lokhttp3/d;->bVJ:I
+    iget v4, v4, Lokhttp3/d;->bVd:I
 
-    int-to-long v9, v4
+    int-to-long v14, v4
 
-    invoke-virtual {v8, v9, v10}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+    invoke-virtual {v9, v14, v15}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
 
     move-result-wide v9
 
-    :cond_12
-    iget-boolean v4, v5, Lokhttp3/d;->bVC:Z
+    :cond_14
+    iget-boolean v4, v5, Lokhttp3/d;->bUW:Z
 
-    if-nez v4, :cond_16
+    if-nez v4, :cond_18
 
-    add-long/2addr v6, v11
+    add-long/2addr v7, v11
 
     add-long/2addr v9, v2
 
-    cmp-long v4, v6, v9
+    cmp-long v4, v7, v9
 
-    if-gez v4, :cond_16
+    if-gez v4, :cond_18
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
-    invoke-virtual {v4}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v4}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v4
 
-    cmp-long v5, v6, v2
+    cmp-long v5, v7, v2
 
-    if-ltz v5, :cond_13
+    if-ltz v5, :cond_15
 
     const-string v2, "Warning"
 
@@ -734,36 +756,36 @@
 
     invoke-virtual {v4, v2, v3}, Lokhttp3/Response$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Response$a;
 
-    :cond_13
+    :cond_15
     const-wide/32 v2, 0x5265c00
 
     cmp-long v5, v11, v2
 
-    if-lez v5, :cond_15
+    if-lez v5, :cond_17
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->HG()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->HF()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v2, v2, Lokhttp3/d;->bVE:I
+    iget v2, v2, Lokhttp3/d;->bUY:I
 
-    if-ne v2, v13, :cond_14
+    if-ne v2, v13, :cond_16
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbq:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caK:Ljava/util/Date;
 
-    if-nez v2, :cond_14
+    if-nez v2, :cond_16
 
     const/16 v16, 0x1
 
-    goto :goto_a
+    goto :goto_9
 
-    :cond_14
+    :cond_16
     const/16 v16, 0x0
 
-    :goto_a
-    if-eqz v16, :cond_15
+    :goto_9
+    if-eqz v16, :cond_17
 
     const-string v2, "Warning"
 
@@ -771,10 +793,10 @@
 
     invoke-virtual {v4, v2, v3}, Lokhttp3/Response$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Response$a;
 
-    :cond_15
+    :cond_17
     new-instance v2, Lokhttp3/internal/a/c;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v3
 
@@ -786,59 +808,59 @@
 
     move-object v4, v2
 
-    goto :goto_d
-
-    :cond_16
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbt:Ljava/lang/String;
-
-    if-eqz v2, :cond_17
-
-    const-string v2, "If-None-Match"
-
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->cbt:Ljava/lang/String;
-
-    goto :goto_b
-
-    :cond_17
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbo:Ljava/util/Date;
-
-    if-eqz v2, :cond_18
-
-    const-string v2, "If-Modified-Since"
-
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->cbp:Ljava/lang/String;
-
-    goto :goto_b
+    goto :goto_c
 
     :cond_18
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caN:Ljava/lang/String;
 
     if-eqz v2, :cond_19
 
+    const-string v2, "If-None-Match"
+
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->caN:Ljava/lang/String;
+
+    goto :goto_a
+
+    :cond_19
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caI:Ljava/util/Date;
+
+    if-eqz v2, :cond_1a
+
     const-string v2, "If-Modified-Since"
 
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->cbn:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->caJ:Ljava/lang/String;
 
-    :goto_b
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    goto :goto_a
 
-    iget-object v4, v4, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    :cond_1a
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
-    invoke-virtual {v4}, Lokhttp3/Headers;->Hh()Lokhttp3/Headers$a;
+    if-eqz v2, :cond_1b
+
+    const-string v2, "If-Modified-Since"
+
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->caH:Ljava/lang/String;
+
+    :goto_a
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
+
+    iget-object v4, v4, Lokhttp3/w;->bYW:Lokhttp3/Headers;
+
+    invoke-virtual {v4}, Lokhttp3/Headers;->Hg()Lokhttp3/Headers$a;
 
     move-result-object v4
 
-    sget-object v5, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v5, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
     invoke-virtual {v5, v4, v2, v3}, Lokhttp3/internal/a;->a(Lokhttp3/Headers$a;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
-    invoke-virtual {v2}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {v2}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object v2
 
-    invoke-virtual {v4}, Lokhttp3/Headers$a;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v4}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object v3
 
@@ -846,100 +868,100 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v2}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
     invoke-direct {v4, v2, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
     const/4 v3, 0x0
 
-    goto :goto_d
+    goto :goto_c
 
-    :cond_19
+    :cond_1b
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
     const/4 v3, 0x0
 
     invoke-direct {v4, v2, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
-    goto :goto_d
+    goto :goto_c
 
-    :cond_1a
-    :goto_c
+    :cond_1c
+    :goto_b
     move-object/from16 v17, v3
 
     move-object v3, v2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
     invoke-direct {v4, v2, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
-    :goto_d
-    iget-object v2, v4, Lokhttp3/internal/a/c;->cbk:Lokhttp3/w;
+    :goto_c
+    iget-object v2, v4, Lokhttp3/internal/a/c;->caE:Lokhttp3/w;
 
-    if-eqz v2, :cond_1b
+    if-eqz v2, :cond_1d
 
-    iget-object v0, v0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
-    invoke-virtual {v0}, Lokhttp3/w;->HG()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/w;->HF()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bVL:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bVf:Z
 
-    if-eqz v0, :cond_1b
+    if-eqz v0, :cond_1d
 
     new-instance v4, Lokhttp3/internal/a/c;
 
     invoke-direct {v4, v3, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
-    :cond_1b
-    iget-object v0, v4, Lokhttp3/internal/a/c;->cbk:Lokhttp3/w;
+    :cond_1d
+    iget-object v0, v4, Lokhttp3/internal/a/c;->caE:Lokhttp3/w;
 
-    iget-object v2, v4, Lokhttp3/internal/a/c;->cax:Lokhttp3/Response;
+    iget-object v2, v4, Lokhttp3/internal/a/c;->bZR:Lokhttp3/Response;
 
-    if-eqz v17, :cond_1c
+    if-eqz v17, :cond_1e
 
-    if-nez v2, :cond_1c
+    if-nez v2, :cond_1e
 
     move-object/from16 v3, v17
 
-    iget-object v4, v3, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v4, v3, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-static {v4}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
-    goto :goto_e
+    goto :goto_d
 
-    :cond_1c
+    :cond_1e
     move-object/from16 v3, v17
 
-    :goto_e
-    if-nez v0, :cond_1d
+    :goto_d
+    if-nez v0, :cond_1f
 
-    if-nez v2, :cond_1d
+    if-nez v2, :cond_1f
 
     new-instance v0, Lokhttp3/Response$a;
 
     invoke-direct {v0}, Lokhttp3/Response$a;-><init>()V
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iput-object v2, v0, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
-    sget-object v2, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bZp:Lokhttp3/u;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->cat:Lokhttp3/u;
+    iput-object v2, v0, Lokhttp3/Response$a;->bZN:Lokhttp3/u;
 
     const/16 v2, 0x1f8
 
@@ -949,30 +971,30 @@
 
     iput-object v2, v0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    sget-object v2, Lokhttp3/internal/c;->caP:Lokhttp3/x;
+    sget-object v2, Lokhttp3/internal/c;->caj:Lokhttp3/x;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iput-object v2, v0, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
     const-wide/16 v2, -0x1
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->caz:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bZT:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v2
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->caA:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bZU:J
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v0
 
     return-object v0
 
-    :cond_1d
-    if-nez v0, :cond_1e
+    :cond_1f
+    if-nez v0, :cond_20
 
-    invoke-virtual {v2}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v0
 
@@ -984,13 +1006,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v0
 
     return-object v0
 
-    :cond_1e
+    :cond_20
     move-object/from16 v4, p1
 
     :try_start_0
@@ -1000,30 +1022,30 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-nez v4, :cond_1f
+    if-nez v4, :cond_21
 
-    if-eqz v3, :cond_1f
+    if-eqz v3, :cond_21
 
-    iget-object v3, v3, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v3, v3, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
-    :cond_1f
-    if-eqz v2, :cond_21
+    :cond_21
+    if-eqz v2, :cond_23
 
     iget v3, v4, Lokhttp3/Response;->code:I
 
     const/16 v5, 0x130
 
-    if-ne v3, v5, :cond_20
+    if-ne v3, v5, :cond_22
 
-    invoke-virtual {v2}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v3, v2, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
-    iget-object v5, v4, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v5, v4, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
     invoke-static {v3, v5}, Lokhttp3/internal/a/a;->a(Lokhttp3/Headers;Lokhttp3/Headers;)Lokhttp3/Headers;
 
@@ -1033,13 +1055,13 @@
 
     move-result-object v0
 
-    iget-wide v5, v4, Lokhttp3/Response;->caz:J
+    iget-wide v5, v4, Lokhttp3/Response;->bZT:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->caz:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bZT:J
 
-    iget-wide v5, v4, Lokhttp3/Response;->caA:J
+    iget-wide v5, v4, Lokhttp3/Response;->bZU:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->caA:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bZU:J
 
     invoke-static {v2}, Lokhttp3/internal/a/a;->c(Lokhttp3/Response;)Lokhttp3/Response;
 
@@ -1057,23 +1079,23 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v0
 
-    iget-object v2, v4, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v2, v4, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-virtual {v2}, Lokhttp3/x;->close()V
 
     return-object v0
 
-    :cond_20
-    iget-object v3, v2, Lokhttp3/Response;->cav:Lokhttp3/x;
+    :cond_22
+    iget-object v3, v2, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
-    :cond_21
-    invoke-virtual {v4}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    :cond_23
+    invoke-virtual {v4}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v3
 
@@ -1093,49 +1115,49 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, v1, Lokhttp3/internal/a/a;->cbe:Lokhttp3/internal/a/e;
+    iget-object v3, v1, Lokhttp3/internal/a/a;->cay:Lokhttp3/internal/a/e;
 
-    if-eqz v3, :cond_25
+    if-eqz v3, :cond_27
 
     invoke-static {v2}, Lokhttp3/internal/c/e;->f(Lokhttp3/Response;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_24
+    if-eqz v3, :cond_26
 
     invoke-static {v2, v0}, Lokhttp3/internal/a/c;->a(Lokhttp3/Response;Lokhttp3/w;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_24
+    if-eqz v3, :cond_26
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->cbe:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->cay:Lokhttp3/internal/a/e;
 
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->HS()Lokhttp3/internal/a/b;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->HR()Lokhttp3/internal/a/b;
 
     move-result-object v0
 
-    if-nez v0, :cond_22
+    if-nez v0, :cond_24
 
     return-object v2
 
-    :cond_22
-    invoke-interface {v0}, Lokhttp3/internal/a/b;->HO()Lokio/p;
+    :cond_24
+    invoke-interface {v0}, Lokhttp3/internal/a/b;->HN()Lokio/p;
 
     move-result-object v3
 
-    if-nez v3, :cond_23
+    if-nez v3, :cond_25
 
     return-object v2
 
-    :cond_23
-    iget-object v4, v2, Lokhttp3/Response;->cav:Lokhttp3/x;
+    :cond_25
+    iget-object v4, v2, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
-    invoke-virtual {v4}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {v4}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v4
 
@@ -1153,13 +1175,13 @@
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v3, v2, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentLength()J
 
     move-result-wide v3
 
-    invoke-virtual {v2}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v2
 
@@ -1171,15 +1193,15 @@
 
     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;->cav:Lokhttp3/x;
+    iput-object v6, v2, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v0
 
     return-object v0
 
-    :cond_24
+    :cond_26
     iget-object v0, v0, Lokhttp3/w;->method:Ljava/lang/String;
 
     const-string v3, "POST"
@@ -1188,7 +1210,7 @@
 
     move-result v3
 
-    if-nez v3, :cond_25
+    if-nez v3, :cond_27
 
     const-string v3, "PATCH"
 
@@ -1196,7 +1218,7 @@
 
     move-result v3
 
-    if-nez v3, :cond_25
+    if-nez v3, :cond_27
 
     const-string v3, "PUT"
 
@@ -1204,7 +1226,7 @@
 
     move-result v3
 
-    if-nez v3, :cond_25
+    if-nez v3, :cond_27
 
     const-string v3, "DELETE"
 
@@ -1212,13 +1234,13 @@
 
     move-result v3
 
-    if-nez v3, :cond_25
+    if-nez v3, :cond_27
 
     const-string v3, "MOVE"
 
     invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    :cond_25
+    :cond_27
     return-object v2
 
     :catchall_0
@@ -1226,12 +1248,12 @@
 
     move-object v2, v0
 
-    if-eqz v3, :cond_26
+    if-eqz v3, :cond_28
 
-    iget-object v0, v3, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, v3, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
-    :cond_26
+    :cond_28
     throw v2
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/b.smali b/com.discord/smali_classes2/okhttp3/internal/a/b.smali
index 00003617f6..bb0b548a1f 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/b.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/internal/a/b;
 .super Ljava/lang/Object;
+.source "CacheRequest.java"
 
 
 # virtual methods
-.method public abstract HO()Lokio/p;
+.method public abstract HN()Lokio/p;
     .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 4200202049..f669178586 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/c$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/a/c$a;
 .super Ljava/lang/Object;
+.source "CacheStrategy.java"
 
 
 # annotations
@@ -14,29 +15,29 @@
 
 
 # instance fields
-.field final cas:Lokhttp3/w;
+.field final bZM:Lokhttp3/w;
 
-.field final cax:Lokhttp3/Response;
+.field final bZR:Lokhttp3/Response;
 
-.field final cbl:J
+.field final caF:J
 
-.field cbm:Ljava/util/Date;
+.field caG:Ljava/util/Date;
 
-.field cbn:Ljava/lang/String;
+.field caH:Ljava/lang/String;
 
-.field cbo:Ljava/util/Date;
+.field caI:Ljava/util/Date;
 
-.field cbp:Ljava/lang/String;
+.field caJ:Ljava/lang/String;
 
-.field cbq:Ljava/util/Date;
+.field caK:Ljava/util/Date;
 
-.field cbr:J
+.field caL:J
 
-.field cbs:J
+.field caM:J
 
-.field cbt:Ljava/lang/String;
+.field caN:Ljava/lang/String;
 
-.field cbu:I
+.field caO:I
 
 
 # direct methods
@@ -47,29 +48,29 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/a/c$a;->cbu:I
+    iput v0, p0, Lokhttp3/internal/a/c$a;->caO:I
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->cbl:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->caF:J
 
-    iput-object p3, p0, Lokhttp3/internal/a/c$a;->cas:Lokhttp3/w;
+    iput-object p3, p0, Lokhttp3/internal/a/c$a;->bZM:Lokhttp3/w;
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->cax:Lokhttp3/Response;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bZR:Lokhttp3/Response;
 
     if-eqz p4, :cond_5
 
-    iget-wide p1, p4, Lokhttp3/Response;->caz:J
+    iget-wide p1, p4, Lokhttp3/Response;->bZT:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->cbr:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->caL:J
 
-    iget-wide p1, p4, Lokhttp3/Response;->caA:J
+    iget-wide p1, p4, Lokhttp3/Response;->bZU:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->cbs:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->caM:J
 
-    iget-object p1, p4, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object p1, p4, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
     const/4 p2, 0x0
 
-    iget-object p3, p1, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length p3, p3
 
@@ -98,9 +99,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->cbm:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->caG:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->cbn:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->caH:Ljava/lang/String;
 
     goto :goto_1
 
@@ -117,7 +118,7 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->cbq:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->caK:Ljava/util/Date;
 
     goto :goto_1
 
@@ -134,9 +135,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->cbo:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->caI:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->cbp:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->caJ:Ljava/lang/String;
 
     goto :goto_1
 
@@ -149,7 +150,7 @@
 
     if-eqz v2, :cond_3
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->cbt:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->caN:Ljava/lang/String;
 
     goto :goto_1
 
@@ -166,7 +167,7 @@
 
     move-result p4
 
-    iput p4, p0, Lokhttp3/internal/a/c$a;->cbu:I
+    iput p4, p0, Lokhttp3/internal/a/c$a;->caO: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 5e2bea6757..556f2a8f02 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/a/d$a;
 .super Ljava/lang/Object;
+.source "DiskLruCache.java"
 
 
 # annotations
@@ -14,8 +15,8 @@
 
 
 # instance fields
-.field final cbD:Lokhttp3/internal/a/d$b;
+.field final caX:Lokhttp3/internal/a/d$b;
 
-.field final synthetic cbE:Lokhttp3/internal/a/d;
+.field final synthetic caY: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 52cf4312ec..5a36d25846 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d$b.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/a/d$b;
 .super Ljava/lang/Object;
+.source "DiskLruCache.java"
 
 
 # annotations
@@ -14,15 +15,15 @@
 
 
 # instance fields
-.field final cbF:[J
+.field final caZ:[J
 
-.field final cbG:[Ljava/io/File;
+.field final cba:[Ljava/io/File;
 
-.field final cbH:[Ljava/io/File;
+.field final cbb:[Ljava/io/File;
 
-.field cbI:Z
+.field cbc:Z
 
-.field cbJ:Lokhttp3/internal/a/d$a;
+.field cbd:Lokhttp3/internal/a/d$a;
 
 .field final key:Ljava/lang/String;
 
@@ -36,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/a/d$b;->cbF:[J
+    iget-object v0, p0, Lokhttp3/internal/a/d$b;->caZ:[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 eb170d845a..bb30f09baa 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/a/d;
 .super Ljava/lang/Object;
+.source "DiskLruCache.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -18,13 +19,21 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field static final cbv:Ljava/util/regex/Pattern;
+.field static final caP:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bYh:Ljava/lang/Runnable;
+.field private final bXB:Ljava/lang/Runnable;
 
-.field final cbA:Ljava/util/LinkedHashMap;
+.field final caQ:Lokhttp3/internal/f/a;
+
+.field private caR:J
+
+.field final caS:I
+
+.field caT:Lokio/BufferedSink;
+
+.field final caU:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -35,17 +44,9 @@
     .end annotation
 .end field
 
-.field cbB:I
+.field caV:I
 
-.field cbC:Z
-
-.field final cbw:Lokhttp3/internal/f/a;
-
-.field private cbx:J
-
-.field final cby:I
-
-.field cbz:Lokio/BufferedSink;
+.field caW:Z
 
 .field closed:Z
 
@@ -66,23 +67,21 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/a/d;->cbv:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/a/d;->caP:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method private HP()Z
+.method private HO()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/a/d;->cbB:I
+    iget v0, p0, Lokhttp3/internal/a/d;->caV:I
 
     const/16 v1, 0x7d0
 
     if-lt v0, v1, :cond_0
 
-    iget v0, p0, Lokhttp3/internal/a/d;->cbB:I
-
-    iget-object v1, p0, Lokhttp3/internal/a/d;->cbA:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lokhttp3/internal/a/d;->caU:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v1}, Ljava/util/LinkedHashMap;->size()I
 
@@ -100,7 +99,7 @@
     return v0
 .end method
 
-.method private declared-synchronized HQ()V
+.method private declared-synchronized HP()V
     .locals 2
 
     monitor-enter p0
@@ -149,9 +148,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p1, Lokhttp3/internal/a/d$a;->cbD:Lokhttp3/internal/a/d$b;
+    iget-object v0, p1, Lokhttp3/internal/a/d$a;->caX:Lokhttp3/internal/a/d$b;
 
-    iget-object v1, v0, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iget-object v1, v0, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
     if-ne v1, p1, :cond_4
 
@@ -160,15 +159,15 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/a/d;->cby:I
+    iget v2, p0, Lokhttp3/internal/a/d;->caS:I
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$b;->cbH:[Ljava/io/File;
+    iget-object v2, v0, Lokhttp3/internal/a/d$b;->cbb:[Ljava/io/File;
 
     aget-object v2, v2, v1
 
-    iget-object v3, p0, Lokhttp3/internal/a/d;->cbw:Lokhttp3/internal/f/a;
+    iget-object v3, p0, Lokhttp3/internal/a/d;->caQ:Lokhttp3/internal/f/a;
 
     invoke-interface {v3, v2}, Lokhttp3/internal/f/a;->A(Ljava/io/File;)V
 
@@ -177,19 +176,19 @@
     goto :goto_0
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/a/d;->cbB:I
+    iget v1, p0, Lokhttp3/internal/a/d;->caV:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, p0, Lokhttp3/internal/a/d;->cbB:I
+    iput v1, p0, Lokhttp3/internal/a/d;->caV:I
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iput-object v1, v0, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
-    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->cbI:Z
+    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->cbc:Z
 
     or-int/2addr p1, v1
 
@@ -199,9 +198,9 @@
 
     if-eqz p1, :cond_1
 
-    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->cbI:Z
+    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->cbc:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     const-string v2, "CLEAN"
 
@@ -211,31 +210,30 @@
 
     invoke-interface {p1, v3}, Lokio/BufferedSink;->fy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     iget-object v2, v0, Lokhttp3/internal/a/d$b;->key:Ljava/lang/String;
 
     invoke-interface {p1, v2}, Lokio/BufferedSink;->eL(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/a/d$b;->a(Lokio/BufferedSink;)V
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
-    :goto_1
     invoke-interface {p1, v1}, Lokio/BufferedSink;->fy(I)Lokio/BufferedSink;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbA:Ljava/util/LinkedHashMap;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caU: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;->cbz:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     const-string v2, "REMOVE"
 
@@ -245,30 +243,30 @@
 
     invoke-interface {p1, v3}, Lokio/BufferedSink;->fy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     iget-object v0, v0, Lokhttp3/internal/a/d$b;->key:Ljava/lang/String;
 
     invoke-interface {p1, v0}, Lokio/BufferedSink;->eL(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
-    goto :goto_1
+    invoke-interface {p1, v1}, Lokio/BufferedSink;->fy(I)Lokio/BufferedSink;
 
-    :goto_2
-    iget-object p1, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    :goto_1
+    iget-object p1, p0, Lokhttp3/internal/a/d;->caT: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;->cbx:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->caR:J
 
     cmp-long p1, v0, v2
 
     if-gtz p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->HP()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->HO()Z
 
     move-result p1
 
@@ -277,7 +275,7 @@
     :cond_2
     iget-object p1, p0, Lokhttp3/internal/a/d;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bYh:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bXB:Ljava/lang/Runnable;
 
     invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
     :try_end_0
@@ -304,6 +302,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method private a(Lokhttp3/internal/a/d$b;)Z
@@ -314,37 +314,37 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$a;->cbD:Lokhttp3/internal/a/d$b;
+    iget-object v2, v0, Lokhttp3/internal/a/d$a;->caX:Lokhttp3/internal/a/d$b;
 
-    iget-object v2, v2, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iget-object v2, v2, Lokhttp3/internal/a/d$b;->cbd: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;->cbE:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->caY:Lokhttp3/internal/a/d;
 
-    iget v3, v3, Lokhttp3/internal/a/d;->cby:I
+    iget v3, v3, Lokhttp3/internal/a/d;->caS:I
 
     if-ge v2, v3, :cond_0
 
     :try_start_0
-    iget-object v3, v0, Lokhttp3/internal/a/d$a;->cbE:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->caY:Lokhttp3/internal/a/d;
 
-    iget-object v3, v3, Lokhttp3/internal/a/d;->cbw:Lokhttp3/internal/f/a;
+    iget-object v3, v3, Lokhttp3/internal/a/d;->caQ:Lokhttp3/internal/f/a;
 
-    iget-object v4, v0, Lokhttp3/internal/a/d$a;->cbD:Lokhttp3/internal/a/d$b;
+    iget-object v4, v0, Lokhttp3/internal/a/d$a;->caX:Lokhttp3/internal/a/d$b;
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->cbH:[Ljava/io/File;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->cbb:[Ljava/io/File;
 
     aget-object v4, v4, v2
 
@@ -358,21 +358,21 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lokhttp3/internal/a/d$a;->cbD:Lokhttp3/internal/a/d$b;
+    iget-object v0, v0, Lokhttp3/internal/a/d$a;->caX:Lokhttp3/internal/a/d$b;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iput-object v2, v0, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
     :cond_1
     :goto_1
-    iget v0, p0, Lokhttp3/internal/a/d;->cby:I
+    iget v0, p0, Lokhttp3/internal/a/d;->caS:I
 
     if-ge v1, v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->cbw:Lokhttp3/internal/f/a;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->caQ:Lokhttp3/internal/f/a;
 
-    iget-object v2, p1, Lokhttp3/internal/a/d$b;->cbG:[Ljava/io/File;
+    iget-object v2, p1, Lokhttp3/internal/a/d$b;->cba:[Ljava/io/File;
 
     aget-object v2, v2, v1
 
@@ -380,7 +380,7 @@
 
     iget-wide v2, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->cbF:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->caZ:[J
 
     aget-wide v4, v0, v1
 
@@ -388,7 +388,7 @@
 
     iput-wide v2, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->cbF:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->caZ:[J
 
     const-wide/16 v2, 0x0
 
@@ -399,15 +399,15 @@
     goto :goto_1
 
     :cond_2
-    iget v0, p0, Lokhttp3/internal/a/d;->cbB:I
+    iget v0, p0, Lokhttp3/internal/a/d;->caV:I
 
     const/4 v1, 0x1
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lokhttp3/internal/a/d;->cbB:I
+    iput v0, p0, Lokhttp3/internal/a/d;->caV:I
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     const-string v2, "REMOVE"
 
@@ -431,13 +431,13 @@
 
     invoke-interface {v0, v2}, Lokio/BufferedSink;->fy(I)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->cbA:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->caU: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;->HP()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->HO()Z
 
     move-result p1
 
@@ -445,7 +445,7 @@
 
     iget-object p1, p0, Lokhttp3/internal/a/d;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bYh:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bXB:Ljava/lang/Runnable;
 
     invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
@@ -486,13 +486,13 @@
     :goto_0
     iget-wide v0, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-wide v2, p0, Lokhttp3/internal/a/d;->cbx:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->caR:J
 
     cmp-long v4, v0, v2
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->cbA:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->caU:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->values()Ljava/util/Collection;
 
@@ -515,7 +515,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/d;->cbC:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/d;->caW:Z
 
     return-void
 .end method
@@ -546,13 +546,13 @@
     goto :goto_2
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/a/d;->cbA:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->caU: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;->cbA:Ljava/util/LinkedHashMap;
+    iget-object v2, p0, Lokhttp3/internal/a/d;->caU:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v2}, Ljava/util/LinkedHashMap;->size()I
 
@@ -575,13 +575,13 @@
 
     aget-object v4, v0, v3
 
-    iget-object v5, v4, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iget-object v5, v4, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
     if-eqz v5, :cond_3
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
-    iget-object v5, v4, Lokhttp3/internal/a/d$a;->cbE:Lokhttp3/internal/a/d;
+    iget-object v5, v4, Lokhttp3/internal/a/d$a;->caY:Lokhttp3/internal/a/d;
 
     monitor-enter v5
     :try_end_0
@@ -592,13 +592,13 @@
 
     if-nez v6, :cond_2
 
-    iget-object v6, v4, Lokhttp3/internal/a/d$a;->cbD:Lokhttp3/internal/a/d$b;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->caX:Lokhttp3/internal/a/d$b;
 
-    iget-object v6, v6, Lokhttp3/internal/a/d$b;->cbJ:Lokhttp3/internal/a/d$a;
+    iget-object v6, v6, Lokhttp3/internal/a/d$b;->cbd:Lokhttp3/internal/a/d$a;
 
     if-ne v6, v4, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/a/d$a;->cbE:Lokhttp3/internal/a/d;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->caY:Lokhttp3/internal/a/d;
 
     invoke-direct {v6, v4}, Lokhttp3/internal/a/d;->a(Lokhttp3/internal/a/d$a;)V
 
@@ -635,13 +635,13 @@
     :cond_4
     invoke-direct {p0}, Lokhttp3/internal/a/d;->trimToSize()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->close()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iput-object v0, p0, Lokhttp3/internal/a/d;->caT:Lokio/BufferedSink;
 
     iput-boolean v1, p0, Lokhttp3/internal/a/d;->closed:Z
     :try_end_2
@@ -668,6 +668,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final declared-synchronized flush()V
@@ -693,11 +695,11 @@
 
     :cond_0
     :try_start_1
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->HQ()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->HP()V
 
     invoke-direct {p0}, Lokhttp3/internal/a/d;->trimToSize()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->cbz:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->caT: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 86c3b10d37..40a319b5fe 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/e.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/internal/a/e;
 .super Ljava/lang/Object;
+.source "InternalCache.java"
 
 
 # virtual methods
-.method public abstract HR()Lokhttp3/Response;
+.method public abstract HQ()Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -11,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract HS()Lokhttp3/internal/a/b;
+.method public abstract HR()Lokhttp3/internal/a/b;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okhttp3/internal/b.smali b/com.discord/smali_classes2/okhttp3/internal/b.smali
index 0bd92cdc98..af9a33fe3b 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/internal/b;
 .super Ljava/lang/Object;
+.source "NamedRunnable.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/a.smali b/com.discord/smali_classes2/okhttp3/internal/b/a.smali
index c0b614bf40..c4b2767552 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/a.smali
@@ -1,12 +1,13 @@
 .class public final Lokhttp3/internal/b/a;
 .super Ljava/lang/Object;
+.source "ConnectInterceptor.java"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
 
 
 # instance fields
-.field public final cab:Lokhttp3/t;
+.field public final bZv:Lokhttp3/t;
 
 
 # direct methods
@@ -15,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/b/a;->cab:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/b/a;->bZv:Lokhttp3/t;
 
     return-void
 .end method
@@ -34,9 +35,9 @@
 
     check-cast v0, Lokhttp3/internal/c/g;
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->cas:Lokhttp3/w;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->bZM:Lokhttp3/w;
 
-    iget-object v2, v0, Lokhttp3/internal/c/g;->cct:Lokhttp3/internal/b/g;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->cbN:Lokhttp3/internal/b/g;
 
     iget-object v3, v1, Lokhttp3/w;->method:Ljava/lang/String;
 
@@ -48,13 +49,13 @@
 
     xor-int/lit8 v3, v3, 0x1
 
-    iget-object v4, p0, Lokhttp3/internal/b/a;->cab:Lokhttp3/t;
+    iget-object v4, p0, Lokhttp3/internal/b/a;->bZv: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;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {v2}, Lokhttp3/internal/b/g;->HX()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 236a760149..67f6a19c98 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/b.smali
@@ -1,9 +1,10 @@
 .class public final Lokhttp3/internal/b/b;
 .super Ljava/lang/Object;
+.source "ConnectionSpecSelector.java"
 
 
 # instance fields
-.field private final bVu:Ljava/util/List;
+.field private final bUO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -13,11 +14,11 @@
     .end annotation
 .end field
 
-.field private cbK:I
+.field private cbe:I
 
-.field cbL:Z
+.field cbf:Z
 
-.field cbM:Z
+.field cbg:Z
 
 
 # direct methods
@@ -36,9 +37,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/b;->cbK:I
+    iput v0, p0, Lokhttp3/internal/b/b;->cbe:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/b;->bVu:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/b;->bUO:Ljava/util/List;
 
     return-void
 .end method
@@ -46,10 +47,10 @@
 .method private d(Ljavax/net/ssl/SSLSocket;)Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/b;->cbK:I
+    iget v0, p0, Lokhttp3/internal/b/b;->cbe:I
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bVu:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bUO:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -57,7 +58,7 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bVu:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bUO:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -96,9 +97,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lokhttp3/internal/b/b;->cbK:I
+    iget v0, p0, Lokhttp3/internal/b/b;->cbe:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bVu:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bUO:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -107,7 +108,7 @@
     :goto_0
     if-ge v0, v1, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/b/b;->bVu:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bUO:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -123,7 +124,7 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/b/b;->cbK:I
+    iput v0, p0, Lokhttp3/internal/b/b;->cbe:I
 
     goto :goto_1
 
@@ -142,11 +143,11 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lokhttp3/internal/b/b;->cbL:Z
+    iput-boolean v0, p0, Lokhttp3/internal/b/b;->cbf:Z
 
-    sget-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-boolean v1, p0, Lokhttp3/internal/b/b;->cbM:Z
+    iget-boolean v1, p0, Lokhttp3/internal/b/b;->cbg:Z
 
     invoke-virtual {v0, v2, p1, v1}, Lokhttp3/internal/a;->a(Lokhttp3/k;Ljavax/net/ssl/SSLSocket;Z)V
 
@@ -161,7 +162,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v2, p0, Lokhttp3/internal/b/b;->cbM:Z
+    iget-boolean v2, p0, Lokhttp3/internal/b/b;->cbg:Z
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -169,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;->bVu:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bUO:Ljava/util/List;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -194,4 +195,6 @@
     invoke-direct {v0, p1}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
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 1eb8aaf14f..0197dbf140 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/c$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/c$1.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/b/c$1;
 .super Lokhttp3/internal/i/a$e;
+.source "RealConnection.java"
 
 
 # annotations
@@ -14,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic cbX:Lokhttp3/internal/b/g;
+.field final synthetic cbr:Lokhttp3/internal/b/g;
 
-.field final synthetic cbY:Lokhttp3/internal/b/c;
+.field final synthetic cbs: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;->cbY:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/c$1;->cbs:Lokhttp3/internal/b/c;
 
-    iput-object p4, p0, Lokhttp3/internal/b/c$1;->cbX:Lokhttp3/internal/b/g;
+    iput-object p4, p0, Lokhttp3/internal/b/c$1;->cbr:Lokhttp3/internal/b/g;
 
     const/4 p1, 0x1
 
@@ -44,11 +45,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c$1;->cbX:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c$1;->cbr:Lokhttp3/internal/b/g;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c$1;->cbX:Lokhttp3/internal/b/g;
-
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HW()Lokhttp3/internal/c/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->HV()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 18f90413ec..b1144636f2 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/d.smali
@@ -1,9 +1,10 @@
 .class public final Lokhttp3/internal/b/d;
 .super Ljava/lang/Object;
+.source "RouteDatabase.java"
 
 
 # instance fields
-.field private final cbZ:Ljava/util/Set;
+.field private final cbt:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -24,7 +25,7 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/d;->cbZ:Ljava/util/Set;
+    iput-object v0, p0, Lokhttp3/internal/b/d;->cbt:Ljava/util/Set;
 
     return-void
 .end method
@@ -37,7 +38,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/d;->cbZ:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->cbt:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -61,7 +62,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/d;->cbZ:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->cbt:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
     :try_end_0
@@ -85,7 +86,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/d;->cbZ:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->cbt: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/e.smali b/com.discord/smali_classes2/okhttp3/internal/b/e.smali
index 705fc644e4..bd07b799c4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/e.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/b/e;
 .super Ljava/lang/RuntimeException;
+.source "RouteException.java"
 
 
 # instance fields
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 0ff27761c5..798e58cc67 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/f$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/f$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/b/f$a;
 .super Ljava/lang/Object;
+.source "RouteSelector.java"
 
 
 # annotations
@@ -14,7 +15,9 @@
 
 
 # instance fields
-.field final ccf:Ljava/util/List;
+.field cbA:I
+
+.field final cbz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,8 +27,6 @@
     .end annotation
 .end field
 
-.field ccg:I
-
 
 # direct methods
 .method constructor <init>(Ljava/util/List;)V
@@ -43,9 +44,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/f$a;->ccg:I
+    iput v0, p0, Lokhttp3/internal/b/f$a;->cbA:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/f$a;->ccf:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f$a;->cbz:Ljava/util/List;
 
     return-void
 .end method
@@ -55,9 +56,9 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/f$a;->ccg:I
+    iget v0, p0, Lokhttp3/internal/b/f$a;->cbA:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f$a;->ccf:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f$a;->cbz: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 c7c81be958..f771fe6b33 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/f.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/b/f;
 .super Ljava/lang/Object;
+.source "RouteSelector.java"
 
 
 # annotations
@@ -11,15 +12,15 @@
 
 
 # instance fields
-.field final bYj:Lokhttp3/internal/b/d;
+.field final bXD:Lokhttp3/internal/b/d;
 
-.field final caG:Lokhttp3/a;
+.field private final bZx:Lokhttp3/p;
 
-.field private final cad:Lokhttp3/p;
+.field final caa:Lokhttp3/a;
 
-.field private final cca:Lokhttp3/e;
+.field private final cbu:Lokhttp3/e;
 
-.field private ccb:Ljava/util/List;
+.field private cbv:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,9 +30,9 @@
     .end annotation
 .end field
 
-.field private ccc:I
+.field private cbw:I
 
-.field private ccd:Ljava/util/List;
+.field private cbx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final cce:Ljava/util/List;
+.field private final cby:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -62,31 +63,31 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->ccb:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->cbv:Ljava/util/List;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->ccd:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->cbx: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;->cce:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->cby:Ljava/util/List;
 
-    iput-object p1, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/internal/b/f;->bYj:Lokhttp3/internal/b/d;
+    iput-object p2, p0, Lokhttp3/internal/b/f;->bXD:Lokhttp3/internal/b/d;
 
-    iput-object p3, p0, Lokhttp3/internal/b/f;->cca:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/f;->cbu:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/f;->cad:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/f;->bZx:Lokhttp3/p;
 
-    iget-object p2, p1, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/a;->bVv:Ljava/net/Proxy;
+    iget-object p1, p1, Lokhttp3/a;->bUP:Ljava/net/Proxy;
 
     const/4 p3, 0x0
 
@@ -99,11 +100,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
     iget-object p1, p1, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
-    invoke-virtual {p2}, Lokhttp3/s;->Hk()Ljava/net/URI;
+    invoke-virtual {p2}, Lokhttp3/s;->Hj()Ljava/net/URI;
 
     move-result-object p2
 
@@ -139,19 +140,19 @@
     move-result-object p1
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/internal/b/f;->ccb:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->cbv:Ljava/util/List;
 
-    iput p3, p0, Lokhttp3/internal/b/f;->ccc:I
+    iput p3, p0, Lokhttp3/internal/b/f;->cbw:I
 
     return-void
 .end method
 
-.method private HV()Z
+.method private HU()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/f;->ccc:I
+    iget v0, p0, Lokhttp3/internal/b/f;->cbw:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->ccb:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->cbv:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -181,7 +182,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->ccd:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->cbx:Ljava/util/List;
 
     invoke-virtual {p1}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -261,15 +262,15 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v1, v0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     iget v0, v0, Lokhttp3/s;->port:I
 
@@ -288,7 +289,7 @@
 
     if-ne p1, v2, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/b/f;->ccd:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->cbx:Ljava/util/List;
 
     invoke-static {v1, v0}, Ljava/net/InetSocketAddress;->createUnresolved(Ljava/lang/String;I)Ljava/net/InetSocketAddress;
 
@@ -299,9 +300,9 @@
     return-void
 
     :cond_4
-    iget-object p1, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iget-object p1, p1, Lokhttp3/a;->bVq:Lokhttp3/o;
+    iget-object p1, p1, Lokhttp3/a;->bUK:Lokhttp3/o;
 
     invoke-interface {p1, v1}, Lokhttp3/o;->eh(Ljava/lang/String;)Ljava/util/List;
 
@@ -328,7 +329,7 @@
 
     check-cast v3, Ljava/net/InetAddress;
 
-    iget-object v4, p0, Lokhttp3/internal/b/f;->ccd:Ljava/util/List;
+    iget-object v4, p0, Lokhttp3/internal/b/f;->cbx:Ljava/util/List;
 
     new-instance v5, Ljava/net/InetSocketAddress;
 
@@ -350,9 +351,9 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bVq:Lokhttp3/o;
+    iget-object v2, v2, Lokhttp3/a;->bUK:Lokhttp3/o;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -398,11 +399,13 @@
     invoke-direct {p1, v0}, Ljava/net/SocketException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public final HU()Lokhttp3/internal/b/f$a;
+.method public final HT()Lokhttp3/internal/b/f$a;
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -421,25 +424,25 @@
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     :cond_0
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->HV()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->HU()Z
 
     move-result v1
 
     if-eqz v1, :cond_4
 
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->HV()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->HU()Z
 
     move-result v1
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->ccb:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->cbv:Ljava/util/List;
 
-    iget v2, p0, Lokhttp3/internal/b/f;->ccc:I
+    iget v2, p0, Lokhttp3/internal/b/f;->cbw:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lokhttp3/internal/b/f;->ccc:I
+    iput v3, p0, Lokhttp3/internal/b/f;->cbw:I
 
     invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -451,7 +454,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lokhttp3/internal/b/f;->ccd:Ljava/util/List;
+    iget-object v3, p0, Lokhttp3/internal/b/f;->cbx:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -462,9 +465,9 @@
 
     new-instance v4, Lokhttp3/y;
 
-    iget-object v5, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iget-object v6, p0, Lokhttp3/internal/b/f;->ccd:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/internal/b/f;->cbx:Ljava/util/List;
 
     invoke-interface {v6, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -474,7 +477,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;->bYj:Lokhttp3/internal/b/d;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bXD:Lokhttp3/internal/b/d;
 
     invoke-virtual {v5, v4}, Lokhttp3/internal/b/d;->c(Lokhttp3/y;)Z
 
@@ -482,7 +485,7 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v5, p0, Lokhttp3/internal/b/f;->cce:Ljava/util/List;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->cby:Ljava/util/List;
 
     invoke-interface {v5, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -514,11 +517,11 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -526,7 +529,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lokhttp3/internal/b/f;->ccb:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->cbv:Ljava/util/List;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -546,11 +549,11 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->cce:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->cby:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->cce:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->cby:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
@@ -567,18 +570,20 @@
     invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final hasNext()Z
     .locals 1
 
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->HV()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->HU()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->cce:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->cby: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 af68e39ed8..79df82753e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/g$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/g$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/b/g$a;
 .super Ljava/lang/ref/WeakReference;
+.source "StreamAllocation.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
 
 
 # instance fields
-.field public final cci:Ljava/lang/Object;
+.field public final cbC:Ljava/lang/Object;
 
 
 # direct methods
@@ -31,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;->cci:Ljava/lang/Object;
+    iput-object p2, p0, Lokhttp3/internal/b/g$a;->cbC: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 8e888e4a57..f7fc543fd2 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/g.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/b/g;
 .super Ljava/lang/Object;
+.source "StreamAllocation.java"
 
 
 # annotations
@@ -15,31 +16,31 @@
 
 
 # instance fields
-.field public final bZM:Lokhttp3/j;
+.field public final bZg:Lokhttp3/j;
 
-.field public final caG:Lokhttp3/a;
+.field public final bZx:Lokhttp3/p;
 
-.field public final cad:Lokhttp3/p;
+.field public final caa:Lokhttp3/a;
 
-.field public cbN:Lokhttp3/y;
+.field private cbB:Lokhttp3/internal/b/f$a;
 
-.field public final cca:Lokhttp3/e;
+.field private final cbC:Ljava/lang/Object;
 
-.field private cch:Lokhttp3/internal/b/f$a;
+.field private final cbD:Lokhttp3/internal/b/f;
 
-.field private final cci:Ljava/lang/Object;
+.field private cbE:I
 
-.field private final ccj:Lokhttp3/internal/b/f;
+.field public cbF:Lokhttp3/internal/b/c;
 
-.field private cck:I
+.field private cbG:Z
 
-.field public ccl:Lokhttp3/internal/b/c;
+.field private cbH:Z
 
-.field private ccm:Z
+.field public cbI:Lokhttp3/internal/c/c;
 
-.field private ccn:Z
+.field public cbh:Lokhttp3/y;
 
-.field public cco:Lokhttp3/internal/c/c;
+.field public final cbu:Lokhttp3/e;
 
 .field private released:Z
 
@@ -56,35 +57,35 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/g;->caG:Lokhttp3/a;
+    iput-object p2, p0, Lokhttp3/internal/b/g;->caa:Lokhttp3/a;
 
-    iput-object p3, p0, Lokhttp3/internal/b/g;->cca:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/g;->cbu:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/g;->cad:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/g;->bZx:Lokhttp3/p;
 
     new-instance p1, Lokhttp3/internal/b/f;
 
-    invoke-direct {p0}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/d;
+    invoke-direct {p0}, Lokhttp3/internal/b/g;->HW()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;->ccj:Lokhttp3/internal/b/f;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->cbD:Lokhttp3/internal/b/f;
 
-    iput-object p5, p0, Lokhttp3/internal/b/g;->cci:Ljava/lang/Object;
+    iput-object p5, p0, Lokhttp3/internal/b/g;->cbC:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private HX()Lokhttp3/internal/b/d;
+.method private HW()Lokhttp3/internal/b/d;
     .locals 2
 
-    sget-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/a;->a(Lokhttp3/j;)Lokhttp3/internal/b/d;
 
@@ -103,7 +104,7 @@
 
     move-object/from16 v1, p0
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v2
 
@@ -112,15 +113,15 @@
 
     if-nez v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     if-nez v0, :cond_10
 
-    iget-boolean v0, v1, Lokhttp3/internal/b/g;->ccn:Z
+    iget-boolean v0, v1, Lokhttp3/internal/b/g;->cbH:Z
 
     if-nez v0, :cond_f
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     const/4 v3, 0x0
 
@@ -130,7 +131,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, v0, Lokhttp3/internal/b/c;->cbS:Z
+    iget-boolean v0, v0, Lokhttp3/internal/b/c;->cbm:Z
 
     if-eqz v0, :cond_0
 
@@ -144,11 +145,11 @@
     move-object v0, v3
 
     :goto_0
-    iget-object v6, v1, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     goto :goto_1
 
@@ -158,38 +159,39 @@
     :goto_1
     if-nez v6, :cond_3
 
-    sget-object v7, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v7, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-object v8, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v8, v1, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
-    iget-object v9, v1, Lokhttp3/internal/b/g;->caG:Lokhttp3/a;
+    iget-object v9, v1, Lokhttp3/internal/b/g;->caa: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;->ccl:Lokhttp3/internal/b/c;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     if-eqz v7, :cond_2
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     move-object v7, v3
 
     const/4 v8, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
-    iget-object v7, v1, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
+
+    const/4 v8, 0x0
 
     goto :goto_2
 
     :cond_3
     move-object v7, v3
 
-    :goto_2
     const/4 v8, 0x0
 
-    :goto_3
+    :goto_2
     monitor-exit v2
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
@@ -203,12 +205,10 @@
     :cond_4
     if-nez v7, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->cch:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->cbB:Lokhttp3/internal/b/f$a;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->cch:Lokhttp3/internal/b/f$a;
-
     invoke-virtual {v0}, Lokhttp3/internal/b/f$a;->hasNext()Z
 
     move-result v0
@@ -216,38 +216,38 @@
     if-nez v0, :cond_6
 
     :cond_5
-    iget-object v0, v1, Lokhttp3/internal/b/g;->ccj:Lokhttp3/internal/b/f;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->cbD:Lokhttp3/internal/b/f;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/f;->HU()Lokhttp3/internal/b/f$a;
+    invoke-virtual {v0}, Lokhttp3/internal/b/f;->HT()Lokhttp3/internal/b/f$a;
 
     move-result-object v0
 
-    iput-object v0, v1, Lokhttp3/internal/b/g;->cch:Lokhttp3/internal/b/f$a;
+    iput-object v0, v1, Lokhttp3/internal/b/g;->cbB:Lokhttp3/internal/b/f$a;
 
     const/4 v0, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const/4 v0, 0x0
 
-    :goto_4
-    iget-object v9, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    :goto_3
+    iget-object v9, v1, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v9
 
     :try_start_1
-    iget-boolean v2, v1, Lokhttp3/internal/b/g;->ccn:Z
+    iget-boolean v2, v1, Lokhttp3/internal/b/g;->cbH:Z
 
     if-nez v2, :cond_e
 
     if-eqz v0, :cond_8
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->cch:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->cbB:Lokhttp3/internal/b/f$a;
 
     new-instance v2, Ljava/util/ArrayList;
 
-    iget-object v0, v0, Lokhttp3/internal/b/f$a;->ccf:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/internal/b/f$a;->cbz:Ljava/util/List;
 
     invoke-direct {v2, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -257,7 +257,7 @@
 
     const/4 v10, 0x0
 
-    :goto_5
+    :goto_4
     if-ge v10, v0, :cond_8
 
     invoke-interface {v2, v10}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -266,38 +266,38 @@
 
     check-cast v11, Lokhttp3/y;
 
-    sget-object v12, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v12, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-object v13, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v13, v1, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
-    iget-object v14, v1, Lokhttp3/internal/b/g;->caG:Lokhttp3/a;
+    iget-object v14, v1, Lokhttp3/internal/b/g;->caa: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;->ccl:Lokhttp3/internal/b/c;
+    iget-object v12, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     if-eqz v12, :cond_7
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iput-object v11, v1, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    iput-object v11, v1, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
 
     const/4 v8, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_7
     add-int/lit8 v10, v10, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
-    :goto_6
+    :goto_5
     if-nez v8, :cond_b
 
     if-nez v7, :cond_a
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->cch:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->cbB:Lokhttp3/internal/b/f$a;
 
     invoke-virtual {v0}, Lokhttp3/internal/b/f$a;->hasNext()Z
 
@@ -305,13 +305,13 @@
 
     if-eqz v2, :cond_9
 
-    iget-object v2, v0, Lokhttp3/internal/b/f$a;->ccf:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/b/f$a;->cbz:Ljava/util/List;
 
-    iget v6, v0, Lokhttp3/internal/b/f$a;->ccg:I
+    iget v6, v0, Lokhttp3/internal/b/f$a;->cbA:I
 
     add-int/lit8 v7, v6, 0x1
 
-    iput v7, v0, Lokhttp3/internal/b/f$a;->ccg:I
+    iput v7, v0, Lokhttp3/internal/b/f$a;->cbA:I
 
     invoke-interface {v2, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -321,7 +321,7 @@
 
     check-cast v7, Lokhttp3/y;
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_9
     new-instance v0, Ljava/util/NoSuchElementException;
@@ -331,14 +331,14 @@
     throw v0
 
     :cond_a
-    :goto_7
-    iput-object v7, v1, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    :goto_6
+    iput-object v7, v1, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
 
-    iput v5, v1, Lokhttp3/internal/b/g;->cck:I
+    iput v5, v1, Lokhttp3/internal/b/g;->cbE:I
 
     new-instance v6, Lokhttp3/internal/b/c;
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     invoke-direct {v6, v0, v7}, Lokhttp3/internal/b/c;-><init>(Lokhttp3/j;Lokhttp3/y;)V
 
@@ -354,9 +354,9 @@
     return-object v6
 
     :cond_c
-    iget-object v0, v1, Lokhttp3/internal/b/g;->cca:Lokhttp3/e;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->cbu:Lokhttp3/e;
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->cad:Lokhttp3/p;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->bZx:Lokhttp3/p;
 
     move-object v10, v6
 
@@ -376,44 +376,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;->HX()Lokhttp3/internal/b/d;
+    invoke-direct/range {p0 .. p0}, Lokhttp3/internal/b/g;->HW()Lokhttp3/internal/b/d;
 
     move-result-object v0
 
-    iget-object v2, v6, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v2, v6, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
     invoke-virtual {v0, v2}, Lokhttp3/internal/b/d;->b(Lokhttp3/y;)V
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_2
-    iput-boolean v4, v1, Lokhttp3/internal/b/g;->ccm:Z
+    iput-boolean v4, v1, Lokhttp3/internal/b/g;->cbG:Z
 
-    sget-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->bZg: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;->HT()Z
+    invoke-virtual {v6}, Lokhttp3/internal/b/c;->HS()Z
 
     move-result v0
 
     if-eqz v0, :cond_d
 
-    sget-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-object v3, v1, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v3, v1, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->caG:Lokhttp3/a;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->caa: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;->ccl:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     :cond_d
     monitor-exit v2
@@ -489,6 +489,8 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_2
 
     throw v0
+
+    return-void
 .end method
 
 .method private a(IIIIZZ)Lokhttp3/internal/b/c;
@@ -504,12 +506,12 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v1
 
     :try_start_0
-    iget v2, v0, Lokhttp3/internal/b/c;->cbT:I
+    iget v2, v0, Lokhttp3/internal/b/c;->cbn:I
 
     if-nez v2, :cond_0
 
@@ -522,13 +524,13 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {v0, p6}, Lokhttp3/internal/b/c;->ag(Z)Z
+    invoke-virtual {v0, p6}, Lokhttp3/internal/b/c;->af(Z)Z
 
     move-result v1
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/internal/b/g;->HZ()V
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->HY()V
 
     goto :goto_0
 
@@ -544,12 +546,14 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method private a(Lokhttp3/internal/b/c;)V
     .locals 3
 
-    iget-object v0, p1, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -560,7 +564,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p1, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -574,7 +578,7 @@
 
     if-ne v2, p0, :cond_0
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     invoke-interface {p1, v1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -591,19 +595,21 @@
     invoke-direct {p1}, Ljava/lang/IllegalStateException;-><init>()V
 
     throw p1
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public final HW()Lokhttp3/internal/c/c;
+.method public final HV()Lokhttp3/internal/c/c;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     monitor-exit v0
 
@@ -619,13 +625,13 @@
     throw v1
 .end method
 
-.method public final declared-synchronized HY()Lokhttp3/internal/b/c;
+.method public final declared-synchronized HX()Lokhttp3/internal/b/c;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -641,10 +647,10 @@
     throw v0
 .end method
 
-.method public final HZ()V
+.method public final HY()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v0
 
@@ -676,19 +682,17 @@
     throw v1
 .end method
 
-.method public final Ia()Z
+.method public final HZ()Z
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->cch:Lokhttp3/internal/b/f$a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->cbB:Lokhttp3/internal/b/f$a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->cch:Lokhttp3/internal/b/f$a;
-
     invoke-virtual {v0}, Lokhttp3/internal/b/f$a;->hasNext()Z
 
     move-result v0
@@ -696,7 +700,7 @@
     if-nez v0, :cond_2
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->ccj:Lokhttp3/internal/b/f;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->cbD:Lokhttp3/internal/b/f;
 
     invoke-virtual {v0}, Lokhttp3/internal/b/f;->hasNext()Z
 
@@ -725,7 +729,7 @@
 
     if-eqz p3, :cond_0
 
-    iput-object v0, p0, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     :cond_0
     const/4 p3, 0x1
@@ -735,18 +739,16 @@
     iput-boolean p3, p0, Lokhttp3/internal/b/g;->released:Z
 
     :cond_1
-    iget-object p2, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     if-eqz p2, :cond_5
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
-
-    iput-boolean p3, p1, Lokhttp3/internal/b/c;->cbS:Z
+    iput-boolean p3, p2, Lokhttp3/internal/b/c;->cbm:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     if-nez p1, :cond_5
 
@@ -754,20 +756,20 @@
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget-boolean p1, p1, Lokhttp3/internal/b/c;->cbS:Z
+    iget-boolean p1, p1, Lokhttp3/internal/b/c;->cbm:Z
 
     if-eqz p1, :cond_5
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->cbF: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;->ccl:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -775,19 +777,19 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide p2
 
-    iput-wide p2, p1, Lokhttp3/internal/b/c;->cbW:J
+    iput-wide p2, p1, Lokhttp3/internal/b/c;->cbq:J
 
-    sget-object p1, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
-    iget-object p3, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p3, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     invoke-virtual {p1, p2, p3}, Lokhttp3/internal/a;->a(Lokhttp3/j;Lokhttp3/internal/b/c;)Z
 
@@ -795,9 +797,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     goto :goto_0
 
@@ -805,7 +807,7 @@
     move-object p1, v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     goto :goto_1
 
@@ -819,21 +821,21 @@
 .method public final a(Lokhttp3/t;Lokhttp3/Interceptor$Chain;Z)Lokhttp3/internal/c/c;
     .locals 7
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hv()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hu()I
 
     move-result v1
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hw()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hv()I
 
     move-result v2
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hx()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hw()I
 
     move-result v3
 
-    iget v4, p1, Lokhttp3/t;->bZT:I
+    iget v4, p1, Lokhttp3/t;->bZn:I
 
-    iget-boolean v5, p1, Lokhttp3/t;->bZP:Z
+    iget-boolean v5, p1, Lokhttp3/t;->bZj:Z
 
     move-object v0, p0
 
@@ -844,34 +846,34 @@
 
     move-result-object p3
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->cbk:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lokhttp3/internal/e/f;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->cbQ:Lokhttp3/internal/e/g;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->cbk: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;->cbP:Ljava/net/Socket;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hw()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hv()I
 
     move-result v1
 
     invoke-virtual {v0, v1}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/r;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hw()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hv()I
 
     move-result v1
 
@@ -881,13 +883,13 @@
 
     invoke-virtual {v0, v1, v2, v3}, Lokio/r;->d(JLjava/util/concurrent/TimeUnit;)Lokio/r;
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/r;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hx()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Hw()I
 
     move-result p2
 
@@ -899,21 +901,21 @@
 
     new-instance v0, Lokhttp3/internal/d/a;
 
-    iget-object p2, p3, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object p2, p3, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->cbl: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;->bZM:Lokhttp3/j;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bZg: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;->cco:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     monitor-exit p1
 
@@ -944,7 +946,7 @@
 .method public final a(Ljava/io/IOException;)V
     .locals 9
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v0
 
@@ -963,41 +965,46 @@
 
     iget-object p1, p1, Lokhttp3/internal/e/n;->errorCode:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccJ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccd:Lokhttp3/internal/e/b;
 
     if-ne p1, v1, :cond_0
 
-    iget p1, p0, Lokhttp3/internal/b/g;->cck:I
+    iget p1, p0, Lokhttp3/internal/b/g;->cbE:I
 
     add-int/2addr p1, v4
 
-    iput p1, p0, Lokhttp3/internal/b/g;->cck:I
+    iput p1, p0, Lokhttp3/internal/b/g;->cbE:I
 
-    iget p1, p0, Lokhttp3/internal/b/g;->cck:I
+    iget p1, p0, Lokhttp3/internal/b/g;->cbE:I
 
-    if-le p1, v4, :cond_6
+    if-le p1, v4, :cond_1
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cce:Lokhttp3/internal/e/b;
 
-    if-eq p1, v1, :cond_6
+    if-eq p1, v1, :cond_1
+
+    iput-object v2, p0, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
+
+    const/4 p1, 0x1
+
+    goto :goto_1
 
     :cond_1
-    :goto_0
-    iput-object v2, p0, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    const/4 p1, 0x0
 
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_7
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/c;->HT()Z
+    invoke-virtual {v1}, Lokhttp3/internal/b/c;->HS()Z
 
     move-result v1
 
@@ -1005,26 +1012,26 @@
 
     instance-of v1, p1, Lokhttp3/internal/e/a;
 
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_7
 
     :cond_3
-    iget-object v1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget v1, v1, Lokhttp3/internal/b/c;->cbT:I
+    iget v1, v1, Lokhttp3/internal/b/c;->cbn:I
 
-    if-nez v1, :cond_5
+    if-nez v1, :cond_6
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_5
 
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->ccj:Lokhttp3/internal/b/f;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbD:Lokhttp3/internal/b/f;
 
-    iget-object v5, p0, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    iget-object v5, p0, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
 
-    iget-object v6, v5, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v6, v5, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v6}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1034,25 +1041,25 @@
 
     if-eq v6, v7, :cond_4
 
-    iget-object v6, v1, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
     iget-object v6, v6, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v1, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
     iget-object v6, v6, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
-    iget-object v7, v1, Lokhttp3/internal/b/f;->caG:Lokhttp3/a;
+    iget-object v7, v1, Lokhttp3/internal/b/f;->caa:Lokhttp3/a;
 
-    iget-object v7, v7, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v7, v7, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
-    invoke-virtual {v7}, Lokhttp3/s;->Hk()Ljava/net/URI;
+    invoke-virtual {v7}, Lokhttp3/s;->Hj()Ljava/net/URI;
 
     move-result-object v7
 
-    iget-object v8, v5, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v8, v5, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v8}, Ljava/net/Proxy;->address()Ljava/net/SocketAddress;
 
@@ -1061,22 +1068,27 @@
     invoke-virtual {v6, v7, v8, p1}, Ljava/net/ProxySelector;->connectFailed(Ljava/net/URI;Ljava/net/SocketAddress;Ljava/io/IOException;)V
 
     :cond_4
-    iget-object p1, v1, Lokhttp3/internal/b/f;->bYj:Lokhttp3/internal/b/d;
+    iget-object p1, v1, Lokhttp3/internal/b/f;->bXD:Lokhttp3/internal/b/d;
 
     invoke-virtual {p1, v5}, Lokhttp3/internal/b/d;->a(Lokhttp3/y;)V
 
-    goto :goto_0
-
     :cond_5
-    :goto_1
+    :goto_0
+    iput-object v2, p0, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
+
     const/4 p1, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_7
     const/4 p1, 0x0
 
-    :goto_2
+    :goto_1
     invoke-virtual {p0, p1, v3, v4}, Lokhttp3/internal/b/g;->a(ZZZ)Ljava/net/Socket;
 
     move-result-object p1
@@ -1103,19 +1115,19 @@
 .method public final a(Lokhttp3/internal/b/c;Z)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iput-boolean p2, p0, Lokhttp3/internal/b/g;->ccm:Z
+    iput-boolean p2, p0, Lokhttp3/internal/b/g;->cbG:Z
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     new-instance p2, Lokhttp3/internal/b/g$a;
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->cci:Ljava/lang/Object;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->cbC:Ljava/lang/Object;
 
     invoke-direct {p2, p0, v0}, Lokhttp3/internal/b/g$a;-><init>(Lokhttp3/internal/b/g;Ljava/lang/Object;)V
 
@@ -1134,14 +1146,14 @@
 .method public final a(ZLokhttp3/internal/c/c;)V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v0
 
     if-eqz p2, :cond_1
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     if-ne p2, v1, :cond_1
 
@@ -1149,13 +1161,13 @@
 
     if-nez p1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget v2, v1, Lokhttp3/internal/b/c;->cbT:I
+    iget v2, v1, Lokhttp3/internal/b/c;->cbn:I
 
     add-int/2addr v2, p2
 
-    iput v2, v1, Lokhttp3/internal/b/c;->cbT:I
+    iput v2, v1, Lokhttp3/internal/b/c;->cbn:I
 
     :cond_0
     const/4 v1, 0x0
@@ -1172,11 +1184,6 @@
 
     return-void
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
     :cond_1
     :try_start_1
     new-instance p1, Ljava/lang/IllegalStateException;
@@ -1187,7 +1194,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iget-object v2, p0, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1205,7 +1212,9 @@
 
     throw p1
 
-    :goto_0
+    :catchall_0
+    move-exception p1
+
     monitor-exit v0
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -1216,18 +1225,18 @@
 .method public final cancel()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v0
 
     const/4 v1, 0x1
 
     :try_start_0
-    iput-boolean v1, p0, Lokhttp3/internal/b/g;->ccn:Z
+    iput-boolean v1, p0, Lokhttp3/internal/b/g;->cbH:Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
     monitor-exit v0
     :try_end_0
@@ -1242,7 +1251,7 @@
     :cond_0
     if-eqz v2, :cond_1
 
-    iget-object v0, v2, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, v2, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     invoke-static {v0}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
@@ -1263,7 +1272,7 @@
 .method public final release()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     monitor-enter v0
 
@@ -1298,7 +1307,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
@@ -1311,7 +1320,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->caG:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->caa:Lokhttp3/a;
 
     invoke-virtual {v0}, Lokhttp3/a;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c$1.smali b/com.discord/smali_classes2/okhttp3/internal/c$1.smali
index 604baa8271..763317903b 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/c$1;
 .super Ljava/lang/Object;
+.source "Util.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali_classes2/okhttp3/internal/c$2.smali b/com.discord/smali_classes2/okhttp3/internal/c$2.smali
index 3780f4d81d..a87e185368 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c$2.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c$2.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/c$2;
 .super Ljava/lang/Object;
+.source "Util.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
@@ -17,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic cbd:Z
+.field final synthetic cax:Z
 
 .field final synthetic val$name:Ljava/lang/String;
 
@@ -28,7 +29,7 @@
 
     iput-object p1, p0, Lokhttp3/internal/c$2;->val$name:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lokhttp3/internal/c$2;->cbd:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c$2;->cax:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,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;->cbd:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c$2;->cax: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 a31309b9bf..cdb5b8181f 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/c/a;
 .super Ljava/lang/Object;
+.source "BridgeInterceptor.java"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -30,15 +31,15 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object v1
 
-    iget-object v2, v0, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v2, v0, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     const-wide/16 v3, -0x1
 
@@ -77,10 +78,9 @@
 
     const-string v2, "Transfer-Encoding"
 
-    :goto_0
     invoke-virtual {v1, v2}, Lokhttp3/w$a;->eu(Ljava/lang/String;)Lokhttp3/w$a;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string v2, "Transfer-Encoding"
@@ -91,10 +91,10 @@
 
     const-string v2, "Content-Length"
 
-    goto :goto_0
+    invoke-virtual {v1, v2}, Lokhttp3/w$a;->eu(Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_2
-    :goto_1
+    :goto_0
     const-string v2, "Host"
 
     invoke-virtual {v0, v2}, Lokhttp3/w;->dU(Ljava/lang/String;)Ljava/lang/String;
@@ -107,7 +107,7 @@
 
     const-string v2, "Host"
 
-    iget-object v6, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v6, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-static {v6, v5}, Lokhttp3/internal/c;->a(Lokhttp3/s;Z)Ljava/lang/String;
 
@@ -155,15 +155,15 @@
 
     const/4 v2, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     const/4 v2, 0x0
 
-    :goto_2
+    :goto_1
     iget-object v6, p0, Lokhttp3/internal/c/a;->cookieJar:Lokhttp3/m;
 
-    iget-object v7, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v7, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-interface {v6, v7}, Lokhttp3/m;->a(Lokhttp3/s;)Ljava/util/List;
 
@@ -185,7 +185,7 @@
 
     move-result v9
 
-    :goto_3
+    :goto_2
     if-ge v5, v9, :cond_7
 
     if-lez v5, :cond_6
@@ -215,7 +215,7 @@
 
     add-int/lit8 v5, v5, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
     invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -240,7 +240,7 @@
     invoke-virtual {v1, v5, v6}, Lokhttp3/w$a;->an(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_9
-    invoke-virtual {v1}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v1
 
@@ -250,17 +250,17 @@
 
     iget-object v1, p0, Lokhttp3/internal/c/a;->cookieJar:Lokhttp3/m;
 
-    iget-object v5, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v5, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    iget-object v6, p1, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v6, p1, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
     invoke-static {v1, v5, v6}, Lokhttp3/internal/c/e;->a(Lokhttp3/m;Lokhttp3/s;Lokhttp3/Headers;)V
 
-    invoke-virtual {p1}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v1
 
-    iput-object v0, v1, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iput-object v0, v1, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
     if-eqz v2, :cond_a
 
@@ -286,17 +286,17 @@
 
     new-instance v0, Lokio/h;
 
-    iget-object v2, p1, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v2, p1, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
-    invoke-virtual {v2}, Lokhttp3/x;->HK()Lokio/d;
+    invoke-virtual {v2}, Lokhttp3/x;->HJ()Lokio/d;
 
     move-result-object v2
 
     invoke-direct {v0, v2}, Lokio/h;-><init>(Lokio/q;)V
 
-    iget-object v2, p1, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object v2, p1, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
-    invoke-virtual {v2}, Lokhttp3/Headers;->Hh()Lokhttp3/Headers$a;
+    invoke-virtual {v2}, Lokhttp3/Headers;->Hg()Lokhttp3/Headers$a;
 
     move-result-object v2
 
@@ -312,7 +312,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/Headers$a;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v2}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object v2
 
@@ -332,10 +332,10 @@
 
     invoke-direct {v2, p1, v3, v4, v0}, Lokhttp3/internal/c/h;-><init>(Ljava/lang/String;JLokio/d;)V
 
-    iput-object v2, v1, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iput-object v2, v1, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
     :cond_a
-    invoke-virtual {v1}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v1}, Lokhttp3/Response$a;->HI()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 b38386c643..cf5b58dc82 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/b$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/c/b$a;
 .super Lokio/e;
+.source "CallServerInterceptor.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field ccp:J
+.field cbJ:J
 
 
 # direct methods
@@ -38,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;->ccp:J
+    iget-wide v0, p0, Lokhttp3/internal/c/b$a;->cbJ:J
 
     add-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->ccp:J
+    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->cbJ: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 736099584b..714a73cda4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/b.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/c/b;
 .super Ljava/lang/Object;
+.source "CallServerInterceptor.java"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field private final caf:Z
+.field private final bZz:Z
 
 
 # direct methods
@@ -23,7 +24,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/internal/c/b;->caf:Z
+    iput-boolean p1, p0, Lokhttp3/internal/c/b;->bZz:Z
 
     return-void
 .end method
@@ -40,15 +41,15 @@
 
     check-cast p1, Lokhttp3/internal/c/g;
 
-    iget-object v0, p1, Lokhttp3/internal/c/g;->ccu:Lokhttp3/internal/c/c;
+    iget-object v0, p1, Lokhttp3/internal/c/g;->cbO:Lokhttp3/internal/c/c;
 
-    iget-object v1, p1, Lokhttp3/internal/c/g;->cct:Lokhttp3/internal/b/g;
+    iget-object v1, p1, Lokhttp3/internal/c/g;->cbN:Lokhttp3/internal/b/g;
 
-    iget-object v2, p1, Lokhttp3/internal/c/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v2, p1, Lokhttp3/internal/c/g;->cbF:Lokhttp3/internal/b/c;
 
     check-cast v2, Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/c/g;->cas:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/internal/c/g;->bZM:Lokhttp3/w;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -66,7 +67,7 @@
 
     if-eqz v5, :cond_2
 
-    iget-object v5, p1, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     if-eqz v5, :cond_2
 
@@ -84,18 +85,18 @@
 
     if-eqz v5, :cond_0
 
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Ib()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Ia()V
 
     const/4 v5, 0x1
 
-    invoke-interface {v0, v5}, Lokhttp3/internal/c/c;->ah(Z)Lokhttp3/Response$a;
+    invoke-interface {v0, v5}, Lokhttp3/internal/c/c;->ag(Z)Lokhttp3/Response$a;
 
     move-result-object v6
 
     :cond_0
     if-nez v6, :cond_1
 
-    iget-object v2, p1, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v2, p1, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     invoke-virtual {v2}, Lokhttp3/RequestBody;->contentLength()J
 
@@ -113,7 +114,7 @@
 
     move-result-object v2
 
-    iget-object v5, p1, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     invoke-virtual {v5, v2}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
@@ -122,46 +123,46 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v2}, Lokhttp3/internal/b/c;->HT()Z
+    invoke-virtual {v2}, Lokhttp3/internal/b/c;->HS()Z
 
     move-result v2
 
     if-nez v2, :cond_2
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HZ()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HY()V
 
     :cond_2
     :goto_0
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Ic()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Ib()V
 
     const/4 v2, 0x0
 
     if-nez v6, :cond_3
 
-    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->ah(Z)Lokhttp3/Response$a;
+    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->ag(Z)Lokhttp3/Response$a;
 
     move-result-object v6
 
     :cond_3
-    iput-object p1, v6, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iput-object p1, v6, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object v5
 
-    iget-object v5, v5, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iget-object v5, v5, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
-    iput-object v5, v6, Lokhttp3/Response$a;->cau:Lokhttp3/r;
+    iput-object v5, v6, Lokhttp3/Response$a;->bZO:Lokhttp3/r;
 
-    iput-wide v3, v6, Lokhttp3/Response$a;->caz:J
+    iput-wide v3, v6, Lokhttp3/Response$a;->bZT:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v7
 
-    iput-wide v7, v6, Lokhttp3/Response$a;->caA:J
+    iput-wide v7, v6, Lokhttp3/Response$a;->bZU:J
 
-    invoke-virtual {v6}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v6}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v5
 
@@ -171,36 +172,36 @@
 
     if-ne v6, v7, :cond_4
 
-    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->ah(Z)Lokhttp3/Response$a;
+    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->ag(Z)Lokhttp3/Response$a;
 
     move-result-object v2
 
-    iput-object p1, v2, Lokhttp3/Response$a;->cas:Lokhttp3/w;
+    iput-object p1, v2, Lokhttp3/Response$a;->bZM:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cau:Lokhttp3/r;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bZO:Lokhttp3/r;
 
-    iput-object p1, v2, Lokhttp3/Response$a;->cau:Lokhttp3/r;
+    iput-object p1, v2, Lokhttp3/Response$a;->bZO:Lokhttp3/r;
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->caz:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bZT:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v3
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->caA:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bZU:J
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v5
 
     iget v6, v5, Lokhttp3/Response;->code:I
 
     :cond_4
-    iget-boolean p1, p0, Lokhttp3/internal/c/b;->caf:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c/b;->bZz:Z
 
     if-eqz p1, :cond_5
 
@@ -208,16 +209,22 @@
 
     if-ne v6, p1, :cond_5
 
-    invoke-virtual {v5}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object p1
 
-    sget-object v0, Lokhttp3/internal/c;->caP:Lokhttp3/x;
+    sget-object v0, Lokhttp3/internal/c;->caj:Lokhttp3/x;
+
+    iput-object v0, p1, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
+
+    invoke-virtual {p1}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
+
+    move-result-object p1
 
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v5}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object p1
 
@@ -225,16 +232,16 @@
 
     move-result-object v0
 
-    :goto_1
-    iput-object v0, p1, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iput-object v0, p1, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object p1
 
+    :goto_1
     const-string v0, "close"
 
-    iget-object v2, p1, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v2, p1, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
     const-string v3, "Connection"
 
@@ -263,7 +270,7 @@
     if-eqz v0, :cond_7
 
     :cond_6
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HZ()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HY()V
 
     :cond_7
     const/16 v0, 0xcc
@@ -275,7 +282,7 @@
     if-ne v6, v0, :cond_9
 
     :cond_8
-    iget-object v0, p1, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-virtual {v0}, Lokhttp3/x;->contentLength()J
 
@@ -305,7 +312,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p1, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object p1, p1, Lokhttp3/Response;->bZP: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 49dc9306b4..5626dbe272 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/c.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/internal/c/c;
 .super Ljava/lang/Object;
+.source "HttpCodec.java"
 
 
 # virtual methods
-.method public abstract Ib()V
+.method public abstract Ia()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -11,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract Ic()V
+.method public abstract Ib()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -22,7 +23,7 @@
 .method public abstract a(Lokhttp3/w;J)Lokio/p;
 .end method
 
-.method public abstract ah(Z)Lokhttp3/Response$a;
+.method public abstract ag(Z)Lokhttp3/Response$a;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali b/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali
index b387413371..2f7585f2c3 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/c/d$1;
 .super Ljava/lang/ThreadLocal;
+.source "HttpDate.java"
 
 
 # annotations
@@ -47,7 +48,7 @@
 
     invoke-virtual {v0, v1}, Ljava/text/DateFormat;->setLenient(Z)V
 
-    sget-object v1, Lokhttp3/internal/c;->cba:Ljava/util/TimeZone;
+    sget-object v1, Lokhttp3/internal/c;->cau: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 c04c3aea5f..76dc4fc6a7 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/d.smali
@@ -1,9 +1,10 @@
 .class public final Lokhttp3/internal/c/d;
 .super Ljava/lang/Object;
+.source "HttpDate.java"
 
 
 # static fields
-.field private static final ccq:Ljava/lang/ThreadLocal;
+.field private static final cbK:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -13,9 +14,9 @@
     .end annotation
 .end field
 
-.field private static final ccr:[Ljava/lang/String;
+.field private static final cbL:[Ljava/lang/String;
 
-.field private static final ccs:[Ljava/text/DateFormat;
+.field private static final cbM:[Ljava/text/DateFormat;
 
 
 # direct methods
@@ -26,7 +27,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/c/d$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/c/d;->ccq:Ljava/lang/ThreadLocal;
+    sput-object v0, Lokhttp3/internal/c/d;->cbK:Ljava/lang/ThreadLocal;
 
     const/16 v0, 0xf
 
@@ -122,11 +123,11 @@
 
     aput-object v2, v1, v3
 
-    sput-object v1, Lokhttp3/internal/c/d;->ccr:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/c/d;->cbL:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/text/DateFormat;
 
-    sput-object v0, Lokhttp3/internal/c/d;->ccs:[Ljava/text/DateFormat;
+    sput-object v0, Lokhttp3/internal/c/d;->cbM:[Ljava/text/DateFormat;
 
     return-void
 .end method
@@ -134,7 +135,7 @@
 .method public static format(Ljava/util/Date;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/c/d;->ccq:Ljava/lang/ThreadLocal;
+    sget-object v0, Lokhttp3/internal/c/d;->cbK:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -169,7 +170,7 @@
 
     invoke-direct {v0, v2}, Ljava/text/ParsePosition;-><init>(I)V
 
-    sget-object v3, Lokhttp3/internal/c/d;->ccq:Ljava/lang/ThreadLocal;
+    sget-object v3, Lokhttp3/internal/c/d;->cbK:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v3}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -194,12 +195,12 @@
     return-object v3
 
     :cond_1
-    sget-object v3, Lokhttp3/internal/c/d;->ccr:[Ljava/lang/String;
+    sget-object v3, Lokhttp3/internal/c/d;->cbL:[Ljava/lang/String;
 
     monitor-enter v3
 
     :try_start_0
-    sget-object v4, Lokhttp3/internal/c/d;->ccr:[Ljava/lang/String;
+    sget-object v4, Lokhttp3/internal/c/d;->cbL:[Ljava/lang/String;
 
     array-length v4, v4
 
@@ -208,7 +209,7 @@
     :goto_0
     if-ge v5, v4, :cond_4
 
-    sget-object v6, Lokhttp3/internal/c/d;->ccs:[Ljava/text/DateFormat;
+    sget-object v6, Lokhttp3/internal/c/d;->cbM:[Ljava/text/DateFormat;
 
     aget-object v6, v6, v5
 
@@ -216,7 +217,7 @@
 
     new-instance v6, Ljava/text/SimpleDateFormat;
 
-    sget-object v7, Lokhttp3/internal/c/d;->ccr:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/c/d;->cbL:[Ljava/lang/String;
 
     aget-object v7, v7, v5
 
@@ -224,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;->cba:Ljava/util/TimeZone;
+    sget-object v7, Lokhttp3/internal/c;->cau:Ljava/util/TimeZone;
 
     invoke-virtual {v6, v7}, Ljava/text/DateFormat;->setTimeZone(Ljava/util/TimeZone;)V
 
-    sget-object v7, Lokhttp3/internal/c/d;->ccs:[Ljava/text/DateFormat;
+    sget-object v7, Lokhttp3/internal/c/d;->cbM:[Ljava/text/DateFormat;
 
     aput-object v6, v7, v5
 
@@ -267,4 +268,6 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/e.smali b/com.discord/smali_classes2/okhttp3/internal/c/e.smali
index e1905c71f1..72c1f92bf8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/e.smali
@@ -1,9 +1,10 @@
 .class public final Lokhttp3/internal/c/e;
 .super Ljava/lang/Object;
+.source "HttpHeaders.java"
 
 
 # static fields
-.field private static final bZm:Ljava/util/regex/Pattern;
+.field private static final bYG:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -16,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c/e;->bZm:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/c/e;->bYG:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -24,7 +25,7 @@
 .method public static a(Lokhttp3/m;Lokhttp3/s;Lokhttp3/Headers;)V
     .locals 1
 
-    sget-object v0, Lokhttp3/m;->bYG:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->bYa:Lokhttp3/m;
 
     if-ne p0, v0, :cond_0
 
@@ -82,7 +83,7 @@
 .method public static e(Lokhttp3/Response;)J
     .locals 2
 
-    iget-object p0, p0, Lokhttp3/Response;->bZC:Lokhttp3/Headers;
+    iget-object p0, p0, Lokhttp3/Response;->bYW:Lokhttp3/Headers;
 
     const-string v0, "Content-Length"
 
@@ -98,7 +99,7 @@
 .end method
 
 .method private static eD(Ljava/lang/String;)J
-    .locals 4
+    .locals 2
 
     const-wide/16 v0, -0x1
 
@@ -110,11 +111,11 @@
     :try_start_0
     invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
-    move-result-wide v2
+    move-result-wide v0
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-wide v2
+    return-wide v0
 
     :catch_0
     return-wide v0
@@ -123,7 +124,7 @@
 .method public static f(Lokhttp3/Response;)Z
     .locals 8
 
-    iget-object v0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
     iget-object v0, v0, Lokhttp3/w;->method:Ljava/lang/String;
 
@@ -235,13 +236,13 @@
     :try_start_0
     invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
-    move-result-wide v0
+    move-result-wide p0
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    const-wide/32 p0, 0x7fffffff
+    const-wide/32 v0, 0x7fffffff
 
-    cmp-long v2, v0, p0
+    cmp-long v2, p0, v0
 
     if-lez v2, :cond_0
 
@@ -250,9 +251,9 @@
     return p0
 
     :cond_0
-    const-wide/16 p0, 0x0
+    const-wide/16 v0, 0x0
 
-    cmp-long v2, v0, p0
+    cmp-long v2, p0, v0
 
     if-gez v2, :cond_1
 
@@ -261,7 +262,7 @@
     return p0
 
     :cond_1
-    long-to-int p0, v0
+    long-to-int p0, p0
 
     return p0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/f.smali b/com.discord/smali_classes2/okhttp3/internal/c/f.smali
index be13581476..37e33c27f9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/f.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/c/f;
 .super Ljava/lang/Object;
+.source "HttpMethod.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/g.smali b/com.discord/smali_classes2/okhttp3/internal/c/g.smali
index 976f0a41de..83fea2b8bb 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/g.smali
@@ -1,12 +1,15 @@
 .class public final Lokhttp3/internal/c/g;
 .super Ljava/lang/Object;
+.source "RealInterceptorChain.java"
 
 # interfaces
 .implements Lokhttp3/Interceptor$Chain;
 
 
 # instance fields
-.field private final bZH:Ljava/util/List;
+.field public final bZM:Lokhttp3/w;
+
+.field private final bZb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -16,25 +19,23 @@
     .end annotation
 .end field
 
-.field private final bZQ:I
+.field private final bZk:I
 
-.field private final bZR:I
+.field private final bZl:I
 
-.field private final bZS:I
+.field private final bZm:I
 
-.field final cad:Lokhttp3/p;
+.field final bZx:Lokhttp3/p;
 
-.field public final cas:Lokhttp3/w;
+.field final cbF:Lokhttp3/internal/b/c;
 
-.field final cca:Lokhttp3/e;
+.field public final cbN:Lokhttp3/internal/b/g;
 
-.field final ccl:Lokhttp3/internal/b/c;
+.field final cbO:Lokhttp3/internal/c/c;
 
-.field public final cct:Lokhttp3/internal/b/g;
+.field private cbP:I
 
-.field final ccu:Lokhttp3/internal/c/c;
-
-.field private ccv:I
+.field final cbu:Lokhttp3/e;
 
 .field private final index:I
 
@@ -61,53 +62,61 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/g;->bZH:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/c/g;->bZb:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/internal/c/g;->ccl:Lokhttp3/internal/b/c;
+    iput-object p4, p0, Lokhttp3/internal/c/g;->cbF:Lokhttp3/internal/b/c;
 
-    iput-object p2, p0, Lokhttp3/internal/c/g;->cct:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/c/g;->cbN:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/c/g;->ccu:Lokhttp3/internal/c/c;
+    iput-object p3, p0, Lokhttp3/internal/c/g;->cbO:Lokhttp3/internal/c/c;
 
     iput p5, p0, Lokhttp3/internal/c/g;->index:I
 
-    iput-object p6, p0, Lokhttp3/internal/c/g;->cas:Lokhttp3/w;
+    iput-object p6, p0, Lokhttp3/internal/c/g;->bZM:Lokhttp3/w;
 
-    iput-object p7, p0, Lokhttp3/internal/c/g;->cca:Lokhttp3/e;
+    iput-object p7, p0, Lokhttp3/internal/c/g;->cbu:Lokhttp3/e;
 
-    iput-object p8, p0, Lokhttp3/internal/c/g;->cad:Lokhttp3/p;
+    iput-object p8, p0, Lokhttp3/internal/c/g;->bZx:Lokhttp3/p;
 
-    iput p9, p0, Lokhttp3/internal/c/g;->bZQ:I
+    iput p9, p0, Lokhttp3/internal/c/g;->bZk:I
 
-    iput p10, p0, Lokhttp3/internal/c/g;->bZR:I
+    iput p10, p0, Lokhttp3/internal/c/g;->bZl:I
 
-    iput p11, p0, Lokhttp3/internal/c/g;->bZS:I
+    iput p11, p0, Lokhttp3/internal/c/g;->bZm:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GY()Lokhttp3/w;
+.method public final GX()Lokhttp3/w;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->cas:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->bZM:Lokhttp3/w;
 
     return-object v0
 .end method
 
-.method public final Hu()Lokhttp3/i;
+.method public final Ht()Lokhttp3/i;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->cbF:Lokhttp3/internal/b/c;
 
     return-object v0
 .end method
 
+.method public final Hu()I
+    .locals 1
+
+    iget v0, p0, Lokhttp3/internal/c/g;->bZk:I
+
+    return v0
+.end method
+
 .method public final Hv()I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->bZQ:I
+    iget v0, p0, Lokhttp3/internal/c/g;->bZl:I
 
     return v0
 .end method
@@ -115,15 +124,7 @@
 .method public final Hw()I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->bZR:I
-
-    return v0
-.end method
-
-.method public final Hx()I
-    .locals 1
-
-    iget v0, p0, Lokhttp3/internal/c/g;->bZS:I
+    iget v0, p0, Lokhttp3/internal/c/g;->bZm:I
 
     return v0
 .end method
@@ -140,7 +141,7 @@
 
     iget v1, v0, Lokhttp3/internal/c/g;->index:I
 
-    iget-object v2, v0, Lokhttp3/internal/c/g;->bZH:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->bZb:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -148,23 +149,23 @@
 
     if-ge v1, v2, :cond_8
 
-    iget v1, v0, Lokhttp3/internal/c/g;->ccv:I
+    iget v1, v0, Lokhttp3/internal/c/g;->cbP:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lokhttp3/internal/c/g;->ccv:I
+    iput v1, v0, Lokhttp3/internal/c/g;->cbP:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->ccu:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->cbO:Lokhttp3/internal/c/c;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->cbF:Lokhttp3/internal/b/c;
 
     move-object/from16 v9, p1
 
-    iget-object v3, v9, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v3, v9, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v1, v3}, Lokhttp3/internal/b/c;->c(Lokhttp3/s;)Z
 
@@ -183,7 +184,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, v0, Lokhttp3/internal/c/g;->bZH:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/internal/c/g;->bZb:Ljava/util/List;
 
     iget v5, v0, Lokhttp3/internal/c/g;->index:I
 
@@ -211,11 +212,11 @@
     move-object/from16 v9, p1
 
     :goto_0
-    iget-object v1, v0, Lokhttp3/internal/c/g;->ccu:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->cbO:Lokhttp3/internal/c/c;
 
     if-eqz v1, :cond_3
 
-    iget v1, v0, Lokhttp3/internal/c/g;->ccv:I
+    iget v1, v0, Lokhttp3/internal/c/g;->cbP:I
 
     if-gt v1, v2, :cond_2
 
@@ -230,7 +231,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, v0, Lokhttp3/internal/c/g;->bZH:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/internal/c/g;->bZb:Ljava/util/List;
 
     iget v5, v0, Lokhttp3/internal/c/g;->index:I
 
@@ -258,21 +259,21 @@
     :goto_1
     new-instance v1, Lokhttp3/internal/c/g;
 
-    iget-object v4, v0, Lokhttp3/internal/c/g;->bZH:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/internal/c/g;->bZb:Ljava/util/List;
 
     iget v3, v0, Lokhttp3/internal/c/g;->index:I
 
     add-int/lit8 v8, v3, 0x1
 
-    iget-object v10, v0, Lokhttp3/internal/c/g;->cca:Lokhttp3/e;
+    iget-object v10, v0, Lokhttp3/internal/c/g;->cbu:Lokhttp3/e;
 
-    iget-object v11, v0, Lokhttp3/internal/c/g;->cad:Lokhttp3/p;
+    iget-object v11, v0, Lokhttp3/internal/c/g;->bZx:Lokhttp3/p;
 
-    iget v12, v0, Lokhttp3/internal/c/g;->bZQ:I
+    iget v12, v0, Lokhttp3/internal/c/g;->bZk:I
 
-    iget v13, v0, Lokhttp3/internal/c/g;->bZR:I
+    iget v13, v0, Lokhttp3/internal/c/g;->bZl:I
 
-    iget v14, v0, Lokhttp3/internal/c/g;->bZS:I
+    iget v14, v0, Lokhttp3/internal/c/g;->bZm:I
 
     move-object v3, v1
 
@@ -286,7 +287,7 @@
 
     invoke-direct/range {v3 .. v14}, 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 v3, v0, Lokhttp3/internal/c/g;->bZH:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/internal/c/g;->bZb:Ljava/util/List;
 
     iget v4, v0, Lokhttp3/internal/c/g;->index:I
 
@@ -306,7 +307,7 @@
 
     add-int/2addr v5, v2
 
-    iget-object v6, v0, Lokhttp3/internal/c/g;->bZH:Ljava/util/List;
+    iget-object v6, v0, Lokhttp3/internal/c/g;->bZb:Ljava/util/List;
 
     invoke-interface {v6}, Ljava/util/List;->size()I
 
@@ -314,7 +315,7 @@
 
     if-ge v5, v6, :cond_5
 
-    iget v1, v1, Lokhttp3/internal/c/g;->ccv:I
+    iget v1, v1, Lokhttp3/internal/c/g;->cbP:I
 
     if-ne v1, v2, :cond_4
 
@@ -347,7 +348,7 @@
     :goto_2
     if-eqz v4, :cond_7
 
-    iget-object v1, v4, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v1, v4, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     if-eqz v1, :cond_6
 
@@ -415,11 +416,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->cct:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->cbN:Lokhttp3/internal/b/g;
 
-    iget-object v1, p0, Lokhttp3/internal/c/g;->ccu:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/c/g;->cbO:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/c/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/c/g;->cbF: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 bd1db4acda..16a9a0b4ea 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/i.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/i.smali
@@ -1,16 +1,17 @@
 .class public final Lokhttp3/internal/c/i;
 .super Ljava/lang/Object;
+.source "RequestLine.java"
 
 
 # direct methods
 .method public static d(Lokhttp3/s;)Ljava/lang/String;
     .locals 2
 
-    invoke-virtual {p0}, Lokhttp3/s;->Ho()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Hn()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lokhttp3/s;->Hq()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Hp()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 92bf929cc7..77e655361c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/j.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/j.smali
@@ -1,20 +1,21 @@
 .class public final Lokhttp3/internal/c/j;
 .super Ljava/lang/Object;
+.source "RetryAndFollowUpInterceptor.java"
 
 # interfaces
 .implements Lokhttp3/Interceptor;
 
 
 # instance fields
-.field private final cab:Lokhttp3/t;
+.field private final bZv:Lokhttp3/t;
 
-.field private final caf:Z
+.field private final bZz:Z
 
-.field public cci:Ljava/lang/Object;
+.field public cbC:Ljava/lang/Object;
 
-.field public volatile ccn:Z
+.field public volatile cbH:Z
 
-.field public volatile cct:Lokhttp3/internal/b/g;
+.field public volatile cbN:Lokhttp3/internal/b/g;
 
 
 # direct methods
@@ -23,9 +24,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iput-boolean p2, p0, Lokhttp3/internal/c/j;->caf:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c/j;->bZz:Z
 
     return-void
 .end method
@@ -73,9 +74,9 @@
 
     invoke-virtual {p2, p1}, Lokhttp3/internal/b/g;->a(Ljava/io/IOException;)V
 
-    iget-object v0, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-boolean v0, v0, Lokhttp3/t;->bZP:Z
+    iget-boolean v0, v0, Lokhttp3/t;->bZj:Z
 
     const/4 v1, 0x0
 
@@ -86,7 +87,7 @@
     :cond_0
     if-eqz p3, :cond_1
 
-    iget-object p4, p4, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object p4, p4, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     instance-of p4, p4, Lokhttp3/internal/c/l;
 
@@ -104,7 +105,7 @@
     return v1
 
     :cond_2
-    invoke-virtual {p2}, Lokhttp3/internal/b/g;->Ia()Z
+    invoke-virtual {p2}, Lokhttp3/internal/b/g;->HZ()Z
 
     move-result p1
 
@@ -176,13 +177,13 @@
 .method private static a(Lokhttp3/Response;Lokhttp3/s;)Z
     .locals 2
 
-    iget-object p0, p0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    iget-object v0, p0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -196,9 +197,9 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object p0, p0, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object p0, p0, Lokhttp3/s;->bYw:Ljava/lang/String;
 
-    iget-object p1, p1, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -223,7 +224,7 @@
 
     move-object/from16 v1, p1
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hl()Z
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Hk()Z
 
     move-result v2
 
@@ -231,17 +232,17 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
     iget-object v3, v2, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
     iget-object v2, v2, Lokhttp3/t;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v4, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v4, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v4, v4, Lokhttp3/t;->bVw:Lokhttp3/g;
+    iget-object v4, v4, Lokhttp3/t;->bUQ:Lokhttp3/g;
 
     move-object v11, v2
 
@@ -261,35 +262,35 @@
     :goto_0
     new-instance v2, Lokhttp3/a;
 
-    iget-object v6, v1, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v6, v1, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     iget v7, v1, Lokhttp3/s;->port:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v8, v1, Lokhttp3/t;->bVq:Lokhttp3/o;
+    iget-object v8, v1, Lokhttp3/t;->bUK:Lokhttp3/o;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v9, v1, Lokhttp3/t;->bVr:Ljavax/net/SocketFactory;
+    iget-object v9, v1, Lokhttp3/t;->bUL:Ljavax/net/SocketFactory;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v13, v1, Lokhttp3/t;->bVs:Lokhttp3/b;
+    iget-object v13, v1, Lokhttp3/t;->bUM:Lokhttp3/b;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v14, v1, Lokhttp3/t;->bVv:Ljava/net/Proxy;
+    iget-object v14, v1, Lokhttp3/t;->bUP:Ljava/net/Proxy;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v15, v1, Lokhttp3/t;->bVt:Ljava/util/List;
+    iget-object v15, v1, Lokhttp3/t;->bUN:Ljava/util/List;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bVu:Ljava/util/List;
+    iget-object v1, v1, Lokhttp3/t;->bUO:Ljava/util/List;
 
-    iget-object v3, v0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v3, v0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
     iget-object v3, v3, Lokhttp3/t;->proxySelector:Ljava/net/ProxySelector;
 
@@ -311,9 +312,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/c/j;->ccn:Z
+    iput-boolean v0, p0, Lokhttp3/internal/c/j;->cbH:Z
 
-    iget-object v0, p0, Lokhttp3/internal/c/j;->cct:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->cbN:Lokhttp3/internal/b/g;
 
     if-eqz v0, :cond_0
 
@@ -331,29 +332,29 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GY()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GX()Lokhttp3/w;
 
     move-result-object v0
 
     check-cast p1, Lokhttp3/internal/c/g;
 
-    iget-object v7, p1, Lokhttp3/internal/c/g;->cca:Lokhttp3/e;
+    iget-object v7, p1, Lokhttp3/internal/c/g;->cbu:Lokhttp3/e;
 
-    iget-object v8, p1, Lokhttp3/internal/c/g;->cad:Lokhttp3/p;
+    iget-object v8, p1, Lokhttp3/internal/c/g;->bZx:Lokhttp3/p;
 
     new-instance v9, Lokhttp3/internal/b/g;
 
-    iget-object v1, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v2, v1, Lokhttp3/t;->bZM:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/t;->bZg:Lokhttp3/j;
 
-    iget-object v1, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v1, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-direct {p0, v1}, Lokhttp3/internal/c/j;->e(Lokhttp3/s;)Lokhttp3/a;
 
     move-result-object v3
 
-    iget-object v6, p0, Lokhttp3/internal/c/j;->cci:Ljava/lang/Object;
+    iget-object v6, p0, Lokhttp3/internal/c/j;->cbC:Ljava/lang/Object;
 
     move-object v1, v9
 
@@ -363,7 +364,7 @@
 
     invoke-direct/range {v1 .. v6}, Lokhttp3/internal/b/g;-><init>(Lokhttp3/j;Lokhttp3/a;Lokhttp3/e;Lokhttp3/p;Ljava/lang/Object;)V
 
-    iput-object v9, p0, Lokhttp3/internal/c/j;->cct:Lokhttp3/internal/b/g;
+    iput-object v9, p0, Lokhttp3/internal/c/j;->cbN:Lokhttp3/internal/b/g;
 
     const/4 v10, 0x0
 
@@ -374,16 +375,16 @@
     const/4 v2, 0x0
 
     :goto_0
-    iget-boolean v3, p0, Lokhttp3/internal/c/j;->ccn:Z
+    iget-boolean v3, p0, Lokhttp3/internal/c/j;->cbH:Z
 
-    if-nez v3, :cond_17
+    if-nez v3, :cond_18
 
     const/4 v3, 0x1
 
     :try_start_0
     invoke-virtual {p1, v0, v9, v11, v11}, Lokhttp3/internal/c/g;->a(Lokhttp3/w;Lokhttp3/internal/b/g;Lokhttp3/internal/c/c;Lokhttp3/internal/b/c;)Lokhttp3/Response;
 
-    move-result-object v4
+    move-result-object v0
     :try_end_0
     .catch Lokhttp3/internal/b/e; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
@@ -391,27 +392,27 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v4}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v0}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    invoke-virtual {v1}, Lokhttp3/Response;->HI()Lokhttp3/Response$a;
+    invoke-virtual {v1}, Lokhttp3/Response;->HH()Lokhttp3/Response$a;
 
     move-result-object v1
 
-    iput-object v11, v1, Lokhttp3/Response$a;->cav:Lokhttp3/x;
+    iput-object v11, v1, Lokhttp3/Response$a;->bZP:Lokhttp3/x;
 
-    invoke-virtual {v1}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v1}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v1
 
-    iget-object v4, v1, Lokhttp3/Response;->cav:Lokhttp3/x;
+    iget-object v4, v1, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     if-nez v4, :cond_0
 
-    iput-object v1, v0, Lokhttp3/Response$a;->cay:Lokhttp3/Response;
+    iput-object v1, v0, Lokhttp3/Response$a;->bZS:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->HJ()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->HI()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -427,36 +428,34 @@
     throw p1
 
     :cond_1
-    move-object v0, v4
-
     :goto_1
     :try_start_1
-    iget-object v1, v9, Lokhttp3/internal/b/g;->cbN:Lokhttp3/y;
+    iget-object v1, v9, Lokhttp3/internal/b/g;->cbh:Lokhttp3/y;
 
-    if-eqz v0, :cond_13
+    if-eqz v0, :cond_14
 
     iget v4, v0, Lokhttp3/Response;->code:I
 
-    iget-object v5, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
     iget-object v5, v5, Lokhttp3/w;->method:Ljava/lang/String;
 
     sparse-switch v4, :sswitch_data_0
 
-    goto/16 :goto_7
+    goto/16 :goto_5
 
     :sswitch_0
-    iget-object v1, v0, Lokhttp3/Response;->cay:Lokhttp3/Response;
+    iget-object v1, v0, Lokhttp3/Response;->bZS:Lokhttp3/Response;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lokhttp3/Response;->cay:Lokhttp3/Response;
+    iget-object v1, v0, Lokhttp3/Response;->bZS:Lokhttp3/Response;
 
     iget v1, v1, Lokhttp3/Response;->code:I
 
     const/16 v3, 0x1f7
 
-    if-eq v1, v3, :cond_c
+    if-eq v1, v3, :cond_d
 
     :cond_2
     const v1, 0x7fffffff
@@ -465,76 +464,85 @@
 
     move-result v1
 
-    if-nez v1, :cond_c
+    if-nez v1, :cond_3
 
-    :goto_2
-    iget-object v1, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v1, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    :goto_3
     move-object v12, v1
 
-    goto/16 :goto_8
+    goto/16 :goto_6
+
+    :cond_3
+    move-object v12, v11
+
+    goto/16 :goto_6
 
     :sswitch_1
-    iget-object v1, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-boolean v1, v1, Lokhttp3/t;->bZP:Z
+    iget-boolean v1, v1, Lokhttp3/t;->bZj:Z
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_d
 
-    iget-object v1, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v1, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object v1, v1, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v1, v1, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     instance-of v1, v1, Lokhttp3/internal/c/l;
 
-    if-nez v1, :cond_c
+    if-nez v1, :cond_d
 
-    iget-object v1, v0, Lokhttp3/Response;->cay:Lokhttp3/Response;
+    iget-object v1, v0, Lokhttp3/Response;->bZS:Lokhttp3/Response;
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lokhttp3/Response;->cay:Lokhttp3/Response;
+    iget-object v1, v0, Lokhttp3/Response;->bZS:Lokhttp3/Response;
 
     iget v1, v1, Lokhttp3/Response;->code:I
 
     const/16 v3, 0x198
 
-    if-eq v1, v3, :cond_c
+    if-eq v1, v3, :cond_d
 
-    :cond_3
+    :cond_4
     invoke-static {v0, v10}, Lokhttp3/internal/c/j;->a(Lokhttp3/Response;I)I
 
     move-result v1
 
-    if-gtz v1, :cond_c
+    if-gtz v1, :cond_d
+
+    iget-object v1, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
+
+    move-object v12, v1
+
+    goto/16 :goto_6
+
+    :sswitch_2
+    if-eqz v1, :cond_5
+
+    iget-object v1, v1, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     goto :goto_2
 
-    :sswitch_2
-    if-eqz v1, :cond_4
+    :cond_5
+    iget-object v1, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v1, v1, Lokhttp3/t;->bUP:Ljava/net/Proxy;
 
-    goto :goto_4
-
-    :cond_4
-    iget-object v1, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
-
-    iget-object v1, v1, Lokhttp3/t;->bVv:Ljava/net/Proxy;
-
-    :goto_4
+    :goto_2
     invoke-virtual {v1}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
     move-result-object v1
 
     sget-object v3, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
 
-    if-ne v1, v3, :cond_5
+    if-ne v1, v3, :cond_6
 
-    goto/16 :goto_7
+    move-object v12, v11
 
-    :cond_5
+    goto/16 :goto_6
+
+    :cond_6
     new-instance p1, Ljava/net/ProtocolException;
 
     const-string v0, "Received HTTP_PROXY_AUTH (407) code while not using proxy"
@@ -544,13 +552,18 @@
     throw p1
 
     :sswitch_3
+    move-object v12, v11
+
+    goto/16 :goto_6
+
+    :sswitch_4
     const-string v1, "GET"
 
     invoke-virtual {v5, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-nez v1, :cond_6
+    if-nez v1, :cond_7
 
     const-string v1, "HEAD"
 
@@ -558,15 +571,15 @@
 
     move-result v1
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_d
 
-    :cond_6
-    :sswitch_4
-    iget-object v1, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    :cond_7
+    :sswitch_5
+    iget-object v1, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-boolean v1, v1, Lokhttp3/t;->bZO:Z
+    iget-boolean v1, v1, Lokhttp3/t;->bZi:Z
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_d
 
     const-string v1, "Location"
 
@@ -574,42 +587,42 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_d
 
-    iget-object v4, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object v4, v4, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v4, v4, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v4, v1}, Lokhttp3/s;->el(Ljava/lang/String;)Lokhttp3/s;
 
     move-result-object v1
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_d
 
-    iget-object v4, v1, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v4, v1, Lokhttp3/s;->bYw:Ljava/lang/String;
 
-    iget-object v6, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object v6, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object v6, v6, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v6, v6, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    iget-object v6, v6, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object v6, v6, Lokhttp3/s;->bYw:Ljava/lang/String;
 
     invoke-virtual {v4, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v4
 
-    if-nez v4, :cond_7
+    if-nez v4, :cond_8
 
-    iget-object v4, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v4, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-boolean v4, v4, Lokhttp3/t;->bZN:Z
+    iget-boolean v4, v4, Lokhttp3/t;->bZh:Z
 
-    if-eqz v4, :cond_c
+    if-eqz v4, :cond_d
 
-    :cond_7
-    iget-object v4, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
+    :cond_8
+    iget-object v4, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/w;->HF()Lokhttp3/w$a;
+    invoke-virtual {v4}, Lokhttp3/w;->HE()Lokhttp3/w$a;
 
     move-result-object v4
 
@@ -617,7 +630,7 @@
 
     move-result v6
 
-    if-eqz v6, :cond_a
+    if-eqz v6, :cond_b
 
     const-string v6, "PROPFIND"
 
@@ -633,31 +646,31 @@
 
     xor-int/2addr v3, v12
 
-    if-eqz v3, :cond_8
+    if-eqz v3, :cond_9
 
     const-string v3, "GET"
 
     invoke-virtual {v4, v3, v11}, Lokhttp3/w$a;->a(Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/w$a;
 
-    goto :goto_6
-
-    :cond_8
-    if-eqz v6, :cond_9
-
-    iget-object v3, v0, Lokhttp3/Response;->cas:Lokhttp3/w;
-
-    iget-object v3, v3, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
-
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
+    if-eqz v6, :cond_a
+
+    iget-object v3, v0, Lokhttp3/Response;->bZM:Lokhttp3/w;
+
+    iget-object v3, v3, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
+
+    goto :goto_3
+
+    :cond_a
     move-object v3, v11
 
-    :goto_5
+    :goto_3
     invoke-virtual {v4, v5, v3}, Lokhttp3/w$a;->a(Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/w$a;
 
-    :goto_6
-    if-nez v6, :cond_a
+    :goto_4
+    if-nez v6, :cond_b
 
     const-string v3, "Transfer-Encoding"
 
@@ -671,49 +684,50 @@
 
     invoke-virtual {v4, v3}, Lokhttp3/w$a;->eu(Ljava/lang/String;)Lokhttp3/w$a;
 
-    :cond_a
+    :cond_b
     invoke-static {v0, v1}, Lokhttp3/internal/c/j;->a(Lokhttp3/Response;Lokhttp3/s;)Z
 
     move-result v3
 
-    if-nez v3, :cond_b
+    if-nez v3, :cond_c
 
     const-string v3, "Authorization"
 
     invoke-virtual {v4, v3}, Lokhttp3/w$a;->eu(Ljava/lang/String;)Lokhttp3/w$a;
 
-    :cond_b
+    :cond_c
     invoke-virtual {v4, v1}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->HH()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->HG()Lokhttp3/w;
 
     move-result-object v1
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
-    goto/16 :goto_3
+    move-object v12, v1
 
-    :cond_c
-    :goto_7
-    :sswitch_5
+    goto :goto_6
+
+    :cond_d
+    :goto_5
     move-object v12, v11
 
-    :goto_8
-    if-nez v12, :cond_e
+    :goto_6
+    if-nez v12, :cond_f
 
-    iget-boolean p1, p0, Lokhttp3/internal/c/j;->caf:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c/j;->bZz:Z
 
-    if-nez p1, :cond_d
+    if-nez p1, :cond_e
 
     invoke-virtual {v9}, Lokhttp3/internal/b/g;->release()V
 
-    :cond_d
+    :cond_e
     return-object v0
 
-    :cond_e
-    iget-object v1, v0, Lokhttp3/Response;->cav:Lokhttp3/x;
+    :cond_f
+    iget-object v1, v0, Lokhttp3/Response;->bZP:Lokhttp3/x;
 
     invoke-static {v1}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -721,37 +735,37 @@
 
     const/16 v1, 0x14
 
-    if-gt v13, v1, :cond_12
+    if-gt v13, v1, :cond_13
 
-    iget-object v1, v12, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v1, v12, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     instance-of v1, v1, Lokhttp3/internal/c/l;
 
-    if-nez v1, :cond_11
+    if-nez v1, :cond_12
 
-    iget-object v1, v12, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v1, v12, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c/j;->a(Lokhttp3/Response;Lokhttp3/s;)Z
 
     move-result v1
 
-    if-nez v1, :cond_f
+    if-nez v1, :cond_10
 
     invoke-virtual {v9}, Lokhttp3/internal/b/g;->release()V
 
     new-instance v9, Lokhttp3/internal/b/g;
 
-    iget-object v1, p0, Lokhttp3/internal/c/j;->cab:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/internal/c/j;->bZv:Lokhttp3/t;
 
-    iget-object v2, v1, Lokhttp3/t;->bZM:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/t;->bZg:Lokhttp3/j;
 
-    iget-object v1, v12, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v1, v12, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-direct {p0, v1}, Lokhttp3/internal/c/j;->e(Lokhttp3/s;)Lokhttp3/a;
 
     move-result-object v3
 
-    iget-object v6, p0, Lokhttp3/internal/c/j;->cci:Ljava/lang/Object;
+    iget-object v6, p0, Lokhttp3/internal/c/j;->cbC:Ljava/lang/Object;
 
     move-object v1, v9
 
@@ -761,18 +775,18 @@
 
     invoke-direct/range {v1 .. v6}, Lokhttp3/internal/b/g;-><init>(Lokhttp3/j;Lokhttp3/a;Lokhttp3/e;Lokhttp3/p;Ljava/lang/Object;)V
 
-    iput-object v9, p0, Lokhttp3/internal/c/j;->cct:Lokhttp3/internal/b/g;
+    iput-object v9, p0, Lokhttp3/internal/c/j;->cbN:Lokhttp3/internal/b/g;
 
-    goto :goto_9
+    goto :goto_7
 
-    :cond_f
-    invoke-virtual {v9}, Lokhttp3/internal/b/g;->HW()Lokhttp3/internal/c/c;
+    :cond_10
+    invoke-virtual {v9}, Lokhttp3/internal/b/g;->HV()Lokhttp3/internal/c/c;
 
     move-result-object v1
 
-    if-nez v1, :cond_10
+    if-nez v1, :cond_11
 
-    :goto_9
+    :goto_7
     move-object v1, v0
 
     move-object v0, v12
@@ -781,7 +795,7 @@
 
     goto/16 :goto_0
 
-    :cond_10
+    :cond_11
     new-instance p1, Ljava/lang/IllegalStateException;
 
     new-instance v1, Ljava/lang/StringBuilder;
@@ -804,7 +818,7 @@
 
     throw p1
 
-    :cond_11
+    :cond_12
     invoke-virtual {v9}, Lokhttp3/internal/b/g;->release()V
 
     new-instance p1, Ljava/net/HttpRetryException;
@@ -817,7 +831,7 @@
 
     throw p1
 
-    :cond_12
+    :cond_13
     invoke-virtual {v9}, Lokhttp3/internal/b/g;->release()V
 
     new-instance p1, Ljava/net/ProtocolException;
@@ -836,7 +850,7 @@
 
     throw p1
 
-    :cond_13
+    :cond_14
     :try_start_2
     new-instance p1, Ljava/lang/IllegalStateException;
 
@@ -856,7 +870,7 @@
     :catchall_0
     move-exception p1
 
-    goto :goto_b
+    goto :goto_9
 
     :catch_1
     move-exception v4
@@ -864,23 +878,23 @@
     :try_start_3
     instance-of v5, v4, Lokhttp3/internal/e/a;
 
-    if-nez v5, :cond_14
+    if-nez v5, :cond_15
 
-    goto :goto_a
+    goto :goto_8
 
-    :cond_14
+    :cond_15
     const/4 v3, 0x0
 
-    :goto_a
+    :goto_8
     invoke-direct {p0, v4, v9, v3, v0}, Lokhttp3/internal/c/j;->a(Ljava/io/IOException;Lokhttp3/internal/b/g;ZLokhttp3/w;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_15
+    if-eqz v3, :cond_16
 
     goto/16 :goto_0
 
-    :cond_15
+    :cond_16
     throw v4
 
     :catch_2
@@ -892,25 +906,25 @@
 
     move-result v4
 
-    if-eqz v4, :cond_16
+    if-eqz v4, :cond_17
 
     goto/16 :goto_0
 
-    :cond_16
+    :cond_17
     iget-object p1, v3, Lokhttp3/internal/b/e;->firstException:Ljava/io/IOException;
 
     throw p1
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :goto_b
+    :goto_9
     invoke-virtual {v9, v11}, Lokhttp3/internal/b/g;->a(Ljava/io/IOException;)V
 
     invoke-virtual {v9}, Lokhttp3/internal/b/g;->release()V
 
     throw p1
 
-    :cond_17
+    :cond_18
     invoke-virtual {v9}, Lokhttp3/internal/b/g;->release()V
 
     new-instance p1, Ljava/io/IOException;
@@ -921,17 +935,17 @@
 
     throw p1
 
-    nop
+    return-void
 
     :sswitch_data_0
     .sparse-switch
-        0x12c -> :sswitch_4
-        0x12d -> :sswitch_4
-        0x12e -> :sswitch_4
-        0x12f -> :sswitch_4
-        0x133 -> :sswitch_3
-        0x134 -> :sswitch_3
-        0x191 -> :sswitch_5
+        0x12c -> :sswitch_5
+        0x12d -> :sswitch_5
+        0x12e -> :sswitch_5
+        0x12f -> :sswitch_5
+        0x133 -> :sswitch_4
+        0x134 -> :sswitch_4
+        0x191 -> :sswitch_3
         0x197 -> :sswitch_2
         0x198 -> :sswitch_1
         0x1f7 -> :sswitch_0
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/k.smali b/com.discord/smali_classes2/okhttp3/internal/c/k.smali
index d62961ad9e..0764b66160 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/k.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/k.smali
@@ -1,9 +1,10 @@
 .class public final Lokhttp3/internal/c/k;
 .super Ljava/lang/Object;
+.source "StatusLine.java"
 
 
 # instance fields
-.field public final cat:Lokhttp3/u;
+.field public final bZN:Lokhttp3/u;
 
 .field public final code:I
 
@@ -16,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/k;->cat:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/c/k;->bZN:Lokhttp3/u;
 
     iput p2, p0, Lokhttp3/internal/c/k;->code:I
 
@@ -39,9 +40,9 @@
 
     move-result v0
 
-    const/4 v1, 0x4
+    const/16 v1, 0x20
 
-    const/16 v2, 0x20
+    const/4 v2, 0x4
 
     const/16 v3, 0x9
 
@@ -59,7 +60,7 @@
 
     move-result v0
 
-    if-ne v0, v2, :cond_2
+    if-ne v0, v1, :cond_2
 
     const/4 v0, 0x7
 
@@ -71,7 +72,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     goto :goto_0
 
@@ -80,7 +81,7 @@
 
     if-ne v0, v4, :cond_1
 
-    sget-object v0, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     goto :goto_0
 
@@ -127,7 +128,7 @@
 
     if-eqz v0, :cond_7
 
-    sget-object v0, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     const/4 v3, 0x4
 
@@ -163,9 +164,9 @@
 
     move-result v5
 
-    if-ne v5, v2, :cond_4
+    if-ne v5, v1, :cond_4
 
-    add-int/2addr v3, v1
+    add-int/2addr v3, v2
 
     invoke-virtual {p0, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
@@ -259,9 +260,9 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/c/k;->cat:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/c/k;->bZN:Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     if-ne v1, v2, :cond_0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/l.smali b/com.discord/smali_classes2/okhttp3/internal/c/l.smali
index 2322f719cf..e761124f0a 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/l.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/l.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lokhttp3/internal/c/l;
 .super Ljava/lang/Object;
+.source "UnrepeatableRequestBody.java"
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 7ea503f984..c5eb508d6a 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali
@@ -1,5 +1,6 @@
 .class abstract Lokhttp3/internal/d/a$a;
 .super Ljava/lang/Object;
+.source "Http1Codec.java"
 
 # interfaces
 .implements Lokio/q;
@@ -17,11 +18,11 @@
 
 
 # instance fields
-.field final synthetic ccA:Lokhttp3/internal/d/a;
+.field protected final cbS:Lokio/g;
 
-.field protected final ccy:Lokio/g;
+.field protected cbT:J
 
-.field protected ccz:J
+.field final synthetic cbU:Lokhttp3/internal/d/a;
 
 .field protected closed:Z
 
@@ -30,15 +31,15 @@
 .method private constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->cbU: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;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->caE:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/r;
 
@@ -46,11 +47,11 @@
 
     invoke-direct {p1, v0}, Lokio/g;-><init>(Lokio/r;)V
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$a;->ccy:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->cbS:Lokio/g;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->ccz:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->cbT:J
 
     return-void
 .end method
@@ -74,9 +75,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->caE:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bZY:Lokio/d;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/d;->a(Lokio/c;J)J
 
@@ -88,13 +89,11 @@
 
     if-lez p3, :cond_0
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$a;->ccz:J
-
-    const/4 p3, 0x0
+    iget-wide v0, p0, Lokhttp3/internal/d/a$a;->cbT:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->ccz:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->cbT:J
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -119,7 +118,7 @@
         }
     .end annotation
 
-    iget-object p2, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iget-object p2, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
     iget p2, p2, Lokhttp3/internal/d/a;->state:I
 
@@ -130,7 +129,7 @@
     return-void
 
     :cond_0
-    iget-object p2, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iget-object p2, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
     iget p2, p2, Lokhttp3/internal/d/a;->state:I
 
@@ -138,27 +137,25 @@
 
     if-ne p2, v1, :cond_2
 
-    iget-object p2, p0, Lokhttp3/internal/d/a$a;->ccy:Lokio/g;
+    iget-object p2, p0, Lokhttp3/internal/d/a$a;->cbS:Lokio/g;
 
     invoke-static {p2}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object p2, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iget-object p2, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
     iput v0, p2, Lokhttp3/internal/d/a;->state:I
 
-    iget-object p2, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
-
-    iget-object p2, p2, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
+    iget-object p2, p2, Lokhttp3/internal/d/a;->cbN:Lokhttp3/internal/b/g;
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iget-object p2, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object p2, p2, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
+    iget-object p2, p2, Lokhttp3/internal/d/a;->cbN:Lokhttp3/internal/b/g;
 
     xor-int/lit8 p1, p1, 0x1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
     invoke-virtual {p2, p1, v0}, Lokhttp3/internal/b/g;->a(ZLokhttp3/internal/c/c;)V
 
@@ -174,7 +171,7 @@
 
     invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->cbU:Lokhttp3/internal/d/a;
 
     iget v0, v0, Lokhttp3/internal/d/a;->state:I
 
@@ -192,7 +189,7 @@
 .method public timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->ccy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->cbS: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 e021c0e6ec..e62a3bfc4e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/d/a$b;
 .super Ljava/lang/Object;
+.source "Http1Codec.java"
 
 # interfaces
 .implements Lokio/p;
@@ -17,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic ccA:Lokhttp3/internal/d/a;
+.field private final cbS:Lokio/g;
 
-.field private final ccy:Lokio/g;
+.field final synthetic cbU:Lokhttp3/internal/d/a;
 
 .field private closed:Z
 
@@ -28,15 +29,15 @@
 .method constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->cbU: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;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/r;
 
@@ -44,7 +45,7 @@
 
     invoke-direct {p1, v0}, Lokio/g;-><init>(Lokio/r;)V
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$b;->ccy:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->cbS:Lokio/g;
 
     return-void
 .end method
@@ -78,19 +79,19 @@
     :try_start_1
     iput-boolean v0, p0, Lokhttp3/internal/d/a$b;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     const-string v1, "0\r\n\r\n"
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->eL(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbS:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
     const/4 v1, 0x3
 
@@ -133,9 +134,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_1
@@ -156,7 +157,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbS:Lokio/g;
 
     return-object v0
 .end method
@@ -182,29 +183,29 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0, p2, p3}, Lokio/BufferedSink;->bf(J)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     const-string v1, "\r\n"
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->eL(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/d/a$b;->ccA:Lokhttp3/internal/d/a;
+    iget-object p1, p0, Lokhttp3/internal/d/a$b;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object p1, p1, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object p1, p1, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     const-string p2, "\r\n"
 
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 a6204a412b..75e1bf3d27 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/d/a$c;
 .super Lokhttp3/internal/d/a$a;
+.source "Http1Codec.java"
 
 
 # annotations
@@ -14,20 +15,20 @@
 
 
 # instance fields
-.field private final bVp:Lokhttp3/s;
+.field private final bUJ:Lokhttp3/s;
 
-.field final synthetic ccA:Lokhttp3/internal/d/a;
+.field final synthetic cbU:Lokhttp3/internal/d/a;
 
-.field private ccB:J
+.field private cbV:J
 
-.field private ccC:Z
+.field private cbW:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;Lokhttp3/s;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$c;->ccA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$c;->cbU:Lokhttp3/internal/d/a;
 
     const/4 v0, 0x0
 
@@ -35,13 +36,13 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->ccC:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->cbW:Z
 
-    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bVp:Lokhttp3/s;
+    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bUJ:Lokhttp3/s;
 
     return-void
 .end method
@@ -66,7 +67,7 @@
 
     if-nez v2, :cond_8
 
-    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->ccC:Z
+    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->cbW:Z
 
     const-wide/16 v3, -0x1
 
@@ -75,7 +76,7 @@
     return-wide v3
 
     :cond_0
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     const/4 v2, 0x0
 
@@ -83,42 +84,40 @@
 
     if-eqz v7, :cond_1
 
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->ccB:J
-
     cmp-long v7, v5, v3
 
     if-nez v7, :cond_5
 
     :cond_1
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     cmp-long v7, v5, v3
 
     if-eqz v7, :cond_2
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->ccA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->caE:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->bZY:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Jg()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Jf()Ljava/lang/String;
 
     :cond_2
     :try_start_0
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->ccA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->caE:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->bZY:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Je()J
+    invoke-interface {v5}, Lokio/d;->Jd()J
 
     move-result-wide v5
 
-    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->ccA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->caE:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->bZY:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Jg()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Jf()Ljava/lang/String;
 
     move-result-object v5
 
@@ -126,7 +125,7 @@
 
     move-result-object v5
 
-    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     cmp-long v8, v6, v0
 
@@ -149,25 +148,25 @@
     if-eqz v6, :cond_7
 
     :cond_3
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     cmp-long v7, v5, v0
 
     if-nez v7, :cond_4
 
-    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->ccC:Z
+    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->cbW:Z
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$c;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$c;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cab:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bZv:Lokhttp3/t;
 
     iget-object v0, v0, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
-    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bVp:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bUJ:Lokhttp3/s;
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->ccA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->cbU:Lokhttp3/internal/d/a;
 
-    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Ie()Lokhttp3/Headers;
+    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Id()Lokhttp3/Headers;
 
     move-result-object v5
 
@@ -180,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;->ccC:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->cbW:Z
 
     if-nez v0, :cond_5
 
     return-wide v3
 
     :cond_5
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     invoke-static {p2, p3, v0, v1}, Ljava/lang/Math;->min(JJ)J
 
@@ -201,11 +200,11 @@
 
     if-eqz p3, :cond_6
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     sub-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     return-wide p1
 
@@ -230,7 +229,7 @@
 
     invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->ccB:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->cbV:J
 
     invoke-virtual {p2, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -305,7 +304,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->ccC:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->cbW: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 2034ed6dec..fefec9c9cb 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/d/a$d;
 .super Ljava/lang/Object;
+.source "Http1Codec.java"
 
 # interfaces
 .implements Lokio/p;
@@ -17,11 +18,11 @@
 
 
 # instance fields
-.field final synthetic ccA:Lokhttp3/internal/d/a;
+.field private final cbS:Lokio/g;
 
-.field private ccD:J
+.field final synthetic cbU:Lokhttp3/internal/d/a;
 
-.field private final ccy:Lokio/g;
+.field private cbX:J
 
 .field private closed:Z
 
@@ -30,15 +31,15 @@
 .method constructor <init>(Lokhttp3/internal/d/a;J)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$d;->ccA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->cbU: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;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/r;
 
@@ -46,9 +47,9 @@
 
     invoke-direct {p1, v0}, Lokio/g;-><init>(Lokio/r;)V
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$d;->ccy:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->cbS:Lokio/g;
 
-    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->ccD:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->cbX:J
 
     return-void
 .end method
@@ -74,7 +75,7 @@
 
     iput-boolean v0, p0, Lokhttp3/internal/d/a$d;->closed:Z
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->ccD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->cbX:J
 
     const-wide/16 v2, 0x0
 
@@ -82,11 +83,11 @@
 
     if-gtz v4, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->ccy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->cbS:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->cbU:Lokhttp3/internal/d/a;
 
     const/4 v1, 0x3
 
@@ -119,9 +120,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
@@ -131,7 +132,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->ccy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->cbS:Lokio/g;
 
     return-object v0
 .end method
@@ -156,23 +157,23 @@
 
     invoke-static/range {v1 .. v6}, Lokhttp3/internal/c;->c(JJJ)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->ccD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->cbX:J
 
     cmp-long v2, p2, v0
 
     if-gtz v2, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->ccA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->cbU:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->ccD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->cbX:J
 
     sub-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->ccD:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->cbX:J
 
     return-void
 
@@ -185,7 +186,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a$d;->ccD:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a$d;->cbX: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 3a33ba102d..647f4a2bb4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$e.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/d/a$e;
 .super Lokhttp3/internal/d/a$a;
+.source "Http1Codec.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field final synthetic ccA:Lokhttp3/internal/d/a;
+.field final synthetic cbU:Lokhttp3/internal/d/a;
 
-.field private ccD:J
+.field private cbX:J
 
 
 # direct methods
@@ -28,15 +29,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$e;->ccA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$e;->cbU: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;->ccD:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$e;->cbX:J
 
-    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->ccD:J
+    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->cbX:J
 
     const-wide/16 v0, 0x0
 
@@ -74,7 +75,7 @@
 
     if-nez v2, :cond_3
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->ccD:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->cbX:J
 
     const-wide/16 v4, -0x1
 
@@ -85,8 +86,6 @@
     return-wide v4
 
     :cond_0
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->ccD:J
-
     invoke-static {v2, v3, p2, p3}, Ljava/lang/Math;->min(JJ)J
 
     move-result-wide p2
@@ -99,13 +98,13 @@
 
     if-eqz p3, :cond_2
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->ccD:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->cbX:J
 
     sub-long/2addr v2, p1
 
-    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->ccD:J
+    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->cbX:J
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->ccD:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->cbX:J
 
     cmp-long p3, v2, v0
 
@@ -175,7 +174,7 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->ccD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->cbX: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 260299455e..3144409137 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$f.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/d/a$f;
 .super Lokhttp3/internal/d/a$a;
+.source "Http1Codec.java"
 
 
 # annotations
@@ -14,16 +15,16 @@
 
 
 # instance fields
-.field final synthetic ccA:Lokhttp3/internal/d/a;
+.field final synthetic cbU:Lokhttp3/internal/d/a;
 
-.field private ccE:Z
+.field private cbY:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$f;->ccA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$f;->cbU:Lokhttp3/internal/d/a;
 
     const/4 v0, 0x0
 
@@ -52,7 +53,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->ccE:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->cbY:Z
 
     const-wide/16 v1, -0x1
 
@@ -71,7 +72,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->ccE:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->cbY:Z
 
     const/4 p2, 0x0
 
@@ -124,7 +125,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->ccE:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->cbY: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 fb88a4b2f6..58be18e201 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/d/a;
 .super Ljava/lang/Object;
+.source "Http1Codec.java"
 
 # interfaces
 .implements Lokhttp3/internal/c/c;
@@ -19,15 +20,15 @@
 
 
 # instance fields
-.field final caE:Lokio/d;
+.field final bZY:Lokio/d;
 
-.field final cab:Lokhttp3/t;
+.field final bZv:Lokhttp3/t;
 
-.field final cbR:Lokio/BufferedSink;
+.field final cbN:Lokhttp3/internal/b/g;
 
-.field final cct:Lokhttp3/internal/b/g;
+.field private cbR:J
 
-.field private ccx:J
+.field final cbl:Lokio/BufferedSink;
 
 .field state:I
 
@@ -44,20 +45,20 @@
 
     const-wide/32 v0, 0x40000
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a;->ccx:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a;->cbR:J
 
-    iput-object p1, p0, Lokhttp3/internal/d/a;->cab:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/d/a;->bZv:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/d/a;->cbN:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/d/a;->caE:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/d/a;->bZY:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     return-void
 .end method
 
-.method private Id()Ljava/lang/String;
+.method private Ic()Ljava/lang/String;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -65,15 +66,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->bZY:Lokio/d;
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a;->ccx:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->cbR:J
 
     invoke-interface {v0, v1, v2}, Lokio/d;->aZ(J)Ljava/lang/String;
 
     move-result-object v0
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a;->ccx:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->cbR:J
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
@@ -83,7 +84,7 @@
 
     sub-long/2addr v1, v3
 
-    iput-wide v1, p0, Lokhttp3/internal/d/a;->ccx:J
+    iput-wide v1, p0, Lokhttp3/internal/d/a;->cbR:J
 
     return-object v0
 .end method
@@ -91,18 +92,18 @@
 .method static a(Lokio/g;)V
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
-    sget-object v1, Lokio/r;->chk:Lokio/r;
+    sget-object v1, Lokio/r;->cgE:Lokio/r;
 
     if-eqz v1, :cond_0
 
-    iput-object v1, p0, Lokio/g;->cgT:Lokio/r;
-
-    invoke-virtual {v0}, Lokio/r;->Ju()Lokio/r;
+    iput-object v1, p0, Lokio/g;->cgn:Lokio/r;
 
     invoke-virtual {v0}, Lokio/r;->Jt()Lokio/r;
 
+    invoke-virtual {v0}, Lokio/r;->Js()Lokio/r;
+
     return-void
 
     :cond_0
@@ -117,6 +118,21 @@
 
 
 # virtual methods
+.method public final Ia()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
+
+    return-void
+.end method
+
 .method public final Ib()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -125,29 +141,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
     return-void
 .end method
 
-.method public final Ic()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
-
-    return-void
-.end method
-
-.method public final Ie()Lokhttp3/Headers;
+.method public final Id()Lokhttp3/Headers;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -160,7 +161,7 @@
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
     :goto_0
-    invoke-direct {p0}, Lokhttp3/internal/d/a;->Id()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Ic()Ljava/lang/String;
 
     move-result-object v1
 
@@ -170,14 +171,14 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v2, Lokhttp3/internal/a;->cai: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;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object v0
 
@@ -300,7 +301,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0, p2}, Lokio/BufferedSink;->eL(Ljava/lang/String;)Lokio/BufferedSink;
 
@@ -312,7 +313,7 @@
 
     const/4 p2, 0x0
 
-    iget-object v0, p1, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -321,7 +322,7 @@
     :goto_0
     if-ge p2, v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object v1, p0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     invoke-virtual {p1, p2}, Lokhttp3/Headers;->fb(I)Ljava/lang/String;
 
@@ -354,7 +355,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/d/a;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/d/a;->cbl:Lokio/BufferedSink;
 
     const-string p2, "\r\n"
 
@@ -386,6 +387,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final aS(J)Lokio/q;
@@ -434,7 +437,7 @@
     throw p1
 .end method
 
-.method public final ah(Z)Lokhttp3/Response$a;
+.method public final ag(Z)Lokhttp3/Response$a;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -450,8 +453,6 @@
 
     if-eq v0, v2, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/d/a;->state:I
-
     if-ne v0, v1, :cond_0
 
     goto :goto_0
@@ -480,7 +481,7 @@
     :cond_1
     :goto_0
     :try_start_0
-    invoke-direct {p0}, Lokhttp3/internal/d/a;->Id()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Ic()Ljava/lang/String;
 
     move-result-object v0
 
@@ -492,9 +493,9 @@
 
     invoke-direct {v2}, Lokhttp3/Response$a;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/internal/c/k;->cat:Lokhttp3/u;
+    iget-object v3, v0, Lokhttp3/internal/c/k;->bZN:Lokhttp3/u;
 
-    iput-object v3, v2, Lokhttp3/Response$a;->cat:Lokhttp3/u;
+    iput-object v3, v2, Lokhttp3/Response$a;->bZN:Lokhttp3/u;
 
     iget v3, v0, Lokhttp3/internal/c/k;->code:I
 
@@ -504,7 +505,7 @@
 
     iput-object v3, v2, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/internal/d/a;->Ie()Lokhttp3/Headers;
+    invoke-virtual {p0}, Lokhttp3/internal/d/a;->Id()Lokhttp3/Headers;
 
     move-result-object v3
 
@@ -553,7 +554,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
+    iget-object v2, p0, Lokhttp3/internal/d/a;->cbN:Lokhttp3/internal/b/g;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -576,15 +577,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->cbN:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bVv:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bUP:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -602,9 +603,9 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p1, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v2, p1, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    invoke-virtual {v2}, Lokhttp3/s;->Hl()Z
+    invoke-virtual {v2}, Lokhttp3/s;->Hk()Z
 
     move-result v2
 
@@ -624,14 +625,14 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bUJ: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;->bVp:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-static {v0}, Lokhttp3/internal/c/i;->d(Lokhttp3/s;)Ljava/lang/String;
 
@@ -648,7 +649,7 @@
 
     move-result-object v0
 
-    iget-object p1, p1, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
     invoke-virtual {p0, p1, v0}, Lokhttp3/internal/d/a;->a(Lokhttp3/Headers;Ljava/lang/String;)V
 
@@ -658,15 +659,15 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->cbN:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->cbO:Ljava/net/Socket;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->cbi:Ljava/net/Socket;
 
     invoke-static {v0}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
@@ -731,9 +732,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object p1, p1, Lokhttp3/Response;->cas:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/Response;->bZM:Lokhttp3/w;
 
-    iget-object p1, p1, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     iget v1, p0, Lokhttp3/internal/d/a;->state:I
 
@@ -806,15 +807,13 @@
 
     if-ne v1, v3, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
+    iget-object v1, p0, Lokhttp3/internal/d/a;->cbN:Lokhttp3/internal/b/g;
 
     if-eqz v1, :cond_4
 
     iput v2, p0, Lokhttp3/internal/d/a;->state:I
 
-    iget-object v1, p0, Lokhttp3/internal/d/a;->cct:Lokhttp3/internal/b/g;
-
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HZ()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->HY()V
 
     new-instance v1, Lokhttp3/internal/d/a$f;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/a.smali b/com.discord/smali_classes2/okhttp3/internal/e/a.smali
index a760e64aff..7e4e82fabd 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/e/a;
 .super Ljava/io/IOException;
+.source "ConnectionShutdownException.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/b.smali b/com.discord/smali_classes2/okhttp3/internal/e/b.smali
index 9b9dcadf5f..2c19bb808c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/b.smali
@@ -1,5 +1,6 @@
 .class public final enum Lokhttp3/internal/e/b;
 .super Ljava/lang/Enum;
+.source "ErrorCode.java"
 
 
 # annotations
@@ -13,29 +14,29 @@
 
 
 # static fields
-.field public static final enum ccF:Lokhttp3/internal/e/b;
+.field public static final enum cbZ:Lokhttp3/internal/e/b;
 
-.field public static final enum ccG:Lokhttp3/internal/e/b;
+.field public static final enum cca:Lokhttp3/internal/e/b;
 
-.field public static final enum ccH:Lokhttp3/internal/e/b;
+.field public static final enum ccb:Lokhttp3/internal/e/b;
 
-.field public static final enum ccI:Lokhttp3/internal/e/b;
+.field public static final enum ccc:Lokhttp3/internal/e/b;
 
-.field public static final enum ccJ:Lokhttp3/internal/e/b;
+.field public static final enum ccd:Lokhttp3/internal/e/b;
 
-.field public static final enum ccK:Lokhttp3/internal/e/b;
+.field public static final enum cce:Lokhttp3/internal/e/b;
 
-.field public static final enum ccL:Lokhttp3/internal/e/b;
+.field public static final enum ccf:Lokhttp3/internal/e/b;
 
-.field public static final enum ccM:Lokhttp3/internal/e/b;
+.field public static final enum ccg:Lokhttp3/internal/e/b;
 
-.field public static final enum ccN:Lokhttp3/internal/e/b;
+.field public static final enum cch:Lokhttp3/internal/e/b;
 
-.field public static final enum ccO:Lokhttp3/internal/e/b;
+.field public static final enum cci:Lokhttp3/internal/e/b;
 
-.field public static final enum ccP:Lokhttp3/internal/e/b;
+.field public static final enum ccj:Lokhttp3/internal/e/b;
 
-.field private static final synthetic ccQ:[Lokhttp3/internal/e/b;
+.field private static final synthetic cck:[Lokhttp3/internal/e/b;
 
 
 # instance fields
@@ -54,7 +55,7 @@
 
     invoke-direct {v0, v1, v2, v2}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccF:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->cbZ:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -64,7 +65,7 @@
 
     invoke-direct {v0, v1, v3, v3}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->cca:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -74,7 +75,7 @@
 
     invoke-direct {v0, v1, v4, v4}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccH:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->ccb:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -84,7 +85,7 @@
 
     invoke-direct {v0, v1, v5, v5}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccI:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->ccc:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -96,7 +97,7 @@
 
     invoke-direct {v0, v1, v6, v7}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccJ:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->ccd:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -108,7 +109,7 @@
 
     invoke-direct {v0, v1, v8, v9}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->cce:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -120,7 +121,7 @@
 
     invoke-direct {v0, v1, v10, v11}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccL:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->ccf:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -130,7 +131,7 @@
 
     invoke-direct {v0, v1, v7, v12}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccM:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->ccg:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -140,7 +141,7 @@
 
     invoke-direct {v0, v1, v9, v13}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccN:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->cch:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -150,7 +151,7 @@
 
     invoke-direct {v0, v1, v11, v14}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccO:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->cci:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -160,55 +161,55 @@
 
     invoke-direct {v0, v1, v12, v14}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccP:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->ccj:Lokhttp3/internal/e/b;
 
     new-array v0, v13, [Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccF:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cbZ:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cca:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccH:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccb:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccI:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccc:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccJ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccd:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cce:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccL:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccf:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccM:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccg:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccN:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cch:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccO:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cci:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v11
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccP:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccj:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v12
 
-    sput-object v0, Lokhttp3/internal/e/b;->ccQ:[Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->cck:[Lokhttp3/internal/e/b;
 
     return-void
 .end method
@@ -278,7 +279,7 @@
 .method public static values()[Lokhttp3/internal/e/b;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccQ:[Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->cck:[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 40a5730671..aa31b6b042 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/c.smali
@@ -1,27 +1,28 @@
 .class public final Lokhttp3/internal/e/c;
 .super Ljava/lang/Object;
+.source "Header.java"
 
 
 # static fields
-.field public static final ccR:Lokio/ByteString;
+.field public static final ccl:Lokio/ByteString;
 
-.field public static final ccS:Lokio/ByteString;
+.field public static final ccm:Lokio/ByteString;
 
-.field public static final ccT:Lokio/ByteString;
+.field public static final ccn:Lokio/ByteString;
 
-.field public static final ccU:Lokio/ByteString;
+.field public static final cco:Lokio/ByteString;
 
-.field public static final ccV:Lokio/ByteString;
+.field public static final ccp:Lokio/ByteString;
 
-.field public static final ccW:Lokio/ByteString;
+.field public static final ccq:Lokio/ByteString;
 
 
 # instance fields
-.field public final ccX:Lokio/ByteString;
+.field public final ccr:Lokio/ByteString;
 
-.field public final ccY:Lokio/ByteString;
+.field public final ccs:Lokio/ByteString;
 
-.field final ccZ:I
+.field final cct:I
 
 
 # direct methods
@@ -34,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->ccR:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->ccl:Lokio/ByteString;
 
     const-string v0, ":status"
 
@@ -42,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v0, ":method"
 
@@ -50,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->ccT:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->ccn:Lokio/ByteString;
 
     const-string v0, ":path"
 
@@ -58,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->ccU:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->cco:Lokio/ByteString;
 
     const-string v0, ":scheme"
 
@@ -66,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->ccV:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->ccp:Lokio/ByteString;
 
     const-string v0, ":authority"
 
@@ -74,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->ccW:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->ccq:Lokio/ByteString;
 
     return-void
 .end method
@@ -112,9 +113,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -128,7 +129,7 @@
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lokhttp3/internal/e/c;->ccZ:I
+    iput p1, p0, Lokhttp3/internal/e/c;->cct:I
 
     return-void
 .end method
@@ -142,13 +143,13 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     check-cast p1, Lokhttp3/internal/e/c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
-    iget-object v2, p1, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v2, p1, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
     invoke-virtual {v0, v2}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -156,9 +157,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
     invoke-virtual {v0, p1}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -172,12 +173,15 @@
 
     :cond_0
     return v1
+
+    :cond_1
+    return v1
 .end method
 
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
     invoke-virtual {v0}, Lokio/ByteString;->hashCode()I
 
@@ -187,7 +191,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
     invoke-virtual {v1}, Lokio/ByteString;->hashCode()I
 
@@ -207,9 +211,9 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v2, p0, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
-    invoke-virtual {v2}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Jj()Ljava/lang/String;
 
     move-result-object v2
 
@@ -217,9 +221,9 @@
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v2, p0, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
-    invoke-virtual {v2}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Jj()Ljava/lang/String;
 
     move-result-object v2
 
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 8871a392b8..de99ef0228 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/d$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/d$a;
 .super Ljava/lang/Object;
+.source "Hpack.java"
 
 
 # annotations
@@ -14,9 +15,15 @@
 
 
 # instance fields
-.field private final caE:Lokio/d;
+.field private final bZY:Lokio/d;
 
-.field private final cdc:Ljava/util/List;
+.field ccA:I
+
+.field ccB:I
+
+.field ccC:I
+
+.field private final ccw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,17 +33,11 @@
     .end annotation
 .end field
 
-.field private final cdd:I
+.field private final ccx:I
 
-.field private cde:I
+.field private ccy:I
 
-.field cdf:[Lokhttp3/internal/e/c;
-
-.field cdg:I
-
-.field cdh:I
-
-.field cdi:I
+.field ccz:[Lokhttp3/internal/e/c;
 
 
 # direct methods
@@ -49,39 +50,39 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->ccw:Ljava/util/List;
 
     const/16 p1, 0x8
 
     new-array p1, p1, [Lokhttp3/internal/e/c;
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
-    iget-object p1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     array-length p1, p1
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cdh:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
     const/16 p1, 0x1000
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cdd:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccx:I
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cde:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccy:I
 
     invoke-static {p3}, Lokio/j;->b(Lokio/q;)Lokio/d;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->caE:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bZY:Lokio/d;
 
     return-void
 .end method
@@ -96,63 +97,57 @@
     return-void
 .end method
 
-.method private If()V
+.method private Ie()V
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->cde:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->ccy:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
     if-ge v0, v1, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->cde:I
-
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ig()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->If()V
 
     return-void
 
     :cond_0
-    iget v0, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    sub-int/2addr v1, v0
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cde:I
-
-    sub-int/2addr v0, v1
-
-    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$a;->ff(I)I
+    invoke-direct {p0, v1}, Lokhttp3/internal/e/d$a;->ff(I)I
 
     :cond_1
     return-void
 .end method
 
-.method private Ig()V
+.method private If()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->ccz:[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;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->cdh:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
     return-void
 .end method
 
-.method private Ij()I
+.method private Ii()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -160,7 +155,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -171,7 +166,7 @@
     return v0
 .end method
 
-.method private Ik()Lokio/ByteString;
+.method private Ij()Lokio/ByteString;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -179,7 +174,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ii()I
 
     move-result v0
 
@@ -205,11 +200,11 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lokhttp3/internal/e/k;->IC()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->IB()Lokhttp3/internal/e/k;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->caE:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bZY:Lokio/d;
 
     int-to-long v3, v0
 
@@ -228,7 +223,7 @@
     return-object v0
 
     :cond_1
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->caE:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bZY:Lokio/d;
 
     int-to-long v2, v0
 
@@ -242,144 +237,134 @@
 .method private a(Lokhttp3/internal/e/c;)V
     .locals 6
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->ccw:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget v0, p1, Lokhttp3/internal/e/c;->ccZ:I
+    iget v0, p1, Lokhttp3/internal/e/c;->cct:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cde:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->ccy:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ig()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->If()V
 
     return-void
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
-    add-int/2addr v1, v0
+    add-int/2addr v2, v0
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->cde:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v1, v2
+    invoke-direct {p0, v2}, Lokhttp3/internal/e/d$a;->ff(I)I
 
-    invoke-direct {p0, v1}, Lokhttp3/internal/e/d$a;->ff(I)I
-
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cdh:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-le v1, v2, :cond_1
+    if-le v1, v3, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
-
-    array-length v1, v1
+    array-length v1, v2
 
     mul-int/lit8 v1, v1, 0x2
 
     new-array v1, v1, [Lokhttp3/internal/e/c;
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
-
     const/4 v3, 0x0
 
-    iget-object v4, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    array-length v4, v2
 
-    array-length v4, v4
-
-    iget-object v5, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
-
-    array-length v5, v5
+    array-length v5, v2
 
     invoke-static {v2, v3, v1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->cdh:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cdh:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
     return-void
 .end method
 
 .method private ff(I)I
-    .locals 5
+    .locals 4
 
     const/4 v0, 0x0
 
     if-lez p1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->ccZ:I
+    iget v2, v2, Lokhttp3/internal/e/c;->cct:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->ccZ:I
+    iget v3, v3, Lokhttp3/internal/e/c;->cct:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->cdi:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->ccC:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->cdh:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->cdh:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -388,29 +373,25 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->ccA:I
+
+    add-int/lit8 v2, v1, 0x1
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iget v3, p0, Lokhttp3/internal/e/d$a;->ccB:I
 
-    add-int/lit8 v3, v3, 0x1
+    invoke-static {p1, v2, p1, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    add-int/2addr v3, v0
-
-    iget v4, p0, Lokhttp3/internal/e/d$a;->cdh:I
-
-    invoke-static {p1, v1, v2, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget p1, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
     :cond_1
     return v0
@@ -419,7 +400,7 @@
 .method private fg(I)I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->cdg:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->ccA:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -442,17 +423,16 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     aget-object p1, v0, p1
 
-    :goto_0
-    iget-object p1, p1, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
     return-object p1
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
@@ -464,17 +444,17 @@
 
     if-ltz v0, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_1
+    if-ge v0, v2, :cond_1
 
-    iget-object p1, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    aget-object p1, v1, v0
 
-    aget-object p1, p1, v0
+    iget-object p1, p1, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
-    goto :goto_0
+    return-object p1
 
     :cond_1
     new-instance v0, Ljava/io/IOException;
@@ -503,7 +483,7 @@
 
     if-ltz p0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
@@ -539,7 +519,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ii()I
 
     move-result v0
 
@@ -567,7 +547,7 @@
 
 
 # virtual methods
-.method final Ih()V
+.method final Ig()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -576,15 +556,15 @@
     .end annotation
 
     :goto_0
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IZ()Z
+    invoke-interface {v0}, Lokio/d;->IY()Z
 
     move-result v0
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -614,18 +594,18 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     aget-object v0, v1, v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->ccw: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;->cda:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
@@ -637,15 +617,13 @@
 
     if-ltz v1, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->ccz:[Lokhttp3/internal/e/c;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_1
+    if-ge v1, v3, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
-
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->ccw:Ljava/util/List;
 
     aget-object v1, v2, v1
 
@@ -679,7 +657,7 @@
 
     if-ne v0, v1, :cond_3
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ik()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()Lokio/ByteString;
 
     move-result-object v0
 
@@ -687,7 +665,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ik()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()Lokio/ByteString;
 
     move-result-object v1
 
@@ -695,7 +673,6 @@
 
     invoke-direct {v2, v0, v1}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Lokio/ByteString;)V
 
-    :goto_1
     invoke-direct {p0, v2}, Lokhttp3/internal/e/d$a;->a(Lokhttp3/internal/e/c;)V
 
     goto :goto_0
@@ -717,7 +694,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ik()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()Lokio/ByteString;
 
     move-result-object v1
 
@@ -725,7 +702,9 @@
 
     invoke-direct {v2, v0, v1}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Lokio/ByteString;)V
 
-    goto :goto_1
+    invoke-direct {p0, v2}, Lokhttp3/internal/e/d$a;->a(Lokhttp3/internal/e/c;)V
+
+    goto/16 :goto_0
 
     :cond_4
     and-int/lit8 v1, v0, 0x20
@@ -740,19 +719,17 @@
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->cde:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->ccy:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->cde:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->ccy:I
 
     if-ltz v0, :cond_5
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->cde:I
-
-    iget v1, p0, Lokhttp3/internal/e/d$a;->cdd:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->ccx:I
 
     if-gt v0, v1, :cond_5
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->If()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ie()V
 
     goto/16 :goto_0
 
@@ -765,7 +742,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->cde:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->ccy:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -784,7 +761,7 @@
 
     if-nez v0, :cond_7
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_7
     const/16 v1, 0xf
@@ -799,21 +776,23 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ik()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->ccw:Ljava/util/List;
 
     new-instance v3, Lokhttp3/internal/e/c;
 
     invoke-direct {v3, v0, v1}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Lokio/ByteString;)V
 
-    goto :goto_3
+    invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto/16 :goto_0
 
     :cond_8
-    :goto_2
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ik()Lokio/ByteString;
+    :goto_1
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()Lokio/ByteString;
 
     move-result-object v0
 
@@ -821,17 +800,16 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ik()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ij()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->ccw:Ljava/util/List;
 
     new-instance v3, Lokhttp3/internal/e/c;
 
     invoke-direct {v3, v0, v1}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Lokio/ByteString;)V
 
-    :goto_3
     invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto/16 :goto_0
@@ -849,7 +827,7 @@
     return-void
 .end method
 
-.method public final Ii()Ljava/util/List;
+.method public final Ih()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -862,11 +840,11 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->ccw:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->cdc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->ccw: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 96b650231a..12845dbd24 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/d$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/d$b.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/d$b;
 .super Ljava/lang/Object;
+.source "Hpack.java"
 
 
 # annotations
@@ -14,25 +15,25 @@
 
 
 # instance fields
-.field cdd:I
+.field ccA:I
 
-.field cde:I
+.field ccB:I
 
-.field cdf:[Lokhttp3/internal/e/c;
+.field ccC:I
 
-.field cdg:I
+.field private final ccD:Lokio/c;
 
-.field cdh:I
+.field private final ccE:Z
 
-.field cdi:I
+.field private ccF:I
 
-.field private final cdj:Lokio/c;
+.field private ccG:Z
 
-.field private final cdk:Z
+.field ccx:I
 
-.field private cdl:I
+.field ccy:I
 
-.field private cdm:Z
+.field ccz:[Lokhttp3/internal/e/c;
 
 
 # direct methods
@@ -53,15 +54,15 @@
 
     const p2, 0x7fffffff
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->cdl:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->ccF:I
 
     const/16 p2, 0x8
 
     new-array p2, p2, [Lokhttp3/internal/e/c;
 
-    iput-object p2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iput-object p2, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     array-length p2, p2
 
@@ -69,49 +70,49 @@
 
     sub-int/2addr p2, v0
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
     const/16 p2, 0x1000
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->cdd:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->ccx:I
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->cde:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->ccy:I
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->cdk:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->ccE:Z
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$b;->cdj:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
 
     return-void
 .end method
 
-.method private Ig()V
+.method private If()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->ccz:[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;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
     return-void
 .end method
@@ -119,91 +120,81 @@
 .method private b(Lokhttp3/internal/e/c;)V
     .locals 6
 
-    iget v0, p1, Lokhttp3/internal/e/c;->ccZ:I
+    iget v0, p1, Lokhttp3/internal/e/c;->cct:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->cde:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->ccy:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Ig()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->If()V
 
     return-void
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
-    add-int/2addr v1, v0
+    add-int/2addr v2, v0
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->cde:I
+    sub-int/2addr v2, v1
 
-    sub-int/2addr v1, v2
+    invoke-direct {p0, v2}, Lokhttp3/internal/e/d$b;->ff(I)I
 
-    invoke-direct {p0, v1}, Lokhttp3/internal/e/d$b;->ff(I)I
-
-    iget v1, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-le v1, v2, :cond_1
+    if-le v1, v3, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
-
-    array-length v1, v1
+    array-length v1, v2
 
     mul-int/lit8 v1, v1, 0x2
 
     new-array v1, v1, [Lokhttp3/internal/e/c;
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
-
     const/4 v3, 0x0
 
-    iget-object v4, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    array-length v4, v2
 
-    array-length v4, v4
-
-    iget-object v5, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
-
-    array-length v5, v5
+    array-length v5, v2
 
     invoke-static {v2, v3, v1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
     return-void
 .end method
@@ -216,13 +207,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->cdk:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->ccE:Z
 
     const/16 v1, 0x7f
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lokhttp3/internal/e/k;->IC()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->IB()Lokhttp3/internal/e/k;
 
     invoke-static {p1}, Lokhttp3/internal/e/k;->c(Lokio/ByteString;)I
 
@@ -238,11 +229,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    invoke-static {}, Lokhttp3/internal/e/k;->IC()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->IB()Lokhttp3/internal/e/k;
 
     invoke-static {p1, v0}, Lokhttp3/internal/e/k;->a(Lokio/ByteString;Lokio/BufferedSink;)V
 
-    invoke-virtual {v0}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Ij()Lokio/ByteString;
 
     move-result-object p1
 
@@ -252,10 +243,9 @@
 
     const/16 v2, 0x80
 
-    :goto_0
     invoke-direct {p0, v0, v1, v2}, Lokhttp3/internal/e/d$b;->q(III)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->cdj:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->g(Lokio/ByteString;)Lokio/c;
 
@@ -268,54 +258,60 @@
 
     const/4 v2, 0x0
 
-    goto :goto_0
+    invoke-direct {p0, v0, v1, v2}, Lokhttp3/internal/e/d$b;->q(III)V
+
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
+
+    invoke-virtual {v0, p1}, Lokio/c;->g(Lokio/ByteString;)Lokio/c;
+
+    return-void
 .end method
 
 .method private ff(I)I
-    .locals 5
+    .locals 4
 
     const/4 v0, 0x0
 
     if-lez p1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->ccZ:I
+    iget v2, v2, Lokhttp3/internal/e/c;->cct:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->ccZ:I
+    iget v3, v3, Lokhttp3/internal/e/c;->cct:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -324,45 +320,39 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->ccA:I
+
+    add-int/lit8 v2, v1, 0x1
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iget v3, p0, Lokhttp3/internal/e/d$b;->ccB:I
 
-    add-int/lit8 v3, v3, 0x1
+    invoke-static {p1, v2, p1, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    add-int/2addr v3, v0
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
-    iget v4, p0, Lokhttp3/internal/e/d$b;->cdh:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
-    invoke-static {p1, v1, v2, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget-object p1, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
-
-    iget v1, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    add-int/lit8 v2, v1, 0x1
 
     add-int/lit8 v1, v1, 0x1
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->cdg:I
-
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/2addr v2, v0
+    add-int/2addr v1, v0
 
     const/4 v3, 0x0
 
-    invoke-static {p1, v1, v2, v3}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
+    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;->cdg:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     :cond_1
     return v0
@@ -373,17 +363,16 @@
 
     if-ge p1, p2, :cond_0
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->cdj:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
 
     or-int/2addr p1, p3
 
-    :goto_0
     invoke-virtual {p2, p1}, Lokio/c;->fs(I)Lokio/c;
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->cdj:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
 
     or-int/2addr p3, p2
 
@@ -391,14 +380,14 @@
 
     sub-int/2addr p1, p2
 
-    :goto_1
+    :goto_0
     const/16 p2, 0x80
 
     if-lt p1, p2, :cond_1
 
     and-int/lit8 p3, p1, 0x7f
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->cdj:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
 
     or-int/2addr p2, p3
 
@@ -406,12 +395,14 @@
 
     ushr-int/lit8 p1, p1, 0x7
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->cdj:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
 
-    goto :goto_0
+    invoke-virtual {p2, p1}, Lokio/c;->fs(I)Lokio/c;
+
+    return-void
 .end method
 
 
@@ -433,15 +424,15 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->cdm:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->ccG:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cdl:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->ccF:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->cde:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->ccy:I
 
     const/16 v3, 0x20
 
@@ -449,18 +440,16 @@
 
     if-ge v0, v2, :cond_0
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cdl:I
-
     invoke-direct {p0, v0, v4, v3}, Lokhttp3/internal/e/d$b;->q(III)V
 
     :cond_0
-    iput-boolean v1, p0, Lokhttp3/internal/e/d$b;->cdm:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/d$b;->ccG:Z
 
     const v0, 0x7fffffff
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->cdl:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->ccF:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cde:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->ccy:I
 
     invoke-direct {p0, v0, v4, v3}, Lokhttp3/internal/e/d$b;->q(III)V
 
@@ -480,15 +469,15 @@
 
     check-cast v3, Lokhttp3/internal/e/c;
 
-    iget-object v4, v3, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v4, v3, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Jp()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/ByteString;->Jo()Lokio/ByteString;
 
     move-result-object v4
 
-    iget-object v5, v3, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v5, v3, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
-    sget-object v6, Lokhttp3/internal/e/d;->cdb:Ljava/util/Map;
+    sget-object v6, Lokhttp3/internal/e/d;->ccv:Ljava/util/Map;
 
     invoke-interface {v6, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -514,13 +503,13 @@
 
     if-ge v6, v9, :cond_3
 
-    sget-object v9, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     add-int/lit8 v10, v6, -0x1
 
     aget-object v9, v9, v10
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
     invoke-static {v9, v5}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -533,11 +522,11 @@
     goto :goto_1
 
     :cond_2
-    sget-object v9, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     aget-object v9, v9, v6
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
     invoke-static {v9, v5}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -570,22 +559,22 @@
     :goto_1
     if-ne v6, v7, :cond_7
 
-    iget v10, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iget v10, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     add-int/2addr v10, v8
 
-    iget-object v8, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v8, p0, Lokhttp3/internal/e/d$b;->ccz:[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;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
     invoke-static {v11, v4}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -593,11 +582,11 @@
 
     if-eqz v11, :cond_6
 
-    iget-object v11, p0, Lokhttp3/internal/e/d$b;->cdf:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->ccz:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
     invoke-static {v11, v5}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -605,11 +594,11 @@
 
     if-eqz v11, :cond_5
 
-    iget v6, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iget v6, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     sub-int/2addr v10, v6
 
-    sget-object v6, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v6, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     array-length v6, v6
 
@@ -620,11 +609,11 @@
     :cond_5
     if-ne v9, v7, :cond_6
 
-    iget v9, p0, Lokhttp3/internal/e/d$b;->cdg:I
+    iget v9, p0, Lokhttp3/internal/e/d$b;->ccA:I
 
     sub-int v9, v10, v9
 
-    sget-object v11, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v11, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     array-length v11, v11
 
@@ -645,28 +634,27 @@
 
     invoke-direct {p0, v6, v3, v4}, Lokhttp3/internal/e/d$b;->q(III)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
     const/16 v6, 0x40
 
     if-ne v9, v7, :cond_9
 
-    iget-object v7, p0, Lokhttp3/internal/e/d$b;->cdj:Lokio/c;
+    iget-object v7, p0, Lokhttp3/internal/e/d$b;->ccD:Lokio/c;
 
     invoke-virtual {v7, v6}, Lokio/c;->fs(I)Lokio/c;
 
     invoke-direct {p0, v4}, Lokhttp3/internal/e/d$b;->b(Lokio/ByteString;)V
 
-    :goto_4
     invoke-direct {p0, v5}, Lokhttp3/internal/e/d$b;->b(Lokio/ByteString;)V
 
     invoke-direct {p0, v3}, Lokhttp3/internal/e/d$b;->b(Lokhttp3/internal/e/c;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
-    sget-object v7, Lokhttp3/internal/e/c;->ccR:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->ccl:Lokio/ByteString;
 
     invoke-virtual {v7}, Lokio/ByteString;->size()I
 
@@ -678,7 +666,7 @@
 
     if-eqz v7, :cond_a
 
-    sget-object v7, Lokhttp3/internal/e/c;->ccW:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->ccq:Lokio/ByteString;
 
     invoke-virtual {v7, v4}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -692,16 +680,18 @@
 
     invoke-direct {p0, v5}, Lokhttp3/internal/e/d$b;->b(Lokio/ByteString;)V
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_a
     const/16 v4, 0x3f
 
     invoke-direct {p0, v9, v4, v6}, Lokhttp3/internal/e/d$b;->q(III)V
 
-    goto :goto_4
+    invoke-direct {p0, v5}, Lokhttp3/internal/e/d$b;->b(Lokio/ByteString;)V
 
-    :goto_5
+    invoke-direct {p0, v3}, Lokhttp3/internal/e/d$b;->b(Lokhttp3/internal/e/c;)V
+
+    :goto_4
     add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_0
@@ -713,7 +703,7 @@
 .method final fj(I)V
     .locals 1
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->cdd:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->ccx:I
 
     const/16 v0, 0x4000
 
@@ -721,54 +711,46 @@
 
     move-result p1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cde:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->ccy:I
 
     if-ne v0, p1, :cond_0
 
     return-void
 
     :cond_0
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cde:I
-
     if-ge p1, v0, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cdl:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->ccF:I
 
     invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->cdl:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->ccF:I
 
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->cdm:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->ccG:Z
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->cde:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->ccy:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->cde:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->ccy:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->ccC:I
 
     if-ge p1, v0, :cond_3
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->cde:I
-
     if-nez p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Ig()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->If()V
 
     return-void
 
     :cond_2
-    iget p1, p0, Lokhttp3/internal/e/d$b;->cdi:I
+    sub-int/2addr v0, p1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->cde:I
-
-    sub-int/2addr p1, v0
-
-    invoke-direct {p0, p1}, Lokhttp3/internal/e/d$b;->ff(I)I
+    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$b;->ff(I)I
 
     :cond_3
     return-void
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/d.smali b/com.discord/smali_classes2/okhttp3/internal/e/d.smali
index 9732a6ab28..63e03cbffb 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/d.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/d;
 .super Ljava/lang/Object;
+.source "Hpack.java"
 
 
 # annotations
@@ -12,9 +13,9 @@
 
 
 # static fields
-.field static final cda:[Lokhttp3/internal/e/c;
+.field static final ccu:[Lokhttp3/internal/e/c;
 
-.field static final cdb:Ljava/util/Map;
+.field static final ccv:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -36,7 +37,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v2, Lokhttp3/internal/e/c;->ccW:Lokio/ByteString;
+    sget-object v2, Lokhttp3/internal/e/c;->ccq:Lokio/ByteString;
 
     const-string v3, ""
 
@@ -48,7 +49,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccT:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccn:Lokio/ByteString;
 
     const-string v4, "GET"
 
@@ -60,7 +61,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccT:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccn:Lokio/ByteString;
 
     const-string v4, "POST"
 
@@ -72,7 +73,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccU:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->cco:Lokio/ByteString;
 
     const-string v4, "/"
 
@@ -84,7 +85,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccU:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->cco:Lokio/ByteString;
 
     const-string v4, "/index.html"
 
@@ -96,7 +97,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccV:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccp:Lokio/ByteString;
 
     const-string v4, "http"
 
@@ -108,7 +109,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccV:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccp:Lokio/ByteString;
 
     const-string v4, "https"
 
@@ -120,7 +121,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v4, "200"
 
@@ -132,7 +133,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v4, "204"
 
@@ -144,7 +145,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v4, "206"
 
@@ -156,7 +157,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v4, "304"
 
@@ -168,7 +169,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v4, "400"
 
@@ -180,7 +181,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v4, "404"
 
@@ -192,7 +193,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v3, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     const-string v4, "500"
 
@@ -766,28 +767,26 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sput-object v0, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
-    sget-object v1, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->ccu:[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;->cda:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
-    array-length v1, v1
+    array-length v3, v1
 
-    if-ge v2, v1, :cond_1
-
-    sget-object v1, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    if-ge v2, v3, :cond_1
 
     aget-object v1, v1, v2
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -795,11 +794,11 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/d;->cda:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->ccu:[Lokhttp3/internal/e/c;
 
     aget-object v1, v1, v2
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -817,7 +816,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/d;->cdb:Ljava/util/Map;
+    sput-object v0, Lokhttp3/internal/e/d;->ccv:Ljava/util/Map;
 
     return-void
 .end method
@@ -862,7 +861,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Jj()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 a33baf4d1a..6b785f8202 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/e.smali
@@ -1,15 +1,16 @@
 .class public final Lokhttp3/internal/e/e;
 .super Ljava/lang/Object;
+.source "Http2.java"
 
 
 # static fields
-.field static final cdn:Lokio/ByteString;
+.field static final ccH:Lokio/ByteString;
 
-.field private static final cdo:[Ljava/lang/String;
+.field private static final ccI:[Ljava/lang/String;
 
-.field static final cdp:[Ljava/lang/String;
+.field static final ccJ:[Ljava/lang/String;
 
-.field static final cdq:[Ljava/lang/String;
+.field static final ccK:[Ljava/lang/String;
 
 
 # direct methods
@@ -22,7 +23,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/e;->cdn:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/e;->ccH:Lokio/ByteString;
 
     const/16 v0, 0xa
 
@@ -88,34 +89,32 @@
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lokhttp3/internal/e/e;->cdo:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->ccI:[Ljava/lang/String;
 
     const/16 v0, 0x40
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     const/16 v0, 0x100
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->cdq:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->ccK:[Ljava/lang/String;
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v1, Lokhttp3/internal/e/e;->cdq:[Ljava/lang/String;
+    sget-object v1, Lokhttp3/internal/e/e;->ccK:[Ljava/lang/String;
 
-    array-length v1, v1
+    array-length v7, v1
 
-    const/16 v7, 0x20
+    const/16 v8, 0x20
 
-    if-ge v0, v1, :cond_0
+    if-ge v0, v7, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/e;->cdq:[Ljava/lang/String;
-
-    const-string v8, "%8s"
+    const-string v7, "%8s"
 
     new-array v9, v3, [Ljava/lang/Object;
 
@@ -125,13 +124,13 @@
 
     aput-object v10, v9, v2
 
-    invoke-static {v8, v9}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v7, v9}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
     const/16 v9, 0x30
 
-    invoke-virtual {v8, v7, v9}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
+    invoke-virtual {v7, v8, v9}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
 
     move-result-object v7
 
@@ -142,36 +141,32 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     const-string v1, ""
 
     aput-object v1, v0, v2
 
-    sget-object v0, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
-
     const-string v1, "END_STREAM"
 
     aput-object v1, v0, v3
 
-    new-array v0, v3, [I
+    new-array v1, v3, [I
 
-    aput v3, v0, v2
-
-    sget-object v1, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    aput v3, v1, v2
 
     const-string v3, "PADDED"
 
-    aput-object v3, v1, v6
+    aput-object v3, v0, v6
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
-    if-gtz v1, :cond_1
+    if-gtz v0, :cond_1
 
-    aget v3, v0, v1
+    aget v3, v1, v0
 
-    sget-object v8, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     or-int/lit8 v9, v3, 0x8
 
@@ -179,7 +174,7 @@
 
     invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v11, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v11, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     aget-object v3, v11, v3
 
@@ -193,52 +188,48 @@
 
     move-result-object v3
 
-    aput-object v3, v8, v9
+    aput-object v3, v7, v9
 
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v0, v0, 0x1
 
     goto :goto_1
 
     :cond_1
-    sget-object v1, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     const-string v3, "END_HEADERS"
 
-    aput-object v3, v1, v5
-
-    sget-object v1, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    aput-object v3, v0, v5
 
     const-string v3, "PRIORITY"
 
-    aput-object v3, v1, v7
-
-    sget-object v1, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    aput-object v3, v0, v8
 
     const/16 v3, 0x24
 
     const-string v5, "END_HEADERS|PRIORITY"
 
-    aput-object v5, v1, v3
+    aput-object v5, v0, v3
 
-    new-array v1, v4, [I
+    new-array v0, v4, [I
 
-    fill-array-data v1, :array_0
+    fill-array-data v0, :array_0
 
     const/4 v3, 0x0
 
     :goto_2
     if-ge v3, v4, :cond_3
 
-    aget v5, v1, v3
+    aget v5, v0, v3
 
     const/4 v7, 0x0
 
     :goto_3
     if-gtz v7, :cond_2
 
-    aget v8, v0, v7
+    aget v8, v1, v7
 
-    sget-object v9, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v9, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     or-int v10, v8, v5
 
@@ -246,7 +237,7 @@
 
     invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v12, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v12, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     aget-object v12, v12, v8
 
@@ -256,7 +247,7 @@
 
     invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v13, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     aget-object v13, v13, v5
 
@@ -268,7 +259,7 @@
 
     aput-object v11, v9, v10
 
-    sget-object v9, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v9, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     or-int/2addr v10, v6
 
@@ -276,7 +267,7 @@
 
     invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v13, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     aget-object v8, v13, v8
 
@@ -284,7 +275,7 @@
 
     invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v8, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v8, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
     aget-object v8, v8, v5
 
@@ -311,21 +302,17 @@
 
     :cond_3
     :goto_4
-    sget-object v0, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-ge v2, v0, :cond_5
+    if-ge v2, v1, :cond_5
 
-    sget-object v0, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    aget-object v1, v0, v2
 
-    aget-object v0, v0, v2
+    if-nez v1, :cond_4
 
-    if-nez v0, :cond_4
-
-    sget-object v0, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
-
-    sget-object v1, Lokhttp3/internal/e/e;->cdq:[Ljava/lang/String;
+    sget-object v1, Lokhttp3/internal/e/e;->ccK:[Ljava/lang/String;
 
     aget-object v1, v1, v2
 
@@ -358,17 +345,15 @@
 .method static a(ZIIBB)Ljava/lang/String;
     .locals 6
 
-    sget-object v0, Lokhttp3/internal/e/e;->cdo:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->ccI:[Ljava/lang/String;
 
-    array-length v0, v0
+    array-length v1, v0
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    if-ge p3, v0, :cond_0
-
-    sget-object v0, Lokhttp3/internal/e/e;->cdo:[Ljava/lang/String;
+    if-ge p3, v1, :cond_0
 
     aget-object v0, v0, p3
 
@@ -377,71 +362,69 @@
     :cond_0
     const-string v0, "0x%02x"
 
-    new-array v3, v2, [Ljava/lang/Object;
+    new-array v1, v3, [Ljava/lang/Object;
 
     invoke-static {p3}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
 
     move-result-object v4
 
-    aput-object v4, v3, v1
+    aput-object v4, v1, v2
 
-    invoke-static {v0, v3}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v1}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     :goto_0
-    const/4 v3, 0x5
+    const/4 v1, 0x5
 
     if-nez p4, :cond_1
 
     const-string p3, ""
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_1
     packed-switch p3, :pswitch_data_0
 
     :pswitch_0
-    sget-object v4, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    sget-object v4, Lokhttp3/internal/e/e;->ccJ:[Ljava/lang/String;
 
-    array-length v4, v4
+    array-length v5, v4
 
-    if-ge p4, v4, :cond_3
-
-    sget-object v4, Lokhttp3/internal/e/e;->cdp:[Ljava/lang/String;
+    if-ge p4, v5, :cond_3
 
     aget-object v4, v4, p4
 
     goto :goto_1
 
     :pswitch_1
-    if-ne p4, v2, :cond_2
+    if-ne p4, v3, :cond_2
 
     const-string p3, "ACK"
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
-    sget-object p3, Lokhttp3/internal/e/e;->cdq:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->ccK:[Ljava/lang/String;
 
     aget-object p3, p3, p4
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_2
-    sget-object p3, Lokhttp3/internal/e/e;->cdq:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->ccK:[Ljava/lang/String;
 
     aget-object p3, p3, p4
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_3
-    sget-object v4, Lokhttp3/internal/e/e;->cdq:[Ljava/lang/String;
+    sget-object v4, Lokhttp3/internal/e/e;->ccK:[Ljava/lang/String;
 
     aget-object v4, v4, p4
 
     :goto_1
-    if-ne p3, v3, :cond_4
+    if-ne p3, v1, :cond_4
 
     and-int/lit8 v5, p4, 0x4
 
@@ -451,12 +434,11 @@
 
     const-string p4, "PUSH_PROMISE"
 
-    :goto_2
     invoke-virtual {v4, p3, p4}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
 
     move-result-object p3
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_4
     if-nez p3, :cond_5
@@ -469,33 +451,37 @@
 
     const-string p4, "COMPRESSED"
 
+    invoke-virtual {v4, p3, p4}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
+
+    move-result-object p3
+
     goto :goto_2
 
     :cond_5
     move-object p3, v4
 
-    :goto_3
+    :goto_2
     const-string p4, "%s 0x%08x %5d %-13s %s"
 
-    new-array v3, v3, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
     if-eqz p0, :cond_6
 
     const-string p0, "<<"
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     const-string p0, ">>"
 
-    :goto_4
-    aput-object p0, v3, v1
+    :goto_3
+    aput-object p0, v1, v2
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p0
 
-    aput-object p0, v3, v2
+    aput-object p0, v1, v3
 
     const/4 p0, 0x2
 
@@ -503,17 +489,17 @@
 
     move-result-object p1
 
-    aput-object p1, v3, p0
+    aput-object p1, v1, p0
 
     const/4 p0, 0x3
 
-    aput-object v0, v3, p0
+    aput-object v0, v1, p0
 
     const/4 p0, 0x4
 
-    aput-object p3, v3, p0
+    aput-object p3, v1, p0
 
-    invoke-static {p4, v3}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p4, v1}, Lokhttp3/internal/c;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
 
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 01e3604403..bdeb787802 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/f$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/f$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/f$a;
 .super Lokio/f;
+.source "Http2Codec.java"
 
 
 # annotations
@@ -14,28 +15,28 @@
 
 
 # instance fields
-.field ccz:J
+.field cbT:J
 
-.field cdE:Z
+.field ccY:Z
 
-.field final synthetic cdF:Lokhttp3/internal/e/f;
+.field final synthetic ccZ:Lokhttp3/internal/e/f;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/f;Lokio/q;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/f$a;->cdF:Lokhttp3/internal/e/f;
+    iput-object p1, p0, Lokhttp3/internal/e/f$a;->ccZ:Lokhttp3/internal/e/f;
 
     invoke-direct {p0, p2}, Lokio/f;-><init>(Lokio/q;)V
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->cdE:Z
+    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->ccY:Z
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->ccz:J
+    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->cbT:J
 
     return-void
 .end method
@@ -43,7 +44,7 @@
 .method private b(Ljava/io/IOException;)V
     .locals 2
 
-    iget-boolean p1, p0, Lokhttp3/internal/e/f$a;->cdE:Z
+    iget-boolean p1, p0, Lokhttp3/internal/e/f$a;->ccY:Z
 
     if-eqz p1, :cond_0
 
@@ -52,15 +53,15 @@
     :cond_0
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->cdE:Z
+    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->ccY:Z
 
-    iget-object p1, p0, Lokhttp3/internal/e/f$a;->cdF:Lokhttp3/internal/e/f;
+    iget-object p1, p0, Lokhttp3/internal/e/f$a;->ccZ:Lokhttp3/internal/e/f;
 
-    iget-object p1, p1, Lokhttp3/internal/e/f;->cct:Lokhttp3/internal/b/g;
+    iget-object p1, p1, Lokhttp3/internal/e/f;->cbN:Lokhttp3/internal/b/g;
 
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lokhttp3/internal/e/f$a;->cdF:Lokhttp3/internal/e/f;
+    iget-object v1, p0, Lokhttp3/internal/e/f$a;->ccZ:Lokhttp3/internal/e/f;
 
     invoke-virtual {p1, v0, v1}, Lokhttp3/internal/b/g;->a(ZLokhttp3/internal/c/c;)V
 
@@ -78,7 +79,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokio/f;->cgS:Lokio/q;
+    iget-object v0, p0, Lokio/f;->cgm:Lokio/q;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/q;->a(Lokio/c;J)J
 
@@ -90,13 +91,11 @@
 
     if-lez p3, :cond_0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->ccz:J
-
-    const/4 p3, 0x0
+    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->cbT:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->ccz:J
+    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->cbT: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 cc98e8f847..63f3f723b4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/f.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/e/f;
 .super Ljava/lang/Object;
+.source "Http2Codec.java"
 
 # interfaces
 .implements Lokhttp3/internal/c/c;
@@ -14,7 +15,23 @@
 
 
 # static fields
-.field private static final cdA:Ljava/util/List;
+.field private static final ccL:Lokio/ByteString;
+
+.field private static final ccM:Lokio/ByteString;
+
+.field private static final ccN:Lokio/ByteString;
+
+.field private static final ccO:Lokio/ByteString;
+
+.field private static final ccP:Lokio/ByteString;
+
+.field private static final ccQ:Lokio/ByteString;
+
+.field private static final ccR:Lokio/ByteString;
+
+.field private static final ccS:Lokio/ByteString;
+
+.field private static final ccT:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,23 +41,7 @@
     .end annotation
 .end field
 
-.field private static final cdr:Lokio/ByteString;
-
-.field private static final cds:Lokio/ByteString;
-
-.field private static final cdt:Lokio/ByteString;
-
-.field private static final cdu:Lokio/ByteString;
-
-.field private static final cdv:Lokio/ByteString;
-
-.field private static final cdw:Lokio/ByteString;
-
-.field private static final cdx:Lokio/ByteString;
-
-.field private static final cdy:Lokio/ByteString;
-
-.field private static final cdz:Ljava/util/List;
+.field private static final ccU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,15 +53,15 @@
 
 
 # instance fields
-.field private final cat:Lokhttp3/u;
+.field private final bZN:Lokhttp3/u;
 
-.field final cct:Lokhttp3/internal/b/g;
+.field final cbN:Lokhttp3/internal/b/g;
 
-.field private final cdB:Lokhttp3/Interceptor$Chain;
+.field private final ccV:Lokhttp3/Interceptor$Chain;
 
-.field private final cdC:Lokhttp3/internal/e/g;
+.field private final ccW:Lokhttp3/internal/e/g;
 
-.field private cdD:Lokhttp3/internal/e/i;
+.field private ccX:Lokhttp3/internal/e/i;
 
 
 # direct methods
@@ -73,7 +74,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdr:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccL:Lokio/ByteString;
 
     const-string v0, "host"
 
@@ -81,7 +82,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cds:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccM:Lokio/ByteString;
 
     const-string v0, "keep-alive"
 
@@ -89,7 +90,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdt:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccN:Lokio/ByteString;
 
     const-string v0, "proxy-connection"
 
@@ -97,7 +98,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdu:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccO:Lokio/ByteString;
 
     const-string v0, "transfer-encoding"
 
@@ -105,7 +106,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdv:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccP:Lokio/ByteString;
 
     const-string v0, "te"
 
@@ -113,7 +114,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdw:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccQ:Lokio/ByteString;
 
     const-string v0, "encoding"
 
@@ -121,7 +122,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdx:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccR:Lokio/ByteString;
 
     const-string v0, "upgrade"
 
@@ -129,79 +130,79 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdy:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/f;->ccS:Lokio/ByteString;
 
     const/16 v0, 0xc
 
     new-array v0, v0, [Lokio/ByteString;
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdr:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccL:Lokio/ByteString;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/internal/e/f;->cds:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccM:Lokio/ByteString;
 
     const/4 v3, 0x1
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdt:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccN:Lokio/ByteString;
 
     const/4 v4, 0x2
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdu:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccO:Lokio/ByteString;
 
     const/4 v5, 0x3
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdw:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccQ:Lokio/ByteString;
 
     const/4 v6, 0x4
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdv:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccP:Lokio/ByteString;
 
     const/4 v7, 0x5
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdx:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccR:Lokio/ByteString;
 
     const/4 v8, 0x6
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdy:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccS:Lokio/ByteString;
 
     const/4 v9, 0x7
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lokhttp3/internal/e/c;->ccT:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/c;->ccn:Lokio/ByteString;
 
     const/16 v10, 0x8
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lokhttp3/internal/e/c;->ccU:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/c;->cco:Lokio/ByteString;
 
     const/16 v11, 0x9
 
     aput-object v1, v0, v11
 
-    sget-object v1, Lokhttp3/internal/e/c;->ccV:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/c;->ccp:Lokio/ByteString;
 
     const/16 v11, 0xa
 
     aput-object v1, v0, v11
 
-    sget-object v1, Lokhttp3/internal/e/c;->ccW:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/c;->ccq:Lokio/ByteString;
 
     const/16 v11, 0xb
 
@@ -211,39 +212,39 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdz:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->ccT:Ljava/util/List;
 
     new-array v0, v10, [Lokio/ByteString;
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdr:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccL:Lokio/ByteString;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/internal/e/f;->cds:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccM:Lokio/ByteString;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdt:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccN:Lokio/ByteString;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdu:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccO:Lokio/ByteString;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdw:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccQ:Lokio/ByteString;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdv:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccP:Lokio/ByteString;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdx:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccR:Lokio/ByteString;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lokhttp3/internal/e/f;->cdy:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/f;->ccS:Lokio/ByteString;
 
     aput-object v1, v0, v9
 
@@ -251,7 +252,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->cdA:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->ccU:Ljava/util/List;
 
     return-void
 .end method
@@ -261,15 +262,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lokhttp3/internal/e/f;->cdB:Lokhttp3/Interceptor$Chain;
+    iput-object p2, p0, Lokhttp3/internal/e/f;->ccV:Lokhttp3/Interceptor$Chain;
 
-    iput-object p3, p0, Lokhttp3/internal/e/f;->cct:Lokhttp3/internal/b/g;
+    iput-object p3, p0, Lokhttp3/internal/e/f;->cbN:Lokhttp3/internal/b/g;
 
-    iput-object p4, p0, Lokhttp3/internal/e/f;->cdC:Lokhttp3/internal/e/g;
+    iput-object p4, p0, Lokhttp3/internal/e/f;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/t;->bVt:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/t;->bUN:Ljava/util/List;
 
-    sget-object p2, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     invoke-interface {p1, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -277,21 +278,38 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lokhttp3/u;->bZX:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->bZr:Lokhttp3/u;
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/internal/e/f;->cat:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->bZN:Lokhttp3/u;
 
     return-void
 .end method
 
 
 # virtual methods
+.method public final Ia()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lokhttp3/internal/e/f;->ccW:Lokhttp3/internal/e/g;
+
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
+
+    invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
+
+    return-void
+.end method
+
 .method public final Ib()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -300,26 +318,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
-
-    invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
-
-    return-void
-.end method
-
-.method public final Ic()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
-
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->It()Lokio/p;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Is()Lokio/p;
 
     move-result-object v0
 
@@ -331,16 +332,16 @@
 .method public final a(Lokhttp3/w;J)Lokio/p;
     .locals 0
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i;->It()Lokio/p;
+    invoke-virtual {p1}, Lokhttp3/internal/e/i;->Is()Lokio/p;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final ah(Z)Lokhttp3/Response$a;
+.method public final ag(Z)Lokhttp3/Response$a;
     .locals 10
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -348,13 +349,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Is()Ljava/util/List;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Ir()Ljava/util/List;
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/f;->cat:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/e/f;->bZN:Lokhttp3/u;
 
     new-instance v2, Lokhttp3/Headers$a;
 
@@ -402,15 +403,15 @@
     goto :goto_1
 
     :cond_0
-    iget-object v7, v8, Lokhttp3/internal/e/c;->ccX:Lokio/ByteString;
+    iget-object v7, v8, Lokhttp3/internal/e/c;->ccr:Lokio/ByteString;
 
-    iget-object v8, v8, Lokhttp3/internal/e/c;->ccY:Lokio/ByteString;
+    iget-object v8, v8, Lokhttp3/internal/e/c;->ccs:Lokio/ByteString;
 
-    invoke-virtual {v8}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {v8}, Lokio/ByteString;->Jj()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lokhttp3/internal/e/c;->ccS:Lokio/ByteString;
+    sget-object v9, Lokhttp3/internal/e/c;->ccm:Lokio/ByteString;
 
     invoke-virtual {v7, v9}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -435,7 +436,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v9, Lokhttp3/internal/e/f;->cdA:Ljava/util/List;
+    sget-object v9, Lokhttp3/internal/e/f;->ccU:Ljava/util/List;
 
     invoke-interface {v9, v7}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -443,9 +444,9 @@
 
     if-nez v9, :cond_2
 
-    sget-object v9, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v9, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
-    invoke-virtual {v7}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {v7}, Lokio/ByteString;->Jj()Ljava/lang/String;
 
     move-result-object v7
 
@@ -464,7 +465,7 @@
 
     invoke-direct {v0}, Lokhttp3/Response$a;-><init>()V
 
-    iput-object v1, v0, Lokhttp3/Response$a;->cat:Lokhttp3/u;
+    iput-object v1, v0, Lokhttp3/Response$a;->bZN:Lokhttp3/u;
 
     iget v1, v2, Lokhttp3/internal/c/k;->code:I
 
@@ -474,7 +475,7 @@
 
     iput-object v1, v0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lokhttp3/Headers$a;->Hi()Lokhttp3/Headers;
+    invoke-virtual {v6}, Lokhttp3/Headers$a;->Hh()Lokhttp3/Headers;
 
     move-result-object v1
 
@@ -484,7 +485,7 @@
 
     if-eqz p1, :cond_4
 
-    sget-object p1, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->cai:Lokhttp3/internal/a;
 
     invoke-virtual {p1, v0}, Lokhttp3/internal/a;->a(Lokhttp3/Response$a;)I
 
@@ -505,6 +506,8 @@
     invoke-direct {p1, v0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final c(Lokhttp3/w;)V
@@ -515,14 +518,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/w;->bZD:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->bYX:Lokhttp3/RequestBody;
 
     const/4 v1, 0x0
 
@@ -536,11 +539,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p1, Lokhttp3/w;->bZC:Lokhttp3/Headers;
+    iget-object v2, p1, Lokhttp3/w;->bYW:Lokhttp3/Headers;
 
     new-instance v3, Ljava/util/ArrayList;
 
-    iget-object v4, v2, Lokhttp3/Headers;->bYZ:[Ljava/lang/String;
+    iget-object v4, v2, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length v4, v4
 
@@ -552,7 +555,7 @@
 
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->ccT:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->ccn:Lokio/ByteString;
 
     iget-object v6, p1, Lokhttp3/w;->method:Ljava/lang/String;
 
@@ -562,9 +565,9 @@
 
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->ccU:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->cco:Lokio/ByteString;
 
-    iget-object v6, p1, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v6, p1, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
     invoke-static {v6}, Lokhttp3/internal/c/i;->d(Lokhttp3/s;)Ljava/lang/String;
 
@@ -584,7 +587,7 @@
 
     new-instance v5, Lokhttp3/internal/e/c;
 
-    sget-object v6, Lokhttp3/internal/e/c;->ccW:Lokio/ByteString;
+    sget-object v6, Lokhttp3/internal/e/c;->ccq:Lokio/ByteString;
 
     invoke-direct {v5, v6, v4}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Ljava/lang/String;)V
 
@@ -593,17 +596,17 @@
     :cond_2
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->ccV:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->ccp:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->bZc:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bYw: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;->bYZ:[Ljava/lang/String;
+    iget-object p1, v2, Lokhttp3/Headers;->bYt:[Ljava/lang/String;
 
     array-length p1, p1
 
@@ -626,7 +629,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lokhttp3/internal/e/f;->cdz:Ljava/util/List;
+    sget-object v5, Lokhttp3/internal/e/f;->ccT:Ljava/util/List;
 
     invoke-interface {v5, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -650,21 +653,21 @@
     goto :goto_1
 
     :cond_4
-    iget-object p1, p0, Lokhttp3/internal/e/f;->cdC:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->ccW: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;->cdD:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->cdS:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdB:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->ccV:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Hw()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Hv()I
 
     move-result v0
 
@@ -674,13 +677,13 @@
 
     invoke-virtual {p1, v0, v1, v2}, Lokio/r;->d(JLjava/util/concurrent/TimeUnit;)Lokio/r;
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdB:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->ccV:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Hx()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Hw()I
 
     move-result v0
 
@@ -696,13 +699,11 @@
 .method public final cancel()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
-
-    sget-object v1, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cce:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/b;)V
 
@@ -730,9 +731,9 @@
 
     new-instance p1, Lokhttp3/internal/e/f$a;
 
-    iget-object v3, p0, Lokhttp3/internal/e/f;->cdD:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/f;->ccX:Lokhttp3/internal/e/i;
 
-    iget-object v3, v3, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object v3, v3, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
     invoke-direct {p1, p0, v3}, Lokhttp3/internal/e/f$a;-><init>(Lokhttp3/internal/e/f;Lokio/q;)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 8f75a0362e..c49c7e0840 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$1;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic cdY:I
+.field final synthetic cds:I
 
-.field final synthetic cdZ:Lokhttp3/internal/e/b;
+.field final synthetic cdt:Lokhttp3/internal/e/b;
 
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final synthetic cdu: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;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$1;->cdu:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$1;->cdY:I
+    iput p4, p0, Lokhttp3/internal/e/g$1;->cds:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$1;->cdZ:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$1;->cdt:Lokhttp3/internal/e/b;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -42,11 +43,11 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$1;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->cdu:Lokhttp3/internal/e/g;
 
-    iget v1, p0, Lokhttp3/internal/e/g$1;->cdY:I
+    iget v1, p0, Lokhttp3/internal/e/g$1;->cds:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$1;->cdZ:Lokhttp3/internal/e/b;
+    iget-object v2, p0, Lokhttp3/internal/e/g$1;->cdt:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1, v2}, Lokhttp3/internal/e/g;->b(ILokhttp3/internal/e/b;)V
     :try_end_0
@@ -55,7 +56,7 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$1;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->cdu: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 965da78d0d..413d6cf5ba 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$2.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$2.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$2;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic cdY:I
+.field final synthetic cds:I
 
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final synthetic cdu:Lokhttp3/internal/e/g;
 
-.field final synthetic ceb:J
+.field final synthetic cdv: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;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$2;->cdu:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$2;->cdY:I
+    iput p4, p0, Lokhttp3/internal/e/g$2;->cds:I
 
-    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->ceb:J
+    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->cdv:J
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -42,13 +43,13 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$2;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$2;->cdY:I
+    iget v1, p0, Lokhttp3/internal/e/g$2;->cds:I
 
-    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->ceb:J
+    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->cdv:J
 
     invoke-virtual {v0, v1, v2, v3}, Lokhttp3/internal/e/j;->m(IJ)V
     :try_end_0
@@ -57,7 +58,7 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$2;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->cdu: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 2e8decbacb..38c96eb0e9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$3.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$3.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$3;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic cdY:I
+.field final synthetic cds:I
 
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final synthetic cdu:Lokhttp3/internal/e/g;
 
-.field final synthetic cec:Ljava/util/List;
+.field final synthetic cdw: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;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$3;->cdu:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$3;->cdY:I
+    iput p4, p0, Lokhttp3/internal/e/g$3;->cds:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$3;->cec:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$3;->cdw:Ljava/util/List;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -42,28 +43,28 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$3;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$3;->cdY:I
+    iget v1, p0, Lokhttp3/internal/e/g$3;->cds:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->cce: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;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->cdu: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;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$3;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->cdX:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->cdr:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$3;->cdY:I
+    iget v2, p0, Lokhttp3/internal/e/g$3;->cds: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 a2943a7383..58c11d54c2 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$4.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$4.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$4;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,26 +15,26 @@
 
 
 # instance fields
-.field final synthetic cdY:I
+.field final synthetic cds:I
 
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final synthetic cdu:Lokhttp3/internal/e/g;
 
-.field final synthetic cec:Ljava/util/List;
+.field final synthetic cdw:Ljava/util/List;
 
-.field final synthetic ced:Z
+.field final synthetic cdx: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;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$4;->cdu:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$4;->cdY:I
+    iput p4, p0, Lokhttp3/internal/e/g$4;->cds:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$4;->cec:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$4;->cdw:Ljava/util/List;
 
-    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->ced:Z
+    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->cdx:Z
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -46,28 +47,28 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$4;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$4;->cdY:I
+    iget v1, p0, Lokhttp3/internal/e/g$4;->cds:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->cce: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;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->cdu: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;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$4;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->cdX:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->cdr:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$4;->cdY:I
+    iget v2, p0, Lokhttp3/internal/e/g$4;->cds: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 0d9ce184a2..52941bc4af 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$5.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$5.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$5;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,30 +15,30 @@
 
 
 # instance fields
-.field final synthetic cao:I
+.field final synthetic bZI:I
 
-.field final synthetic cdY:I
+.field final synthetic cds:I
 
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final synthetic cdu:Lokhttp3/internal/e/g;
 
-.field final synthetic ced:Z
+.field final synthetic cdx:Z
 
-.field final synthetic cee:Lokio/c;
+.field final synthetic cdy: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;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$5;->cdu:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$5;->cdY:I
+    iput p4, p0, Lokhttp3/internal/e/g$5;->cds:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$5;->cee:Lokio/c;
+    iput-object p5, p0, Lokhttp3/internal/e/g$5;->cdy:Lokio/c;
 
-    iput p6, p0, Lokhttp3/internal/e/g$5;->cao:I
+    iput p6, p0, Lokhttp3/internal/e/g$5;->bZI:I
 
-    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->ced:Z
+    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->cdx:Z
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -50,38 +51,38 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$5;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdO:Lokhttp3/internal/e/l;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdi:Lokhttp3/internal/e/l;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$5;->cee:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->cdy:Lokio/c;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->cao:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->bZI:I
 
     invoke-interface {v0, v1, v2}, Lokhttp3/internal/e/l;->a(Lokio/d;I)Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$5;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$5;->cdY:I
+    iget v1, p0, Lokhttp3/internal/e/g$5;->cds:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->cce: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;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->cdu: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;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->cdX:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->cdr:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->cdY:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->cds: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 abde62635b..4416eed380 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$6.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$6.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$6;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic cdY:I
+.field final synthetic cds:I
 
-.field final synthetic cdZ:Lokhttp3/internal/e/b;
+.field final synthetic cdt:Lokhttp3/internal/e/b;
 
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final synthetic cdu: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;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$6;->cdu:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$6;->cdY:I
+    iput p4, p0, Lokhttp3/internal/e/g$6;->cds:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$6;->cdZ:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$6;->cdt:Lokhttp3/internal/e/b;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -41,16 +42,16 @@
 .method public final execute()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$6;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$6;->cdu:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$6;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$6;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->cdX:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->cdr:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$6;->cdY:I
+    iget v2, p0, Lokhttp3/internal/e/g$6;->cds: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 ac3e13de7a..1a8f612ccf 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/e/g$a;
 .super Ljava/lang/Object;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,19 +15,19 @@
 
 
 # instance fields
-.field caE:Lokio/d;
+.field bZY:Lokio/d;
 
-.field cbP:Ljava/net/Socket;
+.field cbj:Ljava/net/Socket;
 
-.field cbR:Lokio/BufferedSink;
+.field cbl:Lokio/BufferedSink;
 
-.field cdH:Z
+.field cdb:Z
 
-.field public cdI:Lokhttp3/internal/e/g$b;
+.field public cdc:Lokhttp3/internal/e/g$b;
 
-.field cdO:Lokhttp3/internal/e/l;
+.field cdi:Lokhttp3/internal/e/l;
 
-.field public cef:I
+.field public cdz:I
 
 .field hostname:Ljava/lang/String;
 
@@ -37,24 +38,24 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/internal/e/g$b;->ceg:Lokhttp3/internal/e/g$b;
+    sget-object v0, Lokhttp3/internal/e/g$b;->cdA:Lokhttp3/internal/e/g$b;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->cdI:Lokhttp3/internal/e/g$b;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->cdc:Lokhttp3/internal/e/g$b;
 
-    sget-object v0, Lokhttp3/internal/e/l;->ceQ:Lokhttp3/internal/e/l;
+    sget-object v0, Lokhttp3/internal/e/l;->cek:Lokhttp3/internal/e/l;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->cdO:Lokhttp3/internal/e/l;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->cdi:Lokhttp3/internal/e/l;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->cdH:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->cdb:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ip()Lokhttp3/internal/e/g;
+.method public final Io()Lokhttp3/internal/e/g;
     .locals 1
 
     new-instance v0, Lokhttp3/internal/e/g;
@@ -67,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;->cbP:Ljava/net/Socket;
+    iput-object p1, p0, Lokhttp3/internal/e/g$a;->cbj: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;->caE:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/e/g$a;->bZY:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$a;->cbR:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/e/g$a;->cbl: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 5eec63f0ff..ba0bf267ba 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
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$b$1;
 .super Lokhttp3/internal/e/g$b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccJ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->ccd: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 022ac957c8..37b6dbf425 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$c.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$c;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,20 +15,20 @@
 
 
 # instance fields
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final cdB:Z
 
-.field final ceh:Z
+.field final cdC:I
 
-.field final cei:I
+.field final cdD:I
 
-.field final cej:I
+.field final synthetic cdu:Lokhttp3/internal/e/g;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/g;ZII)V
     .locals 3
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$c;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$c;->cdu:Lokhttp3/internal/e/g;
 
     const-string v0, "OkHttp %s ping %08x%08x"
 
@@ -59,11 +60,11 @@
 
     invoke-direct {p0, v0, v1}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/g$c;->ceh:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/g$c;->cdB:Z
 
-    iput p3, p0, Lokhttp3/internal/e/g$c;->cei:I
+    iput p3, p0, Lokhttp3/internal/e/g$c;->cdC:I
 
-    iput p4, p0, Lokhttp3/internal/e/g$c;->cej:I
+    iput p4, p0, Lokhttp3/internal/e/g$c;->cdD:I
 
     return-void
 .end method
@@ -73,24 +74,24 @@
 .method public final execute()V
     .locals 6
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$c;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$c;->cdu:Lokhttp3/internal/e/g;
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->ceh:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->cdB:Z
 
-    iget v2, p0, Lokhttp3/internal/e/g$c;->cei:I
+    iget v2, p0, Lokhttp3/internal/e/g$c;->cdC:I
 
-    iget v3, p0, Lokhttp3/internal/e/g$c;->cej:I
+    iget v3, p0, Lokhttp3/internal/e/g$c;->cdD:I
 
     if-nez v1, :cond_0
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->cdP:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->cdj:Z
 
     const/4 v5, 0x1
 
-    iput-boolean v5, v0, Lokhttp3/internal/e/g;->cdP:Z
+    iput-boolean v5, v0, Lokhttp3/internal/e/g;->cdj:Z
 
     monitor-exit v0
     :try_end_0
@@ -98,7 +99,7 @@
 
     if-eqz v4, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Im()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Il()V
 
     return-void
 
@@ -114,7 +115,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v4, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v4, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {v4, v1, v2, v3}, Lokhttp3/internal/e/j;->a(ZII)V
     :try_end_2
@@ -123,7 +124,7 @@
     return-void
 
     :catch_0
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Im()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Il()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 b7fb05ce6d..50ec95eb94 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
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$d$1;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic cel:Lokhttp3/internal/e/i;
+.field final synthetic cdF:Lokhttp3/internal/e/i;
 
-.field final synthetic cem:Lokhttp3/internal/e/g$d;
+.field final synthetic cdG: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;->cem:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$1;->cdG:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->cel:Lokhttp3/internal/e/i;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->cdF:Lokhttp3/internal/e/i;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -38,13 +39,13 @@
     .locals 5
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->cem:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->cdG:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdI:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdc:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->cel:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->cdF:Lokhttp3/internal/e/i;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/g$b;->a(Lokhttp3/internal/e/i;)V
     :try_end_0
@@ -55,7 +56,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v1
 
@@ -67,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;->cem:Lokhttp3/internal/e/g$d;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d$1;->cdG:Lokhttp3/internal/e/g$d;
 
-    iget-object v4, v4, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v4, v4, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object v4, v4, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -82,14 +83,16 @@
     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;->cel:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->cdF:Lokhttp3/internal/e/i;
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cca:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
 
+    return-void
+
     :catch_1
     return-void
 .end method
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 c1ed75f07a..c88a8a9010 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
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$d$2;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic cem:Lokhttp3/internal/e/g$d;
+.field final synthetic cdG: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;->cem:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$2;->cdG:Lokhttp3/internal/e/g$d;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -33,15 +34,15 @@
 .method public final execute()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$2;->cem:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$2;->cdG:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdI:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdc:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->cem:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->cdG:Lokhttp3/internal/e/g$d;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, v1, Lokhttp3/internal/e/g$d;->cdu: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 30cae7ee2d..10b58124fe 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
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$d$3;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 
 # annotations
@@ -14,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic cem:Lokhttp3/internal/e/g$d;
+.field final synthetic cdG:Lokhttp3/internal/e/g$d;
 
-.field final synthetic cen:Lokhttp3/internal/e/m;
+.field final synthetic cdH: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;->cem:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$3;->cdG:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->cen:Lokhttp3/internal/e/m;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->cdH:Lokhttp3/internal/e/m;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -38,13 +39,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->cem:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->cdG:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->cen:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->cdH:Lokhttp3/internal/e/m;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/j;->b(Lokhttp3/internal/e/m;)V
     :try_end_0
@@ -53,9 +54,9 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->cem:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->cdG:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->cdu: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 bfac329a40..e6d93b9262 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$d.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/g$d;
 .super Lokhttp3/internal/b;
+.source "Http2Connection.java"
 
 # interfaces
 .implements Lokhttp3/internal/e/h$b;
@@ -17,16 +18,16 @@
 
 
 # instance fields
-.field final synthetic cea:Lokhttp3/internal/e/g;
+.field final cdE:Lokhttp3/internal/e/h;
 
-.field final cek:Lokhttp3/internal/e/h;
+.field final synthetic cdu:Lokhttp3/internal/e/g;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/g;Lokhttp3/internal/e/h;)V
     .locals 3
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     const-string v0, "OkHttp %s"
 
@@ -42,7 +43,7 @@
 
     invoke-direct {p0, v0, v1}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lokhttp3/internal/e/g$d;->cek:Lokhttp3/internal/e/h;
+    iput-object p2, p0, Lokhttp3/internal/e/g$d;->cdE:Lokhttp3/internal/e/h;
 
     return-void
 .end method
@@ -52,22 +53,22 @@
 .method public final a(Lokhttp3/internal/e/m;)V
     .locals 11
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {v1}, Lokhttp3/internal/e/m;->IE()I
 
     move-result v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object v2, v2, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object v2, v2, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
     const/4 v3, 0x0
 
@@ -84,7 +85,7 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v5, p1, Lokhttp3/internal/e/m;->ceS:[I
+    iget-object v5, p1, Lokhttp3/internal/e/m;->cem:[I
 
     aget v5, v5, v4
 
@@ -101,7 +102,7 @@
     const/4 v2, 0x1
 
     :try_start_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-static {v4}, Lokhttp3/internal/e/g;->c(Lokhttp3/internal/e/g;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -113,7 +114,7 @@
 
     new-array v7, v2, [Ljava/lang/Object;
 
-    iget-object v8, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v8, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object v8, v8, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -128,11 +129,11 @@
 
     :catch_0
     :try_start_2
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object p1, p1, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->IE()I
 
     move-result p1
 
@@ -150,18 +151,18 @@
 
     int-to-long v8, p1
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-boolean p1, p1, Lokhttp3/internal/e/g;->cdU:Z
+    iget-boolean p1, p1, Lokhttp3/internal/e/g;->cdo:Z
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iput-boolean v2, p1, Lokhttp3/internal/e/g;->cdU:Z
+    iput-boolean v2, p1, Lokhttp3/internal/e/g;->cdo:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -171,7 +172,7 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -179,7 +180,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object v1, v1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -204,7 +205,7 @@
 
     :cond_4
     :goto_1
-    invoke-static {}, Lokhttp3/internal/e/g;->Io()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->In()Ljava/util/concurrent/ExecutorService;
 
     move-result-object p1
 
@@ -214,7 +215,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    iget-object v10, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v10, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object v10, v10, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -273,6 +274,8 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     throw p1
+
+    return-void
 .end method
 
 .method public final a(ZII)V
@@ -280,16 +283,16 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     monitor-enter p1
 
     :try_start_0
-    iget-object p2, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->cdu: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;->cea:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-virtual {p2}, Ljava/lang/Object;->notifyAll()V
 
@@ -308,7 +311,7 @@
 
     :cond_0
     :try_start_1
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-static {p1}, Lokhttp3/internal/e/g;->c(Lokhttp3/internal/e/g;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -316,7 +319,7 @@
 
     new-instance v0, Lokhttp3/internal/e/g$c;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     const/4 v2, 0x1
 
@@ -326,6 +329,8 @@
     :try_end_1
     .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_1 .. :try_end_1} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -353,7 +358,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     :try_start_0
     new-instance v11, Lokhttp3/internal/e/g$4;
@@ -388,16 +393,18 @@
     :try_end_0
     .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-virtual {v4, p2}, Lokhttp3/internal/e/g;->fk(I)Lokhttp3/internal/e/i;
 
@@ -405,9 +412,9 @@
 
     if-nez v4, :cond_4
 
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-boolean v4, v4, Lokhttp3/internal/e/g;->cdL:Z
+    iget-boolean v4, v4, Lokhttp3/internal/e/g;->cdf:Z
 
     if-eqz v4, :cond_1
 
@@ -416,9 +423,9 @@
     return-void
 
     :cond_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget v4, v4, Lokhttp3/internal/e/g;->cdJ:I
+    iget v4, v4, Lokhttp3/internal/e/g;->cdd:I
 
     if-gt p2, v4, :cond_2
 
@@ -429,9 +436,9 @@
     :cond_2
     rem-int/lit8 v4, p2, 0x2
 
-    iget-object v5, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v5, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget v5, v5, Lokhttp3/internal/e/g;->cdK:I
+    iget v5, v5, Lokhttp3/internal/e/g;->cde:I
 
     rem-int/2addr v5, v3
 
@@ -444,7 +451,7 @@
     :cond_3
     new-instance v10, Lokhttp3/internal/e/i;
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     const/4 v7, 0x0
 
@@ -458,11 +465,11 @@
 
     invoke-direct/range {v4 .. v9}, Lokhttp3/internal/e/i;-><init>(ILokhttp3/internal/e/g;ZZLjava/util/List;)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iput p2, p1, Lokhttp3/internal/e/g;->cdJ:I
+    iput p2, p1, Lokhttp3/internal/e/g;->cdd:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -472,7 +479,7 @@
 
     invoke-interface {p1, p3, v10}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lokhttp3/internal/e/g;->Io()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->In()Ljava/util/concurrent/ExecutorService;
 
     move-result-object p1
 
@@ -482,7 +489,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    iget-object v5, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v5, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object v5, v5, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -531,13 +538,13 @@
     monitor-enter v4
 
     :try_start_2
-    iput-boolean v2, v4, Lokhttp3/internal/e/i;->cev:Z
+    iput-boolean v2, v4, Lokhttp3/internal/e/i;->cdP:Z
 
-    iget-object p2, v4, Lokhttp3/internal/e/i;->ceu:Ljava/util/List;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->cdO:Ljava/util/List;
 
     if-nez p2, :cond_7
 
-    iput-object p3, v4, Lokhttp3/internal/e/i;->ceu:Ljava/util/List;
+    iput-object p3, v4, Lokhttp3/internal/e/i;->cdO:Ljava/util/List;
 
     invoke-virtual {v4}, Lokhttp3/internal/e/i;->isOpen()Z
 
@@ -552,7 +559,7 @@
 
     invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v0, v4, Lokhttp3/internal/e/i;->ceu:Ljava/util/List;
+    iget-object v0, v4, Lokhttp3/internal/e/i;->cdO:Ljava/util/List;
 
     invoke-interface {p2, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
@@ -562,7 +569,7 @@
 
     invoke-interface {p2, p3}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iput-object p2, v4, Lokhttp3/internal/e/i;->ceu:Ljava/util/List;
+    iput-object p2, v4, Lokhttp3/internal/e/i;->cdO:Ljava/util/List;
 
     :goto_1
     monitor-exit v4
@@ -571,7 +578,7 @@
 
     if-nez v2, :cond_8
 
-    iget-object p2, v4, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
     iget p3, v4, Lokhttp3/internal/e/i;->id:I
 
@@ -580,7 +587,7 @@
     :cond_8
     if-eqz p1, :cond_9
 
-    invoke-virtual {v4}, Lokhttp3/internal/e/i;->Iu()V
+    invoke-virtual {v4}, Lokhttp3/internal/e/i;->It()V
 
     :cond_9
     return-void
@@ -620,7 +627,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     new-instance v6, Lokio/c;
 
@@ -702,7 +709,7 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p2}, Lokhttp3/internal/e/g;->fk(I)Lokhttp3/internal/e/i;
 
@@ -710,13 +717,13 @@
 
     if-nez v0, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->cca: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;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     int-to-long v0, p4
 
@@ -748,7 +755,7 @@
 
     :cond_4
     :goto_0
-    iget-object p2, v0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object p2, v0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
     int-to-long v1, p4
 
@@ -756,7 +763,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Iu()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->It()V
 
     :cond_5
     return-void
@@ -771,7 +778,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     new-instance v7, Lokhttp3/internal/e/g$6;
 
@@ -810,7 +817,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->fl(I)Lokhttp3/internal/e/i;
 
@@ -825,16 +832,16 @@
 .end method
 
 .method public final execute()V
-    .locals 10
+    .locals 9
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccH:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->ccb:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccH:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->ccb:Lokhttp3/internal/e/b;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cek:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cdE:Lokhttp3/internal/e/h;
 
-    iget-boolean v3, v2, Lokhttp3/internal/e/h;->cdH:Z
+    iget-boolean v3, v2, Lokhttp3/internal/e/h;->cdb:Z
 
     const/4 v4, 0x1
 
@@ -862,9 +869,9 @@
     throw v2
 
     :cond_1
-    iget-object v2, v2, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v2, v2, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
-    sget-object v3, Lokhttp3/internal/e/e;->cdn:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->ccH:Lokio/ByteString;
 
     invoke-virtual {v3}, Lokio/ByteString;->size()I
 
@@ -892,7 +899,7 @@
 
     new-array v7, v4, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lokio/ByteString;->Jo()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Jn()Ljava/lang/String;
 
     move-result-object v8
 
@@ -905,7 +912,7 @@
     invoke-virtual {v3, v6}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_2
-    sget-object v3, Lokhttp3/internal/e/e;->cdn:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->ccH:Lokio/ByteString;
 
     invoke-virtual {v3, v2}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -915,7 +922,7 @@
 
     :cond_3
     :goto_0
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cek:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cdE:Lokhttp3/internal/e/h;
 
     invoke-virtual {v2, v5, p0}, Lokhttp3/internal/e/h;->a(ZLokhttp3/internal/e/h$b;)Z
 
@@ -923,44 +930,35 @@
 
     if-nez v2, :cond_3
 
-    sget-object v2, Lokhttp3/internal/e/b;->ccF:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->cbZ:Lokhttp3/internal/e/b;
+
+    sget-object v1, Lokhttp3/internal/e/b;->cce:Lokhttp3/internal/e/b;
     :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    sget-object v0, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :try_start_2
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     :goto_1
-    invoke-virtual {v1, v2, v0}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+    invoke-virtual {v2, v0, v1}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cek:Lokhttp3/internal/e/h;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdE:Lokhttp3/internal/e/h;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     return-void
 
-    :catch_1
-    move-object v0, v2
-
-    goto :goto_2
-
     :cond_4
-    :try_start_3
+    :try_start_2
     const-string v3, "Expected a connection header but was %s"
 
     new-array v4, v4, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Jj()Ljava/lang/String;
 
     move-result-object v2
 
@@ -971,68 +969,57 @@
     move-result-object v2
 
     throw v2
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :catchall_0
     move-exception v2
 
-    goto :goto_3
+    goto :goto_2
+
+    :catch_1
+    :try_start_3
+    sget-object v0, Lokhttp3/internal/e/b;->cca:Lokhttp3/internal/e/b;
+
+    sget-object v1, Lokhttp3/internal/e/b;->cca:Lokhttp3/internal/e/b;
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    :catch_2
-    :goto_2
     :try_start_4
-    sget-object v2, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
     :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    :try_start_5
-    sget-object v0, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    :try_start_6
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
-    :try_end_6
-    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_0
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
 
     goto :goto_1
 
-    :catchall_1
-    move-exception v0
-
-    move-object v9, v2
-
-    move-object v2, v0
-
-    move-object v0, v9
-
-    :goto_3
-    :try_start_7
-    iget-object v3, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    :goto_2
+    :try_start_5
+    iget-object v3, p0, Lokhttp3/internal/e/g$d;->cdu: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_7
-    .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_3
+    :try_end_5
+    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_2
 
-    :catch_3
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cek:Lokhttp3/internal/e/h;
+    :catch_2
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdE:Lokhttp3/internal/e/h;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     throw v2
+
+    return-void
 .end method
 
 .method public final fn(I)V
     .locals 5
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object v1, v1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -1040,7 +1027,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget-object v2, v2, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -1056,11 +1043,11 @@
 
     check-cast v1, [Lokhttp3/internal/e/i;
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     const/4 v3, 0x1
 
-    iput-boolean v3, v2, Lokhttp3/internal/e/g;->cdL:Z
+    iput-boolean v3, v2, Lokhttp3/internal/e/g;->cdf:Z
 
     monitor-exit v0
     :try_end_0
@@ -1079,17 +1066,17 @@
 
     if-le v4, p1, :cond_0
 
-    invoke-virtual {v3}, Lokhttp3/internal/e/i;->Ir()Z
+    invoke-virtual {v3}, Lokhttp3/internal/e/i;->Iq()Z
 
     move-result v4
 
     if-eqz v4, :cond_0
 
-    sget-object v4, Lokhttp3/internal/e/b;->ccJ:Lokhttp3/internal/e/b;
+    sget-object v4, Lokhttp3/internal/e/b;->ccd:Lokhttp3/internal/e/b;
 
     invoke-virtual {v3, v4}, Lokhttp3/internal/e/i;->e(Lokhttp3/internal/e/b;)V
 
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     iget v3, v3, Lokhttp3/internal/e/i;->id:I
 
@@ -1112,29 +1099,29 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final m(IJ)V
-    .locals 4
+    .locals 3
 
     if-nez p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
-    iget-wide v1, p1, Lokhttp3/internal/e/g;->cdR:J
-
-    const/4 v3, 0x0
+    iget-wide v1, p1, Lokhttp3/internal/e/g;->cdl:J
 
     add-long/2addr v1, p2
 
-    iput-wide v1, p1, Lokhttp3/internal/e/g;->cdR:J
+    iput-wide v1, p1, Lokhttp3/internal/e/g;->cdl:J
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
 
@@ -1152,7 +1139,7 @@
     throw p1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->fk(I)Lokhttp3/internal/e/i;
 
@@ -1193,12 +1180,12 @@
         }
     .end annotation
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->cea:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->cdu:Lokhttp3/internal/e/g;
 
     monitor-enter v6
 
     :try_start_0
-    iget-object v0, v6, Lokhttp3/internal/e/g;->cdX:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->cdr:Ljava/util/Set;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1210,7 +1197,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p2, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->cca:Lokhttp3/internal/e/b;
 
     invoke-virtual {v6, p1, p2}, Lokhttp3/internal/e/g;->a(ILokhttp3/internal/e/b;)V
 
@@ -1219,7 +1206,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v6, Lokhttp3/internal/e/g;->cdX:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->cdr:Ljava/util/Set;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1268,6 +1255,8 @@
     :try_end_1
     .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_1 .. :try_end_1} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g.smali b/com.discord/smali_classes2/okhttp3/internal/e/g.smali
index 0ed666de70..532fa950f5 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/e/g;
 .super Ljava/lang/Object;
+.source "Http2Connection.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -19,45 +20,45 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field private static final cdG:Ljava/util/concurrent/ExecutorService;
+.field private static final cda:Ljava/util/concurrent/ExecutorService;
 
 
 # instance fields
-.field final cbP:Ljava/net/Socket;
+.field final cbj:Ljava/net/Socket;
 
-.field final cdH:Z
+.field final cdb:Z
 
-.field final cdI:Lokhttp3/internal/e/g$b;
+.field final cdc:Lokhttp3/internal/e/g$b;
 
-.field cdJ:I
+.field cdd:I
 
-.field cdK:I
+.field cde:I
 
-.field cdL:Z
+.field cdf:Z
 
-.field private final cdM:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final cdg:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final cdN:Ljava/util/concurrent/ExecutorService;
+.field private final cdh:Ljava/util/concurrent/ExecutorService;
 
-.field final cdO:Lokhttp3/internal/e/l;
+.field final cdi:Lokhttp3/internal/e/l;
 
-.field cdP:Z
+.field cdj:Z
 
-.field cdQ:J
+.field cdk:J
 
-.field cdR:J
+.field cdl:J
 
-.field cdS:Lokhttp3/internal/e/m;
+.field cdm:Lokhttp3/internal/e/m;
 
-.field final cdT:Lokhttp3/internal/e/m;
+.field final cdn:Lokhttp3/internal/e/m;
 
-.field cdU:Z
+.field cdo:Z
 
-.field final cdV:Lokhttp3/internal/e/j;
+.field final cdp:Lokhttp3/internal/e/j;
 
-.field final cdW:Lokhttp3/internal/e/g$d;
+.field final cdq:Lokhttp3/internal/e/g$d;
 
-.field final cdX:Ljava/util/Set;
+.field final cdr:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -111,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;->cdG:Ljava/util/concurrent/ExecutorService;
+    sput-object v8, Lokhttp3/internal/e/g;->cda:Ljava/util/concurrent/ExecutorService;
 
     return-void
 .end method
@@ -133,43 +134,43 @@
 
     const-wide/16 v2, 0x0
 
-    iput-wide v2, v0, Lokhttp3/internal/e/g;->cdQ:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->cdk: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;->cdS:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->cdm: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;->cdT:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v0, Lokhttp3/internal/e/g;->cdU:Z
+    iput-boolean v2, v0, Lokhttp3/internal/e/g;->cdo:Z
 
     new-instance v3, Ljava/util/LinkedHashSet;
 
     invoke-direct {v3}, Ljava/util/LinkedHashSet;-><init>()V
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->cdX:Ljava/util/Set;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->cdr:Ljava/util/Set;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->cdO:Lokhttp3/internal/e/l;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->cdi:Lokhttp3/internal/e/l;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->cdO:Lokhttp3/internal/e/l;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->cdi:Lokhttp3/internal/e/l;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdH:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdb:Z
 
-    iput-boolean v3, v0, Lokhttp3/internal/e/g;->cdH:Z
+    iput-boolean v3, v0, Lokhttp3/internal/e/g;->cdb:Z
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->cdI:Lokhttp3/internal/e/g$b;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->cdc:Lokhttp3/internal/e/g$b;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->cdI:Lokhttp3/internal/e/g$b;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->cdc:Lokhttp3/internal/e/g$b;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdH:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdb:Z
 
     const/4 v4, 0x2
 
@@ -185,26 +186,26 @@
     const/4 v3, 0x2
 
     :goto_0
-    iput v3, v0, Lokhttp3/internal/e/g;->cdK:I
+    iput v3, v0, Lokhttp3/internal/e/g;->cde:I
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdH:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdb:Z
 
     if-eqz v3, :cond_1
 
-    iget v3, v0, Lokhttp3/internal/e/g;->cdK:I
+    iget v3, v0, Lokhttp3/internal/e/g;->cde:I
 
     add-int/2addr v3, v4
 
-    iput v3, v0, Lokhttp3/internal/e/g;->cdK:I
+    iput v3, v0, Lokhttp3/internal/e/g;->cde:I
 
     :cond_1
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdH:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->cdb:Z
 
     const/4 v4, 0x7
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v0, Lokhttp3/internal/e/g;->cdS:Lokhttp3/internal/e/m;
+    iget-object v3, v0, Lokhttp3/internal/e/g;->cdm:Lokhttp3/internal/e/m;
 
     const/high16 v6, 0x1000000
 
@@ -235,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;->cdM:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->cdg:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->cef:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->cdz:I
 
     if-eqz v3, :cond_3
 
-    iget-object v6, v0, Lokhttp3/internal/e/g;->cdM:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v6, v0, Lokhttp3/internal/e/g;->cdg: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;->cef:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->cdz:I
 
     int-to-long v8, v3
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->cef:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->cdz:I
 
     int-to-long v10, v3
 
@@ -294,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;->cdN:Ljava/util/concurrent/ExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->cdh:Ljava/util/concurrent/ExecutorService;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
     const v3, 0xffff
 
     invoke-virtual {v2, v4, v3}, Lokhttp3/internal/e/m;->au(II)Lokhttp3/internal/e/m;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
     const/4 v3, 0x5
 
@@ -310,51 +311,51 @@
 
     invoke-virtual {v2, v3, v4}, Lokhttp3/internal/e/m;->au(II)Lokhttp3/internal/e/m;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {v2}, Lokhttp3/internal/e/m;->IE()I
 
     move-result v2
 
     int-to-long v2, v2
 
-    iput-wide v2, v0, Lokhttp3/internal/e/g;->cdR:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->cdl:J
 
-    iget-object v2, v1, Lokhttp3/internal/e/g$a;->cbP:Ljava/net/Socket;
+    iget-object v2, v1, Lokhttp3/internal/e/g$a;->cbj:Ljava/net/Socket;
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->cbP:Ljava/net/Socket;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->cbj:Ljava/net/Socket;
 
     new-instance v2, Lokhttp3/internal/e/j;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->cbR:Lokio/BufferedSink;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->cbl:Lokio/BufferedSink;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->cdH:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->cdb:Z
 
     invoke-direct {v2, v3, v4}, Lokhttp3/internal/e/j;-><init>(Lokio/BufferedSink;Z)V
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->cdp: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;->caE:Lokio/d;
+    iget-object v1, v1, Lokhttp3/internal/e/g$a;->bZY:Lokio/d;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->cdH:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->cdb: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;->cdW:Lokhttp3/internal/e/g$d;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->cdq:Lokhttp3/internal/e/g$d;
 
     return-void
 .end method
 
-.method static synthetic Io()Ljava/util/concurrent/ExecutorService;
+.method static synthetic In()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/g;->cdG:Ljava/util/concurrent/ExecutorService;
+    sget-object v0, Lokhttp3/internal/e/g;->cda:Ljava/util/concurrent/ExecutorService;
 
     return-object v0
 .end method
@@ -367,7 +368,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     monitor-enter v0
 
@@ -377,7 +378,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-boolean v1, p0, Lokhttp3/internal/e/g;->cdL:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g;->cdf:Z
 
     if-eqz v1, :cond_0
 
@@ -396,16 +397,16 @@
     const/4 v1, 0x1
 
     :try_start_3
-    iput-boolean v1, p0, Lokhttp3/internal/e/g;->cdL:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/g;->cdf:Z
 
-    iget v1, p0, Lokhttp3/internal/e/g;->cdJ:I
+    iget v1, p0, Lokhttp3/internal/e/g;->cdd: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;->cdV:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     sget-object v3, Lokhttp3/internal/c;->aOW:[B
 
@@ -441,7 +442,7 @@
 .method static synthetic b(Lokhttp3/internal/e/g;)V
     .locals 0
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/g;->Im()V
+    invoke-virtual {p0}, Lokhttp3/internal/e/g;->Il()V
 
     return-void
 .end method
@@ -449,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;->cdM:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p0, p0, Lokhttp3/internal/e/g;->cdg:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object p0
 .end method
@@ -459,7 +460,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/g;->cdP:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g;->cdj:Z
 
     return v0
 .end method
@@ -485,21 +486,21 @@
 
 
 # virtual methods
-.method public final declared-synchronized Il()I
+.method public final declared-synchronized Ik()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
-    iget v1, v0, Lokhttp3/internal/e/m;->ceR:I
+    iget v1, v0, Lokhttp3/internal/e/m;->cel:I
 
     and-int/lit8 v1, v1, 0x10
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/e/m;->ceS:[I
+    iget-object v0, v0, Lokhttp3/internal/e/m;->cem:[I
 
     const/4 v1, 0x4
 
@@ -526,21 +527,23 @@
     throw v0
 .end method
 
-.method final Im()V
+.method final Il()V
     .locals 1
 
     :try_start_0
-    sget-object v0, Lokhttp3/internal/e/b;->ccG:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->cca: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
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
 
-.method public final In()V
+.method public final Im()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -548,19 +551,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/j;->IB()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/j;->IA()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g;->cdS:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->cdm: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;->cdS:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdm:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->IE()I
 
     move-result v0
 
@@ -568,7 +571,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     const/4 v3, 0x0
 
@@ -581,7 +584,7 @@
     :cond_0
     new-instance v0, Ljava/lang/Thread;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g;->cdW:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->cdq:Lokhttp3/internal/e/g$d;
 
     invoke-direct {v0, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;)V
 
@@ -594,7 +597,7 @@
     .locals 8
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdM:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdg:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v7, Lokhttp3/internal/e/g$1;
 
@@ -632,6 +635,8 @@
     :try_end_0
     .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
@@ -652,7 +657,7 @@
 
     if-nez v3, :cond_0
 
-    iget-object p4, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object p4, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {p4, p2, p1, p3, v0}, Lokhttp3/internal/e/j;->a(ZILokio/c;I)V
 
@@ -668,7 +673,7 @@
 
     :goto_1
     :try_start_0
-    iget-wide v3, p0, Lokhttp3/internal/e/g;->cdR:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->cdl:J
 
     cmp-long v5, v3, v1
 
@@ -704,7 +709,7 @@
 
     :cond_2
     :try_start_1
-    iget-wide v3, p0, Lokhttp3/internal/e/g;->cdR:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->cdl:J
 
     invoke-static {p4, p5, v3, v4}, Ljava/lang/Math;->min(JJ)J
 
@@ -712,31 +717,29 @@
 
     long-to-int v3, v3
 
-    iget-object v4, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v4, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
-    iget v4, v4, Lokhttp3/internal/e/j;->ceH:I
+    iget v4, v4, Lokhttp3/internal/e/j;->ceb:I
 
     invoke-static {v3, v4}, Ljava/lang/Math;->min(II)I
 
     move-result v3
 
-    iget-wide v4, p0, Lokhttp3/internal/e/g;->cdR:J
+    iget-wide v4, p0, Lokhttp3/internal/e/g;->cdl:J
 
     int-to-long v6, v3
 
     sub-long/2addr v4, v6
 
-    iput-wide v4, p0, Lokhttp3/internal/e/g;->cdR:J
+    iput-wide v4, p0, Lokhttp3/internal/e/g;->cdl:J
 
     monitor-exit p0
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    const/4 v4, 0x0
-
     sub-long/2addr p4, v6
 
-    iget-object v4, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v4, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     if-eqz p2, :cond_3
 
@@ -798,7 +801,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdN:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdh:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
     :try_end_0
@@ -913,7 +916,7 @@
 
     :cond_2
     :try_start_3
-    iget-object p2, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {p2}, Lokhttp3/internal/e/j;->close()V
     :try_end_3
@@ -931,7 +934,7 @@
     :cond_3
     :goto_3
     :try_start_4
-    iget-object p2, p0, Lokhttp3/internal/e/g;->cbP:Ljava/net/Socket;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->cbj:Ljava/net/Socket;
 
     invoke-virtual {p2}, Ljava/net/Socket;->close()V
     :try_end_4
@@ -943,11 +946,11 @@
     move-exception p1
 
     :goto_4
-    iget-object p2, p0, Lokhttp3/internal/e/g;->cdM:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->cdg:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p2}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
-    iget-object p2, p0, Lokhttp3/internal/e/g;->cdN:Ljava/util/concurrent/ExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->cdh:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {p2}, Ljava/util/concurrent/ExecutorService;->shutdown()V
 
@@ -967,6 +970,8 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method final declared-synchronized aT(J)V
@@ -975,19 +980,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->cdQ:J
-
-    const/4 v2, 0x0
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->cdk:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/g;->cdQ:J
+    iput-wide v0, p0, Lokhttp3/internal/e/g;->cdk:J
 
-    iget-wide p1, p0, Lokhttp3/internal/e/g;->cdQ:J
+    iget-wide p1, p0, Lokhttp3/internal/e/g;->cdk:J
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdS:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdm:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->IE()I
 
     move-result v0
 
@@ -1001,13 +1004,13 @@
 
     const/4 p1, 0x0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->cdQ:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->cdk:J
 
     invoke-virtual {p0, p1, v0, v1}, Lokhttp3/internal/e/g;->l(IJ)V
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lokhttp3/internal/e/g;->cdQ:J
+    iput-wide p1, p0, Lokhttp3/internal/e/g;->cdk:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1032,7 +1035,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/e/j;->c(ILokhttp3/internal/e/b;)V
 
@@ -1059,7 +1062,7 @@
 
     xor-int/lit8 v6, p2, 0x1
 
-    iget-object v7, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v7, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     monitor-enter v7
 
@@ -1069,28 +1072,28 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget v0, p0, Lokhttp3/internal/e/g;->cdK:I
+    iget v0, p0, Lokhttp3/internal/e/g;->cde:I
 
     const v1, 0x3fffffff    # 1.9999999f
 
     if-le v0, v1, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccJ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->ccd: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;->cdL:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->cdf:Z
 
     if-nez v0, :cond_5
 
-    iget v8, p0, Lokhttp3/internal/e/g;->cdK:I
+    iget v8, p0, Lokhttp3/internal/e/g;->cde:I
 
-    iget v0, p0, Lokhttp3/internal/e/g;->cdK:I
+    iget v0, p0, Lokhttp3/internal/e/g;->cde:I
 
     add-int/lit8 v0, v0, 0x2
 
-    iput v0, p0, Lokhttp3/internal/e/g;->cdK:I
+    iput v0, p0, Lokhttp3/internal/e/g;->cde:I
 
     new-instance v9, Lokhttp3/internal/e/i;
 
@@ -1110,7 +1113,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->cdR:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->cdl:J
 
     const-wide/16 v2, 0x0
 
@@ -1118,7 +1121,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-wide v0, v9, Lokhttp3/internal/e/i;->cdR:J
+    iget-wide v0, v9, Lokhttp3/internal/e/i;->cdl:J
 
     cmp-long p2, v0, v2
 
@@ -1156,7 +1159,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0, v6, v8, p1}, Lokhttp3/internal/e/j;->b(ZILjava/util/List;)V
 
@@ -1166,7 +1169,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object p1, p0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {p1}, Lokhttp3/internal/e/j;->flush()V
 
@@ -1209,9 +1212,9 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccF:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->cbZ:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->cce:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0, v1}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
 
@@ -1290,7 +1293,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/e/g;->cdL:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->cdf:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1310,7 +1313,7 @@
     .locals 9
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->cdM:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->cdg:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v8, Lokhttp3/internal/e/g$2;
 
@@ -1348,6 +1351,8 @@
     :try_end_0
     .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
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 c2a0bb925a..583f5c31bc 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/h$a;
 .super Ljava/lang/Object;
+.source "Http2Reader.java"
 
 # interfaces
 .implements Lokio/q;
@@ -17,13 +18,13 @@
 
 
 # instance fields
-.field private final caE:Lokio/d;
+.field private final bZY:Lokio/d;
 
-.field ceq:B
+.field cdK:B
 
-.field cer:I
+.field cdL:I
 
-.field ces:S
+.field cdM:S
 
 .field left:I
 
@@ -36,7 +37,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h$a;->caE:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
     return-void
 .end method
@@ -58,9 +59,9 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/e/h$a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
-    iget-short v3, p0, Lokhttp3/internal/e/h$a;->ces:S
+    iget-short v3, p0, Lokhttp3/internal/e/h$a;->cdM:S
 
     int-to-long v3, v3
 
@@ -68,9 +69,9 @@
 
     const/4 v0, 0x0
 
-    iput-short v0, p0, Lokhttp3/internal/e/h$a;->ces:S
+    iput-short v0, p0, Lokhttp3/internal/e/h$a;->cdM:S
 
-    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->ceq:B
+    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->cdK:B
 
     and-int/lit8 v3, v3, 0x4
 
@@ -79,9 +80,9 @@
     return-wide v1
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/e/h$a;->cer:I
+    iget v1, p0, Lokhttp3/internal/e/h$a;->cdL:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/h$a;->caE:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
     invoke-static {v2}, Lokhttp3/internal/e/h;->a(Lokio/d;)I
 
@@ -91,7 +92,7 @@
 
     iput v2, p0, Lokhttp3/internal/e/h$a;->length:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/h$a;->caE:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->readByte()B
 
@@ -101,7 +102,7 @@
 
     int-to-byte v2, v2
 
-    iget-object v3, p0, Lokhttp3/internal/e/h$a;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readByte()B
 
@@ -111,7 +112,7 @@
 
     int-to-byte v3, v3
 
-    iput-byte v3, p0, Lokhttp3/internal/e/h$a;->ceq:B
+    iput-byte v3, p0, Lokhttp3/internal/e/h$a;->cdK:B
 
     sget-object v3, Lokhttp3/internal/e/h;->logger:Ljava/util/logging/Logger;
 
@@ -127,11 +128,11 @@
 
     sget-object v3, Lokhttp3/internal/e/h;->logger:Ljava/util/logging/Logger;
 
-    iget v5, p0, Lokhttp3/internal/e/h$a;->cer:I
+    iget v5, p0, Lokhttp3/internal/e/h$a;->cdL:I
 
     iget v6, p0, Lokhttp3/internal/e/h$a;->length:I
 
-    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->ceq:B
+    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->cdK:B
 
     invoke-static {v4, v5, v6, v2, v7}, Lokhttp3/internal/e/e;->a(ZIIBB)Ljava/lang/String;
 
@@ -140,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;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -150,13 +151,13 @@
 
     and-int/2addr v3, v5
 
-    iput v3, p0, Lokhttp3/internal/e/h$a;->cer:I
+    iput v3, p0, Lokhttp3/internal/e/h$a;->cdL:I
 
     const/16 v3, 0x9
 
     if-ne v2, v3, :cond_3
 
-    iget v2, p0, Lokhttp3/internal/e/h$a;->cer:I
+    iget v2, p0, Lokhttp3/internal/e/h$a;->cdL:I
 
     if-ne v2, v1, :cond_2
 
@@ -191,17 +192,15 @@
     throw p1
 
     :cond_4
-    iget-object v0, p0, Lokhttp3/internal/e/h$a;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
-    iget v3, p0, Lokhttp3/internal/e/h$a;->left:I
+    int-to-long v4, v0
 
-    int-to-long v3, v3
-
-    invoke-static {p2, p3, v3, v4}, Ljava/lang/Math;->min(JJ)J
+    invoke-static {p2, p3, v4, v5}, Ljava/lang/Math;->min(JJ)J
 
     move-result-wide p2
 
-    invoke-interface {v0, p1, p2, p3}, Lokio/d;->a(Lokio/c;J)J
+    invoke-interface {v3, p1, p2, p3}, Lokio/d;->a(Lokio/c;J)J
 
     move-result-wide p1
 
@@ -239,7 +238,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/h$a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/r;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali b/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali
index 255931fba6..fad9902e28 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lokhttp3/internal/e/h$b;
 .super Ljava/lang/Object;
+.source "Http2Reader.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/h.smali b/com.discord/smali_classes2/okhttp3/internal/e/h.smali
index 03908ebc6c..103b7b4e81 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/h;
 .super Ljava/lang/Object;
+.source "Http2Reader.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -19,13 +20,13 @@
 
 
 # instance fields
-.field final caE:Lokio/d;
+.field final bZY:Lokio/d;
 
-.field final cdH:Z
+.field private final cdI:Lokhttp3/internal/e/h$a;
 
-.field private final ceo:Lokhttp3/internal/e/h$a;
+.field final cdJ:Lokhttp3/internal/e/d$a;
 
-.field final cep:Lokhttp3/internal/e/d$a;
+.field final cdb:Z
 
 
 # direct methods
@@ -52,30 +53,30 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/h;->cdH:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/h;->cdb:Z
 
     new-instance p1, Lokhttp3/internal/e/h$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/h$a;-><init>(Lokio/d;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->ceo:Lokhttp3/internal/e/h$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->cdI:Lokhttp3/internal/e/h$a;
 
     new-instance p1, Lokhttp3/internal/e/d$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->ceo:Lokhttp3/internal/e/h$a;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->cdI:Lokhttp3/internal/e/h$a;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/d$a;-><init>(Lokio/q;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->cep:Lokhttp3/internal/e/d$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->cdJ:Lokhttp3/internal/e/d$a;
 
     return-void
 .end method
 
-.method private Iq()V
+.method private Ip()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -83,11 +84,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readInt()I
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -185,7 +186,7 @@
 .end method
 
 .method private a(ISBI)Ljava/util/List;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ISBI)",
@@ -201,33 +202,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->ceo:Lokhttp3/internal/e/h$a;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->cdI:Lokhttp3/internal/e/h$a;
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->ceo:Lokhttp3/internal/e/h$a;
-
-    iput p1, v1, Lokhttp3/internal/e/h$a;->left:I
+    iput p1, v0, Lokhttp3/internal/e/h$a;->left:I
 
     iput p1, v0, Lokhttp3/internal/e/h$a;->length:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->ceo:Lokhttp3/internal/e/h$a;
+    iput-short p2, v0, Lokhttp3/internal/e/h$a;->cdM:S
 
-    iput-short p2, p1, Lokhttp3/internal/e/h$a;->ces:S
+    iput-byte p3, v0, Lokhttp3/internal/e/h$a;->cdK:B
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->ceo:Lokhttp3/internal/e/h$a;
+    iput p4, v0, Lokhttp3/internal/e/h$a;->cdL:I
 
-    iput-byte p3, p1, Lokhttp3/internal/e/h$a;->ceq:B
+    iget-object p1, p0, Lokhttp3/internal/e/h;->cdJ:Lokhttp3/internal/e/d$a;
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->ceo:Lokhttp3/internal/e/h$a;
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Ig()V
 
-    iput p4, p1, Lokhttp3/internal/e/h$a;->cer:I
+    iget-object p1, p0, Lokhttp3/internal/e/h;->cdJ:Lokhttp3/internal/e/d$a;
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->cep:Lokhttp3/internal/e/d$a;
-
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Ih()V
-
-    iget-object p1, p0, Lokhttp3/internal/e/h;->cep:Lokhttp3/internal/e/d$a;
-
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Ii()Ljava/util/List;
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Ih()Ljava/util/List;
 
     move-result-object p1
 
@@ -247,7 +240,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     const-wide/16 v2, 0x9
 
@@ -255,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;->caE:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-static {v1}, Lokhttp3/internal/e/h;->a(Lokio/d;)I
 
@@ -269,7 +262,7 @@
 
     if-gt v1, v3, :cond_25
 
-    iget-object v4, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v4}, Lokio/d;->readByte()B
 
@@ -306,7 +299,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readByte()B
 
@@ -316,7 +309,7 @@
 
     int-to-byte p1, p1
 
-    iget-object v6, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v6}, Lokio/d;->readInt()I
 
@@ -349,19 +342,18 @@
 
     packed-switch v4, :pswitch_data_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     int-to-long v0, v1
 
-    :goto_1
     invoke-interface {p1, v0, v1}, Lokio/d;->bc(J)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :pswitch_0
     if-ne v1, v5, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
@@ -381,7 +373,7 @@
 
     invoke-interface {p2, v6, v3, v4}, Lokhttp3/internal/e/h$b;->m(IJ)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_3
     new-array p1, v2, [Ljava/lang/Object;
@@ -422,13 +414,13 @@
 
     if-nez v6, :cond_7
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
     move-result p1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -442,11 +434,11 @@
 
     if-eqz v4, :cond_6
 
-    sget-object v0, Lokio/ByteString;->cgQ:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->cgk:Lokio/ByteString;
 
     if-lez v1, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     int-to-long v3, v1
 
@@ -455,7 +447,7 @@
     :cond_5
     invoke-interface {p2, p1}, Lokhttp3/internal/e/h$b;->fn(I)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_6
     new-array p1, v2, [Ljava/lang/Object;
@@ -507,13 +499,13 @@
 
     if-nez v6, :cond_a
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v1}, Lokio/d;->readInt()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -528,7 +520,7 @@
     :cond_9
     invoke-interface {p2, v0, v1, v3}, Lokhttp3/internal/e/h$b;->a(ZII)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_a
     new-array p1, v0, [Ljava/lang/Object;
@@ -565,7 +557,7 @@
 
     if-eqz v3, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -576,7 +568,7 @@
     int-to-short v0, v0
 
     :cond_c
-    iget-object v3, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -596,7 +588,7 @@
 
     invoke-interface {p2, v3, p1}, Lokhttp3/internal/e/h$b;->o(ILjava/util/List;)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_d
     new-array p1, v0, [Ljava/lang/Object;
@@ -618,7 +610,7 @@
 
     if-nez v1, :cond_e
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_e
     new-array p1, v0, [Ljava/lang/Object;
@@ -642,10 +634,10 @@
 
     const/4 v4, 0x0
 
-    :goto_2
+    :goto_1
     if-ge v4, v1, :cond_14
 
-    iget-object v6, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v6}, Lokio/d;->readShort()S
 
@@ -655,7 +647,7 @@
 
     and-int/2addr v6, v7
 
-    iget-object v7, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v7, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v7}, Lokio/d;->readInt()I
 
@@ -663,7 +655,7 @@
 
     packed-switch v6, :pswitch_data_1
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_5
     if-lt v7, v3, :cond_10
@@ -672,7 +664,7 @@
 
     if-gt v7, v8, :cond_10
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_10
     new-array p1, v2, [Ljava/lang/Object;
@@ -696,7 +688,7 @@
 
     if-ltz v7, :cond_11
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_11
     new-array p1, v0, [Ljava/lang/Object;
@@ -712,14 +704,14 @@
     :pswitch_7
     const/4 v6, 0x4
 
-    goto :goto_3
+    goto :goto_2
 
     :pswitch_8
     if-eqz v7, :cond_13
 
     if-ne v7, v2, :cond_12
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_12
     new-array p1, v0, [Ljava/lang/Object;
@@ -733,18 +725,18 @@
     throw p1
 
     :cond_13
-    :goto_3
+    :goto_2
     :pswitch_9
     invoke-virtual {p1, v6, v7}, Lokhttp3/internal/e/m;->au(II)Lokhttp3/internal/e/m;
 
     add-int/lit8 v4, v4, 0x6
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_14
     invoke-interface {p2, p1}, Lokhttp3/internal/e/h$b;->a(Lokhttp3/internal/e/m;)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_15
     new-array p1, v2, [Ljava/lang/Object;
@@ -779,7 +771,7 @@
 
     if-eqz v6, :cond_18
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
@@ -793,7 +785,7 @@
 
     invoke-interface {p2, v6, v1}, Lokhttp3/internal/e/h$b;->c(ILokhttp3/internal/e/b;)V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_17
     new-array p2, v2, [Ljava/lang/Object;
@@ -847,9 +839,9 @@
 
     if-eqz v6, :cond_1a
 
-    invoke-direct {p0}, Lokhttp3/internal/e/h;->Iq()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Ip()V
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_1a
     new-array p1, v0, [Ljava/lang/Object;
@@ -888,17 +880,17 @@
 
     const/4 v3, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_1c
     const/4 v3, 0x0
 
-    :goto_4
+    :goto_3
     and-int/lit8 v4, p1, 0x8
 
     if-eqz v4, :cond_1d
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -913,7 +905,7 @@
 
     if-eqz v4, :cond_1e
 
-    invoke-direct {p0}, Lokhttp3/internal/e/h;->Iq()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Ip()V
 
     add-int/lit8 v1, v1, -0x5
 
@@ -928,7 +920,7 @@
 
     invoke-interface {p2, v3, v6, p1}, Lokhttp3/internal/e/h$b;->a(ZILjava/util/List;)V
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_1f
     new-array p1, v0, [Ljava/lang/Object;
@@ -950,31 +942,31 @@
 
     const/4 v3, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_20
     const/4 v3, 0x0
 
-    :goto_5
+    :goto_4
     and-int/lit8 v4, p1, 0x20
 
     if-eqz v4, :cond_21
 
     const/4 v4, 0x1
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_21
     const/4 v4, 0x0
 
-    :goto_6
+    :goto_5
     if-nez v4, :cond_23
 
     and-int/lit8 v4, p1, 0x8
 
     if-eqz v4, :cond_22
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -989,15 +981,17 @@
 
     move-result p1
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->bZY: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;->caE:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bZY:Lokio/d;
 
     int-to-long v0, v0
 
-    goto/16 :goto_1
+    invoke-interface {p1, v0, v1}, Lokio/d;->bc(J)V
+
+    goto :goto_6
 
     :cond_23
     new-array p1, v0, [Ljava/lang/Object;
@@ -1021,7 +1015,7 @@
 
     throw p1
 
-    :goto_7
+    :goto_6
     return v2
 
     :cond_25
@@ -1077,7 +1071,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bZY: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 f3f084826d..114be8b1ed 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/i$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/i$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/i$a;
 .super Ljava/lang/Object;
+.source "Http2Stream.java"
 
 # interfaces
 .implements Lokio/p;
@@ -21,11 +22,11 @@
 
 
 # instance fields
-.field private final ceA:Lokio/c;
+.field private final cdU:Lokio/c;
 
-.field ceB:Z
+.field cdV:Z
 
-.field final synthetic ceC:Lokhttp3/internal/e/i;
+.field final synthetic cdW:Lokhttp3/internal/e/i;
 
 .field closed:Z
 
@@ -42,7 +43,7 @@
 .method constructor <init>(Lokhttp3/internal/e/i;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,12 +51,12 @@
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$a;->ceA:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->cdU:Lokio/c;
 
     return-void
 .end method
 
-.method private ai(Z)V
+.method private ah(Z)V
     .locals 11
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -63,14 +64,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
     invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->enter()V
     :try_end_0
@@ -78,9 +79,9 @@
 
     :goto_0
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->cdR:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->cdl:J
 
     const-wide/16 v3, 0x0
 
@@ -88,7 +89,7 @@
 
     if-gtz v5, :cond_0
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->ceB:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->cdV:Z
 
     if-nez v1, :cond_0
 
@@ -96,15 +97,15 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW: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;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->Ix()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->Iw()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
@@ -112,21 +113,21 @@
 
     :cond_0
     :try_start_2
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->Iz()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->Iw()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->Iv()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->cdR:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->cdl:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$a;->ceA:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$a;->cdU:Lokio/c;
 
     iget-wide v3, v3, Lokio/c;->size:J
 
@@ -134,38 +135,36 @@
 
     move-result-wide v9
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-wide v2, v1, Lokhttp3/internal/e/i;->cdR:J
-
-    const/4 v4, 0x0
+    iget-wide v2, v1, Lokhttp3/internal/e/i;->cdl:J
 
     sub-long/2addr v2, v9
 
-    iput-wide v2, v1, Lokhttp3/internal/e/i;->cdR:J
+    iput-wide v2, v1, Lokhttp3/internal/e/i;->cdl: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;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->cdT: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;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v5, v0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v5, v0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW: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;->ceA:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->cdU:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
@@ -185,28 +184,28 @@
     const/4 v7, 0x0
 
     :goto_1
-    iget-object v8, p0, Lokhttp3/internal/e/i$a;->ceA:Lokio/c;
+    iget-object v8, p0, Lokhttp3/internal/e/i$a;->cdU: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;->ceC:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->Iz()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->Iz()V
 
     throw p1
 
@@ -214,11 +213,11 @@
     move-exception p1
 
     :try_start_4
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->Iz()V
 
     throw p1
 
@@ -230,6 +229,8 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -242,7 +243,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
@@ -260,17 +261,17 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->cdV:Z
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceA:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdU:Lokio/c;
 
     iget-wide v2, v0, Lokio/c;->size:J
 
@@ -281,7 +282,7 @@
     if-lez v0, :cond_1
 
     :goto_0
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceA:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdU:Lokio/c;
 
     iget-wide v2, v0, Lokio/c;->size:J
 
@@ -289,16 +290,16 @@
 
     if-lez v0, :cond_2
 
-    invoke-direct {p0, v1}, Lokhttp3/internal/e/i$a;->ai(Z)V
+    invoke-direct {p0, v1}, Lokhttp3/internal/e/i$a;->ah(Z)V
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v2, v0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v2, v0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
     iget v3, v0, Lokhttp3/internal/e/i;->id:I
 
@@ -311,7 +312,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;->ceC:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
@@ -322,17 +323,17 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Iv()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Iu()V
 
     return-void
 
@@ -355,6 +356,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw v1
+
+    return-void
 .end method
 
 .method public final flush()V
@@ -365,21 +368,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->Iw()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->Iv()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;->ceA:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdU:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -391,13 +394,13 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lokhttp3/internal/e/i$a;->ai(Z)V
+    invoke-direct {p0, v0}, Lokhttp3/internal/e/i$a;->ah(Z)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->cdV:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->cdp:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
@@ -415,14 +418,16 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cez:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
     return-object v0
 .end method
@@ -435,12 +440,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->ceA:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->cdU: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;->ceA:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->cdU:Lokio/c;
 
     iget-wide p1, p1, Lokio/c;->size:J
 
@@ -452,7 +457,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lokhttp3/internal/e/i$a;->ai(Z)V
+    invoke-direct {p0, p1}, Lokhttp3/internal/e/i$a;->ah(Z)V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali b/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali
index 562d39d0cb..51b34a2817 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/i$b;
 .super Ljava/lang/Object;
+.source "Http2Stream.java"
 
 # interfaces
 .implements Lokio/q;
@@ -21,15 +22,15 @@
 
 
 # instance fields
-.field ceB:Z
+.field cdV:Z
 
-.field final synthetic ceC:Lokhttp3/internal/e/i;
+.field final synthetic cdW:Lokhttp3/internal/e/i;
 
-.field private final ceD:Lokio/c;
+.field private final cdX:Lokio/c;
 
-.field private final ceE:Lokio/c;
+.field private final cdY:Lokio/c;
 
-.field private final ceF:J
+.field private final cdZ:J
 
 .field closed:Z
 
@@ -46,7 +47,7 @@
 .method constructor <init>(Lokhttp3/internal/e/i;J)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,20 +55,20 @@
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->ceD:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->cdX:Lokio/c;
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
-    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->ceF:J
+    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->cdZ:J
 
     return-void
 .end method
 
-.method private Iy()V
+.method private Ix()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -75,15 +76,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->cdS:Lokhttp3/internal/e/i$c;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->enter()V
 
     :goto_0
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -93,7 +94,7 @@
 
     if-nez v4, :cond_0
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/i$b;->ceB:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/i$b;->cdV:Z
 
     if-nez v0, :cond_0
 
@@ -101,47 +102,49 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     iget-object v0, v0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Ix()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Iw()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->cdS:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->Iz()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->cdS:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->Iz()V
 
     throw v0
+
+    return-void
 .end method
 
 .method private aT(J)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/e/g;->aT(J)V
 
@@ -164,22 +167,22 @@
 
     if-ltz v2, :cond_5
 
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_0
-    invoke-direct {p0}, Lokhttp3/internal/e/i$b;->Iy()V
+    invoke-direct {p0}, Lokhttp3/internal/e/i$b;->Ix()V
 
     iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->closed:Z
 
     if-nez v3, :cond_4
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     iget-object v3, v3, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
 
-    iget-object v4, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v4, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
@@ -189,9 +192,9 @@
 
     if-lez v8, :cond_0
 
-    iget-object v4, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v4, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
-    iget-object v5, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v5, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
     iget-wide v8, v5, Lokio/c;->size:J
 
@@ -203,15 +206,13 @@
 
     move-result-wide p1
 
-    iget-object p3, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object p3, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-wide v4, p3, Lokhttp3/internal/e/i;->cdQ:J
-
-    const/4 v8, 0x0
+    iget-wide v4, p3, Lokhttp3/internal/e/i;->cdk:J
 
     add-long/2addr v4, p1
 
-    iput-wide v4, p3, Lokhttp3/internal/e/i;->cdQ:J
+    iput-wide v4, p3, Lokhttp3/internal/e/i;->cdk:J
 
     goto :goto_0
 
@@ -221,17 +222,17 @@
     :goto_0
     if-nez v3, :cond_1
 
-    iget-object p3, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object p3, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-wide v4, p3, Lokhttp3/internal/e/i;->cdQ:J
+    iget-wide v4, p3, Lokhttp3/internal/e/i;->cdk:J
 
-    iget-object p3, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object p3, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object p3, p3, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object p3, p3, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object p3, p3, Lokhttp3/internal/e/g;->cdS:Lokhttp3/internal/e/m;
+    iget-object p3, p3, Lokhttp3/internal/e/g;->cdm:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p3}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {p3}, Lokhttp3/internal/e/m;->IE()I
 
     move-result p3
 
@@ -243,23 +244,23 @@
 
     if-ltz p3, :cond_1
 
-    iget-object p3, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object p3, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object p3, p3, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object p3, p3, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object v4, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v4, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     iget v4, v4, Lokhttp3/internal/e/i;->id:I
 
-    iget-object v5, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v5, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-wide v8, v5, Lokhttp3/internal/e/i;->cdQ:J
+    iget-wide v8, v5, Lokhttp3/internal/e/i;->cdk:J
 
     invoke-virtual {p3, v4, v8, v9}, Lokhttp3/internal/e/g;->l(IJ)V
 
-    iget-object p3, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object p3, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iput-wide v0, p3, Lokhttp3/internal/e/i;->cdQ:J
+    iput-wide v0, p3, Lokhttp3/internal/e/i;->cdk:J
 
     :cond_1
     monitor-exit v2
@@ -338,26 +339,24 @@
 
     if-lez v2, :cond_6
 
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_0
-    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->ceB:Z
+    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->cdV:Z
 
-    iget-object v4, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v4, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
-    const/4 v6, 0x0
-
     add-long/2addr v4, p2
 
-    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->ceF:J
+    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->cdZ:J
 
-    const/4 v8, 0x0
+    const/4 v8, 0x1
 
-    const/4 v9, 0x1
+    const/4 v9, 0x0
 
     cmp-long v10, v4, v6
 
@@ -379,9 +378,9 @@
 
     invoke-interface {p1, p2, p3}, Lokio/d;->bc(J)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    sget-object p2, Lokhttp3/internal/e/b;->ccI:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->ccc:Lokhttp3/internal/e/b;
 
     invoke-virtual {p1, p2}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/b;)V
 
@@ -395,7 +394,7 @@
     return-void
 
     :cond_2
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->ceD:Lokio/c;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->cdX:Lokio/c;
 
     invoke-interface {p1, v2, p2, p3}, Lokio/d;->a(Lokio/c;J)J
 
@@ -409,12 +408,12 @@
 
     sub-long/2addr p2, v2
 
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_1
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
     iget-wide v3, v3, Lokio/c;->size:J
 
@@ -422,18 +421,21 @@
 
     if-nez v5, :cond_3
 
-    const/4 v8, 0x1
+    goto :goto_2
 
     :cond_3
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    const/4 v8, 0x0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->ceD:Lokio/c;
+    :goto_2
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
+
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->cdX:Lokio/c;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/q;)J
 
     if-eqz v8, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     invoke-virtual {v0}, Ljava/lang/Object;->notifyAll()V
 
@@ -480,7 +482,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
@@ -489,15 +491,15 @@
     :try_start_0
     iput-boolean v1, p0, Lokhttp3/internal/e/i$b;->closed:Z
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->ceE:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->cdY:Lokio/c;
 
     invoke-virtual {v3}, Lokio/c;->clear()V
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
     invoke-virtual {v3}, Ljava/lang/Object;->notifyAll()V
 
@@ -514,9 +516,9 @@
     invoke-direct {p0, v1, v2}, Lokhttp3/internal/e/i$b;->aT(J)V
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Iv()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Iu()V
 
     return-void
 
@@ -534,9 +536,9 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->ceC:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->cdW:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->cdS: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 11f09e4605..33f7c3c497 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/i$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/i$c.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/i$c;
 .super Lokio/a;
+.source "Http2Stream.java"
 
 
 # annotations
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic ceC:Lokhttp3/internal/e/i;
+.field final synthetic cdW: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;->ceC:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$c;->cdW:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -30,7 +31,19 @@
 
 
 # virtual methods
-.method public final IA()V
+.method public final Iy()V
+    .locals 2
+
+    iget-object v0, p0, Lokhttp3/internal/e/i$c;->cdW:Lokhttp3/internal/e/i;
+
+    sget-object v1, Lokhttp3/internal/e/b;->cce: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 Iz()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -38,7 +51,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->IV()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->IU()Z
 
     move-result v0
 
@@ -56,18 +69,6 @@
     throw v0
 .end method
 
-.method public final Iz()V
-    .locals 2
-
-    iget-object v0, p0, Lokhttp3/internal/e/i$c;->ceC:Lokhttp3/internal/e/i;
-
-    sget-object v1, Lokhttp3/internal/e/b;->ccK: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 c(Ljava/io/IOException;)Ljava/io/IOException;
     .locals 2
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/i.smali b/com.discord/smali_classes2/okhttp3/internal/e/i.smali
index 96d357dbda..1f75403c6a 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/i.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/i.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/e/i;
 .super Ljava/lang/Object;
+.source "Http2Stream.java"
 
 
 # annotations
@@ -17,13 +18,9 @@
 
 
 # instance fields
-.field final cdC:Lokhttp3/internal/e/g;
+.field final ccW:Lokhttp3/internal/e/g;
 
-.field cdQ:J
-
-.field cdR:J
-
-.field private final cet:Ljava/util/List;
+.field private final cdN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,7 +30,7 @@
     .end annotation
 .end field
 
-.field ceu:Ljava/util/List;
+.field cdO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,15 +40,19 @@
     .end annotation
 .end field
 
-.field cev:Z
+.field cdP:Z
 
-.field final cew:Lokhttp3/internal/e/i$b;
+.field final cdQ:Lokhttp3/internal/e/i$b;
 
-.field final cex:Lokhttp3/internal/e/i$a;
+.field final cdR:Lokhttp3/internal/e/i$a;
 
-.field final cey:Lokhttp3/internal/e/i$c;
+.field final cdS:Lokhttp3/internal/e/i$c;
 
-.field final cez:Lokhttp3/internal/e/i$c;
+.field final cdT:Lokhttp3/internal/e/i$c;
+
+.field cdk:J
+
+.field cdl:J
 
 .field errorCode:Lokhttp3/internal/e/b;
 
@@ -82,19 +83,19 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->cdQ:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->cdk:J
 
     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;->cey:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->cdS: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;->cez:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->cdT:Lokhttp3/internal/e/i$c;
 
     const/4 v0, 0x0
 
@@ -106,23 +107,23 @@
 
     iput p1, p0, Lokhttp3/internal/e/i;->id:I
 
-    iput-object p2, p0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iput-object p2, p0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-object p1, p2, Lokhttp3/internal/e/g;->cdT:Lokhttp3/internal/e/m;
+    iget-object p1, p2, Lokhttp3/internal/e/g;->cdn:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->IE()I
 
     move-result p1
 
     int-to-long v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->cdR:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->cdl:J
 
     new-instance p1, Lokhttp3/internal/e/i$b;
 
-    iget-object p2, p2, Lokhttp3/internal/e/g;->cdS:Lokhttp3/internal/e/m;
+    iget-object p2, p2, Lokhttp3/internal/e/g;->cdm:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p2}, Lokhttp3/internal/e/m;->IF()I
+    invoke-virtual {p2}, Lokhttp3/internal/e/m;->IE()I
 
     move-result p2
 
@@ -130,23 +131,23 @@
 
     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;->cew:Lokhttp3/internal/e/i$b;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->cdQ: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;->cex:Lokhttp3/internal/e/i$a;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
-    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->ceB:Z
+    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->cdV:Z
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
-    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->ceB:Z
+    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->cdV:Z
 
-    iput-object p5, p0, Lokhttp3/internal/e/i;->cet:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/i;->cdN:Ljava/util/List;
 
     return-void
 
@@ -186,15 +187,15 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->cdV:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->cdV:Z
 
     if-eqz v0, :cond_1
 
@@ -211,7 +212,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
     iget v0, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -234,7 +235,7 @@
 
 
 # virtual methods
-.method public final Ir()Z
+.method public final Iq()Z
     .locals 4
 
     iget v0, p0, Lokhttp3/internal/e/i;->id:I
@@ -255,9 +256,9 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
-    iget-boolean v3, v3, Lokhttp3/internal/e/g;->cdH:Z
+    iget-boolean v3, v3, Lokhttp3/internal/e/g;->cdb:Z
 
     if-ne v3, v0, :cond_1
 
@@ -267,7 +268,7 @@
     return v2
 .end method
 
-.method public final declared-synchronized Is()Ljava/util/List;
+.method public final declared-synchronized Ir()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -287,13 +288,13 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Ir()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Iq()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdS:Lokhttp3/internal/e/i$c;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->enter()V
     :try_end_0
@@ -301,7 +302,7 @@
 
     :goto_0
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->ceu:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdO:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -309,7 +310,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Ix()V
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Iw()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -317,17 +318,17 @@
 
     :cond_0
     :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdS:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->Iz()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->ceu:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdO:Ljava/util/List;
 
     if-eqz v0, :cond_1
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokhttp3/internal/e/i;->ceu:Ljava/util/List;
+    iput-object v1, p0, Lokhttp3/internal/e/i;->cdO:Ljava/util/List;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -348,9 +349,9 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i;->cey:Lokhttp3/internal/e/i$c;
+    iget-object v1, p0, Lokhttp3/internal/e/i;->cdS:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->IA()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->Iz()V
 
     throw v0
 
@@ -371,19 +372,21 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
-.method public final It()Lokio/p;
+.method public final Is()Lokio/p;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/e/i;->cev:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->cdP:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Ir()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Iq()Z
 
     move-result v0
 
@@ -406,7 +409,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
     return-object v0
 
@@ -421,17 +424,17 @@
     throw v0
 .end method
 
-.method final Iu()V
+.method final It()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->ceB:Z
+    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->cdV:Z
 
     invoke-virtual {p0}, Lokhttp3/internal/e/i;->isOpen()Z
 
@@ -445,7 +448,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -465,7 +468,7 @@
     throw v0
 .end method
 
-.method final Iv()V
+.method final Iu()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -476,25 +479,25 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->cdV:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->closed:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->cdV:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->closed:Z
 
@@ -519,7 +522,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/internal/e/b;->ccK:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->cce:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
@@ -528,7 +531,7 @@
     :cond_2
     if-nez v1, :cond_3
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -548,7 +551,7 @@
     throw v0
 .end method
 
-.method final Iw()V
+.method final Iv()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -556,15 +559,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->closed:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->cdV:Z
 
     if-nez v0, :cond_1
 
@@ -575,13 +578,11 @@
     return-void
 
     :cond_0
-    new-instance v0, Lokhttp3/internal/e/n;
+    new-instance v1, Lokhttp3/internal/e/n;
 
-    iget-object v1, p0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
+    invoke-direct {v1, v0}, Lokhttp3/internal/e/n;-><init>(Lokhttp3/internal/e/b;)V
 
-    invoke-direct {v0, v1}, Lokhttp3/internal/e/n;-><init>(Lokhttp3/internal/e/b;)V
-
-    throw v0
+    throw v1
 
     :cond_1
     new-instance v0, Ljava/io/IOException;
@@ -602,7 +603,7 @@
     throw v0
 .end method
 
-.method final Ix()V
+.method final Iw()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -634,11 +635,11 @@
 .method final aU(J)V
     .locals 3
 
-    iget-wide v0, p0, Lokhttp3/internal/e/i;->cdR:J
+    iget-wide v0, p0, Lokhttp3/internal/e/i;->cdl:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->cdR:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->cdl:J
 
     const-wide/16 v0, 0x0
 
@@ -669,7 +670,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -690,7 +691,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cdC:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->ccW:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -748,33 +749,33 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->cdV:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cew:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdQ:Lokhttp3/internal/e/i$b;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->closed:Z
 
     if-eqz v0, :cond_3
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->ceB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->cdV:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->cex:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->cdR:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->closed:Z
 
     if-eqz v0, :cond_3
 
     :cond_2
-    iget-boolean v0, p0, Lokhttp3/internal/e/i;->cev:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->cdP:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/j.smali b/com.discord/smali_classes2/okhttp3/internal/e/j.smali
index a2a1eec4af..7e514293a8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/j.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/j.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/j;
 .super Ljava/lang/Object;
+.source "Http2Writer.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -10,15 +11,15 @@
 
 
 # instance fields
-.field private final cbR:Lokio/BufferedSink;
+.field private final cbl:Lokio/BufferedSink;
 
-.field private final cdH:Z
+.field private final cdb:Z
 
-.field private final ceG:Lokio/c;
+.field private final cea:Lokio/c;
 
-.field ceH:I
+.field ceb:I
 
-.field final ceI:Lokhttp3/internal/e/d$b;
+.field final cec:Lokhttp3/internal/e/d$b;
 
 .field private closed:Z
 
@@ -47,27 +48,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/j;->cdH:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/j;->cdb:Z
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->ceG:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->cea:Lokio/c;
 
     new-instance p1, Lokhttp3/internal/e/d$b;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->ceG:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->cea:Lokio/c;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/d$b;-><init>(Lokio/c;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->ceI:Lokhttp3/internal/e/d$b;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->cec:Lokhttp3/internal/e/d$b;
 
     const/16 p1, 0x4000
 
-    iput p1, p0, Lokhttp3/internal/e/j;->ceH:I
+    iput p1, p0, Lokhttp3/internal/e/j;->ceb:I
 
     return-void
 .end method
@@ -101,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;->ceH:I
+    iget v0, p0, Lokhttp3/internal/e/j;->ceb:I
 
     const/4 v2, 0x1
 
@@ -113,23 +114,23 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-static {v0, p2}, Lokhttp3/internal/e/j;->a(Lokio/BufferedSink;I)V
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     and-int/lit16 p3, p3, 0xff
 
     invoke-interface {p2, p3}, Lokio/BufferedSink;->fy(I)Lokio/BufferedSink;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     and-int/lit16 p3, p4, 0xff
 
     invoke-interface {p2, p3}, Lokio/BufferedSink;->fy(I)Lokio/BufferedSink;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     const p3, 0x7fffffff
 
@@ -161,9 +162,7 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    iget p3, p0, Lokhttp3/internal/e/j;->ceH:I
-
-    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p3
 
@@ -226,7 +225,7 @@
 
     if-lez v2, :cond_1
 
-    iget v2, p0, Lokhttp3/internal/e/j;->ceH:I
+    iget v2, p0, Lokhttp3/internal/e/j;->ceb:I
 
     int-to-long v2, v2
 
@@ -256,9 +255,9 @@
     :goto_1
     invoke-direct {p0, p1, v2, v5, v0}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/internal/e/j;->ceG:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/j;->cea:Lokio/c;
 
     invoke-interface {v0, v1, v3, v4}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
@@ -270,7 +269,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized IB()V
+.method public final declared-synchronized IA()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -285,7 +284,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/j;->cdH:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/j;->cdb:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -317,9 +316,9 @@
 
     const/4 v3, 0x0
 
-    sget-object v4, Lokhttp3/internal/e/e;->cdn:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/e;->ccH:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Jo()Ljava/lang/String;
+    invoke-virtual {v4}, Lokio/ByteString;->Jn()Ljava/lang/String;
 
     move-result-object v4
 
@@ -332,9 +331,9 @@
     invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/internal/e/e;->cdn:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/e;->ccH:Lokio/ByteString;
 
     invoke-virtual {v1}, Lokio/ByteString;->toByteArray()[B
 
@@ -342,7 +341,7 @@
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_1
@@ -403,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;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0, p1}, Lokio/BufferedSink;->fw(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     iget p2, p2, Lokhttp3/internal/e/b;->httpCode:I
 
@@ -417,12 +416,12 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->N([B)Lokio/BufferedSink;
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -476,25 +475,35 @@
     :try_start_0
     iget-boolean v0, p0, Lokhttp3/internal/e/j;->closed:Z
 
-    if-nez v0, :cond_0
+    if-nez v0, :cond_1
 
     const/4 v0, 0x0
 
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     const/16 v1, 0x8
 
     const/4 v2, 0x6
 
     invoke-direct {p0, v0, v1, v2, p1}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1, p2}, Lokio/BufferedSink;->fw(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->fw(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -504,7 +513,7 @@
 
     return-void
 
-    :cond_0
+    :cond_1
     :try_start_1
     new-instance p1, Ljava/io/IOException;
 
@@ -545,7 +554,7 @@
 
     if-lez p4, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     int-to-long v0, p4
 
@@ -593,24 +602,24 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lokhttp3/internal/e/j;->ceH:I
+    iget v0, p0, Lokhttp3/internal/e/j;->ceb:I
 
-    iget v1, p1, Lokhttp3/internal/e/m;->ceR:I
+    iget v1, p1, Lokhttp3/internal/e/m;->cel:I
 
     and-int/lit8 v1, v1, 0x20
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p1, Lokhttp3/internal/e/m;->ceS:[I
+    iget-object v0, p1, Lokhttp3/internal/e/m;->cem:[I
 
     const/4 v1, 0x5
 
     aget v0, v0, v1
 
     :cond_0
-    iput v0, p0, Lokhttp3/internal/e/j;->ceH:I
+    iput v0, p0, Lokhttp3/internal/e/j;->ceb:I
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->IE()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->ID()I
 
     move-result v0
 
@@ -618,9 +627,9 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->ceI:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cec:Lokhttp3/internal/e/d$b;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->IE()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->ID()I
 
     move-result p1
 
@@ -635,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;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -693,15 +702,15 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->ceI:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cec:Lokhttp3/internal/e/d$b;
 
     invoke-virtual {v0, p3}, Lokhttp3/internal/e/d$b;->ax(Ljava/util/List;)V
 
-    iget-object p3, p0, Lokhttp3/internal/e/j;->ceG:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->cea:Lokio/c;
 
     iget-wide v0, p3, Lokio/c;->size:J
 
-    iget p3, p0, Lokhttp3/internal/e/j;->ceH:I
+    iget p3, p0, Lokhttp3/internal/e/j;->ceb:I
 
     int-to-long v2, p3
 
@@ -736,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;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
-    iget-object p3, p0, Lokhttp3/internal/e/j;->ceG:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->cea:Lokio/c;
 
     invoke-interface {p1, p3, v2, v3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
@@ -815,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;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     iget p2, p2, Lokhttp3/internal/e/b;->httpCode:I
 
     invoke-interface {p1, p2}, Lokio/BufferedSink;->fw(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -873,7 +882,7 @@
 
     if-nez v0, :cond_4
 
-    iget v0, p1, Lokhttp3/internal/e/m;->ceR:I
+    iget v0, p1, Lokhttp3/internal/e/m;->cel:I
 
     invoke-static {v0}, Ljava/lang/Integer;->bitCount(I)I
 
@@ -917,13 +926,13 @@
     move v0, v2
 
     :goto_1
-    iget-object v3, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v3, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v3, v0}, Lokio/BufferedSink;->fx(I)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
-    iget-object v3, p1, Lokhttp3/internal/e/m;->ceS:[I
+    iget-object v3, p1, Lokhttp3/internal/e/m;->cem:[I
 
     aget v3, v3, v2
 
@@ -935,7 +944,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -963,6 +972,8 @@
     monitor-exit p0
 
     throw p1
+
+    return-void
 .end method
 
 .method public final declared-synchronized close()V
@@ -980,7 +991,7 @@
     :try_start_0
     iput-boolean v0, p0, Lokhttp3/internal/e/j;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->close()V
     :try_end_0
@@ -1013,7 +1024,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -1078,13 +1089,13 @@
 
     invoke-direct {p0, p1, v0, v1, v2}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl:Lokio/BufferedSink;
 
     long-to-int p2, p2
 
     invoke-interface {p1, p2}, Lokio/BufferedSink;->fw(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->cbl: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 b452fcf333..2e219a333d 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/k$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/k$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/k$a;
 .super Ljava/lang/Object;
+.source "Huffman.java"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # instance fields
-.field final ceN:[Lokhttp3/internal/e/k$a;
+.field final ceh:[Lokhttp3/internal/e/k$a;
 
-.field final ceO:I
+.field final cei:I
 
-.field final ceP:I
+.field final cej:I
 
 
 # direct methods
@@ -31,13 +32,13 @@
 
     new-array v0, v0, [Lokhttp3/internal/e/k$a;
 
-    iput-object v0, p0, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->ceO:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->cei:I
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->ceP:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->cej:I
 
     return-void
 .end method
@@ -49,9 +50,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
-    iput p1, p0, Lokhttp3/internal/e/k$a;->ceO:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->cei:I
 
     and-int/lit8 p1, p2, 0x7
 
@@ -60,7 +61,7 @@
     const/16 p1, 0x8
 
     :cond_0
-    iput p1, p0, Lokhttp3/internal/e/k$a;->ceP:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->cej: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 a519fec9e5..2d41b25cc3 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/k.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/k.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/k;
 .super Ljava/lang/Object;
+.source "Huffman.java"
 
 
 # annotations
@@ -11,15 +12,15 @@
 
 
 # static fields
-.field private static final ceJ:[I
+.field private static final ced:[I
 
-.field private static final ceK:[B
+.field private static final cee:[B
 
-.field private static final ceL:Lokhttp3/internal/e/k;
+.field private static final cef:Lokhttp3/internal/e/k;
 
 
 # instance fields
-.field private final ceM:Lokhttp3/internal/e/k$a;
+.field private final ceg:Lokhttp3/internal/e/k$a;
 
 
 # direct methods
@@ -32,19 +33,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/internal/e/k;->ceJ:[I
+    sput-object v1, Lokhttp3/internal/e/k;->ced:[I
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokhttp3/internal/e/k;->ceK:[B
+    sput-object v0, Lokhttp3/internal/e/k;->cee:[B
 
     new-instance v0, Lokhttp3/internal/e/k;
 
     invoke-direct {v0}, Lokhttp3/internal/e/k;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/k;->ceL:Lokhttp3/internal/e/k;
+    sput-object v0, Lokhttp3/internal/e/k;->cef:Lokhttp3/internal/e/k;
 
     return-void
 
@@ -578,71 +579,69 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/k$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/e/k;->ceM:Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k;->ceg:Lokhttp3/internal/e/k$a;
 
-    invoke-direct {p0}, Lokhttp3/internal/e/k;->ID()V
+    invoke-direct {p0}, Lokhttp3/internal/e/k;->IC()V
 
     return-void
 .end method
 
-.method public static IC()Lokhttp3/internal/e/k;
+.method public static IB()Lokhttp3/internal/e/k;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/k;->ceL:Lokhttp3/internal/e/k;
+    sget-object v0, Lokhttp3/internal/e/k;->cef:Lokhttp3/internal/e/k;
 
     return-object v0
 .end method
 
-.method private ID()V
+.method private IC()V
     .locals 8
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v1, Lokhttp3/internal/e/k;->ceK:[B
+    sget-object v1, Lokhttp3/internal/e/k;->cee:[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_4
+    if-ge v0, v2, :cond_4
 
-    sget-object v1, Lokhttp3/internal/e/k;->ceJ:[I
+    sget-object v2, Lokhttp3/internal/e/k;->ced:[I
 
-    aget v1, v1, v0
+    aget v2, v2, v0
 
-    sget-object v2, Lokhttp3/internal/e/k;->ceK:[B
-
-    aget-byte v2, v2, v0
+    aget-byte v1, v1, v0
 
     new-instance v3, Lokhttp3/internal/e/k$a;
 
-    invoke-direct {v3, v0, v2}, Lokhttp3/internal/e/k$a;-><init>(II)V
+    invoke-direct {v3, v0, v1}, Lokhttp3/internal/e/k$a;-><init>(II)V
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->ceM:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->ceg:Lokhttp3/internal/e/k$a;
 
     :goto_1
     const/16 v5, 0x8
 
-    if-le v2, v5, :cond_2
+    if-le v1, v5, :cond_2
 
-    add-int/lit8 v2, v2, -0x8
+    add-int/lit8 v1, v1, -0x8
 
-    int-to-byte v2, v2
+    int-to-byte v1, v1
 
-    ushr-int v5, v1, v2
+    ushr-int v5, v2, v1
 
     and-int/lit16 v5, v5, 0xff
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     aget-object v6, v6, v5
 
     if-nez v6, :cond_0
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     new-instance v7, Lokhttp3/internal/e/k$a;
 
@@ -651,7 +650,7 @@
     aput-object v7, v6, v5
 
     :cond_0
-    iget-object v4, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     aget-object v4, v4, v5
 
@@ -667,9 +666,9 @@
     throw v0
 
     :cond_2
-    sub-int/2addr v5, v2
+    sub-int/2addr v5, v1
 
-    shl-int/2addr v1, v5
+    shl-int v1, v2, v5
 
     and-int/lit16 v1, v1, 0xff
 
@@ -684,7 +683,7 @@
 
     if-ge v5, v6, :cond_3
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     aput-object v3, v6, v5
 
@@ -713,7 +712,9 @@
 
     const-wide/16 v1, 0x0
 
-    const/4 v3, 0x0
+    move-wide v2, v1
+
+    const/4 v1, 0x0
 
     :goto_0
     invoke-virtual {p0}, Lokio/ByteString;->size()I
@@ -732,28 +733,28 @@
 
     and-int/2addr v4, v6
 
-    sget-object v6, Lokhttp3/internal/e/k;->ceJ:[I
+    sget-object v6, Lokhttp3/internal/e/k;->ced:[I
 
     aget v6, v6, v4
 
-    sget-object v7, Lokhttp3/internal/e/k;->ceK:[B
+    sget-object v7, Lokhttp3/internal/e/k;->cee:[B
 
     aget-byte v4, v7, v4
 
-    shl-long/2addr v1, v4
+    shl-long/2addr v2, v4
 
     int-to-long v6, v6
 
-    or-long/2addr v1, v6
+    or-long/2addr v2, v6
 
-    add-int/2addr v3, v4
+    add-int/2addr v1, v4
 
     :goto_1
-    if-lt v3, v5, :cond_0
+    if-lt v1, v5, :cond_0
 
-    add-int/lit8 v3, v3, -0x8
+    add-int/lit8 v1, v1, -0x8
 
-    shr-long v6, v1, v3
+    shr-long v6, v2, v1
 
     long-to-int v4, v6
 
@@ -767,15 +768,15 @@
     goto :goto_0
 
     :cond_1
-    if-lez v3, :cond_2
+    if-lez v1, :cond_2
 
-    sub-int/2addr v5, v3
+    sub-int/2addr v5, v1
 
-    shl-long v0, v1, v5
+    shl-long/2addr v2, v5
 
-    ushr-int p0, v6, v3
+    ushr-int p0, v6, v1
 
-    int-to-long v2, p0
+    int-to-long v0, p0
 
     or-long/2addr v0, v2
 
@@ -807,7 +808,7 @@
 
     and-int/lit16 v3, v3, 0xff
 
-    sget-object v4, Lokhttp3/internal/e/k;->ceK:[B
+    sget-object v4, Lokhttp3/internal/e/k;->cee:[B
 
     aget-byte v3, v4, v3
 
@@ -842,7 +843,7 @@
 
     invoke-direct {v0}, Ljava/io/ByteArrayOutputStream;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/k;->ceM:Lokhttp3/internal/e/k$a;
+    iget-object v1, p0, Lokhttp3/internal/e/k;->ceg:Lokhttp3/internal/e/k$a;
 
     const/4 v2, 0x0
 
@@ -878,23 +879,23 @@
 
     and-int/lit16 v5, v5, 0xff
 
-    iget-object v4, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     aget-object v4, v4, v5
 
-    iget-object v5, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v5, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     if-nez v5, :cond_0
 
-    iget v5, v4, Lokhttp3/internal/e/k$a;->ceO:I
+    iget v5, v4, Lokhttp3/internal/e/k$a;->cei:I
 
     invoke-virtual {v0, v5}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget v4, v4, Lokhttp3/internal/e/k$a;->ceP:I
+    iget v4, v4, Lokhttp3/internal/e/k$a;->cej:I
 
     sub-int/2addr v3, v4
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->ceM:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->ceg:Lokhttp3/internal/e/k$a;
 
     goto :goto_1
 
@@ -918,27 +919,27 @@
 
     and-int/lit16 p1, p1, 0xff
 
-    iget-object v2, v4, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v2, v4, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     aget-object p1, v2, p1
 
-    iget-object v2, p1, Lokhttp3/internal/e/k$a;->ceN:[Lokhttp3/internal/e/k$a;
+    iget-object v2, p1, Lokhttp3/internal/e/k$a;->ceh:[Lokhttp3/internal/e/k$a;
 
     if-nez v2, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->ceP:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->cej:I
 
     if-gt v2, v3, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->ceO:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->cei:I
 
     invoke-virtual {v0, v2}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget p1, p1, Lokhttp3/internal/e/k$a;->ceP:I
+    iget p1, p1, Lokhttp3/internal/e/k$a;->cej:I
 
     sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->ceM:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->ceg:Lokhttp3/internal/e/k$a;
 
     goto :goto_2
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/l$1.smali b/com.discord/smali_classes2/okhttp3/internal/e/l$1.smali
index 35eea4f0b9..e9ff8b0a93 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/l$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/l$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/e/l$1;
 .super Ljava/lang/Object;
+.source "PushObserver.java"
 
 # interfaces
 .implements Lokhttp3/internal/e/l;
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/l.smali b/com.discord/smali_classes2/okhttp3/internal/e/l.smali
index c004f49980..844d0a6a45 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/l.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/l.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/internal/e/l;
 .super Ljava/lang/Object;
+.source "PushObserver.java"
 
 
 # static fields
-.field public static final ceQ:Lokhttp3/internal/e/l;
+.field public static final cek:Lokhttp3/internal/e/l;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/l$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/l;->ceQ:Lokhttp3/internal/e/l;
+    sput-object v0, Lokhttp3/internal/e/l;->cek: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 ffdeda247e..f956e42323 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/m.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/m.smali
@@ -1,11 +1,12 @@
 .class public final Lokhttp3/internal/e/m;
 .super Ljava/lang/Object;
+.source "Settings.java"
 
 
 # instance fields
-.field ceR:I
+.field cel:I
 
-.field final ceS:[I
+.field final cem:[I
 
 
 # direct methods
@@ -18,23 +19,23 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lokhttp3/internal/e/m;->ceS:[I
+    iput-object v0, p0, Lokhttp3/internal/e/m;->cem:[I
 
     return-void
 .end method
 
 
 # virtual methods
-.method final IE()I
+.method final ID()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->ceR:I
+    iget v0, p0, Lokhttp3/internal/e/m;->cel:I
 
     and-int/lit8 v0, v0, 0x2
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->ceS:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->cem:[I
 
     const/4 v1, 0x1
 
@@ -48,16 +49,16 @@
     return v0
 .end method
 
-.method final IF()I
+.method final IE()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->ceR:I
+    iget v0, p0, Lokhttp3/internal/e/m;->cel:I
 
     and-int/lit16 v0, v0, 0x80
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->ceS:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->cem:[I
 
     const/4 v1, 0x7
 
@@ -72,33 +73,33 @@
 .end method
 
 .method final au(II)Lokhttp3/internal/e/m;
-    .locals 2
+    .locals 3
 
     if-ltz p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->ceS:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->cem:[I
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-lt p1, v0, :cond_0
+    if-lt p1, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    shl-int/2addr v0, p1
+    shl-int/2addr v1, p1
 
-    iget v1, p0, Lokhttp3/internal/e/m;->ceR:I
+    iget v2, p0, Lokhttp3/internal/e/m;->cel:I
 
-    or-int/2addr v0, v1
+    or-int/2addr v1, v2
 
-    iput v0, p0, Lokhttp3/internal/e/m;->ceR:I
-
-    iget-object v0, p0, Lokhttp3/internal/e/m;->ceS:[I
+    iput v1, p0, Lokhttp3/internal/e/m;->cel:I
 
     aput p2, v0, p1
 
+    return-object p0
+
     :cond_1
     :goto_0
     return-object p0
@@ -111,7 +112,7 @@
 
     shl-int p1, v0, p1
 
-    iget v1, p0, Lokhttp3/internal/e/m;->ceR:I
+    iget v1, p0, Lokhttp3/internal/e/m;->cel:I
 
     and-int/2addr p1, v1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/n.smali b/com.discord/smali_classes2/okhttp3/internal/e/n.smali
index e9ba04f39f..edad2b612d 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/n.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/n.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/e/n;
 .super Ljava/io/IOException;
+.source "StreamResetException.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali b/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali
index 270e4f0751..b9ec7e24ee 100644
--- a/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/f/a$1;
 .super Ljava/lang/Object;
+.source "FileSystem.java"
 
 # interfaces
 .implements Lokhttp3/internal/f/a;
diff --git a/com.discord/smali_classes2/okhttp3/internal/f/a.smali b/com.discord/smali_classes2/okhttp3/internal/f/a.smali
index f1e387fbbf..d019b61175 100644
--- a/com.discord/smali_classes2/okhttp3/internal/f/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/f/a.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/internal/f/a;
 .super Ljava/lang/Object;
+.source "FileSystem.java"
 
 
 # static fields
-.field public static final ceT:Lokhttp3/internal/f/a;
+.field public static final cen:Lokhttp3/internal/f/a;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/f/a$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/f/a;->ceT:Lokhttp3/internal/f/a;
+    sput-object v0, Lokhttp3/internal/f/a;->cen: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 7ec8b39008..2f077f6350 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/g/a$a;
 .super Lokhttp3/internal/h/c;
+.source "AndroidPlatform.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field private final cfa:Ljava/lang/Object;
+.field private final ceu:Ljava/lang/Object;
 
-.field private final cfb:Ljava/lang/reflect/Method;
+.field private final cev:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -25,9 +26,9 @@
 
     invoke-direct {p0}, Lokhttp3/internal/h/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/a$a;->cfa:Ljava/lang/Object;
+    iput-object p1, p0, Lokhttp3/internal/g/a$a;->ceu:Ljava/lang/Object;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$a;->cfb:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$a;->cev:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -69,9 +70,9 @@
 
     check-cast p1, [Ljava/security/cert/X509Certificate;
 
-    iget-object v0, p0, Lokhttp3/internal/g/a$a;->cfb:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/a$a;->cev:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$a;->cfa:Ljava/lang/Object;
+    iget-object v1, p0, Lokhttp3/internal/g/a$a;->ceu: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 5a832dbecd..e6cd16ac7d 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/g/a$b;
 .super Ljava/lang/Object;
+.source "AndroidPlatform.java"
 
 # interfaces
 .implements Lokhttp3/internal/h/e;
@@ -17,9 +18,9 @@
 
 
 # instance fields
-.field private final cfc:Ljavax/net/ssl/X509TrustManager;
+.field private final cew:Ljavax/net/ssl/X509TrustManager;
 
-.field private final cfd:Ljava/lang/reflect/Method;
+.field private final cex:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -28,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$b;->cfd:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$b;->cex:Ljava/lang/reflect/Method;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a$b;->cfc:Ljavax/net/ssl/X509TrustManager;
+    iput-object p1, p0, Lokhttp3/internal/g/a$b;->cew:Ljavax/net/ssl/X509TrustManager;
 
     return-void
 .end method
@@ -43,9 +44,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cfd:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cex:Ljava/lang/reflect/Method;
 
-    iget-object v2, p0, Lokhttp3/internal/g/a$b;->cfc:Ljavax/net/ssl/X509TrustManager;
+    iget-object v2, p0, Lokhttp3/internal/g/a$b;->cew:Ljavax/net/ssl/X509TrustManager;
 
     const/4 v3, 0x1
 
@@ -72,10 +73,12 @@
 
     return-object p1
 
-    :catch_0
     :cond_0
     return-object v0
 
+    :catch_0
+    return-object v0
+
     :catch_1
     move-exception p1
 
@@ -109,9 +112,9 @@
     :cond_1
     check-cast p1, Lokhttp3/internal/g/a$b;
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cfc:Ljavax/net/ssl/X509TrustManager;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cew:Ljavax/net/ssl/X509TrustManager;
 
-    iget-object v3, p1, Lokhttp3/internal/g/a$b;->cfc:Ljavax/net/ssl/X509TrustManager;
+    iget-object v3, p1, Lokhttp3/internal/g/a$b;->cew:Ljavax/net/ssl/X509TrustManager;
 
     invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -119,9 +122,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cfd:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cex:Ljava/lang/reflect/Method;
 
-    iget-object p1, p1, Lokhttp3/internal/g/a$b;->cfd:Ljava/lang/reflect/Method;
+    iget-object p1, p1, Lokhttp3/internal/g/a$b;->cex:Ljava/lang/reflect/Method;
 
     invoke-virtual {v1, p1}, Ljava/lang/reflect/Method;->equals(Ljava/lang/Object;)Z
 
@@ -138,13 +141,13 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/g/a$b;->cfc:Ljavax/net/ssl/X509TrustManager;
+    iget-object v0, p0, Lokhttp3/internal/g/a$b;->cew:Ljavax/net/ssl/X509TrustManager;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cfd:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->cex: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 4314e54419..2dd17b2d3b 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/a$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/g/a$c;
 .super Ljava/lang/Object;
+.source "AndroidPlatform.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field private final cfe:Ljava/lang/reflect/Method;
+.field private final cey:Ljava/lang/reflect/Method;
 
-.field private final cff:Ljava/lang/reflect/Method;
+.field private final cez:Ljava/lang/reflect/Method;
 
 .field private final getMethod:Ljava/lang/reflect/Method;
 
@@ -29,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;->cfe:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$c;->cey:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a$c;->cff:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/a$c;->cez:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method static IJ()Lokhttp3/internal/g/a$c;
+.method static II()Lokhttp3/internal/g/a$c;
     .locals 7
 
     const/4 v0, 0x0
@@ -78,10 +79,12 @@
 
     invoke-virtual {v1, v5, v3}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
+    move-object v1, v0
+
     move-object v0, v2
 
     goto :goto_0
@@ -109,7 +112,7 @@
     if-eqz p1, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/g/a$c;->cff:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$c;->cez:Ljava/lang/reflect/Method;
 
     new-array v2, v0, [Ljava/lang/Object;
 
@@ -133,18 +136,16 @@
 
     if-eqz v0, :cond_0
 
-    :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/g/a$c;->getMethod:Ljava/lang/reflect/Method;
-
     const/4 v2, 0x0
 
+    :try_start_0
     new-array v3, v2, [Ljava/lang/Object;
 
     invoke-virtual {v0, v1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v3, p0, Lokhttp3/internal/g/a$c;->cfe:Ljava/lang/reflect/Method;
+    iget-object v3, p0, Lokhttp3/internal/g/a$c;->cey: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 615be944a3..b9e1926790 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/d$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/g/d$a;
 .super Ljava/lang/Object;
+.source "JdkWithJettyBootPlatform.java"
 
 # interfaces
 .implements Ljava/lang/reflect/InvocationHandler;
@@ -17,7 +18,7 @@
 
 
 # instance fields
-.field private final bVt:Ljava/util/List;
+.field private final bUN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,9 +28,9 @@
     .end annotation
 .end field
 
-.field cfm:Z
+.field ceG:Z
 
-.field cfn:Ljava/lang/String;
+.field ceH:Ljava/lang/String;
 
 
 # direct methods
@@ -46,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bVt:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bUN:Ljava/util/List;
 
     return-void
 .end method
@@ -107,7 +108,7 @@
 
     if-ne v1, v0, :cond_2
 
-    iput-boolean v3, p0, Lokhttp3/internal/g/d$a;->cfm:Z
+    iput-boolean v3, p0, Lokhttp3/internal/g/d$a;->ceG:Z
 
     return-object v2
 
@@ -124,7 +125,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bVt:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bUN:Ljava/util/List;
 
     return-object p1
 
@@ -175,7 +176,7 @@
     :goto_0
     if-ge p3, p2, :cond_6
 
-    iget-object v0, p0, Lokhttp3/internal/g/d$a;->bVt:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/g/d$a;->bUN:Ljava/util/List;
 
     invoke-interface {p1, p3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -191,10 +192,9 @@
 
     move-result-object p1
 
-    :goto_1
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->cfn:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->ceH:Ljava/lang/String;
 
     return-object p1
 
@@ -204,13 +204,17 @@
     goto :goto_0
 
     :cond_6
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bVt:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bUN:Ljava/util/List;
 
     invoke-interface {p1, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
-    goto :goto_1
+    check-cast p1, Ljava/lang/String;
+
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->ceH:Ljava/lang/String;
+
+    return-object p1
 
     :cond_7
     const-string v0, "protocolSelected"
@@ -238,7 +242,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->cfn:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->ceH: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 f52c54bf70..32f06cd33e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/e.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/g/e;
 .super Ljava/lang/Object;
+.source "OptionalMethod.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field private final cfo:Ljava/lang/Class;
+.field private final ceI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -23,9 +24,9 @@
     .end annotation
 .end field
 
-.field private final cfp:Ljava/lang/String;
+.field private final ceJ:Ljava/lang/String;
 
-.field private final cfq:[Ljava/lang/Class;
+.field private final ceK:[Ljava/lang/Class;
 
 
 # direct methods
@@ -45,11 +46,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/e;->cfo:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/e;->ceI:Ljava/lang/Class;
 
-    iput-object p2, p0, Lokhttp3/internal/g/e;->cfp:Ljava/lang/String;
+    iput-object p2, p0, Lokhttp3/internal/g/e;->ceJ:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/internal/g/e;->cfq:[Ljava/lang/Class;
+    iput-object p3, p0, Lokhttp3/internal/g/e;->ceK:[Ljava/lang/Class;
 
     return-void
 .end method
@@ -134,11 +135,16 @@
 
     if-nez p1, :cond_0
 
+    move-object p0, v0
+
+    goto :goto_0
+
     :catch_0
     move-object p0, v0
 
     :catch_1
     :cond_0
+    :goto_0
     return-object p0
 .end method
 
@@ -153,15 +159,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/g/e;->cfp:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/internal/g/e;->ceJ:Ljava/lang/String;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/g/e;->cfp:Ljava/lang/String;
-
-    iget-object v2, p0, Lokhttp3/internal/g/e;->cfq:[Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/e;->ceK:[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;
 
@@ -169,12 +173,10 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/g/e;->cfo:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/e;->ceI:Ljava/lang/Class;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/g/e;->cfo:Ljava/lang/Class;
-
     invoke-virtual {p1}, Ljava/lang/reflect/Method;->getReturnType()Ljava/lang/Class;
 
     move-result-object v2
@@ -261,7 +263,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/internal/g/e;->cfp:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/internal/g/e;->ceJ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/h/a.smali b/com.discord/smali_classes2/okhttp3/internal/h/a.smali
index 6cbc2509a9..4ddc224e2e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/h/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/h/a.smali
@@ -1,9 +1,10 @@
 .class public final Lokhttp3/internal/h/a;
 .super Lokhttp3/internal/h/c;
+.source "BasicCertificateChainCleaner.java"
 
 
 # instance fields
-.field private final cfA:Lokhttp3/internal/h/e;
+.field private final ceU:Lokhttp3/internal/h/e;
 
 
 # direct methods
@@ -12,7 +13,7 @@
 
     invoke-direct {p0}, Lokhttp3/internal/h/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/h/a;->cfA:Lokhttp3/internal/h/e;
+    iput-object p1, p0, Lokhttp3/internal/h/a;->ceU:Lokhttp3/internal/h/e;
 
     return-void
 .end method
@@ -117,7 +118,7 @@
 
     check-cast v2, Ljava/security/cert/X509Certificate;
 
-    iget-object v4, p0, Lokhttp3/internal/h/a;->cfA:Lokhttp3/internal/h/e;
+    iget-object v4, p0, Lokhttp3/internal/h/a;->ceU:Lokhttp3/internal/h/e;
 
     invoke-interface {v4, v2}, Lokhttp3/internal/h/e;->e(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
 
@@ -225,6 +226,8 @@
     invoke-direct {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
@@ -243,9 +246,9 @@
 
     check-cast p1, Lokhttp3/internal/h/a;
 
-    iget-object p1, p1, Lokhttp3/internal/h/a;->cfA:Lokhttp3/internal/h/e;
+    iget-object p1, p1, Lokhttp3/internal/h/a;->ceU:Lokhttp3/internal/h/e;
 
-    iget-object v1, p0, Lokhttp3/internal/h/a;->cfA:Lokhttp3/internal/h/e;
+    iget-object v1, p0, Lokhttp3/internal/h/a;->ceU:Lokhttp3/internal/h/e;
 
     invoke-virtual {p1, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -264,7 +267,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/h/a;->cfA:Lokhttp3/internal/h/e;
+    iget-object v0, p0, Lokhttp3/internal/h/a;->ceU:Lokhttp3/internal/h/e;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/h/b.smali b/com.discord/smali_classes2/okhttp3/internal/h/b.smali
index 96c1ae534f..c84371de4d 100644
--- a/com.discord/smali_classes2/okhttp3/internal/h/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/h/b.smali
@@ -1,12 +1,13 @@
 .class public final Lokhttp3/internal/h/b;
 .super Ljava/lang/Object;
+.source "BasicTrustRootIndex.java"
 
 # interfaces
 .implements Lokhttp3/internal/h/e;
 
 
 # instance fields
-.field private final cfB:Ljava/util/Map;
+.field private final ceV:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -29,7 +30,7 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/h/b;->cfB:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/internal/h/b;->ceV:Ljava/util/Map;
 
     array-length v0, p1
 
@@ -44,7 +45,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lokhttp3/internal/h/b;->cfB:Ljava/util/Map;
+    iget-object v4, p0, Lokhttp3/internal/h/b;->ceV:Ljava/util/Map;
 
     invoke-interface {v4, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -60,7 +61,7 @@
 
     invoke-direct {v4, v5}, Ljava/util/LinkedHashSet;-><init>(I)V
 
-    iget-object v5, p0, Lokhttp3/internal/h/b;->cfB:Ljava/util/Map;
+    iget-object v5, p0, Lokhttp3/internal/h/b;->ceV:Ljava/util/Map;
 
     invoke-interface {v5, v3, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -84,7 +85,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/h/b;->cfB:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/h/b;->ceV:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -147,9 +148,9 @@
 
     check-cast p1, Lokhttp3/internal/h/b;
 
-    iget-object p1, p1, Lokhttp3/internal/h/b;->cfB:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/internal/h/b;->ceV:Ljava/util/Map;
 
-    iget-object v1, p0, Lokhttp3/internal/h/b;->cfB:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/h/b;->ceV:Ljava/util/Map;
 
     invoke-interface {p1, v1}, Ljava/util/Map;->equals(Ljava/lang/Object;)Z
 
@@ -168,7 +169,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/h/b;->cfB:Ljava/util/Map;
+    iget-object v0, p0, Lokhttp3/internal/h/b;->ceV:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->hashCode()I
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/h/c.smali b/com.discord/smali_classes2/okhttp3/internal/h/c.smali
index ef66d3c45c..bb6002546b 100644
--- a/com.discord/smali_classes2/okhttp3/internal/h/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/h/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/internal/h/c;
 .super Ljava/lang/Object;
+.source "CertificateChainCleaner.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/okhttp3/internal/h/d.smali b/com.discord/smali_classes2/okhttp3/internal/h/d.smali
index 5558635375..0b452398f9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/h/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/h/d.smali
@@ -1,12 +1,13 @@
 .class public final Lokhttp3/internal/h/d;
 .super Ljava/lang/Object;
+.source "OkHostnameVerifier.java"
 
 # interfaces
 .implements Ljavax/net/ssl/HostnameVerifier;
 
 
 # static fields
-.field public static final cfC:Lokhttp3/internal/h/d;
+.field public static final ceW:Lokhttp3/internal/h/d;
 
 
 # direct methods
@@ -17,7 +18,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/h/d;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/h/d;->cfC:Lokhttp3/internal/h/d;
+    sput-object v0, Lokhttp3/internal/h/d;->ceW:Lokhttp3/internal/h/d;
 
     return-void
 .end method
@@ -137,13 +138,13 @@
 
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_a
+    if-eqz p0, :cond_c
 
     invoke-virtual {p0}, Ljava/lang/String;->length()I
 
     move-result v1
 
-    if-eqz v1, :cond_a
+    if-eqz v1, :cond_c
 
     const-string v1, "."
 
@@ -151,7 +152,7 @@
 
     move-result v1
 
-    if-nez v1, :cond_a
+    if-nez v1, :cond_c
 
     const-string v1, ".."
 
@@ -161,16 +162,16 @@
 
     if-eqz v1, :cond_0
 
-    goto/16 :goto_0
+    goto/16 :goto_2
 
     :cond_0
-    if-eqz p1, :cond_a
+    if-eqz p1, :cond_b
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
     move-result v1
 
-    if-eqz v1, :cond_a
+    if-eqz v1, :cond_b
 
     const-string v1, "."
 
@@ -178,7 +179,7 @@
 
     move-result v1
 
-    if-nez v1, :cond_a
+    if-nez v1, :cond_b
 
     const-string v1, ".."
 
@@ -188,7 +189,7 @@
 
     if-eqz v1, :cond_1
 
-    goto/16 :goto_0
+    goto/16 :goto_1
 
     :cond_1
     const-string v1, "."
@@ -344,6 +345,14 @@
     :cond_a
     :goto_0
     return v0
+
+    :cond_b
+    :goto_1
+    return v0
+
+    :cond_c
+    :goto_2
+    return v0
 .end method
 
 .method private static b(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
diff --git a/com.discord/smali_classes2/okhttp3/internal/h/e.smali b/com.discord/smali_classes2/okhttp3/internal/h/e.smali
index 72a3d5a024..25409ab96b 100644
--- a/com.discord/smali_classes2/okhttp3/internal/h/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/h/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/internal/h/e;
 .super Ljava/lang/Object;
+.source "TrustRootIndex.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a$1.smali b/com.discord/smali_classes2/okhttp3/internal/i/a$1.smali
index 9609232ea7..2c1e31ce46 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/a$1;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cfV:Lokhttp3/internal/i/a;
+.field final synthetic cfp:Lokhttp3/internal/i/a;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/i/a;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/i/a$1;->cfV:Lokhttp3/internal/i/a;
+    iput-object p1, p0, Lokhttp3/internal/i/a$1;->cfp:Lokhttp3/internal/i/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,9 +39,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/i/a$1;->cfV:Lokhttp3/internal/i/a;
+    iget-object v0, p0, Lokhttp3/internal/i/a$1;->cfp:Lokhttp3/internal/i/a;
 
-    invoke-virtual {v0}, Lokhttp3/internal/i/a;->IQ()Z
+    invoke-virtual {v0}, Lokhttp3/internal/i/a;->IP()Z
 
     move-result v0
     :try_end_0
@@ -53,7 +54,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lokhttp3/internal/i/a$1;->cfV:Lokhttp3/internal/i/a;
+    iget-object v1, p0, Lokhttp3/internal/i/a$1;->cfp:Lokhttp3/internal/i/a;
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a$2.smali b/com.discord/smali_classes2/okhttp3/internal/i/a$2.smali
index ddf7541afb..5c2a0a98a9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a$2.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a$2.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/i/a$2;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 # interfaces
 .implements Lokhttp3/f;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cfV:Lokhttp3/internal/i/a;
+.field final synthetic cfp:Lokhttp3/internal/i/a;
 
-.field final synthetic cfW:Lokhttp3/w;
+.field final synthetic cfq:Lokhttp3/w;
 
 
 # direct methods
 .method public constructor <init>(Lokhttp3/internal/i/a;Lokhttp3/w;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iput-object p1, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
-    iput-object p2, p0, Lokhttp3/internal/i/a$2;->cfW:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/internal/i/a$2;->cfq:Lokhttp3/w;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final a(Lokhttp3/e;Ljava/io/IOException;)V
     .locals 1
 
-    iget-object p1, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object p1, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
     const/4 v0, 0x0
 
@@ -53,7 +54,7 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
     iget v1, p2, Lokhttp3/Response;->code:I
 
@@ -115,11 +116,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Jm()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Jl()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Jl()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/ByteString;->Jk()Ljava/lang/String;
 
     move-result-object v0
 
@@ -131,32 +132,32 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v0, Lokhttp3/internal/a;->caO:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->cai: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;->HZ()V
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->HY()V
 
-    invoke-virtual {p1}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     new-instance v1, Lokhttp3/internal/b/c$1;
 
-    iget-object v2, v0, Lokhttp3/internal/b/c;->caE:Lokio/d;
+    iget-object v2, v0, Lokhttp3/internal/b/c;->bZY:Lokio/d;
 
-    iget-object v3, v0, Lokhttp3/internal/b/c;->cbR:Lokio/BufferedSink;
+    iget-object v3, v0, Lokhttp3/internal/b/c;->cbl: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_1
-    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
-    iget-object v0, v0, Lokhttp3/internal/i/a;->cfE:Lokhttp3/WebSocketListener;
+    iget-object v0, v0, Lokhttp3/internal/i/a;->ceY:Lokhttp3/WebSocketListener;
 
-    iget-object v2, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object v2, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
     invoke-virtual {v0, v2, p2}, Lokhttp3/WebSocketListener;->onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
 
@@ -166,11 +167,11 @@
 
     invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfW:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfq:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->Hr()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Hq()Ljava/lang/String;
 
     move-result-object v0
 
@@ -180,23 +181,23 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
     invoke-virtual {v0, p2, v1}, Lokhttp3/internal/i/a;->a(Ljava/lang/String;Lokhttp3/internal/i/a$e;)V
 
-    invoke-virtual {p1}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object p1, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object p1, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/i/a;->IN()V
+    invoke-virtual {p1}, Lokhttp3/internal/i/a;->IM()V
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -205,7 +206,7 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object p2, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
     const/4 v0, 0x0
 
@@ -327,7 +328,7 @@
     :catch_1
     move-exception p1
 
-    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfV:Lokhttp3/internal/i/a;
+    iget-object v0, p0, Lokhttp3/internal/i/a$2;->cfp:Lokhttp3/internal/i/a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/i/a;->a(Ljava/lang/Exception;Lokhttp3/Response;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a$a.smali b/com.discord/smali_classes2/okhttp3/internal/i/a$a.smali
index bb5ab4771e..5a0ec7377f 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/a$a;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cfV:Lokhttp3/internal/i/a;
+.field final synthetic cfp:Lokhttp3/internal/i/a;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/i/a;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/i/a$a;->cfV:Lokhttp3/internal/i/a;
+    iput-object p1, p0, Lokhttp3/internal/i/a$a;->cfp:Lokhttp3/internal/i/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,9 +37,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/i/a$a;->cfV:Lokhttp3/internal/i/a;
+    iget-object v0, p0, Lokhttp3/internal/i/a$a;->cfp:Lokhttp3/internal/i/a;
 
-    iget-object v0, v0, Lokhttp3/internal/i/a;->cca:Lokhttp3/e;
+    iget-object v0, v0, Lokhttp3/internal/i/a;->cbu:Lokhttp3/e;
 
     invoke-interface {v0}, Lokhttp3/e;->cancel()V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a$b.smali b/com.discord/smali_classes2/okhttp3/internal/i/a$b.smali
index e8816912e3..3bbefe4c09 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/a$b;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field final cfX:Lokio/ByteString;
+.field final cfr:Lokio/ByteString;
 
-.field final cfY:J
+.field final cfs:J
 
 .field final code:I
 
@@ -29,11 +30,11 @@
 
     iput p1, p0, Lokhttp3/internal/i/a$b;->code:I
 
-    iput-object p2, p0, Lokhttp3/internal/i/a$b;->cfX:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/i/a$b;->cfr:Lokio/ByteString;
 
     const-wide/32 p1, 0xea60
 
-    iput-wide p1, p0, Lokhttp3/internal/i/a$b;->cfY:J
+    iput-wide p1, p0, Lokhttp3/internal/i/a$b;->cfs:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a$c.smali b/com.discord/smali_classes2/okhttp3/internal/i/a$c.smali
index 3a62b9eda1..f9ea1367e6 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/a$c;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field final cfZ:I
+.field final cft:I
 
-.field final cga:Lokio/ByteString;
+.field final cfu:Lokio/ByteString;
 
 
 # direct methods
@@ -27,9 +28,9 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/i/a$c;->cfZ:I
+    iput p1, p0, Lokhttp3/internal/i/a$c;->cft:I
 
-    iput-object p2, p0, Lokhttp3/internal/i/a$c;->cga:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/i/a$c;->cfu:Lokio/ByteString;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a$d.smali b/com.discord/smali_classes2/okhttp3/internal/i/a$d.smali
index ad2500783d..c5ba6a0f2e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a$d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a$d.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/a$d;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cfV:Lokhttp3/internal/i/a;
+.field final synthetic cfp:Lokhttp3/internal/i/a;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/i/a;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/i/a$d;->cfV:Lokhttp3/internal/i/a;
+    iput-object p1, p0, Lokhttp3/internal/i/a$d;->cfp:Lokhttp3/internal/i/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,12 +37,12 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lokhttp3/internal/i/a$d;->cfV:Lokhttp3/internal/i/a;
+    iget-object v0, p0, Lokhttp3/internal/i/a$d;->cfp:Lokhttp3/internal/i/a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, v0, Lokhttp3/internal/i/a;->cfR:Z
+    iget-boolean v1, v0, Lokhttp3/internal/i/a;->cfl:Z
 
     if-eqz v1, :cond_0
 
@@ -50,15 +51,15 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lokhttp3/internal/i/a;->cfI:Lokhttp3/internal/i/d;
+    iget-object v1, v0, Lokhttp3/internal/i/a;->cfc:Lokhttp3/internal/i/d;
 
-    iget-boolean v2, v0, Lokhttp3/internal/i/a;->cdP:Z
+    iget-boolean v2, v0, Lokhttp3/internal/i/a;->cdj:Z
 
     const/4 v3, -0x1
 
     if-eqz v2, :cond_1
 
-    iget v2, v0, Lokhttp3/internal/i/a;->cfS:I
+    iget v2, v0, Lokhttp3/internal/i/a;->cfm:I
 
     goto :goto_0
 
@@ -66,15 +67,15 @@
     const/4 v2, -0x1
 
     :goto_0
-    iget v4, v0, Lokhttp3/internal/i/a;->cfS:I
+    iget v4, v0, Lokhttp3/internal/i/a;->cfm:I
 
     const/4 v5, 0x1
 
     add-int/2addr v4, v5
 
-    iput v4, v0, Lokhttp3/internal/i/a;->cfS:I
+    iput v4, v0, Lokhttp3/internal/i/a;->cfm:I
 
-    iput-boolean v5, v0, Lokhttp3/internal/i/a;->cdP:Z
+    iput-boolean v5, v0, Lokhttp3/internal/i/a;->cdj:Z
 
     monitor-exit v0
     :try_end_0
@@ -92,7 +93,7 @@
 
     invoke-direct {v3, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v6, v0, Lokhttp3/internal/i/a;->cfF:J
+    iget-wide v6, v0, Lokhttp3/internal/i/a;->ceZ:J
 
     invoke-virtual {v3, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -120,7 +121,7 @@
 
     :cond_2
     :try_start_1
-    sget-object v2, Lokio/ByteString;->cgQ:Lokio/ByteString;
+    sget-object v2, Lokio/ByteString;->cgk:Lokio/ByteString;
 
     const/16 v3, 0x9
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a$e.smali b/com.discord/smali_classes2/okhttp3/internal/i/a$e.smali
index 9011feead0..d77ef18b4e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a$e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a$e.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/internal/i/a$e;
 .super Ljava/lang/Object;
+.source "RealWebSocket.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -17,11 +18,11 @@
 
 
 # instance fields
-.field public final caE:Lokio/d;
+.field public final bZY:Lokio/d;
 
-.field public final cbR:Lokio/BufferedSink;
+.field public final cbl:Lokio/BufferedSink;
 
-.field public final cdH:Z
+.field public final cdb:Z
 
 
 # direct methods
@@ -32,11 +33,11 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/i/a$e;->cdH:Z
+    iput-boolean p1, p0, Lokhttp3/internal/i/a$e;->cdb:Z
 
-    iput-object p2, p0, Lokhttp3/internal/i/a$e;->caE:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/i/a$e;->bZY:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/i/a$e;->cbR:Lokio/BufferedSink;
+    iput-object p3, p0, Lokhttp3/internal/i/a$e;->cbl:Lokio/BufferedSink;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/b.smali b/com.discord/smali_classes2/okhttp3/internal/i/b.smali
index 50a14cb93f..766ac2ca84 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/b.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/internal/i/b;
 .super Ljava/lang/Object;
+.source "WebSocketProtocol.java"
 
 
 # direct methods
@@ -41,7 +42,7 @@
     :cond_1
     iget-wide v2, p0, Lokio/c$a;->offset:J
 
-    iget-object v4, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->cfG:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
@@ -59,12 +60,11 @@
 
     const-wide/16 v2, 0x0
 
-    :goto_1
     invoke-virtual {p0, v2, v3}, Lokio/c$a;->bh(J)I
 
     move-result v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     iget-wide v2, p0, Lokio/c$a;->offset:J
@@ -79,9 +79,11 @@
 
     add-long/2addr v2, v4
 
-    goto :goto_1
+    invoke-virtual {p0, v2, v3}, Lokio/c$a;->bh(J)I
 
-    :goto_2
+    move-result v2
+
+    :goto_1
     const/4 v3, -0x1
 
     if-ne v2, v3, :cond_0
@@ -94,6 +96,8 @@
     invoke-direct {p0}, Ljava/lang/IllegalStateException;-><init>()V
 
     throw p0
+
+    return-void
 .end method
 
 .method static fo(I)Ljava/lang/String;
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/c.smali b/com.discord/smali_classes2/okhttp3/internal/i/c.smali
index a0a92e45e8..7b6cb49af9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/c.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/c;
 .super Ljava/lang/Object;
+.source "WebSocketReader.java"
 
 
 # annotations
@@ -11,25 +12,25 @@
 
 
 # instance fields
-.field final caE:Lokio/d;
+.field final bZY:Lokio/d;
 
-.field final cgb:Z
+.field private final cfA:Lokio/c;
 
-.field final cgc:Lokhttp3/internal/i/c$a;
+.field final cfB:Lokio/c;
 
-.field cgd:J
+.field private final cfC:[B
 
-.field cge:Z
+.field private final cfD:Lokio/c$a;
 
-.field cgf:Z
+.field final cfv:Z
 
-.field private final cgg:Lokio/c;
+.field final cfw:Lokhttp3/internal/i/c$a;
 
-.field final cgh:Lokio/c;
+.field cfx:J
 
-.field private final cgi:[B
+.field cfy:Z
 
-.field private final cgj:Lokio/c$a;
+.field cfz:Z
 
 .field closed:Z
 
@@ -46,21 +47,21 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
     new-instance v0, Lokio/c;
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/i/c;->cgh:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/i/c;->cfB:Lokio/c;
 
     if-eqz p2, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/i/c;->cgb:Z
+    iput-boolean p1, p0, Lokhttp3/internal/i/c;->cfv:Z
 
-    iput-object p2, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/i/c;->cgc:Lokhttp3/internal/i/c$a;
+    iput-object p3, p0, Lokhttp3/internal/i/c;->cfw:Lokhttp3/internal/i/c$a;
 
     const/4 p2, 0x0
 
@@ -76,7 +77,7 @@
     new-array p3, p3, [B
 
     :goto_0
-    iput-object p3, p0, Lokhttp3/internal/i/c;->cgi:[B
+    iput-object p3, p0, Lokhttp3/internal/i/c;->cfC:[B
 
     if-eqz p1, :cond_1
 
@@ -88,7 +89,7 @@
     invoke-direct {p2}, Lokio/c$a;-><init>()V
 
     :goto_1
-    iput-object p2, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
     return-void
 
@@ -102,7 +103,7 @@
     throw p1
 .end method
 
-.method private IT()V
+.method private IS()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -115,13 +116,13 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/i/c;->IR()V
+    invoke-virtual {p0}, Lokhttp3/internal/i/c;->IQ()V
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cgf:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cfz:Z
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/i/c;->IS()V
+    invoke-virtual {p0}, Lokhttp3/internal/i/c;->IR()V
 
     goto :goto_0
 
@@ -131,7 +132,7 @@
 
 
 # virtual methods
-.method final IR()V
+.method final IQ()V
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -143,26 +144,26 @@
 
     if-nez v0, :cond_11
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/r;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/r;->Jq()J
+    invoke-virtual {v0}, Lokio/r;->Jp()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->timeout()Lokio/r;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/r;->Jt()Lokio/r;
+    invoke-virtual {v2}, Lokio/r;->Js()Lokio/r;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->readByte()B
 
@@ -172,7 +173,7 @@
 
     and-int/lit16 v2, v2, 0xff
 
-    iget-object v3, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->timeout()Lokio/r;
 
@@ -188,9 +189,9 @@
 
     and-int/lit16 v0, v2, 0x80
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-eqz v0, :cond_0
 
@@ -202,7 +203,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-boolean v0, p0, Lokhttp3/internal/i/c;->cge:Z
+    iput-boolean v0, p0, Lokhttp3/internal/i/c;->cfy:Z
 
     and-int/lit8 v0, v2, 0x8
 
@@ -216,13 +217,13 @@
     const/4 v0, 0x0
 
     :goto_1
-    iput-boolean v0, p0, Lokhttp3/internal/i/c;->cgf:Z
+    iput-boolean v0, p0, Lokhttp3/internal/i/c;->cfz:Z
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cgf:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cfz:Z
 
     if-eqz v0, :cond_3
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cge:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cfy:Z
 
     if-eqz v0, :cond_2
 
@@ -281,7 +282,7 @@
 
     if-nez v2, :cond_10
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -293,27 +294,28 @@
 
     if-eqz v2, :cond_7
 
-    const/4 v1, 0x1
+    goto :goto_6
 
     :cond_7
-    iget-boolean v2, p0, Lokhttp3/internal/i/c;->cgb:Z
+    const/4 v1, 0x0
+
+    :goto_6
+    iget-boolean v2, p0, Lokhttp3/internal/i/c;->cfv:Z
 
     if-ne v1, v2, :cond_9
 
     new-instance v0, Ljava/net/ProtocolException;
 
-    iget-boolean v1, p0, Lokhttp3/internal/i/c;->cgb:Z
-
-    if-eqz v1, :cond_8
+    if-eqz v2, :cond_8
 
     const-string v1, "Server-sent frames must not be masked."
 
-    goto :goto_6
+    goto :goto_7
 
     :cond_8
     const-string v1, "Client-sent frames must be masked."
 
-    :goto_6
+    :goto_7
     invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
 
     throw v0
@@ -323,9 +325,9 @@
 
     int-to-long v2, v0
 
-    iput-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    iput-wide v2, p0, Lokhttp3/internal/i/c;->cfx:J
 
-    iget-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    iget-wide v2, p0, Lokhttp3/internal/i/c;->cfx:J
 
     const-wide/16 v4, 0x7e
 
@@ -333,7 +335,7 @@
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readShort()S
 
@@ -345,28 +347,26 @@
 
     and-long/2addr v2, v4
 
-    iput-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    iput-wide v2, p0, Lokhttp3/internal/i/c;->cfx:J
 
-    goto :goto_7
+    goto :goto_8
 
     :cond_a
-    iget-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
-
     const-wide/16 v4, 0x7f
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readLong()J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    iput-wide v2, p0, Lokhttp3/internal/i/c;->cfx:J
 
-    iget-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    iget-wide v2, p0, Lokhttp3/internal/i/c;->cfx:J
 
     const-wide/16 v4, 0x0
 
@@ -374,7 +374,7 @@
 
     if-ltz v0, :cond_b
 
-    goto :goto_7
+    goto :goto_8
 
     :cond_b
     new-instance v0, Ljava/net/ProtocolException;
@@ -385,7 +385,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    iget-wide v2, p0, Lokhttp3/internal/i/c;->cfx:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->toHexString(J)Ljava/lang/String;
 
@@ -406,12 +406,12 @@
     throw v0
 
     :cond_c
-    :goto_7
-    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cgf:Z
+    :goto_8
+    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cfz:Z
 
     if-eqz v0, :cond_e
 
-    iget-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    iget-wide v2, p0, Lokhttp3/internal/i/c;->cfx:J
 
     const-wide/16 v4, 0x7d
 
@@ -419,7 +419,7 @@
 
     if-gtz v0, :cond_d
 
-    goto :goto_8
+    goto :goto_9
 
     :cond_d
     new-instance v0, Ljava/net/ProtocolException;
@@ -431,12 +431,12 @@
     throw v0
 
     :cond_e
-    :goto_8
+    :goto_9
     if-eqz v1, :cond_f
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgi:[B
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfC:[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/i/c;->caE:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->timeout()Lokio/r;
 
@@ -477,7 +477,7 @@
     throw v0
 .end method
 
-.method final IS()V
+.method final IR()V
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -485,7 +485,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lokhttp3/internal/i/c;->cgd:J
+    iget-wide v0, p0, Lokhttp3/internal/i/c;->cfx:J
 
     const-wide/16 v2, 0x0
 
@@ -493,35 +493,33 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iget-object v5, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
-    iget-wide v4, p0, Lokhttp3/internal/i/c;->cgd:J
+    invoke-interface {v4, v5, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    invoke-interface {v0, v1, v4, v5}, Lokio/d;->b(Lokio/c;J)V
-
-    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cgb:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cfv:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
     invoke-virtual {v0, v2, v3}, Lokio/c$a;->bh(J)I
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgi:[B
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfC:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/i/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
     invoke-virtual {v0}, Lokio/c$a;->close()V
 
@@ -555,22 +553,22 @@
     throw v0
 
     :pswitch_0
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgc:Lokhttp3/internal/i/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfw:Lokhttp3/internal/i/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Ij()Lokio/ByteString;
 
-    invoke-interface {v0}, Lokhttp3/internal/i/c$a;->IO()V
+    invoke-interface {v0}, Lokhttp3/internal/i/c$a;->IN()V
 
     return-void
 
     :pswitch_1
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgc:Lokhttp3/internal/i/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfw:Lokhttp3/internal/i/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Ij()Lokio/ByteString;
 
     move-result-object v1
 
@@ -583,7 +581,7 @@
 
     const-string v1, ""
 
-    iget-object v4, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iget-object v4, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
@@ -597,15 +595,15 @@
 
     if-eqz v6, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgg:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfA:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Jf()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->Je()Ljava/lang/String;
 
     move-result-object v1
 
@@ -626,7 +624,7 @@
 
     :cond_2
     :goto_0
-    iget-object v2, p0, Lokhttp3/internal/i/c;->cgc:Lokhttp3/internal/i/c$a;
+    iget-object v2, p0, Lokhttp3/internal/i/c;->cfw:Lokhttp3/internal/i/c$a;
 
     invoke-interface {v2, v0, v1}, Lokhttp3/internal/i/c$a;->i(ILjava/lang/String;)V
 
@@ -655,7 +653,7 @@
     .end packed-switch
 .end method
 
-.method final IU()V
+.method final IT()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -668,7 +666,7 @@
 
     if-nez v0, :cond_3
 
-    iget-wide v0, p0, Lokhttp3/internal/i/c;->cgd:J
+    iget-wide v0, p0, Lokhttp3/internal/i/c;->cfx:J
 
     const-wide/16 v2, 0x0
 
@@ -676,52 +674,50 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->caE:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/i/c;->bZY:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgh:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/i/c;->cfB:Lokio/c;
 
-    iget-wide v2, p0, Lokhttp3/internal/i/c;->cgd:J
+    invoke-interface {v2, v3, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    invoke-interface {v0, v1, v2, v3}, Lokio/d;->b(Lokio/c;J)V
-
-    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cgb:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cfv:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgh:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfB:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgh:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfB:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-wide v3, p0, Lokhttp3/internal/i/c;->cgd:J
+    iget-wide v3, p0, Lokhttp3/internal/i/c;->cfx:J
 
     sub-long/2addr v1, v3
 
     invoke-virtual {v0, v1, v2}, Lokio/c$a;->bh(J)I
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/i/c;->cgi:[B
+    iget-object v1, p0, Lokhttp3/internal/i/c;->cfC:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/i/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/i/c;->cgj:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/i/c;->cfD:Lokio/c$a;
 
     invoke-virtual {v0}, Lokio/c$a;->close()V
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cge:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/c;->cfy:Z
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/i/c;->IT()V
+    invoke-direct {p0}, Lokhttp3/internal/i/c;->IS()V
 
     iget v0, p0, Lokhttp3/internal/i/c;->opcode:I
 
@@ -765,4 +761,6 @@
     invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/d$a.smali b/com.discord/smali_classes2/okhttp3/internal/i/d$a.smali
index 8fc7521992..90fad838e6 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/d$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/d$a;
 .super Ljava/lang/Object;
+.source "WebSocketWriter.java"
 
 # interfaces
 .implements Lokio/p;
@@ -17,11 +18,11 @@
 
 
 # instance fields
-.field cfZ:I
+.field cfJ:Z
 
-.field cgp:Z
+.field final synthetic cfK:Lokhttp3/internal/i/d;
 
-.field final synthetic cgq:Lokhttp3/internal/i/d;
+.field cft:I
 
 .field closed:Z
 
@@ -32,7 +33,7 @@
 .method constructor <init>(Lokhttp3/internal/i/d;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iput-object p1, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,17 +54,15 @@
 
     if-nez v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object v1, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
-    iget v2, p0, Lokhttp3/internal/i/d$a;->cfZ:I
+    iget v2, p0, Lokhttp3/internal/i/d$a;->cft:I
 
-    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
-
-    iget-object v0, v0, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/i/d;->cfG:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/i/d$a;->cgp:Z
+    iget-boolean v5, p0, Lokhttp3/internal/i/d$a;->cfJ:Z
 
     const/4 v6, 0x1
 
@@ -73,11 +72,11 @@
 
     iput-boolean v0, p0, Lokhttp3/internal/i/d$a;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lokhttp3/internal/i/d;->cgo:Z
+    iput-boolean v1, v0, Lokhttp3/internal/i/d;->cfI:Z
 
     return-void
 
@@ -103,17 +102,15 @@
 
     if-nez v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object v1, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
-    iget v2, p0, Lokhttp3/internal/i/d$a;->cfZ:I
+    iget v2, p0, Lokhttp3/internal/i/d$a;->cft:I
 
-    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
-
-    iget-object v0, v0, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/i/d;->cfG:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/i/d$a;->cgp:Z
+    iget-boolean v5, p0, Lokhttp3/internal/i/d$a;->cfJ:Z
 
     const/4 v6, 0x0
 
@@ -121,7 +118,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/i/d$a;->cgp:Z
+    iput-boolean v0, p0, Lokhttp3/internal/i/d$a;->cfJ:Z
 
     return-void
 
@@ -138,9 +135,9 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
-    iget-object v0, v0, Lokhttp3/internal/i/d;->cbR:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/i/d;->cbl:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/r;
 
@@ -161,13 +158,13 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
-    iget-object v0, v0, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/i/d;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-boolean p1, p0, Lokhttp3/internal/i/d$a;->cgp:Z
+    iget-boolean p1, p0, Lokhttp3/internal/i/d$a;->cfJ:Z
 
     const/4 p2, 0x0
 
@@ -181,9 +178,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object p1, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
-    iget-object p1, p1, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iget-object p1, p1, Lokhttp3/internal/i/d;->cfG:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
@@ -205,11 +202,11 @@
     const/4 p1, 0x0
 
     :goto_0
-    iget-object p3, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object p3, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
-    iget-object p3, p3, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iget-object p3, p3, Lokhttp3/internal/i/d;->cfG:Lokio/c;
 
-    invoke-virtual {p3}, Lokio/c;->Jb()J
+    invoke-virtual {p3}, Lokio/c;->Ja()J
 
     move-result-wide v2
 
@@ -221,17 +218,17 @@
 
     if-nez p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cgq:Lokhttp3/internal/i/d;
+    iget-object v0, p0, Lokhttp3/internal/i/d$a;->cfK:Lokhttp3/internal/i/d;
 
-    iget v1, p0, Lokhttp3/internal/i/d$a;->cfZ:I
+    iget v1, p0, Lokhttp3/internal/i/d$a;->cft:I
 
-    iget-boolean v4, p0, Lokhttp3/internal/i/d$a;->cgp:Z
+    iget-boolean v4, p0, Lokhttp3/internal/i/d$a;->cfJ:Z
 
     const/4 v5, 0x0
 
     invoke-virtual/range {v0 .. v5}, Lokhttp3/internal/i/d;->a(IJZZ)V
 
-    iput-boolean p2, p0, Lokhttp3/internal/i/d$a;->cgp:Z
+    iput-boolean p2, p0, Lokhttp3/internal/i/d$a;->cfJ:Z
 
     :cond_1
     return-void
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/d.smali b/com.discord/smali_classes2/okhttp3/internal/i/d.smali
index c0477ff8ca..5ea72eb977 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/d.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/internal/i/d;
 .super Ljava/lang/Object;
+.source "WebSocketWriter.java"
 
 
 # annotations
@@ -11,23 +12,23 @@
 
 
 # instance fields
-.field final cbR:Lokio/BufferedSink;
+.field final cbl:Lokio/BufferedSink;
 
-.field final cgb:Z
+.field private final cfC:[B
 
-.field private final cgi:[B
+.field private final cfD:Lokio/c$a;
 
-.field private final cgj:Lokio/c$a;
+.field final cfE:Lokio/c;
 
-.field final cgk:Lokio/c;
+.field cfF:Z
 
-.field cgl:Z
+.field final cfG:Lokio/c;
 
-.field final cgm:Lokio/c;
+.field final cfH:Lokhttp3/internal/i/d$a;
 
-.field final cgn:Lokhttp3/internal/i/d$a;
+.field cfI:Z
 
-.field cgo:Z
+.field final cfv:Z
 
 .field final random:Ljava/util/Random;
 
@@ -42,27 +43,27 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/i/d;->cfG:Lokio/c;
 
     new-instance v0, Lokhttp3/internal/i/d$a;
 
     invoke-direct {v0, p0}, Lokhttp3/internal/i/d$a;-><init>(Lokhttp3/internal/i/d;)V
 
-    iput-object v0, p0, Lokhttp3/internal/i/d;->cgn:Lokhttp3/internal/i/d$a;
+    iput-object v0, p0, Lokhttp3/internal/i/d;->cfH:Lokhttp3/internal/i/d$a;
 
     if-eqz p2, :cond_3
 
     if-eqz p3, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/i/d;->cgb:Z
+    iput-boolean p1, p0, Lokhttp3/internal/i/d;->cfv:Z
 
-    iput-object p2, p0, Lokhttp3/internal/i/d;->cbR:Lokio/BufferedSink;
+    iput-object p2, p0, Lokhttp3/internal/i/d;->cbl:Lokio/BufferedSink;
 
-    invoke-interface {p2}, Lokio/BufferedSink;->IX()Lokio/c;
+    invoke-interface {p2}, Lokio/BufferedSink;->IW()Lokio/c;
 
     move-result-object p2
 
-    iput-object p2, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iput-object p2, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     iput-object p3, p0, Lokhttp3/internal/i/d;->random:Ljava/util/Random;
 
@@ -80,7 +81,7 @@
     move-object p3, p2
 
     :goto_0
-    iput-object p3, p0, Lokhttp3/internal/i/d;->cgi:[B
+    iput-object p3, p0, Lokhttp3/internal/i/d;->cfC:[B
 
     if-eqz p1, :cond_1
 
@@ -89,7 +90,7 @@
     invoke-direct {p2}, Lokio/c$a;-><init>()V
 
     :cond_1
-    iput-object p2, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
     return-void
 
@@ -122,7 +123,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/d;->cgl:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/d;->cfF:Z
 
     if-nez v0, :cond_7
 
@@ -141,11 +142,11 @@
     or-int/lit16 p1, p1, 0x80
 
     :cond_1
-    iget-object p4, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->fs(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/i/d;->cgb:Z
+    iget-boolean p1, p0, Lokhttp3/internal/i/d;->cfv:Z
 
     if-eqz p1, :cond_2
 
@@ -162,7 +163,7 @@
 
     or-int/2addr p1, v0
 
-    iget-object p4, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->fs(I)Lokio/c;
 
@@ -177,11 +178,11 @@
 
     or-int/lit8 p1, v0, 0x7e
 
-    iget-object p4, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->fs(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     long-to-int p4, p2
 
@@ -192,11 +193,11 @@
     :cond_4
     or-int/lit8 p1, v0, 0x7f
 
-    iget-object p4, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->fs(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     const/16 p4, 0x8
 
@@ -327,19 +328,19 @@
     iput-wide p4, p1, Lokio/c;->size:J
 
     :goto_1
-    iget-boolean p1, p0, Lokhttp3/internal/i/d;->cgb:Z
+    iget-boolean p1, p0, Lokhttp3/internal/i/d;->cfv:Z
 
     if-eqz p1, :cond_5
 
     iget-object p1, p0, Lokhttp3/internal/i/d;->random:Ljava/util/Random;
 
-    iget-object p4, p0, Lokhttp3/internal/i/d;->cgi:[B
+    iget-object p4, p0, Lokhttp3/internal/i/d;->cfC:[B
 
     invoke-virtual {p1, p4}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/i/d;->cgi:[B
+    iget-object p4, p0, Lokhttp3/internal/i/d;->cfC:[B
 
     invoke-virtual {p1, p4}, Lokio/c;->M([B)Lokio/c;
 
@@ -349,50 +350,50 @@
 
     if-lez p1, :cond_6
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     iget-wide p4, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
-    iget-object v0, p0, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/i/d;->cfG:Lokio/c;
 
     invoke-virtual {p1, v0, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
     invoke-virtual {p1, p4, p5}, Lokio/c$a;->bh(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/i/d;->cgi:[B
+    iget-object p2, p0, Lokhttp3/internal/i/d;->cfC:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/i/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_2
 
     :cond_5
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/i/d;->cgm:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/i/d;->cfG: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/i/d;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cbl:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->IY()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->IX()Lokio/BufferedSink;
 
     return-void
 
@@ -414,7 +415,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/i/d;->cgl:Z
+    iget-boolean v0, p0, Lokhttp3/internal/i/d;->cfF:Z
 
     if-nez v0, :cond_3
 
@@ -432,76 +433,76 @@
 
     or-int/lit16 p1, p1, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {v1, p1}, Lokio/c;->fs(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/i/d;->cgb:Z
+    iget-boolean p1, p0, Lokhttp3/internal/i/d;->cfv:Z
 
     if-eqz p1, :cond_0
 
     or-int/lit16 p1, v0, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {v1, p1}, Lokio/c;->fs(I)Lokio/c;
 
     iget-object p1, p0, Lokhttp3/internal/i/d;->random:Ljava/util/Random;
 
-    iget-object v1, p0, Lokhttp3/internal/i/d;->cgi:[B
+    iget-object v1, p0, Lokhttp3/internal/i/d;->cfC:[B
 
     invoke-virtual {p1, v1}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/i/d;->cgi:[B
+    iget-object v1, p0, Lokhttp3/internal/i/d;->cfC:[B
 
     invoke-virtual {p1, v1}, Lokio/c;->M([B)Lokio/c;
 
     if-lez v0, :cond_1
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {p1, p2}, Lokio/c;->g(Lokio/ByteString;)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
     invoke-virtual {p1, v0, v1}, Lokio/c$a;->bh(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/i/d;->cgi:[B
+    iget-object p2, p0, Lokhttp3/internal/i/d;->cfC:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/i/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgj:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfD:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {p1, v0}, Lokio/c;->fs(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cgk:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cfE:Lokio/c;
 
     invoke-virtual {p1, p2}, Lokio/c;->g(Lokio/ByteString;)Lokio/c;
 
     :cond_1
     :goto_0
-    iget-object p1, p0, Lokhttp3/internal/i/d;->cbR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/i/d;->cbl: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 355a68f726..17170dece9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
@@ -1,25 +1,26 @@
 .class public final Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 .super Ljava/lang/Object;
+.source "PublicSuffixDatabase.java"
 
 
 # static fields
-.field private static final cfs:[B
+.field private static final ceM:[B
 
-.field private static final cft:[Ljava/lang/String;
+.field private static final ceN:[Ljava/lang/String;
 
-.field private static final cfu:[Ljava/lang/String;
+.field private static final ceO:[Ljava/lang/String;
 
-.field private static final cfv:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.field private static final ceP:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
 
 # instance fields
-.field private final cfw:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final ceQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final cfx:Ljava/util/concurrent/CountDownLatch;
+.field private final ceR:Ljava/util/concurrent/CountDownLatch;
 
-.field private cfy:[B
+.field private ceS:[B
 
-.field private cfz:[B
+.field private ceT:[B
 
 
 # direct methods
@@ -36,11 +37,11 @@
 
     aput-byte v3, v1, v2
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfs:[B
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceM:[B
 
     new-array v1, v2, [Ljava/lang/String;
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cft:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceN:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -48,13 +49,13 @@
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfu:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceO:[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;->cfv:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceP:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     return-void
 .end method
@@ -70,7 +71,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfw:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/concurrent/CountDownLatch;
 
@@ -78,15 +79,15 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfx:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceR:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
 
-.method public static IM()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.method public static IL()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfv:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceP:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     return-object v0
 .end method
@@ -216,7 +217,6 @@
     :cond_4
     if-gez v13, :cond_5
 
-    :goto_5
     add-int/lit8 v4, v5, -0x1
 
     goto :goto_0
@@ -224,7 +224,6 @@
     :cond_5
     if-lez v13, :cond_6
 
-    :goto_6
     add-int/lit8 v2, v9, 0x1
 
     goto :goto_0
@@ -238,7 +237,7 @@
 
     sub-int/2addr v8, v11
 
-    :goto_7
+    :goto_5
     add-int/lit8 v10, v10, 0x1
 
     array-length v11, v1
@@ -251,17 +250,21 @@
 
     add-int/2addr v8, v11
 
-    goto :goto_7
+    goto :goto_5
 
     :cond_7
     if-ge v8, v7, :cond_8
 
-    goto :goto_5
+    add-int/lit8 v4, v5, -0x1
+
+    goto :goto_0
 
     :cond_8
     if-le v8, v7, :cond_9
 
-    goto :goto_6
+    add-int/lit8 v2, v9, 0x1
+
+    goto :goto_0
 
     :cond_9
     new-instance v1, Ljava/lang/String;
@@ -270,19 +273,19 @@
 
     invoke-direct {v1, p0, v5, v6, v2}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
-    goto :goto_8
+    goto :goto_6
 
     :cond_a
     const/4 v1, 0x0
 
-    :goto_8
+    :goto_6
     return-object v1
 .end method
 
 .method private g([Ljava/lang/String;)[Ljava/lang/String;
     .locals 7
 
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfw:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -294,7 +297,7 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfw:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
@@ -361,16 +364,16 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
     :try_start_3
-    iput-object v4, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfy:[B
+    iput-object v4, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceS:[B
 
-    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfz:[B
+    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceT:[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;->cfx:Ljava/util/concurrent/CountDownLatch;
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceR:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v3}, Ljava/util/concurrent/CountDownLatch;->countDown()V
     :try_end_4
@@ -406,18 +409,25 @@
     :goto_1
     if-eqz v0, :cond_3
 
-    goto :goto_3
+    :goto_2
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
+
+    goto :goto_4
 
     :catchall_2
     move-exception p1
 
-    goto :goto_2
+    goto :goto_3
 
     :catch_0
     move-exception v3
 
     :try_start_7
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v4
 
@@ -431,9 +441,9 @@
 
     if-eqz v0, :cond_3
 
-    goto :goto_3
+    goto :goto_2
 
-    :goto_2
+    :goto_3
     if-eqz v0, :cond_1
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
@@ -452,7 +462,7 @@
 
     :cond_2
     :try_start_8
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfx:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceR:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
     :try_end_8
@@ -461,7 +471,6 @@
     goto :goto_4
 
     :catch_2
-    :goto_3
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v0
@@ -473,7 +482,7 @@
     monitor-enter p0
 
     :try_start_9
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfy:[B
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceS:[B
 
     if-eqz v0, :cond_10
 
@@ -516,7 +525,7 @@
 
     if-ge p1, v3, :cond_6
 
-    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfy:[B
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceS:[B
 
     invoke-static {v3, v0, p1}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a([B[[BI)Ljava/lang/String;
 
@@ -554,11 +563,11 @@
 
     if-ge v5, v6, :cond_8
 
-    sget-object v6, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfs:[B
+    sget-object v6, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceM:[B
 
     aput-object v6, p1, v5
 
-    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfy:[B
+    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceS:[B
 
     invoke-static {v6, p1, v5}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a([B[[BI)Ljava/lang/String;
 
@@ -586,7 +595,7 @@
 
     if-ge v1, p1, :cond_a
 
-    iget-object p1, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfz:[B
+    iget-object p1, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceT:[B
 
     invoke-static {p1, v0, v1}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a([B[[BI)Ljava/lang/String;
 
@@ -630,7 +639,7 @@
 
     if-nez v6, :cond_c
 
-    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cfu:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceO:[Ljava/lang/String;
 
     return-object p1
 
@@ -646,7 +655,7 @@
     goto :goto_c
 
     :cond_d
-    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cft:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceN:[Ljava/lang/String;
 
     :goto_c
     if-eqz v6, :cond_e
@@ -660,7 +669,7 @@
     goto :goto_d
 
     :cond_e
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->cft:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->ceN:[Ljava/lang/String;
 
     :goto_d
     array-length v1, p1
@@ -692,6 +701,8 @@
     .catchall {:try_start_a .. :try_end_a} :catchall_3
 
     throw p1
+
+    return-void
 .end method
 
 
@@ -750,10 +761,9 @@
 
     array-length v1, v1
 
-    :goto_0
     sub-int/2addr v0, v1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     array-length v0, v0
@@ -762,9 +772,9 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    goto :goto_0
+    sub-int/2addr v0, v1
 
-    :goto_1
+    :goto_0
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
@@ -775,7 +785,7 @@
 
     move-result-object p1
 
-    :goto_2
+    :goto_1
     array-length v2, p1
 
     if-ge v0, v2, :cond_2
@@ -790,7 +800,7 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->length()I
@@ -815,4 +825,6 @@
     invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/j$1.smali b/com.discord/smali_classes2/okhttp3/j$1.smali
index ff0093ff6d..103e5500ec 100644
--- a/com.discord/smali_classes2/okhttp3/j$1.smali
+++ b/com.discord/smali_classes2/okhttp3/j$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/j$1;
 .super Ljava/lang/Object;
+.source "ConnectionPool.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bYl:Lokhttp3/j;
+.field final synthetic bXF:Lokhttp3/j;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/j;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/j$1;->bYl:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/j$1;->bXF:Lokhttp3/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,7 +39,7 @@
 
     :cond_0
     :goto_0
-    iget-object v0, p0, Lokhttp3/j$1;->bYl:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/j$1;->bXF:Lokhttp3/j;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -71,12 +72,12 @@
 
     sub-long/2addr v0, v2
 
-    iget-object v2, p0, Lokhttp3/j$1;->bYl:Lokhttp3/j;
+    iget-object v2, p0, Lokhttp3/j$1;->bXF:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lokhttp3/j$1;->bYl:Lokhttp3/j;
+    iget-object v3, p0, Lokhttp3/j$1;->bXF:Lokhttp3/j;
 
     long-to-int v0, v0
 
@@ -105,4 +106,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/j.smali b/com.discord/smali_classes2/okhttp3/j.smali
index 45833bf856..db7a6b9b9f 100644
--- a/com.discord/smali_classes2/okhttp3/j.smali
+++ b/com.discord/smali_classes2/okhttp3/j.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/j;
 .super Ljava/lang/Object;
+.source "ConnectionPool.java"
 
 
 # static fields
@@ -9,13 +10,11 @@
 
 
 # instance fields
-.field final bYf:I
+.field private final bXA:J
 
-.field private final bYg:J
+.field final bXB:Ljava/lang/Runnable;
 
-.field final bYh:Ljava/lang/Runnable;
-
-.field final bYi:Ljava/util/Deque;
+.field final bXC:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -25,9 +24,11 @@
     .end annotation
 .end field
 
-.field final bYj:Lokhttp3/internal/b/d;
+.field final bXD:Lokhttp3/internal/b/d;
 
-.field bYk:Z
+.field bXE:Z
+
+.field final bXz:I
 
 
 # direct methods
@@ -84,23 +85,23 @@
 
     invoke-direct {v0, p0}, Lokhttp3/j$1;-><init>(Lokhttp3/j;)V
 
-    iput-object v0, p0, Lokhttp3/j;->bYh:Ljava/lang/Runnable;
+    iput-object v0, p0, Lokhttp3/j;->bXB:Ljava/lang/Runnable;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/j;->bYi:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/j;->bXC: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;->bYj:Lokhttp3/internal/b/d;
+    iput-object v0, p0, Lokhttp3/j;->bXD:Lokhttp3/internal/b/d;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/j;->bYf:I
+    iput v0, p0, Lokhttp3/j;->bXz:I
 
     const-wide/16 v0, 0x5
 
@@ -108,7 +109,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lokhttp3/j;->bYg:J
+    iput-wide v0, p0, Lokhttp3/j;->bXA:J
 
     return-void
 .end method
@@ -121,7 +122,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/j;->bYi:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/j;->bXC:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -153,7 +154,7 @@
 
     check-cast v7, Lokhttp3/internal/b/c;
 
-    iget-object v8, v7, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object v8, v7, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     const/4 v9, 0x0
 
@@ -190,11 +191,11 @@
 
     invoke-direct {v11, v12}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v12, v7, Lokhttp3/internal/b/c;->cbN:Lokhttp3/y;
+    iget-object v12, v7, Lokhttp3/internal/b/c;->cbh:Lokhttp3/y;
 
-    iget-object v12, v12, Lokhttp3/y;->caG:Lokhttp3/a;
+    iget-object v12, v12, Lokhttp3/y;->caa:Lokhttp3/a;
 
-    iget-object v12, v12, Lokhttp3/a;->bVp:Lokhttp3/s;
+    iget-object v12, v12, Lokhttp3/a;->bUJ:Lokhttp3/s;
 
     invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -206,11 +207,11 @@
 
     move-result-object v11
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v12
 
-    iget-object v10, v10, Lokhttp3/internal/b/g$a;->cci:Ljava/lang/Object;
+    iget-object v10, v10, Lokhttp3/internal/b/g$a;->cbC:Ljava/lang/Object;
 
     invoke-virtual {v12, v11, v10}, Lokhttp3/internal/g/f;->s(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -218,7 +219,7 @@
 
     const/4 v10, 0x1
 
-    iput-boolean v10, v7, Lokhttp3/internal/b/c;->cbS:Z
+    iput-boolean v10, v7, Lokhttp3/internal/b/c;->cbm:Z
 
     invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
 
@@ -226,13 +227,11 @@
 
     if-eqz v10, :cond_1
 
-    iget-wide v8, p0, Lokhttp3/j;->bYg:J
-
-    const/4 v10, 0x0
+    iget-wide v8, p0, Lokhttp3/j;->bXA:J
 
     sub-long v8, p1, v8
 
-    iput-wide v8, v7, Lokhttp3/internal/b/c;->cbW:J
+    iput-wide v8, v7, Lokhttp3/internal/b/c;->cbq:J
 
     const/4 v8, 0x0
 
@@ -253,9 +252,7 @@
     :cond_4
     add-int/lit8 v2, v2, 0x1
 
-    iget-wide v8, v7, Lokhttp3/internal/b/c;->cbW:J
-
-    const/4 v10, 0x0
+    iget-wide v8, v7, Lokhttp3/internal/b/c;->cbq:J
 
     sub-long v8, p1, v8
 
@@ -270,13 +267,13 @@
     goto :goto_0
 
     :cond_5
-    iget-wide p1, p0, Lokhttp3/j;->bYg:J
+    iget-wide p1, p0, Lokhttp3/j;->bXA:J
 
     cmp-long v0, v3, p1
 
     if-gez v0, :cond_9
 
-    iget p1, p0, Lokhttp3/j;->bYf:I
+    iget p1, p0, Lokhttp3/j;->bXz:I
 
     if-le v2, p1, :cond_6
 
@@ -285,9 +282,7 @@
     :cond_6
     if-lez v2, :cond_7
 
-    iget-wide p1, p0, Lokhttp3/j;->bYg:J
-
-    const/4 v0, 0x0
+    iget-wide p1, p0, Lokhttp3/j;->bXA:J
 
     sub-long/2addr p1, v3
 
@@ -298,14 +293,14 @@
     :cond_7
     if-lez v6, :cond_8
 
-    iget-wide p1, p0, Lokhttp3/j;->bYg:J
+    iget-wide p1, p0, Lokhttp3/j;->bXA:J
 
     monitor-exit p0
 
     return-wide p1
 
     :cond_8
-    iput-boolean v1, p0, Lokhttp3/j;->bYk:Z
+    iput-boolean v1, p0, Lokhttp3/j;->bXE:Z
 
     const-wide/16 p1, -0x1
 
@@ -315,7 +310,7 @@
 
     :cond_9
     :goto_3
-    iget-object p1, p0, Lokhttp3/j;->bYi:Ljava/util/Deque;
+    iget-object p1, p0, Lokhttp3/j;->bXC:Ljava/util/Deque;
 
     invoke-interface {p1, v5}, Ljava/util/Deque;->remove(Ljava/lang/Object;)Z
 
@@ -323,7 +318,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, v5, Lokhttp3/internal/b/c;->cbP:Ljava/net/Socket;
+    iget-object p1, v5, Lokhttp3/internal/b/c;->cbj:Ljava/net/Socket;
 
     invoke-static {p1}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
@@ -340,4 +335,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/l$a.smali b/com.discord/smali_classes2/okhttp3/l$a.smali
index 98d651effe..5019379100 100644
--- a/com.discord/smali_classes2/okhttp3/l$a.smali
+++ b/com.discord/smali_classes2/okhttp3/l$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/l$a;
 .super Ljava/lang/Object;
+.source "Cookie.java"
 
 
 # annotations
@@ -14,17 +15,17 @@
 
 
 # instance fields
-.field public bYA:J
+.field public bXU:J
 
-.field bYB:Ljava/lang/String;
+.field bXV:Ljava/lang/String;
 
-.field public bYC:Z
+.field public bXW:Z
 
-.field public bYD:Z
+.field public bXX:Z
 
-.field public bYE:Z
+.field public bXY:Z
 
-.field bYF:Z
+.field bXZ:Z
 
 .field public name:Ljava/lang/String;
 
@@ -41,7 +42,7 @@
 
     const-wide v0, 0xe677d21fdbffL
 
-    iput-wide v0, p0, Lokhttp3/l$a;->bYA:J
+    iput-wide v0, p0, Lokhttp3/l$a;->bXU:J
 
     const-string v0, "/"
 
@@ -63,9 +64,9 @@
 
     if-eqz v0, :cond_0
 
-    iput-object v0, p0, Lokhttp3/l$a;->bYB:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l$a;->bXV:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lokhttp3/l$a;->bYF:Z
+    iput-boolean p2, p0, Lokhttp3/l$a;->bXZ:Z
 
     return-object p0
 
diff --git a/com.discord/smali_classes2/okhttp3/m$1.smali b/com.discord/smali_classes2/okhttp3/m$1.smali
index 461f79081b..c56313a46c 100644
--- a/com.discord/smali_classes2/okhttp3/m$1.smali
+++ b/com.discord/smali_classes2/okhttp3/m$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/m$1;
 .super Ljava/lang/Object;
+.source "CookieJar.java"
 
 # interfaces
 .implements Lokhttp3/m;
diff --git a/com.discord/smali_classes2/okhttp3/m.smali b/com.discord/smali_classes2/okhttp3/m.smali
index ad85ca0a8c..b1a8c64aba 100644
--- a/com.discord/smali_classes2/okhttp3/m.smali
+++ b/com.discord/smali_classes2/okhttp3/m.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/m;
 .super Ljava/lang/Object;
+.source "CookieJar.java"
 
 
 # static fields
-.field public static final bYG:Lokhttp3/m;
+.field public static final bYa:Lokhttp3/m;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/m$1;-><init>()V
 
-    sput-object v0, Lokhttp3/m;->bYG:Lokhttp3/m;
+    sput-object v0, Lokhttp3/m;->bYa:Lokhttp3/m;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/o$1.smali b/com.discord/smali_classes2/okhttp3/o$1.smali
index bdb7ff6ce8..5815955e5f 100644
--- a/com.discord/smali_classes2/okhttp3/o$1.smali
+++ b/com.discord/smali_classes2/okhttp3/o$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/o$1;
 .super Ljava/lang/Object;
+.source "Dns.java"
 
 # interfaces
 .implements Lokhttp3/o;
@@ -55,11 +56,11 @@
 
     invoke-static {v0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
 
-    return-object v0
+    return-object p1
 
     :catch_0
     move-exception v0
diff --git a/com.discord/smali_classes2/okhttp3/o.smali b/com.discord/smali_classes2/okhttp3/o.smali
index b0207b809d..a0c6422469 100644
--- a/com.discord/smali_classes2/okhttp3/o.smali
+++ b/com.discord/smali_classes2/okhttp3/o.smali
@@ -1,9 +1,10 @@
 .class public interface abstract Lokhttp3/o;
 .super Ljava/lang/Object;
+.source "Dns.java"
 
 
 # static fields
-.field public static final bYN:Lokhttp3/o;
+.field public static final bYh:Lokhttp3/o;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/o$1;-><init>()V
 
-    sput-object v0, Lokhttp3/o;->bYN:Lokhttp3/o;
+    sput-object v0, Lokhttp3/o;->bYh:Lokhttp3/o;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/p$1.smali b/com.discord/smali_classes2/okhttp3/p$1.smali
index 3b81f37d6a..90a66eb769 100644
--- a/com.discord/smali_classes2/okhttp3/p$1.smali
+++ b/com.discord/smali_classes2/okhttp3/p$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/p$1;
 .super Lokhttp3/p;
+.source "EventListener.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/okhttp3/p$2.smali b/com.discord/smali_classes2/okhttp3/p$2.smali
index a86241e74e..aea0219679 100644
--- a/com.discord/smali_classes2/okhttp3/p$2.smali
+++ b/com.discord/smali_classes2/okhttp3/p$2.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/p$2;
 .super Ljava/lang/Object;
+.source "EventListener.java"
 
 # interfaces
 .implements Lokhttp3/p$a;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bYP:Lokhttp3/p;
+.field final synthetic bYj:Lokhttp3/p;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/p;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/p$2;->bYP:Lokhttp3/p;
+    iput-object p1, p0, Lokhttp3/p$2;->bYj:Lokhttp3/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,10 +34,10 @@
 
 
 # virtual methods
-.method public final Hg()Lokhttp3/p;
+.method public final Hf()Lokhttp3/p;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/p$2;->bYP:Lokhttp3/p;
+    iget-object v0, p0, Lokhttp3/p$2;->bYj: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 7cdac7820b..afd11ac4e4 100644
--- a/com.discord/smali_classes2/okhttp3/p$a.smali
+++ b/com.discord/smali_classes2/okhttp3/p$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lokhttp3/p$a;
 .super Ljava/lang/Object;
+.source "EventListener.java"
 
 
 # annotations
@@ -14,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract Hg()Lokhttp3/p;
+.method public abstract Hf()Lokhttp3/p;
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/p.smali b/com.discord/smali_classes2/okhttp3/p.smali
index 53e9005489..5a186696ee 100644
--- a/com.discord/smali_classes2/okhttp3/p.smali
+++ b/com.discord/smali_classes2/okhttp3/p.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokhttp3/p;
 .super Ljava/lang/Object;
+.source "EventListener.java"
 
 
 # annotations
@@ -11,7 +12,7 @@
 
 
 # static fields
-.field public static final bYO:Lokhttp3/p;
+.field public static final bYi:Lokhttp3/p;
 
 
 # direct methods
@@ -22,7 +23,7 @@
 
     invoke-direct {v0}, Lokhttp3/p$1;-><init>()V
 
-    sput-object v0, Lokhttp3/p;->bYO:Lokhttp3/p;
+    sput-object v0, Lokhttp3/p;->bYi: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 81d3a0e098..18abb46ccc 100644
--- a/com.discord/smali_classes2/okhttp3/q$a.smali
+++ b/com.discord/smali_classes2/okhttp3/q$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/q$a;
 .super Ljava/lang/Object;
+.source "FormBody.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field public final bYT:Ljava/util/List;
+.field public final bYn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final bYU:Ljava/nio/charset/Charset;
+.field private final bYo:Ljava/nio/charset/Charset;
 
 .field public final names:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -63,11 +64,11 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/q$a;->bYT:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q$a;->bYn:Ljava/util/List;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lokhttp3/q$a;->bYU:Ljava/nio/charset/Charset;
+    iput-object p1, p0, Lokhttp3/q$a;->bYo:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -85,7 +86,7 @@
 
     const-string v1, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
 
-    iget-object v2, p0, Lokhttp3/q$a;->bYU:Ljava/nio/charset/Charset;
+    iget-object v2, p0, Lokhttp3/q$a;->bYo:Ljava/nio/charset/Charset;
 
     const/4 v3, 0x0
 
@@ -95,11 +96,11 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/q$a;->bYT:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->bYn:Ljava/util/List;
 
     const-string v0, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
 
-    iget-object v1, p0, Lokhttp3/q$a;->bYU:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->bYo:Ljava/nio/charset/Charset;
 
     invoke-static {p2, v0, v3, v1}, Lokhttp3/s;->a(Ljava/lang/String;Ljava/lang/String;ZLjava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -139,7 +140,7 @@
 
     const-string v1, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
 
-    iget-object v2, p0, Lokhttp3/q$a;->bYU:Ljava/nio/charset/Charset;
+    iget-object v2, p0, Lokhttp3/q$a;->bYo:Ljava/nio/charset/Charset;
 
     const/4 v3, 0x1
 
@@ -149,11 +150,11 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/q$a;->bYT:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->bYn:Ljava/util/List;
 
     const-string v0, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
 
-    iget-object v1, p0, Lokhttp3/q$a;->bYU:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->bYo:Ljava/nio/charset/Charset;
 
     invoke-static {p2, v0, v3, v1}, Lokhttp3/s;->a(Ljava/lang/String;Ljava/lang/String;ZLjava/nio/charset/Charset;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okhttp3/t$1.smali b/com.discord/smali_classes2/okhttp3/t$1.smali
index a7e58a3d60..1aba79ed65 100644
--- a/com.discord/smali_classes2/okhttp3/t$1.smali
+++ b/com.discord/smali_classes2/okhttp3/t$1.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/t$1;
 .super Lokhttp3/internal/a;
+.source "OkHttpClient.java"
 
 
 # annotations
@@ -56,7 +57,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p1, Lokhttp3/j;->bYi:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bXC:Ljava/util/Deque;
 
     invoke-interface {p1}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -83,13 +84,13 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/c;->HT()Z
+    invoke-virtual {v0}, Lokhttp3/internal/b/c;->HS()Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p3}, Lokhttp3/internal/b/g;->HY()Lokhttp3/internal/b/c;
+    invoke-virtual {p3}, Lokhttp3/internal/b/g;->HX()Lokhttp3/internal/b/c;
 
     move-result-object v1
 
@@ -99,7 +100,7 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->bZM:Lokhttp3/j;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->bZg:Lokhttp3/j;
 
     invoke-static {p1}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
 
@@ -118,13 +119,13 @@
 
     :cond_4
     :goto_1
-    iget-object p1, p3, Lokhttp3/internal/b/g;->cco:Lokhttp3/internal/c/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->cbI:Lokhttp3/internal/c/c;
 
     if-nez p1, :cond_5
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -134,9 +135,9 @@
 
     if-ne p1, p2, :cond_5
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -150,9 +151,9 @@
 
     move-result-object p2
 
-    iput-object v0, p3, Lokhttp3/internal/b/g;->ccl:Lokhttp3/internal/b/c;
+    iput-object v0, p3, Lokhttp3/internal/b/g;->cbF:Lokhttp3/internal/b/c;
 
-    iget-object p3, v0, Lokhttp3/internal/b/c;->cbV:Ljava/util/List;
+    iget-object p3, v0, Lokhttp3/internal/b/c;->cbp:Ljava/util/List;
 
     invoke-interface {p3, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -205,7 +206,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p1, Lokhttp3/j;->bYi:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bXC:Ljava/util/Deque;
 
     invoke-interface {p1}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -245,7 +246,7 @@
 .method public final a(Lokhttp3/j;)Lokhttp3/internal/b/d;
     .locals 0
 
-    iget-object p1, p1, Lokhttp3/j;->bYj:Lokhttp3/internal/b/d;
+    iget-object p1, p1, Lokhttp3/j;->bXD:Lokhttp3/internal/b/d;
 
     return-object p1
 .end method
@@ -255,9 +256,9 @@
 
     check-cast p1, Lokhttp3/v;
 
-    iget-object p1, p1, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object p1, p1, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
-    iget-object p1, p1, Lokhttp3/internal/c/j;->cct:Lokhttp3/internal/b/g;
+    iget-object p1, p1, Lokhttp3/internal/c/j;->cbN:Lokhttp3/internal/b/g;
 
     return-object p1
 .end method
@@ -331,17 +332,17 @@
 .method public final a(Lokhttp3/k;Ljavax/net/ssl/SSLSocket;Z)V
     .locals 5
 
-    iget-object v0, p1, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/h;->bVU:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bVo:Ljava/util/Comparator;
 
     invoke-virtual {p2}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p1, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object v2, p1, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     invoke-static {v0, v1, v2}, Lokhttp3/internal/c;->a(Ljava/util/Comparator;[Ljava/lang/String;[Ljava/lang/String;)[Ljava/lang/String;
 
@@ -355,7 +356,7 @@
     move-result-object v0
 
     :goto_0
-    iget-object v1, p1, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     if-eqz v1, :cond_1
 
@@ -365,7 +366,7 @@
 
     move-result-object v2
 
-    iget-object v3, p1, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     invoke-static {v1, v2, v3}, Lokhttp3/internal/c;->a(Ljava/util/Comparator;[Ljava/lang/String;[Ljava/lang/String;)[Ljava/lang/String;
 
@@ -383,7 +384,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lokhttp3/h;->bVU:Ljava/util/Comparator;
+    sget-object v3, Lokhttp3/h;->bVo:Ljava/util/Comparator;
 
     const-string v4, "TLS_FALLBACK_SCSV"
 
@@ -416,24 +417,24 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/k$a;->Hc()Lokhttp3/k;
+    invoke-virtual {p1}, Lokhttp3/k$a;->Hb()Lokhttp3/k;
 
     move-result-object p1
 
-    iget-object p3, p1, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     if-eqz p3, :cond_3
 
-    iget-object p3, p1, Lokhttp3/k;->bYv:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bXP:[Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
 
     :cond_3
-    iget-object p3, p1, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     if-eqz p3, :cond_4
 
-    iget-object p1, p1, Lokhttp3/k;->bYu:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/k;->bXO:[Ljava/lang/String;
 
     invoke-virtual {p2, p1}, Ljavax/net/ssl/SSLSocket;->setEnabledCipherSuites([Ljava/lang/String;)V
 
@@ -475,11 +476,11 @@
 
     :cond_1
     :goto_0
-    iget-boolean v0, p2, Lokhttp3/internal/b/c;->cbS:Z
+    iget-boolean v0, p2, Lokhttp3/internal/b/c;->cbm:Z
 
     if-nez v0, :cond_3
 
-    iget v0, p1, Lokhttp3/j;->bYf:I
+    iget v0, p1, Lokhttp3/j;->bXz:I
 
     if-nez v0, :cond_2
 
@@ -494,7 +495,7 @@
 
     :cond_3
     :goto_1
-    iget-object p1, p1, Lokhttp3/j;->bYi:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bXC:Ljava/util/Deque;
 
     invoke-interface {p1, p2}, Ljava/util/Deque;->remove(Ljava/lang/Object;)Z
 
@@ -527,22 +528,22 @@
 
     :cond_1
     :goto_0
-    iget-boolean v0, p1, Lokhttp3/j;->bYk:Z
+    iget-boolean v0, p1, Lokhttp3/j;->bXE:Z
 
     if-nez v0, :cond_2
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokhttp3/j;->bYk:Z
+    iput-boolean v0, p1, Lokhttp3/j;->bXE:Z
 
     sget-object v0, Lokhttp3/j;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v1, p1, Lokhttp3/j;->bYh:Ljava/lang/Runnable;
+    iget-object v1, p1, Lokhttp3/j;->bXB:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
     :cond_2
-    iget-object p1, p1, Lokhttp3/j;->bYi:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bXC:Ljava/util/Deque;
 
     invoke-interface {p1, p2}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/okhttp3/u.smali b/com.discord/smali_classes2/okhttp3/u.smali
index 432d3badab..63b999b791 100644
--- a/com.discord/smali_classes2/okhttp3/u.smali
+++ b/com.discord/smali_classes2/okhttp3/u.smali
@@ -1,5 +1,6 @@
 .class public final enum Lokhttp3/u;
 .super Ljava/lang/Enum;
+.source "Protocol.java"
 
 
 # annotations
@@ -13,19 +14,19 @@
 
 
 # static fields
-.field public static final enum bZU:Lokhttp3/u;
+.field public static final enum bZo:Lokhttp3/u;
 
-.field public static final enum bZV:Lokhttp3/u;
+.field public static final enum bZp:Lokhttp3/u;
 
-.field public static final enum bZW:Lokhttp3/u;
+.field public static final enum bZq:Lokhttp3/u;
 
-.field public static final enum bZX:Lokhttp3/u;
+.field public static final enum bZr:Lokhttp3/u;
 
-.field public static final enum bZY:Lokhttp3/u;
+.field public static final enum bZs:Lokhttp3/u;
 
-.field public static final enum bZZ:Lokhttp3/u;
+.field public static final enum bZt:Lokhttp3/u;
 
-.field private static final synthetic caa:[Lokhttp3/u;
+.field private static final synthetic bZu:[Lokhttp3/u;
 
 
 # instance fields
@@ -46,7 +47,7 @@
 
     invoke-direct {v0, v1, v3, v2}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -58,7 +59,7 @@
 
     invoke-direct {v0, v1, v4, v2}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -70,7 +71,7 @@
 
     invoke-direct {v0, v1, v5, v2}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->bZW:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bZq:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -82,7 +83,7 @@
 
     invoke-direct {v0, v1, v6, v2}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->bZX:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bZr:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -94,7 +95,7 @@
 
     invoke-direct {v0, v1, v7, v2}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -106,37 +107,37 @@
 
     invoke-direct {v0, v1, v8, v2}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->bZZ:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bZt:Lokhttp3/u;
 
     const/4 v0, 0x6
 
     new-array v0, v0, [Lokhttp3/u;
 
-    sget-object v1, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/u;->bZW:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bZq:Lokhttp3/u;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/u;->bZX:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bZr:Lokhttp3/u;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lokhttp3/u;->bZZ:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bZt:Lokhttp3/u;
 
     aput-object v1, v0, v8
 
-    sput-object v0, Lokhttp3/u;->caa:[Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bZu:[Lokhttp3/u;
 
     return-void
 .end method
@@ -166,7 +167,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -176,12 +177,12 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lokhttp3/u;->bZU:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bZo:Lokhttp3/u;
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -191,12 +192,12 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p0, Lokhttp3/u;->bZV:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bZp:Lokhttp3/u;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -206,12 +207,12 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p0, Lokhttp3/u;->bZY:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bZs:Lokhttp3/u;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/u;->bZX:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZr:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -221,12 +222,12 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p0, Lokhttp3/u;->bZX:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bZr:Lokhttp3/u;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/u;->bZW:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZq:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -236,12 +237,12 @@
 
     if-eqz v0, :cond_4
 
-    sget-object p0, Lokhttp3/u;->bZW:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bZq:Lokhttp3/u;
 
     return-object p0
 
     :cond_4
-    sget-object v0, Lokhttp3/u;->bZZ:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZt:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -251,7 +252,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object p0, Lokhttp3/u;->bZZ:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bZt:Lokhttp3/u;
 
     return-object p0
 
@@ -290,7 +291,7 @@
 .method public static values()[Lokhttp3/u;
     .locals 1
 
-    sget-object v0, Lokhttp3/u;->caa:[Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bZu:[Lokhttp3/u;
 
     invoke-virtual {v0}, [Lokhttp3/u;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okhttp3/v$a.smali b/com.discord/smali_classes2/okhttp3/v$a.smali
index f45c4eeab1..a1e54d8333 100644
--- a/com.discord/smali_classes2/okhttp3/v$a.smali
+++ b/com.discord/smali_classes2/okhttp3/v$a.smali
@@ -1,5 +1,6 @@
 .class final Lokhttp3/v$a;
 .super Lokhttp3/internal/b;
+.source "RealCall.java"
 
 
 # annotations
@@ -14,16 +15,16 @@
 
 
 # instance fields
-.field private final cah:Lokhttp3/f;
+.field private final bZB:Lokhttp3/f;
 
-.field final synthetic cai:Lokhttp3/v;
+.field final synthetic bZC:Lokhttp3/v;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/v;Lokhttp3/f;)V
     .locals 3
 
-    iput-object p1, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iput-object p1, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
     const-string v0, "OkHttp %s"
 
@@ -31,7 +32,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/v;->HB()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v;->HA()Ljava/lang/String;
 
     move-result-object p1
 
@@ -41,23 +42,23 @@
 
     invoke-direct {p0, v0, v1}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lokhttp3/v$a;->cah:Lokhttp3/f;
+    iput-object p2, p0, Lokhttp3/v$a;->bZB:Lokhttp3/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final HD()Ljava/lang/String;
+.method final HC()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->cae:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/v;->bZy:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bZd:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bYx:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -70,27 +71,27 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    invoke-virtual {v2}, Lokhttp3/v;->HC()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/v;->HB()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    iget-object v3, v3, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v3, v3, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
-    iget-boolean v3, v3, Lokhttp3/internal/c/j;->ccn:Z
+    iget-boolean v1, v3, Lokhttp3/internal/c/j;->cbH: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
 
-    if-eqz v3, :cond_0
+    if-eqz v1, :cond_0
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/v$a;->cah:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bZB:Lokhttp3/f;
 
-    iget-object v2, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
     new-instance v3, Ljava/io/IOException;
 
@@ -102,15 +103,10 @@
 
     goto :goto_0
 
-    :catch_0
-    move-exception v1
-
-    goto :goto_1
-
     :cond_0
-    iget-object v1, p0, Lokhttp3/v$a;->cah:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bZB:Lokhttp3/f;
 
-    iget-object v3, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
     invoke-interface {v1, v3, v2}, Lokhttp3/f;->a(Lokhttp3/e;Lokhttp3/Response;)V
     :try_end_1
@@ -118,20 +114,26 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v0, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->bZa:Lokhttp3/n;
 
+    :goto_1
     invoke-virtual {v0, p0}, Lokhttp3/n;->c(Lokhttp3/v$a;)V
 
     return-void
 
+    :catch_0
+    move-exception v1
+
+    goto :goto_2
+
     :catchall_0
     move-exception v0
 
-    goto :goto_4
+    goto :goto_6
 
     :catch_1
     move-exception v0
@@ -140,11 +142,11 @@
 
     const/4 v0, 0x0
 
-    :goto_1
+    :goto_2
     if-eqz v0, :cond_3
 
     :try_start_2
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -156,47 +158,47 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v4, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
     new-instance v5, Ljava/lang/StringBuilder;
 
     invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v6, v4, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v6, v4, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
-    iget-boolean v6, v6, Lokhttp3/internal/c/j;->ccn:Z
+    iget-boolean v6, v6, Lokhttp3/internal/c/j;->cbH:Z
 
     if-eqz v6, :cond_1
 
     const-string v6, "canceled "
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_1
     const-string v6, ""
 
-    :goto_2
+    :goto_3
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v6, v4, Lokhttp3/v;->caf:Z
+    iget-boolean v6, v4, Lokhttp3/v;->bZz:Z
 
     if-eqz v6, :cond_2
 
     const-string v6, "web socket"
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_2
     const-string v6, "call"
 
-    :goto_3
+    :goto_4
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v6, " to "
 
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v4}, Lokhttp3/v;->HB()Ljava/lang/String;
+    invoke-virtual {v4}, Lokhttp3/v;->HA()Ljava/lang/String;
 
     move-result-object v4
 
@@ -214,31 +216,40 @@
 
     invoke-virtual {v0, v2, v3, v1}, Lokhttp3/internal/g/f;->a(ILjava/lang/String;Ljava/lang/Throwable;)V
 
-    goto :goto_0
+    goto :goto_5
 
     :cond_3
-    iget-object v0, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
     invoke-static {v0}, Lokhttp3/v;->c(Lokhttp3/v;)Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v$a;->cah:Lokhttp3/f;
+    iget-object v0, p0, Lokhttp3/v$a;->bZB:Lokhttp3/f;
 
-    iget-object v2, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
     invoke-interface {v0, v2, v1}, Lokhttp3/f;->a(Lokhttp3/e;Ljava/io/IOException;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    goto :goto_0
+    :goto_5
+    iget-object v0, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
 
-    :goto_4
-    iget-object v1, p0, Lokhttp3/v$a;->cai:Lokhttp3/v;
+    iget-object v0, v0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/t;->bZa:Lokhttp3/n;
 
-    iget-object v1, v1, Lokhttp3/t;->bZG:Lokhttp3/n;
+    goto :goto_1
+
+    :goto_6
+    iget-object v1, p0, Lokhttp3/v$a;->bZC:Lokhttp3/v;
+
+    iget-object v1, v1, Lokhttp3/v;->bZv:Lokhttp3/t;
+
+    iget-object v1, v1, Lokhttp3/t;->bZa:Lokhttp3/n;
 
     invoke-virtual {v1, p0}, Lokhttp3/n;->c(Lokhttp3/v$a;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/v.smali b/com.discord/smali_classes2/okhttp3/v.smali
index 59fd9dae8d..d1446149e0 100644
--- a/com.discord/smali_classes2/okhttp3/v.smali
+++ b/com.discord/smali_classes2/okhttp3/v.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/v;
 .super Ljava/lang/Object;
+.source "RealCall.java"
 
 # interfaces
 .implements Lokhttp3/e;
@@ -14,17 +15,17 @@
 
 
 # instance fields
-.field final cab:Lokhttp3/t;
+.field private bZA:Z
 
-.field final cac:Lokhttp3/internal/c/j;
+.field final bZv:Lokhttp3/t;
 
-.field private cad:Lokhttp3/p;
+.field final bZw:Lokhttp3/internal/c/j;
 
-.field final cae:Lokhttp3/w;
+.field private bZx:Lokhttp3/p;
 
-.field final caf:Z
+.field final bZy:Lokhttp3/w;
 
-.field private cag:Z
+.field final bZz:Z
 
 
 # direct methods
@@ -33,25 +34,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/v;->cae:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/v;->bZy:Lokhttp3/w;
 
-    iput-boolean p3, p0, Lokhttp3/v;->caf:Z
+    iput-boolean p3, p0, Lokhttp3/v;->bZz: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;->cac:Lokhttp3/internal/c/j;
+    iput-object p2, p0, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
     return-void
 .end method
 
-.method private HA()V
+.method private Hz()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/f;->IL()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->IK()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -61,9 +62,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v1, p0, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
-    iput-object v0, v1, Lokhttp3/internal/c/j;->cci:Ljava/lang/Object;
+    iput-object v0, v1, Lokhttp3/internal/c/j;->cbC:Ljava/lang/Object;
 
     return-void
 .end method
@@ -75,13 +76,13 @@
 
     invoke-direct {v0, p0, p1, p2}, Lokhttp3/v;-><init>(Lokhttp3/t;Lokhttp3/w;Z)V
 
-    iget-object p0, p0, Lokhttp3/t;->bZJ:Lokhttp3/p$a;
+    iget-object p0, p0, Lokhttp3/t;->bZd:Lokhttp3/p$a;
 
-    invoke-interface {p0}, Lokhttp3/p$a;->Hg()Lokhttp3/p;
+    invoke-interface {p0}, Lokhttp3/p$a;->Hf()Lokhttp3/p;
 
     move-result-object p0
 
-    iput-object p0, v0, Lokhttp3/v;->cad:Lokhttp3/p;
+    iput-object p0, v0, Lokhttp3/v;->bZx:Lokhttp3/p;
 
     return-object v0
 .end method
@@ -89,22 +90,22 @@
 .method static synthetic c(Lokhttp3/v;)Lokhttp3/p;
     .locals 0
 
-    iget-object p0, p0, Lokhttp3/v;->cad:Lokhttp3/p;
+    iget-object p0, p0, Lokhttp3/v;->bZx:Lokhttp3/p;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final GY()Lokhttp3/w;
+.method public final GX()Lokhttp3/w;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->cae:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bZy:Lokhttp3/w;
 
     return-object v0
 .end method
 
-.method public final GZ()Lokhttp3/Response;
+.method public final GY()Lokhttp3/Response;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -115,28 +116,28 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/v;->cag:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bZA:Z
 
     if-nez v0, :cond_1
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->cag:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bZA:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-direct {p0}, Lokhttp3/v;->HA()V
+    invoke-direct {p0}, Lokhttp3/v;->Hz()V
 
     :try_start_1
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->bZa:Lokhttp3/n;
 
     invoke-virtual {v0, p0}, Lokhttp3/n;->a(Lokhttp3/v;)V
 
-    invoke-virtual {p0}, Lokhttp3/v;->HC()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/v;->HB()Lokhttp3/Response;
 
     move-result-object v0
     :try_end_1
@@ -145,9 +146,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->bZa:Lokhttp3/n;
 
     invoke-virtual {v1, p0}, Lokhttp3/n;->b(Lokhttp3/v;)V
 
@@ -180,9 +181,9 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->bZa:Lokhttp3/n;
 
     invoke-virtual {v1, p0}, Lokhttp3/n;->b(Lokhttp3/v;)V
 
@@ -208,21 +209,21 @@
     throw v0
 .end method
 
-.method final HB()Ljava/lang/String;
+.method final HA()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->cae:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bZy:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bVp:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bUJ:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->Hr()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Hq()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final HC()Lokhttp3/Response;
+.method final HB()Lokhttp3/Response;
     .locals 13
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -234,19 +235,19 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bZH:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->bZb:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bZw: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;->cab:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
     iget-object v2, v2, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
@@ -256,9 +257,9 @@
 
     new-instance v0, Lokhttp3/internal/a/a;
 
-    iget-object v2, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    invoke-virtual {v2}, Lokhttp3/t;->Hy()Lokhttp3/internal/a/e;
+    invoke-virtual {v2}, Lokhttp3/t;->Hx()Lokhttp3/internal/a/e;
 
     move-result-object v2
 
@@ -268,26 +269,26 @@
 
     new-instance v0, Lokhttp3/internal/b/a;
 
-    iget-object v2, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bZv: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;->caf:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bZz:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bZI:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->bZc: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;->caf:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bZz:Z
 
     invoke-direct {v0, v2}, Lokhttp3/internal/c/b;-><init>(Z)V
 
@@ -303,21 +304,21 @@
 
     const/4 v5, 0x0
 
-    iget-object v6, p0, Lokhttp3/v;->cae:Lokhttp3/w;
+    iget-object v6, p0, Lokhttp3/v;->bZy:Lokhttp3/w;
 
-    iget-object v8, p0, Lokhttp3/v;->cad:Lokhttp3/p;
+    iget-object v8, p0, Lokhttp3/v;->bZx:Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget v9, v0, Lokhttp3/t;->bZQ:I
+    iget v9, v0, Lokhttp3/t;->bZk:I
 
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget v10, v0, Lokhttp3/t;->bZR:I
+    iget v10, v0, Lokhttp3/t;->bZl:I
 
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget v11, v0, Lokhttp3/t;->bZS:I
+    iget v11, v0, Lokhttp3/t;->bZm:I
 
     move-object v0, v12
 
@@ -325,7 +326,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;->cae:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bZy:Lokhttp3/w;
 
     invoke-interface {v12, v0}, Lokhttp3/Interceptor$Chain;->b(Lokhttp3/w;)Lokhttp3/Response;
 
@@ -340,23 +341,23 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/v;->cag:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bZA:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->cag:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bZA:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-direct {p0}, Lokhttp3/v;->HA()V
+    invoke-direct {p0}, Lokhttp3/v;->Hz()V
 
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bZG:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->bZa:Lokhttp3/n;
 
     new-instance v1, Lokhttp3/v$a;
 
@@ -389,7 +390,7 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/c/j;->cancel()V
 
@@ -404,11 +405,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/v;->cab:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bZv:Lokhttp3/t;
 
-    iget-object v1, p0, Lokhttp3/v;->cae:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/v;->bZy:Lokhttp3/w;
 
-    iget-boolean v2, p0, Lokhttp3/v;->caf:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bZz:Z
 
     invoke-static {v0, v1, v2}, Lokhttp3/v;->a(Lokhttp3/t;Lokhttp3/w;Z)Lokhttp3/v;
 
@@ -420,9 +421,9 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->cac:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bZw:Lokhttp3/internal/c/j;
 
-    iget-boolean v0, v0, Lokhttp3/internal/c/j;->ccn:Z
+    iget-boolean v0, v0, Lokhttp3/internal/c/j;->cbH:Z
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/x$a.smali b/com.discord/smali_classes2/okhttp3/x$a.smali
index f92c62bd50..775f86e635 100644
--- a/com.discord/smali_classes2/okhttp3/x$a.smali
+++ b/com.discord/smali_classes2/okhttp3/x$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokhttp3/x$a;
 .super Ljava/io/Reader;
+.source "ResponseBody.java"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # instance fields
-.field private final bYU:Ljava/nio/charset/Charset;
+.field private final bYo:Ljava/nio/charset/Charset;
 
-.field private final caE:Lokio/d;
+.field private final bZY:Lokio/d;
 
-.field private caF:Ljava/io/Reader;
+.field private bZZ:Ljava/io/Reader;
 
 .field private closed:Z
 
@@ -29,9 +30,9 @@
 
     invoke-direct {p0}, Ljava/io/Reader;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/x$a;->caE:Lokio/d;
+    iput-object p1, p0, Lokhttp3/x$a;->bZY:Lokio/d;
 
-    iput-object p2, p0, Lokhttp3/x$a;->bYU:Ljava/nio/charset/Charset;
+    iput-object p2, p0, Lokhttp3/x$a;->bYo:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -50,18 +51,16 @@
 
     iput-boolean v0, p0, Lokhttp3/x$a;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/x$a;->caF:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bZZ:Ljava/io/Reader;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/x$a;->caF:Ljava/io/Reader;
-
     invoke-virtual {v0}, Ljava/io/Reader;->close()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/x$a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
@@ -80,13 +79,13 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/x$a;->caF:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bZZ:Ljava/io/Reader;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/x$a;->caE:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->bZY:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/x$a;->bYU:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/x$a;->bYo:Ljava/nio/charset/Charset;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c;->a(Lokio/d;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
@@ -94,15 +93,15 @@
 
     new-instance v1, Ljava/io/InputStreamReader;
 
-    iget-object v2, p0, Lokhttp3/x$a;->caE:Lokio/d;
+    iget-object v2, p0, Lokhttp3/x$a;->bZY:Lokio/d;
 
-    invoke-interface {v2}, Lokio/d;->Ja()Ljava/io/InputStream;
+    invoke-interface {v2}, Lokio/d;->IZ()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;->caF:Ljava/io/Reader;
+    iput-object v1, p0, Lokhttp3/x$a;->bZZ:Ljava/io/Reader;
 
     move-object v0, v1
 
diff --git a/com.discord/smali_classes2/okhttp3/z.smali b/com.discord/smali_classes2/okhttp3/z.smali
index 6a23d0a4d0..14fad268a4 100644
--- a/com.discord/smali_classes2/okhttp3/z.smali
+++ b/com.discord/smali_classes2/okhttp3/z.smali
@@ -1,5 +1,6 @@
 .class public final enum Lokhttp3/z;
 .super Ljava/lang/Enum;
+.source "TlsVersion.java"
 
 
 # annotations
@@ -13,17 +14,17 @@
 
 
 # static fields
-.field public static final enum caI:Lokhttp3/z;
+.field public static final enum cac:Lokhttp3/z;
 
-.field public static final enum caJ:Lokhttp3/z;
+.field public static final enum cad:Lokhttp3/z;
 
-.field public static final enum caK:Lokhttp3/z;
+.field public static final enum cae:Lokhttp3/z;
 
-.field public static final enum caL:Lokhttp3/z;
+.field public static final enum caf:Lokhttp3/z;
 
-.field public static final enum caM:Lokhttp3/z;
+.field public static final enum cag:Lokhttp3/z;
 
-.field private static final synthetic caN:[Lokhttp3/z;
+.field private static final synthetic cah:[Lokhttp3/z;
 
 
 # instance fields
@@ -44,7 +45,7 @@
 
     invoke-direct {v0, v1, v3, v2}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->caI:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->cac:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -56,7 +57,7 @@
 
     invoke-direct {v0, v1, v4, v2}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->caJ:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->cad:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -68,7 +69,7 @@
 
     invoke-direct {v0, v1, v5, v2}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->caK:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->cae:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -80,7 +81,7 @@
 
     invoke-direct {v0, v1, v6, v2}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->caL:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->caf:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -92,33 +93,33 @@
 
     invoke-direct {v0, v1, v7, v2}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->caM:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->cag:Lokhttp3/z;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lokhttp3/z;
 
-    sget-object v1, Lokhttp3/z;->caI:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->cac:Lokhttp3/z;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/z;->caJ:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->cad:Lokhttp3/z;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/z;->caK:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->cae:Lokhttp3/z;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/z;->caL:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->caf:Lokhttp3/z;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/z;->caM:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->cag:Lokhttp3/z;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lokhttp3/z;->caN:[Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->cah:[Lokhttp3/z;
 
     return-void
 .end method
@@ -294,27 +295,27 @@
     throw v0
 
     :pswitch_3
-    sget-object p0, Lokhttp3/z;->caM:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->cag:Lokhttp3/z;
 
     return-object p0
 
     :pswitch_4
-    sget-object p0, Lokhttp3/z;->caL:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->caf:Lokhttp3/z;
 
     return-object p0
 
     :pswitch_5
-    sget-object p0, Lokhttp3/z;->caK:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->cae:Lokhttp3/z;
 
     return-object p0
 
     :pswitch_6
-    sget-object p0, Lokhttp3/z;->caJ:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->cad:Lokhttp3/z;
 
     return-object p0
 
     :pswitch_7
-    sget-object p0, Lokhttp3/z;->caI:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->cac:Lokhttp3/z;
 
     return-object p0
 
@@ -354,7 +355,7 @@
 .method public static values()[Lokhttp3/z;
     .locals 1
 
-    sget-object v0, Lokhttp3/z;->caN:[Lokhttp3/z;
+    sget-object v0, Lokhttp3/z;->cah:[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 3331dd735b..602a3aa450 100644
--- a/com.discord/smali_classes2/okio/ByteString.smali
+++ b/com.discord/smali_classes2/okio/ByteString.smali
@@ -1,5 +1,6 @@
 .class public Lokio/ByteString;
 .super Ljava/lang/Object;
+.source "ByteString.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
@@ -19,9 +20,9 @@
 
 
 # static fields
-.field static final bZb:[C
+.field static final bYv:[C
 
-.field public static final cgQ:Lokio/ByteString;
+.field public static final cgk:Lokio/ByteString;
 
 .field private static final serialVersionUID:J = 0x1L
 
@@ -29,7 +30,7 @@
 # instance fields
 .field transient cX:I
 
-.field transient cgR:Ljava/lang/String;
+.field transient cgl:Ljava/lang/String;
 
 .field final data:[B
 
@@ -44,7 +45,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokio/ByteString;->bZb:[C
+    sput-object v0, Lokio/ByteString;->bYv:[C
 
     const/4 v0, 0x0
 
@@ -54,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/ByteString;->cgQ:Lokio/ByteString;
+    sput-object v0, Lokio/ByteString;->cgk:Lokio/ByteString;
 
     return-void
 
@@ -142,7 +143,6 @@
 
     if-gt p0, v1, :cond_1
 
-    :goto_0
     sub-int/2addr p0, v0
 
     add-int/lit8 p0, p0, 0xa
@@ -158,7 +158,11 @@
 
     if-gt p0, v1, :cond_2
 
-    goto :goto_0
+    sub-int/2addr p0, v0
+
+    add-int/lit8 p0, p0, 0xa
+
+    return p0
 
     :cond_2
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -193,7 +197,7 @@
 
     invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
 
-    iput-object p0, v0, Lokio/ByteString;->cgR:Ljava/lang/String;
+    iput-object p0, v0, Lokio/ByteString;->cgl:Ljava/lang/String;
 
     return-object v0
 
@@ -320,6 +324,8 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private readObject(Ljava/io/ObjectInputStream;)V
@@ -432,6 +438,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method private writeObject(Ljava/io/ObjectOutputStream;)V
@@ -457,10 +465,10 @@
 
 
 # virtual methods
-.method public Jk()Ljava/lang/String;
+.method public Jj()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lokio/ByteString;->cgR:Ljava/lang/String;
+    iget-object v0, p0, Lokio/ByteString;->cgl:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -475,12 +483,12 @@
 
     invoke-direct {v0, v1, v2}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
-    iput-object v0, p0, Lokio/ByteString;->cgR:Ljava/lang/String;
+    iput-object v0, p0, Lokio/ByteString;->cgl:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public Jl()Ljava/lang/String;
+.method public Jk()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -492,7 +500,7 @@
     return-object v0
 .end method
 
-.method public Jm()Lokio/ByteString;
+.method public Jl()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-1"
@@ -504,7 +512,7 @@
     return-object v0
 .end method
 
-.method public Jn()Lokio/ByteString;
+.method public Jm()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-256"
@@ -516,20 +524,18 @@
     return-object v0
 .end method
 
-.method public Jo()Ljava/lang/String;
+.method public Jn()Ljava/lang/String;
     .locals 9
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
 
-    array-length v0, v0
+    array-length v1, v0
 
-    mul-int/lit8 v0, v0, 0x2
+    mul-int/lit8 v1, v1, 0x2
 
-    new-array v0, v0, [C
+    new-array v1, v1, [C
 
-    iget-object v1, p0, Lokio/ByteString;->data:[B
-
-    array-length v2, v1
+    array-length v2, v0
 
     const/4 v3, 0x0
 
@@ -538,43 +544,41 @@
     :goto_0
     if-ge v3, v2, :cond_0
 
-    aget-byte v5, v1, v3
+    aget-byte v5, v0, v3
 
     add-int/lit8 v6, v4, 0x1
 
-    sget-object v7, Lokio/ByteString;->bZb:[C
+    sget-object v7, Lokio/ByteString;->bYv:[C
 
     shr-int/lit8 v8, v5, 0x4
 
     and-int/lit8 v8, v8, 0xf
 
-    aget-char v7, v7, v8
+    aget-char v8, v7, v8
 
-    aput-char v7, v0, v4
+    aput-char v8, v1, v4
 
     add-int/lit8 v4, v6, 0x1
 
-    sget-object v7, Lokio/ByteString;->bZb:[C
-
     and-int/lit8 v5, v5, 0xf
 
     aget-char v5, v7, v5
 
-    aput-char v5, v0, v6
+    aput-char v5, v1, v6
 
     add-int/lit8 v3, v3, 0x1
 
     goto :goto_0
 
     :cond_0
-    new-instance v1, Ljava/lang/String;
+    new-instance v0, Ljava/lang/String;
 
-    invoke-direct {v1, v0}, Ljava/lang/String;-><init>([C)V
+    invoke-direct {v0, v1}, Ljava/lang/String;-><init>([C)V
 
-    return-object v1
+    return-object v0
 .end method
 
-.method public Jp()Lokio/ByteString;
+.method public Jo()Lokio/ByteString;
     .locals 6
 
     const/4 v0, 0x0
@@ -582,54 +586,50 @@
     :goto_0
     iget-object v1, p0, Lokio/ByteString;->data:[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    if-ge v0, v1, :cond_3
+    if-ge v0, v2, :cond_3
 
-    iget-object v1, p0, Lokio/ByteString;->data:[B
+    aget-byte v2, v1, v0
 
-    aget-byte v1, v1, v0
+    const/16 v3, 0x41
 
-    const/16 v2, 0x41
+    if-lt v2, v3, :cond_2
 
-    if-lt v1, v2, :cond_2
+    const/16 v4, 0x5a
 
-    const/16 v3, 0x5a
+    if-gt v2, v4, :cond_2
 
-    if-gt v1, v3, :cond_2
+    invoke-virtual {v1}, [B->clone()Ljava/lang/Object;
 
-    iget-object v4, p0, Lokio/ByteString;->data:[B
+    move-result-object v1
 
-    invoke-virtual {v4}, [B->clone()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, [B
+    check-cast v1, [B
 
     add-int/lit8 v5, v0, 0x1
 
-    add-int/lit8 v1, v1, 0x20
+    add-int/lit8 v2, v2, 0x20
 
-    int-to-byte v1, v1
+    int-to-byte v2, v2
 
-    aput-byte v1, v4, v0
+    aput-byte v2, v1, v0
 
     :goto_1
-    array-length v0, v4
+    array-length v0, v1
 
     if-ge v5, v0, :cond_1
 
-    aget-byte v0, v4, v5
+    aget-byte v0, v1, v5
 
-    if-lt v0, v2, :cond_0
+    if-lt v0, v3, :cond_0
 
-    if-gt v0, v3, :cond_0
+    if-gt v0, v4, :cond_0
 
     add-int/lit8 v0, v0, 0x20
 
     int-to-byte v0, v0
 
-    aput-byte v0, v4, v5
+    aput-byte v0, v1, v5
 
     :cond_0
     add-int/lit8 v5, v5, 0x1
@@ -639,7 +639,7 @@
     :cond_1
     new-instance v0, Lokio/ByteString;
 
-    invoke-direct {v0, v4}, Lokio/ByteString;-><init>([B)V
+    invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
 
     return-object v0
 
@@ -673,32 +673,30 @@
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
 
-    array-length v0, v0
+    array-length v1, v0
 
-    if-gt p2, v0, :cond_2
+    if-gt p2, v1, :cond_2
 
-    sub-int v0, p2, p1
+    sub-int v1, p2, p1
 
-    if-ltz v0, :cond_1
+    if-ltz v1, :cond_1
 
     if-nez p1, :cond_0
 
-    iget-object v1, p0, Lokio/ByteString;->data:[B
+    array-length v0, v0
 
-    array-length v1, v1
-
-    if-ne p2, v1, :cond_0
+    if-ne p2, v0, :cond_0
 
     return-object p0
 
     :cond_0
-    new-array p2, v0, [B
+    new-array p2, v1, [B
 
-    iget-object v1, p0, Lokio/ByteString;->data:[B
+    iget-object v0, p0, Lokio/ByteString;->data:[B
 
     const/4 v2, 0x0
 
-    invoke-static {v1, p1, p2, v2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, p1, p2, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     new-instance p1, Lokio/ByteString;
 
@@ -757,9 +755,7 @@
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
 
-    iget-object v1, p0, Lokio/ByteString;->data:[B
-
-    array-length v1, v1
+    array-length v1, v0
 
     const/4 v2, 0x0
 
@@ -837,7 +833,7 @@
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 5
 
     const/4 v0, 0x1
 
@@ -860,17 +856,13 @@
 
     iget-object v3, p0, Lokio/ByteString;->data:[B
 
-    array-length v3, v3
+    array-length v4, v3
 
-    if-ne v1, v3, :cond_1
+    if-ne v1, v4, :cond_1
 
-    iget-object v1, p0, Lokio/ByteString;->data:[B
+    array-length v1, v3
 
-    iget-object v3, p0, Lokio/ByteString;->data:[B
-
-    array-length v3, v3
-
-    invoke-virtual {p1, v2, v1, v2, v3}, Lokio/ByteString;->f(I[BII)Z
+    invoke-virtual {p1, v2, v3, v2, v1}, Lokio/ByteString;->f(I[BII)Z
 
     move-result p1
 
@@ -883,27 +875,25 @@
 .end method
 
 .method public f(I[BII)Z
-    .locals 1
+    .locals 2
 
     if-ltz p1, :cond_0
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
 
-    array-length v0, v0
+    array-length v1, v0
 
-    sub-int/2addr v0, p4
+    sub-int/2addr v1, p4
 
-    if-gt p1, v0, :cond_0
+    if-gt p1, v1, :cond_0
 
     if-ltz p3, :cond_0
 
-    array-length v0, p2
+    array-length v1, p2
 
-    sub-int/2addr v0, p4
+    sub-int/2addr v1, p4
 
-    if-gt p3, v0, :cond_0
-
-    iget-object v0, p0, Lokio/ByteString;->data:[B
+    if-gt p3, v1, :cond_0
 
     invoke-static {v0, p1, p2, p3, p4}, Lokio/s;->a([BI[BII)Z
 
@@ -990,7 +980,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lokio/ByteString;->Jk()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Jj()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1075,16 +1065,14 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lokio/ByteString;->Jo()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Jn()Ljava/lang/String;
 
     move-result-object v1
 
-    :goto_2
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v1, "]"
 
-    :goto_3
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -1114,16 +1102,21 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokio/ByteString;->Jo()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Jn()Ljava/lang/String;
 
     move-result-object v1
 
-    :goto_4
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string v1, "\u2026]"
 
-    goto :goto_3
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 
     :cond_7
     invoke-virtual {v0, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
@@ -1176,7 +1169,17 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_4
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "\u2026]"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
 
     :cond_8
     new-instance v0, Ljava/lang/StringBuilder;
@@ -1185,7 +1188,17 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_2
+    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
 
 .method public write(Ljava/io/OutputStream;)V
diff --git a/com.discord/smali_classes2/okio/a$1.smali b/com.discord/smali_classes2/okio/a$1.smali
index acf625c539..036b09e03a 100644
--- a/com.discord/smali_classes2/okio/a$1.smali
+++ b/com.discord/smali_classes2/okio/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lokio/a$1;
 .super Ljava/lang/Object;
+.source "AsyncTimeout.java"
 
 # interfaces
 .implements Lokio/p;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cgG:Lokio/p;
+.field final synthetic cga:Lokio/p;
 
-.field final synthetic cgH:Lokio/a;
+.field final synthetic cgb:Lokio/a;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/p;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$1;->cgH:Lokio/a;
+    iput-object p1, p0, Lokio/a$1;->cgb:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$1;->cgG:Lokio/p;
+    iput-object p2, p0, Lokio/a$1;->cga:Lokio/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,23 +46,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->cgb:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->cgG:Lokio/p;
+    iget-object v0, p0, Lokio/a$1;->cga:Lokio/p;
 
     invoke-interface {v0}, Lokio/p;->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;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->cgb:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->aj(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ai(Z)V
 
     return-void
 
@@ -74,7 +75,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->cgb:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->d(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -85,11 +86,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->cgb:Lokio/a;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v1, v2}, Lokio/a;->aj(Z)V
+    invoke-virtual {v1, v2}, Lokio/a;->ai(Z)V
 
     throw v0
 .end method
@@ -102,23 +103,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->cgb:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->cgG:Lokio/p;
+    iget-object v0, p0, Lokio/a$1;->cga:Lokio/p;
 
     invoke-interface {v0}, Lokio/p;->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;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->cgb:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->aj(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ai(Z)V
 
     return-void
 
@@ -131,7 +132,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->cgb:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->d(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -142,11 +143,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->cgb:Lokio/a;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v1, v2}, Lokio/a;->aj(Z)V
+    invoke-virtual {v1, v2}, Lokio/a;->ai(Z)V
 
     throw v0
 .end method
@@ -154,7 +155,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->cgb:Lokio/a;
 
     return-object v0
 .end method
@@ -168,7 +169,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/a$1;->cgG:Lokio/p;
+    iget-object v1, p0, Lokio/a$1;->cga:Lokio/p;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -206,7 +207,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v2, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, p1, Lokio/c;->cgg:Lokio/m;
 
     :goto_1
     const-wide/32 v3, 0x10000
@@ -234,33 +235,31 @@
     goto :goto_2
 
     :cond_0
-    iget-object v2, v2, Lokio/m;->chf:Lokio/m;
+    iget-object v2, v2, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_1
 
     :cond_1
     :goto_2
-    iget-object v2, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v2, p0, Lokio/a$1;->cgb:Lokio/a;
 
     invoke-virtual {v2}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v2, p0, Lokio/a$1;->cgG:Lokio/p;
+    iget-object v2, p0, Lokio/a$1;->cga:Lokio/p;
 
     invoke-interface {v2, p1, v0, v1}, Lokio/p;->write(Lokio/c;J)V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    const/4 v2, 0x0
-
     sub-long/2addr p2, v0
 
-    iget-object v0, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->cgb:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->aj(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ai(Z)V
 
     goto :goto_0
 
@@ -273,7 +272,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->cgb:Lokio/a;
 
     invoke-virtual {p2, p1}, Lokio/a;->d(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -284,11 +283,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_3
-    iget-object p2, p0, Lokio/a$1;->cgH:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->cgb:Lokio/a;
 
     const/4 p3, 0x0
 
-    invoke-virtual {p2, p3}, Lokio/a;->aj(Z)V
+    invoke-virtual {p2, p3}, Lokio/a;->ai(Z)V
 
     throw p1
 
diff --git a/com.discord/smali_classes2/okio/a$2.smali b/com.discord/smali_classes2/okio/a$2.smali
index 7e26832a0b..f2f63433e3 100644
--- a/com.discord/smali_classes2/okio/a$2.smali
+++ b/com.discord/smali_classes2/okio/a$2.smali
@@ -1,5 +1,6 @@
 .class final Lokio/a$2;
 .super Ljava/lang/Object;
+.source "AsyncTimeout.java"
 
 # interfaces
 .implements Lokio/q;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cgH:Lokio/a;
+.field final synthetic cgb:Lokio/a;
 
-.field final synthetic cgI:Lokio/q;
+.field final synthetic cgc:Lokio/q;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/q;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$2;->cgH:Lokio/a;
+    iput-object p1, p0, Lokio/a$2;->cgb:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$2;->cgI:Lokio/q;
+    iput-object p2, p0, Lokio/a$2;->cgc:Lokio/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,12 +46,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$2;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->cgb:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->cgI:Lokio/q;
+    iget-object v0, p0, Lokio/a$2;->cgc:Lokio/q;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/q;->a(Lokio/c;J)J
 
@@ -59,11 +60,11 @@
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p3, p0, Lokio/a$2;->cgH:Lokio/a;
+    iget-object p3, p0, Lokio/a$2;->cgb:Lokio/a;
 
     const/4 v0, 0x1
 
-    invoke-virtual {p3, v0}, Lokio/a;->aj(Z)V
+    invoke-virtual {p3, v0}, Lokio/a;->ai(Z)V
 
     return-wide p1
 
@@ -76,7 +77,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$2;->cgH:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->cgb:Lokio/a;
 
     invoke-virtual {p2, p1}, Lokio/a;->d(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -87,11 +88,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object p2, p0, Lokio/a$2;->cgH:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->cgb:Lokio/a;
 
     const/4 p3, 0x0
 
-    invoke-virtual {p2, p3}, Lokio/a;->aj(Z)V
+    invoke-virtual {p2, p3}, Lokio/a;->ai(Z)V
 
     throw p1
 .end method
@@ -105,18 +106,18 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->cgI:Lokio/q;
+    iget-object v0, p0, Lokio/a$2;->cgc: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$2;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->cgb:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->aj(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ai(Z)V
 
     return-void
 
@@ -129,7 +130,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$2;->cgH:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->cgb:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->d(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -140,11 +141,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$2;->cgH:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->cgb:Lokio/a;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v1, v2}, Lokio/a;->aj(Z)V
+    invoke-virtual {v1, v2}, Lokio/a;->ai(Z)V
 
     throw v0
 .end method
@@ -152,7 +153,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/a$2;->cgH:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->cgb:Lokio/a;
 
     return-object v0
 .end method
@@ -166,7 +167,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/a$2;->cgI:Lokio/q;
+    iget-object v1, p0, Lokio/a$2;->cgc:Lokio/q;
 
     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 f9ce212cb6..8e12514ed5 100644
--- a/com.discord/smali_classes2/okio/a$a.smali
+++ b/com.discord/smali_classes2/okio/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lokio/a$a;
 .super Ljava/lang/Thread;
+.source "AsyncTimeout.java"
 
 
 # annotations
@@ -43,7 +44,7 @@
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    invoke-static {}, Lokio/a;->IW()Lokio/a;
+    invoke-static {}, Lokio/a;->IV()Lokio/a;
 
     move-result-object v1
 
@@ -54,13 +55,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lokio/a;->cgC:Lokio/a;
+    sget-object v2, Lokio/a;->cfW:Lokio/a;
 
     if-ne v1, v2, :cond_1
 
     const/4 v1, 0x0
 
-    sput-object v1, Lokio/a;->cgC:Lokio/a;
+    sput-object v1, Lokio/a;->cfW:Lokio/a;
 
     monitor-exit v0
 
@@ -72,7 +73,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {v1}, Lokio/a;->Iz()V
+    invoke-virtual {v1}, Lokio/a;->Iy()V
     :try_end_2
     .catch Ljava/lang/InterruptedException; {:try_start_2 .. :try_end_2} :catch_0
 
@@ -90,4 +91,6 @@
     throw v1
     :try_end_4
     .catch Ljava/lang/InterruptedException; {:try_start_4 .. :try_end_4} :catch_0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okio/b.smali b/com.discord/smali_classes2/okio/b.smali
index 8e3133f74c..cbc3f42ce3 100644
--- a/com.discord/smali_classes2/okio/b.smali
+++ b/com.discord/smali_classes2/okio/b.smali
@@ -1,11 +1,12 @@
 .class final Lokio/b;
 .super Ljava/lang/Object;
+.source "Base64.java"
 
 
 # static fields
-.field private static final cgJ:[B
+.field private static final cgd:[B
 
-.field private static final cgK:[B
+.field private static final cge:[B
 
 
 # direct methods
@@ -18,13 +19,13 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokio/b;->cgJ:[B
+    sput-object v1, Lokio/b;->cgd:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokio/b;->cgK:[B
+    sput-object v0, Lokio/b;->cge:[B
 
     return-void
 
@@ -170,7 +171,7 @@
 .method public static L([B)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lokio/b;->cgJ:[B
+    sget-object v0, Lokio/b;->cgd:[B
 
     invoke-static {p0, v0}, Lokio/b;->b([B[B)Ljava/lang/String;
 
@@ -391,7 +392,7 @@
 
     throw p1
 
-    nop
+    return-void
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali_classes2/okio/c$1.smali b/com.discord/smali_classes2/okio/c$1.smali
index 0ac7e27f85..011e2a03b4 100644
--- a/com.discord/smali_classes2/okio/c$1.smali
+++ b/com.discord/smali_classes2/okio/c$1.smali
@@ -1,5 +1,6 @@
 .class public final Lokio/c$1;
 .super Ljava/io/OutputStream;
+.source "Buffer.java"
 
 
 # annotations
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic cgN:Lokio/c;
+.field final synthetic cgh:Lokio/c;
 
 
 # direct methods
 .method public constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$1;->cgN:Lokio/c;
+    iput-object p1, p0, Lokio/c$1;->cgh:Lokio/c;
 
     invoke-direct {p0}, Ljava/io/OutputStream;-><init>()V
 
@@ -49,7 +50,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokio/c$1;->cgN:Lokio/c;
+    iget-object v1, p0, Lokio/c$1;->cgh:Lokio/c;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -67,7 +68,7 @@
 .method public final write(I)V
     .locals 1
 
-    iget-object v0, p0, Lokio/c$1;->cgN:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->cgh:Lokio/c;
 
     int-to-byte p1, p1
 
@@ -79,7 +80,7 @@
 .method public final write([BII)V
     .locals 1
 
-    iget-object v0, p0, Lokio/c$1;->cgN:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->cgh:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->q([BII)Lokio/c;
 
diff --git a/com.discord/smali_classes2/okio/c$2.smali b/com.discord/smali_classes2/okio/c$2.smali
index 977ed6c6f3..093256130d 100644
--- a/com.discord/smali_classes2/okio/c$2.smali
+++ b/com.discord/smali_classes2/okio/c$2.smali
@@ -1,10 +1,11 @@
 .class final Lokio/c$2;
 .super Ljava/io/InputStream;
+.source "Buffer.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lokio/c;->Ja()Ljava/io/InputStream;
+    value = Lokio/c;->IZ()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic cgN:Lokio/c;
+.field final synthetic cgh:Lokio/c;
 
 
 # direct methods
 .method constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$2;->cgN:Lokio/c;
+    iput-object p1, p0, Lokio/c$2;->cgh:Lokio/c;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -33,7 +34,7 @@
 .method public final available()I
     .locals 4
 
-    iget-object v0, p0, Lokio/c$2;->cgN:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->cgh:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -57,7 +58,7 @@
 .method public final read()I
     .locals 5
 
-    iget-object v0, p0, Lokio/c$2;->cgN:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->cgh:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -67,7 +68,7 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokio/c$2;->cgN:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->cgh:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -86,7 +87,7 @@
 .method public final read([BII)I
     .locals 1
 
-    iget-object v0, p0, Lokio/c$2;->cgN:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->cgh:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->read([BII)I
 
@@ -102,7 +103,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokio/c$2;->cgN:Lokio/c;
+    iget-object v1, p0, Lokio/c$2;->cgh: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 1d79eab6b3..ac89b102f3 100644
--- a/com.discord/smali_classes2/okio/c$a.smali
+++ b/com.discord/smali_classes2/okio/c$a.smali
@@ -1,5 +1,6 @@
 .class public final Lokio/c$a;
 .super Ljava/lang/Object;
+.source "Buffer.java"
 
 # interfaces
 .implements Ljava/io/Closeable;
@@ -17,11 +18,11 @@
 
 
 # instance fields
-.field public cgO:Z
+.field public cfG:Lokio/c;
 
-.field private cgP:Lokio/m;
+.field public cgi:Z
 
-.field public cgm:Lokio/c;
+.field private cgj:Lokio/m;
 
 .field public data:[B
 
@@ -62,7 +63,7 @@
 
     if-ltz v2, :cond_8
 
-    iget-object v2, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->cfG:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -74,7 +75,7 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v0, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -87,55 +88,51 @@
     :cond_0
     const-wide/16 v0, 0x0
 
-    iget-object v2, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->cfG:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v4, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->cfG:Lokio/c;
 
-    iget-object v4, v4, Lokio/c;->cgM:Lokio/m;
+    iget-object v4, v4, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v5, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v5, p0, Lokio/c$a;->cfG:Lokio/c;
 
-    iget-object v5, v5, Lokio/c;->cgM:Lokio/m;
+    iget-object v5, v5, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v6, p0, Lokio/c$a;->cgP:Lokio/m;
+    iget-object v6, p0, Lokio/c$a;->cgj:Lokio/m;
 
     if-eqz v6, :cond_2
 
-    iget-wide v6, p0, Lokio/c$a;->offset:J
+    iget-wide v7, p0, Lokio/c$a;->offset:J
 
-    iget v8, p0, Lokio/c$a;->start:I
+    iget v9, p0, Lokio/c$a;->start:I
 
-    iget-object v9, p0, Lokio/c$a;->cgP:Lokio/m;
+    iget v6, v6, Lokio/m;->pos:I
 
-    iget v9, v9, Lokio/m;->pos:I
+    sub-int/2addr v9, v6
 
-    sub-int/2addr v8, v9
+    int-to-long v9, v9
 
-    int-to-long v8, v8
+    sub-long/2addr v7, v9
 
-    sub-long/2addr v6, v8
+    cmp-long v6, v7, p1
 
-    cmp-long v8, v6, p1
+    if-lez v6, :cond_1
 
-    if-lez v8, :cond_1
+    iget-object v5, p0, Lokio/c$a;->cgj:Lokio/m;
 
-    iget-object v5, p0, Lokio/c$a;->cgP:Lokio/m;
-
-    move-wide v2, v6
+    move-wide v2, v7
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, p0, Lokio/c$a;->cgP:Lokio/m;
+    iget-object v4, p0, Lokio/c$a;->cgj:Lokio/m;
 
-    move-wide v0, v6
+    move-wide v0, v7
 
     :cond_2
     :goto_0
-    const/4 v6, 0x0
-
     sub-long v6, v2, p1
 
     sub-long v8, p1, v0
@@ -169,7 +166,7 @@
 
     add-long/2addr v0, v2
 
-    iget-object v4, v4, Lokio/m;->chf:Lokio/m;
+    iget-object v4, v4, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_1
 
@@ -183,7 +180,7 @@
 
     if-lez v2, :cond_4
 
-    iget-object v4, v4, Lokio/m;->chg:Lokio/m;
+    iget-object v4, v4, Lokio/m;->cgA:Lokio/m;
 
     iget v2, v4, Lokio/m;->limit:I
 
@@ -198,39 +195,39 @@
     goto :goto_2
 
     :cond_4
-    iget-boolean v2, p0, Lokio/c$a;->cgO:Z
+    iget-boolean v2, p0, Lokio/c$a;->cgi:Z
 
     if-eqz v2, :cond_6
 
-    iget-boolean v2, v4, Lokio/m;->che:Z
+    iget-boolean v2, v4, Lokio/m;->cgy:Z
 
     if-eqz v2, :cond_6
 
-    invoke-virtual {v4}, Lokio/m;->Jy()Lokio/m;
+    invoke-virtual {v4}, Lokio/m;->Jx()Lokio/m;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->cfG:Lokio/c;
 
-    iget-object v3, v3, Lokio/c;->cgM:Lokio/m;
+    iget-object v3, v3, Lokio/c;->cgg:Lokio/m;
 
     if-ne v3, v4, :cond_5
 
-    iget-object v3, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->cfG:Lokio/c;
 
-    iput-object v2, v3, Lokio/c;->cgM:Lokio/m;
+    iput-object v2, v3, Lokio/c;->cgg:Lokio/m;
 
     :cond_5
     invoke-virtual {v4, v2}, Lokio/m;->a(Lokio/m;)Lokio/m;
 
     move-result-object v4
 
-    iget-object v2, v4, Lokio/m;->chg:Lokio/m;
+    iget-object v2, v4, Lokio/m;->cgA:Lokio/m;
 
-    invoke-virtual {v2}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v2}, Lokio/m;->Jy()Lokio/m;
 
     :cond_6
-    iput-object v4, p0, Lokio/c$a;->cgP:Lokio/m;
+    iput-object v4, p0, Lokio/c$a;->cgj:Lokio/m;
 
     iput-wide p1, p0, Lokio/c$a;->offset:J
 
@@ -264,7 +261,7 @@
     :goto_3
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokio/c$a;->cgP:Lokio/m;
+    iput-object v0, p0, Lokio/c$a;->cgj:Lokio/m;
 
     iput-wide p1, p0, Lokio/c$a;->offset:J
 
@@ -295,7 +292,7 @@
 
     const/4 p1, 0x1
 
-    iget-object p2, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object p2, p0, Lokio/c$a;->cfG:Lokio/c;
 
     iget-wide v2, p2, Lokio/c;->size:J
 
@@ -314,20 +311,22 @@
     invoke-direct {v0, p1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final close()V
     .locals 3
 
-    iget-object v0, p0, Lokio/c$a;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->cfG:Lokio/c;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokio/c$a;->cgm:Lokio/c;
+    iput-object v0, p0, Lokio/c$a;->cfG:Lokio/c;
 
-    iput-object v0, p0, Lokio/c$a;->cgP:Lokio/m;
+    iput-object v0, p0, Lokio/c$a;->cgj:Lokio/m;
 
     const-wide/16 v1, -0x1
 
diff --git a/com.discord/smali_classes2/okio/e.smali b/com.discord/smali_classes2/okio/e.smali
index 39b0724c19..c010707221 100644
--- a/com.discord/smali_classes2/okio/e.smali
+++ b/com.discord/smali_classes2/okio/e.smali
@@ -1,5 +1,6 @@
 .class public abstract Lokio/e;
 .super Ljava/lang/Object;
+.source "ForwardingSink.java"
 
 # interfaces
 .implements Lokio/p;
diff --git a/com.discord/smali_classes2/okio/f.smali b/com.discord/smali_classes2/okio/f.smali
index d95b7f62a3..8e679895a6 100644
--- a/com.discord/smali_classes2/okio/f.smali
+++ b/com.discord/smali_classes2/okio/f.smali
@@ -1,12 +1,13 @@
 .class public abstract Lokio/f;
 .super Ljava/lang/Object;
+.source "ForwardingSource.java"
 
 # interfaces
 .implements Lokio/q;
 
 
 # instance fields
-.field protected final cgS:Lokio/q;
+.field protected final cgm:Lokio/q;
 
 
 # direct methods
@@ -17,7 +18,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/f;->cgS:Lokio/q;
+    iput-object p1, p0, Lokio/f;->cgm:Lokio/q;
 
     return-void
 
@@ -41,7 +42,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/f;->cgS:Lokio/q;
+    iget-object v0, p0, Lokio/f;->cgm:Lokio/q;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/q;->a(Lokio/c;J)J
 
@@ -58,7 +59,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/f;->cgS:Lokio/q;
+    iget-object v0, p0, Lokio/f;->cgm:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->close()V
 
@@ -68,7 +69,7 @@
 .method public timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/f;->cgS:Lokio/q;
+    iget-object v0, p0, Lokio/f;->cgm:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->timeout()Lokio/r;
 
@@ -98,7 +99,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokio/f;->cgS:Lokio/q;
+    iget-object v1, p0, Lokio/f;->cgm:Lokio/q;
 
     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 ec289d6ea8..0fca7d448c 100644
--- a/com.discord/smali_classes2/okio/g.smali
+++ b/com.discord/smali_classes2/okio/g.smali
@@ -1,9 +1,10 @@
 .class public final Lokio/g;
 .super Lokio/r;
+.source "ForwardingTimeout.java"
 
 
 # instance fields
-.field public cgT:Lokio/r;
+.field public cgn:Lokio/r;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/g;->cgT:Lokio/r;
+    iput-object p1, p0, Lokio/g;->cgn:Lokio/r;
 
     return-void
 
@@ -30,46 +31,58 @@
 
 
 # virtual methods
-.method public final Jq()J
+.method public final Jp()J
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
-    invoke-virtual {v0}, Lokio/r;->Jq()J
+    invoke-virtual {v0}, Lokio/r;->Jp()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final Jr()Z
+.method public final Jq()Z
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
-    invoke-virtual {v0}, Lokio/r;->Jr()Z
+    invoke-virtual {v0}, Lokio/r;->Jq()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Js()J
+.method public final Jr()J
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
-    invoke-virtual {v0}, Lokio/r;->Js()J
+    invoke-virtual {v0}, Lokio/r;->Jr()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
+.method public final Js()Lokio/r;
+    .locals 1
+
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
+
+    invoke-virtual {v0}, Lokio/r;->Js()Lokio/r;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final Jt()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
     invoke-virtual {v0}, Lokio/r;->Jt()Lokio/r;
 
@@ -78,19 +91,7 @@
     return-object v0
 .end method
 
-.method public final Ju()Lokio/r;
-    .locals 1
-
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
-
-    invoke-virtual {v0}, Lokio/r;->Ju()Lokio/r;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final Jv()V
+.method public final Ju()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -98,9 +99,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
-    invoke-virtual {v0}, Lokio/r;->Jv()V
+    invoke-virtual {v0}, Lokio/r;->Ju()V
 
     return-void
 .end method
@@ -108,7 +109,7 @@
 .method public final bi(J)Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
     invoke-virtual {v0, p1, p2}, Lokio/r;->bi(J)Lokio/r;
 
@@ -120,7 +121,7 @@
 .method public final d(JLjava/util/concurrent/TimeUnit;)Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->cgT:Lokio/r;
+    iget-object v0, p0, Lokio/g;->cgn:Lokio/r;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/r;->d(JLjava/util/concurrent/TimeUnit;)Lokio/r;
 
diff --git a/com.discord/smali_classes2/okio/h.smali b/com.discord/smali_classes2/okio/h.smali
index d8d647d170..9c6ead61f9 100644
--- a/com.discord/smali_classes2/okio/h.smali
+++ b/com.discord/smali_classes2/okio/h.smali
@@ -1,16 +1,17 @@
 .class public final Lokio/h;
 .super Ljava/lang/Object;
+.source "GzipSource.java"
 
 # interfaces
 .implements Lokio/q;
 
 
 # instance fields
-.field private final caE:Lokio/d;
+.field private final bZY:Lokio/d;
 
-.field private cgU:I
+.field private cgo:I
 
-.field private final cgV:Lokio/i;
+.field private final cgp:Lokio/i;
 
 .field private final crc:Ljava/util/zip/CRC32;
 
@@ -25,7 +26,7 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokio/h;->cgU:I
+    iput v0, p0, Lokio/h;->cgo:I
 
     new-instance v0, Ljava/util/zip/CRC32;
 
@@ -47,17 +48,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/h;->caE:Lokio/d;
+    iput-object p1, p0, Lokio/h;->bZY:Lokio/d;
 
     new-instance p1, Lokio/i;
 
-    iget-object v0, p0, Lokio/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokio/h;->bZY: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;->cgV:Lokio/i;
+    iput-object p1, p0, Lokio/h;->cgp:Lokio/i;
 
     return-void
 
@@ -74,7 +75,7 @@
 .method private b(Lokio/c;JJ)V
     .locals 4
 
-    iget-object p1, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object p1, p1, Lokio/c;->cgg:Lokio/m;
 
     :goto_0
     iget v0, p1, Lokio/m;->limit:I
@@ -99,7 +100,7 @@
 
     sub-long/2addr p2, v0
 
-    iget-object p1, p1, Lokio/m;->chf:Lokio/m;
+    iget-object p1, p1, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_0
 
@@ -141,7 +142,7 @@
 
     sub-long/2addr p4, p2
 
-    iget-object p1, p1, Lokio/m;->chf:Lokio/m;
+    iget-object p1, p1, Lokio/m;->cgz:Lokio/m;
 
     move-wide p2, v0
 
@@ -230,7 +231,7 @@
     return-wide v0
 
     :cond_0
-    iget v0, v6, Lokio/h;->cgU:I
+    iget v0, v6, Lokio/h;->cgo:I
 
     const-wide/16 v10, -0x1
 
@@ -238,15 +239,15 @@
 
     if-nez v0, :cond_d
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
     const-wide/16 v1, 0xa
 
     invoke-interface {v0, v1, v2}, Lokio/d;->aV(J)V
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v0
 
@@ -274,9 +275,9 @@
     :goto_0
     if-eqz v14, :cond_2
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v1
 
@@ -289,7 +290,7 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_2
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readShort()S
 
@@ -301,7 +302,7 @@
 
     invoke-static {v1, v2, v0}, Lokio/h;->q(Ljava/lang/String;II)V
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
     const-wide/16 v1, 0x8
 
@@ -313,7 +314,7 @@
 
     if-ne v0, v12, :cond_5
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
     const-wide/16 v1, 0x2
 
@@ -321,9 +322,9 @@
 
     if-eqz v14, :cond_3
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v1
 
@@ -336,17 +337,17 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_3
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Jc()S
+    invoke-virtual {v0}, Lokio/c;->Jb()S
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v1, v6, Lokio/h;->bZY:Lokio/d;
 
     int-to-long v4, v0
 
@@ -354,9 +355,9 @@
 
     if-eqz v14, :cond_4
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v1
 
@@ -374,7 +375,7 @@
     move-wide v15, v4
 
     :goto_1
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
     move-wide v1, v15
 
@@ -389,9 +390,9 @@
 
     if-ne v0, v12, :cond_8
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Jh()J
+    invoke-interface {v0}, Lokio/d;->Jg()J
 
     move-result-wide v17
 
@@ -401,9 +402,9 @@
 
     if-eqz v14, :cond_6
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v1
 
@@ -416,7 +417,7 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_6
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -439,9 +440,9 @@
 
     if-ne v0, v12, :cond_b
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Jh()J
+    invoke-interface {v0}, Lokio/d;->Jg()J
 
     move-result-wide v17
 
@@ -451,9 +452,9 @@
 
     if-eqz v14, :cond_9
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v1
 
@@ -466,7 +467,7 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_9
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -487,9 +488,9 @@
 
     const-string v0, "FHCRC"
 
-    iget-object v1, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v1, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v1}, Lokio/d;->Jc()S
+    invoke-interface {v1}, Lokio/d;->Jb()S
 
     move-result v1
 
@@ -510,10 +511,10 @@
     invoke-virtual {v0}, Ljava/util/zip/CRC32;->reset()V
 
     :cond_c
-    iput v12, v6, Lokio/h;->cgU:I
+    iput v12, v6, Lokio/h;->cgo:I
 
     :cond_d
-    iget v0, v6, Lokio/h;->cgU:I
+    iget v0, v6, Lokio/h;->cgo:I
 
     const/4 v1, 0x2
 
@@ -521,7 +522,7 @@
 
     iget-wide v2, v7, Lokio/c;->size:J
 
-    iget-object v0, v6, Lokio/h;->cgV:Lokio/i;
+    iget-object v0, v6, Lokio/h;->cgp:Lokio/i;
 
     invoke-virtual {v0, v7, v8, v9}, Lokio/i;->a(Lokio/c;J)J
 
@@ -542,18 +543,18 @@
     return-wide v8
 
     :cond_e
-    iput v1, v6, Lokio/h;->cgU:I
+    iput v1, v6, Lokio/h;->cgo:I
 
     :cond_f
-    iget v0, v6, Lokio/h;->cgU:I
+    iget v0, v6, Lokio/h;->cgo:I
 
     if-ne v0, v1, :cond_11
 
     const-string v0, "CRC"
 
-    iget-object v1, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v1, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v1}, Lokio/d;->Jd()I
+    invoke-interface {v1}, Lokio/d;->Jc()I
 
     move-result v1
 
@@ -569,9 +570,9 @@
 
     const-string v0, "ISIZE"
 
-    iget-object v1, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v1, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v1}, Lokio/d;->Jd()I
+    invoke-interface {v1}, Lokio/d;->Jc()I
 
     move-result v1
 
@@ -587,11 +588,11 @@
 
     const/4 v0, 0x3
 
-    iput v0, v6, Lokio/h;->cgU:I
+    iput v0, v6, Lokio/h;->cgo:I
 
-    iget-object v0, v6, Lokio/h;->caE:Lokio/d;
+    iget-object v0, v6, Lokio/h;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IZ()Z
+    invoke-interface {v0}, Lokio/d;->IY()Z
 
     move-result v0
 
@@ -638,7 +639,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/h;->cgV:Lokio/i;
+    iget-object v0, p0, Lokio/h;->cgp:Lokio/i;
 
     invoke-virtual {v0}, Lokio/i;->close()V
 
@@ -648,7 +649,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/h;->caE:Lokio/d;
+    iget-object v0, p0, Lokio/h;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/r;
 
diff --git a/com.discord/smali_classes2/okio/i.smali b/com.discord/smali_classes2/okio/i.smali
index 8f1c87797a..793baacb1d 100644
--- a/com.discord/smali_classes2/okio/i.smali
+++ b/com.discord/smali_classes2/okio/i.smali
@@ -1,14 +1,15 @@
 .class public final Lokio/i;
 .super Ljava/lang/Object;
+.source "InflaterSource.java"
 
 # interfaces
 .implements Lokio/q;
 
 
 # instance fields
-.field private final caE:Lokio/d;
+.field private final bZY:Lokio/d;
 
-.field private cgW:I
+.field private cgq:I
 
 .field private closed:Z
 
@@ -25,7 +26,7 @@
 
     if-eqz p2, :cond_0
 
-    iput-object p1, p0, Lokio/i;->caE:Lokio/d;
+    iput-object p1, p0, Lokio/i;->bZY:Lokio/d;
 
     iput-object p2, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -50,7 +51,7 @@
     throw p1
 .end method
 
-.method private Jw()V
+.method private Jv()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -58,15 +59,13 @@
         }
     .end annotation
 
-    iget v0, p0, Lokio/i;->cgW:I
+    iget v0, p0, Lokio/i;->cgq:I
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget v0, p0, Lokio/i;->cgW:I
-
     iget-object v1, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
     invoke-virtual {v1}, Ljava/util/zip/Inflater;->getRemaining()I
@@ -75,13 +74,13 @@
 
     sub-int/2addr v0, v1
 
-    iget v1, p0, Lokio/i;->cgW:I
+    iget v1, p0, Lokio/i;->cgq:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lokio/i;->cgW:I
+    iput v1, p0, Lokio/i;->cgq:I
 
-    iget-object v1, p0, Lokio/i;->caE:Lokio/d;
+    iget-object v1, p0, Lokio/i;->bZY:Lokio/d;
 
     int-to-long v2, v0
 
@@ -133,7 +132,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lokio/i;->Jw()V
+    invoke-direct {p0}, Lokio/i;->Jv()V
 
     iget-object v0, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -143,9 +142,9 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, p0, Lokio/i;->caE:Lokio/d;
+    iget-object v0, p0, Lokio/i;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IZ()Z
+    invoke-interface {v0}, Lokio/d;->IY()Z
 
     move-result v0
 
@@ -156,13 +155,13 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lokio/i;->caE:Lokio/d;
+    iget-object v0, p0, Lokio/i;->bZY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IX()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->IW()Lokio/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, v0, Lokio/c;->cgg:Lokio/m;
 
     iget v3, v0, Lokio/m;->limit:I
 
@@ -170,7 +169,7 @@
 
     sub-int/2addr v3, v4
 
-    iput v3, p0, Lokio/i;->cgW:I
+    iput v3, p0, Lokio/i;->cgq:I
 
     iget-object v3, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -178,7 +177,7 @@
 
     iget v0, v0, Lokio/m;->pos:I
 
-    iget v5, p0, Lokio/i;->cgW:I
+    iget v5, p0, Lokio/i;->cgq:I
 
     invoke-virtual {v3, v4, v0, v5}, Ljava/util/zip/Inflater;->setInput([BII)V
 
@@ -263,7 +262,7 @@
 
     :cond_6
     :goto_2
-    invoke-direct {p0}, Lokio/i;->Jw()V
+    invoke-direct {p0}, Lokio/i;->Jv()V
 
     iget p2, v0, Lokio/m;->pos:I
 
@@ -271,11 +270,11 @@
 
     if-ne p2, p3, :cond_7
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object p2
 
-    iput-object p2, p1, Lokio/c;->cgM:Lokio/m;
+    iput-object p2, p1, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
     :try_end_0
@@ -329,6 +328,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final close()V
@@ -354,7 +355,7 @@
 
     iput-boolean v0, p0, Lokio/i;->closed:Z
 
-    iget-object v0, p0, Lokio/i;->caE:Lokio/d;
+    iget-object v0, p0, Lokio/i;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
@@ -364,7 +365,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/i;->caE:Lokio/d;
+    iget-object v0, p0, Lokio/i;->bZY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/r;
 
diff --git a/com.discord/smali_classes2/okio/j$1.smali b/com.discord/smali_classes2/okio/j$1.smali
index f0917d7ce7..ad22cb1797 100644
--- a/com.discord/smali_classes2/okio/j$1.smali
+++ b/com.discord/smali_classes2/okio/j$1.smali
@@ -1,5 +1,6 @@
 .class final Lokio/j$1;
 .super Ljava/lang/Object;
+.source "Okio.java"
 
 # interfaces
 .implements Lokio/p;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cgX:Lokio/r;
+.field final synthetic cgr:Lokio/r;
 
-.field final synthetic cgY:Ljava/io/OutputStream;
+.field final synthetic cgs:Ljava/io/OutputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/r;Ljava/io/OutputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$1;->cgX:Lokio/r;
+    iput-object p1, p0, Lokio/j$1;->cgr:Lokio/r;
 
-    iput-object p2, p0, Lokio/j$1;->cgY:Ljava/io/OutputStream;
+    iput-object p2, p0, Lokio/j$1;->cgs:Ljava/io/OutputStream;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->cgY:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->cgs:Ljava/io/OutputStream;
 
     invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
 
@@ -60,7 +61,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->cgY:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->cgs:Ljava/io/OutputStream;
 
     invoke-virtual {v0}, Ljava/io/OutputStream;->flush()V
 
@@ -70,7 +71,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/j$1;->cgX:Lokio/r;
+    iget-object v0, p0, Lokio/j$1;->cgr:Lokio/r;
 
     return-object v0
 .end method
@@ -84,7 +85,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/j$1;->cgY:Ljava/io/OutputStream;
+    iget-object v1, p0, Lokio/j$1;->cgs:Ljava/io/OutputStream;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -123,11 +124,11 @@
 
     if-lez v2, :cond_1
 
-    iget-object v0, p0, Lokio/j$1;->cgX:Lokio/r;
+    iget-object v0, p0, Lokio/j$1;->cgr:Lokio/r;
 
-    invoke-virtual {v0}, Lokio/r;->Jv()V
+    invoke-virtual {v0}, Lokio/r;->Ju()V
 
-    iget-object v0, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p1, Lokio/c;->cgg:Lokio/m;
 
     iget v1, v0, Lokio/m;->limit:I
 
@@ -143,7 +144,7 @@
 
     long-to-int v1, v1
 
-    iget-object v2, p0, Lokio/j$1;->cgY:Ljava/io/OutputStream;
+    iget-object v2, p0, Lokio/j$1;->cgs:Ljava/io/OutputStream;
 
     iget-object v3, v0, Lokio/m;->data:[B
 
@@ -173,11 +174,11 @@
 
     if-ne v1, v2, :cond_0
 
-    invoke-virtual {v0}, Lokio/m;->Jz()Lokio/m;
+    invoke-virtual {v0}, Lokio/m;->Jy()Lokio/m;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->cgM:Lokio/m;
+    iput-object v1, p1, Lokio/c;->cgg:Lokio/m;
 
     invoke-static {v0}, Lokio/n;->b(Lokio/m;)V
 
diff --git a/com.discord/smali_classes2/okio/j$2.smali b/com.discord/smali_classes2/okio/j$2.smali
index 7f2384f95f..a3ce11b509 100644
--- a/com.discord/smali_classes2/okio/j$2.smali
+++ b/com.discord/smali_classes2/okio/j$2.smali
@@ -1,5 +1,6 @@
 .class final Lokio/j$2;
 .super Ljava/lang/Object;
+.source "Okio.java"
 
 # interfaces
 .implements Lokio/q;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cgX:Lokio/r;
+.field final synthetic cgr:Lokio/r;
 
-.field final synthetic cgZ:Ljava/io/InputStream;
+.field final synthetic cgt:Ljava/io/InputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/r;Ljava/io/InputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$2;->cgX:Lokio/r;
+    iput-object p1, p0, Lokio/j$2;->cgr:Lokio/r;
 
-    iput-object p2, p0, Lokio/j$2;->cgZ:Ljava/io/InputStream;
+    iput-object p2, p0, Lokio/j$2;->cgt:Ljava/io/InputStream;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,9 +60,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lokio/j$2;->cgX:Lokio/r;
+    iget-object v0, p0, Lokio/j$2;->cgr:Lokio/r;
 
-    invoke-virtual {v0}, Lokio/r;->Jv()V
+    invoke-virtual {v0}, Lokio/r;->Ju()V
 
     const/4 v0, 0x1
 
@@ -81,7 +82,7 @@
 
     long-to-int p2, p2
 
-    iget-object p3, p0, Lokio/j$2;->cgZ:Ljava/io/InputStream;
+    iget-object p3, p0, Lokio/j$2;->cgt:Ljava/io/InputStream;
 
     iget-object v1, v0, Lokio/m;->data:[B
 
@@ -162,7 +163,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$2;->cgZ:Ljava/io/InputStream;
+    iget-object v0, p0, Lokio/j$2;->cgt:Ljava/io/InputStream;
 
     invoke-virtual {v0}, Ljava/io/InputStream;->close()V
 
@@ -172,7 +173,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/j$2;->cgX:Lokio/r;
+    iget-object v0, p0, Lokio/j$2;->cgr:Lokio/r;
 
     return-object v0
 .end method
@@ -186,7 +187,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/j$2;->cgZ:Ljava/io/InputStream;
+    iget-object v1, p0, Lokio/j$2;->cgt: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 e32dc7b496..6aafad5ec5 100644
--- a/com.discord/smali_classes2/okio/j.smali
+++ b/com.discord/smali_classes2/okio/j.smali
@@ -1,5 +1,6 @@
 .class public final Lokio/j;
 .super Ljava/lang/Object;
+.source "Okio.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/okio/k.smali b/com.discord/smali_classes2/okio/k.smali
index 17c4cb3afd..53dec0c1b6 100644
--- a/com.discord/smali_classes2/okio/k.smali
+++ b/com.discord/smali_classes2/okio/k.smali
@@ -1,14 +1,15 @@
 .class final Lokio/k;
 .super Ljava/lang/Object;
+.source "RealBufferedSink.java"
 
 # interfaces
 .implements Lokio/BufferedSink;
 
 
 # instance fields
-.field public final cgm:Lokio/c;
+.field public final cfG:Lokio/c;
 
-.field public final chb:Lokio/p;
+.field public final cgv:Lokio/p;
 
 .field closed:Z
 
@@ -23,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iput-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/k;->chb:Lokio/p;
+    iput-object p1, p0, Lokio/k;->cgv:Lokio/p;
 
     return-void
 
@@ -43,15 +44,15 @@
 
 
 # virtual methods
-.method public final IX()Lokio/c;
+.method public final IW()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final IY()Lokio/BufferedSink;
+.method public final IX()Lokio/BufferedSink;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -63,7 +64,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -73,9 +74,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v2, p0, Lokio/k;->cgv:Lokio/p;
 
-    iget-object v3, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/p;->write(Lokio/c;J)V
 
@@ -92,7 +93,7 @@
     throw v0
 .end method
 
-.method public final Jj()Lokio/BufferedSink;
+.method public final Ji()Lokio/BufferedSink;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -104,9 +105,9 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Jb()J
+    invoke-virtual {v0}, Lokio/c;->Ja()J
 
     move-result-wide v0
 
@@ -116,9 +117,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v2, p0, Lokio/k;->cgv:Lokio/p;
 
-    iget-object v3, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/p;->write(Lokio/c;J)V
 
@@ -147,11 +148,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->M([B)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -180,7 +181,7 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/k;->cfG:Lokio/c;
 
     const-wide/16 v3, 0x2000
 
@@ -196,7 +197,7 @@
 
     add-long/2addr v0, v2
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     goto :goto_0
 
@@ -211,6 +212,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final bf(J)Lokio/BufferedSink;
@@ -225,11 +228,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->be(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -257,11 +260,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->bd(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -295,7 +298,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v1, p0, Lokio/k;->cfG:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
@@ -305,11 +308,11 @@
 
     if-lez v5, :cond_1
 
-    iget-object v1, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v1, p0, Lokio/k;->cgv:Lokio/p;
 
-    iget-object v2, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/k;->cfG:Lokio/c;
 
-    iget-object v3, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/k;->cfG:Lokio/c;
 
     iget-wide v3, v3, Lokio/c;->size:J
 
@@ -325,7 +328,7 @@
     :cond_1
     :goto_0
     :try_start_1
-    iget-object v1, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v1, p0, Lokio/k;->cgv:Lokio/p;
 
     invoke-interface {v1}, Lokio/p;->close()V
     :try_end_1
@@ -366,11 +369,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->eK(Ljava/lang/String;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -398,7 +401,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -408,18 +411,16 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v0, p0, Lokio/k;->cgv:Lokio/p;
 
-    iget-object v1, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v1, p0, Lokio/k;->cfG:Lokio/c;
 
-    iget-object v2, p0, Lokio/k;->cgm:Lokio/c;
-
-    iget-wide v2, v2, Lokio/c;->size:J
+    iget-wide v2, v1, Lokio/c;->size:J
 
     invoke-interface {v0, v1, v2, v3}, Lokio/p;->write(Lokio/c;J)V
 
     :cond_0
-    iget-object v0, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v0, p0, Lokio/k;->cgv:Lokio/p;
 
     invoke-interface {v0}, Lokio/p;->flush()V
 
@@ -447,11 +448,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->fu(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -479,11 +480,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->ft(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -511,11 +512,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->fs(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -543,11 +544,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->g(Lokio/ByteString;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -592,11 +593,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->q([BII)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -615,7 +616,7 @@
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v0, p0, Lokio/k;->cgv:Lokio/p;
 
     invoke-interface {v0}, Lokio/p;->timeout()Lokio/r;
 
@@ -633,7 +634,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/k;->chb:Lokio/p;
+    iget-object v1, p0, Lokio/k;->cgv:Lokio/p;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -660,13 +661,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->write(Ljava/nio/ByteBuffer;)I
 
     move-result p1
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     return p1
 
@@ -692,11 +693,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/k;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/k;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    invoke-virtual {p0}, Lokio/k;->Jj()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/k;->Ji()Lokio/BufferedSink;
 
     return-void
 
diff --git a/com.discord/smali_classes2/okio/l$1.smali b/com.discord/smali_classes2/okio/l$1.smali
index b4833e12f2..a8f3d0d5eb 100644
--- a/com.discord/smali_classes2/okio/l$1.smali
+++ b/com.discord/smali_classes2/okio/l$1.smali
@@ -1,10 +1,11 @@
 .class final Lokio/l$1;
 .super Ljava/io/InputStream;
+.source "RealBufferedSource.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lokio/l;->Ja()Ljava/io/InputStream;
+    value = Lokio/l;->IZ()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic chd:Lokio/l;
+.field final synthetic cgx:Lokio/l;
 
 
 # direct methods
 .method constructor <init>(Lokio/l;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/l$1;->chd:Lokio/l;
+    iput-object p1, p0, Lokio/l$1;->cgx:Lokio/l;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -38,15 +39,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
     iget-boolean v0, v0, Lokio/l;->closed:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v0, v0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, v0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -78,7 +79,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
     invoke-virtual {v0}, Lokio/l;->close()V
 
@@ -93,15 +94,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
     iget-boolean v0, v0, Lokio/l;->closed:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v0, v0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, v0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -111,13 +112,13 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v0, v0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, v0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v1, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v1, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v1, v1, Lokio/l;->cgm:Lokio/c;
+    iget-object v1, v1, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -136,9 +137,9 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v0, v0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, v0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -166,7 +167,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
     iget-boolean v0, v0, Lokio/l;->closed:Z
 
@@ -182,9 +183,9 @@
 
     invoke-static/range {v1 .. v6}, Lokio/s;->c(JJJ)V
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v0, v0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, v0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -194,13 +195,13 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v0, v0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, v0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v1, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v1, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v1, v1, Lokio/l;->cgm:Lokio/c;
+    iget-object v1, v1, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -219,9 +220,9 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v0, p0, Lokio/l$1;->cgx:Lokio/l;
 
-    iget-object v0, v0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, v0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->read([BII)I
 
@@ -246,7 +247,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokio/l$1;->chd:Lokio/l;
+    iget-object v1, p0, Lokio/l$1;->cgx:Lokio/l;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okio/l.smali b/com.discord/smali_classes2/okio/l.smali
index e33152f117..554ef2c6d2 100644
--- a/com.discord/smali_classes2/okio/l.smali
+++ b/com.discord/smali_classes2/okio/l.smali
@@ -1,14 +1,15 @@
 .class final Lokio/l;
 .super Ljava/lang/Object;
+.source "RealBufferedSource.java"
 
 # interfaces
 .implements Lokio/d;
 
 
 # instance fields
-.field public final cgm:Lokio/c;
+.field public final cfG:Lokio/c;
 
-.field public final chc:Lokio/q;
+.field public final cgw:Lokio/q;
 
 .field closed:Z
 
@@ -23,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iput-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/l;->chc:Lokio/q;
+    iput-object p1, p0, Lokio/l;->cgw:Lokio/q;
 
     return-void
 
@@ -51,22 +52,22 @@
 
     iget-boolean v0, p0, Lokio/l;->closed:Z
 
-    if-nez v0, :cond_4
+    if-nez v0, :cond_5
 
     const-wide/16 v0, 0x0
 
     cmp-long v2, p4, v0
 
-    if-ltz v2, :cond_3
+    if-ltz v2, :cond_4
 
     :goto_0
     const-wide/16 v0, -0x1
 
     cmp-long v2, p2, p4
 
-    if-gez v2, :cond_2
+    if-gez v2, :cond_3
 
-    iget-object v3, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/l;->cfG:Lokio/c;
 
     move v4, p1
 
@@ -85,7 +86,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -93,9 +94,9 @@
 
     if-gez v4, :cond_2
 
-    iget-object v4, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v4, p0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v5, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v5, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -121,6 +122,9 @@
     return-wide v0
 
     :cond_3
+    return-wide v0
+
+    :cond_4
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const/4 p2, 0x2
@@ -153,7 +157,7 @@
 
     throw p1
 
-    :cond_4
+    :cond_5
     new-instance p1, Ljava/lang/IllegalStateException;
 
     const-string p2, "closed"
@@ -161,19 +165,21 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public final IX()Lokio/c;
+.method public final IW()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final IZ()Z
+.method public final IY()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -185,17 +191,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->IZ()Z
+    invoke-virtual {v0}, Lokio/c;->IY()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, p0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v1, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -228,7 +234,7 @@
     throw v0
 .end method
 
-.method public final Ja()Ljava/io/InputStream;
+.method public final IZ()Ljava/io/InputStream;
     .locals 1
 
     new-instance v0, Lokio/l$1;
@@ -238,7 +244,7 @@
     return-object v0
 .end method
 
-.method public final Jc()S
+.method public final Jb()S
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -250,7 +256,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
@@ -263,7 +269,7 @@
     return v0
 .end method
 
-.method public final Jd()I
+.method public final Jc()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -275,7 +281,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readInt()I
 
@@ -288,7 +294,7 @@
     return v0
 .end method
 
-.method public final Je()J
+.method public final Jd()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -315,7 +321,7 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/l;->cfG:Lokio/c;
 
     int-to-long v4, v1
 
@@ -387,16 +393,16 @@
 
     :cond_5
     :goto_2
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Je()J
+    invoke-virtual {v0}, Lokio/c;->Jd()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final Jg()Ljava/lang/String;
+.method public final Jf()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -413,7 +419,7 @@
     return-object v0
 .end method
 
-.method public final Jh()J
+.method public final Jg()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -456,7 +462,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -464,9 +470,9 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, p0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v1, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -483,7 +489,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -491,7 +497,7 @@
 
     move-result-wide p2
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->a(Lokio/c;J)J
 
@@ -551,9 +557,9 @@
 
     :cond_0
     :goto_0
-    iget-object v4, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v4, p0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v5, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v5, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -567,9 +573,9 @@
 
     if-eqz v8, :cond_1
 
-    iget-object v4, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v4, p0, Lokio/l;->cfG:Lokio/c;
 
-    invoke-virtual {v4}, Lokio/c;->Jb()J
+    invoke-virtual {v4}, Lokio/c;->Ja()J
 
     move-result-wide v4
 
@@ -579,14 +585,14 @@
 
     add-long/2addr v2, v4
 
-    iget-object v6, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v6, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-interface {p1, v6, v4, v5}, Lokio/p;->write(Lokio/c;J)V
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v4, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
@@ -594,17 +600,15 @@
 
     if-lez v6, :cond_2
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
     add-long/2addr v2, v0
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
-    iget-object v1, p0, Lokio/l;->cgm:Lokio/c;
-
-    iget-wide v4, v1, Lokio/c;->size:J
+    iget-wide v4, v0, Lokio/c;->size:J
 
     invoke-interface {p1, v0, v4, v5}, Lokio/p;->write(Lokio/c;J)V
 
@@ -619,6 +623,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final aV(J)V
@@ -655,7 +661,7 @@
 
     invoke-virtual {p0, p1, p2}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aX(J)Lokio/ByteString;
 
@@ -691,8 +697,6 @@
     goto :goto_0
 
     :cond_0
-    const/4 v4, 0x0
-
     add-long v4, p1, v0
 
     :goto_0
@@ -714,7 +718,7 @@
 
     if-eqz v10, :cond_1
 
-    iget-object p1, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object p1, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {p1, v6, v7}, Lokio/c;->ba(J)Ljava/lang/String;
 
@@ -733,7 +737,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
     sub-long v6, v4, v0
 
@@ -753,7 +757,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, v4, v5}, Lokio/c;->aW(J)B
 
@@ -763,7 +767,7 @@
 
     if-ne v0, v1, :cond_2
 
-    iget-object p1, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object p1, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {p1, v4, v5}, Lokio/c;->ba(J)Ljava/lang/String;
 
@@ -776,15 +780,13 @@
 
     invoke-direct {v6}, Lokio/c;-><init>()V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x0
 
     const-wide/16 v4, 0x20
 
-    iget-object v1, p0, Lokio/l;->cgm:Lokio/c;
-
-    iget-wide v7, v1, Lokio/c;->size:J
+    iget-wide v7, v0, Lokio/c;->size:J
 
     invoke-static {v4, v5, v7, v8}, Ljava/lang/Math;->min(JJ)J
 
@@ -802,7 +804,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -816,11 +818,11 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6}, Lokio/c;->Ik()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Ij()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Jo()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Jn()Ljava/lang/String;
 
     move-result-object p1
 
@@ -869,7 +871,7 @@
     :try_end_0
     .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->b(Lokio/c;J)V
 
@@ -878,7 +880,7 @@
     :catch_0
     move-exception p2
 
-    iget-object p3, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object p3, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {p1, p3}, Lokio/c;->a(Lokio/q;)J
 
@@ -895,7 +897,7 @@
 
     invoke-virtual {p0, p1, p2}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->bb(J)[B
 
@@ -923,7 +925,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -931,9 +933,9 @@
 
     if-nez v4, :cond_1
 
-    iget-object v0, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, p0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v1, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -958,7 +960,7 @@
 
     :cond_1
     :goto_1
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -966,7 +968,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v2, v0, v1}, Lokio/c;->bc(J)V
 
@@ -985,6 +987,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final c(Ljava/nio/charset/Charset;)Ljava/lang/String;
@@ -997,13 +1001,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
-    iget-object v1, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v1, p0, Lokio/l;->cgw:Lokio/q;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/q;)J
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->c(Ljava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -1040,11 +1044,11 @@
 
     iput-boolean v0, p0, Lokio/l;->closed:Z
 
-    iget-object v0, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, p0, Lokio/l;->cgw:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->close()V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->clear()V
 
@@ -1106,7 +1110,7 @@
     return v1
 
     :cond_1
-    iget-object v3, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v3, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v3, v5, v6}, Lokio/c;->aW(J)B
 
@@ -1144,6 +1148,8 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final isOpen()Z
@@ -1171,7 +1177,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -1181,9 +1187,9 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, p0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v1, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -1202,7 +1208,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->read(Ljava/nio/ByteBuffer;)I
 
@@ -1223,7 +1229,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -1249,7 +1255,7 @@
     :try_end_0
     .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->readFully([B)V
 
@@ -1261,7 +1267,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -1271,11 +1277,9 @@
 
     if-lez v6, :cond_1
 
-    iget-object v2, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v2, p0, Lokio/l;->cfG:Lokio/c;
 
-    iget-object v3, p0, Lokio/l;->cgm:Lokio/c;
-
-    iget-wide v3, v3, Lokio/c;->size:J
+    iget-wide v3, v2, Lokio/c;->size:J
 
     long-to-int v3, v3
 
@@ -1300,6 +1304,8 @@
 
     :cond_1
     throw v0
+
+    return-void
 .end method
 
 .method public final readInt()I
@@ -1314,7 +1320,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readInt()I
 
@@ -1335,7 +1341,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readLong()J
 
@@ -1356,7 +1362,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/l;->aV(J)V
 
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
@@ -1384,7 +1390,7 @@
     if-nez v0, :cond_2
 
     :cond_0
-    iget-object v0, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v0, p0, Lokio/l;->cfG:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -1392,9 +1398,9 @@
 
     if-gez v2, :cond_1
 
-    iget-object v0, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, p0, Lokio/l;->cgw:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->cgm:Lokio/c;
+    iget-object v1, p0, Lokio/l;->cfG:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -1442,12 +1448,14 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final timeout()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v0, p0, Lokio/l;->cgw:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->timeout()Lokio/r;
 
@@ -1465,7 +1473,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/l;->chc:Lokio/q;
+    iget-object v1, p0, Lokio/l;->cgw:Lokio/q;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okio/o.smali b/com.discord/smali_classes2/okio/o.smali
index 191ad97fdd..6e9f560e18 100644
--- a/com.discord/smali_classes2/okio/o.smali
+++ b/com.discord/smali_classes2/okio/o.smali
@@ -1,11 +1,12 @@
 .class final Lokio/o;
 .super Lokio/ByteString;
+.source "SegmentedByteString.java"
 
 
 # instance fields
-.field final transient chi:[[B
+.field final transient cgC:[[B
 
-.field final transient chj:[I
+.field final transient cgD:[I
 
 
 # direct methods
@@ -24,36 +25,36 @@
 
     invoke-static/range {v1 .. v6}, Lokio/s;->c(JJJ)V
 
-    iget-object v0, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v0, p1, Lokio/c;->cgg:Lokio/m;
 
     const/4 v1, 0x0
 
-    move-object v2, v0
+    move-object v3, v0
 
     const/4 v0, 0x0
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
     if-ge v0, p2, :cond_1
 
-    iget v4, v2, Lokio/m;->limit:I
+    iget v4, v3, Lokio/m;->limit:I
 
-    iget v5, v2, Lokio/m;->pos:I
+    iget v5, v3, Lokio/m;->pos:I
 
     if-eq v4, v5, :cond_0
 
-    iget v4, v2, Lokio/m;->limit:I
+    iget v4, v3, Lokio/m;->limit:I
 
-    iget v5, v2, Lokio/m;->pos:I
+    iget v5, v3, Lokio/m;->pos:I
 
     sub-int/2addr v4, v5
 
     add-int/2addr v0, v4
 
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
-    iget-object v2, v2, Lokio/m;->chf:Lokio/m;
+    iget-object v3, v3, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_0
 
@@ -67,17 +68,17 @@
     throw p1
 
     :cond_1
-    new-array v0, v3, [[B
+    new-array v0, v2, [[B
 
-    iput-object v0, p0, Lokio/o;->chi:[[B
+    iput-object v0, p0, Lokio/o;->cgC:[[B
 
-    mul-int/lit8 v3, v3, 0x2
+    mul-int/lit8 v2, v2, 0x2
 
-    new-array v0, v3, [I
+    new-array v0, v2, [I
 
-    iput-object v0, p0, Lokio/o;->chj:[I
+    iput-object v0, p0, Lokio/o;->cgD:[I
 
-    iget-object p1, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object p1, p1, Lokio/c;->cgg:Lokio/m;
 
     move-object v0, p1
 
@@ -86,7 +87,7 @@
     :goto_1
     if-ge v1, p2, :cond_3
 
-    iget-object v2, p0, Lokio/o;->chi:[[B
+    iget-object v2, p0, Lokio/o;->cgC:[[B
 
     iget-object v3, v0, Lokio/m;->data:[B
 
@@ -105,13 +106,11 @@
     move v1, p2
 
     :cond_2
-    iget-object v2, p0, Lokio/o;->chj:[I
+    iget-object v2, p0, Lokio/o;->cgD:[I
 
     aput v1, v2, p1
 
-    iget-object v2, p0, Lokio/o;->chj:[I
-
-    iget-object v3, p0, Lokio/o;->chi:[[B
+    iget-object v3, p0, Lokio/o;->cgC:[[B
 
     array-length v3, v3
 
@@ -123,11 +122,11 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v0, Lokio/m;->che:Z
+    iput-boolean v2, v0, Lokio/m;->cgy:Z
 
     add-int/lit8 p1, p1, 0x1
 
-    iget-object v0, v0, Lokio/m;->chf:Lokio/m;
+    iget-object v0, v0, Lokio/m;->cgz:Lokio/m;
 
     goto :goto_1
 
@@ -135,7 +134,7 @@
     return-void
 .end method
 
-.method private JB()Lokio/ByteString;
+.method private JA()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
@@ -152,9 +151,9 @@
 .method private fz(I)I
     .locals 3
 
-    iget-object v0, p0, Lokio/o;->chj:[I
+    iget-object v0, p0, Lokio/o;->cgD:[I
 
-    iget-object v1, p0, Lokio/o;->chi:[[B
+    iget-object v1, p0, Lokio/o;->cgC:[[B
 
     array-length v1, v1
 
@@ -179,7 +178,7 @@
 .method private writeReplace()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
@@ -188,10 +187,24 @@
 
 
 # virtual methods
+.method public final Jj()Ljava/lang/String;
+    .locals 1
+
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lokio/ByteString;->Jj()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final Jk()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
@@ -202,14 +215,14 @@
     return-object v0
 .end method
 
-.method public final Jl()Ljava/lang/String;
+.method public final Jl()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Jl()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/ByteString;->Jl()Lokio/ByteString;
 
     move-result-object v0
 
@@ -219,7 +232,7 @@
 .method public final Jm()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
@@ -230,42 +243,28 @@
     return-object v0
 .end method
 
-.method public final Jn()Lokio/ByteString;
+.method public final Jn()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Jn()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Jn()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Jo()Ljava/lang/String;
+.method public final Jo()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Jo()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final Jp()Lokio/ByteString;
-    .locals 1
-
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lokio/ByteString;->Jp()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Jo()Lokio/ByteString;
 
     move-result-object v0
 
@@ -273,7 +272,7 @@
 .end method
 
 .method public final a(ILokio/ByteString;II)Z
-    .locals 6
+    .locals 7
 
     invoke-virtual {p0}, Lokio/o;->size()I
 
@@ -302,14 +301,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/o;->chj:[I
+    iget-object v2, p0, Lokio/o;->cgD:[I
 
     add-int/lit8 v3, v0, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/o;->chj:[I
+    iget-object v3, p0, Lokio/o;->cgD:[I
 
     aget v3, v3, v0
 
@@ -323,23 +322,21 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/o;->chj:[I
+    iget-object v4, p0, Lokio/o;->cgD:[I
 
-    iget-object v5, p0, Lokio/o;->chi:[[B
+    iget-object v5, p0, Lokio/o;->cgC:[[B
 
-    array-length v5, v5
+    array-length v6, v5
 
-    add-int/2addr v5, v0
+    add-int/2addr v6, v0
 
-    aget v4, v4, v5
+    aget v4, v4, v6
 
     sub-int v2, p1, v2
 
     add-int/2addr v2, v4
 
-    iget-object v4, p0, Lokio/o;->chi:[[B
-
-    aget-object v4, v4, v0
+    aget-object v4, v5, v0
 
     invoke-virtual {p2, p3, v4, v2, v3}, Lokio/ByteString;->f(I[BII)Z
 
@@ -369,7 +366,7 @@
 .method public final av(II)Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
@@ -383,7 +380,7 @@
 .method final b(Lokio/c;)V
     .locals 11
 
-    iget-object v0, p0, Lokio/o;->chi:[[B
+    iget-object v0, p0, Lokio/o;->cgC:[[B
 
     array-length v0, v0
 
@@ -394,19 +391,17 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v3, p0, Lokio/o;->chj:[I
+    iget-object v3, p0, Lokio/o;->cgD:[I
 
     add-int v4, v0, v1
 
     aget v7, v3, v4
 
-    iget-object v3, p0, Lokio/o;->chj:[I
-
     aget v3, v3, v1
 
     new-instance v4, Lokio/m;
 
-    iget-object v5, p0, Lokio/o;->chi:[[B
+    iget-object v5, p0, Lokio/o;->cgC:[[B
 
     aget-object v6, v5, v1
 
@@ -422,22 +417,22 @@
 
     invoke-direct/range {v5 .. v10}, Lokio/m;-><init>([BIIZZ)V
 
-    iget-object v2, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, p1, Lokio/c;->cgg:Lokio/m;
 
     if-nez v2, :cond_0
 
-    iput-object v4, v4, Lokio/m;->chg:Lokio/m;
+    iput-object v4, v4, Lokio/m;->cgA:Lokio/m;
 
-    iput-object v4, v4, Lokio/m;->chf:Lokio/m;
+    iput-object v4, v4, Lokio/m;->cgz:Lokio/m;
 
-    iput-object v4, p1, Lokio/c;->cgM:Lokio/m;
+    iput-object v4, p1, Lokio/c;->cgg:Lokio/m;
 
     goto :goto_1
 
     :cond_0
-    iget-object v2, p1, Lokio/c;->cgM:Lokio/m;
+    iget-object v2, p1, Lokio/c;->cgg:Lokio/m;
 
-    iget-object v2, v2, Lokio/m;->chg:Lokio/m;
+    iget-object v2, v2, Lokio/m;->cgA:Lokio/m;
 
     invoke-virtual {v2, v4}, Lokio/m;->a(Lokio/m;)Lokio/m;
 
@@ -505,7 +500,7 @@
 .end method
 
 .method public final f(I[BII)Z
-    .locals 6
+    .locals 7
 
     const/4 v0, 0x0
 
@@ -544,14 +539,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/o;->chj:[I
+    iget-object v2, p0, Lokio/o;->cgD:[I
 
     add-int/lit8 v3, v1, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/o;->chj:[I
+    iget-object v3, p0, Lokio/o;->cgD:[I
 
     aget v3, v3, v1
 
@@ -565,23 +560,21 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/o;->chj:[I
+    iget-object v4, p0, Lokio/o;->cgD:[I
 
-    iget-object v5, p0, Lokio/o;->chi:[[B
+    iget-object v5, p0, Lokio/o;->cgC:[[B
 
-    array-length v5, v5
+    array-length v6, v5
 
-    add-int/2addr v5, v1
+    add-int/2addr v6, v1
 
-    aget v4, v4, v5
+    aget v4, v4, v6
 
     sub-int v2, p1, v2
 
     add-int/2addr v2, v4
 
-    iget-object v4, p0, Lokio/o;->chi:[[B
-
-    aget-object v4, v4, v1
+    aget-object v4, v5, v1
 
     invoke-static {v4, v2, p2, p3, v3}, Lokio/s;->a([BI[BII)Z
 
@@ -615,9 +608,9 @@
 .method public final getByte(I)B
     .locals 7
 
-    iget-object v0, p0, Lokio/o;->chj:[I
+    iget-object v0, p0, Lokio/o;->cgD:[I
 
-    iget-object v1, p0, Lokio/o;->chi:[[B
+    iget-object v1, p0, Lokio/o;->cgC:[[B
 
     array-length v1, v1
 
@@ -644,24 +637,22 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lokio/o;->chj:[I
+    iget-object v1, p0, Lokio/o;->cgD:[I
 
     add-int/lit8 v2, v0, -0x1
 
     aget v1, v1, v2
 
     :goto_0
-    iget-object v2, p0, Lokio/o;->chj:[I
+    iget-object v2, p0, Lokio/o;->cgD:[I
 
-    iget-object v3, p0, Lokio/o;->chi:[[B
+    iget-object v3, p0, Lokio/o;->cgC:[[B
 
-    array-length v3, v3
+    array-length v4, v3
 
-    add-int/2addr v3, v0
+    add-int/2addr v4, v0
 
-    aget v2, v2, v3
-
-    iget-object v3, p0, Lokio/o;->chi:[[B
+    aget v2, v2, v4
 
     aget-object v0, v3, v0
 
@@ -684,7 +675,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/o;->chi:[[B
+    iget-object v0, p0, Lokio/o;->cgC:[[B
 
     array-length v0, v0
 
@@ -692,63 +683,59 @@
 
     const/4 v2, 0x1
 
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     :goto_0
     if-ge v1, v0, :cond_2
 
-    iget-object v4, p0, Lokio/o;->chi:[[B
+    iget-object v4, p0, Lokio/o;->cgC:[[B
 
     aget-object v4, v4, v1
 
-    iget-object v5, p0, Lokio/o;->chj:[I
+    iget-object v5, p0, Lokio/o;->cgD:[I
 
     add-int v6, v0, v1
 
-    aget v5, v5, v6
+    aget v6, v5, v6
 
-    iget-object v6, p0, Lokio/o;->chj:[I
+    aget v5, v5, v1
 
-    aget v6, v6, v1
+    sub-int v3, v5, v3
 
-    sub-int v2, v6, v2
-
-    add-int/2addr v2, v5
+    add-int/2addr v3, v6
 
     :goto_1
-    if-ge v5, v2, :cond_1
+    if-ge v6, v3, :cond_1
 
-    mul-int/lit8 v3, v3, 0x1f
+    mul-int/lit8 v2, v2, 0x1f
 
-    aget-byte v7, v4, v5
+    aget-byte v7, v4, v6
 
-    add-int/2addr v3, v7
+    add-int/2addr v2, v7
 
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v6, v6, 0x1
 
     goto :goto_1
 
     :cond_1
     add-int/lit8 v1, v1, 0x1
 
-    move v2, v6
+    move v3, v5
 
     goto :goto_0
 
     :cond_2
-    iput v3, p0, Lokio/o;->cX:I
+    iput v2, p0, Lokio/o;->cX:I
 
-    return v3
+    return v2
 .end method
 
 .method public final size()I
     .locals 2
 
-    iget-object v0, p0, Lokio/o;->chj:[I
+    iget-object v0, p0, Lokio/o;->cgD:[I
 
-    iget-object v1, p0, Lokio/o;->chi:[[B
+    iget-object v1, p0, Lokio/o;->cgC:[[B
 
     array-length v1, v1
 
@@ -762,20 +749,18 @@
 .method public final toByteArray()[B
     .locals 8
 
-    iget-object v0, p0, Lokio/o;->chj:[I
+    iget-object v0, p0, Lokio/o;->cgD:[I
 
-    iget-object v1, p0, Lokio/o;->chi:[[B
+    iget-object v1, p0, Lokio/o;->cgC:[[B
 
-    array-length v1, v1
+    array-length v2, v1
 
-    add-int/lit8 v1, v1, -0x1
+    add-int/lit8 v2, v2, -0x1
 
-    aget v0, v0, v1
+    aget v0, v0, v2
 
     new-array v0, v0, [B
 
-    iget-object v1, p0, Lokio/o;->chi:[[B
-
     array-length v1, v1
 
     const/4 v2, 0x0
@@ -785,27 +770,25 @@
     :goto_0
     if-ge v2, v1, :cond_0
 
-    iget-object v4, p0, Lokio/o;->chj:[I
+    iget-object v4, p0, Lokio/o;->cgD:[I
 
     add-int v5, v1, v2
 
-    aget v4, v4, v5
+    aget v5, v4, v5
 
-    iget-object v5, p0, Lokio/o;->chj:[I
+    aget v4, v4, v2
 
-    aget v5, v5, v2
-
-    iget-object v6, p0, Lokio/o;->chi:[[B
+    iget-object v6, p0, Lokio/o;->cgC:[[B
 
     aget-object v6, v6, v2
 
-    sub-int v7, v5, v3
+    sub-int v7, v4, v3
 
-    invoke-static {v6, v4, v0, v3, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v6, v5, v0, v3, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     add-int/lit8 v2, v2, 0x1
 
-    move v3, v5
+    move v3, v4
 
     goto :goto_0
 
@@ -816,7 +799,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/o;->JB()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/o;->JA()Lokio/ByteString;
 
     move-result-object v0
 
@@ -835,7 +818,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/o;->chi:[[B
+    iget-object v0, p0, Lokio/o;->cgC:[[B
 
     array-length v0, v0
 
@@ -846,27 +829,25 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v3, p0, Lokio/o;->chj:[I
+    iget-object v3, p0, Lokio/o;->cgD:[I
 
     add-int v4, v0, v1
 
-    aget v3, v3, v4
+    aget v4, v3, v4
 
-    iget-object v4, p0, Lokio/o;->chj:[I
+    aget v3, v3, v1
 
-    aget v4, v4, v1
-
-    iget-object v5, p0, Lokio/o;->chi:[[B
+    iget-object v5, p0, Lokio/o;->cgC:[[B
 
     aget-object v5, v5, v1
 
-    sub-int v2, v4, v2
+    sub-int v2, v3, v2
 
-    invoke-virtual {p1, v5, v3, v2}, Ljava/io/OutputStream;->write([BII)V
+    invoke-virtual {p1, v5, v4, v2}, Ljava/io/OutputStream;->write([BII)V
 
     add-int/lit8 v1, v1, 0x1
 
-    move v2, v4
+    move v2, v3
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/okio/r$1.smali b/com.discord/smali_classes2/okio/r$1.smali
index 11723eb337..5c43f96d30 100644
--- a/com.discord/smali_classes2/okio/r$1.smali
+++ b/com.discord/smali_classes2/okio/r$1.smali
@@ -1,5 +1,6 @@
 .class final Lokio/r$1;
 .super Lokio/r;
+.source "Timeout.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # virtual methods
-.method public final Jv()V
+.method public final Ju()V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/okio/s.smali b/com.discord/smali_classes2/okio/s.smali
index 94a7513efb..d01980266e 100644
--- a/com.discord/smali_classes2/okio/s.smali
+++ b/com.discord/smali_classes2/okio/s.smali
@@ -1,5 +1,6 @@
 .class public final Lokio/s;
 .super Ljava/lang/Object;
+.source "Util.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/org/a/a/a.smali b/com.discord/smali_classes2/org/a/a/a.smali
index 9537308a0b..962210c632 100644
--- a/com.discord/smali_classes2/org/a/a/a.smali
+++ b/com.discord/smali_classes2/org/a/a/a.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field protected final cho:I
+.field protected final cgI:I
 
-.field protected chp:Lorg/a/a/a;
+.field protected cgJ:Lorg/a/a/a;
 
 
 # direct methods
@@ -26,27 +26,25 @@
 
     const/high16 p1, 0x50000
 
-    iput p1, p0, Lorg/a/a/a;->cho:I
+    iput p1, p0, Lorg/a/a/a;->cgI:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
+    iput-object p1, p0, Lorg/a/a/a;->cgJ:Lorg/a/a/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public JC()V
+.method public JB()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->cgJ:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
-
-    invoke-virtual {v0}, Lorg/a/a/a;->JC()V
+    invoke-virtual {v0}, Lorg/a/a/a;->JB()V
 
     :cond_0
     return-void
@@ -55,12 +53,10 @@
 .method public ar(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->cgJ:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/a;->ar(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/a;
 
     move-result-object p1
@@ -76,12 +72,10 @@
 .method public eP(Ljava/lang/String;)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->cgJ:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
-
     invoke-virtual {v0, p1}, Lorg/a/a/a;->eP(Ljava/lang/String;)Lorg/a/a/a;
 
     move-result-object p1
@@ -97,12 +91,10 @@
 .method public p(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->cgJ:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
-
     invoke-virtual {v0, p1, p2, p3}, Lorg/a/a/a;->p(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
@@ -112,12 +104,10 @@
 .method public t(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->cgJ:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/a;->chp:Lorg/a/a/a;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/a;->t(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
diff --git a/com.discord/smali_classes2/org/a/a/b.smali b/com.discord/smali_classes2/org/a/a/b.smali
index f9d1ea2f1a..4d3a1ce939 100644
--- a/com.discord/smali_classes2/org/a/a/b.smali
+++ b/com.discord/smali_classes2/org/a/a/b.smali
@@ -3,21 +3,21 @@
 
 
 # instance fields
-.field private final chq:Lorg/a/a/g;
+.field private final cgK:Lorg/a/a/g;
 
-.field private chr:I
+.field private cgL:I
 
-.field private final chs:Z
+.field private final cgM:Z
 
-.field private final cht:Lorg/a/a/d;
+.field private final cgN:Lorg/a/a/d;
 
-.field private final chu:Lorg/a/a/d;
+.field private final cgO:Lorg/a/a/d;
 
-.field private final chv:I
+.field private final cgP:I
 
-.field chw:Lorg/a/a/b;
+.field cgQ:Lorg/a/a/b;
 
-.field chx:Lorg/a/a/b;
+.field cgR:Lorg/a/a/b;
 
 
 # direct methods
@@ -26,15 +26,15 @@
 
     invoke-direct {p0}, Lorg/a/a/a;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iput-object p1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
-    iput-boolean p2, p0, Lorg/a/a/b;->chs:Z
+    iput-boolean p2, p0, Lorg/a/a/b;->cgM:Z
 
-    iput-object p3, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iput-object p4, p0, Lorg/a/a/b;->chu:Lorg/a/a/d;
+    iput-object p4, p0, Lorg/a/a/b;->cgO:Lorg/a/a/d;
 
-    iput p5, p0, Lorg/a/a/b;->chv:I
+    iput p5, p0, Lorg/a/a/b;->cgP:I
 
     return-void
 .end method
@@ -85,9 +85,9 @@
     return-void
 
     :cond_0
-    iget-object p0, p1, Lorg/a/a/u;->chA:[B
+    iget-object p0, p1, Lorg/a/a/u;->cgU:[B
 
-    iget v0, p1, Lorg/a/a/u;->chr:I
+    iget v0, p1, Lorg/a/a/u;->cgL:I
 
     aget-byte p0, p0, v0
 
@@ -95,9 +95,9 @@
 
     add-int/lit8 p0, p0, 0x1
 
-    iget-object v0, p1, Lorg/a/a/u;->chA:[B
+    iget-object v0, p1, Lorg/a/a/u;->cgU:[B
 
-    iget p1, p1, Lorg/a/a/u;->chr:I
+    iget p1, p1, Lorg/a/a/u;->cgL:I
 
     invoke-virtual {p2, v0, p1, p0}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
@@ -160,7 +160,7 @@
     :cond_0
     aget-object v2, p0, v0
 
-    invoke-virtual {v2}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v2}, Lorg/a/a/b;->JC()I
 
     move-result v3
 
@@ -202,11 +202,11 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    invoke-virtual {v1}, Lorg/a/a/b;->JC()V
+    invoke-virtual {v1}, Lorg/a/a/b;->JB()V
 
-    iput-object v2, v1, Lorg/a/a/b;->chx:Lorg/a/a/b;
+    iput-object v2, v1, Lorg/a/a/b;->cgR:Lorg/a/a/b;
 
-    iget-object v2, v1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iget-object v2, v1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
     move-object v4, v2
 
@@ -222,17 +222,17 @@
     :goto_4
     if-eqz v2, :cond_3
 
-    iget-object v0, v2, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v0, v2, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v1, v2, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v1, v2, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p2, v0, v3, v1}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    iget-object v2, v2, Lorg/a/a/b;->chx:Lorg/a/a/b;
+    iget-object v2, v2, Lorg/a/a/b;->cgR:Lorg/a/a/b;
 
     goto :goto_4
 
@@ -247,33 +247,27 @@
 
 
 # virtual methods
-.method public final JC()V
-    .locals 3
+.method public final JB()V
+    .locals 4
 
-    iget-object v0, p0, Lorg/a/a/b;->chu:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->cgO:Lorg/a/a/d;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->chu:Lorg/a/a/d;
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget v1, p0, Lorg/a/a/b;->cgP:I
 
-    iget v1, p0, Lorg/a/a/b;->chv:I
+    iget v2, p0, Lorg/a/a/b;->cgL:I
 
-    iget v2, p0, Lorg/a/a/b;->chr:I
+    ushr-int/lit8 v3, v2, 0x8
 
-    ushr-int/lit8 v2, v2, 0x8
+    int-to-byte v3, v3
 
-    int-to-byte v2, v2
-
-    aput-byte v2, v0, v1
-
-    iget v1, p0, Lorg/a/a/b;->chv:I
+    aput-byte v3, v0, v1
 
     add-int/lit8 v1, v1, 0x1
 
-    iget v2, p0, Lorg/a/a/b;->chr:I
-
     int-to-byte v2, v2
 
     aput-byte v2, v0, v1
@@ -282,7 +276,7 @@
     return-void
 .end method
 
-.method final JD()I
+.method final JC()I
     .locals 3
 
     const/4 v0, 0x0
@@ -294,13 +288,13 @@
     :goto_0
     if-eqz v0, :cond_0
 
-    iget-object v2, v0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget v2, v2, Lorg/a/a/d;->chr:I
+    iget v2, v2, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v1, v2
 
-    iget-object v0, v0, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iget-object v0, v0, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
     goto :goto_0
 
@@ -317,30 +311,28 @@
 
     const/4 v2, 0x0
 
+    const/4 v3, 0x0
+
     move-object v4, v2
 
-    const/4 v1, 0x0
-
-    const/4 v3, 0x2
-
     move-object v2, p0
 
     :goto_0
     if-eqz v2, :cond_0
 
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v3, v3, 0x1
 
-    iget-object v5, v2, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v5, v2, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget v5, v5, Lorg/a/a/d;->chr:I
+    iget v5, v5, Lorg/a/a/d;->cgL:I
 
-    add-int/2addr v3, v5
+    add-int/2addr v1, v5
 
-    invoke-virtual {v2}, Lorg/a/a/b;->JC()V
+    invoke-virtual {v2}, Lorg/a/a/b;->JB()V
 
-    iput-object v4, v2, Lorg/a/a/b;->chx:Lorg/a/a/b;
+    iput-object v4, v2, Lorg/a/a/b;->cgR:Lorg/a/a/b;
 
-    iget-object v4, v2, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iget-object v4, v2, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
     move-object v6, v4
 
@@ -351,24 +343,24 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1, v3}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {p1, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :goto_1
     if-eqz v4, :cond_1
 
-    iget-object v1, v4, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v1, v4, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v1, v1, Lorg/a/a/d;->chA:[B
+    iget-object v1, v1, Lorg/a/a/d;->cgU:[B
 
-    iget-object v2, v4, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v2, v4, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget v2, v2, Lorg/a/a/d;->chr:I
+    iget v2, v2, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v1, v0, v2}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/b;->chx:Lorg/a/a/b;
+    iget-object v4, v4, Lorg/a/a/b;->cgR:Lorg/a/a/b;
 
     goto :goto_1
 
@@ -379,19 +371,19 @@
 .method public final ar(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/a;
     .locals 6
 
-    iget v0, p0, Lorg/a/a/b;->chr:I
+    iget v0, p0, Lorg/a/a/b;->cgL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->chr:I
+    iput v0, p0, Lorg/a/a/b;->cgL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->chs:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->cgM:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {v1, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -400,11 +392,11 @@
     invoke-virtual {v0, p1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x40
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {v1, p2}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -420,22 +412,20 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
-
-    iget-object p2, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
-
-    iget p2, p2, Lorg/a/a/d;->chr:I
+    iget p2, v4, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v5, p2, -0x2
 
     move-object v0, p1
 
+    move-object v3, v4
+
     invoke-direct/range {v0 .. v5}, Lorg/a/a/b;-><init>(Lorg/a/a/g;ZLorg/a/a/d;Lorg/a/a/d;I)V
 
     return-object p1
@@ -444,19 +434,19 @@
 .method public final eP(Ljava/lang/String;)Lorg/a/a/a;
     .locals 8
 
-    iget v0, p0, Lorg/a/a/b;->chr:I
+    iget v0, p0, Lorg/a/a/b;->cgL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->chr:I
+    iput v0, p0, Lorg/a/a/b;->cgL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->chs:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->cgM:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {v1, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -465,7 +455,7 @@
     invoke-virtual {v0, p1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x5b
 
@@ -475,22 +465,20 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v3, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v3, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     const/4 v4, 0x0
 
-    iget-object v5, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v6, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v6, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
-
-    iget-object v0, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
-
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v6, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v7, v0, -0x2
 
     move-object v2, p1
 
+    move-object v5, v6
+
     invoke-direct/range {v2 .. v7}, Lorg/a/a/b;-><init>(Lorg/a/a/g;ZLorg/a/a/d;Lorg/a/a/d;I)V
 
     return-object p1
@@ -499,19 +487,19 @@
 .method public final p(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/b;->chr:I
+    iget v0, p0, Lorg/a/a/b;->cgL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->chr:I
+    iput v0, p0, Lorg/a/a/b;->cgL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->chs:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->cgM:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {v1, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -520,11 +508,11 @@
     invoke-virtual {v0, p1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x65
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {v1, p2}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -534,7 +522,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object p2, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {p2, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -548,19 +536,19 @@
 .method public final t(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 6
 
-    iget v0, p0, Lorg/a/a/b;->chr:I
+    iget v0, p0, Lorg/a/a/b;->cgL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->chr:I
+    iput v0, p0, Lorg/a/a/b;->cgL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->chs:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->cgM:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {v1, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -573,11 +561,11 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x73
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     check-cast p2, Ljava/lang/String;
 
@@ -596,9 +584,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     check-cast p2, Ljava/lang/Byte;
 
@@ -610,7 +598,7 @@
 
     move-result-object p2
 
-    iget p2, p2, Lorg/a/a/o;->ciC:I
+    iget p2, p2, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -629,15 +617,15 @@
 
     move-result p1
 
-    iget-object p2, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {v0, p1}, Lorg/a/a/g;->fK(I)Lorg/a/a/o;
 
     move-result-object p1
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p2, v1, p1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -650,9 +638,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     check-cast p2, Ljava/lang/Character;
 
@@ -664,7 +652,7 @@
 
     move-result-object p2
 
-    iget p2, p2, Lorg/a/a/o;->ciC:I
+    iget p2, p2, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v2, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -677,9 +665,9 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     check-cast p2, Ljava/lang/Short;
 
@@ -691,7 +679,7 @@
 
     move-result-object p2
 
-    iget p2, p2, Lorg/a/a/o;->ciC:I
+    iget p2, p2, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v3, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -702,11 +690,11 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x63
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     check-cast p2, Lorg/a/a/t;
 
@@ -733,7 +721,7 @@
 
     check-cast p2, [B
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v1, p2
 
@@ -744,9 +732,9 @@
 
     if-ge v4, p1, :cond_7
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget-byte v2, p2, v4
 
@@ -754,7 +742,7 @@
 
     move-result-object v1
 
-    iget v1, v1, Lorg/a/a/o;->ciC:I
+    iget v1, v1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -772,7 +760,7 @@
 
     check-cast p2, [Z
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -783,9 +771,9 @@
 
     if-ge v4, p1, :cond_9
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget-boolean v2, p2, v4
 
@@ -793,7 +781,7 @@
 
     move-result-object v0
 
-    iget v0, v0, Lorg/a/a/o;->ciC:I
+    iget v0, v0, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v1, v0}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -811,7 +799,7 @@
 
     check-cast p2, [S
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -822,9 +810,9 @@
 
     if-ge v4, p1, :cond_b
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget-short v1, p2, v4
 
@@ -832,7 +820,7 @@
 
     move-result-object v0
 
-    iget v0, v0, Lorg/a/a/o;->ciC:I
+    iget v0, v0, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v3, v0}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -850,7 +838,7 @@
 
     check-cast p2, [C
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -861,9 +849,9 @@
 
     if-ge v4, p1, :cond_d
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget-char v1, p2, v4
 
@@ -871,7 +859,7 @@
 
     move-result-object v0
 
-    iget v0, v0, Lorg/a/a/o;->ciC:I
+    iget v0, v0, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v2, v0}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -889,7 +877,7 @@
 
     check-cast p2, [I
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -900,11 +888,11 @@
 
     if-ge v4, p1, :cond_f
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x49
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget v2, p2, v4
 
@@ -912,7 +900,7 @@
 
     move-result-object v1
 
-    iget v1, v1, Lorg/a/a/o;->ciC:I
+    iget v1, v1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -930,7 +918,7 @@
 
     check-cast p2, [J
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -941,11 +929,11 @@
 
     if-ge v4, p1, :cond_11
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x4a
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget-wide v2, p2, v4
 
@@ -953,7 +941,7 @@
 
     move-result-object v1
 
-    iget v1, v1, Lorg/a/a/o;->ciC:I
+    iget v1, v1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -971,7 +959,7 @@
 
     check-cast p2, [F
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -982,11 +970,11 @@
 
     if-ge v4, p1, :cond_13
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x46
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget v2, p2, v4
 
@@ -994,7 +982,7 @@
 
     move-result-object v1
 
-    iget v1, v1, Lorg/a/a/o;->ciC:I
+    iget v1, v1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -1012,7 +1000,7 @@
 
     check-cast p2, [D
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -1023,11 +1011,11 @@
 
     if-ge v4, p1, :cond_15
 
-    iget-object p1, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const/16 v0, 0x44
 
-    iget-object v1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     aget-wide v2, p2, v4
 
@@ -1035,7 +1023,7 @@
 
     move-result-object v1
 
-    iget v1, v1, Lorg/a/a/o;->ciC:I
+    iget v1, v1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -1047,23 +1035,23 @@
     return-void
 
     :cond_16
-    iget-object p1, p0, Lorg/a/a/b;->chq:Lorg/a/a/g;
+    iget-object p1, p0, Lorg/a/a/b;->cgK:Lorg/a/a/g;
 
     invoke-virtual {p1, p2}, Lorg/a/a/g;->bX(Ljava/lang/Object;)Lorg/a/a/o;
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/b;->cht:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->cgN:Lorg/a/a/d;
 
     const-string v0, ".s.IFJDCS"
 
-    iget v1, p1, Lorg/a/a/o;->chr:I
+    iget v1, p1, Lorg/a/a/o;->cgL:I
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->charAt(I)C
 
     move-result v0
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p2, v0, p1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
diff --git a/com.discord/smali_classes2/org/a/a/c.smali b/com.discord/smali_classes2/org/a/a/c.smali
index 2acfac338c..47e3ee4815 100644
--- a/com.discord/smali_classes2/org/a/a/c.smali
+++ b/com.discord/smali_classes2/org/a/a/c.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field chy:[B
+.field cgS:[B
 
-.field chz:Lorg/a/a/c;
+.field cgT:Lorg/a/a/c;
 
 .field public final type:Ljava/lang/String;
 
@@ -21,29 +21,27 @@
     return-void
 .end method
 
-.method private JE()Lorg/a/a/d;
+.method private JD()Lorg/a/a/d;
     .locals 2
 
     new-instance v0, Lorg/a/a/d;
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/c;->chy:[B
+    iget-object v1, p0, Lorg/a/a/c;->cgS:[B
 
-    iput-object v1, v0, Lorg/a/a/d;->chA:[B
-
-    iget-object v1, p0, Lorg/a/a/c;->chy:[B
+    iput-object v1, v0, Lorg/a/a/d;->cgU:[B
 
     array-length v1, v1
 
-    iput v1, v0, Lorg/a/a/d;->chr:I
+    iput v1, v0, Lorg/a/a/d;->cgL:I
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method final JD()I
+.method final JC()I
     .locals 2
 
     const/4 v0, 0x0
@@ -57,7 +55,7 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v0, v0, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     goto :goto_0
 
@@ -81,17 +79,17 @@
 
     invoke-virtual {p1, v2}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    invoke-direct {v0}, Lorg/a/a/c;->JE()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->JD()Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v2, v2, Lorg/a/a/d;->chr:I
+    iget v2, v2, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v2, v2, 0x6
 
     add-int/2addr v1, v2
 
-    iget-object v0, v0, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     goto :goto_0
 
@@ -110,11 +108,11 @@
 
     new-array v1, p3, [B
 
-    iput-object v1, v0, Lorg/a/a/c;->chy:[B
+    iput-object v1, v0, Lorg/a/a/c;->cgS:[B
 
-    iget-object p1, p1, Lorg/a/a/e;->chy:[B
+    iget-object p1, p1, Lorg/a/a/e;->cgS:[B
 
-    iget-object v1, v0, Lorg/a/a/c;->chy:[B
+    iget-object v1, v0, Lorg/a/a/c;->cgS:[B
 
     const/4 v2, 0x0
 
@@ -131,7 +129,7 @@
     :goto_0
     if-eqz v0, :cond_0
 
-    invoke-direct {v0}, Lorg/a/a/c;->JE()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->JD()Lorg/a/a/d;
 
     move-result-object v1
 
@@ -145,19 +143,19 @@
 
     move-result-object v2
 
-    iget v3, v1, Lorg/a/a/d;->chr:I
+    iget v3, v1, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {v2, v3}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    iget-object v2, v1, Lorg/a/a/d;->chA:[B
+    iget-object v2, v1, Lorg/a/a/d;->cgU:[B
 
     const/4 v3, 0x0
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p2, v2, v3, v1}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/org/a/a/d.smali b/com.discord/smali_classes2/org/a/a/d.smali
index 310066e5bd..a101784944 100644
--- a/com.discord/smali_classes2/org/a/a/d.smali
+++ b/com.discord/smali_classes2/org/a/a/d.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field chA:[B
+.field cgL:I
 
-.field chr:I
+.field cgU:[B
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     new-array v0, v0, [B
 
-    iput-object v0, p0, Lorg/a/a/d;->chA:[B
+    iput-object v0, p0, Lorg/a/a/d;->cgU:[B
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     new-array p1, p1, [B
 
-    iput-object p1, p0, Lorg/a/a/d;->chA:[B
+    iput-object p1, p0, Lorg/a/a/d;->cgU:[B
 
     return-void
 .end method
@@ -38,13 +38,13 @@
 .method private fE(I)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/d;->chA:[B
+    iget-object v0, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v0, v0
 
     mul-int/lit8 v0, v0, 0x2
 
-    iget v1, p0, Lorg/a/a/d;->chr:I
+    iget v1, p0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr p1, v1
 
@@ -55,15 +55,15 @@
     :cond_0
     new-array p1, p1, [B
 
-    iget-object v0, p0, Lorg/a/a/d;->chA:[B
+    iget-object v0, p0, Lorg/a/a/d;->cgU:[B
 
-    iget v1, p0, Lorg/a/a/d;->chr:I
+    iget v1, p0, Lorg/a/a/d;->cgL:I
 
     const/4 v2, 0x0
 
     invoke-static {v0, v2, p1, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object p1, p0, Lorg/a/a/d;->chA:[B
+    iput-object p1, p0, Lorg/a/a/d;->cgU:[B
 
     return-void
 .end method
@@ -73,11 +73,11 @@
 .method final aw(II)Lorg/a/a/d;
     .locals 3
 
-    iget v0, p0, Lorg/a/a/d;->chr:I
+    iget v0, p0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v0, 0x2
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v2, v2
 
@@ -88,7 +88,7 @@
     invoke-direct {p0, v1}, Lorg/a/a/d;->fE(I)V
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v2, v0, 0x1
 
@@ -102,7 +102,7 @@
 
     aput-byte p2, v1, v2
 
-    iput p1, p0, Lorg/a/a/d;->chr:I
+    iput p1, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 .end method
@@ -110,11 +110,11 @@
 .method final ax(II)Lorg/a/a/d;
     .locals 3
 
-    iget v0, p0, Lorg/a/a/d;->chr:I
+    iget v0, p0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v0, 0x3
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v2, v2
 
@@ -125,7 +125,7 @@
     invoke-direct {p0, v1}, Lorg/a/a/d;->fE(I)V
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v2, v0, 0x1
 
@@ -147,7 +147,7 @@
 
     aput-byte p2, v1, p1
 
-    iput v0, p0, Lorg/a/a/d;->chr:I
+    iput v0, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 .end method
@@ -155,11 +155,11 @@
 .method public final bj(J)Lorg/a/a/d;
     .locals 5
 
-    iget v0, p0, Lorg/a/a/d;->chr:I
+    iget v0, p0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v0, 0x8
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v2, v2
 
@@ -170,7 +170,7 @@
     invoke-direct {p0, v1}, Lorg/a/a/d;->fE(I)V
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     const/16 v2, 0x20
 
@@ -240,7 +240,7 @@
 
     aput-byte p1, v1, p2
 
-    iput v0, p0, Lorg/a/a/d;->chr:I
+    iput v0, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 .end method
@@ -256,13 +256,13 @@
 
     if-gt v0, v1, :cond_3
 
-    iget v2, p0, Lorg/a/a/d;->chr:I
+    iget v2, p0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v3, v2, 0x2
 
     add-int/2addr v3, v0
 
-    iget-object v4, p0, Lorg/a/a/d;->chA:[B
+    iget-object v4, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v4, v4
 
@@ -273,7 +273,7 @@
     invoke-direct {p0, v3}, Lorg/a/a/d;->fE(I)V
 
     :cond_0
-    iget-object v3, p0, Lorg/a/a/d;->chA:[B
+    iget-object v3, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v4, v2, 0x1
 
@@ -317,7 +317,7 @@
     goto :goto_0
 
     :cond_1
-    iput v2, p0, Lorg/a/a/d;->chr:I
+    iput v2, p0, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p0, p1, v4, v1}, Lorg/a/a/d;->r(Ljava/lang/String;II)Lorg/a/a/d;
 
@@ -326,7 +326,7 @@
     return-object p1
 
     :cond_2
-    iput v2, p0, Lorg/a/a/d;->chr:I
+    iput v2, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 
@@ -336,16 +336,18 @@
     invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final fB(I)Lorg/a/a/d;
     .locals 3
 
-    iget v0, p0, Lorg/a/a/d;->chr:I
+    iget v0, p0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v0, 0x1
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v2, v2
 
@@ -356,13 +358,13 @@
     invoke-direct {p0, v2}, Lorg/a/a/d;->fE(I)V
 
     :cond_0
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     int-to-byte p1, p1
 
     aput-byte p1, v2, v0
 
-    iput v1, p0, Lorg/a/a/d;->chr:I
+    iput v1, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 .end method
@@ -370,11 +372,11 @@
 .method public final fC(I)Lorg/a/a/d;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/d;->chr:I
+    iget v0, p0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v0, 0x2
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v2, v2
 
@@ -385,7 +387,7 @@
     invoke-direct {p0, v1}, Lorg/a/a/d;->fE(I)V
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v2, v0, 0x1
 
@@ -401,7 +403,7 @@
 
     aput-byte p1, v1, v2
 
-    iput v0, p0, Lorg/a/a/d;->chr:I
+    iput v0, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 .end method
@@ -409,11 +411,11 @@
 .method public final fD(I)Lorg/a/a/d;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/d;->chr:I
+    iget v0, p0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v0, 0x4
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v2, v2
 
@@ -424,7 +426,7 @@
     invoke-direct {p0, v1}, Lorg/a/a/d;->fE(I)V
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v2, v0, 0x1
 
@@ -456,7 +458,7 @@
 
     aput-byte p1, v1, v2
 
-    iput v0, p0, Lorg/a/a/d;->chr:I
+    iput v0, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 .end method
@@ -473,9 +475,9 @@
     move v2, v1
 
     :goto_0
-    const/16 v3, 0x7ff
+    const/16 v3, 0x7f
 
-    const/16 v4, 0x7f
+    const/16 v4, 0x7ff
 
     if-ge v1, v0, :cond_2
 
@@ -485,14 +487,14 @@
 
     if-lez v5, :cond_0
 
-    if-gt v5, v4, :cond_0
+    if-gt v5, v3, :cond_0
 
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
 
     :cond_0
-    if-le v5, v3, :cond_1
+    if-le v5, v4, :cond_1
 
     add-int/lit8 v2, v2, 0x3
 
@@ -509,7 +511,7 @@
     :cond_2
     if-gt v2, p3, :cond_8
 
-    iget p3, p0, Lorg/a/a/d;->chr:I
+    iget p3, p0, Lorg/a/a/d;->cgL:I
 
     sub-int/2addr p3, p2
 
@@ -517,7 +519,7 @@
 
     if-ltz p3, :cond_3
 
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     ushr-int/lit8 v5, v2, 0x8
 
@@ -525,8 +527,6 @@
 
     aput-byte v5, v1, p3
 
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
-
     add-int/lit8 p3, p3, 0x1
 
     int-to-byte v5, v2
@@ -534,13 +534,13 @@
     aput-byte v5, v1, p3
 
     :cond_3
-    iget p3, p0, Lorg/a/a/d;->chr:I
+    iget p3, p0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr p3, v2
 
     sub-int/2addr p3, p2
 
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v1, v1
 
@@ -551,7 +551,7 @@
     invoke-direct {p0, v2}, Lorg/a/a/d;->fE(I)V
 
     :cond_4
-    iget p3, p0, Lorg/a/a/d;->chr:I
+    iget p3, p0, Lorg/a/a/d;->cgL:I
 
     :goto_2
     if-ge p2, v0, :cond_7
@@ -562,9 +562,9 @@
 
     if-lez v1, :cond_5
 
-    if-gt v1, v4, :cond_5
+    if-gt v1, v3, :cond_5
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v5, p3, 0x1
 
@@ -572,15 +572,12 @@
 
     aput-byte v1, v2, p3
 
-    :goto_3
-    move p3, v5
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_5
-    if-le v1, v3, :cond_6
+    if-le v1, v4, :cond_6
 
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v5, p3, 0x1
 
@@ -594,9 +591,7 @@
 
     aput-byte v6, v2, p3
 
-    iget-object p3, p0, Lorg/a/a/d;->chA:[B
-
-    add-int/lit8 v2, v5, 0x1
+    add-int/lit8 p3, v5, 0x1
 
     shr-int/lit8 v6, v1, 0x6
 
@@ -606,11 +601,9 @@
 
     int-to-byte v6, v6
 
-    aput-byte v6, p3, v5
+    aput-byte v6, v2, v5
 
-    iget-object p3, p0, Lorg/a/a/d;->chA:[B
-
-    add-int/lit8 v5, v2, 0x1
+    add-int/lit8 v5, p3, 0x1
 
     and-int/lit8 v1, v1, 0x3f
 
@@ -618,12 +611,15 @@
 
     int-to-byte v1, v1
 
-    aput-byte v1, p3, v2
+    aput-byte v1, v2, p3
 
-    goto :goto_3
+    :goto_3
+    move p3, v5
+
+    goto :goto_4
 
     :cond_6
-    iget-object v2, p0, Lorg/a/a/d;->chA:[B
+    iget-object v2, p0, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v5, p3, 0x1
 
@@ -637,9 +633,7 @@
 
     aput-byte v6, v2, p3
 
-    iget-object p3, p0, Lorg/a/a/d;->chA:[B
-
-    add-int/lit8 v2, v5, 0x1
+    add-int/lit8 p3, v5, 0x1
 
     and-int/lit8 v1, v1, 0x3f
 
@@ -647,9 +641,7 @@
 
     int-to-byte v1, v1
 
-    aput-byte v1, p3, v5
-
-    move p3, v2
+    aput-byte v1, v2, v5
 
     :goto_4
     add-int/lit8 p2, p2, 0x1
@@ -657,7 +649,7 @@
     goto :goto_2
 
     :cond_7
-    iput p3, p0, Lorg/a/a/d;->chr:I
+    iput p3, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 
@@ -667,16 +659,18 @@
     invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final s([BII)Lorg/a/a/d;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/d;->chr:I
+    iget v0, p0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, p3
 
-    iget-object v1, p0, Lorg/a/a/d;->chA:[B
+    iget-object v1, p0, Lorg/a/a/d;->cgU:[B
 
     array-length v1, v1
 
@@ -687,18 +681,18 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/d;->chA:[B
+    iget-object v0, p0, Lorg/a/a/d;->cgU:[B
 
-    iget v1, p0, Lorg/a/a/d;->chr:I
+    iget v1, p0, Lorg/a/a/d;->cgL:I
 
     invoke-static {p1, p2, v0, v1, p3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_1
-    iget p1, p0, Lorg/a/a/d;->chr:I
+    iget p1, p0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr p1, p3
 
-    iput p1, p0, Lorg/a/a/d;->chr:I
+    iput p1, p0, Lorg/a/a/d;->cgL:I
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/e.smali b/com.discord/smali_classes2/org/a/a/e.smali
index 7ca0d5dd9d..606f8ca77a 100644
--- a/com.discord/smali_classes2/org/a/a/e.smali
+++ b/com.discord/smali_classes2/org/a/a/e.smali
@@ -3,15 +3,15 @@
 
 
 # instance fields
-.field private final chB:[I
+.field public final cgS:[B
 
-.field private final chC:[Ljava/lang/String;
+.field private final cgV:[I
 
-.field private final chD:I
+.field private final cgW:[Ljava/lang/String;
 
-.field public final chE:I
+.field private final cgX:I
 
-.field public final chy:[B
+.field public final cgY:I
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/e;->chy:[B
+    iput-object p1, p0, Lorg/a/a/e;->cgS:[B
 
     const/4 p2, 0x6
 
@@ -50,15 +50,15 @@
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lorg/a/a/e;->chB:[I
+    iput-object p2, p0, Lorg/a/a/e;->cgV:[I
 
-    iget-object p2, p0, Lorg/a/a/e;->chB:[I
+    iget-object p2, p0, Lorg/a/a/e;->cgV:[I
 
     array-length p2, p2
 
     new-array v0, p2, [Ljava/lang/String;
 
-    iput-object v0, p0, Lorg/a/a/e;->chC:[Ljava/lang/String;
+    iput-object v0, p0, Lorg/a/a/e;->cgW:[Ljava/lang/String;
 
     const/4 v0, 0x0
 
@@ -68,18 +68,20 @@
 
     const/4 v0, 0x1
 
-    const/4 v3, 0x0
+    const/4 v1, 0x0
+
+    const/16 v3, 0xa
 
     :goto_0
     if-ge v0, p2, :cond_4
 
-    iget-object v4, p0, Lorg/a/a/e;->chB:[I
+    iget-object v4, p0, Lorg/a/a/e;->cgV:[I
 
-    add-int/lit8 v5, v1, 0x1
+    add-int/lit8 v5, v3, 0x1
 
     aput v5, v4, v0
 
-    aget-byte v4, p1, v1
+    aget-byte v4, p1, v3
 
     const/4 v6, 0x3
 
@@ -124,22 +126,22 @@
 
     add-int/2addr v6, v4
 
-    if-le v6, v3, :cond_3
+    if-le v6, v1, :cond_3
 
-    move v3, v6
+    move v1, v6
 
     :cond_3
     :goto_1
-    add-int/2addr v1, v6
+    add-int/2addr v3, v6
 
     add-int/2addr v0, v2
 
     goto :goto_0
 
     :cond_4
-    iput v3, p0, Lorg/a/a/e;->chD:I
+    iput v1, p0, Lorg/a/a/e;->cgX:I
 
-    iput v1, p0, Lorg/a/a/e;->chE:I
+    iput v3, p0, Lorg/a/a/e;->cgY:I
 
     return-void
 
@@ -150,6 +152,10 @@
 
     throw p1
 
+    return-void
+
+    nop
+
     :pswitch_data_0
     .packed-switch 0x3
         :pswitch_1
@@ -170,15 +176,15 @@
 .method private a(IZZLorg/a/a/h;)I
     .locals 11
 
-    iget-object v6, p4, Lorg/a/a/h;->cio:[C
+    iget-object v6, p4, Lorg/a/a/h;->chI:[C
 
-    iget-object v7, p4, Lorg/a/a/h;->cit:[Lorg/a/a/p;
+    iget-object v7, p4, Lorg/a/a/h;->chN:[Lorg/a/a/p;
 
     const/16 v0, 0xff
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/e;->chy:[B
+    iget-object p2, p0, Lorg/a/a/e;->cgS:[B
 
     add-int/lit8 v1, p1, 0x1
 
@@ -193,7 +199,7 @@
     :cond_0
     const/4 p2, -0x1
 
-    iput p2, p4, Lorg/a/a/h;->chT:I
+    iput p2, p4, Lorg/a/a/h;->chn:I
 
     move v3, p1
 
@@ -202,7 +208,7 @@
     :goto_0
     const/4 p2, 0x0
 
-    iput p2, p4, Lorg/a/a/h;->ciz:I
+    iput p2, p4, Lorg/a/a/h;->chT:I
 
     const/4 v1, 0x3
 
@@ -212,9 +218,9 @@
 
     if-ge p1, v2, :cond_1
 
-    iput v1, p4, Lorg/a/a/h;->ciy:I
+    iput v1, p4, Lorg/a/a/h;->chS:I
 
-    iput p2, p4, Lorg/a/a/h;->chY:I
+    iput p2, p4, Lorg/a/a/h;->chs:I
 
     :goto_1
     move v10, p1
@@ -230,7 +236,7 @@
 
     add-int/lit8 p1, p1, -0x40
 
-    iget-object v1, p4, Lorg/a/a/h;->ciB:[Ljava/lang/Object;
+    iget-object v1, p4, Lorg/a/a/h;->chV:[Ljava/lang/Object;
 
     const/4 v2, 0x0
 
@@ -244,9 +250,9 @@
 
     move-result v3
 
-    iput v9, p4, Lorg/a/a/h;->ciy:I
+    iput v9, p4, Lorg/a/a/h;->chS:I
 
-    iput v8, p4, Lorg/a/a/h;->chY:I
+    iput v8, p4, Lorg/a/a/h;->chs:I
 
     goto :goto_1
 
@@ -261,7 +267,7 @@
 
     if-ne p1, v2, :cond_3
 
-    iget-object v1, p4, Lorg/a/a/h;->ciB:[Ljava/lang/Object;
+    iget-object v1, p4, Lorg/a/a/h;->chV:[Ljava/lang/Object;
 
     const/4 v2, 0x0
 
@@ -275,9 +281,9 @@
 
     move-result v3
 
-    iput v9, p4, Lorg/a/a/h;->ciy:I
+    iput v9, p4, Lorg/a/a/h;->chS:I
 
-    iput v8, p4, Lorg/a/a/h;->chY:I
+    iput v8, p4, Lorg/a/a/h;->chs:I
 
     goto/16 :goto_8
 
@@ -292,15 +298,15 @@
 
     if-ge p1, v4, :cond_4
 
-    iput v9, p4, Lorg/a/a/h;->ciy:I
+    iput v9, p4, Lorg/a/a/h;->chS:I
 
     sub-int/2addr v4, p1
 
-    iput v4, p4, Lorg/a/a/h;->ciz:I
+    iput v4, p4, Lorg/a/a/h;->chT:I
 
-    iget p1, p4, Lorg/a/a/h;->chV:I
+    iget p1, p4, Lorg/a/a/h;->chp:I
 
-    iget p3, p4, Lorg/a/a/h;->ciz:I
+    iget p3, p4, Lorg/a/a/h;->chT:I
 
     sub-int/2addr p1, p3
 
@@ -309,7 +315,7 @@
     :cond_4
     if-ne p1, v4, :cond_5
 
-    iput v1, p4, Lorg/a/a/h;->ciy:I
+    iput v1, p4, Lorg/a/a/h;->chS:I
 
     goto :goto_5
 
@@ -318,7 +324,7 @@
 
     if-eqz p3, :cond_6
 
-    iget p3, p4, Lorg/a/a/h;->chV:I
+    iget p3, p4, Lorg/a/a/h;->chp:I
 
     goto :goto_2
 
@@ -335,7 +341,7 @@
     :goto_3
     if-lez p3, :cond_7
 
-    iget-object v1, p4, Lorg/a/a/h;->ciA:[Ljava/lang/Object;
+    iget-object v1, p4, Lorg/a/a/h;->chU:[Ljava/lang/Object;
 
     add-int/lit8 v9, v2, 0x1
 
@@ -356,26 +362,26 @@
     goto :goto_3
 
     :cond_7
-    iput v8, p4, Lorg/a/a/h;->ciy:I
+    iput v8, p4, Lorg/a/a/h;->chS:I
 
-    iput p1, p4, Lorg/a/a/h;->ciz:I
+    iput p1, p4, Lorg/a/a/h;->chT:I
 
-    iget p1, p4, Lorg/a/a/h;->chV:I
+    iget p1, p4, Lorg/a/a/h;->chp:I
 
-    iget p3, p4, Lorg/a/a/h;->ciz:I
+    iget p3, p4, Lorg/a/a/h;->chT:I
 
     add-int/2addr p1, p3
 
     :goto_4
-    iput p1, p4, Lorg/a/a/h;->chV:I
+    iput p1, p4, Lorg/a/a/h;->chp:I
 
     :goto_5
-    iput p2, p4, Lorg/a/a/h;->chY:I
+    iput p2, p4, Lorg/a/a/h;->chs:I
 
     goto :goto_8
 
     :cond_8
-    iput p2, p4, Lorg/a/a/h;->ciy:I
+    iput p2, p4, Lorg/a/a/h;->chS:I
 
     invoke-direct {p0, v3}, Lorg/a/a/e;->fG(I)I
 
@@ -383,16 +389,16 @@
 
     add-int/lit8 v3, v3, 0x2
 
-    iput p1, p4, Lorg/a/a/h;->ciz:I
+    iput p1, p4, Lorg/a/a/h;->chT:I
 
-    iput p1, p4, Lorg/a/a/h;->chV:I
+    iput p1, p4, Lorg/a/a/h;->chp:I
 
     const/4 v2, 0x0
 
     :goto_6
     if-lez p1, :cond_9
 
-    iget-object v1, p4, Lorg/a/a/h;->ciA:[Ljava/lang/Object;
+    iget-object v1, p4, Lorg/a/a/h;->chU:[Ljava/lang/Object;
 
     add-int/lit8 p3, v2, 0x1
 
@@ -419,14 +425,14 @@
 
     add-int/2addr v3, v9
 
-    iput p1, p4, Lorg/a/a/h;->chY:I
+    iput p1, p4, Lorg/a/a/h;->chs:I
 
     const/4 v2, 0x0
 
     :goto_7
     if-lez p1, :cond_a
 
-    iget-object v1, p4, Lorg/a/a/h;->ciB:[Ljava/lang/Object;
+    iget-object v1, p4, Lorg/a/a/h;->chV:[Ljava/lang/Object;
 
     add-int/lit8 p2, v2, 0x1
 
@@ -448,15 +454,15 @@
 
     :cond_a
     :goto_8
-    iget p1, p4, Lorg/a/a/h;->chT:I
+    iget p1, p4, Lorg/a/a/h;->chn:I
 
     add-int/2addr v10, v8
 
     add-int/2addr p1, v10
 
-    iput p1, p4, Lorg/a/a/h;->chT:I
+    iput p1, p4, Lorg/a/a/h;->chn:I
 
-    iget p1, p4, Lorg/a/a/h;->chT:I
+    iget p1, p4, Lorg/a/a/h;->chn:I
 
     invoke-static {p1, v7}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
@@ -472,7 +478,7 @@
 
     if-nez p4, :cond_3
 
-    iget-object p3, p0, Lorg/a/a/e;->chy:[B
+    iget-object p3, p0, Lorg/a/a/e;->cgS:[B
 
     aget-byte p3, p3, p1
 
@@ -520,7 +526,7 @@
     return p1
 
     :cond_3
-    iget-object v2, p0, Lorg/a/a/e;->chy:[B
+    iget-object v2, p0, Lorg/a/a/e;->cgS:[B
 
     add-int/lit8 v3, p1, 0x1
 
@@ -589,7 +595,7 @@
     return p1
 
     :cond_4
-    iget-object v2, p0, Lorg/a/a/e;->chy:[B
+    iget-object v2, p0, Lorg/a/a/e;->cgS:[B
 
     add-int/lit8 v4, v3, 0x1
 
@@ -631,7 +637,7 @@
     :goto_0
     if-ge v0, p1, :cond_5
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -657,7 +663,7 @@
     :goto_1
     if-ge v0, p1, :cond_5
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -683,7 +689,7 @@
     :goto_2
     if-ge v0, p1, :cond_5
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -713,7 +719,7 @@
     :goto_3
     if-ge v0, p1, :cond_5
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -741,7 +747,7 @@
     :goto_4
     if-ge v0, p1, :cond_5
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -778,7 +784,7 @@
     :goto_5
     if-ge v2, p1, :cond_5
 
-    iget-object v3, p0, Lorg/a/a/e;->chB:[I
+    iget-object v3, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -814,7 +820,7 @@
     :goto_7
     if-ge v0, p1, :cond_5
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -842,7 +848,7 @@
     :goto_8
     if-ge v0, p1, :cond_5
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -867,7 +873,7 @@
     goto :goto_8
 
     :sswitch_4
-    iget-object p1, p0, Lorg/a/a/e;->chB:[I
+    iget-object p1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v3}, Lorg/a/a/e;->fG(I)I
 
@@ -891,7 +897,7 @@
     goto :goto_9
 
     :sswitch_5
-    iget-object p1, p0, Lorg/a/a/e;->chB:[I
+    iget-object p1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v3}, Lorg/a/a/e;->fG(I)I
 
@@ -926,7 +932,7 @@
     goto :goto_b
 
     :sswitch_7
-    iget-object p1, p0, Lorg/a/a/e;->chB:[I
+    iget-object p1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v3}, Lorg/a/a/e;->fG(I)I
 
@@ -947,7 +953,7 @@
     goto :goto_a
 
     :sswitch_8
-    iget-object p1, p0, Lorg/a/a/e;->chB:[I
+    iget-object p1, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, v3}, Lorg/a/a/e;->fG(I)I
 
@@ -1067,7 +1073,7 @@
     :cond_1
     if-eqz p4, :cond_2
 
-    invoke-virtual {p4}, Lorg/a/a/a;->JC()V
+    invoke-virtual {p4}, Lorg/a/a/a;->JB()V
 
     :cond_2
     return p1
@@ -1125,15 +1131,15 @@
 
     new-array v2, v1, [Lorg/a/a/p;
 
-    iput-object v2, p1, Lorg/a/a/h;->civ:[Lorg/a/a/p;
+    iput-object v2, p1, Lorg/a/a/h;->chP:[Lorg/a/a/p;
 
     new-array v2, v1, [Lorg/a/a/p;
 
-    iput-object v2, p1, Lorg/a/a/h;->ciw:[Lorg/a/a/p;
+    iput-object v2, p1, Lorg/a/a/h;->chQ:[Lorg/a/a/p;
 
     new-array v2, v1, [I
 
-    iput-object v2, p1, Lorg/a/a/h;->cix:[I
+    iput-object v2, p1, Lorg/a/a/h;->chR:[I
 
     add-int/lit8 p2, p2, 0x3
 
@@ -1152,9 +1158,9 @@
 
     move-result v4
 
-    iget-object v5, p1, Lorg/a/a/h;->civ:[Lorg/a/a/p;
+    iget-object v5, p1, Lorg/a/a/h;->chP:[Lorg/a/a/p;
 
-    iget-object v6, p1, Lorg/a/a/h;->cit:[Lorg/a/a/p;
+    iget-object v6, p1, Lorg/a/a/h;->chN:[Lorg/a/a/p;
 
     invoke-static {v3, v6}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
@@ -1162,11 +1168,11 @@
 
     aput-object v6, v5, v2
 
-    iget-object v5, p1, Lorg/a/a/h;->ciw:[Lorg/a/a/p;
+    iget-object v5, p1, Lorg/a/a/h;->chQ:[Lorg/a/a/p;
 
     add-int/2addr v3, v4
 
-    iget-object v4, p1, Lorg/a/a/h;->cit:[Lorg/a/a/p;
+    iget-object v4, p1, Lorg/a/a/h;->chN:[Lorg/a/a/p;
 
     invoke-static {v3, v4}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
@@ -1174,7 +1180,7 @@
 
     aput-object v3, v5, v2
 
-    iget-object v3, p1, Lorg/a/a/h;->cix:[I
+    iget-object v3, p1, Lorg/a/a/h;->chR:[I
 
     add-int/lit8 v4, p2, 0x4
 
@@ -1210,7 +1216,7 @@
 
     move-result v1
 
-    iput v0, p1, Lorg/a/a/h;->bTR:I
+    iput v0, p1, Lorg/a/a/h;->bTx:I
 
     if-nez v1, :cond_2
 
@@ -1221,12 +1227,12 @@
     :cond_2
     new-instance v0, Lorg/a/a/u;
 
-    iget-object v2, p0, Lorg/a/a/e;->chy:[B
+    iget-object v2, p0, Lorg/a/a/e;->cgS:[B
 
     invoke-direct {v0, v2, p2}, Lorg/a/a/u;-><init>([BI)V
 
     :goto_2
-    iput-object v0, p1, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iput-object v0, p1, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
     add-int/lit8 p2, p2, 0x1
 
@@ -1271,7 +1277,7 @@
 .method private a([Ljava/lang/Object;II[C[Lorg/a/a/p;)I
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     add-int/lit8 v1, p3, 0x1
 
@@ -1306,49 +1312,49 @@
     goto :goto_0
 
     :pswitch_1
-    sget-object p3, Lorg/a/a/s;->cjV:Ljava/lang/Integer;
+    sget-object p3, Lorg/a/a/s;->cjp:Ljava/lang/Integer;
 
     aput-object p3, p1, p2
 
     goto :goto_1
 
     :pswitch_2
-    sget-object p3, Lorg/a/a/s;->cjU:Ljava/lang/Integer;
+    sget-object p3, Lorg/a/a/s;->cjo:Ljava/lang/Integer;
 
     aput-object p3, p1, p2
 
     goto :goto_1
 
     :pswitch_3
-    sget-object p3, Lorg/a/a/s;->cjT:Ljava/lang/Integer;
+    sget-object p3, Lorg/a/a/s;->cjn:Ljava/lang/Integer;
 
     aput-object p3, p1, p2
 
     goto :goto_1
 
     :pswitch_4
-    sget-object p3, Lorg/a/a/s;->cjS:Ljava/lang/Integer;
+    sget-object p3, Lorg/a/a/s;->cjm:Ljava/lang/Integer;
 
     aput-object p3, p1, p2
 
     goto :goto_1
 
     :pswitch_5
-    sget-object p3, Lorg/a/a/s;->cjR:Ljava/lang/Integer;
+    sget-object p3, Lorg/a/a/s;->cjl:Ljava/lang/Integer;
 
     aput-object p3, p1, p2
 
     goto :goto_1
 
     :pswitch_6
-    sget-object p3, Lorg/a/a/s;->cjQ:Ljava/lang/Integer;
+    sget-object p3, Lorg/a/a/s;->cjk:Ljava/lang/Integer;
 
     aput-object p3, p1, p2
 
     goto :goto_1
 
     :pswitch_7
-    sget-object p3, Lorg/a/a/s;->cjP:Ljava/lang/Integer;
+    sget-object p3, Lorg/a/a/s;->cjj:Ljava/lang/Integer;
 
     aput-object p3, p1, p2
 
@@ -1373,7 +1379,7 @@
 
     add-int/2addr p2, p1
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     const/4 v1, 0x1
 
@@ -1392,27 +1398,27 @@
 
     aget-byte p1, v0, p1
 
-    packed-switch v3, :pswitch_data_0
+    packed-switch v4, :pswitch_data_0
 
     goto :goto_1
 
     :pswitch_0
-    shl-int/lit8 v3, v5, 0x6
+    shl-int/lit8 v4, v5, 0x6
 
     and-int/lit8 p1, p1, 0x3f
 
-    or-int/2addr p1, v3
+    or-int/2addr p1, v4
 
     int-to-char p1, p1
 
     move v5, p1
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
     goto :goto_1
 
     :pswitch_1
-    add-int/lit8 v3, v4, 0x1
+    add-int/lit8 v4, v3, 0x1
 
     shl-int/lit8 v7, v5, 0x6
 
@@ -1422,13 +1428,13 @@
 
     int-to-char p1, p1
 
-    aput-char p1, p3, v4
+    aput-char p1, p3, v3
 
-    move v4, v3
+    move v3, v4
 
     move p1, v6
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     goto :goto_0
 
@@ -1439,26 +1445,26 @@
 
     if-ge p1, v7, :cond_0
 
-    add-int/lit8 v7, v4, 0x1
+    add-int/lit8 v7, v3, 0x1
 
     int-to-char p1, p1
 
-    aput-char p1, p3, v4
+    aput-char p1, p3, v3
 
     move p1, v6
 
-    move v4, v7
+    move v3, v7
 
     goto :goto_0
 
     :cond_0
-    const/16 v3, 0xe0
+    const/16 v4, 0xe0
 
-    if-ge p1, v3, :cond_1
+    if-ge p1, v4, :cond_1
 
-    const/16 v3, 0xbf
+    const/16 v4, 0xbf
 
-    if-le p1, v3, :cond_1
+    if-le p1, v4, :cond_1
 
     and-int/lit8 p1, p1, 0x1f
 
@@ -1466,7 +1472,7 @@
 
     move p1, v6
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
@@ -1475,7 +1481,7 @@
 
     int-to-char v5, p1
 
-    const/4 v3, 0x2
+    const/4 v4, 0x2
 
     :goto_1
     move p1, v6
@@ -1485,7 +1491,7 @@
     :cond_2
     new-instance p1, Ljava/lang/String;
 
-    invoke-direct {p1, p3, v2, v4}, Ljava/lang/String;-><init>([CII)V
+    invoke-direct {p1, p3, v2, v3}, Ljava/lang/String;-><init>([CII)V
 
     return-object p1
 
@@ -1513,34 +1519,32 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/e;->chC:[Ljava/lang/String;
+    iget-object p1, p0, Lorg/a/a/e;->cgW:[Ljava/lang/String;
 
-    aget-object p1, p1, v0
+    aget-object v1, p1, v0
 
-    if-eqz p1, :cond_1
+    if-eqz v1, :cond_1
 
-    return-object p1
+    return-object v1
 
     :cond_1
-    iget-object p1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
-    aget p1, p1, v0
+    aget v1, v1, v0
 
-    iget-object v1, p0, Lorg/a/a/e;->chC:[Ljava/lang/String;
+    add-int/lit8 v2, v1, 0x2
 
-    add-int/lit8 v2, p1, 0x2
+    invoke-direct {p0, v1}, Lorg/a/a/e;->fG(I)I
 
-    invoke-direct {p0, p1}, Lorg/a/a/e;->fG(I)I
+    move-result v1
 
-    move-result p1
+    invoke-direct {p0, v2, v1, p2}, Lorg/a/a/e;->a(II[C)Ljava/lang/String;
 
-    invoke-direct {p0, v2, p1, p2}, Lorg/a/a/e;->a(II[C)Ljava/lang/String;
+    move-result-object p2
 
-    move-result-object p1
+    aput-object p2, p1, v0
 
-    aput-object p1, v1, v0
-
-    return-object p1
+    return-object p2
 
     :cond_2
     :goto_0
@@ -1613,7 +1617,7 @@
 .method private a(Lorg/a/a/q;Lorg/a/a/h;IZ)[I
     .locals 9
 
-    iget-object v0, p2, Lorg/a/a/h;->cio:[C
+    iget-object v0, p2, Lorg/a/a/h;->chI:[C
 
     invoke-direct {p0, p3}, Lorg/a/a/e;->fG(I)I
 
@@ -1678,13 +1682,13 @@
 
     move-result v7
 
-    iget-object v8, p2, Lorg/a/a/h;->cit:[Lorg/a/a/p;
+    iget-object v8, p2, Lorg/a/a/h;->chN:[Lorg/a/a/p;
 
     invoke-static {v6, v8}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
     add-int/2addr v6, v7
 
-    iget-object v7, p2, Lorg/a/a/h;->cit:[Lorg/a/a/p;
+    iget-object v7, p2, Lorg/a/a/h;->chN:[Lorg/a/a/p;
 
     invoke-static {v6, v7}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
@@ -1722,7 +1726,7 @@
     :cond_1
     new-instance v7, Lorg/a/a/u;
 
-    iget-object v4, p0, Lorg/a/a/e;->chy:[B
+    iget-object v4, p0, Lorg/a/a/e;->cgS:[B
 
     invoke-direct {v7, v4, p3}, Lorg/a/a/u;-><init>([BI)V
 
@@ -1803,7 +1807,7 @@
 .method private b(I[C)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/e;->chB:[I
+    iget-object v0, p0, Lorg/a/a/e;->cgV:[I
 
     invoke-direct {p0, p1}, Lorg/a/a/e;->fG(I)I
 
@@ -1821,7 +1825,7 @@
 .method private b(Lorg/a/a/q;Lorg/a/a/h;IZ)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     add-int/lit8 v1, p3, 0x1
 
@@ -1829,7 +1833,7 @@
 
     and-int/lit16 p3, p3, 0xff
 
-    iget-object v0, p2, Lorg/a/a/h;->cis:Ljava/lang/String;
+    iget-object v0, p2, Lorg/a/a/h;->chM:Ljava/lang/String;
 
     invoke-static {v0}, Lorg/a/a/t;->fb(Ljava/lang/String;)[Lorg/a/a/t;
 
@@ -1854,7 +1858,7 @@
 
     if-eqz v4, :cond_0
 
-    invoke-virtual {v4}, Lorg/a/a/a;->JC()V
+    invoke-virtual {v4}, Lorg/a/a/a;->JB()V
 
     :cond_0
     add-int/lit8 v3, v3, 0x1
@@ -1862,7 +1866,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p2, p2, Lorg/a/a/h;->cio:[C
+    iget-object p2, p2, Lorg/a/a/h;->chI:[C
 
     :goto_1
     add-int v2, p3, v0
@@ -1910,11 +1914,11 @@
 .method private c(I[C)Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/e;->chB:[I
+    iget-object v0, p0, Lorg/a/a/e;->cgV:[I
 
     aget p1, v0, p1
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     add-int/lit8 v1, p1, -0x1
 
@@ -1930,7 +1934,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lorg/a/a/e;->chB:[I
+    iget-object v1, p0, Lorg/a/a/e;->cgV:[I
 
     add-int/lit8 p1, p1, 0x1
 
@@ -2063,7 +2067,7 @@
 .method private fF(I)I
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     aget-byte p1, v0, p1
 
@@ -2075,7 +2079,7 @@
 .method private fG(I)I
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     aget-byte v1, v0, p1
 
@@ -2097,7 +2101,7 @@
 .method private fH(I)S
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     aget-byte v1, v0, p1
 
@@ -2121,7 +2125,7 @@
 .method private fI(I)I
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/e;->chy:[B
+    iget-object v0, p0, Lorg/a/a/e;->cgS:[B
 
     aget-byte v1, v0, p1
 
@@ -2193,7 +2197,7 @@
 
 # virtual methods
 .method public final a(Lorg/a/a/f;)V
-    .locals 80
+    .locals 48
 
     move-object/from16 v0, p0
 
@@ -2203,9 +2207,9 @@
 
     new-array v1, v9, [Lorg/a/a/c;
 
-    iget v2, v0, Lorg/a/a/e;->chE:I
+    iget v2, v0, Lorg/a/a/e;->cgY:I
 
-    iget v3, v0, Lorg/a/a/e;->chD:I
+    iget v3, v0, Lorg/a/a/e;->cgX:I
 
     new-array v10, v3, [C
 
@@ -2213,13 +2217,13 @@
 
     invoke-direct {v11}, Lorg/a/a/h;-><init>()V
 
-    iput-object v1, v11, Lorg/a/a/h;->cin:[Lorg/a/a/c;
+    iput-object v1, v11, Lorg/a/a/h;->chH:[Lorg/a/a/c;
 
     const/4 v12, 0x4
 
-    iput v12, v11, Lorg/a/a/h;->chr:I
+    iput v12, v11, Lorg/a/a/h;->cgL:I
 
-    iput-object v10, v11, Lorg/a/a/h;->cio:[C
+    iput-object v10, v11, Lorg/a/a/h;->chI:[C
 
     invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
 
@@ -2271,30 +2275,28 @@
     goto :goto_0
 
     :cond_0
-    iget v2, v0, Lorg/a/a/e;->chE:I
+    iget v2, v0, Lorg/a/a/e;->cgY:I
 
-    add-int/2addr v2, v14
+    add-int/lit8 v5, v2, 0x8
 
-    iget v5, v0, Lorg/a/a/e;->chE:I
-
-    add-int/lit8 v5, v5, 0x6
-
-    invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
-
-    move-result v5
-
-    mul-int/lit8 v5, v5, 0x2
-
-    add-int/2addr v2, v5
+    add-int/lit8 v2, v2, 0x6
 
     invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
 
-    move-result v5
+    move-result v2
+
+    mul-int/lit8 v2, v2, 0x2
+
+    add-int/2addr v5, v2
+
+    invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
+
+    move-result v2
 
     :goto_1
-    if-lez v5, :cond_2
+    if-lez v2, :cond_2
 
-    add-int/lit8 v7, v2, 0x8
+    add-int/lit8 v7, v5, 0x8
 
     invoke-direct {v0, v7}, Lorg/a/a/e;->fG(I)I
 
@@ -2303,7 +2305,7 @@
     :goto_2
     if-lez v7, :cond_1
 
-    add-int/lit8 v15, v2, 0xc
+    add-int/lit8 v15, v5, 0xc
 
     invoke-direct {v0, v15}, Lorg/a/a/e;->fI(I)I
 
@@ -2311,30 +2313,30 @@
 
     add-int/lit8 v15, v15, 0x6
 
-    add-int/2addr v2, v15
+    add-int/2addr v5, v15
 
     add-int/lit8 v7, v7, -0x1
 
     goto :goto_2
 
     :cond_1
-    add-int/lit8 v2, v2, 0x8
+    add-int/lit8 v5, v5, 0x8
 
-    add-int/lit8 v5, v5, -0x1
+    add-int/lit8 v2, v2, -0x1
 
     goto :goto_1
 
     :cond_2
-    add-int/lit8 v2, v2, 0x2
+    add-int/lit8 v5, v5, 0x2
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
 
-    move-result v5
+    move-result v2
 
     :goto_3
-    if-lez v5, :cond_4
+    if-lez v2, :cond_4
 
-    add-int/lit8 v7, v2, 0x8
+    add-int/lit8 v7, v5, 0x8
 
     invoke-direct {v0, v7}, Lorg/a/a/e;->fG(I)I
 
@@ -2343,7 +2345,7 @@
     :goto_4
     if-lez v7, :cond_3
 
-    add-int/lit8 v15, v2, 0xc
+    add-int/lit8 v15, v5, 0xc
 
     invoke-direct {v0, v15}, Lorg/a/a/e;->fI(I)I
 
@@ -2351,25 +2353,29 @@
 
     add-int/lit8 v15, v15, 0x6
 
-    add-int/2addr v2, v15
+    add-int/2addr v5, v15
 
     add-int/lit8 v7, v7, -0x1
 
     goto :goto_4
 
     :cond_3
-    add-int/lit8 v2, v2, 0x8
+    add-int/lit8 v5, v5, 0x8
 
-    add-int/lit8 v5, v5, -0x1
+    add-int/lit8 v2, v2, -0x1
 
     goto :goto_3
 
     :cond_4
-    add-int/lit8 v2, v2, 0x2
+    add-int/lit8 v5, v5, 0x2
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
 
-    move-result v5
+    move-result v2
+
+    move/from16 v16, v5
+
+    const/4 v5, 0x0
 
     const/4 v7, 0x0
 
@@ -2393,281 +2399,288 @@
 
     const/16 v23, 0x0
 
-    const/16 v24, 0x0
-
     :goto_5
-    const/high16 v25, 0x20000
+    const/high16 v24, 0x20000
 
-    move-object/from16 v26, v15
+    move-object/from16 v25, v15
 
-    if-lez v5, :cond_14
+    if-lez v2, :cond_14
 
-    add-int/lit8 v15, v2, 0x2
+    add-int/lit8 v15, v16, 0x2
 
     invoke-direct {v0, v15, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
     move-result-object v15
 
-    const-string v8, "SourceFile"
+    move-object/from16 v27, v7
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    const-string v7, "SourceFile"
 
-    move-result v8
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    if-eqz v8, :cond_6
+    move-result v7
 
-    add-int/lit8 v8, v2, 0x8
+    if-eqz v7, :cond_5
 
-    invoke-direct {v0, v8, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
-
-    move-result-object v8
-
-    move-object v12, v8
-
-    :goto_6
-    move-object/from16 v29, v10
-
-    :cond_5
-    :goto_7
-    move-object/from16 v15, v26
-
-    goto/16 :goto_a
-
-    :cond_6
-    const-string v8, "InnerClasses"
-
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_7
-
-    add-int/lit8 v8, v2, 0x8
-
-    move/from16 v24, v8
-
-    goto :goto_6
-
-    :cond_7
-    const-string v8, "EnclosingMethod"
-
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_9
-
-    add-int/lit8 v8, v2, 0x8
-
-    invoke-direct {v0, v8, v10}, Lorg/a/a/e;->b(I[C)Ljava/lang/String;
-
-    move-result-object v8
-
-    add-int/lit8 v15, v2, 0xa
-
-    invoke-direct {v0, v15}, Lorg/a/a/e;->fG(I)I
-
-    move-result v15
-
-    if-eqz v15, :cond_8
-
-    move-object/from16 v28, v8
-
-    iget-object v8, v0, Lorg/a/a/e;->chB:[I
-
-    aget v8, v8, v15
-
-    invoke-direct {v0, v8, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
-
-    move-result-object v18
-
-    iget-object v8, v0, Lorg/a/a/e;->chB:[I
-
-    aget v8, v8, v15
-
-    add-int/lit8 v8, v8, 0x2
-
-    invoke-direct {v0, v8, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
-
-    move-result-object v23
-
-    goto :goto_8
-
-    :cond_8
-    move-object/from16 v28, v8
-
-    :goto_8
-    move-object/from16 v29, v10
-
-    move-object/from16 v15, v28
-
-    goto/16 :goto_a
-
-    :cond_9
-    const-string v8, "Signature"
-
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_a
-
-    add-int/lit8 v7, v2, 0x8
+    add-int/lit8 v7, v16, 0x8
 
     invoke-direct {v0, v7, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
     move-result-object v7
 
+    move-object/from16 v28, v10
+
+    move-object/from16 v15, v25
+
+    goto/16 :goto_b
+
+    :cond_5
+    const-string v7, "InnerClasses"
+
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_7
+
+    add-int/lit8 v7, v16, 0x8
+
+    move/from16 v22, v7
+
+    :goto_6
+    move-object/from16 v28, v10
+
+    :cond_6
+    :goto_7
+    move-object/from16 v15, v25
+
+    :goto_8
+    move-object/from16 v7, v27
+
+    goto/16 :goto_b
+
+    :cond_7
+    const-string v7, "EnclosingMethod"
+
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_9
+
+    add-int/lit8 v7, v16, 0x8
+
+    invoke-direct {v0, v7, v10}, Lorg/a/a/e;->b(I[C)Ljava/lang/String;
+
+    move-result-object v7
+
+    add-int/lit8 v14, v16, 0xa
+
+    invoke-direct {v0, v14}, Lorg/a/a/e;->fG(I)I
+
+    move-result v14
+
+    if-eqz v14, :cond_8
+
+    iget-object v15, v0, Lorg/a/a/e;->cgV:[I
+
+    aget v15, v15, v14
+
+    invoke-direct {v0, v15, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+
+    move-result-object v15
+
+    move-object/from16 v24, v7
+
+    iget-object v7, v0, Lorg/a/a/e;->cgV:[I
+
+    aget v7, v7, v14
+
+    add-int/lit8 v7, v7, 0x2
+
+    invoke-direct {v0, v7, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+
+    move-result-object v23
+
+    goto :goto_9
+
+    :cond_8
+    move-object/from16 v24, v7
+
+    move-object/from16 v15, v25
+
+    :goto_9
+    move-object/from16 v28, v10
+
+    move-object/from16 v14, v24
+
+    goto :goto_8
+
+    :cond_9
+    const-string v7, "Signature"
+
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_a
+
+    add-int/lit8 v5, v16, 0x8
+
+    invoke-direct {v0, v5, v10}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+
+    move-result-object v5
+
     goto :goto_6
 
     :cond_a
-    const-string v8, "RuntimeVisibleAnnotations"
+    const-string v7, "RuntimeVisibleAnnotations"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_b
+    if-eqz v7, :cond_b
 
-    add-int/lit8 v8, v2, 0x8
+    add-int/lit8 v7, v16, 0x8
 
-    move/from16 v19, v8
+    move/from16 v18, v7
 
     goto :goto_6
 
     :cond_b
-    const-string v8, "RuntimeVisibleTypeAnnotations"
+    const-string v7, "RuntimeVisibleTypeAnnotations"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_c
+    if-eqz v7, :cond_c
 
-    add-int/lit8 v8, v2, 0x8
+    add-int/lit8 v7, v16, 0x8
 
-    move/from16 v21, v8
+    move/from16 v20, v7
 
     goto :goto_6
 
     :cond_c
-    const-string v8, "Deprecated"
+    const-string v7, "Deprecated"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_d
+    if-eqz v7, :cond_d
 
-    or-int v3, v3, v25
+    or-int v3, v3, v24
 
     goto :goto_6
 
     :cond_d
-    const-string v8, "Synthetic"
+    const-string v7, "Synthetic"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_e
+    if-eqz v7, :cond_e
 
-    const v8, 0x41000
+    const v7, 0x41000
 
-    or-int/2addr v3, v8
+    or-int/2addr v3, v7
 
-    goto/16 :goto_6
+    goto :goto_6
 
     :cond_e
-    const-string v8, "SourceDebugExtension"
+    const-string v7, "SourceDebugExtension"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_f
+    if-eqz v7, :cond_f
 
-    add-int/lit8 v8, v2, 0x4
+    add-int/lit8 v7, v16, 0x4
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->fI(I)I
+    invoke-direct {v0, v7}, Lorg/a/a/e;->fI(I)I
 
-    move-result v8
+    move-result v7
 
-    add-int/lit8 v14, v2, 0x8
+    add-int/lit8 v12, v16, 0x8
 
-    new-array v15, v8, [C
+    new-array v15, v7, [C
 
-    invoke-direct {v0, v14, v8, v15}, Lorg/a/a/e;->a(II[C)Ljava/lang/String;
+    invoke-direct {v0, v12, v7, v15}, Lorg/a/a/e;->a(II[C)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    move-object v14, v8
+    move-object v12, v7
 
     goto/16 :goto_6
 
     :cond_f
-    const-string v8, "RuntimeInvisibleAnnotations"
+    const-string v7, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_10
+    if-eqz v7, :cond_10
 
-    add-int/lit8 v8, v2, 0x8
+    add-int/lit8 v7, v16, 0x8
 
-    move/from16 v20, v8
+    move/from16 v19, v7
 
     goto/16 :goto_6
 
     :cond_10
-    const-string v8, "RuntimeInvisibleTypeAnnotations"
+    const-string v7, "RuntimeInvisibleTypeAnnotations"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_11
+    if-eqz v7, :cond_11
 
-    add-int/lit8 v8, v2, 0x8
+    add-int/lit8 v7, v16, 0x8
 
-    move/from16 v22, v8
+    move/from16 v21, v7
 
     goto/16 :goto_6
 
     :cond_11
-    const-string v8, "BootstrapMethods"
+    const-string v7, "BootstrapMethods"
 
-    invoke-virtual {v8, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v7, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_13
+    if-eqz v7, :cond_13
 
-    add-int/lit8 v8, v2, 0x8
+    add-int/lit8 v7, v16, 0x8
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v7}, Lorg/a/a/e;->fG(I)I
 
-    move-result v8
+    move-result v7
 
-    new-array v8, v8, [I
+    new-array v7, v7, [I
 
-    add-int/lit8 v15, v2, 0xa
+    add-int/lit8 v15, v16, 0xa
 
-    move-object/from16 v29, v10
+    move-object/from16 v28, v10
 
-    move/from16 v25, v15
+    move/from16 v24, v15
 
     const/4 v15, 0x0
 
-    :goto_9
-    array-length v10, v8
+    :goto_a
+    array-length v10, v7
 
     if-ge v15, v10, :cond_12
 
-    aput v25, v8, v15
+    aput v24, v7, v15
 
-    add-int/lit8 v10, v25, 0x2
+    add-int/lit8 v10, v24, 0x2
 
     invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
 
@@ -2675,67 +2688,67 @@
 
     add-int/lit8 v10, v10, 0x2
 
-    const/16 v27, 0x1
+    const/16 v26, 0x1
 
     shl-int/lit8 v10, v10, 0x1
 
-    add-int v25, v25, v10
+    add-int v24, v24, v10
 
     add-int/lit8 v15, v15, 0x1
 
-    goto :goto_9
+    goto :goto_a
 
     :cond_12
-    iput-object v8, v11, Lorg/a/a/h;->cip:[I
+    iput-object v7, v11, Lorg/a/a/h;->chJ:[I
 
     goto/16 :goto_7
 
     :cond_13
-    move-object/from16 v29, v10
+    move-object/from16 v28, v10
 
-    add-int/lit8 v8, v2, 0x8
+    add-int/lit8 v7, v16, 0x8
 
-    add-int/lit8 v10, v2, 0x4
+    add-int/lit8 v10, v16, 0x4
 
     invoke-direct {v0, v10}, Lorg/a/a/e;->fI(I)I
 
     move-result v10
 
-    invoke-direct {v0, v1, v15, v8, v10}, Lorg/a/a/e;->a([Lorg/a/a/c;Ljava/lang/String;II)Lorg/a/a/c;
+    invoke-direct {v0, v1, v15, v7, v10}, Lorg/a/a/e;->a([Lorg/a/a/c;Ljava/lang/String;II)Lorg/a/a/c;
 
-    move-result-object v8
+    move-result-object v7
 
-    if-eqz v8, :cond_5
+    if-eqz v7, :cond_6
 
-    iput-object v9, v8, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v9, v7, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
-    move-object v9, v8
+    move-object v9, v7
 
     goto/16 :goto_7
 
-    :goto_a
-    add-int/lit8 v8, v2, 0x4
+    :goto_b
+    add-int/lit8 v10, v16, 0x4
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->fI(I)I
+    invoke-direct {v0, v10}, Lorg/a/a/e;->fI(I)I
 
-    move-result v8
+    move-result v10
 
-    add-int/lit8 v8, v8, 0x6
+    add-int/lit8 v10, v10, 0x6
 
-    add-int/2addr v2, v8
+    add-int v16, v16, v10
 
-    add-int/lit8 v5, v5, -0x1
+    add-int/lit8 v2, v2, -0x1
 
-    move-object/from16 v10, v29
-
-    move-object/from16 v8, p1
+    move-object/from16 v10, v28
 
     goto/16 :goto_5
 
     :cond_14
-    move-object/from16 v29, v10
+    move-object/from16 v27, v7
 
-    iget-object v1, v0, Lorg/a/a/e;->chB:[I
+    move-object/from16 v28, v10
+
+    iget-object v1, v0, Lorg/a/a/e;->cgV:[I
 
     const/4 v2, 0x1
 
@@ -2749,44 +2762,72 @@
 
     move-object/from16 v1, p1
 
-    move-object v5, v7
+    move-object/from16 v15, v27
 
     move-object v7, v13
 
     invoke-virtual/range {v1 .. v7}, Lorg/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    if-nez v12, :cond_16
+    if-nez v15, :cond_15
 
-    if-eqz v14, :cond_15
-
-    goto :goto_b
+    if-eqz v12, :cond_16
 
     :cond_15
-    move-object/from16 v7, p1
+    invoke-virtual {v8, v15, v12}, Lorg/a/a/f;->as(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_16
+    if-eqz v14, :cond_17
+
+    move-object/from16 v1, v23
+
+    move-object/from16 v15, v25
+
+    invoke-virtual {v8, v14, v15, v1}, Lorg/a/a/f;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_17
+    move/from16 v1, v18
+
+    if-eqz v1, :cond_18
+
+    invoke-direct {v0, v1}, Lorg/a/a/e;->fG(I)I
+
+    move-result v2
+
+    add-int/lit8 v18, v1, 0x2
+
+    move/from16 v1, v18
+
+    :goto_c
+    if-lez v2, :cond_18
+
+    add-int/lit8 v3, v1, 0x2
+
+    move-object/from16 v4, v28
+
+    invoke-direct {v0, v1, v4}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    const/4 v5, 0x1
+
+    invoke-virtual {v8, v1, v5}, Lorg/a/a/f;->k(Ljava/lang/String;Z)Lorg/a/a/a;
+
+    move-result-object v1
+
+    invoke-direct {v0, v3, v4, v5, v1}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
+
+    move-result v1
+
+    add-int/lit8 v2, v2, -0x1
 
     goto :goto_c
 
-    :cond_16
-    :goto_b
-    move-object/from16 v7, p1
+    :cond_18
+    move-object/from16 v4, v28
 
-    invoke-virtual {v7, v12, v14}, Lorg/a/a/f;->as(Ljava/lang/String;Ljava/lang/String;)V
-
-    :goto_c
-    if-eqz v26, :cond_17
-
-    move-object/from16 v1, v18
-
-    move-object/from16 v2, v23
-
-    move-object/from16 v15, v26
-
-    invoke-virtual {v7, v15, v1, v2}, Lorg/a/a/f;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_17
     move/from16 v1, v19
 
-    if-eqz v1, :cond_18
+    if-eqz v1, :cond_19
 
     invoke-direct {v0, v1}, Lorg/a/a/e;->fG(I)I
 
@@ -2797,46 +2838,6 @@
     move/from16 v1, v19
 
     :goto_d
-    if-lez v2, :cond_18
-
-    add-int/lit8 v3, v1, 0x2
-
-    move-object/from16 v4, v29
-
-    invoke-direct {v0, v1, v4}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    const/4 v5, 0x1
-
-    invoke-virtual {v7, v1, v5}, Lorg/a/a/f;->k(Ljava/lang/String;Z)Lorg/a/a/a;
-
-    move-result-object v1
-
-    invoke-direct {v0, v3, v4, v5, v1}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
-
-    move-result v1
-
-    add-int/lit8 v2, v2, -0x1
-
-    goto :goto_d
-
-    :cond_18
-    move-object/from16 v4, v29
-
-    move/from16 v1, v20
-
-    if-eqz v1, :cond_19
-
-    invoke-direct {v0, v1}, Lorg/a/a/e;->fG(I)I
-
-    move-result v2
-
-    add-int/lit8 v20, v1, 0x2
-
-    move/from16 v1, v20
-
-    :goto_e
     if-lez v2, :cond_19
 
     add-int/lit8 v3, v1, 0x2
@@ -2847,7 +2848,7 @@
 
     const/4 v5, 0x0
 
-    invoke-virtual {v7, v1, v5}, Lorg/a/a/f;->k(Ljava/lang/String;Z)Lorg/a/a/a;
+    invoke-virtual {v8, v1, v5}, Lorg/a/a/f;->k(Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object v1
 
@@ -2859,10 +2860,10 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_e
+    goto :goto_d
 
     :cond_19
-    move/from16 v1, v21
+    move/from16 v1, v20
 
     if-eqz v1, :cond_1a
 
@@ -2870,55 +2871,55 @@
 
     move-result v2
 
+    add-int/lit8 v20, v1, 0x2
+
+    move/from16 v1, v20
+
+    :goto_e
+    if-lez v2, :cond_1a
+
+    invoke-direct {v0, v11, v1}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
+
+    move-result v1
+
+    add-int/lit8 v3, v1, 0x2
+
+    iget v5, v11, Lorg/a/a/h;->bTx:I
+
+    iget-object v6, v11, Lorg/a/a/h;->chO:Lorg/a/a/u;
+
+    invoke-direct {v0, v1, v4}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    const/4 v7, 0x1
+
+    invoke-virtual {v8, v5, v6, v1, v7}, Lorg/a/a/f;->a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
+
+    move-result-object v1
+
+    invoke-direct {v0, v3, v4, v7, v1}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
+
+    move-result v1
+
+    add-int/lit8 v2, v2, -0x1
+
+    goto :goto_e
+
+    :cond_1a
+    move/from16 v1, v21
+
+    if-eqz v1, :cond_1b
+
+    invoke-direct {v0, v1}, Lorg/a/a/e;->fG(I)I
+
+    move-result v2
+
     add-int/lit8 v21, v1, 0x2
 
     move/from16 v1, v21
 
     :goto_f
-    if-lez v2, :cond_1a
-
-    invoke-direct {v0, v11, v1}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
-
-    move-result v1
-
-    add-int/lit8 v3, v1, 0x2
-
-    iget v5, v11, Lorg/a/a/h;->bTR:I
-
-    iget-object v6, v11, Lorg/a/a/h;->ciu:Lorg/a/a/u;
-
-    invoke-direct {v0, v1, v4}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    const/4 v8, 0x1
-
-    invoke-virtual {v7, v5, v6, v1, v8}, Lorg/a/a/f;->a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
-
-    move-result-object v1
-
-    invoke-direct {v0, v3, v4, v8, v1}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
-
-    move-result v1
-
-    add-int/lit8 v2, v2, -0x1
-
-    goto :goto_f
-
-    :cond_1a
-    move/from16 v1, v22
-
-    if-eqz v1, :cond_1b
-
-    invoke-direct {v0, v1}, Lorg/a/a/e;->fG(I)I
-
-    move-result v2
-
-    add-int/lit8 v22, v1, 0x2
-
-    move/from16 v1, v22
-
-    :goto_10
     if-lez v2, :cond_1b
 
     invoke-direct {v0, v11, v1}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
@@ -2927,17 +2928,17 @@
 
     add-int/lit8 v3, v1, 0x2
 
-    iget v5, v11, Lorg/a/a/h;->bTR:I
+    iget v5, v11, Lorg/a/a/h;->bTx:I
 
-    iget-object v6, v11, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v6, v11, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
     invoke-direct {v0, v1, v4}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
     move-result-object v1
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    invoke-virtual {v7, v5, v6, v1, v8}, Lorg/a/a/f;->a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
+    invoke-virtual {v8, v5, v6, v1, v7}, Lorg/a/a/f;->a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object v1
 
@@ -2949,38 +2950,38 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_10
+    goto :goto_f
 
     :cond_1b
-    :goto_11
+    :goto_10
     if-eqz v9, :cond_1c
 
-    iget-object v1, v9, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iget-object v1, v9, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     const/4 v2, 0x0
 
-    iput-object v2, v9, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v2, v9, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
-    invoke-virtual {v7, v9}, Lorg/a/a/f;->a(Lorg/a/a/c;)V
+    invoke-virtual {v8, v9}, Lorg/a/a/f;->a(Lorg/a/a/c;)V
 
     move-object v9, v1
 
-    goto :goto_11
+    goto :goto_10
 
     :cond_1c
-    move/from16 v9, v24
+    move/from16 v9, v22
 
     if-eqz v9, :cond_1d
 
-    add-int/lit8 v24, v9, 0x2
+    add-int/lit8 v22, v9, 0x2
 
     invoke-direct {v0, v9}, Lorg/a/a/e;->fG(I)I
 
     move-result v1
 
-    move/from16 v2, v24
+    move/from16 v2, v22
 
-    :goto_12
+    :goto_11
     if-lez v1, :cond_1d
 
     invoke-direct {v0, v2, v4}, Lorg/a/a/e;->b(I[C)Ljava/lang/String;
@@ -2999,13 +3000,13 @@
 
     move-result-object v6
 
-    add-int/lit8 v8, v2, 0x6
+    add-int/lit8 v7, v2, 0x6
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v7}, Lorg/a/a/e;->fG(I)I
 
-    move-result v8
+    move-result v7
 
-    invoke-virtual {v7, v3, v5, v6, v8}, Lorg/a/a/f;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+    invoke-virtual {v8, v3, v5, v6, v7}, Lorg/a/a/f;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 
     const/16 v3, 0x8
 
@@ -3013,10 +3014,10 @@
 
     add-int/lit8 v1, v1, -0x1
 
-    goto :goto_12
+    goto :goto_11
 
     :cond_1d
-    iget v1, v0, Lorg/a/a/e;->chE:I
+    iget v1, v0, Lorg/a/a/e;->cgY:I
 
     add-int/lit8 v1, v1, 0xa
 
@@ -3032,12 +3033,12 @@
 
     move-result v2
 
-    move v8, v2
+    move v7, v2
 
-    :goto_13
-    if-lez v8, :cond_2f
+    :goto_12
+    if-lez v7, :cond_2f
 
-    iget-object v9, v11, Lorg/a/a/h;->cio:[C
+    iget-object v9, v11, Lorg/a/a/h;->chI:[C
 
     invoke-direct {v0, v1}, Lorg/a/a/e;->fG(I)I
 
@@ -3063,7 +3064,7 @@
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
     const/4 v10, 0x0
 
@@ -3075,52 +3076,52 @@
 
     const/4 v15, 0x0
 
-    :goto_14
+    :goto_13
     if-lez v5, :cond_28
 
-    move/from16 v30, v8
+    move/from16 v16, v7
 
-    add-int/lit8 v8, v1, 0x2
+    add-int/lit8 v7, v1, 0x2
 
-    invoke-direct {v0, v8, v9}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+    invoke-direct {v0, v7, v9}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    move/from16 v31, v15
+    move/from16 v18, v15
 
     const-string v15, "ConstantValue"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
     if-eqz v15, :cond_1f
 
-    add-int/lit8 v8, v1, 0x8
+    add-int/lit8 v7, v1, 0x8
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v7}, Lorg/a/a/e;->fG(I)I
 
-    move-result v8
+    move-result v7
 
-    if-nez v8, :cond_1e
+    if-nez v7, :cond_1e
 
     const/4 v10, 0x0
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_1e
-    invoke-direct {v0, v8, v9}, Lorg/a/a/e;->c(I[C)Ljava/lang/Object;
+    invoke-direct {v0, v7, v9}, Lorg/a/a/e;->c(I[C)Ljava/lang/Object;
 
     move-result-object v15
 
     move-object v10, v15
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_1f
     const-string v15, "Signature"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
@@ -3132,111 +3133,111 @@
 
     move-result-object v6
 
-    :goto_15
-    move-object/from16 v32, v11
+    :goto_14
+    move-object/from16 v19, v11
 
-    move/from16 v15, v31
+    move/from16 v15, v18
 
-    goto/16 :goto_16
+    goto/16 :goto_15
 
     :cond_20
     const-string v15, "Deprecated"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
     if-eqz v15, :cond_21
 
-    or-int v2, v2, v25
+    or-int v2, v2, v24
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_21
     const-string v15, "Synthetic"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
     if-eqz v15, :cond_22
 
-    const v8, 0x41000
+    const v7, 0x41000
 
-    or-int/2addr v2, v8
+    or-int/2addr v2, v7
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_22
     const-string v15, "RuntimeVisibleAnnotations"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
     if-eqz v15, :cond_23
 
-    add-int/lit8 v8, v1, 0x8
+    add-int/lit8 v7, v1, 0x8
 
-    move v12, v8
+    move v12, v7
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_23
     const-string v15, "RuntimeVisibleTypeAnnotations"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
     if-eqz v15, :cond_24
 
-    add-int/lit8 v8, v1, 0x8
+    add-int/lit8 v7, v1, 0x8
 
-    move v14, v8
+    move v14, v7
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_24
     const-string v15, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
     if-eqz v15, :cond_25
 
-    add-int/lit8 v8, v1, 0x8
+    add-int/lit8 v7, v1, 0x8
 
-    move v13, v8
+    move v13, v7
 
-    goto :goto_15
+    goto :goto_14
 
     :cond_25
     const-string v15, "RuntimeInvisibleTypeAnnotations"
 
-    invoke-virtual {v15, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v15, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v15
 
     if-eqz v15, :cond_26
 
-    add-int/lit8 v8, v1, 0x8
+    add-int/lit8 v7, v1, 0x8
 
-    move v15, v8
+    move v15, v7
 
-    move-object/from16 v32, v11
+    move-object/from16 v19, v11
 
-    goto :goto_16
+    goto :goto_15
 
     :cond_26
-    iget-object v15, v11, Lorg/a/a/h;->cin:[Lorg/a/a/c;
+    iget-object v15, v11, Lorg/a/a/h;->chH:[Lorg/a/a/c;
 
-    move-object/from16 v32, v11
+    move-object/from16 v19, v11
 
     add-int/lit8 v11, v1, 0x8
 
-    move/from16 v33, v14
+    move/from16 v20, v14
 
     add-int/lit8 v14, v1, 0x4
 
@@ -3244,50 +3245,50 @@
 
     move-result v14
 
-    invoke-direct {v0, v15, v8, v11, v14}, Lorg/a/a/e;->a([Lorg/a/a/c;Ljava/lang/String;II)Lorg/a/a/c;
+    invoke-direct {v0, v15, v7, v11, v14}, Lorg/a/a/e;->a([Lorg/a/a/c;Ljava/lang/String;II)Lorg/a/a/c;
 
-    move-result-object v8
+    move-result-object v7
 
-    if-eqz v8, :cond_27
+    if-eqz v7, :cond_27
 
-    iput-object v7, v8, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v8, v7, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
-    move-object v7, v8
+    move-object v8, v7
 
     :cond_27
-    move/from16 v15, v31
+    move/from16 v15, v18
 
-    move/from16 v14, v33
+    move/from16 v14, v20
 
-    :goto_16
-    add-int/lit8 v8, v1, 0x4
+    :goto_15
+    add-int/lit8 v7, v1, 0x4
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->fI(I)I
+    invoke-direct {v0, v7}, Lorg/a/a/e;->fI(I)I
 
-    move-result v8
+    move-result v7
 
-    add-int/lit8 v8, v8, 0x6
+    add-int/lit8 v7, v7, 0x6
 
-    add-int/2addr v1, v8
+    add-int/2addr v1, v7
 
     add-int/lit8 v5, v5, -0x1
 
-    move/from16 v8, v30
+    move/from16 v7, v16
 
-    move-object/from16 v11, v32
+    move-object/from16 v11, v19
 
-    goto/16 :goto_14
+    goto/16 :goto_13
 
     :cond_28
-    move/from16 v30, v8
+    move/from16 v16, v7
 
-    move-object/from16 v32, v11
+    move-object/from16 v19, v11
 
-    move/from16 v33, v14
+    move/from16 v20, v14
 
-    move/from16 v31, v15
+    move/from16 v18, v15
 
-    add-int/lit8 v8, v1, 0x2
+    add-int/lit8 v7, v1, 0x2
 
     move-object/from16 v1, p1
 
@@ -3309,7 +3310,7 @@
 
     add-int/lit8 v12, v12, 0x2
 
-    :goto_17
+    :goto_16
     if-lez v2, :cond_29
 
     add-int/lit8 v3, v12, 0x2
@@ -3330,7 +3331,7 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_17
+    goto :goto_16
 
     :cond_29
     if-eqz v13, :cond_2a
@@ -3341,7 +3342,7 @@
 
     add-int/lit8 v13, v13, 0x2
 
-    :goto_18
+    :goto_17
     if-lez v2, :cond_2a
 
     add-int/lit8 v3, v13, 0x2
@@ -3364,12 +3365,12 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_18
+    goto :goto_17
 
     :cond_2a
-    if-eqz v33, :cond_2b
+    if-eqz v20, :cond_2b
 
-    move/from16 v14, v33
+    move/from16 v14, v20
 
     invoke-direct {v0, v14}, Lorg/a/a/e;->fG(I)I
 
@@ -3377,10 +3378,10 @@
 
     add-int/lit8 v14, v14, 0x2
 
-    :goto_19
+    :goto_18
     if-lez v2, :cond_2b
 
-    move-object/from16 v10, v32
+    move-object/from16 v10, v19
 
     invoke-direct {v0, v10, v14}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
 
@@ -3388,9 +3389,9 @@
 
     add-int/lit8 v4, v3, 0x2
 
-    iget v5, v10, Lorg/a/a/h;->bTR:I
+    iget v5, v10, Lorg/a/a/h;->bTx:I
 
-    iget-object v6, v10, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v6, v10, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
     invoke-direct {v0, v3, v9}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
@@ -3408,14 +3409,14 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_19
+    goto :goto_18
 
     :cond_2b
-    move-object/from16 v10, v32
+    move-object/from16 v10, v19
 
-    if-eqz v31, :cond_2c
+    if-eqz v18, :cond_2c
 
-    move/from16 v15, v31
+    move/from16 v15, v18
 
     invoke-direct {v0, v15}, Lorg/a/a/e;->fG(I)I
 
@@ -3423,7 +3424,7 @@
 
     add-int/lit8 v15, v15, 0x2
 
-    :goto_1a
+    :goto_19
     if-lez v2, :cond_2c
 
     invoke-direct {v0, v10, v15}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
@@ -3432,9 +3433,9 @@
 
     add-int/lit8 v4, v3, 0x2
 
-    iget v5, v10, Lorg/a/a/h;->bTR:I
+    iget v5, v10, Lorg/a/a/h;->bTx:I
 
-    iget-object v6, v10, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v6, v10, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
     invoke-direct {v0, v3, v9}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
@@ -3454,41 +3455,41 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_1a
+    goto :goto_19
 
     :cond_2c
-    :goto_1b
-    if-eqz v7, :cond_2e
+    :goto_1a
+    if-eqz v8, :cond_2e
 
-    iget-object v2, v7, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iget-object v2, v8, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v7, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v3, v8, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
-    invoke-virtual {v1, v7}, Lorg/a/a/j;->a(Lorg/a/a/c;)V
+    invoke-virtual {v1, v8}, Lorg/a/a/j;->a(Lorg/a/a/c;)V
 
-    move-object v7, v2
+    move-object v8, v2
 
-    goto :goto_1b
+    goto :goto_1a
 
     :cond_2d
-    move-object/from16 v10, v32
+    move-object/from16 v10, v19
 
     :cond_2e
-    add-int/lit8 v1, v30, -0x1
+    add-int/lit8 v1, v16, -0x1
 
     move-object v11, v10
 
-    move-object/from16 v7, p1
+    move-object/from16 v8, p1
 
-    move/from16 v79, v8
+    move/from16 v47, v7
 
-    move v8, v1
+    move v7, v1
 
-    move/from16 v1, v79
+    move/from16 v1, v47
 
-    goto/16 :goto_13
+    goto/16 :goto_12
 
     :cond_2f
     move-object v10, v11
@@ -3503,16 +3504,16 @@
 
     move v7, v2
 
-    :goto_1c
+    :goto_1b
     if-lez v7, :cond_9c
 
-    iget-object v8, v10, Lorg/a/a/h;->cio:[C
+    iget-object v8, v10, Lorg/a/a/h;->chI:[C
 
     invoke-direct {v0, v1}, Lorg/a/a/e;->fG(I)I
 
     move-result v2
 
-    iput v2, v10, Lorg/a/a/h;->ciq:I
+    iput v2, v10, Lorg/a/a/h;->chK:I
 
     add-int/lit8 v2, v1, 0x2
 
@@ -3520,7 +3521,7 @@
 
     move-result-object v2
 
-    iput-object v2, v10, Lorg/a/a/h;->cir:Ljava/lang/String;
+    iput-object v2, v10, Lorg/a/a/h;->chL:Ljava/lang/String;
 
     add-int/lit8 v2, v1, 0x4
 
@@ -3528,7 +3529,7 @@
 
     move-result-object v2
 
-    iput-object v2, v10, Lorg/a/a/h;->cis:Ljava/lang/String;
+    iput-object v2, v10, Lorg/a/a/h;->chM:Ljava/lang/String;
 
     add-int/lit8 v9, v1, 0x6
 
@@ -3536,7 +3537,7 @@
 
     move-result v1
 
-    move/from16 v34, v7
+    move/from16 v18, v7
 
     move v2, v9
 
@@ -3560,16 +3561,16 @@
 
     const/4 v15, 0x0
 
-    const/16 v18, 0x0
+    const/16 v16, 0x0
 
-    const/16 v35, 0x0
+    const/16 v19, 0x0
 
-    const/16 v36, 0x0
+    const/16 v29, 0x0
 
-    :goto_1d
+    :goto_1c
     if-lez v1, :cond_40
 
-    move/from16 v37, v3
+    move/from16 v20, v3
 
     add-int/lit8 v3, v2, 0x2
 
@@ -3577,7 +3578,7 @@
 
     move-result-object v3
 
-    move/from16 v38, v4
+    move/from16 v21, v4
 
     const-string v4, "Code"
 
@@ -3587,7 +3588,7 @@
 
     if-eqz v4, :cond_31
 
-    iget v3, v10, Lorg/a/a/h;->chr:I
+    iget v3, v10, Lorg/a/a/h;->cgL:I
 
     const/4 v4, 0x1
 
@@ -3597,23 +3598,23 @@
 
     add-int/lit8 v3, v2, 0x8
 
-    move/from16 v36, v3
+    move/from16 v29, v3
 
-    :goto_1e
-    move/from16 v3, v37
+    :goto_1d
+    move/from16 v3, v20
 
-    move/from16 v4, v38
-
-    goto/16 :goto_26
-
-    :cond_30
-    move/from16 v39, v5
-
-    :goto_1f
-    move/from16 v40, v6
+    move/from16 v4, v21
 
     goto/16 :goto_25
 
+    :cond_30
+    move/from16 v22, v5
+
+    :goto_1e
+    move/from16 v23, v6
+
+    goto/16 :goto_24
+
     :cond_31
     const-string v4, "Exceptions"
 
@@ -3635,11 +3636,11 @@
 
     move v4, v3
 
-    move/from16 v39, v5
+    move/from16 v22, v5
 
     const/4 v3, 0x0
 
-    :goto_20
+    :goto_1f
     array-length v5, v12
 
     if-ge v3, v5, :cond_32
@@ -3654,15 +3655,15 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    goto :goto_20
+    goto :goto_1f
 
     :cond_32
-    move/from16 v18, v4
+    move/from16 v16, v4
 
-    goto :goto_21
+    goto :goto_20
 
     :cond_33
-    move/from16 v39, v5
+    move/from16 v22, v5
 
     const-string v4, "Signature"
 
@@ -3678,16 +3679,16 @@
 
     move-result-object v11
 
+    :goto_20
+    move/from16 v3, v20
+
     :goto_21
-    move/from16 v3, v37
+    move/from16 v4, v21
 
     :goto_22
-    move/from16 v4, v38
+    move/from16 v5, v22
 
-    :goto_23
-    move/from16 v5, v39
-
-    goto/16 :goto_26
+    goto/16 :goto_25
 
     :cond_34
     const-string v4, "Deprecated"
@@ -3698,14 +3699,14 @@
 
     if-eqz v4, :cond_35
 
-    iget v3, v10, Lorg/a/a/h;->ciq:I
+    iget v3, v10, Lorg/a/a/h;->chK:I
 
-    or-int v3, v3, v25
+    or-int v3, v3, v24
 
-    :goto_24
-    iput v3, v10, Lorg/a/a/h;->ciq:I
+    :goto_23
+    iput v3, v10, Lorg/a/a/h;->chK:I
 
-    goto :goto_1f
+    goto :goto_1e
 
     :cond_35
     const-string v4, "RuntimeVisibleAnnotations"
@@ -3720,7 +3721,7 @@
 
     move v14, v3
 
-    goto :goto_21
+    goto :goto_20
 
     :cond_36
     const-string v4, "RuntimeVisibleTypeAnnotations"
@@ -3735,7 +3736,7 @@
 
     move v5, v3
 
-    goto :goto_1e
+    goto :goto_1d
 
     :cond_37
     const-string v4, "AnnotationDefault"
@@ -3748,9 +3749,9 @@
 
     add-int/lit8 v3, v2, 0x8
 
-    move v15, v3
+    move v6, v3
 
-    goto :goto_21
+    goto :goto_20
 
     :cond_38
     const-string v4, "Synthetic"
@@ -3761,13 +3762,13 @@
 
     if-eqz v4, :cond_39
 
-    iget v3, v10, Lorg/a/a/h;->ciq:I
+    iget v3, v10, Lorg/a/a/h;->chK:I
 
     const v4, 0x41000
 
     or-int/2addr v3, v4
 
-    goto :goto_24
+    goto :goto_23
 
     :cond_39
     const-string v4, "RuntimeInvisibleAnnotations"
@@ -3780,9 +3781,9 @@
 
     add-int/lit8 v3, v2, 0x8
 
-    move v6, v3
+    move v15, v3
 
-    goto :goto_21
+    goto :goto_20
 
     :cond_3a
     const-string v4, "RuntimeInvisibleTypeAnnotations"
@@ -3797,9 +3798,9 @@
 
     move v4, v3
 
-    move/from16 v3, v37
+    move/from16 v3, v20
 
-    goto :goto_23
+    goto :goto_22
 
     :cond_3b
     const-string v4, "RuntimeVisibleParameterAnnotations"
@@ -3812,7 +3813,7 @@
 
     add-int/lit8 v3, v2, 0x8
 
-    goto :goto_22
+    goto :goto_21
 
     :cond_3c
     const-string v4, "RuntimeInvisibleParameterAnnotations"
@@ -3825,9 +3826,9 @@
 
     add-int/lit8 v3, v2, 0x8
 
-    move/from16 v35, v3
+    move/from16 v19, v3
 
-    goto :goto_21
+    goto :goto_20
 
     :cond_3d
     const-string v4, "MethodParameters"
@@ -3842,14 +3843,14 @@
 
     move v13, v3
 
-    goto/16 :goto_21
+    goto/16 :goto_20
 
     :cond_3e
-    iget-object v4, v10, Lorg/a/a/h;->cin:[Lorg/a/a/c;
+    iget-object v4, v10, Lorg/a/a/h;->chH:[Lorg/a/a/c;
 
     add-int/lit8 v5, v2, 0x8
 
-    move/from16 v40, v6
+    move/from16 v23, v6
 
     add-int/lit8 v6, v2, 0x4
 
@@ -3863,22 +3864,22 @@
 
     if-eqz v3, :cond_3f
 
-    iput-object v7, v3, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v7, v3, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     move-object v7, v3
 
     :cond_3f
+    :goto_24
+    move/from16 v3, v20
+
+    move/from16 v4, v21
+
+    move/from16 v5, v22
+
+    move/from16 v6, v23
+
     :goto_25
-    move/from16 v3, v37
-
-    move/from16 v4, v38
-
-    move/from16 v5, v39
-
-    move/from16 v6, v40
-
-    :goto_26
-    move/from16 v41, v3
+    move/from16 v20, v3
 
     add-int/lit8 v3, v2, 0x4
 
@@ -3892,46 +3893,46 @@
 
     add-int/lit8 v1, v1, -0x1
 
-    move/from16 v3, v41
+    move/from16 v3, v20
 
-    goto/16 :goto_1d
+    goto/16 :goto_1c
 
     :cond_40
-    move/from16 v37, v3
+    move/from16 v20, v3
 
-    move/from16 v38, v4
+    move/from16 v21, v4
 
-    move/from16 v39, v5
+    move/from16 v22, v5
 
-    move/from16 v40, v6
+    move/from16 v23, v6
 
-    add-int/lit8 v19, v2, 0x2
+    add-int/lit8 v25, v2, 0x2
 
-    iget v2, v10, Lorg/a/a/h;->ciq:I
+    iget v2, v10, Lorg/a/a/h;->chK:I
 
-    iget-object v3, v10, Lorg/a/a/h;->cir:Ljava/lang/String;
+    iget-object v3, v10, Lorg/a/a/h;->chL:Ljava/lang/String;
 
-    iget-object v4, v10, Lorg/a/a/h;->cis:Ljava/lang/String;
+    iget-object v4, v10, Lorg/a/a/h;->chM:Ljava/lang/String;
 
     move-object/from16 v1, p1
 
-    move/from16 v6, v37
+    move/from16 v6, v20
 
-    move/from16 v5, v38
+    move/from16 v5, v21
 
-    move/from16 v43, v5
+    move/from16 v30, v5
 
-    move-object/from16 v42, v7
+    move-object/from16 v20, v7
 
-    move/from16 v7, v39
+    move/from16 v7, v22
 
     move-object v5, v11
 
-    move/from16 v45, v6
+    move/from16 v31, v6
 
-    move-object/from16 v44, v10
+    move-object/from16 v21, v10
 
-    move/from16 v10, v40
+    move/from16 v10, v23
 
     move-object v6, v12
 
@@ -3949,28 +3950,28 @@
 
     check-cast v2, Lorg/a/a/r;
 
-    iget-object v3, v2, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v3, v2, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v3, v3, Lorg/a/a/g;->chG:Lorg/a/a/e;
+    iget-object v3, v3, Lorg/a/a/g;->cha:Lorg/a/a/e;
 
     if-ne v3, v0, :cond_45
 
-    iget-object v3, v2, Lorg/a/a/r;->cis:Ljava/lang/String;
+    iget-object v3, v2, Lorg/a/a/r;->chM:Ljava/lang/String;
 
     if-ne v11, v3, :cond_45
 
     if-nez v12, :cond_41
 
-    iget v3, v2, Lorg/a/a/r;->cja:I
+    iget v3, v2, Lorg/a/a/r;->ciu:I
 
     if-nez v3, :cond_44
 
-    goto :goto_28
+    goto :goto_27
 
     :cond_41
     array-length v3, v12
 
-    iget v4, v2, Lorg/a/a/r;->cja:I
+    iget v4, v2, Lorg/a/a/r;->ciu:I
 
     if-ne v3, v4, :cond_44
 
@@ -3980,12 +3981,12 @@
 
     sub-int/2addr v3, v4
 
-    :goto_27
+    :goto_26
     if-ltz v3, :cond_43
 
-    add-int/lit8 v4, v18, -0x2
+    add-int/lit8 v4, v16, -0x2
 
-    iget-object v5, v2, Lorg/a/a/r;->cjh:[I
+    iget-object v5, v2, Lorg/a/a/r;->ciB:[I
 
     aget v5, v5, v3
 
@@ -3995,40 +3996,40 @@
 
     if-eq v5, v6, :cond_42
 
-    goto :goto_29
+    goto :goto_28
 
     :cond_42
     add-int/lit8 v3, v3, -0x1
 
-    move/from16 v18, v4
+    move/from16 v16, v4
 
-    goto :goto_27
+    goto :goto_26
 
     :cond_43
-    :goto_28
+    :goto_27
     const/4 v3, 0x1
 
-    goto :goto_2a
+    goto :goto_29
 
     :cond_44
-    :goto_29
+    :goto_28
     const/4 v3, 0x0
 
-    :goto_2a
+    :goto_29
     if-eqz v3, :cond_45
 
-    iput v9, v2, Lorg/a/a/r;->ciP:I
+    iput v9, v2, Lorg/a/a/r;->cij:I
 
-    sub-int v1, v19, v9
+    sub-int v1, v25, v9
 
-    iput v1, v2, Lorg/a/a/r;->bTR:I
+    iput v1, v2, Lorg/a/a/r;->bTx:I
 
-    goto/16 :goto_79
+    goto/16 :goto_76
 
     :cond_45
     if-eqz v13, :cond_46
 
-    iget-object v2, v0, Lorg/a/a/e;->chy:[B
+    iget-object v2, v0, Lorg/a/a/e;->cgS:[B
 
     aget-byte v2, v2, v13
 
@@ -4036,7 +4037,7 @@
 
     add-int/lit8 v13, v13, 0x1
 
-    :goto_2b
+    :goto_2a
     if-lez v2, :cond_46
 
     invoke-direct {v0, v13, v8}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
@@ -4057,22 +4058,22 @@
 
     add-int/2addr v13, v3
 
-    goto :goto_2b
+    goto :goto_2a
 
     :cond_46
-    if-eqz v15, :cond_47
+    if-eqz v10, :cond_47
 
-    invoke-virtual {v1}, Lorg/a/a/q;->JH()Lorg/a/a/a;
+    invoke-virtual {v1}, Lorg/a/a/q;->JG()Lorg/a/a/a;
 
     move-result-object v2
 
     const/4 v3, 0x0
 
-    invoke-direct {v0, v15, v8, v3, v2}, Lorg/a/a/e;->a(I[CLjava/lang/String;Lorg/a/a/a;)I
+    invoke-direct {v0, v10, v8, v3, v2}, Lorg/a/a/e;->a(I[CLjava/lang/String;Lorg/a/a/a;)I
 
     if-eqz v2, :cond_47
 
-    invoke-virtual {v2}, Lorg/a/a/a;->JC()V
+    invoke-virtual {v2}, Lorg/a/a/a;->JB()V
 
     :cond_47
     if-eqz v14, :cond_48
@@ -4083,7 +4084,7 @@
 
     add-int/lit8 v14, v14, 0x2
 
-    :goto_2c
+    :goto_2b
     if-lez v2, :cond_48
 
     add-int/lit8 v3, v14, 0x2
@@ -4104,23 +4105,23 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_2c
+    goto :goto_2b
 
     :cond_48
-    if-eqz v10, :cond_49
+    if-eqz v15, :cond_49
 
-    invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v15}, Lorg/a/a/e;->fG(I)I
 
     move-result v2
 
-    add-int/lit8 v6, v10, 0x2
+    add-int/lit8 v15, v15, 0x2
 
-    :goto_2d
+    :goto_2c
     if-lez v2, :cond_49
 
-    add-int/lit8 v3, v6, 0x2
+    add-int/lit8 v3, v15, 0x2
 
-    invoke-direct {v0, v6, v8}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+    invoke-direct {v0, v15, v8}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
     move-result-object v4
 
@@ -4134,11 +4135,11 @@
 
     invoke-direct {v0, v3, v8, v5, v4}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
 
-    move-result v6
+    move-result v15
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_2d
+    goto :goto_2c
 
     :cond_49
     if-eqz v7, :cond_4a
@@ -4149,10 +4150,10 @@
 
     add-int/lit8 v5, v7, 0x2
 
-    :goto_2e
+    :goto_2d
     if-lez v2, :cond_4a
 
-    move-object/from16 v3, v44
+    move-object/from16 v3, v21
 
     invoke-direct {v0, v3, v5}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
 
@@ -4160,9 +4161,9 @@
 
     add-int/lit8 v5, v4, 0x2
 
-    iget v6, v3, Lorg/a/a/h;->bTR:I
+    iget v6, v3, Lorg/a/a/h;->bTx:I
 
-    iget-object v7, v3, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v7, v3, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
     invoke-direct {v0, v4, v8}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
@@ -4180,12 +4181,12 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_2e
+    goto :goto_2d
 
     :cond_4a
-    move-object/from16 v3, v44
+    move-object/from16 v3, v21
 
-    move/from16 v4, v43
+    move/from16 v4, v30
 
     if-eqz v4, :cond_4b
 
@@ -4195,7 +4196,7 @@
 
     add-int/lit8 v4, v4, 0x2
 
-    :goto_2f
+    :goto_2e
     if-lez v2, :cond_4b
 
     invoke-direct {v0, v3, v4}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
@@ -4204,9 +4205,9 @@
 
     add-int/lit8 v5, v4, 0x2
 
-    iget v6, v3, Lorg/a/a/h;->bTR:I
+    iget v6, v3, Lorg/a/a/h;->bTx:I
 
-    iget-object v7, v3, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v7, v3, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
     invoke-direct {v0, v4, v8}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
@@ -4226,52 +4227,52 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    goto :goto_2f
+    goto :goto_2e
 
     :cond_4b
     const/4 v6, 0x1
 
-    move/from16 v2, v45
+    move/from16 v2, v31
 
     if-eqz v2, :cond_4c
 
     invoke-direct {v0, v1, v3, v2, v6}, Lorg/a/a/e;->b(Lorg/a/a/q;Lorg/a/a/h;IZ)V
 
     :cond_4c
-    if-eqz v35, :cond_4d
+    if-eqz v19, :cond_4d
 
-    move/from16 v2, v35
+    move/from16 v2, v19
 
     const/4 v4, 0x0
 
     invoke-direct {v0, v1, v3, v2, v4}, Lorg/a/a/e;->b(Lorg/a/a/q;Lorg/a/a/h;IZ)V
 
     :cond_4d
-    move-object/from16 v2, v42
+    move-object/from16 v2, v20
 
-    :goto_30
+    :goto_2f
     if-eqz v2, :cond_4e
 
-    iget-object v4, v2, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iget-object v4, v2, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     const/4 v5, 0x0
 
-    iput-object v5, v2, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v5, v2, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     invoke-virtual {v1, v2}, Lorg/a/a/q;->a(Lorg/a/a/c;)V
 
     move-object v2, v4
 
-    goto :goto_30
+    goto :goto_2f
 
     :cond_4e
-    move/from16 v2, v36
+    move/from16 v2, v29
 
     if-eqz v2, :cond_9b
 
-    iget-object v4, v0, Lorg/a/a/e;->chy:[B
+    iget-object v4, v0, Lorg/a/a/e;->cgS:[B
 
-    iget-object v5, v3, Lorg/a/a/h;->cio:[C
+    iget-object v5, v3, Lorg/a/a/h;->chI:[C
 
     invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
 
@@ -4289,32 +4290,32 @@
 
     move-result v8
 
-    add-int/lit8 v36, v2, 0x8
+    add-int/lit8 v29, v2, 0x8
 
-    add-int v2, v36, v8
+    add-int v2, v29, v8
 
     add-int/lit8 v9, v8, 0x2
 
     new-array v9, v9, [Lorg/a/a/p;
 
-    iput-object v9, v3, Lorg/a/a/h;->cit:[Lorg/a/a/p;
+    iput-object v9, v3, Lorg/a/a/h;->chN:[Lorg/a/a/p;
 
     add-int/lit8 v10, v8, 0x1
 
     invoke-static {v10, v9}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
-    move/from16 v10, v36
+    move/from16 v10, v29
 
-    :goto_31
+    :goto_30
     if-ge v10, v2, :cond_52
 
-    sub-int v11, v10, v36
+    sub-int v11, v10, v29
 
     aget-byte v12, v4, v10
 
     and-int/lit16 v12, v12, 0xff
 
-    sget-object v13, Lorg/a/a/g;->chA:[B
+    sget-object v13, Lorg/a/a/g;->cgU:[B
 
     aget-byte v12, v13, v12
 
@@ -4324,7 +4325,7 @@
     :pswitch_0
     add-int/lit8 v10, v10, 0x4
 
-    goto :goto_31
+    goto :goto_30
 
     :pswitch_1
     add-int/lit8 v11, v10, 0x1
@@ -4339,7 +4340,7 @@
 
     add-int/lit8 v10, v10, 0x6
 
-    goto :goto_31
+    goto :goto_30
 
     :pswitch_2
     add-int/lit8 v10, v10, 0x4
@@ -4362,7 +4363,7 @@
 
     move-result v12
 
-    :goto_32
+    :goto_31
     if-lez v12, :cond_50
 
     add-int/lit8 v13, v10, 0xc
@@ -4379,12 +4380,12 @@
 
     add-int/lit8 v12, v12, -0x1
 
-    goto :goto_32
+    goto :goto_31
 
     :cond_50
     add-int/lit8 v10, v10, 0x8
 
-    goto :goto_31
+    goto :goto_30
 
     :pswitch_3
     add-int/lit8 v10, v10, 0x4
@@ -4419,7 +4420,7 @@
 
     add-int/2addr v12, v13
 
-    :goto_33
+    :goto_32
     if-lez v12, :cond_51
 
     add-int/lit8 v13, v10, 0xc
@@ -4436,12 +4437,12 @@
 
     add-int/lit8 v12, v12, -0x1
 
-    goto :goto_33
+    goto :goto_32
 
     :cond_51
     add-int/lit8 v10, v10, 0xc
 
-    goto :goto_31
+    goto :goto_30
 
     :pswitch_4
     add-int/lit8 v12, v10, 0x1
@@ -4454,7 +4455,7 @@
 
     invoke-static {v11, v9}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
-    goto :goto_34
+    goto :goto_33
 
     :pswitch_5
     add-int/lit8 v12, v10, 0x1
@@ -4467,36 +4468,36 @@
 
     invoke-static {v11, v9}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
-    goto :goto_35
+    goto :goto_34
 
-    :goto_34
+    :goto_33
     :pswitch_6
     add-int/lit8 v10, v10, 0x5
 
-    goto/16 :goto_31
+    goto/16 :goto_30
 
-    :goto_35
+    :goto_34
     :pswitch_7
     add-int/lit8 v10, v10, 0x3
 
-    goto/16 :goto_31
+    goto/16 :goto_30
 
     :pswitch_8
     add-int/lit8 v10, v10, 0x2
 
-    goto/16 :goto_31
+    goto/16 :goto_30
 
     :pswitch_9
     add-int/lit8 v10, v10, 0x1
 
-    goto/16 :goto_31
+    goto/16 :goto_30
 
     :cond_52
     invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
 
     move-result v11
 
-    :goto_36
+    :goto_35
     if-lez v11, :cond_53
 
     add-int/lit8 v12, v10, 0x2
@@ -4529,15 +4530,15 @@
 
     move-result-object v14
 
-    iget-object v15, v0, Lorg/a/a/e;->chB:[I
+    iget-object v15, v0, Lorg/a/a/e;->cgV:[I
 
     add-int/lit8 v10, v10, 0x8
 
     invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
 
-    move-result v18
+    move-result v16
 
-    aget v15, v15, v18
+    aget v15, v15, v16
 
     invoke-direct {v0, v15, v5}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
@@ -4547,12 +4548,12 @@
 
     add-int/lit8 v11, v11, -0x1
 
-    goto :goto_36
+    goto :goto_35
 
     :cond_53
     add-int/lit8 v10, v10, 0x2
 
-    iget v11, v3, Lorg/a/a/h;->chr:I
+    iget v11, v3, Lorg/a/a/h;->cgL:I
 
     const/16 v12, 0x8
 
@@ -4562,48 +4563,50 @@
 
     const/4 v11, 0x1
 
-    goto :goto_37
+    goto :goto_36
 
     :cond_54
     const/4 v11, 0x0
 
-    :goto_37
+    :goto_36
     invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
 
     move-result v12
 
-    const/4 v14, 0x0
+    move v14, v10
+
+    const/4 v10, 0x0
 
     const/4 v15, 0x0
 
-    const/16 v18, 0x0
+    const/16 v16, 0x0
 
-    const/16 v20, 0x0
+    const/16 v19, 0x0
+
+    const/16 v20, -0x1
 
     const/16 v21, -0x1
 
-    const/16 v22, -0x1
+    const/16 v40, 0x0
 
-    const/16 v54, 0x0
+    const/16 v41, 0x0
 
-    const/16 v55, 0x0
+    const/16 v42, 0x0
 
-    const/16 v56, 0x0
+    const/16 v43, 0x0
 
-    const/16 v57, 0x0
+    const/16 v44, 0x1
 
-    const/16 v58, 0x1
-
-    :goto_38
+    :goto_37
     if-lez v12, :cond_6b
 
-    add-int/lit8 v13, v10, 0x2
+    add-int/lit8 v13, v14, 0x2
 
     invoke-direct {v0, v13, v5}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
     move-result-object v13
 
-    move-object/from16 v59, v5
+    move-object/from16 v27, v5
 
     const-string v5, "LocalVariableTable"
 
@@ -4613,61 +4616,61 @@
 
     if-eqz v5, :cond_59
 
-    iget v5, v3, Lorg/a/a/h;->chr:I
+    iget v5, v3, Lorg/a/a/h;->cgL:I
 
     and-int/lit8 v5, v5, 0x2
 
     if-nez v5, :cond_58
 
-    add-int/lit8 v5, v10, 0x8
+    add-int/lit8 v5, v14, 0x8
 
     invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
 
     move-result v13
 
-    move/from16 v23, v10
+    move/from16 v23, v14
 
-    :goto_39
+    :goto_38
     if-lez v13, :cond_57
 
-    move/from16 v60, v5
+    move/from16 v28, v5
 
     add-int/lit8 v5, v23, 0xa
 
-    move/from16 v61, v2
+    move/from16 v30, v2
 
     invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
 
     move-result v2
 
-    aget-object v24, v9, v2
+    aget-object v31, v9, v2
 
-    if-nez v24, :cond_55
+    if-nez v31, :cond_55
 
-    move/from16 v62, v5
+    move/from16 v31, v5
 
     invoke-static {v2, v9}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
     move-result-object v5
 
-    move/from16 v63, v8
+    move/from16 v38, v8
 
-    iget v8, v5, Lorg/a/a/p;->ciC:I
+    iget v8, v5, Lorg/a/a/p;->chW:I
 
-    const/16 v24, 0x1
+    const/16 v26, 0x1
 
     or-int/lit8 v8, v8, 0x1
 
-    iput v8, v5, Lorg/a/a/p;->ciC:I
+    iput v8, v5, Lorg/a/a/p;->chW:I
 
-    goto :goto_3a
+    goto :goto_39
 
     :cond_55
-    move/from16 v62, v5
+    move/from16 v31, v5
 
-    move/from16 v63, v8
+    move/from16 v38, v8
 
-    :goto_3a
+    :goto_39
     add-int/lit8 v5, v23, 0xc
 
     invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
@@ -4684,51 +4687,49 @@
 
     move-result-object v2
 
-    iget v5, v2, Lorg/a/a/p;->ciC:I
+    iget v5, v2, Lorg/a/a/p;->chW:I
 
     const/4 v8, 0x1
 
     or-int/2addr v5, v8
 
-    iput v5, v2, Lorg/a/a/p;->ciC:I
+    iput v5, v2, Lorg/a/a/p;->chW:I
 
     :cond_56
     add-int/lit8 v13, v13, -0x1
 
-    move/from16 v5, v60
+    move/from16 v5, v28
 
-    move/from16 v2, v61
+    move/from16 v2, v30
 
-    move/from16 v23, v62
+    move/from16 v23, v31
 
-    move/from16 v8, v63
+    move/from16 v8, v38
 
-    goto :goto_39
+    goto :goto_38
 
     :cond_57
-    move/from16 v61, v2
+    move/from16 v30, v2
 
-    move/from16 v60, v5
+    move/from16 v28, v5
 
-    move/from16 v63, v8
+    move/from16 v38, v8
 
-    move-object/from16 v64, v4
+    move/from16 v42, v28
 
-    move/from16 v56, v60
-
-    goto/16 :goto_45
+    goto :goto_3a
 
     :cond_58
-    move/from16 v61, v2
+    move/from16 v30, v2
 
-    move/from16 v63, v8
+    move/from16 v38, v8
 
-    goto :goto_3b
+    goto :goto_3a
 
     :cond_59
-    move/from16 v61, v2
+    move/from16 v30, v2
 
-    move/from16 v63, v8
+    move/from16 v38, v8
 
     const-string v2, "LocalVariableTypeTable"
 
@@ -4738,15 +4739,15 @@
 
     if-eqz v2, :cond_5b
 
-    add-int/lit8 v2, v10, 0x8
+    add-int/lit8 v2, v14, 0x8
 
-    move/from16 v57, v2
+    move/from16 v43, v2
 
     :cond_5a
-    :goto_3b
-    move-object/from16 v64, v4
+    :goto_3a
+    move-object/from16 v28, v4
 
-    goto/16 :goto_45
+    goto/16 :goto_44
 
     :cond_5b
     const-string v2, "LineNumberTable"
@@ -4757,21 +4758,21 @@
 
     if-eqz v2, :cond_5f
 
-    iget v2, v3, Lorg/a/a/h;->chr:I
+    iget v2, v3, Lorg/a/a/h;->cgL:I
 
     and-int/lit8 v2, v2, 0x2
 
     if-nez v2, :cond_5a
 
-    add-int/lit8 v2, v10, 0x8
+    add-int/lit8 v2, v14, 0x8
 
     invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
 
     move-result v2
 
-    move v5, v10
+    move v5, v14
 
-    :goto_3c
+    :goto_3b
     if-lez v2, :cond_5a
 
     add-int/lit8 v8, v5, 0xa
@@ -4788,30 +4789,30 @@
 
     move-result-object v13
 
-    move-object/from16 v64, v4
+    move-object/from16 v28, v4
 
-    iget v4, v13, Lorg/a/a/p;->ciC:I
+    iget v4, v13, Lorg/a/a/p;->chW:I
 
     const/16 v23, 0x1
 
     or-int/lit8 v4, v4, 0x1
 
-    iput v4, v13, Lorg/a/a/p;->ciC:I
+    iput v4, v13, Lorg/a/a/p;->chW:I
 
-    goto :goto_3d
+    goto :goto_3c
 
     :cond_5c
-    move-object/from16 v64, v4
+    move-object/from16 v28, v4
 
-    :goto_3d
+    :goto_3c
     aget-object v4, v9, v8
 
-    :goto_3e
-    iget v8, v4, Lorg/a/a/p;->chr:I
+    :goto_3d
+    iget v8, v4, Lorg/a/a/p;->cgL:I
 
     if-lez v8, :cond_5e
 
-    iget-object v8, v4, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v8, v4, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
     if-nez v8, :cond_5d
 
@@ -4819,12 +4820,12 @@
 
     invoke-direct {v8}, Lorg/a/a/p;-><init>()V
 
-    iput-object v8, v4, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iput-object v8, v4, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
     :cond_5d
-    iget-object v4, v4, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v4, v4, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    goto :goto_3e
+    goto :goto_3d
 
     :cond_5e
     add-int/lit8 v8, v5, 0xc
@@ -4833,18 +4834,18 @@
 
     move-result v8
 
-    iput v8, v4, Lorg/a/a/p;->chr:I
+    iput v8, v4, Lorg/a/a/p;->cgL:I
 
     add-int/lit8 v5, v5, 0x4
 
     add-int/lit8 v2, v2, -0x1
 
-    move-object/from16 v4, v64
+    move-object/from16 v4, v28
 
-    goto :goto_3c
+    goto :goto_3b
 
     :cond_5f
-    move-object/from16 v64, v4
+    move-object/from16 v28, v4
 
     const-string v2, "RuntimeVisibleTypeAnnotations"
 
@@ -4854,7 +4855,7 @@
 
     if-eqz v2, :cond_62
 
-    add-int/lit8 v2, v10, 0x8
+    add-int/lit8 v2, v14, 0x8
 
     const/4 v4, 0x1
 
@@ -4878,7 +4879,7 @@
 
     if-ge v8, v13, :cond_60
 
-    goto :goto_3f
+    goto :goto_3e
 
     :cond_60
     aget v8, v2, v5
@@ -4889,18 +4890,18 @@
 
     move-result v13
 
-    goto :goto_40
+    goto :goto_3f
 
     :cond_61
-    :goto_3f
+    :goto_3e
     const/4 v13, -0x1
 
-    :goto_40
-    move-object/from16 v54, v2
+    :goto_3f
+    move-object/from16 v40, v2
 
-    move/from16 v21, v13
+    move/from16 v20, v13
 
-    goto/16 :goto_45
+    goto/16 :goto_44
 
     :cond_62
     const-string v2, "RuntimeInvisibleTypeAnnotations"
@@ -4911,7 +4912,7 @@
 
     if-eqz v2, :cond_65
 
-    add-int/lit8 v2, v10, 0x8
+    add-int/lit8 v2, v14, 0x8
 
     const/4 v4, 0x0
 
@@ -4933,7 +4934,7 @@
 
     if-ge v5, v8, :cond_63
 
-    goto :goto_41
+    goto :goto_40
 
     :cond_63
     aget v5, v2, v4
@@ -4946,18 +4947,18 @@
 
     move-result v13
 
-    goto :goto_42
+    goto :goto_41
 
     :cond_64
-    :goto_41
+    :goto_40
     const/4 v13, -0x1
 
-    :goto_42
-    move-object/from16 v55, v2
+    :goto_41
+    move-object/from16 v41, v2
 
-    move/from16 v22, v13
+    move/from16 v21, v13
 
-    goto/16 :goto_45
+    goto/16 :goto_44
 
     :cond_65
     const-string v2, "StackMapTable"
@@ -4968,7 +4969,7 @@
 
     if-eqz v2, :cond_66
 
-    iget v2, v3, Lorg/a/a/h;->chr:I
+    iget v2, v3, Lorg/a/a/h;->cgL:I
 
     const/4 v4, 0x4
 
@@ -4976,27 +4977,27 @@
 
     if-nez v2, :cond_6a
 
-    add-int/lit8 v2, v10, 0xa
+    add-int/lit8 v2, v14, 0xa
 
-    add-int/lit8 v4, v10, 0x4
+    add-int/lit8 v4, v14, 0x4
 
     invoke-direct {v0, v4}, Lorg/a/a/e;->fI(I)I
 
     move-result v4
 
-    add-int/lit8 v5, v10, 0x8
+    add-int/lit8 v5, v14, 0x8
 
     invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
 
     move-result v5
 
-    move v14, v2
+    move v10, v2
 
     move v15, v4
 
-    move/from16 v20, v5
+    move/from16 v19, v5
 
-    goto :goto_45
+    goto :goto_44
 
     :cond_66
     const-string v2, "StackMap"
@@ -5007,7 +5008,7 @@
 
     if-eqz v2, :cond_67
 
-    iget v2, v3, Lorg/a/a/h;->chr:I
+    iget v2, v3, Lorg/a/a/h;->cgL:I
 
     const/4 v4, 0x4
 
@@ -5015,43 +5016,43 @@
 
     if-nez v2, :cond_6a
 
-    add-int/lit8 v2, v10, 0xa
+    add-int/lit8 v2, v14, 0xa
 
-    add-int/lit8 v4, v10, 0x4
+    add-int/lit8 v4, v14, 0x4
 
     invoke-direct {v0, v4}, Lorg/a/a/e;->fI(I)I
 
     move-result v4
 
-    add-int/lit8 v5, v10, 0x8
+    add-int/lit8 v5, v14, 0x8
 
     invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
 
     move-result v5
 
-    move v14, v2
+    move v10, v2
 
     move v15, v4
 
-    move/from16 v20, v5
+    move/from16 v19, v5
 
-    const/16 v58, 0x0
+    const/16 v44, 0x0
 
-    goto :goto_45
+    goto :goto_44
 
     :cond_67
-    move-object/from16 v4, v18
+    move-object/from16 v4, v16
 
     const/4 v2, 0x0
 
-    :goto_43
-    iget-object v5, v3, Lorg/a/a/h;->cin:[Lorg/a/a/c;
+    :goto_42
+    iget-object v5, v3, Lorg/a/a/h;->chH:[Lorg/a/a/c;
 
     array-length v5, v5
 
     if-ge v2, v5, :cond_69
 
-    iget-object v5, v3, Lorg/a/a/h;->cin:[Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/h;->chH:[Lorg/a/a/c;
 
     aget-object v5, v5, v2
 
@@ -5063,15 +5064,15 @@
 
     if-eqz v5, :cond_68
 
-    iget-object v5, v3, Lorg/a/a/h;->cin:[Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/h;->chH:[Lorg/a/a/c;
 
     aget-object v5, v5, v2
 
-    add-int/lit8 v8, v10, 0x8
+    add-int/lit8 v8, v14, 0x8
 
-    move-object/from16 v65, v13
+    move-object/from16 v23, v13
 
-    add-int/lit8 v13, v10, 0x4
+    add-int/lit8 v13, v14, 0x4
 
     invoke-direct {v0, v13}, Lorg/a/a/e;->fI(I)I
 
@@ -5081,28 +5082,28 @@
 
     move-result-object v5
 
-    iput-object v4, v5, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v4, v5, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     move-object v4, v5
 
-    goto :goto_44
-
-    :cond_68
-    move-object/from16 v65, v13
-
-    :goto_44
-    add-int/lit8 v2, v2, 0x1
-
-    move-object/from16 v13, v65
-
     goto :goto_43
 
+    :cond_68
+    move-object/from16 v23, v13
+
+    :goto_43
+    add-int/lit8 v2, v2, 0x1
+
+    move-object/from16 v13, v23
+
+    goto :goto_42
+
     :cond_69
-    move-object/from16 v18, v4
+    move-object/from16 v16, v4
 
     :cond_6a
-    :goto_45
-    add-int/lit8 v2, v10, 0x4
+    :goto_44
+    add-int/lit8 v2, v14, 0x4
 
     invoke-direct {v0, v2}, Lorg/a/a/e;->fI(I)I
 
@@ -5110,60 +5111,60 @@
 
     add-int/lit8 v2, v2, 0x6
 
-    add-int/2addr v10, v2
+    add-int/2addr v14, v2
 
     add-int/lit8 v12, v12, -0x1
 
-    move-object/from16 v5, v59
+    move-object/from16 v5, v27
 
-    move/from16 v2, v61
+    move-object/from16 v4, v28
 
-    move/from16 v8, v63
+    move/from16 v2, v30
 
-    move-object/from16 v4, v64
+    move/from16 v8, v38
 
-    goto/16 :goto_38
+    goto/16 :goto_37
 
     :cond_6b
-    move/from16 v61, v2
+    move/from16 v30, v2
 
-    move-object/from16 v64, v4
+    move-object/from16 v28, v4
 
-    move-object/from16 v59, v5
+    move-object/from16 v27, v5
 
-    move/from16 v63, v8
+    move/from16 v38, v8
 
-    if-eqz v14, :cond_75
+    if-eqz v10, :cond_75
 
     const/4 v2, -0x1
 
-    iput v2, v3, Lorg/a/a/h;->chT:I
+    iput v2, v3, Lorg/a/a/h;->chn:I
 
     const/4 v2, 0x0
 
-    iput v2, v3, Lorg/a/a/h;->ciy:I
+    iput v2, v3, Lorg/a/a/h;->chS:I
 
-    iput v2, v3, Lorg/a/a/h;->chV:I
+    iput v2, v3, Lorg/a/a/h;->chp:I
 
-    iput v2, v3, Lorg/a/a/h;->ciz:I
+    iput v2, v3, Lorg/a/a/h;->chT:I
 
-    iput v2, v3, Lorg/a/a/h;->chY:I
+    iput v2, v3, Lorg/a/a/h;->chs:I
 
     new-array v2, v7, [Ljava/lang/Object;
 
-    iput-object v2, v3, Lorg/a/a/h;->ciA:[Ljava/lang/Object;
+    iput-object v2, v3, Lorg/a/a/h;->chU:[Ljava/lang/Object;
 
     new-array v2, v6, [Ljava/lang/Object;
 
-    iput-object v2, v3, Lorg/a/a/h;->ciB:[Ljava/lang/Object;
+    iput-object v2, v3, Lorg/a/a/h;->chV:[Ljava/lang/Object;
 
     if-eqz v11, :cond_71
 
-    iget-object v2, v3, Lorg/a/a/h;->cis:Ljava/lang/String;
+    iget-object v2, v3, Lorg/a/a/h;->chM:Ljava/lang/String;
 
-    iget-object v4, v3, Lorg/a/a/h;->ciA:[Ljava/lang/Object;
+    iget-object v4, v3, Lorg/a/a/h;->chU:[Ljava/lang/Object;
 
-    iget v5, v3, Lorg/a/a/h;->ciq:I
+    iget v5, v3, Lorg/a/a/h;->chK:I
 
     const/16 v8, 0x8
 
@@ -5173,7 +5174,7 @@
 
     const-string v5, "<init>"
 
-    iget-object v8, v3, Lorg/a/a/h;->cir:Ljava/lang/String;
+    iget-object v8, v3, Lorg/a/a/h;->chL:Ljava/lang/String;
 
     invoke-virtual {v5, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -5181,196 +5182,196 @@
 
     if-eqz v5, :cond_6c
 
-    sget-object v5, Lorg/a/a/s;->cjV:Ljava/lang/Integer;
+    sget-object v5, Lorg/a/a/s;->cjp:Ljava/lang/Integer;
 
     const/4 v8, 0x0
 
     aput-object v5, v4, v8
 
-    :goto_46
-    const/4 v5, 0x1
-
-    goto :goto_47
+    goto :goto_45
 
     :cond_6c
     const/4 v8, 0x0
 
-    iget v5, v0, Lorg/a/a/e;->chE:I
+    iget v5, v0, Lorg/a/a/e;->cgY:I
 
     add-int/lit8 v5, v5, 0x2
 
-    iget-object v10, v3, Lorg/a/a/h;->cio:[C
+    iget-object v12, v3, Lorg/a/a/h;->chI:[C
 
-    invoke-direct {v0, v5, v10}, Lorg/a/a/e;->b(I[C)Ljava/lang/String;
+    invoke-direct {v0, v5, v12}, Lorg/a/a/e;->b(I[C)Ljava/lang/String;
 
     move-result-object v5
 
     aput-object v5, v4, v8
 
+    :goto_45
+    const/4 v5, 0x1
+
     goto :goto_46
 
     :cond_6d
     const/4 v5, 0x0
 
-    :goto_47
+    :goto_46
     move v8, v5
 
     const/4 v5, 0x1
 
-    :goto_48
-    add-int/lit8 v10, v5, 0x1
+    :goto_47
+    add-int/lit8 v12, v5, 0x1
 
     invoke-virtual {v2, v5}, Ljava/lang/String;->charAt(I)C
 
-    move-result v12
+    move-result v13
 
-    sparse-switch v12, :sswitch_data_0
+    sparse-switch v13, :sswitch_data_0
 
-    iput v8, v3, Lorg/a/a/h;->chV:I
+    iput v8, v3, Lorg/a/a/h;->chp:I
 
-    goto/16 :goto_4d
+    goto/16 :goto_4c
+
+    :goto_48
+    :sswitch_0
+    invoke-virtual {v2, v12}, Ljava/lang/String;->charAt(I)C
+
+    move-result v13
+
+    const/16 v14, 0x5b
+
+    if-ne v13, v14, :cond_6e
+
+    add-int/lit8 v12, v12, 0x1
+
+    goto :goto_48
+
+    :cond_6e
+    invoke-virtual {v2, v12}, Ljava/lang/String;->charAt(I)C
+
+    move-result v13
+
+    const/16 v14, 0x4c
+
+    if-ne v13, v14, :cond_6f
 
     :goto_49
-    :sswitch_0
-    invoke-virtual {v2, v10}, Ljava/lang/String;->charAt(I)C
+    add-int/lit8 v12, v12, 0x1
 
-    move-result v12
+    invoke-virtual {v2, v12}, Ljava/lang/String;->charAt(I)C
 
-    const/16 v13, 0x5b
+    move-result v13
 
-    if-ne v12, v13, :cond_6e
+    const/16 v14, 0x3b
 
-    add-int/lit8 v10, v10, 0x1
+    if-eq v13, v14, :cond_6f
 
     goto :goto_49
 
-    :cond_6e
-    invoke-virtual {v2, v10}, Ljava/lang/String;->charAt(I)C
-
-    move-result v12
-
-    const/16 v13, 0x4c
-
-    if-ne v12, v13, :cond_6f
-
-    :goto_4a
-    add-int/lit8 v10, v10, 0x1
-
-    invoke-virtual {v2, v10}, Ljava/lang/String;->charAt(I)C
-
-    move-result v12
-
-    const/16 v13, 0x3b
-
-    if-eq v12, v13, :cond_6f
-
-    goto :goto_4a
-
     :cond_6f
-    add-int/lit8 v12, v8, 0x1
+    add-int/lit8 v13, v8, 0x1
 
-    const/4 v13, 0x1
+    const/4 v14, 0x1
 
-    add-int/2addr v10, v13
+    add-int/2addr v12, v14
 
-    invoke-virtual {v2, v5, v10}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v2, v5, v12}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v5
 
     aput-object v5, v4, v8
 
-    move v5, v10
+    move v5, v12
 
-    move v8, v12
+    move v8, v13
 
-    goto :goto_48
+    goto :goto_47
 
     :sswitch_1
-    move v5, v10
+    move v5, v12
 
-    :goto_4b
+    :goto_4a
     invoke-virtual {v2, v5}, Ljava/lang/String;->charAt(I)C
 
-    move-result v12
+    move-result v13
 
-    const/16 v13, 0x3b
+    const/16 v14, 0x3b
 
-    if-eq v12, v13, :cond_70
+    if-eq v13, v14, :cond_70
 
     add-int/lit8 v5, v5, 0x1
 
-    goto :goto_4b
+    goto :goto_4a
 
     :cond_70
-    add-int/lit8 v12, v8, 0x1
+    add-int/lit8 v13, v8, 0x1
 
-    add-int/lit8 v13, v5, 0x1
+    add-int/lit8 v14, v5, 0x1
 
-    invoke-virtual {v2, v10, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v2, v12, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v5
 
     aput-object v5, v4, v8
 
-    move v8, v12
+    move v8, v13
 
-    move v5, v13
+    move v5, v14
 
-    goto :goto_48
+    goto :goto_47
 
     :sswitch_2
     add-int/lit8 v5, v8, 0x1
 
-    sget-object v12, Lorg/a/a/s;->cjT:Ljava/lang/Integer;
+    sget-object v13, Lorg/a/a/s;->cjn:Ljava/lang/Integer;
 
-    aput-object v12, v4, v8
+    aput-object v13, v4, v8
 
-    goto :goto_4c
+    goto :goto_4b
 
     :sswitch_3
     add-int/lit8 v5, v8, 0x1
 
-    sget-object v12, Lorg/a/a/s;->cjR:Ljava/lang/Integer;
+    sget-object v13, Lorg/a/a/s;->cjl:Ljava/lang/Integer;
 
-    aput-object v12, v4, v8
+    aput-object v13, v4, v8
 
-    goto :goto_4c
+    goto :goto_4b
 
     :sswitch_4
     add-int/lit8 v5, v8, 0x1
 
-    sget-object v12, Lorg/a/a/s;->cjS:Ljava/lang/Integer;
+    sget-object v13, Lorg/a/a/s;->cjm:Ljava/lang/Integer;
 
-    aput-object v12, v4, v8
+    aput-object v13, v4, v8
 
-    goto :goto_4c
+    goto :goto_4b
 
     :sswitch_5
     add-int/lit8 v5, v8, 0x1
 
-    sget-object v12, Lorg/a/a/s;->cjQ:Ljava/lang/Integer;
+    sget-object v13, Lorg/a/a/s;->cjk:Ljava/lang/Integer;
 
-    aput-object v12, v4, v8
+    aput-object v13, v4, v8
 
-    :goto_4c
+    :goto_4b
     move v8, v5
 
-    move v5, v10
+    move v5, v12
 
-    goto :goto_48
+    goto :goto_47
 
     :cond_71
-    :goto_4d
-    move v2, v14
+    :goto_4c
+    move v2, v10
 
-    :goto_4e
-    add-int v4, v14, v15
+    :goto_4d
+    add-int v4, v10, v15
 
     add-int/lit8 v4, v4, -0x2
 
     if-ge v2, v4, :cond_74
 
-    aget-byte v4, v64, v2
+    aget-byte v4, v28, v2
 
     const/16 v5, 0x8
 
@@ -5384,279 +5385,280 @@
 
     if-ltz v4, :cond_72
 
-    move/from16 v5, v63
+    move/from16 v5, v38
 
     if-ge v4, v5, :cond_73
 
-    add-int v8, v36, v4
+    add-int v8, v29, v4
 
-    aget-byte v8, v64, v8
+    aget-byte v8, v28, v8
 
     and-int/lit16 v8, v8, 0xff
 
-    const/16 v10, 0xbb
+    const/16 v12, 0xbb
 
-    if-ne v8, v10, :cond_73
+    if-ne v8, v12, :cond_73
 
     invoke-static {v4, v9}, Lorg/a/a/e;->a(I[Lorg/a/a/p;)Lorg/a/a/p;
 
-    goto :goto_4f
-
-    :cond_72
-    move/from16 v5, v63
-
-    :cond_73
-    :goto_4f
-    add-int/lit8 v2, v2, 0x1
-
-    move/from16 v63, v5
-
     goto :goto_4e
 
+    :cond_72
+    move/from16 v5, v38
+
+    :cond_73
+    :goto_4e
+    add-int/lit8 v2, v2, 0x1
+
+    move/from16 v38, v5
+
+    goto :goto_4d
+
     :cond_74
-    move/from16 v5, v63
+    move/from16 v5, v38
 
     move-object v2, v3
 
-    goto :goto_50
+    goto :goto_4f
 
     :cond_75
-    move/from16 v5, v63
+    move/from16 v5, v38
 
     const/4 v2, 0x0
 
-    :goto_50
+    :goto_4f
     move-object v15, v2
 
-    move/from16 v2, v36
+    move/from16 v2, v29
 
     const/4 v4, 0x0
 
     const/4 v8, 0x0
 
-    :goto_51
-    move/from16 v10, v61
+    :goto_50
+    move/from16 v12, v30
 
-    if-ge v2, v10, :cond_8e
+    if-ge v2, v12, :cond_8e
 
-    sub-int v12, v2, v36
+    sub-int v13, v2, v29
 
-    aget-object v13, v9, v12
+    aget-object v14, v9, v13
 
-    if-eqz v13, :cond_76
+    if-eqz v14, :cond_76
 
-    move/from16 v66, v4
+    move/from16 v30, v4
 
-    iget-object v4, v13, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v4, v14, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    move-object/from16 v67, v4
+    move-object/from16 v31, v4
 
     const/4 v4, 0x0
 
-    iput-object v4, v13, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iput-object v4, v14, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    invoke-virtual {v1, v13}, Lorg/a/a/q;->a(Lorg/a/a/p;)V
+    invoke-virtual {v1, v14}, Lorg/a/a/q;->a(Lorg/a/a/p;)V
 
-    iget v4, v3, Lorg/a/a/h;->chr:I
+    iget v4, v3, Lorg/a/a/h;->cgL:I
 
     and-int/lit8 v4, v4, 0x2
 
     if-nez v4, :cond_77
 
-    iget v4, v13, Lorg/a/a/p;->chr:I
+    iget v4, v14, Lorg/a/a/p;->cgL:I
 
     if-lez v4, :cond_77
 
-    iget v4, v13, Lorg/a/a/p;->chr:I
+    iget v4, v14, Lorg/a/a/p;->cgL:I
 
-    invoke-virtual {v1, v4, v13}, Lorg/a/a/q;->b(ILorg/a/a/p;)V
+    invoke-virtual {v1, v4, v14}, Lorg/a/a/q;->b(ILorg/a/a/p;)V
 
-    move-object/from16 v4, v67
+    move-object/from16 v4, v31
 
-    :goto_52
+    :goto_51
     if-eqz v4, :cond_77
 
-    move/from16 v68, v8
+    move/from16 v31, v8
 
-    iget v8, v4, Lorg/a/a/p;->chr:I
+    iget v8, v4, Lorg/a/a/p;->cgL:I
 
-    invoke-virtual {v1, v8, v13}, Lorg/a/a/q;->b(ILorg/a/a/p;)V
+    invoke-virtual {v1, v8, v14}, Lorg/a/a/q;->b(ILorg/a/a/p;)V
 
-    iget-object v4, v4, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v4, v4, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    move/from16 v8, v68
+    move/from16 v8, v31
 
-    goto :goto_52
+    goto :goto_51
 
     :cond_76
-    move/from16 v66, v4
+    move/from16 v30, v4
 
     :cond_77
-    move/from16 v68, v8
+    move/from16 v31, v8
 
-    :goto_53
+    :goto_52
     if-eqz v15, :cond_7d
 
-    iget v4, v15, Lorg/a/a/h;->chT:I
+    iget v4, v15, Lorg/a/a/h;->chn:I
 
-    if-eq v4, v12, :cond_78
+    if-eq v4, v13, :cond_78
 
-    iget v4, v15, Lorg/a/a/h;->chT:I
+    iget v4, v15, Lorg/a/a/h;->chn:I
 
     const/4 v8, -0x1
 
     if-ne v4, v8, :cond_7d
 
-    goto :goto_54
+    goto :goto_53
 
     :cond_78
     const/4 v8, -0x1
 
-    :goto_54
-    iget v4, v15, Lorg/a/a/h;->chT:I
+    :goto_53
+    iget v4, v15, Lorg/a/a/h;->chn:I
 
     if-eq v4, v8, :cond_7b
 
-    move/from16 v4, v58
+    move/from16 v4, v44
 
     if-eqz v4, :cond_7a
 
     if-eqz v11, :cond_79
 
-    goto :goto_55
+    goto :goto_54
 
     :cond_79
-    iget v8, v15, Lorg/a/a/h;->ciy:I
+    iget v8, v15, Lorg/a/a/h;->chS:I
 
-    iget v13, v15, Lorg/a/a/h;->ciz:I
+    iget v14, v15, Lorg/a/a/h;->chT:I
 
-    move/from16 v69, v10
+    move/from16 v38, v12
 
-    iget-object v10, v15, Lorg/a/a/h;->ciA:[Ljava/lang/Object;
+    iget-object v12, v15, Lorg/a/a/h;->chU:[Ljava/lang/Object;
 
-    move/from16 v70, v6
+    move/from16 v44, v6
 
-    iget v6, v15, Lorg/a/a/h;->chY:I
+    iget v6, v15, Lorg/a/a/h;->chs:I
 
-    move/from16 v71, v7
+    move/from16 v45, v7
 
-    iget-object v7, v15, Lorg/a/a/h;->ciB:[Ljava/lang/Object;
+    iget-object v7, v15, Lorg/a/a/h;->chV:[Ljava/lang/Object;
 
-    move-object/from16 v28, v1
+    move-object/from16 v32, v1
 
-    move/from16 v29, v8
+    move/from16 v33, v8
 
-    move/from16 v30, v13
+    move/from16 v34, v14
 
-    move-object/from16 v31, v10
+    move-object/from16 v35, v12
 
-    move/from16 v32, v6
+    move/from16 v36, v6
 
-    move-object/from16 v33, v7
+    move-object/from16 v37, v7
+
+    goto :goto_55
+
+    :cond_7a
+    :goto_54
+    move/from16 v44, v6
+
+    move/from16 v45, v7
+
+    move/from16 v38, v12
+
+    const/16 v33, -0x1
+
+    iget v6, v15, Lorg/a/a/h;->chp:I
+
+    iget-object v7, v15, Lorg/a/a/h;->chU:[Ljava/lang/Object;
+
+    iget v8, v15, Lorg/a/a/h;->chs:I
+
+    iget-object v12, v15, Lorg/a/a/h;->chV:[Ljava/lang/Object;
+
+    move-object/from16 v32, v1
+
+    move/from16 v34, v6
+
+    move-object/from16 v35, v7
+
+    move/from16 v36, v8
+
+    move-object/from16 v37, v12
+
+    :goto_55
+    invoke-virtual/range {v32 .. v37}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     goto :goto_56
 
-    :cond_7a
-    :goto_55
-    move/from16 v70, v6
+    :cond_7b
+    move/from16 v45, v7
 
-    move/from16 v71, v7
+    move/from16 v38, v12
 
-    move/from16 v69, v10
+    move/from16 v4, v44
 
-    const/16 v29, -0x1
-
-    iget v6, v15, Lorg/a/a/h;->chV:I
-
-    iget-object v7, v15, Lorg/a/a/h;->ciA:[Ljava/lang/Object;
-
-    iget v8, v15, Lorg/a/a/h;->chY:I
-
-    iget-object v10, v15, Lorg/a/a/h;->ciB:[Ljava/lang/Object;
-
-    move-object/from16 v28, v1
-
-    move/from16 v30, v6
-
-    move-object/from16 v31, v7
-
-    move/from16 v32, v8
-
-    move-object/from16 v33, v10
+    move/from16 v44, v6
 
     :goto_56
-    invoke-virtual/range {v28 .. v33}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    if-lez v19, :cond_7c
+
+    invoke-direct {v0, v10, v4, v11, v15}, Lorg/a/a/e;->a(IZZLorg/a/a/h;)I
+
+    move-result v10
+
+    add-int/lit8 v19, v19, -0x1
+
+    move/from16 v12, v38
+
+    move/from16 v6, v44
+
+    move/from16 v7, v45
 
     goto :goto_57
 
-    :cond_7b
-    move/from16 v70, v6
-
-    move/from16 v71, v7
-
-    move/from16 v69, v10
-
-    move/from16 v4, v58
-
-    :goto_57
-    if-lez v20, :cond_7c
-
-    invoke-direct {v0, v14, v4, v11, v15}, Lorg/a/a/e;->a(IZZLorg/a/a/h;)I
-
-    move-result v14
-
-    add-int/lit8 v20, v20, -0x1
-
-    move/from16 v58, v4
-
-    move/from16 v10, v69
-
-    move/from16 v6, v70
-
-    move/from16 v7, v71
-
-    goto :goto_53
-
     :cond_7c
-    move/from16 v58, v4
+    move/from16 v12, v38
 
-    move/from16 v10, v69
+    move/from16 v6, v44
 
-    move/from16 v6, v70
-
-    move/from16 v7, v71
+    move/from16 v7, v45
 
     const/4 v15, 0x0
 
-    goto :goto_53
+    :goto_57
+    move/from16 v44, v4
+
+    goto :goto_52
 
     :cond_7d
-    move/from16 v70, v6
+    move/from16 v45, v7
 
-    move/from16 v71, v7
+    move/from16 v38, v12
 
-    move/from16 v69, v10
+    move/from16 v4, v44
 
-    move/from16 v4, v58
+    move/from16 v44, v6
 
-    aget-byte v6, v64, v2
+    aget-byte v6, v28, v2
 
     and-int/lit16 v6, v6, 0xff
 
-    sget-object v7, Lorg/a/a/g;->chA:[B
+    sget-object v7, Lorg/a/a/g;->cgU:[B
 
     aget-byte v7, v7, v6
 
     packed-switch v7, :pswitch_data_1
 
     :pswitch_a
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
 
     add-int/lit8 v4, v2, 0x1
 
@@ -5666,7 +5668,7 @@
 
     add-int/lit8 v6, v2, 0x3
 
-    aget-byte v6, v64, v6
+    aget-byte v6, v28, v6
 
     and-int/lit16 v6, v6, 0xff
 
@@ -5675,20 +5677,20 @@
     add-int/lit8 v2, v2, 0x4
 
     :goto_58
-    move v10, v2
+    move v14, v2
 
-    move/from16 v2, v21
+    move/from16 v6, v20
 
-    move-object/from16 v6, v54
+    move/from16 v4, v30
 
-    move/from16 v4, v66
+    move-object/from16 v2, v40
 
-    goto/16 :goto_69
+    goto/16 :goto_68
 
     :pswitch_b
     add-int/lit8 v6, v2, 0x1
 
-    aget-byte v6, v64, v6
+    aget-byte v6, v28, v6
 
     and-int/lit16 v6, v6, 0xff
 
@@ -5712,12 +5714,7 @@
 
     add-int/lit8 v2, v2, 0x6
 
-    :goto_59
-    move v10, v2
-
-    move/from16 v72, v4
-
-    goto/16 :goto_5c
+    goto :goto_59
 
     :cond_7e
     add-int/lit8 v7, v2, 0x2
@@ -5730,12 +5727,17 @@
 
     add-int/lit8 v2, v2, 0x4
 
-    goto :goto_59
+    :goto_59
+    move v14, v2
+
+    move/from16 v39, v4
+
+    goto/16 :goto_5c
 
     :pswitch_c
     add-int/lit8 v2, v2, 0x4
 
-    and-int/lit8 v6, v12, 0x3
+    and-int/lit8 v6, v13, 0x3
 
     sub-int/2addr v2, v6
 
@@ -5743,7 +5745,7 @@
 
     move-result v6
 
-    add-int/2addr v6, v12
+    add-int/2addr v6, v13
 
     add-int/lit8 v7, v2, 0x4
 
@@ -5753,66 +5755,62 @@
 
     new-array v8, v7, [I
 
-    new-array v10, v7, [Lorg/a/a/p;
+    new-array v12, v7, [Lorg/a/a/p;
 
-    const/16 v13, 0x8
+    const/16 v14, 0x8
 
-    add-int/2addr v2, v13
+    add-int/2addr v2, v14
 
-    move v13, v2
+    move v14, v2
 
     const/4 v2, 0x0
 
     :goto_5a
     if-ge v2, v7, :cond_7f
 
-    invoke-direct {v0, v13}, Lorg/a/a/e;->fI(I)I
+    invoke-direct {v0, v14}, Lorg/a/a/e;->fI(I)I
 
-    move-result v17
+    move-result v32
 
-    aput v17, v8, v2
+    aput v32, v8, v2
 
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    add-int/lit8 v4, v13, 0x4
+    add-int/lit8 v4, v14, 0x4
 
     invoke-direct {v0, v4}, Lorg/a/a/e;->fI(I)I
 
     move-result v4
 
-    add-int/2addr v4, v12
+    add-int/2addr v4, v13
 
     aget-object v4, v9, v4
 
-    aput-object v4, v10, v2
+    aput-object v4, v12, v2
 
-    add-int/lit8 v13, v13, 0x8
+    add-int/lit8 v14, v14, 0x8
 
     add-int/lit8 v2, v2, 0x1
 
-    move/from16 v4, v72
+    move/from16 v4, v39
 
     goto :goto_5a
 
     :cond_7f
-    move/from16 v72, v4
+    move/from16 v39, v4
 
     aget-object v2, v9, v6
 
-    invoke-virtual {v1, v2, v8, v10}, Lorg/a/a/q;->a(Lorg/a/a/p;[I[Lorg/a/a/p;)V
+    invoke-virtual {v1, v2, v8, v12}, Lorg/a/a/q;->a(Lorg/a/a/p;[I[Lorg/a/a/p;)V
 
-    move/from16 v73, v11
-
-    move v10, v13
-
-    goto :goto_5d
+    goto :goto_5c
 
     :pswitch_d
-    move/from16 v72, v4
+    move/from16 v39, v4
 
     add-int/lit8 v2, v2, 0x4
 
-    and-int/lit8 v4, v12, 0x3
+    and-int/lit8 v4, v13, 0x3
 
     sub-int/2addr v2, v4
 
@@ -5820,7 +5818,7 @@
 
     move-result v4
 
-    add-int/2addr v4, v12
+    add-int/2addr v4, v13
 
     add-int/lit8 v6, v2, 0x4
 
@@ -5836,34 +5834,34 @@
 
     sub-int v8, v7, v6
 
-    const/4 v10, 0x1
+    const/4 v12, 0x1
 
-    add-int/2addr v8, v10
+    add-int/2addr v8, v12
 
     new-array v8, v8, [Lorg/a/a/p;
 
     add-int/lit8 v2, v2, 0xc
 
-    move v10, v2
+    move v12, v2
 
     const/4 v2, 0x0
 
     :goto_5b
-    array-length v13, v8
+    array-length v14, v8
 
-    if-ge v2, v13, :cond_80
+    if-ge v2, v14, :cond_80
 
-    invoke-direct {v0, v10}, Lorg/a/a/e;->fI(I)I
+    invoke-direct {v0, v12}, Lorg/a/a/e;->fI(I)I
 
-    move-result v13
+    move-result v14
 
-    add-int/2addr v13, v12
+    add-int/2addr v14, v13
 
-    aget-object v13, v9, v13
+    aget-object v14, v9, v14
 
-    aput-object v13, v8, v2
+    aput-object v14, v8, v2
 
-    add-int/lit8 v10, v10, 0x4
+    add-int/lit8 v12, v12, 0x4
 
     add-int/lit8 v2, v2, 0x1
 
@@ -5874,41 +5872,51 @@
 
     invoke-virtual {v1, v6, v7, v2, v8}, Lorg/a/a/q;->a(IILorg/a/a/p;[Lorg/a/a/p;)V
 
-    goto :goto_5c
+    move/from16 v46, v11
+
+    move v14, v12
+
+    goto :goto_5d
 
     :pswitch_e
-    move/from16 v72, v4
+    move/from16 v39, v4
 
     add-int/lit8 v4, v2, 0x1
 
-    aget-byte v4, v64, v4
+    aget-byte v4, v28, v4
 
     and-int/lit16 v4, v4, 0xff
 
     add-int/lit8 v6, v2, 0x2
 
-    aget-byte v6, v64, v6
+    aget-byte v6, v28, v6
 
     invoke-virtual {v1, v4, v6}, Lorg/a/a/q;->aC(II)V
 
     add-int/lit8 v2, v2, 0x3
 
-    move v10, v2
+    move v14, v2
 
     :goto_5c
-    move/from16 v73, v11
+    move/from16 v46, v11
 
     :goto_5d
-    move/from16 v2, v21
+    move/from16 v6, v20
 
-    move-object/from16 v6, v54
+    move-object/from16 v7, v27
 
-    move-object/from16 v7, v59
+    move/from16 v4, v30
 
-    goto :goto_60
+    move-object/from16 v2, v40
+
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
+
+    goto/16 :goto_68
 
     :pswitch_f
-    move/from16 v72, v4
+    move/from16 v39, v4
 
     add-int/lit8 v4, v2, 0x1
 
@@ -5916,7 +5924,7 @@
 
     move-result v4
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
     invoke-direct {v0, v4, v7}, Lorg/a/a/e;->c(I[C)Ljava/lang/Object;
 
@@ -5927,13 +5935,13 @@
     goto :goto_5e
 
     :pswitch_10
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
     add-int/lit8 v4, v2, 0x1
 
-    aget-byte v4, v64, v4
+    aget-byte v4, v28, v4
 
     and-int/lit16 v4, v4, 0xff
 
@@ -5948,9 +5956,9 @@
     goto :goto_5f
 
     :pswitch_11
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
     add-int/lit8 v6, v6, -0x21
 
@@ -5960,7 +5968,7 @@
 
     move-result v4
 
-    add-int/2addr v4, v12
+    add-int/2addr v4, v13
 
     aget-object v4, v9, v4
 
@@ -5971,9 +5979,9 @@
     goto :goto_5f
 
     :pswitch_12
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
     add-int/lit8 v4, v2, 0x1
 
@@ -5981,7 +5989,7 @@
 
     move-result v4
 
-    add-int/2addr v4, v12
+    add-int/2addr v4, v13
 
     aget-object v4, v9, v4
 
@@ -5991,27 +5999,28 @@
     add-int/lit8 v2, v2, 0x3
 
     :goto_5f
-    move v10, v2
+    move v14, v2
 
-    move/from16 v73, v11
+    move/from16 v27, v10
 
-    move/from16 v2, v21
+    move/from16 v46, v11
 
-    move-object/from16 v6, v54
+    move/from16 v6, v20
 
-    :goto_60
-    move/from16 v4, v66
+    move/from16 v4, v30
 
-    const/16 v16, 0x4
+    move-object/from16 v2, v40
 
-    goto/16 :goto_69
+    const/16 v17, 0x4
+
+    goto/16 :goto_68
 
     :pswitch_13
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    iget-object v4, v0, Lorg/a/a/e;->chB:[I
+    iget-object v4, v0, Lorg/a/a/e;->cgV:[I
 
     add-int/lit8 v6, v2, 0x1
 
@@ -6021,7 +6030,7 @@
 
     aget v4, v4, v6
 
-    iget-object v6, v3, Lorg/a/a/h;->cip:[I
+    iget-object v6, v3, Lorg/a/a/h;->chJ:[I
 
     invoke-direct {v0, v4}, Lorg/a/a/e;->fG(I)I
 
@@ -6039,49 +6048,51 @@
 
     check-cast v8, Lorg/a/a/m;
 
-    add-int/lit8 v10, v6, 0x2
+    add-int/lit8 v12, v6, 0x2
 
-    invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v12}, Lorg/a/a/e;->fG(I)I
 
-    move-result v10
+    move-result v12
 
-    new-array v13, v10, [Ljava/lang/Object;
+    new-array v14, v12, [Ljava/lang/Object;
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
 
     add-int/lit8 v6, v6, 0x4
 
-    move/from16 v73, v11
+    move/from16 v27, v10
 
-    move v11, v6
+    move v10, v6
 
     const/4 v6, 0x0
 
-    :goto_61
-    if-ge v6, v10, :cond_81
+    :goto_60
+    if-ge v6, v12, :cond_81
 
-    move/from16 v74, v10
+    move/from16 v46, v11
 
-    invoke-direct {v0, v11}, Lorg/a/a/e;->fG(I)I
+    invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
 
-    move-result v10
+    move-result v11
 
-    invoke-direct {v0, v10, v7}, Lorg/a/a/e;->c(I[C)Ljava/lang/Object;
+    invoke-direct {v0, v11, v7}, Lorg/a/a/e;->c(I[C)Ljava/lang/Object;
 
-    move-result-object v10
+    move-result-object v11
 
-    aput-object v10, v13, v6
+    aput-object v11, v14, v6
 
-    add-int/lit8 v11, v11, 0x2
+    add-int/lit8 v10, v10, 0x2
 
     add-int/lit8 v6, v6, 0x1
 
-    move/from16 v10, v74
+    move/from16 v11, v46
 
-    goto :goto_61
+    goto :goto_60
 
     :cond_81
-    iget-object v6, v0, Lorg/a/a/e;->chB:[I
+    move/from16 v46, v11
+
+    iget-object v6, v0, Lorg/a/a/e;->cgV:[I
 
     add-int/lit8 v4, v4, 0x2
 
@@ -6101,23 +6112,25 @@
 
     move-result-object v4
 
-    invoke-virtual {v1, v6, v4, v8, v13}, Lorg/a/a/q;->a(Ljava/lang/String;Ljava/lang/String;Lorg/a/a/m;[Ljava/lang/Object;)V
+    invoke-virtual {v1, v6, v4, v8, v14}, Lorg/a/a/q;->a(Ljava/lang/String;Ljava/lang/String;Lorg/a/a/m;[Ljava/lang/Object;)V
 
-    :goto_62
+    :goto_61
     add-int/lit8 v2, v2, 0x5
 
     goto/16 :goto_58
 
     :pswitch_14
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
 
-    iget-object v4, v0, Lorg/a/a/e;->chB:[I
+    move/from16 v27, v10
+
+    iget-object v4, v0, Lorg/a/a/e;->cgV:[I
 
     add-int/lit8 v8, v2, 0x1
 
@@ -6129,25 +6142,25 @@
 
     add-int/lit8 v8, v4, -0x1
 
-    aget-byte v8, v64, v8
+    aget-byte v8, v28, v8
 
     const/16 v10, 0xb
 
     if-ne v8, v10, :cond_82
 
-    const/16 v33, 0x1
+    const/16 v37, 0x1
 
-    goto :goto_63
+    goto :goto_62
 
     :cond_82
-    const/16 v33, 0x0
+    const/16 v37, 0x0
 
-    :goto_63
+    :goto_62
     invoke-direct {v0, v4, v7}, Lorg/a/a/e;->b(I[C)Ljava/lang/String;
 
     move-result-object v8
 
-    iget-object v10, v0, Lorg/a/a/e;->chB:[I
+    iget-object v10, v0, Lorg/a/a/e;->cgV:[I
 
     add-int/lit8 v4, v4, 0x2
 
@@ -6173,36 +6186,38 @@
 
     invoke-virtual {v1, v6, v8, v10, v4}, Lorg/a/a/q;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_64
+    goto :goto_63
 
     :cond_83
-    move-object/from16 v28, v1
+    move-object/from16 v32, v1
 
-    move/from16 v29, v6
+    move/from16 v33, v6
 
-    move-object/from16 v30, v8
+    move-object/from16 v34, v8
 
-    move-object/from16 v31, v10
+    move-object/from16 v35, v10
 
-    move-object/from16 v32, v4
+    move-object/from16 v36, v4
 
-    invoke-virtual/range {v28 .. v33}, Lorg/a/a/q;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+    invoke-virtual/range {v32 .. v37}, Lorg/a/a/q;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
 
-    :goto_64
+    :goto_63
     const/16 v4, 0xb9
 
     if-ne v6, v4, :cond_85
 
-    goto :goto_62
+    goto :goto_61
 
     :pswitch_15
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
 
     add-int/lit8 v4, v2, 0x1
 
@@ -6212,16 +6227,18 @@
 
     invoke-virtual {v1, v6, v4}, Lorg/a/a/q;->k(ILjava/lang/String;)V
 
-    goto :goto_66
+    goto :goto_65
 
     :pswitch_16
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
 
     const/16 v4, 0x36
 
@@ -6233,12 +6250,7 @@
 
     add-int/lit8 v4, v4, 0x36
 
-    :goto_65
-    and-int/lit8 v6, v6, 0x3
-
-    invoke-virtual {v1, v4, v6}, Lorg/a/a/q;->aB(II)V
-
-    goto :goto_68
+    goto :goto_64
 
     :cond_84
     add-int/lit8 v6, v6, -0x1a
@@ -6247,35 +6259,44 @@
 
     add-int/lit8 v4, v4, 0x15
 
-    goto :goto_65
+    :goto_64
+    and-int/lit8 v6, v6, 0x3
+
+    invoke-virtual {v1, v4, v6}, Lorg/a/a/q;->aB(II)V
+
+    goto :goto_67
 
     :pswitch_17
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
 
     add-int/lit8 v4, v2, 0x1
 
-    aget-byte v4, v64, v4
+    aget-byte v4, v28, v4
 
     and-int/lit16 v4, v4, 0xff
 
     invoke-virtual {v1, v6, v4}, Lorg/a/a/q;->aB(II)V
 
-    goto :goto_67
+    goto :goto_66
 
     :pswitch_18
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
 
     add-int/lit8 v4, v2, 0x1
 
@@ -6286,343 +6307,382 @@
     invoke-virtual {v1, v6, v4}, Lorg/a/a/q;->aA(II)V
 
     :cond_85
-    :goto_66
+    :goto_65
     add-int/lit8 v2, v2, 0x3
 
     goto/16 :goto_58
 
     :pswitch_19
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
 
     add-int/lit8 v4, v2, 0x1
 
-    aget-byte v4, v64, v4
+    aget-byte v4, v28, v4
 
     invoke-virtual {v1, v6, v4}, Lorg/a/a/q;->aA(II)V
 
-    :goto_67
+    :goto_66
     add-int/lit8 v2, v2, 0x2
 
     goto/16 :goto_58
 
     :pswitch_1a
-    move/from16 v72, v4
+    move/from16 v39, v4
 
-    move/from16 v73, v11
+    move/from16 v46, v11
 
-    move-object/from16 v7, v59
+    move-object/from16 v7, v27
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
+
+    move/from16 v27, v10
 
     invoke-virtual {v1, v6}, Lorg/a/a/q;->fO(I)V
 
-    :goto_68
+    :goto_67
     add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_58
 
-    :goto_69
-    if-eqz v6, :cond_89
+    :goto_68
+    if-eqz v2, :cond_89
 
-    array-length v8, v6
+    array-length v8, v2
 
     if-ge v4, v8, :cond_89
 
-    if-gt v2, v12, :cond_89
+    if-gt v6, v13, :cond_89
 
-    if-ne v2, v12, :cond_86
+    if-ne v6, v13, :cond_86
 
-    aget v2, v6, v4
+    aget v6, v2, v4
 
-    invoke-direct {v0, v3, v2}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
+    invoke-direct {v0, v3, v6}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
 
-    move-result v2
+    move-result v6
 
-    add-int/lit8 v8, v2, 0x2
+    add-int/lit8 v8, v6, 0x2
 
-    iget v11, v3, Lorg/a/a/h;->bTR:I
+    iget v10, v3, Lorg/a/a/h;->bTx:I
 
-    iget-object v13, v3, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v11, v3, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
-    invoke-direct {v0, v2, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+    invoke-direct {v0, v6, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v6
 
-    move/from16 v75, v10
+    const/4 v12, 0x1
 
-    const/4 v10, 0x1
+    invoke-virtual {v1, v10, v11, v6, v12}, Lorg/a/a/q;->b(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
-    invoke-virtual {v1, v11, v13, v2, v10}, Lorg/a/a/q;->b(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
+    move-result-object v6
 
-    move-result-object v2
-
-    invoke-direct {v0, v8, v7, v10, v2}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
-
-    goto :goto_6a
+    invoke-direct {v0, v8, v7, v12, v6}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
 
     :cond_86
-    move/from16 v75, v10
-
-    :goto_6a
     add-int/lit8 v4, v4, 0x1
 
-    array-length v2, v6
+    array-length v6, v2
 
-    if-ge v4, v2, :cond_88
+    if-ge v4, v6, :cond_88
 
-    aget v2, v6, v4
+    aget v6, v2, v4
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->fF(I)I
+    invoke-direct {v0, v6}, Lorg/a/a/e;->fF(I)I
 
-    move-result v2
+    move-result v6
 
     const/16 v8, 0x43
 
-    if-ge v2, v8, :cond_87
-
-    goto :goto_6b
-
-    :cond_87
-    aget v2, v6, v4
-
-    const/4 v8, 0x1
-
-    add-int/2addr v2, v8
-
-    invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
-
-    move-result v13
-
-    move v2, v13
-
-    goto :goto_6c
-
-    :cond_88
-    :goto_6b
-    const/4 v2, -0x1
-
-    :goto_6c
-    move/from16 v10, v75
+    if-ge v6, v8, :cond_87
 
     goto :goto_69
 
+    :cond_87
+    aget v6, v2, v4
+
+    const/4 v8, 0x1
+
+    add-int/2addr v6, v8
+
+    invoke-direct {v0, v6}, Lorg/a/a/e;->fG(I)I
+
+    move-result v6
+
+    goto :goto_68
+
+    :cond_88
+    :goto_69
+    const/4 v6, -0x1
+
+    goto :goto_68
+
     :cond_89
-    move/from16 v75, v10
+    move/from16 v11, v21
 
-    move/from16 v11, v22
+    move/from16 v10, v31
 
-    move-object/from16 v10, v55
+    move-object/from16 v8, v41
 
-    move/from16 v8, v68
+    :goto_6a
+    if-eqz v8, :cond_8d
 
-    :goto_6d
-    if-eqz v10, :cond_8d
+    array-length v12, v8
 
-    array-length v13, v10
+    if-ge v10, v12, :cond_8d
 
-    if-ge v8, v13, :cond_8d
+    if-gt v11, v13, :cond_8d
 
-    if-gt v11, v12, :cond_8d
+    if-ne v11, v13, :cond_8a
 
-    if-ne v11, v12, :cond_8a
-
-    aget v11, v10, v8
+    aget v11, v8, v10
 
     invoke-direct {v0, v3, v11}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
 
     move-result v11
 
-    add-int/lit8 v13, v11, 0x2
+    add-int/lit8 v12, v11, 0x2
 
-    move/from16 v76, v2
+    move/from16 v20, v4
 
-    iget v2, v3, Lorg/a/a/h;->bTR:I
+    iget v4, v3, Lorg/a/a/h;->bTx:I
 
-    move/from16 v77, v4
+    move/from16 v21, v6
 
-    iget-object v4, v3, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v6, v3, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
     invoke-direct {v0, v11, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
     move-result-object v11
 
-    move/from16 v78, v12
+    move/from16 v30, v13
 
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
-    invoke-virtual {v1, v2, v4, v11, v12}, Lorg/a/a/q;->b(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
+    invoke-virtual {v1, v4, v6, v11, v13}, Lorg/a/a/q;->b(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
-    move-result-object v2
+    move-result-object v4
 
-    const/4 v4, 0x1
+    const/4 v6, 0x1
 
-    invoke-direct {v0, v13, v7, v4, v2}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
+    invoke-direct {v0, v12, v7, v6, v4}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
 
-    goto :goto_6e
+    goto :goto_6b
 
     :cond_8a
-    move/from16 v76, v2
+    move/from16 v20, v4
 
-    move/from16 v77, v4
+    move/from16 v21, v6
 
-    move/from16 v78, v12
+    move/from16 v30, v13
 
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
-    :goto_6e
-    add-int/lit8 v8, v8, 0x1
+    :goto_6b
+    add-int/lit8 v10, v10, 0x1
 
-    array-length v2, v10
+    array-length v4, v8
 
-    if-ge v8, v2, :cond_8c
+    if-ge v10, v4, :cond_8c
 
-    aget v2, v10, v8
+    aget v4, v8, v10
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->fF(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->fF(I)I
 
-    move-result v2
+    move-result v4
 
-    const/16 v4, 0x43
+    const/16 v6, 0x43
 
-    if-ge v2, v4, :cond_8b
+    if-ge v4, v6, :cond_8b
 
-    goto :goto_6f
+    goto :goto_6c
 
     :cond_8b
-    aget v2, v10, v8
+    aget v4, v8, v10
 
     const/4 v11, 0x1
 
-    add-int/2addr v2, v11
-
-    invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
-
-    move-result v13
-
-    move v11, v13
-
-    goto :goto_70
-
-    :cond_8c
-    const/16 v4, 0x43
-
-    :goto_6f
-    const/4 v11, -0x1
-
-    :goto_70
-    move/from16 v2, v76
-
-    move/from16 v4, v77
-
-    move/from16 v12, v78
-
-    goto :goto_6d
-
-    :cond_8d
-    move/from16 v76, v2
-
-    move/from16 v77, v4
-
-    const/16 v4, 0x43
-
-    const/4 v12, 0x0
-
-    move-object/from16 v54, v6
-
-    move-object/from16 v59, v7
-
-    move-object/from16 v55, v10
-
-    move/from16 v22, v11
-
-    move/from16 v61, v69
-
-    move/from16 v6, v70
-
-    move/from16 v7, v71
-
-    move/from16 v58, v72
-
-    move/from16 v11, v73
-
-    move/from16 v2, v75
-
-    move/from16 v21, v76
-
-    move/from16 v4, v77
-
-    goto/16 :goto_51
-
-    :cond_8e
-    move/from16 v70, v6
-
-    move/from16 v71, v7
-
-    move-object/from16 v6, v54
-
-    move-object/from16 v10, v55
-
-    move-object/from16 v7, v59
-
-    const/4 v12, 0x0
-
-    const/16 v16, 0x4
-
-    aget-object v2, v9, v5
-
-    if-eqz v2, :cond_8f
-
-    aget-object v2, v9, v5
-
-    invoke-virtual {v1, v2}, Lorg/a/a/q;->a(Lorg/a/a/p;)V
-
-    :cond_8f
-    iget v2, v3, Lorg/a/a/h;->chr:I
-
-    and-int/lit8 v2, v2, 0x2
-
-    if-nez v2, :cond_94
-
-    move/from16 v2, v56
-
-    if-eqz v2, :cond_94
-
-    move/from16 v4, v57
-
-    if-eqz v4, :cond_90
-
-    add-int/lit8 v57, v4, 0x2
+    add-int/2addr v4, v11
 
     invoke-direct {v0, v4}, Lorg/a/a/e;->fG(I)I
 
     move-result v4
 
-    mul-int/lit8 v4, v4, 0x3
+    move v11, v4
 
-    new-array v15, v4, [I
+    goto :goto_6d
 
-    array-length v4, v15
+    :cond_8c
+    const/16 v6, 0x43
 
-    move/from16 v5, v57
+    :goto_6c
+    const/4 v11, -0x1
 
-    :goto_71
-    if-lez v4, :cond_91
+    :goto_6d
+    move/from16 v4, v20
 
-    add-int/lit8 v4, v4, -0x1
+    move/from16 v6, v21
 
-    add-int/lit8 v8, v5, 0x6
+    move/from16 v13, v30
 
-    aput v8, v15, v4
+    goto :goto_6a
 
-    const/4 v8, -0x1
+    :cond_8d
+    move/from16 v20, v4
 
-    add-int/2addr v4, v8
+    move/from16 v21, v6
+
+    const/16 v6, 0x43
+
+    const/4 v13, 0x0
+
+    move-object/from16 v40, v2
+
+    move-object/from16 v41, v8
+
+    move v8, v10
+
+    move v2, v14
+
+    move/from16 v4, v20
+
+    move/from16 v20, v21
+
+    move/from16 v10, v27
+
+    move/from16 v30, v38
+
+    move/from16 v6, v44
+
+    move-object/from16 v27, v7
+
+    move/from16 v21, v11
+
+    move/from16 v44, v39
+
+    move/from16 v7, v45
+
+    move/from16 v11, v46
+
+    goto/16 :goto_50
+
+    :cond_8e
+    move/from16 v44, v6
+
+    move/from16 v45, v7
+
+    move-object/from16 v7, v27
+
+    move-object/from16 v2, v40
+
+    move-object/from16 v8, v41
+
+    const/4 v13, 0x0
+
+    const/16 v17, 0x4
+
+    aget-object v4, v9, v5
+
+    if-eqz v4, :cond_8f
+
+    aget-object v4, v9, v5
+
+    invoke-virtual {v1, v4}, Lorg/a/a/q;->a(Lorg/a/a/p;)V
+
+    :cond_8f
+    iget v4, v3, Lorg/a/a/h;->cgL:I
+
+    and-int/lit8 v4, v4, 0x2
+
+    if-nez v4, :cond_94
+
+    move/from16 v4, v42
+
+    if-eqz v4, :cond_94
+
+    move/from16 v5, v43
+
+    if-eqz v5, :cond_90
+
+    add-int/lit8 v43, v5, 0x2
+
+    invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
+
+    move-result v5
+
+    mul-int/lit8 v5, v5, 0x3
+
+    new-array v15, v5, [I
+
+    array-length v5, v15
+
+    move/from16 v6, v43
+
+    :goto_6e
+    if-lez v5, :cond_91
+
+    add-int/lit8 v5, v5, -0x1
+
+    add-int/lit8 v10, v6, 0x6
+
+    aput v10, v15, v5
+
+    const/4 v10, -0x1
+
+    add-int/2addr v5, v10
+
+    add-int/lit8 v11, v6, 0x8
+
+    invoke-direct {v0, v11}, Lorg/a/a/e;->fG(I)I
+
+    move-result v11
+
+    aput v11, v15, v5
+
+    add-int/2addr v5, v10
+
+    invoke-direct {v0, v6}, Lorg/a/a/e;->fG(I)I
+
+    move-result v11
+
+    aput v11, v15, v5
+
+    add-int/lit8 v6, v6, 0xa
+
+    goto :goto_6e
+
+    :cond_90
+    const/4 v15, 0x0
+
+    :cond_91
+    add-int/lit8 v42, v4, 0x2
+
+    invoke-direct {v0, v4}, Lorg/a/a/e;->fG(I)I
+
+    move-result v4
+
+    move/from16 v5, v42
+
+    :goto_6f
+    if-lez v4, :cond_94
+
+    invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
+
+    move-result v6
+
+    add-int/lit8 v10, v5, 0x2
+
+    invoke-direct {v0, v10}, Lorg/a/a/e;->fG(I)I
+
+    move-result v10
 
     add-int/lit8 v11, v5, 0x8
 
@@ -6630,205 +6690,160 @@
 
     move-result v11
 
-    aput v11, v15, v4
-
-    add-int/2addr v4, v8
-
-    invoke-direct {v0, v5}, Lorg/a/a/e;->fG(I)I
-
-    move-result v11
-
-    aput v11, v15, v4
-
-    add-int/lit8 v5, v5, 0xa
-
-    goto :goto_71
-
-    :cond_90
-    const/4 v15, 0x0
-
-    :cond_91
-    add-int/lit8 v56, v2, 0x2
-
-    invoke-direct {v0, v2}, Lorg/a/a/e;->fG(I)I
-
-    move-result v2
-
-    move/from16 v4, v56
-
-    :goto_72
-    if-lez v2, :cond_94
-
-    invoke-direct {v0, v4}, Lorg/a/a/e;->fG(I)I
-
-    move-result v5
-
-    add-int/lit8 v8, v4, 0x2
-
-    invoke-direct {v0, v8}, Lorg/a/a/e;->fG(I)I
-
-    move-result v8
-
-    add-int/lit8 v11, v4, 0x8
-
-    invoke-direct {v0, v11}, Lorg/a/a/e;->fG(I)I
-
-    move-result v11
-
     if-eqz v15, :cond_93
 
-    const/4 v13, 0x0
+    const/4 v12, 0x0
 
-    :goto_73
+    :goto_70
     array-length v14, v15
 
-    if-ge v13, v14, :cond_93
+    if-ge v12, v14, :cond_93
 
-    aget v14, v15, v13
+    aget v14, v15, v12
 
-    if-ne v14, v5, :cond_92
+    if-ne v14, v6, :cond_92
 
-    add-int/lit8 v14, v13, 0x1
+    add-int/lit8 v14, v12, 0x1
 
     aget v14, v15, v14
 
     if-ne v14, v11, :cond_92
 
-    add-int/lit8 v13, v13, 0x2
+    add-int/lit8 v12, v12, 0x2
 
-    aget v13, v15, v13
+    aget v12, v15, v12
 
-    invoke-direct {v0, v13, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+    invoke-direct {v0, v12, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
-    move-result-object v13
+    move-result-object v12
 
-    move-object/from16 v49, v13
+    move-object/from16 v35, v12
 
-    goto :goto_74
+    goto :goto_71
 
     :cond_92
-    add-int/lit8 v13, v13, 0x3
+    add-int/lit8 v12, v12, 0x3
 
-    goto :goto_73
+    goto :goto_70
 
     :cond_93
-    const/16 v49, 0x0
+    const/16 v35, 0x0
 
-    :goto_74
-    add-int/lit8 v13, v4, 0x4
+    :goto_71
+    add-int/lit8 v12, v5, 0x4
 
-    invoke-direct {v0, v13, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+    invoke-direct {v0, v12, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
-    move-result-object v47
+    move-result-object v33
 
-    add-int/lit8 v13, v4, 0x6
+    add-int/lit8 v12, v5, 0x6
 
-    invoke-direct {v0, v13, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+    invoke-direct {v0, v12, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
-    move-result-object v48
+    move-result-object v34
 
-    aget-object v50, v9, v5
+    aget-object v36, v9, v6
 
-    add-int/2addr v5, v8
+    add-int/2addr v6, v10
 
-    aget-object v51, v9, v5
+    aget-object v37, v9, v6
 
-    move-object/from16 v46, v1
+    move-object/from16 v32, v1
 
-    move/from16 v52, v11
+    move/from16 v38, v11
 
-    invoke-virtual/range {v46 .. v52}, Lorg/a/a/q;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;Lorg/a/a/p;I)V
+    invoke-virtual/range {v32 .. v38}, Lorg/a/a/q;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;Lorg/a/a/p;I)V
 
-    add-int/lit8 v4, v4, 0xa
+    add-int/lit8 v5, v5, 0xa
 
-    add-int/lit8 v2, v2, -0x1
+    add-int/lit8 v4, v4, -0x1
+
+    goto :goto_6f
+
+    :cond_94
+    if-eqz v2, :cond_96
+
+    const/4 v4, 0x0
+
+    :goto_72
+    array-length v5, v2
+
+    if-ge v4, v5, :cond_96
+
+    aget v5, v2, v4
+
+    invoke-direct {v0, v5}, Lorg/a/a/e;->fF(I)I
+
+    move-result v5
+
+    const/4 v6, 0x1
+
+    shr-int/2addr v5, v6
+
+    const/16 v6, 0x20
+
+    if-ne v5, v6, :cond_95
+
+    aget v5, v2, v4
+
+    invoke-direct {v0, v3, v5}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
+
+    move-result v5
+
+    add-int/lit8 v6, v5, 0x2
+
+    iget v9, v3, Lorg/a/a/h;->bTx:I
+
+    iget-object v10, v3, Lorg/a/a/h;->chO:Lorg/a/a/u;
+
+    iget-object v11, v3, Lorg/a/a/h;->chP:[Lorg/a/a/p;
+
+    iget-object v12, v3, Lorg/a/a/h;->chQ:[Lorg/a/a/p;
+
+    iget-object v14, v3, Lorg/a/a/h;->chR:[I
+
+    invoke-direct {v0, v5, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+
+    move-result-object v38
+
+    const/16 v39, 0x1
+
+    move-object/from16 v32, v1
+
+    move/from16 v33, v9
+
+    move-object/from16 v34, v10
+
+    move-object/from16 v35, v11
+
+    move-object/from16 v36, v12
+
+    move-object/from16 v37, v14
+
+    invoke-virtual/range {v32 .. v39}, Lorg/a/a/q;->a(ILorg/a/a/u;[Lorg/a/a/p;[Lorg/a/a/p;[ILjava/lang/String;Z)Lorg/a/a/a;
+
+    move-result-object v5
+
+    const/4 v9, 0x1
+
+    invoke-direct {v0, v6, v7, v9, v5}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
+
+    :cond_95
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_72
 
-    :cond_94
-    if-eqz v6, :cond_96
-
-    const/4 v2, 0x0
-
-    :goto_75
-    array-length v4, v6
-
-    if-ge v2, v4, :cond_96
-
-    aget v4, v6, v2
-
-    invoke-direct {v0, v4}, Lorg/a/a/e;->fF(I)I
-
-    move-result v4
-
-    const/4 v5, 0x1
-
-    shr-int/2addr v4, v5
-
-    const/16 v5, 0x20
-
-    if-ne v4, v5, :cond_95
-
-    aget v4, v6, v2
-
-    invoke-direct {v0, v3, v4}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
-
-    move-result v4
-
-    add-int/lit8 v5, v4, 0x2
-
-    iget v8, v3, Lorg/a/a/h;->bTR:I
-
-    iget-object v9, v3, Lorg/a/a/h;->ciu:Lorg/a/a/u;
-
-    iget-object v11, v3, Lorg/a/a/h;->civ:[Lorg/a/a/p;
-
-    iget-object v13, v3, Lorg/a/a/h;->ciw:[Lorg/a/a/p;
-
-    iget-object v14, v3, Lorg/a/a/h;->cix:[I
-
-    invoke-direct {v0, v4, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
-
-    move-result-object v52
-
-    const/16 v53, 0x1
-
-    move-object/from16 v46, v1
-
-    move/from16 v47, v8
-
-    move-object/from16 v48, v9
-
-    move-object/from16 v49, v11
-
-    move-object/from16 v50, v13
-
-    move-object/from16 v51, v14
-
-    invoke-virtual/range {v46 .. v53}, Lorg/a/a/q;->a(ILorg/a/a/u;[Lorg/a/a/p;[Lorg/a/a/p;[ILjava/lang/String;Z)Lorg/a/a/a;
-
-    move-result-object v4
-
-    const/4 v8, 0x1
-
-    invoke-direct {v0, v5, v7, v8, v4}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
-
-    :cond_95
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_75
-
     :cond_96
-    if-eqz v10, :cond_98
+    if-eqz v8, :cond_98
 
     const/4 v2, 0x0
 
-    :goto_76
-    array-length v4, v10
+    :goto_73
+    array-length v4, v8
 
     if-ge v2, v4, :cond_98
 
-    aget v4, v10, v2
+    aget v4, v8, v2
 
     invoke-direct {v0, v4}, Lorg/a/a/e;->fF(I)I
 
@@ -6842,7 +6857,7 @@
 
     if-ne v4, v5, :cond_97
 
-    aget v4, v10, v2
+    aget v4, v8, v2
 
     invoke-direct {v0, v3, v4}, Lorg/a/a/e;->a(Lorg/a/a/h;I)I
 
@@ -6850,35 +6865,35 @@
 
     add-int/lit8 v5, v4, 0x2
 
-    iget v6, v3, Lorg/a/a/h;->bTR:I
+    iget v6, v3, Lorg/a/a/h;->bTx:I
 
-    iget-object v8, v3, Lorg/a/a/h;->ciu:Lorg/a/a/u;
+    iget-object v9, v3, Lorg/a/a/h;->chO:Lorg/a/a/u;
 
-    iget-object v9, v3, Lorg/a/a/h;->civ:[Lorg/a/a/p;
+    iget-object v10, v3, Lorg/a/a/h;->chP:[Lorg/a/a/p;
 
-    iget-object v11, v3, Lorg/a/a/h;->ciw:[Lorg/a/a/p;
+    iget-object v11, v3, Lorg/a/a/h;->chQ:[Lorg/a/a/p;
 
-    iget-object v13, v3, Lorg/a/a/h;->cix:[I
+    iget-object v12, v3, Lorg/a/a/h;->chR:[I
 
     invoke-direct {v0, v4, v7}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
 
-    move-result-object v52
+    move-result-object v38
 
-    const/16 v53, 0x0
+    const/16 v39, 0x0
 
-    move-object/from16 v46, v1
+    move-object/from16 v32, v1
 
-    move/from16 v47, v6
+    move/from16 v33, v6
 
-    move-object/from16 v48, v8
+    move-object/from16 v34, v9
 
-    move-object/from16 v49, v9
+    move-object/from16 v35, v10
 
-    move-object/from16 v50, v11
+    move-object/from16 v36, v11
 
-    move-object/from16 v51, v13
+    move-object/from16 v37, v12
 
-    invoke-virtual/range {v46 .. v53}, Lorg/a/a/q;->a(ILorg/a/a/u;[Lorg/a/a/p;[Lorg/a/a/p;[ILjava/lang/String;Z)Lorg/a/a/a;
+    invoke-virtual/range {v32 .. v39}, Lorg/a/a/q;->a(ILorg/a/a/u;[Lorg/a/a/p;[Lorg/a/a/p;[ILjava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object v4
 
@@ -6886,72 +6901,74 @@
 
     invoke-direct {v0, v5, v7, v6, v4}, Lorg/a/a/e;->a(I[CZLorg/a/a/a;)I
 
-    goto :goto_77
+    goto :goto_74
 
     :cond_97
     const/4 v6, 0x1
 
-    :goto_77
+    :goto_74
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_76
+    goto :goto_73
 
     :cond_98
     const/4 v6, 0x1
 
-    move-object/from16 v2, v18
+    move-object/from16 v2, v16
 
-    :goto_78
+    :goto_75
     if-eqz v2, :cond_99
 
-    iget-object v4, v2, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iget-object v4, v2, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     const/4 v5, 0x0
 
-    iput-object v5, v2, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v5, v2, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
     invoke-virtual {v1, v2}, Lorg/a/a/q;->a(Lorg/a/a/c;)V
 
     move-object v2, v4
 
-    goto :goto_78
+    goto :goto_75
 
     :cond_99
-    move/from16 v2, v70
+    move/from16 v2, v44
 
-    move/from16 v4, v71
+    move/from16 v4, v45
 
     const/4 v5, 0x0
 
     invoke-virtual {v1, v2, v4}, Lorg/a/a/q;->aD(II)V
 
-    goto :goto_7a
+    goto :goto_77
 
     :cond_9a
-    :goto_79
-    move-object/from16 v3, v44
+    :goto_76
+    move-object/from16 v3, v21
 
     :cond_9b
     const/4 v5, 0x0
 
     const/4 v6, 0x1
 
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
 
-    :goto_7a
-    add-int/lit8 v7, v34, -0x1
+    :goto_77
+    add-int/lit8 v7, v18, -0x1
 
     move-object v10, v3
 
-    move/from16 v1, v19
+    move/from16 v1, v25
 
-    goto/16 :goto_1c
+    goto/16 :goto_1b
 
     :cond_9c
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_9
diff --git a/com.discord/smali_classes2/org/a/a/f.smali b/com.discord/smali_classes2/org/a/a/f.smali
index 87bc20db7b..dac775eda0 100644
--- a/com.discord/smali_classes2/org/a/a/f.smali
+++ b/com.discord/smali_classes2/org/a/a/f.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field protected chF:Lorg/a/a/f;
+.field protected final cgI:I
 
-.field protected final cho:I
+.field protected cgZ:Lorg/a/a/f;
 
 
 # direct methods
@@ -26,11 +26,11 @@
 
     const/high16 p1, 0x50000
 
-    iput p1, p0, Lorg/a/a/f;->cho:I
+    iput p1, p0, Lorg/a/a/f;->cgI:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iput-object p1, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     return-void
 .end method
@@ -40,18 +40,16 @@
 .method public a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/f;->cho:I
+    iget v0, p0, Lorg/a/a/f;->cgI:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/f;->a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -72,25 +70,23 @@
 .end method
 
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/a/a/j;
-    .locals 7
+    .locals 6
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    move v1, p1
 
-    move v2, p1
+    move-object v2, p2
 
-    move-object v3, p2
+    move-object v3, p3
 
-    move-object v4, p3
+    move-object v4, p4
 
-    move-object v5, p4
+    move-object v5, p5
 
-    move-object v6, p5
-
-    invoke-virtual/range {v1 .. v6}, Lorg/a/a/f;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/a/a/j;
+    invoke-virtual/range {v0 .. v5}, Lorg/a/a/f;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/a/a/j;
 
     move-result-object p1
 
@@ -103,25 +99,23 @@
 .end method
 
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/a/a/q;
-    .locals 7
+    .locals 6
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    move v1, p1
 
-    move v2, p1
+    move-object v2, p2
 
-    move-object v3, p2
+    move-object v3, p3
 
-    move-object v4, p3
+    move-object v4, p4
 
-    move-object v5, p4
+    move-object v5, p5
 
-    move-object v6, p5
-
-    invoke-virtual/range {v1 .. v6}, Lorg/a/a/f;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/a/a/q;
+    invoke-virtual/range {v0 .. v5}, Lorg/a/a/f;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/a/a/q;
 
     move-result-object p1
 
@@ -134,27 +128,25 @@
 .end method
 
 .method public a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
-    .locals 8
+    .locals 7
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    move v1, p1
 
-    move v2, p1
+    move v2, p2
 
-    move v3, p2
+    move-object v3, p3
 
-    move-object v4, p3
+    move-object v4, p4
 
-    move-object v5, p4
+    move-object v5, p5
 
-    move-object v6, p5
+    move-object v6, p6
 
-    move-object v7, p6
-
-    invoke-virtual/range {v1 .. v7}, Lorg/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+    invoke-virtual/range {v0 .. v6}, Lorg/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -163,12 +155,10 @@
 .method public a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/f;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 
     :cond_0
@@ -178,12 +168,10 @@
 .method public a(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
-
     invoke-virtual {v0, p1}, Lorg/a/a/f;->a(Lorg/a/a/c;)V
 
     :cond_0
@@ -193,12 +181,10 @@
 .method public as(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/f;->as(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
@@ -208,12 +194,10 @@
 .method public k(Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/f;->k(Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -229,12 +213,10 @@
 .method public q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
+    iget-object v0, p0, Lorg/a/a/f;->cgZ:Lorg/a/a/f;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/f;->chF:Lorg/a/a/f;
-
     invoke-virtual {v0, p1, p2, p3}, Lorg/a/a/f;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
diff --git a/com.discord/smali_classes2/org/a/a/g.smali b/com.discord/smali_classes2/org/a/a/g.smali
index bf2baec179..70df9b2dd6 100644
--- a/com.discord/smali_classes2/org/a/a/g.smali
+++ b/com.discord/smali_classes2/org/a/a/g.smali
@@ -3,81 +3,81 @@
 
 
 # static fields
-.field static final chA:[B
+.field static final cgU:[B
 
 
 # instance fields
-.field chG:Lorg/a/a/e;
+.field cgL:I
 
-.field chH:I
+.field final cgN:Lorg/a/a/d;
 
-.field chI:[Lorg/a/a/o;
+.field cgP:I
 
-.field final chJ:Lorg/a/a/o;
+.field chA:Lorg/a/a/k;
 
-.field final chK:Lorg/a/a/o;
+.field chB:Lorg/a/a/k;
 
-.field final chL:Lorg/a/a/o;
+.field chC:Lorg/a/a/r;
 
-.field final chM:Lorg/a/a/o;
+.field chD:Lorg/a/a/r;
 
-.field chN:[Lorg/a/a/o;
+.field private chE:Z
 
-.field private chO:S
+.field private chF:Z
 
-.field private chP:I
+.field chG:Z
 
-.field private chQ:I
+.field cha:Lorg/a/a/e;
 
-.field chR:Ljava/lang/String;
+.field chb:I
 
-.field private chS:I
+.field chc:[Lorg/a/a/o;
 
-.field private chT:I
+.field final chd:Lorg/a/a/o;
 
-.field private chU:[I
+.field final che:Lorg/a/a/o;
 
-.field private chV:I
+.field final chf:Lorg/a/a/o;
 
-.field private chW:Lorg/a/a/d;
+.field final chg:Lorg/a/a/o;
 
-.field private chX:I
+.field chh:[Lorg/a/a/o;
 
-.field private chY:I
+.field private chi:S
 
-.field private chZ:Lorg/a/a/b;
+.field private chj:I
 
-.field chr:I
+.field private chk:I
 
-.field final cht:Lorg/a/a/d;
+.field chl:Ljava/lang/String;
 
-.field chv:I
+.field private chm:I
 
-.field private cia:Lorg/a/a/b;
+.field private chn:I
 
-.field private cib:Lorg/a/a/b;
+.field private cho:[I
 
-.field private cic:Lorg/a/a/b;
+.field private chp:I
 
-.field private cid:Lorg/a/a/c;
+.field private chq:Lorg/a/a/d;
 
-.field private cie:Lorg/a/a/d;
+.field private chr:I
 
-.field cif:Lorg/a/a/d;
+.field private chs:I
 
-.field cig:Lorg/a/a/k;
+.field private cht:Lorg/a/a/b;
 
-.field cih:Lorg/a/a/k;
+.field private chu:Lorg/a/a/b;
 
-.field cii:Lorg/a/a/r;
+.field private chv:Lorg/a/a/b;
 
-.field cij:Lorg/a/a/r;
+.field private chw:Lorg/a/a/b;
 
-.field private cik:Z
+.field private chx:Lorg/a/a/c;
 
-.field private cil:Z
+.field private chy:Lorg/a/a/d;
 
-.field cim:Z
+.field chz:Lorg/a/a/d;
 
 .field private mN:I
 
@@ -116,7 +116,7 @@
     goto :goto_0
 
     :cond_0
-    sput-object v1, Lorg/a/a/g;->chA:[B
+    sput-object v1, Lorg/a/a/g;->cgU:[B
 
     return-void
 .end method
@@ -128,21 +128,21 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lorg/a/a/g;->chH:I
+    iput v0, p0, Lorg/a/a/g;->chb:I
 
     new-instance v1, Lorg/a/a/d;
 
     invoke-direct {v1}, Lorg/a/a/d;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iput-object v1, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     const/16 v1, 0x100
 
     new-array v1, v1, [Lorg/a/a/o;
 
-    iput-object v1, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iput-object v1, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
-    iget-object v1, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
     array-length v1, v1
 
@@ -156,31 +156,31 @@
 
     double-to-int v1, v1
 
-    iput v1, p0, Lorg/a/a/g;->chv:I
+    iput v1, p0, Lorg/a/a/g;->cgP:I
 
     new-instance v1, Lorg/a/a/o;
 
     invoke-direct {v1}, Lorg/a/a/o;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iput-object v1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     new-instance v1, Lorg/a/a/o;
 
     invoke-direct {v1}, Lorg/a/a/o;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iput-object v1, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     new-instance v1, Lorg/a/a/o;
 
     invoke-direct {v1}, Lorg/a/a/o;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iput-object v1, p0, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     new-instance v1, Lorg/a/a/o;
 
     invoke-direct {v1}, Lorg/a/a/o;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/g;->chM:Lorg/a/a/o;
+    iput-object v1, p0, Lorg/a/a/g;->chg:Lorg/a/a/o;
 
     and-int/lit8 v1, p1, 0x1
 
@@ -196,7 +196,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iput-boolean v1, p0, Lorg/a/a/g;->cik:Z
+    iput-boolean v1, p0, Lorg/a/a/g;->chE:Z
 
     and-int/lit8 p1, p1, 0x2
 
@@ -208,33 +208,33 @@
     const/4 v0, 0x0
 
     :goto_1
-    iput-boolean v0, p0, Lorg/a/a/g;->cil:Z
+    iput-boolean v0, p0, Lorg/a/a/g;->chF:Z
 
     return-void
 .end method
 
-.method private JF()Lorg/a/a/o;
+.method private JE()Lorg/a/a/o;
     .locals 5
 
-    iget-short v0, p0, Lorg/a/a/g;->chO:S
+    iget-short v0, p0, Lorg/a/a/g;->chi:S
 
     add-int/lit8 v0, v0, 0x1
 
     int-to-short v0, v0
 
-    iput-short v0, p0, Lorg/a/a/g;->chO:S
+    iput-short v0, p0, Lorg/a/a/g;->chi:S
 
     new-instance v0, Lorg/a/a/o;
 
-    iget-short v1, p0, Lorg/a/a/g;->chO:S
+    iget-short v1, p0, Lorg/a/a/g;->chi:S
 
-    iget-object v2, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v2, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-direct {v0, v1, v2}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->b(Lorg/a/a/o;)V
 
-    iget-object v1, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     if-nez v1, :cond_0
 
@@ -242,41 +242,35 @@
 
     new-array v1, v1, [Lorg/a/a/o;
 
-    iput-object v1, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iput-object v1, p0, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     :cond_0
-    iget-short v1, p0, Lorg/a/a/g;->chO:S
+    iget-short v1, p0, Lorg/a/a/g;->chi:S
 
-    iget-object v2, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v2, p0, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ne v1, v2, :cond_1
+    if-ne v1, v3, :cond_1
 
-    iget-object v1, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
-
-    array-length v1, v1
+    array-length v1, v2
 
     mul-int/lit8 v1, v1, 0x2
 
     new-array v1, v1, [Lorg/a/a/o;
 
-    iget-object v2, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
-
-    iget-object v3, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
-
-    array-length v3, v3
+    array-length v3, v2
 
     const/4 v4, 0x0
 
     invoke-static {v2, v4, v1, v4, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v1, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iput-object v1, p0, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
-    iget-short v2, p0, Lorg/a/a/g;->chO:S
+    iget-short v2, p0, Lorg/a/a/g;->chi:S
 
     aput-object v0, v1, v2
 
@@ -286,7 +280,7 @@
 .method private au(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/o;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     const/16 v1, 0xc
 
@@ -294,7 +288,7 @@
 
     invoke-virtual {v0, v1, p1, p2, v2}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -314,13 +308,13 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 p2, p1, 0x1
 
-    iput p2, p0, Lorg/a/a/g;->chH:I
+    iput p2, p0, Lorg/a/a/g;->chb:I
 
-    iget-object p2, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object p2, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-direct {v0, p1, p2}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -333,7 +327,7 @@
 .method private ay(II)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     const/16 v1, 0xf
 
@@ -353,7 +347,7 @@
 
     move-result-object p1
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     return p1
 .end method
@@ -361,7 +355,7 @@
 .method private eU(Ljava/lang/String;)Lorg/a/a/o;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -369,7 +363,7 @@
 
     invoke-virtual {v0, v2, p1, v1, v1}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -377,7 +371,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -387,13 +381,13 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 v1, p1, 0x1
 
-    iput v1, p0, Lorg/a/a/g;->chH:I
+    iput v1, p0, Lorg/a/a/g;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-direct {v0, p1, v1}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -406,7 +400,7 @@
 .method private eV(Ljava/lang/String;)Lorg/a/a/o;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -414,7 +408,7 @@
 
     invoke-virtual {v0, v2, p1, v1, v1}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -422,7 +416,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -432,13 +426,13 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 v1, p1, 0x1
 
-    iput v1, p0, Lorg/a/a/g;->chH:I
+    iput v1, p0, Lorg/a/a/g;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-direct {v0, p1, v1}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -455,7 +449,7 @@
 
     move-result-object p1
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     return p1
 .end method
@@ -465,11 +459,11 @@
 .method final C(F)Lorg/a/a/o;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {v0, p1}, Lorg/a/a/o;->D(F)V
 
-    iget-object p1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object p1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -477,7 +471,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     const/4 v0, 0x4
 
@@ -485,21 +479,21 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
-    iget v0, v0, Lorg/a/a/o;->chH:I
+    iget v0, v0, Lorg/a/a/o;->chb:I
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/o;
 
-    iget v0, p0, Lorg/a/a/g;->chH:I
+    iget v0, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 v1, v0, 0x1
 
-    iput v1, p0, Lorg/a/a/g;->chH:I
+    iput v1, p0, Lorg/a/a/g;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-direct {p1, v0, v1}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -532,7 +526,7 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget p2, v4, Lorg/a/a/d;->chr:I
+    iget p2, v4, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v5, p2, -0x2
 
@@ -548,20 +542,20 @@
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/g;->cib:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/g;->chv:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/g;->cib:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/g;->chv:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/g;->cic:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/g;->chw:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/g;->cic:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/g;->chw:Lorg/a/a/b;
 
     :goto_0
     return-object p1
@@ -594,13 +588,13 @@
 .method final a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/o;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->chM:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chg:Lorg/a/a/o;
 
     add-int/lit8 v1, p1, 0x14
 
     invoke-virtual {v0, v1, p2, p3, p4}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chM:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chg:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -643,13 +637,13 @@
     :goto_2
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 p2, p1, 0x1
 
-    iput p2, p0, Lorg/a/a/g;->chH:I
+    iput p2, p0, Lorg/a/a/g;->chb:I
 
-    iget-object p2, p0, Lorg/a/a/g;->chM:Lorg/a/a/o;
+    iget-object p2, p0, Lorg/a/a/g;->chg:Lorg/a/a/o;
 
     invoke-direct {v0, p1, p2}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -662,11 +656,11 @@
 .method final a(Lorg/a/a/o;)Lorg/a/a/o;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
-    iget v1, p1, Lorg/a/a/o;->cja:I
+    iget v1, p1, Lorg/a/a/o;->ciu:I
 
-    iget-object v2, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iget-object v2, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
     array-length v2, v2
 
@@ -677,9 +671,9 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/o;->chr:I
+    iget v1, v0, Lorg/a/a/o;->cgL:I
 
-    iget v2, p1, Lorg/a/a/o;->chr:I
+    iget v2, p1, Lorg/a/a/o;->cgL:I
 
     if-ne v1, v2, :cond_0
 
@@ -690,7 +684,7 @@
     if-nez v1, :cond_1
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/o;->cjb:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/o;->civ:Lorg/a/a/o;
 
     goto :goto_0
 
@@ -703,9 +697,9 @@
 
     new-instance v9, Lorg/a/a/r;
 
-    iget-boolean v7, p0, Lorg/a/a/g;->cik:Z
+    iget-boolean v7, p0, Lorg/a/a/g;->chE:Z
 
-    iget-boolean v8, p0, Lorg/a/a/g;->cil:Z
+    iget-boolean v8, p0, Lorg/a/a/g;->chF:Z
 
     move-object v0, v9
 
@@ -729,17 +723,17 @@
 .method public final a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
     .locals 0
 
-    iput p1, p0, Lorg/a/a/g;->chr:I
+    iput p1, p0, Lorg/a/a/g;->cgL:I
 
-    iput p2, p0, Lorg/a/a/g;->chP:I
+    iput p2, p0, Lorg/a/a/g;->chj:I
 
     invoke-virtual {p0, p3}, Lorg/a/a/g;->eT(Ljava/lang/String;)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/g;->chQ:I
+    iput p1, p0, Lorg/a/a/g;->chk:I
 
-    iput-object p3, p0, Lorg/a/a/g;->chR:Ljava/lang/String;
+    iput-object p3, p0, Lorg/a/a/g;->chl:Ljava/lang/String;
 
     if-eqz p4, :cond_0
 
@@ -747,7 +741,7 @@
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/g;->chS:I
+    iput p1, p0, Lorg/a/a/g;->chm:I
 
     :cond_0
     const/4 p1, 0x0
@@ -774,20 +768,20 @@
 
     array-length p2, p6
 
-    iput p2, p0, Lorg/a/a/g;->chT:I
+    iput p2, p0, Lorg/a/a/g;->chn:I
 
-    iget p2, p0, Lorg/a/a/g;->chT:I
+    iget p2, p0, Lorg/a/a/g;->chn:I
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lorg/a/a/g;->chU:[I
+    iput-object p2, p0, Lorg/a/a/g;->cho:[I
 
     :goto_1
-    iget p2, p0, Lorg/a/a/g;->chT:I
+    iget p2, p0, Lorg/a/a/g;->chn:I
 
     if-ge p1, p2, :cond_2
 
-    iget-object p2, p0, Lorg/a/a/g;->chU:[I
+    iget-object p2, p0, Lorg/a/a/g;->cho:[I
 
     aget-object p3, p6, p1
 
@@ -808,7 +802,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -816,14 +810,14 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     :cond_0
     invoke-virtual {p0, p1}, Lorg/a/a/g;->eS(Ljava/lang/String;)Lorg/a/a/o;
 
     move-result-object p1
 
-    iget v0, p1, Lorg/a/a/o;->chH:I
+    iget v0, p1, Lorg/a/a/o;->chb:I
 
     if-nez v0, :cond_3
 
@@ -833,13 +827,13 @@
 
     iput v0, p0, Lorg/a/a/g;->x:I
 
-    iget-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
-    iget v1, p1, Lorg/a/a/o;->ciC:I
+    iget v1, p1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {v0, v1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     const/4 v1, 0x0
 
@@ -857,7 +851,7 @@
     :goto_0
     invoke-virtual {v0, p2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     if-nez p3, :cond_2
 
@@ -871,13 +865,13 @@
     :goto_1
     invoke-virtual {p2, v1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     invoke-virtual {p2, p4}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     iget p2, p0, Lorg/a/a/g;->x:I
 
-    iput p2, p1, Lorg/a/a/o;->chH:I
+    iput p2, p1, Lorg/a/a/o;->chb:I
 
     :cond_3
     return-void
@@ -886,11 +880,11 @@
 .method public final a(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/g;->chx:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/g;->chx:Lorg/a/a/c;
 
     return-void
 .end method
@@ -904,7 +898,7 @@
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/g;->chV:I
+    iput p1, p0, Lorg/a/a/g;->chp:I
 
     :cond_0
     if-eqz p2, :cond_1
@@ -921,7 +915,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/a/a/g;->chW:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/g;->chq:Lorg/a/a/d;
 
     :cond_1
     return-void
@@ -934,7 +928,7 @@
 
     move-result-object p1
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     return p1
 .end method
@@ -1046,22 +1040,24 @@
     invoke-direct {p2, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw p2
+
+    return-void
 .end method
 
 .method final b(Lorg/a/a/o;)V
     .locals 7
 
-    iget v0, p0, Lorg/a/a/g;->chH:I
+    iget v0, p0, Lorg/a/a/g;->chb:I
 
-    iget-short v1, p0, Lorg/a/a/g;->chO:S
+    iget-short v1, p0, Lorg/a/a/g;->chi:S
 
     add-int/2addr v0, v1
 
-    iget v1, p0, Lorg/a/a/g;->chv:I
+    iget v1, p0, Lorg/a/a/g;->cgP:I
 
     if-le v0, v1, :cond_2
 
-    iget-object v0, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
     array-length v0, v0
 
@@ -1076,22 +1072,22 @@
     :goto_0
     if-ltz v0, :cond_1
 
-    iget-object v3, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iget-object v3, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
     aget-object v3, v3, v0
 
     :goto_1
     if-eqz v3, :cond_0
 
-    iget v4, v3, Lorg/a/a/o;->cja:I
+    iget v4, v3, Lorg/a/a/o;->ciu:I
 
     rem-int/2addr v4, v1
 
-    iget-object v5, v3, Lorg/a/a/o;->cjb:Lorg/a/a/o;
+    iget-object v5, v3, Lorg/a/a/o;->civ:Lorg/a/a/o;
 
     aget-object v6, v2, v4
 
-    iput-object v6, v3, Lorg/a/a/o;->cjb:Lorg/a/a/o;
+    iput-object v6, v3, Lorg/a/a/o;->civ:Lorg/a/a/o;
 
     aput-object v3, v2, v4
 
@@ -1105,7 +1101,7 @@
     goto :goto_0
 
     :cond_1
-    iput-object v2, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iput-object v2, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
     int-to-double v0, v1
 
@@ -1117,24 +1113,20 @@
 
     double-to-int v0, v0
 
-    iput v0, p0, Lorg/a/a/g;->chv:I
+    iput v0, p0, Lorg/a/a/g;->cgP:I
 
     :cond_2
-    iget v0, p1, Lorg/a/a/o;->cja:I
+    iget v0, p1, Lorg/a/a/o;->ciu:I
 
-    iget-object v1, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
-    array-length v1, v1
+    array-length v2, v1
 
-    rem-int/2addr v0, v1
+    rem-int/2addr v0, v2
 
-    iget-object v1, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    aget-object v2, v1, v0
 
-    aget-object v1, v1, v0
-
-    iput-object v1, p1, Lorg/a/a/o;->cjb:Lorg/a/a/o;
-
-    iget-object v1, p0, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iput-object v2, p1, Lorg/a/a/o;->civ:Lorg/a/a/o;
 
     aput-object p1, v1, v0
 
@@ -1299,13 +1291,13 @@
 
     check-cast p1, Lorg/a/a/t;
 
-    iget v0, p1, Lorg/a/a/t;->ciC:I
+    iget v0, p1, Lorg/a/a/t;->chW:I
 
     const/16 v1, 0xa
 
     if-ne v0, v1, :cond_9
 
-    invoke-virtual {p1}, Lorg/a/a/t;->JN()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/t;->JM()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1348,13 +1340,13 @@
 
     check-cast p1, Lorg/a/a/m;
 
-    iget v0, p1, Lorg/a/a/m;->ciC:I
+    iget v0, p1, Lorg/a/a/m;->chW:I
 
-    iget-object v1, p1, Lorg/a/a/m;->ciR:Ljava/lang/String;
+    iget-object v1, p1, Lorg/a/a/m;->cil:Ljava/lang/String;
 
-    iget-object v2, p1, Lorg/a/a/m;->ciS:Ljava/lang/String;
+    iget-object v2, p1, Lorg/a/a/m;->cim:Ljava/lang/String;
 
-    iget-object p1, p1, Lorg/a/a/m;->ciT:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/m;->cin:Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1, v2, p1}, Lorg/a/a/g;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/o;
 
@@ -1383,11 +1375,11 @@
 .method final bk(J)Lorg/a/a/o;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/o;->bl(J)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1395,7 +1387,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     const/4 v1, 0x5
 
@@ -1407,17 +1399,17 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
-    iget-object p2, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object p2, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-direct {v0, p1, p2}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 p1, p1, 0x2
 
-    iput p1, p0, Lorg/a/a/g;->chH:I
+    iput p1, p0, Lorg/a/a/g;->chb:I
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->b(Lorg/a/a/o;)V
 
@@ -1438,11 +1430,11 @@
     const/16 p4, 0xa
 
     :goto_0
-    iget-object v0, p0, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     invoke-virtual {v0, p4, p1, p2, p3}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1462,13 +1454,13 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 p2, p1, 0x1
 
-    iput p2, p0, Lorg/a/a/g;->chH:I
+    iput p2, p0, Lorg/a/a/g;->chb:I
 
-    iget-object p2, p0, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object p2, p0, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     invoke-direct {v0, p1, p2}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -1481,7 +1473,7 @@
 .method public final eR(Ljava/lang/String;)I
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -1489,7 +1481,7 @@
 
     invoke-virtual {v0, v2, p1, v1, v1}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1497,7 +1489,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
@@ -1507,20 +1499,20 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 v1, p1, 0x1
 
-    iput v1, p0, Lorg/a/a/g;->chH:I
+    iput v1, p0, Lorg/a/a/g;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-direct {v0, p1, v1}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->b(Lorg/a/a/o;)V
 
     :cond_0
-    iget p1, v0, Lorg/a/a/o;->ciC:I
+    iget p1, v0, Lorg/a/a/o;->chW:I
 
     return p1
 .end method
@@ -1528,7 +1520,7 @@
 .method final eS(Ljava/lang/String;)Lorg/a/a/o;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -1536,7 +1528,7 @@
 
     invoke-virtual {v0, v2, p1, v1, v1}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1544,7 +1536,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -1554,13 +1546,13 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 v1, p1, 0x1
 
-    iput v1, p0, Lorg/a/a/g;->chH:I
+    iput v1, p0, Lorg/a/a/g;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-direct {v0, p1, v1}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -1577,7 +1569,7 @@
 
     move-result-object p1
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     return p1
 .end method
@@ -1585,7 +1577,7 @@
 .method final eW(Ljava/lang/String;)I
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -1593,7 +1585,7 @@
 
     invoke-virtual {v0, v2, p1, v1, v1}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object p1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1601,12 +1593,12 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lorg/a/a/g;->JF()Lorg/a/a/o;
+    invoke-direct {p0}, Lorg/a/a/g;->JE()Lorg/a/a/o;
 
     move-result-object p1
 
     :cond_0
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     return p1
 .end method
@@ -1614,11 +1606,11 @@
 .method final fK(I)Lorg/a/a/o;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {v0, p1}, Lorg/a/a/o;->fE(I)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1626,7 +1618,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     const/4 v1, 0x3
 
@@ -1638,13 +1630,13 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 v1, p1, 0x1
 
-    iput v1, p0, Lorg/a/a/g;->chH:I
+    iput v1, p0, Lorg/a/a/g;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-direct {v0, p1, v1}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -1657,11 +1649,11 @@
 .method final g(D)Lorg/a/a/o;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/o;->h(D)V
 
-    iget-object p1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object p1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1669,7 +1661,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     const/4 p2, 0x6
 
@@ -1677,25 +1669,25 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object p2, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
-    iget-wide v0, p2, Lorg/a/a/o;->ciX:J
+    iget-wide v0, p2, Lorg/a/a/o;->cir:J
 
     invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->bj(J)Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/o;
 
-    iget p2, p0, Lorg/a/a/g;->chH:I
+    iget p2, p0, Lorg/a/a/g;->chb:I
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-direct {p1, p2, v0}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
-    iget p2, p0, Lorg/a/a/g;->chH:I
+    iget p2, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 p2, p2, 0x2
 
-    iput p2, p0, Lorg/a/a/g;->chH:I
+    iput p2, p0, Lorg/a/a/g;->chb:I
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->b(Lorg/a/a/o;)V
 
@@ -1738,20 +1730,20 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/g;->chZ:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/g;->cht:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/g;->chZ:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/g;->cht:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/g;->cia:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/g;->chu:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/g;->cia:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/g;->chu:Lorg/a/a/b;
 
     :goto_0
     return-object p1
@@ -1760,21 +1752,15 @@
 .method final m(Ljava/lang/String;I)I
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     const/16 v1, 0x1f
 
-    iput v1, v0, Lorg/a/a/o;->chr:I
+    iput v1, v0, Lorg/a/a/o;->cgL:I
 
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iput p2, v0, Lorg/a/a/o;->chb:I
 
-    iput p2, v0, Lorg/a/a/o;->chH:I
-
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
-
-    iput-object p1, v0, Lorg/a/a/o;->cis:Ljava/lang/String;
-
-    iget-object v0, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iput-object p1, v0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
@@ -1788,9 +1774,9 @@
 
     and-int/2addr p1, p2
 
-    iput p1, v0, Lorg/a/a/o;->cja:I
+    iput p1, v0, Lorg/a/a/o;->ciu:I
 
-    iget-object p1, p0, Lorg/a/a/g;->chJ:Lorg/a/a/o;
+    iget-object p1, p0, Lorg/a/a/g;->chd:Lorg/a/a/o;
 
     invoke-virtual {p0, p1}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1798,12 +1784,12 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lorg/a/a/g;->JF()Lorg/a/a/o;
+    invoke-direct {p0}, Lorg/a/a/g;->JE()Lorg/a/a/o;
 
     move-result-object p1
 
     :cond_0
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     return p1
 .end method
@@ -1815,7 +1801,7 @@
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/g;->chX:I
+    iput p1, p0, Lorg/a/a/g;->chr:I
 
     if-eqz p2, :cond_0
 
@@ -1825,7 +1811,7 @@
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/g;->chY:I
+    iput p1, p0, Lorg/a/a/g;->chs:I
 
     :cond_0
     return-void
@@ -1834,13 +1820,13 @@
 .method final r(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/o;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     const/16 v1, 0x9
 
     invoke-virtual {v0, v1, p1, p2, p3}, Lorg/a/a/o;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     invoke-virtual {p0, v0}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -1860,13 +1846,13 @@
 
     new-instance v0, Lorg/a/a/o;
 
-    iget p1, p0, Lorg/a/a/g;->chH:I
+    iget p1, p0, Lorg/a/a/g;->chb:I
 
     add-int/lit8 p2, p1, 0x1
 
-    iput p2, p0, Lorg/a/a/g;->chH:I
+    iput p2, p0, Lorg/a/a/g;->chb:I
 
-    iget-object p2, p0, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object p2, p0, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     invoke-direct {v0, p1, p2}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
@@ -1879,7 +1865,7 @@
 .method final r(III)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -1894,13 +1880,13 @@
     .locals 14
 
     :goto_0
-    iget v0, p0, Lorg/a/a/g;->chH:I
+    iget v0, p0, Lorg/a/a/g;->chb:I
 
     const v1, 0xffff
 
     if-gt v0, v1, :cond_40
 
-    iget v0, p0, Lorg/a/a/g;->chT:I
+    iget v0, p0, Lorg/a/a/g;->chn:I
 
     const/4 v2, 0x2
 
@@ -1908,7 +1894,7 @@
 
     add-int/lit8 v0, v0, 0x18
 
-    iget-object v3, p0, Lorg/a/a/g;->cig:Lorg/a/a/k;
+    iget-object v3, p0, Lorg/a/a/g;->chA:Lorg/a/a/k;
 
     const/4 v4, 0x0
 
@@ -1917,9 +1903,9 @@
     const/4 v0, 0x0
 
     :goto_1
-    const/high16 v6, 0x20000
+    const/16 v6, 0x31
 
-    const/16 v7, 0x31
+    const/high16 v7, 0x20000
 
     const/high16 v8, 0x40000
 
@@ -1929,11 +1915,11 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    iget v10, v3, Lorg/a/a/k;->ciH:I
+    iget v10, v3, Lorg/a/a/k;->cib:I
 
     if-eqz v10, :cond_0
 
-    iget-object v10, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v11, "ConstantValue"
 
@@ -1947,43 +1933,43 @@
     const/16 v10, 0x8
 
     :goto_2
-    iget v11, v3, Lorg/a/a/k;->chH:I
+    iget v11, v3, Lorg/a/a/k;->chb:I
 
     and-int/lit16 v11, v11, 0x1000
 
     if-eqz v11, :cond_2
 
-    iget-object v11, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v11, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    iget v11, v11, Lorg/a/a/g;->chr:I
+    iget v11, v11, Lorg/a/a/g;->cgL:I
 
     and-int/2addr v11, v1
 
-    if-lt v11, v7, :cond_1
+    if-lt v11, v6, :cond_1
 
-    iget v7, v3, Lorg/a/a/k;->chH:I
+    iget v6, v3, Lorg/a/a/k;->chb:I
 
-    and-int/2addr v7, v8
+    and-int/2addr v6, v8
 
-    if-eqz v7, :cond_2
+    if-eqz v6, :cond_2
 
     :cond_1
-    iget-object v7, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v6, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v8, "Synthetic"
 
-    invoke-virtual {v7, v8}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v6, v8}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x6
 
     :cond_2
-    iget v7, v3, Lorg/a/a/k;->chH:I
+    iget v6, v3, Lorg/a/a/k;->chb:I
 
     and-int/2addr v6, v7
 
     if-eqz v6, :cond_3
 
-    iget-object v6, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v6, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v7, "Deprecated"
 
@@ -1992,11 +1978,11 @@
     add-int/lit8 v10, v10, 0x6
 
     :cond_3
-    iget v6, v3, Lorg/a/a/k;->chv:I
+    iget v6, v3, Lorg/a/a/k;->cgP:I
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v6, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v7, "Signature"
 
@@ -2005,19 +1991,19 @@
     add-int/lit8 v10, v10, 0x8
 
     :cond_4
-    iget-object v6, v3, Lorg/a/a/k;->chx:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cgR:Lorg/a/a/b;
 
     if-eqz v6, :cond_5
 
-    iget-object v6, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v6, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v7, "RuntimeVisibleAnnotations"
 
     invoke-virtual {v6, v7}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v6, v3, Lorg/a/a/k;->chx:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cgR:Lorg/a/a/b;
 
-    invoke-virtual {v6}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v6}, Lorg/a/a/b;->JC()I
 
     move-result v6
 
@@ -2026,19 +2012,19 @@
     add-int/2addr v10, v6
 
     :cond_5
-    iget-object v6, v3, Lorg/a/a/k;->ciI:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cic:Lorg/a/a/b;
 
     if-eqz v6, :cond_6
 
-    iget-object v6, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v6, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v7, "RuntimeInvisibleAnnotations"
 
     invoke-virtual {v6, v7}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v6, v3, Lorg/a/a/k;->ciI:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cic:Lorg/a/a/b;
 
-    invoke-virtual {v6}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v6}, Lorg/a/a/b;->JC()I
 
     move-result v6
 
@@ -2047,19 +2033,19 @@
     add-int/2addr v10, v6
 
     :cond_6
-    iget-object v6, v3, Lorg/a/a/k;->ciJ:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cid:Lorg/a/a/b;
 
     if-eqz v6, :cond_7
 
-    iget-object v6, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v6, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v7, "RuntimeVisibleTypeAnnotations"
 
     invoke-virtual {v6, v7}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v6, v3, Lorg/a/a/k;->ciJ:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cid:Lorg/a/a/b;
 
-    invoke-virtual {v6}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v6}, Lorg/a/a/b;->JC()I
 
     move-result v6
 
@@ -2068,19 +2054,19 @@
     add-int/2addr v10, v6
 
     :cond_7
-    iget-object v6, v3, Lorg/a/a/k;->ciK:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cie:Lorg/a/a/b;
 
     if-eqz v6, :cond_8
 
-    iget-object v6, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v6, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const-string v7, "RuntimeInvisibleTypeAnnotations"
 
     invoke-virtual {v6, v7}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v6, v3, Lorg/a/a/k;->ciK:Lorg/a/a/b;
+    iget-object v6, v3, Lorg/a/a/k;->cie:Lorg/a/a/b;
 
-    invoke-virtual {v6}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v6}, Lorg/a/a/b;->JC()I
 
     move-result v6
 
@@ -2089,13 +2075,13 @@
     add-int/2addr v10, v6
 
     :cond_8
-    iget-object v6, v3, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iget-object v6, v3, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
     if-eqz v6, :cond_9
 
-    iget-object v6, v3, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iget-object v6, v3, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
-    iget-object v7, v3, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v7, v3, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     invoke-virtual {v6, v7}, Lorg/a/a/c;->a(Lorg/a/a/g;)I
 
@@ -2106,14 +2092,14 @@
     :cond_9
     add-int/2addr v5, v10
 
-    iget-object v3, v3, Lorg/a/a/k;->ciF:Lorg/a/a/j;
+    iget-object v3, v3, Lorg/a/a/k;->chZ:Lorg/a/a/j;
 
     check-cast v3, Lorg/a/a/k;
 
     goto/16 :goto_1
 
     :cond_a
-    iget-object v3, p0, Lorg/a/a/g;->cii:Lorg/a/a/r;
+    iget-object v3, p0, Lorg/a/a/g;->chC:Lorg/a/a/r;
 
     move v10, v5
 
@@ -2124,28 +2110,26 @@
 
     add-int/lit8 v5, v5, 0x1
 
-    invoke-virtual {v3}, Lorg/a/a/r;->JD()I
+    invoke-virtual {v3}, Lorg/a/a/r;->JC()I
 
     move-result v11
 
     add-int/2addr v10, v11
 
-    iget-object v3, v3, Lorg/a/a/r;->cjg:Lorg/a/a/q;
+    iget-object v3, v3, Lorg/a/a/r;->ciA:Lorg/a/a/q;
 
     check-cast v3, Lorg/a/a/r;
 
     goto :goto_3
 
     :cond_b
-    iget-object v3, p0, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
     const/4 v11, 0x1
 
     if-eqz v3, :cond_c
 
-    iget-object v3, p0, Lorg/a/a/g;->cif:Lorg/a/a/d;
-
-    iget v3, v3, Lorg/a/a/d;->chr:I
+    iget v3, v3, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v3, v9
 
@@ -2163,7 +2147,7 @@
     const/4 v3, 0x0
 
     :goto_4
-    iget v12, p0, Lorg/a/a/g;->chS:I
+    iget v12, p0, Lorg/a/a/g;->chm:I
 
     if-eqz v12, :cond_d
 
@@ -2176,7 +2160,7 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_d
-    iget v12, p0, Lorg/a/a/g;->chV:I
+    iget v12, p0, Lorg/a/a/g;->chp:I
 
     if-eqz v12, :cond_e
 
@@ -2189,15 +2173,13 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_e
-    iget-object v12, p0, Lorg/a/a/g;->chW:Lorg/a/a/d;
+    iget-object v12, p0, Lorg/a/a/g;->chq:Lorg/a/a/d;
 
     if-eqz v12, :cond_f
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v12, p0, Lorg/a/a/g;->chW:Lorg/a/a/d;
-
-    iget v12, v12, Lorg/a/a/d;->chr:I
+    iget v12, v12, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v12, v12, 0x6
 
@@ -2208,7 +2190,7 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_f
-    iget v12, p0, Lorg/a/a/g;->chX:I
+    iget v12, p0, Lorg/a/a/g;->chr:I
 
     if-eqz v12, :cond_10
 
@@ -2221,9 +2203,9 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_10
-    iget v12, p0, Lorg/a/a/g;->chP:I
+    iget v12, p0, Lorg/a/a/g;->chj:I
 
-    and-int/2addr v12, v6
+    and-int/2addr v12, v7
 
     if-eqz v12, :cond_11
 
@@ -2236,19 +2218,17 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_11
-    iget v12, p0, Lorg/a/a/g;->chP:I
+    iget v12, p0, Lorg/a/a/g;->chj:I
 
-    and-int/lit16 v12, v12, 0x1000
+    and-int/lit16 v13, v12, 0x1000
 
-    if-eqz v12, :cond_13
+    if-eqz v13, :cond_13
 
-    iget v12, p0, Lorg/a/a/g;->chr:I
+    iget v13, p0, Lorg/a/a/g;->cgL:I
 
-    and-int/2addr v12, v1
+    and-int/2addr v13, v1
 
-    if-lt v12, v7, :cond_12
-
-    iget v12, p0, Lorg/a/a/g;->chP:I
+    if-lt v13, v6, :cond_12
 
     and-int/2addr v12, v8
 
@@ -2264,15 +2244,13 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_13
-    iget-object v12, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v12, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     if-eqz v12, :cond_14
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v12, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
-
-    iget v12, v12, Lorg/a/a/d;->chr:I
+    iget v12, v12, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v12, v9
 
@@ -2283,15 +2261,13 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_14
-    iget-object v12, p0, Lorg/a/a/g;->chZ:Lorg/a/a/b;
+    iget-object v12, p0, Lorg/a/a/g;->cht:Lorg/a/a/b;
 
     if-eqz v12, :cond_15
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v12, p0, Lorg/a/a/g;->chZ:Lorg/a/a/b;
-
-    invoke-virtual {v12}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v12}, Lorg/a/a/b;->JC()I
 
     move-result v12
 
@@ -2304,15 +2280,13 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_15
-    iget-object v12, p0, Lorg/a/a/g;->cia:Lorg/a/a/b;
+    iget-object v12, p0, Lorg/a/a/g;->chu:Lorg/a/a/b;
 
     if-eqz v12, :cond_16
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v12, p0, Lorg/a/a/g;->cia:Lorg/a/a/b;
-
-    invoke-virtual {v12}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v12}, Lorg/a/a/b;->JC()I
 
     move-result v12
 
@@ -2325,15 +2299,13 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_16
-    iget-object v12, p0, Lorg/a/a/g;->cib:Lorg/a/a/b;
+    iget-object v12, p0, Lorg/a/a/g;->chv:Lorg/a/a/b;
 
     if-eqz v12, :cond_17
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v12, p0, Lorg/a/a/g;->cib:Lorg/a/a/b;
-
-    invoke-virtual {v12}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v12}, Lorg/a/a/b;->JC()I
 
     move-result v12
 
@@ -2346,15 +2318,13 @@
     invoke-virtual {p0, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_17
-    iget-object v12, p0, Lorg/a/a/g;->cic:Lorg/a/a/b;
+    iget-object v12, p0, Lorg/a/a/g;->chw:Lorg/a/a/b;
 
     if-eqz v12, :cond_18
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v12, p0, Lorg/a/a/g;->cic:Lorg/a/a/b;
-
-    invoke-virtual {v12}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v12}, Lorg/a/a/b;->JC()I
 
     move-result v12
 
@@ -2367,19 +2337,17 @@
     invoke-virtual {p0, v9}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     :cond_18
-    iget-object v9, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
+    iget-object v9, p0, Lorg/a/a/g;->chx:Lorg/a/a/c;
 
     if-eqz v9, :cond_19
 
-    iget-object v9, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
-
-    invoke-virtual {v9}, Lorg/a/a/c;->JD()I
+    invoke-virtual {v9}, Lorg/a/a/c;->JC()I
 
     move-result v9
 
     add-int/2addr v3, v9
 
-    iget-object v9, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
+    iget-object v9, p0, Lorg/a/a/g;->chx:Lorg/a/a/c;
 
     invoke-virtual {v9, p0}, Lorg/a/a/c;->a(Lorg/a/a/g;)I
 
@@ -2388,9 +2356,9 @@
     add-int/2addr v10, v9
 
     :cond_19
-    iget-object v9, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v9, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
-    iget v9, v9, Lorg/a/a/d;->chr:I
+    iget v9, v9, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v10, v9
 
@@ -2404,72 +2372,70 @@
 
     move-result-object v10
 
-    iget v12, p0, Lorg/a/a/g;->chr:I
+    iget v12, p0, Lorg/a/a/g;->cgL:I
 
     invoke-virtual {v10, v12}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    iget v10, p0, Lorg/a/a/g;->chH:I
+    iget v10, p0, Lorg/a/a/g;->chb:I
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget-object v12, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v12, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
-    iget-object v12, v12, Lorg/a/a/d;->chA:[B
+    iget-object v12, v12, Lorg/a/a/d;->cgU:[B
 
-    iget-object v13, p0, Lorg/a/a/g;->cht:Lorg/a/a/d;
+    iget-object v13, p0, Lorg/a/a/g;->cgN:Lorg/a/a/d;
 
-    iget v13, v13, Lorg/a/a/d;->chr:I
+    iget v13, v13, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {v10, v12, v4, v13}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    iget v10, p0, Lorg/a/a/g;->chP:I
+    iget v10, p0, Lorg/a/a/g;->chj:I
 
-    and-int/2addr v10, v8
+    and-int v12, v10, v8
 
-    div-int/lit8 v10, v10, 0x40
+    div-int/lit8 v12, v12, 0x40
 
-    const/high16 v12, 0x60000
+    const/high16 v13, 0x60000
 
-    or-int/2addr v10, v12
+    or-int/2addr v12, v13
 
-    iget v13, p0, Lorg/a/a/g;->chP:I
+    xor-int/lit8 v12, v12, -0x1
 
-    xor-int/lit8 v10, v10, -0x1
-
-    and-int/2addr v10, v13
+    and-int/2addr v10, v12
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v13, p0, Lorg/a/a/g;->chQ:I
+    iget v12, p0, Lorg/a/a/g;->chk:I
 
-    invoke-virtual {v10, v13}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v10, v12}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v13, p0, Lorg/a/a/g;->mN:I
+    iget v12, p0, Lorg/a/a/g;->mN:I
 
-    invoke-virtual {v10, v13}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v10, v12}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget v10, p0, Lorg/a/a/g;->chT:I
+    iget v10, p0, Lorg/a/a/g;->chn:I
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     const/4 v10, 0x0
 
     :goto_5
-    iget v13, p0, Lorg/a/a/g;->chT:I
+    iget v12, p0, Lorg/a/a/g;->chn:I
 
-    if-ge v10, v13, :cond_1a
+    if-ge v10, v12, :cond_1a
 
-    iget-object v13, p0, Lorg/a/a/g;->chU:[I
+    iget-object v12, p0, Lorg/a/a/g;->cho:[I
 
-    aget v13, v13, v10
+    aget v12, v12, v10
 
-    invoke-virtual {v9, v13}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v9, v12}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     add-int/lit8 v10, v10, 0x1
 
@@ -2478,40 +2444,40 @@
     :cond_1a
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cig:Lorg/a/a/k;
+    iget-object v0, p0, Lorg/a/a/g;->chA:Lorg/a/a/k;
 
     :goto_6
     if-eqz v0, :cond_2f
 
-    iget v10, v0, Lorg/a/a/k;->chH:I
+    iget v10, v0, Lorg/a/a/k;->chb:I
 
     and-int/2addr v10, v8
 
     div-int/lit8 v10, v10, 0x40
 
-    or-int/2addr v10, v12
+    or-int/2addr v10, v13
 
-    iget v13, v0, Lorg/a/a/k;->chH:I
+    iget v12, v0, Lorg/a/a/k;->chb:I
 
     xor-int/lit8 v10, v10, -0x1
 
-    and-int/2addr v10, v13
+    and-int/2addr v10, v12
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v13, v0, Lorg/a/a/k;->chD:I
+    iget v12, v0, Lorg/a/a/k;->cgX:I
 
-    invoke-virtual {v10, v13}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v10, v12}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v13, v0, Lorg/a/a/k;->ciq:I
+    iget v12, v0, Lorg/a/a/k;->chK:I
 
-    invoke-virtual {v10, v13}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v10, v12}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget v10, v0, Lorg/a/a/k;->ciH:I
+    iget v10, v0, Lorg/a/a/k;->cib:I
 
     if-eqz v10, :cond_1b
 
@@ -2523,98 +2489,98 @@
     const/4 v10, 0x0
 
     :goto_7
-    iget v13, v0, Lorg/a/a/k;->chH:I
+    iget v12, v0, Lorg/a/a/k;->chb:I
 
-    and-int/lit16 v13, v13, 0x1000
+    and-int/lit16 v12, v12, 0x1000
 
-    if-eqz v13, :cond_1d
+    if-eqz v12, :cond_1d
 
-    iget-object v13, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v12, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    iget v13, v13, Lorg/a/a/g;->chr:I
+    iget v12, v12, Lorg/a/a/g;->cgL:I
 
-    and-int/2addr v13, v1
+    and-int/2addr v12, v1
 
-    if-lt v13, v7, :cond_1c
+    if-lt v12, v6, :cond_1c
 
-    iget v13, v0, Lorg/a/a/k;->chH:I
+    iget v12, v0, Lorg/a/a/k;->chb:I
 
-    and-int/2addr v13, v8
+    and-int/2addr v12, v8
 
-    if-eqz v13, :cond_1d
+    if-eqz v12, :cond_1d
 
     :cond_1c
     add-int/lit8 v10, v10, 0x1
 
     :cond_1d
-    iget v13, v0, Lorg/a/a/k;->chH:I
+    iget v12, v0, Lorg/a/a/k;->chb:I
 
-    and-int/2addr v13, v6
+    and-int/2addr v12, v7
 
-    if-eqz v13, :cond_1e
+    if-eqz v12, :cond_1e
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_1e
-    iget v13, v0, Lorg/a/a/k;->chv:I
+    iget v12, v0, Lorg/a/a/k;->cgP:I
 
-    if-eqz v13, :cond_1f
+    if-eqz v12, :cond_1f
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_1f
-    iget-object v13, v0, Lorg/a/a/k;->chx:Lorg/a/a/b;
+    iget-object v12, v0, Lorg/a/a/k;->cgR:Lorg/a/a/b;
 
-    if-eqz v13, :cond_20
+    if-eqz v12, :cond_20
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_20
-    iget-object v13, v0, Lorg/a/a/k;->ciI:Lorg/a/a/b;
+    iget-object v12, v0, Lorg/a/a/k;->cic:Lorg/a/a/b;
 
-    if-eqz v13, :cond_21
+    if-eqz v12, :cond_21
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_21
-    iget-object v13, v0, Lorg/a/a/k;->ciJ:Lorg/a/a/b;
+    iget-object v12, v0, Lorg/a/a/k;->cid:Lorg/a/a/b;
 
-    if-eqz v13, :cond_22
+    if-eqz v12, :cond_22
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_22
-    iget-object v13, v0, Lorg/a/a/k;->ciK:Lorg/a/a/b;
+    iget-object v12, v0, Lorg/a/a/k;->cie:Lorg/a/a/b;
 
-    if-eqz v13, :cond_23
+    if-eqz v12, :cond_23
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_23
-    iget-object v13, v0, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iget-object v12, v0, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
-    if-eqz v13, :cond_24
+    if-eqz v12, :cond_24
 
-    iget-object v13, v0, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iget-object v12, v0, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
-    invoke-virtual {v13}, Lorg/a/a/c;->JD()I
+    invoke-virtual {v12}, Lorg/a/a/c;->JC()I
 
-    move-result v13
+    move-result v12
 
-    add-int/2addr v10, v13
+    add-int/2addr v10, v12
 
     :cond_24
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget v10, v0, Lorg/a/a/k;->ciH:I
+    iget v10, v0, Lorg/a/a/k;->cib:I
 
     if-eqz v10, :cond_25
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "ConstantValue"
+    const-string v12, "ConstantValue"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
@@ -2624,37 +2590,37 @@
 
     move-result-object v10
 
-    iget v13, v0, Lorg/a/a/k;->ciH:I
+    iget v12, v0, Lorg/a/a/k;->cib:I
 
-    invoke-virtual {v10, v13}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v10, v12}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_25
-    iget v10, v0, Lorg/a/a/k;->chH:I
+    iget v10, v0, Lorg/a/a/k;->chb:I
 
     and-int/lit16 v10, v10, 0x1000
 
     if-eqz v10, :cond_27
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    iget v10, v10, Lorg/a/a/g;->chr:I
+    iget v10, v10, Lorg/a/a/g;->cgL:I
 
     and-int/2addr v10, v1
 
-    if-lt v10, v7, :cond_26
+    if-lt v10, v6, :cond_26
 
-    iget v10, v0, Lorg/a/a/k;->chH:I
+    iget v10, v0, Lorg/a/a/k;->chb:I
 
     and-int/2addr v10, v8
 
     if-eqz v10, :cond_27
 
     :cond_26
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "Synthetic"
+    const-string v12, "Synthetic"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
@@ -2665,17 +2631,17 @@
     invoke-virtual {v10, v4}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     :cond_27
-    iget v10, v0, Lorg/a/a/k;->chH:I
+    iget v10, v0, Lorg/a/a/k;->chb:I
 
-    and-int/2addr v10, v6
+    and-int/2addr v10, v7
 
     if-eqz v10, :cond_28
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "Deprecated"
+    const-string v12, "Deprecated"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
@@ -2686,15 +2652,15 @@
     invoke-virtual {v10, v4}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     :cond_28
-    iget v10, v0, Lorg/a/a/k;->chv:I
+    iget v10, v0, Lorg/a/a/k;->cgP:I
 
     if-eqz v10, :cond_29
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "Signature"
+    const-string v12, "Signature"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
@@ -2704,99 +2670,99 @@
 
     move-result-object v10
 
-    iget v13, v0, Lorg/a/a/k;->chv:I
+    iget v12, v0, Lorg/a/a/k;->cgP:I
 
-    invoke-virtual {v10, v13}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v10, v12}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_29
-    iget-object v10, v0, Lorg/a/a/k;->chx:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cgR:Lorg/a/a/b;
 
     if-eqz v10, :cond_2a
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "RuntimeVisibleAnnotations"
+    const-string v12, "RuntimeVisibleAnnotations"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v10, v0, Lorg/a/a/k;->chx:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cgR:Lorg/a/a/b;
 
     invoke-virtual {v10, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_2a
-    iget-object v10, v0, Lorg/a/a/k;->ciI:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cic:Lorg/a/a/b;
 
     if-eqz v10, :cond_2b
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "RuntimeInvisibleAnnotations"
+    const-string v12, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v10, v0, Lorg/a/a/k;->ciI:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cic:Lorg/a/a/b;
 
     invoke-virtual {v10, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_2b
-    iget-object v10, v0, Lorg/a/a/k;->ciJ:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cid:Lorg/a/a/b;
 
     if-eqz v10, :cond_2c
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "RuntimeVisibleTypeAnnotations"
+    const-string v12, "RuntimeVisibleTypeAnnotations"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v10, v0, Lorg/a/a/k;->ciJ:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cid:Lorg/a/a/b;
 
     invoke-virtual {v10, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_2c
-    iget-object v10, v0, Lorg/a/a/k;->ciK:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cie:Lorg/a/a/b;
 
     if-eqz v10, :cond_2d
 
-    iget-object v10, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    const-string v13, "RuntimeInvisibleTypeAnnotations"
+    const-string v12, "RuntimeInvisibleTypeAnnotations"
 
-    invoke-virtual {v10, v13}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v9, v10}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v10, v0, Lorg/a/a/k;->ciK:Lorg/a/a/b;
+    iget-object v10, v0, Lorg/a/a/k;->cie:Lorg/a/a/b;
 
     invoke-virtual {v10, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_2d
-    iget-object v10, v0, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iget-object v10, v0, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
     if-eqz v10, :cond_2e
 
-    iget-object v10, v0, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iget-object v10, v0, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
-    iget-object v13, v0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v12, v0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    invoke-virtual {v10, v13, v9}, Lorg/a/a/c;->a(Lorg/a/a/g;Lorg/a/a/d;)V
+    invoke-virtual {v10, v12, v9}, Lorg/a/a/c;->a(Lorg/a/a/g;Lorg/a/a/d;)V
 
     :cond_2e
-    iget-object v0, v0, Lorg/a/a/k;->ciF:Lorg/a/a/j;
+    iget-object v0, v0, Lorg/a/a/k;->chZ:Lorg/a/a/j;
 
     check-cast v0, Lorg/a/a/k;
 
@@ -2805,14 +2771,14 @@
     :cond_2f
     invoke-virtual {v9, v5}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cii:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/g;->chC:Lorg/a/a/r;
 
     :goto_8
     if-eqz v0, :cond_30
 
     invoke-virtual {v0, v9}, Lorg/a/a/r;->a(Lorg/a/a/d;)V
 
-    iget-object v0, v0, Lorg/a/a/r;->cjg:Lorg/a/a/q;
+    iget-object v0, v0, Lorg/a/a/r;->ciA:Lorg/a/a/q;
 
     check-cast v0, Lorg/a/a/r;
 
@@ -2821,7 +2787,7 @@
     :cond_30
     invoke-virtual {v9, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
     if-eqz v0, :cond_31
 
@@ -2833,9 +2799,9 @@
 
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, v2
 
@@ -2847,18 +2813,18 @@
 
     invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v3, p0, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
-    iget v3, v3, Lorg/a/a/d;->chr:I
+    iget v3, v3, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {v9, v0, v4, v3}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_31
-    iget v0, p0, Lorg/a/a/g;->chS:I
+    iget v0, p0, Lorg/a/a/g;->chm:I
 
     if-eqz v0, :cond_32
 
@@ -2876,12 +2842,12 @@
 
     move-result-object v0
 
-    iget v3, p0, Lorg/a/a/g;->chS:I
+    iget v3, p0, Lorg/a/a/g;->chm:I
 
     invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_32
-    iget v0, p0, Lorg/a/a/g;->chV:I
+    iget v0, p0, Lorg/a/a/g;->chp:I
 
     if-eqz v0, :cond_33
 
@@ -2899,18 +2865,16 @@
 
     move-result-object v0
 
-    iget v3, p0, Lorg/a/a/g;->chV:I
+    iget v3, p0, Lorg/a/a/g;->chp:I
 
     invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_33
-    iget-object v0, p0, Lorg/a/a/g;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chq:Lorg/a/a/d;
 
     if-eqz v0, :cond_34
 
-    iget-object v0, p0, Lorg/a/a/g;->chW:Lorg/a/a/d;
-
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     const-string v3, "SourceDebugExtension"
 
@@ -2924,14 +2888,14 @@
 
     invoke-virtual {v3, v0}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    iget-object v3, p0, Lorg/a/a/g;->chW:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/g;->chq:Lorg/a/a/d;
 
-    iget-object v3, v3, Lorg/a/a/d;->chA:[B
+    iget-object v3, v3, Lorg/a/a/d;->cgU:[B
 
     invoke-virtual {v9, v3, v4, v0}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_34
-    iget v0, p0, Lorg/a/a/g;->chX:I
+    iget v0, p0, Lorg/a/a/g;->chr:I
 
     if-eqz v0, :cond_35
 
@@ -2949,20 +2913,20 @@
 
     invoke-virtual {v0, v3}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    iget v0, p0, Lorg/a/a/g;->chX:I
+    iget v0, p0, Lorg/a/a/g;->chr:I
 
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget v3, p0, Lorg/a/a/g;->chY:I
+    iget v3, p0, Lorg/a/a/g;->chs:I
 
     invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_35
-    iget v0, p0, Lorg/a/a/g;->chP:I
+    iget v0, p0, Lorg/a/a/g;->chj:I
 
-    and-int/2addr v0, v6
+    and-int/2addr v0, v7
 
     if-eqz v0, :cond_36
 
@@ -2979,19 +2943,17 @@
     invoke-virtual {v0, v4}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     :cond_36
-    iget v0, p0, Lorg/a/a/g;->chP:I
+    iget v0, p0, Lorg/a/a/g;->chj:I
 
-    and-int/lit16 v0, v0, 0x1000
+    and-int/lit16 v3, v0, 0x1000
 
-    if-eqz v0, :cond_38
+    if-eqz v3, :cond_38
 
-    iget v0, p0, Lorg/a/a/g;->chr:I
+    iget v3, p0, Lorg/a/a/g;->cgL:I
 
-    and-int/2addr v0, v1
+    and-int/2addr v1, v3
 
-    if-lt v0, v7, :cond_37
-
-    iget v0, p0, Lorg/a/a/g;->chP:I
+    if-lt v1, v6, :cond_37
 
     and-int/2addr v0, v8
 
@@ -3011,7 +2973,7 @@
     invoke-virtual {v0, v4}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     :cond_38
-    iget-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     if-eqz v0, :cond_39
 
@@ -3023,9 +2985,9 @@
 
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, v2
 
@@ -3037,18 +2999,18 @@
 
     invoke-virtual {v0, v1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v1, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {v9, v0, v4, v1}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_39
-    iget-object v0, p0, Lorg/a/a/g;->chZ:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/b;
 
     if-eqz v0, :cond_3a
 
@@ -3060,12 +3022,12 @@
 
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->chZ:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/b;
 
     invoke-virtual {v0, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_3a
-    iget-object v0, p0, Lorg/a/a/g;->cia:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->chu:Lorg/a/a/b;
 
     if-eqz v0, :cond_3b
 
@@ -3077,12 +3039,12 @@
 
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cia:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->chu:Lorg/a/a/b;
 
     invoke-virtual {v0, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_3b
-    iget-object v0, p0, Lorg/a/a/g;->cib:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->chv:Lorg/a/a/b;
 
     if-eqz v0, :cond_3c
 
@@ -3094,12 +3056,12 @@
 
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cib:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->chv:Lorg/a/a/b;
 
     invoke-virtual {v0, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_3c
-    iget-object v0, p0, Lorg/a/a/g;->cic:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->chw:Lorg/a/a/b;
 
     if-eqz v0, :cond_3d
 
@@ -3111,57 +3073,55 @@
 
     invoke-virtual {v9, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/g;->cic:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/g;->chw:Lorg/a/a/b;
 
     invoke-virtual {v0, v9}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_3d
-    iget-object v0, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/g;->chx:Lorg/a/a/c;
 
     if-eqz v0, :cond_3e
 
-    iget-object v0, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
-
     invoke-virtual {v0, p0, v9}, Lorg/a/a/c;->a(Lorg/a/a/g;Lorg/a/a/d;)V
 
     :cond_3e
-    iget-boolean v0, p0, Lorg/a/a/g;->cim:Z
+    iget-boolean v0, p0, Lorg/a/a/g;->chG:Z
 
     if-eqz v0, :cond_3f
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lorg/a/a/g;->chZ:Lorg/a/a/b;
+    iput-object v0, p0, Lorg/a/a/g;->cht:Lorg/a/a/b;
 
-    iput-object v0, p0, Lorg/a/a/g;->cia:Lorg/a/a/b;
+    iput-object v0, p0, Lorg/a/a/g;->chu:Lorg/a/a/b;
 
-    iput-object v0, p0, Lorg/a/a/g;->cid:Lorg/a/a/c;
+    iput-object v0, p0, Lorg/a/a/g;->chx:Lorg/a/a/c;
 
     iput v4, p0, Lorg/a/a/g;->x:I
 
-    iput-object v0, p0, Lorg/a/a/g;->cie:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/g;->chy:Lorg/a/a/d;
 
     iput v4, p0, Lorg/a/a/g;->z:I
 
-    iput-object v0, p0, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
-    iput-object v0, p0, Lorg/a/a/g;->cig:Lorg/a/a/k;
+    iput-object v0, p0, Lorg/a/a/g;->chA:Lorg/a/a/k;
 
-    iput-object v0, p0, Lorg/a/a/g;->cih:Lorg/a/a/k;
+    iput-object v0, p0, Lorg/a/a/g;->chB:Lorg/a/a/k;
 
-    iput-object v0, p0, Lorg/a/a/g;->cii:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/g;->chC:Lorg/a/a/r;
 
-    iput-object v0, p0, Lorg/a/a/g;->cij:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/g;->chD:Lorg/a/a/r;
 
-    iput-boolean v4, p0, Lorg/a/a/g;->cik:Z
+    iput-boolean v4, p0, Lorg/a/a/g;->chE:Z
 
-    iput-boolean v11, p0, Lorg/a/a/g;->cil:Z
+    iput-boolean v11, p0, Lorg/a/a/g;->chF:Z
 
-    iput-boolean v4, p0, Lorg/a/a/g;->cim:Z
+    iput-boolean v4, p0, Lorg/a/a/g;->chG:Z
 
     new-instance v0, Lorg/a/a/e;
 
-    iget-object v1, v9, Lorg/a/a/d;->chA:[B
+    iget-object v1, v9, Lorg/a/a/d;->cgU:[B
 
     invoke-direct {v0, v1}, Lorg/a/a/e;-><init>([B)V
 
@@ -3170,7 +3130,7 @@
     goto/16 :goto_0
 
     :cond_3f
-    iget-object v0, v9, Lorg/a/a/d;->chA:[B
+    iget-object v0, v9, Lorg/a/a/d;->cgU:[B
 
     return-object v0
 
@@ -3182,4 +3142,6 @@
     invoke-direct {v0, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/h.smali b/com.discord/smali_classes2/org/a/a/h.smali
index 5ca0abb700..e3160186d3 100644
--- a/com.discord/smali_classes2/org/a/a/h.smali
+++ b/com.discord/smali_classes2/org/a/a/h.smali
@@ -3,45 +3,45 @@
 
 
 # instance fields
-.field bTR:I
+.field bTx:I
+
+.field cgL:I
+
+.field chH:[Lorg/a/a/c;
+
+.field chI:[C
+
+.field chJ:[I
+
+.field chK:I
+
+.field chL:Ljava/lang/String;
+
+.field chM:Ljava/lang/String;
+
+.field chN:[Lorg/a/a/p;
+
+.field chO:Lorg/a/a/u;
+
+.field chP:[Lorg/a/a/p;
+
+.field chQ:[Lorg/a/a/p;
+
+.field chR:[I
+
+.field chS:I
 
 .field chT:I
 
-.field chV:I
+.field chU:[Ljava/lang/Object;
 
-.field chY:I
+.field chV:[Ljava/lang/Object;
 
-.field chr:I
+.field chn:I
 
-.field ciA:[Ljava/lang/Object;
+.field chp:I
 
-.field ciB:[Ljava/lang/Object;
-
-.field cin:[Lorg/a/a/c;
-
-.field cio:[C
-
-.field cip:[I
-
-.field ciq:I
-
-.field cir:Ljava/lang/String;
-
-.field cis:Ljava/lang/String;
-
-.field cit:[Lorg/a/a/p;
-
-.field ciu:Lorg/a/a/u;
-
-.field civ:[Lorg/a/a/p;
-
-.field ciw:[Lorg/a/a/p;
-
-.field cix:[I
-
-.field ciy:I
-
-.field ciz:I
+.field chs:I
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/a/a/i.smali b/com.discord/smali_classes2/org/a/a/i.smali
index ebe94e411f..f7b02b54a7 100644
--- a/com.discord/smali_classes2/org/a/a/i.smali
+++ b/com.discord/smali_classes2/org/a/a/i.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field ciC:I
+.field chW:I
 
-.field ciD:Lorg/a/a/p;
+.field chX:Lorg/a/a/p;
 
-.field ciE:Lorg/a/a/i;
+.field chY:Lorg/a/a/i;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/a/a/j.smali b/com.discord/smali_classes2/org/a/a/j.smali
index 579853f2f2..70a3fce233 100644
--- a/com.discord/smali_classes2/org/a/a/j.smali
+++ b/com.discord/smali_classes2/org/a/a/j.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field protected final cho:I
+.field protected final cgI:I
 
-.field protected ciF:Lorg/a/a/j;
+.field protected chZ:Lorg/a/a/j;
 
 
 # direct methods
@@ -26,11 +26,11 @@
 
     const/high16 p1, 0x50000
 
-    iput p1, p0, Lorg/a/a/j;->cho:I
+    iput p1, p0, Lorg/a/a/j;->cgI:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/j;->ciF:Lorg/a/a/j;
+    iput-object p1, p0, Lorg/a/a/j;->chZ:Lorg/a/a/j;
 
     return-void
 .end method
@@ -40,18 +40,16 @@
 .method public a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/j;->cho:I
+    iget v0, p0, Lorg/a/a/j;->cgI:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/j;->ciF:Lorg/a/a/j;
+    iget-object v0, p0, Lorg/a/a/j;->chZ:Lorg/a/a/j;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/j;->ciF:Lorg/a/a/j;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/j;->a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -74,12 +72,10 @@
 .method public a(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/j;->ciF:Lorg/a/a/j;
+    iget-object v0, p0, Lorg/a/a/j;->chZ:Lorg/a/a/j;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/j;->ciF:Lorg/a/a/j;
-
     invoke-virtual {v0, p1}, Lorg/a/a/j;->a(Lorg/a/a/c;)V
 
     :cond_0
@@ -89,12 +85,10 @@
 .method public k(Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/j;->ciF:Lorg/a/a/j;
+    iget-object v0, p0, Lorg/a/a/j;->chZ:Lorg/a/a/j;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/j;->ciF:Lorg/a/a/j;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/j;->k(Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
diff --git a/com.discord/smali_classes2/org/a/a/k.smali b/com.discord/smali_classes2/org/a/a/k.smali
index 30c1c1fb80..b66cfd0398 100644
--- a/com.discord/smali_classes2/org/a/a/k.smali
+++ b/com.discord/smali_classes2/org/a/a/k.smali
@@ -3,27 +3,27 @@
 
 
 # instance fields
-.field final chD:I
+.field cgP:I
 
-.field final chH:I
+.field cgR:Lorg/a/a/b;
 
-.field chv:I
+.field final cgX:I
 
-.field chx:Lorg/a/a/b;
+.field final chK:I
 
-.field final ciG:Lorg/a/a/g;
+.field final chb:I
 
-.field ciH:I
+.field final cia:Lorg/a/a/g;
 
-.field ciI:Lorg/a/a/b;
+.field cib:I
 
-.field ciJ:Lorg/a/a/b;
+.field cic:Lorg/a/a/b;
 
-.field ciK:Lorg/a/a/b;
+.field cid:Lorg/a/a/b;
 
-.field ciL:Lorg/a/a/c;
+.field cie:Lorg/a/a/b;
 
-.field final ciq:I
+.field cif:Lorg/a/a/c;
 
 
 # direct methods
@@ -32,37 +32,37 @@
 
     invoke-direct {p0}, Lorg/a/a/j;-><init>()V
 
-    iget-object v0, p1, Lorg/a/a/g;->cig:Lorg/a/a/k;
+    iget-object v0, p1, Lorg/a/a/g;->chA:Lorg/a/a/k;
 
     if-nez v0, :cond_0
 
-    iput-object p0, p1, Lorg/a/a/g;->cig:Lorg/a/a/k;
+    iput-object p0, p1, Lorg/a/a/g;->chA:Lorg/a/a/k;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lorg/a/a/g;->cih:Lorg/a/a/k;
+    iget-object v0, p1, Lorg/a/a/g;->chB:Lorg/a/a/k;
 
-    iput-object p0, v0, Lorg/a/a/k;->ciF:Lorg/a/a/j;
+    iput-object p0, v0, Lorg/a/a/k;->chZ:Lorg/a/a/j;
 
     :goto_0
-    iput-object p0, p1, Lorg/a/a/g;->cih:Lorg/a/a/k;
+    iput-object p0, p1, Lorg/a/a/g;->chB:Lorg/a/a/k;
 
-    iput-object p1, p0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iput-object p1, p0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    iput p2, p0, Lorg/a/a/k;->chH:I
+    iput p2, p0, Lorg/a/a/k;->chb:I
 
     invoke-virtual {p1, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/k;->chD:I
+    iput p2, p0, Lorg/a/a/k;->cgX:I
 
     invoke-virtual {p1, p4}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/k;->ciq:I
+    iput p2, p0, Lorg/a/a/k;->chK:I
 
     if-eqz p5, :cond_1
 
@@ -70,7 +70,7 @@
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/k;->chv:I
+    iput p2, p0, Lorg/a/a/k;->cgP:I
 
     :cond_1
     if-eqz p6, :cond_2
@@ -79,9 +79,9 @@
 
     move-result-object p1
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
-    iput p1, p0, Lorg/a/a/k;->ciH:I
+    iput p1, p0, Lorg/a/a/k;->cib:I
 
     :cond_2
     return-void
@@ -98,7 +98,7 @@
 
     invoke-static {p1, p2, v4}, Lorg/a/a/b;->a(ILorg/a/a/u;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object p1, p0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     invoke-virtual {p1, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -114,9 +114,9 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
-    iget p2, v4, Lorg/a/a/d;->chr:I
+    iget p2, v4, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v5, p2, -0x2
 
@@ -130,20 +130,20 @@
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/k;->ciJ:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/k;->cid:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/k;->ciJ:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/k;->cid:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/k;->ciK:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/k;->cie:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/k;->ciK:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/k;->cie:Lorg/a/a/b;
 
     :goto_0
     return-object p1
@@ -152,11 +152,11 @@
 .method public final a(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/k;->ciL:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/k;->cif:Lorg/a/a/c;
 
     return-void
 .end method
@@ -168,7 +168,7 @@
 
     invoke-direct {v4}, Lorg/a/a/d;-><init>()V
 
-    iget-object v0, p0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -184,7 +184,7 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/k;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/k;->cia:Lorg/a/a/g;
 
     const/4 v2, 0x1
 
@@ -198,20 +198,20 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/k;->chx:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/k;->cgR:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/k;->chx:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/k;->cgR:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/k;->ciI:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/k;->cic:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/k;->ciI:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/k;->cic:Lorg/a/a/b;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali_classes2/org/a/a/l.smali b/com.discord/smali_classes2/org/a/a/l.smali
index 483fccd842..35d7cfb2f7 100644
--- a/com.discord/smali_classes2/org/a/a/l.smali
+++ b/com.discord/smali_classes2/org/a/a/l.smali
@@ -3,25 +3,25 @@
 
 
 # static fields
-.field static final chB:[I
+.field static final cgV:[I
 
 
 # instance fields
-.field ciD:Lorg/a/a/p;
+.field chJ:[I
 
-.field ciH:I
+.field chX:Lorg/a/a/p;
 
-.field ciM:[I
+.field cib:I
 
-.field ciN:[I
+.field cig:[I
 
-.field ciO:[I
+.field cih:[I
 
-.field private ciP:I
+.field cii:[I
 
-.field ciQ:[I
+.field private cij:I
 
-.field cip:[I
+.field cik:[I
 
 
 # direct methods
@@ -52,7 +52,7 @@
     goto :goto_0
 
     :cond_0
-    sput-object v1, Lorg/a/a/l;->chB:[I
+    sput-object v1, Lorg/a/a/l;->cgV:[I
 
     return-void
 .end method
@@ -65,35 +65,33 @@
     return-void
 .end method
 
-.method private JD()I
+.method private JC()I
     .locals 3
 
-    iget v0, p0, Lorg/a/a/l;->ciH:I
+    iget v0, p0, Lorg/a/a/l;->cib:I
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/l;->ciO:[I
+    iget-object v1, p0, Lorg/a/a/l;->cii:[I
 
-    iget v1, p0, Lorg/a/a/l;->ciH:I
+    add-int/lit8 v0, v0, -0x1
 
-    add-int/lit8 v1, v1, -0x1
+    iput v0, p0, Lorg/a/a/l;->cib:I
 
-    iput v1, p0, Lorg/a/a/l;->ciH:I
-
-    aget v0, v0, v1
+    aget v0, v1, v0
 
     return v0
 
     :cond_0
     const/high16 v0, 0x3000000
 
-    iget-object v1, p0, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iget v2, v1, Lorg/a/a/p;->chv:I
+    iget v2, v1, Lorg/a/a/p;->cgP:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, v1, Lorg/a/a/p;->chv:I
+    iput v2, v1, Lorg/a/a/p;->cgP:I
 
     neg-int v1, v2
 
@@ -228,13 +226,13 @@
 
     and-int/2addr v4, v0
 
-    iget-object v5, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v5, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     const/16 v6, 0x20
 
-    iput v6, v5, Lorg/a/a/o;->chr:I
+    iput v6, v5, Lorg/a/a/o;->cgL:I
 
-    iget-object v5, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v5, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     int-to-long v7, p1
 
@@ -244,9 +242,9 @@
 
     or-long/2addr v7, v9
 
-    iput-wide v7, v5, Lorg/a/a/o;->ciX:J
+    iput-wide v7, v5, Lorg/a/a/o;->cir:J
 
-    iget-object v5, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v5, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     const v6, 0x7fffffff
 
@@ -256,9 +254,9 @@
 
     and-int/2addr v6, v7
 
-    iput v6, v5, Lorg/a/a/o;->cja:I
+    iput v6, v5, Lorg/a/a/o;->ciu:I
 
-    iget-object v5, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v5, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-virtual {p0, v5}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -266,19 +264,19 @@
 
     if-nez v5, :cond_8
 
-    iget-object v5, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v5, p0, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     aget-object p1, v5, p1
 
-    iget-object p1, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iget-object v5, p0, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v5, p0, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     aget-object v4, v5, v4
 
-    iget-object v4, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v4, v4, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iget-object v5, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object v5, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-virtual {p0, p1, v4}, Lorg/a/a/g;->av(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -288,18 +286,18 @@
 
     move-result p1
 
-    iput p1, v5, Lorg/a/a/o;->chH:I
+    iput p1, v5, Lorg/a/a/o;->chb:I
 
     new-instance v5, Lorg/a/a/o;
 
-    iget-object p1, p0, Lorg/a/a/g;->chK:Lorg/a/a/o;
+    iget-object p1, p0, Lorg/a/a/g;->che:Lorg/a/a/o;
 
     invoke-direct {v5, v1, p1}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
     invoke-virtual {p0, v5}, Lorg/a/a/g;->b(Lorg/a/a/o;)V
 
     :cond_8
-    iget p0, v5, Lorg/a/a/o;->chH:I
+    iget p0, v5, Lorg/a/a/o;->chb:I
 
     or-int v6, v3, p0
 
@@ -386,7 +384,7 @@
 .method private az(II)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/l;->ciN:[I
+    iget-object v0, p0, Lorg/a/a/l;->cih:[I
 
     if-nez v0, :cond_0
 
@@ -394,10 +392,10 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/l;->ciN:[I
+    iput-object v0, p0, Lorg/a/a/l;->cih:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/l;->ciN:[I
+    iget-object v0, p0, Lorg/a/a/l;->cih:[I
 
     array-length v0, v0
 
@@ -413,16 +411,16 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/l;->ciN:[I
+    iget-object v2, p0, Lorg/a/a/l;->cih:[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/l;->ciN:[I
+    iput-object v1, p0, Lorg/a/a/l;->cih:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/l;->ciN:[I
+    iget-object v0, p0, Lorg/a/a/l;->cih:[I
 
     aput p2, v0, p1
 
@@ -704,39 +702,31 @@
 .end method
 
 .method private fL(I)I
-    .locals 2
+    .locals 3
 
-    iget-object v0, p0, Lorg/a/a/l;->ciN:[I
+    iget-object v0, p0, Lorg/a/a/l;->cih:[I
 
     const/high16 v1, 0x2000000
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lorg/a/a/l;->ciN:[I
+    array-length v2, v0
 
-    array-length v0, v0
-
-    if-lt p1, v0, :cond_0
+    if-lt p1, v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/l;->ciN:[I
+    aget v2, v0, p1
 
-    aget v0, v0, p1
+    if-nez v2, :cond_1
 
-    if-nez v0, :cond_1
+    or-int v2, p1, v1
 
-    iget-object v0, p0, Lorg/a/a/l;->ciN:[I
-
-    or-int/2addr v1, p1
-
-    aput v1, v0, p1
-
-    move v0, v1
+    aput v2, v0, p1
 
     :cond_1
-    return v0
+    return v2
 
     :cond_2
     :goto_0
@@ -748,7 +738,7 @@
 .method private fM(I)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/l;->ciO:[I
+    iget-object v0, p0, Lorg/a/a/l;->cii:[I
 
     if-nez v0, :cond_0
 
@@ -756,19 +746,17 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/l;->ciO:[I
+    iput-object v0, p0, Lorg/a/a/l;->cii:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/l;->ciO:[I
+    iget-object v0, p0, Lorg/a/a/l;->cii:[I
 
     array-length v0, v0
 
-    iget v1, p0, Lorg/a/a/l;->ciH:I
+    iget v1, p0, Lorg/a/a/l;->cib:I
 
     if-lt v1, v0, :cond_1
 
-    iget v1, p0, Lorg/a/a/l;->ciH:I
-
     add-int/lit8 v1, v1, 0x1
 
     mul-int/lit8 v2, v0, 0x2
@@ -779,42 +767,42 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/l;->ciO:[I
+    iget-object v2, p0, Lorg/a/a/l;->cii:[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/l;->ciO:[I
+    iput-object v1, p0, Lorg/a/a/l;->cii:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/l;->ciO:[I
+    iget-object v0, p0, Lorg/a/a/l;->cii:[I
 
-    iget v1, p0, Lorg/a/a/l;->ciH:I
+    iget v1, p0, Lorg/a/a/l;->cib:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/a/a/l;->ciH:I
+    iput v2, p0, Lorg/a/a/l;->cib:I
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object p1, p0, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iget p1, p1, Lorg/a/a/p;->chv:I
+    iget p1, p1, Lorg/a/a/p;->cgP:I
 
-    iget v0, p0, Lorg/a/a/l;->ciH:I
+    iget v0, p0, Lorg/a/a/l;->cib:I
 
     add-int/2addr p1, v0
 
-    iget-object v0, p0, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iget v0, v0, Lorg/a/a/p;->ciH:I
+    iget v0, v0, Lorg/a/a/p;->cib:I
 
     if-le p1, v0, :cond_2
 
-    iget-object v0, p0, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iput p1, v0, Lorg/a/a/p;->ciH:I
+    iput p1, v0, Lorg/a/a/p;->cib:I
 
     :cond_2
     return-void
@@ -823,34 +811,32 @@
 .method private fN(I)V
     .locals 3
 
-    iget v0, p0, Lorg/a/a/l;->ciH:I
+    iget v0, p0, Lorg/a/a/l;->cib:I
 
     if-lt v0, p1, :cond_0
 
-    iget v0, p0, Lorg/a/a/l;->ciH:I
-
     sub-int/2addr v0, p1
 
-    iput v0, p0, Lorg/a/a/l;->ciH:I
+    iput v0, p0, Lorg/a/a/l;->cib:I
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iget v1, v0, Lorg/a/a/p;->chv:I
+    iget v1, v0, Lorg/a/a/p;->cgP:I
 
-    iget v2, p0, Lorg/a/a/l;->ciH:I
+    iget v2, p0, Lorg/a/a/l;->cib:I
 
     sub-int/2addr p1, v2
 
     sub-int/2addr v1, p1
 
-    iput v1, v0, Lorg/a/a/p;->chv:I
+    iput v1, v0, Lorg/a/a/p;->cgP:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lorg/a/a/l;->ciH:I
+    iput p1, p0, Lorg/a/a/l;->cib:I
 
     return-void
 .end method
@@ -866,7 +852,7 @@
 
     if-ne p2, v1, :cond_0
 
-    iget-object v1, p1, Lorg/a/a/g;->chR:Ljava/lang/String;
+    iget-object v1, p1, Lorg/a/a/g;->chl:Ljava/lang/String;
 
     :goto_0
     invoke-virtual {p1, v1}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
@@ -886,7 +872,7 @@
 
     if-ne v1, v2, :cond_4
 
-    iget-object v1, p1, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v1, p1, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     const v2, 0xfffff
 
@@ -894,7 +880,7 @@
 
     aget-object v1, v1, v2
 
-    iget-object v1, v1, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v1, v1, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     goto :goto_0
 
@@ -902,11 +888,11 @@
     const/4 v0, 0x0
 
     :goto_2
-    iget v1, p0, Lorg/a/a/l;->ciP:I
+    iget v1, p0, Lorg/a/a/l;->cij:I
 
     if-ge v0, v1, :cond_4
 
-    iget-object v1, p0, Lorg/a/a/l;->ciQ:[I
+    iget-object v1, p0, Lorg/a/a/l;->cik:[I
 
     aget v1, v1, v0
 
@@ -924,7 +910,7 @@
 
     if-ne v3, v4, :cond_1
 
-    iget-object v3, p0, Lorg/a/a/l;->ciM:[I
+    iget-object v3, p0, Lorg/a/a/l;->cig:[I
 
     and-int/2addr v1, v5
 
@@ -940,11 +926,9 @@
 
     if-ne v3, v4, :cond_2
 
-    iget-object v3, p0, Lorg/a/a/l;->cip:[I
+    iget-object v3, p0, Lorg/a/a/l;->chJ:[I
 
-    iget-object v4, p0, Lorg/a/a/l;->cip:[I
-
-    array-length v4, v4
+    array-length v4, v3
 
     and-int/2addr v1, v5
 
@@ -1020,16 +1004,16 @@
 
     invoke-direct {v0, v2}, Lorg/a/a/l;->fN(I)V
 
-    iget-object v1, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-direct {v0, v3, v1}, Lorg/a/a/l;->a(Lorg/a/a/g;Ljava/lang/String;)V
 
     goto/16 :goto_2
 
     :pswitch_0
-    iget-object v1, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     invoke-virtual {v1, v12}, Ljava/lang/String;->charAt(I)C
 
@@ -1053,9 +1037,9 @@
     return-void
 
     :pswitch_1
-    iget-object v1, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     invoke-virtual {v1, v12}, Ljava/lang/String;->charAt(I)C
 
@@ -1091,7 +1075,7 @@
     return-void
 
     :pswitch_2
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     packed-switch v2, :pswitch_data_5
 
@@ -1153,7 +1137,7 @@
     :pswitch_a
     const/high16 v1, 0x1800000
 
-    iget-object v4, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v4, v4, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {v3, v4, v2}, Lorg/a/a/g;->m(Ljava/lang/String;I)I
 
@@ -1166,18 +1150,18 @@
     return-void
 
     :pswitch_b
-    iget-object v1, v4, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     invoke-direct {v0, v1}, Lorg/a/a/l;->eX(Ljava/lang/String;)V
 
-    iget-object v1, v4, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     invoke-direct {v0, v3, v1}, Lorg/a/a/l;->a(Lorg/a/a/g;Ljava/lang/String;)V
 
     return-void
 
     :pswitch_c
-    iget-object v2, v4, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget-object v2, v4, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     invoke-direct {v0, v2}, Lorg/a/a/l;->eX(Ljava/lang/String;)V
 
@@ -1185,7 +1169,7 @@
 
     if-eq v1, v2, :cond_4
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v2
 
@@ -1193,7 +1177,7 @@
 
     if-ne v1, v5, :cond_4
 
-    iget-object v1, v4, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     invoke-virtual {v1, v12}, Ljava/lang/String;->charAt(I)C
 
@@ -1203,25 +1187,23 @@
 
     if-ne v1, v5, :cond_4
 
-    iget-object v1, v0, Lorg/a/a/l;->ciQ:[I
+    iget-object v1, v0, Lorg/a/a/l;->cik:[I
 
     if-nez v1, :cond_2
 
     new-array v1, v13, [I
 
-    iput-object v1, v0, Lorg/a/a/l;->ciQ:[I
+    iput-object v1, v0, Lorg/a/a/l;->cik:[I
 
     :cond_2
-    iget-object v1, v0, Lorg/a/a/l;->ciQ:[I
+    iget-object v1, v0, Lorg/a/a/l;->cik:[I
 
     array-length v1, v1
 
-    iget v5, v0, Lorg/a/a/l;->ciP:I
+    iget v5, v0, Lorg/a/a/l;->cij:I
 
     if-lt v5, v1, :cond_3
 
-    iget v5, v0, Lorg/a/a/l;->ciP:I
-
     add-int/2addr v5, v14
 
     mul-int/lit8 v6, v1, 0x2
@@ -1232,57 +1214,57 @@
 
     new-array v5, v5, [I
 
-    iget-object v6, v0, Lorg/a/a/l;->ciQ:[I
+    iget-object v6, v0, Lorg/a/a/l;->cik:[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/l;->ciQ:[I
+    iput-object v5, v0, Lorg/a/a/l;->cik:[I
 
     :cond_3
-    iget-object v1, v0, Lorg/a/a/l;->ciQ:[I
+    iget-object v1, v0, Lorg/a/a/l;->cik:[I
 
-    iget v5, v0, Lorg/a/a/l;->ciP:I
+    iget v5, v0, Lorg/a/a/l;->cij:I
 
     add-int/lit8 v6, v5, 0x1
 
-    iput v6, v0, Lorg/a/a/l;->ciP:I
+    iput v6, v0, Lorg/a/a/l;->cij:I
 
     aput v2, v1, v5
 
     :cond_4
-    iget-object v1, v4, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     invoke-direct {v0, v3, v1}, Lorg/a/a/l;->a(Lorg/a/a/g;Ljava/lang/String;)V
 
     return-void
 
     :pswitch_d
-    iget-object v1, v4, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     invoke-direct {v0, v1}, Lorg/a/a/l;->eX(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     return-void
 
     :pswitch_e
     invoke-direct {v0, v14}, Lorg/a/a/l;->fN(I)V
 
-    iget-object v1, v4, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     invoke-direct {v0, v3, v1}, Lorg/a/a/l;->a(Lorg/a/a/g;Ljava/lang/String;)V
 
     return-void
 
     :pswitch_f
-    iget-object v1, v4, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     invoke-direct {v0, v1}, Lorg/a/a/l;->eX(Ljava/lang/String;)V
 
     return-void
 
     :pswitch_10
-    iget-object v1, v4, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget-object v1, v4, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     invoke-direct {v0, v3, v1}, Lorg/a/a/l;->a(Lorg/a/a/g;Ljava/lang/String;)V
 
@@ -1385,11 +1367,11 @@
     return-void
 
     :pswitch_1d
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v2
 
@@ -1400,19 +1382,19 @@
     return-void
 
     :pswitch_1e
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v2
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v3
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v4
 
@@ -1431,15 +1413,15 @@
     return-void
 
     :pswitch_1f
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v2
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v3
 
@@ -1456,11 +1438,11 @@
     return-void
 
     :pswitch_20
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v2
 
@@ -1475,15 +1457,15 @@
     return-void
 
     :pswitch_21
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v2
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v3
 
@@ -1498,11 +1480,11 @@
     return-void
 
     :pswitch_22
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v2
 
@@ -1515,7 +1497,7 @@
     return-void
 
     :pswitch_23
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
@@ -1550,7 +1532,7 @@
     :pswitch_28
     invoke-direct {v0, v14}, Lorg/a/a/l;->fN(I)V
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
@@ -1592,7 +1574,7 @@
     return-void
 
     :pswitch_29
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
@@ -1627,6 +1609,8 @@
     :goto_1
     invoke-direct {v0, v1, v10}, Lorg/a/a/l;->az(II)V
 
+    return-void
+
     :cond_9
     :goto_2
     return-void
@@ -1634,7 +1618,7 @@
     :pswitch_2a
     invoke-direct {v0, v14}, Lorg/a/a/l;->fN(I)V
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JD()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/l;->JC()I
 
     move-result v1
 
@@ -1688,7 +1672,7 @@
     return-void
 
     :pswitch_30
-    iget v1, v4, Lorg/a/a/o;->chr:I
+    iget v1, v4, Lorg/a/a/o;->cgL:I
 
     const/16 v2, 0x10
 
@@ -1803,8 +1787,6 @@
     :pswitch_3c
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3c
diff --git a/com.discord/smali_classes2/org/a/a/m.smali b/com.discord/smali_classes2/org/a/a/m.smali
index ec764df17e..301259ed8f 100644
--- a/com.discord/smali_classes2/org/a/a/m.smali
+++ b/com.discord/smali_classes2/org/a/a/m.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field final ciC:I
+.field final chW:I
 
-.field final ciR:Ljava/lang/String;
+.field final cil:Ljava/lang/String;
 
-.field final ciS:Ljava/lang/String;
+.field final cim:Ljava/lang/String;
 
-.field final ciT:Ljava/lang/String;
+.field final cin:Ljava/lang/String;
 
 
 # direct methods
@@ -18,13 +18,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lorg/a/a/m;->ciC:I
+    iput p1, p0, Lorg/a/a/m;->chW:I
 
-    iput-object p2, p0, Lorg/a/a/m;->ciR:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/m;->cil:Ljava/lang/String;
 
-    iput-object p3, p0, Lorg/a/a/m;->ciS:Ljava/lang/String;
+    iput-object p3, p0, Lorg/a/a/m;->cim:Ljava/lang/String;
 
-    iput-object p4, p0, Lorg/a/a/m;->ciT:Ljava/lang/String;
+    iput-object p4, p0, Lorg/a/a/m;->cin:Ljava/lang/String;
 
     return-void
 .end method
@@ -52,15 +52,15 @@
     :cond_1
     check-cast p1, Lorg/a/a/m;
 
-    iget v1, p0, Lorg/a/a/m;->ciC:I
+    iget v1, p0, Lorg/a/a/m;->chW:I
 
-    iget v3, p1, Lorg/a/a/m;->ciC:I
+    iget v3, p1, Lorg/a/a/m;->chW:I
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/m;->ciR:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/m;->cil:Ljava/lang/String;
 
-    iget-object v3, p1, Lorg/a/a/m;->ciR:Ljava/lang/String;
+    iget-object v3, p1, Lorg/a/a/m;->cil:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -68,9 +68,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/m;->ciS:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/m;->cim:Ljava/lang/String;
 
-    iget-object v3, p1, Lorg/a/a/m;->ciS:Ljava/lang/String;
+    iget-object v3, p1, Lorg/a/a/m;->cim:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -78,9 +78,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/m;->ciT:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/m;->cin:Ljava/lang/String;
 
-    iget-object p1, p1, Lorg/a/a/m;->ciT:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/m;->cin:Ljava/lang/String;
 
     invoke-virtual {v1, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -97,15 +97,15 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lorg/a/a/m;->ciC:I
+    iget v0, p0, Lorg/a/a/m;->chW:I
 
-    iget-object v1, p0, Lorg/a/a/m;->ciR:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/m;->cil:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v1
 
-    iget-object v2, p0, Lorg/a/a/m;->ciS:Ljava/lang/String;
+    iget-object v2, p0, Lorg/a/a/m;->cim:Ljava/lang/String;
 
     invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
 
@@ -113,7 +113,7 @@
 
     mul-int v1, v1, v2
 
-    iget-object v2, p0, Lorg/a/a/m;->ciT:Ljava/lang/String;
+    iget-object v2, p0, Lorg/a/a/m;->cin:Ljava/lang/String;
 
     invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
 
@@ -133,7 +133,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuffer;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/m;->ciR:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/m;->cil:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
@@ -141,11 +141,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    iget-object v1, p0, Lorg/a/a/m;->ciS:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/m;->cim:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    iget-object v1, p0, Lorg/a/a/m;->ciT:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/m;->cin:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
@@ -153,7 +153,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
-    iget v1, p0, Lorg/a/a/m;->ciC:I
+    iget v1, p0, Lorg/a/a/m;->chW:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuffer;->append(I)Ljava/lang/StringBuffer;
 
diff --git a/com.discord/smali_classes2/org/a/a/n.smali b/com.discord/smali_classes2/org/a/a/n.smali
index b296c80ee6..b24b33070e 100644
--- a/com.discord/smali_classes2/org/a/a/n.smali
+++ b/com.discord/smali_classes2/org/a/a/n.smali
@@ -3,17 +3,17 @@
 
 
 # instance fields
-.field ciD:Lorg/a/a/p;
+.field chK:I
 
-.field ciT:Ljava/lang/String;
+.field chX:Lorg/a/a/p;
 
-.field ciU:Lorg/a/a/p;
+.field cin:Ljava/lang/String;
 
-.field ciV:Lorg/a/a/p;
+.field cio:Lorg/a/a/p;
 
-.field ciW:Lorg/a/a/n;
+.field cip:Lorg/a/a/p;
 
-.field ciq:I
+.field ciq:Lorg/a/a/n;
 
 
 # direct methods
@@ -35,23 +35,23 @@
     return-object p0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iget-object v0, p0, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
     invoke-static {v0, p1, p2}, Lorg/a/a/n;->a(Lorg/a/a/n;Lorg/a/a/p;Lorg/a/a/p;)Lorg/a/a/n;
 
     move-result-object v0
 
-    iput-object v0, p0, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iput-object v0, p0, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
-    iget-object v0, p0, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
-    iget v0, v0, Lorg/a/a/p;->chH:I
+    iget v0, v0, Lorg/a/a/p;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    iget v1, v1, Lorg/a/a/p;->chH:I
+    iget v1, v1, Lorg/a/a/p;->chb:I
 
-    iget v2, p1, Lorg/a/a/p;->chH:I
+    iget v2, p1, Lorg/a/a/p;->chb:I
 
     if-nez p2, :cond_1
 
@@ -60,7 +60,7 @@
     goto :goto_0
 
     :cond_1
-    iget v3, p2, Lorg/a/a/p;->chH:I
+    iget v3, p2, Lorg/a/a/p;->chb:I
 
     :goto_0
     if-ge v2, v1, :cond_5
@@ -71,19 +71,19 @@
 
     if-lt v3, v1, :cond_2
 
-    iget-object p0, p0, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iget-object p0, p0, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
     goto :goto_1
 
     :cond_2
-    iput-object p2, p0, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iput-object p2, p0, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
     goto :goto_1
 
     :cond_3
     if-lt v3, v1, :cond_4
 
-    iput-object p1, p0, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
     goto :goto_1
 
@@ -92,31 +92,31 @@
 
     invoke-direct {v0}, Lorg/a/a/n;-><init>()V
 
-    iput-object p2, v0, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iput-object p2, v0, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
-    iget-object p2, p0, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iget-object p2, p0, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    iput-object p2, v0, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iput-object p2, v0, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    iget-object p2, p0, Lorg/a/a/n;->ciV:Lorg/a/a/p;
+    iget-object p2, p0, Lorg/a/a/n;->cip:Lorg/a/a/p;
 
-    iput-object p2, v0, Lorg/a/a/n;->ciV:Lorg/a/a/p;
+    iput-object p2, v0, Lorg/a/a/n;->cip:Lorg/a/a/p;
 
-    iget-object p2, p0, Lorg/a/a/n;->ciT:Ljava/lang/String;
+    iget-object p2, p0, Lorg/a/a/n;->cin:Ljava/lang/String;
 
-    iput-object p2, v0, Lorg/a/a/n;->ciT:Ljava/lang/String;
+    iput-object p2, v0, Lorg/a/a/n;->cin:Ljava/lang/String;
 
-    iget p2, p0, Lorg/a/a/n;->ciq:I
+    iget p2, p0, Lorg/a/a/n;->chK:I
 
-    iput p2, v0, Lorg/a/a/n;->ciq:I
+    iput p2, v0, Lorg/a/a/n;->chK:I
 
-    iget-object p2, p0, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iget-object p2, p0, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
-    iput-object p2, v0, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iput-object p2, v0, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
-    iput-object p1, p0, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    iput-object v0, p0, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iput-object v0, p0, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
     :cond_5
     :goto_1
diff --git a/com.discord/smali_classes2/org/a/a/o.smali b/com.discord/smali_classes2/org/a/a/o.smali
index 773e436f4c..9bde9c3628 100644
--- a/com.discord/smali_classes2/org/a/a/o.smali
+++ b/com.discord/smali_classes2/org/a/a/o.smali
@@ -3,23 +3,23 @@
 
 
 # instance fields
-.field chH:I
+.field cgL:I
 
-.field chr:I
+.field chM:Ljava/lang/String;
 
-.field ciC:I
+.field chW:I
 
-.field ciX:J
+.field chb:I
 
-.field ciY:Ljava/lang/String;
-
-.field ciZ:Ljava/lang/String;
+.field cir:J
 
 .field cis:Ljava/lang/String;
 
-.field cja:I
+.field cit:Ljava/lang/String;
 
-.field cjb:Lorg/a/a/o;
+.field ciu:I
+
+.field civ:Lorg/a/a/o;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lorg/a/a/o;->ciC:I
+    iput p1, p0, Lorg/a/a/o;->chW:I
 
     return-void
 .end method
@@ -46,35 +46,35 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lorg/a/a/o;->ciC:I
+    iput p1, p0, Lorg/a/a/o;->chW:I
 
-    iget p1, p2, Lorg/a/a/o;->chr:I
+    iget p1, p2, Lorg/a/a/o;->cgL:I
 
-    iput p1, p0, Lorg/a/a/o;->chr:I
+    iput p1, p0, Lorg/a/a/o;->cgL:I
 
-    iget p1, p2, Lorg/a/a/o;->chH:I
+    iget p1, p2, Lorg/a/a/o;->chb:I
 
-    iput p1, p0, Lorg/a/a/o;->chH:I
+    iput p1, p0, Lorg/a/a/o;->chb:I
 
-    iget-wide v0, p2, Lorg/a/a/o;->ciX:J
+    iget-wide v0, p2, Lorg/a/a/o;->cir:J
 
-    iput-wide v0, p0, Lorg/a/a/o;->ciX:J
+    iput-wide v0, p0, Lorg/a/a/o;->cir:J
+
+    iget-object p1, p2, Lorg/a/a/o;->chM:Ljava/lang/String;
+
+    iput-object p1, p0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     iget-object p1, p2, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     iput-object p1, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
 
-    iget-object p1, p2, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object p1, p2, Lorg/a/a/o;->cit:Ljava/lang/String;
 
-    iput-object p1, p0, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iput-object p1, p0, Lorg/a/a/o;->cit:Ljava/lang/String;
 
-    iget-object p1, p2, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget p1, p2, Lorg/a/a/o;->ciu:I
 
-    iput-object p1, p0, Lorg/a/a/o;->ciZ:Ljava/lang/String;
-
-    iget p1, p2, Lorg/a/a/o;->cja:I
-
-    iput p1, p0, Lorg/a/a/o;->cja:I
+    iput p1, p0, Lorg/a/a/o;->ciu:I
 
     return-void
 .end method
@@ -86,15 +86,15 @@
 
     const/4 v0, 0x4
 
-    iput v0, p0, Lorg/a/a/o;->chr:I
+    iput v0, p0, Lorg/a/a/o;->cgL:I
 
     invoke-static {p1}, Ljava/lang/Float;->floatToRawIntBits(F)I
 
     move-result v0
 
-    iput v0, p0, Lorg/a/a/o;->chH:I
+    iput v0, p0, Lorg/a/a/o;->chb:I
 
-    iget v0, p0, Lorg/a/a/o;->chr:I
+    iget v0, p0, Lorg/a/a/o;->cgL:I
 
     float-to-int p1, p1
 
@@ -104,7 +104,7 @@
 
     and-int/2addr p1, v0
 
-    iput p1, p0, Lorg/a/a/o;->cja:I
+    iput p1, p0, Lorg/a/a/o;->ciu:I
 
     return-void
 .end method
@@ -112,13 +112,13 @@
 .method final b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iput p1, p0, Lorg/a/a/o;->chr:I
+    iput p1, p0, Lorg/a/a/o;->cgL:I
 
-    iput-object p2, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iput-object p3, p0, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iput-object p3, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
 
-    iput-object p4, p0, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iput-object p4, p0, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     const/4 v0, 0x1
 
@@ -162,14 +162,14 @@
 
     and-int/2addr p1, v1
 
-    iput p1, p0, Lorg/a/a/o;->cja:I
+    iput p1, p0, Lorg/a/a/o;->ciu:I
 
     return-void
 
     :pswitch_0
     const/4 p3, 0x0
 
-    iput p3, p0, Lorg/a/a/o;->chH:I
+    iput p3, p0, Lorg/a/a/o;->chb:I
 
     goto :goto_2
 
@@ -205,11 +205,11 @@
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lorg/a/a/o;->chr:I
+    iput v0, p0, Lorg/a/a/o;->cgL:I
 
-    iput-wide p1, p0, Lorg/a/a/o;->ciX:J
+    iput-wide p1, p0, Lorg/a/a/o;->cir:J
 
-    iget v0, p0, Lorg/a/a/o;->chr:I
+    iget v0, p0, Lorg/a/a/o;->cgL:I
 
     long-to-int p1, p1
 
@@ -219,7 +219,7 @@
 
     and-int/2addr p1, v0
 
-    iput p1, p0, Lorg/a/a/o;->cja:I
+    iput p1, p0, Lorg/a/a/o;->ciu:I
 
     return-void
 .end method
@@ -227,7 +227,7 @@
 .method final c(Lorg/a/a/o;)Z
     .locals 8
 
-    iget v0, p0, Lorg/a/a/o;->chr:I
+    iget v0, p0, Lorg/a/a/o;->cgL:I
 
     const/4 v1, 0x1
 
@@ -251,6 +251,16 @@
 
     packed-switch v0, :pswitch_data_1
 
+    iget-object v0, p1, Lorg/a/a/o;->chM:Ljava/lang/String;
+
+    iget-object v2, p0, Lorg/a/a/o;->chM:Ljava/lang/String;
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
     iget-object v0, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     iget-object v2, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
@@ -261,19 +271,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/o;->cit:Ljava/lang/String;
 
-    iget-object v2, p0, Lorg/a/a/o;->ciY:Ljava/lang/String;
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p1, Lorg/a/a/o;->ciZ:Ljava/lang/String;
-
-    iget-object v0, p0, Lorg/a/a/o;->ciZ:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/o;->cit:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -287,15 +287,15 @@
     return v3
 
     :pswitch_0
-    iget v0, p1, Lorg/a/a/o;->chH:I
+    iget v0, p1, Lorg/a/a/o;->chb:I
 
-    iget v2, p0, Lorg/a/a/o;->chH:I
+    iget v2, p0, Lorg/a/a/o;->chb:I
 
     if-ne v0, v2, :cond_1
 
-    iget-object p1, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iget-object v0, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -309,9 +309,9 @@
     return v3
 
     :pswitch_1
-    iget-wide v4, p1, Lorg/a/a/o;->ciX:J
+    iget-wide v4, p1, Lorg/a/a/o;->cir:J
 
-    iget-wide v6, p0, Lorg/a/a/o;->ciX:J
+    iget-wide v6, p0, Lorg/a/a/o;->cir:J
 
     cmp-long p1, v4, v6
 
@@ -323,9 +323,9 @@
     return v3
 
     :pswitch_2
-    iget p1, p1, Lorg/a/a/o;->chH:I
+    iget p1, p1, Lorg/a/a/o;->chb:I
 
-    iget v0, p0, Lorg/a/a/o;->chH:I
+    iget v0, p0, Lorg/a/a/o;->chb:I
 
     if-ne p1, v0, :cond_3
 
@@ -335,17 +335,17 @@
     return v3
 
     :cond_4
-    iget-wide v4, p1, Lorg/a/a/o;->ciX:J
+    iget-wide v4, p1, Lorg/a/a/o;->cir:J
 
-    iget-wide v6, p0, Lorg/a/a/o;->ciX:J
+    iget-wide v6, p0, Lorg/a/a/o;->cir:J
 
     cmp-long v0, v4, v6
 
     if-nez v0, :cond_5
 
-    iget-object v0, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iget-object v2, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v2, p0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -353,9 +353,9 @@
 
     if-eqz v0, :cond_5
 
-    iget-object p1, p1, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
 
-    iget-object v0, p0, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -369,9 +369,9 @@
     return v3
 
     :cond_6
-    iget-object v0, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iget-object v2, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v2, p0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -379,9 +379,9 @@
 
     if-eqz v0, :cond_7
 
-    iget-object p1, p1, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
 
-    iget-object v0, p0, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -396,9 +396,9 @@
 
     :cond_8
     :pswitch_3
-    iget-object p1, p1, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object p1, p1, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iget-object v0, p0, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -431,11 +431,11 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lorg/a/a/o;->chr:I
+    iput v0, p0, Lorg/a/a/o;->cgL:I
 
-    iput p1, p0, Lorg/a/a/o;->chH:I
+    iput p1, p0, Lorg/a/a/o;->chb:I
 
-    iget v0, p0, Lorg/a/a/o;->chr:I
+    iget v0, p0, Lorg/a/a/o;->cgL:I
 
     add-int/2addr v0, p1
 
@@ -443,7 +443,7 @@
 
     and-int/2addr p1, v0
 
-    iput p1, p0, Lorg/a/a/o;->cja:I
+    iput p1, p0, Lorg/a/a/o;->ciu:I
 
     return-void
 .end method
@@ -453,15 +453,15 @@
 
     const/4 v0, 0x6
 
-    iput v0, p0, Lorg/a/a/o;->chr:I
+    iput v0, p0, Lorg/a/a/o;->cgL:I
 
     invoke-static {p1, p2}, Ljava/lang/Double;->doubleToRawLongBits(D)J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lorg/a/a/o;->ciX:J
+    iput-wide v0, p0, Lorg/a/a/o;->cir:J
 
-    iget v0, p0, Lorg/a/a/o;->chr:I
+    iget v0, p0, Lorg/a/a/o;->cgL:I
 
     double-to-int p1, p1
 
@@ -471,7 +471,7 @@
 
     and-int/2addr p1, v0
 
-    iput p1, p0, Lorg/a/a/o;->cja:I
+    iput p1, p0, Lorg/a/a/o;->ciu:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/p.smali b/com.discord/smali_classes2/org/a/a/p.smali
index 1b61baf2fc..643921bf3e 100644
--- a/com.discord/smali_classes2/org/a/a/p.smali
+++ b/com.discord/smali_classes2/org/a/a/p.smali
@@ -3,27 +3,27 @@
 
 
 # instance fields
-.field private chD:I
+.field cgL:I
 
-.field chH:I
+.field cgP:I
 
-.field chr:I
+.field private cgX:I
 
-.field chv:I
+.field chW:I
 
-.field ciC:I
+.field chb:I
 
-.field ciH:I
+.field cib:I
 
-.field private ciN:[I
+.field private cih:[I
 
-.field cjc:Lorg/a/a/l;
+.field ciw:Lorg/a/a/l;
 
-.field cjd:Lorg/a/a/p;
+.field cix:Lorg/a/a/p;
 
-.field cje:Lorg/a/a/i;
+.field ciy:Lorg/a/a/i;
 
-.field cjf:Lorg/a/a/p;
+.field ciz:Lorg/a/a/p;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 .method private az(II)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/p;->ciN:[I
+    iget-object v0, p0, Lorg/a/a/p;->cih:[I
 
     const/4 v1, 0x6
 
@@ -46,76 +46,66 @@
 
     new-array v0, v1, [I
 
-    iput-object v0, p0, Lorg/a/a/p;->ciN:[I
+    iput-object v0, p0, Lorg/a/a/p;->cih:[I
 
     :cond_0
-    iget v0, p0, Lorg/a/a/p;->chD:I
+    iget v0, p0, Lorg/a/a/p;->cgX:I
 
-    iget-object v2, p0, Lorg/a/a/p;->ciN:[I
+    iget-object v2, p0, Lorg/a/a/p;->cih:[I
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-lt v0, v2, :cond_1
+    if-lt v0, v3, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/p;->ciN:[I
-
-    array-length v0, v0
+    array-length v0, v2
 
     add-int/2addr v0, v1
 
     new-array v0, v0, [I
 
-    iget-object v1, p0, Lorg/a/a/p;->ciN:[I
-
-    iget-object v2, p0, Lorg/a/a/p;->ciN:[I
-
-    array-length v2, v2
+    array-length v1, v2
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v2, v3, v0, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lorg/a/a/p;->ciN:[I
+    iput-object v0, p0, Lorg/a/a/p;->cih:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/p;->ciN:[I
+    iget-object v0, p0, Lorg/a/a/p;->cih:[I
 
-    iget v1, p0, Lorg/a/a/p;->chD:I
+    iget v1, p0, Lorg/a/a/p;->cgX:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/a/a/p;->chD:I
+    iput v2, p0, Lorg/a/a/p;->cgX:I
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Lorg/a/a/p;->ciN:[I
+    iget p1, p0, Lorg/a/a/p;->cgX:I
 
-    iget v0, p0, Lorg/a/a/p;->chD:I
+    add-int/lit8 v1, p1, 0x1
 
-    add-int/lit8 v1, v0, 0x1
+    iput v1, p0, Lorg/a/a/p;->cgX:I
 
-    iput v1, p0, Lorg/a/a/p;->chD:I
-
-    aput p2, p1, v0
+    aput p2, v0, p1
 
     return-void
 .end method
 
 
 # virtual methods
-.method final JG()Lorg/a/a/p;
+.method final JF()Lorg/a/a/p;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, p0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     if-nez v0, :cond_0
 
     return-object p0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
-
-    iget-object v0, v0, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object v0, v0, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
     return-object v0
 .end method
@@ -123,7 +113,7 @@
 .method final a(Lorg/a/a/d;IZ)V
     .locals 1
 
-    iget v0, p0, Lorg/a/a/p;->ciC:I
+    iget v0, p0, Lorg/a/a/p;->chW:I
 
     and-int/lit8 v0, v0, 0x2
 
@@ -135,7 +125,7 @@
 
     rsub-int/lit8 p2, p2, -0x1
 
-    iget p3, p1, Lorg/a/a/d;->chr:I
+    iget p3, p1, Lorg/a/a/d;->cgL:I
 
     invoke-direct {p0, p2, p3}, Lorg/a/a/p;->az(II)V
 
@@ -144,7 +134,7 @@
     return-void
 
     :cond_0
-    iget p3, p1, Lorg/a/a/d;->chr:I
+    iget p3, p1, Lorg/a/a/d;->cgL:I
 
     invoke-direct {p0, p2, p3}, Lorg/a/a/p;->az(II)V
 
@@ -155,7 +145,7 @@
     :cond_1
     if-eqz p3, :cond_2
 
-    iget p3, p0, Lorg/a/a/p;->chH:I
+    iget p3, p0, Lorg/a/a/p;->chb:I
 
     sub-int/2addr p3, p2
 
@@ -164,7 +154,7 @@
     return-void
 
     :cond_2
-    iget p3, p0, Lorg/a/a/p;->chH:I
+    iget p3, p0, Lorg/a/a/p;->chb:I
 
     sub-int/2addr p3, p2
 
@@ -179,13 +169,13 @@
     move-object v0, p0
 
     :goto_0
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_b
 
-    iget-object v1, v0, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v1, v0, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iput-object v2, v0, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
     const/4 v2, 0x1
 
@@ -193,31 +183,27 @@
 
     if-eqz p1, :cond_3
 
-    iget v4, v0, Lorg/a/a/p;->ciC:I
+    iget v4, v0, Lorg/a/a/p;->chW:I
 
-    and-int/lit16 v4, v4, 0x800
+    and-int/lit16 v5, v4, 0x800
 
-    if-nez v4, :cond_9
-
-    iget v4, v0, Lorg/a/a/p;->ciC:I
+    if-nez v5, :cond_a
 
     or-int/lit16 v4, v4, 0x800
 
-    iput v4, v0, Lorg/a/a/p;->ciC:I
+    iput v4, v0, Lorg/a/a/p;->chW:I
 
-    iget v4, v0, Lorg/a/a/p;->ciC:I
+    iget v4, v0, Lorg/a/a/p;->chW:I
 
-    and-int/lit16 v4, v4, 0x100
+    and-int/lit16 v5, v4, 0x100
 
-    if-eqz v4, :cond_6
-
-    iget v4, v0, Lorg/a/a/p;->ciC:I
+    if-eqz v5, :cond_6
 
     and-int/lit16 v4, v4, 0x400
 
     if-eqz v4, :cond_2
 
-    iget v4, p1, Lorg/a/a/p;->ciC:I
+    iget v4, p1, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v4, v4, 0x400
 
@@ -229,17 +215,15 @@
     const/4 v4, 0x0
 
     :goto_1
-    iget-object v5, v0, Lorg/a/a/p;->ciN:[I
+    iget-object v5, v0, Lorg/a/a/p;->cih:[I
 
-    array-length v5, v5
+    array-length v6, v5
 
-    if-ge v4, v5, :cond_2
-
-    iget-object v5, v0, Lorg/a/a/p;->ciN:[I
+    if-ge v4, v6, :cond_2
 
     aget v5, v5, v4
 
-    iget-object v6, p1, Lorg/a/a/p;->ciN:[I
+    iget-object v6, p1, Lorg/a/a/p;->cih:[I
 
     aget v6, v6, v4
 
@@ -264,26 +248,26 @@
 
     invoke-direct {v2}, Lorg/a/a/i;-><init>()V
 
-    iget v3, v0, Lorg/a/a/p;->chv:I
+    iget v3, v0, Lorg/a/a/p;->cgP:I
 
-    iput v3, v2, Lorg/a/a/i;->ciC:I
+    iput v3, v2, Lorg/a/a/i;->chW:I
 
-    iget-object v3, p1, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v3, p1, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget-object v3, v3, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v3, v3, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iput-object v3, v2, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iput-object v3, v2, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iget-object v3, v0, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v3, v0, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iput-object v3, v2, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iput-object v3, v2, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iput-object v2, v0, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iput-object v2, v0, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
     goto :goto_3
 
     :cond_3
-    iget v4, v0, Lorg/a/a/p;->ciC:I
+    iget v4, v0, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v4, v4, 0x400
 
@@ -291,7 +275,7 @@
 
     if-eqz v4, :cond_4
 
-    iget-object v4, v0, Lorg/a/a/p;->ciN:[I
+    iget-object v4, v0, Lorg/a/a/p;->cih:[I
 
     ushr-long v6, p2, v5
 
@@ -308,19 +292,17 @@
     const/4 v3, 0x1
 
     :cond_4
-    if-nez v3, :cond_9
+    if-nez v3, :cond_a
 
-    iget v3, v0, Lorg/a/a/p;->ciC:I
+    iget v3, v0, Lorg/a/a/p;->chW:I
 
-    and-int/lit16 v3, v3, 0x400
+    and-int/lit16 v4, v3, 0x400
 
-    if-nez v3, :cond_5
-
-    iget v3, v0, Lorg/a/a/p;->ciC:I
+    if-nez v4, :cond_5
 
     or-int/lit16 v3, v3, 0x400
 
-    iput v3, v0, Lorg/a/a/p;->ciC:I
+    iput v3, v0, Lorg/a/a/p;->chW:I
 
     div-int/lit8 v3, p4, 0x20
 
@@ -328,10 +310,10 @@
 
     new-array v2, v3, [I
 
-    iput-object v2, v0, Lorg/a/a/p;->ciN:[I
+    iput-object v2, v0, Lorg/a/a/p;->cih:[I
 
     :cond_5
-    iget-object v2, v0, Lorg/a/a/p;->ciN:[I
+    iget-object v2, v0, Lorg/a/a/p;->cih:[I
 
     ushr-long v3, p2, v5
 
@@ -347,38 +329,38 @@
 
     :cond_6
     :goto_3
-    iget-object v2, v0, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v2, v0, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
     :goto_4
     if-eqz v2, :cond_9
 
-    iget v3, v0, Lorg/a/a/p;->ciC:I
+    iget v3, v0, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v3, v3, 0x80
 
     if-eqz v3, :cond_7
 
-    iget-object v3, v0, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v3, v0, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget-object v3, v3, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v3, v3, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
     if-eq v2, v3, :cond_8
 
     :cond_7
-    iget-object v3, v2, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v3, v2, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iget-object v3, v3, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v3, v3, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
     if-nez v3, :cond_8
 
-    iget-object v3, v2, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v3, v2, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iput-object v1, v3, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iput-object v1, v3, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    iget-object v1, v2, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v1, v2, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
     :cond_8
-    iget-object v2, v2, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v2, v2, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
     goto :goto_4
 
@@ -388,37 +370,40 @@
     goto/16 :goto_0
 
     :cond_a
+    move-object v0, v1
+
+    goto/16 :goto_0
+
+    :cond_b
     return-void
 .end method
 
 .method final d(I[B)Z
     .locals 7
 
-    iget v0, p0, Lorg/a/a/p;->ciC:I
+    iget v0, p0, Lorg/a/a/p;->chW:I
 
     or-int/lit8 v0, v0, 0x2
 
-    iput v0, p0, Lorg/a/a/p;->ciC:I
+    iput v0, p0, Lorg/a/a/p;->chW:I
 
-    iput p1, p0, Lorg/a/a/p;->chH:I
+    iput p1, p0, Lorg/a/a/p;->chb:I
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lorg/a/a/p;->chD:I
+    iget v2, p0, Lorg/a/a/p;->cgX:I
 
     if-ge v0, v2, :cond_4
 
-    iget-object v2, p0, Lorg/a/a/p;->ciN:[I
+    iget-object v2, p0, Lorg/a/a/p;->cih:[I
 
     add-int/lit8 v3, v0, 0x1
 
     aget v0, v2, v0
 
-    iget-object v2, p0, Lorg/a/a/p;->ciN:[I
-
     add-int/lit8 v4, v3, 0x1
 
     aget v2, v2, v3
diff --git a/com.discord/smali_classes2/org/a/a/q.smali b/com.discord/smali_classes2/org/a/a/q.smali
index f33009ff1e..d9253b83f7 100644
--- a/com.discord/smali_classes2/org/a/a/q.smali
+++ b/com.discord/smali_classes2/org/a/a/q.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field protected final cho:I
+.field protected final cgI:I
 
-.field protected cjg:Lorg/a/a/q;
+.field protected ciA:Lorg/a/a/q;
 
 
 # direct methods
@@ -26,27 +26,25 @@
 
     const/high16 p1, 0x50000
 
-    iput p1, p0, Lorg/a/a/q;->cho:I
+    iput p1, p0, Lorg/a/a/q;->cgI:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iput-object p1, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public JH()Lorg/a/a/a;
+.method public JG()Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
-    invoke-virtual {v0}, Lorg/a/a/q;->JH()Lorg/a/a/a;
+    invoke-virtual {v0}, Lorg/a/a/q;->JG()Lorg/a/a/a;
 
     move-result-object v0
 
@@ -61,12 +59,10 @@
 .method public a(ILjava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3}, Lorg/a/a/q;->a(ILjava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -82,18 +78,16 @@
 .method public a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/q;->cho:I
+    iget v0, p0, Lorg/a/a/q;->cgI:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/q;->a(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -114,37 +108,35 @@
 .end method
 
 .method public a(ILorg/a/a/u;[Lorg/a/a/p;[Lorg/a/a/p;[ILjava/lang/String;Z)Lorg/a/a/a;
-    .locals 10
+    .locals 11
 
     move-object v0, p0
 
-    iget v1, v0, Lorg/a/a/q;->cho:I
+    iget v1, v0, Lorg/a/a/q;->cgI:I
 
     const/high16 v2, 0x50000
 
     if-lt v1, v2, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v3, v0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
-    if-eqz v1, :cond_0
+    if-eqz v3, :cond_0
 
-    iget-object v2, v0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    move v4, p1
 
-    move v3, p1
+    move-object v5, p2
 
-    move-object v4, p2
+    move-object v6, p3
 
-    move-object v5, p3
+    move-object v7, p4
 
-    move-object v6, p4
+    move-object/from16 v8, p5
 
-    move-object v7, p5
+    move-object/from16 v9, p6
 
-    move-object/from16 v8, p6
+    move/from16 v10, p7
 
-    move/from16 v9, p7
-
-    invoke-virtual/range {v2 .. v9}, Lorg/a/a/q;->a(ILorg/a/a/u;[Lorg/a/a/p;[Lorg/a/a/p;[ILjava/lang/String;Z)Lorg/a/a/a;
+    invoke-virtual/range {v3 .. v10}, Lorg/a/a/q;->a(ILorg/a/a/u;[Lorg/a/a/p;[Lorg/a/a/p;[ILjava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object v1
 
@@ -166,12 +158,10 @@
 .method public varargs a(IILorg/a/a/p;[Lorg/a/a/p;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/q;->a(IILorg/a/a/p;[Lorg/a/a/p;)V
 
     :cond_0
@@ -179,34 +169,32 @@
 .end method
 
 .method public a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-    .locals 7
+    .locals 6
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    move v1, p1
 
-    move v2, p1
+    move v2, p2
 
-    move v3, p2
+    move-object v3, p3
 
-    move-object v4, p3
+    move v4, p4
 
-    move v5, p4
+    move-object v5, p5
 
-    move-object v6, p5
-
-    invoke-virtual/range {v1 .. v6}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v0 .. v5}, Lorg/a/a/q;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     :cond_0
     return-void
 .end method
 
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-    .locals 7
+    .locals 6
 
-    iget v0, p0, Lorg/a/a/q;->cho:I
+    iget v0, p0, Lorg/a/a/q;->cgI:I
 
     const/high16 v1, 0x50000
 
@@ -240,23 +228,21 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_3
 
-    iget-object v1, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    move v1, p1
 
-    move v2, p1
+    move-object v2, p2
 
-    move-object v3, p2
+    move-object v3, p3
 
-    move-object v4, p3
+    move-object v4, p4
 
-    move-object v5, p4
+    move v5, p5
 
-    move v6, p5
-
-    invoke-virtual/range {v1 .. v6}, Lorg/a/a/q;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+    invoke-virtual/range {v0 .. v5}, Lorg/a/a/q;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
 
     :cond_3
     return-void
@@ -265,12 +251,10 @@
 .method public a(ILorg/a/a/p;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->a(ILorg/a/a/p;)V
 
     :cond_0
@@ -278,27 +262,25 @@
 .end method
 
 .method public a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;Lorg/a/a/p;I)V
-    .locals 8
+    .locals 7
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    move-object v1, p1
 
-    move-object v2, p1
+    move-object v2, p2
 
-    move-object v3, p2
+    move-object v3, p3
 
-    move-object v4, p3
+    move-object v4, p4
 
-    move-object v5, p4
+    move-object v5, p5
 
-    move-object v6, p5
+    move v6, p6
 
-    move v7, p6
-
-    invoke-virtual/range {v1 .. v7}, Lorg/a/a/q;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;Lorg/a/a/p;I)V
+    invoke-virtual/range {v0 .. v6}, Lorg/a/a/q;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;Lorg/a/a/p;I)V
 
     :cond_0
     return-void
@@ -307,12 +289,10 @@
 .method public varargs a(Ljava/lang/String;Ljava/lang/String;Lorg/a/a/m;[Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/q;->a(Ljava/lang/String;Ljava/lang/String;Lorg/a/a/m;[Ljava/lang/Object;)V
 
     :cond_0
@@ -322,12 +302,10 @@
 .method public a(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1}, Lorg/a/a/q;->a(Lorg/a/a/c;)V
 
     :cond_0
@@ -337,12 +315,10 @@
 .method public a(Lorg/a/a/p;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1}, Lorg/a/a/q;->a(Lorg/a/a/p;)V
 
     :cond_0
@@ -352,12 +328,10 @@
 .method public a(Lorg/a/a/p;Lorg/a/a/p;Lorg/a/a/p;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/q;->a(Lorg/a/a/p;Lorg/a/a/p;Lorg/a/a/p;Ljava/lang/String;)V
 
     :cond_0
@@ -367,12 +341,10 @@
 .method public a(Lorg/a/a/p;[I[Lorg/a/a/p;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3}, Lorg/a/a/q;->a(Lorg/a/a/p;[I[Lorg/a/a/p;)V
 
     :cond_0
@@ -382,12 +354,10 @@
 .method public aA(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->aA(II)V
 
     :cond_0
@@ -397,12 +367,10 @@
 .method public aB(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->aB(II)V
 
     :cond_0
@@ -412,12 +380,10 @@
 .method public aC(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->aC(II)V
 
     :cond_0
@@ -427,12 +393,10 @@
 .method public aD(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->aD(II)V
 
     :cond_0
@@ -442,18 +406,16 @@
 .method public b(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/q;->cho:I
+    iget v0, p0, Lorg/a/a/q;->cgI:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/q;->b(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -476,12 +438,10 @@
 .method public b(ILorg/a/a/p;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->b(ILorg/a/a/p;)V
 
     :cond_0
@@ -491,12 +451,10 @@
 .method public bY(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1}, Lorg/a/a/q;->bY(Ljava/lang/Object;)V
 
     :cond_0
@@ -506,18 +464,16 @@
 .method public c(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/q;->cho:I
+    iget v0, p0, Lorg/a/a/q;->cgI:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/q;->c(ILorg/a/a/u;Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -540,12 +496,10 @@
 .method public c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2, p3, p4}, Lorg/a/a/q;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
@@ -558,7 +512,7 @@
     move-object v0, p0
 
     :goto_0
-    iget v1, v0, Lorg/a/a/q;->cho:I
+    iget v1, v0, Lorg/a/a/q;->cgI:I
 
     const/high16 v2, 0x50000
 
@@ -593,11 +547,9 @@
     return-void
 
     :cond_1
-    iget-object v1, v0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, v0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
-    if-eqz v1, :cond_2
-
-    iget-object v0, v0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    if-eqz v0, :cond_2
 
     goto :goto_0
 
@@ -608,12 +560,10 @@
 .method public fO(I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1}, Lorg/a/a/q;->fO(I)V
 
     :cond_0
@@ -623,12 +573,10 @@
 .method public k(Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->k(Ljava/lang/String;Z)Lorg/a/a/a;
 
     move-result-object p1
@@ -644,12 +592,10 @@
 .method public k(ILjava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->k(ILjava/lang/String;)V
 
     :cond_0
@@ -659,18 +605,16 @@
 .method public n(Ljava/lang/String;I)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/q;->cho:I
+    iget v0, p0, Lorg/a/a/q;->cgI:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->n(Ljava/lang/String;I)V
 
     :cond_0
@@ -687,12 +631,10 @@
 .method public o(Ljava/lang/String;I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->ciA:Lorg/a/a/q;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/q;->cjg:Lorg/a/a/q;
-
     invoke-virtual {v0, p1, p2}, Lorg/a/a/q;->o(Ljava/lang/String;I)V
 
     :cond_0
diff --git a/com.discord/smali_classes2/org/a/a/r.smali b/com.discord/smali_classes2/org/a/a/r.smali
index 89c7c35b52..38a0421baf 100644
--- a/com.discord/smali_classes2/org/a/a/r.smali
+++ b/com.discord/smali_classes2/org/a/a/r.smali
@@ -9,99 +9,99 @@
 
 .field private T:I
 
-.field bTR:I
+.field bTx:I
 
-.field private final chD:I
+.field private final cgX:I
 
-.field private chH:I
+.field private chE:Z
 
-.field private chW:Lorg/a/a/d;
+.field private final chK:I
 
-.field private chX:I
+.field private final chL:Ljava/lang/String;
 
-.field private chY:I
+.field chM:Ljava/lang/String;
 
-.field final ciG:Lorg/a/a/g;
+.field private chb:I
 
-.field ciP:I
+.field private chq:Lorg/a/a/d;
 
-.field private cik:Z
+.field private chr:I
 
-.field private final ciq:I
+.field private chs:I
 
-.field private final cir:Ljava/lang/String;
+.field ciB:[I
 
-.field cis:Ljava/lang/String;
+.field private ciC:Lorg/a/a/d;
 
-.field private cjA:I
+.field private ciD:Lorg/a/a/b;
 
-.field private cjB:Lorg/a/a/d;
+.field private ciE:Lorg/a/a/b;
 
-.field private cjC:I
+.field private ciF:Lorg/a/a/b;
 
-.field private cjD:Lorg/a/a/d;
+.field private ciG:Lorg/a/a/b;
 
-.field private cjE:I
+.field private ciH:[Lorg/a/a/b;
 
-.field private cjF:Lorg/a/a/d;
+.field private ciI:[Lorg/a/a/b;
 
-.field private cjG:I
+.field private ciJ:I
 
-.field private cjH:Lorg/a/a/b;
+.field private ciK:Lorg/a/a/c;
 
-.field private cjI:Lorg/a/a/b;
+.field private ciL:I
 
-.field private cjJ:Lorg/a/a/c;
+.field private ciM:Lorg/a/a/d;
 
-.field private cjK:Lorg/a/a/p;
+.field private ciN:[I
 
-.field private cjL:Lorg/a/a/p;
+.field private ciO:[I
 
-.field private cjM:Lorg/a/a/p;
+.field private ciP:I
 
-.field private cjN:I
+.field private ciQ:Lorg/a/a/n;
 
-.field private cjO:I
+.field private ciR:Lorg/a/a/n;
 
-.field cja:I
+.field private ciS:I
 
-.field cjh:[I
+.field private ciT:Lorg/a/a/d;
 
-.field private cji:Lorg/a/a/d;
+.field private ciU:I
 
-.field private cjj:Lorg/a/a/b;
+.field private ciV:Lorg/a/a/d;
 
-.field private cjk:Lorg/a/a/b;
+.field private ciW:I
 
-.field private cjl:Lorg/a/a/b;
+.field private ciX:Lorg/a/a/d;
 
-.field private cjm:Lorg/a/a/b;
+.field private ciY:I
 
-.field private cjn:[Lorg/a/a/b;
+.field private ciZ:Lorg/a/a/d;
 
-.field private cjo:[Lorg/a/a/b;
+.field final cia:Lorg/a/a/g;
 
-.field private cjp:I
+.field cij:I
 
-.field private cjq:Lorg/a/a/c;
+.field ciu:I
 
-.field private cjr:I
+.field private cja:I
 
-.field private cjs:Lorg/a/a/d;
+.field private cjb:Lorg/a/a/b;
 
-.field private cjt:[I
+.field private cjc:Lorg/a/a/b;
 
-.field private cju:[I
+.field private cjd:Lorg/a/a/c;
 
-.field private cjv:I
+.field private cje:Lorg/a/a/p;
 
-.field private cjw:Lorg/a/a/n;
+.field private cjf:Lorg/a/a/p;
 
-.field private cjx:Lorg/a/a/n;
+.field private cjg:Lorg/a/a/p;
 
-.field private cjy:I
+.field private cjh:I
 
-.field private cjz:Lorg/a/a/d;
+.field private cji:I
 
 .field private w:I
 
@@ -116,27 +116,27 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v0, p1, Lorg/a/a/g;->cii:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/g;->chC:Lorg/a/a/r;
 
     if-nez v0, :cond_0
 
-    iput-object p0, p1, Lorg/a/a/g;->cii:Lorg/a/a/r;
+    iput-object p0, p1, Lorg/a/a/g;->chC:Lorg/a/a/r;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lorg/a/a/g;->cij:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/g;->chD:Lorg/a/a/r;
 
-    iput-object p0, v0, Lorg/a/a/r;->cjg:Lorg/a/a/q;
+    iput-object p0, v0, Lorg/a/a/r;->ciA:Lorg/a/a/q;
 
     :goto_0
-    iput-object p0, p1, Lorg/a/a/g;->cij:Lorg/a/a/r;
+    iput-object p0, p1, Lorg/a/a/g;->chD:Lorg/a/a/r;
 
-    iput-object p1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iput-object p1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iput p2, p0, Lorg/a/a/r;->chH:I
+    iput p2, p0, Lorg/a/a/r;->chb:I
 
     const-string v0, "<init>"
 
@@ -146,30 +146,30 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lorg/a/a/r;->chH:I
+    iget v0, p0, Lorg/a/a/r;->chb:I
 
     const/high16 v1, 0x80000
 
     or-int/2addr v0, v1
 
-    iput v0, p0, Lorg/a/a/r;->chH:I
+    iput v0, p0, Lorg/a/a/r;->chb:I
 
     :cond_1
     invoke-virtual {p1, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result p3
 
-    iput p3, p0, Lorg/a/a/r;->chD:I
+    iput p3, p0, Lorg/a/a/r;->cgX:I
 
     invoke-virtual {p1, p4}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     move-result p3
 
-    iput p3, p0, Lorg/a/a/r;->ciq:I
+    iput p3, p0, Lorg/a/a/r;->chK:I
 
-    iput-object p4, p0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iput-object p4, p0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    iput-object p5, p0, Lorg/a/a/r;->cis:Ljava/lang/String;
+    iput-object p5, p0, Lorg/a/a/r;->chM:Ljava/lang/String;
 
     const/4 p3, 0x0
 
@@ -181,22 +181,22 @@
 
     array-length p4, p6
 
-    iput p4, p0, Lorg/a/a/r;->cja:I
+    iput p4, p0, Lorg/a/a/r;->ciu:I
 
-    iget p4, p0, Lorg/a/a/r;->cja:I
+    iget p4, p0, Lorg/a/a/r;->ciu:I
 
     new-array p4, p4, [I
 
-    iput-object p4, p0, Lorg/a/a/r;->cjh:[I
+    iput-object p4, p0, Lorg/a/a/r;->ciB:[I
 
     const/4 p4, 0x0
 
     :goto_1
-    iget p5, p0, Lorg/a/a/r;->cja:I
+    iget p5, p0, Lorg/a/a/r;->ciu:I
 
     if-ge p4, p5, :cond_2
 
-    iget-object p5, p0, Lorg/a/a/r;->cjh:[I
+    iget-object p5, p0, Lorg/a/a/r;->ciB:[I
 
     aget-object v0, p6, p4
 
@@ -235,7 +235,7 @@
     if-eqz p8, :cond_7
 
     :cond_5
-    iget-object p3, p0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object p3, p0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
     invoke-static {p3}, Lorg/a/a/t;->fc(Ljava/lang/String;)I
 
@@ -250,7 +250,7 @@
     add-int/lit8 p1, p1, -0x1
 
     :cond_6
-    iput p1, p0, Lorg/a/a/r;->chY:I
+    iput p1, p0, Lorg/a/a/r;->chs:I
 
     iput p1, p0, Lorg/a/a/r;->T:I
 
@@ -258,17 +258,17 @@
 
     invoke-direct {p1}, Lorg/a/a/p;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    iget-object p1, p0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object p1, p0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    iget p2, p1, Lorg/a/a/p;->ciC:I
+    iget p2, p1, Lorg/a/a/p;->chW:I
 
     or-int/lit8 p2, p2, 0x8
 
-    iput p2, p1, Lorg/a/a/p;->ciC:I
+    iput p2, p1, Lorg/a/a/p;->chW:I
 
-    iget-object p1, p0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object p1, p0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
     invoke-virtual {p0, p1}, Lorg/a/a/r;->a(Lorg/a/a/p;)V
 
@@ -276,7 +276,7 @@
     return-void
 .end method
 
-.method private JI()V
+.method private JH()V
     .locals 3
 
     iget v0, p0, Lorg/a/a/r;->M:I
@@ -291,53 +291,53 @@
 
     invoke-direct {v1}, Lorg/a/a/l;-><init>()V
 
-    iput-object v1, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iput-object v1, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object v1, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v1, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iput-object v0, v1, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iput-object v0, v1, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
-    iget-object v2, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v2, v2, Lorg/a/a/d;->chA:[B
+    iget-object v2, v2, Lorg/a/a/d;->cgU:[B
 
     invoke-virtual {v0, v1, v2}, Lorg/a/a/p;->d(I[B)Z
 
-    iget-object v1, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
-    iput-object v0, v1, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    iput-object v0, v1, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
-    iput-object v0, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iput-object v0, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget v1, p0, Lorg/a/a/r;->cjO:I
+    iget v1, p0, Lorg/a/a/r;->cji:I
 
-    iput v1, v0, Lorg/a/a/p;->ciH:I
+    iput v1, v0, Lorg/a/a/p;->cib:I
 
     :goto_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iput-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     return-void
 .end method
 
-.method private JJ()V
+.method private JI()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjt:[I
+    iget-object v0, p0, Lorg/a/a/r;->ciN:[I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -345,47 +345,45 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     :cond_0
-    invoke-direct {p0}, Lorg/a/a/r;->JK()V
+    invoke-direct {p0}, Lorg/a/a/r;->JJ()V
 
-    iget v0, p0, Lorg/a/a/r;->cjr:I
+    iget v0, p0, Lorg/a/a/r;->ciL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/r;->cjr:I
+    iput v0, p0, Lorg/a/a/r;->ciL:I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->cju:[I
+    iget-object v0, p0, Lorg/a/a/r;->ciO:[I
 
-    iput-object v0, p0, Lorg/a/a/r;->cjt:[I
+    iput-object v0, p0, Lorg/a/a/r;->ciN:[I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lorg/a/a/r;->cju:[I
+    iput-object v0, p0, Lorg/a/a/r;->ciO:[I
 
     return-void
 .end method
 
-.method private JK()V
+.method private JJ()V
     .locals 15
 
-    iget-object v0, p0, Lorg/a/a/r;->cju:[I
+    iget-object v0, p0, Lorg/a/a/r;->ciO:[I
 
     const/4 v1, 0x1
 
-    aget v0, v0, v1
-
-    iget-object v2, p0, Lorg/a/a/r;->cju:[I
+    aget v2, v0, v1
 
     const/4 v3, 0x2
 
-    aget v2, v2, v3
+    aget v0, v0, v3
 
-    iget-object v3, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v3, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget v3, v3, Lorg/a/a/g;->chr:I
+    iget v3, v3, Lorg/a/a/g;->cgL:I
 
     const v4, 0xffff
 
@@ -399,9 +397,9 @@
 
     if-ge v3, v6, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    iget-object v3, p0, Lorg/a/a/r;->cju:[I
+    iget-object v3, p0, Lorg/a/a/r;->ciO:[I
 
     aget v3, v3, v4
 
@@ -409,49 +407,47 @@
 
     move-result-object v1
 
-    invoke-virtual {v1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
-
-    add-int/2addr v0, v5
-
-    invoke-direct {p0, v5, v0}, Lorg/a/a/r;->az(II)V
-
-    iget-object v1, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
-
     invoke-virtual {v1, v2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    add-int/2addr v2, v0
+    add-int/2addr v2, v5
 
-    invoke-direct {p0, v0, v2}, Lorg/a/a/r;->az(II)V
+    invoke-direct {p0, v5, v2}, Lorg/a/a/r;->az(II)V
+
+    iget-object v1, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
+
+    invoke-virtual {v1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+
+    add-int/2addr v0, v2
+
+    invoke-direct {p0, v2, v0}, Lorg/a/a/r;->az(II)V
 
     return-void
 
     :cond_0
-    iget-object v3, p0, Lorg/a/a/r;->cjt:[I
+    iget-object v3, p0, Lorg/a/a/r;->ciN:[I
 
-    aget v3, v3, v1
+    aget v6, v3, v1
 
-    iget v6, p0, Lorg/a/a/r;->cjr:I
+    iget v7, p0, Lorg/a/a/r;->ciL:I
 
-    if-nez v6, :cond_1
+    if-nez v7, :cond_1
 
-    iget-object v6, p0, Lorg/a/a/r;->cju:[I
+    iget-object v3, p0, Lorg/a/a/r;->ciO:[I
 
-    aget v6, v6, v4
+    aget v3, v3, v4
 
     goto :goto_0
 
     :cond_1
-    iget-object v6, p0, Lorg/a/a/r;->cju:[I
-
-    aget v6, v6, v4
-
-    iget-object v7, p0, Lorg/a/a/r;->cjt:[I
+    iget-object v7, p0, Lorg/a/a/r;->ciO:[I
 
     aget v7, v7, v4
 
-    sub-int/2addr v6, v7
+    aget v3, v3, v4
 
-    sub-int/2addr v6, v1
+    sub-int/2addr v7, v3
+
+    add-int/lit8 v3, v7, -0x1
 
     :goto_0
     const/16 v7, 0xf7
@@ -462,9 +458,9 @@
 
     const/16 v10, 0xff
 
-    if-nez v2, :cond_3
+    if-nez v0, :cond_3
 
-    sub-int v1, v0, v3
+    sub-int v1, v2, v6
 
     packed-switch v1, :pswitch_data_0
 
@@ -476,7 +472,7 @@
     goto :goto_3
 
     :pswitch_1
-    if-ge v6, v9, :cond_2
+    if-ge v3, v9, :cond_2
 
     const/4 v11, 0x0
 
@@ -488,22 +484,22 @@
     goto :goto_3
 
     :pswitch_2
-    const/16 v3, 0xf8
+    const/16 v6, 0xf8
 
-    move v3, v0
+    move v6, v2
 
     const/16 v11, 0xf8
 
     goto :goto_3
 
     :cond_3
-    if-ne v0, v3, :cond_5
+    if-ne v2, v6, :cond_5
 
-    if-ne v2, v1, :cond_5
+    if-ne v0, v1, :cond_5
 
     const/16 v1, 0x3f
 
-    if-ge v6, v1, :cond_4
+    if-ge v3, v1, :cond_4
 
     const/16 v1, 0x40
 
@@ -531,13 +527,13 @@
     const/4 v12, 0x3
 
     :goto_4
-    if-ge v4, v3, :cond_7
+    if-ge v4, v6, :cond_7
 
-    iget-object v13, p0, Lorg/a/a/r;->cju:[I
+    iget-object v13, p0, Lorg/a/a/r;->ciO:[I
 
     aget v13, v13, v12
 
-    iget-object v14, p0, Lorg/a/a/r;->cjt:[I
+    iget-object v14, p0, Lorg/a/a/r;->ciN:[I
 
     aget v14, v14, v12
 
@@ -564,64 +560,34 @@
 
     packed-switch v11, :pswitch_data_2
 
-    iget-object v1, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     invoke-virtual {v1, v10}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v1, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
-
-    add-int/2addr v0, v5
-
-    invoke-direct {p0, v5, v0}, Lorg/a/a/r;->az(II)V
-
-    iget-object v1, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
-
     invoke-virtual {v1, v2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    add-int/2addr v2, v0
+    add-int/2addr v2, v5
 
-    invoke-direct {p0, v0, v2}, Lorg/a/a/r;->az(II)V
+    invoke-direct {p0, v5, v2}, Lorg/a/a/r;->az(II)V
+
+    iget-object v1, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
+
+    invoke-virtual {v1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+
+    add-int/2addr v0, v2
+
+    invoke-direct {p0, v2, v0}, Lorg/a/a/r;->az(II)V
 
     return-void
 
     :pswitch_3
-    iget-object v2, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
-
-    add-int/2addr v1, v8
-
-    invoke-virtual {v2, v1}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
-
-    add-int/2addr v3, v5
-
-    add-int/2addr v0, v5
-
-    invoke-direct {p0, v3, v0}, Lorg/a/a/r;->az(II)V
-
-    return-void
-
-    :pswitch_4
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
-
-    invoke-virtual {v0, v8}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
-
-    return-void
-
-    :pswitch_5
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     add-int/2addr v1, v8
 
@@ -629,51 +595,79 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+
+    add-int/2addr v6, v5
+
+    add-int/2addr v2, v5
+
+    invoke-direct {p0, v6, v2}, Lorg/a/a/r;->az(II)V
+
+    return-void
+
+    :pswitch_4
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
+
+    invoke-virtual {v0, v8}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+
+    return-void
+
+    :pswitch_5
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
+
+    add-int/2addr v1, v8
+
+    invoke-virtual {v0, v1}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     return-void
 
     :pswitch_6
-    iget-object v1, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    invoke-virtual {v1, v7}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    invoke-virtual {v0, v7}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    add-int/lit8 v1, v0, 0x3
+    add-int/lit8 v0, v2, 0x3
 
-    add-int/lit8 v0, v0, 0x4
+    add-int/lit8 v2, v2, 0x4
 
-    invoke-direct {p0, v1, v0}, Lorg/a/a/r;->az(II)V
+    invoke-direct {p0, v0, v2}, Lorg/a/a/r;->az(II)V
 
     return-void
 
     :cond_8
-    iget-object v1, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    add-int/2addr v6, v9
+    add-int/2addr v3, v9
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    add-int/lit8 v1, v0, 0x3
+    add-int/lit8 v0, v2, 0x3
 
-    add-int/lit8 v0, v0, 0x4
+    add-int/lit8 v2, v2, 0x4
 
-    invoke-direct {p0, v1, v0}, Lorg/a/a/r;->az(II)V
+    invoke-direct {p0, v0, v2}, Lorg/a/a/r;->az(II)V
 
     return-void
 
     :cond_9
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    invoke-virtual {v0, v6}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch -0x3
         :pswitch_2
@@ -750,9 +744,9 @@
 .method private a(Lorg/a/a/l;)V
     .locals 10
 
-    iget-object v0, p1, Lorg/a/a/l;->ciM:[I
+    iget-object v0, p1, Lorg/a/a/l;->cig:[I
 
-    iget-object v1, p1, Lorg/a/a/l;->cip:[I
+    iget-object v1, p1, Lorg/a/a/l;->chJ:[I
 
     const/4 v2, 0x0
 
@@ -777,16 +771,16 @@
 
     if-ne v6, v9, :cond_0
 
-    add-int/lit8 v4, v4, 0x1
+    add-int/lit8 v5, v5, 0x1
 
     goto :goto_1
 
     :cond_0
-    add-int/lit8 v4, v4, 0x1
+    add-int/lit8 v5, v5, 0x1
 
-    add-int/2addr v5, v4
+    add-int/2addr v4, v5
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     :goto_1
     if-eq v6, v8, :cond_1
@@ -804,7 +798,7 @@
     :cond_3
     const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     :goto_2
     array-length v6, v1
@@ -813,7 +807,7 @@
 
     aget v6, v1, v3
 
-    add-int/lit8 v4, v4, 0x1
+    add-int/lit8 v5, v5, 0x1
 
     if-eq v6, v8, :cond_4
 
@@ -828,11 +822,11 @@
     goto :goto_2
 
     :cond_6
-    iget-object p1, p1, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object p1, p1, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iget p1, p1, Lorg/a/a/p;->chH:I
+    iget p1, p1, Lorg/a/a/p;->chb:I
 
-    invoke-direct {p0, p1, v5, v4}, Lorg/a/a/r;->s(III)I
+    invoke-direct {p0, p1, v4, v5}, Lorg/a/a/r;->s(III)I
 
     move-result p1
 
@@ -841,19 +835,19 @@
     const/4 p1, 0x0
 
     :goto_3
-    if-lez v5, :cond_9
+    if-lez v4, :cond_9
 
-    aget v4, v0, p1
+    aget v5, v0, p1
 
-    iget-object v6, p0, Lorg/a/a/r;->cju:[I
+    iget-object v6, p0, Lorg/a/a/r;->ciO:[I
 
     add-int/lit8 v9, v3, 0x1
 
-    aput v4, v6, v3
+    aput v5, v6, v3
 
-    if-eq v4, v8, :cond_7
+    if-eq v5, v8, :cond_7
 
-    if-ne v4, v7, :cond_8
+    if-ne v5, v7, :cond_8
 
     :cond_7
     add-int/lit8 p1, p1, 0x1
@@ -861,7 +855,7 @@
     :cond_8
     add-int/lit8 p1, p1, 0x1
 
-    add-int/lit8 v5, v5, -0x1
+    add-int/lit8 v4, v4, -0x1
 
     move v3, v9
 
@@ -875,7 +869,7 @@
 
     aget p1, v1, v2
 
-    iget-object v0, p0, Lorg/a/a/r;->cju:[I
+    iget-object v0, p0, Lorg/a/a/r;->ciO:[I
 
     add-int/lit8 v4, v3, 0x1
 
@@ -896,7 +890,7 @@
     goto :goto_4
 
     :cond_c
-    invoke-direct {p0}, Lorg/a/a/r;->JJ()V
+    invoke-direct {p0}, Lorg/a/a/r;->JI()V
 
     return-void
 .end method
@@ -904,37 +898,35 @@
 .method private a(Lorg/a/a/p;[Lorg/a/a/p;)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v1, p0, Lorg/a/a/r;->M:I
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
-
-    const/16 v2, 0xab
+    const/16 v1, 0xab
 
     const/4 v3, 0x0
 
-    invoke-virtual {v0, v2, v1, v3, v3}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
+    invoke-virtual {v0, v1, v2, v3, v3}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
 
-    invoke-direct {p0, v1, p1}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
+    invoke-direct {p0, v2, p1}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
-    invoke-virtual {p1}, Lorg/a/a/p;->JG()Lorg/a/a/p;
+    invoke-virtual {p1}, Lorg/a/a/p;->JF()Lorg/a/a/p;
 
     move-result-object p1
 
-    iget v0, p1, Lorg/a/a/p;->ciC:I
+    iget v0, p1, Lorg/a/a/p;->chW:I
 
     or-int/lit8 v0, v0, 0x10
 
-    iput v0, p1, Lorg/a/a/p;->ciC:I
+    iput v0, p1, Lorg/a/a/p;->chW:I
 
     const/4 p1, 0x0
 
@@ -945,52 +937,52 @@
 
     aget-object v0, p2, p1
 
-    invoke-direct {p0, v1, v0}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
+    invoke-direct {p0, v2, v0}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
     aget-object v0, p2, p1
 
-    invoke-virtual {v0}, Lorg/a/a/p;->JG()Lorg/a/a/p;
+    invoke-virtual {v0}, Lorg/a/a/p;->JF()Lorg/a/a/p;
 
     move-result-object v0
 
-    iget v2, v0, Lorg/a/a/p;->ciC:I
+    iget v1, v0, Lorg/a/a/p;->chW:I
 
-    or-int/lit8 v2, v2, 0x10
+    or-int/lit8 v1, v1, 0x10
 
-    iput v2, v0, Lorg/a/a/p;->ciC:I
+    iput v1, v0, Lorg/a/a/p;->chW:I
 
     add-int/lit8 p1, p1, 0x1
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     invoke-direct {p0, v0, p1}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
     :goto_1
     array-length p1, p2
 
-    if-ge v1, p1, :cond_1
+    if-ge v2, p1, :cond_1
 
-    iget p1, p0, Lorg/a/a/r;->cjN:I
+    iget p1, p0, Lorg/a/a/r;->cjh:I
 
-    aget-object v0, p2, v1
+    aget-object v0, p2, v2
 
     invoke-direct {p0, p1, v0}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lorg/a/a/r;->JI()V
+    invoke-direct {p0}, Lorg/a/a/r;->JH()V
 
     :cond_2
     return-void
@@ -999,7 +991,7 @@
 .method private static a([I[ILorg/a/a/p;)V
     .locals 2
 
-    iget v0, p2, Lorg/a/a/p;->ciC:I
+    iget v0, p2, Lorg/a/a/p;->chW:I
 
     and-int/lit8 v0, v0, 0x4
 
@@ -1007,19 +999,19 @@
 
     const/4 v0, 0x0
 
-    iget v1, p2, Lorg/a/a/p;->chH:I
+    iget v1, p2, Lorg/a/a/p;->chb:I
 
     invoke-static {p0, p1, v0, v1}, Lorg/a/a/r;->a([I[III)I
 
     move-result p0
 
-    iput p0, p2, Lorg/a/a/p;->chH:I
+    iput p0, p2, Lorg/a/a/p;->chb:I
 
-    iget p0, p2, Lorg/a/a/p;->ciC:I
+    iget p0, p2, Lorg/a/a/p;->chW:I
 
     or-int/lit8 p0, p0, 0x4
 
-    iput p0, p2, Lorg/a/a/p;->ciC:I
+    iput p0, p2, Lorg/a/a/p;->chW:I
 
     :cond_0
     return-void
@@ -1031,7 +1023,7 @@
     :goto_0
     if-ge p1, p2, :cond_5
 
-    iget-object v0, p0, Lorg/a/a/r;->cju:[I
+    iget-object v0, p0, Lorg/a/a/r;->ciO:[I
 
     aget v0, v0, p1
 
@@ -1059,14 +1051,14 @@
 
     if-eq v0, v2, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     invoke-virtual {v0, v1}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     goto/16 :goto_5
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     const/16 v2, 0x8
 
@@ -1074,32 +1066,30 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v2, v2, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v2, v2, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     aget-object v1, v2, v1
 
-    iget v1, v1, Lorg/a/a/o;->chH:I
+    iget v1, v1, Lorg/a/a/o;->chb:I
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v3, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
-
-    iget-object v3, v3, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v3, v2, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     aget-object v1, v3, v1
 
-    iget-object v1, v1, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v1, v1, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {v2, v1}, Lorg/a/a/g;->eT(Ljava/lang/String;)I
 
@@ -1139,15 +1129,15 @@
 
     invoke-virtual {v6, v1}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v1, v1, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v1, v1, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     and-int/2addr v0, v5
 
     aget-object v0, v1, v0
 
-    iget-object v0, v0, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v0, v0, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {v6, v0}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
 
@@ -1205,13 +1195,13 @@
     goto :goto_3
 
     :goto_4
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v6}, Ljava/lang/StringBuffer;->toString()Ljava/lang/String;
 
@@ -1256,7 +1246,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     const/4 v1, 0x7
 
@@ -1264,7 +1254,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     check-cast p1, Ljava/lang/String;
 
@@ -1281,7 +1271,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     check-cast p1, Ljava/lang/Integer;
 
@@ -1294,7 +1284,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     const/16 v1, 0x8
 
@@ -1304,7 +1294,7 @@
 
     check-cast p1, Lorg/a/a/p;
 
-    iget p1, p1, Lorg/a/a/p;->chH:I
+    iget p1, p1, Lorg/a/a/p;->chb:I
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
@@ -1318,19 +1308,19 @@
 
     invoke-direct {v0}, Lorg/a/a/i;-><init>()V
 
-    iput p1, v0, Lorg/a/a/i;->ciC:I
+    iput p1, v0, Lorg/a/a/i;->chW:I
 
-    iput-object p2, v0, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iput-object p2, v0, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iget-object p1, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object p1, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget-object p1, p1, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object p1, p1, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iput-object p1, v0, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iput-object p1, v0, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iget-object p1, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object p1, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iput-object v0, p1, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iput-object v0, p1, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
     return-void
 .end method
@@ -1342,12 +1332,10 @@
 
     add-int/2addr v0, p3
 
-    iget-object v1, p0, Lorg/a/a/r;->cju:[I
+    iget-object v1, p0, Lorg/a/a/r;->ciO:[I
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/r;->cju:[I
-
     array-length v1, v1
 
     if-ge v1, v0, :cond_1
@@ -1355,26 +1343,22 @@
     :cond_0
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/r;->cju:[I
+    iput-object v0, p0, Lorg/a/a/r;->ciO:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->cju:[I
+    iget-object v0, p0, Lorg/a/a/r;->ciO:[I
 
     const/4 v1, 0x0
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Lorg/a/a/r;->cju:[I
+    const/4 p1, 0x1
 
-    const/4 v0, 0x1
+    aput p2, v0, p1
 
-    aput p2, p1, v0
+    const/4 p1, 0x2
 
-    iget-object p1, p0, Lorg/a/a/r;->cju:[I
-
-    const/4 p2, 0x2
-
-    aput p3, p1, p2
+    aput p3, v0, p1
 
     const/4 p1, 0x3
 
@@ -1483,55 +1467,55 @@
 
 
 # virtual methods
-.method final JD()I
+.method final JC()I
     .locals 7
 
-    iget v0, p0, Lorg/a/a/r;->ciP:I
+    iget v0, p0, Lorg/a/a/r;->cij:I
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lorg/a/a/r;->bTR:I
+    iget v0, p0, Lorg/a/a/r;->bTx:I
 
     add-int/lit8 v0, v0, 0x6
 
     return v0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     const v1, 0xffff
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     const/16 v4, 0x8
 
     if-lez v0, :cond_a
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     const/high16 v5, 0x10000
 
     if-gt v0, v5, :cond_9
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "Code"
 
     invoke-virtual {v0, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v0, v0, 0x12
 
-    iget v5, p0, Lorg/a/a/r;->cjv:I
+    iget v5, p0, Lorg/a/a/r;->ciP:I
 
     mul-int/lit8 v5, v5, 0x8
 
@@ -1539,70 +1523,70 @@
 
     add-int/2addr v0, v4
 
-    iget-object v5, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
     if-eqz v5, :cond_1
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v6, "LocalVariableTable"
 
     invoke-virtual {v5, v6}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v5, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
-    iget v5, v5, Lorg/a/a/d;->chr:I
+    iget v5, v5, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v5, v4
 
     add-int/2addr v0, v5
 
     :cond_1
-    iget-object v5, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
     if-eqz v5, :cond_2
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v6, "LocalVariableTypeTable"
 
     invoke-virtual {v5, v6}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v5, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
-    iget v5, v5, Lorg/a/a/d;->chr:I
+    iget v5, v5, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v5, v4
 
     add-int/2addr v0, v5
 
     :cond_2
-    iget-object v5, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v6, "LineNumberTable"
 
     invoke-virtual {v5, v6}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v5, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
-    iget v5, v5, Lorg/a/a/d;->chr:I
+    iget v5, v5, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v5, v4
 
     add-int/2addr v0, v5
 
     :cond_3
-    iget-object v5, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     if-eqz v5, :cond_6
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget v5, v5, Lorg/a/a/g;->chr:I
+    iget v5, v5, Lorg/a/a/g;->cgL:I
 
     and-int/2addr v5, v1
 
@@ -1618,7 +1602,7 @@
     const/4 v5, 0x0
 
     :goto_0
-    iget-object v6, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v6, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     if-eqz v5, :cond_5
 
@@ -1632,28 +1616,28 @@
     :goto_1
     invoke-virtual {v6, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v5, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    iget v5, v5, Lorg/a/a/d;->chr:I
+    iget v5, v5, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v5, v4
 
     add-int/2addr v0, v5
 
     :cond_6
-    iget-object v5, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object v5, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     if-eqz v5, :cond_7
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v6, "RuntimeVisibleTypeAnnotations"
 
     invoke-virtual {v5, v6}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v5, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object v5, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
-    invoke-virtual {v5}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v5}, Lorg/a/a/b;->JC()I
 
     move-result v5
 
@@ -1662,19 +1646,19 @@
     add-int/2addr v0, v5
 
     :cond_7
-    iget-object v5, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object v5, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     if-eqz v5, :cond_8
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v6, "RuntimeInvisibleTypeAnnotations"
 
     invoke-virtual {v5, v6}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v5, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object v5, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
-    invoke-virtual {v5}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v5}, Lorg/a/a/b;->JC()I
 
     move-result v5
 
@@ -1683,13 +1667,11 @@
     add-int/2addr v0, v5
 
     :cond_8
-    iget-object v5, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
+    iget-object v5, p0, Lorg/a/a/r;->cjd:Lorg/a/a/c;
 
     if-eqz v5, :cond_b
 
-    iget-object v5, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
-
-    iget-object v6, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v6, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v5, v6}, Lorg/a/a/c;->a(Lorg/a/a/g;)I
 
@@ -1713,17 +1695,17 @@
 
     :cond_b
     :goto_2
-    iget v5, p0, Lorg/a/a/r;->cja:I
+    iget v5, p0, Lorg/a/a/r;->ciu:I
 
     if-lez v5, :cond_c
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v6, "Exceptions"
 
     invoke-virtual {v5, v6}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget v5, p0, Lorg/a/a/r;->cja:I
+    iget v5, p0, Lorg/a/a/r;->ciu:I
 
     mul-int/lit8 v5, v5, 0x2
 
@@ -1732,15 +1714,15 @@
     add-int/2addr v0, v5
 
     :cond_c
-    iget v5, p0, Lorg/a/a/r;->chH:I
+    iget v5, p0, Lorg/a/a/r;->chb:I
 
     and-int/lit16 v5, v5, 0x1000
 
     if-eqz v5, :cond_e
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget v5, v5, Lorg/a/a/g;->chr:I
+    iget v5, v5, Lorg/a/a/g;->cgL:I
 
     and-int/2addr v1, v5
 
@@ -1748,7 +1730,7 @@
 
     if-lt v1, v5, :cond_d
 
-    iget v1, p0, Lorg/a/a/r;->chH:I
+    iget v1, p0, Lorg/a/a/r;->chb:I
 
     const/high16 v5, 0x40000
 
@@ -1757,7 +1739,7 @@
     if-eqz v1, :cond_e
 
     :cond_d
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "Synthetic"
 
@@ -1766,7 +1748,7 @@
     add-int/lit8 v0, v0, 0x6
 
     :cond_e
-    iget v1, p0, Lorg/a/a/r;->chH:I
+    iget v1, p0, Lorg/a/a/r;->chb:I
 
     const/high16 v5, 0x20000
 
@@ -1774,7 +1756,7 @@
 
     if-eqz v1, :cond_f
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "Deprecated"
 
@@ -1783,76 +1765,76 @@
     add-int/lit8 v0, v0, 0x6
 
     :cond_f
-    iget-object v1, p0, Lorg/a/a/r;->cis:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/r;->chM:Ljava/lang/String;
 
     if-eqz v1, :cond_10
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "Signature"
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v5, p0, Lorg/a/a/r;->cis:Ljava/lang/String;
+    iget-object v5, p0, Lorg/a/a/r;->chM:Ljava/lang/String;
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
     add-int/lit8 v0, v0, 0x8
 
     :cond_10
-    iget-object v1, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
     if-eqz v1, :cond_11
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "MethodParameters"
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v1, 0x7
 
     add-int/2addr v0, v1
 
     :cond_11
-    iget-object v1, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
     if-eqz v1, :cond_12
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "AnnotationDefault"
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v1, v1, 0x6
 
     add-int/2addr v0, v1
 
     :cond_12
-    iget-object v1, p0, Lorg/a/a/r;->cjj:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciD:Lorg/a/a/b;
 
     if-eqz v1, :cond_13
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "RuntimeVisibleAnnotations"
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjj:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciD:Lorg/a/a/b;
 
-    invoke-virtual {v1}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v1}, Lorg/a/a/b;->JC()I
 
     move-result v1
 
@@ -1861,19 +1843,19 @@
     add-int/2addr v0, v1
 
     :cond_13
-    iget-object v1, p0, Lorg/a/a/r;->cjk:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciE:Lorg/a/a/b;
 
     if-eqz v1, :cond_14
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "RuntimeInvisibleAnnotations"
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjk:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciE:Lorg/a/a/b;
 
-    invoke-virtual {v1}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v1}, Lorg/a/a/b;->JC()I
 
     move-result v1
 
@@ -1882,19 +1864,19 @@
     add-int/2addr v0, v1
 
     :cond_14
-    iget-object v1, p0, Lorg/a/a/r;->cjl:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciF:Lorg/a/a/b;
 
     if-eqz v1, :cond_15
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "RuntimeVisibleTypeAnnotations"
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjl:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciF:Lorg/a/a/b;
 
-    invoke-virtual {v1}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v1}, Lorg/a/a/b;->JC()I
 
     move-result v1
 
@@ -1903,19 +1885,19 @@
     add-int/2addr v0, v1
 
     :cond_15
-    iget-object v1, p0, Lorg/a/a/r;->cjm:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/b;
 
     if-eqz v1, :cond_16
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v5, "RuntimeInvisibleTypeAnnotations"
 
     invoke-virtual {v1, v5}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjm:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/b;
 
-    invoke-virtual {v1}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v1}, Lorg/a/a/b;->JC()I
 
     move-result v1
 
@@ -1924,57 +1906,53 @@
     add-int/2addr v0, v1
 
     :cond_16
-    iget-object v1, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
     if-eqz v1, :cond_18
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v4, "RuntimeVisibleParameterAnnotations"
 
     invoke-virtual {v1, v4}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
+
+    array-length v4, v1
+
+    iget v5, p0, Lorg/a/a/r;->ciJ:I
+
+    sub-int/2addr v4, v5
+
+    mul-int/lit8 v4, v4, 0x2
+
+    add-int/lit8 v4, v4, 0x7
+
+    add-int/2addr v0, v4
 
     array-length v1, v1
 
-    iget v4, p0, Lorg/a/a/r;->cjp:I
-
-    sub-int/2addr v1, v4
-
-    mul-int/lit8 v1, v1, 0x2
-
-    add-int/lit8 v1, v1, 0x7
-
-    add-int/2addr v0, v1
-
-    iget-object v1, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
-
-    array-length v1, v1
-
-    sub-int/2addr v1, v3
+    sub-int/2addr v1, v2
 
     :goto_3
-    iget v4, p0, Lorg/a/a/r;->cjp:I
+    iget v4, p0, Lorg/a/a/r;->ciJ:I
 
     if-lt v1, v4, :cond_18
 
-    iget-object v4, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object v4, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
-    aget-object v4, v4, v1
+    aget-object v5, v4, v1
 
-    if-nez v4, :cond_17
+    if-nez v5, :cond_17
 
     const/4 v4, 0x0
 
     goto :goto_4
 
     :cond_17
-    iget-object v4, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
-
     aget-object v4, v4, v1
 
-    invoke-virtual {v4}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v4}, Lorg/a/a/b;->JC()I
 
     move-result v4
 
@@ -1986,75 +1964,69 @@
     goto :goto_3
 
     :cond_18
-    iget-object v1, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
     if-eqz v1, :cond_1a
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v4, "RuntimeInvisibleParameterAnnotations"
 
     invoke-virtual {v1, v4}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
+
+    array-length v4, v1
+
+    iget v5, p0, Lorg/a/a/r;->ciJ:I
+
+    sub-int/2addr v4, v5
+
+    mul-int/lit8 v4, v4, 0x2
+
+    add-int/lit8 v4, v4, 0x7
+
+    add-int/2addr v0, v4
 
     array-length v1, v1
 
-    iget v4, p0, Lorg/a/a/r;->cjp:I
-
-    sub-int/2addr v1, v4
-
-    mul-int/lit8 v1, v1, 0x2
-
-    add-int/lit8 v1, v1, 0x7
-
-    add-int/2addr v0, v1
-
-    iget-object v1, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
-
-    array-length v1, v1
-
-    sub-int/2addr v1, v3
+    sub-int/2addr v1, v2
 
     :goto_5
-    iget v3, p0, Lorg/a/a/r;->cjp:I
+    iget v2, p0, Lorg/a/a/r;->ciJ:I
 
-    if-lt v1, v3, :cond_1a
+    if-lt v1, v2, :cond_1a
 
-    iget-object v3, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object v2, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
-    aget-object v3, v3, v1
+    aget-object v4, v2, v1
 
-    if-nez v3, :cond_19
+    if-nez v4, :cond_19
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     goto :goto_6
 
     :cond_19
-    iget-object v3, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    aget-object v2, v2, v1
 
-    aget-object v3, v3, v1
+    invoke-virtual {v2}, Lorg/a/a/b;->JC()I
 
-    invoke-virtual {v3}, Lorg/a/a/b;->JD()I
-
-    move-result v3
+    move-result v2
 
     :goto_6
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     add-int/lit8 v1, v1, -0x1
 
     goto :goto_5
 
     :cond_1a
-    iget-object v1, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
+    iget-object v1, p0, Lorg/a/a/r;->ciK:Lorg/a/a/c;
 
     if-eqz v1, :cond_1b
 
-    iget-object v1, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
-
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v1, v2}, Lorg/a/a/c;->a(Lorg/a/a/g;)I
 
@@ -2066,20 +2038,20 @@
     return v0
 .end method
 
-.method public final JH()Lorg/a/a/a;
+.method public final JG()Lorg/a/a/a;
     .locals 7
 
     new-instance v0, Lorg/a/a/d;
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
     new-instance v0, Lorg/a/a/b;
 
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v4, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
     const/4 v3, 0x0
 
@@ -2109,7 +2081,7 @@
 
     if-eqz v0, :cond_0
 
-    iget p2, p0, Lorg/a/a/r;->cjp:I
+    iget p2, p0, Lorg/a/a/r;->ciJ:I
 
     add-int/lit8 p1, p1, 0x1
 
@@ -2117,11 +2089,11 @@
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/r;->cjp:I
+    iput p1, p0, Lorg/a/a/r;->ciJ:I
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const/4 v2, 0x0
 
@@ -2140,7 +2112,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p2}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -2156,7 +2128,7 @@
 
     new-instance p2, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const/4 v2, 0x1
 
@@ -2170,11 +2142,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
     if-nez p3, :cond_1
 
-    iget-object p3, p0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object p3, p0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
     invoke-static {p3}, Lorg/a/a/t;->fb(Ljava/lang/String;)[Lorg/a/a/t;
 
@@ -2184,27 +2156,25 @@
 
     new-array p3, p3, [Lorg/a/a/b;
 
-    iput-object p3, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iput-object p3, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
     :cond_1
-    iget-object p3, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
-    aget-object p3, p3, p1
+    aget-object v0, p3, p1
 
-    iput-object p3, p2, Lorg/a/a/b;->chw:Lorg/a/a/b;
-
-    iget-object p3, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iput-object v0, p2, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
     aput-object p2, p3, p1
 
     goto :goto_0
 
     :cond_2
-    iget-object p3, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
     if-nez p3, :cond_3
 
-    iget-object p3, p0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object p3, p0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
     invoke-static {p3}, Lorg/a/a/t;->fb(Ljava/lang/String;)[Lorg/a/a/t;
 
@@ -2214,16 +2184,14 @@
 
     new-array p3, p3, [Lorg/a/a/b;
 
-    iput-object p3, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iput-object p3, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
     :cond_3
-    iget-object p3, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
-    aget-object p3, p3, p1
+    aget-object v0, p3, p1
 
-    iput-object p3, p2, Lorg/a/a/b;->chw:Lorg/a/a/b;
-
-    iget-object p3, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iput-object v0, p2, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
     aput-object p2, p3, p1
 
@@ -2240,7 +2208,7 @@
 
     invoke-static {p1, p2, v4}, Lorg/a/a/b;->a(ILorg/a/a/u;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p1, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -2256,9 +2224,9 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget p2, v4, Lorg/a/a/d;->chr:I
+    iget p2, v4, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v5, p2, -0x2
 
@@ -2272,20 +2240,20 @@
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/r;->cjl:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->ciF:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjl:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->ciF:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/r;->cjm:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjm:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/b;
 
     :goto_0
     return-object p1
@@ -2319,7 +2287,7 @@
 
     aget-object v2, p3, v1
 
-    iget v2, v2, Lorg/a/a/p;->chH:I
+    iget v2, v2, Lorg/a/a/p;->chb:I
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
@@ -2327,11 +2295,11 @@
 
     aget-object v3, p4, v1
 
-    iget v3, v3, Lorg/a/a/p;->chH:I
+    iget v3, v3, Lorg/a/a/p;->chb:I
 
     aget-object v4, p3, v1
 
-    iget v4, v4, Lorg/a/a/p;->chH:I
+    iget v4, v4, Lorg/a/a/p;->chb:I
 
     sub-int/2addr v3, v4
 
@@ -2355,9 +2323,9 @@
     goto :goto_1
 
     :cond_1
-    iget-object p3, p2, Lorg/a/a/u;->chA:[B
+    iget-object p3, p2, Lorg/a/a/u;->cgU:[B
 
-    iget p4, p2, Lorg/a/a/u;->chr:I
+    iget p4, p2, Lorg/a/a/u;->cgL:I
 
     aget-byte p3, p3, p4
 
@@ -2365,14 +2333,14 @@
 
     add-int/lit8 p3, p3, 0x1
 
-    iget-object p4, p2, Lorg/a/a/u;->chA:[B
+    iget-object p4, p2, Lorg/a/a/u;->cgU:[B
 
-    iget p2, p2, Lorg/a/a/u;->chr:I
+    iget p2, p2, Lorg/a/a/u;->cgL:I
 
     invoke-virtual {v0, p4, p2, p3}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :goto_1
-    iget-object p2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p2, p6}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -2386,11 +2354,11 @@
 
     new-instance v1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const/4 p3, 0x1
 
-    iget p1, v0, Lorg/a/a/d;->chr:I
+    iget p1, v0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 p6, p1, -0x2
 
@@ -2404,20 +2372,20 @@
 
     if-eqz p7, :cond_2
 
-    iget-object p1, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object p1, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
-    iput-object p1, v1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p1, v1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object v1, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iput-object v1, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     goto :goto_2
 
     :cond_2
-    iget-object p1, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object p1, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
-    iput-object p1, v1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p1, v1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object v1, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iput-object v1, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     :goto_2
     return-object v1
@@ -2426,27 +2394,25 @@
 .method public final varargs a(IILorg/a/a/p;[Lorg/a/a/p;)V
     .locals 5
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v2, 0xaa
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
-
-    iget v2, v2, Lorg/a/a/d;->chr:I
+    iget v2, v1, Lorg/a/a/d;->cgL:I
 
     rem-int/lit8 v2, v2, 0x4
 
@@ -2460,13 +2426,13 @@
 
     invoke-virtual {v1, v4, v3, v2}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/4 v2, 0x1
 
     invoke-virtual {p3, v1, v0, v2}, Lorg/a/a/p;->a(Lorg/a/a/d;IZ)V
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v1, p1}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
@@ -2481,7 +2447,7 @@
 
     aget-object p1, p4, v3
 
-    iget-object p2, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {p1, p2, v0, v2}, Lorg/a/a/p;->a(Lorg/a/a/d;IZ)V
 
@@ -2496,279 +2462,275 @@
 .end method
 
 .method public final a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-    .locals 17
+    .locals 15
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
     move/from16 v1, p1
 
     move/from16 v2, p2
 
-    move/from16 v4, p4
+    move/from16 v3, p4
 
-    iget v6, v0, Lorg/a/a/r;->M:I
+    iget v4, v0, Lorg/a/a/r;->M:I
 
-    if-nez v6, :cond_0
+    if-nez v4, :cond_0
 
     return-void
 
     :cond_0
-    const/4 v6, -0x1
+    const/4 v4, -0x1
 
-    const/4 v7, 0x3
+    const/4 v5, 0x3
 
-    const/4 v8, 0x0
+    const/4 v6, 0x0
 
-    const/4 v9, 0x1
+    const/4 v7, 0x1
 
-    if-ne v1, v6, :cond_d
+    if-ne v1, v4, :cond_d
 
-    iget-object v1, v0, Lorg/a/a/r;->cjt:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciN:[I
 
-    const/high16 v6, 0x1700000
+    const/high16 v4, 0x1700000
 
     if-nez v1, :cond_6
 
-    iget-object v1, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v1, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
     move-result v1
 
-    add-int/2addr v1, v9
+    add-int/2addr v1, v7
 
-    invoke-direct {v0, v8, v1, v8}, Lorg/a/a/r;->s(III)I
+    invoke-direct {p0, v6, v1, v6}, Lorg/a/a/r;->s(III)I
 
     move-result v1
 
-    iget v10, v0, Lorg/a/a/r;->chH:I
+    iget v8, v0, Lorg/a/a/r;->chb:I
 
-    and-int/lit8 v10, v10, 0x8
+    and-int/lit8 v9, v8, 0x8
 
-    if-nez v10, :cond_2
+    if-nez v9, :cond_2
 
-    iget v10, v0, Lorg/a/a/r;->chH:I
+    const/high16 v9, 0x80000
 
-    const/high16 v11, 0x80000
+    and-int/2addr v8, v9
 
-    and-int/2addr v10, v11
+    if-nez v8, :cond_1
 
-    if-nez v10, :cond_1
-
-    iget-object v10, v0, Lorg/a/a/r;->cju:[I
+    iget-object v8, v0, Lorg/a/a/r;->ciO:[I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v11, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v9, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v12, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v10, v9, Lorg/a/a/g;->chl:Ljava/lang/String;
 
-    iget-object v12, v12, Lorg/a/a/g;->chR:Ljava/lang/String;
+    invoke-virtual {v9, v10}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
-    invoke-virtual {v11, v12}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
+    move-result v9
 
-    move-result v11
+    or-int/2addr v9, v4
 
-    or-int/2addr v11, v6
-
-    aput v11, v10, v7
+    aput v9, v8, v5
 
     goto :goto_0
 
     :cond_1
-    iget-object v10, v0, Lorg/a/a/r;->cju:[I
+    iget-object v8, v0, Lorg/a/a/r;->ciO:[I
 
     add-int/lit8 v1, v1, 0x1
 
-    const/4 v11, 0x6
+    const/4 v9, 0x6
 
-    aput v11, v10, v7
+    aput v9, v8, v5
 
     :cond_2
     :goto_0
-    move v10, v1
+    move v8, v1
 
     const/4 v1, 0x1
 
     :goto_1
-    iget-object v11, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v9, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    add-int/lit8 v12, v1, 0x1
+    add-int/lit8 v10, v1, 0x1
 
-    invoke-virtual {v11, v1}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v9, v1}, Ljava/lang/String;->charAt(I)C
 
-    move-result v11
+    move-result v9
 
-    const/16 v13, 0x3b
+    const/16 v11, 0x3b
 
-    sparse-switch v11, :sswitch_data_0
+    sparse-switch v9, :sswitch_data_0
 
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    sub-int/2addr v10, v7
+    sub-int/2addr v8, v5
 
-    aput v10, v1, v9
+    aput v8, v1, v7
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/r;->JJ()V
+    invoke-direct {p0}, Lorg/a/a/r;->JI()V
 
     goto/16 :goto_6
 
     :goto_2
     :sswitch_0
-    iget-object v11, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v9, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    invoke-virtual {v11, v12}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v9, v10}, Ljava/lang/String;->charAt(I)C
 
-    move-result v11
+    move-result v9
 
-    const/16 v14, 0x5b
+    const/16 v12, 0x5b
 
-    if-ne v11, v14, :cond_3
+    if-ne v9, v12, :cond_3
 
-    add-int/lit8 v12, v12, 0x1
+    add-int/lit8 v10, v10, 0x1
 
     goto :goto_2
 
     :cond_3
-    iget-object v11, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v9, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    invoke-virtual {v11, v12}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v9, v10}, Ljava/lang/String;->charAt(I)C
 
-    move-result v11
+    move-result v9
 
-    const/16 v14, 0x4c
+    const/16 v12, 0x4c
 
-    if-ne v11, v14, :cond_4
+    if-ne v9, v12, :cond_4
 
     :goto_3
-    add-int/lit8 v12, v12, 0x1
+    add-int/lit8 v10, v10, 0x1
 
-    iget-object v11, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v9, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    invoke-virtual {v11, v12}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v9, v10}, Ljava/lang/String;->charAt(I)C
 
-    move-result v11
+    move-result v9
 
-    if-eq v11, v13, :cond_4
+    if-eq v9, v11, :cond_4
 
     goto :goto_3
 
     :cond_4
-    iget-object v11, v0, Lorg/a/a/r;->cju:[I
+    iget-object v9, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v13, v10, 0x1
+    add-int/lit8 v11, v8, 0x1
 
-    iget-object v14, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v12, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v15, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v13, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    add-int/2addr v12, v9
+    add-int/2addr v10, v7
 
-    invoke-virtual {v15, v1, v12}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v13, v1, v10}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v14, v1}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
+    invoke-virtual {v12, v1}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
     move-result v1
 
-    or-int/2addr v1, v6
+    or-int/2addr v1, v4
 
-    aput v1, v11, v10
+    aput v1, v9, v8
 
-    move v1, v12
+    move v1, v10
 
-    move v10, v13
+    move v8, v11
 
     goto :goto_1
 
     :sswitch_1
-    move v1, v12
+    move v1, v10
 
     :goto_4
-    iget-object v11, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v9, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    invoke-virtual {v11, v1}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v9, v1}, Ljava/lang/String;->charAt(I)C
 
-    move-result v11
+    move-result v9
 
-    if-eq v11, v13, :cond_5
+    if-eq v9, v11, :cond_5
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_4
 
     :cond_5
-    iget-object v11, v0, Lorg/a/a/r;->cju:[I
+    iget-object v9, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v13, v10, 0x1
+    add-int/lit8 v11, v8, 0x1
 
-    iget-object v14, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v12, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v15, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v13, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    add-int/lit8 v16, v1, 0x1
+    add-int/lit8 v14, v1, 0x1
 
-    invoke-virtual {v15, v12, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v13, v10, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v14, v1}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
+    invoke-virtual {v12, v1}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
     move-result v1
 
-    or-int/2addr v1, v6
+    or-int/2addr v1, v4
 
-    aput v1, v11, v10
+    aput v1, v9, v8
 
-    move v10, v13
+    move v8, v11
 
-    move/from16 v1, v16
+    move v1, v14
 
     goto :goto_1
 
     :sswitch_2
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v11, v10, 0x1
+    add-int/lit8 v9, v8, 0x1
 
-    const/4 v13, 0x4
+    const/4 v11, 0x4
 
-    aput v13, v1, v10
+    aput v11, v1, v8
 
     goto :goto_5
 
     :sswitch_3
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v11, v10, 0x1
+    add-int/lit8 v9, v8, 0x1
 
-    const/4 v13, 0x2
+    const/4 v11, 0x2
 
-    aput v13, v1, v10
+    aput v11, v1, v8
 
     goto :goto_5
 
     :sswitch_4
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v11, v10, 0x1
+    add-int/lit8 v9, v8, 0x1
 
-    aput v7, v1, v10
+    aput v5, v1, v8
 
     goto :goto_5
 
     :sswitch_5
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v11, v10, 0x1
+    add-int/lit8 v9, v8, 0x1
 
-    aput v9, v1, v10
+    aput v7, v1, v8
 
     :goto_5
-    move v10, v11
+    move v8, v9
 
-    move v1, v12
+    move v1, v10
 
     goto/16 :goto_1
 
@@ -2776,99 +2738,99 @@
     :goto_6
     iput v2, v0, Lorg/a/a/r;->T:I
 
-    iget-object v1, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
-    invoke-direct {v0, v1, v2, v4}, Lorg/a/a/r;->s(III)I
+    invoke-direct {p0, v1, v2, v3}, Lorg/a/a/r;->s(III)I
 
     move-result v1
 
-    move v7, v1
+    move v5, v1
 
     const/4 v1, 0x0
 
     :goto_7
-    const/high16 v9, 0x1800000
+    const/high16 v7, 0x1800000
 
     if-ge v1, v2, :cond_9
 
+    aget-object v8, p3, v1
+
+    instance-of v8, v8, Ljava/lang/String;
+
+    if-eqz v8, :cond_7
+
+    iget-object v7, v0, Lorg/a/a/r;->ciO:[I
+
+    add-int/lit8 v8, v5, 0x1
+
+    iget-object v9, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
+
     aget-object v10, p3, v1
 
-    instance-of v10, v10, Ljava/lang/String;
+    check-cast v10, Ljava/lang/String;
 
-    if-eqz v10, :cond_7
+    invoke-virtual {v9, v10}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
-    iget-object v9, v0, Lorg/a/a/r;->cju:[I
+    move-result v9
 
-    add-int/lit8 v10, v7, 0x1
+    or-int/2addr v9, v4
 
-    iget-object v11, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
-
-    aget-object v12, p3, v1
-
-    check-cast v12, Ljava/lang/String;
-
-    invoke-virtual {v11, v12}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
-
-    move-result v11
-
-    or-int/2addr v11, v6
-
-    aput v11, v9, v7
+    aput v9, v7, v5
 
     :goto_8
-    move v7, v10
+    move v5, v8
 
     goto :goto_9
 
     :cond_7
-    aget-object v10, p3, v1
+    aget-object v8, p3, v1
 
-    instance-of v10, v10, Ljava/lang/Integer;
+    instance-of v8, v8, Ljava/lang/Integer;
 
-    if-eqz v10, :cond_8
+    if-eqz v8, :cond_8
 
-    iget-object v9, v0, Lorg/a/a/r;->cju:[I
+    iget-object v7, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v10, v7, 0x1
+    add-int/lit8 v8, v5, 0x1
 
-    aget-object v11, p3, v1
+    aget-object v9, p3, v1
 
-    check-cast v11, Ljava/lang/Integer;
+    check-cast v9, Ljava/lang/Integer;
 
-    invoke-virtual {v11}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v9}, Ljava/lang/Integer;->intValue()I
 
-    move-result v11
+    move-result v9
 
-    aput v11, v9, v7
+    aput v9, v7, v5
 
     goto :goto_8
 
     :cond_8
-    iget-object v10, v0, Lorg/a/a/r;->cju:[I
+    iget-object v8, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v11, v7, 0x1
+    add-int/lit8 v9, v5, 0x1
 
-    iget-object v12, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v10, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    const-string v13, ""
+    const-string v11, ""
 
-    aget-object v14, p3, v1
+    aget-object v12, p3, v1
 
-    check-cast v14, Lorg/a/a/p;
+    check-cast v12, Lorg/a/a/p;
 
-    iget v14, v14, Lorg/a/a/p;->chH:I
+    iget v12, v12, Lorg/a/a/p;->chb:I
 
-    invoke-virtual {v12, v13, v14}, Lorg/a/a/g;->m(Ljava/lang/String;I)I
+    invoke-virtual {v10, v11, v12}, Lorg/a/a/g;->m(Ljava/lang/String;I)I
 
-    move-result v12
+    move-result v10
 
-    or-int/2addr v9, v12
+    or-int/2addr v7, v10
 
-    aput v9, v10, v7
+    aput v7, v8, v5
 
-    move v7, v11
+    move v5, v9
 
     :goto_9
     add-int/lit8 v1, v1, 0x1
@@ -2877,126 +2839,126 @@
 
     :cond_9
     :goto_a
-    if-ge v8, v4, :cond_c
+    if-ge v6, v3, :cond_c
 
-    aget-object v1, p5, v8
+    aget-object v1, p5, v6
 
     instance-of v1, v1, Ljava/lang/String;
 
     if-eqz v1, :cond_a
 
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v2, v7, 0x1
+    add-int/lit8 v2, v5, 0x1
 
-    iget-object v3, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v8, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    aget-object v10, p5, v8
+    aget-object v9, p5, v6
 
-    check-cast v10, Ljava/lang/String;
+    check-cast v9, Ljava/lang/String;
 
-    invoke-virtual {v3, v10}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
+    invoke-virtual {v8, v9}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
-    move-result v3
+    move-result v8
 
-    or-int/2addr v3, v6
+    or-int/2addr v8, v4
 
-    aput v3, v1, v7
+    aput v8, v1, v5
 
     :goto_b
-    move v7, v2
+    move v5, v2
 
     goto :goto_c
 
     :cond_a
-    aget-object v1, p5, v8
+    aget-object v1, p5, v6
 
     instance-of v1, v1, Ljava/lang/Integer;
 
     if-eqz v1, :cond_b
 
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v2, v7, 0x1
+    add-int/lit8 v2, v5, 0x1
 
-    aget-object v3, p5, v8
+    aget-object v8, p5, v6
 
-    check-cast v3, Ljava/lang/Integer;
+    check-cast v8, Ljava/lang/Integer;
 
-    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v8}, Ljava/lang/Integer;->intValue()I
 
-    move-result v3
+    move-result v8
 
-    aput v3, v1, v7
+    aput v8, v1, v5
 
     goto :goto_b
 
     :cond_b
-    iget-object v1, v0, Lorg/a/a/r;->cju:[I
+    iget-object v1, v0, Lorg/a/a/r;->ciO:[I
 
-    add-int/lit8 v2, v7, 0x1
+    add-int/lit8 v2, v5, 0x1
 
-    iget-object v3, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v8, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    const-string v10, ""
+    const-string v9, ""
 
-    aget-object v11, p5, v8
+    aget-object v10, p5, v6
 
-    check-cast v11, Lorg/a/a/p;
+    check-cast v10, Lorg/a/a/p;
 
-    iget v11, v11, Lorg/a/a/p;->chH:I
+    iget v10, v10, Lorg/a/a/p;->chb:I
 
-    invoke-virtual {v3, v10, v11}, Lorg/a/a/g;->m(Ljava/lang/String;I)I
+    invoke-virtual {v8, v9, v10}, Lorg/a/a/g;->m(Ljava/lang/String;I)I
 
-    move-result v3
+    move-result v8
 
-    or-int/2addr v3, v9
+    or-int/2addr v8, v7
 
-    aput v3, v1, v7
+    aput v8, v1, v5
 
     goto :goto_b
 
     :goto_c
-    add-int/lit8 v8, v8, 0x1
+    add-int/lit8 v6, v6, 0x1
 
     goto :goto_a
 
     :cond_c
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/r;->JJ()V
+    invoke-direct {p0}, Lorg/a/a/r;->JI()V
 
     goto/16 :goto_14
 
     :cond_d
-    iget-object v6, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v4, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    if-nez v6, :cond_e
+    if-nez v4, :cond_e
 
-    new-instance v6, Lorg/a/a/d;
+    new-instance v4, Lorg/a/a/d;
 
-    invoke-direct {v6}, Lorg/a/a/d;-><init>()V
+    invoke-direct {v4}, Lorg/a/a/d;-><init>()V
 
-    iput-object v6, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iput-object v4, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    iget-object v6, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v4, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v6, v6, Lorg/a/a/d;->chr:I
+    iget v4, v4, Lorg/a/a/d;->cgL:I
 
     goto :goto_d
 
     :cond_e
-    iget-object v6, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v4, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v6, v6, Lorg/a/a/d;->chr:I
+    iget v4, v4, Lorg/a/a/d;->cgL:I
 
-    iget v10, v0, Lorg/a/a/r;->w:I
+    iget v8, v0, Lorg/a/a/r;->w:I
 
-    sub-int/2addr v6, v10
+    sub-int/2addr v4, v8
 
-    sub-int/2addr v6, v9
+    sub-int/2addr v4, v7
 
-    if-gez v6, :cond_10
+    if-gez v4, :cond_10
 
-    if-ne v1, v7, :cond_f
+    if-ne v1, v5, :cond_f
 
     return-void
 
@@ -3009,27 +2971,27 @@
 
     :cond_10
     :goto_d
-    const/16 v7, 0x40
+    const/16 v5, 0x40
 
-    const/16 v10, 0xfb
+    const/16 v8, 0xfb
 
     packed-switch v1, :pswitch_data_0
 
     goto/16 :goto_13
 
     :pswitch_0
-    if-ge v6, v7, :cond_11
+    if-ge v4, v5, :cond_11
 
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    add-int/2addr v6, v7
+    add-int/2addr v4, v5
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     goto :goto_e
 
     :cond_11
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     const/16 v2, 0xf7
 
@@ -3037,26 +2999,26 @@
 
     move-result-object v1
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :goto_e
-    aget-object v1, p5, v8
+    aget-object v1, p5, v6
 
-    invoke-direct {v0, v1}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
+    invoke-direct {p0, v1}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
 
     goto :goto_13
 
     :pswitch_1
-    if-ge v6, v7, :cond_12
+    if-ge v4, v5, :cond_12
 
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     goto :goto_13
 
     :cond_12
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     goto :goto_f
 
@@ -3067,16 +3029,16 @@
 
     iput v1, v0, Lorg/a/a/r;->T:I
 
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    sub-int/2addr v10, v2
+    sub-int/2addr v8, v2
 
     :goto_f
-    invoke-virtual {v1, v10}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    invoke-virtual {v1, v8}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     goto :goto_13
 
@@ -3087,7 +3049,7 @@
 
     iput v1, v0, Lorg/a/a/r;->T:I
 
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     add-int/lit16 v5, v2, 0xfb
 
@@ -3095,31 +3057,31 @@
 
     move-result-object v1
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :goto_10
-    if-ge v8, v2, :cond_14
+    if-ge v6, v2, :cond_14
 
-    aget-object v1, p3, v8
+    aget-object v1, p3, v6
 
-    invoke-direct {v0, v1}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
+    invoke-direct {p0, v1}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
 
-    add-int/lit8 v8, v8, 0x1
+    add-int/lit8 v6, v6, 0x1
 
     goto :goto_10
 
     :pswitch_4
     iput v2, v0, Lorg/a/a/r;->T:I
 
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    const/16 v7, 0xff
+    const/16 v5, 0xff
 
-    invoke-virtual {v1, v7}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    invoke-virtual {v1, v5}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v1
 
@@ -3130,54 +3092,54 @@
     :goto_11
     if-ge v1, v2, :cond_13
 
-    aget-object v6, p3, v1
+    aget-object v4, p3, v1
 
-    invoke-direct {v0, v6}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
+    invoke-direct {p0, v4}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_11
 
     :cond_13
-    iget-object v1, v0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    invoke-virtual {v1, v4}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
+    invoke-virtual {v1, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :goto_12
-    if-ge v8, v4, :cond_14
+    if-ge v6, v3, :cond_14
 
-    aget-object v1, p5, v8
+    aget-object v1, p5, v6
 
-    invoke-direct {v0, v1}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
+    invoke-direct {p0, v1}, Lorg/a/a/r;->bZ(Ljava/lang/Object;)V
 
-    add-int/lit8 v8, v8, 0x1
+    add-int/lit8 v6, v6, 0x1
 
     goto :goto_12
 
     :cond_14
     :goto_13
-    iget-object v1, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     iput v1, v0, Lorg/a/a/r;->w:I
 
-    iget v1, v0, Lorg/a/a/r;->cjr:I
+    iget v1, v0, Lorg/a/a/r;->ciL:I
 
-    add-int/2addr v1, v9
+    add-int/2addr v1, v7
 
-    iput v1, v0, Lorg/a/a/r;->cjr:I
+    iput v1, v0, Lorg/a/a/r;->ciL:I
 
     :goto_14
-    iget v1, v0, Lorg/a/a/r;->chX:I
+    iget v1, v0, Lorg/a/a/r;->chr:I
 
-    invoke-static {v1, v4}, Ljava/lang/Math;->max(II)I
+    invoke-static {v1, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    iput v1, v0, Lorg/a/a/r;->chX:I
+    iput v1, v0, Lorg/a/a/r;->chr:I
 
-    iget v1, v0, Lorg/a/a/r;->chY:I
+    iget v1, v0, Lorg/a/a/r;->chs:I
 
     iget v2, v0, Lorg/a/a/r;->T:I
 
@@ -3185,7 +3147,7 @@
 
     move-result v1
 
-    iput v1, v0, Lorg/a/a/r;->chY:I
+    iput v1, v0, Lorg/a/a/r;->chs:I
 
     return-void
 
@@ -3218,35 +3180,33 @@
 .method public final a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p2, p3, p4, p5}, Lorg/a/a/g;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/a/a/o;
 
     move-result-object p2
 
-    iget p3, p2, Lorg/a/a/o;->chH:I
+    iget p3, p2, Lorg/a/a/o;->chb:I
 
-    iget-object p5, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object p5, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     const/4 v0, 0x0
 
     if-eqz p5, :cond_4
 
-    iget p5, p0, Lorg/a/a/r;->M:I
+    iget v1, p0, Lorg/a/a/r;->M:I
 
-    if-nez p5, :cond_0
+    if-nez v1, :cond_0
 
-    iget-object p5, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object p5, p5, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object p5, p5, Lorg/a/a/p;->cjc:Lorg/a/a/l;
-
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p5, p1, v0, v1, p2}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
 
@@ -3259,14 +3219,14 @@
 
     move-result p3
 
-    iput p3, p2, Lorg/a/a/o;->chH:I
+    iput p3, p2, Lorg/a/a/o;->chb:I
 
     :cond_1
     const/16 p5, 0xb8
 
     if-ne p1, p5, :cond_2
 
-    iget p5, p0, Lorg/a/a/r;->cjN:I
+    iget p5, p0, Lorg/a/a/r;->cjh:I
 
     shr-int/lit8 v1, p3, 0x2
 
@@ -3281,7 +3241,7 @@
     goto :goto_0
 
     :cond_2
-    iget p5, p0, Lorg/a/a/r;->cjN:I
+    iget p5, p0, Lorg/a/a/r;->cjh:I
 
     shr-int/lit8 v1, p3, 0x2
 
@@ -3292,14 +3252,14 @@
     add-int/2addr p5, v1
 
     :goto_0
-    iget v1, p0, Lorg/a/a/r;->cjO:I
+    iget v1, p0, Lorg/a/a/r;->cji:I
 
     if-le p5, v1, :cond_3
 
-    iput p5, p0, Lorg/a/a/r;->cjO:I
+    iput p5, p0, Lorg/a/a/r;->cji:I
 
     :cond_3
-    iput p5, p0, Lorg/a/a/r;->cjN:I
+    iput p5, p0, Lorg/a/a/r;->cjh:I
 
     :cond_4
     :goto_1
@@ -3313,12 +3273,12 @@
 
     move-result p3
 
-    iput p3, p2, Lorg/a/a/o;->chH:I
+    iput p3, p2, Lorg/a/a/o;->chb:I
 
     :cond_5
-    iget-object p1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/o;->ciC:I
+    iget p2, p2, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p1, p5, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -3331,9 +3291,9 @@
     return-void
 
     :cond_6
-    iget-object p3, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/o;->ciC:I
+    iget p2, p2, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p3, p1, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -3343,13 +3303,13 @@
 .method public final a(ILorg/a/a/p;)V
     .locals 7
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     const/16 v1, 0xa8
 
@@ -3363,25 +3323,23 @@
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v6, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v6, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
-
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     invoke-virtual {v0, p1, v3, v4, v4}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
 
-    invoke-virtual {p2}, Lorg/a/a/p;->JG()Lorg/a/a/p;
+    invoke-virtual {p2}, Lorg/a/a/p;->JF()Lorg/a/a/p;
 
     move-result-object v0
 
-    iget v6, v0, Lorg/a/a/p;->ciC:I
+    iget v6, v0, Lorg/a/a/p;->chW:I
 
     or-int/lit8 v6, v6, 0x10
 
-    iput v6, v0, Lorg/a/a/p;->ciC:I
+    iput v6, v0, Lorg/a/a/p;->chW:I
 
     invoke-direct {p0, v3, p2}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
@@ -3396,17 +3354,17 @@
     :cond_0
     if-ne p1, v1, :cond_2
 
-    iget v0, p2, Lorg/a/a/p;->ciC:I
+    iget v0, p2, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v0, v0, 0x200
 
     if-nez v0, :cond_1
 
-    iget v0, p2, Lorg/a/a/p;->ciC:I
+    iget v0, p2, Lorg/a/a/p;->chW:I
 
     or-int/lit16 v0, v0, 0x200
 
-    iput v0, p2, Lorg/a/a/p;->ciC:I
+    iput v0, p2, Lorg/a/a/p;->chW:I
 
     iget v0, p0, Lorg/a/a/r;->L:I
 
@@ -3415,15 +3373,15 @@
     iput v0, p0, Lorg/a/a/r;->L:I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget v4, v0, Lorg/a/a/p;->ciC:I
+    iget v4, v0, Lorg/a/a/p;->chW:I
 
     or-int/lit16 v4, v4, 0x80
 
-    iput v4, v0, Lorg/a/a/p;->ciC:I
+    iput v4, v0, Lorg/a/a/p;->chW:I
 
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     add-int/2addr v0, v5
 
@@ -3436,33 +3394,33 @@
     goto :goto_0
 
     :cond_2
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
-    sget-object v6, Lorg/a/a/l;->chB:[I
+    sget-object v6, Lorg/a/a/l;->cgV:[I
 
     aget v6, v6, p1
 
     add-int/2addr v0, v6
 
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     invoke-direct {p0, v0, p2}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
     :cond_3
     :goto_0
-    iget v0, p2, Lorg/a/a/p;->ciC:I
+    iget v0, p2, Lorg/a/a/p;->chW:I
 
     and-int/lit8 v0, v0, 0x2
 
     if-eqz v0, :cond_8
 
-    iget v0, p2, Lorg/a/a/p;->chH:I
+    iget v0, p2, Lorg/a/a/p;->chb:I
 
-    iget-object v6, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v6, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v6, v6, Lorg/a/a/d;->chr:I
+    iget v6, v6, Lorg/a/a/d;->cgL:I
 
     sub-int/2addr v0, v6
 
@@ -3475,7 +3433,7 @@
     if-ne p1, v2, :cond_4
 
     :goto_1
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v1, v0}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
@@ -3484,7 +3442,7 @@
     :cond_4
     if-ne p1, v1, :cond_5
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v1, 0xc9
 
@@ -3495,14 +3453,14 @@
     :cond_5
     if-eqz v4, :cond_6
 
-    iget v1, v4, Lorg/a/a/p;->ciC:I
+    iget v1, v4, Lorg/a/a/p;->chW:I
 
     or-int/lit8 v1, v1, 0x10
 
-    iput v1, v4, Lorg/a/a/p;->ciC:I
+    iput v1, v4, Lorg/a/a/p;->chW:I
 
     :cond_6
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v3, 0xa6
 
@@ -3522,7 +3480,7 @@
     :goto_2
     invoke-virtual {v1, v3}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v3, 0x8
 
@@ -3531,11 +3489,9 @@
     goto :goto_1
 
     :goto_3
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
-
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v0, Lorg/a/a/d;->cgL:I
 
     sub-int/2addr v1, v5
 
@@ -3544,22 +3500,20 @@
     goto :goto_4
 
     :cond_8
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
-
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v0, Lorg/a/a/d;->cgL:I
 
     sub-int/2addr v1, v5
 
     invoke-virtual {p2, v0, v1, v3}, Lorg/a/a/p;->a(Lorg/a/a/d;IZ)V
 
     :goto_4
-    iget-object p2, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object p2, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     if-eqz p2, :cond_a
 
@@ -3570,7 +3524,7 @@
     :cond_9
     if-ne p1, v2, :cond_a
 
-    invoke-direct {p0}, Lorg/a/a/r;->JI()V
+    invoke-direct {p0}, Lorg/a/a/r;->JH()V
 
     :cond_a
     return-void
@@ -3583,7 +3537,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object v1, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
     if-nez v1, :cond_0
 
@@ -3591,26 +3545,26 @@
 
     invoke-direct {v1}, Lorg/a/a/d;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iput-object v1, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
     :cond_0
-    iget v1, p0, Lorg/a/a/r;->cjC:I
+    iget v1, p0, Lorg/a/a/r;->ciW:I
 
     add-int/2addr v1, v0
 
-    iput v1, p0, Lorg/a/a/r;->cjC:I
+    iput v1, p0, Lorg/a/a/r;->ciW:I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
-    iget v2, p4, Lorg/a/a/p;->chH:I
+    iget v2, p4, Lorg/a/a/p;->chb:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, p5, Lorg/a/a/p;->chH:I
+    iget v2, p5, Lorg/a/a/p;->chb:I
 
-    iget v3, p4, Lorg/a/a/p;->chH:I
+    iget v3, p4, Lorg/a/a/p;->chb:I
 
     sub-int/2addr v2, v3
 
@@ -3618,7 +3572,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v2, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -3628,7 +3582,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v2, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -3641,7 +3595,7 @@
     invoke-virtual {p3, p6}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_1
-    iget-object p3, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
     if-nez p3, :cond_2
 
@@ -3649,26 +3603,26 @@
 
     invoke-direct {p3}, Lorg/a/a/d;-><init>()V
 
-    iput-object p3, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
     :cond_2
-    iget p3, p0, Lorg/a/a/r;->cjA:I
+    iget p3, p0, Lorg/a/a/r;->ciU:I
 
     add-int/2addr p3, v0
 
-    iput p3, p0, Lorg/a/a/r;->cjA:I
+    iput p3, p0, Lorg/a/a/r;->ciU:I
 
-    iget-object p3, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
-    iget v1, p4, Lorg/a/a/p;->chH:I
+    iget v1, p4, Lorg/a/a/p;->chb:I
 
     invoke-virtual {p3, v1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object p3
 
-    iget p5, p5, Lorg/a/a/p;->chH:I
+    iget p5, p5, Lorg/a/a/p;->chb:I
 
-    iget p4, p4, Lorg/a/a/p;->chH:I
+    iget p4, p4, Lorg/a/a/p;->chb:I
 
     sub-int/2addr p5, p4
 
@@ -3676,7 +3630,7 @@
 
     move-result-object p3
 
-    iget-object p4, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p4, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p4, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -3686,7 +3640,7 @@
 
     move-result-object p1
 
-    iget-object p3, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p3, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p3, p2}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -3727,11 +3681,11 @@
     :goto_0
     add-int/2addr p6, p3
 
-    iget p1, p0, Lorg/a/a/r;->chY:I
+    iget p1, p0, Lorg/a/a/r;->chs:I
 
     if-le p6, p1, :cond_5
 
-    iput p6, p0, Lorg/a/a/r;->chY:I
+    iput p6, p0, Lorg/a/a/r;->chs:I
 
     :cond_5
     return-void
@@ -3750,15 +3704,15 @@
 
     move-object/from16 v4, p4
 
-    iget-object v5, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v5, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v5, v5, Lorg/a/a/d;->chr:I
+    iget v5, v5, Lorg/a/a/d;->cgL:I
 
-    iput v5, v0, Lorg/a/a/r;->cjG:I
+    iput v5, v0, Lorg/a/a/r;->cja:I
 
-    iget-object v5, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v6, v5, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iget-object v6, v5, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
     if-nez v6, :cond_0
 
@@ -3766,28 +3720,28 @@
 
     invoke-direct {v6}, Lorg/a/a/d;-><init>()V
 
-    iput-object v6, v5, Lorg/a/a/g;->cif:Lorg/a/a/d;
+    iput-object v6, v5, Lorg/a/a/g;->chz:Lorg/a/a/d;
 
     :cond_0
-    iget v7, v6, Lorg/a/a/d;->chr:I
+    iget v7, v6, Lorg/a/a/d;->cgL:I
 
     invoke-virtual/range {p3 .. p3}, Lorg/a/a/m;->hashCode()I
 
     move-result v8
 
-    iget v9, v3, Lorg/a/a/m;->ciC:I
+    iget v9, v3, Lorg/a/a/m;->chW:I
 
-    iget-object v10, v3, Lorg/a/a/m;->ciR:Ljava/lang/String;
+    iget-object v10, v3, Lorg/a/a/m;->cil:Ljava/lang/String;
 
-    iget-object v11, v3, Lorg/a/a/m;->ciS:Ljava/lang/String;
+    iget-object v11, v3, Lorg/a/a/m;->cim:Ljava/lang/String;
 
-    iget-object v3, v3, Lorg/a/a/m;->ciT:Ljava/lang/String;
+    iget-object v3, v3, Lorg/a/a/m;->cin:Ljava/lang/String;
 
     invoke-virtual {v5, v9, v10, v11, v3}, Lorg/a/a/g;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/o;
 
     move-result-object v3
 
-    iget v3, v3, Lorg/a/a/o;->ciC:I
+    iget v3, v3, Lorg/a/a/o;->chW:I
 
     invoke-virtual {v6, v3}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
@@ -3814,7 +3768,7 @@
 
     move-result-object v11
 
-    iget v11, v11, Lorg/a/a/o;->ciC:I
+    iget v11, v11, Lorg/a/a/o;->chW:I
 
     invoke-virtual {v6, v11}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
@@ -3823,7 +3777,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v4, v6, Lorg/a/a/d;->chA:[B
+    iget-object v4, v6, Lorg/a/a/d;->cgU:[B
 
     add-int/lit8 v3, v3, 0x2
 
@@ -3833,7 +3787,7 @@
 
     and-int/2addr v10, v8
 
-    iget-object v11, v5, Lorg/a/a/g;->chI:[Lorg/a/a/o;
+    iget-object v11, v5, Lorg/a/a/g;->chc:[Lorg/a/a/o;
 
     array-length v12, v11
 
@@ -3846,18 +3800,18 @@
 
     if-eqz v11, :cond_5
 
-    iget v13, v11, Lorg/a/a/o;->chr:I
+    iget v13, v11, Lorg/a/a/o;->cgL:I
 
     if-ne v13, v12, :cond_4
 
-    iget v13, v11, Lorg/a/a/o;->cja:I
+    iget v13, v11, Lorg/a/a/o;->ciu:I
 
     if-eq v13, v10, :cond_2
 
     goto :goto_3
 
     :cond_2
-    iget v13, v11, Lorg/a/a/o;->chH:I
+    iget v13, v11, Lorg/a/a/o;->chb:I
 
     const/4 v14, 0x0
 
@@ -3883,16 +3837,16 @@
 
     :cond_4
     :goto_3
-    iget-object v11, v11, Lorg/a/a/o;->cjb:Lorg/a/a/o;
+    iget-object v11, v11, Lorg/a/a/o;->civ:Lorg/a/a/o;
 
     goto :goto_1
 
     :cond_5
     if-eqz v11, :cond_6
 
-    iget v3, v11, Lorg/a/a/o;->ciC:I
+    iget v3, v11, Lorg/a/a/o;->chW:I
 
-    iput v7, v6, Lorg/a/a/d;->chr:I
+    iput v7, v6, Lorg/a/a/d;->cgL:I
 
     goto :goto_4
 
@@ -3907,30 +3861,30 @@
 
     invoke-direct {v4, v3}, Lorg/a/a/o;-><init>(I)V
 
-    iput v12, v4, Lorg/a/a/o;->chr:I
+    iput v12, v4, Lorg/a/a/o;->cgL:I
 
-    iput v7, v4, Lorg/a/a/o;->chH:I
+    iput v7, v4, Lorg/a/a/o;->chb:I
 
-    iput v10, v4, Lorg/a/a/o;->cja:I
+    iput v10, v4, Lorg/a/a/o;->ciu:I
 
     invoke-virtual {v5, v4}, Lorg/a/a/g;->b(Lorg/a/a/o;)V
 
     :goto_4
-    iget-object v4, v5, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object v4, v5, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     const/16 v6, 0x12
 
-    iput v6, v4, Lorg/a/a/o;->chr:I
+    iput v6, v4, Lorg/a/a/o;->cgL:I
 
     int-to-long v9, v3
 
-    iput-wide v9, v4, Lorg/a/a/o;->ciX:J
+    iput-wide v9, v4, Lorg/a/a/o;->cir:J
 
-    iput-object v1, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iput-object v1, v4, Lorg/a/a/o;->chM:Ljava/lang/String;
 
-    iput-object v2, v4, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iput-object v2, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
 
-    iget-object v7, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
+    iget-object v7, v4, Lorg/a/a/o;->chM:Ljava/lang/String;
 
     invoke-virtual {v7}, Ljava/lang/String;->hashCode()I
 
@@ -3938,7 +3892,7 @@
 
     mul-int v7, v7, v3
 
-    iget-object v9, v4, Lorg/a/a/o;->ciY:Ljava/lang/String;
+    iget-object v9, v4, Lorg/a/a/o;->cis:Ljava/lang/String;
 
     invoke-virtual {v9}, Ljava/lang/String;->hashCode()I
 
@@ -3950,9 +3904,9 @@
 
     and-int/2addr v7, v8
 
-    iput v7, v4, Lorg/a/a/o;->cja:I
+    iput v7, v4, Lorg/a/a/o;->ciu:I
 
-    iget-object v4, v5, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object v4, v5, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     invoke-virtual {v5, v4}, Lorg/a/a/g;->a(Lorg/a/a/o;)Lorg/a/a/o;
 
@@ -3968,36 +3922,34 @@
 
     new-instance v4, Lorg/a/a/o;
 
-    iget v1, v5, Lorg/a/a/g;->chH:I
+    iget v1, v5, Lorg/a/a/g;->chb:I
 
     add-int/lit8 v3, v1, 0x1
 
-    iput v3, v5, Lorg/a/a/g;->chH:I
+    iput v3, v5, Lorg/a/a/g;->chb:I
 
-    iget-object v3, v5, Lorg/a/a/g;->chL:Lorg/a/a/o;
+    iget-object v3, v5, Lorg/a/a/g;->chf:Lorg/a/a/o;
 
     invoke-direct {v4, v1, v3}, Lorg/a/a/o;-><init>(ILorg/a/a/o;)V
 
     invoke-virtual {v5, v4}, Lorg/a/a/g;->b(Lorg/a/a/o;)V
 
     :cond_7
-    iget v1, v4, Lorg/a/a/o;->chH:I
+    iget v1, v4, Lorg/a/a/o;->chb:I
 
-    iget-object v3, v0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v3, v0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     const/16 v5, 0xba
 
     if-eqz v3, :cond_b
 
-    iget v3, v0, Lorg/a/a/r;->M:I
+    iget v6, v0, Lorg/a/a/r;->M:I
 
-    if-nez v3, :cond_8
+    if-nez v6, :cond_8
 
-    iget-object v1, v0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v1, v3, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object v1, v1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
-
-    iget-object v2, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const/4 v3, 0x0
 
@@ -4012,10 +3964,10 @@
 
     move-result v1
 
-    iput v1, v4, Lorg/a/a/o;->chH:I
+    iput v1, v4, Lorg/a/a/o;->chb:I
 
     :cond_9
-    iget v2, v0, Lorg/a/a/r;->cjN:I
+    iget v2, v0, Lorg/a/a/r;->cjh:I
 
     shr-int/lit8 v3, v1, 0x2
 
@@ -4027,24 +3979,24 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    iget v1, v0, Lorg/a/a/r;->cjO:I
+    iget v1, v0, Lorg/a/a/r;->cji:I
 
     if-le v2, v1, :cond_a
 
-    iput v2, v0, Lorg/a/a/r;->cjO:I
+    iput v2, v0, Lorg/a/a/r;->cji:I
 
     :cond_a
-    iput v2, v0, Lorg/a/a/r;->cjN:I
+    iput v2, v0, Lorg/a/a/r;->cjh:I
 
     :cond_b
     :goto_5
-    iget-object v1, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v2, v4, Lorg/a/a/o;->ciC:I
+    iget v2, v4, Lorg/a/a/o;->chW:I
 
     invoke-virtual {v1, v5, v2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
-    iget-object v1, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/4 v2, 0x0
 
@@ -4056,11 +4008,11 @@
 .method public final a(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/r;->ciK:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->chz:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->cgT:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/r;->ciK:Lorg/a/a/c;
 
     return-void
 .end method
@@ -4068,21 +4020,19 @@
 .method final a(Lorg/a/a/d;)V
     .locals 10
 
-    iget v0, p0, Lorg/a/a/r;->chH:I
+    iget v0, p0, Lorg/a/a/r;->chb:I
 
     const/high16 v1, 0x40000
 
-    and-int/2addr v0, v1
+    and-int v2, v0, v1
 
-    div-int/lit8 v0, v0, 0x40
+    div-int/lit8 v2, v2, 0x40
 
-    const/high16 v2, 0xe0000
+    const/high16 v3, 0xe0000
 
-    or-int/2addr v0, v2
+    or-int/2addr v2, v3
 
-    iget v2, p0, Lorg/a/a/r;->chH:I
-
-    xor-int/lit8 v0, v0, -0x1
+    xor-int/lit8 v2, v2, -0x1
 
     and-int/2addr v0, v2
 
@@ -4090,38 +4040,38 @@
 
     move-result-object v0
 
-    iget v2, p0, Lorg/a/a/r;->chD:I
+    iget v2, p0, Lorg/a/a/r;->cgX:I
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget v2, p0, Lorg/a/a/r;->ciq:I
+    iget v2, p0, Lorg/a/a/r;->chK:I
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget v0, p0, Lorg/a/a/r;->ciP:I
+    iget v0, p0, Lorg/a/a/r;->cij:I
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v0, v0, Lorg/a/a/g;->chG:Lorg/a/a/e;
+    iget-object v0, v0, Lorg/a/a/g;->cha:Lorg/a/a/e;
 
-    iget-object v0, v0, Lorg/a/a/e;->chy:[B
+    iget-object v0, v0, Lorg/a/a/e;->cgS:[B
 
-    iget v1, p0, Lorg/a/a/r;->ciP:I
+    iget v1, p0, Lorg/a/a/r;->cij:I
 
-    iget v2, p0, Lorg/a/a/r;->bTR:I
+    iget v2, p0, Lorg/a/a/r;->bTx:I
 
     invoke-virtual {p1, v0, v1, v2}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     const/4 v2, 0x0
 
@@ -4137,14 +4087,14 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget v4, p0, Lorg/a/a/r;->cja:I
+    iget v4, p0, Lorg/a/a/r;->ciu:I
 
     if-lez v4, :cond_2
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_2
-    iget v4, p0, Lorg/a/a/r;->chH:I
+    iget v4, p0, Lorg/a/a/r;->chb:I
 
     and-int/lit16 v4, v4, 0x1000
 
@@ -4154,15 +4104,15 @@
 
     if-eqz v4, :cond_4
 
-    iget-object v4, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v4, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget v4, v4, Lorg/a/a/g;->chr:I
+    iget v4, v4, Lorg/a/a/g;->cgL:I
 
     and-int/2addr v4, v6
 
     if-lt v4, v5, :cond_3
 
-    iget v4, p0, Lorg/a/a/r;->chH:I
+    iget v4, p0, Lorg/a/a/r;->chb:I
 
     and-int/2addr v4, v1
 
@@ -4172,7 +4122,7 @@
     add-int/lit8 v0, v0, 0x1
 
     :cond_4
-    iget v4, p0, Lorg/a/a/r;->chH:I
+    iget v4, p0, Lorg/a/a/r;->chb:I
 
     const/high16 v7, 0x20000
 
@@ -4183,76 +4133,74 @@
     add-int/lit8 v0, v0, 0x1
 
     :cond_5
-    iget-object v4, p0, Lorg/a/a/r;->cis:Ljava/lang/String;
+    iget-object v4, p0, Lorg/a/a/r;->chM:Ljava/lang/String;
 
     if-eqz v4, :cond_6
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_6
-    iget-object v4, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
     if-eqz v4, :cond_7
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_7
-    iget-object v4, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
     if-eqz v4, :cond_8
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_8
-    iget-object v4, p0, Lorg/a/a/r;->cjj:Lorg/a/a/b;
+    iget-object v4, p0, Lorg/a/a/r;->ciD:Lorg/a/a/b;
 
     if-eqz v4, :cond_9
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_9
-    iget-object v4, p0, Lorg/a/a/r;->cjk:Lorg/a/a/b;
+    iget-object v4, p0, Lorg/a/a/r;->ciE:Lorg/a/a/b;
 
     if-eqz v4, :cond_a
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_a
-    iget-object v4, p0, Lorg/a/a/r;->cjl:Lorg/a/a/b;
+    iget-object v4, p0, Lorg/a/a/r;->ciF:Lorg/a/a/b;
 
     if-eqz v4, :cond_b
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_b
-    iget-object v4, p0, Lorg/a/a/r;->cjm:Lorg/a/a/b;
+    iget-object v4, p0, Lorg/a/a/r;->ciG:Lorg/a/a/b;
 
     if-eqz v4, :cond_c
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_c
-    iget-object v4, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object v4, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
     if-eqz v4, :cond_d
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_d
-    iget-object v4, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object v4, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
     if-eqz v4, :cond_e
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_e
-    iget-object v4, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
+    iget-object v4, p0, Lorg/a/a/r;->ciK:Lorg/a/a/c;
 
     if-eqz v4, :cond_f
 
-    iget-object v4, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
-
-    invoke-virtual {v4}, Lorg/a/a/c;->JD()I
+    invoke-virtual {v4}, Lorg/a/a/c;->JC()I
 
     move-result v4
 
@@ -4261,85 +4209,75 @@
     :cond_f
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     const/4 v4, 0x2
 
     if-lez v0, :cond_27
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v0, v0, 0xc
 
-    iget v8, p0, Lorg/a/a/r;->cjv:I
+    iget v8, p0, Lorg/a/a/r;->ciP:I
 
     mul-int/lit8 v8, v8, 0x8
 
     add-int/2addr v0, v8
 
-    iget-object v8, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
     if-eqz v8, :cond_10
 
-    iget-object v8, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
-
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v8, v8, 0x8
 
     add-int/2addr v0, v8
 
     :cond_10
-    iget-object v8, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
     if-eqz v8, :cond_11
 
-    iget-object v8, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
-
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v8, v8, 0x8
 
     add-int/2addr v0, v8
 
     :cond_11
-    iget-object v8, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     if-eqz v8, :cond_12
 
-    iget-object v8, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
-
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v8, v8, 0x8
 
     add-int/2addr v0, v8
 
     :cond_12
-    iget-object v8, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     if-eqz v8, :cond_13
 
-    iget-object v8, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
-
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v8, v8, 0x8
 
     add-int/2addr v0, v8
 
     :cond_13
-    iget-object v8, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object v8, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     if-eqz v8, :cond_14
 
-    iget-object v8, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
-
-    invoke-virtual {v8}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v8}, Lorg/a/a/b;->JC()I
 
     move-result v8
 
@@ -4348,13 +4286,11 @@
     add-int/2addr v0, v8
 
     :cond_14
-    iget-object v8, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object v8, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     if-eqz v8, :cond_15
 
-    iget-object v8, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
-
-    invoke-virtual {v8}, Lorg/a/a/b;->JD()I
+    invoke-virtual {v8}, Lorg/a/a/b;->JC()I
 
     move-result v8
 
@@ -4363,13 +4299,11 @@
     add-int/2addr v0, v8
 
     :cond_15
-    iget-object v8, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
+    iget-object v8, p0, Lorg/a/a/r;->cjd:Lorg/a/a/c;
 
     if-eqz v8, :cond_16
 
-    iget-object v8, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
-
-    iget-object v9, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v9, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v8, v9}, Lorg/a/a/c;->a(Lorg/a/a/g;)I
 
@@ -4378,7 +4312,7 @@
     add-int/2addr v0, v8
 
     :cond_16
-    iget-object v8, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v8, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v9, "Code"
 
@@ -4392,81 +4326,81 @@
 
     invoke-virtual {v8, v0}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    iget v0, p0, Lorg/a/a/r;->chX:I
+    iget v0, p0, Lorg/a/a/r;->chr:I
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget v8, p0, Lorg/a/a/r;->chY:I
+    iget v8, p0, Lorg/a/a/r;->chs:I
 
     invoke-virtual {v0, v8}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget-object v8, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v8, v8, Lorg/a/a/d;->chA:[B
+    iget-object v8, v8, Lorg/a/a/d;->cgU:[B
 
-    iget-object v9, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v9, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v9, v9, Lorg/a/a/d;->chr:I
+    iget v9, v9, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {v0, v8, v2, v9}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    iget v0, p0, Lorg/a/a/r;->cjv:I
+    iget v0, p0, Lorg/a/a/r;->ciP:I
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget v0, p0, Lorg/a/a/r;->cjv:I
+    iget v0, p0, Lorg/a/a/r;->ciP:I
 
     if-lez v0, :cond_17
 
-    iget-object v0, p0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
+    iget-object v0, p0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
 
     :goto_1
     if-eqz v0, :cond_17
 
-    iget-object v8, v0, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iget-object v8, v0, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
-    iget v8, v8, Lorg/a/a/p;->chH:I
+    iget v8, v8, Lorg/a/a/p;->chb:I
 
     invoke-virtual {p1, v8}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v8
 
-    iget-object v9, v0, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iget-object v9, v0, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    iget v9, v9, Lorg/a/a/p;->chH:I
+    iget v9, v9, Lorg/a/a/p;->chb:I
 
     invoke-virtual {v8, v9}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v8
 
-    iget-object v9, v0, Lorg/a/a/n;->ciV:Lorg/a/a/p;
+    iget-object v9, v0, Lorg/a/a/n;->cip:Lorg/a/a/p;
 
-    iget v9, v9, Lorg/a/a/p;->chH:I
+    iget v9, v9, Lorg/a/a/p;->chb:I
 
     invoke-virtual {v8, v9}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     move-result-object v8
 
-    iget v9, v0, Lorg/a/a/n;->ciq:I
+    iget v9, v0, Lorg/a/a/n;->chK:I
 
     invoke-virtual {v8, v9}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iget-object v0, v0, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
     goto :goto_1
 
     :cond_17
-    iget-object v0, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
     if-eqz v0, :cond_18
 
@@ -4478,48 +4412,46 @@
     const/4 v0, 0x0
 
     :goto_2
-    iget-object v8, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
     if-eqz v8, :cond_19
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_19
-    iget-object v8, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     if-eqz v8, :cond_1a
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_1a
-    iget-object v8, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     if-eqz v8, :cond_1b
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_1b
-    iget-object v8, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object v8, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     if-eqz v8, :cond_1c
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_1c
-    iget-object v8, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object v8, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     if-eqz v8, :cond_1d
 
     add-int/lit8 v0, v0, 0x1
 
     :cond_1d
-    iget-object v8, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
+    iget-object v8, p0, Lorg/a/a/r;->cjd:Lorg/a/a/c;
 
     if-eqz v8, :cond_1e
 
-    iget-object v8, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
-
-    invoke-virtual {v8}, Lorg/a/a/c;->JD()I
+    invoke-virtual {v8}, Lorg/a/a/c;->JC()I
 
     move-result v8
 
@@ -4528,11 +4460,11 @@
     :cond_1e
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
     if-eqz v0, :cond_1f
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v8, "LocalVariableTable"
 
@@ -4542,9 +4474,9 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, v4
 
@@ -4552,26 +4484,26 @@
 
     move-result-object v0
 
-    iget v8, p0, Lorg/a/a/r;->cjA:I
+    iget v8, p0, Lorg/a/a/r;->ciU:I
 
     invoke-virtual {v0, v8}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v8, p0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0, v2, v8}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_1f
-    iget-object v0, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
     if-eqz v0, :cond_20
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v8, "LocalVariableTypeTable"
 
@@ -4581,9 +4513,9 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, v4
 
@@ -4591,26 +4523,26 @@
 
     move-result-object v0
 
-    iget v8, p0, Lorg/a/a/r;->cjC:I
+    iget v8, p0, Lorg/a/a/r;->ciW:I
 
     invoke-virtual {v0, v8}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v8, p0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0, v2, v8}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_20
-    iget-object v0, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     if-eqz v0, :cond_21
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v8, "LineNumberTable"
 
@@ -4620,9 +4552,9 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, v4
 
@@ -4630,28 +4562,28 @@
 
     move-result-object v0
 
-    iget v8, p0, Lorg/a/a/r;->cjE:I
+    iget v8, p0, Lorg/a/a/r;->ciY:I
 
     invoke-virtual {v0, v8}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v8, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0, v2, v8}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_21
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
     if-eqz v0, :cond_24
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget v0, v0, Lorg/a/a/g;->chr:I
+    iget v0, v0, Lorg/a/a/g;->cgL:I
 
     and-int/2addr v0, v6
 
@@ -4667,7 +4599,7 @@
     const/4 v0, 0x0
 
     :goto_3
-    iget-object v8, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v8, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     if-eqz v0, :cond_23
 
@@ -4685,9 +4617,9 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, v4
 
@@ -4695,26 +4627,26 @@
 
     move-result-object v0
 
-    iget v8, p0, Lorg/a/a/r;->cjr:I
+    iget v8, p0, Lorg/a/a/r;->ciL:I
 
     invoke-virtual {v0, v8}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v8, p0, Lorg/a/a/r;->cjs:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/r;->ciM:Lorg/a/a/d;
 
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0, v2, v8}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_24
-    iget-object v0, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     if-eqz v0, :cond_25
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v8, "RuntimeVisibleTypeAnnotations"
 
@@ -4724,16 +4656,16 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     invoke-virtual {v0, p1}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_25
-    iget-object v0, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     if-eqz v0, :cond_26
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v8, "RuntimeInvisibleTypeAnnotations"
 
@@ -4743,27 +4675,25 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     invoke-virtual {v0, p1}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_26
-    iget-object v0, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/r;->cjd:Lorg/a/a/c;
 
     if-eqz v0, :cond_27
 
-    iget-object v0, p0, Lorg/a/a/r;->cjJ:Lorg/a/a/c;
-
-    iget-object v8, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v8, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, v8, p1}, Lorg/a/a/c;->a(Lorg/a/a/g;Lorg/a/a/d;)V
 
     :cond_27
-    iget v0, p0, Lorg/a/a/r;->cja:I
+    iget v0, p0, Lorg/a/a/r;->ciu:I
 
     if-lez v0, :cond_28
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v8, "Exceptions"
 
@@ -4775,7 +4705,7 @@
 
     move-result-object v0
 
-    iget v8, p0, Lorg/a/a/r;->cja:I
+    iget v8, p0, Lorg/a/a/r;->ciu:I
 
     mul-int/lit8 v8, v8, 0x2
 
@@ -4783,18 +4713,18 @@
 
     invoke-virtual {v0, v8}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    iget v0, p0, Lorg/a/a/r;->cja:I
+    iget v0, p0, Lorg/a/a/r;->ciu:I
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     const/4 v0, 0x0
 
     :goto_5
-    iget v8, p0, Lorg/a/a/r;->cja:I
+    iget v8, p0, Lorg/a/a/r;->ciu:I
 
     if-ge v0, v8, :cond_28
 
-    iget-object v8, p0, Lorg/a/a/r;->cjh:[I
+    iget-object v8, p0, Lorg/a/a/r;->ciB:[I
 
     aget v8, v8, v0
 
@@ -4805,28 +4735,28 @@
     goto :goto_5
 
     :cond_28
-    iget v0, p0, Lorg/a/a/r;->chH:I
+    iget v0, p0, Lorg/a/a/r;->chb:I
 
     and-int/lit16 v0, v0, 0x1000
 
     if-eqz v0, :cond_2a
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget v0, v0, Lorg/a/a/g;->chr:I
+    iget v0, v0, Lorg/a/a/g;->cgL:I
 
     and-int/2addr v0, v6
 
     if-lt v0, v5, :cond_29
 
-    iget v0, p0, Lorg/a/a/r;->chH:I
+    iget v0, p0, Lorg/a/a/r;->chb:I
 
     and-int/2addr v0, v1
 
     if-eqz v0, :cond_2a
 
     :cond_29
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "Synthetic"
 
@@ -4841,13 +4771,13 @@
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     :cond_2a
-    iget v0, p0, Lorg/a/a/r;->chH:I
+    iget v0, p0, Lorg/a/a/r;->chb:I
 
     and-int/2addr v0, v7
 
     if-eqz v0, :cond_2b
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "Deprecated"
 
@@ -4862,11 +4792,11 @@
     invoke-virtual {v0, v2}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
     :cond_2b
-    iget-object v0, p0, Lorg/a/a/r;->cis:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/r;->chM:Ljava/lang/String;
 
     if-eqz v0, :cond_2c
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "Signature"
 
@@ -4882,9 +4812,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v4, p0, Lorg/a/a/r;->cis:Ljava/lang/String;
+    iget-object v4, p0, Lorg/a/a/r;->chM:Ljava/lang/String;
 
     invoke-virtual {v1, v4}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -4893,11 +4823,11 @@
     invoke-virtual {v0, v1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
     :cond_2c
-    iget-object v0, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
     if-eqz v0, :cond_2d
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "MethodParameters"
 
@@ -4907,9 +4837,9 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     add-int/2addr v0, v3
 
@@ -4917,26 +4847,26 @@
 
     move-result-object v0
 
-    iget v1, p0, Lorg/a/a/r;->cjy:I
+    iget v1, p0, Lorg/a/a/r;->ciS:I
 
     invoke-virtual {v0, v1}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v1, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0, v2, v1}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_2d
-    iget-object v0, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
     if-eqz v0, :cond_2e
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "AnnotationDefault"
 
@@ -4946,28 +4876,28 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/d;->chA:[B
+    iget-object v0, v0, Lorg/a/a/d;->cgU:[B
 
-    iget-object v1, p0, Lorg/a/a/r;->cji:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->ciC:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
     invoke-virtual {p1, v0, v2, v1}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     :cond_2e
-    iget-object v0, p0, Lorg/a/a/r;->cjj:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciD:Lorg/a/a/b;
 
     if-eqz v0, :cond_2f
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "RuntimeVisibleAnnotations"
 
@@ -4977,16 +4907,16 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjj:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciD:Lorg/a/a/b;
 
     invoke-virtual {v0, p1}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_2f
-    iget-object v0, p0, Lorg/a/a/r;->cjk:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciE:Lorg/a/a/b;
 
     if-eqz v0, :cond_30
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "RuntimeInvisibleAnnotations"
 
@@ -4996,16 +4926,16 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjk:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciE:Lorg/a/a/b;
 
     invoke-virtual {v0, p1}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_30
-    iget-object v0, p0, Lorg/a/a/r;->cjl:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciF:Lorg/a/a/b;
 
     if-eqz v0, :cond_31
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "RuntimeVisibleTypeAnnotations"
 
@@ -5015,16 +4945,16 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjl:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciF:Lorg/a/a/b;
 
     invoke-virtual {v0, p1}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_31
-    iget-object v0, p0, Lorg/a/a/r;->cjm:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/b;
 
     if-eqz v0, :cond_32
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "RuntimeInvisibleTypeAnnotations"
 
@@ -5034,16 +4964,16 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjm:Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/b;
 
     invoke-virtual {v0, p1}, Lorg/a/a/b;->a(Lorg/a/a/d;)V
 
     :cond_32
-    iget-object v0, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
     if-eqz v0, :cond_33
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "RuntimeVisibleParameterAnnotations"
 
@@ -5053,18 +4983,18 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjn:[Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciH:[Lorg/a/a/b;
 
-    iget v1, p0, Lorg/a/a/r;->cjp:I
+    iget v1, p0, Lorg/a/a/r;->ciJ:I
 
     invoke-static {v0, v1, p1}, Lorg/a/a/b;->a([Lorg/a/a/b;ILorg/a/a/d;)V
 
     :cond_33
-    iget-object v0, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
     if-eqz v0, :cond_34
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const-string v1, "RuntimeInvisibleParameterAnnotations"
 
@@ -5074,20 +5004,18 @@
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjo:[Lorg/a/a/b;
+    iget-object v0, p0, Lorg/a/a/r;->ciI:[Lorg/a/a/b;
 
-    iget v1, p0, Lorg/a/a/r;->cjp:I
+    iget v1, p0, Lorg/a/a/r;->ciJ:I
 
     invoke-static {v0, v1, p1}, Lorg/a/a/b;->a([Lorg/a/a/b;ILorg/a/a/d;)V
 
     :cond_34
-    iget-object v0, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/r;->ciK:Lorg/a/a/c;
 
     if-eqz v0, :cond_35
 
-    iget-object v0, p0, Lorg/a/a/r;->cjq:Lorg/a/a/c;
-
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, v1, p1}, Lorg/a/a/c;->a(Lorg/a/a/g;Lorg/a/a/d;)V
 
@@ -5098,15 +5026,15 @@
 .method public final a(Lorg/a/a/p;)V
     .locals 3
 
-    iget-boolean v0, p0, Lorg/a/a/r;->cik:Z
+    iget-boolean v0, p0, Lorg/a/a/r;->chE:Z
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
-    iget-object v2, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v2, v2, Lorg/a/a/d;->chA:[B
+    iget-object v2, v2, Lorg/a/a/d;->cgU:[B
 
     invoke-virtual {p1, v1, v2}, Lorg/a/a/p;->d(I[B)Z
 
@@ -5114,9 +5042,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lorg/a/a/r;->cik:Z
+    iput-boolean v0, p0, Lorg/a/a/r;->chE:Z
 
-    iget v0, p1, Lorg/a/a/p;->ciC:I
+    iget v0, p1, Lorg/a/a/p;->chW:I
 
     const/4 v1, 0x1
 
@@ -5133,35 +5061,35 @@
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     if-eqz v0, :cond_2
 
-    iget v0, p1, Lorg/a/a/p;->chH:I
+    iget v0, p1, Lorg/a/a/p;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget v1, v1, Lorg/a/a/p;->chH:I
+    iget v1, v1, Lorg/a/a/p;->chb:I
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget v1, v0, Lorg/a/a/p;->ciC:I
+    iget v1, v0, Lorg/a/a/p;->chW:I
 
-    iget v2, p1, Lorg/a/a/p;->ciC:I
+    iget v2, p1, Lorg/a/a/p;->chW:I
 
     and-int/lit8 v2, v2, 0x10
 
     or-int/2addr v1, v2
 
-    iput v1, v0, Lorg/a/a/p;->ciC:I
+    iput v1, v0, Lorg/a/a/p;->chW:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iput-object v0, p1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iput-object v0, p1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     return-void
 
@@ -5169,9 +5097,9 @@
     invoke-direct {p0, v2, p1}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
     :cond_2
-    iput-object p1, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget-object v0, p1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, p1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     if-nez v0, :cond_3
 
@@ -5179,95 +5107,89 @@
 
     invoke-direct {v0}, Lorg/a/a/l;-><init>()V
 
-    iput-object v0, p1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iput-object v0, p1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object v0, p1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, p1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iput-object p1, v0, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iput-object p1, v0, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
     :cond_3
-    iget-object v0, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
     if-eqz v0, :cond_5
 
-    iget v0, p1, Lorg/a/a/p;->chH:I
+    iget v0, p1, Lorg/a/a/p;->chb:I
 
-    iget-object v1, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
-    iget v1, v1, Lorg/a/a/p;->chH:I
+    iget v1, v1, Lorg/a/a/p;->chb:I
 
     if-ne v0, v1, :cond_4
 
-    iget-object v0, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
-    iget v1, v0, Lorg/a/a/p;->ciC:I
+    iget v1, v0, Lorg/a/a/p;->chW:I
 
-    iget v2, p1, Lorg/a/a/p;->ciC:I
+    iget v2, p1, Lorg/a/a/p;->chW:I
 
     and-int/lit8 v2, v2, 0x10
 
     or-int/2addr v1, v2
 
-    iput v1, v0, Lorg/a/a/p;->ciC:I
+    iput v1, v0, Lorg/a/a/p;->chW:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iput-object v0, p1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iput-object v0, p1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object p1, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object p1, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     return-void
 
     :cond_4
-    iget-object v0, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
-    iput-object p1, v0, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    iput-object p1, v0, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
     :cond_5
-    iput-object p1, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
     return-void
 
     :cond_6
-    iget v0, p0, Lorg/a/a/r;->M:I
-
     if-ne v0, v1, :cond_9
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget v1, p0, Lorg/a/a/r;->cji:I
 
-    iget v1, p0, Lorg/a/a/r;->cjO:I
+    iput v1, v0, Lorg/a/a/p;->cib:I
 
-    iput v1, v0, Lorg/a/a/p;->ciH:I
-
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     invoke-direct {p0, v0, p1}, Lorg/a/a/r;->c(ILorg/a/a/p;)V
 
     :cond_7
-    iput-object p1, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iput v2, p0, Lorg/a/a/r;->cjN:I
+    iput v2, p0, Lorg/a/a/r;->cjh:I
 
-    iput v2, p0, Lorg/a/a/r;->cjO:I
+    iput v2, p0, Lorg/a/a/r;->cji:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
-
-    iput-object p1, v0, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    iput-object p1, v0, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
     :cond_8
-    iput-object p1, p0, Lorg/a/a/r;->cjL:Lorg/a/a/p;
+    iput-object p1, p0, Lorg/a/a/r;->cjf:Lorg/a/a/p;
 
     :cond_9
     return-void
@@ -5276,27 +5198,27 @@
 .method public final a(Lorg/a/a/p;Lorg/a/a/p;Lorg/a/a/p;Ljava/lang/String;)V
     .locals 1
 
-    iget v0, p0, Lorg/a/a/r;->cjv:I
+    iget v0, p0, Lorg/a/a/r;->ciP:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/r;->cjv:I
+    iput v0, p0, Lorg/a/a/r;->ciP:I
 
     new-instance v0, Lorg/a/a/n;
 
     invoke-direct {v0}, Lorg/a/a/n;-><init>()V
 
-    iput-object p1, v0, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iput-object p1, v0, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
-    iput-object p2, v0, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iput-object p2, v0, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    iput-object p3, v0, Lorg/a/a/n;->ciV:Lorg/a/a/p;
+    iput-object p3, v0, Lorg/a/a/n;->cip:Lorg/a/a/p;
 
-    iput-object p4, v0, Lorg/a/a/n;->ciT:Ljava/lang/String;
+    iput-object p4, v0, Lorg/a/a/n;->cin:Ljava/lang/String;
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p1, p4}, Lorg/a/a/g;->eT(Ljava/lang/String;)I
 
@@ -5308,23 +5230,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput p1, v0, Lorg/a/a/n;->ciq:I
+    iput p1, v0, Lorg/a/a/n;->chK:I
 
-    iget-object p1, p0, Lorg/a/a/r;->cjx:Lorg/a/a/n;
+    iget-object p1, p0, Lorg/a/a/r;->ciR:Lorg/a/a/n;
 
     if-nez p1, :cond_1
 
-    iput-object v0, p0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
+    iput-object v0, p0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
 
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lorg/a/a/r;->cjx:Lorg/a/a/n;
-
-    iput-object v0, p1, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iput-object v0, p1, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
     :goto_1
-    iput-object v0, p0, Lorg/a/a/r;->cjx:Lorg/a/a/n;
+    iput-object v0, p0, Lorg/a/a/r;->ciR:Lorg/a/a/n;
 
     return-void
 .end method
@@ -5332,27 +5252,25 @@
 .method public final a(Lorg/a/a/p;[I[Lorg/a/a/p;)V
     .locals 5
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v2, 0xab
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
-
-    iget v2, v2, Lorg/a/a/d;->chr:I
+    iget v2, v1, Lorg/a/a/d;->cgL:I
 
     rem-int/lit8 v2, v2, 0x4
 
@@ -5366,13 +5284,13 @@
 
     invoke-virtual {v1, v4, v3, v2}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/4 v2, 0x1
 
     invoke-virtual {p1, v1, v0, v2}, Lorg/a/a/p;->a(Lorg/a/a/d;IZ)V
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     array-length v4, p3
 
@@ -5383,7 +5301,7 @@
 
     if-ge v3, v1, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     aget v4, p2, v3
 
@@ -5391,7 +5309,7 @@
 
     aget-object v1, p3, v3
 
-    iget-object v4, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v1, v4, v0, v2}, Lorg/a/a/p;->a(Lorg/a/a/d;IZ)V
 
@@ -5408,23 +5326,21 @@
 .method public final aA(II)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v1, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
-
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     const/4 v1, 0x0
 
@@ -5437,18 +5353,18 @@
 
     if-eq p1, v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iget v1, p0, Lorg/a/a/r;->cjO:I
+    iget v1, p0, Lorg/a/a/r;->cji:I
 
     if-le v0, v1, :cond_1
 
-    iput v0, p0, Lorg/a/a/r;->cjO:I
+    iput v0, p0, Lorg/a/a/r;->cji:I
 
     :cond_1
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
     :cond_2
     :goto_0
@@ -5456,14 +5372,14 @@
 
     if-ne p1, v0, :cond_3
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
     return-void
 
     :cond_3
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->aw(II)Lorg/a/a/d;
 
@@ -5473,13 +5389,13 @@
 .method public final aB(II)V
     .locals 5
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     const/16 v1, 0x100
 
@@ -5487,13 +5403,11 @@
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v3, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v3, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
-
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     const/4 v3, 0x0
 
@@ -5504,41 +5418,39 @@
     :cond_0
     if-ne p1, v2, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
-
-    iget v3, v0, Lorg/a/a/p;->ciC:I
+    iget v3, v0, Lorg/a/a/p;->chW:I
 
     or-int/2addr v3, v1
 
-    iput v3, v0, Lorg/a/a/p;->ciC:I
+    iput v3, v0, Lorg/a/a/p;->chW:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    iget v3, p0, Lorg/a/a/r;->cjN:I
+    iget v3, p0, Lorg/a/a/r;->cjh:I
 
-    iput v3, v0, Lorg/a/a/p;->chv:I
+    iput v3, v0, Lorg/a/a/p;->cgP:I
 
-    invoke-direct {p0}, Lorg/a/a/r;->JI()V
+    invoke-direct {p0}, Lorg/a/a/r;->JH()V
 
     goto :goto_0
 
     :cond_1
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
-    sget-object v3, Lorg/a/a/l;->chB:[I
+    sget-object v3, Lorg/a/a/l;->cgV:[I
 
     aget v3, v3, p1
 
     add-int/2addr v0, v3
 
-    iget v3, p0, Lorg/a/a/r;->cjO:I
+    iget v3, p0, Lorg/a/a/r;->cji:I
 
     if-le v0, v3, :cond_2
 
-    iput v0, p0, Lorg/a/a/r;->cjO:I
+    iput v0, p0, Lorg/a/a/r;->cji:I
 
     :cond_2
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
     :cond_3
     :goto_0
@@ -5576,11 +5488,11 @@
     add-int/lit8 v0, p2, 0x2
 
     :goto_2
-    iget v4, p0, Lorg/a/a/r;->chY:I
+    iget v4, p0, Lorg/a/a/r;->chs:I
 
     if-le v0, v4, :cond_6
 
-    iput v0, p0, Lorg/a/a/r;->chY:I
+    iput v0, p0, Lorg/a/a/r;->chs:I
 
     :cond_6
     const/4 v0, 0x4
@@ -5599,10 +5511,7 @@
 
     add-int/lit8 v0, v0, 0x1a
 
-    :goto_3
-    add-int/2addr v0, p2
-
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     add-int/lit8 v0, p1, -0x36
@@ -5611,19 +5520,19 @@
 
     add-int/lit8 v0, v0, 0x3b
 
-    goto :goto_3
+    :goto_3
+    add-int/2addr v0, p2
 
-    :goto_4
-    iget-object p2, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {p2, v0}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_8
     if-lt p2, v1, :cond_9
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v1, 0xc4
 
@@ -5633,21 +5542,21 @@
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->aw(II)Lorg/a/a/d;
 
-    :goto_5
+    :goto_4
     if-lt p1, v4, :cond_a
 
     iget p1, p0, Lorg/a/a/r;->M:I
 
     if-nez p1, :cond_a
 
-    iget p1, p0, Lorg/a/a/r;->cjv:I
+    iget p1, p0, Lorg/a/a/r;->ciP:I
 
     if-lez p1, :cond_a
 
@@ -5664,25 +5573,23 @@
 .method public final aC(II)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     const/16 v1, 0x84
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v2, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v2, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
-
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     const/4 v2, 0x0
 
@@ -5697,11 +5604,11 @@
 
     add-int/lit8 v0, p1, 0x1
 
-    iget v2, p0, Lorg/a/a/r;->chY:I
+    iget v2, p0, Lorg/a/a/r;->chs:I
 
     if-le v0, v2, :cond_1
 
-    iput v0, p0, Lorg/a/a/r;->chY:I
+    iput v0, p0, Lorg/a/a/r;->chs:I
 
     :cond_1
     const/16 v0, 0xff
@@ -5719,7 +5626,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v0, v1}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
@@ -5731,7 +5638,7 @@
 
     :cond_3
     :goto_0
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v2, 0xc4
 
@@ -5749,13 +5656,13 @@
 .end method
 
 .method public final aD(II)V
-    .locals 20
+    .locals 21
 
     move-object/from16 v0, p0
 
     move/from16 v1, p1
 
-    iget-boolean v2, v0, Lorg/a/a/r;->cik:Z
+    iget-boolean v2, v0, Lorg/a/a/r;->chE:Z
 
     const/4 v3, 0x0
 
@@ -5769,17 +5676,17 @@
 
     if-eqz v2, :cond_25
 
-    iget-object v2, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v2, v2, Lorg/a/a/d;->chA:[B
+    iget-object v2, v2, Lorg/a/a/d;->cgU:[B
 
     new-array v8, v6, [I
 
     new-array v9, v6, [I
 
-    iget-object v10, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v10, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v10, v10, Lorg/a/a/d;->chr:I
+    iget v10, v10, Lorg/a/a/d;->cgL:I
 
     new-array v10, v10, [Z
 
@@ -5802,7 +5709,7 @@
     :goto_1
     array-length v14, v2
 
-    const/16 v15, 0xc9
+    const/4 v15, 0x5
 
     const/4 v12, 0x4
 
@@ -5812,11 +5719,11 @@
 
     and-int/lit16 v14, v14, 0xff
 
-    sget-object v18, Lorg/a/a/g;->chA:[B
+    sget-object v17, Lorg/a/a/g;->cgU:[B
 
-    aget-byte v18, v18, v14
+    aget-byte v17, v17, v14
 
-    packed-switch v18, :pswitch_data_0
+    packed-switch v17, :pswitch_data_0
 
     :cond_1
     :pswitch_0
@@ -5825,7 +5732,7 @@
     :goto_2
     const/4 v14, 0x0
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
     :pswitch_1
     add-int/lit8 v12, v8, 0x1
@@ -5892,7 +5799,7 @@
 
     move v14, v12
 
-    goto/16 :goto_a
+    goto/16 :goto_8
 
     :pswitch_3
     if-ne v9, v7, :cond_4
@@ -5952,10 +5859,12 @@
 
     move v8, v15
 
-    goto :goto_a
+    goto :goto_8
 
     :pswitch_4
-    if-le v14, v15, :cond_7
+    const/16 v4, 0xc9
+
+    if-le v14, v4, :cond_7
 
     const/16 v4, 0xda
 
@@ -6006,37 +5915,29 @@
 
     const/16 v4, 0xa7
 
-    if-eq v14, v4, :cond_a
+    if-eq v14, v4, :cond_9
 
     const/16 v4, 0xa8
 
-    if-ne v14, v4, :cond_9
+    if-ne v14, v4, :cond_a
+
+    :cond_9
+    const/4 v15, 0x2
+
+    :cond_a
+    aput-boolean v7, v10, v8
 
     goto :goto_7
 
-    :cond_9
-    const/16 v17, 0x5
-
-    goto :goto_8
-
-    :cond_a
-    :goto_7
-    const/16 v17, 0x2
-
-    :goto_8
-    aput-boolean v7, v10, v8
-
-    goto :goto_9
-
     :cond_b
-    const/16 v17, 0x0
+    const/4 v15, 0x0
 
-    :goto_9
+    :goto_7
     add-int/lit8 v8, v8, 0x3
 
-    move/from16 v14, v17
+    move v14, v15
 
-    goto :goto_a
+    goto :goto_8
 
     :pswitch_5
     add-int/lit8 v8, v8, 0x5
@@ -6058,7 +5959,7 @@
 
     goto/16 :goto_2
 
-    :goto_a
+    :goto_8
     if-eqz v14, :cond_d
 
     array-length v4, v11
@@ -6097,7 +5998,7 @@
 
     const/4 v9, 0x3
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_c
     move-object v11, v4
@@ -6105,7 +6006,7 @@
     move-object v13, v12
 
     :cond_d
-    :goto_b
+    :goto_9
     const/16 v4, 0x8
 
     goto/16 :goto_1
@@ -6122,18 +6023,18 @@
 
     new-instance v4, Lorg/a/a/d;
 
-    iget-object v8, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v8, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     invoke-direct {v4, v8}, Lorg/a/a/d;-><init>(I)V
 
     const/4 v8, 0x0
 
-    :goto_c
-    iget-object v9, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    :goto_a
+    iget-object v9, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v9, v9, Lorg/a/a/d;->chr:I
+    iget v9, v9, Lorg/a/a/d;->cgL:I
 
     if-ge v8, v9, :cond_19
 
@@ -6141,20 +6042,18 @@
 
     and-int/lit16 v9, v9, 0xff
 
-    sget-object v14, Lorg/a/a/g;->chA:[B
+    sget-object v14, Lorg/a/a/g;->cgU:[B
 
     aget-byte v14, v14, v9
 
     packed-switch v14, :pswitch_data_1
 
     :pswitch_9
-    const/4 v5, 0x5
-
     invoke-virtual {v4, v2, v8, v12}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     add-int/lit8 v8, v8, 0x4
 
-    goto/16 :goto_16
+    goto/16 :goto_14
 
     :pswitch_a
     add-int/lit8 v9, v8, 0x1
@@ -6173,14 +6072,14 @@
 
     add-int/lit8 v8, v8, 0x6
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_10
     invoke-virtual {v4, v2, v8, v12}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
     add-int/lit8 v8, v8, 0x4
 
-    goto :goto_c
+    goto :goto_a
 
     :pswitch_b
     add-int/lit8 v9, v8, 0x4
@@ -6193,7 +6092,7 @@
 
     invoke-virtual {v4, v14}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget v14, v4, Lorg/a/a/d;->chr:I
+    iget v14, v4, Lorg/a/a/d;->cgL:I
 
     rem-int/2addr v14, v12
 
@@ -6225,7 +6124,7 @@
 
     invoke-virtual {v4, v14}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    :goto_d
+    :goto_b
     if-lez v14, :cond_11
 
     invoke-static {v2, v9}, Lorg/a/a/r;->z([BI)I
@@ -6254,12 +6153,12 @@
 
     const/4 v5, 0x3
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_11
     move v8, v9
 
-    goto :goto_f
+    goto/16 :goto_14
 
     :pswitch_c
     add-int/lit8 v5, v8, 0x4
@@ -6272,7 +6171,7 @@
 
     invoke-virtual {v4, v9}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget v9, v4, Lorg/a/a/d;->chr:I
+    iget v9, v4, Lorg/a/a/d;->cgL:I
 
     rem-int/2addr v9, v12
 
@@ -6322,7 +6221,7 @@
 
     invoke-virtual {v4, v9}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    :goto_e
+    :goto_c
     if-lez v14, :cond_12
 
     invoke-static {v2, v5}, Lorg/a/a/r;->z([BI)I
@@ -6341,15 +6240,12 @@
 
     add-int/lit8 v14, v14, -0x1
 
-    goto :goto_e
+    goto :goto_c
 
     :cond_12
     move v8, v5
 
-    :goto_f
-    const/4 v5, 0x5
-
-    goto/16 :goto_16
+    goto/16 :goto_14
 
     :pswitch_d
     add-int/lit8 v5, v8, 0x1
@@ -6368,10 +6264,12 @@
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    goto :goto_14
+    goto :goto_12
 
     :pswitch_e
-    if-le v9, v15, :cond_14
+    const/16 v5, 0xc9
+
+    if-le v9, v5, :cond_14
 
     const/16 v5, 0xda
 
@@ -6379,19 +6277,19 @@
 
     add-int/lit8 v9, v9, -0x31
 
-    goto :goto_10
+    goto :goto_d
 
     :cond_13
     add-int/lit8 v9, v9, -0x14
 
-    :goto_10
+    :goto_d
     add-int/lit8 v5, v8, 0x1
 
     invoke-static {v2, v5}, Lorg/a/a/r;->x([BI)I
 
     move-result v5
 
-    goto :goto_11
+    goto :goto_e
 
     :cond_14
     add-int/lit8 v5, v8, 0x1
@@ -6400,7 +6298,7 @@
 
     move-result v5
 
-    :goto_11
+    :goto_e
     add-int/2addr v5, v8
 
     invoke-static {v11, v13, v8, v5}, Lorg/a/a/r;->a([I[III)I
@@ -6417,18 +6315,19 @@
 
     const/16 v9, 0xc8
 
+    :goto_f
     invoke-virtual {v4, v9}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    goto :goto_13
+    goto :goto_11
 
     :cond_15
     const/16 v14, 0xa8
 
     if-ne v9, v14, :cond_16
 
-    invoke-virtual {v4, v15}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
+    const/16 v9, 0xc9
 
-    goto :goto_13
+    goto :goto_f
 
     :cond_16
     const/16 v14, 0xa6
@@ -6441,12 +6340,12 @@
 
     sub-int/2addr v9, v7
 
-    goto :goto_12
+    goto :goto_10
 
     :cond_17
     xor-int/lit8 v9, v9, 0x1
 
-    :goto_12
+    :goto_10
     invoke-virtual {v4, v9}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     const/16 v9, 0x8
@@ -6459,74 +6358,64 @@
 
     add-int/lit8 v5, v5, -0x3
 
-    :goto_13
+    :goto_11
     invoke-virtual {v4, v5}, Lorg/a/a/d;->fD(I)Lorg/a/a/d;
 
-    goto :goto_15
+    goto :goto_13
 
     :cond_18
     invoke-virtual {v4, v9}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    goto :goto_15
+    goto :goto_13
 
     :pswitch_f
-    const/4 v5, 0x5
+    invoke-virtual {v4, v2, v8, v15}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
+
+    :goto_12
+    add-int/lit8 v8, v8, 0x5
+
+    goto :goto_14
+
+    :pswitch_10
+    invoke-virtual {v4, v2, v8, v5}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
+
+    :goto_13
+    add-int/lit8 v8, v8, 0x3
+
+    goto :goto_14
+
+    :pswitch_11
+    const/4 v5, 0x2
 
     invoke-virtual {v4, v2, v8, v5}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
 
-    :goto_14
-    add-int/lit8 v8, v8, 0x5
-
-    goto :goto_16
-
-    :pswitch_10
-    const/4 v5, 0x5
-
-    const/4 v9, 0x3
-
-    invoke-virtual {v4, v2, v8, v9}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
-
-    :goto_15
-    add-int/lit8 v8, v8, 0x3
-
-    goto :goto_16
-
-    :pswitch_11
-    const/4 v5, 0x5
-
-    const/4 v9, 0x2
-
-    invoke-virtual {v4, v2, v8, v9}, Lorg/a/a/d;->s([BII)Lorg/a/a/d;
-
     add-int/lit8 v8, v8, 0x2
 
-    goto :goto_16
+    goto :goto_14
 
     :pswitch_12
-    const/4 v5, 0x5
-
     invoke-virtual {v4, v9}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
     add-int/lit8 v8, v8, 0x1
 
-    :goto_16
+    :goto_14
     const/4 v5, 0x3
 
-    goto/16 :goto_c
+    goto/16 :goto_a
 
     :cond_19
     iget v2, v0, Lorg/a/a/r;->M:I
 
     if-nez v2, :cond_1d
 
-    iget-object v2, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v2, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    :goto_17
+    :goto_15
     if-eqz v2, :cond_1b
 
-    iget v5, v2, Lorg/a/a/p;->chH:I
+    iget v5, v2, Lorg/a/a/p;->chb:I
 
     const/4 v8, 0x3
 
@@ -6538,121 +6427,121 @@
 
     if-eqz v5, :cond_1a
 
-    iget v5, v2, Lorg/a/a/p;->ciC:I
+    iget v5, v2, Lorg/a/a/p;->chW:I
 
     or-int/lit8 v5, v5, 0x10
 
-    iput v5, v2, Lorg/a/a/p;->ciC:I
+    iput v5, v2, Lorg/a/a/p;->chW:I
 
     :cond_1a
     invoke-static {v11, v13, v2}, Lorg/a/a/r;->a([I[ILorg/a/a/p;)V
 
-    iget-object v2, v2, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    iget-object v2, v2, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
-    goto :goto_17
+    goto :goto_15
 
     :cond_1b
-    iget-object v2, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v2, v2, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v2, v2, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     if-eqz v2, :cond_1e
 
     const/4 v2, 0x0
 
-    :goto_18
-    iget-object v5, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    :goto_16
+    iget-object v5, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v5, v5, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v5, v5, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     array-length v5, v5
 
     if-ge v2, v5, :cond_1e
 
-    iget-object v5, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v5, v5, Lorg/a/a/g;->chN:[Lorg/a/a/o;
+    iget-object v5, v5, Lorg/a/a/g;->chh:[Lorg/a/a/o;
 
     aget-object v5, v5, v2
 
     if-eqz v5, :cond_1c
 
-    iget v8, v5, Lorg/a/a/o;->chr:I
+    iget v8, v5, Lorg/a/a/o;->cgL:I
 
     const/16 v9, 0x1f
 
     if-ne v8, v9, :cond_1c
 
-    iget v8, v5, Lorg/a/a/o;->chH:I
+    iget v8, v5, Lorg/a/a/o;->chb:I
 
     invoke-static {v11, v13, v6, v8}, Lorg/a/a/r;->a([I[III)I
 
     move-result v8
 
-    iput v8, v5, Lorg/a/a/o;->chH:I
+    iput v8, v5, Lorg/a/a/o;->chb:I
 
     :cond_1c
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_18
+    goto :goto_16
 
     :cond_1d
-    iget v2, v0, Lorg/a/a/r;->cjr:I
+    iget v2, v0, Lorg/a/a/r;->ciL:I
 
     if-lez v2, :cond_1e
 
-    iget-object v2, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iput-boolean v7, v2, Lorg/a/a/g;->cim:Z
+    iput-boolean v7, v2, Lorg/a/a/g;->chG:Z
 
     :cond_1e
-    iget-object v2, v0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
+    iget-object v2, v0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
 
-    :goto_19
+    :goto_17
     if-eqz v2, :cond_1f
 
-    iget-object v5, v2, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iget-object v5, v2, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
     invoke-static {v11, v13, v5}, Lorg/a/a/r;->a([I[ILorg/a/a/p;)V
 
-    iget-object v5, v2, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iget-object v5, v2, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
     invoke-static {v11, v13, v5}, Lorg/a/a/r;->a([I[ILorg/a/a/p;)V
 
-    iget-object v5, v2, Lorg/a/a/n;->ciV:Lorg/a/a/p;
+    iget-object v5, v2, Lorg/a/a/n;->cip:Lorg/a/a/p;
 
     invoke-static {v11, v13, v5}, Lorg/a/a/r;->a([I[ILorg/a/a/p;)V
 
-    iget-object v2, v2, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iget-object v2, v2, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
-    goto :goto_19
+    goto :goto_17
 
     :cond_1f
     const/4 v2, 0x0
 
     const/4 v5, 0x2
 
-    :goto_1a
+    :goto_18
     if-ge v2, v5, :cond_22
 
     if-nez v2, :cond_20
 
-    iget-object v8, v0, Lorg/a/a/r;->cjB:Lorg/a/a/d;
+    iget-object v8, v0, Lorg/a/a/r;->ciV:Lorg/a/a/d;
 
-    goto :goto_1b
+    goto :goto_19
 
     :cond_20
-    iget-object v8, v0, Lorg/a/a/r;->cjD:Lorg/a/a/d;
+    iget-object v8, v0, Lorg/a/a/r;->ciX:Lorg/a/a/d;
 
-    :goto_1b
+    :goto_19
     if-eqz v8, :cond_21
 
-    iget-object v9, v8, Lorg/a/a/d;->chA:[B
+    iget-object v9, v8, Lorg/a/a/d;->cgU:[B
 
     const/4 v10, 0x0
 
-    :goto_1c
-    iget v12, v8, Lorg/a/a/d;->chr:I
+    :goto_1a
+    iget v12, v8, Lorg/a/a/d;->cgL:I
 
     if-ge v10, v12, :cond_21
 
@@ -6684,28 +6573,26 @@
 
     add-int/lit8 v10, v10, 0xa
 
-    goto :goto_1c
+    goto :goto_1a
 
     :cond_21
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_1a
+    goto :goto_18
 
     :cond_22
-    iget-object v2, v0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     if-eqz v2, :cond_23
 
-    iget-object v2, v0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
-
-    iget-object v2, v2, Lorg/a/a/d;->chA:[B
+    iget-object v2, v2, Lorg/a/a/d;->cgU:[B
 
     const/4 v5, 0x0
 
-    :goto_1d
-    iget-object v8, v0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    :goto_1b
+    iget-object v8, v0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
-    iget v8, v8, Lorg/a/a/d;->chr:I
+    iget v8, v8, Lorg/a/a/d;->cgL:I
 
     if-ge v5, v8, :cond_23
 
@@ -6721,12 +6608,12 @@
 
     add-int/lit8 v5, v5, 0x4
 
-    goto :goto_1d
+    goto :goto_1b
 
     :cond_23
-    iput-object v4, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iput-object v4, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    goto :goto_1e
+    goto :goto_1c
 
     :cond_24
     move-object v9, v13
@@ -6736,386 +6623,381 @@
     goto/16 :goto_0
 
     :cond_25
-    :goto_1e
+    :goto_1c
     iget v2, v0, Lorg/a/a/r;->M:I
 
     const/16 v4, 0x20
 
     if-nez v2, :cond_4e
 
-    iget-object v1, v0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
+    iget-object v1, v0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
+
+    :goto_1d
+    const/high16 v2, 0x1700000
 
-    :goto_1f
     if-eqz v1, :cond_28
 
-    iget-object v2, v1, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iget-object v5, v1, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
-    invoke-virtual {v2}, Lorg/a/a/p;->JG()Lorg/a/a/p;
-
-    move-result-object v2
-
-    iget-object v5, v1, Lorg/a/a/n;->ciV:Lorg/a/a/p;
-
-    invoke-virtual {v5}, Lorg/a/a/p;->JG()Lorg/a/a/p;
+    invoke-virtual {v5}, Lorg/a/a/p;->JF()Lorg/a/a/p;
 
     move-result-object v5
 
-    iget-object v8, v1, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iget-object v8, v1, Lorg/a/a/n;->cip:Lorg/a/a/p;
 
-    invoke-virtual {v8}, Lorg/a/a/p;->JG()Lorg/a/a/p;
+    invoke-virtual {v8}, Lorg/a/a/p;->JF()Lorg/a/a/p;
 
     move-result-object v8
 
-    iget-object v9, v1, Lorg/a/a/n;->ciT:Ljava/lang/String;
+    iget-object v9, v1, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    if-nez v9, :cond_26
+    invoke-virtual {v9}, Lorg/a/a/p;->JF()Lorg/a/a/p;
 
-    const-string v9, "java/lang/Throwable"
+    move-result-object v9
 
-    goto :goto_20
+    iget-object v10, v1, Lorg/a/a/n;->cin:Ljava/lang/String;
+
+    if-nez v10, :cond_26
+
+    const-string v10, "java/lang/Throwable"
+
+    goto :goto_1e
 
     :cond_26
-    iget-object v9, v1, Lorg/a/a/n;->ciT:Ljava/lang/String;
+    iget-object v10, v1, Lorg/a/a/n;->cin:Ljava/lang/String;
 
-    :goto_20
-    const/high16 v10, 0x1700000
+    :goto_1e
+    iget-object v11, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v11, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    invoke-virtual {v11, v10}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
-    invoke-virtual {v11, v9}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
+    move-result v10
 
-    move-result v9
+    or-int/2addr v2, v10
 
-    or-int/2addr v9, v10
-
-    iget v10, v5, Lorg/a/a/p;->ciC:I
+    iget v10, v8, Lorg/a/a/p;->chW:I
 
     or-int/lit8 v10, v10, 0x10
 
-    iput v10, v5, Lorg/a/a/p;->ciC:I
+    iput v10, v8, Lorg/a/a/p;->chW:I
 
-    :goto_21
-    if-eq v2, v8, :cond_27
+    :goto_1f
+    if-eq v5, v9, :cond_27
 
     new-instance v10, Lorg/a/a/i;
 
     invoke-direct {v10}, Lorg/a/a/i;-><init>()V
 
-    iput v9, v10, Lorg/a/a/i;->ciC:I
+    iput v2, v10, Lorg/a/a/i;->chW:I
 
-    iput-object v5, v10, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iput-object v8, v10, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iget-object v11, v2, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v11, v5, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iput-object v11, v10, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iput-object v11, v10, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iput-object v10, v2, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iput-object v10, v5, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget-object v2, v2, Lorg/a/a/p;->cjd:Lorg/a/a/p;
-
-    goto :goto_21
-
-    :cond_27
-    iget-object v1, v1, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iget-object v5, v5, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
     goto :goto_1f
 
+    :cond_27
+    iget-object v1, v1, Lorg/a/a/n;->ciq:Lorg/a/a/n;
+
+    goto :goto_1d
+
     :cond_28
-    iget-object v1, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v1, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    iget-object v1, v1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v1, v1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object v2, v0, Lorg/a/a/r;->cir:Ljava/lang/String;
+    iget-object v5, v0, Lorg/a/a/r;->chL:Ljava/lang/String;
 
-    invoke-static {v2}, Lorg/a/a/t;->fb(Ljava/lang/String;)[Lorg/a/a/t;
+    invoke-static {v5}, Lorg/a/a/t;->fb(Ljava/lang/String;)[Lorg/a/a/t;
 
-    move-result-object v2
+    move-result-object v5
 
-    iget-object v5, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v8, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget v8, v0, Lorg/a/a/r;->chH:I
+    iget v9, v0, Lorg/a/a/r;->chb:I
 
-    iget v9, v0, Lorg/a/a/r;->chY:I
+    iget v10, v0, Lorg/a/a/r;->chs:I
 
-    new-array v10, v9, [I
+    new-array v11, v10, [I
 
-    iput-object v10, v1, Lorg/a/a/l;->ciM:[I
+    iput-object v11, v1, Lorg/a/a/l;->cig:[I
 
-    new-array v10, v6, [I
+    new-array v11, v6, [I
 
-    iput-object v10, v1, Lorg/a/a/l;->cip:[I
+    iput-object v11, v1, Lorg/a/a/l;->chJ:[I
 
-    and-int/lit8 v10, v8, 0x8
+    and-int/lit8 v11, v9, 0x8
 
-    if-nez v10, :cond_2a
+    if-nez v11, :cond_2a
 
-    const/high16 v10, 0x80000
+    const/high16 v11, 0x80000
 
-    and-int/2addr v8, v10
+    and-int/2addr v9, v11
 
-    if-nez v8, :cond_29
+    if-nez v9, :cond_29
 
-    iget-object v8, v1, Lorg/a/a/l;->ciM:[I
+    iget-object v9, v1, Lorg/a/a/l;->cig:[I
 
-    const/high16 v10, 0x1700000
+    iget-object v11, v8, Lorg/a/a/g;->chl:Ljava/lang/String;
 
-    iget-object v11, v5, Lorg/a/a/g;->chR:Ljava/lang/String;
-
-    invoke-virtual {v5, v11}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
+    invoke-virtual {v8, v11}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
     move-result v11
 
-    or-int/2addr v10, v11
+    or-int/2addr v11, v2
 
-    aput v10, v8, v6
+    aput v11, v9, v6
+
+    goto :goto_20
+
+    :cond_29
+    iget-object v9, v1, Lorg/a/a/l;->cig:[I
+
+    const v11, 0x1000006
+
+    aput v11, v9, v6
+
+    :goto_20
+    const/4 v9, 0x1
+
+    goto :goto_21
+
+    :cond_2a
+    const/4 v9, 0x0
+
+    :goto_21
+    move v11, v9
+
+    const/4 v9, 0x0
 
     :goto_22
-    const/4 v8, 0x1
+    array-length v12, v5
+
+    const/high16 v13, 0x1000000
+
+    if-ge v9, v12, :cond_2d
+
+    aget-object v12, v5, v9
+
+    invoke-virtual {v12}, Lorg/a/a/t;->getDescriptor()Ljava/lang/String;
+
+    move-result-object v12
+
+    invoke-static {v8, v12}, Lorg/a/a/l;->b(Lorg/a/a/g;Ljava/lang/String;)I
+
+    move-result v12
+
+    iget-object v14, v1, Lorg/a/a/l;->cig:[I
+
+    add-int/lit8 v15, v11, 0x1
+
+    aput v12, v14, v11
+
+    const v11, 0x1000004
+
+    if-eq v12, v11, :cond_2c
+
+    const v11, 0x1000003
+
+    if-ne v12, v11, :cond_2b
 
     goto :goto_23
 
-    :cond_29
-    iget-object v8, v1, Lorg/a/a/l;->ciM:[I
-
-    const v10, 0x1000006
-
-    aput v10, v8, v6
-
-    goto :goto_22
-
-    :cond_2a
-    const/4 v8, 0x0
-
-    :goto_23
-    move v10, v8
-
-    const/4 v8, 0x0
-
-    :goto_24
-    array-length v11, v2
-
-    const/high16 v12, 0x1000000
-
-    if-ge v8, v11, :cond_2d
-
-    aget-object v11, v2, v8
-
-    invoke-virtual {v11}, Lorg/a/a/t;->getDescriptor()Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-static {v5, v11}, Lorg/a/a/l;->b(Lorg/a/a/g;Ljava/lang/String;)I
-
-    move-result v11
-
-    iget-object v13, v1, Lorg/a/a/l;->ciM:[I
-
-    add-int/lit8 v14, v10, 0x1
-
-    aput v11, v13, v10
-
-    const v10, 0x1000004
-
-    if-eq v11, v10, :cond_2c
-
-    const v10, 0x1000003
-
-    if-ne v11, v10, :cond_2b
-
-    goto :goto_25
-
     :cond_2b
-    move v10, v14
-
-    goto :goto_26
-
-    :cond_2c
-    :goto_25
-    iget-object v10, v1, Lorg/a/a/l;->ciM:[I
-
-    add-int/lit8 v11, v14, 0x1
-
-    aput v12, v10, v14
-
-    move v10, v11
-
-    :goto_26
-    add-int/lit8 v8, v8, 0x1
+    move v11, v15
 
     goto :goto_24
 
+    :cond_2c
+    :goto_23
+    iget-object v11, v1, Lorg/a/a/l;->cig:[I
+
+    add-int/lit8 v12, v15, 0x1
+
+    aput v13, v11, v15
+
+    move v11, v12
+
+    :goto_24
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_22
+
     :cond_2d
-    :goto_27
-    if-ge v10, v9, :cond_2e
+    :goto_25
+    if-ge v11, v10, :cond_2e
 
-    iget-object v2, v1, Lorg/a/a/l;->ciM:[I
+    iget-object v5, v1, Lorg/a/a/l;->cig:[I
 
-    add-int/lit8 v5, v10, 0x1
+    add-int/lit8 v8, v11, 0x1
 
-    aput v12, v2, v10
+    aput v13, v5, v11
 
-    move v10, v5
+    move v11, v8
 
-    goto :goto_27
+    goto :goto_25
 
     :cond_2e
     invoke-direct {v0, v1}, Lorg/a/a/r;->a(Lorg/a/a/l;)V
 
-    iget-object v1, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v1, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    const/4 v2, 0x0
+    const/4 v5, 0x0
 
-    :goto_28
+    :goto_26
     if-eqz v1, :cond_47
 
-    iget-object v5, v1, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v8, v1, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    iput-object v3, v1, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iput-object v3, v1, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    iget-object v8, v1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v9, v1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget v9, v1, Lorg/a/a/p;->ciC:I
+    iget v10, v1, Lorg/a/a/p;->chW:I
 
-    and-int/lit8 v9, v9, 0x10
+    and-int/lit8 v10, v10, 0x10
 
-    if-eqz v9, :cond_2f
+    if-eqz v10, :cond_2f
 
-    iget v9, v1, Lorg/a/a/p;->ciC:I
+    iget v10, v1, Lorg/a/a/p;->chW:I
 
-    or-int/2addr v9, v4
+    or-int/2addr v10, v4
 
-    iput v9, v1, Lorg/a/a/p;->ciC:I
+    iput v10, v1, Lorg/a/a/p;->chW:I
 
     :cond_2f
-    iget v9, v1, Lorg/a/a/p;->ciC:I
+    iget v10, v1, Lorg/a/a/p;->chW:I
 
-    or-int/lit8 v9, v9, 0x40
+    or-int/lit8 v10, v10, 0x40
 
-    iput v9, v1, Lorg/a/a/p;->ciC:I
+    iput v10, v1, Lorg/a/a/p;->chW:I
 
-    iget-object v9, v8, Lorg/a/a/l;->cip:[I
+    iget-object v10, v9, Lorg/a/a/l;->chJ:[I
 
-    array-length v9, v9
+    array-length v10, v10
 
-    iget v10, v1, Lorg/a/a/p;->ciH:I
+    iget v11, v1, Lorg/a/a/p;->cib:I
 
-    add-int/2addr v9, v10
+    add-int/2addr v10, v11
 
-    if-le v9, v2, :cond_30
+    if-le v10, v5, :cond_30
 
-    move v2, v9
+    move v5, v10
 
     :cond_30
-    iget-object v1, v1, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v1, v1, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    :goto_29
+    :goto_27
     if-eqz v1, :cond_46
 
-    iget-object v9, v1, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v10, v1, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    invoke-virtual {v9}, Lorg/a/a/p;->JG()Lorg/a/a/p;
+    invoke-virtual {v10}, Lorg/a/a/p;->JF()Lorg/a/a/p;
 
-    move-result-object v9
+    move-result-object v10
 
-    iget-object v10, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v11, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v11, v9, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v12, v10, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget v13, v1, Lorg/a/a/i;->ciC:I
+    iget v14, v1, Lorg/a/a/i;->chW:I
 
-    iget-object v14, v8, Lorg/a/a/l;->ciM:[I
-
-    array-length v14, v14
-
-    iget-object v15, v8, Lorg/a/a/l;->cip:[I
+    iget-object v15, v9, Lorg/a/a/l;->cig:[I
 
     array-length v15, v15
 
-    iget-object v3, v11, Lorg/a/a/l;->ciM:[I
+    iget-object v3, v9, Lorg/a/a/l;->chJ:[I
 
-    if-nez v3, :cond_31
+    array-length v3, v3
 
-    new-array v3, v14, [I
+    iget-object v2, v12, Lorg/a/a/l;->cig:[I
 
-    iput-object v3, v11, Lorg/a/a/l;->ciM:[I
+    if-nez v2, :cond_31
 
-    const/4 v3, 0x1
+    new-array v2, v15, [I
 
-    goto :goto_2a
+    iput-object v2, v12, Lorg/a/a/l;->cig:[I
+
+    const/4 v2, 0x1
+
+    goto :goto_28
 
     :cond_31
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    :goto_2a
-    move/from16 v16, v3
+    :goto_28
+    move/from16 v17, v2
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    :goto_2b
-    const v17, 0x7fffff
+    :goto_29
+    const v18, 0x7fffff
 
-    if-ge v3, v14, :cond_38
+    if-ge v2, v15, :cond_38
 
-    iget-object v4, v8, Lorg/a/a/l;->ciN:[I
+    iget-object v4, v9, Lorg/a/a/l;->cih:[I
 
     if-eqz v4, :cond_35
 
-    iget-object v4, v8, Lorg/a/a/l;->ciN:[I
+    iget-object v4, v9, Lorg/a/a/l;->cih:[I
 
     array-length v4, v4
 
-    if-ge v3, v4, :cond_35
+    if-ge v2, v4, :cond_35
 
-    iget-object v4, v8, Lorg/a/a/l;->ciN:[I
+    iget-object v4, v9, Lorg/a/a/l;->cih:[I
 
-    aget v4, v4, v3
+    aget v4, v4, v2
 
     if-eqz v4, :cond_35
 
-    const/high16 v18, -0x10000000
+    const/high16 v19, -0x10000000
 
-    and-int v18, v4, v18
+    and-int v19, v4, v19
 
-    const/high16 v19, 0xf000000
+    const/high16 v20, 0xf000000
 
-    and-int v6, v4, v19
+    and-int v6, v4, v20
 
-    if-ne v6, v12, :cond_32
+    if-ne v6, v13, :cond_32
 
-    move v12, v4
+    move v13, v4
 
-    goto :goto_2e
+    goto :goto_2b
 
     :cond_32
-    const/high16 v12, 0x2000000
+    const/high16 v13, 0x2000000
 
-    if-ne v6, v12, :cond_33
+    if-ne v6, v13, :cond_33
 
-    iget-object v6, v8, Lorg/a/a/l;->ciM:[I
+    iget-object v6, v9, Lorg/a/a/l;->cig:[I
 
-    and-int v12, v4, v17
+    and-int v13, v4, v18
 
-    aget v6, v6, v12
+    aget v6, v6, v13
 
-    :goto_2c
-    add-int v18, v18, v6
-
-    move/from16 v12, v18
-
-    goto :goto_2d
+    goto :goto_2a
 
     :cond_33
-    iget-object v6, v8, Lorg/a/a/l;->cip:[I
+    iget-object v6, v9, Lorg/a/a/l;->chJ:[I
 
-    and-int v12, v4, v17
+    and-int v13, v4, v18
 
-    sub-int v12, v15, v12
+    sub-int v13, v3, v13
 
-    aget v6, v6, v12
+    aget v6, v6, v13
 
-    goto :goto_2c
+    :goto_2a
+    add-int v19, v19, v6
+
+    move/from16 v13, v19
 
-    :goto_2d
     const/high16 v6, 0x800000
 
     and-int/2addr v4, v6
@@ -7124,269 +7006,270 @@
 
     const v4, 0x1000004
 
-    if-eq v12, v4, :cond_34
+    if-eq v13, v4, :cond_34
 
     const v4, 0x1000003
 
-    if-ne v12, v4, :cond_36
+    if-ne v13, v4, :cond_36
 
     :cond_34
-    const/high16 v12, 0x1000000
+    const/high16 v13, 0x1000000
 
-    goto :goto_2e
+    goto :goto_2b
 
     :cond_35
-    iget-object v4, v8, Lorg/a/a/l;->ciM:[I
+    iget-object v4, v9, Lorg/a/a/l;->cig:[I
 
-    aget v12, v4, v3
+    aget v13, v4, v2
 
     :cond_36
-    :goto_2e
-    iget-object v4, v8, Lorg/a/a/l;->ciQ:[I
+    :goto_2b
+    iget-object v4, v9, Lorg/a/a/l;->cik:[I
 
     if-eqz v4, :cond_37
 
-    invoke-virtual {v8, v10, v12}, Lorg/a/a/l;->a(Lorg/a/a/g;I)I
+    invoke-virtual {v9, v11, v13}, Lorg/a/a/l;->a(Lorg/a/a/g;I)I
 
-    move-result v12
+    move-result v13
 
     :cond_37
-    iget-object v4, v11, Lorg/a/a/l;->ciM:[I
+    iget-object v4, v12, Lorg/a/a/l;->cig:[I
 
-    invoke-static {v10, v12, v4, v3}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
+    invoke-static {v11, v13, v4, v2}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
 
     move-result v4
 
-    or-int v16, v16, v4
+    or-int v17, v17, v4
 
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     const/16 v4, 0x20
 
     const/4 v6, 0x0
 
-    const/high16 v12, 0x1000000
+    const/high16 v13, 0x1000000
 
-    goto :goto_2b
+    goto :goto_29
 
     :cond_38
-    if-lez v13, :cond_3b
+    if-lez v14, :cond_3b
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    :goto_2f
-    if-ge v3, v14, :cond_39
+    :goto_2c
+    if-ge v2, v15, :cond_39
 
-    iget-object v4, v8, Lorg/a/a/l;->ciM:[I
+    iget-object v3, v9, Lorg/a/a/l;->cig:[I
 
-    aget v4, v4, v3
+    aget v3, v3, v2
 
-    iget-object v6, v11, Lorg/a/a/l;->ciM:[I
+    iget-object v4, v12, Lorg/a/a/l;->cig:[I
 
-    invoke-static {v10, v4, v6, v3}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
-
-    move-result v4
-
-    or-int v16, v16, v4
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_2f
-
-    :cond_39
-    iget-object v3, v11, Lorg/a/a/l;->cip:[I
-
-    if-nez v3, :cond_3a
-
-    new-array v3, v7, [I
-
-    iput-object v3, v11, Lorg/a/a/l;->cip:[I
-
-    const/16 v16, 0x1
-
-    :cond_3a
-    iget-object v3, v11, Lorg/a/a/l;->cip:[I
-
-    const/4 v4, 0x0
-
-    invoke-static {v10, v13, v3, v4}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
+    invoke-static {v11, v3, v4, v2}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
 
     move-result v3
 
-    or-int v3, v16, v3
+    or-int v17, v17, v3
 
-    move/from16 v16, v3
+    add-int/lit8 v2, v2, 0x1
 
-    goto/16 :goto_35
+    goto :goto_2c
+
+    :cond_39
+    iget-object v2, v12, Lorg/a/a/l;->chJ:[I
+
+    if-nez v2, :cond_3a
+
+    new-array v2, v7, [I
+
+    iput-object v2, v12, Lorg/a/a/l;->chJ:[I
+
+    const/16 v17, 0x1
+
+    :cond_3a
+    iget-object v2, v12, Lorg/a/a/l;->chJ:[I
+
+    const/4 v3, 0x0
+
+    invoke-static {v11, v14, v2, v3}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
+
+    move-result v2
+
+    or-int v2, v17, v2
+
+    move/from16 v17, v2
+
+    goto/16 :goto_31
 
     :cond_3b
-    iget-object v3, v8, Lorg/a/a/l;->cip:[I
+    iget-object v2, v9, Lorg/a/a/l;->chJ:[I
 
-    array-length v3, v3
+    array-length v2, v2
 
-    iget-object v4, v8, Lorg/a/a/l;->ciD:Lorg/a/a/p;
+    iget-object v4, v9, Lorg/a/a/l;->chX:Lorg/a/a/p;
 
-    iget v4, v4, Lorg/a/a/p;->chv:I
+    iget v4, v4, Lorg/a/a/p;->cgP:I
 
-    add-int/2addr v3, v4
+    add-int/2addr v2, v4
 
-    iget-object v4, v11, Lorg/a/a/l;->cip:[I
+    iget-object v4, v12, Lorg/a/a/l;->chJ:[I
 
     if-nez v4, :cond_3c
 
-    iget v4, v8, Lorg/a/a/l;->ciH:I
+    iget v4, v9, Lorg/a/a/l;->cib:I
 
-    add-int/2addr v4, v3
+    add-int/2addr v4, v2
 
     new-array v4, v4, [I
 
-    iput-object v4, v11, Lorg/a/a/l;->cip:[I
+    iput-object v4, v12, Lorg/a/a/l;->chJ:[I
 
-    const/16 v16, 0x1
+    const/16 v17, 0x1
 
     :cond_3c
     const/4 v4, 0x0
 
-    :goto_30
-    if-ge v4, v3, :cond_3e
+    :goto_2d
+    if-ge v4, v2, :cond_3e
 
-    iget-object v6, v8, Lorg/a/a/l;->cip:[I
+    iget-object v6, v9, Lorg/a/a/l;->chJ:[I
 
     aget v6, v6, v4
 
-    iget-object v12, v8, Lorg/a/a/l;->ciQ:[I
+    iget-object v13, v9, Lorg/a/a/l;->cik:[I
 
-    if-eqz v12, :cond_3d
+    if-eqz v13, :cond_3d
 
-    invoke-virtual {v8, v10, v6}, Lorg/a/a/l;->a(Lorg/a/a/g;I)I
+    invoke-virtual {v9, v11, v6}, Lorg/a/a/l;->a(Lorg/a/a/g;I)I
 
     move-result v6
 
     :cond_3d
-    iget-object v12, v11, Lorg/a/a/l;->cip:[I
+    iget-object v13, v12, Lorg/a/a/l;->chJ:[I
 
-    invoke-static {v10, v6, v12, v4}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
+    invoke-static {v11, v6, v13, v4}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
 
     move-result v6
 
-    or-int v16, v16, v6
+    or-int v17, v17, v6
 
     add-int/lit8 v4, v4, 0x1
 
-    goto :goto_30
+    goto :goto_2d
 
     :cond_3e
     const/4 v4, 0x0
 
-    :goto_31
-    iget v6, v8, Lorg/a/a/l;->ciH:I
+    :goto_2e
+    iget v6, v9, Lorg/a/a/l;->cib:I
 
     if-ge v4, v6, :cond_44
 
-    iget-object v6, v8, Lorg/a/a/l;->ciO:[I
+    iget-object v6, v9, Lorg/a/a/l;->cii:[I
 
-    aget v12, v6, v4
+    aget v13, v6, v4
 
     const/high16 v6, -0x10000000
 
-    and-int/2addr v6, v12
+    and-int/2addr v6, v13
 
-    const/high16 v13, 0xf000000
+    const/high16 v14, 0xf000000
 
-    and-int/2addr v13, v12
+    and-int/2addr v14, v13
 
-    const/high16 v14, 0x1000000
+    const/high16 v15, 0x1000000
 
-    if-ne v13, v14, :cond_3f
+    if-ne v14, v15, :cond_3f
 
-    move v6, v12
-
-    goto :goto_34
+    goto :goto_30
 
     :cond_3f
-    const/high16 v14, 0x2000000
+    const/high16 v15, 0x2000000
 
-    if-ne v13, v14, :cond_40
+    if-ne v14, v15, :cond_40
 
-    iget-object v13, v8, Lorg/a/a/l;->ciM:[I
+    iget-object v14, v9, Lorg/a/a/l;->cig:[I
 
-    and-int v14, v12, v17
+    and-int v15, v13, v18
 
-    aget v13, v13, v14
+    aget v14, v14, v15
 
-    :goto_32
-    add-int/2addr v6, v13
-
-    goto :goto_33
+    goto :goto_2f
 
     :cond_40
-    iget-object v13, v8, Lorg/a/a/l;->cip:[I
+    iget-object v14, v9, Lorg/a/a/l;->chJ:[I
 
-    and-int v14, v12, v17
+    and-int v15, v13, v18
 
-    sub-int v14, v15, v14
+    sub-int v15, v3, v15
 
-    aget v13, v13, v14
+    aget v14, v14, v15
 
-    goto :goto_32
+    :goto_2f
+    add-int/2addr v6, v14
 
-    :goto_33
-    const/high16 v13, 0x800000
+    const/high16 v14, 0x800000
 
-    and-int/2addr v12, v13
+    and-int/2addr v13, v14
 
-    if-eqz v12, :cond_42
+    if-eqz v13, :cond_42
 
-    const v12, 0x1000004
+    const v13, 0x1000004
 
-    if-eq v6, v12, :cond_41
+    if-eq v6, v13, :cond_41
 
-    const v12, 0x1000003
+    const v13, 0x1000003
 
-    if-ne v6, v12, :cond_42
+    if-ne v6, v13, :cond_42
 
     :cond_41
-    const/high16 v6, 0x1000000
+    const/high16 v13, 0x1000000
+
+    goto :goto_30
 
     :cond_42
-    :goto_34
-    iget-object v12, v8, Lorg/a/a/l;->ciQ:[I
+    move v13, v6
 
-    if-eqz v12, :cond_43
+    :goto_30
+    iget-object v6, v9, Lorg/a/a/l;->cik:[I
 
-    invoke-virtual {v8, v10, v6}, Lorg/a/a/l;->a(Lorg/a/a/g;I)I
+    if-eqz v6, :cond_43
 
-    move-result v6
+    invoke-virtual {v9, v11, v13}, Lorg/a/a/l;->a(Lorg/a/a/g;I)I
+
+    move-result v13
 
     :cond_43
-    iget-object v12, v11, Lorg/a/a/l;->cip:[I
+    iget-object v6, v12, Lorg/a/a/l;->chJ:[I
 
-    add-int v13, v3, v4
+    add-int v14, v2, v4
 
-    invoke-static {v10, v6, v12, v13}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
+    invoke-static {v11, v13, v6, v14}, Lorg/a/a/l;->a(Lorg/a/a/g;I[II)Z
 
     move-result v6
 
-    or-int v16, v16, v6
+    or-int v17, v17, v6
 
     add-int/lit8 v4, v4, 0x1
 
-    goto :goto_31
+    goto :goto_2e
 
     :cond_44
-    :goto_35
-    if-eqz v16, :cond_45
+    :goto_31
+    if-eqz v17, :cond_45
 
-    iget-object v3, v9, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v2, v10, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    if-nez v3, :cond_45
+    if-nez v2, :cond_45
 
-    iput-object v5, v9, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iput-object v8, v10, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    move-object v5, v9
+    move-object v8, v10
 
     :cond_45
-    iget-object v1, v1, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v1, v1, Lorg/a/a/i;->chY:Lorg/a/a/i;
+
+    const/high16 v2, 0x1700000
 
     const/4 v3, 0x0
 
@@ -7394,72 +7277,72 @@
 
     const/4 v6, 0x0
 
-    const/high16 v12, 0x1000000
+    const/high16 v13, 0x1000000
 
-    goto/16 :goto_29
+    goto/16 :goto_27
 
     :cond_46
-    move-object v1, v5
+    move-object v1, v8
 
-    goto/16 :goto_28
+    goto/16 :goto_26
 
     :cond_47
-    iget-object v1, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v1, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    :goto_36
+    :goto_32
     if-eqz v1, :cond_4c
 
-    iget-object v3, v1, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v2, v1, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget v4, v1, Lorg/a/a/p;->ciC:I
+    iget v3, v1, Lorg/a/a/p;->chW:I
 
-    const/16 v5, 0x20
+    const/16 v4, 0x20
 
-    and-int/2addr v4, v5
+    and-int/2addr v3, v4
 
-    if-eqz v4, :cond_48
+    if-eqz v3, :cond_48
 
-    invoke-direct {v0, v3}, Lorg/a/a/r;->a(Lorg/a/a/l;)V
+    invoke-direct {v0, v2}, Lorg/a/a/r;->a(Lorg/a/a/l;)V
 
     :cond_48
-    iget v3, v1, Lorg/a/a/p;->ciC:I
+    iget v2, v1, Lorg/a/a/p;->chW:I
 
-    and-int/lit8 v3, v3, 0x40
+    and-int/lit8 v2, v2, 0x40
 
-    if-nez v3, :cond_4b
+    if-nez v2, :cond_4b
 
-    iget-object v3, v1, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    iget-object v2, v1, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
-    iget v4, v1, Lorg/a/a/p;->chH:I
+    iget v3, v1, Lorg/a/a/p;->chb:I
 
-    if-nez v3, :cond_49
+    if-nez v2, :cond_49
 
-    iget-object v5, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v4, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v5, v5, Lorg/a/a/d;->chr:I
+    iget v4, v4, Lorg/a/a/d;->cgL:I
 
-    goto :goto_37
+    goto :goto_33
 
     :cond_49
-    iget v5, v3, Lorg/a/a/p;->chH:I
+    iget v4, v2, Lorg/a/a/p;->chb:I
 
-    :goto_37
-    sub-int/2addr v5, v7
+    :goto_33
+    sub-int/2addr v4, v7
 
-    if-lt v5, v4, :cond_4b
+    if-lt v4, v3, :cond_4b
 
-    invoke-static {v2, v7}, Ljava/lang/Math;->max(II)I
+    invoke-static {v5, v7}, Ljava/lang/Math;->max(II)I
 
-    move-result v2
+    move-result v5
 
-    move v6, v4
+    move v6, v3
 
-    :goto_38
-    if-ge v6, v5, :cond_4a
+    :goto_34
+    if-ge v6, v4, :cond_4a
 
-    iget-object v8, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v8, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v8, v8, Lorg/a/a/d;->chA:[B
+    iget-object v8, v8, Lorg/a/a/d;->cgU:[B
 
     const/4 v9, 0x0
 
@@ -7467,104 +7350,104 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_38
+    goto :goto_34
 
     :cond_4a
     const/4 v9, 0x0
 
-    iget-object v6, v0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v6, v0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v6, v6, Lorg/a/a/d;->chA:[B
+    iget-object v6, v6, Lorg/a/a/d;->cgU:[B
 
     const/16 v8, -0x41
 
-    aput-byte v8, v6, v5
+    aput-byte v8, v6, v4
 
-    invoke-direct {v0, v4, v9, v7}, Lorg/a/a/r;->s(III)I
+    invoke-direct {v0, v3, v9, v7}, Lorg/a/a/r;->s(III)I
 
-    iget-object v4, v0, Lorg/a/a/r;->cju:[I
+    iget-object v3, v0, Lorg/a/a/r;->ciO:[I
 
-    const/high16 v5, 0x1700000
+    iget-object v4, v0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object v6, v0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    const-string v6, "java/lang/Throwable"
 
-    const-string v8, "java/lang/Throwable"
+    invoke-virtual {v4, v6}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
 
-    invoke-virtual {v6, v8}, Lorg/a/a/g;->eW(Ljava/lang/String;)I
+    move-result v4
 
-    move-result v6
+    const/high16 v6, 0x1700000
 
-    or-int/2addr v5, v6
+    or-int/2addr v4, v6
 
-    const/4 v6, 0x3
+    const/4 v8, 0x3
 
-    aput v5, v4, v6
+    aput v4, v3, v8
 
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/r;->JJ()V
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/r;->JI()V
 
-    iget-object v4, v0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
+    iget-object v3, v0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
 
-    invoke-static {v4, v1, v3}, Lorg/a/a/n;->a(Lorg/a/a/n;Lorg/a/a/p;Lorg/a/a/p;)Lorg/a/a/n;
+    invoke-static {v3, v1, v2}, Lorg/a/a/n;->a(Lorg/a/a/n;Lorg/a/a/p;Lorg/a/a/p;)Lorg/a/a/n;
 
-    move-result-object v3
+    move-result-object v2
 
-    iput-object v3, v0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
+    iput-object v2, v0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
 
-    goto :goto_39
+    goto :goto_35
 
     :cond_4b
-    const/4 v6, 0x3
+    const/high16 v6, 0x1700000
 
-    :goto_39
-    iget-object v1, v1, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    const/4 v8, 0x3
+
+    :goto_35
+    iget-object v1, v1, Lorg/a/a/p;->cix:Lorg/a/a/p;
+
+    goto :goto_32
+
+    :cond_4c
+    iget-object v1, v0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
+
+    const/4 v3, 0x0
+
+    iput v3, v0, Lorg/a/a/r;->ciP:I
+
+    :goto_36
+    if-eqz v1, :cond_4d
+
+    iget v2, v0, Lorg/a/a/r;->ciP:I
+
+    add-int/2addr v2, v7
+
+    iput v2, v0, Lorg/a/a/r;->ciP:I
+
+    iget-object v1, v1, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
     goto :goto_36
 
-    :cond_4c
-    iget-object v1, v0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
-
-    const/4 v4, 0x0
-
-    iput v4, v0, Lorg/a/a/r;->cjv:I
-
-    :goto_3a
-    if-eqz v1, :cond_4d
-
-    iget v3, v0, Lorg/a/a/r;->cjv:I
-
-    add-int/2addr v3, v7
-
-    iput v3, v0, Lorg/a/a/r;->cjv:I
-
-    iget-object v1, v1, Lorg/a/a/n;->ciW:Lorg/a/a/n;
-
-    goto :goto_3a
-
     :cond_4d
-    iput v2, v0, Lorg/a/a/r;->chX:I
+    iput v5, v0, Lorg/a/a/r;->chr:I
 
     return-void
 
     :cond_4e
-    const/4 v4, 0x0
-
-    iget v2, v0, Lorg/a/a/r;->M:I
+    const/4 v3, 0x0
 
     if-ne v2, v7, :cond_5d
 
-    iget-object v2, v0, Lorg/a/a/r;->cjw:Lorg/a/a/n;
+    iget-object v2, v0, Lorg/a/a/r;->ciQ:Lorg/a/a/n;
 
-    :goto_3b
+    :goto_37
     if-eqz v2, :cond_51
 
-    iget-object v3, v2, Lorg/a/a/n;->ciU:Lorg/a/a/p;
+    iget-object v4, v2, Lorg/a/a/n;->cio:Lorg/a/a/p;
 
-    iget-object v5, v2, Lorg/a/a/n;->ciV:Lorg/a/a/p;
+    iget-object v5, v2, Lorg/a/a/n;->cip:Lorg/a/a/p;
 
-    iget-object v6, v2, Lorg/a/a/n;->ciD:Lorg/a/a/p;
+    iget-object v6, v2, Lorg/a/a/n;->chX:Lorg/a/a/p;
 
-    :goto_3c
-    if-eq v3, v6, :cond_50
+    :goto_38
+    if-eq v4, v6, :cond_50
 
     new-instance v8, Lorg/a/a/i;
 
@@ -7572,92 +7455,90 @@
 
     const v9, 0x7fffffff
 
-    iput v9, v8, Lorg/a/a/i;->ciC:I
+    iput v9, v8, Lorg/a/a/i;->chW:I
 
-    iput-object v5, v8, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iput-object v5, v8, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iget v9, v3, Lorg/a/a/p;->ciC:I
+    iget v9, v4, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v9, v9, 0x80
 
     if-nez v9, :cond_4f
 
-    iget-object v9, v3, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v9, v4, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iput-object v9, v8, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iput-object v9, v8, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iput-object v8, v3, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iput-object v8, v4, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    goto :goto_3d
+    goto :goto_39
 
     :cond_4f
-    iget-object v9, v3, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v9, v4, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget-object v9, v9, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v9, v9, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iget-object v9, v9, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v9, v9, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iput-object v9, v8, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iput-object v9, v8, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iget-object v9, v3, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v9, v4, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget-object v9, v9, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v9, v9, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iput-object v8, v9, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iput-object v8, v9, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    :goto_3d
-    iget-object v3, v3, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    :goto_39
+    iget-object v4, v4, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
-    goto :goto_3c
+    goto :goto_38
 
     :cond_50
-    iget-object v2, v2, Lorg/a/a/n;->ciW:Lorg/a/a/n;
+    iget-object v2, v2, Lorg/a/a/n;->ciq:Lorg/a/a/n;
 
-    goto :goto_3b
+    goto :goto_37
 
     :cond_51
     iget v2, v0, Lorg/a/a/r;->L:I
 
     if-lez v2, :cond_56
 
-    iget-object v2, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v4, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
     const-wide/16 v5, 0x1
 
-    iget v3, v0, Lorg/a/a/r;->L:I
-
     const/4 v8, 0x0
 
-    invoke-virtual {v2, v8, v5, v6, v3}, Lorg/a/a/p;->a(Lorg/a/a/p;JI)V
+    invoke-virtual {v4, v8, v5, v6, v2}, Lorg/a/a/p;->a(Lorg/a/a/p;JI)V
 
-    iget-object v2, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v2, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    :goto_3e
+    :goto_3a
     if-eqz v2, :cond_53
 
-    iget v5, v2, Lorg/a/a/p;->ciC:I
+    iget v5, v2, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v5, v5, 0x80
 
     if-eqz v5, :cond_52
 
-    iget-object v5, v2, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v5, v2, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget-object v5, v5, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v5, v5, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iget-object v5, v5, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v5, v5, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iget v6, v5, Lorg/a/a/p;->ciC:I
+    iget v6, v5, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v6, v6, 0x400
 
     if-nez v6, :cond_52
 
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v4, v4, 0x1
 
-    int-to-long v8, v3
+    int-to-long v8, v4
 
     const-wide/16 v10, 0x20
 
@@ -7669,7 +7550,7 @@
 
     const-wide/16 v10, 0x1
 
-    rem-int/lit8 v12, v3, 0x20
+    rem-int/lit8 v12, v4, 0x20
 
     shl-long/2addr v10, v12
 
@@ -7681,101 +7562,101 @@
 
     invoke-virtual {v5, v11, v8, v9, v10}, Lorg/a/a/p;->a(Lorg/a/a/p;JI)V
 
-    goto :goto_3f
+    goto :goto_3b
 
     :cond_52
     const/16 v6, 0x20
 
     const/4 v11, 0x0
 
-    :goto_3f
-    iget-object v2, v2, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    :goto_3b
+    iget-object v2, v2, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
-    goto :goto_3e
+    goto :goto_3a
 
     :cond_53
-    iget-object v2, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v2, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    :goto_40
+    :goto_3c
     if-eqz v2, :cond_56
 
-    iget v3, v2, Lorg/a/a/p;->ciC:I
+    iget v4, v2, Lorg/a/a/p;->chW:I
 
-    and-int/lit16 v3, v3, 0x80
+    and-int/lit16 v4, v4, 0x80
 
-    if-eqz v3, :cond_55
+    if-eqz v4, :cond_55
 
-    iget-object v3, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v4, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
-    :goto_41
-    if-eqz v3, :cond_54
+    :goto_3d
+    if-eqz v4, :cond_54
 
-    iget v5, v3, Lorg/a/a/p;->ciC:I
+    iget v5, v4, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v5, v5, -0x801
 
-    iput v5, v3, Lorg/a/a/p;->ciC:I
+    iput v5, v4, Lorg/a/a/p;->chW:I
 
-    iget-object v3, v3, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    iget-object v4, v4, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
-    goto :goto_41
+    goto :goto_3d
 
     :cond_54
-    iget-object v3, v2, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v4, v2, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget-object v3, v3, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v4, v4, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    iget-object v3, v3, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v4, v4, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
     const-wide/16 v5, 0x0
 
     iget v8, v0, Lorg/a/a/r;->L:I
 
-    invoke-virtual {v3, v2, v5, v6, v8}, Lorg/a/a/p;->a(Lorg/a/a/p;JI)V
+    invoke-virtual {v4, v2, v5, v6, v8}, Lorg/a/a/p;->a(Lorg/a/a/p;JI)V
 
     :cond_55
-    iget-object v2, v2, Lorg/a/a/p;->cjd:Lorg/a/a/p;
+    iget-object v2, v2, Lorg/a/a/p;->cix:Lorg/a/a/p;
 
-    goto :goto_40
+    goto :goto_3c
 
     :cond_56
-    iget-object v2, v0, Lorg/a/a/r;->cjK:Lorg/a/a/p;
+    iget-object v2, v0, Lorg/a/a/r;->cje:Lorg/a/a/p;
 
     :cond_57
     if-eqz v2, :cond_5c
 
-    iget-object v3, v2, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iget-object v4, v2, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    iget v5, v2, Lorg/a/a/p;->chv:I
+    iget v5, v2, Lorg/a/a/p;->cgP:I
 
-    iget v6, v2, Lorg/a/a/p;->ciH:I
+    iget v6, v2, Lorg/a/a/p;->cib:I
 
     add-int/2addr v6, v5
 
-    if-le v6, v4, :cond_58
+    if-le v6, v3, :cond_58
 
-    move v4, v6
+    move v3, v6
 
     :cond_58
-    iget-object v6, v2, Lorg/a/a/p;->cje:Lorg/a/a/i;
+    iget-object v6, v2, Lorg/a/a/p;->ciy:Lorg/a/a/i;
 
-    iget v2, v2, Lorg/a/a/p;->ciC:I
+    iget v2, v2, Lorg/a/a/p;->chW:I
 
     and-int/lit16 v2, v2, 0x80
 
     if-eqz v2, :cond_59
 
-    iget-object v6, v6, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v6, v6, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
     :cond_59
-    move-object v2, v3
+    move-object v2, v4
 
-    :goto_42
+    :goto_3e
     if-eqz v6, :cond_57
 
-    iget-object v3, v6, Lorg/a/a/i;->ciD:Lorg/a/a/p;
+    iget-object v4, v6, Lorg/a/a/i;->chX:Lorg/a/a/p;
 
-    iget v8, v3, Lorg/a/a/p;->ciC:I
+    iget v8, v4, Lorg/a/a/p;->chW:I
 
     const/16 v9, 0x8
 
@@ -7783,7 +7664,7 @@
 
     if-nez v8, :cond_5b
 
-    iget v8, v6, Lorg/a/a/i;->ciC:I
+    iget v8, v6, Lorg/a/a/i;->chW:I
 
     const v10, 0x7fffffff
 
@@ -7791,46 +7672,46 @@
 
     const/4 v8, 0x1
 
-    goto :goto_43
+    goto :goto_3f
 
     :cond_5a
-    iget v8, v6, Lorg/a/a/i;->ciC:I
+    iget v8, v6, Lorg/a/a/i;->chW:I
 
     add-int/2addr v8, v5
 
-    :goto_43
-    iput v8, v3, Lorg/a/a/p;->chv:I
+    :goto_3f
+    iput v8, v4, Lorg/a/a/p;->cgP:I
 
-    iget v8, v3, Lorg/a/a/p;->ciC:I
+    iget v8, v4, Lorg/a/a/p;->chW:I
 
     or-int/2addr v8, v9
 
-    iput v8, v3, Lorg/a/a/p;->ciC:I
+    iput v8, v4, Lorg/a/a/p;->chW:I
 
-    iput-object v2, v3, Lorg/a/a/p;->cjf:Lorg/a/a/p;
+    iput-object v2, v4, Lorg/a/a/p;->ciz:Lorg/a/a/p;
 
-    move-object v2, v3
+    move-object v2, v4
 
     :cond_5b
-    iget-object v6, v6, Lorg/a/a/i;->ciE:Lorg/a/a/i;
+    iget-object v6, v6, Lorg/a/a/i;->chY:Lorg/a/a/i;
 
-    goto :goto_42
+    goto :goto_3e
 
     :cond_5c
-    invoke-static {v1, v4}, Ljava/lang/Math;->max(II)I
+    invoke-static {v1, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    iput v1, v0, Lorg/a/a/r;->chX:I
+    iput v1, v0, Lorg/a/a/r;->chr:I
 
     return-void
 
     :cond_5d
-    iput v1, v0, Lorg/a/a/r;->chX:I
+    iput v1, v0, Lorg/a/a/r;->chr:I
 
     move/from16 v1, p2
 
-    iput v1, v0, Lorg/a/a/r;->chY:I
+    iput v1, v0, Lorg/a/a/r;->chs:I
 
     return-void
 
@@ -7890,7 +7771,7 @@
 
     and-int/2addr p1, v0
 
-    iget v0, p0, Lorg/a/a/r;->cjG:I
+    iget v0, p0, Lorg/a/a/r;->cja:I
 
     shl-int/lit8 v0, v0, 0x8
 
@@ -7898,7 +7779,7 @@
 
     invoke-static {p1, p2, v4}, Lorg/a/a/b;->a(ILorg/a/a/u;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p1, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -7914,9 +7795,9 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget p2, v4, Lorg/a/a/d;->chr:I
+    iget p2, v4, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v5, p2, -0x2
 
@@ -7930,20 +7811,20 @@
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     :goto_0
     return-object p1
@@ -7952,7 +7833,7 @@
 .method public final b(ILorg/a/a/p;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -7960,22 +7841,22 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/r;->cjE:I
+    iget v0, p0, Lorg/a/a/r;->ciY:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/r;->cjE:I
+    iput v0, p0, Lorg/a/a/r;->ciY:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/p;->chH:I
+    iget p2, p2, Lorg/a/a/p;->chb:I
 
     invoke-virtual {v0, p2}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/r;->cjF:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/r;->ciZ:Lorg/a/a/d;
 
     invoke-virtual {p2, p1}, Lorg/a/a/d;->fC(I)Lorg/a/a/d;
 
@@ -7985,57 +7866,55 @@
 .method public final bY(Ljava/lang/Object;)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p1}, Lorg/a/a/g;->bX(Ljava/lang/Object;)Lorg/a/a/o;
 
     move-result-object p1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    const/4 v1, 0x6
+    const/16 v1, 0x12
 
-    const/16 v2, 0x12
+    const/4 v2, 0x6
 
     const/4 v3, 0x5
 
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v4, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v4, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
-
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     const/4 v4, 0x0
 
-    iget-object v5, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v5, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    invoke-virtual {v0, v2, v4, v5, p1}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
+    invoke-virtual {v0, v1, v4, v5, p1}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
 
     goto :goto_2
 
     :cond_0
-    iget v0, p1, Lorg/a/a/o;->chr:I
+    iget v0, p1, Lorg/a/a/o;->cgL:I
 
     if-eq v0, v3, :cond_2
 
-    iget v0, p1, Lorg/a/a/o;->chr:I
+    iget v0, p1, Lorg/a/a/o;->cgL:I
 
-    if-ne v0, v1, :cond_1
+    if-ne v0, v2, :cond_1
 
     goto :goto_0
 
     :cond_1
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -8043,31 +7922,31 @@
 
     :cond_2
     :goto_0
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     add-int/lit8 v0, v0, 0x2
 
     :goto_1
-    iget v4, p0, Lorg/a/a/r;->cjO:I
+    iget v4, p0, Lorg/a/a/r;->cji:I
 
     if-le v0, v4, :cond_3
 
-    iput v0, p0, Lorg/a/a/r;->cjO:I
+    iput v0, p0, Lorg/a/a/r;->cji:I
 
     :cond_3
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
     :cond_4
     :goto_2
-    iget v0, p1, Lorg/a/a/o;->ciC:I
+    iget v0, p1, Lorg/a/a/o;->chW:I
 
-    iget v4, p1, Lorg/a/a/o;->chr:I
+    iget v4, p1, Lorg/a/a/o;->cgL:I
 
     if-eq v4, v3, :cond_7
 
-    iget p1, p1, Lorg/a/a/o;->chr:I
+    iget p1, p1, Lorg/a/a/o;->cgL:I
 
-    if-ne p1, v1, :cond_5
+    if-ne p1, v2, :cond_5
 
     goto :goto_3
 
@@ -8076,7 +7955,7 @@
 
     if-lt v0, p1, :cond_6
 
-    iget-object p1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v1, 0x13
 
@@ -8085,15 +7964,15 @@
     return-void
 
     :cond_6
-    iget-object p1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    invoke-virtual {p1, v2, v0}, Lorg/a/a/d;->aw(II)Lorg/a/a/d;
+    invoke-virtual {p1, v1, v0}, Lorg/a/a/d;->aw(II)Lorg/a/a/d;
 
     return-void
 
     :cond_7
     :goto_3
-    iget-object p1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     const/16 v1, 0x14
 
@@ -8111,7 +7990,7 @@
 
     invoke-static {p1, p2, v4}, Lorg/a/a/b;->a(ILorg/a/a/u;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object p1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {p1, p3}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -8127,9 +8006,9 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget p2, v4, Lorg/a/a/d;->chr:I
+    iget p2, v4, Lorg/a/a/d;->cgL:I
 
     add-int/lit8 v5, p2, -0x2
 
@@ -8143,20 +8022,20 @@
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjH:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->cjb:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjI:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->cjc:Lorg/a/a/b;
 
     :goto_0
     return-object p1
@@ -8165,46 +8044,44 @@
 .method public final c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p2, p3, p4}, Lorg/a/a/g;->r(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/o;
 
     move-result-object p2
 
-    iget-object p3, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object p3, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
-    if-eqz p3, :cond_9
+    if-eqz p3, :cond_8
 
-    iget p3, p0, Lorg/a/a/r;->M:I
+    iget v0, p0, Lorg/a/a/r;->M:I
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    if-nez p3, :cond_0
+    if-nez v0, :cond_0
 
-    iget-object p3, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object p3, p3, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object p3, p3, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object p4, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
-    iget-object p4, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
-
-    invoke-virtual {p3, p1, v0, p4, p2}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
+    invoke-virtual {p3, p1, v1, p4, p2}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
 
     goto :goto_4
 
     :cond_0
-    invoke-virtual {p4, v0}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {p4, v1}, Ljava/lang/String;->charAt(I)C
 
     move-result p3
 
     const/4 p4, 0x1
 
-    const/4 v1, -0x2
+    const/4 v0, -0x2
 
     const/16 v2, 0x4a
 
@@ -8212,18 +8089,18 @@
 
     packed-switch p1, :pswitch_data_0
 
-    iget p4, p0, Lorg/a/a/r;->cjN:I
+    iget p4, p0, Lorg/a/a/r;->cjh:I
 
-    if-eq p3, v3, :cond_6
+    if-eq p3, v3, :cond_5
 
-    if-ne p3, v2, :cond_7
+    if-ne p3, v2, :cond_6
 
     goto :goto_1
 
     :pswitch_0
-    iget v1, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
-    if-eq p3, v3, :cond_2
+    if-eq p3, v3, :cond_4
 
     if-ne p3, v2, :cond_1
 
@@ -8232,64 +8109,61 @@
     :cond_1
     const/4 p4, 0x0
 
-    :cond_2
-    :goto_0
-    add-int/2addr v1, p4
-
-    goto :goto_3
+    goto :goto_0
 
     :pswitch_1
-    iget p4, p0, Lorg/a/a/r;->cjN:I
+    iget p4, p0, Lorg/a/a/r;->cjh:I
 
-    if-eq p3, v3, :cond_7
+    if-eq p3, v3, :cond_6
 
-    if-ne p3, v2, :cond_3
+    if-ne p3, v2, :cond_2
 
     goto :goto_2
 
-    :cond_3
-    const/4 v1, -0x1
+    :cond_2
+    const/4 v0, -0x1
 
     goto :goto_2
 
     :pswitch_2
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
-    if-eq p3, v3, :cond_4
+    if-eq p3, v3, :cond_3
 
-    if-ne p3, v2, :cond_5
+    if-ne p3, v2, :cond_4
 
-    :cond_4
+    :cond_3
     const/4 p4, 0x2
 
-    :cond_5
-    add-int v1, v0, p4
+    :cond_4
+    :goto_0
+    add-int/2addr v0, p4
 
     goto :goto_3
 
-    :cond_6
+    :cond_5
     :goto_1
-    const/4 v1, -0x3
+    const/4 v0, -0x3
 
-    :cond_7
+    :cond_6
     :goto_2
-    add-int/2addr v1, p4
+    add-int/2addr v0, p4
 
     :goto_3
-    iget p3, p0, Lorg/a/a/r;->cjO:I
+    iget p3, p0, Lorg/a/a/r;->cji:I
 
-    if-le v1, p3, :cond_8
+    if-le v0, p3, :cond_7
 
-    iput v1, p0, Lorg/a/a/r;->cjO:I
+    iput v0, p0, Lorg/a/a/r;->cji:I
+
+    :cond_7
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
     :cond_8
-    iput v1, p0, Lorg/a/a/r;->cjN:I
-
-    :cond_9
     :goto_4
-    iget-object p3, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/o;->ciC:I
+    iget p2, p2, Lorg/a/a/o;->chW:I
 
     invoke-virtual {p3, p1, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -8306,27 +8180,25 @@
 .method public final fO(I)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->fB(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v1, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
-
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
     const/4 v1, 0x0
 
@@ -8337,22 +8209,22 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
-    sget-object v1, Lorg/a/a/l;->chB:[I
+    sget-object v1, Lorg/a/a/l;->cgV:[I
 
     aget v1, v1, p1
 
     add-int/2addr v0, v1
 
-    iget v1, p0, Lorg/a/a/r;->cjO:I
+    iget v1, p0, Lorg/a/a/r;->cji:I
 
     if-le v0, v1, :cond_1
 
-    iput v0, p0, Lorg/a/a/r;->cjO:I
+    iput v0, p0, Lorg/a/a/r;->cji:I
 
     :cond_1
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
     :goto_0
     const/16 v0, 0xac
@@ -8369,7 +8241,7 @@
     if-ne p1, v0, :cond_4
 
     :cond_3
-    invoke-direct {p0}, Lorg/a/a/r;->JI()V
+    invoke-direct {p0}, Lorg/a/a/r;->JH()V
 
     :cond_4
     return-void
@@ -8382,7 +8254,7 @@
 
     invoke-direct {v4}, Lorg/a/a/d;-><init>()V
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -8398,7 +8270,7 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     const/4 v2, 0x1
 
@@ -8412,20 +8284,20 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/r;->cjj:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->ciD:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjj:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->ciD:Lorg/a/a/b;
 
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/r;->cjk:Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/r;->ciE:Lorg/a/a/b;
 
-    iput-object p2, p1, Lorg/a/a/b;->chw:Lorg/a/a/b;
+    iput-object p2, p1, Lorg/a/a/b;->cgQ:Lorg/a/a/b;
 
-    iput-object p1, p0, Lorg/a/a/r;->cjk:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/r;->ciE:Lorg/a/a/b;
 
     :goto_0
     return-object p1
@@ -8434,35 +8306,33 @@
 .method public final k(ILjava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p2}, Lorg/a/a/g;->eS(Ljava/lang/String;)Lorg/a/a/o;
 
     move-result-object p2
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v1, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
+    iget-object v1, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget v1, v1, Lorg/a/a/d;->cgL:I
 
-    iget v1, v1, Lorg/a/a/d;->chr:I
-
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p1, v1, v2, p2}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
 
@@ -8473,24 +8343,24 @@
 
     if-ne p1, v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iget v1, p0, Lorg/a/a/r;->cjO:I
+    iget v1, p0, Lorg/a/a/r;->cji:I
 
     if-le v0, v1, :cond_1
 
-    iput v0, p0, Lorg/a/a/r;->cjO:I
+    iput v0, p0, Lorg/a/a/r;->cji:I
 
     :cond_1
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/o;->ciC:I
+    iget p2, p2, Lorg/a/a/o;->chW:I
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
@@ -8500,7 +8370,7 @@
 .method public final n(Ljava/lang/String;I)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -8508,16 +8378,16 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/r;->cjy:I
+    iget v0, p0, Lorg/a/a/r;->ciS:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/r;->cjy:I
+    iput v0, p0, Lorg/a/a/r;->ciS:I
 
-    iget-object v0, p0, Lorg/a/a/r;->cjz:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->ciT:Lorg/a/a/d;
 
     if-nez p1, :cond_1
 
@@ -8526,7 +8396,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v1, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v1, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)I
 
@@ -8545,52 +8415,50 @@
 .method public final o(Ljava/lang/String;I)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget v0, v0, Lorg/a/a/d;->chr:I
+    iget v0, v0, Lorg/a/a/d;->cgL:I
 
-    iput v0, p0, Lorg/a/a/r;->cjG:I
+    iput v0, p0, Lorg/a/a/r;->cja:I
 
-    iget-object v0, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, p1}, Lorg/a/a/g;->eS(Ljava/lang/String;)Lorg/a/a/o;
 
     move-result-object p1
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, p0, Lorg/a/a/r;->cjg:Lorg/a/a/p;
 
     const/16 v1, 0xc5
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lorg/a/a/r;->M:I
+    iget v2, p0, Lorg/a/a/r;->M:I
 
-    if-nez v0, :cond_0
+    if-nez v2, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/r;->cjM:Lorg/a/a/p;
+    iget-object v0, v0, Lorg/a/a/p;->ciw:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/p;->cjc:Lorg/a/a/l;
-
-    iget-object v2, p0, Lorg/a/a/r;->ciG:Lorg/a/a/g;
+    iget-object v2, p0, Lorg/a/a/r;->cia:Lorg/a/a/g;
 
     invoke-virtual {v0, v1, p2, v2, p1}, Lorg/a/a/l;->a(IILorg/a/a/g;Lorg/a/a/o;)V
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lorg/a/a/r;->cjN:I
+    iget v0, p0, Lorg/a/a/r;->cjh:I
 
     rsub-int/lit8 v2, p2, 0x1
 
     add-int/2addr v0, v2
 
-    iput v0, p0, Lorg/a/a/r;->cjN:I
+    iput v0, p0, Lorg/a/a/r;->cjh:I
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lorg/a/a/r;->chW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/r;->chq:Lorg/a/a/d;
 
-    iget p1, p1, Lorg/a/a/o;->ciC:I
+    iget p1, p1, Lorg/a/a/o;->chW:I
 
     invoke-virtual {v0, v1, p1}, Lorg/a/a/d;->ax(II)Lorg/a/a/d;
 
diff --git a/com.discord/smali_classes2/org/a/a/s.smali b/com.discord/smali_classes2/org/a/a/s.smali
index 84ef3d8e98..01135f3b91 100644
--- a/com.discord/smali_classes2/org/a/a/s.smali
+++ b/com.discord/smali_classes2/org/a/a/s.smali
@@ -3,19 +3,19 @@
 
 
 # static fields
-.field public static final cjP:Ljava/lang/Integer;
+.field public static final cjj:Ljava/lang/Integer;
 
-.field public static final cjQ:Ljava/lang/Integer;
+.field public static final cjk:Ljava/lang/Integer;
 
-.field public static final cjR:Ljava/lang/Integer;
+.field public static final cjl:Ljava/lang/Integer;
 
-.field public static final cjS:Ljava/lang/Integer;
+.field public static final cjm:Ljava/lang/Integer;
 
-.field public static final cjT:Ljava/lang/Integer;
+.field public static final cjn:Ljava/lang/Integer;
 
-.field public static final cjU:Ljava/lang/Integer;
+.field public static final cjo:Ljava/lang/Integer;
 
-.field public static final cjV:Ljava/lang/Integer;
+.field public static final cjp:Ljava/lang/Integer;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/s;->cjP:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/s;->cjj:Ljava/lang/Integer;
 
     const/4 v0, 0x1
 
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/s;->cjQ:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/s;->cjk:Ljava/lang/Integer;
 
     const/4 v0, 0x2
 
@@ -44,7 +44,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/s;->cjR:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/s;->cjl:Ljava/lang/Integer;
 
     const/4 v0, 0x3
 
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/s;->cjS:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/s;->cjm:Ljava/lang/Integer;
 
     const/4 v0, 0x4
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/s;->cjT:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/s;->cjn:Ljava/lang/Integer;
 
     const/4 v0, 0x5
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/s;->cjU:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/s;->cjo:Ljava/lang/Integer;
 
     const/4 v0, 0x6
 
@@ -76,7 +76,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/s;->cjV:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/s;->cjp:Ljava/lang/Integer;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/t.smali b/com.discord/smali_classes2/org/a/a/t.smali
index 3faa358404..818a871225 100644
--- a/com.discord/smali_classes2/org/a/a/t.smali
+++ b/com.discord/smali_classes2/org/a/a/t.smali
@@ -3,33 +3,33 @@
 
 
 # static fields
-.field public static final cjW:Lorg/a/a/t;
+.field public static final cjq:Lorg/a/a/t;
 
-.field public static final cjX:Lorg/a/a/t;
+.field public static final cjr:Lorg/a/a/t;
 
-.field public static final cjY:Lorg/a/a/t;
+.field public static final cjs:Lorg/a/a/t;
 
-.field public static final cjZ:Lorg/a/a/t;
+.field public static final cjt:Lorg/a/a/t;
 
-.field public static final cka:Lorg/a/a/t;
+.field public static final cju:Lorg/a/a/t;
 
-.field public static final ckb:Lorg/a/a/t;
+.field public static final cjv:Lorg/a/a/t;
 
-.field public static final ckc:Lorg/a/a/t;
+.field public static final cjw:Lorg/a/a/t;
 
-.field public static final ckd:Lorg/a/a/t;
+.field public static final cjx:Lorg/a/a/t;
 
-.field public static final cke:Lorg/a/a/t;
+.field public static final cjy:Lorg/a/a/t;
 
 
 # instance fields
-.field private final chD:I
+.field private final cgX:I
 
-.field private final chH:I
+.field public final chW:I
 
-.field public final ciC:I
+.field private final chb:I
 
-.field private final ckf:[C
+.field private final cjz:[C
 
 
 # direct methods
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->cjW:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjq:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -56,7 +56,7 @@
 
     invoke-direct {v0, v2, v1, v3, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->cjX:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjr:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -66,7 +66,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->cjY:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjs:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -76,7 +76,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->cjZ:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjt:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -86,7 +86,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->cka:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cju:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -96,7 +96,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->ckb:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjv:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -106,7 +106,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->ckc:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjw:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -116,7 +116,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->ckd:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjx:Lorg/a/a/t;
 
     new-instance v0, Lorg/a/a/t;
 
@@ -126,7 +126,7 @@
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/t;-><init>(I[CII)V
 
-    sput-object v0, Lorg/a/a/t;->cke:Lorg/a/a/t;
+    sput-object v0, Lorg/a/a/t;->cjy:Lorg/a/a/t;
 
     return-void
 .end method
@@ -136,26 +136,26 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lorg/a/a/t;->ciC:I
+    iput p1, p0, Lorg/a/a/t;->chW:I
 
-    iput-object p2, p0, Lorg/a/a/t;->ckf:[C
+    iput-object p2, p0, Lorg/a/a/t;->cjz:[C
 
-    iput p3, p0, Lorg/a/a/t;->chH:I
+    iput p3, p0, Lorg/a/a/t;->chb:I
 
-    iput p4, p0, Lorg/a/a/t;->chD:I
+    iput p4, p0, Lorg/a/a/t;->cgX:I
 
     return-void
 .end method
 
-.method private JL()I
+.method private JK()I
     .locals 3
 
     const/4 v0, 0x1
 
     :goto_0
-    iget-object v1, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v1, p0, Lorg/a/a/t;->cjz:[C
 
-    iget v2, p0, Lorg/a/a/t;->chH:I
+    iget v2, p0, Lorg/a/a/t;->chb:I
 
     add-int/2addr v2, v0
 
@@ -173,14 +173,14 @@
     return v0
 .end method
 
-.method private JM()Lorg/a/a/t;
+.method private JL()Lorg/a/a/t;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v0, p0, Lorg/a/a/t;->cjz:[C
 
-    iget v1, p0, Lorg/a/a/t;->chH:I
+    iget v1, p0, Lorg/a/a/t;->chb:I
 
-    invoke-direct {p0}, Lorg/a/a/t;->JL()I
+    invoke-direct {p0}, Lorg/a/a/t;->JK()I
 
     move-result v2
 
@@ -262,17 +262,17 @@
     return-object v1
 
     :sswitch_1
-    sget-object p0, Lorg/a/a/t;->cjX:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjr:Lorg/a/a/t;
 
     return-object p0
 
     :sswitch_2
-    sget-object p0, Lorg/a/a/t;->cjW:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjq:Lorg/a/a/t;
 
     return-object p0
 
     :sswitch_3
-    sget-object p0, Lorg/a/a/t;->cka:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cju:Lorg/a/a/t;
 
     return-object p0
 
@@ -304,32 +304,32 @@
     return-object v1
 
     :sswitch_5
-    sget-object p0, Lorg/a/a/t;->ckd:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjx:Lorg/a/a/t;
 
     return-object p0
 
     :sswitch_6
-    sget-object p0, Lorg/a/a/t;->ckb:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjv:Lorg/a/a/t;
 
     return-object p0
 
     :sswitch_7
-    sget-object p0, Lorg/a/a/t;->ckc:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjw:Lorg/a/a/t;
 
     return-object p0
 
     :sswitch_8
-    sget-object p0, Lorg/a/a/t;->cke:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjy:Lorg/a/a/t;
 
     return-object p0
 
     :sswitch_9
-    sget-object p0, Lorg/a/a/t;->cjY:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjs:Lorg/a/a/t;
 
     return-object p0
 
     :sswitch_a
-    sget-object p0, Lorg/a/a/t;->cjZ:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjt:Lorg/a/a/t;
 
     return-object p0
 
@@ -354,11 +354,11 @@
 .method private a(Ljava/lang/StringBuffer;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v0, p0, Lorg/a/a/t;->cjz:[C
 
     if-nez v0, :cond_0
 
-    iget v0, p0, Lorg/a/a/t;->chH:I
+    iget v0, p0, Lorg/a/a/t;->chb:I
 
     const/high16 v1, -0x1000000
 
@@ -373,21 +373,21 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lorg/a/a/t;->ciC:I
+    iget v1, p0, Lorg/a/a/t;->chW:I
 
-    const/16 v1, 0xa
+    const/16 v2, 0xa
 
-    if-ne v0, v1, :cond_1
+    if-ne v1, v2, :cond_1
 
     const/16 v0, 0x4c
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    iget-object v0, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v0, p0, Lorg/a/a/t;->cjz:[C
 
-    iget v1, p0, Lorg/a/a/t;->chH:I
+    iget v1, p0, Lorg/a/a/t;->chb:I
 
-    iget v2, p0, Lorg/a/a/t;->chD:I
+    iget v2, p0, Lorg/a/a/t;->cgX:I
 
     invoke-virtual {p1, v0, v1, v2}, Ljava/lang/StringBuffer;->append([CII)Ljava/lang/StringBuffer;
 
@@ -398,11 +398,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/t;->ckf:[C
+    iget v1, p0, Lorg/a/a/t;->chb:I
 
-    iget v1, p0, Lorg/a/a/t;->chH:I
-
-    iget v2, p0, Lorg/a/a/t;->chD:I
+    iget v2, p0, Lorg/a/a/t;->cgX:I
 
     invoke-virtual {p1, v0, v1, v2}, Ljava/lang/StringBuffer;->append([CII)Ljava/lang/StringBuffer;
 
@@ -571,7 +569,7 @@
 
     if-ne p0, v0, :cond_0
 
-    sget-object p0, Lorg/a/a/t;->ckb:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjv:Lorg/a/a/t;
 
     return-object p0
 
@@ -580,7 +578,7 @@
 
     if-ne p0, v0, :cond_1
 
-    sget-object p0, Lorg/a/a/t;->cjW:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjq:Lorg/a/a/t;
 
     return-object p0
 
@@ -589,7 +587,7 @@
 
     if-ne p0, v0, :cond_2
 
-    sget-object p0, Lorg/a/a/t;->cjX:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjr:Lorg/a/a/t;
 
     return-object p0
 
@@ -598,7 +596,7 @@
 
     if-ne p0, v0, :cond_3
 
-    sget-object p0, Lorg/a/a/t;->cjZ:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjt:Lorg/a/a/t;
 
     return-object p0
 
@@ -607,7 +605,7 @@
 
     if-ne p0, v0, :cond_4
 
-    sget-object p0, Lorg/a/a/t;->cjY:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjs:Lorg/a/a/t;
 
     return-object p0
 
@@ -616,7 +614,7 @@
 
     if-ne p0, v0, :cond_5
 
-    sget-object p0, Lorg/a/a/t;->cka:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cju:Lorg/a/a/t;
 
     return-object p0
 
@@ -625,7 +623,7 @@
 
     if-ne p0, v0, :cond_6
 
-    sget-object p0, Lorg/a/a/t;->cke:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjy:Lorg/a/a/t;
 
     return-object p0
 
@@ -634,12 +632,12 @@
 
     if-ne p0, v0, :cond_7
 
-    sget-object p0, Lorg/a/a/t;->ckc:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjw:Lorg/a/a/t;
 
     return-object p0
 
     :cond_7
-    sget-object p0, Lorg/a/a/t;->ckd:Lorg/a/a/t;
+    sget-object p0, Lorg/a/a/t;->cjx:Lorg/a/a/t;
 
     return-object p0
 
@@ -811,11 +809,11 @@
 
     aget-object v4, v2, v3
 
-    iget v4, v4, Lorg/a/a/t;->chD:I
+    iget v4, v4, Lorg/a/a/t;->cgX:I
 
     aget-object v6, v2, v3
 
-    iget v6, v6, Lorg/a/a/t;->ciC:I
+    iget v6, v6, Lorg/a/a/t;->chW:I
 
     const/16 v7, 0xa
 
@@ -973,16 +971,16 @@
 
 
 # virtual methods
-.method public final JN()Ljava/lang/String;
+.method public final JM()Ljava/lang/String;
     .locals 4
 
     new-instance v0, Ljava/lang/String;
 
-    iget-object v1, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v1, p0, Lorg/a/a/t;->cjz:[C
 
-    iget v2, p0, Lorg/a/a/t;->chH:I
+    iget v2, p0, Lorg/a/a/t;->chb:I
 
-    iget v3, p0, Lorg/a/a/t;->chD:I
+    iget v3, p0, Lorg/a/a/t;->cgX:I
 
     invoke-direct {v0, v1, v2, v3}, Ljava/lang/String;-><init>([CII)V
 
@@ -1010,58 +1008,54 @@
     :cond_1
     check-cast p1, Lorg/a/a/t;
 
-    iget v1, p0, Lorg/a/a/t;->ciC:I
+    iget v1, p0, Lorg/a/a/t;->chW:I
 
-    iget v3, p1, Lorg/a/a/t;->ciC:I
+    iget v3, p1, Lorg/a/a/t;->chW:I
 
     if-eq v1, v3, :cond_2
 
     return v2
 
     :cond_2
-    iget v1, p0, Lorg/a/a/t;->ciC:I
-
     const/16 v3, 0x9
 
     if-lt v1, v3, :cond_5
 
-    iget v1, p0, Lorg/a/a/t;->chD:I
+    iget v1, p0, Lorg/a/a/t;->cgX:I
 
-    iget v3, p1, Lorg/a/a/t;->chD:I
+    iget v3, p1, Lorg/a/a/t;->cgX:I
 
     if-eq v1, v3, :cond_3
 
     return v2
 
     :cond_3
-    iget v1, p0, Lorg/a/a/t;->chH:I
+    iget v3, p0, Lorg/a/a/t;->chb:I
 
-    iget v3, p1, Lorg/a/a/t;->chH:I
+    iget v4, p1, Lorg/a/a/t;->chb:I
 
-    iget v4, p0, Lorg/a/a/t;->chD:I
-
-    add-int/2addr v4, v1
+    add-int/2addr v1, v3
 
     :goto_0
-    if-ge v1, v4, :cond_5
+    if-ge v3, v1, :cond_5
 
-    iget-object v5, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v5, p0, Lorg/a/a/t;->cjz:[C
 
-    aget-char v5, v5, v1
+    aget-char v5, v5, v3
 
-    iget-object v6, p1, Lorg/a/a/t;->ckf:[C
+    iget-object v6, p1, Lorg/a/a/t;->cjz:[C
 
-    aget-char v6, v6, v3
+    aget-char v6, v6, v4
 
     if-eq v5, v6, :cond_4
 
     return v2
 
     :cond_4
-    add-int/lit8 v1, v1, 0x1
-
     add-int/lit8 v3, v3, 0x1
 
+    add-int/lit8 v4, v4, 0x1
+
     goto :goto_0
 
     :cond_5
@@ -1071,7 +1065,7 @@
 .method public final getClassName()Ljava/lang/String;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/t;->ciC:I
+    iget v0, p0, Lorg/a/a/t;->chW:I
 
     packed-switch v0, :pswitch_data_0
 
@@ -1082,11 +1076,11 @@
     :pswitch_0
     new-instance v0, Ljava/lang/String;
 
-    iget-object v1, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v1, p0, Lorg/a/a/t;->cjz:[C
 
-    iget v2, p0, Lorg/a/a/t;->chH:I
+    iget v2, p0, Lorg/a/a/t;->chb:I
 
-    iget v3, p0, Lorg/a/a/t;->chD:I
+    iget v3, p0, Lorg/a/a/t;->cgX:I
 
     invoke-direct {v0, v1, v2, v3}, Ljava/lang/String;-><init>([CII)V
 
@@ -1103,7 +1097,7 @@
     :pswitch_1
     new-instance v0, Ljava/lang/StringBuffer;
 
-    invoke-direct {p0}, Lorg/a/a/t;->JM()Lorg/a/a/t;
+    invoke-direct {p0}, Lorg/a/a/t;->JL()Lorg/a/a/t;
 
     move-result-object v1
 
@@ -1113,7 +1107,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuffer;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lorg/a/a/t;->JL()I
+    invoke-direct {p0}, Lorg/a/a/t;->JK()I
 
     move-result v1
 
@@ -1215,39 +1209,37 @@
 .method public final hashCode()I
     .locals 4
 
-    iget v0, p0, Lorg/a/a/t;->ciC:I
+    iget v0, p0, Lorg/a/a/t;->chW:I
 
-    mul-int/lit8 v0, v0, 0xd
-
-    iget v1, p0, Lorg/a/a/t;->ciC:I
+    mul-int/lit8 v1, v0, 0xd
 
     const/16 v2, 0x9
 
-    if-lt v1, v2, :cond_0
+    if-lt v0, v2, :cond_0
 
-    iget v1, p0, Lorg/a/a/t;->chH:I
+    iget v0, p0, Lorg/a/a/t;->chb:I
 
-    iget v2, p0, Lorg/a/a/t;->chD:I
+    iget v2, p0, Lorg/a/a/t;->cgX:I
 
-    add-int/2addr v2, v1
+    add-int/2addr v2, v0
 
     :goto_0
-    if-ge v1, v2, :cond_0
+    if-ge v0, v2, :cond_0
 
-    iget-object v3, p0, Lorg/a/a/t;->ckf:[C
+    iget-object v3, p0, Lorg/a/a/t;->cjz:[C
 
-    aget-char v3, v3, v1
+    aget-char v3, v3, v0
 
-    add-int/2addr v0, v3
+    add-int/2addr v1, v3
 
-    mul-int/lit8 v0, v0, 0x11
+    mul-int/lit8 v1, v1, 0x11
 
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    return v0
+    return v1
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali_classes2/org/a/a/u.smali b/com.discord/smali_classes2/org/a/a/u.smali
index 168d33b2de..230343cf1a 100644
--- a/com.discord/smali_classes2/org/a/a/u.smali
+++ b/com.discord/smali_classes2/org/a/a/u.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field chA:[B
+.field cgL:I
 
-.field chr:I
+.field cgU:[B
 
 
 # direct methods
@@ -14,9 +14,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/u;->chA:[B
+    iput-object p1, p0, Lorg/a/a/u;->cgU:[B
 
-    iput p2, p0, Lorg/a/a/u;->chr:I
+    iput p2, p0, Lorg/a/a/u;->cgL:I
 
     return-void
 .end method
@@ -24,11 +24,11 @@
 
 # virtual methods
 .method public final toString()Ljava/lang/String;
-    .locals 6
+    .locals 7
 
-    iget-object v0, p0, Lorg/a/a/u;->chA:[B
+    iget-object v0, p0, Lorg/a/a/u;->cgU:[B
 
-    iget v1, p0, Lorg/a/a/u;->chr:I
+    iget v1, p0, Lorg/a/a/u;->cgL:I
 
     aget-byte v0, v0, v1
 
@@ -43,32 +43,28 @@
     :goto_0
     if-ge v2, v0, :cond_0
 
-    iget-object v3, p0, Lorg/a/a/u;->chA:[B
+    iget-object v3, p0, Lorg/a/a/u;->cgU:[B
 
-    iget v4, p0, Lorg/a/a/u;->chr:I
+    iget v4, p0, Lorg/a/a/u;->cgL:I
 
     mul-int/lit8 v5, v2, 0x2
 
-    add-int/2addr v4, v5
+    add-int v6, v4, v5
 
-    add-int/lit8 v4, v4, 0x1
+    add-int/lit8 v6, v6, 0x1
 
-    aget-byte v3, v3, v4
+    aget-byte v6, v3, v6
 
-    packed-switch v3, :pswitch_data_0
+    packed-switch v6, :pswitch_data_0
 
     const/16 v3, 0x5f
 
     :goto_1
     invoke-virtual {v1, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
 
-    goto :goto_2
+    goto :goto_3
 
     :pswitch_0
-    iget-object v3, p0, Lorg/a/a/u;->chA:[B
-
-    iget v4, p0, Lorg/a/a/u;->chr:I
-
     add-int/2addr v4, v5
 
     add-int/lit8 v4, v4, 0x2
@@ -84,19 +80,20 @@
     :pswitch_1
     const/16 v3, 0x2a
 
-    goto :goto_1
+    goto :goto_2
 
     :pswitch_2
     const/16 v3, 0x2e
 
-    goto :goto_1
+    goto :goto_2
 
     :pswitch_3
     const/16 v3, 0x5b
 
-    goto :goto_1
-
     :goto_2
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuffer;->append(C)Ljava/lang/StringBuffer;
+
+    :goto_3
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
@@ -108,6 +105,8 @@
 
     return-object v0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_3
diff --git a/com.discord/smali_classes2/org/b/a.smali b/com.discord/smali_classes2/org/b/a.smali
index d58069ec49..dfe041c6a1 100644
--- a/com.discord/smali_classes2/org/b/a.smali
+++ b/com.discord/smali_classes2/org/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a;
 .super Ljava/lang/RuntimeException;
+.source "ObjenesisException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/org/b/a/a.smali b/com.discord/smali_classes2/org/b/a/a.smali
index f79781cb93..8007819213 100644
--- a/com.discord/smali_classes2/org/b/a/a.smali
+++ b/com.discord/smali_classes2/org/b/a/a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/b/a/a;
 .super Ljava/lang/Object;
+.source "ObjectInstantiator.java"
 
 
 # annotations
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 999cfaea0f..8121478f0e 100644
--- a/com.discord/smali_classes2/org/b/a/a/a.smali
+++ b/com.discord/smali_classes2/org/b/a/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/a/a;
 .super Ljava/lang/Object;
+.source "Android10Instantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field private final ckg:Ljava/lang/reflect/Method;
+.field private final cjA:Ljava/lang/reflect/Method;
 
 .field private final type:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
@@ -46,16 +47,16 @@
 
     iput-object p1, p0, Lorg/b/a/a/a;->type:Ljava/lang/Class;
 
-    invoke-static {}, Lorg/b/a/a/a;->JO()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/a;->JN()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/a;->ckg:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/a;->cjA:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method private static JO()Ljava/lang/reflect/Method;
+.method private static JN()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -122,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;->ckg:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/a;->cjA: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 94c87a53da..4e1430ab78 100644
--- a/com.discord/smali_classes2/org/b/a/a/b.smali
+++ b/com.discord/smali_classes2/org/b/a/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/a/b;
 .super Ljava/lang/Object;
+.source "Android17Instantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -19,9 +20,9 @@
 
 
 # instance fields
-.field private final ckh:Ljava/lang/reflect/Method;
+.field private final cjB:Ljava/lang/reflect/Method;
 
-.field private final cki:Ljava/lang/Integer;
+.field private final cjC:Ljava/lang/Integer;
 
 .field private final type:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
@@ -48,22 +49,22 @@
 
     iput-object p1, p0, Lorg/b/a/a/b;->type:Ljava/lang/Class;
 
-    invoke-static {}, Lorg/b/a/a/b;->JP()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/b;->JO()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->ckh:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/b;->cjB:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/b;->JQ()Ljava/lang/Integer;
+    invoke-static {}, Lorg/b/a/a/b;->JP()Ljava/lang/Integer;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->cki:Ljava/lang/Integer;
+    iput-object p1, p0, Lorg/b/a/a/b;->cjC:Ljava/lang/Integer;
 
     return-void
 .end method
 
-.method private static JP()Ljava/lang/reflect/Method;
+.method private static JO()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -117,7 +118,7 @@
     throw v1
 .end method
 
-.method private static JQ()Ljava/lang/Integer;
+.method private static JP()Ljava/lang/Integer;
     .locals 6
 
     :try_start_0
@@ -212,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;->ckh:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/b;->cjB:Ljava/lang/reflect/Method;
 
     const/4 v2, 0x0
 
@@ -228,7 +229,7 @@
 
     const/4 v4, 0x1
 
-    iget-object v5, p0, Lorg/b/a/a/b;->cki:Ljava/lang/Integer;
+    iget-object v5, p0, Lorg/b/a/a/b;->cjC: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 6fdcd05111..7235339099 100644
--- a/com.discord/smali_classes2/org/b/a/a/c.smali
+++ b/com.discord/smali_classes2/org/b/a/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/a/c;
 .super Ljava/lang/Object;
+.source "Android18Instantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -19,9 +20,9 @@
 
 
 # instance fields
-.field private final ckh:Ljava/lang/reflect/Method;
+.field private final cjB:Ljava/lang/reflect/Method;
 
-.field private final ckj:Ljava/lang/Long;
+.field private final cjD:Ljava/lang/Long;
 
 .field private final type:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
@@ -48,22 +49,22 @@
 
     iput-object p1, p0, Lorg/b/a/a/c;->type:Ljava/lang/Class;
 
-    invoke-static {}, Lorg/b/a/a/c;->JP()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/c;->JO()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->ckh:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/c;->cjB:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/c;->JR()Ljava/lang/Long;
+    invoke-static {}, Lorg/b/a/a/c;->JQ()Ljava/lang/Long;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->ckj:Ljava/lang/Long;
+    iput-object p1, p0, Lorg/b/a/a/c;->cjD:Ljava/lang/Long;
 
     return-void
 .end method
 
-.method private static JP()Ljava/lang/reflect/Method;
+.method private static JO()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -117,7 +118,7 @@
     throw v1
 .end method
 
-.method private static JR()Ljava/lang/Long;
+.method private static JQ()Ljava/lang/Long;
     .locals 6
 
     :try_start_0
@@ -212,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;->ckh:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/c;->cjB:Ljava/lang/reflect/Method;
 
     const/4 v2, 0x0
 
@@ -228,7 +229,7 @@
 
     const/4 v4, 0x1
 
-    iget-object v5, p0, Lorg/b/a/a/c;->ckj:Ljava/lang/Long;
+    iget-object v5, p0, Lorg/b/a/a/c;->cjD: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 6d906f54e1..f89b8f7beb 100644
--- a/com.discord/smali_classes2/org/b/a/b/a.smali
+++ b/com.discord/smali_classes2/org/b/a/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/b/a;
 .super Lorg/b/a/b/b;
+.source "AccessibleInstantiator.java"
 
 
 # annotations
@@ -27,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;->ckk:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->cjE:Ljava/lang/reflect/Constructor;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lorg/b/a/b/a;->ckk:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->cjE: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 98adefc48e..ee09296e73 100644
--- a/com.discord/smali_classes2/org/b/a/b/b.smali
+++ b/com.discord/smali_classes2/org/b/a/b/b.smali
@@ -1,5 +1,6 @@
 .class public Lorg/b/a/b/b;
 .super Ljava/lang/Object;
+.source "ConstructorInstantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field protected ckk:Ljava/lang/reflect/Constructor;
+.field protected cjE:Ljava/lang/reflect/Constructor;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/reflect/Constructor<",
@@ -49,7 +50,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/b/b;->ckk:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/b/b;->cjE:Ljava/lang/reflect/Constructor;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -76,7 +77,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/b/b;->ckk:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/b/b;->cjE: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 d249331ae4..c7e1f318fa 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
@@ -1,5 +1,6 @@
 .class final Lorg/b/a/b/c$a;
 .super Ljava/io/InputStream;
+.source "ObjectInputStreamInstantiator.java"
 
 
 # annotations
@@ -14,21 +15,21 @@
 
 
 # static fields
-.field private static final cko:[I
+.field private static final cjI:[I
 
-.field private static ckr:[B
+.field private static cjL:[B
 
-.field private static cks:[B
+.field private static cjM:[B
 
 
 # instance fields
-.field private ckm:I
+.field private cjG:I
 
-.field private ckn:I
+.field private cjH:I
 
-.field private ckp:[[B
+.field private cjJ:[[B
 
-.field private final ckq:[B
+.field private final cjK:[B
 
 .field private data:[B
 
@@ -43,7 +44,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/b/a/b/c$a;->cko:[I
+    sput-object v0, Lorg/b/a/b/c$a;->cjI:[I
 
     :try_start_0
     new-instance v0, Ljava/io/ByteArrayOutputStream;
@@ -66,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/a/b/c$a;->ckr:[B
+    sput-object v0, Lorg/b/a/b/c$a;->cjL:[B
 
     new-instance v0, Ljava/io/ByteArrayOutputStream;
 
@@ -92,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/a/b/c$a;->cks:[B
+    sput-object v0, Lorg/b/a/b/c$a;->cjM:[B
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -145,11 +146,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lorg/b/a/b/c$a;->ckm:I
+    iput v0, p0, Lorg/b/a/b/c$a;->cjG:I
 
-    iput v0, p0, Lorg/b/a/b/c$a;->ckn:I
+    iput v0, p0, Lorg/b/a/b/c$a;->cjH:I
 
-    sget-object v1, Lorg/b/a/b/c$a;->ckr:[B
+    sget-object v1, Lorg/b/a/b/c$a;->cjL:[B
 
     iput-object v1, p0, Lorg/b/a/b/c$a;->data:[B
 
@@ -206,27 +207,27 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lorg/b/a/b/c$a;->ckq:[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->cjK:[B
 
     const/4 v1, 0x3
 
     new-array v1, v1, [[B
 
-    sget-object v2, Lorg/b/a/b/c$a;->ckr:[B
+    sget-object v2, Lorg/b/a/b/c$a;->cjL:[B
 
     aput-object v2, v1, v0
 
     const/4 v0, 0x1
 
-    iget-object v2, p0, Lorg/b/a/b/c$a;->ckq:[B
+    iget-object v2, p0, Lorg/b/a/b/c$a;->cjK:[B
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lorg/b/a/b/c$a;->cks:[B
+    sget-object v0, Lorg/b/a/b/c$a;->cjM:[B
 
     aput-object v0, v1, p1
 
-    iput-object v1, p0, Lorg/b/a/b/c$a;->ckp:[[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->cjJ:[[B
 
     return-void
 
@@ -256,24 +257,24 @@
     throw v0
 .end method
 
-.method private JS()V
+.method private JR()V
     .locals 2
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lorg/b/a/b/c$a;->ckm:I
+    iput v0, p0, Lorg/b/a/b/c$a;->cjG:I
 
-    sget-object v0, Lorg/b/a/b/c$a;->cko:[I
+    sget-object v0, Lorg/b/a/b/c$a;->cjI:[I
 
-    iget v1, p0, Lorg/b/a/b/c$a;->ckn:I
+    iget v1, p0, Lorg/b/a/b/c$a;->cjH:I
 
     aget v0, v0, v1
 
-    iput v0, p0, Lorg/b/a/b/c$a;->ckn:I
+    iput v0, p0, Lorg/b/a/b/c$a;->cjH:I
 
-    iget-object v0, p0, Lorg/b/a/b/c$a;->ckp:[[B
+    iget-object v0, p0, Lorg/b/a/b/c$a;->cjJ:[[B
 
-    iget v1, p0, Lorg/b/a/b/c$a;->ckn:I
+    iget v1, p0, Lorg/b/a/b/c$a;->cjH:I
 
     aget-object v0, v0, v1
 
@@ -307,26 +308,24 @@
 
     iget-object v0, p0, Lorg/b/a/b/c$a;->data:[B
 
-    iget v1, p0, Lorg/b/a/b/c$a;->ckm:I
+    iget v1, p0, Lorg/b/a/b/c$a;->cjG:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/b/a/b/c$a;->ckm:I
+    iput v2, p0, Lorg/b/a/b/c$a;->cjG:I
 
-    aget-byte v0, v0, v1
+    aget-byte v1, v0, v1
 
-    iget v1, p0, Lorg/b/a/b/c$a;->ckm:I
+    iget v2, p0, Lorg/b/a/b/c$a;->cjG:I
 
-    iget-object v2, p0, Lorg/b/a/b/c$a;->data:[B
+    array-length v0, v0
 
-    array-length v2, v2
+    if-lt v2, v0, :cond_0
 
-    if-lt v1, v2, :cond_0
-
-    invoke-direct {p0}, Lorg/b/a/b/c$a;->JS()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->JR()V
 
     :cond_0
-    return v0
+    return v1
 .end method
 
 .method public final read([BII)I
@@ -341,7 +340,7 @@
 
     array-length v0, v0
 
-    iget v1, p0, Lorg/b/a/b/c$a;->ckm:I
+    iget v1, p0, Lorg/b/a/b/c$a;->cjG:I
 
     sub-int/2addr v0, v1
 
@@ -354,7 +353,7 @@
 
     iget-object v2, p0, Lorg/b/a/b/c$a;->data:[B
 
-    iget v3, p0, Lorg/b/a/b/c$a;->ckm:I
+    iget v3, p0, Lorg/b/a/b/c$a;->cjG:I
 
     invoke-static {v2, v3, p1, v1, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -362,13 +361,13 @@
 
     sub-int/2addr p2, v0
 
-    invoke-direct {p0}, Lorg/b/a/b/c$a;->JS()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->JR()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;->ckm:I
+    iget v2, p0, Lorg/b/a/b/c$a;->cjG:I
 
     sub-int/2addr v0, v2
 
@@ -379,15 +378,15 @@
 
     iget-object v0, p0, Lorg/b/a/b/c$a;->data:[B
 
-    iget v2, p0, Lorg/b/a/b/c$a;->ckm:I
+    iget v2, p0, Lorg/b/a/b/c$a;->cjG: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;->ckm:I
+    iget p1, p0, Lorg/b/a/b/c$a;->cjG:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/b/a/b/c$a;->ckm:I
+    iput p1, p0, Lorg/b/a/b/c$a;->cjG: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 8428057e76..13c463aa6a 100644
--- a/com.discord/smali_classes2/org/b/a/b/c.smali
+++ b/com.discord/smali_classes2/org/b/a/b/c.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/b/c;
 .super Ljava/lang/Object;
+.source "ObjectInputStreamInstantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field private ckl:Ljava/io/ObjectInputStream;
+.field private cjF:Ljava/io/ObjectInputStream;
 
 
 # direct methods
@@ -58,7 +59,7 @@
 
     invoke-direct {v0, v1}, Ljava/io/ObjectInputStream;-><init>(Ljava/io/InputStream;)V
 
-    iput-object v0, p0, Lorg/b/a/b/c;->ckl:Ljava/io/ObjectInputStream;
+    iput-object v0, p0, Lorg/b/a/b/c;->cjF:Ljava/io/ObjectInputStream;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -126,7 +127,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/b/c;->ckl:Ljava/io/ObjectInputStream;
+    iget-object v0, p0, Lorg/b/a/b/c;->cjF: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 c4b4c708bf..d2f95ae0cc 100644
--- a/com.discord/smali_classes2/org/b/a/c/a.smali
+++ b/com.discord/smali_classes2/org/b/a/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/c/a;
 .super Lorg/b/a/c/b;
+.source "GCJInstantiator.java"
 
 
 # annotations
@@ -43,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;->ckt:Ljava/lang/reflect/Method;
+    sget-object v1, Lorg/b/a/c/a;->cjN:Ljava/lang/reflect/Method;
 
-    sget-object v2, Lorg/b/a/c/a;->cku:Ljava/io/ObjectInputStream;
+    sget-object v2, Lorg/b/a/c/a;->cjO:Ljava/io/ObjectInputStream;
 
     const/4 v3, 0x2
 
diff --git a/com.discord/smali_classes2/org/b/a/c/b$a.smali b/com.discord/smali_classes2/org/b/a/c/b$a.smali
index e3734d4b88..3c4890f09a 100644
--- a/com.discord/smali_classes2/org/b/a/c/b$a.smali
+++ b/com.discord/smali_classes2/org/b/a/c/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lorg/b/a/c/b$a;
 .super Ljava/io/ObjectInputStream;
+.source "GCJInstantiatorBase.java"
 
 
 # annotations
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 435b8b68b8..57e33ad0fc 100644
--- a/com.discord/smali_classes2/org/b/a/c/b.smali
+++ b/com.discord/smali_classes2/org/b/a/c/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lorg/b/a/c/b;
 .super Ljava/lang/Object;
+.source "GCJInstantiatorBase.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -25,9 +26,9 @@
 
 
 # static fields
-.field static ckt:Ljava/lang/reflect/Method;
+.field static cjN:Ljava/lang/reflect/Method;
 
-.field static cku:Ljava/io/ObjectInputStream;
+.field static cjO:Ljava/io/ObjectInputStream;
 
 
 # instance fields
@@ -62,7 +63,7 @@
 
     iput-object p1, p0, Lorg/b/a/c/b;->type:Ljava/lang/Class;
 
-    sget-object p1, Lorg/b/a/c/b;->ckt:Ljava/lang/reflect/Method;
+    sget-object p1, Lorg/b/a/c/b;->cjN:Ljava/lang/reflect/Method;
 
     if-nez p1, :cond_0
 
@@ -91,7 +92,7 @@
 
     move-result-object p1
 
-    sput-object p1, Lorg/b/a/c/b;->ckt:Ljava/lang/reflect/Method;
+    sput-object p1, Lorg/b/a/c/b;->cjN:Ljava/lang/reflect/Method;
 
     invoke-virtual {p1, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V
 
@@ -99,7 +100,7 @@
 
     invoke-direct {p1}, Lorg/b/a/c/b$a;-><init>()V
 
-    sput-object p1, Lorg/b/a/c/b;->cku:Ljava/io/ObjectInputStream;
+    sput-object p1, Lorg/b/a/c/b;->cjO: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 fbc13c93f3..26a2770cda 100644
--- a/com.discord/smali_classes2/org/b/a/d/a.smali
+++ b/com.discord/smali_classes2/org/b/a/d/a.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/d/a;
 .super Ljava/lang/Object;
+.source "PercInstantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -19,9 +20,9 @@
 
 
 # instance fields
-.field private final ckh:Ljava/lang/reflect/Method;
+.field private final cjB:Ljava/lang/reflect/Method;
 
-.field private final ckv:[Ljava/lang/Object;
+.field private final cjP:[Ljava/lang/Object;
 
 
 # direct methods
@@ -53,9 +54,9 @@
 
     aput-object v3, v1, v4
 
-    iput-object v1, p0, Lorg/b/a/d/a;->ckv:[Ljava/lang/Object;
+    iput-object v1, p0, Lorg/b/a/d/a;->cjP:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lorg/b/a/d/a;->ckv:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/b/a/d/a;->cjP:[Ljava/lang/Object;
 
     aput-object p1, v1, v2
 
@@ -78,9 +79,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/d/a;->ckh:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/d/a;->cjB:Ljava/lang/reflect/Method;
 
-    iget-object p1, p0, Lorg/b/a/d/a;->ckh:Ljava/lang/reflect/Method;
+    iget-object p1, p0, Lorg/b/a/d/a;->cjB:Ljava/lang/reflect/Method;
 
     invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
     :try_end_0
@@ -119,11 +120,11 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/d/a;->ckh:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lorg/b/a/d/a;->cjB:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Lorg/b/a/d/a;->ckv:[Ljava/lang/Object;
+    iget-object v2, p0, Lorg/b/a/d/a;->cjP:[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 476920a9f7..7f48fa5162 100644
--- a/com.discord/smali_classes2/org/b/a/e/a.smali
+++ b/com.discord/smali_classes2/org/b/a/e/a.smali
@@ -1,9 +1,10 @@
 .class final Lorg/b/a/e/a;
 .super Ljava/lang/Object;
+.source "SunReflectionFactoryHelper.java"
 
 
 # direct methods
-.method private static JT()Ljava/lang/Class;
+.method private static JS()Ljava/lang/Class;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -50,7 +51,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lorg/b/a/e/a;->JT()Ljava/lang/Class;
+    invoke-static {}, Lorg/b/a/e/a;->JS()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 fa79e0985f..b361303cb0 100644
--- a/com.discord/smali_classes2/org/b/a/e/b.smali
+++ b/com.discord/smali_classes2/org/b/a/e/b.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/e/b;
 .super Ljava/lang/Object;
+.source "SunReflectionFactoryInstantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field private final ckw:Ljava/lang/reflect/Constructor;
+.field private final cjQ:Ljava/lang/reflect/Constructor;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/reflect/Constructor<",
@@ -42,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lorg/b/a/e/b;->JU()Ljava/lang/reflect/Constructor;
+    invoke-static {}, Lorg/b/a/e/b;->JT()Ljava/lang/reflect/Constructor;
 
     move-result-object v0
 
@@ -50,9 +51,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/e/b;->ckw:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/e/b;->cjQ:Ljava/lang/reflect/Constructor;
 
-    iget-object p1, p0, Lorg/b/a/e/b;->ckw:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/e/b;->cjQ:Ljava/lang/reflect/Constructor;
 
     const/4 v0, 0x1
 
@@ -61,7 +62,7 @@
     return-void
 .end method
 
-.method private static JU()Ljava/lang/reflect/Constructor;
+.method private static JT()Ljava/lang/reflect/Constructor;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -106,7 +107,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/e/b;->ckw:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/e/b;->cjQ: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 c94e015f13..0fbefa9833 100644
--- a/com.discord/smali_classes2/org/b/a/e/c.smali
+++ b/com.discord/smali_classes2/org/b/a/e/c.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/a/e/c;
 .super Ljava/lang/Object;
+.source "UnsafeFactoryInstantiator.java"
 
 # interfaces
 .implements Lorg/b/a/a;
@@ -19,7 +20,7 @@
 
 
 # static fields
-.field private static ckx:Lsun/misc/Unsafe;
+.field private static cjR:Lsun/misc/Unsafe;
 
 
 # instance fields
@@ -46,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lorg/b/a/e/c;->ckx:Lsun/misc/Unsafe;
+    sget-object v0, Lorg/b/a/e/c;->cjR:Lsun/misc/Unsafe;
 
     if-nez v0, :cond_0
 
@@ -74,7 +75,7 @@
 
     check-cast v0, Lsun/misc/Unsafe;
 
-    sput-object v0, Lorg/b/a/e/c;->ckx:Lsun/misc/Unsafe;
+    sput-object v0, Lorg/b/a/e/c;->cjR:Lsun/misc/Unsafe;
     :try_end_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -118,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;->ckx:Lsun/misc/Unsafe;
+    sget-object v1, Lorg/b/a/e/c;->cjR: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/a.smali b/com.discord/smali_classes2/org/b/b/a.smali
index f75aed4e0b..44f085a766 100644
--- a/com.discord/smali_classes2/org/b/b/a.smali
+++ b/com.discord/smali_classes2/org/b/b/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lorg/b/b/a;
 .super Ljava/lang/Object;
+.source "BaseInstantiatorStrategy.java"
 
 # interfaces
 .implements Lorg/b/b/b;
diff --git a/com.discord/smali_classes2/org/b/b/b.smali b/com.discord/smali_classes2/org/b/b/b.smali
index e1dd8f52f4..9a240914cc 100644
--- a/com.discord/smali_classes2/org/b/b/b.smali
+++ b/com.discord/smali_classes2/org/b/b/b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/b/b/b;
 .super Ljava/lang/Object;
+.source "InstantiatorStrategy.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/b/b/c.smali b/com.discord/smali_classes2/org/b/b/c.smali
index 1d5fb53dac..aa1f470434 100644
--- a/com.discord/smali_classes2/org/b/b/c.smali
+++ b/com.discord/smali_classes2/org/b/b/c.smali
@@ -1,25 +1,26 @@
 .class public final Lorg/b/b/c;
 .super Ljava/lang/Object;
+.source "PlatformDescription.java"
 
 
 # static fields
-.field public static final ckA:Ljava/lang/String;
+.field public static final cjS:Ljava/lang/String;
 
-.field public static final ckB:Ljava/lang/String;
+.field public static final cjT:Ljava/lang/String;
 
-.field public static final ckC:Ljava/lang/String;
+.field public static final cjU:Ljava/lang/String;
 
-.field public static final ckD:Ljava/lang/String;
+.field public static final cjV:Ljava/lang/String;
 
-.field public static final ckE:I
+.field public static final cjW:Ljava/lang/String;
 
-.field public static final ckF:Z
+.field public static final cjX:Ljava/lang/String;
 
-.field public static final ckG:Ljava/lang/String;
+.field public static final cjY:I
 
-.field public static final cky:Ljava/lang/String;
+.field public static final cjZ:Z
 
-.field public static final ckz:Ljava/lang/String;
+.field public static final cka:Ljava/lang/String;
 
 
 # direct methods
@@ -32,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->cky:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->cjS:Ljava/lang/String;
 
     const-string v0, "java.runtime.version"
 
@@ -40,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->ckz:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->cjT:Ljava/lang/String;
 
     const-string v0, "java.vm.info"
 
@@ -48,7 +49,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->ckA:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->cjU:Ljava/lang/String;
 
     const-string v0, "java.vm.version"
 
@@ -56,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->ckB:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->cjV:Ljava/lang/String;
 
     const-string v0, "java.vm.vendor"
 
@@ -64,7 +65,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->ckC:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->cjW:Ljava/lang/String;
 
     const-string v0, "java.vm.name"
 
@@ -72,15 +73,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->ckD:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->cjX:Ljava/lang/String;
 
-    invoke-static {}, Lorg/b/b/c;->JX()I
+    invoke-static {}, Lorg/b/b/c;->JW()I
 
     move-result v0
 
-    sput v0, Lorg/b/b/c;->ckE:I
+    sput v0, Lorg/b/b/c;->cjY:I
 
-    invoke-static {}, Lorg/b/b/c;->JX()I
+    invoke-static {}, Lorg/b/b/c;->JW()I
 
     move-result v0
 
@@ -114,7 +115,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lorg/b/b/c;->ckF:Z
+    sput-boolean v0, Lorg/b/b/c;->cjZ:Z
 
     const-string v0, "com.google.appengine.runtime.version"
 
@@ -122,23 +123,23 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->ckG:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->cka:Ljava/lang/String;
 
     return-void
 .end method
 
+.method public static JU()Z
+    .locals 1
+
+    sget-boolean v0, Lorg/b/b/c;->cjZ:Z
+
+    return v0
+.end method
+
 .method public static JV()Z
     .locals 1
 
-    sget-boolean v0, Lorg/b/b/c;->ckF:Z
-
-    return v0
-.end method
-
-.method public static JW()Z
-    .locals 1
-
-    sget-object v0, Lorg/b/b/c;->ckG:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->cka:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -152,12 +153,12 @@
     return v0
 .end method
 
-.method private static JX()I
+.method private static JW()I
     .locals 2
 
     const-string v0, "Dalvik"
 
-    sget-object v1, Lorg/b/b/c;->ckD:Ljava/lang/String;
+    sget-object v1, Lorg/b/b/c;->cjX:Ljava/lang/String;
 
     invoke-virtual {v1, v0}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
@@ -170,14 +171,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lorg/b/b/c;->JY()I
+    invoke-static {}, Lorg/b/b/c;->JX()I
 
     move-result v0
 
     return v0
 .end method
 
-.method private static JY()I
+.method private static JX()I
     .locals 2
 
     :try_start_0
@@ -194,14 +195,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_1
     .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_1
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :try_start_2
-    invoke-virtual {v1, v0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -299,7 +300,7 @@
 .method public static fd(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lorg/b/b/c;->ckD:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->cjX: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 93259c43e2..95db52cee1 100644
--- a/com.discord/smali_classes2/org/b/b/d.smali
+++ b/com.discord/smali_classes2/org/b/b/d.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/b/b/d;
 .super Lorg/b/b/a;
+.source "StdInstantiatorStrategy.java"
 
 
 # direct methods
@@ -54,7 +55,7 @@
 
     if-eqz v0, :cond_4
 
-    invoke-static {}, Lorg/b/b/c;->JV()Z
+    invoke-static {}, Lorg/b/b/c;->JU()Z
 
     move-result v0
 
@@ -67,7 +68,7 @@
     return-object v0
 
     :cond_1
-    sget v0, Lorg/b/b/c;->ckE:I
+    sget v0, Lorg/b/b/c;->cjY:I
 
     const/16 v1, 0xa
 
@@ -80,7 +81,7 @@
     return-object v0
 
     :cond_2
-    sget v0, Lorg/b/b/c;->ckE:I
+    sget v0, Lorg/b/b/c;->cjY:I
 
     const/16 v1, 0x11
 
@@ -153,7 +154,7 @@
 
     :cond_8
     :goto_0
-    invoke-static {}, Lorg/b/b/c;->JW()Z
+    invoke-static {}, Lorg/b/b/c;->JV()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/org/webrtc/AndroidVideoTrackSourceObserver.smali b/com.discord/smali_classes2/org/webrtc/AndroidVideoTrackSourceObserver.smali
index 967dbddaf6..8b59144bb3 100644
--- a/com.discord/smali_classes2/org/webrtc/AndroidVideoTrackSourceObserver.smali
+++ b/com.discord/smali_classes2/org/webrtc/AndroidVideoTrackSourceObserver.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/AndroidVideoTrackSourceObserver;
 .super Ljava/lang/Object;
+.source "AndroidVideoTrackSourceObserver.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoCapturer$CapturerObserver;
diff --git a/com.discord/smali_classes2/org/webrtc/AudioProcessingFactory.smali b/com.discord/smali_classes2/org/webrtc/AudioProcessingFactory.smali
index 70312353b5..303f2958cc 100644
--- a/com.discord/smali_classes2/org/webrtc/AudioProcessingFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/AudioProcessingFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/AudioProcessingFactory;
 .super Ljava/lang/Object;
+.source "AudioProcessingFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/AudioSource.smali b/com.discord/smali_classes2/org/webrtc/AudioSource.smali
index 47ee9afe98..7c0981b172 100644
--- a/com.discord/smali_classes2/org/webrtc/AudioSource.smali
+++ b/com.discord/smali_classes2/org/webrtc/AudioSource.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/AudioSource;
 .super Lorg/webrtc/MediaSource;
+.source "AudioSource.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/AudioTrack.smali b/com.discord/smali_classes2/org/webrtc/AudioTrack.smali
index 1058f606cb..fda3850cc7 100644
--- a/com.discord/smali_classes2/org/webrtc/AudioTrack.smali
+++ b/com.discord/smali_classes2/org/webrtc/AudioTrack.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/AudioTrack;
 .super Lorg/webrtc/MediaStreamTrack;
+.source "AudioTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/BaseBitrateAdjuster.smali b/com.discord/smali_classes2/org/webrtc/BaseBitrateAdjuster.smali
index 4d71b4e296..63e7b69704 100644
--- a/com.discord/smali_classes2/org/webrtc/BaseBitrateAdjuster.smali
+++ b/com.discord/smali_classes2/org/webrtc/BaseBitrateAdjuster.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/BaseBitrateAdjuster;
 .super Ljava/lang/Object;
+.source "BaseBitrateAdjuster.java"
 
 # interfaces
 .implements Lorg/webrtc/BitrateAdjuster;
diff --git a/com.discord/smali_classes2/org/webrtc/BitrateAdjuster.smali b/com.discord/smali_classes2/org/webrtc/BitrateAdjuster.smali
index 89b1bc48e5..3dde28c03e 100644
--- a/com.discord/smali_classes2/org/webrtc/BitrateAdjuster.smali
+++ b/com.discord/smali_classes2/org/webrtc/BitrateAdjuster.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lorg/webrtc/BitrateAdjuster;
 .super Ljava/lang/Object;
+.source "BitrateAdjuster.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/CallSessionFileRotatingLogSink.smali b/com.discord/smali_classes2/org/webrtc/CallSessionFileRotatingLogSink.smali
index c56336674d..7122143b5d 100644
--- a/com.discord/smali_classes2/org/webrtc/CallSessionFileRotatingLogSink.smali
+++ b/com.discord/smali_classes2/org/webrtc/CallSessionFileRotatingLogSink.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/CallSessionFileRotatingLogSink;
 .super Ljava/lang/Object;
+.source "CallSessionFileRotatingLogSink.java"
 
 
 # annotations
@@ -63,8 +64,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lorg/webrtc/CallSessionFileRotatingLogSink;->nativeSink:J
-
     invoke-static {v0, v1}, Lorg/webrtc/CallSessionFileRotatingLogSink;->nativeDeleteSink(J)V
 
     iput-wide v2, p0, Lorg/webrtc/CallSessionFileRotatingLogSink;->nativeSink:J
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Capturer.smali b/com.discord/smali_classes2/org/webrtc/Camera1Capturer.smali
index 28b240e8aa..e1065d424d 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Capturer.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Capturer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Camera1Capturer;
 .super Lorg/webrtc/CameraCapturer;
+.source "Camera1Capturer.java"
 
 
 # instance fields
@@ -53,7 +54,7 @@
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     const/4 v4, 0x0
 
@@ -61,7 +62,7 @@
 
     :cond_1
     :goto_0
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     const/4 v4, 0x1
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Enumerator.smali b/com.discord/smali_classes2/org/webrtc/Camera1Enumerator.smali
index 249a2b8df3..7e7b51c80a 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Enumerator.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Enumerator.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Camera1Enumerator;
 .super Ljava/lang/Object;
+.source "Camera1Enumerator.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraEnumerator;
@@ -204,30 +205,26 @@
 
     invoke-static {p0}, Landroid/hardware/Camera;->open(I)Landroid/hardware/Camera;
 
+    move-result-object v2
+
+    invoke-virtual {v2}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
+
     move-result-object v3
     :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :try_start_1
-    invoke-virtual {v3}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
+    if-eqz v2, :cond_0
 
-    move-result-object v2
-    :try_end_1
-    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v3, :cond_0
-
-    invoke-virtual {v3}, Landroid/hardware/Camera;->release()V
+    invoke-virtual {v2}, Landroid/hardware/Camera;->release()V
 
     :cond_0
-    new-instance v3, Ljava/util/ArrayList;
+    new-instance v2, Ljava/util/ArrayList;
 
-    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    :try_start_2
-    invoke-virtual {v2}, Landroid/hardware/Camera$Parameters;->getSupportedPreviewFpsRange()Ljava/util/List;
+    :try_start_1
+    invoke-virtual {v3}, Landroid/hardware/Camera$Parameters;->getSupportedPreviewFpsRange()Ljava/util/List;
 
     move-result-object v4
 
@@ -259,22 +256,22 @@
     const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v2}, Landroid/hardware/Camera$Parameters;->getSupportedPreviewSizes()Ljava/util/List;
+    invoke-virtual {v3}, Landroid/hardware/Camera$Parameters;->getSupportedPreviewSizes()Ljava/util/List;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v2
+    move-result-object v3
 
     :goto_1
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v6
 
     if-eqz v6, :cond_2
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -288,14 +285,14 @@
 
     invoke-direct {v7, v8, v6, v5, v4}, Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;-><init>(IIII)V
 
-    invoke-interface {v3, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-    :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
+    invoke-interface {v2, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
 
     goto :goto_1
 
     :catch_0
-    move-exception v2
+    move-exception v3
 
     const-string v4, "Camera1Enumerator"
 
@@ -309,14 +306,14 @@
 
     move-result-object v5
 
-    invoke-static {v4, v5, v2}, Lorg/webrtc/Logging;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    invoke-static {v4, v5, v3}, Lorg/webrtc/Logging;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_2
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    const-string v2, "Camera1Enumerator"
+    const-string v5, "Camera1Enumerator"
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -330,9 +327,9 @@
 
     invoke-virtual {v6, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sub-long/2addr v4, v0
+    sub-long/2addr v3, v0
 
-    invoke-virtual {v6, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v3, v4}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     const-string p0, " ms."
 
@@ -342,34 +339,19 @@
 
     move-result-object p0
 
-    invoke-static {v2, p0}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v5, p0}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    return-object v3
+    return-object v2
 
     :catchall_0
     move-exception p0
 
-    move-object v2, v3
-
-    goto :goto_3
+    goto :goto_2
 
     :catch_1
     move-exception v0
 
-    move-object v2, v3
-
-    goto :goto_2
-
-    :catchall_1
-    move-exception p0
-
-    goto :goto_3
-
-    :catch_2
-    move-exception v0
-
-    :goto_2
-    :try_start_3
+    :try_start_2
     const-string v1, "Camera1Enumerator"
 
     const-string v3, "Open camera failed on camera index "
@@ -387,8 +369,8 @@
     new-instance p0, Ljava/util/ArrayList;
 
     invoke-direct {p0}, Ljava/util/ArrayList;-><init>()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     if-eqz v2, :cond_3
 
@@ -397,13 +379,15 @@
     :cond_3
     return-object p0
 
-    :goto_3
+    :goto_2
     if-eqz v2, :cond_4
 
     invoke-virtual {v2}, Landroid/hardware/Camera;->release()V
 
     :cond_4
     throw p0
+
+    return-void
 .end method
 
 .method static getCameraIndex(Ljava/lang/String;)I
@@ -465,6 +449,8 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method private static getCameraInfo(I)Landroid/hardware/Camera$CameraInfo;
@@ -628,6 +614,8 @@
     monitor-exit v0
 
     throw p0
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Session$1.smali b/com.discord/smali_classes2/org/webrtc/Camera1Session$1.smali
index d36c9717e3..d4523a209d 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Session$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Session$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera1Session$1;
 .super Ljava/lang/Object;
+.source "Camera1Session.java"
 
 # interfaces
 .implements Landroid/hardware/Camera$ErrorCallback;
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali b/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali
index a5e58dc79e..ba1144287c 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera1Session$2;
 .super Ljava/lang/Object;
+.source "Camera1Session.java"
 
 # interfaces
 .implements Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
@@ -132,9 +133,14 @@
 
     move-result-object p2
 
+    move-object v7, p2
+
+    goto :goto_0
+
     :cond_2
     move-object v7, p2
 
+    :goto_0
     iget-object p2, p0, Lorg/webrtc/Camera1Session$2;->this$0:Lorg/webrtc/Camera1Session;
 
     invoke-static {p2}, Lorg/webrtc/Camera1Session;->access$1000(Lorg/webrtc/Camera1Session;)Z
@@ -200,9 +206,7 @@
 
     iget-object v3, p0, Lorg/webrtc/Camera1Session$2;->this$0:Lorg/webrtc/Camera1Session;
 
-    iget-object p2, p0, Lorg/webrtc/Camera1Session$2;->this$0:Lorg/webrtc/Camera1Session;
-
-    invoke-static {p2}, Lorg/webrtc/Camera1Session;->access$1100(Lorg/webrtc/Camera1Session;)Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;
+    invoke-static {v3}, Lorg/webrtc/Camera1Session;->access$1100(Lorg/webrtc/Camera1Session;)Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Session$3.smali b/com.discord/smali_classes2/org/webrtc/Camera1Session$3.smali
index f148713742..b597cd336f 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Session$3.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Session$3.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera1Session$3;
 .super Ljava/lang/Object;
+.source "Camera1Session.java"
 
 # interfaces
 .implements Landroid/hardware/Camera$PreviewCallback;
@@ -235,9 +236,7 @@
 
     iget-object v3, p0, Lorg/webrtc/Camera1Session$3;->this$0:Lorg/webrtc/Camera1Session;
 
-    iget-object p2, p0, Lorg/webrtc/Camera1Session$3;->this$0:Lorg/webrtc/Camera1Session;
-
-    invoke-static {p2}, Lorg/webrtc/Camera1Session;->access$1100(Lorg/webrtc/Camera1Session;)Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;
+    invoke-static {v3}, Lorg/webrtc/Camera1Session;->access$1100(Lorg/webrtc/Camera1Session;)Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Session$SessionState.smali b/com.discord/smali_classes2/org/webrtc/Camera1Session$SessionState.smali
index 9491b93377..032ddcd639 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Session$SessionState.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Session$SessionState.smali
@@ -1,5 +1,6 @@
 .class final enum Lorg/webrtc/Camera1Session$SessionState;
 .super Ljava/lang/Enum;
+.source "Camera1Session.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Session.smali b/com.discord/smali_classes2/org/webrtc/Camera1Session.smali
index 50dd3fe598..64f40f48ed 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Session.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Session.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera1Session;
 .super Ljava/lang/Object;
+.source "Camera1Session.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraSession;
@@ -759,7 +760,6 @@
 
     const-string v1, "Camera is already stopped"
 
-    :goto_0
     invoke-static {v0, v1}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
@@ -789,7 +789,9 @@
 
     const-string v1, "Stop done"
 
-    goto :goto_0
+    invoke-static {v0, v1}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
+
+    return-void
 .end method
 
 .method private static updateCameraParameters(Landroid/hardware/Camera;Landroid/hardware/Camera$Parameters;Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;Lorg/webrtc/Size;Z)V
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Capturer.smali b/com.discord/smali_classes2/org/webrtc/Camera2Capturer.smali
index a880cb94df..7355468183 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Capturer.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Capturer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Camera2Capturer;
 .super Lorg/webrtc/CameraCapturer;
+.source "Camera2Capturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Enumerator.smali b/com.discord/smali_classes2/org/webrtc/Camera2Enumerator.smali
index 966620dc34..5becdb83fb 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Enumerator.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Enumerator.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Camera2Enumerator;
 .super Ljava/lang/Object;
+.source "Camera2Enumerator.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraEnumerator;
@@ -566,8 +567,6 @@
 
     invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/4 p1, 0x0
-
     sub-long/2addr v5, v1
 
     invoke-virtual {v3, v5, v6}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
@@ -619,6 +618,8 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     throw p0
+
+    return-void
 .end method
 
 .method static getSupportedSizes(Landroid/hardware/camera2/CameraCharacteristics;)Ljava/util/List;
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session$1.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session$1.smali
index 5b33eb4d8e..32d8267df2 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/Camera2Session$1;
 .super Ljava/lang/Object;
+.source "Camera2Session.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraCaptureCallback.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraCaptureCallback.smali
index 25e3fec5c7..8ecd791fbd 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraCaptureCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraCaptureCallback.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera2Session$CameraCaptureCallback;
 .super Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
+.source "Camera2Session.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraStateCallback.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraStateCallback.smali
index 4e8a960e19..795931dc20 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraStateCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session$CameraStateCallback.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera2Session$CameraStateCallback;
 .super Landroid/hardware/camera2/CameraDevice$StateCallback;
+.source "Camera2Session.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback$1.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback$1.smali
index 973bac875b..bb9bc749dc 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera2Session$CaptureSessionCallback$1;
 .super Ljava/lang/Object;
+.source "Camera2Session.java"
 
 # interfaces
 .implements Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali
index 382888e45d..d4e6c039a9 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera2Session$CaptureSessionCallback;
 .super Landroid/hardware/camera2/CameraCaptureSession$StateCallback;
+.source "Camera2Session.java"
 
 
 # annotations
@@ -78,7 +79,6 @@
 
     const-string v0, "Using continuous video auto-focus."
 
-    :goto_1
     invoke-static {p1, v0}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
@@ -93,7 +93,9 @@
 
     const-string v0, "Auto-focus is not available."
 
-    goto :goto_1
+    invoke-static {p1, v0}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
+
+    return-void
 .end method
 
 .method private chooseStabilizationMode(Landroid/hardware/camera2/CaptureRequest$Builder;)V
@@ -150,7 +152,6 @@
 
     const-string v0, "Using optical stabilization."
 
-    :goto_1
     invoke-static {p1, v0}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
@@ -179,7 +180,7 @@
 
     const/4 v4, 0x0
 
-    :goto_2
+    :goto_1
     if-ge v4, v3, :cond_3
 
     aget v5, v0, v4
@@ -206,19 +207,23 @@
 
     const-string v0, "Using video stabilization."
 
-    goto :goto_1
+    invoke-static {p1, v0}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
+
+    return-void
 
     :cond_2
     add-int/lit8 v4, v4, 0x1
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const-string p1, "Camera2Session"
 
     const-string v0, "Stabilization not available."
 
-    goto :goto_1
+    invoke-static {p1, v0}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session$SessionState.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session$SessionState.smali
index 6af65b4af1..a7c4970987 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session$SessionState.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session$SessionState.smali
@@ -1,5 +1,6 @@
 .class final enum Lorg/webrtc/Camera2Session$SessionState;
 .super Ljava/lang/Enum;
+.source "Camera2Session.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session.smali
index fd34ff2ff6..d1b56aee2a 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Camera2Session;
 .super Ljava/lang/Object;
+.source "Camera2Session.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraSession;
@@ -939,8 +940,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/Camera2Session;->captureSession:Landroid/hardware/camera2/CameraCaptureSession;
-
     invoke-virtual {v0}, Landroid/hardware/camera2/CameraCaptureSession;->close()V
 
     iput-object v1, p0, Lorg/webrtc/Camera2Session;->captureSession:Landroid/hardware/camera2/CameraCaptureSession;
@@ -950,8 +949,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/webrtc/Camera2Session;->surface:Landroid/view/Surface;
-
     invoke-virtual {v0}, Landroid/view/Surface;->release()V
 
     iput-object v1, p0, Lorg/webrtc/Camera2Session;->surface:Landroid/view/Surface;
@@ -961,8 +958,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lorg/webrtc/Camera2Session;->cameraDevice:Landroid/hardware/camera2/CameraDevice;
-
     invoke-virtual {v0}, Landroid/hardware/camera2/CameraDevice;->close()V
 
     iput-object v1, p0, Lorg/webrtc/Camera2Session;->cameraDevice:Landroid/hardware/camera2/CameraDevice;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$1.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$1.smali
index c7a01072de..f59c50ce02 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$1;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraSession$CreateSessionCallback;
@@ -291,20 +292,19 @@
 
     sget-object v1, Lorg/webrtc/CameraCapturer$MediaRecorderState;->ACTIVE:Lorg/webrtc/CameraCapturer$MediaRecorderState;
 
-    :goto_1
     invoke-static {p1, v1}, Lorg/webrtc/CameraCapturer;->access$202(Lorg/webrtc/CameraCapturer;Lorg/webrtc/CameraCapturer$MediaRecorderState;)Lorg/webrtc/CameraCapturer$MediaRecorderState;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_5
     iget-object p1, p0, Lorg/webrtc/CameraCapturer$1;->this$0:Lorg/webrtc/CameraCapturer;
 
     sget-object v1, Lorg/webrtc/CameraCapturer$MediaRecorderState;->IDLE:Lorg/webrtc/CameraCapturer$MediaRecorderState;
 
-    goto :goto_1
+    invoke-static {p1, v1}, Lorg/webrtc/CameraCapturer;->access$202(Lorg/webrtc/CameraCapturer;Lorg/webrtc/CameraCapturer$MediaRecorderState;)Lorg/webrtc/CameraCapturer$MediaRecorderState;
 
     :cond_6
-    :goto_2
+    :goto_1
     monitor-exit v0
 
     return-void
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$10.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$10.smali
index 7d49d081ef..96854e14c3 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$10.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$10.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$10;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$11.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$11.smali
index 6735345075..b1074a5b85 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$11.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$11.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$11;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$2.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$2.smali
index 89575c5a6b..d2e62c3273 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$2.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$2;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraSession$Events;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$3.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$3.smali
index a1e6374eb0..9af21268ef 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$3.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$3.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$3;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$4.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$4.smali
index b62261b0dd..a1a2a5323b 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$4.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$4.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$4;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraVideoCapturer$CameraEventsHandler;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$5.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$5.smali
index 94217ed443..4d0bbf257c 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$5.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$5.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$5;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -42,9 +43,7 @@
 
     iget-object v0, p0, Lorg/webrtc/CameraCapturer$5;->this$0:Lorg/webrtc/CameraCapturer;
 
-    iget-object v1, p0, Lorg/webrtc/CameraCapturer$5;->this$0:Lorg/webrtc/CameraCapturer;
-
-    invoke-static {v1}, Lorg/webrtc/CameraCapturer;->access$2000(Lorg/webrtc/CameraCapturer;)Lorg/webrtc/CameraSession$CreateSessionCallback;
+    invoke-static {v0}, Lorg/webrtc/CameraCapturer;->access$2000(Lorg/webrtc/CameraCapturer;)Lorg/webrtc/CameraSession$CreateSessionCallback;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$6.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$6.smali
index 81a98d304a..23cf343e1c 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$6.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$6.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$6;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$7.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$7.smali
index cc96d78252..e2aa4b3bb4 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$7.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$7.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$7;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$8.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$8.smali
index a7b5e0eb45..07791c0934 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$8.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$8.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$8;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$9.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$9.smali
index 47d4240edc..2fd37528da 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$9.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$9.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraCapturer$9;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$MediaRecorderState.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$MediaRecorderState.smali
index a9df386d2d..3c6543d9b2 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$MediaRecorderState.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$MediaRecorderState.smali
@@ -1,5 +1,6 @@
 .class final enum Lorg/webrtc/CameraCapturer$MediaRecorderState;
 .super Ljava/lang/Enum;
+.source "CameraCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer$SwitchState.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer$SwitchState.smali
index 2604ee0fd3..768072c189 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer$SwitchState.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer$SwitchState.smali
@@ -1,5 +1,6 @@
 .class final enum Lorg/webrtc/CameraCapturer$SwitchState;
 .super Ljava/lang/Enum;
+.source "CameraCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali
index 23648b0d2b..02409ddcf4 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali
@@ -1,5 +1,6 @@
 .class abstract Lorg/webrtc/CameraCapturer;
 .super Ljava/lang/Object;
+.source "CameraCapturer.java"
 
 # interfaces
 .implements Lorg/webrtc/CameraVideoCapturer;
@@ -1109,8 +1110,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/CameraCapturer;->cameraThreadHandler:Landroid/os/Handler;
-
     invoke-virtual {v0}, Landroid/os/Handler;->getLooper()Landroid/os/Looper;
 
     move-result-object v0
@@ -1389,6 +1388,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method public switchCamera(Lorg/webrtc/CameraVideoCapturer$CameraSwitchHandler;)V
diff --git a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$1.smali b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$1.smali
index bede42240e..6788f66471 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraEnumerationAndroid$1;
 .super Lorg/webrtc/CameraEnumerationAndroid$ClosestComparator;
+.source "CameraEnumerationAndroid.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$2.smali b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$2.smali
index 7f8ba0623f..0dcf51ca7b 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$2.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraEnumerationAndroid$2;
 .super Lorg/webrtc/CameraEnumerationAndroid$ClosestComparator;
+.source "CameraEnumerationAndroid.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat$FramerateRange.smali b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat$FramerateRange.smali
index 94e20ebbb0..7120077c23 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat$FramerateRange.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat$FramerateRange.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat$FramerateRange;
 .super Ljava/lang/Object;
+.source "CameraEnumerationAndroid.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat.smali b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat.smali
index 71fc94c87b..e523c672ad 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$CaptureFormat.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;
 .super Ljava/lang/Object;
+.source "CameraEnumerationAndroid.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$ClosestComparator.smali b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$ClosestComparator.smali
index 932a1a2c12..b2657c6ddc 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$ClosestComparator.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid$ClosestComparator.smali
@@ -1,5 +1,6 @@
 .class abstract Lorg/webrtc/CameraEnumerationAndroid$ClosestComparator;
 .super Ljava/lang/Object;
+.source "CameraEnumerationAndroid.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid.smali b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid.smali
index 9b65013ed9..f8461e583d 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraEnumerationAndroid.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/CameraEnumerationAndroid;
 .super Ljava/lang/Object;
+.source "CameraEnumerationAndroid.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraEnumerator.smali b/com.discord/smali_classes2/org/webrtc/CameraEnumerator.smali
index 09dadbeffb..76047aa7e7 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraEnumerator.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraEnumerator.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/CameraEnumerator;
 .super Ljava/lang/Object;
+.source "CameraEnumerator.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/CameraSession$CreateSessionCallback.smali b/com.discord/smali_classes2/org/webrtc/CameraSession$CreateSessionCallback.smali
index 31e8014b4d..bdaff52db1 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraSession$CreateSessionCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraSession$CreateSessionCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/CameraSession$CreateSessionCallback;
 .super Ljava/lang/Object;
+.source "CameraSession.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraSession$Events.smali b/com.discord/smali_classes2/org/webrtc/CameraSession$Events.smali
index 0e16b31529..d91452fde8 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraSession$Events.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraSession$Events.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/CameraSession$Events;
 .super Ljava/lang/Object;
+.source "CameraSession.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraSession$FailureType.smali b/com.discord/smali_classes2/org/webrtc/CameraSession$FailureType.smali
index 3766241653..915a5fa9fb 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraSession$FailureType.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraSession$FailureType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/CameraSession$FailureType;
 .super Ljava/lang/Enum;
+.source "CameraSession.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraSession.smali b/com.discord/smali_classes2/org/webrtc/CameraSession.smali
index 5a2bfddeda..0c034d3b3f 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraSession.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraSession.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lorg/webrtc/CameraSession;
 .super Ljava/lang/Object;
+.source "CameraSession.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraEventsHandler.smali b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraEventsHandler.smali
index 7767cd0f3b..117a06c673 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraEventsHandler.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraEventsHandler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/CameraVideoCapturer$CameraEventsHandler;
 .super Ljava/lang/Object;
+.source "CameraVideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics$1.smali b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics$1.smali
index 5a084d5fe0..e2fff9aba4 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/CameraVideoCapturer$CameraStatistics$1;
 .super Ljava/lang/Object;
+.source "CameraVideoCapturer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics.smali b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics.smali
index a5d0a0d440..102994a52e 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraStatistics.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/CameraVideoCapturer$CameraStatistics;
 .super Ljava/lang/Object;
+.source "CameraVideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraSwitchHandler.smali b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraSwitchHandler.smali
index 1541f6728a..483bbf739b 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraSwitchHandler.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$CameraSwitchHandler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/CameraVideoCapturer$CameraSwitchHandler;
 .super Ljava/lang/Object;
+.source "CameraVideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$MediaRecorderHandler.smali b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$MediaRecorderHandler.smali
index 0e71bd9504..50f48d442e 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$MediaRecorderHandler.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer$MediaRecorderHandler.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;
 .super Ljava/lang/Object;
+.source "CameraVideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer.smali b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer.smali
index 1fcf71c606..c5aca7aa44 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraVideoCapturer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/CameraVideoCapturer;
 .super Ljava/lang/Object;
+.source "CameraVideoCapturer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoCapturer;
diff --git a/com.discord/smali_classes2/org/webrtc/ContextUtils.smali b/com.discord/smali_classes2/org/webrtc/ContextUtils.smali
index 045737ec39..039cbebde1 100644
--- a/com.discord/smali_classes2/org/webrtc/ContextUtils.smali
+++ b/com.discord/smali_classes2/org/webrtc/ContextUtils.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/ContextUtils;
 .super Ljava/lang/Object;
+.source "ContextUtils.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/org/webrtc/DataChannel$Buffer.smali b/com.discord/smali_classes2/org/webrtc/DataChannel$Buffer.smali
index 6812ccafd7..87500a5cf7 100644
--- a/com.discord/smali_classes2/org/webrtc/DataChannel$Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/DataChannel$Buffer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/DataChannel$Buffer;
 .super Ljava/lang/Object;
+.source "DataChannel.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/DataChannel$Init.smali b/com.discord/smali_classes2/org/webrtc/DataChannel$Init.smali
index 0f024c8ed7..a40fe29b8d 100644
--- a/com.discord/smali_classes2/org/webrtc/DataChannel$Init.smali
+++ b/com.discord/smali_classes2/org/webrtc/DataChannel$Init.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/DataChannel$Init;
 .super Ljava/lang/Object;
+.source "DataChannel.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/DataChannel$Observer.smali b/com.discord/smali_classes2/org/webrtc/DataChannel$Observer.smali
index b393ccc5ca..f63786641f 100644
--- a/com.discord/smali_classes2/org/webrtc/DataChannel$Observer.smali
+++ b/com.discord/smali_classes2/org/webrtc/DataChannel$Observer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/DataChannel$Observer;
 .super Ljava/lang/Object;
+.source "DataChannel.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/DataChannel$State.smali b/com.discord/smali_classes2/org/webrtc/DataChannel$State.smali
index 96bc9fec05..4b599d6076 100644
--- a/com.discord/smali_classes2/org/webrtc/DataChannel$State.smali
+++ b/com.discord/smali_classes2/org/webrtc/DataChannel$State.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/DataChannel$State;
 .super Ljava/lang/Enum;
+.source "DataChannel.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/DataChannel.smali b/com.discord/smali_classes2/org/webrtc/DataChannel.smali
index 321dbf156f..5ec3582a1e 100644
--- a/com.discord/smali_classes2/org/webrtc/DataChannel.smali
+++ b/com.discord/smali_classes2/org/webrtc/DataChannel.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/DataChannel;
 .super Ljava/lang/Object;
+.source "DataChannel.java"
 
 
 # annotations
@@ -131,8 +132,6 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lorg/webrtc/DataChannel;->nativeObserver:J
-
     invoke-direct {p0, v0, v1}, Lorg/webrtc/DataChannel;->nativeUnregisterObserver(J)V
 
     :cond_0
diff --git a/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali b/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali
index 77c55a70c9..ce1839c418 100644
--- a/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/DefaultVideoDecoderFactory;
 .super Ljava/lang/Object;
+.source "DefaultVideoDecoderFactory.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoDecoderFactory;
diff --git a/com.discord/smali_classes2/org/webrtc/DefaultVideoEncoderFactory.smali b/com.discord/smali_classes2/org/webrtc/DefaultVideoEncoderFactory.smali
index 189e27db01..81c2e74ee2 100644
--- a/com.discord/smali_classes2/org/webrtc/DefaultVideoEncoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/DefaultVideoEncoderFactory.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/DefaultVideoEncoderFactory;
 .super Ljava/lang/Object;
+.source "DefaultVideoEncoderFactory.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoEncoderFactory;
diff --git a/com.discord/smali_classes2/org/webrtc/DtmfSender.smali b/com.discord/smali_classes2/org/webrtc/DtmfSender.smali
index b79c197d57..587ae6f62f 100644
--- a/com.discord/smali_classes2/org/webrtc/DtmfSender.smali
+++ b/com.discord/smali_classes2/org/webrtc/DtmfSender.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/DtmfSender;
 .super Ljava/lang/Object;
+.source "DtmfSender.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/DynamicBitrateAdjuster.smali b/com.discord/smali_classes2/org/webrtc/DynamicBitrateAdjuster.smali
index 24a2a1a9b6..ec7d3c9339 100644
--- a/com.discord/smali_classes2/org/webrtc/DynamicBitrateAdjuster.smali
+++ b/com.discord/smali_classes2/org/webrtc/DynamicBitrateAdjuster.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/DynamicBitrateAdjuster;
 .super Lorg/webrtc/BaseBitrateAdjuster;
+.source "DynamicBitrateAdjuster.java"
 
 
 # static fields
@@ -178,8 +179,6 @@
 
     if-lez p1, :cond_2
 
-    iget-wide v2, p0, Lorg/webrtc/DynamicBitrateAdjuster;->deviationBytes:D
-
     div-double/2addr v2, v0
 
     add-double/2addr v2, v4
@@ -207,16 +206,12 @@
     goto :goto_0
 
     :cond_2
-    iget-wide v2, p0, Lorg/webrtc/DynamicBitrateAdjuster;->deviationBytes:D
-
     neg-double v6, v0
 
     cmpg-double p1, v2, v6
 
     if-gez p1, :cond_3
 
-    iget-wide v2, p0, Lorg/webrtc/DynamicBitrateAdjuster;->deviationBytes:D
-
     neg-double v2, v2
 
     div-double/2addr v2, v0
diff --git a/com.discord/smali_classes2/org/webrtc/EglBase$Context.smali b/com.discord/smali_classes2/org/webrtc/EglBase$Context.smali
index 3b15c171b0..c53d641f11 100644
--- a/com.discord/smali_classes2/org/webrtc/EglBase$Context.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglBase$Context.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/EglBase$Context;
 .super Ljava/lang/Object;
+.source "EglBase.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/EglBase.smali b/com.discord/smali_classes2/org/webrtc/EglBase.smali
index bcc15e79da..34f5fbb444 100644
--- a/com.discord/smali_classes2/org/webrtc/EglBase.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglBase.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/EglBase;
 .super Ljava/lang/Object;
+.source "EglBase.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/EglBase10$1FakeSurfaceHolder.smali b/com.discord/smali_classes2/org/webrtc/EglBase10$1FakeSurfaceHolder.smali
index 1092f2bfb5..82875a0ec9 100644
--- a/com.discord/smali_classes2/org/webrtc/EglBase10$1FakeSurfaceHolder.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglBase10$1FakeSurfaceHolder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/EglBase10$1FakeSurfaceHolder;
 .super Ljava/lang/Object;
+.source "EglBase10.java"
 
 # interfaces
 .implements Landroid/view/SurfaceHolder;
diff --git a/com.discord/smali_classes2/org/webrtc/EglBase10$Context.smali b/com.discord/smali_classes2/org/webrtc/EglBase10$Context.smali
index 0256bb740f..914b23794f 100644
--- a/com.discord/smali_classes2/org/webrtc/EglBase10$Context.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglBase10$Context.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/EglBase10$Context;
 .super Ljava/lang/Object;
+.source "EglBase10.java"
 
 # interfaces
 .implements Lorg/webrtc/EglBase$Context;
diff --git a/com.discord/smali_classes2/org/webrtc/EglBase10.smali b/com.discord/smali_classes2/org/webrtc/EglBase10.smali
index fceb90fd8d..cc45107eab 100644
--- a/com.discord/smali_classes2/org/webrtc/EglBase10.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglBase10.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/EglBase10;
 .super Ljava/lang/Object;
+.source "EglBase10.java"
 
 # interfaces
 .implements Lorg/webrtc/EglBase;
diff --git a/com.discord/smali_classes2/org/webrtc/EglBase14$Context.smali b/com.discord/smali_classes2/org/webrtc/EglBase14$Context.smali
index 0aa1a26336..f74a4380d6 100644
--- a/com.discord/smali_classes2/org/webrtc/EglBase14$Context.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglBase14$Context.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/EglBase14$Context;
 .super Ljava/lang/Object;
+.source "EglBase14.java"
 
 # interfaces
 .implements Lorg/webrtc/EglBase$Context;
diff --git a/com.discord/smali_classes2/org/webrtc/EglBase14.smali b/com.discord/smali_classes2/org/webrtc/EglBase14.smali
index e0a6335c31..480cbe2603 100644
--- a/com.discord/smali_classes2/org/webrtc/EglBase14.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglBase14.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/EglBase14;
 .super Ljava/lang/Object;
+.source "EglBase14.java"
 
 # interfaces
 .implements Lorg/webrtc/EglBase;
@@ -522,9 +523,9 @@
 
     sget v2, Lorg/webrtc/EglBase14;->CURRENT_SDK_VERSION:I
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
     const/16 v5, 0x12
 
@@ -550,10 +551,10 @@
 
     if-lt v0, v5, :cond_1
 
-    return v4
+    return v3
 
     :cond_1
-    return v3
+    return v4
 .end method
 
 
diff --git a/com.discord/smali_classes2/org/webrtc/EglHelper.smali b/com.discord/smali_classes2/org/webrtc/EglHelper.smali
index d95f2a5ca9..ea63d3e1c8 100644
--- a/com.discord/smali_classes2/org/webrtc/EglHelper.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglHelper.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/EglHelper;
 .super Ljava/lang/Object;
+.source "EglHelper.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/EglRenderer$1.smali b/com.discord/smali_classes2/org/webrtc/EglRenderer$1.smali
index e664d4472f..d81c9a579a 100644
--- a/com.discord/smali_classes2/org/webrtc/EglRenderer$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglRenderer$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/EglRenderer$1;
 .super Ljava/lang/Object;
+.source "EglRenderer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/EglRenderer$EglSurfaceCreation.smali b/com.discord/smali_classes2/org/webrtc/EglRenderer$EglSurfaceCreation.smali
index 0f9c450bb2..985de3a326 100644
--- a/com.discord/smali_classes2/org/webrtc/EglRenderer$EglSurfaceCreation.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglRenderer$EglSurfaceCreation.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/EglRenderer$EglSurfaceCreation;
 .super Ljava/lang/Object;
+.source "EglRenderer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListener.smali b/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListener.smali
index 4f56e24d5e..4d0393dc41 100644
--- a/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListener.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/EglRenderer$FrameListener;
 .super Ljava/lang/Object;
+.source "EglRenderer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListenerAndParams.smali b/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListenerAndParams.smali
index d5de17e5c5..e8594ca47b 100644
--- a/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListenerAndParams.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglRenderer$FrameListenerAndParams.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/EglRenderer$FrameListenerAndParams;
 .super Ljava/lang/Object;
+.source "EglRenderer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/EglRenderer.smali b/com.discord/smali_classes2/org/webrtc/EglRenderer.smali
index 2536cf78f9..1806a08b39 100644
--- a/com.discord/smali_classes2/org/webrtc/EglRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglRenderer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/EglRenderer;
 .super Ljava/lang/Object;
+.source "EglRenderer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoRenderer$Callbacks;
@@ -241,8 +242,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/EglRenderer;->eglBase:Lorg/webrtc/EglBase;
-
     invoke-interface {v0}, Lorg/webrtc/EglBase;->hasSurface()Z
 
     move-result v0
@@ -319,8 +318,6 @@
     :try_start_0
     iget-wide v3, p0, Lorg/webrtc/EglRenderer;->statisticsStartTimeNs:J
 
-    const/4 v5, 0x0
-
     sub-long v3, v0, v3
 
     const-wide/16 v5, 0x0
@@ -473,9 +470,9 @@
 .end method
 
 .method private notifyCallbacks(Lorg/webrtc/VideoFrame;Z)V
-    .locals 16
+    .locals 15
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
     iget-object v1, v0, Lorg/webrtc/EglRenderer;->frameListeners:Ljava/util/ArrayList;
 
@@ -500,20 +497,20 @@
 
     iget-boolean v1, v0, Lorg/webrtc/EglRenderer;->mirror:Z
 
-    const/high16 v2, 0x3f800000    # 1.0f
+    const/high16 v2, -0x40800000    # -1.0f
 
-    const/high16 v3, -0x40800000    # -1.0f
+    const/high16 v3, 0x3f800000    # 1.0f
 
     if-eqz v1, :cond_1
 
     iget-object v1, v0, Lorg/webrtc/EglRenderer;->drawMatrix:Landroid/graphics/Matrix;
 
-    invoke-virtual {v1, v3, v2}, Landroid/graphics/Matrix;->preScale(FF)Z
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Matrix;->preScale(FF)Z
 
     :cond_1
     iget-object v1, v0, Lorg/webrtc/EglRenderer;->drawMatrix:Landroid/graphics/Matrix;
 
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Matrix;->preScale(FF)Z
+    invoke-virtual {v1, v3, v2}, Landroid/graphics/Matrix;->preScale(FF)Z
 
     iget-object v1, v0, Lorg/webrtc/EglRenderer;->drawMatrix:Landroid/graphics/Matrix;
 
@@ -543,163 +540,164 @@
 
     if-nez p2, :cond_3
 
-    iget-boolean v4, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->applyFpsReduction:Z
+    iget-boolean v3, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->applyFpsReduction:Z
 
-    if-nez v4, :cond_2
+    if-nez v3, :cond_2
 
     :cond_3
     invoke-interface {v1}, Ljava/util/Iterator;->remove()V
 
-    iget v4, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->scale:F
+    iget v3, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->scale:F
 
     invoke-virtual/range {p1 .. p1}, Lorg/webrtc/VideoFrame;->getRotatedWidth()I
 
+    move-result v4
+
+    int-to-float v4, v4
+
+    mul-float v3, v3, v4
+
+    float-to-int v3, v3
+
+    iget v4, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->scale:F
+
+    invoke-virtual/range {p1 .. p1}, Lorg/webrtc/VideoFrame;->getRotatedHeight()I
+
     move-result v5
 
     int-to-float v5, v5
 
     mul-float v4, v4, v5
 
-    float-to-int v4, v4
+    float-to-int v12, v4
 
-    iget v5, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->scale:F
+    if-eqz v3, :cond_6
 
-    invoke-virtual/range {p1 .. p1}, Lorg/webrtc/VideoFrame;->getRotatedHeight()I
-
-    move-result v6
-
-    int-to-float v6, v6
-
-    mul-float v5, v5, v6
-
-    float-to-int v13, v5
-
-    if-eqz v4, :cond_6
-
-    if-nez v13, :cond_4
+    if-nez v12, :cond_4
 
     goto/16 :goto_1
 
     :cond_4
-    iget-object v5, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
+    iget-object v4, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
 
-    if-nez v5, :cond_5
+    if-nez v4, :cond_5
 
-    new-instance v5, Lorg/webrtc/GlTextureFrameBuffer;
+    new-instance v4, Lorg/webrtc/GlTextureFrameBuffer;
 
-    const/16 v6, 0x1908
+    const/16 v5, 0x1908
 
-    invoke-direct {v5, v6}, Lorg/webrtc/GlTextureFrameBuffer;-><init>(I)V
+    invoke-direct {v4, v5}, Lorg/webrtc/GlTextureFrameBuffer;-><init>(I)V
 
-    iput-object v5, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
+    iput-object v4, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
 
     :cond_5
-    iget-object v5, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
+    iget-object v4, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
 
-    invoke-virtual {v5, v4, v13}, Lorg/webrtc/GlTextureFrameBuffer;->setSize(II)V
+    invoke-virtual {v4, v3, v12}, Lorg/webrtc/GlTextureFrameBuffer;->setSize(II)V
 
-    iget-object v5, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
+    iget-object v4, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
 
-    invoke-virtual {v5}, Lorg/webrtc/GlTextureFrameBuffer;->getFrameBufferId()I
+    invoke-virtual {v4}, Lorg/webrtc/GlTextureFrameBuffer;->getFrameBufferId()I
 
-    move-result v5
+    move-result v4
 
-    const v14, 0x8d40
+    const v13, 0x8d40
 
-    invoke-static {v14, v5}, Landroid/opengl/GLES20;->glBindFramebuffer(II)V
+    invoke-static {v13, v4}, Landroid/opengl/GLES20;->glBindFramebuffer(II)V
 
-    const v5, 0x8ce0
+    const v4, 0x8ce0
 
-    const/16 v6, 0xde1
+    const/16 v5, 0xde1
 
-    iget-object v7, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
+    iget-object v6, v0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
 
-    invoke-virtual {v7}, Lorg/webrtc/GlTextureFrameBuffer;->getTextureId()I
+    invoke-virtual {v6}, Lorg/webrtc/GlTextureFrameBuffer;->getTextureId()I
 
-    move-result v7
+    move-result v6
 
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
-    invoke-static {v14, v5, v6, v7, v15}, Landroid/opengl/GLES20;->glFramebufferTexture2D(IIIII)V
+    invoke-static {v13, v4, v5, v6, v14}, Landroid/opengl/GLES20;->glFramebufferTexture2D(IIIII)V
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    invoke-static {v5, v5, v5, v5}, Landroid/opengl/GLES20;->glClearColor(FFFF)V
+    invoke-static {v4, v4, v4, v4}, Landroid/opengl/GLES20;->glClearColor(FFFF)V
 
-    const/16 v5, 0x4000
+    const/16 v4, 0x4000
 
-    invoke-static {v5}, Landroid/opengl/GLES20;->glClear(I)V
+    invoke-static {v4}, Landroid/opengl/GLES20;->glClear(I)V
 
-    iget-object v5, v0, Lorg/webrtc/EglRenderer;->frameDrawer:Lorg/webrtc/VideoFrameDrawer;
+    iget-object v4, v0, Lorg/webrtc/EglRenderer;->frameDrawer:Lorg/webrtc/VideoFrameDrawer;
 
-    iget-object v7, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->drawer:Lorg/webrtc/RendererCommon$GlDrawer;
+    iget-object v6, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->drawer:Lorg/webrtc/RendererCommon$GlDrawer;
 
-    iget-object v8, v0, Lorg/webrtc/EglRenderer;->drawMatrix:Landroid/graphics/Matrix;
+    iget-object v7, v0, Lorg/webrtc/EglRenderer;->drawMatrix:Landroid/graphics/Matrix;
+
+    const/4 v8, 0x0
 
     const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    move-object/from16 v5, p1
 
-    move-object/from16 v6, p1
+    move v10, v3
 
-    move v11, v4
+    move v11, v12
 
-    move v12, v13
+    invoke-virtual/range {v4 .. v11}, Lorg/webrtc/VideoFrameDrawer;->drawFrame(Lorg/webrtc/VideoFrame;Lorg/webrtc/RendererCommon$GlDrawer;Landroid/graphics/Matrix;IIII)V
 
-    invoke-virtual/range {v5 .. v12}, Lorg/webrtc/VideoFrameDrawer;->drawFrame(Lorg/webrtc/VideoFrame;Lorg/webrtc/RendererCommon$GlDrawer;Landroid/graphics/Matrix;IIII)V
+    mul-int v4, v3, v12
 
-    mul-int v5, v4, v13
+    mul-int/lit8 v4, v4, 0x4
 
-    mul-int/lit8 v5, v5, 0x4
+    invoke-static {v4}, Ljava/nio/ByteBuffer;->allocateDirect(I)Ljava/nio/ByteBuffer;
 
-    invoke-static {v5}, Ljava/nio/ByteBuffer;->allocateDirect(I)Ljava/nio/ByteBuffer;
+    move-result-object v11
 
-    move-result-object v12
+    invoke-static {v14, v14, v3, v12}, Landroid/opengl/GLES20;->glViewport(IIII)V
 
-    invoke-static {v15, v15, v4, v13}, Landroid/opengl/GLES20;->glViewport(IIII)V
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v8, 0x1908
 
-    const/16 v9, 0x1908
+    const/16 v9, 0x1401
 
-    const/16 v10, 0x1401
+    move v6, v3
 
-    move v7, v4
+    move v7, v12
 
-    move v8, v13
+    move-object v10, v11
 
-    move-object v11, v12
+    invoke-static/range {v4 .. v10}, Landroid/opengl/GLES20;->glReadPixels(IIIIIILjava/nio/Buffer;)V
 
-    invoke-static/range {v5 .. v11}, Landroid/opengl/GLES20;->glReadPixels(IIIIIILjava/nio/Buffer;)V
+    invoke-static {v13, v14}, Landroid/opengl/GLES20;->glBindFramebuffer(II)V
 
-    invoke-static {v14, v15}, Landroid/opengl/GLES20;->glBindFramebuffer(II)V
+    const-string v4, "EglRenderer.notifyCallbacks"
 
-    const-string v5, "EglRenderer.notifyCallbacks"
+    invoke-static {v4}, Lorg/webrtc/GlUtil;->checkNoGLES2Error(Ljava/lang/String;)V
 
-    invoke-static {v5}, Lorg/webrtc/GlUtil;->checkNoGLES2Error(Ljava/lang/String;)V
+    sget-object v4, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
-    sget-object v5, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
+    invoke-static {v3, v12, v4}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
 
-    invoke-static {v4, v13, v5}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
+    move-result-object v3
 
-    move-result-object v4
-
-    invoke-virtual {v4, v12}, Landroid/graphics/Bitmap;->copyPixelsFromBuffer(Ljava/nio/Buffer;)V
+    invoke-virtual {v3, v11}, Landroid/graphics/Bitmap;->copyPixelsFromBuffer(Ljava/nio/Buffer;)V
 
     iget-object v2, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->listener:Lorg/webrtc/EglRenderer$FrameListener;
 
-    goto :goto_2
+    invoke-interface {v2, v3}, Lorg/webrtc/EglRenderer$FrameListener;->onFrame(Landroid/graphics/Bitmap;)V
+
+    goto/16 :goto_0
 
     :cond_6
     :goto_1
     iget-object v2, v2, Lorg/webrtc/EglRenderer$FrameListenerAndParams;->listener:Lorg/webrtc/EglRenderer$FrameListener;
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    :goto_2
-    invoke-interface {v2, v4}, Lorg/webrtc/EglRenderer$FrameListener;->onFrame(Landroid/graphics/Bitmap;)V
+    invoke-interface {v2, v3}, Lorg/webrtc/EglRenderer$FrameListener;->onFrame(Landroid/graphics/Bitmap;)V
 
     goto/16 :goto_0
 
@@ -769,15 +767,13 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lorg/webrtc/EglRenderer;->eglBase:Lorg/webrtc/EglBase;
-
     invoke-interface {v0}, Lorg/webrtc/EglBase;->hasSurface()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    goto/16 :goto_7
+    goto/16 :goto_4
 
     :cond_1
     iget-object v0, p0, Lorg/webrtc/EglRenderer;->fpsReductionLock:Ljava/lang/Object;
@@ -797,10 +793,9 @@
 
     if-nez v7, :cond_2
 
-    :goto_0
     const/4 v11, 0x0
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_2
     iget-wide v2, p0, Lorg/webrtc/EglRenderer;->minRenderPeriodNs:J
@@ -811,10 +806,9 @@
 
     if-gtz v7, :cond_3
 
-    :goto_1
     const/4 v11, 0x1
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_3
     invoke-static {}, Ljava/lang/System;->nanoTime()J
@@ -831,6 +825,8 @@
 
     invoke-direct {p0, v2}, Lorg/webrtc/EglRenderer;->logD(Ljava/lang/String;)V
 
+    const/4 v11, 0x0
+
     goto :goto_0
 
     :cond_4
@@ -838,8 +834,6 @@
 
     iget-wide v6, p0, Lorg/webrtc/EglRenderer;->minRenderPeriodNs:J
 
-    const/4 v8, 0x0
-
     add-long/2addr v4, v6
 
     iput-wide v4, p0, Lorg/webrtc/EglRenderer;->nextFrameTimeNs:J
@@ -852,9 +846,9 @@
 
     iput-wide v2, p0, Lorg/webrtc/EglRenderer;->nextFrameTimeNs:J
 
-    goto :goto_1
+    const/4 v11, 0x1
 
-    :goto_2
+    :goto_0
     monitor-exit v0
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
@@ -892,12 +886,12 @@
 
     iget v3, p0, Lorg/webrtc/EglRenderer;->layoutAspectRatio:F
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_5
     move v3, v0
 
-    :goto_3
+    :goto_1
     monitor-exit v2
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
@@ -912,7 +906,7 @@
 
     const/high16 v3, 0x3f800000    # 1.0f
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_6
     div-float/2addr v0, v3
@@ -921,7 +915,7 @@
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    :goto_4
+    :goto_2
     iget-object v5, p0, Lorg/webrtc/EglRenderer;->drawMatrix:Landroid/graphics/Matrix;
 
     invoke-virtual {v5}, Landroid/graphics/Matrix;->reset()V
@@ -1012,8 +1006,6 @@
 
     iget-wide v6, p0, Lorg/webrtc/EglRenderer;->renderTimeNs:J
 
-    const/4 v8, 0x0
-
     sub-long v8, v4, v12
 
     add-long/2addr v6, v8
@@ -1022,8 +1014,6 @@
 
     iget-wide v6, p0, Lorg/webrtc/EglRenderer;->renderSwapBufferTimeNs:J
 
-    const/4 v8, 0x0
-
     sub-long/2addr v4, v2
 
     add-long/2addr v6, v4
@@ -1032,7 +1022,7 @@
 
     monitor-exit v0
 
-    goto :goto_5
+    goto :goto_3
 
     :catchall_0
     move-exception v1
@@ -1044,10 +1034,9 @@
     throw v1
 
     :cond_8
-    :goto_5
+    :goto_3
     invoke-direct {p0, v1, v11}, Lorg/webrtc/EglRenderer;->notifyCallbacks(Lorg/webrtc/VideoFrame;Z)V
 
-    :goto_6
     invoke-virtual {v1}, Lorg/webrtc/VideoFrame;->release()V
 
     return-void
@@ -1073,12 +1062,14 @@
     throw v1
 
     :cond_9
-    :goto_7
+    :goto_4
     const-string v0, "Dropping frame - No surface"
 
     invoke-direct {p0, v0}, Lorg/webrtc/EglRenderer;->logD(Ljava/lang/String;)V
 
-    goto :goto_6
+    invoke-virtual {v1}, Lorg/webrtc/VideoFrame;->release()V
+
+    return-void
 
     :catchall_3
     move-exception v1
@@ -1433,7 +1424,6 @@
 
     move-result-object p1
 
-    :goto_0
     iput-object p1, p0, Lorg/webrtc/EglRenderer;->eglBase:Lorg/webrtc/EglBase;
 
     return-void
@@ -1447,7 +1437,9 @@
 
     move-result-object p1
 
-    goto :goto_0
+    iput-object p1, p0, Lorg/webrtc/EglRenderer;->eglBase:Lorg/webrtc/EglBase;
+
+    return-void
 .end method
 
 .method final synthetic lambda$release$1$EglRenderer(Ljava/util/concurrent/CountDownLatch;)V
@@ -1459,8 +1451,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/EglRenderer;->drawer:Lorg/webrtc/RendererCommon$GlDrawer;
-
     invoke-interface {v0}, Lorg/webrtc/RendererCommon$GlDrawer;->release()V
 
     iput-object v1, p0, Lorg/webrtc/EglRenderer;->drawer:Lorg/webrtc/RendererCommon$GlDrawer;
@@ -1474,8 +1464,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
-
     invoke-virtual {v0}, Lorg/webrtc/GlTextureFrameBuffer;->release()V
 
     iput-object v1, p0, Lorg/webrtc/EglRenderer;->bitmapTextureFramebuffer:Lorg/webrtc/GlTextureFrameBuffer;
@@ -1528,8 +1516,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/EglRenderer;->eglBase:Lorg/webrtc/EglBase;
-
     invoke-interface {v0}, Lorg/webrtc/EglBase;->detachCurrent()V
 
     iget-object v0, p0, Lorg/webrtc/EglRenderer;->eglBase:Lorg/webrtc/EglBase;
@@ -1810,6 +1796,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw v1
+
+    return-void
 .end method
 
 .method public release()V
diff --git a/com.discord/smali_classes2/org/webrtc/EncodedImage$1.smali b/com.discord/smali_classes2/org/webrtc/EncodedImage$1.smali
index 4e2bd28c9e..f472f8a201 100644
--- a/com.discord/smali_classes2/org/webrtc/EncodedImage$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/EncodedImage$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/EncodedImage$1;
 .super Ljava/lang/Object;
+.source "EncodedImage.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/EncodedImage$Builder.smali b/com.discord/smali_classes2/org/webrtc/EncodedImage$Builder.smali
index 1787368a35..e9fd2101b7 100644
--- a/com.discord/smali_classes2/org/webrtc/EncodedImage$Builder.smali
+++ b/com.discord/smali_classes2/org/webrtc/EncodedImage$Builder.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/EncodedImage$Builder;
 .super Ljava/lang/Object;
+.source "EncodedImage.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/EncodedImage$FrameType.smali b/com.discord/smali_classes2/org/webrtc/EncodedImage$FrameType.smali
index b2effb5a8e..d7b6e05b2d 100644
--- a/com.discord/smali_classes2/org/webrtc/EncodedImage$FrameType.smali
+++ b/com.discord/smali_classes2/org/webrtc/EncodedImage$FrameType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/EncodedImage$FrameType;
 .super Ljava/lang/Enum;
+.source "EncodedImage.java"
 
 
 # annotations
@@ -155,6 +156,8 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public static valueOf(Ljava/lang/String;)Lorg/webrtc/EncodedImage$FrameType;
diff --git a/com.discord/smali_classes2/org/webrtc/EncodedImage.smali b/com.discord/smali_classes2/org/webrtc/EncodedImage.smali
index 0f4b7583f1..db47678e07 100644
--- a/com.discord/smali_classes2/org/webrtc/EncodedImage.smali
+++ b/com.discord/smali_classes2/org/webrtc/EncodedImage.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/EncodedImage;
 .super Ljava/lang/Object;
+.source "EncodedImage.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$1.smali b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$1.smali
index 8d4580a7e2..47b0d80863 100644
--- a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/FileVideoCapturer$1;
 .super Ljava/util/TimerTask;
+.source "FileVideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReader.smali b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReader.smali
index 99afaa8b5b..670f78d9d4 100644
--- a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReader.smali
+++ b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReader.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lorg/webrtc/FileVideoCapturer$VideoReader;
 .super Ljava/lang/Object;
+.source "FileVideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReaderY4M.smali b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReaderY4M.smali
index 301578135c..50301df223 100644
--- a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReaderY4M.smali
+++ b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer$VideoReaderY4M.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/FileVideoCapturer$VideoReaderY4M;
 .super Ljava/lang/Object;
+.source "FileVideoCapturer.java"
 
 # interfaces
 .implements Lorg/webrtc/FileVideoCapturer$VideoReader;
@@ -275,6 +276,8 @@
     invoke-direct {v0, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 
@@ -338,29 +341,27 @@
 
     iget v6, p0, Lorg/webrtc/FileVideoCapturer$VideoReaderY4M;->frameHeight:I
 
-    add-int/lit8 v6, v6, 0x1
+    add-int/lit8 v7, v6, 0x1
 
-    div-int/lit8 v6, v6, 0x2
-
-    iget v7, p0, Lorg/webrtc/FileVideoCapturer$VideoReaderY4M;->frameHeight:I
+    div-int/lit8 v7, v7, 0x2
 
     invoke-virtual {v2}, Lorg/webrtc/JavaI420Buffer;->getStrideY()I
 
     move-result v8
 
-    mul-int v7, v7, v8
+    mul-int v6, v6, v8
 
     invoke-virtual {v2}, Lorg/webrtc/JavaI420Buffer;->getStrideU()I
 
     move-result v8
 
-    mul-int v8, v8, v6
+    mul-int v8, v8, v7
 
     invoke-virtual {v2}, Lorg/webrtc/JavaI420Buffer;->getStrideV()I
 
     move-result v9
 
-    mul-int v6, v6, v9
+    mul-int v7, v7, v9
 
     const/4 v9, 0x6
 
@@ -430,19 +431,19 @@
 
     move-result v3
 
-    invoke-virtual {v9, v10, v3, v7}, Ljava/io/RandomAccessFile;->readFully([BII)V
+    invoke-virtual {v9, v10, v3, v6}, Ljava/io/RandomAccessFile;->readFully([BII)V
 
     iget-object v3, p0, Lorg/webrtc/FileVideoCapturer$VideoReaderY4M;->mediaFileStream:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v4}, Ljava/nio/ByteBuffer;->array()[B
 
-    move-result-object v7
+    move-result-object v6
 
     invoke-virtual {v4}, Ljava/nio/ByteBuffer;->arrayOffset()I
 
     move-result v4
 
-    invoke-virtual {v3, v7, v4, v8}, Ljava/io/RandomAccessFile;->readFully([BII)V
+    invoke-virtual {v3, v6, v4, v8}, Ljava/io/RandomAccessFile;->readFully([BII)V
 
     iget-object v3, p0, Lorg/webrtc/FileVideoCapturer$VideoReaderY4M;->mediaFileStream:Ljava/io/RandomAccessFile;
 
@@ -454,7 +455,7 @@
 
     move-result v5
 
-    invoke-virtual {v3, v4, v5, v6}, Ljava/io/RandomAccessFile;->readFully([BII)V
+    invoke-virtual {v3, v4, v5, v7}, Ljava/io/RandomAccessFile;->readFully([BII)V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer.smali b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer.smali
index 5f2bee93af..7661e42393 100644
--- a/com.discord/smali_classes2/org/webrtc/FileVideoCapturer.smali
+++ b/com.discord/smali_classes2/org/webrtc/FileVideoCapturer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/FileVideoCapturer;
 .super Ljava/lang/Object;
+.source "FileVideoCapturer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoCapturer;
diff --git a/com.discord/smali_classes2/org/webrtc/FramerateBitrateAdjuster.smali b/com.discord/smali_classes2/org/webrtc/FramerateBitrateAdjuster.smali
index cb6e2a8fbd..16d1acba8f 100644
--- a/com.discord/smali_classes2/org/webrtc/FramerateBitrateAdjuster.smali
+++ b/com.discord/smali_classes2/org/webrtc/FramerateBitrateAdjuster.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/FramerateBitrateAdjuster;
 .super Lorg/webrtc/BaseBitrateAdjuster;
+.source "FramerateBitrateAdjuster.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/org/webrtc/GlRectDrawer$Shader.smali b/com.discord/smali_classes2/org/webrtc/GlRectDrawer$Shader.smali
index 53b17a165a..a052d12b2b 100644
--- a/com.discord/smali_classes2/org/webrtc/GlRectDrawer$Shader.smali
+++ b/com.discord/smali_classes2/org/webrtc/GlRectDrawer$Shader.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/GlRectDrawer$Shader;
 .super Ljava/lang/Object;
+.source "GlRectDrawer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/GlRectDrawer.smali b/com.discord/smali_classes2/org/webrtc/GlRectDrawer.smali
index daeb7cc27f..cc827c3e51 100644
--- a/com.discord/smali_classes2/org/webrtc/GlRectDrawer.smali
+++ b/com.discord/smali_classes2/org/webrtc/GlRectDrawer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/GlRectDrawer;
 .super Ljava/lang/Object;
+.source "GlRectDrawer.java"
 
 # interfaces
 .implements Lorg/webrtc/RendererCommon$GlDrawer;
@@ -148,7 +149,7 @@
 
     check-cast p1, Lorg/webrtc/GlRectDrawer$Shader;
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     new-instance v0, Lorg/webrtc/GlRectDrawer$Shader;
@@ -203,7 +204,7 @@
 
     invoke-static {p1, v4}, Landroid/opengl/GLES20;->glUniform1i(II)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const-string v3, "precision mediump float;\nvarying vec2 interp_tc;\n\nuniform sampler2D rgb_tex;\n\nvoid main() {\n  gl_FragColor = texture2D(rgb_tex, interp_tc);\n}\n"
@@ -218,14 +219,13 @@
 
     const-string v3, "rgb_tex"
 
-    :goto_0
     invoke-virtual {p1, v3}, Lorg/webrtc/GlShader;->getUniformLocation(Ljava/lang/String;)I
 
     move-result p1
 
     invoke-static {p1, v2}, Landroid/opengl/GLES20;->glUniform1i(II)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const-string v3, "#extension GL_OES_EGL_image_external : require\nprecision mediump float;\nvarying vec2 interp_tc;\n\nuniform samplerExternalOES oes_tex;\n\nvoid main() {\n  gl_FragColor = texture2D(oes_tex, interp_tc);\n}\n"
@@ -240,9 +240,13 @@
 
     const-string v3, "oes_tex"
 
-    goto :goto_0
+    invoke-virtual {p1, v3}, Lorg/webrtc/GlShader;->getUniformLocation(Ljava/lang/String;)I
 
-    :goto_1
+    move-result p1
+
+    invoke-static {p1, v2}, Landroid/opengl/GLES20;->glUniform1i(II)V
+
+    :goto_0
     const-string p1, "Initialize fragment shader uniform values."
 
     invoke-static {p1}, Lorg/webrtc/GlUtil;->checkNoGLES2Error(Ljava/lang/String;)V
@@ -265,7 +269,7 @@
 
     move-object p1, v0
 
-    :goto_2
+    :goto_1
     iget-object v0, p1, Lorg/webrtc/GlRectDrawer$Shader;->glShader:Lorg/webrtc/GlShader;
 
     invoke-virtual {v0}, Lorg/webrtc/GlShader;->useProgram()V
diff --git a/com.discord/smali_classes2/org/webrtc/GlShader.smali b/com.discord/smali_classes2/org/webrtc/GlShader.smali
index 33e19746a0..30a0b6be0b 100644
--- a/com.discord/smali_classes2/org/webrtc/GlShader.smali
+++ b/com.discord/smali_classes2/org/webrtc/GlShader.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/GlShader;
 .super Ljava/lang/Object;
+.source "GlShader.java"
 
 
 # static fields
@@ -38,8 +39,6 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lorg/webrtc/GlShader;->program:I
-
     invoke-static {v0, p1}, Landroid/opengl/GLES20;->glAttachShader(II)V
 
     iget v0, p0, Lorg/webrtc/GlShader;->program:I
@@ -244,8 +243,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lorg/webrtc/GlShader;->program:I
-
     invoke-static {v0, p1}, Landroid/opengl/GLES20;->glGetAttribLocation(ILjava/lang/String;)I
 
     move-result v0
@@ -296,8 +293,6 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lorg/webrtc/GlShader;->program:I
-
     invoke-static {v0, p1}, Landroid/opengl/GLES20;->glGetUniformLocation(ILjava/lang/String;)I
 
     move-result v0
@@ -354,8 +349,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lorg/webrtc/GlShader;->program:I
-
     invoke-static {v0}, Landroid/opengl/GLES20;->glDeleteProgram(I)V
 
     iput v1, p0, Lorg/webrtc/GlShader;->program:I
@@ -426,8 +419,6 @@
 
     if-eq v0, v1, :cond_0
 
-    iget v0, p0, Lorg/webrtc/GlShader;->program:I
-
     invoke-static {v0}, Landroid/opengl/GLES20;->glUseProgram(I)V
 
     const-string v0, "glUseProgram"
diff --git a/com.discord/smali_classes2/org/webrtc/GlTextureFrameBuffer.smali b/com.discord/smali_classes2/org/webrtc/GlTextureFrameBuffer.smali
index 10857299d1..d933c0e895 100644
--- a/com.discord/smali_classes2/org/webrtc/GlTextureFrameBuffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/GlTextureFrameBuffer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/GlTextureFrameBuffer;
 .super Ljava/lang/Object;
+.source "GlTextureFrameBuffer.java"
 
 
 # instance fields
@@ -175,16 +176,16 @@
 
     const/4 v3, 0x0
 
-    iget v4, p0, Lorg/webrtc/GlTextureFrameBuffer;->pixelFormat:I
+    iget v8, p0, Lorg/webrtc/GlTextureFrameBuffer;->pixelFormat:I
 
     const/4 v7, 0x0
 
-    iget v8, p0, Lorg/webrtc/GlTextureFrameBuffer;->pixelFormat:I
-
     const/16 v9, 0x1401
 
     const/4 v10, 0x0
 
+    move v4, v8
+
     move v5, p1
 
     move v6, p2
diff --git a/com.discord/smali_classes2/org/webrtc/GlUtil.smali b/com.discord/smali_classes2/org/webrtc/GlUtil.smali
index 33f583dd70..60962ddb54 100644
--- a/com.discord/smali_classes2/org/webrtc/GlUtil.smali
+++ b/com.discord/smali_classes2/org/webrtc/GlUtil.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/GlUtil;
 .super Ljava/lang/Object;
+.source "GlUtil.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$1.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$1.smali
index ecbeb2d0ff..026b245c9e 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/HardwareVideoDecoder$1;
 .super Ljava/lang/Thread;
+.source "HardwareVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$DecodedTextureMetadata.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$DecodedTextureMetadata.smali
index f8575bed18..f0e7d8e3a6 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$DecodedTextureMetadata.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$DecodedTextureMetadata.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/HardwareVideoDecoder$DecodedTextureMetadata;
 .super Ljava/lang/Object;
+.source "HardwareVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$FrameInfo.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$FrameInfo.smali
index cfac70aa20..4d73197645 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$FrameInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder$FrameInfo.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/HardwareVideoDecoder$FrameInfo;
 .super Ljava/lang/Object;
+.source "HardwareVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder.smali
index c3ef8270e9..30920852d8 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/HardwareVideoDecoder;
 .super Ljava/lang/Object;
+.source "HardwareVideoDecoder.java"
 
 # interfaces
 .implements Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
@@ -486,7 +487,7 @@
 .end method
 
 .method private deliverDecodedFrame()V
-    .locals 8
+    .locals 7
 
     iget-object v0, p0, Lorg/webrtc/HardwareVideoDecoder;->outputThreadChecker:Lorg/webrtc/ThreadUtils$ThreadChecker;
 
@@ -559,8 +560,6 @@
 
     iget-wide v5, v2, Lorg/webrtc/HardwareVideoDecoder$FrameInfo;->decodeStartTimeMs:J
 
-    const/4 v7, 0x0
-
     sub-long/2addr v3, v5
 
     long-to-int v3, v3
@@ -1782,11 +1781,9 @@
 
     if-eqz p2, :cond_0
 
-    const-string p2, "decoder-texture-thread"
+    const-string v0, "decoder-texture-thread"
 
-    iget-object v0, p0, Lorg/webrtc/HardwareVideoDecoder;->sharedContext:Lorg/webrtc/EglBase$Context;
-
-    invoke-static {p2, v0}, Lorg/webrtc/SurfaceTextureHelper;->create(Ljava/lang/String;Lorg/webrtc/EglBase$Context;)Lorg/webrtc/SurfaceTextureHelper;
+    invoke-static {v0, p2}, Lorg/webrtc/SurfaceTextureHelper;->create(Ljava/lang/String;Lorg/webrtc/EglBase$Context;)Lorg/webrtc/SurfaceTextureHelper;
 
     move-result-object p2
 
@@ -1933,8 +1930,6 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lorg/webrtc/HardwareVideoDecoder;->surface:Landroid/view/Surface;
-
     invoke-virtual {v1}, Landroid/view/Surface;->release()V
 
     iput-object v2, p0, Lorg/webrtc/HardwareVideoDecoder;->surface:Landroid/view/Surface;
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory$1.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory$1.smali
index 80fc3b3830..d9c4a56c20 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/HardwareVideoDecoderFactory$1;
 .super Ljava/lang/Object;
+.source "HardwareVideoDecoderFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory.smali
index f31828a1c3..662033beeb 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoDecoderFactory.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/HardwareVideoDecoderFactory;
 .super Ljava/lang/Object;
+.source "HardwareVideoDecoderFactory.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoDecoderFactory;
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$1.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$1.smali
index d30ff1a415..1f2328ac3c 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/HardwareVideoEncoder$1;
 .super Ljava/lang/Thread;
+.source "HardwareVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$1.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$1.smali
index 71127d55e7..f04e6f79e4 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$1.smali
@@ -1,5 +1,6 @@
 .class final enum Lorg/webrtc/HardwareVideoEncoder$YuvFormat$1;
 .super Lorg/webrtc/HardwareVideoEncoder$YuvFormat;
+.source "HardwareVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$2.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$2.smali
index 5bdcc98dac..c27fb29965 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat$2.smali
@@ -1,5 +1,6 @@
 .class final enum Lorg/webrtc/HardwareVideoEncoder$YuvFormat$2;
 .super Lorg/webrtc/HardwareVideoEncoder$YuvFormat;
+.source "HardwareVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat.smali
index a4b47e6b7e..b405b15d88 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder$YuvFormat.smali
@@ -1,5 +1,6 @@
 .class abstract enum Lorg/webrtc/HardwareVideoEncoder$YuvFormat;
 .super Ljava/lang/Enum;
+.source "HardwareVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali
index 699327aa4a..197c49ceee 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/HardwareVideoEncoder;
 .super Ljava/lang/Object;
+.source "HardwareVideoEncoder.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoEncoder;
@@ -1192,15 +1193,13 @@
 
     if-lez v4, :cond_0
 
-    iget-wide v0, p0, Lorg/webrtc/HardwareVideoEncoder;->lastKeyFrameNs:J
+    iget-wide v2, p0, Lorg/webrtc/HardwareVideoEncoder;->lastKeyFrameNs:J
 
-    iget-wide v2, p0, Lorg/webrtc/HardwareVideoEncoder;->forcedKeyFrameNs:J
+    add-long/2addr v2, v0
 
-    add-long/2addr v0, v2
+    cmp-long v0, p1, v2
 
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_0
+    if-lez v0, :cond_0
 
     const/4 p1, 0x1
 
@@ -1650,11 +1649,9 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iput-boolean v0, p0, Lorg/webrtc/HardwareVideoEncoder;->running:Z
-
-    iget-object v0, p0, Lorg/webrtc/HardwareVideoEncoder;->outputThread:Ljava/lang/Thread;
+    iput-boolean v1, p0, Lorg/webrtc/HardwareVideoEncoder;->running:Z
 
     const-wide/16 v1, 0x1388
 
@@ -1709,8 +1706,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/webrtc/HardwareVideoEncoder;->textureEglBase:Lorg/webrtc/EglBase14;
-
     invoke-virtual {v1}, Lorg/webrtc/EglBase14;->release()V
 
     iput-object v2, p0, Lorg/webrtc/HardwareVideoEncoder;->textureEglBase:Lorg/webrtc/EglBase14;
@@ -1720,8 +1715,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lorg/webrtc/HardwareVideoEncoder;->textureInputSurface:Landroid/view/Surface;
-
     invoke-virtual {v1}, Landroid/view/Surface;->release()V
 
     iput-object v2, p0, Lorg/webrtc/HardwareVideoEncoder;->textureInputSurface:Landroid/view/Surface;
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory$1.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory$1.smali
index 0e445fc6f5..c53a867bb2 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/HardwareVideoEncoderFactory$1;
 .super Ljava/lang/Object;
+.source "HardwareVideoEncoderFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory.smali
index 4fa98a0428..167d93c96f 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoderFactory.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/HardwareVideoEncoderFactory;
 .super Ljava/lang/Object;
+.source "HardwareVideoEncoderFactory.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoEncoderFactory;
@@ -97,10 +98,9 @@
 
     check-cast p1, Lorg/webrtc/EglBase14$Context;
 
-    :goto_0
     iput-object p1, p0, Lorg/webrtc/HardwareVideoEncoderFactory;->sharedContext:Lorg/webrtc/EglBase14$Context;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const-string p1, "HardwareVideoEncoderFactory"
@@ -111,9 +111,9 @@
 
     const/4 p1, 0x0
 
-    goto :goto_0
+    iput-object p1, p0, Lorg/webrtc/HardwareVideoEncoderFactory;->sharedContext:Lorg/webrtc/EglBase14$Context;
 
-    :goto_1
+    :goto_0
     iput-boolean p2, p0, Lorg/webrtc/HardwareVideoEncoderFactory;->enableIntelVp8Encoder:Z
 
     iput-boolean p3, p0, Lorg/webrtc/HardwareVideoEncoderFactory;->enableH264HighProfile:Z
@@ -188,7 +188,7 @@
     :try_start_0
     invoke-static {v0}, Landroid/media/MediaCodecList;->getCodecInfoAt(I)Landroid/media/MediaCodecInfo;
 
-    move-result-object v1
+    move-result-object v2
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -203,24 +203,22 @@
 
     invoke-static {v3, v4, v1}, Lorg/webrtc/Logging;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    move-object v1, v2
-
     :goto_1
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2}, Landroid/media/MediaCodecInfo;->isEncoder()Z
+
+    move-result v1
+
     if-eqz v1, :cond_0
 
-    invoke-virtual {v1}, Landroid/media/MediaCodecInfo;->isEncoder()Z
+    invoke-direct {p0, v2, p1}, Lorg/webrtc/HardwareVideoEncoderFactory;->isSupportedCodec(Landroid/media/MediaCodecInfo;Lorg/webrtc/VideoCodecType;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-direct {p0, v1, p1}, Lorg/webrtc/HardwareVideoEncoderFactory;->isSupportedCodec(Landroid/media/MediaCodecInfo;Lorg/webrtc/VideoCodecType;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    return-object v1
+    return-object v2
 
     :cond_0
     add-int/lit8 v0, v0, 0x1
@@ -368,6 +366,8 @@
 
     if-le p1, p2, :cond_3
 
+    return v0
+
     :cond_2
     :goto_0
     return v0
diff --git a/com.discord/smali_classes2/org/webrtc/Histogram.smali b/com.discord/smali_classes2/org/webrtc/Histogram.smali
index c865e8c3a0..23db5de932 100644
--- a/com.discord/smali_classes2/org/webrtc/Histogram.smali
+++ b/com.discord/smali_classes2/org/webrtc/Histogram.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/Histogram;
 .super Ljava/lang/Object;
+.source "Histogram.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/IceCandidate.smali b/com.discord/smali_classes2/org/webrtc/IceCandidate.smali
index 2fd204922b..2e73d33364 100644
--- a/com.discord/smali_classes2/org/webrtc/IceCandidate.smali
+++ b/com.discord/smali_classes2/org/webrtc/IceCandidate.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/IceCandidate;
 .super Ljava/lang/Object;
+.source "IceCandidate.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali b/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali
index e3b5501ff2..68d7b5f977 100644
--- a/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/JavaI420Buffer;
 .super Ljava/lang/Object;
+.source "JavaI420Buffer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoFrame$I420Buffer;
@@ -153,25 +154,25 @@
 
     invoke-virtual {p2}, Ljava/nio/ByteBuffer;->isDirect()Z
 
-    move-result v4
+    move-result v0
 
-    if-eqz v4, :cond_3
+    if-eqz v0, :cond_3
 
     invoke-virtual {p4}, Ljava/nio/ByteBuffer;->isDirect()Z
 
-    move-result v4
+    move-result v0
 
-    if-eqz v4, :cond_3
+    if-eqz v0, :cond_3
 
     invoke-virtual/range {p6 .. p6}, Ljava/nio/ByteBuffer;->isDirect()Z
 
-    move-result v4
+    move-result v0
 
-    if-eqz v4, :cond_3
+    if-eqz v0, :cond_3
 
     invoke-virtual {p2}, Ljava/nio/ByteBuffer;->slice()Ljava/nio/ByteBuffer;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-virtual {p4}, Ljava/nio/ByteBuffer;->slice()Ljava/nio/ByteBuffer;
 
@@ -187,21 +188,21 @@
 
     mul-int v1, p3, p1
 
-    mul-int v3, p5, v0
+    mul-int v2, p5, v0
 
     mul-int v0, v0, p7
 
-    invoke-virtual {v4}, Ljava/nio/ByteBuffer;->capacity()I
+    invoke-virtual {v3}, Ljava/nio/ByteBuffer;->capacity()I
 
-    move-result v10
+    move-result v4
 
-    if-lt v10, v1, :cond_2
+    if-lt v4, v1, :cond_2
 
     invoke-virtual {v5}, Ljava/nio/ByteBuffer;->capacity()I
 
     move-result v1
 
-    if-lt v1, v3, :cond_1
+    if-lt v1, v2, :cond_1
 
     invoke-virtual {v7}, Ljava/nio/ByteBuffer;->capacity()I
 
@@ -217,8 +218,6 @@
 
     move v2, p1
 
-    move-object v3, v4
-
     move v4, p3
 
     move/from16 v6, p5
@@ -259,11 +258,11 @@
 
     new-instance v1, Ljava/lang/StringBuilder;
 
-    const-string v2, "U-buffer must be at least "
+    const-string v3, "U-buffer must be at least "
 
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string v2, " bytes."
 
diff --git a/com.discord/smali_classes2/org/webrtc/JniCommon.smali b/com.discord/smali_classes2/org/webrtc/JniCommon.smali
index 1654810013..fd6f3fb585 100644
--- a/com.discord/smali_classes2/org/webrtc/JniCommon.smali
+++ b/com.discord/smali_classes2/org/webrtc/JniCommon.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/JniCommon;
 .super Ljava/lang/Object;
+.source "JniCommon.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/JniHelper.smali b/com.discord/smali_classes2/org/webrtc/JniHelper.smali
index 2415336cce..894d0a1cf9 100644
--- a/com.discord/smali_classes2/org/webrtc/JniHelper.smali
+++ b/com.discord/smali_classes2/org/webrtc/JniHelper.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/JniHelper;
 .super Ljava/lang/Object;
+.source "JniHelper.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/Logging$1.smali b/com.discord/smali_classes2/org/webrtc/Logging$1.smali
index 8849de101e..e758c9eacc 100644
--- a/com.discord/smali_classes2/org/webrtc/Logging$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/Logging$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/Logging$1;
 .super Ljava/lang/Object;
+.source "Logging.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Logging$ExternalReporter.smali b/com.discord/smali_classes2/org/webrtc/Logging$ExternalReporter.smali
index 2e56cb3daf..3faded1ec5 100644
--- a/com.discord/smali_classes2/org/webrtc/Logging$ExternalReporter.smali
+++ b/com.discord/smali_classes2/org/webrtc/Logging$ExternalReporter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/Logging$ExternalReporter;
 .super Ljava/lang/Object;
+.source "Logging.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Logging$Severity.smali b/com.discord/smali_classes2/org/webrtc/Logging$Severity.smali
index 2171deb440..a70d4d63b4 100644
--- a/com.discord/smali_classes2/org/webrtc/Logging$Severity.smali
+++ b/com.discord/smali_classes2/org/webrtc/Logging$Severity.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/Logging$Severity;
 .super Ljava/lang/Enum;
+.source "Logging.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Logging$TraceLevel.smali b/com.discord/smali_classes2/org/webrtc/Logging$TraceLevel.smali
index 686d09086f..806892a8a9 100644
--- a/com.discord/smali_classes2/org/webrtc/Logging$TraceLevel.smali
+++ b/com.discord/smali_classes2/org/webrtc/Logging$TraceLevel.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/Logging$TraceLevel;
 .super Ljava/lang/Enum;
+.source "Logging.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Logging.smali b/com.discord/smali_classes2/org/webrtc/Logging.smali
index f5ace0c925..92dd6f02bd 100644
--- a/com.discord/smali_classes2/org/webrtc/Logging.smali
+++ b/com.discord/smali_classes2/org/webrtc/Logging.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Logging;
 .super Ljava/lang/Object;
+.source "Logging.java"
 
 
 # annotations
@@ -82,8 +83,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/Logging;->externalReporter:Lorg/webrtc/Logging$ExternalReporter;
-
     const/4 v1, 0x0
 
     invoke-interface {v0, p0, p1, v1}, Lorg/webrtc/Logging$ExternalReporter;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
@@ -119,8 +118,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/Logging;->externalReporter:Lorg/webrtc/Logging$ExternalReporter;
-
     invoke-interface {v0, p0, p1, p2}, Lorg/webrtc/Logging$ExternalReporter;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_0
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecUtils.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecUtils.smali
index 94c79727ba..6fce7d6337 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecUtils.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecUtils.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecUtils;
 .super Ljava/lang/Object;
+.source "MediaCodecUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$1.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$1.smali
index 00ccca54f5..bce2d1647c 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoDecoder$1;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer.smali
index fdf0825bcb..e2f796571b 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer.smali
index 0e97a774e3..4c739e6c8e 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecoderProperties.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecoderProperties.smali
index da152ffda9..67ddddb9d4 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecoderProperties.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$DecoderProperties.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoDecoder$DecoderProperties;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$MediaCodecVideoDecoderErrorCallback.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$MediaCodecVideoDecoderErrorCallback.smali
index 2198b8aa49..5f47933435 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$MediaCodecVideoDecoderErrorCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$MediaCodecVideoDecoderErrorCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/MediaCodecVideoDecoder$MediaCodecVideoDecoderErrorCallback;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TextureListener.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TextureListener.smali
index bb38666df6..cbb1fb6bca 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TextureListener.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TextureListener.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoDecoder$TextureListener;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 # interfaces
 .implements Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
@@ -222,8 +223,6 @@
 
     move-result-wide v14
 
-    const/4 v5, 0x0
-
     sub-long v14, v3, v14
 
     move-object v3, v0
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TimeStamps.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TimeStamps.smali
index 5839e60ab5..0a277ed364 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TimeStamps.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$TimeStamps.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoDecoder$TimeStamps;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$VideoCodecType.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$VideoCodecType.smali
index a09a6b516a..9ab595016a 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$VideoCodecType.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$VideoCodecType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/MediaCodecVideoDecoder$VideoCodecType;
 .super Ljava/lang/Enum;
+.source "MediaCodecVideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali
index 186902582b..f73ae7d626 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaCodecVideoDecoder;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoDecoder.java"
 
 
 # annotations
@@ -351,6 +352,8 @@
 
     invoke-virtual {v1, v0, v2}, Landroid/media/MediaCodec;->releaseOutputBuffer(IZ)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
@@ -1091,7 +1094,6 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    :goto_1
     invoke-static {v2}, Lorg/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer;->access$100(Lorg/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer;)J
 
     move-result-wide v4
@@ -1112,7 +1114,7 @@
 
     invoke-static {v1, v3}, Lorg/webrtc/Logging;->w(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
     const-string v1, "MediaCodecVideoDecoder"
@@ -1135,9 +1137,27 @@
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    goto :goto_1
+    invoke-static {v2}, Lorg/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer;->access$100(Lorg/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer;)J
 
-    :goto_2
+    move-result-wide v4
+
+    invoke-virtual {v3, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v4, ". Total number of dropped frames: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v4, v0, Lorg/webrtc/MediaCodecVideoDecoder;->droppedFrames:I
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v1, v3}, Lorg/webrtc/Logging;->w(Ljava/lang/String;Ljava/lang/String;)V
+
+    :goto_1
     iget-object v1, v0, Lorg/webrtc/MediaCodecVideoDecoder;->mediaCodec:Landroid/media/MediaCodec;
 
     invoke-static {v2}, Lorg/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer;->access$900(Lorg/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer;)I
@@ -2060,16 +2080,10 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/MediaCodecVideoDecoder;->runningInstance:Lorg/webrtc/MediaCodecVideoDecoder;
-
     iget-object v0, v0, Lorg/webrtc/MediaCodecVideoDecoder;->mediaCodecThread:Ljava/lang/Thread;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/MediaCodecVideoDecoder;->runningInstance:Lorg/webrtc/MediaCodecVideoDecoder;
-
-    iget-object v0, v0, Lorg/webrtc/MediaCodecVideoDecoder;->mediaCodecThread:Ljava/lang/Thread;
-
     invoke-virtual {v0}, Ljava/lang/Thread;->getStackTrace()[Ljava/lang/StackTraceElement;
 
     move-result-object v0
@@ -2121,29 +2135,29 @@
     const/4 v9, 0x0
 
     :try_start_0
-    iget-object v2, v1, Lorg/webrtc/MediaCodecVideoDecoder;->inputBuffers:[Ljava/nio/ByteBuffer;
+    iget-object v0, v1, Lorg/webrtc/MediaCodecVideoDecoder;->inputBuffers:[Ljava/nio/ByteBuffer;
 
-    aget-object v2, v2, p1
+    aget-object v0, v0, p1
 
-    invoke-virtual {v2, v9}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+    invoke-virtual {v0, v9}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object v2, v1, Lorg/webrtc/MediaCodecVideoDecoder;->inputBuffers:[Ljava/nio/ByteBuffer;
+    iget-object v0, v1, Lorg/webrtc/MediaCodecVideoDecoder;->inputBuffers:[Ljava/nio/ByteBuffer;
 
-    aget-object v2, v2, p1
+    aget-object v0, v0, p1
 
     move/from16 v5, p2
 
-    invoke-virtual {v2, v5}, Ljava/nio/ByteBuffer;->limit(I)Ljava/nio/Buffer;
+    invoke-virtual {v0, v5}, Ljava/nio/ByteBuffer;->limit(I)Ljava/nio/Buffer;
 
-    iget-object v2, v1, Lorg/webrtc/MediaCodecVideoDecoder;->decodeStartTimeMs:Ljava/util/Queue;
+    iget-object v0, v1, Lorg/webrtc/MediaCodecVideoDecoder;->decodeStartTimeMs:Ljava/util/Queue;
 
-    new-instance v3, Lorg/webrtc/MediaCodecVideoDecoder$TimeStamps;
+    new-instance v2, Lorg/webrtc/MediaCodecVideoDecoder$TimeStamps;
 
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
     move-result-wide v11
 
-    move-object v10, v3
+    move-object v10, v2
 
     move-wide/from16 v13, p5
 
@@ -2151,7 +2165,7 @@
 
     invoke-direct/range {v10 .. v16}, Lorg/webrtc/MediaCodecVideoDecoder$TimeStamps;-><init>(JJJ)V
 
-    invoke-interface {v2, v3}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v2}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
     iget-object v2, v1, Lorg/webrtc/MediaCodecVideoDecoder;->mediaCodec:Landroid/media/MediaCodec;
 
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1.smali
index 99f5270631..2084176418 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoEncoder$1;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoEncoder.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1CaughtException.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1CaughtException.smali
index 66eab9dfe3..55e7e51836 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1CaughtException.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$1CaughtException.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoEncoder$1CaughtException;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType.smali
index 56a9fd128e..5e37f14653 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType;
 .super Ljava/lang/Enum;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$EncoderProperties.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$EncoderProperties.smali
index 2dcd59aa76..71cc541005 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$EncoderProperties.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$EncoderProperties.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaCodecVideoEncoder$EncoderProperties;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$H264Profile.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$H264Profile.smali
index 523d3cb446..ed0b06f937 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$H264Profile.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$H264Profile.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/MediaCodecVideoEncoder$H264Profile;
 .super Ljava/lang/Enum;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecProperties.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecProperties.smali
index 1c59852b36..efce21123b 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecProperties.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecProperties.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecVideoEncoderErrorCallback.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecVideoEncoderErrorCallback.smali
index 5735ccfc67..0671739332 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecVideoEncoderErrorCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$MediaCodecVideoEncoderErrorCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecVideoEncoderErrorCallback;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo.smali
index 3fa952bab9..321272657b 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/MediaCodecVideoEncoder$OutputBufferInfo;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$VideoCodecType.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$VideoCodecType.smali
index 6ec0f8efee..336727260a 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$VideoCodecType.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder$VideoCodecType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;
 .super Ljava/lang/Enum;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali
index d44e6b2aec..a8073219b9 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaCodecVideoEncoder;
 .super Ljava/lang/Object;
+.source "MediaCodecVideoEncoder.java"
 
 
 # annotations
@@ -1168,16 +1169,10 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/MediaCodecVideoEncoder;->runningInstance:Lorg/webrtc/MediaCodecVideoEncoder;
-
     iget-object v0, v0, Lorg/webrtc/MediaCodecVideoEncoder;->mediaCodecThread:Ljava/lang/Thread;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/MediaCodecVideoEncoder;->runningInstance:Lorg/webrtc/MediaCodecVideoEncoder;
-
-    iget-object v0, v0, Lorg/webrtc/MediaCodecVideoEncoder;->mediaCodecThread:Ljava/lang/Thread;
-
     invoke-virtual {v0}, Ljava/lang/Thread;->getStackTrace()[Ljava/lang/StackTraceElement;
 
     move-result-object v0
@@ -1218,11 +1213,11 @@
 .end method
 
 .method private reportEncodedFrame(I)V
-    .locals 8
+    .locals 10
 
     iget v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetFps:I
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     iget-object v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAdjustmentType:Lorg/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType;
 
@@ -1230,7 +1225,7 @@
 
     if-eq v0, v1, :cond_0
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
     iget v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetBitrateBps:I
@@ -1241,25 +1236,25 @@
 
     iget v4, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetFps:I
 
-    int-to-double v4, v4
+    int-to-double v5, v4
 
-    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static {v5, v6}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v4, v4, v2
+    mul-double v5, v5, v2
 
     invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
 
-    div-double/2addr v0, v4
+    div-double/2addr v0, v5
 
     iget-wide v2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
 
-    int-to-double v4, p1
+    int-to-double v5, p1
 
-    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static {v5, v6}, Ljava/lang/Double;->isNaN(D)Z
 
-    sub-double/2addr v4, v0
+    sub-double/2addr v5, v0
 
-    add-double/2addr v2, v4
+    add-double/2addr v2, v5
 
     iput-wide v2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
 
@@ -1267,9 +1262,7 @@
 
     const-wide v2, 0x408f400000000000L    # 1000.0
 
-    iget p1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetFps:I
-
-    int-to-double v4, p1
+    int-to-double v4, v4
 
     invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
 
@@ -1363,10 +1356,6 @@
 
     if-lez v7, :cond_1
 
-    iget-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
-
-    iget-wide v2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulatorMax:D
-
     div-double/2addr v0, v2
 
     add-double/2addr v0, v5
@@ -1379,30 +1368,19 @@
 
     iput v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAdjustmentScaleExp:I
 
-    iget-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulatorMax:D
+    iput-wide v2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
 
-    :goto_0
-    iput-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    iget-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
+    neg-double v7, v2
 
-    iget-wide v2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulatorMax:D
+    cmpg-double v9, v0, v7
 
-    neg-double v2, v2
-
-    cmpg-double v7, v0, v2
-
-    if-gez v7, :cond_2
-
-    iget-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
+    if-gez v9, :cond_2
 
     neg-double v0, v0
 
-    iget-wide v2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulatorMax:D
-
     div-double/2addr v0, v2
 
     add-double/2addr v0, v5
@@ -1415,16 +1393,16 @@
 
     iput v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAdjustmentScaleExp:I
 
-    iget-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulatorMax:D
+    neg-double v0, v2
 
-    neg-double v0, v0
+    iput-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
 
     goto :goto_0
 
     :cond_2
     const/4 v4, 0x0
 
-    :goto_1
+    :goto_0
     if-eqz v4, :cond_3
 
     iget p1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAdjustmentScaleExp:I
@@ -1491,7 +1469,10 @@
     iput-wide v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateObservationTimeMs:D
 
     :cond_4
-    :goto_2
+    return-void
+
+    :cond_5
+    :goto_1
     return-void
 .end method
 
@@ -1510,7 +1491,7 @@
 .end method
 
 .method private setRates(II)Z
-    .locals 5
+    .locals 6
     .annotation build Lorg/webrtc/CalledByNativeUnchecked;
     .end annotation
 
@@ -1538,25 +1519,21 @@
 
     if-lez v3, :cond_0
 
-    iget v3, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetBitrateBps:I
-
     if-ge v0, v3, :cond_0
 
-    iget-wide v3, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
+    iget-wide v4, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
 
     invoke-static {v1, v2}, Ljava/lang/Double;->isNaN(D)Z
 
-    mul-double v3, v3, v1
+    mul-double v4, v4, v1
 
-    iget v1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetBitrateBps:I
-
-    int-to-double v1, v1
+    int-to-double v1, v3
 
     invoke-static {v1, v2}, Ljava/lang/Double;->isNaN(D)Z
 
-    div-double/2addr v3, v1
+    div-double/2addr v4, v1
 
-    iput-wide v3, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
+    iput-wide v4, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulator:D
 
     :cond_0
     iput v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetBitrateBps:I
@@ -1573,13 +1550,11 @@
 
     if-lez p2, :cond_1
 
-    iget p2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetBitrateBps:I
+    iget v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetBitrateBps:I
 
-    mul-int/lit8 p2, p2, 0x1e
+    mul-int/lit8 v0, v0, 0x1e
 
-    iget v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetFps:I
-
-    div-int v0, p2, v0
+    div-int/2addr v0, p2
 
     const-string p2, "MediaCodecVideoEncoder"
 
@@ -1597,7 +1572,6 @@
 
     div-int/lit16 p1, v0, 0x3e8
 
-    :goto_0
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string p1, " kbps. Fps: "
@@ -1614,7 +1588,7 @@
 
     invoke-static {p2, p1}, Lorg/webrtc/Logging;->v(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p2, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAdjustmentType:Lorg/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType;
@@ -1659,21 +1633,19 @@
 
     if-eqz p1, :cond_3
 
-    int-to-double p1, v0
+    int-to-double v0, v0
 
-    iget v0, p0, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAdjustmentScaleExp:I
+    invoke-direct {p0, p1}, Lorg/webrtc/MediaCodecVideoEncoder;->getBitrateScale(I)D
 
-    invoke-direct {p0, v0}, Lorg/webrtc/MediaCodecVideoEncoder;->getBitrateScale(I)D
+    move-result-wide p1
 
-    move-result-wide v0
+    invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
 
-    invoke-static {p1, p2}, Ljava/lang/Double;->isNaN(D)Z
+    mul-double v0, v0, p1
 
-    mul-double p1, p1, v0
+    double-to-int v0, v0
 
-    double-to-int v0, p1
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     const-string p2, "MediaCodecVideoEncoder"
@@ -1684,10 +1656,24 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    goto :goto_0
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string p1, " kbps. Fps: "
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget p1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->targetFps:I
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p2, p1}, Lorg/webrtc/Logging;->v(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_3
-    :goto_1
+    :goto_0
     :try_start_0
     new-instance p1, Landroid/os/Bundle;
 
@@ -1839,9 +1825,7 @@
 
     iget-wide v1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->lastKeyFrameMs:J
 
-    iget-wide v3, p0, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
-
-    add-long/2addr v1, v3
+    add-long/2addr v1, v4
 
     cmp-long v3, p2, v1
 
@@ -1866,19 +1850,18 @@
 
     const-string v1, "Sync frame request"
 
-    :goto_1
     invoke-static {p1, v1}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     const-string p1, "MediaCodecVideoEncoder"
 
     const-string v1, "Sync frame forced"
 
-    goto :goto_1
+    invoke-static {p1, v1}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    :goto_2
+    :goto_1
     new-instance p1, Landroid/os/Bundle;
 
     invoke-direct {p1}, Landroid/os/Bundle;-><init>()V
@@ -2100,9 +2083,14 @@
 
     move-result v1
 
+    move v2, v1
+
+    goto :goto_2
+
     :cond_3
     move v2, v1
 
+    :goto_2
     if-ltz v2, :cond_7
 
     iget-object v1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->outputBuffers:[Ljava/nio/ByteBuffer;
@@ -2135,12 +2123,12 @@
 
     if-eqz v3, :cond_4
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     const/4 v4, 0x0
 
-    :goto_2
+    :goto_3
     if-eqz v4, :cond_5
 
     const-string v3, "MediaCodecVideoEncoder"
@@ -2703,7 +2691,7 @@
 .end method
 
 .method initEncode(Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;IIIIILorg/webrtc/EglBase14$Context;)Z
-    .locals 17
+    .locals 16
     .annotation build Lorg/webrtc/CalledByNativeUnchecked;
     .end annotation
 
@@ -2793,7 +2781,7 @@
 
     iget-object v11, v1, Lorg/webrtc/MediaCodecVideoEncoder;->mediaCodecThread:Ljava/lang/Thread;
 
-    if-nez v11, :cond_12
+    if-nez v11, :cond_13
 
     sget-object v11, Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;->VIDEO_CODEC_VP8:Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;
 
@@ -2811,25 +2799,26 @@
 
     if-eqz v10, :cond_1
 
-    :goto_1
     sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedSurfaceColorList:[I
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedColorList:[I
 
-    :goto_2
+    :goto_1
     invoke-static {v11, v14, v15}, Lorg/webrtc/MediaCodecVideoEncoder;->findHwEncoder(Ljava/lang/String;[Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;[I)Lorg/webrtc/MediaCodecVideoEncoder$EncoderProperties;
 
     move-result-object v11
 
+    const/4 v14, 0x0
+
     goto :goto_6
 
     :cond_2
     sget-object v11, Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;->VIDEO_CODEC_VP9:Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;
 
-    if-ne v0, v11, :cond_3
+    if-ne v0, v11, :cond_4
 
     const-string v2, "video/x-vnd.on2.vp9"
 
@@ -2837,14 +2826,28 @@
 
     sget-object v14, Lorg/webrtc/MediaCodecVideoEncoder;->vp9HwList:[Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;
 
-    if-eqz v10, :cond_1
+    if-eqz v10, :cond_3
 
-    goto :goto_1
+    sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedSurfaceColorList:[I
+
+    goto :goto_2
 
     :cond_3
+    sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedColorList:[I
+
+    :goto_2
+    invoke-static {v11, v14, v15}, Lorg/webrtc/MediaCodecVideoEncoder;->findHwEncoder(Ljava/lang/String;[Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;[I)Lorg/webrtc/MediaCodecVideoEncoder$EncoderProperties;
+
+    move-result-object v11
+
+    const/4 v14, 0x0
+
+    goto :goto_6
+
+    :cond_4
     sget-object v11, Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;->VIDEO_CODEC_H264:Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;
 
-    if-ne v0, v11, :cond_8
+    if-ne v0, v11, :cond_9
 
     const-string v11, "video/avc"
 
@@ -2852,13 +2855,13 @@
 
     sget-object v14, Lorg/webrtc/MediaCodecVideoEncoder;->h264HwList:[Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;
 
-    if-eqz v10, :cond_4
+    if-eqz v10, :cond_5
 
     sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedSurfaceColorList:[I
 
     goto :goto_3
 
-    :cond_4
+    :cond_5
     sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedColorList:[I
 
     :goto_3
@@ -2872,19 +2875,19 @@
 
     move-result v14
 
-    if-ne v2, v14, :cond_7
+    if-ne v2, v14, :cond_8
 
     const-string v2, "video/avc"
 
     sget-object v14, Lorg/webrtc/MediaCodecVideoEncoder;->h264HighProfileHwList:[Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;
 
-    if-eqz v10, :cond_5
+    if-eqz v10, :cond_6
 
     sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedSurfaceColorList:[I
 
     goto :goto_4
 
-    :cond_5
+    :cond_6
     sget-object v15, Lorg/webrtc/MediaCodecVideoEncoder;->supportedColorList:[I
 
     :goto_4
@@ -2892,7 +2895,7 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_6
+    if-eqz v2, :cond_7
 
     const-string v2, "MediaCodecVideoEncoder"
 
@@ -2904,14 +2907,14 @@
 
     goto :goto_5
 
-    :cond_6
+    :cond_7
     const-string v2, "MediaCodecVideoEncoder"
 
     const-string v14, "High profile H.264 encoder requested, but not supported. Use baseline."
 
     invoke-static {v2, v14}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    :cond_7
+    :cond_8
     const/4 v2, 0x0
 
     :goto_5
@@ -2925,20 +2928,19 @@
 
     const/16 v12, 0x14
 
-    goto :goto_7
+    goto :goto_6
 
-    :cond_8
+    :cond_9
     const/4 v2, 0x0
 
     const/4 v11, 0x0
 
     const/4 v12, 0x0
 
-    :goto_6
     const/4 v14, 0x0
 
-    :goto_7
-    if-eqz v11, :cond_11
+    :goto_6
+    if-eqz v11, :cond_12
 
     sput-object v1, Lorg/webrtc/MediaCodecVideoEncoder;->runningInstance:Lorg/webrtc/MediaCodecVideoEncoder;
 
@@ -2956,124 +2958,127 @@
 
     const/16 v13, 0x1e
 
-    if-ne v15, v8, :cond_9
+    if-ne v15, v8, :cond_a
 
-    :goto_8
-    move/from16 v16, v10
+    move v8, v10
 
-    goto :goto_9
+    goto :goto_7
 
-    :cond_9
+    :cond_a
     invoke-static {v6, v13}, Ljava/lang/Math;->min(II)I
 
     move-result v13
 
-    goto :goto_8
+    move v8, v10
 
-    :goto_9
+    :goto_7
     const-wide/16 v9, 0x0
 
     iput-wide v9, v1, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
 
-    const-wide/16 v8, -0x1
+    const-wide/16 v9, -0x1
 
-    iput-wide v8, v1, Lorg/webrtc/MediaCodecVideoEncoder;->lastKeyFrameMs:J
+    iput-wide v9, v1, Lorg/webrtc/MediaCodecVideoEncoder;->lastKeyFrameMs:J
 
-    sget-object v6, Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;->VIDEO_CODEC_VP8:Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;
+    sget-object v9, Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;->VIDEO_CODEC_VP8:Lorg/webrtc/MediaCodecVideoEncoder$VideoCodecType;
 
-    if-ne v0, v6, :cond_d
+    if-ne v0, v9, :cond_e
 
-    iget-object v6, v11, Lorg/webrtc/MediaCodecVideoEncoder$EncoderProperties;->codecName:Ljava/lang/String;
+    iget-object v9, v11, Lorg/webrtc/MediaCodecVideoEncoder$EncoderProperties;->codecName:Ljava/lang/String;
 
-    sget-object v8, Lorg/webrtc/MediaCodecVideoEncoder;->qcomVp8HwProperties:Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;
+    sget-object v10, Lorg/webrtc/MediaCodecVideoEncoder;->qcomVp8HwProperties:Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;
 
-    iget-object v8, v8, Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;->codecPrefix:Ljava/lang/String;
+    iget-object v10, v10, Lorg/webrtc/MediaCodecVideoEncoder$MediaCodecProperties;->codecPrefix:Ljava/lang/String;
 
-    invoke-virtual {v6, v8}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+    invoke-virtual {v9, v10}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
-    move-result v6
+    move-result v9
 
-    if-eqz v6, :cond_d
+    if-eqz v9, :cond_e
 
-    sget v6, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v9, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v8, 0x15
+    const/16 v10, 0x15
 
-    const-wide/16 v9, 0x3a98
+    const-wide/16 v6, 0x3a98
 
-    if-eq v6, v8, :cond_c
+    if-eq v9, v10, :cond_d
 
-    sget v6, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v9, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v8, 0x16
+    const/16 v10, 0x16
 
-    if-ne v6, v8, :cond_a
+    if-ne v9, v10, :cond_b
 
-    goto :goto_a
-
-    :cond_a
-    sget v6, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 v8, 0x17
-
-    if-ne v6, v8, :cond_b
-
-    const-wide/16 v8, 0x4e20
-
-    iput-wide v8, v1, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
-
-    goto :goto_b
+    goto :goto_8
 
     :cond_b
-    sget v6, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v9, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-le v6, v8, :cond_d
+    const/16 v10, 0x17
+
+    if-ne v9, v10, :cond_c
+
+    const-wide/16 v6, 0x4e20
+
+    iput-wide v6, v1, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
+
+    goto :goto_9
 
     :cond_c
-    :goto_a
-    iput-wide v9, v1, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
+    sget v9, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-le v9, v10, :cond_e
+
+    iput-wide v6, v1, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
+
+    goto :goto_9
 
     :cond_d
-    :goto_b
+    :goto_8
+    iput-wide v6, v1, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
+
+    :cond_e
+    :goto_9
     const-string v6, "MediaCodecVideoEncoder"
 
-    new-instance v8, Ljava/lang/StringBuilder;
+    new-instance v7, Ljava/lang/StringBuilder;
 
     const-string v9, "Color format: "
 
-    invoke-direct {v8, v9}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v7, v9}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     iget v9, v1, Lorg/webrtc/MediaCodecVideoEncoder;->colorFormat:I
 
-    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string v9, ". Bitrate adjustment: "
 
-    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     iget-object v9, v1, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAdjustmentType:Lorg/webrtc/MediaCodecVideoEncoder$BitrateAdjustmentType;
 
-    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     const-string v9, ". Key frame interval: "
 
-    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     iget-wide v9, v1, Lorg/webrtc/MediaCodecVideoEncoder;->forcedKeyFrameMs:J
 
-    invoke-virtual {v8, v9, v10}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v9, v10}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     const-string v9, " . Initial fps: "
 
-    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8, v13}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v13}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-static {v6, v8}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     mul-int/lit16 v5, v5, 0x3e8
 
@@ -3085,11 +3090,11 @@
 
     int-to-double v5, v5
 
-    const-wide/high16 v8, 0x4020000000000000L    # 8.0
+    const-wide/high16 v9, 0x4020000000000000L    # 8.0
 
     invoke-static {v5, v6}, Ljava/lang/Double;->isNaN(D)Z
 
-    div-double/2addr v5, v8
+    div-double/2addr v5, v9
 
     iput-wide v5, v1, Lorg/webrtc/MediaCodecVideoEncoder;->bitrateAccumulatorMax:D
 
@@ -3142,7 +3147,7 @@
 
     invoke-virtual {v2, v3, v12}, Landroid/media/MediaFormat;->setInteger(Ljava/lang/String;I)V
 
-    if-eqz v14, :cond_e
+    if-eqz v14, :cond_f
 
     const-string v3, "profile"
 
@@ -3156,7 +3161,7 @@
 
     invoke-virtual {v2, v3, v4}, Landroid/media/MediaFormat;->setInteger(Ljava/lang/String;I)V
 
-    :cond_e
+    :cond_f
     const-string v3, "MediaCodecVideoEncoder"
 
     const-string v4, "  Format: "
@@ -3183,7 +3188,7 @@
 
     iget-object v0, v1, Lorg/webrtc/MediaCodecVideoEncoder;->mediaCodec:Landroid/media/MediaCodec;
 
-    if-nez v0, :cond_f
+    if-nez v0, :cond_10
 
     const-string v0, "MediaCodecVideoEncoder"
 
@@ -3197,7 +3202,7 @@
 
     return v2
 
-    :cond_f
+    :cond_10
     iget-object v0, v1, Lorg/webrtc/MediaCodecVideoEncoder;->mediaCodec:Landroid/media/MediaCodec;
 
     const/4 v3, 0x1
@@ -3206,13 +3211,15 @@
 
     invoke-virtual {v0, v2, v4, v4, v3}, Landroid/media/MediaCodec;->configure(Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V
 
-    if-eqz v16, :cond_10
+    if-eqz v8, :cond_11
 
     new-instance v0, Lorg/webrtc/EglBase14;
 
     sget-object v2, Lorg/webrtc/EglBase;->CONFIG_RECORDABLE:[I
 
-    invoke-direct {v0, v7, v2}, Lorg/webrtc/EglBase14;-><init>(Lorg/webrtc/EglBase14$Context;[I)V
+    move-object/from16 v3, p7
+
+    invoke-direct {v0, v3, v2}, Lorg/webrtc/EglBase14;-><init>(Lorg/webrtc/EglBase14$Context;[I)V
 
     iput-object v0, v1, Lorg/webrtc/MediaCodecVideoEncoder;->eglBase:Lorg/webrtc/EglBase14;
 
@@ -3236,7 +3243,7 @@
 
     iput-object v0, v1, Lorg/webrtc/MediaCodecVideoEncoder;->drawer:Lorg/webrtc/GlRectDrawer;
 
-    :cond_10
+    :cond_11
     iget-object v0, v1, Lorg/webrtc/MediaCodecVideoEncoder;->mediaCodec:Landroid/media/MediaCodec;
 
     invoke-virtual {v0}, Landroid/media/MediaCodec;->start()V
@@ -3290,7 +3297,7 @@
 
     return v2
 
-    :cond_11
+    :cond_12
     new-instance v2, Ljava/lang/RuntimeException;
 
     invoke-static/range {p1 .. p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -3307,7 +3314,7 @@
 
     throw v2
 
-    :cond_12
+    :cond_13
     new-instance v0, Ljava/lang/RuntimeException;
 
     const-string v2, "Forgot to release()?"
@@ -3384,8 +3391,6 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->drawer:Lorg/webrtc/GlRectDrawer;
-
     invoke-virtual {v1}, Lorg/webrtc/GlRectDrawer;->release()V
 
     iput-object v3, p0, Lorg/webrtc/MediaCodecVideoEncoder;->drawer:Lorg/webrtc/GlRectDrawer;
@@ -3395,8 +3400,6 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->eglBase:Lorg/webrtc/EglBase14;
-
     invoke-virtual {v1}, Lorg/webrtc/EglBase14;->release()V
 
     iput-object v3, p0, Lorg/webrtc/MediaCodecVideoEncoder;->eglBase:Lorg/webrtc/EglBase14;
@@ -3406,8 +3409,6 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lorg/webrtc/MediaCodecVideoEncoder;->inputSurface:Landroid/view/Surface;
-
     invoke-virtual {v1}, Landroid/view/Surface;->release()V
 
     iput-object v3, p0, Lorg/webrtc/MediaCodecVideoEncoder;->inputSurface:Landroid/view/Surface;
diff --git a/com.discord/smali_classes2/org/webrtc/MediaConstraints$KeyValuePair.smali b/com.discord/smali_classes2/org/webrtc/MediaConstraints$KeyValuePair.smali
index 9b21b951f0..bb54499c6a 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaConstraints$KeyValuePair.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaConstraints$KeyValuePair.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaConstraints$KeyValuePair;
 .super Ljava/lang/Object;
+.source "MediaConstraints.java"
 
 
 # annotations
@@ -46,7 +47,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -86,6 +87,9 @@
     return v0
 
     :cond_2
+    return v1
+
+    :cond_3
     :goto_0
     return v1
 .end method
diff --git a/com.discord/smali_classes2/org/webrtc/MediaConstraints.smali b/com.discord/smali_classes2/org/webrtc/MediaConstraints.smali
index a232043487..ca77444341 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaConstraints.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaConstraints.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaConstraints;
 .super Ljava/lang/Object;
+.source "MediaConstraints.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaSource$State.smali b/com.discord/smali_classes2/org/webrtc/MediaSource$State.smali
index 565e5956d6..0b794f9dca 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaSource$State.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaSource$State.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/MediaSource$State;
 .super Ljava/lang/Enum;
+.source "MediaSource.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaSource.smali b/com.discord/smali_classes2/org/webrtc/MediaSource.smali
index 279668040d..144468c6b6 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaSource.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaSource.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaSource;
 .super Ljava/lang/Object;
+.source "MediaSource.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaStream.smali b/com.discord/smali_classes2/org/webrtc/MediaStream.smali
index ef91b11092..5b920abb87 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaStream.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaStream.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaStream;
 .super Ljava/lang/Object;
+.source "MediaStream.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$MediaType.smali b/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$MediaType.smali
index c938fd71d7..b2b2b44e14 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$MediaType.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$MediaType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/MediaStreamTrack$MediaType;
 .super Ljava/lang/Enum;
+.source "MediaStreamTrack.java"
 
 
 # annotations
@@ -137,6 +138,8 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public static valueOf(Ljava/lang/String;)Lorg/webrtc/MediaStreamTrack$MediaType;
diff --git a/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$State.smali b/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$State.smali
index b9c329e102..f5f6600aa3 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$State.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaStreamTrack$State.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/MediaStreamTrack$State;
 .super Ljava/lang/Enum;
+.source "MediaStreamTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/MediaStreamTrack.smali b/com.discord/smali_classes2/org/webrtc/MediaStreamTrack.smali
index 2f15d7f197..6a47d7540f 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaStreamTrack.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaStreamTrack.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/MediaStreamTrack;
 .super Ljava/lang/Object;
+.source "MediaStreamTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Metrics$HistogramInfo.smali b/com.discord/smali_classes2/org/webrtc/Metrics$HistogramInfo.smali
index 4a7c5ed6aa..f891abdacd 100644
--- a/com.discord/smali_classes2/org/webrtc/Metrics$HistogramInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/Metrics$HistogramInfo.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Metrics$HistogramInfo;
 .super Ljava/lang/Object;
+.source "Metrics.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Metrics.smali b/com.discord/smali_classes2/org/webrtc/Metrics.smali
index 7bdcccf626..1dd7c3e954 100644
--- a/com.discord/smali_classes2/org/webrtc/Metrics.smali
+++ b/com.discord/smali_classes2/org/webrtc/Metrics.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Metrics;
 .super Ljava/lang/Object;
+.source "Metrics.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NV12Buffer.smali b/com.discord/smali_classes2/org/webrtc/NV12Buffer.smali
index 3a5d099322..69a4b3270e 100644
--- a/com.discord/smali_classes2/org/webrtc/NV12Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/NV12Buffer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/NV12Buffer;
 .super Ljava/lang/Object;
+.source "NV12Buffer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoFrame$Buffer;
@@ -211,10 +212,6 @@
 .method public toI420()Lorg/webrtc/VideoFrame$I420Buffer;
     .locals 7
 
-    iget v3, p0, Lorg/webrtc/NV12Buffer;->width:I
-
-    iget v4, p0, Lorg/webrtc/NV12Buffer;->height:I
-
     iget v5, p0, Lorg/webrtc/NV12Buffer;->width:I
 
     iget v6, p0, Lorg/webrtc/NV12Buffer;->height:I
@@ -225,6 +222,10 @@
 
     move-object v0, p0
 
+    move v3, v5
+
+    move v4, v6
+
     invoke-virtual/range {v0 .. v6}, Lorg/webrtc/NV12Buffer;->cropAndScale(IIIIII)Lorg/webrtc/VideoFrame$Buffer;
 
     move-result-object v0
diff --git a/com.discord/smali_classes2/org/webrtc/NV21Buffer.smali b/com.discord/smali_classes2/org/webrtc/NV21Buffer.smali
index 8ef502f6df..1970dc56a0 100644
--- a/com.discord/smali_classes2/org/webrtc/NV21Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/NV21Buffer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/NV21Buffer;
 .super Ljava/lang/Object;
+.source "NV21Buffer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoFrame$Buffer;
@@ -199,10 +200,6 @@
 .method public toI420()Lorg/webrtc/VideoFrame$I420Buffer;
     .locals 7
 
-    iget v3, p0, Lorg/webrtc/NV21Buffer;->width:I
-
-    iget v4, p0, Lorg/webrtc/NV21Buffer;->height:I
-
     iget v5, p0, Lorg/webrtc/NV21Buffer;->width:I
 
     iget v6, p0, Lorg/webrtc/NV21Buffer;->height:I
@@ -213,6 +210,10 @@
 
     move-object v0, p0
 
+    move v3, v5
+
+    move v4, v6
+
     invoke-virtual/range {v0 .. v6}, Lorg/webrtc/NV21Buffer;->cropAndScale(IIIIII)Lorg/webrtc/VideoFrame$Buffer;
 
     move-result-object v0
diff --git a/com.discord/smali_classes2/org/webrtc/NativeLibrary$DefaultLoader.smali b/com.discord/smali_classes2/org/webrtc/NativeLibrary$DefaultLoader.smali
index fe8369c63b..e316fa2b38 100644
--- a/com.discord/smali_classes2/org/webrtc/NativeLibrary$DefaultLoader.smali
+++ b/com.discord/smali_classes2/org/webrtc/NativeLibrary$DefaultLoader.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NativeLibrary$DefaultLoader;
 .super Ljava/lang/Object;
+.source "NativeLibrary.java"
 
 # interfaces
 .implements Lorg/webrtc/NativeLibraryLoader;
diff --git a/com.discord/smali_classes2/org/webrtc/NativeLibrary.smali b/com.discord/smali_classes2/org/webrtc/NativeLibrary.smali
index 8e27a13e6b..8dadef2b2f 100644
--- a/com.discord/smali_classes2/org/webrtc/NativeLibrary.smali
+++ b/com.discord/smali_classes2/org/webrtc/NativeLibrary.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NativeLibrary;
 .super Ljava/lang/Object;
+.source "NativeLibrary.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NativeLibraryLoader.smali b/com.discord/smali_classes2/org/webrtc/NativeLibraryLoader.smali
index 3b52baf390..b14b8b68b2 100644
--- a/com.discord/smali_classes2/org/webrtc/NativeLibraryLoader.smali
+++ b/com.discord/smali_classes2/org/webrtc/NativeLibraryLoader.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/NativeLibraryLoader;
 .super Ljava/lang/Object;
+.source "NativeLibraryLoader.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/NativePeerConnectionFactory.smali b/com.discord/smali_classes2/org/webrtc/NativePeerConnectionFactory.smali
index cb6015ed99..d295043b21 100644
--- a/com.discord/smali_classes2/org/webrtc/NativePeerConnectionFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/NativePeerConnectionFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/NativePeerConnectionFactory;
 .super Ljava/lang/Object;
+.source "NativePeerConnectionFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitor$1.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitor$1.smali
index fa2d3bd9c2..5187788880 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitor$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitor$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NetworkMonitor$1;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.java"
 
 # interfaces
 .implements Lorg/webrtc/NetworkMonitorAutoDetect$Observer;
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitor$InstanceHolder.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitor$InstanceHolder.smali
index 4435952d30..970fc8bcac 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitor$InstanceHolder.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitor$InstanceHolder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NetworkMonitor$InstanceHolder;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitor$NetworkObserver.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitor$NetworkObserver.smali
index 98c67a7977..af20243745 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitor$NetworkObserver.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitor$NetworkObserver.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/NetworkMonitor$NetworkObserver;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitor.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitor.smali
index 294a0389ad..663c807130 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitor.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitor.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/NetworkMonitor;
 .super Ljava/lang/Object;
+.source "NetworkMonitor.java"
 
 
 # annotations
@@ -629,6 +630,8 @@
 
     invoke-direct {p0, p1, p2, v0}, Lorg/webrtc/NetworkMonitor;->nativeNotifyOfActiveNetworkList(J[Lorg/webrtc/NetworkMonitorAutoDetect$NetworkInformation;)V
 
+    return-void
+
     :cond_2
     :goto_1
     return-void
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$1.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$1.smali
index 6036049570..cb5daa65a2 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/NetworkMonitorAutoDetect$1;
 .super Ljava/lang/Object;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectionType.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectionType.smali
index ba51eae758..67e44977ff 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectionType.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectionType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/NetworkMonitorAutoDetect$ConnectionType;
 .super Ljava/lang/Enum;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate.smali
index 805e38429e..daa9cda4dd 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;
 .super Ljava/lang/Object;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
@@ -75,8 +76,6 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->connectivityManager:Landroid/net/ConnectivityManager;
-
     invoke-virtual {v0, p1}, Landroid/net/ConnectivityManager;->getLinkProperties(Landroid/net/Network;)Landroid/net/LinkProperties;
 
     move-result-object v0
@@ -347,8 +346,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->connectivityManager:Landroid/net/ConnectivityManager;
-
     invoke-virtual {v0}, Landroid/net/ConnectivityManager;->getAllNetworks()[Landroid/net/Network;
 
     move-result-object v0
@@ -535,8 +532,6 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->connectivityManager:Landroid/net/ConnectivityManager;
-
     invoke-virtual {v0}, Landroid/net/ConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;
 
     move-result-object v0
@@ -571,8 +566,6 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->connectivityManager:Landroid/net/ConnectivityManager;
-
     invoke-virtual {v0, p1}, Landroid/net/ConnectivityManager;->getNetworkInfo(Landroid/net/Network;)Landroid/net/NetworkInfo;
 
     move-result-object p1
@@ -644,8 +637,6 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->connectivityManager:Landroid/net/ConnectivityManager;
-
     invoke-virtual {v0, p1}, Landroid/net/ConnectivityManager;->getNetworkCapabilities(Landroid/net/Network;)Landroid/net/NetworkCapabilities;
 
     move-result-object p1
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$IPAddress.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$IPAddress.smali
index fef9f8d866..b002d1d3fe 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$IPAddress.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$IPAddress.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/NetworkMonitorAutoDetect$IPAddress;
 .super Ljava/lang/Object;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkInformation.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkInformation.smali
index 31744343a3..cc66d5683c 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkInformation.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkInformation.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/NetworkMonitorAutoDetect$NetworkInformation;
 .super Ljava/lang/Object;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkState.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkState.smali
index 3e342ab7e5..eeb9656ae8 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkState.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$NetworkState.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NetworkMonitorAutoDetect$NetworkState;
 .super Ljava/lang/Object;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$Observer.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$Observer.smali
index 4d934145fd..4d4f007af6 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$Observer.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$Observer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/NetworkMonitorAutoDetect$Observer;
 .super Ljava/lang/Object;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$SimpleNetworkCallback.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$SimpleNetworkCallback.smali
index 8a1a6a90a1..8f624964f8 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$SimpleNetworkCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$SimpleNetworkCallback.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NetworkMonitorAutoDetect$SimpleNetworkCallback;
 .super Landroid/net/ConnectivityManager$NetworkCallback;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate.smali
index 56e84fb6f4..9840c8c81b 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate;
 .super Landroid/content/BroadcastReceiver;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
@@ -158,6 +159,8 @@
 
     invoke-static {v0, v1, p1}, Lorg/webrtc/Logging;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
+    return-void
+
     :cond_2
     :goto_1
     return-void
@@ -201,8 +204,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate;->wifiP2pNetworkInfo:Lorg/webrtc/NetworkMonitorAutoDetect$NetworkInformation;
-
     invoke-static {v0}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiManagerDelegate.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiManagerDelegate.smali
index 56694202f0..2d7525ec16 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiManagerDelegate.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect$WifiManagerDelegate.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/NetworkMonitorAutoDetect$WifiManagerDelegate;
 .super Ljava/lang/Object;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect.smali b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect.smali
index b2c31c3554..8b3efb582c 100644
--- a/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect.smali
+++ b/com.discord/smali_classes2/org/webrtc/NetworkMonitorAutoDetect.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/NetworkMonitorAutoDetect;
 .super Landroid/content/BroadcastReceiver;
+.source "NetworkMonitorAutoDetect.java"
 
 
 # annotations
@@ -473,30 +474,24 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->connectivityManagerDelegate:Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;
+    iget-object v1, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->connectivityManagerDelegate:Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;
 
-    iget-object v1, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->allNetworkCallback:Landroid/net/ConnectivityManager$NetworkCallback;
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->releaseCallback(Landroid/net/ConnectivityManager$NetworkCallback;)V
+    invoke-virtual {v1, v0}, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->releaseCallback(Landroid/net/ConnectivityManager$NetworkCallback;)V
 
     :cond_0
     iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->mobileNetworkCallback:Landroid/net/ConnectivityManager$NetworkCallback;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->connectivityManagerDelegate:Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;
+    iget-object v1, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->connectivityManagerDelegate:Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;
 
-    iget-object v1, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->mobileNetworkCallback:Landroid/net/ConnectivityManager$NetworkCallback;
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->releaseCallback(Landroid/net/ConnectivityManager$NetworkCallback;)V
+    invoke-virtual {v1, v0}, Lorg/webrtc/NetworkMonitorAutoDetect$ConnectivityManagerDelegate;->releaseCallback(Landroid/net/ConnectivityManager$NetworkCallback;)V
 
     :cond_1
     iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->wifiDirectManagerDelegate:Lorg/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->wifiDirectManagerDelegate:Lorg/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate;
-
     invoke-virtual {v0}, Lorg/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate;->release()V
 
     :cond_2
@@ -537,8 +532,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/webrtc/NetworkMonitorAutoDetect;->wifiDirectManagerDelegate:Lorg/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate;
-
     invoke-virtual {v0}, Lorg/webrtc/NetworkMonitorAutoDetect$WifiDirectManagerDelegate;->getActiveNetworkList()Ljava/util/List;
 
     move-result-object v0
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$1.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$1.smali
index f9f84bdbb2..c16ea327bb 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/PeerConnection$1;
 .super Ljava/lang/Object;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$BundlePolicy.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$BundlePolicy.smali
index 0231f0d9fb..eb4d5db573 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$BundlePolicy.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$BundlePolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$BundlePolicy;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$CandidateNetworkPolicy.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$CandidateNetworkPolicy.smali
index 66c1e2300f..7a28ccd11b 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$CandidateNetworkPolicy.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$CandidateNetworkPolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$CandidateNetworkPolicy;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$ContinualGatheringPolicy.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$ContinualGatheringPolicy.smali
index 353eeffe9e..77de6127ef 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$ContinualGatheringPolicy.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$ContinualGatheringPolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$ContinualGatheringPolicy;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceConnectionState.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceConnectionState.smali
index 6d6b1fad38..88fba8324d 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceConnectionState.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceConnectionState.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$IceConnectionState;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceGatheringState.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceGatheringState.smali
index e63f094292..0a00526ee7 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceGatheringState.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceGatheringState.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$IceGatheringState;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer$Builder.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer$Builder.smali
index ec1efd4f40..fdce55f161 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer$Builder.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer$Builder.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnection$IceServer$Builder;
 .super Ljava/lang/Object;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer.smali
index cfd4fee4a7..f923c10aa6 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceServer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnection$IceServer;
 .super Ljava/lang/Object;
+.source "PeerConnection.java"
 
 
 # annotations
@@ -275,6 +276,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method synthetic constructor <init>(Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lorg/webrtc/PeerConnection$TlsCertPolicy;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lorg/webrtc/PeerConnection$1;)V
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceTransportsType.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceTransportsType.smali
index 279ec81124..0a4d868e64 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$IceTransportsType.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$IceTransportsType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$IceTransportsType;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$IntervalRange.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$IntervalRange.smali
index 2059108009..4130071cbd 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$IntervalRange.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$IntervalRange.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnection$IntervalRange;
 .super Ljava/lang/Object;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$KeyType.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$KeyType.smali
index cf9021b69e..d8326fb64e 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$KeyType.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$KeyType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$KeyType;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$Observer.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$Observer.smali
index 0de35514b9..3d4a9b62e9 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$Observer.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$Observer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/PeerConnection$Observer;
 .super Ljava/lang/Object;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$RTCConfiguration.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$RTCConfiguration.smali
index f663aa4f9d..4b2f794f7d 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$RTCConfiguration.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$RTCConfiguration.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnection$RTCConfiguration;
 .super Ljava/lang/Object;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$RtcpMuxPolicy.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$RtcpMuxPolicy.smali
index 153a11e456..395f72a1ef 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$RtcpMuxPolicy.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$RtcpMuxPolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$RtcpMuxPolicy;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$SignalingState.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$SignalingState.smali
index 57a8f1abc6..c3c1adf095 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$SignalingState.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$SignalingState.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$SignalingState;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$TcpCandidatePolicy.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$TcpCandidatePolicy.smali
index e1c0992c3b..a0a9b562e8 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$TcpCandidatePolicy.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$TcpCandidatePolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$TcpCandidatePolicy;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection$TlsCertPolicy.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection$TlsCertPolicy.smali
index a63ee82a8b..ac509eb594 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection$TlsCertPolicy.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection$TlsCertPolicy.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/PeerConnection$TlsCertPolicy;
 .super Ljava/lang/Enum;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnection.smali b/com.discord/smali_classes2/org/webrtc/PeerConnection.smali
index b2f68a47de..061878700f 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnection.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnection.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnection;
 .super Ljava/lang/Object;
+.source "PeerConnection.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$1.smali b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$1.smali
index 6dc7a3b3a6..d2cf9b4daf 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/PeerConnectionFactory$1;
 .super Ljava/lang/Object;
+.source "PeerConnectionFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions$Builder.smali b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions$Builder.smali
index 2cd8daedf7..cc3b7f895f 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions$Builder.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions$Builder.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnectionFactory$InitializationOptions$Builder;
 .super Ljava/lang/Object;
+.source "PeerConnectionFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions.smali b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions.smali
index e46901b2d1..e2c1b8d6d8 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$InitializationOptions.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnectionFactory$InitializationOptions;
 .super Ljava/lang/Object;
+.source "PeerConnectionFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$Options.smali b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$Options.smali
index bb188fd803..7204cfd9af 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$Options.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory$Options.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnectionFactory$Options;
 .super Ljava/lang/Object;
+.source "PeerConnectionFactory.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory.smali b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory.smali
index ed1339c224..1ebe009a62 100644
--- a/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/PeerConnectionFactory.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/PeerConnectionFactory;
 .super Ljava/lang/Object;
+.source "PeerConnectionFactory.java"
 
 
 # annotations
@@ -665,8 +666,6 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/PeerConnectionFactory;->localEglbase:Lorg/webrtc/EglBase;
-
     invoke-interface {v0}, Lorg/webrtc/EglBase;->getEglBaseContext()Lorg/webrtc/EglBase$Context;
 
     move-result-object v0
@@ -742,8 +741,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/PeerConnectionFactory;->localEglbase:Lorg/webrtc/EglBase;
-
     invoke-interface {v0}, Lorg/webrtc/EglBase;->release()V
 
     :cond_0
@@ -751,8 +748,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/webrtc/PeerConnectionFactory;->remoteEglbase:Lorg/webrtc/EglBase;
-
     invoke-interface {v0}, Lorg/webrtc/EglBase;->release()V
 
     :cond_1
diff --git a/com.discord/smali_classes2/org/webrtc/RTCStats.smali b/com.discord/smali_classes2/org/webrtc/RTCStats.smali
index b4420eb964..ca5b62f3cc 100644
--- a/com.discord/smali_classes2/org/webrtc/RTCStats.smali
+++ b/com.discord/smali_classes2/org/webrtc/RTCStats.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RTCStats;
 .super Ljava/lang/Object;
+.source "RTCStats.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/org/webrtc/RTCStatsCollectorCallback.smali b/com.discord/smali_classes2/org/webrtc/RTCStatsCollectorCallback.smali
index 01bb448893..062a2c6b1c 100644
--- a/com.discord/smali_classes2/org/webrtc/RTCStatsCollectorCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/RTCStatsCollectorCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/RTCStatsCollectorCallback;
 .super Ljava/lang/Object;
+.source "RTCStatsCollectorCallback.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/RTCStatsReport.smali b/com.discord/smali_classes2/org/webrtc/RTCStatsReport.smali
index ee7cc050c0..905aae0902 100644
--- a/com.discord/smali_classes2/org/webrtc/RTCStatsReport.smali
+++ b/com.discord/smali_classes2/org/webrtc/RTCStatsReport.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RTCStatsReport;
 .super Ljava/lang/Object;
+.source "RTCStatsReport.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/org/webrtc/RendererCommon$1.smali b/com.discord/smali_classes2/org/webrtc/RendererCommon$1.smali
index 9a1674d168..455d914613 100644
--- a/com.discord/smali_classes2/org/webrtc/RendererCommon$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/RendererCommon$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/RendererCommon$1;
 .super Ljava/lang/Object;
+.source "RendererCommon.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RendererCommon$GlDrawer.smali b/com.discord/smali_classes2/org/webrtc/RendererCommon$GlDrawer.smali
index 6e9e292f9c..570360377a 100644
--- a/com.discord/smali_classes2/org/webrtc/RendererCommon$GlDrawer.smali
+++ b/com.discord/smali_classes2/org/webrtc/RendererCommon$GlDrawer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/RendererCommon$GlDrawer;
 .super Ljava/lang/Object;
+.source "RendererCommon.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RendererCommon$RendererEvents.smali b/com.discord/smali_classes2/org/webrtc/RendererCommon$RendererEvents.smali
index e2df4cb255..cfb8af7617 100644
--- a/com.discord/smali_classes2/org/webrtc/RendererCommon$RendererEvents.smali
+++ b/com.discord/smali_classes2/org/webrtc/RendererCommon$RendererEvents.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/RendererCommon$RendererEvents;
 .super Ljava/lang/Object;
+.source "RendererCommon.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RendererCommon$ScalingType.smali b/com.discord/smali_classes2/org/webrtc/RendererCommon$ScalingType.smali
index fd2fb71050..7e8c2b86be 100644
--- a/com.discord/smali_classes2/org/webrtc/RendererCommon$ScalingType.smali
+++ b/com.discord/smali_classes2/org/webrtc/RendererCommon$ScalingType.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/RendererCommon$ScalingType;
 .super Ljava/lang/Enum;
+.source "RendererCommon.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RendererCommon$VideoLayoutMeasure.smali b/com.discord/smali_classes2/org/webrtc/RendererCommon$VideoLayoutMeasure.smali
index 363a979316..d8d2bccd10 100644
--- a/com.discord/smali_classes2/org/webrtc/RendererCommon$VideoLayoutMeasure.smali
+++ b/com.discord/smali_classes2/org/webrtc/RendererCommon$VideoLayoutMeasure.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RendererCommon$VideoLayoutMeasure;
 .super Ljava/lang/Object;
+.source "RendererCommon.java"
 
 
 # annotations
@@ -59,7 +60,7 @@
 
     if-nez v0, :cond_0
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_0
     int-to-float p3, p3
@@ -74,9 +75,9 @@
 
     div-float/2addr p4, v2
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     const/high16 v4, 0x3f800000    # 1.0f
 
@@ -96,19 +97,22 @@
 
     if-lez p4, :cond_2
 
-    const/4 v2, 0x1
+    goto :goto_1
 
     :cond_2
+    const/4 v2, 0x0
+
+    :goto_1
     if-ne v5, v2, :cond_3
 
     iget-object p4, p0, Lorg/webrtc/RendererCommon$VideoLayoutMeasure;->scalingTypeMatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_3
     iget-object p4, p0, Lorg/webrtc/RendererCommon$VideoLayoutMeasure;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
 
-    :goto_1
+    :goto_2
     invoke-static {p4, p3, v1, v0}, Lorg/webrtc/RendererCommon;->getDisplaySize(Lorg/webrtc/RendererCommon$ScalingType;FII)Landroid/graphics/Point;
 
     move-result-object p3
@@ -136,7 +140,7 @@
     return-object p3
 
     :cond_6
-    :goto_2
+    :goto_3
     new-instance p1, Landroid/graphics/Point;
 
     invoke-direct {p1, v1, v0}, Landroid/graphics/Point;-><init>(II)V
diff --git a/com.discord/smali_classes2/org/webrtc/RendererCommon.smali b/com.discord/smali_classes2/org/webrtc/RendererCommon.smali
index c2a285beca..e2faae1ebb 100644
--- a/com.discord/smali_classes2/org/webrtc/RendererCommon.smali
+++ b/com.discord/smali_classes2/org/webrtc/RendererCommon.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RendererCommon;
 .super Ljava/lang/Object;
+.source "RendererCommon.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RtpParameters$Codec.smali b/com.discord/smali_classes2/org/webrtc/RtpParameters$Codec.smali
index 5492cdbaaa..575862b4b1 100644
--- a/com.discord/smali_classes2/org/webrtc/RtpParameters$Codec.smali
+++ b/com.discord/smali_classes2/org/webrtc/RtpParameters$Codec.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RtpParameters$Codec;
 .super Ljava/lang/Object;
+.source "RtpParameters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RtpParameters$Encoding.smali b/com.discord/smali_classes2/org/webrtc/RtpParameters$Encoding.smali
index 7fb6068518..acea19b4a1 100644
--- a/com.discord/smali_classes2/org/webrtc/RtpParameters$Encoding.smali
+++ b/com.discord/smali_classes2/org/webrtc/RtpParameters$Encoding.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RtpParameters$Encoding;
 .super Ljava/lang/Object;
+.source "RtpParameters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RtpParameters.smali b/com.discord/smali_classes2/org/webrtc/RtpParameters.smali
index 583603f04c..007e72eec6 100644
--- a/com.discord/smali_classes2/org/webrtc/RtpParameters.smali
+++ b/com.discord/smali_classes2/org/webrtc/RtpParameters.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RtpParameters;
 .super Ljava/lang/Object;
+.source "RtpParameters.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RtpReceiver$Observer.smali b/com.discord/smali_classes2/org/webrtc/RtpReceiver$Observer.smali
index 5c11ce36b8..a9dc336259 100644
--- a/com.discord/smali_classes2/org/webrtc/RtpReceiver$Observer.smali
+++ b/com.discord/smali_classes2/org/webrtc/RtpReceiver$Observer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/RtpReceiver$Observer;
 .super Ljava/lang/Object;
+.source "RtpReceiver.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/RtpReceiver.smali b/com.discord/smali_classes2/org/webrtc/RtpReceiver.smali
index ddd7e6c9b9..59e38189df 100644
--- a/com.discord/smali_classes2/org/webrtc/RtpReceiver.smali
+++ b/com.discord/smali_classes2/org/webrtc/RtpReceiver.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RtpReceiver;
 .super Ljava/lang/Object;
+.source "RtpReceiver.java"
 
 
 # annotations
@@ -76,11 +77,9 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lorg/webrtc/RtpReceiver;->nativeRtpReceiver:J
+    iget-wide v2, p0, Lorg/webrtc/RtpReceiver;->nativeRtpReceiver:J
 
-    iget-wide v2, p0, Lorg/webrtc/RtpReceiver;->nativeObserver:J
-
-    invoke-static {v0, v1, v2, v3}, Lorg/webrtc/RtpReceiver;->nativeUnsetObserver(JJ)V
+    invoke-static {v2, v3, v0, v1}, Lorg/webrtc/RtpReceiver;->nativeUnsetObserver(JJ)V
 
     :cond_0
     iget-wide v0, p0, Lorg/webrtc/RtpReceiver;->nativeRtpReceiver:J
@@ -111,11 +110,9 @@
 
     if-eqz v4, :cond_0
 
-    iget-wide v0, p0, Lorg/webrtc/RtpReceiver;->nativeRtpReceiver:J
+    iget-wide v4, p0, Lorg/webrtc/RtpReceiver;->nativeRtpReceiver:J
 
-    iget-wide v4, p0, Lorg/webrtc/RtpReceiver;->nativeObserver:J
-
-    invoke-static {v0, v1, v4, v5}, Lorg/webrtc/RtpReceiver;->nativeUnsetObserver(JJ)V
+    invoke-static {v4, v5, v0, v1}, Lorg/webrtc/RtpReceiver;->nativeUnsetObserver(JJ)V
 
     iput-wide v2, p0, Lorg/webrtc/RtpReceiver;->nativeObserver:J
 
diff --git a/com.discord/smali_classes2/org/webrtc/RtpSender.smali b/com.discord/smali_classes2/org/webrtc/RtpSender.smali
index 5fd8d1c769..68199aeddf 100644
--- a/com.discord/smali_classes2/org/webrtc/RtpSender.smali
+++ b/com.discord/smali_classes2/org/webrtc/RtpSender.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/RtpSender;
 .super Ljava/lang/Object;
+.source "RtpSender.java"
 
 
 # annotations
@@ -101,8 +102,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/RtpSender;->dtmfSender:Lorg/webrtc/DtmfSender;
-
     invoke-virtual {v0}, Lorg/webrtc/DtmfSender;->dispose()V
 
     :cond_0
@@ -110,11 +109,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lorg/webrtc/RtpSender;->ownsTrack:Z
+    iget-boolean v1, p0, Lorg/webrtc/RtpSender;->ownsTrack:Z
 
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lorg/webrtc/RtpSender;->cachedTrack:Lorg/webrtc/MediaStreamTrack;
+    if-eqz v1, :cond_1
 
     invoke-virtual {v0}, Lorg/webrtc/MediaStreamTrack;->dispose()V
 
@@ -200,11 +197,9 @@
 
     if-eqz v0, :cond_2
 
-    iget-boolean v0, p0, Lorg/webrtc/RtpSender;->ownsTrack:Z
+    iget-boolean v1, p0, Lorg/webrtc/RtpSender;->ownsTrack:Z
 
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lorg/webrtc/RtpSender;->cachedTrack:Lorg/webrtc/MediaStreamTrack;
+    if-eqz v1, :cond_2
 
     invoke-virtual {v0}, Lorg/webrtc/MediaStreamTrack;->dispose()V
 
diff --git a/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$1.smali b/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$1.smali
index 1587883303..8d346a1d10 100644
--- a/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ScreenCapturerAndroid$1;
 .super Ljava/lang/Object;
+.source "ScreenCapturerAndroid.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$2.smali b/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$2.smali
index 7d16607cf7..e633b7093f 100644
--- a/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid$2.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ScreenCapturerAndroid$2;
 .super Ljava/lang/Object;
+.source "ScreenCapturerAndroid.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid.smali b/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid.smali
index 121ef37c99..edb844a398 100644
--- a/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid.smali
+++ b/com.discord/smali_classes2/org/webrtc/ScreenCapturerAndroid.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/ScreenCapturerAndroid;
 .super Ljava/lang/Object;
+.source "ScreenCapturerAndroid.java"
 
 # interfaces
 .implements Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
diff --git a/com.discord/smali_classes2/org/webrtc/SdpObserver.smali b/com.discord/smali_classes2/org/webrtc/SdpObserver.smali
index 380397e301..d4a630e514 100644
--- a/com.discord/smali_classes2/org/webrtc/SdpObserver.smali
+++ b/com.discord/smali_classes2/org/webrtc/SdpObserver.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/SdpObserver;
 .super Ljava/lang/Object;
+.source "SdpObserver.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/SessionDescription$Type.smali b/com.discord/smali_classes2/org/webrtc/SessionDescription$Type.smali
index 418b4a670d..16f1581314 100644
--- a/com.discord/smali_classes2/org/webrtc/SessionDescription$Type.smali
+++ b/com.discord/smali_classes2/org/webrtc/SessionDescription$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/SessionDescription$Type;
 .super Ljava/lang/Enum;
+.source "SessionDescription.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/SessionDescription.smali b/com.discord/smali_classes2/org/webrtc/SessionDescription.smali
index e6d7c32b4f..d09bfcc356 100644
--- a/com.discord/smali_classes2/org/webrtc/SessionDescription.smali
+++ b/com.discord/smali_classes2/org/webrtc/SessionDescription.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/SessionDescription;
 .super Ljava/lang/Object;
+.source "SessionDescription.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/Size.smali b/com.discord/smali_classes2/org/webrtc/Size.smali
index 74dade9a52..3cb3d35172 100644
--- a/com.discord/smali_classes2/org/webrtc/Size.smali
+++ b/com.discord/smali_classes2/org/webrtc/Size.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/Size;
 .super Ljava/lang/Object;
+.source "Size.java"
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/org/webrtc/SoftwareVideoDecoderFactory.smali b/com.discord/smali_classes2/org/webrtc/SoftwareVideoDecoderFactory.smali
index 83aa805136..cb325a8c27 100644
--- a/com.discord/smali_classes2/org/webrtc/SoftwareVideoDecoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/SoftwareVideoDecoderFactory.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/SoftwareVideoDecoderFactory;
 .super Ljava/lang/Object;
+.source "SoftwareVideoDecoderFactory.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoDecoderFactory;
diff --git a/com.discord/smali_classes2/org/webrtc/SoftwareVideoEncoderFactory.smali b/com.discord/smali_classes2/org/webrtc/SoftwareVideoEncoderFactory.smali
index d630aa64c8..81800c44f7 100644
--- a/com.discord/smali_classes2/org/webrtc/SoftwareVideoEncoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/SoftwareVideoEncoderFactory.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/SoftwareVideoEncoderFactory;
 .super Ljava/lang/Object;
+.source "SoftwareVideoEncoderFactory.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoEncoderFactory;
diff --git a/com.discord/smali_classes2/org/webrtc/StatsObserver.smali b/com.discord/smali_classes2/org/webrtc/StatsObserver.smali
index 7965b1f1e3..5afad6e6c5 100644
--- a/com.discord/smali_classes2/org/webrtc/StatsObserver.smali
+++ b/com.discord/smali_classes2/org/webrtc/StatsObserver.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/StatsObserver;
 .super Ljava/lang/Object;
+.source "StatsObserver.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/StatsReport$Value.smali b/com.discord/smali_classes2/org/webrtc/StatsReport$Value.smali
index 7907afc930..3ac1e2063b 100644
--- a/com.discord/smali_classes2/org/webrtc/StatsReport$Value.smali
+++ b/com.discord/smali_classes2/org/webrtc/StatsReport$Value.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/StatsReport$Value;
 .super Ljava/lang/Object;
+.source "StatsReport.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/StatsReport.smali b/com.discord/smali_classes2/org/webrtc/StatsReport.smali
index 0ae841d134..b9b7fd8975 100644
--- a/com.discord/smali_classes2/org/webrtc/StatsReport.smali
+++ b/com.discord/smali_classes2/org/webrtc/StatsReport.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/StatsReport;
 .super Ljava/lang/Object;
+.source "StatsReport.java"
 
 
 # annotations
@@ -42,7 +43,7 @@
 
 # virtual methods
 .method public toString()Ljava/lang/String;
-    .locals 3
+    .locals 4
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -81,11 +82,9 @@
     :goto_0
     iget-object v2, p0, Lorg/webrtc/StatsReport;->values:[Lorg/webrtc/StatsReport$Value;
 
-    array-length v2, v2
+    array-length v3, v2
 
-    if-ge v1, v2, :cond_0
-
-    iget-object v2, p0, Lorg/webrtc/StatsReport;->values:[Lorg/webrtc/StatsReport$Value;
+    if-ge v1, v3, :cond_0
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali b/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali
index d395db980f..52e51e1fa8 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/SurfaceEglRenderer;
 .super Lorg/webrtc/EglRenderer;
+.source "SurfaceEglRenderer.java"
 
 # interfaces
 .implements Landroid/view/SurfaceHolder$Callback;
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$1.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$1.smali
index 0ad4ec99d0..1ccbcbc043 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/SurfaceTextureHelper$1;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$2.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$2.smali
index 3319f6c862..4bf6cb6b69 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$2.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/SurfaceTextureHelper$2;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -60,9 +61,7 @@
 
     iget-object v0, p0, Lorg/webrtc/SurfaceTextureHelper$2;->this$0:Lorg/webrtc/SurfaceTextureHelper;
 
-    iget-object v1, p0, Lorg/webrtc/SurfaceTextureHelper$2;->this$0:Lorg/webrtc/SurfaceTextureHelper;
-
-    invoke-static {v1}, Lorg/webrtc/SurfaceTextureHelper;->access$100(Lorg/webrtc/SurfaceTextureHelper;)Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
+    invoke-static {v0}, Lorg/webrtc/SurfaceTextureHelper;->access$100(Lorg/webrtc/SurfaceTextureHelper;)Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$3.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$3.smali
index 00b1e97905..3a1fe7f4bb 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$3.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$3.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/SurfaceTextureHelper$3;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$4.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$4.smali
index 7cb3a50404..2d5fcacb04 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$4.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$4.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/SurfaceTextureHelper$4;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$5.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$5.smali
index 5398882520..93ecf3293c 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$5.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$5.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/SurfaceTextureHelper$5;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$6.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$6.smali
index 33bdae477f..3d93f7efbb 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$6.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$6.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/SurfaceTextureHelper$6;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$7.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$7.smali
index 23c68a051a..b4f1cee68b 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$7.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$7.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/SurfaceTextureHelper$7;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener.smali
index 01d5b2cdee..00c97589b6 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali
index 73a2a59198..dbf6fa55da 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/SurfaceTextureHelper;
 .super Ljava/lang/Object;
+.source "SurfaceTextureHelper.java"
 
 
 # annotations
@@ -327,8 +328,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/SurfaceTextureHelper;->yuvConverter:Lorg/webrtc/YuvConverter;
-
     invoke-virtual {v0}, Lorg/webrtc/YuvConverter;->release()V
 
     :cond_0
@@ -471,6 +470,8 @@
 
     invoke-interface {v3, v4, v0, v1, v2}, Lorg/webrtc/SurfaceTextureHelper$OnTextureFrameAvailableListener;->onTextureFrameAvailable(I[FJ)V
 
+    return-void
+
     :cond_1
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali b/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali
index bc5acdb177..b11c4c1260 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/SurfaceViewRenderer;
 .super Landroid/view/SurfaceView;
+.source "SurfaceViewRenderer.java"
 
 # interfaces
 .implements Landroid/view/SurfaceHolder$Callback;
@@ -243,61 +244,47 @@
 
     iget v1, p0, Lorg/webrtc/SurfaceViewRenderer;->rotatedFrameWidth:I
 
-    int-to-float v1, v1
+    int-to-float v2, v1
 
-    iget v2, p0, Lorg/webrtc/SurfaceViewRenderer;->rotatedFrameHeight:I
+    iget v3, p0, Lorg/webrtc/SurfaceViewRenderer;->rotatedFrameHeight:I
 
-    int-to-float v2, v2
+    int-to-float v4, v3
 
-    div-float/2addr v1, v2
+    div-float/2addr v2, v4
 
-    cmpl-float v1, v1, v0
+    cmpl-float v2, v2, v0
 
-    if-lez v1, :cond_0
+    if-lez v2, :cond_0
 
-    iget v1, p0, Lorg/webrtc/SurfaceViewRenderer;->rotatedFrameHeight:I
-
-    int-to-float v1, v1
+    int-to-float v1, v3
 
     mul-float v1, v1, v0
 
-    float-to-int v0, v1
-
-    iget v1, p0, Lorg/webrtc/SurfaceViewRenderer;->rotatedFrameHeight:I
+    float-to-int v1, v1
 
     goto :goto_0
 
     :cond_0
-    iget v1, p0, Lorg/webrtc/SurfaceViewRenderer;->rotatedFrameWidth:I
-
-    iget v2, p0, Lorg/webrtc/SurfaceViewRenderer;->rotatedFrameWidth:I
-
-    int-to-float v2, v2
+    int-to-float v2, v1
 
     div-float/2addr v2, v0
 
-    float-to-int v0, v2
-
-    move v4, v1
-
-    move v1, v0
-
-    move v0, v4
+    float-to-int v3, v2
 
     :goto_0
     invoke-virtual {p0}, Lorg/webrtc/SurfaceViewRenderer;->getWidth()I
 
-    move-result v2
+    move-result v0
 
-    invoke-static {v2, v0}, Ljava/lang/Math;->min(II)I
+    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
     invoke-virtual {p0}, Lorg/webrtc/SurfaceViewRenderer;->getHeight()I
 
-    move-result v2
+    move-result v1
 
-    invoke-static {v2, v1}, Ljava/lang/Math;->min(II)I
+    invoke-static {v1, v3}, Ljava/lang/Math;->min(II)I
 
     move-result v1
 
@@ -508,8 +495,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/SurfaceViewRenderer;->rendererEvents:Lorg/webrtc/RendererCommon$RendererEvents;
-
     invoke-interface {v0}, Lorg/webrtc/RendererCommon$RendererEvents;->onFirstFrameRendered()V
 
     :cond_0
@@ -533,8 +518,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/SurfaceViewRenderer;->rendererEvents:Lorg/webrtc/RendererCommon$RendererEvents;
-
     invoke-interface {v0, p1, p2, p3}, Lorg/webrtc/RendererCommon$RendererEvents;->onFrameResolutionChanged(III)V
 
     :cond_0
diff --git a/com.discord/smali_classes2/org/webrtc/TextureBufferImpl$1.smali b/com.discord/smali_classes2/org/webrtc/TextureBufferImpl$1.smali
index 5e7fa9eebe..3c6c3c3638 100644
--- a/com.discord/smali_classes2/org/webrtc/TextureBufferImpl$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/TextureBufferImpl$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/TextureBufferImpl$1;
 .super Ljava/lang/Object;
+.source "TextureBufferImpl.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali b/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali
index 1b0ba1d873..8a651489f6 100644
--- a/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali
+++ b/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/TextureBufferImpl;
 .super Ljava/lang/Object;
+.source "TextureBufferImpl.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoFrame$TextureBuffer;
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$1.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$1.smali
index d74e4e43a5..7b1f6cdb82 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ThreadUtils$1;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 # interfaces
 .implements Lorg/webrtc/ThreadUtils$BlockingOperation;
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$1CaughtException.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$1CaughtException.smali
index 9d2878ddf1..f0d76c9308 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$1CaughtException.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$1CaughtException.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ThreadUtils$1CaughtException;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$1Result.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$1Result.smali
index 989b362c10..24c7c39e87 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$1Result.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$1Result.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ThreadUtils$1Result;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$2.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$2.smali
index 86d3fb919f..ca5e110bcd 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$2.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ThreadUtils$2;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 # interfaces
 .implements Lorg/webrtc/ThreadUtils$BlockingOperation;
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$3.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$3.smali
index fa44d1e3cd..e14a00cf3d 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$3.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$3.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ThreadUtils$3;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 # interfaces
 .implements Lorg/webrtc/ThreadUtils$BlockingOperation;
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$4.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$4.smali
index 59e392e7cf..b5df1f09e5 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$4.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$4.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ThreadUtils$4;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$5.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$5.smali
index 42181a70b9..38f839a3f5 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$5.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$5.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/ThreadUtils$5;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$BlockingOperation.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$BlockingOperation.smali
index 393913b196..2de4def19d 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$BlockingOperation.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$BlockingOperation.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/ThreadUtils$BlockingOperation;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils$ThreadChecker.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils$ThreadChecker.smali
index 5c32c35787..c7a5079e47 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils$ThreadChecker.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils$ThreadChecker.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/ThreadUtils$ThreadChecker;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/ThreadUtils.smali b/com.discord/smali_classes2/org/webrtc/ThreadUtils.smali
index ecc7b02c4a..64f27f7707 100644
--- a/com.discord/smali_classes2/org/webrtc/ThreadUtils.smali
+++ b/com.discord/smali_classes2/org/webrtc/ThreadUtils.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/ThreadUtils;
 .super Ljava/lang/Object;
+.source "ThreadUtils.java"
 
 
 # annotations
@@ -51,12 +52,10 @@
 
     invoke-virtual {p0, v3, v4, v6}, Ljava/util/concurrent/CountDownLatch;->await(JLjava/util/concurrent/TimeUnit;)Z
 
-    move-result v3
+    move-result v2
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move v2, v3
-
     goto :goto_0
 
     :catch_0
diff --git a/com.discord/smali_classes2/org/webrtc/TurnCustomizer.smali b/com.discord/smali_classes2/org/webrtc/TurnCustomizer.smali
index 4a0ad66b81..72853926fb 100644
--- a/com.discord/smali_classes2/org/webrtc/TurnCustomizer.smali
+++ b/com.discord/smali_classes2/org/webrtc/TurnCustomizer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/TurnCustomizer;
 .super Ljava/lang/Object;
+.source "TurnCustomizer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VP8Decoder.smali b/com.discord/smali_classes2/org/webrtc/VP8Decoder.smali
index 0b47129ef6..63dea2149e 100644
--- a/com.discord/smali_classes2/org/webrtc/VP8Decoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/VP8Decoder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VP8Decoder;
 .super Lorg/webrtc/WrappedNativeVideoDecoder;
+.source "VP8Decoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VP8Encoder.smali b/com.discord/smali_classes2/org/webrtc/VP8Encoder.smali
index 791619fca1..65f4266a2a 100644
--- a/com.discord/smali_classes2/org/webrtc/VP8Encoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/VP8Encoder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VP8Encoder;
 .super Lorg/webrtc/WrappedNativeVideoEncoder;
+.source "VP8Encoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VP9Decoder.smali b/com.discord/smali_classes2/org/webrtc/VP9Decoder.smali
index 26b3b0d246..79bac279b4 100644
--- a/com.discord/smali_classes2/org/webrtc/VP9Decoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/VP9Decoder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VP9Decoder;
 .super Lorg/webrtc/WrappedNativeVideoDecoder;
+.source "VP9Decoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VP9Encoder.smali b/com.discord/smali_classes2/org/webrtc/VP9Encoder.smali
index a0a54e91bd..26b8f1f7d5 100644
--- a/com.discord/smali_classes2/org/webrtc/VP9Encoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/VP9Encoder.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VP9Encoder;
 .super Lorg/webrtc/WrappedNativeVideoEncoder;
+.source "VP9Encoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoCapturer$CapturerObserver.smali b/com.discord/smali_classes2/org/webrtc/VideoCapturer$CapturerObserver.smali
index c5f62d2393..a953bde84f 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoCapturer$CapturerObserver.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoCapturer$CapturerObserver.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoCapturer$CapturerObserver;
 .super Ljava/lang/Object;
+.source "VideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoCapturer.smali b/com.discord/smali_classes2/org/webrtc/VideoCapturer.smali
index 50b1a50ead..9c5a4eacc9 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoCapturer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoCapturer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoCapturer;
 .super Ljava/lang/Object;
+.source "VideoCapturer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoCodecInfo.smali b/com.discord/smali_classes2/org/webrtc/VideoCodecInfo.smali
index 158001531d..4486a481e6 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoCodecInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoCodecInfo.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoCodecInfo;
 .super Ljava/lang/Object;
+.source "VideoCodecInfo.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/org/webrtc/VideoCodecStatus.smali b/com.discord/smali_classes2/org/webrtc/VideoCodecStatus.smali
index de14fcb472..d210ce3996 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoCodecStatus.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoCodecStatus.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/VideoCodecStatus;
 .super Ljava/lang/Enum;
+.source "VideoCodecStatus.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoCodecType.smali b/com.discord/smali_classes2/org/webrtc/VideoCodecType.smali
index 20f7f8a447..5372255f79 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoCodecType.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoCodecType.smali
@@ -1,5 +1,6 @@
 .class final enum Lorg/webrtc/VideoCodecType;
 .super Ljava/lang/Enum;
+.source "VideoCodecType.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoder$Callback.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoder$Callback.smali
index 092b8cce9b..2257914670 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoder$Callback.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoder$Callback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoDecoder$Callback;
 .super Ljava/lang/Object;
+.source "VideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoder$DecodeInfo.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoder$DecodeInfo.smali
index fca5da1533..dac24e6417 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoder$DecodeInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoder$DecodeInfo.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoDecoder$DecodeInfo;
 .super Ljava/lang/Object;
+.source "VideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoder$Settings.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoder$Settings.smali
index cfe8e542f1..8f4ec57b38 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoder$Settings.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoder$Settings.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoDecoder$Settings;
 .super Ljava/lang/Object;
+.source "VideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoder.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoder.smali
index 86fe41c2a6..ea7cbe6159 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoder.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoDecoder;
 .super Ljava/lang/Object;
+.source "VideoDecoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoderFactory.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoderFactory.smali
index 82a0fea142..949b4384ff 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoderFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoDecoderFactory;
 .super Ljava/lang/Object;
+.source "VideoDecoderFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoderFallback.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoderFallback.smali
index 023be2d153..6ddaa5d223 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoderFallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoderFallback.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoDecoderFallback;
 .super Lorg/webrtc/WrappedNativeVideoDecoder;
+.source "VideoDecoderFallback.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali
index 581e71d8ca..5cbc2e33e7 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VideoDecoderWrapper;
 .super Ljava/lang/Object;
+.source "VideoDecoderWrapper.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$BitrateAllocation.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$BitrateAllocation.smali
index d09e3f6964..11146ef307 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$BitrateAllocation.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$BitrateAllocation.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$BitrateAllocation;
 .super Ljava/lang/Object;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$Callback.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$Callback.smali
index 8842c80a02..55e17c6463 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$Callback.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$Callback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoEncoder$Callback;
 .super Ljava/lang/Object;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfo.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfo.smali
index 4734461077..1bed0de7de 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfo.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$CodecSpecificInfo;
 .super Ljava/lang/Object;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoH264.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoH264.smali
index 7e8d357eab..86399f718e 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoH264.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoH264.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$CodecSpecificInfoH264;
 .super Lorg/webrtc/VideoEncoder$CodecSpecificInfo;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP8.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP8.smali
index 350a3c7985..44b24c40eb 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP8.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP8.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$CodecSpecificInfoVP8;
 .super Lorg/webrtc/VideoEncoder$CodecSpecificInfo;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP9.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP9.smali
index 79bf784175..9d4c2b13d4 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP9.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$CodecSpecificInfoVP9.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$CodecSpecificInfoVP9;
 .super Lorg/webrtc/VideoEncoder$CodecSpecificInfo;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$EncodeInfo.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$EncodeInfo.smali
index da2ff33491..4c7a2f46d2 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$EncodeInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$EncodeInfo.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$EncodeInfo;
 .super Ljava/lang/Object;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$ScalingSettings.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$ScalingSettings.smali
index f95919a78f..4f37437db0 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$ScalingSettings.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$ScalingSettings.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$ScalingSettings;
 .super Ljava/lang/Object;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder$Settings.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder$Settings.smali
index 87ff07d930..195b2b0795 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder$Settings.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder$Settings.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoder$Settings;
 .super Ljava/lang/Object;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoder.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoder.smali
index 0f69139c15..f5fd3aa8ed 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoder.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoEncoder;
 .super Ljava/lang/Object;
+.source "VideoEncoder.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoderFactory.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoderFactory.smali
index 3968f6740e..8b7500ae09 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoderFactory.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoEncoderFactory;
 .super Ljava/lang/Object;
+.source "VideoEncoderFactory.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoderFallback.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoderFallback.smali
index 0fa5c3f862..a09fd5b098 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoderFallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoderFallback.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoEncoderFallback;
 .super Lorg/webrtc/WrappedNativeVideoEncoder;
+.source "VideoEncoderFallback.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali
index 848d8c500f..eef9c8452a 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VideoEncoderWrapper;
 .super Ljava/lang/Object;
+.source "VideoEncoderWrapper.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali
index 37b36d79d1..2751aec55c 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VideoFileRenderer$1;
 .super Ljava/lang/Object;
+.source "VideoFileRenderer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$2.smali b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$2.smali
index ff94a4249d..6b8e6810bd 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$2.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VideoFileRenderer$2;
 .super Ljava/lang/Object;
+.source "VideoFileRenderer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$3.smali b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$3.smali
index b74a9b3139..101f22f994 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$3.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$3.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VideoFileRenderer$3;
 .super Ljava/lang/Object;
+.source "VideoFileRenderer.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali
index b306b2ef49..f3f07b5c78 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoFileRenderer;
 .super Ljava/lang/Object;
+.source "VideoFileRenderer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoRenderer$Callbacks;
@@ -468,6 +469,8 @@
     invoke-static/range {p1 .. p1}, Lorg/webrtc/VideoRenderer;->renderFrameDone(Lorg/webrtc/VideoRenderer$I420Frame;)V
 
     throw v0
+
+    return-void
 .end method
 
 
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrame$Buffer.smali b/com.discord/smali_classes2/org/webrtc/VideoFrame$Buffer.smali
index 06ab5b5b9b..623d6ab87a 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrame$Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrame$Buffer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoFrame$Buffer;
 .super Ljava/lang/Object;
+.source "VideoFrame.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrame$I420Buffer.smali b/com.discord/smali_classes2/org/webrtc/VideoFrame$I420Buffer.smali
index 0e8610d432..7b908c05bb 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrame$I420Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrame$I420Buffer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoFrame$I420Buffer;
 .super Ljava/lang/Object;
+.source "VideoFrame.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoFrame$Buffer;
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer$Type.smali b/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer$Type.smali
index 7a5325af0a..ff06ecbc39 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer$Type.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer$Type.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/VideoFrame$TextureBuffer$Type;
 .super Ljava/lang/Enum;
+.source "VideoFrame.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer.smali b/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer.smali
index 3e403e15f9..167e9c5911 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrame$TextureBuffer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoFrame$TextureBuffer;
 .super Ljava/lang/Object;
+.source "VideoFrame.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoFrame$Buffer;
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrame.smali b/com.discord/smali_classes2/org/webrtc/VideoFrame.smali
index 9b0773c132..fc19d1d229 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrame.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrame.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoFrame;
 .super Ljava/lang/Object;
+.source "VideoFrame.java"
 
 
 # annotations
@@ -74,11 +75,11 @@
 
     if-ne v8, v9, :cond_0
 
-    move/from16 v15, p4
+    move/from16 v7, p4
 
-    move/from16 v14, p6
+    move/from16 v6, p6
 
-    if-ne v15, v14, :cond_1
+    if-ne v7, v6, :cond_1
 
     invoke-interface/range {p0 .. p0}, Lorg/webrtc/VideoFrame$I420Buffer;->getDataY()Ljava/nio/ByteBuffer;
 
@@ -173,9 +174,9 @@
     return-object v0
 
     :cond_0
-    move/from16 v15, p4
+    move/from16 v7, p4
 
-    move/from16 v14, p6
+    move/from16 v6, p6
 
     :cond_1
     invoke-static/range {p5 .. p6}, Lorg/webrtc/JavaI420Buffer;->allocate(II)Lorg/webrtc/JavaI420Buffer;
@@ -224,15 +225,11 @@
 
     invoke-virtual/range {v18 .. v18}, Lorg/webrtc/JavaI420Buffer;->getDataV()Ljava/nio/ByteBuffer;
 
-    move-result-object v16
-
-    move-object/from16 v14, v16
+    move-result-object v14
 
     invoke-virtual/range {v18 .. v18}, Lorg/webrtc/JavaI420Buffer;->getStrideV()I
 
-    move-result v16
-
-    move/from16 v15, v16
+    move-result v15
 
     move/from16 v6, p1
 
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$1.smali b/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$1.smali
index 63920bbab5..ea1f61ff72 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/VideoFrameDrawer$1;
 .super Ljava/lang/Object;
+.source "VideoFrameDrawer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$YuvUploader.smali b/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$YuvUploader.smali
index 84dd4b1c40..6ed26d1e4d 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$YuvUploader.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer$YuvUploader.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/VideoFrameDrawer$YuvUploader;
 .super Ljava/lang/Object;
+.source "VideoFrameDrawer.java"
 
 
 # annotations
@@ -57,13 +58,11 @@
 
     if-eqz v1, :cond_0
 
-    const/4 v1, 0x3
-
-    iget-object v2, p0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
+    const/4 v2, 0x3
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v2, v3}, Landroid/opengl/GLES20;->glDeleteTextures(I[II)V
+    invoke-static {v2, v1, v3}, Landroid/opengl/GLES20;->glDeleteTextures(I[II)V
 
     iput-object v0, p0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
 
@@ -142,50 +141,50 @@
 
     move-object/from16 v0, p0
 
-    const/4 v3, 0x3
+    const/4 v1, 0x3
 
-    new-array v4, v3, [I
+    new-array v2, v1, [I
 
-    const/4 v5, 0x0
+    const/4 v3, 0x0
 
-    aput p1, v4, v5
+    aput p1, v2, v3
 
-    const/4 v6, 0x2
+    const/4 v4, 0x2
 
-    div-int/lit8 v1, p1, 0x2
+    div-int/lit8 v5, p1, 0x2
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
-    aput v1, v4, v7
+    aput v5, v2, v6
 
-    aput v1, v4, v6
+    aput v5, v2, v4
 
-    new-array v1, v3, [I
+    new-array v5, v1, [I
 
-    aput p2, v1, v5
+    aput p2, v5, v3
 
-    div-int/lit8 v2, p2, 0x2
+    div-int/lit8 v7, p2, 0x2
 
-    aput v2, v1, v7
+    aput v7, v5, v6
 
-    aput v2, v1, v6
+    aput v7, v5, v4
 
-    const/4 v2, 0x0
+    const/4 v4, 0x0
 
     const/4 v6, 0x0
 
     :goto_0
-    if-ge v2, v3, :cond_1
+    if-ge v4, v1, :cond_1
 
-    aget v7, p3, v2
+    aget v7, p3, v4
 
-    aget v8, v4, v2
+    aget v8, v2, v4
 
     if-le v7, v8, :cond_0
 
-    aget v7, v4, v2
+    aget v7, v2, v4
 
-    aget v8, v1, v2
+    aget v8, v5, v4
 
     mul-int v7, v7, v8
 
@@ -194,47 +193,45 @@
     move-result v6
 
     :cond_0
-    add-int/lit8 v2, v2, 0x1
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_0
 
     :cond_1
     if-lez v6, :cond_3
 
-    iget-object v2, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
+    iget-object v4, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
 
-    if-eqz v2, :cond_2
+    if-eqz v4, :cond_2
 
-    iget-object v2, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
+    invoke-virtual {v4}, Ljava/nio/ByteBuffer;->capacity()I
 
-    invoke-virtual {v2}, Ljava/nio/ByteBuffer;->capacity()I
+    move-result v4
 
-    move-result v2
-
-    if-ge v2, v6, :cond_3
+    if-ge v4, v6, :cond_3
 
     :cond_2
     invoke-static {v6}, Ljava/nio/ByteBuffer;->allocateDirect(I)Ljava/nio/ByteBuffer;
 
-    move-result-object v2
+    move-result-object v4
 
-    iput-object v2, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
+    iput-object v4, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
 
     :cond_3
-    iget-object v2, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
+    iget-object v4, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
 
     const/16 v6, 0xde1
 
-    if-nez v2, :cond_4
+    if-nez v4, :cond_4
 
-    new-array v2, v3, [I
+    new-array v4, v1, [I
 
-    iput-object v2, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
+    iput-object v4, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
 
-    const/4 v2, 0x0
+    const/4 v4, 0x0
 
     :goto_1
-    if-ge v2, v3, :cond_4
+    if-ge v4, v1, :cond_4
 
     iget-object v7, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
 
@@ -242,70 +239,69 @@
 
     move-result v8
 
-    aput v8, v7, v2
+    aput v8, v7, v4
 
-    add-int/lit8 v2, v2, 0x1
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_1
 
     :cond_4
     :goto_2
-    if-ge v5, v3, :cond_6
+    if-ge v3, v1, :cond_6
 
-    const v2, 0x84c0
+    const v4, 0x84c0
 
-    add-int/2addr v2, v5
+    add-int/2addr v4, v3
 
-    invoke-static {v2}, Landroid/opengl/GLES20;->glActiveTexture(I)V
+    invoke-static {v4}, Landroid/opengl/GLES20;->glActiveTexture(I)V
 
-    iget-object v2, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
+    iget-object v4, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->yuvTextures:[I
 
-    aget v2, v2, v5
+    aget v4, v4, v3
 
-    invoke-static {v6, v2}, Landroid/opengl/GLES20;->glBindTexture(II)V
+    invoke-static {v6, v4}, Landroid/opengl/GLES20;->glBindTexture(II)V
 
-    aget v2, p3, v5
+    aget v4, p3, v3
 
-    aget v7, v4, v5
+    aget v7, v2, v3
 
-    if-ne v2, v7, :cond_5
+    if-ne v4, v7, :cond_5
 
-    aget-object v2, p4, v5
+    aget-object v4, p4, v3
 
-    :goto_3
-    move-object v15, v2
-
-    goto :goto_4
-
-    :cond_5
-    aget-object v7, p4, v5
-
-    aget v8, v4, v5
-
-    aget v9, v1, v5
-
-    aget v10, p3, v5
-
-    iget-object v11, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
-
-    aget v12, v4, v5
-
-    invoke-static/range {v7 .. v12}, Lorg/webrtc/VideoRenderer;->nativeCopyPlane(Ljava/nio/ByteBuffer;IIILjava/nio/ByteBuffer;I)V
-
-    iget-object v2, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
+    move-object v15, v4
 
     goto :goto_3
 
-    :goto_4
+    :cond_5
+    aget-object v7, p4, v3
+
+    aget v8, v2, v3
+
+    aget v9, v5, v3
+
+    aget v10, p3, v3
+
+    iget-object v11, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
+
+    aget v12, v2, v3
+
+    invoke-static/range {v7 .. v12}, Lorg/webrtc/VideoRenderer;->nativeCopyPlane(Ljava/nio/ByteBuffer;IIILjava/nio/ByteBuffer;I)V
+
+    iget-object v4, v0, Lorg/webrtc/VideoFrameDrawer$YuvUploader;->copyBuffer:Ljava/nio/ByteBuffer;
+
+    move-object v15, v4
+
+    :goto_3
     const/16 v7, 0xde1
 
     const/4 v8, 0x0
 
     const/16 v9, 0x1909
 
-    aget v10, v4, v5
+    aget v10, v2, v3
 
-    aget v11, v1, v5
+    aget v11, v5, v3
 
     const/4 v12, 0x0
 
@@ -315,7 +311,7 @@
 
     invoke-static/range {v7 .. v15}, Landroid/opengl/GLES20;->glTexImage2D(IIIIIIIILjava/nio/Buffer;)V
 
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v3, v3, 0x1
 
     goto :goto_2
 
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer.smali b/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer.smali
index 8489dc2730..cfb4470400 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFrameDrawer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoFrameDrawer;
 .super Ljava/lang/Object;
+.source "VideoFrameDrawer.java"
 
 
 # annotations
@@ -134,8 +135,6 @@
 
     aput v5, v1, v4
 
-    iget-object v1, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
-
     add-int/2addr v3, v2
 
     aget v2, v1, v3
@@ -153,23 +152,17 @@
     :cond_1
     iget-object p1, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
 
-    aget p1, p1, p3
+    aget p2, p1, p3
 
-    iget-object p2, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
-
-    aget p2, p2, v2
-
-    iget-object v0, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
+    aget v0, p1, v2
 
     const/4 v3, 0x2
 
-    aget v0, v0, v3
+    aget v3, p1, v3
 
-    iget-object v3, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
+    aget p1, p1, v1
 
-    aget v1, v3, v1
-
-    invoke-static {p1, p2, v0, v1}, Lorg/webrtc/VideoFrameDrawer;->distance(FFFF)I
+    invoke-static {p2, v0, v3, p1}, Lorg/webrtc/VideoFrameDrawer;->distance(FFFF)I
 
     move-result p1
 
@@ -177,25 +170,19 @@
 
     iget-object p1, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
 
-    aget p1, p1, p3
+    aget p2, p1, p3
 
-    iget-object p2, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
-
-    aget p2, p2, v2
-
-    iget-object p3, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
+    aget p3, p1, v2
 
     const/4 v0, 0x4
 
-    aget p3, p3, v0
-
-    iget-object v0, p0, Lorg/webrtc/VideoFrameDrawer;->dstPoints:[F
+    aget v0, p1, v0
 
     const/4 v1, 0x5
 
-    aget v0, v0, v1
+    aget p1, p1, v1
 
-    invoke-static {p1, p2, p3, v0}, Lorg/webrtc/VideoFrameDrawer;->distance(FFFF)I
+    invoke-static {p2, p3, v0, p1}, Lorg/webrtc/VideoFrameDrawer;->distance(FFFF)I
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/org/webrtc/VideoRenderer$Callbacks.smali b/com.discord/smali_classes2/org/webrtc/VideoRenderer$Callbacks.smali
index 6041c0a392..7c8460902a 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoRenderer$Callbacks.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoRenderer$Callbacks.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoRenderer$Callbacks;
 .super Ljava/lang/Object;
+.source "VideoRenderer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoRenderer$I420Frame.smali b/com.discord/smali_classes2/org/webrtc/VideoRenderer$I420Frame.smali
index 316974eb8d..5bffff597d 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoRenderer$I420Frame.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoRenderer$I420Frame.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoRenderer$I420Frame;
 .super Ljava/lang/Object;
+.source "VideoRenderer.java"
 
 
 # annotations
@@ -208,12 +209,11 @@
 
     iput-object p1, p0, Lorg/webrtc/VideoRenderer$I420Frame;->samplingMatrix:[F
 
-    :goto_0
     iput-object v0, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvStrides:[I
 
     iput-object v0, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvPlanes:[Ljava/nio/ByteBuffer;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     instance-of p1, p2, Lorg/webrtc/VideoFrame$I420Buffer;
@@ -284,7 +284,7 @@
 
     iput v1, p0, Lorg/webrtc/VideoRenderer$I420Frame;->textureId:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iput-boolean v1, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvFrame:Z
@@ -293,9 +293,11 @@
 
     iput-object v0, p0, Lorg/webrtc/VideoRenderer$I420Frame;->samplingMatrix:[F
 
-    goto :goto_0
+    iput-object v0, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvStrides:[I
 
-    :goto_1
+    iput-object v0, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvPlanes:[Ljava/nio/ByteBuffer;
+
+    :goto_0
     iput-wide p3, p0, Lorg/webrtc/VideoRenderer$I420Frame;->nativeFramePointer:J
 
     iput-object p2, p0, Lorg/webrtc/VideoRenderer$I420Frame;->backingBuffer:Lorg/webrtc/VideoFrame$Buffer;
@@ -509,14 +511,13 @@
 
     aget v1, v1, v2
 
-    :goto_0
     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
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     new-instance v0, Ljava/lang/StringBuilder;
@@ -527,9 +528,13 @@
 
     iget v1, p0, Lorg/webrtc/VideoRenderer$I420Frame;->textureId:I
 
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    :goto_1
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_0
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
@@ -566,8 +571,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/VideoRenderer$I420Frame;->backingBuffer:Lorg/webrtc/VideoFrame$Buffer;
-
     invoke-interface {v0}, Lorg/webrtc/VideoFrame$Buffer;->retain()V
 
     invoke-static {p0}, Lorg/webrtc/VideoRenderer;->renderFrameDone(Lorg/webrtc/VideoRenderer$I420Frame;)V
@@ -589,43 +592,37 @@
 
     const/4 v3, 0x0
 
+    aget-object v4, v0, v3
+
+    iget-object v5, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvStrides:[I
+
+    aget v6, v5, v3
+
+    const/4 v3, 0x1
+
+    aget-object v7, v0, v3
+
+    aget v8, v5, v3
+
+    const/4 v3, 0x2
+
     aget-object v0, v0, v3
 
-    iget-object v4, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvStrides:[I
-
-    aget v4, v4, v3
-
-    iget-object v3, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvPlanes:[Ljava/nio/ByteBuffer;
-
-    const/4 v5, 0x1
-
-    aget-object v6, v3, v5
-
-    iget-object v3, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvStrides:[I
-
-    aget v7, v3, v5
-
-    iget-object v3, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvPlanes:[Ljava/nio/ByteBuffer;
-
-    const/4 v5, 0x2
-
-    aget-object v8, v3, v5
-
-    iget-object v3, p0, Lorg/webrtc/VideoRenderer$I420Frame;->yuvStrides:[I
-
-    aget v9, v3, v5
+    aget v9, v5, v3
 
     new-instance v10, Lorg/webrtc/VideoRenderer$I420Frame$$Lambda$0;
 
     invoke-direct {v10, p0}, Lorg/webrtc/VideoRenderer$I420Frame$$Lambda$0;-><init>(Lorg/webrtc/VideoRenderer$I420Frame;)V
 
-    move-object v3, v0
+    move-object v3, v4
 
-    move-object v5, v6
+    move v4, v6
 
-    move v6, v7
+    move-object v5, v7
 
-    move-object v7, v8
+    move v6, v8
+
+    move-object v7, v0
 
     move v8, v9
 
diff --git a/com.discord/smali_classes2/org/webrtc/VideoRenderer.smali b/com.discord/smali_classes2/org/webrtc/VideoRenderer.smali
index 32018be7b4..9730e6b08d 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoRenderer.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoRenderer;
 .super Ljava/lang/Object;
+.source "VideoRenderer.java"
 
 
 # annotations
@@ -95,8 +96,6 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lorg/webrtc/VideoRenderer;->nativeVideoRenderer:J
-
     invoke-static {v0, v1}, Lorg/webrtc/VideoRenderer;->nativeFreeWrappedVideoRenderer(J)V
 
     iput-wide v2, p0, Lorg/webrtc/VideoRenderer;->nativeVideoRenderer:J
diff --git a/com.discord/smali_classes2/org/webrtc/VideoSink.smali b/com.discord/smali_classes2/org/webrtc/VideoSink.smali
index 713e7f2589..8a4d48fada 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoSink.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoSink.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/VideoSink;
 .super Ljava/lang/Object;
+.source "VideoSink.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/org/webrtc/VideoSource.smali b/com.discord/smali_classes2/org/webrtc/VideoSource.smali
index 627b65fea6..ba407b0f8c 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoSource.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoSource.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoSource;
 .super Lorg/webrtc/MediaSource;
+.source "VideoSource.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/VideoTrack.smali b/com.discord/smali_classes2/org/webrtc/VideoTrack.smali
index 42379fd58f..a62ce56dad 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoTrack.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoTrack.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/VideoTrack;
 .super Lorg/webrtc/MediaStreamTrack;
+.source "VideoTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/WebRtcClassLoader.smali b/com.discord/smali_classes2/org/webrtc/WebRtcClassLoader.smali
index 60394124e3..a56c5b2f4d 100644
--- a/com.discord/smali_classes2/org/webrtc/WebRtcClassLoader.smali
+++ b/com.discord/smali_classes2/org/webrtc/WebRtcClassLoader.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/WebRtcClassLoader;
 .super Ljava/lang/Object;
+.source "WebRtcClassLoader.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/WrappedNativeI420Buffer.smali b/com.discord/smali_classes2/org/webrtc/WrappedNativeI420Buffer.smali
index 37e4103b9b..71a13f3e02 100644
--- a/com.discord/smali_classes2/org/webrtc/WrappedNativeI420Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/WrappedNativeI420Buffer.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/WrappedNativeI420Buffer;
 .super Ljava/lang/Object;
+.source "WrappedNativeI420Buffer.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoFrame$I420Buffer;
diff --git a/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoDecoder.smali b/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoDecoder.smali
index b89927d558..3b6a1d0592 100644
--- a/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoDecoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoDecoder.smali
@@ -1,5 +1,6 @@
 .class abstract Lorg/webrtc/WrappedNativeVideoDecoder;
 .super Ljava/lang/Object;
+.source "WrappedNativeVideoDecoder.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoDecoder;
diff --git a/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoEncoder.smali b/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoEncoder.smali
index 7f79bd751b..106cd3e2f4 100644
--- a/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoEncoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/WrappedNativeVideoEncoder.smali
@@ -1,5 +1,6 @@
 .class abstract Lorg/webrtc/WrappedNativeVideoEncoder;
 .super Ljava/lang/Object;
+.source "WrappedNativeVideoEncoder.java"
 
 # interfaces
 .implements Lorg/webrtc/VideoEncoder;
diff --git a/com.discord/smali_classes2/org/webrtc/YuvConverter$1.smali b/com.discord/smali_classes2/org/webrtc/YuvConverter$1.smali
index ed50967b6c..3654fe7c81 100644
--- a/com.discord/smali_classes2/org/webrtc/YuvConverter$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/YuvConverter$1.smali
@@ -1,5 +1,6 @@
 .class synthetic Lorg/webrtc/YuvConverter$1;
 .super Ljava/lang/Object;
+.source "YuvConverter.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/YuvConverter.smali b/com.discord/smali_classes2/org/webrtc/YuvConverter.smali
index bcdf0def43..cb4dc21add 100644
--- a/com.discord/smali_classes2/org/webrtc/YuvConverter.smali
+++ b/com.discord/smali_classes2/org/webrtc/YuvConverter.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/YuvConverter;
 .super Ljava/lang/Object;
+.source "YuvConverter.java"
 
 
 # static fields
@@ -395,8 +396,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/YuvConverter;->shader:Lorg/webrtc/GlShader;
-
     invoke-virtual {v0}, Lorg/webrtc/GlShader;->release()V
 
     :cond_0
@@ -687,8 +686,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/YuvConverter;->shader:Lorg/webrtc/GlShader;
-
     invoke-virtual {v0}, Lorg/webrtc/GlShader;->release()V
 
     :cond_0
diff --git a/com.discord/smali_classes2/org/webrtc/YuvHelper.smali b/com.discord/smali_classes2/org/webrtc/YuvHelper.smali
index 097003c948..37562711e9 100644
--- a/com.discord/smali_classes2/org/webrtc/YuvHelper.smali
+++ b/com.discord/smali_classes2/org/webrtc/YuvHelper.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/YuvHelper;
 .super Ljava/lang/Object;
+.source "YuvHelper.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/BuildInfo.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/BuildInfo.smali
index 0a098261ec..5bfa973faf 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/BuildInfo.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/BuildInfo.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/webrtc/voiceengine/BuildInfo;
 .super Ljava/lang/Object;
+.source "BuildInfo.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioEffects.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioEffects.smali
index b83b7d288d..f0a34399ae 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioEffects.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioEffects.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/voiceengine/WebRtcAudioEffects;
 .super Ljava/lang/Object;
+.source "WebRtcAudioEffects.java"
 
 
 # static fields
@@ -284,8 +285,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->cachedEffects:[Landroid/media/audiofx/AudioEffect$Descriptor;
-
     return-object v0
 
     :cond_0
@@ -605,9 +604,9 @@
 
     iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->aec:Landroid/media/audiofx/AcousticEchoCanceler;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     if-nez v0, :cond_0
 
@@ -651,8 +650,6 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->aec:Landroid/media/audiofx/AcousticEchoCanceler;
-
     invoke-virtual {v0}, Landroid/media/audiofx/AcousticEchoCanceler;->getEnabled()Z
 
     move-result v0
@@ -771,8 +768,6 @@
 
     if-eqz p1, :cond_c
 
-    iget-object p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->ns:Landroid/media/audiofx/NoiseSuppressor;
-
     invoke-virtual {p1}, Landroid/media/audiofx/NoiseSuppressor;->getEnabled()Z
 
     move-result p1
@@ -787,9 +782,12 @@
 
     if-eqz v0, :cond_8
 
-    const/4 v1, 0x1
+    goto :goto_6
 
     :cond_8
+    const/4 v1, 0x0
+
+    :goto_6
     iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->ns:Landroid/media/audiofx/NoiseSuppressor;
 
     invoke-virtual {v0, v1}, Landroid/media/audiofx/NoiseSuppressor;->setEnabled(Z)I
@@ -817,12 +815,12 @@
 
     const-string p1, "enabled"
 
-    goto :goto_6
+    goto :goto_7
 
     :cond_a
     const-string p1, "disabled"
 
-    :goto_6
+    :goto_7
     invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string p1, ", enable: "
@@ -845,12 +843,12 @@
 
     const-string p1, "enabled"
 
-    goto :goto_7
+    goto :goto_8
 
     :cond_b
     const-string p1, "disabled"
 
-    :goto_7
+    :goto_8
     invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
@@ -887,8 +885,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->aec:Landroid/media/audiofx/AcousticEchoCanceler;
-
     invoke-virtual {v0}, Landroid/media/audiofx/AcousticEchoCanceler;->release()V
 
     iput-object v1, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->aec:Landroid/media/audiofx/AcousticEchoCanceler;
@@ -898,8 +894,6 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->ns:Landroid/media/audiofx/NoiseSuppressor;
-
     invoke-virtual {v0}, Landroid/media/audiofx/NoiseSuppressor;->release()V
 
     iput-object v1, p0, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->ns:Landroid/media/audiofx/NoiseSuppressor;
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger$LogVolumeTask.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger$LogVolumeTask.smali
index e10a8eb2f8..e6f577239f 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger$LogVolumeTask.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger$LogVolumeTask.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger$LogVolumeTask;
 .super Ljava/util/TimerTask;
+.source "WebRtcAudioManager.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger.smali
index 76b3de56cb..aab51cfb1c 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger;
 .super Ljava/lang/Object;
+.source "WebRtcAudioManager.java"
 
 
 # annotations
@@ -65,8 +66,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioManager$VolumeLogger;->timer:Ljava/util/Timer;
-
     invoke-virtual {v0}, Ljava/util/Timer;->cancel()V
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager.smali
index ca2c077466..e5513c3335 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioManager.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/voiceengine/WebRtcAudioManager;
 .super Ljava/lang/Object;
+.source "WebRtcAudioManager.java"
 
 
 # annotations
@@ -861,9 +862,9 @@
 
     move-result v0
 
-    const/4 v1, 0x1
+    const/4 v1, 0x2
 
-    const/4 v2, 0x2
+    const/4 v2, 0x1
 
     if-eqz v0, :cond_0
 
@@ -883,9 +884,12 @@
 
     if-eqz v0, :cond_1
 
-    const/4 v1, 0x2
+    goto :goto_1
 
     :cond_1
+    const/4 v1, 0x1
+
+    :goto_1
     iput v1, p0, Lorg/webrtc/voiceengine/WebRtcAudioManager;->inputChannels:I
 
     invoke-direct {p0}, Lorg/webrtc/voiceengine/WebRtcAudioManager;->getNativeOutputSampleRate()I
@@ -936,7 +940,7 @@
 
     move-result v0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     iget v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioManager;->sampleRate:I
@@ -947,7 +951,7 @@
 
     move-result v0
 
-    :goto_1
+    :goto_2
     iput v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioManager;->outputBufferSize:I
 
     iget-boolean v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioManager;->lowLatencyInput:Z
@@ -958,7 +962,7 @@
 
     move-result v0
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     iget v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioManager;->sampleRate:I
@@ -969,7 +973,7 @@
 
     move-result v0
 
-    :goto_2
+    :goto_3
     iput v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioManager;->inputBufferSize:I
 
     return-void
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordStartErrorCode.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordStartErrorCode.smali
index 1a8e1e5564..a86fd1791d 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordStartErrorCode.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordStartErrorCode.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordStartErrorCode;
 .super Ljava/lang/Enum;
+.source "WebRtcAudioRecord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordThread.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordThread.smali
index 3eebd9d07a..2f37ef281e 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordThread.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordThread.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordThread;
 .super Ljava/lang/Thread;
+.source "WebRtcAudioRecord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback.smali
index 0a5a8eb79c..3916d7f89a 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback;
 .super Ljava/lang/Object;
+.source "WebRtcAudioRecord.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord.smali
index 3bf1bb836d..b29f08b51c 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioRecord.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/voiceengine/WebRtcAudioRecord;
 .super Ljava/lang/Object;
+.source "WebRtcAudioRecord.java"
 
 
 # annotations
@@ -253,8 +254,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->effects:Lorg/webrtc/voiceengine/WebRtcAudioEffects;
-
     invoke-virtual {v0, p1}, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->setAEC(Z)Z
 
     move-result p1
@@ -300,8 +299,6 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->effects:Lorg/webrtc/voiceengine/WebRtcAudioEffects;
-
     invoke-virtual {v0, p1}, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->setNS(Z)Z
 
     move-result p1
@@ -489,8 +486,6 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->audioRecord:Landroid/media/AudioRecord;
-
     invoke-virtual {p1}, Landroid/media/AudioRecord;->getState()I
 
     move-result p1
@@ -506,8 +501,6 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->effects:Lorg/webrtc/voiceengine/WebRtcAudioEffects;
-
     iget-object p2, p0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->audioRecord:Landroid/media/AudioRecord;
 
     invoke-virtual {p2}, Landroid/media/AudioRecord;->getAudioSessionId()I
@@ -684,8 +677,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->audioRecord:Landroid/media/AudioRecord;
-
     invoke-virtual {v0}, Landroid/media/AudioRecord;->release()V
 
     const/4 v0, 0x0
@@ -721,8 +712,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->errorCallback:Lorg/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback;
-
     invoke-interface {v0, p1}, Lorg/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback;->onWebRtcAudioRecordError(Ljava/lang/String;)V
 
     :cond_0
@@ -754,8 +743,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->errorCallback:Lorg/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback;
-
     invoke-interface {v0, p1}, Lorg/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback;->onWebRtcAudioRecordInitError(Ljava/lang/String;)V
 
     :cond_0
@@ -795,8 +782,6 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->errorCallback:Lorg/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback;
-
     invoke-interface {v0, p1, p2}, Lorg/webrtc/voiceengine/WebRtcAudioRecord$WebRtcAudioRecordErrorCallback;->onWebRtcAudioRecordStartError(Lorg/webrtc/voiceengine/WebRtcAudioRecord$AudioRecordStartErrorCode;Ljava/lang/String;)V
 
     :cond_0
@@ -1092,8 +1077,6 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioRecord;->effects:Lorg/webrtc/voiceengine/WebRtcAudioEffects;
-
     invoke-virtual {v0}, Lorg/webrtc/voiceengine/WebRtcAudioEffects;->release()V
 
     :cond_2
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackStartErrorCode.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackStartErrorCode.smali
index 32080ae508..ebb63b2f39 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackStartErrorCode.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackStartErrorCode.smali
@@ -1,5 +1,6 @@
 .class public final enum Lorg/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackStartErrorCode;
 .super Ljava/lang/Enum;
+.source "WebRtcAudioTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackThread.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackThread.smali
index d8ab8a9795..ac2b05b3a3 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackThread.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackThread.smali
@@ -1,5 +1,6 @@
 .class Lorg/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackThread;
 .super Ljava/lang/Thread;
+.source "WebRtcAudioTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback.smali
index e8d652e004..c42be1e9ad 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback;
 .super Ljava/lang/Object;
+.source "WebRtcAudioTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$WebRtcAudioTrackErrorCallback.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$WebRtcAudioTrackErrorCallback.smali
index ee05ffd925..679cc2f640 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$WebRtcAudioTrackErrorCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack$WebRtcAudioTrackErrorCallback.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lorg/webrtc/voiceengine/WebRtcAudioTrack$WebRtcAudioTrackErrorCallback;
 .super Ljava/lang/Object;
+.source "WebRtcAudioTrack.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali
index 9a61f3012d..f6d3c3b513 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali
@@ -1,5 +1,6 @@
 .class public Lorg/webrtc/voiceengine/WebRtcAudioTrack;
 .super Ljava/lang/Object;
+.source "WebRtcAudioTrack.java"
 
 
 # annotations
@@ -637,27 +638,24 @@
 
     move-result-object p1
 
-    :goto_0
     iput-object p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioTrack:Landroid/media/AudioTrack;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     invoke-static {p1, p2, v0}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->createAudioTrackOnLowerThanLollipop(III)Landroid/media/AudioTrack;
 
     move-result-object p1
+
+    iput-object p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioTrack:Landroid/media/AudioTrack;
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_0
-
-    :goto_1
+    :goto_0
     iget-object p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioTrack:Landroid/media/AudioTrack;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioTrack:Landroid/media/AudioTrack;
-
     invoke-virtual {p1}, Landroid/media/AudioTrack;->getState()I
 
     move-result p1
@@ -666,7 +664,7 @@
 
     if-eq p1, p2, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     invoke-direct {p0}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->logMainParameters()V
@@ -676,7 +674,7 @@
     return p2
 
     :cond_4
-    :goto_2
+    :goto_1
     const-string p1, "Initialization of audio track failed."
 
     invoke-direct {p0, p1}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->reportWebRtcAudioTrackInitError(Ljava/lang/String;)V
@@ -913,8 +911,6 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioTrack:Landroid/media/AudioTrack;
-
     invoke-virtual {v0}, Landroid/media/AudioTrack;->release()V
 
     const/4 v0, 0x0
@@ -959,8 +955,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->errorCallback:Lorg/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback;
-
     invoke-interface {v0, p1}, Lorg/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback;->onWebRtcAudioTrackError(Ljava/lang/String;)V
 
     :cond_1
@@ -1001,8 +995,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->errorCallback:Lorg/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback;
-
     invoke-interface {v0, p1}, Lorg/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback;->onWebRtcAudioTrackInitError(Ljava/lang/String;)V
 
     :cond_1
@@ -1051,8 +1043,6 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->errorCallback:Lorg/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback;
-
     invoke-interface {v0, p1, p2}, Lorg/webrtc/voiceengine/WebRtcAudioTrack$ErrorCallback;->onWebRtcAudioTrackStartError(Lorg/webrtc/voiceengine/WebRtcAudioTrack$AudioTrackStartErrorCode;Ljava/lang/String;)V
 
     :cond_1
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioUtils.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioUtils.smali
index 36e31b4de6..03147d8289 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioUtils.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioUtils.smali
@@ -1,5 +1,6 @@
 .class public final Lorg/webrtc/voiceengine/WebRtcAudioUtils;
 .super Ljava/lang/Object;
+.source "WebRtcAudioUtils.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/rx/Emitter$a.smali b/com.discord/smali_classes2/rx/Emitter$a.smali
index 27418c8f36..c3848cb5b7 100644
--- a/com.discord/smali_classes2/rx/Emitter$a.smali
+++ b/com.discord/smali_classes2/rx/Emitter$a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/Emitter$a;
 .super Ljava/lang/Enum;
+.source "Emitter.java"
 
 
 # annotations
@@ -22,17 +23,17 @@
 
 
 # static fields
-.field public static final cmK:I = 0x1
+.field public static final cme:I = 0x1
 
-.field public static final cmL:I = 0x2
+.field public static final cmf:I = 0x2
 
-.field public static final cmM:I = 0x3
+.field public static final cmg:I = 0x3
 
-.field public static final cmN:I = 0x4
+.field public static final cmh:I = 0x4
 
-.field public static final cmO:I = 0x5
+.field public static final cmi:I = 0x5
 
-.field private static final synthetic cmP:[I
+.field private static final synthetic cmj:[I
 
 
 # direct methods
@@ -43,45 +44,45 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lrx/Emitter$a;->cmK:I
+    sget v1, Lrx/Emitter$a;->cme:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->cmL:I
+    sget v1, Lrx/Emitter$a;->cmf:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->cmM:I
+    sget v1, Lrx/Emitter$a;->cmg:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->cmN:I
+    sget v1, Lrx/Emitter$a;->cmh:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->cmO:I
+    sget v1, Lrx/Emitter$a;->cmi:I
 
     const/4 v2, 0x4
 
     aput v1, v0, v2
 
-    sput-object v0, Lrx/Emitter$a;->cmP:[I
+    sput-object v0, Lrx/Emitter$a;->cmj:[I
 
     return-void
 .end method
 
-.method public static Kv()[I
+.method public static Ku()[I
     .locals 1
 
-    sget-object v0, Lrx/Emitter$a;->cmP:[I
+    sget-object v0, Lrx/Emitter$a;->cmj:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/Emitter.smali b/com.discord/smali_classes2/rx/Emitter.smali
index 8a4f70fee2..c6ad713cca 100644
--- a/com.discord/smali_classes2/rx/Emitter.smali
+++ b/com.discord/smali_classes2/rx/Emitter.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/Emitter;
 .super Ljava/lang/Object;
+.source "Emitter.java"
 
 # interfaces
 .implements Lrx/e;
diff --git a/com.discord/smali_classes2/rx/Observable$a.smali b/com.discord/smali_classes2/rx/Observable$a.smali
index 2fa3733a77..a32f634dab 100644
--- a/com.discord/smali_classes2/rx/Observable$a.smali
+++ b/com.discord/smali_classes2/rx/Observable$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/Observable$a;
 .super Ljava/lang/Object;
+.source "Observable.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali_classes2/rx/Observable$b.smali b/com.discord/smali_classes2/rx/Observable$b.smali
index 3caa0f77f6..86fe761603 100644
--- a/com.discord/smali_classes2/rx/Observable$b.smali
+++ b/com.discord/smali_classes2/rx/Observable$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/Observable$b;
 .super Ljava/lang/Object;
+.source "Observable.java"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali_classes2/rx/Producer.smali b/com.discord/smali_classes2/rx/Producer.smali
index c48840cd20..f47ec113c2 100644
--- a/com.discord/smali_classes2/rx/Producer.smali
+++ b/com.discord/smali_classes2/rx/Producer.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/Producer;
 .super Ljava/lang/Object;
+.source "Producer.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/rx/Scheduler$Worker.smali b/com.discord/smali_classes2/rx/Scheduler$Worker.smali
index da8a8171d5..edf46e60c3 100644
--- a/com.discord/smali_classes2/rx/Scheduler$Worker.smali
+++ b/com.discord/smali_classes2/rx/Scheduler$Worker.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/Scheduler$Worker;
 .super Ljava/lang/Object;
+.source "Scheduler.java"
 
 # interfaces
 .implements Lrx/Subscription;
diff --git a/com.discord/smali_classes2/rx/Scheduler.smali b/com.discord/smali_classes2/rx/Scheduler.smali
index 262a32046e..dbf91aec91 100644
--- a/com.discord/smali_classes2/rx/Scheduler.smali
+++ b/com.discord/smali_classes2/rx/Scheduler.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/Scheduler;
 .super Ljava/lang/Object;
+.source "Scheduler.java"
 
 
 # annotations
@@ -31,5 +32,5 @@
 
 
 # virtual methods
-.method public abstract KM()Lrx/Scheduler$Worker;
+.method public abstract KL()Lrx/Scheduler$Worker;
 .end method
diff --git a/com.discord/smali_classes2/rx/Subscriber.smali b/com.discord/smali_classes2/rx/Subscriber.smali
index 3fe90bb7e6..380c830275 100644
--- a/com.discord/smali_classes2/rx/Subscriber.smali
+++ b/com.discord/smali_classes2/rx/Subscriber.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/Subscriber;
 .super Ljava/lang/Object;
+.source "Subscriber.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -124,8 +125,6 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lrx/Subscriber;->requested:J
-
     add-long/2addr v0, p1
 
     const-wide/16 p1, 0x0
diff --git a/com.discord/smali_classes2/rx/a$a.smali b/com.discord/smali_classes2/rx/a$a.smali
index 21c9dfb6fd..1924f9251b 100644
--- a/com.discord/smali_classes2/rx/a$a.smali
+++ b/com.discord/smali_classes2/rx/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/a$a;
 .super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
 
 # interfaces
 .implements Lrx/a$d;
@@ -17,7 +18,7 @@
 
 
 # static fields
-.field static final cmB:Lrx/a$a;
+.field static final clU:Lrx/a$a;
 
 
 # direct methods
@@ -28,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$a;-><init>()V
 
-    sput-object v0, Lrx/a$a;->cmB:Lrx/a$a;
+    sput-object v0, Lrx/a$a;->clU:Lrx/a$a;
 
     return-void
 .end method
@@ -43,7 +44,7 @@
 
 
 # virtual methods
-.method public final Ku()Z
+.method public final Kt()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 93106ec123..7a98348516 100644
--- a/com.discord/smali_classes2/rx/a$b.smali
+++ b/com.discord/smali_classes2/rx/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/a$b;
 .super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
 
 # interfaces
 .implements Lrx/a$d;
@@ -17,7 +18,7 @@
 
 
 # static fields
-.field static final cmC:Lrx/a$b;
+.field static final clV:Lrx/a$b;
 
 
 # direct methods
@@ -28,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$b;-><init>()V
 
-    sput-object v0, Lrx/a$b;->cmC:Lrx/a$b;
+    sput-object v0, Lrx/a$b;->clV:Lrx/a$b;
 
     return-void
 .end method
@@ -43,7 +44,7 @@
 
 
 # virtual methods
-.method public final Ku()Z
+.method public final Kt()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 36c0a64f0f..dbb9b0dfc7 100644
--- a/com.discord/smali_classes2/rx/a$c.smali
+++ b/com.discord/smali_classes2/rx/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/a$c;
 .super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
 
 # interfaces
 .implements Lrx/a$d;
@@ -17,7 +18,7 @@
 
 
 # static fields
-.field static final cmD:Lrx/a$c;
+.field static final clW:Lrx/a$c;
 
 
 # direct methods
@@ -28,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$c;-><init>()V
 
-    sput-object v0, Lrx/a$c;->cmD:Lrx/a$c;
+    sput-object v0, Lrx/a$c;->clW:Lrx/a$c;
 
     return-void
 .end method
@@ -43,7 +44,7 @@
 
 
 # virtual methods
-.method public final Ku()Z
+.method public final Kt()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 c9b4fdbf40..f607cd3da7 100644
--- a/com.discord/smali_classes2/rx/a$d.smali
+++ b/com.discord/smali_classes2/rx/a$d.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/a$d;
 .super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Ku()Z
+.method public abstract Kt()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 978ecad74b..c74adf86aa 100644
--- a/com.discord/smali_classes2/rx/a.smali
+++ b/com.discord/smali_classes2/rx/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a;
 .super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
 
 
 # annotations
@@ -14,32 +15,32 @@
 
 
 # static fields
-.field public static final cmA:Lrx/a$d;
+.field public static final clQ:Lrx/a$d;
 
-.field public static final cmx:Lrx/a$d;
+.field public static final clR:Lrx/a$d;
 
-.field public static final cmy:Lrx/a$d;
+.field public static final clS:Lrx/a$d;
 
-.field public static final cmz:Lrx/a$d;
+.field public static final clT:Lrx/a$d;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lrx/a$c;->cmD:Lrx/a$c;
+    sget-object v0, Lrx/a$c;->clW:Lrx/a$c;
 
-    sput-object v0, Lrx/a;->cmx:Lrx/a$d;
+    sput-object v0, Lrx/a;->clQ:Lrx/a$d;
 
-    sput-object v0, Lrx/a;->cmy:Lrx/a$d;
+    sput-object v0, Lrx/a;->clR:Lrx/a$d;
 
-    sget-object v0, Lrx/a$b;->cmC:Lrx/a$b;
+    sget-object v0, Lrx/a$b;->clV:Lrx/a$b;
 
-    sput-object v0, Lrx/a;->cmz:Lrx/a$d;
+    sput-object v0, Lrx/a;->clS:Lrx/a$d;
 
-    sget-object v0, Lrx/a$a;->cmB:Lrx/a$a;
+    sget-object v0, Lrx/a$a;->clU:Lrx/a$a;
 
-    sput-object v0, Lrx/a;->cmA:Lrx/a$d;
+    sput-object v0, Lrx/a;->clT:Lrx/a$d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/a/a$a.smali b/com.discord/smali_classes2/rx/a/a$a.smali
index cbd871da03..0275cc1130 100644
--- a/com.discord/smali_classes2/rx/a/a$a.smali
+++ b/com.discord/smali_classes2/rx/a/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/a/a$a;
 .super Ljava/lang/RuntimeException;
+.source "CompositeException.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/a/a$b.smali b/com.discord/smali_classes2/rx/a/a$b.smali
index 9a85c9fa39..793323a7ab 100644
--- a/com.discord/smali_classes2/rx/a/a$b.smali
+++ b/com.discord/smali_classes2/rx/a/a$b.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/a/a$b;
 .super Ljava/lang/Object;
+.source "CompositeException.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # virtual methods
-.method abstract KR()Ljava/lang/Object;
+.method abstract KQ()Ljava/lang/Object;
 .end method
 
 .method abstract println(Ljava/lang/Object;)V
diff --git a/com.discord/smali_classes2/rx/a/a$c.smali b/com.discord/smali_classes2/rx/a/a$c.smali
index 0c6563b092..f3d15d91ec 100644
--- a/com.discord/smali_classes2/rx/a/a$c.smali
+++ b/com.discord/smali_classes2/rx/a/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/a/a$c;
 .super Lrx/a/a$b;
+.source "CompositeException.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field private final cng:Ljava/io/PrintStream;
+.field private final cmA:Ljava/io/PrintStream;
 
 
 # direct methods
@@ -23,17 +24,17 @@
 
     invoke-direct {p0}, Lrx/a/a$b;-><init>()V
 
-    iput-object p1, p0, Lrx/a/a$c;->cng:Ljava/io/PrintStream;
+    iput-object p1, p0, Lrx/a/a$c;->cmA:Ljava/io/PrintStream;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final KR()Ljava/lang/Object;
+.method final KQ()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$c;->cng:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->cmA:Ljava/io/PrintStream;
 
     return-object v0
 .end method
@@ -41,7 +42,7 @@
 .method final println(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$c;->cng:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->cmA: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 a15de56017..54ce27c68f 100644
--- a/com.discord/smali_classes2/rx/a/a$d.smali
+++ b/com.discord/smali_classes2/rx/a/a$d.smali
@@ -1,5 +1,6 @@
 .class final Lrx/a/a$d;
 .super Lrx/a/a$b;
+.source "CompositeException.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field private final cnh:Ljava/io/PrintWriter;
+.field private final cmB:Ljava/io/PrintWriter;
 
 
 # direct methods
@@ -23,17 +24,17 @@
 
     invoke-direct {p0}, Lrx/a/a$b;-><init>()V
 
-    iput-object p1, p0, Lrx/a/a$d;->cnh:Ljava/io/PrintWriter;
+    iput-object p1, p0, Lrx/a/a$d;->cmB:Ljava/io/PrintWriter;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final KR()Ljava/lang/Object;
+.method final KQ()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$d;->cnh:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->cmB:Ljava/io/PrintWriter;
 
     return-object v0
 .end method
@@ -41,7 +42,7 @@
 .method final println(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$d;->cnh:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->cmB: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 e2cdcba34e..806d2beaa9 100644
--- a/com.discord/smali_classes2/rx/a/a.smali
+++ b/com.discord/smali_classes2/rx/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/a;
 .super Ljava/lang/RuntimeException;
+.source "CompositeException.java"
 
 
 # annotations
@@ -93,7 +94,6 @@
     :cond_0
     if-eqz v2, :cond_1
 
-    :goto_1
     invoke-interface {v0, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
@@ -103,7 +103,9 @@
 
     invoke-direct {v2}, Ljava/lang/NullPointerException;-><init>()V
 
-    goto :goto_1
+    invoke-interface {v0, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
 
     :cond_2
     new-instance p1, Ljava/lang/NullPointerException;
@@ -195,24 +197,23 @@
 
     invoke-interface {v0, v3}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     if-eqz v3, :cond_1
 
-    :goto_1
     invoke-interface {v0, v3}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     new-instance v3, Ljava/lang/NullPointerException;
 
     invoke-direct {v3}, Ljava/lang/NullPointerException;-><init>()V
 
-    goto :goto_1
+    invoke-interface {v0, v3}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    :goto_2
+    :goto_1
     add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
@@ -272,11 +273,11 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     if-ne v1, p0, :cond_0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_0
     :goto_0
@@ -302,6 +303,10 @@
     :cond_2
     :goto_1
     return-object v0
+
+    :cond_3
+    :goto_2
+    return-object v0
 .end method
 
 .method private a(Ljava/lang/StringBuilder;Ljava/lang/Throwable;Ljava/lang/String;)V
@@ -447,7 +452,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p1}, Lrx/a/a$b;->KR()Ljava/lang/Object;
+    invoke-virtual {p1}, Lrx/a/a$b;->KQ()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -472,6 +477,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method private static getRootCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
@@ -640,6 +647,8 @@
     monitor-exit p0
 
     throw v0
+
+    return-void
 .end method
 
 .method public final getMessage()Ljava/lang/String;
diff --git a/com.discord/smali_classes2/rx/a/b.smali b/com.discord/smali_classes2/rx/a/b.smali
index 02abdd0cab..c92c65365a 100644
--- a/com.discord/smali_classes2/rx/a/b.smali
+++ b/com.discord/smali_classes2/rx/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/b;
 .super Ljava/lang/Object;
+.source "Exceptions.java"
 
 
 # direct methods
@@ -298,6 +299,8 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
+    return-void
+
     :catch_0
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/a/c.smali b/com.discord/smali_classes2/rx/a/c.smali
index 51ecf03391..5e75540b21 100644
--- a/com.discord/smali_classes2/rx/a/c.smali
+++ b/com.discord/smali_classes2/rx/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/c;
 .super Ljava/lang/Exception;
+.source "MissingBackpressureException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/rx/a/d.smali b/com.discord/smali_classes2/rx/a/d.smali
index f0f87abfdf..407bc1cfcf 100644
--- a/com.discord/smali_classes2/rx/a/d.smali
+++ b/com.discord/smali_classes2/rx/a/d.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/d;
 .super Ljava/lang/RuntimeException;
+.source "OnCompletedFailedException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/rx/a/e.smali b/com.discord/smali_classes2/rx/a/e.smali
index 1f239394d6..26a57dc61e 100644
--- a/com.discord/smali_classes2/rx/a/e.smali
+++ b/com.discord/smali_classes2/rx/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/e;
 .super Ljava/lang/RuntimeException;
+.source "OnErrorFailedException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/rx/a/f.smali b/com.discord/smali_classes2/rx/a/f.smali
index 768a7dcf65..5ff372fc2a 100644
--- a/com.discord/smali_classes2/rx/a/f.smali
+++ b/com.discord/smali_classes2/rx/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/f;
 .super Ljava/lang/RuntimeException;
+.source "OnErrorNotImplementedException.java"
 
 
 # static fields
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 a867d395cd..d64eace256 100644
--- a/com.discord/smali_classes2/rx/a/g$a$a.smali
+++ b/com.discord/smali_classes2/rx/a/g$a$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/a/g$a$a;
 .super Ljava/lang/Object;
+.source "OnErrorThrowable.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final cni:Ljava/util/Set;
+.field static final cmC:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -65,7 +66,7 @@
 
     invoke-interface {v0, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    sput-object v0, Lrx/a/g$a$a;->cni:Ljava/util/Set;
+    sput-object v0, Lrx/a/g$a$a;->cmC: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 065188c458..1c31ec8d52 100644
--- a/com.discord/smali_classes2/rx/a/g$a.smali
+++ b/com.discord/smali_classes2/rx/a/g$a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/g$a;
 .super Ljava/lang/RuntimeException;
+.source "OnErrorThrowable.java"
 
 
 # annotations
@@ -44,7 +45,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lrx/a/g$a$a;->cni:Ljava/util/Set;
+    sget-object v1, Lrx/a/g$a$a;->cmC:Ljava/util/Set;
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -89,11 +90,11 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->LU()Lrx/c/b;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/rx/a/g.smali b/com.discord/smali_classes2/rx/a/g.smali
index b5f4e2b087..da59681fd9 100644
--- a/com.discord/smali_classes2/rx/a/g.smali
+++ b/com.discord/smali_classes2/rx/a/g.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/g;
 .super Ljava/lang/RuntimeException;
+.source "OnErrorThrowable.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/a/h.smali b/com.discord/smali_classes2/rx/a/h.smali
index ccca03b243..0a9dbece1f 100644
--- a/com.discord/smali_classes2/rx/a/h.smali
+++ b/com.discord/smali_classes2/rx/a/h.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/a/h;
 .super Ljava/lang/RuntimeException;
+.source "UnsubscribeFailedException.java"
 
 
 # static fields
diff --git a/com.discord/smali_classes2/rx/android/R.smali b/com.discord/smali_classes2/rx/android/R.smali
index 808b13838a..9d009a25dd 100644
--- a/com.discord/smali_classes2/rx/android/R.smali
+++ b/com.discord/smali_classes2/rx/android/R.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/android/R;
 .super Ljava/lang/Object;
+.source "R.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/android/a/a.smali b/com.discord/smali_classes2/rx/android/a/a.smali
index 5beff203c4..4d95750aa2 100644
--- a/com.discord/smali_classes2/rx/android/a/a.smali
+++ b/com.discord/smali_classes2/rx/android/a/a.smali
@@ -1,13 +1,14 @@
 .class public final Lrx/android/a/a;
 .super Ljava/lang/Object;
+.source "RxAndroidPlugins.java"
 
 
 # static fields
-.field private static final cmZ:Lrx/android/a/a;
+.field private static final cmt:Lrx/android/a/a;
 
 
 # instance fields
-.field private final cna:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final cmu:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -26,7 +27,7 @@
 
     invoke-direct {v0}, Lrx/android/a/a;-><init>()V
 
-    sput-object v0, Lrx/android/a/a;->cmZ:Lrx/android/a/a;
+    sput-object v0, Lrx/android/a/a;->cmt:Lrx/android/a/a;
 
     return-void
 .end method
@@ -40,25 +41,25 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/android/a/a;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/android/a/a;->cmu:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static KN()Lrx/android/a/a;
+.method public static KM()Lrx/android/a/a;
     .locals 1
 
-    sget-object v0, Lrx/android/a/a;->cmZ:Lrx/android/a/a;
+    sget-object v0, Lrx/android/a/a;->cmt:Lrx/android/a/a;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final KO()Lrx/android/a/b;
+.method public final KN()Lrx/android/a/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/android/a/a;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->cmu:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -66,18 +67,18 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/android/a/a;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->cmu:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
-    invoke-static {}, Lrx/android/a/b;->KP()Lrx/android/a/b;
+    invoke-static {}, Lrx/android/a/b;->KO()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;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->cmu: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 1c75b5b7b6..202022a1e6 100644
--- a/com.discord/smali_classes2/rx/android/a/b.smali
+++ b/com.discord/smali_classes2/rx/android/a/b.smali
@@ -1,9 +1,10 @@
 .class public final Lrx/android/a/b;
 .super Ljava/lang/Object;
+.source "RxAndroidSchedulersHook.java"
 
 
 # static fields
-.field private static final cnb:Lrx/android/a/b;
+.field private static final cmv:Lrx/android/a/b;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/android/a/b;-><init>()V
 
-    sput-object v0, Lrx/android/a/b;->cnb:Lrx/android/a/b;
+    sput-object v0, Lrx/android/a/b;->cmv:Lrx/android/a/b;
 
     return-void
 .end method
@@ -27,10 +28,10 @@
     return-void
 .end method
 
-.method public static KP()Lrx/android/a/b;
+.method public static KO()Lrx/android/a/b;
     .locals 1
 
-    sget-object v0, Lrx/android/a/b;->cnb:Lrx/android/a/b;
+    sget-object v0, Lrx/android/a/b;->cmv: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 64a4cf6aee..3d5e3d6f29 100644
--- a/com.discord/smali_classes2/rx/android/b/a.smali
+++ b/com.discord/smali_classes2/rx/android/b/a.smali
@@ -1,9 +1,10 @@
 .class public final Lrx/android/b/a;
 .super Ljava/lang/Object;
+.source "AndroidSchedulers.java"
 
 
 # static fields
-.field private static final cnc:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final cmw:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -15,7 +16,7 @@
 
 
 # instance fields
-.field private final cnd:Lrx/Scheduler;
+.field private final cmx:Lrx/Scheduler;
 
 
 # direct methods
@@ -26,7 +27,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lrx/android/b/a;->cnc:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/android/b/a;->cmw:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -36,11 +37,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lrx/android/a/a;->KN()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->KM()Lrx/android/a/a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/android/a/a;->KO()Lrx/android/a/b;
+    invoke-virtual {v0}, Lrx/android/a/a;->KN()Lrx/android/a/b;
 
     new-instance v0, Lrx/android/b/b;
 
@@ -50,16 +51,16 @@
 
     invoke-direct {v0, v1}, Lrx/android/b/b;-><init>(Landroid/os/Looper;)V
 
-    iput-object v0, p0, Lrx/android/b/a;->cnd:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/android/b/a;->cmx:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method public static KQ()Lrx/Scheduler;
+.method public static KP()Lrx/Scheduler;
     .locals 3
 
     :cond_0
-    sget-object v0, Lrx/android/b/a;->cnc:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/android/b/a;->cmw:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -76,7 +77,7 @@
 
     invoke-direct {v0}, Lrx/android/b/a;-><init>()V
 
-    sget-object v1, Lrx/android/b/a;->cnc:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/android/b/a;->cmw:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -87,7 +88,7 @@
     if-eqz v1, :cond_0
 
     :goto_0
-    iget-object v0, v0, Lrx/android/b/a;->cnd:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/android/b/a;->cmx: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 f946ec4220..dba9ad6ad2 100644
--- a/com.discord/smali_classes2/rx/android/b/b$a.smali
+++ b/com.discord/smali_classes2/rx/android/b/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/android/b/b$a;
 .super Lrx/Scheduler$Worker;
+.source "LooperScheduler.java"
 
 
 # annotations
@@ -14,9 +15,9 @@
 
 
 # instance fields
-.field private final cne:Lrx/android/a/b;
+.field private final cmy:Lrx/android/a/b;
 
-.field private volatile cnf:Z
+.field private volatile cmz:Z
 
 .field private final handler:Landroid/os/Handler;
 
@@ -29,15 +30,15 @@
 
     iput-object p1, p0, Lrx/android/b/b$a;->handler:Landroid/os/Handler;
 
-    invoke-static {}, Lrx/android/a/a;->KN()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->KM()Lrx/android/a/a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/android/a/a;->KO()Lrx/android/a/b;
+    invoke-virtual {p1}, Lrx/android/a/a;->KN()Lrx/android/a/b;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/android/b/b$a;->cne:Lrx/android/a/b;
+    iput-object p1, p0, Lrx/android/b/b$a;->cmy:Lrx/android/a/b;
 
     return-void
 .end method
@@ -47,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;->cnf:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->cmz:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -84,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;->cnf:Z
+    iget-boolean p1, p0, Lrx/android/b/b$a;->cmz:Z
 
     if-eqz p1, :cond_1
 
@@ -92,7 +93,7 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -119,7 +120,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/android/b/b$a;->cnf:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->cmz:Z
 
     return v0
 .end method
@@ -129,7 +130,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/android/b/b$a;->cnf:Z
+    iput-boolean v0, p0, Lrx/android/b/b$a;->cmz: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 246d5f7691..6be4aee393 100644
--- a/com.discord/smali_classes2/rx/android/b/b$b.smali
+++ b/com.discord/smali_classes2/rx/android/b/b$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/android/b/b$b;
 .super Ljava/lang/Object;
+.source "LooperScheduler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -20,7 +21,7 @@
 # instance fields
 .field private final action:Lrx/functions/Action0;
 
-.field private volatile cnf:Z
+.field private volatile cmz:Z
 
 .field private final handler:Landroid/os/Handler;
 
@@ -43,7 +44,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/android/b/b$b;->cnf:Z
+    iget-boolean v0, p0, Lrx/android/b/b$b;->cmz:Z
 
     return v0
 .end method
@@ -83,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;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {v0}, Lrx/c/f;->LU()Lrx/c/b;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -107,7 +108,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/android/b/b$b;->cnf:Z
+    iput-boolean v0, p0, Lrx/android/b/b$b;->cmz: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 dd40f7b58d..0a0608953e 100644
--- a/com.discord/smali_classes2/rx/android/b/b.smali
+++ b/com.discord/smali_classes2/rx/android/b/b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/android/b/b;
 .super Lrx/Scheduler;
+.source "LooperScheduler.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
 
 
 # virtual methods
-.method public final KM()Lrx/Scheduler$Worker;
+.method public final KL()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 eb823bfd3e..120f950f3a 100644
--- a/com.discord/smali_classes2/rx/b$1.smali
+++ b/com.discord/smali_classes2/rx/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/b$1;
 .super Ljava/lang/Object;
+.source "Completable.java"
 
 # interfaces
 .implements Lrx/b$a;
@@ -30,7 +31,7 @@
 .method public final synthetic call(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()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 d99ac9d4b7..4fb815b11d 100644
--- a/com.discord/smali_classes2/rx/b$2$1.smali
+++ b/com.discord/smali_classes2/rx/b$2$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/b$2$1;
 .super Lrx/Subscriber;
+.source "Completable.java"
 
 
 # annotations
@@ -22,18 +23,18 @@
 
 
 # instance fields
-.field final synthetic cmI:Lrx/c;
+.field final synthetic cmb:Lrx/c;
 
-.field final synthetic cmJ:Lrx/b$2;
+.field final synthetic cmc:Lrx/b$2;
 
 
 # direct methods
 .method constructor <init>(Lrx/b$2;Lrx/c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2$1;->cmJ:Lrx/b$2;
+    iput-object p1, p0, Lrx/b$2$1;->cmc:Lrx/b$2;
 
-    iput-object p2, p0, Lrx/b$2$1;->cmI:Lrx/c;
+    iput-object p2, p0, Lrx/b$2$1;->cmb: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 febea378f6..519bf921b3 100644
--- a/com.discord/smali_classes2/rx/b$2.smali
+++ b/com.discord/smali_classes2/rx/b$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/b$2;
 .super Ljava/lang/Object;
+.source "Completable.java"
 
 # interfaces
 .implements Lrx/b$a;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cmH:Lrx/Observable;
+.field final synthetic cma:Lrx/Observable;
 
 
 # direct methods
 .method constructor <init>(Lrx/Observable;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2;->cmH:Lrx/Observable;
+    iput-object p1, p0, Lrx/b$2;->cma:Lrx/Observable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,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;->cmH:Lrx/Observable;
+    iget-object p1, p0, Lrx/b$2;->cma: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 7c467a9d5a..6b68e1fbf1 100644
--- a/com.discord/smali_classes2/rx/b$3.smali
+++ b/com.discord/smali_classes2/rx/b$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/b$3;
 .super Ljava/lang/Object;
+.source "Completable.java"
 
 # interfaces
 .implements Lrx/b$a;
@@ -30,7 +31,7 @@
 .method public final synthetic call(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/b$a.smali b/com.discord/smali_classes2/rx/b$a.smali
index 44e036931d..dcd5fa98ad 100644
--- a/com.discord/smali_classes2/rx/b$a.smali
+++ b/com.discord/smali_classes2/rx/b$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/b$a;
 .super Ljava/lang/Object;
+.source "Completable.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali_classes2/rx/b$b.smali b/com.discord/smali_classes2/rx/b$b.smali
index 03715fa8da..de1ceeb1cc 100644
--- a/com.discord/smali_classes2/rx/b$b.smali
+++ b/com.discord/smali_classes2/rx/b$b.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/b$b;
 .super Ljava/lang/Object;
+.source "Completable.java"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali_classes2/rx/b.smali b/com.discord/smali_classes2/rx/b.smali
index 42ffa80a1c..8d2f006f1b 100644
--- a/com.discord/smali_classes2/rx/b.smali
+++ b/com.discord/smali_classes2/rx/b.smali
@@ -1,5 +1,6 @@
 .class public Lrx/b;
 .super Ljava/lang/Object;
+.source "Completable.java"
 
 
 # annotations
@@ -12,13 +13,13 @@
 
 
 # static fields
-.field static final cmF:Lrx/b;
+.field static final clY:Lrx/b;
 
-.field static final cmG:Lrx/b;
+.field static final clZ:Lrx/b;
 
 
 # instance fields
-.field private final cmE:Lrx/b$a;
+.field private final clX:Lrx/b$a;
 
 
 # direct methods
@@ -35,7 +36,7 @@
 
     invoke-direct {v0, v1, v2}, Lrx/b;-><init>(Lrx/b$a;B)V
 
-    sput-object v0, Lrx/b;->cmF:Lrx/b;
+    sput-object v0, Lrx/b;->clY:Lrx/b;
 
     new-instance v0, Lrx/b;
 
@@ -45,7 +46,7 @@
 
     invoke-direct {v0, v1, v2}, Lrx/b;-><init>(Lrx/b$a;B)V
 
-    sput-object v0, Lrx/b;->cmG:Lrx/b;
+    sput-object v0, Lrx/b;->clZ:Lrx/b;
 
     return-void
 .end method
@@ -59,7 +60,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/b;->cmE:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->clX:Lrx/b$a;
 
     return-void
 .end method
@@ -69,7 +70,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/b;->cmE:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->clX: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 ef39bc16ef..b20dcb9e15 100644
--- a/com.discord/smali_classes2/rx/b/a$1.smali
+++ b/com.discord/smali_classes2/rx/b/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/b/a$1;
 .super Lrx/Subscriber;
+.source "BlockingObservable.java"
 
 
 # annotations
@@ -21,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic cuE:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic ctY:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic cuF:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic ctZ:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic cuG:Lrx/b/a;
+.field final synthetic cua:Lrx/b/a;
 
 .field final synthetic val$latch:Ljava/util/concurrent/CountDownLatch;
 
@@ -34,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;->cuG:Lrx/b/a;
+    iput-object p1, p0, Lrx/b/a$1;->cua: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;->cuE:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/b/a$1;->ctY:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/b/a$1;->cuF:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p4, p0, Lrx/b/a$1;->ctZ:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -62,7 +63,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/b/a$1;->cuE:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->ctY:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
@@ -81,7 +82,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/b/a$1;->cuF:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->ctZ: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 1f309c2f33..5666f63d1a 100644
--- a/com.discord/smali_classes2/rx/b/a.smali
+++ b/com.discord/smali_classes2/rx/b/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/b/a;
 .super Ljava/lang/Object;
+.source "BlockingObservable.java"
 
 
 # annotations
@@ -14,15 +15,15 @@
 
 
 # static fields
-.field static final cuB:Ljava/lang/Object;
+.field static final ctV:Ljava/lang/Object;
 
-.field static final cuC:Ljava/lang/Object;
+.field static final ctW:Ljava/lang/Object;
 
-.field static final cuD:Ljava/lang/Object;
+.field static final ctX:Ljava/lang/Object;
 
 
 # instance fields
-.field public final cuA:Lrx/Observable;
+.field public final ctU:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -40,19 +41,19 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->cuB:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->ctV:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->cuC:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->ctW:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->cuD:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->ctX:Ljava/lang/Object;
 
     return-void
 .end method
@@ -69,7 +70,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/b/a;->cuA:Lrx/Observable;
+    iput-object p1, p0, Lrx/b/a;->ctU:Lrx/Observable;
 
     return-void
 .end method
@@ -153,7 +154,7 @@
 
 
 # virtual methods
-.method public final LP()Ljava/lang/Object;
+.method public final LO()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -161,9 +162,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/b/a;->cuA:Lrx/Observable;
+    iget-object v0, p0, Lrx/b/a;->ctU:Lrx/Observable;
 
-    invoke-virtual {v0}, Lrx/Observable;->KG()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->KF()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/b/b.smali b/com.discord/smali_classes2/rx/b/b.smali
index 21e53b3686..23905c3d56 100644
--- a/com.discord/smali_classes2/rx/b/b.smali
+++ b/com.discord/smali_classes2/rx/b/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/b/b;
 .super Lrx/Observable;
+.source "ConnectableObservable.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
 
 
 # virtual methods
-.method public final LQ()Lrx/Observable;
+.method public final LP()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/rx/c.smali b/com.discord/smali_classes2/rx/c.smali
index ac17089ac9..6e97527dc9 100644
--- a/com.discord/smali_classes2/rx/c.smali
+++ b/com.discord/smali_classes2/rx/c.smali
@@ -1,2 +1,3 @@
 .class public interface abstract Lrx/c;
 .super Ljava/lang/Object;
+.source "CompletableSubscriber.java"
diff --git a/com.discord/smali_classes2/rx/c/a.smali b/com.discord/smali_classes2/rx/c/a.smali
index 33f61c221b..7188a38ace 100644
--- a/com.discord/smali_classes2/rx/c/a.smali
+++ b/com.discord/smali_classes2/rx/c/a.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/c/a;
 .super Ljava/lang/Object;
+.source "RxJavaCompletableExecutionHook.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/c/b.smali b/com.discord/smali_classes2/rx/c/b.smali
index 0e6c6d0365..c6a42d986e 100644
--- a/com.discord/smali_classes2/rx/c/b.smali
+++ b/com.discord/smali_classes2/rx/c/b.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/c/b;
 .super Ljava/lang/Object;
+.source "RxJavaErrorHandler.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/c/c$1.smali b/com.discord/smali_classes2/rx/c/c$1.smali
index 59618c79e5..491b427c6a 100644
--- a/com.discord/smali_classes2/rx/c/c$1.smali
+++ b/com.discord/smali_classes2/rx/c/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$1;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -39,11 +40,11 @@
 .method public final synthetic call(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->LU()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 c5dc82c2ca..21127294a1 100644
--- a/com.discord/smali_classes2/rx/c/c$10.smali
+++ b/com.discord/smali_classes2/rx/c/c$10.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$10;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LW()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->LV()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 fd0a2773a9..9e4e31fe3f 100644
--- a/com.discord/smali_classes2/rx/c/c$11.smali
+++ b/com.discord/smali_classes2/rx/c/c$11.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$11;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -43,15 +44,15 @@
 
     check-cast p2, Lrx/f$a;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LX()Lrx/c/h;
+    invoke-virtual {p1}, Lrx/c/f;->LW()Lrx/c/h;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/c/i;->Me()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Md()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 de2f275f19..7ff700bbba 100644
--- a/com.discord/smali_classes2/rx/c/c$12.smali
+++ b/com.discord/smali_classes2/rx/c/c$12.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$12;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LX()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->LW()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 cd16f5ee26..a93cb430f9 100644
--- a/com.discord/smali_classes2/rx/c/c$13.smali
+++ b/com.discord/smali_classes2/rx/c/c$13.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$13;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -43,11 +44,11 @@
 
     check-cast p2, Lrx/b$a;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LY()Lrx/c/a;
+    invoke-virtual {p1}, Lrx/c/f;->LX()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 79491b8a0e..a237ea96d2 100644
--- a/com.discord/smali_classes2/rx/c/c$14.smali
+++ b/com.discord/smali_classes2/rx/c/c$14.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$14;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/functions/Action0;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LZ()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->LY()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 4ce0c4053a..74c4ed60fe 100644
--- a/com.discord/smali_classes2/rx/c/c$15.smali
+++ b/com.discord/smali_classes2/rx/c/c$15.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$15;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LW()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->LV()Lrx/c/d;
 
     invoke-static {p1}, Lrx/c/d;->N(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 491f6dc4cb..4527fd197d 100644
--- a/com.discord/smali_classes2/rx/c/c$16.smali
+++ b/com.discord/smali_classes2/rx/c/c$16.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$16;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/Observable$b;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LW()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->LV()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 894bb96c5c..150f478215 100644
--- a/com.discord/smali_classes2/rx/c/c$2.smali
+++ b/com.discord/smali_classes2/rx/c/c$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$2;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LX()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->LW()Lrx/c/h;
 
     invoke-static {p1}, Lrx/c/h;->N(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 4065392653..89d7889529 100644
--- a/com.discord/smali_classes2/rx/c/c$3.smali
+++ b/com.discord/smali_classes2/rx/c/c$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$3;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/Observable$b;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LX()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->LW()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 9ad03efb95..7433aa9c01 100644
--- a/com.discord/smali_classes2/rx/c/c$4.smali
+++ b/com.discord/smali_classes2/rx/c/c$4.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$4;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LY()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->LX()Lrx/c/a;
 
     invoke-static {p1}, Lrx/c/a;->N(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 eca3c92cd8..aabb4ed5f7 100644
--- a/com.discord/smali_classes2/rx/c/c$5.smali
+++ b/com.discord/smali_classes2/rx/c/c$5.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$5;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/b$b;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LY()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->LX()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 4e9c3ecbbb..5ef0704089 100644
--- a/com.discord/smali_classes2/rx/c/c$6.smali
+++ b/com.discord/smali_classes2/rx/c/c$6.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$6;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/Observable$a;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LW()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->LV()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 cb2ea9b507..4db3c63d3a 100644
--- a/com.discord/smali_classes2/rx/c/c$7.smali
+++ b/com.discord/smali_classes2/rx/c/c$7.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$7;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/f$a;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LX()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->LW()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 7adb5b3390..4e62b1fe0f 100644
--- a/com.discord/smali_classes2/rx/c/c$8.smali
+++ b/com.discord/smali_classes2/rx/c/c$8.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$8;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -42,11 +43,11 @@
 
     check-cast p1, Lrx/b$a;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LY()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->LX()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 eb511b1208..ce31556cdd 100644
--- a/com.discord/smali_classes2/rx/c/c$9.smali
+++ b/com.discord/smali_classes2/rx/c/c$9.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/c$9;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -43,11 +44,11 @@
 
     check-cast p2, Lrx/Observable$a;
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->LW()Lrx/c/d;
+    invoke-virtual {p1}, Lrx/c/f;->LV()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 de30a6bbad..74260ad24f 100644
--- a/com.discord/smali_classes2/rx/c/c.smali
+++ b/com.discord/smali_classes2/rx/c/c.smali
@@ -1,9 +1,10 @@
 .class public final Lrx/c/c;
 .super Ljava/lang/Object;
+.source "RxJavaHooks.java"
 
 
 # static fields
-.field static volatile cts:Lrx/functions/Action1;
+.field static volatile csM:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -13,7 +14,7 @@
     .end annotation
 .end field
 
-.field static volatile cuM:Lrx/functions/b;
+.field static volatile cug:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -24,7 +25,7 @@
     .end annotation
 .end field
 
-.field static volatile cuN:Lrx/functions/b;
+.field static volatile cuh:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -35,7 +36,7 @@
     .end annotation
 .end field
 
-.field static volatile cuO:Lrx/functions/b;
+.field static volatile cui:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -46,7 +47,7 @@
     .end annotation
 .end field
 
-.field static volatile cuP:Lrx/functions/Func2;
+.field static volatile cuj:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -58,7 +59,7 @@
     .end annotation
 .end field
 
-.field static volatile cuQ:Lrx/functions/Func2;
+.field static volatile cuk:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -70,7 +71,7 @@
     .end annotation
 .end field
 
-.field static volatile cuR:Lrx/functions/Func2;
+.field static volatile cul:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -82,7 +83,7 @@
     .end annotation
 .end field
 
-.field static volatile cuS:Lrx/functions/b;
+.field static volatile cum:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -93,7 +94,7 @@
     .end annotation
 .end field
 
-.field static volatile cuT:Lrx/functions/b;
+.field static volatile cun:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -104,7 +105,7 @@
     .end annotation
 .end field
 
-.field static volatile cuU:Lrx/functions/b;
+.field static volatile cuo:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -115,7 +116,7 @@
     .end annotation
 .end field
 
-.field static volatile cuV:Lrx/functions/b;
+.field static volatile cup:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -126,7 +127,7 @@
     .end annotation
 .end field
 
-.field static volatile cuW:Lrx/functions/b;
+.field static volatile cuq:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -137,7 +138,7 @@
     .end annotation
 .end field
 
-.field static volatile cuX:Lrx/functions/Func0;
+.field static volatile cur:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -148,7 +149,7 @@
     .end annotation
 .end field
 
-.field static volatile cuY:Lrx/functions/b;
+.field static volatile cus:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -159,7 +160,7 @@
     .end annotation
 .end field
 
-.field static volatile cuZ:Lrx/functions/b;
+.field static volatile cut:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -170,7 +171,7 @@
     .end annotation
 .end field
 
-.field static volatile cva:Lrx/functions/b;
+.field static volatile cuu:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -181,7 +182,7 @@
     .end annotation
 .end field
 
-.field static volatile cvb:Lrx/functions/b;
+.field static volatile cuv:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -192,7 +193,7 @@
     .end annotation
 .end field
 
-.field static volatile cvc:Lrx/functions/b;
+.field static volatile cuw:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -203,7 +204,7 @@
     .end annotation
 .end field
 
-.field static volatile cvd:Lrx/functions/b;
+.field static volatile cux:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -223,102 +224,102 @@
 
     invoke-direct {v0}, Lrx/c/c$1;-><init>()V
 
-    sput-object v0, Lrx/c/c;->cts:Lrx/functions/Action1;
+    sput-object v0, Lrx/c/c;->csM: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;->cuP:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->cuj: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;->cuV:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cup: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;->cuQ:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->cuk: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;->cuW:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cuq: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;->cuR:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->cul: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;->cuU:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cuo: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;->cuY:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cus: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;->cvb:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cuv: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;->cuZ:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cut: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;->cvc:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cuw: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;->cva:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cuu: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;->cvd:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cux: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;->cuM:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cug: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;->cuN:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cuh: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;->cuO:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->cui:Lrx/functions/b;
 
     return-void
 .end method
 
-.method public static LS()Lrx/functions/Func0;
+.method public static LR()Lrx/functions/Func0;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -330,7 +331,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->cuX:Lrx/functions/Func0;
+    sget-object v0, Lrx/c/c;->cur:Lrx/functions/Func0;
 
     return-object v0
 .end method
@@ -354,7 +355,7 @@
 .method public static P(Ljava/lang/Throwable;)Ljava/lang/Throwable;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->cuY:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cus:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -364,6 +365,8 @@
 
     check-cast p0, Ljava/lang/Throwable;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -384,7 +387,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->cuP:Lrx/functions/Func2;
+    sget-object v0, Lrx/c/c;->cuj:Lrx/functions/Func2;
 
     if-eqz v0, :cond_0
 
@@ -414,7 +417,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->cuN:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cuh:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -424,6 +427,8 @@
 
     check-cast p0, Lrx/f$a;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -444,7 +449,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->cvb:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cuv:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -454,6 +459,8 @@
 
     check-cast p0, Lrx/Observable$b;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -461,7 +468,7 @@
 .method public static b(Lrx/b$a;)Lrx/b$a;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->cuO:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cui:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -471,6 +478,8 @@
 
     check-cast p0, Lrx/b$a;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -489,7 +498,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->cuM:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cug:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -499,6 +508,8 @@
 
     check-cast p0, Lrx/Observable$a;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -519,7 +530,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->cvc:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cuw:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -529,6 +540,8 @@
 
     check-cast p0, Lrx/Observable$b;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -536,7 +549,7 @@
 .method public static c(Lrx/Subscription;)Lrx/Subscription;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->cuV:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cup:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -546,6 +559,8 @@
 
     check-cast p0, Lrx/Subscription;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -553,7 +568,7 @@
 .method public static d(Lrx/Scheduler;)Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->cuS:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cum:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -563,6 +578,8 @@
 
     check-cast p0, Lrx/Scheduler;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -570,7 +587,7 @@
 .method public static e(Lrx/Scheduler;)Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->cuT:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cun:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -580,6 +597,8 @@
 
     check-cast p0, Lrx/Scheduler;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -587,7 +606,7 @@
 .method public static e(Lrx/functions/Action0;)Lrx/functions/Action0;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->cuU:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->cuo:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -597,6 +616,8 @@
 
     check-cast p0, Lrx/functions/Action0;
 
+    return-object p0
+
     :cond_0
     return-object p0
 .end method
@@ -604,7 +625,7 @@
 .method public static onError(Ljava/lang/Throwable;)V
     .locals 4
 
-    sget-object v0, Lrx/c/c;->cts:Lrx/functions/Action1;
+    sget-object v0, Lrx/c/c;->csM:Lrx/functions/Action1;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/c/d.smali b/com.discord/smali_classes2/rx/c/d.smali
index 38c9b396a3..067305ac0e 100644
--- a/com.discord/smali_classes2/rx/c/d.smali
+++ b/com.discord/smali_classes2/rx/c/d.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/c/d;
 .super Ljava/lang/Object;
+.source "RxJavaObservableExecutionHook.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/c/e.smali b/com.discord/smali_classes2/rx/c/e.smali
index e53fdfe9c4..9df49769de 100644
--- a/com.discord/smali_classes2/rx/c/e.smali
+++ b/com.discord/smali_classes2/rx/c/e.smali
@@ -1,9 +1,10 @@
 .class final Lrx/c/e;
 .super Lrx/c/d;
+.source "RxJavaObservableExecutionHookDefault.java"
 
 
 # static fields
-.field private static final cve:Lrx/c/e;
+.field private static final cuy:Lrx/c/e;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/e;-><init>()V
 
-    sput-object v0, Lrx/c/e;->cve:Lrx/c/e;
+    sput-object v0, Lrx/c/e;->cuy:Lrx/c/e;
 
     return-void
 .end method
@@ -27,10 +28,10 @@
     return-void
 .end method
 
-.method public static LT()Lrx/c/d;
+.method public static LS()Lrx/c/d;
     .locals 1
 
-    sget-object v0, Lrx/c/e;->cve:Lrx/c/e;
+    sget-object v0, Lrx/c/e;->cuy:Lrx/c/e;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/c/f$1.smali b/com.discord/smali_classes2/rx/c/f$1.smali
index bed364baf3..ef3a63c7a3 100644
--- a/com.discord/smali_classes2/rx/c/f$1.smali
+++ b/com.discord/smali_classes2/rx/c/f$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/c/f$1;
 .super Lrx/c/b;
+.source "RxJavaPlugins.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/c/f$2.smali b/com.discord/smali_classes2/rx/c/f$2.smali
index 828ace5133..0b2f473c94 100644
--- a/com.discord/smali_classes2/rx/c/f$2.smali
+++ b/com.discord/smali_classes2/rx/c/f$2.smali
@@ -1,10 +1,11 @@
 .class final Lrx/c/f$2;
 .super Lrx/c/a;
+.source "RxJavaPlugins.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lrx/c/f;->LY()Lrx/c/a;
+    value = Lrx/c/f;->LX()Lrx/c/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -14,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic cvl:Lrx/c/f;
+.field final synthetic cuF:Lrx/c/f;
 
 
 # direct methods
 .method constructor <init>(Lrx/c/f;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/c/f$2;->cvl:Lrx/c/f;
+    iput-object p1, p0, Lrx/c/f$2;->cuF: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 bb649e558c..f7ece09d84 100644
--- a/com.discord/smali_classes2/rx/c/f.smali
+++ b/com.discord/smali_classes2/rx/c/f.smali
@@ -1,15 +1,16 @@
 .class public final Lrx/c/f;
 .super Ljava/lang/Object;
+.source "RxJavaPlugins.java"
 
 
 # static fields
-.field private static final cvf:Lrx/c/f;
+.field static final cuE:Lrx/c/b;
 
-.field static final cvk:Lrx/c/b;
+.field private static final cuz:Lrx/c/f;
 
 
 # instance fields
-.field private final cna:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final cmu:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -19,7 +20,7 @@
     .end annotation
 .end field
 
-.field private final cvg:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final cuA:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -29,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final cvh:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final cuB:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -39,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final cvi:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final cuC:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -49,7 +50,7 @@
     .end annotation
 .end field
 
-.field private final cvj:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final cuD:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -68,13 +69,13 @@
 
     invoke-direct {v0}, Lrx/c/f;-><init>()V
 
-    sput-object v0, Lrx/c/f;->cvf:Lrx/c/f;
+    sput-object v0, Lrx/c/f;->cuz: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;->cvk:Lrx/c/b;
+    sput-object v0, Lrx/c/f;->cuE:Lrx/c/b;
 
     return-void
 .end method
@@ -88,41 +89,41 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/c/f;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->cuA: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;->cvh:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->cuB: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;->cvi:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->cuC: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;->cvj:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->cuD: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;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->cmu:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static LU()Lrx/c/f;
+.method public static LT()Lrx/c/f;
     .locals 1
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    sget-object v0, Lrx/c/f;->cvf:Lrx/c/f;
+    sget-object v0, Lrx/c/f;->cuz:Lrx/c/f;
 
     return-object v0
 .end method
@@ -237,21 +238,15 @@
 
     invoke-virtual {v7}, Ljava/lang/String;->length()I
 
-    move-result v5
-
-    invoke-virtual {v3}, Ljava/lang/String;->length()I
-
     move-result v3
 
-    sub-int/2addr v5, v3
+    add-int/lit8 v3, v3, -0x6
 
-    invoke-virtual {v7, v2, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v7, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v3
+    const/16 v3, 0xe
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
@@ -442,10 +437,10 @@
 
 
 # virtual methods
-.method public final LV()Lrx/c/b;
+.method public final LU()Lrx/c/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuA:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -467,16 +462,16 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuA:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v2, Lrx/c/f;->cvk:Lrx/c/b;
+    sget-object v2, Lrx/c/f;->cuE: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;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->cuA:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/b;
 
@@ -484,7 +479,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuA:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -495,10 +490,10 @@
     return-object v0
 .end method
 
-.method public final LW()Lrx/c/d;
+.method public final LV()Lrx/c/d;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->cvh:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuB:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -520,9 +515,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->cvh:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuB:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/e;->LT()Lrx/c/d;
+    invoke-static {}, Lrx/c/e;->LS()Lrx/c/d;
 
     move-result-object v2
 
@@ -531,7 +526,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->cvh:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->cuB:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/d;
 
@@ -539,7 +534,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->cvh:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuB:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -550,10 +545,10 @@
     return-object v0
 .end method
 
-.method public final LX()Lrx/c/h;
+.method public final LW()Lrx/c/h;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->cvi:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -575,9 +570,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->cvi:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/i;->Me()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Md()Lrx/c/h;
 
     move-result-object v2
 
@@ -586,7 +581,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->cvi:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->cuC:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/h;
 
@@ -594,7 +589,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->cvi:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -605,10 +600,10 @@
     return-object v0
 .end method
 
-.method public final LY()Lrx/c/a;
+.method public final LX()Lrx/c/a;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->cvj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuD:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -630,7 +625,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->cvj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuD:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance v2, Lrx/c/f$2;
 
@@ -641,7 +636,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->cvj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->cuD:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/a;
 
@@ -649,7 +644,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->cvj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cuD:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -660,10 +655,10 @@
     return-object v0
 .end method
 
-.method public final LZ()Lrx/c/g;
+.method public final LY()Lrx/c/g;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cmu:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -685,9 +680,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cmu:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/g;->Md()Lrx/c/g;
+    invoke-static {}, Lrx/c/g;->Mc()Lrx/c/g;
 
     move-result-object v2
 
@@ -696,7 +691,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->cmu:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/g;
 
@@ -704,7 +699,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->cna:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->cmu: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 905aa91d5e..a758fd5cbf 100644
--- a/com.discord/smali_classes2/rx/c/g.smali
+++ b/com.discord/smali_classes2/rx/c/g.smali
@@ -1,9 +1,10 @@
 .class public Lrx/c/g;
 .super Ljava/lang/Object;
+.source "RxJavaSchedulersHook.java"
 
 
 # static fields
-.field private static final cvm:Lrx/c/g;
+.field private static final cuG:Lrx/c/g;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/g;-><init>()V
 
-    sput-object v0, Lrx/c/g;->cvm:Lrx/c/g;
+    sput-object v0, Lrx/c/g;->cuG:Lrx/c/g;
 
     return-void
 .end method
@@ -27,7 +28,7 @@
     return-void
 .end method
 
-.method public static Ma()Lrx/Scheduler;
+.method public static LZ()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -43,7 +44,7 @@
     return-object v1
 .end method
 
-.method public static Mb()Lrx/Scheduler;
+.method public static Ma()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -59,7 +60,7 @@
     return-object v1
 .end method
 
-.method public static Mc()Lrx/Scheduler;
+.method public static Mb()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -75,10 +76,10 @@
     return-object v1
 .end method
 
-.method public static Md()Lrx/c/g;
+.method public static Mc()Lrx/c/g;
     .locals 1
 
-    sget-object v0, Lrx/c/g;->cvm:Lrx/c/g;
+    sget-object v0, Lrx/c/g;->cuG:Lrx/c/g;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/c/h.smali b/com.discord/smali_classes2/rx/c/h.smali
index df77479767..065cc809fc 100644
--- a/com.discord/smali_classes2/rx/c/h.smali
+++ b/com.discord/smali_classes2/rx/c/h.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/c/h;
 .super Ljava/lang/Object;
+.source "RxJavaSingleExecutionHook.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/c/i.smali b/com.discord/smali_classes2/rx/c/i.smali
index 3834e81fc4..ef9e68b8bd 100644
--- a/com.discord/smali_classes2/rx/c/i.smali
+++ b/com.discord/smali_classes2/rx/c/i.smali
@@ -1,9 +1,10 @@
 .class final Lrx/c/i;
 .super Lrx/c/h;
+.source "RxJavaSingleExecutionHookDefault.java"
 
 
 # static fields
-.field private static final cvn:Lrx/c/i;
+.field private static final cuH:Lrx/c/i;
 
 
 # direct methods
@@ -14,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/i;-><init>()V
 
-    sput-object v0, Lrx/c/i;->cvn:Lrx/c/i;
+    sput-object v0, Lrx/c/i;->cuH:Lrx/c/i;
 
     return-void
 .end method
@@ -27,10 +28,10 @@
     return-void
 .end method
 
-.method public static Me()Lrx/c/h;
+.method public static Md()Lrx/c/h;
     .locals 1
 
-    sget-object v0, Lrx/c/i;->cvn:Lrx/c/i;
+    sget-object v0, Lrx/c/i;->cuH: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 8e834427bf..f69f5c17e3 100644
--- a/com.discord/smali_classes2/rx/d$a.smali
+++ b/com.discord/smali_classes2/rx/d$a.smali
@@ -1,5 +1,6 @@
 .class public final enum Lrx/d$a;
 .super Ljava/lang/Enum;
+.source "Notification.java"
 
 
 # annotations
@@ -22,13 +23,13 @@
 
 
 # static fields
-.field public static final enum cmS:Lrx/d$a;
+.field public static final enum cmm:Lrx/d$a;
 
-.field public static final enum cmT:Lrx/d$a;
+.field public static final enum cmn:Lrx/d$a;
 
-.field public static final enum cmU:Lrx/d$a;
+.field public static final enum cmo:Lrx/d$a;
 
-.field private static final synthetic cmV:[Lrx/d$a;
+.field private static final synthetic cmp:[Lrx/d$a;
 
 
 # direct methods
@@ -43,7 +44,7 @@
 
     invoke-direct {v0, v1, v2}, Lrx/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/d$a;->cmS:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->cmm:Lrx/d$a;
 
     new-instance v0, Lrx/d$a;
 
@@ -53,7 +54,7 @@
 
     invoke-direct {v0, v1, v3}, Lrx/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/d$a;->cmT:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->cmn:Lrx/d$a;
 
     new-instance v0, Lrx/d$a;
 
@@ -63,25 +64,25 @@
 
     invoke-direct {v0, v1, v4}, Lrx/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/d$a;->cmU:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->cmo:Lrx/d$a;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->cmS:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmm:Lrx/d$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lrx/d$a;->cmT:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmn:Lrx/d$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lrx/d$a;->cmU:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmo:Lrx/d$a;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lrx/d$a;->cmV:[Lrx/d$a;
+    sput-object v0, Lrx/d$a;->cmp:[Lrx/d$a;
 
     return-void
 .end method
@@ -116,7 +117,7 @@
 .method public static values()[Lrx/d$a;
     .locals 1
 
-    sget-object v0, Lrx/d$a;->cmV:[Lrx/d$a;
+    sget-object v0, Lrx/d$a;->cmp:[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 5d55b31a67..277564f92d 100644
--- a/com.discord/smali_classes2/rx/d.smali
+++ b/com.discord/smali_classes2/rx/d.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/d;
 .super Ljava/lang/Object;
+.source "Notification.java"
 
 
 # annotations
@@ -20,7 +21,7 @@
 
 
 # static fields
-.field private static final cmR:Lrx/d;
+.field private static final cml:Lrx/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/d<",
@@ -32,7 +33,7 @@
 
 
 # instance fields
-.field public final cmQ:Lrx/d$a;
+.field public final cmk:Lrx/d$a;
 
 .field public final throwable:Ljava/lang/Throwable;
 
@@ -51,13 +52,13 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->cmU:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmo: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;->cmR:Lrx/d;
+    sput-object v0, Lrx/d;->cml:Lrx/d;
 
     return-void
 .end method
@@ -82,12 +83,12 @@
 
     iput-object p3, p0, Lrx/d;->throwable:Ljava/lang/Throwable;
 
-    iput-object p1, p0, Lrx/d;->cmQ:Lrx/d$a;
+    iput-object p1, p0, Lrx/d;->cmk:Lrx/d$a;
 
     return-void
 .end method
 
-.method public static Kw()Lrx/d;
+.method public static Kv()Lrx/d;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -101,7 +102,7 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->cmS:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmm:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -110,7 +111,7 @@
     return-object v0
 .end method
 
-.method public static Kx()Lrx/d;
+.method public static Kw()Lrx/d;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -122,15 +123,15 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/d;->cmR:Lrx/d;
+    sget-object v0, Lrx/d;->cml:Lrx/d;
 
     return-object v0
 .end method
 
-.method private Ky()Z
+.method private Kx()Z
     .locals 1
 
-    invoke-virtual {p0}, Lrx/d;->Kz()Z
+    invoke-virtual {p0}, Lrx/d;->Ky()Z
 
     move-result v0
 
@@ -153,13 +154,13 @@
 .method private hasValue()Z
     .locals 4
 
-    iget-object v0, p0, Lrx/d;->cmQ:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->cmk:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->cmS:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmm:Lrx/d$a;
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     if-ne v0, v1, :cond_0
 
@@ -177,10 +178,10 @@
 
     if-eqz v0, :cond_1
 
-    return v3
+    return v2
 
     :cond_1
-    return v2
+    return v3
 .end method
 
 .method public static z(Ljava/lang/Throwable;)Lrx/d;
@@ -199,7 +200,7 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->cmT:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmn:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -210,12 +211,12 @@
 
 
 # virtual methods
-.method public final Kz()Z
+.method public final Ky()Z
     .locals 2
 
-    iget-object v0, p0, Lrx/d;->cmQ:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->cmk:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->cmT:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmn:Lrx/d$a;
 
     if-ne v0, v1, :cond_0
 
@@ -261,9 +262,9 @@
     :cond_2
     check-cast p1, Lrx/d;
 
-    iget-object v2, p1, Lrx/d;->cmQ:Lrx/d$a;
+    iget-object v2, p1, Lrx/d;->cmk:Lrx/d$a;
 
-    iget-object v3, p0, Lrx/d;->cmQ:Lrx/d$a;
+    iget-object v3, p0, Lrx/d;->cmk:Lrx/d$a;
 
     if-ne v2, v3, :cond_5
 
@@ -273,14 +274,8 @@
 
     if-eq v2, v3, :cond_3
 
-    iget-object v2, p0, Lrx/d;->value:Ljava/lang/Object;
-
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Lrx/d;->value:Ljava/lang/Object;
-
-    iget-object v3, p1, Lrx/d;->value:Ljava/lang/Object;
-
     invoke-virtual {v2, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v2
@@ -290,18 +285,12 @@
     :cond_3
     iget-object v2, p0, Lrx/d;->throwable:Ljava/lang/Throwable;
 
-    iget-object v3, p1, Lrx/d;->throwable:Ljava/lang/Throwable;
+    iget-object p1, p1, Lrx/d;->throwable:Ljava/lang/Throwable;
 
-    if-eq v2, v3, :cond_4
-
-    iget-object v2, p0, Lrx/d;->throwable:Ljava/lang/Throwable;
+    if-eq v2, p1, :cond_4
 
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Lrx/d;->throwable:Ljava/lang/Throwable;
-
-    iget-object p1, p1, Lrx/d;->throwable:Ljava/lang/Throwable;
-
     invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result p1
@@ -318,7 +307,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lrx/d;->cmQ:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->cmk:Lrx/d$a;
 
     invoke-virtual {v0}, Lrx/d$a;->hashCode()I
 
@@ -341,7 +330,7 @@
     add-int/2addr v0, v1
 
     :cond_0
-    invoke-direct {p0}, Lrx/d;->Ky()Z
+    invoke-direct {p0}, Lrx/d;->Kx()Z
 
     move-result v1
 
@@ -384,7 +373,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lrx/d;->cmQ:Lrx/d$a;
+    iget-object v2, p0, Lrx/d;->cmk:Lrx/d$a;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -401,7 +390,7 @@
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     :cond_0
-    invoke-direct {p0}, Lrx/d;->Ky()Z
+    invoke-direct {p0}, Lrx/d;->Kx()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 5e58791ba1..52e78a2806 100644
--- a/com.discord/smali_classes2/rx/d/a.smali
+++ b/com.discord/smali_classes2/rx/d/a.smali
@@ -1,9 +1,10 @@
 .class public final Lrx/d/a;
 .super Ljava/lang/Object;
+.source "Schedulers.java"
 
 
 # static fields
-.field private static final cnc:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final cmw:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -15,11 +16,11 @@
 
 
 # instance fields
-.field private final cvo:Lrx/Scheduler;
+.field private final cuI:Lrx/Scheduler;
 
-.field private final cvp:Lrx/Scheduler;
+.field private final cuJ:Lrx/Scheduler;
 
-.field private final cvq:Lrx/Scheduler;
+.field private final cuK:Lrx/Scheduler;
 
 
 # direct methods
@@ -30,7 +31,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lrx/d/a;->cnc:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/d/a;->cmw:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -40,38 +41,38 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->LZ()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->LY()Lrx/c/g;
+
+    invoke-static {}, Lrx/c/g;->LZ()Lrx/Scheduler;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lrx/d/a;->cuI:Lrx/Scheduler;
 
     invoke-static {}, Lrx/c/g;->Ma()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->cvo:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->cuJ:Lrx/Scheduler;
 
     invoke-static {}, Lrx/c/g;->Mb()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->cvp:Lrx/Scheduler;
-
-    invoke-static {}, Lrx/c/g;->Mc()Lrx/Scheduler;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lrx/d/a;->cvq:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->cuK:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method private static Mf()Lrx/d/a;
+.method private static Me()Lrx/d/a;
     .locals 3
 
     :goto_0
-    sget-object v0, Lrx/d/a;->cnc:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/d/a;->cmw:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -88,7 +89,7 @@
 
     invoke-direct {v0}, Lrx/d/a;-><init>()V
 
-    sget-object v1, Lrx/d/a;->cnc:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/d/a;->cmw:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -101,27 +102,27 @@
     return-object v0
 
     :cond_1
-    invoke-direct {v0}, Lrx/d/a;->Mj()V
+    invoke-direct {v0}, Lrx/d/a;->Mi()V
 
     goto :goto_0
 .end method
 
+.method public static Mf()Lrx/Scheduler;
+    .locals 1
+
+    sget-object v0, Lrx/internal/c/m;->csD:Lrx/internal/c/m;
+
+    return-object v0
+.end method
+
 .method public static Mg()Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/internal/c/m;->ctj:Lrx/internal/c/m;
-
-    return-object v0
-.end method
-
-.method public static Mh()Lrx/Scheduler;
-    .locals 1
-
-    invoke-static {}, Lrx/d/a;->Mf()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Me()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->cvo:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->cuI:Lrx/Scheduler;
 
     invoke-static {v0}, Lrx/c/c;->d(Lrx/Scheduler;)Lrx/Scheduler;
 
@@ -130,14 +131,14 @@
     return-object v0
 .end method
 
-.method public static Mi()Lrx/Scheduler;
+.method public static Mh()Lrx/Scheduler;
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->Mf()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Me()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->cvp:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->cuJ:Lrx/Scheduler;
 
     invoke-static {v0}, Lrx/c/c;->e(Lrx/Scheduler;)Lrx/Scheduler;
 
@@ -146,45 +147,45 @@
     return-object v0
 .end method
 
-.method private declared-synchronized Mj()V
+.method private declared-synchronized Mi()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/d/a;->cvo:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->cuI:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/d/a;->cvo:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->cuI: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;->cvp:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->cuJ:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/d/a;->cvp:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->cuJ: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;->cvq:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->cuK:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/d/a;->cvq:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->cuK:Lrx/Scheduler;
 
     check-cast v0, Lrx/internal/c/k;
 
diff --git a/com.discord/smali_classes2/rx/e.smali b/com.discord/smali_classes2/rx/e.smali
index a7d6b57164..3f7f40eef9 100644
--- a/com.discord/smali_classes2/rx/e.smali
+++ b/com.discord/smali_classes2/rx/e.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/e;
 .super Ljava/lang/Object;
+.source "Observer.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/f$a.smali b/com.discord/smali_classes2/rx/f$a.smali
index fe9b770d29..aafbed4c0d 100644
--- a/com.discord/smali_classes2/rx/f$a.smali
+++ b/com.discord/smali_classes2/rx/f$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/f$a;
 .super Ljava/lang/Object;
+.source "Single.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali_classes2/rx/f.smali b/com.discord/smali_classes2/rx/f.smali
index eba6a3f770..4b06004005 100644
--- a/com.discord/smali_classes2/rx/f.smali
+++ b/com.discord/smali_classes2/rx/f.smali
@@ -1,5 +1,6 @@
 .class public Lrx/f;
 .super Ljava/lang/Object;
+.source "Single.java"
 
 
 # annotations
@@ -20,7 +21,7 @@
 
 
 # instance fields
-.field final cmX:Lrx/f$a;
+.field final cmr:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -47,7 +48,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/f;->cmX:Lrx/f$a;
+    iput-object p1, p0, Lrx/f;->cmr:Lrx/f$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/functions/Action0.smali b/com.discord/smali_classes2/rx/functions/Action0.smali
index 43c8bd1e1c..fbe3b73f34 100644
--- a/com.discord/smali_classes2/rx/functions/Action0.smali
+++ b/com.discord/smali_classes2/rx/functions/Action0.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Action0;
 .super Ljava/lang/Object;
+.source "Action0.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/rx/functions/Action2.smali b/com.discord/smali_classes2/rx/functions/Action2.smali
index 277cb83ad4..3f4d7a2476 100644
--- a/com.discord/smali_classes2/rx/functions/Action2.smali
+++ b/com.discord/smali_classes2/rx/functions/Action2.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Action2;
 .super Ljava/lang/Object;
+.source "Action2.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Action3.smali b/com.discord/smali_classes2/rx/functions/Action3.smali
index 8e150a2576..42514fabee 100644
--- a/com.discord/smali_classes2/rx/functions/Action3.smali
+++ b/com.discord/smali_classes2/rx/functions/Action3.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Action3;
 .super Ljava/lang/Object;
+.source "Action3.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func0.smali b/com.discord/smali_classes2/rx/functions/Func0.smali
index 73272cace4..fc768c90bf 100644
--- a/com.discord/smali_classes2/rx/functions/Func0.smali
+++ b/com.discord/smali_classes2/rx/functions/Func0.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func0;
 .super Ljava/lang/Object;
+.source "Func0.java"
 
 # interfaces
 .implements Ljava/util/concurrent/Callable;
diff --git a/com.discord/smali_classes2/rx/functions/Func2.smali b/com.discord/smali_classes2/rx/functions/Func2.smali
index 50a24132a8..985df1d7f8 100644
--- a/com.discord/smali_classes2/rx/functions/Func2.smali
+++ b/com.discord/smali_classes2/rx/functions/Func2.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func2;
 .super Ljava/lang/Object;
+.source "Func2.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func3.smali b/com.discord/smali_classes2/rx/functions/Func3.smali
index b91d4999dc..09a7877c08 100644
--- a/com.discord/smali_classes2/rx/functions/Func3.smali
+++ b/com.discord/smali_classes2/rx/functions/Func3.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func3;
 .super Ljava/lang/Object;
+.source "Func3.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func4.smali b/com.discord/smali_classes2/rx/functions/Func4.smali
index 06b7a507e7..ee8b95a933 100644
--- a/com.discord/smali_classes2/rx/functions/Func4.smali
+++ b/com.discord/smali_classes2/rx/functions/Func4.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func4;
 .super Ljava/lang/Object;
+.source "Func4.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func5.smali b/com.discord/smali_classes2/rx/functions/Func5.smali
index c6d96a1283..284810645b 100644
--- a/com.discord/smali_classes2/rx/functions/Func5.smali
+++ b/com.discord/smali_classes2/rx/functions/Func5.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func5;
 .super Ljava/lang/Object;
+.source "Func5.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func6.smali b/com.discord/smali_classes2/rx/functions/Func6.smali
index ca0b4f293b..a7861d4381 100644
--- a/com.discord/smali_classes2/rx/functions/Func6.smali
+++ b/com.discord/smali_classes2/rx/functions/Func6.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func6;
 .super Ljava/lang/Object;
+.source "Func6.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func7.smali b/com.discord/smali_classes2/rx/functions/Func7.smali
index 536b40b891..fbb789925c 100644
--- a/com.discord/smali_classes2/rx/functions/Func7.smali
+++ b/com.discord/smali_classes2/rx/functions/Func7.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func7;
 .super Ljava/lang/Object;
+.source "Func7.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func8.smali b/com.discord/smali_classes2/rx/functions/Func8.smali
index eb2e26fc59..12742770fe 100644
--- a/com.discord/smali_classes2/rx/functions/Func8.smali
+++ b/com.discord/smali_classes2/rx/functions/Func8.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func8;
 .super Ljava/lang/Object;
+.source "Func8.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/Func9.smali b/com.discord/smali_classes2/rx/functions/Func9.smali
index 29f3986781..a5bdf23390 100644
--- a/com.discord/smali_classes2/rx/functions/Func9.smali
+++ b/com.discord/smali_classes2/rx/functions/Func9.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/Func9;
 .super Ljava/lang/Object;
+.source "Func9.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/FuncN.smali b/com.discord/smali_classes2/rx/functions/FuncN.smali
index 7b6448756d..55b1bcb137 100644
--- a/com.discord/smali_classes2/rx/functions/FuncN.smali
+++ b/com.discord/smali_classes2/rx/functions/FuncN.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/functions/FuncN;
 .super Ljava/lang/Object;
+.source "FuncN.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/functions/a$a.smali b/com.discord/smali_classes2/rx/functions/a$a.smali
index 158d4dc10a..3b250ee7ce 100644
--- a/com.discord/smali_classes2/rx/functions/a$a.smali
+++ b/com.discord/smali_classes2/rx/functions/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/a$a;
 .super Ljava/lang/Object;
+.source "Actions.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali_classes2/rx/functions/a$b.smali b/com.discord/smali_classes2/rx/functions/a$b.smali
index 11a8f10de5..da7e41914c 100644
--- a/com.discord/smali_classes2/rx/functions/a$b.smali
+++ b/com.discord/smali_classes2/rx/functions/a$b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/functions/a$b;
 .super Ljava/lang/Object;
+.source "Actions.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali_classes2/rx/functions/a.smali b/com.discord/smali_classes2/rx/functions/a.smali
index 358c31ea1b..94ab115f1e 100644
--- a/com.discord/smali_classes2/rx/functions/a.smali
+++ b/com.discord/smali_classes2/rx/functions/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/functions/a;
 .super Ljava/lang/Object;
+.source "Actions.java"
 
 
 # annotations
@@ -12,7 +13,7 @@
 
 
 # static fields
-.field private static final cnj:Lrx/functions/a$b;
+.field private static final cmD:Lrx/functions/a$b;
 
 
 # direct methods
@@ -23,12 +24,12 @@
 
     invoke-direct {v0}, Lrx/functions/a$b;-><init>()V
 
-    sput-object v0, Lrx/functions/a;->cnj:Lrx/functions/a$b;
+    sput-object v0, Lrx/functions/a;->cmD:Lrx/functions/a$b;
 
     return-void
 .end method
 
-.method public static KS()Lrx/functions/a$b;
+.method public static KR()Lrx/functions/a$b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -56,7 +57,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/functions/a;->cnj:Lrx/functions/a$b;
+    sget-object v0, Lrx/functions/a;->cmD: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 c67df2fbce..11ab20c53c 100644
--- a/com.discord/smali_classes2/rx/functions/c$1.smali
+++ b/com.discord/smali_classes2/rx/functions/c$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$1;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cnk:Lrx/functions/Func9;
+.field final synthetic cmE:Lrx/functions/Func9;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func9;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$1;->cnk:Lrx/functions/Func9;
+    iput-object p1, p0, Lrx/functions/c$1;->cmE:Lrx/functions/Func9;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$1;->cnk:Lrx/functions/Func9;
+    iget-object v2, p0, Lrx/functions/c$1;->cmE: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 c8acc49ebc..62603ac0ff 100644
--- a/com.discord/smali_classes2/rx/functions/c$2.smali
+++ b/com.discord/smali_classes2/rx/functions/c$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$2;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cnl:Lrx/functions/Func2;
+.field final synthetic cmF:Lrx/functions/Func2;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$2;->cnl:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/functions/c$2;->cmF:Lrx/functions/Func2;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/functions/c$2;->cnl:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/functions/c$2;->cmF: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 bde62819c4..989fb79b43 100644
--- a/com.discord/smali_classes2/rx/functions/c$3.smali
+++ b/com.discord/smali_classes2/rx/functions/c$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$3;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cnm:Lrx/functions/Func3;
+.field final synthetic cmG:Lrx/functions/Func3;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func3;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$3;->cnm:Lrx/functions/Func3;
+    iput-object p1, p0, Lrx/functions/c$3;->cmG:Lrx/functions/Func3;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/functions/c$3;->cnm:Lrx/functions/Func3;
+    iget-object v0, p0, Lrx/functions/c$3;->cmG: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 ca9a9628a7..691a926a3d 100644
--- a/com.discord/smali_classes2/rx/functions/c$4.smali
+++ b/com.discord/smali_classes2/rx/functions/c$4.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$4;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cnn:Lrx/functions/Func4;
+.field final synthetic cmH:Lrx/functions/Func4;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func4;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$4;->cnn:Lrx/functions/Func4;
+    iput-object p1, p0, Lrx/functions/c$4;->cmH:Lrx/functions/Func4;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/functions/c$4;->cnn:Lrx/functions/Func4;
+    iget-object v0, p0, Lrx/functions/c$4;->cmH: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 de4b5afcd8..2e55b8899c 100644
--- a/com.discord/smali_classes2/rx/functions/c$5.smali
+++ b/com.discord/smali_classes2/rx/functions/c$5.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$5;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cno:Lrx/functions/Func5;
+.field final synthetic cmI:Lrx/functions/Func5;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func5;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$5;->cno:Lrx/functions/Func5;
+    iput-object p1, p0, Lrx/functions/c$5;->cmI:Lrx/functions/Func5;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$5;->cno:Lrx/functions/Func5;
+    iget-object v2, p0, Lrx/functions/c$5;->cmI: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 5dc7fc617b..280b80608d 100644
--- a/com.discord/smali_classes2/rx/functions/c$6.smali
+++ b/com.discord/smali_classes2/rx/functions/c$6.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$6;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cnp:Lrx/functions/Func6;
+.field final synthetic cmJ:Lrx/functions/Func6;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func6;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$6;->cnp:Lrx/functions/Func6;
+    iput-object p1, p0, Lrx/functions/c$6;->cmJ:Lrx/functions/Func6;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$6;->cnp:Lrx/functions/Func6;
+    iget-object v2, p0, Lrx/functions/c$6;->cmJ: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 b70ce42d7e..65d8e3b492 100644
--- a/com.discord/smali_classes2/rx/functions/c$7.smali
+++ b/com.discord/smali_classes2/rx/functions/c$7.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$7;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cnq:Lrx/functions/Func7;
+.field final synthetic cmK:Lrx/functions/Func7;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func7;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$7;->cnq:Lrx/functions/Func7;
+    iput-object p1, p0, Lrx/functions/c$7;->cmK:Lrx/functions/Func7;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$7;->cnq:Lrx/functions/Func7;
+    iget-object v2, p0, Lrx/functions/c$7;->cmK: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 2f144c34db..3b1371569c 100644
--- a/com.discord/smali_classes2/rx/functions/c$8.smali
+++ b/com.discord/smali_classes2/rx/functions/c$8.smali
@@ -1,5 +1,6 @@
 .class final Lrx/functions/c$8;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 # interfaces
 .implements Lrx/functions/FuncN;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cnr:Lrx/functions/Func8;
+.field final synthetic cmL:Lrx/functions/Func8;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func8;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$8;->cnr:Lrx/functions/Func8;
+    iput-object p1, p0, Lrx/functions/c$8;->cmL:Lrx/functions/Func8;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$8;->cnr:Lrx/functions/Func8;
+    iget-object v2, p0, Lrx/functions/c$8;->cmL:Lrx/functions/Func8;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c.smali b/com.discord/smali_classes2/rx/functions/c.smali
index 836f5c0471..f3f88d9877 100644
--- a/com.discord/smali_classes2/rx/functions/c.smali
+++ b/com.discord/smali_classes2/rx/functions/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/functions/c;
 .super Ljava/lang/Object;
+.source "Functions.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/g.smali b/com.discord/smali_classes2/rx/g.smali
index ee096d6369..95159b2ef9 100644
--- a/com.discord/smali_classes2/rx/g.smali
+++ b/com.discord/smali_classes2/rx/g.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/g;
 .super Ljava/lang/Object;
+.source "SingleSubscriber.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -18,7 +19,7 @@
 
 
 # instance fields
-.field private final cmY:Lrx/internal/util/SubscriptionList;
+.field private final cms:Lrx/internal/util/SubscriptionList;
 
 
 # direct methods
@@ -31,7 +32,7 @@
 
     invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
 
-    iput-object v0, p0, Lrx/g;->cmY:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/g;->cms:Lrx/internal/util/SubscriptionList;
 
     return-void
 .end method
@@ -41,7 +42,7 @@
 .method public final add(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/g;->cmY:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->cms:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0, p1}, Lrx/internal/util/SubscriptionList;->add(Lrx/Subscription;)V
 
@@ -51,7 +52,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/g;->cmY:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->cms:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->isUnsubscribed()Z
 
@@ -74,7 +75,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/g;->cmY:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->cms:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/a.smali b/com.discord/smali_classes2/rx/internal/a/a.smali
index 9c532d2ab8..4dd7d2b317 100644
--- a/com.discord/smali_classes2/rx/internal/a/a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/a;
 .super Ljava/lang/Object;
+.source "BackpressureUtils.java"
 
 
 # direct methods
@@ -41,8 +42,6 @@
     return-wide v2
 
     :cond_1
-    const/4 v2, 0x0
-
     sub-long v2, v0, p1
 
     const-wide/16 v4, 0x0
@@ -75,6 +74,8 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p0
+
+    return-void
 .end method
 
 .method public static h(JJ)J
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 a134697abe..f22a9842fe 100644
--- a/com.discord/smali_classes2/rx/internal/a/aa$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aa$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/aa$1;
 .super Lrx/Subscriber;
+.source "OperatorAny.java"
 
 
 # annotations
@@ -21,13 +22,13 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field cpc:Z
+.field cow:Z
 
-.field final synthetic cpd:Lrx/internal/b/b;
+.field final synthetic cox:Lrx/internal/b/b;
 
-.field final synthetic cpe:Lrx/internal/a/aa;
+.field final synthetic coy:Lrx/internal/a/aa;
 
 .field done:Z
 
@@ -36,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;->cpe:Lrx/internal/a/aa;
+    iput-object p1, p0, Lrx/internal/a/aa$1;->coy:Lrx/internal/a/aa;
 
-    iput-object p2, p0, Lrx/internal/a/aa$1;->cpd:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/aa$1;->cox:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/aa$1;->com:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aa$1;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -60,11 +61,11 @@
 
     iput-boolean v0, p0, Lrx/internal/a/aa$1;->done:Z
 
-    iget-boolean v0, p0, Lrx/internal/a/aa$1;->cpc:Z
+    iget-boolean v0, p0, Lrx/internal/a/aa$1;->cow:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aa$1;->cpd:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->cox:Lrx/internal/b/b;
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -73,11 +74,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aa$1;->cpd:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->cox:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->cpe:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->coy:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->cpb:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->cov:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -100,7 +101,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/aa$1;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/aa$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -129,12 +130,12 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/aa$1;->cpc:Z
+    iput-boolean v0, p0, Lrx/internal/a/aa$1;->cow:Z
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/aa$1;->cpe:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->coy:Lrx/internal/a/aa;
 
-    iget-object v1, v1, Lrx/internal/a/aa;->cnY:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/aa;->cns:Lrx/functions/b;
 
     invoke-interface {v1, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -144,19 +145,19 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v1
+    move-result p1
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    if-eqz v1, :cond_1
+    if-eqz p1, :cond_1
 
     iput-boolean v0, p0, Lrx/internal/a/aa$1;->done:Z
 
-    iget-object p1, p0, Lrx/internal/a/aa$1;->cpd:Lrx/internal/b/b;
+    iget-object p1, p0, Lrx/internal/a/aa$1;->cox:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->cpe:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->coy:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->cpb:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->cov: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 d6eb7ee175..93dcb684f7 100644
--- a/com.discord/smali_classes2/rx/internal/a/aa.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aa.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/aa;
 .super Ljava/lang/Object;
+.source "OperatorAny.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -20,7 +21,7 @@
 
 
 # instance fields
-.field final cnY:Lrx/functions/b;
+.field final cns:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -31,7 +32,7 @@
     .end annotation
 .end field
 
-.field final cpb:Z
+.field final cov:Z
 
 
 # direct methods
@@ -49,11 +50,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/aa;->cnY:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/aa;->cns:Lrx/functions/b;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/aa;->cpb:Z
+    iput-boolean p1, p0, Lrx/internal/a/aa;->cov: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 7fdf264b04..89556d5046 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ab$a$1;
 .super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cpj:Lrx/internal/a/ab$a;
+.field final synthetic coD: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;->cpj:Lrx/internal/a/ab$a;
+    iput-object p1, p0, Lrx/internal/a/ab$a$1;->coD:Lrx/internal/a/ab$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,7 +37,7 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/ab$a$1;->cpj:Lrx/internal/a/ab$a;
+    iget-object v0, p0, Lrx/internal/a/ab$a$1;->coD:Lrx/internal/a/ab$a;
 
     monitor-enter v0
 
@@ -50,13 +51,13 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lrx/internal/a/ab$a;->cph:Ljava/util/List;
+    iget-object v1, v0, Lrx/internal/a/ab$a;->coB: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;->cph:Ljava/util/List;
+    iput-object v2, v0, Lrx/internal/a/ab$a;->coB: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 f02e742796..eb543fd143 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ab$a;
 .super Lrx/Subscriber;
+.source "OperatorBufferWithTime.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
     .end annotation
 .end field
 
-.field cph:Ljava/util/List;
+.field coB:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,7 +42,7 @@
     .end annotation
 .end field
 
-.field final synthetic cpi:Lrx/internal/a/ab;
+.field final synthetic coC:Lrx/internal/a/ab;
 
 .field done:Z
 
@@ -63,7 +64,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/ab$a;->cpi:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->coC:Lrx/internal/a/ab;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -75,7 +76,7 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ab$a;->cph:Ljava/util/List;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->coB:Ljava/util/List;
 
     return-void
 .end method
@@ -108,11 +109,11 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ab$a;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ab$a;->cph:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->coB:Ljava/util/List;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/ab$a;->cph:Ljava/util/List;
+    iput-object v1, p0, Lrx/internal/a/ab$a;->coB:Ljava/util/List;
 
     monitor-exit p0
     :try_end_1
@@ -177,7 +178,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/ab$a;->cph:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->coB:Ljava/util/List;
 
     monitor-exit p0
     :try_end_0
@@ -222,29 +223,29 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/ab$a;->cph:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->coB:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/ab$a;->cph:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->coB:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
 
-    iget-object v0, p0, Lrx/internal/a/ab$a;->cpi:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->coC: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;->cph:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->coB: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;->cph:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->coB: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 a9171eef77..1d0fc8709a 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ab$b$1;
 .super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cpk:Lrx/internal/a/ab$b;
+.field final synthetic coE: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;->cpk:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$1;->coE:Lrx/internal/a/ab$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,9 +37,9 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ab$b$1;->cpk:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$1;->coE:Lrx/internal/a/ab$b;
 
-    invoke-virtual {v0}, Lrx/internal/a/ab$b;->La()V
+    invoke-virtual {v0}, Lrx/internal/a/ab$b;->KZ()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 ed96144cde..66e4ce6ea1 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ab$b$2;
 .super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -7,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lrx/internal/a/ab$b;->La()V
+    value = Lrx/internal/a/ab$b;->KZ()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cpk:Lrx/internal/a/ab$b;
+.field final synthetic coE:Lrx/internal/a/ab$b;
 
-.field final synthetic cpl:Ljava/util/List;
+.field final synthetic coF: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;->cpk:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$2;->coE:Lrx/internal/a/ab$b;
 
-    iput-object p2, p0, Lrx/internal/a/ab$b$2;->cpl:Ljava/util/List;
+    iput-object p2, p0, Lrx/internal/a/ab$b$2;->coF:Ljava/util/List;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,9 +41,9 @@
 .method public final call()V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/ab$b$2;->cpk:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$2;->coE:Lrx/internal/a/ab$b;
 
-    iget-object v1, p0, Lrx/internal/a/ab$b$2;->cpl:Ljava/util/List;
+    iget-object v1, p0, Lrx/internal/a/ab$b$2;->coF:Ljava/util/List;
 
     monitor-enter v0
 
@@ -119,4 +120,6 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     throw v1
+
+    return-void
 .end method
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 37b7ab9612..785f1a8e24 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ab$b;
 .super Lrx/Subscriber;
+.source "OperatorBufferWithTime.java"
 
 
 # annotations
@@ -42,7 +43,7 @@
     .end annotation
 .end field
 
-.field final synthetic cpi:Lrx/internal/a/ab;
+.field final synthetic coC:Lrx/internal/a/ab;
 
 .field done:Z
 
@@ -64,7 +65,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/ab$b;->cpi:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$b;->coC:Lrx/internal/a/ab;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -83,7 +84,7 @@
 
 
 # virtual methods
-.method final La()V
+.method final KZ()V
     .locals 5
 
     new-instance v0, Ljava/util/ArrayList;
@@ -116,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;->cpi:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->coC:Lrx/internal/a/ab;
 
-    iget-wide v3, v0, Lrx/internal/a/ab;->cpf:J
+    iget-wide v3, v0, Lrx/internal/a/ab;->coz:J
 
-    iget-object v0, p0, Lrx/internal/a/ab$b;->cpi:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->coC:Lrx/internal/a/ab;
 
     iget-object v0, v0, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -327,7 +328,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lrx/internal/a/ab$b;->cpi:Lrx/internal/a/ab;
+    iget-object v4, p0, Lrx/internal/a/ab$b;->coC:Lrx/internal/a/ab;
 
     iget v4, v4, Lrx/internal/a/ab;->count:I
 
@@ -388,4 +389,6 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ab.smali b/com.discord/smali_classes2/rx/internal/a/ab.smali
index cc657bab99..728c6bb655 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ab;
 .super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -27,11 +28,11 @@
 
 
 # instance fields
+.field final coA:J
+
 .field final count:I
 
-.field final cpf:J
-
-.field final cpg:J
+.field final coz:J
 
 .field final scheduler:Lrx/Scheduler;
 
@@ -44,9 +45,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lrx/internal/a/ab;->cpf:J
+    iput-wide p1, p0, Lrx/internal/a/ab;->coz:J
 
-    iput-wide p3, p0, Lrx/internal/a/ab;->cpg:J
+    iput-wide p3, p0, Lrx/internal/a/ab;->coA:J
 
     iput-object p5, p0, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -73,7 +74,7 @@
 
     iget-object v0, p0, Lrx/internal/a/ab;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
@@ -81,9 +82,9 @@
 
     invoke-direct {v1, p1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
 
-    iget-wide v2, p0, Lrx/internal/a/ab;->cpf:J
+    iget-wide v2, p0, Lrx/internal/a/ab;->coz:J
 
-    iget-wide v4, p0, Lrx/internal/a/ab;->cpg:J
+    iget-wide v4, p0, Lrx/internal/a/ab;->coA:J
 
     cmp-long v6, v2, v4
 
@@ -103,17 +104,16 @@
 
     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;->cpi:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->coC:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->cpf:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->coz:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->cpi:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->coC:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->cpf:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->coz:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->cpi:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->coC:Lrx/internal/a/ab;
 
-    :goto_0
     iget-object v9, p1, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
 
     invoke-virtual/range {v3 .. v9}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
@@ -129,7 +129,7 @@
 
     invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    invoke-virtual {v2}, Lrx/internal/a/ab$b;->La()V
+    invoke-virtual {v2}, Lrx/internal/a/ab$b;->KZ()V
 
     iget-object v3, v2, Lrx/internal/a/ab$b;->inner:Lrx/Scheduler$Worker;
 
@@ -137,17 +137,21 @@
 
     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;->cpi:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->coC:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->cpg:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->coA:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->cpi:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->coC:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->cpg:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->coA:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->cpi:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->coC:Lrx/internal/a/ab;
 
-    goto :goto_0
+    iget-object v9, p1, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual/range {v3 .. v9}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    return-object v2
 .end method
 
 
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 525f585717..5831b39c14 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ac$1$1;
 .super Ljava/lang/Object;
+.source "OperatorDebounceWithTime.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic cpo:Lrx/internal/a/ac$1;
+.field final synthetic coI:Lrx/internal/a/ac$1;
 
 .field final synthetic val$index:I
 
@@ -26,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;->cpo:Lrx/internal/a/ac$1;
+    iput-object p1, p0, Lrx/internal/a/ac$1$1;->coI:Lrx/internal/a/ac$1;
 
     iput p2, p0, Lrx/internal/a/ac$1$1;->val$index:I
 
@@ -40,17 +41,17 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/ac$1$1;->cpo:Lrx/internal/a/ac$1;
+    iget-object v0, p0, Lrx/internal/a/ac$1$1;->coI:Lrx/internal/a/ac$1;
 
-    iget-object v0, v0, Lrx/internal/a/ac$1;->cpm:Lrx/internal/a/ac$a;
+    iget-object v0, v0, Lrx/internal/a/ac$1;->coG: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;->cpo:Lrx/internal/a/ac$1;
+    iget-object v2, p0, Lrx/internal/a/ac$1$1;->coI: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;->cpo:Lrx/internal/a/ac$1;
+    iget-object v3, p0, Lrx/internal/a/ac$1$1;->coI: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 573acd0354..0d39b5e358 100644
--- a/com.discord/smali_classes2/rx/internal/a/ac$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ac$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ac$1;
 .super Lrx/Subscriber;
+.source "OperatorDebounceWithTime.java"
 
 
 # annotations
@@ -21,7 +22,7 @@
 
 
 # instance fields
-.field final cpm:Lrx/internal/a/ac$a;
+.field final coG:Lrx/internal/a/ac$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ac$a<",
@@ -30,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic cpn:Lrx/internal/a/ac;
+.field final synthetic coH:Lrx/internal/a/ac;
 
 .field final self:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -52,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;->cpn:Lrx/internal/a/ac;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->coH:Lrx/internal/a/ac;
 
     iput-object p3, p0, Lrx/internal/a/ac$1;->val$serial:Lrx/subscriptions/SerialSubscription;
 
@@ -66,7 +67,7 @@
 
     invoke-direct {p1}, Lrx/internal/a/ac$a;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ac$1;->cpm:Lrx/internal/a/ac$a;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->coG:Lrx/internal/a/ac$a;
 
     iput-object p0, p0, Lrx/internal/a/ac$1;->self:Lrx/Subscriber;
 
@@ -78,7 +79,7 @@
 .method public final onCompleted()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/ac$1;->cpm:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->coG:Lrx/internal/a/ac$a;
 
     iget-object v1, p0, Lrx/internal/a/ac$1;->val$s:Lrx/observers/SerializedSubscriber;
 
@@ -158,7 +159,7 @@
 
     invoke-virtual {p0}, Lrx/internal/a/ac$1;->unsubscribe()V
 
-    iget-object p1, p0, Lrx/internal/a/ac$1;->cpm:Lrx/internal/a/ac$a;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->coG:Lrx/internal/a/ac$a;
 
     invoke-virtual {p1}, Lrx/internal/a/ac$a;->clear()V
 
@@ -173,7 +174,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ac$1;->cpm:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->coG:Lrx/internal/a/ac$a;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ac$a;->next(Ljava/lang/Object;)I
 
@@ -187,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;->cpn:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->coH:Lrx/internal/a/ac;
 
     iget-wide v3, p1, Lrx/internal/a/ac;->timeout:J
 
-    iget-object p1, p0, Lrx/internal/a/ac$1;->cpn:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->coH: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$a.smali b/com.discord/smali_classes2/rx/internal/a/ac$a.smali
index 4a545b10b5..a61bc987ce 100644
--- a/com.discord/smali_classes2/rx/internal/a/ac$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ac$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ac$a;
 .super Ljava/lang/Object;
+.source "OperatorDebounceWithTime.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/a/ac.smali b/com.discord/smali_classes2/rx/internal/a/ac.smali
index 62171e566c..2db74a5470 100644
--- a/com.discord/smali_classes2/rx/internal/a/ac.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ac.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ac;
 .super Ljava/lang/Object;
+.source "OperatorDebounceWithTime.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -58,7 +59,7 @@
 
     iget-object p1, p0, Lrx/internal/a/ac;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {p1}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->KL()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 6a4f9f8458..e132a88997 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ad$1$1;
 .super Ljava/lang/Object;
+.source "OperatorDelay.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cpq:Lrx/internal/a/ad$1;
+.field final synthetic coK: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;->cpq:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$1;->coK:Lrx/internal/a/ad$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,21 +37,19 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$1;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->coK: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;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->coK:Lrx/internal/a/ad$1;
 
     const/4 v1, 0x1
 
     iput-boolean v1, v0, Lrx/internal/a/ad$1;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$1;->cpq:Lrx/internal/a/ad$1;
-
-    iget-object v0, v0, Lrx/internal/a/ad$1;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->cnG: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 8b2df66edb..b44c426e16 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ad$1$2;
 .super Ljava/lang/Object;
+.source "OperatorDelay.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cpq:Lrx/internal/a/ad$1;
+.field final synthetic coK:Lrx/internal/a/ad$1;
 
-.field final synthetic cpr:Ljava/lang/Throwable;
+.field final synthetic coL: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;->cpq:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$2;->coK:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$2;->cpr:Ljava/lang/Throwable;
+    iput-object p2, p0, Lrx/internal/a/ad$1$2;->coL:Ljava/lang/Throwable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,27 +41,25 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->coK: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;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->coK:Lrx/internal/a/ad$1;
 
     const/4 v1, 0x1
 
     iput-boolean v1, v0, Lrx/internal/a/ad$1;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->cnG:Lrx/Subscriber;
 
-    iget-object v0, v0, Lrx/internal/a/ad$1;->com:Lrx/Subscriber;
-
-    iget-object v1, p0, Lrx/internal/a/ad$1$2;->cpr:Ljava/lang/Throwable;
+    iget-object v1, p0, Lrx/internal/a/ad$1$2;->coL:Ljava/lang/Throwable;
 
     invoke-virtual {v0, v1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->coK: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 849cfdbb32..893d14e415 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ad$1$3;
 .super Ljava/lang/Object;
+.source "OperatorDelay.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cpq:Lrx/internal/a/ad$1;
+.field final synthetic coK:Lrx/internal/a/ad$1;
 
-.field final synthetic cps:Ljava/lang/Object;
+.field final synthetic coM: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;->cpq:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$3;->coK:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$3;->cps:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ad$1$3;->coM:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,17 +41,17 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$3;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->coK: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;->cpq:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->coK:Lrx/internal/a/ad$1;
 
-    iget-object v0, v0, Lrx/internal/a/ad$1;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->cnG:Lrx/Subscriber;
 
-    iget-object v1, p0, Lrx/internal/a/ad$1$3;->cps:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ad$1$3;->coM: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 378cf46751..99bee1ad09 100644
--- a/com.discord/smali_classes2/rx/internal/a/ad$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ad$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ad$1;
 .super Lrx/Subscriber;
+.source "OperatorDelay.java"
 
 
 # annotations
@@ -21,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic cpp:Lrx/internal/a/ad;
+.field final synthetic coJ:Lrx/internal/a/ad;
 
 .field done:Z
 
@@ -34,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;->cpp:Lrx/internal/a/ad;
+    iput-object p1, p0, Lrx/internal/a/ad$1;->coJ: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;->com:Lrx/Subscriber;
+    iput-object p4, p0, Lrx/internal/a/ad$1;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -56,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;->cpp:Lrx/internal/a/ad;
+    iget-object v2, p0, Lrx/internal/a/ad$1;->coJ:Lrx/internal/a/ad;
 
     iget-wide v2, v2, Lrx/internal/a/ad;->delay:J
 
-    iget-object v4, p0, Lrx/internal/a/ad$1;->cpp:Lrx/internal/a/ad;
+    iget-object v4, p0, Lrx/internal/a/ad$1;->coJ:Lrx/internal/a/ad;
 
     iget-object v4, v4, Lrx/internal/a/ad;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -97,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;->cpp:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->coJ:Lrx/internal/a/ad;
 
     iget-wide v2, p1, Lrx/internal/a/ad;->delay:J
 
-    iget-object p1, p0, Lrx/internal/a/ad$1;->cpp:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->coJ: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 26bcc0bac9..df6810ab70 100644
--- a/com.discord/smali_classes2/rx/internal/a/ad.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ad.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ad;
 .super Ljava/lang/Object;
+.source "OperatorDelay.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -50,7 +51,7 @@
 
     iget-object v0, p0, Lrx/internal/a/ad;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()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 927e74c1e5..a8f3c3c2e2 100644
--- a/com.discord/smali_classes2/rx/internal/a/ae$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ae$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ae$1;
 .super Lrx/Subscriber;
+.source "OperatorDistinctUntilChanged.java"
 
 
 # annotations
@@ -21,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field cpu:Ljava/lang/Object;
+.field coO:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TU;"
@@ -31,18 +32,18 @@
     .end annotation
 .end field
 
-.field cpv:Z
+.field coP:Z
 
-.field final synthetic cpw:Lrx/internal/a/ae;
+.field final synthetic coQ: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;->cpw:Lrx/internal/a/ae;
+    iput-object p1, p0, Lrx/internal/a/ae$1;->coQ:Lrx/internal/a/ae;
 
-    iput-object p3, p0, Lrx/internal/a/ae$1;->com:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ae$1;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -54,7 +55,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -64,7 +65,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -80,9 +81,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ae$1;->cpw:Lrx/internal/a/ae;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->coQ:Lrx/internal/a/ae;
 
-    iget-object v0, v0, Lrx/internal/a/ae;->coY:Lrx/functions/b;
+    iget-object v0, v0, Lrx/internal/a/ae;->cos:Lrx/functions/b;
 
     invoke-interface {v0, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -90,18 +91,18 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_1
 
-    iget-object v1, p0, Lrx/internal/a/ae$1;->cpu:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->coO:Ljava/lang/Object;
 
-    iput-object v0, p0, Lrx/internal/a/ae$1;->cpu:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/ae$1;->coO:Ljava/lang/Object;
 
-    iget-boolean v2, p0, Lrx/internal/a/ae$1;->cpv:Z
+    iget-boolean v2, p0, Lrx/internal/a/ae$1;->coP:Z
 
     if-eqz v2, :cond_1
 
     :try_start_1
-    iget-object v2, p0, Lrx/internal/a/ae$1;->cpw:Lrx/internal/a/ae;
+    iget-object v2, p0, Lrx/internal/a/ae$1;->coQ:Lrx/internal/a/ae;
 
-    iget-object v2, v2, Lrx/internal/a/ae;->cpt:Lrx/functions/Func2;
+    iget-object v2, v2, Lrx/internal/a/ae;->coN:Lrx/functions/Func2;
 
     invoke-interface {v2, v1, v0}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -111,13 +112,13 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v1
+    move-result v0
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -133,7 +134,7 @@
     :catch_0
     move-exception p1
 
-    iget-object v1, p0, Lrx/internal/a/ae$1;->com:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->cnG:Lrx/Subscriber;
 
     invoke-static {p1, v1, v0}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
@@ -142,9 +143,9 @@
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ae$1;->cpv:Z
+    iput-boolean v0, p0, Lrx/internal/a/ae$1;->coP:Z
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -153,7 +154,7 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/ae$1;->com:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->cnG: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 46e73a06ea..e6adf0278a 100644
--- a/com.discord/smali_classes2/rx/internal/a/ae$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ae$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ae$a;
 .super Ljava/lang/Object;
+.source "OperatorDistinctUntilChanged.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final cpx:Lrx/internal/a/ae;
+.field static final coR:Lrx/internal/a/ae;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ae<",
@@ -30,11 +31,11 @@
 
     new-instance v0, Lrx/internal/a/ae;
 
-    sget-object v1, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->ctq: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;->cpx:Lrx/internal/a/ae;
+    sput-object v0, Lrx/internal/a/ae$a;->coR:Lrx/internal/a/ae;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ae.smali b/com.discord/smali_classes2/rx/internal/a/ae.smali
index cded795a2a..84d90e4bfa 100644
--- a/com.discord/smali_classes2/rx/internal/a/ae.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ae.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ae;
 .super Ljava/lang/Object;
+.source "OperatorDistinctUntilChanged.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -32,16 +33,7 @@
 
 
 # instance fields
-.field final coY:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "-TT;+TU;>;"
-        }
-    .end annotation
-.end field
-
-.field final cpt:Lrx/functions/Func2;
+.field final coN:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -52,6 +44,15 @@
     .end annotation
 .end field
 
+.field final cos:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "-TT;+TU;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/functions/Func2;)V
@@ -68,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lrx/internal/util/l$b;->ctW:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->ctq:Lrx/internal/util/l$b;
 
-    iput-object v0, p0, Lrx/internal/a/ae;->coY:Lrx/functions/b;
+    iput-object v0, p0, Lrx/internal/a/ae;->cos:Lrx/functions/b;
 
-    iput-object p1, p0, Lrx/internal/a/ae;->cpt:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ae;->coN:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -89,14 +90,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ae;->coY:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ae;->cos:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/ae;->cpt:Lrx/functions/Func2;
+    iput-object p0, p0, Lrx/internal/a/ae;->coN:Lrx/functions/Func2;
 
     return-void
 .end method
 
-.method public static Lb()Lrx/internal/a/ae;
+.method public static La()Lrx/internal/a/ae;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -108,7 +109,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ae$a;->cpx:Lrx/internal/a/ae;
+    sget-object v0, Lrx/internal/a/ae$a;->coR:Lrx/internal/a/ae;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/af.smali b/com.discord/smali_classes2/rx/internal/a/af.smali
index 9ff1a12b19..3fdf999c15 100644
--- a/com.discord/smali_classes2/rx/internal/a/af.smali
+++ b/com.discord/smali_classes2/rx/internal/a/af.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/af;
 .super Ljava/lang/Object;
+.source "OperatorDoOnSubscribe.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field private final cpy:Lrx/functions/Action0;
+.field private final coS:Lrx/functions/Action0;
 
 
 # direct methods
@@ -28,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/af;->cpy:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/af;->coS:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -40,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/af;->cpy:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/af;->coS: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 bf7932c7b7..f6a525fea2 100644
--- a/com.discord/smali_classes2/rx/internal/a/ag.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ag.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ag;
 .super Ljava/lang/Object;
+.source "OperatorDoOnUnsubscribe.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field private final cpz:Lrx/functions/Action0;
+.field private final coT:Lrx/functions/Action0;
 
 
 # direct methods
@@ -28,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ag;->cpz:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/ag;->coT:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -40,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ag;->cpz:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/ag;->coT: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 b8d5aedf47..9c6511929b 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ah$a;
 .super Ljava/lang/Object;
+.source "OperatorMerge.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final cpC:Lrx/internal/a/ah;
+.field static final coW:Lrx/internal/a/ah;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ah<",
@@ -35,7 +36,7 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/ah;-><init>(Z)V
 
-    sput-object v0, Lrx/internal/a/ah$a;->cpC:Lrx/internal/a/ah;
+    sput-object v0, Lrx/internal/a/ah$a;->coW: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 bcc4335821..4587583a8a 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ah$b;
 .super Lrx/Subscriber;
+.source "OperatorMerge.java"
 
 
 # annotations
@@ -24,11 +25,11 @@
 
 
 # static fields
-.field static final cpG:I
+.field static final cpa:I
 
 
 # instance fields
-.field final cpD:Lrx/internal/a/ah$d;
+.field final coX:Lrx/internal/a/ah$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ah$d<",
@@ -37,9 +38,9 @@
     .end annotation
 .end field
 
-.field volatile cpE:Lrx/internal/util/i;
+.field volatile coY:Lrx/internal/util/i;
 
-.field cpF:I
+.field coZ:I
 
 .field volatile done:Z
 
@@ -54,7 +55,7 @@
 
     div-int/lit8 v0, v0, 0x4
 
-    sput v0, Lrx/internal/a/ah$b;->cpG:I
+    sput v0, Lrx/internal/a/ah$b;->cpa:I
 
     return-void
 .end method
@@ -71,7 +72,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ah$b;->cpD:Lrx/internal/a/ah$d;
+    iput-object p1, p0, Lrx/internal/a/ah$b;->coX:Lrx/internal/a/ah$d;
 
     iput-wide p2, p0, Lrx/internal/a/ah$b;->id:J
 
@@ -83,24 +84,24 @@
 .method public final bq(J)V
     .locals 1
 
-    iget v0, p0, Lrx/internal/a/ah$b;->cpF:I
+    iget v0, p0, Lrx/internal/a/ah$b;->coZ:I
 
     long-to-int p1, p1
 
     sub-int/2addr v0, p1
 
-    sget p1, Lrx/internal/a/ah$b;->cpG:I
+    sget p1, Lrx/internal/a/ah$b;->cpa:I
 
     if-le v0, p1, :cond_0
 
-    iput v0, p0, Lrx/internal/a/ah$b;->cpF:I
+    iput v0, p0, Lrx/internal/a/ah$b;->coZ:I
 
     return-void
 
     :cond_0
     sget p1, Lrx/internal/util/i;->SIZE:I
 
-    iput p1, p0, Lrx/internal/a/ah$b;->cpF:I
+    iput p1, p0, Lrx/internal/a/ah$b;->coZ:I
 
     sget p1, Lrx/internal/util/i;->SIZE:I
 
@@ -123,9 +124,9 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ah$b;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->cpD:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->coX:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lg()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lf()V
 
     return-void
 .end method
@@ -137,17 +138,17 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ah$b;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->cpD:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->coX:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Ld()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lc()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;->cpD:Lrx/internal/a/ah$d;
+    iget-object p1, p0, Lrx/internal/a/ah$b;->coX:Lrx/internal/a/ah$d;
 
-    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Lg()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Lf()V
 
     return-void
 .end method
@@ -160,9 +161,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->cpD:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->coX:Lrx/internal/a/ah$d;
 
-    iget-object v1, v0, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
     invoke-virtual {v1}, Lrx/internal/a/ah$c;->get()J
 
@@ -181,7 +182,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, v0, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
     invoke-virtual {v1}, Lrx/internal/a/ah$c;->get()J
 
@@ -226,7 +227,7 @@
     :goto_1
     if-eqz v3, :cond_8
 
-    iget-object v3, p0, Lrx/internal/a/ah$b;->cpE:Lrx/internal/util/i;
+    iget-object v3, p0, Lrx/internal/a/ah$b;->coY:Lrx/internal/util/i;
 
     if-eqz v3, :cond_3
 
@@ -241,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;->Lh()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lg()V
 
     return-void
 
@@ -268,7 +269,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v3, v0, Lrx/internal/a/ah$d;->cpA:Z
+    iget-boolean v3, v0, Lrx/internal/a/ah$d;->coU:Z
 
     if-nez v3, :cond_4
 
@@ -292,7 +293,7 @@
 
     :cond_4
     :try_start_4
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Ld()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lc()Ljava/util/Queue;
 
     move-result-object v3
 
@@ -305,7 +306,7 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, v0, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object p1, v0, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
     const-wide/16 v1, -0x1
 
@@ -338,7 +339,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lh()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lg()V
 
     return-void
 
@@ -383,7 +384,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;->Lg()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Lf()V
 
     :goto_6
     return-void
@@ -394,7 +395,7 @@
 
     sget v0, Lrx/internal/util/i;->SIZE:I
 
-    iput v0, p0, Lrx/internal/a/ah$b;->cpF:I
+    iput v0, p0, Lrx/internal/a/ah$b;->coZ:I
 
     sget v0, Lrx/internal/util/i;->SIZE:I
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ah$c.smali b/com.discord/smali_classes2/rx/internal/a/ah$c.smali
index 8587fa31a4..377fcee92c 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ah$c;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorMerge.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -87,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;->Lg()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Lf()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 90b1635814..ca1b964394 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$d.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$d.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ah$d;
 .super Lrx/Subscriber;
+.source "OperatorMerge.java"
 
 
 # annotations
@@ -25,7 +26,7 @@
 
 
 # static fields
-.field static final cpN:[Lrx/internal/a/ah$b;
+.field static final cph:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -46,11 +47,11 @@
     .end annotation
 .end field
 
-.field final cpA:Z
+.field final coU:Z
 
-.field final cpB:I
+.field final coV:I
 
-.field cpH:Lrx/internal/a/ah$c;
+.field cpb:Lrx/internal/a/ah$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ah$c<",
@@ -59,7 +60,7 @@
     .end annotation
 .end field
 
-.field volatile cpI:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field volatile cpc:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -69,9 +70,9 @@
     .end annotation
 .end field
 
-.field final cpJ:Ljava/lang/Object;
+.field final cpd:Ljava/lang/Object;
 
-.field volatile cpK:[Lrx/internal/a/ah$b;
+.field volatile cpe:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -81,13 +82,13 @@
     .end annotation
 .end field
 
-.field cpL:J
+.field cpf:J
 
-.field cpM:J
+.field cpg:J
 
-.field final cpO:I
+.field final cpi:I
 
-.field cpP:I
+.field cpj:I
 
 .field volatile done:Z
 
@@ -118,7 +119,7 @@
 
     new-array v0, v0, [Lrx/internal/a/ah$b;
 
-    sput-object v0, Lrx/internal/a/ah$d;->cpN:[Lrx/internal/a/ah$b;
+    sput-object v0, Lrx/internal/a/ah$d;->cph:[Lrx/internal/a/ah$b;
 
     return-void
 .end method
@@ -137,29 +138,28 @@
 
     iput-object p1, p0, Lrx/internal/a/ah$d;->child:Lrx/Subscriber;
 
-    iput-boolean p2, p0, Lrx/internal/a/ah$d;->cpA:Z
+    iput-boolean p2, p0, Lrx/internal/a/ah$d;->coU:Z
 
-    iput p3, p0, Lrx/internal/a/ah$d;->cpB:I
+    iput p3, p0, Lrx/internal/a/ah$d;->coV:I
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->cpJ:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->cpd:Ljava/lang/Object;
 
-    sget-object p1, Lrx/internal/a/ah$d;->cpN:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->cph:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->cpK:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->cpe:[Lrx/internal/a/ah$b;
 
     const p1, 0x7fffffff
 
     if-ne p3, p1, :cond_0
 
-    iput p1, p0, Lrx/internal/a/ah$d;->cpO:I
+    iput p1, p0, Lrx/internal/a/ah$d;->cpi:I
 
     const-wide p1, 0x7fffffffffffffffL
 
-    :goto_0
     invoke-virtual {p0, p1, p2}, Lrx/internal/a/ah$d;->request(J)V
 
     return-void
@@ -173,14 +173,16 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/a/ah$d;->cpO:I
+    iput p1, p0, Lrx/internal/a/ah$d;->cpi:I
 
     int-to-long p1, p3
 
-    goto :goto_0
+    invoke-virtual {p0, p1, p2}, Lrx/internal/a/ah$d;->request(J)V
+
+    return-void
 .end method
 
-.method private Le()Lrx/subscriptions/CompositeSubscription;
+.method private Ld()Lrx/subscriptions/CompositeSubscription;
     .locals 2
 
     iget-object v0, p0, Lrx/internal/a/ah$d;->subscriptions:Lrx/subscriptions/CompositeSubscription;
@@ -237,12 +239,12 @@
     return-object v0
 .end method
 
-.method private Lf()V
+.method private Le()V
     .locals 4
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lrx/internal/a/ah$d;->cpI:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->cpc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -280,7 +282,7 @@
     return-void
 .end method
 
-.method private Li()Z
+.method private Lh()Z
     .locals 3
 
     iget-object v0, p0, Lrx/internal/a/ah$d;->child:Lrx/Subscriber;
@@ -296,9 +298,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->cpI:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->cpc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
-    iget-boolean v2, p0, Lrx/internal/a/ah$d;->cpA:Z
+    iget-boolean v2, p0, Lrx/internal/a/ah$d;->coU:Z
 
     if-nez v2, :cond_1
 
@@ -311,7 +313,7 @@
     if-nez v0, :cond_1
 
     :try_start_0
-    invoke-direct {p0}, Lrx/internal/a/ah$d;->Lf()V
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Le()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -342,18 +344,18 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lrx/internal/a/ah$b;->cpE:Lrx/internal/util/i;
+    iget-object v0, p1, Lrx/internal/a/ah$b;->coY: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;->cpJ:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->cpd:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ah$d;->cpK:[Lrx/internal/a/ah$b;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->cpe:[Lrx/internal/a/ah$b;
 
     array-length v2, v1
 
@@ -396,9 +398,9 @@
 
     if-ne v2, p1, :cond_3
 
-    sget-object p1, Lrx/internal/a/ah$d;->cpN:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->cph:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->cpK:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->cpe:[Lrx/internal/a/ah$b;
 
     monitor-exit v0
 
@@ -419,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;->cpK:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->cpe:[Lrx/internal/a/ah$b;
 
     monitor-exit v0
 
@@ -433,6 +435,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method static a(Lrx/internal/a/ah$b;Ljava/lang/Object;)V
@@ -445,17 +449,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->cpE:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->coY:Lrx/internal/util/i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/util/i;->LG()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->LF()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;->cpE:Lrx/internal/util/i;
+    iput-object v0, p0, Lrx/internal/a/ah$b;->coY:Lrx/internal/util/i;
 
     :cond_0
     :try_start_0
@@ -508,7 +512,7 @@
 
     if-nez v0, :cond_4
 
-    iget v0, p0, Lrx/internal/a/ah$d;->cpB:I
+    iget v0, p0, Lrx/internal/a/ah$d;->coV:I
 
     const v1, 0x7fffffff
 
@@ -520,7 +524,7 @@
 
     invoke-direct {v0, v1}, Lrx/internal/util/a/h;-><init>(I)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_0
     add-int/lit8 v1, v0, -0x1
@@ -539,7 +543,7 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result v1
 
@@ -549,6 +553,8 @@
 
     invoke-direct {v1, v0}, Lrx/internal/util/b/q;-><init>(I)V
 
+    move-object v0, v1
+
     goto :goto_1
 
     :cond_2
@@ -556,6 +562,8 @@
 
     invoke-direct {v1, v0}, Lrx/internal/util/a/d;-><init>(I)V
 
+    move-object v0, v1
+
     goto :goto_1
 
     :cond_3
@@ -563,10 +571,9 @@
 
     invoke-direct {v1, v0}, Lrx/internal/util/a/e;-><init>(I)V
 
-    :goto_1
     move-object v0, v1
 
-    :goto_2
+    :goto_1
     iput-object v0, p0, Lrx/internal/a/ah$d;->queue:Ljava/util/Queue;
 
     :cond_4
@@ -598,7 +605,7 @@
 
 
 # virtual methods
-.method final Ld()Ljava/util/Queue;
+.method final Lc()Ljava/util/Queue;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -609,14 +616,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$d;->cpI:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->cpc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->cpI:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->cpc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-nez v0, :cond_0
 
@@ -624,7 +631,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/ah$d;->cpI:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/ah$d;->cpc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     :cond_0
     monitor-exit p0
@@ -645,7 +652,7 @@
     return-object v0
 .end method
 
-.method final Lg()V
+.method final Lf()V
     .locals 2
 
     monitor-enter p0
@@ -670,7 +677,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lh()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lg()V
 
     return-void
 
@@ -685,8 +692,8 @@
     throw v0
 .end method
 
-.method Lh()V
-    .locals 20
+.method Lg()V
+    .locals 22
 
     move-object/from16 v1, p0
 
@@ -694,7 +701,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;->Li()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Lh()Z
 
     move-result v0
 
@@ -705,7 +712,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;->cpH:Lrx/internal/a/ah$c;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
     invoke-virtual {v0}, Lrx/internal/a/ah$c;->get()J
 
@@ -749,7 +756,7 @@
 
     move-result-object v17
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Li()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Lh()Z
 
     move-result v0
 
@@ -780,7 +787,7 @@
     move-object/from16 v18, v0
 
     :try_start_2
-    iget-boolean v0, v1, Lrx/internal/a/ah$d;->cpA:Z
+    iget-boolean v0, v1, Lrx/internal/a/ah$d;->coU:Z
 
     if-nez v0, :cond_3
 
@@ -802,15 +809,15 @@
     :catchall_0
     move-exception v0
 
-    const/4 v3, 0x1
+    const/16 v21, 0x1
 
-    goto/16 :goto_13
+    goto/16 :goto_14
 
     :cond_3
     move-object/from16 v8, v18
 
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lrx/internal/a/ah$d;->Ld()Ljava/util/Queue;
+    invoke-virtual/range {p0 .. p0}, Lrx/internal/a/ah$d;->Lc()Ljava/util/Queue;
 
     move-result-object v0
 
@@ -842,7 +849,7 @@
     goto :goto_5
 
     :cond_6
-    iget-object v6, v1, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object v6, v1, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
     neg-int v2, v2
 
@@ -878,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;->cpK:[Lrx/internal/a/ah$b;
+    iget-object v5, v1, Lrx/internal/a/ah$d;->cpe:[Lrx/internal/a/ah$b;
 
     array-length v8, v5
 
@@ -895,7 +902,7 @@
     :cond_b
     if-nez v8, :cond_e
 
-    iget-object v0, v1, Lrx/internal/a/ah$d;->cpI:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->cpc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-eqz v0, :cond_d
 
@@ -908,7 +915,7 @@
     goto :goto_7
 
     :cond_c
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Lf()V
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Le()V
 
     return-void
 
@@ -919,9 +926,9 @@
     return-void
 
     :cond_e
-    if-lez v8, :cond_21
+    if-lez v8, :cond_23
 
-    iget-wide v11, v1, Lrx/internal/a/ah$d;->cpM:J
+    iget-wide v11, v1, Lrx/internal/a/ah$d;->cpg:J
 
     iget v0, v1, Lrx/internal/a/ah$d;->lastIndex:I
 
@@ -929,7 +936,7 @@
 
     aget-object v2, v5, v0
 
-    move-object/from16 v19, v4
+    move-object/from16 v17, v4
 
     iget-wide v3, v2, Lrx/internal/a/ah$b;->id:J
 
@@ -940,7 +947,7 @@
     goto :goto_8
 
     :cond_f
-    move-object/from16 v19, v4
+    move-object/from16 v17, v4
 
     :goto_8
     if-gt v8, v0, :cond_10
@@ -959,9 +966,9 @@
 
     iget-wide v3, v3, Lrx/internal/a/ah$b;->id:J
 
-    cmp-long v9, v3, v11
+    cmp-long v21, v3, v11
 
-    if-eqz v9, :cond_12
+    if-eqz v21, :cond_12
 
     add-int/lit8 v3, v2, 0x1
 
@@ -986,7 +993,7 @@
 
     iget-wide v3, v0, Lrx/internal/a/ah$b;->id:J
 
-    iput-wide v3, v1, Lrx/internal/a/ah$d;->cpM:J
+    iput-wide v3, v1, Lrx/internal/a/ah$d;->cpg:J
 
     move v0, v2
 
@@ -998,9 +1005,9 @@
     const/4 v3, 0x0
 
     :goto_b
-    if-ge v0, v8, :cond_1f
+    if-ge v0, v8, :cond_21
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Li()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Lh()Z
 
     move-result v4
 
@@ -1011,60 +1018,58 @@
     :cond_14
     aget-object v4, v5, v2
 
-    const/4 v9, 0x0
+    const/4 v11, 0x0
 
     :goto_c
-    move-object v11, v9
+    move-object v12, v11
 
-    const/4 v9, 0x0
+    const/4 v11, 0x0
 
     :goto_d
-    cmp-long v12, v6, v14
+    cmp-long v21, v6, v14
 
-    if-lez v12, :cond_16
+    if-lez v21, :cond_18
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Li()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Lh()Z
 
-    move-result v12
+    move-result v21
 
-    if-eqz v12, :cond_15
+    if-eqz v21, :cond_15
 
     return-void
 
     :cond_15
-    iget-object v12, v4, Lrx/internal/a/ah$b;->cpE:Lrx/internal/util/i;
+    iget-object v9, v4, Lrx/internal/a/ah$b;->coY:Lrx/internal/util/i;
+
+    if-eqz v9, :cond_17
+
+    invoke-virtual {v9}, Lrx/internal/util/i;->poll()Ljava/lang/Object;
+
+    move-result-object v12
 
     if-eqz v12, :cond_16
 
-    invoke-virtual {v12}, Lrx/internal/util/i;->poll()Ljava/lang/Object;
+    invoke-static {v12}, Lrx/internal/a/g;->cf(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v11
-
-    if-eqz v11, :cond_16
-
-    invoke-static {v11}, Lrx/internal/a/g;->cf(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v12
+    move-result-object v9
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_6
 
-    move-object/from16 v13, v19
+    move-object/from16 v13, v17
 
     :try_start_5
-    invoke-virtual {v13, v12}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v13, v9}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
     :try_end_5
     .catch Ljava/lang/Throwable; {:try_start_5 .. :try_end_5} :catch_1
     .catchall {:try_start_5 .. :try_end_5} :catchall_6
 
-    const/4 v12, 0x0
+    const-wide/16 v19, 0x1
 
-    const-wide/16 v17, 0x1
+    sub-long v6, v6, v19
 
-    sub-long v6, v6, v17
+    add-int/lit8 v11, v11, 0x1
 
-    add-int/lit8 v9, v9, 0x1
-
-    move-object/from16 v19, v13
+    move-object/from16 v17, v13
 
     goto :goto_d
 
@@ -1100,18 +1105,33 @@
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
     :cond_16
-    move-object/from16 v13, v19
+    move-object/from16 v13, v17
 
-    const-wide/16 v17, 0x1
+    const-wide/16 v19, 0x1
 
-    if-lez v9, :cond_18
+    goto :goto_e
 
-    if-nez v10, :cond_17
+    :cond_17
+    move-object/from16 v13, v17
+
+    const-wide/16 v19, 0x1
+
+    goto :goto_e
+
+    :cond_18
+    move-object/from16 v13, v17
+
+    const-wide/16 v19, 0x1
+
+    :goto_e
+    if-lez v11, :cond_1a
+
+    if-nez v10, :cond_19
 
     :try_start_9
-    iget-object v6, v1, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object v6, v1, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
-    neg-int v7, v9
+    neg-int v7, v11
 
     int-to-long v14, v7
 
@@ -1119,122 +1139,127 @@
 
     move-result-wide v6
 
-    goto :goto_e
+    goto :goto_f
 
-    :cond_17
+    :cond_19
     const-wide v6, 0x7fffffffffffffffL
 
-    :goto_e
-    int-to-long v14, v9
+    :goto_f
+    int-to-long v14, v11
 
     invoke-virtual {v4, v14, v15}, Lrx/internal/a/ah$b;->bq(J)V
 
     const-wide/16 v14, 0x0
 
-    :cond_18
+    :cond_1a
     cmp-long v9, v6, v14
 
-    if-eqz v9, :cond_1a
+    if-eqz v9, :cond_1c
 
-    if-nez v11, :cond_19
+    if-nez v12, :cond_1b
 
-    goto :goto_f
+    goto :goto_10
 
-    :cond_19
-    move-object v9, v11
+    :cond_1b
+    move-object v11, v12
 
-    move-object/from16 v19, v13
+    move-object/from16 v17, v13
 
     const-wide/16 v14, 0x0
 
     goto :goto_c
 
-    :cond_1a
-    :goto_f
+    :cond_1c
+    :goto_10
     iget-boolean v9, v4, Lrx/internal/a/ah$b;->done:Z
 
-    iget-object v11, v4, Lrx/internal/a/ah$b;->cpE:Lrx/internal/util/i;
+    iget-object v11, v4, Lrx/internal/a/ah$b;->coY:Lrx/internal/util/i;
 
-    if-eqz v9, :cond_1d
+    if-eqz v9, :cond_1f
 
-    if-eqz v11, :cond_1b
+    if-eqz v11, :cond_1d
 
     invoke-virtual {v11}, Lrx/internal/util/i;->isEmpty()Z
 
     move-result v9
 
-    if-eqz v9, :cond_1d
+    if-eqz v9, :cond_1f
 
-    :cond_1b
+    :cond_1d
     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;->Li()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Lh()Z
 
     move-result v3
 
-    if-eqz v3, :cond_1c
+    if-eqz v3, :cond_1e
 
     return-void
 
-    :cond_1c
+    :cond_1e
     add-int/lit8 v16, v16, 0x1
 
     const/4 v3, 0x1
 
-    :cond_1d
     const-wide/16 v11, 0x0
 
+    goto :goto_11
+
+    :cond_1f
+    const-wide/16 v11, 0x0
+
+    :goto_11
     cmp-long v4, v6, v11
 
-    if-eqz v4, :cond_20
+    if-eqz v4, :cond_22
 
     add-int/lit8 v2, v2, 0x1
 
-    if-ne v2, v8, :cond_1e
+    if-ne v2, v8, :cond_20
 
     const/4 v2, 0x0
 
-    :cond_1e
+    :cond_20
     add-int/lit8 v0, v0, 0x1
 
     move-wide v14, v11
 
-    move-object/from16 v19, v13
+    move-object/from16 v17, v13
 
     goto/16 :goto_b
 
-    :cond_1f
-    move-object/from16 v13, v19
+    :cond_21
+    move-object/from16 v13, v17
 
-    :cond_20
+    :cond_22
     iput v2, v1, Lrx/internal/a/ah$d;->lastIndex: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;->cpM:J
+    iput-wide v4, v1, Lrx/internal/a/ah$d;->cpg:J
 
     move/from16 v0, v16
 
-    goto :goto_10
+    goto :goto_12
 
-    :cond_21
+    :cond_23
     move-object v13, v4
 
     move/from16 v0, v16
 
     const/4 v3, 0x0
 
-    :goto_10
-    if-lez v0, :cond_22
+    :goto_12
+    if-lez v0, :cond_24
 
     int-to-long v4, v0
 
     invoke-virtual {v1, v4, v5}, Lrx/internal/a/ah$d;->request(J)V
 
-    :cond_22
-    if-nez v3, :cond_24
+    :cond_24
+    if-nez v3, :cond_26
 
     monitor-enter p0
     :try_end_9
@@ -1245,7 +1270,7 @@
     :try_end_a
     .catchall {:try_start_a .. :try_end_a} :catchall_3
 
-    if-nez v0, :cond_23
+    if-nez v0, :cond_25
 
     const/4 v2, 0x0
 
@@ -1263,9 +1288,9 @@
 
     const/4 v2, 0x1
 
-    goto :goto_11
+    goto :goto_13
 
-    :cond_23
+    :cond_25
     const/4 v2, 0x0
 
     :try_start_c
@@ -1275,14 +1300,16 @@
     :try_end_c
     .catchall {:try_start_c .. :try_end_c} :catchall_3
 
-    goto :goto_12
+    move-object v4, v13
+
+    goto/16 :goto_0
 
     :catchall_3
     move-exception v0
 
     const/4 v2, 0x0
 
-    :goto_11
+    :goto_13
     :try_start_d
     monitor-exit p0
     :try_end_d
@@ -1296,17 +1323,16 @@
     :catchall_4
     move-exception v0
 
-    move v3, v2
+    move/from16 v21, v2
 
-    goto :goto_13
+    goto :goto_14
 
     :catchall_5
     move-exception v0
 
-    goto :goto_11
+    goto :goto_13
 
-    :cond_24
-    :goto_12
+    :cond_26
     move-object v4, v13
 
     goto/16 :goto_0
@@ -1314,10 +1340,10 @@
     :catchall_6
     move-exception v0
 
-    const/4 v3, 0x0
+    const/16 v21, 0x0
 
-    :goto_13
-    if-nez v3, :cond_25
+    :goto_14
+    if-nez v21, :cond_27
 
     monitor-enter p0
 
@@ -1328,7 +1354,7 @@
 
     monitor-exit p0
 
-    goto :goto_14
+    goto :goto_15
 
     :catchall_7
     move-exception v0
@@ -1339,9 +1365,11 @@
 
     throw v0
 
-    :cond_25
-    :goto_14
+    :cond_27
+    :goto_15
     throw v0
+
+    return-void
 .end method
 
 .method public final onCompleted()V
@@ -1351,7 +1379,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ah$d;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lf()V
 
     return-void
 .end method
@@ -1359,7 +1387,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ld()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lc()Ljava/util/Queue;
 
     move-result-object v0
 
@@ -1369,7 +1397,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/ah$d;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lf()V
 
     return-void
 .end method
@@ -1381,7 +1409,7 @@
 
     if-eqz p1, :cond_d
 
-    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KA()Lrx/Observable;
 
     move-result-object v0
 
@@ -1391,15 +1419,15 @@
 
     if-ne p1, v0, :cond_1
 
-    iget p1, p0, Lrx/internal/a/ah$d;->cpP:I
+    iget p1, p0, Lrx/internal/a/ah$d;->cpj:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->cpO:I
+    iget v0, p0, Lrx/internal/a/ah$d;->cpi:I
 
     if-ne p1, v0, :cond_0
 
-    iput v2, p0, Lrx/internal/a/ah$d;->cpP:I
+    iput v2, p0, Lrx/internal/a/ah$d;->cpj:I
 
     int-to-long v0, p1
 
@@ -1408,7 +1436,7 @@
     return-void
 
     :cond_0
-    iput p1, p0, Lrx/internal/a/ah$d;->cpP:I
+    iput p1, p0, Lrx/internal/a/ah$d;->cpj:I
 
     return-void
 
@@ -1419,9 +1447,9 @@
 
     check-cast p1, Lrx/internal/util/k;
 
-    iget-object p1, p1, Lrx/internal/util/k;->ctK:Ljava/lang/Object;
+    iget-object p1, p1, Lrx/internal/util/k;->cte:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
     invoke-virtual {v0}, Lrx/internal/a/ah$c;->get()J
 
@@ -1436,7 +1464,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->cpb:Lrx/internal/a/ah$c;
 
     invoke-virtual {v0}, Lrx/internal/a/ah$c;->get()J
 
@@ -1496,7 +1524,7 @@
     :cond_4
     invoke-direct {p0, p1}, Lrx/internal/a/ah$d;->ci(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lh()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lg()V
 
     return-void
 
@@ -1523,7 +1551,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v0, p0, Lrx/internal/a/ah$d;->cpA:Z
+    iget-boolean v0, p0, Lrx/internal/a/ah$d;->coU:Z
 
     if-nez v0, :cond_6
 
@@ -1547,7 +1575,7 @@
 
     :cond_6
     :try_start_4
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ld()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lc()Ljava/util/Queue;
 
     move-result-object v0
 
@@ -1560,22 +1588,22 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Lrx/internal/a/ah$d;->cpH:Lrx/internal/a/ah$c;
+    iget-object p1, p0, Lrx/internal/a/ah$d;->cpb: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;->cpP:I
+    iget p1, p0, Lrx/internal/a/ah$d;->cpj:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->cpO:I
+    iget v0, p0, Lrx/internal/a/ah$d;->cpi:I
 
     if-ne p1, v0, :cond_8
 
-    iput v2, p0, Lrx/internal/a/ah$d;->cpP:I
+    iput v2, p0, Lrx/internal/a/ah$d;->cpj:I
 
     int-to-long v3, p1
 
@@ -1584,7 +1612,7 @@
     goto :goto_4
 
     :cond_8
-    iput p1, p0, Lrx/internal/a/ah$d;->cpP:I
+    iput p1, p0, Lrx/internal/a/ah$d;->cpj:I
 
     :goto_4
     monitor-enter p0
@@ -1609,7 +1637,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lh()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lg()V
 
     return-void
 
@@ -1654,7 +1682,7 @@
     :cond_b
     invoke-direct {p0, p1}, Lrx/internal/a/ah$d;->ci(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lf()V
 
     :goto_7
     return-void
@@ -1662,28 +1690,28 @@
     :cond_c
     new-instance v0, Lrx/internal/a/ah$b;
 
-    iget-wide v3, p0, Lrx/internal/a/ah$d;->cpL:J
+    iget-wide v3, p0, Lrx/internal/a/ah$d;->cpf:J
 
     const-wide/16 v5, 0x1
 
     add-long/2addr v5, v3
 
-    iput-wide v5, p0, Lrx/internal/a/ah$d;->cpL:J
+    iput-wide v5, p0, Lrx/internal/a/ah$d;->cpf: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;->Le()Lrx/subscriptions/CompositeSubscription;
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Ld()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;->cpJ:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->cpd:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_9
-    iget-object v3, p0, Lrx/internal/a/ah$d;->cpK:[Lrx/internal/a/ah$b;
+    iget-object v3, p0, Lrx/internal/a/ah$d;->cpe:[Lrx/internal/a/ah$b;
 
     array-length v4, v3
 
@@ -1695,7 +1723,7 @@
 
     aput-object v0, v5, v4
 
-    iput-object v5, p0, Lrx/internal/a/ah$d;->cpK:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->cpe:[Lrx/internal/a/ah$b;
 
     monitor-exit v1
     :try_end_9
@@ -1703,7 +1731,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Lf()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 f28cc8d921..875c63a70a 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ah;
 .super Ljava/lang/Object;
+.source "OperatorMerge.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -30,9 +31,9 @@
 
 
 # instance fields
-.field final cpA:Z
+.field final coU:Z
 
-.field final cpB:I
+.field final coV:I
 
 
 # direct methods
@@ -43,16 +44,16 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lrx/internal/a/ah;->cpA:Z
+    iput-boolean p1, p0, Lrx/internal/a/ah;->coU:Z
 
     const p1, 0x7fffffff
 
-    iput p1, p0, Lrx/internal/a/ah;->cpB:I
+    iput p1, p0, Lrx/internal/a/ah;->coV:I
 
     return-void
 .end method
 
-.method public static Lc()Lrx/internal/a/ah;
+.method public static Lb()Lrx/internal/a/ah;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -64,7 +65,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ah$a;->cpC:Lrx/internal/a/ah;
+    sget-object v0, Lrx/internal/a/ah$a;->coW:Lrx/internal/a/ah;
 
     return-object v0
 .end method
@@ -78,9 +79,9 @@
 
     new-instance v0, Lrx/internal/a/ah$d;
 
-    iget-boolean v1, p0, Lrx/internal/a/ah;->cpA:Z
+    iget-boolean v1, p0, Lrx/internal/a/ah;->coU:Z
 
-    iget v2, p0, Lrx/internal/a/ah;->cpB:I
+    iget v2, p0, Lrx/internal/a/ah;->coV:I
 
     invoke-direct {v0, p1, v1, v2}, Lrx/internal/a/ah$d;-><init>(Lrx/Subscriber;ZI)V
 
@@ -88,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;->cpH:Lrx/internal/a/ah$c;
+    iput-object v1, v0, Lrx/internal/a/ah$d;->cpb: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 1ef09820b4..277909c179 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ai$a$1;
 .super Ljava/lang/Object;
+.source "OperatorObserveOn.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cpT:Lrx/internal/a/ai$a;
+.field final synthetic cpn: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;->cpT:Lrx/internal/a/ai$a;
+    iput-object p1, p0, Lrx/internal/a/ai$a$1;->cpn:Lrx/internal/a/ai$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,15 +43,15 @@
 
     if-lez v2, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ai$a$1;->cpT:Lrx/internal/a/ai$a;
+    iget-object v0, p0, Lrx/internal/a/ai$a$1;->cpn: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;->cpT:Lrx/internal/a/ai$a;
+    iget-object p1, p0, Lrx/internal/a/ai$a$1;->cpn:Lrx/internal/a/ai$a;
 
-    invoke-virtual {p1}, Lrx/internal/a/ai$a;->Lj()V
+    invoke-virtual {p1}, Lrx/internal/a/ai$a;->Li()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 a4219d9dbe..beed823cad 100644
--- a/com.discord/smali_classes2/rx/internal/a/ai$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ai$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ai$a;
 .super Lrx/Subscriber;
+.source "OperatorObserveOn.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -28,7 +29,7 @@
 
 
 # instance fields
-.field volatile ceB:Z
+.field volatile cdV:Z
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -39,11 +40,11 @@
     .end annotation
 .end field
 
-.field final cpQ:Lrx/Scheduler$Worker;
+.field final cpk:Lrx/Scheduler$Worker;
 
-.field final cpR:Ljava/util/concurrent/atomic/AtomicLong;
+.field final cpl:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field cpS:J
+.field cpm:J
 
 .field final delayError:Z
 
@@ -88,15 +89,15 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/ai$a;->cpR:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object v0, p0, Lrx/internal/a/ai$a;->cpl:Ljava/util/concurrent/atomic/AtomicLong;
 
     iput-object p2, p0, Lrx/internal/a/ai$a;->child:Lrx/Subscriber;
 
-    invoke-virtual {p1}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    iput-object p1, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     iput-boolean p3, p0, Lrx/internal/a/ai$a;->delayError:Z
 
@@ -114,7 +115,7 @@
 
     iput p1, p0, Lrx/internal/a/ai$a;->limit:I
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result p1
 
@@ -124,19 +125,18 @@
 
     invoke-direct {p1, p4}, Lrx/internal/util/b/q;-><init>(I)V
 
-    :goto_1
     iput-object p1, p0, Lrx/internal/a/ai$a;->queue:Ljava/util/Queue;
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     new-instance p1, Lrx/internal/util/a/d;
 
     invoke-direct {p1, p4}, Lrx/internal/util/a/d;-><init>(I)V
 
-    goto :goto_1
+    iput-object p1, p0, Lrx/internal/a/ai$a;->queue:Ljava/util/Queue;
 
-    :goto_2
+    :goto_1
     int-to-long p1, p4
 
     invoke-virtual {p0, p1, p2}, Lrx/internal/a/ai$a;->request(J)V
@@ -187,25 +187,22 @@
 
     goto :goto_0
 
-    :catchall_0
-    move-exception p1
-
-    goto :goto_1
-
     :cond_1
     invoke-virtual {p3}, Lrx/Subscriber;->onCompleted()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    iget-object p1, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
-    goto :goto_2
+    goto :goto_1
 
-    :goto_1
-    iget-object p2, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    :catchall_0
+    move-exception p1
+
+    iget-object p2, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -223,7 +220,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    iget-object p1, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -232,7 +229,7 @@
     :catchall_1
     move-exception p1
 
-    iget-object p2, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -246,7 +243,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
-    iget-object p1, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -255,14 +252,14 @@
     :catchall_2
     move-exception p1
 
-    iget-object p2, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
     throw p1
 
     :cond_4
-    :goto_2
+    :goto_1
     const/4 p1, 0x0
 
     return p1
@@ -270,10 +267,10 @@
 
 
 # virtual methods
-.method protected final Lj()V
+.method protected final Li()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/ai$a;->cpR:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->cpl:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -285,7 +282,7 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0, p0}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;)Lrx/Subscription;
 
@@ -296,7 +293,7 @@
 .method public final call()V
     .locals 15
 
-    iget-wide v0, p0, Lrx/internal/a/ai$a;->cpS:J
+    iget-wide v0, p0, Lrx/internal/a/ai$a;->cpm:J
 
     iget-object v2, p0, Lrx/internal/a/ai$a;->queue:Ljava/util/Queue;
 
@@ -323,7 +320,7 @@
 
     if-eqz v12, :cond_4
 
-    iget-boolean v12, p0, Lrx/internal/a/ai$a;->ceB:Z
+    iget-boolean v12, p0, Lrx/internal/a/ai$a;->cdV:Z
 
     invoke-interface {v2}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -383,7 +380,7 @@
 
     if-nez v12, :cond_5
 
-    iget-boolean v8, p0, Lrx/internal/a/ai$a;->ceB:Z
+    iget-boolean v8, p0, Lrx/internal/a/ai$a;->cdV:Z
 
     invoke-interface {v2}, Ljava/util/Queue;->isEmpty()Z
 
@@ -398,9 +395,9 @@
     return-void
 
     :cond_5
-    iput-wide v6, p0, Lrx/internal/a/ai$a;->cpS:J
+    iput-wide v6, p0, Lrx/internal/a/ai$a;->cpm:J
 
-    iget-object v8, p0, Lrx/internal/a/ai$a;->cpR:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v8, p0, Lrx/internal/a/ai$a;->cpl:Ljava/util/concurrent/atomic/AtomicLong;
 
     neg-long v0, v0
 
@@ -424,7 +421,7 @@
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->ceB:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->cdV:Z
 
     if-eqz v0, :cond_0
 
@@ -433,9 +430,11 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ai$a;->ceB:Z
+    iput-boolean v0, p0, Lrx/internal/a/ai$a;->cdV:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Lj()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Li()V
+
+    return-void
 
     :cond_1
     :goto_0
@@ -451,7 +450,7 @@
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->ceB:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->cdV:Z
 
     if-eqz v0, :cond_0
 
@@ -462,9 +461,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/ai$a;->ceB:Z
+    iput-boolean p1, p0, Lrx/internal/a/ai$a;->cdV:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Lj()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Li()V
 
     return-void
 
@@ -489,7 +488,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->ceB:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->cdV:Z
 
     if-eqz v0, :cond_0
 
@@ -517,7 +516,9 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Lj()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Li()V
+
+    return-void
 
     :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 1995fc15ac..3c2de1f78f 100644
--- a/com.discord/smali_classes2/rx/internal/a/ai.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ai.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ai;
 .super Ljava/lang/Object;
+.source "OperatorObserveOn.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -66,45 +67,41 @@
 
     iget-object v0, p0, Lrx/internal/a/ai;->scheduler:Lrx/Scheduler;
 
-    instance-of v0, v0, Lrx/internal/c/f;
+    instance-of v1, v0, Lrx/internal/c/f;
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/ai;->scheduler:Lrx/Scheduler;
+    instance-of v1, v0, Lrx/internal/c/m;
 
-    instance-of v0, v0, Lrx/internal/c/m;
-
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
     return-object p1
 
     :cond_1
-    new-instance v0, Lrx/internal/a/ai$a;
-
-    iget-object v1, p0, Lrx/internal/a/ai;->scheduler:Lrx/Scheduler;
+    new-instance v1, Lrx/internal/a/ai$a;
 
     iget-boolean v2, p0, Lrx/internal/a/ai;->delayError:Z
 
     iget v3, p0, Lrx/internal/a/ai;->bufferSize:I
 
-    invoke-direct {v0, v1, p1, v2, v3}, Lrx/internal/a/ai$a;-><init>(Lrx/Scheduler;Lrx/Subscriber;ZI)V
+    invoke-direct {v1, v0, p1, v2, v3}, Lrx/internal/a/ai$a;-><init>(Lrx/Scheduler;Lrx/Subscriber;ZI)V
 
-    iget-object p1, v0, Lrx/internal/a/ai$a;->child:Lrx/Subscriber;
+    iget-object p1, v1, Lrx/internal/a/ai$a;->child:Lrx/Subscriber;
 
-    new-instance v1, Lrx/internal/a/ai$a$1;
+    new-instance v0, Lrx/internal/a/ai$a$1;
 
-    invoke-direct {v1, v0}, Lrx/internal/a/ai$a$1;-><init>(Lrx/internal/a/ai$a;)V
+    invoke-direct {v0, v1}, Lrx/internal/a/ai$a$1;-><init>(Lrx/internal/a/ai$a;)V
 
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object v1, v0, Lrx/internal/a/ai$a;->cpQ:Lrx/Scheduler$Worker;
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+    iget-object v0, v1, Lrx/internal/a/ai$a;->cpk:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    return-object v0
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    return-object v1
 .end method
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 769db9d62b..32ed3da999 100644
--- a/com.discord/smali_classes2/rx/internal/a/aj$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aj$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/aj$a;
 .super Lrx/Subscriber;
+.source "OperatorOnBackpressureBuffer.java"
 
 # interfaces
 .implements Lrx/internal/util/c$a;
@@ -28,7 +29,7 @@
 
 
 # instance fields
-.field private final bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -47,15 +48,15 @@
     .end annotation
 .end field
 
-.field private final cpV:Lrx/functions/Action0;
+.field private final cpp:Lrx/functions/Action0;
 
-.field private final cpW:Lrx/a$d;
+.field private final cpq:Lrx/a$d;
 
-.field private final cpX:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final cpr:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private final cpY:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final cps:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final cpZ:Lrx/internal/util/c;
+.field final cpt:Lrx/internal/util/c;
 
 
 # direct methods
@@ -79,7 +80,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/aj$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -87,7 +88,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object v0, p0, Lrx/internal/a/aj$a;->cpY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->cps:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     iput-object p1, p0, Lrx/internal/a/aj$a;->child:Lrx/Subscriber;
 
@@ -107,25 +108,25 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lrx/internal/a/aj$a;->cpX:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->cpr:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/aj$a;->cpV:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/a/aj$a;->cpp: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;->cpZ:Lrx/internal/util/c;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->cpt:Lrx/internal/util/c;
 
-    iput-object p4, p0, Lrx/internal/a/aj$a;->cpW:Lrx/a$d;
+    iput-object p4, p0, Lrx/internal/a/aj$a;->cpq:Lrx/a$d;
 
     return-void
 .end method
 
-.method private Ll()Z
+.method private Lk()Z
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->cpX:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->cpr:Ljava/util/concurrent/atomic/AtomicLong;
 
     const/4 v1, 0x1
 
@@ -134,7 +135,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aj$a;->cpX:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->cpr:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -144,14 +145,14 @@
 
     cmp-long v0, v2, v4
 
-    if-gtz v0, :cond_3
+    if-gtz v0, :cond_4
 
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v4, p0, Lrx/internal/a/aj$a;->cpW:Lrx/a$d;
+    iget-object v4, p0, Lrx/internal/a/aj$a;->cpq:Lrx/a$d;
 
-    invoke-interface {v4}, Lrx/a$d;->Ku()Z
+    invoke-interface {v4}, Lrx/a$d;->Kt()Z
 
     move-result v4
 
@@ -169,16 +170,21 @@
 
     goto :goto_0
 
+    :cond_1
+    const/4 v4, 0x0
+
+    goto :goto_0
+
     :catch_0
     move-exception v4
 
-    iget-object v5, p0, Lrx/internal/a/aj$a;->cpY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->cps:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v5, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
     move-result v5
 
-    if-eqz v5, :cond_1
+    if-eqz v5, :cond_2
 
     invoke-virtual {p0}, Lrx/internal/a/aj$a;->unsubscribe()V
 
@@ -186,17 +192,15 @@
 
     invoke-virtual {v5, v4}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
-    :cond_1
+    :cond_2
     const/4 v4, 0x0
 
     :goto_0
-    iget-object v5, p0, Lrx/internal/a/aj$a;->cpV:Lrx/functions/Action0;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->cpp:Lrx/functions/Action0;
 
-    if-eqz v5, :cond_2
+    if-eqz v5, :cond_3
 
     :try_start_1
-    iget-object v5, p0, Lrx/internal/a/aj$a;->cpV:Lrx/functions/Action0;
-
     invoke-interface {v5}, Lrx/functions/Action0;->call()V
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1
@@ -208,20 +212,20 @@
 
     invoke-static {v1}, Lrx/a/b;->C(Ljava/lang/Throwable;)V
 
-    iget-object v2, p0, Lrx/internal/a/aj$a;->cpZ:Lrx/internal/util/c;
+    iget-object v2, p0, Lrx/internal/a/aj$a;->cpt:Lrx/internal/util/c;
 
     invoke-virtual {v2, v1}, Lrx/internal/util/c;->L(Ljava/lang/Throwable;)V
 
     return v0
 
-    :cond_2
+    :cond_3
     :goto_1
-    if-nez v4, :cond_3
+    if-nez v4, :cond_4
 
     return v0
 
-    :cond_3
-    iget-object v0, p0, Lrx/internal/a/aj$a;->cpX:Ljava/util/concurrent/atomic/AtomicLong;
+    :cond_4
+    iget-object v0, p0, Lrx/internal/a/aj$a;->cpr:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide/16 v4, 0x1
 
@@ -272,7 +276,7 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->cpY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->cps:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -280,7 +284,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->cpZ:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->cpt:Lrx/internal/util/c;
 
     const/4 v1, 0x1
 
@@ -295,7 +299,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->cpY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->cps:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -303,7 +307,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->cpZ:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->cpt:Lrx/internal/util/c;
 
     invoke-virtual {v0, p1}, Lrx/internal/util/c;->L(Ljava/lang/Throwable;)V
 
@@ -319,7 +323,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lrx/internal/a/aj$a;->Ll()Z
+    invoke-direct {p0}, Lrx/internal/a/aj$a;->Lk()Z
 
     move-result v0
 
@@ -328,7 +332,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-static {p1}, Lrx/internal/a/g;->cb(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -336,7 +340,7 @@
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/aj$a;->cpZ:Lrx/internal/util/c;
+    iget-object p1, p0, Lrx/internal/a/aj$a;->cpt:Lrx/internal/util/c;
 
     invoke-virtual {p1}, Lrx/internal/util/c;->drain()V
 
@@ -356,7 +360,7 @@
 .method public final peek()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->peek()Ljava/lang/Object;
 
@@ -368,20 +372,18 @@
 .method public final poll()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bUc: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;->cpX:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lrx/internal/a/aj$a;->cpr:Ljava/util/concurrent/atomic/AtomicLong;
 
     if-eqz v1, :cond_0
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lrx/internal/a/aj$a;->cpX:Ljava/util/concurrent/atomic/AtomicLong;
-
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
 
     :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 5968a41670..8fac3a69d9 100644
--- a/com.discord/smali_classes2/rx/internal/a/aj$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aj$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/aj$b;
 .super Ljava/lang/Object;
+.source "OperatorOnBackpressureBuffer.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final cqa:Lrx/internal/a/aj;
+.field static final cpu:Lrx/internal/a/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/aj<",
@@ -32,7 +33,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/aj;-><init>()V
 
-    sput-object v0, Lrx/internal/a/aj$b;->cqa:Lrx/internal/a/aj;
+    sput-object v0, Lrx/internal/a/aj$b;->cpu: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 407bf28ce7..d6a957a80a 100644
--- a/com.discord/smali_classes2/rx/internal/a/aj.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aj.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/aj;
 .super Ljava/lang/Object;
+.source "OperatorOnBackpressureBuffer.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -26,11 +27,11 @@
 
 
 # instance fields
-.field private final cpU:Ljava/lang/Long;
+.field private final cpo:Ljava/lang/Long;
 
-.field private final cpV:Lrx/functions/Action0;
+.field private final cpp:Lrx/functions/Action0;
 
-.field private final cpW:Lrx/a$d;
+.field private final cpq:Lrx/a$d;
 
 
 # direct methods
@@ -41,18 +42,18 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/aj;->cpU:Ljava/lang/Long;
+    iput-object v0, p0, Lrx/internal/a/aj;->cpo:Ljava/lang/Long;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->cpV:Lrx/functions/Action0;
+    iput-object v0, p0, Lrx/internal/a/aj;->cpp:Lrx/functions/Action0;
 
-    sget-object v0, Lrx/a;->cmy:Lrx/a$d;
+    sget-object v0, Lrx/a;->clR:Lrx/a$d;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->cpW:Lrx/a$d;
+    iput-object v0, p0, Lrx/internal/a/aj;->cpq:Lrx/a$d;
 
     return-void
 .end method
 
-.method public static Lk()Lrx/internal/a/aj;
+.method public static Lj()Lrx/internal/a/aj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -64,7 +65,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/aj$b;->cqa:Lrx/internal/a/aj;
+    sget-object v0, Lrx/internal/a/aj$b;->cpu:Lrx/internal/a/aj;
 
     return-object v0
 .end method
@@ -78,17 +79,17 @@
 
     new-instance v0, Lrx/internal/a/aj$a;
 
-    iget-object v1, p0, Lrx/internal/a/aj;->cpU:Ljava/lang/Long;
+    iget-object v1, p0, Lrx/internal/a/aj;->cpo:Ljava/lang/Long;
 
-    iget-object v2, p0, Lrx/internal/a/aj;->cpV:Lrx/functions/Action0;
+    iget-object v2, p0, Lrx/internal/a/aj;->cpp:Lrx/functions/Action0;
 
-    iget-object v3, p0, Lrx/internal/a/aj;->cpW:Lrx/a$d;
+    iget-object v3, p0, Lrx/internal/a/aj;->cpq: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;->cpZ:Lrx/internal/util/c;
+    iget-object v1, v0, Lrx/internal/a/aj$a;->cpt: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 b96115e892..6c0ed8e60c 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ak$a;
 .super Ljava/lang/Object;
+.source "OperatorOnBackpressureLatest.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final cqb:Lrx/internal/a/ak;
+.field static final cpv:Lrx/internal/a/ak;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ak<",
@@ -33,7 +34,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/ak;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ak$a;->cqb:Lrx/internal/a/ak;
+    sput-object v0, Lrx/internal/a/ak$a;->cpv: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 bbe630df11..0f641b7e08 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ak$b;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorOnBackpressureLatest.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -32,7 +33,7 @@
 
 
 # static fields
-.field static final cqc:Ljava/lang/Object;
+.field static final cpw:Ljava/lang/Object;
 
 .field private static final serialVersionUID:J = -0x12ef4cd3e08498a2L
 
@@ -83,7 +84,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ak$b;->cqc:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ak$b;->cpw:Ljava/lang/Object;
 
     return-void
 .end method
@@ -104,7 +105,7 @@
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/a/ak$b;->cqc:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/ak$b;->cpw:Ljava/lang/Object;
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -117,7 +118,7 @@
     return-void
 .end method
 
-.method private Lg()V
+.method private Lf()V
     .locals 9
 
     monitor-enter p0
@@ -173,7 +174,7 @@
 
     if-lez v7, :cond_2
 
-    sget-object v2, Lrx/internal/a/ak$b;->cqc:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->cpw:Ljava/lang/Object;
 
     if-eq v4, v2, :cond_2
 
@@ -183,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;->cqc:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/a/ak$b;->cpw: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;->Ln()J
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lm()J
 
-    sget-object v4, Lrx/internal/a/ak$b;->cqc:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/ak$b;->cpw:Ljava/lang/Object;
 
     :cond_2
-    sget-object v2, Lrx/internal/a/ak$b;->cqc:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->cpw:Ljava/lang/Object;
 
     if-ne v4, v2, :cond_4
 
@@ -318,9 +319,11 @@
     .catchall {:try_start_8 .. :try_end_8} :catchall_5
 
     throw v0
+
+    return-void
 .end method
 
-.method private Ln()J
+.method private Lm()J
     .locals 5
 
     :cond_0
@@ -382,7 +385,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ak$b;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lg()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lf()V
 
     return-void
 .end method
@@ -396,7 +399,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/ak$b;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lg()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lf()V
 
     return-void
 .end method
@@ -413,7 +416,7 @@
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lg()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lf()V
 
     return-void
 .end method
@@ -452,8 +455,6 @@
     goto :goto_0
 
     :cond_2
-    const/4 v6, 0x0
-
     add-long v6, v2, p1
 
     cmp-long v8, v6, v0
@@ -476,10 +477,12 @@
 
     iget-object p1, p0, Lrx/internal/a/ak$b;->parent:Lrx/internal/a/ak$c;
 
-    invoke-virtual {p1}, Lrx/internal/a/ak$c;->KV()V
+    invoke-virtual {p1}, Lrx/internal/a/ak$c;->KU()V
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lg()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Lf()V
+
+    return-void
 
     :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 7290d924bd..ece073aaa8 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ak$c;
 .super Lrx/Subscriber;
+.source "OperatorOnBackpressureLatest.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final cqd:Lrx/internal/a/ak$b;
+.field private final cpx:Lrx/internal/a/ak$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ak$b<",
@@ -47,14 +48,14 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ak$c;->cqd:Lrx/internal/a/ak$b;
+    iput-object p1, p0, Lrx/internal/a/ak$c;->cpx:Lrx/internal/a/ak$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final KV()V
+.method final KU()V
     .locals 2
 
     const-wide v0, 0x7fffffffffffffffL
@@ -67,7 +68,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ak$c;->cqd:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->cpx:Lrx/internal/a/ak$b;
 
     invoke-virtual {v0}, Lrx/internal/a/ak$b;->onCompleted()V
 
@@ -77,7 +78,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ak$c;->cqd:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->cpx:Lrx/internal/a/ak$b;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ak$b;->onError(Ljava/lang/Throwable;)V
 
@@ -92,7 +93,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ak$c;->cqd:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->cpx: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 81d5cceea8..06345354d8 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ak;
 .super Ljava/lang/Object;
+.source "OperatorOnBackpressureLatest.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -35,7 +36,7 @@
     return-void
 .end method
 
-.method public static Lm()Lrx/internal/a/ak;
+.method public static Ll()Lrx/internal/a/ak;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -47,7 +48,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ak$a;->cqb:Lrx/internal/a/ak;
+    sget-object v0, Lrx/internal/a/ak$a;->cpv: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 e90bcf7c01..698dd45e0a 100644
--- a/com.discord/smali_classes2/rx/internal/a/al$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/al$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/al$1;
 .super Ljava/lang/Object;
+.source "OperatorOnErrorResumeNextViaFunction.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -27,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic cqf:Lrx/functions/b;
+.field final synthetic cpz:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/al$1;->cqf:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al$1;->cpz:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +49,7 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    iget-object v0, p0, Lrx/internal/a/al$1;->cqf:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/al$1;->cpz: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 e503a40638..ba470f7753 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/al$2$1;
 .super Lrx/Subscriber;
+.source "OperatorOnErrorResumeNextViaFunction.java"
 
 
 # annotations
@@ -21,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic cqi:Lrx/internal/a/al$2;
+.field final synthetic cpC: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;->cqi:Lrx/internal/a/al$2;
+    iput-object p1, p0, Lrx/internal/a/al$2$1;->cpC:Lrx/internal/a/al$2;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -40,9 +41,9 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->cqi:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->cpC:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -52,9 +53,9 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->cqi:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->cpC:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -69,9 +70,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->cqi:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->cpC:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -81,9 +82,9 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->cqi:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->cpC:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->cqg:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/al$2;->cpA: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 4fed57fdd7..571e12481f 100644
--- a/com.discord/smali_classes2/rx/internal/a/al$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/al$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/al$2;
 .super Lrx/Subscriber;
+.source "OperatorOnErrorResumeNextViaFunction.java"
 
 
 # annotations
@@ -21,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic cqg:Lrx/internal/b/a;
+.field final synthetic cpA:Lrx/internal/b/a;
 
-.field final synthetic cqh:Lrx/internal/a/al;
+.field final synthetic cpB:Lrx/internal/a/al;
 
 .field private done:Z
 
@@ -38,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;->cqh:Lrx/internal/a/al;
+    iput-object p1, p0, Lrx/internal/a/al$2;->cpB:Lrx/internal/a/al;
 
-    iput-object p2, p0, Lrx/internal/a/al$2;->com:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/al$2;->cnG:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/al$2;->cqg:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/al$2;->cpA:Lrx/internal/b/a;
 
     iput-object p4, p0, Lrx/internal/a/al$2;->val$serial:Lrx/subscriptions/SerialSubscription;
 
@@ -67,7 +68,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/al$2;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -111,14 +112,14 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v3, p0, Lrx/internal/a/al$2;->cqg:Lrx/internal/b/a;
+    iget-object v3, p0, Lrx/internal/a/al$2;->cpA:Lrx/internal/b/a;
 
     invoke-virtual {v3, v1, v2}, Lrx/internal/b/a;->bt(J)V
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/a/al$2;->cqh:Lrx/internal/a/al;
+    iget-object v1, p0, Lrx/internal/a/al$2;->cpB:Lrx/internal/a/al;
 
-    iget-object v1, v1, Lrx/internal/a/al;->cqe:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/al;->cpy:Lrx/functions/b;
 
     invoke-interface {v1, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -135,7 +136,7 @@
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->cnG:Lrx/Subscriber;
 
     invoke-static {p1, v0}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
@@ -165,7 +166,7 @@
 
     iput-wide v0, p0, Lrx/internal/a/al$2;->produced:J
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -175,7 +176,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->cqg:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/al$2;->cpA: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 af2e231eb6..cd958d0eed 100644
--- a/com.discord/smali_classes2/rx/internal/a/al.smali
+++ b/com.discord/smali_classes2/rx/internal/a/al.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/al;
 .super Ljava/lang/Object;
+.source "OperatorOnErrorResumeNextViaFunction.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field final cqe:Lrx/functions/b;
+.field final cpy:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -50,7 +51,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/al;->cqe:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al;->cpy: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 59c9d308d4..81122c59d3 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/am$1;
 .super Ljava/lang/Object;
+.source "OperatorPublish.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cqk:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic cpE: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;->cqk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$1;->cpE:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +48,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/am$1;->cqk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am$1;->cpE:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -66,13 +67,13 @@
     :cond_1
     new-instance v1, Lrx/internal/a/am$b;
 
-    iget-object v2, p0, Lrx/internal/a/am$1;->cqk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->cpE: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;->cqk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->cpE:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -88,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;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, v0, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -96,7 +97,7 @@
 
     check-cast v2, [Lrx/internal/a/am$a;
 
-    sget-object v3, Lrx/internal/a/am$b;->cqn:[Lrx/internal/a/am$a;
+    sget-object v3, Lrx/internal/a/am$b;->cpH:[Lrx/internal/a/am$a;
 
     const/4 v4, 0x0
 
@@ -115,7 +116,7 @@
 
     aput-object v1, v5, v3
 
-    iget-object v3, v0, Lrx/internal/a/am$b;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->cpI: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 7ce6241891..5c1d8fc3aa 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/am$a;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorPublish.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -80,7 +81,7 @@
 
 
 # virtual methods
-.method public final Ln()J
+.method public final Lm()J
     .locals 7
 
     :cond_0
@@ -156,6 +157,8 @@
     invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final isUnsubscribed()Z
@@ -228,8 +231,6 @@
     goto :goto_0
 
     :cond_3
-    const/4 v4, 0x0
-
     add-long v4, v2, p1
 
     cmp-long v6, v4, v0
@@ -248,7 +249,7 @@
 
     iget-object p1, p0, Lrx/internal/a/am$a;->parent:Lrx/internal/a/am$b;
 
-    invoke-virtual {p1}, Lrx/internal/a/am$b;->Lo()V
+    invoke-virtual {p1}, Lrx/internal/a/am$b;->Ln()V
 
     return-void
 .end method
@@ -277,7 +278,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;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, v0, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -285,11 +286,11 @@
 
     check-cast v1, [Lrx/internal/a/am$a;
 
-    sget-object v2, Lrx/internal/a/am$b;->cqm:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->cpG:[Lrx/internal/a/am$a;
 
     if-eq v1, v2, :cond_5
 
-    sget-object v2, Lrx/internal/a/am$b;->cqn:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->cpH:[Lrx/internal/a/am$a;
 
     if-ne v1, v2, :cond_1
 
@@ -332,7 +333,7 @@
 
     if-ne v3, v5, :cond_4
 
-    sget-object v2, Lrx/internal/a/am$b;->cqm:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->cpG:[Lrx/internal/a/am$a;
 
     goto :goto_2
 
@@ -354,7 +355,7 @@
     move-object v2, v6
 
     :goto_2
-    iget-object v3, v0, Lrx/internal/a/am$b;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v3, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -366,7 +367,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;->Lo()V
+    invoke-virtual {v0}, Lrx/internal/a/am$b;->Ln()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 48b8e1c205..b35b3befc7 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/am$b$1;
 .super Ljava/lang/Object;
+.source "OperatorPublish.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cqq:Lrx/internal/a/am$b;
+.field final synthetic cpK: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;->cqq:Lrx/internal/a/am$b;
+    iput-object p1, p0, Lrx/internal/a/am$b$1;->cpK:Lrx/internal/a/am$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,19 +37,19 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/am$b$1;->cqq:Lrx/internal/a/am$b;
+    iget-object v0, p0, Lrx/internal/a/am$b$1;->cpK:Lrx/internal/a/am$b;
 
-    iget-object v0, v0, Lrx/internal/a/am$b;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->cqn:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->cpH:[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;->cqq:Lrx/internal/a/am$b;
+    iget-object v0, p0, Lrx/internal/a/am$b$1;->cpK:Lrx/internal/a/am$b;
 
-    iget-object v0, v0, Lrx/internal/a/am$b;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/a/am$b;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v1, p0, Lrx/internal/a/am$b$1;->cqq:Lrx/internal/a/am$b;
+    iget-object v1, p0, Lrx/internal/a/am$b$1;->cpK: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 0fad6a3b70..836bf4bd77 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/am$b;
 .super Lrx/Subscriber;
+.source "OperatorPublish.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -28,13 +29,13 @@
 
 
 # static fields
-.field static final cqm:[Lrx/internal/a/am$a;
+.field static final cpG:[Lrx/internal/a/am$a;
 
-.field static final cqn:[Lrx/internal/a/am$a;
+.field static final cpH:[Lrx/internal/a/am$a;
 
 
 # instance fields
-.field final cqj:Ljava/util/concurrent/atomic/AtomicReference;
+.field final cpD:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -44,9 +45,9 @@
     .end annotation
 .end field
 
-.field volatile cql:Ljava/lang/Object;
+.field volatile cpF:Ljava/lang/Object;
 
-.field final cqo:Ljava/util/concurrent/atomic/AtomicReference;
+.field final cpI:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -57,7 +58,7 @@
     .end annotation
 .end field
 
-.field final cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .field emitting:Z
 
@@ -82,11 +83,11 @@
 
     new-array v1, v0, [Lrx/internal/a/am$a;
 
-    sput-object v1, Lrx/internal/a/am$b;->cqm:[Lrx/internal/a/am$a;
+    sput-object v1, Lrx/internal/a/am$b;->cpG:[Lrx/internal/a/am$a;
 
     new-array v0, v0, [Lrx/internal/a/am$a;
 
-    sput-object v0, Lrx/internal/a/am$b;->cqn:[Lrx/internal/a/am$a;
+    sput-object v0, Lrx/internal/a/am$b;->cpH:[Lrx/internal/a/am$a;
 
     return-void
 .end method
@@ -104,7 +105,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result v0
 
@@ -130,19 +131,19 @@
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->cqm:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->cpG:[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;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p1, p0, Lrx/internal/a/am$b;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$b;->cpD: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;->cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/am$b;->cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
 .end method
@@ -166,14 +167,14 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p1, p0, Lrx/internal/a/am$b;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->cpD: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;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object p2, Lrx/internal/a/am$b;->cqn:[Lrx/internal/a/am$a;
+    sget-object p2, Lrx/internal/a/am$b;->cpH:[Lrx/internal/a/am$a;
 
     invoke-virtual {p1, p2}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -215,14 +216,14 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lrx/internal/a/am$b;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->cpD: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;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->cqn:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->cpH:[Lrx/internal/a/am$a;
 
     invoke-virtual {p2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -265,7 +266,7 @@
 
 
 # virtual methods
-.method final Lo()V
+.method final Ln()V
     .locals 17
 
     move-object/from16 v1, p0
@@ -299,7 +300,7 @@
     :cond_1
     :goto_0
     :try_start_1
-    iget-object v0, v1, Lrx/internal/a/am$b;->cql:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->cpF:Ljava/lang/Object;
 
     iget-object v4, v1, Lrx/internal/a/am$b;->queue:Ljava/util/Queue;
 
@@ -318,7 +319,7 @@
     :cond_2
     if-nez v4, :cond_10
 
-    iget-object v0, v1, Lrx/internal/a/am$b;->cqo:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v1, Lrx/internal/a/am$b;->cpI:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -379,7 +380,7 @@
     :cond_5
     if-ne v0, v7, :cond_8
 
-    iget-object v0, v1, Lrx/internal/a/am$b;->cql:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->cpF:Ljava/lang/Object;
 
     iget-object v4, v1, Lrx/internal/a/am$b;->queue:Ljava/util/Queue;
 
@@ -424,7 +425,7 @@
 
     if-gez v8, :cond_e
 
-    iget-object v0, v1, Lrx/internal/a/am$b;->cql:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->cpF:Ljava/lang/Object;
 
     iget-object v8, v1, Lrx/internal/a/am$b;->queue:Ljava/util/Queue;
 
@@ -485,7 +486,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_3
 
     :try_start_3
-    invoke-virtual {v14}, Lrx/internal/a/am$a;->Ln()J
+    invoke-virtual {v14}, Lrx/internal/a/am$a;->Lm()J
 
     goto :goto_7
 
@@ -622,6 +623,8 @@
     .catchall {:try_start_a .. :try_end_a} :catchall_5
 
     throw v0
+
+    return-void
 .end method
 
 .method final init()V
@@ -643,17 +646,17 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/am$b;->cql:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->cpF:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->KU()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->KT()Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/a/am$b;->cql:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/am$b;->cpF:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->Lo()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->Ln()V
 
     :cond_0
     return-void
@@ -662,7 +665,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/am$b;->cql:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->cpF:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -670,9 +673,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/am$b;->cql:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/am$b;->cpF:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->Lo()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->Ln()V
 
     :cond_0
     return-void
@@ -707,7 +710,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->Lo()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->Ln()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/am.smali b/com.discord/smali_classes2/rx/internal/a/am.smali
index ccd1d3ac4e..e12c6d8530 100644
--- a/com.discord/smali_classes2/rx/internal/a/am.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/am;
 .super Lrx/b/b;
+.source "OperatorPublish.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -31,7 +32,7 @@
     .end annotation
 .end field
 
-.field final cqj:Ljava/util/concurrent/atomic/AtomicReference;
+.field final cpD:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -60,9 +61,9 @@
 
     invoke-direct {p0, p1}, Lrx/b/b;-><init>(Lrx/Observable$a;)V
 
-    iput-object p2, p0, Lrx/internal/a/am;->cnJ:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/am;->cnd:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/am;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/am;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -111,7 +112,7 @@
     .end annotation
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/am;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -130,13 +131,13 @@
     :cond_1
     new-instance v1, Lrx/internal/a/am$b;
 
-    iget-object v2, p0, Lrx/internal/a/am;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->cpD: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;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -147,7 +148,7 @@
     move-object v0, v1
 
     :cond_2
-    iget-object v1, v0, Lrx/internal/a/am$b;->cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -159,7 +160,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lrx/internal/a/am$b;->cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
@@ -177,7 +178,7 @@
 
     if-eqz v2, :cond_4
 
-    iget-object p1, p0, Lrx/internal/a/am;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/am;->cnd:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$1.smali b/com.discord/smali_classes2/rx/internal/a/an$1.smali
index f81310747d..bb6793f80c 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$1;
 .super Ljava/lang/Object;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/functions/Func0;
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 fcfe9fb492..b10db6c36d 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$2;
 .super Ljava/lang/Object;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/functions/Func0;
@@ -26,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic cqt:I
+.field final synthetic cpN:I
 
 
 # direct methods
 .method constructor <init>(I)V
     .locals 0
 
-    iput p1, p0, Lrx/internal/a/an$2;->cqt:I
+    iput p1, p0, Lrx/internal/a/an$2;->cpN:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +48,7 @@
 
     new-instance v0, Lrx/internal/a/an$f;
 
-    iget v1, p0, Lrx/internal/a/an$2;->cqt:I
+    iget v1, p0, Lrx/internal/a/an$2;->cpN: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 055be4488a..1b5f7978ac 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$3;
 .super Ljava/lang/Object;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic cqk:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic cpE:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic cqu:Lrx/functions/Func0;
+.field final synthetic cpO: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;->cqk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/an$3;->cpE:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p2, p0, Lrx/internal/a/an$3;->cqu:Lrx/functions/Func0;
+    iput-object p2, p0, Lrx/internal/a/an$3;->cpO:Lrx/functions/Func0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +52,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an$3;->cqk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an$3;->cpE:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -63,7 +64,7 @@
 
     new-instance v1, Lrx/internal/a/an$e;
 
-    iget-object v2, p0, Lrx/internal/a/an$3;->cqu:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an$3;->cpO:Lrx/functions/Func0;
 
     invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
@@ -75,7 +76,7 @@
 
     invoke-virtual {v1}, Lrx/internal/a/an$e;->init()V
 
-    iget-object v2, p0, Lrx/internal/a/an$3;->cqk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an$3;->cpE:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -94,7 +95,7 @@
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, v0, Lrx/internal/a/an$e;->cqv:Lrx/internal/a/an$d;
+    iget-object v0, v0, Lrx/internal/a/an$e;->cpP: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 00d025fb3d..b645976c38 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$a.smali
@@ -1,5 +1,6 @@
 .class Lrx/internal/a/an$a;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/internal/a/an$d;
@@ -106,7 +107,7 @@
     return-void
 .end method
 
-.method Lp()V
+.method Lo()V
     .locals 0
 
     return-void
@@ -335,6 +336,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw v0
+
+    return-void
 .end method
 
 .method public final cj(Ljava/lang/Object;)V
@@ -363,7 +366,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;->Lp()V
+    invoke-virtual {p0}, Lrx/internal/a/an$a;->Lo()V
 
     return-void
 .end method
@@ -371,7 +374,7 @@
 .method public final complete()V
     .locals 6
 
-    invoke-static {}, Lrx/internal/a/g;->KU()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->KT()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 12f9ae9839..fc8d3e1fea 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$b;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -145,8 +146,6 @@
     return-wide v4
 
     :cond_1
-    const/4 v4, 0x0
-
     sub-long v4, v2, p1
 
     cmp-long v6, v4, v0
@@ -198,6 +197,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final isUnsubscribed()Z
@@ -259,8 +260,6 @@
     return-void
 
     :cond_2
-    const/4 v4, 0x0
-
     add-long v4, v2, p1
 
     cmp-long v6, v4, v0
@@ -284,7 +283,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;->cqv:Lrx/internal/a/an$d;
+    iget-object p1, p1, Lrx/internal/a/an$e;->cpP:Lrx/internal/a/an$d;
 
     invoke-interface {p1, p0}, Lrx/internal/a/an$d;->a(Lrx/internal/a/an$b;)V
 
@@ -318,7 +317,7 @@
 
     if-nez v1, :cond_5
 
-    iget-object v1, v0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v1, v0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
     monitor-enter v1
 
@@ -327,15 +326,14 @@
 
     if-eqz v2, :cond_0
 
-    :goto_0
     monitor-exit v1
 
-    goto :goto_4
+    goto :goto_2
 
     :cond_0
-    iget-object v2, v0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v2, v0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
-    iget-object v3, v2, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iget-object v3, v2, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
     iget v4, v2, Lrx/internal/util/g;->mask:I
 
@@ -361,10 +359,9 @@
 
     if-eqz v6, :cond_1
 
-    :goto_1
     invoke-virtual {v2, v5, v3, v4}, Lrx/internal/util/g;->a(I[Ljava/lang/Object;I)Z
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     add-int/2addr v5, v7
@@ -381,38 +378,40 @@
 
     if-eqz v6, :cond_1
 
-    goto :goto_1
+    invoke-virtual {v2, v5, v3, v4}, Lrx/internal/util/g;->a(I[Ljava/lang/Object;I)Z
 
     :cond_2
-    :goto_2
-    iget-object v2, v0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    :goto_0
+    iget-object v2, v0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
     iget v2, v2, Lrx/internal/util/g;->size:I
 
     if-nez v2, :cond_3
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_3
     const/4 v7, 0x0
 
-    :goto_3
+    :goto_1
     if-eqz v7, :cond_4
 
-    sget-object v2, Lrx/internal/a/an$e;->cqw:[Lrx/internal/a/an$b;
+    sget-object v2, Lrx/internal/a/an$e;->cpQ:[Lrx/internal/a/an$b;
 
-    iput-object v2, v0, Lrx/internal/a/an$e;->cqz:[Lrx/internal/a/an$b;
+    iput-object v2, v0, Lrx/internal/a/an$e;->cpT:[Lrx/internal/a/an$b;
 
     :cond_4
-    iget-wide v2, v0, Lrx/internal/a/an$e;->cqA:J
+    iget-wide v2, v0, Lrx/internal/a/an$e;->cpU:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v0, Lrx/internal/a/an$e;->cqA:J
+    iput-wide v2, v0, Lrx/internal/a/an$e;->cpU:J
 
-    goto :goto_0
+    monitor-exit v1
+
+    goto :goto_2
 
     :catchall_0
     move-exception v0
@@ -424,7 +423,7 @@
     throw v0
 
     :cond_5
-    :goto_4
+    :goto_2
     iget-object v0, p0, Lrx/internal/a/an$b;->parent:Lrx/internal/a/an$e;
 
     invoke-virtual {v0, p0}, Lrx/internal/a/an$e;->c(Lrx/internal/a/an$b;)V
diff --git a/com.discord/smali_classes2/rx/internal/a/an$c.smali b/com.discord/smali_classes2/rx/internal/a/an$c.smali
index bc5e2158ba..33910c3adc 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$c;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "OperatorReplay.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/a/an$d.smali b/com.discord/smali_classes2/rx/internal/a/an$d.smali
index 266dcb8be0..168f874205 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$d.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$d.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lrx/internal/a/an$d;
 .super Ljava/lang/Object;
+.source "OperatorReplay.java"
 
 
 # annotations
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 860b4ffe8b..6683438076 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$e$1;
 .super Ljava/lang/Object;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic cqG:Lrx/internal/a/an$e;
+.field final synthetic cqa: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;->cqG:Lrx/internal/a/an$e;
+    iput-object p1, p0, Lrx/internal/a/an$e$1;->cqa:Lrx/internal/a/an$e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,28 +37,28 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/an$e$1;->cqG:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->cqa: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;->cqG:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->cqa:Lrx/internal/a/an$e;
 
-    iget-object v0, v0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v0, v0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->cqG:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->cqa: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;->cqG:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->cqa:Lrx/internal/a/an$e;
 
-    iget-object v1, v1, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v1, v1, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
     const/4 v2, 0x0
 
@@ -67,19 +68,19 @@
 
     check-cast v2, [Ljava/lang/Object;
 
-    iput-object v2, v1, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iput-object v2, v1, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->cqG:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->cqa:Lrx/internal/a/an$e;
 
-    iget-wide v2, v1, Lrx/internal/a/an$e;->cqA:J
+    iget-wide v2, v1, Lrx/internal/a/an$e;->cpU:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/a/an$e;->cqA:J
+    iput-wide v2, v1, Lrx/internal/a/an$e;->cpU:J
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->cqG:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->cqa: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 964358ae63..9252d7d392 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$e.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$e;
 .super Lrx/Subscriber;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -28,35 +29,15 @@
 
 
 # static fields
-.field static final cqw:[Lrx/internal/a/an$b;
+.field static final cpQ:[Lrx/internal/a/an$b;
 
-.field static final cqx:[Lrx/internal/a/an$b;
+.field static final cpR:[Lrx/internal/a/an$b;
 
 
 # instance fields
-.field volatile cqA:J
+.field final cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field cqB:J
-
-.field cqC:J
-
-.field cqD:J
-
-.field cqE:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lrx/internal/a/an$b<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field cqF:Z
-
-.field final cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field final cqv:Lrx/internal/a/an$d;
+.field final cpP:Lrx/internal/a/an$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/an$d<",
@@ -65,7 +46,7 @@
     .end annotation
 .end field
 
-.field final cqy:Lrx/internal/util/g;
+.field final cpS:Lrx/internal/util/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/util/g<",
@@ -75,7 +56,7 @@
     .end annotation
 .end field
 
-.field cqz:[Lrx/internal/a/an$b;
+.field cpT:[Lrx/internal/a/an$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -85,6 +66,26 @@
     .end annotation
 .end field
 
+.field volatile cpU:J
+
+.field cpV:J
+
+.field cpW:J
+
+.field cpX:J
+
+.field cpY:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lrx/internal/a/an$b<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field cpZ:Z
+
 .field done:Z
 
 .field emitting:Z
@@ -104,11 +105,11 @@
 
     new-array v1, v0, [Lrx/internal/a/an$b;
 
-    sput-object v1, Lrx/internal/a/an$e;->cqw:[Lrx/internal/a/an$b;
+    sput-object v1, Lrx/internal/a/an$e;->cpQ:[Lrx/internal/a/an$b;
 
     new-array v0, v0, [Lrx/internal/a/an$b;
 
-    sput-object v0, Lrx/internal/a/an$e;->cqx:[Lrx/internal/a/an$b;
+    sput-object v0, Lrx/internal/a/an$e;->cpR:[Lrx/internal/a/an$b;
 
     return-void
 .end method
@@ -125,23 +126,23 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->cqv:Lrx/internal/a/an$d;
+    iput-object p1, p0, Lrx/internal/a/an$e;->cpP: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;->cqy:Lrx/internal/util/g;
+    iput-object p1, p0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
-    sget-object p1, Lrx/internal/a/an$e;->cqw:[Lrx/internal/a/an$b;
+    sget-object p1, Lrx/internal/a/an$e;->cpQ:[Lrx/internal/a/an$b;
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->cqz:[Lrx/internal/a/an$b;
+    iput-object p1, p0, Lrx/internal/a/an$e;->cpT:[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;->cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/an$e;->cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const-wide/16 v0, 0x0
 
@@ -150,7 +151,7 @@
     return-void
 .end method
 
-.method private Lq()[Lrx/internal/a/an$b;
+.method private Lp()[Lrx/internal/a/an$b;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -160,14 +161,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
-    iget-object v1, v1, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -191,14 +192,14 @@
     throw v1
 .end method
 
-.method private Lr()V
+.method private Lq()V
     .locals 7
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqz:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpT:[Lrx/internal/a/an$b;
 
-    iget-wide v1, p0, Lrx/internal/a/an$e;->cqB:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->cpV:J
 
-    iget-wide v3, p0, Lrx/internal/a/an$e;->cqA:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->cpU:J
 
     const/4 v5, 0x0
 
@@ -206,16 +207,16 @@
 
     if-eqz v6, :cond_1
 
-    iget-object v1, p0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqz:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpT:[Lrx/internal/a/an$b;
 
-    iget-object v2, p0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v2, p0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
-    iget-object v2, v2, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
     array-length v3, v2
 
@@ -225,14 +226,14 @@
 
     new-array v0, v3, [Lrx/internal/a/an$b;
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->cqz:[Lrx/internal/a/an$b;
+    iput-object v0, p0, Lrx/internal/a/an$e;->cpT:[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;->cqA:J
+    iget-wide v2, p0, Lrx/internal/a/an$e;->cpU:J
 
-    iput-wide v2, p0, Lrx/internal/a/an$e;->cqB:J
+    iput-wide v2, p0, Lrx/internal/a/an$e;->cpV:J
 
     monitor-exit v1
 
@@ -249,7 +250,7 @@
 
     :cond_1
     :goto_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->cqv:Lrx/internal/a/an$d;
+    iget-object v1, p0, Lrx/internal/a/an$e;->cpP:Lrx/internal/a/an$d;
 
     array-length v2, v0
 
@@ -274,7 +275,7 @@
 .method private i(JJ)V
     .locals 6
 
-    iget-wide v0, p0, Lrx/internal/a/an$e;->cqD:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->cpX:J
 
     iget-object v2, p0, Lrx/internal/a/an$e;->producer:Lrx/Producer;
 
@@ -286,7 +287,7 @@
 
     if-eqz v5, :cond_3
 
-    iput-wide p1, p0, Lrx/internal/a/an$e;->cqC:J
+    iput-wide p1, p0, Lrx/internal/a/an$e;->cpW:J
 
     if-eqz v2, :cond_1
 
@@ -294,7 +295,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->cqD:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->cpX:J
 
     add-long/2addr v0, p3
 
@@ -308,8 +309,6 @@
     return-void
 
     :cond_1
-    const/4 p1, 0x0
-
     add-long/2addr v0, p3
 
     cmp-long p1, v0, v3
@@ -319,7 +318,7 @@
     const-wide v0, 0x7fffffffffffffffL
 
     :cond_2
-    iput-wide v0, p0, Lrx/internal/a/an$e;->cqD:J
+    iput-wide v0, p0, Lrx/internal/a/an$e;->cpX:J
 
     return-void
 
@@ -330,7 +329,7 @@
 
     if-eqz v2, :cond_4
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->cqD:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->cpX:J
 
     invoke-interface {v2, v0, v1}, Lrx/Producer;->request(J)V
 
@@ -359,7 +358,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
     monitor-enter v0
 
@@ -373,9 +372,9 @@
     return v1
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/a/an$e;->cqy:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->cpS:Lrx/internal/util/g;
 
-    iget-object v2, v1, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iget-object v2, v1, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
     iget v3, v1, Lrx/internal/util/g;->mask:I
 
@@ -431,7 +430,7 @@
 
     if-lt p1, v2, :cond_8
 
-    iget-object p1, v1, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iget-object p1, v1, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
     array-length v2, p1
 
@@ -504,17 +503,17 @@
 
     iput p1, v1, Lrx/internal/util/g;->maxSize:I
 
-    iput-object v5, v1, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iput-object v5, v1, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
     :cond_8
     :goto_1
-    iget-wide v1, p0, Lrx/internal/a/an$e;->cqA:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->cpU:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v1, v3
 
-    iput-wide v1, p0, Lrx/internal/a/an$e;->cqA:J
+    iput-wide v1, p0, Lrx/internal/a/an$e;->cpU:J
 
     monitor-exit v0
 
@@ -528,6 +527,8 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     throw p1
+
+    return-void
 .end method
 
 .method final c(Lrx/internal/a/an$b;)V
@@ -560,7 +561,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqE:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpY:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -568,7 +569,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->cqE:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->cpY:Ljava/util/List;
 
     :cond_1
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
@@ -576,7 +577,7 @@
     goto :goto_0
 
     :cond_2
-    iput-boolean v1, p0, Lrx/internal/a/an$e;->cqF:Z
+    iput-boolean v1, p0, Lrx/internal/a/an$e;->cpZ:Z
 
     :goto_0
     iput-boolean v1, p0, Lrx/internal/a/an$e;->missed:Z
@@ -592,7 +593,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-wide v0, p0, Lrx/internal/a/an$e;->cqC:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->cpW:J
 
     const/4 v2, 0x0
 
@@ -611,7 +612,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/an$e;->Lq()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->Lp()[Lrx/internal/a/an$b;
 
     move-result-object p1
 
@@ -675,21 +676,21 @@
     :cond_8
     iput-boolean v2, p0, Lrx/internal/a/an$e;->missed:Z
 
-    iget-object p1, p0, Lrx/internal/a/an$e;->cqE:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/an$e;->cpY:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->cqE:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->cpY:Ljava/util/List;
 
-    iget-boolean v0, p0, Lrx/internal/a/an$e;->cqF:Z
+    iget-boolean v0, p0, Lrx/internal/a/an$e;->cpZ:Z
 
-    iput-boolean v2, p0, Lrx/internal/a/an$e;->cqF:Z
+    iput-boolean v2, p0, Lrx/internal/a/an$e;->cpZ: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;->cqC:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->cpW:J
 
     if-eqz p1, :cond_9
 
@@ -730,7 +731,7 @@
     :cond_a
     if-eqz v0, :cond_c
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->Lq()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->Lp()[Lrx/internal/a/an$b;
 
     move-result-object p1
 
@@ -784,6 +785,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw p1
+
+    return-void
 .end method
 
 .method final init()V
@@ -814,11 +817,11 @@
     iput-boolean v0, p0, Lrx/internal/a/an$e;->done:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqv:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpP:Lrx/internal/a/an$d;
 
     invoke-interface {v0}, Lrx/internal/a/an$d;->complete()V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->Lr()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->Lq()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -849,11 +852,11 @@
     iput-boolean v0, p0, Lrx/internal/a/an$e;->done:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqv:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpP:Lrx/internal/a/an$d;
 
     invoke-interface {v0, p1}, Lrx/internal/a/an$d;->H(Ljava/lang/Throwable;)V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->Lr()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->Lq()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -884,11 +887,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->cqv:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->cpP:Lrx/internal/a/an$d;
 
     invoke-interface {v0, p1}, Lrx/internal/a/an$d;->cj(Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->Lr()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->Lq()V
 
     :cond_0
     return-void
@@ -907,7 +910,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;->Lr()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->Lq()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 5e36ab9e50..642dd8a74a 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$f.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$f.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$f;
 .super Lrx/internal/a/an$a;
+.source "OperatorReplay.java"
 
 
 # annotations
@@ -44,7 +45,7 @@
 
 
 # virtual methods
-.method final Lp()V
+.method final Lo()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 2f550392e4..9b4c03fccc 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$g.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$g.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/an$g;
 .super Ljava/util/ArrayList;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/internal/a/an$d;
@@ -159,11 +160,11 @@
     :try_start_1
     invoke-static {v3, v10}, Lrx/internal/a/g;->a(Lrx/e;Ljava/lang/Object;)Z
 
-    move-result v11
+    move-result v10
     :try_end_1
     .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0
 
-    if-eqz v11, :cond_4
+    if-eqz v10, :cond_4
 
     return-void
 
@@ -275,6 +276,8 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     throw v0
+
+    return-void
 .end method
 
 .method public final cj(Ljava/lang/Object;)V
@@ -303,7 +306,7 @@
 .method public final complete()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/a/g;->KU()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->KT()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 c6e7927204..28d816add4 100644
--- a/com.discord/smali_classes2/rx/internal/a/an.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/an;
 .super Lrx/b/b;
+.source "OperatorReplay.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -31,11 +32,11 @@
 
 
 # static fields
-.field static final cqs:Lrx/functions/Func0;
+.field static final cpM:Lrx/functions/Func0;
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -44,7 +45,7 @@
     .end annotation
 .end field
 
-.field final cqj:Ljava/util/concurrent/atomic/AtomicReference;
+.field final cpD:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -54,7 +55,7 @@
     .end annotation
 .end field
 
-.field final cqr:Lrx/functions/Func0;
+.field final cpL:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -74,7 +75,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/an$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/an;->cqs:Lrx/functions/Func0;
+    sput-object v0, Lrx/internal/a/an;->cpM:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -100,11 +101,11 @@
 
     invoke-direct {p0, p1}, Lrx/b/b;-><init>(Lrx/Observable$a;)V
 
-    iput-object p2, p0, Lrx/internal/a/an;->cnJ:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/an;->cnd:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/an;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/an;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/internal/a/an;->cqr:Lrx/functions/Func0;
+    iput-object p4, p0, Lrx/internal/a/an;->cpL:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -159,7 +160,7 @@
     .end annotation
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -178,7 +179,7 @@
     :cond_1
     new-instance v1, Lrx/internal/a/an$e;
 
-    iget-object v2, p0, Lrx/internal/a/an;->cqr:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an;->cpL:Lrx/functions/Func0;
 
     invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
@@ -190,7 +191,7 @@
 
     invoke-virtual {v1}, Lrx/internal/a/an$e;->init()V
 
-    iget-object v2, p0, Lrx/internal/a/an;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -201,7 +202,7 @@
     move-object v0, v1
 
     :cond_2
-    iget-object v1, v0, Lrx/internal/a/an$e;->cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -213,7 +214,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lrx/internal/a/an$e;->cqp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->cpJ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
@@ -231,7 +232,7 @@
 
     if-eqz v2, :cond_4
 
-    iget-object p1, p0, Lrx/internal/a/an;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/an;->cnd:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
@@ -242,7 +243,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/an;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->cpD:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -275,7 +276,7 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/an;->cqj:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->cpD: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 8810673ebc..d66c596b16 100644
--- a/com.discord/smali_classes2/rx/internal/a/ao$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ao$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ao$a;
 .super Lrx/Subscriber;
+.source "OperatorSampleWithTime.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -28,7 +29,7 @@
 
 
 # static fields
-.field private static final cqH:Ljava/lang/Object;
+.field private static final cqb:Ljava/lang/Object;
 
 
 # instance fields
@@ -60,7 +61,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ao$a;->cqH:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ao$a;->cqb:Ljava/lang/Object;
 
     return-void
 .end method
@@ -79,7 +80,7 @@
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/ao$a;->cqH:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->cqb:Ljava/lang/Object;
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -90,18 +91,18 @@
     return-void
 .end method
 
-.method private Ls()V
+.method private Lr()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;->cqH:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->cqb: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;->cqH:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->cqb:Ljava/lang/Object;
 
     if-eq v0, v1, :cond_0
 
@@ -128,7 +129,7 @@
 .method public final call()V
     .locals 0
 
-    invoke-direct {p0}, Lrx/internal/a/ao$a;->Ls()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->Lr()V
 
     return-void
 .end method
@@ -136,7 +137,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    invoke-direct {p0}, Lrx/internal/a/ao$a;->Ls()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->Lr()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 1f0a11a94d..cb0aa797d6 100644
--- a/com.discord/smali_classes2/rx/internal/a/ao.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ao.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ao;
 .super Ljava/lang/Object;
+.source "OperatorSampleWithTime.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -60,7 +61,7 @@
 
     iget-object v1, p0, Lrx/internal/a/ao;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v1}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v1}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v2
 
@@ -72,14 +73,14 @@
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-wide v4, p0, Lrx/internal/a/ao;->time:J
-
     iget-wide v6, p0, Lrx/internal/a/ao;->time:J
 
     iget-object v8, p0, Lrx/internal/a/ao;->unit:Ljava/util/concurrent/TimeUnit;
 
     move-object v3, v1
 
+    move-wide v4, v6
+
     invoke-virtual/range {v2 .. v8}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
 
     return-object v1
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 272f02e059..4155048775 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ap$1;
 .super Ljava/lang/Object;
+.source "OperatorScan.java"
 
 # interfaces
 .implements Lrx/functions/Func0;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cns:Ljava/lang/Object;
+.field final synthetic cmM:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ap$1;->cns:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ap$1;->cmM:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ap$1;->cns:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ap$1;->cmM: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 1eaf7ace29..5885e0e152 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ap$2;
 .super Lrx/Subscriber;
+.source "OperatorScan.java"
 
 
 # annotations
@@ -21,11 +22,11 @@
 
 
 # instance fields
-.field cnQ:Z
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic com:Lrx/Subscriber;
+.field cnk:Z
 
-.field final synthetic cqL:Lrx/internal/a/ap;
+.field final synthetic cqf:Lrx/internal/a/ap;
 
 .field value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -40,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;->cqL:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$2;->cqf:Lrx/internal/a/ap;
 
-    iput-object p3, p0, Lrx/internal/a/ap$2;->com:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ap$2;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -54,7 +55,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -64,7 +65,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -79,13 +80,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/ap$2;->cnQ:Z
+    iget-boolean v0, p0, Lrx/internal/a/ap$2;->cnk:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ap$2;->cnQ:Z
+    iput-boolean v0, p0, Lrx/internal/a/ap$2;->cnk:Z
 
     goto :goto_0
 
@@ -93,22 +94,20 @@
     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;->cqL:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->cqf:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->cqJ:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->cqd:Lrx/functions/Func2;
 
     invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    move-object p1, v0
-
     :goto_0
     iput-object p1, p0, Lrx/internal/a/ap$2;->value:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/ap$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -117,7 +116,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/ap$2;->com:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->cnG: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 fd48903e8f..5d4fc60006 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ap$3;
 .super Lrx/Subscriber;
+.source "OperatorScan.java"
 
 
 # annotations
@@ -21,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic cns:Ljava/lang/Object;
+.field final synthetic cmM:Ljava/lang/Object;
 
-.field final synthetic cqL:Lrx/internal/a/ap;
+.field final synthetic cqf:Lrx/internal/a/ap;
 
-.field final synthetic cqM:Lrx/internal/a/ap$a;
+.field final synthetic cqg:Lrx/internal/a/ap$a;
 
 .field private value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -40,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;->cqL:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$3;->cqf:Lrx/internal/a/ap;
 
-    iput-object p2, p0, Lrx/internal/a/ap$3;->cns:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ap$3;->cmM:Ljava/lang/Object;
 
-    iput-object p3, p0, Lrx/internal/a/ap$3;->cqM:Lrx/internal/a/ap$a;
+    iput-object p3, p0, Lrx/internal/a/ap$3;->cqg:Lrx/internal/a/ap$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iget-object p1, p0, Lrx/internal/a/ap$3;->cns:Ljava/lang/Object;
+    iget-object p1, p0, Lrx/internal/a/ap$3;->cmM:Ljava/lang/Object;
 
     iput-object p1, p0, Lrx/internal/a/ap$3;->value:Ljava/lang/Object;
 
@@ -60,7 +61,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$3;->cqM:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->cqg:Lrx/internal/a/ap$a;
 
     invoke-virtual {v0}, Lrx/internal/a/ap$a;->onCompleted()V
 
@@ -70,7 +71,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$3;->cqM:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->cqg:Lrx/internal/a/ap$a;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ap$a;->onError(Ljava/lang/Throwable;)V
 
@@ -88,21 +89,21 @@
     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;->cqL:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$3;->cqf:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->cqJ:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->cqd:Lrx/functions/Func2;
 
     invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    iput-object v0, p0, Lrx/internal/a/ap$3;->value:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ap$3;->value:Ljava/lang/Object;
 
-    iget-object p1, p0, Lrx/internal/a/ap$3;->cqM:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->cqg:Lrx/internal/a/ap$a;
 
-    invoke-virtual {p1, v0}, Lrx/internal/a/ap$a;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Lrx/internal/a/ap$a;->onNext(Ljava/lang/Object;)V
 
     return-void
 
@@ -117,7 +118,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 7
 
-    iget-object v0, p0, Lrx/internal/a/ap$3;->cqM:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->cqg:Lrx/internal/a/ap$a;
 
     if-eqz p1, :cond_3
 
@@ -130,7 +131,7 @@
 
     if-nez v2, :cond_2
 
-    iget-wide v2, v0, Lrx/internal/a/ap$a;->cqN:J
+    iget-wide v2, v0, Lrx/internal/a/ap$a;->cqh:J
 
     const-wide v4, 0x7fffffffffffffffL
 
@@ -145,7 +146,7 @@
     :cond_0
     const-wide/16 v4, 0x0
 
-    iput-wide v4, v0, Lrx/internal/a/ap$a;->cqN:J
+    iput-wide v4, v0, Lrx/internal/a/ap$a;->cqh:J
 
     iput-object p1, v0, Lrx/internal/a/ap$a;->producer:Lrx/Producer;
 
@@ -160,7 +161,7 @@
     invoke-interface {p1, v2, v3}, Lrx/Producer;->request(J)V
 
     :cond_1
-    invoke-virtual {v0}, Lrx/internal/a/ap$a;->Lg()V
+    invoke-virtual {v0}, Lrx/internal/a/ap$a;->Lf()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 6714419d3b..81d77f4856 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ap$a;
 .super Ljava/lang/Object;
+.source "OperatorScan.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -39,7 +40,7 @@
     .end annotation
 .end field
 
-.field cqN:J
+.field cqh:J
 
 .field volatile done:Z
 
@@ -79,7 +80,7 @@
 
     iput-object p2, p0, Lrx/internal/a/ap$a;->child:Lrx/Subscriber;
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result p2
 
@@ -114,7 +115,7 @@
     return-void
 .end method
 
-.method private Lh()V
+.method private Lg()V
     .locals 13
 
     iget-object v0, p0, Lrx/internal/a/ap$a;->child:Lrx/Subscriber;
@@ -247,6 +248,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 .method private a(ZZLrx/Subscriber;)Z
@@ -295,7 +298,7 @@
 
 
 # virtual methods
-.method final Lg()V
+.method final Lf()V
     .locals 2
 
     monitor-enter p0
@@ -320,7 +323,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-direct {p0}, Lrx/internal/a/ap$a;->Lh()V
+    invoke-direct {p0}, Lrx/internal/a/ap$a;->Lg()V
 
     return-void
 
@@ -342,7 +345,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ap$a;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lf()V
 
     return-void
 .end method
@@ -356,7 +359,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/ap$a;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lf()V
 
     return-void
 .end method
@@ -377,7 +380,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lf()V
 
     return-void
 .end method
@@ -412,13 +415,13 @@
 
     if-nez v0, :cond_0
 
-    iget-wide v2, p0, Lrx/internal/a/ap$a;->cqN:J
+    iget-wide v2, p0, Lrx/internal/a/ap$a;->cqh:J
 
     invoke-static {v2, v3, p1, p2}, Lrx/internal/a/a;->h(JJ)J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lrx/internal/a/ap$a;->cqN:J
+    iput-wide v2, p0, Lrx/internal/a/ap$a;->cqh:J
 
     :cond_0
     monitor-exit v1
@@ -441,7 +444,7 @@
     invoke-interface {v0, p1, p2}, Lrx/Producer;->request(J)V
 
     :cond_2
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lg()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Lf()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 4c6b6eefce..d576383cd8 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ap;
 .super Ljava/lang/Object;
+.source "OperatorScan.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -27,11 +28,11 @@
 
 
 # static fields
-.field private static final cqK:Ljava/lang/Object;
+.field private static final cqe:Ljava/lang/Object;
 
 
 # instance fields
-.field private final cqI:Lrx/functions/Func0;
+.field private final cqc:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -40,7 +41,7 @@
     .end annotation
 .end field
 
-.field final cqJ:Lrx/functions/Func2;
+.field final cqd:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -58,7 +59,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ap;->cqK:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ap;->cqe:Ljava/lang/Object;
 
     return-void
 .end method
@@ -96,9 +97,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ap;->cqI:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/ap;->cqc:Lrx/functions/Func0;
 
-    iput-object p2, p0, Lrx/internal/a/ap;->cqJ:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/ap;->cqd:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -110,13 +111,13 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ap;->cqI:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/ap;->cqc:Lrx/functions/Func0;
 
     invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/a/ap;->cqK:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ap;->cqe: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 30132228a6..ad20ad4cd1 100644
--- a/com.discord/smali_classes2/rx/internal/a/aq$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aq$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/aq$a;
 .super Ljava/lang/Object;
+.source "OperatorSingle.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final cqP:Lrx/internal/a/aq;
+.field static final cqj:Lrx/internal/a/aq;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/aq<",
@@ -32,7 +33,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/aq;-><init>()V
 
-    sput-object v0, Lrx/internal/a/aq$a;->cqP:Lrx/internal/a/aq;
+    sput-object v0, Lrx/internal/a/aq$a;->cqj: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 c5bbec9264..5591bb3002 100644
--- a/com.discord/smali_classes2/rx/internal/a/aq$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aq$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/aq$b;
 .super Lrx/Subscriber;
+.source "OperatorSingle.java"
 
 
 # annotations
@@ -33,11 +34,11 @@
     .end annotation
 .end field
 
-.field private final cqO:Z
+.field private final cqi:Z
 
-.field private cqQ:Z
+.field private cqk:Z
 
-.field private cqR:Z
+.field private cql:Z
 
 .field private final defaultValue:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -71,7 +72,7 @@
 
     iput-object p1, p0, Lrx/internal/a/aq$b;->child:Lrx/Subscriber;
 
-    iput-boolean p2, p0, Lrx/internal/a/aq$b;->cqO:Z
+    iput-boolean p2, p0, Lrx/internal/a/aq$b;->cqi:Z
 
     iput-object p3, p0, Lrx/internal/a/aq$b;->defaultValue:Ljava/lang/Object;
 
@@ -85,13 +86,13 @@
 
 # virtual methods
 .method public final onCompleted()V
-    .locals 4
+    .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqR:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cql:Z
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqQ:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqk:Z
 
     if-eqz v0, :cond_0
 
@@ -99,19 +100,16 @@
 
     new-instance v1, Lrx/internal/b/c;
 
-    iget-object v2, p0, Lrx/internal/a/aq$b;->child:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/aq$b;->value:Ljava/lang/Object;
 
-    iget-object v3, p0, Lrx/internal/a/aq$b;->value:Ljava/lang/Object;
+    invoke-direct {v1, v0, v2}, Lrx/internal/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
 
-    invoke-direct {v1, v2, v3}, Lrx/internal/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    :goto_0
     invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqO:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqi:Z
 
     if-eqz v0, :cond_1
 
@@ -119,13 +117,13 @@
 
     new-instance v1, Lrx/internal/b/c;
 
-    iget-object v2, p0, Lrx/internal/a/aq$b;->child:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/aq$b;->defaultValue:Ljava/lang/Object;
 
-    iget-object v3, p0, Lrx/internal/a/aq$b;->defaultValue:Ljava/lang/Object;
+    invoke-direct {v1, v0, v2}, Lrx/internal/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
 
-    invoke-direct {v1, v2, v3}, Lrx/internal/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    goto :goto_0
+    return-void
 
     :cond_1
     iget-object v0, p0, Lrx/internal/a/aq$b;->child:Lrx/Subscriber;
@@ -145,7 +143,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqR:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cql:Z
 
     if-eqz v0, :cond_0
 
@@ -169,17 +167,17 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqR:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cql:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqQ:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->cqk:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/aq$b;->cqR:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->cql:Z
 
     iget-object p1, p0, Lrx/internal/a/aq$b;->child:Lrx/Subscriber;
 
@@ -198,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;->cqQ:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->cqk: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 aa5bfc6454..86faad854f 100644
--- a/com.discord/smali_classes2/rx/internal/a/aq.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aq.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/aq;
 .super Ljava/lang/Object;
+.source "OperatorSingle.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field private final cqO:Z
+.field private final cqi:Z
 
 .field private final defaultValue:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -60,7 +61,7 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lrx/internal/a/aq;->cqO:Z
+    iput-boolean p1, p0, Lrx/internal/a/aq;->cqi:Z
 
     const/4 p1, 0x0
 
@@ -69,7 +70,7 @@
     return-void
 .end method
 
-.method public static Lt()Lrx/internal/a/aq;
+.method public static Ls()Lrx/internal/a/aq;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -81,7 +82,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/aq$a;->cqP:Lrx/internal/a/aq;
+    sget-object v0, Lrx/internal/a/aq$a;->cqj:Lrx/internal/a/aq;
 
     return-object v0
 .end method
@@ -95,7 +96,7 @@
 
     new-instance v0, Lrx/internal/a/aq$b;
 
-    iget-boolean v1, p0, Lrx/internal/a/aq;->cqO:Z
+    iget-boolean v1, p0, Lrx/internal/a/aq;->cqi: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 66aa9714af..d249ca5128 100644
--- a/com.discord/smali_classes2/rx/internal/a/ar$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ar$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ar$1;
 .super Lrx/Subscriber;
+.source "OperatorSkip.java"
 
 
 # annotations
@@ -21,20 +22,20 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field cqT:I
+.field cqn:I
 
-.field final synthetic cqU:Lrx/internal/a/ar;
+.field final synthetic cqo: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;->cqU:Lrx/internal/a/ar;
+    iput-object p1, p0, Lrx/internal/a/ar$1;->cqo:Lrx/internal/a/ar;
 
-    iput-object p3, p0, Lrx/internal/a/ar$1;->com:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ar$1;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -46,7 +47,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -56,7 +57,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -71,26 +72,26 @@
         }
     .end annotation
 
-    iget v0, p0, Lrx/internal/a/ar$1;->cqT:I
+    iget v0, p0, Lrx/internal/a/ar$1;->cqn:I
 
-    iget-object v1, p0, Lrx/internal/a/ar$1;->cqU:Lrx/internal/a/ar;
+    iget-object v1, p0, Lrx/internal/a/ar$1;->cqo:Lrx/internal/a/ar;
 
-    iget v1, v1, Lrx/internal/a/ar;->cqS:I
+    iget v1, v1, Lrx/internal/a/ar;->cqm:I
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->cnG: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;->cqT:I
+    iget p1, p0, Lrx/internal/a/ar$1;->cqn:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar$1;->cqT:I
+    iput p1, p0, Lrx/internal/a/ar$1;->cqn:I
 
     return-void
 .end method
@@ -98,13 +99,13 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->cqU:Lrx/internal/a/ar;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->cqo:Lrx/internal/a/ar;
 
-    iget v0, v0, Lrx/internal/a/ar;->cqS:I
+    iget v0, v0, Lrx/internal/a/ar;->cqm: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 2f970bd389..dd29075cd0 100644
--- a/com.discord/smali_classes2/rx/internal/a/ar.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ar.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ar;
 .super Ljava/lang/Object;
+.source "OperatorSkip.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field final cqS:I
+.field final cqm:I
 
 
 # direct methods
@@ -30,7 +31,7 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar;->cqS:I
+    iput p1, p0, Lrx/internal/a/ar;->cqm: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 64e3d88eaa..d14b311929 100644
--- a/com.discord/smali_classes2/rx/internal/a/as$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/as$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/as$1;
 .super Lrx/Subscriber;
+.source "OperatorSkipWhile.java"
 
 
 # annotations
@@ -21,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field cqW:Z
+.field cqq:Z
 
-.field final synthetic cqX:Lrx/internal/a/as;
+.field final synthetic cqr:Lrx/internal/a/as;
 
 .field index:I
 
@@ -34,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;->cqX:Lrx/internal/a/as;
+    iput-object p1, p0, Lrx/internal/a/as$1;->cqr:Lrx/internal/a/as;
 
-    iput-object p3, p0, Lrx/internal/a/as$1;->com:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/as$1;->cnG: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;->cqW:Z
+    iput-boolean p1, p0, Lrx/internal/a/as$1;->cqq:Z
 
     return-void
 .end method
@@ -52,7 +53,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -62,7 +63,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -77,11 +78,11 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/as$1;->cqW:Z
+    iget-boolean v0, p0, Lrx/internal/a/as$1;->cqq:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -89,9 +90,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/as$1;->cqX:Lrx/internal/a/as;
+    iget-object v0, p0, Lrx/internal/a/as$1;->cqr:Lrx/internal/a/as;
 
-    iget-object v0, v0, Lrx/internal/a/as;->cqV:Lrx/functions/Func2;
+    iget-object v0, v0, Lrx/internal/a/as;->cqp:Lrx/functions/Func2;
 
     iget v1, p0, Lrx/internal/a/as$1;->index:I
 
@@ -119,9 +120,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lrx/internal/a/as$1;->cqW:Z
+    iput-boolean v0, p0, Lrx/internal/a/as$1;->cqq:Z
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -137,7 +138,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/as$1;->com:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/as$1;->cnG: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 f28362ed24..073e226316 100644
--- a/com.discord/smali_classes2/rx/internal/a/as$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/as$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/as$2;
 .super Ljava/lang/Object;
+.source "OperatorSkipWhile.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -28,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic cqY:Lrx/functions/b;
+.field final synthetic cqs:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/as$2;->cqY:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/as$2;->cqs:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,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;->cqY:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/as$2;->cqs: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 ccb398c2c3..914867657c 100644
--- a/com.discord/smali_classes2/rx/internal/a/as.smali
+++ b/com.discord/smali_classes2/rx/internal/a/as.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/as;
 .super Ljava/lang/Object;
+.source "OperatorSkipWhile.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field final cqV:Lrx/functions/Func2;
+.field final cqp:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -48,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/as;->cqV:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/as;->cqp: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 64c7f129e5..eaf4f1ac3c 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/at$a$1$1;
 .super Ljava/lang/Object;
+.source "OperatorSubscribeOn.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cre:J
+.field final synthetic cqx:J
 
-.field final synthetic crf:Lrx/internal/a/at$a$1;
+.field final synthetic cqy: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;->crf:Lrx/internal/a/at$a$1;
+    iput-object p1, p0, Lrx/internal/a/at$a$1$1;->cqy:Lrx/internal/a/at$a$1;
 
-    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->cre:J
+    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->cqx:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,11 +41,11 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/at$a$1$1;->crf:Lrx/internal/a/at$a$1;
+    iget-object v0, p0, Lrx/internal/a/at$a$1$1;->cqy:Lrx/internal/a/at$a$1;
 
-    iget-object v0, v0, Lrx/internal/a/at$a$1;->crb:Lrx/Producer;
+    iget-object v0, v0, Lrx/internal/a/at$a$1;->cqv:Lrx/Producer;
 
-    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->cre:J
+    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->cqx: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 86cd3e0bc7..cfcae72396 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/at$a$1;
 .super Ljava/lang/Object;
+.source "OperatorSubscribeOn.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic crb:Lrx/Producer;
+.field final synthetic cqv:Lrx/Producer;
 
-.field final synthetic crd:Lrx/internal/a/at$a;
+.field final synthetic cqw: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;->crd:Lrx/internal/a/at$a;
+    iput-object p1, p0, Lrx/internal/a/at$a$1;->cqw:Lrx/internal/a/at$a;
 
-    iput-object p2, p0, Lrx/internal/a/at$a$1;->crb:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/at$a$1;->cqv:Lrx/Producer;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,9 +41,9 @@
 .method public final request(J)V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->crd:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->cqw:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->cra:Ljava/lang/Thread;
+    iget-object v0, v0, Lrx/internal/a/at$a;->cqu:Ljava/lang/Thread;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -50,18 +51,18 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->crd:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->cqw:Lrx/internal/a/at$a;
 
-    iget-boolean v0, v0, Lrx/internal/a/at$a;->cqZ:Z
+    iget-boolean v0, v0, Lrx/internal/a/at$a;->cqt:Z
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->crd:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->cqw:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->coO:Lrx/Scheduler$Worker;
+    iget-object v0, v0, Lrx/internal/a/at$a;->coi:Lrx/Scheduler$Worker;
 
     new-instance v1, Lrx/internal/a/at$a$1$1;
 
@@ -73,7 +74,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->crb:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->cqv: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 1a58f57771..e265b7414b 100644
--- a/com.discord/smali_classes2/rx/internal/a/at$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/at$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/at$a;
 .super Lrx/Subscriber;
+.source "OperatorSubscribeOn.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -37,7 +38,7 @@
     .end annotation
 .end field
 
-.field cnJ:Lrx/Observable;
+.field cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -46,11 +47,11 @@
     .end annotation
 .end field
 
-.field final coO:Lrx/Scheduler$Worker;
+.field final coi:Lrx/Scheduler$Worker;
 
-.field final cqZ:Z
+.field final cqt:Z
 
-.field cra:Ljava/lang/Thread;
+.field cqu:Ljava/lang/Thread;
 
 
 # direct methods
@@ -71,11 +72,11 @@
 
     iput-object p1, p0, Lrx/internal/a/at$a;->actual:Lrx/Subscriber;
 
-    iput-boolean p2, p0, Lrx/internal/a/at$a;->cqZ:Z
+    iput-boolean p2, p0, Lrx/internal/a/at$a;->cqt:Z
 
-    iput-object p3, p0, Lrx/internal/a/at$a;->coO:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/a/at$a;->coi:Lrx/Scheduler$Worker;
 
-    iput-object p4, p0, Lrx/internal/a/at$a;->cnJ:Lrx/Observable;
+    iput-object p4, p0, Lrx/internal/a/at$a;->cnd:Lrx/Observable;
 
     return-void
 .end method
@@ -85,17 +86,17 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/at$a;->cnJ:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/at$a;->cnd:Lrx/Observable;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->cnJ:Lrx/Observable;
+    iput-object v1, p0, Lrx/internal/a/at$a;->cnd:Lrx/Observable;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v1
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->cra:Ljava/lang/Thread;
+    iput-object v1, p0, Lrx/internal/a/at$a;->cqu:Ljava/lang/Thread;
 
     invoke-virtual {v0, p0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
@@ -112,7 +113,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/internal/a/at$a;->coO:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->coi:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -121,7 +122,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/at$a;->coO:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/at$a;->coi:Lrx/Scheduler$Worker;
 
     invoke-virtual {v1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -138,7 +139,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lrx/internal/a/at$a;->coO:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/at$a;->coi:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -147,7 +148,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lrx/internal/a/at$a;->coO:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->coi: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 c301ed9da8..34cb7147af 100644
--- a/com.discord/smali_classes2/rx/internal/a/at.smali
+++ b/com.discord/smali_classes2/rx/internal/a/at.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/at;
 .super Ljava/lang/Object;
+.source "OperatorSubscribeOn.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -34,7 +35,7 @@
     .end annotation
 .end field
 
-.field final cqZ:Z
+.field final cqt:Z
 
 .field final scheduler:Lrx/Scheduler;
 
@@ -56,9 +57,9 @@
 
     iput-object p2, p0, Lrx/internal/a/at;->scheduler:Lrx/Scheduler;
 
-    iput-object p1, p0, Lrx/internal/a/at;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/at;->cnd:Lrx/Observable;
 
-    iput-boolean p3, p0, Lrx/internal/a/at;->cqZ:Z
+    iput-boolean p3, p0, Lrx/internal/a/at;->cqt:Z
 
     return-void
 .end method
@@ -72,15 +73,15 @@
 
     iget-object v0, p0, Lrx/internal/a/at;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
     new-instance v1, Lrx/internal/a/at$a;
 
-    iget-boolean v2, p0, Lrx/internal/a/at;->cqZ:Z
+    iget-boolean v2, p0, Lrx/internal/a/at;->cqt:Z
 
-    iget-object v3, p0, Lrx/internal/a/at;->cnJ:Lrx/Observable;
+    iget-object v3, p0, Lrx/internal/a/at;->cnd: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 ccc6cd42eb..4c641e0800 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/au$a;
 .super Ljava/lang/Object;
+.source "OperatorSwitch.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final crg:Lrx/internal/a/au;
+.field static final cqz:Lrx/internal/a/au;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/au<",
@@ -35,7 +36,7 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/au;-><init>(Z)V
 
-    sput-object v0, Lrx/internal/a/au$a;->crg:Lrx/internal/a/au;
+    sput-object v0, Lrx/internal/a/au$a;->cqz: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 a1e7e81597..6535006781 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/au$b;
 .super Lrx/Subscriber;
+.source "OperatorSwitch.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final crh:Lrx/internal/a/au$c;
+.field private final cqA:Lrx/internal/a/au$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/au$c<",
@@ -51,7 +52,7 @@
 
     iput-wide p1, p0, Lrx/internal/a/au$b;->id:J
 
-    iput-object p3, p0, Lrx/internal/a/au$b;->crh:Lrx/internal/a/au$c;
+    iput-object p3, p0, Lrx/internal/a/au$b;->cqA:Lrx/internal/a/au$c;
 
     return-void
 .end method
@@ -61,14 +62,14 @@
 .method public final onCompleted()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->crh:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->cqA: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;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -85,7 +86,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lrx/internal/a/au$c;->crj:Z
+    iput-boolean v1, v0, Lrx/internal/a/au$c;->cqC:Z
 
     const/4 v1, 0x0
 
@@ -113,14 +114,14 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->crh:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->cqA: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;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -136,7 +137,7 @@
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v0, Lrx/internal/a/au$c;->crj:Z
+    iput-boolean v2, v0, Lrx/internal/a/au$c;->cqC:Z
 
     const/4 v2, 0x0
 
@@ -182,12 +183,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->crh:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->cqA:Lrx/internal/a/au$c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, v0, Lrx/internal/a/au$c;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, v0, Lrx/internal/a/au$c;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -234,14 +235,14 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->crh:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->cqA: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;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->coj: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 7f71b652fe..61a450ed5d 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/au$c$1;
 .super Ljava/lang/Object;
+.source "OperatorSwitch.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic crl:Lrx/internal/a/au$c;
+.field final synthetic cqE: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;->crl:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$1;->cqE:Lrx/internal/a/au$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,7 +37,7 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/au$c$1;->crl:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$c$1;->cqE: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 f5675f8dcd..2ecb830a33 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/au$c$2;
 .super Ljava/lang/Object;
+.source "OperatorSwitch.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic crl:Lrx/internal/a/au$c;
+.field final synthetic cqE: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;->crl:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$2;->cqE:Lrx/internal/a/au$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +43,7 @@
 
     if-lez v2, :cond_1
 
-    iget-object v2, p0, Lrx/internal/a/au$c$2;->crl:Lrx/internal/a/au$c;
+    iget-object v2, p0, Lrx/internal/a/au$c$2;->cqE:Lrx/internal/a/au$c;
 
     monitor-enter v2
 
diff --git a/com.discord/smali_classes2/rx/internal/a/au$c.smali b/com.discord/smali_classes2/rx/internal/a/au$c.smali
index f95b4c9fdc..40cc0c8cf7 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/au$c;
 .super Lrx/Subscriber;
+.source "OperatorSwitch.java"
 
 
 # annotations
@@ -25,7 +26,7 @@
 
 
 # static fields
-.field static final crk:Ljava/lang/Throwable;
+.field static final cqD:Ljava/lang/Throwable;
 
 
 # instance fields
@@ -38,11 +39,11 @@
     .end annotation
 .end field
 
-.field final coP:Ljava/util/concurrent/atomic/AtomicLong;
+.field final coj:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field volatile cri:Z
+.field volatile cqB:Z
 
-.field crj:Z
+.field cqC:Z
 
 .field final delayError:Z
 
@@ -79,7 +80,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/a/au$c;->crk:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/a/au$c;->cqD:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -110,7 +111,7 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/au$c;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/au$c;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     new-instance p1, Lrx/internal/util/a/f;
 
@@ -202,7 +203,7 @@
 
     iget-object v0, p0, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/a/au$c;->crk:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->cqD:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -215,10 +216,9 @@
 
     if-nez v0, :cond_1
 
-    :goto_0
     iput-object p1, p0, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     instance-of v3, v0, Lrx/a/a;
@@ -239,6 +239,8 @@
 
     invoke-direct {p1, v3, v2}, Lrx/a/a;-><init>(Ljava/util/Collection;B)V
 
+    iput-object p1, p0, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
+
     goto :goto_0
 
     :cond_2
@@ -256,7 +258,7 @@
 
     iput-object v3, p0, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
-    :goto_1
+    :goto_0
     return v1
 .end method
 
@@ -283,7 +285,7 @@
     :cond_0
     iput-boolean v1, v8, Lrx/internal/a/au$c;->emitting:Z
 
-    iget-boolean v0, v8, Lrx/internal/a/au$c;->crj:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->cqC:Z
 
     iget-wide v1, v8, Lrx/internal/a/au$c;->requested:J
 
@@ -291,7 +293,7 @@
 
     if-eqz v3, :cond_1
 
-    sget-object v4, Lrx/internal/a/au$c;->crk:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->cqD:Ljava/lang/Throwable;
 
     if-eq v3, v4, :cond_1
 
@@ -299,7 +301,7 @@
 
     if-nez v4, :cond_1
 
-    sget-object v4, Lrx/internal/a/au$c;->crk:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->cqD:Ljava/lang/Throwable;
 
     iput-object v4, v8, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
@@ -310,11 +312,11 @@
 
     iget-object v9, v8, Lrx/internal/a/au$c;->queue:Lrx/internal/util/a/f;
 
-    iget-object v10, v8, Lrx/internal/a/au$c;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v10, v8, Lrx/internal/a/au$c;->coj: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;->cri:Z
+    iget-boolean v4, v8, Lrx/internal/a/au$c;->cqB:Z
 
     move-wide v12, v1
 
@@ -417,7 +419,7 @@
     return-void
 
     :cond_6
-    iget-boolean v2, v8, Lrx/internal/a/au$c;->cri:Z
+    iget-boolean v2, v8, Lrx/internal/a/au$c;->cqB:Z
 
     invoke-virtual {v9}, Lrx/internal/util/a/f;->isEmpty()Z
 
@@ -457,9 +459,14 @@
 
     iput-wide v0, v8, Lrx/internal/a/au$c;->requested:J
 
+    move-wide v12, v0
+
+    goto :goto_2
+
     :cond_8
     move-wide v12, v0
 
+    :goto_2
     iget-boolean v0, v8, Lrx/internal/a/au$c;->missed:Z
 
     const/4 v1, 0x0
@@ -475,15 +482,15 @@
     :cond_9
     iput-boolean v1, v8, Lrx/internal/a/au$c;->missed:Z
 
-    iget-boolean v15, v8, Lrx/internal/a/au$c;->cri:Z
+    iget-boolean v15, v8, Lrx/internal/a/au$c;->cqB:Z
 
-    iget-boolean v0, v8, Lrx/internal/a/au$c;->crj:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->cqC: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;->crk:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->cqD:Ljava/lang/Throwable;
 
     if-eq v14, v1, :cond_a
 
@@ -491,7 +498,7 @@
 
     if-nez v1, :cond_a
 
-    sget-object v1, Lrx/internal/a/au$c;->crk:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->cqD:Ljava/lang/Throwable;
 
     iput-object v1, v8, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
@@ -518,6 +525,8 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     throw v0
+
+    return-void
 .end method
 
 .method public final onCompleted()V
@@ -525,7 +534,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->cri:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->cqB:Z
 
     invoke-virtual {p0}, Lrx/internal/a/au$c;->drain()V
 
@@ -550,7 +559,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/au$c;->cri:Z
+    iput-boolean p1, p0, Lrx/internal/a/au$c;->cqB:Z
 
     invoke-virtual {p0}, Lrx/internal/a/au$c;->drain()V
 
@@ -577,7 +586,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/a/au$c;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/au$c;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
 
@@ -585,9 +594,9 @@
 
     iget-object v2, p0, Lrx/internal/a/au$c;->serial:Lrx/subscriptions/SerialSubscription;
 
-    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->cvP:Lrx/internal/d/a;
+    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->cvj:Lrx/internal/d/a;
 
-    invoke-virtual {v2}, Lrx/internal/d/a;->LC()Lrx/Subscription;
+    invoke-virtual {v2}, Lrx/internal/d/a;->LB()Lrx/Subscription;
 
     move-result-object v2
 
@@ -605,7 +614,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->crj:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->cqC: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 ceb083426d..86265f4f41 100644
--- a/com.discord/smali_classes2/rx/internal/a/au.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/au;
 .super Ljava/lang/Object;
+.source "OperatorSwitch.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -45,7 +46,7 @@
     return-void
 .end method
 
-.method public static Lu()Lrx/internal/a/au;
+.method public static Lt()Lrx/internal/a/au;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -57,7 +58,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/au$a;->crg:Lrx/internal/a/au;
+    sget-object v0, Lrx/internal/a/au$a;->cqz: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 ae4c3d279f..db4a93cbd5 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/av$1$1;
 .super Ljava/lang/Object;
+.source "OperatorTake.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic crn:Lrx/Producer;
+.field final synthetic cqG:Lrx/Producer;
 
-.field final synthetic cro:Lrx/internal/a/av$1;
+.field final synthetic cqH:Lrx/internal/a/av$1;
 
 .field final requested:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -28,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;->cro:Lrx/internal/a/av$1;
+    iput-object p1, p0, Lrx/internal/a/av$1$1;->cqH:Lrx/internal/a/av$1;
 
-    iput-object p2, p0, Lrx/internal/a/av$1$1;->crn:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/av$1$1;->cqG:Lrx/Producer;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,9 +57,9 @@
 
     if-lez v2, :cond_1
 
-    iget-object v2, p0, Lrx/internal/a/av$1$1;->cro:Lrx/internal/a/av$1;
+    iget-object v2, p0, Lrx/internal/a/av$1$1;->cqH:Lrx/internal/a/av$1;
 
-    iget-boolean v2, v2, Lrx/internal/a/av$1;->cdE:Z
+    iget-boolean v2, v2, Lrx/internal/a/av$1;->ccY:Z
 
     if-nez v2, :cond_1
 
@@ -69,9 +70,9 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/a/av$1$1;->cro:Lrx/internal/a/av$1;
+    iget-object v4, p0, Lrx/internal/a/av$1$1;->cqH:Lrx/internal/a/av$1;
 
-    iget-object v4, v4, Lrx/internal/a/av$1;->crm:Lrx/internal/a/av;
+    iget-object v4, v4, Lrx/internal/a/av$1;->cqF:Lrx/internal/a/av;
 
     iget v4, v4, Lrx/internal/a/av;->limit:I
 
@@ -97,10 +98,12 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lrx/internal/a/av$1$1;->crn:Lrx/Producer;
+    iget-object p1, p0, Lrx/internal/a/av$1$1;->cqG:Lrx/Producer;
 
     invoke-interface {p1, v4, v5}, Lrx/Producer;->request(J)V
 
+    return-void
+
     :cond_1
     return-void
 .end method
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 d304a8aa67..38ca15bfaa 100644
--- a/com.discord/smali_classes2/rx/internal/a/av$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/av$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/av$1;
 .super Lrx/Subscriber;
+.source "OperatorTake.java"
 
 
 # annotations
@@ -21,22 +22,22 @@
 
 
 # instance fields
-.field cdE:Z
+.field ccY:Z
 
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
 .field count:I
 
-.field final synthetic crm:Lrx/internal/a/av;
+.field final synthetic cqF:Lrx/internal/a/av;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/av;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/av$1;->crm:Lrx/internal/a/av;
+    iput-object p1, p0, Lrx/internal/a/av$1;->cqF:Lrx/internal/a/av;
 
-    iput-object p2, p0, Lrx/internal/a/av$1;->com:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/av$1;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -48,15 +49,15 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/a/av$1;->cdE:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->ccY:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->cdE:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->ccY:Z
 
-    iget-object v0, p0, Lrx/internal/a/av$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -67,16 +68,16 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/a/av$1;->cdE:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->ccY:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->cdE:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->ccY:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/av$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
     :try_end_0
@@ -117,7 +118,7 @@
 
     iput v1, p0, Lrx/internal/a/av$1;->count:I
 
-    iget-object v1, p0, Lrx/internal/a/av$1;->crm:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->cqF:Lrx/internal/a/av;
 
     iget v1, v1, Lrx/internal/a/av;->limit:I
 
@@ -125,7 +126,7 @@
 
     iget v0, p0, Lrx/internal/a/av$1;->count:I
 
-    iget-object v1, p0, Lrx/internal/a/av$1;->crm:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->cqF:Lrx/internal/a/av;
 
     iget v1, v1, Lrx/internal/a/av;->limit:I
 
@@ -141,20 +142,20 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lrx/internal/a/av$1;->com:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/av$1;->cnG: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;->cdE:Z
+    iget-boolean p1, p0, Lrx/internal/a/av$1;->ccY:Z
 
     if-nez p1, :cond_1
 
-    iput-boolean v2, p0, Lrx/internal/a/av$1;->cdE:Z
+    iput-boolean v2, p0, Lrx/internal/a/av$1;->ccY:Z
 
     :try_start_0
-    iget-object p1, p0, Lrx/internal/a/av$1;->com:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/av$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
     :try_end_0
@@ -178,7 +179,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/av$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->cnG:Lrx/Subscriber;
 
     new-instance v1, Lrx/internal/a/av$1$1;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/av.smali b/com.discord/smali_classes2/rx/internal/a/av.smali
index cd1b2b84fd..34f5009170 100644
--- a/com.discord/smali_classes2/rx/internal/a/av.smali
+++ b/com.discord/smali_classes2/rx/internal/a/av.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/av;
 .super Ljava/lang/Object;
+.source "OperatorTake.java"
 
 # interfaces
 .implements Lrx/Observable$b;
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 013b5695a0..014258a834 100644
--- a/com.discord/smali_classes2/rx/internal/a/aw$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aw$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/aw$1;
 .super Lrx/Subscriber;
+.source "OperatorTakeUntil.java"
 
 
 # annotations
@@ -21,18 +22,18 @@
 
 
 # instance fields
-.field final synthetic crq:Lrx/Subscriber;
+.field final synthetic cqJ:Lrx/Subscriber;
 
-.field final synthetic crr:Lrx/internal/a/aw;
+.field final synthetic cqK: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;->crr:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$1;->cqK:Lrx/internal/a/aw;
 
-    iput-object p3, p0, Lrx/internal/a/aw$1;->crq:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aw$1;->cqJ:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -47,13 +48,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/aw$1;->crq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->cqJ: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;->crq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->cqJ:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -62,7 +63,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/aw$1;->crq:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/aw$1;->cqJ:Lrx/Subscriber;
 
     invoke-virtual {v1}, Lrx/Subscriber;->unsubscribe()V
 
@@ -73,13 +74,13 @@
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/aw$1;->crq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->cqJ: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;->crq:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/aw$1;->cqJ:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
 
@@ -88,7 +89,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lrx/internal/a/aw$1;->crq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->cqJ:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -103,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/aw$1;->crq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->cqJ: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 bea2b6462e..9d0c3e482b 100644
--- a/com.discord/smali_classes2/rx/internal/a/aw$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aw$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/aw$2;
 .super Lrx/Subscriber;
+.source "OperatorTakeUntil.java"
 
 
 # annotations
@@ -21,18 +22,18 @@
 
 
 # instance fields
-.field final synthetic crr:Lrx/internal/a/aw;
+.field final synthetic cqK:Lrx/internal/a/aw;
 
-.field final synthetic crs:Lrx/Subscriber;
+.field final synthetic cqL: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;->crr:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$2;->cqK:Lrx/internal/a/aw;
 
-    iput-object p2, p0, Lrx/internal/a/aw$2;->crs:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/aw$2;->cqL:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -44,7 +45,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aw$2;->crs:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->cqL:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -54,7 +55,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aw$2;->crs:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->cqL: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 e7f0b10ad9..2c20b8a43b 100644
--- a/com.discord/smali_classes2/rx/internal/a/aw.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aw.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/aw;
 .super Ljava/lang/Object;
+.source "OperatorTakeUntil.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -21,7 +22,7 @@
 
 
 # instance fields
-.field private final crp:Lrx/Observable;
+.field private final cqI:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -44,7 +45,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/aw;->crp:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/aw;->cqI:Lrx/Observable;
 
     return-void
 .end method
@@ -76,7 +77,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/aw;->crp:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/aw;->cqI: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 f77666ba6c..3d8576d548 100644
--- a/com.discord/smali_classes2/rx/internal/a/ax$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ax$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ax$1;
 .super Ljava/lang/Object;
+.source "OperatorTakeUntilPredicate.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cru:Lrx/internal/a/ax$a;
+.field final synthetic cqN:Lrx/internal/a/ax$a;
 
-.field final synthetic crv:Lrx/internal/a/ax;
+.field final synthetic cqO: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;->crv:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$1;->cqO:Lrx/internal/a/ax;
 
-    iput-object p2, p0, Lrx/internal/a/ax$1;->cru:Lrx/internal/a/ax$a;
+    iput-object p2, p0, Lrx/internal/a/ax$1;->cqN:Lrx/internal/a/ax$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final request(J)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ax$1;->cru:Lrx/internal/a/ax$a;
+    iget-object v0, p0, Lrx/internal/a/ax$1;->cqN:Lrx/internal/a/ax$a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/a/ax$a;->bm(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 d563a0bf59..b3f6601d04 100644
--- a/com.discord/smali_classes2/rx/internal/a/ax$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ax$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ax$a;
 .super Lrx/Subscriber;
+.source "OperatorTakeUntilPredicate.java"
 
 
 # annotations
@@ -30,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic crv:Lrx/internal/a/ax;
+.field final synthetic cqO:Lrx/internal/a/ax;
 
 .field private done:Z
 
@@ -46,7 +47,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/ax$a;->crv:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$a;->cqO:Lrx/internal/a/ax;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -110,9 +111,9 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ax$a;->crv:Lrx/internal/a/ax;
+    iget-object v1, p0, Lrx/internal/a/ax$a;->cqO:Lrx/internal/a/ax;
 
-    iget-object v1, v1, Lrx/internal/a/ax;->crt:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/ax;->cqM:Lrx/functions/b;
 
     invoke-interface {v1, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -122,11 +123,11 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v1
+    move-result p1
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    if-eqz v1, :cond_0
+    if-eqz p1, :cond_0
 
     iput-boolean v0, p0, Lrx/internal/a/ax$a;->done:Z
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ax.smali b/com.discord/smali_classes2/rx/internal/a/ax.smali
index bf424ba4d3..3252182d29 100644
--- a/com.discord/smali_classes2/rx/internal/a/ax.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ax.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ax;
 .super Ljava/lang/Object;
+.source "OperatorTakeUntilPredicate.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field final crt:Lrx/functions/b;
+.field final cqM:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -52,7 +53,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ax;->crt:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ax;->cqM: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 728ad1ebf0..a657d45d28 100644
--- a/com.discord/smali_classes2/rx/internal/a/ay$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ay$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ay$1;
 .super Ljava/lang/Object;
+.source "OperatorTakeWhile.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -28,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic crw:Lrx/functions/b;
+.field final synthetic cqP:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ay$1;->crw:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ay$1;->cqP:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,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;->crw:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/ay$1;->cqP: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 2837d8f38b..ae7bc87bd2 100644
--- a/com.discord/smali_classes2/rx/internal/a/ay$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ay$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ay$2;
 .super Lrx/Subscriber;
+.source "OperatorTakeWhile.java"
 
 
 # annotations
@@ -23,9 +24,9 @@
 # instance fields
 .field private bRf:I
 
-.field final synthetic coC:Lrx/Subscriber;
+.field final synthetic cnW:Lrx/Subscriber;
 
-.field final synthetic crx:Lrx/internal/a/ay;
+.field final synthetic cqQ:Lrx/internal/a/ay;
 
 .field private done:Z
 
@@ -34,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;->crx:Lrx/internal/a/ay;
+    iput-object p1, p0, Lrx/internal/a/ay$2;->cqQ:Lrx/internal/a/ay;
 
-    iput-object p3, p0, Lrx/internal/a/ay$2;->coC:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ay$2;->cnW:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -54,7 +55,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -69,7 +70,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -88,9 +89,9 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ay$2;->crx:Lrx/internal/a/ay;
+    iget-object v1, p0, Lrx/internal/a/ay$2;->cqQ:Lrx/internal/a/ay;
 
-    iget-object v1, v1, Lrx/internal/a/ay;->cqV:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ay;->cqp:Lrx/functions/Func2;
 
     iget v2, p0, Lrx/internal/a/ay$2;->bRf:I
 
@@ -116,7 +117,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -125,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;->coC:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/ay$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
 
@@ -138,7 +139,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ay$2;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->cnW: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 d6b788c361..acc3f00b98 100644
--- a/com.discord/smali_classes2/rx/internal/a/ay.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ay.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ay;
 .super Ljava/lang/Object;
+.source "OperatorTakeWhile.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field final cqV:Lrx/functions/Func2;
+.field final cqp:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -48,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ay;->cqV:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ay;->cqp: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 edc9cc4823..accab162df 100644
--- a/com.discord/smali_classes2/rx/internal/a/az$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/az$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/az$1;
 .super Lrx/Subscriber;
+.source "OperatorThrottleFirst.java"
 
 
 # annotations
@@ -21,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic coC:Lrx/Subscriber;
+.field final synthetic cnW:Lrx/Subscriber;
 
-.field final synthetic cry:Lrx/internal/a/az;
+.field final synthetic cqR:Lrx/internal/a/az;
 
 .field private lastOnNext:J
 
@@ -32,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;->cry:Lrx/internal/a/az;
+    iput-object p1, p0, Lrx/internal/a/az$1;->cqR:Lrx/internal/a/az;
 
-    iput-object p3, p0, Lrx/internal/a/az$1;->coC:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/az$1;->cnW:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -50,7 +51,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/az$1;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -60,7 +61,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/az$1;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -87,17 +88,13 @@
 
     if-eqz v6, :cond_0
 
-    iget-wide v2, p0, Lrx/internal/a/az$1;->lastOnNext:J
-
     cmp-long v4, v0, v2
 
     if-ltz v4, :cond_0
 
-    iget-wide v2, p0, Lrx/internal/a/az$1;->lastOnNext:J
-
     sub-long v2, v0, v2
 
-    iget-object v4, p0, Lrx/internal/a/az$1;->cry:Lrx/internal/a/az;
+    iget-object v4, p0, Lrx/internal/a/az$1;->cqR:Lrx/internal/a/az;
 
     iget-wide v4, v4, Lrx/internal/a/az;->timeInMilliseconds:J
 
@@ -108,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;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/az.smali b/com.discord/smali_classes2/rx/internal/a/az.smali
index 2dd75e86e8..95ec938c6b 100644
--- a/com.discord/smali_classes2/rx/internal/a/az.smali
+++ b/com.discord/smali_classes2/rx/internal/a/az.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/az;
 .super Ljava/lang/Object;
+.source "OperatorThrottleFirst.java"
 
 # interfaces
 .implements Lrx/Observable$b;
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 dd5c06ba92..6da72376bb 100644
--- a/com.discord/smali_classes2/rx/internal/a/b$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/b$1.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/b$1;
 .super Ljava/lang/Object;
+.source "BlockingOperatorMostRecent.java"
 
 # interfaces
 .implements Ljava/lang/Iterable;
@@ -25,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic cns:Ljava/lang/Object;
+.field final synthetic cmM:Ljava/lang/Object;
 
-.field final synthetic cnt:Lrx/Observable;
+.field final synthetic cmN: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;->cns:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/b$1;->cmM:Ljava/lang/Object;
 
-    iput-object p2, p0, Lrx/internal/a/b$1;->cnt:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/b$1;->cmN:Lrx/Observable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,11 +58,11 @@
 
     new-instance v0, Lrx/internal/a/b$a;
 
-    iget-object v1, p0, Lrx/internal/a/b$1;->cns:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$1;->cmM: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;->cnt:Lrx/Observable;
+    iget-object v1, p0, Lrx/internal/a/b$1;->cmN: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 0fe10ba6b9..46a6f808e5 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/b$a$1;
 .super Ljava/lang/Object;
+.source "BlockingOperatorMostRecent.java"
 
 # interfaces
 .implements Ljava/util/Iterator;
@@ -25,16 +26,16 @@
 
 
 # instance fields
-.field private cnu:Ljava/lang/Object;
+.field private cmO:Ljava/lang/Object;
 
-.field final synthetic cnv:Lrx/internal/a/b$a;
+.field final synthetic cmP: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;->cnv:Lrx/internal/a/b$a;
+    iput-object p1, p0, Lrx/internal/a/b$a$1;->cmP:Lrx/internal/a/b$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,13 +47,13 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/b$a$1;->cnv:Lrx/internal/a/b$a;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->cmP: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;->cnu:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/b$a$1;->cnu:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     invoke-static {v0}, Lrx/internal/a/g;->cc(Ljava/lang/Object;)Z
 
@@ -81,18 +82,18 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->cnu:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->cnv:Lrx/internal/a/b$a;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->cmP: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;->cnu:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->cnu:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->cc(Ljava/lang/Object;)Z
 
@@ -100,7 +101,7 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->cnu:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->cd(Ljava/lang/Object;)Z
 
@@ -108,7 +109,7 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->cnu:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->cf(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -116,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;->cnu:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     return-object v1
 
     :cond_1
     :try_start_1
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->cnu:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->cmO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->cg(Ljava/lang/Object;)Ljava/lang/Throwable;
 
@@ -146,7 +147,7 @@
     :catchall_0
     move-exception v1
 
-    iput-object v0, p0, Lrx/internal/a/b$a$1;->cnu:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->cmO: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 3bbad9c74b..81608bd1f3 100644
--- a/com.discord/smali_classes2/rx/internal/a/b$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/b$a;
 .super Lrx/Subscriber;
+.source "BlockingOperatorMostRecent.java"
 
 
 # annotations
@@ -52,7 +53,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/a/g;->KU()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->KT()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/b.smali b/com.discord/smali_classes2/rx/internal/a/b.smali
index cfc886fe6d..0102203103 100644
--- a/com.discord/smali_classes2/rx/internal/a/b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/b;
 .super Ljava/lang/Object;
+.source "BlockingOperatorMostRecent.java"
 
 
 # annotations
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 f637392994..6ad5e5b659 100644
--- a/com.discord/smali_classes2/rx/internal/a/ba$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ba$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ba$1;
 .super Lrx/Subscriber;
+.source "OperatorToObservableList.java"
 
 
 # annotations
@@ -21,13 +22,13 @@
 
 
 # instance fields
-.field cdE:Z
+.field ccY:Z
 
-.field final synthetic cpd:Lrx/internal/b/b;
+.field final synthetic cox:Lrx/internal/b/b;
 
-.field final synthetic crA:Lrx/internal/a/ba;
+.field final synthetic cqS:Lrx/Subscriber;
 
-.field final synthetic crz:Lrx/Subscriber;
+.field final synthetic cqT:Lrx/internal/a/ba;
 
 .field list:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -43,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;->crA:Lrx/internal/a/ba;
+    iput-object p1, p0, Lrx/internal/a/ba$1;->cqT:Lrx/internal/a/ba;
 
-    iput-object p2, p0, Lrx/internal/a/ba$1;->cpd:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/ba$1;->cox:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/ba$1;->crz:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ba$1;->cqS:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -65,13 +66,13 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/internal/a/ba$1;->cdE:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->ccY:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ba$1;->cdE:Z
+    iput-boolean v0, p0, Lrx/internal/a/ba$1;->ccY:Z
 
     :try_start_0
     new-instance v0, Ljava/util/ArrayList;
@@ -86,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;->cpd:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/ba$1;->cox:Lrx/internal/b/b;
 
     invoke-virtual {v1, v0}, Lrx/internal/b/b;->setValue(Ljava/lang/Object;)V
 
@@ -97,6 +98,8 @@
 
     invoke-static {v0, p0}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
+    return-void
+
     :cond_0
     :goto_0
     return-void
@@ -105,7 +108,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ba$1;->crz:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ba$1;->cqS:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -120,7 +123,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/ba$1;->cdE:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->ccY: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 14f71ae9ae..be3a523a40 100644
--- a/com.discord/smali_classes2/rx/internal/a/ba$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ba$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/ba$a;
 .super Ljava/lang/Object;
+.source "OperatorToObservableList.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # static fields
-.field static final crB:Lrx/internal/a/ba;
+.field static final cqU:Lrx/internal/a/ba;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ba<",
@@ -33,7 +34,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/ba;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ba$a;->crB:Lrx/internal/a/ba;
+    sput-object v0, Lrx/internal/a/ba$a;->cqU: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 21b662d683..798c8292dd 100644
--- a/com.discord/smali_classes2/rx/internal/a/ba.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ba.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/ba;
 .super Ljava/lang/Object;
+.source "OperatorToObservableList.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -34,7 +35,7 @@
     return-void
 .end method
 
-.method public static Lv()Lrx/internal/a/ba;
+.method public static Lu()Lrx/internal/a/ba;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -46,7 +47,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ba$a;->crB:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->cqU: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 4bc6521078..7a4db9b165 100644
--- a/com.discord/smali_classes2/rx/internal/a/bb$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bb$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bb$1;
 .super Ljava/lang/Object;
+.source "OperatorToObservableSortedList.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
@@ -25,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic crF:Lrx/functions/Func2;
+.field final synthetic cqY:Lrx/functions/Func2;
 
-.field final synthetic crG:Lrx/internal/a/bb;
+.field final synthetic cqZ: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;->crG:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$1;->cqZ:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$1;->crF:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/bb$1;->cqY:Lrx/functions/Func2;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/bb$1;->crF:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/internal/a/bb$1;->cqY: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 83174b9c58..766fa107ef 100644
--- a/com.discord/smali_classes2/rx/internal/a/bb$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bb$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bb$2;
 .super Lrx/Subscriber;
+.source "OperatorToObservableSortedList.java"
 
 
 # annotations
@@ -21,13 +22,13 @@
 
 
 # instance fields
-.field cdE:Z
+.field ccY:Z
 
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic cpd:Lrx/internal/b/b;
+.field final synthetic cox:Lrx/internal/b/b;
 
-.field final synthetic crG:Lrx/internal/a/bb;
+.field final synthetic cqZ:Lrx/internal/a/bb;
 
 .field list:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -43,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;->crG:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$2;->cqZ:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$2;->cpd:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/bb$2;->cox:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/bb$2;->com:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/bb$2;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
     new-instance p1, Ljava/util/ArrayList;
 
-    iget-object p2, p0, Lrx/internal/a/bb$2;->crG:Lrx/internal/a/bb;
+    iget-object p2, p0, Lrx/internal/a/bb$2;->cqZ:Lrx/internal/a/bb;
 
-    iget p2, p2, Lrx/internal/a/bb;->crD:I
+    iget p2, p2, Lrx/internal/a/bb;->cqW:I
 
     invoke-direct {p1, p2}, Ljava/util/ArrayList;-><init>(I)V
 
@@ -69,13 +70,13 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/internal/a/bb$2;->cdE:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->ccY:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/bb$2;->cdE:Z
+    iput-boolean v0, p0, Lrx/internal/a/bb$2;->ccY:Z
 
     iget-object v0, p0, Lrx/internal/a/bb$2;->list:Ljava/util/List;
 
@@ -84,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;->crG:Lrx/internal/a/bb;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->cqZ:Lrx/internal/a/bb;
 
-    iget-object v1, v1, Lrx/internal/a/bb;->crC:Ljava/util/Comparator;
+    iget-object v1, v1, Lrx/internal/a/bb;->cqV:Ljava/util/Comparator;
 
     invoke-static {v0, v1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v1, p0, Lrx/internal/a/bb$2;->cpd:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->cox:Lrx/internal/b/b;
 
     invoke-virtual {v1, v0}, Lrx/internal/b/b;->setValue(Ljava/lang/Object;)V
 
@@ -103,6 +104,8 @@
 
     invoke-static {v0, p0}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
+    return-void
+
     :cond_0
     :goto_0
     return-void
@@ -111,7 +114,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/bb$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/bb$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -126,7 +129,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/bb$2;->cdE:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->ccY:Z
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bb$a.smali b/com.discord/smali_classes2/rx/internal/a/bb$a.smali
index 82ca31561b..a2d17aa88e 100644
--- a/com.discord/smali_classes2/rx/internal/a/bb$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bb$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bb$a;
 .super Ljava/lang/Object;
+.source "OperatorToObservableSortedList.java"
 
 # interfaces
 .implements Ljava/util/Comparator;
diff --git a/com.discord/smali_classes2/rx/internal/a/bb.smali b/com.discord/smali_classes2/rx/internal/a/bb.smali
index 499584cb98..d78e1175e2 100644
--- a/com.discord/smali_classes2/rx/internal/a/bb.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bb.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/bb;
 .super Ljava/lang/Object;
+.source "OperatorToObservableSortedList.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -26,11 +27,11 @@
 
 
 # static fields
-.field private static final crE:Ljava/util/Comparator;
+.field private static final cqX:Ljava/util/Comparator;
 
 
 # instance fields
-.field final crC:Ljava/util/Comparator;
+.field final cqV:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -39,7 +40,7 @@
     .end annotation
 .end field
 
-.field final crD:I
+.field final cqW:I
 
 
 # direct methods
@@ -50,7 +51,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/bb$a;-><init>()V
 
-    sput-object v0, Lrx/internal/a/bb;->crE:Ljava/util/Comparator;
+    sput-object v0, Lrx/internal/a/bb;->cqX:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -60,13 +61,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lrx/internal/a/bb;->crE:Ljava/util/Comparator;
+    sget-object v0, Lrx/internal/a/bb;->cqX:Ljava/util/Comparator;
 
-    iput-object v0, p0, Lrx/internal/a/bb;->crC:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->cqV:Ljava/util/Comparator;
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->crD:I
+    iput v0, p0, Lrx/internal/a/bb;->cqW:I
 
     return-void
 .end method
@@ -87,13 +88,13 @@
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->crD:I
+    iput v0, p0, Lrx/internal/a/bb;->cqW: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;->crC:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->cqV: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 ffe3c3ffab..73a4e9c403 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bc$a$a;
 .super Lrx/Subscriber;
+.source "OperatorZip.java"
 
 
 # annotations
@@ -14,24 +15,24 @@
 
 
 # instance fields
-.field final crI:Lrx/internal/util/i;
+.field final crb:Lrx/internal/util/i;
 
-.field final synthetic crJ:Lrx/internal/a/bc$a;
+.field final synthetic crd: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;->crJ:Lrx/internal/a/bc$a;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->crd:Lrx/internal/a/bc$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    invoke-static {}, Lrx/internal/util/i;->LH()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->LG()Lrx/internal/util/i;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/bc$a$a;->crI:Lrx/internal/util/i;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->crb:Lrx/internal/util/i;
 
     return-void
 .end method
@@ -49,20 +50,20 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crI:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crb:Lrx/internal/util/i;
 
-    iget-object v1, v0, Lrx/internal/util/i;->ctI:Ljava/lang/Object;
+    iget-object v1, v0, Lrx/internal/util/i;->ctc:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->KU()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->KT()Ljava/lang/Object;
 
     move-result-object v1
 
-    iput-object v1, v0, Lrx/internal/util/i;->ctI:Ljava/lang/Object;
+    iput-object v1, v0, Lrx/internal/util/i;->ctc:Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crJ:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crd:Lrx/internal/a/bc$a;
 
     invoke-virtual {v0}, Lrx/internal/a/bc$a;->tick()V
 
@@ -72,7 +73,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crJ:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crd:Lrx/internal/a/bc$a;
 
     iget-object v0, v0, Lrx/internal/a/bc$a;->child:Lrx/e;
 
@@ -85,7 +86,7 @@
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crI:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->crb:Lrx/internal/util/i;
 
     invoke-virtual {v0, p1}, Lrx/internal/util/i;->onNext(Ljava/lang/Object;)V
     :try_end_0
@@ -99,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;->crJ:Lrx/internal/a/bc$a;
+    iget-object p1, p0, Lrx/internal/a/bc$a$a;->crd:Lrx/internal/a/bc$a;
 
     invoke-virtual {p1}, Lrx/internal/a/bc$a;->tick()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bc$a.smali b/com.discord/smali_classes2/rx/internal/a/bc$a.smali
index 3d396059a6..e228a35de1 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bc$a;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorZip.java"
 
 
 # annotations
@@ -29,7 +30,7 @@
 
 
 # static fields
-.field static final crH:I
+.field static final cra:I
 
 .field private static final serialVersionUID:J = 0x53337eae55d8937dL
 
@@ -78,7 +79,7 @@
 
     double-to-int v0, v0
 
-    sput v0, Lrx/internal/a/bc$a;->crH:I
+    sput v0, Lrx/internal/a/bc$a;->cra:I
 
     return-void
 .end method
@@ -161,7 +162,7 @@
 
     check-cast v11, Lrx/internal/a/bc$a$a;
 
-    iget-object v11, v11, Lrx/internal/a/bc$a$a;->crI:Lrx/internal/util/i;
+    iget-object v11, v11, Lrx/internal/a/bc$a$a;->crb:Lrx/internal/util/i;
 
     invoke-virtual {v11}, Lrx/internal/util/i;->peek()Ljava/lang/Object;
 
@@ -171,7 +172,7 @@
 
     const/4 v10, 0x0
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_2
     invoke-static {v11}, Lrx/internal/util/i;->cc(Ljava/lang/Object;)Z
@@ -180,7 +181,6 @@
 
     if-eqz v12, :cond_3
 
-    :goto_2
     invoke-interface {v2}, Lrx/e;->onCompleted()V
 
     iget-object v0, p0, Lrx/internal/a/bc$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
@@ -196,7 +196,7 @@
 
     aput-object v11, v6, v9
 
-    :goto_3
+    :goto_2
     add-int/lit8 v9, v9, 0x1
 
     goto :goto_1
@@ -235,14 +235,14 @@
 
     const/4 v8, 0x0
 
-    :goto_4
+    :goto_3
     if-ge v8, v6, :cond_6
 
     aget-object v9, v0, v8
 
     check-cast v9, Lrx/internal/a/bc$a$a;
 
-    iget-object v9, v9, Lrx/internal/a/bc$a$a;->crI:Lrx/internal/util/i;
+    iget-object v9, v9, Lrx/internal/a/bc$a$a;->crb:Lrx/internal/util/i;
 
     invoke-virtual {v9}, Lrx/internal/util/i;->poll()Ljava/lang/Object;
 
@@ -256,17 +256,23 @@
 
     if-eqz v9, :cond_5
 
-    goto :goto_2
+    invoke-interface {v2}, Lrx/e;->onCompleted()V
+
+    iget-object v0, p0, Lrx/internal/a/bc$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    return-void
 
     :cond_5
     add-int/lit8 v8, v8, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     iget v6, p0, Lrx/internal/a/bc$a;->emitted:I
 
-    sget v8, Lrx/internal/a/bc$a;->crH:I
+    sget v8, Lrx/internal/a/bc$a;->cra:I
 
     if-le v6, v8, :cond_1
 
@@ -274,7 +280,7 @@
 
     const/4 v8, 0x0
 
-    :goto_5
+    :goto_4
     if-ge v8, v6, :cond_7
 
     aget-object v9, v0, v8
@@ -289,12 +295,12 @@
 
     add-int/lit8 v8, v8, 0x1
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_7
     iput v7, p0, Lrx/internal/a/bc$a;->emitted:I
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :catch_0
     move-exception v0
diff --git a/com.discord/smali_classes2/rx/internal/a/bc$b.smali b/com.discord/smali_classes2/rx/internal/a/bc$b.smali
index c99e49f812..252030d04e 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bc$b;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorZip.java"
 
 # interfaces
 .implements Lrx/Producer;
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 3c5644b399..bab6c6c1a1 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bc$c;
 .super Lrx/Subscriber;
+.source "OperatorZip.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
     .end annotation
 .end field
 
-.field final crK:Lrx/internal/a/bc$b;
+.field final cre:Lrx/internal/a/bc$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/bc$b<",
@@ -41,7 +42,7 @@
     .end annotation
 .end field
 
-.field final synthetic crL:Lrx/internal/a/bc;
+.field final synthetic crf:Lrx/internal/a/bc;
 
 .field started:Z
 
@@ -70,7 +71,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/bc$c;->crL:Lrx/internal/a/bc;
+    iput-object p1, p0, Lrx/internal/a/bc$c;->crf:Lrx/internal/a/bc;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -78,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;->crK:Lrx/internal/a/bc$b;
+    iput-object p4, p0, Lrx/internal/a/bc$c;->cre:Lrx/internal/a/bc$b;
 
     return-void
 .end method
@@ -130,7 +131,7 @@
 
     iget-object v0, p0, Lrx/internal/a/bc$c;->zipper:Lrx/internal/a/bc$a;
 
-    iget-object v1, p0, Lrx/internal/a/bc$c;->crK:Lrx/internal/a/bc$b;
+    iget-object v1, p0, Lrx/internal/a/bc$c;->cre:Lrx/internal/a/bc$b;
 
     array-length v2, p1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bc.smali b/com.discord/smali_classes2/rx/internal/a/bc.smali
index 4c686fca82..1e68adc91e 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/bc;
 .super Ljava/lang/Object;
+.source "OperatorZip.java"
 
 # interfaces
 .implements Lrx/Observable$b;
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 33370f34c5..13a4046afa 100644
--- a/com.discord/smali_classes2/rx/internal/a/bd$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bd$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/bd$a;
 .super Lrx/Subscriber;
+.source "SingleFromObservable.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field final crN:Lrx/g;
+.field final crh:Lrx/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/g<",
@@ -57,7 +58,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/bd$a;->crN:Lrx/g;
+    iput-object p1, p0, Lrx/internal/a/bd$a;->crh:Lrx/g;
 
     return-void
 .end method
@@ -71,7 +72,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/bd$a;->crN:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->crh:Lrx/g;
 
     new-instance v1, Ljava/util/NoSuchElementException;
 
@@ -96,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;->crN:Lrx/g;
+    iget-object v1, p0, Lrx/internal/a/bd$a;->crh:Lrx/g;
 
     invoke-virtual {v1, v0}, Lrx/g;->onSuccess(Ljava/lang/Object;)V
 
@@ -122,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;->crN:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->crh:Lrx/g;
 
     invoke-virtual {v0, p1}, Lrx/g;->onError(Ljava/lang/Throwable;)V
 
@@ -156,7 +157,7 @@
 
     iput p1, p0, Lrx/internal/a/bd$a;->state:I
 
-    iget-object p1, p0, Lrx/internal/a/bd$a;->crN:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/bd$a;->crh: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 63749342bc..f8aa1f68dc 100644
--- a/com.discord/smali_classes2/rx/internal/a/bd.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bd.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/bd;
 .super Ljava/lang/Object;
+.source "SingleFromObservable.java"
 
 # interfaces
 .implements Lrx/f$a;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field final crM:Lrx/Observable$a;
+.field final crg:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -48,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/bd;->crM:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/bd;->crg:Lrx/Observable$a;
 
     return-void
 .end method
@@ -66,7 +67,7 @@
 
     invoke-virtual {p1, v0}, Lrx/g;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/bd;->crM:Lrx/Observable$a;
+    iget-object p1, p0, Lrx/internal/a/bd;->crg: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$a.smali b/com.discord/smali_classes2/rx/internal/a/be$a.smali
index 4f0d8fcc21..abd626903d 100644
--- a/com.discord/smali_classes2/rx/internal/a/be$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/be$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/be$a;
 .super Lrx/g;
+.source "SingleLiftObservableOperator.java"
 
 
 # annotations
@@ -65,7 +66,7 @@
 .end method
 
 .method public final onSuccess(Ljava/lang/Object;)V
-    .locals 3
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;)V"
@@ -76,9 +77,7 @@
 
     new-instance v1, Lrx/internal/b/c;
 
-    iget-object v2, p0, Lrx/internal/a/be$a;->actual:Lrx/Subscriber;
-
-    invoke-direct {v1, v2, p1}, Lrx/internal/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+    invoke-direct {v1, v0, p1}, Lrx/internal/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
 
     invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/be.smali b/com.discord/smali_classes2/rx/internal/a/be.smali
index 7133833c0b..3cb52d884a 100644
--- a/com.discord/smali_classes2/rx/internal/a/be.smali
+++ b/com.discord/smali_classes2/rx/internal/a/be.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/be;
 .super Ljava/lang/Object;
+.source "SingleLiftObservableOperator.java"
 
 # interfaces
 .implements Lrx/f$a;
@@ -27,7 +28,7 @@
 
 
 # instance fields
-.field final crO:Lrx/f$a;
+.field final cri:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -36,7 +37,7 @@
     .end annotation
 .end field
 
-.field final crP:Lrx/Observable$b;
+.field final crj:Lrx/Observable$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$b<",
@@ -59,7 +60,7 @@
     invoke-virtual {p1, v0}, Lrx/g;->add(Lrx/Subscription;)V
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/be;->crP:Lrx/Observable$b;
+    iget-object v1, p0, Lrx/internal/a/be;->crj:Lrx/Observable$b;
 
     invoke-static {v1}, Lrx/c/c;->c(Lrx/Observable$b;)Lrx/Observable$b;
 
@@ -79,7 +80,7 @@
 
     invoke-virtual {v0}, Lrx/Subscriber;->onStart()V
 
-    iget-object v0, p0, Lrx/internal/a/be;->crO:Lrx/f$a;
+    iget-object v0, p0, Lrx/internal/a/be;->cri: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 96c323ceac..ef3e3a6de4 100644
--- a/com.discord/smali_classes2/rx/internal/a/bf.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bf.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/bf;
 .super Ljava/lang/Object;
+.source "SingleToObservable.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field final crO:Lrx/f$a;
+.field final cri:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -42,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/bf;->crO:Lrx/f$a;
+    iput-object p1, p0, Lrx/internal/a/bf;->cri:Lrx/f$a;
 
     return-void
 .end method
@@ -60,7 +61,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/bf;->crO:Lrx/f$a;
+    iget-object p1, p0, Lrx/internal/a/bf;->cri: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 bcd0d7b40e..6787ce30e0 100644
--- a/com.discord/smali_classes2/rx/internal/a/c$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/c$a;
 .super Ljava/lang/Object;
+.source "DeferredScalarSubscriber.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,7 +18,7 @@
 
 
 # instance fields
-.field final cnx:Lrx/internal/a/c;
+.field final cmR:Lrx/internal/a/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/c<",
@@ -40,7 +41,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/c$a;->cnx:Lrx/internal/a/c;
+    iput-object p1, p0, Lrx/internal/a/c$a;->cmR:Lrx/internal/a/c;
 
     return-void
 .end method
@@ -50,7 +51,7 @@
 .method public final request(J)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/c$a;->cnx:Lrx/internal/a/c;
+    iget-object v0, p0, Lrx/internal/a/c$a;->cmR:Lrx/internal/a/c;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/a/c;->bm(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 01e7dec98d..c82fdfc6e9 100644
--- a/com.discord/smali_classes2/rx/internal/a/c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/c.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/internal/a/c;
 .super Lrx/Subscriber;
+.source "DeferredScalarSubscriber.java"
 
 
 # annotations
@@ -32,7 +33,7 @@
     .end annotation
 .end field
 
-.field final cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field protected hasValue:Z
 
@@ -64,7 +65,7 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/c;->cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lrx/internal/a/c;->cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -78,16 +79,16 @@
 
     cmp-long v2, p1, v0
 
-    if-ltz v2, :cond_5
+    if-ltz v2, :cond_6
 
     cmp-long v2, p1, v0
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_5
 
     iget-object p1, p0, Lrx/internal/a/c;->actual:Lrx/Subscriber;
 
     :cond_0
-    iget-object p2, p0, Lrx/internal/a/c;->cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -114,7 +115,7 @@
 
     if-ne p2, v2, :cond_3
 
-    iget-object p2, p0, Lrx/internal/a/c;->cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2, v2, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
 
@@ -138,7 +139,7 @@
     return-void
 
     :cond_3
-    iget-object p2, p0, Lrx/internal/a/c;->cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v1, 0x0
 
@@ -148,11 +149,16 @@
 
     if-eqz p2, :cond_0
 
+    return-void
+
     :cond_4
     :goto_0
     return-void
 
     :cond_5
+    return-void
+
+    :cond_6
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
     invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
@@ -168,6 +174,8 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
+
+    return-void
 .end method
 
 .method public final d(Lrx/Observable;)V
@@ -207,7 +215,7 @@
     iget-object v1, p0, Lrx/internal/a/c;->actual:Lrx/Subscriber;
 
     :cond_0
-    iget-object v2, p0, Lrx/internal/a/c;->cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -245,7 +253,7 @@
     invoke-virtual {v1}, Lrx/Subscriber;->onCompleted()V
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/a/c;->cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/c;->cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->lazySet(I)V
 
@@ -254,7 +262,7 @@
     :cond_3
     iput-object v0, p0, Lrx/internal/a/c;->value:Ljava/lang/Object;
 
-    iget-object v2, p0, Lrx/internal/a/c;->cnw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->cmQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v4, 0x0
 
@@ -264,6 +272,8 @@
 
     if-eqz v2, :cond_0
 
+    return-void
+
     :cond_4
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/d.smali b/com.discord/smali_classes2/rx/internal/a/d.smali
index 82c2210d8f..dd06d8b2fd 100644
--- a/com.discord/smali_classes2/rx/internal/a/d.smali
+++ b/com.discord/smali_classes2/rx/internal/a/d.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/internal/a/d;
 .super Lrx/internal/a/c;
+.source "DeferredScalarSubscriberSafe.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/a/e.smali b/com.discord/smali_classes2/rx/internal/a/e.smali
index 90bb410ac4..cbfdfac3a8 100644
--- a/com.discord/smali_classes2/rx/internal/a/e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/e.smali
@@ -1,5 +1,6 @@
 .class public final enum Lrx/internal/a/e;
 .super Ljava/lang/Enum;
+.source "EmptyObservableHolder.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -29,9 +30,9 @@
     .end annotation
 .end field
 
-.field public static final enum cny:Lrx/internal/a/e;
+.field public static final enum cmS:Lrx/internal/a/e;
 
-.field private static final synthetic cnz:[Lrx/internal/a/e;
+.field private static final synthetic cmT:[Lrx/internal/a/e;
 
 
 # direct methods
@@ -44,23 +45,21 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/e;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/a/e;->cny:Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->cmS:Lrx/internal/a/e;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/e;
 
-    sget-object v1, Lrx/internal/a/e;->cny:Lrx/internal/a/e;
+    sget-object v1, Lrx/internal/a/e;->cmS:Lrx/internal/a/e;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/e;->cnz:[Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->cmT:[Lrx/internal/a/e;
 
-    sget-object v0, Lrx/internal/a/e;->cny:Lrx/internal/a/e;
-
-    invoke-static {v0}, Lrx/Observable;->b(Lrx/Observable$a;)Lrx/Observable;
+    invoke-static {v1}, Lrx/Observable;->b(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object v0
 
@@ -84,7 +83,7 @@
     return-void
 .end method
 
-.method public static KT()Lrx/Observable;
+.method public static KS()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -118,7 +117,7 @@
 .method public static values()[Lrx/internal/a/e;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/e;->cnz:[Lrx/internal/a/e;
+    sget-object v0, Lrx/internal/a/e;->cmT:[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 18d1233eb9..93df233820 100644
--- a/com.discord/smali_classes2/rx/internal/a/f.smali
+++ b/com.discord/smali_classes2/rx/internal/a/f.smali
@@ -1,5 +1,6 @@
 .class public final enum Lrx/internal/a/f;
 .super Ljava/lang/Enum;
+.source "NeverObservableHolder.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -19,9 +20,9 @@
 
 
 # static fields
-.field public static final enum cnA:Lrx/internal/a/f;
+.field public static final enum cmU:Lrx/internal/a/f;
 
-.field static final cnB:Lrx/Observable;
+.field static final cmV:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -31,7 +32,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic cnC:[Lrx/internal/a/f;
+.field private static final synthetic cmW:[Lrx/internal/a/f;
 
 
 # direct methods
@@ -44,27 +45,25 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/f;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/a/f;->cnA:Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->cmU:Lrx/internal/a/f;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/f;
 
-    sget-object v1, Lrx/internal/a/f;->cnA:Lrx/internal/a/f;
+    sget-object v1, Lrx/internal/a/f;->cmU:Lrx/internal/a/f;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/f;->cnC:[Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->cmW:[Lrx/internal/a/f;
 
-    sget-object v0, Lrx/internal/a/f;->cnA:Lrx/internal/a/f;
-
-    invoke-static {v0}, Lrx/Observable;->b(Lrx/Observable$a;)Lrx/Observable;
+    invoke-static {v1}, Lrx/Observable;->b(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/a/f;->cnB:Lrx/Observable;
+    sput-object v0, Lrx/internal/a/f;->cmV:Lrx/Observable;
 
     return-void
 .end method
@@ -84,7 +83,7 @@
     return-void
 .end method
 
-.method public static KT()Lrx/Observable;
+.method public static KS()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -96,7 +95,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/f;->cnB:Lrx/Observable;
+    sget-object v0, Lrx/internal/a/f;->cmV:Lrx/Observable;
 
     return-object v0
 .end method
@@ -118,7 +117,7 @@
 .method public static values()[Lrx/internal/a/f;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/f;->cnC:[Lrx/internal/a/f;
+    sget-object v0, Lrx/internal/a/f;->cmW:[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$1.smali b/com.discord/smali_classes2/rx/internal/a/g$1.smali
index 3c4908f82e..60d8bceca3 100644
--- a/com.discord/smali_classes2/rx/internal/a/g$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/g$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/g$1;
 .super Ljava/lang/Object;
+.source "NotificationLite.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/rx/internal/a/g$2.smali b/com.discord/smali_classes2/rx/internal/a/g$2.smali
index 166ae5d465..e372dbd8e1 100644
--- a/com.discord/smali_classes2/rx/internal/a/g$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/g$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/g$2;
 .super Ljava/lang/Object;
+.source "NotificationLite.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/rx/internal/a/g$a.smali b/com.discord/smali_classes2/rx/internal/a/g$a.smali
index 216b14720e..7f16607613 100644
--- a/com.discord/smali_classes2/rx/internal/a/g$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/g$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/g$a;
 .super Ljava/lang/Object;
+.source "NotificationLite.java"
 
 # interfaces
 .implements Ljava/io/Serializable;
diff --git a/com.discord/smali_classes2/rx/internal/a/g.smali b/com.discord/smali_classes2/rx/internal/a/g.smali
index c40d12a592..4310d907e5 100644
--- a/com.discord/smali_classes2/rx/internal/a/g.smali
+++ b/com.discord/smali_classes2/rx/internal/a/g.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/g;
 .super Ljava/lang/Object;
+.source "NotificationLite.java"
 
 
 # annotations
@@ -11,9 +12,9 @@
 
 
 # static fields
-.field private static final cnD:Ljava/lang/Object;
+.field private static final cmX:Ljava/lang/Object;
 
-.field private static final cnE:Ljava/lang/Object;
+.field private static final cmY:Ljava/lang/Object;
 
 
 # direct methods
@@ -24,13 +25,13 @@
 
     invoke-direct {v0}, Lrx/internal/a/g$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/g;->cnD:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->cmX: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;->cnE:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->cmY:Ljava/lang/Object;
 
     return-void
 .end method
@@ -45,10 +46,10 @@
     return-object v0
 .end method
 
-.method public static KU()Ljava/lang/Object;
+.method public static KT()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/g;->cnD:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->cmX:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -67,7 +68,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->cnD:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->cmX:Ljava/lang/Object;
 
     const/4 v1, 0x1
 
@@ -78,7 +79,7 @@
     return v1
 
     :cond_0
-    sget-object v0, Lrx/internal/a/g;->cnE:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->cmY:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
@@ -137,7 +138,9 @@
 
     if-nez p0, :cond_0
 
-    sget-object p0, Lrx/internal/a/g;->cnE:Ljava/lang/Object;
+    sget-object p0, Lrx/internal/a/g;->cmY:Ljava/lang/Object;
+
+    return-object p0
 
     :cond_0
     return-object p0
@@ -146,7 +149,7 @@
 .method public static cc(Ljava/lang/Object;)Z
     .locals 1
 
-    sget-object v0, Lrx/internal/a/g;->cnD:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->cmX:Ljava/lang/Object;
 
     if-ne p0, v0, :cond_0
 
@@ -205,7 +208,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->cnE:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->cmY: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 d62b33fcda..64e3de2e39 100644
--- a/com.discord/smali_classes2/rx/internal/a/h$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/h$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/h$a;
 .super Lrx/Subscriber;
+.source "OnSubscribeCombineLatest.java"
 
 
 # annotations
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field final cnH:Lrx/internal/a/h$b;
+.field final cnb:Lrx/internal/a/h$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/h$b<",
@@ -53,7 +54,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/h$a;->cnH:Lrx/internal/a/h$b;
+    iput-object p1, p0, Lrx/internal/a/h$a;->cnb:Lrx/internal/a/h$b;
 
     iput p2, p0, Lrx/internal/a/h$a;->index:I
 
@@ -68,7 +69,7 @@
 
 
 # virtual methods
-.method public final KV()V
+.method public final KU()V
     .locals 2
 
     const-wide/16 v0, 0x1
@@ -92,7 +93,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/h$a;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/h$a;->cnH:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->cnb:Lrx/internal/a/h$b;
 
     const/4 v1, 0x0
 
@@ -115,7 +116,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/h$a;->cnH:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->cnb:Lrx/internal/a/h$b;
 
     iget-object v0, v0, Lrx/internal/a/h$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -185,7 +186,7 @@
 
     iput-boolean v2, p0, Lrx/internal/a/h$a;->done:Z
 
-    iget-object p1, p0, Lrx/internal/a/h$a;->cnH:Lrx/internal/a/h$b;
+    iget-object p1, p0, Lrx/internal/a/h$a;->cnb:Lrx/internal/a/h$b;
 
     const/4 v0, 0x0
 
@@ -211,7 +212,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/h$a;->cnH:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->cnb:Lrx/internal/a/h$b;
 
     invoke-static {p1}, Lrx/internal/a/g;->cb(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 2ea78942ba..130693a833 100644
--- a/com.discord/smali_classes2/rx/internal/a/h$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/h$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/h$b;
 .super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "OnSubscribeCombineLatest.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -31,7 +32,7 @@
 
 
 # static fields
-.field static final cnI:Ljava/lang/Object;
+.field static final cnc:Ljava/lang/Object;
 
 .field private static final serialVersionUID:J = 0x76e7117251786db1L
 
@@ -110,7 +111,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/h$b;->cnI:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/h$b;->cnc:Ljava/lang/Object;
 
     return-void
 .end method
@@ -143,7 +144,7 @@
 
     iget-object p1, p0, Lrx/internal/a/h$b;->latest:[Ljava/lang/Object;
 
-    sget-object p2, Lrx/internal/a/h$b;->cnI:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->cnc:Ljava/lang/Object;
 
     invoke-static {p1, p2}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -412,7 +413,6 @@
 
     invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
-    :goto_2
     invoke-virtual {v9, v0}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
     return-void
@@ -429,7 +429,7 @@
 
     invoke-virtual {v9, v1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
-    invoke-virtual/range {v17 .. v17}, Lrx/internal/a/h$a;->KV()V
+    invoke-virtual/range {v17 .. v17}, Lrx/internal/a/h$a;->KU()V
 
     const-wide/16 v1, 0x1
 
@@ -446,17 +446,19 @@
 
     invoke-direct {v7, v8}, Lrx/internal/a/h$b;->a(Ljava/util/Queue;)V
 
-    goto :goto_2
+    invoke-virtual {v9, v0}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
+
+    return-void
 
     :cond_6
     move-wide/from16 v3, v19
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_7
     move-wide v3, v5
 
-    :goto_3
+    :goto_2
     cmp-long v1, v3, v15
 
     if-eqz v1, :cond_8
@@ -511,7 +513,7 @@
 
     iget v3, p0, Lrx/internal/a/h$b;->active:I
 
-    sget-object v4, Lrx/internal/a/h$b;->cnI:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/h$b;->cnc:Ljava/lang/Object;
 
     if-ne v2, v4, :cond_0
 
@@ -558,7 +560,7 @@
 
     if-nez p1, :cond_4
 
-    sget-object v1, Lrx/internal/a/h$b;->cnI:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/h$b;->cnc:Ljava/lang/Object;
 
     if-ne v2, v1, :cond_4
 
@@ -566,7 +568,7 @@
     const/4 p2, 0x1
 
     :cond_4
-    if-nez p2, :cond_6
+    if-nez p2, :cond_7
 
     if-eqz p1, :cond_5
 
@@ -585,7 +587,7 @@
     goto :goto_2
 
     :cond_5
-    if-nez p1, :cond_7
+    if-nez p1, :cond_8
 
     iget-object p2, p0, Lrx/internal/a/h$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -593,34 +595,39 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_7
+    if-eqz p2, :cond_8
 
-    sget-object p2, Lrx/internal/a/h$b;->cnI:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->cnc:Ljava/lang/Object;
 
     if-eq v2, p2, :cond_6
 
     iget-boolean p2, p0, Lrx/internal/a/h$b;->delayError:Z
 
-    if-nez p2, :cond_7
+    if-nez p2, :cond_8
 
     :cond_6
     iput-boolean v5, p0, Lrx/internal/a/h$b;->done:Z
 
+    goto :goto_2
+
     :cond_7
+    iput-boolean v5, p0, Lrx/internal/a/h$b;->done:Z
+
+    :cond_8
     :goto_2
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-nez v3, :cond_8
+    if-nez v3, :cond_9
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_9
 
-    invoke-virtual {v0}, Lrx/internal/a/h$a;->KV()V
+    invoke-virtual {v0}, Lrx/internal/a/h$a;->KU()V
 
     return-void
 
-    :cond_8
+    :cond_9
     invoke-direct {p0}, Lrx/internal/a/h$b;->drain()V
 
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/h.smali b/com.discord/smali_classes2/rx/internal/a/h.smali
index 0667543b75..056dbe5f0b 100644
--- a/com.discord/smali_classes2/rx/internal/a/h.smali
+++ b/com.discord/smali_classes2/rx/internal/a/h.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/h;
 .super Ljava/lang/Object;
+.source "OnSubscribeCombineLatest.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -30,7 +31,7 @@
 # instance fields
 .field final bufferSize:I
 
-.field final cnF:[Lrx/Observable;
+.field final cmZ:[Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -40,7 +41,7 @@
     .end annotation
 .end field
 
-.field final cnG:Ljava/lang/Iterable;
+.field final cna:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -103,9 +104,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/h;->cnF:[Lrx/Observable;
+    iput-object v0, p0, Lrx/internal/a/h;->cmZ:[Lrx/Observable;
 
-    iput-object p1, p0, Lrx/internal/a/h;->cnG:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/h;->cna:Ljava/lang/Iterable;
 
     iput-object p2, p0, Lrx/internal/a/h;->combiner:Lrx/functions/FuncN;
 
@@ -127,19 +128,17 @@
 
     check-cast v1, Lrx/Subscriber;
 
-    iget-object p1, p0, Lrx/internal/a/h;->cnF:[Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/h;->cmZ:[Lrx/Observable;
 
     const/4 v6, 0x0
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lrx/internal/a/h;->cnG:Ljava/lang/Iterable;
+    iget-object p1, p0, Lrx/internal/a/h;->cna:Ljava/lang/Iterable;
 
-    instance-of p1, p1, Ljava/util/List;
+    instance-of v0, p1, Ljava/util/List;
 
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lrx/internal/a/h;->cnG:Ljava/lang/Iterable;
+    if-eqz v0, :cond_0
 
     check-cast p1, Ljava/util/List;
 
@@ -157,73 +156,70 @@
 
     array-length v0, p1
 
+    move v3, v0
+
     goto :goto_1
 
     :cond_0
-    const/16 p1, 0x8
+    const/16 v0, 0x8
 
-    new-array p1, p1, [Lrx/Observable;
+    new-array v0, v0, [Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/a/h;->cnG:Ljava/lang/Iterable;
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    move-result-object p1
 
-    move-result-object v0
-
-    move-object v2, p1
-
-    const/4 p1, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
 
     if-eqz v3, :cond_2
 
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v3
 
     check-cast v3, Lrx/Observable;
 
-    array-length v4, v2
+    array-length v4, v0
 
-    if-ne p1, v4, :cond_1
+    if-ne v2, v4, :cond_1
 
-    shr-int/lit8 v4, p1, 0x2
+    shr-int/lit8 v4, v2, 0x2
 
-    add-int/2addr v4, p1
+    add-int/2addr v4, v2
 
     new-array v4, v4, [Lrx/Observable;
 
-    invoke-static {v2, v6, v4, v6, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v0, v6, v4, v6, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    move-object v2, v4
+    move-object v0, v4
 
     :cond_1
-    add-int/lit8 v4, p1, 0x1
+    add-int/lit8 v4, v2, 0x1
 
-    aput-object v3, v2, p1
+    aput-object v3, v0, v2
 
-    move p1, v4
+    move v2, v4
 
     goto :goto_0
 
     :cond_2
-    move v3, p1
+    move-object p1, v0
 
-    move-object p1, v2
+    move v3, v2
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     array-length v0, p1
 
-    :goto_1
     move v3, v0
 
-    :goto_2
+    :goto_1
     if-nez v3, :cond_4
 
     invoke-virtual {v1}, Lrx/Subscriber;->onCompleted()V
@@ -249,7 +245,7 @@
 
     const/4 v2, 0x0
 
-    :goto_3
+    :goto_2
     if-ge v2, v1, :cond_5
 
     new-instance v3, Lrx/internal/a/h$a;
@@ -260,7 +256,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     invoke-virtual {v7, v6}, Lrx/internal/a/h$b;->lazySet(I)V
@@ -273,7 +269,7 @@
 
     invoke-virtual {v2, v7}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    :goto_4
+    :goto_3
     if-ge v6, v1, :cond_6
 
     iget-boolean v2, v7, Lrx/internal/a/h$b;->cancelled:Z
@@ -288,7 +284,7 @@
 
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_6
     return-void
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 65402b58d8..8225325460 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/i$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeConcatMap.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cnN:Lrx/internal/a/i$c;
+.field final synthetic cnh:Lrx/internal/a/i$c;
 
-.field final synthetic cnO:Lrx/internal/a/i;
+.field final synthetic cni: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;->cnO:Lrx/internal/a/i;
+    iput-object p1, p0, Lrx/internal/a/i$1;->cni:Lrx/internal/a/i;
 
-    iput-object p2, p0, Lrx/internal/a/i$1;->cnN:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$1;->cnh:Lrx/internal/a/i$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final request(J)V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/i$1;->cnN:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$1;->cnh:Lrx/internal/a/i$c;
 
     const-wide/16 v1, 0x0
 
@@ -48,7 +49,7 @@
 
     if-lez v3, :cond_0
 
-    iget-object v0, v0, Lrx/internal/a/i$c;->cnR:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->cnl: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 e9ef03624b..5a9fa83389 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/i$a;
 .super Ljava/lang/Object;
+.source "OnSubscribeConcatMap.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -29,7 +30,7 @@
 
 
 # instance fields
-.field final cnP:Lrx/internal/a/i$c;
+.field final cnj:Lrx/internal/a/i$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/i$c<",
@@ -38,7 +39,7 @@
     .end annotation
 .end field
 
-.field cnQ:Z
+.field cnk:Z
 
 .field final value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -64,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;->cnP:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$a;->cnj:Lrx/internal/a/i$c;
 
     return-void
 .end method
@@ -74,7 +75,7 @@
 .method public final request(J)V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/a/i$a;->cnQ:Z
+    iget-boolean v0, p0, Lrx/internal/a/i$a;->cnk:Z
 
     if-nez v0, :cond_0
 
@@ -86,9 +87,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/i$a;->cnQ:Z
+    iput-boolean p1, p0, Lrx/internal/a/i$a;->cnk:Z
 
-    iget-object p1, p0, Lrx/internal/a/i$a;->cnP:Lrx/internal/a/i$c;
+    iget-object p1, p0, Lrx/internal/a/i$a;->cnj: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 2770655203..4155172d6c 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/i$b;
 .super Lrx/Subscriber;
+.source "OnSubscribeConcatMap.java"
 
 
 # annotations
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field final cnP:Lrx/internal/a/i$c;
+.field final cnj:Lrx/internal/a/i$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/i$c<",
@@ -51,7 +52,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i$b;->cnP:Lrx/internal/a/i$c;
+    iput-object p1, p0, Lrx/internal/a/i$b;->cnj:Lrx/internal/a/i$c;
 
     return-void
 .end method
@@ -61,7 +62,7 @@
 .method public final onCompleted()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->cnP:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->cnj:Lrx/internal/a/i$c;
 
     iget-wide v1, p0, Lrx/internal/a/i$b;->produced:J
 
@@ -73,7 +74,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->cnP:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->cnj:Lrx/internal/a/i$c;
 
     iget-wide v1, p0, Lrx/internal/a/i$b;->produced:J
 
@@ -90,7 +91,7 @@
     return-void
 
     :cond_0
-    iget p1, v0, Lrx/internal/a/i$c;->cnM:I
+    iget p1, v0, Lrx/internal/a/i$c;->cng:I
 
     if-nez p1, :cond_2
 
@@ -122,7 +123,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lrx/internal/a/i$c;->cnR:Lrx/internal/b/a;
+    iget-object p1, v0, Lrx/internal/a/i$c;->cnl:Lrx/internal/b/a;
 
     invoke-virtual {p1, v1, v2}, Lrx/internal/b/a;->bt(J)V
 
@@ -152,7 +153,7 @@
 
     iput-wide v0, p0, Lrx/internal/a/i$b;->produced:J
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->cnP:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->cnj:Lrx/internal/a/i$c;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/i$c;->ch(Ljava/lang/Object;)V
 
@@ -162,9 +163,9 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->cnP:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->cnj:Lrx/internal/a/i$c;
 
-    iget-object v0, v0, Lrx/internal/a/i$c;->cnR:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->cnl: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 ef2a00f9ba..1c110bc471 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/i$c;
 .super Lrx/Subscriber;
+.source "OnSubscribeConcatMap.java"
 
 
 # annotations
@@ -37,7 +38,7 @@
     .end annotation
 .end field
 
-.field final cnK:Lrx/functions/b;
+.field final cne:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -48,11 +49,11 @@
     .end annotation
 .end field
 
-.field final cnM:I
+.field final cng:I
 
-.field final cnR:Lrx/internal/b/a;
+.field final cnl:Lrx/internal/b/a;
 
-.field final cnS:Lrx/subscriptions/SerialSubscription;
+.field final cnm:Lrx/subscriptions/SerialSubscription;
 
 .field volatile done:Z
 
@@ -98,15 +99,15 @@
 
     iput-object p1, p0, Lrx/internal/a/i$c;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/i$c;->cnK:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i$c;->cne:Lrx/functions/b;
 
-    iput p4, p0, Lrx/internal/a/i$c;->cnM:I
+    iput p4, p0, Lrx/internal/a/i$c;->cng: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;->cnR:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/i$c;->cnl:Lrx/internal/b/a;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -120,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;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result p1
 
@@ -144,7 +145,7 @@
 
     invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i$c;->cnS:Lrx/subscriptions/SerialSubscription;
+    iput-object p1, p0, Lrx/internal/a/i$c;->cnm:Lrx/subscriptions/SerialSubscription;
 
     int-to-long p1, p3
 
@@ -202,7 +203,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/i$c;->cnR:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/i$c;->cnl:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/b/a;->bt(J)V
 
@@ -245,7 +246,7 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lrx/internal/a/i$c;->cnM:I
+    iget v0, p0, Lrx/internal/a/i$c;->cng:I
 
     :cond_1
     :goto_0
@@ -350,7 +351,7 @@
     if-nez v4, :cond_d
 
     :try_start_0
-    iget-object v2, p0, Lrx/internal/a/i$c;->cnK:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i$c;->cne:Lrx/functions/b;
 
     invoke-static {v3}, Lrx/internal/a/g;->cf(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -377,7 +378,7 @@
     return-void
 
     :cond_9
-    invoke-static {}, Lrx/Observable;->KB()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->KA()Lrx/Observable;
 
     move-result-object v3
 
@@ -393,11 +394,11 @@
 
     iput-boolean v1, p0, Lrx/internal/a/i$c;->active:Z
 
-    iget-object v1, p0, Lrx/internal/a/i$c;->cnR:Lrx/internal/b/a;
+    iget-object v1, p0, Lrx/internal/a/i$c;->cnl:Lrx/internal/b/a;
 
     new-instance v3, Lrx/internal/a/i$a;
 
-    iget-object v2, v2, Lrx/internal/util/k;->ctK:Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/k;->cte:Ljava/lang/Object;
 
     invoke-direct {v3, v2, p0}, Lrx/internal/a/i$a;-><init>(Ljava/lang/Object;Lrx/internal/a/i$c;)V
 
@@ -410,7 +411,7 @@
 
     invoke-direct {v3, p0}, Lrx/internal/a/i$b;-><init>(Lrx/internal/a/i$c;)V
 
-    iget-object v6, p0, Lrx/internal/a/i$c;->cnS:Lrx/subscriptions/SerialSubscription;
+    iget-object v6, p0, Lrx/internal/a/i$c;->cnm:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {v6, v3}, Lrx/subscriptions/SerialSubscription;->f(Lrx/Subscription;)V
 
@@ -486,7 +487,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/i$c;->done:Z
 
-    iget p1, p0, Lrx/internal/a/i$c;->cnM:I
+    iget p1, p0, Lrx/internal/a/i$c;->cng:I
 
     if-nez p1, :cond_1
 
@@ -507,7 +508,7 @@
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
     :cond_0
-    iget-object p1, p0, Lrx/internal/a/i$c;->cnS:Lrx/subscriptions/SerialSubscription;
+    iget-object p1, p0, Lrx/internal/a/i$c;->cnm:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {p1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/i.smali b/com.discord/smali_classes2/rx/internal/a/i.smali
index 13d6e191a6..abe074182c 100644
--- a/com.discord/smali_classes2/rx/internal/a/i.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/i;
 .super Ljava/lang/Object;
+.source "OnSubscribeConcatMap.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -29,7 +30,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -38,7 +39,7 @@
     .end annotation
 .end field
 
-.field final cnK:Lrx/functions/b;
+.field final cne:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -49,9 +50,9 @@
     .end annotation
 .end field
 
-.field final cnL:I
+.field final cnf:I
 
-.field final cnM:I
+.field final cng:I
 
 
 # direct methods
@@ -71,17 +72,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/i;->cnd:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/i;->cnK:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i;->cne:Lrx/functions/b;
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lrx/internal/a/i;->cnL:I
+    iput p1, p0, Lrx/internal/a/i;->cnf:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lrx/internal/a/i;->cnM:I
+    iput p1, p0, Lrx/internal/a/i;->cng:I
 
     return-void
 .end method
@@ -93,7 +94,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget v0, p0, Lrx/internal/a/i;->cnM:I
+    iget v0, p0, Lrx/internal/a/i;->cng:I
 
     if-nez v0, :cond_0
 
@@ -109,17 +110,17 @@
     :goto_0
     new-instance v1, Lrx/internal/a/i$c;
 
-    iget-object v2, p0, Lrx/internal/a/i;->cnK:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i;->cne:Lrx/functions/b;
 
-    iget v3, p0, Lrx/internal/a/i;->cnL:I
+    iget v3, p0, Lrx/internal/a/i;->cnf:I
 
-    iget v4, p0, Lrx/internal/a/i;->cnM:I
+    iget v4, p0, Lrx/internal/a/i;->cng: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;->cnS:Lrx/subscriptions/SerialSubscription;
+    iget-object v0, v1, Lrx/internal/a/i$c;->cnm:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
@@ -135,7 +136,7 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/i;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/i;->cnd: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 6edf4c0015..fcbed3ac15 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$1.smali
@@ -1,5 +1,6 @@
 .class final synthetic Lrx/internal/a/j$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeCreate.java"
 
 
 # annotations
@@ -14,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic cnV:[I
+.field static final synthetic cnp:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lrx/Emitter$a;->Kv()[I
+    invoke-static {}, Lrx/Emitter$a;->Ku()[I
 
     move-result-object v0
 
@@ -29,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lrx/internal/a/j$1;->cnV:[I
+    sput-object v0, Lrx/internal/a/j$1;->cnp:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lrx/internal/a/j$1;->cnV:[I
+    sget-object v1, Lrx/internal/a/j$1;->cnp:[I
 
-    sget v2, Lrx/Emitter$a;->cmK:I
+    sget v2, Lrx/Emitter$a;->cme:I
 
     sub-int/2addr v2, v0
 
@@ -46,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lrx/internal/a/j$1;->cnV:[I
+    sget-object v1, Lrx/internal/a/j$1;->cnp:[I
 
-    sget v2, Lrx/Emitter$a;->cmL:I
+    sget v2, Lrx/Emitter$a;->cmf:I
 
     sub-int/2addr v2, v0
 
@@ -60,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lrx/internal/a/j$1;->cnV:[I
+    sget-object v1, Lrx/internal/a/j$1;->cnp:[I
 
-    sget v2, Lrx/Emitter$a;->cmN:I
+    sget v2, Lrx/Emitter$a;->cmh:I
 
     sub-int/2addr v2, v0
 
@@ -74,9 +75,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lrx/internal/a/j$1;->cnV:[I
+    sget-object v1, Lrx/internal/a/j$1;->cnp:[I
 
-    sget v2, Lrx/Emitter$a;->cmO:I
+    sget v2, Lrx/Emitter$a;->cmi:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/j$a.smali b/com.discord/smali_classes2/rx/internal/a/j$a.smali
index 69aeb10ceb..15ab86be8f 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$a.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/a/j$a;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OnSubscribeCreate.java"
 
 # interfaces
 .implements Lrx/Emitter;
@@ -74,13 +75,13 @@
 
 
 # virtual methods
-.method KW()V
+.method KV()V
     .locals 0
 
     return-void
 .end method
 
-.method KX()V
+.method KW()V
     .locals 0
 
     return-void
@@ -183,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;->KX()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->KW()V
 
     :cond_0
     return-void
@@ -196,7 +197,7 @@
 
     invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
 
-    invoke-virtual {p0}, Lrx/internal/a/j$a;->KW()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->KV()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 4d9298bd4d..bba1368add 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/j$b;
 .super Lrx/internal/a/j$a;
+.source "OnSubscribeCreate.java"
 
 
 # annotations
@@ -58,7 +59,7 @@
 
     invoke-direct {p0, p1}, Lrx/internal/a/j$a;-><init>(Lrx/Subscriber;)V
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result p1
 
@@ -244,7 +245,7 @@
 
 
 # virtual methods
-.method final KW()V
+.method final KV()V
     .locals 1
 
     iget-object v0, p0, Lrx/internal/a/j$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -263,7 +264,7 @@
     return-void
 .end method
 
-.method final KX()V
+.method final KW()V
     .locals 0
 
     invoke-direct {p0}, Lrx/internal/a/j$b;->drain()V
diff --git a/com.discord/smali_classes2/rx/internal/a/j$c.smali b/com.discord/smali_classes2/rx/internal/a/j$c.smali
index 7315aa3bd0..8522155f53 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/j$c;
 .super Lrx/internal/a/j$f;
+.source "OnSubscribeCreate.java"
 
 
 # annotations
@@ -45,7 +46,7 @@
 
 
 # virtual methods
-.method final KY()V
+.method final KX()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 26d2f669bc..f51e76b8f9 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$d.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$d.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/j$d;
 .super Lrx/internal/a/j$f;
+.source "OnSubscribeCreate.java"
 
 
 # annotations
@@ -49,7 +50,7 @@
 
 
 # virtual methods
-.method final KY()V
+.method final KX()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 dba9aa3e5b..09674eb61d 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$e.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/j$e;
 .super Lrx/internal/a/j$a;
+.source "OnSubscribeCreate.java"
 
 
 # annotations
@@ -239,7 +240,7 @@
 
 
 # virtual methods
-.method final KW()V
+.method final KV()V
     .locals 2
 
     iget-object v0, p0, Lrx/internal/a/j$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -260,7 +261,7 @@
     return-void
 .end method
 
-.method final KX()V
+.method final KW()V
     .locals 0
 
     invoke-direct {p0}, Lrx/internal/a/j$e;->drain()V
diff --git a/com.discord/smali_classes2/rx/internal/a/j$f.smali b/com.discord/smali_classes2/rx/internal/a/j$f.smali
index b91db0056b..d7fc585dae 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$f.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$f.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/a/j$f;
 .super Lrx/internal/a/j$a;
+.source "OnSubscribeCreate.java"
 
 
 # annotations
@@ -45,7 +46,7 @@
 
 
 # virtual methods
-.method abstract KY()V
+.method abstract KX()V
 .end method
 
 .method public onNext(Ljava/lang/Object;)V
@@ -88,7 +89,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/j$f;->KY()V
+    invoke-virtual {p0}, Lrx/internal/a/j$f;->KX()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/j$g.smali b/com.discord/smali_classes2/rx/internal/a/j$g.smali
index d51071daa9..fc5ff33f56 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$g.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$g.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/j$g;
 .super Lrx/internal/a/j$a;
+.source "OnSubscribeCreate.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/a/j.smali b/com.discord/smali_classes2/rx/internal/a/j.smali
index b2ff6a418c..0a4a52a961 100644
--- a/com.discord/smali_classes2/rx/internal/a/j.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/j;
 .super Ljava/lang/Object;
+.source "OnSubscribeCreate.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -31,7 +32,7 @@
 
 
 # instance fields
-.field final cnT:Lrx/functions/Action1;
+.field final cnn:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -41,7 +42,7 @@
     .end annotation
 .end field
 
-.field final cnU:I
+.field final cno:I
 
 
 # direct methods
@@ -58,9 +59,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/j;->cnT:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/a/j;->cnn:Lrx/functions/Action1;
 
-    iput p2, p0, Lrx/internal/a/j;->cnU:I
+    iput p2, p0, Lrx/internal/a/j;->cno:I
 
     return-void
 .end method
@@ -72,9 +73,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    sget-object v0, Lrx/internal/a/j$1;->cnV:[I
+    sget-object v0, Lrx/internal/a/j$1;->cnp:[I
 
-    iget v1, p0, Lrx/internal/a/j;->cnU:I
+    iget v1, p0, Lrx/internal/a/j;->cno:I
 
     add-int/lit8 v1, v1, -0x1
 
@@ -121,7 +122,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object p1, p0, Lrx/internal/a/j;->cnT:Lrx/functions/Action1;
+    iget-object p1, p0, Lrx/internal/a/j;->cnn: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 d69a1462eb..8065a4f071 100644
--- a/com.discord/smali_classes2/rx/internal/a/k.smali
+++ b/com.discord/smali_classes2/rx/internal/a/k.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/k;
 .super Ljava/lang/Object;
+.source "OnSubscribeDefer.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field final cnW:Lrx/functions/Func0;
+.field final cnq:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -46,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/k;->cnW:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/k;->cnq:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -59,7 +60,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/k;->cnW:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/k;->cnq: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 fc14495bcf..c27d9e6edc 100644
--- a/com.discord/smali_classes2/rx/internal/a/l$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/l$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/l$a;
 .super Lrx/Subscriber;
+.source "OnSubscribeDoOnEach.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # instance fields
-.field private final cnX:Lrx/e;
+.field private final cnr:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -62,7 +63,7 @@
 
     iput-object p1, p0, Lrx/internal/a/l$a;->subscriber:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/l$a;->cnX:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l$a;->cnr:Lrx/e;
 
     return-void
 .end method
@@ -80,7 +81,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/l$a;->cnX:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->cnr:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
     :try_end_0
@@ -121,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;->cnX:Lrx/e;
+    iget-object v1, p0, Lrx/internal/a/l$a;->cnr:Lrx/e;
 
     invoke-interface {v1, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
     :try_end_0
@@ -179,7 +180,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/l$a;->cnX:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->cnr: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 6d40534a24..2aa8effcc7 100644
--- a/com.discord/smali_classes2/rx/internal/a/l.smali
+++ b/com.discord/smali_classes2/rx/internal/a/l.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/l;
 .super Ljava/lang/Object;
+.source "OnSubscribeDoOnEach.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field private final cnJ:Lrx/Observable;
+.field private final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -34,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final cnX:Lrx/e;
+.field private final cnr:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -59,9 +60,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/l;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/l;->cnd:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/l;->cnX:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l;->cnr:Lrx/e;
 
     return-void
 .end method
@@ -73,11 +74,11 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/l;->cnJ:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/l;->cnd:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/l$a;
 
-    iget-object v2, p0, Lrx/internal/a/l;->cnX:Lrx/e;
+    iget-object v2, p0, Lrx/internal/a/l;->cnr: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 87d8a71464..b9badf410d 100644
--- a/com.discord/smali_classes2/rx/internal/a/m$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/m$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/m$a;
 .super Lrx/Subscriber;
+.source "OnSubscribeFilter.java"
 
 
 # annotations
@@ -33,7 +34,7 @@
     .end annotation
 .end field
 
-.field final cnY:Lrx/functions/b;
+.field final cns:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -66,7 +67,7 @@
 
     iput-object p1, p0, Lrx/internal/a/m$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/m$a;->cnY:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m$a;->cns:Lrx/functions/b;
 
     const-wide/16 p1, 0x0
 
@@ -126,7 +127,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/m$a;->cnY:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/m$a;->cns: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 af55b7164b..e703419801 100644
--- a/com.discord/smali_classes2/rx/internal/a/m.smali
+++ b/com.discord/smali_classes2/rx/internal/a/m.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/m;
 .super Ljava/lang/Object;
+.source "OnSubscribeFilter.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -34,7 +35,7 @@
     .end annotation
 .end field
 
-.field final cnY:Lrx/functions/b;
+.field final cns:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -63,9 +64,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/m;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/m;->cnd:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/m;->cnY:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m;->cns:Lrx/functions/b;
 
     return-void
 .end method
@@ -79,13 +80,13 @@
 
     new-instance v0, Lrx/internal/a/m$a;
 
-    iget-object v1, p0, Lrx/internal/a/m;->cnY:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/m;->cns: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;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/m;->cnd: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 cfdcdfdb4d..09e0aec73d 100644
--- a/com.discord/smali_classes2/rx/internal/a/n$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/n$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeFlattenIterable.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cnZ:Lrx/internal/a/n$a;
+.field final synthetic cnt:Lrx/internal/a/n$a;
 
-.field final synthetic coa:Lrx/internal/a/n;
+.field final synthetic cnu: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;->coa:Lrx/internal/a/n;
+    iput-object p1, p0, Lrx/internal/a/n$1;->cnu:Lrx/internal/a/n;
 
-    iput-object p2, p0, Lrx/internal/a/n$1;->cnZ:Lrx/internal/a/n$a;
+    iput-object p2, p0, Lrx/internal/a/n$1;->cnt:Lrx/internal/a/n$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final request(J)V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/n$1;->cnZ:Lrx/internal/a/n$a;
+    iget-object v0, p0, Lrx/internal/a/n$1;->cnt:Lrx/internal/a/n$a;
 
     const-wide/16 v1, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/n$a.smali b/com.discord/smali_classes2/rx/internal/a/n$a.smali
index 14da1b78d6..8eba8dbda1 100644
--- a/com.discord/smali_classes2/rx/internal/a/n$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/n$a;
 .super Lrx/Subscriber;
+.source "OnSubscribeFlattenIterable.java"
 
 
 # annotations
@@ -35,7 +36,7 @@
     .end annotation
 .end field
 
-.field final cnK:Lrx/functions/b;
+.field final cne:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -46,9 +47,9 @@
     .end annotation
 .end field
 
-.field final cob:J
+.field final cnv:J
 
-.field coc:Ljava/util/Iterator;
+.field cnw:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -105,7 +106,7 @@
 
     iput-object p1, p0, Lrx/internal/a/n$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/n$a;->cnK:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$a;->cne:Lrx/functions/b;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -131,7 +132,7 @@
 
     const-wide p1, 0x7fffffffffffffffL
 
-    iput-wide p1, p0, Lrx/internal/a/n$a;->cob:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->cnv:J
 
     new-instance p1, Lrx/internal/util/a/f;
 
@@ -139,10 +140,9 @@
 
     invoke-direct {p1, p2}, Lrx/internal/util/a/f;-><init>(I)V
 
-    :goto_0
     iput-object p1, p0, Lrx/internal/a/n$a;->queue:Ljava/util/Queue;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     shr-int/lit8 p1, p3, 0x2
@@ -151,9 +151,9 @@
 
     int-to-long p1, p1
 
-    iput-wide p1, p0, Lrx/internal/a/n$a;->cob:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->cnv:J
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result p1
 
@@ -163,6 +163,8 @@
 
     invoke-direct {p1, p3}, Lrx/internal/util/b/q;-><init>(I)V
 
+    iput-object p1, p0, Lrx/internal/a/n$a;->queue:Ljava/util/Queue;
+
     goto :goto_0
 
     :cond_1
@@ -170,9 +172,9 @@
 
     invoke-direct {p1, p3}, Lrx/internal/util/a/d;-><init>(I)V
 
-    goto :goto_0
+    iput-object p1, p0, Lrx/internal/a/n$a;->queue:Ljava/util/Queue;
 
-    :goto_1
+    :goto_0
     int-to-long p1, p3
 
     invoke-virtual {p0, p1, p2}, Lrx/internal/a/n$a;->request(J)V
@@ -204,7 +206,7 @@
 
     invoke-interface {p4}, Ljava/util/Queue;->clear()V
 
-    iput-object v1, p0, Lrx/internal/a/n$a;->coc:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->cnw:Ljava/util/Iterator;
 
     return v2
 
@@ -231,7 +233,7 @@
 
     invoke-interface {p4}, Ljava/util/Queue;->clear()V
 
-    iput-object v1, p0, Lrx/internal/a/n$a;->coc:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->cnw:Ljava/util/Iterator;
 
     invoke-virtual {p3, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -253,7 +255,7 @@
 
 # virtual methods
 .method final drain()V
-    .locals 16
+    .locals 17
 
     move-object/from16 v1, p0
 
@@ -276,7 +278,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, v1, Lrx/internal/a/n$a;->coc:Ljava/util/Iterator;
+    iget-object v0, v1, Lrx/internal/a/n$a;->cnw:Ljava/util/Iterator;
 
     const-wide/16 v6, 0x1
 
@@ -284,7 +286,7 @@
 
     const/4 v10, 0x0
 
-    if-nez v0, :cond_5
+    if-nez v0, :cond_6
 
     iget-boolean v11, v1, Lrx/internal/a/n$a;->done:Z
 
@@ -319,7 +321,7 @@
 
     move v15, v5
 
-    iget-wide v4, v1, Lrx/internal/a/n$a;->cob:J
+    iget-wide v4, v1, Lrx/internal/a/n$a;->cnv:J
 
     cmp-long v0, v13, v4
 
@@ -336,7 +338,7 @@
 
     :goto_2
     :try_start_0
-    iget-object v0, v1, Lrx/internal/a/n$a;->cnK:Lrx/functions/b;
+    iget-object v0, v1, Lrx/internal/a/n$a;->cne:Lrx/functions/b;
 
     invoke-static {v12}, Lrx/internal/a/g;->cf(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -358,9 +360,9 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    if-eqz v4, :cond_d
+    if-eqz v4, :cond_e
 
-    iput-object v0, v1, Lrx/internal/a/n$a;->coc:Ljava/util/Iterator;
+    iput-object v0, v1, Lrx/internal/a/n$a;->cnw:Ljava/util/Iterator;
 
     goto :goto_3
 
@@ -371,13 +373,18 @@
 
     invoke-virtual {v1, v0}, Lrx/internal/a/n$a;->onError(Ljava/lang/Throwable;)V
 
-    goto :goto_5
+    goto/16 :goto_5
 
     :cond_5
     move v15, v5
 
+    goto :goto_3
+
+    :cond_6
+    move v15, v5
+
     :goto_3
-    if-eqz v0, :cond_e
+    if-eqz v0, :cond_f
 
     iget-object v4, v1, Lrx/internal/a/n$a;->requested:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -385,60 +392,58 @@
 
     move-result-wide v4
 
-    move-wide v11, v8
-
-    :cond_6
-    const/4 v13, 0x0
-
-    cmp-long v14, v11, v4
-
-    if-eqz v14, :cond_9
-
-    iget-boolean v14, v1, Lrx/internal/a/n$a;->done:Z
-
-    invoke-direct {v1, v14, v10, v2, v3}, Lrx/internal/a/n$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-
-    move-result v14
-
-    if-eqz v14, :cond_7
-
-    return-void
+    move-wide v12, v8
 
     :cond_7
-    :try_start_1
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    const/4 v14, 0x0
 
-    move-result-object v14
-    :try_end_1
-    .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1
+    cmp-long v16, v12, v4
 
-    invoke-virtual {v2, v14}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
+    if-eqz v16, :cond_a
 
-    iget-boolean v14, v1, Lrx/internal/a/n$a;->done:Z
+    iget-boolean v11, v1, Lrx/internal/a/n$a;->done:Z
 
-    invoke-direct {v1, v14, v10, v2, v3}, Lrx/internal/a/n$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+    invoke-direct {v1, v11, v10, v2, v3}, Lrx/internal/a/n$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
 
-    move-result v14
+    move-result v11
 
-    if-eqz v14, :cond_8
+    if-eqz v11, :cond_8
 
     return-void
 
     :cond_8
-    const/4 v14, 0x0
+    :try_start_1
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    add-long/2addr v11, v6
+    move-result-object v11
+    :try_end_1
+    .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_2
+
+    invoke-virtual {v2, v11}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
+
+    iget-boolean v11, v1, Lrx/internal/a/n$a;->done:Z
+
+    invoke-direct {v1, v11, v10, v2, v3}, Lrx/internal/a/n$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+
+    move-result v11
+
+    if-eqz v11, :cond_9
+
+    return-void
+
+    :cond_9
+    add-long/2addr v12, v6
 
     :try_start_2
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v14
+    move-result v11
     :try_end_2
     .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_1
 
-    if-nez v14, :cond_6
+    if-nez v11, :cond_7
 
-    iput-object v13, v1, Lrx/internal/a/n$a;->coc:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->cnw:Ljava/util/Iterator;
 
     goto :goto_4
 
@@ -449,19 +454,32 @@
 
     invoke-static {v6}, Lrx/a/b;->C(Ljava/lang/Throwable;)V
 
-    iput-object v13, v1, Lrx/internal/a/n$a;->coc:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->cnw:Ljava/util/Iterator;
 
     invoke-virtual {v1, v6}, Lrx/internal/a/n$a;->onError(Ljava/lang/Throwable;)V
 
     goto :goto_4
 
-    :cond_9
-    move-object v13, v0
+    :catch_2
+    move-exception v0
+
+    move-object v6, v0
+
+    invoke-static {v6}, Lrx/a/b;->C(Ljava/lang/Throwable;)V
+
+    iput-object v14, v1, Lrx/internal/a/n$a;->cnw:Ljava/util/Iterator;
+
+    invoke-virtual {v1, v6}, Lrx/internal/a/n$a;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_4
+
+    :cond_a
+    move-object v14, v0
 
     :goto_4
-    cmp-long v0, v11, v4
+    cmp-long v0, v12, v4
 
-    if-nez v0, :cond_b
+    if-nez v0, :cond_c
 
     iget-boolean v0, v1, Lrx/internal/a/n$a;->done:Z
 
@@ -469,48 +487,46 @@
 
     move-result v4
 
-    if-eqz v4, :cond_a
+    if-eqz v4, :cond_b
 
-    if-nez v13, :cond_a
+    if-nez v14, :cond_b
 
     const/4 v10, 0x1
 
-    :cond_a
+    :cond_b
     invoke-direct {v1, v0, v10, v2, v3}, Lrx/internal/a/n$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_c
 
     return-void
 
-    :cond_b
-    cmp-long v0, v11, v8
+    :cond_c
+    cmp-long v0, v12, v8
 
-    if-eqz v0, :cond_c
+    if-eqz v0, :cond_d
 
     iget-object v0, v1, Lrx/internal/a/n$a;->requested:Ljava/util/concurrent/atomic/AtomicLong;
 
-    invoke-static {v0, v11, v12}, Lrx/internal/a/a;->b(Ljava/util/concurrent/atomic/AtomicLong;J)J
+    invoke-static {v0, v12, v13}, Lrx/internal/a/a;->b(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    :cond_c
-    if-eqz v13, :cond_d
+    :cond_d
+    if-eqz v14, :cond_e
 
     goto :goto_6
 
-    :cond_d
+    :cond_e
     :goto_5
     move v5, v15
 
     goto/16 :goto_0
 
-    :cond_e
+    :cond_f
     :goto_6
     iget-object v0, v1, Lrx/internal/a/n$a;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    move v4, v15
-
-    neg-int v4, v4
+    neg-int v4, v15
 
     invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
 
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 d61ae43443..9e60e10323 100644
--- a/com.discord/smali_classes2/rx/internal/a/n$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/n$b;
 .super Ljava/lang/Object;
+.source "OnSubscribeFlattenIterable.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -30,7 +31,7 @@
 
 
 # instance fields
-.field final cnK:Lrx/functions/b;
+.field final cne:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -67,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;->cnK:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$b;->cne:Lrx/functions/b;
 
     return-void
 .end method
@@ -80,7 +81,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/n$b;->cnK:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/n$b;->cne: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 8b6f2796c5..60294628c1 100644
--- a/com.discord/smali_classes2/rx/internal/a/n.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/n;
 .super Ljava/lang/Object;
+.source "OnSubscribeFlattenIterable.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -28,7 +29,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -37,7 +38,7 @@
     .end annotation
 .end field
 
-.field final cnK:Lrx/functions/b;
+.field final cne:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -48,7 +49,7 @@
     .end annotation
 .end field
 
-.field final cnL:I
+.field final cnf:I
 
 
 # direct methods
@@ -68,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/n;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/n;->cnd:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/n;->cnK:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n;->cne:Lrx/functions/b;
 
-    iput p3, p0, Lrx/internal/a/n;->cnL:I
+    iput p3, p0, Lrx/internal/a/n;->cnf:I
 
     return-void
 .end method
@@ -103,7 +104,7 @@
 
     check-cast p0, Lrx/internal/util/k;
 
-    iget-object p0, p0, Lrx/internal/util/k;->ctK:Ljava/lang/Object;
+    iget-object p0, p0, Lrx/internal/util/k;->cte:Ljava/lang/Object;
 
     new-instance p2, Lrx/internal/a/n$b;
 
@@ -136,9 +137,9 @@
 
     new-instance v0, Lrx/internal/a/n$a;
 
-    iget-object v1, p0, Lrx/internal/a/n;->cnK:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/n;->cne:Lrx/functions/b;
 
-    iget v2, p0, Lrx/internal/a/n;->cnL:I
+    iget v2, p0, Lrx/internal/a/n;->cnf:I
 
     invoke-direct {v0, p1, v1, v2}, Lrx/internal/a/n$a;-><init>(Lrx/Subscriber;Lrx/functions/b;I)V
 
@@ -150,7 +151,7 @@
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object p1, p0, Lrx/internal/a/n;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/n;->cnd: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 e7dbb0ee86..0edf274cdd 100644
--- a/com.discord/smali_classes2/rx/internal/a/o$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/o$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/o$a;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OnSubscribeFromArray.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -71,7 +72,7 @@
     return-void
 .end method
 
-.method private KZ()V
+.method private KY()V
     .locals 6
 
     iget-object v0, p0, Lrx/internal/a/o$a;->child:Lrx/Subscriber;
@@ -130,46 +131,45 @@
 
     const-wide/16 v4, 0x0
 
-    :cond_0
     move-wide v6, v4
 
-    :cond_1
+    :cond_0
     :goto_0
     cmp-long v8, p1, v4
 
-    if-eqz v8, :cond_5
+    if-eqz v8, :cond_4
 
-    if-eq v3, v2, :cond_5
+    if-eq v3, v2, :cond_4
 
     invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
 
     move-result v8
 
-    if-eqz v8, :cond_2
+    if-eqz v8, :cond_1
 
     return-void
 
-    :cond_2
+    :cond_1
     aget-object v8, v1, v3
 
     invoke-virtual {v0, v8}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
     add-int/lit8 v3, v3, 0x1
 
-    if-ne v3, v2, :cond_4
+    if-ne v3, v2, :cond_3
 
     invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
 
     move-result p1
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_2
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
-    :cond_3
+    :cond_2
     return-void
 
-    :cond_4
+    :cond_3
     const-wide/16 v8, 0x1
 
     sub-long/2addr p1, v8
@@ -178,7 +178,7 @@
 
     goto :goto_0
 
-    :cond_5
+    :cond_4
     invoke-virtual {p0}, Lrx/internal/a/o$a;->get()J
 
     move-result-wide p1
@@ -187,7 +187,7 @@
 
     cmp-long v8, p1, v4
 
-    if-nez v8, :cond_1
+    if-nez v8, :cond_0
 
     iput v3, p0, Lrx/internal/a/o$a;->index:I
 
@@ -197,9 +197,14 @@
 
     cmp-long v6, p1, v4
 
-    if-nez v6, :cond_0
+    if-nez v6, :cond_5
 
     return-void
+
+    :cond_5
+    move-wide v6, v4
+
+    goto :goto_0
 .end method
 
 
@@ -227,7 +232,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-direct {p0}, Lrx/internal/a/o$a;->KZ()V
+    invoke-direct {p0}, Lrx/internal/a/o$a;->KY()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/rx/internal/a/o.smali b/com.discord/smali_classes2/rx/internal/a/o.smali
index dd684de5e5..af49663ea0 100644
--- a/com.discord/smali_classes2/rx/internal/a/o.smali
+++ b/com.discord/smali_classes2/rx/internal/a/o.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/o;
 .super Ljava/lang/Object;
+.source "OnSubscribeFromArray.java"
 
 # interfaces
 .implements Lrx/Observable$a;
diff --git a/com.discord/smali_classes2/rx/internal/a/p$a.smali b/com.discord/smali_classes2/rx/internal/a/p$a.smali
index 78d21346db..c4fda45d0b 100644
--- a/com.discord/smali_classes2/rx/internal/a/p$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/p$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/p$a;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OnSubscribeFromIterable.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -160,6 +161,8 @@
 
     invoke-static {p2, p1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
+    return-void
+
     :cond_3
     return-void
 
@@ -182,11 +185,10 @@
 
     move-wide v4, p1
 
-    :goto_0
     move-wide p1, v0
 
     :cond_5
-    :goto_1
+    :goto_0
     cmp-long v6, p1, v4
 
     if-eqz v6, :cond_8
@@ -237,7 +239,7 @@
 
     add-long/2addr p1, v6
 
-    goto :goto_1
+    goto :goto_0
 
     :catch_2
     move-exception p1
@@ -270,6 +272,8 @@
 
     if-eqz p1, :cond_9
 
+    move-wide p1, v0
+
     goto :goto_0
 
     :cond_9
diff --git a/com.discord/smali_classes2/rx/internal/a/p.smali b/com.discord/smali_classes2/rx/internal/a/p.smali
index a6e86562bf..ee3630b67f 100644
--- a/com.discord/smali_classes2/rx/internal/a/p.smali
+++ b/com.discord/smali_classes2/rx/internal/a/p.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/p;
 .super Ljava/lang/Object;
+.source "OnSubscribeFromIterable.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field final cod:Ljava/lang/Iterable;
+.field final cnx:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -50,7 +51,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lrx/internal/a/p;->cod:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/p;->cnx:Ljava/lang/Iterable;
 
     return-void
 
@@ -72,7 +73,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/p;->cod:Ljava/lang/Iterable;
+    iget-object v0, p0, Lrx/internal/a/p;->cnx: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 b0694fc313..83350a2dc6 100644
--- a/com.discord/smali_classes2/rx/internal/a/q.smali
+++ b/com.discord/smali_classes2/rx/internal/a/q.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/q;
 .super Ljava/lang/Object;
+.source "OnSubscribeLift.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -21,7 +22,7 @@
 
 
 # instance fields
-.field final coe:Lrx/Observable$a;
+.field final cny:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -30,7 +31,7 @@
     .end annotation
 .end field
 
-.field final cof:Lrx/Observable$b;
+.field final cnz:Lrx/Observable$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$b<",
@@ -55,9 +56,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/q;->coe:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/q;->cny:Lrx/Observable$a;
 
-    iput-object p2, p0, Lrx/internal/a/q;->cof:Lrx/Observable$b;
+    iput-object p2, p0, Lrx/internal/a/q;->cnz:Lrx/Observable$b;
 
     return-void
 .end method
@@ -70,7 +71,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/q;->cof:Lrx/Observable$b;
+    iget-object v0, p0, Lrx/internal/a/q;->cnz:Lrx/Observable$b;
 
     invoke-static {v0}, Lrx/c/c;->b(Lrx/Observable$b;)Lrx/Observable$b;
 
@@ -87,7 +88,7 @@
     :try_start_1
     invoke-virtual {v0}, Lrx/Subscriber;->onStart()V
 
-    iget-object v1, p0, Lrx/internal/a/q;->coe:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/internal/a/q;->cny: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 9af7eab58a..0f8d40e565 100644
--- a/com.discord/smali_classes2/rx/internal/a/r$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/r$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/r$a;
 .super Lrx/Subscriber;
+.source "OnSubscribeMap.java"
 
 
 # annotations
@@ -35,7 +36,7 @@
     .end annotation
 .end field
 
-.field final cnK:Lrx/functions/b;
+.field final cne:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -64,7 +65,7 @@
 
     iput-object p1, p0, Lrx/internal/a/r$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/r$a;->cnK:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r$a;->cne:Lrx/functions/b;
 
     return-void
 .end method
@@ -120,17 +121,17 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/r$a;->cnK:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/r$a;->cne:Lrx/functions/b;
 
     invoke-interface {v0, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p1
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object p1, p0, Lrx/internal/a/r$a;->actual:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/r$a;->actual:Lrx/Subscriber;
 
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
     return-void
 
diff --git a/com.discord/smali_classes2/rx/internal/a/r.smali b/com.discord/smali_classes2/rx/internal/a/r.smali
index fe88ef5399..255c0261fe 100644
--- a/com.discord/smali_classes2/rx/internal/a/r.smali
+++ b/com.discord/smali_classes2/rx/internal/a/r.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/r;
 .super Ljava/lang/Object;
+.source "OnSubscribeMap.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -27,16 +28,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field final cog:Lrx/functions/b;
+.field final cnA:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -45,6 +37,15 @@
     .end annotation
 .end field
 
+.field final cnd:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lrx/functions/b;)V
@@ -61,9 +62,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/r;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/r;->cnd:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/r;->cog:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r;->cnA:Lrx/functions/b;
 
     return-void
 .end method
@@ -77,13 +78,13 @@
 
     new-instance v0, Lrx/internal/a/r$a;
 
-    iget-object v1, p0, Lrx/internal/a/r;->cog:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/r;->cnA: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;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/r;->cnd: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 e14519380b..346d9e909e 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$1$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -28,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic col:Lrx/internal/a/s$1;
+.field final synthetic cnF: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;->col:Lrx/internal/a/s$1;
+    iput-object p1, p0, Lrx/internal/a/s$1$1;->cnF:Lrx/internal/a/s$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +48,7 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-static {}, Lrx/d;->Kw()Lrx/d;
+    invoke-static {}, Lrx/d;->Kv()Lrx/d;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$1.smali b/com.discord/smali_classes2/rx/internal/a/s$1.smali
index 0d563d9f9f..26ead5d9d8 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
 
 # interfaces
 .implements Lrx/functions/b;
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 ae8ee92530..c4ce61c018 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$2$1;
 .super Lrx/Subscriber;
+.source "OnSubscribeRedo.java"
 
 
 # annotations
@@ -21,7 +22,7 @@
 
 
 # instance fields
-.field final synthetic cos:Lrx/internal/a/s$2;
+.field final synthetic cnM:Lrx/internal/a/s$2;
 
 .field done:Z
 
@@ -30,7 +31,7 @@
 .method constructor <init>(Lrx/internal/a/s$2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$2$1;->cos:Lrx/internal/a/s$2;
+    iput-object p1, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -52,11 +53,11 @@
 
     invoke-virtual {p0}, Lrx/internal/a/s$2$1;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->cos:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->con:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->cnH:Lrx/subjects/Subject;
 
-    invoke-static {}, Lrx/d;->Kx()Lrx/d;
+    invoke-static {}, Lrx/d;->Kw()Lrx/d;
 
     move-result-object v1
 
@@ -79,9 +80,9 @@
 
     invoke-virtual {p0}, Lrx/internal/a/s$2$1;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->cos:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->con:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->cnH:Lrx/subjects/Subject;
 
     invoke-static {p1}, Lrx/d;->z(Ljava/lang/Throwable;)Lrx/d;
 
@@ -105,16 +106,16 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->cos:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$2;->cnG: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;->cos:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->cop:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -128,9 +129,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$2$1;->cos:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->cop:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
     sub-long v2, v0, v4
 
@@ -141,9 +142,9 @@
     if-eqz p1, :cond_0
 
     :cond_1
-    iget-object p1, p0, Lrx/internal/a/s$2$1;->cos:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->coo:Lrx/internal/b/a;
+    iget-object p1, p1, Lrx/internal/a/s$2;->cnI:Lrx/internal/b/a;
 
     invoke-virtual {p1, v4, v5}, Lrx/internal/b/a;->bt(J)V
 
@@ -154,9 +155,9 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->cos:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->cnM:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->coo:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/s$2;->cnI: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 dd6703631e..1deced4dbe 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$2;
 .super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,34 +18,34 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic con:Lrx/subjects/Subject;
+.field final synthetic cnH:Lrx/subjects/Subject;
 
-.field final synthetic coo:Lrx/internal/b/a;
+.field final synthetic cnI:Lrx/internal/b/a;
 
-.field final synthetic cop:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic coq:Lrx/subscriptions/SerialSubscription;
+.field final synthetic cnK:Lrx/subscriptions/SerialSubscription;
 
-.field final synthetic cor:Lrx/internal/a/s;
+.field final synthetic cnL: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;->cor:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$2;->cnL:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$2;->com:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/s$2;->cnG:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/s$2;->con:Lrx/subjects/Subject;
+    iput-object p3, p0, Lrx/internal/a/s$2;->cnH:Lrx/subjects/Subject;
 
-    iput-object p4, p0, Lrx/internal/a/s$2;->coo:Lrx/internal/b/a;
+    iput-object p4, p0, Lrx/internal/a/s$2;->cnI:Lrx/internal/b/a;
 
-    iput-object p5, p0, Lrx/internal/a/s$2;->cop:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p5, p0, Lrx/internal/a/s$2;->cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p6, p0, Lrx/internal/a/s$2;->coq:Lrx/subscriptions/SerialSubscription;
+    iput-object p6, p0, Lrx/internal/a/s$2;->cnK:Lrx/subscriptions/SerialSubscription;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,7 +57,7 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/s$2;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$2;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -71,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;->coq:Lrx/subscriptions/SerialSubscription;
+    iget-object v1, p0, Lrx/internal/a/s$2;->cnK:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->f(Lrx/Subscription;)V
 
-    iget-object v1, p0, Lrx/internal/a/s$2;->cor:Lrx/internal/a/s;
+    iget-object v1, p0, Lrx/internal/a/s$2;->cnL:Lrx/internal/a/s;
 
-    iget-object v1, v1, Lrx/internal/a/s;->cnJ:Lrx/Observable;
+    iget-object v1, v1, Lrx/internal/a/s;->cnd: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 e27eb18df5..f00d4e7873 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$3$1;
 .super Lrx/Subscriber;
+.source "OnSubscribeRedo.java"
 
 
 # annotations
@@ -22,18 +23,18 @@
 
 
 # instance fields
-.field final synthetic cot:Lrx/Subscriber;
+.field final synthetic cnN:Lrx/Subscriber;
 
-.field final synthetic cou:Lrx/internal/a/s$3;
+.field final synthetic cnO: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;->cou:Lrx/internal/a/s$3;
+    iput-object p1, p0, Lrx/internal/a/s$3$1;->cnO:Lrx/internal/a/s$3;
 
-    iput-object p3, p0, Lrx/internal/a/s$3$1;->cot:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$3$1;->cnN:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -45,7 +46,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->cot:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->cnN:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -55,7 +56,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->cot:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->cnN:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -67,9 +68,9 @@
 
     check-cast p1, Lrx/d;
 
-    iget-object v0, p1, Lrx/d;->cmQ:Lrx/d$a;
+    iget-object v0, p1, Lrx/d;->cmk:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->cmU:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->cmo:Lrx/d$a;
 
     if-ne v0, v1, :cond_0
 
@@ -83,36 +84,36 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->cou:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->cnO:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->cor:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->cnL:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->coi:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->cnC:Z
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$3$1;->cot:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/s$3$1;->cnN:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
 
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lrx/d;->Kz()Z
+    invoke-virtual {p1}, Lrx/d;->Ky()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->cou:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->cnO:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->cor:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->cnL:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->coj:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->cnD:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->cot:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->cnN:Lrx/Subscriber;
 
     iget-object p1, p1, Lrx/d;->throwable:Ljava/lang/Throwable;
 
@@ -121,7 +122,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->cot:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->cnN: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 373f05f8d7..72b30c5074 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$3;
 .super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
 
 # interfaces
 .implements Lrx/Observable$b;
@@ -28,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic cor:Lrx/internal/a/s;
+.field final synthetic cnL: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;->cor:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$3;->cnL: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 879e99d59a..b22606056a 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$4$1;
 .super Lrx/Subscriber;
+.source "OnSubscribeRedo.java"
 
 
 # annotations
@@ -22,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic coy:Lrx/internal/a/s$4;
+.field final synthetic cnS: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;->coy:Lrx/internal/a/s$4;
+    iput-object p1, p0, Lrx/internal/a/s$4$1;->cnS:Lrx/internal/a/s$4;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -41,9 +42,9 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$4$1;->coy:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->cnS:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -53,9 +54,9 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$4$1;->coy:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->cnS:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->com:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -65,9 +66,9 @@
 .method public final onNext(Ljava/lang/Object;)V
     .locals 4
 
-    iget-object p1, p0, Lrx/internal/a/s$4$1;->coy:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->cnS:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->com:Lrx/Subscriber;
+    iget-object p1, p1, Lrx/internal/a/s$4;->cnG:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -75,9 +76,9 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$4$1;->coy:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->cnS:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->cop:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$4;->cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -89,22 +90,22 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lrx/internal/a/s$4$1;->coy:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->cnS: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;->coy:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->cnS:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->cow:Lrx/functions/Action0;
+    iget-object v0, v0, Lrx/internal/a/s$4;->cnQ: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;->coy:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->cnS:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->cox:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p1, Lrx/internal/a/s$4;->cnR: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 f613a52418..5bddc34954 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$4.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$4.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$4;
 .super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,17 +18,17 @@
 
 
 # instance fields
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic cop:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic cor:Lrx/internal/a/s;
+.field final synthetic cnL:Lrx/internal/a/s;
 
-.field final synthetic cov:Lrx/Observable;
+.field final synthetic cnP:Lrx/Observable;
 
-.field final synthetic cow:Lrx/functions/Action0;
+.field final synthetic cnQ:Lrx/functions/Action0;
 
-.field final synthetic cox:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic cnR:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -36,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;->cor:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$4;->cnL:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$4;->cov:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/s$4;->cnP:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/s$4;->com:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$4;->cnG:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/s$4;->cop:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p4, p0, Lrx/internal/a/s$4;->cnJ: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;->cow:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$4;->cnQ:Lrx/functions/Action0;
 
-    iput-object p7, p0, Lrx/internal/a/s$4;->cox:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p7, p0, Lrx/internal/a/s$4;->cnR:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,11 +61,11 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/s$4;->cov:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/s$4;->cnP:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/s$4$1;
 
-    iget-object v2, p0, Lrx/internal/a/s$4;->com:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/s$4;->cnG: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 9b97a0d4ec..942c21c6da 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$5.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$5.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/s$5;
 .super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -17,15 +18,15 @@
 
 
 # instance fields
-.field final synthetic coo:Lrx/internal/b/a;
+.field final synthetic cnI:Lrx/internal/b/a;
 
-.field final synthetic cop:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic cor:Lrx/internal/a/s;
+.field final synthetic cnL:Lrx/internal/a/s;
 
-.field final synthetic cow:Lrx/functions/Action0;
+.field final synthetic cnQ:Lrx/functions/Action0;
 
-.field final synthetic cox:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic cnR:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -34,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;->cor:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$5;->cnL:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$5;->cop:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p2, p0, Lrx/internal/a/s$5;->cnJ:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/s$5;->coo:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/s$5;->cnI:Lrx/internal/b/a;
 
-    iput-object p4, p0, Lrx/internal/a/s$5;->cox:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p4, p0, Lrx/internal/a/s$5;->cnR: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;->cow:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$5;->cnQ:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,15 +63,15 @@
 
     if-lez v2, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/s$5;->cop:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/s$5;->cnJ: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;->coo:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/s$5;->cnI: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;->cox:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/s$5;->cnR:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 p2, 0x1
 
@@ -84,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;->cow:Lrx/functions/Action0;
+    iget-object p2, p0, Lrx/internal/a/s$5;->cnQ: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 a8022a1913..83d43d87d5 100644
--- a/com.discord/smali_classes2/rx/internal/a/s.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/s;
 .super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -19,7 +20,7 @@
 
 
 # static fields
-.field static final cok:Lrx/functions/b;
+.field static final cnE:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -35,16 +36,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field private final coh:Lrx/functions/b;
+.field private final cnB:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -59,9 +51,18 @@
     .end annotation
 .end field
 
-.field final coi:Z
+.field final cnC:Z
 
-.field final coj:Z
+.field final cnD:Z
+
+.field final cnd:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
 
 .field private final scheduler:Lrx/Scheduler;
 
@@ -74,7 +75,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/s$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/s;->cok:Lrx/functions/b;
+    sput-object v0, Lrx/internal/a/s;->cnE:Lrx/functions/b;
 
     return-void
 .end method
@@ -101,13 +102,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/s;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/s;->cnd:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/s;->coh:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/s;->cnB:Lrx/functions/b;
 
-    iput-boolean p3, p0, Lrx/internal/a/s;->coi:Z
+    iput-boolean p3, p0, Lrx/internal/a/s;->cnC:Z
 
-    iput-boolean p4, p0, Lrx/internal/a/s;->coj:Z
+    iput-boolean p4, p0, Lrx/internal/a/s;->cnD:Z
 
     iput-object p5, p0, Lrx/internal/a/s;->scheduler:Lrx/Scheduler;
 
@@ -138,7 +139,7 @@
 
     new-instance v6, Lrx/internal/a/s;
 
-    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mf()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -185,7 +186,7 @@
 
     new-instance v6, Lrx/internal/a/s;
 
-    invoke-static {}, Lrx/d/a;->Mg()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Mf()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -227,7 +228,7 @@
 
     iget-object v0, p0, Lrx/internal/a/s;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v10
 
@@ -239,7 +240,7 @@
 
     invoke-virtual {p1, v6}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mk()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Mj()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -265,7 +266,7 @@
     move-object v7, v1
 
     :goto_0
-    invoke-static {}, Lrx/observers/a;->LR()Lrx/e;
+    invoke-static {}, Lrx/observers/a;->LQ()Lrx/e;
 
     move-result-object v0
 
@@ -295,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;->coh:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/s;->cnB: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 f1b6c83693..9b0e56e004 100644
--- a/com.discord/smali_classes2/rx/internal/a/t$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/t$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeRefCount.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -26,22 +27,22 @@
 
 
 # instance fields
-.field final synthetic coC:Lrx/Subscriber;
+.field final synthetic cnW:Lrx/Subscriber;
 
-.field final synthetic coD:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic cnX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic coE:Lrx/internal/a/t;
+.field final synthetic cnY: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;->coE:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$1;->cnY:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$1;->coC:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/t$1;->cnW:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/t$1;->coD:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p3, p0, Lrx/internal/a/t$1;->cnX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,31 +59,31 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/t$1;->coE:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->cnY:Lrx/internal/a/t;
 
-    iget-object v1, v1, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, v1, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/t$1;->coE:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->cnY:Lrx/internal/a/t;
 
-    iget-object v1, p0, Lrx/internal/a/t$1;->coC:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/t$1;->cnW:Lrx/Subscriber;
 
-    iget-object v2, p0, Lrx/internal/a/t$1;->coE:Lrx/internal/a/t;
+    iget-object v2, p0, Lrx/internal/a/t$1;->cnY:Lrx/internal/a/t;
 
-    iget-object v2, v2, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, v2, Lrx/internal/a/t;->cnU: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;->coE:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->cnY: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;->coD:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/t$1;->cnX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -91,13 +92,13 @@
     :catchall_0
     move-exception p1
 
-    iget-object v1, p0, Lrx/internal/a/t$1;->coE:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->cnY: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;->coD:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lrx/internal/a/t$1;->cnX: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 26d1cef795..9715767d15 100644
--- a/com.discord/smali_classes2/rx/internal/a/t$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/t$2;
 .super Lrx/Subscriber;
+.source "OnSubscribeRefCount.java"
 
 
 # annotations
@@ -21,22 +22,22 @@
 
 
 # instance fields
-.field final synthetic coC:Lrx/Subscriber;
+.field final synthetic cnW:Lrx/Subscriber;
 
-.field final synthetic coE:Lrx/internal/a/t;
+.field final synthetic cnY:Lrx/internal/a/t;
 
-.field final synthetic coF:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic cnZ: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;->coE:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
-    iput-object p3, p0, Lrx/internal/a/t$2;->coC:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/t$2;->cnW:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/t$2;->coF:Lrx/subscriptions/CompositeSubscription;
+    iput-object p4, p0, Lrx/internal/a/t$2;->cnZ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -46,22 +47,22 @@
 .method private cleanup()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY: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;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$2;->coF:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$2;->cnZ:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -71,7 +72,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -82,23 +83,23 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY: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;->coA:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->coB:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->cnV:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v1, 0x0
 
@@ -107,7 +108,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_1
-    iget-object v0, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
     iget-object v0, v0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -118,7 +119,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/t$2;->coE:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$2;->cnY:Lrx/internal/a/t;
 
     iget-object v1, v1, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -134,7 +135,7 @@
 
     invoke-direct {p0}, Lrx/internal/a/t$2;->cleanup()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -146,7 +147,7 @@
 
     invoke-direct {p0}, Lrx/internal/a/t$2;->cleanup()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -161,7 +162,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->cnW: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 d8f8795ea6..9487fb53a8 100644
--- a/com.discord/smali_classes2/rx/internal/a/t$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/t$3;
 .super Ljava/lang/Object;
+.source "OnSubscribeRefCount.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic coE:Lrx/internal/a/t;
+.field final synthetic cnY:Lrx/internal/a/t;
 
-.field final synthetic coG:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic coa: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;->coE:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$3;->cnY:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$3;->coG:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/a/t$3;->coa:Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,24 +41,24 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY: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;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$3;->coG:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$3;->coa:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->coB:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->cnV:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
 
@@ -65,7 +66,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -75,7 +76,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -86,24 +87,24 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/t$3;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY: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;->coA:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->cnU: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;->coE:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->cnY:Lrx/internal/a/t;
 
     iget-object v0, v0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -114,7 +115,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/t$3;->coE:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$3;->cnY: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 8c886cc571..e79fea3542 100644
--- a/com.discord/smali_classes2/rx/internal/a/t.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/t;
 .super Ljava/lang/Object;
+.source "OnSubscribeRefCount.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -19,11 +20,7 @@
 
 
 # instance fields
-.field volatile coA:Lrx/subscriptions/CompositeSubscription;
-
-.field final coB:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field private final coz:Lrx/b/b;
+.field private final cnT:Lrx/b/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/b/b<",
@@ -32,6 +29,10 @@
     .end annotation
 .end field
 
+.field volatile cnU:Lrx/subscriptions/CompositeSubscription;
+
+.field final cnV:Ljava/util/concurrent/atomic/AtomicInteger;
+
 .field final lock:Ljava/util/concurrent/locks/ReentrantLock;
 
 
@@ -52,7 +53,7 @@
 
     invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -60,7 +61,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lrx/internal/a/t;->coB:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/a/t;->cnV:Ljava/util/concurrent/atomic/AtomicInteger;
 
     new-instance v0, Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -68,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;->coz:Lrx/b/b;
+    iput-object p1, p0, Lrx/internal/a/t;->cnT:Lrx/b/b;
 
     return-void
 .end method
@@ -76,7 +77,7 @@
 .method static synthetic a(Lrx/internal/a/t;)Lrx/b/b;
     .locals 0
 
-    iget-object p0, p0, Lrx/internal/a/t;->coz:Lrx/b/b;
+    iget-object p0, p0, Lrx/internal/a/t;->cnT:Lrx/b/b;
 
     return-object p0
 .end method
@@ -105,7 +106,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, p0, Lrx/internal/a/t;->coz:Lrx/b/b;
+    iget-object v0, p0, Lrx/internal/a/t;->cnT:Lrx/b/b;
 
     new-instance v1, Lrx/internal/a/t$2;
 
@@ -125,7 +126,7 @@
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
-    iget-object v0, p0, Lrx/internal/a/t;->coB:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/t;->cnV:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -140,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;->coz:Lrx/b/b;
+    iget-object v1, p0, Lrx/internal/a/t;->cnT:Lrx/b/b;
 
     new-instance v2, Lrx/internal/a/t$1;
 
@@ -156,11 +157,12 @@
 
     if-eqz p1, :cond_0
 
-    :goto_0
     iget-object p1, p0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
+    return-void
+
     :cond_0
     return-void
 
@@ -182,13 +184,17 @@
 
     :cond_2
     :try_start_1
-    iget-object v0, p0, Lrx/internal/a/t;->coA:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/a/t;->cnU:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p0, p1, v0}, Lrx/internal/a/t;->a(Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    goto :goto_0
+    iget-object p1, p0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    return-void
 
     :catchall_1
     move-exception p1
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 d928ee92d6..3f767b5e72 100644
--- a/com.discord/smali_classes2/rx/internal/a/u$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/u$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/u$1;
 .super Lrx/Subscriber;
+.source "OnSubscribeSingle.java"
 
 
 # annotations
@@ -21,11 +22,11 @@
 
 
 # instance fields
-.field private coI:Z
+.field private coc:Z
 
-.field private coJ:Z
+.field private cod:Z
 
-.field private coK:Ljava/lang/Object;
+.field private coe:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -33,18 +34,18 @@
     .end annotation
 .end field
 
-.field final synthetic coL:Lrx/g;
+.field final synthetic cof:Lrx/g;
 
-.field final synthetic coM:Lrx/internal/a/u;
+.field final synthetic cog: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;->coM:Lrx/internal/a/u;
+    iput-object p1, p0, Lrx/internal/a/u$1;->cog:Lrx/internal/a/u;
 
-    iput-object p2, p0, Lrx/internal/a/u$1;->coL:Lrx/g;
+    iput-object p2, p0, Lrx/internal/a/u$1;->cof:Lrx/g;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -56,24 +57,24 @@
 .method public final onCompleted()V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->coI:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->coc:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->coJ:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->cod:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/u$1;->coL:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->cof:Lrx/g;
 
-    iget-object v1, p0, Lrx/internal/a/u$1;->coK:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/u$1;->coe: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;->coL:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->cof:Lrx/g;
 
     new-instance v1, Ljava/util/NoSuchElementException;
 
@@ -90,7 +91,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/u$1;->coL:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->cof:Lrx/g;
 
     invoke-virtual {v0, p1}, Lrx/g;->onError(Ljava/lang/Throwable;)V
 
@@ -107,15 +108,15 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->coJ:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->cod:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/u$1;->coI:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->coc:Z
 
-    iget-object p1, p0, Lrx/internal/a/u$1;->coL:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/u$1;->cof:Lrx/g;
 
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
@@ -130,9 +131,9 @@
     return-void
 
     :cond_0
-    iput-boolean v1, p0, Lrx/internal/a/u$1;->coJ:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->cod:Z
 
-    iput-object p1, p0, Lrx/internal/a/u$1;->coK:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/u$1;->coe: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 207c977ea1..dabf504704 100644
--- a/com.discord/smali_classes2/rx/internal/a/u.smali
+++ b/com.discord/smali_classes2/rx/internal/a/u.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/u;
 .super Ljava/lang/Object;
+.source "OnSubscribeSingle.java"
 
 # interfaces
 .implements Lrx/f$a;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field private final coH:Lrx/Observable;
+.field private final cob:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -42,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/u;->coH:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/u;->cob:Lrx/Observable;
 
     return-void
 .end method
@@ -81,7 +82,7 @@
 
     invoke-virtual {p1, v0}, Lrx/g;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/u;->coH:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/u;->cob:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/v.smali b/com.discord/smali_classes2/rx/internal/a/v.smali
index 29fb499bfb..b7d7af7de9 100644
--- a/com.discord/smali_classes2/rx/internal/a/v.smali
+++ b/com.discord/smali_classes2/rx/internal/a/v.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/v;
 .super Ljava/lang/Object;
+.source "OnSubscribeThrow.java"
 
 # interfaces
 .implements Lrx/Observable$a;
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 54b0e5b57c..52242a640b 100644
--- a/com.discord/smali_classes2/rx/internal/a/w$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/w$a;
 .super Lrx/Subscriber;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
 
 
 # annotations
@@ -33,7 +34,7 @@
     .end annotation
 .end field
 
-.field final cnR:Lrx/internal/b/a;
+.field final cnl:Lrx/internal/b/a;
 
 
 # direct methods
@@ -53,7 +54,7 @@
 
     iput-object p1, p0, Lrx/internal/a/w$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/w$a;->cnR:Lrx/internal/b/a;
+    iput-object p2, p0, Lrx/internal/a/w$a;->cnl:Lrx/internal/b/a;
 
     return-void
 .end method
@@ -98,7 +99,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/w$a;->cnR:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$a;->cnl: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 e39258dcb3..2fced4d370 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/w$b$a;
 .super Ljava/lang/Object;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,20 +18,20 @@
 
 
 # instance fields
-.field final coT:J
+.field final con:J
 
-.field final synthetic coU:Lrx/internal/a/w$b;
+.field final synthetic coo: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;->coU:Lrx/internal/a/w$b;
+    iput-object p1, p0, Lrx/internal/a/w$b$a;->coo:Lrx/internal/a/w$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p2, p0, Lrx/internal/a/w$b$a;->coT:J
+    iput-wide p2, p0, Lrx/internal/a/w$b$a;->con:J
 
     return-void
 .end method
@@ -40,11 +41,11 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/w$b$a;->coU:Lrx/internal/a/w$b;
+    iget-object v0, p0, Lrx/internal/a/w$b$a;->coo:Lrx/internal/a/w$b;
 
-    iget-wide v1, p0, Lrx/internal/a/w$b$a;->coT:J
+    iget-wide v1, p0, Lrx/internal/a/w$b$a;->con:J
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/w$b;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide v4, 0x7fffffffffffffffL
 
@@ -56,7 +57,7 @@
 
     invoke-virtual {v0}, Lrx/internal/a/w$b;->unsubscribe()V
 
-    iget-object v1, v0, Lrx/internal/a/w$b;->coN:Lrx/Observable;
+    iget-object v1, v0, Lrx/internal/a/w$b;->coh:Lrx/Observable;
 
     if-nez v1, :cond_0
 
@@ -71,7 +72,7 @@
     return-void
 
     :cond_0
-    iget-wide v1, v0, Lrx/internal/a/w$b;->coS:J
+    iget-wide v1, v0, Lrx/internal/a/w$b;->com:J
 
     const-wide/16 v3, 0x0
 
@@ -79,7 +80,7 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->cnR:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->cnl:Lrx/internal/b/a;
 
     invoke-virtual {v3, v1, v2}, Lrx/internal/b/a;->bt(J)V
 
@@ -88,11 +89,11 @@
 
     iget-object v2, v0, Lrx/internal/a/w$b;->actual:Lrx/Subscriber;
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->cnR:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->cnl: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;->coR:Lrx/internal/d/a;
+    iget-object v2, v0, Lrx/internal/a/w$b;->col:Lrx/internal/d/a;
 
     invoke-virtual {v2, v1}, Lrx/internal/d/a;->b(Lrx/Subscription;)Z
 
@@ -100,7 +101,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v0, v0, Lrx/internal/a/w$b;->coN:Lrx/Observable;
+    iget-object v0, v0, Lrx/internal/a/w$b;->coh: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 abba08c401..2a1fbb7180 100644
--- a/com.discord/smali_classes2/rx/internal/a/w$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/w$b;
 .super Lrx/Subscriber;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
 
 
 # annotations
@@ -39,9 +40,9 @@
     .end annotation
 .end field
 
-.field final cnR:Lrx/internal/b/a;
+.field final cnl:Lrx/internal/b/a;
 
-.field final coN:Lrx/Observable;
+.field final coh:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -50,15 +51,15 @@
     .end annotation
 .end field
 
-.field final coO:Lrx/Scheduler$Worker;
+.field final coi:Lrx/Scheduler$Worker;
 
-.field final coP:Ljava/util/concurrent/atomic/AtomicLong;
+.field final coj:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final coQ:Lrx/internal/d/a;
+.field final cok:Lrx/internal/d/a;
 
-.field final coR:Lrx/internal/d/a;
+.field final col:Lrx/internal/d/a;
 
-.field coS:J
+.field com:J
 
 .field final timeout:J
 
@@ -88,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;->coO:Lrx/Scheduler$Worker;
+    iput-object p5, p0, Lrx/internal/a/w$b;->coi:Lrx/Scheduler$Worker;
 
-    iput-object p6, p0, Lrx/internal/a/w$b;->coN:Lrx/Observable;
+    iput-object p6, p0, Lrx/internal/a/w$b;->coh: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;->cnR:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->cnl: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;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/w$b;->coj: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;->coQ:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->cok: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;->coR:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->col: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;->coQ:Lrx/internal/d/a;
+    iget-object p1, p0, Lrx/internal/a/w$b;->cok:Lrx/internal/d/a;
 
     invoke-virtual {p0, p1}, Lrx/internal/a/w$b;->add(Lrx/Subscription;)V
 
@@ -130,9 +131,9 @@
 .method final bp(J)V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->coQ:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->cok:Lrx/internal/d/a;
 
-    iget-object v1, p0, Lrx/internal/a/w$b;->coO:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/w$b;->coi:Lrx/Scheduler$Worker;
 
     new-instance v2, Lrx/internal/a/w$b$a;
 
@@ -154,7 +155,7 @@
 .method public final onCompleted()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide v1, 0x7fffffffffffffffL
 
@@ -166,7 +167,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->coQ:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->cok:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
@@ -174,7 +175,7 @@
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->coO:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/w$b;->coi:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -185,7 +186,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide v1, 0x7fffffffffffffffL
 
@@ -197,7 +198,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->coQ:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->cok:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
@@ -205,7 +206,7 @@
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
-    iget-object p1, p0, Lrx/internal/a/w$b;->coO:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/w$b;->coi:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -225,7 +226,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -237,7 +238,7 @@
 
     if-eqz v4, :cond_2
 
-    iget-object v2, p0, Lrx/internal/a/w$b;->coP:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v2, p0, Lrx/internal/a/w$b;->coj:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide/16 v3, 0x1
 
@@ -252,7 +253,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/w$b;->coQ:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->cok:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->get()Ljava/lang/Object;
 
@@ -265,11 +266,11 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_1
-    iget-wide v0, p0, Lrx/internal/a/w$b;->coS:J
+    iget-wide v0, p0, Lrx/internal/a/w$b;->com:J
 
     add-long/2addr v0, v3
 
-    iput-wide v0, p0, Lrx/internal/a/w$b;->coS:J
+    iput-wide v0, p0, Lrx/internal/a/w$b;->com:J
 
     iget-object v0, p0, Lrx/internal/a/w$b;->actual:Lrx/Subscriber;
 
@@ -277,6 +278,8 @@
 
     invoke-virtual {p0, v5, v6}, Lrx/internal/a/w$b;->bp(J)V
 
+    return-void
+
     :cond_2
     :goto_0
     return-void
@@ -285,7 +288,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->cnR:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->cnl: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 ec8bef9543..ff84365142 100644
--- a/com.discord/smali_classes2/rx/internal/a/w.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/w;
 .super Ljava/lang/Object;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -26,7 +27,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +36,7 @@
     .end annotation
 .end field
 
-.field final coN:Lrx/Observable;
+.field final coh:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -68,7 +69,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/w;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/w;->cnd:Lrx/Observable;
 
     iput-wide p2, p0, Lrx/internal/a/w;->timeout:J
 
@@ -76,7 +77,7 @@
 
     iput-object p5, p0, Lrx/internal/a/w;->scheduler:Lrx/Scheduler;
 
-    iput-object p6, p0, Lrx/internal/a/w;->coN:Lrx/Observable;
+    iput-object p6, p0, Lrx/internal/a/w;->coh:Lrx/Observable;
 
     return-void
 .end method
@@ -96,11 +97,11 @@
 
     iget-object v0, p0, Lrx/internal/a/w;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v5
 
-    iget-object v6, p0, Lrx/internal/a/w;->coN:Lrx/Observable;
+    iget-object v6, p0, Lrx/internal/a/w;->coh:Lrx/Observable;
 
     move-object v0, v7
 
@@ -108,11 +109,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;->coR:Lrx/internal/d/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->col:Lrx/internal/d/a;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, v7, Lrx/internal/a/w$b;->cnR:Lrx/internal/b/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->cnl:Lrx/internal/b/a;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
@@ -120,7 +121,7 @@
 
     invoke-virtual {v7, v0, v1}, Lrx/internal/a/w$b;->bp(J)V
 
-    iget-object p1, p0, Lrx/internal/a/w;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/w;->cnd: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 25dc7b6f68..98778e16a7 100644
--- a/com.discord/smali_classes2/rx/internal/a/x$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/x$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/x$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeTimerOnce.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic coV:Lrx/internal/a/x;
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cop: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;->coV:Lrx/internal/a/x;
+    iput-object p1, p0, Lrx/internal/a/x$1;->cop:Lrx/internal/a/x;
 
-    iput-object p2, p0, Lrx/internal/a/x$1;->com:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/x$1;->cnG:Lrx/Subscriber;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +42,7 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/x$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->cnG:Lrx/Subscriber;
 
     const-wide/16 v1, 0x0
 
@@ -53,7 +54,7 @@
     :try_end_0
     .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v0, p0, Lrx/internal/a/x$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->cnG:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -62,7 +63,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/x$1;->com:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/x$1;->cnG: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 e43c4ee1bf..e3897c19fb 100644
--- a/com.discord/smali_classes2/rx/internal/a/x.smali
+++ b/com.discord/smali_classes2/rx/internal/a/x.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/x;
 .super Ljava/lang/Object;
+.source "OnSubscribeTimerOnce.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -48,7 +49,7 @@
 
     iget-object v0, p0, Lrx/internal/a/x;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()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 73c6d210f5..913d9dae55 100644
--- a/com.discord/smali_classes2/rx/internal/a/y$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/y$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/y$1;
 .super Ljava/lang/Object;
+.source "OnSubscribeTimerPeriodically.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,11 +18,11 @@
 
 
 # instance fields
-.field coW:J
+.field final synthetic cnG:Lrx/Subscriber;
 
-.field final synthetic coX:Lrx/internal/a/y;
+.field coq:J
 
-.field final synthetic com:Lrx/Subscriber;
+.field final synthetic cor:Lrx/internal/a/y;
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -30,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;->coX:Lrx/internal/a/y;
+    iput-object p1, p0, Lrx/internal/a/y$1;->cor:Lrx/internal/a/y;
 
-    iput-object p2, p0, Lrx/internal/a/y$1;->com:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/y$1;->cnG:Lrx/Subscriber;
 
     iput-object p3, p0, Lrx/internal/a/y$1;->val$worker:Lrx/Scheduler$Worker;
 
@@ -47,15 +48,15 @@
     .locals 5
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/y$1;->com:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/y$1;->cnG:Lrx/Subscriber;
 
-    iget-wide v1, p0, Lrx/internal/a/y$1;->coW:J
+    iget-wide v1, p0, Lrx/internal/a/y$1;->coq:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v3, v1
 
-    iput-wide v3, p0, Lrx/internal/a/y$1;->coW:J
+    iput-wide v3, p0, Lrx/internal/a/y$1;->coq:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -77,7 +78,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v1, p0, Lrx/internal/a/y$1;->com:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/y$1;->cnG:Lrx/Subscriber;
 
     invoke-static {v0, v1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
@@ -86,7 +87,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lrx/internal/a/y$1;->com:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/y$1;->cnG: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 4c5364516e..acef766402 100644
--- a/com.discord/smali_classes2/rx/internal/a/y.smali
+++ b/com.discord/smali_classes2/rx/internal/a/y.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/y;
 .super Ljava/lang/Object;
+.source "OnSubscribeTimerPeriodically.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -52,7 +53,7 @@
 
     iget-object v0, p0, Lrx/internal/a/y;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()Lrx/Scheduler$Worker;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/z$a.smali b/com.discord/smali_classes2/rx/internal/a/z$a.smali
index d25008782b..ab6afbc9f4 100644
--- a/com.discord/smali_classes2/rx/internal/a/z$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/z$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/a/z$a;
 .super Lrx/internal/a/d;
+.source "OnSubscribeToMap.java"
 
 
 # annotations
@@ -30,7 +31,7 @@
 
 
 # instance fields
-.field final coY:Lrx/functions/b;
+.field final cos:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -39,7 +40,7 @@
     .end annotation
 .end field
 
-.field final coZ:Lrx/functions/b;
+.field final cot:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -76,9 +77,9 @@
 
     iput-boolean p1, p0, Lrx/internal/a/z$a;->hasValue:Z
 
-    iput-object p3, p0, Lrx/internal/a/z$a;->coY:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z$a;->cos:Lrx/functions/b;
 
-    iput-object p4, p0, Lrx/internal/a/z$a;->coZ:Lrx/functions/b;
+    iput-object p4, p0, Lrx/internal/a/z$a;->cot:Lrx/functions/b;
 
     return-void
 .end method
@@ -101,13 +102,13 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/z$a;->coY:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/z$a;->cos: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;->coZ:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/z$a;->cot: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 c8d2ef425f..6d3b9b84d1 100644
--- a/com.discord/smali_classes2/rx/internal/a/z.smali
+++ b/com.discord/smali_classes2/rx/internal/a/z.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/a/z;
 .super Ljava/lang/Object;
+.source "OnSubscribeToMap.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -34,7 +35,7 @@
 
 
 # instance fields
-.field final cnJ:Lrx/Observable;
+.field final cnd:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -43,7 +44,7 @@
     .end annotation
 .end field
 
-.field final coY:Lrx/functions/b;
+.field final cos:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -52,7 +53,7 @@
     .end annotation
 .end field
 
-.field final coZ:Lrx/functions/b;
+.field final cot:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -61,7 +62,7 @@
     .end annotation
 .end field
 
-.field final cpa:Lrx/functions/Func0;
+.field final cou:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -111,13 +112,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/z;->cnJ:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/z;->cnd:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/z;->coY:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/z;->cos:Lrx/functions/b;
 
-    iput-object p3, p0, Lrx/internal/a/z;->coZ:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z;->cot:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/z;->cpa:Lrx/functions/Func0;
+    iput-object p0, p0, Lrx/internal/a/z;->cou:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -140,7 +141,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/z;->cpa:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/z;->cou:Lrx/functions/Func0;
 
     invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
@@ -152,13 +153,13 @@
 
     new-instance v1, Lrx/internal/a/z$a;
 
-    iget-object v2, p0, Lrx/internal/a/z;->coY:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/z;->cos:Lrx/functions/b;
 
-    iget-object v3, p0, Lrx/internal/a/z;->coZ:Lrx/functions/b;
+    iget-object v3, p0, Lrx/internal/a/z;->cot: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;->cnJ:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/z;->cnd: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$1.smali b/com.discord/smali_classes2/rx/internal/b/a$1.smali
index 90c9f2f573..c72d89b368 100644
--- a/com.discord/smali_classes2/rx/internal/b/a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/b/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/b/a$1;
 .super Ljava/lang/Object;
+.source "ProducerArbiter.java"
 
 # interfaces
 .implements Lrx/Producer;
diff --git a/com.discord/smali_classes2/rx/internal/b/a.smali b/com.discord/smali_classes2/rx/internal/b/a.smali
index d09cd49c56..ed73048c1a 100644
--- a/com.discord/smali_classes2/rx/internal/b/a.smali
+++ b/com.discord/smali_classes2/rx/internal/b/a.smali
@@ -1,22 +1,23 @@
 .class public final Lrx/internal/b/a;
 .super Ljava/lang/Object;
+.source "ProducerArbiter.java"
 
 # interfaces
 .implements Lrx/Producer;
 
 
 # static fields
-.field static final crT:Lrx/Producer;
+.field static final crn:Lrx/Producer;
 
 
 # instance fields
-.field cqN:J
+.field cqh:J
 
-.field crQ:Lrx/Producer;
+.field crk:Lrx/Producer;
 
-.field crR:J
+.field crl:J
 
-.field crS:Lrx/Producer;
+.field crm:Lrx/Producer;
 
 .field emitting:Z
 
@@ -31,7 +32,7 @@
 
     invoke-direct {v0}, Lrx/internal/b/a$1;-><init>()V
 
-    sput-object v0, Lrx/internal/b/a;->crT:Lrx/Producer;
+    sput-object v0, Lrx/internal/b/a;->crn:Lrx/Producer;
 
     return-void
 .end method
@@ -44,7 +45,7 @@
     return-void
 .end method
 
-.method private Lh()V
+.method private Lg()V
     .locals 13
 
     :cond_0
@@ -52,11 +53,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lrx/internal/b/a;->cqN:J
+    iget-wide v0, p0, Lrx/internal/b/a;->cqh:J
 
-    iget-wide v2, p0, Lrx/internal/b/a;->crR:J
+    iget-wide v2, p0, Lrx/internal/b/a;->crl:J
 
-    iget-object v4, p0, Lrx/internal/b/a;->crS:Lrx/Producer;
+    iget-object v4, p0, Lrx/internal/b/a;->crm:Lrx/Producer;
 
     const-wide/16 v5, 0x0
 
@@ -79,13 +80,13 @@
     return-void
 
     :cond_1
-    iput-wide v5, p0, Lrx/internal/b/a;->cqN:J
+    iput-wide v5, p0, Lrx/internal/b/a;->cqh:J
 
-    iput-wide v5, p0, Lrx/internal/b/a;->crR:J
+    iput-wide v5, p0, Lrx/internal/b/a;->crl:J
 
     const/4 v7, 0x0
 
-    iput-object v7, p0, Lrx/internal/b/a;->crS:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->crm:Lrx/Producer;
 
     monitor-exit p0
     :try_end_0
@@ -112,8 +113,6 @@
     goto :goto_1
 
     :cond_2
-    const/4 v10, 0x0
-
     sub-long/2addr v8, v2
 
     cmp-long v2, v8, v5
@@ -143,23 +142,23 @@
     :goto_2
     if-eqz v4, :cond_7
 
-    sget-object v0, Lrx/internal/b/a;->crT:Lrx/Producer;
+    sget-object v0, Lrx/internal/b/a;->crn:Lrx/Producer;
 
     if-ne v4, v0, :cond_6
 
-    iput-object v7, p0, Lrx/internal/b/a;->crQ:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->crk:Lrx/Producer;
 
     goto :goto_0
 
     :cond_6
-    iput-object v4, p0, Lrx/internal/b/a;->crQ:Lrx/Producer;
+    iput-object v4, p0, Lrx/internal/b/a;->crk: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;->crQ:Lrx/Producer;
+    iget-object v2, p0, Lrx/internal/b/a;->crk:Lrx/Producer;
 
     if-eqz v2, :cond_0
 
@@ -180,6 +179,8 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v0
+
+    return-void
 .end method
 
 
@@ -200,13 +201,11 @@
 
     if-eqz v2, :cond_0
 
-    iget-wide v0, p0, Lrx/internal/b/a;->crR:J
-
-    const/4 v2, 0x0
+    iget-wide v0, p0, Lrx/internal/b/a;->crl:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->crR:J
+    iput-wide v0, p0, Lrx/internal/b/a;->crl:J
 
     monitor-exit p0
 
@@ -251,7 +250,7 @@
 
     :cond_2
     :goto_0
-    invoke-direct {p0}, Lrx/internal/b/a;->Lh()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Lg()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -326,13 +325,11 @@
 
     if-eqz v2, :cond_1
 
-    iget-wide v0, p0, Lrx/internal/b/a;->cqN:J
-
-    const/4 v2, 0x0
+    iget-wide v0, p0, Lrx/internal/b/a;->cqh:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->cqN:J
+    iput-wide v0, p0, Lrx/internal/b/a;->cqh:J
 
     monitor-exit p0
 
@@ -350,8 +347,6 @@
     :try_start_1
     iget-wide v2, p0, Lrx/internal/b/a;->requested:J
 
-    const/4 v4, 0x0
-
     add-long/2addr v2, p1
 
     cmp-long v4, v2, v0
@@ -363,14 +358,14 @@
     :cond_2
     iput-wide v2, p0, Lrx/internal/b/a;->requested:J
 
-    iget-object v0, p0, Lrx/internal/b/a;->crQ:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/b/a;->crk: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;->Lh()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Lg()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -434,10 +429,10 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lrx/internal/b/a;->crT:Lrx/Producer;
+    sget-object p1, Lrx/internal/b/a;->crn:Lrx/Producer;
 
     :cond_0
-    iput-object p1, p0, Lrx/internal/b/a;->crS:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->crm:Lrx/Producer;
 
     monitor-exit p0
 
@@ -453,7 +448,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    iput-object p1, p0, Lrx/internal/b/a;->crQ:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->crk:Lrx/Producer;
 
     if-eqz p1, :cond_2
 
@@ -462,7 +457,7 @@
     invoke-interface {p1, v0, v1}, Lrx/Producer;->request(J)V
 
     :cond_2
-    invoke-direct {p0}, Lrx/internal/b/a;->Lh()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Lg()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali_classes2/rx/internal/b/b.smali b/com.discord/smali_classes2/rx/internal/b/b.smali
index d950da5874..84de201fc1 100644
--- a/com.discord/smali_classes2/rx/internal/b/b.smali
+++ b/com.discord/smali_classes2/rx/internal/b/b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/b/b;
 .super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "SingleDelayedProducer.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -172,6 +173,8 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final setValue(Ljava/lang/Object;)V
diff --git a/com.discord/smali_classes2/rx/internal/b/c.smali b/com.discord/smali_classes2/rx/internal/b/c.smali
index 9c84c74965..ea34d17f3e 100644
--- a/com.discord/smali_classes2/rx/internal/b/c.smali
+++ b/com.discord/smali_classes2/rx/internal/b/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/b/c;
 .super Ljava/util/concurrent/atomic/AtomicBoolean;
+.source "SingleProducer.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -124,6 +125,8 @@
 
     invoke-static {v0, p1, p2}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
+    return-void
+
     :cond_3
     :goto_0
     return-void
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 dc4cca62ac..ecd6ad23b6 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/a$a$1;
 .super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cse:Ljava/util/concurrent/ThreadFactory;
+.field final synthetic cry:Ljava/util/concurrent/ThreadFactory;
 
-.field final synthetic csf:Lrx/internal/c/a$a;
+.field final synthetic crz: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;->csf:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$1;->crz:Lrx/internal/c/a$a;
 
-    iput-object p2, p0, Lrx/internal/c/a$a$1;->cse:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lrx/internal/c/a$a$1;->cry:Ljava/util/concurrent/ThreadFactory;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,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;->cse:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/a$a$1;->cry: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 0533dd6216..b5d934187d 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/a$a$2;
 .super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic csf:Lrx/internal/c/a$a;
+.field final synthetic crz: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;->csf:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$2;->crz:Lrx/internal/c/a$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,9 +37,9 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lrx/internal/c/a$a$2;->csf:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$a$2;->crz:Lrx/internal/c/a$a;
 
-    iget-object v1, v0, Lrx/internal/c/a$a;->csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, v0, Lrx/internal/c/a$a;->cru:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
 
@@ -50,7 +51,7 @@
 
     move-result-wide v1
 
-    iget-object v3, v0, Lrx/internal/c/a$a;->csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v3, v0, Lrx/internal/c/a$a;->cru:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v3}, Ljava/util/concurrent/ConcurrentLinkedQueue;->iterator()Ljava/util/Iterator;
 
@@ -70,13 +71,13 @@
 
     check-cast v4, Lrx/internal/c/a$c;
 
-    iget-wide v5, v4, Lrx/internal/c/a$c;->csm:J
+    iget-wide v5, v4, Lrx/internal/c/a$c;->crG:J
 
     cmp-long v7, v5, v1
 
     if-gtz v7, :cond_1
 
-    iget-object v5, v0, Lrx/internal/c/a$a;->csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v5, v0, Lrx/internal/c/a$a;->cru:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v5, v4}, Ljava/util/concurrent/ConcurrentLinkedQueue;->remove(Ljava/lang/Object;)Z
 
@@ -84,7 +85,7 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v5, v0, Lrx/internal/c/a$a;->csb:Lrx/subscriptions/CompositeSubscription;
+    iget-object v5, v0, Lrx/internal/c/a$a;->crv: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 dc5f36b4ae..a19e3d533d 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/a$a;
 .super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
 
 
 # annotations
@@ -16,9 +17,9 @@
 # instance fields
 .field private final bMi:Ljava/util/concurrent/ThreadFactory;
 
-.field final crZ:J
+.field final crt:J
 
-.field final csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final cru:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -28,11 +29,11 @@
     .end annotation
 .end field
 
-.field final csb:Lrx/subscriptions/CompositeSubscription;
+.field final crv:Lrx/subscriptions/CompositeSubscription;
 
-.field private final csc:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final crw:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final csd:Ljava/util/concurrent/Future;
+.field private final crx:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -62,19 +63,19 @@
     const-wide/16 p2, 0x0
 
     :goto_0
-    iput-wide p2, p0, Lrx/internal/c/a$a;->crZ:J
+    iput-wide p2, p0, Lrx/internal/c/a$a;->crt: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;->csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p2, p0, Lrx/internal/c/a$a;->cru: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;->csb:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/c/a$a;->crv:Lrx/subscriptions/CompositeSubscription;
 
     const/4 p2, 0x0
 
@@ -96,14 +97,14 @@
 
     invoke-direct {v1, p0}, Lrx/internal/c/a$a$2;-><init>(Lrx/internal/c/a$a;)V
 
-    iget-wide v2, p0, Lrx/internal/c/a$a;->crZ:J
-
-    iget-wide v4, p0, Lrx/internal/c/a$a;->crZ:J
+    iget-wide v4, p0, Lrx/internal/c/a$a;->crt:J
 
     sget-object v6, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
 
     move-object v0, p1
 
+    move-wide v2, v4
+
     invoke-interface/range {v0 .. v6}, Ljava/util/concurrent/ScheduledExecutorService;->scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
 
     move-result-object p2
@@ -114,19 +115,19 @@
     move-object p1, p2
 
     :goto_1
-    iput-object p1, p0, Lrx/internal/c/a$a;->csc:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/a$a;->crw:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p2, p0, Lrx/internal/c/a$a;->csd:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/a$a;->crx:Ljava/util/concurrent/Future;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Lw()Lrx/internal/c/a$c;
+.method final Lv()Lrx/internal/c/a$c;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->csb:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->crv:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -134,12 +135,12 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lrx/internal/c/a;->crW:Lrx/internal/c/a$c;
+    sget-object v0, Lrx/internal/c/a;->crq:Lrx/internal/c/a$c;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$a;->csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->cru:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
 
@@ -147,7 +148,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->cru:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -166,7 +167,7 @@
 
     invoke-direct {v0, v1}, Lrx/internal/c/a$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
 
-    iget-object v1, p0, Lrx/internal/c/a$a;->csb:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->crv:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
@@ -177,29 +178,29 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/c/a$a;->csd:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->crx:Ljava/util/concurrent/Future;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->csd:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->crx: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;->csc:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->crw:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->csc:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->crw: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;->csb:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->crv:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
@@ -208,7 +209,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/c/a$a;->csb:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->crv: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 2b01af6591..d497ddb762 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/a$b$1;
 .super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic csk:Lrx/functions/Action0;
+.field final synthetic crE:Lrx/functions/Action0;
 
-.field final synthetic csl:Lrx/internal/c/a$b;
+.field final synthetic crF: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;->csl:Lrx/internal/c/a$b;
+    iput-object p1, p0, Lrx/internal/c/a$b$1;->crF:Lrx/internal/c/a$b;
 
-    iput-object p2, p0, Lrx/internal/c/a$b$1;->csk:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/a$b$1;->crE:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/a$b$1;->csl:Lrx/internal/c/a$b;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->crF:Lrx/internal/c/a$b;
 
     invoke-virtual {v0}, Lrx/internal/c/a$b;->isUnsubscribed()Z
 
@@ -51,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$b$1;->csk:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->crE: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 16b48b01ae..20c9c8c917 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/a$b;
 .super Lrx/Scheduler$Worker;
+.source "CachedThreadScheduler.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,13 +18,13 @@
 
 
 # instance fields
-.field private final csg:Lrx/subscriptions/CompositeSubscription;
+.field private final crA:Lrx/subscriptions/CompositeSubscription;
 
-.field private final csh:Lrx/internal/c/a$a;
+.field private final crB:Lrx/internal/c/a$a;
 
-.field private final csi:Lrx/internal/c/a$c;
+.field private final crC:Lrx/internal/c/a$c;
 
-.field final csj:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final crD:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 
 # direct methods
@@ -36,21 +37,21 @@
 
     invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/a$b;->csg:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/a$b;->crA:Lrx/subscriptions/CompositeSubscription;
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->csh:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$b;->crB: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;->csj:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/c/a$b;->crD:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-virtual {p1}, Lrx/internal/c/a$a;->Lw()Lrx/internal/c/a$c;
+    invoke-virtual {p1}, Lrx/internal/c/a$a;->Lv()Lrx/internal/c/a$c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->csi:Lrx/internal/c/a$c;
+    iput-object p1, p0, Lrx/internal/c/a$b;->crC:Lrx/internal/c/a$c;
 
     return-void
 .end method
@@ -60,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;->csg:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->crA:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -68,14 +69,14 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$b;->csi:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->crC:Lrx/internal/c/a$c;
 
     new-instance v1, Lrx/internal/c/a$b$1;
 
@@ -85,11 +86,11 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lrx/internal/c/a$b;->csg:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->crA:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p2, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p2, p0, Lrx/internal/c/a$b;->csg:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->crA:Lrx/subscriptions/CompositeSubscription;
 
     iget-object p3, p1, Lrx/internal/c/j;->cancel:Lrx/internal/util/SubscriptionList;
 
@@ -119,21 +120,21 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->csh:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$b;->crB:Lrx/internal/c/a$a;
 
-    iget-object v1, p0, Lrx/internal/c/a$b;->csi:Lrx/internal/c/a$c;
+    iget-object v1, p0, Lrx/internal/c/a$b;->crC: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;->crZ:J
+    iget-wide v4, v0, Lrx/internal/c/a$a;->crt:J
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/c/a$c;->csm:J
+    iput-wide v2, v1, Lrx/internal/c/a$c;->crG:J
 
-    iget-object v0, v0, Lrx/internal/c/a$a;->csa:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v0, Lrx/internal/c/a$a;->cru:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
 
@@ -143,7 +144,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->csg:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->crA:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -155,7 +156,7 @@
 .method public final unsubscribe()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->csj:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/c/a$b;->crD:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v1, 0x0
 
@@ -167,12 +168,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->csi:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->crC: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;->csg:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->crA: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 430ddd60cb..62368640b5 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$c.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/a$c;
 .super Lrx/internal/c/h;
+.source "CachedThreadScheduler.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field csm:J
+.field crG:J
 
 
 # direct methods
@@ -25,7 +26,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lrx/internal/c/a$c;->csm:J
+    iput-wide v0, p0, Lrx/internal/c/a$c;->crG: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 8625bdfea6..8ddfa2fbfb 100644
--- a/com.discord/smali_classes2/rx/internal/c/a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/a;
 .super Lrx/Scheduler;
+.source "CachedThreadScheduler.java"
 
 # interfaces
 .implements Lrx/internal/c/k;
@@ -16,19 +17,19 @@
 
 
 # static fields
-.field private static final crU:J
+.field private static final cro:J
 
-.field private static final crV:Ljava/util/concurrent/TimeUnit;
+.field private static final crp:Ljava/util/concurrent/TimeUnit;
 
-.field static final crW:Lrx/internal/c/a$c;
+.field static final crq:Lrx/internal/c/a$c;
 
-.field static final crX:Lrx/internal/c/a$a;
+.field static final crr:Lrx/internal/c/a$a;
 
 
 # instance fields
 .field final bMi:Ljava/util/concurrent/ThreadFactory;
 
-.field final crY:Ljava/util/concurrent/atomic/AtomicReference;
+.field final crs:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -45,15 +46,15 @@
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sput-object v0, Lrx/internal/c/a;->crV:Ljava/util/concurrent/TimeUnit;
+    sput-object v0, Lrx/internal/c/a;->crp:Ljava/util/concurrent/TimeUnit;
 
     new-instance v0, Lrx/internal/c/a$c;
 
-    sget-object v1, Lrx/internal/util/j;->ctJ:Ljava/util/concurrent/ThreadFactory;
+    sget-object v1, Lrx/internal/util/j;->ctd: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;->crW:Lrx/internal/c/a$c;
+    sput-object v0, Lrx/internal/c/a;->crq:Lrx/internal/c/a$c;
 
     invoke-virtual {v0}, Lrx/internal/c/a$c;->unsubscribe()V
 
@@ -65,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;->crX:Lrx/internal/c/a$a;
+    sput-object v0, Lrx/internal/c/a;->crr:Lrx/internal/c/a$a;
 
     invoke-virtual {v0}, Lrx/internal/c/a$a;->shutdown()V
 
@@ -83,7 +84,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lrx/internal/c/a;->crU:J
+    sput-wide v0, Lrx/internal/c/a;->cro:J
 
     return-void
 .end method
@@ -97,25 +98,25 @@
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/a;->crX:Lrx/internal/c/a$a;
+    sget-object v0, Lrx/internal/c/a;->crr: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;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/a;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/a$a;
 
     iget-object v0, p0, Lrx/internal/c/a;->bMi:Ljava/util/concurrent/ThreadFactory;
 
-    sget-wide v1, Lrx/internal/c/a;->crU:J
+    sget-wide v1, Lrx/internal/c/a;->cro:J
 
-    sget-object v3, Lrx/internal/c/a;->crV:Ljava/util/concurrent/TimeUnit;
+    sget-object v3, Lrx/internal/c/a;->crp: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;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/a;->crX:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->crr:Lrx/internal/c/a$a;
 
     invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -131,12 +132,12 @@
 
 
 # virtual methods
-.method public final KM()Lrx/Scheduler$Worker;
+.method public final KL()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/a$b;
 
-    iget-object v1, p0, Lrx/internal/c/a;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/a;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -153,7 +154,7 @@
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -161,18 +162,16 @@
 
     check-cast v0, Lrx/internal/c/a$a;
 
-    sget-object v1, Lrx/internal/c/a;->crX:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->crr:Lrx/internal/c/a$a;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/c/a;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/a;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v2, Lrx/internal/c/a;->crX:Lrx/internal/c/a$a;
-
-    invoke-virtual {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
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 8239f245e3..f692aa4bd3 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/b$a$1;
 .super Ljava/lang/Object;
+.source "EventLoopsScheduler.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic csk:Lrx/functions/Action0;
+.field final synthetic crE:Lrx/functions/Action0;
 
-.field final synthetic csu:Lrx/internal/c/b$a;
+.field final synthetic crO: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;->csu:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$1;->crO:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$1;->csk:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$1;->crE:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a$1;->csu:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->crO:Lrx/internal/c/b$a;
 
     invoke-virtual {v0}, Lrx/internal/c/b$a;->isUnsubscribed()Z
 
@@ -51,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a$1;->csk:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->crE: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 14c2636568..4b4de84eb4 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/b$a$2;
 .super Ljava/lang/Object;
+.source "EventLoopsScheduler.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic csk:Lrx/functions/Action0;
+.field final synthetic crE:Lrx/functions/Action0;
 
-.field final synthetic csu:Lrx/internal/c/b$a;
+.field final synthetic crO: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;->csu:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$2;->crO:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$2;->csk:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$2;->crE:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a$2;->csu:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->crO:Lrx/internal/c/b$a;
 
     invoke-virtual {v0}, Lrx/internal/c/b$a;->isUnsubscribed()Z
 
@@ -51,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a$2;->csk:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->crE: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 0bd2f77b30..1ee5bb8729 100644
--- a/com.discord/smali_classes2/rx/internal/c/b$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/b$a;
 .super Lrx/Scheduler$Worker;
+.source "EventLoopsScheduler.java"
 
 
 # annotations
@@ -14,13 +15,13 @@
 
 
 # instance fields
-.field private final csq:Lrx/internal/util/SubscriptionList;
+.field private final crK:Lrx/internal/util/SubscriptionList;
 
-.field private final csr:Lrx/subscriptions/CompositeSubscription;
+.field private final crL:Lrx/subscriptions/CompositeSubscription;
 
-.field private final css:Lrx/internal/util/SubscriptionList;
+.field private final crM:Lrx/internal/util/SubscriptionList;
 
-.field private final cst:Lrx/internal/c/b$c;
+.field private final crN:Lrx/internal/c/b$c;
 
 
 # direct methods
@@ -33,13 +34,13 @@
 
     invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/b$a;->csq:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->crK: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;->csr:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/b$a;->crL:Lrx/subscriptions/CompositeSubscription;
 
     new-instance v0, Lrx/internal/util/SubscriptionList;
 
@@ -47,13 +48,13 @@
 
     new-array v1, v1, [Lrx/Subscription;
 
-    iget-object v2, p0, Lrx/internal/c/b$a;->csq:Lrx/internal/util/SubscriptionList;
+    iget-object v2, p0, Lrx/internal/c/b$a;->crK:Lrx/internal/util/SubscriptionList;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lrx/internal/c/b$a;->csr:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/b$a;->crL:Lrx/subscriptions/CompositeSubscription;
 
     const/4 v3, 0x1
 
@@ -61,9 +62,9 @@
 
     invoke-direct {v0, v1}, Lrx/internal/util/SubscriptionList;-><init>([Lrx/Subscription;)V
 
-    iput-object v0, p0, Lrx/internal/c/b$a;->css:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->crM:Lrx/internal/util/SubscriptionList;
 
-    iput-object p1, p0, Lrx/internal/c/b$a;->cst:Lrx/internal/c/b$c;
+    iput-object p1, p0, Lrx/internal/c/b$a;->crN:Lrx/internal/c/b$c;
 
     return-void
 .end method
@@ -79,20 +80,20 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->cst:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->crN: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;->csr:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/b$a;->crL:Lrx/subscriptions/CompositeSubscription;
 
     invoke-static {v1}, Lrx/c/c;->e(Lrx/functions/Action0;)Lrx/functions/Action0;
 
@@ -140,20 +141,20 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->cst:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->crN: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;->csq:Lrx/internal/util/SubscriptionList;
+    iget-object p1, p0, Lrx/internal/c/b$a;->crK:Lrx/internal/util/SubscriptionList;
 
     invoke-static {v1}, Lrx/c/c;->e(Lrx/functions/Action0;)Lrx/functions/Action0;
 
@@ -179,7 +180,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a;->css:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->crM:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->isUnsubscribed()Z
 
@@ -191,7 +192,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a;->css:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->crM: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 0791511f0e..1befe37b0d 100644
--- a/com.discord/smali_classes2/rx/internal/c/b$b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b$b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/b$b;
 .super Ljava/lang/Object;
+.source "EventLoopsScheduler.java"
 
 
 # annotations
@@ -14,11 +15,11 @@
 
 
 # instance fields
-.field final csv:I
+.field final crP:I
 
-.field final csw:[Lrx/internal/c/b$c;
+.field final crQ:[Lrx/internal/c/b$c;
 
-.field csx:J
+.field crR:J
 
 
 # direct methods
@@ -27,18 +28,18 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p2, p0, Lrx/internal/c/b$b;->csv:I
+    iput p2, p0, Lrx/internal/c/b$b;->crP:I
 
     new-array v0, p2, [Lrx/internal/c/b$c;
 
-    iput-object v0, p0, Lrx/internal/c/b$b;->csw:[Lrx/internal/c/b$c;
+    iput-object v0, p0, Lrx/internal/c/b$b;->crQ:[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;->csw:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->crQ:[Lrx/internal/c/b$c;
 
     new-instance v2, Lrx/internal/c/b$c;
 
@@ -56,27 +57,27 @@
 
 
 # virtual methods
-.method public final Lx()Lrx/internal/c/b$c;
+.method public final Lw()Lrx/internal/c/b$c;
     .locals 6
 
-    iget v0, p0, Lrx/internal/c/b$b;->csv:I
+    iget v0, p0, Lrx/internal/c/b$b;->crP:I
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lrx/internal/c/b;->cso:Lrx/internal/c/b$c;
+    sget-object v0, Lrx/internal/c/b;->crI:Lrx/internal/c/b$c;
 
     return-object v0
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/c/b$b;->csw:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->crQ:[Lrx/internal/c/b$c;
 
-    iget-wide v2, p0, Lrx/internal/c/b$b;->csx:J
+    iget-wide v2, p0, Lrx/internal/c/b$b;->crR:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v4, v2
 
-    iput-wide v4, p0, Lrx/internal/c/b$b;->csx:J
+    iput-wide v4, p0, Lrx/internal/c/b$b;->crR:J
 
     int-to-long v4, v0
 
@@ -92,7 +93,7 @@
 .method public final shutdown()V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/c/b$b;->csw:[Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$b;->crQ:[Lrx/internal/c/b$c;
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/rx/internal/c/b$c.smali b/com.discord/smali_classes2/rx/internal/c/b$c.smali
index b916eef197..43dd71a950 100644
--- a/com.discord/smali_classes2/rx/internal/c/b$c.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b$c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/b$c;
 .super Lrx/internal/c/h;
+.source "EventLoopsScheduler.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/c/b.smali b/com.discord/smali_classes2/rx/internal/c/b.smali
index a4ca33c14f..02d4cefbfd 100644
--- a/com.discord/smali_classes2/rx/internal/c/b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/b;
 .super Lrx/Scheduler;
+.source "EventLoopsScheduler.java"
 
 # interfaces
 .implements Lrx/internal/c/k;
@@ -16,17 +17,17 @@
 
 
 # static fields
-.field static final csn:I
+.field static final crH:I
 
-.field static final cso:Lrx/internal/c/b$c;
+.field static final crI:Lrx/internal/c/b$c;
 
-.field static final csp:Lrx/internal/c/b$b;
+.field static final crJ:Lrx/internal/c/b$b;
 
 
 # instance fields
 .field final bMi:Ljava/util/concurrent/ThreadFactory;
 
-.field public final crY:Ljava/util/concurrent/atomic/AtomicReference;
+.field public final crs:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -69,15 +70,15 @@
     move v0, v2
 
     :cond_1
-    sput v0, Lrx/internal/c/b;->csn:I
+    sput v0, Lrx/internal/c/b;->crH:I
 
     new-instance v0, Lrx/internal/c/b$c;
 
-    sget-object v2, Lrx/internal/util/j;->ctJ:Ljava/util/concurrent/ThreadFactory;
+    sget-object v2, Lrx/internal/util/j;->ctd:Ljava/util/concurrent/ThreadFactory;
 
     invoke-direct {v0, v2}, Lrx/internal/c/b$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
 
-    sput-object v0, Lrx/internal/c/b;->cso:Lrx/internal/c/b$c;
+    sput-object v0, Lrx/internal/c/b;->crI:Lrx/internal/c/b$c;
 
     invoke-virtual {v0}, Lrx/internal/c/b$c;->unsubscribe()V
 
@@ -87,7 +88,7 @@
 
     invoke-direct {v0, v2, v1}, Lrx/internal/c/b$b;-><init>(Ljava/util/concurrent/ThreadFactory;I)V
 
-    sput-object v0, Lrx/internal/c/b;->csp:Lrx/internal/c/b$b;
+    sput-object v0, Lrx/internal/c/b;->crJ:Lrx/internal/c/b$b;
 
     return-void
 .end method
@@ -101,23 +102,23 @@
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/b;->csp:Lrx/internal/c/b$b;
+    sget-object v0, Lrx/internal/c/b;->crJ: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;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/b;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/b$b;
 
     iget-object v0, p0, Lrx/internal/c/b;->bMi:Ljava/util/concurrent/ThreadFactory;
 
-    sget v1, Lrx/internal/c/b;->csn:I
+    sget v1, Lrx/internal/c/b;->crH: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;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/b;->csp:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->crJ:Lrx/internal/c/b$b;
 
     invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -133,12 +134,12 @@
 
 
 # virtual methods
-.method public final KM()Lrx/Scheduler$Worker;
+.method public final KL()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/b$a;
 
-    iget-object v1, p0, Lrx/internal/c/b;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/b;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -146,7 +147,7 @@
 
     check-cast v1, Lrx/internal/c/b$b;
 
-    invoke-virtual {v1}, Lrx/internal/c/b$b;->Lx()Lrx/internal/c/b$c;
+    invoke-virtual {v1}, Lrx/internal/c/b$b;->Lw()Lrx/internal/c/b$c;
 
     move-result-object v1
 
@@ -159,7 +160,7 @@
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -167,18 +168,16 @@
 
     check-cast v0, Lrx/internal/c/b$b;
 
-    sget-object v1, Lrx/internal/c/b;->csp:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->crJ:Lrx/internal/c/b$b;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/c/b;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/b;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v2, Lrx/internal/c/b;->csp:Lrx/internal/c/b$b;
-
-    invoke-virtual {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
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 e45dd30326..fc2c8bde04 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/c$a$1;
 .super Ljava/lang/Object;
+.source "ExecutorScheduler.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic csA:Lrx/subscriptions/b;
+.field final synthetic crU:Lrx/subscriptions/b;
 
-.field final synthetic csB:Lrx/internal/c/c$a;
+.field final synthetic crV: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;->csB:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$1;->crV:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$1;->csA:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$1;->crU:Lrx/subscriptions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,11 +41,11 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/c$a$1;->csB:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$1;->crV:Lrx/internal/c/c$a;
 
-    iget-object v0, v0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$1;->csA:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$1;->crU: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 c96db8db36..1f09dd3141 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/c$a$2;
 .super Ljava/lang/Object;
+.source "ExecutorScheduler.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic csA:Lrx/subscriptions/b;
+.field final synthetic crU:Lrx/subscriptions/b;
 
-.field final synthetic csB:Lrx/internal/c/c$a;
+.field final synthetic crV:Lrx/internal/c/c$a;
 
-.field final synthetic csC:Lrx/functions/Action0;
+.field final synthetic crW:Lrx/functions/Action0;
 
-.field final synthetic csD:Lrx/Subscription;
+.field final synthetic crX: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;->csB:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$2;->crV:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$2;->csA:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$2;->crU:Lrx/subscriptions/b;
 
-    iput-object p3, p0, Lrx/internal/c/c$a$2;->csC:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/c/c$a$2;->crW:Lrx/functions/Action0;
 
-    iput-object p4, p0, Lrx/internal/c/c$a$2;->csD:Lrx/Subscription;
+    iput-object p4, p0, Lrx/internal/c/c$a$2;->crX:Lrx/Subscription;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +49,7 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/c/c$a$2;->csA:Lrx/subscriptions/b;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->crU:Lrx/subscriptions/b;
 
     invoke-virtual {v0}, Lrx/subscriptions/b;->isUnsubscribed()Z
 
@@ -59,15 +60,15 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/c$a$2;->csB:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->crV:Lrx/internal/c/c$a;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$2;->csC:Lrx/functions/Action0;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->crW: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;->csA:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->crU:Lrx/subscriptions/b;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/b;->f(Lrx/Subscription;)V
 
@@ -81,7 +82,7 @@
 
     check-cast v0, Lrx/internal/c/j;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$2;->csD:Lrx/Subscription;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->crX: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 b360d31aa6..eca1914f23 100644
--- a/com.discord/smali_classes2/rx/internal/c/c$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/c$a;
 .super Lrx/Scheduler$Worker;
+.source "ExecutorScheduler.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -17,7 +18,7 @@
 
 
 # instance fields
-.field final bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -27,9 +28,9 @@
     .end annotation
 .end field
 
-.field final csy:Lrx/subscriptions/CompositeSubscription;
+.field final crS:Lrx/subscriptions/CompositeSubscription;
 
-.field final csz:Ljava/util/concurrent/ScheduledExecutorService;
+.field final crT:Ljava/util/concurrent/ScheduledExecutorService;
 
 .field final executor:Ljava/util/concurrent/Executor;
 
@@ -48,7 +49,7 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -60,13 +61,13 @@
 
     invoke-direct {p1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iput-object p1, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
-    invoke-static {}, Lrx/internal/c/d;->Ly()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/d;->Lx()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->csz:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/c$a;->crT:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
@@ -95,7 +96,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -116,7 +117,7 @@
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/b;->f(Lrx/Subscription;)V
 
-    iget-object v2, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v2, v1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
@@ -139,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;->csz:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/c$a;->crT: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;
 
@@ -168,7 +169,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -181,15 +182,15 @@
 
     new-instance v0, Lrx/internal/c/j;
 
-    iget-object v1, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->crS: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;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/c/c$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {p1, v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
 
@@ -213,7 +214,7 @@
     :catch_0
     move-exception p1
 
-    iget-object v1, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/CompositeSubscription;->e(Lrx/Subscription;)V
 
@@ -233,7 +234,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -246,23 +247,22 @@
     .locals 2
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
     move-result v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
-    :cond_1
-    iget-object v0, p0, Lrx/internal/c/c$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
 
     return-void
 
-    :cond_2
-    iget-object v0, p0, Lrx/internal/c/c$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    :cond_1
+    iget-object v0, p0, Lrx/internal/c/c$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -270,28 +270,38 @@
 
     check-cast v0, Lrx/internal/c/j;
 
-    if-nez v0, :cond_3
+    if-nez v0, :cond_2
 
     return-void
 
-    :cond_3
+    :cond_2
     invoke-virtual {v0}, Lrx/internal/c/j;->isUnsubscribed()Z
 
     move-result v1
 
     if-nez v1, :cond_4
 
-    iget-object v1, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
     move-result v1
 
-    if-nez v1, :cond_1
+    if-nez v1, :cond_3
 
     invoke-virtual {v0}, Lrx/internal/c/j;->run()V
 
+    goto :goto_0
+
+    :cond_3
+    iget-object v0, p0, Lrx/internal/c/c$a;->bUc:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
+
+    return-void
+
     :cond_4
+    :goto_0
     iget-object v0, p0, Lrx/internal/c/c$a;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
@@ -306,11 +316,11 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->csy:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->crS:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->bUE:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bUc: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 6a982f18fc..5a72df4c7f 100644
--- a/com.discord/smali_classes2/rx/internal/c/c.smali
+++ b/com.discord/smali_classes2/rx/internal/c/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/c;
 .super Lrx/Scheduler;
+.source "ExecutorScheduler.java"
 
 
 # annotations
@@ -27,7 +28,7 @@
 
 
 # virtual methods
-.method public final KM()Lrx/Scheduler$Worker;
+.method public final KL()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 d0ef3906d1..e6be42c1b9 100644
--- a/com.discord/smali_classes2/rx/internal/c/d.smali
+++ b/com.discord/smali_classes2/rx/internal/c/d.smali
@@ -1,22 +1,23 @@
 .class public final Lrx/internal/c/d;
 .super Ljava/lang/Object;
+.source "GenericScheduledExecutorService.java"
 
 # interfaces
 .implements Lrx/internal/c/k;
 
 
 # static fields
-.field private static final csE:[Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final crY:[Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static final csF:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final crZ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field public static final csG:Lrx/internal/c/d;
+.field public static final csa:Lrx/internal/c/d;
 
-.field private static csI:I
+.field private static csc:I
 
 
 # instance fields
-.field private final csH:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final csb:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -36,13 +37,13 @@
 
     new-array v1, v0, [Ljava/util/concurrent/ScheduledExecutorService;
 
-    sput-object v1, Lrx/internal/c/d;->csE:[Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v1, Lrx/internal/c/d;->crY:[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;->csF:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Lrx/internal/c/d;->crZ:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
@@ -50,7 +51,7 @@
 
     invoke-direct {v0}, Lrx/internal/c/d;-><init>()V
 
-    sput-object v0, Lrx/internal/c/d;->csG:Lrx/internal/c/d;
+    sput-object v0, Lrx/internal/c/d;->csa:Lrx/internal/c/d;
 
     return-void
 .end method
@@ -62,23 +63,23 @@
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/d;->csE:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->crY:[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;->csH:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/c/d;->csb:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Lrx/internal/c/d;->start()V
 
     return-void
 .end method
 
-.method public static Ly()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static Lx()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 3
 
-    sget-object v0, Lrx/internal/c/d;->csG:Lrx/internal/c/d;
+    sget-object v0, Lrx/internal/c/d;->csa:Lrx/internal/c/d;
 
-    iget-object v0, v0, Lrx/internal/c/d;->csH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/d;->csb:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -86,16 +87,16 @@
 
     check-cast v0, [Ljava/util/concurrent/ScheduledExecutorService;
 
-    sget-object v1, Lrx/internal/c/d;->csE:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->crY:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/c/d;->csF:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lrx/internal/c/d;->crZ:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object v0
 
     :cond_0
-    sget v1, Lrx/internal/c/d;->csI:I
+    sget v1, Lrx/internal/c/d;->csc:I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -106,7 +107,7 @@
     const/4 v1, 0x0
 
     :cond_1
-    sput v1, Lrx/internal/c/d;->csI:I
+    sput v1, Lrx/internal/c/d;->csc:I
 
     aget-object v0, v0, v1
 
@@ -147,7 +148,7 @@
     :goto_0
     if-ge v3, v0, :cond_2
 
-    invoke-static {}, Lrx/internal/c/e;->Lz()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/e;->Ly()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object v4
 
@@ -158,9 +159,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/c/d;->csH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->csb:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lrx/internal/c/d;->csE:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v3, Lrx/internal/c/d;->crY:[Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-virtual {v0, v3, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -221,7 +222,7 @@
     .locals 4
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/d;->csH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->csb:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -229,18 +230,16 @@
 
     check-cast v0, [Ljava/util/concurrent/ScheduledExecutorService;
 
-    sget-object v1, Lrx/internal/c/d;->csE:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->crY:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/c/d;->csH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/d;->csb:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v2, Lrx/internal/c/d;->csE:[Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-virtual {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/rx/internal/c/e.smali b/com.discord/smali_classes2/rx/internal/c/e.smali
index 1d2558b66e..c428303238 100644
--- a/com.discord/smali_classes2/rx/internal/c/e.smali
+++ b/com.discord/smali_classes2/rx/internal/c/e.smali
@@ -1,5 +1,6 @@
 .class final enum Lrx/internal/c/e;
 .super Ljava/lang/Enum;
+.source "GenericScheduledExecutorServiceFactory.java"
 
 
 # annotations
@@ -13,9 +14,9 @@
 
 
 # static fields
-.field static final csJ:Lrx/internal/util/j;
+.field static final csd:Lrx/internal/util/j;
 
-.field private static final synthetic csK:[Lrx/internal/c/e;
+.field private static final synthetic cse:[Lrx/internal/c/e;
 
 
 # direct methods
@@ -26,7 +27,7 @@
 
     new-array v0, v0, [Lrx/internal/c/e;
 
-    sput-object v0, Lrx/internal/c/e;->csK:[Lrx/internal/c/e;
+    sput-object v0, Lrx/internal/c/e;->cse:[Lrx/internal/c/e;
 
     new-instance v0, Lrx/internal/util/j;
 
@@ -34,15 +35,15 @@
 
     invoke-direct {v0, v1}, Lrx/internal/util/j;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/c/e;->csJ:Lrx/internal/util/j;
+    sput-object v0, Lrx/internal/c/e;->csd:Lrx/internal/util/j;
 
     return-void
 .end method
 
-.method public static Lz()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static Ly()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 2
 
-    invoke-static {}, Lrx/c/c;->LS()Lrx/functions/Func0;
+    invoke-static {}, Lrx/c/c;->LR()Lrx/functions/Func0;
 
     move-result-object v0
 
@@ -50,7 +51,7 @@
 
     const/4 v0, 0x1
 
-    sget-object v1, Lrx/internal/c/e;->csJ:Lrx/internal/util/j;
+    sget-object v1, Lrx/internal/c/e;->csd:Lrx/internal/util/j;
 
     invoke-static {v0, v1}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -85,7 +86,7 @@
 .method public static values()[Lrx/internal/c/e;
     .locals 1
 
-    sget-object v0, Lrx/internal/c/e;->csK:[Lrx/internal/c/e;
+    sget-object v0, Lrx/internal/c/e;->cse:[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 902d8f1d5e..717d14e7e7 100644
--- a/com.discord/smali_classes2/rx/internal/c/f$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/f$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/f$a;
 .super Lrx/Scheduler$Worker;
+.source "ImmediateScheduler.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -17,16 +18,16 @@
 
 
 # instance fields
-.field final csM:Lrx/subscriptions/a;
+.field final csg:Lrx/subscriptions/a;
 
-.field final synthetic csN:Lrx/internal/c/f;
+.field final synthetic csh: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;->csN:Lrx/internal/c/f;
+    iput-object p1, p0, Lrx/internal/c/f$a;->csh:Lrx/internal/c/f;
 
     invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
 
@@ -34,7 +35,7 @@
 
     invoke-direct {p1}, Lrx/subscriptions/a;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/f$a;->csM:Lrx/subscriptions/a;
+    iput-object p1, p0, Lrx/internal/c/f$a;->csg:Lrx/subscriptions/a;
 
     return-void
 .end method
@@ -70,7 +71,7 @@
 
     invoke-interface {p1}, Lrx/functions/Action0;->call()V
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -80,7 +81,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/f$a;->csM:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->csg:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->isUnsubscribed()Z
 
@@ -92,7 +93,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/f$a;->csM:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->csg: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 9680c8075c..73c3e61af9 100644
--- a/com.discord/smali_classes2/rx/internal/c/f.smali
+++ b/com.discord/smali_classes2/rx/internal/c/f.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/f;
 .super Lrx/Scheduler;
+.source "ImmediateScheduler.java"
 
 
 # annotations
@@ -11,7 +12,7 @@
 
 
 # static fields
-.field public static final csL:Lrx/internal/c/f;
+.field public static final csf:Lrx/internal/c/f;
 
 
 # direct methods
@@ -22,7 +23,7 @@
 
     invoke-direct {v0}, Lrx/internal/c/f;-><init>()V
 
-    sput-object v0, Lrx/internal/c/f;->csL:Lrx/internal/c/f;
+    sput-object v0, Lrx/internal/c/f;->csf:Lrx/internal/c/f;
 
     return-void
 .end method
@@ -37,7 +38,7 @@
 
 
 # virtual methods
-.method public final KM()Lrx/Scheduler$Worker;
+.method public final KL()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 f9202fdaf8..1ca21e0186 100644
--- a/com.discord/smali_classes2/rx/internal/c/g.smali
+++ b/com.discord/smali_classes2/rx/internal/c/g.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/g;
 .super Lrx/Scheduler;
+.source "NewThreadScheduler.java"
 
 
 # instance fields
@@ -19,7 +20,7 @@
 
 
 # virtual methods
-.method public final KM()Lrx/Scheduler$Worker;
+.method public final KL()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/h;
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 5d03d2afc4..0ae3326434 100644
--- a/com.discord/smali_classes2/rx/internal/c/h$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/h$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/h$1;
 .super Ljava/lang/Object;
+.source "NewThreadWorker.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
@@ -30,7 +31,7 @@
 .method public final run()V
     .locals 0
 
-    invoke-static {}, Lrx/internal/c/h;->LA()V
+    invoke-static {}, Lrx/internal/c/h;->Lz()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 1245993520..09812e2dd1 100644
--- a/com.discord/smali_classes2/rx/internal/c/h.smali
+++ b/com.discord/smali_classes2/rx/internal/c/h.smali
@@ -1,16 +1,17 @@
 .class public Lrx/internal/c/h;
 .super Lrx/Scheduler$Worker;
+.source "NewThreadWorker.java"
 
 # interfaces
 .implements Lrx/Subscription;
 
 
 # static fields
-.field private static final csP:Z
+.field private static final csj:Z
 
-.field public static final csQ:I
+.field public static final csk:I
 
-.field private static final csR:Ljava/util/concurrent/ConcurrentHashMap;
+.field private static final csl:Ljava/util/concurrent/ConcurrentHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentHashMap<",
@@ -21,7 +22,7 @@
     .end annotation
 .end field
 
-.field private static final csS:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final csm:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -31,13 +32,13 @@
     .end annotation
 .end field
 
-.field private static volatile csT:Ljava/lang/Object;
+.field private static volatile csn:Ljava/lang/Object;
 
-.field private static final csU:Ljava/lang/Object;
+.field private static final cso:Ljava/lang/Object;
 
 
 # instance fields
-.field volatile csO:Z
+.field volatile csi:Z
 
 .field final nK:Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -50,19 +51,19 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/c/h;->csU:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/c/h;->cso: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;->csR:Ljava/util/concurrent/ConcurrentHashMap;
+    sput-object v0, Lrx/internal/c/h;->csl: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;->csS:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/internal/c/h;->csm:Ljava/util/concurrent/atomic/AtomicReference;
 
     const-string v0, "rx.scheduler.jdk6.purge-frequency-millis"
 
@@ -76,7 +77,7 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/c/h;->csQ:I
+    sput v0, Lrx/internal/c/h;->csk:I
 
     const-string v0, "rx.scheduler.jdk6.purge-force"
 
@@ -84,7 +85,7 @@
 
     move-result v0
 
-    invoke-static {}, Lrx/internal/util/h;->LE()I
+    invoke-static {}, Lrx/internal/util/h;->LD()I
 
     move-result v1
 
@@ -105,7 +106,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/c/h;->csP:Z
+    sput-boolean v0, Lrx/internal/c/h;->csj:Z
 
     return-void
 .end method
@@ -143,11 +144,11 @@
     return-void
 .end method
 
-.method static LA()V
+.method static Lz()V
     .locals 3
 
     :try_start_0
-    sget-object v0, Lrx/internal/c/h;->csR:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->csl:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -203,7 +204,7 @@
 .method public static a(Ljava/util/concurrent/ScheduledExecutorService;)V
     .locals 1
 
-    sget-object v0, Lrx/internal/c/h;->csR:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->csl:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v0, p0}, Ljava/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -214,7 +215,7 @@
     .locals 10
 
     :goto_0
-    sget-object v0, Lrx/internal/c/h;->csS:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->csm:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -236,7 +237,7 @@
 
     move-result-object v3
 
-    sget-object v0, Lrx/internal/c/h;->csS:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->csm:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
@@ -250,12 +251,10 @@
 
     invoke-direct {v4}, Lrx/internal/c/h$1;-><init>()V
 
-    sget v0, Lrx/internal/c/h;->csQ:I
+    sget v0, Lrx/internal/c/h;->csk:I
 
     int-to-long v5, v0
 
-    sget v0, Lrx/internal/c/h;->csQ:I
-
     int-to-long v7, v0
 
     sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
@@ -271,7 +270,7 @@
 
     :cond_1
     :goto_1
-    sget-object v0, Lrx/internal/c/h;->csR:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->csl:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v0, p0, p0}, Ljava/util/concurrent/ConcurrentHashMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -281,7 +280,7 @@
 .method public static b(Ljava/util/concurrent/ScheduledExecutorService;)Z
     .locals 5
 
-    sget-boolean v0, Lrx/internal/c/h;->csP:Z
+    sget-boolean v0, Lrx/internal/c/h;->csj:Z
 
     const/4 v1, 0x0
 
@@ -291,9 +290,9 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lrx/internal/c/h;->csT:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/c/h;->csn:Ljava/lang/Object;
 
-    sget-object v2, Lrx/internal/c/h;->csU:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->cso:Ljava/lang/Object;
 
     if-ne v0, v2, :cond_0
 
@@ -313,10 +312,10 @@
     goto :goto_0
 
     :cond_1
-    sget-object v2, Lrx/internal/c/h;->csU:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->cso:Ljava/lang/Object;
 
     :goto_0
-    sput-object v2, Lrx/internal/c/h;->csT:Ljava/lang/Object;
+    sput-object v2, Lrx/internal/c/h;->csn:Ljava/lang/Object;
 
     goto :goto_1
 
@@ -344,8 +343,8 @@
 
     invoke-virtual {v0, p0, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
     return v2
@@ -355,7 +354,22 @@
 
     invoke-static {p0}, Lrx/c/c;->onError(Ljava/lang/Throwable;)V
 
+    goto :goto_2
+
+    :catch_1
+    move-exception p0
+
+    invoke-static {p0}, Lrx/c/c;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :catch_2
+    move-exception p0
+
+    invoke-static {p0}, Lrx/c/c;->onError(Ljava/lang/Throwable;)V
+
     :cond_4
+    :goto_2
     return v1
 .end method
 
@@ -427,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;->csO:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->csi:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -500,7 +514,7 @@
 .method public isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/c/h;->csO:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->csi:Z
 
     return v0
 .end method
@@ -510,7 +524,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/c/h;->csO:Z
+    iput-boolean v0, p0, Lrx/internal/c/h;->csi:Z
 
     iget-object v0, p0, Lrx/internal/c/h;->nK:Ljava/util/concurrent/ScheduledExecutorService;
 
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 4833214f43..6ac8fce484 100644
--- a/com.discord/smali_classes2/rx/internal/c/i$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/i$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/i$1;
 .super Ljava/lang/Object;
+.source "SchedulePeriodicHelper.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,23 +18,23 @@
 
 
 # instance fields
-.field csW:J
+.field final synthetic crE:Lrx/functions/Action0;
 
-.field csX:J
+.field csq:J
 
-.field csY:J
+.field csr:J
 
-.field final synthetic csZ:J
+.field css:J
 
-.field final synthetic csk:Lrx/functions/Action0;
+.field final synthetic cst:J
 
-.field final synthetic cta:J
+.field final synthetic csu:J
 
-.field final synthetic ctb:Lrx/internal/d/a;
+.field final synthetic csv:Lrx/internal/d/a;
 
-.field final synthetic ctc:Lrx/internal/c/i$a;
+.field final synthetic csw:Lrx/internal/c/i$a;
 
-.field final synthetic ctd:J
+.field final synthetic csx:J
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -42,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;->csZ:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->cst:J
 
-    iput-wide p3, p0, Lrx/internal/c/i$1;->cta:J
+    iput-wide p3, p0, Lrx/internal/c/i$1;->csu:J
 
-    iput-object p5, p0, Lrx/internal/c/i$1;->csk:Lrx/functions/Action0;
+    iput-object p5, p0, Lrx/internal/c/i$1;->crE:Lrx/functions/Action0;
 
-    iput-object p6, p0, Lrx/internal/c/i$1;->ctb:Lrx/internal/d/a;
+    iput-object p6, p0, Lrx/internal/c/i$1;->csv:Lrx/internal/d/a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lrx/internal/c/i$1;->ctc:Lrx/internal/c/i$a;
+    iput-object p1, p0, Lrx/internal/c/i$1;->csw: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;->ctd:J
+    iput-wide p9, p0, Lrx/internal/c/i$1;->csx:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->csZ:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->cst:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->csX:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->csr:J
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->cta:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->csu:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->csY:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->css:J
 
     return-void
 .end method
@@ -76,11 +77,11 @@
 .method public final call()V
     .locals 10
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->csk:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/i$1;->crE:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->ctb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->csv:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->isUnsubscribed()Z
 
@@ -88,13 +89,11 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->ctc:Lrx/internal/c/i$a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->csw:Lrx/internal/c/i$a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->ctc:Lrx/internal/c/i$a;
-
-    invoke-interface {v0}, Lrx/internal/c/i$a;->LB()J
+    invoke-interface {v0}, Lrx/internal/c/i$a;->LA()J
 
     move-result-wide v0
 
@@ -112,11 +111,11 @@
     move-result-wide v0
 
     :goto_0
-    sget-wide v2, Lrx/internal/c/i;->csV:J
+    sget-wide v2, Lrx/internal/c/i;->csp:J
 
     add-long/2addr v2, v0
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->csX:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->csr:J
 
     const-wide/16 v6, 0x1
 
@@ -124,32 +123,30 @@
 
     if-ltz v8, :cond_2
 
-    iget-wide v2, p0, Lrx/internal/c/i$1;->csX:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->csx:J
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->ctd:J
+    add-long/2addr v4, v2
 
-    add-long/2addr v2, v4
+    sget-wide v2, Lrx/internal/c/i;->csp:J
 
-    sget-wide v4, Lrx/internal/c/i;->csV:J
+    add-long/2addr v4, v2
 
-    add-long/2addr v2, v4
+    cmp-long v2, v0, v4
 
-    cmp-long v4, v0, v2
-
-    if-ltz v4, :cond_1
+    if-ltz v2, :cond_1
 
     goto :goto_1
 
     :cond_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->csY:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->css:J
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->csW:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->csq:J
 
     add-long/2addr v4, v6
 
-    iput-wide v4, p0, Lrx/internal/c/i$1;->csW:J
+    iput-wide v4, p0, Lrx/internal/c/i$1;->csq:J
 
-    iget-wide v6, p0, Lrx/internal/c/i$1;->ctd:J
+    iget-wide v6, p0, Lrx/internal/c/i$1;->csx:J
 
     mul-long v4, v4, v6
 
@@ -159,30 +156,30 @@
 
     :cond_2
     :goto_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->ctd:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->csx:J
 
-    add-long/2addr v2, v0
+    add-long v4, v0, v2
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->ctd:J
-
-    iget-wide v8, p0, Lrx/internal/c/i$1;->csW:J
+    iget-wide v8, p0, Lrx/internal/c/i$1;->csq:J
 
     add-long/2addr v8, v6
 
-    iput-wide v8, p0, Lrx/internal/c/i$1;->csW:J
+    iput-wide v8, p0, Lrx/internal/c/i$1;->csq:J
 
-    mul-long v4, v4, v8
+    mul-long v2, v2, v8
 
-    sub-long v4, v2, v4
+    sub-long v2, v4, v2
 
-    iput-wide v4, p0, Lrx/internal/c/i$1;->csY:J
+    iput-wide v2, p0, Lrx/internal/c/i$1;->css:J
+
+    move-wide v2, v4
 
     :goto_2
-    iput-wide v0, p0, Lrx/internal/c/i$1;->csX:J
+    iput-wide v0, p0, Lrx/internal/c/i$1;->csr:J
 
     sub-long/2addr v2, v0
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->ctb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->csv: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 b28bec1f77..f8be66d2c8 100644
--- a/com.discord/smali_classes2/rx/internal/c/i$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/i$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/internal/c/i$a;
 .super Ljava/lang/Object;
+.source "SchedulePeriodicHelper.java"
 
 
 # annotations
@@ -14,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract LB()J
+.method public abstract LA()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 524c9273b5..ffe10f5257 100644
--- a/com.discord/smali_classes2/rx/internal/c/i.smali
+++ b/com.discord/smali_classes2/rx/internal/c/i.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/i;
 .super Ljava/lang/Object;
+.source "SchedulePeriodicHelper.java"
 
 
 # annotations
@@ -11,7 +12,7 @@
 
 
 # static fields
-.field public static final csV:J
+.field public static final csp:J
 
 
 # direct methods
@@ -36,7 +37,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/c/i;->csV:J
+    sput-wide v0, Lrx/internal/c/i;->csp: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 6d3895f56f..bc5eb8b8eb 100644
--- a/com.discord/smali_classes2/rx/internal/c/j$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/j$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/j$a;
 .super Ljava/lang/Object;
+.source "ScheduledAction.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -17,7 +18,7 @@
 
 
 # instance fields
-.field private final cte:Ljava/util/concurrent/Future;
+.field private final csy:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -26,7 +27,7 @@
     .end annotation
 .end field
 
-.field final synthetic ctf:Lrx/internal/c/j;
+.field final synthetic csz:Lrx/internal/c/j;
 
 
 # direct methods
@@ -40,11 +41,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/c/j$a;->ctf:Lrx/internal/c/j;
+    iput-object p1, p0, Lrx/internal/c/j$a;->csz:Lrx/internal/c/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lrx/internal/c/j$a;->cte:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/j$a;->csy:Ljava/util/concurrent/Future;
 
     return-void
 .end method
@@ -54,7 +55,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/j$a;->cte:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->csy:Ljava/util/concurrent/Future;
 
     invoke-interface {v0}, Ljava/util/concurrent/Future;->isCancelled()Z
 
@@ -66,7 +67,7 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/j$a;->ctf:Lrx/internal/c/j;
+    iget-object v0, p0, Lrx/internal/c/j$a;->csz:Lrx/internal/c/j;
 
     invoke-virtual {v0}, Lrx/internal/c/j;->get()Ljava/lang/Object;
 
@@ -78,19 +79,20 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/j$a;->cte:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->csy:Ljava/util/concurrent/Future;
 
     const/4 v1, 0x1
 
-    :goto_0
     invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/j$a;->cte:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->csy:Ljava/util/concurrent/Future;
 
     const/4 v1, 0x0
 
-    goto :goto_0
+    invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/c/j$b.smali b/com.discord/smali_classes2/rx/internal/c/j$b.smali
index 17c8d11d25..459c4bbc43 100644
--- a/com.discord/smali_classes2/rx/internal/c/j$b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/j$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/j$b;
 .super Ljava/util/concurrent/atomic/AtomicBoolean;
+.source "ScheduledAction.java"
 
 # interfaces
 .implements Lrx/Subscription;
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 6b0d1f14c5..7f2817fa7a 100644
--- a/com.discord/smali_classes2/rx/internal/c/j$c.smali
+++ b/com.discord/smali_classes2/rx/internal/c/j$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/j$c;
 .super Ljava/util/concurrent/atomic/AtomicBoolean;
+.source "ScheduledAction.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -70,16 +71,16 @@
 
     iget-object v1, p0, Lrx/internal/c/j$c;->s:Lrx/internal/c/j;
 
-    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
     if-nez v2, :cond_2
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v2, v0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iget-object v2, v0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
-    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
     if-nez v3, :cond_1
 
diff --git a/com.discord/smali_classes2/rx/internal/c/j.smali b/com.discord/smali_classes2/rx/internal/c/j.smali
index a169d371f0..d1ac654050 100644
--- a/com.discord/smali_classes2/rx/internal/c/j.smali
+++ b/com.discord/smali_classes2/rx/internal/c/j.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/j;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "ScheduledAction.java"
 
 # interfaces
 .implements Ljava/lang/Runnable;
diff --git a/com.discord/smali_classes2/rx/internal/c/k.smali b/com.discord/smali_classes2/rx/internal/c/k.smali
index 30b7d5ab49..17fc10b51c 100644
--- a/com.discord/smali_classes2/rx/internal/c/k.smali
+++ b/com.discord/smali_classes2/rx/internal/c/k.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/internal/c/k;
 .super Ljava/lang/Object;
+.source "SchedulerLifecycle.java"
 
 
 # virtual methods
diff --git a/com.discord/smali_classes2/rx/internal/c/l.smali b/com.discord/smali_classes2/rx/internal/c/l.smali
index bcaaaef323..89fff5277f 100644
--- a/com.discord/smali_classes2/rx/internal/c/l.smali
+++ b/com.discord/smali_classes2/rx/internal/c/l.smali
@@ -1,16 +1,17 @@
 .class final Lrx/internal/c/l;
 .super Ljava/lang/Object;
+.source "SleepingAction.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
 
 
 # instance fields
-.field private final ctg:Lrx/functions/Action0;
+.field private final csA:Lrx/functions/Action0;
 
-.field private final cth:Lrx/Scheduler$Worker;
+.field private final csB:Lrx/Scheduler$Worker;
 
-.field private final cti:J
+.field private final csC:J
 
 
 # direct methods
@@ -19,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/l;->ctg:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/c/l;->csA:Lrx/functions/Action0;
 
-    iput-object p2, p0, Lrx/internal/c/l;->cth:Lrx/Scheduler$Worker;
+    iput-object p2, p0, Lrx/internal/c/l;->csB:Lrx/Scheduler$Worker;
 
-    iput-wide p3, p0, Lrx/internal/c/l;->cti:J
+    iput-wide p3, p0, Lrx/internal/c/l;->csC:J
 
     return-void
 .end method
@@ -33,7 +34,7 @@
 .method public final call()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/c/l;->cth:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->csB:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->isUnsubscribed()Z
 
@@ -44,7 +45,7 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lrx/internal/c/l;->cti:J
+    iget-wide v0, p0, Lrx/internal/c/l;->csC:J
 
     invoke-static {}, Lrx/Scheduler$Worker;->now()J
 
@@ -78,7 +79,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/internal/c/l;->cth:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->csB:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->isUnsubscribed()Z
 
@@ -89,7 +90,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/c/l;->ctg:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/l;->csA: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 d953718ce8..72e1cec006 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/m$a$1;
 .super Ljava/lang/Object;
+.source "TrampolineScheduler.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic ctm:Lrx/internal/c/m$b;
+.field final synthetic csG:Lrx/internal/c/m$b;
 
-.field final synthetic ctn:Lrx/internal/c/m$a;
+.field final synthetic csH: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;->ctn:Lrx/internal/c/m$a;
+    iput-object p1, p0, Lrx/internal/c/m$a$1;->csH:Lrx/internal/c/m$a;
 
-    iput-object p2, p0, Lrx/internal/c/m$a$1;->ctm:Lrx/internal/c/m$b;
+    iput-object p2, p0, Lrx/internal/c/m$a$1;->csG:Lrx/internal/c/m$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,11 +41,11 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/m$a$1;->ctn:Lrx/internal/c/m$a;
+    iget-object v0, p0, Lrx/internal/c/m$a$1;->csH:Lrx/internal/c/m$a;
 
-    iget-object v0, v0, Lrx/internal/c/m$a;->ctl:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v0, v0, Lrx/internal/c/m$a;->csF:Ljava/util/concurrent/PriorityBlockingQueue;
 
-    iget-object v1, p0, Lrx/internal/c/m$a$1;->ctm:Lrx/internal/c/m$b;
+    iget-object v1, p0, Lrx/internal/c/m$a$1;->csG: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 de9f4684c5..6dc61c4f4e 100644
--- a/com.discord/smali_classes2/rx/internal/c/m$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/m$a;
 .super Lrx/Scheduler$Worker;
+.source "TrampolineScheduler.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -17,11 +18,9 @@
 
 
 # instance fields
-.field private final csM:Lrx/subscriptions/a;
+.field final csE:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final ctk:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field final ctl:Ljava/util/concurrent/PriorityBlockingQueue;
+.field final csF:Ljava/util/concurrent/PriorityBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/PriorityBlockingQueue<",
@@ -31,6 +30,8 @@
     .end annotation
 .end field
 
+.field private final csg:Lrx/subscriptions/a;
+
 .field private final wip:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
@@ -44,19 +45,19 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/m$a;->ctk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/c/m$a;->csE: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;->ctl:Ljava/util/concurrent/PriorityBlockingQueue;
+    iput-object v0, p0, Lrx/internal/c/m$a;->csF: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;->csM:Lrx/subscriptions/a;
+    iput-object v0, p0, Lrx/internal/c/m$a;->csg:Lrx/subscriptions/a;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -70,7 +71,7 @@
 .method private a(Lrx/functions/Action0;J)Lrx/Subscription;
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/m$a;->csM:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->csg:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->isUnsubscribed()Z
 
@@ -78,7 +79,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -91,7 +92,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lrx/internal/c/m$a;->ctk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p3, p0, Lrx/internal/c/m$a;->csE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p3}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -99,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;->ctl:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->csF:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-virtual {p1, v0}, Ljava/util/concurrent/PriorityBlockingQueue;->add(Ljava/lang/Object;)Z
 
@@ -112,7 +113,7 @@
     if-nez p1, :cond_3
 
     :cond_1
-    iget-object p1, p0, Lrx/internal/c/m$a;->ctl:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->csF:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/PriorityBlockingQueue;->poll()Ljava/lang/Object;
 
@@ -135,7 +136,7 @@
 
     if-gtz p1, :cond_1
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object p1
 
@@ -196,7 +197,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/m$a;->csM:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->csg:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->isUnsubscribed()Z
 
@@ -208,7 +209,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/m$a;->csM:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->csg: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 06ec281b7e..cb07c29279 100644
--- a/com.discord/smali_classes2/rx/internal/c/m$b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/c/m$b;
 .super Ljava/lang/Object;
+.source "TrampolineScheduler.java"
 
 # interfaces
 .implements Ljava/lang/Comparable;
@@ -30,7 +31,7 @@
 
 .field final count:I
 
-.field final cto:Ljava/lang/Long;
+.field final csI:Ljava/lang/Long;
 
 
 # direct methods
@@ -41,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;->cto:Ljava/lang/Long;
+    iput-object p2, p0, Lrx/internal/c/m$b;->csI:Ljava/lang/Long;
 
     iput p3, p0, Lrx/internal/c/m$b;->count:I
 
@@ -55,9 +56,9 @@
 
     check-cast p1, Lrx/internal/c/m$b;
 
-    iget-object v0, p0, Lrx/internal/c/m$b;->cto:Ljava/lang/Long;
+    iget-object v0, p0, Lrx/internal/c/m$b;->csI:Ljava/lang/Long;
 
-    iget-object v1, p1, Lrx/internal/c/m$b;->cto:Ljava/lang/Long;
+    iget-object v1, p1, Lrx/internal/c/m$b;->csI: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 b03da56d96..f4150e9ac5 100644
--- a/com.discord/smali_classes2/rx/internal/c/m.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/c/m;
 .super Lrx/Scheduler;
+.source "TrampolineScheduler.java"
 
 
 # annotations
@@ -12,7 +13,7 @@
 
 
 # static fields
-.field public static final ctj:Lrx/internal/c/m;
+.field public static final csD:Lrx/internal/c/m;
 
 
 # direct methods
@@ -23,7 +24,7 @@
 
     invoke-direct {v0}, Lrx/internal/c/m;-><init>()V
 
-    sput-object v0, Lrx/internal/c/m;->ctj:Lrx/internal/c/m;
+    sput-object v0, Lrx/internal/c/m;->csD:Lrx/internal/c/m;
 
     return-void
 .end method
@@ -60,7 +61,7 @@
 
 
 # virtual methods
-.method public final KM()Lrx/Scheduler$Worker;
+.method public final KL()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 0b481afaff..c358d397d9 100644
--- a/com.discord/smali_classes2/rx/internal/d/a.smali
+++ b/com.discord/smali_classes2/rx/internal/d/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/d/a;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "SequentialSubscription.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -41,7 +42,7 @@
 
 
 # virtual methods
-.method public final LC()Lrx/Subscription;
+.method public final LB()Lrx/Subscription;
     .locals 2
 
     invoke-super {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
@@ -50,14 +51,16 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Mn()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Mm()Lrx/Subscription;
 
     move-result-object v0
 
+    return-object v0
+
     :cond_0
     return-object v0
 .end method
@@ -72,7 +75,7 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_2
 
@@ -112,7 +115,7 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_2
 
@@ -144,7 +147,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_0
 
@@ -167,11 +170,11 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     if-eq v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     invoke-virtual {p0, v0}, Lrx/internal/d/a;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -181,7 +184,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->csJ: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 ecb334f384..3943c411d1 100644
--- a/com.discord/smali_classes2/rx/internal/d/b.smali
+++ b/com.discord/smali_classes2/rx/internal/d/b.smali
@@ -1,5 +1,6 @@
 .class public final enum Lrx/internal/d/b;
 .super Ljava/lang/Enum;
+.source "Unsubscribed.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -17,9 +18,9 @@
 
 
 # static fields
-.field public static final enum ctp:Lrx/internal/d/b;
+.field public static final enum csJ:Lrx/internal/d/b;
 
-.field private static final synthetic ctq:[Lrx/internal/d/b;
+.field private static final synthetic csK:[Lrx/internal/d/b;
 
 
 # direct methods
@@ -32,19 +33,19 @@
 
     invoke-direct {v0, v1}, Lrx/internal/d/b;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/d/b;
 
-    sget-object v1, Lrx/internal/d/b;->ctp:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->csJ:Lrx/internal/d/b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/d/b;->ctq:[Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->csK:[Lrx/internal/d/b;
 
     return-void
 .end method
@@ -81,7 +82,7 @@
 .method public static values()[Lrx/internal/d/b;
     .locals 1
 
-    sget-object v0, Lrx/internal/d/b;->ctq:[Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->csK:[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 2dc4385323..6e769026f2 100644
--- a/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
+++ b/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
@@ -1,14 +1,15 @@
 .class public final Lrx/internal/util/SubscriptionList;
 .super Ljava/lang/Object;
+.source "SubscriptionList.java"
 
 # interfaces
 .implements Lrx/Subscription;
 
 
 # instance fields
-.field public volatile cnf:Z
+.field public volatile cmz:Z
 
-.field public ctT:Ljava/util/List;
+.field public ctn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,9 +38,9 @@
 
     invoke-direct {v0}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
-    iget-object v0, p0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -59,7 +60,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/LinkedList;-><init>(Ljava/util/Collection;)V
 
-    iput-object v0, p0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
     return-void
 .end method
@@ -78,18 +79,18 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -97,7 +98,7 @@
 
     invoke-direct {v0}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
     :cond_1
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
@@ -130,7 +131,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
     return v0
 .end method
@@ -138,14 +139,14 @@
 .method public final unsubscribe()V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
     if-eqz v0, :cond_0
 
@@ -156,13 +157,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cnf:Z
+    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->cmz:Z
 
-    iget-object v0, p0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/util/SubscriptionList;->ctT:Ljava/util/List;
+    iput-object v1, p0, Lrx/internal/util/SubscriptionList;->ctn:Ljava/util/List;
 
     monitor-exit p0
     :try_end_0
diff --git a/com.discord/smali_classes2/rx/internal/util/a.smali b/com.discord/smali_classes2/rx/internal/util/a.smali
index fa472e2493..1349bb4c3a 100644
--- a/com.discord/smali_classes2/rx/internal/util/a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/a;
 .super Ljava/lang/Object;
+.source "ActionObserver.java"
 
 # interfaces
 .implements Lrx/e;
@@ -19,7 +20,7 @@
 
 
 # instance fields
-.field final ctr:Lrx/functions/Action1;
+.field final csL:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -28,7 +29,7 @@
     .end annotation
 .end field
 
-.field final cts:Lrx/functions/Action1;
+.field final csM:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -39,7 +40,7 @@
     .end annotation
 .end field
 
-.field final ctt:Lrx/functions/Action0;
+.field final csN:Lrx/functions/Action0;
 
 
 # direct methods
@@ -61,11 +62,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/a;->ctr:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/a;->csL:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/a;->cts:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/a;->csM:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/a;->ctt:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/a;->csN:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -75,7 +76,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/a;->ctt:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/a;->csN:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
@@ -85,7 +86,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/a;->cts:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->csM:Lrx/functions/Action1;
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
@@ -100,7 +101,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a;->ctr:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->csL: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 3d36af3306..8802530837 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/a.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/a/a;
 .super Ljava/util/AbstractQueue;
+.source "AtomicReferenceArrayQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # instance fields
-.field protected final bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field protected final bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -45,7 +46,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v0, p0, Lrx/internal/util/a/a;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/a;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     return-void
 .end method
@@ -91,7 +92,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/a;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/a;->bUw: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 4a28f129d5..ef9dfb3140 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/b.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/a/b;
 .super Ljava/util/AbstractQueue;
+.source "BaseLinkedAtomicQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # instance fields
-.field final ctY:Ljava/util/concurrent/atomic/AtomicReference;
+.field final cts:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -25,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final ctZ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final ctt:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -46,17 +47,38 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/util/a/b;->ctY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->cts: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;->ctZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->ctt:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
+.method private LH()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;->cts: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 LI()Lrx/internal/util/a/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -67,28 +89,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->ctY: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 LJ()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;->ctZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->ctt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -101,7 +102,7 @@
 
 
 # virtual methods
-.method protected final LK()Lrx/internal/util/a/c;
+.method protected final LJ()Lrx/internal/util/a/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -111,7 +112,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->ctZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->ctt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -132,7 +133,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->ctY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->cts:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
@@ -149,7 +150,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->ctZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->ctt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
@@ -159,11 +160,11 @@
 .method public final isEmpty()Z
     .locals 2
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->LJ()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->LI()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->LI()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->LH()Lrx/internal/util/a/c;
 
     move-result-object v1
 
@@ -199,11 +200,11 @@
 .method public final size()I
     .locals 4
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->LJ()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->LI()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->LI()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->LH()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 8cc5043559..ab8113fd1a 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/c.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/a/c;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "LinkedQueueNode.java"
 
 
 # annotations
@@ -55,7 +56,7 @@
 
 
 # virtual methods
-.method public final LL()Ljava/lang/Object;
+.method public final LK()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 f3f6d124c4..584e22647b 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/d.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/d.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/a/d;
 .super Lrx/internal/util/a/a;
+.source "SpscAtomicArrayQueue.java"
 
 
 # annotations
@@ -15,15 +16,15 @@
 
 
 # static fields
-.field private static final cua:Ljava/lang/Integer;
+.field private static final ctu:Ljava/lang/Integer;
 
 
 # instance fields
 .field final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field cub:J
+.field ctv:J
 
-.field final cuc:I
+.field final ctw:I
 
 .field final producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -40,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/util/a/d;->cua:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/a/d;->ctu:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -64,7 +65,7 @@
 
     div-int/lit8 p1, p1, 0x4
 
-    sget-object v0, Lrx/internal/util/a/d;->cua:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/a/d;->ctu:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -74,7 +75,7 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/d;->cuc:I
+    iput p1, p0, Lrx/internal/util/a/d;->ctw:I
 
     return-void
 .end method
@@ -138,7 +139,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/a/d;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/d;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lrx/internal/util/a/d;->mask:I
 
@@ -152,13 +153,13 @@
 
     and-int/2addr v4, v1
 
-    iget-wide v5, p0, Lrx/internal/util/a/d;->cub:J
+    iget-wide v5, p0, Lrx/internal/util/a/d;->ctv:J
 
     cmp-long v7, v2, v5
 
     if-ltz v7, :cond_1
 
-    iget v5, p0, Lrx/internal/util/a/d;->cuc:I
+    iget v5, p0, Lrx/internal/util/a/d;->ctw:I
 
     int-to-long v5, v5
 
@@ -174,7 +175,7 @@
 
     if-nez v1, :cond_0
 
-    iput-wide v5, p0, Lrx/internal/util/a/d;->cub:J
+    iput-wide v5, p0, Lrx/internal/util/a/d;->ctv:J
 
     goto :goto_0
 
@@ -258,7 +259,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lrx/internal/util/a/d;->bUZ:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lrx/internal/util/a/d;->bUw:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/e.smali b/com.discord/smali_classes2/rx/internal/util/a/e.smali
index 918ad8ec9b..c0d91e589d 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/e.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/e.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/a/e;
 .super Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.source "SpscExactAtomicArrayQueue.java"
 
 # interfaces
 .implements Ljava/util/Queue;
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 c9044363d7..4f1ae553cb 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/f.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/a/f;
 .super Ljava/lang/Object;
+.source "SpscLinkedArrayQueue.java"
 
 # interfaces
 .implements Ljava/util/Queue;
@@ -19,21 +20,15 @@
 
 
 # static fields
-.field static final cud:I
+.field private static final ctD:Ljava/lang/Object;
 
-.field private static final cuj:Ljava/lang/Object;
+.field static final ctx:I
 
 
 # instance fields
 .field final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field cub:J
-
-.field cue:I
-
-.field cuf:I
-
-.field cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -43,9 +38,9 @@
     .end annotation
 .end field
 
-.field cuh:I
+.field ctB:I
 
-.field cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -55,6 +50,12 @@
     .end annotation
 .end field
 
+.field ctv:J
+
+.field cty:I
+
+.field ctz:I
+
 .field final producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
 
@@ -74,13 +75,13 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/a/f;->cud:I
+    sput v0, Lrx/internal/util/a/f;->ctx:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/f;->cuj:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/f;->ctD:Ljava/lang/Object;
 
     return-void
 .end method
@@ -102,29 +103,29 @@
 
     invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v1, p0, Lrx/internal/util/a/f;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->cuf:I
+    iput v0, p0, Lrx/internal/util/a/f;->ctz:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/f;->cud:I
+    sget v2, Lrx/internal/util/a/f;->ctx:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/f;->cue:I
+    iput p1, p0, Lrx/internal/util/a/f;->cty:I
 
-    iput-object v1, p0, Lrx/internal/util/a/f;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->cuh:I
+    iput v0, p0, Lrx/internal/util/a/f;->ctB:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/f;->cub:J
+    iput-wide v0, p0, Lrx/internal/util/a/f;->ctv:J
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -388,7 +389,7 @@
         }
     .end annotation
 
-    iget-object v1, p0, Lrx/internal/util/a/f;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/f;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v0, p0, Lrx/internal/util/a/f;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -396,13 +397,13 @@
 
     move-result-wide v3
 
-    iget v0, p0, Lrx/internal/util/a/f;->cuf:I
+    iget v0, p0, Lrx/internal/util/a/f;->ctz:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/f;->cub:J
+    iget-wide v6, p0, Lrx/internal/util/a/f;->ctv:J
 
     cmp-long v2, v3, v6
 
@@ -419,7 +420,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/f;->cue:I
+    iget v2, p0, Lrx/internal/util/a/f;->cty:I
 
     int-to-long v6, v2
 
@@ -439,7 +440,7 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/f;->cub:J
+    iput-wide v6, p0, Lrx/internal/util/a/f;->ctv:J
 
     move-object v0, p0
 
@@ -452,8 +453,6 @@
     return p1
 
     :cond_1
-    const/4 v2, 0x0
-
     add-long v6, v3, v8
 
     long-to-int v2, v6
@@ -487,19 +486,19 @@
 
     invoke-direct {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v2, p0, Lrx/internal/util/a/f;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/f;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/f;->cub:J
+    iput-wide v3, p0, Lrx/internal/util/a/f;->ctv: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;->cuj:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->ctD:Ljava/lang/Object;
 
     invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
@@ -518,7 +517,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/f;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -526,7 +525,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/f;->cuh:I
+    iget v3, p0, Lrx/internal/util/a/f;->ctB:I
 
     long-to-int v1, v1
 
@@ -536,7 +535,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/f;->cuj:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/f;->ctD:Ljava/lang/Object;
 
     if-ne v2, v3, :cond_0
 
@@ -544,7 +543,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/f;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -564,7 +563,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/f;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -572,7 +571,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/f;->cuh:I
+    iget v3, p0, Lrx/internal/util/a/f;->ctB:I
 
     long-to-int v4, v1
 
@@ -582,7 +581,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/f;->cuj:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/f;->ctD:Ljava/lang/Object;
 
     if-ne v4, v5, :cond_0
 
@@ -598,11 +597,10 @@
 
     const/4 v8, 0x0
 
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_1
 
-    if-nez v5, :cond_2
+    if-nez v5, :cond_1
 
-    :cond_1
     invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
     add-long/2addr v1, v6
@@ -611,20 +609,31 @@
 
     return-object v4
 
-    :cond_2
+    :cond_1
     if-eqz v5, :cond_3
 
     invoke-static {v0}, Lrx/internal/util/a/f;->a(Ljava/util/concurrent/atomic/AtomicReferenceArray;)Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/f;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
     move-result-object v4
 
-    if-nez v4, :cond_1
+    if-nez v4, :cond_2
+
+    return-object v8
+
+    :cond_2
+    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    add-long/2addr v1, v6
+
+    invoke-direct {p0, v1, v2}, Lrx/internal/util/a/f;->bw(J)V
+
+    return-object v4
 
     :cond_3
     return-object v8
@@ -762,7 +771,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/f;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -770,7 +779,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/f;->cuf:I
+    iget v3, p0, Lrx/internal/util/a/f;->ctz:I
 
     const-wide/16 v4, 0x2
 
@@ -794,12 +803,11 @@
 
     invoke-virtual {v0, v2, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
-    :goto_0
     invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
     invoke-direct {p0, v4, v5}, Lrx/internal/util/a/f;->bv(J)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
@@ -810,7 +818,7 @@
 
     invoke-direct {v7, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v7, p0, Lrx/internal/util/a/f;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v7, p0, Lrx/internal/util/a/f;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     long-to-int v1, v1
 
@@ -824,11 +832,13 @@
 
     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;->cuj:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->ctD:Ljava/lang/Object;
 
-    goto :goto_0
+    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
-    :goto_1
+    invoke-direct {p0, v4, v5}, Lrx/internal/util/a/f;->bv(J)V
+
+    :goto_0
     const/4 p1, 0x1
 
     return p1
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 a5f0206eb4..a94fbf7c75 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/g.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/g.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/a/g;
 .super Lrx/internal/util/a/b;
+.source "SpscLinkedAtomicQueue.java"
 
 
 # annotations
@@ -51,7 +52,7 @@
 
     invoke-direct {v0, p1}, Lrx/internal/util/a/c;-><init>(Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lrx/internal/util/a/b;->ctY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/util/a/b;->cts:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -85,7 +86,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->LK()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->LJ()Lrx/internal/util/a/c;
 
     move-result-object v0
 
@@ -115,7 +116,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->LK()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->LJ()Lrx/internal/util/a/c;
 
     move-result-object v0
 
@@ -127,7 +128,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lrx/internal/util/a/c;->LL()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->LK()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 f4ccd00d99..2a61b42bdc 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/h.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/a/h;
 .super Ljava/lang/Object;
+.source "SpscUnboundedAtomicArrayQueue.java"
 
 # interfaces
 .implements Ljava/util/Queue;
@@ -19,21 +20,15 @@
 
 
 # static fields
-.field static final cud:I
+.field private static final ctD:Ljava/lang/Object;
 
-.field private static final cuj:Ljava/lang/Object;
+.field static final ctx:I
 
 
 # instance fields
 .field final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field cub:J
-
-.field cue:I
-
-.field cuf:I
-
-.field cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -43,9 +38,9 @@
     .end annotation
 .end field
 
-.field cuh:I
+.field ctB:I
 
-.field cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -55,6 +50,12 @@
     .end annotation
 .end field
 
+.field ctv:J
+
+.field cty:I
+
+.field ctz:I
+
 .field final producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
 
@@ -74,13 +75,13 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/a/h;->cud:I
+    sput v0, Lrx/internal/util/a/h;->ctx:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/h;->cuj:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/h;->ctD:Ljava/lang/Object;
 
     return-void
 .end method
@@ -120,29 +121,29 @@
 
     invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v1, p0, Lrx/internal/util/a/h;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->cuf:I
+    iput v0, p0, Lrx/internal/util/a/h;->ctz:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/h;->cud:I
+    sget v2, Lrx/internal/util/a/h;->ctx:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/h;->cue:I
+    iput p1, p0, Lrx/internal/util/a/h;->cty:I
 
-    iput-object v1, p0, Lrx/internal/util/a/h;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->cuh:I
+    iput v0, p0, Lrx/internal/util/a/h;->ctB:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/h;->cub:J
+    iput-wide v0, p0, Lrx/internal/util/a/h;->ctv:J
 
     const-wide/16 v0, 0x0
 
@@ -375,7 +376,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v1, p0, Lrx/internal/util/a/h;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/h;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v0, p0, Lrx/internal/util/a/h;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -383,19 +384,18 @@
 
     move-result-wide v3
 
-    iget v0, p0, Lrx/internal/util/a/h;->cuf:I
+    iget v0, p0, Lrx/internal/util/a/h;->ctz:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/h;->cub:J
+    iget-wide v6, p0, Lrx/internal/util/a/h;->ctv:J
 
     cmp-long v2, v3, v6
 
     if-gez v2, :cond_0
 
-    :goto_0
     move-object v0, p0
 
     move-object v2, p1
@@ -407,7 +407,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/h;->cue:I
+    iget v2, p0, Lrx/internal/util/a/h;->cty:I
 
     int-to-long v6, v2
 
@@ -427,13 +427,19 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/h;->cub:J
+    iput-wide v6, p0, Lrx/internal/util/a/h;->ctv:J
 
-    goto :goto_0
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v5}, Lrx/internal/util/a/h;->a(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/lang/Object;JI)Z
+
+    move-result p1
+
+    return p1
 
     :cond_1
-    const/4 v2, 0x0
-
     add-long v6, v3, v8
 
     long-to-int v2, v6
@@ -446,7 +452,15 @@
 
     if-eqz v2, :cond_2
 
-    goto :goto_0
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v5}, Lrx/internal/util/a/h;->a(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/lang/Object;JI)Z
+
+    move-result p1
+
+    return p1
 
     :cond_2
     int-to-long v10, v0
@@ -459,13 +473,13 @@
 
     invoke-direct {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v2, p0, Lrx/internal/util/a/h;->cug:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/h;->ctA:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/h;->cub:J
+    iput-wide v3, p0, Lrx/internal/util/a/h;->ctv:J
 
     invoke-direct {p0, v6, v7}, Lrx/internal/util/a/h;->bv(J)V
 
@@ -481,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;->cuj:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/h;->ctD:Ljava/lang/Object;
 
     invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
@@ -503,7 +517,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/h;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/h;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -511,7 +525,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/h;->cuh:I
+    iget v3, p0, Lrx/internal/util/a/h;->ctB:I
 
     long-to-int v1, v1
 
@@ -521,7 +535,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/h;->cuj:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/h;->ctD:Ljava/lang/Object;
 
     if-ne v2, v3, :cond_0
 
@@ -529,7 +543,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/h;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -549,7 +563,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/h;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/h;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -557,7 +571,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/h;->cuh:I
+    iget v3, p0, Lrx/internal/util/a/h;->ctB:I
 
     long-to-int v4, v1
 
@@ -567,7 +581,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/h;->cuj:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/h;->ctD:Ljava/lang/Object;
 
     if-ne v4, v5, :cond_0
 
@@ -587,7 +601,6 @@
 
     if-nez v5, :cond_1
 
-    :goto_1
     add-long/2addr v1, v6
 
     invoke-direct {p0, v1, v2}, Lrx/internal/util/a/h;->bw(J)V
@@ -603,7 +616,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/h;->cui:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->ctC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -614,9 +627,13 @@
     return-object v8
 
     :cond_2
-    const/4 v5, 0x0
+    add-long/2addr v1, v6
 
-    goto :goto_1
+    invoke-direct {p0, v1, v2}, Lrx/internal/util/a/h;->bw(J)V
+
+    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    return-object v4
 
     :cond_3
     return-object v8
diff --git a/com.discord/smali_classes2/rx/internal/util/b.smali b/com.discord/smali_classes2/rx/internal/util/b.smali
index 294f45af8d..3809dbde94 100644
--- a/com.discord/smali_classes2/rx/internal/util/b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/b;
 .super Lrx/Subscriber;
+.source "ActionSubscriber.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # instance fields
-.field final ctr:Lrx/functions/Action1;
+.field final csL:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -24,7 +25,7 @@
     .end annotation
 .end field
 
-.field final cts:Lrx/functions/Action1;
+.field final csM:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -34,7 +35,7 @@
     .end annotation
 .end field
 
-.field final ctt:Lrx/functions/Action0;
+.field final csN:Lrx/functions/Action0;
 
 
 # direct methods
@@ -55,11 +56,11 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/b;->ctr:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/b;->csL:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/b;->cts:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/b;->csM:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/b;->ctt:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/b;->csN:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -69,7 +70,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/b;->ctt:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/b;->csN:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
@@ -79,7 +80,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/b;->cts:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->csM:Lrx/functions/Action1;
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
@@ -94,7 +95,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b;->ctr:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->csL: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 c3e94eb190..75113338c2 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/a.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/a;
 .super Lrx/internal/util/b/b;
+.source "BaseLinkedQueue.java"
 
 
 # annotations
@@ -28,11 +29,11 @@
 .method public final isEmpty()Z
     .locals 2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->LJ()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->LI()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->LI()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->LH()Lrx/internal/util/a/c;
 
     move-result-object v1
 
@@ -68,11 +69,11 @@
 .method public final size()I
     .locals 4
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->LJ()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->LI()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->LI()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->LH()Lrx/internal/util/a/c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/aa.smali b/com.discord/smali_classes2/rx/internal/util/b/aa.smali
index 76f2531faa..d7951386db 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/aa.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/aa.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/aa;
 .super Lrx/internal/util/b/z;
+.source "SpscUnboundedArrayQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/ab.smali b/com.discord/smali_classes2/rx/internal/util/b/ab.smali
index 93e6fce2ee..d507646d56 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ab.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ab.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/ab;
 .super Lrx/internal/util/b/ac;
+.source "SpscUnboundedArrayQueue.java"
 
 
 # annotations
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 5d90928293..b4b2b71c1e 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ac.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ac.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/ac;
 .super Lrx/internal/util/b/ad;
+.source "SpscUnboundedArrayQueue.java"
 
 
 # annotations
@@ -15,13 +16,9 @@
 
 
 # instance fields
-.field protected cub:J
+.field protected ctQ:J
 
-.field protected cue:I
-
-.field protected cuw:J
-
-.field protected cux:[Ljava/lang/Object;
+.field protected ctR:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -29,6 +26,10 @@
     .end annotation
 .end field
 
+.field protected ctv:J
+
+.field protected cty:I
+
 
 # direct methods
 .method constructor <init>()V
diff --git a/com.discord/smali_classes2/rx/internal/util/b/ad.smali b/com.discord/smali_classes2/rx/internal/util/b/ad.smali
index c24a50ed12..32ee705dd1 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ad.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ad.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/ad;
 .super Ljava/util/AbstractQueue;
+.source "SpscUnboundedArrayQueue.java"
 
 
 # annotations
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 93cd324371..947a000b63 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ae.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ae.smali
@@ -1,11 +1,12 @@
 .class public final Lrx/internal/util/b/ae;
 .super Ljava/lang/Object;
+.source "UnsafeAccess.java"
 
 
 # static fields
-.field public static final cuy:Lsun/misc/Unsafe;
+.field public static final ctS:Lsun/misc/Unsafe;
 
-.field private static final cuz:Z
+.field private static final ctT:Z
 
 
 # direct methods
@@ -30,7 +31,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/util/b/ae;->cuz:Z
+    sput-boolean v0, Lrx/internal/util/b/ae;->ctT:Z
 
     const/4 v0, 0x0
 
@@ -56,19 +57,19 @@
     move-object v0, v1
 
     :catch_0
-    sput-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sput-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
     return-void
 .end method
 
-.method public static LO()Z
+.method public static LN()Z
     .locals 1
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
     if-eqz v0, :cond_0
 
-    sget-boolean v0, Lrx/internal/util/b/ae;->cuz:Z
+    sget-boolean v0, Lrx/internal/util/b/ae;->ctT:Z
 
     if-nez v0, :cond_0
 
@@ -99,7 +100,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object p1, Lrx/internal/util/b/ae;->ctS: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 ec0f8488fa..ec02f8b6f9 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/b.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/b;
 .super Lrx/internal/util/b/d;
+.source "BaseLinkedQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field protected static final cuk:J
+.field protected static final ctE:J
 
 
 # instance fields
@@ -41,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/b;->cuk:J
+    sput-wide v0, Lrx/internal/util/b/b;->ctE:J
 
     return-void
 .end method
@@ -56,7 +57,7 @@
 
 
 # virtual methods
-.method protected final LJ()Lrx/internal/util/a/c;
+.method protected final LI()Lrx/internal/util/a/c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -66,9 +67,9 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/b;->cuk:J
+    sget-wide v1, Lrx/internal/util/b/b;->ctE: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/c.smali b/com.discord/smali_classes2/rx/internal/util/b/c.smali
index e18a04af48..9712edc6c4 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/c.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/c.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/c;
 .super Ljava/util/AbstractQueue;
+.source "BaseLinkedQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/d.smali b/com.discord/smali_classes2/rx/internal/util/b/d.smali
index a450241117..0f2e0bd306 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/d.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/d.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/d;
 .super Lrx/internal/util/b/e;
+.source "BaseLinkedQueue.java"
 
 
 # annotations
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 15ebf9a7af..2ea4ae61cc 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/e.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/e.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/e;
 .super Lrx/internal/util/b/c;
+.source "BaseLinkedQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field protected static final cul:J
+.field protected static final ctF:J
 
 
 # instance fields
@@ -41,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/e;->cul:J
+    sput-wide v0, Lrx/internal/util/b/e;->ctF:J
 
     return-void
 .end method
@@ -56,7 +57,7 @@
 
 
 # virtual methods
-.method protected final LI()Lrx/internal/util/a/c;
+.method protected final LH()Lrx/internal/util/a/c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -66,9 +67,9 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/e;->cul:J
+    sget-wide v1, Lrx/internal/util/b/e;->ctF: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 1086d7635b..75bc6b0559 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/f.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/internal/util/b/f;
 .super Lrx/internal/util/b/g;
+.source "ConcurrentCircularArrayQueue.java"
 
 
 # annotations
@@ -15,17 +16,17 @@
 
 
 # static fields
-.field protected static final cum:I
+.field protected static final ctG:I
 
-.field private static final cun:J
+.field private static final ctH:J
 
-.field private static final cuo:I
+.field private static final ctI:I
 
 
 # instance fields
-.field protected final cup:J
+.field protected final ctJ:J
 
-.field protected final cuq:[Ljava/lang/Object;
+.field protected final ctK:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -50,9 +51,9 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/f;->cum:I
+    sput v0, Lrx/internal/util/b/f;->ctG:I
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -64,28 +65,27 @@
 
     if-ne v1, v0, :cond_0
 
-    sget v0, Lrx/internal/util/b/f;->cum:I
+    sget v0, Lrx/internal/util/b/f;->ctG:I
 
     add-int/lit8 v0, v0, 0x2
 
-    :goto_0
-    sput v0, Lrx/internal/util/b/f;->cuo:I
+    sput v0, Lrx/internal/util/b/f;->ctI:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/16 v1, 0x8
 
     if-ne v1, v0, :cond_1
 
-    sget v0, Lrx/internal/util/b/f;->cum:I
+    sget v0, Lrx/internal/util/b/f;->ctG:I
 
     add-int/lit8 v0, v0, 0x3
 
-    goto :goto_0
+    sput v0, Lrx/internal/util/b/f;->ctI:I
 
-    :goto_1
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    :goto_0
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -95,9 +95,9 @@
 
     const/16 v1, 0x20
 
-    sget v2, Lrx/internal/util/b/f;->cuo:I
+    sget v2, Lrx/internal/util/b/f;->ctI:I
 
-    sget v3, Lrx/internal/util/b/f;->cum:I
+    sget v3, Lrx/internal/util/b/f;->ctG:I
 
     sub-int/2addr v2, v3
 
@@ -107,7 +107,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lrx/internal/util/b/f;->cun:J
+    sput-wide v0, Lrx/internal/util/b/f;->ctH:J
 
     return-void
 
@@ -134,9 +134,9 @@
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/b/f;->cup:J
+    iput-wide v0, p0, Lrx/internal/util/b/f;->ctJ:J
 
-    sget v0, Lrx/internal/util/b/f;->cum:I
+    sget v0, Lrx/internal/util/b/f;->ctG: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;->cuq:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/b/f;->ctK:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS: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;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS: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 bx(J)J
     .locals 4
 
-    iget-wide v0, p0, Lrx/internal/util/b/f;->cup:J
+    iget-wide v0, p0, Lrx/internal/util/b/f;->ctJ:J
 
-    sget-wide v2, Lrx/internal/util/b/f;->cun:J
+    sget-wide v2, Lrx/internal/util/b/f;->ctH:J
 
     and-long/2addr p1, v0
 
-    sget v0, Lrx/internal/util/b/f;->cuo:I
+    sget v0, Lrx/internal/util/b/f;->ctI:I
 
     shl-long/2addr p1, v0
 
@@ -211,7 +211,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/f;->cuq:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/f;->ctK:[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/g.smali b/com.discord/smali_classes2/rx/internal/util/b/g.smali
index 7bc0599b59..ee9746b089 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/g.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/g.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/g;
 .super Ljava/util/AbstractQueue;
+.source "ConcurrentCircularArrayQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/h.smali b/com.discord/smali_classes2/rx/internal/util/b/h.smali
index e5d2276f49..b832151518 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/h.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/b/h;
 .super Ljava/lang/Object;
+.source "Pow2.java"
 
 
 # direct methods
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 82c96d28a7..95eec22101 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/i.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/i.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/b/i;
 .super Lrx/internal/util/b/m;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
@@ -56,9 +57,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/b/i;->cuq:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/i;->ctK:[Ljava/lang/Object;
 
-    iget-wide v1, p0, Lrx/internal/util/b/i;->cup:J
+    iget-wide v1, p0, Lrx/internal/util/b/i;->ctJ:J
 
     iget-wide v3, p0, Lrx/internal/util/b/o;->producerIndex:J
 
@@ -92,7 +93,7 @@
     if-nez v1, :cond_0
 
     :cond_1
-    sget-object v1, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0, v5, v6, p1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -114,6 +115,8 @@
     invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
+
+    return-void
 .end method
 
 .method public final peek()Ljava/lang/Object;
@@ -124,7 +127,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lrx/internal/util/b/p;->cut:J
+    iget-wide v0, p0, Lrx/internal/util/b/p;->ctN:J
 
     :cond_0
     iget-wide v2, p0, Lrx/internal/util/b/j;->consumerIndex:J
@@ -144,7 +147,7 @@
     return-object v0
 
     :cond_1
-    iput-wide v4, p0, Lrx/internal/util/b/p;->cut:J
+    iput-wide v4, p0, Lrx/internal/util/b/p;->ctN:J
 
     :cond_2
     invoke-virtual {p0, v2, v3}, Lrx/internal/util/b/i;->bx(J)J
@@ -168,7 +171,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lrx/internal/util/b/p;->cut:J
+    iget-wide v0, p0, Lrx/internal/util/b/p;->ctN:J
 
     :cond_0
     iget-wide v2, p0, Lrx/internal/util/b/j;->consumerIndex:J
@@ -188,7 +191,7 @@
     return-object v4
 
     :cond_1
-    iput-wide v5, p0, Lrx/internal/util/b/p;->cut:J
+    iput-wide v5, p0, Lrx/internal/util/b/p;->ctN:J
 
     :cond_2
     const-wide/16 v5, 0x1
@@ -205,9 +208,9 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lrx/internal/util/b/i;->cuq:[Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/b/i;->ctK:[Ljava/lang/Object;
 
-    sget-object v3, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v3, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
     invoke-virtual {v3, v2, v0, v1}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/j.smali b/com.discord/smali_classes2/rx/internal/util/b/j.smali
index d0bd4fd64b..3dea093ae9 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/j.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/j.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/j;
 .super Lrx/internal/util/b/l;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field protected static final cur:J
+.field protected static final ctL:J
 
 
 # instance fields
@@ -34,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/j;->cur:J
+    sput-wide v0, Lrx/internal/util/b/j;->ctL:J
 
     return-void
 .end method
@@ -52,9 +53,9 @@
 .method protected final j(JJ)Z
     .locals 8
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/j;->cur:J
+    sget-wide v2, Lrx/internal/util/b/j;->ctL:J
 
     move-object v1, p0
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/k.smali b/com.discord/smali_classes2/rx/internal/util/b/k.smali
index 40963b05d8..039c08a3e7 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/k.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/k.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/k;
 .super Lrx/internal/util/b/f;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/l.smali b/com.discord/smali_classes2/rx/internal/util/b/l.smali
index f3c6f92690..7fb9663767 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/l.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/l.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/l;
 .super Lrx/internal/util/b/o;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/m.smali b/com.discord/smali_classes2/rx/internal/util/b/m.smali
index 4ac6e56344..5b9f0cc4ea 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/m.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/m.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/m;
 .super Lrx/internal/util/b/p;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/n.smali b/com.discord/smali_classes2/rx/internal/util/b/n.smali
index b7c141135c..48a492e5f2 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/n.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/n.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/n;
 .super Lrx/internal/util/b/j;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
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 05ee0272df..07a09efa5e 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/o.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/o.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/o;
 .super Lrx/internal/util/b/k;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field protected static final cus:J
+.field protected static final ctM:J
 
 
 # instance fields
@@ -34,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/o;->cus:J
+    sput-wide v0, Lrx/internal/util/b/o;->ctM:J
 
     return-void
 .end method
@@ -52,9 +53,9 @@
 .method protected final bz(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/o;->cus:J
+    sget-wide v2, Lrx/internal/util/b/o;->ctM: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 a5f1a869e2..83ed6ad4a3 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/p.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/p.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/p;
 .super Lrx/internal/util/b/n;
+.source "SpmcArrayQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # instance fields
-.field volatile cut:J
+.field volatile ctN:J
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/internal/util/b/q.smali b/com.discord/smali_classes2/rx/internal/util/b/q.smali
index 23a4c6c78c..d5f7a3a572 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/q.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/q.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/b/q;
 .super Lrx/internal/util/b/v;
+.source "SpscArrayQueue.java"
 
 
 # annotations
@@ -23,12 +24,12 @@
     return-void
 .end method
 
-.method private LM()J
+.method private LL()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->cus:J
+    sget-wide v1, Lrx/internal/util/b/q;->ctM:J
 
     invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
 
@@ -37,12 +38,12 @@
     return-wide v0
 .end method
 
-.method private LN()J
+.method private LM()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->cur:J
+    sget-wide v1, Lrx/internal/util/b/q;->ctL:J
 
     invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
 
@@ -56,11 +57,11 @@
 .method public final isEmpty()Z
     .locals 5
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->LM()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->LL()J
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->LN()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->LM()J
 
     move-result-wide v2
 
@@ -88,7 +89,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/util/b/q;->cuq:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/q;->ctK:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/q;->producerIndex:J
 
@@ -113,9 +114,9 @@
 
     add-long v9, v1, v3
 
-    sget-object v5, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v5, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v7, Lrx/internal/util/b/q;->cus:J
+    sget-wide v7, Lrx/internal/util/b/q;->ctM:J
 
     move-object v6, p0
 
@@ -170,7 +171,7 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/util/b/q;->cuq:[Ljava/lang/Object;
+    iget-object v4, p0, Lrx/internal/util/b/q;->ctK:[Ljava/lang/Object;
 
     invoke-static {v4, v2, v3}, Lrx/internal/util/b/q;->a([Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -189,9 +190,9 @@
 
     add-long v10, v0, v2
 
-    sget-object v6, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v6, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v8, Lrx/internal/util/b/q;->cur:J
+    sget-wide v8, Lrx/internal/util/b/q;->ctL:J
 
     move-object v7, p0
 
@@ -203,16 +204,16 @@
 .method public final size()I
     .locals 7
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->LN()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->LM()J
 
     move-result-wide v0
 
     :goto_0
-    invoke-direct {p0}, Lrx/internal/util/b/q;->LM()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->LL()J
 
     move-result-wide v2
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->LN()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->LM()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 f3d5096b3a..b978c7e3bc 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/r.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/r.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/r;
 .super Lrx/internal/util/b/f;
+.source "SpscArrayQueue.java"
 
 
 # annotations
@@ -15,11 +16,11 @@
 
 
 # static fields
-.field private static final cua:Ljava/lang/Integer;
+.field private static final ctu:Ljava/lang/Integer;
 
 
 # instance fields
-.field protected final cuc:I
+.field protected final ctw:I
 
 
 # direct methods
@@ -34,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/util/b/r;->cua:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/b/r;->ctu:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -46,7 +47,7 @@
 
     div-int/lit8 p1, p1, 0x4
 
-    sget-object v0, Lrx/internal/util/b/r;->cua:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/b/r;->ctu:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -56,7 +57,7 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/b/r;->cuc:I
+    iput p1, p0, Lrx/internal/util/b/r;->ctw: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 4b126fd476..f1e8d1837f 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/s.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/s.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/s;
 .super Lrx/internal/util/b/u;
+.source "SpscArrayQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field protected static final cur:J
+.field protected static final ctL:J
 
 
 # instance fields
@@ -34,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/s;->cur:J
+    sput-wide v0, Lrx/internal/util/b/s;->ctL:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/util/b/t.smali b/com.discord/smali_classes2/rx/internal/util/b/t.smali
index ec1a765e85..a7e774ad9e 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/t.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/t.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/t;
 .super Lrx/internal/util/b/r;
+.source "SpscArrayQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/u.smali b/com.discord/smali_classes2/rx/internal/util/b/u.smali
index 9e31c88ac7..ed5cb99273 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/u.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/u.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/u;
 .super Lrx/internal/util/b/w;
+.source "SpscArrayQueue.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/b/v.smali b/com.discord/smali_classes2/rx/internal/util/b/v.smali
index a18bf34f6f..b27c3ee164 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/v.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/v.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/v;
 .super Lrx/internal/util/b/s;
+.source "SpscArrayQueue.java"
 
 
 # annotations
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 6e3b7d594c..74f406942f 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/w.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/w.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/w;
 .super Lrx/internal/util/b/t;
+.source "SpscArrayQueue.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # static fields
-.field protected static final cus:J
+.field protected static final ctM:J
 
 
 # instance fields
@@ -34,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/w;->cus:J
+    sput-wide v0, Lrx/internal/util/b/w;->ctM: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 f90559955e..ef596f14b6 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/x.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/x.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/b/x;
 .super Lrx/internal/util/b/a;
+.source "SpscLinkedQueue.java"
 
 
 # annotations
@@ -121,7 +122,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lrx/internal/util/a/c;->LL()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->LK()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 f1af1f8674..a6b91113c4 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/y.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/y.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/b/y;
 .super Lrx/internal/util/b/aa;
+.source "SpscUnboundedArrayQueue.java"
 
 
 # annotations
@@ -15,17 +16,17 @@
 
 
 # static fields
-.field static final cud:I
+.field private static final ctD:Ljava/lang/Object;
 
-.field private static final cuj:Ljava/lang/Object;
+.field private static final ctH:J
 
-.field private static final cun:J
+.field private static final ctI:I
 
-.field private static final cuo:I
+.field private static final ctL:J
 
-.field private static final cur:J
+.field private static final ctM:J
 
-.field private static final cus:J
+.field static final ctx:I
 
 
 # direct methods
@@ -44,15 +45,15 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/y;->cud:I
+    sput v0, Lrx/internal/util/b/y;->ctx:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/b/y;->cuj:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/b/y;->ctD:Ljava/lang/Object;
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -66,10 +67,9 @@
 
     const/4 v0, 0x2
 
-    :goto_0
-    sput v0, Lrx/internal/util/b/y;->cuo:I
+    sput v0, Lrx/internal/util/b/y;->ctI:I
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     const/16 v1, 0x8
@@ -78,10 +78,10 @@
 
     const/4 v0, 0x3
 
-    goto :goto_0
+    sput v0, Lrx/internal/util/b/y;->ctI:I
 
-    :goto_1
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    :goto_0
+    sget-object v0, Lrx/internal/util/b/ae;->ctS: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;->cun:J
+    sput-wide v0, Lrx/internal/util/b/y;->ctH: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;->cuy:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->ctS: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;->cus:J
+    sput-wide v0, Lrx/internal/util/b/y;->ctM: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;->cuy:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->ctS: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;->cur:J
+    sput-wide v0, Lrx/internal/util/b/y;->ctL: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;->cux:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->ctR:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->cuw:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->ctQ:J
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v3, Lrx/internal/util/b/y;->cud:I
+    sget v3, Lrx/internal/util/b/y;->ctx:I
 
     invoke-static {p1, v3}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/b/y;->cue:I
+    iput p1, p0, Lrx/internal/util/b/y;->cty:I
 
-    iput-object v2, p0, Lrx/internal/util/b/y;->cuv:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->ctP:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->cuu:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->ctO:J
 
     const-wide/16 v2, 0x1
 
     sub-long/2addr v0, v2
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->cub:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->ctv:J
 
     const-wide/16 v0, 0x0
 
@@ -215,12 +215,12 @@
     return-void
 .end method
 
-.method private LN()J
+.method private LM()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/y;->cur:J
+    sget-wide v1, Lrx/internal/util/b/y;->ctL: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;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS: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;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS: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 static bA(J)J
     .locals 3
 
-    sget-wide v0, Lrx/internal/util/b/y;->cun:J
+    sget-wide v0, Lrx/internal/util/b/y;->ctH:J
 
-    sget v2, Lrx/internal/util/b/y;->cuo:I
+    sget v2, Lrx/internal/util/b/y;->ctI:I
 
     shl-long/2addr p0, v2
 
@@ -297,9 +297,9 @@
 .method private bv(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->cus:J
+    sget-wide v2, Lrx/internal/util/b/y;->ctM:J
 
     move-object v1, p0
 
@@ -313,9 +313,9 @@
 .method private bw(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->cur:J
+    sget-wide v2, Lrx/internal/util/b/y;->ctL:J
 
     move-object v1, p0
 
@@ -386,11 +386,11 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v1, v7, Lrx/internal/util/b/y;->cux:[Ljava/lang/Object;
+    iget-object v1, v7, Lrx/internal/util/b/y;->ctR:[Ljava/lang/Object;
 
     iget-wide v3, v7, Lrx/internal/util/b/y;->producerIndex:J
 
-    iget-wide v5, v7, Lrx/internal/util/b/y;->cuw:J
+    iget-wide v5, v7, Lrx/internal/util/b/y;->ctQ:J
 
     and-long v8, v3, v5
 
@@ -398,13 +398,12 @@
 
     move-result-wide v8
 
-    iget-wide v10, v7, Lrx/internal/util/b/y;->cub:J
+    iget-wide v10, v7, Lrx/internal/util/b/y;->ctv:J
 
     cmp-long v0, v3, v10
 
     if-gez v0, :cond_0
 
-    :goto_0
     move-object/from16 v0, p0
 
     move-object/from16 v2, p1
@@ -418,7 +417,7 @@
     return v0
 
     :cond_0
-    iget v0, v7, Lrx/internal/util/b/y;->cue:I
+    iget v0, v7, Lrx/internal/util/b/y;->cty:I
 
     int-to-long v10, v0
 
@@ -440,13 +439,21 @@
 
     sub-long/2addr v10, v12
 
-    iput-wide v10, v7, Lrx/internal/util/b/y;->cub:J
+    iput-wide v10, v7, Lrx/internal/util/b/y;->ctv:J
 
-    goto :goto_0
+    move-object/from16 v0, p0
+
+    move-object/from16 v2, p1
+
+    move-wide v5, v8
+
+    invoke-direct/range {v0 .. v6}, Lrx/internal/util/b/y;->a([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    return v0
 
     :cond_1
-    const/4 v0, 0x0
-
     add-long v10, v3, v12
 
     and-long v14, v10, v5
@@ -461,7 +468,17 @@
 
     if-eqz v0, :cond_2
 
-    goto :goto_0
+    move-object/from16 v0, p0
+
+    move-object/from16 v2, p1
+
+    move-wide v5, v8
+
+    invoke-direct/range {v0 .. v6}, Lrx/internal/util/b/y;->a([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    return v0
 
     :cond_2
     array-length v0, v1
@@ -470,13 +487,13 @@
 
     check-cast v0, [Ljava/lang/Object;
 
-    iput-object v0, v7, Lrx/internal/util/b/y;->cux:[Ljava/lang/Object;
+    iput-object v0, v7, Lrx/internal/util/b/y;->ctR:[Ljava/lang/Object;
 
     add-long/2addr v3, v5
 
     sub-long/2addr v3, v12
 
-    iput-wide v3, v7, Lrx/internal/util/b/y;->cub:J
+    iput-wide v3, v7, Lrx/internal/util/b/y;->ctv:J
 
     invoke-static {v0, v8, v9, v2}, Lrx/internal/util/b/y;->a([Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -494,7 +511,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;->cuj:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/util/b/y;->ctD:Ljava/lang/Object;
 
     invoke-static {v1, v8, v9, v0}, Lrx/internal/util/b/y;->a([Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -520,11 +537,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/y;->cuv:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->ctP:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->cuu:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->ctO:J
 
     and-long/2addr v1, v3
 
@@ -536,7 +553,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lrx/internal/util/b/y;->cuj:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/util/b/y;->ctD:Ljava/lang/Object;
 
     if-ne v3, v4, :cond_0
 
@@ -544,7 +561,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/b/y;->cuv:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->ctP:[Ljava/lang/Object;
 
     invoke-static {v1, v2}, Lrx/internal/util/b/y;->bA(J)J
 
@@ -568,11 +585,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/y;->cuv:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->ctP:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->cuu:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->ctO:J
 
     and-long/2addr v3, v1
 
@@ -584,7 +601,7 @@
 
     move-result-object v7
 
-    sget-object v8, Lrx/internal/util/b/y;->cuj:Ljava/lang/Object;
+    sget-object v8, Lrx/internal/util/b/y;->ctD:Ljava/lang/Object;
 
     if-ne v7, v8, :cond_0
 
@@ -619,7 +636,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/b/y;->cuv:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->ctP:[Ljava/lang/Object;
 
     invoke-static {v3, v4}, Lrx/internal/util/b/y;->bA(J)J
 
@@ -649,20 +666,20 @@
 .method public final size()I
     .locals 7
 
-    invoke-direct {p0}, Lrx/internal/util/b/y;->LN()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->LM()J
 
     move-result-wide v0
 
     :goto_0
-    sget-object v2, Lrx/internal/util/b/ae;->cuy:Lsun/misc/Unsafe;
+    sget-object v2, Lrx/internal/util/b/ae;->ctS:Lsun/misc/Unsafe;
 
-    sget-wide v3, Lrx/internal/util/b/y;->cus:J
+    sget-wide v3, Lrx/internal/util/b/y;->ctM: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;->LN()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->LM()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 aca22d9aa9..bb1501131e 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/z.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/z.smali
@@ -1,5 +1,6 @@
 .class abstract Lrx/internal/util/b/z;
 .super Lrx/internal/util/b/ab;
+.source "SpscUnboundedArrayQueue.java"
 
 
 # annotations
@@ -15,9 +16,9 @@
 
 
 # instance fields
-.field protected cuu:J
+.field protected ctO:J
 
-.field protected cuv:[Ljava/lang/Object;
+.field protected ctP:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
diff --git a/com.discord/smali_classes2/rx/internal/util/c$a.smali b/com.discord/smali_classes2/rx/internal/util/c$a.smali
index e2a2165b72..ec65687fa6 100644
--- a/com.discord/smali_classes2/rx/internal/util/c$a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/c$a.smali
@@ -1,5 +1,6 @@
 .class public interface abstract Lrx/internal/util/c$a;
 .super Ljava/lang/Object;
+.source "BackpressureDrainManager.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/internal/util/c.smali b/com.discord/smali_classes2/rx/internal/util/c.smali
index b97249e393..64a1d8f271 100644
--- a/com.discord/smali_classes2/rx/internal/util/c.smali
+++ b/com.discord/smali_classes2/rx/internal/util/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/c;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "BackpressureDrainManager.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -313,6 +314,8 @@
     .catchall {:try_start_a .. :try_end_a} :catchall_5
 
     throw v0
+
+    return-void
 .end method
 
 .method public final request(J)V
@@ -362,8 +365,6 @@
     goto :goto_1
 
     :cond_2
-    const/4 v4, 0x0
-
     sub-long v8, v6, p1
 
     cmp-long v4, v2, v8
@@ -373,8 +374,6 @@
     goto :goto_1
 
     :cond_3
-    const/4 v4, 0x0
-
     add-long v6, v2, p1
 
     :goto_1
diff --git a/com.discord/smali_classes2/rx/internal/util/d.smali b/com.discord/smali_classes2/rx/internal/util/d.smali
index 22d17e1a00..e10631211f 100644
--- a/com.discord/smali_classes2/rx/internal/util/d.smali
+++ b/com.discord/smali_classes2/rx/internal/util/d.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/d;
 .super Ljava/lang/Object;
+.source "BlockingUtils.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/internal/util/e.smali b/com.discord/smali_classes2/rx/internal/util/e.smali
index ba7d057db7..08a682df5e 100644
--- a/com.discord/smali_classes2/rx/internal/util/e.smali
+++ b/com.discord/smali_classes2/rx/internal/util/e.smali
@@ -1,5 +1,6 @@
 .class public final enum Lrx/internal/util/e;
 .super Ljava/lang/Enum;
+.source "ExceptionsUtils.java"
 
 
 # annotations
@@ -13,9 +14,9 @@
 
 
 # static fields
-.field private static final ctu:Ljava/lang/Throwable;
+.field private static final csO:Ljava/lang/Throwable;
 
-.field private static final synthetic ctv:[Lrx/internal/util/e;
+.field private static final synthetic csP:[Lrx/internal/util/e;
 
 
 # direct methods
@@ -26,7 +27,7 @@
 
     new-array v0, v0, [Lrx/internal/util/e;
 
-    sput-object v0, Lrx/internal/util/e;->ctv:[Lrx/internal/util/e;
+    sput-object v0, Lrx/internal/util/e;->csP:[Lrx/internal/util/e;
 
     new-instance v0, Ljava/lang/Throwable;
 
@@ -34,7 +35,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/util/e;->ctu:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/util/e;->csO:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -42,7 +43,7 @@
 .method public static M(Ljava/lang/Throwable;)Z
     .locals 1
 
-    sget-object v0, Lrx/internal/util/e;->ctu:Ljava/lang/Throwable;
+    sget-object v0, Lrx/internal/util/e;->csO:Ljava/lang/Throwable;
 
     if-ne p0, v0, :cond_0
 
@@ -76,7 +77,7 @@
 
     check-cast v0, Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/util/e;->ctu:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->csO:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -159,13 +160,11 @@
 
     check-cast v0, Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/util/e;->ctu:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->csO:Ljava/lang/Throwable;
 
     if-eq v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/util/e;->ctu:Ljava/lang/Throwable;
-
-    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -194,7 +193,7 @@
 .method public static values()[Lrx/internal/util/e;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/e;->ctv:[Lrx/internal/util/e;
+    sget-object v0, Lrx/internal/util/e;->csP:[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$a.smali b/com.discord/smali_classes2/rx/internal/util/f$a.smali
index 4743af9248..b449fedf88 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/f$a;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
diff --git a/com.discord/smali_classes2/rx/internal/util/f$b.smali b/com.discord/smali_classes2/rx/internal/util/f$b.smali
index d773ee933d..e65c632cd7 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/f$b;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali_classes2/rx/internal/util/f$c.smali b/com.discord/smali_classes2/rx/internal/util/f$c.smali
index 7b6b5f8a92..b4a5bd0f4f 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$c.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/f$c;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali_classes2/rx/internal/util/f$d.smali b/com.discord/smali_classes2/rx/internal/util/f$d.smali
index ee05dfe79b..24e1f7acc9 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$d.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$d.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/f$d;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
diff --git a/com.discord/smali_classes2/rx/internal/util/f$e.smali b/com.discord/smali_classes2/rx/internal/util/f$e.smali
index 6de50d3129..d80ce7a237 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$e.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$e.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/f$e;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/Func2;
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 c6da5c5df6..4ed1eb1fd4 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$f.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/f$f;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -30,7 +31,7 @@
 
 
 # instance fields
-.field final ctF:Lrx/functions/b;
+.field final csZ:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -65,7 +66,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/f$f;->ctF:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$f;->csZ:Lrx/functions/b;
 
     return-void
 .end method
@@ -77,9 +78,9 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/util/f$f;->ctF:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$f;->csZ:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->ctz:Lrx/internal/util/f$h;
+    sget-object v1, Lrx/internal/util/f;->csT: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 d4982498c4..a78e9a8afd 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$g.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$g.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/f$g;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -30,7 +31,7 @@
 
 
 # instance fields
-.field final ctF:Lrx/functions/b;
+.field final csZ:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -65,7 +66,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/f$g;->ctF:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$g;->csZ:Lrx/functions/b;
 
     return-void
 .end method
@@ -77,9 +78,9 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/util/f$g;->ctF:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$g;->csZ:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->ctB:Lrx/internal/util/f$b;
+    sget-object v1, Lrx/internal/util/f;->csV: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$h.smali b/com.discord/smali_classes2/rx/internal/util/f$h.smali
index d7159d0393..2cb80c63bd 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$h.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/f$h;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali_classes2/rx/internal/util/f$i.smali b/com.discord/smali_classes2/rx/internal/util/f$i.smali
index 2d2e0d4110..37b590716a 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$i.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$i.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/f$i;
 .super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
 
 # interfaces
 .implements Lrx/functions/b;
diff --git a/com.discord/smali_classes2/rx/internal/util/f.smali b/com.discord/smali_classes2/rx/internal/util/f.smali
index a980db4036..95c4024158 100644
--- a/com.discord/smali_classes2/rx/internal/util/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f.smali
@@ -1,5 +1,6 @@
 .class public final enum Lrx/internal/util/f;
 .super Ljava/lang/Enum;
+.source "InternalObservableUtils.java"
 
 
 # annotations
@@ -27,11 +28,19 @@
 
 
 # static fields
-.field public static final ctA:Lrx/internal/util/f$d;
+.field public static final csQ:Lrx/internal/util/f$e;
 
-.field static final ctB:Lrx/internal/util/f$b;
+.field public static final csR:Lrx/internal/util/f$c;
 
-.field public static final ctC:Lrx/functions/Action1;
+.field public static final csS:Lrx/internal/util/f$i;
+
+.field static final csT:Lrx/internal/util/f$h;
+
+.field public static final csU:Lrx/internal/util/f$d;
+
+.field static final csV:Lrx/internal/util/f$b;
+
+.field public static final csW:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -41,7 +50,7 @@
     .end annotation
 .end field
 
-.field public static final ctD:Lrx/Observable$b;
+.field public static final csX:Lrx/Observable$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$b<",
@@ -52,15 +61,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic ctE:[Lrx/internal/util/f;
-
-.field public static final ctw:Lrx/internal/util/f$e;
-
-.field public static final ctx:Lrx/internal/util/f$c;
-
-.field public static final cty:Lrx/internal/util/f$i;
-
-.field static final ctz:Lrx/internal/util/f$h;
+.field private static final synthetic csY:[Lrx/internal/util/f;
 
 
 # direct methods
@@ -71,57 +72,57 @@
 
     new-array v0, v0, [Lrx/internal/util/f;
 
-    sput-object v0, Lrx/internal/util/f;->ctE:[Lrx/internal/util/f;
+    sput-object v0, Lrx/internal/util/f;->csY:[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;->ctw:Lrx/internal/util/f$e;
+    sput-object v0, Lrx/internal/util/f;->csQ: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;->ctx:Lrx/internal/util/f$c;
+    sput-object v0, Lrx/internal/util/f;->csR: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;->cty:Lrx/internal/util/f$i;
+    sput-object v0, Lrx/internal/util/f;->csS: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;->ctz:Lrx/internal/util/f$h;
+    sput-object v0, Lrx/internal/util/f;->csT: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;->ctA:Lrx/internal/util/f$d;
+    sput-object v0, Lrx/internal/util/f;->csU: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;->ctB:Lrx/internal/util/f$b;
+    sput-object v0, Lrx/internal/util/f;->csV: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;->ctC:Lrx/functions/Action1;
+    sput-object v0, Lrx/internal/util/f;->csW:Lrx/functions/Action1;
 
     new-instance v0, Lrx/internal/a/aa;
 
-    sget-object v1, Lrx/internal/util/l$a;->ctU:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->cto: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;->ctD:Lrx/Observable$b;
+    sput-object v0, Lrx/internal/util/f;->csX:Lrx/Observable$b;
 
     return-void
 .end method
@@ -203,7 +204,7 @@
 .method public static values()[Lrx/internal/util/f;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/f;->ctE:[Lrx/internal/util/f;
+    sget-object v0, Lrx/internal/util/f;->csY:[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 f377ad5984..8dc4e8b46a 100644
--- a/com.discord/smali_classes2/rx/internal/util/g.smali
+++ b/com.discord/smali_classes2/rx/internal/util/g.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/g;
 .super Ljava/lang/Object;
+.source "OpenHashSet.java"
 
 
 # annotations
@@ -14,7 +15,7 @@
 
 
 # instance fields
-.field public ctG:[Ljava/lang/Object;
+.field public cta:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -73,7 +74,7 @@
 
     check-cast p1, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/internal/util/g;->ctG:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/g;->cta:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -113,9 +114,9 @@
     :goto_0
     add-int/lit8 v0, p1, 0x1
 
-    :goto_1
     and-int/2addr v0, p3
 
+    :goto_1
     aget-object v2, p2, v0
 
     if-nez v2, :cond_0
@@ -164,5 +165,7 @@
     :goto_3
     add-int/lit8 v0, v0, 0x1
 
+    and-int/2addr v0, p3
+
     goto :goto_1
 .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 45f3663769..1261684469 100644
--- a/com.discord/smali_classes2/rx/internal/util/h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/h.smali
@@ -1,22 +1,23 @@
 .class public final Lrx/internal/util/h;
 .super Ljava/lang/Object;
+.source "PlatformDependent.java"
 
 
 # static fields
 .field private static final IS_ANDROID:Z
 
-.field private static final ctH:I
+.field private static final ctb:I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/util/h;->LF()I
+    invoke-static {}, Lrx/internal/util/h;->LE()I
 
     move-result v0
 
-    sput v0, Lrx/internal/util/h;->ctH:I
+    sput v0, Lrx/internal/util/h;->ctb:I
 
     if-eqz v0, :cond_0
 
@@ -33,7 +34,7 @@
     return-void
 .end method
 
-.method public static LD()Z
+.method public static LC()Z
     .locals 1
 
     sget-boolean v0, Lrx/internal/util/h;->IS_ANDROID:Z
@@ -41,15 +42,15 @@
     return v0
 .end method
 
-.method public static LE()I
+.method public static LD()I
     .locals 1
 
-    sget v0, Lrx/internal/util/h;->ctH:I
+    sget v0, Lrx/internal/util/h;->ctb:I
 
     return v0
 .end method
 
-.method private static LF()I
+.method private static LE()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 44f6560a18..9e065b2dc1 100644
--- a/com.discord/smali_classes2/rx/internal/util/i.smali
+++ b/com.discord/smali_classes2/rx/internal/util/i.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/i;
 .super Ljava/lang/Object;
+.source "RxRingBuffer.java"
 
 # interfaces
 .implements Lrx/Subscription;
@@ -10,7 +11,7 @@
 
 
 # instance fields
-.field public volatile ctI:Ljava/lang/Object;
+.field public volatile ctc:Ljava/lang/Object;
 
 .field private queue:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
@@ -29,7 +30,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    invoke-static {}, Lrx/internal/util/h;->LD()Z
+    invoke-static {}, Lrx/internal/util/h;->LC()Z
 
     move-result v0
 
@@ -54,12 +55,10 @@
     :try_start_0
     invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
 
-    move-result v2
+    move-result v0
     :try_end_0
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
-    move v0, v2
-
     goto :goto_1
 
     :catch_0
@@ -160,10 +159,10 @@
     return-void
 .end method
 
-.method public static LG()Lrx/internal/util/i;
+.method public static LF()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result v0
 
@@ -187,10 +186,10 @@
     return-object v0
 .end method
 
-.method public static LH()Lrx/internal/util/i;
+.method public static LG()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->LO()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->LN()Z
 
     move-result v0
 
@@ -375,7 +374,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lrx/internal/util/i;->ctI:Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/i;->ctc:Ljava/lang/Object;
 
     if-nez v1, :cond_1
 
@@ -425,7 +424,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lrx/internal/util/i;->ctI:Ljava/lang/Object;
+    iget-object v3, p0, Lrx/internal/util/i;->ctc:Ljava/lang/Object;
 
     if-nez v2, :cond_1
 
@@ -437,7 +436,7 @@
 
     if-nez v0, :cond_1
 
-    iput-object v1, p0, Lrx/internal/util/i;->ctI:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/util/i;->ctc:Ljava/lang/Object;
 
     move-object v2, v3
 
diff --git a/com.discord/smali_classes2/rx/internal/util/j$1.smali b/com.discord/smali_classes2/rx/internal/util/j$1.smali
index d7596660bb..2b6c5b5426 100644
--- a/com.discord/smali_classes2/rx/internal/util/j$1.smali
+++ b/com.discord/smali_classes2/rx/internal/util/j$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/j$1;
 .super Ljava/lang/Object;
+.source "RxThreadFactory.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
diff --git a/com.discord/smali_classes2/rx/internal/util/j.smali b/com.discord/smali_classes2/rx/internal/util/j.smali
index 1547f426c9..29a2055598 100644
--- a/com.discord/smali_classes2/rx/internal/util/j.smali
+++ b/com.discord/smali_classes2/rx/internal/util/j.smali
@@ -1,12 +1,13 @@
 .class public final Lrx/internal/util/j;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "RxThreadFactory.java"
 
 # interfaces
 .implements Ljava/util/concurrent/ThreadFactory;
 
 
 # static fields
-.field public static final ctJ:Ljava/util/concurrent/ThreadFactory;
+.field public static final ctd:Ljava/util/concurrent/ThreadFactory;
 
 .field private static final serialVersionUID:J = -0x7ab1e491ecc1649fL
 
@@ -23,7 +24,7 @@
 
     invoke-direct {v0}, Lrx/internal/util/j$1;-><init>()V
 
-    sput-object v0, Lrx/internal/util/j;->ctJ:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lrx/internal/util/j;->ctd: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 82b047f938..7b46eb580e 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$1.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$1;
 .super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -27,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic ctM:Lrx/internal/c/b;
+.field final synthetic ctg:Lrx/internal/c/b;
 
-.field final synthetic ctN:Lrx/internal/util/k;
+.field final synthetic cth: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;->ctN:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$1;->cth:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$1;->ctM:Lrx/internal/c/b;
+    iput-object p2, p0, Lrx/internal/util/k$1;->ctg:Lrx/internal/c/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,9 +53,9 @@
 
     check-cast p1, Lrx/functions/Action0;
 
-    iget-object v0, p0, Lrx/internal/util/k$1;->ctM:Lrx/internal/c/b;
+    iget-object v0, p0, Lrx/internal/util/k$1;->ctg:Lrx/internal/c/b;
 
-    iget-object v0, v0, Lrx/internal/c/b;->crY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/b;->crs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -62,7 +63,7 @@
 
     check-cast v0, Lrx/internal/c/b$b;
 
-    invoke-virtual {v0}, Lrx/internal/c/b$b;->Lx()Lrx/internal/c/b$c;
+    invoke-virtual {v0}, Lrx/internal/c/b$b;->Lw()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 b7c98b63b0..98ee68c53a 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
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$2$1;
 .super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic ctP:Lrx/functions/Action0;
+.field final synthetic ctj:Lrx/functions/Action0;
 
-.field final synthetic ctQ:Lrx/Scheduler$Worker;
+.field final synthetic ctk:Lrx/Scheduler$Worker;
 
-.field final synthetic ctR:Lrx/internal/util/k$2;
+.field final synthetic ctl: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;->ctR:Lrx/internal/util/k$2;
+    iput-object p1, p0, Lrx/internal/util/k$2$1;->ctl:Lrx/internal/util/k$2;
 
-    iput-object p2, p0, Lrx/internal/util/k$2$1;->ctP:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/util/k$2$1;->ctj:Lrx/functions/Action0;
 
-    iput-object p3, p0, Lrx/internal/util/k$2$1;->ctQ:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/util/k$2$1;->ctk:Lrx/Scheduler$Worker;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,13 +46,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/util/k$2$1;->ctP:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->ctj: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;->ctQ:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->ctk:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -60,7 +61,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/util/k$2$1;->ctQ:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/util/k$2$1;->ctk: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 cfb4801cc8..ce1d96b97b 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$2.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$2;
 .super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -27,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic ctN:Lrx/internal/util/k;
+.field final synthetic cth:Lrx/internal/util/k;
 
-.field final synthetic ctO:Lrx/Scheduler;
+.field final synthetic cti: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;->ctN:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$2;->cth:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$2;->ctO:Lrx/Scheduler;
+    iput-object p2, p0, Lrx/internal/util/k$2;->cti:Lrx/Scheduler;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,9 +53,9 @@
 
     check-cast p1, Lrx/functions/Action0;
 
-    iget-object v0, p0, Lrx/internal/util/k$2;->ctO:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/internal/util/k$2;->cti:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->KM()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->KL()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 1c86a29c0b..6ab57ca50f 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$3.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$3.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$3;
 .super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic ctN:Lrx/internal/util/k;
+.field final synthetic cth:Lrx/internal/util/k;
 
-.field final synthetic ctS:Lrx/functions/b;
+.field final synthetic ctm: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;->ctN:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$3;->cth:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$3;->ctS:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/util/k$3;->ctm:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,11 +51,11 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/util/k$3;->ctS:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/k$3;->ctm:Lrx/functions/b;
 
-    iget-object v1, p0, Lrx/internal/util/k$3;->ctN:Lrx/internal/util/k;
+    iget-object v1, p0, Lrx/internal/util/k$3;->cth:Lrx/internal/util/k;
 
-    iget-object v1, v1, Lrx/internal/util/k;->ctK:Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/k;->cte:Ljava/lang/Object;
 
     invoke-interface {v0, v1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -68,7 +69,7 @@
 
     check-cast v0, Lrx/internal/util/k;
 
-    iget-object v0, v0, Lrx/internal/util/k;->ctK:Ljava/lang/Object;
+    iget-object v0, v0, Lrx/internal/util/k;->cte: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$a.smali b/com.discord/smali_classes2/rx/internal/util/k$a.smali
index a308e3003b..228b4a7721 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$a;
 .super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements Lrx/Observable$a;
diff --git a/com.discord/smali_classes2/rx/internal/util/k$b.smali b/com.discord/smali_classes2/rx/internal/util/k$b.smali
index 60322bccf3..9aa6244b44 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$b;
 .super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements Lrx/Observable$a;
diff --git a/com.discord/smali_classes2/rx/internal/util/k$c.smali b/com.discord/smali_classes2/rx/internal/util/k$c.smali
index f7b3852764..72ed25b71c 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$c.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$c;
 .super Ljava/util/concurrent/atomic/AtomicBoolean;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements 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 00d1a8f459..023e0fcaea 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$d.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$d.smali
@@ -1,5 +1,6 @@
 .class final Lrx/internal/util/k$d;
 .super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -36,7 +37,7 @@
     .end annotation
 .end field
 
-.field cnQ:Z
+.field cnk:Z
 
 .field final value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -72,7 +73,7 @@
 .method public final request(J)V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/util/k$d;->cnQ:Z
+    iget-boolean v0, p0, Lrx/internal/util/k$d;->cnk:Z
 
     if-eqz v0, :cond_0
 
@@ -94,7 +95,7 @@
     :cond_1
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/util/k$d;->cnQ:Z
+    iput-boolean p1, p0, Lrx/internal/util/k$d;->cnk: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 89b0c21c3c..287ef32ce6 100644
--- a/com.discord/smali_classes2/rx/internal/util/k.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/k;
 .super Lrx/Observable;
+.source "ScalarSynchronousObservable.java"
 
 
 # annotations
@@ -24,11 +25,11 @@
 
 
 # static fields
-.field static final ctL:Z
+.field static final ctf:Z
 
 
 # instance fields
-.field public final ctK:Ljava/lang/Object;
+.field public final cte:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -57,7 +58,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lrx/internal/util/k;->ctL:Z
+    sput-boolean v0, Lrx/internal/util/k;->ctf:Z
 
     return-void
 .end method
@@ -80,7 +81,7 @@
 
     invoke-direct {p0, v0}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
 
-    iput-object p1, p0, Lrx/internal/util/k;->ctK:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/k;->cte:Ljava/lang/Object;
 
     return-void
 .end method
@@ -98,7 +99,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lrx/internal/util/k;->ctL:Z
+    sget-boolean v0, Lrx/internal/util/k;->ctf:Z
 
     if-eqz v0, :cond_0
 
@@ -169,7 +170,7 @@
     :goto_0
     new-instance p1, Lrx/internal/util/k$b;
 
-    iget-object v1, p0, Lrx/internal/util/k;->ctK:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/util/k;->cte: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 c5a14527aa..06b87ea88f 100644
--- a/com.discord/smali_classes2/rx/internal/util/l$a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/l$a.smali
@@ -1,5 +1,6 @@
 .class final enum Lrx/internal/util/l$a;
 .super Ljava/lang/Enum;
+.source "UtilityFunctions.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -29,9 +30,9 @@
 
 
 # static fields
-.field public static final enum ctU:Lrx/internal/util/l$a;
+.field public static final enum cto:Lrx/internal/util/l$a;
 
-.field private static final synthetic ctV:[Lrx/internal/util/l$a;
+.field private static final synthetic ctp:[Lrx/internal/util/l$a;
 
 
 # direct methods
@@ -44,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;->ctU:Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->cto: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;->ctU:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->cto:Lrx/internal/util/l$a;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$a;->ctV:[Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->ctp:[Lrx/internal/util/l$a;
 
     return-void
 .end method
@@ -93,7 +94,7 @@
 .method public static values()[Lrx/internal/util/l$a;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/l$a;->ctV:[Lrx/internal/util/l$a;
+    sget-object v0, Lrx/internal/util/l$a;->ctp:[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 015ef222b1..a60b418f6b 100644
--- a/com.discord/smali_classes2/rx/internal/util/l$b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/l$b.smali
@@ -1,5 +1,6 @@
 .class public final enum Lrx/internal/util/l$b;
 .super Ljava/lang/Enum;
+.source "UtilityFunctions.java"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -29,9 +30,9 @@
 
 
 # static fields
-.field public static final enum ctW:Lrx/internal/util/l$b;
+.field public static final enum ctq:Lrx/internal/util/l$b;
 
-.field private static final synthetic ctX:[Lrx/internal/util/l$b;
+.field private static final synthetic ctr:[Lrx/internal/util/l$b;
 
 
 # direct methods
@@ -44,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;->ctW:Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->ctq: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;->ctW:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->ctq:Lrx/internal/util/l$b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$b;->ctX:[Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->ctr:[Lrx/internal/util/l$b;
 
     return-void
 .end method
@@ -93,7 +94,7 @@
 .method public static values()[Lrx/internal/util/l$b;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/l$b;->ctX:[Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->ctr:[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/internal/util/l.smali b/com.discord/smali_classes2/rx/internal/util/l.smali
index 203d0a1e90..c68349c639 100644
--- a/com.discord/smali_classes2/rx/internal/util/l.smali
+++ b/com.discord/smali_classes2/rx/internal/util/l.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/internal/util/l;
 .super Ljava/lang/Object;
+.source "UtilityFunctions.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali b/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
index 470d99b1eb..30dd75c07f 100644
--- a/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
+++ b/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
@@ -1,5 +1,6 @@
 .class public Lrx/observers/SerializedSubscriber;
 .super Lrx/Subscriber;
+.source "SerializedSubscriber.java"
 
 
 # annotations
@@ -15,7 +16,7 @@
 
 
 # instance fields
-.field private final cuK:Lrx/e;
+.field private final cue:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -59,7 +60,7 @@
 
     invoke-direct {p2, p1}, Lrx/observers/c;-><init>(Lrx/e;)V
 
-    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->cuK:Lrx/e;
+    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->cue:Lrx/e;
 
     return-void
 .end method
@@ -69,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->cuK:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->cue:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
 
@@ -79,7 +80,7 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->cuK:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->cue:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
 
@@ -94,7 +95,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->cuK:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->cue:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/observers/a$1.smali b/com.discord/smali_classes2/rx/observers/a$1.smali
index 745cb4eb90..9903a81607 100644
--- a/com.discord/smali_classes2/rx/observers/a$1.smali
+++ b/com.discord/smali_classes2/rx/observers/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/observers/a$1;
 .super Ljava/lang/Object;
+.source "Observers.java"
 
 # interfaces
 .implements Lrx/e;
diff --git a/com.discord/smali_classes2/rx/observers/a.smali b/com.discord/smali_classes2/rx/observers/a.smali
index bedd1dab5f..a5be42fd14 100644
--- a/com.discord/smali_classes2/rx/observers/a.smali
+++ b/com.discord/smali_classes2/rx/observers/a.smali
@@ -1,9 +1,10 @@
 .class public final Lrx/observers/a;
 .super Ljava/lang/Object;
+.source "Observers.java"
 
 
 # static fields
-.field private static final cuH:Lrx/e;
+.field private static final cub:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -22,12 +23,12 @@
 
     invoke-direct {v0}, Lrx/observers/a$1;-><init>()V
 
-    sput-object v0, Lrx/observers/a;->cuH:Lrx/e;
+    sput-object v0, Lrx/observers/a;->cub:Lrx/e;
 
     return-void
 .end method
 
-.method public static LR()Lrx/e;
+.method public static LQ()Lrx/e;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -39,7 +40,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/observers/a;->cuH:Lrx/e;
+    sget-object v0, Lrx/observers/a;->cub: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 2740c2cf39..f5c55bd261 100644
--- a/com.discord/smali_classes2/rx/observers/b.smali
+++ b/com.discord/smali_classes2/rx/observers/b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/observers/b;
 .super Lrx/Subscriber;
+.source "SafeSubscriber.java"
 
 
 # annotations
@@ -153,11 +154,11 @@
 
     iput-boolean v0, p0, Lrx/observers/b;->done:Z
 
-    invoke-static {}, Lrx/c/f;->LU()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->LT()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->LV()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->LU()Lrx/c/b;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/rx/observers/c$a.smali b/com.discord/smali_classes2/rx/observers/c$a.smali
index 28575d4020..fbbb13ff19 100644
--- a/com.discord/smali_classes2/rx/observers/c$a.smali
+++ b/com.discord/smali_classes2/rx/observers/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/observers/c$a;
 .super Ljava/lang/Object;
+.source "SerializedObserver.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/observers/c.smali b/com.discord/smali_classes2/rx/observers/c.smali
index 9c54e69adc..be86a7c1b6 100644
--- a/com.discord/smali_classes2/rx/observers/c.smali
+++ b/com.discord/smali_classes2/rx/observers/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/observers/c;
 .super Ljava/lang/Object;
+.source "SerializedObserver.java"
 
 # interfaces
 .implements Lrx/e;
@@ -25,7 +26,7 @@
 
 
 # instance fields
-.field private final cuI:Lrx/e;
+.field private final cuc:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -34,7 +35,7 @@
     .end annotation
 .end field
 
-.field private cuJ:Lrx/observers/c$a;
+.field private cud:Lrx/observers/c$a;
 
 .field private emitting:Z
 
@@ -54,7 +55,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/observers/c;->cuI:Lrx/e;
+    iput-object p1, p0, Lrx/observers/c;->cuc:Lrx/e;
 
     return-void
 .end method
@@ -91,7 +92,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     if-nez v0, :cond_2
 
@@ -99,10 +100,10 @@
 
     invoke-direct {v0}, Lrx/observers/c$a;-><init>()V
 
-    iput-object v0, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     :cond_2
-    invoke-static {}, Lrx/internal/a/g;->KU()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->KT()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -119,7 +120,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/observers/c;->cuI:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->cuc:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
 
@@ -168,7 +169,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     if-nez v0, :cond_2
 
@@ -176,7 +177,7 @@
 
     invoke-direct {v0}, Lrx/observers/c$a;-><init>()V
 
-    iput-object v0, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     :cond_2
     invoke-static {p1}, Lrx/internal/a/g;->E(Ljava/lang/Throwable;)Ljava/lang/Object;
@@ -196,7 +197,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/observers/c;->cuI:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->cuc:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
 
@@ -244,7 +245,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     if-nez v0, :cond_2
 
@@ -252,7 +253,7 @@
 
     invoke-direct {v0}, Lrx/observers/c$a;-><init>()V
 
-    iput-object v0, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     :cond_2
     invoke-static {p1}, Lrx/internal/a/g;->cb(Ljava/lang/Object;)Ljava/lang/Object;
@@ -275,7 +276,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, p0, Lrx/observers/c;->cuI:Lrx/e;
+    iget-object v1, p0, Lrx/observers/c;->cuc:Lrx/e;
 
     invoke-interface {v1, p1}, Lrx/e;->onNext(Ljava/lang/Object;)V
     :try_end_1
@@ -285,7 +286,7 @@
     monitor-enter p0
 
     :try_start_2
-    iget-object v1, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iget-object v1, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     const/4 v2, 0x0
 
@@ -300,7 +301,7 @@
     :cond_5
     const/4 v3, 0x0
 
-    iput-object v3, p0, Lrx/observers/c;->cuJ:Lrx/observers/c$a;
+    iput-object v3, p0, Lrx/observers/c;->cud:Lrx/observers/c$a;
 
     monitor-exit p0
     :try_end_2
@@ -318,7 +319,7 @@
     if-eqz v4, :cond_4
 
     :try_start_3
-    iget-object v5, p0, Lrx/observers/c;->cuI:Lrx/e;
+    iget-object v5, p0, Lrx/observers/c;->cuc:Lrx/e;
 
     invoke-static {v5, v4}, Lrx/internal/a/g;->a(Lrx/e;Ljava/lang/Object;)Z
 
@@ -344,7 +345,7 @@
 
     invoke-static {v1}, Lrx/a/b;->C(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lrx/observers/c;->cuI:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->cuc:Lrx/e;
 
     invoke-static {v1, p1}, Lrx/a/g;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
 
@@ -369,7 +370,7 @@
 
     iput-boolean v0, p0, Lrx/observers/c;->terminated:Z
 
-    iget-object v0, p0, Lrx/observers/c;->cuI:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->cuc:Lrx/e;
 
     invoke-static {v1, v0, p1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
@@ -384,4 +385,6 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
     throw p1
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/observers/d$1.smali b/com.discord/smali_classes2/rx/observers/d$1.smali
index 30607a1a50..c4f9682767 100644
--- a/com.discord/smali_classes2/rx/observers/d$1.smali
+++ b/com.discord/smali_classes2/rx/observers/d$1.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/observers/d$1;
 .super Lrx/Subscriber;
+.source "Subscribers.java"
 
 
 # annotations
@@ -21,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic cuL:Lrx/e;
+.field final synthetic cuf:Lrx/e;
 
 
 # direct methods
 .method public constructor <init>(Lrx/e;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/observers/d$1;->cuL:Lrx/e;
+    iput-object p1, p0, Lrx/observers/d$1;->cuf:Lrx/e;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -40,7 +41,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$1;->cuL:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->cuf:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
 
@@ -50,7 +51,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$1;->cuL:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->cuf:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
 
@@ -65,7 +66,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/observers/d$1;->cuL:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->cuf: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 5787bc9a6b..fb427dc81b 100644
--- a/com.discord/smali_classes2/rx/observers/d$2.smali
+++ b/com.discord/smali_classes2/rx/observers/d$2.smali
@@ -1,5 +1,6 @@
 .class final Lrx/observers/d$2;
 .super Lrx/Subscriber;
+.source "Subscribers.java"
 
 
 # annotations
@@ -21,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic coC:Lrx/Subscriber;
+.field final synthetic cnW:Lrx/Subscriber;
 
 
 # direct methods
 .method constructor <init>(Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p2, p0, Lrx/observers/d$2;->coC:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/observers/d$2;->cnW:Lrx/Subscriber;
 
     invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -40,7 +41,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -50,7 +51,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -65,7 +66,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/observers/d$2;->coC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->cnW:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/observers/d.smali b/com.discord/smali_classes2/rx/observers/d.smali
index a520e01424..a84a83a46f 100644
--- a/com.discord/smali_classes2/rx/observers/d.smali
+++ b/com.discord/smali_classes2/rx/observers/d.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/observers/d;
 .super Ljava/lang/Object;
+.source "Subscribers.java"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali b/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali
index 5d2bf9d14b..3150d26e14 100644
--- a/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali
+++ b/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/BehaviorSubject$1;
 .super Ljava/lang/Object;
+.source "BehaviorSubject.java"
 
 # interfaces
 .implements Lrx/functions/Action1;
@@ -26,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic cvt:Lrx/subjects/b;
+.field final synthetic cuN:Lrx/subjects/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->cvt:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->cuN:Lrx/subjects/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +48,7 @@
 
     check-cast p1, Lrx/subjects/b$b;
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject$1;->cvt:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject$1;->cuN:Lrx/subjects/b;
 
     iget-object v0, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
@@ -138,9 +139,9 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    iget-object v4, p1, Lrx/subjects/b$b;->cvK:Ljava/util/List;
+    iget-object v4, p1, Lrx/subjects/b$b;->cve:Ljava/util/List;
 
-    iput-object v3, p1, Lrx/subjects/b$b;->cvK:Ljava/util/List;
+    iput-object v3, p1, Lrx/subjects/b$b;->cve:Ljava/util/List;
 
     if-nez v4, :cond_4
 
@@ -232,4 +233,6 @@
     .catchall {:try_start_8 .. :try_end_8} :catchall_5
 
     throw v0
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali b/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
index 7fd0f7c628..838157b4e4 100644
--- a/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/subjects/BehaviorSubject;
 .super Lrx/subjects/Subject;
+.source "BehaviorSubject.java"
 
 
 # annotations
@@ -15,11 +16,11 @@
 
 
 # static fields
-.field private static final cvr:[Ljava/lang/Object;
+.field private static final cuL:[Ljava/lang/Object;
 
 
 # instance fields
-.field private final cvs:Lrx/subjects/b;
+.field private final cuM:Lrx/subjects/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/b<",
@@ -37,7 +38,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lrx/subjects/BehaviorSubject;->cvr:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/BehaviorSubject;->cuL:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -56,12 +57,12 @@
 
     invoke-direct {p0, p1}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->cuM:Lrx/subjects/b;
 
     return-void
 .end method
 
-.method public static Mk()Lrx/subjects/BehaviorSubject;
+.method public static Mj()Lrx/subjects/BehaviorSubject;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -157,7 +158,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM:Lrx/subjects/b;
 
     iget-object v0, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
@@ -182,24 +183,24 @@
 .method public final onCompleted()V
     .locals 5
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM: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;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM: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;->KU()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->KT()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->cuM:Lrx/subjects/b;
 
     invoke-virtual {v1, v0}, Lrx/subjects/b;->cm(Ljava/lang/Object;)[Lrx/subjects/b$b;
 
@@ -227,13 +228,13 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM: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;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM:Lrx/subjects/b;
 
     iget-boolean v0, v0, Lrx/subjects/b;->active:Z
 
@@ -246,7 +247,7 @@
 
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->cuM:Lrx/subjects/b;
 
     invoke-virtual {v1, p1}, Lrx/subjects/b;->cm(Ljava/lang/Object;)[Lrx/subjects/b$b;
 
@@ -300,13 +301,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM: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;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM:Lrx/subjects/b;
 
     iget-boolean v0, v0, Lrx/subjects/b;->active:Z
 
@@ -317,7 +318,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cvs:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->cuM:Lrx/subjects/b;
 
     iput-object p1, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
@@ -327,7 +328,7 @@
 
     check-cast v0, Lrx/subjects/b$a;
 
-    iget-object v0, v0, Lrx/subjects/b$a;->cvG:[Lrx/subjects/b$b;
+    iget-object v0, v0, Lrx/subjects/b$a;->cva:[Lrx/subjects/b$b;
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali b/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali
index 18c1e10d21..926ec76bdc 100644
--- a/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali
+++ b/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/PublishSubject$a;
 .super Ljava/util/concurrent/atomic/AtomicLong;
+.source "PublishSubject.java"
 
 # interfaces
 .implements Lrx/Producer;
@@ -232,6 +233,8 @@
 
     if-eqz v0, :cond_0
 
+    return-void
+
     :cond_2
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali b/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
index a3d5669cb4..ce54c21118 100644
--- a/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
+++ b/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/PublishSubject$b;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "PublishSubject.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -34,9 +35,9 @@
 
 
 # static fields
-.field static final cvv:[Lrx/subjects/PublishSubject$a;
+.field static final cuP:[Lrx/subjects/PublishSubject$a;
 
-.field static final cvw:[Lrx/subjects/PublishSubject$a;
+.field static final cuQ:[Lrx/subjects/PublishSubject$a;
 
 .field private static final serialVersionUID:J = -0x690a478d773d9c84L
 
@@ -53,11 +54,11 @@
 
     new-array v1, v0, [Lrx/subjects/PublishSubject$a;
 
-    sput-object v1, Lrx/subjects/PublishSubject$b;->cvv:[Lrx/subjects/PublishSubject$a;
+    sput-object v1, Lrx/subjects/PublishSubject$b;->cuP:[Lrx/subjects/PublishSubject$a;
 
     new-array v0, v0, [Lrx/subjects/PublishSubject$a;
 
-    sput-object v0, Lrx/subjects/PublishSubject$b;->cvw:[Lrx/subjects/PublishSubject$a;
+    sput-object v0, Lrx/subjects/PublishSubject$b;->cuQ:[Lrx/subjects/PublishSubject$a;
 
     return-void
 .end method
@@ -67,7 +68,7 @@
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sget-object v0, Lrx/subjects/PublishSubject$b;->cvv:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->cuP:[Lrx/subjects/PublishSubject$a;
 
     invoke-virtual {p0, v0}, Lrx/subjects/PublishSubject$b;->lazySet(Ljava/lang/Object;)V
 
@@ -93,11 +94,11 @@
 
     check-cast v0, [Lrx/subjects/PublishSubject$a;
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->cvw:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->cuQ:[Lrx/subjects/PublishSubject$a;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->cvv:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->cuP:[Lrx/subjects/PublishSubject$a;
 
     if-ne v0, v1, :cond_1
 
@@ -139,7 +140,7 @@
 
     if-ne v1, v4, :cond_5
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->cvv:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->cuP:[Lrx/subjects/PublishSubject$a;
 
     goto :goto_2
 
@@ -167,6 +168,8 @@
 
     if-eqz v0, :cond_0
 
+    return-void
+
     :cond_6
     :goto_3
     return-void
@@ -192,7 +195,7 @@
 
     check-cast v1, [Lrx/subjects/PublishSubject$a;
 
-    sget-object v2, Lrx/subjects/PublishSubject$b;->cvw:[Lrx/subjects/PublishSubject$a;
+    sget-object v2, Lrx/subjects/PublishSubject$b;->cuQ:[Lrx/subjects/PublishSubject$a;
 
     const/4 v3, 0x0
 
@@ -251,7 +254,7 @@
 .method public final onCompleted()V
     .locals 4
 
-    sget-object v0, Lrx/subjects/PublishSubject$b;->cvw:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->cuQ:[Lrx/subjects/PublishSubject$a;
 
     invoke-virtual {p0, v0}, Lrx/subjects/PublishSubject$b;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -283,7 +286,7 @@
 
     iput-object p1, p0, Lrx/subjects/PublishSubject$b;->error:Ljava/lang/Throwable;
 
-    sget-object v0, Lrx/subjects/PublishSubject$b;->cvw:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->cuQ:[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 a3e568891b..e0e6af77ae 100644
--- a/com.discord/smali_classes2/rx/subjects/PublishSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/PublishSubject.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/subjects/PublishSubject;
 .super Lrx/subjects/Subject;
+.source "PublishSubject.java"
 
 
 # annotations
@@ -22,7 +23,7 @@
 
 
 # instance fields
-.field final cvu:Lrx/subjects/PublishSubject$b;
+.field final cuO:Lrx/subjects/PublishSubject$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/PublishSubject$b<",
@@ -45,12 +46,12 @@
 
     invoke-direct {p0, p1}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    iput-object p1, p0, Lrx/subjects/PublishSubject;->cvu:Lrx/subjects/PublishSubject$b;
+    iput-object p1, p0, Lrx/subjects/PublishSubject;->cuO:Lrx/subjects/PublishSubject$b;
 
     return-void
 .end method
 
-.method public static Ml()Lrx/subjects/PublishSubject;
+.method public static Mk()Lrx/subjects/PublishSubject;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -78,7 +79,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/PublishSubject;->cvu:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->cuO:Lrx/subjects/PublishSubject$b;
 
     invoke-virtual {v0}, Lrx/subjects/PublishSubject$b;->onCompleted()V
 
@@ -88,7 +89,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/PublishSubject;->cvu:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->cuO:Lrx/subjects/PublishSubject$b;
 
     invoke-virtual {v0, p1}, Lrx/subjects/PublishSubject$b;->onError(Ljava/lang/Throwable;)V
 
@@ -103,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/PublishSubject;->cvu:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->cuO: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 505eed6ad5..80a9abe387 100644
--- a/com.discord/smali_classes2/rx/subjects/SerializedSubject$1.smali
+++ b/com.discord/smali_classes2/rx/subjects/SerializedSubject$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/SerializedSubject$1;
 .super Ljava/lang/Object;
+.source "SerializedSubject.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -25,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic cvD:Lrx/subjects/Subject;
+.field final synthetic cuX:Lrx/subjects/Subject;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/Subject;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->cvD:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->cuX:Lrx/subjects/Subject;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +47,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject$1;->cvD:Lrx/subjects/Subject;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject$1;->cuX: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 975301751c..73919709a0 100644
--- a/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
@@ -1,5 +1,6 @@
 .class public Lrx/subjects/SerializedSubject;
 .super Lrx/subjects/Subject;
+.source "SerializedSubject.java"
 
 
 # annotations
@@ -17,7 +18,7 @@
 
 
 # instance fields
-.field private final cvB:Lrx/observers/c;
+.field private final cuV:Lrx/observers/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/observers/c<",
@@ -26,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final cvC:Lrx/subjects/Subject;
+.field private final cuW:Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/Subject<",
@@ -53,13 +54,13 @@
 
     invoke-direct {p0, v0}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    iput-object p1, p0, Lrx/subjects/SerializedSubject;->cvC:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject;->cuW: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;->cvB:Lrx/observers/c;
+    iput-object v0, p0, Lrx/subjects/SerializedSubject;->cuV:Lrx/observers/c;
 
     return-void
 .end method
@@ -69,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->cvB:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->cuV:Lrx/observers/c;
 
     invoke-virtual {v0}, Lrx/observers/c;->onCompleted()V
 
@@ -79,7 +80,7 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->cvB:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->cuV:Lrx/observers/c;
 
     invoke-virtual {v0, p1}, Lrx/observers/c;->onError(Ljava/lang/Throwable;)V
 
@@ -94,7 +95,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->cvB:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->cuV:Lrx/observers/c;
 
     invoke-virtual {v0, p1}, Lrx/observers/c;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/subjects/Subject.smali b/com.discord/smali_classes2/rx/subjects/Subject.smali
index cda3ffc028..b3e4ba1180 100644
--- a/com.discord/smali_classes2/rx/subjects/Subject.smali
+++ b/com.discord/smali_classes2/rx/subjects/Subject.smali
@@ -1,5 +1,6 @@
 .class public abstract Lrx/subjects/Subject;
 .super Lrx/Observable;
+.source "Subject.java"
 
 # interfaces
 .implements Lrx/e;
diff --git a/com.discord/smali_classes2/rx/subjects/a$a.smali b/com.discord/smali_classes2/rx/subjects/a$a.smali
index 46502ddfa7..f488a01ce9 100644
--- a/com.discord/smali_classes2/rx/subjects/a$a.smali
+++ b/com.discord/smali_classes2/rx/subjects/a$a.smali
@@ -1,5 +1,6 @@
 .class interface abstract Lrx/subjects/a$a;
 .super Ljava/lang/Object;
+.source "ReplaySubject.java"
 
 
 # annotations
diff --git a/com.discord/smali_classes2/rx/subjects/a$b.smali b/com.discord/smali_classes2/rx/subjects/a$b.smali
index 3b08e0dfbb..a3d8a9b4e4 100644
--- a/com.discord/smali_classes2/rx/subjects/a$b.smali
+++ b/com.discord/smali_classes2/rx/subjects/a$b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/a$b;
 .super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "ReplaySubject.java"
 
 # interfaces
 .implements Lrx/Producer;
diff --git a/com.discord/smali_classes2/rx/subjects/a$c.smali b/com.discord/smali_classes2/rx/subjects/a$c.smali
index 2b8c7edf28..8ecb4fde8e 100644
--- a/com.discord/smali_classes2/rx/subjects/a$c.smali
+++ b/com.discord/smali_classes2/rx/subjects/a$c.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/a$c;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "ReplaySubject.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -34,9 +35,9 @@
 
 
 # static fields
-.field static final cvx:[Lrx/subjects/a$b;
+.field static final cuR:[Lrx/subjects/a$b;
 
-.field static final cvy:[Lrx/subjects/a$b;
+.field static final cuS:[Lrx/subjects/a$b;
 
 .field private static final serialVersionUID:J = 0x529b0a217109d450L
 
@@ -60,11 +61,11 @@
 
     new-array v1, v0, [Lrx/subjects/a$b;
 
-    sput-object v1, Lrx/subjects/a$c;->cvx:[Lrx/subjects/a$b;
+    sput-object v1, Lrx/subjects/a$c;->cuR:[Lrx/subjects/a$b;
 
     new-array v0, v0, [Lrx/subjects/a$b;
 
-    sput-object v0, Lrx/subjects/a$c;->cvy:[Lrx/subjects/a$b;
+    sput-object v0, Lrx/subjects/a$c;->cuS:[Lrx/subjects/a$b;
 
     return-void
 .end method
@@ -83,7 +84,7 @@
 
     iput-object p1, p0, Lrx/subjects/a$c;->buffer:Lrx/subjects/a$a;
 
-    sget-object p1, Lrx/subjects/a$c;->cvx:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->cuR:[Lrx/subjects/a$b;
 
     invoke-virtual {p0, p1}, Lrx/subjects/a$c;->lazySet(Ljava/lang/Object;)V
 
@@ -109,11 +110,11 @@
 
     check-cast v0, [Lrx/subjects/a$b;
 
-    sget-object v1, Lrx/subjects/a$c;->cvy:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->cuS:[Lrx/subjects/a$b;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/a$c;->cvx:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->cuR:[Lrx/subjects/a$b;
 
     if-ne v0, v1, :cond_1
 
@@ -155,7 +156,7 @@
 
     if-ne v1, v4, :cond_5
 
-    sget-object v1, Lrx/subjects/a$c;->cvx:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->cuR:[Lrx/subjects/a$b;
 
     goto :goto_2
 
@@ -183,6 +184,8 @@
 
     if-eqz v0, :cond_0
 
+    return-void
+
     :cond_6
     :goto_3
     return-void
@@ -208,7 +211,7 @@
 
     check-cast p1, [Lrx/subjects/a$b;
 
-    sget-object v1, Lrx/subjects/a$c;->cvy:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->cuS:[Lrx/subjects/a$b;
 
     const/4 v2, 0x0
 
@@ -263,7 +266,7 @@
 
     invoke-interface {v0}, Lrx/subjects/a$a;->complete()V
 
-    sget-object v1, Lrx/subjects/a$c;->cvy:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->cuS:[Lrx/subjects/a$b;
 
     invoke-virtual {p0, v1}, Lrx/subjects/a$c;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -297,7 +300,7 @@
 
     invoke-interface {v0, p1}, Lrx/subjects/a$a;->H(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lrx/subjects/a$c;->cvy:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->cuS:[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 b6cfe545f1..9806cd8a8d 100644
--- a/com.discord/smali_classes2/rx/subjects/a$d.smali
+++ b/com.discord/smali_classes2/rx/subjects/a$d.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/a$d;
 .super Ljava/lang/Object;
+.source "ReplaySubject.java"
 
 # interfaces
 .implements Lrx/subjects/a$a;
@@ -30,9 +31,9 @@
 # instance fields
 .field final capacity:I
 
-.field cvA:[Ljava/lang/Object;
+.field final cuT:[Ljava/lang/Object;
 
-.field final cvz:[Ljava/lang/Object;
+.field cuU:[Ljava/lang/Object;
 
 .field volatile done:Z
 
@@ -57,9 +58,9 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/subjects/a$d;->cvz:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->cuT:[Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/subjects/a$d;->cvA:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->cuU:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -131,7 +132,7 @@
 
     if-nez v8, :cond_2
 
-    iget-object v8, v0, Lrx/subjects/a$d;->cvz:[Ljava/lang/Object;
+    iget-object v8, v0, Lrx/subjects/a$d;->cuT:[Ljava/lang/Object;
 
     :cond_2
     iget v9, v1, Lrx/subjects/a$b;->tailIndex:I
@@ -231,7 +232,7 @@
     :cond_8
     cmp-long v11, v8, v6
 
-    if-nez v11, :cond_c
+    if-nez v11, :cond_d
 
     invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -280,21 +281,27 @@
     :cond_c
     const-wide/16 v11, 0x0
 
+    goto :goto_4
+
+    :cond_d
+    const-wide/16 v11, 0x0
+
+    :goto_4
     cmp-long v15, v8, v11
 
-    if-eqz v15, :cond_d
+    if-eqz v15, :cond_e
 
     const-wide v11, 0x7fffffffffffffffL
 
     cmp-long v15, v6, v11
 
-    if-eqz v15, :cond_d
+    if-eqz v15, :cond_e
 
     iget-object v6, v1, Lrx/subjects/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-static {v6, v8, v9}, Lrx/internal/a/a;->b(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    :cond_d
+    :cond_e
     iput v10, v1, Lrx/subjects/a$b;->index:I
 
     iput v13, v1, Lrx/subjects/a$b;->tailIndex:I
@@ -329,7 +336,7 @@
     :cond_0
     iget v0, p0, Lrx/subjects/a$d;->tailIndex:I
 
-    iget-object v1, p0, Lrx/subjects/a$d;->cvA:[Ljava/lang/Object;
+    iget-object v1, p0, Lrx/subjects/a$d;->cuU:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -351,7 +358,7 @@
 
     aput-object v2, v1, v0
 
-    iput-object v2, p0, Lrx/subjects/a$d;->cvA:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/subjects/a$d;->cuU:[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 2a44e4fbc4..b7d27d7a70 100644
--- a/com.discord/smali_classes2/rx/subjects/a.smali
+++ b/com.discord/smali_classes2/rx/subjects/a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/subjects/a;
 .super Lrx/subjects/Subject;
+.source "ReplaySubject.java"
 
 
 # annotations
@@ -24,7 +25,7 @@
 
 
 # static fields
-.field private static final cvr:[Ljava/lang/Object;
+.field private static final cuL:[Ljava/lang/Object;
 
 
 # instance fields
@@ -46,7 +47,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lrx/subjects/a;->cvr:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/a;->cuL:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -68,7 +69,7 @@
     return-void
 .end method
 
-.method public static Mm()Lrx/subjects/a;
+.method public static Ml()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 c8df5e0b41..54a58295a5 100644
--- a/com.discord/smali_classes2/rx/subjects/b$1.smali
+++ b/com.discord/smali_classes2/rx/subjects/b$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/b$1;
 .super Ljava/lang/Object;
+.source "SubjectSubscriptionManager.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
@@ -17,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic cvE:Lrx/subjects/b$b;
+.field final synthetic cuY:Lrx/subjects/b$b;
 
-.field final synthetic cvF:Lrx/subjects/b;
+.field final synthetic cuZ: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;->cvF:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/b$1;->cuZ:Lrx/subjects/b;
 
-    iput-object p2, p0, Lrx/subjects/b$1;->cvE:Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$1;->cuY:Lrx/subjects/b$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,9 +41,9 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/subjects/b$1;->cvF:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/b$1;->cuZ:Lrx/subjects/b;
 
-    iget-object v1, p0, Lrx/subjects/b$1;->cvE:Lrx/subjects/b$b;
+    iget-object v1, p0, Lrx/subjects/b$1;->cuY: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 72155d46ec..9de6262991 100644
--- a/com.discord/smali_classes2/rx/subjects/b$a.smali
+++ b/com.discord/smali_classes2/rx/subjects/b$a.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/subjects/b$a;
 .super Ljava/lang/Object;
+.source "SubjectSubscriptionManager.java"
 
 
 # annotations
@@ -23,15 +24,15 @@
 
 
 # static fields
-.field static final cvH:[Lrx/subjects/b$b;
+.field static final cvb:[Lrx/subjects/b$b;
 
-.field static final cvI:Lrx/subjects/b$a;
+.field static final cvc:Lrx/subjects/b$a;
 
-.field static final cvJ:Lrx/subjects/b$a;
+.field static final cvd:Lrx/subjects/b$a;
 
 
 # instance fields
-.field final cvG:[Lrx/subjects/b$b;
+.field final cva:[Lrx/subjects/b$b;
 
 .field final terminated:Z
 
@@ -44,25 +45,25 @@
 
     new-array v1, v0, [Lrx/subjects/b$b;
 
-    sput-object v1, Lrx/subjects/b$a;->cvH:[Lrx/subjects/b$b;
+    sput-object v1, Lrx/subjects/b$a;->cvb:[Lrx/subjects/b$b;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->cvH:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->cvb:[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;->cvI:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->cvc:Lrx/subjects/b$a;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->cvH:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->cvb:[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;->cvJ:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->cvd:Lrx/subjects/b$a;
 
     return-void
 .end method
@@ -74,7 +75,7 @@
 
     iput-boolean p1, p0, Lrx/subjects/b$a;->terminated:Z
 
-    iput-object p2, p0, Lrx/subjects/b$a;->cvG:[Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$a;->cva:[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 34ec2d09c6..4e1c151359 100644
--- a/com.discord/smali_classes2/rx/subjects/b$b.smali
+++ b/com.discord/smali_classes2/rx/subjects/b$b.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/subjects/b$b;
 .super Ljava/lang/Object;
+.source "SubjectSubscriptionManager.java"
 
 # interfaces
 .implements Lrx/e;
@@ -39,7 +40,7 @@
 
 .field bMd:Z
 
-.field cvK:Ljava/util/List;
+.field cve:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -49,7 +50,7 @@
     .end annotation
 .end field
 
-.field cvL:Z
+.field cvf:Z
 
 .field emitting:Z
 
@@ -94,7 +95,7 @@
 .method final cn(Ljava/lang/Object;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/subjects/b$b;->cvL:Z
+    iget-boolean v0, p0, Lrx/subjects/b$b;->cvf:Z
 
     if-nez v0, :cond_2
 
@@ -109,7 +110,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/subjects/b$b;->cvK:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->cve:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -117,10 +118,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lrx/subjects/b$b;->cvK:Ljava/util/List;
+    iput-object v0, p0, Lrx/subjects/b$b;->cve:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lrx/subjects/b$b;->cvK:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->cve:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -135,7 +136,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subjects/b$b;->cvL:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->cvf: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 bc37638477..a6ca938bd9 100644
--- a/com.discord/smali_classes2/rx/subjects/b.smali
+++ b/com.discord/smali_classes2/rx/subjects/b.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subjects/b;
 .super Ljava/util/concurrent/atomic/AtomicReference;
+.source "SubjectSubscriptionManager.java"
 
 # interfaces
 .implements Lrx/Observable$a;
@@ -71,7 +72,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lrx/subjects/b$a;->cvJ:Lrx/subjects/b$a;
+    sget-object v0, Lrx/subjects/b$a;->cvd:Lrx/subjects/b$a;
 
     invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -79,19 +80,19 @@
 
     iput-boolean v0, p0, Lrx/subjects/b;->active:Z
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onStart:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onAdded:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->KS()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->KR()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -126,7 +127,7 @@
     return-void
 
     :cond_1
-    iget-object v1, v0, Lrx/subjects/b$a;->cvG:[Lrx/subjects/b$b;
+    iget-object v1, v0, Lrx/subjects/b$a;->cva:[Lrx/subjects/b$b;
 
     array-length v2, v1
 
@@ -140,15 +141,14 @@
 
     if-ne v3, p1, :cond_2
 
-    :goto_0
-    sget-object v1, Lrx/subjects/b$a;->cvJ:Lrx/subjects/b$a;
+    sget-object v1, Lrx/subjects/b$a;->cvd:Lrx/subjects/b$a;
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_2
     if-nez v2, :cond_3
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_3
     add-int/lit8 v3, v2, -0x1
@@ -159,7 +159,7 @@
 
     const/4 v7, 0x0
 
-    :goto_1
+    :goto_0
     if-ge v6, v2, :cond_6
 
     aget-object v8, v1, v6
@@ -168,10 +168,10 @@
 
     if-ne v7, v3, :cond_4
 
-    :goto_2
+    :goto_1
     move-object v1, v0
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
     add-int/lit8 v9, v7, 0x1
@@ -183,12 +183,14 @@
     :cond_5
     add-int/lit8 v6, v6, 0x1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_6
     if-nez v7, :cond_7
 
-    goto :goto_0
+    sget-object v1, Lrx/subjects/b$a;->cvd:Lrx/subjects/b$a;
+
+    goto :goto_3
 
     :cond_7
     if-ge v7, v3, :cond_8
@@ -197,12 +199,12 @@
 
     invoke-static {v5, v4, v1, v4, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_8
     move-object v1, v5
 
-    :goto_3
+    :goto_2
     new-instance v2, Lrx/subjects/b$a;
 
     iget-boolean v3, v0, Lrx/subjects/b$a;->terminated:Z
@@ -211,7 +213,7 @@
 
     move-object v1, v2
 
-    :goto_4
+    :goto_3
     if-eq v1, v0, :cond_9
 
     invoke-virtual {p0, v0, v1}, Lrx/subjects/b;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -273,7 +275,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, v1, Lrx/subjects/b$a;->cvG:[Lrx/subjects/b$b;
+    iget-object v2, v1, Lrx/subjects/b$a;->cva:[Lrx/subjects/b$b;
 
     array-length v2, v2
 
@@ -281,7 +283,7 @@
 
     new-array v4, v4, [Lrx/subjects/b$b;
 
-    iget-object v5, v1, Lrx/subjects/b$a;->cvG:[Lrx/subjects/b$b;
+    iget-object v5, v1, Lrx/subjects/b$a;->cva:[Lrx/subjects/b$b;
 
     invoke-static {v5, v3, v4, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -348,12 +350,12 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lrx/subjects/b$a;->cvH:[Lrx/subjects/b$b;
+    sget-object p1, Lrx/subjects/b$a;->cvb:[Lrx/subjects/b$b;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lrx/subjects/b$a;->cvI:Lrx/subjects/b$a;
+    sget-object p1, Lrx/subjects/b$a;->cvc:Lrx/subjects/b$a;
 
     invoke-virtual {p0, p1}, Lrx/subjects/b;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -361,7 +363,7 @@
 
     check-cast p1, Lrx/subjects/b$a;
 
-    iget-object p1, p1, Lrx/subjects/b$a;->cvG:[Lrx/subjects/b$b;
+    iget-object p1, p1, Lrx/subjects/b$a;->cva:[Lrx/subjects/b$b;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
index 445ec20d67..d760e105b4 100644
--- a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
@@ -1,14 +1,15 @@
 .class public final Lrx/subscriptions/CompositeSubscription;
 .super Ljava/lang/Object;
+.source "CompositeSubscription.java"
 
 # interfaces
 .implements Lrx/Subscription;
 
 
 # instance fields
-.field private volatile cnf:Z
+.field private volatile cmz:Z
 
-.field private cvO:Ljava/util/Set;
+.field private cvi:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -41,7 +42,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     return-void
 .end method
@@ -122,18 +123,18 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     if-nez v0, :cond_1
 
@@ -143,10 +144,10 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(I)V
 
-    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     :cond_1
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -178,29 +179,29 @@
 .method public final clear()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     monitor-exit p0
     :try_end_0
@@ -234,25 +235,25 @@
 .method public final e(Lrx/Subscription;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -292,7 +293,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     return v0
 .end method
@@ -300,14 +301,14 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
     if-eqz v0, :cond_0
 
@@ -318,13 +319,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cnf:Z
+    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->cmz:Z
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->cvi:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->cvO:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->cvi: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 5926f0c0ea..4e9b272696 100644
--- a/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali
@@ -1,12 +1,13 @@
 .class public final Lrx/subscriptions/SerialSubscription;
 .super Ljava/lang/Object;
+.source "SerialSubscription.java"
 
 # interfaces
 .implements Lrx/Subscription;
 
 
 # instance fields
-.field public final cvP:Lrx/internal/d/a;
+.field public final cvj:Lrx/internal/d/a;
 
 
 # direct methods
@@ -19,7 +20,7 @@
 
     invoke-direct {v0}, Lrx/internal/d/a;-><init>()V
 
-    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvP:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvj:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -31,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvP:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvj:Lrx/internal/d/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/d/a;->a(Lrx/Subscription;)Z
 
@@ -50,7 +51,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvP:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvj:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->isUnsubscribed()Z
 
@@ -62,7 +63,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvP:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->cvj:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/subscriptions/a$1.smali b/com.discord/smali_classes2/rx/subscriptions/a$1.smali
index aa81beaa41..491b6fcb54 100644
--- a/com.discord/smali_classes2/rx/subscriptions/a$1.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/a$1.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subscriptions/a$1;
 .super Ljava/lang/Object;
+.source "BooleanSubscription.java"
 
 # interfaces
 .implements Lrx/functions/Action0;
diff --git a/com.discord/smali_classes2/rx/subscriptions/a.smali b/com.discord/smali_classes2/rx/subscriptions/a.smali
index 151e5efa97..03b3532837 100644
--- a/com.discord/smali_classes2/rx/subscriptions/a.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/a.smali
@@ -1,16 +1,17 @@
 .class public final Lrx/subscriptions/a;
 .super Ljava/lang/Object;
+.source "BooleanSubscription.java"
 
 # interfaces
 .implements Lrx/Subscription;
 
 
 # static fields
-.field static final cvN:Lrx/functions/Action0;
+.field static final cvh:Lrx/functions/Action0;
 
 
 # instance fields
-.field final cvM:Ljava/util/concurrent/atomic/AtomicReference;
+.field final cvg:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -29,7 +30,7 @@
 
     invoke-direct {v0}, Lrx/subscriptions/a$1;-><init>()V
 
-    sput-object v0, Lrx/subscriptions/a;->cvN:Lrx/functions/Action0;
+    sput-object v0, Lrx/subscriptions/a;->cvh:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -43,7 +44,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/subscriptions/a;->cvM:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -57,7 +58,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lrx/subscriptions/a;->cvM:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -77,13 +78,13 @@
 .method public final isUnsubscribed()Z
     .locals 2
 
-    iget-object v0, p0, Lrx/subscriptions/a;->cvM:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->cvg: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;->cvN:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->cvh:Lrx/functions/Action0;
 
     if-ne v0, v1, :cond_0
 
@@ -100,7 +101,7 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-object v0, p0, Lrx/subscriptions/a;->cvM:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -108,13 +109,11 @@
 
     check-cast v0, Lrx/functions/Action0;
 
-    sget-object v1, Lrx/subscriptions/a;->cvN:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->cvh:Lrx/functions/Action0;
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/a;->cvM:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lrx/subscriptions/a;->cvN:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/subscriptions/a;->cvg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -124,7 +123,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lrx/subscriptions/a;->cvN:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->cvh: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 8a55e4c919..259baba153 100644
--- a/com.discord/smali_classes2/rx/subscriptions/b.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/b.smali
@@ -1,12 +1,13 @@
 .class public final Lrx/subscriptions/b;
 .super Ljava/lang/Object;
+.source "MultipleAssignmentSubscription.java"
 
 # interfaces
 .implements Lrx/Subscription;
 
 
 # instance fields
-.field final cvP:Lrx/internal/d/a;
+.field final cvj:Lrx/internal/d/a;
 
 
 # direct methods
@@ -19,7 +20,7 @@
 
     invoke-direct {v0}, Lrx/internal/d/a;-><init>()V
 
-    iput-object v0, p0, Lrx/subscriptions/b;->cvP:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/b;->cvj:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -31,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/b;->cvP:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->cvj:Lrx/internal/d/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/d/a;->b(Lrx/Subscription;)Z
 
@@ -50,7 +51,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/b;->cvP:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->cvj:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->isUnsubscribed()Z
 
@@ -62,7 +63,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/b;->cvP:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->cvj:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/subscriptions/c$a.smali b/com.discord/smali_classes2/rx/subscriptions/c$a.smali
index f7c2e2d5a8..4a2d47d07f 100644
--- a/com.discord/smali_classes2/rx/subscriptions/c$a.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/c$a.smali
@@ -1,5 +1,6 @@
 .class final Lrx/subscriptions/c$a;
 .super Ljava/lang/Object;
+.source "Subscriptions.java"
 
 # interfaces
 .implements Lrx/Subscription;
diff --git a/com.discord/smali_classes2/rx/subscriptions/c.smali b/com.discord/smali_classes2/rx/subscriptions/c.smali
index b7299655c2..e37b803eb1 100644
--- a/com.discord/smali_classes2/rx/subscriptions/c.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/c.smali
@@ -1,5 +1,6 @@
 .class public final Lrx/subscriptions/c;
 .super Ljava/lang/Object;
+.source "Subscriptions.java"
 
 
 # annotations
@@ -11,7 +12,7 @@
 
 
 # static fields
-.field private static final cvQ:Lrx/subscriptions/c$a;
+.field private static final cvk:Lrx/subscriptions/c$a;
 
 
 # direct methods
@@ -22,15 +23,15 @@
 
     invoke-direct {v0}, Lrx/subscriptions/c$a;-><init>()V
 
-    sput-object v0, Lrx/subscriptions/c;->cvQ:Lrx/subscriptions/c$a;
+    sput-object v0, Lrx/subscriptions/c;->cvk:Lrx/subscriptions/c$a;
 
     return-void
 .end method
 
-.method public static Mn()Lrx/Subscription;
+.method public static Mm()Lrx/Subscription;
     .locals 1
 
-    sget-object v0, Lrx/subscriptions/c;->cvQ:Lrx/subscriptions/c$a;
+    sget-object v0, Lrx/subscriptions/c;->cvk:Lrx/subscriptions/c$a;
 
     return-object v0
 .end method